From 73b6606629bb65551bc804fa9e96b43ee3aa6583 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 9 Sep 2015 09:34:46 -0700 Subject: [PATCH 01/56] Workqueue: interface, test, and posix implementation --- BUILD | 15 ++ Makefile | 38 +++- build.yaml | 27 ++- gRPC.podspec | 8 + src/core/iomgr/wakeup_fd_eventfd.c | 2 +- src/core/iomgr/wakeup_fd_pipe.c | 4 +- src/core/iomgr/workqueue.h | 66 +++++++ src/core/iomgr/workqueue_posix.c | 138 ++++++++++++++ src/core/iomgr/workqueue_posix.h | 37 ++++ src/core/iomgr/workqueue_windows.c | 40 ++++ src/core/iomgr/workqueue_windows.h | 37 ++++ test/core/iomgr/workqueue_test.c | 84 +++++++++ tools/doxygen/Doxyfile.core.internal | 5 + tools/run_tests/sources_and_headers.json | 30 +++ tools/run_tests/tests.json | 18 ++ vsprojects/buildtests_c.sln | 27 +++ vsprojects/vcxproj/grpc/grpc.vcxproj | 7 + vsprojects/vcxproj/grpc/grpc.vcxproj.filters | 15 ++ .../grpc_unsecure/grpc_unsecure.vcxproj | 7 + .../grpc_unsecure.vcxproj.filters | 15 ++ .../workqueue_test/workqueue_test.vcxproj | 172 ++++++++++++++++++ .../workqueue_test.vcxproj.filters | 21 +++ 22 files changed, 799 insertions(+), 14 deletions(-) create mode 100644 src/core/iomgr/workqueue.h create mode 100644 src/core/iomgr/workqueue_posix.c create mode 100644 src/core/iomgr/workqueue_posix.h create mode 100644 src/core/iomgr/workqueue_windows.c create mode 100644 src/core/iomgr/workqueue_windows.h create mode 100644 test/core/iomgr/workqueue_test.c create mode 100644 vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj create mode 100644 vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj.filters diff --git a/BUILD b/BUILD index 7511320a4ce..78aa63d254e 100644 --- a/BUILD +++ b/BUILD @@ -204,6 +204,9 @@ cc_library( "src/core/iomgr/udp_server.h", "src/core/iomgr/wakeup_fd_pipe.h", "src/core/iomgr/wakeup_fd_posix.h", + "src/core/iomgr/workqueue.h", + "src/core/iomgr/workqueue_posix.h", + "src/core/iomgr/workqueue_windows.h", "src/core/json/json.h", "src/core/json/json_common.h", "src/core/json/json_reader.h", @@ -334,6 +337,8 @@ cc_library( "src/core/iomgr/wakeup_fd_nospecial.c", "src/core/iomgr/wakeup_fd_pipe.c", "src/core/iomgr/wakeup_fd_posix.c", + "src/core/iomgr/workqueue_posix.c", + "src/core/iomgr/workqueue_windows.c", "src/core/json/json.c", "src/core/json/json_reader.c", "src/core/json/json_string.c", @@ -474,6 +479,9 @@ cc_library( "src/core/iomgr/udp_server.h", "src/core/iomgr/wakeup_fd_pipe.h", "src/core/iomgr/wakeup_fd_posix.h", + "src/core/iomgr/workqueue.h", + "src/core/iomgr/workqueue_posix.h", + "src/core/iomgr/workqueue_windows.h", "src/core/json/json.h", "src/core/json/json_common.h", "src/core/json/json_reader.h", @@ -584,6 +592,8 @@ cc_library( "src/core/iomgr/wakeup_fd_nospecial.c", "src/core/iomgr/wakeup_fd_pipe.c", "src/core/iomgr/wakeup_fd_posix.c", + "src/core/iomgr/workqueue_posix.c", + "src/core/iomgr/workqueue_windows.c", "src/core/json/json.c", "src/core/json/json_reader.c", "src/core/json/json_string.c", @@ -1098,6 +1108,8 @@ objc_library( "src/core/iomgr/wakeup_fd_nospecial.c", "src/core/iomgr/wakeup_fd_pipe.c", "src/core/iomgr/wakeup_fd_posix.c", + "src/core/iomgr/workqueue_posix.c", + "src/core/iomgr/workqueue_windows.c", "src/core/json/json.c", "src/core/json/json_reader.c", "src/core/json/json_string.c", @@ -1235,6 +1247,9 @@ objc_library( "src/core/iomgr/udp_server.h", "src/core/iomgr/wakeup_fd_pipe.h", "src/core/iomgr/wakeup_fd_posix.h", + "src/core/iomgr/workqueue.h", + "src/core/iomgr/workqueue_posix.h", + "src/core/iomgr/workqueue_windows.h", "src/core/json/json.h", "src/core/json/json_common.h", "src/core/json/json_reader.h", diff --git a/Makefile b/Makefile index 4359f781046..7ce3ad68064 100644 --- a/Makefile +++ b/Makefile @@ -851,6 +851,7 @@ transport_metadata_test: $(BINDIR)/$(CONFIG)/transport_metadata_test transport_security_test: $(BINDIR)/$(CONFIG)/transport_security_test udp_server_test: $(BINDIR)/$(CONFIG)/udp_server_test uri_parser_test: $(BINDIR)/$(CONFIG)/uri_parser_test +workqueue_test: $(BINDIR)/$(CONFIG)/workqueue_test async_end2end_test: $(BINDIR)/$(CONFIG)/async_end2end_test async_streaming_ping_pong_test: $(BINDIR)/$(CONFIG)/async_streaming_ping_pong_test async_unary_ping_pong_test: $(BINDIR)/$(CONFIG)/async_unary_ping_pong_test @@ -1729,7 +1730,7 @@ endif buildtests: buildtests_c buildtests_cxx buildtests_zookeeper -buildtests_c: privatelibs_c $(BINDIR)/$(CONFIG)/alarm_heap_test $(BINDIR)/$(CONFIG)/alarm_list_test $(BINDIR)/$(CONFIG)/alarm_test $(BINDIR)/$(CONFIG)/alpn_test $(BINDIR)/$(CONFIG)/bin_encoder_test $(BINDIR)/$(CONFIG)/chttp2_status_conversion_test $(BINDIR)/$(CONFIG)/chttp2_stream_encoder_test $(BINDIR)/$(CONFIG)/chttp2_stream_map_test $(BINDIR)/$(CONFIG)/compression_test $(BINDIR)/$(CONFIG)/dualstack_socket_test $(BINDIR)/$(CONFIG)/endpoint_pair_test $(BINDIR)/$(CONFIG)/fd_conservation_posix_test $(BINDIR)/$(CONFIG)/fd_posix_test $(BINDIR)/$(CONFIG)/fling_client $(BINDIR)/$(CONFIG)/fling_server $(BINDIR)/$(CONFIG)/fling_stream_test $(BINDIR)/$(CONFIG)/fling_test $(BINDIR)/$(CONFIG)/gpr_cmdline_test $(BINDIR)/$(CONFIG)/gpr_env_test $(BINDIR)/$(CONFIG)/gpr_file_test $(BINDIR)/$(CONFIG)/gpr_histogram_test $(BINDIR)/$(CONFIG)/gpr_host_port_test $(BINDIR)/$(CONFIG)/gpr_log_test $(BINDIR)/$(CONFIG)/gpr_slice_buffer_test $(BINDIR)/$(CONFIG)/gpr_slice_test $(BINDIR)/$(CONFIG)/gpr_stack_lockfree_test $(BINDIR)/$(CONFIG)/gpr_string_test $(BINDIR)/$(CONFIG)/gpr_sync_test $(BINDIR)/$(CONFIG)/gpr_thd_test $(BINDIR)/$(CONFIG)/gpr_time_test $(BINDIR)/$(CONFIG)/gpr_tls_test $(BINDIR)/$(CONFIG)/gpr_useful_test $(BINDIR)/$(CONFIG)/grpc_auth_context_test $(BINDIR)/$(CONFIG)/grpc_base64_test $(BINDIR)/$(CONFIG)/grpc_byte_buffer_reader_test $(BINDIR)/$(CONFIG)/grpc_channel_args_test $(BINDIR)/$(CONFIG)/grpc_channel_stack_test $(BINDIR)/$(CONFIG)/grpc_completion_queue_test $(BINDIR)/$(CONFIG)/grpc_credentials_test $(BINDIR)/$(CONFIG)/grpc_json_token_test $(BINDIR)/$(CONFIG)/grpc_jwt_verifier_test $(BINDIR)/$(CONFIG)/grpc_security_connector_test $(BINDIR)/$(CONFIG)/grpc_stream_op_test $(BINDIR)/$(CONFIG)/hpack_parser_test $(BINDIR)/$(CONFIG)/hpack_table_test $(BINDIR)/$(CONFIG)/httpcli_format_request_test $(BINDIR)/$(CONFIG)/httpcli_parser_test $(BINDIR)/$(CONFIG)/httpcli_test $(BINDIR)/$(CONFIG)/json_rewrite $(BINDIR)/$(CONFIG)/json_rewrite_test $(BINDIR)/$(CONFIG)/json_test $(BINDIR)/$(CONFIG)/lame_client_test $(BINDIR)/$(CONFIG)/message_compress_test $(BINDIR)/$(CONFIG)/multi_init_test $(BINDIR)/$(CONFIG)/multiple_server_queues_test $(BINDIR)/$(CONFIG)/murmur_hash_test $(BINDIR)/$(CONFIG)/no_server_test $(BINDIR)/$(CONFIG)/resolve_address_test $(BINDIR)/$(CONFIG)/secure_endpoint_test $(BINDIR)/$(CONFIG)/sockaddr_utils_test $(BINDIR)/$(CONFIG)/tcp_client_posix_test $(BINDIR)/$(CONFIG)/tcp_posix_test $(BINDIR)/$(CONFIG)/tcp_server_posix_test $(BINDIR)/$(CONFIG)/time_averaged_stats_test $(BINDIR)/$(CONFIG)/timeout_encoding_test $(BINDIR)/$(CONFIG)/timers_test $(BINDIR)/$(CONFIG)/transport_metadata_test $(BINDIR)/$(CONFIG)/transport_security_test $(BINDIR)/$(CONFIG)/udp_server_test $(BINDIR)/$(CONFIG)/uri_parser_test $(BINDIR)/$(CONFIG)/h2_compress_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_compress_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_call_creds_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_compress_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_compress_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_compress_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_compress_default_host_test $(BINDIR)/$(CONFIG)/h2_compress_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_compress_empty_batch_test $(BINDIR)/$(CONFIG)/h2_compress_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_compress_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_compress_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_compress_large_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_compress_max_message_length_test $(BINDIR)/$(CONFIG)/h2_compress_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_no_op_test $(BINDIR)/$(CONFIG)/h2_compress_payload_test $(BINDIR)/$(CONFIG)/h2_compress_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_compress_registered_call_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_compress_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_compress_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_compress_simple_request_test $(BINDIR)/$(CONFIG)/h2_compress_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_fakesec_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_call_creds_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_fakesec_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_fakesec_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_fakesec_default_host_test $(BINDIR)/$(CONFIG)/h2_fakesec_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_fakesec_empty_batch_test $(BINDIR)/$(CONFIG)/h2_fakesec_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_fakesec_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_fakesec_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_large_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_fakesec_max_message_length_test $(BINDIR)/$(CONFIG)/h2_fakesec_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_no_op_test $(BINDIR)/$(CONFIG)/h2_fakesec_payload_test $(BINDIR)/$(CONFIG)/h2_fakesec_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_fakesec_registered_call_test $(BINDIR)/$(CONFIG)/h2_fakesec_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_fakesec_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_fakesec_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_fakesec_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_fakesec_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_simple_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_full_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_full_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_full_call_creds_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_full_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_full_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_full_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_full_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_full_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_full_default_host_test $(BINDIR)/$(CONFIG)/h2_full_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_full_empty_batch_test $(BINDIR)/$(CONFIG)/h2_full_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_full_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_full_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_full_large_metadata_test $(BINDIR)/$(CONFIG)/h2_full_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_full_max_message_length_test $(BINDIR)/$(CONFIG)/h2_full_metadata_test $(BINDIR)/$(CONFIG)/h2_full_no_op_test $(BINDIR)/$(CONFIG)/h2_full_payload_test $(BINDIR)/$(CONFIG)/h2_full_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_full_registered_call_test $(BINDIR)/$(CONFIG)/h2_full_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_full_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_full_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_full_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_full_simple_request_test $(BINDIR)/$(CONFIG)/h2_full_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_full+poll_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_call_creds_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_full+poll_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_full+poll_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_full+poll_default_host_test $(BINDIR)/$(CONFIG)/h2_full+poll_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_full+poll_empty_batch_test $(BINDIR)/$(CONFIG)/h2_full+poll_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_full+poll_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_full+poll_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_large_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_message_length_test $(BINDIR)/$(CONFIG)/h2_full+poll_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_no_op_test $(BINDIR)/$(CONFIG)/h2_full+poll_payload_test $(BINDIR)/$(CONFIG)/h2_full+poll_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_full+poll_registered_call_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_full+poll_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_oauth2_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_call_creds_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_oauth2_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_oauth2_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_oauth2_default_host_test $(BINDIR)/$(CONFIG)/h2_oauth2_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_oauth2_empty_batch_test $(BINDIR)/$(CONFIG)/h2_oauth2_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_oauth2_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_oauth2_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_large_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_oauth2_max_message_length_test $(BINDIR)/$(CONFIG)/h2_oauth2_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_no_op_test $(BINDIR)/$(CONFIG)/h2_oauth2_payload_test $(BINDIR)/$(CONFIG)/h2_oauth2_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_oauth2_registered_call_test $(BINDIR)/$(CONFIG)/h2_oauth2_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_oauth2_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_oauth2_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_oauth2_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_oauth2_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_simple_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_proxy_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_call_creds_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_proxy_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_proxy_default_host_test $(BINDIR)/$(CONFIG)/h2_proxy_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_proxy_empty_batch_test $(BINDIR)/$(CONFIG)/h2_proxy_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_proxy_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_proxy_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_proxy_large_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_max_message_length_test $(BINDIR)/$(CONFIG)/h2_proxy_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_no_op_test $(BINDIR)/$(CONFIG)/h2_proxy_payload_test $(BINDIR)/$(CONFIG)/h2_proxy_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_proxy_registered_call_test $(BINDIR)/$(CONFIG)/h2_proxy_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_proxy_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_request_test $(BINDIR)/$(CONFIG)/h2_proxy_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_sockpair_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_call_creds_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_sockpair_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_empty_batch_test $(BINDIR)/$(CONFIG)/h2_sockpair_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_sockpair_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_sockpair_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_large_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_message_length_test $(BINDIR)/$(CONFIG)/h2_sockpair_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_no_op_test $(BINDIR)/$(CONFIG)/h2_sockpair_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_sockpair_registered_call_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_sockpair_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_call_creds_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_empty_batch_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_large_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_message_length_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_no_op_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_registered_call_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_call_creds_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_empty_batch_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_large_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_message_length_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_no_op_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_registered_call_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_ssl_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_call_creds_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_ssl_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_ssl_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_default_host_test $(BINDIR)/$(CONFIG)/h2_ssl_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_ssl_empty_batch_test $(BINDIR)/$(CONFIG)/h2_ssl_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_ssl_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_ssl_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_ssl_large_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_ssl_max_message_length_test $(BINDIR)/$(CONFIG)/h2_ssl_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_no_op_test $(BINDIR)/$(CONFIG)/h2_ssl_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_ssl_registered_call_test $(BINDIR)/$(CONFIG)/h2_ssl_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_ssl_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_ssl_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_ssl_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_ssl_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_ssl_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_call_creds_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_default_host_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_empty_batch_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_large_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_max_message_length_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_no_op_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_payload_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_registered_call_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_call_creds_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_default_host_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_empty_batch_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_large_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_max_message_length_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_no_op_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_registered_call_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_uds_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_call_creds_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_uds_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_uds_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_uds_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_uds_empty_batch_test $(BINDIR)/$(CONFIG)/h2_uds_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_uds_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_uds_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_uds_large_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_uds_max_message_length_test $(BINDIR)/$(CONFIG)/h2_uds_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_no_op_test $(BINDIR)/$(CONFIG)/h2_uds_payload_test $(BINDIR)/$(CONFIG)/h2_uds_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_uds_registered_call_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_uds_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_uds_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_uds_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_uds+poll_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_call_creds_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_uds+poll_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_uds+poll_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_uds+poll_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_uds+poll_empty_batch_test $(BINDIR)/$(CONFIG)/h2_uds+poll_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_uds+poll_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_uds+poll_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_large_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_message_length_test $(BINDIR)/$(CONFIG)/h2_uds+poll_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_no_op_test $(BINDIR)/$(CONFIG)/h2_uds+poll_payload_test $(BINDIR)/$(CONFIG)/h2_uds+poll_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_uds+poll_registered_call_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_uds+poll_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_full_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_full_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_full_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_full_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_full_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_full_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_full_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_full_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_full_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_full_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_full_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_full_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_full_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_full_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_full_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/connection_prefix_bad_client_test $(BINDIR)/$(CONFIG)/initial_settings_frame_bad_client_test +buildtests_c: privatelibs_c $(BINDIR)/$(CONFIG)/alarm_heap_test $(BINDIR)/$(CONFIG)/alarm_list_test $(BINDIR)/$(CONFIG)/alarm_test $(BINDIR)/$(CONFIG)/alpn_test $(BINDIR)/$(CONFIG)/bin_encoder_test $(BINDIR)/$(CONFIG)/chttp2_status_conversion_test $(BINDIR)/$(CONFIG)/chttp2_stream_encoder_test $(BINDIR)/$(CONFIG)/chttp2_stream_map_test $(BINDIR)/$(CONFIG)/compression_test $(BINDIR)/$(CONFIG)/dualstack_socket_test $(BINDIR)/$(CONFIG)/endpoint_pair_test $(BINDIR)/$(CONFIG)/fd_conservation_posix_test $(BINDIR)/$(CONFIG)/fd_posix_test $(BINDIR)/$(CONFIG)/fling_client $(BINDIR)/$(CONFIG)/fling_server $(BINDIR)/$(CONFIG)/fling_stream_test $(BINDIR)/$(CONFIG)/fling_test $(BINDIR)/$(CONFIG)/gpr_cmdline_test $(BINDIR)/$(CONFIG)/gpr_env_test $(BINDIR)/$(CONFIG)/gpr_file_test $(BINDIR)/$(CONFIG)/gpr_histogram_test $(BINDIR)/$(CONFIG)/gpr_host_port_test $(BINDIR)/$(CONFIG)/gpr_log_test $(BINDIR)/$(CONFIG)/gpr_slice_buffer_test $(BINDIR)/$(CONFIG)/gpr_slice_test $(BINDIR)/$(CONFIG)/gpr_stack_lockfree_test $(BINDIR)/$(CONFIG)/gpr_string_test $(BINDIR)/$(CONFIG)/gpr_sync_test $(BINDIR)/$(CONFIG)/gpr_thd_test $(BINDIR)/$(CONFIG)/gpr_time_test $(BINDIR)/$(CONFIG)/gpr_tls_test $(BINDIR)/$(CONFIG)/gpr_useful_test $(BINDIR)/$(CONFIG)/grpc_auth_context_test $(BINDIR)/$(CONFIG)/grpc_base64_test $(BINDIR)/$(CONFIG)/grpc_byte_buffer_reader_test $(BINDIR)/$(CONFIG)/grpc_channel_args_test $(BINDIR)/$(CONFIG)/grpc_channel_stack_test $(BINDIR)/$(CONFIG)/grpc_completion_queue_test $(BINDIR)/$(CONFIG)/grpc_credentials_test $(BINDIR)/$(CONFIG)/grpc_json_token_test $(BINDIR)/$(CONFIG)/grpc_jwt_verifier_test $(BINDIR)/$(CONFIG)/grpc_security_connector_test $(BINDIR)/$(CONFIG)/grpc_stream_op_test $(BINDIR)/$(CONFIG)/hpack_parser_test $(BINDIR)/$(CONFIG)/hpack_table_test $(BINDIR)/$(CONFIG)/httpcli_format_request_test $(BINDIR)/$(CONFIG)/httpcli_parser_test $(BINDIR)/$(CONFIG)/httpcli_test $(BINDIR)/$(CONFIG)/json_rewrite $(BINDIR)/$(CONFIG)/json_rewrite_test $(BINDIR)/$(CONFIG)/json_test $(BINDIR)/$(CONFIG)/lame_client_test $(BINDIR)/$(CONFIG)/message_compress_test $(BINDIR)/$(CONFIG)/multi_init_test $(BINDIR)/$(CONFIG)/multiple_server_queues_test $(BINDIR)/$(CONFIG)/murmur_hash_test $(BINDIR)/$(CONFIG)/no_server_test $(BINDIR)/$(CONFIG)/resolve_address_test $(BINDIR)/$(CONFIG)/secure_endpoint_test $(BINDIR)/$(CONFIG)/sockaddr_utils_test $(BINDIR)/$(CONFIG)/tcp_client_posix_test $(BINDIR)/$(CONFIG)/tcp_posix_test $(BINDIR)/$(CONFIG)/tcp_server_posix_test $(BINDIR)/$(CONFIG)/time_averaged_stats_test $(BINDIR)/$(CONFIG)/timeout_encoding_test $(BINDIR)/$(CONFIG)/timers_test $(BINDIR)/$(CONFIG)/transport_metadata_test $(BINDIR)/$(CONFIG)/transport_security_test $(BINDIR)/$(CONFIG)/udp_server_test $(BINDIR)/$(CONFIG)/uri_parser_test $(BINDIR)/$(CONFIG)/workqueue_test $(BINDIR)/$(CONFIG)/h2_compress_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_compress_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_call_creds_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_compress_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_compress_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_compress_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_compress_default_host_test $(BINDIR)/$(CONFIG)/h2_compress_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_compress_empty_batch_test $(BINDIR)/$(CONFIG)/h2_compress_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_compress_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_compress_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_compress_large_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_compress_max_message_length_test $(BINDIR)/$(CONFIG)/h2_compress_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_no_op_test $(BINDIR)/$(CONFIG)/h2_compress_payload_test $(BINDIR)/$(CONFIG)/h2_compress_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_compress_registered_call_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_compress_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_compress_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_compress_simple_request_test $(BINDIR)/$(CONFIG)/h2_compress_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_fakesec_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_call_creds_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_fakesec_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_fakesec_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_fakesec_default_host_test $(BINDIR)/$(CONFIG)/h2_fakesec_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_fakesec_empty_batch_test $(BINDIR)/$(CONFIG)/h2_fakesec_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_fakesec_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_fakesec_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_large_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_fakesec_max_message_length_test $(BINDIR)/$(CONFIG)/h2_fakesec_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_no_op_test $(BINDIR)/$(CONFIG)/h2_fakesec_payload_test $(BINDIR)/$(CONFIG)/h2_fakesec_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_fakesec_registered_call_test $(BINDIR)/$(CONFIG)/h2_fakesec_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_fakesec_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_fakesec_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_fakesec_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_fakesec_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_simple_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_full_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_full_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_full_call_creds_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_full_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_full_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_full_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_full_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_full_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_full_default_host_test $(BINDIR)/$(CONFIG)/h2_full_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_full_empty_batch_test $(BINDIR)/$(CONFIG)/h2_full_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_full_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_full_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_full_large_metadata_test $(BINDIR)/$(CONFIG)/h2_full_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_full_max_message_length_test $(BINDIR)/$(CONFIG)/h2_full_metadata_test $(BINDIR)/$(CONFIG)/h2_full_no_op_test $(BINDIR)/$(CONFIG)/h2_full_payload_test $(BINDIR)/$(CONFIG)/h2_full_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_full_registered_call_test $(BINDIR)/$(CONFIG)/h2_full_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_full_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_full_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_full_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_full_simple_request_test $(BINDIR)/$(CONFIG)/h2_full_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_full+poll_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_call_creds_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_full+poll_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_full+poll_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_full+poll_default_host_test $(BINDIR)/$(CONFIG)/h2_full+poll_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_full+poll_empty_batch_test $(BINDIR)/$(CONFIG)/h2_full+poll_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_full+poll_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_full+poll_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_large_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_message_length_test $(BINDIR)/$(CONFIG)/h2_full+poll_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_no_op_test $(BINDIR)/$(CONFIG)/h2_full+poll_payload_test $(BINDIR)/$(CONFIG)/h2_full+poll_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_full+poll_registered_call_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_full+poll_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_oauth2_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_call_creds_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_oauth2_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_oauth2_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_oauth2_default_host_test $(BINDIR)/$(CONFIG)/h2_oauth2_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_oauth2_empty_batch_test $(BINDIR)/$(CONFIG)/h2_oauth2_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_oauth2_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_oauth2_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_large_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_oauth2_max_message_length_test $(BINDIR)/$(CONFIG)/h2_oauth2_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_no_op_test $(BINDIR)/$(CONFIG)/h2_oauth2_payload_test $(BINDIR)/$(CONFIG)/h2_oauth2_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_oauth2_registered_call_test $(BINDIR)/$(CONFIG)/h2_oauth2_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_oauth2_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_oauth2_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_oauth2_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_oauth2_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_simple_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_proxy_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_call_creds_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_proxy_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_proxy_default_host_test $(BINDIR)/$(CONFIG)/h2_proxy_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_proxy_empty_batch_test $(BINDIR)/$(CONFIG)/h2_proxy_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_proxy_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_proxy_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_proxy_large_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_max_message_length_test $(BINDIR)/$(CONFIG)/h2_proxy_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_no_op_test $(BINDIR)/$(CONFIG)/h2_proxy_payload_test $(BINDIR)/$(CONFIG)/h2_proxy_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_proxy_registered_call_test $(BINDIR)/$(CONFIG)/h2_proxy_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_proxy_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_request_test $(BINDIR)/$(CONFIG)/h2_proxy_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_sockpair_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_call_creds_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_sockpair_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_empty_batch_test $(BINDIR)/$(CONFIG)/h2_sockpair_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_sockpair_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_sockpair_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_large_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_message_length_test $(BINDIR)/$(CONFIG)/h2_sockpair_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_no_op_test $(BINDIR)/$(CONFIG)/h2_sockpair_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_sockpair_registered_call_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_sockpair_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_call_creds_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_empty_batch_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_large_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_message_length_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_no_op_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_registered_call_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_call_creds_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_empty_batch_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_large_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_message_length_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_no_op_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_registered_call_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_ssl_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_call_creds_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_ssl_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_ssl_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_default_host_test $(BINDIR)/$(CONFIG)/h2_ssl_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_ssl_empty_batch_test $(BINDIR)/$(CONFIG)/h2_ssl_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_ssl_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_ssl_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_ssl_large_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_ssl_max_message_length_test $(BINDIR)/$(CONFIG)/h2_ssl_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_no_op_test $(BINDIR)/$(CONFIG)/h2_ssl_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_ssl_registered_call_test $(BINDIR)/$(CONFIG)/h2_ssl_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_ssl_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_ssl_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_ssl_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_ssl_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_ssl_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_call_creds_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_default_host_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_empty_batch_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_large_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_max_message_length_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_no_op_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_payload_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_registered_call_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_call_creds_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_default_host_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_empty_batch_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_large_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_max_message_length_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_no_op_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_registered_call_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_uds_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_call_creds_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_uds_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_uds_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_uds_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_uds_empty_batch_test $(BINDIR)/$(CONFIG)/h2_uds_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_uds_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_uds_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_uds_large_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_uds_max_message_length_test $(BINDIR)/$(CONFIG)/h2_uds_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_no_op_test $(BINDIR)/$(CONFIG)/h2_uds_payload_test $(BINDIR)/$(CONFIG)/h2_uds_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_uds_registered_call_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_uds_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_uds_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_uds_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_uds+poll_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_call_creds_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_uds+poll_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_uds+poll_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_uds+poll_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_uds+poll_empty_batch_test $(BINDIR)/$(CONFIG)/h2_uds+poll_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_uds+poll_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_uds+poll_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_large_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_message_length_test $(BINDIR)/$(CONFIG)/h2_uds+poll_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_no_op_test $(BINDIR)/$(CONFIG)/h2_uds+poll_payload_test $(BINDIR)/$(CONFIG)/h2_uds+poll_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_uds+poll_registered_call_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_uds+poll_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_full_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_full_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_full_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_full_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_full_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_full_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_full_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_full_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_full_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_full_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_full_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_full_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_full_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_full_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_full_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/connection_prefix_bad_client_test $(BINDIR)/$(CONFIG)/initial_settings_frame_bad_client_test buildtests_cxx: buildtests_zookeeper privatelibs_cxx $(BINDIR)/$(CONFIG)/async_end2end_test $(BINDIR)/$(CONFIG)/async_streaming_ping_pong_test $(BINDIR)/$(CONFIG)/async_unary_ping_pong_test $(BINDIR)/$(CONFIG)/auth_property_iterator_test $(BINDIR)/$(CONFIG)/channel_arguments_test $(BINDIR)/$(CONFIG)/cli_call_test $(BINDIR)/$(CONFIG)/client_crash_test $(BINDIR)/$(CONFIG)/client_crash_test_server $(BINDIR)/$(CONFIG)/credentials_test $(BINDIR)/$(CONFIG)/cxx_byte_buffer_test $(BINDIR)/$(CONFIG)/cxx_slice_test $(BINDIR)/$(CONFIG)/cxx_string_ref_test $(BINDIR)/$(CONFIG)/cxx_time_test $(BINDIR)/$(CONFIG)/end2end_test $(BINDIR)/$(CONFIG)/generic_end2end_test $(BINDIR)/$(CONFIG)/grpc_cli $(BINDIR)/$(CONFIG)/interop_client $(BINDIR)/$(CONFIG)/interop_server $(BINDIR)/$(CONFIG)/interop_test $(BINDIR)/$(CONFIG)/mock_test $(BINDIR)/$(CONFIG)/qps_interarrival_test $(BINDIR)/$(CONFIG)/qps_openloop_test $(BINDIR)/$(CONFIG)/qps_test $(BINDIR)/$(CONFIG)/reconnect_interop_client $(BINDIR)/$(CONFIG)/reconnect_interop_server $(BINDIR)/$(CONFIG)/secure_auth_context_test $(BINDIR)/$(CONFIG)/server_crash_test $(BINDIR)/$(CONFIG)/server_crash_test_client $(BINDIR)/$(CONFIG)/shutdown_test $(BINDIR)/$(CONFIG)/status_test $(BINDIR)/$(CONFIG)/streaming_throughput_test $(BINDIR)/$(CONFIG)/sync_streaming_ping_pong_test $(BINDIR)/$(CONFIG)/sync_unary_ping_pong_test $(BINDIR)/$(CONFIG)/thread_stress_test @@ -1879,6 +1880,8 @@ test_c: buildtests_c $(Q) $(BINDIR)/$(CONFIG)/udp_server_test || ( echo test udp_server_test failed ; exit 1 ) $(E) "[RUN] Testing uri_parser_test" $(Q) $(BINDIR)/$(CONFIG)/uri_parser_test || ( echo test uri_parser_test failed ; exit 1 ) + $(E) "[RUN] Testing workqueue_test" + $(Q) $(BINDIR)/$(CONFIG)/workqueue_test || ( echo test workqueue_test failed ; exit 1 ) $(E) "[RUN] Testing h2_compress_bad_hostname_test" $(Q) $(BINDIR)/$(CONFIG)/h2_compress_bad_hostname_test || ( echo test h2_compress_bad_hostname_test failed ; exit 1 ) $(E) "[RUN] Testing h2_compress_binary_metadata_test" @@ -4102,6 +4105,8 @@ LIBGRPC_SRC = \ src/core/iomgr/wakeup_fd_nospecial.c \ src/core/iomgr/wakeup_fd_pipe.c \ src/core/iomgr/wakeup_fd_posix.c \ + src/core/iomgr/workqueue_posix.c \ + src/core/iomgr/workqueue_windows.c \ src/core/json/json.c \ src/core/json/json_reader.c \ src/core/json/json_string.c \ @@ -4377,6 +4382,8 @@ LIBGRPC_UNSECURE_SRC = \ src/core/iomgr/wakeup_fd_nospecial.c \ src/core/iomgr/wakeup_fd_pipe.c \ src/core/iomgr/wakeup_fd_posix.c \ + src/core/iomgr/workqueue_posix.c \ + src/core/iomgr/workqueue_windows.c \ src/core/json/json.c \ src/core/json/json_reader.c \ src/core/json/json_string.c \ @@ -8772,6 +8779,35 @@ endif endif +WORKQUEUE_TEST_SRC = \ + test/core/iomgr/workqueue_test.c \ + +WORKQUEUE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(WORKQUEUE_TEST_SRC)))) +ifeq ($(NO_SECURE),true) + +# You can't build secure targets if you don't have OpenSSL. + +$(BINDIR)/$(CONFIG)/workqueue_test: openssl_dep_error + +else + +$(BINDIR)/$(CONFIG)/workqueue_test: $(WORKQUEUE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` + $(Q) $(LD) $(LDFLAGS) $(WORKQUEUE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/workqueue_test + +endif + +$(OBJDIR)/$(CONFIG)/test/core/iomgr/workqueue_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a +deps_workqueue_test: $(WORKQUEUE_TEST_OBJS:.o=.dep) + +ifneq ($(NO_SECURE),true) +ifneq ($(NO_DEPS),true) +-include $(WORKQUEUE_TEST_OBJS:.o=.dep) +endif +endif + + ASYNC_END2END_TEST_SRC = \ test/cpp/end2end/async_end2end_test.cc \ diff --git a/build.yaml b/build.yaml index 757ba137afc..31c3b230fe5 100644 --- a/build.yaml +++ b/build.yaml @@ -63,6 +63,7 @@ filegroups: src/core/iomgr/socket_windows.h, src/core/iomgr/tcp_client.h, src/core/iomgr/tcp_posix.h, src/core/iomgr/tcp_server.h, src/core/iomgr/tcp_windows.h, src/core/iomgr/time_averaged_stats.h, src/core/iomgr/udp_server.h, src/core/iomgr/wakeup_fd_pipe.h, src/core/iomgr/wakeup_fd_posix.h, + src/core/iomgr/workqueue.h, src/core/iomgr/workqueue_posix.h, src/core/iomgr/workqueue_windows.h, src/core/json/json.h, src/core/json/json_common.h, src/core/json/json_reader.h, src/core/json/json_writer.h, src/core/profiling/timers.h, src/core/statistics/census_interface.h, src/core/statistics/census_rpc_stats.h, src/core/surface/byte_buffer_queue.h, @@ -104,16 +105,17 @@ filegroups: src/core/iomgr/tcp_client_windows.c, src/core/iomgr/tcp_posix.c, src/core/iomgr/tcp_server_posix.c, src/core/iomgr/tcp_server_windows.c, src/core/iomgr/tcp_windows.c, src/core/iomgr/time_averaged_stats.c, src/core/iomgr/udp_server.c, src/core/iomgr/wakeup_fd_eventfd.c, src/core/iomgr/wakeup_fd_nospecial.c, - src/core/iomgr/wakeup_fd_pipe.c, src/core/iomgr/wakeup_fd_posix.c, src/core/json/json.c, - src/core/json/json_reader.c, src/core/json/json_string.c, src/core/json/json_writer.c, - src/core/profiling/basic_timers.c, src/core/profiling/stap_timers.c, src/core/surface/byte_buffer.c, - src/core/surface/byte_buffer_queue.c, src/core/surface/byte_buffer_reader.c, src/core/surface/call.c, - src/core/surface/call_details.c, src/core/surface/call_log_batch.c, src/core/surface/channel.c, - src/core/surface/channel_connectivity.c, src/core/surface/channel_create.c, src/core/surface/completion_queue.c, - src/core/surface/event_string.c, src/core/surface/init.c, src/core/surface/lame_client.c, - src/core/surface/metadata_array.c, src/core/surface/server.c, src/core/surface/server_chttp2.c, - src/core/surface/server_create.c, src/core/surface/surface_trace.c, src/core/surface/version.c, - src/core/transport/chttp2/alpn.c, src/core/transport/chttp2/bin_encoder.c, src/core/transport/chttp2/frame_data.c, + src/core/iomgr/wakeup_fd_pipe.c, src/core/iomgr/wakeup_fd_posix.c, src/core/iomgr/workqueue_posix.c, + src/core/iomgr/workqueue_windows.c, src/core/json/json.c, src/core/json/json_reader.c, + src/core/json/json_string.c, src/core/json/json_writer.c, src/core/profiling/basic_timers.c, + src/core/profiling/stap_timers.c, src/core/surface/byte_buffer.c, src/core/surface/byte_buffer_queue.c, + src/core/surface/byte_buffer_reader.c, src/core/surface/call.c, src/core/surface/call_details.c, + src/core/surface/call_log_batch.c, src/core/surface/channel.c, src/core/surface/channel_connectivity.c, + src/core/surface/channel_create.c, src/core/surface/completion_queue.c, src/core/surface/event_string.c, + src/core/surface/init.c, src/core/surface/lame_client.c, src/core/surface/metadata_array.c, + src/core/surface/server.c, src/core/surface/server_chttp2.c, src/core/surface/server_create.c, + src/core/surface/surface_trace.c, src/core/surface/version.c, src/core/transport/chttp2/alpn.c, + src/core/transport/chttp2/bin_encoder.c, src/core/transport/chttp2/frame_data.c, src/core/transport/chttp2/frame_goaway.c, src/core/transport/chttp2/frame_ping.c, src/core/transport/chttp2/frame_rst_stream.c, src/core/transport/chttp2/frame_settings.c, src/core/transport/chttp2/frame_window_update.c, src/core/transport/chttp2/hpack_parser.c, @@ -741,6 +743,11 @@ targets: language: c src: [test/core/client_config/uri_parser_test.c] deps: [grpc_test_util, grpc, gpr_test_util, gpr] +- name: workqueue_test + build: test + language: c + src: [test/core/iomgr/workqueue_test.c] + deps: [grpc_test_util, grpc, gpr_test_util, gpr] - name: async_end2end_test build: test language: c++ diff --git a/gRPC.podspec b/gRPC.podspec index d0e1e2d848d..9d4b3405e83 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -206,6 +206,9 @@ Pod::Spec.new do |s| 'src/core/iomgr/udp_server.h', 'src/core/iomgr/wakeup_fd_pipe.h', 'src/core/iomgr/wakeup_fd_posix.h', + 'src/core/iomgr/workqueue.h', + 'src/core/iomgr/workqueue_posix.h', + 'src/core/iomgr/workqueue_windows.h', 'src/core/json/json.h', 'src/core/json/json_common.h', 'src/core/json/json_reader.h', @@ -343,6 +346,8 @@ Pod::Spec.new do |s| 'src/core/iomgr/wakeup_fd_nospecial.c', 'src/core/iomgr/wakeup_fd_pipe.c', 'src/core/iomgr/wakeup_fd_posix.c', + 'src/core/iomgr/workqueue_posix.c', + 'src/core/iomgr/workqueue_windows.c', 'src/core/json/json.c', 'src/core/json/json_reader.c', 'src/core/json/json_string.c', @@ -480,6 +485,9 @@ Pod::Spec.new do |s| 'src/core/iomgr/udp_server.h', 'src/core/iomgr/wakeup_fd_pipe.h', 'src/core/iomgr/wakeup_fd_posix.h', + 'src/core/iomgr/workqueue.h', + 'src/core/iomgr/workqueue_posix.h', + 'src/core/iomgr/workqueue_windows.h', 'src/core/json/json.h', 'src/core/json/json_common.h', 'src/core/json/json_reader.h', diff --git a/src/core/iomgr/wakeup_fd_eventfd.c b/src/core/iomgr/wakeup_fd_eventfd.c index 08fdc74f172..ba622eb1ee7 100644 --- a/src/core/iomgr/wakeup_fd_eventfd.c +++ b/src/core/iomgr/wakeup_fd_eventfd.c @@ -66,7 +66,7 @@ static void eventfd_wakeup(grpc_wakeup_fd *fd_info) { } static void eventfd_destroy(grpc_wakeup_fd *fd_info) { - close(fd_info->read_fd); + if (fd_info->read_fd != 0) close(fd_info->read_fd); } static int eventfd_check_availability(void) { diff --git a/src/core/iomgr/wakeup_fd_pipe.c b/src/core/iomgr/wakeup_fd_pipe.c index bd643e80619..7d6a579d06b 100644 --- a/src/core/iomgr/wakeup_fd_pipe.c +++ b/src/core/iomgr/wakeup_fd_pipe.c @@ -81,8 +81,8 @@ static void pipe_wakeup(grpc_wakeup_fd *fd_info) { } static void pipe_destroy(grpc_wakeup_fd *fd_info) { - close(fd_info->read_fd); - close(fd_info->write_fd); + if (fd_info->read_fd != 0) close(fd_info->read_fd); + if (fd_info->write_fd != 0) close(fd_info->write_fd); } static int pipe_check_availability(void) { diff --git a/src/core/iomgr/workqueue.h b/src/core/iomgr/workqueue.h new file mode 100644 index 00000000000..0bfa959953c --- /dev/null +++ b/src/core/iomgr/workqueue.h @@ -0,0 +1,66 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef GRPC_INTERNAL_CORE_IOMGR_WORKQUEUE_H +#define GRPC_INTERNAL_CORE_IOMGR_WORKQUEUE_H + +#include "src/core/iomgr/iomgr.h" +#include "src/core/iomgr/pollset.h" + +#ifdef GPR_POSIX_SOCKET +#include "src/core/iomgr/workqueue_posix.h" +#endif + +#ifdef GPR_WIN32 +#include "src/core/iomgr/workqueue_windows.h" +#endif + +/** A workqueue represents a list of work to be executed asynchronously. */ +struct grpc_workqueue; +typedef struct grpc_workqueue grpc_workqueue; + +/** Create a work queue */ +grpc_workqueue *grpc_workqueue_create(void); + +void grpc_workqueue_ref(grpc_workqueue *workqueue); +void grpc_workqueue_unref(grpc_workqueue *workqueue); + +/** Bind this workqueue to a pollset */ +void grpc_workqueue_add_to_pollset(grpc_workqueue *workqueue, + grpc_pollset *pollset); + +/** Add a work item to a workqueue */ +void grpc_workqueue_push(grpc_workqueue *workqueue, grpc_iomgr_closure *closure, + int success); + +#endif diff --git a/src/core/iomgr/workqueue_posix.c b/src/core/iomgr/workqueue_posix.c new file mode 100644 index 00000000000..df4e0aca753 --- /dev/null +++ b/src/core/iomgr/workqueue_posix.c @@ -0,0 +1,138 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include + +#ifdef GPR_POSIX_SOCKET + +#include "src/core/iomgr/workqueue.h" + +#include + +#include + +#include "src/core/iomgr/fd_posix.h" + +struct grpc_workqueue { + gpr_refcount refs; + + gpr_mu mu; + grpc_iomgr_closure head; + grpc_iomgr_closure *tail; + + grpc_wakeup_fd wakeup_fd; + grpc_fd *wakeup_read_fd; + + grpc_iomgr_closure read_closure; +}; + +static void on_readable(void *arg, int success); + +grpc_workqueue *grpc_workqueue_create(void) { + char name[32]; + grpc_workqueue *workqueue = gpr_malloc(sizeof(grpc_workqueue)); + gpr_ref_init(&workqueue->refs, 1); + gpr_mu_init(&workqueue->mu); + workqueue->head.next = NULL; + workqueue->tail = &workqueue->head; + grpc_wakeup_fd_init(&workqueue->wakeup_fd); + sprintf(name, "workqueue:%p", (void *)workqueue); + workqueue->wakeup_read_fd = + grpc_fd_create(GRPC_WAKEUP_FD_GET_READ_FD(&workqueue->wakeup_fd), name); + grpc_iomgr_closure_init(&workqueue->read_closure, on_readable, workqueue); + grpc_fd_notify_on_read(workqueue->wakeup_read_fd, &workqueue->read_closure); + return workqueue; +} + +static void workqueue_destroy(grpc_workqueue *workqueue) { + grpc_fd_shutdown(workqueue->wakeup_read_fd); +} + +void grpc_workqueue_ref(grpc_workqueue *workqueue) { + gpr_ref(&workqueue->refs); +} + +void grpc_workqueue_unref(grpc_workqueue *workqueue) { + if (gpr_unref(&workqueue->refs)) { + workqueue_destroy(workqueue); + } +} + +void grpc_workqueue_add_to_pollset(grpc_workqueue *workqueue, + grpc_pollset *pollset) { + grpc_pollset_add_fd(pollset, workqueue->wakeup_read_fd); +} + +static void on_readable(void *arg, int success) { + grpc_workqueue *workqueue = arg; + grpc_iomgr_closure *todo; + + if (!success) { + gpr_mu_destroy(&workqueue->mu); + /* HACK: let wakeup_fd code know that we stole the fd */ + workqueue->wakeup_fd.read_fd = 0; + grpc_wakeup_fd_destroy(&workqueue->wakeup_fd); + grpc_fd_orphan(workqueue->wakeup_read_fd, NULL, "destroy"); + gpr_free(workqueue); + return; + } else { + gpr_mu_lock(&workqueue->mu); + todo = workqueue->head.next; + workqueue->head.next = NULL; + workqueue->tail = &workqueue->head; + grpc_wakeup_fd_consume_wakeup(&workqueue->wakeup_fd); + gpr_mu_unlock(&workqueue->mu); + grpc_fd_notify_on_read(workqueue->wakeup_read_fd, &workqueue->read_closure); + + while (todo) { + grpc_iomgr_closure *next = todo->next; + todo->cb(todo->cb_arg, todo->success); + todo = next; + } + } +} + +void grpc_workqueue_push(grpc_workqueue *workqueue, grpc_iomgr_closure *closure, + int success) { + closure->success = success; + closure->next = NULL; + gpr_mu_lock(&workqueue->mu); + if (workqueue->tail == &workqueue->head) { + grpc_wakeup_fd_wakeup(&workqueue->wakeup_fd); + } + workqueue->tail->next = closure; + workqueue->tail = closure; + gpr_mu_unlock(&workqueue->mu); +} + +#endif /* GPR_POSIX_SOCKET */ diff --git a/src/core/iomgr/workqueue_posix.h b/src/core/iomgr/workqueue_posix.h new file mode 100644 index 00000000000..ba455522ffe --- /dev/null +++ b/src/core/iomgr/workqueue_posix.h @@ -0,0 +1,37 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef GRPC_INTERNAL_CORE_IOMGR_WORKQUEUE_POSIX_H +#define GRPC_INTERNAL_CORE_IOMGR_WORKQUEUE_POSIX_H + +#endif /* GRPC_INTERNAL_CORE_IOMGR_WORKQUEUE_POSIX_H */ diff --git a/src/core/iomgr/workqueue_windows.c b/src/core/iomgr/workqueue_windows.c new file mode 100644 index 00000000000..f9ca57557b5 --- /dev/null +++ b/src/core/iomgr/workqueue_windows.c @@ -0,0 +1,40 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include + +#ifdef GPR_WIN32 + +#include "src/core/iomgr/workqueue.h" + +#endif /* GPR_WIN32 */ diff --git a/src/core/iomgr/workqueue_windows.h b/src/core/iomgr/workqueue_windows.h new file mode 100644 index 00000000000..941f195f514 --- /dev/null +++ b/src/core/iomgr/workqueue_windows.h @@ -0,0 +1,37 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef GRPC_INTERNAL_CORE_IOMGR_WORKQUEUE_WINDOWS_H +#define GRPC_INTERNAL_CORE_IOMGR_WORKQUEUE_WINDOWS_H + +#endif /* GRPC_INTERNAL_CORE_IOMGR_WORKQUEUE_WINDOWS_H */ diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c new file mode 100644 index 00000000000..99a9de7c9d0 --- /dev/null +++ b/test/core/iomgr/workqueue_test.c @@ -0,0 +1,84 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include "src/core/iomgr/workqueue.h" + +#include +#include + +#include "test/core/util/test_config.h" + +static grpc_pollset g_pollset; + +static void must_succeed(void *p, int success) { + GPR_ASSERT(success == 1); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + *(int *)p = 1; + grpc_pollset_kick(&g_pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); +} + +static void test_add_closure(void) { + grpc_iomgr_closure c; + int done = 0; + grpc_workqueue *wq = grpc_workqueue_create(); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5); + grpc_pollset_worker worker; + grpc_iomgr_closure_init(&c, must_succeed, &done); + + grpc_workqueue_push(wq, &c, 1); + grpc_workqueue_add_to_pollset(wq, &g_pollset); + + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + GPR_ASSERT(!done); + grpc_pollset_work(&g_pollset, &worker, gpr_now(deadline.clock_type), + deadline); + GPR_ASSERT(done); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + + grpc_workqueue_unref(wq); +} + +static void done_shutdown(void *arg) { grpc_pollset_destroy(arg); } + +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + grpc_init(); + grpc_pollset_init(&g_pollset); + + test_add_closure(); + + grpc_pollset_shutdown(&g_pollset, done_shutdown, &g_pollset); + grpc_shutdown(); + return 0; +} diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index fdc32c77765..50defad096f 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -840,6 +840,9 @@ src/core/iomgr/time_averaged_stats.h \ src/core/iomgr/udp_server.h \ src/core/iomgr/wakeup_fd_pipe.h \ src/core/iomgr/wakeup_fd_posix.h \ +src/core/iomgr/workqueue.h \ +src/core/iomgr/workqueue_posix.h \ +src/core/iomgr/workqueue_windows.h \ src/core/json/json.h \ src/core/json/json_common.h \ src/core/json/json_reader.h \ @@ -970,6 +973,8 @@ src/core/iomgr/wakeup_fd_eventfd.c \ src/core/iomgr/wakeup_fd_nospecial.c \ src/core/iomgr/wakeup_fd_pipe.c \ src/core/iomgr/wakeup_fd_posix.c \ +src/core/iomgr/workqueue_posix.c \ +src/core/iomgr/workqueue_windows.c \ src/core/json/json.c \ src/core/json/json_reader.c \ src/core/json/json_string.c \ diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 1774e5640cd..d7e7e2b8084 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -1038,6 +1038,20 @@ "test/core/client_config/uri_parser_test.c" ] }, + { + "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc_test_util" + ], + "headers": [], + "language": "c", + "name": "workqueue_test", + "src": [ + "test/core/iomgr/workqueue_test.c" + ] + }, { "deps": [ "gpr", @@ -12322,6 +12336,9 @@ "src/core/iomgr/udp_server.h", "src/core/iomgr/wakeup_fd_pipe.h", "src/core/iomgr/wakeup_fd_posix.h", + "src/core/iomgr/workqueue.h", + "src/core/iomgr/workqueue_posix.h", + "src/core/iomgr/workqueue_windows.h", "src/core/json/json.h", "src/core/json/json_common.h", "src/core/json/json_reader.h", @@ -12520,6 +12537,11 @@ "src/core/iomgr/wakeup_fd_pipe.h", "src/core/iomgr/wakeup_fd_posix.c", "src/core/iomgr/wakeup_fd_posix.h", + "src/core/iomgr/workqueue.h", + "src/core/iomgr/workqueue_posix.c", + "src/core/iomgr/workqueue_posix.h", + "src/core/iomgr/workqueue_windows.c", + "src/core/iomgr/workqueue_windows.h", "src/core/json/json.c", "src/core/json/json.h", "src/core/json/json_common.h", @@ -12802,6 +12824,9 @@ "src/core/iomgr/udp_server.h", "src/core/iomgr/wakeup_fd_pipe.h", "src/core/iomgr/wakeup_fd_posix.h", + "src/core/iomgr/workqueue.h", + "src/core/iomgr/workqueue_posix.h", + "src/core/iomgr/workqueue_windows.h", "src/core/json/json.h", "src/core/json/json_common.h", "src/core/json/json_reader.h", @@ -12985,6 +13010,11 @@ "src/core/iomgr/wakeup_fd_pipe.h", "src/core/iomgr/wakeup_fd_posix.c", "src/core/iomgr/wakeup_fd_posix.h", + "src/core/iomgr/workqueue.h", + "src/core/iomgr/workqueue_posix.c", + "src/core/iomgr/workqueue_posix.h", + "src/core/iomgr/workqueue_windows.c", + "src/core/iomgr/workqueue_windows.h", "src/core/json/json.c", "src/core/json/json.h", "src/core/json/json_common.h", diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 5976d5d4923..9cf762de3a1 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -1179,6 +1179,24 @@ "windows" ] }, + { + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "exclude_configs": [], + "flaky": false, + "language": "c", + "name": "workqueue_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ] + }, { "ci_platforms": [ "linux", diff --git a/vsprojects/buildtests_c.sln b/vsprojects/buildtests_c.sln index 406ae79102a..3a4bf4f2c47 100644 --- a/vsprojects/buildtests_c.sln +++ b/vsprojects/buildtests_c.sln @@ -1237,6 +1237,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uri_parser_test", "vcxproj\ {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "workqueue_test", "vcxproj\test\workqueue_test\workqueue_test.vcxproj", "{1B6E9651-4D88-2ACB-BEE0-26599919361D}" + ProjectSection(myProperties) = preProject + lib = "False" + EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} = {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} + {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} + {EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037} + {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h2_compress_bad_hostname_test", "vcxproj\test\h2_compress_bad_hostname_test\h2_compress_bad_hostname_test.vcxproj", "{CB29C8C8-0EF3-843F-2E56-36E076A57D0C}" ProjectSection(myProperties) = preProject lib = "False" @@ -9789,6 +9800,22 @@ Global {E35C24A0-8725-E773-FE78-CC0C67071EF7}.Release-DLL|Win32.Build.0 = Release|Win32 {E35C24A0-8725-E773-FE78-CC0C67071EF7}.Release-DLL|x64.ActiveCfg = Release|x64 {E35C24A0-8725-E773-FE78-CC0C67071EF7}.Release-DLL|x64.Build.0 = Release|x64 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug|Win32.ActiveCfg = Debug|Win32 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug|x64.ActiveCfg = Debug|x64 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release|Win32.ActiveCfg = Release|Win32 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release|x64.ActiveCfg = Release|x64 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug|Win32.Build.0 = Debug|Win32 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug|x64.Build.0 = Debug|x64 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release|Win32.Build.0 = Release|Win32 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release|x64.Build.0 = Release|x64 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug-DLL|Win32.ActiveCfg = Debug|Win32 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug-DLL|Win32.Build.0 = Debug|Win32 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug-DLL|x64.ActiveCfg = Debug|x64 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug-DLL|x64.Build.0 = Debug|x64 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release-DLL|Win32.ActiveCfg = Release|Win32 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release-DLL|Win32.Build.0 = Release|Win32 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release-DLL|x64.ActiveCfg = Release|x64 + {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release-DLL|x64.Build.0 = Release|x64 {CB29C8C8-0EF3-843F-2E56-36E076A57D0C}.Debug|Win32.ActiveCfg = Debug|Win32 {CB29C8C8-0EF3-843F-2E56-36E076A57D0C}.Debug|x64.ActiveCfg = Debug|x64 {CB29C8C8-0EF3-843F-2E56-36E076A57D0C}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index 852da5d95f7..130201a699b 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -302,6 +302,9 @@ + + + @@ -520,6 +523,10 @@ + + + + diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index b334602e020..20bd228fe04 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -259,6 +259,12 @@ src\core\iomgr + + src\core\iomgr + + + src\core\iomgr + src\core\json @@ -668,6 +674,15 @@ src\core\iomgr + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + src\core\json diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index f069aa52253..8cf0be61ca7 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -281,6 +281,9 @@ + + + @@ -459,6 +462,10 @@ + + + + diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index 35f8599cb9f..a6eccd42c3b 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -199,6 +199,12 @@ src\core\iomgr + + src\core\iomgr + + + src\core\iomgr + src\core\json @@ -566,6 +572,15 @@ src\core\iomgr + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + src\core\json diff --git a/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj b/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj new file mode 100644 index 00000000000..851e650de61 --- /dev/null +++ b/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj @@ -0,0 +1,172 @@ + + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {1B6E9651-4D88-2ACB-BEE0-26599919361D} + + + + v100 + + + v110 + + + v120 + + + Application + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + workqueue_test + static + Debug + Debug + + + workqueue_test + static + Debug + Debug + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + + + + + + + + + {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} + + + {29D16885-7228-4C31-81ED-5F9187C7F2A9} + + + {EAB0A629-17A9-44DB-B5FF-E91A721FE037} + + + {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + diff --git a/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj.filters b/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj.filters new file mode 100644 index 00000000000..8b8c22896d8 --- /dev/null +++ b/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj.filters @@ -0,0 +1,21 @@ + + + + + test\core\iomgr + + + + + + {3c17ce2b-b57b-9278-8494-48ab4df88ec8} + + + {7035b4d7-88e6-ce95-0011-0ea3cc64eddd} + + + {f0fb09d4-0bdc-a53c-1b5f-d71acbf72a5d} + + + + From 8664ca6463e8387b711f32fe283e0115e79c4c54 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 9 Sep 2015 12:30:59 -0700 Subject: [PATCH 02/56] Starting to convert code to work queues --- src/core/channel/client_channel.c | 3 ++- src/core/iomgr/iomgr.c | 30 ------------------------ src/core/iomgr/iomgr.h | 9 ------- src/core/iomgr/iomgr_internal.h | 3 --- src/core/iomgr/pollset_posix.c | 3 --- src/core/security/credentials.c | 13 ++++------ src/core/surface/channel.h | 3 +++ src/core/surface/secure_channel_create.c | 4 ++-- 8 files changed, 11 insertions(+), 57 deletions(-) diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 2e250338138..2624fcdd538 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -600,7 +600,8 @@ static void cc_start_transport_op(grpc_channel_element *elem, } if (on_consumed) { - grpc_iomgr_add_callback(on_consumed); + grpc_workqueue_push(grpc_channel_get_workqueue(chand->master), on_consumed, + 1); } } diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index 1dd03992ae4..cf74a16c0c8 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -46,39 +46,9 @@ static gpr_mu g_mu; static gpr_cv g_rcv; -static grpc_iomgr_closure *g_cbs_head = NULL; -static grpc_iomgr_closure *g_cbs_tail = NULL; static int g_shutdown; -static gpr_event g_background_callback_executor_done; static grpc_iomgr_object g_root_object; -/* Execute followup callbacks continuously. - Other threads may check in and help during pollset_work() */ -static void background_callback_executor(void *ignored) { - gpr_mu_lock(&g_mu); - while (!g_shutdown) { - gpr_timespec deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); - gpr_timespec short_deadline = gpr_time_add( - gpr_now(GPR_CLOCK_MONOTONIC), gpr_time_from_millis(100, GPR_TIMESPAN)); - if (g_cbs_head) { - grpc_iomgr_closure *closure = g_cbs_head; - g_cbs_head = closure->next; - if (!g_cbs_head) g_cbs_tail = NULL; - gpr_mu_unlock(&g_mu); - closure->cb(closure->cb_arg, closure->success); - gpr_mu_lock(&g_mu); - } else if (grpc_alarm_check(&g_mu, gpr_now(GPR_CLOCK_MONOTONIC), - &deadline)) { - } else { - gpr_mu_unlock(&g_mu); - gpr_sleep_until(gpr_time_min(short_deadline, deadline)); - gpr_mu_lock(&g_mu); - } - } - gpr_mu_unlock(&g_mu); - gpr_event_set(&g_background_callback_executor_done, (void *)1); -} - void grpc_kick_poller(void) { /* Empty. The background callback executor polls periodically. The activity * the kicker is trying to draw the executor's attention to will be picked up diff --git a/src/core/iomgr/iomgr.h b/src/core/iomgr/iomgr.h index 261c17366a3..f1d2e6439d0 100644 --- a/src/core/iomgr/iomgr.h +++ b/src/core/iomgr/iomgr.h @@ -68,13 +68,4 @@ void grpc_iomgr_init(void); /** Signals the intention to shutdown the iomgr. */ void grpc_iomgr_shutdown(void); -/** Registers a closure to be invoked at some point in the future. - * - * Can be called from within a callback or from anywhere else */ -void grpc_iomgr_add_callback(grpc_iomgr_closure *closure); - -/** As per grpc_iomgr_add_callback, with the ability to set the success - argument. */ -void grpc_iomgr_add_delayed_callback(grpc_iomgr_closure *iocb, int success); - #endif /* GRPC_INTERNAL_CORE_IOMGR_IOMGR_H */ diff --git a/src/core/iomgr/iomgr_internal.h b/src/core/iomgr/iomgr_internal.h index 4cec973ba04..f266732c96b 100644 --- a/src/core/iomgr/iomgr_internal.h +++ b/src/core/iomgr/iomgr_internal.h @@ -43,9 +43,6 @@ typedef struct grpc_iomgr_object { struct grpc_iomgr_object *prev; } grpc_iomgr_object; -int grpc_maybe_call_delayed_callbacks(gpr_mu *drop_mu, int success); -void grpc_iomgr_add_delayed_callback(grpc_iomgr_closure *iocb, int success); - void grpc_iomgr_register_object(grpc_iomgr_object *obj, const char *name); void grpc_iomgr_unregister_object(grpc_iomgr_object *obj); diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 6bd1b61f242..97a9fa863e6 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -178,9 +178,6 @@ void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, worker->next = worker->prev = NULL; /* TODO(ctiller): pool these */ grpc_wakeup_fd_init(&worker->wakeup_fd); - if (grpc_maybe_call_delayed_callbacks(&pollset->mu, 1)) { - goto done; - } if (grpc_alarm_check(&pollset->mu, now, &deadline)) { goto done; } diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index a764413300f..f151fba959c 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -47,6 +47,7 @@ #include #include #include +#include #include /* -- Common. -- */ @@ -54,7 +55,6 @@ struct grpc_credentials_metadata_request { grpc_credentials *creds; grpc_credentials_metadata_cb cb; - grpc_iomgr_closure *on_simulated_token_fetch_done_closure; void *user_data; }; @@ -66,8 +66,6 @@ grpc_credentials_metadata_request_create(grpc_credentials *creds, gpr_malloc(sizeof(grpc_credentials_metadata_request)); r->creds = grpc_credentials_ref(creds); r->cb = cb; - r->on_simulated_token_fetch_done_closure = - gpr_malloc(sizeof(grpc_iomgr_closure)); r->user_data = user_data; return r; } @@ -75,7 +73,6 @@ grpc_credentials_metadata_request_create(grpc_credentials *creds, static void grpc_credentials_metadata_request_destroy( grpc_credentials_metadata_request *r) { grpc_credentials_unref(r->creds); - gpr_free(r->on_simulated_token_fetch_done_closure); gpr_free(r); } @@ -746,11 +743,10 @@ static int md_only_test_has_request_metadata_only( return 1; } -void on_simulated_token_fetch_done(void *user_data, int success) { +void on_simulated_token_fetch_done(void *user_data) { grpc_credentials_metadata_request *r = (grpc_credentials_metadata_request *)user_data; grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)r->creds; - GPR_ASSERT(success); r->cb(r->user_data, c->md_store->entries, c->md_store->num_entries, GRPC_CREDENTIALS_OK); grpc_credentials_metadata_request_destroy(r); @@ -764,11 +760,10 @@ static void md_only_test_get_request_metadata(grpc_credentials *creds, grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)creds; if (c->is_async) { + gpr_thd_id thd_id; grpc_credentials_metadata_request *cb_arg = grpc_credentials_metadata_request_create(creds, cb, user_data); - grpc_iomgr_closure_init(cb_arg->on_simulated_token_fetch_done_closure, - on_simulated_token_fetch_done, cb_arg); - grpc_iomgr_add_callback(cb_arg->on_simulated_token_fetch_done_closure); + gpr_thd_new(&thd_id, on_simulated_token_fetch_done, cb_arg, NULL); } else { cb(user_data, c->md_store->entries, 1, GRPC_CREDENTIALS_OK); } diff --git a/src/core/surface/channel.h b/src/core/surface/channel.h index f271616f606..593faec7df8 100644 --- a/src/core/surface/channel.h +++ b/src/core/surface/channel.h @@ -36,6 +36,7 @@ #include "src/core/channel/channel_stack.h" #include "src/core/client_config/subchannel_factory.h" +#include "src/core/iomgr/workqueue.h" grpc_channel *grpc_channel_create_from_filters( const char *target, const grpc_channel_filter **filters, size_t count, @@ -61,6 +62,8 @@ grpc_mdstr *grpc_channel_get_encodings_accepted_by_peer_string( grpc_mdstr *grpc_channel_get_message_string(grpc_channel *channel); gpr_uint32 grpc_channel_get_max_message_length(grpc_channel *channel); +grpc_workqueue *grpc_channel_get_workqueue(grpc_channel *channel); + #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG void grpc_channel_internal_ref(grpc_channel *channel, const char *reason); void grpc_channel_internal_unref(grpc_channel *channel, const char *reason); diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 35b60bdbefc..1b6d1b3f464 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -95,7 +95,7 @@ static void on_secure_transport_setup_done(void *arg, } notify = c->notify; c->notify = NULL; - grpc_iomgr_add_callback(notify); + notify->cb(notify->cb_arg, 1); } static void connected(void *arg, grpc_endpoint *tcp) { @@ -108,7 +108,7 @@ static void connected(void *arg, grpc_endpoint *tcp) { memset(c->result, 0, sizeof(*c->result)); notify = c->notify; c->notify = NULL; - grpc_iomgr_add_callback(notify); + notify->cb(notify->cb_arg, 1); } } From 06a43f5d7e7ec90dfe133c5dfa1bb2c3acb85059 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 15 Sep 2015 07:41:28 -0700 Subject: [PATCH 03/56] Progress towards workqueue transition --- .../client_config/lb_policies/pick_first.c | 11 +- src/core/client_config/lb_policy_factory.h | 2 + src/core/client_config/resolver_factory.c | 5 +- src/core/client_config/resolver_factory.h | 15 ++- src/core/client_config/resolver_registry.c | 14 ++- src/core/client_config/resolver_registry.h | 5 +- .../client_config/resolvers/dns_resolver.c | 31 ++--- .../resolvers/sockaddr_resolver.c | 30 ++--- src/core/client_config/subchannel.c | 3 +- src/core/iomgr/endpoint_pair.h | 3 +- src/core/iomgr/endpoint_pair_posix.c | 11 +- src/core/iomgr/fd_posix.c | 30 +++-- src/core/iomgr/fd_posix.h | 4 +- src/core/iomgr/iomgr.c | 109 ++---------------- .../iomgr/pollset_multipoller_with_epoll.c | 2 +- src/core/iomgr/pollset_posix.c | 4 +- src/core/iomgr/tcp_client.h | 1 + src/core/iomgr/workqueue_posix.c | 15 --- src/core/iomgr/workqueue_posix.h | 15 +++ src/core/surface/secure_channel_create.c | 11 +- 20 files changed, 136 insertions(+), 185 deletions(-) diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index c8262e92efa..151b6f12f88 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -52,6 +52,8 @@ typedef struct { /** all our subchannels */ grpc_subchannel **subchannels; size_t num_subchannels; + /** workqueue for async work */ + grpc_workqueue *workqueue; grpc_iomgr_closure connectivity_changed; @@ -102,6 +104,7 @@ void pf_destroy(grpc_lb_policy *pol) { grpc_connectivity_state_destroy(&p->state_tracker); gpr_free(p->subchannels); gpr_mu_destroy(&p->mu); + grpc_workqueue_unref(p->workqueue); gpr_free(p); } @@ -114,7 +117,7 @@ void pf_shutdown(grpc_lb_policy *pol) { while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = NULL; - grpc_iomgr_add_delayed_callback(pp->on_complete, 0); + grpc_workqueue_push(p->workqueue, pp->on_complete, 0); gpr_free(pp); } grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, @@ -196,7 +199,7 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { p->pending_picks = pp->next; *pp->target = p->selected; grpc_subchannel_del_interested_party(p->selected, pp->pollset); - grpc_iomgr_add_delayed_callback(pp->on_complete, 1); + grpc_workqueue_push(p->workqueue, pp->on_complete, 1); gpr_free(pp); } grpc_subchannel_notify_on_state_change( @@ -241,7 +244,7 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = NULL; - grpc_iomgr_add_delayed_callback(pp->on_complete, 1); + grpc_workqueue_push(p->workqueue, pp->on_complete, 1); gpr_free(pp); } unref = 1; @@ -327,6 +330,8 @@ static grpc_lb_policy *create_pick_first(grpc_lb_policy_factory *factory, grpc_lb_policy_init(&p->base, &pick_first_lb_policy_vtable); p->subchannels = gpr_malloc(sizeof(grpc_subchannel *) * args->num_subchannels); p->num_subchannels = args->num_subchannels; + p->workqueue = args->workqueue; + grpc_workqueue_ref(p->workqueue); grpc_connectivity_state_init(&p->state_tracker, GRPC_CHANNEL_IDLE, "pick_first"); memcpy(p->subchannels, args->subchannels, diff --git a/src/core/client_config/lb_policy_factory.h b/src/core/client_config/lb_policy_factory.h index 04610316ee4..755faf88132 100644 --- a/src/core/client_config/lb_policy_factory.h +++ b/src/core/client_config/lb_policy_factory.h @@ -36,6 +36,7 @@ #include "src/core/client_config/lb_policy.h" #include "src/core/client_config/subchannel.h" +#include "src/core/iomgr/workqueue.h" typedef struct grpc_lb_policy_factory grpc_lb_policy_factory; typedef struct grpc_lb_policy_factory_vtable grpc_lb_policy_factory_vtable; @@ -49,6 +50,7 @@ struct grpc_lb_policy_factory { typedef struct grpc_lb_policy_args { grpc_subchannel **subchannels; size_t num_subchannels; + grpc_workqueue *workqueue; } grpc_lb_policy_args; struct grpc_lb_policy_factory_vtable { diff --git a/src/core/client_config/resolver_factory.c b/src/core/client_config/resolver_factory.c index 5b859a8d10b..af04f7d9c71 100644 --- a/src/core/client_config/resolver_factory.c +++ b/src/core/client_config/resolver_factory.c @@ -43,10 +43,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_resolver_factory *factory, grpc_uri *uri, - grpc_subchannel_factory *subchannel_factory) { + grpc_resolver_factory *factory, grpc_resolver_args *args) { if (factory == NULL) return NULL; - return factory->vtable->create_resolver(factory, uri, subchannel_factory); + return factory->vtable->create_resolver(factory, args); } char *grpc_resolver_factory_get_default_authority( diff --git a/src/core/client_config/resolver_factory.h b/src/core/client_config/resolver_factory.h index e243b23988a..24da84d89d0 100644 --- a/src/core/client_config/resolver_factory.h +++ b/src/core/client_config/resolver_factory.h @@ -37,6 +37,7 @@ #include "src/core/client_config/resolver.h" #include "src/core/client_config/subchannel_factory.h" #include "src/core/client_config/uri_parser.h" +#include "src/core/iomgr/workqueue.h" typedef struct grpc_resolver_factory grpc_resolver_factory; typedef struct grpc_resolver_factory_vtable grpc_resolver_factory_vtable; @@ -47,14 +48,19 @@ struct grpc_resolver_factory { const grpc_resolver_factory_vtable *vtable; }; +typedef struct grpc_resolver_args { + grpc_uri *uri; + grpc_subchannel_factory *subchannel_factory; + grpc_workqueue *workqueue; +} grpc_resolver_args; + struct grpc_resolver_factory_vtable { void (*ref)(grpc_resolver_factory *factory); void (*unref)(grpc_resolver_factory *factory); /** Implementation of grpc_resolver_factory_create_resolver */ - grpc_resolver *(*create_resolver)( - grpc_resolver_factory *factory, grpc_uri *uri, - grpc_subchannel_factory *subchannel_factory); + grpc_resolver *(*create_resolver)(grpc_resolver_factory *factory, + grpc_resolver_args *args); /** Implementation of grpc_resolver_factory_get_default_authority */ char *(*get_default_authority)(grpc_resolver_factory *factory, grpc_uri *uri); @@ -68,8 +74,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_resolver_factory *factory, grpc_uri *uri, - grpc_subchannel_factory *subchannel_factory); + 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/client_config/resolver_registry.c b/src/core/client_config/resolver_registry.c index 37979b3b86c..3611252bda9 100644 --- a/src/core/client_config/resolver_registry.c +++ b/src/core/client_config/resolver_registry.c @@ -114,12 +114,18 @@ static grpc_resolver_factory *resolve_factory(const char *target, return factory; } -grpc_resolver *grpc_resolver_create( - const char *target, grpc_subchannel_factory *subchannel_factory) { +grpc_resolver *grpc_resolver_create(const char *target, + grpc_subchannel_factory *subchannel_factory, + grpc_workqueue *workqueue) { grpc_uri *uri = NULL; grpc_resolver_factory *factory = resolve_factory(target, &uri); - grpc_resolver *resolver = - grpc_resolver_factory_create_resolver(factory, uri, subchannel_factory); + grpc_resolver *resolver; + grpc_resolver_args args; + memset(&args, 0, sizeof(args)); + args.uri = uri; + args.subchannel_factory = subchannel_factory; + args.workqueue = workqueue; + resolver = grpc_resolver_factory_create_resolver(factory, &args); grpc_uri_destroy(uri); return resolver; } diff --git a/src/core/client_config/resolver_registry.h b/src/core/client_config/resolver_registry.h index 5a7193b7ae2..9a9a6282627 100644 --- a/src/core/client_config/resolver_registry.h +++ b/src/core/client_config/resolver_registry.h @@ -55,8 +55,9 @@ void grpc_register_resolver_type(grpc_resolver_factory *factory); If a resolver factory was found, use it to instantiate a resolver and return it. If a resolver factory was not found, return NULL. */ -grpc_resolver *grpc_resolver_create( - const char *target, grpc_subchannel_factory *subchannel_factory); +grpc_resolver *grpc_resolver_create(const char *target, + grpc_subchannel_factory *subchannel_factory, + grpc_workqueue *workqueue); /** Given a target, return a (freshly allocated with gpr_malloc) string representing the default authority to pass from a client. */ diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index ccec07a08c6..b519ce41740 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -49,6 +49,8 @@ typedef struct { grpc_resolver base; /** refcount */ gpr_refcount refs; + /** workqueue */ + grpc_workqueue *workqueue; /** name to resolve */ char *name; /** default port to use */ @@ -94,7 +96,7 @@ static void dns_shutdown(grpc_resolver *resolver) { gpr_mu_lock(&r->mu); if (r->next_completion != NULL) { *r->target_config = NULL; - grpc_iomgr_add_callback(r->next_completion); + grpc_workqueue_push(r->workqueue, r->next_completion, 1); r->next_completion = NULL; } gpr_mu_unlock(&r->mu); @@ -180,7 +182,7 @@ static void dns_maybe_finish_next_locked(dns_resolver *r) { if (r->resolved_config) { grpc_client_config_ref(r->resolved_config); } - grpc_iomgr_add_callback(r->next_completion); + grpc_workqueue_push(r->workqueue, r->next_completion, 1); r->next_completion = NULL; r->published_version = r->resolved_version; } @@ -193,21 +195,21 @@ static void dns_destroy(grpc_resolver *gr) { grpc_client_config_unref(r->resolved_config); } grpc_subchannel_factory_unref(r->subchannel_factory); + grpc_workqueue_unref(r->workqueue); gpr_free(r->name); gpr_free(r->default_port); gpr_free(r->lb_policy_name); gpr_free(r); } -static grpc_resolver *dns_create( - grpc_uri *uri, const char *default_port, - const char* lb_policy_name, - grpc_subchannel_factory *subchannel_factory) { +static grpc_resolver *dns_create(grpc_resolver_args *args, + const char *default_port, + const char *lb_policy_name) { dns_resolver *r; - const char *path = uri->path; + const char *path = args->uri->path; - if (0 != strcmp(uri->authority, "")) { - gpr_log(GPR_ERROR, "authority based uri's not supported"); + if (0 != strcmp(args->uri->authority, "")) { + gpr_log(GPR_ERROR, "authority based dns uri's not supported"); return NULL; } @@ -220,8 +222,10 @@ static grpc_resolver *dns_create( grpc_resolver_init(&r->base, &dns_resolver_vtable); r->name = gpr_strdup(path); r->default_port = gpr_strdup(default_port); - r->subchannel_factory = subchannel_factory; - grpc_subchannel_factory_ref(subchannel_factory); + r->subchannel_factory = args->subchannel_factory; + grpc_subchannel_factory_ref(r->subchannel_factory); + r->workqueue = args->workqueue; + grpc_workqueue_ref(r->workqueue); r->lb_policy_name = gpr_strdup(lb_policy_name); return &r->base; } @@ -235,9 +239,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_resolver_factory *factory, grpc_uri *uri, - grpc_subchannel_factory *subchannel_factory) { - return dns_create(uri, "https", "pick_first", subchannel_factory); + grpc_resolver_factory *factory, grpc_resolver_args *args) { + return dns_create(args, "https", "pick_first"); } char *dns_factory_get_default_host_name(grpc_resolver_factory *factory, diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index 2900df285cf..260bee27a94 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -56,6 +56,8 @@ typedef struct { gpr_refcount refs; /** subchannel factory */ grpc_subchannel_factory *subchannel_factory; + /** workqueue */ + grpc_workqueue *workqueue; /** load balancing policy name */ char *lb_policy_name; @@ -96,8 +98,7 @@ static void sockaddr_shutdown(grpc_resolver *resolver) { gpr_mu_lock(&r->mu); if (r->next_completion != NULL) { *r->target_config = NULL; - /* TODO(ctiller): add delayed callback */ - grpc_iomgr_add_callback(r->next_completion); + grpc_workqueue_push(r->workqueue, r->next_completion, 1); r->next_completion = NULL; } gpr_mu_unlock(&r->mu); @@ -145,7 +146,7 @@ static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r) { GRPC_LB_POLICY_UNREF(lb_policy, "unix"); r->published = 1; *r->target_config = cfg; - grpc_iomgr_add_callback(r->next_completion); + grpc_workqueue_push(r->workqueue, r->next_completion, 1); r->next_completion = NULL; } } @@ -154,6 +155,7 @@ static void sockaddr_destroy(grpc_resolver *gr) { sockaddr_resolver *r = (sockaddr_resolver *)gr; gpr_mu_destroy(&r->mu); grpc_subchannel_factory_unref(r->subchannel_factory); + grpc_workqueue_unref(r->workqueue); gpr_free(r->addrs); gpr_free(r->addrs_len); gpr_free(r->lb_policy_name); @@ -278,8 +280,7 @@ done: static void do_nothing(void *ignored) {} static grpc_resolver *sockaddr_create( - grpc_uri *uri, const char *lb_policy_name, - grpc_subchannel_factory *subchannel_factory, + grpc_resolver_args *args, const char *lb_policy_name, int parse(grpc_uri *uri, struct sockaddr_storage *dst, size_t *len)) { size_t i; int errors_found = 0; /* GPR_FALSE */ @@ -287,7 +288,7 @@ static grpc_resolver *sockaddr_create( gpr_slice path_slice; gpr_slice_buffer path_parts; - if (0 != strcmp(uri->authority, "")) { + if (0 != strcmp(args->uri->authority, "")) { gpr_log(GPR_ERROR, "authority based uri's not supported"); return NULL; } @@ -295,7 +296,8 @@ static grpc_resolver *sockaddr_create( r = gpr_malloc(sizeof(sockaddr_resolver)); memset(r, 0, sizeof(*r)); - path_slice = gpr_slice_new(uri->path, strlen(uri->path), do_nothing); + path_slice = + gpr_slice_new(args->uri->path, strlen(args->uri->path), do_nothing); gpr_slice_buffer_init(&path_parts); gpr_slice_split(path_slice, ",", &path_parts); @@ -304,7 +306,7 @@ static grpc_resolver *sockaddr_create( r->addrs_len = gpr_malloc(sizeof(*r->addrs_len) * r->num_addrs); for(i = 0; i < r->num_addrs; i++) { - grpc_uri ith_uri = *uri; + grpc_uri ith_uri = *args->uri; char* part_str = gpr_dump_slice(path_parts.slices[i], GPR_DUMP_ASCII); ith_uri.path = part_str; if (!parse(&ith_uri, &r->addrs[i], &r->addrs_len[i])) { @@ -324,10 +326,12 @@ static grpc_resolver *sockaddr_create( gpr_ref_init(&r->refs, 1); gpr_mu_init(&r->mu); grpc_resolver_init(&r->base, &sockaddr_resolver_vtable); - r->subchannel_factory = subchannel_factory; + r->subchannel_factory = args->subchannel_factory; + grpc_subchannel_factory_ref(r->subchannel_factory); + r->workqueue = args->workqueue; + grpc_workqueue_ref(r->workqueue); r->lb_policy_name = gpr_strdup(lb_policy_name); - grpc_subchannel_factory_ref(subchannel_factory); return &r->base; } @@ -341,10 +345,8 @@ 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_uri *uri, \ - grpc_subchannel_factory *subchannel_factory) { \ - return sockaddr_create(uri, "pick_first", \ - subchannel_factory, parse_##name); \ + grpc_resolver_factory *factory, grpc_resolver_args *args) { \ + return sockaddr_create(args, "pick_first", parse_##name); \ } \ static const grpc_resolver_factory_vtable name##_factory_vtable = { \ sockaddr_factory_ref, sockaddr_factory_unref, \ diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index ca52c75bebc..0718ffbb8c9 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -76,6 +76,7 @@ typedef struct waiting_for_connect { struct grpc_subchannel { grpc_connector *connector; + grpc_workqueue *workqueue; /** non-transport related channel filters */ const grpc_channel_filter **filters; @@ -575,7 +576,7 @@ static void publish_transport(grpc_subchannel *c) { connectivity_state_changed_locked(c, "connected"); while ((w4c = c->waiting)) { c->waiting = w4c->next; - grpc_iomgr_add_callback(&w4c->continuation); + grpc_workqueue_push(c->workqueue, &w4c->continuation, 1); } gpr_mu_unlock(&c->mu); diff --git a/src/core/iomgr/endpoint_pair.h b/src/core/iomgr/endpoint_pair.h index 095ec5fcc9f..25ef1891fb9 100644 --- a/src/core/iomgr/endpoint_pair.h +++ b/src/core/iomgr/endpoint_pair.h @@ -42,6 +42,7 @@ typedef struct { } grpc_endpoint_pair; grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name, - size_t read_slice_size); + size_t read_slice_size, + grpc_workqueue *workqueue); #endif /* GRPC_INTERNAL_CORE_IOMGR_ENDPOINT_PAIR_H */ diff --git a/src/core/iomgr/endpoint_pair_posix.c b/src/core/iomgr/endpoint_pair_posix.c index deae9c68757..dc1f441b4bf 100644 --- a/src/core/iomgr/endpoint_pair_posix.c +++ b/src/core/iomgr/endpoint_pair_posix.c @@ -59,19 +59,20 @@ static void create_sockets(int sv[2]) { } grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name, - size_t read_slice_size) { + size_t read_slice_size, + grpc_workqueue *workqueue) { int sv[2]; grpc_endpoint_pair p; char *final_name; create_sockets(sv); gpr_asprintf(&final_name, "%s:client", name); - p.client = grpc_tcp_create(grpc_fd_create(sv[1], final_name), read_slice_size, - "socketpair-server"); + p.client = grpc_tcp_create(grpc_fd_create(sv[1], workqueue, final_name), + read_slice_size, "socketpair-server"); gpr_free(final_name); gpr_asprintf(&final_name, "%s:server", name); - p.server = grpc_tcp_create(grpc_fd_create(sv[0], final_name), read_slice_size, - "socketpair-client"); + p.server = grpc_tcp_create(grpc_fd_create(sv[0], workqueue, final_name), + read_slice_size, "socketpair-client"); gpr_free(final_name); return p; } diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index 2d08a77a705..4bca9f3f6e3 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -71,6 +71,9 @@ static grpc_fd *fd_freelist = NULL; static gpr_mu fd_freelist_mu; static void freelist_fd(grpc_fd *fd) { + if (fd->workqueue->wakeup_read_fd != fd) { + grpc_workqueue_unref(fd->workqueue); + } gpr_mu_lock(&fd_freelist_mu); fd->freelist_next = fd_freelist; fd_freelist = fd; @@ -158,8 +161,14 @@ void grpc_fd_global_shutdown(void) { gpr_mu_destroy(&fd_freelist_mu); } -grpc_fd *grpc_fd_create(int fd, const char *name) { +grpc_fd *grpc_fd_create(int fd, grpc_workqueue *workqueue, const char *name) { grpc_fd *r = alloc_fd(fd); + r->workqueue = workqueue; + /* if the wakeup_read_fd is NULL, then the workqueue is under construction + ==> this fd will be the wakeup_read_fd, and we shouldn't take a ref */ + if (workqueue->wakeup_read_fd != NULL) { + grpc_workqueue_ref(workqueue); + } grpc_iomgr_register_object(&r->iomgr_object, name); return r; } @@ -220,7 +229,7 @@ void grpc_fd_orphan(grpc_fd *fd, grpc_iomgr_closure *on_done, fd->closed = 1; close(fd->fd); if (fd->on_done_closure) { - grpc_iomgr_add_callback(fd->on_done_closure); + grpc_workqueue_push(fd->workqueue, fd->on_done_closure, 1); } } else { wake_all_watchers_locked(fd); @@ -246,19 +255,19 @@ void grpc_fd_unref(grpc_fd *fd) { unref_by(fd, 2); } #endif static void process_callback(grpc_iomgr_closure *closure, int success, - int allow_synchronous_callback) { - if (allow_synchronous_callback) { + grpc_workqueue *optional_workqueue) { + if (optional_workqueue == NULL) { closure->cb(closure->cb_arg, success); } else { - grpc_iomgr_add_delayed_callback(closure, success); + grpc_workqueue_push(optional_workqueue, closure, success); } } static void process_callbacks(grpc_iomgr_closure *callbacks, size_t n, - int success, int allow_synchronous_callback) { + int success, grpc_workqueue *optional_workqueue) { size_t i; for (i = 0; i < n; i++) { - process_callback(callbacks + i, success, allow_synchronous_callback); + process_callback(callbacks + i, success, optional_workqueue); } } @@ -286,7 +295,7 @@ static void notify_on(grpc_fd *fd, gpr_atm *st, grpc_iomgr_closure *closure, GPR_ASSERT(gpr_atm_no_barrier_load(st) == READY); gpr_atm_rel_store(st, NOT_READY); process_callback(closure, !gpr_atm_acq_load(&fd->shutdown), - allow_synchronous_callback); + allow_synchronous_callback ? NULL : fd->workqueue); return; default: /* WAITING */ /* upcallptr was set to a different closure. This is an error! */ @@ -339,7 +348,8 @@ static void set_ready(grpc_fd *fd, gpr_atm *st, success = !gpr_atm_acq_load(&fd->shutdown); GPR_ASSERT(ncb <= 1); if (ncb > 0) { - process_callbacks(closure, ncb, success, allow_synchronous_callback); + process_callbacks(closure, ncb, success, + allow_synchronous_callback ? NULL : fd->workqueue); } } @@ -441,7 +451,7 @@ void grpc_fd_end_poll(grpc_fd_watcher *watcher, int got_read, int got_write) { fd->closed = 1; close(fd->fd); if (fd->on_done_closure != NULL) { - grpc_iomgr_add_callback(fd->on_done_closure); + grpc_workqueue_push(fd->workqueue, fd->on_done_closure, 1); } } gpr_mu_unlock(&fd->watcher_mu); diff --git a/src/core/iomgr/fd_posix.h b/src/core/iomgr/fd_posix.h index 835e9b339a2..e5157ad342b 100644 --- a/src/core/iomgr/fd_posix.h +++ b/src/core/iomgr/fd_posix.h @@ -36,6 +36,7 @@ #include "src/core/iomgr/iomgr_internal.h" #include "src/core/iomgr/pollset.h" +#include "src/core/iomgr/workqueue.h" #include #include #include @@ -57,6 +58,7 @@ struct grpc_fd { meaning that mostly we ref by two to avoid altering the orphaned bit, and just unref by 1 when we're ready to flag the object as orphaned */ gpr_atm refst; + grpc_workqueue *workqueue; gpr_mu set_state_mu; gpr_atm shutdown; @@ -103,7 +105,7 @@ struct grpc_fd { /* Create a wrapped file descriptor. Requires fd is a non-blocking file descriptor. This takes ownership of closing fd. */ -grpc_fd *grpc_fd_create(int fd, const char *name); +grpc_fd *grpc_fd_create(int fd, grpc_workqueue *workqueue, const char *name); /* Releases fd to be asynchronously destroyed. on_done is called when the underlying file descriptor is definitely close()d. diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index cf74a16c0c8..66d7e9b1103 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -57,7 +57,6 @@ void grpc_kick_poller(void) { } void grpc_iomgr_init(void) { - gpr_thd_id id; g_shutdown = 0; gpr_mu_init(&g_mu); gpr_cv_init(&g_rcv); @@ -65,8 +64,6 @@ void grpc_iomgr_init(void) { g_root_object.next = g_root_object.prev = &g_root_object; g_root_object.name = "root"; grpc_iomgr_platform_init(); - gpr_event_init(&g_background_callback_executor_done); - gpr_thd_new(&id, background_callback_executor, NULL, NULL); } static size_t count_objects(void) { @@ -86,58 +83,36 @@ static void dump_objects(const char *kind) { } void grpc_iomgr_shutdown(void) { - grpc_iomgr_closure *closure; 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); gpr_mu_lock(&g_mu); g_shutdown = 1; - while (g_cbs_head != NULL || g_root_object.next != &g_root_object) { + 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_cbs_head != NULL && g_root_object.next != &g_root_object) { - gpr_log(GPR_DEBUG, - "Waiting for %d iomgr objects to be destroyed and executing " - "final callbacks", - count_objects()); - } else if (g_cbs_head != NULL) { - gpr_log(GPR_DEBUG, "Executing final iomgr callbacks"); - } else { + if (g_root_object.next != &g_root_object) { gpr_log(GPR_DEBUG, "Waiting for %d iomgr objects to be destroyed", count_objects()); } last_warning_time = gpr_now(GPR_CLOCK_REALTIME); } - if (g_cbs_head) { - do { - closure = g_cbs_head; - g_cbs_head = closure->next; - if (!g_cbs_head) g_cbs_tail = NULL; - gpr_mu_unlock(&g_mu); - - closure->cb(closure->cb_arg, 0); - gpr_mu_lock(&g_mu); - } while (g_cbs_head); - continue; - } if (grpc_alarm_check(&g_mu, gpr_inf_future(GPR_CLOCK_MONOTONIC), NULL)) { continue; } if (g_root_object.next != &g_root_object) { int timeout = 0; - while (g_cbs_head == NULL) { - gpr_timespec short_deadline = gpr_time_add( + 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) && g_cbs_head == NULL) { - if (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), shutdown_deadline) > 0) { - timeout = 1; - break; - } + if (gpr_cv_wait(&g_rcv, &g_mu, short_deadline)) { + if (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), shutdown_deadline) > 0) { + timeout = 1; + break; } } - if (timeout) { + if (timeout && g_root_object.next != &g_root_object) { gpr_log(GPR_DEBUG, "Failed to free %d iomgr objects before shutdown deadline: " "memory leaks are likely", @@ -149,10 +124,6 @@ void grpc_iomgr_shutdown(void) { } gpr_mu_unlock(&g_mu); - grpc_kick_poller(); - gpr_event_wait(&g_background_callback_executor_done, - gpr_inf_future(GPR_CLOCK_REALTIME)); - grpc_alarm_list_shutdown(); grpc_iomgr_platform_shutdown(); @@ -184,67 +155,3 @@ void grpc_iomgr_closure_init(grpc_iomgr_closure *closure, grpc_iomgr_cb_func cb, closure->cb_arg = cb_arg; closure->next = NULL; } - -static void assert_not_scheduled_locked(grpc_iomgr_closure *closure) { -#ifndef NDEBUG - grpc_iomgr_closure *c; - - for (c = g_cbs_head; c; c = c->next) { - GPR_ASSERT(c != closure); - } -#endif -} - -void grpc_iomgr_add_delayed_callback(grpc_iomgr_closure *closure, int success) { - closure->success = success; - GPR_ASSERT(closure->cb); - gpr_mu_lock(&g_mu); - assert_not_scheduled_locked(closure); - closure->next = NULL; - if (!g_cbs_tail) { - g_cbs_head = g_cbs_tail = closure; - } else { - g_cbs_tail->next = closure; - g_cbs_tail = closure; - } - if (g_shutdown) { - gpr_cv_signal(&g_rcv); - } - gpr_mu_unlock(&g_mu); -} - -void grpc_iomgr_add_callback(grpc_iomgr_closure *closure) { - grpc_iomgr_add_delayed_callback(closure, 1 /* GPR_TRUE */); -} - -int grpc_maybe_call_delayed_callbacks(gpr_mu *drop_mu, int success) { - int n = 0; - gpr_mu *retake_mu = NULL; - grpc_iomgr_closure *closure; - for (;;) { - /* check for new work */ - if (!gpr_mu_trylock(&g_mu)) { - break; - } - closure = g_cbs_head; - if (!closure) { - gpr_mu_unlock(&g_mu); - break; - } - g_cbs_head = closure->next; - if (!g_cbs_head) g_cbs_tail = NULL; - gpr_mu_unlock(&g_mu); - /* if we have a mutex to drop, do so before executing work */ - if (drop_mu) { - gpr_mu_unlock(drop_mu); - retake_mu = drop_mu; - drop_mu = NULL; - } - closure->cb(closure->cb_arg, success && closure->success); - n++; - } - if (retake_mu) { - gpr_mu_lock(retake_mu); - } - return n; -} diff --git a/src/core/iomgr/pollset_multipoller_with_epoll.c b/src/core/iomgr/pollset_multipoller_with_epoll.c index 8f62ce2954b..971b7b4a01e 100644 --- a/src/core/iomgr/pollset_multipoller_with_epoll.c +++ b/src/core/iomgr/pollset_multipoller_with_epoll.c @@ -127,7 +127,7 @@ static void multipoll_with_epoll_pollset_add_fd(grpc_pollset *pollset, GRPC_FD_REF(fd, "delayed_add"); grpc_iomgr_closure_init(&da->closure, perform_delayed_add, da); pollset->in_flight_cbs++; - grpc_iomgr_add_callback(&da->closure); + grpc_workqueue_push(fd->workqueue, &da->closure, 1); } } diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index b98b40b2220..ad9c862d6ec 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -293,7 +293,7 @@ static void basic_do_promote(void *args, int success) { /* First we need to ensure that nobody is polling concurrently */ if (grpc_pollset_has_workers(pollset)) { grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); - grpc_iomgr_add_callback(&up_args->promotion_closure); + grpc_workqueue_push(fd->workqueue, &up_args->promotion_closure, 1); gpr_mu_unlock(&pollset->mu); return; } @@ -385,7 +385,7 @@ static void basic_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, up_args->original_vtable = pollset->vtable; up_args->promotion_closure.cb = basic_do_promote; up_args->promotion_closure.cb_arg = up_args; - grpc_iomgr_add_callback(&up_args->promotion_closure); + grpc_workqueue_push(fd->workqueue, &up_args->promotion_closure, 1); grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); diff --git a/src/core/iomgr/tcp_client.h b/src/core/iomgr/tcp_client.h index 12296bd55b8..57f80016c2c 100644 --- a/src/core/iomgr/tcp_client.h +++ b/src/core/iomgr/tcp_client.h @@ -46,6 +46,7 @@ in this connection being established (in order to continue their work) */ void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *tcp), void *arg, grpc_pollset_set *interested_parties, + grpc_workqueue *workqueue, const struct sockaddr *addr, size_t addr_len, gpr_timespec deadline); diff --git a/src/core/iomgr/workqueue_posix.c b/src/core/iomgr/workqueue_posix.c index df4e0aca753..ef1598c711e 100644 --- a/src/core/iomgr/workqueue_posix.c +++ b/src/core/iomgr/workqueue_posix.c @@ -41,21 +41,6 @@ #include -#include "src/core/iomgr/fd_posix.h" - -struct grpc_workqueue { - gpr_refcount refs; - - gpr_mu mu; - grpc_iomgr_closure head; - grpc_iomgr_closure *tail; - - grpc_wakeup_fd wakeup_fd; - grpc_fd *wakeup_read_fd; - - grpc_iomgr_closure read_closure; -}; - static void on_readable(void *arg, int success); grpc_workqueue *grpc_workqueue_create(void) { diff --git a/src/core/iomgr/workqueue_posix.h b/src/core/iomgr/workqueue_posix.h index ba455522ffe..1b3a0e281b3 100644 --- a/src/core/iomgr/workqueue_posix.h +++ b/src/core/iomgr/workqueue_posix.h @@ -34,4 +34,19 @@ #ifndef GRPC_INTERNAL_CORE_IOMGR_WORKQUEUE_POSIX_H #define GRPC_INTERNAL_CORE_IOMGR_WORKQUEUE_POSIX_H +struct grpc_fd; + +struct grpc_workqueue { + gpr_refcount refs; + + gpr_mu mu; + grpc_iomgr_closure head; + grpc_iomgr_closure *tail; + + grpc_wakeup_fd wakeup_fd; + struct grpc_fd *wakeup_read_fd; + + grpc_iomgr_closure read_closure; +}; + #endif /* GRPC_INTERNAL_CORE_IOMGR_WORKQUEUE_POSIX_H */ diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 06ffa8dd6e2..d1412604216 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -57,6 +57,7 @@ typedef struct { gpr_refcount refs; grpc_channel_security_connector *security_connector; + grpc_workqueue *workqueue; grpc_iomgr_closure *notify; grpc_connect_in_args args; @@ -71,6 +72,7 @@ static void connector_ref(grpc_connector *con) { static void connector_unref(grpc_connector *con) { connector *c = (connector *)con; if (gpr_unref(&c->refs)) { + grpc_workqueue_unref(c->workqueue); gpr_free(c); } } @@ -122,8 +124,8 @@ static void connector_connect(grpc_connector *con, c->notify = notify; c->args = *args; c->result = result; - grpc_tcp_client_connect(connected, c, args->interested_parties, args->addr, - args->addr_len, args->deadline); + grpc_tcp_client_connect(connected, c, args->interested_parties, c->workqueue, + args->addr, args->addr_len, args->deadline); } static const grpc_connector_vtable connector_vtable = { @@ -165,6 +167,8 @@ static grpc_subchannel *subchannel_factory_create_subchannel( memset(c, 0, sizeof(*c)); c->base.vtable = &connector_vtable; c->security_connector = f->security_connector; + c->workqueue = grpc_channel_get_workqueue(f->master); + grpc_workqueue_ref(c->workqueue); gpr_ref_init(&c->refs, 1); args->mdctx = f->mdctx; args->args = final_args; @@ -240,7 +244,8 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, f->merge_args = grpc_channel_args_copy(args_copy); f->master = channel; GRPC_CHANNEL_INTERNAL_REF(channel, "subchannel_factory"); - resolver = grpc_resolver_create(target, &f->base); + resolver = grpc_resolver_create(target, &f->base, + grpc_channel_get_workqueue(channel)); if (!resolver) { return NULL; } From 47a708e252c8f56091c11e63eadba51a995ca7c8 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 15 Sep 2015 16:16:06 -0700 Subject: [PATCH 04/56] Core compiles with workqueues --- src/core/channel/client_channel.c | 5 +- src/core/client_config/connector.h | 2 + .../client_config/lb_policies/pick_first.c | 4 +- .../resolvers/zookeeper_resolver.c | 34 +++++---- src/core/client_config/subchannel.c | 7 +- src/core/httpcli/httpcli.c | 73 +++++++++---------- src/core/iomgr/tcp_client_posix.c | 3 +- src/core/iomgr/tcp_posix.c | 2 +- src/core/iomgr/tcp_server_posix.c | 9 ++- src/core/iomgr/udp_server.c | 6 +- src/core/iomgr/workqueue_posix.c | 6 +- src/core/security/server_secure_chttp2.c | 11 ++- src/core/surface/call.c | 3 +- src/core/surface/channel.c | 7 +- src/core/surface/channel.h | 3 +- src/core/surface/channel_connectivity.c | 3 +- src/core/surface/channel_create.c | 17 +++-- src/core/surface/lame_client.c | 3 +- src/core/surface/secure_channel_create.c | 21 +++--- src/core/surface/server.c | 31 +++++--- src/core/surface/server.h | 1 + src/core/surface/server_chttp2.c | 9 ++- src/core/transport/chttp2/frame_ping.c | 4 +- src/core/transport/chttp2_transport.c | 10 +-- src/core/transport/chttp2_transport.h | 3 +- src/core/transport/connectivity_state.c | 15 ++-- src/core/transport/connectivity_state.h | 4 + test/core/bad_client/bad_client.c | 5 +- 28 files changed, 178 insertions(+), 123 deletions(-) diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 2624fcdd538..6fefdec2f64 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -670,8 +670,9 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, grpc_iomgr_closure_init(&chand->on_config_changed, cc_on_config_changed, chand); - grpc_connectivity_state_init(&chand->state_tracker, GRPC_CHANNEL_IDLE, - "client_channel"); + grpc_connectivity_state_init(&chand->state_tracker, + grpc_channel_get_workqueue(master), + GRPC_CHANNEL_IDLE, "client_channel"); } /* Destructor for channel_data */ diff --git a/src/core/client_config/connector.h b/src/core/client_config/connector.h index 39f34679901..bdaeda86aee 100644 --- a/src/core/client_config/connector.h +++ b/src/core/client_config/connector.h @@ -57,6 +57,8 @@ typedef struct { const grpc_channel_args *channel_args; /** metadata context */ grpc_mdctx *metadata_context; + /** workqueue */ + grpc_workqueue *workqueue; } grpc_connect_in_args; typedef struct { diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index 151b6f12f88..06186403e53 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -332,8 +332,8 @@ static grpc_lb_policy *create_pick_first(grpc_lb_policy_factory *factory, p->num_subchannels = args->num_subchannels; p->workqueue = args->workqueue; grpc_workqueue_ref(p->workqueue); - grpc_connectivity_state_init(&p->state_tracker, GRPC_CHANNEL_IDLE, - "pick_first"); + grpc_connectivity_state_init(&p->state_tracker, args->workqueue, + GRPC_CHANNEL_IDLE, "pick_first"); memcpy(p->subchannels, args->subchannels, sizeof(grpc_subchannel *) * args->num_subchannels); grpc_iomgr_closure_init(&p->connectivity_changed, pf_connectivity_changed, p); diff --git a/src/core/client_config/resolvers/zookeeper_resolver.c b/src/core/client_config/resolvers/zookeeper_resolver.c index 2594e6fae95..bc042037448 100644 --- a/src/core/client_config/resolvers/zookeeper_resolver.c +++ b/src/core/client_config/resolvers/zookeeper_resolver.c @@ -61,6 +61,8 @@ typedef struct { grpc_subchannel_factory *subchannel_factory; /** load balancing policy name */ char *lb_policy_name; + /** work queue */ + grpc_workqueue *workqueue; /** mutex guarding the rest of the state */ gpr_mu mu; @@ -108,7 +110,7 @@ static void zookeeper_shutdown(grpc_resolver *resolver) { gpr_mu_lock(&r->mu); if (r->next_completion != NULL) { *r->target_config = NULL; - grpc_iomgr_add_callback(r->next_completion); + grpc_workqueue_push(r->workqueue, r->next_completion, 1); r->next_completion = NULL; } zookeeper_close(r->zookeeper_handle); @@ -409,7 +411,7 @@ static void zookeeper_maybe_finish_next_locked(zookeeper_resolver *r) { if (r->resolved_config != NULL) { grpc_client_config_ref(r->resolved_config); } - grpc_iomgr_add_callback(r->next_completion); + grpc_workqueue_push(r->workqueue, r->next_completion, 1); r->next_completion = NULL; r->published_version = r->resolved_version; } @@ -422,19 +424,19 @@ static void zookeeper_destroy(grpc_resolver *gr) { grpc_client_config_unref(r->resolved_config); } grpc_subchannel_factory_unref(r->subchannel_factory); + grpc_workqueue_unref(r->workqueue); gpr_free(r->name); gpr_free(r->lb_policy_name); gpr_free(r); } -static grpc_resolver *zookeeper_create( - grpc_uri *uri, const char *lb_policy_name, - grpc_subchannel_factory *subchannel_factory) { +static grpc_resolver *zookeeper_create(grpc_resolver_args *args, + const char *lb_policy_name) { zookeeper_resolver *r; size_t length; - char *path = uri->path; + char *path = args->uri->path; - if (0 == strcmp(uri->authority, "")) { + if (0 == strcmp(args->uri->authority, "")) { gpr_log(GPR_ERROR, "No authority specified in zookeeper uri"); return NULL; } @@ -452,14 +454,19 @@ static grpc_resolver *zookeeper_create( grpc_resolver_init(&r->base, &zookeeper_resolver_vtable); r->name = gpr_strdup(path); - r->subchannel_factory = subchannel_factory; + r->workqueue = args->workqueue; + grpc_workqueue_ref(r->workqueue); + + r->subchannel_factory = args->subchannel_factory; + grpc_subchannel_factory_ref(r->subchannel_factory); + r->lb_policy_name = gpr_strdup(lb_policy_name); - grpc_subchannel_factory_ref(subchannel_factory); /** Initializes zookeeper client */ zoo_set_debug_level(ZOO_LOG_LEVEL_WARN); - r->zookeeper_handle = zookeeper_init(uri->authority, zookeeper_global_watcher, - GRPC_ZOOKEEPER_SESSION_TIMEOUT, 0, 0, 0); + r->zookeeper_handle = + zookeeper_init(args->uri->authority, zookeeper_global_watcher, + GRPC_ZOOKEEPER_SESSION_TIMEOUT, 0, 0, 0); if (r->zookeeper_handle == NULL) { gpr_log(GPR_ERROR, "Unable to connect to zookeeper server"); return NULL; @@ -490,9 +497,8 @@ static char *zookeeper_factory_get_default_hostname( } static grpc_resolver *zookeeper_factory_create_resolver( - grpc_resolver_factory *factory, grpc_uri *uri, - grpc_subchannel_factory *subchannel_factory) { - return zookeeper_create(uri, "pick_first", subchannel_factory); + grpc_resolver_factory *factory, grpc_resolver_args *args) { + return zookeeper_create(args, "pick_first"); } static const grpc_resolver_factory_vtable zookeeper_factory_vtable = { diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index 0718ffbb8c9..82212d2c6b4 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -260,6 +260,7 @@ static void subchannel_destroy(grpc_subchannel *c) { grpc_mdctx_unref(c->mdctx); grpc_connectivity_state_destroy(&c->state_tracker); grpc_connector_unref(c->connector); + grpc_workqueue_unref(c->workqueue); gpr_free(c); } @@ -296,12 +297,14 @@ grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, c->args = grpc_channel_args_copy(args->args); c->mdctx = args->mdctx; c->master = args->master; + c->workqueue = grpc_channel_get_workqueue(c->master); + grpc_workqueue_ref(c->workqueue); c->pollset_set = grpc_client_channel_get_connecting_pollset_set(parent_elem); c->random = random_seed(); grpc_mdctx_ref(c->mdctx); grpc_iomgr_closure_init(&c->connected, subchannel_connected, c); - grpc_connectivity_state_init(&c->state_tracker, GRPC_CHANNEL_IDLE, - "subchannel"); + grpc_connectivity_state_init(&c->state_tracker, c->workqueue, + GRPC_CHANNEL_IDLE, "subchannel"); gpr_mu_init(&c->mu); return c; } diff --git a/src/core/httpcli/httpcli.c b/src/core/httpcli/httpcli.c index 1e38479eb16..4bfe3cf9738 100644 --- a/src/core/httpcli/httpcli.c +++ b/src/core/httpcli/httpcli.c @@ -65,6 +65,7 @@ typedef struct { gpr_slice_buffer outgoing; grpc_iomgr_closure on_read; grpc_iomgr_closure done_write; + grpc_workqueue *workqueue; } internal_request; static grpc_httpcli_get_override g_get_override = NULL; @@ -105,6 +106,7 @@ static void finish(internal_request *req, int success) { grpc_iomgr_unregister_object(&req->iomgr_obj); gpr_slice_buffer_destroy(&req->incoming); gpr_slice_buffer_destroy(&req->outgoing); + grpc_workqueue_unref(req->workqueue); gpr_free(req); } @@ -202,8 +204,8 @@ static void next_address(internal_request *req) { } addr = &req->addresses->addrs[req->next_address++]; grpc_tcp_client_connect(on_connected, req, &req->context->pollset_set, - (struct sockaddr *)&addr->addr, addr->len, - req->deadline); + req->workqueue, (struct sockaddr *)&addr->addr, + addr->len, req->deadline); } static void on_resolved(void *arg, grpc_resolved_addresses *addresses) { @@ -217,19 +219,16 @@ static void on_resolved(void *arg, grpc_resolved_addresses *addresses) { next_address(req); } -void grpc_httpcli_get(grpc_httpcli_context *context, grpc_pollset *pollset, - const grpc_httpcli_request *request, - gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data) { - internal_request *req; - char *name; - if (g_get_override && - g_get_override(request, deadline, on_response, user_data)) { - return; - } - req = gpr_malloc(sizeof(internal_request)); +static void internal_request_begin(grpc_httpcli_context *context, + grpc_pollset *pollset, + const grpc_httpcli_request *request, + gpr_timespec deadline, + grpc_httpcli_response_cb on_response, + void *user_data, const char *name, + gpr_slice request_text) { + internal_request *req = gpr_malloc(sizeof(internal_request)); memset(req, 0, sizeof(*req)); - req->request_text = grpc_httpcli_format_get_request(request); + req->request_text = request_text; grpc_httpcli_parser_init(&req->parser); req->on_response = on_response; req->user_data = user_data; @@ -242,51 +241,47 @@ void grpc_httpcli_get(grpc_httpcli_context *context, grpc_pollset *pollset, grpc_iomgr_closure_init(&req->done_write, done_write, req); gpr_slice_buffer_init(&req->incoming); gpr_slice_buffer_init(&req->outgoing); - gpr_asprintf(&name, "HTTP:GET:%s:%s", request->host, request->path); grpc_iomgr_register_object(&req->iomgr_obj, name); - gpr_free(name); req->host = gpr_strdup(request->host); + req->workqueue = grpc_workqueue_create(); + grpc_workqueue_add_to_pollset(req->workqueue, pollset); grpc_pollset_set_add_pollset(&req->context->pollset_set, req->pollset); grpc_resolve_address(request->host, req->handshaker->default_port, on_resolved, req); } +void grpc_httpcli_get(grpc_httpcli_context *context, grpc_pollset *pollset, + const grpc_httpcli_request *request, + gpr_timespec deadline, + grpc_httpcli_response_cb on_response, void *user_data) { + char *name; + if (g_get_override && + g_get_override(request, deadline, on_response, user_data)) { + return; + } + gpr_asprintf(&name, "HTTP:GET:%s:%s", request->host, request->path); + internal_request_begin(context, pollset, request, deadline, on_response, + user_data, name, + grpc_httpcli_format_get_request(request)); + gpr_free(name); +} + void grpc_httpcli_post(grpc_httpcli_context *context, grpc_pollset *pollset, const grpc_httpcli_request *request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { - internal_request *req; char *name; if (g_post_override && g_post_override(request, body_bytes, body_size, deadline, on_response, user_data)) { return; } - req = gpr_malloc(sizeof(internal_request)); - memset(req, 0, sizeof(*req)); - req->request_text = - grpc_httpcli_format_post_request(request, body_bytes, body_size); - grpc_httpcli_parser_init(&req->parser); - req->on_response = on_response; - req->user_data = user_data; - req->deadline = deadline; - req->handshaker = - request->handshaker ? request->handshaker : &grpc_httpcli_plaintext; - req->context = context; - req->pollset = pollset; - grpc_iomgr_closure_init(&req->on_read, on_read, req); - grpc_iomgr_closure_init(&req->done_write, done_write, req); - gpr_slice_buffer_init(&req->incoming); - gpr_slice_buffer_init(&req->outgoing); gpr_asprintf(&name, "HTTP:POST:%s:%s", request->host, request->path); - grpc_iomgr_register_object(&req->iomgr_obj, name); + internal_request_begin( + context, pollset, request, deadline, on_response, user_data, name, + grpc_httpcli_format_post_request(request, body_bytes, body_size)); gpr_free(name); - req->host = gpr_strdup(request->host); - - grpc_pollset_set_add_pollset(&req->context->pollset_set, req->pollset); - grpc_resolve_address(request->host, req->handshaker->default_port, - on_resolved, req); } void grpc_httpcli_set_override(grpc_httpcli_get_override get, diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c index c3668f6a920..8b1a3b0f9e3 100644 --- a/src/core/iomgr/tcp_client_posix.c +++ b/src/core/iomgr/tcp_client_posix.c @@ -195,6 +195,7 @@ finish: void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *ep), void *arg, grpc_pollset_set *interested_parties, + grpc_workqueue *workqueue, const struct sockaddr *addr, size_t addr_len, gpr_timespec deadline) { int fd; @@ -236,7 +237,7 @@ void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *ep), addr_str = grpc_sockaddr_to_uri(addr); gpr_asprintf(&name, "tcp-client:%s", addr_str); - fdobj = grpc_fd_create(fd, name); + fdobj = grpc_fd_create(fd, workqueue, name); if (err >= 0) { cb(arg, grpc_tcp_create(fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str)); diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c index 68f469c3681..c539cf2d348 100644 --- a/src/core/iomgr/tcp_posix.c +++ b/src/core/iomgr/tcp_posix.c @@ -261,7 +261,7 @@ static grpc_endpoint_op_status tcp_read(grpc_endpoint *ep, tcp->finished_edge = 0; grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_closure); } else { - grpc_iomgr_add_delayed_callback(&tcp->read_closure, 1); + grpc_workqueue_push(tcp->em_fd->workqueue, &tcp->read_closure, 1); } /* TODO(ctiller): immediate return */ return GRPC_ENDPOINT_PENDING; diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c index bcbd0afe6b9..02d37350f75 100644 --- a/src/core/iomgr/tcp_server_posix.c +++ b/src/core/iomgr/tcp_server_posix.c @@ -124,6 +124,9 @@ struct grpc_tcp_server { grpc_pollset **pollsets; /* number of pollsets in the pollsets array */ size_t pollset_count; + + /** workqueue for interally created async work */ + grpc_workqueue *workqueue; }; grpc_tcp_server *grpc_tcp_server_create(void) { @@ -137,6 +140,7 @@ grpc_tcp_server *grpc_tcp_server_create(void) { s->ports = gpr_malloc(sizeof(server_port) * INIT_PORT_CAP); s->nports = 0; s->port_capacity = INIT_PORT_CAP; + s->workqueue = grpc_workqueue_create(); return s; } @@ -147,6 +151,7 @@ static void finish_shutdown(grpc_tcp_server *s) { gpr_mu_destroy(&s->mu); gpr_free(s->ports); + grpc_workqueue_unref(s->workqueue); gpr_free(s); } @@ -339,7 +344,7 @@ static void on_read(void *arg, int success) { addr_str = grpc_sockaddr_to_uri((struct sockaddr *)&addr); gpr_asprintf(&name, "tcp-server-connection:%s", addr_str); - fdobj = grpc_fd_create(fd, name); + fdobj = grpc_fd_create(fd, sp->server->workqueue, name); /* TODO(ctiller): revise this when we have server-side sharding of channels -- we certainly should not be automatically adding every incoming channel to every pollset owned by the server */ @@ -387,7 +392,7 @@ static int add_socket_to_server(grpc_tcp_server *s, int fd, sp = &s->ports[s->nports++]; sp->server = s; sp->fd = fd; - sp->emfd = grpc_fd_create(fd, name); + sp->emfd = grpc_fd_create(fd, s->workqueue, name); memcpy(sp->addr.untyped, addr, addr_len); sp->addr_len = addr_len; GPR_ASSERT(sp->emfd); diff --git a/src/core/iomgr/udp_server.c b/src/core/iomgr/udp_server.c index ed9eee8726b..d4e8e99bce1 100644 --- a/src/core/iomgr/udp_server.c +++ b/src/core/iomgr/udp_server.c @@ -121,6 +121,8 @@ struct grpc_udp_server { grpc_pollset **pollsets; /* number of pollsets in the pollsets array */ size_t pollset_count; + + grpc_workqueue *workqueue; }; grpc_udp_server *grpc_udp_server_create(void) { @@ -135,6 +137,7 @@ grpc_udp_server *grpc_udp_server_create(void) { s->ports = gpr_malloc(sizeof(server_port) * INIT_PORT_CAP); s->nports = 0; s->port_capacity = INIT_PORT_CAP; + s->workqueue = grpc_workqueue_create(); return s; } @@ -146,6 +149,7 @@ static void finish_shutdown(grpc_udp_server *s) { gpr_cv_destroy(&s->cv); gpr_free(s->ports); + grpc_workqueue_unref(s->workqueue); gpr_free(s); } @@ -310,7 +314,7 @@ static int add_socket_to_server(grpc_udp_server *s, int fd, sp = &s->ports[s->nports++]; sp->server = s; sp->fd = fd; - sp->emfd = grpc_fd_create(fd, name); + sp->emfd = grpc_fd_create(fd, s->workqueue, name); memcpy(sp->addr.untyped, addr, addr_len); sp->addr_len = addr_len; sp->read_cb = read_cb; diff --git a/src/core/iomgr/workqueue_posix.c b/src/core/iomgr/workqueue_posix.c index ef1598c711e..26626bef3bc 100644 --- a/src/core/iomgr/workqueue_posix.c +++ b/src/core/iomgr/workqueue_posix.c @@ -35,6 +35,7 @@ #ifdef GPR_POSIX_SOCKET +#include "src/core/iomgr/fd_posix.h" #include "src/core/iomgr/workqueue.h" #include @@ -52,8 +53,9 @@ grpc_workqueue *grpc_workqueue_create(void) { workqueue->tail = &workqueue->head; grpc_wakeup_fd_init(&workqueue->wakeup_fd); sprintf(name, "workqueue:%p", (void *)workqueue); - workqueue->wakeup_read_fd = - grpc_fd_create(GRPC_WAKEUP_FD_GET_READ_FD(&workqueue->wakeup_fd), name); + workqueue->wakeup_read_fd = NULL; /* inspected during grpc_fd_create below */ + workqueue->wakeup_read_fd = grpc_fd_create( + GRPC_WAKEUP_FD_GET_READ_FD(&workqueue->wakeup_fd), workqueue, name); grpc_iomgr_closure_init(&workqueue->read_closure, on_readable, workqueue); grpc_fd_notify_on_read(workqueue->wakeup_read_fd, &workqueue->read_closure); return workqueue; diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index 4749f5f5165..a6f50712f54 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -85,7 +85,7 @@ static void state_unref(grpc_server_secure_state *state) { } static void setup_transport(void *statep, grpc_transport *transport, - grpc_mdctx *mdctx) { + grpc_mdctx *mdctx, grpc_workqueue *workqueue) { static grpc_channel_filter const *extra_filters[] = { &grpc_server_auth_filter, &grpc_http_server_filter}; grpc_server_secure_state *state = statep; @@ -98,7 +98,8 @@ static void setup_transport(void *statep, grpc_transport *transport, grpc_server_get_channel_args(state->server), args_to_add, GPR_ARRAY_SIZE(args_to_add)); grpc_server_setup_transport(state->server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, args_copy); + GPR_ARRAY_SIZE(extra_filters), mdctx, workqueue, + args_copy); grpc_channel_args_destroy(args_copy); } @@ -130,15 +131,17 @@ static void on_secure_transport_setup_done(void *statep, grpc_server_secure_state *state = statep; grpc_transport *transport; grpc_mdctx *mdctx; + grpc_workqueue *workqueue; if (status == GRPC_SECURITY_OK) { gpr_mu_lock(&state->mu); remove_tcp_from_list_locked(state, wrapped_endpoint); if (!state->is_shutdown) { mdctx = grpc_mdctx_create(); + workqueue = grpc_workqueue_create(); transport = grpc_create_chttp2_transport( grpc_server_get_channel_args(state->server), secure_endpoint, mdctx, - 0); - setup_transport(state, transport, mdctx); + workqueue, 0); + setup_transport(state, transport, mdctx, workqueue); grpc_chttp2_transport_start_reading(transport, NULL, 0); } else { /* We need to consume this here, because the server may already have gone diff --git a/src/core/surface/call.c b/src/core/surface/call.c index 4168c2ef0cc..c2b30403191 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -499,7 +499,8 @@ void grpc_call_internal_unref(grpc_call *c, int allow_immediate_deletion) { } else { c->destroy_closure.cb = destroy_call; c->destroy_closure.cb_arg = c; - grpc_iomgr_add_callback(&c->destroy_closure); + grpc_workqueue_push(grpc_channel_get_workqueue(c->channel), + &c->destroy_closure, 1); } } } diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index a89523b3ab6..bf4aee190fd 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -79,6 +79,7 @@ struct grpc_channel { registered_call *registered_calls; grpc_iomgr_closure destroy_closure; char *target; + grpc_workqueue *workqueue; }; #define CHANNEL_STACK_FROM_CHANNEL(c) ((grpc_channel_stack *)((c) + 1)) @@ -92,7 +93,8 @@ struct grpc_channel { grpc_channel *grpc_channel_create_from_filters( const char *target, const grpc_channel_filter **filters, size_t num_filters, - const grpc_channel_args *args, grpc_mdctx *mdctx, int is_client) { + const grpc_channel_args *args, grpc_mdctx *mdctx, grpc_workqueue *workqueue, + int is_client) { size_t i; size_t size = sizeof(grpc_channel) + grpc_channel_stack_size(filters, num_filters); @@ -104,6 +106,7 @@ grpc_channel *grpc_channel_create_from_filters( /* decremented by grpc_channel_destroy */ gpr_ref_init(&channel->refs, 1); channel->metadata_context = mdctx; + channel->workqueue = workqueue; channel->grpc_status_string = grpc_mdstr_from_string(mdctx, "grpc-status", 0); channel->grpc_compression_algorithm_string = grpc_mdstr_from_string(mdctx, "grpc-encoding", 0); @@ -311,7 +314,7 @@ void grpc_channel_internal_unref(grpc_channel *channel) { if (gpr_unref(&channel->refs)) { channel->destroy_closure.cb = destroy_channel; channel->destroy_closure.cb_arg = channel; - grpc_iomgr_add_callback(&channel->destroy_closure); + grpc_workqueue_push(channel->workqueue, &channel->destroy_closure, 1); } } diff --git a/src/core/surface/channel.h b/src/core/surface/channel.h index 593faec7df8..9fc821d64b2 100644 --- a/src/core/surface/channel.h +++ b/src/core/surface/channel.h @@ -40,7 +40,8 @@ grpc_channel *grpc_channel_create_from_filters( const char *target, const grpc_channel_filter **filters, size_t count, - const grpc_channel_args *args, grpc_mdctx *mdctx, int is_client); + const grpc_channel_args *args, grpc_mdctx *mdctx, grpc_workqueue *workqueue, + int is_client); /** Get a (borrowed) pointer to this channels underlying channel stack */ grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel); diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index 88a7c165985..12b15f353f4 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -176,7 +176,8 @@ void grpc_channel_watch_connectivity_state( "grpc_channel_watch_connectivity_state called on something that is " "not a client channel, but '%s'", client_channel_elem->filter->name); - grpc_iomgr_add_delayed_callback(&w->on_complete, 1); + grpc_workqueue_push(grpc_channel_get_workqueue(channel), &w->on_complete, + 1); } else { GRPC_CHANNEL_INTERNAL_REF(channel, "watch_connectivity"); grpc_client_channel_add_interested_party(client_channel_elem, diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index 9e2cf1cf66e..7a4ec00abb7 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -74,7 +74,8 @@ static void connected(void *arg, grpc_endpoint *tcp) { grpc_iomgr_closure *notify; if (tcp != NULL) { c->result->transport = grpc_create_chttp2_transport( - c->args.channel_args, tcp, c->args.metadata_context, 1); + c->args.channel_args, tcp, c->args.metadata_context, c->args.workqueue, + 1); grpc_chttp2_transport_start_reading(c->result->transport, NULL, 0); GPR_ASSERT(c->result->transport); c->result->filters = gpr_malloc(sizeof(grpc_channel_filter *)); @@ -85,7 +86,7 @@ static void connected(void *arg, grpc_endpoint *tcp) { } notify = c->notify; c->notify = NULL; - grpc_iomgr_add_callback(notify); + notify->cb(notify->cb_arg, 1); } static void connector_connect(grpc_connector *con, @@ -98,8 +99,9 @@ static void connector_connect(grpc_connector *con, c->notify = notify; c->args = *args; c->result = result; - grpc_tcp_client_connect(connected, c, args->interested_parties, args->addr, - args->addr_len, args->deadline); + grpc_tcp_client_connect(connected, c, args->interested_parties, + args->workqueue, args->addr, args->addr_len, + args->deadline); } static const grpc_connector_vtable connector_vtable = { @@ -164,6 +166,7 @@ grpc_channel *grpc_insecure_channel_create(const char *target, grpc_resolver *resolver; subchannel_factory *f; grpc_mdctx *mdctx = grpc_mdctx_create(); + grpc_workqueue *workqueue = grpc_workqueue_create(); size_t n = 0; GPR_ASSERT(!reserved); if (grpc_channel_args_is_census_enabled(args)) { @@ -173,8 +176,8 @@ grpc_channel *grpc_insecure_channel_create(const char *target, filters[n++] = &grpc_client_channel_filter; GPR_ASSERT(n <= MAX_FILTERS); - channel = - grpc_channel_create_from_filters(target, filters, n, args, mdctx, 1); + channel = grpc_channel_create_from_filters(target, filters, n, args, mdctx, + workqueue, 1); f = gpr_malloc(sizeof(*f)); f->base.vtable = &subchannel_factory_vtable; @@ -184,7 +187,7 @@ grpc_channel *grpc_insecure_channel_create(const char *target, f->merge_args = grpc_channel_args_copy(args); f->master = channel; GRPC_CHANNEL_INTERNAL_REF(f->master, "subchannel_factory"); - resolver = grpc_resolver_create(target, &f->base); + resolver = grpc_resolver_create(target, &f->base, workqueue); if (!resolver) { return NULL; } diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c index 80704cbf677..a5de900effe 100644 --- a/src/core/surface/lame_client.c +++ b/src/core/surface/lame_client.c @@ -150,7 +150,8 @@ grpc_channel *grpc_lame_client_channel_create(const char *target, channel_data *chand; static const grpc_channel_filter *filters[] = {&lame_filter}; channel = grpc_channel_create_from_filters(target, filters, 1, NULL, - grpc_mdctx_create(), 1); + grpc_mdctx_create(), + grpc_workqueue_create(), 1); elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); GPR_ASSERT(elem->filter == &lame_filter); chand = (channel_data *)elem->channel_data; diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index d1412604216..ec077af8dd2 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -57,7 +57,6 @@ typedef struct { gpr_refcount refs; grpc_channel_security_connector *security_connector; - grpc_workqueue *workqueue; grpc_iomgr_closure *notify; grpc_connect_in_args args; @@ -72,7 +71,6 @@ static void connector_ref(grpc_connector *con) { static void connector_unref(grpc_connector *con) { connector *c = (connector *)con; if (gpr_unref(&c->refs)) { - grpc_workqueue_unref(c->workqueue); gpr_free(c); } } @@ -88,7 +86,8 @@ static void on_secure_transport_setup_done(void *arg, memset(c->result, 0, sizeof(*c->result)); } else { c->result->transport = grpc_create_chttp2_transport( - c->args.channel_args, secure_endpoint, c->args.metadata_context, 1); + c->args.channel_args, secure_endpoint, c->args.metadata_context, + c->args.workqueue, 1); grpc_chttp2_transport_start_reading(c->result->transport, NULL, 0); c->result->filters = gpr_malloc(sizeof(grpc_channel_filter *) * 2); c->result->filters[0] = &grpc_http_client_filter; @@ -124,8 +123,9 @@ static void connector_connect(grpc_connector *con, c->notify = notify; c->args = *args; c->result = result; - grpc_tcp_client_connect(connected, c, args->interested_parties, c->workqueue, - args->addr, args->addr_len, args->deadline); + grpc_tcp_client_connect(connected, c, args->interested_parties, + args->workqueue, args->addr, args->addr_len, + args->deadline); } static const grpc_connector_vtable connector_vtable = { @@ -167,8 +167,6 @@ static grpc_subchannel *subchannel_factory_create_subchannel( memset(c, 0, sizeof(*c)); c->base.vtable = &connector_vtable; c->security_connector = f->security_connector; - c->workqueue = grpc_channel_get_workqueue(f->master); - grpc_workqueue_ref(c->workqueue); gpr_ref_init(&c->refs, 1); args->mdctx = f->mdctx; args->args = final_args; @@ -197,6 +195,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, grpc_channel_args *new_args_from_connector; grpc_channel_security_connector *connector; grpc_mdctx *mdctx; + grpc_workqueue *workqueue; grpc_resolver *resolver; subchannel_factory *f; #define MAX_FILTERS 3 @@ -219,6 +218,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, "Failed to create security connector."); } mdctx = grpc_mdctx_create(); + workqueue = grpc_workqueue_create(); connector_arg = grpc_security_connector_to_arg(&connector->base); args_copy = grpc_channel_args_copy_and_add( @@ -231,8 +231,8 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, filters[n++] = &grpc_client_channel_filter; GPR_ASSERT(n <= MAX_FILTERS); - channel = - grpc_channel_create_from_filters(target, filters, n, args_copy, mdctx, 1); + channel = grpc_channel_create_from_filters(target, filters, n, args_copy, + mdctx, workqueue, 1); f = gpr_malloc(sizeof(*f)); f->base.vtable = &subchannel_factory_vtable; @@ -244,8 +244,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, f->merge_args = grpc_channel_args_copy(args_copy); f->master = channel; GRPC_CHANNEL_INTERNAL_REF(channel, "subchannel_factory"); - resolver = grpc_resolver_create(target, &f->base, - grpc_channel_get_workqueue(channel)); + resolver = grpc_resolver_create(target, &f->base, workqueue); if (!resolver) { return NULL; } diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 3d404f78a4f..aba0f94fd48 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -219,6 +219,8 @@ struct grpc_server { /** when did we print the last shutdown progress message */ gpr_timespec last_shutdown_message_time; + + grpc_workqueue *workqueue; }; #define SERVER_FROM_CALL_ELEM(elem) \ @@ -314,7 +316,7 @@ static void kill_zombie(void *elem, int success) { } static void request_matcher_zombify_all_pending_calls( - request_matcher *request_matcher) { + request_matcher *request_matcher, grpc_workqueue *workqueue) { while (request_matcher->pending_head) { call_data *calld = request_matcher->pending_head; request_matcher->pending_head = calld->pending_next; @@ -324,7 +326,7 @@ static void request_matcher_zombify_all_pending_calls( grpc_iomgr_closure_init( &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0)); - grpc_iomgr_add_callback(&calld->kill_zombie_closure); + grpc_workqueue_push(workqueue, &calld->kill_zombie_closure, 1); } } @@ -363,6 +365,7 @@ static void server_delete(grpc_server *server) { } request_matcher_destroy(&server->unregistered_request_matcher); gpr_stack_lockfree_destroy(server->request_freelist); + grpc_workqueue_unref(server->workqueue); gpr_free(server->cqs); gpr_free(server->pollsets); gpr_free(server->shutdown_tags); @@ -401,7 +404,8 @@ static void destroy_channel(channel_data *chand) { maybe_finish_shutdown(chand->server); chand->finish_destroy_channel_closure.cb = finish_destroy_channel; chand->finish_destroy_channel_closure.cb_arg = chand; - grpc_iomgr_add_callback(&chand->finish_destroy_channel_closure); + grpc_workqueue_push(chand->server->workqueue, + &chand->finish_destroy_channel_closure, 1); } static void finish_start_new_rpc(grpc_server *server, grpc_call_element *elem, @@ -414,7 +418,7 @@ static void finish_start_new_rpc(grpc_server *server, grpc_call_element *elem, calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); grpc_iomgr_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); - grpc_iomgr_add_callback(&calld->kill_zombie_closure); + grpc_workqueue_push(server->workqueue, &calld->kill_zombie_closure, 1); return; } @@ -505,10 +509,11 @@ static void kill_pending_work_locked(grpc_server *server) { registered_method *rm; request_matcher_kill_requests(server, &server->unregistered_request_matcher); request_matcher_zombify_all_pending_calls( - &server->unregistered_request_matcher); + &server->unregistered_request_matcher, server->workqueue); for (rm = server->registered_methods; rm; rm = rm->next) { request_matcher_kill_requests(server, &rm->request_matcher); - request_matcher_zombify_all_pending_calls(&rm->request_matcher); + request_matcher_zombify_all_pending_calls(&rm->request_matcher, + server->workqueue); } } @@ -561,6 +566,7 @@ static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { static void server_on_recv(void *ptr, int success) { grpc_call_element *elem = ptr; call_data *calld = elem->call_data; + channel_data *chand = elem->channel_data; gpr_timespec op_deadline; if (success && !calld->got_initial_metadata) { @@ -595,7 +601,8 @@ static void server_on_recv(void *ptr, int success) { calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); grpc_iomgr_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); - grpc_iomgr_add_callback(&calld->kill_zombie_closure); + grpc_workqueue_push(chand->server->workqueue, + &calld->kill_zombie_closure, 1); } else { gpr_mu_unlock(&calld->mu_state); } @@ -606,7 +613,8 @@ static void server_on_recv(void *ptr, int success) { calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); grpc_iomgr_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); - grpc_iomgr_add_callback(&calld->kill_zombie_closure); + grpc_workqueue_push(chand->server->workqueue, + &calld->kill_zombie_closure, 1); } else if (calld->state == PENDING) { calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); @@ -799,6 +807,7 @@ grpc_server *grpc_server_create_from_filters( gpr_ref_init(&server->internal_refcount, 1); server->root_channel_data.next = server->root_channel_data.prev = &server->root_channel_data; + server->workqueue = grpc_workqueue_create(); /* TODO(ctiller): expose a channel_arg for this */ server->max_requested_calls = 32768; @@ -873,6 +882,7 @@ void grpc_server_start(grpc_server *server) { server->pollsets = gpr_malloc(sizeof(grpc_pollset *) * server->cq_count); for (i = 0; i < server->cq_count; i++) { server->pollsets[i] = grpc_cq_pollset(server->cqs[i]); + grpc_workqueue_add_to_pollset(server->workqueue, server->pollsets[i]); } for (l = server->listeners; l; l = l->next) { @@ -883,6 +893,7 @@ void grpc_server_start(grpc_server *server) { void grpc_server_setup_transport(grpc_server *s, grpc_transport *transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx *mdctx, + grpc_workqueue *workqueue, const grpc_channel_args *args) { size_t num_filters = s->channel_filter_count + num_extra_filters + 1; grpc_channel_filter const **filters = @@ -917,7 +928,7 @@ void grpc_server_setup_transport(grpc_server *s, grpc_transport *transport, } channel = grpc_channel_create_from_filters(NULL, filters, num_filters, args, - mdctx, 0); + mdctx, workqueue, 0); chand = (channel_data *)grpc_channel_stack_element( grpc_channel_get_channel_stack(channel), 0) ->channel_data; @@ -1119,7 +1130,7 @@ static grpc_call_error queue_call_request(grpc_server *server, grpc_iomgr_closure_init( &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0)); - grpc_iomgr_add_callback(&calld->kill_zombie_closure); + grpc_workqueue_push(server->workqueue, &calld->kill_zombie_closure, 1); } else { GPR_ASSERT(calld->state == PENDING); calld->state = ACTIVATED; diff --git a/src/core/surface/server.h b/src/core/surface/server.h index c638d682bb1..1d82d07cedc 100644 --- a/src/core/surface/server.h +++ b/src/core/surface/server.h @@ -58,6 +58,7 @@ void grpc_server_listener_destroy_done(void *server); void grpc_server_setup_transport(grpc_server *server, grpc_transport *transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx *mdctx, + grpc_workqueue *workqueue, const grpc_channel_args *args); const grpc_channel_args *grpc_server_get_channel_args(grpc_server *server); diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c index 4ab845bc008..91cf6ece9cd 100644 --- a/src/core/surface/server_chttp2.c +++ b/src/core/surface/server_chttp2.c @@ -43,11 +43,11 @@ #include static void setup_transport(void *server, grpc_transport *transport, - grpc_mdctx *mdctx) { + grpc_mdctx *mdctx, grpc_workqueue *workqueue) { static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; grpc_server_setup_transport(server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, + GPR_ARRAY_SIZE(extra_filters), mdctx, workqueue, grpc_server_get_channel_args(server)); } @@ -60,9 +60,10 @@ static void new_transport(void *server, grpc_endpoint *tcp) { * case. */ grpc_mdctx *mdctx = grpc_mdctx_create(); + grpc_workqueue *workqueue = grpc_workqueue_create(); grpc_transport *transport = grpc_create_chttp2_transport( - grpc_server_get_channel_args(server), tcp, mdctx, 0); - setup_transport(server, transport, mdctx); + grpc_server_get_channel_args(server), tcp, mdctx, workqueue, 0); + setup_transport(server, transport, mdctx, workqueue); grpc_chttp2_transport_start_reading(transport, NULL, 0); } diff --git a/src/core/transport/chttp2/frame_ping.c b/src/core/transport/chttp2/frame_ping.c index 05451c7a8ad..10d1e0a523c 100644 --- a/src/core/transport/chttp2/frame_ping.c +++ b/src/core/transport/chttp2/frame_ping.c @@ -89,7 +89,9 @@ grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse( for (ping = transport_parsing->pings.next; ping != &transport_parsing->pings; ping = ping->next) { if (0 == memcmp(p->opaque_8bytes, ping->id, 8)) { - grpc_iomgr_add_delayed_callback(ping->on_recv, 1); + /* we know no locks are held here, we may as well just call up + * directly */ + ping->on_recv->cb(ping->on_recv->cb_arg, 1); } ping->next->prev = ping->prev; ping->prev->next = ping->next; diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index deb2fedf0c4..705a025ccaa 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -166,7 +166,7 @@ static void destruct_transport(grpc_chttp2_transport *t) { and maybe they hold resources that need to be freed */ while (t->global.pings.next != &t->global.pings) { grpc_chttp2_outstanding_ping *ping = t->global.pings.next; - grpc_iomgr_add_delayed_callback(ping->on_recv, 0); + ping->on_recv->cb(ping->on_recv->cb_arg, 0); ping->next->prev = ping->prev; ping->prev->next = ping->next; gpr_free(ping); @@ -209,7 +209,7 @@ static void ref_transport(grpc_chttp2_transport *t) { gpr_ref(&t->refs); } static void init_transport(grpc_chttp2_transport *t, const grpc_channel_args *channel_args, grpc_endpoint *ep, grpc_mdctx *mdctx, - gpr_uint8 is_client) { + grpc_workqueue *workqueue, gpr_uint8 is_client) { size_t i; int j; @@ -242,7 +242,7 @@ static void init_transport(grpc_chttp2_transport *t, t->parsing.deframe_state = is_client ? GRPC_DTS_FH_0 : GRPC_DTS_CLIENT_PREFIX_0; t->writing.is_client = is_client; - grpc_connectivity_state_init(&t->channel_callback.state_tracker, + grpc_connectivity_state_init(&t->channel_callback.state_tracker, workqueue, GRPC_CHANNEL_READY, "transport"); gpr_slice_buffer_init(&t->global.qbuf); @@ -1280,9 +1280,9 @@ static const grpc_transport_vtable vtable = {sizeof(grpc_chttp2_stream), grpc_transport *grpc_create_chttp2_transport( const grpc_channel_args *channel_args, grpc_endpoint *ep, grpc_mdctx *mdctx, - int is_client) { + grpc_workqueue *workqueue, int is_client) { grpc_chttp2_transport *t = gpr_malloc(sizeof(grpc_chttp2_transport)); - init_transport(t, channel_args, ep, mdctx, is_client != 0); + init_transport(t, channel_args, ep, mdctx, workqueue, is_client != 0); return &t->base; } diff --git a/src/core/transport/chttp2_transport.h b/src/core/transport/chttp2_transport.h index fa0d6e4151e..8bd8af6236c 100644 --- a/src/core/transport/chttp2_transport.h +++ b/src/core/transport/chttp2_transport.h @@ -35,6 +35,7 @@ #define GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_TRANSPORT_H #include "src/core/iomgr/endpoint.h" +#include "src/core/iomgr/workqueue.h" #include "src/core/transport/transport.h" extern int grpc_http_trace; @@ -42,7 +43,7 @@ extern int grpc_flowctl_trace; grpc_transport *grpc_create_chttp2_transport( const grpc_channel_args *channel_args, grpc_endpoint *ep, - grpc_mdctx *metadata_context, int is_client); + grpc_mdctx *metadata_context, grpc_workqueue *workqueue, int is_client); void grpc_chttp2_transport_start_reading(grpc_transport *transport, gpr_slice *slices, size_t nslices); diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c index 61d26f06f09..716280505e8 100644 --- a/src/core/transport/connectivity_state.c +++ b/src/core/transport/connectivity_state.c @@ -56,6 +56,7 @@ const char *grpc_connectivity_state_name(grpc_connectivity_state state) { } void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, + grpc_workqueue *workqueue, grpc_connectivity_state init_state, const char *name) { tracker->current_state = init_state; @@ -64,16 +65,18 @@ void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, } void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker) { + int success; grpc_connectivity_state_watcher *w; while ((w = tracker->watchers)) { tracker->watchers = w->next; if (GRPC_CHANNEL_FATAL_FAILURE != *w->current) { *w->current = GRPC_CHANNEL_FATAL_FAILURE; - grpc_iomgr_add_callback(w->notify); + success = 1; } else { - grpc_iomgr_add_delayed_callback(w->notify, 0); + success = 0; } + grpc_workqueue_push(tracker->workqueue, w->notify, success); gpr_free(w); } gpr_free(tracker->name); @@ -94,7 +97,7 @@ int grpc_connectivity_state_notify_on_state_change( } if (tracker->current_state != *current) { *current = tracker->current_state; - grpc_iomgr_add_callback(notify); + grpc_workqueue_push(tracker->workqueue, notify, 1); } else { grpc_connectivity_state_watcher *w = gpr_malloc(sizeof(*w)); w->current = current; @@ -136,13 +139,13 @@ void grpc_connectivity_state_set_with_scheduler( tracker->watchers = new; } -static void default_scheduler(void *ignored, grpc_iomgr_closure *closure) { - grpc_iomgr_add_callback(closure); +static void default_scheduler(void *workqueue, grpc_iomgr_closure *closure) { + grpc_workqueue_push(workqueue, closure, 1); } void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, grpc_connectivity_state state, const char *reason) { grpc_connectivity_state_set_with_scheduler(tracker, state, default_scheduler, - NULL, reason); + tracker->workqueue, reason); } diff --git a/src/core/transport/connectivity_state.h b/src/core/transport/connectivity_state.h index a3b0b80c986..6c61e026234 100644 --- a/src/core/transport/connectivity_state.h +++ b/src/core/transport/connectivity_state.h @@ -36,6 +36,7 @@ #include #include "src/core/iomgr/iomgr.h" +#include "src/core/iomgr/workqueue.h" typedef struct grpc_connectivity_state_watcher { /** we keep watchers in a linked list */ @@ -53,11 +54,14 @@ typedef struct { grpc_connectivity_state_watcher *watchers; /** a name to help debugging */ char *name; + /** workqueue for async work */ + grpc_workqueue *workqueue; } grpc_connectivity_state_tracker; extern int grpc_connectivity_state_trace; void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, + grpc_workqueue *grpc_workqueue, grpc_connectivity_state init_state, const char *name); void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker); diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index 41ac83b7b70..b1d3479fa5b 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -65,12 +65,13 @@ static void done_write(void *arg, int success) { } static void server_setup_transport(void *ts, grpc_transport *transport, - grpc_mdctx *mdctx) { + grpc_mdctx *mdctx, + grpc_workqueue *workqueue) { thd_args *a = ts; static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; grpc_server_setup_transport(a->server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, + GPR_ARRAY_SIZE(extra_filters), mdctx, workqueue, grpc_server_get_channel_args(a->server)); } From 7d57ba138fc4dbde885c5a59231ae6de6968e557 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 16 Sep 2015 10:02:09 -0700 Subject: [PATCH 05/56] Tests compile --- src/core/iomgr/pollset_posix.c | 3 +++ src/core/surface/channel.c | 4 ++++ test/core/bad_client/bad_client.c | 9 ++++++--- .../core/end2end/fixtures/h2_sockpair+trace.c | 19 ++++++++++++------ test/core/end2end/fixtures/h2_sockpair.c | 19 ++++++++++++------ .../core/end2end/fixtures/h2_sockpair_1byte.c | 19 ++++++++++++------ test/core/iomgr/alarm_test.c | 12 +---------- test/core/iomgr/endpoint_pair_test.c | 6 +++++- test/core/iomgr/fd_conservation_posix_test.c | 6 +++++- test/core/iomgr/fd_posix_test.c | 11 ++++++---- test/core/iomgr/tcp_client_posix_test.c | 9 ++++++--- test/core/iomgr/tcp_posix_test.c | 20 +++++++++++-------- test/core/security/secure_endpoint_test.c | 5 ++++- 13 files changed, 92 insertions(+), 50 deletions(-) diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index ad9c862d6ec..8bde41a1466 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -140,6 +140,9 @@ void grpc_pollset_init(grpc_pollset *pollset) { } void grpc_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd) { + if (fd->workqueue->wakeup_read_fd != fd) { + grpc_pollset_add_fd(pollset, fd->workqueue->wakeup_read_fd); + } gpr_mu_lock(&pollset->mu); pollset->vtable->add_fd(pollset, fd, 1); /* the following (enabled only in debug) will reacquire and then release diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index bf4aee190fd..4ec6aba7f4e 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -370,3 +370,7 @@ grpc_mdstr *grpc_channel_get_message_string(grpc_channel *channel) { gpr_uint32 grpc_channel_get_max_message_length(grpc_channel *channel) { return channel->max_message_length; } + +grpc_workqueue *grpc_channel_get_workqueue(grpc_channel *channel) { + return channel->workqueue; +} diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index b1d3479fa5b..01fcb9275e4 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -88,6 +88,7 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, gpr_slice_from_copied_buffer(client_payload, client_payload_length); gpr_slice_buffer outgoing; grpc_iomgr_closure done_write_closure; + grpc_workqueue *workqueue = grpc_workqueue_create(); hex = gpr_dump(client_payload, client_payload_length, GPR_DUMP_HEX | GPR_DUMP_ASCII); @@ -101,7 +102,7 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, grpc_init(); /* Create endpoints */ - sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536); + sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536, workqueue); /* Create server, completion events */ a.server = grpc_server_create_from_filters(NULL, 0, NULL); @@ -111,8 +112,9 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, a.validator = validator; grpc_server_register_completion_queue(a.server, a.cq, NULL); grpc_server_start(a.server); - transport = grpc_create_chttp2_transport(NULL, sfd.server, mdctx, 0); - server_setup_transport(&a, transport, mdctx); + transport = + grpc_create_chttp2_transport(NULL, sfd.server, mdctx, workqueue, 0); + server_setup_transport(&a, transport, mdctx, workqueue); grpc_chttp2_transport_start_reading(transport, NULL, 0); /* Bind everything into the same pollset */ @@ -166,5 +168,6 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, grpc_completion_queue_destroy(a.cq); gpr_slice_buffer_destroy(&outgoing); + grpc_workqueue_unref(workqueue); grpc_shutdown(); } diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 588c4b23e1e..13cc6b4d99e 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -54,6 +54,8 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" +grpc_workqueue *g_workqueue; + /* chttp2 transport that is immediately available (used for testing connected_channel without a client_channel */ @@ -63,7 +65,7 @@ static void server_setup_transport(void *ts, grpc_transport *transport, static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; grpc_server_setup_transport(f->server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, + GPR_ARRAY_SIZE(extra_filters), mdctx, g_workqueue, grpc_server_get_channel_args(f->server)); } @@ -80,8 +82,9 @@ static void client_setup_transport(void *ts, grpc_transport *transport, &grpc_compress_filter, &grpc_connected_channel_filter}; size_t nfilters = sizeof(filters) / sizeof(*filters); - grpc_channel *channel = grpc_channel_create_from_filters( - "socketpair-target", filters, nfilters, cs->client_args, mdctx, 1); + grpc_channel *channel = + grpc_channel_create_from_filters("socketpair-target", filters, nfilters, + cs->client_args, mdctx, g_workqueue, 1); cs->f->client = channel; @@ -98,7 +101,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( f.fixture_data = sfd; f.cq = grpc_completion_queue_create(NULL); - *sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536); + *sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536, g_workqueue); return f; } @@ -111,7 +114,8 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1); + transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, + g_workqueue, 1); client_setup_transport(&cs, transport, mdctx); GPR_ASSERT(f->client); grpc_chttp2_transport_start_reading(transport, NULL, 0); @@ -126,7 +130,8 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, f->server = grpc_server_create_from_filters(NULL, 0, server_args); grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0); + transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, + g_workqueue, 0); server_setup_transport(f, transport, mdctx); grpc_chttp2_transport_start_reading(transport, NULL, 0); } @@ -156,6 +161,7 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); + g_workqueue = grpc_workqueue_create(); GPR_ASSERT(0 == grpc_tracer_set_enabled("also-doesnt-exist", 0)); GPR_ASSERT(1 == grpc_tracer_set_enabled("http", 1)); @@ -165,6 +171,7 @@ int main(int argc, char **argv) { grpc_end2end_tests(configs[i]); } + grpc_workqueue_unref(g_workqueue); grpc_shutdown(); return 0; diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index 16a04fbebfa..044c9e47b04 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -53,6 +53,8 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" +grpc_workqueue *g_workqueue; + /* chttp2 transport that is immediately available (used for testing connected_channel without a client_channel */ @@ -62,7 +64,7 @@ static void server_setup_transport(void *ts, grpc_transport *transport, static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; grpc_server_setup_transport(f->server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, + GPR_ARRAY_SIZE(extra_filters), mdctx, g_workqueue, grpc_server_get_channel_args(f->server)); } @@ -79,8 +81,9 @@ static void client_setup_transport(void *ts, grpc_transport *transport, &grpc_compress_filter, &grpc_connected_channel_filter}; size_t nfilters = sizeof(filters) / sizeof(*filters); - grpc_channel *channel = grpc_channel_create_from_filters( - "socketpair-target", filters, nfilters, cs->client_args, mdctx, 1); + grpc_channel *channel = + grpc_channel_create_from_filters("socketpair-target", filters, nfilters, + cs->client_args, mdctx, g_workqueue, 1); cs->f->client = channel; @@ -97,7 +100,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( f.fixture_data = sfd; f.cq = grpc_completion_queue_create(NULL); - *sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536); + *sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536, g_workqueue); return f; } @@ -110,7 +113,8 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1); + transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, + g_workqueue, 1); client_setup_transport(&cs, transport, mdctx); GPR_ASSERT(f->client); grpc_chttp2_transport_start_reading(transport, NULL, 0); @@ -125,7 +129,8 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, f->server = grpc_server_create_from_filters(NULL, 0, server_args); grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0); + transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, + g_workqueue, 0); server_setup_transport(f, transport, mdctx); grpc_chttp2_transport_start_reading(transport, NULL, 0); } @@ -146,11 +151,13 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); + g_workqueue = grpc_workqueue_create(); for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { grpc_end2end_tests(configs[i]); } + grpc_workqueue_unref(g_workqueue); grpc_shutdown(); return 0; diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 94fc36f5eca..0fec408c30c 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -53,6 +53,8 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" +grpc_workqueue *g_workqueue; + /* chttp2 transport that is immediately available (used for testing connected_channel without a client_channel */ @@ -62,7 +64,7 @@ static void server_setup_transport(void *ts, grpc_transport *transport, static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; grpc_server_setup_transport(f->server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, + GPR_ARRAY_SIZE(extra_filters), mdctx, g_workqueue, grpc_server_get_channel_args(f->server)); } @@ -79,8 +81,9 @@ static void client_setup_transport(void *ts, grpc_transport *transport, &grpc_compress_filter, &grpc_connected_channel_filter}; size_t nfilters = sizeof(filters) / sizeof(*filters); - grpc_channel *channel = grpc_channel_create_from_filters( - "socketpair-target", filters, nfilters, cs->client_args, mdctx, 1); + grpc_channel *channel = + grpc_channel_create_from_filters("socketpair-target", filters, nfilters, + cs->client_args, mdctx, g_workqueue, 1); cs->f->client = channel; @@ -97,7 +100,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( f.fixture_data = sfd; f.cq = grpc_completion_queue_create(NULL); - *sfd = grpc_iomgr_create_endpoint_pair("fixture", 1); + *sfd = grpc_iomgr_create_endpoint_pair("fixture", 1, g_workqueue); return f; } @@ -110,7 +113,8 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1); + transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, + g_workqueue, 1); client_setup_transport(&cs, transport, mdctx); GPR_ASSERT(f->client); grpc_chttp2_transport_start_reading(transport, NULL, 0); @@ -125,7 +129,8 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, f->server = grpc_server_create_from_filters(NULL, 0, server_args); grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0); + transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, + g_workqueue, 0); server_setup_transport(f, transport, mdctx); grpc_chttp2_transport_start_reading(transport, NULL, 0); } @@ -146,11 +151,13 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); + g_workqueue = grpc_workqueue_create(); for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { grpc_end2end_tests(configs[i]); } + grpc_workqueue_unref(g_workqueue); grpc_shutdown(); return 0; diff --git a/test/core/iomgr/alarm_test.c b/test/core/iomgr/alarm_test.c index 55aa517529c..eafac0dc46f 100644 --- a/test/core/iomgr/alarm_test.c +++ b/test/core/iomgr/alarm_test.c @@ -56,7 +56,6 @@ void no_op_cb(void *arg, int success) {} typedef struct { gpr_cv cv; gpr_mu mu; - grpc_iomgr_closure *followup_closure; int counter; int done_success_ctr; int done_cancel_ctr; @@ -65,10 +64,6 @@ typedef struct { int success; } alarm_arg; -static void followup_cb(void *arg, int success) { - gpr_event_set((gpr_event *)arg, arg); -} - /* Called when an alarm expires. */ static void alarm_cb(void *arg /* alarm_arg */, int success) { alarm_arg *a = arg; @@ -83,8 +78,7 @@ static void alarm_cb(void *arg /* alarm_arg */, int success) { a->success = success; gpr_cv_signal(&a->cv); gpr_mu_unlock(&a->mu); - grpc_iomgr_closure_init(a->followup_closure, followup_cb, &a->fcb_arg); - grpc_iomgr_add_callback(a->followup_closure); + gpr_event_set((gpr_event *)arg, arg); } /* Test grpc_alarm add and cancel. */ @@ -110,7 +104,6 @@ static void test_grpc_alarm(void) { arg.done = 0; gpr_mu_init(&arg.mu); gpr_cv_init(&arg.cv); - arg.followup_closure = gpr_malloc(sizeof(grpc_iomgr_closure)); gpr_event_init(&arg.fcb_arg); grpc_alarm_init(&alarm, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(100), alarm_cb, &arg, @@ -152,7 +145,6 @@ static void test_grpc_alarm(void) { } gpr_cv_destroy(&arg.cv); gpr_mu_destroy(&arg.mu); - gpr_free(arg.followup_closure); arg2.counter = 0; arg2.success = SUCCESS_NOT_SET; @@ -161,7 +153,6 @@ static void test_grpc_alarm(void) { arg2.done = 0; gpr_mu_init(&arg2.mu); gpr_cv_init(&arg2.cv); - arg2.followup_closure = gpr_malloc(sizeof(grpc_iomgr_closure)); gpr_event_init(&arg2.fcb_arg); @@ -213,7 +204,6 @@ static void test_grpc_alarm(void) { } gpr_cv_destroy(&arg2.cv); gpr_mu_destroy(&arg2.mu); - gpr_free(arg2.followup_closure); grpc_shutdown(); } diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c index 3abde5ac358..3c1c50e3c44 100644 --- a/test/core/iomgr/endpoint_pair_test.c +++ b/test/core/iomgr/endpoint_pair_test.c @@ -43,13 +43,15 @@ #include "test/core/iomgr/endpoint_tests.h" static grpc_pollset g_pollset; +static grpc_workqueue *g_workqueue; static void clean_up(void) {} static grpc_endpoint_test_fixture create_fixture_endpoint_pair( size_t slice_size) { grpc_endpoint_test_fixture f; - grpc_endpoint_pair p = grpc_iomgr_create_endpoint_pair("test", slice_size); + grpc_endpoint_pair p = + grpc_iomgr_create_endpoint_pair("test", slice_size, g_workqueue); f.client_ep = p.client; f.server_ep = p.server; @@ -69,8 +71,10 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); grpc_pollset_init(&g_pollset); + g_workqueue = grpc_workqueue_create(); grpc_endpoint_tests(configs[0], &g_pollset); grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); + grpc_workqueue_unref(g_workqueue); 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 8327c681b81..f5fd3b017d9 100644 --- a/test/core/iomgr/fd_conservation_posix_test.c +++ b/test/core/iomgr/fd_conservation_posix_test.c @@ -43,8 +43,11 @@ int main(int argc, char **argv) { int i; struct rlimit rlim; grpc_endpoint_pair p; + grpc_workqueue *workqueue; + grpc_test_init(argc, argv); grpc_iomgr_init(); + workqueue = grpc_workqueue_create(); /* set max # of file descriptors to a low value, and verify we can create and destroy many more than this number @@ -53,11 +56,12 @@ int main(int argc, char **argv) { GPR_ASSERT(0 == setrlimit(RLIMIT_NOFILE, &rlim)); for (i = 0; i < 100; i++) { - p = grpc_iomgr_create_endpoint_pair("test", 1); + p = grpc_iomgr_create_endpoint_pair("test", 1, workqueue); grpc_endpoint_destroy(p.client); grpc_endpoint_destroy(p.server); } + grpc_workqueue_unref(workqueue); grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index 75959069c0f..8b68439dce1 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -52,6 +52,7 @@ #include "test/core/util/test_config.h" static grpc_pollset g_pollset; +static grpc_workqueue *g_workqueue; /* buffer size used to send and receive data. 1024 is the minimal value to set TCP send and receive buffer. */ @@ -207,7 +208,7 @@ static void listen_cb(void *arg, /*=sv_arg*/ fcntl(fd, F_SETFL, flags | O_NONBLOCK); se = gpr_malloc(sizeof(*se)); se->sv = sv; - se->em_fd = grpc_fd_create(fd, "listener"); + se->em_fd = grpc_fd_create(fd, g_workqueue, "listener"); grpc_pollset_add_fd(&g_pollset, se->em_fd); se->session_read_closure.cb = session_read_cb; se->session_read_closure.cb_arg = se; @@ -236,7 +237,7 @@ static int server_start(server *sv) { port = ntohs(sin.sin_port); GPR_ASSERT(listen(fd, MAX_NUM_FD) == 0); - sv->em_fd = grpc_fd_create(fd, "server"); + sv->em_fd = grpc_fd_create(fd, g_workqueue, "server"); grpc_pollset_add_fd(&g_pollset, sv->em_fd); /* Register to be interested in reading from listen_fd. */ sv->listen_closure.cb = listen_cb; @@ -349,7 +350,7 @@ static void client_start(client *cl, int port) { } } - cl->em_fd = grpc_fd_create(fd, "client"); + cl->em_fd = grpc_fd_create(fd, g_workqueue, "client"); grpc_pollset_add_fd(&g_pollset, cl->em_fd); client_session_write(cl, 1); @@ -438,7 +439,7 @@ static void test_grpc_fd_change(void) { flags = fcntl(sv[1], F_GETFL, 0); GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0); - em_fd = grpc_fd_create(sv[0], "test_grpc_fd_change"); + em_fd = grpc_fd_create(sv[0], g_workqueue, "test_grpc_fd_change"); grpc_pollset_add_fd(&g_pollset, em_fd); /* Register the first callback, then make its FD readable */ @@ -490,9 +491,11 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_iomgr_init(); grpc_pollset_init(&g_pollset); + g_workqueue = grpc_workqueue_create(); test_grpc_fd(); test_grpc_fd_change(); grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); + grpc_workqueue_unref(g_workqueue); grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index f0e2de24d95..c73347b94fb 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -49,6 +49,7 @@ static grpc_pollset_set g_pollset_set; static grpc_pollset g_pollset; +static grpc_workqueue *g_workqueue; static int g_connections_complete = 0; static gpr_timespec test_deadline(void) { @@ -98,7 +99,7 @@ void test_succeeds(void) { /* connect to it */ GPR_ASSERT(getsockname(svr_fd, (struct sockaddr *)&addr, &addr_len) == 0); - grpc_tcp_client_connect(must_succeed, NULL, &g_pollset_set, + grpc_tcp_client_connect(must_succeed, NULL, &g_pollset_set, g_workqueue, (struct sockaddr *)&addr, addr_len, gpr_inf_future(GPR_CLOCK_REALTIME)); @@ -136,7 +137,7 @@ void test_fails(void) { gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); /* connect to a broken address */ - grpc_tcp_client_connect(must_fail, NULL, &g_pollset_set, + grpc_tcp_client_connect(must_fail, NULL, &g_pollset_set, g_workqueue, (struct sockaddr *)&addr, addr_len, gpr_inf_future(GPR_CLOCK_REALTIME)); @@ -195,7 +196,7 @@ void test_times_out(void) { connections_complete_before = g_connections_complete; gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_tcp_client_connect(must_fail, NULL, &g_pollset_set, + grpc_tcp_client_connect(must_fail, NULL, &g_pollset_set, g_workqueue, (struct sockaddr *)&addr, addr_len, connect_deadline); /* Make sure the event doesn't trigger early */ @@ -239,12 +240,14 @@ int main(int argc, char **argv) { grpc_pollset_set_init(&g_pollset_set); grpc_pollset_init(&g_pollset); grpc_pollset_set_add_pollset(&g_pollset_set, &g_pollset); + g_workqueue = grpc_workqueue_create(); test_succeeds(); gpr_log(GPR_ERROR, "End of first test"); test_fails(); test_times_out(); grpc_pollset_set_destroy(&g_pollset_set); grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); + grpc_workqueue_unref(g_workqueue); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index 59c498edff1..6d080c2b975 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -49,6 +49,7 @@ #include "test/core/iomgr/endpoint_tests.h" static grpc_pollset g_pollset; +static grpc_workqueue *g_workqueue; /* General test notes: @@ -184,7 +185,8 @@ static void read_test(size_t num_bytes, size_t slice_size) { create_sockets(sv); - ep = grpc_tcp_create(grpc_fd_create(sv[1], "read_test"), slice_size, "test"); + ep = grpc_tcp_create(grpc_fd_create(sv[1], g_workqueue, "read_test"), + slice_size, "test"); grpc_endpoint_add_to_pollset(ep, &g_pollset); written_bytes = fill_socket_partial(sv[0], num_bytes); @@ -233,8 +235,8 @@ static void large_read_test(size_t slice_size) { create_sockets(sv); - ep = grpc_tcp_create(grpc_fd_create(sv[1], "large_read_test"), slice_size, - "test"); + ep = grpc_tcp_create(grpc_fd_create(sv[1], g_workqueue, "large_read_test"), + slice_size, "test"); grpc_endpoint_add_to_pollset(ep, &g_pollset); written_bytes = fill_socket(sv[0]); @@ -383,7 +385,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { create_sockets(sv); - ep = grpc_tcp_create(grpc_fd_create(sv[1], "write_test"), + ep = grpc_tcp_create(grpc_fd_create(sv[1], g_workqueue, "write_test"), GRPC_TCP_DEFAULT_READ_SLICE_SIZE, "test"); grpc_endpoint_add_to_pollset(ep, &g_pollset); @@ -454,10 +456,10 @@ static grpc_endpoint_test_fixture create_fixture_tcp_socketpair( grpc_endpoint_test_fixture f; create_sockets(sv); - f.client_ep = grpc_tcp_create(grpc_fd_create(sv[0], "fixture:client"), - slice_size, "test"); - f.server_ep = grpc_tcp_create(grpc_fd_create(sv[1], "fixture:server"), - slice_size, "test"); + f.client_ep = grpc_tcp_create( + grpc_fd_create(sv[0], g_workqueue, "fixture:client"), slice_size, "test"); + f.server_ep = grpc_tcp_create( + grpc_fd_create(sv[1], g_workqueue, "fixture:server"), slice_size, "test"); grpc_endpoint_add_to_pollset(f.client_ep, &g_pollset); grpc_endpoint_add_to_pollset(f.server_ep, &g_pollset); @@ -473,9 +475,11 @@ static void destroy_pollset(void *p) { grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); + g_workqueue = grpc_workqueue_create(); grpc_pollset_init(&g_pollset); run_tests(); grpc_endpoint_tests(configs[0], &g_pollset); + grpc_workqueue_unref(g_workqueue); grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); grpc_shutdown(); diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index 047d37748d4..67fa9322a70 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -46,6 +46,7 @@ #include "src/core/tsi/fake_transport_security.h" static grpc_pollset g_pollset; +static grpc_workqueue *g_workqueue; static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( size_t slice_size, gpr_slice *leftover_slices, size_t leftover_nslices) { @@ -54,7 +55,7 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( grpc_endpoint_test_fixture f; grpc_endpoint_pair tcp; - tcp = grpc_iomgr_create_endpoint_pair("fixture", slice_size); + tcp = grpc_iomgr_create_endpoint_pair("fixture", slice_size, g_workqueue); grpc_endpoint_add_to_pollset(tcp.client, &g_pollset); grpc_endpoint_add_to_pollset(tcp.server, &g_pollset); @@ -165,9 +166,11 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); + g_workqueue = grpc_workqueue_create(); grpc_pollset_init(&g_pollset); grpc_endpoint_tests(configs[0], &g_pollset); test_leftover(configs[1], 1); + grpc_workqueue_unref(g_workqueue); grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); grpc_shutdown(); From 8f3addcc4d8822b68f3c2367353dac38eb56c38c Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 16 Sep 2015 10:12:12 -0700 Subject: [PATCH 06/56] Propagate workqueue from resolver --> lb_policy --- src/core/client_config/resolvers/dns_resolver.c | 2 ++ src/core/client_config/resolvers/sockaddr_resolver.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index b519ce41740..cbc96ca9923 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -146,8 +146,10 @@ static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses) { subchannels[i] = grpc_subchannel_factory_create_subchannel( r->subchannel_factory, &args); } + memset(&lb_policy_args, 0, sizeof(lb_policy_args)); lb_policy_args.subchannels = subchannels; lb_policy_args.num_subchannels = addresses->naddrs; + lb_policy_args.workqueue = r->workqueue; lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); grpc_client_config_set_lb_policy(config, lb_policy); GRPC_LB_POLICY_UNREF(lb_policy, "construction"); diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index 260bee27a94..cb3b6070f27 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -137,8 +137,10 @@ static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r) { subchannels[i] = grpc_subchannel_factory_create_subchannel( r->subchannel_factory, &args); } + memset(&lb_policy_args, 0, sizeof(lb_policy_args)); lb_policy_args.subchannels = subchannels; lb_policy_args.num_subchannels = r->num_addrs; + lb_policy_args.workqueue = r->workqueue; lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); gpr_free(subchannels); From 3cd6a5158d388c6ae2d07bc78951c986dc4f41ea Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 16 Sep 2015 16:15:47 -0700 Subject: [PATCH 07/56] Getting stuff working --- .../client_config/lb_policies/pick_first.c | 4 +- .../client_config/resolvers/dns_resolver.c | 4 +- .../resolvers/sockaddr_resolver.c | 4 +- src/core/client_config/subchannel.c | 4 +- src/core/httpcli/httpcli.c | 2 +- src/core/iomgr/fd_posix.c | 4 +- src/core/iomgr/iomgr.c | 2 - src/core/iomgr/tcp_server_posix.c | 2 +- src/core/iomgr/udp_server.c | 2 +- src/core/iomgr/workqueue.h | 15 ++++ src/core/iomgr/workqueue_posix.c | 79 ++++++++++++++++++- src/core/surface/server.c | 7 +- src/core/transport/chttp2_transport.c | 5 +- src/core/transport/connectivity_state.c | 3 + test/core/bad_client/bad_client.c | 2 +- .../core/end2end/fixtures/h2_sockpair+trace.c | 2 +- test/core/end2end/fixtures/h2_sockpair.c | 3 +- .../core/end2end/fixtures/h2_sockpair_1byte.c | 2 +- test/core/iomgr/endpoint_pair_test.c | 2 +- test/core/iomgr/fd_conservation_posix_test.c | 2 +- test/core/iomgr/fd_posix_test.c | 2 +- test/core/iomgr/tcp_client_posix_test.c | 2 +- test/core/iomgr/tcp_posix_test.c | 2 +- test/core/iomgr/workqueue_test.c | 2 +- test/core/security/secure_endpoint_test.c | 2 +- 25 files changed, 130 insertions(+), 30 deletions(-) diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index 06186403e53..575ee02249b 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -104,7 +104,7 @@ void pf_destroy(grpc_lb_policy *pol) { grpc_connectivity_state_destroy(&p->state_tracker); gpr_free(p->subchannels); gpr_mu_destroy(&p->mu); - grpc_workqueue_unref(p->workqueue); + GRPC_WORKQUEUE_UNREF(p->workqueue, "pick_first"); gpr_free(p); } @@ -331,7 +331,7 @@ static grpc_lb_policy *create_pick_first(grpc_lb_policy_factory *factory, p->subchannels = gpr_malloc(sizeof(grpc_subchannel *) * args->num_subchannels); p->num_subchannels = args->num_subchannels; p->workqueue = args->workqueue; - grpc_workqueue_ref(p->workqueue); + GRPC_WORKQUEUE_REF(p->workqueue, "pick_first"); grpc_connectivity_state_init(&p->state_tracker, args->workqueue, GRPC_CHANNEL_IDLE, "pick_first"); memcpy(p->subchannels, args->subchannels, diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index cbc96ca9923..66a8c9f99df 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -197,7 +197,7 @@ static void dns_destroy(grpc_resolver *gr) { grpc_client_config_unref(r->resolved_config); } grpc_subchannel_factory_unref(r->subchannel_factory); - grpc_workqueue_unref(r->workqueue); + GRPC_WORKQUEUE_UNREF(r->workqueue, "dns"); gpr_free(r->name); gpr_free(r->default_port); gpr_free(r->lb_policy_name); @@ -227,7 +227,7 @@ static grpc_resolver *dns_create(grpc_resolver_args *args, r->subchannel_factory = args->subchannel_factory; grpc_subchannel_factory_ref(r->subchannel_factory); r->workqueue = args->workqueue; - grpc_workqueue_ref(r->workqueue); + GRPC_WORKQUEUE_REF(r->workqueue, "dns"); r->lb_policy_name = gpr_strdup(lb_policy_name); return &r->base; } diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index cb3b6070f27..abfb7b8569c 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -157,7 +157,7 @@ static void sockaddr_destroy(grpc_resolver *gr) { sockaddr_resolver *r = (sockaddr_resolver *)gr; gpr_mu_destroy(&r->mu); grpc_subchannel_factory_unref(r->subchannel_factory); - grpc_workqueue_unref(r->workqueue); + GRPC_WORKQUEUE_UNREF(r->workqueue, "sockaddr"); gpr_free(r->addrs); gpr_free(r->addrs_len); gpr_free(r->lb_policy_name); @@ -331,7 +331,7 @@ static grpc_resolver *sockaddr_create( r->subchannel_factory = args->subchannel_factory; grpc_subchannel_factory_ref(r->subchannel_factory); r->workqueue = args->workqueue; - grpc_workqueue_ref(r->workqueue); + GRPC_WORKQUEUE_REF(r->workqueue, "sockaddr"); r->lb_policy_name = gpr_strdup(lb_policy_name); return &r->base; diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index 99479b79c51..2047d2fee75 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -260,7 +260,7 @@ static void subchannel_destroy(grpc_subchannel *c) { grpc_mdctx_unref(c->mdctx); grpc_connectivity_state_destroy(&c->state_tracker); grpc_connector_unref(c->connector); - grpc_workqueue_unref(c->workqueue); + GRPC_WORKQUEUE_UNREF(c->workqueue, "subchannel"); gpr_free(c); } @@ -298,7 +298,7 @@ grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, c->mdctx = args->mdctx; c->master = args->master; c->workqueue = grpc_channel_get_workqueue(c->master); - grpc_workqueue_ref(c->workqueue); + GRPC_WORKQUEUE_REF(c->workqueue, "subchannel"); c->pollset_set = grpc_client_channel_get_connecting_pollset_set(parent_elem); c->random = random_seed(); grpc_mdctx_ref(c->mdctx); diff --git a/src/core/httpcli/httpcli.c b/src/core/httpcli/httpcli.c index 4bfe3cf9738..75f3f7db4b1 100644 --- a/src/core/httpcli/httpcli.c +++ b/src/core/httpcli/httpcli.c @@ -106,7 +106,7 @@ static void finish(internal_request *req, int success) { grpc_iomgr_unregister_object(&req->iomgr_obj); gpr_slice_buffer_destroy(&req->incoming); gpr_slice_buffer_destroy(&req->outgoing); - grpc_workqueue_unref(req->workqueue); + GRPC_WORKQUEUE_UNREF(req->workqueue, "destroy"); gpr_free(req); } diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index 69518597d57..5bdce0bfd8a 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -72,7 +72,7 @@ static gpr_mu fd_freelist_mu; static void freelist_fd(grpc_fd *fd) { if (fd->workqueue->wakeup_read_fd != fd) { - grpc_workqueue_unref(fd->workqueue); + GRPC_WORKQUEUE_UNREF(fd->workqueue, "fd"); } gpr_mu_lock(&fd_freelist_mu); fd->freelist_next = fd_freelist; @@ -167,7 +167,7 @@ grpc_fd *grpc_fd_create(int fd, grpc_workqueue *workqueue, const char *name) { /* if the wakeup_read_fd is NULL, then the workqueue is under construction ==> this fd will be the wakeup_read_fd, and we shouldn't take a ref */ if (workqueue->wakeup_read_fd != NULL) { - grpc_workqueue_ref(workqueue); + GRPC_WORKQUEUE_REF(workqueue, "fd"); } grpc_iomgr_register_object(&r->iomgr_object, name); return r; diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index 5d1fc687673..67eff3e5285 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -126,8 +126,6 @@ void grpc_iomgr_shutdown(void) { } gpr_mu_unlock(&g_mu); - memset(&g_root_object, 0, sizeof(g_root_object)); - grpc_alarm_list_shutdown(); grpc_iomgr_platform_shutdown(); diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c index 02d37350f75..c6c716e4dfd 100644 --- a/src/core/iomgr/tcp_server_posix.c +++ b/src/core/iomgr/tcp_server_posix.c @@ -151,7 +151,7 @@ static void finish_shutdown(grpc_tcp_server *s) { gpr_mu_destroy(&s->mu); gpr_free(s->ports); - grpc_workqueue_unref(s->workqueue); + GRPC_WORKQUEUE_UNREF(s->workqueue, "destroy"); gpr_free(s); } diff --git a/src/core/iomgr/udp_server.c b/src/core/iomgr/udp_server.c index 96688054fbf..30957f8dee7 100644 --- a/src/core/iomgr/udp_server.c +++ b/src/core/iomgr/udp_server.c @@ -144,7 +144,7 @@ static void finish_shutdown(grpc_udp_server *s) { gpr_cv_destroy(&s->cv); gpr_free(s->ports); - grpc_workqueue_unref(s->workqueue); + GRPC_WORKQUEUE_UNREF(s->workqueue, "workqueue"); gpr_free(s); } diff --git a/src/core/iomgr/workqueue.h b/src/core/iomgr/workqueue.h index 0bfa959953c..a236651fbd4 100644 --- a/src/core/iomgr/workqueue.h +++ b/src/core/iomgr/workqueue.h @@ -52,8 +52,23 @@ typedef struct grpc_workqueue grpc_workqueue; /** Create a work queue */ grpc_workqueue *grpc_workqueue_create(void); +void grpc_workqueue_flush(grpc_workqueue *workqueue, int asynchronously); + +#ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG +#define GRPC_WORKQUEUE_REF(p, r) \ + grpc_workqueue_ref((p), __FILE__, __LINE__, (r)) +#define GRPC_WORKQUEUE_UNREF(p, r) \ + grpc_workqueue_unref((p), __FILE__, __LINE__, (r)) +void grpc_workqueue_ref(grpc_workqueue *workqueue, const char *file, int line, + const char *reason); +void grpc_workqueue_unref(grpc_workqueue *workqueue, const char *file, int line, + const char *reason); +#else +#define GRPC_WORKQUEUE_REF(p, r) grpc_workqueue_ref((p)) +#define GRPC_WORKQUEUE_UNREF(p, r) grpc_workqueue_unref((p)) void grpc_workqueue_ref(grpc_workqueue *workqueue); void grpc_workqueue_unref(grpc_workqueue *workqueue); +#endif /** Bind this workqueue to a pollset */ void grpc_workqueue_add_to_pollset(grpc_workqueue *workqueue, diff --git a/src/core/iomgr/workqueue_posix.c b/src/core/iomgr/workqueue_posix.c index 26626bef3bc..ec3ce713b0c 100644 --- a/src/core/iomgr/workqueue_posix.c +++ b/src/core/iomgr/workqueue_posix.c @@ -35,12 +35,15 @@ #ifdef GPR_POSIX_SOCKET -#include "src/core/iomgr/fd_posix.h" #include "src/core/iomgr/workqueue.h" #include #include +#include +#include + +#include "src/core/iomgr/fd_posix.h" static void on_readable(void *arg, int success); @@ -61,15 +64,81 @@ grpc_workqueue *grpc_workqueue_create(void) { return workqueue; } +static void shutdown_thread(void *arg) { + grpc_iomgr_closure *todo = arg; + + while (todo) { + grpc_iomgr_closure *next = todo->next; + todo->cb(todo->cb_arg, todo->success); + todo = next; + } +} + +#ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG +static size_t count_waiting(grpc_workqueue *workqueue) { + size_t i = 0; + grpc_iomgr_closure *c; + for (c = workqueue->head.next; c; c = c->next) { + i++; + } + return i; +} +#endif + +void grpc_workqueue_flush(grpc_workqueue *workqueue, int asynchronously) { + grpc_iomgr_closure *todo; + gpr_thd_id thd; + + gpr_mu_lock(&workqueue->mu); +#ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG + gpr_log(GPR_DEBUG, "WORKQUEUE:%p flush %d objects %s", workqueue, + count_waiting(workqueue), + asynchronously ? "asynchronously" : "synchronously"); +#endif + todo = workqueue->head.next; + workqueue->head.next = NULL; + workqueue->tail = &workqueue->head; + gpr_mu_unlock(&workqueue->mu); + + if (todo != NULL) { + if (asynchronously) { + gpr_thd_new(&thd, shutdown_thread, todo, NULL); + } else { + while (todo) { + grpc_iomgr_closure *next = todo->next; + todo->cb(todo->cb_arg, todo->success); + todo = next; + } + } + } +} + static void workqueue_destroy(grpc_workqueue *workqueue) { + GPR_ASSERT(workqueue->tail == &workqueue->head); grpc_fd_shutdown(workqueue->wakeup_read_fd); } +#ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG +void grpc_workqueue_ref(grpc_workqueue *workqueue, const char *file, int line, + const char *reason) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p ref %d -> %d %s", + workqueue, (int)workqueue->refs.count, (int)workqueue->refs.count + 1, + reason); +#else void grpc_workqueue_ref(grpc_workqueue *workqueue) { +#endif gpr_ref(&workqueue->refs); } +#ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG +void grpc_workqueue_unref(grpc_workqueue *workqueue, const char *file, int line, + const char *reason) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p unref %d -> %d %s", + workqueue, (int)workqueue->refs.count, (int)workqueue->refs.count - 1, + reason); +#else void grpc_workqueue_unref(grpc_workqueue *workqueue) { +#endif if (gpr_unref(&workqueue->refs)) { workqueue_destroy(workqueue); } @@ -94,6 +163,10 @@ static void on_readable(void *arg, int success) { return; } else { gpr_mu_lock(&workqueue->mu); +#ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG + gpr_log(GPR_DEBUG, "WORKQUEUE:%p %d objects", workqueue, + count_waiting(workqueue)); +#endif todo = workqueue->head.next; workqueue->head.next = NULL; workqueue->tail = &workqueue->head; @@ -119,6 +192,10 @@ void grpc_workqueue_push(grpc_workqueue *workqueue, grpc_iomgr_closure *closure, } workqueue->tail->next = closure; workqueue->tail = closure; +#ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG + gpr_log(GPR_DEBUG, "WORKQUEUE:%p %d objects", workqueue, + count_waiting(workqueue)); +#endif gpr_mu_unlock(&workqueue->mu); } diff --git a/src/core/surface/server.c b/src/core/surface/server.c index aba0f94fd48..efddb9ee479 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -365,7 +365,7 @@ static void server_delete(grpc_server *server) { } request_matcher_destroy(&server->unregistered_request_matcher); gpr_stack_lockfree_destroy(server->request_freelist); - grpc_workqueue_unref(server->workqueue); + GRPC_WORKQUEUE_UNREF(server->workqueue, "destroy"); gpr_free(server->cqs); gpr_free(server->pollsets); gpr_free(server->shutdown_tags); @@ -392,6 +392,7 @@ static void orphan_channel(channel_data *chand) { static void finish_destroy_channel(void *cd, int success) { channel_data *chand = cd; grpc_server *server = chand->server; + gpr_log(GPR_DEBUG, "finish_destroy_channel: %p", chand->channel); GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "server"); server_unref(server); } @@ -404,6 +405,8 @@ static void destroy_channel(channel_data *chand) { maybe_finish_shutdown(chand->server); chand->finish_destroy_channel_closure.cb = finish_destroy_channel; chand->finish_destroy_channel_closure.cb_arg = chand; + gpr_log(GPR_DEBUG, "queue finish_destroy_channel: %p on %p", chand->channel, + chand->server->workqueue); grpc_workqueue_push(chand->server->workqueue, &chand->finish_destroy_channel_closure, 1); } @@ -1074,6 +1077,8 @@ void grpc_server_destroy(grpc_server *server) { gpr_mu_unlock(&server->mu_global); + grpc_workqueue_flush(server->workqueue, 0); + server_unref(server); } diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index 705a025ccaa..896f5a331ae 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -242,8 +242,9 @@ static void init_transport(grpc_chttp2_transport *t, t->parsing.deframe_state = is_client ? GRPC_DTS_FH_0 : GRPC_DTS_CLIENT_PREFIX_0; t->writing.is_client = is_client; - grpc_connectivity_state_init(&t->channel_callback.state_tracker, workqueue, - GRPC_CHANNEL_READY, "transport"); + grpc_connectivity_state_init( + &t->channel_callback.state_tracker, workqueue, GRPC_CHANNEL_READY, + is_client ? "client_transport" : "server_transport"); gpr_slice_buffer_init(&t->global.qbuf); diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c index 716280505e8..cf23adfbb23 100644 --- a/src/core/transport/connectivity_state.c +++ b/src/core/transport/connectivity_state.c @@ -61,6 +61,8 @@ void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, const char *name) { tracker->current_state = init_state; tracker->watchers = NULL; + tracker->workqueue = workqueue; + GRPC_WORKQUEUE_REF(workqueue, name); tracker->name = gpr_strdup(name); } @@ -79,6 +81,7 @@ void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker) { grpc_workqueue_push(tracker->workqueue, w->notify, success); gpr_free(w); } + GRPC_WORKQUEUE_UNREF(tracker->workqueue, tracker->name); gpr_free(tracker->name); } diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index 01fcb9275e4..48534ce0605 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -168,6 +168,6 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, grpc_completion_queue_destroy(a.cq); gpr_slice_buffer_destroy(&outgoing); - grpc_workqueue_unref(workqueue); + GRPC_WORKQUEUE_UNREF(workqueue, "destroy"); grpc_shutdown(); } diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 13cc6b4d99e..16dc7044051 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -171,7 +171,7 @@ int main(int argc, char **argv) { grpc_end2end_tests(configs[i]); } - grpc_workqueue_unref(g_workqueue); + GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); grpc_shutdown(); return 0; diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index 044c9e47b04..9d7e973b8e2 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -157,7 +157,8 @@ int main(int argc, char **argv) { grpc_end2end_tests(configs[i]); } - grpc_workqueue_unref(g_workqueue); + grpc_workqueue_flush(g_workqueue, 1); + GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); grpc_shutdown(); return 0; diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 0fec408c30c..2a3002bc579 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -157,7 +157,7 @@ int main(int argc, char **argv) { grpc_end2end_tests(configs[i]); } - grpc_workqueue_unref(g_workqueue); + GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); grpc_shutdown(); return 0; diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c index 3c1c50e3c44..9fe54771bd5 100644 --- a/test/core/iomgr/endpoint_pair_test.c +++ b/test/core/iomgr/endpoint_pair_test.c @@ -74,7 +74,7 @@ int main(int argc, char **argv) { g_workqueue = grpc_workqueue_create(); grpc_endpoint_tests(configs[0], &g_pollset); grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); - grpc_workqueue_unref(g_workqueue); + GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); 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 f5fd3b017d9..30852050ceb 100644 --- a/test/core/iomgr/fd_conservation_posix_test.c +++ b/test/core/iomgr/fd_conservation_posix_test.c @@ -61,7 +61,7 @@ int main(int argc, char **argv) { grpc_endpoint_destroy(p.server); } - grpc_workqueue_unref(workqueue); + GRPC_WORKQUEUE_UNREF(workqueue, "destroy"); grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index 8b68439dce1..0f9b323e770 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -495,7 +495,7 @@ int main(int argc, char **argv) { test_grpc_fd(); test_grpc_fd_change(); grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); - grpc_workqueue_unref(g_workqueue); + GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index c73347b94fb..4a6786c0a24 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -247,7 +247,7 @@ int main(int argc, char **argv) { test_times_out(); grpc_pollset_set_destroy(&g_pollset_set); grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); - grpc_workqueue_unref(g_workqueue); + GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index 6d080c2b975..01162eb2252 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -479,7 +479,7 @@ int main(int argc, char **argv) { grpc_pollset_init(&g_pollset); run_tests(); grpc_endpoint_tests(configs[0], &g_pollset); - grpc_workqueue_unref(g_workqueue); + GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); grpc_shutdown(); diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c index 99a9de7c9d0..5663af80e8d 100644 --- a/test/core/iomgr/workqueue_test.c +++ b/test/core/iomgr/workqueue_test.c @@ -66,7 +66,7 @@ static void test_add_closure(void) { GPR_ASSERT(done); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_workqueue_unref(wq); + GRPC_WORKQUEUE_UNREF(wq, "destroy"); } static void done_shutdown(void *arg) { grpc_pollset_destroy(arg); } diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index 67fa9322a70..e0bdea527ad 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -170,7 +170,7 @@ int main(int argc, char **argv) { grpc_pollset_init(&g_pollset); grpc_endpoint_tests(configs[0], &g_pollset); test_leftover(configs[1], 1); - grpc_workqueue_unref(g_workqueue); + GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); grpc_shutdown(); From 99b65f22610458f9623f6db93b651cc04ac476cf Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 17 Sep 2015 08:52:59 -0700 Subject: [PATCH 08/56] Test bug fixes --- test/core/bad_client/bad_client.c | 4 +++- test/core/end2end/fixtures/h2_sockpair+trace.c | 1 + test/core/end2end/fixtures/h2_sockpair_1byte.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index 48534ce0605..938da7a3e14 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -88,7 +88,7 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, gpr_slice_from_copied_buffer(client_payload, client_payload_length); gpr_slice_buffer outgoing; grpc_iomgr_closure done_write_closure; - grpc_workqueue *workqueue = grpc_workqueue_create(); + grpc_workqueue *workqueue; hex = gpr_dump(client_payload, client_payload_length, GPR_DUMP_HEX | GPR_DUMP_ASCII); @@ -101,6 +101,8 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, /* Init grpc */ grpc_init(); + workqueue = grpc_workqueue_create(); + /* Create endpoints */ sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536, workqueue); diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 16dc7044051..919a5065213 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -171,6 +171,7 @@ int main(int argc, char **argv) { grpc_end2end_tests(configs[i]); } + grpc_workqueue_flush(g_workqueue, 1); GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); grpc_shutdown(); diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 2a3002bc579..44bb4c5dc0e 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -157,6 +157,7 @@ int main(int argc, char **argv) { grpc_end2end_tests(configs[i]); } + grpc_workqueue_flush(g_workqueue, 1); GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); grpc_shutdown(); From 2d2711f9e6fd3ac783f400fcd4e72798636f194e Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 17 Sep 2015 09:46:57 -0700 Subject: [PATCH 09/56] Poke fd workqueues on add - to unblock a potential starvation issue --- src/core/iomgr/pollset_posix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 2ed8c84ebbf..291181d9a52 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -145,6 +145,7 @@ void grpc_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd) { } gpr_mu_lock(&pollset->mu); pollset->vtable->add_fd(pollset, fd, 1); + grpc_workqueue_flush(fd->workqueue, 0); /* the following (enabled only in debug) will reacquire and then release our lock - meaning that if the unlocking flag passed to del_fd above is not respected, the code will deadlock (in a way that we have a chance of From 5795da7c96642f3e19c8cfe105de7d1cc7cf6fbc Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 17 Sep 2015 15:27:13 -0700 Subject: [PATCH 10/56] Update connectivity state code to be completely synchronous --- src/core/channel/client_channel.c | 75 ++++++++---- .../client_config/lb_policies/pick_first.c | 113 +++++++++++++----- src/core/client_config/lb_policy.c | 9 +- src/core/client_config/lb_policy.h | 15 ++- .../client_config/resolvers/dns_resolver.c | 31 +++-- .../resolvers/sockaddr_resolver.c | 21 +++- .../resolvers/zookeeper_resolver.c | 25 +++- src/core/client_config/subchannel.c | 67 ++++++++--- src/core/client_config/subchannel.h | 8 +- src/core/iomgr/workqueue.h | 1 + src/core/surface/call.c | 2 + src/core/transport/chttp2_transport.c | 25 ++-- src/core/transport/connectivity_state.c | 73 ++++++----- src/core/transport/connectivity_state.h | 38 ++++-- 14 files changed, 350 insertions(+), 153 deletions(-) diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 6fefdec2f64..5b165972a70 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -437,20 +437,28 @@ static void cc_start_transport_stream_op(grpc_call_element *elem, static void watch_lb_policy(channel_data *chand, grpc_lb_policy *lb_policy, grpc_connectivity_state current_state); +static void on_lb_policy_state_changed_locked( + lb_policy_connectivity_watcher *w) { + /* check if the notification is for a stale policy */ + if (w->lb_policy != w->chand->lb_policy) return; + + grpc_connectivity_state_set(&w->chand->state_tracker, w->state, "lb_changed"); + if (w->state != GRPC_CHANNEL_FATAL_FAILURE) { + watch_lb_policy(w->chand, w->lb_policy, w->state); + } +} + static void on_lb_policy_state_changed(void *arg, int iomgr_success) { lb_policy_connectivity_watcher *w = arg; + grpc_connectivity_state_flusher f; gpr_mu_lock(&w->chand->mu_config); - /* check if the notification is for a stale policy */ - if (w->lb_policy == w->chand->lb_policy) { - grpc_connectivity_state_set(&w->chand->state_tracker, w->state, - "lb_changed"); - if (w->state != GRPC_CHANNEL_FATAL_FAILURE) { - watch_lb_policy(w->chand, w->lb_policy, w->state); - } - } + on_lb_policy_state_changed_locked(w); + grpc_connectivity_state_begin_flush(&w->chand->state_tracker, &f); gpr_mu_unlock(&w->chand->mu_config); + grpc_connectivity_state_end_flush(&f); + GRPC_CHANNEL_INTERNAL_UNREF(w->chand->master, "watch_lb_policy"); gpr_free(w); } @@ -464,7 +472,13 @@ static void watch_lb_policy(channel_data *chand, grpc_lb_policy *lb_policy, grpc_iomgr_closure_init(&w->on_changed, on_lb_policy_state_changed, w); w->state = current_state; w->lb_policy = lb_policy; - grpc_lb_policy_notify_on_state_change(lb_policy, &w->state, &w->on_changed); + if (grpc_lb_policy_notify_on_state_change(lb_policy, &w->state, + &w->on_changed) + .state_already_changed) { + on_lb_policy_state_changed_locked(w); + GRPC_CHANNEL_INTERNAL_UNREF(w->chand->master, "watch_lb_policy"); + gpr_free(w); + } } static void cc_on_config_changed(void *arg, int iomgr_success) { @@ -474,6 +488,7 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { grpc_resolver *old_resolver; grpc_iomgr_closure *wakeup_closures = NULL; grpc_connectivity_state state = GRPC_CHANNEL_TRANSIENT_FAILURE; + grpc_connectivity_state_flusher f; int exit_idle = 0; if (chand->incoming_configuration != NULL) { @@ -507,20 +522,24 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { GRPC_RESOLVER_REF(resolver, "channel-next"); grpc_connectivity_state_set(&chand->state_tracker, state, "new_lb+resolver"); + if (lb_policy != NULL) { + watch_lb_policy(chand, lb_policy, state); + } + grpc_connectivity_state_begin_flush(&chand->state_tracker, &f); gpr_mu_unlock(&chand->mu_config); GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); + grpc_connectivity_state_end_flush(&f); grpc_resolver_next(resolver, &chand->incoming_configuration, &chand->on_config_changed); GRPC_RESOLVER_UNREF(resolver, "channel-next"); - if (lb_policy != NULL) { - watch_lb_policy(chand, lb_policy, state); - } } else { old_resolver = chand->resolver; chand->resolver = NULL; grpc_connectivity_state_set(&chand->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "resolver_gone"); + grpc_connectivity_state_begin_flush(&chand->state_tracker, &f); gpr_mu_unlock(&chand->mu_config); + grpc_connectivity_state_end_flush(&f); if (old_resolver != NULL) { grpc_resolver_shutdown(old_resolver); GRPC_RESOLVER_UNREF(old_resolver, "channel"); @@ -554,7 +573,9 @@ static void cc_start_transport_op(grpc_channel_element *elem, grpc_lb_policy *lb_policy = NULL; channel_data *chand = elem->channel_data; grpc_resolver *destroy_resolver = NULL; - grpc_iomgr_closure *on_consumed = op->on_consumed; + grpc_connectivity_state_flusher f; + grpc_iomgr_closure *call_list = op->on_consumed; + call_list->next = NULL; op->on_consumed = NULL; GPR_ASSERT(op->set_accept_stream == NULL); @@ -562,9 +583,13 @@ static void cc_start_transport_op(grpc_channel_element *elem, gpr_mu_lock(&chand->mu_config); if (op->on_connectivity_state_change != NULL) { - grpc_connectivity_state_notify_on_state_change( - &chand->state_tracker, op->connectivity_state, - op->on_connectivity_state_change); + if (grpc_connectivity_state_notify_on_state_change( + &chand->state_tracker, op->connectivity_state, + op->on_connectivity_state_change) + .state_already_changed) { + op->on_connectivity_state_change->next = call_list; + call_list = op->on_connectivity_state_change; + } op->on_connectivity_state_change = NULL; op->connectivity_state = NULL; } @@ -587,7 +612,9 @@ static void cc_start_transport_op(grpc_channel_element *elem, chand->lb_policy = NULL; } } + grpc_connectivity_state_begin_flush(&chand->state_tracker, &f); gpr_mu_unlock(&chand->mu_config); + grpc_connectivity_state_end_flush(&f); if (destroy_resolver) { grpc_resolver_shutdown(destroy_resolver); @@ -599,9 +626,10 @@ static void cc_start_transport_op(grpc_channel_element *elem, GRPC_LB_POLICY_UNREF(lb_policy, "broadcast"); } - if (on_consumed) { - grpc_workqueue_push(grpc_channel_get_workqueue(chand->master), on_consumed, - 1); + while (call_list != NULL) { + grpc_iomgr_closure *next = call_list->next; + call_list->cb(call_list->cb_arg, 1); + call_list = next; } } @@ -671,7 +699,6 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, chand); grpc_connectivity_state_init(&chand->state_tracker, - grpc_channel_get_workqueue(master), GRPC_CHANNEL_IDLE, "client_channel"); } @@ -750,10 +777,14 @@ void grpc_client_channel_watch_connectivity_state( grpc_channel_element *elem, grpc_connectivity_state *state, grpc_iomgr_closure *on_complete) { channel_data *chand = elem->channel_data; + grpc_connectivity_state_notify_on_state_change_result r; gpr_mu_lock(&chand->mu_config); - grpc_connectivity_state_notify_on_state_change(&chand->state_tracker, state, - on_complete); + r = grpc_connectivity_state_notify_on_state_change(&chand->state_tracker, + state, on_complete); gpr_mu_unlock(&chand->mu_config); + if (r.state_already_changed) { + on_complete->cb(on_complete->cb_arg, 1); + } } grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set( diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index 575ee02249b..804dbdeadde 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -110,38 +110,54 @@ void pf_destroy(grpc_lb_policy *pol) { void pf_shutdown(grpc_lb_policy *pol) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; + grpc_connectivity_state_flusher f; pending_pick *pp; gpr_mu_lock(&p->mu); del_interested_parties_locked(p); p->shutdown = 1; - while ((pp = p->pending_picks)) { - p->pending_picks = pp->next; - *pp->target = NULL; - grpc_workqueue_push(p->workqueue, pp->on_complete, 0); - gpr_free(pp); - } + pp = p->pending_picks; + p->pending_picks = NULL; grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "shutdown"); + grpc_connectivity_state_begin_flush(&p->state_tracker, &f); gpr_mu_unlock(&p->mu); + grpc_connectivity_state_end_flush(&f); + while (pp != NULL) { + pending_pick *next = pp->next; + *pp->target = NULL; + pp->on_complete->cb(pp->on_complete->cb_arg, 0); + gpr_free(pp); + pp = next; + } } -static void start_picking(pick_first_lb_policy *p) { +/* returns a closure to call, or NULL */ +static grpc_iomgr_closure *start_picking(pick_first_lb_policy *p) { p->started_picking = 1; p->checking_subchannel = 0; p->checking_connectivity = GRPC_CHANNEL_IDLE; GRPC_LB_POLICY_REF(&p->base, "pick_first_connectivity"); - grpc_subchannel_notify_on_state_change(p->subchannels[p->checking_subchannel], - &p->checking_connectivity, - &p->connectivity_changed); + if (grpc_subchannel_notify_on_state_change( + p->subchannels[p->checking_subchannel], &p->checking_connectivity, + &p->connectivity_changed) + .state_already_changed) { + return &p->connectivity_changed; + } else { + return NULL; + } } void pf_exit_idle(grpc_lb_policy *pol) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; + grpc_iomgr_closure *call = NULL; gpr_mu_lock(&p->mu); if (!p->started_picking) { - start_picking(p); + call = start_picking(p); } gpr_mu_unlock(&p->mu); + if (call) { + call->cb(call->cb_arg, 1); + } } void pf_pick(grpc_lb_policy *pol, grpc_pollset *pollset, @@ -155,8 +171,9 @@ void pf_pick(grpc_lb_policy *pol, grpc_pollset *pollset, *target = p->selected; on_complete->cb(on_complete->cb_arg, 1); } else { + grpc_iomgr_closure *call = NULL; if (!p->started_picking) { - start_picking(p); + call = start_picking(p); } grpc_subchannel_add_interested_party(p->subchannels[p->checking_subchannel], pollset); @@ -167,6 +184,9 @@ void pf_pick(grpc_lb_policy *pol, grpc_pollset *pollset, pp->on_complete = on_complete; p->pending_picks = pp; gpr_mu_unlock(&p->mu); + if (call) { + call->cb(call->cb_arg, 1); + } } } @@ -174,6 +194,8 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { pick_first_lb_policy *p = arg; pending_pick *pp; int unref = 0; + grpc_iomgr_closure *cbs = NULL; + grpc_connectivity_state_flusher f; gpr_mu_lock(&p->mu); @@ -183,8 +205,12 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { grpc_connectivity_state_set(&p->state_tracker, p->checking_connectivity, "selected_changed"); if (p->checking_connectivity != GRPC_CHANNEL_FATAL_FAILURE) { - grpc_subchannel_notify_on_state_change( - p->selected, &p->checking_connectivity, &p->connectivity_changed); + if (grpc_subchannel_notify_on_state_change( + p->selected, &p->checking_connectivity, &p->connectivity_changed) + .state_already_changed) { + p->connectivity_changed.next = cbs; + cbs = &p->connectivity_changed; + } } else { unref = 1; } @@ -199,11 +225,17 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { p->pending_picks = pp->next; *pp->target = p->selected; grpc_subchannel_del_interested_party(p->selected, pp->pollset); - grpc_workqueue_push(p->workqueue, pp->on_complete, 1); + pp->on_complete->next = cbs; + cbs = pp->on_complete; gpr_free(pp); } - grpc_subchannel_notify_on_state_change( - p->selected, &p->checking_connectivity, &p->connectivity_changed); + if (grpc_subchannel_notify_on_state_change(p->selected, + &p->checking_connectivity, + &p->connectivity_changed) + .state_already_changed) { + p->connectivity_changed.next = cbs; + cbs = &p->connectivity_changed; + } break; case GRPC_CHANNEL_TRANSIENT_FAILURE: grpc_connectivity_state_set(&p->state_tracker, @@ -216,9 +248,13 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { p->subchannels[p->checking_subchannel]); add_interested_parties_locked(p); if (p->checking_connectivity == GRPC_CHANNEL_TRANSIENT_FAILURE) { - grpc_subchannel_notify_on_state_change( - p->subchannels[p->checking_subchannel], &p->checking_connectivity, - &p->connectivity_changed); + if (grpc_subchannel_notify_on_state_change( + p->subchannels[p->checking_subchannel], + &p->checking_connectivity, &p->connectivity_changed) + .state_already_changed) { + p->connectivity_changed.next = cbs; + cbs = &p->connectivity_changed; + } } else { goto loop; } @@ -227,9 +263,13 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { case GRPC_CHANNEL_IDLE: grpc_connectivity_state_set(&p->state_tracker, p->checking_connectivity, "connecting_changed"); - grpc_subchannel_notify_on_state_change( - p->subchannels[p->checking_subchannel], &p->checking_connectivity, - &p->connectivity_changed); + if (grpc_subchannel_notify_on_state_change( + p->subchannels[p->checking_subchannel], + &p->checking_connectivity, &p->connectivity_changed) + .state_already_changed) { + p->connectivity_changed.next = cbs; + cbs = &p->connectivity_changed; + } break; case GRPC_CHANNEL_FATAL_FAILURE: del_interested_parties_locked(p); @@ -244,7 +284,8 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = NULL; - grpc_workqueue_push(p->workqueue, pp->on_complete, 1); + pp->on_complete->next = cbs; + cbs = pp->on_complete; gpr_free(pp); } unref = 1; @@ -261,7 +302,15 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { } } + grpc_connectivity_state_begin_flush(&p->state_tracker, &f); gpr_mu_unlock(&p->mu); + grpc_connectivity_state_end_flush(&f); + + while (cbs != NULL) { + grpc_iomgr_closure *next = cbs->next; + cbs->cb(cbs->cb_arg, 1); + cbs = next; + } if (unref) { GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity"); @@ -299,14 +348,16 @@ static grpc_connectivity_state pf_check_connectivity(grpc_lb_policy *pol) { return st; } -static void pf_notify_on_state_change(grpc_lb_policy *pol, - grpc_connectivity_state *current, - grpc_iomgr_closure *notify) { +static grpc_connectivity_state_notify_on_state_change_result +pf_notify_on_state_change(grpc_lb_policy *pol, grpc_connectivity_state *current, + grpc_iomgr_closure *notify) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; + grpc_connectivity_state_notify_on_state_change_result r; gpr_mu_lock(&p->mu); - grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, - notify); + r = grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, + notify); gpr_mu_unlock(&p->mu); + return r; } static const grpc_lb_policy_vtable pick_first_lb_policy_vtable = { @@ -332,8 +383,8 @@ static grpc_lb_policy *create_pick_first(grpc_lb_policy_factory *factory, p->num_subchannels = args->num_subchannels; p->workqueue = args->workqueue; GRPC_WORKQUEUE_REF(p->workqueue, "pick_first"); - grpc_connectivity_state_init(&p->state_tracker, args->workqueue, - GRPC_CHANNEL_IDLE, "pick_first"); + grpc_connectivity_state_init(&p->state_tracker, GRPC_CHANNEL_IDLE, + "pick_first"); memcpy(p->subchannels, args->subchannels, sizeof(grpc_subchannel *) * args->num_subchannels); grpc_iomgr_closure_init(&p->connectivity_changed, pf_connectivity_changed, p); diff --git a/src/core/client_config/lb_policy.c b/src/core/client_config/lb_policy.c index 90ec44432f8..48a787da8a1 100644 --- a/src/core/client_config/lb_policy.c +++ b/src/core/client_config/lb_policy.c @@ -82,10 +82,11 @@ void grpc_lb_policy_exit_idle(grpc_lb_policy *policy) { policy->vtable->exit_idle(policy); } -void grpc_lb_policy_notify_on_state_change(grpc_lb_policy *policy, - grpc_connectivity_state *state, - grpc_iomgr_closure *closure) { - policy->vtable->notify_on_state_change(policy, state, closure); +grpc_connectivity_state_notify_on_state_change_result +grpc_lb_policy_notify_on_state_change(grpc_lb_policy *policy, + grpc_connectivity_state *state, + grpc_iomgr_closure *closure) { + return policy->vtable->notify_on_state_change(policy, state, closure); } grpc_connectivity_state grpc_lb_policy_check_connectivity( diff --git a/src/core/client_config/lb_policy.h b/src/core/client_config/lb_policy.h index 3f7ca8f28dd..7c9bdac6484 100644 --- a/src/core/client_config/lb_policy.h +++ b/src/core/client_config/lb_policy.h @@ -35,6 +35,7 @@ #define GRPC_INTERNAL_CORE_CLIENT_CONFIG_LB_POLICY_H #include "src/core/client_config/subchannel.h" +#include "src/core/transport/connectivity_state.h" /** A load balancing policy: specified by a vtable and a struct (which is expected to be extended to contain some parameters) */ @@ -70,9 +71,10 @@ struct grpc_lb_policy_vtable { /** call notify when the connectivity state of a channel changes from *state. Updates *state with the new state of the policy */ - void (*notify_on_state_change)(grpc_lb_policy *policy, - grpc_connectivity_state *state, - grpc_iomgr_closure *closure); + grpc_connectivity_state_notify_on_state_change_result ( + *notify_on_state_change)(grpc_lb_policy *policy, + grpc_connectivity_state *state, + grpc_iomgr_closure *closure); }; #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG @@ -111,9 +113,10 @@ void grpc_lb_policy_broadcast(grpc_lb_policy *policy, grpc_transport_op *op); void grpc_lb_policy_exit_idle(grpc_lb_policy *policy); -void grpc_lb_policy_notify_on_state_change(grpc_lb_policy *policy, - grpc_connectivity_state *state, - grpc_iomgr_closure *closure); +grpc_connectivity_state_notify_on_state_change_result +grpc_lb_policy_notify_on_state_change( + grpc_lb_policy *policy, grpc_connectivity_state *state, + grpc_iomgr_closure *closure) GRPC_MUST_USE_RESULT; grpc_connectivity_state grpc_lb_policy_check_connectivity( grpc_lb_policy *policy); diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index 66a8c9f99df..4fee543a5be 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -79,7 +79,8 @@ typedef struct { static void dns_destroy(grpc_resolver *r); static void dns_start_resolving_locked(dns_resolver *r); -static void dns_maybe_finish_next_locked(dns_resolver *r); +static grpc_iomgr_closure *dns_maybe_finish_next_locked(dns_resolver *r) + GRPC_MUST_USE_RESULT; static void dns_shutdown(grpc_resolver *r); static void dns_channel_saw_error(grpc_resolver *r, @@ -93,13 +94,15 @@ static const grpc_resolver_vtable dns_resolver_vtable = { static void dns_shutdown(grpc_resolver *resolver) { dns_resolver *r = (dns_resolver *)resolver; + grpc_iomgr_closure *next_completion; gpr_mu_lock(&r->mu); - if (r->next_completion != NULL) { + next_completion = r->next_completion; + r->next_completion = NULL; + gpr_mu_unlock(&r->mu); + if (next_completion != NULL) { *r->target_config = NULL; - grpc_workqueue_push(r->workqueue, r->next_completion, 1); - r->next_completion = NULL; + next_completion->cb(next_completion->cb_arg, 1); } - gpr_mu_unlock(&r->mu); } static void dns_channel_saw_error(grpc_resolver *resolver, struct sockaddr *sa, @@ -116,6 +119,7 @@ static void dns_next(grpc_resolver *resolver, grpc_client_config **target_config, grpc_iomgr_closure *on_complete) { dns_resolver *r = (dns_resolver *)resolver; + grpc_iomgr_closure *call = NULL; gpr_mu_lock(&r->mu); GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; @@ -123,9 +127,12 @@ static void dns_next(grpc_resolver *resolver, if (r->resolved_version == 0 && !r->resolving) { dns_start_resolving_locked(r); } else { - dns_maybe_finish_next_locked(r); + call = dns_maybe_finish_next_locked(r); } gpr_mu_unlock(&r->mu); + if (call) { + call->cb(call->cb_arg, 1); + } } static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses) { @@ -134,6 +141,7 @@ static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses) { grpc_subchannel **subchannels; grpc_subchannel_args args; grpc_lb_policy *lb_policy; + grpc_iomgr_closure *call; size_t i; if (addresses) { grpc_lb_policy_args lb_policy_args; @@ -164,8 +172,11 @@ static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses) { } r->resolved_config = config; r->resolved_version++; - dns_maybe_finish_next_locked(r); + call = dns_maybe_finish_next_locked(r); gpr_mu_unlock(&r->mu); + if (call) { + call->cb(call->cb_arg, 1); + } GRPC_RESOLVER_UNREF(&r->base, "dns-resolving"); } @@ -177,17 +188,19 @@ static void dns_start_resolving_locked(dns_resolver *r) { grpc_resolve_address(r->name, r->default_port, dns_on_resolved, r); } -static void dns_maybe_finish_next_locked(dns_resolver *r) { +static grpc_iomgr_closure *dns_maybe_finish_next_locked(dns_resolver *r) { + grpc_iomgr_closure *ret = NULL; if (r->next_completion != NULL && r->resolved_version != r->published_version) { *r->target_config = r->resolved_config; if (r->resolved_config) { grpc_client_config_ref(r->resolved_config); } - grpc_workqueue_push(r->workqueue, r->next_completion, 1); + ret = r->next_completion; r->next_completion = NULL; r->published_version = r->resolved_version; } + return ret; } static void dns_destroy(grpc_resolver *gr) { diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index abfb7b8569c..220915853c0 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -80,7 +80,8 @@ typedef struct { static void sockaddr_destroy(grpc_resolver *r); -static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r); +static grpc_iomgr_closure *sockaddr_maybe_finish_next_locked( + sockaddr_resolver *r) GRPC_MUST_USE_RESULT; static void sockaddr_shutdown(grpc_resolver *r); static void sockaddr_channel_saw_error(grpc_resolver *r, @@ -95,13 +96,17 @@ static const grpc_resolver_vtable sockaddr_resolver_vtable = { static void sockaddr_shutdown(grpc_resolver *resolver) { sockaddr_resolver *r = (sockaddr_resolver *)resolver; + grpc_iomgr_closure *call = NULL; gpr_mu_lock(&r->mu); if (r->next_completion != NULL) { *r->target_config = NULL; - grpc_workqueue_push(r->workqueue, r->next_completion, 1); + call = r->next_completion; r->next_completion = NULL; } gpr_mu_unlock(&r->mu); + if (call) { + call->cb(call->cb_arg, 1); + } } static void sockaddr_channel_saw_error(grpc_resolver *resolver, @@ -111,20 +116,24 @@ static void sockaddr_next(grpc_resolver *resolver, grpc_client_config **target_config, grpc_iomgr_closure *on_complete) { sockaddr_resolver *r = (sockaddr_resolver *)resolver; + grpc_iomgr_closure *call = NULL; gpr_mu_lock(&r->mu); GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; r->target_config = target_config; - sockaddr_maybe_finish_next_locked(r); + call = sockaddr_maybe_finish_next_locked(r); gpr_mu_unlock(&r->mu); + if (call) call->cb(call->cb_arg, 1); } -static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r) { +static grpc_iomgr_closure *sockaddr_maybe_finish_next_locked( + sockaddr_resolver *r) { grpc_client_config *cfg; grpc_lb_policy *lb_policy; grpc_lb_policy_args lb_policy_args; grpc_subchannel **subchannels; grpc_subchannel_args args; + grpc_iomgr_closure *call = NULL; if (r->next_completion != NULL && !r->published) { size_t i; @@ -148,9 +157,11 @@ static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r) { GRPC_LB_POLICY_UNREF(lb_policy, "unix"); r->published = 1; *r->target_config = cfg; - grpc_workqueue_push(r->workqueue, r->next_completion, 1); + call = r->next_completion; r->next_completion = NULL; } + + return call; } static void sockaddr_destroy(grpc_resolver *gr) { diff --git a/src/core/client_config/resolvers/zookeeper_resolver.c b/src/core/client_config/resolvers/zookeeper_resolver.c index bc042037448..94ec12dd169 100644 --- a/src/core/client_config/resolvers/zookeeper_resolver.c +++ b/src/core/client_config/resolvers/zookeeper_resolver.c @@ -92,7 +92,8 @@ typedef struct { static void zookeeper_destroy(grpc_resolver *r); static void zookeeper_start_resolving_locked(zookeeper_resolver *r); -static void zookeeper_maybe_finish_next_locked(zookeeper_resolver *r); +static grpc_iomgr_closure *zookeeper_maybe_finish_next_locked( + zookeeper_resolver *r) GRPC_MUST_USE_RESULT; static void zookeeper_shutdown(grpc_resolver *r); static void zookeeper_channel_saw_error(grpc_resolver *r, @@ -107,14 +108,18 @@ static const grpc_resolver_vtable zookeeper_resolver_vtable = { static void zookeeper_shutdown(grpc_resolver *resolver) { zookeeper_resolver *r = (zookeeper_resolver *)resolver; + grpc_iomgr_closure *call = NULL; gpr_mu_lock(&r->mu); if (r->next_completion != NULL) { *r->target_config = NULL; - grpc_workqueue_push(r->workqueue, r->next_completion, 1); + call = r->next_completion; r->next_completion = NULL; } zookeeper_close(r->zookeeper_handle); gpr_mu_unlock(&r->mu); + if (call != NULL) { + call->cb(call->cb_arg, 1); + } } static void zookeeper_channel_saw_error(grpc_resolver *resolver, @@ -131,6 +136,7 @@ static void zookeeper_next(grpc_resolver *resolver, grpc_client_config **target_config, grpc_iomgr_closure *on_complete) { zookeeper_resolver *r = (zookeeper_resolver *)resolver; + grpc_iomgr_closure *call; gpr_mu_lock(&r->mu); GPR_ASSERT(r->next_completion == NULL); r->next_completion = on_complete; @@ -138,9 +144,10 @@ static void zookeeper_next(grpc_resolver *resolver, if (r->resolved_version == 0 && r->resolving == 0) { zookeeper_start_resolving_locked(r); } else { - zookeeper_maybe_finish_next_locked(r); + call = zookeeper_maybe_finish_next_locked(r); } gpr_mu_unlock(&r->mu); + if (call) call->cb(call->cb_arg, 1); } /** Zookeeper global watcher for connection management @@ -182,6 +189,7 @@ static void zookeeper_on_resolved(void *arg, grpc_subchannel **subchannels; grpc_subchannel_args args; grpc_lb_policy *lb_policy; + grpc_iomgr_closure *call; size_t i; if (addresses != NULL) { grpc_lb_policy_args lb_policy_args; @@ -211,9 +219,11 @@ static void zookeeper_on_resolved(void *arg, } r->resolved_config = config; r->resolved_version++; - zookeeper_maybe_finish_next_locked(r); + call = zookeeper_maybe_finish_next_locked(r); gpr_mu_unlock(&r->mu); + if (call) call->cb(call->cb_arg, 1); + GRPC_RESOLVER_UNREF(&r->base, "zookeeper-resolving"); } @@ -404,17 +414,20 @@ static void zookeeper_start_resolving_locked(zookeeper_resolver *r) { zookeeper_resolve_address(r); } -static void zookeeper_maybe_finish_next_locked(zookeeper_resolver *r) { +static grpc_iomgr_closure *zookeeper_maybe_finish_next_locked( + zookeeper_resolver *r) { + grpc_iomgr_closure *call = NULL; if (r->next_completion != NULL && r->resolved_version != r->published_version) { *r->target_config = r->resolved_config; if (r->resolved_config != NULL) { grpc_client_config_ref(r->resolved_config); } - grpc_workqueue_push(r->workqueue, r->next_completion, 1); + call = r->next_completion; r->next_completion = NULL; r->published_version = r->resolved_version; } + return call; } static void zookeeper_destroy(grpc_resolver *gr) { diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index 2047d2fee75..6fbf9664754 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -303,8 +303,8 @@ grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, c->random = random_seed(); grpc_mdctx_ref(c->mdctx); grpc_iomgr_closure_init(&c->connected, subchannel_connected, c); - grpc_connectivity_state_init(&c->state_tracker, c->workqueue, - GRPC_CHANNEL_IDLE, "subchannel"); + grpc_connectivity_state_init(&c->state_tracker, GRPC_CHANNEL_IDLE, + "subchannel"); gpr_mu_init(&c->mu); return c; } @@ -365,12 +365,15 @@ void grpc_subchannel_create_call(grpc_subchannel *c, grpc_pollset *pollset, c->waiting = w4c; grpc_subchannel_add_interested_party(c, pollset); if (!c->connecting) { + grpc_connectivity_state_flusher f; c->connecting = 1; connectivity_state_changed_locked(c, "create_call"); /* released by connection */ SUBCHANNEL_REF_LOCKED(c, "connecting"); GRPC_CHANNEL_INTERNAL_REF(c->master, "connecting"); + grpc_connectivity_state_begin_flush(&c->state_tracker, &f); gpr_mu_unlock(&c->mu); + grpc_connectivity_state_end_flush(&f); start_connect(c); } else { @@ -387,24 +390,33 @@ grpc_connectivity_state grpc_subchannel_check_connectivity(grpc_subchannel *c) { return state; } -void grpc_subchannel_notify_on_state_change(grpc_subchannel *c, - grpc_connectivity_state *state, - grpc_iomgr_closure *notify) { +grpc_connectivity_state_notify_on_state_change_result +grpc_subchannel_notify_on_state_change(grpc_subchannel *c, + grpc_connectivity_state *state, + grpc_iomgr_closure *notify) { int do_connect = 0; + grpc_connectivity_state_notify_on_state_change_result r; gpr_mu_lock(&c->mu); - if (grpc_connectivity_state_notify_on_state_change(&c->state_tracker, state, - notify)) { + r = grpc_connectivity_state_notify_on_state_change(&c->state_tracker, state, + notify); + if (r.current_state_is_idle) { + grpc_connectivity_state_flusher f; do_connect = 1; c->connecting = 1; /* released by connection */ SUBCHANNEL_REF_LOCKED(c, "connecting"); GRPC_CHANNEL_INTERNAL_REF(c->master, "connecting"); connectivity_state_changed_locked(c, "state_change"); - } + grpc_connectivity_state_begin_flush(&c->state_tracker, &f); + gpr_mu_unlock(&c->mu); + grpc_connectivity_state_end_flush(&f); + } else { gpr_mu_unlock(&c->mu); + } if (do_connect) { start_connect(c); } + return r; } void grpc_subchannel_process_transport_op(grpc_subchannel *c, @@ -413,18 +425,23 @@ void grpc_subchannel_process_transport_op(grpc_subchannel *c, grpc_subchannel *destroy; int cancel_alarm = 0; gpr_mu_lock(&c->mu); + if (c->active != NULL) { + con = c->active; + CONNECTION_REF_LOCKED(con, "transport-op"); + } if (op->disconnect) { + grpc_connectivity_state_flusher f; c->disconnected = 1; connectivity_state_changed_locked(c, "disconnect"); if (c->have_alarm) { cancel_alarm = 1; } - } - if (c->active != NULL) { - con = c->active; - CONNECTION_REF_LOCKED(con, "transport-op"); - } + grpc_connectivity_state_begin_flush(&c->state_tracker, &f); + gpr_mu_unlock(&c->mu); + grpc_connectivity_state_end_flush(&f); + } else { gpr_mu_unlock(&c->mu); + } if (con != NULL) { grpc_channel_stack *channel_stack = CHANNEL_STACK_FROM_CONNECTION(con); @@ -457,6 +474,7 @@ static void on_state_changed(void *p, int iomgr_success) { grpc_transport_op op; grpc_channel_element *elem; connection *destroy_connection = NULL; + grpc_connectivity_state_flusher f; gpr_mu_lock(mu); @@ -498,7 +516,9 @@ done: connectivity_state_changed_locked(c, "transport_state_changed"); destroy = SUBCHANNEL_UNREF_LOCKED(c, "state_watcher"); gpr_free(sw); + grpc_connectivity_state_begin_flush(&c->state_tracker, &f); gpr_mu_unlock(mu); + grpc_connectivity_state_end_flush(&f); if (destroy) { subchannel_destroy(c); } @@ -518,6 +538,7 @@ static void publish_transport(grpc_subchannel *c) { state_watcher *sw; connection *destroy_connection = NULL; grpc_channel_element *elem; + grpc_connectivity_state_flusher f; /* build final filter list */ num_filters = c->num_filters + c->connecting_result.num_filters + 1; @@ -581,12 +602,18 @@ static void publish_transport(grpc_subchannel *c) { /* signal completion */ connectivity_state_changed_locked(c, "connected"); - while ((w4c = c->waiting)) { - c->waiting = w4c->next; - grpc_workqueue_push(c->workqueue, &w4c->continuation, 1); - } + w4c = c->waiting; + c->waiting = NULL; + grpc_connectivity_state_begin_flush(&c->state_tracker, &f); gpr_mu_unlock(&c->mu); + grpc_connectivity_state_end_flush(&f); + + while (w4c != NULL) { + waiting_for_connect *next = w4c; + w4c->continuation.cb(w4c->continuation.cb_arg, 1); + w4c = next; + } gpr_free(filters); @@ -626,13 +653,16 @@ static void update_reconnect_parameters(grpc_subchannel *c) { static void on_alarm(void *arg, int iomgr_success) { grpc_subchannel *c = arg; + grpc_connectivity_state_flusher f; gpr_mu_lock(&c->mu); c->have_alarm = 0; if (c->disconnected) { iomgr_success = 0; } connectivity_state_changed_locked(c, "alarm"); + grpc_connectivity_state_begin_flush(&c->state_tracker, &f); gpr_mu_unlock(&c->mu); + grpc_connectivity_state_end_flush(&f); if (iomgr_success) { update_reconnect_parameters(c); continue_connect(c); @@ -648,12 +678,15 @@ static void subchannel_connected(void *arg, int iomgr_success) { publish_transport(c); } else { gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); + grpc_connectivity_state_flusher f; gpr_mu_lock(&c->mu); GPR_ASSERT(!c->have_alarm); c->have_alarm = 1; connectivity_state_changed_locked(c, "connect_failed"); grpc_alarm_init(&c->alarm, c->next_attempt, on_alarm, c, now); + grpc_connectivity_state_begin_flush(&c->state_tracker, &f); gpr_mu_unlock(&c->mu); + grpc_connectivity_state_end_flush(&f); } } diff --git a/src/core/client_config/subchannel.h b/src/core/client_config/subchannel.h index 2e36c69134a..391df36bfd7 100644 --- a/src/core/client_config/subchannel.h +++ b/src/core/client_config/subchannel.h @@ -36,6 +36,7 @@ #include "src/core/channel/channel_stack.h" #include "src/core/client_config/connector.h" +#include "src/core/transport/connectivity_state.h" /** A (sub-)channel that knows how to connect to exactly one target address. Provides a target for load balancing. */ @@ -87,9 +88,10 @@ 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_subchannel *channel, - grpc_connectivity_state *state, - grpc_iomgr_closure *notify); +grpc_connectivity_state_notify_on_state_change_result +grpc_subchannel_notify_on_state_change( + grpc_subchannel *channel, grpc_connectivity_state *state, + grpc_iomgr_closure *notify) GRPC_MUST_USE_RESULT; /** express interest in \a channel's activities through \a pollset. */ void grpc_subchannel_add_interested_party(grpc_subchannel *channel, diff --git a/src/core/iomgr/workqueue.h b/src/core/iomgr/workqueue.h index a236651fbd4..124f294a230 100644 --- a/src/core/iomgr/workqueue.h +++ b/src/core/iomgr/workqueue.h @@ -54,6 +54,7 @@ grpc_workqueue *grpc_workqueue_create(void); void grpc_workqueue_flush(grpc_workqueue *workqueue, int asynchronously); +#define GRPC_WORKQUEUE_REFCOUNT_DEBUG #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG #define GRPC_WORKQUEUE_REF(p, r) \ grpc_workqueue_ref((p), __FILE__, __LINE__, (r)) diff --git a/src/core/surface/call.c b/src/core/surface/call.c index c2b30403191..8f9e97a3967 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -654,6 +654,8 @@ static void unlock(grpc_call *call) { if (!call->bound_pollset && call->cq && (!call->is_client || start_op)) { call->bound_pollset = 1; op.bind_pollset = grpc_cq_pollset(call->cq); + grpc_workqueue_add_to_pollset(grpc_channel_get_workqueue(call->channel), + op.bind_pollset); start_op = 1; } diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index 896f5a331ae..6376c397a2b 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -243,7 +243,7 @@ static void init_transport(grpc_chttp2_transport *t, is_client ? GRPC_DTS_FH_0 : GRPC_DTS_CLIENT_PREFIX_0; t->writing.is_client = is_client; grpc_connectivity_state_init( - &t->channel_callback.state_tracker, workqueue, GRPC_CHANNEL_READY, + &t->channel_callback.state_tracker, GRPC_CHANNEL_READY, is_client ? "client_transport" : "server_transport"); gpr_slice_buffer_init(&t->global.qbuf); @@ -500,6 +500,7 @@ static void lock(grpc_chttp2_transport *t) { gpr_mu_lock(&t->mu); } static void unlock(grpc_chttp2_transport *t) { grpc_iomgr_closure *run_closures; + grpc_connectivity_state_flusher f; unlock_check_read_write_state(t); if (!t->writing_active && !t->closed && @@ -514,8 +515,11 @@ static void unlock(grpc_chttp2_transport *t) { t->global.pending_closures_head = NULL; t->global.pending_closures_tail = NULL; + grpc_connectivity_state_begin_flush(&t->channel_callback.state_tracker, &f); gpr_mu_unlock(&t->mu); + grpc_connectivity_state_end_flush(&f); + while (run_closures) { grpc_iomgr_closure *next = run_closures->next; run_closures->cb(run_closures->cb_arg, run_closures->success); @@ -755,9 +759,13 @@ static void perform_transport_op(grpc_transport *gt, grpc_transport_op *op) { } if (op->on_connectivity_state_change) { - grpc_connectivity_state_notify_on_state_change( - &t->channel_callback.state_tracker, op->connectivity_state, - op->on_connectivity_state_change); + if (grpc_connectivity_state_notify_on_state_change( + &t->channel_callback.state_tracker, op->connectivity_state, + op->on_connectivity_state_change) + .state_already_changed) { + grpc_chttp2_schedule_closure(&t->global, op->on_connectivity_state_change, + 1); + } } if (op->send_goaway) { @@ -1185,19 +1193,14 @@ static void recv_data(void *tp, int success) { * CALLBACK LOOP */ -static void schedule_closure_for_connectivity(void *a, - grpc_iomgr_closure *closure) { - grpc_chttp2_schedule_closure(a, closure, 1); -} - static void connectivity_state_set( grpc_chttp2_transport_global *transport_global, grpc_connectivity_state state, const char *reason) { GRPC_CHTTP2_IF_TRACING( gpr_log(GPR_DEBUG, "set connectivity_state=%d", state)); - grpc_connectivity_state_set_with_scheduler( + grpc_connectivity_state_set( &TRANSPORT_FROM_GLOBAL(transport_global)->channel_callback.state_tracker, - state, schedule_closure_for_connectivity, transport_global, reason); + state, reason); } void grpc_chttp2_schedule_closure( diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c index cf23adfbb23..034f82474f5 100644 --- a/src/core/transport/connectivity_state.c +++ b/src/core/transport/connectivity_state.c @@ -32,6 +32,9 @@ */ #include "src/core/transport/connectivity_state.h" + +#include + #include #include #include @@ -56,14 +59,12 @@ const char *grpc_connectivity_state_name(grpc_connectivity_state state) { } void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, - grpc_workqueue *workqueue, grpc_connectivity_state init_state, const char *name) { tracker->current_state = init_state; tracker->watchers = NULL; - tracker->workqueue = workqueue; - GRPC_WORKQUEUE_REF(workqueue, name); tracker->name = gpr_strdup(name); + tracker->changed = 0; } void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker) { @@ -78,10 +79,9 @@ void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker) { } else { success = 0; } - grpc_workqueue_push(tracker->workqueue, w->notify, success); + w->notify->cb(w->notify->cb_arg, success); gpr_free(w); } - GRPC_WORKQUEUE_UNREF(tracker->workqueue, tracker->name); gpr_free(tracker->name); } @@ -90,9 +90,12 @@ grpc_connectivity_state grpc_connectivity_state_check( return tracker->current_state; } -int grpc_connectivity_state_notify_on_state_change( +grpc_connectivity_state_notify_on_state_change_result +grpc_connectivity_state_notify_on_state_change( grpc_connectivity_state_tracker *tracker, grpc_connectivity_state *current, grpc_iomgr_closure *notify) { + grpc_connectivity_state_notify_on_state_change_result result; + memset(&result, 0, sizeof(result)); if (grpc_connectivity_state_trace) { gpr_log(GPR_DEBUG, "CONWATCH: %s: from %s [cur=%s]", tracker->name, grpc_connectivity_state_name(*current), @@ -100,7 +103,7 @@ int grpc_connectivity_state_notify_on_state_change( } if (tracker->current_state != *current) { *current = tracker->current_state; - grpc_workqueue_push(tracker->workqueue, notify, 1); + result.state_already_changed = 1; } else { grpc_connectivity_state_watcher *w = gpr_malloc(sizeof(*w)); w->current = current; @@ -108,15 +111,13 @@ int grpc_connectivity_state_notify_on_state_change( w->next = tracker->watchers; tracker->watchers = w; } - return tracker->current_state == GRPC_CHANNEL_IDLE; + result.current_state_is_idle = tracker->current_state == GRPC_CHANNEL_IDLE; + return result; } -void grpc_connectivity_state_set_with_scheduler( - grpc_connectivity_state_tracker *tracker, grpc_connectivity_state state, - void (*scheduler)(void *arg, grpc_iomgr_closure *closure), void *arg, - const char *reason) { - grpc_connectivity_state_watcher *new = NULL; - grpc_connectivity_state_watcher *w; +void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, + grpc_connectivity_state state, + const char *reason) { if (grpc_connectivity_state_trace) { gpr_log(GPR_DEBUG, "SET: %s: %s --> %s [%s]", tracker->name, grpc_connectivity_state_name(tracker->current_state), @@ -127,28 +128,40 @@ void grpc_connectivity_state_set_with_scheduler( } GPR_ASSERT(tracker->current_state != GRPC_CHANNEL_FATAL_FAILURE); tracker->current_state = state; - while ((w = tracker->watchers)) { - tracker->watchers = w->next; + tracker->changed = 1; +} - if (state != *w->current) { - *w->current = state; - scheduler(arg, w->notify); +void grpc_connectivity_state_begin_flush( + grpc_connectivity_state_tracker *tracker, + grpc_connectivity_state_flusher *flusher) { + grpc_connectivity_state_watcher *w; + flusher->cbs = NULL; + if (!tracker->changed) return; + w = tracker->watchers; + tracker->watchers = NULL; + while (w != NULL) { + grpc_connectivity_state_watcher *next = w->next; + if (tracker->current_state != *w->current) { + *w->current = tracker->current_state; + w->notify->next = flusher->cbs; + flusher->cbs = w->notify; gpr_free(w); } else { - w->next = new; - new = w; + w->next = tracker->watchers; + tracker->watchers = w; } + w = next; } - tracker->watchers = new; + tracker->changed = 0; } -static void default_scheduler(void *workqueue, grpc_iomgr_closure *closure) { - grpc_workqueue_push(workqueue, closure, 1); +void grpc_connectivity_state_end_flush( + grpc_connectivity_state_flusher *flusher) { + grpc_iomgr_closure *c = flusher->cbs; + while (c != NULL) { + grpc_iomgr_closure *next = c; + c->cb(c->cb_arg, 1); + c = next; + } } -void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, - grpc_connectivity_state state, - const char *reason) { - grpc_connectivity_state_set_with_scheduler(tracker, state, default_scheduler, - tracker->workqueue, reason); -} diff --git a/src/core/transport/connectivity_state.h b/src/core/transport/connectivity_state.h index 6c61e026234..323af2740cd 100644 --- a/src/core/transport/connectivity_state.h +++ b/src/core/transport/connectivity_state.h @@ -54,32 +54,52 @@ typedef struct { grpc_connectivity_state_watcher *watchers; /** a name to help debugging */ char *name; - /** workqueue for async work */ - grpc_workqueue *workqueue; + /** has this state been changed since the last flush? */ + int changed; } grpc_connectivity_state_tracker; +typedef struct { grpc_iomgr_closure *cbs; } grpc_connectivity_state_flusher; + extern int grpc_connectivity_state_trace; void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, - grpc_workqueue *grpc_workqueue, grpc_connectivity_state init_state, const char *name); 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_connectivity_state_tracker *tracker, grpc_connectivity_state state, const char *reason); -void grpc_connectivity_state_set_with_scheduler( - grpc_connectivity_state_tracker *tracker, grpc_connectivity_state state, - void (*scheduler)(void *arg, grpc_iomgr_closure *closure), void *arg, - const char *reason); + +/** Begin flushing callbacks; not thread safe; access must be serialized using + * the same external lock as grpc_connectivity_state_set. Initializes flusher. + */ +void grpc_connectivity_state_begin_flush( + grpc_connectivity_state_tracker *tracker, + grpc_connectivity_state_flusher *flusher); + +/** Complete flushing updates: must not be called with any locks held */ +void grpc_connectivity_state_end_flush( + grpc_connectivity_state_flusher *flusher); grpc_connectivity_state grpc_connectivity_state_check( grpc_connectivity_state_tracker *tracker); +typedef struct { + /** 1 if the current state is idle (a hint to begin connecting), 0 otherwise + */ + int current_state_is_idle; + /** 1 if the state has already changed: in this case the closure passed to + * grpc_connectivity_state_notify_on_state_change will not be called */ + int state_already_changed; +} grpc_connectivity_state_notify_on_state_change_result; + /** Return 1 if the channel should start connecting, 0 otherwise */ -int grpc_connectivity_state_notify_on_state_change( +grpc_connectivity_state_notify_on_state_change_result +grpc_connectivity_state_notify_on_state_change( grpc_connectivity_state_tracker *tracker, grpc_connectivity_state *current, - grpc_iomgr_closure *notify); + grpc_iomgr_closure *notify) GRPC_MUST_USE_RESULT; #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CONNECTIVITY_STATE_H */ From 38adec97e875c21cd9d6cc9d039664bdf4fdb889 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 17 Sep 2015 15:41:31 -0700 Subject: [PATCH 11/56] Dont log on an empty wq --- src/core/iomgr/workqueue_posix.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/iomgr/workqueue_posix.c b/src/core/iomgr/workqueue_posix.c index ec3ce713b0c..ead8c50d8ea 100644 --- a/src/core/iomgr/workqueue_posix.c +++ b/src/core/iomgr/workqueue_posix.c @@ -91,9 +91,11 @@ void grpc_workqueue_flush(grpc_workqueue *workqueue, int asynchronously) { gpr_mu_lock(&workqueue->mu); #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG - gpr_log(GPR_DEBUG, "WORKQUEUE:%p flush %d objects %s", workqueue, - count_waiting(workqueue), - asynchronously ? "asynchronously" : "synchronously"); + if (workqueue->head.next) { + gpr_log(GPR_DEBUG, "WORKQUEUE:%p flush %d objects %s", workqueue, + count_waiting(workqueue), + asynchronously ? "asynchronously" : "synchronously"); + } #endif todo = workqueue->head.next; workqueue->head.next = NULL; From 000cd8f9f7346defc79fe6aa877af11b42ab5f1e Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 18 Sep 2015 07:20:29 -0700 Subject: [PATCH 12/56] Introduce call lists for moving work outside locks --- src/core/channel/client_channel.c | 139 ++++++++---------- src/core/channel/client_channel.h | 5 +- .../client_config/lb_policies/pick_first.c | 127 ++++++---------- src/core/client_config/lb_policy.c | 35 +++-- src/core/client_config/lb_policy.h | 43 +++--- src/core/client_config/subchannel.c | 91 +++++------- src/core/client_config/subchannel.h | 11 +- src/core/iomgr/iomgr.c | 39 +++++ src/core/iomgr/iomgr.h | 15 ++ .../iomgr/pollset_multipoller_with_epoll.c | 2 +- src/core/iomgr/pollset_posix.c | 48 ++++-- src/core/iomgr/pollset_posix.h | 10 ++ src/core/surface/channel.c | 8 +- src/core/surface/channel_connectivity.c | 16 +- src/core/transport/chttp2/internal.h | 8 +- src/core/transport/chttp2/writing.c | 4 +- src/core/transport/chttp2_transport.c | 67 +++------ src/core/transport/connectivity_state.c | 62 ++------ src/core/transport/connectivity_state.h | 32 +--- 19 files changed, 352 insertions(+), 410 deletions(-) diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 5b165972a70..a2346503d90 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -73,7 +73,7 @@ typedef struct { guarded by mu_config */ grpc_client_config *incoming_configuration; /** a list of closures that are all waiting for config to come in */ - grpc_iomgr_closure *waiting_for_config_closures; + grpc_iomgr_call_list waiting_for_config_closures; /** resolver callback */ grpc_iomgr_closure on_config_changed; /** connectivity state being tracked */ @@ -181,8 +181,8 @@ static void add_to_lb_policy_wait_queue_locked_state_config( waiting_call *wc = gpr_malloc(sizeof(*wc)); grpc_iomgr_closure_init(&wc->closure, continue_with_pick, wc); wc->elem = elem; - wc->closure.next = chand->waiting_for_config_closures; - chand->waiting_for_config_closures = &wc->closure; + grpc_iomgr_call_list_add(&chand->waiting_for_config_closures, &wc->closure, + 1); } static int is_empty(void *p, int len) { @@ -230,6 +230,7 @@ static void started_call(void *arg, int iomgr_success) { static void picked_target(void *arg, int iomgr_success) { call_data *calld = arg; grpc_pollset *pollset; + grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; if (calld->picked_channel == NULL) { /* treat this like a cancellation */ @@ -248,9 +249,10 @@ static void picked_target(void *arg, int iomgr_success) { grpc_iomgr_closure_init(&calld->async_setup_task, started_call, calld); grpc_subchannel_create_call(calld->picked_channel, pollset, &calld->subchannel_call, - &calld->async_setup_task); + &calld->async_setup_task, &call_list); } } + grpc_iomgr_call_list_run(call_list); } static grpc_iomgr_closure *merge_into_waiting_op( @@ -310,7 +312,7 @@ static void perform_transport_stream_op(grpc_call_element *elem, grpc_subchannel_call *subchannel_call; grpc_lb_policy *lb_policy; grpc_transport_stream_op op2; - grpc_iomgr_closure *consumed_op = NULL; + grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; GPR_ASSERT(elem->filter == &grpc_client_channel_filter); GRPC_CALL_LOG_OP(GPR_INFO, elem, op); @@ -328,7 +330,7 @@ static void perform_transport_stream_op(grpc_call_element *elem, break; case CALL_WAITING_FOR_SEND: GPR_ASSERT(!continuation); - consumed_op = merge_into_waiting_op(elem, op); + grpc_iomgr_call_list_add(&call_list, merge_into_waiting_op(elem, op), 1); if (!calld->waiting_op.send_ops && calld->waiting_op.cancel_with_status == GRPC_STATUS_OK) { gpr_mu_unlock(&calld->mu_state); @@ -357,7 +359,8 @@ static void perform_transport_stream_op(grpc_call_element *elem, handle_op_after_cancellation(elem, op); handle_op_after_cancellation(elem, &op2); } else { - consumed_op = merge_into_waiting_op(elem, op); + grpc_iomgr_call_list_add(&call_list, merge_into_waiting_op(elem, op), + 1); gpr_mu_unlock(&calld->mu_state); } break; @@ -398,7 +401,7 @@ static void perform_transport_stream_op(grpc_call_element *elem, calld); grpc_lb_policy_pick(lb_policy, bind_pollset, initial_metadata, &calld->picked_channel, - &calld->async_setup_task); + &calld->async_setup_task, &call_list); GRPC_LB_POLICY_UNREF(lb_policy, "pick"); } else if (chand->resolver != NULL) { @@ -424,9 +427,7 @@ static void perform_transport_stream_op(grpc_call_element *elem, break; } - if (consumed_op != NULL) { - consumed_op->cb(consumed_op->cb_arg, 1); - } + grpc_iomgr_call_list_run(call_list); } static void cc_start_transport_stream_op(grpc_call_element *elem, @@ -435,36 +436,38 @@ static void cc_start_transport_stream_op(grpc_call_element *elem, } static void watch_lb_policy(channel_data *chand, grpc_lb_policy *lb_policy, - grpc_connectivity_state current_state); + grpc_connectivity_state current_state, + grpc_iomgr_call_list *cl); -static void on_lb_policy_state_changed_locked( - lb_policy_connectivity_watcher *w) { +static void on_lb_policy_state_changed_locked(lb_policy_connectivity_watcher *w, + grpc_iomgr_call_list *cl) { /* check if the notification is for a stale policy */ if (w->lb_policy != w->chand->lb_policy) return; - grpc_connectivity_state_set(&w->chand->state_tracker, w->state, "lb_changed"); + grpc_connectivity_state_set(&w->chand->state_tracker, w->state, "lb_changed", + cl); if (w->state != GRPC_CHANNEL_FATAL_FAILURE) { - watch_lb_policy(w->chand, w->lb_policy, w->state); + watch_lb_policy(w->chand, w->lb_policy, w->state, cl); } } static void on_lb_policy_state_changed(void *arg, int iomgr_success) { lb_policy_connectivity_watcher *w = arg; - grpc_connectivity_state_flusher f; + grpc_iomgr_call_list cl = GRPC_IOMGR_CALL_LIST_INIT; gpr_mu_lock(&w->chand->mu_config); - on_lb_policy_state_changed_locked(w); - grpc_connectivity_state_begin_flush(&w->chand->state_tracker, &f); + on_lb_policy_state_changed_locked(w, &cl); gpr_mu_unlock(&w->chand->mu_config); - grpc_connectivity_state_end_flush(&f); + grpc_iomgr_call_list_run(cl); GRPC_CHANNEL_INTERNAL_UNREF(w->chand->master, "watch_lb_policy"); gpr_free(w); } static void watch_lb_policy(channel_data *chand, grpc_lb_policy *lb_policy, - grpc_connectivity_state current_state) { + grpc_connectivity_state current_state, + grpc_iomgr_call_list *call_list) { lb_policy_connectivity_watcher *w = gpr_malloc(sizeof(*w)); GRPC_CHANNEL_INTERNAL_REF(chand->master, "watch_lb_policy"); @@ -472,13 +475,8 @@ static void watch_lb_policy(channel_data *chand, grpc_lb_policy *lb_policy, grpc_iomgr_closure_init(&w->on_changed, on_lb_policy_state_changed, w); w->state = current_state; w->lb_policy = lb_policy; - if (grpc_lb_policy_notify_on_state_change(lb_policy, &w->state, - &w->on_changed) - .state_already_changed) { - on_lb_policy_state_changed_locked(w); - GRPC_CHANNEL_INTERNAL_UNREF(w->chand->master, "watch_lb_policy"); - gpr_free(w); - } + grpc_lb_policy_notify_on_state_change(lb_policy, &w->state, &w->on_changed, + call_list); } static void cc_on_config_changed(void *arg, int iomgr_success) { @@ -486,9 +484,8 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { grpc_lb_policy *lb_policy = NULL; grpc_lb_policy *old_lb_policy; grpc_resolver *old_resolver; - grpc_iomgr_closure *wakeup_closures = NULL; grpc_connectivity_state state = GRPC_CHANNEL_TRANSIENT_FAILURE; - grpc_connectivity_state_flusher f; + grpc_iomgr_call_list cl = GRPC_IOMGR_CALL_LIST_INIT; int exit_idle = 0; if (chand->incoming_configuration != NULL) { @@ -496,7 +493,7 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { if (lb_policy != NULL) { GRPC_LB_POLICY_REF(lb_policy, "channel"); GRPC_LB_POLICY_REF(lb_policy, "config_change"); - state = grpc_lb_policy_check_connectivity(lb_policy); + state = grpc_lb_policy_check_connectivity(lb_policy, &cl); } grpc_client_config_unref(chand->incoming_configuration); @@ -508,8 +505,7 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { old_lb_policy = chand->lb_policy; chand->lb_policy = lb_policy; if (lb_policy != NULL || chand->resolver == NULL /* disconnected */) { - wakeup_closures = chand->waiting_for_config_closures; - chand->waiting_for_config_closures = NULL; + grpc_iomgr_call_list_move(&chand->waiting_for_config_closures, &cl); } if (lb_policy != NULL && chand->exit_idle_when_lb_policy_arrives) { GRPC_LB_POLICY_REF(lb_policy, "exit_idle"); @@ -520,15 +516,13 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { if (iomgr_success && chand->resolver) { grpc_resolver *resolver = chand->resolver; GRPC_RESOLVER_REF(resolver, "channel-next"); - grpc_connectivity_state_set(&chand->state_tracker, state, - "new_lb+resolver"); + grpc_connectivity_state_set(&chand->state_tracker, state, "new_lb+resolver", + &cl); if (lb_policy != NULL) { - watch_lb_policy(chand, lb_policy, state); + watch_lb_policy(chand, lb_policy, state, &cl); } - grpc_connectivity_state_begin_flush(&chand->state_tracker, &f); gpr_mu_unlock(&chand->mu_config); GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); - grpc_connectivity_state_end_flush(&f); grpc_resolver_next(resolver, &chand->incoming_configuration, &chand->on_config_changed); GRPC_RESOLVER_UNREF(resolver, "channel-next"); @@ -536,10 +530,9 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { old_resolver = chand->resolver; chand->resolver = NULL; grpc_connectivity_state_set(&chand->state_tracker, - GRPC_CHANNEL_FATAL_FAILURE, "resolver_gone"); - grpc_connectivity_state_begin_flush(&chand->state_tracker, &f); + GRPC_CHANNEL_FATAL_FAILURE, "resolver_gone", + &cl); gpr_mu_unlock(&chand->mu_config); - grpc_connectivity_state_end_flush(&f); if (old_resolver != NULL) { grpc_resolver_shutdown(old_resolver); GRPC_RESOLVER_UNREF(old_resolver, "channel"); @@ -547,24 +540,20 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { } if (exit_idle) { - grpc_lb_policy_exit_idle(lb_policy); + grpc_lb_policy_exit_idle(lb_policy, &cl); GRPC_LB_POLICY_UNREF(lb_policy, "exit_idle"); } if (old_lb_policy != NULL) { - grpc_lb_policy_shutdown(old_lb_policy); + grpc_lb_policy_shutdown(old_lb_policy, &cl); GRPC_LB_POLICY_UNREF(old_lb_policy, "channel"); } - while (wakeup_closures) { - grpc_iomgr_closure *next = wakeup_closures->next; - wakeup_closures->cb(wakeup_closures->cb_arg, 1); - wakeup_closures = next; - } - if (lb_policy != NULL) { GRPC_LB_POLICY_UNREF(lb_policy, "config_change"); } + + grpc_iomgr_call_list_run(cl); GRPC_CHANNEL_INTERNAL_UNREF(chand->master, "resolver"); } @@ -573,23 +562,21 @@ static void cc_start_transport_op(grpc_channel_element *elem, grpc_lb_policy *lb_policy = NULL; channel_data *chand = elem->channel_data; grpc_resolver *destroy_resolver = NULL; - grpc_connectivity_state_flusher f; - grpc_iomgr_closure *call_list = op->on_consumed; - call_list->next = NULL; - op->on_consumed = NULL; + grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; + + if (op->on_consumed) { + grpc_iomgr_call_list_add(&call_list, op->on_consumed, 1); + op->on_consumed = NULL; + } GPR_ASSERT(op->set_accept_stream == NULL); GPR_ASSERT(op->bind_pollset == NULL); gpr_mu_lock(&chand->mu_config); if (op->on_connectivity_state_change != NULL) { - if (grpc_connectivity_state_notify_on_state_change( - &chand->state_tracker, op->connectivity_state, - op->on_connectivity_state_change) - .state_already_changed) { - op->on_connectivity_state_change->next = call_list; - call_list = op->on_connectivity_state_change; - } + grpc_connectivity_state_notify_on_state_change( + &chand->state_tracker, op->connectivity_state, + op->on_connectivity_state_change, &call_list); op->on_connectivity_state_change = NULL; op->connectivity_state = NULL; } @@ -603,18 +590,17 @@ static void cc_start_transport_op(grpc_channel_element *elem, if (op->disconnect && chand->resolver != NULL) { grpc_connectivity_state_set(&chand->state_tracker, - GRPC_CHANNEL_FATAL_FAILURE, "disconnect"); + GRPC_CHANNEL_FATAL_FAILURE, "disconnect", + &call_list); destroy_resolver = chand->resolver; chand->resolver = NULL; if (chand->lb_policy != NULL) { - grpc_lb_policy_shutdown(chand->lb_policy); + grpc_lb_policy_shutdown(chand->lb_policy, &call_list); GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel"); chand->lb_policy = NULL; } } - grpc_connectivity_state_begin_flush(&chand->state_tracker, &f); gpr_mu_unlock(&chand->mu_config); - grpc_connectivity_state_end_flush(&f); if (destroy_resolver) { grpc_resolver_shutdown(destroy_resolver); @@ -622,15 +608,11 @@ static void cc_start_transport_op(grpc_channel_element *elem, } if (lb_policy) { - grpc_lb_policy_broadcast(lb_policy, op); + grpc_lb_policy_broadcast(lb_policy, op, &call_list); GRPC_LB_POLICY_UNREF(lb_policy, "broadcast"); } - while (call_list != NULL) { - grpc_iomgr_closure *next = call_list->next; - call_list->cb(call_list->cb_arg, 1); - call_list = next; - } + grpc_iomgr_call_list_run(call_list); } /* Constructor for call_data */ @@ -740,7 +722,7 @@ void grpc_client_channel_set_resolver(grpc_channel_stack *channel_stack, GPR_ASSERT(!chand->resolver); chand->resolver = resolver; GRPC_RESOLVER_REF(resolver, "channel"); - if (chand->waiting_for_config_closures != NULL || + if (!grpc_iomgr_call_list_empty(chand->waiting_for_config_closures) || chand->exit_idle_when_lb_policy_arrives) { chand->started_resolving = 1; GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); @@ -751,14 +733,15 @@ void grpc_client_channel_set_resolver(grpc_channel_stack *channel_stack, } grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_channel_element *elem, int try_to_connect) { + grpc_channel_element *elem, int try_to_connect, + grpc_iomgr_call_list *call_list) { channel_data *chand = elem->channel_data; grpc_connectivity_state out; gpr_mu_lock(&chand->mu_config); out = grpc_connectivity_state_check(&chand->state_tracker); if (out == GRPC_CHANNEL_IDLE && try_to_connect) { if (chand->lb_policy != NULL) { - grpc_lb_policy_exit_idle(chand->lb_policy); + grpc_lb_policy_exit_idle(chand->lb_policy, call_list); } else { chand->exit_idle_when_lb_policy_arrives = 1; if (!chand->started_resolving && chand->resolver != NULL) { @@ -775,16 +758,12 @@ grpc_connectivity_state grpc_client_channel_check_connectivity_state( void grpc_client_channel_watch_connectivity_state( grpc_channel_element *elem, grpc_connectivity_state *state, - grpc_iomgr_closure *on_complete) { + grpc_iomgr_closure *on_complete, grpc_iomgr_call_list *call_list) { channel_data *chand = elem->channel_data; - grpc_connectivity_state_notify_on_state_change_result r; gpr_mu_lock(&chand->mu_config); - r = grpc_connectivity_state_notify_on_state_change(&chand->state_tracker, - state, on_complete); + grpc_connectivity_state_notify_on_state_change(&chand->state_tracker, state, + on_complete, call_list); gpr_mu_unlock(&chand->mu_config); - if (r.state_already_changed) { - on_complete->cb(on_complete->cb_arg, 1); - } } grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set( diff --git a/src/core/channel/client_channel.h b/src/core/channel/client_channel.h index 13681e3956b..60090e8d7e2 100644 --- a/src/core/channel/client_channel.h +++ b/src/core/channel/client_channel.h @@ -53,11 +53,12 @@ void grpc_client_channel_set_resolver(grpc_channel_stack *channel_stack, grpc_resolver *resolver); grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_channel_element *elem, int try_to_connect); + grpc_channel_element *elem, int try_to_connect, + grpc_iomgr_call_list *call_list); void grpc_client_channel_watch_connectivity_state( grpc_channel_element *elem, grpc_connectivity_state *state, - grpc_iomgr_closure *on_complete); + grpc_iomgr_closure *on_complete, grpc_iomgr_call_list *call_list); grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set( grpc_channel_element *elem); diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index 804dbdeadde..8fd8dd7b671 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -108,9 +108,8 @@ void pf_destroy(grpc_lb_policy *pol) { gpr_free(p); } -void pf_shutdown(grpc_lb_policy *pol) { +void pf_shutdown(grpc_lb_policy *pol, grpc_iomgr_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; - grpc_connectivity_state_flusher f; pending_pick *pp; gpr_mu_lock(&p->mu); del_interested_parties_locked(p); @@ -118,51 +117,40 @@ void pf_shutdown(grpc_lb_policy *pol) { pp = p->pending_picks; p->pending_picks = NULL; grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, - "shutdown"); - grpc_connectivity_state_begin_flush(&p->state_tracker, &f); + "shutdown", call_list); gpr_mu_unlock(&p->mu); - grpc_connectivity_state_end_flush(&f); while (pp != NULL) { pending_pick *next = pp->next; *pp->target = NULL; - pp->on_complete->cb(pp->on_complete->cb_arg, 0); + grpc_iomgr_call_list_add(call_list, pp->on_complete, 1); gpr_free(pp); pp = next; } } -/* returns a closure to call, or NULL */ -static grpc_iomgr_closure *start_picking(pick_first_lb_policy *p) { +static void start_picking(pick_first_lb_policy *p, + grpc_iomgr_call_list *call_list) { p->started_picking = 1; p->checking_subchannel = 0; p->checking_connectivity = GRPC_CHANNEL_IDLE; GRPC_LB_POLICY_REF(&p->base, "pick_first_connectivity"); - if (grpc_subchannel_notify_on_state_change( - p->subchannels[p->checking_subchannel], &p->checking_connectivity, - &p->connectivity_changed) - .state_already_changed) { - return &p->connectivity_changed; - } else { - return NULL; - } + grpc_subchannel_notify_on_state_change(p->subchannels[p->checking_subchannel], + &p->checking_connectivity, + &p->connectivity_changed, call_list); } -void pf_exit_idle(grpc_lb_policy *pol) { +void pf_exit_idle(grpc_lb_policy *pol, grpc_iomgr_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; - grpc_iomgr_closure *call = NULL; gpr_mu_lock(&p->mu); if (!p->started_picking) { - call = start_picking(p); + start_picking(p, call_list); } gpr_mu_unlock(&p->mu); - if (call) { - call->cb(call->cb_arg, 1); - } } void pf_pick(grpc_lb_policy *pol, grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, grpc_subchannel **target, - grpc_iomgr_closure *on_complete) { + grpc_iomgr_closure *on_complete, grpc_iomgr_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; pending_pick *pp; gpr_mu_lock(&p->mu); @@ -171,9 +159,8 @@ void pf_pick(grpc_lb_policy *pol, grpc_pollset *pollset, *target = p->selected; on_complete->cb(on_complete->cb_arg, 1); } else { - grpc_iomgr_closure *call = NULL; if (!p->started_picking) { - call = start_picking(p); + start_picking(p, call_list); } grpc_subchannel_add_interested_party(p->subchannels[p->checking_subchannel], pollset); @@ -184,9 +171,6 @@ void pf_pick(grpc_lb_policy *pol, grpc_pollset *pollset, pp->on_complete = on_complete; p->pending_picks = pp; gpr_mu_unlock(&p->mu); - if (call) { - call->cb(call->cb_arg, 1); - } } } @@ -194,8 +178,7 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { pick_first_lb_policy *p = arg; pending_pick *pp; int unref = 0; - grpc_iomgr_closure *cbs = NULL; - grpc_connectivity_state_flusher f; + grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; gpr_mu_lock(&p->mu); @@ -203,14 +186,11 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { unref = 1; } else if (p->selected != NULL) { grpc_connectivity_state_set(&p->state_tracker, p->checking_connectivity, - "selected_changed"); + "selected_changed", &call_list); if (p->checking_connectivity != GRPC_CHANNEL_FATAL_FAILURE) { - if (grpc_subchannel_notify_on_state_change( - p->selected, &p->checking_connectivity, &p->connectivity_changed) - .state_already_changed) { - p->connectivity_changed.next = cbs; - cbs = &p->connectivity_changed; - } + grpc_subchannel_notify_on_state_change( + p->selected, &p->checking_connectivity, &p->connectivity_changed, + &call_list); } else { unref = 1; } @@ -219,28 +199,23 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { switch (p->checking_connectivity) { case GRPC_CHANNEL_READY: grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_READY, - "connecting_ready"); + "connecting_ready", &call_list); p->selected = p->subchannels[p->checking_subchannel]; while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = p->selected; grpc_subchannel_del_interested_party(p->selected, pp->pollset); - pp->on_complete->next = cbs; - cbs = pp->on_complete; + grpc_iomgr_call_list_add(&call_list, pp->on_complete, 1); gpr_free(pp); } - if (grpc_subchannel_notify_on_state_change(p->selected, - &p->checking_connectivity, - &p->connectivity_changed) - .state_already_changed) { - p->connectivity_changed.next = cbs; - cbs = &p->connectivity_changed; - } + grpc_subchannel_notify_on_state_change( + p->selected, &p->checking_connectivity, &p->connectivity_changed, + &call_list); break; case GRPC_CHANNEL_TRANSIENT_FAILURE: grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, - "connecting_transient_failure"); + "connecting_transient_failure", &call_list); del_interested_parties_locked(p); p->checking_subchannel = (p->checking_subchannel + 1) % p->num_subchannels; @@ -248,13 +223,9 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { p->subchannels[p->checking_subchannel]); add_interested_parties_locked(p); if (p->checking_connectivity == GRPC_CHANNEL_TRANSIENT_FAILURE) { - if (grpc_subchannel_notify_on_state_change( - p->subchannels[p->checking_subchannel], - &p->checking_connectivity, &p->connectivity_changed) - .state_already_changed) { - p->connectivity_changed.next = cbs; - cbs = &p->connectivity_changed; - } + grpc_subchannel_notify_on_state_change( + p->subchannels[p->checking_subchannel], &p->checking_connectivity, + &p->connectivity_changed, &call_list); } else { goto loop; } @@ -262,14 +233,10 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_IDLE: grpc_connectivity_state_set(&p->state_tracker, p->checking_connectivity, - "connecting_changed"); - if (grpc_subchannel_notify_on_state_change( - p->subchannels[p->checking_subchannel], - &p->checking_connectivity, &p->connectivity_changed) - .state_already_changed) { - p->connectivity_changed.next = cbs; - cbs = &p->connectivity_changed; - } + "connecting_changed", &call_list); + grpc_subchannel_notify_on_state_change( + p->subchannels[p->checking_subchannel], &p->checking_connectivity, + &p->connectivity_changed, &call_list); break; case GRPC_CHANNEL_FATAL_FAILURE: del_interested_parties_locked(p); @@ -280,19 +247,18 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { if (p->num_subchannels == 0) { grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, - "no_more_channels"); + "no_more_channels", &call_list); while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = NULL; - pp->on_complete->next = cbs; - cbs = pp->on_complete; + grpc_iomgr_call_list_add(&call_list, pp->on_complete, 1); gpr_free(pp); } unref = 1; } else { grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, - "subchannel_failed"); + "subchannel_failed", &call_list); p->checking_subchannel %= p->num_subchannels; p->checking_connectivity = grpc_subchannel_check_connectivity( p->subchannels[p->checking_subchannel]); @@ -302,22 +268,17 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { } } - grpc_connectivity_state_begin_flush(&p->state_tracker, &f); gpr_mu_unlock(&p->mu); - grpc_connectivity_state_end_flush(&f); - while (cbs != NULL) { - grpc_iomgr_closure *next = cbs->next; - cbs->cb(cbs->cb_arg, 1); - cbs = next; - } + grpc_iomgr_call_list_run(call_list); if (unref) { GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity"); } } -static void pf_broadcast(grpc_lb_policy *pol, grpc_transport_op *op) { +static void pf_broadcast(grpc_lb_policy *pol, grpc_transport_op *op, + grpc_iomgr_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; size_t i; size_t n; @@ -339,7 +300,8 @@ static void pf_broadcast(grpc_lb_policy *pol, grpc_transport_op *op) { gpr_free(subchannels); } -static grpc_connectivity_state pf_check_connectivity(grpc_lb_policy *pol) { +static grpc_connectivity_state pf_check_connectivity( + grpc_lb_policy *pol, grpc_iomgr_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; grpc_connectivity_state st; gpr_mu_lock(&p->mu); @@ -348,16 +310,15 @@ static grpc_connectivity_state pf_check_connectivity(grpc_lb_policy *pol) { return st; } -static grpc_connectivity_state_notify_on_state_change_result -pf_notify_on_state_change(grpc_lb_policy *pol, grpc_connectivity_state *current, - grpc_iomgr_closure *notify) { +void pf_notify_on_state_change(grpc_lb_policy *pol, + grpc_connectivity_state *current, + grpc_iomgr_closure *notify, + grpc_iomgr_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; - grpc_connectivity_state_notify_on_state_change_result r; gpr_mu_lock(&p->mu); - r = grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, - notify); + grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, + notify, call_list); gpr_mu_unlock(&p->mu); - return r; } static const grpc_lb_policy_vtable pick_first_lb_policy_vtable = { diff --git a/src/core/client_config/lb_policy.c b/src/core/client_config/lb_policy.c index 48a787da8a1..a9dc9dcca81 100644 --- a/src/core/client_config/lb_policy.c +++ b/src/core/client_config/lb_policy.c @@ -63,33 +63,38 @@ void grpc_lb_policy_unref(grpc_lb_policy *policy) { } } -void grpc_lb_policy_shutdown(grpc_lb_policy *policy) { - policy->vtable->shutdown(policy); +void grpc_lb_policy_shutdown(grpc_lb_policy *policy, + grpc_iomgr_call_list *call_list) { + policy->vtable->shutdown(policy, call_list); } void grpc_lb_policy_pick(grpc_lb_policy *policy, grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, grpc_subchannel **target, - grpc_iomgr_closure *on_complete) { - policy->vtable->pick(policy, pollset, initial_metadata, target, on_complete); + grpc_iomgr_closure *on_complete, + grpc_iomgr_call_list *call_list) { + policy->vtable->pick(policy, pollset, initial_metadata, target, on_complete, + call_list); } -void grpc_lb_policy_broadcast(grpc_lb_policy *policy, grpc_transport_op *op) { - policy->vtable->broadcast(policy, op); +void grpc_lb_policy_broadcast(grpc_lb_policy *policy, grpc_transport_op *op, + grpc_iomgr_call_list *call_list) { + policy->vtable->broadcast(policy, op, call_list); } -void grpc_lb_policy_exit_idle(grpc_lb_policy *policy) { - policy->vtable->exit_idle(policy); +void grpc_lb_policy_exit_idle(grpc_lb_policy *policy, + grpc_iomgr_call_list *call_list) { + policy->vtable->exit_idle(policy, call_list); } -grpc_connectivity_state_notify_on_state_change_result -grpc_lb_policy_notify_on_state_change(grpc_lb_policy *policy, - grpc_connectivity_state *state, - grpc_iomgr_closure *closure) { - return policy->vtable->notify_on_state_change(policy, state, closure); +void grpc_lb_policy_notify_on_state_change(grpc_lb_policy *policy, + grpc_connectivity_state *state, + grpc_iomgr_closure *closure, + grpc_iomgr_call_list *call_list) { + policy->vtable->notify_on_state_change(policy, state, closure, call_list); } grpc_connectivity_state grpc_lb_policy_check_connectivity( - grpc_lb_policy *policy) { - return policy->vtable->check_connectivity(policy); + grpc_lb_policy *policy, grpc_iomgr_call_list *call_list) { + return policy->vtable->check_connectivity(policy, call_list); } diff --git a/src/core/client_config/lb_policy.h b/src/core/client_config/lb_policy.h index 7c9bdac6484..8d7eb579b5f 100644 --- a/src/core/client_config/lb_policy.h +++ b/src/core/client_config/lb_policy.h @@ -53,28 +53,31 @@ struct grpc_lb_policy { struct grpc_lb_policy_vtable { void (*destroy)(grpc_lb_policy *policy); - void (*shutdown)(grpc_lb_policy *policy); + void (*shutdown)(grpc_lb_policy *policy, grpc_iomgr_call_list *call_list); /** implement grpc_lb_policy_pick */ void (*pick)(grpc_lb_policy *policy, grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, grpc_subchannel **target, - grpc_iomgr_closure *on_complete); + grpc_iomgr_closure *on_complete, + grpc_iomgr_call_list *call_list); /** try to enter a READY connectivity state */ - void (*exit_idle)(grpc_lb_policy *policy); + void (*exit_idle)(grpc_lb_policy *policy, grpc_iomgr_call_list *call_list); /** broadcast a transport op to all subchannels */ - void (*broadcast)(grpc_lb_policy *policy, grpc_transport_op *op); + void (*broadcast)(grpc_lb_policy *policy, grpc_transport_op *op, + grpc_iomgr_call_list *call_list); /** check the current connectivity of the lb_policy */ - grpc_connectivity_state (*check_connectivity)(grpc_lb_policy *policy); + grpc_connectivity_state (*check_connectivity)( + grpc_lb_policy *policy, grpc_iomgr_call_list *call_list); /** call notify when the connectivity state of a channel changes from *state. Updates *state with the new state of the policy */ - grpc_connectivity_state_notify_on_state_change_result ( - *notify_on_state_change)(grpc_lb_policy *policy, - grpc_connectivity_state *state, - grpc_iomgr_closure *closure); + void (*notify_on_state_change)(grpc_lb_policy *policy, + grpc_connectivity_state *state, + grpc_iomgr_closure *closure, + grpc_iomgr_call_list *call_list); }; #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG @@ -98,7 +101,8 @@ void grpc_lb_policy_init(grpc_lb_policy *policy, const grpc_lb_policy_vtable *vtable); /** Start shutting down (fail any pending picks) */ -void grpc_lb_policy_shutdown(grpc_lb_policy *policy); +void grpc_lb_policy_shutdown(grpc_lb_policy *policy, + grpc_iomgr_call_list *call_list); /** Given initial metadata in \a initial_metadata, find an appropriate target for this rpc, and 'return' it by calling \a on_complete after setting @@ -107,18 +111,21 @@ void grpc_lb_policy_shutdown(grpc_lb_policy *policy); void grpc_lb_policy_pick(grpc_lb_policy *policy, grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, grpc_subchannel **target, - grpc_iomgr_closure *on_complete); + grpc_iomgr_closure *on_complete, + grpc_iomgr_call_list *call_list); -void grpc_lb_policy_broadcast(grpc_lb_policy *policy, grpc_transport_op *op); +void grpc_lb_policy_broadcast(grpc_lb_policy *policy, grpc_transport_op *op, + grpc_iomgr_call_list *call_list); -void grpc_lb_policy_exit_idle(grpc_lb_policy *policy); +void grpc_lb_policy_exit_idle(grpc_lb_policy *policy, + grpc_iomgr_call_list *call_list); -grpc_connectivity_state_notify_on_state_change_result -grpc_lb_policy_notify_on_state_change( - grpc_lb_policy *policy, grpc_connectivity_state *state, - grpc_iomgr_closure *closure) GRPC_MUST_USE_RESULT; +void grpc_lb_policy_notify_on_state_change(grpc_lb_policy *policy, + grpc_connectivity_state *state, + grpc_iomgr_closure *closure, + grpc_iomgr_call_list *call_list); grpc_connectivity_state grpc_lb_policy_check_connectivity( - grpc_lb_policy *policy); + grpc_lb_policy *policy, grpc_iomgr_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_CONFIG_LB_POLICY_H */ diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index 6fbf9664754..b15acf826a6 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -146,7 +146,8 @@ struct grpc_subchannel_call { static grpc_subchannel_call *create_call(connection *con); static void connectivity_state_changed_locked(grpc_subchannel *c, - const char *reason); + const char *reason, + grpc_iomgr_call_list *call_list); static grpc_connectivity_state compute_connectivity_locked(grpc_subchannel *c); static gpr_timespec compute_connect_deadline(grpc_subchannel *c); static void subchannel_connected(void *subchannel, int iomgr_success); @@ -333,16 +334,18 @@ static void start_connect(grpc_subchannel *c) { static void continue_creating_call(void *arg, int iomgr_success) { waiting_for_connect *w4c = arg; + grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; grpc_subchannel_del_interested_party(w4c->subchannel, w4c->pollset); grpc_subchannel_create_call(w4c->subchannel, w4c->pollset, w4c->target, - w4c->notify); + w4c->notify, &call_list); GRPC_SUBCHANNEL_UNREF(w4c->subchannel, "waiting_for_connect"); gpr_free(w4c); } void grpc_subchannel_create_call(grpc_subchannel *c, grpc_pollset *pollset, grpc_subchannel_call **target, - grpc_iomgr_closure *notify) { + grpc_iomgr_closure *notify, + grpc_iomgr_call_list *call_list) { connection *con; gpr_mu_lock(&c->mu); if (c->active != NULL) { @@ -365,15 +368,12 @@ void grpc_subchannel_create_call(grpc_subchannel *c, grpc_pollset *pollset, c->waiting = w4c; grpc_subchannel_add_interested_party(c, pollset); if (!c->connecting) { - grpc_connectivity_state_flusher f; c->connecting = 1; - connectivity_state_changed_locked(c, "create_call"); + connectivity_state_changed_locked(c, "create_call", call_list); /* released by connection */ SUBCHANNEL_REF_LOCKED(c, "connecting"); GRPC_CHANNEL_INTERNAL_REF(c->master, "connecting"); - grpc_connectivity_state_begin_flush(&c->state_tracker, &f); gpr_mu_unlock(&c->mu); - grpc_connectivity_state_end_flush(&f); start_connect(c); } else { @@ -390,33 +390,26 @@ grpc_connectivity_state grpc_subchannel_check_connectivity(grpc_subchannel *c) { return state; } -grpc_connectivity_state_notify_on_state_change_result -grpc_subchannel_notify_on_state_change(grpc_subchannel *c, - grpc_connectivity_state *state, - grpc_iomgr_closure *notify) { +void grpc_subchannel_notify_on_state_change(grpc_subchannel *c, + grpc_connectivity_state *state, + grpc_iomgr_closure *notify, + grpc_iomgr_call_list *call_list) { int do_connect = 0; - grpc_connectivity_state_notify_on_state_change_result r; gpr_mu_lock(&c->mu); - r = grpc_connectivity_state_notify_on_state_change(&c->state_tracker, state, - notify); - if (r.current_state_is_idle) { - grpc_connectivity_state_flusher f; + if (grpc_connectivity_state_notify_on_state_change(&c->state_tracker, state, + notify, call_list)) { do_connect = 1; c->connecting = 1; /* released by connection */ SUBCHANNEL_REF_LOCKED(c, "connecting"); GRPC_CHANNEL_INTERNAL_REF(c->master, "connecting"); - connectivity_state_changed_locked(c, "state_change"); - grpc_connectivity_state_begin_flush(&c->state_tracker, &f); - gpr_mu_unlock(&c->mu); - grpc_connectivity_state_end_flush(&f); - } else { - gpr_mu_unlock(&c->mu); + connectivity_state_changed_locked(c, "state_change", call_list); } + gpr_mu_unlock(&c->mu); + if (do_connect) { start_connect(c); } - return r; } void grpc_subchannel_process_transport_op(grpc_subchannel *c, @@ -424,24 +417,20 @@ void grpc_subchannel_process_transport_op(grpc_subchannel *c, connection *con = NULL; grpc_subchannel *destroy; int cancel_alarm = 0; + grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; gpr_mu_lock(&c->mu); if (c->active != NULL) { con = c->active; CONNECTION_REF_LOCKED(con, "transport-op"); } if (op->disconnect) { - grpc_connectivity_state_flusher f; c->disconnected = 1; - connectivity_state_changed_locked(c, "disconnect"); + connectivity_state_changed_locked(c, "disconnect", &call_list); if (c->have_alarm) { cancel_alarm = 1; } - grpc_connectivity_state_begin_flush(&c->state_tracker, &f); - gpr_mu_unlock(&c->mu); - grpc_connectivity_state_end_flush(&f); - } else { - gpr_mu_unlock(&c->mu); } + gpr_mu_unlock(&c->mu); if (con != NULL) { grpc_channel_stack *channel_stack = CHANNEL_STACK_FROM_CONNECTION(con); @@ -464,6 +453,8 @@ void grpc_subchannel_process_transport_op(grpc_subchannel *c, if (op->disconnect) { grpc_connector_shutdown(c->connector); } + + grpc_iomgr_call_list_run(call_list); } static void on_state_changed(void *p, int iomgr_success) { @@ -474,7 +465,7 @@ static void on_state_changed(void *p, int iomgr_success) { grpc_transport_op op; grpc_channel_element *elem; connection *destroy_connection = NULL; - grpc_connectivity_state_flusher f; + grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; gpr_mu_lock(mu); @@ -508,26 +499,26 @@ static void on_state_changed(void *p, int iomgr_success) { grpc_connectivity_state_set( &c->state_tracker, c->disconnected ? GRPC_CHANNEL_FATAL_FAILURE : GRPC_CHANNEL_TRANSIENT_FAILURE, - "connection_failed"); + "connection_failed", &call_list); break; } done: - connectivity_state_changed_locked(c, "transport_state_changed"); + connectivity_state_changed_locked(c, "transport_state_changed", &call_list); destroy = SUBCHANNEL_UNREF_LOCKED(c, "state_watcher"); gpr_free(sw); - grpc_connectivity_state_begin_flush(&c->state_tracker, &f); gpr_mu_unlock(mu); - grpc_connectivity_state_end_flush(&f); if (destroy) { subchannel_destroy(c); } if (destroy_connection != NULL) { connection_destroy(destroy_connection); } + grpc_iomgr_call_list_run(call_list); } -static void publish_transport(grpc_subchannel *c) { +static void publish_transport(grpc_subchannel *c, + grpc_iomgr_call_list *call_list) { size_t channel_stack_size; connection *con; grpc_channel_stack *stk; @@ -538,7 +529,6 @@ static void publish_transport(grpc_subchannel *c) { state_watcher *sw; connection *destroy_connection = NULL; grpc_channel_element *elem; - grpc_connectivity_state_flusher f; /* build final filter list */ num_filters = c->num_filters + c->connecting_result.num_filters + 1; @@ -601,17 +591,15 @@ static void publish_transport(grpc_subchannel *c) { elem->filter->start_transport_op(elem, &op); /* signal completion */ - connectivity_state_changed_locked(c, "connected"); + connectivity_state_changed_locked(c, "connected", call_list); w4c = c->waiting; c->waiting = NULL; - grpc_connectivity_state_begin_flush(&c->state_tracker, &f); gpr_mu_unlock(&c->mu); - grpc_connectivity_state_end_flush(&f); while (w4c != NULL) { waiting_for_connect *next = w4c; - w4c->continuation.cb(w4c->continuation.cb_arg, 1); + grpc_iomgr_call_list_add(call_list, &w4c->continuation, 1); w4c = next; } @@ -653,16 +641,14 @@ static void update_reconnect_parameters(grpc_subchannel *c) { static void on_alarm(void *arg, int iomgr_success) { grpc_subchannel *c = arg; - grpc_connectivity_state_flusher f; + grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; gpr_mu_lock(&c->mu); c->have_alarm = 0; if (c->disconnected) { iomgr_success = 0; } - connectivity_state_changed_locked(c, "alarm"); - grpc_connectivity_state_begin_flush(&c->state_tracker, &f); + connectivity_state_changed_locked(c, "alarm", &call_list); gpr_mu_unlock(&c->mu); - grpc_connectivity_state_end_flush(&f); if (iomgr_success) { update_reconnect_parameters(c); continue_connect(c); @@ -670,24 +656,24 @@ static void on_alarm(void *arg, int iomgr_success) { GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting"); GRPC_SUBCHANNEL_UNREF(c, "connecting"); } + grpc_iomgr_call_list_run(call_list); } static void subchannel_connected(void *arg, int iomgr_success) { grpc_subchannel *c = arg; + grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; if (c->connecting_result.transport != NULL) { - publish_transport(c); + publish_transport(c, &call_list); } else { gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); - grpc_connectivity_state_flusher f; gpr_mu_lock(&c->mu); GPR_ASSERT(!c->have_alarm); c->have_alarm = 1; - connectivity_state_changed_locked(c, "connect_failed"); + connectivity_state_changed_locked(c, "connect_failed", &call_list); grpc_alarm_init(&c->alarm, c->next_attempt, on_alarm, c, now); - grpc_connectivity_state_begin_flush(&c->state_tracker, &f); gpr_mu_unlock(&c->mu); - grpc_connectivity_state_end_flush(&f); } + grpc_iomgr_call_list_run(call_list); } static gpr_timespec compute_connect_deadline(grpc_subchannel *c) { @@ -718,9 +704,10 @@ static grpc_connectivity_state compute_connectivity_locked(grpc_subchannel *c) { } static void connectivity_state_changed_locked(grpc_subchannel *c, - const char *reason) { + const char *reason, + grpc_iomgr_call_list *call_list) { grpc_connectivity_state current = compute_connectivity_locked(c); - grpc_connectivity_state_set(&c->state_tracker, current, reason); + grpc_connectivity_state_set(&c->state_tracker, current, reason, call_list); } /* diff --git a/src/core/client_config/subchannel.h b/src/core/client_config/subchannel.h index 391df36bfd7..7c00ff172d5 100644 --- a/src/core/client_config/subchannel.h +++ b/src/core/client_config/subchannel.h @@ -76,7 +76,8 @@ void grpc_subchannel_call_unref( void grpc_subchannel_create_call(grpc_subchannel *subchannel, grpc_pollset *pollset, grpc_subchannel_call **target, - grpc_iomgr_closure *notify); + grpc_iomgr_closure *notify, + grpc_iomgr_call_list *call_list); /** process a transport level op */ void grpc_subchannel_process_transport_op(grpc_subchannel *subchannel, @@ -88,10 +89,10 @@ 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 */ -grpc_connectivity_state_notify_on_state_change_result -grpc_subchannel_notify_on_state_change( - grpc_subchannel *channel, grpc_connectivity_state *state, - grpc_iomgr_closure *notify) GRPC_MUST_USE_RESULT; +void grpc_subchannel_notify_on_state_change(grpc_subchannel *channel, + grpc_connectivity_state *state, + grpc_iomgr_closure *notify, + grpc_iomgr_call_list *call_list); /** express interest in \a channel's activities through \a pollset. */ void grpc_subchannel_add_interested_party(grpc_subchannel *channel, diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index 67eff3e5285..ba8f73fe081 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -157,3 +157,42 @@ void grpc_iomgr_closure_init(grpc_iomgr_closure *closure, grpc_iomgr_cb_func cb, closure->cb_arg = cb_arg; closure->next = NULL; } + +void grpc_iomgr_call_list_add(grpc_iomgr_call_list *call_list, + grpc_iomgr_closure *closure, int success) { + if (!closure) return; + closure->next = NULL; + closure->success = success; + if (!call_list->head) { + call_list->head = closure; + } else { + call_list->tail->next = closure; + } + call_list->tail = closure; +} + +void grpc_iomgr_call_list_run(grpc_iomgr_call_list call_list) { + grpc_iomgr_closure *c = call_list.head; + while (c) { + grpc_iomgr_closure *next = c->next; + c->cb(c->cb_arg, c->success); + c = next; + } +} + +int grpc_iomgr_call_list_empty(grpc_iomgr_call_list call_list) { + return call_list.head == NULL; +} + +void grpc_iomgr_call_list_move(grpc_iomgr_call_list *src, + grpc_iomgr_call_list *dst) { + if (dst->head == NULL) { + *dst = *src; + return; + } + if (src->head == NULL) { + return; + } + dst->tail->next = src->head; + dst->tail = src->tail; +} diff --git a/src/core/iomgr/iomgr.h b/src/core/iomgr/iomgr.h index f1d2e6439d0..58c31763d22 100644 --- a/src/core/iomgr/iomgr.h +++ b/src/core/iomgr/iomgr.h @@ -58,10 +58,25 @@ typedef struct grpc_iomgr_closure { struct grpc_iomgr_closure *next; } grpc_iomgr_closure; +typedef struct grpc_iomgr_call_list { + grpc_iomgr_closure *head; + grpc_iomgr_closure *tail; +} grpc_iomgr_call_list; + /** Initializes \a closure with \a cb and \a cb_arg. */ void grpc_iomgr_closure_init(grpc_iomgr_closure *closure, grpc_iomgr_cb_func cb, void *cb_arg); +#define GRPC_IOMGR_CALL_LIST_INIT \ + { NULL, NULL } + +void grpc_iomgr_call_list_add(grpc_iomgr_call_list *list, + grpc_iomgr_closure *closure, int success); +void grpc_iomgr_call_list_run(grpc_iomgr_call_list list); +void grpc_iomgr_call_list_move(grpc_iomgr_call_list *src, + grpc_iomgr_call_list *dst); +int grpc_iomgr_call_list_empty(grpc_iomgr_call_list list); + /** Initializes the iomgr. */ void grpc_iomgr_init(void); diff --git a/src/core/iomgr/pollset_multipoller_with_epoll.c b/src/core/iomgr/pollset_multipoller_with_epoll.c index 12f34c1a195..253f3190f13 100644 --- a/src/core/iomgr/pollset_multipoller_with_epoll.c +++ b/src/core/iomgr/pollset_multipoller_with_epoll.c @@ -127,7 +127,7 @@ static void multipoll_with_epoll_pollset_add_fd(grpc_pollset *pollset, GRPC_FD_REF(fd, "delayed_add"); grpc_iomgr_closure_init(&da->closure, perform_delayed_add, da); pollset->in_flight_cbs++; - grpc_workqueue_push(fd->workqueue, &da->closure, 1); + grpc_pollset_add_unlock_job(pollset, &da->closure); } } diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 291181d9a52..107ffb0b5e4 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -136,6 +136,8 @@ void grpc_pollset_init(grpc_pollset *pollset) { pollset->in_flight_cbs = 0; pollset->shutting_down = 0; pollset->called_shutdown = 0; + pollset->idle_jobs = NULL; + pollset->unlock_jobs = NULL; become_basic_pollset(pollset, NULL); } @@ -145,7 +147,6 @@ void grpc_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd) { } gpr_mu_lock(&pollset->mu); pollset->vtable->add_fd(pollset, fd, 1); - grpc_workqueue_flush(fd->workqueue, 0); /* the following (enabled only in debug) will reacquire and then release our lock - meaning that if the unlocking flag passed to del_fd above is not respected, the code will deadlock (in a way that we have a chance of @@ -174,6 +175,33 @@ static void finish_shutdown(grpc_pollset *pollset) { pollset->shutdown_done_cb(pollset->shutdown_done_arg); } +static void run_jobs(grpc_pollset *pollset, grpc_iomgr_closure **root) { + grpc_iomgr_closure *exec = *root; + *root = NULL; + gpr_mu_unlock(&pollset->mu); + while (exec != NULL) { + grpc_iomgr_closure *next = exec->next; + exec->cb(exec->cb_arg, 1); + exec = next; + } + gpr_mu_lock(&pollset->mu); +} + +static void add_job(grpc_iomgr_closure **root, grpc_iomgr_closure *closure) { + closure->next = *root; + *root = closure; +} + +void grpc_pollset_add_idle_job(grpc_pollset *pollset, + grpc_iomgr_closure *closure) { + add_job(&pollset->idle_jobs, closure); +} + +void grpc_pollset_add_unlock_job(grpc_pollset *pollset, + grpc_iomgr_closure *closure) { + add_job(&pollset->unlock_jobs, closure); +} + void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, gpr_timespec now, gpr_timespec deadline) { /* pollset->mu already held */ @@ -182,6 +210,14 @@ void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, worker->next = worker->prev = NULL; /* TODO(ctiller): pool these */ grpc_wakeup_fd_init(&worker->wakeup_fd); + if (!grpc_pollset_has_workers(pollset) && pollset->idle_jobs != NULL) { + run_jobs(pollset, &pollset->idle_jobs); + goto done; + } + if (pollset->unlock_jobs != NULL) { + run_jobs(pollset, &pollset->unlock_jobs); + goto done; + } if (grpc_alarm_check(&pollset->mu, now, &deadline)) { goto done; } @@ -301,12 +337,7 @@ static void basic_do_promote(void *args, int success) { gpr_mu_lock(&pollset->mu); /* First we need to ensure that nobody is polling concurrently */ - if (grpc_pollset_has_workers(pollset)) { - grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); - grpc_workqueue_push(fd->workqueue, &up_args->promotion_closure, 1); - gpr_mu_unlock(&pollset->mu); - return; - } + GPR_ASSERT(!grpc_pollset_has_workers(pollset)); gpr_free(up_args); /* At this point the pollset may no longer be a unary poller. In that case @@ -390,13 +421,12 @@ static void basic_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, GRPC_FD_REF(fd, "basicpoll_add"); pollset->in_flight_cbs++; up_args = gpr_malloc(sizeof(*up_args)); - up_args->pollset = pollset; up_args->fd = fd; up_args->original_vtable = pollset->vtable; up_args->promotion_closure.cb = basic_do_promote; up_args->promotion_closure.cb_arg = up_args; - grpc_workqueue_push(fd->workqueue, &up_args->promotion_closure, 1); + grpc_pollset_add_idle_job(pollset, &up_args->promotion_closure); grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); exit: diff --git a/src/core/iomgr/pollset_posix.h b/src/core/iomgr/pollset_posix.h index 69bd9cca8ce..3f89095d40e 100644 --- a/src/core/iomgr/pollset_posix.h +++ b/src/core/iomgr/pollset_posix.h @@ -37,6 +37,7 @@ #include #include +#include "src/core/iomgr/iomgr.h" #include "src/core/iomgr/wakeup_fd_posix.h" typedef struct grpc_pollset_vtable grpc_pollset_vtable; @@ -66,6 +67,8 @@ typedef struct grpc_pollset { int kicked_without_pollers; void (*shutdown_done_cb)(void *arg); void *shutdown_done_arg; + grpc_iomgr_closure *unlock_jobs; + grpc_iomgr_closure *idle_jobs; union { int fd; void *ptr; @@ -124,4 +127,11 @@ int grpc_pollset_has_workers(grpc_pollset *pollset); typedef int (*grpc_poll_function_type)(struct pollfd *, nfds_t, int); extern grpc_poll_function_type grpc_poll_function; +/** schedule a closure to be run next time there are no active workers */ +void grpc_pollset_add_idle_job(grpc_pollset *pollset, + grpc_iomgr_closure *closure); +/** schedule a closure to be run next time the pollset is unlocked */ +void grpc_pollset_add_unlock_job(grpc_pollset *pollset, + grpc_iomgr_closure *closure); + #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_POSIX_H */ diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index 4ec6aba7f4e..6f49060be5e 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -77,7 +77,6 @@ struct grpc_channel { gpr_mu registered_call_mu; registered_call *registered_calls; - grpc_iomgr_closure destroy_closure; char *target; grpc_workqueue *workqueue; }; @@ -273,8 +272,7 @@ void grpc_channel_internal_ref(grpc_channel *c) { gpr_ref(&c->refs); } -static void destroy_channel(void *p, int ok) { - grpc_channel *channel = p; +static void destroy_channel(grpc_channel *channel) { size_t i; grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CHANNEL(channel)); for (i = 0; i < NUM_CACHED_STATUS_ELEMS; i++) { @@ -312,9 +310,7 @@ void grpc_channel_internal_unref(grpc_channel *channel, const char *reason) { void grpc_channel_internal_unref(grpc_channel *channel) { #endif if (gpr_unref(&channel->refs)) { - channel->destroy_closure.cb = destroy_channel; - channel->destroy_closure.cb_arg = channel; - grpc_workqueue_push(channel->workqueue, &channel->destroy_closure, 1); + destroy_channel(channel); } } diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index 12b15f353f4..ef47a28fda2 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -45,6 +45,8 @@ 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_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; + grpc_connectivity_state state; if (client_channel_elem->filter != &grpc_client_channel_filter) { gpr_log(GPR_ERROR, "grpc_channel_check_connectivity_state called on something that is " @@ -52,8 +54,10 @@ grpc_connectivity_state grpc_channel_check_connectivity_state( client_channel_elem->filter->name); return GRPC_CHANNEL_FATAL_FAILURE; } - return grpc_client_channel_check_connectivity_state(client_channel_elem, - try_to_connect); + state = grpc_client_channel_check_connectivity_state( + client_channel_elem, try_to_connect, &call_list); + grpc_iomgr_call_list_run(call_list); + return state; } typedef enum { @@ -154,6 +158,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_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; state_watcher *w = gpr_malloc(sizeof(*w)); grpc_cq_begin_op(cq); @@ -176,13 +181,14 @@ void grpc_channel_watch_connectivity_state( "grpc_channel_watch_connectivity_state called on something that is " "not a client channel, but '%s'", client_channel_elem->filter->name); - grpc_workqueue_push(grpc_channel_get_workqueue(channel), &w->on_complete, - 1); + grpc_iomgr_call_list_add(&call_list, &w->on_complete, 1); } else { GRPC_CHANNEL_INTERNAL_REF(channel, "watch_connectivity"); grpc_client_channel_add_interested_party(client_channel_elem, grpc_cq_pollset(cq)); grpc_client_channel_watch_connectivity_state(client_channel_elem, &w->state, - &w->on_complete); + &w->on_complete, &call_list); } + + grpc_iomgr_call_list_run(call_list); } diff --git a/src/core/transport/chttp2/internal.h b/src/core/transport/chttp2/internal.h index c8c1abb7508..9be1f2f7cf2 100644 --- a/src/core/transport/chttp2/internal.h +++ b/src/core/transport/chttp2/internal.h @@ -164,8 +164,7 @@ typedef struct { /** data to write next write */ gpr_slice_buffer qbuf; /** queued callbacks */ - grpc_iomgr_closure *pending_closures_head; - grpc_iomgr_closure *pending_closures_tail; + grpc_iomgr_call_list run_at_unlock; /** window available for us to send to peer */ gpr_int64 outgoing_window; @@ -568,11 +567,6 @@ int grpc_chttp2_list_pop_read_write_state_changed( grpc_chttp2_transport_global *transport_global, grpc_chttp2_stream_global **stream_global); -/** schedule a closure to run without the transport lock taken */ -void grpc_chttp2_schedule_closure( - grpc_chttp2_transport_global *transport_global, grpc_iomgr_closure *closure, - int success); - grpc_chttp2_stream_parsing *grpc_chttp2_parsing_lookup_stream( grpc_chttp2_transport_parsing *transport_parsing, gpr_uint32 id); grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream( diff --git a/src/core/transport/chttp2/writing.c b/src/core/transport/chttp2/writing.c index c015e82931d..1da3f85bdef 100644 --- a/src/core/transport/chttp2/writing.c +++ b/src/core/transport/chttp2/writing.c @@ -238,8 +238,8 @@ void grpc_chttp2_cleanup_writing( stream_global->outgoing_sopb->nops == 0) { GPR_ASSERT(stream_global->write_state != GRPC_WRITE_STATE_QUEUED_CLOSE); stream_global->outgoing_sopb = NULL; - grpc_chttp2_schedule_closure(transport_global, - stream_global->send_done_closure, 1); + grpc_iomgr_call_list_add(&transport_global->run_at_unlock, + stream_global->send_done_closure, 1); } } stream_global->writing_now = 0; diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index 6376c397a2b..50d5a3e8a82 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -499,32 +499,20 @@ grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream( static void lock(grpc_chttp2_transport *t) { gpr_mu_lock(&t->mu); } static void unlock(grpc_chttp2_transport *t) { - grpc_iomgr_closure *run_closures; - grpc_connectivity_state_flusher f; + grpc_iomgr_call_list run = GRPC_IOMGR_CALL_LIST_INIT; unlock_check_read_write_state(t); if (!t->writing_active && !t->closed && grpc_chttp2_unlocking_check_writes(&t->global, &t->writing)) { t->writing_active = 1; REF_TRANSPORT(t, "writing"); - grpc_chttp2_schedule_closure(&t->global, &t->writing_action, 1); + grpc_iomgr_call_list_add(&t->global.run_at_unlock, &t->writing_action, 1); prevent_endpoint_shutdown(t); } - run_closures = t->global.pending_closures_head; - t->global.pending_closures_head = NULL; - t->global.pending_closures_tail = NULL; - - grpc_connectivity_state_begin_flush(&t->channel_callback.state_tracker, &f); + GPR_SWAP(grpc_iomgr_call_list, run, t->global.run_at_unlock); gpr_mu_unlock(&t->mu); - - grpc_connectivity_state_end_flush(&f); - - while (run_closures) { - grpc_iomgr_closure *next = run_closures->next; - run_closures->cb(run_closures->cb_arg, run_closures->success); - run_closures = next; - } + grpc_iomgr_call_list_run(run); } /* @@ -676,8 +664,8 @@ static void perform_stream_op_locked( } } else { grpc_sopb_reset(op->send_ops); - grpc_chttp2_schedule_closure(transport_global, - stream_global->send_done_closure, 0); + grpc_iomgr_call_list_add(&transport_global->run_at_unlock, + stream_global->send_done_closure, 0); } } @@ -715,9 +703,8 @@ static void perform_stream_op_locked( op->bind_pollset); } - if (op->on_consumed) { - grpc_chttp2_schedule_closure(transport_global, op->on_consumed, 1); - } + grpc_iomgr_call_list_add(&transport_global->run_at_unlock, op->on_consumed, + 1); } static void perform_stream_op(grpc_transport *gt, grpc_stream *gs, @@ -754,18 +741,12 @@ static void perform_transport_op(grpc_transport *gt, grpc_transport_op *op) { lock(t); - if (op->on_consumed) { - grpc_chttp2_schedule_closure(&t->global, op->on_consumed, 1); - } + grpc_iomgr_call_list_add(&t->global.run_at_unlock, op->on_consumed, 1); if (op->on_connectivity_state_change) { - if (grpc_connectivity_state_notify_on_state_change( - &t->channel_callback.state_tracker, op->connectivity_state, - op->on_connectivity_state_change) - .state_already_changed) { - grpc_chttp2_schedule_closure(&t->global, op->on_connectivity_state_change, - 1); - } + grpc_connectivity_state_notify_on_state_change( + &t->channel_callback.state_tracker, op->connectivity_state, + op->on_connectivity_state_change, &t->global.run_at_unlock); } if (op->send_goaway) { @@ -887,8 +868,8 @@ static void unlock_check_read_write_state(grpc_chttp2_transport *t) { if (stream_global->outgoing_sopb != NULL) { grpc_sopb_reset(stream_global->outgoing_sopb); stream_global->outgoing_sopb = NULL; - grpc_chttp2_schedule_closure(transport_global, - stream_global->send_done_closure, 1); + grpc_iomgr_call_list_add(&transport_global->run_at_unlock, + stream_global->send_done_closure, 1); } stream_global->read_closed = 1; if (!stream_global->published_cancelled) { @@ -938,8 +919,8 @@ static void unlock_check_read_write_state(grpc_chttp2_transport *t) { &stream_global->outstanding_metadata); grpc_sopb_swap(stream_global->publish_sopb, &stream_global->incoming_sopb); stream_global->published_state = *stream_global->publish_state = state; - grpc_chttp2_schedule_closure(transport_global, - stream_global->recv_done_closure, 1); + grpc_iomgr_call_list_add(&transport_global->run_at_unlock, + stream_global->recv_done_closure, 1); stream_global->recv_done_closure = NULL; stream_global->publish_sopb = NULL; stream_global->publish_state = NULL; @@ -1200,21 +1181,7 @@ static void connectivity_state_set( gpr_log(GPR_DEBUG, "set connectivity_state=%d", state)); grpc_connectivity_state_set( &TRANSPORT_FROM_GLOBAL(transport_global)->channel_callback.state_tracker, - state, reason); -} - -void grpc_chttp2_schedule_closure( - grpc_chttp2_transport_global *transport_global, grpc_iomgr_closure *closure, - int success) { - closure->success = success; - if (transport_global->pending_closures_tail == NULL) { - transport_global->pending_closures_head = - transport_global->pending_closures_tail = closure; - } else { - transport_global->pending_closures_tail->next = closure; - transport_global->pending_closures_tail = closure; - } - closure->next = NULL; + state, reason, &transport_global->run_at_unlock); } /* diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c index 034f82474f5..b605da9dbf7 100644 --- a/src/core/transport/connectivity_state.c +++ b/src/core/transport/connectivity_state.c @@ -64,7 +64,6 @@ void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, tracker->current_state = init_state; tracker->watchers = NULL; tracker->name = gpr_strdup(name); - tracker->changed = 0; } void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker) { @@ -90,20 +89,17 @@ grpc_connectivity_state grpc_connectivity_state_check( return tracker->current_state; } -grpc_connectivity_state_notify_on_state_change_result -grpc_connectivity_state_notify_on_state_change( +int grpc_connectivity_state_notify_on_state_change( grpc_connectivity_state_tracker *tracker, grpc_connectivity_state *current, - grpc_iomgr_closure *notify) { - grpc_connectivity_state_notify_on_state_change_result result; - memset(&result, 0, sizeof(result)); + grpc_iomgr_closure *notify, grpc_iomgr_call_list *call_list) { if (grpc_connectivity_state_trace) { - gpr_log(GPR_DEBUG, "CONWATCH: %s: from %s [cur=%s]", tracker->name, - grpc_connectivity_state_name(*current), - grpc_connectivity_state_name(tracker->current_state)); + gpr_log(GPR_DEBUG, "CONWATCH: %s: from %s [cur=%s] notify=%p", + tracker->name, grpc_connectivity_state_name(*current), + grpc_connectivity_state_name(tracker->current_state), notify); } if (tracker->current_state != *current) { *current = tracker->current_state; - result.state_already_changed = 1; + grpc_iomgr_call_list_add(call_list, notify, 1); } else { grpc_connectivity_state_watcher *w = gpr_malloc(sizeof(*w)); w->current = current; @@ -111,13 +107,14 @@ grpc_connectivity_state_notify_on_state_change( w->next = tracker->watchers; tracker->watchers = w; } - result.current_state_is_idle = tracker->current_state == GRPC_CHANNEL_IDLE; - return result; + return tracker->current_state == GRPC_CHANNEL_IDLE; } void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, grpc_connectivity_state state, - const char *reason) { + const char *reason, + grpc_iomgr_call_list *call_list) { + grpc_connectivity_state_watcher *w; if (grpc_connectivity_state_trace) { gpr_log(GPR_DEBUG, "SET: %s: %s --> %s [%s]", tracker->name, grpc_connectivity_state_name(tracker->current_state), @@ -128,40 +125,11 @@ void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, } GPR_ASSERT(tracker->current_state != GRPC_CHANNEL_FATAL_FAILURE); tracker->current_state = state; - tracker->changed = 1; -} - -void grpc_connectivity_state_begin_flush( - grpc_connectivity_state_tracker *tracker, - grpc_connectivity_state_flusher *flusher) { - grpc_connectivity_state_watcher *w; - flusher->cbs = NULL; - if (!tracker->changed) return; - w = tracker->watchers; - tracker->watchers = NULL; - while (w != NULL) { - grpc_connectivity_state_watcher *next = w->next; - if (tracker->current_state != *w->current) { - *w->current = tracker->current_state; - w->notify->next = flusher->cbs; - flusher->cbs = w->notify; - gpr_free(w); - } else { - w->next = tracker->watchers; - tracker->watchers = w; - } - w = next; - } - tracker->changed = 0; -} - -void grpc_connectivity_state_end_flush( - grpc_connectivity_state_flusher *flusher) { - grpc_iomgr_closure *c = flusher->cbs; - while (c != NULL) { - grpc_iomgr_closure *next = c; - c->cb(c->cb_arg, 1); - c = next; + while ((w = tracker->watchers) != NULL) { + *w->current = tracker->current_state; + tracker->watchers = w->next; + grpc_iomgr_call_list_add(call_list, w->notify, 1); + gpr_free(w); } } diff --git a/src/core/transport/connectivity_state.h b/src/core/transport/connectivity_state.h index 323af2740cd..49c28152661 100644 --- a/src/core/transport/connectivity_state.h +++ b/src/core/transport/connectivity_state.h @@ -54,12 +54,8 @@ typedef struct { grpc_connectivity_state_watcher *watchers; /** a name to help debugging */ char *name; - /** has this state been changed since the last flush? */ - int changed; } grpc_connectivity_state_tracker; -typedef struct { grpc_iomgr_closure *cbs; } grpc_connectivity_state_flusher; - extern int grpc_connectivity_state_trace; void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, @@ -71,35 +67,15 @@ void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker); * external lock */ void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, grpc_connectivity_state state, - const char *reason); - -/** Begin flushing callbacks; not thread safe; access must be serialized using - * the same external lock as grpc_connectivity_state_set. Initializes flusher. - */ -void grpc_connectivity_state_begin_flush( - grpc_connectivity_state_tracker *tracker, - grpc_connectivity_state_flusher *flusher); - -/** Complete flushing updates: must not be called with any locks held */ -void grpc_connectivity_state_end_flush( - grpc_connectivity_state_flusher *flusher); + const char *reason, + grpc_iomgr_call_list *call_list); grpc_connectivity_state grpc_connectivity_state_check( grpc_connectivity_state_tracker *tracker); -typedef struct { - /** 1 if the current state is idle (a hint to begin connecting), 0 otherwise - */ - int current_state_is_idle; - /** 1 if the state has already changed: in this case the closure passed to - * grpc_connectivity_state_notify_on_state_change will not be called */ - int state_already_changed; -} grpc_connectivity_state_notify_on_state_change_result; - /** Return 1 if the channel should start connecting, 0 otherwise */ -grpc_connectivity_state_notify_on_state_change_result -grpc_connectivity_state_notify_on_state_change( +int grpc_connectivity_state_notify_on_state_change( grpc_connectivity_state_tracker *tracker, grpc_connectivity_state *current, - grpc_iomgr_closure *notify) GRPC_MUST_USE_RESULT; + grpc_iomgr_closure *notify, grpc_iomgr_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CONNECTIVITY_STATE_H */ From 33825118df7157219cec15382beb006d3462ad96 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 18 Sep 2015 07:44:19 -0700 Subject: [PATCH 13/56] Cleanup --- src/core/census/grpc_filter.c | 4 +- src/core/channel/client_channel.c | 79 +++++++-------- src/core/channel/client_channel.h | 5 +- src/core/channel/http_client_filter.c | 6 +- src/core/channel/http_server_filter.c | 6 +- src/core/client_config/connector.c | 2 +- src/core/client_config/connector.h | 4 +- .../client_config/lb_policies/pick_first.c | 33 +++---- src/core/client_config/lb_policy.c | 17 ++-- src/core/client_config/lb_policy.h | 35 +++---- src/core/client_config/resolver.c | 2 +- src/core/client_config/resolver.h | 4 +- .../client_config/resolvers/dns_resolver.c | 18 ++-- .../resolvers/sockaddr_resolver.c | 19 ++-- .../resolvers/zookeeper_resolver.c | 21 ++-- src/core/client_config/subchannel.c | 49 +++++----- src/core/client_config/subchannel.h | 8 +- src/core/httpcli/httpcli.c | 8 +- src/core/iomgr/endpoint.c | 4 +- src/core/iomgr/endpoint.h | 8 +- src/core/iomgr/fd_posix.c | 21 ++-- src/core/iomgr/fd_posix.h | 11 +-- src/core/iomgr/iomgr.c | 19 ++-- src/core/iomgr/iomgr.h | 31 +++--- .../iomgr/pollset_multipoller_with_epoll.c | 4 +- src/core/iomgr/pollset_posix.c | 16 ++- src/core/iomgr/pollset_posix.h | 10 +- src/core/iomgr/socket_windows.h | 2 +- src/core/iomgr/tcp_client_posix.c | 2 +- src/core/iomgr/tcp_posix.c | 16 +-- src/core/iomgr/tcp_server_posix.c | 4 +- src/core/iomgr/tcp_windows.c | 12 +-- src/core/iomgr/udp_server.c | 4 +- src/core/iomgr/workqueue.h | 4 +- src/core/iomgr/workqueue_posix.c | 97 ++++--------------- src/core/iomgr/workqueue_posix.h | 5 +- src/core/security/secure_endpoint.c | 12 +-- src/core/security/secure_transport_setup.c | 12 +-- src/core/security/server_auth_filter.c | 6 +- src/core/surface/call.c | 19 ++-- src/core/surface/channel_connectivity.c | 14 +-- src/core/surface/channel_create.c | 6 +- src/core/surface/secure_channel_create.c | 8 +- src/core/surface/server.c | 32 +++--- src/core/transport/chttp2/internal.h | 14 +-- src/core/transport/chttp2/writing.c | 4 +- src/core/transport/chttp2_transport.c | 36 ++++--- src/core/transport/connectivity_state.c | 8 +- src/core/transport/connectivity_state.h | 7 +- src/core/transport/transport.c | 6 +- src/core/transport/transport.h | 14 +-- test/core/bad_client/bad_client.c | 4 +- .../core/end2end/fixtures/h2_sockpair+trace.c | 2 +- test/core/end2end/fixtures/h2_sockpair.c | 2 +- .../core/end2end/fixtures/h2_sockpair_1byte.c | 2 +- test/core/iomgr/endpoint_tests.c | 11 +-- test/core/iomgr/fd_posix_test.c | 10 +- test/core/iomgr/tcp_posix_test.c | 10 +- test/core/iomgr/workqueue_test.c | 4 +- 59 files changed, 372 insertions(+), 461 deletions(-) diff --git a/src/core/census/grpc_filter.c b/src/core/census/grpc_filter.c index 8b6ba1d4721..d98162ec9a9 100644 --- a/src/core/census/grpc_filter.c +++ b/src/core/census/grpc_filter.c @@ -54,7 +54,7 @@ typedef struct call_data { /* recv callback */ grpc_stream_op_buffer* recv_ops; - grpc_iomgr_closure* on_done_recv; + grpc_closure* on_done_recv; } call_data; typedef struct channel_data { @@ -145,7 +145,7 @@ static void server_init_call_elem(grpc_call_element* elem, GPR_ASSERT(d != NULL); d->start_ts = gpr_now(GPR_CLOCK_REALTIME); /* TODO(hongyu): call census_tracing_start_op here. */ - grpc_iomgr_closure_init(d->on_done_recv, server_on_done_recv, elem); + grpc_closure_init(d->on_done_recv, server_on_done_recv, elem); if (initial_op) server_mutate_op(elem, initial_op); } diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index a2346503d90..588b9c36ee8 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -73,9 +73,9 @@ typedef struct { guarded by mu_config */ grpc_client_config *incoming_configuration; /** a list of closures that are all waiting for config to come in */ - grpc_iomgr_call_list waiting_for_config_closures; + grpc_call_list waiting_for_config_closures; /** resolver callback */ - grpc_iomgr_closure on_config_changed; + grpc_closure on_config_changed; /** connectivity state being tracked */ grpc_connectivity_state_tracker state_tracker; /** when an lb_policy arrives, should we try to exit idle */ @@ -91,7 +91,7 @@ typedef struct { update the channel, and create a new watcher */ typedef struct { channel_data *chand; - grpc_iomgr_closure on_changed; + grpc_closure on_changed; grpc_connectivity_state state; grpc_lb_policy *lb_policy; } lb_policy_connectivity_watcher; @@ -115,7 +115,7 @@ struct call_data { call_state state; gpr_timespec deadline; grpc_subchannel *picked_channel; - grpc_iomgr_closure async_setup_task; + grpc_closure async_setup_task; grpc_transport_stream_op waiting_op; /* our child call stack */ grpc_subchannel_call *subchannel_call; @@ -123,9 +123,9 @@ struct call_data { grpc_linked_mdelem details; }; -static grpc_iomgr_closure *merge_into_waiting_op( - grpc_call_element *elem, - grpc_transport_stream_op *new_op) GRPC_MUST_USE_RESULT; +static grpc_closure *merge_into_waiting_op(grpc_call_element *elem, + grpc_transport_stream_op *new_op) + GRPC_MUST_USE_RESULT; static void handle_op_after_cancellation(grpc_call_element *elem, grpc_transport_stream_op *op) { @@ -160,7 +160,7 @@ static void handle_op_after_cancellation(grpc_call_element *elem, } typedef struct { - grpc_iomgr_closure closure; + grpc_closure closure; grpc_call_element *elem; } waiting_call; @@ -179,10 +179,9 @@ static void add_to_lb_policy_wait_queue_locked_state_config( grpc_call_element *elem) { channel_data *chand = elem->channel_data; waiting_call *wc = gpr_malloc(sizeof(*wc)); - grpc_iomgr_closure_init(&wc->closure, continue_with_pick, wc); + grpc_closure_init(&wc->closure, continue_with_pick, wc); wc->elem = elem; - grpc_iomgr_call_list_add(&chand->waiting_for_config_closures, &wc->closure, - 1); + grpc_call_list_add(&chand->waiting_for_config_closures, &wc->closure, 1); } static int is_empty(void *p, int len) { @@ -230,7 +229,7 @@ static void started_call(void *arg, int iomgr_success) { static void picked_target(void *arg, int iomgr_success) { call_data *calld = arg; grpc_pollset *pollset; - grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; if (calld->picked_channel == NULL) { /* treat this like a cancellation */ @@ -246,19 +245,19 @@ static void picked_target(void *arg, int iomgr_success) { calld->state = CALL_WAITING_FOR_CALL; pollset = calld->waiting_op.bind_pollset; gpr_mu_unlock(&calld->mu_state); - grpc_iomgr_closure_init(&calld->async_setup_task, started_call, calld); + grpc_closure_init(&calld->async_setup_task, started_call, calld); grpc_subchannel_create_call(calld->picked_channel, pollset, &calld->subchannel_call, &calld->async_setup_task, &call_list); } } - grpc_iomgr_call_list_run(call_list); + grpc_call_list_run(call_list); } -static grpc_iomgr_closure *merge_into_waiting_op( - grpc_call_element *elem, grpc_transport_stream_op *new_op) { +static grpc_closure *merge_into_waiting_op(grpc_call_element *elem, + grpc_transport_stream_op *new_op) { call_data *calld = elem->call_data; - grpc_iomgr_closure *consumed_op = NULL; + grpc_closure *consumed_op = NULL; grpc_transport_stream_op *waiting_op = &calld->waiting_op; GPR_ASSERT((waiting_op->send_ops != NULL) + (new_op->send_ops != NULL) <= 1); GPR_ASSERT((waiting_op->recv_ops != NULL) + (new_op->recv_ops != NULL) <= 1); @@ -312,7 +311,7 @@ static void perform_transport_stream_op(grpc_call_element *elem, grpc_subchannel_call *subchannel_call; grpc_lb_policy *lb_policy; grpc_transport_stream_op op2; - grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; GPR_ASSERT(elem->filter == &grpc_client_channel_filter); GRPC_CALL_LOG_OP(GPR_INFO, elem, op); @@ -330,7 +329,7 @@ static void perform_transport_stream_op(grpc_call_element *elem, break; case CALL_WAITING_FOR_SEND: GPR_ASSERT(!continuation); - grpc_iomgr_call_list_add(&call_list, merge_into_waiting_op(elem, op), 1); + grpc_call_list_add(&call_list, merge_into_waiting_op(elem, op), 1); if (!calld->waiting_op.send_ops && calld->waiting_op.cancel_with_status == GRPC_STATUS_OK) { gpr_mu_unlock(&calld->mu_state); @@ -359,8 +358,7 @@ static void perform_transport_stream_op(grpc_call_element *elem, handle_op_after_cancellation(elem, op); handle_op_after_cancellation(elem, &op2); } else { - grpc_iomgr_call_list_add(&call_list, merge_into_waiting_op(elem, op), - 1); + grpc_call_list_add(&call_list, merge_into_waiting_op(elem, op), 1); gpr_mu_unlock(&calld->mu_state); } break; @@ -397,8 +395,7 @@ static void perform_transport_stream_op(grpc_call_element *elem, GPR_ASSERT(op->send_ops->ops[0].type == GRPC_OP_METADATA); gpr_mu_unlock(&calld->mu_state); - grpc_iomgr_closure_init(&calld->async_setup_task, picked_target, - calld); + grpc_closure_init(&calld->async_setup_task, picked_target, calld); grpc_lb_policy_pick(lb_policy, bind_pollset, initial_metadata, &calld->picked_channel, &calld->async_setup_task, &call_list); @@ -427,7 +424,7 @@ static void perform_transport_stream_op(grpc_call_element *elem, break; } - grpc_iomgr_call_list_run(call_list); + grpc_call_list_run(call_list); } static void cc_start_transport_stream_op(grpc_call_element *elem, @@ -437,10 +434,10 @@ static void cc_start_transport_stream_op(grpc_call_element *elem, static void watch_lb_policy(channel_data *chand, grpc_lb_policy *lb_policy, grpc_connectivity_state current_state, - grpc_iomgr_call_list *cl); + grpc_call_list *cl); static void on_lb_policy_state_changed_locked(lb_policy_connectivity_watcher *w, - grpc_iomgr_call_list *cl) { + grpc_call_list *cl) { /* check if the notification is for a stale policy */ if (w->lb_policy != w->chand->lb_policy) return; @@ -453,13 +450,13 @@ static void on_lb_policy_state_changed_locked(lb_policy_connectivity_watcher *w, static void on_lb_policy_state_changed(void *arg, int iomgr_success) { lb_policy_connectivity_watcher *w = arg; - grpc_iomgr_call_list cl = GRPC_IOMGR_CALL_LIST_INIT; + grpc_call_list cl = GRPC_CALL_LIST_INIT; gpr_mu_lock(&w->chand->mu_config); on_lb_policy_state_changed_locked(w, &cl); gpr_mu_unlock(&w->chand->mu_config); - grpc_iomgr_call_list_run(cl); + grpc_call_list_run(cl); GRPC_CHANNEL_INTERNAL_UNREF(w->chand->master, "watch_lb_policy"); gpr_free(w); @@ -467,12 +464,12 @@ static void on_lb_policy_state_changed(void *arg, int iomgr_success) { static void watch_lb_policy(channel_data *chand, grpc_lb_policy *lb_policy, grpc_connectivity_state current_state, - grpc_iomgr_call_list *call_list) { + grpc_call_list *call_list) { lb_policy_connectivity_watcher *w = gpr_malloc(sizeof(*w)); GRPC_CHANNEL_INTERNAL_REF(chand->master, "watch_lb_policy"); w->chand = chand; - grpc_iomgr_closure_init(&w->on_changed, on_lb_policy_state_changed, w); + grpc_closure_init(&w->on_changed, on_lb_policy_state_changed, w); w->state = current_state; w->lb_policy = lb_policy; grpc_lb_policy_notify_on_state_change(lb_policy, &w->state, &w->on_changed, @@ -485,7 +482,7 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { grpc_lb_policy *old_lb_policy; grpc_resolver *old_resolver; grpc_connectivity_state state = GRPC_CHANNEL_TRANSIENT_FAILURE; - grpc_iomgr_call_list cl = GRPC_IOMGR_CALL_LIST_INIT; + grpc_call_list cl = GRPC_CALL_LIST_INIT; int exit_idle = 0; if (chand->incoming_configuration != NULL) { @@ -505,7 +502,7 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { old_lb_policy = chand->lb_policy; chand->lb_policy = lb_policy; if (lb_policy != NULL || chand->resolver == NULL /* disconnected */) { - grpc_iomgr_call_list_move(&chand->waiting_for_config_closures, &cl); + grpc_call_list_move(&chand->waiting_for_config_closures, &cl); } if (lb_policy != NULL && chand->exit_idle_when_lb_policy_arrives) { GRPC_LB_POLICY_REF(lb_policy, "exit_idle"); @@ -553,7 +550,7 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { GRPC_LB_POLICY_UNREF(lb_policy, "config_change"); } - grpc_iomgr_call_list_run(cl); + grpc_call_list_run(cl); GRPC_CHANNEL_INTERNAL_UNREF(chand->master, "resolver"); } @@ -562,10 +559,10 @@ static void cc_start_transport_op(grpc_channel_element *elem, grpc_lb_policy *lb_policy = NULL; channel_data *chand = elem->channel_data; grpc_resolver *destroy_resolver = NULL; - grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; if (op->on_consumed) { - grpc_iomgr_call_list_add(&call_list, op->on_consumed, 1); + grpc_call_list_add(&call_list, op->on_consumed, 1); op->on_consumed = NULL; } @@ -612,7 +609,7 @@ static void cc_start_transport_op(grpc_channel_element *elem, GRPC_LB_POLICY_UNREF(lb_policy, "broadcast"); } - grpc_iomgr_call_list_run(call_list); + grpc_call_list_run(call_list); } /* Constructor for call_data */ @@ -677,8 +674,7 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, chand->mdctx = metadata_context; chand->master = master; grpc_pollset_set_init(&chand->pollset_set); - grpc_iomgr_closure_init(&chand->on_config_changed, cc_on_config_changed, - chand); + grpc_closure_init(&chand->on_config_changed, cc_on_config_changed, chand); grpc_connectivity_state_init(&chand->state_tracker, GRPC_CHANNEL_IDLE, "client_channel"); @@ -722,7 +718,7 @@ void grpc_client_channel_set_resolver(grpc_channel_stack *channel_stack, GPR_ASSERT(!chand->resolver); chand->resolver = resolver; GRPC_RESOLVER_REF(resolver, "channel"); - if (!grpc_iomgr_call_list_empty(chand->waiting_for_config_closures) || + if (!grpc_call_list_empty(chand->waiting_for_config_closures) || chand->exit_idle_when_lb_policy_arrives) { chand->started_resolving = 1; GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); @@ -733,8 +729,7 @@ void grpc_client_channel_set_resolver(grpc_channel_stack *channel_stack, } grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_channel_element *elem, int try_to_connect, - grpc_iomgr_call_list *call_list) { + grpc_channel_element *elem, int try_to_connect, grpc_call_list *call_list) { channel_data *chand = elem->channel_data; grpc_connectivity_state out; gpr_mu_lock(&chand->mu_config); @@ -758,7 +753,7 @@ grpc_connectivity_state grpc_client_channel_check_connectivity_state( void grpc_client_channel_watch_connectivity_state( grpc_channel_element *elem, grpc_connectivity_state *state, - grpc_iomgr_closure *on_complete, grpc_iomgr_call_list *call_list) { + grpc_closure *on_complete, grpc_call_list *call_list) { channel_data *chand = elem->channel_data; gpr_mu_lock(&chand->mu_config); grpc_connectivity_state_notify_on_state_change(&chand->state_tracker, state, diff --git a/src/core/channel/client_channel.h b/src/core/channel/client_channel.h index 60090e8d7e2..bd84dad6b73 100644 --- a/src/core/channel/client_channel.h +++ b/src/core/channel/client_channel.h @@ -53,12 +53,11 @@ void grpc_client_channel_set_resolver(grpc_channel_stack *channel_stack, grpc_resolver *resolver); grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_channel_element *elem, int try_to_connect, - grpc_iomgr_call_list *call_list); + grpc_channel_element *elem, int try_to_connect, grpc_call_list *call_list); void grpc_client_channel_watch_connectivity_state( grpc_channel_element *elem, grpc_connectivity_state *state, - grpc_iomgr_closure *on_complete, grpc_iomgr_call_list *call_list); + grpc_closure *on_complete, grpc_call_list *call_list); grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set( grpc_channel_element *elem); diff --git a/src/core/channel/http_client_filter.c b/src/core/channel/http_client_filter.c index ec832a03672..bcaaca0f7da 100644 --- a/src/core/channel/http_client_filter.c +++ b/src/core/channel/http_client_filter.c @@ -50,11 +50,11 @@ typedef struct call_data { grpc_stream_op_buffer *recv_ops; /** Closure to call when finished with the hc_on_recv hook */ - grpc_iomgr_closure *on_done_recv; + grpc_closure *on_done_recv; /** Receive closures are chained: we inject this closure as the on_done_recv up-call on transport_op, and remember to call our on_done_recv member after handling it. */ - grpc_iomgr_closure hc_on_recv; + grpc_closure hc_on_recv; } call_data; typedef struct channel_data { @@ -162,7 +162,7 @@ static void init_call_elem(grpc_call_element *elem, calld->sent_initial_metadata = 0; calld->got_initial_metadata = 0; calld->on_done_recv = NULL; - grpc_iomgr_closure_init(&calld->hc_on_recv, hc_on_recv, elem); + grpc_closure_init(&calld->hc_on_recv, hc_on_recv, elem); if (initial_op) hc_mutate_op(elem, initial_op); } diff --git a/src/core/channel/http_server_filter.c b/src/core/channel/http_server_filter.c index 2f061946a1f..7a9f17d057f 100644 --- a/src/core/channel/http_server_filter.c +++ b/src/core/channel/http_server_filter.c @@ -50,11 +50,11 @@ typedef struct call_data { grpc_stream_op_buffer *recv_ops; /** Closure to call when finished with the hs_on_recv hook */ - grpc_iomgr_closure *on_done_recv; + grpc_closure *on_done_recv; /** Receive closures are chained: we inject this closure as the on_done_recv up-call on transport_op, and remember to call our on_done_recv member after handling it. */ - grpc_iomgr_closure hs_on_recv; + grpc_closure hs_on_recv; } call_data; typedef struct channel_data { @@ -232,7 +232,7 @@ static void init_call_elem(grpc_call_element *elem, call_data *calld = elem->call_data; /* initialize members */ memset(calld, 0, sizeof(*calld)); - grpc_iomgr_closure_init(&calld->hs_on_recv, hs_on_recv, elem); + grpc_closure_init(&calld->hs_on_recv, hs_on_recv, elem); if (initial_op) hs_mutate_op(elem, initial_op); } diff --git a/src/core/client_config/connector.c b/src/core/client_config/connector.c index c1e583e4a50..6252d572715 100644 --- a/src/core/client_config/connector.c +++ b/src/core/client_config/connector.c @@ -44,7 +44,7 @@ void grpc_connector_unref(grpc_connector *connector) { void grpc_connector_connect(grpc_connector *connector, const grpc_connect_in_args *in_args, grpc_connect_out_args *out_args, - grpc_iomgr_closure *notify) { + grpc_closure *notify) { connector->vtable->connect(connector, in_args, out_args, notify); } diff --git a/src/core/client_config/connector.h b/src/core/client_config/connector.h index ad0b5675539..fc1f6708de6 100644 --- a/src/core/client_config/connector.h +++ b/src/core/client_config/connector.h @@ -77,7 +77,7 @@ struct grpc_connector_vtable { /** Implementation of grpc_connector_connect */ void (*connect)(grpc_connector *connector, const grpc_connect_in_args *in_args, - grpc_connect_out_args *out_args, grpc_iomgr_closure *notify); + grpc_connect_out_args *out_args, grpc_closure *notify); }; void grpc_connector_ref(grpc_connector *connector); @@ -86,7 +86,7 @@ void grpc_connector_unref(grpc_connector *connector); void grpc_connector_connect(grpc_connector *connector, const grpc_connect_in_args *in_args, grpc_connect_out_args *out_args, - grpc_iomgr_closure *notify); + grpc_closure *notify); /** Cancel any pending connection */ void grpc_connector_shutdown(grpc_connector *connector); diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index 8fd8dd7b671..852eed310d1 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -43,7 +43,7 @@ typedef struct pending_pick { struct pending_pick *next; grpc_pollset *pollset; grpc_subchannel **target; - grpc_iomgr_closure *on_complete; + grpc_closure *on_complete; } pending_pick; typedef struct { @@ -55,7 +55,7 @@ typedef struct { /** workqueue for async work */ grpc_workqueue *workqueue; - grpc_iomgr_closure connectivity_changed; + grpc_closure connectivity_changed; /** mutex protecting remaining members */ gpr_mu mu; @@ -108,7 +108,7 @@ void pf_destroy(grpc_lb_policy *pol) { gpr_free(p); } -void pf_shutdown(grpc_lb_policy *pol, grpc_iomgr_call_list *call_list) { +void pf_shutdown(grpc_lb_policy *pol, grpc_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; pending_pick *pp; gpr_mu_lock(&p->mu); @@ -122,14 +122,13 @@ void pf_shutdown(grpc_lb_policy *pol, grpc_iomgr_call_list *call_list) { while (pp != NULL) { pending_pick *next = pp->next; *pp->target = NULL; - grpc_iomgr_call_list_add(call_list, pp->on_complete, 1); + grpc_call_list_add(call_list, pp->on_complete, 1); gpr_free(pp); pp = next; } } -static void start_picking(pick_first_lb_policy *p, - grpc_iomgr_call_list *call_list) { +static void start_picking(pick_first_lb_policy *p, grpc_call_list *call_list) { p->started_picking = 1; p->checking_subchannel = 0; p->checking_connectivity = GRPC_CHANNEL_IDLE; @@ -139,7 +138,7 @@ static void start_picking(pick_first_lb_policy *p, &p->connectivity_changed, call_list); } -void pf_exit_idle(grpc_lb_policy *pol, grpc_iomgr_call_list *call_list) { +void pf_exit_idle(grpc_lb_policy *pol, grpc_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; gpr_mu_lock(&p->mu); if (!p->started_picking) { @@ -150,7 +149,7 @@ void pf_exit_idle(grpc_lb_policy *pol, grpc_iomgr_call_list *call_list) { void pf_pick(grpc_lb_policy *pol, grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, grpc_subchannel **target, - grpc_iomgr_closure *on_complete, grpc_iomgr_call_list *call_list) { + grpc_closure *on_complete, grpc_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; pending_pick *pp; gpr_mu_lock(&p->mu); @@ -178,7 +177,7 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { pick_first_lb_policy *p = arg; pending_pick *pp; int unref = 0; - grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_mu_lock(&p->mu); @@ -205,7 +204,7 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { p->pending_picks = pp->next; *pp->target = p->selected; grpc_subchannel_del_interested_party(p->selected, pp->pollset); - grpc_iomgr_call_list_add(&call_list, pp->on_complete, 1); + grpc_call_list_add(&call_list, pp->on_complete, 1); gpr_free(pp); } grpc_subchannel_notify_on_state_change( @@ -251,7 +250,7 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = NULL; - grpc_iomgr_call_list_add(&call_list, pp->on_complete, 1); + grpc_call_list_add(&call_list, pp->on_complete, 1); gpr_free(pp); } unref = 1; @@ -270,7 +269,7 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { gpr_mu_unlock(&p->mu); - grpc_iomgr_call_list_run(call_list); + grpc_call_list_run(call_list); if (unref) { GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity"); @@ -278,7 +277,7 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { } static void pf_broadcast(grpc_lb_policy *pol, grpc_transport_op *op, - grpc_iomgr_call_list *call_list) { + grpc_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; size_t i; size_t n; @@ -301,7 +300,7 @@ static void pf_broadcast(grpc_lb_policy *pol, grpc_transport_op *op, } static grpc_connectivity_state pf_check_connectivity( - grpc_lb_policy *pol, grpc_iomgr_call_list *call_list) { + grpc_lb_policy *pol, grpc_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; grpc_connectivity_state st; gpr_mu_lock(&p->mu); @@ -312,8 +311,8 @@ static grpc_connectivity_state pf_check_connectivity( void pf_notify_on_state_change(grpc_lb_policy *pol, grpc_connectivity_state *current, - grpc_iomgr_closure *notify, - grpc_iomgr_call_list *call_list) { + grpc_closure *notify, + grpc_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; gpr_mu_lock(&p->mu); grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, @@ -348,7 +347,7 @@ static grpc_lb_policy *create_pick_first(grpc_lb_policy_factory *factory, "pick_first"); memcpy(p->subchannels, args->subchannels, sizeof(grpc_subchannel *) * args->num_subchannels); - grpc_iomgr_closure_init(&p->connectivity_changed, pf_connectivity_changed, p); + grpc_closure_init(&p->connectivity_changed, pf_connectivity_changed, p); gpr_mu_init(&p->mu); return &p->base; } diff --git a/src/core/client_config/lb_policy.c b/src/core/client_config/lb_policy.c index a9dc9dcca81..95ab29cd886 100644 --- a/src/core/client_config/lb_policy.c +++ b/src/core/client_config/lb_policy.c @@ -64,37 +64,36 @@ void grpc_lb_policy_unref(grpc_lb_policy *policy) { } void grpc_lb_policy_shutdown(grpc_lb_policy *policy, - grpc_iomgr_call_list *call_list) { + grpc_call_list *call_list) { policy->vtable->shutdown(policy, call_list); } void grpc_lb_policy_pick(grpc_lb_policy *policy, grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, - grpc_subchannel **target, - grpc_iomgr_closure *on_complete, - grpc_iomgr_call_list *call_list) { + grpc_subchannel **target, grpc_closure *on_complete, + grpc_call_list *call_list) { policy->vtable->pick(policy, pollset, initial_metadata, target, on_complete, call_list); } void grpc_lb_policy_broadcast(grpc_lb_policy *policy, grpc_transport_op *op, - grpc_iomgr_call_list *call_list) { + grpc_call_list *call_list) { policy->vtable->broadcast(policy, op, call_list); } void grpc_lb_policy_exit_idle(grpc_lb_policy *policy, - grpc_iomgr_call_list *call_list) { + grpc_call_list *call_list) { policy->vtable->exit_idle(policy, call_list); } void grpc_lb_policy_notify_on_state_change(grpc_lb_policy *policy, grpc_connectivity_state *state, - grpc_iomgr_closure *closure, - grpc_iomgr_call_list *call_list) { + grpc_closure *closure, + grpc_call_list *call_list) { policy->vtable->notify_on_state_change(policy, state, closure, call_list); } grpc_connectivity_state grpc_lb_policy_check_connectivity( - grpc_lb_policy *policy, grpc_iomgr_call_list *call_list) { + grpc_lb_policy *policy, grpc_call_list *call_list) { return policy->vtable->check_connectivity(policy, call_list); } diff --git a/src/core/client_config/lb_policy.h b/src/core/client_config/lb_policy.h index 8d7eb579b5f..e445d2cded0 100644 --- a/src/core/client_config/lb_policy.h +++ b/src/core/client_config/lb_policy.h @@ -53,31 +53,30 @@ struct grpc_lb_policy { struct grpc_lb_policy_vtable { void (*destroy)(grpc_lb_policy *policy); - void (*shutdown)(grpc_lb_policy *policy, grpc_iomgr_call_list *call_list); + void (*shutdown)(grpc_lb_policy *policy, grpc_call_list *call_list); /** implement grpc_lb_policy_pick */ void (*pick)(grpc_lb_policy *policy, grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, grpc_subchannel **target, - grpc_iomgr_closure *on_complete, - grpc_iomgr_call_list *call_list); + grpc_closure *on_complete, grpc_call_list *call_list); /** try to enter a READY connectivity state */ - void (*exit_idle)(grpc_lb_policy *policy, grpc_iomgr_call_list *call_list); + void (*exit_idle)(grpc_lb_policy *policy, grpc_call_list *call_list); /** broadcast a transport op to all subchannels */ void (*broadcast)(grpc_lb_policy *policy, grpc_transport_op *op, - grpc_iomgr_call_list *call_list); + grpc_call_list *call_list); /** check the current connectivity of the lb_policy */ - grpc_connectivity_state (*check_connectivity)( - grpc_lb_policy *policy, grpc_iomgr_call_list *call_list); + grpc_connectivity_state (*check_connectivity)(grpc_lb_policy *policy, + grpc_call_list *call_list); /** call notify when the connectivity state of a channel changes from *state. Updates *state with the new state of the policy */ void (*notify_on_state_change)(grpc_lb_policy *policy, grpc_connectivity_state *state, - grpc_iomgr_closure *closure, - grpc_iomgr_call_list *call_list); + grpc_closure *closure, + grpc_call_list *call_list); }; #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG @@ -101,8 +100,7 @@ void grpc_lb_policy_init(grpc_lb_policy *policy, const grpc_lb_policy_vtable *vtable); /** Start shutting down (fail any pending picks) */ -void grpc_lb_policy_shutdown(grpc_lb_policy *policy, - grpc_iomgr_call_list *call_list); +void grpc_lb_policy_shutdown(grpc_lb_policy *policy, grpc_call_list *call_list); /** Given initial metadata in \a initial_metadata, find an appropriate target for this rpc, and 'return' it by calling \a on_complete after setting @@ -110,22 +108,21 @@ void grpc_lb_policy_shutdown(grpc_lb_policy *policy, Picking can be asynchronous. Any IO should be done under \a pollset. */ void grpc_lb_policy_pick(grpc_lb_policy *policy, grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, - grpc_subchannel **target, - grpc_iomgr_closure *on_complete, - grpc_iomgr_call_list *call_list); + grpc_subchannel **target, grpc_closure *on_complete, + grpc_call_list *call_list); void grpc_lb_policy_broadcast(grpc_lb_policy *policy, grpc_transport_op *op, - grpc_iomgr_call_list *call_list); + grpc_call_list *call_list); void grpc_lb_policy_exit_idle(grpc_lb_policy *policy, - grpc_iomgr_call_list *call_list); + grpc_call_list *call_list); void grpc_lb_policy_notify_on_state_change(grpc_lb_policy *policy, grpc_connectivity_state *state, - grpc_iomgr_closure *closure, - grpc_iomgr_call_list *call_list); + grpc_closure *closure, + grpc_call_list *call_list); grpc_connectivity_state grpc_lb_policy_check_connectivity( - grpc_lb_policy *policy, grpc_iomgr_call_list *call_list); + grpc_lb_policy *policy, grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_CONFIG_LB_POLICY_H */ diff --git a/src/core/client_config/resolver.c b/src/core/client_config/resolver.c index 91e42bb6844..6a7d73c54fb 100644 --- a/src/core/client_config/resolver.c +++ b/src/core/client_config/resolver.c @@ -78,6 +78,6 @@ void grpc_resolver_channel_saw_error(grpc_resolver *resolver, void grpc_resolver_next(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_iomgr_closure *on_complete) { + grpc_closure *on_complete) { resolver->vtable->next(resolver, target_config, on_complete); } diff --git a/src/core/client_config/resolver.h b/src/core/client_config/resolver.h index 8ad87d789b5..217d061abee 100644 --- a/src/core/client_config/resolver.h +++ b/src/core/client_config/resolver.h @@ -55,7 +55,7 @@ struct grpc_resolver_vtable { struct sockaddr *failing_address, int failing_address_len); void (*next)(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_iomgr_closure *on_complete); + grpc_closure *on_complete); }; #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG @@ -92,6 +92,6 @@ void grpc_resolver_channel_saw_error(grpc_resolver *resolver, schedule on_complete. */ void grpc_resolver_next(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_iomgr_closure *on_complete); + grpc_closure *on_complete); #endif /* GRPC_INTERNAL_CORE_CONFIG_RESOLVER_H */ diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index 4fee543a5be..e251664e03e 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -69,7 +69,7 @@ typedef struct { /** which version of resolved_config is current? */ int resolved_version; /** pending next completion, or NULL */ - grpc_iomgr_closure *next_completion; + grpc_closure *next_completion; /** target config address for next completion */ grpc_client_config **target_config; /** current (fully resolved) config */ @@ -79,7 +79,7 @@ typedef struct { static void dns_destroy(grpc_resolver *r); static void dns_start_resolving_locked(dns_resolver *r); -static grpc_iomgr_closure *dns_maybe_finish_next_locked(dns_resolver *r) +static grpc_closure *dns_maybe_finish_next_locked(dns_resolver *r) GRPC_MUST_USE_RESULT; static void dns_shutdown(grpc_resolver *r); @@ -87,14 +87,14 @@ static void dns_channel_saw_error(grpc_resolver *r, struct sockaddr *failing_address, int failing_address_len); static void dns_next(grpc_resolver *r, grpc_client_config **target_config, - grpc_iomgr_closure *on_complete); + grpc_closure *on_complete); static const grpc_resolver_vtable dns_resolver_vtable = { dns_destroy, dns_shutdown, dns_channel_saw_error, dns_next}; static void dns_shutdown(grpc_resolver *resolver) { dns_resolver *r = (dns_resolver *)resolver; - grpc_iomgr_closure *next_completion; + grpc_closure *next_completion; gpr_mu_lock(&r->mu); next_completion = r->next_completion; r->next_completion = NULL; @@ -117,9 +117,9 @@ static void dns_channel_saw_error(grpc_resolver *resolver, struct sockaddr *sa, static void dns_next(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_iomgr_closure *on_complete) { + grpc_closure *on_complete) { dns_resolver *r = (dns_resolver *)resolver; - grpc_iomgr_closure *call = NULL; + grpc_closure *call = NULL; gpr_mu_lock(&r->mu); GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; @@ -141,7 +141,7 @@ static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses) { grpc_subchannel **subchannels; grpc_subchannel_args args; grpc_lb_policy *lb_policy; - grpc_iomgr_closure *call; + grpc_closure *call; size_t i; if (addresses) { grpc_lb_policy_args lb_policy_args; @@ -188,8 +188,8 @@ static void dns_start_resolving_locked(dns_resolver *r) { grpc_resolve_address(r->name, r->default_port, dns_on_resolved, r); } -static grpc_iomgr_closure *dns_maybe_finish_next_locked(dns_resolver *r) { - grpc_iomgr_closure *ret = NULL; +static grpc_closure *dns_maybe_finish_next_locked(dns_resolver *r) { + grpc_closure *ret = NULL; if (r->next_completion != NULL && r->resolved_version != r->published_version) { *r->target_config = r->resolved_config; diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index 220915853c0..47fe5fad4a1 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -73,22 +73,22 @@ typedef struct { /** have we published? */ int published; /** pending next completion, or NULL */ - grpc_iomgr_closure *next_completion; + grpc_closure *next_completion; /** target config address for next completion */ grpc_client_config **target_config; } sockaddr_resolver; static void sockaddr_destroy(grpc_resolver *r); -static grpc_iomgr_closure *sockaddr_maybe_finish_next_locked( - sockaddr_resolver *r) GRPC_MUST_USE_RESULT; +static grpc_closure *sockaddr_maybe_finish_next_locked(sockaddr_resolver *r) + GRPC_MUST_USE_RESULT; static void sockaddr_shutdown(grpc_resolver *r); static void sockaddr_channel_saw_error(grpc_resolver *r, struct sockaddr *failing_address, int failing_address_len); static void sockaddr_next(grpc_resolver *r, grpc_client_config **target_config, - grpc_iomgr_closure *on_complete); + grpc_closure *on_complete); static const grpc_resolver_vtable sockaddr_resolver_vtable = { sockaddr_destroy, sockaddr_shutdown, sockaddr_channel_saw_error, @@ -96,7 +96,7 @@ static const grpc_resolver_vtable sockaddr_resolver_vtable = { static void sockaddr_shutdown(grpc_resolver *resolver) { sockaddr_resolver *r = (sockaddr_resolver *)resolver; - grpc_iomgr_closure *call = NULL; + grpc_closure *call = NULL; gpr_mu_lock(&r->mu); if (r->next_completion != NULL) { *r->target_config = NULL; @@ -114,9 +114,9 @@ static void sockaddr_channel_saw_error(grpc_resolver *resolver, static void sockaddr_next(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_iomgr_closure *on_complete) { + grpc_closure *on_complete) { sockaddr_resolver *r = (sockaddr_resolver *)resolver; - grpc_iomgr_closure *call = NULL; + grpc_closure *call = NULL; gpr_mu_lock(&r->mu); GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; @@ -126,14 +126,13 @@ static void sockaddr_next(grpc_resolver *resolver, if (call) call->cb(call->cb_arg, 1); } -static grpc_iomgr_closure *sockaddr_maybe_finish_next_locked( - sockaddr_resolver *r) { +static grpc_closure *sockaddr_maybe_finish_next_locked(sockaddr_resolver *r) { grpc_client_config *cfg; grpc_lb_policy *lb_policy; grpc_lb_policy_args lb_policy_args; grpc_subchannel **subchannels; grpc_subchannel_args args; - grpc_iomgr_closure *call = NULL; + grpc_closure *call = NULL; if (r->next_completion != NULL && !r->published) { size_t i; diff --git a/src/core/client_config/resolvers/zookeeper_resolver.c b/src/core/client_config/resolvers/zookeeper_resolver.c index 94ec12dd169..5632f0425e4 100644 --- a/src/core/client_config/resolvers/zookeeper_resolver.c +++ b/src/core/client_config/resolvers/zookeeper_resolver.c @@ -73,7 +73,7 @@ typedef struct { /** which version of resolved_config is current? */ int resolved_version; /** pending next completion, or NULL */ - grpc_iomgr_closure *next_completion; + grpc_closure *next_completion; /** target config address for next completion */ grpc_client_config **target_config; /** current (fully resolved) config */ @@ -92,15 +92,15 @@ typedef struct { static void zookeeper_destroy(grpc_resolver *r); static void zookeeper_start_resolving_locked(zookeeper_resolver *r); -static grpc_iomgr_closure *zookeeper_maybe_finish_next_locked( - zookeeper_resolver *r) GRPC_MUST_USE_RESULT; +static grpc_closure *zookeeper_maybe_finish_next_locked(zookeeper_resolver *r) + GRPC_MUST_USE_RESULT; static void zookeeper_shutdown(grpc_resolver *r); static void zookeeper_channel_saw_error(grpc_resolver *r, struct sockaddr *failing_address, int failing_address_len); static void zookeeper_next(grpc_resolver *r, grpc_client_config **target_config, - grpc_iomgr_closure *on_complete); + grpc_closure *on_complete); static const grpc_resolver_vtable zookeeper_resolver_vtable = { zookeeper_destroy, zookeeper_shutdown, zookeeper_channel_saw_error, @@ -108,7 +108,7 @@ static const grpc_resolver_vtable zookeeper_resolver_vtable = { static void zookeeper_shutdown(grpc_resolver *resolver) { zookeeper_resolver *r = (zookeeper_resolver *)resolver; - grpc_iomgr_closure *call = NULL; + grpc_closure *call = NULL; gpr_mu_lock(&r->mu); if (r->next_completion != NULL) { *r->target_config = NULL; @@ -134,9 +134,9 @@ static void zookeeper_channel_saw_error(grpc_resolver *resolver, static void zookeeper_next(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_iomgr_closure *on_complete) { + grpc_closure *on_complete) { zookeeper_resolver *r = (zookeeper_resolver *)resolver; - grpc_iomgr_closure *call; + grpc_closure *call; gpr_mu_lock(&r->mu); GPR_ASSERT(r->next_completion == NULL); r->next_completion = on_complete; @@ -189,7 +189,7 @@ static void zookeeper_on_resolved(void *arg, grpc_subchannel **subchannels; grpc_subchannel_args args; grpc_lb_policy *lb_policy; - grpc_iomgr_closure *call; + grpc_closure *call; size_t i; if (addresses != NULL) { grpc_lb_policy_args lb_policy_args; @@ -414,9 +414,8 @@ static void zookeeper_start_resolving_locked(zookeeper_resolver *r) { zookeeper_resolve_address(r); } -static grpc_iomgr_closure *zookeeper_maybe_finish_next_locked( - zookeeper_resolver *r) { - grpc_iomgr_closure *call = NULL; +static grpc_closure *zookeeper_maybe_finish_next_locked(zookeeper_resolver *r) { + grpc_closure *call = NULL; if (r->next_completion != NULL && r->resolved_version != r->published_version) { *r->target_config = r->resolved_config; diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index b15acf826a6..99310e02e53 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -59,7 +59,7 @@ typedef struct { } connection; typedef struct { - grpc_iomgr_closure closure; + grpc_closure closure; size_t version; grpc_subchannel *subchannel; grpc_connectivity_state connectivity_state; @@ -67,11 +67,11 @@ typedef struct { typedef struct waiting_for_connect { struct waiting_for_connect *next; - grpc_iomgr_closure *notify; + grpc_closure *notify; grpc_pollset *pollset; grpc_subchannel_call **target; grpc_subchannel *subchannel; - grpc_iomgr_closure continuation; + grpc_closure continuation; } waiting_for_connect; struct grpc_subchannel { @@ -100,7 +100,7 @@ struct grpc_subchannel { grpc_connect_out_args connecting_result; /** callback for connection finishing */ - grpc_iomgr_closure connected; + grpc_closure connected; /** pollset_set tracking who's interested in a connection being setup - owned by the master channel (in particular the @@ -147,7 +147,7 @@ struct grpc_subchannel_call { static grpc_subchannel_call *create_call(connection *con); static void connectivity_state_changed_locked(grpc_subchannel *c, const char *reason, - grpc_iomgr_call_list *call_list); + grpc_call_list *call_list); static grpc_connectivity_state compute_connectivity_locked(grpc_subchannel *c); static gpr_timespec compute_connect_deadline(grpc_subchannel *c); static void subchannel_connected(void *subchannel, int iomgr_success); @@ -303,7 +303,7 @@ grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, c->pollset_set = grpc_client_channel_get_connecting_pollset_set(parent_elem); c->random = random_seed(); grpc_mdctx_ref(c->mdctx); - grpc_iomgr_closure_init(&c->connected, subchannel_connected, c); + grpc_closure_init(&c->connected, subchannel_connected, c); grpc_connectivity_state_init(&c->state_tracker, GRPC_CHANNEL_IDLE, "subchannel"); gpr_mu_init(&c->mu); @@ -334,7 +334,7 @@ static void start_connect(grpc_subchannel *c) { static void continue_creating_call(void *arg, int iomgr_success) { waiting_for_connect *w4c = arg; - grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_subchannel_del_interested_party(w4c->subchannel, w4c->pollset); grpc_subchannel_create_call(w4c->subchannel, w4c->pollset, w4c->target, w4c->notify, &call_list); @@ -344,8 +344,8 @@ static void continue_creating_call(void *arg, int iomgr_success) { void grpc_subchannel_create_call(grpc_subchannel *c, grpc_pollset *pollset, grpc_subchannel_call **target, - grpc_iomgr_closure *notify, - grpc_iomgr_call_list *call_list) { + grpc_closure *notify, + grpc_call_list *call_list) { connection *con; gpr_mu_lock(&c->mu); if (c->active != NULL) { @@ -364,7 +364,7 @@ void grpc_subchannel_create_call(grpc_subchannel *c, grpc_pollset *pollset, w4c->subchannel = c; /* released when clearing w4c */ SUBCHANNEL_REF_LOCKED(c, "waiting_for_connect"); - grpc_iomgr_closure_init(&w4c->continuation, continue_creating_call, w4c); + grpc_closure_init(&w4c->continuation, continue_creating_call, w4c); c->waiting = w4c; grpc_subchannel_add_interested_party(c, pollset); if (!c->connecting) { @@ -392,8 +392,8 @@ grpc_connectivity_state grpc_subchannel_check_connectivity(grpc_subchannel *c) { void grpc_subchannel_notify_on_state_change(grpc_subchannel *c, grpc_connectivity_state *state, - grpc_iomgr_closure *notify, - grpc_iomgr_call_list *call_list) { + grpc_closure *notify, + grpc_call_list *call_list) { int do_connect = 0; gpr_mu_lock(&c->mu); if (grpc_connectivity_state_notify_on_state_change(&c->state_tracker, state, @@ -417,7 +417,7 @@ void grpc_subchannel_process_transport_op(grpc_subchannel *c, connection *con = NULL; grpc_subchannel *destroy; int cancel_alarm = 0; - grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_mu_lock(&c->mu); if (c->active != NULL) { con = c->active; @@ -454,7 +454,7 @@ void grpc_subchannel_process_transport_op(grpc_subchannel *c, grpc_connector_shutdown(c->connector); } - grpc_iomgr_call_list_run(call_list); + grpc_call_list_run(call_list); } static void on_state_changed(void *p, int iomgr_success) { @@ -465,7 +465,7 @@ static void on_state_changed(void *p, int iomgr_success) { grpc_transport_op op; grpc_channel_element *elem; connection *destroy_connection = NULL; - grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_mu_lock(mu); @@ -514,11 +514,10 @@ done: if (destroy_connection != NULL) { connection_destroy(destroy_connection); } - grpc_iomgr_call_list_run(call_list); + grpc_call_list_run(call_list); } -static void publish_transport(grpc_subchannel *c, - grpc_iomgr_call_list *call_list) { +static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { size_t channel_stack_size; connection *con; grpc_channel_stack *stk; @@ -552,7 +551,7 @@ static void publish_transport(grpc_subchannel *c, /* initialize state watcher */ sw = gpr_malloc(sizeof(*sw)); - grpc_iomgr_closure_init(&sw->closure, on_state_changed, sw); + grpc_closure_init(&sw->closure, on_state_changed, sw); sw->subchannel = c; sw->connectivity_state = GRPC_CHANNEL_READY; @@ -599,7 +598,7 @@ static void publish_transport(grpc_subchannel *c, while (w4c != NULL) { waiting_for_connect *next = w4c; - grpc_iomgr_call_list_add(call_list, &w4c->continuation, 1); + grpc_call_list_add(call_list, &w4c->continuation, 1); w4c = next; } @@ -641,7 +640,7 @@ static void update_reconnect_parameters(grpc_subchannel *c) { static void on_alarm(void *arg, int iomgr_success) { grpc_subchannel *c = arg; - grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_mu_lock(&c->mu); c->have_alarm = 0; if (c->disconnected) { @@ -656,12 +655,12 @@ static void on_alarm(void *arg, int iomgr_success) { GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting"); GRPC_SUBCHANNEL_UNREF(c, "connecting"); } - grpc_iomgr_call_list_run(call_list); + grpc_call_list_run(call_list); } static void subchannel_connected(void *arg, int iomgr_success) { grpc_subchannel *c = arg; - grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; if (c->connecting_result.transport != NULL) { publish_transport(c, &call_list); } else { @@ -673,7 +672,7 @@ static void subchannel_connected(void *arg, int iomgr_success) { grpc_alarm_init(&c->alarm, c->next_attempt, on_alarm, c, now); gpr_mu_unlock(&c->mu); } - grpc_iomgr_call_list_run(call_list); + grpc_call_list_run(call_list); } static gpr_timespec compute_connect_deadline(grpc_subchannel *c) { @@ -705,7 +704,7 @@ static grpc_connectivity_state compute_connectivity_locked(grpc_subchannel *c) { static void connectivity_state_changed_locked(grpc_subchannel *c, const char *reason, - grpc_iomgr_call_list *call_list) { + grpc_call_list *call_list) { grpc_connectivity_state current = compute_connectivity_locked(c); grpc_connectivity_state_set(&c->state_tracker, current, reason, call_list); } diff --git a/src/core/client_config/subchannel.h b/src/core/client_config/subchannel.h index 7c00ff172d5..189e531d35e 100644 --- a/src/core/client_config/subchannel.h +++ b/src/core/client_config/subchannel.h @@ -76,8 +76,8 @@ void grpc_subchannel_call_unref( void grpc_subchannel_create_call(grpc_subchannel *subchannel, grpc_pollset *pollset, grpc_subchannel_call **target, - grpc_iomgr_closure *notify, - grpc_iomgr_call_list *call_list); + grpc_closure *notify, + grpc_call_list *call_list); /** process a transport level op */ void grpc_subchannel_process_transport_op(grpc_subchannel *subchannel, @@ -91,8 +91,8 @@ grpc_connectivity_state grpc_subchannel_check_connectivity( Updates *state with the new state of the channel */ void grpc_subchannel_notify_on_state_change(grpc_subchannel *channel, grpc_connectivity_state *state, - grpc_iomgr_closure *notify, - grpc_iomgr_call_list *call_list); + grpc_closure *notify, + grpc_call_list *call_list); /** express interest in \a channel's activities through \a pollset. */ void grpc_subchannel_add_interested_party(grpc_subchannel *channel, diff --git a/src/core/httpcli/httpcli.c b/src/core/httpcli/httpcli.c index 75f3f7db4b1..c484f4c7b30 100644 --- a/src/core/httpcli/httpcli.c +++ b/src/core/httpcli/httpcli.c @@ -63,8 +63,8 @@ typedef struct { grpc_iomgr_object iomgr_obj; gpr_slice_buffer incoming; gpr_slice_buffer outgoing; - grpc_iomgr_closure on_read; - grpc_iomgr_closure done_write; + grpc_closure on_read; + grpc_closure done_write; grpc_workqueue *workqueue; } internal_request; @@ -237,8 +237,8 @@ static void internal_request_begin(grpc_httpcli_context *context, request->handshaker ? request->handshaker : &grpc_httpcli_plaintext; req->context = context; req->pollset = pollset; - grpc_iomgr_closure_init(&req->on_read, on_read, req); - grpc_iomgr_closure_init(&req->done_write, done_write, req); + grpc_closure_init(&req->on_read, on_read, req); + grpc_closure_init(&req->done_write, done_write, req); gpr_slice_buffer_init(&req->incoming); gpr_slice_buffer_init(&req->outgoing); grpc_iomgr_register_object(&req->iomgr_obj, name); diff --git a/src/core/iomgr/endpoint.c b/src/core/iomgr/endpoint.c index a7878e31dd4..1955f74b9aa 100644 --- a/src/core/iomgr/endpoint.c +++ b/src/core/iomgr/endpoint.c @@ -35,13 +35,13 @@ grpc_endpoint_op_status grpc_endpoint_read(grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_iomgr_closure *cb) { + grpc_closure *cb) { return ep->vtable->read(ep, slices, cb); } grpc_endpoint_op_status grpc_endpoint_write(grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_iomgr_closure *cb) { + grpc_closure *cb) { return ep->vtable->write(ep, slices, cb); } diff --git a/src/core/iomgr/endpoint.h b/src/core/iomgr/endpoint.h index d14d52d5616..79b7d6a78e3 100644 --- a/src/core/iomgr/endpoint.h +++ b/src/core/iomgr/endpoint.h @@ -54,9 +54,9 @@ typedef enum grpc_endpoint_op_status { struct grpc_endpoint_vtable { grpc_endpoint_op_status (*read)(grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_iomgr_closure *cb); + grpc_closure *cb); grpc_endpoint_op_status (*write)(grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_iomgr_closure *cb); + 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); @@ -70,7 +70,7 @@ struct grpc_endpoint_vtable { Valid slices may be placed into \a slices even on callback success == 0. */ grpc_endpoint_op_status grpc_endpoint_read( grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_iomgr_closure *cb) GRPC_MUST_USE_RESULT; + grpc_closure *cb) GRPC_MUST_USE_RESULT; char *grpc_endpoint_get_peer(grpc_endpoint *ep); @@ -86,7 +86,7 @@ char *grpc_endpoint_get_peer(grpc_endpoint *ep); */ grpc_endpoint_op_status grpc_endpoint_write( grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_iomgr_closure *cb) GRPC_MUST_USE_RESULT; + grpc_closure *cb) GRPC_MUST_USE_RESULT; /* Causes any pending read/write callbacks to run immediately with success==0 */ diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index 5bdce0bfd8a..dfebbcc2e13 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -218,8 +218,7 @@ static int has_watchers(grpc_fd *fd) { fd->inactive_watcher_root.next != &fd->inactive_watcher_root; } -void grpc_fd_orphan(grpc_fd *fd, grpc_iomgr_closure *on_done, - const char *reason) { +void grpc_fd_orphan(grpc_fd *fd, grpc_closure *on_done, const char *reason) { fd->on_done_closure = on_done; shutdown(fd->fd, SHUT_RDWR); gpr_mu_lock(&fd->watcher_mu); @@ -253,7 +252,7 @@ void grpc_fd_ref(grpc_fd *fd) { ref_by(fd, 2); } void grpc_fd_unref(grpc_fd *fd) { unref_by(fd, 2); } #endif -static void process_callback(grpc_iomgr_closure *closure, int success, +static void process_callback(grpc_closure *closure, int success, grpc_workqueue *optional_workqueue) { if (optional_workqueue == NULL) { closure->cb(closure->cb_arg, success); @@ -262,15 +261,15 @@ static void process_callback(grpc_iomgr_closure *closure, int success, } } -static void process_callbacks(grpc_iomgr_closure *callbacks, size_t n, - int success, grpc_workqueue *optional_workqueue) { +static void process_callbacks(grpc_closure *callbacks, size_t n, int success, + grpc_workqueue *optional_workqueue) { size_t i; for (i = 0; i < n; i++) { process_callback(callbacks + i, success, optional_workqueue); } } -static void notify_on(grpc_fd *fd, gpr_atm *st, grpc_iomgr_closure *closure, +static void notify_on(grpc_fd *fd, gpr_atm *st, grpc_closure *closure, int allow_synchronous_callback) { switch (gpr_atm_acq_load(st)) { case NOT_READY: @@ -307,7 +306,7 @@ static void notify_on(grpc_fd *fd, gpr_atm *st, grpc_iomgr_closure *closure, abort(); } -static void set_ready_locked(gpr_atm *st, grpc_iomgr_closure **callbacks, +static void set_ready_locked(gpr_atm *st, grpc_closure **callbacks, size_t *ncallbacks) { gpr_intptr state = gpr_atm_acq_load(st); @@ -327,7 +326,7 @@ static void set_ready_locked(gpr_atm *st, grpc_iomgr_closure **callbacks, default: /* waiting */ GPR_ASSERT(gpr_atm_no_barrier_load(st) != READY && gpr_atm_no_barrier_load(st) != NOT_READY); - callbacks[(*ncallbacks)++] = (grpc_iomgr_closure *)state; + callbacks[(*ncallbacks)++] = (grpc_closure *)state; gpr_atm_rel_store(st, NOT_READY); return; } @@ -338,7 +337,7 @@ static void set_ready(grpc_fd *fd, gpr_atm *st, /* only one set_ready can be active at once (but there may be a racing notify_on) */ int success; - grpc_iomgr_closure *closure; + grpc_closure *closure; size_t ncb = 0; gpr_mu_lock(&fd->set_state_mu); @@ -365,11 +364,11 @@ void grpc_fd_shutdown(grpc_fd *fd) { 0 /* GPR_FALSE */); } -void grpc_fd_notify_on_read(grpc_fd *fd, grpc_iomgr_closure *closure) { +void grpc_fd_notify_on_read(grpc_fd *fd, grpc_closure *closure) { notify_on(fd, &fd->readst, closure, 0); } -void grpc_fd_notify_on_write(grpc_fd *fd, grpc_iomgr_closure *closure) { +void grpc_fd_notify_on_write(grpc_fd *fd, grpc_closure *closure) { notify_on(fd, &fd->writest, closure, 0); } diff --git a/src/core/iomgr/fd_posix.h b/src/core/iomgr/fd_posix.h index e5157ad342b..bb85b6c16e7 100644 --- a/src/core/iomgr/fd_posix.h +++ b/src/core/iomgr/fd_posix.h @@ -96,8 +96,8 @@ struct grpc_fd { struct grpc_fd *freelist_next; - grpc_iomgr_closure *on_done_closure; - grpc_iomgr_closure *shutdown_closures[2]; + grpc_closure *on_done_closure; + grpc_closure *shutdown_closures[2]; grpc_iomgr_object iomgr_object; }; @@ -113,8 +113,7 @@ grpc_fd *grpc_fd_create(int fd, grpc_workqueue *workqueue, const char *name); 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_iomgr_closure *on_done, - const char *reason); +void grpc_fd_orphan(grpc_fd *fd, grpc_closure *on_done, const char *reason); /* Begin polling on an fd. Registers that the given pollset is interested in this fd - so that if read @@ -153,10 +152,10 @@ void grpc_fd_shutdown(grpc_fd *fd); 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_iomgr_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_fd *fd, grpc_iomgr_closure *closure); +void grpc_fd_notify_on_write(grpc_fd *fd, grpc_closure *closure); /* Notification from the poller to an fd that it has become readable or writable. diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index ba8f73fe081..dd760449139 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -151,15 +151,15 @@ void grpc_iomgr_unregister_object(grpc_iomgr_object *obj) { gpr_free(obj->name); } -void grpc_iomgr_closure_init(grpc_iomgr_closure *closure, grpc_iomgr_cb_func cb, - void *cb_arg) { +void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, + void *cb_arg) { closure->cb = cb; closure->cb_arg = cb_arg; closure->next = NULL; } -void grpc_iomgr_call_list_add(grpc_iomgr_call_list *call_list, - grpc_iomgr_closure *closure, int success) { +void grpc_call_list_add(grpc_call_list *call_list, grpc_closure *closure, + int success) { if (!closure) return; closure->next = NULL; closure->success = success; @@ -171,21 +171,20 @@ void grpc_iomgr_call_list_add(grpc_iomgr_call_list *call_list, call_list->tail = closure; } -void grpc_iomgr_call_list_run(grpc_iomgr_call_list call_list) { - grpc_iomgr_closure *c = call_list.head; +void grpc_call_list_run(grpc_call_list call_list) { + grpc_closure *c = call_list.head; while (c) { - grpc_iomgr_closure *next = c->next; + grpc_closure *next = c->next; c->cb(c->cb_arg, c->success); c = next; } } -int grpc_iomgr_call_list_empty(grpc_iomgr_call_list call_list) { +int grpc_call_list_empty(grpc_call_list call_list) { return call_list.head == NULL; } -void grpc_iomgr_call_list_move(grpc_iomgr_call_list *src, - grpc_iomgr_call_list *dst) { +void grpc_call_list_move(grpc_call_list *src, grpc_call_list *dst) { if (dst->head == NULL) { *dst = *src; return; diff --git a/src/core/iomgr/iomgr.h b/src/core/iomgr/iomgr.h index 58c31763d22..56f0195be99 100644 --- a/src/core/iomgr/iomgr.h +++ b/src/core/iomgr/iomgr.h @@ -42,7 +42,7 @@ typedef void (*grpc_iomgr_cb_func)(void *arg, int success); /** A closure over a grpc_iomgr_cb_func. */ -typedef struct grpc_iomgr_closure { +typedef struct grpc_closure { /** Bound callback. */ grpc_iomgr_cb_func cb; @@ -55,27 +55,26 @@ typedef struct grpc_iomgr_closure { int success; /**< Internal. Do not touch */ - struct grpc_iomgr_closure *next; -} grpc_iomgr_closure; + struct grpc_closure *next; +} grpc_closure; -typedef struct grpc_iomgr_call_list { - grpc_iomgr_closure *head; - grpc_iomgr_closure *tail; -} grpc_iomgr_call_list; +typedef struct grpc_call_list { + grpc_closure *head; + grpc_closure *tail; +} grpc_call_list; /** Initializes \a closure with \a cb and \a cb_arg. */ -void grpc_iomgr_closure_init(grpc_iomgr_closure *closure, grpc_iomgr_cb_func cb, - void *cb_arg); +void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, + void *cb_arg); -#define GRPC_IOMGR_CALL_LIST_INIT \ +#define GRPC_CALL_LIST_INIT \ { NULL, NULL } -void grpc_iomgr_call_list_add(grpc_iomgr_call_list *list, - grpc_iomgr_closure *closure, int success); -void grpc_iomgr_call_list_run(grpc_iomgr_call_list list); -void grpc_iomgr_call_list_move(grpc_iomgr_call_list *src, - grpc_iomgr_call_list *dst); -int grpc_iomgr_call_list_empty(grpc_iomgr_call_list list); +void grpc_call_list_add(grpc_call_list *list, grpc_closure *closure, + int success); +void grpc_call_list_run(grpc_call_list list); +void grpc_call_list_move(grpc_call_list *src, grpc_call_list *dst); +int grpc_call_list_empty(grpc_call_list list); /** Initializes the iomgr. */ void grpc_iomgr_init(void); diff --git a/src/core/iomgr/pollset_multipoller_with_epoll.c b/src/core/iomgr/pollset_multipoller_with_epoll.c index 253f3190f13..5ca957b8e19 100644 --- a/src/core/iomgr/pollset_multipoller_with_epoll.c +++ b/src/core/iomgr/pollset_multipoller_with_epoll.c @@ -53,7 +53,7 @@ typedef struct wakeup_fd_hdl { typedef struct { grpc_pollset *pollset; grpc_fd *fd; - grpc_iomgr_closure closure; + grpc_closure closure; } delayed_add; typedef struct { @@ -125,7 +125,7 @@ static void multipoll_with_epoll_pollset_add_fd(grpc_pollset *pollset, da->pollset = pollset; da->fd = fd; GRPC_FD_REF(fd, "delayed_add"); - grpc_iomgr_closure_init(&da->closure, perform_delayed_add, da); + grpc_closure_init(&da->closure, perform_delayed_add, da); pollset->in_flight_cbs++; grpc_pollset_add_unlock_job(pollset, &da->closure); } diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 107ffb0b5e4..0fe3f80d448 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -175,30 +175,28 @@ static void finish_shutdown(grpc_pollset *pollset) { pollset->shutdown_done_cb(pollset->shutdown_done_arg); } -static void run_jobs(grpc_pollset *pollset, grpc_iomgr_closure **root) { - grpc_iomgr_closure *exec = *root; +static void run_jobs(grpc_pollset *pollset, grpc_closure **root) { + grpc_closure *exec = *root; *root = NULL; gpr_mu_unlock(&pollset->mu); while (exec != NULL) { - grpc_iomgr_closure *next = exec->next; + grpc_closure *next = exec->next; exec->cb(exec->cb_arg, 1); exec = next; } gpr_mu_lock(&pollset->mu); } -static void add_job(grpc_iomgr_closure **root, grpc_iomgr_closure *closure) { +static void add_job(grpc_closure **root, grpc_closure *closure) { closure->next = *root; *root = closure; } -void grpc_pollset_add_idle_job(grpc_pollset *pollset, - grpc_iomgr_closure *closure) { +void grpc_pollset_add_idle_job(grpc_pollset *pollset, grpc_closure *closure) { add_job(&pollset->idle_jobs, closure); } -void grpc_pollset_add_unlock_job(grpc_pollset *pollset, - grpc_iomgr_closure *closure) { +void grpc_pollset_add_unlock_job(grpc_pollset *pollset, grpc_closure *closure) { add_job(&pollset->unlock_jobs, closure); } @@ -316,7 +314,7 @@ typedef struct grpc_unary_promote_args { const grpc_pollset_vtable *original_vtable; grpc_pollset *pollset; grpc_fd *fd; - grpc_iomgr_closure promotion_closure; + grpc_closure promotion_closure; } grpc_unary_promote_args; static void basic_do_promote(void *args, int success) { diff --git a/src/core/iomgr/pollset_posix.h b/src/core/iomgr/pollset_posix.h index 3f89095d40e..4f09f870f74 100644 --- a/src/core/iomgr/pollset_posix.h +++ b/src/core/iomgr/pollset_posix.h @@ -67,8 +67,8 @@ typedef struct grpc_pollset { int kicked_without_pollers; void (*shutdown_done_cb)(void *arg); void *shutdown_done_arg; - grpc_iomgr_closure *unlock_jobs; - grpc_iomgr_closure *idle_jobs; + grpc_closure *unlock_jobs; + grpc_closure *idle_jobs; union { int fd; void *ptr; @@ -128,10 +128,8 @@ typedef int (*grpc_poll_function_type)(struct pollfd *, nfds_t, int); extern grpc_poll_function_type grpc_poll_function; /** schedule a closure to be run next time there are no active workers */ -void grpc_pollset_add_idle_job(grpc_pollset *pollset, - grpc_iomgr_closure *closure); +void grpc_pollset_add_idle_job(grpc_pollset *pollset, grpc_closure *closure); /** schedule a closure to be run next time the pollset is unlocked */ -void grpc_pollset_add_unlock_job(grpc_pollset *pollset, - grpc_iomgr_closure *closure); +void grpc_pollset_add_unlock_job(grpc_pollset *pollset, grpc_closure *closure); #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_POSIX_H */ diff --git a/src/core/iomgr/socket_windows.h b/src/core/iomgr/socket_windows.h index 498921e0fdb..45bc6572257 100644 --- a/src/core/iomgr/socket_windows.h +++ b/src/core/iomgr/socket_windows.h @@ -91,7 +91,7 @@ typedef struct grpc_winsocket { This prevents that. */ int added_to_iocp; - grpc_iomgr_closure shutdown_closure; + grpc_closure shutdown_closure; /* A label for iomgr to track outstanding objects */ grpc_iomgr_object iomgr_object; diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c index 0df984c3e67..1ea21550607 100644 --- a/src/core/iomgr/tcp_client_posix.c +++ b/src/core/iomgr/tcp_client_posix.c @@ -64,7 +64,7 @@ typedef struct { gpr_timespec deadline; grpc_alarm alarm; int refs; - grpc_iomgr_closure write_closure; + grpc_closure write_closure; grpc_pollset_set *interested_parties; char *addr_str; } async_connect; diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c index c539cf2d348..374d2f3a408 100644 --- a/src/core/iomgr/tcp_posix.c +++ b/src/core/iomgr/tcp_posix.c @@ -85,11 +85,11 @@ typedef struct { /** byte within outgoing_buffer->slices[outgoing_slice_idx] to write next */ size_t outgoing_byte_idx; - grpc_iomgr_closure *read_cb; - grpc_iomgr_closure *write_cb; + grpc_closure *read_cb; + grpc_closure *write_cb; - grpc_iomgr_closure read_closure; - grpc_iomgr_closure write_closure; + grpc_closure read_closure; + grpc_closure write_closure; char *peer_string; } grpc_tcp; @@ -145,7 +145,7 @@ static void tcp_destroy(grpc_endpoint *ep) { } static void call_read_cb(grpc_tcp *tcp, int success) { - grpc_iomgr_closure *cb = tcp->read_cb; + grpc_closure *cb = tcp->read_cb; if (grpc_tcp_trace) { size_t i; @@ -250,7 +250,7 @@ static void tcp_handle_read(void *arg /* grpc_tcp */, int success) { static grpc_endpoint_op_status tcp_read(grpc_endpoint *ep, gpr_slice_buffer *incoming_buffer, - grpc_iomgr_closure *cb) { + grpc_closure *cb) { grpc_tcp *tcp = (grpc_tcp *)ep; GPR_ASSERT(tcp->read_cb == NULL); tcp->read_cb = cb; @@ -350,7 +350,7 @@ static grpc_endpoint_op_status tcp_flush(grpc_tcp *tcp) { static void tcp_handle_write(void *arg /* grpc_tcp */, int success) { grpc_tcp *tcp = (grpc_tcp *)arg; grpc_endpoint_op_status status; - grpc_iomgr_closure *cb; + grpc_closure *cb; if (!success) { cb = tcp->write_cb; @@ -375,7 +375,7 @@ static void tcp_handle_write(void *arg /* grpc_tcp */, int success) { static grpc_endpoint_op_status tcp_write(grpc_endpoint *ep, gpr_slice_buffer *buf, - grpc_iomgr_closure *cb) { + grpc_closure *cb) { grpc_tcp *tcp = (grpc_tcp *)ep; grpc_endpoint_op_status status; diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c index 0b79678e9df..213b2e1113d 100644 --- a/src/core/iomgr/tcp_server_posix.c +++ b/src/core/iomgr/tcp_server_posix.c @@ -84,8 +84,8 @@ typedef struct { struct sockaddr_un un; } addr; size_t addr_len; - grpc_iomgr_closure read_closure; - grpc_iomgr_closure destroyed_closure; + grpc_closure read_closure; + grpc_closure destroyed_closure; } server_port; static void unlink_if_unix_domain_socket(const struct sockaddr_un *un) { diff --git a/src/core/iomgr/tcp_windows.c b/src/core/iomgr/tcp_windows.c index fe3673c6071..e361d22dc39 100644 --- a/src/core/iomgr/tcp_windows.c +++ b/src/core/iomgr/tcp_windows.c @@ -82,8 +82,8 @@ typedef struct grpc_tcp { /* Refcounting how many operations are in progress. */ gpr_refcount refcount; - grpc_iomgr_closure *read_cb; - grpc_iomgr_closure *write_cb; + grpc_closure *read_cb; + grpc_closure *write_cb; gpr_slice read_slice; gpr_slice_buffer *write_slices; gpr_slice_buffer *read_slices; @@ -169,7 +169,7 @@ static int on_read(grpc_tcp *tcp, int success) { static void on_read_cb(void *tcpp, int from_iocp) { grpc_tcp *tcp = tcpp; - grpc_iomgr_closure *cb = tcp->read_cb; + grpc_closure *cb = tcp->read_cb; int success = on_read(tcp, from_iocp); tcp->read_cb = NULL; TCP_UNREF(tcp, "read"); @@ -180,7 +180,7 @@ static void on_read_cb(void *tcpp, int from_iocp) { static grpc_endpoint_op_status win_read(grpc_endpoint *ep, gpr_slice_buffer *read_slices, - grpc_iomgr_closure *cb) { + grpc_closure *cb) { grpc_tcp *tcp = (grpc_tcp *)ep; grpc_winsocket *handle = tcp->socket; grpc_winsocket_callback_info *info = &handle->read_info; @@ -241,7 +241,7 @@ static void on_write(void *tcpp, int success) { grpc_tcp *tcp = (grpc_tcp *)tcpp; grpc_winsocket *handle = tcp->socket; grpc_winsocket_callback_info *info = &handle->write_info; - grpc_iomgr_closure *cb; + grpc_closure *cb; int do_abort = 0; gpr_mu_lock(&tcp->mu); @@ -269,7 +269,7 @@ static void on_write(void *tcpp, int success) { /* Initiates a write. */ static grpc_endpoint_op_status win_write(grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_iomgr_closure *cb) { + grpc_closure *cb) { grpc_tcp *tcp = (grpc_tcp *)ep; grpc_winsocket *socket = tcp->socket; grpc_winsocket_callback_info *info = &socket->write_info; diff --git a/src/core/iomgr/udp_server.c b/src/core/iomgr/udp_server.c index 30957f8dee7..1a1d8120500 100644 --- a/src/core/iomgr/udp_server.c +++ b/src/core/iomgr/udp_server.c @@ -79,8 +79,8 @@ typedef struct { struct sockaddr_un un; } addr; size_t addr_len; - grpc_iomgr_closure read_closure; - grpc_iomgr_closure destroyed_closure; + grpc_closure read_closure; + grpc_closure destroyed_closure; grpc_udp_server_read_cb read_cb; } server_port; diff --git a/src/core/iomgr/workqueue.h b/src/core/iomgr/workqueue.h index 124f294a230..6f09399b558 100644 --- a/src/core/iomgr/workqueue.h +++ b/src/core/iomgr/workqueue.h @@ -52,7 +52,7 @@ typedef struct grpc_workqueue grpc_workqueue; /** Create a work queue */ grpc_workqueue *grpc_workqueue_create(void); -void grpc_workqueue_flush(grpc_workqueue *workqueue, int asynchronously); +void grpc_workqueue_flush(grpc_workqueue *workqueue); #define GRPC_WORKQUEUE_REFCOUNT_DEBUG #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG @@ -76,7 +76,7 @@ void grpc_workqueue_add_to_pollset(grpc_workqueue *workqueue, grpc_pollset *pollset); /** Add a work item to a workqueue */ -void grpc_workqueue_push(grpc_workqueue *workqueue, grpc_iomgr_closure *closure, +void grpc_workqueue_push(grpc_workqueue *workqueue, grpc_closure *closure, int success); #endif diff --git a/src/core/iomgr/workqueue_posix.c b/src/core/iomgr/workqueue_posix.c index ead8c50d8ea..85b541f4d21 100644 --- a/src/core/iomgr/workqueue_posix.c +++ b/src/core/iomgr/workqueue_posix.c @@ -41,7 +41,7 @@ #include #include -#include +#include #include "src/core/iomgr/fd_posix.h" @@ -52,71 +52,19 @@ grpc_workqueue *grpc_workqueue_create(void) { grpc_workqueue *workqueue = gpr_malloc(sizeof(grpc_workqueue)); gpr_ref_init(&workqueue->refs, 1); gpr_mu_init(&workqueue->mu); - workqueue->head.next = NULL; - workqueue->tail = &workqueue->head; + workqueue->call_list.head = workqueue->call_list.tail = NULL; grpc_wakeup_fd_init(&workqueue->wakeup_fd); sprintf(name, "workqueue:%p", (void *)workqueue); workqueue->wakeup_read_fd = NULL; /* inspected during grpc_fd_create below */ workqueue->wakeup_read_fd = grpc_fd_create( GRPC_WAKEUP_FD_GET_READ_FD(&workqueue->wakeup_fd), workqueue, name); - grpc_iomgr_closure_init(&workqueue->read_closure, on_readable, workqueue); + grpc_closure_init(&workqueue->read_closure, on_readable, workqueue); grpc_fd_notify_on_read(workqueue->wakeup_read_fd, &workqueue->read_closure); return workqueue; } -static void shutdown_thread(void *arg) { - grpc_iomgr_closure *todo = arg; - - while (todo) { - grpc_iomgr_closure *next = todo->next; - todo->cb(todo->cb_arg, todo->success); - todo = next; - } -} - -#ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG -static size_t count_waiting(grpc_workqueue *workqueue) { - size_t i = 0; - grpc_iomgr_closure *c; - for (c = workqueue->head.next; c; c = c->next) { - i++; - } - return i; -} -#endif - -void grpc_workqueue_flush(grpc_workqueue *workqueue, int asynchronously) { - grpc_iomgr_closure *todo; - gpr_thd_id thd; - - gpr_mu_lock(&workqueue->mu); -#ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG - if (workqueue->head.next) { - gpr_log(GPR_DEBUG, "WORKQUEUE:%p flush %d objects %s", workqueue, - count_waiting(workqueue), - asynchronously ? "asynchronously" : "synchronously"); - } -#endif - todo = workqueue->head.next; - workqueue->head.next = NULL; - workqueue->tail = &workqueue->head; - gpr_mu_unlock(&workqueue->mu); - - if (todo != NULL) { - if (asynchronously) { - gpr_thd_new(&thd, shutdown_thread, todo, NULL); - } else { - while (todo) { - grpc_iomgr_closure *next = todo->next; - todo->cb(todo->cb_arg, todo->success); - todo = next; - } - } - } -} - static void workqueue_destroy(grpc_workqueue *workqueue) { - GPR_ASSERT(workqueue->tail == &workqueue->head); + GPR_ASSERT(grpc_call_list_empty(workqueue->call_list)); grpc_fd_shutdown(workqueue->wakeup_read_fd); } @@ -151,9 +99,16 @@ void grpc_workqueue_add_to_pollset(grpc_workqueue *workqueue, grpc_pollset_add_fd(pollset, workqueue->wakeup_read_fd); } +void grpc_workqueue_flush(grpc_workqueue *workqueue) { + grpc_call_list todo = GRPC_CALL_LIST_INIT; + gpr_mu_lock(&workqueue->mu); + GPR_SWAP(grpc_call_list, todo, workqueue->call_list); + gpr_mu_unlock(&workqueue->mu); + grpc_call_list_run(todo); +} + static void on_readable(void *arg, int success) { grpc_workqueue *workqueue = arg; - grpc_iomgr_closure *todo; if (!success) { gpr_mu_destroy(&workqueue->mu); @@ -162,42 +117,26 @@ static void on_readable(void *arg, int success) { grpc_wakeup_fd_destroy(&workqueue->wakeup_fd); grpc_fd_orphan(workqueue->wakeup_read_fd, NULL, "destroy"); gpr_free(workqueue); - return; } else { + grpc_call_list todo = GRPC_CALL_LIST_INIT; gpr_mu_lock(&workqueue->mu); -#ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG - gpr_log(GPR_DEBUG, "WORKQUEUE:%p %d objects", workqueue, - count_waiting(workqueue)); -#endif - todo = workqueue->head.next; - workqueue->head.next = NULL; - workqueue->tail = &workqueue->head; + GPR_SWAP(grpc_call_list, todo, workqueue->call_list); grpc_wakeup_fd_consume_wakeup(&workqueue->wakeup_fd); gpr_mu_unlock(&workqueue->mu); grpc_fd_notify_on_read(workqueue->wakeup_read_fd, &workqueue->read_closure); - - while (todo) { - grpc_iomgr_closure *next = todo->next; - todo->cb(todo->cb_arg, todo->success); - todo = next; - } + grpc_call_list_run(todo); } } -void grpc_workqueue_push(grpc_workqueue *workqueue, grpc_iomgr_closure *closure, +void grpc_workqueue_push(grpc_workqueue *workqueue, grpc_closure *closure, int success) { closure->success = success; closure->next = NULL; gpr_mu_lock(&workqueue->mu); - if (workqueue->tail == &workqueue->head) { + if (grpc_call_list_empty(workqueue->call_list)) { grpc_wakeup_fd_wakeup(&workqueue->wakeup_fd); } - workqueue->tail->next = closure; - workqueue->tail = closure; -#ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG - gpr_log(GPR_DEBUG, "WORKQUEUE:%p %d objects", workqueue, - count_waiting(workqueue)); -#endif + grpc_call_list_add(&workqueue->call_list, closure, success); gpr_mu_unlock(&workqueue->mu); } diff --git a/src/core/iomgr/workqueue_posix.h b/src/core/iomgr/workqueue_posix.h index 1b3a0e281b3..22c48c4926c 100644 --- a/src/core/iomgr/workqueue_posix.h +++ b/src/core/iomgr/workqueue_posix.h @@ -40,13 +40,12 @@ struct grpc_workqueue { gpr_refcount refs; gpr_mu mu; - grpc_iomgr_closure head; - grpc_iomgr_closure *tail; + grpc_call_list call_list; grpc_wakeup_fd wakeup_fd; struct grpc_fd *wakeup_read_fd; - grpc_iomgr_closure read_closure; + grpc_closure read_closure; }; #endif /* GRPC_INTERNAL_CORE_IOMGR_WORKQUEUE_POSIX_H */ diff --git a/src/core/security/secure_endpoint.c b/src/core/security/secure_endpoint.c index b696e384fca..dcafc0fc0fa 100644 --- a/src/core/security/secure_endpoint.c +++ b/src/core/security/secure_endpoint.c @@ -49,9 +49,9 @@ typedef struct { struct tsi_frame_protector *protector; gpr_mu protector_mu; /* saved upper level callbacks and user_data. */ - grpc_iomgr_closure *read_cb; - grpc_iomgr_closure *write_cb; - grpc_iomgr_closure on_read; + grpc_closure *read_cb; + grpc_closure *write_cb; + grpc_closure on_read; gpr_slice_buffer *read_buffer; gpr_slice_buffer source_buffer; /* saved handshaker leftover data to unprotect. */ @@ -214,7 +214,7 @@ static void on_read_cb(void *user_data, int success) { static grpc_endpoint_op_status endpoint_read(grpc_endpoint *secure_ep, gpr_slice_buffer *slices, - grpc_iomgr_closure *cb) { + grpc_closure *cb) { secure_endpoint *ep = (secure_endpoint *)secure_ep; int immediate_read_success = -1; ep->read_cb = cb; @@ -257,7 +257,7 @@ static void flush_write_staging_buffer(secure_endpoint *ep, gpr_uint8 **cur, static grpc_endpoint_op_status endpoint_write(grpc_endpoint *secure_ep, gpr_slice_buffer *slices, - grpc_iomgr_closure *cb) { + grpc_closure *cb) { unsigned i; tsi_result result = TSI_OK; secure_endpoint *ep = (secure_endpoint *)secure_ep; @@ -386,7 +386,7 @@ grpc_endpoint *grpc_secure_endpoint_create( gpr_slice_buffer_init(&ep->output_buffer); gpr_slice_buffer_init(&ep->source_buffer); ep->read_buffer = NULL; - grpc_iomgr_closure_init(&ep->on_read, on_read_cb, ep); + grpc_closure_init(&ep->on_read, on_read_cb, ep); gpr_mu_init(&ep->protector_mu); gpr_ref_init(&ep->ref, 1); return &ep->base; diff --git a/src/core/security/secure_transport_setup.c b/src/core/security/secure_transport_setup.c index bf0079577e4..181aa74ba9f 100644 --- a/src/core/security/secure_transport_setup.c +++ b/src/core/security/secure_transport_setup.c @@ -54,8 +54,8 @@ typedef struct { gpr_slice_buffer outgoing; grpc_secure_transport_setup_done_cb cb; void *user_data; - grpc_iomgr_closure on_handshake_data_sent_to_peer; - grpc_iomgr_closure on_handshake_data_received_from_peer; + grpc_closure on_handshake_data_sent_to_peer; + grpc_closure on_handshake_data_received_from_peer; } grpc_secure_transport_setup; static void on_handshake_data_received_from_peer(void *setup, int success); @@ -301,10 +301,10 @@ void grpc_setup_secure_transport(grpc_security_connector *connector, s->wrapped_endpoint = nonsecure_endpoint; s->user_data = user_data; s->cb = cb; - grpc_iomgr_closure_init(&s->on_handshake_data_sent_to_peer, - on_handshake_data_sent_to_peer, s); - grpc_iomgr_closure_init(&s->on_handshake_data_received_from_peer, - on_handshake_data_received_from_peer, s); + grpc_closure_init(&s->on_handshake_data_sent_to_peer, + on_handshake_data_sent_to_peer, s); + grpc_closure_init(&s->on_handshake_data_received_from_peer, + on_handshake_data_received_from_peer, s); gpr_slice_buffer_init(&s->left_overs); gpr_slice_buffer_init(&s->outgoing); gpr_slice_buffer_init(&s->incoming); diff --git a/src/core/security/server_auth_filter.c b/src/core/security/server_auth_filter.c index d134201e87c..84686974727 100644 --- a/src/core/security/server_auth_filter.c +++ b/src/core/security/server_auth_filter.c @@ -44,11 +44,11 @@ typedef struct call_data { gpr_uint8 got_client_metadata; grpc_stream_op_buffer *recv_ops; /* Closure to call when finished with the auth_on_recv hook. */ - grpc_iomgr_closure *on_done_recv; + grpc_closure *on_done_recv; /* Receive closures are chained: we inject this closure as the on_done_recv up-call on transport_op, and remember to call our on_done_recv member after handling it. */ - grpc_iomgr_closure auth_on_recv; + grpc_closure auth_on_recv; grpc_transport_stream_op transport_op; grpc_metadata_array md; const grpc_metadata *consumed_md; @@ -202,7 +202,7 @@ static void init_call_elem(grpc_call_element *elem, /* initialize members */ memset(calld, 0, sizeof(*calld)); - grpc_iomgr_closure_init(&calld->auth_on_recv, auth_on_recv, elem); + grpc_closure_init(&calld->auth_on_recv, auth_on_recv, elem); GPR_ASSERT(initial_op && initial_op->context != NULL && initial_op->context[GRPC_CONTEXT_SECURITY].value == NULL); diff --git a/src/core/surface/call.c b/src/core/surface/call.c index 8f9e97a3967..b5a4155e024 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -256,10 +256,10 @@ struct grpc_call { gpr_slice_buffer incoming_message; gpr_uint32 incoming_message_length; gpr_uint32 incoming_message_flags; - grpc_iomgr_closure destroy_closure; - grpc_iomgr_closure on_done_recv; - grpc_iomgr_closure on_done_send; - grpc_iomgr_closure on_done_bind; + grpc_closure destroy_closure; + grpc_closure on_done_recv; + grpc_closure on_done_send; + grpc_closure on_done_bind; /** completion events - for completion queue use */ grpc_cq_completion completions[MAX_CONCURRENT_COMPLETIONS]; @@ -333,9 +333,9 @@ grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, grpc_sopb_init(&call->send_ops); grpc_sopb_init(&call->recv_ops); gpr_slice_buffer_init(&call->incoming_message); - grpc_iomgr_closure_init(&call->on_done_recv, call_on_done_recv, call); - grpc_iomgr_closure_init(&call->on_done_send, call_on_done_send, call); - grpc_iomgr_closure_init(&call->on_done_bind, finished_loose_op, call); + grpc_closure_init(&call->on_done_recv, call_on_done_recv, call); + grpc_closure_init(&call->on_done_send, call_on_done_send, call); + grpc_closure_init(&call->on_done_bind, finished_loose_op, call); /* dropped in destroy and when READ_STATE_STREAM_CLOSED received */ gpr_ref_init(&call->internal_refcount, 2); /* server hack: start reads immediately so we can get initial metadata. @@ -1353,7 +1353,7 @@ static void finished_loose_op(void *call, int success_ignored) { typedef struct { grpc_call *call; - grpc_iomgr_closure closure; + grpc_closure closure; } finished_loose_op_allocated_args; static void finished_loose_op_allocated(void *alloc, int success) { @@ -1373,8 +1373,7 @@ static void execute_op(grpc_call *call, grpc_transport_stream_op *op) { } else { finished_loose_op_allocated_args *args = gpr_malloc(sizeof(*args)); args->call = call; - grpc_iomgr_closure_init(&args->closure, finished_loose_op_allocated, - args); + grpc_closure_init(&args->closure, finished_loose_op_allocated, args); op->on_consumed = &args->closure; } } diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index ef47a28fda2..4d0cf1ed8bf 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -45,7 +45,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_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_connectivity_state state; if (client_channel_elem->filter != &grpc_client_channel_filter) { gpr_log(GPR_ERROR, @@ -56,7 +56,7 @@ grpc_connectivity_state grpc_channel_check_connectivity_state( } state = grpc_client_channel_check_connectivity_state( client_channel_elem, try_to_connect, &call_list); - grpc_iomgr_call_list_run(call_list); + grpc_call_list_run(call_list); return state; } @@ -71,7 +71,7 @@ typedef struct { gpr_mu mu; callback_phase phase; int success; - grpc_iomgr_closure on_complete; + grpc_closure on_complete; grpc_alarm alarm; grpc_connectivity_state state; grpc_completion_queue *cq; @@ -158,13 +158,13 @@ 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_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; state_watcher *w = gpr_malloc(sizeof(*w)); grpc_cq_begin_op(cq); gpr_mu_init(&w->mu); - grpc_iomgr_closure_init(&w->on_complete, watch_complete, w); + grpc_closure_init(&w->on_complete, watch_complete, w); w->phase = WAITING; w->state = last_observed_state; w->success = 0; @@ -181,7 +181,7 @@ void grpc_channel_watch_connectivity_state( "grpc_channel_watch_connectivity_state called on something that is " "not a client channel, but '%s'", client_channel_elem->filter->name); - grpc_iomgr_call_list_add(&call_list, &w->on_complete, 1); + grpc_call_list_add(&call_list, &w->on_complete, 1); } else { GRPC_CHANNEL_INTERNAL_REF(channel, "watch_connectivity"); grpc_client_channel_add_interested_party(client_channel_elem, @@ -190,5 +190,5 @@ void grpc_channel_watch_connectivity_state( &w->on_complete, &call_list); } - grpc_iomgr_call_list_run(call_list); + grpc_call_list_run(call_list); } diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index 908c07b752e..f6f42b3d7ab 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -52,7 +52,7 @@ typedef struct { grpc_connector base; gpr_refcount refs; - grpc_iomgr_closure *notify; + grpc_closure *notify; grpc_connect_in_args args; grpc_connect_out_args *result; } connector; @@ -71,7 +71,7 @@ static void connector_unref(grpc_connector *con) { static void connected(void *arg, grpc_endpoint *tcp) { connector *c = arg; - grpc_iomgr_closure *notify; + grpc_closure *notify; if (tcp != NULL) { c->result->transport = grpc_create_chttp2_transport( c->args.channel_args, tcp, c->args.metadata_context, c->args.workqueue, @@ -94,7 +94,7 @@ static void connector_shutdown(grpc_connector *con) {} static void connector_connect(grpc_connector *con, const grpc_connect_in_args *args, grpc_connect_out_args *result, - grpc_iomgr_closure *notify) { + grpc_closure *notify) { connector *c = (connector *)con; GPR_ASSERT(c->notify == NULL); GPR_ASSERT(notify->cb); diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 690612d1647..d325b3f77dd 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -58,7 +58,7 @@ typedef struct { grpc_channel_security_connector *security_connector; - grpc_iomgr_closure *notify; + grpc_closure *notify; grpc_connect_in_args args; grpc_connect_out_args *result; @@ -83,7 +83,7 @@ static void on_secure_transport_setup_done(void *arg, grpc_endpoint *wrapped_endpoint, grpc_endpoint *secure_endpoint) { connector *c = arg; - grpc_iomgr_closure *notify; + grpc_closure *notify; gpr_mu_lock(&c->mu); if (c->connecting_endpoint == NULL) { memset(c->result, 0, sizeof(*c->result)); @@ -114,7 +114,7 @@ static void on_secure_transport_setup_done(void *arg, static void connected(void *arg, grpc_endpoint *tcp) { connector *c = arg; - grpc_iomgr_closure *notify; + grpc_closure *notify; if (tcp != NULL) { gpr_mu_lock(&c->mu); GPR_ASSERT(c->connecting_endpoint == NULL); @@ -145,7 +145,7 @@ static void connector_shutdown(grpc_connector *con) { static void connector_connect(grpc_connector *con, const grpc_connect_in_args *args, grpc_connect_out_args *result, - grpc_iomgr_closure *notify) { + grpc_closure *notify) { connector *c = (connector *)con; GPR_ASSERT(c->notify == NULL); GPR_ASSERT(notify->cb); diff --git a/src/core/surface/server.c b/src/core/surface/server.c index efddb9ee479..75600027ed7 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -113,8 +113,8 @@ struct channel_data { channel_registered_method *registered_methods; gpr_uint32 registered_method_slots; gpr_uint32 registered_method_max_probes; - grpc_iomgr_closure finish_destroy_channel_closure; - grpc_iomgr_closure channel_connectivity_changed; + grpc_closure finish_destroy_channel_closure; + grpc_closure channel_connectivity_changed; }; typedef struct shutdown_tag { @@ -153,10 +153,10 @@ struct call_data { grpc_stream_op_buffer *recv_ops; grpc_stream_state *recv_state; - grpc_iomgr_closure *on_done_recv; + grpc_closure *on_done_recv; - grpc_iomgr_closure server_on_recv; - grpc_iomgr_closure kill_zombie_closure; + grpc_closure server_on_recv; + grpc_closure kill_zombie_closure; call_data *pending_next; }; @@ -254,7 +254,7 @@ static void channel_broadcaster_init(grpc_server *s, channel_broadcaster *cb) { } struct shutdown_cleanup_args { - grpc_iomgr_closure closure; + grpc_closure closure; gpr_slice slice; }; @@ -277,7 +277,7 @@ static void send_shutdown(grpc_channel *channel, int send_goaway, op.goaway_message = &sc->slice; op.goaway_status = GRPC_STATUS_OK; op.disconnect = send_disconnect; - grpc_iomgr_closure_init(&sc->closure, shutdown_cleanup, sc); + grpc_closure_init(&sc->closure, shutdown_cleanup, sc); op.on_consumed = &sc->closure; elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); @@ -323,7 +323,7 @@ static void request_matcher_zombify_all_pending_calls( gpr_mu_lock(&calld->mu_state); calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); - grpc_iomgr_closure_init( + grpc_closure_init( &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0)); grpc_workqueue_push(workqueue, &calld->kill_zombie_closure, 1); @@ -420,7 +420,7 @@ static void finish_start_new_rpc(grpc_server *server, grpc_call_element *elem, gpr_mu_lock(&calld->mu_state); calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); - grpc_iomgr_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); + grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); grpc_workqueue_push(server->workqueue, &calld->kill_zombie_closure, 1); return; } @@ -603,7 +603,7 @@ static void server_on_recv(void *ptr, int success) { if (calld->state == NOT_STARTED) { calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); - grpc_iomgr_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); + grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); grpc_workqueue_push(chand->server->workqueue, &calld->kill_zombie_closure, 1); } else { @@ -615,7 +615,7 @@ static void server_on_recv(void *ptr, int success) { if (calld->state == NOT_STARTED) { calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); - grpc_iomgr_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); + grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); grpc_workqueue_push(chand->server->workqueue, &calld->kill_zombie_closure, 1); } else if (calld->state == PENDING) { @@ -689,7 +689,7 @@ static void init_call_elem(grpc_call_element *elem, calld->call = grpc_call_from_top_element(elem); gpr_mu_init(&calld->mu_state); - grpc_iomgr_closure_init(&calld->server_on_recv, server_on_recv, elem); + grpc_closure_init(&calld->server_on_recv, server_on_recv, elem); server_ref(chand->server); @@ -729,8 +729,8 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, chand->next = chand->prev = chand; chand->registered_methods = NULL; chand->connectivity_state = GRPC_CHANNEL_IDLE; - grpc_iomgr_closure_init(&chand->channel_connectivity_changed, - channel_connectivity_changed, chand); + grpc_closure_init(&chand->channel_connectivity_changed, + channel_connectivity_changed, chand); } static void destroy_channel_elem(grpc_channel_element *elem) { @@ -1077,7 +1077,7 @@ void grpc_server_destroy(grpc_server *server) { gpr_mu_unlock(&server->mu_global); - grpc_workqueue_flush(server->workqueue, 0); + grpc_workqueue_flush(server->workqueue); server_unref(server); } @@ -1132,7 +1132,7 @@ static grpc_call_error queue_call_request(grpc_server *server, gpr_mu_lock(&calld->mu_state); if (calld->state == ZOMBIED) { gpr_mu_unlock(&calld->mu_state); - grpc_iomgr_closure_init( + grpc_closure_init( &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0)); grpc_workqueue_push(server->workqueue, &calld->kill_zombie_closure, 1); diff --git a/src/core/transport/chttp2/internal.h b/src/core/transport/chttp2/internal.h index 9be1f2f7cf2..386f2dd3156 100644 --- a/src/core/transport/chttp2/internal.h +++ b/src/core/transport/chttp2/internal.h @@ -155,7 +155,7 @@ typedef enum { /* Outstanding ping request data */ typedef struct grpc_chttp2_outstanding_ping { gpr_uint8 id[8]; - grpc_iomgr_closure *on_recv; + grpc_closure *on_recv; struct grpc_chttp2_outstanding_ping *next; struct grpc_chttp2_outstanding_ping *prev; } grpc_chttp2_outstanding_ping; @@ -164,7 +164,7 @@ typedef struct { /** data to write next write */ gpr_slice_buffer qbuf; /** queued callbacks */ - grpc_iomgr_call_list run_at_unlock; + grpc_call_list run_at_unlock; /** window available for us to send to peer */ gpr_int64 outgoing_window; @@ -214,7 +214,7 @@ typedef struct { /** is this a client? */ gpr_uint8 is_client; /** callback for when writing is done */ - grpc_iomgr_closure done_cb; + grpc_closure done_cb; } grpc_chttp2_transport_writing; struct grpc_chttp2_transport_parsing { @@ -332,9 +332,9 @@ struct grpc_chttp2_transport { grpc_chttp2_stream_map new_stream_map; /** closure to execute writing */ - grpc_iomgr_closure writing_action; + grpc_closure writing_action; /** closure to finish reading from the endpoint */ - grpc_iomgr_closure recv_data; + grpc_closure recv_data; /** incoming read bytes */ gpr_slice_buffer read_buffer; @@ -359,8 +359,8 @@ typedef struct { /** HTTP2 stream id for this stream, or zero if one has not been assigned */ gpr_uint32 id; - grpc_iomgr_closure *send_done_closure; - grpc_iomgr_closure *recv_done_closure; + grpc_closure *send_done_closure; + grpc_closure *recv_done_closure; /** window available for us to send to peer */ gpr_int64 outgoing_window; diff --git a/src/core/transport/chttp2/writing.c b/src/core/transport/chttp2/writing.c index 1da3f85bdef..db6715b43a5 100644 --- a/src/core/transport/chttp2/writing.c +++ b/src/core/transport/chttp2/writing.c @@ -238,8 +238,8 @@ void grpc_chttp2_cleanup_writing( stream_global->outgoing_sopb->nops == 0) { GPR_ASSERT(stream_global->write_state != GRPC_WRITE_STATE_QUEUED_CLOSE); stream_global->outgoing_sopb = NULL; - grpc_iomgr_call_list_add(&transport_global->run_at_unlock, - stream_global->send_done_closure, 1); + grpc_call_list_add(&transport_global->run_at_unlock, + stream_global->send_done_closure, 1); } } stream_global->writing_now = 0; diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index 50d5a3e8a82..bc056ac0b88 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -250,15 +250,15 @@ static void init_transport(grpc_chttp2_transport *t, gpr_slice_buffer_init(&t->writing.outbuf); grpc_chttp2_hpack_compressor_init(&t->writing.hpack_compressor, mdctx); - grpc_iomgr_closure_init(&t->writing_action, writing_action, t); + grpc_closure_init(&t->writing_action, writing_action, t); gpr_slice_buffer_init(&t->parsing.qbuf); grpc_chttp2_goaway_parser_init(&t->parsing.goaway_parser); grpc_chttp2_hpack_parser_init(&t->parsing.hpack_parser, t->metadata_context); - grpc_iomgr_closure_init(&t->writing.done_cb, grpc_chttp2_terminate_writing, - &t->writing); - grpc_iomgr_closure_init(&t->recv_data, recv_data, t); + grpc_closure_init(&t->writing.done_cb, grpc_chttp2_terminate_writing, + &t->writing); + grpc_closure_init(&t->recv_data, recv_data, t); gpr_slice_buffer_init(&t->read_buffer); if (is_client) { @@ -499,20 +499,20 @@ grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream( static void lock(grpc_chttp2_transport *t) { gpr_mu_lock(&t->mu); } static void unlock(grpc_chttp2_transport *t) { - grpc_iomgr_call_list run = GRPC_IOMGR_CALL_LIST_INIT; + grpc_call_list run = GRPC_CALL_LIST_INIT; unlock_check_read_write_state(t); if (!t->writing_active && !t->closed && grpc_chttp2_unlocking_check_writes(&t->global, &t->writing)) { t->writing_active = 1; REF_TRANSPORT(t, "writing"); - grpc_iomgr_call_list_add(&t->global.run_at_unlock, &t->writing_action, 1); + grpc_call_list_add(&t->global.run_at_unlock, &t->writing_action, 1); prevent_endpoint_shutdown(t); } - GPR_SWAP(grpc_iomgr_call_list, run, t->global.run_at_unlock); + GPR_SWAP(grpc_call_list, run, t->global.run_at_unlock); gpr_mu_unlock(&t->mu); - grpc_iomgr_call_list_run(run); + grpc_call_list_run(run); } /* @@ -664,8 +664,8 @@ static void perform_stream_op_locked( } } else { grpc_sopb_reset(op->send_ops); - grpc_iomgr_call_list_add(&transport_global->run_at_unlock, - stream_global->send_done_closure, 0); + grpc_call_list_add(&transport_global->run_at_unlock, + stream_global->send_done_closure, 0); } } @@ -703,8 +703,7 @@ static void perform_stream_op_locked( op->bind_pollset); } - grpc_iomgr_call_list_add(&transport_global->run_at_unlock, op->on_consumed, - 1); + grpc_call_list_add(&transport_global->run_at_unlock, op->on_consumed, 1); } static void perform_stream_op(grpc_transport *gt, grpc_stream *gs, @@ -717,8 +716,7 @@ static void perform_stream_op(grpc_transport *gt, grpc_stream *gs, unlock(t); } -static void send_ping_locked(grpc_chttp2_transport *t, - grpc_iomgr_closure *on_recv) { +static void send_ping_locked(grpc_chttp2_transport *t, grpc_closure *on_recv) { grpc_chttp2_outstanding_ping *p = gpr_malloc(sizeof(*p)); p->next = &t->global.pings; p->prev = p->next->prev; @@ -741,7 +739,7 @@ static void perform_transport_op(grpc_transport *gt, grpc_transport_op *op) { lock(t); - grpc_iomgr_call_list_add(&t->global.run_at_unlock, op->on_consumed, 1); + grpc_call_list_add(&t->global.run_at_unlock, op->on_consumed, 1); if (op->on_connectivity_state_change) { grpc_connectivity_state_notify_on_state_change( @@ -868,8 +866,8 @@ static void unlock_check_read_write_state(grpc_chttp2_transport *t) { if (stream_global->outgoing_sopb != NULL) { grpc_sopb_reset(stream_global->outgoing_sopb); stream_global->outgoing_sopb = NULL; - grpc_iomgr_call_list_add(&transport_global->run_at_unlock, - stream_global->send_done_closure, 1); + grpc_call_list_add(&transport_global->run_at_unlock, + stream_global->send_done_closure, 1); } stream_global->read_closed = 1; if (!stream_global->published_cancelled) { @@ -919,8 +917,8 @@ static void unlock_check_read_write_state(grpc_chttp2_transport *t) { &stream_global->outstanding_metadata); grpc_sopb_swap(stream_global->publish_sopb, &stream_global->incoming_sopb); stream_global->published_state = *stream_global->publish_state = state; - grpc_iomgr_call_list_add(&transport_global->run_at_unlock, - stream_global->recv_done_closure, 1); + grpc_call_list_add(&transport_global->run_at_unlock, + stream_global->recv_done_closure, 1); stream_global->recv_done_closure = NULL; stream_global->publish_sopb = NULL; stream_global->publish_state = NULL; diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c index b605da9dbf7..8b2e1b9b02c 100644 --- a/src/core/transport/connectivity_state.c +++ b/src/core/transport/connectivity_state.c @@ -91,7 +91,7 @@ grpc_connectivity_state grpc_connectivity_state_check( int grpc_connectivity_state_notify_on_state_change( grpc_connectivity_state_tracker *tracker, grpc_connectivity_state *current, - grpc_iomgr_closure *notify, grpc_iomgr_call_list *call_list) { + grpc_closure *notify, grpc_call_list *call_list) { if (grpc_connectivity_state_trace) { gpr_log(GPR_DEBUG, "CONWATCH: %s: from %s [cur=%s] notify=%p", tracker->name, grpc_connectivity_state_name(*current), @@ -99,7 +99,7 @@ int grpc_connectivity_state_notify_on_state_change( } if (tracker->current_state != *current) { *current = tracker->current_state; - grpc_iomgr_call_list_add(call_list, notify, 1); + grpc_call_list_add(call_list, notify, 1); } else { grpc_connectivity_state_watcher *w = gpr_malloc(sizeof(*w)); w->current = current; @@ -113,7 +113,7 @@ int grpc_connectivity_state_notify_on_state_change( void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, grpc_connectivity_state state, const char *reason, - grpc_iomgr_call_list *call_list) { + grpc_call_list *call_list) { grpc_connectivity_state_watcher *w; if (grpc_connectivity_state_trace) { gpr_log(GPR_DEBUG, "SET: %s: %s --> %s [%s]", tracker->name, @@ -128,7 +128,7 @@ void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, while ((w = tracker->watchers) != NULL) { *w->current = tracker->current_state; tracker->watchers = w->next; - grpc_iomgr_call_list_add(call_list, w->notify, 1); + grpc_call_list_add(call_list, w->notify, 1); gpr_free(w); } } diff --git a/src/core/transport/connectivity_state.h b/src/core/transport/connectivity_state.h index 49c28152661..a29c655b4e8 100644 --- a/src/core/transport/connectivity_state.h +++ b/src/core/transport/connectivity_state.h @@ -42,7 +42,7 @@ typedef struct grpc_connectivity_state_watcher { /** we keep watchers in a linked list */ struct grpc_connectivity_state_watcher *next; /** closure to notify on change */ - grpc_iomgr_closure *notify; + grpc_closure *notify; /** the current state as believed by the watcher */ grpc_connectivity_state *current; } grpc_connectivity_state_watcher; @@ -67,8 +67,7 @@ void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker); * external lock */ void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, grpc_connectivity_state state, - const char *reason, - grpc_iomgr_call_list *call_list); + const char *reason, grpc_call_list *call_list); grpc_connectivity_state grpc_connectivity_state_check( grpc_connectivity_state_tracker *tracker); @@ -76,6 +75,6 @@ grpc_connectivity_state grpc_connectivity_state_check( /** Return 1 if the channel should start connecting, 0 otherwise */ int grpc_connectivity_state_notify_on_state_change( grpc_connectivity_state_tracker *tracker, grpc_connectivity_state *current, - grpc_iomgr_closure *notify, grpc_iomgr_call_list *call_list); + grpc_closure *notify, grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CONNECTIVITY_STATE_H */ diff --git a/src/core/transport/transport.c b/src/core/transport/transport.c index c0d92cf93f6..3f6b93c3e8c 100644 --- a/src/core/transport/transport.c +++ b/src/core/transport/transport.c @@ -101,8 +101,8 @@ void grpc_transport_stream_op_add_cancellation(grpc_transport_stream_op *op, typedef struct { gpr_slice message; - grpc_iomgr_closure *then_call; - grpc_iomgr_closure closure; + grpc_closure *then_call; + grpc_closure closure; } close_message_data; static void free_message(void *p, int iomgr_success) { @@ -130,7 +130,7 @@ void grpc_transport_stream_op_add_close(grpc_transport_stream_op *op, cmd = gpr_malloc(sizeof(*cmd)); cmd->message = *optional_message; cmd->then_call = op->on_consumed; - grpc_iomgr_closure_init(&cmd->closure, free_message, cmd); + grpc_closure_init(&cmd->closure, free_message, cmd); op->on_consumed = &cmd->closure; op->optional_close_message = &cmd->message; } diff --git a/src/core/transport/transport.h b/src/core/transport/transport.h index 6e1ec2f64cd..271891d430a 100644 --- a/src/core/transport/transport.h +++ b/src/core/transport/transport.h @@ -64,11 +64,11 @@ typedef enum grpc_stream_state { /* Transport stream op: a set of operations to perform on a transport against a single stream */ typedef struct grpc_transport_stream_op { - grpc_iomgr_closure *on_consumed; + grpc_closure *on_consumed; grpc_stream_op_buffer *send_ops; int is_last_send; - grpc_iomgr_closure *on_done_send; + grpc_closure *on_done_send; grpc_stream_op_buffer *recv_ops; grpc_stream_state *recv_state; @@ -76,7 +76,7 @@ typedef struct grpc_transport_stream_op { These bytes will be eventually used to replenish per-stream flow control windows. */ size_t max_recv_bytes; - grpc_iomgr_closure *on_done_recv; + grpc_closure *on_done_recv; grpc_pollset *bind_pollset; @@ -95,9 +95,9 @@ typedef struct grpc_transport_stream_op { /** Transport op: a set of operations to perform on a transport as a whole */ typedef struct grpc_transport_op { /** called when processing of this op is done */ - grpc_iomgr_closure *on_consumed; + grpc_closure *on_consumed; /** connectivity monitoring */ - grpc_iomgr_closure *on_connectivity_state_change; + grpc_closure *on_connectivity_state_change; grpc_connectivity_state *connectivity_state; /** should the transport be disconnected */ int disconnect; @@ -118,7 +118,7 @@ typedef struct grpc_transport_op { /** add this transport to a pollset_set */ grpc_pollset_set *bind_pollset_set; /** send a ping, call this back if not NULL */ - grpc_iomgr_closure *send_ping; + grpc_closure *send_ping; } grpc_transport_op; /* Returns the amount of memory required to store a grpc_stream for this @@ -181,7 +181,7 @@ void grpc_transport_perform_op(grpc_transport *transport, /* Send a ping on a transport Calls cb with user data when a response is received. */ -void grpc_transport_ping(grpc_transport *transport, grpc_iomgr_closure *cb); +void grpc_transport_ping(grpc_transport *transport, grpc_closure *cb); /* Advise peer of pending connection termination. */ void grpc_transport_goaway(grpc_transport *transport, grpc_status_code status, diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index 938da7a3e14..b9c0c98f69a 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -87,7 +87,7 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, gpr_slice slice = gpr_slice_from_copied_buffer(client_payload, client_payload_length); gpr_slice_buffer outgoing; - grpc_iomgr_closure done_write_closure; + grpc_closure done_write_closure; grpc_workqueue *workqueue; hex = gpr_dump(client_payload, client_payload_length, @@ -131,7 +131,7 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, gpr_slice_buffer_init(&outgoing); gpr_slice_buffer_add(&outgoing, slice); - grpc_iomgr_closure_init(&done_write_closure, done_write, &a); + grpc_closure_init(&done_write_closure, done_write, &a); /* Write data */ switch (grpc_endpoint_write(sfd.client, &outgoing, &done_write_closure)) { diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 919a5065213..210aa68fe17 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -171,7 +171,7 @@ int main(int argc, char **argv) { grpc_end2end_tests(configs[i]); } - grpc_workqueue_flush(g_workqueue, 1); + grpc_workqueue_flush(g_workqueue); GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); grpc_shutdown(); diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index 9d7e973b8e2..e2bba5d1dd9 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -157,7 +157,7 @@ int main(int argc, char **argv) { grpc_end2end_tests(configs[i]); } - grpc_workqueue_flush(g_workqueue, 1); + grpc_workqueue_flush(g_workqueue); GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); grpc_shutdown(); diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 44bb4c5dc0e..2db0669dbac 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -157,7 +157,7 @@ int main(int argc, char **argv) { grpc_end2end_tests(configs[i]); } - grpc_workqueue_flush(g_workqueue, 1); + grpc_workqueue_flush(g_workqueue); GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); grpc_shutdown(); diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index 853b9a32c2c..bf9c2d844e2 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -122,8 +122,8 @@ struct read_and_write_test_state { int write_done; gpr_slice_buffer incoming; gpr_slice_buffer outgoing; - grpc_iomgr_closure done_read; - grpc_iomgr_closure done_write; + grpc_closure done_read; + grpc_closure done_write; }; static void read_and_write_test_read_handler(void *data, int success) { @@ -227,10 +227,9 @@ static void read_and_write_test(grpc_endpoint_test_config config, state.write_done = 0; state.current_read_data = 0; state.current_write_data = 0; - grpc_iomgr_closure_init(&state.done_read, read_and_write_test_read_handler, - &state); - grpc_iomgr_closure_init(&state.done_write, read_and_write_test_write_handler, - &state); + grpc_closure_init(&state.done_read, read_and_write_test_read_handler, &state); + grpc_closure_init(&state.done_write, read_and_write_test_write_handler, + &state); gpr_slice_buffer_init(&state.outgoing); gpr_slice_buffer_init(&state.incoming); diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index 0f9b323e770..ae6b56da772 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -99,7 +99,7 @@ typedef struct { grpc_fd *em_fd; /* listening fd */ ssize_t read_bytes_total; /* total number of received bytes */ int done; /* set to 1 when a server finishes serving */ - grpc_iomgr_closure listen_closure; + grpc_closure listen_closure; } server; static void server_init(server *sv) { @@ -113,7 +113,7 @@ typedef struct { server *sv; /* not owned by a single session */ grpc_fd *em_fd; /* fd to read upload bytes */ char read_buf[BUF_SIZE]; /* buffer to store upload bytes */ - grpc_iomgr_closure session_read_closure; + grpc_closure session_read_closure; } session; /* Called when an upload session can be safely shutdown. @@ -275,7 +275,7 @@ typedef struct { int client_write_cnt; int done; /* set to 1 when a client finishes sending */ - grpc_iomgr_closure write_closure; + grpc_closure write_closure; } client; static void client_init(client *cl) { @@ -422,8 +422,8 @@ static void test_grpc_fd_change(void) { int sv[2]; char data; ssize_t result; - grpc_iomgr_closure first_closure; - grpc_iomgr_closure second_closure; + grpc_closure first_closure; + grpc_closure second_closure; first_closure.cb = first_read_callback; first_closure.cb_arg = &a; diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index 01162eb2252..40f3d98936f 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -120,7 +120,7 @@ struct read_socket_state { size_t read_bytes; size_t target_read_bytes; gpr_slice_buffer incoming; - grpc_iomgr_closure read_cb; + grpc_closure read_cb; }; static size_t count_slices(gpr_slice *slices, size_t nslices, @@ -196,7 +196,7 @@ static void read_test(size_t num_bytes, size_t slice_size) { state.read_bytes = 0; state.target_read_bytes = written_bytes; gpr_slice_buffer_init(&state.incoming); - grpc_iomgr_closure_init(&state.read_cb, read_cb, &state); + grpc_closure_init(&state.read_cb, read_cb, &state); switch (grpc_endpoint_read(ep, &state.incoming, &state.read_cb)) { case GRPC_ENDPOINT_DONE: @@ -246,7 +246,7 @@ static void large_read_test(size_t slice_size) { state.read_bytes = 0; state.target_read_bytes = (size_t)written_bytes; gpr_slice_buffer_init(&state.incoming); - grpc_iomgr_closure_init(&state.read_cb, read_cb, &state); + grpc_closure_init(&state.read_cb, read_cb, &state); switch (grpc_endpoint_read(ep, &state.incoming, &state.read_cb)) { case GRPC_ENDPOINT_DONE: @@ -377,7 +377,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { gpr_slice *slices; gpr_uint8 current_data = 0; gpr_slice_buffer outgoing; - grpc_iomgr_closure write_done_closure; + grpc_closure write_done_closure; gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); gpr_log(GPR_INFO, "Start write test with %d bytes, slice size %d", num_bytes, @@ -396,7 +396,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { gpr_slice_buffer_init(&outgoing); gpr_slice_buffer_addn(&outgoing, slices, num_blocks); - grpc_iomgr_closure_init(&write_done_closure, write_done, &state); + grpc_closure_init(&write_done_closure, write_done, &state); switch (grpc_endpoint_write(ep, &outgoing, &write_done_closure)) { case GRPC_ENDPOINT_DONE: diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c index 5663af80e8d..aa7b460f919 100644 --- a/test/core/iomgr/workqueue_test.c +++ b/test/core/iomgr/workqueue_test.c @@ -49,12 +49,12 @@ static void must_succeed(void *p, int success) { } static void test_add_closure(void) { - grpc_iomgr_closure c; + grpc_closure c; int done = 0; grpc_workqueue *wq = grpc_workqueue_create(); gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5); grpc_pollset_worker worker; - grpc_iomgr_closure_init(&c, must_succeed, &done); + grpc_closure_init(&c, must_succeed, &done); grpc_workqueue_push(wq, &c, 1); grpc_workqueue_add_to_pollset(wq, &g_pollset); From d1bec03fa148344b8eac2b59517252d86e4ca858 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 18 Sep 2015 17:29:00 -0700 Subject: [PATCH 14/56] Call list progress --- src/core/census/grpc_filter.c | 27 ++- src/core/channel/channel_stack.c | 35 ++-- src/core/channel/channel_stack.h | 35 ++-- src/core/channel/client_channel.c | 180 +++++++++--------- src/core/channel/client_channel.h | 9 +- src/core/channel/compress_filter.c | 14 +- src/core/channel/connected_channel.c | 17 +- src/core/channel/http_client_filter.c | 42 ++-- src/core/channel/http_server_filter.c | 36 ++-- src/core/channel/noop_filter.c | 21 +- src/core/client_config/client_config.c | 9 +- src/core/client_config/client_config.h | 3 +- src/core/client_config/connector.c | 9 +- src/core/client_config/connector.h | 18 +- .../client_config/lb_policies/pick_first.c | 86 ++++----- src/core/client_config/lb_policy.c | 8 +- src/core/client_config/lb_policy.h | 14 +- src/core/client_config/lb_policy_factory.h | 2 - src/core/client_config/resolver.c | 26 +-- src/core/client_config/resolver.h | 27 +-- src/core/client_config/resolver_factory.h | 2 - src/core/client_config/resolver_registry.c | 6 +- src/core/client_config/resolver_registry.h | 5 +- .../client_config/resolvers/dns_resolver.c | 67 +++---- .../resolvers/sockaddr_resolver.c | 50 ++--- .../resolvers/zookeeper_resolver.c | 6 - src/core/client_config/subchannel.c | 158 +++++++-------- src/core/client_config/subchannel.h | 38 ++-- src/core/client_config/subchannel_factory.h | 6 +- src/core/httpcli/httpcli.c | 127 ++++++------ src/core/httpcli/httpcli.h | 13 +- src/core/httpcli/httpcli_security_connector.c | 19 +- src/core/iomgr/alarm.c | 66 +++---- src/core/iomgr/alarm.h | 7 +- src/core/iomgr/alarm_internal.h | 6 +- src/core/iomgr/endpoint.c | 32 ++-- src/core/iomgr/endpoint.h | 44 ++--- src/core/iomgr/endpoint_pair.h | 3 +- src/core/iomgr/endpoint_pair_posix.c | 11 +- src/core/iomgr/fd_posix.c | 97 +++------- src/core/iomgr/fd_posix.h | 21 +- src/core/iomgr/iomgr.c | 25 ++- src/core/iomgr/iomgr.h | 22 ++- src/core/iomgr/pollset.h | 5 +- .../iomgr/pollset_multipoller_with_epoll.c | 43 ++--- .../pollset_multipoller_with_poll_posix.c | 22 +-- src/core/iomgr/pollset_posix.c | 138 ++++++-------- src/core/iomgr/pollset_posix.h | 36 ++-- src/core/iomgr/pollset_set.h | 6 +- src/core/iomgr/pollset_set_posix.c | 16 +- src/core/iomgr/pollset_set_posix.h | 6 +- src/core/iomgr/resolve_address.h | 5 +- src/core/iomgr/resolve_address_posix.c | 8 +- src/core/iomgr/tcp_client.h | 7 +- src/core/iomgr/tcp_client_posix.c | 58 +++--- src/core/iomgr/tcp_posix.c | 128 +++++++------ src/core/iomgr/tcp_server.h | 10 +- src/core/iomgr/tcp_server_posix.c | 64 +++---- src/core/iomgr/udp_server.c | 55 +++--- src/core/iomgr/udp_server.h | 7 +- src/core/iomgr/workqueue.h | 16 +- src/core/iomgr/workqueue_posix.c | 49 ++--- src/core/security/client_auth_filter.c | 54 +++--- src/core/security/credentials.c | 85 +++++---- src/core/security/credentials.h | 13 +- .../security/google_default_credentials.c | 17 +- src/core/security/jwt_verifier.c | 20 +- src/core/security/jwt_verifier.h | 4 +- src/core/security/secure_endpoint.c | 92 ++++----- src/core/security/secure_transport_setup.c | 111 +++++------ src/core/security/secure_transport_setup.h | 5 +- src/core/security/security_connector.c | 10 +- src/core/security/security_connector.h | 8 +- src/core/security/server_auth_filter.c | 27 ++- src/core/security/server_secure_chttp2.c | 36 ++-- src/core/surface/secure_channel_create.c | 57 ++++-- src/core/surface/server.h | 10 +- src/core/transport/chttp2_transport.h | 3 +- test/core/bad_client/bad_client.c | 40 ++-- .../core/end2end/fixtures/h2_sockpair+trace.c | 17 +- test/core/end2end/fixtures/h2_sockpair.c | 17 +- .../core/end2end/fixtures/h2_sockpair_1byte.c | 17 +- test/core/iomgr/endpoint_tests.c | 58 ++---- test/core/security/oauth2_utils.c | 18 +- test/core/util/port_posix.c | 35 +++- test/core/util/reconnect_server.c | 24 ++- 86 files changed, 1460 insertions(+), 1446 deletions(-) diff --git a/src/core/census/grpc_filter.c b/src/core/census/grpc_filter.c index d98162ec9a9..d66f29228b0 100644 --- a/src/core/census/grpc_filter.c +++ b/src/core/census/grpc_filter.c @@ -89,19 +89,21 @@ static void client_mutate_op(grpc_call_element* elem, } static void client_start_transport_op(grpc_call_element* elem, - grpc_transport_stream_op* op) { + grpc_transport_stream_op* op, + grpc_call_list* call_list) { client_mutate_op(elem, op); - grpc_call_next_op(elem, op); + grpc_call_next_op(elem, op, call_list); } -static void server_on_done_recv(void* ptr, int success) { +static void server_on_done_recv(void* ptr, int success, + grpc_call_list* call_list) { grpc_call_element* elem = ptr; call_data* calld = elem->call_data; channel_data* chand = elem->channel_data; if (success) { extract_and_annotate_method_tag(calld->recv_ops, calld, chand); } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success); + calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, call_list); } static void server_mutate_op(grpc_call_element* elem, @@ -116,11 +118,12 @@ static void server_mutate_op(grpc_call_element* elem, } static void server_start_transport_op(grpc_call_element* elem, - grpc_transport_stream_op* op) { + grpc_transport_stream_op* op, + grpc_call_list* call_list) { 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(elem, op); + grpc_call_next_op(elem, op, call_list); } static void client_init_call_elem(grpc_call_element* elem, @@ -132,7 +135,8 @@ static void client_init_call_elem(grpc_call_element* elem, if (initial_op) client_mutate_op(elem, initial_op); } -static void client_destroy_call_elem(grpc_call_element* elem) { +static void client_destroy_call_elem(grpc_call_element* elem, + grpc_call_list* call_list) { call_data* d = elem->call_data; GPR_ASSERT(d != NULL); /* TODO(hongyu): record rpc client stats and census_rpc_end_op here */ @@ -149,7 +153,8 @@ static void server_init_call_elem(grpc_call_element* elem, if (initial_op) server_mutate_op(elem, initial_op); } -static void server_destroy_call_elem(grpc_call_element* elem) { +static void server_destroy_call_elem(grpc_call_element* elem, + grpc_call_list* call_list) { call_data* d = elem->call_data; GPR_ASSERT(d != NULL); /* TODO(hongyu): record rpc server stats and census_tracing_end_op here */ @@ -157,13 +162,15 @@ static void server_destroy_call_elem(grpc_call_element* elem) { static void init_channel_elem(grpc_channel_element* elem, grpc_channel* master, const grpc_channel_args* args, grpc_mdctx* mdctx, - int is_first, int is_last) { + int is_first, int is_last, + grpc_call_list* call_list) { channel_data* chand = elem->channel_data; GPR_ASSERT(chand != NULL); chand->path_str = grpc_mdstr_from_string(mdctx, ":path", 0); } -static void destroy_channel_elem(grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_channel_element* elem, + grpc_call_list* call_list) { channel_data* chand = elem->channel_data; GPR_ASSERT(chand != NULL); if (chand->path_str != NULL) { diff --git a/src/core/channel/channel_stack.c b/src/core/channel/channel_stack.c index 4eb5df5de3e..c767a87b208 100644 --- a/src/core/channel/channel_stack.c +++ b/src/core/channel/channel_stack.c @@ -105,7 +105,8 @@ void grpc_channel_stack_init(const grpc_channel_filter **filters, size_t filter_count, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *metadata_context, - grpc_channel_stack *stack) { + grpc_channel_stack *stack, + grpc_call_list *call_list) { size_t call_size = ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(grpc_call_stack)) + ROUND_UP_TO_ALIGNMENT_SIZE(filter_count * sizeof(grpc_call_element)); @@ -125,7 +126,7 @@ void grpc_channel_stack_init(const grpc_channel_filter **filters, elems[i].channel_data = user_data; elems[i].filter->init_channel_elem(&elems[i], master, args, metadata_context, i == 0, - i == (filter_count - 1)); + i == (filter_count - 1), call_list); user_data += ROUND_UP_TO_ALIGNMENT_SIZE(filters[i]->sizeof_channel_data); call_size += ROUND_UP_TO_ALIGNMENT_SIZE(filters[i]->sizeof_call_data); } @@ -137,14 +138,15 @@ void grpc_channel_stack_init(const grpc_channel_filter **filters, stack->call_stack_size = call_size; } -void grpc_channel_stack_destroy(grpc_channel_stack *stack) { +void grpc_channel_stack_destroy(grpc_channel_stack *stack, + grpc_call_list *call_list) { 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(&channel_elems[i], call_list); } } @@ -175,30 +177,34 @@ void grpc_call_stack_init(grpc_channel_stack *channel_stack, } } -void grpc_call_stack_destroy(grpc_call_stack *stack) { +void grpc_call_stack_destroy(grpc_call_stack *stack, + grpc_call_list *call_list) { grpc_call_element *elems = CALL_ELEMS_FROM_STACK(stack); size_t count = stack->count; size_t i; /* destroy per-filter data */ for (i = 0; i < count; i++) { - elems[i].filter->destroy_call_elem(&elems[i]); + elems[i].filter->destroy_call_elem(&elems[i], call_list); } } -void grpc_call_next_op(grpc_call_element *elem, grpc_transport_stream_op *op) { +void grpc_call_next_op(grpc_call_element *elem, grpc_transport_stream_op *op, + grpc_call_list *call_list) { grpc_call_element *next_elem = elem + 1; - next_elem->filter->start_transport_stream_op(next_elem, op); + next_elem->filter->start_transport_stream_op(next_elem, op, call_list); } -char *grpc_call_next_get_peer(grpc_call_element *elem) { +char *grpc_call_next_get_peer(grpc_call_element *elem, + grpc_call_list *call_list) { grpc_call_element *next_elem = elem + 1; - return next_elem->filter->get_peer(next_elem); + return next_elem->filter->get_peer(next_elem, call_list); } -void grpc_channel_next_op(grpc_channel_element *elem, grpc_transport_op *op) { +void grpc_channel_next_op(grpc_channel_element *elem, grpc_transport_op *op, + grpc_call_list *call_list) { grpc_channel_element *next_elem = elem + 1; - next_elem->filter->start_transport_op(next_elem, op); + next_elem->filter->start_transport_op(next_elem, op, call_list); } grpc_channel_stack *grpc_channel_stack_from_top_element( @@ -212,9 +218,10 @@ grpc_call_stack *grpc_call_stack_from_top_element(grpc_call_element *elem) { sizeof(grpc_call_stack))); } -void grpc_call_element_send_cancel(grpc_call_element *cur_elem) { +void grpc_call_element_send_cancel(grpc_call_element *cur_elem, + grpc_call_list *call_list) { grpc_transport_stream_op op; memset(&op, 0, sizeof(op)); op.cancel_with_status = GRPC_STATUS_CANCELLED; - grpc_call_next_op(cur_elem, &op); + grpc_call_next_op(cur_elem, &op, call_list); } diff --git a/src/core/channel/channel_stack.h b/src/core/channel/channel_stack.h index 4a608b956e0..190247b3f10 100644 --- a/src/core/channel/channel_stack.h +++ b/src/core/channel/channel_stack.h @@ -65,11 +65,13 @@ 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)(grpc_call_element *elem, - grpc_transport_stream_op *op); + grpc_transport_stream_op *op, + grpc_call_list *call_list); /* 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_channel_element *elem, grpc_transport_op *op, + grpc_call_list *call_list); /* sizeof(per call data) */ size_t sizeof_call_data; @@ -86,7 +88,7 @@ typedef struct { grpc_transport_stream_op *initial_op); /* Destroy per call data. The filter does not need to do any chaining */ - void (*destroy_call_elem)(grpc_call_element *elem); + void (*destroy_call_elem)(grpc_call_element *elem, grpc_call_list *call_list); /* sizeof(per channel data) */ size_t sizeof_channel_data; @@ -99,13 +101,14 @@ typedef struct { void (*init_channel_elem)(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *metadata_context, int is_first, - int is_last); + int is_last, grpc_call_list *call_list); /* 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_channel_element *elem, + grpc_call_list *call_list); /* Implement grpc_call_get_peer() */ - char *(*get_peer)(grpc_call_element *elem); + char *(*get_peer)(grpc_call_element *elem, grpc_call_list *call_list); /* The name of this filter */ const char *name; @@ -157,9 +160,11 @@ void grpc_channel_stack_init(const grpc_channel_filter **filters, size_t filter_count, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *metadata_context, - grpc_channel_stack *stack); + grpc_channel_stack *stack, + grpc_call_list *call_list); /* Destroy a channel stack */ -void grpc_channel_stack_destroy(grpc_channel_stack *stack); +void grpc_channel_stack_destroy(grpc_channel_stack *stack, + grpc_call_list *call_list); /* 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 @@ -169,15 +174,18 @@ void grpc_call_stack_init(grpc_channel_stack *channel_stack, grpc_transport_stream_op *initial_op, grpc_call_stack *call_stack); /* Destroy a call stack */ -void grpc_call_stack_destroy(grpc_call_stack *stack); +void grpc_call_stack_destroy(grpc_call_stack *stack, grpc_call_list *call_list); /* Call the next operation in a call stack */ -void grpc_call_next_op(grpc_call_element *elem, grpc_transport_stream_op *op); +void grpc_call_next_op(grpc_call_element *elem, grpc_transport_stream_op *op, + grpc_call_list *call_list); /* 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_channel_element *elem, grpc_transport_op *op, + grpc_call_list *call_list); /* Pass through a request to get_peer to the next child element */ -char *grpc_call_next_get_peer(grpc_call_element *elem); +char *grpc_call_next_get_peer(grpc_call_element *elem, + grpc_call_list *call_list); /* Given the top element of a channel stack, get the channel stack itself */ grpc_channel_stack *grpc_channel_stack_from_top_element( @@ -188,7 +196,8 @@ grpc_call_stack *grpc_call_stack_from_top_element(grpc_call_element *elem); void grpc_call_log_op(char *file, int line, gpr_log_severity severity, grpc_call_element *elem, grpc_transport_stream_op *op); -void grpc_call_element_send_cancel(grpc_call_element *cur_elem); +void grpc_call_element_send_cancel(grpc_call_element *cur_elem, + grpc_call_list *call_list); extern int grpc_trace_channel; diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 588b9c36ee8..6618336e938 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -128,12 +128,13 @@ static grpc_closure *merge_into_waiting_op(grpc_call_element *elem, GRPC_MUST_USE_RESULT; static void handle_op_after_cancellation(grpc_call_element *elem, - grpc_transport_stream_op *op) { + grpc_transport_stream_op *op, + grpc_call_list *call_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; if (op->send_ops) { grpc_stream_ops_unref_owned_objects(op->send_ops->ops, op->send_ops->nops); - op->on_done_send->cb(op->on_done_send->cb_arg, 0); + op->on_done_send->cb(op->on_done_send->cb_arg, 0, call_list); } if (op->recv_ops) { char status[GPR_LTOA_MIN_BUFSIZE]; @@ -152,10 +153,10 @@ static void handle_op_after_cancellation(grpc_call_element *elem, mdb.deadline = gpr_inf_future(GPR_CLOCK_REALTIME); grpc_sopb_add_metadata(op->recv_ops, mdb); *op->recv_state = GRPC_STREAM_CLOSED; - op->on_done_recv->cb(op->on_done_recv->cb_arg, 1); + op->on_done_recv->cb(op->on_done_recv->cb_arg, 1, call_list); } if (op->on_consumed) { - op->on_consumed->cb(op->on_consumed->cb_arg, 0); + op->on_consumed->cb(op->on_consumed->cb_arg, 0, call_list); } } @@ -166,12 +167,14 @@ typedef struct { static void perform_transport_stream_op(grpc_call_element *elem, grpc_transport_stream_op *op, - int continuation); + int continuation, + grpc_call_list *call_list); -static void continue_with_pick(void *arg, int iomgr_success) { +static void continue_with_pick(void *arg, int iomgr_success, + grpc_call_list *call_list) { waiting_call *wc = arg; call_data *calld = wc->elem->call_data; - perform_transport_stream_op(wc->elem, &calld->waiting_op, 1); + perform_transport_stream_op(wc->elem, &calld->waiting_op, 1, call_list); gpr_free(wc); } @@ -193,7 +196,8 @@ static int is_empty(void *p, int len) { return 1; } -static void started_call(void *arg, int iomgr_success) { +static void started_call(void *arg, int iomgr_success, + grpc_call_list *call_list) { call_data *calld = arg; grpc_transport_stream_op op; int have_waiting; @@ -203,7 +207,7 @@ static void started_call(void *arg, int iomgr_success) { memset(&op, 0, sizeof(op)); op.cancel_with_status = GRPC_STATUS_CANCELLED; gpr_mu_unlock(&calld->mu_state); - grpc_subchannel_call_process_op(calld->subchannel_call, &op); + grpc_subchannel_call_process_op(calld->subchannel_call, &op, call_list); } else if (calld->state == CALL_WAITING_FOR_CALL) { have_waiting = !is_empty(&calld->waiting_op, sizeof(calld->waiting_op)); if (calld->subchannel_call != NULL) { @@ -211,13 +215,14 @@ static void started_call(void *arg, int iomgr_success) { gpr_mu_unlock(&calld->mu_state); if (have_waiting) { grpc_subchannel_call_process_op(calld->subchannel_call, - &calld->waiting_op); + &calld->waiting_op, call_list); } } else { calld->state = CALL_CANCELLED; gpr_mu_unlock(&calld->mu_state); if (have_waiting) { - handle_op_after_cancellation(calld->elem, &calld->waiting_op); + handle_op_after_cancellation(calld->elem, &calld->waiting_op, + call_list); } } } else { @@ -226,20 +231,20 @@ static void started_call(void *arg, int iomgr_success) { } } -static void picked_target(void *arg, int iomgr_success) { +static void picked_target(void *arg, int iomgr_success, + grpc_call_list *call_list) { call_data *calld = arg; grpc_pollset *pollset; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; if (calld->picked_channel == NULL) { /* treat this like a cancellation */ calld->waiting_op.cancel_with_status = GRPC_STATUS_UNAVAILABLE; - perform_transport_stream_op(calld->elem, &calld->waiting_op, 1); + perform_transport_stream_op(calld->elem, &calld->waiting_op, 1, call_list); } else { gpr_mu_lock(&calld->mu_state); if (calld->state == CALL_CANCELLED) { gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(calld->elem, &calld->waiting_op); + handle_op_after_cancellation(calld->elem, &calld->waiting_op, call_list); } else { GPR_ASSERT(calld->state == CALL_WAITING_FOR_PICK); calld->state = CALL_WAITING_FOR_CALL; @@ -248,10 +253,9 @@ static void picked_target(void *arg, int iomgr_success) { grpc_closure_init(&calld->async_setup_task, started_call, calld); grpc_subchannel_create_call(calld->picked_channel, pollset, &calld->subchannel_call, - &calld->async_setup_task, &call_list); + &calld->async_setup_task, call_list); } } - grpc_call_list_run(call_list); } static grpc_closure *merge_into_waiting_op(grpc_call_element *elem, @@ -283,7 +287,7 @@ static grpc_closure *merge_into_waiting_op(grpc_call_element *elem, return consumed_op; } -static char *cc_get_peer(grpc_call_element *elem) { +static char *cc_get_peer(grpc_call_element *elem, grpc_call_list *call_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_subchannel_call *subchannel_call; @@ -294,8 +298,8 @@ static char *cc_get_peer(grpc_call_element *elem) { subchannel_call = calld->subchannel_call; GRPC_SUBCHANNEL_CALL_REF(subchannel_call, "get_peer"); gpr_mu_unlock(&calld->mu_state); - result = grpc_subchannel_call_get_peer(subchannel_call); - GRPC_SUBCHANNEL_CALL_UNREF(subchannel_call, "get_peer"); + result = grpc_subchannel_call_get_peer(subchannel_call, call_list); + GRPC_SUBCHANNEL_CALL_UNREF(subchannel_call, "get_peer", call_list); return result; } else { gpr_mu_unlock(&calld->mu_state); @@ -305,13 +309,13 @@ static char *cc_get_peer(grpc_call_element *elem) { static void perform_transport_stream_op(grpc_call_element *elem, grpc_transport_stream_op *op, - int continuation) { + int continuation, + grpc_call_list *call_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_subchannel_call *subchannel_call; grpc_lb_policy *lb_policy; grpc_transport_stream_op op2; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; GPR_ASSERT(elem->filter == &grpc_client_channel_filter); GRPC_CALL_LOG_OP(GPR_INFO, elem, op); @@ -321,15 +325,15 @@ static void perform_transport_stream_op(grpc_call_element *elem, GPR_ASSERT(!continuation); subchannel_call = calld->subchannel_call; gpr_mu_unlock(&calld->mu_state); - grpc_subchannel_call_process_op(subchannel_call, op); + grpc_subchannel_call_process_op(subchannel_call, op, call_list); break; case CALL_CANCELLED: gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(elem, op); + handle_op_after_cancellation(elem, op, call_list); break; case CALL_WAITING_FOR_SEND: GPR_ASSERT(!continuation); - grpc_call_list_add(&call_list, merge_into_waiting_op(elem, op), 1); + grpc_call_list_add(call_list, merge_into_waiting_op(elem, op), 1); if (!calld->waiting_op.send_ops && calld->waiting_op.cancel_with_status == GRPC_STATUS_OK) { gpr_mu_unlock(&calld->mu_state); @@ -355,10 +359,10 @@ static void perform_transport_stream_op(grpc_call_element *elem, op2.on_consumed = NULL; } gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(elem, op); - handle_op_after_cancellation(elem, &op2); + handle_op_after_cancellation(elem, op, call_list); + handle_op_after_cancellation(elem, &op2, call_list); } else { - grpc_call_list_add(&call_list, merge_into_waiting_op(elem, op), 1); + grpc_call_list_add(call_list, merge_into_waiting_op(elem, op), 1); gpr_mu_unlock(&calld->mu_state); } break; @@ -368,7 +372,7 @@ static void perform_transport_stream_op(grpc_call_element *elem, if (op->cancel_with_status != GRPC_STATUS_OK) { calld->state = CALL_CANCELLED; gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(elem, op); + handle_op_after_cancellation(elem, op, call_list); } else { calld->waiting_op = *op; @@ -398,9 +402,9 @@ static void perform_transport_stream_op(grpc_call_element *elem, grpc_closure_init(&calld->async_setup_task, picked_target, calld); grpc_lb_policy_pick(lb_policy, bind_pollset, initial_metadata, &calld->picked_channel, - &calld->async_setup_task, &call_list); + &calld->async_setup_task, call_list); - GRPC_LB_POLICY_UNREF(lb_policy, "pick"); + GRPC_LB_POLICY_UNREF(lb_policy, "pick", call_list); } else if (chand->resolver != NULL) { calld->state = CALL_WAITING_FOR_CONFIG; add_to_lb_policy_wait_queue_locked_state_config(elem); @@ -409,7 +413,7 @@ static void perform_transport_stream_op(grpc_call_element *elem, chand->started_resolving = 1; grpc_resolver_next(chand->resolver, &chand->incoming_configuration, - &chand->on_config_changed); + &chand->on_config_changed, call_list); } gpr_mu_unlock(&chand->mu_config); gpr_mu_unlock(&calld->mu_state); @@ -417,19 +421,18 @@ static void perform_transport_stream_op(grpc_call_element *elem, calld->state = CALL_CANCELLED; gpr_mu_unlock(&chand->mu_config); gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(elem, op); + handle_op_after_cancellation(elem, op, call_list); } } } break; } - - grpc_call_list_run(call_list); } static void cc_start_transport_stream_op(grpc_call_element *elem, - grpc_transport_stream_op *op) { - perform_transport_stream_op(elem, op, 0); + grpc_transport_stream_op *op, + grpc_call_list *call_list) { + perform_transport_stream_op(elem, op, 0, call_list); } static void watch_lb_policy(channel_data *chand, grpc_lb_policy *lb_policy, @@ -448,16 +451,14 @@ static void on_lb_policy_state_changed_locked(lb_policy_connectivity_watcher *w, } } -static void on_lb_policy_state_changed(void *arg, int iomgr_success) { +static void on_lb_policy_state_changed(void *arg, int iomgr_success, + grpc_call_list *call_list) { lb_policy_connectivity_watcher *w = arg; - grpc_call_list cl = GRPC_CALL_LIST_INIT; gpr_mu_lock(&w->chand->mu_config); - on_lb_policy_state_changed_locked(w, &cl); + on_lb_policy_state_changed_locked(w, call_list); gpr_mu_unlock(&w->chand->mu_config); - grpc_call_list_run(cl); - GRPC_CHANNEL_INTERNAL_UNREF(w->chand->master, "watch_lb_policy"); gpr_free(w); } @@ -476,13 +477,13 @@ static void watch_lb_policy(channel_data *chand, grpc_lb_policy *lb_policy, call_list); } -static void cc_on_config_changed(void *arg, int iomgr_success) { +static void cc_on_config_changed(void *arg, int iomgr_success, + grpc_call_list *call_list) { channel_data *chand = arg; grpc_lb_policy *lb_policy = NULL; grpc_lb_policy *old_lb_policy; grpc_resolver *old_resolver; grpc_connectivity_state state = GRPC_CHANNEL_TRANSIENT_FAILURE; - grpc_call_list cl = GRPC_CALL_LIST_INIT; int exit_idle = 0; if (chand->incoming_configuration != NULL) { @@ -490,10 +491,10 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { if (lb_policy != NULL) { GRPC_LB_POLICY_REF(lb_policy, "channel"); GRPC_LB_POLICY_REF(lb_policy, "config_change"); - state = grpc_lb_policy_check_connectivity(lb_policy, &cl); + state = grpc_lb_policy_check_connectivity(lb_policy, call_list); } - grpc_client_config_unref(chand->incoming_configuration); + grpc_client_config_unref(chand->incoming_configuration, call_list); } chand->incoming_configuration = NULL; @@ -502,7 +503,7 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { old_lb_policy = chand->lb_policy; chand->lb_policy = lb_policy; if (lb_policy != NULL || chand->resolver == NULL /* disconnected */) { - grpc_call_list_move(&chand->waiting_for_config_closures, &cl); + grpc_call_list_move(&chand->waiting_for_config_closures, call_list); } if (lb_policy != NULL && chand->exit_idle_when_lb_policy_arrives) { GRPC_LB_POLICY_REF(lb_policy, "exit_idle"); @@ -514,57 +515,53 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { grpc_resolver *resolver = chand->resolver; GRPC_RESOLVER_REF(resolver, "channel-next"); grpc_connectivity_state_set(&chand->state_tracker, state, "new_lb+resolver", - &cl); + call_list); if (lb_policy != NULL) { - watch_lb_policy(chand, lb_policy, state, &cl); + watch_lb_policy(chand, lb_policy, state, call_list); } gpr_mu_unlock(&chand->mu_config); GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); grpc_resolver_next(resolver, &chand->incoming_configuration, - &chand->on_config_changed); - GRPC_RESOLVER_UNREF(resolver, "channel-next"); + &chand->on_config_changed, call_list); + GRPC_RESOLVER_UNREF(resolver, "channel-next", call_list); } else { old_resolver = chand->resolver; chand->resolver = NULL; grpc_connectivity_state_set(&chand->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "resolver_gone", - &cl); + call_list); gpr_mu_unlock(&chand->mu_config); if (old_resolver != NULL) { - grpc_resolver_shutdown(old_resolver); - GRPC_RESOLVER_UNREF(old_resolver, "channel"); + grpc_resolver_shutdown(old_resolver, call_list); + GRPC_RESOLVER_UNREF(old_resolver, "channel", call_list); } } if (exit_idle) { - grpc_lb_policy_exit_idle(lb_policy, &cl); - GRPC_LB_POLICY_UNREF(lb_policy, "exit_idle"); + grpc_lb_policy_exit_idle(lb_policy, call_list); + GRPC_LB_POLICY_UNREF(lb_policy, "exit_idle", call_list); } if (old_lb_policy != NULL) { - grpc_lb_policy_shutdown(old_lb_policy, &cl); - GRPC_LB_POLICY_UNREF(old_lb_policy, "channel"); + grpc_lb_policy_shutdown(old_lb_policy, call_list); + GRPC_LB_POLICY_UNREF(old_lb_policy, "channel", call_list); } if (lb_policy != NULL) { - GRPC_LB_POLICY_UNREF(lb_policy, "config_change"); + GRPC_LB_POLICY_UNREF(lb_policy, "config_change", call_list); } - grpc_call_list_run(cl); GRPC_CHANNEL_INTERNAL_UNREF(chand->master, "resolver"); } static void cc_start_transport_op(grpc_channel_element *elem, - grpc_transport_op *op) { + grpc_transport_op *op, + grpc_call_list *call_list) { grpc_lb_policy *lb_policy = NULL; channel_data *chand = elem->channel_data; grpc_resolver *destroy_resolver = NULL; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; - if (op->on_consumed) { - grpc_call_list_add(&call_list, op->on_consumed, 1); - op->on_consumed = NULL; - } + grpc_call_list_add(call_list, op->on_consumed, 1); GPR_ASSERT(op->set_accept_stream == NULL); GPR_ASSERT(op->bind_pollset == NULL); @@ -573,7 +570,7 @@ static void cc_start_transport_op(grpc_channel_element *elem, if (op->on_connectivity_state_change != NULL) { grpc_connectivity_state_notify_on_state_change( &chand->state_tracker, op->connectivity_state, - op->on_connectivity_state_change, &call_list); + op->on_connectivity_state_change, call_list); op->on_connectivity_state_change = NULL; op->connectivity_state = NULL; } @@ -588,28 +585,26 @@ static void cc_start_transport_op(grpc_channel_element *elem, if (op->disconnect && chand->resolver != NULL) { grpc_connectivity_state_set(&chand->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "disconnect", - &call_list); + call_list); destroy_resolver = chand->resolver; chand->resolver = NULL; if (chand->lb_policy != NULL) { - grpc_lb_policy_shutdown(chand->lb_policy, &call_list); - GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel"); + grpc_lb_policy_shutdown(chand->lb_policy, call_list); + GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel", call_list); chand->lb_policy = NULL; } } gpr_mu_unlock(&chand->mu_config); if (destroy_resolver) { - grpc_resolver_shutdown(destroy_resolver); - GRPC_RESOLVER_UNREF(destroy_resolver, "channel"); + grpc_resolver_shutdown(destroy_resolver, call_list); + GRPC_RESOLVER_UNREF(destroy_resolver, "channel", call_list); } if (lb_policy) { - grpc_lb_policy_broadcast(lb_policy, op, &call_list); - GRPC_LB_POLICY_UNREF(lb_policy, "broadcast"); + grpc_lb_policy_broadcast(lb_policy, op, call_list); + GRPC_LB_POLICY_UNREF(lb_policy, "broadcast", call_list); } - - grpc_call_list_run(call_list); } /* Constructor for call_data */ @@ -630,7 +625,8 @@ static void 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_call_element *elem, + grpc_call_list *call_list) { call_data *calld = elem->call_data; grpc_subchannel_call *subchannel_call; @@ -642,7 +638,7 @@ static void destroy_call_elem(grpc_call_element *elem) { case CALL_ACTIVE: subchannel_call = calld->subchannel_call; gpr_mu_unlock(&calld->mu_state); - GRPC_SUBCHANNEL_CALL_UNREF(subchannel_call, "client_channel"); + GRPC_SUBCHANNEL_CALL_UNREF(subchannel_call, "client_channel", call_list); break; case CALL_CREATED: case CALL_CANCELLED: @@ -662,7 +658,7 @@ static void destroy_call_elem(grpc_call_element *elem) { static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *metadata_context, int is_first, - int is_last) { + int is_last, grpc_call_list *call_list) { channel_data *chand = elem->channel_data; memset(chand, 0, sizeof(*chand)); @@ -681,15 +677,16 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, } /* Destructor for channel_data */ -static void destroy_channel_elem(grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem, + grpc_call_list *call_list) { channel_data *chand = elem->channel_data; if (chand->resolver != NULL) { - grpc_resolver_shutdown(chand->resolver); - GRPC_RESOLVER_UNREF(chand->resolver, "channel"); + grpc_resolver_shutdown(chand->resolver, call_list); + GRPC_RESOLVER_UNREF(chand->resolver, "channel", call_list); } if (chand->lb_policy != NULL) { - GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel"); + GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel", call_list); } grpc_connectivity_state_destroy(&chand->state_tracker); grpc_pollset_set_destroy(&chand->pollset_set); @@ -710,7 +707,8 @@ const grpc_channel_filter grpc_client_channel_filter = { }; void grpc_client_channel_set_resolver(grpc_channel_stack *channel_stack, - grpc_resolver *resolver) { + grpc_resolver *resolver, + grpc_call_list *call_list) { /* post construction initialization: set the transport setup pointer */ grpc_channel_element *elem = grpc_channel_stack_last_element(channel_stack); channel_data *chand = elem->channel_data; @@ -723,7 +721,7 @@ void grpc_client_channel_set_resolver(grpc_channel_stack *channel_stack, chand->started_resolving = 1; GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); grpc_resolver_next(resolver, &chand->incoming_configuration, - &chand->on_config_changed); + &chand->on_config_changed, call_list); } gpr_mu_unlock(&chand->mu_config); } @@ -743,7 +741,7 @@ grpc_connectivity_state grpc_client_channel_check_connectivity_state( GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); chand->started_resolving = 1; grpc_resolver_next(chand->resolver, &chand->incoming_configuration, - &chand->on_config_changed); + &chand->on_config_changed, call_list); } } } @@ -768,13 +766,15 @@ grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set( } void grpc_client_channel_add_interested_party(grpc_channel_element *elem, - grpc_pollset *pollset) { + grpc_pollset *pollset, + grpc_call_list *call_list) { channel_data *chand = elem->channel_data; - grpc_pollset_set_add_pollset(&chand->pollset_set, pollset); + grpc_pollset_set_add_pollset(&chand->pollset_set, pollset, call_list); } void grpc_client_channel_del_interested_party(grpc_channel_element *elem, - grpc_pollset *pollset) { + grpc_pollset *pollset, + grpc_call_list *call_list) { channel_data *chand = elem->channel_data; - grpc_pollset_set_del_pollset(&chand->pollset_set, pollset); + grpc_pollset_set_del_pollset(&chand->pollset_set, pollset, call_list); } diff --git a/src/core/channel/client_channel.h b/src/core/channel/client_channel.h index bd84dad6b73..7afc7f8544b 100644 --- a/src/core/channel/client_channel.h +++ b/src/core/channel/client_channel.h @@ -50,7 +50,8 @@ extern const grpc_channel_filter grpc_client_channel_filter; transport setup it should cancel upon destruction, or initiate when it needs a connection */ void grpc_client_channel_set_resolver(grpc_channel_stack *channel_stack, - grpc_resolver *resolver); + grpc_resolver *resolver, + grpc_call_list *call_list); grpc_connectivity_state grpc_client_channel_check_connectivity_state( grpc_channel_element *elem, int try_to_connect, grpc_call_list *call_list); @@ -63,8 +64,10 @@ grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set( grpc_channel_element *elem); void grpc_client_channel_add_interested_party(grpc_channel_element *channel, - grpc_pollset *pollset); + grpc_pollset *pollset, + grpc_call_list *call_list); void grpc_client_channel_del_interested_party(grpc_channel_element *channel, - grpc_pollset *pollset); + grpc_pollset *pollset, + grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_CHANNEL_CLIENT_CHANNEL_H */ diff --git a/src/core/channel/compress_filter.c b/src/core/channel/compress_filter.c index 7959603102c..5a7403ccfdc 100644 --- a/src/core/channel/compress_filter.c +++ b/src/core/channel/compress_filter.c @@ -269,13 +269,14 @@ static void process_send_ops(grpc_call_element *elem, op contains type and call direction information, in addition to the data that is being sent or received. */ static void compress_start_transport_stream_op(grpc_call_element *elem, - grpc_transport_stream_op *op) { + grpc_transport_stream_op *op, + grpc_call_list *call_list) { if (op->send_ops && op->send_ops->nops > 0) { process_send_ops(elem, op->send_ops); } /* pass control down the stack */ - grpc_call_next_op(elem, op); + grpc_call_next_op(elem, op, call_list); } /* Constructor for call_data */ @@ -298,7 +299,8 @@ static void 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_call_element *elem, + grpc_call_list *call_list) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; gpr_slice_buffer_destroy(&calld->slices); @@ -307,7 +309,8 @@ static void destroy_call_elem(grpc_call_element *elem) { /* Constructor for channel_data */ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *mdctx, - int is_first, int is_last) { + int is_first, int is_last, + grpc_call_list *call_list) { channel_data *channeld = elem->channel_data; grpc_compression_algorithm algo_idx; const char *supported_algorithms_names[GRPC_COMPRESS_ALGORITHMS_COUNT - 1]; @@ -369,7 +372,8 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem, + grpc_call_list *call_list) { channel_data *channeld = elem->channel_data; grpc_compression_algorithm algo_idx; diff --git a/src/core/channel/connected_channel.c b/src/core/channel/connected_channel.c index b95ed06f2ba..00a4d61afed 100644 --- a/src/core/channel/connected_channel.c +++ b/src/core/channel/connected_channel.c @@ -62,7 +62,8 @@ typedef struct connected_channel_call_data { void *unused; } call_data; /* Intercept a call operation and either push it directly up or translate it into transport stream operations */ static void con_start_transport_stream_op(grpc_call_element *elem, - grpc_transport_stream_op *op) { + grpc_transport_stream_op *op, + grpc_call_list *call_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); @@ -73,7 +74,8 @@ static void con_start_transport_stream_op(grpc_call_element *elem, } static void con_start_transport_op(grpc_channel_element *elem, - grpc_transport_op *op) { + grpc_transport_op *op, + grpc_call_list *call_list) { channel_data *chand = elem->channel_data; grpc_transport_perform_op(chand->transport, op); } @@ -94,7 +96,8 @@ static void 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_call_element *elem, + grpc_call_list *call_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); @@ -105,7 +108,8 @@ static void destroy_call_elem(grpc_call_element *elem) { /* Constructor for channel_data */ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *mdctx, - int is_first, int is_last) { + int is_first, int is_last, + grpc_call_list *call_list) { channel_data *cd = (channel_data *)elem->channel_data; GPR_ASSERT(is_last); GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); @@ -113,13 +117,14 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, } /* Destructor for channel_data */ -static void destroy_channel_elem(grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem, + grpc_call_list *call_list) { channel_data *cd = (channel_data *)elem->channel_data; GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); grpc_transport_destroy(cd->transport); } -static char *con_get_peer(grpc_call_element *elem) { +static char *con_get_peer(grpc_call_element *elem, grpc_call_list *call_list) { channel_data *chand = elem->channel_data; return grpc_transport_get_peer(chand->transport); } diff --git a/src/core/channel/http_client_filter.c b/src/core/channel/http_client_filter.c index bcaaca0f7da..4e9eac72ba8 100644 --- a/src/core/channel/http_client_filter.c +++ b/src/core/channel/http_client_filter.c @@ -67,22 +67,26 @@ typedef struct channel_data { grpc_mdelem *user_agent; } channel_data; -/* used to silence 'variable not used' warnings */ -static void ignore_unused(void *ignored) {} +typedef struct { + grpc_call_element *elem; + grpc_call_list *call_list; +} client_filter_args; static grpc_mdelem *client_filter(void *user_data, grpc_mdelem *md) { - grpc_call_element *elem = user_data; + client_filter_args *a = user_data; + grpc_call_element *elem = a->elem; channel_data *channeld = elem->channel_data; if (md == channeld->status) { return NULL; } else if (md->key == channeld->status->key) { - grpc_call_element_send_cancel(elem); + grpc_call_element_send_cancel(elem, a->call_list); return NULL; } return md; } -static void hc_on_recv(void *user_data, int success) { +static void hc_on_recv(void *user_data, int success, + grpc_call_list *call_list) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; size_t i; @@ -90,11 +94,14 @@ static void hc_on_recv(void *user_data, int success) { grpc_stream_op *ops = calld->recv_ops->ops; for (i = 0; i < nops; i++) { grpc_stream_op *op = &ops[i]; + client_filter_args a; if (op->type != GRPC_OP_METADATA) continue; calld->got_initial_metadata = 1; - grpc_metadata_batch_filter(&op->data.metadata, client_filter, elem); + a.elem = elem; + a.call_list = call_list; + grpc_metadata_batch_filter(&op->data.metadata, client_filter, &a); } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success); + calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, call_list); } static grpc_mdelem *client_strip_filter(void *user_data, grpc_mdelem *md) { @@ -148,10 +155,11 @@ static void hc_mutate_op(grpc_call_element *elem, } static void hc_start_transport_op(grpc_call_element *elem, - grpc_transport_stream_op *op) { + grpc_transport_stream_op *op, + grpc_call_list *call_list) { GRPC_CALL_LOG_OP(GPR_INFO, elem, op); hc_mutate_op(elem, op); - grpc_call_next_op(elem, op); + grpc_call_next_op(elem, op, call_list); } /* Constructor for call_data */ @@ -167,14 +175,8 @@ static void init_call_elem(grpc_call_element *elem, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element *elem) { - /* grab pointers to our data from the call element */ - call_data *calld = elem->call_data; - channel_data *channeld = elem->channel_data; - - ignore_unused(calld); - ignore_unused(channeld); -} +static void destroy_call_elem(grpc_call_element *elem, + grpc_call_list *call_list) {} static const char *scheme_from_args(const grpc_channel_args *args) { unsigned i; @@ -241,7 +243,8 @@ static grpc_mdstr *user_agent_from_args(grpc_mdctx *mdctx, /* Constructor for channel_data */ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *channel_args, - grpc_mdctx *mdctx, int is_first, int is_last) { + grpc_mdctx *mdctx, int is_first, int is_last, + grpc_call_list *call_list) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; @@ -264,7 +267,8 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem, + grpc_call_list *call_list) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; diff --git a/src/core/channel/http_server_filter.c b/src/core/channel/http_server_filter.c index 7a9f17d057f..201adf4f35c 100644 --- a/src/core/channel/http_server_filter.c +++ b/src/core/channel/http_server_filter.c @@ -74,8 +74,14 @@ typedef struct channel_data { grpc_mdctx *mdctx; } channel_data; +typedef struct { + grpc_call_element *elem; + grpc_call_list *call_list; +} server_filter_args; + static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { - grpc_call_element *elem = user_data; + server_filter_args *a = user_data; + grpc_call_element *elem = a->elem; channel_data *channeld = elem->channel_data; call_data *calld = elem->call_data; @@ -118,7 +124,7 @@ static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { /* swallow it and error everything out. */ /* TODO(klempner): We ought to generate more descriptive error messages on the wire here. */ - grpc_call_element_send_cancel(elem); + grpc_call_element_send_cancel(elem, a->call_list); return NULL; } else if (md->key == channeld->path_key) { if (calld->seen_path) { @@ -144,7 +150,8 @@ static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { } } -static void hs_on_recv(void *user_data, int success) { +static void hs_on_recv(void *user_data, int success, + grpc_call_list *call_list) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; if (success) { @@ -153,9 +160,12 @@ static void hs_on_recv(void *user_data, int success) { grpc_stream_op *ops = calld->recv_ops->ops; for (i = 0; i < nops; i++) { grpc_stream_op *op = &ops[i]; + server_filter_args a; if (op->type != GRPC_OP_METADATA) continue; calld->got_initial_metadata = 1; - grpc_metadata_batch_filter(&op->data.metadata, server_filter, elem); + a.elem = elem; + a.call_list = call_list; + grpc_metadata_batch_filter(&op->data.metadata, server_filter, &a); /* Have we seen the required http2 transport headers? (:method, :scheme, content-type, with :path and :authority covered at the channel level right now) */ @@ -180,11 +190,11 @@ static void hs_on_recv(void *user_data, int success) { } /* Error this call out */ success = 0; - grpc_call_element_send_cancel(elem); + grpc_call_element_send_cancel(elem, call_list); } } } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success); + calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, call_list); } static void hs_mutate_op(grpc_call_element *elem, @@ -218,10 +228,11 @@ static void hs_mutate_op(grpc_call_element *elem, } static void hs_start_transport_op(grpc_call_element *elem, - grpc_transport_stream_op *op) { + grpc_transport_stream_op *op, + grpc_call_list *call_list) { GRPC_CALL_LOG_OP(GPR_INFO, elem, op); hs_mutate_op(elem, op); - grpc_call_next_op(elem, op); + grpc_call_next_op(elem, op, call_list); } /* Constructor for call_data */ @@ -237,12 +248,14 @@ static void 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_call_element *elem, + grpc_call_list *call_list) {} /* Constructor for channel_data */ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *mdctx, - int is_first, int is_last) { + int is_first, int is_last, + grpc_call_list *call_list) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; @@ -271,7 +284,8 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem, + grpc_call_list *call_list) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; diff --git a/src/core/channel/noop_filter.c b/src/core/channel/noop_filter.c index d631885aafd..d4f1acb4c5c 100644 --- a/src/core/channel/noop_filter.c +++ b/src/core/channel/noop_filter.c @@ -63,11 +63,12 @@ static void noop_mutate_op(grpc_call_element *elem, op contains type and call direction information, in addition to the data that is being sent or received. */ static void noop_start_transport_stream_op(grpc_call_element *elem, - grpc_transport_stream_op *op) { + grpc_transport_stream_op *op, + grpc_call_list *call_list) { noop_mutate_op(elem, op); /* pass control down the stack */ - grpc_call_next_op(elem, op); + grpc_call_next_op(elem, op, call_list); } /* Constructor for call_data */ @@ -85,19 +86,14 @@ static void init_call_elem(grpc_call_element *elem, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element *elem) { - /* grab pointers to our data from the call element */ - call_data *calld = elem->call_data; - channel_data *channeld = elem->channel_data; - - ignore_unused(calld); - ignore_unused(channeld); -} +static void destroy_call_elem(grpc_call_element *elem, + grpc_call_list *call_list) {} /* Constructor for channel_data */ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *mdctx, - int is_first, int is_last) { + int is_first, int is_last, + grpc_call_list *call_list) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; @@ -112,7 +108,8 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem, + grpc_call_list *call_list) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; diff --git a/src/core/client_config/client_config.c b/src/core/client_config/client_config.c index 44538241485..07808804730 100644 --- a/src/core/client_config/client_config.c +++ b/src/core/client_config/client_config.c @@ -51,21 +51,20 @@ grpc_client_config *grpc_client_config_create() { void grpc_client_config_ref(grpc_client_config *c) { gpr_ref(&c->refs); } -void grpc_client_config_unref(grpc_client_config *c) { +void grpc_client_config_unref(grpc_client_config *c, + grpc_call_list *call_list) { if (gpr_unref(&c->refs)) { - GRPC_LB_POLICY_UNREF(c->lb_policy, "client_config"); + GRPC_LB_POLICY_UNREF(c->lb_policy, "client_config", call_list); gpr_free(c); } } void grpc_client_config_set_lb_policy(grpc_client_config *c, grpc_lb_policy *lb_policy) { + GPR_ASSERT(c->lb_policy == NULL); if (lb_policy) { GRPC_LB_POLICY_REF(lb_policy, "client_config"); } - if (c->lb_policy) { - GRPC_LB_POLICY_UNREF(c->lb_policy, "client_config"); - } c->lb_policy = lb_policy; } diff --git a/src/core/client_config/client_config.h b/src/core/client_config/client_config.h index 47612da42cf..76a5c665945 100644 --- a/src/core/client_config/client_config.h +++ b/src/core/client_config/client_config.h @@ -42,7 +42,8 @@ typedef struct grpc_client_config grpc_client_config; grpc_client_config *grpc_client_config_create(); void grpc_client_config_ref(grpc_client_config *client_config); -void grpc_client_config_unref(grpc_client_config *client_config); +void grpc_client_config_unref(grpc_client_config *client_config, + grpc_call_list *call_list); void grpc_client_config_set_lb_policy(grpc_client_config *client_config, grpc_lb_policy *lb_policy); diff --git a/src/core/client_config/connector.c b/src/core/client_config/connector.c index 6252d572715..31f0b84efe6 100644 --- a/src/core/client_config/connector.c +++ b/src/core/client_config/connector.c @@ -44,10 +44,11 @@ void grpc_connector_unref(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(connector, in_args, out_args, notify); + grpc_closure *notify, grpc_call_list *call_list) { + connector->vtable->connect(connector, in_args, out_args, notify, call_list); } -void grpc_connector_shutdown(grpc_connector *connector) { - connector->vtable->shutdown(connector); +void grpc_connector_shutdown(grpc_connector *connector, + grpc_call_list *call_list) { + connector->vtable->shutdown(connector, call_list); } diff --git a/src/core/client_config/connector.h b/src/core/client_config/connector.h index fc1f6708de6..388f656c444 100644 --- a/src/core/client_config/connector.h +++ b/src/core/client_config/connector.h @@ -55,10 +55,6 @@ typedef struct { gpr_timespec deadline; /** channel arguments (to be passed to transport) */ const grpc_channel_args *channel_args; - /** metadata context */ - grpc_mdctx *metadata_context; - /** workqueue */ - grpc_workqueue *workqueue; } grpc_connect_in_args; typedef struct { @@ -71,23 +67,25 @@ typedef struct { struct grpc_connector_vtable { void (*ref)(grpc_connector *connector); - void (*unref)(grpc_connector *connector); + void (*unref)(grpc_connector *connector, grpc_call_list *call_list); /** Implementation of grpc_connector_shutdown */ - void (*shutdown)(grpc_connector *connector); + void (*shutdown)(grpc_connector *connector, grpc_call_list *call_list); /** Implementation of grpc_connector_connect */ void (*connect)(grpc_connector *connector, const grpc_connect_in_args *in_args, - grpc_connect_out_args *out_args, grpc_closure *notify); + grpc_connect_out_args *out_args, grpc_closure *notify, + grpc_call_list *call_list); }; void grpc_connector_ref(grpc_connector *connector); -void grpc_connector_unref(grpc_connector *connector); +void grpc_connector_unref(grpc_connector *connector, grpc_call_list *call_list); /** Connect using the connector: max one outstanding call at a time */ void grpc_connector_connect(grpc_connector *connector, const grpc_connect_in_args *in_args, grpc_connect_out_args *out_args, - grpc_closure *notify); + grpc_closure *notify, grpc_call_list *call_list); /** Cancel any pending connection */ -void grpc_connector_shutdown(grpc_connector *connector); +void grpc_connector_shutdown(grpc_connector *connector, + grpc_call_list *call_list); #endif diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index 852eed310d1..6dc52f43ce7 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -52,8 +52,6 @@ typedef struct { /** all our subchannels */ grpc_subchannel **subchannels; size_t num_subchannels; - /** workqueue for async work */ - grpc_workqueue *workqueue; grpc_closure connectivity_changed; @@ -78,33 +76,34 @@ typedef struct { grpc_connectivity_state_tracker state_tracker; } pick_first_lb_policy; -static void del_interested_parties_locked(pick_first_lb_policy *p) { +static void del_interested_parties_locked(pick_first_lb_policy *p, + grpc_call_list *call_list) { pending_pick *pp; for (pp = p->pending_picks; pp; pp = pp->next) { grpc_subchannel_del_interested_party(p->subchannels[p->checking_subchannel], - pp->pollset); + pp->pollset, call_list); } } -static void add_interested_parties_locked(pick_first_lb_policy *p) { +static void add_interested_parties_locked(pick_first_lb_policy *p, + grpc_call_list *call_list) { pending_pick *pp; for (pp = p->pending_picks; pp; pp = pp->next) { grpc_subchannel_add_interested_party(p->subchannels[p->checking_subchannel], - pp->pollset); + pp->pollset, call_list); } } -void pf_destroy(grpc_lb_policy *pol) { +void pf_destroy(grpc_lb_policy *pol, grpc_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; size_t i; - del_interested_parties_locked(p); + GPR_ASSERT(p->shutdown); for (i = 0; i < p->num_subchannels; i++) { - GRPC_SUBCHANNEL_UNREF(p->subchannels[i], "pick_first"); + GRPC_SUBCHANNEL_UNREF(p->subchannels[i], "pick_first", call_list); } grpc_connectivity_state_destroy(&p->state_tracker); gpr_free(p->subchannels); gpr_mu_destroy(&p->mu); - GRPC_WORKQUEUE_UNREF(p->workqueue, "pick_first"); gpr_free(p); } @@ -112,7 +111,7 @@ void pf_shutdown(grpc_lb_policy *pol, grpc_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; pending_pick *pp; gpr_mu_lock(&p->mu); - del_interested_parties_locked(p); + del_interested_parties_locked(p, call_list); p->shutdown = 1; pp = p->pending_picks; p->pending_picks = NULL; @@ -156,13 +155,13 @@ void pf_pick(grpc_lb_policy *pol, grpc_pollset *pollset, if (p->selected) { gpr_mu_unlock(&p->mu); *target = p->selected; - on_complete->cb(on_complete->cb_arg, 1); + grpc_call_list_add(call_list, on_complete, 1); } else { if (!p->started_picking) { start_picking(p, call_list); } grpc_subchannel_add_interested_party(p->subchannels[p->checking_subchannel], - pollset); + pollset, call_list); pp = gpr_malloc(sizeof(*pp)); pp->next = p->pending_picks; pp->pollset = pollset; @@ -173,58 +172,58 @@ void pf_pick(grpc_lb_policy *pol, grpc_pollset *pollset, } } -static void pf_connectivity_changed(void *arg, int iomgr_success) { +static void pf_connectivity_changed(void *arg, int iomgr_success, + grpc_call_list *call_list) { pick_first_lb_policy *p = arg; pending_pick *pp; - int unref = 0; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_mu_lock(&p->mu); if (p->shutdown) { - unref = 1; + GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity", call_list); } else if (p->selected != NULL) { grpc_connectivity_state_set(&p->state_tracker, p->checking_connectivity, - "selected_changed", &call_list); + "selected_changed", call_list); if (p->checking_connectivity != GRPC_CHANNEL_FATAL_FAILURE) { grpc_subchannel_notify_on_state_change( p->selected, &p->checking_connectivity, &p->connectivity_changed, - &call_list); + call_list); } else { - unref = 1; + GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity", call_list); } } else { loop: switch (p->checking_connectivity) { case GRPC_CHANNEL_READY: grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_READY, - "connecting_ready", &call_list); + "connecting_ready", call_list); p->selected = p->subchannels[p->checking_subchannel]; while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = p->selected; - grpc_subchannel_del_interested_party(p->selected, pp->pollset); - grpc_call_list_add(&call_list, pp->on_complete, 1); + grpc_subchannel_del_interested_party(p->selected, pp->pollset, + call_list); + grpc_call_list_add(call_list, pp->on_complete, 1); gpr_free(pp); } grpc_subchannel_notify_on_state_change( p->selected, &p->checking_connectivity, &p->connectivity_changed, - &call_list); + call_list); break; case GRPC_CHANNEL_TRANSIENT_FAILURE: grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, - "connecting_transient_failure", &call_list); - del_interested_parties_locked(p); + "connecting_transient_failure", call_list); + del_interested_parties_locked(p, call_list); p->checking_subchannel = (p->checking_subchannel + 1) % p->num_subchannels; p->checking_connectivity = grpc_subchannel_check_connectivity( p->subchannels[p->checking_subchannel]); - add_interested_parties_locked(p); + add_interested_parties_locked(p, call_list); if (p->checking_connectivity == GRPC_CHANNEL_TRANSIENT_FAILURE) { grpc_subchannel_notify_on_state_change( p->subchannels[p->checking_subchannel], &p->checking_connectivity, - &p->connectivity_changed, &call_list); + &p->connectivity_changed, call_list); } else { goto loop; } @@ -232,48 +231,43 @@ static void pf_connectivity_changed(void *arg, int iomgr_success) { case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_IDLE: grpc_connectivity_state_set(&p->state_tracker, p->checking_connectivity, - "connecting_changed", &call_list); + "connecting_changed", call_list); grpc_subchannel_notify_on_state_change( p->subchannels[p->checking_subchannel], &p->checking_connectivity, - &p->connectivity_changed, &call_list); + &p->connectivity_changed, call_list); break; case GRPC_CHANNEL_FATAL_FAILURE: - del_interested_parties_locked(p); + del_interested_parties_locked(p, call_list); GPR_SWAP(grpc_subchannel *, p->subchannels[p->checking_subchannel], p->subchannels[p->num_subchannels - 1]); p->num_subchannels--; - GRPC_SUBCHANNEL_UNREF(p->subchannels[p->num_subchannels], "pick_first"); + GRPC_SUBCHANNEL_UNREF(p->subchannels[p->num_subchannels], "pick_first", + call_list); if (p->num_subchannels == 0) { grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, - "no_more_channels", &call_list); + "no_more_channels", call_list); while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = NULL; - grpc_call_list_add(&call_list, pp->on_complete, 1); + grpc_call_list_add(call_list, pp->on_complete, 1); gpr_free(pp); } - unref = 1; + GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity", call_list); } else { grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, - "subchannel_failed", &call_list); + "subchannel_failed", call_list); p->checking_subchannel %= p->num_subchannels; p->checking_connectivity = grpc_subchannel_check_connectivity( p->subchannels[p->checking_subchannel]); - add_interested_parties_locked(p); + add_interested_parties_locked(p, call_list); goto loop; } } } gpr_mu_unlock(&p->mu); - - grpc_call_list_run(call_list); - - if (unref) { - GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity"); - } } static void pf_broadcast(grpc_lb_policy *pol, grpc_transport_op *op, @@ -293,8 +287,8 @@ static void pf_broadcast(grpc_lb_policy *pol, grpc_transport_op *op, gpr_mu_unlock(&p->mu); for (i = 0; i < n; i++) { - grpc_subchannel_process_transport_op(subchannels[i], op); - GRPC_SUBCHANNEL_UNREF(subchannels[i], "pf_broadcast"); + grpc_subchannel_process_transport_op(subchannels[i], op, call_list); + GRPC_SUBCHANNEL_UNREF(subchannels[i], "pf_broadcast", call_list); } gpr_free(subchannels); } @@ -341,8 +335,6 @@ static grpc_lb_policy *create_pick_first(grpc_lb_policy_factory *factory, grpc_lb_policy_init(&p->base, &pick_first_lb_policy_vtable); p->subchannels = gpr_malloc(sizeof(grpc_subchannel *) * args->num_subchannels); p->num_subchannels = args->num_subchannels; - p->workqueue = args->workqueue; - GRPC_WORKQUEUE_REF(p->workqueue, "pick_first"); grpc_connectivity_state_init(&p->state_tracker, GRPC_CHANNEL_IDLE, "pick_first"); memcpy(p->subchannels, args->subchannels, diff --git a/src/core/client_config/lb_policy.c b/src/core/client_config/lb_policy.c index 95ab29cd886..84a033d583e 100644 --- a/src/core/client_config/lb_policy.c +++ b/src/core/client_config/lb_policy.c @@ -51,15 +51,15 @@ void grpc_lb_policy_ref(grpc_lb_policy *policy) { } #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG -void grpc_lb_policy_unref(grpc_lb_policy *policy, const char *file, int line, - const char *reason) { +void grpc_lb_policy_unref(grpc_lb_policy *policy, grpc_call_list *call_list, + const char *file, int line, const char *reason) { gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "LB_POLICY:%p unref %d -> %d %s", policy, (int)policy->refs.count, (int)policy->refs.count - 1, reason); #else -void grpc_lb_policy_unref(grpc_lb_policy *policy) { +void grpc_lb_policy_unref(grpc_lb_policy *policy, grpc_call_list *call_list) { #endif if (gpr_unref(&policy->refs)) { - policy->vtable->destroy(policy); + policy->vtable->destroy(policy, call_list); } } diff --git a/src/core/client_config/lb_policy.h b/src/core/client_config/lb_policy.h index e445d2cded0..f9430b42506 100644 --- a/src/core/client_config/lb_policy.h +++ b/src/core/client_config/lb_policy.h @@ -51,7 +51,7 @@ struct grpc_lb_policy { }; struct grpc_lb_policy_vtable { - void (*destroy)(grpc_lb_policy *policy); + void (*destroy)(grpc_lb_policy *policy, grpc_call_list *call_list); void (*shutdown)(grpc_lb_policy *policy, grpc_call_list *call_list); @@ -82,17 +82,17 @@ struct grpc_lb_policy_vtable { #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG #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(p, r, cl) \ + grpc_lb_policy_unref((p), (cl), __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_lb_policy *policy, grpc_call_list *call_list, + 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(p, r, cl) grpc_lb_policy_unref((p), (cl)) void grpc_lb_policy_ref(grpc_lb_policy *policy); -void grpc_lb_policy_unref(grpc_lb_policy *policy); +void grpc_lb_policy_unref(grpc_lb_policy *policy, grpc_call_list *call_list); #endif /** called by concrete implementations to initialize the base struct */ diff --git a/src/core/client_config/lb_policy_factory.h b/src/core/client_config/lb_policy_factory.h index 755faf88132..04610316ee4 100644 --- a/src/core/client_config/lb_policy_factory.h +++ b/src/core/client_config/lb_policy_factory.h @@ -36,7 +36,6 @@ #include "src/core/client_config/lb_policy.h" #include "src/core/client_config/subchannel.h" -#include "src/core/iomgr/workqueue.h" typedef struct grpc_lb_policy_factory grpc_lb_policy_factory; typedef struct grpc_lb_policy_factory_vtable grpc_lb_policy_factory_vtable; @@ -50,7 +49,6 @@ struct grpc_lb_policy_factory { typedef struct grpc_lb_policy_args { grpc_subchannel **subchannels; size_t num_subchannels; - grpc_workqueue *workqueue; } grpc_lb_policy_args; struct grpc_lb_policy_factory_vtable { diff --git a/src/core/client_config/resolver.c b/src/core/client_config/resolver.c index 6a7d73c54fb..eae8ec6ddf0 100644 --- a/src/core/client_config/resolver.c +++ b/src/core/client_config/resolver.c @@ -40,8 +40,8 @@ void grpc_resolver_init(grpc_resolver *resolver, } #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG -void grpc_resolver_ref(grpc_resolver *resolver, const char *file, int line, - const char *reason) { +void grpc_resolver_ref(grpc_resolver *resolver, grpc_call_list *call_list, + const char *file, int line, const char *reason) { gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "RESOLVER:%p ref %d -> %d %s", resolver, (int)resolver->refs.count, (int)resolver->refs.count + 1, reason); @@ -52,32 +52,34 @@ void grpc_resolver_ref(grpc_resolver *resolver) { } #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG -void grpc_resolver_unref(grpc_resolver *resolver, const char *file, int line, - const char *reason) { +void grpc_resolver_unref(grpc_resolver *resolver, grpc_call_list *call_list, + const char *file, int line, const char *reason) { gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "RESOLVER:%p unref %d -> %d %s", resolver, (int)resolver->refs.count, (int)resolver->refs.count - 1, reason); #else -void grpc_resolver_unref(grpc_resolver *resolver) { +void grpc_resolver_unref(grpc_resolver *resolver, grpc_call_list *call_list) { #endif if (gpr_unref(&resolver->refs)) { - resolver->vtable->destroy(resolver); + resolver->vtable->destroy(resolver, call_list); } } -void grpc_resolver_shutdown(grpc_resolver *resolver) { - resolver->vtable->shutdown(resolver); +void grpc_resolver_shutdown(grpc_resolver *resolver, + grpc_call_list *call_list) { + resolver->vtable->shutdown(resolver, call_list); } void grpc_resolver_channel_saw_error(grpc_resolver *resolver, struct sockaddr *failing_address, - int failing_address_len) { + int failing_address_len, + grpc_call_list *call_list) { resolver->vtable->channel_saw_error(resolver, failing_address, - failing_address_len); + failing_address_len, call_list); } void grpc_resolver_next(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_closure *on_complete) { - resolver->vtable->next(resolver, target_config, on_complete); + grpc_closure *on_complete, grpc_call_list *call_list) { + resolver->vtable->next(resolver, target_config, on_complete, call_list); } diff --git a/src/core/client_config/resolver.h b/src/core/client_config/resolver.h index 217d061abee..7960bcb92f4 100644 --- a/src/core/client_config/resolver.h +++ b/src/core/client_config/resolver.h @@ -49,40 +49,41 @@ struct grpc_resolver { }; struct grpc_resolver_vtable { - void (*destroy)(grpc_resolver *resolver); - void (*shutdown)(grpc_resolver *resolver); + void (*destroy)(grpc_resolver *resolver, grpc_call_list *call_list); + void (*shutdown)(grpc_resolver *resolver, grpc_call_list *call_list); void (*channel_saw_error)(grpc_resolver *resolver, struct sockaddr *failing_address, - int failing_address_len); + int failing_address_len, grpc_call_list *call_list); void (*next)(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_closure *on_complete); + grpc_closure *on_complete, grpc_call_list *call_list); }; #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG #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(p, r, cl) \ + grpc_resolver_unref((p), (cl), __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_resolver *policy, grpc_call_list *call_list, + 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(p, r, cl) grpc_resolver_unref((p), (cl)) void grpc_resolver_ref(grpc_resolver *policy); -void grpc_resolver_unref(grpc_resolver *policy); +void grpc_resolver_unref(grpc_resolver *policy, grpc_call_list *call_list); #endif void grpc_resolver_init(grpc_resolver *resolver, const grpc_resolver_vtable *vtable); -void grpc_resolver_shutdown(grpc_resolver *resolver); +void grpc_resolver_shutdown(grpc_resolver *resolver, grpc_call_list *call_list); /** Notification that the channel has seen an error on some address. Can be used as a hint that re-resolution is desirable soon. */ void grpc_resolver_channel_saw_error(grpc_resolver *resolver, struct sockaddr *failing_address, - int failing_address_len); + int failing_address_len, + grpc_call_list *call_list); /** Get the next client config. Called by the channel to fetch a new configuration. Expected to set *target_config with a new configuration, @@ -92,6 +93,6 @@ void grpc_resolver_channel_saw_error(grpc_resolver *resolver, schedule on_complete. */ void grpc_resolver_next(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_closure *on_complete); + grpc_closure *on_complete, grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_CONFIG_RESOLVER_H */ diff --git a/src/core/client_config/resolver_factory.h b/src/core/client_config/resolver_factory.h index 24da84d89d0..4c4df353f7c 100644 --- a/src/core/client_config/resolver_factory.h +++ b/src/core/client_config/resolver_factory.h @@ -37,7 +37,6 @@ #include "src/core/client_config/resolver.h" #include "src/core/client_config/subchannel_factory.h" #include "src/core/client_config/uri_parser.h" -#include "src/core/iomgr/workqueue.h" typedef struct grpc_resolver_factory grpc_resolver_factory; typedef struct grpc_resolver_factory_vtable grpc_resolver_factory_vtable; @@ -51,7 +50,6 @@ struct grpc_resolver_factory { typedef struct grpc_resolver_args { grpc_uri *uri; grpc_subchannel_factory *subchannel_factory; - grpc_workqueue *workqueue; } grpc_resolver_args; struct grpc_resolver_factory_vtable { diff --git a/src/core/client_config/resolver_registry.c b/src/core/client_config/resolver_registry.c index 3611252bda9..89a945c2d31 100644 --- a/src/core/client_config/resolver_registry.c +++ b/src/core/client_config/resolver_registry.c @@ -114,9 +114,8 @@ static grpc_resolver_factory *resolve_factory(const char *target, return factory; } -grpc_resolver *grpc_resolver_create(const char *target, - grpc_subchannel_factory *subchannel_factory, - grpc_workqueue *workqueue) { +grpc_resolver *grpc_resolver_create( + const char *target, grpc_subchannel_factory *subchannel_factory) { grpc_uri *uri = NULL; grpc_resolver_factory *factory = resolve_factory(target, &uri); grpc_resolver *resolver; @@ -124,7 +123,6 @@ grpc_resolver *grpc_resolver_create(const char *target, memset(&args, 0, sizeof(args)); args.uri = uri; args.subchannel_factory = subchannel_factory; - args.workqueue = workqueue; resolver = grpc_resolver_factory_create_resolver(factory, &args); grpc_uri_destroy(uri); return resolver; diff --git a/src/core/client_config/resolver_registry.h b/src/core/client_config/resolver_registry.h index 9a9a6282627..5a7193b7ae2 100644 --- a/src/core/client_config/resolver_registry.h +++ b/src/core/client_config/resolver_registry.h @@ -55,9 +55,8 @@ void grpc_register_resolver_type(grpc_resolver_factory *factory); If a resolver factory was found, use it to instantiate a resolver and return it. If a resolver factory was not found, return NULL. */ -grpc_resolver *grpc_resolver_create(const char *target, - grpc_subchannel_factory *subchannel_factory, - grpc_workqueue *workqueue); +grpc_resolver *grpc_resolver_create( + const char *target, grpc_subchannel_factory *subchannel_factory); /** Given a target, return a (freshly allocated with gpr_malloc) string representing the default authority to pass from a client. */ diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index e251664e03e..9e9b3d49177 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -49,8 +49,6 @@ typedef struct { grpc_resolver base; /** refcount */ gpr_refcount refs; - /** workqueue */ - grpc_workqueue *workqueue; /** name to resolve */ char *name; /** default port to use */ @@ -76,37 +74,36 @@ typedef struct { grpc_client_config *resolved_config; } dns_resolver; -static void dns_destroy(grpc_resolver *r); +static void dns_destroy(grpc_resolver *r, grpc_call_list *call_list); static void dns_start_resolving_locked(dns_resolver *r); -static grpc_closure *dns_maybe_finish_next_locked(dns_resolver *r) - GRPC_MUST_USE_RESULT; +static void dns_maybe_finish_next_locked(dns_resolver *r, + grpc_call_list *call_list); -static void dns_shutdown(grpc_resolver *r); +static void dns_shutdown(grpc_resolver *r, grpc_call_list *call_list); static void dns_channel_saw_error(grpc_resolver *r, struct sockaddr *failing_address, - int failing_address_len); + int failing_address_len, + grpc_call_list *call_list); static void dns_next(grpc_resolver *r, grpc_client_config **target_config, - grpc_closure *on_complete); + grpc_closure *on_complete, grpc_call_list *call_list); static const grpc_resolver_vtable dns_resolver_vtable = { dns_destroy, dns_shutdown, dns_channel_saw_error, dns_next}; -static void dns_shutdown(grpc_resolver *resolver) { +static void dns_shutdown(grpc_resolver *resolver, grpc_call_list *call_list) { dns_resolver *r = (dns_resolver *)resolver; - grpc_closure *next_completion; gpr_mu_lock(&r->mu); - next_completion = r->next_completion; - r->next_completion = NULL; - gpr_mu_unlock(&r->mu); - if (next_completion != NULL) { + if (r->next_completion != NULL) { *r->target_config = NULL; - next_completion->cb(next_completion->cb_arg, 1); + grpc_call_list_add(call_list, r->next_completion, 1); + r->next_completion = NULL; } + gpr_mu_unlock(&r->mu); } static void dns_channel_saw_error(grpc_resolver *resolver, struct sockaddr *sa, - int len) { + int len, grpc_call_list *call_list) { dns_resolver *r = (dns_resolver *)resolver; gpr_mu_lock(&r->mu); if (!r->resolving) { @@ -117,9 +114,8 @@ static void dns_channel_saw_error(grpc_resolver *resolver, struct sockaddr *sa, static void dns_next(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_closure *on_complete) { + grpc_closure *on_complete, grpc_call_list *call_list) { dns_resolver *r = (dns_resolver *)resolver; - grpc_closure *call = NULL; gpr_mu_lock(&r->mu); GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; @@ -127,21 +123,18 @@ static void dns_next(grpc_resolver *resolver, if (r->resolved_version == 0 && !r->resolving) { dns_start_resolving_locked(r); } else { - call = dns_maybe_finish_next_locked(r); + dns_maybe_finish_next_locked(r, call_list); } gpr_mu_unlock(&r->mu); - if (call) { - call->cb(call->cb_arg, 1); - } } -static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses) { +static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses, + grpc_call_list *call_list) { dns_resolver *r = arg; grpc_client_config *config = NULL; grpc_subchannel **subchannels; grpc_subchannel_args args; grpc_lb_policy *lb_policy; - grpc_closure *call; size_t i; if (addresses) { grpc_lb_policy_args lb_policy_args; @@ -157,10 +150,9 @@ static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses) { memset(&lb_policy_args, 0, sizeof(lb_policy_args)); lb_policy_args.subchannels = subchannels; lb_policy_args.num_subchannels = addresses->naddrs; - lb_policy_args.workqueue = r->workqueue; lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); grpc_client_config_set_lb_policy(config, lb_policy); - GRPC_LB_POLICY_UNREF(lb_policy, "construction"); + GRPC_LB_POLICY_UNREF(lb_policy, "construction", call_list); grpc_resolved_addresses_destroy(addresses); gpr_free(subchannels); } @@ -168,17 +160,14 @@ static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses) { GPR_ASSERT(r->resolving); r->resolving = 0; if (r->resolved_config) { - grpc_client_config_unref(r->resolved_config); + grpc_client_config_unref(r->resolved_config, call_list); } r->resolved_config = config; r->resolved_version++; - call = dns_maybe_finish_next_locked(r); + dns_maybe_finish_next_locked(r, call_list); gpr_mu_unlock(&r->mu); - if (call) { - call->cb(call->cb_arg, 1); - } - GRPC_RESOLVER_UNREF(&r->base, "dns-resolving"); + GRPC_RESOLVER_UNREF(&r->base, "dns-resolving", call_list); } static void dns_start_resolving_locked(dns_resolver *r) { @@ -188,29 +177,27 @@ static void dns_start_resolving_locked(dns_resolver *r) { grpc_resolve_address(r->name, r->default_port, dns_on_resolved, r); } -static grpc_closure *dns_maybe_finish_next_locked(dns_resolver *r) { - grpc_closure *ret = NULL; +static void dns_maybe_finish_next_locked(dns_resolver *r, + grpc_call_list *call_list) { if (r->next_completion != NULL && r->resolved_version != r->published_version) { *r->target_config = r->resolved_config; if (r->resolved_config) { grpc_client_config_ref(r->resolved_config); } - ret = r->next_completion; + grpc_call_list_add(call_list, r->next_completion, 1); r->next_completion = NULL; r->published_version = r->resolved_version; } - return ret; } -static void dns_destroy(grpc_resolver *gr) { +static void dns_destroy(grpc_resolver *gr, grpc_call_list *call_list) { dns_resolver *r = (dns_resolver *)gr; gpr_mu_destroy(&r->mu); if (r->resolved_config) { - grpc_client_config_unref(r->resolved_config); + grpc_client_config_unref(r->resolved_config, call_list); } grpc_subchannel_factory_unref(r->subchannel_factory); - GRPC_WORKQUEUE_UNREF(r->workqueue, "dns"); gpr_free(r->name); gpr_free(r->default_port); gpr_free(r->lb_policy_name); @@ -239,8 +226,6 @@ static grpc_resolver *dns_create(grpc_resolver_args *args, r->default_port = gpr_strdup(default_port); r->subchannel_factory = args->subchannel_factory; grpc_subchannel_factory_ref(r->subchannel_factory); - r->workqueue = args->workqueue; - GRPC_WORKQUEUE_REF(r->workqueue, "dns"); r->lb_policy_name = gpr_strdup(lb_policy_name); return &r->base; } diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index 47fe5fad4a1..15eb60b93a6 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -56,8 +56,6 @@ typedef struct { gpr_refcount refs; /** subchannel factory */ grpc_subchannel_factory *subchannel_factory; - /** workqueue */ - grpc_workqueue *workqueue; /** load balancing policy name */ char *lb_policy_name; @@ -78,61 +76,59 @@ typedef struct { grpc_client_config **target_config; } sockaddr_resolver; -static void sockaddr_destroy(grpc_resolver *r); +static void sockaddr_destroy(grpc_resolver *r, grpc_call_list *call_list); -static grpc_closure *sockaddr_maybe_finish_next_locked(sockaddr_resolver *r) - GRPC_MUST_USE_RESULT; +static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r, + grpc_call_list *call_list); -static void sockaddr_shutdown(grpc_resolver *r); +static void sockaddr_shutdown(grpc_resolver *r, grpc_call_list *call_list); static void sockaddr_channel_saw_error(grpc_resolver *r, struct sockaddr *failing_address, - int failing_address_len); + int failing_address_len, + grpc_call_list *call_list); static void sockaddr_next(grpc_resolver *r, grpc_client_config **target_config, - grpc_closure *on_complete); + grpc_closure *on_complete, grpc_call_list *call_list); static const grpc_resolver_vtable sockaddr_resolver_vtable = { sockaddr_destroy, sockaddr_shutdown, sockaddr_channel_saw_error, sockaddr_next}; -static void sockaddr_shutdown(grpc_resolver *resolver) { +static void sockaddr_shutdown(grpc_resolver *resolver, + grpc_call_list *call_list) { sockaddr_resolver *r = (sockaddr_resolver *)resolver; - grpc_closure *call = NULL; gpr_mu_lock(&r->mu); if (r->next_completion != NULL) { *r->target_config = NULL; - call = r->next_completion; + grpc_call_list_add(call_list, r->next_completion, 1); r->next_completion = NULL; } gpr_mu_unlock(&r->mu); - if (call) { - call->cb(call->cb_arg, 1); - } } static void sockaddr_channel_saw_error(grpc_resolver *resolver, - struct sockaddr *sa, int len) {} + struct sockaddr *sa, int len, + grpc_call_list *call_list) {} static void sockaddr_next(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_closure *on_complete) { + grpc_closure *on_complete, + grpc_call_list *call_list) { sockaddr_resolver *r = (sockaddr_resolver *)resolver; - grpc_closure *call = NULL; gpr_mu_lock(&r->mu); GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; r->target_config = target_config; - call = sockaddr_maybe_finish_next_locked(r); + sockaddr_maybe_finish_next_locked(r, call_list); gpr_mu_unlock(&r->mu); - if (call) call->cb(call->cb_arg, 1); } -static grpc_closure *sockaddr_maybe_finish_next_locked(sockaddr_resolver *r) { +static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r, + grpc_call_list *call_list) { grpc_client_config *cfg; grpc_lb_policy *lb_policy; grpc_lb_policy_args lb_policy_args; grpc_subchannel **subchannels; grpc_subchannel_args args; - grpc_closure *call = NULL; if (r->next_completion != NULL && !r->published) { size_t i; @@ -148,26 +144,22 @@ static grpc_closure *sockaddr_maybe_finish_next_locked(sockaddr_resolver *r) { memset(&lb_policy_args, 0, sizeof(lb_policy_args)); lb_policy_args.subchannels = subchannels; lb_policy_args.num_subchannels = r->num_addrs; - lb_policy_args.workqueue = r->workqueue; lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); gpr_free(subchannels); grpc_client_config_set_lb_policy(cfg, lb_policy); - GRPC_LB_POLICY_UNREF(lb_policy, "unix"); + GRPC_LB_POLICY_UNREF(lb_policy, "sockaddr", call_list); r->published = 1; *r->target_config = cfg; - call = r->next_completion; + grpc_call_list_add(call_list, r->next_completion, 1); r->next_completion = NULL; } - - return call; } -static void sockaddr_destroy(grpc_resolver *gr) { +static void sockaddr_destroy(grpc_resolver *gr, grpc_call_list *call_list) { sockaddr_resolver *r = (sockaddr_resolver *)gr; gpr_mu_destroy(&r->mu); grpc_subchannel_factory_unref(r->subchannel_factory); - GRPC_WORKQUEUE_UNREF(r->workqueue, "sockaddr"); gpr_free(r->addrs); gpr_free(r->addrs_len); gpr_free(r->lb_policy_name); @@ -340,8 +332,6 @@ static grpc_resolver *sockaddr_create( grpc_resolver_init(&r->base, &sockaddr_resolver_vtable); r->subchannel_factory = args->subchannel_factory; grpc_subchannel_factory_ref(r->subchannel_factory); - r->workqueue = args->workqueue; - GRPC_WORKQUEUE_REF(r->workqueue, "sockaddr"); r->lb_policy_name = gpr_strdup(lb_policy_name); return &r->base; diff --git a/src/core/client_config/resolvers/zookeeper_resolver.c b/src/core/client_config/resolvers/zookeeper_resolver.c index 5632f0425e4..c785e769396 100644 --- a/src/core/client_config/resolvers/zookeeper_resolver.c +++ b/src/core/client_config/resolvers/zookeeper_resolver.c @@ -61,8 +61,6 @@ typedef struct { grpc_subchannel_factory *subchannel_factory; /** load balancing policy name */ char *lb_policy_name; - /** work queue */ - grpc_workqueue *workqueue; /** mutex guarding the rest of the state */ gpr_mu mu; @@ -436,7 +434,6 @@ static void zookeeper_destroy(grpc_resolver *gr) { grpc_client_config_unref(r->resolved_config); } grpc_subchannel_factory_unref(r->subchannel_factory); - grpc_workqueue_unref(r->workqueue); gpr_free(r->name); gpr_free(r->lb_policy_name); gpr_free(r); @@ -466,9 +463,6 @@ static grpc_resolver *zookeeper_create(grpc_resolver_args *args, grpc_resolver_init(&r->base, &zookeeper_resolver_vtable); r->name = gpr_strdup(path); - r->workqueue = args->workqueue; - grpc_workqueue_ref(r->workqueue); - r->subchannel_factory = args->subchannel_factory; grpc_subchannel_factory_ref(r->subchannel_factory); diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index 99310e02e53..937b3cd71c5 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -76,7 +76,6 @@ typedef struct waiting_for_connect { struct grpc_subchannel { grpc_connector *connector; - grpc_workqueue *workqueue; /** non-transport related channel filters */ const grpc_channel_filter **filters; @@ -150,7 +149,8 @@ static void connectivity_state_changed_locked(grpc_subchannel *c, grpc_call_list *call_list); static grpc_connectivity_state compute_connectivity_locked(grpc_subchannel *c); static gpr_timespec compute_connect_deadline(grpc_subchannel *c); -static void subchannel_connected(void *subchannel, int iomgr_success); +static void subchannel_connected(void *subchannel, int iomgr_success, + grpc_call_list *call_list); static void subchannel_ref_locked( grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); @@ -158,8 +158,9 @@ static int subchannel_unref_locked( grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; static void connection_ref_locked(connection *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); static grpc_subchannel *connection_unref_locked( - connection *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; -static void subchannel_destroy(grpc_subchannel *c); + connection *c, grpc_call_list *call_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) + GRPC_MUST_USE_RESULT; +static void subchannel_destroy(grpc_subchannel *c, grpc_call_list *call_list); #ifdef GRPC_SUBCHANNEL_REFCOUNT_DEBUG #define SUBCHANNEL_REF_LOCKED(p, r) \ @@ -168,8 +169,8 @@ static void subchannel_destroy(grpc_subchannel *c); subchannel_unref_locked((p), __FILE__, __LINE__, (r)) #define CONNECTION_REF_LOCKED(p, r) \ connection_ref_locked((p), __FILE__, __LINE__, (r)) -#define CONNECTION_UNREF_LOCKED(p, r) \ - connection_unref_locked((p), __FILE__, __LINE__, (r)) +#define CONNECTION_UNREF_LOCKED(p, r, cl) \ + connection_unref_locked((p), (cl), __FILE__, __LINE__, (r)) #define REF_PASS_ARGS , file, line, reason #define REF_LOG(name, p) \ gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "%s: %p ref %d -> %d %s", \ @@ -181,7 +182,7 @@ static void subchannel_destroy(grpc_subchannel *c); #define SUBCHANNEL_REF_LOCKED(p, r) subchannel_ref_locked((p)) #define SUBCHANNEL_UNREF_LOCKED(p, r) subchannel_unref_locked((p)) #define CONNECTION_REF_LOCKED(p, r) connection_ref_locked((p)) -#define CONNECTION_UNREF_LOCKED(p, r) connection_unref_locked((p)) +#define CONNECTION_UNREF_LOCKED(p, r, cl) connection_unref_locked((p), (cl)) #define REF_PASS_ARGS #define REF_LOG(name, p) \ do { \ @@ -195,9 +196,9 @@ static void subchannel_destroy(grpc_subchannel *c); * connection implementation */ -static void connection_destroy(connection *c) { +static void connection_destroy(connection *c, grpc_call_list *call_list) { GPR_ASSERT(c->refs == 0); - grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CONNECTION(c)); + grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CONNECTION(c), call_list); gpr_free(c); } @@ -209,14 +210,14 @@ static void connection_ref_locked( } static grpc_subchannel *connection_unref_locked( - connection *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { + connection *c, grpc_call_list *call_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { grpc_subchannel *destroy = NULL; UNREF_LOG("CONNECTION", c); if (subchannel_unref_locked(c->subchannel REF_PASS_ARGS)) { destroy = c->subchannel; } if (--c->refs == 0 && c->subchannel->active != c) { - connection_destroy(c); + connection_destroy(c, call_list); } return destroy; } @@ -243,17 +244,19 @@ void grpc_subchannel_ref(grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { gpr_mu_unlock(&c->mu); } -void grpc_subchannel_unref(grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { +void grpc_subchannel_unref(grpc_subchannel *c, + grpc_call_list *call_list + GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { int destroy; gpr_mu_lock(&c->mu); destroy = subchannel_unref_locked(c REF_PASS_ARGS); gpr_mu_unlock(&c->mu); - if (destroy) subchannel_destroy(c); + if (destroy) subchannel_destroy(c, call_list); } -static void subchannel_destroy(grpc_subchannel *c) { +static void subchannel_destroy(grpc_subchannel *c, grpc_call_list *call_list) { if (c->active != NULL) { - connection_destroy(c->active); + connection_destroy(c->active, call_list); } gpr_free(c->filters); grpc_channel_args_destroy(c->args); @@ -261,18 +264,19 @@ static void subchannel_destroy(grpc_subchannel *c) { grpc_mdctx_unref(c->mdctx); grpc_connectivity_state_destroy(&c->state_tracker); grpc_connector_unref(c->connector); - GRPC_WORKQUEUE_UNREF(c->workqueue, "subchannel"); gpr_free(c); } void grpc_subchannel_add_interested_party(grpc_subchannel *c, - grpc_pollset *pollset) { - grpc_pollset_set_add_pollset(c->pollset_set, pollset); + grpc_pollset *pollset, + grpc_call_list *call_list) { + grpc_pollset_set_add_pollset(c->pollset_set, pollset, call_list); } void grpc_subchannel_del_interested_party(grpc_subchannel *c, - grpc_pollset *pollset) { - grpc_pollset_set_del_pollset(c->pollset_set, pollset); + grpc_pollset *pollset, + grpc_call_list *call_list) { + grpc_pollset_set_del_pollset(c->pollset_set, pollset, call_list); } static gpr_uint32 random_seed() { @@ -298,8 +302,6 @@ grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, c->args = grpc_channel_args_copy(args->args); c->mdctx = args->mdctx; c->master = args->master; - c->workqueue = grpc_channel_get_workqueue(c->master); - GRPC_WORKQUEUE_REF(c->workqueue, "subchannel"); c->pollset_set = grpc_client_channel_get_connecting_pollset_set(parent_elem); c->random = random_seed(); grpc_mdctx_ref(c->mdctx); @@ -310,7 +312,7 @@ grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, return c; } -static void continue_connect(grpc_subchannel *c) { +static void continue_connect(grpc_subchannel *c, grpc_call_list *call_list) { grpc_connect_in_args args; args.interested_parties = c->pollset_set; @@ -321,24 +323,25 @@ static void continue_connect(grpc_subchannel *c) { args.metadata_context = c->mdctx; grpc_connector_connect(c->connector, &args, &c->connecting_result, - &c->connected); + &c->connected, call_list); } -static void start_connect(grpc_subchannel *c) { +static void start_connect(grpc_subchannel *c, grpc_call_list *call_list) { c->backoff_delta = gpr_time_from_seconds( GRPC_SUBCHANNEL_INITIAL_CONNECT_BACKOFF_SECONDS, GPR_TIMESPAN); c->next_attempt = gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), c->backoff_delta); - continue_connect(c); + continue_connect(c, call_list); } -static void continue_creating_call(void *arg, int iomgr_success) { +static void continue_creating_call(void *arg, int iomgr_success, + grpc_call_list *call_list) { waiting_for_connect *w4c = arg; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; - grpc_subchannel_del_interested_party(w4c->subchannel, w4c->pollset); + grpc_subchannel_del_interested_party(w4c->subchannel, w4c->pollset, + call_list); grpc_subchannel_create_call(w4c->subchannel, w4c->pollset, w4c->target, - w4c->notify, &call_list); - GRPC_SUBCHANNEL_UNREF(w4c->subchannel, "waiting_for_connect"); + w4c->notify, call_list); + GRPC_SUBCHANNEL_UNREF(w4c->subchannel, "waiting_for_connect", call_list); gpr_free(w4c); } @@ -354,7 +357,7 @@ void grpc_subchannel_create_call(grpc_subchannel *c, grpc_pollset *pollset, gpr_mu_unlock(&c->mu); *target = create_call(con); - notify->cb(notify->cb_arg, 1); + notify->cb(notify->cb_arg, 1, call_list); } else { waiting_for_connect *w4c = gpr_malloc(sizeof(*w4c)); w4c->next = c->waiting; @@ -366,7 +369,7 @@ void grpc_subchannel_create_call(grpc_subchannel *c, grpc_pollset *pollset, SUBCHANNEL_REF_LOCKED(c, "waiting_for_connect"); grpc_closure_init(&w4c->continuation, continue_creating_call, w4c); c->waiting = w4c; - grpc_subchannel_add_interested_party(c, pollset); + grpc_subchannel_add_interested_party(c, pollset, call_list); if (!c->connecting) { c->connecting = 1; connectivity_state_changed_locked(c, "create_call", call_list); @@ -375,7 +378,7 @@ void grpc_subchannel_create_call(grpc_subchannel *c, grpc_pollset *pollset, GRPC_CHANNEL_INTERNAL_REF(c->master, "connecting"); gpr_mu_unlock(&c->mu); - start_connect(c); + start_connect(c, call_list); } else { gpr_mu_unlock(&c->mu); } @@ -408,16 +411,16 @@ void grpc_subchannel_notify_on_state_change(grpc_subchannel *c, gpr_mu_unlock(&c->mu); if (do_connect) { - start_connect(c); + start_connect(c, call_list); } } void grpc_subchannel_process_transport_op(grpc_subchannel *c, - grpc_transport_op *op) { + grpc_transport_op *op, + grpc_call_list *call_list) { connection *con = NULL; grpc_subchannel *destroy; int cancel_alarm = 0; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_mu_lock(&c->mu); if (c->active != NULL) { con = c->active; @@ -425,7 +428,7 @@ void grpc_subchannel_process_transport_op(grpc_subchannel *c, } if (op->disconnect) { c->disconnected = 1; - connectivity_state_changed_locked(c, "disconnect", &call_list); + connectivity_state_changed_locked(c, "disconnect", call_list); if (c->have_alarm) { cancel_alarm = 1; } @@ -436,28 +439,27 @@ void grpc_subchannel_process_transport_op(grpc_subchannel *c, 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(top_elem, op, call_list); gpr_mu_lock(&c->mu); - destroy = CONNECTION_UNREF_LOCKED(con, "transport-op"); + destroy = CONNECTION_UNREF_LOCKED(con, "transport-op", call_list); gpr_mu_unlock(&c->mu); if (destroy) { - subchannel_destroy(destroy); + subchannel_destroy(destroy, call_list); } } if (cancel_alarm) { - grpc_alarm_cancel(&c->alarm); + grpc_alarm_cancel(&c->alarm, call_list); } if (op->disconnect) { - grpc_connector_shutdown(c->connector); + grpc_connector_shutdown(c->connector, call_list); } - - grpc_call_list_run(call_list); } -static void on_state_changed(void *p, int iomgr_success) { +static void on_state_changed(void *p, int iomgr_success, + grpc_call_list *call_list) { state_watcher *sw = p; grpc_subchannel *c = sw->subchannel; gpr_mu *mu = &c->mu; @@ -465,7 +467,6 @@ static void on_state_changed(void *p, int iomgr_success) { grpc_transport_op op; grpc_channel_element *elem; connection *destroy_connection = NULL; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_mu_lock(mu); @@ -485,7 +486,7 @@ static void on_state_changed(void *p, int iomgr_success) { op.on_connectivity_state_change = &sw->closure; elem = grpc_channel_stack_element( CHANNEL_STACK_FROM_CONNECTION(c->active), 0); - elem->filter->start_transport_op(elem, &op); + elem->filter->start_transport_op(elem, &op, call_list); /* early out */ gpr_mu_unlock(mu); return; @@ -499,22 +500,21 @@ static void on_state_changed(void *p, int iomgr_success) { grpc_connectivity_state_set( &c->state_tracker, c->disconnected ? GRPC_CHANNEL_FATAL_FAILURE : GRPC_CHANNEL_TRANSIENT_FAILURE, - "connection_failed", &call_list); + "connection_failed", call_list); break; } done: - connectivity_state_changed_locked(c, "transport_state_changed", &call_list); + connectivity_state_changed_locked(c, "transport_state_changed", call_list); destroy = SUBCHANNEL_UNREF_LOCKED(c, "state_watcher"); gpr_free(sw); gpr_mu_unlock(mu); if (destroy) { - subchannel_destroy(c); + subchannel_destroy(c, call_list); } if (destroy_connection != NULL) { - connection_destroy(destroy_connection); + connection_destroy(destroy_connection, call_list); } - grpc_call_list_run(call_list); } static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { @@ -544,7 +544,7 @@ static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { con->refs = 0; con->subchannel = c; grpc_channel_stack_init(filters, num_filters, c->master, c->args, c->mdctx, - stk); + stk, call_list); grpc_connected_channel_bind_transport(stk, c->connecting_result.transport); gpr_free(c->connecting_result.filters); memset(&c->connecting_result, 0, sizeof(c->connecting_result)); @@ -561,9 +561,9 @@ static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { gpr_mu_unlock(&c->mu); gpr_free(sw); gpr_free(filters); - grpc_channel_stack_destroy(stk); + grpc_channel_stack_destroy(stk, call_list); GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting"); - GRPC_SUBCHANNEL_UNREF(c, "connecting"); + GRPC_SUBCHANNEL_UNREF(c, "connecting", call_list); return; } @@ -587,7 +587,7 @@ static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { GPR_ASSERT(!SUBCHANNEL_UNREF_LOCKED(c, "connecting")); elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CONNECTION(c->active), 0); - elem->filter->start_transport_op(elem, &op); + elem->filter->start_transport_op(elem, &op, call_list); /* signal completion */ connectivity_state_changed_locked(c, "connected", call_list); @@ -605,7 +605,7 @@ static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { gpr_free(filters); if (destroy_connection != NULL) { - connection_destroy(destroy_connection); + connection_destroy(destroy_connection, call_list); } } @@ -638,41 +638,38 @@ static void update_reconnect_parameters(grpc_subchannel *c) { gpr_time_add(c->next_attempt, gpr_time_from_millis(jitter, GPR_TIMESPAN)); } -static void on_alarm(void *arg, int iomgr_success) { +static void on_alarm(void *arg, int iomgr_success, grpc_call_list *call_list) { grpc_subchannel *c = arg; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_mu_lock(&c->mu); c->have_alarm = 0; if (c->disconnected) { iomgr_success = 0; } - connectivity_state_changed_locked(c, "alarm", &call_list); + connectivity_state_changed_locked(c, "alarm", call_list); gpr_mu_unlock(&c->mu); if (iomgr_success) { update_reconnect_parameters(c); - continue_connect(c); + continue_connect(c, call_list); } else { GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting"); - GRPC_SUBCHANNEL_UNREF(c, "connecting"); + GRPC_SUBCHANNEL_UNREF(c, "connecting", call_list); } - grpc_call_list_run(call_list); } -static void subchannel_connected(void *arg, int iomgr_success) { +static void subchannel_connected(void *arg, int iomgr_success, + grpc_call_list *call_list) { grpc_subchannel *c = arg; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; if (c->connecting_result.transport != NULL) { - publish_transport(c, &call_list); + publish_transport(c, call_list); } else { gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); gpr_mu_lock(&c->mu); GPR_ASSERT(!c->have_alarm); c->have_alarm = 1; - connectivity_state_changed_locked(c, "connect_failed", &call_list); - grpc_alarm_init(&c->alarm, c->next_attempt, on_alarm, c, now); + connectivity_state_changed_locked(c, "connect_failed", call_list); + grpc_alarm_init(&c->alarm, c->next_attempt, on_alarm, c, now, call_list); gpr_mu_unlock(&c->mu); } - grpc_call_list_run(call_list); } static gpr_timespec compute_connect_deadline(grpc_subchannel *c) { @@ -718,33 +715,36 @@ void grpc_subchannel_call_ref( gpr_ref(&c->refs); } -void grpc_subchannel_call_unref( - grpc_subchannel_call *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { +void grpc_subchannel_call_unref(grpc_subchannel_call *c, + grpc_call_list *call_list + GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { if (gpr_unref(&c->refs)) { gpr_mu *mu = &c->connection->subchannel->mu; grpc_subchannel *destroy; - grpc_call_stack_destroy(SUBCHANNEL_CALL_TO_CALL_STACK(c)); + grpc_call_stack_destroy(SUBCHANNEL_CALL_TO_CALL_STACK(c), call_list); gpr_mu_lock(mu); - destroy = CONNECTION_UNREF_LOCKED(c->connection, "call"); + destroy = CONNECTION_UNREF_LOCKED(c->connection, "call", call_list); gpr_mu_unlock(mu); gpr_free(c); if (destroy != NULL) { - subchannel_destroy(destroy); + subchannel_destroy(destroy, call_list); } } } -char *grpc_subchannel_call_get_peer(grpc_subchannel_call *call) { +char *grpc_subchannel_call_get_peer(grpc_subchannel_call *call, + grpc_call_list *call_list) { grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK(call); grpc_call_element *top_elem = grpc_call_stack_element(call_stack, 0); - return top_elem->filter->get_peer(top_elem); + return top_elem->filter->get_peer(top_elem, call_list); } void grpc_subchannel_call_process_op(grpc_subchannel_call *call, - grpc_transport_stream_op *op) { + grpc_transport_stream_op *op, + grpc_call_list *call_list) { grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK(call); grpc_call_element *top_elem = grpc_call_stack_element(call_stack, 0); - top_elem->filter->start_transport_stream_op(top_elem, op); + top_elem->filter->start_transport_stream_op(top_elem, op, call_list); } grpc_subchannel_call *create_call(connection *con) { diff --git a/src/core/client_config/subchannel.h b/src/core/client_config/subchannel.h index 189e531d35e..0ebfc7c29ae 100644 --- a/src/core/client_config/subchannel.h +++ b/src/core/client_config/subchannel.h @@ -47,30 +47,33 @@ typedef struct grpc_subchannel_args grpc_subchannel_args; #ifdef GRPC_SUBCHANNEL_REFCOUNT_DEBUG #define GRPC_SUBCHANNEL_REF(p, r) \ grpc_subchannel_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_UNREF(p, r) \ - grpc_subchannel_unref((p), __FILE__, __LINE__, (r)) +#define GRPC_SUBCHANNEL_UNREF(p, r, cl) \ + grpc_subchannel_unref((p), (cl), __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(p, r, cl) \ + grpc_subchannel_call_unref((p), (cl), __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_UNREF(p, r) grpc_subchannel_unref((p)) +#define GRPC_SUBCHANNEL_UNREF(p, r, cl) grpc_subchannel_unref((p), (cl)) #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(p, r, cl) \ + grpc_subchannel_call_unref((p), (cl)) #define GRPC_SUBCHANNEL_REF_EXTRA_ARGS #endif void grpc_subchannel_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_subchannel *channel, + grpc_call_list *call_list + 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_subchannel_call *call, + grpc_call_list *call_list + GRPC_SUBCHANNEL_REF_EXTRA_ARGS); /** construct a call (possibly asynchronously) */ void grpc_subchannel_create_call(grpc_subchannel *subchannel, @@ -81,7 +84,8 @@ void grpc_subchannel_create_call(grpc_subchannel *subchannel, /** process a transport level op */ void grpc_subchannel_process_transport_op(grpc_subchannel *subchannel, - grpc_transport_op *op); + grpc_transport_op *op, + grpc_call_list *call_list); /** poll the current connectivity state of a channel */ grpc_connectivity_state grpc_subchannel_check_connectivity( @@ -96,17 +100,21 @@ void grpc_subchannel_notify_on_state_change(grpc_subchannel *channel, /** express interest in \a channel's activities through \a pollset. */ void grpc_subchannel_add_interested_party(grpc_subchannel *channel, - grpc_pollset *pollset); + grpc_pollset *pollset, + grpc_call_list *call_list); /** stop following \a channel's activity through \a pollset. */ void grpc_subchannel_del_interested_party(grpc_subchannel *channel, - grpc_pollset *pollset); + grpc_pollset *pollset, + grpc_call_list *call_list); /** continue processing a transport op */ void grpc_subchannel_call_process_op(grpc_subchannel_call *subchannel_call, - grpc_transport_stream_op *op); + grpc_transport_stream_op *op, + grpc_call_list *call_list); /** continue querying for peer */ -char *grpc_subchannel_call_get_peer(grpc_subchannel_call *subchannel_call); +char *grpc_subchannel_call_get_peer(grpc_subchannel_call *subchannel_call, + grpc_call_list *call_list); struct grpc_subchannel_args { /** Channel filters for this channel - wrapped factories will likely diff --git a/src/core/client_config/subchannel_factory.h b/src/core/client_config/subchannel_factory.h index d7eae1c9646..b588580edb7 100644 --- a/src/core/client_config/subchannel_factory.h +++ b/src/core/client_config/subchannel_factory.h @@ -50,7 +50,8 @@ struct grpc_subchannel_factory_vtable { void (*ref)(grpc_subchannel_factory *factory); void (*unref)(grpc_subchannel_factory *factory); grpc_subchannel *(*create_subchannel)(grpc_subchannel_factory *factory, - grpc_subchannel_args *args); + grpc_subchannel_args *args, + grpc_call_list *call_list); }; void grpc_subchannel_factory_ref(grpc_subchannel_factory *factory); @@ -58,6 +59,7 @@ void grpc_subchannel_factory_unref(grpc_subchannel_factory *factory); /** Create a new grpc_subchannel */ grpc_subchannel *grpc_subchannel_factory_create_subchannel( - grpc_subchannel_factory *factory, grpc_subchannel_args *args); + grpc_subchannel_factory *factory, grpc_subchannel_args *args, + grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_SUBCHANNEL_FACTORY_H */ diff --git a/src/core/httpcli/httpcli.c b/src/core/httpcli/httpcli.c index c484f4c7b30..e35fa20953f 100644 --- a/src/core/httpcli/httpcli.c +++ b/src/core/httpcli/httpcli.c @@ -65,6 +65,7 @@ typedef struct { gpr_slice_buffer outgoing; grpc_closure on_read; grpc_closure done_write; + grpc_closure connected; grpc_workqueue *workqueue; } internal_request; @@ -74,8 +75,10 @@ static grpc_httpcli_post_override g_post_override = NULL; static void plaintext_handshake(void *arg, grpc_endpoint *endpoint, const char *host, void (*on_done)(void *arg, - grpc_endpoint *endpoint)) { - on_done(arg, endpoint); + grpc_endpoint *endpoint, + grpc_call_list *call_list), + grpc_call_list *call_list) { + on_done(arg, endpoint, call_list); } const grpc_httpcli_handshaker grpc_httpcli_plaintext = {"http", @@ -89,17 +92,19 @@ void grpc_httpcli_context_destroy(grpc_httpcli_context *context) { grpc_pollset_set_destroy(&context->pollset_set); } -static void next_address(internal_request *req); +static void next_address(internal_request *req, grpc_call_list *call_list); -static void finish(internal_request *req, int success) { - grpc_pollset_set_del_pollset(&req->context->pollset_set, req->pollset); - req->on_response(req->user_data, success ? &req->parser.r : NULL); +static void finish(internal_request *req, int success, + grpc_call_list *call_list) { + grpc_pollset_set_del_pollset(&req->context->pollset_set, req->pollset, + call_list); + req->on_response(req->user_data, success ? &req->parser.r : NULL, call_list); grpc_httpcli_parser_destroy(&req->parser); if (req->addresses != NULL) { grpc_resolved_addresses_destroy(req->addresses); } if (req->ep != NULL) { - grpc_endpoint_destroy(req->ep); + grpc_endpoint_destroy(req->ep, call_list); } gpr_slice_unref(req->request_text); gpr_free(req->host); @@ -110,22 +115,13 @@ static void finish(internal_request *req, int success) { gpr_free(req); } -static void on_read(void *user_data, int success); +static void on_read(void *user_data, int success, grpc_call_list *call_list); -static void do_read(internal_request *req) { - switch (grpc_endpoint_read(req->ep, &req->incoming, &req->on_read)) { - case GRPC_ENDPOINT_DONE: - on_read(req, 1); - break; - case GRPC_ENDPOINT_PENDING: - break; - case GRPC_ENDPOINT_ERROR: - on_read(req, 0); - break; - } +static void do_read(internal_request *req, grpc_call_list *call_list) { + grpc_endpoint_read(req->ep, &req->incoming, &req->on_read, call_list); } -static void on_read(void *user_data, int success) { +static void on_read(void *user_data, int success, grpc_call_list *call_list) { internal_request *req = user_data; size_t i; @@ -133,99 +129,94 @@ static void on_read(void *user_data, int success) { if (GPR_SLICE_LENGTH(req->incoming.slices[i])) { req->have_read_byte = 1; if (!grpc_httpcli_parser_parse(&req->parser, req->incoming.slices[i])) { - finish(req, 0); + finish(req, 0, call_list); return; } } } if (success) { - do_read(req); + do_read(req, call_list); } else if (!req->have_read_byte) { - next_address(req); + next_address(req, call_list); } else { - finish(req, grpc_httpcli_parser_eof(&req->parser)); + finish(req, grpc_httpcli_parser_eof(&req->parser), call_list); } } -static void on_written(internal_request *req) { do_read(req); } +static void on_written(internal_request *req, grpc_call_list *call_list) { + do_read(req, call_list); +} -static void done_write(void *arg, int success) { +static void done_write(void *arg, int success, grpc_call_list *call_list) { internal_request *req = arg; if (success) { - on_written(req); + on_written(req, call_list); } else { - next_address(req); + next_address(req, call_list); } } -static void start_write(internal_request *req) { +static void start_write(internal_request *req, grpc_call_list *call_list) { gpr_slice_ref(req->request_text); gpr_slice_buffer_add(&req->outgoing, req->request_text); - switch (grpc_endpoint_write(req->ep, &req->outgoing, &req->done_write)) { - case GRPC_ENDPOINT_DONE: - on_written(req); - break; - case GRPC_ENDPOINT_PENDING: - break; - case GRPC_ENDPOINT_ERROR: - finish(req, 0); - break; - } + grpc_endpoint_write(req->ep, &req->outgoing, &req->done_write, call_list); } -static void on_handshake_done(void *arg, grpc_endpoint *ep) { +static void on_handshake_done(void *arg, grpc_endpoint *ep, + grpc_call_list *call_list) { internal_request *req = arg; if (!ep) { - next_address(req); + next_address(req, call_list); return; } req->ep = ep; - start_write(req); + start_write(req, call_list); } -static void on_connected(void *arg, grpc_endpoint *tcp) { +static void on_connected(void *arg, int success, grpc_call_list *call_list) { internal_request *req = arg; - if (!tcp) { - next_address(req); + if (!req->ep) { + next_address(req, call_list); return; } - req->handshaker->handshake(req, tcp, req->host, on_handshake_done); + req->handshaker->handshake(req, req->ep, req->host, on_handshake_done, + call_list); } -static void next_address(internal_request *req) { +static void next_address(internal_request *req, grpc_call_list *call_list) { grpc_resolved_address *addr; if (req->next_address == req->addresses->naddrs) { - finish(req, 0); + finish(req, 0, call_list); return; } addr = &req->addresses->addrs[req->next_address++]; - grpc_tcp_client_connect(on_connected, req, &req->context->pollset_set, + grpc_closure_init(&req->connected, on_connected, req); + grpc_tcp_client_connect(&req->connected, &req->ep, &req->context->pollset_set, req->workqueue, (struct sockaddr *)&addr->addr, - addr->len, req->deadline); + addr->len, req->deadline, call_list); } -static void on_resolved(void *arg, grpc_resolved_addresses *addresses) { +static void on_resolved(void *arg, grpc_resolved_addresses *addresses, + grpc_call_list *call_list) { internal_request *req = arg; if (!addresses) { - finish(req, 0); + finish(req, 0, call_list); return; } req->addresses = addresses; req->next_address = 0; - next_address(req); + next_address(req, call_list); } -static void internal_request_begin(grpc_httpcli_context *context, - grpc_pollset *pollset, - const grpc_httpcli_request *request, - gpr_timespec deadline, - grpc_httpcli_response_cb on_response, - void *user_data, const char *name, - gpr_slice request_text) { +static void internal_request_begin( + grpc_httpcli_context *context, grpc_pollset *pollset, + const grpc_httpcli_request *request, gpr_timespec deadline, + grpc_httpcli_response_cb on_response, void *user_data, const char *name, + gpr_slice request_text, grpc_call_list *call_list) { internal_request *req = gpr_malloc(sizeof(internal_request)); memset(req, 0, sizeof(*req)); req->request_text = request_text; @@ -243,10 +234,11 @@ static void internal_request_begin(grpc_httpcli_context *context, gpr_slice_buffer_init(&req->outgoing); grpc_iomgr_register_object(&req->iomgr_obj, name); req->host = gpr_strdup(request->host); - req->workqueue = grpc_workqueue_create(); + req->workqueue = grpc_workqueue_create(call_list); grpc_workqueue_add_to_pollset(req->workqueue, pollset); - grpc_pollset_set_add_pollset(&req->context->pollset_set, req->pollset); + grpc_pollset_set_add_pollset(&req->context->pollset_set, req->pollset, + call_list); grpc_resolve_address(request->host, req->handshaker->default_port, on_resolved, req); } @@ -254,7 +246,8 @@ static void internal_request_begin(grpc_httpcli_context *context, void grpc_httpcli_get(grpc_httpcli_context *context, grpc_pollset *pollset, const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data) { + grpc_httpcli_response_cb on_response, void *user_data, + grpc_call_list *call_list) { char *name; if (g_get_override && g_get_override(request, deadline, on_response, user_data)) { @@ -263,7 +256,7 @@ void grpc_httpcli_get(grpc_httpcli_context *context, grpc_pollset *pollset, gpr_asprintf(&name, "HTTP:GET:%s:%s", request->host, request->path); internal_request_begin(context, pollset, request, deadline, on_response, user_data, name, - grpc_httpcli_format_get_request(request)); + grpc_httpcli_format_get_request(request), call_list); gpr_free(name); } @@ -271,7 +264,8 @@ void grpc_httpcli_post(grpc_httpcli_context *context, grpc_pollset *pollset, const grpc_httpcli_request *request, const char *body_bytes, size_t body_size, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data) { + grpc_httpcli_response_cb on_response, void *user_data, + grpc_call_list *call_list) { char *name; if (g_post_override && g_post_override(request, body_bytes, body_size, deadline, on_response, user_data)) { @@ -280,7 +274,8 @@ void grpc_httpcli_post(grpc_httpcli_context *context, grpc_pollset *pollset, gpr_asprintf(&name, "HTTP:POST:%s:%s", request->host, request->path); internal_request_begin( context, pollset, request, deadline, on_response, user_data, name, - grpc_httpcli_format_post_request(request, body_bytes, body_size)); + grpc_httpcli_format_post_request(request, body_bytes, body_size), + call_list); gpr_free(name); } diff --git a/src/core/httpcli/httpcli.h b/src/core/httpcli/httpcli.h index c45966714cd..74bb1230420 100644 --- a/src/core/httpcli/httpcli.h +++ b/src/core/httpcli/httpcli.h @@ -62,7 +62,9 @@ typedef struct grpc_httpcli_context { typedef struct { const char *default_port; void (*handshake)(void *arg, grpc_endpoint *endpoint, const char *host, - void (*on_done)(void *arg, grpc_endpoint *endpoint)); + void (*on_done)(void *arg, grpc_endpoint *endpoint, + grpc_call_list *call_list), + grpc_call_list *call_list); } grpc_httpcli_handshaker; extern const grpc_httpcli_handshaker grpc_httpcli_plaintext; @@ -97,7 +99,8 @@ typedef struct grpc_httpcli_response { /* Callback for grpc_httpcli_get and grpc_httpcli_post. */ typedef void (*grpc_httpcli_response_cb)(void *user_data, - const grpc_httpcli_response *response); + const grpc_httpcli_response *response, + grpc_call_list *call_list); void grpc_httpcli_context_init(grpc_httpcli_context *context); void grpc_httpcli_context_destroy(grpc_httpcli_context *context); @@ -115,7 +118,8 @@ void grpc_httpcli_context_destroy(grpc_httpcli_context *context); void grpc_httpcli_get(grpc_httpcli_context *context, grpc_pollset *pollset, const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data); + grpc_httpcli_response_cb on_response, void *user_data, + grpc_call_list *call_list); /* Asynchronously perform a HTTP POST. 'context' specifies the http context under which to do the post @@ -136,7 +140,8 @@ void grpc_httpcli_post(grpc_httpcli_context *context, grpc_pollset *pollset, const grpc_httpcli_request *request, const char *body_bytes, size_t body_size, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data); + grpc_httpcli_response_cb on_response, void *user_data, + grpc_call_list *call_list); /* override functions return 1 if they handled the request, 0 otherwise */ typedef int (*grpc_httpcli_get_override)(const grpc_httpcli_request *request, diff --git a/src/core/httpcli/httpcli_security_connector.c b/src/core/httpcli/httpcli_security_connector.c index 7887f9d5304..a11fcd3e626 100644 --- a/src/core/httpcli/httpcli_security_connector.c +++ b/src/core/httpcli/httpcli_security_connector.c @@ -134,33 +134,36 @@ static grpc_security_status httpcli_ssl_channel_security_connector_create( /* handshaker */ typedef struct { - void (*func)(void *arg, grpc_endpoint *endpoint); + void (*func)(void *arg, grpc_endpoint *endpoint, grpc_call_list *call_list); void *arg; } on_done_closure; static void on_secure_transport_setup_done(void *rp, grpc_security_status status, grpc_endpoint *wrapped_endpoint, - grpc_endpoint *secure_endpoint) { + grpc_endpoint *secure_endpoint, + grpc_call_list *call_list) { on_done_closure *c = rp; if (status != GRPC_SECURITY_OK) { gpr_log(GPR_ERROR, "Secure transport setup failed with error %d.", status); - c->func(c->arg, NULL); + c->func(c->arg, NULL, call_list); } else { - c->func(c->arg, secure_endpoint); + c->func(c->arg, secure_endpoint, call_list); } gpr_free(c); } static void ssl_handshake(void *arg, grpc_endpoint *tcp, const char *host, - void (*on_done)(void *arg, grpc_endpoint *endpoint)) { + void (*on_done)(void *arg, grpc_endpoint *endpoint, + grpc_call_list *call_list), + grpc_call_list *call_list) { grpc_channel_security_connector *sc = NULL; const unsigned char *pem_root_certs = NULL; on_done_closure *c = gpr_malloc(sizeof(*c)); size_t pem_root_certs_size = grpc_get_default_ssl_roots(&pem_root_certs); if (pem_root_certs == NULL || pem_root_certs_size == 0) { gpr_log(GPR_ERROR, "Could not get default pem root certs."); - on_done(arg, NULL); + on_done(arg, NULL, call_list); gpr_free(c); return; } @@ -169,8 +172,8 @@ static void ssl_handshake(void *arg, grpc_endpoint *tcp, const char *host, GPR_ASSERT(httpcli_ssl_channel_security_connector_create( pem_root_certs, pem_root_certs_size, host, &sc) == GRPC_SECURITY_OK); - grpc_setup_secure_transport(&sc->base, tcp, on_secure_transport_setup_done, - c); + grpc_setup_secure_transport(&sc->base, tcp, on_secure_transport_setup_done, c, + call_list); GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "httpcli"); } diff --git a/src/core/iomgr/alarm.c b/src/core/iomgr/alarm.c index 7b67fe3b1d0..6e0d516f0c7 100644 --- a/src/core/iomgr/alarm.c +++ b/src/core/iomgr/alarm.c @@ -44,7 +44,6 @@ #define LOG2_NUM_SHARDS 5 #define NUM_SHARDS (1 << LOG2_NUM_SHARDS) -#define MAX_ALARMS_PER_CHECK 128 #define ADD_DEADLINE_SCALE 0.33 #define MIN_QUEUE_WINDOW_DURATION 0.01 #define MAX_QUEUE_WINDOW_DURATION 1 @@ -73,8 +72,8 @@ static shard_type g_shards[NUM_SHARDS]; /* Protected by g_mu */ static shard_type *g_shard_queue[NUM_SHARDS]; -static int run_some_expired_alarms(gpr_mu *drop_mu, gpr_timespec now, - gpr_timespec *next, int success); +static int run_some_expired_alarms(gpr_timespec now, gpr_timespec *next, + int success, grpc_call_list *call_list); static gpr_timespec compute_min_deadline(shard_type *shard) { return grpc_alarm_heap_is_empty(&shard->heap) @@ -103,10 +102,9 @@ void grpc_alarm_list_init(gpr_timespec now) { } } -void grpc_alarm_list_shutdown(void) { +void grpc_alarm_list_shutdown(grpc_call_list *call_list) { int i; - while (run_some_expired_alarms(NULL, gpr_inf_future(g_clock_type), NULL, 0)) - ; + run_some_expired_alarms(gpr_inf_future(g_clock_type), NULL, 0, call_list); for (i = 0; i < NUM_SHARDS; i++) { shard_type *shard = &g_shards[i]; gpr_mu_destroy(&shard->mu); @@ -174,13 +172,12 @@ static void note_deadline_change(shard_type *shard) { void grpc_alarm_init(grpc_alarm *alarm, gpr_timespec deadline, grpc_iomgr_cb_func alarm_cb, void *alarm_cb_arg, - gpr_timespec now) { + gpr_timespec now, grpc_call_list *call_list) { int is_first_alarm = 0; shard_type *shard = &g_shards[shard_idx(alarm)]; GPR_ASSERT(deadline.clock_type == g_clock_type); GPR_ASSERT(now.clock_type == g_clock_type); - alarm->cb = alarm_cb; - alarm->cb_arg = alarm_cb_arg; + grpc_closure_init(&alarm->closure, alarm_cb, alarm_cb_arg); alarm->deadline = deadline; alarm->triggered = 0; @@ -223,12 +220,11 @@ void grpc_alarm_init(grpc_alarm *alarm, gpr_timespec deadline, } } -void grpc_alarm_cancel(grpc_alarm *alarm) { +void grpc_alarm_cancel(grpc_alarm *alarm, grpc_call_list *call_list) { shard_type *shard = &g_shards[shard_idx(alarm)]; - int triggered = 0; gpr_mu_lock(&shard->mu); if (!alarm->triggered) { - triggered = 1; + grpc_call_list_add(call_list, &alarm->closure, 1); alarm->triggered = 1; if (alarm->heap_index == INVALID_HEAP_INDEX) { list_remove(alarm); @@ -237,10 +233,6 @@ void grpc_alarm_cancel(grpc_alarm *alarm) { } } gpr_mu_unlock(&shard->mu); - - if (triggered) { - alarm->cb(alarm->cb_arg, 0); - } } /* This is called when the queue is empty and "now" has reached the @@ -292,39 +284,36 @@ static grpc_alarm *pop_one(shard_type *shard, gpr_timespec now) { /* REQUIRES: shard->mu unlocked */ static size_t pop_alarms(shard_type *shard, gpr_timespec now, - grpc_alarm **alarms, size_t max_alarms, - gpr_timespec *new_min_deadline) { + gpr_timespec *new_min_deadline, int success, + grpc_call_list *call_list) { size_t n = 0; grpc_alarm *alarm; gpr_mu_lock(&shard->mu); - while (n < max_alarms && (alarm = pop_one(shard, now))) { - alarms[n++] = alarm; + while ((alarm = pop_one(shard, now))) { + grpc_call_list_add(call_list, &alarm->closure, success); } *new_min_deadline = compute_min_deadline(shard); gpr_mu_unlock(&shard->mu); return n; } -static int run_some_expired_alarms(gpr_mu *drop_mu, gpr_timespec now, - gpr_timespec *next, int success) { +static int run_some_expired_alarms(gpr_timespec now, gpr_timespec *next, + int success, grpc_call_list *call_list) { size_t n = 0; - size_t i; - grpc_alarm *alarms[MAX_ALARMS_PER_CHECK]; /* TODO(ctiller): verify that there are any alarms (atomically) here */ if (gpr_mu_trylock(&g_checker_mu)) { gpr_mu_lock(&g_mu); - while (n < MAX_ALARMS_PER_CHECK && - gpr_time_cmp(g_shard_queue[0]->min_deadline, now) < 0) { + while (gpr_time_cmp(g_shard_queue[0]->min_deadline, now) < 0) { gpr_timespec new_min_deadline; /* For efficiency, we pop as many available alarms as we can from the shard. This may violate perfect alarm deadline ordering, but that shouldn't be a big deal because we don't make ordering guarantees. */ - n += pop_alarms(g_shard_queue[0], now, alarms + n, - MAX_ALARMS_PER_CHECK - n, &new_min_deadline); + n += pop_alarms(g_shard_queue[0], now, &new_min_deadline, success, + call_list); /* An grpc_alarm_init() on the shard could intervene here, adding a new alarm that is earlier than new_min_deadline. However, @@ -343,26 +332,15 @@ static int run_some_expired_alarms(gpr_mu *drop_mu, gpr_timespec now, gpr_mu_unlock(&g_checker_mu); } - if (n && drop_mu) { - gpr_mu_unlock(drop_mu); - } - - for (i = 0; i < n; i++) { - alarms[i]->cb(alarms[i]->cb_arg, success); - } - - if (n && drop_mu) { - gpr_mu_lock(drop_mu); - } - - return (int)n; + return n > 0; } -int grpc_alarm_check(gpr_mu *drop_mu, gpr_timespec now, gpr_timespec *next) { +int grpc_alarm_check(gpr_timespec now, gpr_timespec *next, + grpc_call_list *call_list) { GPR_ASSERT(now.clock_type == g_clock_type); return run_some_expired_alarms( - drop_mu, now, next, - gpr_time_cmp(now, gpr_inf_future(now.clock_type)) != 0); + now, next, gpr_time_cmp(now, gpr_inf_future(now.clock_type)) != 0, + call_list); } gpr_timespec grpc_alarm_list_next_timeout(void) { diff --git a/src/core/iomgr/alarm.h b/src/core/iomgr/alarm.h index 4a13527e64a..05ca7c27bbd 100644 --- a/src/core/iomgr/alarm.h +++ b/src/core/iomgr/alarm.h @@ -44,8 +44,7 @@ typedef struct grpc_alarm { int triggered; struct grpc_alarm *next; struct grpc_alarm *prev; - grpc_iomgr_cb_func cb; - void *cb_arg; + grpc_closure closure; } grpc_alarm; /* Initialize *alarm. When expired or canceled, alarm_cb will be called with @@ -56,7 +55,7 @@ typedef struct grpc_alarm { information about when to free up any user-level state. */ void grpc_alarm_init(grpc_alarm *alarm, gpr_timespec deadline, grpc_iomgr_cb_func alarm_cb, void *alarm_cb_arg, - gpr_timespec now); + gpr_timespec now, grpc_call_list *call_list); /* Note that there is no alarm destroy function. This is because the alarm is a one-time occurrence with a guarantee that the callback will @@ -84,6 +83,6 @@ void grpc_alarm_init(grpc_alarm *alarm, gpr_timespec deadline, matches this aim. Requires: cancel() must happen after add() on a given alarm */ -void grpc_alarm_cancel(grpc_alarm *alarm); +void grpc_alarm_cancel(grpc_alarm *alarm, grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_ALARM_H */ diff --git a/src/core/iomgr/alarm_internal.h b/src/core/iomgr/alarm_internal.h index e9f98a3444e..a2e9946f4fd 100644 --- a/src/core/iomgr/alarm_internal.h +++ b/src/core/iomgr/alarm_internal.h @@ -48,10 +48,10 @@ with high probability at least one thread in the system will see an update at any time slice. */ -int grpc_alarm_check(gpr_mu *drop_mu, gpr_timespec now, gpr_timespec *next); - +int grpc_alarm_check(gpr_timespec now, gpr_timespec *next, + grpc_call_list *call_list); void grpc_alarm_list_init(gpr_timespec now); -void grpc_alarm_list_shutdown(void); +void grpc_alarm_list_shutdown(grpc_call_list *call_list); gpr_timespec grpc_alarm_list_next_timeout(void); diff --git a/src/core/iomgr/endpoint.c b/src/core/iomgr/endpoint.c index 1955f74b9aa..769f155a639 100644 --- a/src/core/iomgr/endpoint.c +++ b/src/core/iomgr/endpoint.c @@ -33,30 +33,34 @@ #include "src/core/iomgr/endpoint.h" -grpc_endpoint_op_status grpc_endpoint_read(grpc_endpoint *ep, - gpr_slice_buffer *slices, - grpc_closure *cb) { - return ep->vtable->read(ep, slices, cb); +void grpc_endpoint_read(grpc_endpoint *ep, gpr_slice_buffer *slices, + grpc_closure *cb, grpc_call_list *call_list) { + ep->vtable->read(ep, slices, cb, call_list); } -grpc_endpoint_op_status grpc_endpoint_write(grpc_endpoint *ep, - gpr_slice_buffer *slices, - grpc_closure *cb) { - return ep->vtable->write(ep, slices, cb); +void grpc_endpoint_write(grpc_endpoint *ep, gpr_slice_buffer *slices, + grpc_closure *cb, grpc_call_list *call_list) { + ep->vtable->write(ep, slices, cb, call_list); } -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_endpoint *ep, grpc_pollset *pollset, + grpc_call_list *call_list) { + ep->vtable->add_to_pollset(ep, pollset, call_list); } void grpc_endpoint_add_to_pollset_set(grpc_endpoint *ep, - grpc_pollset_set *pollset_set) { - ep->vtable->add_to_pollset_set(ep, pollset_set); + grpc_pollset_set *pollset_set, + grpc_call_list *call_list) { + ep->vtable->add_to_pollset_set(ep, pollset_set, call_list); } -void grpc_endpoint_shutdown(grpc_endpoint *ep) { ep->vtable->shutdown(ep); } +void grpc_endpoint_shutdown(grpc_endpoint *ep, grpc_call_list *call_list) { + ep->vtable->shutdown(ep, call_list); +} -void grpc_endpoint_destroy(grpc_endpoint *ep) { ep->vtable->destroy(ep); } +void grpc_endpoint_destroy(grpc_endpoint *ep, grpc_call_list *call_list) { + ep->vtable->destroy(ep, call_list); +} char *grpc_endpoint_get_peer(grpc_endpoint *ep) { return ep->vtable->get_peer(ep); diff --git a/src/core/iomgr/endpoint.h b/src/core/iomgr/endpoint.h index 79b7d6a78e3..f9881684ffa 100644 --- a/src/core/iomgr/endpoint.h +++ b/src/core/iomgr/endpoint.h @@ -46,21 +46,17 @@ typedef struct grpc_endpoint grpc_endpoint; typedef struct grpc_endpoint_vtable grpc_endpoint_vtable; -typedef enum grpc_endpoint_op_status { - GRPC_ENDPOINT_DONE, /* completed immediately, cb won't be called */ - GRPC_ENDPOINT_PENDING, /* cb will be called when completed */ - GRPC_ENDPOINT_ERROR /* write errored out, cb won't be called */ -} grpc_endpoint_op_status; - struct grpc_endpoint_vtable { - grpc_endpoint_op_status (*read)(grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_closure *cb); - grpc_endpoint_op_status (*write)(grpc_endpoint *ep, gpr_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); - void (*destroy)(grpc_endpoint *ep); + void (*read)(grpc_endpoint *ep, gpr_slice_buffer *slices, grpc_closure *cb, + grpc_call_list *call_list); + void (*write)(grpc_endpoint *ep, gpr_slice_buffer *slices, grpc_closure *cb, + grpc_call_list *call_list); + void (*add_to_pollset)(grpc_endpoint *ep, grpc_pollset *pollset, + grpc_call_list *call_list); + void (*add_to_pollset_set)(grpc_endpoint *ep, grpc_pollset_set *pollset, + grpc_call_list *call_list); + void (*shutdown)(grpc_endpoint *ep, grpc_call_list *call_list); + void (*destroy)(grpc_endpoint *ep, grpc_call_list *call_list); char *(*get_peer)(grpc_endpoint *ep); }; @@ -68,9 +64,8 @@ struct grpc_endpoint_vtable { Callback success indicates that the endpoint can accept more reads, failure indicates the endpoint is closed. Valid slices may be placed into \a slices even on callback success == 0. */ -grpc_endpoint_op_status grpc_endpoint_read( - grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_closure *cb) GRPC_MUST_USE_RESULT; +void grpc_endpoint_read(grpc_endpoint *ep, gpr_slice_buffer *slices, + grpc_closure *cb, grpc_call_list *call_list); char *grpc_endpoint_get_peer(grpc_endpoint *ep); @@ -84,20 +79,21 @@ char *grpc_endpoint_get_peer(grpc_endpoint *ep); No guarantee is made to the content of slices after a write EXCEPT that it is a valid slice buffer. */ -grpc_endpoint_op_status grpc_endpoint_write( - grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_closure *cb) GRPC_MUST_USE_RESULT; +void grpc_endpoint_write(grpc_endpoint *ep, gpr_slice_buffer *slices, + grpc_closure *cb, grpc_call_list *call_list); /* Causes any pending read/write callbacks to run immediately with success==0 */ -void grpc_endpoint_shutdown(grpc_endpoint *ep); -void grpc_endpoint_destroy(grpc_endpoint *ep); +void grpc_endpoint_shutdown(grpc_endpoint *ep, grpc_call_list *call_list); +void grpc_endpoint_destroy(grpc_endpoint *ep, grpc_call_list *call_list); /* 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_endpoint *ep, grpc_pollset *pollset); +void grpc_endpoint_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset, + grpc_call_list *call_list); void grpc_endpoint_add_to_pollset_set(grpc_endpoint *ep, - grpc_pollset_set *pollset_set); + grpc_pollset_set *pollset_set, + grpc_call_list *call_list); struct grpc_endpoint { const grpc_endpoint_vtable *vtable; diff --git a/src/core/iomgr/endpoint_pair.h b/src/core/iomgr/endpoint_pair.h index 25ef1891fb9..095ec5fcc9f 100644 --- a/src/core/iomgr/endpoint_pair.h +++ b/src/core/iomgr/endpoint_pair.h @@ -42,7 +42,6 @@ typedef struct { } grpc_endpoint_pair; grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name, - size_t read_slice_size, - grpc_workqueue *workqueue); + size_t read_slice_size); #endif /* GRPC_INTERNAL_CORE_IOMGR_ENDPOINT_PAIR_H */ diff --git a/src/core/iomgr/endpoint_pair_posix.c b/src/core/iomgr/endpoint_pair_posix.c index dc1f441b4bf..deae9c68757 100644 --- a/src/core/iomgr/endpoint_pair_posix.c +++ b/src/core/iomgr/endpoint_pair_posix.c @@ -59,20 +59,19 @@ static void create_sockets(int sv[2]) { } grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name, - size_t read_slice_size, - grpc_workqueue *workqueue) { + size_t read_slice_size) { int sv[2]; grpc_endpoint_pair p; char *final_name; create_sockets(sv); gpr_asprintf(&final_name, "%s:client", name); - p.client = grpc_tcp_create(grpc_fd_create(sv[1], workqueue, final_name), - read_slice_size, "socketpair-server"); + p.client = grpc_tcp_create(grpc_fd_create(sv[1], final_name), read_slice_size, + "socketpair-server"); gpr_free(final_name); gpr_asprintf(&final_name, "%s:server", name); - p.server = grpc_tcp_create(grpc_fd_create(sv[0], workqueue, final_name), - read_slice_size, "socketpair-client"); + p.server = grpc_tcp_create(grpc_fd_create(sv[0], final_name), read_slice_size, + "socketpair-client"); gpr_free(final_name); return p; } diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index dfebbcc2e13..294cb70746f 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -71,9 +71,6 @@ static grpc_fd *fd_freelist = NULL; static gpr_mu fd_freelist_mu; static void freelist_fd(grpc_fd *fd) { - if (fd->workqueue->wakeup_read_fd != fd) { - GRPC_WORKQUEUE_UNREF(fd->workqueue, "fd"); - } gpr_mu_lock(&fd_freelist_mu); fd->freelist_next = fd_freelist; fd_freelist = fd; @@ -161,14 +158,8 @@ void grpc_fd_global_shutdown(void) { gpr_mu_destroy(&fd_freelist_mu); } -grpc_fd *grpc_fd_create(int fd, grpc_workqueue *workqueue, const char *name) { +grpc_fd *grpc_fd_create(int fd, const char *name) { grpc_fd *r = alloc_fd(fd); - r->workqueue = workqueue; - /* if the wakeup_read_fd is NULL, then the workqueue is under construction - ==> this fd will be the wakeup_read_fd, and we shouldn't take a ref */ - if (workqueue->wakeup_read_fd != NULL) { - GRPC_WORKQUEUE_REF(workqueue, "fd"); - } grpc_iomgr_register_object(&r->iomgr_object, name); return r; } @@ -218,7 +209,8 @@ static int has_watchers(grpc_fd *fd) { fd->inactive_watcher_root.next != &fd->inactive_watcher_root; } -void grpc_fd_orphan(grpc_fd *fd, grpc_closure *on_done, const char *reason) { +void grpc_fd_orphan(grpc_fd *fd, grpc_closure *on_done, const char *reason, + grpc_call_list *call_list) { fd->on_done_closure = on_done; shutdown(fd->fd, SHUT_RDWR); gpr_mu_lock(&fd->watcher_mu); @@ -226,9 +218,7 @@ void grpc_fd_orphan(grpc_fd *fd, grpc_closure *on_done, const char *reason) { if (!has_watchers(fd)) { fd->closed = 1; close(fd->fd); - if (fd->on_done_closure) { - grpc_workqueue_push(fd->workqueue, fd->on_done_closure, 1); - } + grpc_call_list_add(call_list, fd->on_done_closure, 1); } else { wake_all_watchers_locked(fd); } @@ -252,25 +242,8 @@ void grpc_fd_ref(grpc_fd *fd) { ref_by(fd, 2); } void grpc_fd_unref(grpc_fd *fd) { unref_by(fd, 2); } #endif -static void process_callback(grpc_closure *closure, int success, - grpc_workqueue *optional_workqueue) { - if (optional_workqueue == NULL) { - closure->cb(closure->cb_arg, success); - } else { - grpc_workqueue_push(optional_workqueue, closure, success); - } -} - -static void process_callbacks(grpc_closure *callbacks, size_t n, int success, - grpc_workqueue *optional_workqueue) { - size_t i; - for (i = 0; i < n; i++) { - process_callback(callbacks + i, success, optional_workqueue); - } -} - static void notify_on(grpc_fd *fd, gpr_atm *st, grpc_closure *closure, - int allow_synchronous_callback) { + grpc_call_list *call_list) { switch (gpr_atm_acq_load(st)) { case NOT_READY: /* There is no race if the descriptor is already ready, so we skip @@ -292,8 +265,7 @@ static void notify_on(grpc_fd *fd, gpr_atm *st, grpc_closure *closure, case READY: GPR_ASSERT(gpr_atm_no_barrier_load(st) == READY); gpr_atm_rel_store(st, NOT_READY); - process_callback(closure, !gpr_atm_acq_load(&fd->shutdown), - allow_synchronous_callback ? NULL : fd->workqueue); + grpc_call_list_add(call_list, closure, !gpr_atm_acq_load(&fd->shutdown)); return; default: /* WAITING */ /* upcallptr was set to a different closure. This is an error! */ @@ -306,8 +278,8 @@ static void notify_on(grpc_fd *fd, gpr_atm *st, grpc_closure *closure, abort(); } -static void set_ready_locked(gpr_atm *st, grpc_closure **callbacks, - size_t *ncallbacks) { +static void set_ready_locked(grpc_fd *fd, gpr_atm *st, + grpc_call_list *call_list) { gpr_intptr state = gpr_atm_acq_load(st); switch (state) { @@ -326,50 +298,38 @@ static void set_ready_locked(gpr_atm *st, grpc_closure **callbacks, default: /* waiting */ GPR_ASSERT(gpr_atm_no_barrier_load(st) != READY && gpr_atm_no_barrier_load(st) != NOT_READY); - callbacks[(*ncallbacks)++] = (grpc_closure *)state; + grpc_call_list_add(call_list, (grpc_closure *)state, + !gpr_atm_acq_load(&fd->shutdown)); gpr_atm_rel_store(st, NOT_READY); return; } } -static void set_ready(grpc_fd *fd, gpr_atm *st, - int allow_synchronous_callback) { +static void set_ready(grpc_fd *fd, gpr_atm *st, grpc_call_list *call_list) { /* only one set_ready can be active at once (but there may be a racing notify_on) */ - int success; - grpc_closure *closure; - size_t ncb = 0; - gpr_mu_lock(&fd->set_state_mu); - set_ready_locked(st, &closure, &ncb); + set_ready_locked(fd, st, call_list); gpr_mu_unlock(&fd->set_state_mu); - success = !gpr_atm_acq_load(&fd->shutdown); - GPR_ASSERT(ncb <= 1); - if (ncb > 0) { - process_callbacks(closure, ncb, success, - allow_synchronous_callback ? NULL : fd->workqueue); - } } -void grpc_fd_shutdown(grpc_fd *fd) { - size_t ncb = 0; +void grpc_fd_shutdown(grpc_fd *fd, grpc_call_list *call_list) { gpr_mu_lock(&fd->set_state_mu); GPR_ASSERT(!gpr_atm_no_barrier_load(&fd->shutdown)); gpr_atm_rel_store(&fd->shutdown, 1); - set_ready_locked(&fd->readst, &fd->shutdown_closures[0], &ncb); - set_ready_locked(&fd->writest, &fd->shutdown_closures[0], &ncb); + set_ready_locked(fd, &fd->readst, call_list); + set_ready_locked(fd, &fd->writest, call_list); gpr_mu_unlock(&fd->set_state_mu); - GPR_ASSERT(ncb <= 2); - process_callbacks(fd->shutdown_closures[0], ncb, 0 /* GPR_FALSE */, - 0 /* GPR_FALSE */); } -void grpc_fd_notify_on_read(grpc_fd *fd, grpc_closure *closure) { - notify_on(fd, &fd->readst, closure, 0); +void grpc_fd_notify_on_read(grpc_fd *fd, grpc_closure *closure, + grpc_call_list *call_list) { + notify_on(fd, &fd->readst, closure, call_list); } -void grpc_fd_notify_on_write(grpc_fd *fd, grpc_closure *closure) { - notify_on(fd, &fd->writest, closure, 0); +void grpc_fd_notify_on_write(grpc_fd *fd, grpc_closure *closure, + grpc_call_list *call_list) { + notify_on(fd, &fd->writest, closure, call_list); } gpr_uint32 grpc_fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset, @@ -415,7 +375,8 @@ gpr_uint32 grpc_fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset, return mask; } -void grpc_fd_end_poll(grpc_fd_watcher *watcher, int got_read, int got_write) { +void grpc_fd_end_poll(grpc_fd_watcher *watcher, int got_read, int got_write, + grpc_call_list *call_list) { int was_polling = 0; int kick = 0; grpc_fd *fd = watcher->fd; @@ -448,21 +409,19 @@ void grpc_fd_end_poll(grpc_fd_watcher *watcher, int got_read, int got_write) { if (grpc_fd_is_orphaned(fd) && !has_watchers(fd) && !fd->closed) { fd->closed = 1; close(fd->fd); - if (fd->on_done_closure != NULL) { - grpc_workqueue_push(fd->workqueue, fd->on_done_closure, 1); - } + grpc_call_list_add(call_list, fd->on_done_closure, 1); } gpr_mu_unlock(&fd->watcher_mu); GRPC_FD_UNREF(fd, "poll"); } -void grpc_fd_become_readable(grpc_fd *fd, int allow_synchronous_callback) { - set_ready(fd, &fd->readst, allow_synchronous_callback); +void grpc_fd_become_readable(grpc_fd *fd, grpc_call_list *call_list) { + set_ready(fd, &fd->readst, call_list); } -void grpc_fd_become_writable(grpc_fd *fd, int allow_synchronous_callback) { - set_ready(fd, &fd->writest, allow_synchronous_callback); +void grpc_fd_become_writable(grpc_fd *fd, grpc_call_list *call_list) { + set_ready(fd, &fd->writest, call_list); } #endif diff --git a/src/core/iomgr/fd_posix.h b/src/core/iomgr/fd_posix.h index bb85b6c16e7..f435e2d3f9b 100644 --- a/src/core/iomgr/fd_posix.h +++ b/src/core/iomgr/fd_posix.h @@ -58,7 +58,6 @@ struct grpc_fd { meaning that mostly we ref by two to avoid altering the orphaned bit, and just unref by 1 when we're ready to flag the object as orphaned */ gpr_atm refst; - grpc_workqueue *workqueue; gpr_mu set_state_mu; gpr_atm shutdown; @@ -105,7 +104,7 @@ struct grpc_fd { /* Create a wrapped file descriptor. Requires fd is a non-blocking file descriptor. This takes ownership of closing fd. */ -grpc_fd *grpc_fd_create(int fd, grpc_workqueue *workqueue, const char *name); +grpc_fd *grpc_fd_create(int fd, const char *name); /* Releases fd to be asynchronously destroyed. on_done is called when the underlying file descriptor is definitely close()d. @@ -113,7 +112,8 @@ grpc_fd *grpc_fd_create(int fd, grpc_workqueue *workqueue, const char *name); 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, const char *reason); +void grpc_fd_orphan(grpc_fd *fd, grpc_closure *on_done, const char *reason, + grpc_call_list *call_list); /* Begin polling on an fd. Registers that the given pollset is interested in this fd - so that if read @@ -131,13 +131,14 @@ gpr_uint32 grpc_fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset, grpc_fd_watcher *rec); /* Complete polling previously started with grpc_fd_begin_poll MUST NOT be called with a pollset lock taken */ -void grpc_fd_end_poll(grpc_fd_watcher *rec, int got_read, int got_write); +void grpc_fd_end_poll(grpc_fd_watcher *rec, int got_read, int got_write, + grpc_call_list *call_list); /* Return 1 if this fd is orphaned, 0 otherwise */ int grpc_fd_is_orphaned(grpc_fd *fd); /* Cause any current callbacks to error out with GRPC_CALLBACK_CANCELLED. */ -void grpc_fd_shutdown(grpc_fd *fd); +void grpc_fd_shutdown(grpc_fd *fd, grpc_call_list *call_list); /* Register read interest, causing read_cb to be called once when fd becomes readable, on deadline specified by deadline, or on shutdown triggered by @@ -152,17 +153,19 @@ void grpc_fd_shutdown(grpc_fd *fd); 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_fd *fd, grpc_closure *closure, + grpc_call_list *call_list); /* 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_fd *fd, grpc_closure *closure, + grpc_call_list *call_list); /* Notification from the poller to an fd that it has become readable or writable. If allow_synchronous_callback is 1, allow running the fd callback inline in this callstack, otherwise register an asynchronous callback and return */ -void grpc_fd_become_readable(grpc_fd *fd, int allow_synchronous_callback); -void grpc_fd_become_writable(grpc_fd *fd, int allow_synchronous_callback); +void grpc_fd_become_readable(grpc_fd *fd, grpc_call_list *call_list); +void grpc_fd_become_writable(grpc_fd *fd, grpc_call_list *call_list); /* Reference counting for fds */ #ifdef GRPC_FD_REF_COUNT_DEBUG diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index dd760449139..029c6899822 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -88,6 +88,7 @@ void grpc_iomgr_shutdown(void) { 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_call_list call_list = GRPC_CALL_LIST_INIT; gpr_mu_lock(&g_mu); g_shutdown = 1; @@ -101,7 +102,11 @@ void grpc_iomgr_shutdown(void) { } last_warning_time = gpr_now(GPR_CLOCK_REALTIME); } - if (grpc_alarm_check(&g_mu, gpr_inf_future(GPR_CLOCK_MONOTONIC), NULL)) { + if (grpc_alarm_check(gpr_inf_future(GPR_CLOCK_MONOTONIC), NULL, + &call_list)) { + gpr_mu_unlock(&g_mu); + grpc_call_list_run(&call_list); + gpr_mu_lock(&g_mu); continue; } if (g_root_object.next != &g_root_object) { @@ -126,7 +131,8 @@ void grpc_iomgr_shutdown(void) { } gpr_mu_unlock(&g_mu); - grpc_alarm_list_shutdown(); + grpc_alarm_list_shutdown(&call_list); + grpc_call_list_run(&call_list); grpc_iomgr_platform_shutdown(); gpr_mu_destroy(&g_mu); @@ -171,12 +177,15 @@ void grpc_call_list_add(grpc_call_list *call_list, grpc_closure *closure, call_list->tail = closure; } -void grpc_call_list_run(grpc_call_list call_list) { - grpc_closure *c = call_list.head; - while (c) { - grpc_closure *next = c->next; - c->cb(c->cb_arg, c->success); - c = next; +void grpc_call_list_run(grpc_call_list *call_list) { + while (!grpc_call_list_empty(*call_list)) { + grpc_closure *c = call_list->head; + call_list->head = call_list->tail = NULL; + while (c) { + grpc_closure *next = c->next; + c->cb(c->cb_arg, c->success, call_list); + c = next; + } } } diff --git a/src/core/iomgr/iomgr.h b/src/core/iomgr/iomgr.h index 56f0195be99..94f3912990c 100644 --- a/src/core/iomgr/iomgr.h +++ b/src/core/iomgr/iomgr.h @@ -34,15 +34,24 @@ #ifndef GRPC_INTERNAL_CORE_IOMGR_IOMGR_H #define GRPC_INTERNAL_CORE_IOMGR_IOMGR_H +struct grpc_closure; +typedef struct grpc_closure grpc_closure; + +typedef struct grpc_call_list { + grpc_closure *head; + grpc_closure *tail; +} grpc_call_list; + /** gRPC Callback definition. * * \param arg Arbitrary input. * \param success An indication on the state of the iomgr. On false, cleanup * actions should be taken (eg, shutdown). */ -typedef void (*grpc_iomgr_cb_func)(void *arg, int success); +typedef void (*grpc_iomgr_cb_func)(void *arg, int success, + grpc_call_list *call_list); /** A closure over a grpc_iomgr_cb_func. */ -typedef struct grpc_closure { +struct grpc_closure { /** Bound callback. */ grpc_iomgr_cb_func cb; @@ -56,12 +65,7 @@ typedef struct grpc_closure { /**< Internal. Do not touch */ struct grpc_closure *next; -} grpc_closure; - -typedef struct grpc_call_list { - grpc_closure *head; - grpc_closure *tail; -} grpc_call_list; +}; /** Initializes \a closure with \a cb and \a cb_arg. */ void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, @@ -72,7 +76,7 @@ void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, void grpc_call_list_add(grpc_call_list *list, grpc_closure *closure, int success); -void grpc_call_list_run(grpc_call_list list); +void grpc_call_list_run(grpc_call_list *list); void grpc_call_list_move(grpc_call_list *src, grpc_call_list *dst); int grpc_call_list_empty(grpc_call_list list); diff --git a/src/core/iomgr/pollset.h b/src/core/iomgr/pollset.h index 337596cb741..98653412bb1 100644 --- a/src/core/iomgr/pollset.h +++ b/src/core/iomgr/pollset.h @@ -55,9 +55,8 @@ #endif void grpc_pollset_init(grpc_pollset *pollset); -void grpc_pollset_shutdown(grpc_pollset *pollset, - void (*shutdown_done)(void *arg), - void *shutdown_done_arg); +void grpc_pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure, + grpc_call_list *call_list); void grpc_pollset_destroy(grpc_pollset *pollset); /* Do some work on a pollset. diff --git a/src/core/iomgr/pollset_multipoller_with_epoll.c b/src/core/iomgr/pollset_multipoller_with_epoll.c index 5ca957b8e19..e6e0f5cdd4a 100644 --- a/src/core/iomgr/pollset_multipoller_with_epoll.c +++ b/src/core/iomgr/pollset_multipoller_with_epoll.c @@ -61,7 +61,8 @@ typedef struct { wakeup_fd_hdl *free_wakeup_fds; } pollset_hdr; -static void finally_add_fd(grpc_pollset *pollset, grpc_fd *fd) { +static void finally_add_fd(grpc_pollset *pollset, grpc_fd *fd, + grpc_call_list *call_list) { pollset_hdr *h = pollset->data.ptr; struct epoll_event ev; int err; @@ -83,15 +84,15 @@ static void finally_add_fd(grpc_pollset *pollset, grpc_fd *fd) { } } } - grpc_fd_end_poll(&watcher, 0, 0); + grpc_fd_end_poll(&watcher, 0, 0, call_list); } -static void perform_delayed_add(void *arg, int iomgr_status) { +static void perform_delayed_add(void *arg, int iomgr_status, + grpc_call_list *call_list) { delayed_add *da = arg; - int do_shutdown_cb = 0; if (!grpc_fd_is_orphaned(da->fd)) { - finally_add_fd(da->pollset, da->fd); + finally_add_fd(da->pollset, da->fd, call_list); } gpr_mu_lock(&da->pollset->mu); @@ -100,26 +101,23 @@ static void perform_delayed_add(void *arg, int iomgr_status) { /* We don't care about this pollset anymore. */ if (da->pollset->in_flight_cbs == 0 && !da->pollset->called_shutdown) { da->pollset->called_shutdown = 1; - do_shutdown_cb = 1; + grpc_call_list_add(call_list, da->pollset->shutdown_done, 1); } } gpr_mu_unlock(&da->pollset->mu); GRPC_FD_UNREF(da->fd, "delayed_add"); - if (do_shutdown_cb) { - da->pollset->shutdown_done_cb(da->pollset->shutdown_done_arg); - } - gpr_free(da); } static void multipoll_with_epoll_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, - int and_unlock_pollset) { + int and_unlock_pollset, + grpc_call_list *call_list) { if (and_unlock_pollset) { gpr_mu_unlock(&pollset->mu); - finally_add_fd(pollset, fd); + finally_add_fd(pollset, fd, call_list); } else { delayed_add *da = gpr_malloc(sizeof(*da)); da->pollset = pollset; @@ -127,13 +125,14 @@ static void multipoll_with_epoll_pollset_add_fd(grpc_pollset *pollset, GRPC_FD_REF(fd, "delayed_add"); grpc_closure_init(&da->closure, perform_delayed_add, da); pollset->in_flight_cbs++; - grpc_pollset_add_unlock_job(pollset, &da->closure); + grpc_call_list_add(call_list, &da->closure, 1); } } static void multipoll_with_epoll_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd, - int and_unlock_pollset) { + int and_unlock_pollset, + grpc_call_list *call_list) { pollset_hdr *h = pollset->data.ptr; int err; @@ -153,9 +152,9 @@ static void multipoll_with_epoll_pollset_del_fd(grpc_pollset *pollset, /* TODO(klempner): We probably want to turn this down a bit */ #define GRPC_EPOLL_MAX_EVENTS 1000 -static void multipoll_with_epoll_pollset_maybe_work( +static void multipoll_with_epoll_pollset_maybe_work_and_unlock( grpc_pollset *pollset, grpc_pollset_worker *worker, gpr_timespec deadline, - gpr_timespec now, int allow_synchronous_callback) { + gpr_timespec now, grpc_call_list *call_list) { struct epoll_event ep_ev[GRPC_EPOLL_MAX_EVENTS]; int ep_rv; int poll_rv; @@ -209,18 +208,16 @@ static void multipoll_with_epoll_pollset_maybe_work( int read = ep_ev[i].events & (EPOLLIN | EPOLLPRI); int write = ep_ev[i].events & EPOLLOUT; if (read || cancel) { - grpc_fd_become_readable(fd, allow_synchronous_callback); + grpc_fd_become_readable(fd, call_list); } if (write || cancel) { - grpc_fd_become_writable(fd, allow_synchronous_callback); + grpc_fd_become_writable(fd, call_list); } } } } while (ep_rv == GRPC_EPOLL_MAX_EVENTS); } } - - gpr_mu_lock(&pollset->mu); } static void multipoll_with_epoll_pollset_finish_shutdown( @@ -234,12 +231,12 @@ static void multipoll_with_epoll_pollset_destroy(grpc_pollset *pollset) { static const grpc_pollset_vtable multipoll_with_epoll_pollset = { multipoll_with_epoll_pollset_add_fd, multipoll_with_epoll_pollset_del_fd, - multipoll_with_epoll_pollset_maybe_work, + multipoll_with_epoll_pollset_maybe_work_and_unlock, multipoll_with_epoll_pollset_finish_shutdown, multipoll_with_epoll_pollset_destroy}; static void epoll_become_multipoller(grpc_pollset *pollset, grpc_fd **fds, - size_t nfds) { + size_t nfds, grpc_call_list *call_list) { size_t i; pollset_hdr *h = gpr_malloc(sizeof(pollset_hdr)); @@ -252,7 +249,7 @@ static void epoll_become_multipoller(grpc_pollset *pollset, grpc_fd **fds, abort(); } for (i = 0; i < nfds; i++) { - multipoll_with_epoll_pollset_add_fd(pollset, fds[i], 0); + multipoll_with_epoll_pollset_add_fd(pollset, fds[i], 0, call_list); } } diff --git a/src/core/iomgr/pollset_multipoller_with_poll_posix.c b/src/core/iomgr/pollset_multipoller_with_poll_posix.c index cae260cab0b..03a28894f06 100644 --- a/src/core/iomgr/pollset_multipoller_with_poll_posix.c +++ b/src/core/iomgr/pollset_multipoller_with_poll_posix.c @@ -61,7 +61,8 @@ typedef struct { static void multipoll_with_poll_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, - int and_unlock_pollset) { + int and_unlock_pollset, + grpc_call_list *call_list) { size_t i; pollset_hdr *h = pollset->data.ptr; /* TODO(ctiller): this is O(num_fds^2); maybe switch to a hash set here */ @@ -82,7 +83,8 @@ exit: static void multipoll_with_poll_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd, - int and_unlock_pollset) { + int and_unlock_pollset, + grpc_call_list *call_list) { /* will get removed next poll cycle */ pollset_hdr *h = pollset->data.ptr; if (h->del_count == h->del_capacity) { @@ -96,9 +98,9 @@ static void multipoll_with_poll_pollset_del_fd(grpc_pollset *pollset, } } -static void multipoll_with_poll_pollset_maybe_work( +static void multipoll_with_poll_pollset_maybe_work_and_unlock( grpc_pollset *pollset, grpc_pollset_worker *worker, gpr_timespec deadline, - gpr_timespec now, int allow_synchronous_callback) { + gpr_timespec now, grpc_call_list *call_list) { int timeout; int r; size_t i, j, fd_count; @@ -149,7 +151,7 @@ static void multipoll_with_poll_pollset_maybe_work( for (i = 1; i < pfd_count; i++) { grpc_fd_end_poll(&watchers[i], pfds[i].revents & POLLIN, - pfds[i].revents & POLLOUT); + pfds[i].revents & POLLOUT, call_list); } if (r < 0) { @@ -167,18 +169,16 @@ static void multipoll_with_poll_pollset_maybe_work( continue; } if (pfds[i].revents & (POLLIN | POLLHUP | POLLERR)) { - grpc_fd_become_readable(watchers[i].fd, allow_synchronous_callback); + grpc_fd_become_readable(watchers[i].fd, call_list); } if (pfds[i].revents & (POLLOUT | POLLHUP | POLLERR)) { - grpc_fd_become_writable(watchers[i].fd, allow_synchronous_callback); + grpc_fd_become_writable(watchers[i].fd, call_list); } } } gpr_free(pfds); gpr_free(watchers); - - gpr_mu_lock(&pollset->mu); } static void multipoll_with_poll_pollset_finish_shutdown(grpc_pollset *pollset) { @@ -204,12 +204,12 @@ static void multipoll_with_poll_pollset_destroy(grpc_pollset *pollset) { static const grpc_pollset_vtable multipoll_with_poll_pollset = { multipoll_with_poll_pollset_add_fd, multipoll_with_poll_pollset_del_fd, - multipoll_with_poll_pollset_maybe_work, + multipoll_with_poll_pollset_maybe_work_and_unlock, multipoll_with_poll_pollset_finish_shutdown, multipoll_with_poll_pollset_destroy}; void grpc_poll_become_multipoller(grpc_pollset *pollset, grpc_fd **fds, - size_t nfds) { + size_t nfds, grpc_call_list *call_list) { size_t i; pollset_hdr *h = gpr_malloc(sizeof(pollset_hdr)); pollset->vtable = &multipoll_with_poll_pollset; diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 0fe3f80d448..885cb29234f 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -136,17 +136,14 @@ void grpc_pollset_init(grpc_pollset *pollset) { pollset->in_flight_cbs = 0; pollset->shutting_down = 0; pollset->called_shutdown = 0; - pollset->idle_jobs = NULL; - pollset->unlock_jobs = NULL; + pollset->idle_jobs.head = pollset->idle_jobs.tail = NULL; become_basic_pollset(pollset, NULL); } -void grpc_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd) { - if (fd->workqueue->wakeup_read_fd != fd) { - grpc_pollset_add_fd(pollset, fd->workqueue->wakeup_read_fd); - } +void grpc_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, + grpc_call_list *call_list) { gpr_mu_lock(&pollset->mu); - pollset->vtable->add_fd(pollset, fd, 1); + pollset->vtable->add_fd(pollset, fd, 1, call_list); /* the following (enabled only in debug) will reacquire and then release our lock - meaning that if the unlocking flag passed to del_fd above is not respected, the code will deadlock (in a way that we have a chance of @@ -157,9 +154,10 @@ void grpc_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd) { #endif } -void grpc_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd) { +void grpc_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd, + grpc_call_list *call_list) { gpr_mu_lock(&pollset->mu); - pollset->vtable->del_fd(pollset, fd, 1); + pollset->vtable->del_fd(pollset, fd, 1, call_list); /* the following (enabled only in debug) will reacquire and then release our lock - meaning that if the unlocking flag passed to del_fd above is not respected, the code will deadlock (in a way that we have a chance of @@ -170,53 +168,27 @@ void grpc_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd) { #endif } -static void finish_shutdown(grpc_pollset *pollset) { +static void finish_shutdown(grpc_pollset *pollset, grpc_call_list *call_list) { pollset->vtable->finish_shutdown(pollset); - pollset->shutdown_done_cb(pollset->shutdown_done_arg); -} - -static void run_jobs(grpc_pollset *pollset, grpc_closure **root) { - grpc_closure *exec = *root; - *root = NULL; - gpr_mu_unlock(&pollset->mu); - while (exec != NULL) { - grpc_closure *next = exec->next; - exec->cb(exec->cb_arg, 1); - exec = next; - } - gpr_mu_lock(&pollset->mu); -} - -static void add_job(grpc_closure **root, grpc_closure *closure) { - closure->next = *root; - *root = closure; -} - -void grpc_pollset_add_idle_job(grpc_pollset *pollset, grpc_closure *closure) { - add_job(&pollset->idle_jobs, closure); -} - -void grpc_pollset_add_unlock_job(grpc_pollset *pollset, grpc_closure *closure) { - add_job(&pollset->unlock_jobs, closure); + grpc_call_list_add(call_list, pollset->shutdown_done, 1); } void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, gpr_timespec now, gpr_timespec deadline) { /* pollset->mu already held */ int added_worker = 0; + int locked = 1; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; /* this must happen before we (potentially) drop pollset->mu */ worker->next = worker->prev = NULL; /* TODO(ctiller): pool these */ grpc_wakeup_fd_init(&worker->wakeup_fd); - if (!grpc_pollset_has_workers(pollset) && pollset->idle_jobs != NULL) { - run_jobs(pollset, &pollset->idle_jobs); + if (!grpc_pollset_has_workers(pollset) && + !grpc_call_list_empty(pollset->idle_jobs)) { + grpc_call_list_move(&pollset->idle_jobs, &call_list); goto done; } - if (pollset->unlock_jobs != NULL) { - run_jobs(pollset, &pollset->unlock_jobs); - goto done; - } - if (grpc_alarm_check(&pollset->mu, now, &deadline)) { + if (grpc_alarm_check(now, &deadline, &call_list)) { goto done; } if (pollset->shutting_down) { @@ -225,19 +197,32 @@ void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, if (pollset->in_flight_cbs) { /* Give do_promote priority so we don't starve it out */ gpr_mu_unlock(&pollset->mu); - gpr_mu_lock(&pollset->mu); + locked = 0; goto done; } if (!pollset->kicked_without_pollers) { push_front_worker(pollset, worker); added_worker = 1; gpr_tls_set(&g_current_thread_poller, (gpr_intptr)pollset); - pollset->vtable->maybe_work(pollset, worker, deadline, now, 1); + pollset->vtable->maybe_work_and_unlock(pollset, worker, deadline, now, + NULL); + locked = 0; gpr_tls_set(&g_current_thread_poller, 0); } else { pollset->kicked_without_pollers = 0; } done: + if (!grpc_call_list_empty(call_list)) { + if (locked) { + gpr_mu_unlock(&pollset->mu); + locked = 0; + } + grpc_call_list_run(&call_list); + } + if (!locked) { + gpr_mu_lock(&pollset->mu); + locked = 1; + } grpc_wakeup_fd_destroy(&worker->wakeup_fd); if (added_worker) { remove_worker(pollset, worker); @@ -248,7 +233,8 @@ done: } else if (!pollset->called_shutdown && pollset->in_flight_cbs == 0) { pollset->called_shutdown = 1; gpr_mu_unlock(&pollset->mu); - finish_shutdown(pollset); + finish_shutdown(pollset, &call_list); + grpc_call_list_run(&call_list); /* Continuing to access pollset here is safe -- it is the caller's * responsibility to not destroy when it has outstanding calls to * grpc_pollset_work. @@ -258,9 +244,8 @@ done: } } -void grpc_pollset_shutdown(grpc_pollset *pollset, - void (*shutdown_done)(void *arg), - void *shutdown_done_arg) { +void grpc_pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure, + grpc_call_list *call_list) { int call_shutdown = 0; gpr_mu_lock(&pollset->mu); GPR_ASSERT(!pollset->shutting_down); @@ -270,13 +255,12 @@ void grpc_pollset_shutdown(grpc_pollset *pollset, pollset->called_shutdown = 1; call_shutdown = 1; } - pollset->shutdown_done_cb = shutdown_done; - pollset->shutdown_done_arg = shutdown_done_arg; + pollset->shutdown_done = closure; grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); gpr_mu_unlock(&pollset->mu); if (call_shutdown) { - finish_shutdown(pollset); + finish_shutdown(pollset, call_list); } } @@ -317,12 +301,12 @@ typedef struct grpc_unary_promote_args { grpc_closure promotion_closure; } grpc_unary_promote_args; -static void basic_do_promote(void *args, int success) { +static void basic_do_promote(void *args, int success, + grpc_call_list *call_list) { grpc_unary_promote_args *up_args = args; const grpc_pollset_vtable *original_vtable = up_args->original_vtable; grpc_pollset *pollset = up_args->pollset; grpc_fd *fd = up_args->fd; - int do_shutdown_cb = 0; /* * This is quite tricky. There are a number of cases to keep in mind here: @@ -349,19 +333,20 @@ static void basic_do_promote(void *args, int success) { if (pollset->in_flight_cbs == 0 && !pollset->called_shutdown) { GPR_ASSERT(!grpc_pollset_has_workers(pollset)); pollset->called_shutdown = 1; - do_shutdown_cb = 1; + grpc_call_list_add(call_list, pollset->shutdown_done, 1); } } else if (grpc_fd_is_orphaned(fd)) { /* Don't try to add it to anything, we'll drop our ref on it below */ } else if (pollset->vtable != original_vtable) { - pollset->vtable->add_fd(pollset, fd, 0); + pollset->vtable->add_fd(pollset, fd, 0, call_list); } else if (fd != pollset->data.ptr) { grpc_fd *fds[2]; fds[0] = pollset->data.ptr; fds[1] = fd; if (fds[0] && !grpc_fd_is_orphaned(fds[0])) { - grpc_platform_become_multipoller(pollset, fds, GPR_ARRAY_SIZE(fds)); + grpc_platform_become_multipoller(pollset, fds, GPR_ARRAY_SIZE(fds), + call_list); GRPC_FD_UNREF(fds[0], "basicpoll"); } else { /* old fd is orphaned and we haven't cleaned it up until now, so remain a @@ -376,16 +361,15 @@ static void basic_do_promote(void *args, int success) { gpr_mu_unlock(&pollset->mu); - if (do_shutdown_cb) { - pollset->shutdown_done_cb(pollset->shutdown_done_arg); - } - /* Matching ref in basic_pollset_add_fd */ GRPC_FD_UNREF(fd, "basicpoll_add"); + + grpc_call_list_run(call_list); } static void basic_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, - int and_unlock_pollset) { + int and_unlock_pollset, + grpc_call_list *call_list) { grpc_unary_promote_args *up_args; GPR_ASSERT(fd); if (fd == pollset->data.ptr) goto exit; @@ -402,7 +386,8 @@ static void basic_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, pollset->data.ptr = fd; GRPC_FD_REF(fd, "basicpoll"); } else if (!grpc_fd_is_orphaned(fds[0])) { - grpc_platform_become_multipoller(pollset, fds, GPR_ARRAY_SIZE(fds)); + grpc_platform_become_multipoller(pollset, fds, GPR_ARRAY_SIZE(fds), + call_list); GRPC_FD_UNREF(fds[0], "basicpoll"); } else { /* old fd is orphaned and we haven't cleaned it up until now, so remain a @@ -424,7 +409,7 @@ static void basic_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, up_args->promotion_closure.cb = basic_do_promote; up_args->promotion_closure.cb_arg = up_args; - grpc_pollset_add_idle_job(pollset, &up_args->promotion_closure); + grpc_call_list_add(&pollset->idle_jobs, &up_args->promotion_closure, 1); grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); exit: @@ -434,7 +419,8 @@ exit: } static void basic_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd, - int and_unlock_pollset) { + int and_unlock_pollset, + grpc_call_list *call_list) { GPR_ASSERT(fd); if (fd == pollset->data.ptr) { GRPC_FD_UNREF(pollset->data.ptr, "basicpoll"); @@ -446,10 +432,11 @@ static void basic_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd, } } -static void basic_pollset_maybe_work(grpc_pollset *pollset, - grpc_pollset_worker *worker, - gpr_timespec deadline, gpr_timespec now, - int allow_synchronous_callback) { +static void basic_pollset_maybe_work_and_unlock(grpc_pollset *pollset, + grpc_pollset_worker *worker, + gpr_timespec deadline, + gpr_timespec now, + grpc_call_list *call_list) { struct pollfd pfd[2]; grpc_fd *fd; grpc_fd_watcher fd_watcher; @@ -487,7 +474,7 @@ static void basic_pollset_maybe_work(grpc_pollset *pollset, if (fd) { grpc_fd_end_poll(&fd_watcher, pfd[1].revents & POLLIN, - pfd[1].revents & POLLOUT); + pfd[1].revents & POLLOUT, call_list); } if (r < 0) { @@ -502,15 +489,13 @@ static void basic_pollset_maybe_work(grpc_pollset *pollset, } if (nfds > 1) { if (pfd[1].revents & (POLLIN | POLLHUP | POLLERR)) { - grpc_fd_become_readable(fd, allow_synchronous_callback); + grpc_fd_become_readable(fd, call_list); } if (pfd[1].revents & (POLLOUT | POLLHUP | POLLERR)) { - grpc_fd_become_writable(fd, allow_synchronous_callback); + grpc_fd_become_writable(fd, call_list); } } } - - gpr_mu_lock(&pollset->mu); } static void basic_pollset_destroy(grpc_pollset *pollset) { @@ -521,8 +506,9 @@ static void basic_pollset_destroy(grpc_pollset *pollset) { } static const grpc_pollset_vtable basic_pollset = { - basic_pollset_add_fd, basic_pollset_del_fd, basic_pollset_maybe_work, - basic_pollset_destroy, basic_pollset_destroy}; + basic_pollset_add_fd, basic_pollset_del_fd, + basic_pollset_maybe_work_and_unlock, basic_pollset_destroy, + basic_pollset_destroy}; static void become_basic_pollset(grpc_pollset *pollset, grpc_fd *fd_or_null) { pollset->vtable = &basic_pollset; diff --git a/src/core/iomgr/pollset_posix.h b/src/core/iomgr/pollset_posix.h index 4f09f870f74..c65f25fd18c 100644 --- a/src/core/iomgr/pollset_posix.h +++ b/src/core/iomgr/pollset_posix.h @@ -65,10 +65,8 @@ typedef struct grpc_pollset { int shutting_down; int called_shutdown; int kicked_without_pollers; - void (*shutdown_done_cb)(void *arg); - void *shutdown_done_arg; - grpc_closure *unlock_jobs; - grpc_closure *idle_jobs; + grpc_closure *shutdown_done; + grpc_call_list idle_jobs; union { int fd; void *ptr; @@ -77,12 +75,13 @@ typedef struct grpc_pollset { struct grpc_pollset_vtable { void (*add_fd)(grpc_pollset *pollset, struct grpc_fd *fd, - int and_unlock_pollset); + int and_unlock_pollset, grpc_call_list *call_list); void (*del_fd)(grpc_pollset *pollset, struct grpc_fd *fd, - int and_unlock_pollset); - void (*maybe_work)(grpc_pollset *pollset, grpc_pollset_worker *worker, - gpr_timespec deadline, gpr_timespec now, - int allow_synchronous_callback); + int and_unlock_pollset, grpc_call_list *call_list); + void (*maybe_work_and_unlock)(grpc_pollset *pollset, + grpc_pollset_worker *worker, + gpr_timespec deadline, gpr_timespec now, + grpc_call_list *call_list); void (*finish_shutdown)(grpc_pollset *pollset); void (*destroy)(grpc_pollset *pollset); }; @@ -90,10 +89,12 @@ struct grpc_pollset_vtable { #define GRPC_POLLSET_MU(pollset) (&(pollset)->mu) /* Add an fd to a pollset */ -void grpc_pollset_add_fd(grpc_pollset *pollset, struct grpc_fd *fd); +void grpc_pollset_add_fd(grpc_pollset *pollset, struct grpc_fd *fd, + grpc_call_list *call_list); /* Force remove an fd from a pollset (normally they are removed on the next poll after an fd is orphaned) */ -void grpc_pollset_del_fd(grpc_pollset *pollset, struct grpc_fd *fd); +void grpc_pollset_del_fd(grpc_pollset *pollset, struct grpc_fd *fd, + grpc_call_list *call_list); /* Returns the fd to listen on for kicks */ int grpc_kick_read_fd(grpc_pollset *p); @@ -111,13 +112,13 @@ int grpc_poll_deadline_to_millis_timeout(gpr_timespec deadline, gpr_timespec now); /* turn a pollset into a multipoller: platform specific */ -typedef void (*grpc_platform_become_multipoller_type)(grpc_pollset *pollset, - struct grpc_fd **fds, - size_t fd_count); +typedef void (*grpc_platform_become_multipoller_type)( + grpc_pollset *pollset, struct grpc_fd **fds, size_t fd_count, + grpc_call_list *call_list); extern grpc_platform_become_multipoller_type grpc_platform_become_multipoller; void grpc_poll_become_multipoller(grpc_pollset *pollset, struct grpc_fd **fds, - size_t fd_count); + size_t fd_count, grpc_call_list *call_list); /* Return 1 if the pollset has active threads in grpc_pollset_work (pollset must * be locked) */ @@ -127,9 +128,4 @@ int grpc_pollset_has_workers(grpc_pollset *pollset); typedef int (*grpc_poll_function_type)(struct pollfd *, nfds_t, int); extern grpc_poll_function_type grpc_poll_function; -/** schedule a closure to be run next time there are no active workers */ -void grpc_pollset_add_idle_job(grpc_pollset *pollset, grpc_closure *closure); -/** schedule a closure to be run next time the pollset is unlocked */ -void grpc_pollset_add_unlock_job(grpc_pollset *pollset, grpc_closure *closure); - #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_POSIX_H */ diff --git a/src/core/iomgr/pollset_set.h b/src/core/iomgr/pollset_set.h index 6d73951c703..ca667bf34e5 100644 --- a/src/core/iomgr/pollset_set.h +++ b/src/core/iomgr/pollset_set.h @@ -52,8 +52,10 @@ void grpc_pollset_set_init(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); + grpc_pollset *pollset, + grpc_call_list *call_list); void grpc_pollset_set_del_pollset(grpc_pollset_set *pollset_set, - grpc_pollset *pollset); + grpc_pollset *pollset, + grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_H */ diff --git a/src/core/iomgr/pollset_set_posix.c b/src/core/iomgr/pollset_set_posix.c index 2076ac70ef5..a2c1f476297 100644 --- a/src/core/iomgr/pollset_set_posix.c +++ b/src/core/iomgr/pollset_set_posix.c @@ -59,7 +59,8 @@ void grpc_pollset_set_destroy(grpc_pollset_set *pollset_set) { } void grpc_pollset_set_add_pollset(grpc_pollset_set *pollset_set, - grpc_pollset *pollset) { + grpc_pollset *pollset, + grpc_call_list *call_list) { size_t i, j; gpr_mu_lock(&pollset_set->mu); if (pollset_set->pollset_count == pollset_set->pollset_capacity) { @@ -74,7 +75,7 @@ void grpc_pollset_set_add_pollset(grpc_pollset_set *pollset_set, if (grpc_fd_is_orphaned(pollset_set->fds[i])) { GRPC_FD_UNREF(pollset_set->fds[i], "pollset"); } else { - grpc_pollset_add_fd(pollset, pollset_set->fds[i]); + grpc_pollset_add_fd(pollset, pollset_set->fds[i], call_list); pollset_set->fds[j++] = pollset_set->fds[i]; } } @@ -83,7 +84,8 @@ void grpc_pollset_set_add_pollset(grpc_pollset_set *pollset_set, } void grpc_pollset_set_del_pollset(grpc_pollset_set *pollset_set, - grpc_pollset *pollset) { + grpc_pollset *pollset, + grpc_call_list *call_list) { size_t i; gpr_mu_lock(&pollset_set->mu); for (i = 0; i < pollset_set->pollset_count; i++) { @@ -97,7 +99,8 @@ void grpc_pollset_set_del_pollset(grpc_pollset_set *pollset_set, gpr_mu_unlock(&pollset_set->mu); } -void grpc_pollset_set_add_fd(grpc_pollset_set *pollset_set, grpc_fd *fd) { +void grpc_pollset_set_add_fd(grpc_pollset_set *pollset_set, grpc_fd *fd, + grpc_call_list *call_list) { size_t i; gpr_mu_lock(&pollset_set->mu); if (pollset_set->fd_count == pollset_set->fd_capacity) { @@ -108,12 +111,13 @@ void grpc_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++) { - grpc_pollset_add_fd(pollset_set->pollsets[i], fd); + grpc_pollset_add_fd(pollset_set->pollsets[i], fd, call_list); } gpr_mu_unlock(&pollset_set->mu); } -void grpc_pollset_set_del_fd(grpc_pollset_set *pollset_set, grpc_fd *fd) { +void grpc_pollset_set_del_fd(grpc_pollset_set *pollset_set, grpc_fd *fd, + grpc_call_list *call_list) { size_t i; gpr_mu_lock(&pollset_set->mu); for (i = 0; i < pollset_set->fd_count; i++) { diff --git a/src/core/iomgr/pollset_set_posix.h b/src/core/iomgr/pollset_set_posix.h index e88740bde1d..e9969d2c0f5 100644 --- a/src/core/iomgr/pollset_set_posix.h +++ b/src/core/iomgr/pollset_set_posix.h @@ -49,7 +49,9 @@ typedef struct grpc_pollset_set { grpc_fd **fds; } grpc_pollset_set; -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_pollset_set *pollset_set, grpc_fd *fd, + grpc_call_list *call_list); +void grpc_pollset_set_del_fd(grpc_pollset_set *pollset_set, grpc_fd *fd, + grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_WINDOWS_H */ diff --git a/src/core/iomgr/resolve_address.h b/src/core/iomgr/resolve_address.h index 9f361cb892d..ec8d83fffaa 100644 --- a/src/core/iomgr/resolve_address.h +++ b/src/core/iomgr/resolve_address.h @@ -34,7 +34,7 @@ #ifndef GRPC_INTERNAL_CORE_IOMGR_RESOLVE_ADDRESS_H #define GRPC_INTERNAL_CORE_IOMGR_RESOLVE_ADDRESS_H -#include +#include "src/core/iomgr/iomgr.h" #define GRPC_MAX_SOCKADDR_SIZE 128 @@ -52,7 +52,8 @@ typedef struct { On success: addresses is the result, and the callee must call grpc_resolved_addresses_destroy when it's done with them On failure: addresses is NULL */ -typedef void (*grpc_resolve_cb)(void *arg, grpc_resolved_addresses *addresses); +typedef void (*grpc_resolve_cb)(void *arg, grpc_resolved_addresses *addresses, + grpc_call_list *call_list); /* 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 */ diff --git a/src/core/iomgr/resolve_address_posix.c b/src/core/iomgr/resolve_address_posix.c index ce6972b797c..ea64f8176fc 100644 --- a/src/core/iomgr/resolve_address_posix.c +++ b/src/core/iomgr/resolve_address_posix.c @@ -144,17 +144,19 @@ done: } /* Thread function to asynch-ify grpc_blocking_resolve_address */ -static void do_request(void *rp) { +static void do_request_thread(void *rp) { request *r = rp; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_resolved_addresses *resolved = grpc_blocking_resolve_address(r->name, r->default_port); void *arg = r->arg; grpc_resolve_cb cb = r->cb; gpr_free(r->name); gpr_free(r->default_port); - cb(arg, resolved); + cb(arg, resolved, &call_list); grpc_iomgr_unregister_object(&r->iomgr_object); gpr_free(r); + grpc_call_list_run(&call_list); } void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) { @@ -175,7 +177,7 @@ void grpc_resolve_address(const char *name, const char *default_port, r->default_port = gpr_strdup(default_port); r->cb = cb; r->arg = arg; - gpr_thd_new(&id, do_request, r, NULL); + gpr_thd_new(&id, do_request_thread, r, NULL); } #endif diff --git a/src/core/iomgr/tcp_client.h b/src/core/iomgr/tcp_client.h index 57f80016c2c..8fb5bfda1da 100644 --- a/src/core/iomgr/tcp_client.h +++ b/src/core/iomgr/tcp_client.h @@ -44,10 +44,9 @@ 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(void (*cb)(void *arg, grpc_endpoint *tcp), - void *arg, grpc_pollset_set *interested_parties, - grpc_workqueue *workqueue, +void grpc_tcp_client_connect(grpc_closure *on_connect, grpc_endpoint **endpoint, + grpc_pollset_set *interested_parties, const struct sockaddr *addr, size_t addr_len, - gpr_timespec deadline); + gpr_timespec deadline, grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_TCP_CLIENT_H */ diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c index 1ea21550607..a4828201c7f 100644 --- a/src/core/iomgr/tcp_client_posix.c +++ b/src/core/iomgr/tcp_client_posix.c @@ -57,8 +57,6 @@ extern int grpc_tcp_trace; typedef struct { - void (*cb)(void *arg, grpc_endpoint *tcp); - void *cb_arg; gpr_mu mu; grpc_fd *fd; gpr_timespec deadline; @@ -67,6 +65,8 @@ typedef struct { grpc_closure write_closure; grpc_pollset_set *interested_parties; char *addr_str; + grpc_endpoint **ep; + grpc_closure *closure; } async_connect; static int prepare_socket(const struct sockaddr *addr, int fd) { @@ -91,7 +91,7 @@ error: return 0; } -static void tc_on_alarm(void *acp, int success) { +static void tc_on_alarm(void *acp, int success, grpc_call_list *call_list) { int done; async_connect *ac = acp; if (grpc_tcp_trace) { @@ -100,7 +100,7 @@ static void tc_on_alarm(void *acp, int success) { } gpr_mu_lock(&ac->mu); if (ac->fd != NULL) { - grpc_fd_shutdown(ac->fd); + grpc_fd_shutdown(ac->fd, call_list); } done = (--ac->refs == 0); gpr_mu_unlock(&ac->mu); @@ -111,15 +111,14 @@ static void tc_on_alarm(void *acp, int success) { } } -static void on_writable(void *acp, int success) { +static void on_writable(void *acp, int success, grpc_call_list *call_list) { async_connect *ac = acp; int so_error = 0; socklen_t so_error_size; int err; int done; - grpc_endpoint *ep = NULL; - void (*cb)(void *arg, grpc_endpoint *tcp) = ac->cb; - void *cb_arg = ac->cb_arg; + grpc_endpoint **ep = ac->ep; + grpc_closure *closure = ac->closure; grpc_fd *fd; if (grpc_tcp_trace) { @@ -133,7 +132,7 @@ static void on_writable(void *acp, int success) { ac->fd = NULL; gpr_mu_unlock(&ac->mu); - grpc_alarm_cancel(&ac->alarm); + grpc_alarm_cancel(&ac->alarm, call_list); gpr_mu_lock(&ac->mu); if (success) { @@ -162,7 +161,7 @@ static void on_writable(void *acp, int success) { 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(fd, &ac->write_closure, call_list); return; } else { switch (so_error) { @@ -176,8 +175,8 @@ static void on_writable(void *acp, int success) { goto finish; } } else { - grpc_pollset_set_del_fd(ac->interested_parties, fd); - ep = grpc_tcp_create(fd, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, ac->addr_str); + grpc_pollset_set_del_fd(ac->interested_parties, fd, call_list); + *ep = grpc_tcp_create(fd, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, ac->addr_str); fd = NULL; goto finish; } @@ -190,8 +189,8 @@ static void on_writable(void *acp, int success) { finish: if (fd != NULL) { - grpc_pollset_set_del_fd(ac->interested_parties, fd); - grpc_fd_orphan(fd, NULL, "tcp_client_orphan"); + grpc_pollset_set_del_fd(ac->interested_parties, fd, call_list); + grpc_fd_orphan(fd, NULL, "tcp_client_orphan", call_list); fd = NULL; } done = (--ac->refs == 0); @@ -201,14 +200,14 @@ finish: gpr_free(ac->addr_str); gpr_free(ac); } - cb(cb_arg, ep); + grpc_call_list_add(call_list, closure, *ep != NULL); } -void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *ep), - void *arg, grpc_pollset_set *interested_parties, +void grpc_tcp_client_connect(grpc_closure *closure, grpc_endpoint **ep, + grpc_pollset_set *interested_parties, grpc_workqueue *workqueue, const struct sockaddr *addr, size_t addr_len, - gpr_timespec deadline) { + gpr_timespec deadline, grpc_call_list *call_list) { int fd; grpc_dualstack_mode dsmode; int err; @@ -219,6 +218,8 @@ void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *ep), char *name; char *addr_str; + *ep = NULL; + /* Use dualstack sockets where available. */ if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) { addr = (const struct sockaddr *)&addr6_v4mapped; @@ -236,7 +237,7 @@ void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *ep), addr_len = sizeof(addr4_copy); } if (!prepare_socket(addr, fd)) { - cb(arg, NULL); + grpc_call_list_add(call_list, closure, 0); return; } @@ -248,25 +249,26 @@ void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *ep), addr_str = grpc_sockaddr_to_uri(addr); gpr_asprintf(&name, "tcp-client:%s", addr_str); - fdobj = grpc_fd_create(fd, workqueue, name); + fdobj = grpc_fd_create(fd, name); if (err >= 0) { - cb(arg, grpc_tcp_create(fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str)); + *ep = grpc_tcp_create(fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str); + grpc_call_list_add(call_list, closure, 1); goto done; } if (errno != EWOULDBLOCK && errno != EINPROGRESS) { gpr_log(GPR_ERROR, "connect error to '%s': %s", addr_str, strerror(errno)); - grpc_fd_orphan(fdobj, NULL, "tcp_client_connect_error"); - cb(arg, NULL); + grpc_fd_orphan(fdobj, NULL, "tcp_client_connect_error", call_list); + grpc_call_list_add(call_list, closure, 0); goto done; } - grpc_pollset_set_add_fd(interested_parties, fdobj); + grpc_pollset_set_add_fd(interested_parties, fdobj, call_list); ac = gpr_malloc(sizeof(async_connect)); - ac->cb = cb; - ac->cb_arg = arg; + ac->closure = closure; + ac->ep = ep; ac->fd = fdobj; ac->interested_parties = interested_parties; ac->addr_str = addr_str; @@ -284,8 +286,8 @@ void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *ep), gpr_mu_lock(&ac->mu); grpc_alarm_init(&ac->alarm, gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC), - tc_on_alarm, ac, gpr_now(GPR_CLOCK_MONOTONIC)); - grpc_fd_notify_on_write(ac->fd, &ac->write_closure); + tc_on_alarm, ac, gpr_now(GPR_CLOCK_MONOTONIC), call_list); + grpc_fd_notify_on_write(ac->fd, &ac->write_closure, call_list); gpr_mu_unlock(&ac->mu); done: diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c index 374d2f3a408..89a85f26dc9 100644 --- a/src/core/iomgr/tcp_posix.c +++ b/src/core/iomgr/tcp_posix.c @@ -94,30 +94,33 @@ typedef struct { char *peer_string; } grpc_tcp; -static void tcp_handle_read(void *arg /* grpc_tcp */, int success); -static void tcp_handle_write(void *arg /* grpc_tcp */, int success); +static void tcp_handle_read(void *arg /* grpc_tcp */, int success, + grpc_call_list *call_list); +static void tcp_handle_write(void *arg /* grpc_tcp */, int success, + grpc_call_list *call_list); -static void tcp_shutdown(grpc_endpoint *ep) { +static void tcp_shutdown(grpc_endpoint *ep, grpc_call_list *call_list) { grpc_tcp *tcp = (grpc_tcp *)ep; - grpc_fd_shutdown(tcp->em_fd); + grpc_fd_shutdown(tcp->em_fd, call_list); } -static void tcp_free(grpc_tcp *tcp) { - grpc_fd_orphan(tcp->em_fd, NULL, "tcp_unref_orphan"); +static void tcp_free(grpc_tcp *tcp, grpc_call_list *call_list) { + grpc_fd_orphan(tcp->em_fd, NULL, "tcp_unref_orphan", call_list); gpr_free(tcp->peer_string); gpr_free(tcp); } /*#define GRPC_TCP_REFCOUNT_DEBUG*/ #ifdef GRPC_TCP_REFCOUNT_DEBUG -#define TCP_UNREF(tcp, reason) tcp_unref((tcp), (reason), __FILE__, __LINE__) +#define TCP_UNREF(tcp, reason, cl) \ + tcp_unref((tcp), (cl), (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_tcp *tcp, grpc_call_list *call_list, + const char *reason, const char *file, int line) { gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "TCP unref %p : %s %d -> %d", tcp, reason, tcp->refcount.count, tcp->refcount.count - 1); if (gpr_unref(&tcp->refcount)) { - tcp_free(tcp); + tcp_free(tcp, call_list); } } @@ -128,23 +131,24 @@ 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(tcp, reason, cl) tcp_unref((tcp), (cl)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void tcp_unref(grpc_tcp *tcp) { +static void tcp_unref(grpc_tcp *tcp, grpc_call_list *call_list) { if (gpr_unref(&tcp->refcount)) { - tcp_free(tcp); + tcp_free(tcp, call_list); } } static void tcp_ref(grpc_tcp *tcp) { gpr_ref(&tcp->refcount); } #endif -static void tcp_destroy(grpc_endpoint *ep) { +static void tcp_destroy(grpc_endpoint *ep, grpc_call_list *call_list) { grpc_tcp *tcp = (grpc_tcp *)ep; - TCP_UNREF(tcp, "destroy"); + TCP_UNREF(tcp, "destroy", call_list); } -static void call_read_cb(grpc_tcp *tcp, int success) { +static void call_read_cb(grpc_tcp *tcp, int success, + grpc_call_list *call_list) { grpc_closure *cb = tcp->read_cb; if (grpc_tcp_trace) { @@ -160,11 +164,11 @@ static void call_read_cb(grpc_tcp *tcp, int success) { tcp->read_cb = NULL; tcp->incoming_buffer = NULL; - cb->cb(cb->cb_arg, success); + cb->cb(cb->cb_arg, success, call_list); } #define MAX_READ_IOVEC 4 -static void tcp_continue_read(grpc_tcp *tcp) { +static void tcp_continue_read(grpc_tcp *tcp, grpc_call_list *call_list) { struct msghdr msg; struct iovec iov[MAX_READ_IOVEC]; ssize_t read_bytes; @@ -206,18 +210,18 @@ static void tcp_continue_read(grpc_tcp *tcp) { tcp->iov_size /= 2; } /* We've consumed the edge, request a new one */ - grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_closure); + grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_closure, call_list); } else { /* TODO(klempner): Log interesting errors */ gpr_slice_buffer_reset_and_unref(tcp->incoming_buffer); - call_read_cb(tcp, 0); - TCP_UNREF(tcp, "read"); + call_read_cb(tcp, 0, call_list); + TCP_UNREF(tcp, "read", call_list); } } else if (read_bytes == 0) { /* 0 read size ==> end of stream */ gpr_slice_buffer_reset_and_unref(tcp->incoming_buffer); - call_read_cb(tcp, 0); - TCP_UNREF(tcp, "read"); + call_read_cb(tcp, 0, call_list); + TCP_UNREF(tcp, "read", call_list); } else { GPR_ASSERT((size_t)read_bytes <= tcp->incoming_buffer->length); if ((size_t)read_bytes < tcp->incoming_buffer->length) { @@ -228,29 +232,29 @@ static void tcp_continue_read(grpc_tcp *tcp) { ++tcp->iov_size; } GPR_ASSERT((size_t)read_bytes == tcp->incoming_buffer->length); - call_read_cb(tcp, 1); - TCP_UNREF(tcp, "read"); + call_read_cb(tcp, 1, call_list); + TCP_UNREF(tcp, "read", call_list); } GRPC_TIMER_END(GRPC_PTAG_HANDLE_READ, 0); } -static void tcp_handle_read(void *arg /* grpc_tcp */, int success) { +static void tcp_handle_read(void *arg /* grpc_tcp */, int success, + grpc_call_list *call_list) { grpc_tcp *tcp = (grpc_tcp *)arg; GPR_ASSERT(!tcp->finished_edge); if (!success) { gpr_slice_buffer_reset_and_unref(tcp->incoming_buffer); - call_read_cb(tcp, 0); - TCP_UNREF(tcp, "read"); + call_read_cb(tcp, 0, call_list); + TCP_UNREF(tcp, "read", call_list); } else { - tcp_continue_read(tcp); + tcp_continue_read(tcp, call_list); } } -static grpc_endpoint_op_status tcp_read(grpc_endpoint *ep, - gpr_slice_buffer *incoming_buffer, - grpc_closure *cb) { +static void tcp_read(grpc_endpoint *ep, gpr_slice_buffer *incoming_buffer, + grpc_closure *cb, grpc_call_list *call_list) { grpc_tcp *tcp = (grpc_tcp *)ep; GPR_ASSERT(tcp->read_cb == NULL); tcp->read_cb = cb; @@ -259,16 +263,16 @@ static grpc_endpoint_op_status tcp_read(grpc_endpoint *ep, TCP_REF(tcp, "read"); if (tcp->finished_edge) { tcp->finished_edge = 0; - grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_closure); + grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_closure, call_list); } else { - grpc_workqueue_push(tcp->em_fd->workqueue, &tcp->read_closure, 1); + grpc_call_list_add(call_list, &tcp->read_closure, 1); } - /* TODO(ctiller): immediate return */ - return GRPC_ENDPOINT_PENDING; } +typedef enum { FLUSH_DONE, FLUSH_PENDING, FLUSH_ERROR } flush_result; + #define MAX_WRITE_IOVEC 16 -static grpc_endpoint_op_status tcp_flush(grpc_tcp *tcp) { +static flush_result tcp_flush(grpc_tcp *tcp) { struct msghdr msg; struct iovec iov[MAX_WRITE_IOVEC]; msg_iovlen_type iov_size; @@ -318,10 +322,10 @@ static grpc_endpoint_op_status tcp_flush(grpc_tcp *tcp) { if (errno == EAGAIN) { tcp->outgoing_slice_idx = unwind_slice_idx; tcp->outgoing_byte_idx = unwind_byte_idx; - return GRPC_ENDPOINT_PENDING; + return FLUSH_PENDING; } else { /* TODO(klempner): Log some of these */ - return GRPC_ENDPOINT_ERROR; + return FLUSH_ERROR; } } @@ -342,42 +346,42 @@ static grpc_endpoint_op_status tcp_flush(grpc_tcp *tcp) { } if (tcp->outgoing_slice_idx == tcp->outgoing_buffer->count) { - return GRPC_ENDPOINT_DONE; + return FLUSH_DONE; } }; } -static void tcp_handle_write(void *arg /* grpc_tcp */, int success) { +static void tcp_handle_write(void *arg /* grpc_tcp */, int success, + grpc_call_list *call_list) { grpc_tcp *tcp = (grpc_tcp *)arg; - grpc_endpoint_op_status status; + flush_result status; grpc_closure *cb; if (!success) { cb = tcp->write_cb; tcp->write_cb = NULL; - cb->cb(cb->cb_arg, 0); - TCP_UNREF(tcp, "write"); + cb->cb(cb->cb_arg, 0, call_list); + TCP_UNREF(tcp, "write", call_list); return; } GRPC_TIMER_BEGIN(GRPC_PTAG_TCP_CB_WRITE, 0); status = tcp_flush(tcp); - if (status == GRPC_ENDPOINT_PENDING) { - grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_closure); + if (status == FLUSH_PENDING) { + grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_closure, call_list); } else { cb = tcp->write_cb; tcp->write_cb = NULL; - cb->cb(cb->cb_arg, status == GRPC_ENDPOINT_DONE); - TCP_UNREF(tcp, "write"); + cb->cb(cb->cb_arg, status == FLUSH_DONE, call_list); + TCP_UNREF(tcp, "write", call_list); } GRPC_TIMER_END(GRPC_PTAG_TCP_CB_WRITE, 0); } -static grpc_endpoint_op_status tcp_write(grpc_endpoint *ep, - gpr_slice_buffer *buf, - grpc_closure *cb) { +static void tcp_write(grpc_endpoint *ep, gpr_slice_buffer *buf, + grpc_closure *cb, grpc_call_list *call_list) { grpc_tcp *tcp = (grpc_tcp *)ep; - grpc_endpoint_op_status status; + flush_result status; if (grpc_tcp_trace) { size_t i; @@ -395,32 +399,36 @@ static grpc_endpoint_op_status tcp_write(grpc_endpoint *ep, if (buf->length == 0) { GRPC_TIMER_END(GRPC_PTAG_TCP_WRITE, 0); - return GRPC_ENDPOINT_DONE; + grpc_call_list_add(call_list, cb, 1); + return; } tcp->outgoing_buffer = buf; tcp->outgoing_slice_idx = 0; tcp->outgoing_byte_idx = 0; status = tcp_flush(tcp); - if (status == GRPC_ENDPOINT_PENDING) { + if (status == FLUSH_PENDING) { TCP_REF(tcp, "write"); tcp->write_cb = cb; - grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_closure); + grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_closure, call_list); + } else { + grpc_call_list_add(call_list, cb, status == FLUSH_DONE); } GRPC_TIMER_END(GRPC_PTAG_TCP_WRITE, 0); - return status; } -static void tcp_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset) { +static void tcp_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset, + grpc_call_list *call_list) { grpc_tcp *tcp = (grpc_tcp *)ep; - grpc_pollset_add_fd(pollset, tcp->em_fd); + grpc_pollset_add_fd(pollset, tcp->em_fd, call_list); } static void tcp_add_to_pollset_set(grpc_endpoint *ep, - grpc_pollset_set *pollset_set) { + grpc_pollset_set *pollset_set, + grpc_call_list *call_list) { grpc_tcp *tcp = (grpc_tcp *)ep; - grpc_pollset_set_add_fd(pollset_set, tcp->em_fd); + grpc_pollset_set_add_fd(pollset_set, tcp->em_fd, call_list); } static char *tcp_get_peer(grpc_endpoint *ep) { diff --git a/src/core/iomgr/tcp_server.h b/src/core/iomgr/tcp_server.h index 5165f5c5ca8..19e58bc2945 100644 --- a/src/core/iomgr/tcp_server.h +++ b/src/core/iomgr/tcp_server.h @@ -40,7 +40,8 @@ typedef struct grpc_tcp_server grpc_tcp_server; /* New server callback: tcp is the newly connected tcp connection */ -typedef void (*grpc_tcp_server_cb)(void *arg, grpc_endpoint *ep); +typedef void (*grpc_tcp_server_cb)(void *arg, grpc_endpoint *ep, + grpc_call_list *call_list); /* Create a server, initially not bound to any ports */ grpc_tcp_server *grpc_tcp_server_create(void); @@ -48,7 +49,7 @@ grpc_tcp_server *grpc_tcp_server_create(void); /* Start listening to bound ports */ void grpc_tcp_server_start(grpc_tcp_server *server, grpc_pollset **pollsets, size_t pollset_count, grpc_tcp_server_cb cb, - void *cb_arg); + void *cb_arg, grpc_call_list *call_list); /* Add a port to the server, returning port number on success, or negative on failure. @@ -71,8 +72,7 @@ int grpc_tcp_server_add_port(grpc_tcp_server *s, const void *addr, up when grpc_tcp_server_destroy is called. */ int grpc_tcp_server_get_fd(grpc_tcp_server *s, unsigned index); -void grpc_tcp_server_destroy(grpc_tcp_server *server, - void (*shutdown_done)(void *shutdown_done_arg), - void *shutdown_done_arg); +void grpc_tcp_server_destroy(grpc_tcp_server *server, grpc_closure *closure, + grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_TCP_SERVER_H */ diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c index 213b2e1113d..0c5e0053dd3 100644 --- a/src/core/iomgr/tcp_server_posix.c +++ b/src/core/iomgr/tcp_server_posix.c @@ -117,16 +117,12 @@ struct grpc_tcp_server { size_t port_capacity; /* shutdown callback */ - void (*shutdown_complete)(void *); - void *shutdown_complete_arg; + grpc_closure *shutdown_complete; /* all pollsets interested in new connections */ grpc_pollset **pollsets; /* number of pollsets in the pollsets array */ size_t pollset_count; - - /** workqueue for interally created async work */ - grpc_workqueue *workqueue; }; grpc_tcp_server *grpc_tcp_server_create(void) { @@ -140,40 +136,37 @@ grpc_tcp_server *grpc_tcp_server_create(void) { s->ports = gpr_malloc(sizeof(server_port) * INIT_PORT_CAP); s->nports = 0; s->port_capacity = INIT_PORT_CAP; - s->workqueue = grpc_workqueue_create(); return s; } -static void finish_shutdown(grpc_tcp_server *s) { - s->shutdown_complete(s->shutdown_complete_arg); - s->shutdown_complete = NULL; +static void finish_shutdown(grpc_tcp_server *s, grpc_call_list *call_list) { + grpc_call_list_add(call_list, s->shutdown_complete, 1); gpr_mu_destroy(&s->mu); gpr_free(s->ports); - GRPC_WORKQUEUE_UNREF(s->workqueue, "destroy"); gpr_free(s); } -static void destroyed_port(void *server, int success) { +static void destroyed_port(void *server, int success, + grpc_call_list *call_list) { grpc_tcp_server *s = 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(s, call_list); } else { GPR_ASSERT(s->destroyed_ports < s->nports); gpr_mu_unlock(&s->mu); } } -static void dont_care_about_shutdown_completion(void *ignored) {} - /* 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_tcp_server *s, + grpc_call_list *call_list) { size_t i; /* delete ALL the things */ @@ -192,38 +185,35 @@ static void deactivated_all_ports(grpc_tcp_server *s) { } sp->destroyed_closure.cb = destroyed_port; sp->destroyed_closure.cb_arg = s; - grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, "tcp_listener_shutdown"); + grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, "tcp_listener_shutdown", + call_list); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - finish_shutdown(s); + finish_shutdown(s, call_list); } } -void grpc_tcp_server_destroy( - grpc_tcp_server *s, void (*shutdown_complete)(void *shutdown_complete_arg), - void *shutdown_complete_arg) { +void grpc_tcp_server_destroy(grpc_tcp_server *s, grpc_closure *closure, + grpc_call_list *call_list) { size_t i; gpr_mu_lock(&s->mu); GPR_ASSERT(!s->shutdown); s->shutdown = 1; - s->shutdown_complete = shutdown_complete - ? shutdown_complete - : dont_care_about_shutdown_completion; - s->shutdown_complete_arg = shutdown_complete_arg; + s->shutdown_complete = closure; /* shutdown all fd's */ if (s->active_ports) { for (i = 0; i < s->nports; i++) { - grpc_fd_shutdown(s->ports[i].emfd); + grpc_fd_shutdown(s->ports[i].emfd, call_list); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - deactivated_all_ports(s); + deactivated_all_ports(s, call_list); } } @@ -308,7 +298,7 @@ error: } /* event manager callback when reads are ready */ -static void on_read(void *arg, int success) { +static void on_read(void *arg, int success, grpc_call_list *call_list) { server_port *sp = arg; grpc_fd *fdobj; size_t i; @@ -331,7 +321,7 @@ static void on_read(void *arg, int success) { case EINTR: continue; case EAGAIN: - grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure, call_list); return; default: gpr_log(GPR_ERROR, "Failed accept4: %s", strerror(errno)); @@ -348,16 +338,17 @@ static void on_read(void *arg, int success) { gpr_log(GPR_DEBUG, "SERVER_CONNECT: incoming connection: %s", addr_str); } - fdobj = grpc_fd_create(fd, sp->server->workqueue, name); + fdobj = grpc_fd_create(fd, name); /* TODO(ctiller): revise this when we have server-side sharding of channels -- we certainly should not be automatically adding every incoming channel to every pollset owned by the server */ for (i = 0; i < sp->server->pollset_count; i++) { - grpc_pollset_add_fd(sp->server->pollsets[i], fdobj); + grpc_pollset_add_fd(sp->server->pollsets[i], fdobj, call_list); } sp->server->cb( sp->server->cb_arg, - grpc_tcp_create(fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str)); + grpc_tcp_create(fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str), + call_list); gpr_free(name); gpr_free(addr_str); @@ -369,7 +360,7 @@ error: gpr_mu_lock(&sp->server->mu); if (0 == --sp->server->active_ports) { gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(sp->server); + deactivated_all_ports(sp->server, call_list); } else { gpr_mu_unlock(&sp->server->mu); } @@ -396,7 +387,7 @@ static int add_socket_to_server(grpc_tcp_server *s, int fd, sp = &s->ports[s->nports++]; sp->server = s; sp->fd = fd; - sp->emfd = grpc_fd_create(fd, s->workqueue, name); + sp->emfd = grpc_fd_create(fd, name); memcpy(sp->addr.untyped, addr, addr_len); sp->addr_len = addr_len; GPR_ASSERT(sp->emfd); @@ -495,7 +486,7 @@ int grpc_tcp_server_get_fd(grpc_tcp_server *s, unsigned index) { void grpc_tcp_server_start(grpc_tcp_server *s, grpc_pollset **pollsets, size_t pollset_count, grpc_tcp_server_cb cb, - void *cb_arg) { + void *cb_arg, grpc_call_list *call_list) { size_t i, j; GPR_ASSERT(cb); gpr_mu_lock(&s->mu); @@ -507,11 +498,12 @@ void grpc_tcp_server_start(grpc_tcp_server *s, grpc_pollset **pollsets, s->pollset_count = pollset_count; for (i = 0; i < s->nports; i++) { for (j = 0; j < pollset_count; j++) { - grpc_pollset_add_fd(pollsets[j], s->ports[i].emfd); + grpc_pollset_add_fd(pollsets[j], s->ports[i].emfd, call_list); } s->ports[i].read_closure.cb = on_read; s->ports[i].read_closure.cb_arg = &s->ports[i]; - grpc_fd_notify_on_read(s->ports[i].emfd, &s->ports[i].read_closure); + grpc_fd_notify_on_read(s->ports[i].emfd, &s->ports[i].read_closure, + call_list); s->active_ports++; } gpr_mu_unlock(&s->mu); diff --git a/src/core/iomgr/udp_server.c b/src/core/iomgr/udp_server.c index 1a1d8120500..e1c2ae95fd1 100644 --- a/src/core/iomgr/udp_server.c +++ b/src/core/iomgr/udp_server.c @@ -111,15 +111,12 @@ struct grpc_udp_server { size_t port_capacity; /* shutdown callback */ - void (*shutdown_complete)(void *); - void *shutdown_complete_arg; + grpc_closure *shutdown_complete; /* all pollsets interested in new connections */ grpc_pollset **pollsets; /* number of pollsets in the pollsets array */ size_t pollset_count; - - grpc_workqueue *workqueue; }; grpc_udp_server *grpc_udp_server_create(void) { @@ -132,40 +129,38 @@ grpc_udp_server *grpc_udp_server_create(void) { s->ports = gpr_malloc(sizeof(server_port) * INIT_PORT_CAP); s->nports = 0; s->port_capacity = INIT_PORT_CAP; - s->workqueue = grpc_workqueue_create(); return s; } -static void finish_shutdown(grpc_udp_server *s) { - s->shutdown_complete(s->shutdown_complete_arg); +static void finish_shutdown(grpc_udp_server *s, grpc_call_list *call_list) { + grpc_call_list_add(call_list, s->shutdown_complete, 1); gpr_mu_destroy(&s->mu); gpr_cv_destroy(&s->cv); gpr_free(s->ports); - GRPC_WORKQUEUE_UNREF(s->workqueue, "workqueue"); gpr_free(s); } -static void destroyed_port(void *server, int success) { +static void destroyed_port(void *server, int success, + grpc_call_list *call_list) { grpc_udp_server *s = 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(s, call_list); } else { gpr_mu_unlock(&s->mu); } } -static void dont_care_about_shutdown_completion(void *ignored) {} - /* 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_udp_server *s, + grpc_call_list *call_list) { size_t i; /* delete ALL the things */ @@ -184,38 +179,35 @@ static void deactivated_all_ports(grpc_udp_server *s) { } sp->destroyed_closure.cb = destroyed_port; sp->destroyed_closure.cb_arg = s; - grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, "udp_listener_shutdown"); + grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, "udp_listener_shutdown", + call_list); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - finish_shutdown(s); + finish_shutdown(s, call_list); } } -void grpc_udp_server_destroy( - grpc_udp_server *s, void (*shutdown_complete)(void *shutdown_complete_arg), - void *shutdown_complete_arg) { +void grpc_udp_server_destroy(grpc_udp_server *s, grpc_closure *on_done, + grpc_call_list *call_list) { size_t i; gpr_mu_lock(&s->mu); GPR_ASSERT(!s->shutdown); s->shutdown = 1; - s->shutdown_complete = shutdown_complete - ? shutdown_complete - : dont_care_about_shutdown_completion; - s->shutdown_complete_arg = shutdown_complete_arg; + s->shutdown_complete = on_done; /* shutdown all fd's */ if (s->active_ports) { for (i = 0; i < s->nports; i++) { - grpc_fd_shutdown(s->ports[i].emfd); + grpc_fd_shutdown(s->ports[i].emfd, call_list); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - deactivated_all_ports(s); + deactivated_all_ports(s, call_list); } } @@ -270,14 +262,14 @@ error: } /* event manager callback when reads are ready */ -static void on_read(void *arg, int success) { +static void on_read(void *arg, int success, grpc_call_list *call_list) { server_port *sp = arg; if (success == 0) { gpr_mu_lock(&sp->server->mu); if (0 == --sp->server->active_ports) { gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(sp->server); + deactivated_all_ports(sp->server, call_list); } else { gpr_mu_unlock(&sp->server->mu); } @@ -289,7 +281,7 @@ static void on_read(void *arg, int success) { sp->read_cb(sp->fd); /* Re-arm the notification event so we get another chance to read. */ - grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure, call_list); } static int add_socket_to_server(grpc_udp_server *s, int fd, @@ -313,7 +305,7 @@ static int add_socket_to_server(grpc_udp_server *s, int fd, sp = &s->ports[s->nports++]; sp->server = s; sp->fd = fd; - sp->emfd = grpc_fd_create(fd, s->workqueue, name); + sp->emfd = grpc_fd_create(fd, name); memcpy(sp->addr.untyped, addr, addr_len); sp->addr_len = addr_len; sp->read_cb = read_cb; @@ -410,18 +402,19 @@ int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index) { } void grpc_udp_server_start(grpc_udp_server *s, grpc_pollset **pollsets, - size_t pollset_count) { + size_t pollset_count, grpc_call_list *call_list) { size_t i, j; gpr_mu_lock(&s->mu); GPR_ASSERT(s->active_ports == 0); s->pollsets = pollsets; for (i = 0; i < s->nports; i++) { for (j = 0; j < pollset_count; j++) { - grpc_pollset_add_fd(pollsets[j], s->ports[i].emfd); + grpc_pollset_add_fd(pollsets[j], s->ports[i].emfd, call_list); } s->ports[i].read_closure.cb = on_read; s->ports[i].read_closure.cb_arg = &s->ports[i]; - grpc_fd_notify_on_read(s->ports[i].emfd, &s->ports[i].read_closure); + grpc_fd_notify_on_read(s->ports[i].emfd, &s->ports[i].read_closure, + call_list); s->active_ports++; } gpr_mu_unlock(&s->mu); diff --git a/src/core/iomgr/udp_server.h b/src/core/iomgr/udp_server.h index c930e81cbc6..fa4d2147b4f 100644 --- a/src/core/iomgr/udp_server.h +++ b/src/core/iomgr/udp_server.h @@ -47,7 +47,7 @@ grpc_udp_server *grpc_udp_server_create(void); /* Start listening to bound ports */ void grpc_udp_server_start(grpc_udp_server *udp_server, grpc_pollset **pollsets, - size_t pollset_count); + size_t pollset_count, grpc_call_list *call_list); int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index); @@ -64,9 +64,8 @@ int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index); int grpc_udp_server_add_port(grpc_udp_server *s, const void *addr, size_t addr_len, grpc_udp_server_read_cb read_cb); -void grpc_udp_server_destroy(grpc_udp_server *server, - void (*shutdown_done)(void *shutdown_done_arg), - void *shutdown_done_arg); +void grpc_udp_server_destroy(grpc_udp_server *server, grpc_closure *on_done, + grpc_call_list *call_list); /* Write the contents of buffer to the underlying UDP socket. */ /* diff --git a/src/core/iomgr/workqueue.h b/src/core/iomgr/workqueue.h index 6f09399b558..b9d2a87dca3 100644 --- a/src/core/iomgr/workqueue.h +++ b/src/core/iomgr/workqueue.h @@ -50,25 +50,25 @@ struct grpc_workqueue; typedef struct grpc_workqueue grpc_workqueue; /** Create a work queue */ -grpc_workqueue *grpc_workqueue_create(void); +grpc_workqueue *grpc_workqueue_create(grpc_call_list *call_list); -void grpc_workqueue_flush(grpc_workqueue *workqueue); +void grpc_workqueue_flush(grpc_workqueue *workqueue, grpc_call_list *call_list); #define GRPC_WORKQUEUE_REFCOUNT_DEBUG #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG #define GRPC_WORKQUEUE_REF(p, r) \ grpc_workqueue_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_WORKQUEUE_UNREF(p, r) \ - grpc_workqueue_unref((p), __FILE__, __LINE__, (r)) +#define GRPC_WORKQUEUE_UNREF(p, r, cl) \ + grpc_workqueue_unref((p), (cl), __FILE__, __LINE__, (r)) void grpc_workqueue_ref(grpc_workqueue *workqueue, const char *file, int line, const char *reason); -void grpc_workqueue_unref(grpc_workqueue *workqueue, const char *file, int line, - const char *reason); +void grpc_workqueue_unref(grpc_workqueue *workqueue, grpc_call_list *call_list, + const char *file, int line, const char *reason); #else #define GRPC_WORKQUEUE_REF(p, r) grpc_workqueue_ref((p)) -#define GRPC_WORKQUEUE_UNREF(p, r) grpc_workqueue_unref((p)) +#define GRPC_WORKQUEUE_UNREF(p, r, cl) grpc_workqueue_unref((p), (cl)) void grpc_workqueue_ref(grpc_workqueue *workqueue); -void grpc_workqueue_unref(grpc_workqueue *workqueue); +void grpc_workqueue_unref(grpc_workqueue *workqueue, grpc_call_list *call_list); #endif /** Bind this workqueue to a pollset */ diff --git a/src/core/iomgr/workqueue_posix.c b/src/core/iomgr/workqueue_posix.c index 85b541f4d21..83249c583ce 100644 --- a/src/core/iomgr/workqueue_posix.c +++ b/src/core/iomgr/workqueue_posix.c @@ -45,9 +45,9 @@ #include "src/core/iomgr/fd_posix.h" -static void on_readable(void *arg, int success); +static void on_readable(void *arg, int success, grpc_call_list *call_list); -grpc_workqueue *grpc_workqueue_create(void) { +grpc_workqueue *grpc_workqueue_create(grpc_call_list *call_list) { char name[32]; grpc_workqueue *workqueue = gpr_malloc(sizeof(grpc_workqueue)); gpr_ref_init(&workqueue->refs, 1); @@ -55,17 +55,18 @@ grpc_workqueue *grpc_workqueue_create(void) { workqueue->call_list.head = workqueue->call_list.tail = NULL; grpc_wakeup_fd_init(&workqueue->wakeup_fd); sprintf(name, "workqueue:%p", (void *)workqueue); - workqueue->wakeup_read_fd = NULL; /* inspected during grpc_fd_create below */ - workqueue->wakeup_read_fd = grpc_fd_create( - GRPC_WAKEUP_FD_GET_READ_FD(&workqueue->wakeup_fd), workqueue, name); + workqueue->wakeup_read_fd = + grpc_fd_create(GRPC_WAKEUP_FD_GET_READ_FD(&workqueue->wakeup_fd), name); grpc_closure_init(&workqueue->read_closure, on_readable, workqueue); - grpc_fd_notify_on_read(workqueue->wakeup_read_fd, &workqueue->read_closure); + grpc_fd_notify_on_read(workqueue->wakeup_read_fd, &workqueue->read_closure, + call_list); return workqueue; } -static void workqueue_destroy(grpc_workqueue *workqueue) { +static void workqueue_destroy(grpc_workqueue *workqueue, + grpc_call_list *call_list) { GPR_ASSERT(grpc_call_list_empty(workqueue->call_list)); - grpc_fd_shutdown(workqueue->wakeup_read_fd); + grpc_fd_shutdown(workqueue->wakeup_read_fd, call_list); } #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG @@ -81,33 +82,34 @@ void grpc_workqueue_ref(grpc_workqueue *workqueue) { } #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG -void grpc_workqueue_unref(grpc_workqueue *workqueue, const char *file, int line, - const char *reason) { +void grpc_workqueue_unref(grpc_workqueue *workqueue, grpc_call_list *call_list, + const char *file, int line, const char *reason) { gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p unref %d -> %d %s", workqueue, (int)workqueue->refs.count, (int)workqueue->refs.count - 1, reason); #else -void grpc_workqueue_unref(grpc_workqueue *workqueue) { +void grpc_workqueue_unref(grpc_workqueue *workqueue, + grpc_call_list *call_list) { #endif if (gpr_unref(&workqueue->refs)) { - workqueue_destroy(workqueue); + workqueue_destroy(workqueue, call_list); } } void grpc_workqueue_add_to_pollset(grpc_workqueue *workqueue, - grpc_pollset *pollset) { - grpc_pollset_add_fd(pollset, workqueue->wakeup_read_fd); + grpc_pollset *pollset, + grpc_call_list *call_list) { + grpc_pollset_add_fd(pollset, workqueue->wakeup_read_fd, call_list); } -void grpc_workqueue_flush(grpc_workqueue *workqueue) { - grpc_call_list todo = GRPC_CALL_LIST_INIT; +void grpc_workqueue_flush(grpc_workqueue *workqueue, + grpc_call_list *call_list) { gpr_mu_lock(&workqueue->mu); - GPR_SWAP(grpc_call_list, todo, workqueue->call_list); + grpc_call_list_move(&workqueue->call_list, call_list); gpr_mu_unlock(&workqueue->mu); - grpc_call_list_run(todo); } -static void on_readable(void *arg, int success) { +static void on_readable(void *arg, int success, grpc_call_list *call_list) { grpc_workqueue *workqueue = arg; if (!success) { @@ -115,16 +117,15 @@ static void on_readable(void *arg, int success) { /* HACK: let wakeup_fd code know that we stole the fd */ workqueue->wakeup_fd.read_fd = 0; grpc_wakeup_fd_destroy(&workqueue->wakeup_fd); - grpc_fd_orphan(workqueue->wakeup_read_fd, NULL, "destroy"); + grpc_fd_orphan(workqueue->wakeup_read_fd, NULL, "destroy", call_list); gpr_free(workqueue); } else { - grpc_call_list todo = GRPC_CALL_LIST_INIT; gpr_mu_lock(&workqueue->mu); - GPR_SWAP(grpc_call_list, todo, workqueue->call_list); + grpc_call_list_move(&workqueue->call_list, call_list); grpc_wakeup_fd_consume_wakeup(&workqueue->wakeup_fd); gpr_mu_unlock(&workqueue->mu); - grpc_fd_notify_on_read(workqueue->wakeup_read_fd, &workqueue->read_closure); - grpc_call_list_run(todo); + grpc_fd_notify_on_read(workqueue->wakeup_read_fd, &workqueue->read_closure, + call_list); } } diff --git a/src/core/security/client_auth_filter.c b/src/core/security/client_auth_filter.c index f3ecfd0e60e..0a2de4f7bb4 100644 --- a/src/core/security/client_auth_filter.c +++ b/src/core/security/client_auth_filter.c @@ -76,17 +76,18 @@ typedef struct { } channel_data; static void bubble_up_error(grpc_call_element *elem, grpc_status_code status, - const char *error_msg) { + const char *error_msg, grpc_call_list *call_list) { call_data *calld = elem->call_data; gpr_log(GPR_ERROR, "Client side authentication failure: %s", error_msg); grpc_transport_stream_op_add_cancellation(&calld->op, status); - grpc_call_next_op(elem, &calld->op); + grpc_call_next_op(elem, &calld->op, call_list); } static void on_credentials_metadata(void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status) { + grpc_credentials_status status, + grpc_call_list *call_list) { grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -95,7 +96,7 @@ static void on_credentials_metadata(void *user_data, size_t i; if (status != GRPC_CREDENTIALS_OK) { bubble_up_error(elem, GRPC_STATUS_UNAUTHENTICATED, - "Credentials failed to get metadata."); + "Credentials failed to get metadata.", call_list); return; } GPR_ASSERT(num_md <= MAX_CREDENTIALS_METADATA_COUNT); @@ -108,7 +109,7 @@ static void on_credentials_metadata(void *user_data, grpc_mdelem_from_slices(chand->md_ctx, gpr_slice_ref(md_elems[i].key), gpr_slice_ref(md_elems[i].value))); } - grpc_call_next_op(elem, op); + grpc_call_next_op(elem, op, call_list); } static char *build_service_url(const char *url_scheme, call_data *calld) { @@ -132,7 +133,8 @@ static char *build_service_url(const char *url_scheme, call_data *calld) { } static void send_security_metadata(grpc_call_element *elem, - grpc_transport_stream_op *op) { + grpc_transport_stream_op *op, + grpc_call_list *call_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_client_security_context *ctx = @@ -148,7 +150,7 @@ static void send_security_metadata(grpc_call_element *elem, if (!channel_creds_has_md && !call_creds_has_md) { /* Skip sending metadata altogether. */ - grpc_call_next_op(elem, op); + grpc_call_next_op(elem, op, call_list); return; } @@ -157,7 +159,8 @@ static void send_security_metadata(grpc_call_element *elem, grpc_composite_credentials_create(channel_creds, ctx->creds, NULL); if (calld->creds == NULL) { bubble_up_error(elem, GRPC_STATUS_INVALID_ARGUMENT, - "Incompatible credentials set on channel and call."); + "Incompatible credentials set on channel and call.", + call_list); return; } } else { @@ -169,22 +172,24 @@ static void send_security_metadata(grpc_call_element *elem, build_service_url(chand->security_connector->base.url_scheme, calld); calld->op = *op; /* Copy op (originates from the caller's stack). */ GPR_ASSERT(calld->pollset); - grpc_credentials_get_request_metadata( - calld->creds, calld->pollset, service_url, on_credentials_metadata, elem); + grpc_credentials_get_request_metadata(calld->creds, calld->pollset, + service_url, on_credentials_metadata, + elem, call_list); gpr_free(service_url); } -static void on_host_checked(void *user_data, grpc_security_status status) { +static void on_host_checked(void *user_data, grpc_security_status status, + grpc_call_list *call_list) { grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = elem->call_data; if (status == GRPC_SECURITY_OK) { - send_security_metadata(elem, &calld->op); + send_security_metadata(elem, &calld->op, call_list); } else { char *error_msg; gpr_asprintf(&error_msg, "Invalid host %s set in :authority metadata.", grpc_mdstr_as_c_string(calld->host)); - bubble_up_error(elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg); + bubble_up_error(elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg, call_list); gpr_free(error_msg); } } @@ -195,7 +200,8 @@ static void on_host_checked(void *user_data, grpc_security_status status) { op contains type and call direction information, in addition to the data that is being sent or received. */ static void auth_start_transport_op(grpc_call_element *elem, - grpc_transport_stream_op *op) { + grpc_transport_stream_op *op, + grpc_call_list *call_list) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -247,26 +253,28 @@ static void auth_start_transport_op(grpc_call_element *elem, const char *call_host = grpc_mdstr_as_c_string(calld->host); calld->op = *op; /* Copy op (originates from the caller's stack). */ status = grpc_channel_security_connector_check_call_host( - chand->security_connector, call_host, on_host_checked, elem); + chand->security_connector, call_host, on_host_checked, elem, + call_list); if (status != GRPC_SECURITY_OK) { if (status == GRPC_SECURITY_ERROR) { char *error_msg; gpr_asprintf(&error_msg, "Invalid host %s set in :authority metadata.", call_host); - bubble_up_error(elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg); + bubble_up_error(elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg, + call_list); gpr_free(error_msg); } return; /* early exit */ } } - send_security_metadata(elem, op); + send_security_metadata(elem, op, call_list); return; /* early exit */ } } - /* pass control up or down the stack */ - grpc_call_next_op(elem, op); + /* pass control down the stack */ + grpc_call_next_op(elem, op, call_list); } /* Constructor for call_data */ @@ -285,7 +293,8 @@ static void 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_call_element *elem, + grpc_call_list *call_list) { call_data *calld = elem->call_data; grpc_credentials_unref(calld->creds); if (calld->host != NULL) { @@ -300,7 +309,7 @@ static void destroy_call_elem(grpc_call_element *elem) { static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *metadata_context, int is_first, - int is_last) { + int is_last, grpc_call_list *call_list) { grpc_security_connector *sc = grpc_find_security_connector_in_args(args); /* grab pointers to our data from the channel element */ channel_data *chand = elem->channel_data; @@ -326,7 +335,8 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem, + grpc_call_list *call_list) { /* grab pointers to our data from the channel element */ channel_data *chand = elem->channel_data; grpc_channel_security_connector *ctx = chand->security_connector; diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index f151fba959c..086c4281127 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -108,16 +108,17 @@ void grpc_credentials_get_request_metadata(grpc_credentials *creds, grpc_pollset *pollset, const char *service_url, grpc_credentials_metadata_cb cb, - void *user_data) { + void *user_data, + grpc_call_list *call_list) { if (creds == NULL || !grpc_credentials_has_request_metadata(creds) || creds->vtable->get_request_metadata == NULL) { if (cb != NULL) { - cb(user_data, NULL, 0, GRPC_CREDENTIALS_OK); + cb(user_data, NULL, 0, GRPC_CREDENTIALS_OK, call_list); } return; } creds->vtable->get_request_metadata(creds, pollset, service_url, cb, - user_data); + user_data, call_list); } grpc_security_status grpc_credentials_create_security_connector( @@ -375,7 +376,8 @@ static void jwt_get_request_metadata(grpc_credentials *creds, grpc_pollset *pollset, const char *service_url, grpc_credentials_metadata_cb cb, - void *user_data) { + void *user_data, + grpc_call_list *call_list) { grpc_service_account_jwt_access_credentials *c = (grpc_service_account_jwt_access_credentials *)creds; gpr_timespec refresh_threshold = gpr_time_from_seconds( @@ -419,10 +421,11 @@ static void jwt_get_request_metadata(grpc_credentials *creds, } if (jwt_md != NULL) { - cb(user_data, jwt_md->entries, jwt_md->num_entries, GRPC_CREDENTIALS_OK); + cb(user_data, jwt_md->entries, jwt_md->num_entries, GRPC_CREDENTIALS_OK, + call_list); grpc_credentials_md_store_unref(jwt_md); } else { - cb(user_data, NULL, 0, GRPC_CREDENTIALS_ERROR); + cb(user_data, NULL, 0, GRPC_CREDENTIALS_ERROR, call_list); } } @@ -568,7 +571,8 @@ end: } static void on_oauth2_token_fetcher_http_response( - void *user_data, const grpc_httpcli_response *response) { + void *user_data, const grpc_httpcli_response *response, + grpc_call_list *call_list) { grpc_credentials_metadata_request *r = (grpc_credentials_metadata_request *)user_data; grpc_oauth2_token_fetcher_credentials *c = @@ -583,10 +587,10 @@ static void on_oauth2_token_fetcher_http_response( c->token_expiration = gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), token_lifetime); r->cb(r->user_data, c->access_token_md->entries, - c->access_token_md->num_entries, status); + c->access_token_md->num_entries, status, call_list); } else { c->token_expiration = gpr_inf_past(GPR_CLOCK_REALTIME); - r->cb(r->user_data, NULL, 0, status); + r->cb(r->user_data, NULL, 0, status, call_list); } gpr_mu_unlock(&c->mu); grpc_credentials_metadata_request_destroy(r); @@ -594,7 +598,8 @@ static void on_oauth2_token_fetcher_http_response( static void oauth2_token_fetcher_get_request_metadata( grpc_credentials *creds, grpc_pollset *pollset, const char *service_url, - grpc_credentials_metadata_cb cb, void *user_data) { + grpc_credentials_metadata_cb cb, void *user_data, + grpc_call_list *call_list) { grpc_oauth2_token_fetcher_credentials *c = (grpc_oauth2_token_fetcher_credentials *)creds; gpr_timespec refresh_threshold = gpr_time_from_seconds( @@ -613,13 +618,14 @@ static void oauth2_token_fetcher_get_request_metadata( } if (cached_access_token_md != NULL) { cb(user_data, cached_access_token_md->entries, - cached_access_token_md->num_entries, GRPC_CREDENTIALS_OK); + cached_access_token_md->num_entries, GRPC_CREDENTIALS_OK, call_list); grpc_credentials_md_store_unref(cached_access_token_md); } else { c->fetch_func( grpc_credentials_metadata_request_create(creds, cb, user_data), &c->httpcli_context, pollset, on_oauth2_token_fetcher_http_response, - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), refresh_threshold)); + gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), refresh_threshold), + call_list); } } @@ -644,7 +650,8 @@ static grpc_credentials_vtable compute_engine_vtable = { static void compute_engine_fetch_oauth2( grpc_credentials_metadata_request *metadata_req, grpc_httpcli_context *httpcli_context, grpc_pollset *pollset, - grpc_httpcli_response_cb response_cb, gpr_timespec deadline) { + grpc_httpcli_response_cb response_cb, gpr_timespec deadline, + grpc_call_list *call_list) { grpc_httpcli_header header = {"Metadata-Flavor", "Google"}; grpc_httpcli_request request; memset(&request, 0, sizeof(grpc_httpcli_request)); @@ -653,7 +660,7 @@ static void compute_engine_fetch_oauth2( request.hdr_count = 1; request.hdrs = &header; grpc_httpcli_get(httpcli_context, pollset, &request, deadline, response_cb, - metadata_req); + metadata_req, call_list); } grpc_credentials *grpc_google_compute_engine_credentials_create( @@ -683,7 +690,8 @@ static grpc_credentials_vtable refresh_token_vtable = { static void refresh_token_fetch_oauth2( grpc_credentials_metadata_request *metadata_req, grpc_httpcli_context *httpcli_context, grpc_pollset *pollset, - grpc_httpcli_response_cb response_cb, gpr_timespec deadline) { + grpc_httpcli_response_cb response_cb, gpr_timespec deadline, + grpc_call_list *call_list) { grpc_google_refresh_token_credentials *c = (grpc_google_refresh_token_credentials *)metadata_req->creds; grpc_httpcli_header header = {"Content-Type", @@ -700,7 +708,7 @@ static void refresh_token_fetch_oauth2( request.hdrs = &header; request.handshaker = &grpc_httpcli_ssl; grpc_httpcli_post(httpcli_context, pollset, &request, body, strlen(body), - deadline, response_cb, metadata_req); + deadline, response_cb, metadata_req, call_list); gpr_free(body); } @@ -743,20 +751,23 @@ static int md_only_test_has_request_metadata_only( return 1; } -void on_simulated_token_fetch_done(void *user_data) { +static void on_simulated_token_fetch_done(void *user_data) { grpc_credentials_metadata_request *r = (grpc_credentials_metadata_request *)user_data; grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)r->creds; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; r->cb(r->user_data, c->md_store->entries, c->md_store->num_entries, - GRPC_CREDENTIALS_OK); + GRPC_CREDENTIALS_OK, &call_list); grpc_credentials_metadata_request_destroy(r); + grpc_call_list_run(&call_list); } static void md_only_test_get_request_metadata(grpc_credentials *creds, grpc_pollset *pollset, const char *service_url, grpc_credentials_metadata_cb cb, - void *user_data) { + void *user_data, + grpc_call_list *call_list) { grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)creds; if (c->is_async) { @@ -765,7 +776,7 @@ static void md_only_test_get_request_metadata(grpc_credentials *creds, grpc_credentials_metadata_request_create(creds, cb, user_data); gpr_thd_new(&thd_id, on_simulated_token_fetch_done, cb_arg, NULL); } else { - cb(user_data, c->md_store->entries, 1, GRPC_CREDENTIALS_OK); + cb(user_data, c->md_store->entries, 1, GRPC_CREDENTIALS_OK, call_list); } } @@ -809,9 +820,10 @@ static void access_token_get_request_metadata(grpc_credentials *creds, grpc_pollset *pollset, const char *service_url, grpc_credentials_metadata_cb cb, - void *user_data) { + void *user_data, + grpc_call_list *call_list) { grpc_access_token_credentials *c = (grpc_access_token_credentials *)creds; - cb(user_data, c->access_token_md->entries, 1, GRPC_CREDENTIALS_OK); + cb(user_data, c->access_token_md->entries, 1, GRPC_CREDENTIALS_OK, call_list); } static grpc_credentials_vtable access_token_vtable = { @@ -958,11 +970,12 @@ static void composite_md_context_destroy( static void composite_metadata_cb(void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status) { + grpc_credentials_status status, + grpc_call_list *call_list) { grpc_composite_credentials_metadata_context *ctx = (grpc_composite_credentials_metadata_context *)user_data; if (status != GRPC_CREDENTIALS_OK) { - ctx->cb(ctx->user_data, NULL, 0, status); + ctx->cb(ctx->user_data, NULL, 0, status, call_list); return; } @@ -980,28 +993,30 @@ static void composite_metadata_cb(void *user_data, grpc_credentials *inner_creds = ctx->composite_creds->inner.creds_array[ctx->creds_index++]; if (grpc_credentials_has_request_metadata(inner_creds)) { - grpc_credentials_get_request_metadata(inner_creds, ctx->pollset, - ctx->service_url, - composite_metadata_cb, ctx); + grpc_credentials_get_request_metadata( + inner_creds, ctx->pollset, ctx->service_url, composite_metadata_cb, + ctx, call_list); return; } } /* We're done!. */ ctx->cb(ctx->user_data, ctx->md_elems->entries, ctx->md_elems->num_entries, - GRPC_CREDENTIALS_OK); + GRPC_CREDENTIALS_OK, call_list); composite_md_context_destroy(ctx); + grpc_call_list_run(call_list); } static void composite_get_request_metadata(grpc_credentials *creds, grpc_pollset *pollset, const char *service_url, grpc_credentials_metadata_cb cb, - void *user_data) { + void *user_data, + grpc_call_list *call_list) { grpc_composite_credentials *c = (grpc_composite_credentials *)creds; grpc_composite_credentials_metadata_context *ctx; if (!grpc_credentials_has_request_metadata(creds)) { - cb(user_data, NULL, 0, GRPC_CREDENTIALS_OK); + cb(user_data, NULL, 0, GRPC_CREDENTIALS_OK, call_list); return; } ctx = gpr_malloc(sizeof(grpc_composite_credentials_metadata_context)); @@ -1016,7 +1031,8 @@ static void composite_get_request_metadata(grpc_credentials *creds, grpc_credentials *inner_creds = c->inner.creds_array[ctx->creds_index++]; if (grpc_credentials_has_request_metadata(inner_creds)) { grpc_credentials_get_request_metadata(inner_creds, pollset, service_url, - composite_metadata_cb, ctx); + composite_metadata_cb, ctx, + call_list); return; } } @@ -1152,10 +1168,11 @@ static void iam_get_request_metadata(grpc_credentials *creds, grpc_pollset *pollset, const char *service_url, grpc_credentials_metadata_cb cb, - void *user_data) { + void *user_data, + grpc_call_list *call_list) { grpc_google_iam_credentials *c = (grpc_google_iam_credentials *)creds; - cb(user_data, c->iam_md->entries, c->iam_md->num_entries, - GRPC_CREDENTIALS_OK); + cb(user_data, c->iam_md->entries, c->iam_md->num_entries, GRPC_CREDENTIALS_OK, + call_list); } static grpc_credentials_vtable iam_vtable = { diff --git a/src/core/security/credentials.h b/src/core/security/credentials.h index 8e4fed7615f..a93d0ec653c 100644 --- a/src/core/security/credentials.h +++ b/src/core/security/credentials.h @@ -126,7 +126,8 @@ char *grpc_get_well_known_google_credentials_file_path(void); typedef void (*grpc_credentials_metadata_cb)(void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status); + grpc_credentials_status status, + grpc_call_list *call_list); typedef struct { void (*destruct)(grpc_credentials *c); @@ -134,8 +135,8 @@ typedef struct { int (*has_request_metadata_only)(const grpc_credentials *c); void (*get_request_metadata)(grpc_credentials *c, grpc_pollset *pollset, const char *service_url, - grpc_credentials_metadata_cb cb, - void *user_data); + grpc_credentials_metadata_cb cb, void *user_data, + grpc_call_list *call_list); grpc_security_status (*create_security_connector)( grpc_credentials *c, const char *target, const grpc_channel_args *args, grpc_credentials *request_metadata_creds, @@ -156,7 +157,8 @@ void grpc_credentials_get_request_metadata(grpc_credentials *creds, grpc_pollset *pollset, const char *service_url, grpc_credentials_metadata_cb cb, - void *user_data); + void *user_data, + grpc_call_list *call_list); /* 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 @@ -274,7 +276,8 @@ typedef void (*grpc_fetch_oauth2_func)(grpc_credentials_metadata_request *req, grpc_httpcli_context *http_context, grpc_pollset *pollset, grpc_httpcli_response_cb response_cb, - gpr_timespec deadline); + gpr_timespec deadline, + grpc_call_list *call_list); typedef struct { grpc_credentials base; diff --git a/src/core/security/google_default_credentials.c b/src/core/security/google_default_credentials.c index 874dd59e846..5da29f5ad5d 100644 --- a/src/core/security/google_default_credentials.c +++ b/src/core/security/google_default_credentials.c @@ -63,7 +63,8 @@ typedef struct { } compute_engine_detector; static void on_compute_engine_detection_http_response( - void *user_data, const grpc_httpcli_response *response) { + void *user_data, const grpc_httpcli_response *response, + grpc_call_list *call_list) { compute_engine_detector *detector = (compute_engine_detector *)user_data; if (response != NULL && response->status == 200 && response->hdr_count > 0) { /* Internet providers can return a generic response to all requests, so @@ -84,12 +85,16 @@ static void on_compute_engine_detection_http_response( gpr_mu_unlock(GRPC_POLLSET_MU(&detector->pollset)); } -static void destroy_pollset(void *p) { grpc_pollset_destroy(p); } +static void destroy_pollset(void *p, int s, grpc_call_list *call_list) { + grpc_pollset_destroy(p); +} static int is_stack_running_on_compute_engine(void) { compute_engine_detector detector; grpc_httpcli_request request; grpc_httpcli_context context; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure destroy_closure; /* The http call is local. If it takes more than one sec, it is for sure not on compute engine. */ @@ -108,7 +113,9 @@ static int is_stack_running_on_compute_engine(void) { grpc_httpcli_get( &context, &detector.pollset, &request, gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), max_detection_delay), - on_compute_engine_detection_http_response, &detector); + on_compute_engine_detection_http_response, &detector, &call_list); + + grpc_call_list_run(&call_list); /* 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. */ @@ -121,7 +128,9 @@ static int is_stack_running_on_compute_engine(void) { gpr_mu_unlock(GRPC_POLLSET_MU(&detector.pollset)); grpc_httpcli_context_destroy(&context); - grpc_pollset_shutdown(&detector.pollset, destroy_pollset, &detector.pollset); + grpc_closure_init(&destroy_closure, destroy_pollset, &detector.pollset); + grpc_pollset_shutdown(&detector.pollset, &destroy_closure, &call_list); + grpc_call_list_run(&call_list); return detector.success; } diff --git a/src/core/security/jwt_verifier.c b/src/core/security/jwt_verifier.c index 790f2178dbe..a6736c922cb 100644 --- a/src/core/security/jwt_verifier.c +++ b/src/core/security/jwt_verifier.c @@ -570,7 +570,8 @@ end: } static void on_keys_retrieved(void *user_data, - const grpc_httpcli_response *response) { + const grpc_httpcli_response *response, + grpc_call_list *call_list) { grpc_json *json = json_from_http(response); verifier_cb_ctx *ctx = (verifier_cb_ctx *)user_data; EVP_PKEY *verification_key = NULL; @@ -611,7 +612,8 @@ end: } static void on_openid_config_retrieved(void *user_data, - const grpc_httpcli_response *response) { + const grpc_httpcli_response *response, + grpc_call_list *call_list) { const grpc_json *cur; grpc_json *json = json_from_http(response); verifier_cb_ctx *ctx = (verifier_cb_ctx *)user_data; @@ -643,7 +645,7 @@ static void on_openid_config_retrieved(void *user_data, grpc_httpcli_get( &ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), - on_keys_retrieved, ctx); + on_keys_retrieved, ctx, call_list); grpc_json_destroy(json); gpr_free(req.host); return; @@ -682,7 +684,8 @@ static void verifier_put_mapping(grpc_jwt_verifier *v, const char *email_domain, } /* Takes ownership of ctx. */ -static void retrieve_key_and_verify(verifier_cb_ctx *ctx) { +static void retrieve_key_and_verify(verifier_cb_ctx *ctx, + grpc_call_list *call_list) { const char *at_sign; grpc_httpcli_response_cb http_cb; char *path_prefix = NULL; @@ -745,7 +748,7 @@ static void retrieve_key_and_verify(verifier_cb_ctx *ctx) { grpc_httpcli_get( &ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), - http_cb, ctx); + http_cb, ctx, call_list); gpr_free(req.host); gpr_free(req.path); return; @@ -758,8 +761,8 @@ error: void grpc_jwt_verifier_verify(grpc_jwt_verifier *verifier, grpc_pollset *pollset, const char *jwt, const char *audience, - grpc_jwt_verification_done_cb cb, - void *user_data) { + grpc_jwt_verification_done_cb cb, void *user_data, + grpc_call_list *call_list) { const char *dot = NULL; grpc_json *json; jose_header *header = NULL; @@ -792,7 +795,8 @@ void grpc_jwt_verifier_verify(grpc_jwt_verifier *verifier, if (GPR_SLICE_IS_EMPTY(signature)) goto error; retrieve_key_and_verify( verifier_cb_ctx_create(verifier, pollset, header, claims, audience, - signature, jwt, signed_jwt_len, user_data, cb)); + signature, jwt, signed_jwt_len, user_data, cb), + call_list); return; error: diff --git a/src/core/security/jwt_verifier.h b/src/core/security/jwt_verifier.h index 7a32debfcb5..394935302ba 100644 --- a/src/core/security/jwt_verifier.h +++ b/src/core/security/jwt_verifier.h @@ -123,8 +123,8 @@ typedef void (*grpc_jwt_verification_done_cb)(void *user_data, void grpc_jwt_verifier_verify(grpc_jwt_verifier *verifier, grpc_pollset *pollset, const char *jwt, const char *audience, - grpc_jwt_verification_done_cb cb, - void *user_data); + grpc_jwt_verification_done_cb cb, void *user_data, + grpc_call_list *call_list); /* --- TESTING ONLY exposed functions. --- */ diff --git a/src/core/security/secure_endpoint.c b/src/core/security/secure_endpoint.c index dcafc0fc0fa..a501544341c 100644 --- a/src/core/security/secure_endpoint.c +++ b/src/core/security/secure_endpoint.c @@ -67,9 +67,9 @@ typedef struct { int grpc_trace_secure_endpoint = 0; -static void destroy(secure_endpoint *secure_ep) { +static void destroy(secure_endpoint *secure_ep, grpc_call_list *call_list) { secure_endpoint *ep = secure_ep; - grpc_endpoint_destroy(ep->wrapped_ep); + grpc_endpoint_destroy(ep->wrapped_ep, call_list); tsi_frame_protector_destroy(ep->protector); gpr_slice_buffer_destroy(&ep->leftover_bytes); gpr_slice_unref(ep->read_staging_buffer); @@ -102,11 +102,12 @@ 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(ep, reason, cl) secure_endpoint_unref((ep), (cl)) #define SECURE_ENDPOINT_REF(ep, reason) secure_endpoint_ref((ep)) -static void secure_endpoint_unref(secure_endpoint *ep) { +static void secure_endpoint_unref(secure_endpoint *ep, + grpc_call_list *call_list) { if (gpr_unref(&ep->ref)) { - destroy(ep); + destroy(ep, call_list); } } @@ -121,7 +122,8 @@ static void flush_read_staging_buffer(secure_endpoint *ep, gpr_uint8 **cur, *end = GPR_SLICE_END_PTR(ep->read_staging_buffer); } -static void call_read_cb(secure_endpoint *ep, int success) { +static void call_read_cb(secure_endpoint *ep, int success, + grpc_call_list *call_list) { if (grpc_trace_secure_endpoint) { size_t i; for (i = 0; i < ep->read_buffer->count; i++) { @@ -132,11 +134,11 @@ static void call_read_cb(secure_endpoint *ep, int success) { } } ep->read_buffer = NULL; - ep->read_cb->cb(ep->read_cb->cb_arg, success); - SECURE_ENDPOINT_UNREF(ep, "read"); + grpc_call_list_add(call_list, ep->read_cb, success); + SECURE_ENDPOINT_UNREF(ep, "read", call_list); } -static int on_read(void *user_data, int success) { +static void on_read(void *user_data, int success, grpc_call_list *call_list) { unsigned i; gpr_uint8 keep_looping = 0; tsi_result result = TSI_OK; @@ -146,7 +148,8 @@ static int on_read(void *user_data, int success) { if (!success) { gpr_slice_buffer_reset_and_unref(ep->read_buffer); - return 0; + call_read_cb(ep, 0, call_list); + return; } /* TODO(yangg) check error, maybe bail out early */ @@ -202,21 +205,16 @@ static int on_read(void *user_data, int success) { if (result != TSI_OK) { gpr_slice_buffer_reset_and_unref(ep->read_buffer); - return 0; + call_read_cb(ep, 0, call_list); + return; } - return 1; -} - -static void on_read_cb(void *user_data, int success) { - call_read_cb(user_data, on_read(user_data, success)); + call_read_cb(ep, 1, call_list); } -static grpc_endpoint_op_status endpoint_read(grpc_endpoint *secure_ep, - gpr_slice_buffer *slices, - grpc_closure *cb) { +static void endpoint_read(grpc_endpoint *secure_ep, gpr_slice_buffer *slices, + grpc_closure *cb, grpc_call_list *call_list) { secure_endpoint *ep = (secure_endpoint *)secure_ep; - int immediate_read_success = -1; ep->read_cb = cb; ep->read_buffer = slices; gpr_slice_buffer_reset_and_unref(ep->read_buffer); @@ -224,27 +222,13 @@ static grpc_endpoint_op_status endpoint_read(grpc_endpoint *secure_ep, if (ep->leftover_bytes.count) { gpr_slice_buffer_swap(&ep->leftover_bytes, &ep->source_buffer); GPR_ASSERT(ep->leftover_bytes.count == 0); - return on_read(ep, 1) ? GRPC_ENDPOINT_DONE : GRPC_ENDPOINT_ERROR; + on_read(ep, 1, call_list); + return; } SECURE_ENDPOINT_REF(ep, "read"); - - switch ( - grpc_endpoint_read(ep->wrapped_ep, &ep->source_buffer, &ep->on_read)) { - case GRPC_ENDPOINT_DONE: - immediate_read_success = on_read(ep, 1); - break; - case GRPC_ENDPOINT_PENDING: - return GRPC_ENDPOINT_PENDING; - case GRPC_ENDPOINT_ERROR: - immediate_read_success = on_read(ep, 0); - break; - } - - GPR_ASSERT(immediate_read_success != -1); - SECURE_ENDPOINT_UNREF(ep, "read"); - - return immediate_read_success ? GRPC_ENDPOINT_DONE : GRPC_ENDPOINT_ERROR; + grpc_endpoint_read(ep->wrapped_ep, &ep->source_buffer, &ep->on_read, + call_list); } static void flush_write_staging_buffer(secure_endpoint *ep, gpr_uint8 **cur, @@ -255,9 +239,8 @@ static void flush_write_staging_buffer(secure_endpoint *ep, gpr_uint8 **cur, *end = GPR_SLICE_END_PTR(ep->write_staging_buffer); } -static grpc_endpoint_op_status endpoint_write(grpc_endpoint *secure_ep, - gpr_slice_buffer *slices, - grpc_closure *cb) { +static void endpoint_write(grpc_endpoint *secure_ep, gpr_slice_buffer *slices, + grpc_closure *cb, grpc_call_list *call_list) { unsigned i; tsi_result result = TSI_OK; secure_endpoint *ep = (secure_endpoint *)secure_ep; @@ -329,32 +312,37 @@ static grpc_endpoint_op_status endpoint_write(grpc_endpoint *secure_ep, if (result != TSI_OK) { /* TODO(yangg) do different things according to the error type? */ gpr_slice_buffer_reset_and_unref(&ep->output_buffer); - return GRPC_ENDPOINT_ERROR; + grpc_call_list_add(call_list, cb, 0); + return; } - return grpc_endpoint_write(ep->wrapped_ep, &ep->output_buffer, cb); + grpc_endpoint_write(ep->wrapped_ep, &ep->output_buffer, cb, call_list); } -static void endpoint_shutdown(grpc_endpoint *secure_ep) { +static void endpoint_shutdown(grpc_endpoint *secure_ep, + grpc_call_list *call_list) { secure_endpoint *ep = (secure_endpoint *)secure_ep; - grpc_endpoint_shutdown(ep->wrapped_ep); + grpc_endpoint_shutdown(ep->wrapped_ep, call_list); } -static void endpoint_destroy(grpc_endpoint *secure_ep) { +static void endpoint_destroy(grpc_endpoint *secure_ep, + grpc_call_list *call_list) { secure_endpoint *ep = (secure_endpoint *)secure_ep; - SECURE_ENDPOINT_UNREF(ep, "destroy"); + SECURE_ENDPOINT_UNREF(ep, "destroy", call_list); } static void endpoint_add_to_pollset(grpc_endpoint *secure_ep, - grpc_pollset *pollset) { + grpc_pollset *pollset, + grpc_call_list *call_list) { secure_endpoint *ep = (secure_endpoint *)secure_ep; - grpc_endpoint_add_to_pollset(ep->wrapped_ep, pollset); + grpc_endpoint_add_to_pollset(ep->wrapped_ep, pollset, call_list); } static void endpoint_add_to_pollset_set(grpc_endpoint *secure_ep, - grpc_pollset_set *pollset_set) { + grpc_pollset_set *pollset_set, + grpc_call_list *call_list) { secure_endpoint *ep = (secure_endpoint *)secure_ep; - grpc_endpoint_add_to_pollset_set(ep->wrapped_ep, pollset_set); + grpc_endpoint_add_to_pollset_set(ep->wrapped_ep, pollset_set, call_list); } static char *endpoint_get_peer(grpc_endpoint *secure_ep) { @@ -386,7 +374,7 @@ grpc_endpoint *grpc_secure_endpoint_create( gpr_slice_buffer_init(&ep->output_buffer); gpr_slice_buffer_init(&ep->source_buffer); ep->read_buffer = NULL; - grpc_closure_init(&ep->on_read, on_read_cb, ep); + grpc_closure_init(&ep->on_read, on_read, ep); gpr_mu_init(&ep->protector_mu); gpr_ref_init(&ep->ref, 1); return &ep->base; diff --git a/src/core/security/secure_transport_setup.c b/src/core/security/secure_transport_setup.c index 181aa74ba9f..1412ab21ad8 100644 --- a/src/core/security/secure_transport_setup.c +++ b/src/core/security/secure_transport_setup.c @@ -58,23 +58,27 @@ typedef struct { grpc_closure on_handshake_data_received_from_peer; } grpc_secure_transport_setup; -static void on_handshake_data_received_from_peer(void *setup, int success); +static void on_handshake_data_received_from_peer(void *setup, int success, + grpc_call_list *call_list); -static void on_handshake_data_sent_to_peer(void *setup, int success); +static void on_handshake_data_sent_to_peer(void *setup, int success, + grpc_call_list *call_list); static void secure_transport_setup_done(grpc_secure_transport_setup *s, - int is_success) { + int is_success, + grpc_call_list *call_list) { if (is_success) { s->cb(s->user_data, GRPC_SECURITY_OK, s->wrapped_endpoint, - s->secure_endpoint); + s->secure_endpoint, call_list); } else { if (s->secure_endpoint != NULL) { - grpc_endpoint_shutdown(s->secure_endpoint); - grpc_endpoint_destroy(s->secure_endpoint); + grpc_endpoint_shutdown(s->secure_endpoint, call_list); + grpc_endpoint_destroy(s->secure_endpoint, call_list); } else { - grpc_endpoint_destroy(s->wrapped_endpoint); + grpc_endpoint_destroy(s->wrapped_endpoint, call_list); } - s->cb(s->user_data, GRPC_SECURITY_ERROR, s->wrapped_endpoint, NULL); + s->cb(s->user_data, GRPC_SECURITY_ERROR, s->wrapped_endpoint, NULL, + call_list); } if (s->handshaker != NULL) tsi_handshaker_destroy(s->handshaker); if (s->handshake_buffer != NULL) gpr_free(s->handshake_buffer); @@ -85,13 +89,14 @@ static void secure_transport_setup_done(grpc_secure_transport_setup *s, gpr_free(s); } -static void on_peer_checked(void *user_data, grpc_security_status status) { +static void on_peer_checked(void *user_data, grpc_security_status status, + grpc_call_list *call_list) { grpc_secure_transport_setup *s = user_data; tsi_frame_protector *protector; tsi_result result; if (status != GRPC_SECURITY_OK) { gpr_log(GPR_ERROR, "Error checking peer."); - secure_transport_setup_done(s, 0); + secure_transport_setup_done(s, 0, call_list); return; } result = @@ -99,7 +104,7 @@ static void on_peer_checked(void *user_data, grpc_security_status status) { if (result != TSI_OK) { gpr_log(GPR_ERROR, "Frame protector creation failed with error %s.", tsi_result_to_string(result)); - secure_transport_setup_done(s, 0); + secure_transport_setup_done(s, 0, call_list); return; } s->secure_endpoint = @@ -107,11 +112,12 @@ static void on_peer_checked(void *user_data, grpc_security_status status) { s->left_overs.slices, s->left_overs.count); s->left_overs.count = 0; s->left_overs.length = 0; - secure_transport_setup_done(s, 1); + secure_transport_setup_done(s, 1, call_list); return; } -static void check_peer(grpc_secure_transport_setup *s) { +static void check_peer(grpc_secure_transport_setup *s, + grpc_call_list *call_list) { grpc_security_status peer_status; tsi_peer peer; tsi_result result = tsi_handshaker_extract_peer(s->handshaker, &peer); @@ -119,21 +125,22 @@ static void check_peer(grpc_secure_transport_setup *s) { if (result != TSI_OK) { gpr_log(GPR_ERROR, "Peer extraction failed with error %s", tsi_result_to_string(result)); - secure_transport_setup_done(s, 0); + secure_transport_setup_done(s, 0, call_list); return; } peer_status = grpc_security_connector_check_peer(s->connector, peer, on_peer_checked, s); if (peer_status == GRPC_SECURITY_ERROR) { gpr_log(GPR_ERROR, "Peer check failed."); - secure_transport_setup_done(s, 0); + secure_transport_setup_done(s, 0, call_list); return; } else if (peer_status == GRPC_SECURITY_OK) { - on_peer_checked(s, peer_status); + on_peer_checked(s, peer_status, call_list); } } -static void send_handshake_bytes_to_peer(grpc_secure_transport_setup *s) { +static void send_handshake_bytes_to_peer(grpc_secure_transport_setup *s, + grpc_call_list *call_list) { size_t offset = 0; tsi_result result = TSI_OK; gpr_slice to_send; @@ -153,7 +160,7 @@ static void send_handshake_bytes_to_peer(grpc_secure_transport_setup *s) { if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshake failed with error %s", tsi_result_to_string(result)); - secure_transport_setup_done(s, 0); + secure_transport_setup_done(s, 0, call_list); return; } @@ -163,21 +170,12 @@ static void send_handshake_bytes_to_peer(grpc_secure_transport_setup *s) { gpr_slice_buffer_add(&s->outgoing, to_send); /* TODO(klempner,jboeuf): This should probably use the client setup deadline */ - switch (grpc_endpoint_write(s->wrapped_endpoint, &s->outgoing, - &s->on_handshake_data_sent_to_peer)) { - case GRPC_ENDPOINT_ERROR: - gpr_log(GPR_ERROR, "Could not send handshake data to peer."); - secure_transport_setup_done(s, 0); - break; - case GRPC_ENDPOINT_DONE: - on_handshake_data_sent_to_peer(s, 1); - break; - case GRPC_ENDPOINT_PENDING: - break; - } + grpc_endpoint_write(s->wrapped_endpoint, &s->outgoing, + &s->on_handshake_data_sent_to_peer, call_list); } -static void on_handshake_data_received_from_peer(void *setup, int success) { +static void on_handshake_data_received_from_peer(void *setup, int success, + grpc_call_list *call_list) { grpc_secure_transport_setup *s = setup; size_t consumed_slice_size = 0; tsi_result result = TSI_OK; @@ -187,7 +185,7 @@ static void on_handshake_data_received_from_peer(void *setup, int success) { if (!success) { gpr_log(GPR_ERROR, "Read failed."); - secure_transport_setup_done(s, 0); + secure_transport_setup_done(s, 0, call_list); return; } @@ -202,20 +200,11 @@ static void on_handshake_data_received_from_peer(void *setup, int success) { if (tsi_handshaker_is_in_progress(s->handshaker)) { /* We may need more data. */ if (result == TSI_INCOMPLETE_DATA) { - switch (grpc_endpoint_read(s->wrapped_endpoint, &s->incoming, - &s->on_handshake_data_received_from_peer)) { - case GRPC_ENDPOINT_DONE: - on_handshake_data_received_from_peer(s, 1); - break; - case GRPC_ENDPOINT_ERROR: - on_handshake_data_received_from_peer(s, 0); - break; - case GRPC_ENDPOINT_PENDING: - break; - } + grpc_endpoint_read(s->wrapped_endpoint, &s->incoming, + &s->on_handshake_data_received_from_peer, call_list); return; } else { - send_handshake_bytes_to_peer(s); + send_handshake_bytes_to_peer(s, call_list); return; } } @@ -223,7 +212,7 @@ static void on_handshake_data_received_from_peer(void *setup, int success) { if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshake failed with error %s", tsi_result_to_string(result)); - secure_transport_setup_done(s, 0); + secure_transport_setup_done(s, 0, call_list); return; } @@ -233,7 +222,7 @@ static void on_handshake_data_received_from_peer(void *setup, int success) { num_left_overs = (has_left_overs_in_current_slice ? 1 : 0) + s->incoming.count - i - 1; if (num_left_overs == 0) { - check_peer(s); + check_peer(s, call_list); return; } /* Put the leftovers in our buffer (ownership transfered). */ @@ -247,51 +236,41 @@ static void on_handshake_data_received_from_peer(void *setup, int success) { gpr_slice_buffer_addn( &s->left_overs, &s->incoming.slices[i + 1], num_left_overs - (size_t)has_left_overs_in_current_slice); - check_peer(s); + check_peer(s, call_list); } /* If setup is NULL, the setup is done. */ -static void on_handshake_data_sent_to_peer(void *setup, int success) { +static void on_handshake_data_sent_to_peer(void *setup, int success, + grpc_call_list *call_list) { grpc_secure_transport_setup *s = setup; /* Make sure that write is OK. */ if (!success) { gpr_log(GPR_ERROR, "Write failed."); - if (setup != NULL) secure_transport_setup_done(s, 0); + if (setup != NULL) secure_transport_setup_done(s, 0, call_list); return; } /* We may be done. */ if (tsi_handshaker_is_in_progress(s->handshaker)) { - /* TODO(klempner,jboeuf): This should probably use the client setup - deadline */ - switch (grpc_endpoint_read(s->wrapped_endpoint, &s->incoming, - &s->on_handshake_data_received_from_peer)) { - case GRPC_ENDPOINT_ERROR: - on_handshake_data_received_from_peer(s, 0); - break; - case GRPC_ENDPOINT_PENDING: - break; - case GRPC_ENDPOINT_DONE: - on_handshake_data_received_from_peer(s, 1); - break; - } + grpc_endpoint_read(s->wrapped_endpoint, &s->incoming, + &s->on_handshake_data_received_from_peer, call_list); } else { - check_peer(s); + check_peer(s, call_list); } } void grpc_setup_secure_transport(grpc_security_connector *connector, grpc_endpoint *nonsecure_endpoint, grpc_secure_transport_setup_done_cb cb, - void *user_data) { + void *user_data, grpc_call_list *call_list) { grpc_security_status result = GRPC_SECURITY_OK; grpc_secure_transport_setup *s = gpr_malloc(sizeof(grpc_secure_transport_setup)); memset(s, 0, sizeof(grpc_secure_transport_setup)); result = grpc_security_connector_create_handshaker(connector, &s->handshaker); if (result != GRPC_SECURITY_OK) { - secure_transport_setup_done(s, 0); + secure_transport_setup_done(s, 0, call_list); return; } s->connector = @@ -308,5 +287,5 @@ void grpc_setup_secure_transport(grpc_security_connector *connector, gpr_slice_buffer_init(&s->left_overs); gpr_slice_buffer_init(&s->outgoing); gpr_slice_buffer_init(&s->incoming); - send_handshake_bytes_to_peer(s); + send_handshake_bytes_to_peer(s, call_list); } diff --git a/src/core/security/secure_transport_setup.h b/src/core/security/secure_transport_setup.h index d9b802556de..867726ff4cc 100644 --- a/src/core/security/secure_transport_setup.h +++ b/src/core/security/secure_transport_setup.h @@ -42,12 +42,13 @@ /* Ownership of the secure_endpoint is transfered. */ typedef void (*grpc_secure_transport_setup_done_cb)( void *user_data, grpc_security_status status, - grpc_endpoint *wrapped_endpoint, grpc_endpoint *secure_endpoint); + grpc_endpoint *wrapped_endpoint, grpc_endpoint *secure_endpoint, + grpc_call_list *call_list); /* Calls the callback upon completion. */ void grpc_setup_secure_transport(grpc_security_connector *connector, grpc_endpoint *nonsecure_endpoint, grpc_secure_transport_setup_done_cb cb, - void *user_data); + void *user_data, grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_SECURITY_SECURE_TRANSPORT_SETUP_H */ diff --git a/src/core/security/security_connector.c b/src/core/security/security_connector.c index ba9ac68c5f1..dac6a5a5fca 100644 --- a/src/core/security/security_connector.c +++ b/src/core/security/security_connector.c @@ -119,9 +119,9 @@ grpc_security_status grpc_security_connector_check_peer( grpc_security_status grpc_channel_security_connector_check_call_host( grpc_channel_security_connector *sc, const char *host, - grpc_security_check_cb cb, void *user_data) { + grpc_security_check_cb cb, void *user_data, grpc_call_list *call_list) { if (sc == NULL || sc->check_call_host == NULL) return GRPC_SECURITY_ERROR; - return sc->check_call_host(sc, host, cb, user_data); + return sc->check_call_host(sc, host, cb, user_data, call_list); } #ifdef GRPC_SECURITY_CONNECTOR_REFCOUNT_DEBUG @@ -275,11 +275,11 @@ end: static grpc_security_status fake_channel_check_call_host( grpc_channel_security_connector *sc, const char *host, - grpc_security_check_cb cb, void *user_data) { + grpc_security_check_cb cb, void *user_data, grpc_call_list *call_list) { grpc_fake_channel_security_connector *c = (grpc_fake_channel_security_connector *)sc; if (c->call_host_check_is_async) { - cb(user_data, GRPC_SECURITY_OK); + cb(user_data, GRPC_SECURITY_OK, call_list); return GRPC_SECURITY_PENDING; } else { return GRPC_SECURITY_OK; @@ -495,7 +495,7 @@ static grpc_security_status ssl_server_check_peer(grpc_security_connector *sc, static grpc_security_status ssl_channel_check_call_host( grpc_channel_security_connector *sc, const char *host, - grpc_security_check_cb cb, void *user_data) { + grpc_security_check_cb cb, void *user_data, grpc_call_list *call_list) { grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *)sc; diff --git a/src/core/security/security_connector.h b/src/core/security/security_connector.h index 2c9aa1c5a4e..d78d6ad69fe 100644 --- a/src/core/security/security_connector.h +++ b/src/core/security/security_connector.h @@ -61,7 +61,8 @@ typedef struct grpc_security_connector grpc_security_connector; #define GRPC_SECURITY_CONNECTOR_ARG "grpc.security_connector" typedef void (*grpc_security_check_cb)(void *user_data, - grpc_security_status status); + grpc_security_status status, + grpc_call_list *call_list); typedef struct { void (*destroy)(grpc_security_connector *sc); @@ -138,7 +139,8 @@ struct grpc_channel_security_connector { grpc_security_status (*check_call_host)(grpc_channel_security_connector *sc, const char *host, grpc_security_check_cb cb, - void *user_data); + void *user_data, + grpc_call_list *call_list); }; /* Checks that the host that will be set for a call is acceptable. @@ -148,7 +150,7 @@ struct grpc_channel_security_connector { GRPC_SECURITY_PENDING unless an error is detected early on. */ grpc_security_status grpc_channel_security_connector_check_call_host( grpc_channel_security_connector *sc, const char *host, - grpc_security_check_cb cb, void *user_data); + grpc_security_check_cb cb, void *user_data, grpc_call_list *call_list); /* --- Creation security connectors. --- */ diff --git a/src/core/security/server_auth_filter.c b/src/core/security/server_auth_filter.c index 84686974727..2376cbbeb30 100644 --- a/src/core/security/server_auth_filter.c +++ b/src/core/security/server_auth_filter.c @@ -109,12 +109,14 @@ static grpc_mdelem *remove_consumed_md(void *user_data, grpc_mdelem *md) { return md; } +/* called from application code */ static void on_md_processing_done( void *user_data, const grpc_metadata *consumed_md, size_t num_consumed_md, const grpc_metadata *response_md, size_t num_response_md, grpc_status_code status, const char *error_details) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; /* TODO(jboeuf): Implement support for response_md. */ if (response_md != NULL && num_response_md > 0) { @@ -129,7 +131,7 @@ static void on_md_processing_done( grpc_metadata_batch_filter(&calld->md_op->data.metadata, remove_consumed_md, elem); grpc_metadata_array_destroy(&calld->md); - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, 1); + calld->on_done_recv->cb(calld->on_done_recv->cb_arg, 1, &call_list); } else { gpr_slice message; grpc_metadata_array_destroy(&calld->md); @@ -139,11 +141,14 @@ static void on_md_processing_done( message = gpr_slice_from_copied_string(error_details); grpc_sopb_reset(calld->recv_ops); grpc_transport_stream_op_add_close(&calld->transport_op, status, &message); - grpc_call_next_op(elem, &calld->transport_op); + grpc_call_next_op(elem, &calld->transport_op, &call_list); } + + grpc_call_list_run(&call_list); } -static void auth_on_recv(void *user_data, int success) { +static void auth_on_recv(void *user_data, int success, + grpc_call_list *call_list) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -164,7 +169,7 @@ static void auth_on_recv(void *user_data, int success) { return; } } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success); + calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, call_list); } static void set_recv_ops_md_callbacks(grpc_call_element *elem, @@ -186,9 +191,10 @@ static void set_recv_ops_md_callbacks(grpc_call_element *elem, op contains type and call direction information, in addition to the data that is being sent or received. */ static void auth_start_transport_op(grpc_call_element *elem, - grpc_transport_stream_op *op) { + grpc_transport_stream_op *op, + grpc_call_list *call_list) { set_recv_ops_md_callbacks(elem, op); - grpc_call_next_op(elem, op); + grpc_call_next_op(elem, op, call_list); } /* Constructor for call_data */ @@ -227,12 +233,14 @@ static void 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_call_element *elem, + grpc_call_list *call_list) {} /* Constructor for channel_data */ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *mdctx, - int is_first, int is_last) { + int is_first, int is_last, + grpc_call_list *call_list) { grpc_security_connector *sc = grpc_find_security_connector_in_args(args); grpc_auth_metadata_processor *processor = grpc_find_auth_metadata_processor_in_args(args); @@ -256,7 +264,8 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem, + grpc_call_list *call_list) { /* grab pointers to our data from the channel element */ channel_data *chand = elem->channel_data; GRPC_SECURITY_CONNECTOR_UNREF(chand->security_connector, diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index a6f50712f54..e6e2eee658f 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -66,6 +66,7 @@ typedef struct grpc_server_secure_state { int is_shutdown; gpr_mu mu; gpr_refcount refcount; + grpc_closure destroy_closure; } grpc_server_secure_state; static void state_ref(grpc_server_secure_state *state) { @@ -127,7 +128,8 @@ static int remove_tcp_from_list_locked(grpc_server_secure_state *state, static void on_secure_transport_setup_done(void *statep, grpc_security_status status, grpc_endpoint *wrapped_endpoint, - grpc_endpoint *secure_endpoint) { + grpc_endpoint *secure_endpoint, + grpc_call_list *call_list) { grpc_server_secure_state *state = statep; grpc_transport *transport; grpc_mdctx *mdctx; @@ -137,16 +139,16 @@ static void on_secure_transport_setup_done(void *statep, remove_tcp_from_list_locked(state, wrapped_endpoint); if (!state->is_shutdown) { mdctx = grpc_mdctx_create(); - workqueue = grpc_workqueue_create(); + workqueue = grpc_workqueue_create(call_list); transport = grpc_create_chttp2_transport( grpc_server_get_channel_args(state->server), secure_endpoint, mdctx, - workqueue, 0); + 0); setup_transport(state, transport, mdctx, workqueue); grpc_chttp2_transport_start_reading(transport, NULL, 0); } else { /* We need to consume this here, because the server may already have gone * away. */ - grpc_endpoint_destroy(secure_endpoint); + grpc_endpoint_destroy(secure_endpoint, call_list); } gpr_mu_unlock(&state->mu); } else { @@ -158,7 +160,8 @@ static void on_secure_transport_setup_done(void *statep, state_unref(state); } -static void on_accept(void *statep, grpc_endpoint *tcp) { +static void on_accept(void *statep, grpc_endpoint *tcp, + grpc_call_list *call_list) { grpc_server_secure_state *state = statep; tcp_endpoint_list *node; state_ref(state); @@ -169,22 +172,24 @@ static void on_accept(void *statep, grpc_endpoint *tcp) { state->handshaking_tcp_endpoints = node; gpr_mu_unlock(&state->mu); grpc_setup_secure_transport(state->sc, tcp, on_secure_transport_setup_done, - state); + state, call_list); } /* Server callback: start listening on our ports */ static void start(grpc_server *server, void *statep, grpc_pollset **pollsets, - size_t pollset_count) { + size_t pollset_count, grpc_call_list *call_list) { grpc_server_secure_state *state = statep; - grpc_tcp_server_start(state->tcp, pollsets, pollset_count, on_accept, state); + grpc_tcp_server_start(state->tcp, pollsets, pollset_count, on_accept, state, + call_list); } -static void destroy_done(void *statep) { +static void destroy_done(void *statep, int success, grpc_call_list *call_list) { grpc_server_secure_state *state = statep; grpc_server_listener_destroy_done(state->server); gpr_mu_lock(&state->mu); while (state->handshaking_tcp_endpoints != NULL) { - grpc_endpoint_shutdown(state->handshaking_tcp_endpoints->tcp_endpoint); + grpc_endpoint_shutdown(state->handshaking_tcp_endpoints->tcp_endpoint, + call_list); remove_tcp_from_list_locked(state, state->handshaking_tcp_endpoints->tcp_endpoint); } @@ -194,14 +199,16 @@ static void destroy_done(void *statep) { /* Server callback: destroy the tcp listener (so we don't generate further callbacks) */ -static void destroy(grpc_server *server, void *statep) { +static void destroy(grpc_server *server, void *statep, + grpc_call_list *call_list) { grpc_server_secure_state *state = statep; grpc_tcp_server *tcp; gpr_mu_lock(&state->mu); state->is_shutdown = 1; tcp = state->tcp; gpr_mu_unlock(&state->mu); - grpc_tcp_server_destroy(tcp, destroy_done, state); + grpc_closure_init(&state->destroy_closure, destroy_done, state); + grpc_tcp_server_destroy(tcp, &state->destroy_closure, call_list); } int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, @@ -215,6 +222,7 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, int port_temp; grpc_security_status status = GRPC_SECURITY_ERROR; grpc_security_connector *sc = NULL; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; /* create security context */ if (creds == NULL) goto error; @@ -277,6 +285,7 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, /* Register with the server only upon success */ grpc_server_add_listener(server, state, start, destroy); + grpc_call_list_run(&call_list); return port_num; /* Error path: cleanup and return */ @@ -288,10 +297,11 @@ error: grpc_resolved_addresses_destroy(resolved); } if (tcp) { - grpc_tcp_server_destroy(tcp, NULL, NULL); + grpc_tcp_server_destroy(tcp, NULL, &call_list); } if (state) { gpr_free(state); } + grpc_call_list_run(&call_list); return 0; } diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index d325b3f77dd..24d8b3aa2c6 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -64,6 +64,12 @@ typedef struct { gpr_mu mu; grpc_endpoint *connecting_endpoint; + grpc_endpoint *newly_connecting_endpoint; + + grpc_closure connected_closure; + + grpc_mdctx *mdctx; + grpc_workqueue *workqueue; } connector; static void connector_ref(grpc_connector *con) { @@ -71,9 +77,11 @@ static void connector_ref(grpc_connector *con) { gpr_ref(&c->refs); } -static void connector_unref(grpc_connector *con) { +static void connector_unref(grpc_connector *con, grpc_call_list *call_list) { connector *c = (connector *)con; if (gpr_unref(&c->refs)) { + grpc_mdctx_unref(c->mdctx); + GRPC_WORKQUEUE_UNREF(c->workqueue, "connector", call_list); gpr_free(c); } } @@ -81,7 +89,8 @@ static void connector_unref(grpc_connector *con) { static void on_secure_transport_setup_done(void *arg, grpc_security_status status, grpc_endpoint *wrapped_endpoint, - grpc_endpoint *secure_endpoint) { + grpc_endpoint *secure_endpoint, + grpc_call_list *call_list) { connector *c = arg; grpc_closure *notify; gpr_mu_lock(&c->mu); @@ -99,8 +108,7 @@ static void on_secure_transport_setup_done(void *arg, c->connecting_endpoint = NULL; gpr_mu_unlock(&c->mu); c->result->transport = grpc_create_chttp2_transport( - c->args.channel_args, secure_endpoint, c->args.metadata_context, - c->args.workqueue, 1); + c->args.channel_args, secure_endpoint, c->mdctx, 1); grpc_chttp2_transport_start_reading(c->result->transport, NULL, 0); c->result->filters = gpr_malloc(sizeof(grpc_channel_filter *) * 2); c->result->filters[0] = &grpc_http_client_filter; @@ -109,28 +117,29 @@ static void on_secure_transport_setup_done(void *arg, } notify = c->notify; c->notify = NULL; - notify->cb(notify->cb_arg, 1); + notify->cb(notify->cb_arg, 1, call_list); } -static void connected(void *arg, grpc_endpoint *tcp) { +static void connected(void *arg, int success, grpc_call_list *call_list) { connector *c = arg; grpc_closure *notify; + grpc_endpoint *tcp = c->newly_connecting_endpoint; if (tcp != NULL) { gpr_mu_lock(&c->mu); GPR_ASSERT(c->connecting_endpoint == NULL); c->connecting_endpoint = tcp; gpr_mu_unlock(&c->mu); grpc_setup_secure_transport(&c->security_connector->base, tcp, - on_secure_transport_setup_done, c); + on_secure_transport_setup_done, c, call_list); } else { memset(c->result, 0, sizeof(*c->result)); notify = c->notify; c->notify = NULL; - notify->cb(notify->cb_arg, 1); + notify->cb(notify->cb_arg, 1, call_list); } } -static void connector_shutdown(grpc_connector *con) { +static void connector_shutdown(grpc_connector *con, grpc_call_list *call_list) { connector *c = (connector *)con; grpc_endpoint *ep; gpr_mu_lock(&c->mu); @@ -138,14 +147,14 @@ static void connector_shutdown(grpc_connector *con) { c->connecting_endpoint = NULL; gpr_mu_unlock(&c->mu); if (ep) { - grpc_endpoint_shutdown(ep); + grpc_endpoint_shutdown(ep, call_list); } } static void connector_connect(grpc_connector *con, const grpc_connect_in_args *args, grpc_connect_out_args *result, - grpc_closure *notify) { + grpc_closure *notify, grpc_call_list *call_list) { connector *c = (connector *)con; GPR_ASSERT(c->notify == NULL); GPR_ASSERT(notify->cb); @@ -155,9 +164,10 @@ static void connector_connect(grpc_connector *con, gpr_mu_lock(&c->mu); GPR_ASSERT(c->connecting_endpoint == NULL); gpr_mu_unlock(&c->mu); - grpc_tcp_client_connect(connected, c, args->interested_parties, - args->workqueue, args->addr, args->addr_len, - args->deadline); + grpc_closure_init(&c->connected_closure, connected, c); + grpc_tcp_client_connect(&c->connected_closure, &c->newly_connecting_endpoint, + args->interested_parties, args->addr, args->addr_len, + args->deadline, call_list); } static const grpc_connector_vtable connector_vtable = { @@ -190,7 +200,8 @@ static void subchannel_factory_unref(grpc_subchannel_factory *scf) { } static grpc_subchannel *subchannel_factory_create_subchannel( - grpc_subchannel_factory *scf, grpc_subchannel_args *args) { + grpc_subchannel_factory *scf, grpc_subchannel_args *args, + grpc_call_list *call_list) { subchannel_factory *f = (subchannel_factory *)scf; connector *c = gpr_malloc(sizeof(*c)); grpc_channel_args *final_args = @@ -199,12 +210,15 @@ static grpc_subchannel *subchannel_factory_create_subchannel( memset(c, 0, sizeof(*c)); c->base.vtable = &connector_vtable; c->security_connector = f->security_connector; + c->mdctx = f->mdctx; + grpc_mdctx_ref(c->mdctx); + c->workqueue = grpc_channel_get_workqueue(f->master); + GRPC_WORKQUEUE_REF(c->workqueue, "connector"); gpr_ref_init(&c->refs, 1); - args->mdctx = f->mdctx; args->args = final_args; args->master = f->master; s = grpc_subchannel_create(&c->base, args); - grpc_connector_unref(&c->base); + grpc_connector_unref(&c->base, call_list); grpc_channel_args_destroy(final_args); return s; } @@ -232,6 +246,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, subchannel_factory *f; #define MAX_FILTERS 3 const grpc_channel_filter *filters[MAX_FILTERS]; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; size_t n = 0; GPR_ASSERT(reserved == NULL); @@ -250,7 +265,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, "Failed to create security connector."); } mdctx = grpc_mdctx_create(); - workqueue = grpc_workqueue_create(); + workqueue = grpc_workqueue_create(&call_list); connector_arg = grpc_security_connector_to_arg(&connector->base); args_copy = grpc_channel_args_copy_and_add( @@ -282,8 +297,8 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, } grpc_client_channel_set_resolver(grpc_channel_get_channel_stack(channel), - resolver); - GRPC_RESOLVER_UNREF(resolver, "create"); + resolver, &call_list); + GRPC_RESOLVER_UNREF(resolver, "create", &call_list); grpc_subchannel_factory_unref(&f->base); GRPC_SECURITY_CONNECTOR_UNREF(&connector->base, "channel_create"); @@ -292,5 +307,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, grpc_channel_args_destroy(new_args_from_connector); } + grpc_call_list_run(&call_list); + return channel; } diff --git a/src/core/surface/server.h b/src/core/surface/server.h index 1d82d07cedc..f87296797ce 100644 --- a/src/core/surface/server.h +++ b/src/core/surface/server.h @@ -45,11 +45,11 @@ grpc_server *grpc_server_create_from_filters( /* 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)); +void grpc_server_add_listener( + grpc_server *server, void *listener, + void (*start)(grpc_server *server, void *arg, grpc_pollset **pollsets, + size_t npollsets, grpc_call_list *call_list), + void (*destroy)(grpc_server *server, void *arg, grpc_call_list *call_list)); void grpc_server_listener_destroy_done(void *server); diff --git a/src/core/transport/chttp2_transport.h b/src/core/transport/chttp2_transport.h index 8bd8af6236c..fa0d6e4151e 100644 --- a/src/core/transport/chttp2_transport.h +++ b/src/core/transport/chttp2_transport.h @@ -35,7 +35,6 @@ #define GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_TRANSPORT_H #include "src/core/iomgr/endpoint.h" -#include "src/core/iomgr/workqueue.h" #include "src/core/transport/transport.h" extern int grpc_http_trace; @@ -43,7 +42,7 @@ extern int grpc_flowctl_trace; grpc_transport *grpc_create_chttp2_transport( const grpc_channel_args *channel_args, grpc_endpoint *ep, - grpc_mdctx *metadata_context, grpc_workqueue *workqueue, int is_client); + grpc_mdctx *metadata_context, int is_client); void grpc_chttp2_transport_start_reading(grpc_transport *transport, gpr_slice *slices, size_t nslices); diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index b9c0c98f69a..e89d5b3d398 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -59,7 +59,7 @@ static void thd_func(void *arg) { gpr_event_set(&a->done_thd, (void *)1); } -static void done_write(void *arg, int success) { +static void done_write(void *arg, int success, grpc_call_list *call_list) { thd_args *a = arg; gpr_event_set(&a->done_write, (void *)1); } @@ -89,6 +89,7 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, gpr_slice_buffer outgoing; grpc_closure done_write_closure; grpc_workqueue *workqueue; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; hex = gpr_dump(client_payload, client_payload_length, GPR_DUMP_HEX | GPR_DUMP_ASCII); @@ -101,10 +102,11 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, /* Init grpc */ grpc_init(); - workqueue = grpc_workqueue_create(); + workqueue = grpc_workqueue_create(&call_list); + grpc_call_list_run(&call_list); /* Create endpoints */ - sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536, workqueue); + sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536); /* Create server, completion events */ a.server = grpc_server_create_from_filters(NULL, 0, NULL); @@ -114,14 +116,13 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, a.validator = validator; grpc_server_register_completion_queue(a.server, a.cq, NULL); grpc_server_start(a.server); - transport = - grpc_create_chttp2_transport(NULL, sfd.server, mdctx, workqueue, 0); + transport = grpc_create_chttp2_transport(NULL, sfd.server, mdctx, 0); server_setup_transport(&a, transport, mdctx, workqueue); grpc_chttp2_transport_start_reading(transport, NULL, 0); /* 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(sfd.client, grpc_cq_pollset(a.cq), &call_list); + grpc_endpoint_add_to_pollset(sfd.server, grpc_cq_pollset(a.cq), &call_list); /* Check a ground truth */ GPR_ASSERT(grpc_server_has_open_connections(a.server)); @@ -134,24 +135,17 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, grpc_closure_init(&done_write_closure, done_write, &a); /* Write data */ - switch (grpc_endpoint_write(sfd.client, &outgoing, &done_write_closure)) { - case GRPC_ENDPOINT_DONE: - done_write(&a, 1); - break; - case GRPC_ENDPOINT_PENDING: - break; - case GRPC_ENDPOINT_ERROR: - done_write(&a, 0); - break; - } + grpc_endpoint_write(sfd.client, &outgoing, &done_write_closure, &call_list); + grpc_call_list_run(&call_list); /* Await completion */ GPR_ASSERT( gpr_event_wait(&a.done_write, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5))); if (flags & GRPC_BAD_CLIENT_DISCONNECT) { - grpc_endpoint_shutdown(sfd.client); - grpc_endpoint_destroy(sfd.client); + grpc_endpoint_shutdown(sfd.client, &call_list); + grpc_endpoint_destroy(sfd.client, &call_list); + grpc_call_list_run(&call_list); sfd.client = NULL; } @@ -159,8 +153,9 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, /* Shutdown */ if (sfd.client) { - grpc_endpoint_shutdown(sfd.client); - grpc_endpoint_destroy(sfd.client); + grpc_endpoint_shutdown(sfd.client, &call_list); + grpc_endpoint_destroy(sfd.client, &call_list); + grpc_call_list_run(&call_list); } grpc_server_shutdown_and_notify(a.server, a.cq, NULL); GPR_ASSERT(grpc_completion_queue_pluck( @@ -170,6 +165,7 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, grpc_completion_queue_destroy(a.cq); gpr_slice_buffer_destroy(&outgoing); - GRPC_WORKQUEUE_UNREF(workqueue, "destroy"); + GRPC_WORKQUEUE_UNREF(workqueue, "destroy", &call_list); + grpc_call_list_run(&call_list); grpc_shutdown(); } diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 210aa68fe17..04dbf485227 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -101,7 +101,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( f.fixture_data = sfd; f.cq = grpc_completion_queue_create(NULL); - *sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536, g_workqueue); + *sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536); return f; } @@ -114,8 +114,7 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, - g_workqueue, 1); + transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1); client_setup_transport(&cs, transport, mdctx); GPR_ASSERT(f->client); grpc_chttp2_transport_start_reading(transport, NULL, 0); @@ -130,8 +129,7 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, f->server = grpc_server_create_from_filters(NULL, 0, server_args); grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, - g_workqueue, 0); + transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0); server_setup_transport(f, transport, mdctx); grpc_chttp2_transport_start_reading(transport, NULL, 0); } @@ -149,6 +147,7 @@ static grpc_end2end_test_config configs[] = { int main(int argc, char **argv) { size_t i; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; /* force tracing on, with a value to force many code paths in trace.c to be taken */ @@ -161,7 +160,8 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); - g_workqueue = grpc_workqueue_create(); + g_workqueue = grpc_workqueue_create(&call_list); + grpc_call_list_run(&call_list); GPR_ASSERT(0 == grpc_tracer_set_enabled("also-doesnt-exist", 0)); GPR_ASSERT(1 == grpc_tracer_set_enabled("http", 1)); @@ -171,8 +171,9 @@ int main(int argc, char **argv) { grpc_end2end_tests(configs[i]); } - grpc_workqueue_flush(g_workqueue); - GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); + grpc_workqueue_flush(g_workqueue, &call_list); + GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy", &call_list); + grpc_call_list_run(&call_list); grpc_shutdown(); return 0; diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index e2bba5d1dd9..b661dbfd603 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -100,7 +100,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( f.fixture_data = sfd; f.cq = grpc_completion_queue_create(NULL); - *sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536, g_workqueue); + *sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536); return f; } @@ -113,8 +113,7 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, - g_workqueue, 1); + transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1); client_setup_transport(&cs, transport, mdctx); GPR_ASSERT(f->client); grpc_chttp2_transport_start_reading(transport, NULL, 0); @@ -129,8 +128,7 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, f->server = grpc_server_create_from_filters(NULL, 0, server_args); grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, - g_workqueue, 0); + transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0); server_setup_transport(f, transport, mdctx); grpc_chttp2_transport_start_reading(transport, NULL, 0); } @@ -148,17 +146,20 @@ static grpc_end2end_test_config configs[] = { int main(int argc, char **argv) { size_t i; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_test_init(argc, argv); grpc_init(); - g_workqueue = grpc_workqueue_create(); + g_workqueue = grpc_workqueue_create(&call_list); + grpc_call_list_run(&call_list); for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { grpc_end2end_tests(configs[i]); } - grpc_workqueue_flush(g_workqueue); - GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); + grpc_workqueue_flush(g_workqueue, &call_list); + GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy", &call_list); + grpc_call_list_run(&call_list); grpc_shutdown(); return 0; diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 2db0669dbac..6cf656bcde0 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -100,7 +100,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( f.fixture_data = sfd; f.cq = grpc_completion_queue_create(NULL); - *sfd = grpc_iomgr_create_endpoint_pair("fixture", 1, g_workqueue); + *sfd = grpc_iomgr_create_endpoint_pair("fixture", 1); return f; } @@ -113,8 +113,7 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, - g_workqueue, 1); + transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1); client_setup_transport(&cs, transport, mdctx); GPR_ASSERT(f->client); grpc_chttp2_transport_start_reading(transport, NULL, 0); @@ -129,8 +128,7 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, f->server = grpc_server_create_from_filters(NULL, 0, server_args); grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, - g_workqueue, 0); + transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0); server_setup_transport(f, transport, mdctx); grpc_chttp2_transport_start_reading(transport, NULL, 0); } @@ -148,17 +146,20 @@ static grpc_end2end_test_config configs[] = { int main(int argc, char **argv) { size_t i; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_test_init(argc, argv); grpc_init(); - g_workqueue = grpc_workqueue_create(); + g_workqueue = grpc_workqueue_create(&call_list); + grpc_call_list_run(&call_list); for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { grpc_end2end_tests(configs[i]); } - grpc_workqueue_flush(g_workqueue); - GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); + grpc_workqueue_flush(g_workqueue, &call_list); + GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy", &call_list); + grpc_call_list_run(&call_list); grpc_shutdown(); return 0; diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index bf9c2d844e2..a5079f17a53 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -126,10 +126,10 @@ struct read_and_write_test_state { grpc_closure done_write; }; -static void read_and_write_test_read_handler(void *data, int success) { +static void read_and_write_test_read_handler(void *data, int success, + grpc_call_list *call_list) { struct read_and_write_test_state *state = data; -loop: state->bytes_read += count_slices( state->incoming.slices, state->incoming.count, &state->current_read_data); if (state->bytes_read == state->target_bytes || !success) { @@ -139,25 +139,16 @@ loop: grpc_pollset_kick(g_pollset, NULL); gpr_mu_unlock(GRPC_POLLSET_MU(g_pollset)); } else if (success) { - switch (grpc_endpoint_read(state->read_ep, &state->incoming, - &state->done_read)) { - case GRPC_ENDPOINT_ERROR: - success = 0; - goto loop; - case GRPC_ENDPOINT_DONE: - success = 1; - goto loop; - case GRPC_ENDPOINT_PENDING: - break; - } + grpc_endpoint_read(state->read_ep, &state->incoming, &state->done_read, + call_list); } } -static void read_and_write_test_write_handler(void *data, int success) { +static void read_and_write_test_write_handler(void *data, int success, + grpc_call_list *call_list) { struct read_and_write_test_state *state = data; gpr_slice *slices = NULL; size_t nslices; - grpc_endpoint_op_status write_status; if (success) { for (;;) { @@ -176,19 +167,13 @@ static void read_and_write_test_write_handler(void *data, int success) { &state->current_write_data); gpr_slice_buffer_reset_and_unref(&state->outgoing); gpr_slice_buffer_addn(&state->outgoing, slices, nslices); - write_status = grpc_endpoint_write(state->write_ep, &state->outgoing, - &state->done_write); + grpc_endpoint_write(state->write_ep, &state->outgoing, &state->done_write, + call_list); free(slices); - if (write_status == GRPC_ENDPOINT_PENDING) { - return; - } else if (write_status == GRPC_ENDPOINT_ERROR) { - goto cleanup; - } } GPR_ASSERT(state->bytes_written == state->target_bytes); } -cleanup: gpr_log(GPR_INFO, "Write handler done"); gpr_mu_lock(GRPC_POLLSET_MU(g_pollset)); state->write_done = 1 + success; @@ -207,6 +192,7 @@ static void read_and_write_test(grpc_endpoint_test_config config, gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); grpc_endpoint_test_fixture f = begin_test(config, "read_and_write_test", slice_size); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_log(GPR_DEBUG, "num_bytes=%d write_size=%d slice_size=%d shutdown=%d", num_bytes, write_size, slice_size, shutdown); @@ -238,26 +224,19 @@ 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, 1); + read_and_write_test_write_handler(&state, 1, &call_list); + grpc_call_list_run(&call_list); - switch ( - grpc_endpoint_read(state.read_ep, &state.incoming, &state.done_read)) { - case GRPC_ENDPOINT_PENDING: - break; - case GRPC_ENDPOINT_ERROR: - read_and_write_test_read_handler(&state, 0); - break; - case GRPC_ENDPOINT_DONE: - read_and_write_test_read_handler(&state, 1); - break; - } + grpc_endpoint_read(state.read_ep, &state.incoming, &state.done_read, + &call_list); if (shutdown) { gpr_log(GPR_DEBUG, "shutdown read"); - grpc_endpoint_shutdown(state.read_ep); + grpc_endpoint_shutdown(state.read_ep, &call_list); gpr_log(GPR_DEBUG, "shutdown write"); - grpc_endpoint_shutdown(state.write_ep); + grpc_endpoint_shutdown(state.write_ep, &call_list); } + grpc_call_list_run(&call_list); gpr_mu_lock(GRPC_POLLSET_MU(g_pollset)); while (!state.read_done || !state.write_done) { @@ -271,8 +250,9 @@ static void read_and_write_test(grpc_endpoint_test_config config, end_test(config); gpr_slice_buffer_destroy(&state.outgoing); gpr_slice_buffer_destroy(&state.incoming); - grpc_endpoint_destroy(state.read_ep); - grpc_endpoint_destroy(state.write_ep); + grpc_endpoint_destroy(state.read_ep, &call_list); + grpc_endpoint_destroy(state.write_ep, &call_list); + grpc_call_list_run(&call_list); } void grpc_endpoint_tests(grpc_endpoint_test_config config, diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index 7df6fade6b2..45beb05c1c8 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -51,7 +51,8 @@ typedef struct { } oauth2_request; static void on_oauth2_response(void *user_data, grpc_credentials_md *md_elems, - size_t num_md, grpc_credentials_status status) { + size_t num_md, grpc_credentials_status status, + grpc_call_list *call_list) { oauth2_request *request = user_data; char *token = NULL; gpr_slice token_slice; @@ -72,15 +73,21 @@ static void on_oauth2_response(void *user_data, grpc_credentials_md *md_elems, gpr_mu_unlock(GRPC_POLLSET_MU(&request->pollset)); } -static void do_nothing(void *unused) {} +static void do_nothing(void *unused, int success, grpc_call_list *call_list) {} char *grpc_test_fetch_oauth2_token_with_credentials(grpc_credentials *creds) { oauth2_request request; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure do_nothing_closure; grpc_pollset_init(&request.pollset); request.is_done = 0; - grpc_credentials_get_request_metadata(creds, &request.pollset, "", - on_oauth2_response, &request); + grpc_closure_init(&do_nothing_closure, do_nothing, NULL); + + grpc_credentials_get_request_metadata( + creds, &request.pollset, "", on_oauth2_response, &request, &call_list); + + grpc_call_list_run(&call_list); gpr_mu_lock(GRPC_POLLSET_MU(&request.pollset)); while (!request.is_done) { @@ -90,7 +97,8 @@ char *grpc_test_fetch_oauth2_token_with_credentials(grpc_credentials *creds) { } gpr_mu_unlock(GRPC_POLLSET_MU(&request.pollset)); - grpc_pollset_shutdown(&request.pollset, do_nothing, NULL); + grpc_pollset_shutdown(&request.pollset, &do_nothing_closure, &call_list); + grpc_call_list_run(&call_list); grpc_pollset_destroy(&request.pollset); return request.token; } diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index 03f4c4912e9..fa3798aa3c8 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -72,13 +72,15 @@ typedef struct freereq { int done; } freereq; -static void destroy_pollset_and_shutdown(void *p) { +static void destroy_pollset_and_shutdown(void *p, int success, + grpc_call_list *call_list) { grpc_pollset_destroy(p); grpc_shutdown(); } static void freed_port_from_server(void *arg, - const grpc_httpcli_response *response) { + const grpc_httpcli_response *response, + grpc_call_list *call_list) { freereq *pr = arg; gpr_mu_lock(GRPC_POLLSET_MU(&pr->pollset)); pr->done = 1; @@ -91,12 +93,16 @@ static void free_port_using_server(char *server, int port) { grpc_httpcli_request req; freereq pr; char *path; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure shutdown_closure; grpc_init(); memset(&pr, 0, sizeof(pr)); memset(&req, 0, sizeof(req)); grpc_pollset_init(&pr.pollset); + grpc_closure_init(&shutdown_closure, destroy_pollset_and_shutdown, + &pr.pollset); req.host = server; gpr_asprintf(&path, "/drop/%d", port); @@ -105,7 +111,7 @@ static void free_port_using_server(char *server, int port) { grpc_httpcli_context_init(&context); grpc_httpcli_get(&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), freed_port_from_server, - &pr); + &pr, &call_list); gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); while (!pr.done) { grpc_pollset_worker worker; @@ -115,7 +121,9 @@ static void free_port_using_server(char *server, int port) { gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); grpc_httpcli_context_destroy(&context); - grpc_pollset_shutdown(&pr.pollset, destroy_pollset_and_shutdown, &pr.pollset); + grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&pr.pollset, &shutdown_closure, &call_list); + grpc_call_list_run(&call_list); gpr_free(path); } @@ -201,10 +209,12 @@ typedef struct portreq { } portreq; static void got_port_from_server(void *arg, - const grpc_httpcli_response *response) { + const grpc_httpcli_response *response, + grpc_call_list *call_list) { size_t i; int port = 0; portreq *pr = arg; + if (!response || response->status != 200) { grpc_httpcli_request req; memset(&req, 0, sizeof(req)); @@ -214,8 +224,9 @@ static void got_port_from_server(void *arg, req.path = "/get"; gpr_log(GPR_DEBUG, "failed port pick from server: retrying"); sleep(1); - grpc_httpcli_get(pr->ctx, &pr->pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), - got_port_from_server, pr); + grpc_httpcli_get(pr->ctx, &pr->pollset, &req, + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), got_port_from_server, + pr, call_list); return; } GPR_ASSERT(response); @@ -235,12 +246,16 @@ static int pick_port_using_server(char *server) { grpc_httpcli_context context; grpc_httpcli_request req; portreq pr; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure shutdown_closure; grpc_init(); memset(&pr, 0, sizeof(pr)); memset(&req, 0, sizeof(req)); grpc_pollset_init(&pr.pollset); + grpc_closure_init(&shutdown_closure, destroy_pollset_and_shutdown, + &pr.pollset); pr.port = -1; pr.server = server; pr.ctx = &context; @@ -251,7 +266,8 @@ static int pick_port_using_server(char *server) { grpc_httpcli_context_init(&context); grpc_httpcli_get(&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), got_port_from_server, - &pr); + &pr, &call_list); + grpc_call_list_run(&call_list); gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); while (pr.port == -1) { grpc_pollset_worker worker; @@ -261,7 +277,8 @@ static int pick_port_using_server(char *server) { gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); grpc_httpcli_context_destroy(&context); - grpc_pollset_shutdown(&pr.pollset, destroy_pollset_and_shutdown, &pr.pollset); + grpc_pollset_shutdown(&pr.pollset, &shutdown_closure, &call_list); + grpc_call_list_run(&call_list); return pr.port; } diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index 71fb69b54fc..b4eb7ed916e 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -65,15 +65,16 @@ static void pretty_print_backoffs(reconnect_server *server) { } } -static void on_connect(void *arg, grpc_endpoint *tcp) { +static void on_connect(void *arg, grpc_endpoint *tcp, + grpc_call_list *call_list) { char *peer; char *last_colon; reconnect_server *server = (reconnect_server *)arg; gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); timestamp_list *new_tail; peer = grpc_endpoint_get_peer(tcp); - grpc_endpoint_shutdown(tcp); - grpc_endpoint_destroy(tcp); + grpc_endpoint_shutdown(tcp, call_list); + grpc_endpoint_destroy(tcp, call_list); if (peer) { last_colon = strrchr(peer, ':'); if (server->peer == NULL) { @@ -114,6 +115,7 @@ void reconnect_server_init(reconnect_server *server) { void reconnect_server_start(reconnect_server *server, int port) { struct sockaddr_in addr; int port_added; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; addr.sin_family = AF_INET; addr.sin_port = htons((gpr_uint16)port); @@ -125,8 +127,10 @@ void reconnect_server_start(reconnect_server *server, int port) { GPR_ASSERT(port_added == port); grpc_tcp_server_start(server->tcp_server, server->pollsets, 1, on_connect, - server); + server, &call_list); gpr_log(GPR_INFO, "reconnect tcp server listening on 0.0.0.0:%d", port); + + grpc_call_list_run(&call_list); } void reconnect_server_poll(reconnect_server *server, int seconds) { @@ -152,12 +156,18 @@ void reconnect_server_clear_timestamps(reconnect_server *server) { server->peer = NULL; } -static void do_nothing(void *ignored) {} +static void do_nothing(void *ignored, int success, grpc_call_list *call_list) {} void reconnect_server_destroy(reconnect_server *server) { - grpc_tcp_server_destroy(server->tcp_server, do_nothing, NULL); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure do_nothing_closure[2]; + grpc_closure_init(&do_nothing_closure[0], do_nothing, NULL); + grpc_closure_init(&do_nothing_closure[1], do_nothing, NULL); + grpc_tcp_server_destroy(server->tcp_server, &do_nothing_closure[0], + &call_list); reconnect_server_clear_timestamps(server); - grpc_pollset_shutdown(&server->pollset, do_nothing, NULL); + grpc_pollset_shutdown(&server->pollset, &do_nothing_closure[1], &call_list); + grpc_call_list_run(&call_list); grpc_pollset_destroy(&server->pollset); grpc_shutdown(); } From 3ffd8220a17fd2fdf64adc66b03e4e254880471b Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 21 Sep 2015 08:21:57 -0700 Subject: [PATCH 15/56] Call list progress --- src/core/client_config/connector.c | 5 +- .../client_config/resolvers/dns_resolver.c | 2 +- .../resolvers/sockaddr_resolver.c | 2 +- src/core/client_config/subchannel.c | 3 +- src/core/client_config/subchannel_factory.c | 5 +- .../merge_channel_args.c | 5 +- src/core/httpcli/httpcli.c | 8 +- src/core/iomgr/tcp_client_posix.c | 1 - src/core/iomgr/workqueue.h | 3 +- src/core/surface/call.c | 299 ++++++++++++------ src/core/surface/call.h | 18 +- src/core/surface/channel.c | 4 +- src/core/surface/channel.h | 2 +- src/core/surface/completion_queue.h | 3 +- src/core/surface/secure_channel_create.c | 2 +- src/core/surface/server.c | 2 +- 16 files changed, 229 insertions(+), 135 deletions(-) diff --git a/src/core/client_config/connector.c b/src/core/client_config/connector.c index 31f0b84efe6..a0f346faeba 100644 --- a/src/core/client_config/connector.c +++ b/src/core/client_config/connector.c @@ -37,8 +37,9 @@ void grpc_connector_ref(grpc_connector *connector) { connector->vtable->ref(connector); } -void grpc_connector_unref(grpc_connector *connector) { - connector->vtable->unref(connector); +void grpc_connector_unref(grpc_connector *connector, + grpc_call_list *call_list) { + connector->vtable->unref(connector, call_list); } void grpc_connector_connect(grpc_connector *connector, diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index 9e9b3d49177..5750db4b434 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -145,7 +145,7 @@ static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses, args.addr = (struct sockaddr *)(addresses->addrs[i].addr); args.addr_len = (size_t)addresses->addrs[i].len; subchannels[i] = grpc_subchannel_factory_create_subchannel( - r->subchannel_factory, &args); + r->subchannel_factory, &args, call_list); } memset(&lb_policy_args, 0, sizeof(lb_policy_args)); lb_policy_args.subchannels = subchannels; diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index 15eb60b93a6..38293b0f133 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -139,7 +139,7 @@ static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r, args.addr = (struct sockaddr *)&r->addrs[i]; args.addr_len = r->addrs_len[i]; subchannels[i] = grpc_subchannel_factory_create_subchannel( - r->subchannel_factory, &args); + r->subchannel_factory, &args, call_list); } memset(&lb_policy_args, 0, sizeof(lb_policy_args)); lb_policy_args.subchannels = subchannels; diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index 937b3cd71c5..bae705f9c39 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -263,7 +263,7 @@ static void subchannel_destroy(grpc_subchannel *c, grpc_call_list *call_list) { gpr_free(c->addr); grpc_mdctx_unref(c->mdctx); grpc_connectivity_state_destroy(&c->state_tracker); - grpc_connector_unref(c->connector); + grpc_connector_unref(c->connector, call_list); gpr_free(c); } @@ -320,7 +320,6 @@ static void continue_connect(grpc_subchannel *c, grpc_call_list *call_list) { args.addr_len = c->addr_len; args.deadline = compute_connect_deadline(c); args.channel_args = c->args; - args.metadata_context = c->mdctx; grpc_connector_connect(c->connector, &args, &c->connecting_result, &c->connected, call_list); diff --git a/src/core/client_config/subchannel_factory.c b/src/core/client_config/subchannel_factory.c index f71386594c0..2a569aba13f 100644 --- a/src/core/client_config/subchannel_factory.c +++ b/src/core/client_config/subchannel_factory.c @@ -41,6 +41,7 @@ void grpc_subchannel_factory_unref(grpc_subchannel_factory *factory) { } grpc_subchannel *grpc_subchannel_factory_create_subchannel( - grpc_subchannel_factory *factory, grpc_subchannel_args *args) { - return factory->vtable->create_subchannel(factory, args); + grpc_subchannel_factory *factory, grpc_subchannel_args *args, + grpc_call_list *call_list) { + return factory->vtable->create_subchannel(factory, args, call_list); } diff --git a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c index c1b5507fde7..b2c9797b1a3 100644 --- a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c +++ b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c @@ -57,13 +57,14 @@ static void merge_args_factory_unref(grpc_subchannel_factory *scf) { } static grpc_subchannel *merge_args_factory_create_subchannel( - grpc_subchannel_factory *scf, grpc_subchannel_args *args) { + grpc_subchannel_factory *scf, grpc_subchannel_args *args, + grpc_call_list *call_list) { merge_args_factory *f = (merge_args_factory *)scf; grpc_channel_args *final_args = grpc_channel_args_merge(args->args, f->merge_args); grpc_subchannel *s; args->args = final_args; - s = grpc_subchannel_factory_create_subchannel(f->wrapped, args); + s = grpc_subchannel_factory_create_subchannel(f->wrapped, args, call_list); grpc_channel_args_destroy(final_args); return s; } diff --git a/src/core/httpcli/httpcli.c b/src/core/httpcli/httpcli.c index e35fa20953f..40ea2e9688c 100644 --- a/src/core/httpcli/httpcli.c +++ b/src/core/httpcli/httpcli.c @@ -66,7 +66,6 @@ typedef struct { grpc_closure on_read; grpc_closure done_write; grpc_closure connected; - grpc_workqueue *workqueue; } internal_request; static grpc_httpcli_get_override g_get_override = NULL; @@ -111,7 +110,6 @@ static void finish(internal_request *req, int success, grpc_iomgr_unregister_object(&req->iomgr_obj); gpr_slice_buffer_destroy(&req->incoming); gpr_slice_buffer_destroy(&req->outgoing); - GRPC_WORKQUEUE_UNREF(req->workqueue, "destroy"); gpr_free(req); } @@ -196,8 +194,8 @@ static void next_address(internal_request *req, grpc_call_list *call_list) { addr = &req->addresses->addrs[req->next_address++]; grpc_closure_init(&req->connected, on_connected, req); grpc_tcp_client_connect(&req->connected, &req->ep, &req->context->pollset_set, - req->workqueue, (struct sockaddr *)&addr->addr, - addr->len, req->deadline, call_list); + (struct sockaddr *)&addr->addr, addr->len, + req->deadline, call_list); } static void on_resolved(void *arg, grpc_resolved_addresses *addresses, @@ -234,8 +232,6 @@ static void internal_request_begin( gpr_slice_buffer_init(&req->outgoing); grpc_iomgr_register_object(&req->iomgr_obj, name); req->host = gpr_strdup(request->host); - req->workqueue = grpc_workqueue_create(call_list); - grpc_workqueue_add_to_pollset(req->workqueue, pollset); grpc_pollset_set_add_pollset(&req->context->pollset_set, req->pollset, call_list); diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c index a4828201c7f..fed832fce61 100644 --- a/src/core/iomgr/tcp_client_posix.c +++ b/src/core/iomgr/tcp_client_posix.c @@ -205,7 +205,6 @@ finish: void grpc_tcp_client_connect(grpc_closure *closure, grpc_endpoint **ep, grpc_pollset_set *interested_parties, - grpc_workqueue *workqueue, const struct sockaddr *addr, size_t addr_len, gpr_timespec deadline, grpc_call_list *call_list) { int fd; diff --git a/src/core/iomgr/workqueue.h b/src/core/iomgr/workqueue.h index b9d2a87dca3..ea7031a9f37 100644 --- a/src/core/iomgr/workqueue.h +++ b/src/core/iomgr/workqueue.h @@ -73,7 +73,8 @@ void grpc_workqueue_unref(grpc_workqueue *workqueue, grpc_call_list *call_list); /** Bind this workqueue to a pollset */ void grpc_workqueue_add_to_pollset(grpc_workqueue *workqueue, - grpc_pollset *pollset); + grpc_pollset *pollset, + grpc_call_list *call_list); /** Add a work item to a workqueue */ void grpc_workqueue_push(grpc_workqueue *workqueue, grpc_closure *closure, diff --git a/src/core/surface/call.c b/src/core/surface/call.c index b5a4155e024..f2f8f0a6edc 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -163,8 +163,6 @@ struct grpc_call { gpr_uint8 bound_pollset; /* is an error status set */ gpr_uint8 error_status_set; - /** should the alarm be cancelled */ - gpr_uint8 cancel_alarm; /** bitmask of allocated completion events in completions */ gpr_uint8 allocated_completions; /** flag indicating that cancellation is inherited */ @@ -278,19 +276,25 @@ struct grpc_call { #define CALL_FROM_TOP_ELEM(top_elem) \ CALL_FROM_CALL_STACK(grpc_call_stack_from_top_element(top_elem)) -static void set_deadline_alarm(grpc_call *call, gpr_timespec deadline); -static void call_on_done_recv(void *call, int success); -static void call_on_done_send(void *call, int success); +static void set_deadline_alarm(grpc_call *call, gpr_timespec deadline, + grpc_call_list *call_list); +static void call_on_done_recv(void *call, int success, + grpc_call_list *call_list); +static void call_on_done_send(void *call, int success, + grpc_call_list *call_list); static int fill_send_ops(grpc_call *call, grpc_transport_stream_op *op); -static void execute_op(grpc_call *call, grpc_transport_stream_op *op); -static void recv_metadata(grpc_call *call, grpc_metadata_batch *metadata); +static void execute_op(grpc_call *call, grpc_transport_stream_op *op, + grpc_call_list *call_list); +static void recv_metadata(grpc_call *call, grpc_metadata_batch *metadata, + grpc_call_list *call_list); static void finish_read_ops(grpc_call *call); static grpc_call_error cancel_with_status(grpc_call *c, grpc_status_code status, const char *description); -static void finished_loose_op(void *call, int success); +static void finished_loose_op(void *call, int success, + grpc_call_list *call_list); static void lock(grpc_call *call); -static void unlock(grpc_call *call); +static void unlock(grpc_call *call, grpc_call_list *call_list); grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, gpr_uint32 propagation_mask, @@ -303,6 +307,7 @@ grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, grpc_transport_stream_op initial_op; grpc_transport_stream_op *initial_op_ptr = NULL; grpc_channel_stack *channel_stack = grpc_channel_get_channel_stack(channel); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_call *call = gpr_malloc(sizeof(grpc_call) + channel_stack->call_stack_size); memset(call, 0, sizeof(grpc_call)); @@ -395,19 +400,20 @@ grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, } if (gpr_time_cmp(send_deadline, gpr_inf_future(send_deadline.clock_type)) != 0) { - set_deadline_alarm(call, send_deadline); + set_deadline_alarm(call, send_deadline, &call_list); } + grpc_call_list_run(&call_list); return call; } -void grpc_call_set_completion_queue(grpc_call *call, - grpc_completion_queue *cq) { +void grpc_call_set_completion_queue(grpc_call *call, grpc_completion_queue *cq, + grpc_call_list *call_list) { lock(call); call->cq = cq; if (cq) { GRPC_CQ_INTERNAL_REF(cq, "bind"); } - unlock(call); + unlock(call, call_list); } grpc_completion_queue *grpc_call_get_completion_queue(grpc_call *call) { @@ -429,13 +435,14 @@ static grpc_cq_completion *allocate_completion(grpc_call *call) { abort(); } -static void done_completion(void *call, grpc_cq_completion *completion) { +static void done_completion(void *call, grpc_cq_completion *completion, + grpc_call_list *call_list) { grpc_call *c = call; gpr_mu_lock(&c->completion_mu); c->allocated_completions &= (gpr_uint8) ~(1u << (completion - c->completions)); gpr_mu_unlock(&c->completion_mu); - GRPC_CALL_INTERNAL_UNREF(c, "completion", 1); + GRPC_CALL_INTERNAL_UNREF(c, "completion", call_list); } #ifdef GRPC_CALL_REF_COUNT_DEBUG @@ -448,10 +455,10 @@ void grpc_call_internal_ref(grpc_call *c) { gpr_ref(&c->internal_refcount); } -static void destroy_call(void *call, int ignored_success) { +static void destroy_call(grpc_call *call, grpc_call_list *call_list) { size_t i; grpc_call *c = call; - grpc_call_stack_destroy(CALL_STACK_FROM_CALL(c)); + grpc_call_stack_destroy(CALL_STACK_FROM_CALL(c), call_list); GRPC_CHANNEL_INTERNAL_UNREF(c->channel, "call"); gpr_mu_destroy(&c->mu); gpr_mu_destroy(&c->completion_mu); @@ -487,21 +494,14 @@ static void destroy_call(void *call, int ignored_success) { #ifdef GRPC_CALL_REF_COUNT_DEBUG void grpc_call_internal_unref(grpc_call *c, const char *reason, - int allow_immediate_deletion) { + grpc_call_list *call_list) { gpr_log(GPR_DEBUG, "CALL: unref %p %d -> %d [%s]", c, c->internal_refcount.count, c->internal_refcount.count - 1, reason); #else -void grpc_call_internal_unref(grpc_call *c, int allow_immediate_deletion) { +void grpc_call_internal_unref(grpc_call *c, grpc_call_list *call_list) { #endif if (gpr_unref(&c->internal_refcount)) { - if (allow_immediate_deletion) { - destroy_call(c, 1); - } else { - c->destroy_closure.cb = destroy_call; - c->destroy_closure.cb_arg = c; - grpc_workqueue_push(grpc_channel_get_workqueue(c->channel), - &c->destroy_closure, 1); - } + destroy_call(c, call_list); } } @@ -600,7 +600,7 @@ static int need_more_data(grpc_call *call) { (call->cancel_with_status != GRPC_STATUS_OK) || call->destroy_called; } -static void unlock(grpc_call *call) { +static void unlock(grpc_call *call, grpc_call_list *call_list) { grpc_transport_stream_op op; completed_request completed_requests[GRPC_IOREQ_OP_COUNT]; int completing_requests = 0; @@ -608,7 +608,6 @@ static void unlock(grpc_call *call) { int i; const size_t MAX_RECV_PEEK_AHEAD = 65536; size_t buffered_bytes; - int cancel_alarm = 0; memset(&op, 0, sizeof(op)); @@ -616,9 +615,6 @@ static void unlock(grpc_call *call) { start_op = op.cancel_with_status != GRPC_STATUS_OK; call->cancel_with_status = GRPC_STATUS_OK; /* reset */ - cancel_alarm = call->cancel_alarm; - call->cancel_alarm = 0; - if (!call->receiving && need_more_data(call)) { if (grpc_bbq_empty(&call->incoming_queue) && call->reading_message) { op.max_recv_bytes = call->incoming_message_length - @@ -655,7 +651,7 @@ static void unlock(grpc_call *call) { call->bound_pollset = 1; op.bind_pollset = grpc_cq_pollset(call->cq); grpc_workqueue_add_to_pollset(grpc_channel_get_workqueue(call->channel), - op.bind_pollset); + op.bind_pollset, call_list); start_op = 1; } @@ -670,12 +666,8 @@ static void unlock(grpc_call *call) { gpr_mu_unlock(&call->mu); - if (cancel_alarm) { - grpc_alarm_cancel(&call->alarm); - } - if (start_op) { - execute_op(call, &op); + execute_op(call, &op, call_list); } if (completing_requests > 0) { @@ -685,8 +677,8 @@ static void unlock(grpc_call *call) { } lock(call); call->completing = 0; - unlock(call); - GRPC_CALL_INTERNAL_UNREF(call, "completing", 0); + unlock(call, call_list); + GRPC_CALL_INTERNAL_UNREF(call, "completing", call_list); } } @@ -831,7 +823,8 @@ static void early_out_write_ops(grpc_call *call) { } } -static void call_on_done_send(void *pc, int success) { +static void call_on_done_send(void *pc, int success, + grpc_call_list *call_list) { grpc_call *call = pc; lock(call); if (call->last_send_contains & (1 << GRPC_IOREQ_SEND_INITIAL_METADATA)) { @@ -854,8 +847,8 @@ static void call_on_done_send(void *pc, int success) { call->send_ops.nops = 0; call->last_send_contains = 0; call->sending = 0; - unlock(call); - GRPC_CALL_INTERNAL_UNREF(call, "sending", 0); + unlock(call, call_list); + GRPC_CALL_INTERNAL_UNREF(call, "sending", call_list); } static void finish_message(grpc_call *call) { @@ -961,7 +954,8 @@ static int add_slice_to_message(grpc_call *call, gpr_slice slice) { } } -static void call_on_done_recv(void *pc, int success) { +static void call_on_done_recv(void *pc, int success, + grpc_call_list *call_list) { grpc_call *call = pc; grpc_call *child_call; grpc_call *next_child_call; @@ -976,7 +970,7 @@ static void call_on_done_recv(void *pc, int success) { case GRPC_NO_OP: break; case GRPC_OP_METADATA: - recv_metadata(call, &op->data.metadata); + recv_metadata(call, &op->data.metadata, call_list); break; case GRPC_OP_BEGIN_MESSAGE: success = begin_message(call, op->data.begin_message); @@ -997,7 +991,9 @@ static void call_on_done_recv(void *pc, int success) { if (call->recv_state == GRPC_STREAM_CLOSED) { GPR_ASSERT(call->read_state <= READ_STATE_STREAM_CLOSED); call->read_state = READ_STATE_STREAM_CLOSED; - call->cancel_alarm |= call->have_alarm; + if (call->have_alarm) { + grpc_alarm_cancel(&call->alarm, call_list); + } /* propagate cancellation to any interested children */ child_call = call->first_child; if (child_call != NULL) { @@ -1006,12 +1002,12 @@ static void call_on_done_recv(void *pc, int success) { if (child_call->cancellation_is_inherited) { GRPC_CALL_INTERNAL_REF(child_call, "propagate_cancel"); grpc_call_cancel(child_call, NULL); - GRPC_CALL_INTERNAL_UNREF(child_call, "propagate_cancel", 0); + GRPC_CALL_INTERNAL_UNREF(child_call, "propagate_cancel", call_list); } child_call = next_child_call; } while (child_call != call->first_child); } - GRPC_CALL_INTERNAL_UNREF(call, "closed", 0); + GRPC_CALL_INTERNAL_UNREF(call, "closed", call_list); } finish_read_ops(call); } else { @@ -1023,9 +1019,9 @@ static void call_on_done_recv(void *pc, int success) { finish_ioreq_op(call, GRPC_IOREQ_RECV_STATUS_DETAILS, 0); } call->recv_ops.nops = 0; - unlock(call); + unlock(call, call_list); - GRPC_CALL_INTERNAL_UNREF(call, "receiving", 0); + GRPC_CALL_INTERNAL_UNREF(call, "receiving", call_list); GRPC_TIMER_END(GRPC_PTAG_CALL_ON_DONE_RECV, 0); } @@ -1277,17 +1273,19 @@ static grpc_call_error start_ioreq(grpc_call *call, const grpc_ioreq *reqs, grpc_call_error grpc_call_start_ioreq_and_call_back( grpc_call *call, const grpc_ioreq *reqs, size_t nreqs, - grpc_ioreq_completion_func on_complete, void *user_data) { + grpc_ioreq_completion_func on_complete, void *user_data, + grpc_call_list *call_list) { grpc_call_error err; lock(call); err = start_ioreq(call, reqs, nreqs, on_complete, user_data); - unlock(call); + unlock(call, call_list); return err; } void grpc_call_destroy(grpc_call *c) { int cancel; grpc_call *parent = c->parent; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; if (parent) { gpr_mu_lock(&parent->mu); @@ -1300,17 +1298,20 @@ void grpc_call_destroy(grpc_call *c) { c->sibling_next->sibling_prev = c->sibling_prev; } gpr_mu_unlock(&parent->mu); - GRPC_CALL_INTERNAL_UNREF(parent, "child", 1); + GRPC_CALL_INTERNAL_UNREF(parent, "child", &call_list); } lock(c); GPR_ASSERT(!c->destroy_called); c->destroy_called = 1; - c->cancel_alarm |= c->have_alarm; + if (c->have_alarm) { + grpc_alarm_cancel(&c->alarm, &call_list); + } cancel = c->read_state != READ_STATE_STREAM_CLOSED; - unlock(c); + unlock(c, &call_list); if (cancel) grpc_call_cancel(c, NULL); - GRPC_CALL_INTERNAL_UNREF(c, "destroy", 1); + GRPC_CALL_INTERNAL_UNREF(c, "destroy", &call_list); + grpc_call_list_run(&call_list); } grpc_call_error grpc_call_cancel(grpc_call *call, void *reserved) { @@ -1324,10 +1325,12 @@ grpc_call_error grpc_call_cancel_with_status(grpc_call *c, const char *description, void *reserved) { grpc_call_error r; - (void)reserved; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + GPR_ASSERT(reserved == NULL); lock(c); r = cancel_with_status(c, status, description); - unlock(c); + unlock(c, &call_list); + grpc_call_list_run(&call_list); return r; } @@ -1347,8 +1350,9 @@ static grpc_call_error cancel_with_status(grpc_call *c, grpc_status_code status, return GRPC_CALL_OK; } -static void finished_loose_op(void *call, int success_ignored) { - GRPC_CALL_INTERNAL_UNREF(call, "loose-op", 0); +static void finished_loose_op(void *call, int success_ignored, + grpc_call_list *call_list) { + GRPC_CALL_INTERNAL_UNREF(call, "loose-op", call_list); } typedef struct { @@ -1356,13 +1360,15 @@ typedef struct { grpc_closure closure; } finished_loose_op_allocated_args; -static void finished_loose_op_allocated(void *alloc, int success) { +static void finished_loose_op_allocated(void *alloc, int success, + grpc_call_list *call_list) { finished_loose_op_allocated_args *args = alloc; - finished_loose_op(args->call, success); + finished_loose_op(args->call, success, call_list); gpr_free(args); } -static void execute_op(grpc_call *call, grpc_transport_stream_op *op) { +static void execute_op(grpc_call *call, grpc_transport_stream_op *op, + grpc_call_list *call_list) { grpc_call_element *elem; GPR_ASSERT(op->on_consumed == NULL); @@ -1380,19 +1386,22 @@ static void execute_op(grpc_call *call, grpc_transport_stream_op *op) { elem = CALL_ELEM_FROM_CALL(call, 0); op->context = call->context; - elem->filter->start_transport_stream_op(elem, op); + elem->filter->start_transport_stream_op(elem, op, call_list); } char *grpc_call_get_peer(grpc_call *call) { grpc_call_element *elem = CALL_ELEM_FROM_CALL(call, 0); - return elem->filter->get_peer(elem); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + char *result = elem->filter->get_peer(elem, &call_list); + grpc_call_list_run(&call_list); + return result; } grpc_call *grpc_call_from_top_element(grpc_call_element *elem) { return CALL_FROM_TOP_ELEM(elem); } -static void call_alarm(void *arg, int success) { +static void call_alarm(void *arg, int success, grpc_call_list *call_list) { grpc_call *call = arg; lock(call); call->have_alarm = 0; @@ -1401,11 +1410,12 @@ static void call_alarm(void *arg, int success) { "Deadline Exceeded"); } finish_read_ops(call); - unlock(call); - GRPC_CALL_INTERNAL_UNREF(call, "alarm", 1); + unlock(call, call_list); + GRPC_CALL_INTERNAL_UNREF(call, "alarm", call_list); } -static void set_deadline_alarm(grpc_call *call, gpr_timespec deadline) { +static void set_deadline_alarm(grpc_call *call, gpr_timespec deadline, + grpc_call_list *call_list) { if (call->have_alarm) { gpr_log(GPR_ERROR, "Attempt to set deadline alarm twice"); assert(0); @@ -1415,7 +1425,7 @@ static void set_deadline_alarm(grpc_call *call, gpr_timespec deadline) { call->have_alarm = 1; call->send_deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC); grpc_alarm_init(&call->alarm, call->send_deadline, call_alarm, call, - gpr_now(GPR_CLOCK_MONOTONIC)); + gpr_now(GPR_CLOCK_MONOTONIC), call_list); } /* we offset status by a small amount when storing it into transport metadata @@ -1466,7 +1476,8 @@ static gpr_uint32 decode_compression(grpc_mdelem *md) { return algorithm; } -static void recv_metadata(grpc_call *call, grpc_metadata_batch *md) { +static void recv_metadata(grpc_call *call, grpc_metadata_batch *md, + grpc_call_list *call_list) { grpc_linked_mdelem *l; grpc_metadata_array *dest; grpc_metadata *mdusr; @@ -1513,7 +1524,7 @@ static void recv_metadata(grpc_call *call, grpc_metadata_batch *md) { if (gpr_time_cmp(md->deadline, gpr_inf_future(md->deadline.clock_type)) != 0 && !call->is_client) { - set_deadline_alarm(call, md->deadline); + set_deadline_alarm(call, md->deadline, call_list); } if (!is_trailing) { call->read_state = READ_STATE_GOT_INITIAL_METADATA; @@ -1571,8 +1582,13 @@ grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, const grpc_op *op; grpc_ioreq *req; void (*finish_func)(grpc_call *, int, void *) = finish_batch; + grpc_call_error error; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; - if (reserved != NULL) return GRPC_CALL_ERROR; + if (reserved != NULL) { + error = GRPC_CALL_ERROR; + goto done; + } GRPC_CALL_LOG_BATCH(GPR_INFO, call, ops, nops, tag); @@ -1581,19 +1597,29 @@ grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, GRPC_CALL_INTERNAL_REF(call, "completion"); grpc_cq_end_op(call->cq, tag, 1, done_completion, call, allocate_completion(call)); - return GRPC_CALL_OK; + error = GRPC_CALL_OK; + goto done; } /* rewrite batch ops into ioreq ops */ for (in = 0, out = 0; in < nops; in++) { op = &ops[in]; - if (op->reserved != NULL) return GRPC_CALL_ERROR; + if (op->reserved != NULL) { + error = GRPC_CALL_ERROR; + goto done; + } switch (op->op) { case GRPC_OP_SEND_INITIAL_METADATA: /* Flag validation: currently allow no flags */ - if (op->flags != 0) return GRPC_CALL_ERROR_INVALID_FLAGS; + if (op->flags != 0) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) return GRPC_CALL_ERROR_BATCH_TOO_BIG; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } req->op = GRPC_IOREQ_SEND_INITIAL_METADATA; req->data.send_metadata.count = op->data.send_initial_metadata.count; req->data.send_metadata.metadata = @@ -1602,36 +1628,55 @@ grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, break; case GRPC_OP_SEND_MESSAGE: if (!are_write_flags_valid(op->flags)) { - return GRPC_CALL_ERROR_INVALID_FLAGS; + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; } if (op->data.send_message == NULL) { - return GRPC_CALL_ERROR_INVALID_MESSAGE; + error = GRPC_CALL_ERROR_INVALID_MESSAGE; + goto done; } req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) return GRPC_CALL_ERROR_BATCH_TOO_BIG; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } req->op = GRPC_IOREQ_SEND_MESSAGE; req->data.send_message = op->data.send_message; req->flags = op->flags; break; case GRPC_OP_SEND_CLOSE_FROM_CLIENT: /* Flag validation: currently allow no flags */ - if (op->flags != 0) return GRPC_CALL_ERROR_INVALID_FLAGS; + if (op->flags != 0) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } if (!call->is_client) { - return GRPC_CALL_ERROR_NOT_ON_SERVER; + error = GRPC_CALL_ERROR_NOT_ON_SERVER; + goto done; } req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) return GRPC_CALL_ERROR_BATCH_TOO_BIG; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } req->op = GRPC_IOREQ_SEND_CLOSE; req->flags = op->flags; break; case GRPC_OP_SEND_STATUS_FROM_SERVER: /* Flag validation: currently allow no flags */ - if (op->flags != 0) return GRPC_CALL_ERROR_INVALID_FLAGS; + if (op->flags != 0) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } if (call->is_client) { - return GRPC_CALL_ERROR_NOT_ON_CLIENT; + error = GRPC_CALL_ERROR_NOT_ON_CLIENT; + goto done; } req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) return GRPC_CALL_ERROR_BATCH_TOO_BIG; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } req->op = GRPC_IOREQ_SEND_TRAILING_METADATA; req->flags = op->flags; req->data.send_metadata.count = @@ -1639,7 +1684,10 @@ grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, req->data.send_metadata.metadata = op->data.send_status_from_server.trailing_metadata; req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) return GRPC_CALL_ERROR_BATCH_TOO_BIG; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } req->op = GRPC_IOREQ_SEND_STATUS; req->data.send_status.code = op->data.send_status_from_server.status; req->data.send_status.details = @@ -1649,17 +1697,27 @@ grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, op->data.send_status_from_server.status_details, 0) : NULL; req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) return GRPC_CALL_ERROR_BATCH_TOO_BIG; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } req->op = GRPC_IOREQ_SEND_CLOSE; break; case GRPC_OP_RECV_INITIAL_METADATA: /* Flag validation: currently allow no flags */ - if (op->flags != 0) return GRPC_CALL_ERROR_INVALID_FLAGS; + if (op->flags != 0) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } if (!call->is_client) { - return GRPC_CALL_ERROR_NOT_ON_SERVER; + error = GRPC_CALL_ERROR_NOT_ON_SERVER; + goto done; } req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) return GRPC_CALL_ERROR_BATCH_TOO_BIG; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } req->op = GRPC_IOREQ_RECV_INITIAL_METADATA; req->data.recv_metadata = op->data.recv_initial_metadata; req->data.recv_metadata->count = 0; @@ -1667,55 +1725,86 @@ grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, break; case GRPC_OP_RECV_MESSAGE: /* Flag validation: currently allow no flags */ - if (op->flags != 0) return GRPC_CALL_ERROR_INVALID_FLAGS; + if (op->flags != 0) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) return GRPC_CALL_ERROR_BATCH_TOO_BIG; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } req->op = GRPC_IOREQ_RECV_MESSAGE; req->data.recv_message = op->data.recv_message; req->flags = op->flags; break; case GRPC_OP_RECV_STATUS_ON_CLIENT: /* Flag validation: currently allow no flags */ - if (op->flags != 0) return GRPC_CALL_ERROR_INVALID_FLAGS; + if (op->flags != 0) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } if (!call->is_client) { - return GRPC_CALL_ERROR_NOT_ON_SERVER; + error = GRPC_CALL_ERROR_NOT_ON_SERVER; + goto done; } req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) return GRPC_CALL_ERROR_BATCH_TOO_BIG; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } req->op = GRPC_IOREQ_RECV_STATUS; req->flags = op->flags; req->data.recv_status.set_value = set_status_value_directly; req->data.recv_status.user_data = op->data.recv_status_on_client.status; req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) return GRPC_CALL_ERROR_BATCH_TOO_BIG; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } req->op = GRPC_IOREQ_RECV_STATUS_DETAILS; req->data.recv_status_details.details = op->data.recv_status_on_client.status_details; req->data.recv_status_details.details_capacity = op->data.recv_status_on_client.status_details_capacity; req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) return GRPC_CALL_ERROR_BATCH_TOO_BIG; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } req->op = GRPC_IOREQ_RECV_TRAILING_METADATA; req->data.recv_metadata = op->data.recv_status_on_client.trailing_metadata; req->data.recv_metadata->count = 0; req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) return GRPC_CALL_ERROR_BATCH_TOO_BIG; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } req->op = GRPC_IOREQ_RECV_CLOSE; finish_func = finish_batch_with_close; break; case GRPC_OP_RECV_CLOSE_ON_SERVER: /* Flag validation: currently allow no flags */ - if (op->flags != 0) return GRPC_CALL_ERROR_INVALID_FLAGS; + if (op->flags != 0) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) return GRPC_CALL_ERROR_BATCH_TOO_BIG; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } req->op = GRPC_IOREQ_RECV_STATUS; req->flags = op->flags; req->data.recv_status.set_value = set_cancelled_value; req->data.recv_status.user_data = op->data.recv_close_on_server.cancelled; req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) return GRPC_CALL_ERROR_BATCH_TOO_BIG; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } req->op = GRPC_IOREQ_RECV_CLOSE; finish_func = finish_batch_with_close; break; @@ -1725,7 +1814,11 @@ grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, GRPC_CALL_INTERNAL_REF(call, "completion"); grpc_cq_begin_op(call->cq); - return grpc_call_start_ioreq_and_call_back(call, reqs, out, finish_func, tag); + error = grpc_call_start_ioreq_and_call_back(call, reqs, out, finish_func, tag, + &call_list); +done: + grpc_call_list_run(&call_list); + return error; } void grpc_call_context_set(grpc_call *call, grpc_context_index elem, diff --git a/src/core/surface/call.h b/src/core/surface/call.h index 00638e43b5f..7a7178bc7b8 100644 --- a/src/core/surface/call.h +++ b/src/core/surface/call.h @@ -97,28 +97,30 @@ grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, size_t add_initial_metadata_count, gpr_timespec send_deadline); -void grpc_call_set_completion_queue(grpc_call *call, grpc_completion_queue *cq); +void grpc_call_set_completion_queue(grpc_call *call, grpc_completion_queue *cq, + grpc_call_list *call_list); grpc_completion_queue *grpc_call_get_completion_queue(grpc_call *call); #ifdef GRPC_CALL_REF_COUNT_DEBUG void grpc_call_internal_ref(grpc_call *call, const char *reason); void grpc_call_internal_unref(grpc_call *call, const char *reason, - int allow_immediate_deletion); + grpc_call_list *call_list); #define GRPC_CALL_INTERNAL_REF(call, reason) \ grpc_call_internal_ref(call, reason) -#define GRPC_CALL_INTERNAL_UNREF(call, reason, allow_immediate_deletion) \ - grpc_call_internal_unref(call, reason, allow_immediate_deletion) +#define GRPC_CALL_INTERNAL_UNREF(call, reason, call_list) \ + grpc_call_internal_unref(call, reason, call_list) #else void grpc_call_internal_ref(grpc_call *call); -void grpc_call_internal_unref(grpc_call *call, int allow_immediate_deletion); +void grpc_call_internal_unref(grpc_call *call, grpc_call_list *call_list); #define GRPC_CALL_INTERNAL_REF(call, reason) grpc_call_internal_ref(call) -#define GRPC_CALL_INTERNAL_UNREF(call, reason, allow_immediate_deletion) \ - grpc_call_internal_unref(call, allow_immediate_deletion) +#define GRPC_CALL_INTERNAL_UNREF(call, reason, call_list) \ + grpc_call_internal_unref(call, call_list) #endif grpc_call_error grpc_call_start_ioreq_and_call_back( grpc_call *call, const grpc_ioreq *reqs, size_t nreqs, - grpc_ioreq_completion_func on_complete, void *user_data); + grpc_ioreq_completion_func on_complete, void *user_data, + grpc_call_list *call_list); grpc_call_stack *grpc_call_get_call_stack(grpc_call *call); diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index 6f49060be5e..fdba09fcce2 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -93,7 +93,7 @@ struct grpc_channel { grpc_channel *grpc_channel_create_from_filters( const char *target, const grpc_channel_filter **filters, size_t num_filters, const grpc_channel_args *args, grpc_mdctx *mdctx, grpc_workqueue *workqueue, - int is_client) { + int is_client, grpc_call_list *call_list) { size_t i; size_t size = sizeof(grpc_channel) + grpc_channel_stack_size(filters, num_filters); @@ -181,7 +181,7 @@ grpc_channel *grpc_channel_create_from_filters( grpc_channel_stack_init(filters, num_filters, channel, args, channel->metadata_context, - CHANNEL_STACK_FROM_CHANNEL(channel)); + CHANNEL_STACK_FROM_CHANNEL(channel), call_list); return channel; } diff --git a/src/core/surface/channel.h b/src/core/surface/channel.h index 9fc821d64b2..664ecc1c5ac 100644 --- a/src/core/surface/channel.h +++ b/src/core/surface/channel.h @@ -41,7 +41,7 @@ grpc_channel *grpc_channel_create_from_filters( const char *target, const grpc_channel_filter **filters, size_t count, const grpc_channel_args *args, grpc_mdctx *mdctx, grpc_workqueue *workqueue, - int is_client); + int is_client, grpc_call_list *call_list); /** Get a (borrowed) pointer to this channels underlying channel stack */ grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel); diff --git a/src/core/surface/completion_queue.h b/src/core/surface/completion_queue.h index 74dc09e36ef..793baff03a7 100644 --- a/src/core/surface/completion_queue.h +++ b/src/core/surface/completion_queue.h @@ -72,7 +72,8 @@ void grpc_cq_begin_op(grpc_completion_queue *cc); /* Queue a GRPC_OP_COMPLETED operation */ void grpc_cq_end_op(grpc_completion_queue *cc, void *tag, int success, - void (*done)(void *done_arg, grpc_cq_completion *storage), + void (*done)(void *done_arg, grpc_cq_completion *storage, + grpc_call_list *call_list), void *done_arg, grpc_cq_completion *storage); grpc_pollset *grpc_cq_pollset(grpc_completion_queue *cc); diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 24d8b3aa2c6..4a75d03f0a7 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -291,7 +291,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, f->merge_args = grpc_channel_args_copy(args_copy); f->master = channel; GRPC_CHANNEL_INTERNAL_REF(channel, "subchannel_factory"); - resolver = grpc_resolver_create(target, &f->base, workqueue); + resolver = grpc_resolver_create(target, &f->base); if (!resolver) { return NULL; } diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 75600027ed7..e38c6028d91 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -1309,7 +1309,7 @@ static void publish_registered_or_batch(grpc_call *call, int success, server_ref(chand->server); grpc_cq_end_op(calld->cq_new, rc->tag, success, done_request_event, rc, &rc->completion); - GRPC_CALL_INTERNAL_UNREF(call, "server", 0); + GRPC_CALL_INTERNAL_UNREF(call, "server", call_list); } const grpc_channel_args *grpc_server_get_channel_args(grpc_server *server) { From dfff1b8126a1f83833fd99626517f28d1e68453a Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 21 Sep 2015 14:39:57 -0700 Subject: [PATCH 16/56] Call list progress --- src/core/census/grpc_filter.c | 6 +- src/core/channel/channel_stack.c | 5 +- src/core/channel/channel_stack.h | 6 +- src/core/channel/client_channel.c | 9 +- src/core/channel/compress_filter.c | 3 +- src/core/channel/connected_channel.c | 19 +- src/core/channel/http_client_filter.c | 3 +- src/core/channel/http_server_filter.c | 3 +- src/core/channel/noop_filter.c | 3 +- .../client_config/lb_policies/pick_first.c | 2 +- .../client_config/resolvers/dns_resolver.c | 2 +- .../resolvers/sockaddr_resolver.c | 2 +- src/core/client_config/subchannel.c | 18 +- src/core/client_config/subchannel_factory.c | 6 +- src/core/client_config/subchannel_factory.h | 5 +- .../merge_channel_args.c | 5 +- src/core/httpcli/httpcli.c | 7 +- src/core/httpcli/httpcli.h | 6 +- src/core/iomgr/alarm.c | 3 +- src/core/iomgr/pollset.h | 7 +- src/core/iomgr/pollset_posix.c | 20 +- src/core/iomgr/resolve_address.h | 1 + src/core/security/client_auth_filter.c | 3 +- .../security/google_default_credentials.c | 2 +- src/core/security/server_auth_filter.c | 3 +- src/core/security/server_secure_chttp2.c | 20 +- src/core/surface/call.c | 22 +- src/core/surface/call.h | 3 +- src/core/surface/channel.c | 19 +- src/core/surface/channel.h | 14 +- src/core/surface/channel_connectivity.c | 40 +-- src/core/surface/channel_create.c | 60 ++-- src/core/surface/completion_queue.c | 32 +- src/core/surface/completion_queue.h | 6 +- src/core/surface/lame_client.c | 40 ++- src/core/surface/secure_channel_create.c | 14 +- src/core/surface/server.c | 288 ++++++++++-------- src/core/surface/server.h | 9 +- src/core/surface/server_chttp2.c | 36 ++- src/core/transport/chttp2/frame_data.c | 3 +- src/core/transport/chttp2/frame_data.h | 4 +- src/core/transport/chttp2/frame_goaway.c | 3 +- src/core/transport/chttp2/frame_goaway.h | 4 +- src/core/transport/chttp2/frame_ping.c | 7 +- src/core/transport/chttp2/frame_ping.h | 4 +- src/core/transport/chttp2/frame_rst_stream.c | 3 +- src/core/transport/chttp2/frame_rst_stream.h | 4 +- src/core/transport/chttp2/frame_settings.c | 3 +- src/core/transport/chttp2/frame_settings.h | 4 +- .../transport/chttp2/frame_window_update.c | 3 +- .../transport/chttp2/frame_window_update.h | 4 +- src/core/transport/chttp2/hpack_parser.c | 3 +- src/core/transport/chttp2/hpack_parser.h | 4 +- src/core/transport/chttp2/internal.h | 21 +- src/core/transport/chttp2/parsing.c | 30 +- src/core/transport/chttp2/writing.c | 22 +- src/core/transport/chttp2_transport.c | 284 ++++++++--------- src/core/transport/chttp2_transport.h | 5 +- src/core/transport/connectivity_state.c | 5 +- src/core/transport/connectivity_state.h | 3 +- src/core/transport/transport.c | 52 ++-- src/core/transport/transport.h | 22 +- src/core/transport/transport_impl.h | 16 +- test/core/bad_client/bad_client.c | 14 +- test/core/channel/channel_stack_test.c | 32 +- .../core/end2end/fixtures/h2_sockpair+trace.c | 33 +- test/core/end2end/fixtures/h2_sockpair.c | 33 +- .../core/end2end/fixtures/h2_sockpair_1byte.c | 33 +- test/core/httpcli/httpcli_test.c | 29 +- test/core/iomgr/alarm_list_test.c | 63 ++-- test/core/iomgr/alarm_test.c | 10 +- test/core/iomgr/endpoint_pair_test.c | 22 +- test/core/iomgr/endpoint_tests.c | 3 +- test/core/iomgr/fd_conservation_posix_test.c | 11 +- test/core/iomgr/fd_posix_test.c | 121 +++++--- test/core/iomgr/resolve_address_test.c | 6 +- test/core/iomgr/tcp_client_posix_test.c | 69 +++-- test/core/security/credentials_test.c | 118 ++++--- test/core/security/jwt_verifier_test.c | 60 ++-- test/core/security/oauth2_utils.c | 2 +- test/core/security/secure_endpoint_test.c | 44 ++- test/core/surface/completion_queue_test.c | 21 +- test/core/util/port_posix.c | 4 +- test/core/util/reconnect_server.c | 4 +- 84 files changed, 1187 insertions(+), 810 deletions(-) diff --git a/src/core/census/grpc_filter.c b/src/core/census/grpc_filter.c index d66f29228b0..fa318c4e541 100644 --- a/src/core/census/grpc_filter.c +++ b/src/core/census/grpc_filter.c @@ -128,7 +128,8 @@ static void server_start_transport_op(grpc_call_element* elem, static void client_init_call_elem(grpc_call_element* elem, const void* server_transport_data, - grpc_transport_stream_op* initial_op) { + grpc_transport_stream_op* initial_op, + grpc_call_list* call_list) { call_data* d = elem->call_data; GPR_ASSERT(d != NULL); d->start_ts = gpr_now(GPR_CLOCK_REALTIME); @@ -144,7 +145,8 @@ static void client_destroy_call_elem(grpc_call_element* elem, static void server_init_call_elem(grpc_call_element* elem, const void* server_transport_data, - grpc_transport_stream_op* initial_op) { + grpc_transport_stream_op* initial_op, + grpc_call_list* call_list) { call_data* d = elem->call_data; GPR_ASSERT(d != NULL); d->start_ts = gpr_now(GPR_CLOCK_REALTIME); diff --git a/src/core/channel/channel_stack.c b/src/core/channel/channel_stack.c index c767a87b208..10fbd520c32 100644 --- a/src/core/channel/channel_stack.c +++ b/src/core/channel/channel_stack.c @@ -153,7 +153,8 @@ void grpc_channel_stack_destroy(grpc_channel_stack *stack, void grpc_call_stack_init(grpc_channel_stack *channel_stack, const void *transport_server_data, grpc_transport_stream_op *initial_op, - grpc_call_stack *call_stack) { + grpc_call_stack *call_stack, + grpc_call_list *call_list) { grpc_channel_element *channel_elems = CHANNEL_ELEMS_FROM_STACK(channel_stack); size_t count = channel_stack->count; grpc_call_element *call_elems; @@ -171,7 +172,7 @@ void grpc_call_stack_init(grpc_channel_stack *channel_stack, call_elems[i].channel_data = channel_elems[i].channel_data; call_elems[i].call_data = user_data; call_elems[i].filter->init_call_elem(&call_elems[i], transport_server_data, - initial_op); + initial_op, call_list); user_data += ROUND_UP_TO_ALIGNMENT_SIZE(call_elems[i].filter->sizeof_call_data); } diff --git a/src/core/channel/channel_stack.h b/src/core/channel/channel_stack.h index 190247b3f10..5afe7f258a0 100644 --- a/src/core/channel/channel_stack.h +++ b/src/core/channel/channel_stack.h @@ -85,7 +85,8 @@ typedef struct { argument.*/ void (*init_call_elem)(grpc_call_element *elem, const void *server_transport_data, - grpc_transport_stream_op *initial_op); + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list); /* Destroy per call data. The filter does not need to do any chaining */ void (*destroy_call_elem)(grpc_call_element *elem, grpc_call_list *call_list); @@ -172,7 +173,8 @@ void grpc_channel_stack_destroy(grpc_channel_stack *stack, void grpc_call_stack_init(grpc_channel_stack *channel_stack, const void *transport_server_data, grpc_transport_stream_op *initial_op, - grpc_call_stack *call_stack); + grpc_call_stack *call_stack, + grpc_call_list *call_list); /* Destroy a call stack */ void grpc_call_stack_destroy(grpc_call_stack *stack, grpc_call_list *call_list); diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 6618336e938..62f81daf447 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -459,7 +459,7 @@ static void on_lb_policy_state_changed(void *arg, int iomgr_success, on_lb_policy_state_changed_locked(w, call_list); gpr_mu_unlock(&w->chand->mu_config); - GRPC_CHANNEL_INTERNAL_UNREF(w->chand->master, "watch_lb_policy"); + GRPC_CHANNEL_INTERNAL_UNREF(w->chand->master, "watch_lb_policy", call_list); gpr_free(w); } @@ -551,7 +551,7 @@ static void cc_on_config_changed(void *arg, int iomgr_success, GRPC_LB_POLICY_UNREF(lb_policy, "config_change", call_list); } - GRPC_CHANNEL_INTERNAL_UNREF(chand->master, "resolver"); + GRPC_CHANNEL_INTERNAL_UNREF(chand->master, "resolver", call_list); } static void cc_start_transport_op(grpc_channel_element *elem, @@ -610,7 +610,8 @@ static void cc_start_transport_op(grpc_channel_element *elem, /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, - grpc_transport_stream_op *initial_op) { + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list) { call_data *calld = elem->call_data; /* TODO(ctiller): is there something useful we can do here? */ @@ -688,7 +689,7 @@ static void destroy_channel_elem(grpc_channel_element *elem, if (chand->lb_policy != NULL) { GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel", call_list); } - grpc_connectivity_state_destroy(&chand->state_tracker); + grpc_connectivity_state_destroy(&chand->state_tracker, call_list); grpc_pollset_set_destroy(&chand->pollset_set); gpr_mu_destroy(&chand->mu_config); } diff --git a/src/core/channel/compress_filter.c b/src/core/channel/compress_filter.c index 5a7403ccfdc..e2be603e266 100644 --- a/src/core/channel/compress_filter.c +++ b/src/core/channel/compress_filter.c @@ -282,7 +282,8 @@ static void compress_start_transport_stream_op(grpc_call_element *elem, /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, - grpc_transport_stream_op *initial_op) { + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; diff --git a/src/core/channel/connected_channel.c b/src/core/channel/connected_channel.c index 00a4d61afed..1af5eae9478 100644 --- a/src/core/channel/connected_channel.c +++ b/src/core/channel/connected_channel.c @@ -69,21 +69,22 @@ static void con_start_transport_stream_op(grpc_call_element *elem, GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); GRPC_CALL_LOG_OP(GPR_INFO, elem, op); - grpc_transport_perform_stream_op(chand->transport, - TRANSPORT_STREAM_FROM_CALL_DATA(calld), op); + grpc_transport_perform_stream_op( + chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), op, call_list); } static void con_start_transport_op(grpc_channel_element *elem, grpc_transport_op *op, grpc_call_list *call_list) { channel_data *chand = elem->channel_data; - grpc_transport_perform_op(chand->transport, op); + grpc_transport_perform_op(chand->transport, op, call_list); } /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, - grpc_transport_stream_op *initial_op) { + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; int r; @@ -91,7 +92,7 @@ static void init_call_elem(grpc_call_element *elem, GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); r = grpc_transport_init_stream(chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), - server_transport_data, initial_op); + server_transport_data, initial_op, call_list); GPR_ASSERT(r == 0); } @@ -101,8 +102,8 @@ static void destroy_call_elem(grpc_call_element *elem, call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); - grpc_transport_destroy_stream(chand->transport, - TRANSPORT_STREAM_FROM_CALL_DATA(calld)); + grpc_transport_destroy_stream( + chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), call_list); } /* Constructor for channel_data */ @@ -121,12 +122,12 @@ static void destroy_channel_elem(grpc_channel_element *elem, grpc_call_list *call_list) { channel_data *cd = (channel_data *)elem->channel_data; GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); - grpc_transport_destroy(cd->transport); + grpc_transport_destroy(cd->transport, call_list); } static char *con_get_peer(grpc_call_element *elem, grpc_call_list *call_list) { channel_data *chand = elem->channel_data; - return grpc_transport_get_peer(chand->transport); + return grpc_transport_get_peer(chand->transport, call_list); } const grpc_channel_filter grpc_connected_channel_filter = { diff --git a/src/core/channel/http_client_filter.c b/src/core/channel/http_client_filter.c index 4e9eac72ba8..d0adafc0487 100644 --- a/src/core/channel/http_client_filter.c +++ b/src/core/channel/http_client_filter.c @@ -165,7 +165,8 @@ static void hc_start_transport_op(grpc_call_element *elem, /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, - grpc_transport_stream_op *initial_op) { + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list) { call_data *calld = elem->call_data; calld->sent_initial_metadata = 0; calld->got_initial_metadata = 0; diff --git a/src/core/channel/http_server_filter.c b/src/core/channel/http_server_filter.c index 201adf4f35c..70cc4f298ac 100644 --- a/src/core/channel/http_server_filter.c +++ b/src/core/channel/http_server_filter.c @@ -238,7 +238,8 @@ static void hs_start_transport_op(grpc_call_element *elem, /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, - grpc_transport_stream_op *initial_op) { + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; /* initialize members */ diff --git a/src/core/channel/noop_filter.c b/src/core/channel/noop_filter.c index d4f1acb4c5c..de75f836541 100644 --- a/src/core/channel/noop_filter.c +++ b/src/core/channel/noop_filter.c @@ -74,7 +74,8 @@ static void noop_start_transport_stream_op(grpc_call_element *elem, /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, - grpc_transport_stream_op *initial_op) { + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index 6dc52f43ce7..8ea774bebcd 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -101,7 +101,7 @@ void pf_destroy(grpc_lb_policy *pol, grpc_call_list *call_list) { for (i = 0; i < p->num_subchannels; i++) { GRPC_SUBCHANNEL_UNREF(p->subchannels[i], "pick_first", call_list); } - grpc_connectivity_state_destroy(&p->state_tracker); + grpc_connectivity_state_destroy(&p->state_tracker, call_list); gpr_free(p->subchannels); gpr_mu_destroy(&p->mu); gpr_free(p); diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index 5750db4b434..0fc89ed864b 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -197,7 +197,7 @@ static void dns_destroy(grpc_resolver *gr, grpc_call_list *call_list) { if (r->resolved_config) { grpc_client_config_unref(r->resolved_config, call_list); } - grpc_subchannel_factory_unref(r->subchannel_factory); + grpc_subchannel_factory_unref(r->subchannel_factory, call_list); gpr_free(r->name); gpr_free(r->default_port); gpr_free(r->lb_policy_name); diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index 38293b0f133..2729036d4f3 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -159,7 +159,7 @@ static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r, static void sockaddr_destroy(grpc_resolver *gr, grpc_call_list *call_list) { sockaddr_resolver *r = (sockaddr_resolver *)gr; gpr_mu_destroy(&r->mu); - grpc_subchannel_factory_unref(r->subchannel_factory); + grpc_subchannel_factory_unref(r->subchannel_factory, call_list); gpr_free(r->addrs); gpr_free(r->addrs_len); gpr_free(r->lb_policy_name); diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index bae705f9c39..48df4bbd31c 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -143,7 +143,8 @@ struct grpc_subchannel_call { #define SUBCHANNEL_CALL_TO_CALL_STACK(call) ((grpc_call_stack *)((call) + 1)) #define CHANNEL_STACK_FROM_CONNECTION(con) ((grpc_channel_stack *)((con) + 1)) -static grpc_subchannel_call *create_call(connection *con); +static grpc_subchannel_call *create_call(connection *con, + grpc_call_list *call_list); static void connectivity_state_changed_locked(grpc_subchannel *c, const char *reason, grpc_call_list *call_list); @@ -262,7 +263,7 @@ static void subchannel_destroy(grpc_subchannel *c, grpc_call_list *call_list) { grpc_channel_args_destroy(c->args); gpr_free(c->addr); grpc_mdctx_unref(c->mdctx); - grpc_connectivity_state_destroy(&c->state_tracker); + grpc_connectivity_state_destroy(&c->state_tracker, call_list); grpc_connector_unref(c->connector, call_list); gpr_free(c); } @@ -355,7 +356,7 @@ void grpc_subchannel_create_call(grpc_subchannel *c, grpc_pollset *pollset, CONNECTION_REF_LOCKED(con, "call"); gpr_mu_unlock(&c->mu); - *target = create_call(con); + *target = create_call(con, call_list); notify->cb(notify->cb_arg, 1, call_list); } else { waiting_for_connect *w4c = gpr_malloc(sizeof(*w4c)); @@ -561,7 +562,7 @@ static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { gpr_free(sw); gpr_free(filters); grpc_channel_stack_destroy(stk, call_list); - GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting"); + GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting", call_list); GRPC_SUBCHANNEL_UNREF(c, "connecting", call_list); return; } @@ -582,7 +583,7 @@ static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { op.on_connectivity_state_change = &sw->closure; op.bind_pollset_set = c->pollset_set; SUBCHANNEL_REF_LOCKED(c, "state_watcher"); - GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting"); + GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting", call_list); GPR_ASSERT(!SUBCHANNEL_UNREF_LOCKED(c, "connecting")); elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CONNECTION(c->active), 0); @@ -650,7 +651,7 @@ static void on_alarm(void *arg, int iomgr_success, grpc_call_list *call_list) { update_reconnect_parameters(c); continue_connect(c, call_list); } else { - GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting"); + GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting", call_list); GRPC_SUBCHANNEL_UNREF(c, "connecting", call_list); } } @@ -746,13 +747,14 @@ void grpc_subchannel_call_process_op(grpc_subchannel_call *call, top_elem->filter->start_transport_stream_op(top_elem, op, call_list); } -grpc_subchannel_call *create_call(connection *con) { +static grpc_subchannel_call *create_call(connection *con, + grpc_call_list *call_list) { grpc_channel_stack *chanstk = CHANNEL_STACK_FROM_CONNECTION(con); grpc_subchannel_call *call = gpr_malloc(sizeof(grpc_subchannel_call) + chanstk->call_stack_size); grpc_call_stack *callstk = SUBCHANNEL_CALL_TO_CALL_STACK(call); call->connection = con; gpr_ref_init(&call->refs, 1); - grpc_call_stack_init(chanstk, NULL, NULL, callstk); + grpc_call_stack_init(chanstk, NULL, NULL, callstk, call_list); return call; } diff --git a/src/core/client_config/subchannel_factory.c b/src/core/client_config/subchannel_factory.c index 2a569aba13f..e2526650000 100644 --- a/src/core/client_config/subchannel_factory.c +++ b/src/core/client_config/subchannel_factory.c @@ -36,8 +36,10 @@ void grpc_subchannel_factory_ref(grpc_subchannel_factory *factory) { factory->vtable->ref(factory); } -void grpc_subchannel_factory_unref(grpc_subchannel_factory *factory) { - factory->vtable->unref(factory); + +void grpc_subchannel_factory_unref(grpc_subchannel_factory *factory, + grpc_call_list *call_list) { + factory->vtable->unref(factory, call_list); } grpc_subchannel *grpc_subchannel_factory_create_subchannel( diff --git a/src/core/client_config/subchannel_factory.h b/src/core/client_config/subchannel_factory.h index b588580edb7..2ff9d3c4027 100644 --- a/src/core/client_config/subchannel_factory.h +++ b/src/core/client_config/subchannel_factory.h @@ -48,14 +48,15 @@ struct grpc_subchannel_factory { struct grpc_subchannel_factory_vtable { void (*ref)(grpc_subchannel_factory *factory); - void (*unref)(grpc_subchannel_factory *factory); + void (*unref)(grpc_subchannel_factory *factory, grpc_call_list *call_list); grpc_subchannel *(*create_subchannel)(grpc_subchannel_factory *factory, grpc_subchannel_args *args, grpc_call_list *call_list); }; void grpc_subchannel_factory_ref(grpc_subchannel_factory *factory); -void grpc_subchannel_factory_unref(grpc_subchannel_factory *factory); +void grpc_subchannel_factory_unref(grpc_subchannel_factory *factory, + grpc_call_list *call_list); /** Create a new grpc_subchannel */ grpc_subchannel *grpc_subchannel_factory_create_subchannel( diff --git a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c index b2c9797b1a3..00dff6343c1 100644 --- a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c +++ b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c @@ -47,10 +47,11 @@ static void merge_args_factory_ref(grpc_subchannel_factory *scf) { gpr_ref(&f->refs); } -static void merge_args_factory_unref(grpc_subchannel_factory *scf) { +static void merge_args_factory_unref(grpc_subchannel_factory *scf, + grpc_call_list *call_list) { merge_args_factory *f = (merge_args_factory *)scf; if (gpr_unref(&f->refs)) { - grpc_subchannel_factory_unref(f->wrapped); + grpc_subchannel_factory_unref(f->wrapped, call_list); grpc_channel_args_destroy(f->merge_args); gpr_free(f); } diff --git a/src/core/httpcli/httpcli.c b/src/core/httpcli/httpcli.c index 40ea2e9688c..fc45eda2de6 100644 --- a/src/core/httpcli/httpcli.c +++ b/src/core/httpcli/httpcli.c @@ -246,7 +246,7 @@ void grpc_httpcli_get(grpc_httpcli_context *context, grpc_pollset *pollset, grpc_call_list *call_list) { char *name; if (g_get_override && - g_get_override(request, deadline, on_response, user_data)) { + g_get_override(request, deadline, on_response, user_data, call_list)) { return; } gpr_asprintf(&name, "HTTP:GET:%s:%s", request->host, request->path); @@ -263,8 +263,9 @@ void grpc_httpcli_post(grpc_httpcli_context *context, grpc_pollset *pollset, grpc_httpcli_response_cb on_response, void *user_data, grpc_call_list *call_list) { char *name; - if (g_post_override && g_post_override(request, body_bytes, body_size, - deadline, on_response, user_data)) { + if (g_post_override && + g_post_override(request, body_bytes, body_size, deadline, on_response, + user_data, call_list)) { return; } gpr_asprintf(&name, "HTTP:POST:%s:%s", request->host, request->path); diff --git a/src/core/httpcli/httpcli.h b/src/core/httpcli/httpcli.h index 74bb1230420..6d19da37fbe 100644 --- a/src/core/httpcli/httpcli.h +++ b/src/core/httpcli/httpcli.h @@ -147,13 +147,15 @@ void grpc_httpcli_post(grpc_httpcli_context *context, grpc_pollset *pollset, typedef int (*grpc_httpcli_get_override)(const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, - void *user_data); + void *user_data, + grpc_call_list *call_list); typedef int (*grpc_httpcli_post_override)(const grpc_httpcli_request *request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, - void *user_data); + void *user_data, + grpc_call_list *call_list); void grpc_httpcli_set_override(grpc_httpcli_get_override get, grpc_httpcli_post_override post); diff --git a/src/core/iomgr/alarm.c b/src/core/iomgr/alarm.c index 6e0d516f0c7..146bda477d7 100644 --- a/src/core/iomgr/alarm.c +++ b/src/core/iomgr/alarm.c @@ -291,6 +291,7 @@ static size_t pop_alarms(shard_type *shard, gpr_timespec now, gpr_mu_lock(&shard->mu); while ((alarm = pop_one(shard, now))) { grpc_call_list_add(call_list, &alarm->closure, success); + n++; } *new_min_deadline = compute_min_deadline(shard); gpr_mu_unlock(&shard->mu); @@ -332,7 +333,7 @@ static int run_some_expired_alarms(gpr_timespec now, gpr_timespec *next, gpr_mu_unlock(&g_checker_mu); } - return n > 0; + return (int)n; } int grpc_alarm_check(gpr_timespec now, gpr_timespec *next, diff --git a/src/core/iomgr/pollset.h b/src/core/iomgr/pollset.h index 98653412bb1..95ba694ff6b 100644 --- a/src/core/iomgr/pollset.h +++ b/src/core/iomgr/pollset.h @@ -73,9 +73,12 @@ void grpc_pollset_destroy(grpc_pollset *pollset); grpc_pollset_work, and it is guaranteed that GRPC_POLLSET_MU(pollset) will not be released by grpc_pollset_work AFTER worker has been destroyed. - Tries not to block past deadline. */ + Tries not to block past deadline. + May call grpc_call_list_run on grpc_call_list, without holding the pollset + lock */ void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, - gpr_timespec now, gpr_timespec deadline); + gpr_timespec now, gpr_timespec deadline, + grpc_call_list *call_list); /* Break one polling thread out of polling work for this pollset. If specific_worker is GRPC_POLLSET_KICK_BROADCAST, kick ALL the workers. diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 885cb29234f..10407161799 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -174,21 +174,21 @@ static void finish_shutdown(grpc_pollset *pollset, grpc_call_list *call_list) { } void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, - gpr_timespec now, gpr_timespec deadline) { + gpr_timespec now, gpr_timespec deadline, + grpc_call_list *call_list) { /* pollset->mu already held */ int added_worker = 0; int locked = 1; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; /* this must happen before we (potentially) drop pollset->mu */ worker->next = worker->prev = NULL; /* TODO(ctiller): pool these */ grpc_wakeup_fd_init(&worker->wakeup_fd); if (!grpc_pollset_has_workers(pollset) && !grpc_call_list_empty(pollset->idle_jobs)) { - grpc_call_list_move(&pollset->idle_jobs, &call_list); + grpc_call_list_move(&pollset->idle_jobs, call_list); goto done; } - if (grpc_alarm_check(now, &deadline, &call_list)) { + if (grpc_alarm_check(now, &deadline, call_list)) { goto done; } if (pollset->shutting_down) { @@ -212,14 +212,8 @@ void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, pollset->kicked_without_pollers = 0; } done: - if (!grpc_call_list_empty(call_list)) { - if (locked) { - gpr_mu_unlock(&pollset->mu); - locked = 0; - } - grpc_call_list_run(&call_list); - } if (!locked) { + grpc_call_list_run(call_list); gpr_mu_lock(&pollset->mu); locked = 1; } @@ -233,8 +227,8 @@ done: } else if (!pollset->called_shutdown && pollset->in_flight_cbs == 0) { pollset->called_shutdown = 1; gpr_mu_unlock(&pollset->mu); - finish_shutdown(pollset, &call_list); - grpc_call_list_run(&call_list); + finish_shutdown(pollset, call_list); + grpc_call_list_run(call_list); /* Continuing to access pollset here is safe -- it is the caller's * responsibility to not destroy when it has outstanding calls to * grpc_pollset_work. diff --git a/src/core/iomgr/resolve_address.h b/src/core/iomgr/resolve_address.h index ec8d83fffaa..72b9c1cc87e 100644 --- a/src/core/iomgr/resolve_address.h +++ b/src/core/iomgr/resolve_address.h @@ -34,6 +34,7 @@ #ifndef GRPC_INTERNAL_CORE_IOMGR_RESOLVE_ADDRESS_H #define GRPC_INTERNAL_CORE_IOMGR_RESOLVE_ADDRESS_H +#include #include "src/core/iomgr/iomgr.h" #define GRPC_MAX_SOCKADDR_SIZE 128 diff --git a/src/core/security/client_auth_filter.c b/src/core/security/client_auth_filter.c index 0a2de4f7bb4..1d06df8533f 100644 --- a/src/core/security/client_auth_filter.c +++ b/src/core/security/client_auth_filter.c @@ -280,7 +280,8 @@ static void auth_start_transport_op(grpc_call_element *elem, /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, - grpc_transport_stream_op *initial_op) { + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list) { call_data *calld = elem->call_data; calld->creds = NULL; calld->host = NULL; diff --git a/src/core/security/google_default_credentials.c b/src/core/security/google_default_credentials.c index 5da29f5ad5d..8c3d85cc58e 100644 --- a/src/core/security/google_default_credentials.c +++ b/src/core/security/google_default_credentials.c @@ -123,7 +123,7 @@ static int is_stack_running_on_compute_engine(void) { while (!detector.is_done) { grpc_pollset_worker worker; grpc_pollset_work(&detector.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC)); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); } gpr_mu_unlock(GRPC_POLLSET_MU(&detector.pollset)); diff --git a/src/core/security/server_auth_filter.c b/src/core/security/server_auth_filter.c index 2376cbbeb30..201288bbdd4 100644 --- a/src/core/security/server_auth_filter.c +++ b/src/core/security/server_auth_filter.c @@ -200,7 +200,8 @@ static void auth_start_transport_op(grpc_call_element *elem, /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, - grpc_transport_stream_op *initial_op) { + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index e6e2eee658f..0662839105d 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -67,6 +67,7 @@ typedef struct grpc_server_secure_state { gpr_mu mu; gpr_refcount refcount; grpc_closure destroy_closure; + grpc_closure *destroy_callback; } grpc_server_secure_state; static void state_ref(grpc_server_secure_state *state) { @@ -86,7 +87,8 @@ static void state_unref(grpc_server_secure_state *state) { } static void setup_transport(void *statep, grpc_transport *transport, - grpc_mdctx *mdctx, grpc_workqueue *workqueue) { + grpc_mdctx *mdctx, grpc_workqueue *workqueue, + grpc_call_list *call_list) { static grpc_channel_filter const *extra_filters[] = { &grpc_server_auth_filter, &grpc_http_server_filter}; grpc_server_secure_state *state = statep; @@ -100,7 +102,7 @@ static void setup_transport(void *statep, grpc_transport *transport, GPR_ARRAY_SIZE(args_to_add)); grpc_server_setup_transport(state->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, workqueue, - args_copy); + args_copy, call_list); grpc_channel_args_destroy(args_copy); } @@ -142,9 +144,9 @@ static void on_secure_transport_setup_done(void *statep, workqueue = grpc_workqueue_create(call_list); transport = grpc_create_chttp2_transport( grpc_server_get_channel_args(state->server), secure_endpoint, mdctx, - 0); - setup_transport(state, transport, mdctx, workqueue); - grpc_chttp2_transport_start_reading(transport, NULL, 0); + 0, call_list); + setup_transport(state, transport, mdctx, workqueue, call_list); + grpc_chttp2_transport_start_reading(transport, NULL, 0, call_list); } else { /* We need to consume this here, because the server may already have gone * away. */ @@ -185,7 +187,8 @@ static void start(grpc_server *server, void *statep, grpc_pollset **pollsets, static void destroy_done(void *statep, int success, grpc_call_list *call_list) { grpc_server_secure_state *state = statep; - grpc_server_listener_destroy_done(state->server); + state->destroy_callback->cb(state->destroy_callback->cb_arg, success, + call_list); gpr_mu_lock(&state->mu); while (state->handshaking_tcp_endpoints != NULL) { grpc_endpoint_shutdown(state->handshaking_tcp_endpoints->tcp_endpoint, @@ -199,12 +202,13 @@ static void destroy_done(void *statep, int success, grpc_call_list *call_list) { /* Server callback: destroy the tcp listener (so we don't generate further callbacks) */ -static void destroy(grpc_server *server, void *statep, +static void destroy(grpc_server *server, void *statep, grpc_closure *callback, grpc_call_list *call_list) { grpc_server_secure_state *state = statep; grpc_tcp_server *tcp; gpr_mu_lock(&state->mu); state->is_shutdown = 1; + state->destroy_callback = callback; tcp = state->tcp; gpr_mu_unlock(&state->mu); grpc_closure_init(&state->destroy_closure, destroy_done, state); @@ -283,7 +287,7 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, gpr_ref_init(&state->refcount, 1); /* Register with the server only upon success */ - grpc_server_add_listener(server, state, start, destroy); + grpc_server_add_listener(server, state, start, destroy, &call_list); grpc_call_list_run(&call_list); return port_num; diff --git a/src/core/surface/call.c b/src/core/surface/call.c index f2f8f0a6edc..bbaf65759dc 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -356,7 +356,7 @@ grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, initial_op_ptr = &initial_op; } grpc_call_stack_init(channel_stack, server_transport_data, initial_op_ptr, - CALL_STACK_FROM_CALL(call)); + CALL_STACK_FROM_CALL(call), &call_list); if (parent_call != NULL) { GRPC_CALL_INTERNAL_REF(parent_call, "child"); GPR_ASSERT(call->is_client); @@ -459,7 +459,7 @@ static void destroy_call(grpc_call *call, grpc_call_list *call_list) { size_t i; grpc_call *c = call; grpc_call_stack_destroy(CALL_STACK_FROM_CALL(c), call_list); - GRPC_CHANNEL_INTERNAL_UNREF(c->channel, "call"); + GRPC_CHANNEL_INTERNAL_UNREF(c->channel, "call", call_list); gpr_mu_destroy(&c->mu); gpr_mu_destroy(&c->completion_mu); for (i = 0; i < STATUS_SOURCE_COUNT; i++) { @@ -673,7 +673,8 @@ static void unlock(grpc_call *call, grpc_call_list *call_list) { if (completing_requests > 0) { for (i = 0; i < completing_requests; i++) { completed_requests[i].on_complete(call, completed_requests[i].success, - completed_requests[i].user_data); + completed_requests[i].user_data, + call_list); } lock(call); call->completing = 0; @@ -1556,14 +1557,16 @@ static void set_cancelled_value(grpc_status_code status, void *dest) { *(grpc_status_code *)dest = (status != GRPC_STATUS_OK); } -static void finish_batch(grpc_call *call, int success, void *tag) { +static void finish_batch(grpc_call *call, int success, void *tag, + grpc_call_list *call_list) { grpc_cq_end_op(call->cq, tag, success, done_completion, call, - allocate_completion(call)); + allocate_completion(call), call_list); } -static void finish_batch_with_close(grpc_call *call, int success, void *tag) { +static void finish_batch_with_close(grpc_call *call, int success, void *tag, + grpc_call_list *call_list) { grpc_cq_end_op(call->cq, tag, 1, done_completion, call, - allocate_completion(call)); + allocate_completion(call), call_list); } static int are_write_flags_valid(gpr_uint32 flags) { @@ -1581,7 +1584,8 @@ grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, size_t out; const grpc_op *op; grpc_ioreq *req; - void (*finish_func)(grpc_call *, int, void *) = finish_batch; + void (*finish_func)(grpc_call *, int, void *, grpc_call_list *) = + finish_batch; grpc_call_error error; grpc_call_list call_list = GRPC_CALL_LIST_INIT; @@ -1596,7 +1600,7 @@ grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, grpc_cq_begin_op(call->cq); GRPC_CALL_INTERNAL_REF(call, "completion"); grpc_cq_end_op(call->cq, tag, 1, done_completion, call, - allocate_completion(call)); + allocate_completion(call), &call_list); error = GRPC_CALL_OK; goto done; } diff --git a/src/core/surface/call.h b/src/core/surface/call.h index 7a7178bc7b8..144aa7cef2c 100644 --- a/src/core/surface/call.h +++ b/src/core/surface/call.h @@ -87,7 +87,8 @@ typedef struct { } grpc_ioreq; typedef void (*grpc_ioreq_completion_func)(grpc_call *call, int success, - void *user_data); + void *user_data, + grpc_call_list *call_list); grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, gpr_uint32 propagation_mask, diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index fdba09fcce2..46bea139361 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -272,9 +272,9 @@ void grpc_channel_internal_ref(grpc_channel *c) { gpr_ref(&c->refs); } -static void destroy_channel(grpc_channel *channel) { +static void destroy_channel(grpc_channel *channel, grpc_call_list *call_list) { size_t i; - grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CHANNEL(channel)); + grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CHANNEL(channel), call_list); for (i = 0; i < NUM_CACHED_STATUS_ELEMS; i++) { GRPC_MDELEM_UNREF(channel->grpc_status_elem[i]); } @@ -303,26 +303,31 @@ static void destroy_channel(grpc_channel *channel) { } #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG -void grpc_channel_internal_unref(grpc_channel *channel, const char *reason) { +void grpc_channel_internal_unref(grpc_channel *channel, const char *reason, + grpc_call_list *call_list) { gpr_log(GPR_DEBUG, "CHANNEL: unref %p %d -> %d [%s]", channel, channel->refs.count, channel->refs.count - 1, reason); #else -void grpc_channel_internal_unref(grpc_channel *channel) { +void grpc_channel_internal_unref(grpc_channel *channel, + grpc_call_list *call_list) { #endif if (gpr_unref(&channel->refs)) { - destroy_channel(channel); + destroy_channel(channel, call_list); } } void grpc_channel_destroy(grpc_channel *channel) { grpc_transport_op op; grpc_channel_element *elem; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; memset(&op, 0, sizeof(op)); op.disconnect = 1; elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CHANNEL(channel), 0); - elem->filter->start_transport_op(elem, &op); + elem->filter->start_transport_op(elem, &op, &call_list); - GRPC_CHANNEL_INTERNAL_UNREF(channel, "channel"); + GRPC_CHANNEL_INTERNAL_UNREF(channel, "channel", &call_list); + + grpc_call_list_run(&call_list); } grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel) { diff --git a/src/core/surface/channel.h b/src/core/surface/channel.h index 664ecc1c5ac..3f51164fcc4 100644 --- a/src/core/surface/channel.h +++ b/src/core/surface/channel.h @@ -67,18 +67,20 @@ grpc_workqueue *grpc_channel_get_workqueue(grpc_channel *channel); #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG 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_channel *channel, const char *reason, + grpc_call_list *call_list); #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(channel, reason, call_list) \ + grpc_channel_internal_unref(channel, reason, call_list) #else void grpc_channel_internal_ref(grpc_channel *channel); -void grpc_channel_internal_unref(grpc_channel *channel); +void grpc_channel_internal_unref(grpc_channel *channel, + grpc_call_list *call_list); #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(channel, reason, call_list) \ + grpc_channel_internal_unref(channel, call_list) #endif #endif /* GRPC_INTERNAL_CORE_SURFACE_CHANNEL_H */ diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index 4d0cf1ed8bf..7891669e353 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -56,7 +56,7 @@ grpc_connectivity_state grpc_channel_check_connectivity_state( } state = grpc_client_channel_check_connectivity_state( client_channel_elem, try_to_connect, &call_list); - grpc_call_list_run(call_list); + grpc_call_list_run(&call_list); return state; } @@ -80,17 +80,18 @@ typedef struct { void *tag; } state_watcher; -static void delete_state_watcher(state_watcher *w) { +static void delete_state_watcher(state_watcher *w, grpc_call_list *call_list) { grpc_channel_element *client_channel_elem = grpc_channel_stack_last_element( grpc_channel_get_channel_stack(w->channel)); grpc_client_channel_del_interested_party(client_channel_elem, - grpc_cq_pollset(w->cq)); - GRPC_CHANNEL_INTERNAL_UNREF(w->channel, "watch_connectivity"); + grpc_cq_pollset(w->cq), call_list); + GRPC_CHANNEL_INTERNAL_UNREF(w->channel, "watch_connectivity", call_list); gpr_mu_destroy(&w->mu); gpr_free(w); } -static void finished_completion(void *pw, grpc_cq_completion *ignored) { +static void finished_completion(void *pw, grpc_cq_completion *ignored, + grpc_call_list *call_list) { int delete = 0; state_watcher *w = pw; gpr_mu_lock(&w->mu); @@ -110,18 +111,19 @@ static void finished_completion(void *pw, grpc_cq_completion *ignored) { gpr_mu_unlock(&w->mu); if (delete) { - delete_state_watcher(w); + delete_state_watcher(w, call_list); } } -static void partly_done(state_watcher *w, int due_to_completion) { +static void partly_done(state_watcher *w, int due_to_completion, + grpc_call_list *call_list) { int delete = 0; if (due_to_completion) { gpr_mu_lock(&w->mu); w->success = 1; gpr_mu_unlock(&w->mu); - grpc_alarm_cancel(&w->alarm); + grpc_alarm_cancel(&w->alarm, call_list); } gpr_mu_lock(&w->mu); @@ -129,7 +131,7 @@ static void partly_done(state_watcher *w, int due_to_completion) { case WAITING: w->phase = CALLING_BACK; grpc_cq_end_op(w->cq, w->tag, w->success, finished_completion, w, - &w->completion_storage); + &w->completion_storage, call_list); break; case CALLING_BACK: w->phase = CALLING_BACK_AND_FINISHED; @@ -145,13 +147,17 @@ static void partly_done(state_watcher *w, int due_to_completion) { gpr_mu_unlock(&w->mu); if (delete) { - delete_state_watcher(w); + delete_state_watcher(w, call_list); } } -static void watch_complete(void *pw, int success) { partly_done(pw, 1); } +static void watch_complete(void *pw, int success, grpc_call_list *call_list) { + partly_done(pw, 1, call_list); +} -static void timeout_complete(void *pw, int success) { partly_done(pw, 0); } +static void timeout_complete(void *pw, int success, grpc_call_list *call_list) { + partly_done(pw, 0, call_list); +} void grpc_channel_watch_connectivity_state( grpc_channel *channel, grpc_connectivity_state last_observed_state, @@ -172,9 +178,9 @@ void grpc_channel_watch_connectivity_state( w->tag = tag; w->channel = channel; - grpc_alarm_init(&w->alarm, - gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC), - timeout_complete, w, gpr_now(GPR_CLOCK_MONOTONIC)); + grpc_alarm_init( + &w->alarm, gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC), + timeout_complete, w, gpr_now(GPR_CLOCK_MONOTONIC), &call_list); if (client_channel_elem->filter != &grpc_client_channel_filter) { gpr_log(GPR_ERROR, @@ -185,10 +191,10 @@ void grpc_channel_watch_connectivity_state( } else { GRPC_CHANNEL_INTERNAL_REF(channel, "watch_connectivity"); grpc_client_channel_add_interested_party(client_channel_elem, - grpc_cq_pollset(cq)); + grpc_cq_pollset(cq), &call_list); grpc_client_channel_watch_connectivity_state(client_channel_elem, &w->state, &w->on_complete, &call_list); } - grpc_call_list_run(call_list); + grpc_call_list_run(&call_list); } diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index f6f42b3d7ab..7ac76da10a7 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -55,6 +55,13 @@ typedef struct { grpc_closure *notify; grpc_connect_in_args args; grpc_connect_out_args *result; + + grpc_endpoint *tcp; + + grpc_mdctx *mdctx; + grpc_workqueue *workqueue; + + grpc_closure connected; } connector; static void connector_ref(grpc_connector *con) { @@ -62,21 +69,24 @@ static void connector_ref(grpc_connector *con) { gpr_ref(&c->refs); } -static void connector_unref(grpc_connector *con) { +static void connector_unref(grpc_connector *con, grpc_call_list *call_list) { connector *c = (connector *)con; if (gpr_unref(&c->refs)) { + grpc_mdctx_unref(c->mdctx); + GRPC_WORKQUEUE_UNREF(c->workqueue, "connector", call_list); gpr_free(c); } } -static void connected(void *arg, grpc_endpoint *tcp) { +static void connected(void *arg, int success, grpc_call_list *call_list) { connector *c = arg; grpc_closure *notify; + grpc_endpoint *tcp = c->tcp; if (tcp != NULL) { c->result->transport = grpc_create_chttp2_transport( - c->args.channel_args, tcp, c->args.metadata_context, c->args.workqueue, - 1); - grpc_chttp2_transport_start_reading(c->result->transport, NULL, 0); + c->args.channel_args, tcp, c->mdctx, 1, call_list); + grpc_chttp2_transport_start_reading(c->result->transport, NULL, 0, + call_list); GPR_ASSERT(c->result->transport); c->result->filters = gpr_malloc(sizeof(grpc_channel_filter *)); c->result->filters[0] = &grpc_http_client_filter; @@ -86,24 +96,27 @@ static void connected(void *arg, grpc_endpoint *tcp) { } notify = c->notify; c->notify = NULL; - notify->cb(notify->cb_arg, 1); + notify->cb(notify->cb_arg, 1, call_list); } -static void connector_shutdown(grpc_connector *con) {} +static void connector_shutdown(grpc_connector *con, grpc_call_list *call_list) { +} static void connector_connect(grpc_connector *con, const grpc_connect_in_args *args, grpc_connect_out_args *result, - grpc_closure *notify) { + grpc_closure *notify, grpc_call_list *call_list) { connector *c = (connector *)con; GPR_ASSERT(c->notify == NULL); GPR_ASSERT(notify->cb); c->notify = notify; c->args = *args; c->result = result; - grpc_tcp_client_connect(connected, c, args->interested_parties, - args->workqueue, args->addr, args->addr_len, - args->deadline); + c->tcp = NULL; + grpc_closure_init(&c->connected, connected, c); + grpc_tcp_client_connect(&c->connected, &c->tcp, args->interested_parties, + args->addr, args->addr_len, args->deadline, + call_list); } static const grpc_connector_vtable connector_vtable = { @@ -122,10 +135,11 @@ static void subchannel_factory_ref(grpc_subchannel_factory *scf) { gpr_ref(&f->refs); } -static void subchannel_factory_unref(grpc_subchannel_factory *scf) { +static void subchannel_factory_unref(grpc_subchannel_factory *scf, + grpc_call_list *call_list) { subchannel_factory *f = (subchannel_factory *)scf; if (gpr_unref(&f->refs)) { - GRPC_CHANNEL_INTERNAL_UNREF(f->master, "subchannel_factory"); + GRPC_CHANNEL_INTERNAL_UNREF(f->master, "subchannel_factory", call_list); grpc_channel_args_destroy(f->merge_args); grpc_mdctx_unref(f->mdctx); gpr_free(f); @@ -133,7 +147,8 @@ static void subchannel_factory_unref(grpc_subchannel_factory *scf) { } static grpc_subchannel *subchannel_factory_create_subchannel( - grpc_subchannel_factory *scf, grpc_subchannel_args *args) { + grpc_subchannel_factory *scf, grpc_subchannel_args *args, + grpc_call_list *call_list) { subchannel_factory *f = (subchannel_factory *)scf; connector *c = gpr_malloc(sizeof(*c)); grpc_channel_args *final_args = @@ -146,7 +161,7 @@ static grpc_subchannel *subchannel_factory_create_subchannel( args->args = final_args; args->master = f->master; s = grpc_subchannel_create(&c->base, args); - grpc_connector_unref(&c->base); + grpc_connector_unref(&c->base, call_list); grpc_channel_args_destroy(final_args); return s; } @@ -168,7 +183,8 @@ grpc_channel *grpc_insecure_channel_create(const char *target, grpc_resolver *resolver; subchannel_factory *f; grpc_mdctx *mdctx = grpc_mdctx_create(); - grpc_workqueue *workqueue = grpc_workqueue_create(); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_workqueue *workqueue = grpc_workqueue_create(&call_list); size_t n = 0; GPR_ASSERT(!reserved); if (grpc_channel_args_is_census_enabled(args)) { @@ -179,7 +195,7 @@ grpc_channel *grpc_insecure_channel_create(const char *target, GPR_ASSERT(n <= MAX_FILTERS); channel = grpc_channel_create_from_filters(target, filters, n, args, mdctx, - workqueue, 1); + workqueue, 1, &call_list); f = gpr_malloc(sizeof(*f)); f->base.vtable = &subchannel_factory_vtable; @@ -189,15 +205,17 @@ grpc_channel *grpc_insecure_channel_create(const char *target, f->merge_args = grpc_channel_args_copy(args); f->master = channel; GRPC_CHANNEL_INTERNAL_REF(f->master, "subchannel_factory"); - resolver = grpc_resolver_create(target, &f->base, workqueue); + resolver = grpc_resolver_create(target, &f->base); if (!resolver) { return NULL; } grpc_client_channel_set_resolver(grpc_channel_get_channel_stack(channel), - resolver); - GRPC_RESOLVER_UNREF(resolver, "create"); - grpc_subchannel_factory_unref(&f->base); + resolver, &call_list); + GRPC_RESOLVER_UNREF(resolver, "create", &call_list); + grpc_subchannel_factory_unref(&f->base, &call_list); + + grpc_call_list_run(&call_list); return channel; } diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index b58115a93f8..49dfc3c0e1c 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -67,8 +67,12 @@ struct grpc_completion_queue { int is_server_cq; int num_pluckers; plucker pluckers[GRPC_MAX_COMPLETION_QUEUE_PLUCKERS]; + grpc_closure pollset_destroy_done; }; +static void on_pollset_destroy_done(void *cc, int success, + grpc_call_list *call_list); + grpc_completion_queue *grpc_completion_queue_create(void *reserved) { grpc_completion_queue *cc = gpr_malloc(sizeof(grpc_completion_queue)); GPR_ASSERT(!reserved); @@ -80,6 +84,7 @@ grpc_completion_queue *grpc_completion_queue_create(void *reserved) { grpc_pollset_init(&cc->pollset); cc->completed_tail = &cc->completed_head; cc->completed_head.next = (gpr_uintptr)cc->completed_tail; + grpc_closure_init(&cc->pollset_destroy_done, on_pollset_destroy_done, cc); return cc; } @@ -94,7 +99,8 @@ void grpc_cq_internal_ref(grpc_completion_queue *cc) { gpr_ref(&cc->owning_refs); } -static void on_pollset_destroy_done(void *arg) { +static void on_pollset_destroy_done(void *arg, int success, + grpc_call_list *call_list) { grpc_completion_queue *cc = arg; GRPC_CQ_INTERNAL_UNREF(cc, "pollset_destroy"); } @@ -127,8 +133,10 @@ void grpc_cq_begin_op(grpc_completion_queue *cc) { event, then enter shutdown mode */ /* Queue a GRPC_OP_COMPLETED operation */ void grpc_cq_end_op(grpc_completion_queue *cc, void *tag, int success, - void (*done)(void *done_arg, grpc_cq_completion *storage), - void *done_arg, grpc_cq_completion *storage) { + void (*done)(void *done_arg, grpc_cq_completion *storage, + grpc_call_list *call_list), + void *done_arg, grpc_cq_completion *storage, + grpc_call_list *call_list) { int shutdown; int i; grpc_pollset_worker *pluck_worker; @@ -162,7 +170,7 @@ void grpc_cq_end_op(grpc_completion_queue *cc, void *tag, int success, GPR_ASSERT(cc->shutdown_called); cc->shutdown = 1; gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - grpc_pollset_shutdown(&cc->pollset, on_pollset_destroy_done, cc); + grpc_pollset_shutdown(&cc->pollset, &cc->pollset_destroy_done, call_list); } } @@ -172,6 +180,7 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, grpc_pollset_worker worker; int first_loop = 1; gpr_timespec now; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; GPR_ASSERT(!reserved); @@ -190,7 +199,7 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(c->done_arg, c); + c->done(c->done_arg, c, &call_list); break; } if (cc->shutdown) { @@ -207,10 +216,11 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, break; } first_loop = 0; - grpc_pollset_work(&cc->pollset, &worker, now, deadline); + grpc_pollset_work(&cc->pollset, &worker, now, deadline, &call_list); } GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret); GRPC_CQ_INTERNAL_UNREF(cc, "next"); + grpc_call_list_run(&call_list); return ret; } @@ -247,6 +257,7 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, grpc_pollset_worker worker; gpr_timespec now; int first_loop = 1; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; GPR_ASSERT(!reserved); @@ -268,7 +279,7 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(c->done_arg, c); + c->done(c->done_arg, c, &call_list); goto done; } prev = c; @@ -299,18 +310,20 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, break; } first_loop = 0; - grpc_pollset_work(&cc->pollset, &worker, now, deadline); + grpc_pollset_work(&cc->pollset, &worker, now, deadline, &call_list); del_plucker(cc, tag, &worker); } done: GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret); GRPC_CQ_INTERNAL_UNREF(cc, "pluck"); + grpc_call_list_run(&call_list); return ret; } /* 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 *cc) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); if (cc->shutdown_called) { gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); @@ -324,8 +337,9 @@ void grpc_completion_queue_shutdown(grpc_completion_queue *cc) { GPR_ASSERT(!cc->shutdown); cc->shutdown = 1; gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - grpc_pollset_shutdown(&cc->pollset, on_pollset_destroy_done, cc); + grpc_pollset_shutdown(&cc->pollset, &cc->pollset_destroy_done, &call_list); } + grpc_call_list_run(&call_list); } void grpc_completion_queue_destroy(grpc_completion_queue *cc) { diff --git a/src/core/surface/completion_queue.h b/src/core/surface/completion_queue.h index 793baff03a7..6d8d1ce9593 100644 --- a/src/core/surface/completion_queue.h +++ b/src/core/surface/completion_queue.h @@ -44,7 +44,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)(void *done_arg, struct grpc_cq_completion *c, + grpc_call_list *call_list); void *done_arg; /** next pointer; low bit is used to indicate success or not */ gpr_uintptr next; @@ -74,7 +75,8 @@ void grpc_cq_begin_op(grpc_completion_queue *cc); void grpc_cq_end_op(grpc_completion_queue *cc, void *tag, int success, void (*done)(void *done_arg, grpc_cq_completion *storage, grpc_call_list *call_list), - void *done_arg, grpc_cq_completion *storage); + void *done_arg, grpc_cq_completion *storage, + grpc_call_list *call_list); grpc_pollset *grpc_cq_pollset(grpc_completion_queue *cc); diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c index a5de900effe..c5cf33f1f9c 100644 --- a/src/core/surface/lame_client.c +++ b/src/core/surface/lame_client.c @@ -55,13 +55,14 @@ typedef struct { } channel_data; static void lame_start_transport_stream_op(grpc_call_element *elem, - grpc_transport_stream_op *op) { + grpc_transport_stream_op *op, + grpc_call_list *call_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; GRPC_CALL_LOG_OP(GPR_INFO, elem, op); if (op->send_ops != NULL) { grpc_stream_ops_unref_owned_objects(op->send_ops->ops, op->send_ops->nops); - op->on_done_send->cb(op->on_done_send->cb_arg, 0); + op->on_done_send->cb(op->on_done_send->cb_arg, 0, call_list); } if (op->recv_ops != NULL) { char tmp[GPR_LTOA_MIN_BUFSIZE]; @@ -80,44 +81,48 @@ static void lame_start_transport_stream_op(grpc_call_element *elem, mdb.deadline = gpr_inf_future(GPR_CLOCK_REALTIME); grpc_sopb_add_metadata(op->recv_ops, mdb); *op->recv_state = GRPC_STREAM_CLOSED; - op->on_done_recv->cb(op->on_done_recv->cb_arg, 1); + op->on_done_recv->cb(op->on_done_recv->cb_arg, 1, call_list); } if (op->on_consumed != NULL) { - op->on_consumed->cb(op->on_consumed->cb_arg, 0); + op->on_consumed->cb(op->on_consumed->cb_arg, 0, call_list); } } -static char *lame_get_peer(grpc_call_element *elem) { +static char *lame_get_peer(grpc_call_element *elem, grpc_call_list *call_list) { channel_data *chand = elem->channel_data; return grpc_channel_get_target(chand->master); } static void lame_start_transport_op(grpc_channel_element *elem, - grpc_transport_op *op) { + grpc_transport_op *op, + grpc_call_list *call_list) { if (op->on_connectivity_state_change) { GPR_ASSERT(*op->connectivity_state != GRPC_CHANNEL_FATAL_FAILURE); *op->connectivity_state = GRPC_CHANNEL_FATAL_FAILURE; op->on_connectivity_state_change->cb( - op->on_connectivity_state_change->cb_arg, 1); + op->on_connectivity_state_change->cb_arg, 1, call_list); } if (op->on_consumed != NULL) { - op->on_consumed->cb(op->on_consumed->cb_arg, 1); + op->on_consumed->cb(op->on_consumed->cb_arg, 1, call_list); } } static void init_call_elem(grpc_call_element *elem, const void *transport_server_data, - grpc_transport_stream_op *initial_op) { + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list) { if (initial_op) { - grpc_transport_stream_op_finish_with_failure(initial_op); + grpc_transport_stream_op_finish_with_failure(initial_op, call_list); } } -static void destroy_call_elem(grpc_call_element *elem) {} +static void destroy_call_elem(grpc_call_element *elem, + grpc_call_list *call_list) {} static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *mdctx, - int is_first, int is_last) { + int is_first, int is_last, + grpc_call_list *call_list) { channel_data *chand = elem->channel_data; GPR_ASSERT(is_first); GPR_ASSERT(is_last); @@ -125,7 +130,8 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, chand->master = master; } -static void destroy_channel_elem(grpc_channel_element *elem) {} +static void destroy_channel_elem(grpc_channel_element *elem, + grpc_call_list *call_list) {} static const grpc_channel_filter lame_filter = { lame_start_transport_stream_op, @@ -148,14 +154,16 @@ grpc_channel *grpc_lame_client_channel_create(const char *target, grpc_channel *channel; grpc_channel_element *elem; channel_data *chand; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; static const grpc_channel_filter *filters[] = {&lame_filter}; - channel = grpc_channel_create_from_filters(target, filters, 1, NULL, - grpc_mdctx_create(), - grpc_workqueue_create(), 1); + channel = grpc_channel_create_from_filters( + target, filters, 1, NULL, grpc_mdctx_create(), + grpc_workqueue_create(&call_list), 1, &call_list); elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); GPR_ASSERT(elem->filter == &lame_filter); chand = (channel_data *)elem->channel_data; chand->error_code = error_code; chand->error_message = error_message; + grpc_call_list_run(&call_list); return channel; } diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 4a75d03f0a7..b5b9ee173ee 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -108,8 +108,9 @@ static void on_secure_transport_setup_done(void *arg, c->connecting_endpoint = NULL; gpr_mu_unlock(&c->mu); c->result->transport = grpc_create_chttp2_transport( - c->args.channel_args, secure_endpoint, c->mdctx, 1); - grpc_chttp2_transport_start_reading(c->result->transport, NULL, 0); + c->args.channel_args, secure_endpoint, c->mdctx, 1, call_list); + grpc_chttp2_transport_start_reading(c->result->transport, NULL, 0, + call_list); c->result->filters = gpr_malloc(sizeof(grpc_channel_filter *) * 2); c->result->filters[0] = &grpc_http_client_filter; c->result->filters[1] = &grpc_client_auth_filter; @@ -187,12 +188,13 @@ static void subchannel_factory_ref(grpc_subchannel_factory *scf) { gpr_ref(&f->refs); } -static void subchannel_factory_unref(grpc_subchannel_factory *scf) { +static void subchannel_factory_unref(grpc_subchannel_factory *scf, + grpc_call_list *call_list) { subchannel_factory *f = (subchannel_factory *)scf; if (gpr_unref(&f->refs)) { GRPC_SECURITY_CONNECTOR_UNREF(&f->security_connector->base, "subchannel_factory"); - GRPC_CHANNEL_INTERNAL_UNREF(f->master, "subchannel_factory"); + GRPC_CHANNEL_INTERNAL_UNREF(f->master, "subchannel_factory", call_list); grpc_channel_args_destroy(f->merge_args); grpc_mdctx_unref(f->mdctx); gpr_free(f); @@ -279,7 +281,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, GPR_ASSERT(n <= MAX_FILTERS); channel = grpc_channel_create_from_filters(target, filters, n, args_copy, - mdctx, workqueue, 1); + mdctx, workqueue, 1, &call_list); f = gpr_malloc(sizeof(*f)); f->base.vtable = &subchannel_factory_vtable; @@ -299,7 +301,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, grpc_client_channel_set_resolver(grpc_channel_get_channel_stack(channel), resolver, &call_list); GRPC_RESOLVER_UNREF(resolver, "create", &call_list); - grpc_subchannel_factory_unref(&f->base); + grpc_subchannel_factory_unref(&f->base, &call_list); GRPC_SECURITY_CONNECTOR_UNREF(&connector->base, "channel_create"); grpc_channel_args_destroy(args_copy); diff --git a/src/core/surface/server.c b/src/core/surface/server.c index e38c6028d91..24545c67e12 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -57,9 +57,11 @@ 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); + size_t pollset_count, grpc_call_list *call_list); + void (*destroy)(grpc_server *server, void *arg, grpc_closure *closure, + grpc_call_list *call_list); struct listener *next; + grpc_closure destroy_done; } listener; typedef struct call_data call_data; @@ -219,19 +221,19 @@ struct grpc_server { /** when did we print the last shutdown progress message */ gpr_timespec last_shutdown_message_time; - - grpc_workqueue *workqueue; }; #define SERVER_FROM_CALL_ELEM(elem) \ (((channel_data *)(elem)->channel_data)->server) static void begin_call(grpc_server *server, call_data *calld, - requested_call *rc); -static void fail_call(grpc_server *server, requested_call *rc); + requested_call *rc, grpc_call_list *call_list); +static void fail_call(grpc_server *server, requested_call *rc, + grpc_call_list *call_list); /* 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_server *server, + grpc_call_list *call_list); /* * channel broadcaster @@ -258,14 +260,15 @@ struct shutdown_cleanup_args { gpr_slice slice; }; -static void shutdown_cleanup(void *arg, int iomgr_status_ignored) { +static void shutdown_cleanup(void *arg, int iomgr_status_ignored, + grpc_call_list *call_list) { struct shutdown_cleanup_args *a = arg; gpr_slice_unref(a->slice); gpr_free(a); } static void send_shutdown(grpc_channel *channel, int send_goaway, - int send_disconnect) { + int send_disconnect, grpc_call_list *call_list) { grpc_transport_op op; struct shutdown_cleanup_args *sc; grpc_channel_element *elem; @@ -281,17 +284,17 @@ static void send_shutdown(grpc_channel *channel, int send_goaway, op.on_consumed = &sc->closure; elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - elem->filter->start_transport_op(elem, &op); + elem->filter->start_transport_op(elem, &op, call_list); } static void channel_broadcaster_shutdown(channel_broadcaster *cb, - int send_goaway, - int force_disconnect) { + int send_goaway, int force_disconnect, + grpc_call_list *call_list) { size_t i; for (i = 0; i < cb->num_channels; i++) { - send_shutdown(cb->channels[i], send_goaway, force_disconnect); - GRPC_CHANNEL_INTERNAL_UNREF(cb->channels[i], "broadcast"); + send_shutdown(cb->channels[i], send_goaway, force_disconnect, call_list); + GRPC_CHANNEL_INTERNAL_UNREF(cb->channels[i], "broadcast", call_list); } gpr_free(cb->channels); } @@ -311,12 +314,12 @@ static void request_matcher_destroy(request_matcher *request_matcher) { gpr_stack_lockfree_destroy(request_matcher->requests); } -static void kill_zombie(void *elem, int success) { +static void kill_zombie(void *elem, int success, grpc_call_list *call_list) { grpc_call_destroy(grpc_call_from_top_element(elem)); } static void request_matcher_zombify_all_pending_calls( - request_matcher *request_matcher, grpc_workqueue *workqueue) { + request_matcher *request_matcher, grpc_call_list *call_list) { while (request_matcher->pending_head) { call_data *calld = request_matcher->pending_head; request_matcher->pending_head = calld->pending_next; @@ -326,15 +329,16 @@ static void request_matcher_zombify_all_pending_calls( grpc_closure_init( &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0)); - grpc_workqueue_push(workqueue, &calld->kill_zombie_closure, 1); + grpc_call_list_add(call_list, &calld->kill_zombie_closure, 1); } } static void request_matcher_kill_requests(grpc_server *server, - request_matcher *rm) { + request_matcher *rm, + grpc_call_list *call_list) { int request_id; while ((request_id = gpr_stack_lockfree_pop(rm->requests)) != -1) { - fail_call(server, &server->requested_calls[request_id]); + fail_call(server, &server->requested_calls[request_id], call_list); } } @@ -346,7 +350,7 @@ static void server_ref(grpc_server *server) { gpr_ref(&server->internal_refcount); } -static void server_delete(grpc_server *server) { +static void server_delete(grpc_server *server, grpc_call_list *call_list) { registered_method *rm; size_t i; grpc_channel_args_destroy(server->channel_args); @@ -365,7 +369,6 @@ static void server_delete(grpc_server *server) { } request_matcher_destroy(&server->unregistered_request_matcher); gpr_stack_lockfree_destroy(server->request_freelist); - GRPC_WORKQUEUE_UNREF(server->workqueue, "destroy"); gpr_free(server->cqs); gpr_free(server->pollsets); gpr_free(server->shutdown_tags); @@ -373,9 +376,9 @@ static void server_delete(grpc_server *server) { gpr_free(server); } -static void server_unref(grpc_server *server) { +static void server_unref(grpc_server *server, grpc_call_list *call_list) { if (gpr_unref(&server->internal_refcount)) { - server_delete(server); + server_delete(server, call_list); } } @@ -389,30 +392,29 @@ static void orphan_channel(channel_data *chand) { chand->next = chand->prev = chand; } -static void finish_destroy_channel(void *cd, int success) { +static void finish_destroy_channel(void *cd, int success, + grpc_call_list *call_list) { channel_data *chand = cd; grpc_server *server = chand->server; gpr_log(GPR_DEBUG, "finish_destroy_channel: %p", chand->channel); - GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "server"); - server_unref(server); + GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "server", call_list); + server_unref(server, call_list); } -static void destroy_channel(channel_data *chand) { +static void destroy_channel(channel_data *chand, grpc_call_list *call_list) { if (is_channel_orphaned(chand)) return; GPR_ASSERT(chand->server != NULL); orphan_channel(chand); server_ref(chand->server); - maybe_finish_shutdown(chand->server); + maybe_finish_shutdown(chand->server, call_list); chand->finish_destroy_channel_closure.cb = finish_destroy_channel; chand->finish_destroy_channel_closure.cb_arg = chand; - gpr_log(GPR_DEBUG, "queue finish_destroy_channel: %p on %p", chand->channel, - chand->server->workqueue); - grpc_workqueue_push(chand->server->workqueue, - &chand->finish_destroy_channel_closure, 1); + grpc_call_list_add(call_list, &chand->finish_destroy_channel_closure, 1); } static void finish_start_new_rpc(grpc_server *server, grpc_call_element *elem, - request_matcher *request_matcher) { + request_matcher *request_matcher, + grpc_call_list *call_list) { call_data *calld = elem->call_data; int request_id; @@ -421,7 +423,7 @@ static void finish_start_new_rpc(grpc_server *server, grpc_call_element *elem, calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); - grpc_workqueue_push(server->workqueue, &calld->kill_zombie_closure, 1); + grpc_call_list_add(call_list, &calld->kill_zombie_closure, 1); return; } @@ -443,11 +445,11 @@ static void finish_start_new_rpc(grpc_server *server, grpc_call_element *elem, gpr_mu_lock(&calld->mu_state); calld->state = ACTIVATED; gpr_mu_unlock(&calld->mu_state); - begin_call(server, calld, &server->requested_calls[request_id]); + begin_call(server, calld, &server->requested_calls[request_id], call_list); } } -static void start_new_rpc(grpc_call_element *elem) { +static void start_new_rpc(grpc_call_element *elem, grpc_call_list *call_list) { channel_data *chand = elem->channel_data; call_data *calld = elem->call_data; grpc_server *server = chand->server; @@ -466,7 +468,8 @@ static void start_new_rpc(grpc_call_element *elem) { if (rm->host != calld->host) continue; if (rm->method != calld->path) continue; finish_start_new_rpc(server, elem, - &rm->server_registered_method->request_matcher); + &rm->server_registered_method->request_matcher, + call_list); return; } /* check for a wildcard method definition (no host set) */ @@ -478,11 +481,13 @@ static void start_new_rpc(grpc_call_element *elem) { if (rm->host != NULL) continue; if (rm->method != calld->path) continue; finish_start_new_rpc(server, elem, - &rm->server_registered_method->request_matcher); + &rm->server_registered_method->request_matcher, + call_list); return; } } - finish_start_new_rpc(server, elem, &server->unregistered_request_matcher); + finish_start_new_rpc(server, elem, &server->unregistered_request_matcher, + call_list); } static int num_listeners(grpc_server *server) { @@ -494,8 +499,9 @@ static int num_listeners(grpc_server *server) { return n; } -static void done_shutdown_event(void *server, grpc_cq_completion *completion) { - server_unref(server); +static void done_shutdown_event(void *server, grpc_cq_completion *completion, + grpc_call_list *call_list) { + server_unref(server, call_list); } static int num_channels(grpc_server *server) { @@ -508,25 +514,27 @@ static int num_channels(grpc_server *server) { return n; } -static void kill_pending_work_locked(grpc_server *server) { +static void kill_pending_work_locked(grpc_server *server, + grpc_call_list *call_list) { registered_method *rm; - request_matcher_kill_requests(server, &server->unregistered_request_matcher); + request_matcher_kill_requests(server, &server->unregistered_request_matcher, + call_list); request_matcher_zombify_all_pending_calls( - &server->unregistered_request_matcher, server->workqueue); + &server->unregistered_request_matcher, call_list); for (rm = server->registered_methods; rm; rm = rm->next) { - request_matcher_kill_requests(server, &rm->request_matcher); - request_matcher_zombify_all_pending_calls(&rm->request_matcher, - server->workqueue); + request_matcher_kill_requests(server, &rm->request_matcher, call_list); + request_matcher_zombify_all_pending_calls(&rm->request_matcher, call_list); } } -static void maybe_finish_shutdown(grpc_server *server) { +static void maybe_finish_shutdown(grpc_server *server, + grpc_call_list *call_list) { size_t i; if (!gpr_atm_acq_load(&server->shutdown_flag) || server->shutdown_published) { return; } - kill_pending_work_locked(server); + kill_pending_work_locked(server, call_list); if (server->root_channel_data.next != &server->root_channel_data || server->listeners_destroyed < num_listeners(server)) { @@ -548,7 +556,7 @@ static void maybe_finish_shutdown(grpc_server *server) { server_ref(server); grpc_cq_end_op(server->shutdown_tags[i].cq, server->shutdown_tags[i].tag, 1, done_shutdown_event, server, - &server->shutdown_tags[i].completion); + &server->shutdown_tags[i].completion, call_list); } } @@ -566,10 +574,9 @@ static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { return md; } -static void server_on_recv(void *ptr, int success) { +static void server_on_recv(void *ptr, int success, grpc_call_list *call_list) { grpc_call_element *elem = ptr; call_data *calld = elem->call_data; - channel_data *chand = elem->channel_data; gpr_timespec op_deadline; if (success && !calld->got_initial_metadata) { @@ -587,7 +594,7 @@ static void server_on_recv(void *ptr, int success) { } if (calld->host && calld->path) { calld->got_initial_metadata = 1; - start_new_rpc(elem); + start_new_rpc(elem, call_list); } break; } @@ -604,8 +611,7 @@ static void server_on_recv(void *ptr, int success) { calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); - grpc_workqueue_push(chand->server->workqueue, - &calld->kill_zombie_closure, 1); + grpc_call_list_add(call_list, &calld->kill_zombie_closure, 1); } else { gpr_mu_unlock(&calld->mu_state); } @@ -616,8 +622,7 @@ static void server_on_recv(void *ptr, int success) { calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); - grpc_workqueue_push(chand->server->workqueue, - &calld->kill_zombie_closure, 1); + grpc_call_list_add(call_list, &calld->kill_zombie_closure, 1); } else if (calld->state == PENDING) { calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); @@ -629,7 +634,7 @@ static void server_on_recv(void *ptr, int success) { break; } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success); + calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, call_list); } static void server_mutate_op(grpc_call_element *elem, @@ -646,10 +651,11 @@ static void server_mutate_op(grpc_call_element *elem, } static void server_start_transport_stream_op(grpc_call_element *elem, - grpc_transport_stream_op *op) { + grpc_transport_stream_op *op, + grpc_call_list *call_list) { GRPC_CALL_LOG_OP(GPR_INFO, elem, op); server_mutate_op(elem, op); - grpc_call_next_op(elem, op); + grpc_call_next_op(elem, op, call_list); } static void accept_stream(void *cd, grpc_transport *transport, @@ -660,7 +666,8 @@ static void accept_stream(void *cd, grpc_transport *transport, 0, gpr_inf_future(GPR_CLOCK_MONOTONIC)); } -static void channel_connectivity_changed(void *cd, int iomgr_status_ignored) { +static void channel_connectivity_changed(void *cd, int iomgr_status_ignored, + grpc_call_list *call_list) { channel_data *chand = cd; grpc_server *server = chand->server; if (chand->connectivity_state != GRPC_CHANNEL_FATAL_FAILURE) { @@ -670,18 +677,19 @@ static void channel_connectivity_changed(void *cd, int iomgr_status_ignored) { op.connectivity_state = &chand->connectivity_state; grpc_channel_next_op(grpc_channel_stack_element( grpc_channel_get_channel_stack(chand->channel), 0), - &op); + &op, call_list); } else { gpr_mu_lock(&server->mu_global); - destroy_channel(chand); + destroy_channel(chand, call_list); gpr_mu_unlock(&server->mu_global); - GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "connectivity"); + GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "connectivity", call_list); } } static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, - grpc_transport_stream_op *initial_op) { + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; memset(calld, 0, sizeof(call_data)); @@ -696,7 +704,8 @@ static void init_call_elem(grpc_call_element *elem, if (initial_op) server_mutate_op(elem, initial_op); } -static void destroy_call_elem(grpc_call_element *elem) { +static void destroy_call_elem(grpc_call_element *elem, + grpc_call_list *call_list) { channel_data *chand = elem->channel_data; call_data *calld = elem->call_data; @@ -711,13 +720,13 @@ static void destroy_call_elem(grpc_call_element *elem) { gpr_mu_destroy(&calld->mu_state); - server_unref(chand->server); + server_unref(chand->server, call_list); } static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *metadata_context, int is_first, - int is_last) { + int is_last, grpc_call_list *call_list) { channel_data *chand = elem->channel_data; GPR_ASSERT(is_first); GPR_ASSERT(!is_last); @@ -733,7 +742,8 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, channel_connectivity_changed, chand); } -static void destroy_channel_elem(grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem, + grpc_call_list *call_list) { size_t i; channel_data *chand = elem->channel_data; if (chand->registered_methods) { @@ -752,11 +762,11 @@ 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(chand->server, call_list); gpr_mu_unlock(&chand->server->mu_global); GRPC_MDSTR_UNREF(chand->path_key); GRPC_MDSTR_UNREF(chand->authority_key); - server_unref(chand->server); + server_unref(chand->server, call_list); } } @@ -810,7 +820,6 @@ grpc_server *grpc_server_create_from_filters( gpr_ref_init(&server->internal_refcount, 1); server->root_channel_data.next = server->root_channel_data.prev = &server->root_channel_data; - server->workqueue = grpc_workqueue_create(); /* TODO(ctiller): expose a channel_arg for this */ server->max_requested_calls = 32768; @@ -881,23 +890,26 @@ void *grpc_server_register_method(grpc_server *server, const char *method, void grpc_server_start(grpc_server *server) { listener *l; size_t i; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; server->pollsets = gpr_malloc(sizeof(grpc_pollset *) * server->cq_count); for (i = 0; i < server->cq_count; i++) { server->pollsets[i] = grpc_cq_pollset(server->cqs[i]); - grpc_workqueue_add_to_pollset(server->workqueue, server->pollsets[i]); } for (l = server->listeners; l; l = l->next) { - l->start(server, l->arg, server->pollsets, server->cq_count); + l->start(server, l->arg, server->pollsets, server->cq_count, &call_list); } + + grpc_call_list_run(&call_list); } void grpc_server_setup_transport(grpc_server *s, grpc_transport *transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx *mdctx, grpc_workqueue *workqueue, - const grpc_channel_args *args) { + const grpc_channel_args *args, + grpc_call_list *call_list) { size_t num_filters = s->channel_filter_count + num_extra_filters + 1; grpc_channel_filter const **filters = gpr_malloc(sizeof(grpc_channel_filter *) * num_filters); @@ -927,11 +939,11 @@ void grpc_server_setup_transport(grpc_server *s, grpc_transport *transport, for (i = 0; i < s->cq_count; i++) { memset(&op, 0, sizeof(op)); op.bind_pollset = grpc_cq_pollset(s->cqs[i]); - grpc_transport_perform_op(transport, &op); + grpc_transport_perform_op(transport, &op, call_list); } channel = grpc_channel_create_from_filters(NULL, filters, num_filters, args, - mdctx, workqueue, 0); + mdctx, workqueue, 0, call_list); chand = (channel_data *)grpc_channel_stack_element( grpc_channel_get_channel_stack(channel), 0) ->channel_data; @@ -987,19 +999,30 @@ void grpc_server_setup_transport(grpc_server *s, grpc_transport *transport, op.on_connectivity_state_change = &chand->channel_connectivity_changed; op.connectivity_state = &chand->connectivity_state; op.disconnect = gpr_atm_acq_load(&s->shutdown_flag) != 0; - grpc_transport_perform_op(transport, &op); + grpc_transport_perform_op(transport, &op, call_list); } -void done_published_shutdown(void *done_arg, grpc_cq_completion *storage) { +void done_published_shutdown(void *done_arg, grpc_cq_completion *storage, + grpc_call_list *call_list) { (void) done_arg; gpr_free(storage); } +static void listener_destroy_done(void *s, int success, + grpc_call_list *call_list) { + grpc_server *server = s; + gpr_mu_lock(&server->mu_global); + server->listeners_destroyed++; + maybe_finish_shutdown(server, call_list); + gpr_mu_unlock(&server->mu_global); +} + void grpc_server_shutdown_and_notify(grpc_server *server, grpc_completion_queue *cq, void *tag) { listener *l; shutdown_tag *sdt; channel_broadcaster broadcaster; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; GRPC_SERVER_LOG_SHUTDOWN(GPR_INFO, server, cq, tag); @@ -1008,9 +1031,9 @@ void grpc_server_shutdown_and_notify(grpc_server *server, grpc_cq_begin_op(cq); if (server->shutdown_published) { grpc_cq_end_op(cq, tag, 1, done_published_shutdown, NULL, - gpr_malloc(sizeof(grpc_cq_completion))); + gpr_malloc(sizeof(grpc_cq_completion)), &call_list); gpr_mu_unlock(&server->mu_global); - return; + goto done; } server->shutdown_tags = gpr_realloc(server->shutdown_tags, @@ -1020,7 +1043,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); @@ -1029,41 +1052,40 @@ 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); + kill_pending_work_locked(server, &call_list); gpr_mu_unlock(&server->mu_call); gpr_atm_rel_store(&server->shutdown_flag, 1); - maybe_finish_shutdown(server); + maybe_finish_shutdown(server, &call_list); gpr_mu_unlock(&server->mu_global); /* Shutdown listeners */ for (l = server->listeners; l; l = l->next) { - l->destroy(server, l->arg); + grpc_closure_init(&l->destroy_done, listener_destroy_done, server); + l->destroy(server, l->arg, &l->destroy_done, &call_list); } - channel_broadcaster_shutdown(&broadcaster, 1, 0); -} + channel_broadcaster_shutdown(&broadcaster, 1, 0, &call_list); -void grpc_server_listener_destroy_done(void *s) { - grpc_server *server = s; - gpr_mu_lock(&server->mu_global); - server->listeners_destroyed++; - maybe_finish_shutdown(server); - gpr_mu_unlock(&server->mu_global); +done: + grpc_call_list_run(&call_list); } void grpc_server_cancel_all_calls(grpc_server *server) { channel_broadcaster broadcaster; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_mu_lock(&server->mu_global); channel_broadcaster_init(server, &broadcaster); gpr_mu_unlock(&server->mu_global); - channel_broadcaster_shutdown(&broadcaster, 0, 1); + channel_broadcaster_shutdown(&broadcaster, 0, 1, &call_list); + grpc_call_list_run(&call_list); } void grpc_server_destroy(grpc_server *server) { listener *l; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_mu_lock(&server->mu_global); GPR_ASSERT(gpr_atm_acq_load(&server->shutdown_flag) || !server->listeners); @@ -1077,16 +1099,17 @@ void grpc_server_destroy(grpc_server *server) { gpr_mu_unlock(&server->mu_global); - grpc_workqueue_flush(server->workqueue); - - server_unref(server); + server_unref(server, &call_list); + grpc_call_list_run(&call_list); } -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)) { +void grpc_server_add_listener( + grpc_server *server, void *arg, + void (*start)(grpc_server *server, void *arg, grpc_pollset **pollsets, + size_t pollset_count, grpc_call_list *call_list), + void (*destroy)(grpc_server *server, void *arg, grpc_closure *on_done, + grpc_call_list *call_list), + grpc_call_list *call_list) { listener *l = gpr_malloc(sizeof(listener)); l->arg = arg; l->start = start; @@ -1096,18 +1119,19 @@ void grpc_server_add_listener(grpc_server *server, void *arg, } static grpc_call_error queue_call_request(grpc_server *server, - requested_call *rc) { + requested_call *rc, + grpc_call_list *call_list) { call_data *calld = NULL; request_matcher *request_matcher = NULL; int request_id; if (gpr_atm_acq_load(&server->shutdown_flag)) { - fail_call(server, rc); + fail_call(server, rc, call_list); return GRPC_CALL_OK; } request_id = gpr_stack_lockfree_pop(server->request_freelist); if (request_id == -1) { /* out of request ids: just fail this one */ - fail_call(server, rc); + fail_call(server, rc, call_list); return GRPC_CALL_OK; } switch (rc->type) { @@ -1135,12 +1159,13 @@ static grpc_call_error queue_call_request(grpc_server *server, grpc_closure_init( &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0)); - grpc_workqueue_push(server->workqueue, &calld->kill_zombie_closure, 1); + grpc_call_list_add(call_list, &calld->kill_zombie_closure, 1); } else { GPR_ASSERT(calld->state == PENDING); calld->state = ACTIVATED; gpr_mu_unlock(&calld->mu_state); - begin_call(server, calld, &server->requested_calls[request_id]); + begin_call(server, calld, &server->requested_calls[request_id], + call_list); } gpr_mu_lock(&server->mu_call); } @@ -1154,13 +1179,16 @@ grpc_call_error grpc_server_request_call( grpc_metadata_array *initial_metadata, grpc_completion_queue *cq_bound_to_call, grpc_completion_queue *cq_for_notification, void *tag) { + grpc_call_error error; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; requested_call *rc = gpr_malloc(sizeof(*rc)); GRPC_SERVER_LOG_REQUEST_CALL(GPR_INFO, server, call, details, initial_metadata, cq_bound_to_call, cq_for_notification, tag); if (!grpc_cq_is_server_cq(cq_for_notification)) { gpr_free(rc); - return GRPC_CALL_ERROR_NOT_SERVER_COMPLETION_QUEUE; + error = GRPC_CALL_ERROR_NOT_SERVER_COMPLETION_QUEUE; + goto done; } grpc_cq_begin_op(cq_for_notification); details->reserved = NULL; @@ -1172,7 +1200,10 @@ grpc_call_error grpc_server_request_call( rc->call = call; rc->data.batch.details = details; rc->data.batch.initial_metadata = initial_metadata; - return queue_call_request(server, rc); + error = queue_call_request(server, rc, &call_list); +done: + grpc_call_list_run(&call_list); + return error; } grpc_call_error grpc_server_request_registered_call( @@ -1180,11 +1211,14 @@ grpc_call_error grpc_server_request_registered_call( grpc_metadata_array *initial_metadata, grpc_byte_buffer **optional_payload, grpc_completion_queue *cq_bound_to_call, grpc_completion_queue *cq_for_notification, void *tag) { + grpc_call_error error; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; requested_call *rc = gpr_malloc(sizeof(*rc)); registered_method *registered_method = rm; if (!grpc_cq_is_server_cq(cq_for_notification)) { gpr_free(rc); - return GRPC_CALL_ERROR_NOT_SERVER_COMPLETION_QUEUE; + error = GRPC_CALL_ERROR_NOT_SERVER_COMPLETION_QUEUE; + goto done; } grpc_cq_begin_op(cq_for_notification); rc->type = REGISTERED_CALL; @@ -1197,12 +1231,16 @@ grpc_call_error grpc_server_request_registered_call( rc->data.registered.deadline = deadline; rc->data.registered.initial_metadata = initial_metadata; rc->data.registered.optional_payload = optional_payload; - return queue_call_request(server, rc); + error = queue_call_request(server, rc, &call_list); +done: + grpc_call_list_run(&call_list); + return error; } -static void publish_registered_or_batch(grpc_call *call, int success, - void *tag); -static void publish_was_not_set(grpc_call *call, int success, void *tag) { +static void publish_registered_or_batch(grpc_call *call, int success, void *tag, + grpc_call_list *call_list); +static void publish_was_not_set(grpc_call *call, int success, void *tag, + grpc_call_list *call_list) { abort(); } @@ -1218,7 +1256,7 @@ static void cpstr(char **dest, size_t *capacity, grpc_mdstr *value) { } static void begin_call(grpc_server *server, call_data *calld, - requested_call *rc) { + requested_call *rc, grpc_call_list *call_list) { grpc_ioreq_completion_func publish = publish_was_not_set; grpc_ioreq req[2]; grpc_ioreq *r = req; @@ -1229,7 +1267,7 @@ static void begin_call(grpc_server *server, call_data *calld, fill in the metadata array passed by the client, we need to perform an ioreq op, that should complete immediately. */ - grpc_call_set_completion_queue(calld->call, rc->cq_bound_to_call); + grpc_call_set_completion_queue(calld->call, rc->cq_bound_to_call, call_list); *rc->call = calld->call; calld->cq_new = rc->cq_for_notification; switch (rc->type) { @@ -1265,10 +1303,11 @@ static void begin_call(grpc_server *server, call_data *calld, GRPC_CALL_INTERNAL_REF(calld->call, "server"); grpc_call_start_ioreq_and_call_back(calld->call, req, (size_t)(r - req), - publish, rc); + publish, rc, call_list); } -static void done_request_event(void *req, grpc_cq_completion *c) { +static void done_request_event(void *req, grpc_cq_completion *c, + grpc_call_list *call_list) { requested_call *rc = req; grpc_server *server = rc->server; @@ -1281,10 +1320,11 @@ static void done_request_event(void *req, grpc_cq_completion *c) { gpr_free(req); } - server_unref(server); + server_unref(server, call_list); } -static void fail_call(grpc_server *server, requested_call *rc) { +static void fail_call(grpc_server *server, requested_call *rc, + grpc_call_list *call_list) { *rc->call = NULL; switch (rc->type) { case BATCH_CALL: @@ -1296,11 +1336,11 @@ static void fail_call(grpc_server *server, requested_call *rc) { } server_ref(server); grpc_cq_end_op(rc->cq_for_notification, rc->tag, 0, done_request_event, rc, - &rc->completion); + &rc->completion, call_list); } -static void publish_registered_or_batch(grpc_call *call, int success, - void *prc) { +static void publish_registered_or_batch(grpc_call *call, int success, void *prc, + grpc_call_list *call_list) { grpc_call_element *elem = grpc_call_stack_element(grpc_call_get_call_stack(call), 0); requested_call *rc = prc; @@ -1308,7 +1348,7 @@ static void publish_registered_or_batch(grpc_call *call, int success, channel_data *chand = elem->channel_data; server_ref(chand->server); grpc_cq_end_op(calld->cq_new, rc->tag, success, done_request_event, rc, - &rc->completion); + &rc->completion, call_list); GRPC_CALL_INTERNAL_UNREF(call, "server", call_list); } diff --git a/src/core/surface/server.h b/src/core/surface/server.h index f87296797ce..2f2c5b8948d 100644 --- a/src/core/surface/server.h +++ b/src/core/surface/server.h @@ -49,9 +49,9 @@ void grpc_server_add_listener( grpc_server *server, void *listener, void (*start)(grpc_server *server, void *arg, grpc_pollset **pollsets, size_t npollsets, grpc_call_list *call_list), - void (*destroy)(grpc_server *server, void *arg, grpc_call_list *call_list)); - -void grpc_server_listener_destroy_done(void *server); + void (*destroy)(grpc_server *server, void *arg, grpc_closure *on_done, + grpc_call_list *call_list), + grpc_call_list *call_list); /* Setup a transport - creates a channel stack, binds the transport to the server */ @@ -59,7 +59,8 @@ void grpc_server_setup_transport(grpc_server *server, grpc_transport *transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx *mdctx, grpc_workqueue *workqueue, - const grpc_channel_args *args); + const grpc_channel_args *args, + grpc_call_list *call_list); const grpc_channel_args *grpc_server_get_channel_args(grpc_server *server); diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c index 91cf6ece9cd..df63d99dead 100644 --- a/src/core/surface/server_chttp2.c +++ b/src/core/surface/server_chttp2.c @@ -43,15 +43,17 @@ #include static void setup_transport(void *server, grpc_transport *transport, - grpc_mdctx *mdctx, grpc_workqueue *workqueue) { + grpc_mdctx *mdctx, grpc_workqueue *workqueue, + grpc_call_list *call_list) { static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; grpc_server_setup_transport(server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, workqueue, - grpc_server_get_channel_args(server)); + grpc_server_get_channel_args(server), call_list); } -static void new_transport(void *server, grpc_endpoint *tcp) { +static void new_transport(void *server, grpc_endpoint *tcp, + grpc_call_list *call_list) { /* * Beware that the call to grpc_create_chttp2_transport() has to happen before * grpc_tcp_server_destroy(). This is fine here, but similar code @@ -60,25 +62,27 @@ static void new_transport(void *server, grpc_endpoint *tcp) { * case. */ grpc_mdctx *mdctx = grpc_mdctx_create(); - grpc_workqueue *workqueue = grpc_workqueue_create(); + grpc_workqueue *workqueue = grpc_workqueue_create(call_list); grpc_transport *transport = grpc_create_chttp2_transport( - grpc_server_get_channel_args(server), tcp, mdctx, workqueue, 0); - setup_transport(server, transport, mdctx, workqueue); - grpc_chttp2_transport_start_reading(transport, NULL, 0); + grpc_server_get_channel_args(server), tcp, mdctx, 0, call_list); + setup_transport(server, transport, mdctx, workqueue, call_list); + grpc_chttp2_transport_start_reading(transport, NULL, 0, call_list); } /* Server callback: start listening on our ports */ static void start(grpc_server *server, void *tcpp, grpc_pollset **pollsets, - size_t pollset_count) { + size_t pollset_count, grpc_call_list *call_list) { grpc_tcp_server *tcp = tcpp; - grpc_tcp_server_start(tcp, pollsets, pollset_count, new_transport, server); + grpc_tcp_server_start(tcp, pollsets, pollset_count, new_transport, server, + call_list); } /* Server callback: destroy the tcp listener (so we don't generate further callbacks) */ -static void destroy(grpc_server *server, void *tcpp) { +static void destroy(grpc_server *server, void *tcpp, grpc_closure *destroy_done, + grpc_call_list *call_list) { grpc_tcp_server *tcp = tcpp; - grpc_tcp_server_destroy(tcp, grpc_server_listener_destroy_done, server); + grpc_tcp_server_destroy(tcp, destroy_done, call_list); } int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) { @@ -88,6 +92,7 @@ int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) { unsigned count = 0; int port_num = -1; int port_temp; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; resolved = grpc_blocking_resolve_address(addr, "http"); if (!resolved) { @@ -124,9 +129,8 @@ int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) { grpc_resolved_addresses_destroy(resolved); /* Register with the server only upon success */ - grpc_server_add_listener(server, tcp, start, destroy); - - return port_num; + grpc_server_add_listener(server, tcp, start, destroy, &call_list); + goto done; /* Error path: cleanup and return */ error: @@ -136,5 +140,9 @@ error: if (tcp) { grpc_tcp_server_destroy(tcp, NULL, NULL); } + port_num = 0; + +done: + grpc_call_list_run(&call_list); return 0; } diff --git a/src/core/transport/chttp2/frame_data.c b/src/core/transport/chttp2/frame_data.c index 403358016d3..ef12c910cd7 100644 --- a/src/core/transport/chttp2/frame_data.c +++ b/src/core/transport/chttp2/frame_data.c @@ -71,7 +71,8 @@ grpc_chttp2_parse_error grpc_chttp2_data_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_data_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list) { gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; diff --git a/src/core/transport/chttp2/frame_data.h b/src/core/transport/chttp2/frame_data.h index 23957b05ada..7530f0f6446 100644 --- a/src/core/transport/chttp2/frame_data.h +++ b/src/core/transport/chttp2/frame_data.h @@ -36,6 +36,7 @@ /* Parser for GRPC streams embedded in DATA frames */ +#include "src/core/iomgr/iomgr.h" #include #include #include "src/core/transport/stream_op.h" @@ -74,7 +75,8 @@ grpc_chttp2_parse_error grpc_chttp2_data_parser_begin_frame( frame */ grpc_chttp2_parse_error grpc_chttp2_data_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list); /* create a slice with an empty data frame and is_last set */ gpr_slice grpc_chttp2_data_frame_create_empty_close(gpr_uint32 id); diff --git a/src/core/transport/chttp2/frame_goaway.c b/src/core/transport/chttp2/frame_goaway.c index 09d4da234c5..1c2bce6736d 100644 --- a/src/core/transport/chttp2/frame_goaway.c +++ b/src/core/transport/chttp2/frame_goaway.c @@ -64,7 +64,8 @@ grpc_chttp2_parse_error grpc_chttp2_goaway_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_goaway_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list) { gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; diff --git a/src/core/transport/chttp2/frame_goaway.h b/src/core/transport/chttp2/frame_goaway.h index 9c5edfc8215..ec991f43503 100644 --- a/src/core/transport/chttp2/frame_goaway.h +++ b/src/core/transport/chttp2/frame_goaway.h @@ -34,6 +34,7 @@ #ifndef GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_GOAWAY_H #define GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_GOAWAY_H +#include "src/core/iomgr/iomgr.h" #include "src/core/transport/chttp2/frame.h" #include #include @@ -66,7 +67,8 @@ grpc_chttp2_parse_error grpc_chttp2_goaway_parser_begin_frame( grpc_chttp2_goaway_parser *parser, gpr_uint32 length, gpr_uint8 flags); grpc_chttp2_parse_error grpc_chttp2_goaway_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list); void grpc_chttp2_goaway_append(gpr_uint32 last_stream_id, gpr_uint32 error_code, gpr_slice debug_data, diff --git a/src/core/transport/chttp2/frame_ping.c b/src/core/transport/chttp2/frame_ping.c index 10d1e0a523c..2fb8850a459 100644 --- a/src/core/transport/chttp2/frame_ping.c +++ b/src/core/transport/chttp2/frame_ping.c @@ -70,7 +70,8 @@ grpc_chttp2_parse_error grpc_chttp2_ping_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list) { gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; @@ -89,9 +90,7 @@ grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse( for (ping = transport_parsing->pings.next; ping != &transport_parsing->pings; ping = ping->next) { if (0 == memcmp(p->opaque_8bytes, ping->id, 8)) { - /* we know no locks are held here, we may as well just call up - * directly */ - ping->on_recv->cb(ping->on_recv->cb_arg, 1); + grpc_call_list_add(call_list, ping->on_recv, 1); } ping->next->prev = ping->prev; ping->prev->next = ping->next; diff --git a/src/core/transport/chttp2/frame_ping.h b/src/core/transport/chttp2/frame_ping.h index 99197e8352f..70e19eb8ab7 100644 --- a/src/core/transport/chttp2/frame_ping.h +++ b/src/core/transport/chttp2/frame_ping.h @@ -35,6 +35,7 @@ #define GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_PING_H #include +#include "src/core/iomgr/iomgr.h" #include "src/core/transport/chttp2/frame.h" typedef struct { @@ -49,6 +50,7 @@ grpc_chttp2_parse_error grpc_chttp2_ping_parser_begin_frame( grpc_chttp2_ping_parser *parser, gpr_uint32 length, gpr_uint8 flags); grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_PING_H */ diff --git a/src/core/transport/chttp2/frame_rst_stream.c b/src/core/transport/chttp2/frame_rst_stream.c index 67da245239c..7cf8abe88f7 100644 --- a/src/core/transport/chttp2/frame_rst_stream.c +++ b/src/core/transport/chttp2/frame_rst_stream.c @@ -72,7 +72,8 @@ grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list) { gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; diff --git a/src/core/transport/chttp2/frame_rst_stream.h b/src/core/transport/chttp2/frame_rst_stream.h index ed69e588af3..17d57fae5e2 100644 --- a/src/core/transport/chttp2/frame_rst_stream.h +++ b/src/core/transport/chttp2/frame_rst_stream.h @@ -36,6 +36,7 @@ #include #include "src/core/transport/chttp2/frame.h" +#include "src/core/iomgr/iomgr.h" typedef struct { gpr_uint8 byte; @@ -48,6 +49,7 @@ grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_begin_frame( grpc_chttp2_rst_stream_parser *parser, gpr_uint32 length, gpr_uint8 flags); grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_RST_STREAM_H */ diff --git a/src/core/transport/chttp2/frame_settings.c b/src/core/transport/chttp2/frame_settings.c index 54d3694a5c3..78bd4bb09dd 100644 --- a/src/core/transport/chttp2/frame_settings.c +++ b/src/core/transport/chttp2/frame_settings.c @@ -139,7 +139,8 @@ grpc_chttp2_parse_error grpc_chttp2_settings_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_settings_parser_parse( void *p, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list) { grpc_chttp2_settings_parser *parser = p; const gpr_uint8 *cur = GPR_SLICE_START_PTR(slice); const gpr_uint8 *end = GPR_SLICE_END_PTR(slice); diff --git a/src/core/transport/chttp2/frame_settings.h b/src/core/transport/chttp2/frame_settings.h index 0ac68a9fa85..a04a28b7da8 100644 --- a/src/core/transport/chttp2/frame_settings.h +++ b/src/core/transport/chttp2/frame_settings.h @@ -37,6 +37,7 @@ #include #include #include "src/core/transport/chttp2/frame.h" +#include "src/core/iomgr/iomgr.h" typedef enum { GRPC_CHTTP2_SPS_ID0, @@ -95,6 +96,7 @@ grpc_chttp2_parse_error grpc_chttp2_settings_parser_begin_frame( gpr_uint32 *settings); grpc_chttp2_parse_error grpc_chttp2_settings_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_SETTINGS_H */ diff --git a/src/core/transport/chttp2/frame_window_update.c b/src/core/transport/chttp2/frame_window_update.c index ea13969e8cc..51eb2613469 100644 --- a/src/core/transport/chttp2/frame_window_update.c +++ b/src/core/transport/chttp2/frame_window_update.c @@ -75,7 +75,8 @@ grpc_chttp2_parse_error grpc_chttp2_window_update_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_window_update_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list) { gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; diff --git a/src/core/transport/chttp2/frame_window_update.h b/src/core/transport/chttp2/frame_window_update.h index deba801d002..7f1168e551d 100644 --- a/src/core/transport/chttp2/frame_window_update.h +++ b/src/core/transport/chttp2/frame_window_update.h @@ -34,6 +34,7 @@ #ifndef GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_WINDOW_UPDATE_H #define GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_WINDOW_UPDATE_H +#include "src/core/iomgr/iomgr.h" #include #include "src/core/transport/chttp2/frame.h" @@ -51,6 +52,7 @@ grpc_chttp2_parse_error grpc_chttp2_window_update_parser_begin_frame( gpr_uint8 flags); grpc_chttp2_parse_error grpc_chttp2_window_update_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_WINDOW_UPDATE_H */ diff --git a/src/core/transport/chttp2/hpack_parser.c b/src/core/transport/chttp2/hpack_parser.c index 9c40e8a4e60..e3b8e54e8d4 100644 --- a/src/core/transport/chttp2/hpack_parser.c +++ b/src/core/transport/chttp2/hpack_parser.c @@ -1379,7 +1379,8 @@ int grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser *p, grpc_chttp2_parse_error grpc_chttp2_header_parser_parse( void *hpack_parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list) { grpc_chttp2_hpack_parser *parser = hpack_parser; if (!grpc_chttp2_hpack_parser_parse(parser, GPR_SLICE_START_PTR(slice), GPR_SLICE_END_PTR(slice))) { diff --git a/src/core/transport/chttp2/hpack_parser.h b/src/core/transport/chttp2/hpack_parser.h index 4f489d67fb4..c9ae6a97675 100644 --- a/src/core/transport/chttp2/hpack_parser.h +++ b/src/core/transport/chttp2/hpack_parser.h @@ -37,6 +37,7 @@ #include #include +#include "src/core/iomgr/iomgr.h" #include "src/core/transport/chttp2/frame.h" #include "src/core/transport/chttp2/hpack_table.h" #include "src/core/transport/metadata.h" @@ -108,6 +109,7 @@ int grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser *p, the transport */ grpc_chttp2_parse_error grpc_chttp2_header_parser_parse( void *hpack_parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_HPACK_PARSER_H */ diff --git a/src/core/transport/chttp2/internal.h b/src/core/transport/chttp2/internal.h index 386f2dd3156..b9dbbc25eef 100644 --- a/src/core/transport/chttp2/internal.h +++ b/src/core/transport/chttp2/internal.h @@ -163,8 +163,6 @@ typedef struct grpc_chttp2_outstanding_ping { typedef struct { /** data to write next write */ gpr_slice_buffer qbuf; - /** queued callbacks */ - grpc_call_list run_at_unlock; /** window available for us to send to peer */ gpr_int64 outgoing_window; @@ -269,7 +267,8 @@ struct grpc_chttp2_transport_parsing { grpc_chttp2_stream_parsing *incoming_stream; grpc_chttp2_parse_error (*parser)( void *parser_user_data, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list); /* received settings */ gpr_uint32 settings[GRPC_CHTTP2_NUM_SETTINGS]; @@ -469,19 +468,23 @@ struct grpc_chttp2_stream { int grpc_chttp2_unlocking_check_writes(grpc_chttp2_transport_global *global, grpc_chttp2_transport_writing *writing); void grpc_chttp2_perform_writes( - grpc_chttp2_transport_writing *transport_writing, grpc_endpoint *endpoint); -void grpc_chttp2_terminate_writing(void *transport_writing, int success); + grpc_chttp2_transport_writing *transport_writing, grpc_endpoint *endpoint, + grpc_call_list *call_list); +void grpc_chttp2_terminate_writing(void *transport_writing, int success, + grpc_call_list *call_list); void grpc_chttp2_cleanup_writing(grpc_chttp2_transport_global *global, - grpc_chttp2_transport_writing *writing); + grpc_chttp2_transport_writing *writing, + grpc_call_list *call_list); void grpc_chttp2_prepare_to_read(grpc_chttp2_transport_global *global, grpc_chttp2_transport_parsing *parsing); /** 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 */ int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, - gpr_slice slice); + gpr_slice slice, grpc_call_list *call_list); void grpc_chttp2_publish_reads(grpc_chttp2_transport_global *global, - grpc_chttp2_transport_parsing *parsing); + grpc_chttp2_transport_parsing *parsing, + grpc_call_list *call_list); /** Get a writable stream returns non-zero if there was a stream available */ @@ -574,7 +577,7 @@ grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream( void grpc_chttp2_add_incoming_goaway( grpc_chttp2_transport_global *transport_global, gpr_uint32 goaway_error, - gpr_slice goaway_text); + gpr_slice goaway_text, grpc_call_list *call_list); void grpc_chttp2_register_stream(grpc_chttp2_transport *t, grpc_chttp2_stream *s); diff --git a/src/core/transport/chttp2/parsing.c b/src/core/transport/chttp2/parsing.c index f26f4467872..2d95963f1fd 100644 --- a/src/core/transport/chttp2/parsing.c +++ b/src/core/transport/chttp2/parsing.c @@ -59,7 +59,8 @@ static int init_skip_frame_parser( grpc_chttp2_transport_parsing *transport_parsing, int is_header); static int parse_frame_slice(grpc_chttp2_transport_parsing *transport_parsing, - gpr_slice slice, int is_last); + gpr_slice slice, int is_last, + grpc_call_list *call_list); void grpc_chttp2_prepare_to_read( grpc_chttp2_transport_global *transport_global, @@ -90,9 +91,9 @@ void grpc_chttp2_prepare_to_read( } } -void grpc_chttp2_publish_reads( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_transport_parsing *transport_parsing) { +void grpc_chttp2_publish_reads(grpc_chttp2_transport_global *transport_global, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_call_list *call_list) { grpc_chttp2_stream_global *stream_global; grpc_chttp2_stream_parsing *stream_parsing; @@ -132,7 +133,7 @@ void grpc_chttp2_publish_reads( if (transport_parsing->goaway_received) { grpc_chttp2_add_incoming_goaway(transport_global, (gpr_uint32)transport_parsing->goaway_error, - transport_parsing->goaway_text); + transport_parsing->goaway_text, call_list); transport_parsing->goaway_text = gpr_empty_slice(); transport_parsing->goaway_received = 0; } @@ -235,7 +236,7 @@ void grpc_chttp2_publish_reads( } int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, - gpr_slice slice) { + gpr_slice slice, grpc_call_list *call_list) { gpr_uint8 *beg = GPR_SLICE_START_PTR(slice); gpr_uint8 *end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; @@ -364,7 +365,8 @@ int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, transport_parsing->incoming_stream_id; } if (transport_parsing->incoming_frame_size == 0) { - if (!parse_frame_slice(transport_parsing, gpr_empty_slice(), 1)) { + if (!parse_frame_slice(transport_parsing, gpr_empty_slice(), 1, + call_list)) { return 0; } transport_parsing->incoming_stream = NULL; @@ -384,7 +386,7 @@ int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, if (!parse_frame_slice(transport_parsing, gpr_slice_sub_no_ref(slice, (size_t)(cur - beg), (size_t)(end - beg)), - 1)) { + 1, call_list)) { return 0; } transport_parsing->deframe_state = GRPC_DTS_FH_0; @@ -398,7 +400,7 @@ int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, gpr_slice_sub_no_ref( slice, cur_offset, cur_offset + transport_parsing->incoming_frame_size), - 1)) { + 1, call_list)) { return 0; } cur += transport_parsing->incoming_frame_size; @@ -408,7 +410,7 @@ int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, if (!parse_frame_slice(transport_parsing, gpr_slice_sub_no_ref(slice, (size_t)(cur - beg), (size_t)(end - beg)), - 0)) { + 0, call_list)) { return 0; } transport_parsing->incoming_frame_size -= (gpr_uint32)(end - cur); @@ -470,7 +472,8 @@ static int init_frame_parser(grpc_chttp2_transport_parsing *transport_parsing) { static grpc_chttp2_parse_error skip_parser( void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, + grpc_call_list *call_list) { return GRPC_CHTTP2_PARSE_OK; } @@ -789,12 +792,13 @@ static int is_window_update_legal(gpr_int64 window_update, gpr_int64 window) { */ static int parse_frame_slice(grpc_chttp2_transport_parsing *transport_parsing, - gpr_slice slice, int is_last) { + gpr_slice slice, int is_last, + grpc_call_list *call_list) { grpc_chttp2_stream_parsing *stream_parsing = transport_parsing->incoming_stream; switch (transport_parsing->parser(transport_parsing->parser_data, transport_parsing, stream_parsing, slice, - is_last)) { + is_last, call_list)) { case GRPC_CHTTP2_PARSE_OK: if (stream_parsing) { grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, diff --git a/src/core/transport/chttp2/writing.c b/src/core/transport/chttp2/writing.c index db6715b43a5..18f4bfbc77c 100644 --- a/src/core/transport/chttp2/writing.c +++ b/src/core/transport/chttp2/writing.c @@ -163,7 +163,8 @@ int grpc_chttp2_unlocking_check_writes( } void grpc_chttp2_perform_writes( - grpc_chttp2_transport_writing *transport_writing, grpc_endpoint *endpoint) { + grpc_chttp2_transport_writing *transport_writing, grpc_endpoint *endpoint, + grpc_call_list *call_list) { GPR_ASSERT(transport_writing->outbuf.count > 0 || grpc_chttp2_list_have_writing_streams(transport_writing)); @@ -172,17 +173,8 @@ void grpc_chttp2_perform_writes( GPR_ASSERT(transport_writing->outbuf.count > 0); GPR_ASSERT(endpoint); - switch (grpc_endpoint_write(endpoint, &transport_writing->outbuf, - &transport_writing->done_cb)) { - case GRPC_ENDPOINT_DONE: - grpc_chttp2_terminate_writing(transport_writing, 1); - break; - case GRPC_ENDPOINT_ERROR: - grpc_chttp2_terminate_writing(transport_writing, 0); - break; - case GRPC_ENDPOINT_PENDING: - break; - } + grpc_endpoint_write(endpoint, &transport_writing->outbuf, + &transport_writing->done_cb, call_list); } static void finalize_outbuf(grpc_chttp2_transport_writing *transport_writing) { @@ -220,7 +212,8 @@ static void finalize_outbuf(grpc_chttp2_transport_writing *transport_writing) { void grpc_chttp2_cleanup_writing( grpc_chttp2_transport_global *transport_global, - grpc_chttp2_transport_writing *transport_writing) { + grpc_chttp2_transport_writing *transport_writing, + grpc_call_list *call_list) { grpc_chttp2_stream_writing *stream_writing; grpc_chttp2_stream_global *stream_global; @@ -238,8 +231,7 @@ void grpc_chttp2_cleanup_writing( stream_global->outgoing_sopb->nops == 0) { GPR_ASSERT(stream_global->write_state != GRPC_WRITE_STATE_QUEUED_CLOSE); stream_global->outgoing_sopb = NULL; - grpc_call_list_add(&transport_global->run_at_unlock, - stream_global->send_done_closure, 1); + grpc_call_list_add(call_list, stream_global->send_done_closure, 1); } } stream_global->writing_now = 0; diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index bc056ac0b88..acd7cbdc1d7 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -78,27 +78,31 @@ int grpc_flowctl_trace = 0; static const grpc_transport_vtable vtable; static void lock(grpc_chttp2_transport *t); -static void unlock(grpc_chttp2_transport *t); +static void unlock(grpc_chttp2_transport *t, grpc_call_list *call_list); -static void unlock_check_read_write_state(grpc_chttp2_transport *t); +static void unlock_check_read_write_state(grpc_chttp2_transport *t, + grpc_call_list *call_list); /* forward declarations of various callbacks that we'll build closures around */ -static void writing_action(void *t, int iomgr_success_ignored); +static void writing_action(void *t, int iomgr_success_ignored, + grpc_call_list *call_list); /** Set a transport level setting, and push it to our peer */ static void push_setting(grpc_chttp2_transport *t, grpc_chttp2_setting_id id, gpr_uint32 value); /** Endpoint callback to process incoming data */ -static void recv_data(void *tp, int success); +static void recv_data(void *tp, int success, grpc_call_list *call_list); /** Start disconnection chain */ -static void drop_connection(grpc_chttp2_transport *t); +static void drop_connection(grpc_chttp2_transport *t, + grpc_call_list *call_list); /** Perform a transport_op */ static void perform_stream_op_locked( grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global, grpc_transport_stream_op *op); + grpc_chttp2_stream_global *stream_global, grpc_transport_stream_op *op, + grpc_call_list *call_list); /** Cancel a stream: coming from the transport API */ static void cancel_from_api(grpc_chttp2_transport_global *transport_global, @@ -112,23 +116,27 @@ static void close_from_api(grpc_chttp2_transport_global *transport_global, /** Add endpoint from this transport to pollset */ static void add_to_pollset_locked(grpc_chttp2_transport *t, - grpc_pollset *pollset); + grpc_pollset *pollset, + grpc_call_list *call_list); static void add_to_pollset_set_locked(grpc_chttp2_transport *t, - grpc_pollset_set *pollset_set); + grpc_pollset_set *pollset_set, + grpc_call_list *call_list); /** Start new streams that have been created if we can */ static void maybe_start_some_streams( - grpc_chttp2_transport_global *transport_global); + grpc_chttp2_transport_global *transport_global, grpc_call_list *call_list); static void connectivity_state_set( grpc_chttp2_transport_global *transport_global, - grpc_connectivity_state state, const char *reason); + grpc_connectivity_state state, const char *reason, + grpc_call_list *call_list); /* * CONSTRUCTION/DESTRUCTION/REFCOUNTING */ -static void destruct_transport(grpc_chttp2_transport *t) { +static void destruct_transport(grpc_chttp2_transport *t, + grpc_call_list *call_list) { size_t i; gpr_mu_lock(&t->mu); @@ -157,7 +165,8 @@ static void destruct_transport(grpc_chttp2_transport *t) { grpc_chttp2_stream_map_destroy(&t->parsing_stream_map); grpc_chttp2_stream_map_destroy(&t->new_stream_map); - grpc_connectivity_state_destroy(&t->channel_callback.state_tracker); + grpc_connectivity_state_destroy(&t->channel_callback.state_tracker, + call_list); gpr_mu_unlock(&t->mu); gpr_mu_destroy(&t->mu); @@ -166,7 +175,7 @@ static void destruct_transport(grpc_chttp2_transport *t) { and maybe they hold resources that need to be freed */ while (t->global.pings.next != &t->global.pings) { grpc_chttp2_outstanding_ping *ping = t->global.pings.next; - ping->on_recv->cb(ping->on_recv->cb_arg, 0); + grpc_call_list_add(call_list, ping->on_recv, 0); ping->next->prev = ping->prev; ping->prev->next = ping->next; gpr_free(ping); @@ -180,13 +189,13 @@ static void destruct_transport(grpc_chttp2_transport *t) { #ifdef REFCOUNTING_DEBUG #define REF_TRANSPORT(t, r) ref_transport(t, r, __FILE__, __LINE__) -#define UNREF_TRANSPORT(t, r) unref_transport(t, r, __FILE__, __LINE__) -static void unref_transport(grpc_chttp2_transport *t, const char *reason, - const char *file, int line) { +#define UNREF_TRANSPORT(t, r, cl) unref_transport(t, cl, r, __FILE__, __LINE__) +static void unref_transport(grpc_chttp2_transport *t, grpc_call_list *call_list, + const char *reason, const char *file, int line) { gpr_log(GPR_DEBUG, "chttp2:unref:%p %d->%d %s [%s:%d]", t, t->refs.count, t->refs.count - 1, reason, file, line); if (!gpr_unref(&t->refs)) return; - destruct_transport(t); + destruct_transport(t, call_list); } static void ref_transport(grpc_chttp2_transport *t, const char *reason, @@ -197,10 +206,11 @@ static void ref_transport(grpc_chttp2_transport *t, const char *reason, } #else #define REF_TRANSPORT(t, r) ref_transport(t) -#define UNREF_TRANSPORT(t, r) unref_transport(t) -static void unref_transport(grpc_chttp2_transport *t) { +#define UNREF_TRANSPORT(t, r, cl) unref_transport(t, cl) +static void unref_transport(grpc_chttp2_transport *t, + grpc_call_list *call_list) { if (!gpr_unref(&t->refs)) return; - destruct_transport(t); + destruct_transport(t, call_list); } static void ref_transport(grpc_chttp2_transport *t) { gpr_ref(&t->refs); } @@ -209,7 +219,7 @@ static void ref_transport(grpc_chttp2_transport *t) { gpr_ref(&t->refs); } static void init_transport(grpc_chttp2_transport *t, const grpc_channel_args *channel_args, grpc_endpoint *ep, grpc_mdctx *mdctx, - grpc_workqueue *workqueue, gpr_uint8 is_client) { + gpr_uint8 is_client, grpc_call_list *call_list) { size_t i; int j; @@ -329,15 +339,15 @@ static void init_transport(grpc_chttp2_transport *t, } } -static void destroy_transport(grpc_transport *gt) { +static void destroy_transport(grpc_transport *gt, grpc_call_list *call_list) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; lock(t); t->destroying = 1; - drop_connection(t); - unlock(t); + drop_connection(t, call_list); + unlock(t, call_list); - UNREF_TRANSPORT(t, "destroy"); + UNREF_TRANSPORT(t, "destroy", call_list); } /** block grpc_endpoint_shutdown being called until a paired @@ -347,45 +357,50 @@ static void prevent_endpoint_shutdown(grpc_chttp2_transport *t) { gpr_ref(&t->shutdown_ep_refs); } -static void allow_endpoint_shutdown_locked(grpc_chttp2_transport *t) { +static void allow_endpoint_shutdown_locked(grpc_chttp2_transport *t, + grpc_call_list *call_list) { if (gpr_unref(&t->shutdown_ep_refs)) { if (t->ep) { - grpc_endpoint_shutdown(t->ep); + grpc_endpoint_shutdown(t->ep, call_list); } } } -static void allow_endpoint_shutdown_unlocked(grpc_chttp2_transport *t) { +static void allow_endpoint_shutdown_unlocked(grpc_chttp2_transport *t, + grpc_call_list *call_list) { if (gpr_unref(&t->shutdown_ep_refs)) { gpr_mu_lock(&t->mu); if (t->ep) { - grpc_endpoint_shutdown(t->ep); + grpc_endpoint_shutdown(t->ep, call_list); } gpr_mu_unlock(&t->mu); } } -static void destroy_endpoint(grpc_chttp2_transport *t) { - grpc_endpoint_destroy(t->ep); +static void destroy_endpoint(grpc_chttp2_transport *t, + grpc_call_list *call_list) { + grpc_endpoint_destroy(t->ep, call_list); t->ep = NULL; - UNREF_TRANSPORT( - t, "disconnect"); /* safe because we'll still have the ref for write */ + /* safe because we'll still have the ref for write */ + UNREF_TRANSPORT(t, "disconnect", call_list); } -static void close_transport_locked(grpc_chttp2_transport *t) { +static void close_transport_locked(grpc_chttp2_transport *t, + grpc_call_list *call_list) { if (!t->closed) { t->closed = 1; connectivity_state_set(&t->global, GRPC_CHANNEL_FATAL_FAILURE, - "close_transport"); + "close_transport", call_list); if (t->ep) { - allow_endpoint_shutdown_locked(t); + allow_endpoint_shutdown_locked(t, call_list); } } } static int init_stream(grpc_transport *gt, grpc_stream *gs, const void *server_data, - grpc_transport_stream_op *initial_op) { + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; @@ -416,13 +431,15 @@ static int init_stream(grpc_transport *gt, grpc_stream *gs, s->global.in_stream_map = 1; } - if (initial_op) perform_stream_op_locked(&t->global, &s->global, initial_op); - unlock(t); + if (initial_op) + perform_stream_op_locked(&t->global, &s->global, initial_op, call_list); + unlock(t, call_list); return 0; } -static void destroy_stream(grpc_transport *gt, grpc_stream *gs) { +static void destroy_stream(grpc_transport *gt, grpc_stream *gs, + grpc_call_list *call_list) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; int i; @@ -433,7 +450,7 @@ static void destroy_stream(grpc_transport *gt, grpc_stream *gs) { s->global.id == 0); GPR_ASSERT(!s->global.in_stream_map); if (grpc_chttp2_unregister_stream(t, s) && t->global.sent_goaway) { - close_transport_locked(t); + close_transport_locked(t, call_list); } if (!t->parsing_active && s->global.id) { GPR_ASSERT(grpc_chttp2_stream_map_find(&t->parsing_stream_map, @@ -463,7 +480,7 @@ static void destroy_stream(grpc_transport *gt, grpc_stream *gs) { grpc_chttp2_incoming_metadata_live_op_buffer_end( &s->global.outstanding_metadata); - UNREF_TRANSPORT(t, "stream"); + UNREF_TRANSPORT(t, "stream", call_list); } grpc_chttp2_stream_parsing *grpc_chttp2_parsing_lookup_stream( @@ -498,21 +515,17 @@ grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream( static void lock(grpc_chttp2_transport *t) { gpr_mu_lock(&t->mu); } -static void unlock(grpc_chttp2_transport *t) { - grpc_call_list run = GRPC_CALL_LIST_INIT; - - unlock_check_read_write_state(t); +static void unlock(grpc_chttp2_transport *t, grpc_call_list *call_list) { + unlock_check_read_write_state(t, call_list); if (!t->writing_active && !t->closed && grpc_chttp2_unlocking_check_writes(&t->global, &t->writing)) { t->writing_active = 1; REF_TRANSPORT(t, "writing"); - grpc_call_list_add(&t->global.run_at_unlock, &t->writing_action, 1); + grpc_call_list_add(call_list, &t->writing_action, 1); prevent_endpoint_shutdown(t); } - GPR_SWAP(grpc_call_list, run, t->global.run_at_unlock); gpr_mu_unlock(&t->mu); - grpc_call_list_run(run); } /* @@ -534,52 +547,54 @@ static void push_setting(grpc_chttp2_transport *t, grpc_chttp2_setting_id id, } } -void grpc_chttp2_terminate_writing(void *transport_writing_ptr, int success) { +void grpc_chttp2_terminate_writing(void *transport_writing_ptr, int success, + grpc_call_list *call_list) { grpc_chttp2_transport_writing *transport_writing = transport_writing_ptr; grpc_chttp2_transport *t = TRANSPORT_FROM_WRITING(transport_writing); lock(t); - allow_endpoint_shutdown_locked(t); + allow_endpoint_shutdown_locked(t, call_list); if (!success) { - drop_connection(t); + drop_connection(t, call_list); } /* cleanup writing related jazz */ - grpc_chttp2_cleanup_writing(&t->global, &t->writing); + grpc_chttp2_cleanup_writing(&t->global, &t->writing, call_list); /* leave the writing flag up on shutdown to prevent further writes in unlock() from starting */ t->writing_active = 0; if (t->ep && !t->endpoint_reading) { - destroy_endpoint(t); + destroy_endpoint(t, call_list); } - unlock(t); + unlock(t, call_list); - UNREF_TRANSPORT(t, "writing"); + UNREF_TRANSPORT(t, "writing", call_list); } -static void writing_action(void *gt, int iomgr_success_ignored) { +static void writing_action(void *gt, int iomgr_success_ignored, + grpc_call_list *call_list) { grpc_chttp2_transport *t = gt; - grpc_chttp2_perform_writes(&t->writing, t->ep); + grpc_chttp2_perform_writes(&t->writing, t->ep, call_list); } void grpc_chttp2_add_incoming_goaway( grpc_chttp2_transport_global *transport_global, gpr_uint32 goaway_error, - gpr_slice goaway_text) { + gpr_slice goaway_text, grpc_call_list *call_list) { char *msg = gpr_dump_slice(goaway_text, GPR_DUMP_HEX | GPR_DUMP_ASCII); gpr_log(GPR_DEBUG, "got goaway [%d]: %s", goaway_error, msg); gpr_free(msg); gpr_slice_unref(goaway_text); transport_global->seen_goaway = 1; connectivity_state_set(transport_global, GRPC_CHANNEL_FATAL_FAILURE, - "got_goaway"); + "got_goaway", call_list); } static void maybe_start_some_streams( - grpc_chttp2_transport_global *transport_global) { + grpc_chttp2_transport_global *transport_global, grpc_call_list *call_list) { grpc_chttp2_stream_global *stream_global; /* start streams where we have free grpc_chttp2_stream ids and free * concurrency */ @@ -601,7 +616,7 @@ static void maybe_start_some_streams( if (transport_global->next_stream_id >= MAX_CLIENT_STREAM_ID) { connectivity_state_set(transport_global, GRPC_CHANNEL_TRANSIENT_FAILURE, - "no_more_stream_ids"); + "no_more_stream_ids", call_list); } stream_global->outgoing_window = @@ -631,7 +646,8 @@ static void maybe_start_some_streams( static void perform_stream_op_locked( grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global, grpc_transport_stream_op *op) { + grpc_chttp2_stream_global *stream_global, grpc_transport_stream_op *op, + grpc_call_list *call_list) { if (op->cancel_with_status != GRPC_STATUS_OK) { cancel_from_api(transport_global, stream_global, op->cancel_with_status); } @@ -658,14 +674,13 @@ static void perform_stream_op_locked( transport_global->is_client ? "CLI" : "SVR", stream_global)); grpc_chttp2_list_add_waiting_for_concurrency(transport_global, stream_global); - maybe_start_some_streams(transport_global); + maybe_start_some_streams(transport_global, call_list); } else if (stream_global->outgoing_window > 0) { grpc_chttp2_list_add_writable_stream(transport_global, stream_global); } } else { grpc_sopb_reset(op->send_ops); - grpc_call_list_add(&transport_global->run_at_unlock, - stream_global->send_done_closure, 0); + grpc_call_list_add(call_list, stream_global->send_done_closure, 0); } } @@ -700,20 +715,21 @@ static void perform_stream_op_locked( if (op->bind_pollset) { add_to_pollset_locked(TRANSPORT_FROM_GLOBAL(transport_global), - op->bind_pollset); + op->bind_pollset, call_list); } - grpc_call_list_add(&transport_global->run_at_unlock, op->on_consumed, 1); + grpc_call_list_add(call_list, op->on_consumed, 1); } static void perform_stream_op(grpc_transport *gt, grpc_stream *gs, - grpc_transport_stream_op *op) { + grpc_transport_stream_op *op, + grpc_call_list *call_list) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; lock(t); - perform_stream_op_locked(&t->global, &s->global, op); - unlock(t); + perform_stream_op_locked(&t->global, &s->global, op, call_list); + unlock(t, call_list); } static void send_ping_locked(grpc_chttp2_transport *t, grpc_closure *on_recv) { @@ -733,18 +749,19 @@ static void send_ping_locked(grpc_chttp2_transport *t, grpc_closure *on_recv) { gpr_slice_buffer_add(&t->global.qbuf, grpc_chttp2_ping_create(0, p->id)); } -static void perform_transport_op(grpc_transport *gt, grpc_transport_op *op) { +static void perform_transport_op(grpc_transport *gt, grpc_transport_op *op, + grpc_call_list *call_list) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; int close_transport = 0; lock(t); - grpc_call_list_add(&t->global.run_at_unlock, op->on_consumed, 1); + grpc_call_list_add(call_list, op->on_consumed, 1); if (op->on_connectivity_state_change) { grpc_connectivity_state_notify_on_state_change( &t->channel_callback.state_tracker, op->connectivity_state, - op->on_connectivity_state_change, &t->global.run_at_unlock); + op->on_connectivity_state_change, call_list); } if (op->send_goaway) { @@ -763,11 +780,11 @@ static void perform_transport_op(grpc_transport *gt, grpc_transport_op *op) { } if (op->bind_pollset) { - add_to_pollset_locked(t, op->bind_pollset); + add_to_pollset_locked(t, op->bind_pollset, call_list); } if (op->bind_pollset_set) { - add_to_pollset_set_locked(t, op->bind_pollset_set); + add_to_pollset_set_locked(t, op->bind_pollset_set, call_list); } if (op->send_ping) { @@ -775,15 +792,15 @@ static void perform_transport_op(grpc_transport *gt, grpc_transport_op *op) { } if (op->disconnect) { - close_transport_locked(t); + close_transport_locked(t, call_list); } - unlock(t); + unlock(t, call_list); if (close_transport) { lock(t); - close_transport_locked(t); - unlock(t); + close_transport_locked(t, call_list); + unlock(t, call_list); } } @@ -799,7 +816,8 @@ static grpc_stream_state compute_state(gpr_uint8 write_closed, return GRPC_STREAM_OPEN; } -static void remove_stream(grpc_chttp2_transport *t, gpr_uint32 id) { +static void remove_stream(grpc_chttp2_transport *t, gpr_uint32 id, + grpc_call_list *call_list) { size_t new_stream_count; grpc_chttp2_stream *s = grpc_chttp2_stream_map_delete(&t->parsing_stream_map, id); @@ -814,7 +832,7 @@ static void remove_stream(grpc_chttp2_transport *t, gpr_uint32 id) { grpc_chttp2_parsing_become_skip_parser(&t->parsing); } if (grpc_chttp2_unregister_stream(t, s) && t->global.sent_goaway) { - close_transport_locked(t); + close_transport_locked(t, call_list); } new_stream_count = grpc_chttp2_stream_map_size(&t->parsing_stream_map) + @@ -822,11 +840,12 @@ static void remove_stream(grpc_chttp2_transport *t, gpr_uint32 id) { GPR_ASSERT(new_stream_count <= GPR_UINT32_MAX); if (new_stream_count != t->global.concurrent_stream_count) { t->global.concurrent_stream_count = (gpr_uint32)new_stream_count; - maybe_start_some_streams(&t->global); + maybe_start_some_streams(&t->global, call_list); } } -static void unlock_check_read_write_state(grpc_chttp2_transport *t) { +static void unlock_check_read_write_state(grpc_chttp2_transport *t, + grpc_call_list *call_list) { grpc_chttp2_transport_global *transport_global = &t->global; grpc_chttp2_stream_global *stream_global; grpc_stream_state state; @@ -840,7 +859,7 @@ static void unlock_check_read_write_state(grpc_chttp2_transport *t) { GPR_ASSERT(stream_global->in_stream_map); GPR_ASSERT(stream_global->write_state != GRPC_WRITE_STATE_OPEN); GPR_ASSERT(stream_global->read_closed); - remove_stream(t, stream_global->id); + remove_stream(t, stream_global->id, call_list); grpc_chttp2_list_add_read_write_state_changed(transport_global, stream_global); } @@ -866,8 +885,7 @@ static void unlock_check_read_write_state(grpc_chttp2_transport *t) { if (stream_global->outgoing_sopb != NULL) { grpc_sopb_reset(stream_global->outgoing_sopb); stream_global->outgoing_sopb = NULL; - grpc_call_list_add(&transport_global->run_at_unlock, - stream_global->send_done_closure, 1); + grpc_call_list_add(call_list, stream_global->send_done_closure, 1); } stream_global->read_closed = 1; if (!stream_global->published_cancelled) { @@ -889,7 +907,7 @@ static void unlock_check_read_write_state(grpc_chttp2_transport *t) { grpc_chttp2_list_add_closed_waiting_for_parsing(transport_global, stream_global); } else { - remove_stream(t, stream_global->id); + remove_stream(t, stream_global->id, call_list); } } if (!stream_global->publish_sopb) { @@ -917,8 +935,7 @@ static void unlock_check_read_write_state(grpc_chttp2_transport *t) { &stream_global->outstanding_metadata); grpc_sopb_swap(stream_global->publish_sopb, &stream_global->incoming_sopb); stream_global->published_state = *stream_global->publish_state = state; - grpc_call_list_add(&transport_global->run_at_unlock, - stream_global->recv_done_closure, 1); + grpc_call_list_add(call_list, stream_global->recv_done_closure, 1); stream_global->recv_done_closure = NULL; stream_global->publish_sopb = NULL; stream_global->publish_state = NULL; @@ -1053,8 +1070,9 @@ static void end_all_the_calls(grpc_chttp2_transport *t) { grpc_chttp2_for_all_streams(&t->global, NULL, cancel_stream_cb); } -static void drop_connection(grpc_chttp2_transport *t) { - close_transport_locked(t); +static void drop_connection(grpc_chttp2_transport *t, + grpc_call_list *call_list) { + close_transport_locked(t, call_list); end_all_the_calls(t); } @@ -1079,17 +1097,19 @@ static void update_global_window(void *args, gpr_uint32 id, void *stream) { } } -static void read_error_locked(grpc_chttp2_transport *t) { +static void read_error_locked(grpc_chttp2_transport *t, + grpc_call_list *call_list) { t->endpoint_reading = 0; if (!t->writing_active && t->ep) { - destroy_endpoint(t); + destroy_endpoint(t, call_list); } } /* tcp read callback */ -static int recv_data_loop(grpc_chttp2_transport *t, int *success) { +static void recv_data(void *tp, int success, grpc_call_list *call_list) { size_t i; int keep_reading = 0; + grpc_chttp2_transport *t = tp; lock(t); i = 0; @@ -1102,12 +1122,13 @@ static int recv_data_loop(grpc_chttp2_transport *t, int *success) { grpc_chttp2_prepare_to_read(&t->global, &t->parsing); gpr_mu_unlock(&t->mu); for (; i < t->read_buffer.count && - grpc_chttp2_perform_read(&t->parsing, t->read_buffer.slices[i]); + grpc_chttp2_perform_read(&t->parsing, t->read_buffer.slices[i], + call_list); i++) ; gpr_mu_lock(&t->mu); if (i != t->read_buffer.count) { - drop_connection(t); + drop_connection(t, call_list); } /* merge stream lists */ grpc_chttp2_stream_map_move_into(&t->new_stream_map, @@ -1120,52 +1141,27 @@ static int recv_data_loop(grpc_chttp2_transport *t, int *success) { t->parsing.initial_window_update = 0; } /* handle higher level things */ - grpc_chttp2_publish_reads(&t->global, &t->parsing); + grpc_chttp2_publish_reads(&t->global, &t->parsing, call_list); t->parsing_active = 0; } - if (!*success || i != t->read_buffer.count) { - drop_connection(t); - read_error_locked(t); + if (!success || i != t->read_buffer.count) { + drop_connection(t, call_list); + read_error_locked(t, call_list); } else if (!t->closed) { keep_reading = 1; REF_TRANSPORT(t, "keep_reading"); prevent_endpoint_shutdown(t); } gpr_slice_buffer_reset_and_unref(&t->read_buffer); - unlock(t); + unlock(t, call_list); if (keep_reading) { - int ret = -1; - switch (grpc_endpoint_read(t->ep, &t->read_buffer, &t->recv_data)) { - case GRPC_ENDPOINT_DONE: - *success = 1; - ret = 1; - break; - case GRPC_ENDPOINT_ERROR: - *success = 0; - ret = 1; - break; - case GRPC_ENDPOINT_PENDING: - ret = 0; - break; - } - allow_endpoint_shutdown_unlocked(t); - UNREF_TRANSPORT(t, "keep_reading"); - return ret; + grpc_endpoint_read(t->ep, &t->read_buffer, &t->recv_data, call_list); + allow_endpoint_shutdown_unlocked(t, call_list); + UNREF_TRANSPORT(t, "keep_reading", call_list); } else { - UNREF_TRANSPORT(t, "recv_data"); - return 0; + UNREF_TRANSPORT(t, "recv_data", call_list); } - - gpr_log(GPR_ERROR, "should never reach here"); - abort(); -} - -static void recv_data(void *tp, int success) { - grpc_chttp2_transport *t = tp; - - while (recv_data_loop(t, &success)) - ; } /* @@ -1174,12 +1170,13 @@ static void recv_data(void *tp, int success) { static void connectivity_state_set( grpc_chttp2_transport_global *transport_global, - grpc_connectivity_state state, const char *reason) { + grpc_connectivity_state state, const char *reason, + grpc_call_list *call_list) { GRPC_CHTTP2_IF_TRACING( gpr_log(GPR_DEBUG, "set connectivity_state=%d", state)); grpc_connectivity_state_set( &TRANSPORT_FROM_GLOBAL(transport_global)->channel_callback.state_tracker, - state, reason, &transport_global->run_at_unlock); + state, reason, call_list); } /* @@ -1187,16 +1184,18 @@ static void connectivity_state_set( */ static void add_to_pollset_locked(grpc_chttp2_transport *t, - grpc_pollset *pollset) { + grpc_pollset *pollset, + grpc_call_list *call_list) { if (t->ep) { - grpc_endpoint_add_to_pollset(t->ep, pollset); + grpc_endpoint_add_to_pollset(t->ep, pollset, call_list); } } static void add_to_pollset_set_locked(grpc_chttp2_transport *t, - grpc_pollset_set *pollset_set) { + grpc_pollset_set *pollset_set, + grpc_call_list *call_list) { if (t->ep) { - grpc_endpoint_add_to_pollset_set(t->ep, pollset_set); + grpc_endpoint_add_to_pollset_set(t->ep, pollset_set, call_list); } } @@ -1235,7 +1234,7 @@ void grpc_chttp2_flowctl_trace(const char *file, int line, const char *reason, * INTEGRATION GLUE */ -static char *chttp2_get_peer(grpc_transport *t) { +static char *chttp2_get_peer(grpc_transport *t, grpc_call_list *call_list) { return gpr_strdup(((grpc_chttp2_transport *)t)->peer_string); } @@ -1249,16 +1248,17 @@ static const grpc_transport_vtable vtable = {sizeof(grpc_chttp2_stream), grpc_transport *grpc_create_chttp2_transport( const grpc_channel_args *channel_args, grpc_endpoint *ep, grpc_mdctx *mdctx, - grpc_workqueue *workqueue, int is_client) { + int is_client, grpc_call_list *call_list) { grpc_chttp2_transport *t = gpr_malloc(sizeof(grpc_chttp2_transport)); - init_transport(t, channel_args, ep, mdctx, workqueue, is_client != 0); + init_transport(t, channel_args, ep, mdctx, is_client != 0, call_list); return &t->base; } void grpc_chttp2_transport_start_reading(grpc_transport *transport, - gpr_slice *slices, size_t nslices) { + gpr_slice *slices, size_t nslices, + grpc_call_list *call_list) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)transport; REF_TRANSPORT(t, "recv_data"); /* matches unref inside recv_data */ gpr_slice_buffer_addn(&t->read_buffer, slices, nslices); - recv_data(t, 1); + recv_data(t, 1, call_list); } diff --git a/src/core/transport/chttp2_transport.h b/src/core/transport/chttp2_transport.h index fa0d6e4151e..e963e16707b 100644 --- a/src/core/transport/chttp2_transport.h +++ b/src/core/transport/chttp2_transport.h @@ -42,9 +42,10 @@ extern int grpc_flowctl_trace; grpc_transport *grpc_create_chttp2_transport( const grpc_channel_args *channel_args, grpc_endpoint *ep, - grpc_mdctx *metadata_context, int is_client); + grpc_mdctx *metadata_context, int is_client, grpc_call_list *call_list); void grpc_chttp2_transport_start_reading(grpc_transport *transport, - gpr_slice *slices, size_t nslices); + gpr_slice *slices, size_t nslices, + grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_TRANSPORT_H */ diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c index 8b2e1b9b02c..dc8392159b2 100644 --- a/src/core/transport/connectivity_state.c +++ b/src/core/transport/connectivity_state.c @@ -66,7 +66,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_connectivity_state_tracker *tracker, + grpc_call_list *call_list) { int success; grpc_connectivity_state_watcher *w; while ((w = tracker->watchers)) { @@ -78,7 +79,7 @@ void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker) { } else { success = 0; } - w->notify->cb(w->notify->cb_arg, success); + grpc_call_list_add(call_list, w->notify, success); gpr_free(w); } gpr_free(tracker->name); diff --git a/src/core/transport/connectivity_state.h b/src/core/transport/connectivity_state.h index a29c655b4e8..3f92b22d5d0 100644 --- a/src/core/transport/connectivity_state.h +++ b/src/core/transport/connectivity_state.h @@ -61,7 +61,8 @@ extern int grpc_connectivity_state_trace; 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_connectivity_state_tracker *tracker, + grpc_call_list *call_list); /** Set connectivity state; not thread safe; access must be serialized with an * external lock */ diff --git a/src/core/transport/transport.c b/src/core/transport/transport.c index 3f6b93c3e8c..f7c87c1e90b 100644 --- a/src/core/transport/transport.c +++ b/src/core/transport/transport.c @@ -40,48 +40,47 @@ 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_transport *transport, + grpc_call_list *call_list) { + transport->vtable->destroy(transport, call_list); } int grpc_transport_init_stream(grpc_transport *transport, grpc_stream *stream, const void *server_data, - grpc_transport_stream_op *initial_op) { + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list) { return transport->vtable->init_stream(transport, stream, server_data, - initial_op); + initial_op, call_list); } void grpc_transport_perform_stream_op(grpc_transport *transport, grpc_stream *stream, - grpc_transport_stream_op *op) { - transport->vtable->perform_stream_op(transport, stream, op); + grpc_transport_stream_op *op, + grpc_call_list *call_list) { + transport->vtable->perform_stream_op(transport, stream, op, call_list); } -void grpc_transport_perform_op(grpc_transport *transport, - grpc_transport_op *op) { - transport->vtable->perform_op(transport, op); +void grpc_transport_perform_op(grpc_transport *transport, grpc_transport_op *op, + grpc_call_list *call_list) { + transport->vtable->perform_op(transport, op, call_list); } void grpc_transport_destroy_stream(grpc_transport *transport, - grpc_stream *stream) { - transport->vtable->destroy_stream(transport, stream); + grpc_stream *stream, + grpc_call_list *call_list) { + transport->vtable->destroy_stream(transport, stream, call_list); } -char *grpc_transport_get_peer(grpc_transport *transport) { - return transport->vtable->get_peer(transport); +char *grpc_transport_get_peer(grpc_transport *transport, + grpc_call_list *call_list) { + return transport->vtable->get_peer(transport, call_list); } -void grpc_transport_stream_op_finish_with_failure( - grpc_transport_stream_op *op) { - if (op->send_ops) { - op->on_done_send->cb(op->on_done_send->cb_arg, 0); - } - if (op->recv_ops) { - op->on_done_recv->cb(op->on_done_recv->cb_arg, 0); - } - if (op->on_consumed) { - op->on_consumed->cb(op->on_consumed->cb_arg, 0); - } +void grpc_transport_stream_op_finish_with_failure(grpc_transport_stream_op *op, + grpc_call_list *call_list) { + grpc_call_list_add(call_list, op->on_done_recv, 0); + grpc_call_list_add(call_list, op->on_done_send, 0); + grpc_call_list_add(call_list, op->on_consumed, 0); } void grpc_transport_stream_op_add_cancellation(grpc_transport_stream_op *op, @@ -105,11 +104,12 @@ typedef struct { grpc_closure closure; } close_message_data; -static void free_message(void *p, int iomgr_success) { +static void free_message(void *p, int iomgr_success, + grpc_call_list *call_list) { close_message_data *cmd = p; gpr_slice_unref(cmd->message); if (cmd->then_call != NULL) { - cmd->then_call->cb(cmd->then_call->cb_arg, iomgr_success); + cmd->then_call->cb(cmd->then_call->cb_arg, iomgr_success, call_list); } gpr_free(cmd); } diff --git a/src/core/transport/transport.h b/src/core/transport/transport.h index 271891d430a..d5383ad11a4 100644 --- a/src/core/transport/transport.h +++ b/src/core/transport/transport.h @@ -136,7 +136,8 @@ size_t grpc_transport_stream_size(grpc_transport *transport); supplied from the accept_stream callback function */ int grpc_transport_init_stream(grpc_transport *transport, grpc_stream *stream, const void *server_data, - grpc_transport_stream_op *initial_op); + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list); /* Destroy transport data for a stream. @@ -149,9 +150,11 @@ int grpc_transport_init_stream(grpc_transport *transport, grpc_stream *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, - grpc_stream *stream); + grpc_stream *stream, + grpc_call_list *call_list); -void grpc_transport_stream_op_finish_with_failure(grpc_transport_stream_op *op); +void grpc_transport_stream_op_finish_with_failure(grpc_transport_stream_op *op, + grpc_call_list *call_list); void grpc_transport_stream_op_add_cancellation(grpc_transport_stream_op *op, grpc_status_code status); @@ -173,10 +176,11 @@ char *grpc_transport_stream_op_string(grpc_transport_stream_op *op); op - a grpc_transport_stream_op specifying the op to perform */ void grpc_transport_perform_stream_op(grpc_transport *transport, grpc_stream *stream, - grpc_transport_stream_op *op); + grpc_transport_stream_op *op, + grpc_call_list *call_list); -void grpc_transport_perform_op(grpc_transport *transport, - grpc_transport_op *op); +void grpc_transport_perform_op(grpc_transport *transport, grpc_transport_op *op, + grpc_call_list *call_list); /* Send a ping on a transport @@ -191,9 +195,11 @@ 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_transport *transport); +void grpc_transport_destroy(grpc_transport *transport, + grpc_call_list *call_list); /* Get the transports peer */ -char *grpc_transport_get_peer(grpc_transport *transport); +char *grpc_transport_get_peer(grpc_transport *transport, + grpc_call_list *call_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_TRANSPORT_H */ diff --git a/src/core/transport/transport_impl.h b/src/core/transport/transport_impl.h index d3bbdf6c279..9adb16b9411 100644 --- a/src/core/transport/transport_impl.h +++ b/src/core/transport/transport_impl.h @@ -44,23 +44,27 @@ typedef struct grpc_transport_vtable { /* implementation of grpc_transport_init_stream */ int (*init_stream)(grpc_transport *self, grpc_stream *stream, const void *server_data, - grpc_transport_stream_op *initial_op); + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list); /* implementation of grpc_transport_perform_stream_op */ void (*perform_stream_op)(grpc_transport *self, grpc_stream *stream, - grpc_transport_stream_op *op); + grpc_transport_stream_op *op, + grpc_call_list *call_list); /* implementation of grpc_transport_perform_op */ - void (*perform_op)(grpc_transport *self, grpc_transport_op *op); + void (*perform_op)(grpc_transport *self, grpc_transport_op *op, + grpc_call_list *call_list); /* implementation of grpc_transport_destroy_stream */ - void (*destroy_stream)(grpc_transport *self, grpc_stream *stream); + void (*destroy_stream)(grpc_transport *self, grpc_stream *stream, + grpc_call_list *call_list); /* implementation of grpc_transport_destroy */ - void (*destroy)(grpc_transport *self); + void (*destroy)(grpc_transport *self, grpc_call_list *call_list); /* implementation of grpc_transport_get_peer */ - char *(*get_peer)(grpc_transport *self); + char *(*get_peer)(grpc_transport *self, grpc_call_list *call_list); } grpc_transport_vtable; /* an instance of a grpc transport */ diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index e89d5b3d398..fd37fce9761 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -70,9 +70,11 @@ static void server_setup_transport(void *ts, grpc_transport *transport, thd_args *a = ts; static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; - grpc_server_setup_transport(a->server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, workqueue, - grpc_server_get_channel_args(a->server)); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_server_setup_transport( + a->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, + workqueue, grpc_server_get_channel_args(a->server), &call_list); + grpc_call_list_run(&call_list); } void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, @@ -116,9 +118,11 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, a.validator = validator; grpc_server_register_completion_queue(a.server, a.cq, NULL); grpc_server_start(a.server); - transport = grpc_create_chttp2_transport(NULL, sfd.server, mdctx, 0); + transport = + grpc_create_chttp2_transport(NULL, sfd.server, mdctx, 0, &call_list); server_setup_transport(&a, transport, mdctx, workqueue); - grpc_chttp2_transport_start_reading(transport, NULL, 0); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); + grpc_call_list_run(&call_list); /* Bind everything into the same pollset */ grpc_endpoint_add_to_pollset(sfd.client, grpc_cq_pollset(a.cq), &call_list); diff --git a/test/core/channel/channel_stack_test.c b/test/core/channel/channel_stack_test.c index 60129afc43a..07df9212701 100644 --- a/test/core/channel/channel_stack_test.c +++ b/test/core/channel/channel_stack_test.c @@ -44,7 +44,7 @@ static void channel_init_func(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *metadata_context, int is_first, - int is_last) { + int is_last, grpc_call_list *call_list) { GPR_ASSERT(args->num_args == 1); GPR_ASSERT(args->args[0].type == GRPC_ARG_INTEGER); GPR_ASSERT(0 == strcmp(args->args[0].key, "test_key")); @@ -56,26 +56,33 @@ static void channel_init_func(grpc_channel_element *elem, grpc_channel *master, static void call_init_func(grpc_call_element *elem, const void *server_transport_data, - grpc_transport_stream_op *initial_op) { + grpc_transport_stream_op *initial_op, + grpc_call_list *call_list) { ++*(int *)(elem->channel_data); *(int *)(elem->call_data) = 0; } -static void channel_destroy_func(grpc_channel_element *elem) {} +static void channel_destroy_func(grpc_channel_element *elem, + grpc_call_list *call_list) {} -static void call_destroy_func(grpc_call_element *elem) { +static void call_destroy_func(grpc_call_element *elem, + grpc_call_list *call_list) { ++*(int *)(elem->channel_data); } -static void call_func(grpc_call_element *elem, grpc_transport_stream_op *op) { +static void call_func(grpc_call_element *elem, grpc_transport_stream_op *op, + grpc_call_list *call_list) { ++*(int *)(elem->call_data); } -static void channel_func(grpc_channel_element *elem, grpc_transport_op *op) { +static void channel_func(grpc_channel_element *elem, grpc_transport_op *op, + grpc_call_list *call_list) { ++*(int *)(elem->channel_data); } -static char *get_peer(grpc_call_element *elem) { return gpr_strdup("peer"); } +static char *get_peer(grpc_call_element *elem, grpc_call_list *call_list) { + return gpr_strdup("peer"); +} static void test_create_channel_stack(void) { const grpc_channel_filter filter = {call_func, channel_func, @@ -93,6 +100,7 @@ static void test_create_channel_stack(void) { grpc_mdctx *metadata_context; int *channel_data; int *call_data; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; metadata_context = grpc_mdctx_create(); @@ -105,14 +113,14 @@ static void test_create_channel_stack(void) { channel_stack = gpr_malloc(grpc_channel_stack_size(&filters, 1)); grpc_channel_stack_init(&filters, 1, NULL, &chan_args, metadata_context, - channel_stack); + channel_stack, &call_list); GPR_ASSERT(channel_stack->count == 1); channel_elem = grpc_channel_stack_element(channel_stack, 0); channel_data = (int *)channel_elem->channel_data; GPR_ASSERT(*channel_data == 0); call_stack = gpr_malloc(channel_stack->call_stack_size); - grpc_call_stack_init(channel_stack, NULL, NULL, call_stack); + grpc_call_stack_init(channel_stack, NULL, NULL, call_stack, &call_list); GPR_ASSERT(call_stack->count == 1); call_elem = grpc_call_stack_element(call_stack, 0); GPR_ASSERT(call_elem->filter == channel_elem->filter); @@ -121,14 +129,16 @@ static void test_create_channel_stack(void) { GPR_ASSERT(*call_data == 0); GPR_ASSERT(*channel_data == 1); - grpc_call_stack_destroy(call_stack); + grpc_call_stack_destroy(call_stack, &call_list); gpr_free(call_stack); GPR_ASSERT(*channel_data == 2); - grpc_channel_stack_destroy(channel_stack); + grpc_channel_stack_destroy(channel_stack, &call_list); gpr_free(channel_stack); grpc_mdctx_unref(metadata_context); + + GPR_ASSERT(grpc_call_list_empty(call_list)); } int main(int argc, char **argv) { diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 04dbf485227..be8132bc967 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -64,9 +64,11 @@ static void server_setup_transport(void *ts, grpc_transport *transport, grpc_end2end_test_fixture *f = ts; static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; - grpc_server_setup_transport(f->server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, g_workqueue, - grpc_server_get_channel_args(f->server)); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_server_setup_transport( + f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, + g_workqueue, grpc_server_get_channel_args(f->server), &call_list); + grpc_call_list_run(&call_list); } typedef struct { @@ -75,16 +77,17 @@ typedef struct { } sp_client_setup; static void client_setup_transport(void *ts, grpc_transport *transport, - grpc_mdctx *mdctx) { + grpc_mdctx *mdctx, + grpc_call_list *call_list) { sp_client_setup *cs = ts; const grpc_channel_filter *filters[] = {&grpc_http_client_filter, &grpc_compress_filter, &grpc_connected_channel_filter}; size_t nfilters = sizeof(filters) / sizeof(*filters); - grpc_channel *channel = - grpc_channel_create_from_filters("socketpair-target", filters, nfilters, - cs->client_args, mdctx, g_workqueue, 1); + grpc_channel *channel = grpc_channel_create_from_filters( + "socketpair-target", filters, nfilters, cs->client_args, mdctx, + g_workqueue, 1, call_list); cs->f->client = channel; @@ -108,20 +111,24 @@ 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_call_list call_list = GRPC_CALL_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; grpc_mdctx *mdctx = grpc_mdctx_create(); sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1); - client_setup_transport(&cs, transport, mdctx); + transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1, + &call_list); + client_setup_transport(&cs, transport, mdctx, &call_list); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(transport, NULL, 0); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); + grpc_call_list_run(&call_list); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_transport *transport; @@ -129,9 +136,11 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, f->server = grpc_server_create_from_filters(NULL, 0, server_args); grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0); + transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0, + &call_list); server_setup_transport(f, transport, mdctx); - grpc_chttp2_transport_start_reading(transport, NULL, 0); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); + grpc_call_list_run(&call_list); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index b661dbfd603..08f918cbad2 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -63,9 +63,11 @@ static void server_setup_transport(void *ts, grpc_transport *transport, grpc_end2end_test_fixture *f = ts; static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; - grpc_server_setup_transport(f->server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, g_workqueue, - grpc_server_get_channel_args(f->server)); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_server_setup_transport( + f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, + g_workqueue, grpc_server_get_channel_args(f->server), &call_list); + grpc_call_list_run(&call_list); } typedef struct { @@ -74,16 +76,17 @@ typedef struct { } sp_client_setup; static void client_setup_transport(void *ts, grpc_transport *transport, - grpc_mdctx *mdctx) { + grpc_mdctx *mdctx, + grpc_call_list *call_list) { sp_client_setup *cs = ts; const grpc_channel_filter *filters[] = {&grpc_http_client_filter, &grpc_compress_filter, &grpc_connected_channel_filter}; size_t nfilters = sizeof(filters) / sizeof(*filters); - grpc_channel *channel = - grpc_channel_create_from_filters("socketpair-target", filters, nfilters, - cs->client_args, mdctx, g_workqueue, 1); + grpc_channel *channel = grpc_channel_create_from_filters( + "socketpair-target", filters, nfilters, cs->client_args, mdctx, + g_workqueue, 1, call_list); cs->f->client = channel; @@ -107,20 +110,24 @@ 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_call_list call_list = GRPC_CALL_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; grpc_mdctx *mdctx = grpc_mdctx_create(); sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1); - client_setup_transport(&cs, transport, mdctx); + transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1, + &call_list); + client_setup_transport(&cs, transport, mdctx, &call_list); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(transport, NULL, 0); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); + grpc_call_list_run(&call_list); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_transport *transport; @@ -128,9 +135,11 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, f->server = grpc_server_create_from_filters(NULL, 0, server_args); grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0); + transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0, + &call_list); server_setup_transport(f, transport, mdctx); - grpc_chttp2_transport_start_reading(transport, NULL, 0); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); + grpc_call_list_run(&call_list); } 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 6cf656bcde0..46ffaff745f 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -63,9 +63,11 @@ static void server_setup_transport(void *ts, grpc_transport *transport, grpc_end2end_test_fixture *f = ts; static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; - grpc_server_setup_transport(f->server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, g_workqueue, - grpc_server_get_channel_args(f->server)); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_server_setup_transport( + f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, + g_workqueue, grpc_server_get_channel_args(f->server), &call_list); + grpc_call_list_run(&call_list); } typedef struct { @@ -74,16 +76,17 @@ typedef struct { } sp_client_setup; static void client_setup_transport(void *ts, grpc_transport *transport, - grpc_mdctx *mdctx) { + grpc_mdctx *mdctx, + grpc_call_list *call_list) { sp_client_setup *cs = ts; const grpc_channel_filter *filters[] = {&grpc_http_client_filter, &grpc_compress_filter, &grpc_connected_channel_filter}; size_t nfilters = sizeof(filters) / sizeof(*filters); - grpc_channel *channel = - grpc_channel_create_from_filters("socketpair-target", filters, nfilters, - cs->client_args, mdctx, g_workqueue, 1); + grpc_channel *channel = grpc_channel_create_from_filters( + "socketpair-target", filters, nfilters, cs->client_args, mdctx, + g_workqueue, 1, call_list); cs->f->client = channel; @@ -107,20 +110,24 @@ 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_call_list call_list = GRPC_CALL_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; grpc_mdctx *mdctx = grpc_mdctx_create(); sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1); - client_setup_transport(&cs, transport, mdctx); + transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1, + &call_list); + client_setup_transport(&cs, transport, mdctx, &call_list); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(transport, NULL, 0); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); + grpc_call_list_run(&call_list); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_transport *transport; @@ -128,9 +135,11 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, f->server = grpc_server_create_from_filters(NULL, 0, server_args); grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0); + transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0, + &call_list); server_setup_transport(f, transport, mdctx); - grpc_chttp2_transport_start_reading(transport, NULL, 0); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); + grpc_call_list_run(&call_list); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { diff --git a/test/core/httpcli/httpcli_test.c b/test/core/httpcli/httpcli_test.c index cf2b10c021a..bcb544e5028 100644 --- a/test/core/httpcli/httpcli_test.c +++ b/test/core/httpcli/httpcli_test.c @@ -53,7 +53,8 @@ static gpr_timespec n_seconds_time(int seconds) { return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(seconds); } -static void on_finish(void *arg, const grpc_httpcli_response *response) { +static void on_finish(void *arg, const grpc_httpcli_response *response, + grpc_call_list *call_list) { const char *expect = "Hello world!" "

This is a test

"; @@ -71,6 +72,7 @@ static void on_finish(void *arg, const grpc_httpcli_response *response) { static void test_get(int use_ssl, int port) { grpc_httpcli_request req; char *host; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; g_done = 0; gpr_log(GPR_INFO, "running %s with use_ssl=%d.", "test_get", use_ssl); @@ -84,12 +86,15 @@ static void test_get(int use_ssl, int port) { req.handshaker = use_ssl ? &grpc_httpcli_ssl : &grpc_httpcli_plaintext; grpc_httpcli_get(&g_context, &g_pollset, &req, n_seconds_time(15), on_finish, - (void *)42); + (void *)42, &call_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (!g_done) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - n_seconds_time(20)); + n_seconds_time(20), &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); gpr_free(host); @@ -98,6 +103,7 @@ static void test_get(int use_ssl, int port) { static void test_post(int use_ssl, int port) { grpc_httpcli_request req; char *host; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; g_done = 0; gpr_log(GPR_INFO, "running %s with use_ssl=%d.", "test_post", (int)use_ssl); @@ -111,20 +117,27 @@ static void test_post(int use_ssl, int port) { req.handshaker = use_ssl ? &grpc_httpcli_ssl : &grpc_httpcli_plaintext; grpc_httpcli_post(&g_context, &g_pollset, &req, "hello", 5, - n_seconds_time(15), on_finish, (void *)42); + n_seconds_time(15), on_finish, (void *)42, &call_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (!g_done) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - n_seconds_time(20)); + n_seconds_time(20), &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); gpr_free(host); } -static void destroy_pollset(void *ignored) { grpc_pollset_destroy(&g_pollset); } +static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { + grpc_pollset_destroy(p); +} int main(int argc, char **argv) { + grpc_closure destroyed; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_subprocess *server; char *me = argv[0]; char *lslash = strrchr(me, '/'); @@ -161,7 +174,9 @@ int main(int argc, char **argv) { test_post(0, port); grpc_httpcli_context_destroy(&g_context); - grpc_pollset_shutdown(&g_pollset, destroy_pollset, NULL); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); + grpc_call_list_run(&call_list); grpc_shutdown(); gpr_subprocess_destroy(server); diff --git a/test/core/iomgr/alarm_list_test.c b/test/core/iomgr/alarm_list_test.c index 56d662e61a3..8082532434c 100644 --- a/test/core/iomgr/alarm_list_test.c +++ b/test/core/iomgr/alarm_list_test.c @@ -42,11 +42,8 @@ #define MAX_CB 30 static int cb_called[MAX_CB][2]; -static int kicks; -void grpc_kick_poller(void) { ++kicks; } - -static void cb(void *arg, int success) { +static void cb(void *arg, int success, grpc_call_list *call_list) { cb_called[(gpr_intptr)arg][success]++; } @@ -54,6 +51,7 @@ static void add_test(void) { gpr_timespec start = gpr_now(GPR_CLOCK_REALTIME); int i; grpc_alarm alarms[20]; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_alarm_list_init(start); memset(cb_called, 0, sizeof(cb_called)); @@ -62,55 +60,56 @@ static void add_test(void) { for (i = 0; i < 10; i++) { grpc_alarm_init(&alarms[i], gpr_time_add(start, gpr_time_from_millis(10, GPR_TIMESPAN)), - cb, (void *)(gpr_intptr)i, start); + cb, (void *)(gpr_intptr)i, start, &call_list); } /* 1010 ms alarms. will expire in the next epoch */ for (i = 10; i < 20; i++) { grpc_alarm_init(&alarms[i], gpr_time_add(start, gpr_time_from_millis( 1010, GPR_TIMESPAN)), - cb, (void *)(gpr_intptr)i, start); + cb, (void *)(gpr_intptr)i, start, &call_list); } /* collect alarms. Only the first batch should be ready. */ - GPR_ASSERT(10 == grpc_alarm_check(NULL, - gpr_time_add(start, gpr_time_from_millis( + GPR_ASSERT(10 == grpc_alarm_check(gpr_time_add(start, gpr_time_from_millis( 500, GPR_TIMESPAN)), - NULL)); + NULL, &call_list)); + grpc_call_list_run(&call_list); for (i = 0; i < 20; i++) { GPR_ASSERT(cb_called[i][1] == (i < 10)); GPR_ASSERT(cb_called[i][0] == 0); } - GPR_ASSERT(0 == grpc_alarm_check( - NULL, gpr_time_add( - start, gpr_time_from_millis(600, GPR_TIMESPAN)), - NULL)); + GPR_ASSERT(0 == grpc_alarm_check(gpr_time_add(start, gpr_time_from_millis( + 600, GPR_TIMESPAN)), + NULL, &call_list)); + grpc_call_list_run(&call_list); 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 alarms */ - GPR_ASSERT( - 10 == grpc_alarm_check(NULL, gpr_time_add(start, gpr_time_from_millis( - 1500, GPR_TIMESPAN)), - NULL)); + GPR_ASSERT(10 == + grpc_alarm_check( + gpr_time_add(start, gpr_time_from_millis(1500, GPR_TIMESPAN)), + NULL, &call_list)); + grpc_call_list_run(&call_list); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 20)); GPR_ASSERT(cb_called[i][0] == 0); } - GPR_ASSERT(0 == grpc_alarm_check(NULL, - gpr_time_add(start, gpr_time_from_millis( + GPR_ASSERT(0 == grpc_alarm_check(gpr_time_add(start, gpr_time_from_millis( 1600, GPR_TIMESPAN)), - NULL)); + NULL, &call_list)); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 20)); GPR_ASSERT(cb_called[i][0] == 0); } - grpc_alarm_list_shutdown(); + grpc_alarm_list_shutdown(&call_list); + grpc_call_list_run(&call_list); } static gpr_timespec tfm(int m) { @@ -122,28 +121,32 @@ static gpr_timespec tfm(int m) { /* Cleaning up a list with pending alarms. */ void destruction_test(void) { grpc_alarm alarms[5]; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_alarm_list_init(gpr_time_0(GPR_CLOCK_REALTIME)); memset(cb_called, 0, sizeof(cb_called)); grpc_alarm_init(&alarms[0], tfm(100), cb, (void *)(gpr_intptr)0, - gpr_time_0(GPR_CLOCK_REALTIME)); + gpr_time_0(GPR_CLOCK_REALTIME), &call_list); grpc_alarm_init(&alarms[1], tfm(3), cb, (void *)(gpr_intptr)1, - gpr_time_0(GPR_CLOCK_REALTIME)); + gpr_time_0(GPR_CLOCK_REALTIME), &call_list); grpc_alarm_init(&alarms[2], tfm(100), cb, (void *)(gpr_intptr)2, - gpr_time_0(GPR_CLOCK_REALTIME)); + gpr_time_0(GPR_CLOCK_REALTIME), &call_list); grpc_alarm_init(&alarms[3], tfm(3), cb, (void *)(gpr_intptr)3, - gpr_time_0(GPR_CLOCK_REALTIME)); + gpr_time_0(GPR_CLOCK_REALTIME), &call_list); grpc_alarm_init(&alarms[4], tfm(1), cb, (void *)(gpr_intptr)4, - gpr_time_0(GPR_CLOCK_REALTIME)); - GPR_ASSERT(1 == grpc_alarm_check(NULL, tfm(2), NULL)); + gpr_time_0(GPR_CLOCK_REALTIME), &call_list); + GPR_ASSERT(1 == grpc_alarm_check(tfm(2), NULL, &call_list)); + grpc_call_list_run(&call_list); GPR_ASSERT(1 == cb_called[4][1]); - grpc_alarm_cancel(&alarms[0]); - grpc_alarm_cancel(&alarms[3]); + grpc_alarm_cancel(&alarms[0], &call_list); + grpc_alarm_cancel(&alarms[3], &call_list); + grpc_call_list_run(&call_list); GPR_ASSERT(1 == cb_called[0][0]); GPR_ASSERT(1 == cb_called[3][0]); - grpc_alarm_list_shutdown(); + grpc_alarm_list_shutdown(&call_list); + grpc_call_list_run(&call_list); GPR_ASSERT(1 == cb_called[1][0]); GPR_ASSERT(1 == cb_called[2][0]); } diff --git a/test/core/iomgr/alarm_test.c b/test/core/iomgr/alarm_test.c index eafac0dc46f..bfced834097 100644 --- a/test/core/iomgr/alarm_test.c +++ b/test/core/iomgr/alarm_test.c @@ -65,7 +65,8 @@ typedef struct { } alarm_arg; /* Called when an alarm expires. */ -static void alarm_cb(void *arg /* alarm_arg */, int success) { +static void alarm_cb(void *arg /* alarm_arg */, int success, + grpc_call_list *call_list) { alarm_arg *a = arg; gpr_mu_lock(&a->mu); if (success) { @@ -90,6 +91,7 @@ static void test_grpc_alarm(void) { */ gpr_timespec alarm_deadline; gpr_timespec followup_deadline; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; alarm_arg arg; alarm_arg arg2; @@ -107,7 +109,7 @@ static void test_grpc_alarm(void) { gpr_event_init(&arg.fcb_arg); grpc_alarm_init(&alarm, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(100), alarm_cb, &arg, - gpr_now(GPR_CLOCK_MONOTONIC)); + gpr_now(GPR_CLOCK_MONOTONIC), &call_list); alarm_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1); gpr_mu_lock(&arg.mu); @@ -157,8 +159,8 @@ static void test_grpc_alarm(void) { gpr_event_init(&arg2.fcb_arg); grpc_alarm_init(&alarm_to_cancel, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(100), - alarm_cb, &arg2, gpr_now(GPR_CLOCK_MONOTONIC)); - grpc_alarm_cancel(&alarm_to_cancel); + alarm_cb, &arg2, gpr_now(GPR_CLOCK_MONOTONIC), &call_list); + grpc_alarm_cancel(&alarm_to_cancel, &call_list); alarm_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1); gpr_mu_lock(&arg2.mu); diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c index 9fe54771bd5..491effd5ae2 100644 --- a/test/core/iomgr/endpoint_pair_test.c +++ b/test/core/iomgr/endpoint_pair_test.c @@ -43,20 +43,20 @@ #include "test/core/iomgr/endpoint_tests.h" static grpc_pollset g_pollset; -static grpc_workqueue *g_workqueue; static void clean_up(void) {} static grpc_endpoint_test_fixture create_fixture_endpoint_pair( size_t slice_size) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_endpoint_test_fixture f; - grpc_endpoint_pair p = - grpc_iomgr_create_endpoint_pair("test", slice_size, g_workqueue); + grpc_endpoint_pair p = grpc_iomgr_create_endpoint_pair("test", slice_size); 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(f.client_ep, &g_pollset, &call_list); + grpc_endpoint_add_to_pollset(f.server_ep, &g_pollset, &call_list); + grpc_call_list_run(&call_list); return f; } @@ -65,16 +65,20 @@ static grpc_endpoint_test_config configs[] = { {"tcp/tcp_socketpair", create_fixture_endpoint_pair, clean_up}, }; -static void destroy_pollset(void *p) { grpc_pollset_destroy(p); } +static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { + grpc_pollset_destroy(p); +} int main(int argc, char **argv) { + grpc_closure destroyed; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_test_init(argc, argv); grpc_init(); grpc_pollset_init(&g_pollset); - g_workqueue = grpc_workqueue_create(); grpc_endpoint_tests(configs[0], &g_pollset); - grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); - GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); + grpc_call_list_run(&call_list); grpc_shutdown(); return 0; diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index a5079f17a53..02618dfd667 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -243,9 +243,10 @@ static void read_and_write_test(grpc_endpoint_test_config config, grpc_pollset_worker worker; GPR_ASSERT(gpr_time_cmp(gpr_now(GPR_CLOCK_MONOTONIC), deadline) < 0); grpc_pollset_work(g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline); + deadline, &call_list); } gpr_mu_unlock(GRPC_POLLSET_MU(g_pollset)); + grpc_call_list_run(&call_list); end_test(config); gpr_slice_buffer_destroy(&state.outgoing); diff --git a/test/core/iomgr/fd_conservation_posix_test.c b/test/core/iomgr/fd_conservation_posix_test.c index 30852050ceb..a1b1171b07d 100644 --- a/test/core/iomgr/fd_conservation_posix_test.c +++ b/test/core/iomgr/fd_conservation_posix_test.c @@ -43,11 +43,9 @@ int main(int argc, char **argv) { int i; struct rlimit rlim; grpc_endpoint_pair p; - grpc_workqueue *workqueue; grpc_test_init(argc, argv); grpc_iomgr_init(); - workqueue = grpc_workqueue_create(); /* set max # of file descriptors to a low value, and verify we can create and destroy many more than this number @@ -56,12 +54,13 @@ int main(int argc, char **argv) { GPR_ASSERT(0 == setrlimit(RLIMIT_NOFILE, &rlim)); for (i = 0; i < 100; i++) { - p = grpc_iomgr_create_endpoint_pair("test", 1, workqueue); - grpc_endpoint_destroy(p.client); - grpc_endpoint_destroy(p.server); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + p = grpc_iomgr_create_endpoint_pair("test", 1); + grpc_endpoint_destroy(p.client, &call_list); + grpc_endpoint_destroy(p.server, &call_list); + grpc_call_list_run(&call_list); } - GRPC_WORKQUEUE_UNREF(workqueue, "destroy"); grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index ae6b56da772..f89d6c78248 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -52,7 +52,6 @@ #include "test/core/util/test_config.h" static grpc_pollset g_pollset; -static grpc_workqueue *g_workqueue; /* buffer size used to send and receive data. 1024 is the minimal value to set TCP send and receive buffer. */ @@ -119,18 +118,18 @@ 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*/ - int success) { + int success, grpc_call_list *call_list) { session *se = arg; server *sv = se->sv; - grpc_fd_orphan(se->em_fd, NULL, "a"); + grpc_fd_orphan(se->em_fd, NULL, "a", call_list); gpr_free(se); /* Start to shutdown listen fd. */ - grpc_fd_shutdown(sv->em_fd); + grpc_fd_shutdown(sv->em_fd, call_list); } /* Called when data become readable in a session. */ static void session_read_cb(void *arg, /*session*/ - int success) { + int success, grpc_call_list *call_list) { session *se = arg; int fd = se->em_fd->fd; @@ -138,7 +137,7 @@ static void session_read_cb(void *arg, /*session*/ ssize_t read_total = 0; if (!success) { - session_shutdown_cb(arg, 1); + session_shutdown_cb(arg, 1, call_list); return; } @@ -153,7 +152,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(arg, 1, call_list); } else if (read_once == -1) { if (errno == EAGAIN) { /* An edge triggered event is cached in the kernel until next poll. @@ -164,7 +163,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(se->em_fd, &se->session_read_closure, call_list); } else { gpr_log(GPR_ERROR, "Unhandled read error %s", strerror(errno)); abort(); @@ -174,10 +173,11 @@ 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(void *arg /*server*/, int success, + grpc_call_list *call_list) { server *sv = arg; - grpc_fd_orphan(sv->em_fd, NULL, "b"); + grpc_fd_orphan(sv->em_fd, NULL, "b", call_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); sv->done = 1; @@ -187,7 +187,7 @@ static void listen_shutdown_cb(void *arg /*server*/, int success) { /* Called when a new TCP connection request arrives in the listening port. */ static void listen_cb(void *arg, /*=sv_arg*/ - int success) { + int success, grpc_call_list *call_list) { server *sv = arg; int fd; int flags; @@ -197,7 +197,7 @@ static void listen_cb(void *arg, /*=sv_arg*/ grpc_fd *listen_em_fd = sv->em_fd; if (!success) { - listen_shutdown_cb(arg, 1); + listen_shutdown_cb(arg, 1, call_list); return; } @@ -208,13 +208,13 @@ static void listen_cb(void *arg, /*=sv_arg*/ fcntl(fd, F_SETFL, flags | O_NONBLOCK); se = gpr_malloc(sizeof(*se)); se->sv = sv; - se->em_fd = grpc_fd_create(fd, g_workqueue, "listener"); - grpc_pollset_add_fd(&g_pollset, se->em_fd); + se->em_fd = grpc_fd_create(fd, "listener"); + grpc_pollset_add_fd(&g_pollset, se->em_fd, call_list); se->session_read_closure.cb = session_read_cb; se->session_read_closure.cb_arg = se; - grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure); + grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure, call_list); - grpc_fd_notify_on_read(listen_em_fd, &sv->listen_closure); + grpc_fd_notify_on_read(listen_em_fd, &sv->listen_closure, call_list); } /* Max number of connections pending to be accepted by listen(). */ @@ -224,7 +224,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(server *sv, grpc_call_list *call_list) { int port = 0; int fd; struct sockaddr_in sin; @@ -237,12 +237,12 @@ static int server_start(server *sv) { port = ntohs(sin.sin_port); GPR_ASSERT(listen(fd, MAX_NUM_FD) == 0); - sv->em_fd = grpc_fd_create(fd, g_workqueue, "server"); - grpc_pollset_add_fd(&g_pollset, sv->em_fd); + sv->em_fd = grpc_fd_create(fd, "server"); + grpc_pollset_add_fd(&g_pollset, sv->em_fd, call_list); /* Register to be interested in reading from listen_fd. */ sv->listen_closure.cb = listen_cb; sv->listen_closure.cb_arg = sv; - grpc_fd_notify_on_read(sv->em_fd, &sv->listen_closure); + grpc_fd_notify_on_read(sv->em_fd, &sv->listen_closure, call_list); return port; } @@ -251,9 +251,13 @@ static int server_start(server *sv) { static void server_wait_and_shutdown(server *sv) { gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (!sv->done) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC)); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } @@ -286,23 +290,24 @@ 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(void *arg /*client*/, int success, + grpc_call_list *call_list) { client *cl = arg; - grpc_fd_orphan(cl->em_fd, NULL, "c"); + grpc_fd_orphan(cl->em_fd, NULL, "c", call_list); cl->done = 1; grpc_pollset_kick(&g_pollset, NULL); } /* Write as much as possible, then register notify_on_write. */ static void client_session_write(void *arg, /*client*/ - int success) { + int success, grpc_call_list *call_list) { client *cl = arg; int fd = cl->em_fd->fd; ssize_t write_once = 0; if (!success) { gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - client_session_shutdown_cb(arg, 1); + client_session_shutdown_cb(arg, 1, call_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); return; } @@ -317,10 +322,10 @@ static void client_session_write(void *arg, /*client*/ if (cl->client_write_cnt < CLIENT_TOTAL_WRITE_CNT) { cl->write_closure.cb = client_session_write; cl->write_closure.cb_arg = cl; - grpc_fd_notify_on_write(cl->em_fd, &cl->write_closure); + grpc_fd_notify_on_write(cl->em_fd, &cl->write_closure, call_list); cl->client_write_cnt++; } else { - client_session_shutdown_cb(arg, 1); + client_session_shutdown_cb(arg, 1, call_list); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } else { @@ -330,7 +335,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(client *cl, int port, grpc_call_list *call_list) { int fd; struct sockaddr_in sin; create_test_socket(port, &fd, &sin); @@ -350,10 +355,10 @@ static void client_start(client *cl, int port) { } } - cl->em_fd = grpc_fd_create(fd, g_workqueue, "client"); - grpc_pollset_add_fd(&g_pollset, cl->em_fd); + cl->em_fd = grpc_fd_create(fd, "client"); + grpc_pollset_add_fd(&g_pollset, cl->em_fd, call_list); - client_session_write(cl, 1); + client_session_write(cl, 1, call_list); } /* Wait for the signal to shutdown a client. */ @@ -361,8 +366,12 @@ static void client_wait_and_shutdown(client *cl) { gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (!cl->done) { grpc_pollset_worker worker; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC)); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } @@ -374,11 +383,13 @@ static void test_grpc_fd(void) { server sv; client cl; int port; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; server_init(&sv); - port = server_start(&sv); + port = server_start(&sv, &call_list); client_init(&cl); - client_start(&cl, port); + client_start(&cl, port, &call_list); + grpc_call_list_run(&call_list); client_wait_and_shutdown(&cl); server_wait_and_shutdown(&sv); GPR_ASSERT(sv.read_bytes_total == cl.write_bytes_total); @@ -386,14 +397,15 @@ static void test_grpc_fd(void) { } typedef struct fd_change_data { - void (*cb_that_ran)(void *, int success); + void (*cb_that_ran)(void *, int success, grpc_call_list *call_list); } fd_change_data; 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(void *arg /* fd_change_data */, int success) { +static void first_read_callback(void *arg /* fd_change_data */, int success, + grpc_call_list *call_list) { fd_change_data *fdc = arg; gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -402,7 +414,8 @@ static void first_read_callback(void *arg /* fd_change_data */, int success) { gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } -static void second_read_callback(void *arg /* fd_change_data */, int success) { +static void second_read_callback(void *arg /* fd_change_data */, int success, + grpc_call_list *call_list) { fd_change_data *fdc = arg; gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -424,6 +437,7 @@ static void test_grpc_fd_change(void) { ssize_t result; grpc_closure first_closure; grpc_closure second_closure; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; first_closure.cb = first_read_callback; first_closure.cb_arg = &a; @@ -439,11 +453,11 @@ static void test_grpc_fd_change(void) { flags = fcntl(sv[1], F_GETFL, 0); GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0); - em_fd = grpc_fd_create(sv[0], g_workqueue, "test_grpc_fd_change"); - grpc_pollset_add_fd(&g_pollset, em_fd); + em_fd = grpc_fd_create(sv[0], "test_grpc_fd_change"); + grpc_pollset_add_fd(&g_pollset, em_fd, &call_list); /* Register the first callback, then make its FD readable */ - grpc_fd_notify_on_read(em_fd, &first_closure); + grpc_fd_notify_on_read(em_fd, &first_closure, &call_list); data = 0; result = write(sv[1], &data, 1); GPR_ASSERT(result == 1); @@ -453,7 +467,10 @@ static void test_grpc_fd_change(void) { while (a.cb_that_ran == NULL) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC)); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } GPR_ASSERT(a.cb_that_ran == first_read_callback); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); @@ -464,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(em_fd, &second_closure); + grpc_fd_notify_on_read(em_fd, &second_closure, &call_list); data = 0; result = write(sv[1], &data, 1); GPR_ASSERT(result == 1); @@ -473,29 +490,37 @@ static void test_grpc_fd_change(void) { while (b.cb_that_ran == NULL) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC)); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } /* Except now we verify that second_read_callback ran instead */ GPR_ASSERT(b.cb_that_ran == second_read_callback); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_fd_orphan(em_fd, NULL, "d"); + grpc_fd_orphan(em_fd, NULL, "d", &call_list); + grpc_call_list_run(&call_list); destroy_change_data(&a); destroy_change_data(&b); close(sv[1]); } -static void destroy_pollset(void *p) { grpc_pollset_destroy(p); } +static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { + grpc_pollset_destroy(p); +} int main(int argc, char **argv) { + grpc_closure destroyed; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_test_init(argc, argv); grpc_iomgr_init(); grpc_pollset_init(&g_pollset); - g_workqueue = grpc_workqueue_create(); test_grpc_fd(); test_grpc_fd_change(); - grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); - GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); + grpc_call_list_run(&call_list); grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/resolve_address_test.c b/test/core/iomgr/resolve_address_test.c index 668c5399f90..2ea3b56ee62 100644 --- a/test/core/iomgr/resolve_address_test.c +++ b/test/core/iomgr/resolve_address_test.c @@ -42,14 +42,16 @@ static gpr_timespec test_deadline(void) { return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(100); } -static void must_succeed(void* evp, grpc_resolved_addresses* p) { +static void must_succeed(void* evp, grpc_resolved_addresses* p, + grpc_call_list* call_list) { GPR_ASSERT(p); GPR_ASSERT(p->naddrs >= 1); grpc_resolved_addresses_destroy(p); gpr_event_set(evp, (void*)1); } -static void must_fail(void* evp, grpc_resolved_addresses* p) { +static void must_fail(void* evp, grpc_resolved_addresses* p, + grpc_call_list* call_list) { GPR_ASSERT(!p); gpr_event_set(evp, (void*)1); } diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index 4a6786c0a24..a5a3d0ea7ec 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -49,8 +49,8 @@ static grpc_pollset_set g_pollset_set; static grpc_pollset g_pollset; -static grpc_workqueue *g_workqueue; static int g_connections_complete = 0; +static grpc_endpoint *g_connecting = NULL; static gpr_timespec test_deadline(void) { return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10); @@ -63,15 +63,18 @@ static void finish_connection() { gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } -static void must_succeed(void *arg, grpc_endpoint *tcp) { - GPR_ASSERT(tcp); - grpc_endpoint_shutdown(tcp); - grpc_endpoint_destroy(tcp); +static void must_succeed(void *arg, int success, grpc_call_list *call_list) { + GPR_ASSERT(g_connecting != NULL); + GPR_ASSERT(success); + grpc_endpoint_shutdown(g_connecting, call_list); + grpc_endpoint_destroy(g_connecting, call_list); + g_connecting = NULL; finish_connection(); } -static void must_fail(void *arg, grpc_endpoint *tcp) { - GPR_ASSERT(!tcp); +static void must_fail(void *arg, int success, grpc_call_list *call_list) { + GPR_ASSERT(g_connecting == NULL); + GPR_ASSERT(!success); finish_connection(); } @@ -81,6 +84,8 @@ void test_succeeds(void) { int svr_fd; int r; int connections_complete_before; + grpc_closure done; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_log(GPR_DEBUG, "test_succeeds"); @@ -99,9 +104,10 @@ void test_succeeds(void) { /* connect to it */ GPR_ASSERT(getsockname(svr_fd, (struct sockaddr *)&addr, &addr_len) == 0); - grpc_tcp_client_connect(must_succeed, NULL, &g_pollset_set, g_workqueue, + grpc_closure_init(&done, must_succeed, NULL); + grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, (struct sockaddr *)&addr, addr_len, - gpr_inf_future(GPR_CLOCK_REALTIME)); + gpr_inf_future(GPR_CLOCK_REALTIME), &call_list); /* await the connection */ do { @@ -116,7 +122,10 @@ void test_succeeds(void) { while (g_connections_complete == connections_complete_before) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5)); + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); @@ -126,6 +135,8 @@ void test_fails(void) { struct sockaddr_in addr; socklen_t addr_len = sizeof(addr); int connections_complete_before; + grpc_closure done; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_log(GPR_DEBUG, "test_fails"); @@ -137,9 +148,10 @@ void test_fails(void) { gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); /* connect to a broken address */ - grpc_tcp_client_connect(must_fail, NULL, &g_pollset_set, g_workqueue, + grpc_closure_init(&done, must_fail, NULL); + grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, (struct sockaddr *)&addr, addr_len, - gpr_inf_future(GPR_CLOCK_REALTIME)); + gpr_inf_future(GPR_CLOCK_REALTIME), &call_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -147,7 +159,10 @@ void test_fails(void) { while (g_connections_complete == connections_complete_before) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - test_deadline()); + test_deadline(), &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); @@ -163,6 +178,8 @@ void test_times_out(void) { int r; int connections_complete_before; gpr_timespec connect_deadline; + grpc_closure done; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_log(GPR_DEBUG, "test_times_out"); @@ -196,8 +213,10 @@ void test_times_out(void) { connections_complete_before = g_connections_complete; gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_tcp_client_connect(must_fail, NULL, &g_pollset_set, g_workqueue, - (struct sockaddr *)&addr, addr_len, connect_deadline); + grpc_closure_init(&done, must_fail, NULL); + grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, + (struct sockaddr *)&addr, addr_len, connect_deadline, + &call_list); /* Make sure the event doesn't trigger early */ gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -222,7 +241,10 @@ void test_times_out(void) { connections_complete_before + is_after_deadline); } grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10)); + GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10), &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); @@ -232,22 +254,27 @@ void test_times_out(void) { } } -static void destroy_pollset(void *p) { grpc_pollset_destroy(p); } +static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { + grpc_pollset_destroy(p); +} int main(int argc, char **argv) { + grpc_closure destroyed; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_test_init(argc, argv); grpc_init(); grpc_pollset_set_init(&g_pollset_set); grpc_pollset_init(&g_pollset); - grpc_pollset_set_add_pollset(&g_pollset_set, &g_pollset); - g_workqueue = grpc_workqueue_create(); + grpc_pollset_set_add_pollset(&g_pollset_set, &g_pollset, &call_list); + grpc_call_list_run(&call_list); test_succeeds(); gpr_log(GPR_ERROR, "End of first test"); test_fails(); test_times_out(); grpc_pollset_set_destroy(&g_pollset_set); - grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); - GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); + grpc_call_list_run(&call_list); grpc_shutdown(); return 0; } diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index 97ebaa05708..3d0ed094c92 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -318,7 +318,8 @@ static void check_metadata(expected_md *expected, grpc_credentials_md *md_elems, static void check_google_iam_metadata(void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status) { + grpc_credentials_status status, + grpc_call_list *call_list) { grpc_credentials *c = (grpc_credentials *)user_data; expected_md emd[] = {{GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, test_google_iam_authorization_token}, @@ -331,19 +332,23 @@ static void check_google_iam_metadata(void *user_data, } static void test_google_iam_creds(void) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_credentials *creds = grpc_google_iam_credentials_create( test_google_iam_authorization_token, test_google_iam_authority_selector, NULL); GPR_ASSERT(grpc_credentials_has_request_metadata(creds)); GPR_ASSERT(grpc_credentials_has_request_metadata_only(creds)); grpc_credentials_get_request_metadata(creds, NULL, test_service_url, - check_google_iam_metadata, creds); + check_google_iam_metadata, creds, + &call_list); + grpc_call_list_run(&call_list); } static void check_access_token_metadata(void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status) { + grpc_credentials_status status, + grpc_call_list *call_list) { grpc_credentials *c = (grpc_credentials *)user_data; expected_md emd[] = {{GRPC_AUTHORIZATION_METADATA_KEY, "Bearer blah"}}; GPR_ASSERT(status == GRPC_CREDENTIALS_OK); @@ -353,17 +358,22 @@ static void check_access_token_metadata(void *user_data, } static void test_access_token_creds(void) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_credentials *creds = grpc_access_token_credentials_create("blah", NULL); GPR_ASSERT(grpc_credentials_has_request_metadata(creds)); GPR_ASSERT(grpc_credentials_has_request_metadata_only(creds)); GPR_ASSERT(strcmp(creds->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); grpc_credentials_get_request_metadata(creds, NULL, test_service_url, - check_access_token_metadata, creds); + check_access_token_metadata, creds, + &call_list); + grpc_call_list_run(&call_list); } -static void check_ssl_oauth2_composite_metadata( - void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status) { +static void check_ssl_oauth2_composite_metadata(void *user_data, + grpc_credentials_md *md_elems, + size_t num_md, + grpc_credentials_status status, + grpc_call_list *call_list) { grpc_credentials *c = (grpc_credentials *)user_data; expected_md emd[] = { {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}}; @@ -374,6 +384,7 @@ static void check_ssl_oauth2_composite_metadata( } static void test_ssl_oauth2_composite_creds(void) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_credentials *ssl_creds = grpc_ssl_credentials_create(test_root_cert, NULL, NULL); const grpc_credentials_array *creds_array; @@ -395,7 +406,8 @@ static void test_ssl_oauth2_composite_creds(void) { GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); grpc_credentials_get_request_metadata(composite_creds, NULL, test_service_url, check_ssl_oauth2_composite_metadata, - composite_creds); + composite_creds, &call_list); + grpc_call_list_run(&call_list); } void test_ssl_fake_transport_security_composite_creds_failure(void) { @@ -412,7 +424,7 @@ void test_ssl_fake_transport_security_composite_creds_failure(void) { static void check_ssl_oauth2_google_iam_composite_metadata( void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status) { + grpc_credentials_status status, grpc_call_list *call_list) { grpc_credentials *c = (grpc_credentials *)user_data; expected_md emd[] = { {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}, @@ -427,6 +439,7 @@ static void check_ssl_oauth2_google_iam_composite_metadata( } static void test_ssl_oauth2_google_iam_composite_creds(void) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_credentials *ssl_creds = grpc_ssl_credentials_create(test_root_cert, NULL, NULL); const grpc_credentials_array *creds_array; @@ -457,12 +470,16 @@ static void test_ssl_oauth2_google_iam_composite_creds(void) { GRPC_CREDENTIALS_TYPE_IAM) == 0); grpc_credentials_get_request_metadata( composite_creds, NULL, test_service_url, - check_ssl_oauth2_google_iam_composite_metadata, composite_creds); + check_ssl_oauth2_google_iam_composite_metadata, composite_creds, + &call_list); + grpc_call_list_run(&call_list); } -static void on_oauth2_creds_get_metadata_success( - void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status) { +static void on_oauth2_creds_get_metadata_success(void *user_data, + grpc_credentials_md *md_elems, + size_t num_md, + grpc_credentials_status status, + grpc_call_list *call_list) { GPR_ASSERT(status == GRPC_CREDENTIALS_OK); GPR_ASSERT(num_md == 1); GPR_ASSERT(gpr_slice_str_cmp(md_elems[0].key, "Authorization") == 0); @@ -473,9 +490,11 @@ static void on_oauth2_creds_get_metadata_success( GPR_ASSERT(strcmp((const char *)user_data, test_user_data) == 0); } -static void on_oauth2_creds_get_metadata_failure( - void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status) { +static void on_oauth2_creds_get_metadata_failure(void *user_data, + grpc_credentials_md *md_elems, + size_t num_md, + grpc_credentials_status status, + grpc_call_list *call_list) { GPR_ASSERT(status == GRPC_CREDENTIALS_ERROR); GPR_ASSERT(num_md == 0); GPR_ASSERT(user_data != NULL); @@ -497,39 +516,44 @@ static void validate_compute_engine_http_request( static int compute_engine_httpcli_get_success_override( const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data) { + grpc_httpcli_response_cb on_response, void *user_data, + grpc_call_list *call_list) { grpc_httpcli_response response = http_response(200, valid_oauth2_json_response); validate_compute_engine_http_request(request); - on_response(user_data, &response); + on_response(user_data, &response, call_list); return 1; } static int compute_engine_httpcli_get_failure_override( const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data) { + grpc_httpcli_response_cb on_response, void *user_data, + grpc_call_list *call_list) { grpc_httpcli_response response = http_response(403, "Not Authorized."); validate_compute_engine_http_request(request); - on_response(user_data, &response); + on_response(user_data, &response, call_list); return 1; } static int httpcli_post_should_not_be_called( const grpc_httpcli_request *request, const char *body_bytes, size_t body_size, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data) { + grpc_httpcli_response_cb on_response, void *user_data, + grpc_call_list *call_list) { GPR_ASSERT("HTTP POST should not be called" == NULL); return 1; } static int httpcli_get_should_not_be_called( const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data) { + grpc_httpcli_response_cb on_response, void *user_data, + grpc_call_list *call_list) { GPR_ASSERT("HTTP GET should not be called" == NULL); return 1; } static void test_compute_engine_creds_success(void) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_credentials *compute_engine_creds = grpc_google_compute_engine_credentials_create(NULL); GPR_ASSERT(grpc_credentials_has_request_metadata(compute_engine_creds)); @@ -540,20 +564,23 @@ static void test_compute_engine_creds_success(void) { httpcli_post_should_not_be_called); grpc_credentials_get_request_metadata( compute_engine_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_success, (void *)test_user_data); + on_oauth2_creds_get_metadata_success, (void *)test_user_data, &call_list); + grpc_call_list_run(&call_list); /* Second request: the cached token should be served directly. */ grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); grpc_credentials_get_request_metadata( compute_engine_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_success, (void *)test_user_data); + on_oauth2_creds_get_metadata_success, (void *)test_user_data, &call_list); + grpc_call_list_run(&call_list); grpc_credentials_unref(compute_engine_creds); grpc_httpcli_set_override(NULL, NULL); } static void test_compute_engine_creds_failure(void) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_credentials *compute_engine_creds = grpc_google_compute_engine_credentials_create(NULL); grpc_httpcli_set_override(compute_engine_httpcli_get_failure_override, @@ -562,9 +589,10 @@ static void test_compute_engine_creds_failure(void) { GPR_ASSERT(grpc_credentials_has_request_metadata_only(compute_engine_creds)); grpc_credentials_get_request_metadata( compute_engine_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_failure, (void *)test_user_data); + on_oauth2_creds_get_metadata_failure, (void *)test_user_data, &call_list); grpc_credentials_unref(compute_engine_creds); grpc_httpcli_set_override(NULL, NULL); + grpc_call_list_run(&call_list); } static void validate_refresh_token_http_request( @@ -592,25 +620,26 @@ 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, gpr_timespec deadline, grpc_httpcli_response_cb on_response, - void *user_data) { + void *user_data, grpc_call_list *call_list) { grpc_httpcli_response response = http_response(200, valid_oauth2_json_response); validate_refresh_token_http_request(request, body, body_size); - on_response(user_data, &response); + on_response(user_data, &response, call_list); return 1; } static int refresh_token_httpcli_post_failure( const grpc_httpcli_request *request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, - void *user_data) { + void *user_data, grpc_call_list *call_list) { grpc_httpcli_response response = http_response(403, "Not Authorized."); validate_refresh_token_http_request(request, body, body_size); - on_response(user_data, &response); + on_response(user_data, &response, call_list); return 1; } static void test_refresh_token_creds_success(void) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_credentials *refresh_token_creds = grpc_google_refresh_token_credentials_create(test_refresh_token_str, NULL); @@ -622,20 +651,24 @@ static void test_refresh_token_creds_success(void) { refresh_token_httpcli_post_success); grpc_credentials_get_request_metadata( refresh_token_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_success, (void *)test_user_data); + on_oauth2_creds_get_metadata_success, (void *)test_user_data, &call_list); + grpc_call_list_run(&call_list); /* Second request: the cached token should be served directly. */ grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); grpc_credentials_get_request_metadata( refresh_token_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_success, (void *)test_user_data); + on_oauth2_creds_get_metadata_success, (void *)test_user_data, &call_list); + grpc_call_list_run(&call_list); grpc_credentials_unref(refresh_token_creds); grpc_httpcli_set_override(NULL, NULL); + grpc_call_list_run(&call_list); } static void test_refresh_token_creds_failure(void) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_credentials *refresh_token_creds = grpc_google_refresh_token_credentials_create(test_refresh_token_str, NULL); @@ -645,9 +678,10 @@ static void test_refresh_token_creds_failure(void) { GPR_ASSERT(grpc_credentials_has_request_metadata_only(refresh_token_creds)); grpc_credentials_get_request_metadata( refresh_token_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_failure, (void *)test_user_data); + on_oauth2_creds_get_metadata_failure, (void *)test_user_data, &call_list); grpc_credentials_unref(refresh_token_creds); grpc_httpcli_set_override(NULL, NULL); + grpc_call_list_run(&call_list); } static void validate_jwt_encode_and_sign_params( @@ -698,7 +732,8 @@ static char *encode_and_sign_jwt_should_not_be_called( static void on_jwt_creds_get_metadata_success(void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status) { + grpc_credentials_status status, + grpc_call_list *call_list) { char *expected_md_value; gpr_asprintf(&expected_md_value, "Bearer %s", test_signed_jwt); GPR_ASSERT(status == GRPC_CREDENTIALS_OK); @@ -713,7 +748,8 @@ static void on_jwt_creds_get_metadata_success(void *user_data, static void on_jwt_creds_get_metadata_failure(void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status) { + grpc_credentials_status status, + grpc_call_list *call_list) { GPR_ASSERT(status == GRPC_CREDENTIALS_ERROR); GPR_ASSERT(num_md == 0); GPR_ASSERT(user_data != NULL); @@ -722,6 +758,7 @@ static void on_jwt_creds_get_metadata_failure(void *user_data, static void test_jwt_creds_success(void) { char *json_key_string = test_json_key_str(); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_credentials *jwt_creds = grpc_service_account_jwt_access_credentials_create( json_key_string, grpc_max_auth_token_lifetime, NULL); @@ -732,21 +769,24 @@ static void test_jwt_creds_success(void) { grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, - (void *)test_user_data); + (void *)test_user_data, &call_list); + grpc_call_list_run(&call_list); /* Second request: the cached token should be served directly. */ grpc_jwt_encode_and_sign_set_override( encode_and_sign_jwt_should_not_be_called); grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, - (void *)test_user_data); + (void *)test_user_data, &call_list); + grpc_call_list_run(&call_list); /* Third request: Different service url so jwt_encode_and_sign should be called again (no caching). */ grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); grpc_credentials_get_request_metadata(jwt_creds, NULL, other_test_service_url, on_jwt_creds_get_metadata_success, - (void *)test_user_data); + (void *)test_user_data, &call_list); + grpc_call_list_run(&call_list); gpr_free(json_key_string); grpc_credentials_unref(jwt_creds); @@ -755,6 +795,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_call_list call_list = GRPC_CALL_LIST_INIT; grpc_credentials *jwt_creds = grpc_service_account_jwt_access_credentials_create( json_key_string, grpc_max_auth_token_lifetime, NULL); @@ -764,11 +805,12 @@ static void test_jwt_creds_signing_failure(void) { grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_failure); grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_failure, - (void *)test_user_data); + (void *)test_user_data, &call_list); gpr_free(json_key_string); grpc_credentials_unref(jwt_creds); grpc_jwt_encode_and_sign_set_override(NULL); + grpc_call_list_run(&call_list); } static void set_google_default_creds_env_var_with_file_contents( diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c index 5cc8b2e9be6..00a079f54e2 100644 --- a/test/core/security/jwt_verifier_test.c +++ b/test/core/security/jwt_verifier_test.c @@ -276,14 +276,16 @@ 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, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data) { + grpc_httpcli_response_cb on_response, void *user_data, + grpc_call_list *call_list) { GPR_ASSERT("HTTP POST should not be called" == NULL); return 1; } static int httpcli_get_google_keys_for_email( const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data) { + grpc_httpcli_response_cb on_response, void *user_data, + grpc_call_list *call_list) { grpc_httpcli_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); @@ -291,7 +293,7 @@ static int httpcli_get_google_keys_for_email( "/robot/v1/metadata/x509/" "777-abaslkan11hlb6nmim3bpspl31ud@developer." "gserviceaccount.com") == 0); - on_response(user_data, &response); + on_response(user_data, &response, call_list); gpr_free(response.body); return 1; } @@ -307,6 +309,7 @@ static void on_verification_success(void *user_data, } static void test_jwt_verifier_google_email_issuer_success(void) { + grpc_call_list call_list = GRPC_CALL_LIST_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); @@ -320,25 +323,29 @@ static void test_jwt_verifier_google_email_issuer_success(void) { grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != NULL); grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, - on_verification_success, (void *)expected_user_data); + on_verification_success, (void *)expected_user_data, + &call_list); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); + grpc_call_list_run(&call_list); } static int httpcli_get_custom_keys_for_email( const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data) { + grpc_httpcli_response_cb on_response, void *user_data, + grpc_call_list *call_list) { grpc_httpcli_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->path, "/jwk/foo@bar.com") == 0); - on_response(user_data, &response); + on_response(user_data, &response, call_list); gpr_free(response.body); return 1; } static void test_jwt_verifier_custom_email_issuer_success(void) { + grpc_call_list call_list = GRPC_CALL_LIST_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); @@ -352,21 +359,23 @@ static void test_jwt_verifier_custom_email_issuer_success(void) { grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != NULL); grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, - on_verification_success, (void *)expected_user_data); + on_verification_success, (void *)expected_user_data, + &call_list); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); + grpc_call_list_run(&call_list); } static int httpcli_get_jwk_set(const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, - void *user_data) { + void *user_data, grpc_call_list *call_list) { grpc_httpcli_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->path, "/oauth2/v3/certs") == 0); - on_response(user_data, &response); + on_response(user_data, &response, call_list); gpr_free(response.body); return 1; } @@ -374,7 +383,8 @@ static int httpcli_get_jwk_set(const grpc_httpcli_request *request, static int httpcli_get_openid_config(const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, - void *user_data) { + void *user_data, + grpc_call_list *call_list) { grpc_httpcli_response response = http_response(200, gpr_strdup(good_openid_config)); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); @@ -382,12 +392,13 @@ static int httpcli_get_openid_config(const grpc_httpcli_request *request, GPR_ASSERT(strcmp(request->path, GRPC_OPENID_CONFIG_URL_SUFFIX) == 0); grpc_httpcli_set_override(httpcli_get_jwk_set, httpcli_post_should_not_be_called); - on_response(user_data, &response); + on_response(user_data, &response, call_list); gpr_free(response.body); return 1; } static void test_jwt_verifier_url_issuer_success(void) { + grpc_call_list call_list = GRPC_CALL_LIST_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); @@ -401,10 +412,12 @@ static void test_jwt_verifier_url_issuer_success(void) { grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != NULL); grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, - on_verification_success, (void *)expected_user_data); + on_verification_success, (void *)expected_user_data, + &call_list); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); + grpc_call_list_run(&call_list); } static void on_verification_key_retrieval_error(void *user_data, @@ -418,16 +431,17 @@ static void on_verification_key_retrieval_error(void *user_data, static int httpcli_get_bad_json(const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, - void *user_data) { + void *user_data, grpc_call_list *call_list) { grpc_httpcli_response response = http_response(200, gpr_strdup("{\"bad\": \"stuff\"}")); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); - on_response(user_data, &response); + on_response(user_data, &response, call_list); gpr_free(response.body); return 1; } static void test_jwt_verifier_url_issuer_bad_config(void) { + grpc_call_list call_list = GRPC_CALL_LIST_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); @@ -442,13 +456,15 @@ static void test_jwt_verifier_url_issuer_bad_config(void) { GPR_ASSERT(jwt != NULL); grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, - (void *)expected_user_data); + (void *)expected_user_data, &call_list); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); + grpc_call_list_run(&call_list); } static void test_jwt_verifier_bad_json_key(void) { + grpc_call_list call_list = GRPC_CALL_LIST_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); @@ -463,10 +479,11 @@ static void test_jwt_verifier_bad_json_key(void) { GPR_ASSERT(jwt != NULL); grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, - (void *)expected_user_data); + (void *)expected_user_data, &call_list); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); + grpc_call_list_run(&call_list); } static void corrupt_jwt_sig(char *jwt) { @@ -495,6 +512,7 @@ static void on_verification_bad_signature(void *user_data, } static void test_jwt_verifier_bad_signature(void) { + grpc_call_list call_list = GRPC_CALL_LIST_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); @@ -510,15 +528,17 @@ static void test_jwt_verifier_bad_signature(void) { GPR_ASSERT(jwt != NULL); grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_bad_signature, - (void *)expected_user_data); + (void *)expected_user_data, &call_list); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); + grpc_call_list_run(&call_list); } static int httpcli_get_should_not_be_called( const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data) { + grpc_httpcli_response_cb on_response, void *user_data, + grpc_call_list *call_list) { GPR_ASSERT(0); return 1; } @@ -532,14 +552,16 @@ static void on_verification_bad_format(void *user_data, } static void test_jwt_verifier_bad_format(void) { + grpc_call_list call_list = GRPC_CALL_LIST_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(verifier, NULL, "bad jwt", expected_audience, on_verification_bad_format, - (void *)expected_user_data); + (void *)expected_user_data, &call_list); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); + grpc_call_list_run(&call_list); } /* find verification key: bad jks, cannot find key in jks */ diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index 45beb05c1c8..fad52d0c59d 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -93,7 +93,7 @@ char *grpc_test_fetch_oauth2_token_with_credentials(grpc_credentials *creds) { while (!request.is_done) { grpc_pollset_worker worker; grpc_pollset_work(&request.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC)); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); } gpr_mu_unlock(GRPC_POLLSET_MU(&request.pollset)); diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index e0bdea527ad..f7948b56afb 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -46,18 +46,18 @@ #include "src/core/tsi/fake_transport_security.h" static grpc_pollset g_pollset; -static grpc_workqueue *g_workqueue; static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( size_t slice_size, gpr_slice *leftover_slices, size_t leftover_nslices) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; tsi_frame_protector *fake_read_protector = tsi_create_fake_protector(NULL); tsi_frame_protector *fake_write_protector = tsi_create_fake_protector(NULL); grpc_endpoint_test_fixture f; grpc_endpoint_pair tcp; - tcp = grpc_iomgr_create_endpoint_pair("fixture", slice_size, g_workqueue); - grpc_endpoint_add_to_pollset(tcp.client, &g_pollset); - grpc_endpoint_add_to_pollset(tcp.server, &g_pollset); + tcp = grpc_iomgr_create_endpoint_pair("fixture", slice_size); + grpc_endpoint_add_to_pollset(tcp.client, &g_pollset, &call_list); + grpc_endpoint_add_to_pollset(tcp.server, &g_pollset, &call_list); if (leftover_nslices == 0) { f.client_ep = @@ -110,6 +110,7 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( f.server_ep = grpc_secure_endpoint_create(fake_write_protector, tcp.server, NULL, 0); + grpc_call_list_run(&call_list); return f; } @@ -137,41 +138,56 @@ static grpc_endpoint_test_config configs[] = { secure_endpoint_create_fixture_tcp_socketpair_leftover, clean_up}, }; +static void inc_call_ctr(void *arg, int success, grpc_call_list *call_list) { + ++*(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); gpr_slice_buffer incoming; gpr_slice s = gpr_slice_from_copied_string("hello world 12345678900987654321"); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + int n = 0; + grpc_closure done_closure; gpr_log(GPR_INFO, "Start test left over"); gpr_slice_buffer_init(&incoming); - GPR_ASSERT(grpc_endpoint_read(f.client_ep, &incoming, NULL) == - GRPC_ENDPOINT_DONE); + grpc_closure_init(&done_closure, inc_call_ctr, &n); + grpc_endpoint_read(f.client_ep, &incoming, NULL, &call_list); + grpc_call_list_run(&call_list); + GPR_ASSERT(n == 1); GPR_ASSERT(incoming.count == 1); GPR_ASSERT(0 == gpr_slice_cmp(s, incoming.slices[0])); - grpc_endpoint_shutdown(f.client_ep); - grpc_endpoint_shutdown(f.server_ep); - grpc_endpoint_destroy(f.client_ep); - grpc_endpoint_destroy(f.server_ep); + grpc_endpoint_shutdown(f.client_ep, &call_list); + grpc_endpoint_shutdown(f.server_ep, &call_list); + grpc_endpoint_destroy(f.client_ep, &call_list); + grpc_endpoint_destroy(f.server_ep, &call_list); + grpc_call_list_run(&call_list); gpr_slice_unref(s); gpr_slice_buffer_destroy(&incoming); clean_up(); } -static void destroy_pollset(void *p) { grpc_pollset_destroy(p); } +static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { + grpc_pollset_destroy(p); +} int main(int argc, char **argv) { + grpc_closure destroyed; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_test_init(argc, argv); grpc_init(); - g_workqueue = grpc_workqueue_create(); grpc_pollset_init(&g_pollset); grpc_endpoint_tests(configs[0], &g_pollset); test_leftover(configs[1], 1); - GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); - grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); + grpc_call_list_run(&call_list); grpc_shutdown(); return 0; diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index 0eeb5dac459..06bab3279e6 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -75,12 +75,14 @@ static void test_wait_empty(void) { shutdown_and_destroy(cc); } -static void do_nothing_end_completion(void *arg, grpc_cq_completion *c) {} +static void do_nothing_end_completion(void *arg, grpc_cq_completion *c, + grpc_call_list *call_list) {} static void test_cq_end_op(void) { grpc_event ev; grpc_completion_queue *cc; grpc_cq_completion completion; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; void *tag = create_test_tag(); LOG_TEST("test_cq_end_op"); @@ -88,7 +90,8 @@ static void test_cq_end_op(void) { cc = grpc_completion_queue_create(NULL); grpc_cq_begin_op(cc); - grpc_cq_end_op(cc, tag, 1, do_nothing_end_completion, NULL, &completion); + grpc_cq_end_op(cc, tag, 1, do_nothing_end_completion, NULL, &completion, + &call_list); ev = grpc_completion_queue_next(cc, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); @@ -96,6 +99,7 @@ static void test_cq_end_op(void) { GPR_ASSERT(ev.success); shutdown_and_destroy(cc); + GPR_ASSERT(grpc_call_list_empty(call_list)); } static void test_shutdown_then_next_polling(void) { @@ -129,6 +133,7 @@ static void test_pluck(void) { grpc_completion_queue *cc; void *tags[128]; grpc_cq_completion completions[GPR_ARRAY_SIZE(tags)]; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; unsigned i, j; LOG_TEST("test_pluck"); @@ -145,7 +150,7 @@ static void test_pluck(void) { for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { grpc_cq_begin_op(cc); grpc_cq_end_op(cc, tags[i], 1, do_nothing_end_completion, NULL, - &completions[i]); + &completions[i], &call_list); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { @@ -157,7 +162,7 @@ static void test_pluck(void) { for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { grpc_cq_begin_op(cc); grpc_cq_end_op(cc, tags[i], 1, do_nothing_end_completion, NULL, - &completions[i]); + &completions[i], &call_list); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { @@ -167,6 +172,7 @@ static void test_pluck(void) { } shutdown_and_destroy(cc); + GPR_ASSERT(grpc_call_list_empty(call_list)); } #define TEST_THREAD_EVENTS 10000 @@ -186,13 +192,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(void *arg, grpc_cq_completion *completion, + grpc_call_list *call_list) { gpr_free(completion); } static void producer_thread(void *arg) { test_thread_options *opt = arg; int i; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_log(GPR_INFO, "producer %d started", opt->id); gpr_event_set(&opt->on_started, (void *)(gpr_intptr)1); @@ -210,12 +218,13 @@ 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(opt->cc, (void *)(gpr_intptr)1, 1, free_completion, NULL, - gpr_malloc(sizeof(grpc_cq_completion))); + gpr_malloc(sizeof(grpc_cq_completion)), &call_list); opt->events_triggered++; } gpr_log(GPR_INFO, "producer %d phase 2 done", opt->id); gpr_event_set(&opt->on_finished, (void *)(gpr_intptr)1); + GPR_ASSERT(grpc_call_list_empty(call_list)); } static void consumer_thread(void *arg) { diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index fa3798aa3c8..98b5686e911 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -116,7 +116,7 @@ static void free_port_using_server(char *server, int port) { while (!pr.done) { grpc_pollset_worker worker; grpc_pollset_work(&pr.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1)); + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1), &call_list); } gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); @@ -272,7 +272,7 @@ static int pick_port_using_server(char *server) { while (pr.port == -1) { grpc_pollset_worker worker; grpc_pollset_work(&pr.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1)); + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1), &call_list); } gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index b4eb7ed916e..eeb3ecb55a8 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -138,10 +138,12 @@ void reconnect_server_poll(reconnect_server *server, int seconds) { gpr_timespec deadline = gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), gpr_time_from_seconds(seconds, GPR_TIMESPAN)); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_mu_lock(GRPC_POLLSET_MU(&server->pollset)); grpc_pollset_work(&server->pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline); + deadline, &call_list); gpr_mu_unlock(GRPC_POLLSET_MU(&server->pollset)); + grpc_call_list_run(&call_list); } void reconnect_server_clear_timestamps(reconnect_server *server) { From 294d0ecc05097753982e89f14bb0b63c67451038 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 21 Sep 2015 14:59:45 -0700 Subject: [PATCH 17/56] Call lists compile --- test/core/iomgr/tcp_posix_test.c | 166 +++++++++--------------- test/core/iomgr/tcp_server_posix_test.c | 33 +++-- test/core/iomgr/udp_server_test.c | 26 +++- test/core/iomgr/workqueue_test.c | 27 ++-- 4 files changed, 126 insertions(+), 126 deletions(-) diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index 40f3d98936f..09e67155e41 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -49,7 +49,6 @@ #include "test/core/iomgr/endpoint_tests.h" static grpc_pollset g_pollset; -static grpc_workqueue *g_workqueue; /* General test notes: @@ -139,7 +138,7 @@ static size_t count_slices(gpr_slice *slices, size_t nslices, return num_bytes; } -static void read_cb(void *user_data, int success) { +static void read_cb(void *user_data, int success, grpc_call_list *call_list) { struct read_socket_state *state = (struct read_socket_state *)user_data; size_t read_bytes; int current_data; @@ -156,19 +155,8 @@ static void read_cb(void *user_data, int success) { if (state->read_bytes >= state->target_read_bytes) { gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } else { - switch (grpc_endpoint_read(state->ep, &state->incoming, &state->read_cb)) { - case GRPC_ENDPOINT_DONE: - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - read_cb(user_data, 1); - break; - case GRPC_ENDPOINT_ERROR: - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - read_cb(user_data, 0); - break; - case GRPC_ENDPOINT_PENDING: - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - break; - } + grpc_endpoint_read(state->ep, &state->incoming, &state->read_cb, call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } } @@ -179,15 +167,15 @@ static void read_test(size_t num_bytes, size_t slice_size) { struct read_socket_state state; size_t written_bytes; gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_log(GPR_INFO, "Read test of size %d, slice size %d", num_bytes, slice_size); create_sockets(sv); - ep = grpc_tcp_create(grpc_fd_create(sv[1], g_workqueue, "read_test"), - slice_size, "test"); - grpc_endpoint_add_to_pollset(ep, &g_pollset); + ep = grpc_tcp_create(grpc_fd_create(sv[1], "read_test"), slice_size, "test"); + grpc_endpoint_add_to_pollset(ep, &g_pollset, &call_list); written_bytes = fill_socket_partial(sv[0], num_bytes); gpr_log(GPR_INFO, "Wrote %d bytes", written_bytes); @@ -198,28 +186,23 @@ static void read_test(size_t num_bytes, size_t slice_size) { gpr_slice_buffer_init(&state.incoming); grpc_closure_init(&state.read_cb, read_cb, &state); - switch (grpc_endpoint_read(ep, &state.incoming, &state.read_cb)) { - case GRPC_ENDPOINT_DONE: - read_cb(&state, 1); - break; - case GRPC_ENDPOINT_ERROR: - read_cb(&state, 0); - break; - case GRPC_ENDPOINT_PENDING: - break; - } + grpc_endpoint_read(ep, &state.incoming, &state.read_cb, &call_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline); + deadline, &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); gpr_slice_buffer_destroy(&state.incoming); - grpc_endpoint_destroy(ep); + grpc_endpoint_destroy(ep, &call_list); + grpc_call_list_run(&call_list); } /* Write to a socket until it fills up, then read from it using the grpc_tcp @@ -230,14 +213,15 @@ static void large_read_test(size_t slice_size) { struct read_socket_state state; ssize_t written_bytes; gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_log(GPR_INFO, "Start large read test, slice size %d", slice_size); create_sockets(sv); - ep = grpc_tcp_create(grpc_fd_create(sv[1], g_workqueue, "large_read_test"), - slice_size, "test"); - grpc_endpoint_add_to_pollset(ep, &g_pollset); + ep = grpc_tcp_create(grpc_fd_create(sv[1], "large_read_test"), slice_size, + "test"); + grpc_endpoint_add_to_pollset(ep, &g_pollset, &call_list); written_bytes = fill_socket(sv[0]); gpr_log(GPR_INFO, "Wrote %d bytes", written_bytes); @@ -248,28 +232,23 @@ static void large_read_test(size_t slice_size) { gpr_slice_buffer_init(&state.incoming); grpc_closure_init(&state.read_cb, read_cb, &state); - switch (grpc_endpoint_read(ep, &state.incoming, &state.read_cb)) { - case GRPC_ENDPOINT_DONE: - read_cb(&state, 1); - break; - case GRPC_ENDPOINT_ERROR: - read_cb(&state, 0); - break; - case GRPC_ENDPOINT_PENDING: - break; - } + grpc_endpoint_read(ep, &state.incoming, &state.read_cb, &call_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline); + deadline, &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); gpr_slice_buffer_destroy(&state.incoming); - grpc_endpoint_destroy(ep); + grpc_endpoint_destroy(ep, &call_list); + grpc_call_list_run(&call_list); } struct write_socket_state { @@ -300,7 +279,8 @@ static gpr_slice *allocate_blocks(size_t num_bytes, size_t slice_size, return slices; } -static void write_done(void *user_data /* write_socket_state */, int success) { +static void write_done(void *user_data /* write_socket_state */, int success, + grpc_call_list *call_list) { struct write_socket_state *state = (struct write_socket_state *)user_data; gpr_log(GPR_INFO, "Write done callback called"); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -317,6 +297,7 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { int flags; int current = 0; int i; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; flags = fcntl(fd, F_GETFL, 0); GPR_ASSERT(fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) == 0); @@ -325,8 +306,9 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { grpc_pollset_worker worker; gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10)); + GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10), &call_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); do { bytes_read = read(fd, buf, bytes_left > read_size ? read_size : bytes_left); @@ -345,26 +327,6 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { gpr_free(buf); } -static ssize_t drain_socket(int fd) { - ssize_t read_bytes; - ssize_t total_bytes = 0; - unsigned char buf[256]; - int current = 0; - int i; - do { - read_bytes = read(fd, buf, 256); - if (read_bytes > 0) { - total_bytes += read_bytes; - for (i = 0; i < read_bytes; ++i) { - GPR_ASSERT(buf[i] == current); - current = (current + 1) % 256; - } - } - } while (read_bytes >= 0 || errno == EINTR); - GPR_ASSERT(errno == EAGAIN); - return total_bytes; -} - /* Write to a socket using the grpc_tcp API, then drain it directly. Note that if the write does not complete immediately we need to drain the socket in parallel with the read. */ @@ -372,22 +334,22 @@ static void write_test(size_t num_bytes, size_t slice_size) { int sv[2]; grpc_endpoint *ep; struct write_socket_state state; - ssize_t read_bytes; size_t num_blocks; gpr_slice *slices; gpr_uint8 current_data = 0; gpr_slice_buffer outgoing; grpc_closure write_done_closure; gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; gpr_log(GPR_INFO, "Start write test with %d bytes, slice size %d", num_bytes, slice_size); create_sockets(sv); - ep = grpc_tcp_create(grpc_fd_create(sv[1], g_workqueue, "write_test"), + ep = grpc_tcp_create(grpc_fd_create(sv[1], "write_test"), GRPC_TCP_DEFAULT_READ_SLICE_SIZE, "test"); - grpc_endpoint_add_to_pollset(ep, &g_pollset); + grpc_endpoint_add_to_pollset(ep, &g_pollset, &call_list); state.ep = ep; state.write_done = 0; @@ -398,33 +360,26 @@ static void write_test(size_t num_bytes, size_t slice_size) { gpr_slice_buffer_addn(&outgoing, slices, num_blocks); grpc_closure_init(&write_done_closure, write_done, &state); - switch (grpc_endpoint_write(ep, &outgoing, &write_done_closure)) { - case GRPC_ENDPOINT_DONE: - /* Write completed immediately */ - read_bytes = drain_socket(sv[0]); - GPR_ASSERT((size_t)read_bytes == num_bytes); - break; - case GRPC_ENDPOINT_PENDING: - drain_socket_blocking(sv[0], num_bytes, num_bytes); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - for (;;) { - grpc_pollset_worker worker; - if (state.write_done) { - break; - } - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline); - } - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_endpoint_write(ep, &outgoing, &write_done_closure, &call_list); + drain_socket_blocking(sv[0], num_bytes, num_bytes); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + for (;;) { + grpc_pollset_worker worker; + if (state.write_done) { break; - case GRPC_ENDPOINT_ERROR: - gpr_log(GPR_ERROR, "endpoint got error"); - abort(); + } + grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + deadline, &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); gpr_slice_buffer_destroy(&outgoing); - grpc_endpoint_destroy(ep); + grpc_endpoint_destroy(ep, &call_list); gpr_free(slices); + grpc_call_list_run(&call_list); } void run_tests(void) { @@ -454,14 +409,17 @@ static grpc_endpoint_test_fixture create_fixture_tcp_socketpair( size_t slice_size) { int sv[2]; grpc_endpoint_test_fixture f; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; create_sockets(sv); - f.client_ep = grpc_tcp_create( - grpc_fd_create(sv[0], g_workqueue, "fixture:client"), slice_size, "test"); - f.server_ep = grpc_tcp_create( - grpc_fd_create(sv[1], g_workqueue, "fixture:server"), slice_size, "test"); - 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(grpc_fd_create(sv[0], "fixture:client"), + slice_size, "test"); + f.server_ep = grpc_tcp_create(grpc_fd_create(sv[1], "fixture:server"), + slice_size, "test"); + grpc_endpoint_add_to_pollset(f.client_ep, &g_pollset, &call_list); + grpc_endpoint_add_to_pollset(f.server_ep, &g_pollset, &call_list); + + grpc_call_list_run(&call_list); return f; } @@ -470,17 +428,21 @@ static grpc_endpoint_test_config configs[] = { {"tcp/tcp_socketpair", create_fixture_tcp_socketpair, clean_up}, }; -static void destroy_pollset(void *p) { grpc_pollset_destroy(p); } +static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { + grpc_pollset_destroy(p); +} int main(int argc, char **argv) { + grpc_closure destroyed; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_test_init(argc, argv); grpc_init(); - g_workqueue = grpc_workqueue_create(); grpc_pollset_init(&g_pollset); run_tests(); grpc_endpoint_tests(configs[0], &g_pollset); - GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy"); - grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); + grpc_call_list_run(&call_list); grpc_shutdown(); return 0; diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index 29a20cba8e5..5bd3792a012 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -48,9 +48,10 @@ static grpc_pollset g_pollset; static int g_nconnects = 0; -static void on_connect(void *arg, grpc_endpoint *tcp) { - grpc_endpoint_shutdown(tcp); - grpc_endpoint_destroy(tcp); +static void on_connect(void *arg, grpc_endpoint *tcp, + grpc_call_list *call_list) { + grpc_endpoint_shutdown(tcp, call_list); + grpc_endpoint_destroy(tcp, call_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); g_nconnects++; @@ -64,10 +65,12 @@ static void test_no_op(void) { } static void test_no_op_with_start(void) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_tcp_server *s = grpc_tcp_server_create(); LOG_TEST("test_no_op_with_start"); - grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); + grpc_tcp_server_start(s, NULL, 0, on_connect, NULL, &call_list); grpc_tcp_server_destroy(s, NULL, NULL); + grpc_call_list_run(&call_list); } static void test_no_op_with_port(void) { @@ -84,6 +87,7 @@ static void test_no_op_with_port(void) { } static void test_no_op_with_port_and_start(void) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; struct sockaddr_in addr; grpc_tcp_server *s = grpc_tcp_server_create(); LOG_TEST("test_no_op_with_port_and_start"); @@ -93,12 +97,14 @@ static void test_no_op_with_port_and_start(void) { GPR_ASSERT( grpc_tcp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr))); - grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); + grpc_tcp_server_start(s, NULL, 0, on_connect, NULL, &call_list); grpc_tcp_server_destroy(s, NULL, NULL); + grpc_call_list_run(&call_list); } static void test_connect(int n) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; struct sockaddr_storage addr; socklen_t addr_len = sizeof(addr); int svrfd, clifd; @@ -120,7 +126,7 @@ static void test_connect(int n) { GPR_ASSERT(addr_len <= sizeof(addr)); pollsets[0] = &g_pollset; - grpc_tcp_server_start(s, pollsets, 1, on_connect, NULL); + grpc_tcp_server_start(s, pollsets, 1, on_connect, NULL, &call_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -138,7 +144,10 @@ static void test_connect(int n) { gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline); + deadline, &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_log(GPR_DEBUG, "wait done"); @@ -151,9 +160,13 @@ static void test_connect(int n) { grpc_tcp_server_destroy(s, NULL, NULL); } -static void destroy_pollset(void *p) { grpc_pollset_destroy(p); } +static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { + grpc_pollset_destroy(p); +} int main(int argc, char **argv) { + grpc_closure destroyed; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_test_init(argc, argv); grpc_iomgr_init(); grpc_pollset_init(&g_pollset); @@ -165,7 +178,9 @@ int main(int argc, char **argv) { test_connect(1); test_connect(10); - grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); + grpc_call_list_run(&call_list); grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c index 24b6b1c717b..476dfd63bcd 100644 --- a/test/core/iomgr/udp_server_test.c +++ b/test/core/iomgr/udp_server_test.c @@ -69,10 +69,12 @@ static void test_no_op(void) { } static void test_no_op_with_start(void) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_udp_server *s = grpc_udp_server_create(); LOG_TEST("test_no_op_with_start"); - grpc_udp_server_start(s, NULL, 0); + grpc_udp_server_start(s, NULL, 0, &call_list); grpc_udp_server_destroy(s, NULL, NULL); + grpc_call_list_run(&call_list); } static void test_no_op_with_port(void) { @@ -89,6 +91,7 @@ static void test_no_op_with_port(void) { } static void test_no_op_with_port_and_start(void) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; struct sockaddr_in addr; grpc_udp_server *s = grpc_udp_server_create(); LOG_TEST("test_no_op_with_port_and_start"); @@ -98,12 +101,14 @@ static void test_no_op_with_port_and_start(void) { GPR_ASSERT(grpc_udp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr), on_read)); - grpc_udp_server_start(s, NULL, 0); + grpc_udp_server_start(s, NULL, 0, &call_list); grpc_udp_server_destroy(s, NULL, NULL); + grpc_call_list_run(&call_list); } static void test_receive(int number_of_clients) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; struct sockaddr_storage addr; socklen_t addr_len = sizeof(addr); int clifd, svrfd; @@ -128,7 +133,7 @@ static void test_receive(int number_of_clients) { GPR_ASSERT(addr_len <= sizeof(addr)); pollsets[0] = &g_pollset; - grpc_udp_server_start(s, pollsets, 1); + grpc_udp_server_start(s, pollsets, 1, &call_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -145,7 +150,10 @@ static void test_receive(int number_of_clients) { gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline); + deadline, &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } GPR_ASSERT(g_number_of_reads == number_of_reads_before + 1); close(clifd); @@ -157,9 +165,13 @@ static void test_receive(int number_of_clients) { grpc_udp_server_destroy(s, NULL, NULL); } -static void destroy_pollset(void *p) { grpc_pollset_destroy(p); } +static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { + grpc_pollset_destroy(p); +} int main(int argc, char **argv) { + grpc_closure destroyed; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_test_init(argc, argv); grpc_iomgr_init(); grpc_pollset_init(&g_pollset); @@ -171,7 +183,9 @@ int main(int argc, char **argv) { test_receive(1); test_receive(10); - grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); + grpc_call_list_run(&call_list); grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c index aa7b460f919..08030dfe832 100644 --- a/test/core/iomgr/workqueue_test.c +++ b/test/core/iomgr/workqueue_test.c @@ -40,7 +40,7 @@ static grpc_pollset g_pollset; -static void must_succeed(void *p, int success) { +static void must_succeed(void *p, int success, grpc_call_list *call_list) { GPR_ASSERT(success == 1); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); *(int *)p = 1; @@ -51,34 +51,43 @@ static void must_succeed(void *p, int success) { static void test_add_closure(void) { grpc_closure c; int done = 0; - grpc_workqueue *wq = grpc_workqueue_create(); + grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_workqueue *wq = grpc_workqueue_create(&call_list); gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5); grpc_pollset_worker worker; grpc_closure_init(&c, must_succeed, &done); grpc_workqueue_push(wq, &c, 1); - grpc_workqueue_add_to_pollset(wq, &g_pollset); + grpc_workqueue_add_to_pollset(wq, &g_pollset, &call_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); GPR_ASSERT(!done); - grpc_pollset_work(&g_pollset, &worker, gpr_now(deadline.clock_type), - deadline); - GPR_ASSERT(done); + grpc_pollset_work(&g_pollset, &worker, gpr_now(deadline.clock_type), deadline, + &call_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_call_list_run(&call_list); + GPR_ASSERT(done); - GRPC_WORKQUEUE_UNREF(wq, "destroy"); + GRPC_WORKQUEUE_UNREF(wq, "destroy", &call_list); + grpc_call_list_run(&call_list); } -static void done_shutdown(void *arg) { grpc_pollset_destroy(arg); } +static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { + grpc_pollset_destroy(p); +} int main(int argc, char **argv) { + grpc_closure destroyed; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_test_init(argc, argv); grpc_init(); grpc_pollset_init(&g_pollset); test_add_closure(); - grpc_pollset_shutdown(&g_pollset, done_shutdown, &g_pollset); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); + grpc_call_list_run(&call_list); grpc_shutdown(); return 0; } From ba496454b2f0909a64845f1305f3b0a81073a4f1 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 21 Sep 2015 17:15:19 -0700 Subject: [PATCH 18/56] Fixes --- Makefile | 34 +-- build.yaml | 5 - gRPC.podspec | 10 +- .../client_config/lb_policies/pick_first.c | 4 +- src/core/iomgr/alarm.c | 2 +- src/core/iomgr/fd_posix.h | 1 - src/core/iomgr/iomgr.c | 13 +- src/core/iomgr/pollset_posix.c | 3 +- src/core/security/secure_endpoint.c | 11 +- src/core/security/server_secure_chttp2.c | 11 +- src/core/surface/call.c | 2 - src/core/surface/channel.c | 10 +- src/core/surface/channel.h | 7 +- src/core/surface/channel_create.c | 9 +- src/core/surface/lame_client.c | 3 +- src/core/surface/secure_channel_create.c | 9 +- src/core/surface/server.c | 3 +- src/core/surface/server.h | 1 - src/core/surface/server_chttp2.c | 10 +- src/core/transport/connectivity_state.h | 1 - test/core/bad_client/bad_client.c | 12 +- .../core/end2end/fixtures/h2_sockpair+trace.c | 14 +- test/core/end2end/fixtures/h2_sockpair.c | 16 +- .../core/end2end/fixtures/h2_sockpair_1byte.c | 16 +- test/core/iomgr/alarm_test.c | 217 ------------------ .../print_google_default_creds_token.c | 13 +- test/core/security/verify_jwt.c | 8 +- test/core/surface/completion_queue_test.c | 1 + tools/run_tests/sources_and_headers.json | 14 -- tools/run_tests/tests.json | 18 -- vsprojects/buildtests_c.sln | 27 --- .../test/alarm_test/alarm_test.vcxproj | 172 -------------- .../alarm_test/alarm_test.vcxproj.filters | 21 -- 33 files changed, 76 insertions(+), 622 deletions(-) delete mode 100644 test/core/iomgr/alarm_test.c delete mode 100644 vsprojects/vcxproj/test/alarm_test/alarm_test.vcxproj delete mode 100644 vsprojects/vcxproj/test/alarm_test/alarm_test.vcxproj.filters diff --git a/Makefile b/Makefile index dc011ce6867..71495936996 100644 --- a/Makefile +++ b/Makefile @@ -776,7 +776,6 @@ stop: alarm_heap_test: $(BINDIR)/$(CONFIG)/alarm_heap_test alarm_list_test: $(BINDIR)/$(CONFIG)/alarm_list_test -alarm_test: $(BINDIR)/$(CONFIG)/alarm_test alpn_test: $(BINDIR)/$(CONFIG)/alpn_test bin_encoder_test: $(BINDIR)/$(CONFIG)/bin_encoder_test chttp2_status_conversion_test: $(BINDIR)/$(CONFIG)/chttp2_status_conversion_test @@ -1730,7 +1729,7 @@ endif buildtests: buildtests_c buildtests_cxx buildtests_zookeeper -buildtests_c: privatelibs_c $(BINDIR)/$(CONFIG)/alarm_heap_test $(BINDIR)/$(CONFIG)/alarm_list_test $(BINDIR)/$(CONFIG)/alarm_test $(BINDIR)/$(CONFIG)/alpn_test $(BINDIR)/$(CONFIG)/bin_encoder_test $(BINDIR)/$(CONFIG)/chttp2_status_conversion_test $(BINDIR)/$(CONFIG)/chttp2_stream_encoder_test $(BINDIR)/$(CONFIG)/chttp2_stream_map_test $(BINDIR)/$(CONFIG)/compression_test $(BINDIR)/$(CONFIG)/dualstack_socket_test $(BINDIR)/$(CONFIG)/endpoint_pair_test $(BINDIR)/$(CONFIG)/fd_conservation_posix_test $(BINDIR)/$(CONFIG)/fd_posix_test $(BINDIR)/$(CONFIG)/fling_client $(BINDIR)/$(CONFIG)/fling_server $(BINDIR)/$(CONFIG)/fling_stream_test $(BINDIR)/$(CONFIG)/fling_test $(BINDIR)/$(CONFIG)/gpr_cmdline_test $(BINDIR)/$(CONFIG)/gpr_env_test $(BINDIR)/$(CONFIG)/gpr_file_test $(BINDIR)/$(CONFIG)/gpr_histogram_test $(BINDIR)/$(CONFIG)/gpr_host_port_test $(BINDIR)/$(CONFIG)/gpr_log_test $(BINDIR)/$(CONFIG)/gpr_slice_buffer_test $(BINDIR)/$(CONFIG)/gpr_slice_test $(BINDIR)/$(CONFIG)/gpr_stack_lockfree_test $(BINDIR)/$(CONFIG)/gpr_string_test $(BINDIR)/$(CONFIG)/gpr_sync_test $(BINDIR)/$(CONFIG)/gpr_thd_test $(BINDIR)/$(CONFIG)/gpr_time_test $(BINDIR)/$(CONFIG)/gpr_tls_test $(BINDIR)/$(CONFIG)/gpr_useful_test $(BINDIR)/$(CONFIG)/grpc_auth_context_test $(BINDIR)/$(CONFIG)/grpc_base64_test $(BINDIR)/$(CONFIG)/grpc_byte_buffer_reader_test $(BINDIR)/$(CONFIG)/grpc_channel_args_test $(BINDIR)/$(CONFIG)/grpc_channel_stack_test $(BINDIR)/$(CONFIG)/grpc_completion_queue_test $(BINDIR)/$(CONFIG)/grpc_credentials_test $(BINDIR)/$(CONFIG)/grpc_json_token_test $(BINDIR)/$(CONFIG)/grpc_jwt_verifier_test $(BINDIR)/$(CONFIG)/grpc_security_connector_test $(BINDIR)/$(CONFIG)/grpc_stream_op_test $(BINDIR)/$(CONFIG)/hpack_parser_test $(BINDIR)/$(CONFIG)/hpack_table_test $(BINDIR)/$(CONFIG)/httpcli_format_request_test $(BINDIR)/$(CONFIG)/httpcli_parser_test $(BINDIR)/$(CONFIG)/httpcli_test $(BINDIR)/$(CONFIG)/json_rewrite $(BINDIR)/$(CONFIG)/json_rewrite_test $(BINDIR)/$(CONFIG)/json_test $(BINDIR)/$(CONFIG)/lame_client_test $(BINDIR)/$(CONFIG)/message_compress_test $(BINDIR)/$(CONFIG)/multi_init_test $(BINDIR)/$(CONFIG)/multiple_server_queues_test $(BINDIR)/$(CONFIG)/murmur_hash_test $(BINDIR)/$(CONFIG)/no_server_test $(BINDIR)/$(CONFIG)/resolve_address_test $(BINDIR)/$(CONFIG)/secure_endpoint_test $(BINDIR)/$(CONFIG)/sockaddr_utils_test $(BINDIR)/$(CONFIG)/tcp_client_posix_test $(BINDIR)/$(CONFIG)/tcp_posix_test $(BINDIR)/$(CONFIG)/tcp_server_posix_test $(BINDIR)/$(CONFIG)/time_averaged_stats_test $(BINDIR)/$(CONFIG)/timeout_encoding_test $(BINDIR)/$(CONFIG)/timers_test $(BINDIR)/$(CONFIG)/transport_metadata_test $(BINDIR)/$(CONFIG)/transport_security_test $(BINDIR)/$(CONFIG)/udp_server_test $(BINDIR)/$(CONFIG)/uri_parser_test $(BINDIR)/$(CONFIG)/workqueue_test $(BINDIR)/$(CONFIG)/h2_compress_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_compress_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_call_creds_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_compress_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_compress_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_compress_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_compress_default_host_test $(BINDIR)/$(CONFIG)/h2_compress_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_compress_empty_batch_test $(BINDIR)/$(CONFIG)/h2_compress_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_compress_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_compress_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_compress_large_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_compress_max_message_length_test $(BINDIR)/$(CONFIG)/h2_compress_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_no_op_test $(BINDIR)/$(CONFIG)/h2_compress_payload_test $(BINDIR)/$(CONFIG)/h2_compress_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_compress_registered_call_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_compress_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_compress_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_compress_simple_request_test $(BINDIR)/$(CONFIG)/h2_compress_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_fakesec_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_call_creds_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_fakesec_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_fakesec_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_fakesec_default_host_test $(BINDIR)/$(CONFIG)/h2_fakesec_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_fakesec_empty_batch_test $(BINDIR)/$(CONFIG)/h2_fakesec_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_fakesec_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_fakesec_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_large_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_fakesec_max_message_length_test $(BINDIR)/$(CONFIG)/h2_fakesec_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_no_op_test $(BINDIR)/$(CONFIG)/h2_fakesec_payload_test $(BINDIR)/$(CONFIG)/h2_fakesec_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_fakesec_registered_call_test $(BINDIR)/$(CONFIG)/h2_fakesec_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_fakesec_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_fakesec_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_fakesec_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_fakesec_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_simple_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_full_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_full_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_full_call_creds_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_full_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_full_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_full_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_full_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_full_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_full_default_host_test $(BINDIR)/$(CONFIG)/h2_full_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_full_empty_batch_test $(BINDIR)/$(CONFIG)/h2_full_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_full_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_full_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_full_large_metadata_test $(BINDIR)/$(CONFIG)/h2_full_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_full_max_message_length_test $(BINDIR)/$(CONFIG)/h2_full_metadata_test $(BINDIR)/$(CONFIG)/h2_full_no_op_test $(BINDIR)/$(CONFIG)/h2_full_payload_test $(BINDIR)/$(CONFIG)/h2_full_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_full_registered_call_test $(BINDIR)/$(CONFIG)/h2_full_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_full_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_full_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_full_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_full_simple_request_test $(BINDIR)/$(CONFIG)/h2_full_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_full+poll_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_call_creds_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_full+poll_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_full+poll_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_full+poll_default_host_test $(BINDIR)/$(CONFIG)/h2_full+poll_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_full+poll_empty_batch_test $(BINDIR)/$(CONFIG)/h2_full+poll_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_full+poll_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_full+poll_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_large_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_message_length_test $(BINDIR)/$(CONFIG)/h2_full+poll_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_no_op_test $(BINDIR)/$(CONFIG)/h2_full+poll_payload_test $(BINDIR)/$(CONFIG)/h2_full+poll_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_full+poll_registered_call_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_full+poll_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_oauth2_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_call_creds_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_oauth2_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_oauth2_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_oauth2_default_host_test $(BINDIR)/$(CONFIG)/h2_oauth2_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_oauth2_empty_batch_test $(BINDIR)/$(CONFIG)/h2_oauth2_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_oauth2_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_oauth2_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_large_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_oauth2_max_message_length_test $(BINDIR)/$(CONFIG)/h2_oauth2_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_no_op_test $(BINDIR)/$(CONFIG)/h2_oauth2_payload_test $(BINDIR)/$(CONFIG)/h2_oauth2_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_oauth2_registered_call_test $(BINDIR)/$(CONFIG)/h2_oauth2_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_oauth2_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_oauth2_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_oauth2_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_oauth2_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_simple_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_proxy_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_call_creds_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_proxy_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_proxy_default_host_test $(BINDIR)/$(CONFIG)/h2_proxy_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_proxy_empty_batch_test $(BINDIR)/$(CONFIG)/h2_proxy_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_proxy_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_proxy_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_proxy_large_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_max_message_length_test $(BINDIR)/$(CONFIG)/h2_proxy_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_no_op_test $(BINDIR)/$(CONFIG)/h2_proxy_payload_test $(BINDIR)/$(CONFIG)/h2_proxy_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_proxy_registered_call_test $(BINDIR)/$(CONFIG)/h2_proxy_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_proxy_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_request_test $(BINDIR)/$(CONFIG)/h2_proxy_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_sockpair_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_call_creds_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_sockpair_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_empty_batch_test $(BINDIR)/$(CONFIG)/h2_sockpair_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_sockpair_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_sockpair_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_large_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_message_length_test $(BINDIR)/$(CONFIG)/h2_sockpair_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_no_op_test $(BINDIR)/$(CONFIG)/h2_sockpair_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_sockpair_registered_call_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_sockpair_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_call_creds_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_empty_batch_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_large_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_message_length_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_no_op_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_registered_call_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_call_creds_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_empty_batch_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_large_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_message_length_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_no_op_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_registered_call_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_ssl_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_call_creds_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_ssl_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_ssl_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_default_host_test $(BINDIR)/$(CONFIG)/h2_ssl_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_ssl_empty_batch_test $(BINDIR)/$(CONFIG)/h2_ssl_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_ssl_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_ssl_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_ssl_large_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_ssl_max_message_length_test $(BINDIR)/$(CONFIG)/h2_ssl_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_no_op_test $(BINDIR)/$(CONFIG)/h2_ssl_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_ssl_registered_call_test $(BINDIR)/$(CONFIG)/h2_ssl_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_ssl_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_ssl_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_ssl_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_ssl_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_ssl_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_call_creds_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_default_host_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_empty_batch_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_large_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_max_message_length_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_no_op_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_payload_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_registered_call_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_call_creds_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_default_host_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_empty_batch_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_large_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_max_message_length_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_no_op_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_registered_call_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_uds_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_call_creds_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_uds_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_uds_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_uds_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_uds_empty_batch_test $(BINDIR)/$(CONFIG)/h2_uds_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_uds_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_uds_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_uds_large_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_uds_max_message_length_test $(BINDIR)/$(CONFIG)/h2_uds_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_no_op_test $(BINDIR)/$(CONFIG)/h2_uds_payload_test $(BINDIR)/$(CONFIG)/h2_uds_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_uds_registered_call_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_uds_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_uds_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_uds_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_uds+poll_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_call_creds_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_uds+poll_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_uds+poll_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_uds+poll_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_uds+poll_empty_batch_test $(BINDIR)/$(CONFIG)/h2_uds+poll_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_uds+poll_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_uds+poll_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_large_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_message_length_test $(BINDIR)/$(CONFIG)/h2_uds+poll_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_no_op_test $(BINDIR)/$(CONFIG)/h2_uds+poll_payload_test $(BINDIR)/$(CONFIG)/h2_uds+poll_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_uds+poll_registered_call_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_uds+poll_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_full_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_full_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_full_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_full_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_full_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_full_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_full_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_full_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_full_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_full_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_full_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_full_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_full_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_full_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_full_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/connection_prefix_bad_client_test $(BINDIR)/$(CONFIG)/initial_settings_frame_bad_client_test +buildtests_c: privatelibs_c $(BINDIR)/$(CONFIG)/alarm_heap_test $(BINDIR)/$(CONFIG)/alarm_list_test $(BINDIR)/$(CONFIG)/alpn_test $(BINDIR)/$(CONFIG)/bin_encoder_test $(BINDIR)/$(CONFIG)/chttp2_status_conversion_test $(BINDIR)/$(CONFIG)/chttp2_stream_encoder_test $(BINDIR)/$(CONFIG)/chttp2_stream_map_test $(BINDIR)/$(CONFIG)/compression_test $(BINDIR)/$(CONFIG)/dualstack_socket_test $(BINDIR)/$(CONFIG)/endpoint_pair_test $(BINDIR)/$(CONFIG)/fd_conservation_posix_test $(BINDIR)/$(CONFIG)/fd_posix_test $(BINDIR)/$(CONFIG)/fling_client $(BINDIR)/$(CONFIG)/fling_server $(BINDIR)/$(CONFIG)/fling_stream_test $(BINDIR)/$(CONFIG)/fling_test $(BINDIR)/$(CONFIG)/gpr_cmdline_test $(BINDIR)/$(CONFIG)/gpr_env_test $(BINDIR)/$(CONFIG)/gpr_file_test $(BINDIR)/$(CONFIG)/gpr_histogram_test $(BINDIR)/$(CONFIG)/gpr_host_port_test $(BINDIR)/$(CONFIG)/gpr_log_test $(BINDIR)/$(CONFIG)/gpr_slice_buffer_test $(BINDIR)/$(CONFIG)/gpr_slice_test $(BINDIR)/$(CONFIG)/gpr_stack_lockfree_test $(BINDIR)/$(CONFIG)/gpr_string_test $(BINDIR)/$(CONFIG)/gpr_sync_test $(BINDIR)/$(CONFIG)/gpr_thd_test $(BINDIR)/$(CONFIG)/gpr_time_test $(BINDIR)/$(CONFIG)/gpr_tls_test $(BINDIR)/$(CONFIG)/gpr_useful_test $(BINDIR)/$(CONFIG)/grpc_auth_context_test $(BINDIR)/$(CONFIG)/grpc_base64_test $(BINDIR)/$(CONFIG)/grpc_byte_buffer_reader_test $(BINDIR)/$(CONFIG)/grpc_channel_args_test $(BINDIR)/$(CONFIG)/grpc_channel_stack_test $(BINDIR)/$(CONFIG)/grpc_completion_queue_test $(BINDIR)/$(CONFIG)/grpc_credentials_test $(BINDIR)/$(CONFIG)/grpc_json_token_test $(BINDIR)/$(CONFIG)/grpc_jwt_verifier_test $(BINDIR)/$(CONFIG)/grpc_security_connector_test $(BINDIR)/$(CONFIG)/grpc_stream_op_test $(BINDIR)/$(CONFIG)/hpack_parser_test $(BINDIR)/$(CONFIG)/hpack_table_test $(BINDIR)/$(CONFIG)/httpcli_format_request_test $(BINDIR)/$(CONFIG)/httpcli_parser_test $(BINDIR)/$(CONFIG)/httpcli_test $(BINDIR)/$(CONFIG)/json_rewrite $(BINDIR)/$(CONFIG)/json_rewrite_test $(BINDIR)/$(CONFIG)/json_test $(BINDIR)/$(CONFIG)/lame_client_test $(BINDIR)/$(CONFIG)/message_compress_test $(BINDIR)/$(CONFIG)/multi_init_test $(BINDIR)/$(CONFIG)/multiple_server_queues_test $(BINDIR)/$(CONFIG)/murmur_hash_test $(BINDIR)/$(CONFIG)/no_server_test $(BINDIR)/$(CONFIG)/resolve_address_test $(BINDIR)/$(CONFIG)/secure_endpoint_test $(BINDIR)/$(CONFIG)/sockaddr_utils_test $(BINDIR)/$(CONFIG)/tcp_client_posix_test $(BINDIR)/$(CONFIG)/tcp_posix_test $(BINDIR)/$(CONFIG)/tcp_server_posix_test $(BINDIR)/$(CONFIG)/time_averaged_stats_test $(BINDIR)/$(CONFIG)/timeout_encoding_test $(BINDIR)/$(CONFIG)/timers_test $(BINDIR)/$(CONFIG)/transport_metadata_test $(BINDIR)/$(CONFIG)/transport_security_test $(BINDIR)/$(CONFIG)/udp_server_test $(BINDIR)/$(CONFIG)/uri_parser_test $(BINDIR)/$(CONFIG)/workqueue_test $(BINDIR)/$(CONFIG)/h2_compress_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_compress_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_call_creds_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_compress_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_compress_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_compress_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_compress_default_host_test $(BINDIR)/$(CONFIG)/h2_compress_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_compress_empty_batch_test $(BINDIR)/$(CONFIG)/h2_compress_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_compress_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_compress_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_compress_large_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_compress_max_message_length_test $(BINDIR)/$(CONFIG)/h2_compress_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_no_op_test $(BINDIR)/$(CONFIG)/h2_compress_payload_test $(BINDIR)/$(CONFIG)/h2_compress_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_compress_registered_call_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_compress_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_compress_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_compress_simple_request_test $(BINDIR)/$(CONFIG)/h2_compress_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_fakesec_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_call_creds_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_fakesec_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_fakesec_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_fakesec_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_fakesec_default_host_test $(BINDIR)/$(CONFIG)/h2_fakesec_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_fakesec_empty_batch_test $(BINDIR)/$(CONFIG)/h2_fakesec_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_fakesec_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_fakesec_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_large_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_fakesec_max_message_length_test $(BINDIR)/$(CONFIG)/h2_fakesec_metadata_test $(BINDIR)/$(CONFIG)/h2_fakesec_no_op_test $(BINDIR)/$(CONFIG)/h2_fakesec_payload_test $(BINDIR)/$(CONFIG)/h2_fakesec_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_fakesec_registered_call_test $(BINDIR)/$(CONFIG)/h2_fakesec_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_fakesec_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_fakesec_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_fakesec_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_fakesec_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_simple_request_test $(BINDIR)/$(CONFIG)/h2_fakesec_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_full_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_full_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_full_call_creds_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_full_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_full_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_full_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_full_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_full_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_full_default_host_test $(BINDIR)/$(CONFIG)/h2_full_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_full_empty_batch_test $(BINDIR)/$(CONFIG)/h2_full_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_full_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_full_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_full_large_metadata_test $(BINDIR)/$(CONFIG)/h2_full_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_full_max_message_length_test $(BINDIR)/$(CONFIG)/h2_full_metadata_test $(BINDIR)/$(CONFIG)/h2_full_no_op_test $(BINDIR)/$(CONFIG)/h2_full_payload_test $(BINDIR)/$(CONFIG)/h2_full_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_full_registered_call_test $(BINDIR)/$(CONFIG)/h2_full_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_full_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_full_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_full_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_full_simple_request_test $(BINDIR)/$(CONFIG)/h2_full_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_full+poll_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_call_creds_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_full+poll_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_full+poll_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_full+poll_default_host_test $(BINDIR)/$(CONFIG)/h2_full+poll_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_full+poll_empty_batch_test $(BINDIR)/$(CONFIG)/h2_full+poll_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_full+poll_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_full+poll_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_large_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_message_length_test $(BINDIR)/$(CONFIG)/h2_full+poll_metadata_test $(BINDIR)/$(CONFIG)/h2_full+poll_no_op_test $(BINDIR)/$(CONFIG)/h2_full+poll_payload_test $(BINDIR)/$(CONFIG)/h2_full+poll_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_full+poll_registered_call_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_full+poll_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_request_test $(BINDIR)/$(CONFIG)/h2_full+poll_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_oauth2_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_call_creds_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_oauth2_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_oauth2_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_oauth2_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_oauth2_default_host_test $(BINDIR)/$(CONFIG)/h2_oauth2_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_oauth2_empty_batch_test $(BINDIR)/$(CONFIG)/h2_oauth2_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_oauth2_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_oauth2_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_large_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_oauth2_max_message_length_test $(BINDIR)/$(CONFIG)/h2_oauth2_metadata_test $(BINDIR)/$(CONFIG)/h2_oauth2_no_op_test $(BINDIR)/$(CONFIG)/h2_oauth2_payload_test $(BINDIR)/$(CONFIG)/h2_oauth2_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_oauth2_registered_call_test $(BINDIR)/$(CONFIG)/h2_oauth2_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_oauth2_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_oauth2_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_oauth2_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_oauth2_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_simple_request_test $(BINDIR)/$(CONFIG)/h2_oauth2_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_proxy_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_call_creds_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_proxy_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_proxy_default_host_test $(BINDIR)/$(CONFIG)/h2_proxy_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_proxy_empty_batch_test $(BINDIR)/$(CONFIG)/h2_proxy_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_proxy_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_proxy_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_proxy_large_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_max_message_length_test $(BINDIR)/$(CONFIG)/h2_proxy_metadata_test $(BINDIR)/$(CONFIG)/h2_proxy_no_op_test $(BINDIR)/$(CONFIG)/h2_proxy_payload_test $(BINDIR)/$(CONFIG)/h2_proxy_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_proxy_registered_call_test $(BINDIR)/$(CONFIG)/h2_proxy_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_proxy_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_request_test $(BINDIR)/$(CONFIG)/h2_proxy_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_sockpair_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_call_creds_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_sockpair_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_empty_batch_test $(BINDIR)/$(CONFIG)/h2_sockpair_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_sockpair_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_sockpair_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_large_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_message_length_test $(BINDIR)/$(CONFIG)/h2_sockpair_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_no_op_test $(BINDIR)/$(CONFIG)/h2_sockpair_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_sockpair_registered_call_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_sockpair_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_call_creds_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_empty_batch_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_large_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_message_length_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_no_op_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_registered_call_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_call_creds_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_empty_batch_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_large_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_message_length_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_metadata_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_no_op_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_registered_call_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_simple_request_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_ssl_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_call_creds_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_ssl_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_ssl_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_default_host_test $(BINDIR)/$(CONFIG)/h2_ssl_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_ssl_empty_batch_test $(BINDIR)/$(CONFIG)/h2_ssl_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_ssl_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_ssl_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_ssl_large_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_ssl_max_message_length_test $(BINDIR)/$(CONFIG)/h2_ssl_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_no_op_test $(BINDIR)/$(CONFIG)/h2_ssl_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_ssl_registered_call_test $(BINDIR)/$(CONFIG)/h2_ssl_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_ssl_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_ssl_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_ssl_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_ssl_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_ssl_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_call_creds_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_default_host_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_empty_batch_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_large_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_max_message_length_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_no_op_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_payload_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_registered_call_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl+poll_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_call_creds_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_default_host_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_empty_batch_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_large_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_max_message_length_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_metadata_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_no_op_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_registered_call_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_simple_request_test $(BINDIR)/$(CONFIG)/h2_ssl_proxy_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_uds_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_call_creds_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_uds_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_uds_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_uds_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_uds_empty_batch_test $(BINDIR)/$(CONFIG)/h2_uds_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_uds_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_uds_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_uds_large_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_uds_max_message_length_test $(BINDIR)/$(CONFIG)/h2_uds_metadata_test $(BINDIR)/$(CONFIG)/h2_uds_no_op_test $(BINDIR)/$(CONFIG)/h2_uds_payload_test $(BINDIR)/$(CONFIG)/h2_uds_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_uds_registered_call_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_uds_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_uds_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_uds_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_bad_hostname_test $(BINDIR)/$(CONFIG)/h2_uds+poll_binary_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_call_creds_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_accept_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_client_done_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_invoke_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_before_invoke_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_in_a_vacuum_test $(BINDIR)/$(CONFIG)/h2_uds+poll_census_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_channel_connectivity_test $(BINDIR)/$(CONFIG)/h2_uds+poll_compressed_payload_test $(BINDIR)/$(CONFIG)/h2_uds+poll_disappearing_server_test $(BINDIR)/$(CONFIG)/h2_uds+poll_empty_batch_test $(BINDIR)/$(CONFIG)/h2_uds+poll_graceful_server_shutdown_test $(BINDIR)/$(CONFIG)/h2_uds+poll_high_initial_seqno_test $(BINDIR)/$(CONFIG)/h2_uds+poll_invoke_large_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_large_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_concurrent_streams_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_message_length_test $(BINDIR)/$(CONFIG)/h2_uds+poll_metadata_test $(BINDIR)/$(CONFIG)/h2_uds+poll_no_op_test $(BINDIR)/$(CONFIG)/h2_uds+poll_payload_test $(BINDIR)/$(CONFIG)/h2_uds+poll_ping_pong_streaming_test $(BINDIR)/$(CONFIG)/h2_uds+poll_registered_call_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_flags_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_payload_test $(BINDIR)/$(CONFIG)/h2_uds+poll_server_finishes_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_calls_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_tags_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_delayed_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_request_test $(BINDIR)/$(CONFIG)/h2_uds+poll_trailing_metadata_test $(BINDIR)/$(CONFIG)/h2_compress_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_compress_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_full_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_full_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_full_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_full_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_full_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_full_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_full_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_full_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_full_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_full_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_full_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_full_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_full_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_full_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_full_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_full_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_full+poll_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_default_host_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_proxy_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair+trace_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_bad_hostname_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_binary_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_accept_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_client_done_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_after_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_before_invoke_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_cancel_in_a_vacuum_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_census_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_channel_connectivity_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_compressed_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_disappearing_server_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_empty_batch_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_graceful_server_shutdown_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_high_initial_seqno_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_invoke_large_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_large_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_concurrent_streams_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_max_message_length_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_metadata_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_no_op_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_ping_pong_streaming_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_registered_call_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_flags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_request_with_payload_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_server_finishes_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_calls_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_shutdown_finishes_tags_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_delayed_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_simple_request_nosec_test $(BINDIR)/$(CONFIG)/h2_uds+poll_trailing_metadata_nosec_test $(BINDIR)/$(CONFIG)/connection_prefix_bad_client_test $(BINDIR)/$(CONFIG)/initial_settings_frame_bad_client_test buildtests_cxx: buildtests_zookeeper privatelibs_cxx $(BINDIR)/$(CONFIG)/async_end2end_test $(BINDIR)/$(CONFIG)/async_streaming_ping_pong_test $(BINDIR)/$(CONFIG)/async_unary_ping_pong_test $(BINDIR)/$(CONFIG)/auth_property_iterator_test $(BINDIR)/$(CONFIG)/channel_arguments_test $(BINDIR)/$(CONFIG)/cli_call_test $(BINDIR)/$(CONFIG)/client_crash_test $(BINDIR)/$(CONFIG)/client_crash_test_server $(BINDIR)/$(CONFIG)/credentials_test $(BINDIR)/$(CONFIG)/cxx_byte_buffer_test $(BINDIR)/$(CONFIG)/cxx_slice_test $(BINDIR)/$(CONFIG)/cxx_string_ref_test $(BINDIR)/$(CONFIG)/cxx_time_test $(BINDIR)/$(CONFIG)/end2end_test $(BINDIR)/$(CONFIG)/generic_end2end_test $(BINDIR)/$(CONFIG)/grpc_cli $(BINDIR)/$(CONFIG)/interop_client $(BINDIR)/$(CONFIG)/interop_server $(BINDIR)/$(CONFIG)/interop_test $(BINDIR)/$(CONFIG)/mock_test $(BINDIR)/$(CONFIG)/qps_interarrival_test $(BINDIR)/$(CONFIG)/qps_openloop_test $(BINDIR)/$(CONFIG)/qps_test $(BINDIR)/$(CONFIG)/reconnect_interop_client $(BINDIR)/$(CONFIG)/reconnect_interop_server $(BINDIR)/$(CONFIG)/secure_auth_context_test $(BINDIR)/$(CONFIG)/server_crash_test $(BINDIR)/$(CONFIG)/server_crash_test_client $(BINDIR)/$(CONFIG)/shutdown_test $(BINDIR)/$(CONFIG)/status_test $(BINDIR)/$(CONFIG)/streaming_throughput_test $(BINDIR)/$(CONFIG)/sync_streaming_ping_pong_test $(BINDIR)/$(CONFIG)/sync_unary_ping_pong_test $(BINDIR)/$(CONFIG)/thread_stress_test @@ -1750,8 +1749,6 @@ test_c: buildtests_c $(Q) $(BINDIR)/$(CONFIG)/alarm_heap_test || ( echo test alarm_heap_test failed ; exit 1 ) $(E) "[RUN] Testing alarm_list_test" $(Q) $(BINDIR)/$(CONFIG)/alarm_list_test || ( echo test alarm_list_test failed ; exit 1 ) - $(E) "[RUN] Testing alarm_test" - $(Q) $(BINDIR)/$(CONFIG)/alarm_test || ( echo test alarm_test failed ; exit 1 ) $(E) "[RUN] Testing alpn_test" $(Q) $(BINDIR)/$(CONFIG)/alpn_test || ( echo test alpn_test failed ; exit 1 ) $(E) "[RUN] Testing bin_encoder_test" @@ -6610,35 +6607,6 @@ endif endif -ALARM_TEST_SRC = \ - test/core/iomgr/alarm_test.c \ - -ALARM_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ALARM_TEST_SRC)))) -ifeq ($(NO_SECURE),true) - -# You can't build secure targets if you don't have OpenSSL. - -$(BINDIR)/$(CONFIG)/alarm_test: openssl_dep_error - -else - -$(BINDIR)/$(CONFIG)/alarm_test: $(ALARM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a - $(E) "[LD] Linking $@" - $(Q) mkdir -p `dirname $@` - $(Q) $(LD) $(LDFLAGS) $(ALARM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/alarm_test - -endif - -$(OBJDIR)/$(CONFIG)/test/core/iomgr/alarm_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a -deps_alarm_test: $(ALARM_TEST_OBJS:.o=.dep) - -ifneq ($(NO_SECURE),true) -ifneq ($(NO_DEPS),true) --include $(ALARM_TEST_OBJS:.o=.dep) -endif -endif - - ALPN_TEST_SRC = \ test/core/transport/chttp2/alpn_test.c \ diff --git a/build.yaml b/build.yaml index fd97705b25d..4327c7784b3 100644 --- a/build.yaml +++ b/build.yaml @@ -354,11 +354,6 @@ targets: language: c src: [test/core/iomgr/alarm_list_test.c] deps: [grpc_test_util, grpc, gpr_test_util, gpr] -- name: alarm_test - build: test - language: c - src: [test/core/iomgr/alarm_test.c] - deps: [grpc_test_util, grpc, gpr_test_util, gpr] - name: alpn_test build: test language: c diff --git a/gRPC.podspec b/gRPC.podspec index 6c12ea5d958..abd6a8ff81a 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -36,17 +36,17 @@ Pod::Spec.new do |s| s.name = 'gRPC' - s.version = '0.7.0' + s.version = '0.11.0' s.summary = 'gRPC client library for iOS/OSX' s.homepage = 'http://www.grpc.io' s.license = 'New BSD' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } # s.source = { :git => 'https://github.com/grpc/grpc.git', - # :tag => 'release-0_10_0-objectivec-0.6.0' } + # :tag => 'release-0_11_0-objectivec-0.11.0' } - s.ios.deployment_target = '6.0' - s.osx.deployment_target = '10.8' + s.ios.deployment_target = '7.1' + s.osx.deployment_target = '10.9' s.requires_arc = true objc_dir = 'src/objective-c' @@ -599,6 +599,6 @@ Pod::Spec.new do |s| ss.dependency 'gRPC/GRPCClient' ss.dependency 'gRPC/RxLibrary' - ss.dependency 'Protobuf', '~> 3.0.0-alpha-3' + ss.dependency 'Protobuf', '~> 3.0.0-alpha-4' end end diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index 8ea774bebcd..c9a200eb8c4 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -97,7 +97,7 @@ static void add_interested_parties_locked(pick_first_lb_policy *p, void pf_destroy(grpc_lb_policy *pol, grpc_call_list *call_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; size_t i; - GPR_ASSERT(p->shutdown); + GPR_ASSERT(p->pending_picks == NULL); for (i = 0; i < p->num_subchannels; i++) { GRPC_SUBCHANNEL_UNREF(p->subchannels[i], "pick_first", call_list); } @@ -180,7 +180,9 @@ static void pf_connectivity_changed(void *arg, int iomgr_success, gpr_mu_lock(&p->mu); if (p->shutdown) { + gpr_mu_unlock(&p->mu); GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity", call_list); + return; } else if (p->selected != NULL) { grpc_connectivity_state_set(&p->state_tracker, p->checking_connectivity, "selected_changed", call_list); diff --git a/src/core/iomgr/alarm.c b/src/core/iomgr/alarm.c index 146bda477d7..da265d4e506 100644 --- a/src/core/iomgr/alarm.c +++ b/src/core/iomgr/alarm.c @@ -224,7 +224,7 @@ void grpc_alarm_cancel(grpc_alarm *alarm, grpc_call_list *call_list) { shard_type *shard = &g_shards[shard_idx(alarm)]; gpr_mu_lock(&shard->mu); if (!alarm->triggered) { - grpc_call_list_add(call_list, &alarm->closure, 1); + grpc_call_list_add(call_list, &alarm->closure, 0); alarm->triggered = 1; if (alarm->heap_index == INVALID_HEAP_INDEX) { list_remove(alarm); diff --git a/src/core/iomgr/fd_posix.h b/src/core/iomgr/fd_posix.h index f435e2d3f9b..607cba6181a 100644 --- a/src/core/iomgr/fd_posix.h +++ b/src/core/iomgr/fd_posix.h @@ -36,7 +36,6 @@ #include "src/core/iomgr/iomgr_internal.h" #include "src/core/iomgr/pollset.h" -#include "src/core/iomgr/workqueue.h" #include #include #include diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index 029c6899822..5cb20a7ba05 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -194,13 +194,14 @@ int grpc_call_list_empty(grpc_call_list call_list) { } void grpc_call_list_move(grpc_call_list *src, grpc_call_list *dst) { - if (dst->head == NULL) { - *dst = *src; - return; - } if (src->head == NULL) { return; } - dst->tail->next = src->head; - dst->tail = src->tail; + if (dst->head == NULL) { + *dst = *src; + } else { + dst->tail->next = src->head; + dst->tail = src->tail; + } + src->head = src->tail = NULL; } diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 10407161799..daca2f6daa5 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -205,7 +205,7 @@ void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, added_worker = 1; gpr_tls_set(&g_current_thread_poller, (gpr_intptr)pollset); pollset->vtable->maybe_work_and_unlock(pollset, worker, deadline, now, - NULL); + call_list); locked = 0; gpr_tls_set(&g_current_thread_poller, 0); } else { @@ -400,6 +400,7 @@ static void basic_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, up_args = gpr_malloc(sizeof(*up_args)); up_args->fd = fd; up_args->original_vtable = pollset->vtable; + up_args->pollset = pollset; up_args->promotion_closure.cb = basic_do_promote; up_args->promotion_closure.cb_arg = up_args; diff --git a/src/core/security/secure_endpoint.c b/src/core/security/secure_endpoint.c index a501544341c..a647345796f 100644 --- a/src/core/security/secure_endpoint.c +++ b/src/core/security/secure_endpoint.c @@ -82,16 +82,17 @@ static void destroy(secure_endpoint *secure_ep, grpc_call_list *call_list) { /*#define GRPC_SECURE_ENDPOINT_REFCOUNT_DEBUG*/ #ifdef GRPC_SECURE_ENDPOINT_REFCOUNT_DEBUG -#define SECURE_ENDPOINT_UNREF(ep, reason) \ - secure_endpoint_unref((ep), (reason), __FILE__, __LINE__) +#define SECURE_ENDPOINT_UNREF(ep, reason, cl) \ + secure_endpoint_unref((ep), (cl), (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, +static void secure_endpoint_unref(secure_endpoint *ep, + grpc_call_list *call_list, const char *reason, const char *file, int line) { gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "SECENDP unref %p : %s %d -> %d", ep, reason, ep->ref.count, ep->ref.count - 1); if (gpr_unref(&ep->ref)) { - destroy(ep); + destroy(ep, call_list); } } @@ -219,6 +220,7 @@ static void endpoint_read(grpc_endpoint *secure_ep, gpr_slice_buffer *slices, ep->read_buffer = slices; gpr_slice_buffer_reset_and_unref(ep->read_buffer); + SECURE_ENDPOINT_REF(ep, "read"); if (ep->leftover_bytes.count) { gpr_slice_buffer_swap(&ep->leftover_bytes, &ep->source_buffer); GPR_ASSERT(ep->leftover_bytes.count == 0); @@ -226,7 +228,6 @@ static void endpoint_read(grpc_endpoint *secure_ep, gpr_slice_buffer *slices, return; } - SECURE_ENDPOINT_REF(ep, "read"); grpc_endpoint_read(ep->wrapped_ep, &ep->source_buffer, &ep->on_read, call_list); } diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index 0662839105d..829082507cc 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -87,8 +87,7 @@ static void state_unref(grpc_server_secure_state *state) { } static void setup_transport(void *statep, grpc_transport *transport, - grpc_mdctx *mdctx, grpc_workqueue *workqueue, - grpc_call_list *call_list) { + grpc_mdctx *mdctx, grpc_call_list *call_list) { static grpc_channel_filter const *extra_filters[] = { &grpc_server_auth_filter, &grpc_http_server_filter}; grpc_server_secure_state *state = statep; @@ -101,8 +100,8 @@ static void setup_transport(void *statep, grpc_transport *transport, grpc_server_get_channel_args(state->server), args_to_add, GPR_ARRAY_SIZE(args_to_add)); grpc_server_setup_transport(state->server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, workqueue, - args_copy, call_list); + GPR_ARRAY_SIZE(extra_filters), mdctx, args_copy, + call_list); grpc_channel_args_destroy(args_copy); } @@ -135,17 +134,15 @@ static void on_secure_transport_setup_done(void *statep, grpc_server_secure_state *state = statep; grpc_transport *transport; grpc_mdctx *mdctx; - grpc_workqueue *workqueue; if (status == GRPC_SECURITY_OK) { gpr_mu_lock(&state->mu); remove_tcp_from_list_locked(state, wrapped_endpoint); if (!state->is_shutdown) { mdctx = grpc_mdctx_create(); - workqueue = grpc_workqueue_create(call_list); transport = grpc_create_chttp2_transport( grpc_server_get_channel_args(state->server), secure_endpoint, mdctx, 0, call_list); - setup_transport(state, transport, mdctx, workqueue, call_list); + setup_transport(state, transport, mdctx, call_list); grpc_chttp2_transport_start_reading(transport, NULL, 0, call_list); } else { /* We need to consume this here, because the server may already have gone diff --git a/src/core/surface/call.c b/src/core/surface/call.c index bbaf65759dc..9920e0daafe 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -650,8 +650,6 @@ static void unlock(grpc_call *call, grpc_call_list *call_list) { if (!call->bound_pollset && call->cq && (!call->is_client || start_op)) { call->bound_pollset = 1; op.bind_pollset = grpc_cq_pollset(call->cq); - grpc_workqueue_add_to_pollset(grpc_channel_get_workqueue(call->channel), - op.bind_pollset, call_list); start_op = 1; } diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index 46bea139361..b00096f6fa2 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -78,7 +78,6 @@ struct grpc_channel { gpr_mu registered_call_mu; registered_call *registered_calls; char *target; - grpc_workqueue *workqueue; }; #define CHANNEL_STACK_FROM_CHANNEL(c) ((grpc_channel_stack *)((c) + 1)) @@ -92,8 +91,8 @@ struct grpc_channel { grpc_channel *grpc_channel_create_from_filters( const char *target, const grpc_channel_filter **filters, size_t num_filters, - const grpc_channel_args *args, grpc_mdctx *mdctx, grpc_workqueue *workqueue, - int is_client, grpc_call_list *call_list) { + const grpc_channel_args *args, grpc_mdctx *mdctx, int is_client, + grpc_call_list *call_list) { size_t i; size_t size = sizeof(grpc_channel) + grpc_channel_stack_size(filters, num_filters); @@ -105,7 +104,6 @@ grpc_channel *grpc_channel_create_from_filters( /* decremented by grpc_channel_destroy */ gpr_ref_init(&channel->refs, 1); channel->metadata_context = mdctx; - channel->workqueue = workqueue; channel->grpc_status_string = grpc_mdstr_from_string(mdctx, "grpc-status", 0); channel->grpc_compression_algorithm_string = grpc_mdstr_from_string(mdctx, "grpc-encoding", 0); @@ -371,7 +369,3 @@ grpc_mdstr *grpc_channel_get_message_string(grpc_channel *channel) { gpr_uint32 grpc_channel_get_max_message_length(grpc_channel *channel) { return channel->max_message_length; } - -grpc_workqueue *grpc_channel_get_workqueue(grpc_channel *channel) { - return channel->workqueue; -} diff --git a/src/core/surface/channel.h b/src/core/surface/channel.h index 3f51164fcc4..2a249c9c51a 100644 --- a/src/core/surface/channel.h +++ b/src/core/surface/channel.h @@ -36,12 +36,11 @@ #include "src/core/channel/channel_stack.h" #include "src/core/client_config/subchannel_factory.h" -#include "src/core/iomgr/workqueue.h" grpc_channel *grpc_channel_create_from_filters( const char *target, const grpc_channel_filter **filters, size_t count, - const grpc_channel_args *args, grpc_mdctx *mdctx, grpc_workqueue *workqueue, - int is_client, grpc_call_list *call_list); + const grpc_channel_args *args, grpc_mdctx *mdctx, int is_client, + grpc_call_list *call_list); /** Get a (borrowed) pointer to this channels underlying channel stack */ grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel); @@ -63,8 +62,6 @@ grpc_mdstr *grpc_channel_get_encodings_accepted_by_peer_string( grpc_mdstr *grpc_channel_get_message_string(grpc_channel *channel); gpr_uint32 grpc_channel_get_max_message_length(grpc_channel *channel); -grpc_workqueue *grpc_channel_get_workqueue(grpc_channel *channel); - #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG void grpc_channel_internal_ref(grpc_channel *channel, const char *reason); void grpc_channel_internal_unref(grpc_channel *channel, const char *reason, diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index 7ac76da10a7..f48fa4ed83d 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -59,7 +59,6 @@ typedef struct { grpc_endpoint *tcp; grpc_mdctx *mdctx; - grpc_workqueue *workqueue; grpc_closure connected; } connector; @@ -73,7 +72,6 @@ static void connector_unref(grpc_connector *con, grpc_call_list *call_list) { connector *c = (connector *)con; if (gpr_unref(&c->refs)) { grpc_mdctx_unref(c->mdctx); - GRPC_WORKQUEUE_UNREF(c->workqueue, "connector", call_list); gpr_free(c); } } @@ -156,6 +154,8 @@ static grpc_subchannel *subchannel_factory_create_subchannel( grpc_subchannel *s; memset(c, 0, sizeof(*c)); c->base.vtable = &connector_vtable; + c->mdctx = f->mdctx; + grpc_mdctx_ref(c->mdctx); gpr_ref_init(&c->refs, 1); args->mdctx = f->mdctx; args->args = final_args; @@ -184,7 +184,6 @@ grpc_channel *grpc_insecure_channel_create(const char *target, subchannel_factory *f; grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_call_list call_list = GRPC_CALL_LIST_INIT; - grpc_workqueue *workqueue = grpc_workqueue_create(&call_list); size_t n = 0; GPR_ASSERT(!reserved); if (grpc_channel_args_is_census_enabled(args)) { @@ -194,8 +193,8 @@ grpc_channel *grpc_insecure_channel_create(const char *target, filters[n++] = &grpc_client_channel_filter; GPR_ASSERT(n <= MAX_FILTERS); - channel = grpc_channel_create_from_filters(target, filters, n, args, mdctx, - workqueue, 1, &call_list); + channel = grpc_channel_create_from_filters(target, filters, n, args, mdctx, 1, + &call_list); f = gpr_malloc(sizeof(*f)); f->base.vtable = &subchannel_factory_vtable; diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c index c5cf33f1f9c..2af028960d7 100644 --- a/src/core/surface/lame_client.c +++ b/src/core/surface/lame_client.c @@ -157,8 +157,7 @@ grpc_channel *grpc_lame_client_channel_create(const char *target, grpc_call_list call_list = GRPC_CALL_LIST_INIT; static const grpc_channel_filter *filters[] = {&lame_filter}; channel = grpc_channel_create_from_filters( - target, filters, 1, NULL, grpc_mdctx_create(), - grpc_workqueue_create(&call_list), 1, &call_list); + target, filters, 1, NULL, grpc_mdctx_create(), 1, &call_list); elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); GPR_ASSERT(elem->filter == &lame_filter); chand = (channel_data *)elem->channel_data; diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index b5b9ee173ee..9f10cd29fd1 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -69,7 +69,6 @@ typedef struct { grpc_closure connected_closure; grpc_mdctx *mdctx; - grpc_workqueue *workqueue; } connector; static void connector_ref(grpc_connector *con) { @@ -81,7 +80,6 @@ static void connector_unref(grpc_connector *con, grpc_call_list *call_list) { connector *c = (connector *)con; if (gpr_unref(&c->refs)) { grpc_mdctx_unref(c->mdctx); - GRPC_WORKQUEUE_UNREF(c->workqueue, "connector", call_list); gpr_free(c); } } @@ -214,11 +212,10 @@ static grpc_subchannel *subchannel_factory_create_subchannel( c->security_connector = f->security_connector; c->mdctx = f->mdctx; grpc_mdctx_ref(c->mdctx); - c->workqueue = grpc_channel_get_workqueue(f->master); - GRPC_WORKQUEUE_REF(c->workqueue, "connector"); gpr_ref_init(&c->refs, 1); args->args = final_args; args->master = f->master; + args->mdctx = f->mdctx; s = grpc_subchannel_create(&c->base, args); grpc_connector_unref(&c->base, call_list); grpc_channel_args_destroy(final_args); @@ -243,7 +240,6 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, grpc_channel_args *new_args_from_connector; grpc_channel_security_connector *connector; grpc_mdctx *mdctx; - grpc_workqueue *workqueue; grpc_resolver *resolver; subchannel_factory *f; #define MAX_FILTERS 3 @@ -267,7 +263,6 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, "Failed to create security connector."); } mdctx = grpc_mdctx_create(); - workqueue = grpc_workqueue_create(&call_list); connector_arg = grpc_security_connector_to_arg(&connector->base); args_copy = grpc_channel_args_copy_and_add( @@ -281,7 +276,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, GPR_ASSERT(n <= MAX_FILTERS); channel = grpc_channel_create_from_filters(target, filters, n, args_copy, - mdctx, workqueue, 1, &call_list); + mdctx, 1, &call_list); f = gpr_malloc(sizeof(*f)); f->base.vtable = &subchannel_factory_vtable; diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 24545c67e12..4249e6f9bd0 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -907,7 +907,6 @@ void grpc_server_start(grpc_server *server) { void grpc_server_setup_transport(grpc_server *s, grpc_transport *transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx *mdctx, - grpc_workqueue *workqueue, const grpc_channel_args *args, grpc_call_list *call_list) { size_t num_filters = s->channel_filter_count + num_extra_filters + 1; @@ -943,7 +942,7 @@ void grpc_server_setup_transport(grpc_server *s, grpc_transport *transport, } channel = grpc_channel_create_from_filters(NULL, filters, num_filters, args, - mdctx, workqueue, 0, call_list); + mdctx, 0, call_list); chand = (channel_data *)grpc_channel_stack_element( grpc_channel_get_channel_stack(channel), 0) ->channel_data; diff --git a/src/core/surface/server.h b/src/core/surface/server.h index 2f2c5b8948d..d08a0386397 100644 --- a/src/core/surface/server.h +++ b/src/core/surface/server.h @@ -58,7 +58,6 @@ void grpc_server_add_listener( void grpc_server_setup_transport(grpc_server *server, grpc_transport *transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx *mdctx, - grpc_workqueue *workqueue, const grpc_channel_args *args, grpc_call_list *call_list); diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c index df63d99dead..395c88827d4 100644 --- a/src/core/surface/server_chttp2.c +++ b/src/core/surface/server_chttp2.c @@ -43,12 +43,11 @@ #include static void setup_transport(void *server, grpc_transport *transport, - grpc_mdctx *mdctx, grpc_workqueue *workqueue, - grpc_call_list *call_list) { + grpc_mdctx *mdctx, grpc_call_list *call_list) { static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; grpc_server_setup_transport(server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, workqueue, + GPR_ARRAY_SIZE(extra_filters), mdctx, grpc_server_get_channel_args(server), call_list); } @@ -62,10 +61,9 @@ static void new_transport(void *server, grpc_endpoint *tcp, * case. */ grpc_mdctx *mdctx = grpc_mdctx_create(); - grpc_workqueue *workqueue = grpc_workqueue_create(call_list); grpc_transport *transport = grpc_create_chttp2_transport( grpc_server_get_channel_args(server), tcp, mdctx, 0, call_list); - setup_transport(server, transport, mdctx, workqueue, call_list); + setup_transport(server, transport, mdctx, call_list); grpc_chttp2_transport_start_reading(transport, NULL, 0, call_list); } @@ -144,5 +142,5 @@ error: done: grpc_call_list_run(&call_list); - return 0; + return port_num; } diff --git a/src/core/transport/connectivity_state.h b/src/core/transport/connectivity_state.h index 3f92b22d5d0..6ade8e19f73 100644 --- a/src/core/transport/connectivity_state.h +++ b/src/core/transport/connectivity_state.h @@ -36,7 +36,6 @@ #include #include "src/core/iomgr/iomgr.h" -#include "src/core/iomgr/workqueue.h" typedef struct grpc_connectivity_state_watcher { /** we keep watchers in a linked list */ diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index fd37fce9761..747ce4050b8 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -65,15 +65,14 @@ static void done_write(void *arg, int success, grpc_call_list *call_list) { } static void server_setup_transport(void *ts, grpc_transport *transport, - grpc_mdctx *mdctx, - grpc_workqueue *workqueue) { + grpc_mdctx *mdctx) { thd_args *a = ts; static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_server_setup_transport( a->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - workqueue, grpc_server_get_channel_args(a->server), &call_list); + grpc_server_get_channel_args(a->server), &call_list); grpc_call_list_run(&call_list); } @@ -90,7 +89,6 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, gpr_slice_from_copied_buffer(client_payload, client_payload_length); gpr_slice_buffer outgoing; grpc_closure done_write_closure; - grpc_workqueue *workqueue; grpc_call_list call_list = GRPC_CALL_LIST_INIT; hex = gpr_dump(client_payload, client_payload_length, @@ -104,9 +102,6 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, /* Init grpc */ grpc_init(); - workqueue = grpc_workqueue_create(&call_list); - grpc_call_list_run(&call_list); - /* Create endpoints */ sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536); @@ -120,7 +115,7 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, grpc_server_start(a.server); transport = grpc_create_chttp2_transport(NULL, sfd.server, mdctx, 0, &call_list); - server_setup_transport(&a, transport, mdctx, workqueue); + server_setup_transport(&a, transport, mdctx); grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); grpc_call_list_run(&call_list); @@ -169,7 +164,6 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, grpc_completion_queue_destroy(a.cq); gpr_slice_buffer_destroy(&outgoing); - GRPC_WORKQUEUE_UNREF(workqueue, "destroy", &call_list); grpc_call_list_run(&call_list); grpc_shutdown(); } diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index be8132bc967..d0279e79bad 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -54,8 +54,6 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -grpc_workqueue *g_workqueue; - /* chttp2 transport that is immediately available (used for testing connected_channel without a client_channel */ @@ -67,7 +65,7 @@ static void server_setup_transport(void *ts, grpc_transport *transport, grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_server_setup_transport( f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - g_workqueue, grpc_server_get_channel_args(f->server), &call_list); + grpc_server_get_channel_args(f->server), &call_list); grpc_call_list_run(&call_list); } @@ -85,9 +83,9 @@ static void client_setup_transport(void *ts, grpc_transport *transport, &grpc_compress_filter, &grpc_connected_channel_filter}; size_t nfilters = sizeof(filters) / sizeof(*filters); - grpc_channel *channel = grpc_channel_create_from_filters( - "socketpair-target", filters, nfilters, cs->client_args, mdctx, - g_workqueue, 1, call_list); + grpc_channel *channel = + grpc_channel_create_from_filters("socketpair-target", filters, nfilters, + cs->client_args, mdctx, 1, call_list); cs->f->client = channel; @@ -169,7 +167,6 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); - g_workqueue = grpc_workqueue_create(&call_list); grpc_call_list_run(&call_list); GPR_ASSERT(0 == grpc_tracer_set_enabled("also-doesnt-exist", 0)); @@ -180,9 +177,6 @@ int main(int argc, char **argv) { grpc_end2end_tests(configs[i]); } - grpc_workqueue_flush(g_workqueue, &call_list); - GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy", &call_list); - grpc_call_list_run(&call_list); grpc_shutdown(); return 0; diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index 08f918cbad2..57fc9869740 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -53,8 +53,6 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -grpc_workqueue *g_workqueue; - /* chttp2 transport that is immediately available (used for testing connected_channel without a client_channel */ @@ -66,7 +64,7 @@ static void server_setup_transport(void *ts, grpc_transport *transport, grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_server_setup_transport( f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - g_workqueue, grpc_server_get_channel_args(f->server), &call_list); + grpc_server_get_channel_args(f->server), &call_list); grpc_call_list_run(&call_list); } @@ -84,9 +82,9 @@ static void client_setup_transport(void *ts, grpc_transport *transport, &grpc_compress_filter, &grpc_connected_channel_filter}; size_t nfilters = sizeof(filters) / sizeof(*filters); - grpc_channel *channel = grpc_channel_create_from_filters( - "socketpair-target", filters, nfilters, cs->client_args, mdctx, - g_workqueue, 1, call_list); + grpc_channel *channel = + grpc_channel_create_from_filters("socketpair-target", filters, nfilters, + cs->client_args, mdctx, 1, call_list); cs->f->client = channel; @@ -155,20 +153,14 @@ static grpc_end2end_test_config configs[] = { int main(int argc, char **argv) { size_t i; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_test_init(argc, argv); grpc_init(); - g_workqueue = grpc_workqueue_create(&call_list); - grpc_call_list_run(&call_list); for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { grpc_end2end_tests(configs[i]); } - grpc_workqueue_flush(g_workqueue, &call_list); - GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy", &call_list); - grpc_call_list_run(&call_list); grpc_shutdown(); return 0; diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 46ffaff745f..d0c552a6692 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -53,8 +53,6 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -grpc_workqueue *g_workqueue; - /* chttp2 transport that is immediately available (used for testing connected_channel without a client_channel */ @@ -66,7 +64,7 @@ static void server_setup_transport(void *ts, grpc_transport *transport, grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_server_setup_transport( f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - g_workqueue, grpc_server_get_channel_args(f->server), &call_list); + grpc_server_get_channel_args(f->server), &call_list); grpc_call_list_run(&call_list); } @@ -84,9 +82,9 @@ static void client_setup_transport(void *ts, grpc_transport *transport, &grpc_compress_filter, &grpc_connected_channel_filter}; size_t nfilters = sizeof(filters) / sizeof(*filters); - grpc_channel *channel = grpc_channel_create_from_filters( - "socketpair-target", filters, nfilters, cs->client_args, mdctx, - g_workqueue, 1, call_list); + grpc_channel *channel = + grpc_channel_create_from_filters("socketpair-target", filters, nfilters, + cs->client_args, mdctx, 1, call_list); cs->f->client = channel; @@ -155,20 +153,14 @@ static grpc_end2end_test_config configs[] = { int main(int argc, char **argv) { size_t i; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; grpc_test_init(argc, argv); grpc_init(); - g_workqueue = grpc_workqueue_create(&call_list); - grpc_call_list_run(&call_list); for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { grpc_end2end_tests(configs[i]); } - grpc_workqueue_flush(g_workqueue, &call_list); - GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy", &call_list); - grpc_call_list_run(&call_list); grpc_shutdown(); return 0; diff --git a/test/core/iomgr/alarm_test.c b/test/core/iomgr/alarm_test.c deleted file mode 100644 index bfced834097..00000000000 --- a/test/core/iomgr/alarm_test.c +++ /dev/null @@ -1,217 +0,0 @@ -/* - * - * Copyright 2015, Google Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -/* Test gRPC event manager with a simple TCP upload server and client. */ -#include "src/core/iomgr/alarm.h" - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include "test/core/util/test_config.h" - -#define SUCCESS_NOT_SET (-1) - -/* Dummy gRPC callback */ -void no_op_cb(void *arg, int success) {} - -typedef struct { - gpr_cv cv; - gpr_mu mu; - int counter; - int done_success_ctr; - int done_cancel_ctr; - int done; - gpr_event fcb_arg; - int success; -} alarm_arg; - -/* Called when an alarm expires. */ -static void alarm_cb(void *arg /* alarm_arg */, int success, - grpc_call_list *call_list) { - alarm_arg *a = arg; - gpr_mu_lock(&a->mu); - if (success) { - a->counter++; - a->done_success_ctr++; - } else { - a->done_cancel_ctr++; - } - a->done = 1; - a->success = success; - gpr_cv_signal(&a->cv); - gpr_mu_unlock(&a->mu); - gpr_event_set((gpr_event *)arg, arg); -} - -/* Test grpc_alarm add and cancel. */ -static void test_grpc_alarm(void) { - grpc_alarm alarm; - grpc_alarm alarm_to_cancel; - /* Timeout on the alarm cond. var, so make big enough to absorb time - deviations. Otherwise, operations after wait will not be properly ordered - */ - gpr_timespec alarm_deadline; - gpr_timespec followup_deadline; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; - - alarm_arg arg; - alarm_arg arg2; - void *fdone; - - grpc_init(); - - arg.counter = 0; - arg.success = SUCCESS_NOT_SET; - arg.done_success_ctr = 0; - arg.done_cancel_ctr = 0; - arg.done = 0; - gpr_mu_init(&arg.mu); - gpr_cv_init(&arg.cv); - gpr_event_init(&arg.fcb_arg); - - grpc_alarm_init(&alarm, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(100), alarm_cb, &arg, - gpr_now(GPR_CLOCK_MONOTONIC), &call_list); - - alarm_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1); - gpr_mu_lock(&arg.mu); - while (arg.done == 0) { - if (gpr_cv_wait(&arg.cv, &arg.mu, alarm_deadline)) { - gpr_log(GPR_ERROR, "alarm deadline exceeded"); - break; - } - } - gpr_mu_unlock(&arg.mu); - - followup_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5); - fdone = gpr_event_wait(&arg.fcb_arg, followup_deadline); - - if (arg.counter != 1) { - gpr_log(GPR_ERROR, "Alarm callback not called"); - GPR_ASSERT(0); - } else if (arg.done_success_ctr != 1) { - gpr_log(GPR_ERROR, "Alarm done callback not called with success"); - GPR_ASSERT(0); - } else if (arg.done_cancel_ctr != 0) { - gpr_log(GPR_ERROR, "Alarm done callback called with cancel"); - GPR_ASSERT(0); - } else if (arg.success == SUCCESS_NOT_SET) { - gpr_log(GPR_ERROR, "Alarm callback without status"); - GPR_ASSERT(0); - } else { - gpr_log(GPR_INFO, "Alarm callback called successfully"); - } - - if (fdone != (void *)&arg.fcb_arg) { - gpr_log(GPR_ERROR, "Followup callback #1 not invoked properly %p %p", fdone, - &arg.fcb_arg); - GPR_ASSERT(0); - } - gpr_cv_destroy(&arg.cv); - gpr_mu_destroy(&arg.mu); - - arg2.counter = 0; - arg2.success = SUCCESS_NOT_SET; - arg2.done_success_ctr = 0; - arg2.done_cancel_ctr = 0; - arg2.done = 0; - gpr_mu_init(&arg2.mu); - gpr_cv_init(&arg2.cv); - - gpr_event_init(&arg2.fcb_arg); - - grpc_alarm_init(&alarm_to_cancel, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(100), - alarm_cb, &arg2, gpr_now(GPR_CLOCK_MONOTONIC), &call_list); - grpc_alarm_cancel(&alarm_to_cancel, &call_list); - - alarm_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1); - gpr_mu_lock(&arg2.mu); - while (arg2.done == 0) { - gpr_cv_wait(&arg2.cv, &arg2.mu, alarm_deadline); - } - gpr_mu_unlock(&arg2.mu); - - gpr_log(GPR_INFO, "alarm done = %d", arg2.done); - - followup_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5); - fdone = gpr_event_wait(&arg2.fcb_arg, followup_deadline); - - if (arg2.counter != arg2.done_success_ctr) { - gpr_log(GPR_ERROR, "Alarm callback called but didn't lead to done success"); - GPR_ASSERT(0); - } else if (arg2.done_success_ctr && arg2.done_cancel_ctr) { - gpr_log(GPR_ERROR, "Alarm done callback called with success and cancel"); - GPR_ASSERT(0); - } else if (arg2.done_cancel_ctr + arg2.done_success_ctr != 1) { - gpr_log(GPR_ERROR, "Alarm done callback called incorrect number of times"); - GPR_ASSERT(0); - } else if (arg2.success == SUCCESS_NOT_SET) { - gpr_log(GPR_ERROR, "Alarm callback without status"); - GPR_ASSERT(0); - } else if (arg2.done_success_ctr) { - gpr_log(GPR_INFO, "Alarm callback executed before cancel"); - gpr_log(GPR_INFO, "Current value of triggered is %d\n", - alarm_to_cancel.triggered); - } else if (arg2.done_cancel_ctr) { - gpr_log(GPR_INFO, "Alarm callback canceled"); - gpr_log(GPR_INFO, "Current value of triggered is %d\n", - alarm_to_cancel.triggered); - } else { - gpr_log(GPR_ERROR, "Alarm cancel test should not be here"); - GPR_ASSERT(0); - } - - if (fdone != (void *)&arg2.fcb_arg) { - gpr_log(GPR_ERROR, "Followup callback #2 not invoked properly %p %p", fdone, - &arg2.fcb_arg); - GPR_ASSERT(0); - } - gpr_cv_destroy(&arg2.cv); - gpr_mu_destroy(&arg2.mu); - - grpc_shutdown(); -} - -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_grpc_alarm(); - return 0; -} diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c index 753221cada7..5604d869c8d 100644 --- a/test/core/security/print_google_default_creds_token.c +++ b/test/core/security/print_google_default_creds_token.c @@ -50,8 +50,8 @@ typedef struct { } synchronizer; static void on_metadata_response(void *user_data, grpc_credentials_md *md_elems, - size_t num_md, - grpc_credentials_status status) { + size_t num_md, grpc_credentials_status status, + grpc_call_list *call_list) { synchronizer *sync = user_data; if (status == GRPC_CREDENTIALS_ERROR) { fprintf(stderr, "Fetching token failed.\n"); @@ -70,6 +70,7 @@ static void on_metadata_response(void *user_data, grpc_credentials_md *md_elems, int main(int argc, char **argv) { int result = 0; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; synchronizer sync; grpc_credentials *creds = NULL; char *service_url = "https://test.foo.google.com/Foo"; @@ -91,13 +92,17 @@ int main(int argc, char **argv) { sync.is_done = 0; grpc_credentials_get_request_metadata(creds, &sync.pollset, service_url, - on_metadata_response, &sync); + on_metadata_response, &sync, + &call_list); gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); while (!sync.is_done) { grpc_pollset_worker worker; grpc_pollset_work(&sync.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC)); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); diff --git a/test/core/security/verify_jwt.c b/test/core/security/verify_jwt.c index f4432667ee2..417152a3007 100644 --- a/test/core/security/verify_jwt.c +++ b/test/core/security/verify_jwt.c @@ -89,6 +89,7 @@ int main(int argc, char **argv) { gpr_cmdline *cl; char *jwt = NULL; char *aud = NULL; + grpc_call_list call_list = GRPC_CALL_LIST_INIT; cl = gpr_cmdline_create("JWT verifier tool"); gpr_cmdline_add_string(cl, "jwt", "JSON web token to verify", &jwt); @@ -106,13 +107,16 @@ int main(int argc, char **argv) { sync.is_done = 0; grpc_jwt_verifier_verify(verifier, &sync.pollset, jwt, aud, - on_jwt_verification_done, &sync); + on_jwt_verification_done, &sync, &call_list); gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); while (!sync.is_done) { grpc_pollset_worker worker; grpc_pollset_work(&sync.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC)); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); + gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); + grpc_call_list_run(&call_list); + gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index 06bab3279e6..85a021da89d 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -220,6 +220,7 @@ static void producer_thread(void *arg) { grpc_cq_end_op(opt->cc, (void *)(gpr_intptr)1, 1, free_completion, NULL, gpr_malloc(sizeof(grpc_cq_completion)), &call_list); opt->events_triggered++; + grpc_call_list_run(&call_list); } gpr_log(GPR_INFO, "producer %d phase 2 done", opt->id); diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 68fd6a6e5ab..3b9ae3c79de 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -29,20 +29,6 @@ "test/core/iomgr/alarm_list_test.c" ] }, - { - "deps": [ - "gpr", - "gpr_test_util", - "grpc", - "grpc_test_util" - ], - "headers": [], - "language": "c", - "name": "alarm_test", - "src": [ - "test/core/iomgr/alarm_test.c" - ] - }, { "deps": [ "gpr", diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 9cf762de3a1..1ab29b4ba7a 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -37,24 +37,6 @@ "windows" ] }, - { - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "exclude_configs": [], - "flaky": false, - "language": "c", - "name": "alarm_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, { "ci_platforms": [ "linux", diff --git a/vsprojects/buildtests_c.sln b/vsprojects/buildtests_c.sln index 3a4bf4f2c47..84b40d67355 100644 --- a/vsprojects/buildtests_c.sln +++ b/vsprojects/buildtests_c.sln @@ -597,17 +597,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alarm_list_test", "vcxproj\ {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alarm_test", "vcxproj\test\alarm_test\alarm_test.vcxproj", "{AFD362D7-0E2A-E700-1F27-9D90F76166DF}" - ProjectSection(myProperties) = preProject - lib = "False" - EndProjectSection - ProjectSection(ProjectDependencies) = postProject - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} = {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alpn_test", "vcxproj\test\alpn_test\alpn_test.vcxproj", "{5BAAE7EA-A972-DD80-F190-29B9E3110BB3}" ProjectSection(myProperties) = preProject lib = "False" @@ -8808,22 +8797,6 @@ Global {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Release-DLL|Win32.Build.0 = Release|Win32 {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Release-DLL|x64.ActiveCfg = Release|x64 {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Release-DLL|x64.Build.0 = Release|x64 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Debug|Win32.ActiveCfg = Debug|Win32 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Debug|x64.ActiveCfg = Debug|x64 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Release|Win32.ActiveCfg = Release|Win32 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Release|x64.ActiveCfg = Release|x64 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Debug|Win32.Build.0 = Debug|Win32 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Debug|x64.Build.0 = Debug|x64 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Release|Win32.Build.0 = Release|Win32 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Release|x64.Build.0 = Release|x64 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Debug-DLL|Win32.ActiveCfg = Debug|Win32 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Debug-DLL|Win32.Build.0 = Debug|Win32 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Debug-DLL|x64.ActiveCfg = Debug|x64 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Debug-DLL|x64.Build.0 = Debug|x64 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Release-DLL|Win32.ActiveCfg = Release|Win32 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Release-DLL|Win32.Build.0 = Release|Win32 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Release-DLL|x64.ActiveCfg = Release|x64 - {AFD362D7-0E2A-E700-1F27-9D90F76166DF}.Release-DLL|x64.Build.0 = Release|x64 {5BAAE7EA-A972-DD80-F190-29B9E3110BB3}.Debug|Win32.ActiveCfg = Debug|Win32 {5BAAE7EA-A972-DD80-F190-29B9E3110BB3}.Debug|x64.ActiveCfg = Debug|x64 {5BAAE7EA-A972-DD80-F190-29B9E3110BB3}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/vsprojects/vcxproj/test/alarm_test/alarm_test.vcxproj b/vsprojects/vcxproj/test/alarm_test/alarm_test.vcxproj deleted file mode 100644 index a68da91ecd0..00000000000 --- a/vsprojects/vcxproj/test/alarm_test/alarm_test.vcxproj +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {AFD362D7-0E2A-E700-1F27-9D90F76166DF} - - - - v100 - - - v110 - - - v120 - - - Application - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - alarm_test - static - Debug - Debug - - - alarm_test - static - Debug - Debug - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - - - - - - - - - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - - - {29D16885-7228-4C31-81ED-5F9187C7F2A9} - - - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - - - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - diff --git a/vsprojects/vcxproj/test/alarm_test/alarm_test.vcxproj.filters b/vsprojects/vcxproj/test/alarm_test/alarm_test.vcxproj.filters deleted file mode 100644 index 2bbf890ec01..00000000000 --- a/vsprojects/vcxproj/test/alarm_test/alarm_test.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - test\core\iomgr - - - - - - {ce8dc749-635b-4486-70d6-6bdf52297d09} - - - {c214d1e9-ebce-1040-28fa-e286dbb702d9} - - - {2b84eb4a-2ede-2e5b-e422-2931482ae1c0} - - - - From 62aef621360403c15a7c58f4b7a3e8daadc7b07a Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 21 Sep 2015 21:27:54 -0700 Subject: [PATCH 19/56] Fixes --- src/core/client_config/lb_policies/pick_first.c | 2 +- src/core/iomgr/fd_posix.c | 2 ++ src/core/iomgr/iomgr.c | 10 +++++++--- src/core/transport/connectivity_state.c | 4 ++++ test/core/iomgr/tcp_server_posix_test.c | 4 +++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index c9a200eb8c4..eebc7191ba2 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -232,7 +232,7 @@ static void pf_connectivity_changed(void *arg, int iomgr_success, break; case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_IDLE: - grpc_connectivity_state_set(&p->state_tracker, p->checking_connectivity, + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_CONNECTING, "connecting_changed", call_list); grpc_subchannel_notify_on_state_change( p->subchannels[p->checking_subchannel], &p->checking_connectivity, diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index 294cb70746f..7c1db32553f 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -150,6 +150,8 @@ static void unref_by(grpc_fd *fd, int n) { void grpc_fd_global_init(void) { gpr_mu_init(&fd_freelist_mu); } void grpc_fd_global_shutdown(void) { + gpr_mu_lock(&fd_freelist_mu); + gpr_mu_unlock(&fd_freelist_mu); while (fd_freelist != NULL) { grpc_fd *fd = fd_freelist; fd_freelist = fd_freelist->freelist_next; diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index 5cb20a7ba05..b2c17b1ef20 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -134,6 +134,10 @@ void grpc_iomgr_shutdown(void) { grpc_alarm_list_shutdown(&call_list); grpc_call_list_run(&call_list); + /* ensure all threads have left g_mu */ + gpr_mu_lock(&g_mu); + gpr_mu_unlock(&g_mu); + grpc_iomgr_platform_shutdown(); gpr_mu_destroy(&g_mu); gpr_cv_destroy(&g_rcv); @@ -166,10 +170,10 @@ void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, void grpc_call_list_add(grpc_call_list *call_list, grpc_closure *closure, int success) { - if (!closure) return; + if (closure == NULL) return; closure->next = NULL; closure->success = success; - if (!call_list->head) { + if (call_list->head == NULL) { call_list->head = closure; } else { call_list->tail->next = closure; @@ -181,7 +185,7 @@ void grpc_call_list_run(grpc_call_list *call_list) { while (!grpc_call_list_empty(*call_list)) { grpc_closure *c = call_list->head; call_list->head = call_list->tail = NULL; - while (c) { + while (c != NULL) { grpc_closure *next = c->next; c->cb(c->cb_arg, c->success, call_list); c = next; diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c index dc8392159b2..d04c3a2209a 100644 --- a/src/core/transport/connectivity_state.c +++ b/src/core/transport/connectivity_state.c @@ -87,6 +87,10 @@ void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker, grpc_connectivity_state grpc_connectivity_state_check( grpc_connectivity_state_tracker *tracker) { + if (grpc_connectivity_state_trace) { + gpr_log(GPR_DEBUG, "CONWATCH: %s: get %s", tracker->name, + grpc_connectivity_state_name(tracker->current_state)); + } return tracker->current_state; } diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index 5bd3792a012..75026f651c6 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -74,6 +74,7 @@ static void test_no_op_with_start(void) { } static void test_no_op_with_port(void) { + grpc_call_list call_list = GRPC_CALL_LIST_INIT; struct sockaddr_in addr; grpc_tcp_server *s = grpc_tcp_server_create(); LOG_TEST("test_no_op_with_port"); @@ -83,7 +84,8 @@ static void test_no_op_with_port(void) { GPR_ASSERT( grpc_tcp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr))); - grpc_tcp_server_destroy(s, NULL, NULL); + grpc_tcp_server_destroy(s, NULL, &call_list); + grpc_call_list_run(&call_list); } static void test_no_op_with_port_and_start(void) { From 4fc085fcbb80e9a5f018c9d6186ce8ce35c764de Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 21 Sep 2015 21:46:01 -0700 Subject: [PATCH 20/56] Test bug fixes --- test/core/iomgr/tcp_client_posix_test.c | 7 ++++--- test/core/iomgr/tcp_server_posix_test.c | 2 +- test/core/iomgr/udp_server_test.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index a5a3d0ea7ec..0dd752d841c 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -223,8 +223,9 @@ void test_times_out(void) { for (;;) { grpc_pollset_worker worker; gpr_timespec now = gpr_now(connect_deadline.clock_type); - gpr_timespec continue_verifying_time = gpr_time_from_seconds(2, GPR_TIMESPAN); - gpr_timespec grace_time = gpr_time_from_seconds(1, GPR_TIMESPAN); + gpr_timespec continue_verifying_time = + gpr_time_from_seconds(5, GPR_TIMESPAN); + gpr_timespec grace_time = gpr_time_from_seconds(3, GPR_TIMESPAN); gpr_timespec finish_time = gpr_time_add(connect_deadline, continue_verifying_time); gpr_timespec restart_verifying_time = gpr_time_add(connect_deadline, grace_time); int is_after_deadline = gpr_time_cmp(now, connect_deadline) > 0; @@ -244,7 +245,7 @@ void test_times_out(void) { GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10), &call_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_call_list_run(&call_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index 75026f651c6..b80506bc515 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -101,7 +101,7 @@ static void test_no_op_with_port_and_start(void) { grpc_tcp_server_start(s, NULL, 0, on_connect, NULL, &call_list); - grpc_tcp_server_destroy(s, NULL, NULL); + grpc_tcp_server_destroy(s, NULL, &call_list); grpc_call_list_run(&call_list); } diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c index 476dfd63bcd..86b6b9a9fa8 100644 --- a/test/core/iomgr/udp_server_test.c +++ b/test/core/iomgr/udp_server_test.c @@ -103,7 +103,7 @@ static void test_no_op_with_port_and_start(void) { grpc_udp_server_start(s, NULL, 0, &call_list); - grpc_udp_server_destroy(s, NULL, NULL); + grpc_udp_server_destroy(s, NULL, &call_list); grpc_call_list_run(&call_list); } From 40cd820fd6fee53c270c115617107100c6c18ece Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 07:24:21 -0700 Subject: [PATCH 21/56] Fix list iteration --- src/core/client_config/subchannel.c | 2 +- test/core/end2end/fixtures/proxy.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index 48df4bbd31c..c570c552674 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -597,7 +597,7 @@ static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { gpr_mu_unlock(&c->mu); while (w4c != NULL) { - waiting_for_connect *next = w4c; + waiting_for_connect *next = w4c->next; grpc_call_list_add(call_list, &w4c->continuation, 1); w4c = next; } diff --git a/test/core/end2end/fixtures/proxy.c b/test/core/end2end/fixtures/proxy.c index 0090cf42f21..b7933586530 100644 --- a/test/core/end2end/fixtures/proxy.c +++ b/test/core/end2end/fixtures/proxy.c @@ -100,6 +100,10 @@ grpc_end2end_proxy *grpc_end2end_proxy_create( gpr_join_host_port(&proxy->proxy_port, "localhost", proxy_port); gpr_join_host_port(&proxy->server_port, "localhost", server_port); + + gpr_log(GPR_DEBUG, "PROXY ADDR:%s BACKEND:%s", proxy->proxy_port, + proxy->server_port); + proxy->cq = grpc_completion_queue_create(NULL); proxy->server = def->create_server(proxy->proxy_port); proxy->client = def->create_client(proxy->server_port); @@ -142,8 +146,6 @@ void grpc_end2end_proxy_destroy(grpc_end2end_proxy *proxy) { } static void unrefpc(proxy_call *pc, const char *reason) { - gpr_log(GPR_DEBUG, "unref %p: %s %d -> %d", pc, reason, pc->refs.count, - pc->refs.count - 1); if (gpr_unref(&pc->refs)) { grpc_call_destroy(pc->c2p); grpc_call_destroy(pc->p2s); @@ -156,8 +158,6 @@ static void unrefpc(proxy_call *pc, const char *reason) { } static void refpc(proxy_call *pc, const char *reason) { - gpr_log(GPR_DEBUG, "ref %p: %s %d -> %d", pc, reason, pc->refs.count, - pc->refs.count + 1); gpr_ref(&pc->refs); } From d9fdaf204cbca6472f5588eba83f37c01bb6c8a4 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 08:31:23 -0700 Subject: [PATCH 22/56] Fix tests --- test/core/iomgr/endpoint_tests.c | 20 +++++++------------- test/core/iomgr/tcp_server_posix_test.c | 3 ++- test/core/security/secure_endpoint_test.c | 3 +-- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index 02618dfd667..31743167cd2 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -151,18 +151,12 @@ static void read_and_write_test_write_handler(void *data, int success, size_t nslices; if (success) { - for (;;) { - /* Need to do inline writes until they don't succeed synchronously or we - finish writing */ - state->bytes_written += state->current_write_size; - if (state->target_bytes - state->bytes_written < - state->current_write_size) { - state->current_write_size = state->target_bytes - state->bytes_written; - } - if (state->current_write_size == 0) { - break; - } - + state->bytes_written += state->current_write_size; + if (state->target_bytes - state->bytes_written < + state->current_write_size) { + state->current_write_size = state->target_bytes - state->bytes_written; + } + if (state->current_write_size != 0) { slices = allocate_blocks(state->current_write_size, 8192, &nslices, &state->current_write_data); gpr_slice_buffer_reset_and_unref(&state->outgoing); @@ -170,8 +164,8 @@ static void read_and_write_test_write_handler(void *data, int success, grpc_endpoint_write(state->write_ep, &state->outgoing, &state->done_write, call_list); free(slices); + return; } - GPR_ASSERT(state->bytes_written == state->target_bytes); } gpr_log(GPR_INFO, "Write handler done"); diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index b80506bc515..6ce78d20888 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -159,7 +159,8 @@ static void test_connect(int n) { gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_tcp_server_destroy(s, NULL, NULL); + grpc_tcp_server_destroy(s, NULL, &call_list); + grpc_call_list_run(&call_list); } static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index f7948b56afb..2e0f17f3ab0 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -140,7 +140,6 @@ static grpc_endpoint_test_config configs[] = { static void inc_call_ctr(void *arg, int success, grpc_call_list *call_list) { ++*(int *)arg; - ; } static void test_leftover(grpc_endpoint_test_config config, size_t slice_size) { @@ -155,7 +154,7 @@ static void test_leftover(grpc_endpoint_test_config config, size_t slice_size) { gpr_slice_buffer_init(&incoming); grpc_closure_init(&done_closure, inc_call_ctr, &n); - grpc_endpoint_read(f.client_ep, &incoming, NULL, &call_list); + grpc_endpoint_read(f.client_ep, &incoming, &done_closure, &call_list); grpc_call_list_run(&call_list); GPR_ASSERT(n == 1); GPR_ASSERT(incoming.count == 1); From d9ccbbf6b98721f3e0256436e8a31fb378324d34 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 09:30:00 -0700 Subject: [PATCH 23/56] Rename call_list to closure_list --- src/core/census/grpc_filter.c | 24 +- src/core/channel/channel_stack.c | 33 +-- src/core/channel/channel_stack.h | 32 +-- src/core/channel/client_channel.c | 185 +++++++------- src/core/channel/client_channel.h | 11 +- src/core/channel/compress_filter.c | 16 +- src/core/channel/connected_channel.c | 34 +-- src/core/channel/http_client_filter.c | 22 +- src/core/channel/http_server_filter.c | 24 +- src/core/channel/noop_filter.c | 12 +- src/core/client_config/client_config.c | 4 +- src/core/client_config/client_config.h | 2 +- src/core/client_config/connector.c | 14 +- src/core/client_config/connector.h | 14 +- .../client_config/lb_policies/pick_first.c | 104 ++++---- .../client_config/lb_policies/round_robin.c | 85 +++---- src/core/client_config/lb_policy.c | 34 +-- src/core/client_config/lb_policy.h | 37 +-- src/core/client_config/resolver.c | 25 +- src/core/client_config/resolver.h | 22 +- .../client_config/resolvers/dns_resolver.c | 45 ++-- .../resolvers/sockaddr_resolver.c | 35 +-- src/core/client_config/subchannel.c | 170 ++++++------- src/core/client_config/subchannel.h | 18 +- src/core/client_config/subchannel_factory.c | 8 +- src/core/client_config/subchannel_factory.h | 9 +- .../merge_channel_args.c | 8 +- src/core/httpcli/httpcli.c | 105 ++++---- src/core/httpcli/httpcli.h | 14 +- src/core/httpcli/httpcli_security_connector.c | 25 +- src/core/iomgr/alarm.c | 26 +- src/core/iomgr/alarm.h | 4 +- src/core/iomgr/alarm_internal.h | 4 +- src/core/iomgr/endpoint.c | 25 +- src/core/iomgr/endpoint.h | 24 +- src/core/iomgr/fd_posix.c | 46 ++-- src/core/iomgr/fd_posix.h | 14 +- src/core/iomgr/iomgr.c | 38 +-- src/core/iomgr/iomgr.h | 18 +- src/core/iomgr/pollset.h | 7 +- .../iomgr/pollset_multipoller_with_epoll.c | 39 ++- .../pollset_multipoller_with_poll_posix.c | 25 +- src/core/iomgr/pollset_posix.c | 65 +++-- src/core/iomgr/pollset_posix.h | 17 +- src/core/iomgr/pollset_set.h | 4 +- src/core/iomgr/pollset_set_posix.c | 12 +- src/core/iomgr/pollset_set_posix.h | 4 +- src/core/iomgr/resolve_address.h | 2 +- src/core/iomgr/resolve_address_posix.c | 6 +- src/core/iomgr/tcp_client.h | 3 +- src/core/iomgr/tcp_client_posix.c | 37 +-- src/core/iomgr/tcp_posix.c | 86 +++---- src/core/iomgr/tcp_server.h | 6 +- src/core/iomgr/tcp_server_posix.c | 38 +-- src/core/iomgr/udp_server.c | 34 +-- src/core/iomgr/udp_server.h | 5 +- src/core/iomgr/workqueue.h | 15 +- src/core/iomgr/workqueue_posix.c | 45 ++-- src/core/iomgr/workqueue_posix.h | 2 +- src/core/security/client_auth_filter.c | 44 ++-- src/core/security/credentials.c | 77 +++--- src/core/security/credentials.h | 8 +- .../security/google_default_credentials.c | 16 +- src/core/security/handshake.c | 71 +++--- src/core/security/handshake.h | 3 +- src/core/security/jwt_verifier.c | 14 +- src/core/security/jwt_verifier.h | 2 +- src/core/security/secure_endpoint.c | 59 ++--- src/core/security/security_connector.c | 40 +-- src/core/security/security_connector.h | 20 +- src/core/security/server_auth_filter.c | 24 +- src/core/security/server_secure_chttp2.c | 44 ++-- src/core/surface/call.c | 146 +++++------ src/core/surface/call.h | 18 +- src/core/surface/channel.c | 23 +- src/core/surface/channel.h | 14 +- src/core/surface/channel_connectivity.c | 53 ++-- src/core/surface/channel_create.c | 40 +-- src/core/surface/completion_queue.c | 34 +-- src/core/surface/completion_queue.h | 6 +- src/core/surface/lame_client.c | 33 +-- src/core/surface/secure_channel_create.c | 47 ++-- src/core/surface/server.c | 228 +++++++++--------- src/core/surface/server.h | 8 +- src/core/surface/server_chttp2.c | 31 +-- src/core/transport/chttp2/frame_data.c | 2 +- src/core/transport/chttp2/frame_data.h | 2 +- src/core/transport/chttp2/frame_goaway.c | 2 +- src/core/transport/chttp2/frame_goaway.h | 2 +- src/core/transport/chttp2/frame_ping.c | 4 +- src/core/transport/chttp2/frame_ping.h | 2 +- src/core/transport/chttp2/frame_rst_stream.c | 2 +- src/core/transport/chttp2/frame_rst_stream.h | 2 +- src/core/transport/chttp2/frame_settings.c | 2 +- src/core/transport/chttp2/frame_settings.h | 2 +- .../transport/chttp2/frame_window_update.c | 2 +- .../transport/chttp2/frame_window_update.h | 2 +- src/core/transport/chttp2/hpack_parser.c | 2 +- src/core/transport/chttp2/hpack_parser.h | 2 +- src/core/transport/chttp2/internal.h | 14 +- src/core/transport/chttp2/parsing.c | 26 +- src/core/transport/chttp2/writing.c | 9 +- src/core/transport/chttp2_transport.c | 219 +++++++++-------- src/core/transport/chttp2_transport.h | 5 +- src/core/transport/connectivity_state.c | 12 +- src/core/transport/connectivity_state.h | 7 +- src/core/transport/transport.c | 38 +-- src/core/transport/transport.h | 16 +- src/core/transport/transport_impl.h | 12 +- test/core/bad_client/bad_client.c | 42 ++-- test/core/channel/channel_stack_test.c | 27 ++- test/core/client_config/lb_policies_test.c | 6 +- .../core/end2end/fixtures/h2_sockpair+trace.c | 32 +-- test/core/end2end/fixtures/h2_sockpair.c | 28 +-- .../core/end2end/fixtures/h2_sockpair_1byte.c | 28 +-- test/core/httpcli/httpcli_test.c | 27 ++- test/core/iomgr/alarm_list_test.c | 52 ++-- test/core/iomgr/endpoint_pair_test.c | 17 +- test/core/iomgr/endpoint_tests.c | 32 +-- test/core/iomgr/fd_conservation_posix_test.c | 8 +- test/core/iomgr/fd_posix_test.c | 109 +++++---- test/core/iomgr/resolve_address_test.c | 4 +- test/core/iomgr/tcp_client_posix_test.c | 46 ++-- test/core/iomgr/tcp_posix_test.c | 73 +++--- test/core/iomgr/tcp_server_posix_test.c | 47 ++-- test/core/iomgr/udp_server_test.c | 31 +-- test/core/iomgr/workqueue_test.c | 26 +- test/core/security/credentials_test.c | 190 +++++++-------- test/core/security/jwt_verifier_test.c | 68 +++--- test/core/security/oauth2_utils.c | 17 +- .../print_google_default_creds_token.c | 10 +- test/core/security/secure_endpoint_test.c | 36 +-- test/core/security/verify_jwt.c | 8 +- test/core/surface/completion_queue_test.c | 26 +- test/core/util/port_posix.c | 32 +-- test/core/util/reconnect_server.c | 30 +-- 136 files changed, 2255 insertions(+), 2110 deletions(-) diff --git a/src/core/census/grpc_filter.c b/src/core/census/grpc_filter.c index fa318c4e541..26de5142c5d 100644 --- a/src/core/census/grpc_filter.c +++ b/src/core/census/grpc_filter.c @@ -90,20 +90,20 @@ static void client_mutate_op(grpc_call_element* elem, static void client_start_transport_op(grpc_call_element* elem, grpc_transport_stream_op* op, - grpc_call_list* call_list) { + grpc_closure_list* closure_list) { client_mutate_op(elem, op); - grpc_call_next_op(elem, op, call_list); + grpc_call_next_op(elem, op, closure_list); } static void server_on_done_recv(void* ptr, int success, - grpc_call_list* call_list) { + grpc_closure_list* closure_list) { grpc_call_element* elem = ptr; call_data* calld = elem->call_data; channel_data* chand = elem->channel_data; if (success) { extract_and_annotate_method_tag(calld->recv_ops, calld, chand); } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, call_list); + calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, closure_list); } static void server_mutate_op(grpc_call_element* elem, @@ -119,17 +119,17 @@ static void server_mutate_op(grpc_call_element* elem, static void server_start_transport_op(grpc_call_element* elem, grpc_transport_stream_op* op, - grpc_call_list* call_list) { + grpc_closure_list* closure_list) { 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(elem, op, call_list); + grpc_call_next_op(elem, op, closure_list); } static void client_init_call_elem(grpc_call_element* elem, const void* server_transport_data, grpc_transport_stream_op* initial_op, - grpc_call_list* call_list) { + grpc_closure_list* closure_list) { call_data* d = elem->call_data; GPR_ASSERT(d != NULL); d->start_ts = gpr_now(GPR_CLOCK_REALTIME); @@ -137,7 +137,7 @@ static void client_init_call_elem(grpc_call_element* elem, } static void client_destroy_call_elem(grpc_call_element* elem, - grpc_call_list* call_list) { + grpc_closure_list* closure_list) { call_data* d = elem->call_data; GPR_ASSERT(d != NULL); /* TODO(hongyu): record rpc client stats and census_rpc_end_op here */ @@ -146,7 +146,7 @@ static void client_destroy_call_elem(grpc_call_element* elem, static void server_init_call_elem(grpc_call_element* elem, const void* server_transport_data, grpc_transport_stream_op* initial_op, - grpc_call_list* call_list) { + grpc_closure_list* closure_list) { call_data* d = elem->call_data; GPR_ASSERT(d != NULL); d->start_ts = gpr_now(GPR_CLOCK_REALTIME); @@ -156,7 +156,7 @@ static void server_init_call_elem(grpc_call_element* elem, } static void server_destroy_call_elem(grpc_call_element* elem, - grpc_call_list* call_list) { + grpc_closure_list* closure_list) { call_data* d = elem->call_data; GPR_ASSERT(d != NULL); /* TODO(hongyu): record rpc server stats and census_tracing_end_op here */ @@ -165,14 +165,14 @@ static void server_destroy_call_elem(grpc_call_element* elem, static void init_channel_elem(grpc_channel_element* elem, grpc_channel* master, const grpc_channel_args* args, grpc_mdctx* mdctx, int is_first, int is_last, - grpc_call_list* call_list) { + grpc_closure_list* closure_list) { channel_data* chand = elem->channel_data; GPR_ASSERT(chand != NULL); chand->path_str = grpc_mdstr_from_string(mdctx, ":path", 0); } static void destroy_channel_elem(grpc_channel_element* elem, - grpc_call_list* call_list) { + grpc_closure_list* closure_list) { channel_data* chand = elem->channel_data; GPR_ASSERT(chand != NULL); if (chand->path_str != NULL) { diff --git a/src/core/channel/channel_stack.c b/src/core/channel/channel_stack.c index 10fbd520c32..47f1f8e828d 100644 --- a/src/core/channel/channel_stack.c +++ b/src/core/channel/channel_stack.c @@ -106,7 +106,7 @@ void grpc_channel_stack_init(const grpc_channel_filter **filters, const grpc_channel_args *args, grpc_mdctx *metadata_context, grpc_channel_stack *stack, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t call_size = ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(grpc_call_stack)) + ROUND_UP_TO_ALIGNMENT_SIZE(filter_count * sizeof(grpc_call_element)); @@ -126,7 +126,7 @@ void grpc_channel_stack_init(const grpc_channel_filter **filters, elems[i].channel_data = user_data; elems[i].filter->init_channel_elem(&elems[i], master, args, metadata_context, i == 0, - i == (filter_count - 1), call_list); + i == (filter_count - 1), closure_list); user_data += ROUND_UP_TO_ALIGNMENT_SIZE(filters[i]->sizeof_channel_data); call_size += ROUND_UP_TO_ALIGNMENT_SIZE(filters[i]->sizeof_call_data); } @@ -139,14 +139,15 @@ void grpc_channel_stack_init(const grpc_channel_filter **filters, } void grpc_channel_stack_destroy(grpc_channel_stack *stack, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { 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], call_list); + channel_elems[i].filter->destroy_channel_elem(&channel_elems[i], + closure_list); } } @@ -154,7 +155,7 @@ void grpc_call_stack_init(grpc_channel_stack *channel_stack, const void *transport_server_data, grpc_transport_stream_op *initial_op, grpc_call_stack *call_stack, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_channel_element *channel_elems = CHANNEL_ELEMS_FROM_STACK(channel_stack); size_t count = channel_stack->count; grpc_call_element *call_elems; @@ -172,40 +173,40 @@ void grpc_call_stack_init(grpc_channel_stack *channel_stack, call_elems[i].channel_data = channel_elems[i].channel_data; call_elems[i].call_data = user_data; call_elems[i].filter->init_call_elem(&call_elems[i], transport_server_data, - initial_op, call_list); + initial_op, closure_list); user_data += ROUND_UP_TO_ALIGNMENT_SIZE(call_elems[i].filter->sizeof_call_data); } } void grpc_call_stack_destroy(grpc_call_stack *stack, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call_element *elems = CALL_ELEMS_FROM_STACK(stack); size_t count = stack->count; size_t i; /* destroy per-filter data */ for (i = 0; i < count; i++) { - elems[i].filter->destroy_call_elem(&elems[i], call_list); + elems[i].filter->destroy_call_elem(&elems[i], closure_list); } } void grpc_call_next_op(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call_element *next_elem = elem + 1; - next_elem->filter->start_transport_stream_op(next_elem, op, call_list); + next_elem->filter->start_transport_stream_op(next_elem, op, closure_list); } char *grpc_call_next_get_peer(grpc_call_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call_element *next_elem = elem + 1; - return next_elem->filter->get_peer(next_elem, call_list); + return next_elem->filter->get_peer(next_elem, closure_list); } void grpc_channel_next_op(grpc_channel_element *elem, grpc_transport_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_channel_element *next_elem = elem + 1; - next_elem->filter->start_transport_op(next_elem, op, call_list); + next_elem->filter->start_transport_op(next_elem, op, closure_list); } grpc_channel_stack *grpc_channel_stack_from_top_element( @@ -220,9 +221,9 @@ grpc_call_stack *grpc_call_stack_from_top_element(grpc_call_element *elem) { } void grpc_call_element_send_cancel(grpc_call_element *cur_elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_transport_stream_op op; memset(&op, 0, sizeof(op)); op.cancel_with_status = GRPC_STATUS_CANCELLED; - grpc_call_next_op(cur_elem, &op, call_list); + grpc_call_next_op(cur_elem, &op, closure_list); } diff --git a/src/core/channel/channel_stack.h b/src/core/channel/channel_stack.h index 5afe7f258a0..b3facd4f014 100644 --- a/src/core/channel/channel_stack.h +++ b/src/core/channel/channel_stack.h @@ -66,12 +66,12 @@ typedef struct { See grpc_call_next_op on how to call the next element in the stack */ void (*start_transport_stream_op)(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* 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, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* sizeof(per call data) */ size_t sizeof_call_data; @@ -86,10 +86,11 @@ typedef struct { void (*init_call_elem)(grpc_call_element *elem, const void *server_transport_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Destroy per call data. The filter does not need to do any chaining */ - void (*destroy_call_elem)(grpc_call_element *elem, grpc_call_list *call_list); + void (*destroy_call_elem)(grpc_call_element *elem, + grpc_closure_list *closure_list); /* sizeof(per channel data) */ size_t sizeof_channel_data; @@ -102,14 +103,14 @@ typedef struct { void (*init_channel_elem)(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *metadata_context, int is_first, - int is_last, grpc_call_list *call_list); + int is_last, grpc_closure_list *closure_list); /* Destroy per channel data. The filter does not need to do any chaining */ void (*destroy_channel_elem)(grpc_channel_element *elem, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Implement grpc_call_get_peer() */ - char *(*get_peer)(grpc_call_element *elem, grpc_call_list *call_list); + char *(*get_peer)(grpc_call_element *elem, grpc_closure_list *closure_list); /* The name of this filter */ const char *name; @@ -162,10 +163,10 @@ void grpc_channel_stack_init(const grpc_channel_filter **filters, const grpc_channel_args *args, grpc_mdctx *metadata_context, grpc_channel_stack *stack, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Destroy a channel stack */ void grpc_channel_stack_destroy(grpc_channel_stack *stack, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* 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 @@ -174,20 +175,21 @@ void grpc_call_stack_init(grpc_channel_stack *channel_stack, const void *transport_server_data, grpc_transport_stream_op *initial_op, grpc_call_stack *call_stack, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Destroy a call stack */ -void grpc_call_stack_destroy(grpc_call_stack *stack, grpc_call_list *call_list); +void grpc_call_stack_destroy(grpc_call_stack *stack, + grpc_closure_list *closure_list); /* Call the next operation in a call stack */ void grpc_call_next_op(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* 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, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Pass through a request to get_peer to the next child element */ char *grpc_call_next_get_peer(grpc_call_element *elem, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Given the top element of a channel stack, get the channel stack itself */ grpc_channel_stack *grpc_channel_stack_from_top_element( @@ -199,7 +201,7 @@ void grpc_call_log_op(char *file, int line, gpr_log_severity severity, grpc_call_element *elem, grpc_transport_stream_op *op); void grpc_call_element_send_cancel(grpc_call_element *cur_elem, - grpc_call_list *call_list); + grpc_closure_list *closure_list); extern int grpc_trace_channel; diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 62f81daf447..54adeaee9d9 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -73,7 +73,7 @@ typedef struct { guarded by mu_config */ grpc_client_config *incoming_configuration; /** a list of closures that are all waiting for config to come in */ - grpc_call_list waiting_for_config_closures; + grpc_closure_list waiting_for_config_closures; /** resolver callback */ grpc_closure on_config_changed; /** connectivity state being tracked */ @@ -129,12 +129,12 @@ static grpc_closure *merge_into_waiting_op(grpc_call_element *elem, static void handle_op_after_cancellation(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; if (op->send_ops) { grpc_stream_ops_unref_owned_objects(op->send_ops->ops, op->send_ops->nops); - op->on_done_send->cb(op->on_done_send->cb_arg, 0, call_list); + op->on_done_send->cb(op->on_done_send->cb_arg, 0, closure_list); } if (op->recv_ops) { char status[GPR_LTOA_MIN_BUFSIZE]; @@ -153,10 +153,10 @@ static void handle_op_after_cancellation(grpc_call_element *elem, mdb.deadline = gpr_inf_future(GPR_CLOCK_REALTIME); grpc_sopb_add_metadata(op->recv_ops, mdb); *op->recv_state = GRPC_STREAM_CLOSED; - op->on_done_recv->cb(op->on_done_recv->cb_arg, 1, call_list); + op->on_done_recv->cb(op->on_done_recv->cb_arg, 1, closure_list); } if (op->on_consumed) { - op->on_consumed->cb(op->on_consumed->cb_arg, 0, call_list); + op->on_consumed->cb(op->on_consumed->cb_arg, 0, closure_list); } } @@ -168,13 +168,13 @@ typedef struct { static void perform_transport_stream_op(grpc_call_element *elem, grpc_transport_stream_op *op, int continuation, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static void continue_with_pick(void *arg, int iomgr_success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { waiting_call *wc = arg; call_data *calld = wc->elem->call_data; - perform_transport_stream_op(wc->elem, &calld->waiting_op, 1, call_list); + perform_transport_stream_op(wc->elem, &calld->waiting_op, 1, closure_list); gpr_free(wc); } @@ -184,7 +184,7 @@ static void add_to_lb_policy_wait_queue_locked_state_config( waiting_call *wc = gpr_malloc(sizeof(*wc)); grpc_closure_init(&wc->closure, continue_with_pick, wc); wc->elem = elem; - grpc_call_list_add(&chand->waiting_for_config_closures, &wc->closure, 1); + grpc_closure_list_add(&chand->waiting_for_config_closures, &wc->closure, 1); } static int is_empty(void *p, int len) { @@ -197,7 +197,7 @@ static int is_empty(void *p, int len) { } static void started_call(void *arg, int iomgr_success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = arg; grpc_transport_stream_op op; int have_waiting; @@ -207,7 +207,7 @@ static void started_call(void *arg, int iomgr_success, memset(&op, 0, sizeof(op)); op.cancel_with_status = GRPC_STATUS_CANCELLED; gpr_mu_unlock(&calld->mu_state); - grpc_subchannel_call_process_op(calld->subchannel_call, &op, call_list); + grpc_subchannel_call_process_op(calld->subchannel_call, &op, closure_list); } else if (calld->state == CALL_WAITING_FOR_CALL) { have_waiting = !is_empty(&calld->waiting_op, sizeof(calld->waiting_op)); if (calld->subchannel_call != NULL) { @@ -215,14 +215,14 @@ static void started_call(void *arg, int iomgr_success, gpr_mu_unlock(&calld->mu_state); if (have_waiting) { grpc_subchannel_call_process_op(calld->subchannel_call, - &calld->waiting_op, call_list); + &calld->waiting_op, closure_list); } } else { calld->state = CALL_CANCELLED; gpr_mu_unlock(&calld->mu_state); if (have_waiting) { handle_op_after_cancellation(calld->elem, &calld->waiting_op, - call_list); + closure_list); } } } else { @@ -232,19 +232,21 @@ static void started_call(void *arg, int iomgr_success, } static void picked_target(void *arg, int iomgr_success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = arg; grpc_pollset *pollset; if (calld->picked_channel == NULL) { /* treat this like a cancellation */ calld->waiting_op.cancel_with_status = GRPC_STATUS_UNAVAILABLE; - perform_transport_stream_op(calld->elem, &calld->waiting_op, 1, call_list); + perform_transport_stream_op(calld->elem, &calld->waiting_op, 1, + closure_list); } else { gpr_mu_lock(&calld->mu_state); if (calld->state == CALL_CANCELLED) { gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(calld->elem, &calld->waiting_op, call_list); + handle_op_after_cancellation(calld->elem, &calld->waiting_op, + closure_list); } else { GPR_ASSERT(calld->state == CALL_WAITING_FOR_PICK); calld->state = CALL_WAITING_FOR_CALL; @@ -253,7 +255,7 @@ static void picked_target(void *arg, int iomgr_success, grpc_closure_init(&calld->async_setup_task, started_call, calld); grpc_subchannel_create_call(calld->picked_channel, pollset, &calld->subchannel_call, - &calld->async_setup_task, call_list); + &calld->async_setup_task, closure_list); } } } @@ -287,7 +289,8 @@ static grpc_closure *merge_into_waiting_op(grpc_call_element *elem, return consumed_op; } -static char *cc_get_peer(grpc_call_element *elem, grpc_call_list *call_list) { +static char *cc_get_peer(grpc_call_element *elem, + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_subchannel_call *subchannel_call; @@ -298,8 +301,8 @@ static char *cc_get_peer(grpc_call_element *elem, grpc_call_list *call_list) { subchannel_call = calld->subchannel_call; GRPC_SUBCHANNEL_CALL_REF(subchannel_call, "get_peer"); gpr_mu_unlock(&calld->mu_state); - result = grpc_subchannel_call_get_peer(subchannel_call, call_list); - GRPC_SUBCHANNEL_CALL_UNREF(subchannel_call, "get_peer", call_list); + result = grpc_subchannel_call_get_peer(subchannel_call, closure_list); + GRPC_SUBCHANNEL_CALL_UNREF(subchannel_call, "get_peer", closure_list); return result; } else { gpr_mu_unlock(&calld->mu_state); @@ -310,7 +313,7 @@ static char *cc_get_peer(grpc_call_element *elem, grpc_call_list *call_list) { static void perform_transport_stream_op(grpc_call_element *elem, grpc_transport_stream_op *op, int continuation, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_subchannel_call *subchannel_call; @@ -325,15 +328,15 @@ static void perform_transport_stream_op(grpc_call_element *elem, GPR_ASSERT(!continuation); subchannel_call = calld->subchannel_call; gpr_mu_unlock(&calld->mu_state); - grpc_subchannel_call_process_op(subchannel_call, op, call_list); + grpc_subchannel_call_process_op(subchannel_call, op, closure_list); break; case CALL_CANCELLED: gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(elem, op, call_list); + handle_op_after_cancellation(elem, op, closure_list); break; case CALL_WAITING_FOR_SEND: GPR_ASSERT(!continuation); - grpc_call_list_add(call_list, merge_into_waiting_op(elem, op), 1); + grpc_closure_list_add(closure_list, merge_into_waiting_op(elem, op), 1); if (!calld->waiting_op.send_ops && calld->waiting_op.cancel_with_status == GRPC_STATUS_OK) { gpr_mu_unlock(&calld->mu_state); @@ -359,10 +362,11 @@ static void perform_transport_stream_op(grpc_call_element *elem, op2.on_consumed = NULL; } gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(elem, op, call_list); - handle_op_after_cancellation(elem, &op2, call_list); + handle_op_after_cancellation(elem, op, closure_list); + handle_op_after_cancellation(elem, &op2, closure_list); } else { - grpc_call_list_add(call_list, merge_into_waiting_op(elem, op), 1); + grpc_closure_list_add(closure_list, merge_into_waiting_op(elem, op), + 1); gpr_mu_unlock(&calld->mu_state); } break; @@ -372,7 +376,7 @@ static void perform_transport_stream_op(grpc_call_element *elem, if (op->cancel_with_status != GRPC_STATUS_OK) { calld->state = CALL_CANCELLED; gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(elem, op, call_list); + handle_op_after_cancellation(elem, op, closure_list); } else { calld->waiting_op = *op; @@ -402,9 +406,9 @@ static void perform_transport_stream_op(grpc_call_element *elem, grpc_closure_init(&calld->async_setup_task, picked_target, calld); grpc_lb_policy_pick(lb_policy, bind_pollset, initial_metadata, &calld->picked_channel, - &calld->async_setup_task, call_list); + &calld->async_setup_task, closure_list); - GRPC_LB_POLICY_UNREF(lb_policy, "pick", call_list); + GRPC_LB_POLICY_UNREF(lb_policy, "pick", closure_list); } else if (chand->resolver != NULL) { calld->state = CALL_WAITING_FOR_CONFIG; add_to_lb_policy_wait_queue_locked_state_config(elem); @@ -413,7 +417,7 @@ static void perform_transport_stream_op(grpc_call_element *elem, chand->started_resolving = 1; grpc_resolver_next(chand->resolver, &chand->incoming_configuration, - &chand->on_config_changed, call_list); + &chand->on_config_changed, closure_list); } gpr_mu_unlock(&chand->mu_config); gpr_mu_unlock(&calld->mu_state); @@ -421,7 +425,7 @@ static void perform_transport_stream_op(grpc_call_element *elem, calld->state = CALL_CANCELLED; gpr_mu_unlock(&chand->mu_config); gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(elem, op, call_list); + handle_op_after_cancellation(elem, op, closure_list); } } } @@ -431,16 +435,16 @@ static void perform_transport_stream_op(grpc_call_element *elem, static void cc_start_transport_stream_op(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list) { - perform_transport_stream_op(elem, op, 0, call_list); + grpc_closure_list *closure_list) { + perform_transport_stream_op(elem, op, 0, closure_list); } static void watch_lb_policy(channel_data *chand, grpc_lb_policy *lb_policy, grpc_connectivity_state current_state, - grpc_call_list *cl); + grpc_closure_list *cl); static void on_lb_policy_state_changed_locked(lb_policy_connectivity_watcher *w, - grpc_call_list *cl) { + grpc_closure_list *cl) { /* check if the notification is for a stale policy */ if (w->lb_policy != w->chand->lb_policy) return; @@ -452,20 +456,21 @@ static void on_lb_policy_state_changed_locked(lb_policy_connectivity_watcher *w, } static void on_lb_policy_state_changed(void *arg, int iomgr_success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { lb_policy_connectivity_watcher *w = arg; gpr_mu_lock(&w->chand->mu_config); - on_lb_policy_state_changed_locked(w, call_list); + on_lb_policy_state_changed_locked(w, closure_list); gpr_mu_unlock(&w->chand->mu_config); - GRPC_CHANNEL_INTERNAL_UNREF(w->chand->master, "watch_lb_policy", call_list); + GRPC_CHANNEL_INTERNAL_UNREF(w->chand->master, "watch_lb_policy", + closure_list); gpr_free(w); } static void watch_lb_policy(channel_data *chand, grpc_lb_policy *lb_policy, grpc_connectivity_state current_state, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { lb_policy_connectivity_watcher *w = gpr_malloc(sizeof(*w)); GRPC_CHANNEL_INTERNAL_REF(chand->master, "watch_lb_policy"); @@ -474,11 +479,11 @@ static void watch_lb_policy(channel_data *chand, grpc_lb_policy *lb_policy, w->state = current_state; w->lb_policy = lb_policy; grpc_lb_policy_notify_on_state_change(lb_policy, &w->state, &w->on_changed, - call_list); + closure_list); } static void cc_on_config_changed(void *arg, int iomgr_success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { channel_data *chand = arg; grpc_lb_policy *lb_policy = NULL; grpc_lb_policy *old_lb_policy; @@ -491,10 +496,10 @@ static void cc_on_config_changed(void *arg, int iomgr_success, if (lb_policy != NULL) { GRPC_LB_POLICY_REF(lb_policy, "channel"); GRPC_LB_POLICY_REF(lb_policy, "config_change"); - state = grpc_lb_policy_check_connectivity(lb_policy, call_list); + state = grpc_lb_policy_check_connectivity(lb_policy, closure_list); } - grpc_client_config_unref(chand->incoming_configuration, call_list); + grpc_client_config_unref(chand->incoming_configuration, closure_list); } chand->incoming_configuration = NULL; @@ -503,7 +508,7 @@ static void cc_on_config_changed(void *arg, int iomgr_success, old_lb_policy = chand->lb_policy; chand->lb_policy = lb_policy; if (lb_policy != NULL || chand->resolver == NULL /* disconnected */) { - grpc_call_list_move(&chand->waiting_for_config_closures, call_list); + grpc_closure_list_move(&chand->waiting_for_config_closures, closure_list); } if (lb_policy != NULL && chand->exit_idle_when_lb_policy_arrives) { GRPC_LB_POLICY_REF(lb_policy, "exit_idle"); @@ -515,53 +520,53 @@ static void cc_on_config_changed(void *arg, int iomgr_success, grpc_resolver *resolver = chand->resolver; GRPC_RESOLVER_REF(resolver, "channel-next"); grpc_connectivity_state_set(&chand->state_tracker, state, "new_lb+resolver", - call_list); + closure_list); if (lb_policy != NULL) { - watch_lb_policy(chand, lb_policy, state, call_list); + watch_lb_policy(chand, lb_policy, state, closure_list); } gpr_mu_unlock(&chand->mu_config); GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); grpc_resolver_next(resolver, &chand->incoming_configuration, - &chand->on_config_changed, call_list); - GRPC_RESOLVER_UNREF(resolver, "channel-next", call_list); + &chand->on_config_changed, closure_list); + GRPC_RESOLVER_UNREF(resolver, "channel-next", closure_list); } else { old_resolver = chand->resolver; chand->resolver = NULL; grpc_connectivity_state_set(&chand->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "resolver_gone", - call_list); + closure_list); gpr_mu_unlock(&chand->mu_config); if (old_resolver != NULL) { - grpc_resolver_shutdown(old_resolver, call_list); - GRPC_RESOLVER_UNREF(old_resolver, "channel", call_list); + grpc_resolver_shutdown(old_resolver, closure_list); + GRPC_RESOLVER_UNREF(old_resolver, "channel", closure_list); } } if (exit_idle) { - grpc_lb_policy_exit_idle(lb_policy, call_list); - GRPC_LB_POLICY_UNREF(lb_policy, "exit_idle", call_list); + grpc_lb_policy_exit_idle(lb_policy, closure_list); + GRPC_LB_POLICY_UNREF(lb_policy, "exit_idle", closure_list); } if (old_lb_policy != NULL) { - grpc_lb_policy_shutdown(old_lb_policy, call_list); - GRPC_LB_POLICY_UNREF(old_lb_policy, "channel", call_list); + grpc_lb_policy_shutdown(old_lb_policy, closure_list); + GRPC_LB_POLICY_UNREF(old_lb_policy, "channel", closure_list); } if (lb_policy != NULL) { - GRPC_LB_POLICY_UNREF(lb_policy, "config_change", call_list); + GRPC_LB_POLICY_UNREF(lb_policy, "config_change", closure_list); } - GRPC_CHANNEL_INTERNAL_UNREF(chand->master, "resolver", call_list); + GRPC_CHANNEL_INTERNAL_UNREF(chand->master, "resolver", closure_list); } static void cc_start_transport_op(grpc_channel_element *elem, grpc_transport_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_lb_policy *lb_policy = NULL; channel_data *chand = elem->channel_data; grpc_resolver *destroy_resolver = NULL; - grpc_call_list_add(call_list, op->on_consumed, 1); + grpc_closure_list_add(closure_list, op->on_consumed, 1); GPR_ASSERT(op->set_accept_stream == NULL); GPR_ASSERT(op->bind_pollset == NULL); @@ -570,7 +575,7 @@ static void cc_start_transport_op(grpc_channel_element *elem, if (op->on_connectivity_state_change != NULL) { grpc_connectivity_state_notify_on_state_change( &chand->state_tracker, op->connectivity_state, - op->on_connectivity_state_change, call_list); + op->on_connectivity_state_change, closure_list); op->on_connectivity_state_change = NULL; op->connectivity_state = NULL; } @@ -585,25 +590,25 @@ static void cc_start_transport_op(grpc_channel_element *elem, if (op->disconnect && chand->resolver != NULL) { grpc_connectivity_state_set(&chand->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "disconnect", - call_list); + closure_list); destroy_resolver = chand->resolver; chand->resolver = NULL; if (chand->lb_policy != NULL) { - grpc_lb_policy_shutdown(chand->lb_policy, call_list); - GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel", call_list); + grpc_lb_policy_shutdown(chand->lb_policy, closure_list); + GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel", closure_list); chand->lb_policy = NULL; } } gpr_mu_unlock(&chand->mu_config); if (destroy_resolver) { - grpc_resolver_shutdown(destroy_resolver, call_list); - GRPC_RESOLVER_UNREF(destroy_resolver, "channel", call_list); + grpc_resolver_shutdown(destroy_resolver, closure_list); + GRPC_RESOLVER_UNREF(destroy_resolver, "channel", closure_list); } if (lb_policy) { - grpc_lb_policy_broadcast(lb_policy, op, call_list); - GRPC_LB_POLICY_UNREF(lb_policy, "broadcast", call_list); + grpc_lb_policy_broadcast(lb_policy, op, closure_list); + GRPC_LB_POLICY_UNREF(lb_policy, "broadcast", closure_list); } } @@ -611,7 +616,7 @@ static void cc_start_transport_op(grpc_channel_element *elem, static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; /* TODO(ctiller): is there something useful we can do here? */ @@ -627,7 +632,7 @@ static void init_call_elem(grpc_call_element *elem, /* Destructor for call_data */ static void destroy_call_elem(grpc_call_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; grpc_subchannel_call *subchannel_call; @@ -639,7 +644,8 @@ static void destroy_call_elem(grpc_call_element *elem, case CALL_ACTIVE: subchannel_call = calld->subchannel_call; gpr_mu_unlock(&calld->mu_state); - GRPC_SUBCHANNEL_CALL_UNREF(subchannel_call, "client_channel", call_list); + GRPC_SUBCHANNEL_CALL_UNREF(subchannel_call, "client_channel", + closure_list); break; case CALL_CREATED: case CALL_CANCELLED: @@ -659,7 +665,7 @@ static void destroy_call_elem(grpc_call_element *elem, static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *metadata_context, int is_first, - int is_last, grpc_call_list *call_list) { + int is_last, grpc_closure_list *closure_list) { channel_data *chand = elem->channel_data; memset(chand, 0, sizeof(*chand)); @@ -679,17 +685,17 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, /* Destructor for channel_data */ static void destroy_channel_elem(grpc_channel_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { channel_data *chand = elem->channel_data; if (chand->resolver != NULL) { - grpc_resolver_shutdown(chand->resolver, call_list); - GRPC_RESOLVER_UNREF(chand->resolver, "channel", call_list); + grpc_resolver_shutdown(chand->resolver, closure_list); + GRPC_RESOLVER_UNREF(chand->resolver, "channel", closure_list); } if (chand->lb_policy != NULL) { - GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel", call_list); + GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel", closure_list); } - grpc_connectivity_state_destroy(&chand->state_tracker, call_list); + grpc_connectivity_state_destroy(&chand->state_tracker, closure_list); grpc_pollset_set_destroy(&chand->pollset_set); gpr_mu_destroy(&chand->mu_config); } @@ -709,7 +715,7 @@ const grpc_channel_filter grpc_client_channel_filter = { void grpc_client_channel_set_resolver(grpc_channel_stack *channel_stack, grpc_resolver *resolver, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* post construction initialization: set the transport setup pointer */ grpc_channel_element *elem = grpc_channel_stack_last_element(channel_stack); channel_data *chand = elem->channel_data; @@ -717,32 +723,33 @@ void grpc_client_channel_set_resolver(grpc_channel_stack *channel_stack, GPR_ASSERT(!chand->resolver); chand->resolver = resolver; GRPC_RESOLVER_REF(resolver, "channel"); - if (!grpc_call_list_empty(chand->waiting_for_config_closures) || + if (!grpc_closure_list_empty(chand->waiting_for_config_closures) || chand->exit_idle_when_lb_policy_arrives) { chand->started_resolving = 1; GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); grpc_resolver_next(resolver, &chand->incoming_configuration, - &chand->on_config_changed, call_list); + &chand->on_config_changed, closure_list); } gpr_mu_unlock(&chand->mu_config); } grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_channel_element *elem, int try_to_connect, grpc_call_list *call_list) { + grpc_channel_element *elem, int try_to_connect, + grpc_closure_list *closure_list) { channel_data *chand = elem->channel_data; grpc_connectivity_state out; gpr_mu_lock(&chand->mu_config); out = grpc_connectivity_state_check(&chand->state_tracker); if (out == GRPC_CHANNEL_IDLE && try_to_connect) { if (chand->lb_policy != NULL) { - grpc_lb_policy_exit_idle(chand->lb_policy, call_list); + grpc_lb_policy_exit_idle(chand->lb_policy, closure_list); } else { chand->exit_idle_when_lb_policy_arrives = 1; if (!chand->started_resolving && chand->resolver != NULL) { GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); chand->started_resolving = 1; grpc_resolver_next(chand->resolver, &chand->incoming_configuration, - &chand->on_config_changed, call_list); + &chand->on_config_changed, closure_list); } } } @@ -752,11 +759,11 @@ grpc_connectivity_state grpc_client_channel_check_connectivity_state( void grpc_client_channel_watch_connectivity_state( grpc_channel_element *elem, grpc_connectivity_state *state, - grpc_closure *on_complete, grpc_call_list *call_list) { + grpc_closure *on_complete, grpc_closure_list *closure_list) { channel_data *chand = elem->channel_data; gpr_mu_lock(&chand->mu_config); grpc_connectivity_state_notify_on_state_change(&chand->state_tracker, state, - on_complete, call_list); + on_complete, closure_list); gpr_mu_unlock(&chand->mu_config); } @@ -768,14 +775,14 @@ grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set( void grpc_client_channel_add_interested_party(grpc_channel_element *elem, grpc_pollset *pollset, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { channel_data *chand = elem->channel_data; - grpc_pollset_set_add_pollset(&chand->pollset_set, pollset, call_list); + grpc_pollset_set_add_pollset(&chand->pollset_set, pollset, closure_list); } void grpc_client_channel_del_interested_party(grpc_channel_element *elem, grpc_pollset *pollset, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { channel_data *chand = elem->channel_data; - grpc_pollset_set_del_pollset(&chand->pollset_set, pollset, call_list); + grpc_pollset_set_del_pollset(&chand->pollset_set, pollset, closure_list); } diff --git a/src/core/channel/client_channel.h b/src/core/channel/client_channel.h index 7afc7f8544b..d200f6e4b04 100644 --- a/src/core/channel/client_channel.h +++ b/src/core/channel/client_channel.h @@ -51,23 +51,24 @@ extern const grpc_channel_filter grpc_client_channel_filter; a connection */ void grpc_client_channel_set_resolver(grpc_channel_stack *channel_stack, grpc_resolver *resolver, - grpc_call_list *call_list); + grpc_closure_list *closure_list); grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_channel_element *elem, int try_to_connect, grpc_call_list *call_list); + grpc_channel_element *elem, int try_to_connect, + grpc_closure_list *closure_list); void grpc_client_channel_watch_connectivity_state( grpc_channel_element *elem, grpc_connectivity_state *state, - grpc_closure *on_complete, grpc_call_list *call_list); + grpc_closure *on_complete, grpc_closure_list *closure_list); grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set( grpc_channel_element *elem); void grpc_client_channel_add_interested_party(grpc_channel_element *channel, grpc_pollset *pollset, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_client_channel_del_interested_party(grpc_channel_element *channel, grpc_pollset *pollset, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_CHANNEL_CLIENT_CHANNEL_H */ diff --git a/src/core/channel/compress_filter.c b/src/core/channel/compress_filter.c index e2be603e266..911c689d54d 100644 --- a/src/core/channel/compress_filter.c +++ b/src/core/channel/compress_filter.c @@ -268,22 +268,22 @@ static void process_send_ops(grpc_call_element *elem, - a network event (or similar) from below, to receive something op contains type and call direction information, in addition to the data that is being sent or received. */ -static void compress_start_transport_stream_op(grpc_call_element *elem, - grpc_transport_stream_op *op, - grpc_call_list *call_list) { +static void compress_start_transport_stream_op( + grpc_call_element *elem, grpc_transport_stream_op *op, + grpc_closure_list *closure_list) { if (op->send_ops && op->send_ops->nops > 0) { process_send_ops(elem, op->send_ops); } /* pass control down the stack */ - grpc_call_next_op(elem, op, call_list); + grpc_call_next_op(elem, op, closure_list); } /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; @@ -301,7 +301,7 @@ static void init_call_elem(grpc_call_element *elem, /* Destructor for call_data */ static void destroy_call_elem(grpc_call_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; gpr_slice_buffer_destroy(&calld->slices); @@ -311,7 +311,7 @@ static void destroy_call_elem(grpc_call_element *elem, static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *mdctx, int is_first, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { channel_data *channeld = elem->channel_data; grpc_compression_algorithm algo_idx; const char *supported_algorithms_names[GRPC_COMPRESS_ALGORITHMS_COUNT - 1]; @@ -374,7 +374,7 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, /* Destructor for channel data */ static void destroy_channel_elem(grpc_channel_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { channel_data *channeld = elem->channel_data; grpc_compression_algorithm algo_idx; diff --git a/src/core/channel/connected_channel.c b/src/core/channel/connected_channel.c index 1af5eae9478..b58e180a43d 100644 --- a/src/core/channel/connected_channel.c +++ b/src/core/channel/connected_channel.c @@ -63,54 +63,55 @@ typedef struct connected_channel_call_data { void *unused; } call_data; into transport stream operations */ static void con_start_transport_stream_op(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); GRPC_CALL_LOG_OP(GPR_INFO, elem, op); - grpc_transport_perform_stream_op( - chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), op, call_list); + grpc_transport_perform_stream_op(chand->transport, + TRANSPORT_STREAM_FROM_CALL_DATA(calld), op, + closure_list); } static void con_start_transport_op(grpc_channel_element *elem, grpc_transport_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { channel_data *chand = elem->channel_data; - grpc_transport_perform_op(chand->transport, op, call_list); + grpc_transport_perform_op(chand->transport, op, closure_list); } /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; int r; GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); - r = grpc_transport_init_stream(chand->transport, - TRANSPORT_STREAM_FROM_CALL_DATA(calld), - server_transport_data, initial_op, call_list); + r = grpc_transport_init_stream( + chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), + server_transport_data, initial_op, closure_list); GPR_ASSERT(r == 0); } /* Destructor for call_data */ static void destroy_call_elem(grpc_call_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); grpc_transport_destroy_stream( - chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), call_list); + chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), closure_list); } /* Constructor for channel_data */ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *mdctx, int is_first, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { channel_data *cd = (channel_data *)elem->channel_data; GPR_ASSERT(is_last); GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); @@ -119,15 +120,16 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, /* Destructor for channel_data */ static void destroy_channel_elem(grpc_channel_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { channel_data *cd = (channel_data *)elem->channel_data; GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); - grpc_transport_destroy(cd->transport, call_list); + grpc_transport_destroy(cd->transport, closure_list); } -static char *con_get_peer(grpc_call_element *elem, grpc_call_list *call_list) { +static char *con_get_peer(grpc_call_element *elem, + grpc_closure_list *closure_list) { channel_data *chand = elem->channel_data; - return grpc_transport_get_peer(chand->transport, call_list); + return grpc_transport_get_peer(chand->transport, closure_list); } const grpc_channel_filter grpc_connected_channel_filter = { diff --git a/src/core/channel/http_client_filter.c b/src/core/channel/http_client_filter.c index 0aa708694df..6fbe4738e75 100644 --- a/src/core/channel/http_client_filter.c +++ b/src/core/channel/http_client_filter.c @@ -69,7 +69,7 @@ typedef struct channel_data { typedef struct { grpc_call_element *elem; - grpc_call_list *call_list; + grpc_closure_list *closure_list; } client_recv_filter_args; static grpc_mdelem *client_recv_filter(void *user_data, grpc_mdelem *md) { @@ -79,7 +79,7 @@ static grpc_mdelem *client_recv_filter(void *user_data, grpc_mdelem *md) { if (md == channeld->status) { return NULL; } else if (md->key == channeld->status->key) { - grpc_call_element_send_cancel(elem, a->call_list); + grpc_call_element_send_cancel(elem, a->closure_list); return NULL; } else if (md->key == channeld->content_type->key) { return NULL; @@ -88,7 +88,7 @@ static grpc_mdelem *client_recv_filter(void *user_data, grpc_mdelem *md) { } static void hc_on_recv(void *user_data, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; size_t i; @@ -100,10 +100,10 @@ static void hc_on_recv(void *user_data, int success, if (op->type != GRPC_OP_METADATA) continue; calld->got_initial_metadata = 1; a.elem = elem; - a.call_list = call_list; + a.closure_list = closure_list; grpc_metadata_batch_filter(&op->data.metadata, client_recv_filter, &a); } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, call_list); + calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, closure_list); } static grpc_mdelem *client_strip_filter(void *user_data, grpc_mdelem *md) { @@ -158,17 +158,17 @@ static void hc_mutate_op(grpc_call_element *elem, static void hc_start_transport_op(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { GRPC_CALL_LOG_OP(GPR_INFO, elem, op); hc_mutate_op(elem, op); - grpc_call_next_op(elem, op, call_list); + grpc_call_next_op(elem, op, closure_list); } /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; calld->sent_initial_metadata = 0; calld->got_initial_metadata = 0; @@ -179,7 +179,7 @@ static void init_call_elem(grpc_call_element *elem, /* Destructor for call_data */ static void destroy_call_elem(grpc_call_element *elem, - grpc_call_list *call_list) {} + grpc_closure_list *closure_list) {} static const char *scheme_from_args(const grpc_channel_args *args) { unsigned i; @@ -247,7 +247,7 @@ static grpc_mdstr *user_agent_from_args(grpc_mdctx *mdctx, static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *channel_args, grpc_mdctx *mdctx, int is_first, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; @@ -271,7 +271,7 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, /* Destructor for channel data */ static void destroy_channel_elem(grpc_channel_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; diff --git a/src/core/channel/http_server_filter.c b/src/core/channel/http_server_filter.c index 448ce9a5b1a..fb1f0b05544 100644 --- a/src/core/channel/http_server_filter.c +++ b/src/core/channel/http_server_filter.c @@ -76,7 +76,7 @@ typedef struct channel_data { typedef struct { grpc_call_element *elem; - grpc_call_list *call_list; + grpc_closure_list *closure_list; } server_filter_args; static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { @@ -123,7 +123,7 @@ static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { /* swallow it and error everything out. */ /* TODO(klempner): We ought to generate more descriptive error messages on the wire here. */ - grpc_call_element_send_cancel(elem, a->call_list); + grpc_call_element_send_cancel(elem, a->closure_list); return NULL; } else if (md->key == channeld->path_key) { if (calld->seen_path) { @@ -150,7 +150,7 @@ static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { } static void hs_on_recv(void *user_data, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; if (success) { @@ -163,7 +163,7 @@ static void hs_on_recv(void *user_data, int success, if (op->type != GRPC_OP_METADATA) continue; calld->got_initial_metadata = 1; a.elem = elem; - a.call_list = call_list; + a.closure_list = closure_list; grpc_metadata_batch_filter(&op->data.metadata, server_filter, &a); /* Have we seen the required http2 transport headers? (:method, :scheme, content-type, with :path and :authority covered @@ -189,11 +189,11 @@ static void hs_on_recv(void *user_data, int success, } /* Error this call out */ success = 0; - grpc_call_element_send_cancel(elem, call_list); + grpc_call_element_send_cancel(elem, closure_list); } } } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, call_list); + calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, closure_list); } static void hs_mutate_op(grpc_call_element *elem, @@ -228,17 +228,17 @@ static void hs_mutate_op(grpc_call_element *elem, static void hs_start_transport_op(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { GRPC_CALL_LOG_OP(GPR_INFO, elem, op); hs_mutate_op(elem, op); - grpc_call_next_op(elem, op, call_list); + grpc_call_next_op(elem, op, closure_list); } /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; /* initialize members */ @@ -249,13 +249,13 @@ static void init_call_elem(grpc_call_element *elem, /* Destructor for call_data */ static void destroy_call_elem(grpc_call_element *elem, - grpc_call_list *call_list) {} + grpc_closure_list *closure_list) {} /* Constructor for channel_data */ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *mdctx, int is_first, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; @@ -285,7 +285,7 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, /* Destructor for channel data */ static void destroy_channel_elem(grpc_channel_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; diff --git a/src/core/channel/noop_filter.c b/src/core/channel/noop_filter.c index de75f836541..e4f6c7f8375 100644 --- a/src/core/channel/noop_filter.c +++ b/src/core/channel/noop_filter.c @@ -64,18 +64,18 @@ static void noop_mutate_op(grpc_call_element *elem, that is being sent or received. */ static void noop_start_transport_stream_op(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { noop_mutate_op(elem, op); /* pass control down the stack */ - grpc_call_next_op(elem, op, call_list); + grpc_call_next_op(elem, op, closure_list); } /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; @@ -88,13 +88,13 @@ static void init_call_elem(grpc_call_element *elem, /* Destructor for call_data */ static void destroy_call_elem(grpc_call_element *elem, - grpc_call_list *call_list) {} + grpc_closure_list *closure_list) {} /* Constructor for channel_data */ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *mdctx, int is_first, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; @@ -110,7 +110,7 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, /* Destructor for channel data */ static void destroy_channel_elem(grpc_channel_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; diff --git a/src/core/client_config/client_config.c b/src/core/client_config/client_config.c index 07808804730..636ab6d1da3 100644 --- a/src/core/client_config/client_config.c +++ b/src/core/client_config/client_config.c @@ -52,9 +52,9 @@ grpc_client_config *grpc_client_config_create() { void grpc_client_config_ref(grpc_client_config *c) { gpr_ref(&c->refs); } void grpc_client_config_unref(grpc_client_config *c, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (gpr_unref(&c->refs)) { - GRPC_LB_POLICY_UNREF(c->lb_policy, "client_config", call_list); + GRPC_LB_POLICY_UNREF(c->lb_policy, "client_config", closure_list); gpr_free(c); } } diff --git a/src/core/client_config/client_config.h b/src/core/client_config/client_config.h index 76a5c665945..8281dbe662f 100644 --- a/src/core/client_config/client_config.h +++ b/src/core/client_config/client_config.h @@ -43,7 +43,7 @@ typedef struct grpc_client_config grpc_client_config; grpc_client_config *grpc_client_config_create(); void grpc_client_config_ref(grpc_client_config *client_config); void grpc_client_config_unref(grpc_client_config *client_config, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_client_config_set_lb_policy(grpc_client_config *client_config, grpc_lb_policy *lb_policy); diff --git a/src/core/client_config/connector.c b/src/core/client_config/connector.c index a0f346faeba..39581b00fc9 100644 --- a/src/core/client_config/connector.c +++ b/src/core/client_config/connector.c @@ -38,18 +38,20 @@ void grpc_connector_ref(grpc_connector *connector) { } void grpc_connector_unref(grpc_connector *connector, - grpc_call_list *call_list) { - connector->vtable->unref(connector, call_list); + grpc_closure_list *closure_list) { + connector->vtable->unref(connector, closure_list); } void grpc_connector_connect(grpc_connector *connector, const grpc_connect_in_args *in_args, grpc_connect_out_args *out_args, - grpc_closure *notify, grpc_call_list *call_list) { - connector->vtable->connect(connector, in_args, out_args, notify, call_list); + grpc_closure *notify, + grpc_closure_list *closure_list) { + connector->vtable->connect(connector, in_args, out_args, notify, + closure_list); } void grpc_connector_shutdown(grpc_connector *connector, - grpc_call_list *call_list) { - connector->vtable->shutdown(connector, call_list); + grpc_closure_list *closure_list) { + connector->vtable->shutdown(connector, closure_list); } diff --git a/src/core/client_config/connector.h b/src/core/client_config/connector.h index 388f656c444..fd46392dd87 100644 --- a/src/core/client_config/connector.h +++ b/src/core/client_config/connector.h @@ -67,25 +67,27 @@ typedef struct { struct grpc_connector_vtable { void (*ref)(grpc_connector *connector); - void (*unref)(grpc_connector *connector, grpc_call_list *call_list); + void (*unref)(grpc_connector *connector, grpc_closure_list *closure_list); /** Implementation of grpc_connector_shutdown */ - void (*shutdown)(grpc_connector *connector, grpc_call_list *call_list); + void (*shutdown)(grpc_connector *connector, grpc_closure_list *closure_list); /** Implementation of grpc_connector_connect */ void (*connect)(grpc_connector *connector, const grpc_connect_in_args *in_args, grpc_connect_out_args *out_args, grpc_closure *notify, - grpc_call_list *call_list); + grpc_closure_list *closure_list); }; void grpc_connector_ref(grpc_connector *connector); -void grpc_connector_unref(grpc_connector *connector, grpc_call_list *call_list); +void grpc_connector_unref(grpc_connector *connector, + grpc_closure_list *closure_list); /** Connect using the connector: max one outstanding call at a time */ void grpc_connector_connect(grpc_connector *connector, const grpc_connect_in_args *in_args, grpc_connect_out_args *out_args, - grpc_closure *notify, grpc_call_list *call_list); + grpc_closure *notify, + grpc_closure_list *closure_list); /** Cancel any pending connection */ void grpc_connector_shutdown(grpc_connector *connector, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #endif diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index eebc7191ba2..39e9e6c0d74 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -77,91 +77,92 @@ typedef struct { } pick_first_lb_policy; static void del_interested_parties_locked(pick_first_lb_policy *p, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { pending_pick *pp; for (pp = p->pending_picks; pp; pp = pp->next) { grpc_subchannel_del_interested_party(p->subchannels[p->checking_subchannel], - pp->pollset, call_list); + pp->pollset, closure_list); } } static void add_interested_parties_locked(pick_first_lb_policy *p, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { pending_pick *pp; for (pp = p->pending_picks; pp; pp = pp->next) { grpc_subchannel_add_interested_party(p->subchannels[p->checking_subchannel], - pp->pollset, call_list); + pp->pollset, closure_list); } } -void pf_destroy(grpc_lb_policy *pol, grpc_call_list *call_list) { +void pf_destroy(grpc_lb_policy *pol, grpc_closure_list *closure_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; size_t i; GPR_ASSERT(p->pending_picks == NULL); for (i = 0; i < p->num_subchannels; i++) { - GRPC_SUBCHANNEL_UNREF(p->subchannels[i], "pick_first", call_list); + GRPC_SUBCHANNEL_UNREF(p->subchannels[i], "pick_first", closure_list); } - grpc_connectivity_state_destroy(&p->state_tracker, call_list); + grpc_connectivity_state_destroy(&p->state_tracker, closure_list); gpr_free(p->subchannels); gpr_mu_destroy(&p->mu); gpr_free(p); } -void pf_shutdown(grpc_lb_policy *pol, grpc_call_list *call_list) { +void pf_shutdown(grpc_lb_policy *pol, grpc_closure_list *closure_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; pending_pick *pp; gpr_mu_lock(&p->mu); - del_interested_parties_locked(p, call_list); + del_interested_parties_locked(p, closure_list); p->shutdown = 1; pp = p->pending_picks; p->pending_picks = NULL; grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, - "shutdown", call_list); + "shutdown", closure_list); gpr_mu_unlock(&p->mu); while (pp != NULL) { pending_pick *next = pp->next; *pp->target = NULL; - grpc_call_list_add(call_list, pp->on_complete, 1); + grpc_closure_list_add(closure_list, pp->on_complete, 1); gpr_free(pp); pp = next; } } -static void start_picking(pick_first_lb_policy *p, grpc_call_list *call_list) { +static void start_picking(pick_first_lb_policy *p, + grpc_closure_list *closure_list) { p->started_picking = 1; p->checking_subchannel = 0; p->checking_connectivity = GRPC_CHANNEL_IDLE; GRPC_LB_POLICY_REF(&p->base, "pick_first_connectivity"); - grpc_subchannel_notify_on_state_change(p->subchannels[p->checking_subchannel], - &p->checking_connectivity, - &p->connectivity_changed, call_list); + grpc_subchannel_notify_on_state_change( + p->subchannels[p->checking_subchannel], &p->checking_connectivity, + &p->connectivity_changed, closure_list); } -void pf_exit_idle(grpc_lb_policy *pol, grpc_call_list *call_list) { +void pf_exit_idle(grpc_lb_policy *pol, grpc_closure_list *closure_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; gpr_mu_lock(&p->mu); if (!p->started_picking) { - start_picking(p, call_list); + start_picking(p, closure_list); } gpr_mu_unlock(&p->mu); } void pf_pick(grpc_lb_policy *pol, grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, grpc_subchannel **target, - grpc_closure *on_complete, grpc_call_list *call_list) { + grpc_closure *on_complete, grpc_closure_list *closure_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; pending_pick *pp; gpr_mu_lock(&p->mu); if (p->selected) { gpr_mu_unlock(&p->mu); *target = p->selected; - grpc_call_list_add(call_list, on_complete, 1); + grpc_closure_list_add(closure_list, on_complete, 1); } else { if (!p->started_picking) { - start_picking(p, call_list); + start_picking(p, closure_list); } grpc_subchannel_add_interested_party(p->subchannels[p->checking_subchannel], - pollset, call_list); + pollset, closure_list); pp = gpr_malloc(sizeof(*pp)); pp->next = p->pending_picks; pp->pollset = pollset; @@ -173,7 +174,7 @@ void pf_pick(grpc_lb_policy *pol, grpc_pollset *pollset, } static void pf_connectivity_changed(void *arg, int iomgr_success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { pick_first_lb_policy *p = arg; pending_pick *pp; @@ -181,51 +182,51 @@ static void pf_connectivity_changed(void *arg, int iomgr_success, if (p->shutdown) { gpr_mu_unlock(&p->mu); - GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity", call_list); + GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity", closure_list); return; } else if (p->selected != NULL) { grpc_connectivity_state_set(&p->state_tracker, p->checking_connectivity, - "selected_changed", call_list); + "selected_changed", closure_list); if (p->checking_connectivity != GRPC_CHANNEL_FATAL_FAILURE) { grpc_subchannel_notify_on_state_change( p->selected, &p->checking_connectivity, &p->connectivity_changed, - call_list); + closure_list); } else { - GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity", call_list); + GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity", closure_list); } } else { loop: switch (p->checking_connectivity) { case GRPC_CHANNEL_READY: grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_READY, - "connecting_ready", call_list); + "connecting_ready", closure_list); p->selected = p->subchannels[p->checking_subchannel]; while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = p->selected; grpc_subchannel_del_interested_party(p->selected, pp->pollset, - call_list); - grpc_call_list_add(call_list, pp->on_complete, 1); + closure_list); + grpc_closure_list_add(closure_list, pp->on_complete, 1); gpr_free(pp); } grpc_subchannel_notify_on_state_change( p->selected, &p->checking_connectivity, &p->connectivity_changed, - call_list); + closure_list); break; case GRPC_CHANNEL_TRANSIENT_FAILURE: - grpc_connectivity_state_set(&p->state_tracker, - GRPC_CHANNEL_TRANSIENT_FAILURE, - "connecting_transient_failure", call_list); - del_interested_parties_locked(p, call_list); + grpc_connectivity_state_set( + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + "connecting_transient_failure", closure_list); + del_interested_parties_locked(p, closure_list); p->checking_subchannel = (p->checking_subchannel + 1) % p->num_subchannels; p->checking_connectivity = grpc_subchannel_check_connectivity( p->subchannels[p->checking_subchannel]); - add_interested_parties_locked(p, call_list); + add_interested_parties_locked(p, closure_list); if (p->checking_connectivity == GRPC_CHANNEL_TRANSIENT_FAILURE) { grpc_subchannel_notify_on_state_change( p->subchannels[p->checking_subchannel], &p->checking_connectivity, - &p->connectivity_changed, call_list); + &p->connectivity_changed, closure_list); } else { goto loop; } @@ -233,37 +234,38 @@ static void pf_connectivity_changed(void *arg, int iomgr_success, case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_IDLE: grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_CONNECTING, - "connecting_changed", call_list); + "connecting_changed", closure_list); grpc_subchannel_notify_on_state_change( p->subchannels[p->checking_subchannel], &p->checking_connectivity, - &p->connectivity_changed, call_list); + &p->connectivity_changed, closure_list); break; case GRPC_CHANNEL_FATAL_FAILURE: - del_interested_parties_locked(p, call_list); + del_interested_parties_locked(p, closure_list); GPR_SWAP(grpc_subchannel *, p->subchannels[p->checking_subchannel], p->subchannels[p->num_subchannels - 1]); p->num_subchannels--; GRPC_SUBCHANNEL_UNREF(p->subchannels[p->num_subchannels], "pick_first", - call_list); + closure_list); if (p->num_subchannels == 0) { grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, - "no_more_channels", call_list); + "no_more_channels", closure_list); while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = NULL; - grpc_call_list_add(call_list, pp->on_complete, 1); + grpc_closure_list_add(closure_list, pp->on_complete, 1); gpr_free(pp); } - GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity", call_list); + GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity", + closure_list); } else { grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, - "subchannel_failed", call_list); + "subchannel_failed", closure_list); p->checking_subchannel %= p->num_subchannels; p->checking_connectivity = grpc_subchannel_check_connectivity( p->subchannels[p->checking_subchannel]); - add_interested_parties_locked(p, call_list); + add_interested_parties_locked(p, closure_list); goto loop; } } @@ -273,7 +275,7 @@ static void pf_connectivity_changed(void *arg, int iomgr_success, } static void pf_broadcast(grpc_lb_policy *pol, grpc_transport_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; size_t i; size_t n; @@ -289,14 +291,14 @@ static void pf_broadcast(grpc_lb_policy *pol, grpc_transport_op *op, gpr_mu_unlock(&p->mu); for (i = 0; i < n; i++) { - grpc_subchannel_process_transport_op(subchannels[i], op, call_list); - GRPC_SUBCHANNEL_UNREF(subchannels[i], "pf_broadcast", call_list); + grpc_subchannel_process_transport_op(subchannels[i], op, closure_list); + GRPC_SUBCHANNEL_UNREF(subchannels[i], "pf_broadcast", closure_list); } gpr_free(subchannels); } static grpc_connectivity_state pf_check_connectivity( - grpc_lb_policy *pol, grpc_call_list *call_list) { + grpc_lb_policy *pol, grpc_closure_list *closure_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; grpc_connectivity_state st; gpr_mu_lock(&p->mu); @@ -308,11 +310,11 @@ static grpc_connectivity_state pf_check_connectivity( void pf_notify_on_state_change(grpc_lb_policy *pol, grpc_connectivity_state *current, grpc_closure *notify, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; gpr_mu_lock(&p->mu); grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, - notify, call_list); + notify, closure_list); gpr_mu_unlock(&p->mu); } diff --git a/src/core/client_config/lb_policies/round_robin.c b/src/core/client_config/lb_policies/round_robin.c index a346007aca2..b4139719f40 100644 --- a/src/core/client_config/lb_policies/round_robin.c +++ b/src/core/client_config/lb_policies/round_robin.c @@ -202,28 +202,28 @@ static void remove_disconnected_sc_locked(round_robin_lb_policy *p, static void del_interested_parties_locked(round_robin_lb_policy *p, const size_t subchannel_idx, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { pending_pick *pp; for (pp = p->pending_picks; pp; pp = pp->next) { grpc_subchannel_del_interested_party(p->subchannels[subchannel_idx], - pp->pollset, call_list); + pp->pollset, closure_list); } } -void rr_destroy(grpc_lb_policy *pol, grpc_call_list *call_list) { +void rr_destroy(grpc_lb_policy *pol, grpc_closure_list *closure_list) { round_robin_lb_policy *p = (round_robin_lb_policy *)pol; size_t i; ready_list *elem; for (i = 0; i < p->num_subchannels; i++) { - del_interested_parties_locked(p, i, call_list); + del_interested_parties_locked(p, i, closure_list); } for (i = 0; i < p->num_subchannels; i++) { - GRPC_SUBCHANNEL_UNREF(p->subchannels[i], "round_robin", call_list); + GRPC_SUBCHANNEL_UNREF(p->subchannels[i], "round_robin", closure_list); } gpr_free(p->connectivity_changed_cbs); gpr_free(p->subchannel_connectivity); - grpc_connectivity_state_destroy(&p->state_tracker, call_list); + grpc_connectivity_state_destroy(&p->state_tracker, closure_list); gpr_free(p->subchannels); gpr_mu_destroy(&p->mu); @@ -242,29 +242,30 @@ void rr_destroy(grpc_lb_policy *pol, grpc_call_list *call_list) { gpr_free(p); } -void rr_shutdown(grpc_lb_policy *pol, grpc_call_list *call_list) { +void rr_shutdown(grpc_lb_policy *pol, grpc_closure_list *closure_list) { size_t i; round_robin_lb_policy *p = (round_robin_lb_policy *)pol; pending_pick *pp; gpr_mu_lock(&p->mu); for (i = 0; i < p->num_subchannels; i++) { - del_interested_parties_locked(p, i, call_list); + del_interested_parties_locked(p, i, closure_list); } p->shutdown = 1; while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = NULL; - grpc_call_list_add(call_list, pp->on_complete, 0); + grpc_closure_list_add(closure_list, pp->on_complete, 0); gpr_free(pp); } grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, - "shutdown", call_list); + "shutdown", closure_list); gpr_mu_unlock(&p->mu); } -static void start_picking(round_robin_lb_policy *p, grpc_call_list *call_list) { +static void start_picking(round_robin_lb_policy *p, + grpc_closure_list *closure_list) { size_t i; p->started_picking = 1; @@ -272,23 +273,23 @@ static void start_picking(round_robin_lb_policy *p, grpc_call_list *call_list) { p->subchannel_connectivity[i] = GRPC_CHANNEL_IDLE; grpc_subchannel_notify_on_state_change( p->subchannels[i], &p->subchannel_connectivity[i], - &p->connectivity_changed_cbs[i], call_list); + &p->connectivity_changed_cbs[i], closure_list); GRPC_LB_POLICY_REF(&p->base, "round_robin_connectivity"); } } -void rr_exit_idle(grpc_lb_policy *pol, grpc_call_list *call_list) { +void rr_exit_idle(grpc_lb_policy *pol, grpc_closure_list *closure_list) { round_robin_lb_policy *p = (round_robin_lb_policy *)pol; gpr_mu_lock(&p->mu); if (!p->started_picking) { - start_picking(p, call_list); + start_picking(p, closure_list); } gpr_mu_unlock(&p->mu); } void rr_pick(grpc_lb_policy *pol, grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, grpc_subchannel **target, - grpc_closure *on_complete, grpc_call_list *call_list) { + grpc_closure *on_complete, grpc_closure_list *closure_list) { size_t i; round_robin_lb_policy *p = (round_robin_lb_policy *)pol; pending_pick *pp; @@ -303,14 +304,14 @@ void rr_pick(grpc_lb_policy *pol, grpc_pollset *pollset, } /* only advance the last picked pointer if the selection was used */ advance_last_picked_locked(p); - on_complete->cb(on_complete->cb_arg, 1, call_list); + on_complete->cb(on_complete->cb_arg, 1, closure_list); } else { if (!p->started_picking) { - start_picking(p, call_list); + start_picking(p, closure_list); } for (i = 0; i < p->num_subchannels; i++) { grpc_subchannel_add_interested_party(p->subchannels[i], pollset, - call_list); + closure_list); } pp = gpr_malloc(sizeof(*pp)); pp->next = p->pending_picks; @@ -323,7 +324,7 @@ void rr_pick(grpc_lb_policy *pol, grpc_pollset *pollset, } static void rr_connectivity_changed(void *arg, int iomgr_success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { connectivity_changed_cb_arg *cb_arg = arg; round_robin_lb_policy *p = cb_arg->p; /* index over p->subchannels of this cb's subchannel */ @@ -346,7 +347,7 @@ static void rr_connectivity_changed(void *arg, int iomgr_success, switch (*this_connectivity) { case GRPC_CHANNEL_READY: grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_READY, - "connecting_ready", call_list); + "connecting_ready", closure_list); /* add the newly connected subchannel to the list of connected ones. * Note that it goes to the "end of the line". */ p->subchannel_index_to_readylist_node[this_idx] = @@ -369,28 +370,28 @@ static void rr_connectivity_changed(void *arg, int iomgr_success, selected->subchannel, selected); } grpc_subchannel_del_interested_party(selected->subchannel, - pp->pollset, call_list); - grpc_call_list_add(call_list, pp->on_complete, 1); + pp->pollset, closure_list); + grpc_closure_list_add(closure_list, pp->on_complete, 1); gpr_free(pp); } grpc_subchannel_notify_on_state_change( p->subchannels[this_idx], this_connectivity, - &p->connectivity_changed_cbs[this_idx], call_list); + &p->connectivity_changed_cbs[this_idx], closure_list); break; case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_IDLE: grpc_connectivity_state_set(&p->state_tracker, *this_connectivity, - "connecting_changed", call_list); + "connecting_changed", closure_list); grpc_subchannel_notify_on_state_change( p->subchannels[this_idx], this_connectivity, - &p->connectivity_changed_cbs[this_idx], call_list); + &p->connectivity_changed_cbs[this_idx], closure_list); break; case GRPC_CHANNEL_TRANSIENT_FAILURE: - del_interested_parties_locked(p, this_idx, call_list); + del_interested_parties_locked(p, this_idx, closure_list); /* renew state notification */ grpc_subchannel_notify_on_state_change( p->subchannels[this_idx], this_connectivity, - &p->connectivity_changed_cbs[this_idx], call_list); + &p->connectivity_changed_cbs[this_idx], closure_list); /* remove from ready list if still present */ if (p->subchannel_index_to_readylist_node[this_idx] != NULL) { @@ -398,12 +399,12 @@ static void rr_connectivity_changed(void *arg, int iomgr_success, p, p->subchannel_index_to_readylist_node[this_idx]); p->subchannel_index_to_readylist_node[this_idx] = NULL; } - grpc_connectivity_state_set(&p->state_tracker, - GRPC_CHANNEL_TRANSIENT_FAILURE, - "connecting_transient_failure", call_list); + grpc_connectivity_state_set( + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + "connecting_transient_failure", closure_list); break; case GRPC_CHANNEL_FATAL_FAILURE: - del_interested_parties_locked(p, this_idx, call_list); + del_interested_parties_locked(p, this_idx, closure_list); if (p->subchannel_index_to_readylist_node[this_idx] != NULL) { remove_disconnected_sc_locked( p, p->subchannel_index_to_readylist_node[this_idx]); @@ -414,23 +415,23 @@ static void rr_connectivity_changed(void *arg, int iomgr_success, p->subchannels[p->num_subchannels - 1]); p->num_subchannels--; GRPC_SUBCHANNEL_UNREF(p->subchannels[p->num_subchannels], "round_robin", - call_list); + closure_list); if (p->num_subchannels == 0) { grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, - "no_more_channels", call_list); + "no_more_channels", closure_list); while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = NULL; - grpc_call_list_add(call_list, pp->on_complete, 1); + grpc_closure_list_add(closure_list, pp->on_complete, 1); gpr_free(pp); } unref = 1; } else { grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, - "subchannel_failed", call_list); + "subchannel_failed", closure_list); } } /* switch */ } /* !unref */ @@ -438,12 +439,12 @@ static void rr_connectivity_changed(void *arg, int iomgr_success, gpr_mu_unlock(&p->mu); if (unref) { - GRPC_LB_POLICY_UNREF(&p->base, "round_robin_connectivity", call_list); + GRPC_LB_POLICY_UNREF(&p->base, "round_robin_connectivity", closure_list); } } static void rr_broadcast(grpc_lb_policy *pol, grpc_transport_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { round_robin_lb_policy *p = (round_robin_lb_policy *)pol; size_t i; size_t n; @@ -459,14 +460,14 @@ static void rr_broadcast(grpc_lb_policy *pol, grpc_transport_op *op, gpr_mu_unlock(&p->mu); for (i = 0; i < n; i++) { - grpc_subchannel_process_transport_op(subchannels[i], op, call_list); - GRPC_SUBCHANNEL_UNREF(subchannels[i], "rr_broadcast", call_list); + grpc_subchannel_process_transport_op(subchannels[i], op, closure_list); + GRPC_SUBCHANNEL_UNREF(subchannels[i], "rr_broadcast", closure_list); } gpr_free(subchannels); } static grpc_connectivity_state rr_check_connectivity( - grpc_lb_policy *pol, grpc_call_list *call_list) { + grpc_lb_policy *pol, grpc_closure_list *closure_list) { round_robin_lb_policy *p = (round_robin_lb_policy *)pol; grpc_connectivity_state st; gpr_mu_lock(&p->mu); @@ -478,11 +479,11 @@ static grpc_connectivity_state rr_check_connectivity( static void rr_notify_on_state_change(grpc_lb_policy *pol, grpc_connectivity_state *current, grpc_closure *notify, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { round_robin_lb_policy *p = (round_robin_lb_policy *)pol; gpr_mu_lock(&p->mu); grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, - notify, call_list); + notify, closure_list); gpr_mu_unlock(&p->mu); } diff --git a/src/core/client_config/lb_policy.c b/src/core/client_config/lb_policy.c index 84a033d583e..99eb69613b8 100644 --- a/src/core/client_config/lb_policy.c +++ b/src/core/client_config/lb_policy.c @@ -51,49 +51,51 @@ void grpc_lb_policy_ref(grpc_lb_policy *policy) { } #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG -void grpc_lb_policy_unref(grpc_lb_policy *policy, grpc_call_list *call_list, - const char *file, int line, const char *reason) { +void grpc_lb_policy_unref(grpc_lb_policy *policy, + grpc_closure_list *closure_list, const char *file, + int line, const char *reason) { gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "LB_POLICY:%p unref %d -> %d %s", policy, (int)policy->refs.count, (int)policy->refs.count - 1, reason); #else -void grpc_lb_policy_unref(grpc_lb_policy *policy, grpc_call_list *call_list) { +void grpc_lb_policy_unref(grpc_lb_policy *policy, + grpc_closure_list *closure_list) { #endif if (gpr_unref(&policy->refs)) { - policy->vtable->destroy(policy, call_list); + policy->vtable->destroy(policy, closure_list); } } void grpc_lb_policy_shutdown(grpc_lb_policy *policy, - grpc_call_list *call_list) { - policy->vtable->shutdown(policy, call_list); + grpc_closure_list *closure_list) { + policy->vtable->shutdown(policy, closure_list); } void grpc_lb_policy_pick(grpc_lb_policy *policy, grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, grpc_subchannel **target, grpc_closure *on_complete, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { policy->vtable->pick(policy, pollset, initial_metadata, target, on_complete, - call_list); + closure_list); } void grpc_lb_policy_broadcast(grpc_lb_policy *policy, grpc_transport_op *op, - grpc_call_list *call_list) { - policy->vtable->broadcast(policy, op, call_list); + grpc_closure_list *closure_list) { + policy->vtable->broadcast(policy, op, closure_list); } void grpc_lb_policy_exit_idle(grpc_lb_policy *policy, - grpc_call_list *call_list) { - policy->vtable->exit_idle(policy, call_list); + grpc_closure_list *closure_list) { + policy->vtable->exit_idle(policy, closure_list); } void grpc_lb_policy_notify_on_state_change(grpc_lb_policy *policy, grpc_connectivity_state *state, grpc_closure *closure, - grpc_call_list *call_list) { - policy->vtable->notify_on_state_change(policy, state, closure, call_list); + grpc_closure_list *closure_list) { + policy->vtable->notify_on_state_change(policy, state, closure, closure_list); } grpc_connectivity_state grpc_lb_policy_check_connectivity( - grpc_lb_policy *policy, grpc_call_list *call_list) { - return policy->vtable->check_connectivity(policy, call_list); + grpc_lb_policy *policy, grpc_closure_list *closure_list) { + return policy->vtable->check_connectivity(policy, closure_list); } diff --git a/src/core/client_config/lb_policy.h b/src/core/client_config/lb_policy.h index f9430b42506..5e3c016eb26 100644 --- a/src/core/client_config/lb_policy.h +++ b/src/core/client_config/lb_policy.h @@ -51,32 +51,32 @@ struct grpc_lb_policy { }; struct grpc_lb_policy_vtable { - void (*destroy)(grpc_lb_policy *policy, grpc_call_list *call_list); + void (*destroy)(grpc_lb_policy *policy, grpc_closure_list *closure_list); - void (*shutdown)(grpc_lb_policy *policy, grpc_call_list *call_list); + void (*shutdown)(grpc_lb_policy *policy, grpc_closure_list *closure_list); /** implement grpc_lb_policy_pick */ void (*pick)(grpc_lb_policy *policy, grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, grpc_subchannel **target, - grpc_closure *on_complete, grpc_call_list *call_list); + grpc_closure *on_complete, grpc_closure_list *closure_list); /** try to enter a READY connectivity state */ - void (*exit_idle)(grpc_lb_policy *policy, grpc_call_list *call_list); + void (*exit_idle)(grpc_lb_policy *policy, grpc_closure_list *closure_list); /** broadcast a transport op to all subchannels */ void (*broadcast)(grpc_lb_policy *policy, grpc_transport_op *op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** check the current connectivity of the lb_policy */ - grpc_connectivity_state (*check_connectivity)(grpc_lb_policy *policy, - grpc_call_list *call_list); + grpc_connectivity_state (*check_connectivity)( + grpc_lb_policy *policy, grpc_closure_list *closure_list); /** call notify when the connectivity state of a channel changes from *state. Updates *state with the new state of the policy */ void (*notify_on_state_change)(grpc_lb_policy *policy, grpc_connectivity_state *state, grpc_closure *closure, - grpc_call_list *call_list); + grpc_closure_list *closure_list); }; #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG @@ -86,13 +86,15 @@ struct grpc_lb_policy_vtable { grpc_lb_policy_unref((p), (cl), __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, grpc_call_list *call_list, - const char *file, int line, const char *reason); +void grpc_lb_policy_unref(grpc_lb_policy *policy, + grpc_closure_list *closure_list, 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, cl) grpc_lb_policy_unref((p), (cl)) void grpc_lb_policy_ref(grpc_lb_policy *policy); -void grpc_lb_policy_unref(grpc_lb_policy *policy, grpc_call_list *call_list); +void grpc_lb_policy_unref(grpc_lb_policy *policy, + grpc_closure_list *closure_list); #endif /** called by concrete implementations to initialize the base struct */ @@ -100,7 +102,8 @@ void grpc_lb_policy_init(grpc_lb_policy *policy, const grpc_lb_policy_vtable *vtable); /** Start shutting down (fail any pending picks) */ -void grpc_lb_policy_shutdown(grpc_lb_policy *policy, grpc_call_list *call_list); +void grpc_lb_policy_shutdown(grpc_lb_policy *policy, + grpc_closure_list *closure_list); /** Given initial metadata in \a initial_metadata, find an appropriate target for this rpc, and 'return' it by calling \a on_complete after setting @@ -109,20 +112,20 @@ void grpc_lb_policy_shutdown(grpc_lb_policy *policy, grpc_call_list *call_list); void grpc_lb_policy_pick(grpc_lb_policy *policy, grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, grpc_subchannel **target, grpc_closure *on_complete, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_lb_policy_broadcast(grpc_lb_policy *policy, grpc_transport_op *op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_lb_policy_exit_idle(grpc_lb_policy *policy, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_lb_policy_notify_on_state_change(grpc_lb_policy *policy, grpc_connectivity_state *state, grpc_closure *closure, - grpc_call_list *call_list); + grpc_closure_list *closure_list); grpc_connectivity_state grpc_lb_policy_check_connectivity( - grpc_lb_policy *policy, grpc_call_list *call_list); + grpc_lb_policy *policy, grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_CONFIG_LB_POLICY_H */ diff --git a/src/core/client_config/resolver.c b/src/core/client_config/resolver.c index eae8ec6ddf0..21186d7aa18 100644 --- a/src/core/client_config/resolver.c +++ b/src/core/client_config/resolver.c @@ -40,7 +40,7 @@ void grpc_resolver_init(grpc_resolver *resolver, } #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG -void grpc_resolver_ref(grpc_resolver *resolver, grpc_call_list *call_list, +void grpc_resolver_ref(grpc_resolver *resolver, grpc_closure_list *closure_list, const char *file, int line, const char *reason) { gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "RESOLVER:%p ref %d -> %d %s", resolver, (int)resolver->refs.count, (int)resolver->refs.count + 1, @@ -52,34 +52,37 @@ void grpc_resolver_ref(grpc_resolver *resolver) { } #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG -void grpc_resolver_unref(grpc_resolver *resolver, grpc_call_list *call_list, - const char *file, int line, const char *reason) { +void grpc_resolver_unref(grpc_resolver *resolver, + grpc_closure_list *closure_list, const char *file, + int line, const char *reason) { gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "RESOLVER:%p unref %d -> %d %s", resolver, (int)resolver->refs.count, (int)resolver->refs.count - 1, reason); #else -void grpc_resolver_unref(grpc_resolver *resolver, grpc_call_list *call_list) { +void grpc_resolver_unref(grpc_resolver *resolver, + grpc_closure_list *closure_list) { #endif if (gpr_unref(&resolver->refs)) { - resolver->vtable->destroy(resolver, call_list); + resolver->vtable->destroy(resolver, closure_list); } } void grpc_resolver_shutdown(grpc_resolver *resolver, - grpc_call_list *call_list) { - resolver->vtable->shutdown(resolver, call_list); + grpc_closure_list *closure_list) { + resolver->vtable->shutdown(resolver, closure_list); } void grpc_resolver_channel_saw_error(grpc_resolver *resolver, struct sockaddr *failing_address, int failing_address_len, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { resolver->vtable->channel_saw_error(resolver, failing_address, - failing_address_len, call_list); + failing_address_len, closure_list); } void grpc_resolver_next(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_closure *on_complete, grpc_call_list *call_list) { - resolver->vtable->next(resolver, target_config, on_complete, call_list); + grpc_closure *on_complete, + grpc_closure_list *closure_list) { + resolver->vtable->next(resolver, target_config, on_complete, closure_list); } diff --git a/src/core/client_config/resolver.h b/src/core/client_config/resolver.h index 7960bcb92f4..0c39d37018a 100644 --- a/src/core/client_config/resolver.h +++ b/src/core/client_config/resolver.h @@ -49,13 +49,14 @@ struct grpc_resolver { }; struct grpc_resolver_vtable { - void (*destroy)(grpc_resolver *resolver, grpc_call_list *call_list); - void (*shutdown)(grpc_resolver *resolver, grpc_call_list *call_list); + void (*destroy)(grpc_resolver *resolver, grpc_closure_list *closure_list); + void (*shutdown)(grpc_resolver *resolver, grpc_closure_list *closure_list); void (*channel_saw_error)(grpc_resolver *resolver, struct sockaddr *failing_address, - int failing_address_len, grpc_call_list *call_list); + int failing_address_len, + grpc_closure_list *closure_list); void (*next)(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_closure *on_complete, grpc_call_list *call_list); + grpc_closure *on_complete, grpc_closure_list *closure_list); }; #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG @@ -64,26 +65,28 @@ struct grpc_resolver_vtable { grpc_resolver_unref((p), (cl), __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, grpc_call_list *call_list, +void grpc_resolver_unref(grpc_resolver *policy, grpc_closure_list *closure_list, 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, cl) grpc_resolver_unref((p), (cl)) void grpc_resolver_ref(grpc_resolver *policy); -void grpc_resolver_unref(grpc_resolver *policy, grpc_call_list *call_list); +void grpc_resolver_unref(grpc_resolver *policy, + grpc_closure_list *closure_list); #endif void grpc_resolver_init(grpc_resolver *resolver, const grpc_resolver_vtable *vtable); -void grpc_resolver_shutdown(grpc_resolver *resolver, grpc_call_list *call_list); +void grpc_resolver_shutdown(grpc_resolver *resolver, + grpc_closure_list *closure_list); /** Notification that the channel has seen an error on some address. Can be used as a hint that re-resolution is desirable soon. */ void grpc_resolver_channel_saw_error(grpc_resolver *resolver, struct sockaddr *failing_address, int failing_address_len, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** Get the next client config. Called by the channel to fetch a new configuration. Expected to set *target_config with a new configuration, @@ -93,6 +96,7 @@ void grpc_resolver_channel_saw_error(grpc_resolver *resolver, schedule on_complete. */ void grpc_resolver_next(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_closure *on_complete, grpc_call_list *call_list); + grpc_closure *on_complete, + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_CONFIG_RESOLVER_H */ diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index 0fc89ed864b..73723350cb2 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -74,36 +74,38 @@ typedef struct { grpc_client_config *resolved_config; } dns_resolver; -static void dns_destroy(grpc_resolver *r, grpc_call_list *call_list); +static void dns_destroy(grpc_resolver *r, grpc_closure_list *closure_list); static void dns_start_resolving_locked(dns_resolver *r); static void dns_maybe_finish_next_locked(dns_resolver *r, - grpc_call_list *call_list); + grpc_closure_list *closure_list); -static void dns_shutdown(grpc_resolver *r, grpc_call_list *call_list); +static void dns_shutdown(grpc_resolver *r, grpc_closure_list *closure_list); static void dns_channel_saw_error(grpc_resolver *r, struct sockaddr *failing_address, int failing_address_len, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static void dns_next(grpc_resolver *r, grpc_client_config **target_config, - grpc_closure *on_complete, grpc_call_list *call_list); + grpc_closure *on_complete, + grpc_closure_list *closure_list); static const grpc_resolver_vtable dns_resolver_vtable = { dns_destroy, dns_shutdown, dns_channel_saw_error, dns_next}; -static void dns_shutdown(grpc_resolver *resolver, grpc_call_list *call_list) { +static void dns_shutdown(grpc_resolver *resolver, + grpc_closure_list *closure_list) { dns_resolver *r = (dns_resolver *)resolver; gpr_mu_lock(&r->mu); if (r->next_completion != NULL) { *r->target_config = NULL; - grpc_call_list_add(call_list, r->next_completion, 1); + grpc_closure_list_add(closure_list, r->next_completion, 1); r->next_completion = NULL; } gpr_mu_unlock(&r->mu); } static void dns_channel_saw_error(grpc_resolver *resolver, struct sockaddr *sa, - int len, grpc_call_list *call_list) { + int len, grpc_closure_list *closure_list) { dns_resolver *r = (dns_resolver *)resolver; gpr_mu_lock(&r->mu); if (!r->resolving) { @@ -114,7 +116,8 @@ static void dns_channel_saw_error(grpc_resolver *resolver, struct sockaddr *sa, static void dns_next(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_closure *on_complete, grpc_call_list *call_list) { + grpc_closure *on_complete, + grpc_closure_list *closure_list) { dns_resolver *r = (dns_resolver *)resolver; gpr_mu_lock(&r->mu); GPR_ASSERT(!r->next_completion); @@ -123,13 +126,13 @@ static void dns_next(grpc_resolver *resolver, if (r->resolved_version == 0 && !r->resolving) { dns_start_resolving_locked(r); } else { - dns_maybe_finish_next_locked(r, call_list); + dns_maybe_finish_next_locked(r, closure_list); } gpr_mu_unlock(&r->mu); } static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { dns_resolver *r = arg; grpc_client_config *config = NULL; grpc_subchannel **subchannels; @@ -145,14 +148,14 @@ static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses, args.addr = (struct sockaddr *)(addresses->addrs[i].addr); args.addr_len = (size_t)addresses->addrs[i].len; subchannels[i] = grpc_subchannel_factory_create_subchannel( - r->subchannel_factory, &args, call_list); + r->subchannel_factory, &args, closure_list); } memset(&lb_policy_args, 0, sizeof(lb_policy_args)); lb_policy_args.subchannels = subchannels; lb_policy_args.num_subchannels = addresses->naddrs; lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); grpc_client_config_set_lb_policy(config, lb_policy); - GRPC_LB_POLICY_UNREF(lb_policy, "construction", call_list); + GRPC_LB_POLICY_UNREF(lb_policy, "construction", closure_list); grpc_resolved_addresses_destroy(addresses); gpr_free(subchannels); } @@ -160,14 +163,14 @@ static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses, GPR_ASSERT(r->resolving); r->resolving = 0; if (r->resolved_config) { - grpc_client_config_unref(r->resolved_config, call_list); + grpc_client_config_unref(r->resolved_config, closure_list); } r->resolved_config = config; r->resolved_version++; - dns_maybe_finish_next_locked(r, call_list); + dns_maybe_finish_next_locked(r, closure_list); gpr_mu_unlock(&r->mu); - GRPC_RESOLVER_UNREF(&r->base, "dns-resolving", call_list); + GRPC_RESOLVER_UNREF(&r->base, "dns-resolving", closure_list); } static void dns_start_resolving_locked(dns_resolver *r) { @@ -178,26 +181,26 @@ static void dns_start_resolving_locked(dns_resolver *r) { } static void dns_maybe_finish_next_locked(dns_resolver *r, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (r->next_completion != NULL && r->resolved_version != r->published_version) { *r->target_config = r->resolved_config; if (r->resolved_config) { grpc_client_config_ref(r->resolved_config); } - grpc_call_list_add(call_list, r->next_completion, 1); + grpc_closure_list_add(closure_list, r->next_completion, 1); r->next_completion = NULL; r->published_version = r->resolved_version; } } -static void dns_destroy(grpc_resolver *gr, grpc_call_list *call_list) { +static void dns_destroy(grpc_resolver *gr, grpc_closure_list *closure_list) { dns_resolver *r = (dns_resolver *)gr; gpr_mu_destroy(&r->mu); if (r->resolved_config) { - grpc_client_config_unref(r->resolved_config, call_list); + grpc_client_config_unref(r->resolved_config, closure_list); } - grpc_subchannel_factory_unref(r->subchannel_factory, call_list); + grpc_subchannel_factory_unref(r->subchannel_factory, closure_list); gpr_free(r->name); gpr_free(r->default_port); gpr_free(r->lb_policy_name); diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index f0e20762445..da6b5518f8a 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -76,30 +76,32 @@ typedef struct { grpc_client_config **target_config; } sockaddr_resolver; -static void sockaddr_destroy(grpc_resolver *r, grpc_call_list *call_list); +static void sockaddr_destroy(grpc_resolver *r, grpc_closure_list *closure_list); static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r, - grpc_call_list *call_list); + grpc_closure_list *closure_list); -static void sockaddr_shutdown(grpc_resolver *r, grpc_call_list *call_list); +static void sockaddr_shutdown(grpc_resolver *r, + grpc_closure_list *closure_list); static void sockaddr_channel_saw_error(grpc_resolver *r, struct sockaddr *failing_address, int failing_address_len, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static void sockaddr_next(grpc_resolver *r, grpc_client_config **target_config, - grpc_closure *on_complete, grpc_call_list *call_list); + grpc_closure *on_complete, + grpc_closure_list *closure_list); static const grpc_resolver_vtable sockaddr_resolver_vtable = { sockaddr_destroy, sockaddr_shutdown, sockaddr_channel_saw_error, sockaddr_next}; static void sockaddr_shutdown(grpc_resolver *resolver, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { sockaddr_resolver *r = (sockaddr_resolver *)resolver; gpr_mu_lock(&r->mu); if (r->next_completion != NULL) { *r->target_config = NULL; - grpc_call_list_add(call_list, r->next_completion, 1); + grpc_closure_list_add(closure_list, r->next_completion, 1); r->next_completion = NULL; } gpr_mu_unlock(&r->mu); @@ -107,23 +109,23 @@ static void sockaddr_shutdown(grpc_resolver *resolver, static void sockaddr_channel_saw_error(grpc_resolver *resolver, struct sockaddr *sa, int len, - grpc_call_list *call_list) {} + grpc_closure_list *closure_list) {} static void sockaddr_next(grpc_resolver *resolver, grpc_client_config **target_config, grpc_closure *on_complete, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { sockaddr_resolver *r = (sockaddr_resolver *)resolver; gpr_mu_lock(&r->mu); GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; r->target_config = target_config; - sockaddr_maybe_finish_next_locked(r, call_list); + sockaddr_maybe_finish_next_locked(r, closure_list); gpr_mu_unlock(&r->mu); } static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_client_config *cfg; grpc_lb_policy *lb_policy; grpc_lb_policy_args lb_policy_args; @@ -139,7 +141,7 @@ static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r, args.addr = (struct sockaddr *)&r->addrs[i]; args.addr_len = r->addrs_len[i]; subchannels[i] = grpc_subchannel_factory_create_subchannel( - r->subchannel_factory, &args, call_list); + r->subchannel_factory, &args, closure_list); } memset(&lb_policy_args, 0, sizeof(lb_policy_args)); lb_policy_args.subchannels = subchannels; @@ -148,18 +150,19 @@ static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r, grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); gpr_free(subchannels); grpc_client_config_set_lb_policy(cfg, lb_policy); - GRPC_LB_POLICY_UNREF(lb_policy, "sockaddr", call_list); + GRPC_LB_POLICY_UNREF(lb_policy, "sockaddr", closure_list); r->published = 1; *r->target_config = cfg; - grpc_call_list_add(call_list, r->next_completion, 1); + grpc_closure_list_add(closure_list, r->next_completion, 1); r->next_completion = NULL; } } -static void sockaddr_destroy(grpc_resolver *gr, grpc_call_list *call_list) { +static void sockaddr_destroy(grpc_resolver *gr, + grpc_closure_list *closure_list) { sockaddr_resolver *r = (sockaddr_resolver *)gr; gpr_mu_destroy(&r->mu); - grpc_subchannel_factory_unref(r->subchannel_factory, call_list); + grpc_subchannel_factory_unref(r->subchannel_factory, closure_list); gpr_free(r->addrs); gpr_free(r->addrs_len); gpr_free(r->lb_policy_name); diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index c570c552674..d41bf8f566a 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -144,14 +144,14 @@ struct grpc_subchannel_call { #define CHANNEL_STACK_FROM_CONNECTION(con) ((grpc_channel_stack *)((con) + 1)) static grpc_subchannel_call *create_call(connection *con, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static void connectivity_state_changed_locked(grpc_subchannel *c, const char *reason, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static grpc_connectivity_state compute_connectivity_locked(grpc_subchannel *c); static gpr_timespec compute_connect_deadline(grpc_subchannel *c); static void subchannel_connected(void *subchannel, int iomgr_success, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static void subchannel_ref_locked( grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); @@ -159,9 +159,10 @@ static int subchannel_unref_locked( grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; static void connection_ref_locked(connection *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); static grpc_subchannel *connection_unref_locked( - connection *c, grpc_call_list *call_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) - GRPC_MUST_USE_RESULT; -static void subchannel_destroy(grpc_subchannel *c, grpc_call_list *call_list); + connection *c, grpc_closure_list *closure_list + GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; +static void subchannel_destroy(grpc_subchannel *c, + grpc_closure_list *closure_list); #ifdef GRPC_SUBCHANNEL_REFCOUNT_DEBUG #define SUBCHANNEL_REF_LOCKED(p, r) \ @@ -197,9 +198,9 @@ static void subchannel_destroy(grpc_subchannel *c, grpc_call_list *call_list); * connection implementation */ -static void connection_destroy(connection *c, grpc_call_list *call_list) { +static void connection_destroy(connection *c, grpc_closure_list *closure_list) { GPR_ASSERT(c->refs == 0); - grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CONNECTION(c), call_list); + grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CONNECTION(c), closure_list); gpr_free(c); } @@ -211,14 +212,15 @@ static void connection_ref_locked( } static grpc_subchannel *connection_unref_locked( - connection *c, grpc_call_list *call_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { + connection *c, + grpc_closure_list *closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { grpc_subchannel *destroy = NULL; UNREF_LOG("CONNECTION", c); if (subchannel_unref_locked(c->subchannel REF_PASS_ARGS)) { destroy = c->subchannel; } if (--c->refs == 0 && c->subchannel->active != c) { - connection_destroy(c, call_list); + connection_destroy(c, closure_list); } return destroy; } @@ -246,38 +248,39 @@ void grpc_subchannel_ref(grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { } void grpc_subchannel_unref(grpc_subchannel *c, - grpc_call_list *call_list + grpc_closure_list *closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { int destroy; gpr_mu_lock(&c->mu); destroy = subchannel_unref_locked(c REF_PASS_ARGS); gpr_mu_unlock(&c->mu); - if (destroy) subchannel_destroy(c, call_list); + if (destroy) subchannel_destroy(c, closure_list); } -static void subchannel_destroy(grpc_subchannel *c, grpc_call_list *call_list) { +static void subchannel_destroy(grpc_subchannel *c, + grpc_closure_list *closure_list) { if (c->active != NULL) { - connection_destroy(c->active, call_list); + connection_destroy(c->active, closure_list); } gpr_free(c->filters); grpc_channel_args_destroy(c->args); gpr_free(c->addr); grpc_mdctx_unref(c->mdctx); - grpc_connectivity_state_destroy(&c->state_tracker, call_list); - grpc_connector_unref(c->connector, call_list); + grpc_connectivity_state_destroy(&c->state_tracker, closure_list); + grpc_connector_unref(c->connector, closure_list); gpr_free(c); } void grpc_subchannel_add_interested_party(grpc_subchannel *c, grpc_pollset *pollset, - grpc_call_list *call_list) { - grpc_pollset_set_add_pollset(c->pollset_set, pollset, call_list); + grpc_closure_list *closure_list) { + grpc_pollset_set_add_pollset(c->pollset_set, pollset, closure_list); } void grpc_subchannel_del_interested_party(grpc_subchannel *c, grpc_pollset *pollset, - grpc_call_list *call_list) { - grpc_pollset_set_del_pollset(c->pollset_set, pollset, call_list); + grpc_closure_list *closure_list) { + grpc_pollset_set_del_pollset(c->pollset_set, pollset, closure_list); } static gpr_uint32 random_seed() { @@ -313,7 +316,8 @@ grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, return c; } -static void continue_connect(grpc_subchannel *c, grpc_call_list *call_list) { +static void continue_connect(grpc_subchannel *c, + grpc_closure_list *closure_list) { grpc_connect_in_args args; args.interested_parties = c->pollset_set; @@ -323,32 +327,32 @@ static void continue_connect(grpc_subchannel *c, grpc_call_list *call_list) { args.channel_args = c->args; grpc_connector_connect(c->connector, &args, &c->connecting_result, - &c->connected, call_list); + &c->connected, closure_list); } -static void start_connect(grpc_subchannel *c, grpc_call_list *call_list) { +static void start_connect(grpc_subchannel *c, grpc_closure_list *closure_list) { c->backoff_delta = gpr_time_from_seconds( GRPC_SUBCHANNEL_INITIAL_CONNECT_BACKOFF_SECONDS, GPR_TIMESPAN); c->next_attempt = gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), c->backoff_delta); - continue_connect(c, call_list); + continue_connect(c, closure_list); } static void continue_creating_call(void *arg, int iomgr_success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { waiting_for_connect *w4c = arg; grpc_subchannel_del_interested_party(w4c->subchannel, w4c->pollset, - call_list); + closure_list); grpc_subchannel_create_call(w4c->subchannel, w4c->pollset, w4c->target, - w4c->notify, call_list); - GRPC_SUBCHANNEL_UNREF(w4c->subchannel, "waiting_for_connect", call_list); + w4c->notify, closure_list); + GRPC_SUBCHANNEL_UNREF(w4c->subchannel, "waiting_for_connect", closure_list); gpr_free(w4c); } void grpc_subchannel_create_call(grpc_subchannel *c, grpc_pollset *pollset, grpc_subchannel_call **target, grpc_closure *notify, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { connection *con; gpr_mu_lock(&c->mu); if (c->active != NULL) { @@ -356,8 +360,8 @@ void grpc_subchannel_create_call(grpc_subchannel *c, grpc_pollset *pollset, CONNECTION_REF_LOCKED(con, "call"); gpr_mu_unlock(&c->mu); - *target = create_call(con, call_list); - notify->cb(notify->cb_arg, 1, call_list); + *target = create_call(con, closure_list); + notify->cb(notify->cb_arg, 1, closure_list); } else { waiting_for_connect *w4c = gpr_malloc(sizeof(*w4c)); w4c->next = c->waiting; @@ -369,16 +373,16 @@ void grpc_subchannel_create_call(grpc_subchannel *c, grpc_pollset *pollset, SUBCHANNEL_REF_LOCKED(c, "waiting_for_connect"); grpc_closure_init(&w4c->continuation, continue_creating_call, w4c); c->waiting = w4c; - grpc_subchannel_add_interested_party(c, pollset, call_list); + grpc_subchannel_add_interested_party(c, pollset, closure_list); if (!c->connecting) { c->connecting = 1; - connectivity_state_changed_locked(c, "create_call", call_list); + connectivity_state_changed_locked(c, "create_call", closure_list); /* released by connection */ SUBCHANNEL_REF_LOCKED(c, "connecting"); GRPC_CHANNEL_INTERNAL_REF(c->master, "connecting"); gpr_mu_unlock(&c->mu); - start_connect(c, call_list); + start_connect(c, closure_list); } else { gpr_mu_unlock(&c->mu); } @@ -396,28 +400,28 @@ grpc_connectivity_state grpc_subchannel_check_connectivity(grpc_subchannel *c) { void grpc_subchannel_notify_on_state_change(grpc_subchannel *c, grpc_connectivity_state *state, grpc_closure *notify, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { int do_connect = 0; gpr_mu_lock(&c->mu); if (grpc_connectivity_state_notify_on_state_change(&c->state_tracker, state, - notify, call_list)) { + notify, closure_list)) { do_connect = 1; c->connecting = 1; /* released by connection */ SUBCHANNEL_REF_LOCKED(c, "connecting"); GRPC_CHANNEL_INTERNAL_REF(c->master, "connecting"); - connectivity_state_changed_locked(c, "state_change", call_list); + connectivity_state_changed_locked(c, "state_change", closure_list); } gpr_mu_unlock(&c->mu); if (do_connect) { - start_connect(c, call_list); + start_connect(c, closure_list); } } void grpc_subchannel_process_transport_op(grpc_subchannel *c, grpc_transport_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { connection *con = NULL; grpc_subchannel *destroy; int cancel_alarm = 0; @@ -428,7 +432,7 @@ void grpc_subchannel_process_transport_op(grpc_subchannel *c, } if (op->disconnect) { c->disconnected = 1; - connectivity_state_changed_locked(c, "disconnect", call_list); + connectivity_state_changed_locked(c, "disconnect", closure_list); if (c->have_alarm) { cancel_alarm = 1; } @@ -439,27 +443,27 @@ void grpc_subchannel_process_transport_op(grpc_subchannel *c, 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, call_list); + top_elem->filter->start_transport_op(top_elem, op, closure_list); gpr_mu_lock(&c->mu); - destroy = CONNECTION_UNREF_LOCKED(con, "transport-op", call_list); + destroy = CONNECTION_UNREF_LOCKED(con, "transport-op", closure_list); gpr_mu_unlock(&c->mu); if (destroy) { - subchannel_destroy(destroy, call_list); + subchannel_destroy(destroy, closure_list); } } if (cancel_alarm) { - grpc_alarm_cancel(&c->alarm, call_list); + grpc_alarm_cancel(&c->alarm, closure_list); } if (op->disconnect) { - grpc_connector_shutdown(c->connector, call_list); + grpc_connector_shutdown(c->connector, closure_list); } } static void on_state_changed(void *p, int iomgr_success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { state_watcher *sw = p; grpc_subchannel *c = sw->subchannel; gpr_mu *mu = &c->mu; @@ -486,7 +490,7 @@ static void on_state_changed(void *p, int iomgr_success, op.on_connectivity_state_change = &sw->closure; elem = grpc_channel_stack_element( CHANNEL_STACK_FROM_CONNECTION(c->active), 0); - elem->filter->start_transport_op(elem, &op, call_list); + elem->filter->start_transport_op(elem, &op, closure_list); /* early out */ gpr_mu_unlock(mu); return; @@ -500,24 +504,25 @@ static void on_state_changed(void *p, int iomgr_success, grpc_connectivity_state_set( &c->state_tracker, c->disconnected ? GRPC_CHANNEL_FATAL_FAILURE : GRPC_CHANNEL_TRANSIENT_FAILURE, - "connection_failed", call_list); + "connection_failed", closure_list); break; } done: - connectivity_state_changed_locked(c, "transport_state_changed", call_list); + connectivity_state_changed_locked(c, "transport_state_changed", closure_list); destroy = SUBCHANNEL_UNREF_LOCKED(c, "state_watcher"); gpr_free(sw); gpr_mu_unlock(mu); if (destroy) { - subchannel_destroy(c, call_list); + subchannel_destroy(c, closure_list); } if (destroy_connection != NULL) { - connection_destroy(destroy_connection, call_list); + connection_destroy(destroy_connection, closure_list); } } -static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { +static void publish_transport(grpc_subchannel *c, + grpc_closure_list *closure_list) { size_t channel_stack_size; connection *con; grpc_channel_stack *stk; @@ -544,7 +549,7 @@ static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { con->refs = 0; con->subchannel = c; grpc_channel_stack_init(filters, num_filters, c->master, c->args, c->mdctx, - stk, call_list); + stk, closure_list); grpc_connected_channel_bind_transport(stk, c->connecting_result.transport); gpr_free(c->connecting_result.filters); memset(&c->connecting_result, 0, sizeof(c->connecting_result)); @@ -561,9 +566,9 @@ static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { gpr_mu_unlock(&c->mu); gpr_free(sw); gpr_free(filters); - grpc_channel_stack_destroy(stk, call_list); - GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting", call_list); - GRPC_SUBCHANNEL_UNREF(c, "connecting", call_list); + grpc_channel_stack_destroy(stk, closure_list); + GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting", closure_list); + GRPC_SUBCHANNEL_UNREF(c, "connecting", closure_list); return; } @@ -583,14 +588,14 @@ static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { op.on_connectivity_state_change = &sw->closure; op.bind_pollset_set = c->pollset_set; SUBCHANNEL_REF_LOCKED(c, "state_watcher"); - GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting", call_list); + GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting", closure_list); GPR_ASSERT(!SUBCHANNEL_UNREF_LOCKED(c, "connecting")); elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CONNECTION(c->active), 0); - elem->filter->start_transport_op(elem, &op, call_list); + elem->filter->start_transport_op(elem, &op, closure_list); /* signal completion */ - connectivity_state_changed_locked(c, "connected", call_list); + connectivity_state_changed_locked(c, "connected", closure_list); w4c = c->waiting; c->waiting = NULL; @@ -598,14 +603,14 @@ static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { while (w4c != NULL) { waiting_for_connect *next = w4c->next; - grpc_call_list_add(call_list, &w4c->continuation, 1); + grpc_closure_list_add(closure_list, &w4c->continuation, 1); w4c = next; } gpr_free(filters); if (destroy_connection != NULL) { - connection_destroy(destroy_connection, call_list); + connection_destroy(destroy_connection, closure_list); } } @@ -638,36 +643,37 @@ static void update_reconnect_parameters(grpc_subchannel *c) { gpr_time_add(c->next_attempt, gpr_time_from_millis(jitter, GPR_TIMESPAN)); } -static void on_alarm(void *arg, int iomgr_success, grpc_call_list *call_list) { +static void on_alarm(void *arg, int iomgr_success, + grpc_closure_list *closure_list) { grpc_subchannel *c = arg; gpr_mu_lock(&c->mu); c->have_alarm = 0; if (c->disconnected) { iomgr_success = 0; } - connectivity_state_changed_locked(c, "alarm", call_list); + connectivity_state_changed_locked(c, "alarm", closure_list); gpr_mu_unlock(&c->mu); if (iomgr_success) { update_reconnect_parameters(c); - continue_connect(c, call_list); + continue_connect(c, closure_list); } else { - GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting", call_list); - GRPC_SUBCHANNEL_UNREF(c, "connecting", call_list); + GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting", closure_list); + GRPC_SUBCHANNEL_UNREF(c, "connecting", closure_list); } } static void subchannel_connected(void *arg, int iomgr_success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_subchannel *c = arg; if (c->connecting_result.transport != NULL) { - publish_transport(c, call_list); + publish_transport(c, closure_list); } else { gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); gpr_mu_lock(&c->mu); GPR_ASSERT(!c->have_alarm); c->have_alarm = 1; - connectivity_state_changed_locked(c, "connect_failed", call_list); - grpc_alarm_init(&c->alarm, c->next_attempt, on_alarm, c, now, call_list); + connectivity_state_changed_locked(c, "connect_failed", closure_list); + grpc_alarm_init(&c->alarm, c->next_attempt, on_alarm, c, now, closure_list); gpr_mu_unlock(&c->mu); } } @@ -701,9 +707,9 @@ static grpc_connectivity_state compute_connectivity_locked(grpc_subchannel *c) { static void connectivity_state_changed_locked(grpc_subchannel *c, const char *reason, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_connectivity_state current = compute_connectivity_locked(c); - grpc_connectivity_state_set(&c->state_tracker, current, reason, call_list); + grpc_connectivity_state_set(&c->state_tracker, current, reason, closure_list); } /* @@ -716,45 +722,45 @@ void grpc_subchannel_call_ref( } void grpc_subchannel_call_unref(grpc_subchannel_call *c, - grpc_call_list *call_list + grpc_closure_list *closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { if (gpr_unref(&c->refs)) { gpr_mu *mu = &c->connection->subchannel->mu; grpc_subchannel *destroy; - grpc_call_stack_destroy(SUBCHANNEL_CALL_TO_CALL_STACK(c), call_list); + grpc_call_stack_destroy(SUBCHANNEL_CALL_TO_CALL_STACK(c), closure_list); gpr_mu_lock(mu); - destroy = CONNECTION_UNREF_LOCKED(c->connection, "call", call_list); + destroy = CONNECTION_UNREF_LOCKED(c->connection, "call", closure_list); gpr_mu_unlock(mu); gpr_free(c); if (destroy != NULL) { - subchannel_destroy(destroy, call_list); + subchannel_destroy(destroy, closure_list); } } } char *grpc_subchannel_call_get_peer(grpc_subchannel_call *call, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK(call); grpc_call_element *top_elem = grpc_call_stack_element(call_stack, 0); - return top_elem->filter->get_peer(top_elem, call_list); + return top_elem->filter->get_peer(top_elem, closure_list); } void grpc_subchannel_call_process_op(grpc_subchannel_call *call, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK(call); grpc_call_element *top_elem = grpc_call_stack_element(call_stack, 0); - top_elem->filter->start_transport_stream_op(top_elem, op, call_list); + top_elem->filter->start_transport_stream_op(top_elem, op, closure_list); } static grpc_subchannel_call *create_call(connection *con, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_channel_stack *chanstk = CHANNEL_STACK_FROM_CONNECTION(con); grpc_subchannel_call *call = gpr_malloc(sizeof(grpc_subchannel_call) + chanstk->call_stack_size); grpc_call_stack *callstk = SUBCHANNEL_CALL_TO_CALL_STACK(call); call->connection = con; gpr_ref_init(&call->refs, 1); - grpc_call_stack_init(chanstk, NULL, NULL, callstk, call_list); + grpc_call_stack_init(chanstk, NULL, NULL, callstk, closure_list); return call; } diff --git a/src/core/client_config/subchannel.h b/src/core/client_config/subchannel.h index 0ebfc7c29ae..57cc248fecc 100644 --- a/src/core/client_config/subchannel.h +++ b/src/core/client_config/subchannel.h @@ -67,12 +67,12 @@ typedef struct grpc_subchannel_args grpc_subchannel_args; void grpc_subchannel_ref( grpc_subchannel *channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); void grpc_subchannel_unref(grpc_subchannel *channel, - grpc_call_list *call_list + grpc_closure_list *closure_list 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_call_list *call_list + grpc_closure_list *closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS); /** construct a call (possibly asynchronously) */ @@ -80,12 +80,12 @@ void grpc_subchannel_create_call(grpc_subchannel *subchannel, grpc_pollset *pollset, grpc_subchannel_call **target, grpc_closure *notify, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** process a transport level op */ void grpc_subchannel_process_transport_op(grpc_subchannel *subchannel, grpc_transport_op *op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** poll the current connectivity state of a channel */ grpc_connectivity_state grpc_subchannel_check_connectivity( @@ -96,25 +96,25 @@ grpc_connectivity_state grpc_subchannel_check_connectivity( void grpc_subchannel_notify_on_state_change(grpc_subchannel *channel, grpc_connectivity_state *state, grpc_closure *notify, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** express interest in \a channel's activities through \a pollset. */ void grpc_subchannel_add_interested_party(grpc_subchannel *channel, grpc_pollset *pollset, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** stop following \a channel's activity through \a pollset. */ void grpc_subchannel_del_interested_party(grpc_subchannel *channel, grpc_pollset *pollset, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** continue processing a transport op */ void grpc_subchannel_call_process_op(grpc_subchannel_call *subchannel_call, grpc_transport_stream_op *op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** continue querying for peer */ char *grpc_subchannel_call_get_peer(grpc_subchannel_call *subchannel_call, - grpc_call_list *call_list); + grpc_closure_list *closure_list); struct grpc_subchannel_args { /** Channel filters for this channel - wrapped factories will likely diff --git a/src/core/client_config/subchannel_factory.c b/src/core/client_config/subchannel_factory.c index e2526650000..51b805f2f52 100644 --- a/src/core/client_config/subchannel_factory.c +++ b/src/core/client_config/subchannel_factory.c @@ -38,12 +38,12 @@ void grpc_subchannel_factory_ref(grpc_subchannel_factory *factory) { } void grpc_subchannel_factory_unref(grpc_subchannel_factory *factory, - grpc_call_list *call_list) { - factory->vtable->unref(factory, call_list); + grpc_closure_list *closure_list) { + factory->vtable->unref(factory, closure_list); } grpc_subchannel *grpc_subchannel_factory_create_subchannel( grpc_subchannel_factory *factory, grpc_subchannel_args *args, - grpc_call_list *call_list) { - return factory->vtable->create_subchannel(factory, args, call_list); + grpc_closure_list *closure_list) { + return factory->vtable->create_subchannel(factory, args, closure_list); } diff --git a/src/core/client_config/subchannel_factory.h b/src/core/client_config/subchannel_factory.h index 2ff9d3c4027..ea19ab89447 100644 --- a/src/core/client_config/subchannel_factory.h +++ b/src/core/client_config/subchannel_factory.h @@ -48,19 +48,20 @@ struct grpc_subchannel_factory { struct grpc_subchannel_factory_vtable { void (*ref)(grpc_subchannel_factory *factory); - void (*unref)(grpc_subchannel_factory *factory, grpc_call_list *call_list); + void (*unref)(grpc_subchannel_factory *factory, + grpc_closure_list *closure_list); grpc_subchannel *(*create_subchannel)(grpc_subchannel_factory *factory, grpc_subchannel_args *args, - grpc_call_list *call_list); + grpc_closure_list *closure_list); }; void grpc_subchannel_factory_ref(grpc_subchannel_factory *factory); void grpc_subchannel_factory_unref(grpc_subchannel_factory *factory, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** Create a new grpc_subchannel */ grpc_subchannel *grpc_subchannel_factory_create_subchannel( grpc_subchannel_factory *factory, grpc_subchannel_args *args, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_SUBCHANNEL_FACTORY_H */ diff --git a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c index 00dff6343c1..cf5fb00cdf8 100644 --- a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c +++ b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c @@ -48,10 +48,10 @@ static void merge_args_factory_ref(grpc_subchannel_factory *scf) { } static void merge_args_factory_unref(grpc_subchannel_factory *scf, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { merge_args_factory *f = (merge_args_factory *)scf; if (gpr_unref(&f->refs)) { - grpc_subchannel_factory_unref(f->wrapped, call_list); + grpc_subchannel_factory_unref(f->wrapped, closure_list); grpc_channel_args_destroy(f->merge_args); gpr_free(f); } @@ -59,13 +59,13 @@ static void merge_args_factory_unref(grpc_subchannel_factory *scf, static grpc_subchannel *merge_args_factory_create_subchannel( grpc_subchannel_factory *scf, grpc_subchannel_args *args, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { merge_args_factory *f = (merge_args_factory *)scf; grpc_channel_args *final_args = grpc_channel_args_merge(args->args, f->merge_args); grpc_subchannel *s; args->args = final_args; - s = grpc_subchannel_factory_create_subchannel(f->wrapped, args, call_list); + s = grpc_subchannel_factory_create_subchannel(f->wrapped, args, closure_list); grpc_channel_args_destroy(final_args); return s; } diff --git a/src/core/httpcli/httpcli.c b/src/core/httpcli/httpcli.c index fc45eda2de6..6422bfb840a 100644 --- a/src/core/httpcli/httpcli.c +++ b/src/core/httpcli/httpcli.c @@ -71,13 +71,12 @@ typedef struct { static grpc_httpcli_get_override g_get_override = NULL; static grpc_httpcli_post_override g_post_override = NULL; -static void plaintext_handshake(void *arg, grpc_endpoint *endpoint, - const char *host, - void (*on_done)(void *arg, - grpc_endpoint *endpoint, - grpc_call_list *call_list), - grpc_call_list *call_list) { - on_done(arg, endpoint, call_list); +static void plaintext_handshake( + void *arg, grpc_endpoint *endpoint, const char *host, + void (*on_done)(void *arg, grpc_endpoint *endpoint, + grpc_closure_list *closure_list), + grpc_closure_list *closure_list) { + on_done(arg, endpoint, closure_list); } const grpc_httpcli_handshaker grpc_httpcli_plaintext = {"http", @@ -91,19 +90,21 @@ void grpc_httpcli_context_destroy(grpc_httpcli_context *context) { grpc_pollset_set_destroy(&context->pollset_set); } -static void next_address(internal_request *req, grpc_call_list *call_list); +static void next_address(internal_request *req, + grpc_closure_list *closure_list); static void finish(internal_request *req, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_pollset_set_del_pollset(&req->context->pollset_set, req->pollset, - call_list); - req->on_response(req->user_data, success ? &req->parser.r : NULL, call_list); + closure_list); + req->on_response(req->user_data, success ? &req->parser.r : NULL, + closure_list); grpc_httpcli_parser_destroy(&req->parser); if (req->addresses != NULL) { grpc_resolved_addresses_destroy(req->addresses); } if (req->ep != NULL) { - grpc_endpoint_destroy(req->ep, call_list); + grpc_endpoint_destroy(req->ep, closure_list); } gpr_slice_unref(req->request_text); gpr_free(req->host); @@ -113,13 +114,15 @@ static void finish(internal_request *req, int success, gpr_free(req); } -static void on_read(void *user_data, int success, grpc_call_list *call_list); +static void on_read(void *user_data, int success, + grpc_closure_list *closure_list); -static void do_read(internal_request *req, grpc_call_list *call_list) { - grpc_endpoint_read(req->ep, &req->incoming, &req->on_read, call_list); +static void do_read(internal_request *req, grpc_closure_list *closure_list) { + grpc_endpoint_read(req->ep, &req->incoming, &req->on_read, closure_list); } -static void on_read(void *user_data, int success, grpc_call_list *call_list) { +static void on_read(void *user_data, int success, + grpc_closure_list *closure_list) { internal_request *req = user_data; size_t i; @@ -127,94 +130,98 @@ static void on_read(void *user_data, int success, grpc_call_list *call_list) { if (GPR_SLICE_LENGTH(req->incoming.slices[i])) { req->have_read_byte = 1; if (!grpc_httpcli_parser_parse(&req->parser, req->incoming.slices[i])) { - finish(req, 0, call_list); + finish(req, 0, closure_list); return; } } } if (success) { - do_read(req, call_list); + do_read(req, closure_list); } else if (!req->have_read_byte) { - next_address(req, call_list); + next_address(req, closure_list); } else { - finish(req, grpc_httpcli_parser_eof(&req->parser), call_list); + finish(req, grpc_httpcli_parser_eof(&req->parser), closure_list); } } -static void on_written(internal_request *req, grpc_call_list *call_list) { - do_read(req, call_list); +static void on_written(internal_request *req, grpc_closure_list *closure_list) { + do_read(req, closure_list); } -static void done_write(void *arg, int success, grpc_call_list *call_list) { +static void done_write(void *arg, int success, + grpc_closure_list *closure_list) { internal_request *req = arg; if (success) { - on_written(req, call_list); + on_written(req, closure_list); } else { - next_address(req, call_list); + next_address(req, closure_list); } } -static void start_write(internal_request *req, grpc_call_list *call_list) { +static void start_write(internal_request *req, + grpc_closure_list *closure_list) { gpr_slice_ref(req->request_text); gpr_slice_buffer_add(&req->outgoing, req->request_text); - grpc_endpoint_write(req->ep, &req->outgoing, &req->done_write, call_list); + grpc_endpoint_write(req->ep, &req->outgoing, &req->done_write, closure_list); } static void on_handshake_done(void *arg, grpc_endpoint *ep, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { internal_request *req = arg; if (!ep) { - next_address(req, call_list); + next_address(req, closure_list); return; } req->ep = ep; - start_write(req, call_list); + start_write(req, closure_list); } -static void on_connected(void *arg, int success, grpc_call_list *call_list) { +static void on_connected(void *arg, int success, + grpc_closure_list *closure_list) { internal_request *req = arg; if (!req->ep) { - next_address(req, call_list); + next_address(req, closure_list); return; } req->handshaker->handshake(req, req->ep, req->host, on_handshake_done, - call_list); + closure_list); } -static void next_address(internal_request *req, grpc_call_list *call_list) { +static void next_address(internal_request *req, + grpc_closure_list *closure_list) { grpc_resolved_address *addr; if (req->next_address == req->addresses->naddrs) { - finish(req, 0, call_list); + finish(req, 0, closure_list); return; } addr = &req->addresses->addrs[req->next_address++]; grpc_closure_init(&req->connected, on_connected, req); grpc_tcp_client_connect(&req->connected, &req->ep, &req->context->pollset_set, (struct sockaddr *)&addr->addr, addr->len, - req->deadline, call_list); + req->deadline, closure_list); } static void on_resolved(void *arg, grpc_resolved_addresses *addresses, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { internal_request *req = arg; if (!addresses) { - finish(req, 0, call_list); + finish(req, 0, closure_list); return; } req->addresses = addresses; req->next_address = 0; - next_address(req, call_list); + next_address(req, closure_list); } static void internal_request_begin( grpc_httpcli_context *context, grpc_pollset *pollset, const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, const char *name, - gpr_slice request_text, grpc_call_list *call_list) { + gpr_slice request_text, grpc_closure_list *closure_list) { internal_request *req = gpr_malloc(sizeof(internal_request)); memset(req, 0, sizeof(*req)); req->request_text = request_text; @@ -234,7 +241,7 @@ static void internal_request_begin( req->host = gpr_strdup(request->host); grpc_pollset_set_add_pollset(&req->context->pollset_set, req->pollset, - call_list); + closure_list); grpc_resolve_address(request->host, req->handshaker->default_port, on_resolved, req); } @@ -243,16 +250,16 @@ void grpc_httpcli_get(grpc_httpcli_context *context, grpc_pollset *pollset, const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { char *name; if (g_get_override && - g_get_override(request, deadline, on_response, user_data, call_list)) { + g_get_override(request, deadline, on_response, user_data, closure_list)) { return; } gpr_asprintf(&name, "HTTP:GET:%s:%s", request->host, request->path); - internal_request_begin(context, pollset, request, deadline, on_response, - user_data, name, - grpc_httpcli_format_get_request(request), call_list); + internal_request_begin( + context, pollset, request, deadline, on_response, user_data, name, + grpc_httpcli_format_get_request(request), closure_list); gpr_free(name); } @@ -261,18 +268,18 @@ void grpc_httpcli_post(grpc_httpcli_context *context, grpc_pollset *pollset, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { char *name; if (g_post_override && g_post_override(request, body_bytes, body_size, deadline, on_response, - user_data, call_list)) { + user_data, closure_list)) { return; } gpr_asprintf(&name, "HTTP:POST:%s:%s", request->host, request->path); internal_request_begin( context, pollset, request, deadline, on_response, user_data, name, grpc_httpcli_format_post_request(request, body_bytes, body_size), - call_list); + closure_list); gpr_free(name); } diff --git a/src/core/httpcli/httpcli.h b/src/core/httpcli/httpcli.h index 6d19da37fbe..2460c6ca606 100644 --- a/src/core/httpcli/httpcli.h +++ b/src/core/httpcli/httpcli.h @@ -63,8 +63,8 @@ typedef struct { const char *default_port; void (*handshake)(void *arg, grpc_endpoint *endpoint, const char *host, void (*on_done)(void *arg, grpc_endpoint *endpoint, - grpc_call_list *call_list), - grpc_call_list *call_list); + grpc_closure_list *closure_list), + grpc_closure_list *closure_list); } grpc_httpcli_handshaker; extern const grpc_httpcli_handshaker grpc_httpcli_plaintext; @@ -100,7 +100,7 @@ typedef struct grpc_httpcli_response { /* Callback for grpc_httpcli_get and grpc_httpcli_post. */ typedef void (*grpc_httpcli_response_cb)(void *user_data, const grpc_httpcli_response *response, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_httpcli_context_init(grpc_httpcli_context *context); void grpc_httpcli_context_destroy(grpc_httpcli_context *context); @@ -119,7 +119,7 @@ void grpc_httpcli_get(grpc_httpcli_context *context, grpc_pollset *pollset, const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Asynchronously perform a HTTP POST. 'context' specifies the http context under which to do the post @@ -141,21 +141,21 @@ void grpc_httpcli_post(grpc_httpcli_context *context, grpc_pollset *pollset, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* override functions return 1 if they handled the request, 0 otherwise */ typedef int (*grpc_httpcli_get_override)(const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list); + grpc_closure_list *closure_list); typedef int (*grpc_httpcli_post_override)(const grpc_httpcli_request *request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_httpcli_set_override(grpc_httpcli_get_override get, grpc_httpcli_post_override post); diff --git a/src/core/httpcli/httpcli_security_connector.c b/src/core/httpcli/httpcli_security_connector.c index a340a90c4b2..1ae1d7f09b0 100644 --- a/src/core/httpcli/httpcli_security_connector.c +++ b/src/core/httpcli/httpcli_security_connector.c @@ -62,13 +62,13 @@ static void httpcli_ssl_do_handshake(grpc_security_connector *sc, grpc_endpoint *nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_httpcli_ssl_channel_security_connector *c = (grpc_httpcli_ssl_channel_security_connector *)sc; tsi_result result = TSI_OK; tsi_handshaker *handshaker; if (c->handshaker_factory == NULL) { - cb(user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, call_list); + cb(user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, closure_list); return; } result = tsi_ssl_handshaker_factory_create_handshaker( @@ -76,10 +76,10 @@ static void httpcli_ssl_do_handshake(grpc_security_connector *sc, if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshaker creation failed with error %s.", tsi_result_to_string(result)); - cb(user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, call_list); + cb(user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, closure_list); } else { grpc_do_security_handshake(handshaker, sc, nonsecure_endpoint, cb, - user_data, call_list); + user_data, closure_list); } } @@ -143,7 +143,8 @@ static grpc_security_status httpcli_ssl_channel_security_connector_create( /* handshaker */ typedef struct { - void (*func)(void *arg, grpc_endpoint *endpoint, grpc_call_list *call_list); + void (*func)(void *arg, grpc_endpoint *endpoint, + grpc_closure_list *closure_list); void *arg; } on_done_closure; @@ -151,28 +152,28 @@ static void on_secure_transport_setup_done(void *rp, grpc_security_status status, grpc_endpoint *wrapped_endpoint, grpc_endpoint *secure_endpoint, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { on_done_closure *c = rp; if (status != GRPC_SECURITY_OK) { gpr_log(GPR_ERROR, "Secure transport setup failed with error %d.", status); - c->func(c->arg, NULL, call_list); + c->func(c->arg, NULL, closure_list); } else { - c->func(c->arg, secure_endpoint, call_list); + c->func(c->arg, secure_endpoint, closure_list); } gpr_free(c); } static void ssl_handshake(void *arg, grpc_endpoint *tcp, const char *host, void (*on_done)(void *arg, grpc_endpoint *endpoint, - grpc_call_list *call_list), - grpc_call_list *call_list) { + grpc_closure_list *closure_list), + grpc_closure_list *closure_list) { grpc_channel_security_connector *sc = NULL; const unsigned char *pem_root_certs = NULL; on_done_closure *c = gpr_malloc(sizeof(*c)); size_t pem_root_certs_size = grpc_get_default_ssl_roots(&pem_root_certs); if (pem_root_certs == NULL || pem_root_certs_size == 0) { gpr_log(GPR_ERROR, "Could not get default pem root certs."); - on_done(arg, NULL, call_list); + on_done(arg, NULL, closure_list); gpr_free(c); return; } @@ -182,7 +183,7 @@ static void ssl_handshake(void *arg, grpc_endpoint *tcp, const char *host, pem_root_certs, pem_root_certs_size, host, &sc) == GRPC_SECURITY_OK); grpc_security_connector_do_handshake( - &sc->base, tcp, on_secure_transport_setup_done, c, call_list); + &sc->base, tcp, on_secure_transport_setup_done, c, closure_list); GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "httpcli"); } diff --git a/src/core/iomgr/alarm.c b/src/core/iomgr/alarm.c index da265d4e506..d26dc57b096 100644 --- a/src/core/iomgr/alarm.c +++ b/src/core/iomgr/alarm.c @@ -73,7 +73,8 @@ static shard_type g_shards[NUM_SHARDS]; static shard_type *g_shard_queue[NUM_SHARDS]; static int run_some_expired_alarms(gpr_timespec now, gpr_timespec *next, - int success, grpc_call_list *call_list); + int success, + grpc_closure_list *closure_list); static gpr_timespec compute_min_deadline(shard_type *shard) { return grpc_alarm_heap_is_empty(&shard->heap) @@ -102,9 +103,9 @@ void grpc_alarm_list_init(gpr_timespec now) { } } -void grpc_alarm_list_shutdown(grpc_call_list *call_list) { +void grpc_alarm_list_shutdown(grpc_closure_list *closure_list) { int i; - run_some_expired_alarms(gpr_inf_future(g_clock_type), NULL, 0, call_list); + run_some_expired_alarms(gpr_inf_future(g_clock_type), NULL, 0, closure_list); for (i = 0; i < NUM_SHARDS; i++) { shard_type *shard = &g_shards[i]; gpr_mu_destroy(&shard->mu); @@ -172,7 +173,7 @@ static void note_deadline_change(shard_type *shard) { void grpc_alarm_init(grpc_alarm *alarm, gpr_timespec deadline, grpc_iomgr_cb_func alarm_cb, void *alarm_cb_arg, - gpr_timespec now, grpc_call_list *call_list) { + gpr_timespec now, grpc_closure_list *closure_list) { int is_first_alarm = 0; shard_type *shard = &g_shards[shard_idx(alarm)]; GPR_ASSERT(deadline.clock_type == g_clock_type); @@ -220,11 +221,11 @@ void grpc_alarm_init(grpc_alarm *alarm, gpr_timespec deadline, } } -void grpc_alarm_cancel(grpc_alarm *alarm, grpc_call_list *call_list) { +void grpc_alarm_cancel(grpc_alarm *alarm, grpc_closure_list *closure_list) { shard_type *shard = &g_shards[shard_idx(alarm)]; gpr_mu_lock(&shard->mu); if (!alarm->triggered) { - grpc_call_list_add(call_list, &alarm->closure, 0); + grpc_closure_list_add(closure_list, &alarm->closure, 0); alarm->triggered = 1; if (alarm->heap_index == INVALID_HEAP_INDEX) { list_remove(alarm); @@ -285,12 +286,12 @@ static grpc_alarm *pop_one(shard_type *shard, gpr_timespec now) { /* REQUIRES: shard->mu unlocked */ static size_t pop_alarms(shard_type *shard, gpr_timespec now, gpr_timespec *new_min_deadline, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t n = 0; grpc_alarm *alarm; gpr_mu_lock(&shard->mu); while ((alarm = pop_one(shard, now))) { - grpc_call_list_add(call_list, &alarm->closure, success); + grpc_closure_list_add(closure_list, &alarm->closure, success); n++; } *new_min_deadline = compute_min_deadline(shard); @@ -299,7 +300,8 @@ static size_t pop_alarms(shard_type *shard, gpr_timespec now, } static int run_some_expired_alarms(gpr_timespec now, gpr_timespec *next, - int success, grpc_call_list *call_list) { + int success, + grpc_closure_list *closure_list) { size_t n = 0; /* TODO(ctiller): verify that there are any alarms (atomically) here */ @@ -314,7 +316,7 @@ static int run_some_expired_alarms(gpr_timespec now, gpr_timespec *next, shard. This may violate perfect alarm deadline ordering, but that shouldn't be a big deal because we don't make ordering guarantees. */ n += pop_alarms(g_shard_queue[0], now, &new_min_deadline, success, - call_list); + closure_list); /* An grpc_alarm_init() on the shard could intervene here, adding a new alarm that is earlier than new_min_deadline. However, @@ -337,11 +339,11 @@ static int run_some_expired_alarms(gpr_timespec now, gpr_timespec *next, } int grpc_alarm_check(gpr_timespec now, gpr_timespec *next, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { GPR_ASSERT(now.clock_type == g_clock_type); return run_some_expired_alarms( now, next, gpr_time_cmp(now, gpr_inf_future(now.clock_type)) != 0, - call_list); + closure_list); } gpr_timespec grpc_alarm_list_next_timeout(void) { diff --git a/src/core/iomgr/alarm.h b/src/core/iomgr/alarm.h index 05ca7c27bbd..09bfa887569 100644 --- a/src/core/iomgr/alarm.h +++ b/src/core/iomgr/alarm.h @@ -55,7 +55,7 @@ typedef struct grpc_alarm { information about when to free up any user-level state. */ void grpc_alarm_init(grpc_alarm *alarm, gpr_timespec deadline, grpc_iomgr_cb_func alarm_cb, void *alarm_cb_arg, - gpr_timespec now, grpc_call_list *call_list); + gpr_timespec now, grpc_closure_list *closure_list); /* Note that there is no alarm destroy function. This is because the alarm is a one-time occurrence with a guarantee that the callback will @@ -83,6 +83,6 @@ void grpc_alarm_init(grpc_alarm *alarm, gpr_timespec deadline, matches this aim. Requires: cancel() must happen after add() on a given alarm */ -void grpc_alarm_cancel(grpc_alarm *alarm, grpc_call_list *call_list); +void grpc_alarm_cancel(grpc_alarm *alarm, grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_ALARM_H */ diff --git a/src/core/iomgr/alarm_internal.h b/src/core/iomgr/alarm_internal.h index a2e9946f4fd..aebc789ec67 100644 --- a/src/core/iomgr/alarm_internal.h +++ b/src/core/iomgr/alarm_internal.h @@ -49,9 +49,9 @@ at any time slice. */ int grpc_alarm_check(gpr_timespec now, gpr_timespec *next, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_alarm_list_init(gpr_timespec now); -void grpc_alarm_list_shutdown(grpc_call_list *call_list); +void grpc_alarm_list_shutdown(grpc_closure_list *closure_list); gpr_timespec grpc_alarm_list_next_timeout(void); diff --git a/src/core/iomgr/endpoint.c b/src/core/iomgr/endpoint.c index 769f155a639..db2a738d09a 100644 --- a/src/core/iomgr/endpoint.c +++ b/src/core/iomgr/endpoint.c @@ -34,32 +34,33 @@ #include "src/core/iomgr/endpoint.h" void grpc_endpoint_read(grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_closure *cb, grpc_call_list *call_list) { - ep->vtable->read(ep, slices, cb, call_list); + grpc_closure *cb, grpc_closure_list *closure_list) { + ep->vtable->read(ep, slices, cb, closure_list); } void grpc_endpoint_write(grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_closure *cb, grpc_call_list *call_list) { - ep->vtable->write(ep, slices, cb, call_list); + grpc_closure *cb, grpc_closure_list *closure_list) { + ep->vtable->write(ep, slices, cb, closure_list); } void grpc_endpoint_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset, - grpc_call_list *call_list) { - ep->vtable->add_to_pollset(ep, pollset, call_list); + grpc_closure_list *closure_list) { + ep->vtable->add_to_pollset(ep, pollset, closure_list); } void grpc_endpoint_add_to_pollset_set(grpc_endpoint *ep, grpc_pollset_set *pollset_set, - grpc_call_list *call_list) { - ep->vtable->add_to_pollset_set(ep, pollset_set, call_list); + grpc_closure_list *closure_list) { + ep->vtable->add_to_pollset_set(ep, pollset_set, closure_list); } -void grpc_endpoint_shutdown(grpc_endpoint *ep, grpc_call_list *call_list) { - ep->vtable->shutdown(ep, call_list); +void grpc_endpoint_shutdown(grpc_endpoint *ep, + grpc_closure_list *closure_list) { + ep->vtable->shutdown(ep, closure_list); } -void grpc_endpoint_destroy(grpc_endpoint *ep, grpc_call_list *call_list) { - ep->vtable->destroy(ep, call_list); +void grpc_endpoint_destroy(grpc_endpoint *ep, grpc_closure_list *closure_list) { + ep->vtable->destroy(ep, closure_list); } char *grpc_endpoint_get_peer(grpc_endpoint *ep) { diff --git a/src/core/iomgr/endpoint.h b/src/core/iomgr/endpoint.h index f9881684ffa..cb722e32e9d 100644 --- a/src/core/iomgr/endpoint.h +++ b/src/core/iomgr/endpoint.h @@ -48,15 +48,15 @@ typedef struct grpc_endpoint_vtable grpc_endpoint_vtable; struct grpc_endpoint_vtable { void (*read)(grpc_endpoint *ep, gpr_slice_buffer *slices, grpc_closure *cb, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void (*write)(grpc_endpoint *ep, gpr_slice_buffer *slices, grpc_closure *cb, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void (*add_to_pollset)(grpc_endpoint *ep, grpc_pollset *pollset, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void (*add_to_pollset_set)(grpc_endpoint *ep, grpc_pollset_set *pollset, - grpc_call_list *call_list); - void (*shutdown)(grpc_endpoint *ep, grpc_call_list *call_list); - void (*destroy)(grpc_endpoint *ep, grpc_call_list *call_list); + grpc_closure_list *closure_list); + void (*shutdown)(grpc_endpoint *ep, grpc_closure_list *closure_list); + void (*destroy)(grpc_endpoint *ep, grpc_closure_list *closure_list); char *(*get_peer)(grpc_endpoint *ep); }; @@ -65,7 +65,7 @@ struct grpc_endpoint_vtable { indicates the endpoint is closed. Valid slices may be placed into \a slices even on callback success == 0. */ void grpc_endpoint_read(grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_closure *cb, grpc_call_list *call_list); + grpc_closure *cb, grpc_closure_list *closure_list); char *grpc_endpoint_get_peer(grpc_endpoint *ep); @@ -80,20 +80,20 @@ char *grpc_endpoint_get_peer(grpc_endpoint *ep); it is a valid slice buffer. */ void grpc_endpoint_write(grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_closure *cb, grpc_call_list *call_list); + grpc_closure *cb, grpc_closure_list *closure_list); /* Causes any pending read/write callbacks to run immediately with success==0 */ -void grpc_endpoint_shutdown(grpc_endpoint *ep, grpc_call_list *call_list); -void grpc_endpoint_destroy(grpc_endpoint *ep, grpc_call_list *call_list); +void grpc_endpoint_shutdown(grpc_endpoint *ep, grpc_closure_list *closure_list); +void grpc_endpoint_destroy(grpc_endpoint *ep, grpc_closure_list *closure_list); /* 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_endpoint *ep, grpc_pollset *pollset, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_endpoint_add_to_pollset_set(grpc_endpoint *ep, grpc_pollset_set *pollset_set, - grpc_call_list *call_list); + grpc_closure_list *closure_list); struct grpc_endpoint { const grpc_endpoint_vtable *vtable; diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index 7c1db32553f..5e455f32d77 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -212,7 +212,7 @@ static int has_watchers(grpc_fd *fd) { } void grpc_fd_orphan(grpc_fd *fd, grpc_closure *on_done, const char *reason, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { fd->on_done_closure = on_done; shutdown(fd->fd, SHUT_RDWR); gpr_mu_lock(&fd->watcher_mu); @@ -220,7 +220,7 @@ void grpc_fd_orphan(grpc_fd *fd, grpc_closure *on_done, const char *reason, if (!has_watchers(fd)) { fd->closed = 1; close(fd->fd); - grpc_call_list_add(call_list, fd->on_done_closure, 1); + grpc_closure_list_add(closure_list, fd->on_done_closure, 1); } else { wake_all_watchers_locked(fd); } @@ -245,7 +245,7 @@ void grpc_fd_unref(grpc_fd *fd) { unref_by(fd, 2); } #endif static void notify_on(grpc_fd *fd, gpr_atm *st, grpc_closure *closure, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { switch (gpr_atm_acq_load(st)) { case NOT_READY: /* There is no race if the descriptor is already ready, so we skip @@ -267,7 +267,8 @@ static void notify_on(grpc_fd *fd, gpr_atm *st, grpc_closure *closure, case READY: GPR_ASSERT(gpr_atm_no_barrier_load(st) == READY); gpr_atm_rel_store(st, NOT_READY); - grpc_call_list_add(call_list, closure, !gpr_atm_acq_load(&fd->shutdown)); + grpc_closure_list_add(closure_list, closure, + !gpr_atm_acq_load(&fd->shutdown)); return; default: /* WAITING */ /* upcallptr was set to a different closure. This is an error! */ @@ -281,7 +282,7 @@ static void notify_on(grpc_fd *fd, gpr_atm *st, grpc_closure *closure, } static void set_ready_locked(grpc_fd *fd, gpr_atm *st, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { gpr_intptr state = gpr_atm_acq_load(st); switch (state) { @@ -300,38 +301,39 @@ static void set_ready_locked(grpc_fd *fd, gpr_atm *st, default: /* waiting */ GPR_ASSERT(gpr_atm_no_barrier_load(st) != READY && gpr_atm_no_barrier_load(st) != NOT_READY); - grpc_call_list_add(call_list, (grpc_closure *)state, - !gpr_atm_acq_load(&fd->shutdown)); + grpc_closure_list_add(closure_list, (grpc_closure *)state, + !gpr_atm_acq_load(&fd->shutdown)); gpr_atm_rel_store(st, NOT_READY); return; } } -static void set_ready(grpc_fd *fd, gpr_atm *st, grpc_call_list *call_list) { +static void set_ready(grpc_fd *fd, gpr_atm *st, + grpc_closure_list *closure_list) { /* only one set_ready can be active at once (but there may be a racing notify_on) */ gpr_mu_lock(&fd->set_state_mu); - set_ready_locked(fd, st, call_list); + set_ready_locked(fd, st, closure_list); gpr_mu_unlock(&fd->set_state_mu); } -void grpc_fd_shutdown(grpc_fd *fd, grpc_call_list *call_list) { +void grpc_fd_shutdown(grpc_fd *fd, grpc_closure_list *closure_list) { gpr_mu_lock(&fd->set_state_mu); GPR_ASSERT(!gpr_atm_no_barrier_load(&fd->shutdown)); gpr_atm_rel_store(&fd->shutdown, 1); - set_ready_locked(fd, &fd->readst, call_list); - set_ready_locked(fd, &fd->writest, call_list); + set_ready_locked(fd, &fd->readst, closure_list); + set_ready_locked(fd, &fd->writest, closure_list); gpr_mu_unlock(&fd->set_state_mu); } void grpc_fd_notify_on_read(grpc_fd *fd, grpc_closure *closure, - grpc_call_list *call_list) { - notify_on(fd, &fd->readst, closure, call_list); + grpc_closure_list *closure_list) { + notify_on(fd, &fd->readst, closure, closure_list); } void grpc_fd_notify_on_write(grpc_fd *fd, grpc_closure *closure, - grpc_call_list *call_list) { - notify_on(fd, &fd->writest, closure, call_list); + grpc_closure_list *closure_list) { + notify_on(fd, &fd->writest, closure, closure_list); } gpr_uint32 grpc_fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset, @@ -378,7 +380,7 @@ gpr_uint32 grpc_fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset, } void grpc_fd_end_poll(grpc_fd_watcher *watcher, int got_read, int got_write, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { int was_polling = 0; int kick = 0; grpc_fd *fd = watcher->fd; @@ -411,19 +413,19 @@ void grpc_fd_end_poll(grpc_fd_watcher *watcher, int got_read, int got_write, if (grpc_fd_is_orphaned(fd) && !has_watchers(fd) && !fd->closed) { fd->closed = 1; close(fd->fd); - grpc_call_list_add(call_list, fd->on_done_closure, 1); + grpc_closure_list_add(closure_list, fd->on_done_closure, 1); } gpr_mu_unlock(&fd->watcher_mu); GRPC_FD_UNREF(fd, "poll"); } -void grpc_fd_become_readable(grpc_fd *fd, grpc_call_list *call_list) { - set_ready(fd, &fd->readst, call_list); +void grpc_fd_become_readable(grpc_fd *fd, grpc_closure_list *closure_list) { + set_ready(fd, &fd->readst, closure_list); } -void grpc_fd_become_writable(grpc_fd *fd, grpc_call_list *call_list) { - set_ready(fd, &fd->writest, call_list); +void grpc_fd_become_writable(grpc_fd *fd, grpc_closure_list *closure_list) { + set_ready(fd, &fd->writest, closure_list); } #endif diff --git a/src/core/iomgr/fd_posix.h b/src/core/iomgr/fd_posix.h index 607cba6181a..eab0daa00d5 100644 --- a/src/core/iomgr/fd_posix.h +++ b/src/core/iomgr/fd_posix.h @@ -112,7 +112,7 @@ grpc_fd *grpc_fd_create(int fd, const char *name); notify_on_write. MUST NOT be called with a pollset lock taken */ void grpc_fd_orphan(grpc_fd *fd, grpc_closure *on_done, const char *reason, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Begin polling on an fd. Registers that the given pollset is interested in this fd - so that if read @@ -131,13 +131,13 @@ gpr_uint32 grpc_fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset, /* Complete polling previously started with grpc_fd_begin_poll MUST NOT be called with a pollset lock taken */ void grpc_fd_end_poll(grpc_fd_watcher *rec, int got_read, int got_write, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Return 1 if this fd is orphaned, 0 otherwise */ int grpc_fd_is_orphaned(grpc_fd *fd); /* Cause any current callbacks to error out with GRPC_CALLBACK_CANCELLED. */ -void grpc_fd_shutdown(grpc_fd *fd, grpc_call_list *call_list); +void grpc_fd_shutdown(grpc_fd *fd, grpc_closure_list *closure_list); /* Register read interest, causing read_cb to be called once when fd becomes readable, on deadline specified by deadline, or on shutdown triggered by @@ -153,18 +153,18 @@ void grpc_fd_shutdown(grpc_fd *fd, grpc_call_list *call_list); 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, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Exactly the same semantics as above, except based on writable events. */ void grpc_fd_notify_on_write(grpc_fd *fd, grpc_closure *closure, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Notification from the poller to an fd that it has become readable or writable. If allow_synchronous_callback is 1, allow running the fd callback inline in this callstack, otherwise register an asynchronous callback and return */ -void grpc_fd_become_readable(grpc_fd *fd, grpc_call_list *call_list); -void grpc_fd_become_writable(grpc_fd *fd, grpc_call_list *call_list); +void grpc_fd_become_readable(grpc_fd *fd, grpc_closure_list *closure_list); +void grpc_fd_become_writable(grpc_fd *fd, grpc_closure_list *closure_list); /* Reference counting for fds */ #ifdef GRPC_FD_REF_COUNT_DEBUG diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index b2c17b1ef20..9456bad7169 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -88,7 +88,7 @@ void grpc_iomgr_shutdown(void) { 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_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_mu_lock(&g_mu); g_shutdown = 1; @@ -103,9 +103,9 @@ void grpc_iomgr_shutdown(void) { last_warning_time = gpr_now(GPR_CLOCK_REALTIME); } if (grpc_alarm_check(gpr_inf_future(GPR_CLOCK_MONOTONIC), NULL, - &call_list)) { + &closure_list)) { gpr_mu_unlock(&g_mu); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(&g_mu); continue; } @@ -131,8 +131,8 @@ void grpc_iomgr_shutdown(void) { } gpr_mu_unlock(&g_mu); - grpc_alarm_list_shutdown(&call_list); - grpc_call_list_run(&call_list); + grpc_alarm_list_shutdown(&closure_list); + grpc_closure_list_run(&closure_list); /* ensure all threads have left g_mu */ gpr_mu_lock(&g_mu); @@ -168,36 +168,36 @@ void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, closure->next = NULL; } -void grpc_call_list_add(grpc_call_list *call_list, grpc_closure *closure, - int success) { +void grpc_closure_list_add(grpc_closure_list *closure_list, + grpc_closure *closure, int success) { if (closure == NULL) return; closure->next = NULL; closure->success = success; - if (call_list->head == NULL) { - call_list->head = closure; + if (closure_list->head == NULL) { + closure_list->head = closure; } else { - call_list->tail->next = closure; + closure_list->tail->next = closure; } - call_list->tail = closure; + closure_list->tail = closure; } -void grpc_call_list_run(grpc_call_list *call_list) { - while (!grpc_call_list_empty(*call_list)) { - grpc_closure *c = call_list->head; - call_list->head = call_list->tail = NULL; +void grpc_closure_list_run(grpc_closure_list *closure_list) { + while (!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; - c->cb(c->cb_arg, c->success, call_list); + c->cb(c->cb_arg, c->success, closure_list); c = next; } } } -int grpc_call_list_empty(grpc_call_list call_list) { - return call_list.head == NULL; +int grpc_closure_list_empty(grpc_closure_list closure_list) { + return closure_list.head == NULL; } -void grpc_call_list_move(grpc_call_list *src, grpc_call_list *dst) { +void grpc_closure_list_move(grpc_closure_list *src, grpc_closure_list *dst) { if (src->head == NULL) { return; } diff --git a/src/core/iomgr/iomgr.h b/src/core/iomgr/iomgr.h index 94f3912990c..bc015706a31 100644 --- a/src/core/iomgr/iomgr.h +++ b/src/core/iomgr/iomgr.h @@ -37,10 +37,10 @@ struct grpc_closure; typedef struct grpc_closure grpc_closure; -typedef struct grpc_call_list { +typedef struct grpc_closure_list { grpc_closure *head; grpc_closure *tail; -} grpc_call_list; +} grpc_closure_list; /** gRPC Callback definition. * @@ -48,7 +48,7 @@ typedef struct grpc_call_list { * \param success An indication on the state of the iomgr. On false, cleanup * actions should be taken (eg, shutdown). */ typedef void (*grpc_iomgr_cb_func)(void *arg, int success, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** A closure over a grpc_iomgr_cb_func. */ struct grpc_closure { @@ -71,14 +71,14 @@ struct grpc_closure { void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, void *cb_arg); -#define GRPC_CALL_LIST_INIT \ +#define GRPC_CLOSURE_LIST_INIT \ { NULL, NULL } -void grpc_call_list_add(grpc_call_list *list, grpc_closure *closure, - int success); -void grpc_call_list_run(grpc_call_list *list); -void grpc_call_list_move(grpc_call_list *src, grpc_call_list *dst); -int grpc_call_list_empty(grpc_call_list list); +void grpc_closure_list_add(grpc_closure_list *list, grpc_closure *closure, + int success); +void grpc_closure_list_run(grpc_closure_list *list); +void grpc_closure_list_move(grpc_closure_list *src, grpc_closure_list *dst); +int grpc_closure_list_empty(grpc_closure_list list); /** Initializes the iomgr. */ void grpc_iomgr_init(void); diff --git a/src/core/iomgr/pollset.h b/src/core/iomgr/pollset.h index 95ba694ff6b..b5d71bfb4ca 100644 --- a/src/core/iomgr/pollset.h +++ b/src/core/iomgr/pollset.h @@ -56,7 +56,7 @@ void grpc_pollset_init(grpc_pollset *pollset); void grpc_pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_pollset_destroy(grpc_pollset *pollset); /* Do some work on a pollset. @@ -74,11 +74,12 @@ void grpc_pollset_destroy(grpc_pollset *pollset); not be released by grpc_pollset_work AFTER worker has been destroyed. Tries not to block past deadline. - May call grpc_call_list_run on grpc_call_list, without holding the pollset + May call grpc_closure_list_run on grpc_closure_list, without holding the + pollset lock */ void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, gpr_timespec now, gpr_timespec deadline, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Break one polling thread out of polling work for this pollset. If specific_worker is GRPC_POLLSET_KICK_BROADCAST, kick ALL the workers. diff --git a/src/core/iomgr/pollset_multipoller_with_epoll.c b/src/core/iomgr/pollset_multipoller_with_epoll.c index e6e0f5cdd4a..a83086572e1 100644 --- a/src/core/iomgr/pollset_multipoller_with_epoll.c +++ b/src/core/iomgr/pollset_multipoller_with_epoll.c @@ -62,7 +62,7 @@ typedef struct { } pollset_hdr; static void finally_add_fd(grpc_pollset *pollset, grpc_fd *fd, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { pollset_hdr *h = pollset->data.ptr; struct epoll_event ev; int err; @@ -84,15 +84,15 @@ static void finally_add_fd(grpc_pollset *pollset, grpc_fd *fd, } } } - grpc_fd_end_poll(&watcher, 0, 0, call_list); + grpc_fd_end_poll(&watcher, 0, 0, closure_list); } static void perform_delayed_add(void *arg, int iomgr_status, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { delayed_add *da = arg; if (!grpc_fd_is_orphaned(da->fd)) { - finally_add_fd(da->pollset, da->fd, call_list); + finally_add_fd(da->pollset, da->fd, closure_list); } gpr_mu_lock(&da->pollset->mu); @@ -101,7 +101,7 @@ static void perform_delayed_add(void *arg, int iomgr_status, /* We don't care about this pollset anymore. */ if (da->pollset->in_flight_cbs == 0 && !da->pollset->called_shutdown) { da->pollset->called_shutdown = 1; - grpc_call_list_add(call_list, da->pollset->shutdown_done, 1); + grpc_closure_list_add(closure_list, da->pollset->shutdown_done, 1); } } gpr_mu_unlock(&da->pollset->mu); @@ -111,13 +111,12 @@ static void perform_delayed_add(void *arg, int iomgr_status, gpr_free(da); } -static void multipoll_with_epoll_pollset_add_fd(grpc_pollset *pollset, - grpc_fd *fd, - int and_unlock_pollset, - grpc_call_list *call_list) { +static void multipoll_with_epoll_pollset_add_fd( + grpc_pollset *pollset, grpc_fd *fd, int and_unlock_pollset, + grpc_closure_list *closure_list) { if (and_unlock_pollset) { gpr_mu_unlock(&pollset->mu); - finally_add_fd(pollset, fd, call_list); + finally_add_fd(pollset, fd, closure_list); } else { delayed_add *da = gpr_malloc(sizeof(*da)); da->pollset = pollset; @@ -125,14 +124,13 @@ static void multipoll_with_epoll_pollset_add_fd(grpc_pollset *pollset, GRPC_FD_REF(fd, "delayed_add"); grpc_closure_init(&da->closure, perform_delayed_add, da); pollset->in_flight_cbs++; - grpc_call_list_add(call_list, &da->closure, 1); + grpc_closure_list_add(closure_list, &da->closure, 1); } } -static void multipoll_with_epoll_pollset_del_fd(grpc_pollset *pollset, - grpc_fd *fd, - int and_unlock_pollset, - grpc_call_list *call_list) { +static void multipoll_with_epoll_pollset_del_fd( + grpc_pollset *pollset, grpc_fd *fd, int and_unlock_pollset, + grpc_closure_list *closure_list) { pollset_hdr *h = pollset->data.ptr; int err; @@ -154,7 +152,7 @@ static void multipoll_with_epoll_pollset_del_fd(grpc_pollset *pollset, static void multipoll_with_epoll_pollset_maybe_work_and_unlock( grpc_pollset *pollset, grpc_pollset_worker *worker, gpr_timespec deadline, - gpr_timespec now, grpc_call_list *call_list) { + gpr_timespec now, grpc_closure_list *closure_list) { struct epoll_event ep_ev[GRPC_EPOLL_MAX_EVENTS]; int ep_rv; int poll_rv; @@ -208,10 +206,10 @@ static void multipoll_with_epoll_pollset_maybe_work_and_unlock( int read = ep_ev[i].events & (EPOLLIN | EPOLLPRI); int write = ep_ev[i].events & EPOLLOUT; if (read || cancel) { - grpc_fd_become_readable(fd, call_list); + grpc_fd_become_readable(fd, closure_list); } if (write || cancel) { - grpc_fd_become_writable(fd, call_list); + grpc_fd_become_writable(fd, closure_list); } } } @@ -236,7 +234,8 @@ static const grpc_pollset_vtable multipoll_with_epoll_pollset = { multipoll_with_epoll_pollset_destroy}; static void epoll_become_multipoller(grpc_pollset *pollset, grpc_fd **fds, - size_t nfds, grpc_call_list *call_list) { + size_t nfds, + grpc_closure_list *closure_list) { size_t i; pollset_hdr *h = gpr_malloc(sizeof(pollset_hdr)); @@ -249,7 +248,7 @@ static void epoll_become_multipoller(grpc_pollset *pollset, grpc_fd **fds, abort(); } for (i = 0; i < nfds; i++) { - multipoll_with_epoll_pollset_add_fd(pollset, fds[i], 0, call_list); + multipoll_with_epoll_pollset_add_fd(pollset, fds[i], 0, closure_list); } } diff --git a/src/core/iomgr/pollset_multipoller_with_poll_posix.c b/src/core/iomgr/pollset_multipoller_with_poll_posix.c index 03a28894f06..a3aa7e69fac 100644 --- a/src/core/iomgr/pollset_multipoller_with_poll_posix.c +++ b/src/core/iomgr/pollset_multipoller_with_poll_posix.c @@ -59,10 +59,9 @@ typedef struct { grpc_fd **dels; } pollset_hdr; -static void multipoll_with_poll_pollset_add_fd(grpc_pollset *pollset, - grpc_fd *fd, - int and_unlock_pollset, - grpc_call_list *call_list) { +static void multipoll_with_poll_pollset_add_fd( + grpc_pollset *pollset, grpc_fd *fd, int and_unlock_pollset, + grpc_closure_list *closure_list) { size_t i; pollset_hdr *h = pollset->data.ptr; /* TODO(ctiller): this is O(num_fds^2); maybe switch to a hash set here */ @@ -81,10 +80,9 @@ exit: } } -static void multipoll_with_poll_pollset_del_fd(grpc_pollset *pollset, - grpc_fd *fd, - int and_unlock_pollset, - grpc_call_list *call_list) { +static void multipoll_with_poll_pollset_del_fd( + grpc_pollset *pollset, grpc_fd *fd, int and_unlock_pollset, + grpc_closure_list *closure_list) { /* will get removed next poll cycle */ pollset_hdr *h = pollset->data.ptr; if (h->del_count == h->del_capacity) { @@ -100,7 +98,7 @@ static void multipoll_with_poll_pollset_del_fd(grpc_pollset *pollset, static void multipoll_with_poll_pollset_maybe_work_and_unlock( grpc_pollset *pollset, grpc_pollset_worker *worker, gpr_timespec deadline, - gpr_timespec now, grpc_call_list *call_list) { + gpr_timespec now, grpc_closure_list *closure_list) { int timeout; int r; size_t i, j, fd_count; @@ -151,7 +149,7 @@ static void multipoll_with_poll_pollset_maybe_work_and_unlock( for (i = 1; i < pfd_count; i++) { grpc_fd_end_poll(&watchers[i], pfds[i].revents & POLLIN, - pfds[i].revents & POLLOUT, call_list); + pfds[i].revents & POLLOUT, closure_list); } if (r < 0) { @@ -169,10 +167,10 @@ static void multipoll_with_poll_pollset_maybe_work_and_unlock( continue; } if (pfds[i].revents & (POLLIN | POLLHUP | POLLERR)) { - grpc_fd_become_readable(watchers[i].fd, call_list); + grpc_fd_become_readable(watchers[i].fd, closure_list); } if (pfds[i].revents & (POLLOUT | POLLHUP | POLLERR)) { - grpc_fd_become_writable(watchers[i].fd, call_list); + grpc_fd_become_writable(watchers[i].fd, closure_list); } } } @@ -209,7 +207,8 @@ static const grpc_pollset_vtable multipoll_with_poll_pollset = { multipoll_with_poll_pollset_destroy}; void grpc_poll_become_multipoller(grpc_pollset *pollset, grpc_fd **fds, - size_t nfds, grpc_call_list *call_list) { + size_t nfds, + grpc_closure_list *closure_list) { size_t i; pollset_hdr *h = gpr_malloc(sizeof(pollset_hdr)); pollset->vtable = &multipoll_with_poll_pollset; diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index daca2f6daa5..82ef0298a23 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -141,9 +141,9 @@ void grpc_pollset_init(grpc_pollset *pollset) { } void grpc_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { gpr_mu_lock(&pollset->mu); - pollset->vtable->add_fd(pollset, fd, 1, call_list); + pollset->vtable->add_fd(pollset, fd, 1, closure_list); /* the following (enabled only in debug) will reacquire and then release our lock - meaning that if the unlocking flag passed to del_fd above is not respected, the code will deadlock (in a way that we have a chance of @@ -155,9 +155,9 @@ void grpc_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, } void grpc_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { gpr_mu_lock(&pollset->mu); - pollset->vtable->del_fd(pollset, fd, 1, call_list); + pollset->vtable->del_fd(pollset, fd, 1, closure_list); /* the following (enabled only in debug) will reacquire and then release our lock - meaning that if the unlocking flag passed to del_fd above is not respected, the code will deadlock (in a way that we have a chance of @@ -168,14 +168,15 @@ void grpc_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd, #endif } -static void finish_shutdown(grpc_pollset *pollset, grpc_call_list *call_list) { +static void finish_shutdown(grpc_pollset *pollset, + grpc_closure_list *closure_list) { pollset->vtable->finish_shutdown(pollset); - grpc_call_list_add(call_list, pollset->shutdown_done, 1); + grpc_closure_list_add(closure_list, pollset->shutdown_done, 1); } void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, gpr_timespec now, gpr_timespec deadline, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* pollset->mu already held */ int added_worker = 0; int locked = 1; @@ -184,11 +185,11 @@ void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, /* TODO(ctiller): pool these */ grpc_wakeup_fd_init(&worker->wakeup_fd); if (!grpc_pollset_has_workers(pollset) && - !grpc_call_list_empty(pollset->idle_jobs)) { - grpc_call_list_move(&pollset->idle_jobs, call_list); + !grpc_closure_list_empty(pollset->idle_jobs)) { + grpc_closure_list_move(&pollset->idle_jobs, closure_list); goto done; } - if (grpc_alarm_check(now, &deadline, call_list)) { + if (grpc_alarm_check(now, &deadline, closure_list)) { goto done; } if (pollset->shutting_down) { @@ -205,7 +206,7 @@ void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, added_worker = 1; gpr_tls_set(&g_current_thread_poller, (gpr_intptr)pollset); pollset->vtable->maybe_work_and_unlock(pollset, worker, deadline, now, - call_list); + closure_list); locked = 0; gpr_tls_set(&g_current_thread_poller, 0); } else { @@ -213,7 +214,7 @@ void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, } done: if (!locked) { - grpc_call_list_run(call_list); + grpc_closure_list_run(closure_list); gpr_mu_lock(&pollset->mu); locked = 1; } @@ -227,8 +228,8 @@ done: } else if (!pollset->called_shutdown && pollset->in_flight_cbs == 0) { pollset->called_shutdown = 1; gpr_mu_unlock(&pollset->mu); - finish_shutdown(pollset, call_list); - grpc_call_list_run(call_list); + finish_shutdown(pollset, closure_list); + grpc_closure_list_run(closure_list); /* Continuing to access pollset here is safe -- it is the caller's * responsibility to not destroy when it has outstanding calls to * grpc_pollset_work. @@ -239,7 +240,7 @@ done: } void grpc_pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { int call_shutdown = 0; gpr_mu_lock(&pollset->mu); GPR_ASSERT(!pollset->shutting_down); @@ -254,7 +255,7 @@ void grpc_pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure, gpr_mu_unlock(&pollset->mu); if (call_shutdown) { - finish_shutdown(pollset, call_list); + finish_shutdown(pollset, closure_list); } } @@ -296,7 +297,7 @@ typedef struct grpc_unary_promote_args { } grpc_unary_promote_args; static void basic_do_promote(void *args, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_unary_promote_args *up_args = args; const grpc_pollset_vtable *original_vtable = up_args->original_vtable; grpc_pollset *pollset = up_args->pollset; @@ -327,12 +328,12 @@ static void basic_do_promote(void *args, int success, if (pollset->in_flight_cbs == 0 && !pollset->called_shutdown) { GPR_ASSERT(!grpc_pollset_has_workers(pollset)); pollset->called_shutdown = 1; - grpc_call_list_add(call_list, pollset->shutdown_done, 1); + grpc_closure_list_add(closure_list, pollset->shutdown_done, 1); } } else if (grpc_fd_is_orphaned(fd)) { /* Don't try to add it to anything, we'll drop our ref on it below */ } else if (pollset->vtable != original_vtable) { - pollset->vtable->add_fd(pollset, fd, 0, call_list); + pollset->vtable->add_fd(pollset, fd, 0, closure_list); } else if (fd != pollset->data.ptr) { grpc_fd *fds[2]; fds[0] = pollset->data.ptr; @@ -340,7 +341,7 @@ static void basic_do_promote(void *args, int success, if (fds[0] && !grpc_fd_is_orphaned(fds[0])) { grpc_platform_become_multipoller(pollset, fds, GPR_ARRAY_SIZE(fds), - call_list); + closure_list); GRPC_FD_UNREF(fds[0], "basicpoll"); } else { /* old fd is orphaned and we haven't cleaned it up until now, so remain a @@ -358,12 +359,12 @@ static void basic_do_promote(void *args, int success, /* Matching ref in basic_pollset_add_fd */ GRPC_FD_UNREF(fd, "basicpoll_add"); - grpc_call_list_run(call_list); + grpc_closure_list_run(closure_list); } static void basic_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, int and_unlock_pollset, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_unary_promote_args *up_args; GPR_ASSERT(fd); if (fd == pollset->data.ptr) goto exit; @@ -381,7 +382,7 @@ static void basic_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, GRPC_FD_REF(fd, "basicpoll"); } else if (!grpc_fd_is_orphaned(fds[0])) { grpc_platform_become_multipoller(pollset, fds, GPR_ARRAY_SIZE(fds), - call_list); + closure_list); GRPC_FD_UNREF(fds[0], "basicpoll"); } else { /* old fd is orphaned and we haven't cleaned it up until now, so remain a @@ -404,7 +405,7 @@ static void basic_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, up_args->promotion_closure.cb = basic_do_promote; up_args->promotion_closure.cb_arg = up_args; - grpc_call_list_add(&pollset->idle_jobs, &up_args->promotion_closure, 1); + grpc_closure_list_add(&pollset->idle_jobs, &up_args->promotion_closure, 1); grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); exit: @@ -415,7 +416,7 @@ exit: static void basic_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd, int and_unlock_pollset, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { GPR_ASSERT(fd); if (fd == pollset->data.ptr) { GRPC_FD_UNREF(pollset->data.ptr, "basicpoll"); @@ -427,11 +428,9 @@ static void basic_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd, } } -static void basic_pollset_maybe_work_and_unlock(grpc_pollset *pollset, - grpc_pollset_worker *worker, - gpr_timespec deadline, - gpr_timespec now, - grpc_call_list *call_list) { +static void basic_pollset_maybe_work_and_unlock( + grpc_pollset *pollset, grpc_pollset_worker *worker, gpr_timespec deadline, + gpr_timespec now, grpc_closure_list *closure_list) { struct pollfd pfd[2]; grpc_fd *fd; grpc_fd_watcher fd_watcher; @@ -469,7 +468,7 @@ static void basic_pollset_maybe_work_and_unlock(grpc_pollset *pollset, if (fd) { grpc_fd_end_poll(&fd_watcher, pfd[1].revents & POLLIN, - pfd[1].revents & POLLOUT, call_list); + pfd[1].revents & POLLOUT, closure_list); } if (r < 0) { @@ -484,10 +483,10 @@ static void basic_pollset_maybe_work_and_unlock(grpc_pollset *pollset, } if (nfds > 1) { if (pfd[1].revents & (POLLIN | POLLHUP | POLLERR)) { - grpc_fd_become_readable(fd, call_list); + grpc_fd_become_readable(fd, closure_list); } if (pfd[1].revents & (POLLOUT | POLLHUP | POLLERR)) { - grpc_fd_become_writable(fd, call_list); + grpc_fd_become_writable(fd, closure_list); } } } diff --git a/src/core/iomgr/pollset_posix.h b/src/core/iomgr/pollset_posix.h index c65f25fd18c..2f50cd22091 100644 --- a/src/core/iomgr/pollset_posix.h +++ b/src/core/iomgr/pollset_posix.h @@ -66,7 +66,7 @@ typedef struct grpc_pollset { int called_shutdown; int kicked_without_pollers; grpc_closure *shutdown_done; - grpc_call_list idle_jobs; + grpc_closure_list idle_jobs; union { int fd; void *ptr; @@ -75,13 +75,13 @@ typedef struct grpc_pollset { struct grpc_pollset_vtable { void (*add_fd)(grpc_pollset *pollset, struct grpc_fd *fd, - int and_unlock_pollset, grpc_call_list *call_list); + int and_unlock_pollset, grpc_closure_list *closure_list); void (*del_fd)(grpc_pollset *pollset, struct grpc_fd *fd, - int and_unlock_pollset, grpc_call_list *call_list); + int and_unlock_pollset, grpc_closure_list *closure_list); void (*maybe_work_and_unlock)(grpc_pollset *pollset, grpc_pollset_worker *worker, gpr_timespec deadline, gpr_timespec now, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void (*finish_shutdown)(grpc_pollset *pollset); void (*destroy)(grpc_pollset *pollset); }; @@ -90,11 +90,11 @@ struct grpc_pollset_vtable { /* Add an fd to a pollset */ void grpc_pollset_add_fd(grpc_pollset *pollset, struct grpc_fd *fd, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Force remove an fd from a pollset (normally they are removed on the next poll after an fd is orphaned) */ void grpc_pollset_del_fd(grpc_pollset *pollset, struct grpc_fd *fd, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Returns the fd to listen on for kicks */ int grpc_kick_read_fd(grpc_pollset *p); @@ -114,11 +114,12 @@ int grpc_poll_deadline_to_millis_timeout(gpr_timespec deadline, /* turn a pollset into a multipoller: platform specific */ typedef void (*grpc_platform_become_multipoller_type)( grpc_pollset *pollset, struct grpc_fd **fds, size_t fd_count, - grpc_call_list *call_list); + grpc_closure_list *closure_list); extern grpc_platform_become_multipoller_type grpc_platform_become_multipoller; void grpc_poll_become_multipoller(grpc_pollset *pollset, struct grpc_fd **fds, - size_t fd_count, grpc_call_list *call_list); + size_t fd_count, + grpc_closure_list *closure_list); /* Return 1 if the pollset has active threads in grpc_pollset_work (pollset must * be locked) */ diff --git a/src/core/iomgr/pollset_set.h b/src/core/iomgr/pollset_set.h index ca667bf34e5..5b5b20ef66a 100644 --- a/src/core/iomgr/pollset_set.h +++ b/src/core/iomgr/pollset_set.h @@ -53,9 +53,9 @@ void grpc_pollset_set_init(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, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_pollset_set_del_pollset(grpc_pollset_set *pollset_set, grpc_pollset *pollset, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_H */ diff --git a/src/core/iomgr/pollset_set_posix.c b/src/core/iomgr/pollset_set_posix.c index a2c1f476297..810543cc2e1 100644 --- a/src/core/iomgr/pollset_set_posix.c +++ b/src/core/iomgr/pollset_set_posix.c @@ -60,7 +60,7 @@ void grpc_pollset_set_destroy(grpc_pollset_set *pollset_set) { void grpc_pollset_set_add_pollset(grpc_pollset_set *pollset_set, grpc_pollset *pollset, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t i, j; gpr_mu_lock(&pollset_set->mu); if (pollset_set->pollset_count == pollset_set->pollset_capacity) { @@ -75,7 +75,7 @@ void grpc_pollset_set_add_pollset(grpc_pollset_set *pollset_set, if (grpc_fd_is_orphaned(pollset_set->fds[i])) { GRPC_FD_UNREF(pollset_set->fds[i], "pollset"); } else { - grpc_pollset_add_fd(pollset, pollset_set->fds[i], call_list); + grpc_pollset_add_fd(pollset, pollset_set->fds[i], closure_list); pollset_set->fds[j++] = pollset_set->fds[i]; } } @@ -85,7 +85,7 @@ void grpc_pollset_set_add_pollset(grpc_pollset_set *pollset_set, void grpc_pollset_set_del_pollset(grpc_pollset_set *pollset_set, grpc_pollset *pollset, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t i; gpr_mu_lock(&pollset_set->mu); for (i = 0; i < pollset_set->pollset_count; i++) { @@ -100,7 +100,7 @@ void grpc_pollset_set_del_pollset(grpc_pollset_set *pollset_set, } void grpc_pollset_set_add_fd(grpc_pollset_set *pollset_set, grpc_fd *fd, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t i; gpr_mu_lock(&pollset_set->mu); if (pollset_set->fd_count == pollset_set->fd_capacity) { @@ -111,13 +111,13 @@ void grpc_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++) { - grpc_pollset_add_fd(pollset_set->pollsets[i], fd, call_list); + grpc_pollset_add_fd(pollset_set->pollsets[i], fd, closure_list); } gpr_mu_unlock(&pollset_set->mu); } void grpc_pollset_set_del_fd(grpc_pollset_set *pollset_set, grpc_fd *fd, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t i; gpr_mu_lock(&pollset_set->mu); for (i = 0; i < pollset_set->fd_count; i++) { diff --git a/src/core/iomgr/pollset_set_posix.h b/src/core/iomgr/pollset_set_posix.h index e9969d2c0f5..40d7a9b259b 100644 --- a/src/core/iomgr/pollset_set_posix.h +++ b/src/core/iomgr/pollset_set_posix.h @@ -50,8 +50,8 @@ typedef struct grpc_pollset_set { } grpc_pollset_set; void grpc_pollset_set_add_fd(grpc_pollset_set *pollset_set, grpc_fd *fd, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_pollset_set_del_fd(grpc_pollset_set *pollset_set, grpc_fd *fd, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_WINDOWS_H */ diff --git a/src/core/iomgr/resolve_address.h b/src/core/iomgr/resolve_address.h index 72b9c1cc87e..174432225e7 100644 --- a/src/core/iomgr/resolve_address.h +++ b/src/core/iomgr/resolve_address.h @@ -54,7 +54,7 @@ typedef struct { grpc_resolved_addresses_destroy when it's done with them On failure: addresses is NULL */ typedef void (*grpc_resolve_cb)(void *arg, grpc_resolved_addresses *addresses, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* 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 */ diff --git a/src/core/iomgr/resolve_address_posix.c b/src/core/iomgr/resolve_address_posix.c index ea64f8176fc..f0a230bab2e 100644 --- a/src/core/iomgr/resolve_address_posix.c +++ b/src/core/iomgr/resolve_address_posix.c @@ -146,17 +146,17 @@ done: /* Thread function to asynch-ify grpc_blocking_resolve_address */ static void do_request_thread(void *rp) { request *r = rp; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_resolved_addresses *resolved = grpc_blocking_resolve_address(r->name, r->default_port); void *arg = r->arg; grpc_resolve_cb cb = r->cb; gpr_free(r->name); gpr_free(r->default_port); - cb(arg, resolved, &call_list); + cb(arg, resolved, &closure_list); grpc_iomgr_unregister_object(&r->iomgr_object); gpr_free(r); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) { diff --git a/src/core/iomgr/tcp_client.h b/src/core/iomgr/tcp_client.h index 8fb5bfda1da..971e984e540 100644 --- a/src/core/iomgr/tcp_client.h +++ b/src/core/iomgr/tcp_client.h @@ -47,6 +47,7 @@ void grpc_tcp_client_connect(grpc_closure *on_connect, grpc_endpoint **endpoint, grpc_pollset_set *interested_parties, const struct sockaddr *addr, size_t addr_len, - gpr_timespec deadline, grpc_call_list *call_list); + gpr_timespec deadline, + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_TCP_CLIENT_H */ diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c index fed832fce61..e23551c4c0c 100644 --- a/src/core/iomgr/tcp_client_posix.c +++ b/src/core/iomgr/tcp_client_posix.c @@ -91,7 +91,8 @@ error: return 0; } -static void tc_on_alarm(void *acp, int success, grpc_call_list *call_list) { +static void tc_on_alarm(void *acp, int success, + grpc_closure_list *closure_list) { int done; async_connect *ac = acp; if (grpc_tcp_trace) { @@ -100,7 +101,7 @@ static void tc_on_alarm(void *acp, int success, grpc_call_list *call_list) { } gpr_mu_lock(&ac->mu); if (ac->fd != NULL) { - grpc_fd_shutdown(ac->fd, call_list); + grpc_fd_shutdown(ac->fd, closure_list); } done = (--ac->refs == 0); gpr_mu_unlock(&ac->mu); @@ -111,7 +112,8 @@ static void tc_on_alarm(void *acp, int success, grpc_call_list *call_list) { } } -static void on_writable(void *acp, int success, grpc_call_list *call_list) { +static void on_writable(void *acp, int success, + grpc_closure_list *closure_list) { async_connect *ac = acp; int so_error = 0; socklen_t so_error_size; @@ -132,7 +134,7 @@ static void on_writable(void *acp, int success, grpc_call_list *call_list) { ac->fd = NULL; gpr_mu_unlock(&ac->mu); - grpc_alarm_cancel(&ac->alarm, call_list); + grpc_alarm_cancel(&ac->alarm, closure_list); gpr_mu_lock(&ac->mu); if (success) { @@ -161,7 +163,7 @@ static void on_writable(void *acp, int success, grpc_call_list *call_list) { 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, call_list); + grpc_fd_notify_on_write(fd, &ac->write_closure, closure_list); return; } else { switch (so_error) { @@ -175,7 +177,7 @@ static void on_writable(void *acp, int success, grpc_call_list *call_list) { goto finish; } } else { - grpc_pollset_set_del_fd(ac->interested_parties, fd, call_list); + grpc_pollset_set_del_fd(ac->interested_parties, fd, closure_list); *ep = grpc_tcp_create(fd, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, ac->addr_str); fd = NULL; goto finish; @@ -189,8 +191,8 @@ static void on_writable(void *acp, int success, grpc_call_list *call_list) { finish: if (fd != NULL) { - grpc_pollset_set_del_fd(ac->interested_parties, fd, call_list); - grpc_fd_orphan(fd, NULL, "tcp_client_orphan", call_list); + grpc_pollset_set_del_fd(ac->interested_parties, fd, closure_list); + grpc_fd_orphan(fd, NULL, "tcp_client_orphan", closure_list); fd = NULL; } done = (--ac->refs == 0); @@ -200,13 +202,14 @@ finish: gpr_free(ac->addr_str); gpr_free(ac); } - grpc_call_list_add(call_list, closure, *ep != NULL); + grpc_closure_list_add(closure_list, closure, *ep != NULL); } void grpc_tcp_client_connect(grpc_closure *closure, grpc_endpoint **ep, grpc_pollset_set *interested_parties, const struct sockaddr *addr, size_t addr_len, - gpr_timespec deadline, grpc_call_list *call_list) { + gpr_timespec deadline, + grpc_closure_list *closure_list) { int fd; grpc_dualstack_mode dsmode; int err; @@ -236,7 +239,7 @@ void grpc_tcp_client_connect(grpc_closure *closure, grpc_endpoint **ep, addr_len = sizeof(addr4_copy); } if (!prepare_socket(addr, fd)) { - grpc_call_list_add(call_list, closure, 0); + grpc_closure_list_add(closure_list, closure, 0); return; } @@ -252,18 +255,18 @@ void grpc_tcp_client_connect(grpc_closure *closure, grpc_endpoint **ep, if (err >= 0) { *ep = grpc_tcp_create(fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str); - grpc_call_list_add(call_list, closure, 1); + grpc_closure_list_add(closure_list, closure, 1); goto done; } if (errno != EWOULDBLOCK && errno != EINPROGRESS) { gpr_log(GPR_ERROR, "connect error to '%s': %s", addr_str, strerror(errno)); - grpc_fd_orphan(fdobj, NULL, "tcp_client_connect_error", call_list); - grpc_call_list_add(call_list, closure, 0); + grpc_fd_orphan(fdobj, NULL, "tcp_client_connect_error", closure_list); + grpc_closure_list_add(closure_list, closure, 0); goto done; } - grpc_pollset_set_add_fd(interested_parties, fdobj, call_list); + grpc_pollset_set_add_fd(interested_parties, fdobj, closure_list); ac = gpr_malloc(sizeof(async_connect)); ac->closure = closure; @@ -285,8 +288,8 @@ void grpc_tcp_client_connect(grpc_closure *closure, grpc_endpoint **ep, gpr_mu_lock(&ac->mu); grpc_alarm_init(&ac->alarm, gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC), - tc_on_alarm, ac, gpr_now(GPR_CLOCK_MONOTONIC), call_list); - grpc_fd_notify_on_write(ac->fd, &ac->write_closure, call_list); + tc_on_alarm, ac, gpr_now(GPR_CLOCK_MONOTONIC), closure_list); + grpc_fd_notify_on_write(ac->fd, &ac->write_closure, closure_list); gpr_mu_unlock(&ac->mu); done: diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c index 89a85f26dc9..942ab8b71df 100644 --- a/src/core/iomgr/tcp_posix.c +++ b/src/core/iomgr/tcp_posix.c @@ -95,17 +95,17 @@ typedef struct { } grpc_tcp; static void tcp_handle_read(void *arg /* grpc_tcp */, int success, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static void tcp_handle_write(void *arg /* grpc_tcp */, int success, - grpc_call_list *call_list); + grpc_closure_list *closure_list); -static void tcp_shutdown(grpc_endpoint *ep, grpc_call_list *call_list) { +static void tcp_shutdown(grpc_endpoint *ep, grpc_closure_list *closure_list) { grpc_tcp *tcp = (grpc_tcp *)ep; - grpc_fd_shutdown(tcp->em_fd, call_list); + grpc_fd_shutdown(tcp->em_fd, closure_list); } -static void tcp_free(grpc_tcp *tcp, grpc_call_list *call_list) { - grpc_fd_orphan(tcp->em_fd, NULL, "tcp_unref_orphan", call_list); +static void tcp_free(grpc_tcp *tcp, grpc_closure_list *closure_list) { + grpc_fd_orphan(tcp->em_fd, NULL, "tcp_unref_orphan", closure_list); gpr_free(tcp->peer_string); gpr_free(tcp); } @@ -115,12 +115,12 @@ static void tcp_free(grpc_tcp *tcp, grpc_call_list *call_list) { #define TCP_UNREF(tcp, reason, cl) \ tcp_unref((tcp), (cl), (reason), __FILE__, __LINE__) #define TCP_REF(tcp, reason) tcp_ref((tcp), (reason), __FILE__, __LINE__) -static void tcp_unref(grpc_tcp *tcp, grpc_call_list *call_list, +static void tcp_unref(grpc_tcp *tcp, grpc_closure_list *closure_list, const char *reason, const char *file, int line) { gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "TCP unref %p : %s %d -> %d", tcp, reason, tcp->refcount.count, tcp->refcount.count - 1); if (gpr_unref(&tcp->refcount)) { - tcp_free(tcp, call_list); + tcp_free(tcp, closure_list); } } @@ -133,22 +133,22 @@ static void tcp_ref(grpc_tcp *tcp, const char *reason, const char *file, #else #define TCP_UNREF(tcp, reason, cl) tcp_unref((tcp), (cl)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void tcp_unref(grpc_tcp *tcp, grpc_call_list *call_list) { +static void tcp_unref(grpc_tcp *tcp, grpc_closure_list *closure_list) { if (gpr_unref(&tcp->refcount)) { - tcp_free(tcp, call_list); + tcp_free(tcp, closure_list); } } static void tcp_ref(grpc_tcp *tcp) { gpr_ref(&tcp->refcount); } #endif -static void tcp_destroy(grpc_endpoint *ep, grpc_call_list *call_list) { +static void tcp_destroy(grpc_endpoint *ep, grpc_closure_list *closure_list) { grpc_tcp *tcp = (grpc_tcp *)ep; - TCP_UNREF(tcp, "destroy", call_list); + TCP_UNREF(tcp, "destroy", closure_list); } static void call_read_cb(grpc_tcp *tcp, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_closure *cb = tcp->read_cb; if (grpc_tcp_trace) { @@ -164,11 +164,11 @@ static void call_read_cb(grpc_tcp *tcp, int success, tcp->read_cb = NULL; tcp->incoming_buffer = NULL; - cb->cb(cb->cb_arg, success, call_list); + cb->cb(cb->cb_arg, success, closure_list); } #define MAX_READ_IOVEC 4 -static void tcp_continue_read(grpc_tcp *tcp, grpc_call_list *call_list) { +static void tcp_continue_read(grpc_tcp *tcp, grpc_closure_list *closure_list) { struct msghdr msg; struct iovec iov[MAX_READ_IOVEC]; ssize_t read_bytes; @@ -210,18 +210,18 @@ static void tcp_continue_read(grpc_tcp *tcp, grpc_call_list *call_list) { tcp->iov_size /= 2; } /* We've consumed the edge, request a new one */ - grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_closure, call_list); + grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_closure, closure_list); } else { /* TODO(klempner): Log interesting errors */ gpr_slice_buffer_reset_and_unref(tcp->incoming_buffer); - call_read_cb(tcp, 0, call_list); - TCP_UNREF(tcp, "read", call_list); + call_read_cb(tcp, 0, closure_list); + TCP_UNREF(tcp, "read", closure_list); } } else if (read_bytes == 0) { /* 0 read size ==> end of stream */ gpr_slice_buffer_reset_and_unref(tcp->incoming_buffer); - call_read_cb(tcp, 0, call_list); - TCP_UNREF(tcp, "read", call_list); + call_read_cb(tcp, 0, closure_list); + TCP_UNREF(tcp, "read", closure_list); } else { GPR_ASSERT((size_t)read_bytes <= tcp->incoming_buffer->length); if ((size_t)read_bytes < tcp->incoming_buffer->length) { @@ -232,29 +232,29 @@ static void tcp_continue_read(grpc_tcp *tcp, grpc_call_list *call_list) { ++tcp->iov_size; } GPR_ASSERT((size_t)read_bytes == tcp->incoming_buffer->length); - call_read_cb(tcp, 1, call_list); - TCP_UNREF(tcp, "read", call_list); + call_read_cb(tcp, 1, closure_list); + TCP_UNREF(tcp, "read", closure_list); } GRPC_TIMER_END(GRPC_PTAG_HANDLE_READ, 0); } static void tcp_handle_read(void *arg /* grpc_tcp */, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_tcp *tcp = (grpc_tcp *)arg; GPR_ASSERT(!tcp->finished_edge); if (!success) { gpr_slice_buffer_reset_and_unref(tcp->incoming_buffer); - call_read_cb(tcp, 0, call_list); - TCP_UNREF(tcp, "read", call_list); + call_read_cb(tcp, 0, closure_list); + TCP_UNREF(tcp, "read", closure_list); } else { - tcp_continue_read(tcp, call_list); + tcp_continue_read(tcp, closure_list); } } static void tcp_read(grpc_endpoint *ep, gpr_slice_buffer *incoming_buffer, - grpc_closure *cb, grpc_call_list *call_list) { + grpc_closure *cb, grpc_closure_list *closure_list) { grpc_tcp *tcp = (grpc_tcp *)ep; GPR_ASSERT(tcp->read_cb == NULL); tcp->read_cb = cb; @@ -263,9 +263,9 @@ static void tcp_read(grpc_endpoint *ep, gpr_slice_buffer *incoming_buffer, TCP_REF(tcp, "read"); if (tcp->finished_edge) { tcp->finished_edge = 0; - grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_closure, call_list); + grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_closure, closure_list); } else { - grpc_call_list_add(call_list, &tcp->read_closure, 1); + grpc_closure_list_add(closure_list, &tcp->read_closure, 1); } } @@ -352,7 +352,7 @@ static flush_result tcp_flush(grpc_tcp *tcp) { } static void tcp_handle_write(void *arg /* grpc_tcp */, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_tcp *tcp = (grpc_tcp *)arg; flush_result status; grpc_closure *cb; @@ -360,26 +360,26 @@ static void tcp_handle_write(void *arg /* grpc_tcp */, int success, if (!success) { cb = tcp->write_cb; tcp->write_cb = NULL; - cb->cb(cb->cb_arg, 0, call_list); - TCP_UNREF(tcp, "write", call_list); + cb->cb(cb->cb_arg, 0, closure_list); + TCP_UNREF(tcp, "write", closure_list); return; } GRPC_TIMER_BEGIN(GRPC_PTAG_TCP_CB_WRITE, 0); status = tcp_flush(tcp); if (status == FLUSH_PENDING) { - grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_closure, call_list); + grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_closure, closure_list); } else { cb = tcp->write_cb; tcp->write_cb = NULL; - cb->cb(cb->cb_arg, status == FLUSH_DONE, call_list); - TCP_UNREF(tcp, "write", call_list); + cb->cb(cb->cb_arg, status == FLUSH_DONE, closure_list); + TCP_UNREF(tcp, "write", closure_list); } GRPC_TIMER_END(GRPC_PTAG_TCP_CB_WRITE, 0); } static void tcp_write(grpc_endpoint *ep, gpr_slice_buffer *buf, - grpc_closure *cb, grpc_call_list *call_list) { + grpc_closure *cb, grpc_closure_list *closure_list) { grpc_tcp *tcp = (grpc_tcp *)ep; flush_result status; @@ -399,7 +399,7 @@ static void tcp_write(grpc_endpoint *ep, gpr_slice_buffer *buf, if (buf->length == 0) { GRPC_TIMER_END(GRPC_PTAG_TCP_WRITE, 0); - grpc_call_list_add(call_list, cb, 1); + grpc_closure_list_add(closure_list, cb, 1); return; } tcp->outgoing_buffer = buf; @@ -410,25 +410,25 @@ static void tcp_write(grpc_endpoint *ep, gpr_slice_buffer *buf, if (status == FLUSH_PENDING) { TCP_REF(tcp, "write"); tcp->write_cb = cb; - grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_closure, call_list); + grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_closure, closure_list); } else { - grpc_call_list_add(call_list, cb, status == FLUSH_DONE); + grpc_closure_list_add(closure_list, cb, status == FLUSH_DONE); } GRPC_TIMER_END(GRPC_PTAG_TCP_WRITE, 0); } static void tcp_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_tcp *tcp = (grpc_tcp *)ep; - grpc_pollset_add_fd(pollset, tcp->em_fd, call_list); + grpc_pollset_add_fd(pollset, tcp->em_fd, closure_list); } static void tcp_add_to_pollset_set(grpc_endpoint *ep, grpc_pollset_set *pollset_set, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_tcp *tcp = (grpc_tcp *)ep; - grpc_pollset_set_add_fd(pollset_set, tcp->em_fd, call_list); + grpc_pollset_set_add_fd(pollset_set, tcp->em_fd, closure_list); } static char *tcp_get_peer(grpc_endpoint *ep) { diff --git a/src/core/iomgr/tcp_server.h b/src/core/iomgr/tcp_server.h index b2aab234d33..034f10eff70 100644 --- a/src/core/iomgr/tcp_server.h +++ b/src/core/iomgr/tcp_server.h @@ -41,7 +41,7 @@ typedef struct grpc_tcp_server grpc_tcp_server; /* Called for newly connected TCP connections. */ typedef void (*grpc_tcp_server_cb)(void *arg, grpc_endpoint *ep, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Create a server, initially not bound to any ports */ grpc_tcp_server *grpc_tcp_server_create(void); @@ -50,7 +50,7 @@ grpc_tcp_server *grpc_tcp_server_create(void); 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_call_list *call_list); + grpc_closure_list *closure_list); /* Add a port to the server, returning port number on success, or negative on failure. @@ -74,6 +74,6 @@ int grpc_tcp_server_add_port(grpc_tcp_server *s, const void *addr, int grpc_tcp_server_get_fd(grpc_tcp_server *s, unsigned index); void grpc_tcp_server_destroy(grpc_tcp_server *server, grpc_closure *closure, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_TCP_SERVER_H */ diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c index 635fdeb198f..e6c6a36602a 100644 --- a/src/core/iomgr/tcp_server_posix.c +++ b/src/core/iomgr/tcp_server_posix.c @@ -140,8 +140,9 @@ grpc_tcp_server *grpc_tcp_server_create(void) { return s; } -static void finish_shutdown(grpc_tcp_server *s, grpc_call_list *call_list) { - grpc_call_list_add(call_list, s->shutdown_complete, 1); +static void finish_shutdown(grpc_tcp_server *s, + grpc_closure_list *closure_list) { + grpc_closure_list_add(closure_list, s->shutdown_complete, 1); gpr_mu_destroy(&s->mu); @@ -150,13 +151,13 @@ static void finish_shutdown(grpc_tcp_server *s, grpc_call_list *call_list) { } static void destroyed_port(void *server, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_tcp_server *s = server; gpr_mu_lock(&s->mu); s->destroyed_ports++; if (s->destroyed_ports == s->nports) { gpr_mu_unlock(&s->mu); - finish_shutdown(s, call_list); + finish_shutdown(s, closure_list); } else { GPR_ASSERT(s->destroyed_ports < s->nports); gpr_mu_unlock(&s->mu); @@ -167,7 +168,7 @@ static void destroyed_port(void *server, int success, events will be received on them - at this point it's safe to destroy things */ static void deactivated_all_ports(grpc_tcp_server *s, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t i; /* delete ALL the things */ @@ -187,17 +188,17 @@ static void deactivated_all_ports(grpc_tcp_server *s, sp->destroyed_closure.cb = destroyed_port; sp->destroyed_closure.cb_arg = s; grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, "tcp_listener_shutdown", - call_list); + closure_list); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - finish_shutdown(s, call_list); + finish_shutdown(s, closure_list); } } void grpc_tcp_server_destroy(grpc_tcp_server *s, grpc_closure *closure, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t i; gpr_mu_lock(&s->mu); @@ -209,12 +210,12 @@ void grpc_tcp_server_destroy(grpc_tcp_server *s, grpc_closure *closure, /* shutdown all fd's */ if (s->active_ports) { for (i = 0; i < s->nports; i++) { - grpc_fd_shutdown(s->ports[i].emfd, call_list); + grpc_fd_shutdown(s->ports[i].emfd, closure_list); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - deactivated_all_ports(s, call_list); + deactivated_all_ports(s, closure_list); } } @@ -299,7 +300,7 @@ error: } /* event manager callback when reads are ready */ -static void on_read(void *arg, int success, grpc_call_list *call_list) { +static void on_read(void *arg, int success, grpc_closure_list *closure_list) { server_port *sp = arg; grpc_fd *fdobj; size_t i; @@ -322,7 +323,7 @@ static void on_read(void *arg, int success, grpc_call_list *call_list) { case EINTR: continue; case EAGAIN: - grpc_fd_notify_on_read(sp->emfd, &sp->read_closure, call_list); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure, closure_list); return; default: gpr_log(GPR_ERROR, "Failed accept4: %s", strerror(errno)); @@ -344,12 +345,12 @@ static void on_read(void *arg, int success, grpc_call_list *call_list) { of channels -- we certainly should not be automatically adding every incoming channel to every pollset owned by the server */ for (i = 0; i < sp->server->pollset_count; i++) { - grpc_pollset_add_fd(sp->server->pollsets[i], fdobj, call_list); + grpc_pollset_add_fd(sp->server->pollsets[i], fdobj, closure_list); } sp->server->on_accept_cb( sp->server->on_accept_cb_arg, grpc_tcp_create(fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str), - call_list); + closure_list); gpr_free(name); gpr_free(addr_str); @@ -361,7 +362,7 @@ error: gpr_mu_lock(&sp->server->mu); if (0 == --sp->server->active_ports) { gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(sp->server, call_list); + deactivated_all_ports(sp->server, closure_list); } else { gpr_mu_unlock(&sp->server->mu); } @@ -488,7 +489,8 @@ int grpc_tcp_server_get_fd(grpc_tcp_server *s, unsigned index) { 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, grpc_call_list *call_list) { + void *on_accept_cb_arg, + grpc_closure_list *closure_list) { size_t i, j; GPR_ASSERT(on_accept_cb); gpr_mu_lock(&s->mu); @@ -500,12 +502,12 @@ void grpc_tcp_server_start(grpc_tcp_server *s, grpc_pollset **pollsets, s->pollset_count = pollset_count; for (i = 0; i < s->nports; i++) { for (j = 0; j < pollset_count; j++) { - grpc_pollset_add_fd(pollsets[j], s->ports[i].emfd, call_list); + grpc_pollset_add_fd(pollsets[j], s->ports[i].emfd, closure_list); } s->ports[i].read_closure.cb = on_read; s->ports[i].read_closure.cb_arg = &s->ports[i]; grpc_fd_notify_on_read(s->ports[i].emfd, &s->ports[i].read_closure, - call_list); + closure_list); s->active_ports++; } gpr_mu_unlock(&s->mu); diff --git a/src/core/iomgr/udp_server.c b/src/core/iomgr/udp_server.c index e1c2ae95fd1..0f0bea82ab1 100644 --- a/src/core/iomgr/udp_server.c +++ b/src/core/iomgr/udp_server.c @@ -133,8 +133,9 @@ grpc_udp_server *grpc_udp_server_create(void) { return s; } -static void finish_shutdown(grpc_udp_server *s, grpc_call_list *call_list) { - grpc_call_list_add(call_list, s->shutdown_complete, 1); +static void finish_shutdown(grpc_udp_server *s, + grpc_closure_list *closure_list) { + grpc_closure_list_add(closure_list, s->shutdown_complete, 1); gpr_mu_destroy(&s->mu); gpr_cv_destroy(&s->cv); @@ -144,13 +145,13 @@ static void finish_shutdown(grpc_udp_server *s, grpc_call_list *call_list) { } static void destroyed_port(void *server, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_udp_server *s = server; gpr_mu_lock(&s->mu); s->destroyed_ports++; if (s->destroyed_ports == s->nports) { gpr_mu_unlock(&s->mu); - finish_shutdown(s, call_list); + finish_shutdown(s, closure_list); } else { gpr_mu_unlock(&s->mu); } @@ -160,7 +161,7 @@ static void destroyed_port(void *server, int success, events will be received on them - at this point it's safe to destroy things */ static void deactivated_all_ports(grpc_udp_server *s, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t i; /* delete ALL the things */ @@ -180,17 +181,17 @@ static void deactivated_all_ports(grpc_udp_server *s, sp->destroyed_closure.cb = destroyed_port; sp->destroyed_closure.cb_arg = s; grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, "udp_listener_shutdown", - call_list); + closure_list); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - finish_shutdown(s, call_list); + finish_shutdown(s, closure_list); } } void grpc_udp_server_destroy(grpc_udp_server *s, grpc_closure *on_done, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t i; gpr_mu_lock(&s->mu); @@ -202,12 +203,12 @@ void grpc_udp_server_destroy(grpc_udp_server *s, grpc_closure *on_done, /* shutdown all fd's */ if (s->active_ports) { for (i = 0; i < s->nports; i++) { - grpc_fd_shutdown(s->ports[i].emfd, call_list); + grpc_fd_shutdown(s->ports[i].emfd, closure_list); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - deactivated_all_ports(s, call_list); + deactivated_all_ports(s, closure_list); } } @@ -262,14 +263,14 @@ error: } /* event manager callback when reads are ready */ -static void on_read(void *arg, int success, grpc_call_list *call_list) { +static void on_read(void *arg, int success, grpc_closure_list *closure_list) { server_port *sp = arg; if (success == 0) { gpr_mu_lock(&sp->server->mu); if (0 == --sp->server->active_ports) { gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(sp->server, call_list); + deactivated_all_ports(sp->server, closure_list); } else { gpr_mu_unlock(&sp->server->mu); } @@ -281,7 +282,7 @@ static void on_read(void *arg, int success, grpc_call_list *call_list) { sp->read_cb(sp->fd); /* Re-arm the notification event so we get another chance to read. */ - grpc_fd_notify_on_read(sp->emfd, &sp->read_closure, call_list); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure, closure_list); } static int add_socket_to_server(grpc_udp_server *s, int fd, @@ -402,19 +403,20 @@ int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index) { } void grpc_udp_server_start(grpc_udp_server *s, grpc_pollset **pollsets, - size_t pollset_count, grpc_call_list *call_list) { + size_t pollset_count, + grpc_closure_list *closure_list) { size_t i, j; gpr_mu_lock(&s->mu); GPR_ASSERT(s->active_ports == 0); s->pollsets = pollsets; for (i = 0; i < s->nports; i++) { for (j = 0; j < pollset_count; j++) { - grpc_pollset_add_fd(pollsets[j], s->ports[i].emfd, call_list); + grpc_pollset_add_fd(pollsets[j], s->ports[i].emfd, closure_list); } s->ports[i].read_closure.cb = on_read; s->ports[i].read_closure.cb_arg = &s->ports[i]; grpc_fd_notify_on_read(s->ports[i].emfd, &s->ports[i].read_closure, - call_list); + closure_list); s->active_ports++; } gpr_mu_unlock(&s->mu); diff --git a/src/core/iomgr/udp_server.h b/src/core/iomgr/udp_server.h index fa4d2147b4f..b66a2d79a23 100644 --- a/src/core/iomgr/udp_server.h +++ b/src/core/iomgr/udp_server.h @@ -47,7 +47,8 @@ grpc_udp_server *grpc_udp_server_create(void); /* Start listening to bound ports */ void grpc_udp_server_start(grpc_udp_server *udp_server, grpc_pollset **pollsets, - size_t pollset_count, grpc_call_list *call_list); + size_t pollset_count, + grpc_closure_list *closure_list); int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index); @@ -65,7 +66,7 @@ int grpc_udp_server_add_port(grpc_udp_server *s, const void *addr, size_t addr_len, grpc_udp_server_read_cb read_cb); void grpc_udp_server_destroy(grpc_udp_server *server, grpc_closure *on_done, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Write the contents of buffer to the underlying UDP socket. */ /* diff --git a/src/core/iomgr/workqueue.h b/src/core/iomgr/workqueue.h index ea7031a9f37..0bec714d4f1 100644 --- a/src/core/iomgr/workqueue.h +++ b/src/core/iomgr/workqueue.h @@ -50,9 +50,10 @@ struct grpc_workqueue; typedef struct grpc_workqueue grpc_workqueue; /** Create a work queue */ -grpc_workqueue *grpc_workqueue_create(grpc_call_list *call_list); +grpc_workqueue *grpc_workqueue_create(grpc_closure_list *closure_list); -void grpc_workqueue_flush(grpc_workqueue *workqueue, grpc_call_list *call_list); +void grpc_workqueue_flush(grpc_workqueue *workqueue, + grpc_closure_list *closure_list); #define GRPC_WORKQUEUE_REFCOUNT_DEBUG #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG @@ -62,19 +63,21 @@ void grpc_workqueue_flush(grpc_workqueue *workqueue, grpc_call_list *call_list); grpc_workqueue_unref((p), (cl), __FILE__, __LINE__, (r)) void grpc_workqueue_ref(grpc_workqueue *workqueue, const char *file, int line, const char *reason); -void grpc_workqueue_unref(grpc_workqueue *workqueue, grpc_call_list *call_list, - const char *file, int line, const char *reason); +void grpc_workqueue_unref(grpc_workqueue *workqueue, + grpc_closure_list *closure_list, const char *file, + int line, const char *reason); #else #define GRPC_WORKQUEUE_REF(p, r) grpc_workqueue_ref((p)) #define GRPC_WORKQUEUE_UNREF(p, r, cl) grpc_workqueue_unref((p), (cl)) void grpc_workqueue_ref(grpc_workqueue *workqueue); -void grpc_workqueue_unref(grpc_workqueue *workqueue, grpc_call_list *call_list); +void grpc_workqueue_unref(grpc_workqueue *workqueue, + grpc_closure_list *closure_list); #endif /** Bind this workqueue to a pollset */ void grpc_workqueue_add_to_pollset(grpc_workqueue *workqueue, grpc_pollset *pollset, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** Add a work item to a workqueue */ void grpc_workqueue_push(grpc_workqueue *workqueue, grpc_closure *closure, diff --git a/src/core/iomgr/workqueue_posix.c b/src/core/iomgr/workqueue_posix.c index 83249c583ce..9ecd59d390b 100644 --- a/src/core/iomgr/workqueue_posix.c +++ b/src/core/iomgr/workqueue_posix.c @@ -45,28 +45,29 @@ #include "src/core/iomgr/fd_posix.h" -static void on_readable(void *arg, int success, grpc_call_list *call_list); +static void on_readable(void *arg, int success, + grpc_closure_list *closure_list); -grpc_workqueue *grpc_workqueue_create(grpc_call_list *call_list) { +grpc_workqueue *grpc_workqueue_create(grpc_closure_list *closure_list) { char name[32]; grpc_workqueue *workqueue = gpr_malloc(sizeof(grpc_workqueue)); gpr_ref_init(&workqueue->refs, 1); gpr_mu_init(&workqueue->mu); - workqueue->call_list.head = workqueue->call_list.tail = NULL; + workqueue->closure_list.head = workqueue->closure_list.tail = NULL; grpc_wakeup_fd_init(&workqueue->wakeup_fd); sprintf(name, "workqueue:%p", (void *)workqueue); workqueue->wakeup_read_fd = grpc_fd_create(GRPC_WAKEUP_FD_GET_READ_FD(&workqueue->wakeup_fd), name); grpc_closure_init(&workqueue->read_closure, on_readable, workqueue); grpc_fd_notify_on_read(workqueue->wakeup_read_fd, &workqueue->read_closure, - call_list); + closure_list); return workqueue; } static void workqueue_destroy(grpc_workqueue *workqueue, - grpc_call_list *call_list) { - GPR_ASSERT(grpc_call_list_empty(workqueue->call_list)); - grpc_fd_shutdown(workqueue->wakeup_read_fd, call_list); + grpc_closure_list *closure_list) { + GPR_ASSERT(grpc_closure_list_empty(workqueue->closure_list)); + grpc_fd_shutdown(workqueue->wakeup_read_fd, closure_list); } #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG @@ -82,34 +83,36 @@ void grpc_workqueue_ref(grpc_workqueue *workqueue) { } #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG -void grpc_workqueue_unref(grpc_workqueue *workqueue, grpc_call_list *call_list, - const char *file, int line, const char *reason) { +void grpc_workqueue_unref(grpc_workqueue *workqueue, + grpc_closure_list *closure_list, const char *file, + int line, const char *reason) { gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p unref %d -> %d %s", workqueue, (int)workqueue->refs.count, (int)workqueue->refs.count - 1, reason); #else void grpc_workqueue_unref(grpc_workqueue *workqueue, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { #endif if (gpr_unref(&workqueue->refs)) { - workqueue_destroy(workqueue, call_list); + workqueue_destroy(workqueue, closure_list); } } void grpc_workqueue_add_to_pollset(grpc_workqueue *workqueue, grpc_pollset *pollset, - grpc_call_list *call_list) { - grpc_pollset_add_fd(pollset, workqueue->wakeup_read_fd, call_list); + grpc_closure_list *closure_list) { + grpc_pollset_add_fd(pollset, workqueue->wakeup_read_fd, closure_list); } void grpc_workqueue_flush(grpc_workqueue *workqueue, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { gpr_mu_lock(&workqueue->mu); - grpc_call_list_move(&workqueue->call_list, call_list); + grpc_closure_list_move(&workqueue->closure_list, closure_list); gpr_mu_unlock(&workqueue->mu); } -static void on_readable(void *arg, int success, grpc_call_list *call_list) { +static void on_readable(void *arg, int success, + grpc_closure_list *closure_list) { grpc_workqueue *workqueue = arg; if (!success) { @@ -117,15 +120,15 @@ static void on_readable(void *arg, int success, grpc_call_list *call_list) { /* HACK: let wakeup_fd code know that we stole the fd */ workqueue->wakeup_fd.read_fd = 0; grpc_wakeup_fd_destroy(&workqueue->wakeup_fd); - grpc_fd_orphan(workqueue->wakeup_read_fd, NULL, "destroy", call_list); + grpc_fd_orphan(workqueue->wakeup_read_fd, NULL, "destroy", closure_list); gpr_free(workqueue); } else { gpr_mu_lock(&workqueue->mu); - grpc_call_list_move(&workqueue->call_list, call_list); + grpc_closure_list_move(&workqueue->closure_list, closure_list); grpc_wakeup_fd_consume_wakeup(&workqueue->wakeup_fd); gpr_mu_unlock(&workqueue->mu); grpc_fd_notify_on_read(workqueue->wakeup_read_fd, &workqueue->read_closure, - call_list); + closure_list); } } @@ -134,10 +137,10 @@ void grpc_workqueue_push(grpc_workqueue *workqueue, grpc_closure *closure, closure->success = success; closure->next = NULL; gpr_mu_lock(&workqueue->mu); - if (grpc_call_list_empty(workqueue->call_list)) { + if (grpc_closure_list_empty(workqueue->closure_list)) { grpc_wakeup_fd_wakeup(&workqueue->wakeup_fd); } - grpc_call_list_add(&workqueue->call_list, closure, success); + grpc_closure_list_add(&workqueue->closure_list, closure, success); gpr_mu_unlock(&workqueue->mu); } diff --git a/src/core/iomgr/workqueue_posix.h b/src/core/iomgr/workqueue_posix.h index 22c48c4926c..589034fe1bb 100644 --- a/src/core/iomgr/workqueue_posix.h +++ b/src/core/iomgr/workqueue_posix.h @@ -40,7 +40,7 @@ struct grpc_workqueue { gpr_refcount refs; gpr_mu mu; - grpc_call_list call_list; + grpc_closure_list closure_list; grpc_wakeup_fd wakeup_fd; struct grpc_fd *wakeup_read_fd; diff --git a/src/core/security/client_auth_filter.c b/src/core/security/client_auth_filter.c index 43a37c2077c..5955b84962a 100644 --- a/src/core/security/client_auth_filter.c +++ b/src/core/security/client_auth_filter.c @@ -84,18 +84,19 @@ static void reset_service_url(call_data *calld) { } static void bubble_up_error(grpc_call_element *elem, grpc_status_code status, - const char *error_msg, grpc_call_list *call_list) { + const char *error_msg, + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; gpr_log(GPR_ERROR, "Client side authentication failure: %s", error_msg); grpc_transport_stream_op_add_cancellation(&calld->op, status); - grpc_call_next_op(elem, &calld->op, call_list); + grpc_call_next_op(elem, &calld->op, closure_list); } static void on_credentials_metadata(void *user_data, grpc_credentials_md *md_elems, size_t num_md, grpc_credentials_status status, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -105,7 +106,7 @@ static void on_credentials_metadata(void *user_data, reset_service_url(calld); if (status != GRPC_CREDENTIALS_OK) { bubble_up_error(elem, GRPC_STATUS_UNAUTHENTICATED, - "Credentials failed to get metadata.", call_list); + "Credentials failed to get metadata.", closure_list); return; } GPR_ASSERT(num_md <= MAX_CREDENTIALS_METADATA_COUNT); @@ -118,7 +119,7 @@ static void on_credentials_metadata(void *user_data, grpc_mdelem_from_slices(chand->md_ctx, gpr_slice_ref(md_elems[i].key), gpr_slice_ref(md_elems[i].value))); } - grpc_call_next_op(elem, op, call_list); + grpc_call_next_op(elem, op, closure_list); } void build_service_url(const char *url_scheme, call_data *calld) { @@ -142,7 +143,7 @@ void build_service_url(const char *url_scheme, call_data *calld) { static void send_security_metadata(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_client_security_context *ctx = @@ -157,7 +158,7 @@ static void send_security_metadata(grpc_call_element *elem, if (!channel_creds_has_md && !call_creds_has_md) { /* Skip sending metadata altogether. */ - grpc_call_next_op(elem, op, call_list); + grpc_call_next_op(elem, op, closure_list); return; } @@ -167,7 +168,7 @@ static void send_security_metadata(grpc_call_element *elem, if (calld->creds == NULL) { bubble_up_error(elem, GRPC_STATUS_INVALID_ARGUMENT, "Incompatible credentials set on channel and call.", - call_list); + closure_list); return; } } else { @@ -180,21 +181,22 @@ static void send_security_metadata(grpc_call_element *elem, GPR_ASSERT(calld->pollset); grpc_credentials_get_request_metadata( calld->creds, calld->pollset, calld->service_url, on_credentials_metadata, - elem, call_list); + elem, closure_list); } static void on_host_checked(void *user_data, grpc_security_status status, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = elem->call_data; if (status == GRPC_SECURITY_OK) { - send_security_metadata(elem, &calld->op, call_list); + send_security_metadata(elem, &calld->op, closure_list); } else { char *error_msg; gpr_asprintf(&error_msg, "Invalid host %s set in :authority metadata.", grpc_mdstr_as_c_string(calld->host)); - bubble_up_error(elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg, call_list); + bubble_up_error(elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg, + closure_list); gpr_free(error_msg); } } @@ -206,7 +208,7 @@ static void on_host_checked(void *user_data, grpc_security_status status, that is being sent or received. */ static void auth_start_transport_op(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -259,7 +261,7 @@ static void auth_start_transport_op(grpc_call_element *elem, calld->op = *op; /* Copy op (originates from the caller's stack). */ status = grpc_channel_security_connector_check_call_host( chand->security_connector, call_host, on_host_checked, elem, - call_list); + closure_list); if (status != GRPC_SECURITY_OK) { if (status == GRPC_SECURITY_ERROR) { char *error_msg; @@ -267,26 +269,26 @@ static void auth_start_transport_op(grpc_call_element *elem, "Invalid host %s set in :authority metadata.", call_host); bubble_up_error(elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg, - call_list); + closure_list); gpr_free(error_msg); } return; /* early exit */ } } - send_security_metadata(elem, op, call_list); + send_security_metadata(elem, op, closure_list); return; /* early exit */ } } /* pass control down the stack */ - grpc_call_next_op(elem, op, call_list); + grpc_call_next_op(elem, op, closure_list); } /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; memset(calld, 0, sizeof(*calld)); GPR_ASSERT(!initial_op || !initial_op->send_ops); @@ -294,7 +296,7 @@ static void init_call_elem(grpc_call_element *elem, /* Destructor for call_data */ static void destroy_call_elem(grpc_call_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; grpc_credentials_unref(calld->creds); if (calld->host != NULL) { @@ -310,7 +312,7 @@ static void destroy_call_elem(grpc_call_element *elem, static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *metadata_context, int is_first, - int is_last, grpc_call_list *call_list) { + int is_last, grpc_closure_list *closure_list) { grpc_security_connector *sc = grpc_find_security_connector_in_args(args); /* grab pointers to our data from the channel element */ channel_data *chand = elem->channel_data; @@ -337,7 +339,7 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, /* Destructor for channel data */ static void destroy_channel_elem(grpc_channel_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* grab pointers to our data from the channel element */ channel_data *chand = elem->channel_data; grpc_channel_security_connector *ctx = chand->security_connector; diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index 80e0a79447b..0a49834d40b 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -109,16 +109,16 @@ void grpc_credentials_get_request_metadata(grpc_credentials *creds, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (creds == NULL || !grpc_credentials_has_request_metadata(creds) || creds->vtable->get_request_metadata == NULL) { if (cb != NULL) { - cb(user_data, NULL, 0, GRPC_CREDENTIALS_OK, call_list); + cb(user_data, NULL, 0, GRPC_CREDENTIALS_OK, closure_list); } return; } creds->vtable->get_request_metadata(creds, pollset, service_url, cb, - user_data, call_list); + user_data, closure_list); } grpc_security_status grpc_credentials_create_security_connector( @@ -377,7 +377,7 @@ static void jwt_get_request_metadata(grpc_credentials *creds, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_service_account_jwt_access_credentials *c = (grpc_service_account_jwt_access_credentials *)creds; gpr_timespec refresh_threshold = gpr_time_from_seconds( @@ -422,10 +422,10 @@ static void jwt_get_request_metadata(grpc_credentials *creds, if (jwt_md != NULL) { cb(user_data, jwt_md->entries, jwt_md->num_entries, GRPC_CREDENTIALS_OK, - call_list); + closure_list); grpc_credentials_md_store_unref(jwt_md); } else { - cb(user_data, NULL, 0, GRPC_CREDENTIALS_ERROR, call_list); + cb(user_data, NULL, 0, GRPC_CREDENTIALS_ERROR, closure_list); } } @@ -572,7 +572,7 @@ end: static void on_oauth2_token_fetcher_http_response( void *user_data, const grpc_httpcli_response *response, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_credentials_metadata_request *r = (grpc_credentials_metadata_request *)user_data; grpc_oauth2_token_fetcher_credentials *c = @@ -587,10 +587,10 @@ static void on_oauth2_token_fetcher_http_response( c->token_expiration = gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), token_lifetime); r->cb(r->user_data, c->access_token_md->entries, - c->access_token_md->num_entries, status, call_list); + c->access_token_md->num_entries, status, closure_list); } else { c->token_expiration = gpr_inf_past(GPR_CLOCK_REALTIME); - r->cb(r->user_data, NULL, 0, status, call_list); + r->cb(r->user_data, NULL, 0, status, closure_list); } gpr_mu_unlock(&c->mu); grpc_credentials_metadata_request_destroy(r); @@ -599,7 +599,7 @@ static void on_oauth2_token_fetcher_http_response( static void oauth2_token_fetcher_get_request_metadata( grpc_credentials *creds, grpc_pollset *pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_oauth2_token_fetcher_credentials *c = (grpc_oauth2_token_fetcher_credentials *)creds; gpr_timespec refresh_threshold = gpr_time_from_seconds( @@ -618,14 +618,14 @@ static void oauth2_token_fetcher_get_request_metadata( } if (cached_access_token_md != NULL) { cb(user_data, cached_access_token_md->entries, - cached_access_token_md->num_entries, GRPC_CREDENTIALS_OK, call_list); + cached_access_token_md->num_entries, GRPC_CREDENTIALS_OK, closure_list); grpc_credentials_md_store_unref(cached_access_token_md); } else { c->fetch_func( grpc_credentials_metadata_request_create(creds, cb, user_data), &c->httpcli_context, pollset, on_oauth2_token_fetcher_http_response, gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), refresh_threshold), - call_list); + closure_list); } } @@ -651,7 +651,7 @@ static void compute_engine_fetch_oauth2( grpc_credentials_metadata_request *metadata_req, grpc_httpcli_context *httpcli_context, grpc_pollset *pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_httpcli_header header = {"Metadata-Flavor", "Google"}; grpc_httpcli_request request; memset(&request, 0, sizeof(grpc_httpcli_request)); @@ -660,7 +660,7 @@ static void compute_engine_fetch_oauth2( request.hdr_count = 1; request.hdrs = &header; grpc_httpcli_get(httpcli_context, pollset, &request, deadline, response_cb, - metadata_req, call_list); + metadata_req, closure_list); } grpc_credentials *grpc_google_compute_engine_credentials_create( @@ -691,7 +691,7 @@ static void refresh_token_fetch_oauth2( grpc_credentials_metadata_request *metadata_req, grpc_httpcli_context *httpcli_context, grpc_pollset *pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_google_refresh_token_credentials *c = (grpc_google_refresh_token_credentials *)metadata_req->creds; grpc_httpcli_header header = {"Content-Type", @@ -708,7 +708,7 @@ static void refresh_token_fetch_oauth2( request.hdrs = &header; request.handshaker = &grpc_httpcli_ssl; grpc_httpcli_post(httpcli_context, pollset, &request, body, strlen(body), - deadline, response_cb, metadata_req, call_list); + deadline, response_cb, metadata_req, closure_list); gpr_free(body); } @@ -755,11 +755,11 @@ static void on_simulated_token_fetch_done(void *user_data) { grpc_credentials_metadata_request *r = (grpc_credentials_metadata_request *)user_data; grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)r->creds; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; r->cb(r->user_data, c->md_store->entries, c->md_store->num_entries, - GRPC_CREDENTIALS_OK, &call_list); + GRPC_CREDENTIALS_OK, &closure_list); grpc_credentials_metadata_request_destroy(r); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static void md_only_test_get_request_metadata(grpc_credentials *creds, @@ -767,7 +767,7 @@ static void md_only_test_get_request_metadata(grpc_credentials *creds, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)creds; if (c->is_async) { @@ -776,7 +776,7 @@ static void md_only_test_get_request_metadata(grpc_credentials *creds, grpc_credentials_metadata_request_create(creds, cb, user_data); gpr_thd_new(&thd_id, on_simulated_token_fetch_done, cb_arg, NULL); } else { - cb(user_data, c->md_store->entries, 1, GRPC_CREDENTIALS_OK, call_list); + cb(user_data, c->md_store->entries, 1, GRPC_CREDENTIALS_OK, closure_list); } } @@ -821,9 +821,10 @@ static void access_token_get_request_metadata(grpc_credentials *creds, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_access_token_credentials *c = (grpc_access_token_credentials *)creds; - cb(user_data, c->access_token_md->entries, 1, GRPC_CREDENTIALS_OK, call_list); + cb(user_data, c->access_token_md->entries, 1, GRPC_CREDENTIALS_OK, + closure_list); } static grpc_credentials_vtable access_token_vtable = { @@ -971,11 +972,11 @@ static void composite_md_context_destroy( static void composite_metadata_cb(void *user_data, grpc_credentials_md *md_elems, size_t num_md, grpc_credentials_status status, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_composite_credentials_metadata_context *ctx = (grpc_composite_credentials_metadata_context *)user_data; if (status != GRPC_CREDENTIALS_OK) { - ctx->cb(ctx->user_data, NULL, 0, status, call_list); + ctx->cb(ctx->user_data, NULL, 0, status, closure_list); return; } @@ -995,16 +996,16 @@ static void composite_metadata_cb(void *user_data, if (grpc_credentials_has_request_metadata(inner_creds)) { grpc_credentials_get_request_metadata( inner_creds, ctx->pollset, ctx->service_url, composite_metadata_cb, - ctx, call_list); + ctx, closure_list); return; } } /* We're done!. */ ctx->cb(ctx->user_data, ctx->md_elems->entries, ctx->md_elems->num_entries, - GRPC_CREDENTIALS_OK, call_list); + GRPC_CREDENTIALS_OK, closure_list); composite_md_context_destroy(ctx); - grpc_call_list_run(call_list); + grpc_closure_list_run(closure_list); } static void composite_get_request_metadata(grpc_credentials *creds, @@ -1012,11 +1013,11 @@ static void composite_get_request_metadata(grpc_credentials *creds, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_composite_credentials *c = (grpc_composite_credentials *)creds; grpc_composite_credentials_metadata_context *ctx; if (!grpc_credentials_has_request_metadata(creds)) { - cb(user_data, NULL, 0, GRPC_CREDENTIALS_OK, call_list); + cb(user_data, NULL, 0, GRPC_CREDENTIALS_OK, closure_list); return; } ctx = gpr_malloc(sizeof(grpc_composite_credentials_metadata_context)); @@ -1032,7 +1033,7 @@ static void composite_get_request_metadata(grpc_credentials *creds, if (grpc_credentials_has_request_metadata(inner_creds)) { grpc_credentials_get_request_metadata(inner_creds, pollset, service_url, composite_metadata_cb, ctx, - call_list); + closure_list); return; } } @@ -1169,10 +1170,10 @@ static void iam_get_request_metadata(grpc_credentials *creds, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_google_iam_credentials *c = (grpc_google_iam_credentials *)creds; cb(user_data, c->iam_md->entries, c->iam_md->num_entries, GRPC_CREDENTIALS_OK, - call_list); + closure_list); } static grpc_credentials_vtable iam_vtable = { @@ -1226,14 +1227,14 @@ static void plugin_md_request_metadata_ready(void *request, grpc_status_code status, const char *error_details) { /* called from application code */ - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_metadata_plugin_request *r = (grpc_metadata_plugin_request *)request; if (status != GRPC_STATUS_OK) { if (error_details != NULL) { gpr_log(GPR_ERROR, "Getting metadata from plugin failed with error: %s", error_details); } - r->cb(r->user_data, NULL, 0, GRPC_CREDENTIALS_ERROR, &call_list); + r->cb(r->user_data, NULL, 0, GRPC_CREDENTIALS_ERROR, &closure_list); } else { size_t i; grpc_credentials_md *md_array = NULL; @@ -1245,7 +1246,7 @@ static void plugin_md_request_metadata_ready(void *request, gpr_slice_from_copied_buffer(md[i].value, md[i].value_length); } } - r->cb(r->user_data, md_array, num_md, GRPC_CREDENTIALS_OK, &call_list); + r->cb(r->user_data, md_array, num_md, GRPC_CREDENTIALS_OK, &closure_list); if (md_array != NULL) { for (i = 0; i < num_md; i++) { gpr_slice_unref(md_array[i].key); @@ -1262,7 +1263,7 @@ static void plugin_get_request_metadata(grpc_credentials *creds, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_plugin_credentials *c = (grpc_plugin_credentials *)creds; if (c->plugin.get_metadata != NULL) { grpc_metadata_plugin_request *request = gpr_malloc(sizeof(*request)); @@ -1272,7 +1273,7 @@ static void plugin_get_request_metadata(grpc_credentials *creds, c->plugin.get_metadata(c->plugin.state, service_url, plugin_md_request_metadata_ready, request); } else { - cb(user_data, NULL, 0, GRPC_CREDENTIALS_OK, call_list); + cb(user_data, NULL, 0, GRPC_CREDENTIALS_OK, closure_list); } } diff --git a/src/core/security/credentials.h b/src/core/security/credentials.h index 090767d237d..edc0a61f03b 100644 --- a/src/core/security/credentials.h +++ b/src/core/security/credentials.h @@ -128,7 +128,7 @@ typedef void (*grpc_credentials_metadata_cb)(void *user_data, grpc_credentials_md *md_elems, size_t num_md, grpc_credentials_status status, - grpc_call_list *call_list); + grpc_closure_list *closure_list); typedef struct { void (*destruct)(grpc_credentials *c); @@ -137,7 +137,7 @@ typedef struct { void (*get_request_metadata)(grpc_credentials *c, grpc_pollset *pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, - grpc_call_list *call_list); + grpc_closure_list *closure_list); grpc_security_status (*create_security_connector)( grpc_credentials *c, const char *target, const grpc_channel_args *args, grpc_credentials *request_metadata_creds, @@ -159,7 +159,7 @@ void grpc_credentials_get_request_metadata(grpc_credentials *creds, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* 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 @@ -278,7 +278,7 @@ typedef void (*grpc_fetch_oauth2_func)(grpc_credentials_metadata_request *req, grpc_pollset *pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline, - grpc_call_list *call_list); + grpc_closure_list *closure_list); typedef struct { grpc_credentials base; diff --git a/src/core/security/google_default_credentials.c b/src/core/security/google_default_credentials.c index 8c3d85cc58e..4a7ab53c1e3 100644 --- a/src/core/security/google_default_credentials.c +++ b/src/core/security/google_default_credentials.c @@ -64,7 +64,7 @@ typedef struct { static void on_compute_engine_detection_http_response( void *user_data, const grpc_httpcli_response *response, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { compute_engine_detector *detector = (compute_engine_detector *)user_data; if (response != NULL && response->status == 200 && response->hdr_count > 0) { /* Internet providers can return a generic response to all requests, so @@ -85,7 +85,7 @@ static void on_compute_engine_detection_http_response( gpr_mu_unlock(GRPC_POLLSET_MU(&detector->pollset)); } -static void destroy_pollset(void *p, int s, grpc_call_list *call_list) { +static void destroy_pollset(void *p, int s, grpc_closure_list *closure_list) { grpc_pollset_destroy(p); } @@ -93,7 +93,7 @@ static int is_stack_running_on_compute_engine(void) { compute_engine_detector detector; grpc_httpcli_request request; grpc_httpcli_context context; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_closure destroy_closure; /* The http call is local. If it takes more than one sec, it is for sure not @@ -113,9 +113,9 @@ static int is_stack_running_on_compute_engine(void) { grpc_httpcli_get( &context, &detector.pollset, &request, gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), max_detection_delay), - on_compute_engine_detection_http_response, &detector, &call_list); + on_compute_engine_detection_http_response, &detector, &closure_list); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); /* 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. */ @@ -123,14 +123,14 @@ static int is_stack_running_on_compute_engine(void) { while (!detector.is_done) { grpc_pollset_worker worker; grpc_pollset_work(&detector.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); } gpr_mu_unlock(GRPC_POLLSET_MU(&detector.pollset)); grpc_httpcli_context_destroy(&context); grpc_closure_init(&destroy_closure, destroy_pollset, &detector.pollset); - grpc_pollset_shutdown(&detector.pollset, &destroy_closure, &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&detector.pollset, &destroy_closure, &closure_list); + grpc_closure_list_run(&closure_list); return detector.success; } diff --git a/src/core/security/handshake.c b/src/core/security/handshake.c index e3206c2e122..caad12a6533 100644 --- a/src/core/security/handshake.c +++ b/src/core/security/handshake.c @@ -58,26 +58,26 @@ typedef struct { grpc_closure on_handshake_data_received_from_peer; } grpc_security_handshake; -static void on_handshake_data_received_from_peer(void *setup, int success, - grpc_call_list *call_list); +static void on_handshake_data_received_from_peer( + void *setup, int success, grpc_closure_list *closure_list); static void on_handshake_data_sent_to_peer(void *setup, int success, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static void security_handshake_done(grpc_security_handshake *h, int is_success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (is_success) { h->cb(h->user_data, GRPC_SECURITY_OK, h->wrapped_endpoint, - h->secure_endpoint, call_list); + h->secure_endpoint, closure_list); } else { if (h->secure_endpoint != NULL) { - grpc_endpoint_shutdown(h->secure_endpoint, call_list); - grpc_endpoint_destroy(h->secure_endpoint, call_list); + grpc_endpoint_shutdown(h->secure_endpoint, closure_list); + grpc_endpoint_destroy(h->secure_endpoint, closure_list); } else { - grpc_endpoint_destroy(h->wrapped_endpoint, call_list); + grpc_endpoint_destroy(h->wrapped_endpoint, closure_list); } h->cb(h->user_data, GRPC_SECURITY_ERROR, h->wrapped_endpoint, NULL, - call_list); + closure_list); } if (h->handshaker != NULL) tsi_handshaker_destroy(h->handshaker); if (h->handshake_buffer != NULL) gpr_free(h->handshake_buffer); @@ -89,13 +89,13 @@ static void security_handshake_done(grpc_security_handshake *h, int is_success, } static void on_peer_checked(void *user_data, grpc_security_status status, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_security_handshake *h = user_data; tsi_frame_protector *protector; tsi_result result; if (status != GRPC_SECURITY_OK) { gpr_log(GPR_ERROR, "Error checking peer."); - security_handshake_done(h, 0, call_list); + security_handshake_done(h, 0, closure_list); return; } result = @@ -103,7 +103,7 @@ static void on_peer_checked(void *user_data, grpc_security_status status, if (result != TSI_OK) { gpr_log(GPR_ERROR, "Frame protector creation failed with error %s.", tsi_result_to_string(result)); - security_handshake_done(h, 0, call_list); + security_handshake_done(h, 0, closure_list); return; } h->secure_endpoint = @@ -111,11 +111,12 @@ static void on_peer_checked(void *user_data, grpc_security_status status, h->left_overs.slices, h->left_overs.count); h->left_overs.count = 0; h->left_overs.length = 0; - security_handshake_done(h, 1, call_list); + security_handshake_done(h, 1, closure_list); return; } -static void check_peer(grpc_security_handshake *h, grpc_call_list *call_list) { +static void check_peer(grpc_security_handshake *h, + grpc_closure_list *closure_list) { grpc_security_status peer_status; tsi_peer peer; tsi_result result = tsi_handshaker_extract_peer(h->handshaker, &peer); @@ -123,22 +124,22 @@ static void check_peer(grpc_security_handshake *h, grpc_call_list *call_list) { if (result != TSI_OK) { gpr_log(GPR_ERROR, "Peer extraction failed with error %s", tsi_result_to_string(result)); - security_handshake_done(h, 0, call_list); + security_handshake_done(h, 0, closure_list); return; } peer_status = grpc_security_connector_check_peer(h->connector, peer, on_peer_checked, h); if (peer_status == GRPC_SECURITY_ERROR) { gpr_log(GPR_ERROR, "Peer check failed."); - security_handshake_done(h, 0, call_list); + security_handshake_done(h, 0, closure_list); return; } else if (peer_status == GRPC_SECURITY_OK) { - on_peer_checked(h, peer_status, call_list); + on_peer_checked(h, peer_status, closure_list); } } static void send_handshake_bytes_to_peer(grpc_security_handshake *h, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t offset = 0; tsi_result result = TSI_OK; gpr_slice to_send; @@ -158,7 +159,7 @@ static void send_handshake_bytes_to_peer(grpc_security_handshake *h, if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshake failed with error %s", tsi_result_to_string(result)); - security_handshake_done(h, 0, call_list); + security_handshake_done(h, 0, closure_list); return; } @@ -169,11 +170,11 @@ static void send_handshake_bytes_to_peer(grpc_security_handshake *h, /* TODO(klempner,jboeuf): This should probably use the client setup deadline */ grpc_endpoint_write(h->wrapped_endpoint, &h->outgoing, - &h->on_handshake_data_sent_to_peer, call_list); + &h->on_handshake_data_sent_to_peer, closure_list); } -static void on_handshake_data_received_from_peer(void *handshake, int success, - grpc_call_list *call_list) { +static void on_handshake_data_received_from_peer( + void *handshake, int success, grpc_closure_list *closure_list) { grpc_security_handshake *h = handshake; size_t consumed_slice_size = 0; tsi_result result = TSI_OK; @@ -183,7 +184,7 @@ static void on_handshake_data_received_from_peer(void *handshake, int success, if (!success) { gpr_log(GPR_ERROR, "Read failed."); - security_handshake_done(h, 0, call_list); + security_handshake_done(h, 0, closure_list); return; } @@ -199,10 +200,11 @@ static void on_handshake_data_received_from_peer(void *handshake, int success, /* We may need more data. */ if (result == TSI_INCOMPLETE_DATA) { grpc_endpoint_read(h->wrapped_endpoint, &h->incoming, - &h->on_handshake_data_received_from_peer, call_list); + &h->on_handshake_data_received_from_peer, + closure_list); return; } else { - send_handshake_bytes_to_peer(h, call_list); + send_handshake_bytes_to_peer(h, closure_list); return; } } @@ -210,7 +212,7 @@ static void on_handshake_data_received_from_peer(void *handshake, int success, if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshake failed with error %s", tsi_result_to_string(result)); - security_handshake_done(h, 0, call_list); + security_handshake_done(h, 0, closure_list); return; } @@ -220,7 +222,7 @@ static void on_handshake_data_received_from_peer(void *handshake, int success, num_left_overs = (has_left_overs_in_current_slice ? 1 : 0) + h->incoming.count - i - 1; if (num_left_overs == 0) { - check_peer(h, call_list); + check_peer(h, closure_list); return; } @@ -235,18 +237,18 @@ static void on_handshake_data_received_from_peer(void *handshake, int success, gpr_slice_buffer_addn( &h->left_overs, &h->incoming.slices[i + 1], num_left_overs - (size_t)has_left_overs_in_current_slice); - check_peer(h, call_list); + check_peer(h, closure_list); } /* If handshake is NULL, the handshake is done. */ static void on_handshake_data_sent_to_peer(void *handshake, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_security_handshake *h = handshake; /* Make sure that write is OK. */ if (!success) { gpr_log(GPR_ERROR, "Write failed."); - if (handshake != NULL) security_handshake_done(h, 0, call_list); + if (handshake != NULL) security_handshake_done(h, 0, closure_list); return; } @@ -255,9 +257,9 @@ static void on_handshake_data_sent_to_peer(void *handshake, int success, /* TODO(klempner,jboeuf): This should probably use the client setup deadline */ grpc_endpoint_read(h->wrapped_endpoint, &h->incoming, - &h->on_handshake_data_received_from_peer, call_list); + &h->on_handshake_data_received_from_peer, closure_list); } else { - check_peer(h, call_list); + check_peer(h, closure_list); } } @@ -265,7 +267,8 @@ void grpc_do_security_handshake(tsi_handshaker *handshaker, grpc_security_connector *connector, grpc_endpoint *nonsecure_endpoint, grpc_security_handshake_done_cb cb, - void *user_data, grpc_call_list *call_list) { + void *user_data, + grpc_closure_list *closure_list) { grpc_security_handshake *h = gpr_malloc(sizeof(grpc_security_handshake)); memset(h, 0, sizeof(grpc_security_handshake)); h->handshaker = handshaker; @@ -282,5 +285,5 @@ void grpc_do_security_handshake(tsi_handshaker *handshaker, gpr_slice_buffer_init(&h->left_overs); gpr_slice_buffer_init(&h->outgoing); gpr_slice_buffer_init(&h->incoming); - send_handshake_bytes_to_peer(h, call_list); + send_handshake_bytes_to_peer(h, closure_list); } diff --git a/src/core/security/handshake.h b/src/core/security/handshake.h index d492de5059b..368e8bf5e1b 100644 --- a/src/core/security/handshake.h +++ b/src/core/security/handshake.h @@ -42,6 +42,7 @@ void grpc_do_security_handshake(tsi_handshaker *handshaker, grpc_security_connector *connector, grpc_endpoint *nonsecure_endpoint, grpc_security_handshake_done_cb cb, - void *user_data, grpc_call_list *call_list); + void *user_data, + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_SECURITY_HANDSHAKE_H */ diff --git a/src/core/security/jwt_verifier.c b/src/core/security/jwt_verifier.c index a6736c922cb..be861693468 100644 --- a/src/core/security/jwt_verifier.c +++ b/src/core/security/jwt_verifier.c @@ -571,7 +571,7 @@ end: static void on_keys_retrieved(void *user_data, const grpc_httpcli_response *response, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_json *json = json_from_http(response); verifier_cb_ctx *ctx = (verifier_cb_ctx *)user_data; EVP_PKEY *verification_key = NULL; @@ -613,7 +613,7 @@ end: static void on_openid_config_retrieved(void *user_data, const grpc_httpcli_response *response, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { const grpc_json *cur; grpc_json *json = json_from_http(response); verifier_cb_ctx *ctx = (verifier_cb_ctx *)user_data; @@ -645,7 +645,7 @@ static void on_openid_config_retrieved(void *user_data, grpc_httpcli_get( &ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), - on_keys_retrieved, ctx, call_list); + on_keys_retrieved, ctx, closure_list); grpc_json_destroy(json); gpr_free(req.host); return; @@ -685,7 +685,7 @@ static void verifier_put_mapping(grpc_jwt_verifier *v, const char *email_domain, /* Takes ownership of ctx. */ static void retrieve_key_and_verify(verifier_cb_ctx *ctx, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { const char *at_sign; grpc_httpcli_response_cb http_cb; char *path_prefix = NULL; @@ -748,7 +748,7 @@ static void retrieve_key_and_verify(verifier_cb_ctx *ctx, grpc_httpcli_get( &ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), - http_cb, ctx, call_list); + http_cb, ctx, closure_list); gpr_free(req.host); gpr_free(req.path); return; @@ -762,7 +762,7 @@ void grpc_jwt_verifier_verify(grpc_jwt_verifier *verifier, grpc_pollset *pollset, const char *jwt, const char *audience, grpc_jwt_verification_done_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { const char *dot = NULL; grpc_json *json; jose_header *header = NULL; @@ -796,7 +796,7 @@ void grpc_jwt_verifier_verify(grpc_jwt_verifier *verifier, retrieve_key_and_verify( verifier_cb_ctx_create(verifier, pollset, header, claims, audience, signature, jwt, signed_jwt_len, user_data, cb), - call_list); + closure_list); return; error: diff --git a/src/core/security/jwt_verifier.h b/src/core/security/jwt_verifier.h index 394935302ba..b270280cc10 100644 --- a/src/core/security/jwt_verifier.h +++ b/src/core/security/jwt_verifier.h @@ -124,7 +124,7 @@ void grpc_jwt_verifier_verify(grpc_jwt_verifier *verifier, grpc_pollset *pollset, const char *jwt, const char *audience, grpc_jwt_verification_done_cb cb, void *user_data, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* --- TESTING ONLY exposed functions. --- */ diff --git a/src/core/security/secure_endpoint.c b/src/core/security/secure_endpoint.c index a647345796f..a6fc7e94a08 100644 --- a/src/core/security/secure_endpoint.c +++ b/src/core/security/secure_endpoint.c @@ -67,9 +67,10 @@ typedef struct { int grpc_trace_secure_endpoint = 0; -static void destroy(secure_endpoint *secure_ep, grpc_call_list *call_list) { +static void destroy(secure_endpoint *secure_ep, + grpc_closure_list *closure_list) { secure_endpoint *ep = secure_ep; - grpc_endpoint_destroy(ep->wrapped_ep, call_list); + grpc_endpoint_destroy(ep->wrapped_ep, closure_list); tsi_frame_protector_destroy(ep->protector); gpr_slice_buffer_destroy(&ep->leftover_bytes); gpr_slice_unref(ep->read_staging_buffer); @@ -87,12 +88,13 @@ static void destroy(secure_endpoint *secure_ep, grpc_call_list *call_list) { #define SECURE_ENDPOINT_REF(ep, reason) \ secure_endpoint_ref((ep), (reason), __FILE__, __LINE__) static void secure_endpoint_unref(secure_endpoint *ep, - grpc_call_list *call_list, const char *reason, - const char *file, int line) { + grpc_closure_list *closure_list, + const char *reason, const char *file, + int line) { gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "SECENDP unref %p : %s %d -> %d", ep, reason, ep->ref.count, ep->ref.count - 1); if (gpr_unref(&ep->ref)) { - destroy(ep, call_list); + destroy(ep, closure_list); } } @@ -106,9 +108,9 @@ static void secure_endpoint_ref(secure_endpoint *ep, const char *reason, #define SECURE_ENDPOINT_UNREF(ep, reason, cl) secure_endpoint_unref((ep), (cl)) #define SECURE_ENDPOINT_REF(ep, reason) secure_endpoint_ref((ep)) static void secure_endpoint_unref(secure_endpoint *ep, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (gpr_unref(&ep->ref)) { - destroy(ep, call_list); + destroy(ep, closure_list); } } @@ -124,7 +126,7 @@ static void flush_read_staging_buffer(secure_endpoint *ep, gpr_uint8 **cur, } static void call_read_cb(secure_endpoint *ep, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (grpc_trace_secure_endpoint) { size_t i; for (i = 0; i < ep->read_buffer->count; i++) { @@ -135,11 +137,12 @@ static void call_read_cb(secure_endpoint *ep, int success, } } ep->read_buffer = NULL; - grpc_call_list_add(call_list, ep->read_cb, success); - SECURE_ENDPOINT_UNREF(ep, "read", call_list); + grpc_closure_list_add(closure_list, ep->read_cb, success); + SECURE_ENDPOINT_UNREF(ep, "read", closure_list); } -static void on_read(void *user_data, int success, grpc_call_list *call_list) { +static void on_read(void *user_data, int success, + grpc_closure_list *closure_list) { unsigned i; gpr_uint8 keep_looping = 0; tsi_result result = TSI_OK; @@ -149,7 +152,7 @@ static void on_read(void *user_data, int success, grpc_call_list *call_list) { if (!success) { gpr_slice_buffer_reset_and_unref(ep->read_buffer); - call_read_cb(ep, 0, call_list); + call_read_cb(ep, 0, closure_list); return; } @@ -206,15 +209,15 @@ static void on_read(void *user_data, int success, grpc_call_list *call_list) { if (result != TSI_OK) { gpr_slice_buffer_reset_and_unref(ep->read_buffer); - call_read_cb(ep, 0, call_list); + call_read_cb(ep, 0, closure_list); return; } - call_read_cb(ep, 1, call_list); + call_read_cb(ep, 1, closure_list); } static void endpoint_read(grpc_endpoint *secure_ep, gpr_slice_buffer *slices, - grpc_closure *cb, grpc_call_list *call_list) { + grpc_closure *cb, grpc_closure_list *closure_list) { secure_endpoint *ep = (secure_endpoint *)secure_ep; ep->read_cb = cb; ep->read_buffer = slices; @@ -224,12 +227,12 @@ static void endpoint_read(grpc_endpoint *secure_ep, gpr_slice_buffer *slices, if (ep->leftover_bytes.count) { gpr_slice_buffer_swap(&ep->leftover_bytes, &ep->source_buffer); GPR_ASSERT(ep->leftover_bytes.count == 0); - on_read(ep, 1, call_list); + on_read(ep, 1, closure_list); return; } grpc_endpoint_read(ep->wrapped_ep, &ep->source_buffer, &ep->on_read, - call_list); + closure_list); } static void flush_write_staging_buffer(secure_endpoint *ep, gpr_uint8 **cur, @@ -241,7 +244,7 @@ static void flush_write_staging_buffer(secure_endpoint *ep, gpr_uint8 **cur, } static void endpoint_write(grpc_endpoint *secure_ep, gpr_slice_buffer *slices, - grpc_closure *cb, grpc_call_list *call_list) { + grpc_closure *cb, grpc_closure_list *closure_list) { unsigned i; tsi_result result = TSI_OK; secure_endpoint *ep = (secure_endpoint *)secure_ep; @@ -313,37 +316,37 @@ static void endpoint_write(grpc_endpoint *secure_ep, gpr_slice_buffer *slices, if (result != TSI_OK) { /* TODO(yangg) do different things according to the error type? */ gpr_slice_buffer_reset_and_unref(&ep->output_buffer); - grpc_call_list_add(call_list, cb, 0); + grpc_closure_list_add(closure_list, cb, 0); return; } - grpc_endpoint_write(ep->wrapped_ep, &ep->output_buffer, cb, call_list); + grpc_endpoint_write(ep->wrapped_ep, &ep->output_buffer, cb, closure_list); } static void endpoint_shutdown(grpc_endpoint *secure_ep, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { secure_endpoint *ep = (secure_endpoint *)secure_ep; - grpc_endpoint_shutdown(ep->wrapped_ep, call_list); + grpc_endpoint_shutdown(ep->wrapped_ep, closure_list); } static void endpoint_destroy(grpc_endpoint *secure_ep, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { secure_endpoint *ep = (secure_endpoint *)secure_ep; - SECURE_ENDPOINT_UNREF(ep, "destroy", call_list); + SECURE_ENDPOINT_UNREF(ep, "destroy", closure_list); } static void endpoint_add_to_pollset(grpc_endpoint *secure_ep, grpc_pollset *pollset, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { secure_endpoint *ep = (secure_endpoint *)secure_ep; - grpc_endpoint_add_to_pollset(ep->wrapped_ep, pollset, call_list); + grpc_endpoint_add_to_pollset(ep->wrapped_ep, pollset, closure_list); } static void endpoint_add_to_pollset_set(grpc_endpoint *secure_ep, grpc_pollset_set *pollset_set, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { secure_endpoint *ep = (secure_endpoint *)secure_ep; - grpc_endpoint_add_to_pollset_set(ep->wrapped_ep, pollset_set, call_list); + grpc_endpoint_add_to_pollset_set(ep->wrapped_ep, pollset_set, closure_list); } static char *endpoint_get_peer(grpc_endpoint *secure_ep) { diff --git a/src/core/security/security_connector.c b/src/core/security/security_connector.c index 07e2490981c..280036bc0eb 100644 --- a/src/core/security/security_connector.c +++ b/src/core/security/security_connector.c @@ -106,11 +106,12 @@ void grpc_security_connector_do_handshake(grpc_security_connector *sc, grpc_endpoint *nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (sc == NULL || nonsecure_endpoint == NULL) { - cb(user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, call_list); + cb(user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, closure_list); } else { - sc->vtable->do_handshake(sc, nonsecure_endpoint, cb, user_data, call_list); + sc->vtable->do_handshake(sc, nonsecure_endpoint, cb, user_data, + closure_list); } } @@ -126,9 +127,10 @@ grpc_security_status grpc_security_connector_check_peer( grpc_security_status grpc_channel_security_connector_check_call_host( grpc_channel_security_connector *sc, const char *host, - grpc_security_check_cb cb, void *user_data, grpc_call_list *call_list) { + grpc_security_check_cb cb, void *user_data, + grpc_closure_list *closure_list) { if (sc == NULL || sc->check_call_host == NULL) return GRPC_SECURITY_ERROR; - return sc->check_call_host(sc, host, cb, user_data, call_list); + return sc->check_call_host(sc, host, cb, user_data, closure_list); } #ifdef GRPC_SECURITY_CONNECTOR_REFCOUNT_DEBUG @@ -270,11 +272,12 @@ end: static grpc_security_status fake_channel_check_call_host( grpc_channel_security_connector *sc, const char *host, - grpc_security_check_cb cb, void *user_data, grpc_call_list *call_list) { + grpc_security_check_cb cb, void *user_data, + grpc_closure_list *closure_list) { grpc_fake_channel_security_connector *c = (grpc_fake_channel_security_connector *)sc; if (c->call_host_check_is_async) { - cb(user_data, GRPC_SECURITY_OK, call_list); + cb(user_data, GRPC_SECURITY_OK, closure_list); return GRPC_SECURITY_PENDING; } else { return GRPC_SECURITY_OK; @@ -285,18 +288,18 @@ static void fake_channel_do_handshake(grpc_security_connector *sc, grpc_endpoint *nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_do_security_handshake(tsi_create_fake_handshaker(1), sc, - nonsecure_endpoint, cb, user_data, call_list); + nonsecure_endpoint, cb, user_data, closure_list); } static void fake_server_do_handshake(grpc_security_connector *sc, grpc_endpoint *nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_do_security_handshake(tsi_create_fake_handshaker(0), sc, - nonsecure_endpoint, cb, user_data, call_list); + nonsecure_endpoint, cb, user_data, closure_list); } static grpc_security_connector_vtable fake_channel_vtable = { @@ -389,7 +392,7 @@ static void ssl_channel_do_handshake(grpc_security_connector *sc, grpc_endpoint *nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *)sc; tsi_handshaker *handshaker; @@ -399,10 +402,10 @@ static void ssl_channel_do_handshake(grpc_security_connector *sc, : c->target_name, &handshaker); if (status != GRPC_SECURITY_OK) { - cb(user_data, status, nonsecure_endpoint, NULL, call_list); + cb(user_data, status, nonsecure_endpoint, NULL, closure_list); } else { grpc_do_security_handshake(handshaker, sc, nonsecure_endpoint, cb, - user_data, call_list); + user_data, closure_list); } } @@ -410,17 +413,17 @@ static void ssl_server_do_handshake(grpc_security_connector *sc, grpc_endpoint *nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_ssl_server_security_connector *c = (grpc_ssl_server_security_connector *)sc; tsi_handshaker *handshaker; grpc_security_status status = ssl_create_handshaker(c->handshaker_factory, 0, NULL, &handshaker); if (status != GRPC_SECURITY_OK) { - cb(user_data, status, nonsecure_endpoint, NULL, call_list); + cb(user_data, status, nonsecure_endpoint, NULL, closure_list); } else { grpc_do_security_handshake(handshaker, sc, nonsecure_endpoint, cb, - user_data, call_list); + user_data, closure_list); } } @@ -529,7 +532,8 @@ static grpc_security_status ssl_server_check_peer(grpc_security_connector *sc, static grpc_security_status ssl_channel_check_call_host( grpc_channel_security_connector *sc, const char *host, - grpc_security_check_cb cb, void *user_data, grpc_call_list *call_list) { + grpc_security_check_cb cb, void *user_data, + grpc_closure_list *closure_list) { grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *)sc; diff --git a/src/core/security/security_connector.h b/src/core/security/security_connector.h index 276fa479400..0f161d0e374 100644 --- a/src/core/security/security_connector.h +++ b/src/core/security/security_connector.h @@ -62,21 +62,20 @@ typedef struct grpc_security_connector grpc_security_connector; typedef void (*grpc_security_check_cb)(void *user_data, grpc_security_status status, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Ownership of the secure_endpoint is transfered. */ -typedef void (*grpc_security_handshake_done_cb)(void *user_data, - grpc_security_status status, - grpc_endpoint *wrapped_endpoint, - grpc_endpoint *secure_endpoint, - grpc_call_list *call_list); +typedef void (*grpc_security_handshake_done_cb)( + void *user_data, grpc_security_status status, + grpc_endpoint *wrapped_endpoint, grpc_endpoint *secure_endpoint, + grpc_closure_list *closure_list); typedef struct { void (*destroy)(grpc_security_connector *sc); void (*do_handshake)(grpc_security_connector *sc, grpc_endpoint *nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, - grpc_call_list *call_list); + grpc_closure_list *closure_list); grpc_security_status (*check_peer)(grpc_security_connector *sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data); @@ -115,7 +114,7 @@ void grpc_security_connector_do_handshake(grpc_security_connector *connector, grpc_endpoint *nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Check the peer. Implementations can choose to check the peer either synchronously or @@ -152,7 +151,7 @@ struct grpc_channel_security_connector { const char *host, grpc_security_check_cb cb, void *user_data, - grpc_call_list *call_list); + grpc_closure_list *closure_list); }; /* Checks that the host that will be set for a call is acceptable. @@ -162,7 +161,8 @@ struct grpc_channel_security_connector { GRPC_SECURITY_PENDING unless an error is detected early on. */ grpc_security_status grpc_channel_security_connector_check_call_host( grpc_channel_security_connector *sc, const char *host, - grpc_security_check_cb cb, void *user_data, grpc_call_list *call_list); + grpc_security_check_cb cb, void *user_data, + grpc_closure_list *closure_list); /* --- Creation security connectors. --- */ diff --git a/src/core/security/server_auth_filter.c b/src/core/security/server_auth_filter.c index 201288bbdd4..e65578e479e 100644 --- a/src/core/security/server_auth_filter.c +++ b/src/core/security/server_auth_filter.c @@ -116,7 +116,7 @@ static void on_md_processing_done( grpc_status_code status, const char *error_details) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; /* TODO(jboeuf): Implement support for response_md. */ if (response_md != NULL && num_response_md > 0) { @@ -131,7 +131,7 @@ static void on_md_processing_done( grpc_metadata_batch_filter(&calld->md_op->data.metadata, remove_consumed_md, elem); grpc_metadata_array_destroy(&calld->md); - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, 1, &call_list); + calld->on_done_recv->cb(calld->on_done_recv->cb_arg, 1, &closure_list); } else { gpr_slice message; grpc_metadata_array_destroy(&calld->md); @@ -141,14 +141,14 @@ static void on_md_processing_done( message = gpr_slice_from_copied_string(error_details); grpc_sopb_reset(calld->recv_ops); grpc_transport_stream_op_add_close(&calld->transport_op, status, &message); - grpc_call_next_op(elem, &calld->transport_op, &call_list); + grpc_call_next_op(elem, &calld->transport_op, &closure_list); } - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static void auth_on_recv(void *user_data, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -169,7 +169,7 @@ static void auth_on_recv(void *user_data, int success, return; } } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, call_list); + calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, closure_list); } static void set_recv_ops_md_callbacks(grpc_call_element *elem, @@ -192,16 +192,16 @@ static void set_recv_ops_md_callbacks(grpc_call_element *elem, that is being sent or received. */ static void auth_start_transport_op(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { set_recv_ops_md_callbacks(elem, op); - grpc_call_next_op(elem, op, call_list); + grpc_call_next_op(elem, op, closure_list); } /* Constructor for call_data */ static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -235,13 +235,13 @@ static void init_call_elem(grpc_call_element *elem, /* Destructor for call_data */ static void destroy_call_elem(grpc_call_element *elem, - grpc_call_list *call_list) {} + grpc_closure_list *closure_list) {} /* Constructor for channel_data */ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *mdctx, int is_first, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_security_connector *sc = grpc_find_security_connector_in_args(args); grpc_auth_metadata_processor *processor = grpc_find_auth_metadata_processor_in_args(args); @@ -266,7 +266,7 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, /* Destructor for channel data */ static void destroy_channel_elem(grpc_channel_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* grab pointers to our data from the channel element */ channel_data *chand = elem->channel_data; GRPC_SECURITY_CONNECTOR_UNREF(chand->security_connector, diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index 2ecb6151402..268ae582804 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -86,7 +86,8 @@ static void state_unref(grpc_server_secure_state *state) { } static void setup_transport(void *statep, grpc_transport *transport, - grpc_mdctx *mdctx, grpc_call_list *call_list) { + grpc_mdctx *mdctx, + grpc_closure_list *closure_list) { static grpc_channel_filter const *extra_filters[] = { &grpc_server_auth_filter, &grpc_http_server_filter}; grpc_server_secure_state *state = statep; @@ -100,7 +101,7 @@ static void setup_transport(void *statep, grpc_transport *transport, GPR_ARRAY_SIZE(args_to_add)); grpc_server_setup_transport(state->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, args_copy, - call_list); + closure_list); grpc_channel_args_destroy(args_copy); } @@ -128,7 +129,7 @@ static int remove_tcp_from_list_locked(grpc_server_secure_state *state, static void on_secure_handshake_done(void *statep, grpc_security_status status, grpc_endpoint *wrapped_endpoint, grpc_endpoint *secure_endpoint, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_server_secure_state *state = statep; grpc_transport *transport; grpc_mdctx *mdctx; @@ -139,13 +140,13 @@ static void on_secure_handshake_done(void *statep, grpc_security_status status, mdctx = grpc_mdctx_create(); transport = grpc_create_chttp2_transport( grpc_server_get_channel_args(state->server), secure_endpoint, mdctx, - 0, call_list); - setup_transport(state, transport, mdctx, call_list); - grpc_chttp2_transport_start_reading(transport, NULL, 0, call_list); + 0, closure_list); + setup_transport(state, transport, mdctx, closure_list); + grpc_chttp2_transport_start_reading(transport, NULL, 0, closure_list); } else { /* We need to consume this here, because the server may already have gone * away. */ - grpc_endpoint_destroy(secure_endpoint, call_list); + grpc_endpoint_destroy(secure_endpoint, closure_list); } gpr_mu_unlock(&state->mu); } else { @@ -158,7 +159,7 @@ static void on_secure_handshake_done(void *statep, grpc_security_status status, } static void on_accept(void *statep, grpc_endpoint *tcp, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_server_secure_state *state = statep; tcp_endpoint_list *node; state_ref(state); @@ -169,25 +170,26 @@ static void on_accept(void *statep, grpc_endpoint *tcp, state->handshaking_tcp_endpoints = node; gpr_mu_unlock(&state->mu); grpc_security_connector_do_handshake(state->sc, tcp, on_secure_handshake_done, - state, call_list); + state, closure_list); } /* Server callback: start listening on our ports */ static void start(grpc_server *server, void *statep, grpc_pollset **pollsets, - size_t pollset_count, grpc_call_list *call_list) { + size_t pollset_count, grpc_closure_list *closure_list) { grpc_server_secure_state *state = statep; grpc_tcp_server_start(state->tcp, pollsets, pollset_count, on_accept, state, - call_list); + closure_list); } -static void destroy_done(void *statep, int success, grpc_call_list *call_list) { +static void destroy_done(void *statep, int success, + grpc_closure_list *closure_list) { grpc_server_secure_state *state = statep; state->destroy_callback->cb(state->destroy_callback->cb_arg, success, - call_list); + closure_list); gpr_mu_lock(&state->mu); while (state->handshaking_tcp_endpoints != NULL) { grpc_endpoint_shutdown(state->handshaking_tcp_endpoints->tcp_endpoint, - call_list); + closure_list); remove_tcp_from_list_locked(state, state->handshaking_tcp_endpoints->tcp_endpoint); } @@ -198,7 +200,7 @@ static void destroy_done(void *statep, int success, grpc_call_list *call_list) { /* Server callback: destroy the tcp listener (so we don't generate further callbacks) */ static void destroy(grpc_server *server, void *statep, grpc_closure *callback, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_server_secure_state *state = statep; grpc_tcp_server *tcp; gpr_mu_lock(&state->mu); @@ -207,7 +209,7 @@ static void destroy(grpc_server *server, void *statep, grpc_closure *callback, tcp = state->tcp; gpr_mu_unlock(&state->mu); grpc_closure_init(&state->destroy_closure, destroy_done, state); - grpc_tcp_server_destroy(tcp, &state->destroy_closure, call_list); + grpc_tcp_server_destroy(tcp, &state->destroy_closure, closure_list); } int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, @@ -221,7 +223,7 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, int port_temp; grpc_security_status status = GRPC_SECURITY_ERROR; grpc_security_connector *sc = NULL; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; /* create security context */ if (creds == NULL) goto error; @@ -282,9 +284,9 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, gpr_ref_init(&state->refcount, 1); /* Register with the server only upon success */ - grpc_server_add_listener(server, state, start, destroy, &call_list); + grpc_server_add_listener(server, state, start, destroy, &closure_list); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); return port_num; /* Error path: cleanup and return */ @@ -296,11 +298,11 @@ error: grpc_resolved_addresses_destroy(resolved); } if (tcp) { - grpc_tcp_server_destroy(tcp, NULL, &call_list); + grpc_tcp_server_destroy(tcp, NULL, &closure_list); } if (state) { gpr_free(state); } - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); return 0; } diff --git a/src/core/surface/call.c b/src/core/surface/call.c index 9920e0daafe..1e371a4cbc0 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -277,24 +277,24 @@ struct grpc_call { CALL_FROM_CALL_STACK(grpc_call_stack_from_top_element(top_elem)) static void set_deadline_alarm(grpc_call *call, gpr_timespec deadline, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static void call_on_done_recv(void *call, int success, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static void call_on_done_send(void *call, int success, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static int fill_send_ops(grpc_call *call, grpc_transport_stream_op *op); static void execute_op(grpc_call *call, grpc_transport_stream_op *op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static void recv_metadata(grpc_call *call, grpc_metadata_batch *metadata, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static void finish_read_ops(grpc_call *call); static grpc_call_error cancel_with_status(grpc_call *c, grpc_status_code status, const char *description); static void finished_loose_op(void *call, int success, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static void lock(grpc_call *call); -static void unlock(grpc_call *call, grpc_call_list *call_list); +static void unlock(grpc_call *call, grpc_closure_list *closure_list); grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, gpr_uint32 propagation_mask, @@ -307,7 +307,7 @@ grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, grpc_transport_stream_op initial_op; grpc_transport_stream_op *initial_op_ptr = NULL; grpc_channel_stack *channel_stack = grpc_channel_get_channel_stack(channel); - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_call *call = gpr_malloc(sizeof(grpc_call) + channel_stack->call_stack_size); memset(call, 0, sizeof(grpc_call)); @@ -356,7 +356,7 @@ grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, initial_op_ptr = &initial_op; } grpc_call_stack_init(channel_stack, server_transport_data, initial_op_ptr, - CALL_STACK_FROM_CALL(call), &call_list); + CALL_STACK_FROM_CALL(call), &closure_list); if (parent_call != NULL) { GRPC_CALL_INTERNAL_REF(parent_call, "child"); GPR_ASSERT(call->is_client); @@ -400,20 +400,20 @@ grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, } if (gpr_time_cmp(send_deadline, gpr_inf_future(send_deadline.clock_type)) != 0) { - set_deadline_alarm(call, send_deadline, &call_list); + set_deadline_alarm(call, send_deadline, &closure_list); } - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); return call; } void grpc_call_set_completion_queue(grpc_call *call, grpc_completion_queue *cq, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { lock(call); call->cq = cq; if (cq) { GRPC_CQ_INTERNAL_REF(cq, "bind"); } - unlock(call, call_list); + unlock(call, closure_list); } grpc_completion_queue *grpc_call_get_completion_queue(grpc_call *call) { @@ -436,13 +436,13 @@ static grpc_cq_completion *allocate_completion(grpc_call *call) { } static void done_completion(void *call, grpc_cq_completion *completion, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call *c = call; gpr_mu_lock(&c->completion_mu); c->allocated_completions &= (gpr_uint8) ~(1u << (completion - c->completions)); gpr_mu_unlock(&c->completion_mu); - GRPC_CALL_INTERNAL_UNREF(c, "completion", call_list); + GRPC_CALL_INTERNAL_UNREF(c, "completion", closure_list); } #ifdef GRPC_CALL_REF_COUNT_DEBUG @@ -455,11 +455,11 @@ void grpc_call_internal_ref(grpc_call *c) { gpr_ref(&c->internal_refcount); } -static void destroy_call(grpc_call *call, grpc_call_list *call_list) { +static void destroy_call(grpc_call *call, grpc_closure_list *closure_list) { size_t i; grpc_call *c = call; - grpc_call_stack_destroy(CALL_STACK_FROM_CALL(c), call_list); - GRPC_CHANNEL_INTERNAL_UNREF(c->channel, "call", call_list); + grpc_call_stack_destroy(CALL_STACK_FROM_CALL(c), closure_list); + GRPC_CHANNEL_INTERNAL_UNREF(c->channel, "call", closure_list); gpr_mu_destroy(&c->mu); gpr_mu_destroy(&c->completion_mu); for (i = 0; i < STATUS_SOURCE_COUNT; i++) { @@ -494,14 +494,14 @@ static void destroy_call(grpc_call *call, grpc_call_list *call_list) { #ifdef GRPC_CALL_REF_COUNT_DEBUG void grpc_call_internal_unref(grpc_call *c, const char *reason, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { gpr_log(GPR_DEBUG, "CALL: unref %p %d -> %d [%s]", c, c->internal_refcount.count, c->internal_refcount.count - 1, reason); #else -void grpc_call_internal_unref(grpc_call *c, grpc_call_list *call_list) { +void grpc_call_internal_unref(grpc_call *c, grpc_closure_list *closure_list) { #endif if (gpr_unref(&c->internal_refcount)) { - destroy_call(c, call_list); + destroy_call(c, closure_list); } } @@ -600,7 +600,7 @@ static int need_more_data(grpc_call *call) { (call->cancel_with_status != GRPC_STATUS_OK) || call->destroy_called; } -static void unlock(grpc_call *call, grpc_call_list *call_list) { +static void unlock(grpc_call *call, grpc_closure_list *closure_list) { grpc_transport_stream_op op; completed_request completed_requests[GRPC_IOREQ_OP_COUNT]; int completing_requests = 0; @@ -665,19 +665,19 @@ static void unlock(grpc_call *call, grpc_call_list *call_list) { gpr_mu_unlock(&call->mu); if (start_op) { - execute_op(call, &op, call_list); + execute_op(call, &op, closure_list); } if (completing_requests > 0) { for (i = 0; i < completing_requests; i++) { completed_requests[i].on_complete(call, completed_requests[i].success, completed_requests[i].user_data, - call_list); + closure_list); } lock(call); call->completing = 0; - unlock(call, call_list); - GRPC_CALL_INTERNAL_UNREF(call, "completing", call_list); + unlock(call, closure_list); + GRPC_CALL_INTERNAL_UNREF(call, "completing", closure_list); } } @@ -823,7 +823,7 @@ static void early_out_write_ops(grpc_call *call) { } static void call_on_done_send(void *pc, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call *call = pc; lock(call); if (call->last_send_contains & (1 << GRPC_IOREQ_SEND_INITIAL_METADATA)) { @@ -846,8 +846,8 @@ static void call_on_done_send(void *pc, int success, call->send_ops.nops = 0; call->last_send_contains = 0; call->sending = 0; - unlock(call, call_list); - GRPC_CALL_INTERNAL_UNREF(call, "sending", call_list); + unlock(call, closure_list); + GRPC_CALL_INTERNAL_UNREF(call, "sending", closure_list); } static void finish_message(grpc_call *call) { @@ -954,7 +954,7 @@ static int add_slice_to_message(grpc_call *call, gpr_slice slice) { } static void call_on_done_recv(void *pc, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call *call = pc; grpc_call *child_call; grpc_call *next_child_call; @@ -969,7 +969,7 @@ static void call_on_done_recv(void *pc, int success, case GRPC_NO_OP: break; case GRPC_OP_METADATA: - recv_metadata(call, &op->data.metadata, call_list); + recv_metadata(call, &op->data.metadata, closure_list); break; case GRPC_OP_BEGIN_MESSAGE: success = begin_message(call, op->data.begin_message); @@ -991,7 +991,7 @@ static void call_on_done_recv(void *pc, int success, GPR_ASSERT(call->read_state <= READ_STATE_STREAM_CLOSED); call->read_state = READ_STATE_STREAM_CLOSED; if (call->have_alarm) { - grpc_alarm_cancel(&call->alarm, call_list); + grpc_alarm_cancel(&call->alarm, closure_list); } /* propagate cancellation to any interested children */ child_call = call->first_child; @@ -1001,12 +1001,13 @@ static void call_on_done_recv(void *pc, int success, if (child_call->cancellation_is_inherited) { GRPC_CALL_INTERNAL_REF(child_call, "propagate_cancel"); grpc_call_cancel(child_call, NULL); - GRPC_CALL_INTERNAL_UNREF(child_call, "propagate_cancel", call_list); + GRPC_CALL_INTERNAL_UNREF(child_call, "propagate_cancel", + closure_list); } child_call = next_child_call; } while (child_call != call->first_child); } - GRPC_CALL_INTERNAL_UNREF(call, "closed", call_list); + GRPC_CALL_INTERNAL_UNREF(call, "closed", closure_list); } finish_read_ops(call); } else { @@ -1018,9 +1019,9 @@ static void call_on_done_recv(void *pc, int success, finish_ioreq_op(call, GRPC_IOREQ_RECV_STATUS_DETAILS, 0); } call->recv_ops.nops = 0; - unlock(call, call_list); + unlock(call, closure_list); - GRPC_CALL_INTERNAL_UNREF(call, "receiving", call_list); + GRPC_CALL_INTERNAL_UNREF(call, "receiving", closure_list); GRPC_TIMER_END(GRPC_PTAG_CALL_ON_DONE_RECV, 0); } @@ -1273,18 +1274,18 @@ static grpc_call_error start_ioreq(grpc_call *call, const grpc_ioreq *reqs, grpc_call_error grpc_call_start_ioreq_and_call_back( grpc_call *call, const grpc_ioreq *reqs, size_t nreqs, grpc_ioreq_completion_func on_complete, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call_error err; lock(call); err = start_ioreq(call, reqs, nreqs, on_complete, user_data); - unlock(call, call_list); + unlock(call, closure_list); return err; } void grpc_call_destroy(grpc_call *c) { int cancel; grpc_call *parent = c->parent; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; if (parent) { gpr_mu_lock(&parent->mu); @@ -1297,20 +1298,20 @@ void grpc_call_destroy(grpc_call *c) { c->sibling_next->sibling_prev = c->sibling_prev; } gpr_mu_unlock(&parent->mu); - GRPC_CALL_INTERNAL_UNREF(parent, "child", &call_list); + GRPC_CALL_INTERNAL_UNREF(parent, "child", &closure_list); } lock(c); GPR_ASSERT(!c->destroy_called); c->destroy_called = 1; if (c->have_alarm) { - grpc_alarm_cancel(&c->alarm, &call_list); + grpc_alarm_cancel(&c->alarm, &closure_list); } cancel = c->read_state != READ_STATE_STREAM_CLOSED; - unlock(c, &call_list); + unlock(c, &closure_list); if (cancel) grpc_call_cancel(c, NULL); - GRPC_CALL_INTERNAL_UNREF(c, "destroy", &call_list); - grpc_call_list_run(&call_list); + GRPC_CALL_INTERNAL_UNREF(c, "destroy", &closure_list); + grpc_closure_list_run(&closure_list); } grpc_call_error grpc_call_cancel(grpc_call *call, void *reserved) { @@ -1324,12 +1325,12 @@ grpc_call_error grpc_call_cancel_with_status(grpc_call *c, const char *description, void *reserved) { grpc_call_error r; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; GPR_ASSERT(reserved == NULL); lock(c); r = cancel_with_status(c, status, description); - unlock(c, &call_list); - grpc_call_list_run(&call_list); + unlock(c, &closure_list); + grpc_closure_list_run(&closure_list); return r; } @@ -1350,8 +1351,8 @@ static grpc_call_error cancel_with_status(grpc_call *c, grpc_status_code status, } static void finished_loose_op(void *call, int success_ignored, - grpc_call_list *call_list) { - GRPC_CALL_INTERNAL_UNREF(call, "loose-op", call_list); + grpc_closure_list *closure_list) { + GRPC_CALL_INTERNAL_UNREF(call, "loose-op", closure_list); } typedef struct { @@ -1360,14 +1361,14 @@ typedef struct { } finished_loose_op_allocated_args; static void finished_loose_op_allocated(void *alloc, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { finished_loose_op_allocated_args *args = alloc; - finished_loose_op(args->call, success, call_list); + finished_loose_op(args->call, success, closure_list); gpr_free(args); } static void execute_op(grpc_call *call, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call_element *elem; GPR_ASSERT(op->on_consumed == NULL); @@ -1385,14 +1386,14 @@ static void execute_op(grpc_call *call, grpc_transport_stream_op *op, elem = CALL_ELEM_FROM_CALL(call, 0); op->context = call->context; - elem->filter->start_transport_stream_op(elem, op, call_list); + elem->filter->start_transport_stream_op(elem, op, closure_list); } char *grpc_call_get_peer(grpc_call *call) { grpc_call_element *elem = CALL_ELEM_FROM_CALL(call, 0); - grpc_call_list call_list = GRPC_CALL_LIST_INIT; - char *result = elem->filter->get_peer(elem, &call_list); - grpc_call_list_run(&call_list); + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + char *result = elem->filter->get_peer(elem, &closure_list); + grpc_closure_list_run(&closure_list); return result; } @@ -1400,7 +1401,8 @@ grpc_call *grpc_call_from_top_element(grpc_call_element *elem) { return CALL_FROM_TOP_ELEM(elem); } -static void call_alarm(void *arg, int success, grpc_call_list *call_list) { +static void call_alarm(void *arg, int success, + grpc_closure_list *closure_list) { grpc_call *call = arg; lock(call); call->have_alarm = 0; @@ -1409,12 +1411,12 @@ static void call_alarm(void *arg, int success, grpc_call_list *call_list) { "Deadline Exceeded"); } finish_read_ops(call); - unlock(call, call_list); - GRPC_CALL_INTERNAL_UNREF(call, "alarm", call_list); + unlock(call, closure_list); + GRPC_CALL_INTERNAL_UNREF(call, "alarm", closure_list); } static void set_deadline_alarm(grpc_call *call, gpr_timespec deadline, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (call->have_alarm) { gpr_log(GPR_ERROR, "Attempt to set deadline alarm twice"); assert(0); @@ -1424,7 +1426,7 @@ static void set_deadline_alarm(grpc_call *call, gpr_timespec deadline, call->have_alarm = 1; call->send_deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC); grpc_alarm_init(&call->alarm, call->send_deadline, call_alarm, call, - gpr_now(GPR_CLOCK_MONOTONIC), call_list); + gpr_now(GPR_CLOCK_MONOTONIC), closure_list); } /* we offset status by a small amount when storing it into transport metadata @@ -1476,7 +1478,7 @@ static gpr_uint32 decode_compression(grpc_mdelem *md) { } static void recv_metadata(grpc_call *call, grpc_metadata_batch *md, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_linked_mdelem *l; grpc_metadata_array *dest; grpc_metadata *mdusr; @@ -1523,7 +1525,7 @@ static void recv_metadata(grpc_call *call, grpc_metadata_batch *md, if (gpr_time_cmp(md->deadline, gpr_inf_future(md->deadline.clock_type)) != 0 && !call->is_client) { - set_deadline_alarm(call, md->deadline, call_list); + set_deadline_alarm(call, md->deadline, closure_list); } if (!is_trailing) { call->read_state = READ_STATE_GOT_INITIAL_METADATA; @@ -1556,15 +1558,15 @@ static void set_cancelled_value(grpc_status_code status, void *dest) { } static void finish_batch(grpc_call *call, int success, void *tag, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_cq_end_op(call->cq, tag, success, done_completion, call, - allocate_completion(call), call_list); + allocate_completion(call), closure_list); } static void finish_batch_with_close(grpc_call *call, int success, void *tag, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_cq_end_op(call->cq, tag, 1, done_completion, call, - allocate_completion(call), call_list); + allocate_completion(call), closure_list); } static int are_write_flags_valid(gpr_uint32 flags) { @@ -1582,10 +1584,10 @@ grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, size_t out; const grpc_op *op; grpc_ioreq *req; - void (*finish_func)(grpc_call *, int, void *, grpc_call_list *) = + void (*finish_func)(grpc_call *, int, void *, grpc_closure_list *) = finish_batch; grpc_call_error error; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; if (reserved != NULL) { error = GRPC_CALL_ERROR; @@ -1598,7 +1600,7 @@ grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, grpc_cq_begin_op(call->cq); GRPC_CALL_INTERNAL_REF(call, "completion"); grpc_cq_end_op(call->cq, tag, 1, done_completion, call, - allocate_completion(call), &call_list); + allocate_completion(call), &closure_list); error = GRPC_CALL_OK; goto done; } @@ -1817,9 +1819,9 @@ grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, grpc_cq_begin_op(call->cq); error = grpc_call_start_ioreq_and_call_back(call, reqs, out, finish_func, tag, - &call_list); + &closure_list); done: - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); return error; } diff --git a/src/core/surface/call.h b/src/core/surface/call.h index 144aa7cef2c..4476ab915be 100644 --- a/src/core/surface/call.h +++ b/src/core/surface/call.h @@ -88,7 +88,7 @@ typedef struct { typedef void (*grpc_ioreq_completion_func)(grpc_call *call, int success, void *user_data, - grpc_call_list *call_list); + grpc_closure_list *closure_list); grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, gpr_uint32 propagation_mask, @@ -99,29 +99,29 @@ grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, gpr_timespec send_deadline); void grpc_call_set_completion_queue(grpc_call *call, grpc_completion_queue *cq, - grpc_call_list *call_list); + grpc_closure_list *closure_list); grpc_completion_queue *grpc_call_get_completion_queue(grpc_call *call); #ifdef GRPC_CALL_REF_COUNT_DEBUG void grpc_call_internal_ref(grpc_call *call, const char *reason); void grpc_call_internal_unref(grpc_call *call, const char *reason, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #define GRPC_CALL_INTERNAL_REF(call, reason) \ grpc_call_internal_ref(call, reason) -#define GRPC_CALL_INTERNAL_UNREF(call, reason, call_list) \ - grpc_call_internal_unref(call, reason, call_list) +#define GRPC_CALL_INTERNAL_UNREF(call, reason, closure_list) \ + grpc_call_internal_unref(call, reason, closure_list) #else void grpc_call_internal_ref(grpc_call *call); -void grpc_call_internal_unref(grpc_call *call, grpc_call_list *call_list); +void grpc_call_internal_unref(grpc_call *call, grpc_closure_list *closure_list); #define GRPC_CALL_INTERNAL_REF(call, reason) grpc_call_internal_ref(call) -#define GRPC_CALL_INTERNAL_UNREF(call, reason, call_list) \ - grpc_call_internal_unref(call, call_list) +#define GRPC_CALL_INTERNAL_UNREF(call, reason, closure_list) \ + grpc_call_internal_unref(call, closure_list) #endif grpc_call_error grpc_call_start_ioreq_and_call_back( grpc_call *call, const grpc_ioreq *reqs, size_t nreqs, grpc_ioreq_completion_func on_complete, void *user_data, - grpc_call_list *call_list); + grpc_closure_list *closure_list); grpc_call_stack *grpc_call_get_call_stack(grpc_call *call); diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index b00096f6fa2..1214425e090 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -92,7 +92,7 @@ struct grpc_channel { grpc_channel *grpc_channel_create_from_filters( const char *target, const grpc_channel_filter **filters, size_t num_filters, const grpc_channel_args *args, grpc_mdctx *mdctx, int is_client, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t i; size_t size = sizeof(grpc_channel) + grpc_channel_stack_size(filters, num_filters); @@ -179,7 +179,7 @@ grpc_channel *grpc_channel_create_from_filters( grpc_channel_stack_init(filters, num_filters, channel, args, channel->metadata_context, - CHANNEL_STACK_FROM_CHANNEL(channel), call_list); + CHANNEL_STACK_FROM_CHANNEL(channel), closure_list); return channel; } @@ -270,9 +270,10 @@ void grpc_channel_internal_ref(grpc_channel *c) { gpr_ref(&c->refs); } -static void destroy_channel(grpc_channel *channel, grpc_call_list *call_list) { +static void destroy_channel(grpc_channel *channel, + grpc_closure_list *closure_list) { size_t i; - grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CHANNEL(channel), call_list); + grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CHANNEL(channel), closure_list); for (i = 0; i < NUM_CACHED_STATUS_ELEMS; i++) { GRPC_MDELEM_UNREF(channel->grpc_status_elem[i]); } @@ -302,30 +303,30 @@ static void destroy_channel(grpc_channel *channel, grpc_call_list *call_list) { #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG void grpc_channel_internal_unref(grpc_channel *channel, const char *reason, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { gpr_log(GPR_DEBUG, "CHANNEL: unref %p %d -> %d [%s]", channel, channel->refs.count, channel->refs.count - 1, reason); #else void grpc_channel_internal_unref(grpc_channel *channel, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { #endif if (gpr_unref(&channel->refs)) { - destroy_channel(channel, call_list); + destroy_channel(channel, closure_list); } } void grpc_channel_destroy(grpc_channel *channel) { grpc_transport_op op; grpc_channel_element *elem; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; memset(&op, 0, sizeof(op)); op.disconnect = 1; elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CHANNEL(channel), 0); - elem->filter->start_transport_op(elem, &op, &call_list); + elem->filter->start_transport_op(elem, &op, &closure_list); - GRPC_CHANNEL_INTERNAL_UNREF(channel, "channel", &call_list); + GRPC_CHANNEL_INTERNAL_UNREF(channel, "channel", &closure_list); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel) { diff --git a/src/core/surface/channel.h b/src/core/surface/channel.h index 2a249c9c51a..e9c29481474 100644 --- a/src/core/surface/channel.h +++ b/src/core/surface/channel.h @@ -40,7 +40,7 @@ grpc_channel *grpc_channel_create_from_filters( const char *target, const grpc_channel_filter **filters, size_t count, const grpc_channel_args *args, grpc_mdctx *mdctx, int is_client, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** Get a (borrowed) pointer to this channels underlying channel stack */ grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel); @@ -65,19 +65,19 @@ gpr_uint32 grpc_channel_get_max_message_length(grpc_channel *channel); #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG void grpc_channel_internal_ref(grpc_channel *channel, const char *reason); void grpc_channel_internal_unref(grpc_channel *channel, const char *reason, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #define GRPC_CHANNEL_INTERNAL_REF(channel, reason) \ grpc_channel_internal_ref(channel, reason) -#define GRPC_CHANNEL_INTERNAL_UNREF(channel, reason, call_list) \ - grpc_channel_internal_unref(channel, reason, call_list) +#define GRPC_CHANNEL_INTERNAL_UNREF(channel, reason, closure_list) \ + grpc_channel_internal_unref(channel, reason, closure_list) #else void grpc_channel_internal_ref(grpc_channel *channel); void grpc_channel_internal_unref(grpc_channel *channel, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #define GRPC_CHANNEL_INTERNAL_REF(channel, reason) \ grpc_channel_internal_ref(channel) -#define GRPC_CHANNEL_INTERNAL_UNREF(channel, reason, call_list) \ - grpc_channel_internal_unref(channel, call_list) +#define GRPC_CHANNEL_INTERNAL_UNREF(channel, reason, closure_list) \ + grpc_channel_internal_unref(channel, closure_list) #endif #endif /* GRPC_INTERNAL_CORE_SURFACE_CHANNEL_H */ diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index 3e34e84f601..d09e9bef799 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -45,7 +45,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_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_connectivity_state state; if (client_channel_elem->filter != &grpc_client_channel_filter) { gpr_log(GPR_ERROR, @@ -55,8 +55,8 @@ grpc_connectivity_state grpc_channel_check_connectivity_state( return GRPC_CHANNEL_FATAL_FAILURE; } state = grpc_client_channel_check_connectivity_state( - client_channel_elem, try_to_connect, &call_list); - grpc_call_list_run(&call_list); + client_channel_elem, try_to_connect, &closure_list); + grpc_closure_list_run(&closure_list); return state; } @@ -81,14 +81,15 @@ typedef struct { void *tag; } state_watcher; -static void delete_state_watcher(state_watcher *w, grpc_call_list *call_list) { - GRPC_CHANNEL_INTERNAL_UNREF(w->channel, "watch_connectivity", call_list); +static void delete_state_watcher(state_watcher *w, + grpc_closure_list *closure_list) { + GRPC_CHANNEL_INTERNAL_UNREF(w->channel, "watch_connectivity", closure_list); gpr_mu_destroy(&w->mu); gpr_free(w); } static void finished_completion(void *pw, grpc_cq_completion *ignored, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { int delete = 0; state_watcher *w = pw; gpr_mu_lock(&w->mu); @@ -108,12 +109,12 @@ static void finished_completion(void *pw, grpc_cq_completion *ignored, gpr_mu_unlock(&w->mu); if (delete) { - delete_state_watcher(w, call_list); + delete_state_watcher(w, closure_list); } } static void partly_done(state_watcher *w, int due_to_completion, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { int delete = 0; grpc_channel_element *client_channel_elem = NULL; @@ -122,15 +123,15 @@ static void partly_done(state_watcher *w, int due_to_completion, w->removed = 1; client_channel_elem = grpc_channel_stack_last_element( grpc_channel_get_channel_stack(w->channel)); - grpc_client_channel_del_interested_party(client_channel_elem, - grpc_cq_pollset(w->cq), call_list); + grpc_client_channel_del_interested_party( + client_channel_elem, grpc_cq_pollset(w->cq), closure_list); } gpr_mu_unlock(&w->mu); if (due_to_completion) { gpr_mu_lock(&w->mu); w->success = 1; gpr_mu_unlock(&w->mu); - grpc_alarm_cancel(&w->alarm, call_list); + grpc_alarm_cancel(&w->alarm, closure_list); } gpr_mu_lock(&w->mu); @@ -138,7 +139,7 @@ static void partly_done(state_watcher *w, int due_to_completion, case WAITING: w->phase = CALLING_BACK; grpc_cq_end_op(w->cq, w->tag, w->success, finished_completion, w, - &w->completion_storage, call_list); + &w->completion_storage, closure_list); break; case CALLING_BACK: w->phase = CALLING_BACK_AND_FINISHED; @@ -154,16 +155,18 @@ static void partly_done(state_watcher *w, int due_to_completion, gpr_mu_unlock(&w->mu); if (delete) { - delete_state_watcher(w, call_list); + delete_state_watcher(w, closure_list); } } -static void watch_complete(void *pw, int success, grpc_call_list *call_list) { - partly_done(pw, 1, call_list); +static void watch_complete(void *pw, int success, + grpc_closure_list *closure_list) { + partly_done(pw, 1, closure_list); } -static void timeout_complete(void *pw, int success, grpc_call_list *call_list) { - partly_done(pw, 0, call_list); +static void timeout_complete(void *pw, int success, + grpc_closure_list *closure_list) { + partly_done(pw, 0, closure_list); } void grpc_channel_watch_connectivity_state( @@ -171,7 +174,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_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; state_watcher *w = gpr_malloc(sizeof(*w)); grpc_cq_begin_op(cq); @@ -188,21 +191,21 @@ void grpc_channel_watch_connectivity_state( grpc_alarm_init( &w->alarm, gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC), - timeout_complete, w, gpr_now(GPR_CLOCK_MONOTONIC), &call_list); + timeout_complete, w, gpr_now(GPR_CLOCK_MONOTONIC), &closure_list); if (client_channel_elem->filter != &grpc_client_channel_filter) { gpr_log(GPR_ERROR, "grpc_channel_watch_connectivity_state called on something that is " "not a client channel, but '%s'", client_channel_elem->filter->name); - grpc_call_list_add(&call_list, &w->on_complete, 1); + grpc_closure_list_add(&closure_list, &w->on_complete, 1); } else { GRPC_CHANNEL_INTERNAL_REF(channel, "watch_connectivity"); - grpc_client_channel_add_interested_party(client_channel_elem, - grpc_cq_pollset(cq), &call_list); - grpc_client_channel_watch_connectivity_state(client_channel_elem, &w->state, - &w->on_complete, &call_list); + grpc_client_channel_add_interested_party( + client_channel_elem, grpc_cq_pollset(cq), &closure_list); + grpc_client_channel_watch_connectivity_state( + client_channel_elem, &w->state, &w->on_complete, &closure_list); } - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index f48fa4ed83d..fc9ed584916 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -68,7 +68,8 @@ static void connector_ref(grpc_connector *con) { gpr_ref(&c->refs); } -static void connector_unref(grpc_connector *con, grpc_call_list *call_list) { +static void connector_unref(grpc_connector *con, + grpc_closure_list *closure_list) { connector *c = (connector *)con; if (gpr_unref(&c->refs)) { grpc_mdctx_unref(c->mdctx); @@ -76,15 +77,15 @@ static void connector_unref(grpc_connector *con, grpc_call_list *call_list) { } } -static void connected(void *arg, int success, grpc_call_list *call_list) { +static void connected(void *arg, int success, grpc_closure_list *closure_list) { connector *c = arg; grpc_closure *notify; grpc_endpoint *tcp = c->tcp; if (tcp != NULL) { c->result->transport = grpc_create_chttp2_transport( - c->args.channel_args, tcp, c->mdctx, 1, call_list); + c->args.channel_args, tcp, c->mdctx, 1, closure_list); grpc_chttp2_transport_start_reading(c->result->transport, NULL, 0, - call_list); + closure_list); GPR_ASSERT(c->result->transport); c->result->filters = gpr_malloc(sizeof(grpc_channel_filter *)); c->result->filters[0] = &grpc_http_client_filter; @@ -94,16 +95,17 @@ static void connected(void *arg, int success, grpc_call_list *call_list) { } notify = c->notify; c->notify = NULL; - notify->cb(notify->cb_arg, 1, call_list); + notify->cb(notify->cb_arg, 1, closure_list); } -static void connector_shutdown(grpc_connector *con, grpc_call_list *call_list) { -} +static void connector_shutdown(grpc_connector *con, + grpc_closure_list *closure_list) {} static void connector_connect(grpc_connector *con, const grpc_connect_in_args *args, grpc_connect_out_args *result, - grpc_closure *notify, grpc_call_list *call_list) { + grpc_closure *notify, + grpc_closure_list *closure_list) { connector *c = (connector *)con; GPR_ASSERT(c->notify == NULL); GPR_ASSERT(notify->cb); @@ -114,7 +116,7 @@ static void connector_connect(grpc_connector *con, grpc_closure_init(&c->connected, connected, c); grpc_tcp_client_connect(&c->connected, &c->tcp, args->interested_parties, args->addr, args->addr_len, args->deadline, - call_list); + closure_list); } static const grpc_connector_vtable connector_vtable = { @@ -134,10 +136,10 @@ static void subchannel_factory_ref(grpc_subchannel_factory *scf) { } static void subchannel_factory_unref(grpc_subchannel_factory *scf, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { subchannel_factory *f = (subchannel_factory *)scf; if (gpr_unref(&f->refs)) { - GRPC_CHANNEL_INTERNAL_UNREF(f->master, "subchannel_factory", call_list); + GRPC_CHANNEL_INTERNAL_UNREF(f->master, "subchannel_factory", closure_list); grpc_channel_args_destroy(f->merge_args); grpc_mdctx_unref(f->mdctx); gpr_free(f); @@ -146,7 +148,7 @@ static void subchannel_factory_unref(grpc_subchannel_factory *scf, static grpc_subchannel *subchannel_factory_create_subchannel( grpc_subchannel_factory *scf, grpc_subchannel_args *args, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { subchannel_factory *f = (subchannel_factory *)scf; connector *c = gpr_malloc(sizeof(*c)); grpc_channel_args *final_args = @@ -161,7 +163,7 @@ static grpc_subchannel *subchannel_factory_create_subchannel( args->args = final_args; args->master = f->master; s = grpc_subchannel_create(&c->base, args); - grpc_connector_unref(&c->base, call_list); + grpc_connector_unref(&c->base, closure_list); grpc_channel_args_destroy(final_args); return s; } @@ -183,7 +185,7 @@ grpc_channel *grpc_insecure_channel_create(const char *target, grpc_resolver *resolver; subchannel_factory *f; grpc_mdctx *mdctx = grpc_mdctx_create(); - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; size_t n = 0; GPR_ASSERT(!reserved); if (grpc_channel_args_is_census_enabled(args)) { @@ -194,7 +196,7 @@ grpc_channel *grpc_insecure_channel_create(const char *target, GPR_ASSERT(n <= MAX_FILTERS); channel = grpc_channel_create_from_filters(target, filters, n, args, mdctx, 1, - &call_list); + &closure_list); f = gpr_malloc(sizeof(*f)); f->base.vtable = &subchannel_factory_vtable; @@ -210,11 +212,11 @@ grpc_channel *grpc_insecure_channel_create(const char *target, } grpc_client_channel_set_resolver(grpc_channel_get_channel_stack(channel), - resolver, &call_list); - GRPC_RESOLVER_UNREF(resolver, "create", &call_list); - grpc_subchannel_factory_unref(&f->base, &call_list); + resolver, &closure_list); + GRPC_RESOLVER_UNREF(resolver, "create", &closure_list); + grpc_subchannel_factory_unref(&f->base, &closure_list); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); return channel; } diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index 49dfc3c0e1c..cb839b069d5 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -71,7 +71,7 @@ struct grpc_completion_queue { }; static void on_pollset_destroy_done(void *cc, int success, - grpc_call_list *call_list); + grpc_closure_list *closure_list); grpc_completion_queue *grpc_completion_queue_create(void *reserved) { grpc_completion_queue *cc = gpr_malloc(sizeof(grpc_completion_queue)); @@ -100,7 +100,7 @@ void grpc_cq_internal_ref(grpc_completion_queue *cc) { } static void on_pollset_destroy_done(void *arg, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_completion_queue *cc = arg; GRPC_CQ_INTERNAL_UNREF(cc, "pollset_destroy"); } @@ -134,9 +134,9 @@ void grpc_cq_begin_op(grpc_completion_queue *cc) { /* Queue a GRPC_OP_COMPLETED operation */ void grpc_cq_end_op(grpc_completion_queue *cc, void *tag, int success, void (*done)(void *done_arg, grpc_cq_completion *storage, - grpc_call_list *call_list), + grpc_closure_list *closure_list), void *done_arg, grpc_cq_completion *storage, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { int shutdown; int i; grpc_pollset_worker *pluck_worker; @@ -170,7 +170,8 @@ void grpc_cq_end_op(grpc_completion_queue *cc, void *tag, int success, GPR_ASSERT(cc->shutdown_called); cc->shutdown = 1; gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - grpc_pollset_shutdown(&cc->pollset, &cc->pollset_destroy_done, call_list); + grpc_pollset_shutdown(&cc->pollset, &cc->pollset_destroy_done, + closure_list); } } @@ -180,7 +181,7 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, grpc_pollset_worker worker; int first_loop = 1; gpr_timespec now; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; GPR_ASSERT(!reserved); @@ -199,7 +200,7 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(c->done_arg, c, &call_list); + c->done(c->done_arg, c, &closure_list); break; } if (cc->shutdown) { @@ -216,11 +217,11 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, break; } first_loop = 0; - grpc_pollset_work(&cc->pollset, &worker, now, deadline, &call_list); + grpc_pollset_work(&cc->pollset, &worker, now, deadline, &closure_list); } GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret); GRPC_CQ_INTERNAL_UNREF(cc, "next"); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); return ret; } @@ -257,7 +258,7 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, grpc_pollset_worker worker; gpr_timespec now; int first_loop = 1; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; GPR_ASSERT(!reserved); @@ -279,7 +280,7 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(c->done_arg, c, &call_list); + c->done(c->done_arg, c, &closure_list); goto done; } prev = c; @@ -310,20 +311,20 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, break; } first_loop = 0; - grpc_pollset_work(&cc->pollset, &worker, now, deadline, &call_list); + grpc_pollset_work(&cc->pollset, &worker, now, deadline, &closure_list); del_plucker(cc, tag, &worker); } done: GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret); GRPC_CQ_INTERNAL_UNREF(cc, "pluck"); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); return ret; } /* 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 *cc) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); if (cc->shutdown_called) { gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); @@ -337,9 +338,10 @@ void grpc_completion_queue_shutdown(grpc_completion_queue *cc) { GPR_ASSERT(!cc->shutdown); cc->shutdown = 1; gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - grpc_pollset_shutdown(&cc->pollset, &cc->pollset_destroy_done, &call_list); + grpc_pollset_shutdown(&cc->pollset, &cc->pollset_destroy_done, + &closure_list); } - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } void grpc_completion_queue_destroy(grpc_completion_queue *cc) { diff --git a/src/core/surface/completion_queue.h b/src/core/surface/completion_queue.h index 6d8d1ce9593..7e88b471da0 100644 --- a/src/core/surface/completion_queue.h +++ b/src/core/surface/completion_queue.h @@ -45,7 +45,7 @@ typedef struct grpc_cq_completion { /** 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, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void *done_arg; /** next pointer; low bit is used to indicate success or not */ gpr_uintptr next; @@ -74,9 +74,9 @@ void grpc_cq_begin_op(grpc_completion_queue *cc); /* Queue a GRPC_OP_COMPLETED operation */ void grpc_cq_end_op(grpc_completion_queue *cc, void *tag, int success, void (*done)(void *done_arg, grpc_cq_completion *storage, - grpc_call_list *call_list), + grpc_closure_list *closure_list), void *done_arg, grpc_cq_completion *storage, - grpc_call_list *call_list); + grpc_closure_list *closure_list); grpc_pollset *grpc_cq_pollset(grpc_completion_queue *cc); diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c index 2af028960d7..53334e7c5bf 100644 --- a/src/core/surface/lame_client.c +++ b/src/core/surface/lame_client.c @@ -56,13 +56,13 @@ typedef struct { static void lame_start_transport_stream_op(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; GRPC_CALL_LOG_OP(GPR_INFO, elem, op); if (op->send_ops != NULL) { grpc_stream_ops_unref_owned_objects(op->send_ops->ops, op->send_ops->nops); - op->on_done_send->cb(op->on_done_send->cb_arg, 0, call_list); + op->on_done_send->cb(op->on_done_send->cb_arg, 0, closure_list); } if (op->recv_ops != NULL) { char tmp[GPR_LTOA_MIN_BUFSIZE]; @@ -81,48 +81,49 @@ static void lame_start_transport_stream_op(grpc_call_element *elem, mdb.deadline = gpr_inf_future(GPR_CLOCK_REALTIME); grpc_sopb_add_metadata(op->recv_ops, mdb); *op->recv_state = GRPC_STREAM_CLOSED; - op->on_done_recv->cb(op->on_done_recv->cb_arg, 1, call_list); + op->on_done_recv->cb(op->on_done_recv->cb_arg, 1, closure_list); } if (op->on_consumed != NULL) { - op->on_consumed->cb(op->on_consumed->cb_arg, 0, call_list); + op->on_consumed->cb(op->on_consumed->cb_arg, 0, closure_list); } } -static char *lame_get_peer(grpc_call_element *elem, grpc_call_list *call_list) { +static char *lame_get_peer(grpc_call_element *elem, + grpc_closure_list *closure_list) { channel_data *chand = elem->channel_data; return grpc_channel_get_target(chand->master); } static void lame_start_transport_op(grpc_channel_element *elem, grpc_transport_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (op->on_connectivity_state_change) { GPR_ASSERT(*op->connectivity_state != GRPC_CHANNEL_FATAL_FAILURE); *op->connectivity_state = GRPC_CHANNEL_FATAL_FAILURE; op->on_connectivity_state_change->cb( - op->on_connectivity_state_change->cb_arg, 1, call_list); + op->on_connectivity_state_change->cb_arg, 1, closure_list); } if (op->on_consumed != NULL) { - op->on_consumed->cb(op->on_consumed->cb_arg, 1, call_list); + op->on_consumed->cb(op->on_consumed->cb_arg, 1, closure_list); } } static void init_call_elem(grpc_call_element *elem, const void *transport_server_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (initial_op) { - grpc_transport_stream_op_finish_with_failure(initial_op, call_list); + grpc_transport_stream_op_finish_with_failure(initial_op, closure_list); } } static void destroy_call_elem(grpc_call_element *elem, - grpc_call_list *call_list) {} + grpc_closure_list *closure_list) {} static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *mdctx, int is_first, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { channel_data *chand = elem->channel_data; GPR_ASSERT(is_first); GPR_ASSERT(is_last); @@ -131,7 +132,7 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, } static void destroy_channel_elem(grpc_channel_element *elem, - grpc_call_list *call_list) {} + grpc_closure_list *closure_list) {} static const grpc_channel_filter lame_filter = { lame_start_transport_stream_op, @@ -154,15 +155,15 @@ grpc_channel *grpc_lame_client_channel_create(const char *target, grpc_channel *channel; grpc_channel_element *elem; channel_data *chand; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; static const grpc_channel_filter *filters[] = {&lame_filter}; channel = grpc_channel_create_from_filters( - target, filters, 1, NULL, grpc_mdctx_create(), 1, &call_list); + target, filters, 1, NULL, grpc_mdctx_create(), 1, &closure_list); elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); GPR_ASSERT(elem->filter == &lame_filter); chand = (channel_data *)elem->channel_data; chand->error_code = error_code; chand->error_message = error_message; - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); return channel; } diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index c2d571d955c..45567428e90 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -75,7 +75,8 @@ static void connector_ref(grpc_connector *con) { gpr_ref(&c->refs); } -static void connector_unref(grpc_connector *con, grpc_call_list *call_list) { +static void connector_unref(grpc_connector *con, + grpc_closure_list *closure_list) { connector *c = (connector *)con; if (gpr_unref(&c->refs)) { grpc_mdctx_unref(c->mdctx); @@ -86,7 +87,7 @@ static void connector_unref(grpc_connector *con, grpc_call_list *call_list) { static void on_secure_handshake_done(void *arg, grpc_security_status status, grpc_endpoint *wrapped_endpoint, grpc_endpoint *secure_endpoint, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { connector *c = arg; grpc_closure *notify; gpr_mu_lock(&c->mu); @@ -104,9 +105,9 @@ static void on_secure_handshake_done(void *arg, grpc_security_status status, c->connecting_endpoint = NULL; gpr_mu_unlock(&c->mu); c->result->transport = grpc_create_chttp2_transport( - c->args.channel_args, secure_endpoint, c->mdctx, 1, call_list); + c->args.channel_args, secure_endpoint, c->mdctx, 1, closure_list); grpc_chttp2_transport_start_reading(c->result->transport, NULL, 0, - call_list); + closure_list); c->result->filters = gpr_malloc(sizeof(grpc_channel_filter *) * 2); c->result->filters[0] = &grpc_http_client_filter; c->result->filters[1] = &grpc_client_auth_filter; @@ -114,10 +115,10 @@ static void on_secure_handshake_done(void *arg, grpc_security_status status, } notify = c->notify; c->notify = NULL; - notify->cb(notify->cb_arg, 1, call_list); + notify->cb(notify->cb_arg, 1, closure_list); } -static void connected(void *arg, int success, grpc_call_list *call_list) { +static void connected(void *arg, int success, grpc_closure_list *closure_list) { connector *c = arg; grpc_closure *notify; grpc_endpoint *tcp = c->newly_connecting_endpoint; @@ -128,16 +129,17 @@ static void connected(void *arg, int success, grpc_call_list *call_list) { gpr_mu_unlock(&c->mu); grpc_security_connector_do_handshake(&c->security_connector->base, tcp, on_secure_handshake_done, c, - call_list); + closure_list); } else { memset(c->result, 0, sizeof(*c->result)); notify = c->notify; c->notify = NULL; - notify->cb(notify->cb_arg, 1, call_list); + notify->cb(notify->cb_arg, 1, closure_list); } } -static void connector_shutdown(grpc_connector *con, grpc_call_list *call_list) { +static void connector_shutdown(grpc_connector *con, + grpc_closure_list *closure_list) { connector *c = (connector *)con; grpc_endpoint *ep; gpr_mu_lock(&c->mu); @@ -145,14 +147,15 @@ static void connector_shutdown(grpc_connector *con, grpc_call_list *call_list) { c->connecting_endpoint = NULL; gpr_mu_unlock(&c->mu); if (ep) { - grpc_endpoint_shutdown(ep, call_list); + grpc_endpoint_shutdown(ep, closure_list); } } static void connector_connect(grpc_connector *con, const grpc_connect_in_args *args, grpc_connect_out_args *result, - grpc_closure *notify, grpc_call_list *call_list) { + grpc_closure *notify, + grpc_closure_list *closure_list) { connector *c = (connector *)con; GPR_ASSERT(c->notify == NULL); GPR_ASSERT(notify->cb); @@ -165,7 +168,7 @@ static void connector_connect(grpc_connector *con, grpc_closure_init(&c->connected_closure, connected, c); grpc_tcp_client_connect(&c->connected_closure, &c->newly_connecting_endpoint, args->interested_parties, args->addr, args->addr_len, - args->deadline, call_list); + args->deadline, closure_list); } static const grpc_connector_vtable connector_vtable = { @@ -186,12 +189,12 @@ static void subchannel_factory_ref(grpc_subchannel_factory *scf) { } static void subchannel_factory_unref(grpc_subchannel_factory *scf, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { subchannel_factory *f = (subchannel_factory *)scf; if (gpr_unref(&f->refs)) { GRPC_SECURITY_CONNECTOR_UNREF(&f->security_connector->base, "subchannel_factory"); - GRPC_CHANNEL_INTERNAL_UNREF(f->master, "subchannel_factory", call_list); + GRPC_CHANNEL_INTERNAL_UNREF(f->master, "subchannel_factory", closure_list); grpc_channel_args_destroy(f->merge_args); grpc_mdctx_unref(f->mdctx); gpr_free(f); @@ -200,7 +203,7 @@ static void subchannel_factory_unref(grpc_subchannel_factory *scf, static grpc_subchannel *subchannel_factory_create_subchannel( grpc_subchannel_factory *scf, grpc_subchannel_args *args, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { subchannel_factory *f = (subchannel_factory *)scf; connector *c = gpr_malloc(sizeof(*c)); grpc_channel_args *final_args = @@ -216,7 +219,7 @@ static grpc_subchannel *subchannel_factory_create_subchannel( args->master = f->master; args->mdctx = f->mdctx; s = grpc_subchannel_create(&c->base, args); - grpc_connector_unref(&c->base, call_list); + grpc_connector_unref(&c->base, closure_list); grpc_channel_args_destroy(final_args); return s; } @@ -243,7 +246,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, subchannel_factory *f; #define MAX_FILTERS 3 const grpc_channel_filter *filters[MAX_FILTERS]; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; size_t n = 0; GPR_ASSERT(reserved == NULL); @@ -275,7 +278,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, GPR_ASSERT(n <= MAX_FILTERS); channel = grpc_channel_create_from_filters(target, filters, n, args_copy, - mdctx, 1, &call_list); + mdctx, 1, &closure_list); f = gpr_malloc(sizeof(*f)); f->base.vtable = &subchannel_factory_vtable; @@ -293,9 +296,9 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, } grpc_client_channel_set_resolver(grpc_channel_get_channel_stack(channel), - resolver, &call_list); - GRPC_RESOLVER_UNREF(resolver, "create", &call_list); - grpc_subchannel_factory_unref(&f->base, &call_list); + resolver, &closure_list); + GRPC_RESOLVER_UNREF(resolver, "create", &closure_list); + grpc_subchannel_factory_unref(&f->base, &closure_list); GRPC_SECURITY_CONNECTOR_UNREF(&connector->base, "channel_create"); grpc_channel_args_destroy(args_copy); @@ -303,7 +306,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, grpc_channel_args_destroy(new_args_from_connector); } - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); return channel; } diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 4249e6f9bd0..520065a4841 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -57,9 +57,9 @@ typedef struct listener { void *arg; void (*start)(grpc_server *server, void *arg, grpc_pollset **pollsets, - size_t pollset_count, grpc_call_list *call_list); + size_t pollset_count, grpc_closure_list *closure_list); void (*destroy)(grpc_server *server, void *arg, grpc_closure *closure, - grpc_call_list *call_list); + grpc_closure_list *closure_list); struct listener *next; grpc_closure destroy_done; } listener; @@ -227,13 +227,13 @@ struct grpc_server { (((channel_data *)(elem)->channel_data)->server) static void begin_call(grpc_server *server, call_data *calld, - requested_call *rc, grpc_call_list *call_list); + requested_call *rc, grpc_closure_list *closure_list); static void fail_call(grpc_server *server, requested_call *rc, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Before calling maybe_finish_shutdown, we must hold mu_global and not hold mu_call */ static void maybe_finish_shutdown(grpc_server *server, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* * channel broadcaster @@ -261,14 +261,15 @@ struct shutdown_cleanup_args { }; static void shutdown_cleanup(void *arg, int iomgr_status_ignored, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { struct shutdown_cleanup_args *a = arg; gpr_slice_unref(a->slice); gpr_free(a); } static void send_shutdown(grpc_channel *channel, int send_goaway, - int send_disconnect, grpc_call_list *call_list) { + int send_disconnect, + grpc_closure_list *closure_list) { grpc_transport_op op; struct shutdown_cleanup_args *sc; grpc_channel_element *elem; @@ -284,17 +285,17 @@ static void send_shutdown(grpc_channel *channel, int send_goaway, op.on_consumed = &sc->closure; elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - elem->filter->start_transport_op(elem, &op, call_list); + elem->filter->start_transport_op(elem, &op, closure_list); } static void channel_broadcaster_shutdown(channel_broadcaster *cb, int send_goaway, int force_disconnect, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t i; for (i = 0; i < cb->num_channels; i++) { - send_shutdown(cb->channels[i], send_goaway, force_disconnect, call_list); - GRPC_CHANNEL_INTERNAL_UNREF(cb->channels[i], "broadcast", call_list); + send_shutdown(cb->channels[i], send_goaway, force_disconnect, closure_list); + GRPC_CHANNEL_INTERNAL_UNREF(cb->channels[i], "broadcast", closure_list); } gpr_free(cb->channels); } @@ -314,12 +315,13 @@ static void request_matcher_destroy(request_matcher *request_matcher) { gpr_stack_lockfree_destroy(request_matcher->requests); } -static void kill_zombie(void *elem, int success, grpc_call_list *call_list) { +static void kill_zombie(void *elem, int success, + grpc_closure_list *closure_list) { grpc_call_destroy(grpc_call_from_top_element(elem)); } static void request_matcher_zombify_all_pending_calls( - request_matcher *request_matcher, grpc_call_list *call_list) { + request_matcher *request_matcher, grpc_closure_list *closure_list) { while (request_matcher->pending_head) { call_data *calld = request_matcher->pending_head; request_matcher->pending_head = calld->pending_next; @@ -329,16 +331,16 @@ static void request_matcher_zombify_all_pending_calls( grpc_closure_init( &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0)); - grpc_call_list_add(call_list, &calld->kill_zombie_closure, 1); + grpc_closure_list_add(closure_list, &calld->kill_zombie_closure, 1); } } static void request_matcher_kill_requests(grpc_server *server, request_matcher *rm, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { int request_id; while ((request_id = gpr_stack_lockfree_pop(rm->requests)) != -1) { - fail_call(server, &server->requested_calls[request_id], call_list); + fail_call(server, &server->requested_calls[request_id], closure_list); } } @@ -350,7 +352,8 @@ static void server_ref(grpc_server *server) { gpr_ref(&server->internal_refcount); } -static void server_delete(grpc_server *server, grpc_call_list *call_list) { +static void server_delete(grpc_server *server, + grpc_closure_list *closure_list) { registered_method *rm; size_t i; grpc_channel_args_destroy(server->channel_args); @@ -376,9 +379,9 @@ static void server_delete(grpc_server *server, grpc_call_list *call_list) { gpr_free(server); } -static void server_unref(grpc_server *server, grpc_call_list *call_list) { +static void server_unref(grpc_server *server, grpc_closure_list *closure_list) { if (gpr_unref(&server->internal_refcount)) { - server_delete(server, call_list); + server_delete(server, closure_list); } } @@ -393,28 +396,30 @@ static void orphan_channel(channel_data *chand) { } static void finish_destroy_channel(void *cd, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { channel_data *chand = cd; grpc_server *server = chand->server; gpr_log(GPR_DEBUG, "finish_destroy_channel: %p", chand->channel); - GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "server", call_list); - server_unref(server, call_list); + GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "server", closure_list); + server_unref(server, closure_list); } -static void destroy_channel(channel_data *chand, grpc_call_list *call_list) { +static void destroy_channel(channel_data *chand, + grpc_closure_list *closure_list) { if (is_channel_orphaned(chand)) return; GPR_ASSERT(chand->server != NULL); orphan_channel(chand); server_ref(chand->server); - maybe_finish_shutdown(chand->server, call_list); + maybe_finish_shutdown(chand->server, closure_list); chand->finish_destroy_channel_closure.cb = finish_destroy_channel; chand->finish_destroy_channel_closure.cb_arg = chand; - grpc_call_list_add(call_list, &chand->finish_destroy_channel_closure, 1); + grpc_closure_list_add(closure_list, &chand->finish_destroy_channel_closure, + 1); } static void finish_start_new_rpc(grpc_server *server, grpc_call_element *elem, request_matcher *request_matcher, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; int request_id; @@ -423,7 +428,7 @@ static void finish_start_new_rpc(grpc_server *server, grpc_call_element *elem, calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); - grpc_call_list_add(call_list, &calld->kill_zombie_closure, 1); + grpc_closure_list_add(closure_list, &calld->kill_zombie_closure, 1); return; } @@ -445,11 +450,13 @@ static void finish_start_new_rpc(grpc_server *server, grpc_call_element *elem, gpr_mu_lock(&calld->mu_state); calld->state = ACTIVATED; gpr_mu_unlock(&calld->mu_state); - begin_call(server, calld, &server->requested_calls[request_id], call_list); + begin_call(server, calld, &server->requested_calls[request_id], + closure_list); } } -static void start_new_rpc(grpc_call_element *elem, grpc_call_list *call_list) { +static void start_new_rpc(grpc_call_element *elem, + grpc_closure_list *closure_list) { channel_data *chand = elem->channel_data; call_data *calld = elem->call_data; grpc_server *server = chand->server; @@ -469,7 +476,7 @@ static void start_new_rpc(grpc_call_element *elem, grpc_call_list *call_list) { if (rm->method != calld->path) continue; finish_start_new_rpc(server, elem, &rm->server_registered_method->request_matcher, - call_list); + closure_list); return; } /* check for a wildcard method definition (no host set) */ @@ -482,12 +489,12 @@ static void start_new_rpc(grpc_call_element *elem, grpc_call_list *call_list) { if (rm->method != calld->path) continue; finish_start_new_rpc(server, elem, &rm->server_registered_method->request_matcher, - call_list); + closure_list); return; } } finish_start_new_rpc(server, elem, &server->unregistered_request_matcher, - call_list); + closure_list); } static int num_listeners(grpc_server *server) { @@ -500,8 +507,8 @@ static int num_listeners(grpc_server *server) { } static void done_shutdown_event(void *server, grpc_cq_completion *completion, - grpc_call_list *call_list) { - server_unref(server, call_list); + grpc_closure_list *closure_list) { + server_unref(server, closure_list); } static int num_channels(grpc_server *server) { @@ -515,26 +522,27 @@ static int num_channels(grpc_server *server) { } static void kill_pending_work_locked(grpc_server *server, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { registered_method *rm; request_matcher_kill_requests(server, &server->unregistered_request_matcher, - call_list); + closure_list); request_matcher_zombify_all_pending_calls( - &server->unregistered_request_matcher, call_list); + &server->unregistered_request_matcher, closure_list); for (rm = server->registered_methods; rm; rm = rm->next) { - request_matcher_kill_requests(server, &rm->request_matcher, call_list); - request_matcher_zombify_all_pending_calls(&rm->request_matcher, call_list); + request_matcher_kill_requests(server, &rm->request_matcher, closure_list); + request_matcher_zombify_all_pending_calls(&rm->request_matcher, + closure_list); } } static void maybe_finish_shutdown(grpc_server *server, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t i; if (!gpr_atm_acq_load(&server->shutdown_flag) || server->shutdown_published) { return; } - kill_pending_work_locked(server, call_list); + kill_pending_work_locked(server, closure_list); if (server->root_channel_data.next != &server->root_channel_data || server->listeners_destroyed < num_listeners(server)) { @@ -556,7 +564,7 @@ static void maybe_finish_shutdown(grpc_server *server, server_ref(server); grpc_cq_end_op(server->shutdown_tags[i].cq, server->shutdown_tags[i].tag, 1, done_shutdown_event, server, - &server->shutdown_tags[i].completion, call_list); + &server->shutdown_tags[i].completion, closure_list); } } @@ -574,7 +582,8 @@ static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { return md; } -static void server_on_recv(void *ptr, int success, grpc_call_list *call_list) { +static void server_on_recv(void *ptr, int success, + grpc_closure_list *closure_list) { grpc_call_element *elem = ptr; call_data *calld = elem->call_data; gpr_timespec op_deadline; @@ -594,7 +603,7 @@ static void server_on_recv(void *ptr, int success, grpc_call_list *call_list) { } if (calld->host && calld->path) { calld->got_initial_metadata = 1; - start_new_rpc(elem, call_list); + start_new_rpc(elem, closure_list); } break; } @@ -611,7 +620,7 @@ static void server_on_recv(void *ptr, int success, grpc_call_list *call_list) { calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); - grpc_call_list_add(call_list, &calld->kill_zombie_closure, 1); + grpc_closure_list_add(closure_list, &calld->kill_zombie_closure, 1); } else { gpr_mu_unlock(&calld->mu_state); } @@ -622,7 +631,7 @@ static void server_on_recv(void *ptr, int success, grpc_call_list *call_list) { calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); - grpc_call_list_add(call_list, &calld->kill_zombie_closure, 1); + grpc_closure_list_add(closure_list, &calld->kill_zombie_closure, 1); } else if (calld->state == PENDING) { calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); @@ -634,7 +643,7 @@ static void server_on_recv(void *ptr, int success, grpc_call_list *call_list) { break; } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, call_list); + calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, closure_list); } static void server_mutate_op(grpc_call_element *elem, @@ -652,10 +661,10 @@ static void server_mutate_op(grpc_call_element *elem, static void server_start_transport_stream_op(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { GRPC_CALL_LOG_OP(GPR_INFO, elem, op); server_mutate_op(elem, op); - grpc_call_next_op(elem, op, call_list); + grpc_call_next_op(elem, op, closure_list); } static void accept_stream(void *cd, grpc_transport *transport, @@ -667,7 +676,7 @@ static void accept_stream(void *cd, grpc_transport *transport, } static void channel_connectivity_changed(void *cd, int iomgr_status_ignored, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { channel_data *chand = cd; grpc_server *server = chand->server; if (chand->connectivity_state != GRPC_CHANNEL_FATAL_FAILURE) { @@ -677,19 +686,19 @@ static void channel_connectivity_changed(void *cd, int iomgr_status_ignored, op.connectivity_state = &chand->connectivity_state; grpc_channel_next_op(grpc_channel_stack_element( grpc_channel_get_channel_stack(chand->channel), 0), - &op, call_list); + &op, closure_list); } else { gpr_mu_lock(&server->mu_global); - destroy_channel(chand, call_list); + destroy_channel(chand, closure_list); gpr_mu_unlock(&server->mu_global); - GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "connectivity", call_list); + GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "connectivity", closure_list); } } static void init_call_elem(grpc_call_element *elem, const void *server_transport_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; memset(calld, 0, sizeof(call_data)); @@ -705,7 +714,7 @@ static void init_call_elem(grpc_call_element *elem, } static void destroy_call_elem(grpc_call_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { channel_data *chand = elem->channel_data; call_data *calld = elem->call_data; @@ -720,13 +729,13 @@ static void destroy_call_elem(grpc_call_element *elem, gpr_mu_destroy(&calld->mu_state); - server_unref(chand->server, call_list); + server_unref(chand->server, closure_list); } static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *metadata_context, int is_first, - int is_last, grpc_call_list *call_list) { + int is_last, grpc_closure_list *closure_list) { channel_data *chand = elem->channel_data; GPR_ASSERT(is_first); GPR_ASSERT(!is_last); @@ -743,7 +752,7 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, } static void destroy_channel_elem(grpc_channel_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t i; channel_data *chand = elem->channel_data; if (chand->registered_methods) { @@ -762,11 +771,11 @@ 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, call_list); + maybe_finish_shutdown(chand->server, closure_list); gpr_mu_unlock(&chand->server->mu_global); GRPC_MDSTR_UNREF(chand->path_key); GRPC_MDSTR_UNREF(chand->authority_key); - server_unref(chand->server, call_list); + server_unref(chand->server, closure_list); } } @@ -890,7 +899,7 @@ void *grpc_server_register_method(grpc_server *server, const char *method, void grpc_server_start(grpc_server *server) { listener *l; size_t i; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; server->pollsets = gpr_malloc(sizeof(grpc_pollset *) * server->cq_count); for (i = 0; i < server->cq_count; i++) { @@ -898,17 +907,17 @@ void grpc_server_start(grpc_server *server) { } for (l = server->listeners; l; l = l->next) { - l->start(server, l->arg, server->pollsets, server->cq_count, &call_list); + l->start(server, l->arg, server->pollsets, server->cq_count, &closure_list); } - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } void grpc_server_setup_transport(grpc_server *s, grpc_transport *transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx *mdctx, const grpc_channel_args *args, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t num_filters = s->channel_filter_count + num_extra_filters + 1; grpc_channel_filter const **filters = gpr_malloc(sizeof(grpc_channel_filter *) * num_filters); @@ -938,11 +947,11 @@ void grpc_server_setup_transport(grpc_server *s, grpc_transport *transport, for (i = 0; i < s->cq_count; i++) { memset(&op, 0, sizeof(op)); op.bind_pollset = grpc_cq_pollset(s->cqs[i]); - grpc_transport_perform_op(transport, &op, call_list); + grpc_transport_perform_op(transport, &op, closure_list); } channel = grpc_channel_create_from_filters(NULL, filters, num_filters, args, - mdctx, 0, call_list); + mdctx, 0, closure_list); chand = (channel_data *)grpc_channel_stack_element( grpc_channel_get_channel_stack(channel), 0) ->channel_data; @@ -998,21 +1007,21 @@ void grpc_server_setup_transport(grpc_server *s, grpc_transport *transport, op.on_connectivity_state_change = &chand->channel_connectivity_changed; op.connectivity_state = &chand->connectivity_state; op.disconnect = gpr_atm_acq_load(&s->shutdown_flag) != 0; - grpc_transport_perform_op(transport, &op, call_list); + grpc_transport_perform_op(transport, &op, closure_list); } void done_published_shutdown(void *done_arg, grpc_cq_completion *storage, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { (void) done_arg; gpr_free(storage); } static void listener_destroy_done(void *s, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_server *server = s; gpr_mu_lock(&server->mu_global); server->listeners_destroyed++; - maybe_finish_shutdown(server, call_list); + maybe_finish_shutdown(server, closure_list); gpr_mu_unlock(&server->mu_global); } @@ -1021,7 +1030,7 @@ void grpc_server_shutdown_and_notify(grpc_server *server, listener *l; shutdown_tag *sdt; channel_broadcaster broadcaster; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; GRPC_SERVER_LOG_SHUTDOWN(GPR_INFO, server, cq, tag); @@ -1030,7 +1039,7 @@ void grpc_server_shutdown_and_notify(grpc_server *server, grpc_cq_begin_op(cq); if (server->shutdown_published) { grpc_cq_end_op(cq, tag, 1, done_published_shutdown, NULL, - gpr_malloc(sizeof(grpc_cq_completion)), &call_list); + gpr_malloc(sizeof(grpc_cq_completion)), &closure_list); gpr_mu_unlock(&server->mu_global); goto done; } @@ -1051,40 +1060,40 @@ 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, &call_list); + kill_pending_work_locked(server, &closure_list); gpr_mu_unlock(&server->mu_call); gpr_atm_rel_store(&server->shutdown_flag, 1); - maybe_finish_shutdown(server, &call_list); + maybe_finish_shutdown(server, &closure_list); 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); - l->destroy(server, l->arg, &l->destroy_done, &call_list); + l->destroy(server, l->arg, &l->destroy_done, &closure_list); } - channel_broadcaster_shutdown(&broadcaster, 1, 0, &call_list); + channel_broadcaster_shutdown(&broadcaster, 1, 0, &closure_list); done: - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } void grpc_server_cancel_all_calls(grpc_server *server) { channel_broadcaster broadcaster; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_mu_lock(&server->mu_global); channel_broadcaster_init(server, &broadcaster); gpr_mu_unlock(&server->mu_global); - channel_broadcaster_shutdown(&broadcaster, 0, 1, &call_list); - grpc_call_list_run(&call_list); + channel_broadcaster_shutdown(&broadcaster, 0, 1, &closure_list); + grpc_closure_list_run(&closure_list); } void grpc_server_destroy(grpc_server *server) { listener *l; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_mu_lock(&server->mu_global); GPR_ASSERT(gpr_atm_acq_load(&server->shutdown_flag) || !server->listeners); @@ -1098,17 +1107,17 @@ void grpc_server_destroy(grpc_server *server) { gpr_mu_unlock(&server->mu_global); - server_unref(server, &call_list); - grpc_call_list_run(&call_list); + server_unref(server, &closure_list); + grpc_closure_list_run(&closure_list); } void grpc_server_add_listener( grpc_server *server, void *arg, void (*start)(grpc_server *server, void *arg, grpc_pollset **pollsets, - size_t pollset_count, grpc_call_list *call_list), + size_t pollset_count, grpc_closure_list *closure_list), void (*destroy)(grpc_server *server, void *arg, grpc_closure *on_done, - grpc_call_list *call_list), - grpc_call_list *call_list) { + grpc_closure_list *closure_list), + grpc_closure_list *closure_list) { listener *l = gpr_malloc(sizeof(listener)); l->arg = arg; l->start = start; @@ -1119,18 +1128,18 @@ void grpc_server_add_listener( static grpc_call_error queue_call_request(grpc_server *server, requested_call *rc, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { call_data *calld = NULL; request_matcher *request_matcher = NULL; int request_id; if (gpr_atm_acq_load(&server->shutdown_flag)) { - fail_call(server, rc, call_list); + fail_call(server, rc, closure_list); return GRPC_CALL_OK; } request_id = gpr_stack_lockfree_pop(server->request_freelist); if (request_id == -1) { /* out of request ids: just fail this one */ - fail_call(server, rc, call_list); + fail_call(server, rc, closure_list); return GRPC_CALL_OK; } switch (rc->type) { @@ -1158,13 +1167,13 @@ static grpc_call_error queue_call_request(grpc_server *server, grpc_closure_init( &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0)); - grpc_call_list_add(call_list, &calld->kill_zombie_closure, 1); + grpc_closure_list_add(closure_list, &calld->kill_zombie_closure, 1); } else { GPR_ASSERT(calld->state == PENDING); calld->state = ACTIVATED; gpr_mu_unlock(&calld->mu_state); begin_call(server, calld, &server->requested_calls[request_id], - call_list); + closure_list); } gpr_mu_lock(&server->mu_call); } @@ -1179,7 +1188,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_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; requested_call *rc = gpr_malloc(sizeof(*rc)); GRPC_SERVER_LOG_REQUEST_CALL(GPR_INFO, server, call, details, initial_metadata, cq_bound_to_call, @@ -1199,9 +1208,9 @@ grpc_call_error grpc_server_request_call( rc->call = call; rc->data.batch.details = details; rc->data.batch.initial_metadata = initial_metadata; - error = queue_call_request(server, rc, &call_list); + error = queue_call_request(server, rc, &closure_list); done: - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); return error; } @@ -1211,7 +1220,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_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; requested_call *rc = gpr_malloc(sizeof(*rc)); registered_method *registered_method = rm; if (!grpc_cq_is_server_cq(cq_for_notification)) { @@ -1230,16 +1239,16 @@ grpc_call_error grpc_server_request_registered_call( rc->data.registered.deadline = deadline; rc->data.registered.initial_metadata = initial_metadata; rc->data.registered.optional_payload = optional_payload; - error = queue_call_request(server, rc, &call_list); + error = queue_call_request(server, rc, &closure_list); done: - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); return error; } static void publish_registered_or_batch(grpc_call *call, int success, void *tag, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static void publish_was_not_set(grpc_call *call, int success, void *tag, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { abort(); } @@ -1255,7 +1264,7 @@ static void cpstr(char **dest, size_t *capacity, grpc_mdstr *value) { } static void begin_call(grpc_server *server, call_data *calld, - requested_call *rc, grpc_call_list *call_list) { + requested_call *rc, grpc_closure_list *closure_list) { grpc_ioreq_completion_func publish = publish_was_not_set; grpc_ioreq req[2]; grpc_ioreq *r = req; @@ -1266,7 +1275,8 @@ static void begin_call(grpc_server *server, call_data *calld, fill in the metadata array passed by the client, we need to perform an ioreq op, that should complete immediately. */ - grpc_call_set_completion_queue(calld->call, rc->cq_bound_to_call, call_list); + grpc_call_set_completion_queue(calld->call, rc->cq_bound_to_call, + closure_list); *rc->call = calld->call; calld->cq_new = rc->cq_for_notification; switch (rc->type) { @@ -1302,11 +1312,11 @@ static void begin_call(grpc_server *server, call_data *calld, GRPC_CALL_INTERNAL_REF(calld->call, "server"); grpc_call_start_ioreq_and_call_back(calld->call, req, (size_t)(r - req), - publish, rc, call_list); + publish, rc, closure_list); } static void done_request_event(void *req, grpc_cq_completion *c, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { requested_call *rc = req; grpc_server *server = rc->server; @@ -1319,11 +1329,11 @@ static void done_request_event(void *req, grpc_cq_completion *c, gpr_free(req); } - server_unref(server, call_list); + server_unref(server, closure_list); } static void fail_call(grpc_server *server, requested_call *rc, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { *rc->call = NULL; switch (rc->type) { case BATCH_CALL: @@ -1335,11 +1345,11 @@ static void fail_call(grpc_server *server, requested_call *rc, } server_ref(server); grpc_cq_end_op(rc->cq_for_notification, rc->tag, 0, done_request_event, rc, - &rc->completion, call_list); + &rc->completion, closure_list); } static void publish_registered_or_batch(grpc_call *call, int success, void *prc, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_call_element *elem = grpc_call_stack_element(grpc_call_get_call_stack(call), 0); requested_call *rc = prc; @@ -1347,8 +1357,8 @@ static void publish_registered_or_batch(grpc_call *call, int success, void *prc, channel_data *chand = elem->channel_data; server_ref(chand->server); grpc_cq_end_op(calld->cq_new, rc->tag, success, done_request_event, rc, - &rc->completion, call_list); - GRPC_CALL_INTERNAL_UNREF(call, "server", call_list); + &rc->completion, closure_list); + GRPC_CALL_INTERNAL_UNREF(call, "server", closure_list); } const grpc_channel_args *grpc_server_get_channel_args(grpc_server *server) { diff --git a/src/core/surface/server.h b/src/core/surface/server.h index d08a0386397..985fb01893e 100644 --- a/src/core/surface/server.h +++ b/src/core/surface/server.h @@ -48,10 +48,10 @@ grpc_server *grpc_server_create_from_filters( void grpc_server_add_listener( grpc_server *server, void *listener, void (*start)(grpc_server *server, void *arg, grpc_pollset **pollsets, - size_t npollsets, grpc_call_list *call_list), + size_t npollsets, grpc_closure_list *closure_list), void (*destroy)(grpc_server *server, void *arg, grpc_closure *on_done, - grpc_call_list *call_list), - grpc_call_list *call_list); + grpc_closure_list *closure_list), + grpc_closure_list *closure_list); /* Setup a transport - creates a channel stack, binds the transport to the server */ @@ -59,7 +59,7 @@ void grpc_server_setup_transport(grpc_server *server, grpc_transport *transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx *mdctx, const grpc_channel_args *args, - grpc_call_list *call_list); + grpc_closure_list *closure_list); const grpc_channel_args *grpc_server_get_channel_args(grpc_server *server); diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c index 395c88827d4..ad44aed73ba 100644 --- a/src/core/surface/server_chttp2.c +++ b/src/core/surface/server_chttp2.c @@ -43,16 +43,17 @@ #include static void setup_transport(void *server, grpc_transport *transport, - grpc_mdctx *mdctx, grpc_call_list *call_list) { + grpc_mdctx *mdctx, + grpc_closure_list *closure_list) { static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; - grpc_server_setup_transport(server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, - grpc_server_get_channel_args(server), call_list); + grpc_server_setup_transport( + server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, + grpc_server_get_channel_args(server), closure_list); } static void new_transport(void *server, grpc_endpoint *tcp, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { /* * Beware that the call to grpc_create_chttp2_transport() has to happen before * grpc_tcp_server_destroy(). This is fine here, but similar code @@ -62,25 +63,25 @@ static void new_transport(void *server, grpc_endpoint *tcp, */ grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_transport *transport = grpc_create_chttp2_transport( - grpc_server_get_channel_args(server), tcp, mdctx, 0, call_list); - setup_transport(server, transport, mdctx, call_list); - grpc_chttp2_transport_start_reading(transport, NULL, 0, call_list); + grpc_server_get_channel_args(server), tcp, mdctx, 0, closure_list); + setup_transport(server, transport, mdctx, closure_list); + grpc_chttp2_transport_start_reading(transport, NULL, 0, closure_list); } /* Server callback: start listening on our ports */ static void start(grpc_server *server, void *tcpp, grpc_pollset **pollsets, - size_t pollset_count, grpc_call_list *call_list) { + size_t pollset_count, grpc_closure_list *closure_list) { grpc_tcp_server *tcp = tcpp; grpc_tcp_server_start(tcp, pollsets, pollset_count, new_transport, server, - call_list); + closure_list); } /* Server callback: destroy the tcp listener (so we don't generate further callbacks) */ static void destroy(grpc_server *server, void *tcpp, grpc_closure *destroy_done, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_tcp_server *tcp = tcpp; - grpc_tcp_server_destroy(tcp, destroy_done, call_list); + grpc_tcp_server_destroy(tcp, destroy_done, closure_list); } int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) { @@ -90,7 +91,7 @@ int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) { unsigned count = 0; int port_num = -1; int port_temp; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; resolved = grpc_blocking_resolve_address(addr, "http"); if (!resolved) { @@ -127,7 +128,7 @@ int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) { grpc_resolved_addresses_destroy(resolved); /* Register with the server only upon success */ - grpc_server_add_listener(server, tcp, start, destroy, &call_list); + grpc_server_add_listener(server, tcp, start, destroy, &closure_list); goto done; /* Error path: cleanup and return */ @@ -141,6 +142,6 @@ error: port_num = 0; done: - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); return port_num; } diff --git a/src/core/transport/chttp2/frame_data.c b/src/core/transport/chttp2/frame_data.c index ef12c910cd7..a58189a1366 100644 --- a/src/core/transport/chttp2/frame_data.c +++ b/src/core/transport/chttp2/frame_data.c @@ -72,7 +72,7 @@ grpc_chttp2_parse_error grpc_chttp2_data_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_data_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; diff --git a/src/core/transport/chttp2/frame_data.h b/src/core/transport/chttp2/frame_data.h index 7530f0f6446..89a503eb7ca 100644 --- a/src/core/transport/chttp2/frame_data.h +++ b/src/core/transport/chttp2/frame_data.h @@ -76,7 +76,7 @@ grpc_chttp2_parse_error grpc_chttp2_data_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_data_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* create a slice with an empty data frame and is_last set */ gpr_slice grpc_chttp2_data_frame_create_empty_close(gpr_uint32 id); diff --git a/src/core/transport/chttp2/frame_goaway.c b/src/core/transport/chttp2/frame_goaway.c index 1c2bce6736d..d338b566112 100644 --- a/src/core/transport/chttp2/frame_goaway.c +++ b/src/core/transport/chttp2/frame_goaway.c @@ -65,7 +65,7 @@ grpc_chttp2_parse_error grpc_chttp2_goaway_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_goaway_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; diff --git a/src/core/transport/chttp2/frame_goaway.h b/src/core/transport/chttp2/frame_goaway.h index ec991f43503..6f9ce94a0cb 100644 --- a/src/core/transport/chttp2/frame_goaway.h +++ b/src/core/transport/chttp2/frame_goaway.h @@ -68,7 +68,7 @@ grpc_chttp2_parse_error grpc_chttp2_goaway_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_goaway_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_chttp2_goaway_append(gpr_uint32 last_stream_id, gpr_uint32 error_code, gpr_slice debug_data, diff --git a/src/core/transport/chttp2/frame_ping.c b/src/core/transport/chttp2/frame_ping.c index 2fb8850a459..d4bf43eb37c 100644 --- a/src/core/transport/chttp2/frame_ping.c +++ b/src/core/transport/chttp2/frame_ping.c @@ -71,7 +71,7 @@ grpc_chttp2_parse_error grpc_chttp2_ping_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; @@ -90,7 +90,7 @@ grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse( for (ping = transport_parsing->pings.next; ping != &transport_parsing->pings; ping = ping->next) { if (0 == memcmp(p->opaque_8bytes, ping->id, 8)) { - grpc_call_list_add(call_list, ping->on_recv, 1); + grpc_closure_list_add(closure_list, ping->on_recv, 1); } ping->next->prev = ping->prev; ping->prev->next = ping->next; diff --git a/src/core/transport/chttp2/frame_ping.h b/src/core/transport/chttp2/frame_ping.h index 70e19eb8ab7..fb31147ed45 100644 --- a/src/core/transport/chttp2/frame_ping.h +++ b/src/core/transport/chttp2/frame_ping.h @@ -51,6 +51,6 @@ grpc_chttp2_parse_error grpc_chttp2_ping_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_PING_H */ diff --git a/src/core/transport/chttp2/frame_rst_stream.c b/src/core/transport/chttp2/frame_rst_stream.c index 7cf8abe88f7..4d8323c11dd 100644 --- a/src/core/transport/chttp2/frame_rst_stream.c +++ b/src/core/transport/chttp2/frame_rst_stream.c @@ -73,7 +73,7 @@ grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; diff --git a/src/core/transport/chttp2/frame_rst_stream.h b/src/core/transport/chttp2/frame_rst_stream.h index 17d57fae5e2..05d9e560f4e 100644 --- a/src/core/transport/chttp2/frame_rst_stream.h +++ b/src/core/transport/chttp2/frame_rst_stream.h @@ -50,6 +50,6 @@ grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_RST_STREAM_H */ diff --git a/src/core/transport/chttp2/frame_settings.c b/src/core/transport/chttp2/frame_settings.c index 78bd4bb09dd..235ff5a352f 100644 --- a/src/core/transport/chttp2/frame_settings.c +++ b/src/core/transport/chttp2/frame_settings.c @@ -140,7 +140,7 @@ grpc_chttp2_parse_error grpc_chttp2_settings_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_settings_parser_parse( void *p, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_chttp2_settings_parser *parser = p; const gpr_uint8 *cur = GPR_SLICE_START_PTR(slice); const gpr_uint8 *end = GPR_SLICE_END_PTR(slice); diff --git a/src/core/transport/chttp2/frame_settings.h b/src/core/transport/chttp2/frame_settings.h index a04a28b7da8..7931b8b2ca1 100644 --- a/src/core/transport/chttp2/frame_settings.h +++ b/src/core/transport/chttp2/frame_settings.h @@ -97,6 +97,6 @@ grpc_chttp2_parse_error grpc_chttp2_settings_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_settings_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_SETTINGS_H */ diff --git a/src/core/transport/chttp2/frame_window_update.c b/src/core/transport/chttp2/frame_window_update.c index 51eb2613469..b0f5f8698bd 100644 --- a/src/core/transport/chttp2/frame_window_update.c +++ b/src/core/transport/chttp2/frame_window_update.c @@ -76,7 +76,7 @@ grpc_chttp2_parse_error grpc_chttp2_window_update_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_window_update_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; diff --git a/src/core/transport/chttp2/frame_window_update.h b/src/core/transport/chttp2/frame_window_update.h index 7f1168e551d..08931044e48 100644 --- a/src/core/transport/chttp2/frame_window_update.h +++ b/src/core/transport/chttp2/frame_window_update.h @@ -53,6 +53,6 @@ grpc_chttp2_parse_error grpc_chttp2_window_update_parser_begin_frame( grpc_chttp2_parse_error grpc_chttp2_window_update_parser_parse( void *parser, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_WINDOW_UPDATE_H */ diff --git a/src/core/transport/chttp2/hpack_parser.c b/src/core/transport/chttp2/hpack_parser.c index e3b8e54e8d4..e66a918fcdc 100644 --- a/src/core/transport/chttp2/hpack_parser.c +++ b/src/core/transport/chttp2/hpack_parser.c @@ -1380,7 +1380,7 @@ int grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser *p, grpc_chttp2_parse_error grpc_chttp2_header_parser_parse( void *hpack_parser, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_chttp2_hpack_parser *parser = hpack_parser; if (!grpc_chttp2_hpack_parser_parse(parser, GPR_SLICE_START_PTR(slice), GPR_SLICE_END_PTR(slice))) { diff --git a/src/core/transport/chttp2/hpack_parser.h b/src/core/transport/chttp2/hpack_parser.h index c9ae6a97675..946f8e34ef5 100644 --- a/src/core/transport/chttp2/hpack_parser.h +++ b/src/core/transport/chttp2/hpack_parser.h @@ -110,6 +110,6 @@ int grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser *p, grpc_chttp2_parse_error grpc_chttp2_header_parser_parse( void *hpack_parser, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_HPACK_PARSER_H */ diff --git a/src/core/transport/chttp2/internal.h b/src/core/transport/chttp2/internal.h index b9dbbc25eef..14a6c909ee0 100644 --- a/src/core/transport/chttp2/internal.h +++ b/src/core/transport/chttp2/internal.h @@ -268,7 +268,7 @@ struct grpc_chttp2_transport_parsing { grpc_chttp2_parse_error (*parser)( void *parser_user_data, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* received settings */ gpr_uint32 settings[GRPC_CHTTP2_NUM_SETTINGS]; @@ -469,22 +469,22 @@ int grpc_chttp2_unlocking_check_writes(grpc_chttp2_transport_global *global, grpc_chttp2_transport_writing *writing); void grpc_chttp2_perform_writes( grpc_chttp2_transport_writing *transport_writing, grpc_endpoint *endpoint, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_chttp2_terminate_writing(void *transport_writing, int success, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_chttp2_cleanup_writing(grpc_chttp2_transport_global *global, grpc_chttp2_transport_writing *writing, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_chttp2_prepare_to_read(grpc_chttp2_transport_global *global, grpc_chttp2_transport_parsing *parsing); /** 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 */ int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, - gpr_slice slice, grpc_call_list *call_list); + gpr_slice slice, grpc_closure_list *closure_list); void grpc_chttp2_publish_reads(grpc_chttp2_transport_global *global, grpc_chttp2_transport_parsing *parsing, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** Get a writable stream returns non-zero if there was a stream available */ @@ -577,7 +577,7 @@ grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream( void grpc_chttp2_add_incoming_goaway( grpc_chttp2_transport_global *transport_global, gpr_uint32 goaway_error, - gpr_slice goaway_text, grpc_call_list *call_list); + gpr_slice goaway_text, grpc_closure_list *closure_list); void grpc_chttp2_register_stream(grpc_chttp2_transport *t, grpc_chttp2_stream *s); diff --git a/src/core/transport/chttp2/parsing.c b/src/core/transport/chttp2/parsing.c index 2d95963f1fd..f6ce35f9acc 100644 --- a/src/core/transport/chttp2/parsing.c +++ b/src/core/transport/chttp2/parsing.c @@ -60,7 +60,7 @@ static int init_skip_frame_parser( static int parse_frame_slice(grpc_chttp2_transport_parsing *transport_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_chttp2_prepare_to_read( grpc_chttp2_transport_global *transport_global, @@ -93,7 +93,7 @@ void grpc_chttp2_prepare_to_read( void grpc_chttp2_publish_reads(grpc_chttp2_transport_global *transport_global, grpc_chttp2_transport_parsing *transport_parsing, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_chttp2_stream_global *stream_global; grpc_chttp2_stream_parsing *stream_parsing; @@ -131,9 +131,9 @@ void grpc_chttp2_publish_reads(grpc_chttp2_transport_global *transport_global, /* move goaway to the global state if we received one (it will be published later */ if (transport_parsing->goaway_received) { - grpc_chttp2_add_incoming_goaway(transport_global, - (gpr_uint32)transport_parsing->goaway_error, - transport_parsing->goaway_text, call_list); + grpc_chttp2_add_incoming_goaway( + transport_global, (gpr_uint32)transport_parsing->goaway_error, + transport_parsing->goaway_text, closure_list); transport_parsing->goaway_text = gpr_empty_slice(); transport_parsing->goaway_received = 0; } @@ -236,7 +236,7 @@ void grpc_chttp2_publish_reads(grpc_chttp2_transport_global *transport_global, } int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, - gpr_slice slice, grpc_call_list *call_list) { + gpr_slice slice, grpc_closure_list *closure_list) { gpr_uint8 *beg = GPR_SLICE_START_PTR(slice); gpr_uint8 *end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; @@ -366,7 +366,7 @@ int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, } if (transport_parsing->incoming_frame_size == 0) { if (!parse_frame_slice(transport_parsing, gpr_empty_slice(), 1, - call_list)) { + closure_list)) { return 0; } transport_parsing->incoming_stream = NULL; @@ -386,7 +386,7 @@ int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, if (!parse_frame_slice(transport_parsing, gpr_slice_sub_no_ref(slice, (size_t)(cur - beg), (size_t)(end - beg)), - 1, call_list)) { + 1, closure_list)) { return 0; } transport_parsing->deframe_state = GRPC_DTS_FH_0; @@ -400,7 +400,7 @@ int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, gpr_slice_sub_no_ref( slice, cur_offset, cur_offset + transport_parsing->incoming_frame_size), - 1, call_list)) { + 1, closure_list)) { return 0; } cur += transport_parsing->incoming_frame_size; @@ -410,7 +410,7 @@ int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, if (!parse_frame_slice(transport_parsing, gpr_slice_sub_no_ref(slice, (size_t)(cur - beg), (size_t)(end - beg)), - 0, call_list)) { + 0, closure_list)) { return 0; } transport_parsing->incoming_frame_size -= (gpr_uint32)(end - cur); @@ -473,7 +473,7 @@ static int init_frame_parser(grpc_chttp2_transport_parsing *transport_parsing) { static grpc_chttp2_parse_error skip_parser( void *parser, grpc_chttp2_transport_parsing *transport_parsing, grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { return GRPC_CHTTP2_PARSE_OK; } @@ -793,12 +793,12 @@ static int is_window_update_legal(gpr_int64 window_update, gpr_int64 window) { static int parse_frame_slice(grpc_chttp2_transport_parsing *transport_parsing, gpr_slice slice, int is_last, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_chttp2_stream_parsing *stream_parsing = transport_parsing->incoming_stream; switch (transport_parsing->parser(transport_parsing->parser_data, transport_parsing, stream_parsing, slice, - is_last, call_list)) { + is_last, closure_list)) { case GRPC_CHTTP2_PARSE_OK: if (stream_parsing) { grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, diff --git a/src/core/transport/chttp2/writing.c b/src/core/transport/chttp2/writing.c index 18f4bfbc77c..e6f169c2807 100644 --- a/src/core/transport/chttp2/writing.c +++ b/src/core/transport/chttp2/writing.c @@ -164,7 +164,7 @@ int grpc_chttp2_unlocking_check_writes( void grpc_chttp2_perform_writes( grpc_chttp2_transport_writing *transport_writing, grpc_endpoint *endpoint, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { GPR_ASSERT(transport_writing->outbuf.count > 0 || grpc_chttp2_list_have_writing_streams(transport_writing)); @@ -174,7 +174,7 @@ void grpc_chttp2_perform_writes( GPR_ASSERT(endpoint); grpc_endpoint_write(endpoint, &transport_writing->outbuf, - &transport_writing->done_cb, call_list); + &transport_writing->done_cb, closure_list); } static void finalize_outbuf(grpc_chttp2_transport_writing *transport_writing) { @@ -213,7 +213,7 @@ static void finalize_outbuf(grpc_chttp2_transport_writing *transport_writing) { void grpc_chttp2_cleanup_writing( grpc_chttp2_transport_global *transport_global, grpc_chttp2_transport_writing *transport_writing, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_chttp2_stream_writing *stream_writing; grpc_chttp2_stream_global *stream_global; @@ -231,7 +231,8 @@ void grpc_chttp2_cleanup_writing( stream_global->outgoing_sopb->nops == 0) { GPR_ASSERT(stream_global->write_state != GRPC_WRITE_STATE_QUEUED_CLOSE); stream_global->outgoing_sopb = NULL; - grpc_call_list_add(call_list, stream_global->send_done_closure, 1); + grpc_closure_list_add(closure_list, stream_global->send_done_closure, + 1); } } stream_global->writing_now = 0; diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index acd7cbdc1d7..766b55b5fa7 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -78,31 +78,31 @@ int grpc_flowctl_trace = 0; static const grpc_transport_vtable vtable; static void lock(grpc_chttp2_transport *t); -static void unlock(grpc_chttp2_transport *t, grpc_call_list *call_list); +static void unlock(grpc_chttp2_transport *t, grpc_closure_list *closure_list); static void unlock_check_read_write_state(grpc_chttp2_transport *t, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* forward declarations of various callbacks that we'll build closures around */ static void writing_action(void *t, int iomgr_success_ignored, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** Set a transport level setting, and push it to our peer */ static void push_setting(grpc_chttp2_transport *t, grpc_chttp2_setting_id id, gpr_uint32 value); /** Endpoint callback to process incoming data */ -static void recv_data(void *tp, int success, grpc_call_list *call_list); +static void recv_data(void *tp, int success, grpc_closure_list *closure_list); /** Start disconnection chain */ static void drop_connection(grpc_chttp2_transport *t, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** Perform a transport_op */ static void perform_stream_op_locked( grpc_chttp2_transport_global *transport_global, grpc_chttp2_stream_global *stream_global, grpc_transport_stream_op *op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** Cancel a stream: coming from the transport API */ static void cancel_from_api(grpc_chttp2_transport_global *transport_global, @@ -117,26 +117,27 @@ static void close_from_api(grpc_chttp2_transport_global *transport_global, /** Add endpoint from this transport to pollset */ static void add_to_pollset_locked(grpc_chttp2_transport *t, grpc_pollset *pollset, - grpc_call_list *call_list); + grpc_closure_list *closure_list); static void add_to_pollset_set_locked(grpc_chttp2_transport *t, grpc_pollset_set *pollset_set, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** Start new streams that have been created if we can */ static void maybe_start_some_streams( - grpc_chttp2_transport_global *transport_global, grpc_call_list *call_list); + grpc_chttp2_transport_global *transport_global, + grpc_closure_list *closure_list); static void connectivity_state_set( grpc_chttp2_transport_global *transport_global, grpc_connectivity_state state, const char *reason, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* * CONSTRUCTION/DESTRUCTION/REFCOUNTING */ static void destruct_transport(grpc_chttp2_transport *t, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t i; gpr_mu_lock(&t->mu); @@ -166,7 +167,7 @@ static void destruct_transport(grpc_chttp2_transport *t, grpc_chttp2_stream_map_destroy(&t->parsing_stream_map); grpc_chttp2_stream_map_destroy(&t->new_stream_map); grpc_connectivity_state_destroy(&t->channel_callback.state_tracker, - call_list); + closure_list); gpr_mu_unlock(&t->mu); gpr_mu_destroy(&t->mu); @@ -175,7 +176,7 @@ static void destruct_transport(grpc_chttp2_transport *t, and maybe they hold resources that need to be freed */ while (t->global.pings.next != &t->global.pings) { grpc_chttp2_outstanding_ping *ping = t->global.pings.next; - grpc_call_list_add(call_list, ping->on_recv, 0); + grpc_closure_list_add(closure_list, ping->on_recv, 0); ping->next->prev = ping->prev; ping->prev->next = ping->next; gpr_free(ping); @@ -190,12 +191,13 @@ static void destruct_transport(grpc_chttp2_transport *t, #ifdef REFCOUNTING_DEBUG #define REF_TRANSPORT(t, r) ref_transport(t, r, __FILE__, __LINE__) #define UNREF_TRANSPORT(t, r, cl) unref_transport(t, cl, r, __FILE__, __LINE__) -static void unref_transport(grpc_chttp2_transport *t, grpc_call_list *call_list, - const char *reason, const char *file, int line) { +static void unref_transport(grpc_chttp2_transport *t, + grpc_closure_list *closure_list, const char *reason, + const char *file, int line) { gpr_log(GPR_DEBUG, "chttp2:unref:%p %d->%d %s [%s:%d]", t, t->refs.count, t->refs.count - 1, reason, file, line); if (!gpr_unref(&t->refs)) return; - destruct_transport(t, call_list); + destruct_transport(t, closure_list); } static void ref_transport(grpc_chttp2_transport *t, const char *reason, @@ -208,9 +210,9 @@ static void ref_transport(grpc_chttp2_transport *t, const char *reason, #define REF_TRANSPORT(t, r) ref_transport(t) #define UNREF_TRANSPORT(t, r, cl) unref_transport(t, cl) static void unref_transport(grpc_chttp2_transport *t, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (!gpr_unref(&t->refs)) return; - destruct_transport(t, call_list); + destruct_transport(t, closure_list); } static void ref_transport(grpc_chttp2_transport *t) { gpr_ref(&t->refs); } @@ -219,7 +221,8 @@ static void ref_transport(grpc_chttp2_transport *t) { gpr_ref(&t->refs); } static void init_transport(grpc_chttp2_transport *t, const grpc_channel_args *channel_args, grpc_endpoint *ep, grpc_mdctx *mdctx, - gpr_uint8 is_client, grpc_call_list *call_list) { + gpr_uint8 is_client, + grpc_closure_list *closure_list) { size_t i; int j; @@ -339,15 +342,16 @@ static void init_transport(grpc_chttp2_transport *t, } } -static void destroy_transport(grpc_transport *gt, grpc_call_list *call_list) { +static void destroy_transport(grpc_transport *gt, + grpc_closure_list *closure_list) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; lock(t); t->destroying = 1; - drop_connection(t, call_list); - unlock(t, call_list); + drop_connection(t, closure_list); + unlock(t, closure_list); - UNREF_TRANSPORT(t, "destroy", call_list); + UNREF_TRANSPORT(t, "destroy", closure_list); } /** block grpc_endpoint_shutdown being called until a paired @@ -358,41 +362,41 @@ static void prevent_endpoint_shutdown(grpc_chttp2_transport *t) { } static void allow_endpoint_shutdown_locked(grpc_chttp2_transport *t, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (gpr_unref(&t->shutdown_ep_refs)) { if (t->ep) { - grpc_endpoint_shutdown(t->ep, call_list); + grpc_endpoint_shutdown(t->ep, closure_list); } } } static void allow_endpoint_shutdown_unlocked(grpc_chttp2_transport *t, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (gpr_unref(&t->shutdown_ep_refs)) { gpr_mu_lock(&t->mu); if (t->ep) { - grpc_endpoint_shutdown(t->ep, call_list); + grpc_endpoint_shutdown(t->ep, closure_list); } gpr_mu_unlock(&t->mu); } } static void destroy_endpoint(grpc_chttp2_transport *t, - grpc_call_list *call_list) { - grpc_endpoint_destroy(t->ep, call_list); + grpc_closure_list *closure_list) { + grpc_endpoint_destroy(t->ep, closure_list); t->ep = NULL; /* safe because we'll still have the ref for write */ - UNREF_TRANSPORT(t, "disconnect", call_list); + UNREF_TRANSPORT(t, "disconnect", closure_list); } static void close_transport_locked(grpc_chttp2_transport *t, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (!t->closed) { t->closed = 1; connectivity_state_set(&t->global, GRPC_CHANNEL_FATAL_FAILURE, - "close_transport", call_list); + "close_transport", closure_list); if (t->ep) { - allow_endpoint_shutdown_locked(t, call_list); + allow_endpoint_shutdown_locked(t, closure_list); } } } @@ -400,7 +404,7 @@ static void close_transport_locked(grpc_chttp2_transport *t, static int init_stream(grpc_transport *gt, grpc_stream *gs, const void *server_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; @@ -432,14 +436,14 @@ static int init_stream(grpc_transport *gt, grpc_stream *gs, } if (initial_op) - perform_stream_op_locked(&t->global, &s->global, initial_op, call_list); - unlock(t, call_list); + perform_stream_op_locked(&t->global, &s->global, initial_op, closure_list); + unlock(t, closure_list); return 0; } static void destroy_stream(grpc_transport *gt, grpc_stream *gs, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; int i; @@ -450,7 +454,7 @@ static void destroy_stream(grpc_transport *gt, grpc_stream *gs, s->global.id == 0); GPR_ASSERT(!s->global.in_stream_map); if (grpc_chttp2_unregister_stream(t, s) && t->global.sent_goaway) { - close_transport_locked(t, call_list); + close_transport_locked(t, closure_list); } if (!t->parsing_active && s->global.id) { GPR_ASSERT(grpc_chttp2_stream_map_find(&t->parsing_stream_map, @@ -480,7 +484,7 @@ static void destroy_stream(grpc_transport *gt, grpc_stream *gs, grpc_chttp2_incoming_metadata_live_op_buffer_end( &s->global.outstanding_metadata); - UNREF_TRANSPORT(t, "stream", call_list); + UNREF_TRANSPORT(t, "stream", closure_list); } grpc_chttp2_stream_parsing *grpc_chttp2_parsing_lookup_stream( @@ -515,13 +519,13 @@ grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream( static void lock(grpc_chttp2_transport *t) { gpr_mu_lock(&t->mu); } -static void unlock(grpc_chttp2_transport *t, grpc_call_list *call_list) { - unlock_check_read_write_state(t, call_list); +static void unlock(grpc_chttp2_transport *t, grpc_closure_list *closure_list) { + unlock_check_read_write_state(t, closure_list); if (!t->writing_active && !t->closed && grpc_chttp2_unlocking_check_writes(&t->global, &t->writing)) { t->writing_active = 1; REF_TRANSPORT(t, "writing"); - grpc_call_list_add(call_list, &t->writing_action, 1); + grpc_closure_list_add(closure_list, &t->writing_action, 1); prevent_endpoint_shutdown(t); } @@ -548,53 +552,54 @@ static void push_setting(grpc_chttp2_transport *t, grpc_chttp2_setting_id id, } void grpc_chttp2_terminate_writing(void *transport_writing_ptr, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_chttp2_transport_writing *transport_writing = transport_writing_ptr; grpc_chttp2_transport *t = TRANSPORT_FROM_WRITING(transport_writing); lock(t); - allow_endpoint_shutdown_locked(t, call_list); + allow_endpoint_shutdown_locked(t, closure_list); if (!success) { - drop_connection(t, call_list); + drop_connection(t, closure_list); } /* cleanup writing related jazz */ - grpc_chttp2_cleanup_writing(&t->global, &t->writing, call_list); + grpc_chttp2_cleanup_writing(&t->global, &t->writing, closure_list); /* leave the writing flag up on shutdown to prevent further writes in unlock() from starting */ t->writing_active = 0; if (t->ep && !t->endpoint_reading) { - destroy_endpoint(t, call_list); + destroy_endpoint(t, closure_list); } - unlock(t, call_list); + unlock(t, closure_list); - UNREF_TRANSPORT(t, "writing", call_list); + UNREF_TRANSPORT(t, "writing", closure_list); } static void writing_action(void *gt, int iomgr_success_ignored, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_chttp2_transport *t = gt; - grpc_chttp2_perform_writes(&t->writing, t->ep, call_list); + grpc_chttp2_perform_writes(&t->writing, t->ep, closure_list); } void grpc_chttp2_add_incoming_goaway( grpc_chttp2_transport_global *transport_global, gpr_uint32 goaway_error, - gpr_slice goaway_text, grpc_call_list *call_list) { + gpr_slice goaway_text, grpc_closure_list *closure_list) { char *msg = gpr_dump_slice(goaway_text, GPR_DUMP_HEX | GPR_DUMP_ASCII); gpr_log(GPR_DEBUG, "got goaway [%d]: %s", goaway_error, msg); gpr_free(msg); gpr_slice_unref(goaway_text); transport_global->seen_goaway = 1; connectivity_state_set(transport_global, GRPC_CHANNEL_FATAL_FAILURE, - "got_goaway", call_list); + "got_goaway", closure_list); } static void maybe_start_some_streams( - grpc_chttp2_transport_global *transport_global, grpc_call_list *call_list) { + grpc_chttp2_transport_global *transport_global, + grpc_closure_list *closure_list) { grpc_chttp2_stream_global *stream_global; /* start streams where we have free grpc_chttp2_stream ids and free * concurrency */ @@ -616,7 +621,7 @@ static void maybe_start_some_streams( if (transport_global->next_stream_id >= MAX_CLIENT_STREAM_ID) { connectivity_state_set(transport_global, GRPC_CHANNEL_TRANSIENT_FAILURE, - "no_more_stream_ids", call_list); + "no_more_stream_ids", closure_list); } stream_global->outgoing_window = @@ -647,7 +652,7 @@ static void maybe_start_some_streams( static void perform_stream_op_locked( grpc_chttp2_transport_global *transport_global, grpc_chttp2_stream_global *stream_global, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (op->cancel_with_status != GRPC_STATUS_OK) { cancel_from_api(transport_global, stream_global, op->cancel_with_status); } @@ -674,13 +679,13 @@ static void perform_stream_op_locked( transport_global->is_client ? "CLI" : "SVR", stream_global)); grpc_chttp2_list_add_waiting_for_concurrency(transport_global, stream_global); - maybe_start_some_streams(transport_global, call_list); + maybe_start_some_streams(transport_global, closure_list); } else if (stream_global->outgoing_window > 0) { grpc_chttp2_list_add_writable_stream(transport_global, stream_global); } } else { grpc_sopb_reset(op->send_ops); - grpc_call_list_add(call_list, stream_global->send_done_closure, 0); + grpc_closure_list_add(closure_list, stream_global->send_done_closure, 0); } } @@ -715,21 +720,21 @@ static void perform_stream_op_locked( if (op->bind_pollset) { add_to_pollset_locked(TRANSPORT_FROM_GLOBAL(transport_global), - op->bind_pollset, call_list); + op->bind_pollset, closure_list); } - grpc_call_list_add(call_list, op->on_consumed, 1); + grpc_closure_list_add(closure_list, op->on_consumed, 1); } static void perform_stream_op(grpc_transport *gt, grpc_stream *gs, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; lock(t); - perform_stream_op_locked(&t->global, &s->global, op, call_list); - unlock(t, call_list); + perform_stream_op_locked(&t->global, &s->global, op, closure_list); + unlock(t, closure_list); } static void send_ping_locked(grpc_chttp2_transport *t, grpc_closure *on_recv) { @@ -750,18 +755,18 @@ static void send_ping_locked(grpc_chttp2_transport *t, grpc_closure *on_recv) { } static void perform_transport_op(grpc_transport *gt, grpc_transport_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; int close_transport = 0; lock(t); - grpc_call_list_add(call_list, op->on_consumed, 1); + grpc_closure_list_add(closure_list, op->on_consumed, 1); if (op->on_connectivity_state_change) { grpc_connectivity_state_notify_on_state_change( &t->channel_callback.state_tracker, op->connectivity_state, - op->on_connectivity_state_change, call_list); + op->on_connectivity_state_change, closure_list); } if (op->send_goaway) { @@ -780,11 +785,11 @@ static void perform_transport_op(grpc_transport *gt, grpc_transport_op *op, } if (op->bind_pollset) { - add_to_pollset_locked(t, op->bind_pollset, call_list); + add_to_pollset_locked(t, op->bind_pollset, closure_list); } if (op->bind_pollset_set) { - add_to_pollset_set_locked(t, op->bind_pollset_set, call_list); + add_to_pollset_set_locked(t, op->bind_pollset_set, closure_list); } if (op->send_ping) { @@ -792,15 +797,15 @@ static void perform_transport_op(grpc_transport *gt, grpc_transport_op *op, } if (op->disconnect) { - close_transport_locked(t, call_list); + close_transport_locked(t, closure_list); } - unlock(t, call_list); + unlock(t, closure_list); if (close_transport) { lock(t); - close_transport_locked(t, call_list); - unlock(t, call_list); + close_transport_locked(t, closure_list); + unlock(t, closure_list); } } @@ -817,7 +822,7 @@ static grpc_stream_state compute_state(gpr_uint8 write_closed, } static void remove_stream(grpc_chttp2_transport *t, gpr_uint32 id, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t new_stream_count; grpc_chttp2_stream *s = grpc_chttp2_stream_map_delete(&t->parsing_stream_map, id); @@ -832,7 +837,7 @@ static void remove_stream(grpc_chttp2_transport *t, gpr_uint32 id, grpc_chttp2_parsing_become_skip_parser(&t->parsing); } if (grpc_chttp2_unregister_stream(t, s) && t->global.sent_goaway) { - close_transport_locked(t, call_list); + close_transport_locked(t, closure_list); } new_stream_count = grpc_chttp2_stream_map_size(&t->parsing_stream_map) + @@ -840,12 +845,12 @@ static void remove_stream(grpc_chttp2_transport *t, gpr_uint32 id, GPR_ASSERT(new_stream_count <= GPR_UINT32_MAX); if (new_stream_count != t->global.concurrent_stream_count) { t->global.concurrent_stream_count = (gpr_uint32)new_stream_count; - maybe_start_some_streams(&t->global, call_list); + maybe_start_some_streams(&t->global, closure_list); } } static void unlock_check_read_write_state(grpc_chttp2_transport *t, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_chttp2_transport_global *transport_global = &t->global; grpc_chttp2_stream_global *stream_global; grpc_stream_state state; @@ -859,7 +864,7 @@ static void unlock_check_read_write_state(grpc_chttp2_transport *t, GPR_ASSERT(stream_global->in_stream_map); GPR_ASSERT(stream_global->write_state != GRPC_WRITE_STATE_OPEN); GPR_ASSERT(stream_global->read_closed); - remove_stream(t, stream_global->id, call_list); + remove_stream(t, stream_global->id, closure_list); grpc_chttp2_list_add_read_write_state_changed(transport_global, stream_global); } @@ -885,7 +890,8 @@ static void unlock_check_read_write_state(grpc_chttp2_transport *t, if (stream_global->outgoing_sopb != NULL) { grpc_sopb_reset(stream_global->outgoing_sopb); stream_global->outgoing_sopb = NULL; - grpc_call_list_add(call_list, stream_global->send_done_closure, 1); + grpc_closure_list_add(closure_list, stream_global->send_done_closure, + 1); } stream_global->read_closed = 1; if (!stream_global->published_cancelled) { @@ -907,7 +913,7 @@ static void unlock_check_read_write_state(grpc_chttp2_transport *t, grpc_chttp2_list_add_closed_waiting_for_parsing(transport_global, stream_global); } else { - remove_stream(t, stream_global->id, call_list); + remove_stream(t, stream_global->id, closure_list); } } if (!stream_global->publish_sopb) { @@ -935,7 +941,7 @@ static void unlock_check_read_write_state(grpc_chttp2_transport *t, &stream_global->outstanding_metadata); grpc_sopb_swap(stream_global->publish_sopb, &stream_global->incoming_sopb); stream_global->published_state = *stream_global->publish_state = state; - grpc_call_list_add(call_list, stream_global->recv_done_closure, 1); + grpc_closure_list_add(closure_list, stream_global->recv_done_closure, 1); stream_global->recv_done_closure = NULL; stream_global->publish_sopb = NULL; stream_global->publish_state = NULL; @@ -1071,8 +1077,8 @@ static void end_all_the_calls(grpc_chttp2_transport *t) { } static void drop_connection(grpc_chttp2_transport *t, - grpc_call_list *call_list) { - close_transport_locked(t, call_list); + grpc_closure_list *closure_list) { + close_transport_locked(t, closure_list); end_all_the_calls(t); } @@ -1098,15 +1104,15 @@ static void update_global_window(void *args, gpr_uint32 id, void *stream) { } static void read_error_locked(grpc_chttp2_transport *t, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { t->endpoint_reading = 0; if (!t->writing_active && t->ep) { - destroy_endpoint(t, call_list); + destroy_endpoint(t, closure_list); } } /* tcp read callback */ -static void recv_data(void *tp, int success, grpc_call_list *call_list) { +static void recv_data(void *tp, int success, grpc_closure_list *closure_list) { size_t i; int keep_reading = 0; grpc_chttp2_transport *t = tp; @@ -1123,12 +1129,12 @@ static void recv_data(void *tp, int success, grpc_call_list *call_list) { gpr_mu_unlock(&t->mu); for (; i < t->read_buffer.count && grpc_chttp2_perform_read(&t->parsing, t->read_buffer.slices[i], - call_list); + closure_list); i++) ; gpr_mu_lock(&t->mu); if (i != t->read_buffer.count) { - drop_connection(t, call_list); + drop_connection(t, closure_list); } /* merge stream lists */ grpc_chttp2_stream_map_move_into(&t->new_stream_map, @@ -1141,26 +1147,26 @@ static void recv_data(void *tp, int success, grpc_call_list *call_list) { t->parsing.initial_window_update = 0; } /* handle higher level things */ - grpc_chttp2_publish_reads(&t->global, &t->parsing, call_list); + grpc_chttp2_publish_reads(&t->global, &t->parsing, closure_list); t->parsing_active = 0; } if (!success || i != t->read_buffer.count) { - drop_connection(t, call_list); - read_error_locked(t, call_list); + drop_connection(t, closure_list); + read_error_locked(t, closure_list); } else if (!t->closed) { keep_reading = 1; REF_TRANSPORT(t, "keep_reading"); prevent_endpoint_shutdown(t); } gpr_slice_buffer_reset_and_unref(&t->read_buffer); - unlock(t, call_list); + unlock(t, closure_list); if (keep_reading) { - grpc_endpoint_read(t->ep, &t->read_buffer, &t->recv_data, call_list); - allow_endpoint_shutdown_unlocked(t, call_list); - UNREF_TRANSPORT(t, "keep_reading", call_list); + grpc_endpoint_read(t->ep, &t->read_buffer, &t->recv_data, closure_list); + allow_endpoint_shutdown_unlocked(t, closure_list); + UNREF_TRANSPORT(t, "keep_reading", closure_list); } else { - UNREF_TRANSPORT(t, "recv_data", call_list); + UNREF_TRANSPORT(t, "recv_data", closure_list); } } @@ -1171,12 +1177,12 @@ static void recv_data(void *tp, int success, grpc_call_list *call_list) { static void connectivity_state_set( grpc_chttp2_transport_global *transport_global, grpc_connectivity_state state, const char *reason, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { GRPC_CHTTP2_IF_TRACING( gpr_log(GPR_DEBUG, "set connectivity_state=%d", state)); grpc_connectivity_state_set( &TRANSPORT_FROM_GLOBAL(transport_global)->channel_callback.state_tracker, - state, reason, call_list); + state, reason, closure_list); } /* @@ -1185,17 +1191,17 @@ static void connectivity_state_set( static void add_to_pollset_locked(grpc_chttp2_transport *t, grpc_pollset *pollset, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (t->ep) { - grpc_endpoint_add_to_pollset(t->ep, pollset, call_list); + grpc_endpoint_add_to_pollset(t->ep, pollset, closure_list); } } static void add_to_pollset_set_locked(grpc_chttp2_transport *t, grpc_pollset_set *pollset_set, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { if (t->ep) { - grpc_endpoint_add_to_pollset_set(t->ep, pollset_set, call_list); + grpc_endpoint_add_to_pollset_set(t->ep, pollset_set, closure_list); } } @@ -1234,7 +1240,8 @@ void grpc_chttp2_flowctl_trace(const char *file, int line, const char *reason, * INTEGRATION GLUE */ -static char *chttp2_get_peer(grpc_transport *t, grpc_call_list *call_list) { +static char *chttp2_get_peer(grpc_transport *t, + grpc_closure_list *closure_list) { return gpr_strdup(((grpc_chttp2_transport *)t)->peer_string); } @@ -1248,17 +1255,17 @@ static const grpc_transport_vtable vtable = {sizeof(grpc_chttp2_stream), grpc_transport *grpc_create_chttp2_transport( const grpc_channel_args *channel_args, grpc_endpoint *ep, grpc_mdctx *mdctx, - int is_client, grpc_call_list *call_list) { + int is_client, grpc_closure_list *closure_list) { grpc_chttp2_transport *t = gpr_malloc(sizeof(grpc_chttp2_transport)); - init_transport(t, channel_args, ep, mdctx, is_client != 0, call_list); + init_transport(t, channel_args, ep, mdctx, is_client != 0, closure_list); return &t->base; } void grpc_chttp2_transport_start_reading(grpc_transport *transport, gpr_slice *slices, size_t nslices, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)transport; REF_TRANSPORT(t, "recv_data"); /* matches unref inside recv_data */ gpr_slice_buffer_addn(&t->read_buffer, slices, nslices); - recv_data(t, 1, call_list); + recv_data(t, 1, closure_list); } diff --git a/src/core/transport/chttp2_transport.h b/src/core/transport/chttp2_transport.h index e963e16707b..93a654bc83e 100644 --- a/src/core/transport/chttp2_transport.h +++ b/src/core/transport/chttp2_transport.h @@ -42,10 +42,11 @@ extern int grpc_flowctl_trace; grpc_transport *grpc_create_chttp2_transport( const grpc_channel_args *channel_args, grpc_endpoint *ep, - grpc_mdctx *metadata_context, int is_client, grpc_call_list *call_list); + grpc_mdctx *metadata_context, int is_client, + grpc_closure_list *closure_list); void grpc_chttp2_transport_start_reading(grpc_transport *transport, gpr_slice *slices, size_t nslices, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_TRANSPORT_H */ diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c index d04c3a2209a..638ec62e734 100644 --- a/src/core/transport/connectivity_state.c +++ b/src/core/transport/connectivity_state.c @@ -67,7 +67,7 @@ void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, } void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { int success; grpc_connectivity_state_watcher *w; while ((w = tracker->watchers)) { @@ -79,7 +79,7 @@ void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker, } else { success = 0; } - grpc_call_list_add(call_list, w->notify, success); + grpc_closure_list_add(closure_list, w->notify, success); gpr_free(w); } gpr_free(tracker->name); @@ -96,7 +96,7 @@ grpc_connectivity_state grpc_connectivity_state_check( int grpc_connectivity_state_notify_on_state_change( grpc_connectivity_state_tracker *tracker, grpc_connectivity_state *current, - grpc_closure *notify, grpc_call_list *call_list) { + grpc_closure *notify, grpc_closure_list *closure_list) { if (grpc_connectivity_state_trace) { gpr_log(GPR_DEBUG, "CONWATCH: %s: from %s [cur=%s] notify=%p", tracker->name, grpc_connectivity_state_name(*current), @@ -104,7 +104,7 @@ int grpc_connectivity_state_notify_on_state_change( } if (tracker->current_state != *current) { *current = tracker->current_state; - grpc_call_list_add(call_list, notify, 1); + grpc_closure_list_add(closure_list, notify, 1); } else { grpc_connectivity_state_watcher *w = gpr_malloc(sizeof(*w)); w->current = current; @@ -118,7 +118,7 @@ int grpc_connectivity_state_notify_on_state_change( void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, grpc_connectivity_state state, const char *reason, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_connectivity_state_watcher *w; if (grpc_connectivity_state_trace) { gpr_log(GPR_DEBUG, "SET: %s: %s --> %s [%s]", tracker->name, @@ -133,7 +133,7 @@ void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, while ((w = tracker->watchers) != NULL) { *w->current = tracker->current_state; tracker->watchers = w->next; - grpc_call_list_add(call_list, w->notify, 1); + grpc_closure_list_add(closure_list, w->notify, 1); gpr_free(w); } } diff --git a/src/core/transport/connectivity_state.h b/src/core/transport/connectivity_state.h index 6ade8e19f73..26f8874fbc4 100644 --- a/src/core/transport/connectivity_state.h +++ b/src/core/transport/connectivity_state.h @@ -61,13 +61,14 @@ 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, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /** Set connectivity state; not thread safe; access must be serialized with an * external lock */ void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, grpc_connectivity_state state, - const char *reason, grpc_call_list *call_list); + const char *reason, + grpc_closure_list *closure_list); grpc_connectivity_state grpc_connectivity_state_check( grpc_connectivity_state_tracker *tracker); @@ -75,6 +76,6 @@ grpc_connectivity_state grpc_connectivity_state_check( /** Return 1 if the channel should start connecting, 0 otherwise */ int grpc_connectivity_state_notify_on_state_change( grpc_connectivity_state_tracker *tracker, grpc_connectivity_state *current, - grpc_closure *notify, grpc_call_list *call_list); + grpc_closure *notify, grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CONNECTIVITY_STATE_H */ diff --git a/src/core/transport/transport.c b/src/core/transport/transport.c index f7c87c1e90b..24d549a29b7 100644 --- a/src/core/transport/transport.c +++ b/src/core/transport/transport.c @@ -41,46 +41,46 @@ size_t grpc_transport_stream_size(grpc_transport *transport) { } void grpc_transport_destroy(grpc_transport *transport, - grpc_call_list *call_list) { - transport->vtable->destroy(transport, call_list); + grpc_closure_list *closure_list) { + transport->vtable->destroy(transport, closure_list); } int grpc_transport_init_stream(grpc_transport *transport, grpc_stream *stream, const void *server_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { return transport->vtable->init_stream(transport, stream, server_data, - initial_op, call_list); + initial_op, closure_list); } void grpc_transport_perform_stream_op(grpc_transport *transport, grpc_stream *stream, grpc_transport_stream_op *op, - grpc_call_list *call_list) { - transport->vtable->perform_stream_op(transport, stream, op, call_list); + grpc_closure_list *closure_list) { + transport->vtable->perform_stream_op(transport, stream, op, closure_list); } void grpc_transport_perform_op(grpc_transport *transport, grpc_transport_op *op, - grpc_call_list *call_list) { - transport->vtable->perform_op(transport, op, call_list); + grpc_closure_list *closure_list) { + transport->vtable->perform_op(transport, op, closure_list); } void grpc_transport_destroy_stream(grpc_transport *transport, grpc_stream *stream, - grpc_call_list *call_list) { - transport->vtable->destroy_stream(transport, stream, call_list); + grpc_closure_list *closure_list) { + transport->vtable->destroy_stream(transport, stream, closure_list); } char *grpc_transport_get_peer(grpc_transport *transport, - grpc_call_list *call_list) { - return transport->vtable->get_peer(transport, call_list); + grpc_closure_list *closure_list) { + return transport->vtable->get_peer(transport, closure_list); } -void grpc_transport_stream_op_finish_with_failure(grpc_transport_stream_op *op, - grpc_call_list *call_list) { - grpc_call_list_add(call_list, op->on_done_recv, 0); - grpc_call_list_add(call_list, op->on_done_send, 0); - grpc_call_list_add(call_list, op->on_consumed, 0); +void grpc_transport_stream_op_finish_with_failure( + grpc_transport_stream_op *op, grpc_closure_list *closure_list) { + grpc_closure_list_add(closure_list, op->on_done_recv, 0); + grpc_closure_list_add(closure_list, op->on_done_send, 0); + grpc_closure_list_add(closure_list, op->on_consumed, 0); } void grpc_transport_stream_op_add_cancellation(grpc_transport_stream_op *op, @@ -105,11 +105,11 @@ typedef struct { } close_message_data; static void free_message(void *p, int iomgr_success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { close_message_data *cmd = p; gpr_slice_unref(cmd->message); if (cmd->then_call != NULL) { - cmd->then_call->cb(cmd->then_call->cb_arg, iomgr_success, call_list); + cmd->then_call->cb(cmd->then_call->cb_arg, iomgr_success, closure_list); } gpr_free(cmd); } diff --git a/src/core/transport/transport.h b/src/core/transport/transport.h index d5383ad11a4..1d6dd1e735a 100644 --- a/src/core/transport/transport.h +++ b/src/core/transport/transport.h @@ -137,7 +137,7 @@ size_t grpc_transport_stream_size(grpc_transport *transport); int grpc_transport_init_stream(grpc_transport *transport, grpc_stream *stream, const void *server_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Destroy transport data for a stream. @@ -151,10 +151,10 @@ int grpc_transport_init_stream(grpc_transport *transport, grpc_stream *stream, caller, but any child memory must be cleaned up) */ void grpc_transport_destroy_stream(grpc_transport *transport, grpc_stream *stream, - grpc_call_list *call_list); + grpc_closure_list *closure_list); -void grpc_transport_stream_op_finish_with_failure(grpc_transport_stream_op *op, - grpc_call_list *call_list); +void grpc_transport_stream_op_finish_with_failure( + grpc_transport_stream_op *op, grpc_closure_list *closure_list); void grpc_transport_stream_op_add_cancellation(grpc_transport_stream_op *op, grpc_status_code status); @@ -177,10 +177,10 @@ char *grpc_transport_stream_op_string(grpc_transport_stream_op *op); void grpc_transport_perform_stream_op(grpc_transport *transport, grpc_stream *stream, grpc_transport_stream_op *op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); void grpc_transport_perform_op(grpc_transport *transport, grpc_transport_op *op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Send a ping on a transport @@ -196,10 +196,10 @@ void grpc_transport_close(grpc_transport *transport); /* Destroy the transport */ void grpc_transport_destroy(grpc_transport *transport, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* Get the transports peer */ char *grpc_transport_get_peer(grpc_transport *transport, - grpc_call_list *call_list); + grpc_closure_list *closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_TRANSPORT_H */ diff --git a/src/core/transport/transport_impl.h b/src/core/transport/transport_impl.h index 9adb16b9411..c7eebc9bb20 100644 --- a/src/core/transport/transport_impl.h +++ b/src/core/transport/transport_impl.h @@ -45,26 +45,26 @@ typedef struct grpc_transport_vtable { int (*init_stream)(grpc_transport *self, grpc_stream *stream, const void *server_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* implementation of grpc_transport_perform_stream_op */ void (*perform_stream_op)(grpc_transport *self, grpc_stream *stream, grpc_transport_stream_op *op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* implementation of grpc_transport_perform_op */ void (*perform_op)(grpc_transport *self, grpc_transport_op *op, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* implementation of grpc_transport_destroy_stream */ void (*destroy_stream)(grpc_transport *self, grpc_stream *stream, - grpc_call_list *call_list); + grpc_closure_list *closure_list); /* implementation of grpc_transport_destroy */ - void (*destroy)(grpc_transport *self, grpc_call_list *call_list); + void (*destroy)(grpc_transport *self, grpc_closure_list *closure_list); /* implementation of grpc_transport_get_peer */ - char *(*get_peer)(grpc_transport *self, grpc_call_list *call_list); + char *(*get_peer)(grpc_transport *self, grpc_closure_list *closure_list); } grpc_transport_vtable; /* an instance of a grpc transport */ diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index 747ce4050b8..76059044114 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -59,7 +59,8 @@ static void thd_func(void *arg) { gpr_event_set(&a->done_thd, (void *)1); } -static void done_write(void *arg, int success, grpc_call_list *call_list) { +static void done_write(void *arg, int success, + grpc_closure_list *closure_list) { thd_args *a = arg; gpr_event_set(&a->done_write, (void *)1); } @@ -69,11 +70,11 @@ static void server_setup_transport(void *ts, grpc_transport *transport, thd_args *a = ts; static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_server_setup_transport( a->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - grpc_server_get_channel_args(a->server), &call_list); - grpc_call_list_run(&call_list); + grpc_server_get_channel_args(a->server), &closure_list); + grpc_closure_list_run(&closure_list); } void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, @@ -89,7 +90,7 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, gpr_slice_from_copied_buffer(client_payload, client_payload_length); gpr_slice_buffer outgoing; grpc_closure done_write_closure; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; hex = gpr_dump(client_payload, client_payload_length, GPR_DUMP_HEX | GPR_DUMP_ASCII); @@ -114,14 +115,16 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, grpc_server_register_completion_queue(a.server, a.cq, NULL); grpc_server_start(a.server); transport = - grpc_create_chttp2_transport(NULL, sfd.server, mdctx, 0, &call_list); + grpc_create_chttp2_transport(NULL, sfd.server, mdctx, 0, &closure_list); server_setup_transport(&a, transport, mdctx); - grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); - grpc_call_list_run(&call_list); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); + grpc_closure_list_run(&closure_list); /* Bind everything into the same pollset */ - grpc_endpoint_add_to_pollset(sfd.client, grpc_cq_pollset(a.cq), &call_list); - grpc_endpoint_add_to_pollset(sfd.server, grpc_cq_pollset(a.cq), &call_list); + grpc_endpoint_add_to_pollset(sfd.client, grpc_cq_pollset(a.cq), + &closure_list); + grpc_endpoint_add_to_pollset(sfd.server, grpc_cq_pollset(a.cq), + &closure_list); /* Check a ground truth */ GPR_ASSERT(grpc_server_has_open_connections(a.server)); @@ -134,17 +137,18 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, grpc_closure_init(&done_write_closure, done_write, &a); /* Write data */ - grpc_endpoint_write(sfd.client, &outgoing, &done_write_closure, &call_list); - grpc_call_list_run(&call_list); + grpc_endpoint_write(sfd.client, &outgoing, &done_write_closure, + &closure_list); + grpc_closure_list_run(&closure_list); /* Await completion */ GPR_ASSERT( gpr_event_wait(&a.done_write, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5))); if (flags & GRPC_BAD_CLIENT_DISCONNECT) { - grpc_endpoint_shutdown(sfd.client, &call_list); - grpc_endpoint_destroy(sfd.client, &call_list); - grpc_call_list_run(&call_list); + grpc_endpoint_shutdown(sfd.client, &closure_list); + grpc_endpoint_destroy(sfd.client, &closure_list); + grpc_closure_list_run(&closure_list); sfd.client = NULL; } @@ -152,9 +156,9 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, /* Shutdown */ if (sfd.client) { - grpc_endpoint_shutdown(sfd.client, &call_list); - grpc_endpoint_destroy(sfd.client, &call_list); - grpc_call_list_run(&call_list); + grpc_endpoint_shutdown(sfd.client, &closure_list); + grpc_endpoint_destroy(sfd.client, &closure_list); + grpc_closure_list_run(&closure_list); } grpc_server_shutdown_and_notify(a.server, a.cq, NULL); GPR_ASSERT(grpc_completion_queue_pluck( @@ -164,6 +168,6 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, grpc_completion_queue_destroy(a.cq); gpr_slice_buffer_destroy(&outgoing); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); grpc_shutdown(); } diff --git a/test/core/channel/channel_stack_test.c b/test/core/channel/channel_stack_test.c index 07df9212701..72b48e208d3 100644 --- a/test/core/channel/channel_stack_test.c +++ b/test/core/channel/channel_stack_test.c @@ -44,7 +44,7 @@ static void channel_init_func(grpc_channel_element *elem, grpc_channel *master, const grpc_channel_args *args, grpc_mdctx *metadata_context, int is_first, - int is_last, grpc_call_list *call_list) { + int is_last, grpc_closure_list *closure_list) { GPR_ASSERT(args->num_args == 1); GPR_ASSERT(args->args[0].type == GRPC_ARG_INTEGER); GPR_ASSERT(0 == strcmp(args->args[0].key, "test_key")); @@ -57,30 +57,31 @@ static void channel_init_func(grpc_channel_element *elem, grpc_channel *master, static void call_init_func(grpc_call_element *elem, const void *server_transport_data, grpc_transport_stream_op *initial_op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { ++*(int *)(elem->channel_data); *(int *)(elem->call_data) = 0; } static void channel_destroy_func(grpc_channel_element *elem, - grpc_call_list *call_list) {} + grpc_closure_list *closure_list) {} static void call_destroy_func(grpc_call_element *elem, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { ++*(int *)(elem->channel_data); } static void call_func(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { ++*(int *)(elem->call_data); } static void channel_func(grpc_channel_element *elem, grpc_transport_op *op, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { ++*(int *)(elem->channel_data); } -static char *get_peer(grpc_call_element *elem, grpc_call_list *call_list) { +static char *get_peer(grpc_call_element *elem, + grpc_closure_list *closure_list) { return gpr_strdup("peer"); } @@ -100,7 +101,7 @@ static void test_create_channel_stack(void) { grpc_mdctx *metadata_context; int *channel_data; int *call_data; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; metadata_context = grpc_mdctx_create(); @@ -113,14 +114,14 @@ static void test_create_channel_stack(void) { channel_stack = gpr_malloc(grpc_channel_stack_size(&filters, 1)); grpc_channel_stack_init(&filters, 1, NULL, &chan_args, metadata_context, - channel_stack, &call_list); + channel_stack, &closure_list); GPR_ASSERT(channel_stack->count == 1); channel_elem = grpc_channel_stack_element(channel_stack, 0); channel_data = (int *)channel_elem->channel_data; GPR_ASSERT(*channel_data == 0); call_stack = gpr_malloc(channel_stack->call_stack_size); - grpc_call_stack_init(channel_stack, NULL, NULL, call_stack, &call_list); + grpc_call_stack_init(channel_stack, NULL, NULL, call_stack, &closure_list); GPR_ASSERT(call_stack->count == 1); call_elem = grpc_call_stack_element(call_stack, 0); GPR_ASSERT(call_elem->filter == channel_elem->filter); @@ -129,16 +130,16 @@ static void test_create_channel_stack(void) { GPR_ASSERT(*call_data == 0); GPR_ASSERT(*channel_data == 1); - grpc_call_stack_destroy(call_stack, &call_list); + grpc_call_stack_destroy(call_stack, &closure_list); gpr_free(call_stack); GPR_ASSERT(*channel_data == 2); - grpc_channel_stack_destroy(channel_stack, &call_list); + grpc_channel_stack_destroy(channel_stack, &closure_list); gpr_free(channel_stack); grpc_mdctx_unref(metadata_context); - GPR_ASSERT(grpc_call_list_empty(call_list)); + GPR_ASSERT(grpc_closure_list_empty(closure_list)); } int main(int argc, char **argv) { diff --git a/test/core/client_config/lb_policies_test.c b/test/core/client_config/lb_policies_test.c index ee3164f4fd0..411e96598ab 100644 --- a/test/core/client_config/lb_policies_test.c +++ b/test/core/client_config/lb_policies_test.c @@ -387,15 +387,15 @@ static void assert_channel_connectivity( grpc_channel_stack *client_stack; grpc_channel_element *client_channel_filter; grpc_connectivity_state actual_conn_state; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; va_list ap; client_stack = grpc_channel_get_channel_stack(ch); client_channel_filter = grpc_channel_stack_last_element(client_stack); actual_conn_state = grpc_client_channel_check_connectivity_state( - client_channel_filter, 0 /* don't try to connect */, &call_list); - grpc_call_list_run(&call_list); + client_channel_filter, 0 /* don't try to connect */, &closure_list); + grpc_closure_list_run(&closure_list); va_start(ap, accepted_conn_state); for (i = 0; i < num_accepted_conn_states; i++) { if (actual_conn_state == accepted_conn_state) { diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index d0279e79bad..b79c483703e 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -62,11 +62,11 @@ static void server_setup_transport(void *ts, grpc_transport *transport, grpc_end2end_test_fixture *f = ts; static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_server_setup_transport( f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - grpc_server_get_channel_args(f->server), &call_list); - grpc_call_list_run(&call_list); + grpc_server_get_channel_args(f->server), &closure_list); + grpc_closure_list_run(&closure_list); } typedef struct { @@ -76,7 +76,7 @@ typedef struct { static void client_setup_transport(void *ts, grpc_transport *transport, grpc_mdctx *mdctx, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { sp_client_setup *cs = ts; const grpc_channel_filter *filters[] = {&grpc_http_client_filter, @@ -85,7 +85,7 @@ static void client_setup_transport(void *ts, grpc_transport *transport, size_t nfilters = sizeof(filters) / sizeof(*filters); grpc_channel *channel = grpc_channel_create_from_filters("socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1, call_list); + cs->client_args, mdctx, 1, closure_list); cs->f->client = channel; @@ -109,7 +109,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_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; grpc_mdctx *mdctx = grpc_mdctx_create(); @@ -117,16 +117,16 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, cs.client_args = client_args; cs.f = f; transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1, - &call_list); - client_setup_transport(&cs, transport, mdctx, &call_list); + &closure_list); + client_setup_transport(&cs, transport, mdctx, &closure_list); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); - grpc_call_list_run(&call_list); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); + grpc_closure_list_run(&closure_list); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_transport *transport; @@ -135,10 +135,10 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0, - &call_list); + &closure_list); server_setup_transport(f, transport, mdctx); - grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); - grpc_call_list_run(&call_list); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); + grpc_closure_list_run(&closure_list); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { @@ -154,7 +154,7 @@ static grpc_end2end_test_config configs[] = { int main(int argc, char **argv) { size_t i; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; /* force tracing on, with a value to force many code paths in trace.c to be taken */ @@ -167,7 +167,7 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); 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 57fc9869740..e927a0e0d80 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -61,11 +61,11 @@ static void server_setup_transport(void *ts, grpc_transport *transport, grpc_end2end_test_fixture *f = ts; static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_server_setup_transport( f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - grpc_server_get_channel_args(f->server), &call_list); - grpc_call_list_run(&call_list); + grpc_server_get_channel_args(f->server), &closure_list); + grpc_closure_list_run(&closure_list); } typedef struct { @@ -75,7 +75,7 @@ typedef struct { static void client_setup_transport(void *ts, grpc_transport *transport, grpc_mdctx *mdctx, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { sp_client_setup *cs = ts; const grpc_channel_filter *filters[] = {&grpc_http_client_filter, @@ -84,7 +84,7 @@ static void client_setup_transport(void *ts, grpc_transport *transport, size_t nfilters = sizeof(filters) / sizeof(*filters); grpc_channel *channel = grpc_channel_create_from_filters("socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1, call_list); + cs->client_args, mdctx, 1, closure_list); cs->f->client = channel; @@ -108,7 +108,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_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; grpc_mdctx *mdctx = grpc_mdctx_create(); @@ -116,16 +116,16 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, cs.client_args = client_args; cs.f = f; transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1, - &call_list); - client_setup_transport(&cs, transport, mdctx, &call_list); + &closure_list); + client_setup_transport(&cs, transport, mdctx, &closure_list); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); - grpc_call_list_run(&call_list); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); + grpc_closure_list_run(&closure_list); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_transport *transport; @@ -134,10 +134,10 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0, - &call_list); + &closure_list); server_setup_transport(f, transport, mdctx); - grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); - grpc_call_list_run(&call_list); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); + grpc_closure_list_run(&closure_list); } 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 d0c552a6692..8a9196d3b60 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -61,11 +61,11 @@ static void server_setup_transport(void *ts, grpc_transport *transport, grpc_end2end_test_fixture *f = ts; static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_server_setup_transport( f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - grpc_server_get_channel_args(f->server), &call_list); - grpc_call_list_run(&call_list); + grpc_server_get_channel_args(f->server), &closure_list); + grpc_closure_list_run(&closure_list); } typedef struct { @@ -75,7 +75,7 @@ typedef struct { static void client_setup_transport(void *ts, grpc_transport *transport, grpc_mdctx *mdctx, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { sp_client_setup *cs = ts; const grpc_channel_filter *filters[] = {&grpc_http_client_filter, @@ -84,7 +84,7 @@ static void client_setup_transport(void *ts, grpc_transport *transport, size_t nfilters = sizeof(filters) / sizeof(*filters); grpc_channel *channel = grpc_channel_create_from_filters("socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1, call_list); + cs->client_args, mdctx, 1, closure_list); cs->f->client = channel; @@ -108,7 +108,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_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; grpc_mdctx *mdctx = grpc_mdctx_create(); @@ -116,16 +116,16 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, cs.client_args = client_args; cs.f = f; transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1, - &call_list); - client_setup_transport(&cs, transport, mdctx, &call_list); + &closure_list); + client_setup_transport(&cs, transport, mdctx, &closure_list); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); - grpc_call_list_run(&call_list); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); + grpc_closure_list_run(&closure_list); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_transport *transport; @@ -134,10 +134,10 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0, - &call_list); + &closure_list); server_setup_transport(f, transport, mdctx); - grpc_chttp2_transport_start_reading(transport, NULL, 0, &call_list); - grpc_call_list_run(&call_list); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); + grpc_closure_list_run(&closure_list); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { diff --git a/test/core/httpcli/httpcli_test.c b/test/core/httpcli/httpcli_test.c index bcb544e5028..063565ecfc8 100644 --- a/test/core/httpcli/httpcli_test.c +++ b/test/core/httpcli/httpcli_test.c @@ -54,7 +54,7 @@ static gpr_timespec n_seconds_time(int seconds) { } static void on_finish(void *arg, const grpc_httpcli_response *response, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { const char *expect = "Hello world!" "

This is a test

"; @@ -72,7 +72,7 @@ static void on_finish(void *arg, const grpc_httpcli_response *response, static void test_get(int use_ssl, int port) { grpc_httpcli_request req; char *host; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; g_done = 0; gpr_log(GPR_INFO, "running %s with use_ssl=%d.", "test_get", use_ssl); @@ -86,14 +86,14 @@ static void test_get(int use_ssl, int port) { req.handshaker = use_ssl ? &grpc_httpcli_ssl : &grpc_httpcli_plaintext; grpc_httpcli_get(&g_context, &g_pollset, &req, n_seconds_time(15), on_finish, - (void *)42, &call_list); + (void *)42, &closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (!g_done) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - n_seconds_time(20), &call_list); + n_seconds_time(20), &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); @@ -103,7 +103,7 @@ static void test_get(int use_ssl, int port) { static void test_post(int use_ssl, int port) { grpc_httpcli_request req; char *host; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; g_done = 0; gpr_log(GPR_INFO, "running %s with use_ssl=%d.", "test_post", (int)use_ssl); @@ -117,27 +117,28 @@ static void test_post(int use_ssl, int port) { req.handshaker = use_ssl ? &grpc_httpcli_ssl : &grpc_httpcli_plaintext; grpc_httpcli_post(&g_context, &g_pollset, &req, "hello", 5, - n_seconds_time(15), on_finish, (void *)42, &call_list); + n_seconds_time(15), on_finish, (void *)42, &closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (!g_done) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - n_seconds_time(20), &call_list); + n_seconds_time(20), &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); gpr_free(host); } -static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { +static void destroy_pollset(void *p, int success, + grpc_closure_list *closure_list) { grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_subprocess *server; char *me = argv[0]; char *lslash = strrchr(me, '/'); @@ -175,8 +176,8 @@ int main(int argc, char **argv) { grpc_httpcli_context_destroy(&g_context); grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run(&closure_list); grpc_shutdown(); gpr_subprocess_destroy(server); diff --git a/test/core/iomgr/alarm_list_test.c b/test/core/iomgr/alarm_list_test.c index 8082532434c..90ff49cb8f5 100644 --- a/test/core/iomgr/alarm_list_test.c +++ b/test/core/iomgr/alarm_list_test.c @@ -43,7 +43,7 @@ static int cb_called[MAX_CB][2]; -static void cb(void *arg, int success, grpc_call_list *call_list) { +static void cb(void *arg, int success, grpc_closure_list *closure_list) { cb_called[(gpr_intptr)arg][success]++; } @@ -51,7 +51,7 @@ static void add_test(void) { gpr_timespec start = gpr_now(GPR_CLOCK_REALTIME); int i; grpc_alarm alarms[20]; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_alarm_list_init(start); memset(cb_called, 0, sizeof(cb_called)); @@ -60,21 +60,21 @@ static void add_test(void) { for (i = 0; i < 10; i++) { grpc_alarm_init(&alarms[i], gpr_time_add(start, gpr_time_from_millis(10, GPR_TIMESPAN)), - cb, (void *)(gpr_intptr)i, start, &call_list); + cb, (void *)(gpr_intptr)i, start, &closure_list); } /* 1010 ms alarms. will expire in the next epoch */ for (i = 10; i < 20; i++) { grpc_alarm_init(&alarms[i], gpr_time_add(start, gpr_time_from_millis( 1010, GPR_TIMESPAN)), - cb, (void *)(gpr_intptr)i, start, &call_list); + cb, (void *)(gpr_intptr)i, start, &closure_list); } /* collect alarms. Only the first batch should be ready. */ GPR_ASSERT(10 == grpc_alarm_check(gpr_time_add(start, gpr_time_from_millis( 500, GPR_TIMESPAN)), - NULL, &call_list)); - grpc_call_list_run(&call_list); + NULL, &closure_list)); + grpc_closure_list_run(&closure_list); for (i = 0; i < 20; i++) { GPR_ASSERT(cb_called[i][1] == (i < 10)); GPR_ASSERT(cb_called[i][0] == 0); @@ -82,8 +82,8 @@ static void add_test(void) { GPR_ASSERT(0 == grpc_alarm_check(gpr_time_add(start, gpr_time_from_millis( 600, GPR_TIMESPAN)), - NULL, &call_list)); - grpc_call_list_run(&call_list); + NULL, &closure_list)); + grpc_closure_list_run(&closure_list); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 10)); GPR_ASSERT(cb_called[i][0] == 0); @@ -93,8 +93,8 @@ static void add_test(void) { GPR_ASSERT(10 == grpc_alarm_check( gpr_time_add(start, gpr_time_from_millis(1500, GPR_TIMESPAN)), - NULL, &call_list)); - grpc_call_list_run(&call_list); + NULL, &closure_list)); + grpc_closure_list_run(&closure_list); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 20)); GPR_ASSERT(cb_called[i][0] == 0); @@ -102,14 +102,14 @@ static void add_test(void) { GPR_ASSERT(0 == grpc_alarm_check(gpr_time_add(start, gpr_time_from_millis( 1600, GPR_TIMESPAN)), - NULL, &call_list)); + NULL, &closure_list)); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 20)); GPR_ASSERT(cb_called[i][0] == 0); } - grpc_alarm_list_shutdown(&call_list); - grpc_call_list_run(&call_list); + grpc_alarm_list_shutdown(&closure_list); + grpc_closure_list_run(&closure_list); } static gpr_timespec tfm(int m) { @@ -121,32 +121,32 @@ static gpr_timespec tfm(int m) { /* Cleaning up a list with pending alarms. */ void destruction_test(void) { grpc_alarm alarms[5]; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_alarm_list_init(gpr_time_0(GPR_CLOCK_REALTIME)); memset(cb_called, 0, sizeof(cb_called)); grpc_alarm_init(&alarms[0], tfm(100), cb, (void *)(gpr_intptr)0, - gpr_time_0(GPR_CLOCK_REALTIME), &call_list); + gpr_time_0(GPR_CLOCK_REALTIME), &closure_list); grpc_alarm_init(&alarms[1], tfm(3), cb, (void *)(gpr_intptr)1, - gpr_time_0(GPR_CLOCK_REALTIME), &call_list); + gpr_time_0(GPR_CLOCK_REALTIME), &closure_list); grpc_alarm_init(&alarms[2], tfm(100), cb, (void *)(gpr_intptr)2, - gpr_time_0(GPR_CLOCK_REALTIME), &call_list); + gpr_time_0(GPR_CLOCK_REALTIME), &closure_list); grpc_alarm_init(&alarms[3], tfm(3), cb, (void *)(gpr_intptr)3, - gpr_time_0(GPR_CLOCK_REALTIME), &call_list); + gpr_time_0(GPR_CLOCK_REALTIME), &closure_list); grpc_alarm_init(&alarms[4], tfm(1), cb, (void *)(gpr_intptr)4, - gpr_time_0(GPR_CLOCK_REALTIME), &call_list); - GPR_ASSERT(1 == grpc_alarm_check(tfm(2), NULL, &call_list)); - grpc_call_list_run(&call_list); + gpr_time_0(GPR_CLOCK_REALTIME), &closure_list); + GPR_ASSERT(1 == grpc_alarm_check(tfm(2), NULL, &closure_list)); + grpc_closure_list_run(&closure_list); GPR_ASSERT(1 == cb_called[4][1]); - grpc_alarm_cancel(&alarms[0], &call_list); - grpc_alarm_cancel(&alarms[3], &call_list); - grpc_call_list_run(&call_list); + grpc_alarm_cancel(&alarms[0], &closure_list); + grpc_alarm_cancel(&alarms[3], &closure_list); + grpc_closure_list_run(&closure_list); GPR_ASSERT(1 == cb_called[0][0]); GPR_ASSERT(1 == cb_called[3][0]); - grpc_alarm_list_shutdown(&call_list); - grpc_call_list_run(&call_list); + grpc_alarm_list_shutdown(&closure_list); + grpc_closure_list_run(&closure_list); GPR_ASSERT(1 == cb_called[1][0]); GPR_ASSERT(1 == cb_called[2][0]); } diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c index 491effd5ae2..32c715c4286 100644 --- a/test/core/iomgr/endpoint_pair_test.c +++ b/test/core/iomgr/endpoint_pair_test.c @@ -48,15 +48,15 @@ static void clean_up(void) {} static grpc_endpoint_test_fixture create_fixture_endpoint_pair( size_t slice_size) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_test_fixture f; grpc_endpoint_pair p = grpc_iomgr_create_endpoint_pair("test", slice_size); f.client_ep = p.client; f.server_ep = p.server; - grpc_endpoint_add_to_pollset(f.client_ep, &g_pollset, &call_list); - grpc_endpoint_add_to_pollset(f.server_ep, &g_pollset, &call_list); - grpc_call_list_run(&call_list); + grpc_endpoint_add_to_pollset(f.client_ep, &g_pollset, &closure_list); + grpc_endpoint_add_to_pollset(f.server_ep, &g_pollset, &closure_list); + grpc_closure_list_run(&closure_list); return f; } @@ -65,20 +65,21 @@ static grpc_endpoint_test_config configs[] = { {"tcp/tcp_socketpair", create_fixture_endpoint_pair, clean_up}, }; -static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { +static void destroy_pollset(void *p, int success, + grpc_closure_list *closure_list) { grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_test_init(argc, argv); grpc_init(); grpc_pollset_init(&g_pollset); grpc_endpoint_tests(configs[0], &g_pollset); grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run(&closure_list); grpc_shutdown(); return 0; diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index 31743167cd2..e106881d91b 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -127,7 +127,7 @@ struct read_and_write_test_state { }; static void read_and_write_test_read_handler(void *data, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { struct read_and_write_test_state *state = data; state->bytes_read += count_slices( @@ -140,12 +140,12 @@ static void read_and_write_test_read_handler(void *data, int success, gpr_mu_unlock(GRPC_POLLSET_MU(g_pollset)); } else if (success) { grpc_endpoint_read(state->read_ep, &state->incoming, &state->done_read, - call_list); + closure_list); } } static void read_and_write_test_write_handler(void *data, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { struct read_and_write_test_state *state = data; gpr_slice *slices = NULL; size_t nslices; @@ -162,7 +162,7 @@ static void read_and_write_test_write_handler(void *data, int success, gpr_slice_buffer_reset_and_unref(&state->outgoing); gpr_slice_buffer_addn(&state->outgoing, slices, nslices); grpc_endpoint_write(state->write_ep, &state->outgoing, &state->done_write, - call_list); + closure_list); free(slices); return; } @@ -186,7 +186,7 @@ static void read_and_write_test(grpc_endpoint_test_config config, gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); grpc_endpoint_test_fixture f = begin_test(config, "read_and_write_test", slice_size); - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_log(GPR_DEBUG, "num_bytes=%d write_size=%d slice_size=%d shutdown=%d", num_bytes, write_size, slice_size, shutdown); @@ -218,36 +218,36 @@ 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, 1, &call_list); - grpc_call_list_run(&call_list); + read_and_write_test_write_handler(&state, 1, &closure_list); + grpc_closure_list_run(&closure_list); grpc_endpoint_read(state.read_ep, &state.incoming, &state.done_read, - &call_list); + &closure_list); if (shutdown) { gpr_log(GPR_DEBUG, "shutdown read"); - grpc_endpoint_shutdown(state.read_ep, &call_list); + grpc_endpoint_shutdown(state.read_ep, &closure_list); gpr_log(GPR_DEBUG, "shutdown write"); - grpc_endpoint_shutdown(state.write_ep, &call_list); + grpc_endpoint_shutdown(state.write_ep, &closure_list); } - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(g_pollset)); while (!state.read_done || !state.write_done) { grpc_pollset_worker worker; GPR_ASSERT(gpr_time_cmp(gpr_now(GPR_CLOCK_MONOTONIC), deadline) < 0); grpc_pollset_work(g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline, &call_list); + deadline, &closure_list); } gpr_mu_unlock(GRPC_POLLSET_MU(g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); end_test(config); gpr_slice_buffer_destroy(&state.outgoing); gpr_slice_buffer_destroy(&state.incoming); - grpc_endpoint_destroy(state.read_ep, &call_list); - grpc_endpoint_destroy(state.write_ep, &call_list); - grpc_call_list_run(&call_list); + grpc_endpoint_destroy(state.read_ep, &closure_list); + grpc_endpoint_destroy(state.write_ep, &closure_list); + grpc_closure_list_run(&closure_list); } void grpc_endpoint_tests(grpc_endpoint_test_config config, diff --git a/test/core/iomgr/fd_conservation_posix_test.c b/test/core/iomgr/fd_conservation_posix_test.c index a1b1171b07d..1ffb5808b72 100644 --- a/test/core/iomgr/fd_conservation_posix_test.c +++ b/test/core/iomgr/fd_conservation_posix_test.c @@ -54,11 +54,11 @@ int main(int argc, char **argv) { GPR_ASSERT(0 == setrlimit(RLIMIT_NOFILE, &rlim)); for (i = 0; i < 100; i++) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; p = grpc_iomgr_create_endpoint_pair("test", 1); - grpc_endpoint_destroy(p.client, &call_list); - grpc_endpoint_destroy(p.server, &call_list); - grpc_call_list_run(&call_list); + grpc_endpoint_destroy(p.client, &closure_list); + grpc_endpoint_destroy(p.server, &closure_list); + grpc_closure_list_run(&closure_list); } grpc_iomgr_shutdown(); diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index f89d6c78248..0a8d40419b1 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -118,18 +118,18 @@ 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*/ - int success, grpc_call_list *call_list) { + int success, grpc_closure_list *closure_list) { session *se = arg; server *sv = se->sv; - grpc_fd_orphan(se->em_fd, NULL, "a", call_list); + grpc_fd_orphan(se->em_fd, NULL, "a", closure_list); gpr_free(se); /* Start to shutdown listen fd. */ - grpc_fd_shutdown(sv->em_fd, call_list); + grpc_fd_shutdown(sv->em_fd, closure_list); } /* Called when data become readable in a session. */ static void session_read_cb(void *arg, /*session*/ - int success, grpc_call_list *call_list) { + int success, grpc_closure_list *closure_list) { session *se = arg; int fd = se->em_fd->fd; @@ -137,7 +137,7 @@ static void session_read_cb(void *arg, /*session*/ ssize_t read_total = 0; if (!success) { - session_shutdown_cb(arg, 1, call_list); + session_shutdown_cb(arg, 1, closure_list); return; } @@ -152,7 +152,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, call_list); + session_shutdown_cb(arg, 1, closure_list); } else if (read_once == -1) { if (errno == EAGAIN) { /* An edge triggered event is cached in the kernel until next poll. @@ -163,7 +163,8 @@ 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, call_list); + grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure, + closure_list); } else { gpr_log(GPR_ERROR, "Unhandled read error %s", strerror(errno)); abort(); @@ -174,10 +175,10 @@ 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, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { server *sv = arg; - grpc_fd_orphan(sv->em_fd, NULL, "b", call_list); + grpc_fd_orphan(sv->em_fd, NULL, "b", closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); sv->done = 1; @@ -187,7 +188,7 @@ static void listen_shutdown_cb(void *arg /*server*/, int success, /* Called when a new TCP connection request arrives in the listening port. */ static void listen_cb(void *arg, /*=sv_arg*/ - int success, grpc_call_list *call_list) { + int success, grpc_closure_list *closure_list) { server *sv = arg; int fd; int flags; @@ -197,7 +198,7 @@ static void listen_cb(void *arg, /*=sv_arg*/ grpc_fd *listen_em_fd = sv->em_fd; if (!success) { - listen_shutdown_cb(arg, 1, call_list); + listen_shutdown_cb(arg, 1, closure_list); return; } @@ -209,12 +210,12 @@ static void listen_cb(void *arg, /*=sv_arg*/ se = gpr_malloc(sizeof(*se)); se->sv = sv; se->em_fd = grpc_fd_create(fd, "listener"); - grpc_pollset_add_fd(&g_pollset, se->em_fd, call_list); + grpc_pollset_add_fd(&g_pollset, se->em_fd, closure_list); se->session_read_closure.cb = session_read_cb; se->session_read_closure.cb_arg = se; - grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure, call_list); + grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure, closure_list); - grpc_fd_notify_on_read(listen_em_fd, &sv->listen_closure, call_list); + grpc_fd_notify_on_read(listen_em_fd, &sv->listen_closure, closure_list); } /* Max number of connections pending to be accepted by listen(). */ @@ -224,7 +225,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, grpc_call_list *call_list) { +static int server_start(server *sv, grpc_closure_list *closure_list) { int port = 0; int fd; struct sockaddr_in sin; @@ -238,11 +239,11 @@ static int server_start(server *sv, grpc_call_list *call_list) { 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, call_list); + grpc_pollset_add_fd(&g_pollset, sv->em_fd, closure_list); /* Register to be interested in reading from listen_fd. */ sv->listen_closure.cb = listen_cb; sv->listen_closure.cb_arg = sv; - grpc_fd_notify_on_read(sv->em_fd, &sv->listen_closure, call_list); + grpc_fd_notify_on_read(sv->em_fd, &sv->listen_closure, closure_list); return port; } @@ -251,12 +252,12 @@ static int server_start(server *sv, grpc_call_list *call_list) { static void server_wait_and_shutdown(server *sv) { gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (!sv->done) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); @@ -291,23 +292,23 @@ 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, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { client *cl = arg; - grpc_fd_orphan(cl->em_fd, NULL, "c", call_list); + grpc_fd_orphan(cl->em_fd, NULL, "c", closure_list); cl->done = 1; grpc_pollset_kick(&g_pollset, NULL); } /* Write as much as possible, then register notify_on_write. */ static void client_session_write(void *arg, /*client*/ - int success, grpc_call_list *call_list) { + int success, grpc_closure_list *closure_list) { client *cl = arg; int fd = cl->em_fd->fd; ssize_t write_once = 0; if (!success) { gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - client_session_shutdown_cb(arg, 1, call_list); + client_session_shutdown_cb(arg, 1, closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); return; } @@ -322,10 +323,10 @@ static void client_session_write(void *arg, /*client*/ if (cl->client_write_cnt < CLIENT_TOTAL_WRITE_CNT) { cl->write_closure.cb = client_session_write; cl->write_closure.cb_arg = cl; - grpc_fd_notify_on_write(cl->em_fd, &cl->write_closure, call_list); + grpc_fd_notify_on_write(cl->em_fd, &cl->write_closure, closure_list); cl->client_write_cnt++; } else { - client_session_shutdown_cb(arg, 1, call_list); + client_session_shutdown_cb(arg, 1, closure_list); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } else { @@ -335,7 +336,8 @@ 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, grpc_call_list *call_list) { +static void client_start(client *cl, int port, + grpc_closure_list *closure_list) { int fd; struct sockaddr_in sin; create_test_socket(port, &fd, &sin); @@ -356,9 +358,9 @@ static void client_start(client *cl, int port, grpc_call_list *call_list) { } cl->em_fd = grpc_fd_create(fd, "client"); - grpc_pollset_add_fd(&g_pollset, cl->em_fd, call_list); + grpc_pollset_add_fd(&g_pollset, cl->em_fd, closure_list); - client_session_write(cl, 1, call_list); + client_session_write(cl, 1, closure_list); } /* Wait for the signal to shutdown a client. */ @@ -366,11 +368,11 @@ static void client_wait_and_shutdown(client *cl) { gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (!cl->done) { grpc_pollset_worker worker; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); @@ -383,13 +385,13 @@ static void test_grpc_fd(void) { server sv; client cl; int port; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; server_init(&sv); - port = server_start(&sv, &call_list); + port = server_start(&sv, &closure_list); client_init(&cl); - client_start(&cl, port, &call_list); - grpc_call_list_run(&call_list); + client_start(&cl, port, &closure_list); + grpc_closure_list_run(&closure_list); client_wait_and_shutdown(&cl); server_wait_and_shutdown(&sv); GPR_ASSERT(sv.read_bytes_total == cl.write_bytes_total); @@ -397,7 +399,7 @@ static void test_grpc_fd(void) { } typedef struct fd_change_data { - void (*cb_that_ran)(void *, int success, grpc_call_list *call_list); + void (*cb_that_ran)(void *, int success, grpc_closure_list *closure_list); } fd_change_data; void init_change_data(fd_change_data *fdc) { fdc->cb_that_ran = NULL; } @@ -405,7 +407,7 @@ 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(void *arg /* fd_change_data */, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { fd_change_data *fdc = arg; gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -415,7 +417,7 @@ static void first_read_callback(void *arg /* fd_change_data */, int success, } static void second_read_callback(void *arg /* fd_change_data */, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { fd_change_data *fdc = arg; gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -437,7 +439,7 @@ static void test_grpc_fd_change(void) { ssize_t result; grpc_closure first_closure; grpc_closure second_closure; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; first_closure.cb = first_read_callback; first_closure.cb_arg = &a; @@ -454,10 +456,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, &call_list); + grpc_pollset_add_fd(&g_pollset, em_fd, &closure_list); /* Register the first callback, then make its FD readable */ - grpc_fd_notify_on_read(em_fd, &first_closure, &call_list); + grpc_fd_notify_on_read(em_fd, &first_closure, &closure_list); data = 0; result = write(sv[1], &data, 1); GPR_ASSERT(result == 1); @@ -467,9 +469,9 @@ static void test_grpc_fd_change(void) { while (a.cb_that_ran == NULL) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } GPR_ASSERT(a.cb_that_ran == first_read_callback); @@ -481,7 +483,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, &call_list); + grpc_fd_notify_on_read(em_fd, &second_closure, &closure_list); data = 0; result = write(sv[1], &data, 1); GPR_ASSERT(result == 1); @@ -490,37 +492,38 @@ static void test_grpc_fd_change(void) { while (b.cb_that_ran == NULL) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } /* Except now we verify that second_read_callback ran instead */ GPR_ASSERT(b.cb_that_ran == second_read_callback); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_fd_orphan(em_fd, NULL, "d", &call_list); - grpc_call_list_run(&call_list); + grpc_fd_orphan(em_fd, NULL, "d", &closure_list); + grpc_closure_list_run(&closure_list); destroy_change_data(&a); destroy_change_data(&b); close(sv[1]); } -static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { +static void destroy_pollset(void *p, int success, + grpc_closure_list *closure_list) { grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_test_init(argc, argv); grpc_iomgr_init(); grpc_pollset_init(&g_pollset); test_grpc_fd(); test_grpc_fd_change(); grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run(&closure_list); grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/resolve_address_test.c b/test/core/iomgr/resolve_address_test.c index 2ea3b56ee62..4d41020768a 100644 --- a/test/core/iomgr/resolve_address_test.c +++ b/test/core/iomgr/resolve_address_test.c @@ -43,7 +43,7 @@ static gpr_timespec test_deadline(void) { } static void must_succeed(void* evp, grpc_resolved_addresses* p, - grpc_call_list* call_list) { + grpc_closure_list* closure_list) { GPR_ASSERT(p); GPR_ASSERT(p->naddrs >= 1); grpc_resolved_addresses_destroy(p); @@ -51,7 +51,7 @@ static void must_succeed(void* evp, grpc_resolved_addresses* p, } static void must_fail(void* evp, grpc_resolved_addresses* p, - grpc_call_list* call_list) { + grpc_closure_list* closure_list) { GPR_ASSERT(!p); gpr_event_set(evp, (void*)1); } diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index 0dd752d841c..436e5cf7dfa 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -63,16 +63,17 @@ static void finish_connection() { gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } -static void must_succeed(void *arg, int success, grpc_call_list *call_list) { +static void must_succeed(void *arg, int success, + grpc_closure_list *closure_list) { GPR_ASSERT(g_connecting != NULL); GPR_ASSERT(success); - grpc_endpoint_shutdown(g_connecting, call_list); - grpc_endpoint_destroy(g_connecting, call_list); + grpc_endpoint_shutdown(g_connecting, closure_list); + grpc_endpoint_destroy(g_connecting, closure_list); g_connecting = NULL; finish_connection(); } -static void must_fail(void *arg, int success, grpc_call_list *call_list) { +static void must_fail(void *arg, int success, grpc_closure_list *closure_list) { GPR_ASSERT(g_connecting == NULL); GPR_ASSERT(!success); finish_connection(); @@ -85,7 +86,7 @@ void test_succeeds(void) { int r; int connections_complete_before; grpc_closure done; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_log(GPR_DEBUG, "test_succeeds"); @@ -107,7 +108,7 @@ void test_succeeds(void) { grpc_closure_init(&done, must_succeed, NULL); grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, (struct sockaddr *)&addr, addr_len, - gpr_inf_future(GPR_CLOCK_REALTIME), &call_list); + gpr_inf_future(GPR_CLOCK_REALTIME), &closure_list); /* await the connection */ do { @@ -122,9 +123,9 @@ void test_succeeds(void) { while (g_connections_complete == connections_complete_before) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), &call_list); + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } @@ -136,7 +137,7 @@ void test_fails(void) { socklen_t addr_len = sizeof(addr); int connections_complete_before; grpc_closure done; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_log(GPR_DEBUG, "test_fails"); @@ -151,7 +152,7 @@ void test_fails(void) { grpc_closure_init(&done, must_fail, NULL); grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, (struct sockaddr *)&addr, addr_len, - gpr_inf_future(GPR_CLOCK_REALTIME), &call_list); + gpr_inf_future(GPR_CLOCK_REALTIME), &closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -159,9 +160,9 @@ void test_fails(void) { while (g_connections_complete == connections_complete_before) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - test_deadline(), &call_list); + test_deadline(), &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } @@ -179,7 +180,7 @@ void test_times_out(void) { int connections_complete_before; gpr_timespec connect_deadline; grpc_closure done; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_log(GPR_DEBUG, "test_times_out"); @@ -216,7 +217,7 @@ void test_times_out(void) { grpc_closure_init(&done, must_fail, NULL); grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, (struct sockaddr *)&addr, addr_len, connect_deadline, - &call_list); + &closure_list); /* Make sure the event doesn't trigger early */ gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -242,9 +243,9 @@ void test_times_out(void) { connections_complete_before + is_after_deadline); } grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10), &call_list); + GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10), &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); @@ -255,27 +256,28 @@ void test_times_out(void) { } } -static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { +static void destroy_pollset(void *p, int success, + grpc_closure_list *closure_list) { grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_test_init(argc, argv); grpc_init(); grpc_pollset_set_init(&g_pollset_set); grpc_pollset_init(&g_pollset); - grpc_pollset_set_add_pollset(&g_pollset_set, &g_pollset, &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_set_add_pollset(&g_pollset_set, &g_pollset, &closure_list); + grpc_closure_list_run(&closure_list); test_succeeds(); gpr_log(GPR_ERROR, "End of first test"); test_fails(); test_times_out(); grpc_pollset_set_destroy(&g_pollset_set); grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run(&closure_list); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index 09e67155e41..9edfe76e046 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -138,7 +138,8 @@ static size_t count_slices(gpr_slice *slices, size_t nslices, return num_bytes; } -static void read_cb(void *user_data, int success, grpc_call_list *call_list) { +static void read_cb(void *user_data, int success, + grpc_closure_list *closure_list) { struct read_socket_state *state = (struct read_socket_state *)user_data; size_t read_bytes; int current_data; @@ -155,7 +156,8 @@ static void read_cb(void *user_data, int success, grpc_call_list *call_list) { if (state->read_bytes >= state->target_read_bytes) { gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } else { - grpc_endpoint_read(state->ep, &state->incoming, &state->read_cb, call_list); + grpc_endpoint_read(state->ep, &state->incoming, &state->read_cb, + closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } } @@ -167,7 +169,7 @@ static void read_test(size_t num_bytes, size_t slice_size) { struct read_socket_state state; size_t written_bytes; gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_log(GPR_INFO, "Read test of size %d, slice size %d", num_bytes, slice_size); @@ -175,7 +177,7 @@ static void read_test(size_t num_bytes, size_t slice_size) { create_sockets(sv); ep = grpc_tcp_create(grpc_fd_create(sv[1], "read_test"), slice_size, "test"); - grpc_endpoint_add_to_pollset(ep, &g_pollset, &call_list); + grpc_endpoint_add_to_pollset(ep, &g_pollset, &closure_list); written_bytes = fill_socket_partial(sv[0], num_bytes); gpr_log(GPR_INFO, "Wrote %d bytes", written_bytes); @@ -186,23 +188,23 @@ static void read_test(size_t num_bytes, size_t slice_size) { gpr_slice_buffer_init(&state.incoming); grpc_closure_init(&state.read_cb, read_cb, &state); - grpc_endpoint_read(ep, &state.incoming, &state.read_cb, &call_list); + grpc_endpoint_read(ep, &state.incoming, &state.read_cb, &closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline, &call_list); + deadline, &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); gpr_slice_buffer_destroy(&state.incoming); - grpc_endpoint_destroy(ep, &call_list); - grpc_call_list_run(&call_list); + grpc_endpoint_destroy(ep, &closure_list); + grpc_closure_list_run(&closure_list); } /* Write to a socket until it fills up, then read from it using the grpc_tcp @@ -213,7 +215,7 @@ static void large_read_test(size_t slice_size) { struct read_socket_state state; ssize_t written_bytes; gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_log(GPR_INFO, "Start large read test, slice size %d", slice_size); @@ -221,7 +223,7 @@ static void large_read_test(size_t slice_size) { ep = grpc_tcp_create(grpc_fd_create(sv[1], "large_read_test"), slice_size, "test"); - grpc_endpoint_add_to_pollset(ep, &g_pollset, &call_list); + grpc_endpoint_add_to_pollset(ep, &g_pollset, &closure_list); written_bytes = fill_socket(sv[0]); gpr_log(GPR_INFO, "Wrote %d bytes", written_bytes); @@ -232,23 +234,23 @@ static void large_read_test(size_t slice_size) { gpr_slice_buffer_init(&state.incoming); grpc_closure_init(&state.read_cb, read_cb, &state); - grpc_endpoint_read(ep, &state.incoming, &state.read_cb, &call_list); + grpc_endpoint_read(ep, &state.incoming, &state.read_cb, &closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline, &call_list); + deadline, &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); gpr_slice_buffer_destroy(&state.incoming); - grpc_endpoint_destroy(ep, &call_list); - grpc_call_list_run(&call_list); + grpc_endpoint_destroy(ep, &closure_list); + grpc_closure_list_run(&closure_list); } struct write_socket_state { @@ -280,7 +282,7 @@ static gpr_slice *allocate_blocks(size_t num_bytes, size_t slice_size, } static void write_done(void *user_data /* write_socket_state */, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { struct write_socket_state *state = (struct write_socket_state *)user_data; gpr_log(GPR_INFO, "Write done callback called"); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -297,7 +299,7 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { int flags; int current = 0; int i; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; flags = fcntl(fd, F_GETFL, 0); GPR_ASSERT(fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) == 0); @@ -306,9 +308,9 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { grpc_pollset_worker worker; gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10), &call_list); + GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10), &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); do { bytes_read = read(fd, buf, bytes_left > read_size ? read_size : bytes_left); @@ -340,7 +342,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { gpr_slice_buffer outgoing; grpc_closure write_done_closure; gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_log(GPR_INFO, "Start write test with %d bytes, slice size %d", num_bytes, slice_size); @@ -349,7 +351,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { ep = grpc_tcp_create(grpc_fd_create(sv[1], "write_test"), GRPC_TCP_DEFAULT_READ_SLICE_SIZE, "test"); - grpc_endpoint_add_to_pollset(ep, &g_pollset, &call_list); + grpc_endpoint_add_to_pollset(ep, &g_pollset, &closure_list); state.ep = ep; state.write_done = 0; @@ -360,7 +362,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { gpr_slice_buffer_addn(&outgoing, slices, num_blocks); grpc_closure_init(&write_done_closure, write_done, &state); - grpc_endpoint_write(ep, &outgoing, &write_done_closure, &call_list); + grpc_endpoint_write(ep, &outgoing, &write_done_closure, &closure_list); drain_socket_blocking(sv[0], num_bytes, num_bytes); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); for (;;) { @@ -369,17 +371,17 @@ static void write_test(size_t num_bytes, size_t slice_size) { break; } grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline, &call_list); + deadline, &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); gpr_slice_buffer_destroy(&outgoing); - grpc_endpoint_destroy(ep, &call_list); + grpc_endpoint_destroy(ep, &closure_list); gpr_free(slices); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } void run_tests(void) { @@ -409,17 +411,17 @@ static grpc_endpoint_test_fixture create_fixture_tcp_socketpair( size_t slice_size) { int sv[2]; grpc_endpoint_test_fixture f; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; create_sockets(sv); f.client_ep = grpc_tcp_create(grpc_fd_create(sv[0], "fixture:client"), slice_size, "test"); f.server_ep = grpc_tcp_create(grpc_fd_create(sv[1], "fixture:server"), slice_size, "test"); - grpc_endpoint_add_to_pollset(f.client_ep, &g_pollset, &call_list); - grpc_endpoint_add_to_pollset(f.server_ep, &g_pollset, &call_list); + grpc_endpoint_add_to_pollset(f.client_ep, &g_pollset, &closure_list); + grpc_endpoint_add_to_pollset(f.server_ep, &g_pollset, &closure_list); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); return f; } @@ -428,21 +430,22 @@ static grpc_endpoint_test_config configs[] = { {"tcp/tcp_socketpair", create_fixture_tcp_socketpair, clean_up}, }; -static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { +static void destroy_pollset(void *p, int success, + grpc_closure_list *closure_list) { grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_test_init(argc, argv); grpc_init(); grpc_pollset_init(&g_pollset); run_tests(); grpc_endpoint_tests(configs[0], &g_pollset); grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run(&closure_list); grpc_shutdown(); return 0; diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index 6ce78d20888..4a3b51efc69 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -49,9 +49,9 @@ static grpc_pollset g_pollset; static int g_nconnects = 0; static void on_connect(void *arg, grpc_endpoint *tcp, - grpc_call_list *call_list) { - grpc_endpoint_shutdown(tcp, call_list); - grpc_endpoint_destroy(tcp, call_list); + grpc_closure_list *closure_list) { + grpc_endpoint_shutdown(tcp, closure_list); + grpc_endpoint_destroy(tcp, closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); g_nconnects++; @@ -65,16 +65,16 @@ static void test_no_op(void) { } static void test_no_op_with_start(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_tcp_server *s = grpc_tcp_server_create(); LOG_TEST("test_no_op_with_start"); - grpc_tcp_server_start(s, NULL, 0, on_connect, NULL, &call_list); + grpc_tcp_server_start(s, NULL, 0, on_connect, NULL, &closure_list); grpc_tcp_server_destroy(s, NULL, NULL); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static void test_no_op_with_port(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; struct sockaddr_in addr; grpc_tcp_server *s = grpc_tcp_server_create(); LOG_TEST("test_no_op_with_port"); @@ -84,12 +84,12 @@ static void test_no_op_with_port(void) { GPR_ASSERT( grpc_tcp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr))); - grpc_tcp_server_destroy(s, NULL, &call_list); - grpc_call_list_run(&call_list); + grpc_tcp_server_destroy(s, NULL, &closure_list); + grpc_closure_list_run(&closure_list); } static void test_no_op_with_port_and_start(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; struct sockaddr_in addr; grpc_tcp_server *s = grpc_tcp_server_create(); LOG_TEST("test_no_op_with_port_and_start"); @@ -99,14 +99,14 @@ static void test_no_op_with_port_and_start(void) { GPR_ASSERT( grpc_tcp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr))); - grpc_tcp_server_start(s, NULL, 0, on_connect, NULL, &call_list); + grpc_tcp_server_start(s, NULL, 0, on_connect, NULL, &closure_list); - grpc_tcp_server_destroy(s, NULL, &call_list); - grpc_call_list_run(&call_list); + grpc_tcp_server_destroy(s, NULL, &closure_list); + grpc_closure_list_run(&closure_list); } static void test_connect(int n) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; struct sockaddr_storage addr; socklen_t addr_len = sizeof(addr); int svrfd, clifd; @@ -128,7 +128,7 @@ static void test_connect(int n) { GPR_ASSERT(addr_len <= sizeof(addr)); pollsets[0] = &g_pollset; - grpc_tcp_server_start(s, pollsets, 1, on_connect, NULL, &call_list); + grpc_tcp_server_start(s, pollsets, 1, on_connect, NULL, &closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -146,9 +146,9 @@ static void test_connect(int n) { gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline, &call_list); + deadline, &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } gpr_log(GPR_DEBUG, "wait done"); @@ -159,17 +159,18 @@ static void test_connect(int n) { gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_tcp_server_destroy(s, NULL, &call_list); - grpc_call_list_run(&call_list); + grpc_tcp_server_destroy(s, NULL, &closure_list); + grpc_closure_list_run(&closure_list); } -static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { +static void destroy_pollset(void *p, int success, + grpc_closure_list *closure_list) { grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_test_init(argc, argv); grpc_iomgr_init(); grpc_pollset_init(&g_pollset); @@ -182,8 +183,8 @@ int main(int argc, char **argv) { test_connect(10); grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run(&closure_list); grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c index 86b6b9a9fa8..067838777a0 100644 --- a/test/core/iomgr/udp_server_test.c +++ b/test/core/iomgr/udp_server_test.c @@ -69,12 +69,12 @@ static void test_no_op(void) { } static void test_no_op_with_start(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_udp_server *s = grpc_udp_server_create(); LOG_TEST("test_no_op_with_start"); - grpc_udp_server_start(s, NULL, 0, &call_list); + grpc_udp_server_start(s, NULL, 0, &closure_list); grpc_udp_server_destroy(s, NULL, NULL); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static void test_no_op_with_port(void) { @@ -91,7 +91,7 @@ static void test_no_op_with_port(void) { } static void test_no_op_with_port_and_start(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; struct sockaddr_in addr; grpc_udp_server *s = grpc_udp_server_create(); LOG_TEST("test_no_op_with_port_and_start"); @@ -101,14 +101,14 @@ static void test_no_op_with_port_and_start(void) { GPR_ASSERT(grpc_udp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr), on_read)); - grpc_udp_server_start(s, NULL, 0, &call_list); + grpc_udp_server_start(s, NULL, 0, &closure_list); - grpc_udp_server_destroy(s, NULL, &call_list); - grpc_call_list_run(&call_list); + grpc_udp_server_destroy(s, NULL, &closure_list); + grpc_closure_list_run(&closure_list); } static void test_receive(int number_of_clients) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; struct sockaddr_storage addr; socklen_t addr_len = sizeof(addr); int clifd, svrfd; @@ -133,7 +133,7 @@ static void test_receive(int number_of_clients) { GPR_ASSERT(addr_len <= sizeof(addr)); pollsets[0] = &g_pollset; - grpc_udp_server_start(s, pollsets, 1, &call_list); + grpc_udp_server_start(s, pollsets, 1, &closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -150,9 +150,9 @@ static void test_receive(int number_of_clients) { gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0) { grpc_pollset_worker worker; grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline, &call_list); + deadline, &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } GPR_ASSERT(g_number_of_reads == number_of_reads_before + 1); @@ -165,13 +165,14 @@ static void test_receive(int number_of_clients) { grpc_udp_server_destroy(s, NULL, NULL); } -static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { +static void destroy_pollset(void *p, int success, + grpc_closure_list *closure_list) { grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_test_init(argc, argv); grpc_iomgr_init(); grpc_pollset_init(&g_pollset); @@ -184,8 +185,8 @@ int main(int argc, char **argv) { test_receive(10); grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run(&closure_list); grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c index 08030dfe832..e4f172d32e2 100644 --- a/test/core/iomgr/workqueue_test.c +++ b/test/core/iomgr/workqueue_test.c @@ -40,7 +40,8 @@ static grpc_pollset g_pollset; -static void must_succeed(void *p, int success, grpc_call_list *call_list) { +static void must_succeed(void *p, int success, + grpc_closure_list *closure_list) { GPR_ASSERT(success == 1); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); *(int *)p = 1; @@ -51,34 +52,35 @@ static void must_succeed(void *p, int success, grpc_call_list *call_list) { static void test_add_closure(void) { grpc_closure c; int done = 0; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; - grpc_workqueue *wq = grpc_workqueue_create(&call_list); + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_workqueue *wq = grpc_workqueue_create(&closure_list); gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5); grpc_pollset_worker worker; grpc_closure_init(&c, must_succeed, &done); grpc_workqueue_push(wq, &c, 1); - grpc_workqueue_add_to_pollset(wq, &g_pollset, &call_list); + grpc_workqueue_add_to_pollset(wq, &g_pollset, &closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); GPR_ASSERT(!done); grpc_pollset_work(&g_pollset, &worker, gpr_now(deadline.clock_type), deadline, - &call_list); + &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); GPR_ASSERT(done); - GRPC_WORKQUEUE_UNREF(wq, "destroy", &call_list); - grpc_call_list_run(&call_list); + GRPC_WORKQUEUE_UNREF(wq, "destroy", &closure_list); + grpc_closure_list_run(&closure_list); } -static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { +static void destroy_pollset(void *p, int success, + grpc_closure_list *closure_list) { grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_test_init(argc, argv); grpc_init(); grpc_pollset_init(&g_pollset); @@ -86,8 +88,8 @@ int main(int argc, char **argv) { test_add_closure(); grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run(&closure_list); grpc_shutdown(); return 0; } diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index c7bd7ab4f4f..e48aab95fa4 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -319,7 +319,7 @@ static void check_google_iam_metadata(void *user_data, grpc_credentials_md *md_elems, size_t num_md, grpc_credentials_status status, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_credentials *c = (grpc_credentials *)user_data; expected_md emd[] = {{GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, test_google_iam_authorization_token}, @@ -332,7 +332,7 @@ static void check_google_iam_metadata(void *user_data, } static void test_google_iam_creds(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_credentials *creds = grpc_google_iam_credentials_create( test_google_iam_authorization_token, test_google_iam_authority_selector, NULL); @@ -340,15 +340,15 @@ static void test_google_iam_creds(void) { GPR_ASSERT(grpc_credentials_has_request_metadata_only(creds)); grpc_credentials_get_request_metadata(creds, NULL, test_service_url, check_google_iam_metadata, creds, - &call_list); - grpc_call_list_run(&call_list); + &closure_list); + grpc_closure_list_run(&closure_list); } static void check_access_token_metadata(void *user_data, grpc_credentials_md *md_elems, size_t num_md, grpc_credentials_status status, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_credentials *c = (grpc_credentials *)user_data; expected_md emd[] = {{GRPC_AUTHORIZATION_METADATA_KEY, "Bearer blah"}}; GPR_ASSERT(status == GRPC_CREDENTIALS_OK); @@ -358,22 +358,20 @@ static void check_access_token_metadata(void *user_data, } static void test_access_token_creds(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_credentials *creds = grpc_access_token_credentials_create("blah", NULL); GPR_ASSERT(grpc_credentials_has_request_metadata(creds)); GPR_ASSERT(grpc_credentials_has_request_metadata_only(creds)); GPR_ASSERT(strcmp(creds->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); grpc_credentials_get_request_metadata(creds, NULL, test_service_url, check_access_token_metadata, creds, - &call_list); - grpc_call_list_run(&call_list); + &closure_list); + grpc_closure_list_run(&closure_list); } -static void check_ssl_oauth2_composite_metadata(void *user_data, - grpc_credentials_md *md_elems, - size_t num_md, - grpc_credentials_status status, - grpc_call_list *call_list) { +static void check_ssl_oauth2_composite_metadata( + void *user_data, grpc_credentials_md *md_elems, size_t num_md, + grpc_credentials_status status, grpc_closure_list *closure_list) { grpc_credentials *c = (grpc_credentials *)user_data; expected_md emd[] = { {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}}; @@ -384,7 +382,7 @@ static void check_ssl_oauth2_composite_metadata(void *user_data, } static void test_ssl_oauth2_composite_creds(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_credentials *ssl_creds = grpc_ssl_credentials_create(test_root_cert, NULL, NULL); const grpc_credentials_array *creds_array; @@ -406,8 +404,8 @@ static void test_ssl_oauth2_composite_creds(void) { GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); grpc_credentials_get_request_metadata(composite_creds, NULL, test_service_url, check_ssl_oauth2_composite_metadata, - composite_creds, &call_list); - grpc_call_list_run(&call_list); + composite_creds, &closure_list); + grpc_closure_list_run(&closure_list); } void test_ssl_fake_transport_security_composite_creds_failure(void) { @@ -424,7 +422,7 @@ void test_ssl_fake_transport_security_composite_creds_failure(void) { static void check_ssl_oauth2_google_iam_composite_metadata( void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status, grpc_call_list *call_list) { + grpc_credentials_status status, grpc_closure_list *closure_list) { grpc_credentials *c = (grpc_credentials *)user_data; expected_md emd[] = { {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}, @@ -439,7 +437,7 @@ static void check_ssl_oauth2_google_iam_composite_metadata( } static void test_ssl_oauth2_google_iam_composite_creds(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_credentials *ssl_creds = grpc_ssl_credentials_create(test_root_cert, NULL, NULL); const grpc_credentials_array *creds_array; @@ -471,15 +469,13 @@ static void test_ssl_oauth2_google_iam_composite_creds(void) { grpc_credentials_get_request_metadata( composite_creds, NULL, test_service_url, check_ssl_oauth2_google_iam_composite_metadata, composite_creds, - &call_list); - grpc_call_list_run(&call_list); + &closure_list); + grpc_closure_list_run(&closure_list); } -static void on_oauth2_creds_get_metadata_success(void *user_data, - grpc_credentials_md *md_elems, - size_t num_md, - grpc_credentials_status status, - grpc_call_list *call_list) { +static void on_oauth2_creds_get_metadata_success( + void *user_data, grpc_credentials_md *md_elems, size_t num_md, + grpc_credentials_status status, grpc_closure_list *closure_list) { GPR_ASSERT(status == GRPC_CREDENTIALS_OK); GPR_ASSERT(num_md == 1); GPR_ASSERT(gpr_slice_str_cmp(md_elems[0].key, "Authorization") == 0); @@ -490,11 +486,9 @@ static void on_oauth2_creds_get_metadata_success(void *user_data, GPR_ASSERT(strcmp((const char *)user_data, test_user_data) == 0); } -static void on_oauth2_creds_get_metadata_failure(void *user_data, - grpc_credentials_md *md_elems, - size_t num_md, - grpc_credentials_status status, - grpc_call_list *call_list) { +static void on_oauth2_creds_get_metadata_failure( + void *user_data, grpc_credentials_md *md_elems, size_t num_md, + grpc_credentials_status status, grpc_closure_list *closure_list) { GPR_ASSERT(status == GRPC_CREDENTIALS_ERROR); GPR_ASSERT(num_md == 0); GPR_ASSERT(user_data != NULL); @@ -517,21 +511,21 @@ static void validate_compute_engine_http_request( static int compute_engine_httpcli_get_success_override( const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_httpcli_response response = http_response(200, valid_oauth2_json_response); validate_compute_engine_http_request(request); - on_response(user_data, &response, call_list); + on_response(user_data, &response, closure_list); return 1; } static int compute_engine_httpcli_get_failure_override( const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_httpcli_response response = http_response(403, "Not Authorized."); validate_compute_engine_http_request(request); - on_response(user_data, &response, call_list); + on_response(user_data, &response, closure_list); return 1; } @@ -539,7 +533,7 @@ static int httpcli_post_should_not_be_called( const grpc_httpcli_request *request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { GPR_ASSERT("HTTP POST should not be called" == NULL); return 1; } @@ -547,13 +541,13 @@ static int httpcli_post_should_not_be_called( static int httpcli_get_should_not_be_called( const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { GPR_ASSERT("HTTP GET should not be called" == NULL); return 1; } static void test_compute_engine_creds_success(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_credentials *compute_engine_creds = grpc_google_compute_engine_credentials_create(NULL); GPR_ASSERT(grpc_credentials_has_request_metadata(compute_engine_creds)); @@ -562,37 +556,40 @@ static void test_compute_engine_creds_success(void) { /* First request: http get should be called. */ grpc_httpcli_set_override(compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); - grpc_credentials_get_request_metadata( - compute_engine_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_success, (void *)test_user_data, &call_list); - grpc_call_list_run(&call_list); + grpc_credentials_get_request_metadata(compute_engine_creds, NULL, + test_service_url, + on_oauth2_creds_get_metadata_success, + (void *)test_user_data, &closure_list); + grpc_closure_list_run(&closure_list); /* Second request: the cached token should be served directly. */ grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - grpc_credentials_get_request_metadata( - compute_engine_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_success, (void *)test_user_data, &call_list); - grpc_call_list_run(&call_list); + grpc_credentials_get_request_metadata(compute_engine_creds, NULL, + test_service_url, + on_oauth2_creds_get_metadata_success, + (void *)test_user_data, &closure_list); + grpc_closure_list_run(&closure_list); grpc_credentials_unref(compute_engine_creds); grpc_httpcli_set_override(NULL, NULL); } static void test_compute_engine_creds_failure(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_credentials *compute_engine_creds = grpc_google_compute_engine_credentials_create(NULL); grpc_httpcli_set_override(compute_engine_httpcli_get_failure_override, httpcli_post_should_not_be_called); GPR_ASSERT(grpc_credentials_has_request_metadata(compute_engine_creds)); GPR_ASSERT(grpc_credentials_has_request_metadata_only(compute_engine_creds)); - grpc_credentials_get_request_metadata( - compute_engine_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_failure, (void *)test_user_data, &call_list); + grpc_credentials_get_request_metadata(compute_engine_creds, NULL, + test_service_url, + on_oauth2_creds_get_metadata_failure, + (void *)test_user_data, &closure_list); grpc_credentials_unref(compute_engine_creds); grpc_httpcli_set_override(NULL, NULL); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static void validate_refresh_token_http_request( @@ -620,26 +617,26 @@ 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, gpr_timespec deadline, grpc_httpcli_response_cb on_response, - void *user_data, grpc_call_list *call_list) { + void *user_data, grpc_closure_list *closure_list) { grpc_httpcli_response response = http_response(200, valid_oauth2_json_response); validate_refresh_token_http_request(request, body, body_size); - on_response(user_data, &response, call_list); + on_response(user_data, &response, closure_list); return 1; } static int refresh_token_httpcli_post_failure( const grpc_httpcli_request *request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, - void *user_data, grpc_call_list *call_list) { + void *user_data, grpc_closure_list *closure_list) { grpc_httpcli_response response = http_response(403, "Not Authorized."); validate_refresh_token_http_request(request, body, body_size); - on_response(user_data, &response, call_list); + on_response(user_data, &response, closure_list); return 1; } static void test_refresh_token_creds_success(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_credentials *refresh_token_creds = grpc_google_refresh_token_credentials_create(test_refresh_token_str, NULL); @@ -649,26 +646,28 @@ static void test_refresh_token_creds_success(void) { /* First request: http get should be called. */ grpc_httpcli_set_override(httpcli_get_should_not_be_called, refresh_token_httpcli_post_success); - grpc_credentials_get_request_metadata( - refresh_token_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_success, (void *)test_user_data, &call_list); - grpc_call_list_run(&call_list); + grpc_credentials_get_request_metadata(refresh_token_creds, NULL, + test_service_url, + on_oauth2_creds_get_metadata_success, + (void *)test_user_data, &closure_list); + grpc_closure_list_run(&closure_list); /* Second request: the cached token should be served directly. */ grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - grpc_credentials_get_request_metadata( - refresh_token_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_success, (void *)test_user_data, &call_list); - grpc_call_list_run(&call_list); + grpc_credentials_get_request_metadata(refresh_token_creds, NULL, + test_service_url, + on_oauth2_creds_get_metadata_success, + (void *)test_user_data, &closure_list); + grpc_closure_list_run(&closure_list); grpc_credentials_unref(refresh_token_creds); grpc_httpcli_set_override(NULL, NULL); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static void test_refresh_token_creds_failure(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_credentials *refresh_token_creds = grpc_google_refresh_token_credentials_create(test_refresh_token_str, NULL); @@ -676,12 +675,13 @@ static void test_refresh_token_creds_failure(void) { refresh_token_httpcli_post_failure); GPR_ASSERT(grpc_credentials_has_request_metadata(refresh_token_creds)); GPR_ASSERT(grpc_credentials_has_request_metadata_only(refresh_token_creds)); - grpc_credentials_get_request_metadata( - refresh_token_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_failure, (void *)test_user_data, &call_list); + grpc_credentials_get_request_metadata(refresh_token_creds, NULL, + test_service_url, + on_oauth2_creds_get_metadata_failure, + (void *)test_user_data, &closure_list); grpc_credentials_unref(refresh_token_creds); grpc_httpcli_set_override(NULL, NULL); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static void validate_jwt_encode_and_sign_params( @@ -733,7 +733,7 @@ static void on_jwt_creds_get_metadata_success(void *user_data, grpc_credentials_md *md_elems, size_t num_md, grpc_credentials_status status, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { char *expected_md_value; gpr_asprintf(&expected_md_value, "Bearer %s", test_signed_jwt); GPR_ASSERT(status == GRPC_CREDENTIALS_OK); @@ -749,7 +749,7 @@ static void on_jwt_creds_get_metadata_failure(void *user_data, grpc_credentials_md *md_elems, size_t num_md, grpc_credentials_status status, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { GPR_ASSERT(status == GRPC_CREDENTIALS_ERROR); GPR_ASSERT(num_md == 0); GPR_ASSERT(user_data != NULL); @@ -758,7 +758,7 @@ static void on_jwt_creds_get_metadata_failure(void *user_data, static void test_jwt_creds_success(void) { char *json_key_string = test_json_key_str(); - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_credentials *jwt_creds = grpc_service_account_jwt_access_credentials_create( json_key_string, grpc_max_auth_token_lifetime, NULL); @@ -769,24 +769,24 @@ static void test_jwt_creds_success(void) { grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, - (void *)test_user_data, &call_list); - grpc_call_list_run(&call_list); + (void *)test_user_data, &closure_list); + grpc_closure_list_run(&closure_list); /* Second request: the cached token should be served directly. */ grpc_jwt_encode_and_sign_set_override( encode_and_sign_jwt_should_not_be_called); grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, - (void *)test_user_data, &call_list); - grpc_call_list_run(&call_list); + (void *)test_user_data, &closure_list); + grpc_closure_list_run(&closure_list); /* Third request: Different service url so jwt_encode_and_sign should be called again (no caching). */ grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); grpc_credentials_get_request_metadata(jwt_creds, NULL, other_test_service_url, on_jwt_creds_get_metadata_success, - (void *)test_user_data, &call_list); - grpc_call_list_run(&call_list); + (void *)test_user_data, &closure_list); + grpc_closure_list_run(&closure_list); gpr_free(json_key_string); grpc_credentials_unref(jwt_creds); @@ -795,7 +795,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_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_credentials *jwt_creds = grpc_service_account_jwt_access_credentials_create( json_key_string, grpc_max_auth_token_lifetime, NULL); @@ -805,12 +805,12 @@ static void test_jwt_creds_signing_failure(void) { grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_failure); grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_failure, - (void *)test_user_data, &call_list); + (void *)test_user_data, &closure_list); gpr_free(json_key_string); grpc_credentials_unref(jwt_creds); grpc_jwt_encode_and_sign_set_override(NULL); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static void set_google_default_creds_env_var_with_file_contents( @@ -915,11 +915,9 @@ static void plugin_get_metadata_failure(void *state, const char *service_url, "Could not get metadata for plugin."); } -static void on_plugin_metadata_received_success(void *user_data, - grpc_credentials_md *md_elems, - size_t num_md, - grpc_credentials_status status, - grpc_call_list *call_list) { +static void on_plugin_metadata_received_success( + void *user_data, grpc_credentials_md *md_elems, size_t num_md, + grpc_credentials_status status, grpc_closure_list *closure_list) { size_t i = 0; GPR_ASSERT(user_data == NULL); GPR_ASSERT(md_elems != NULL); @@ -930,11 +928,9 @@ static void on_plugin_metadata_received_success(void *user_data, } } -static void on_plugin_metadata_received_failure(void *user_data, - grpc_credentials_md *md_elems, - size_t num_md, - grpc_credentials_status status, - grpc_call_list *call_list) { +static void on_plugin_metadata_received_failure( + void *user_data, grpc_credentials_md *md_elems, size_t num_md, + grpc_credentials_status status, grpc_closure_list *closure_list) { GPR_ASSERT(user_data == NULL); GPR_ASSERT(md_elems == NULL); GPR_ASSERT(num_md == 0); @@ -950,7 +946,7 @@ static void test_metadata_plugin_success(void) { grpc_credentials *creds; plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; plugin.state = &state; plugin.get_metadata = plugin_get_metadata_success; @@ -960,18 +956,18 @@ static void test_metadata_plugin_success(void) { GPR_ASSERT(state == PLUGIN_INITIAL_STATE); grpc_credentials_get_request_metadata(creds, NULL, test_service_url, on_plugin_metadata_received_success, - NULL, &call_list); + NULL, &closure_list); GPR_ASSERT(state == PLUGIN_GET_METADATA_CALLED_STATE); grpc_credentials_release(creds); GPR_ASSERT(state == PLUGIN_DESTROY_CALLED_STATE); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static void test_metadata_plugin_failure(void) { grpc_credentials *creds; plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; plugin.state = &state; plugin.get_metadata = plugin_get_metadata_failure; @@ -981,11 +977,11 @@ static void test_metadata_plugin_failure(void) { GPR_ASSERT(state == PLUGIN_INITIAL_STATE); grpc_credentials_get_request_metadata(creds, NULL, test_service_url, on_plugin_metadata_received_failure, - NULL, &call_list); + NULL, &closure_list); GPR_ASSERT(state == PLUGIN_GET_METADATA_CALLED_STATE); grpc_credentials_release(creds); GPR_ASSERT(state == PLUGIN_DESTROY_CALLED_STATE); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } int main(int argc, char **argv) { diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c index 00a079f54e2..f2215e18227 100644 --- a/test/core/security/jwt_verifier_test.c +++ b/test/core/security/jwt_verifier_test.c @@ -277,7 +277,7 @@ static int httpcli_post_should_not_be_called( const grpc_httpcli_request *request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { GPR_ASSERT("HTTP POST should not be called" == NULL); return 1; } @@ -285,7 +285,7 @@ static int httpcli_post_should_not_be_called( static int httpcli_get_google_keys_for_email( const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_httpcli_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); @@ -293,7 +293,7 @@ static int httpcli_get_google_keys_for_email( "/robot/v1/metadata/x509/" "777-abaslkan11hlb6nmim3bpspl31ud@developer." "gserviceaccount.com") == 0); - on_response(user_data, &response, call_list); + on_response(user_data, &response, closure_list); gpr_free(response.body); return 1; } @@ -309,7 +309,7 @@ static void on_verification_success(void *user_data, } static void test_jwt_verifier_google_email_issuer_success(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_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); @@ -324,28 +324,28 @@ static void test_jwt_verifier_google_email_issuer_success(void) { GPR_ASSERT(jwt != NULL); grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_success, (void *)expected_user_data, - &call_list); + &closure_list); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static int httpcli_get_custom_keys_for_email( const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_httpcli_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->path, "/jwk/foo@bar.com") == 0); - on_response(user_data, &response, call_list); + on_response(user_data, &response, closure_list); gpr_free(response.body); return 1; } static void test_jwt_verifier_custom_email_issuer_success(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_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); @@ -360,22 +360,23 @@ static void test_jwt_verifier_custom_email_issuer_success(void) { GPR_ASSERT(jwt != NULL); grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_success, (void *)expected_user_data, - &call_list); + &closure_list); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static int httpcli_get_jwk_set(const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, - void *user_data, grpc_call_list *call_list) { + void *user_data, + grpc_closure_list *closure_list) { grpc_httpcli_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->path, "/oauth2/v3/certs") == 0); - on_response(user_data, &response, call_list); + on_response(user_data, &response, closure_list); gpr_free(response.body); return 1; } @@ -384,7 +385,7 @@ static int httpcli_get_openid_config(const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_httpcli_response response = http_response(200, gpr_strdup(good_openid_config)); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); @@ -392,13 +393,13 @@ static int httpcli_get_openid_config(const grpc_httpcli_request *request, GPR_ASSERT(strcmp(request->path, GRPC_OPENID_CONFIG_URL_SUFFIX) == 0); grpc_httpcli_set_override(httpcli_get_jwk_set, httpcli_post_should_not_be_called); - on_response(user_data, &response, call_list); + on_response(user_data, &response, closure_list); gpr_free(response.body); return 1; } static void test_jwt_verifier_url_issuer_success(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_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); @@ -413,11 +414,11 @@ static void test_jwt_verifier_url_issuer_success(void) { GPR_ASSERT(jwt != NULL); grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_success, (void *)expected_user_data, - &call_list); + &closure_list); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static void on_verification_key_retrieval_error(void *user_data, @@ -431,17 +432,18 @@ static void on_verification_key_retrieval_error(void *user_data, static int httpcli_get_bad_json(const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, - void *user_data, grpc_call_list *call_list) { + void *user_data, + grpc_closure_list *closure_list) { grpc_httpcli_response response = http_response(200, gpr_strdup("{\"bad\": \"stuff\"}")); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); - on_response(user_data, &response, call_list); + on_response(user_data, &response, closure_list); gpr_free(response.body); return 1; } static void test_jwt_verifier_url_issuer_bad_config(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_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); @@ -456,15 +458,15 @@ static void test_jwt_verifier_url_issuer_bad_config(void) { GPR_ASSERT(jwt != NULL); grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, - (void *)expected_user_data, &call_list); + (void *)expected_user_data, &closure_list); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static void test_jwt_verifier_bad_json_key(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_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); @@ -479,11 +481,11 @@ static void test_jwt_verifier_bad_json_key(void) { GPR_ASSERT(jwt != NULL); grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, - (void *)expected_user_data, &call_list); + (void *)expected_user_data, &closure_list); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static void corrupt_jwt_sig(char *jwt) { @@ -512,7 +514,7 @@ static void on_verification_bad_signature(void *user_data, } static void test_jwt_verifier_bad_signature(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_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); @@ -528,17 +530,17 @@ static void test_jwt_verifier_bad_signature(void) { GPR_ASSERT(jwt != NULL); grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_bad_signature, - (void *)expected_user_data, &call_list); + (void *)expected_user_data, &closure_list); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static int httpcli_get_should_not_be_called( const grpc_httpcli_request *request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { GPR_ASSERT(0); return 1; } @@ -552,16 +554,16 @@ static void on_verification_bad_format(void *user_data, } static void test_jwt_verifier_bad_format(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_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(verifier, NULL, "bad jwt", expected_audience, on_verification_bad_format, - (void *)expected_user_data, &call_list); + (void *)expected_user_data, &closure_list); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } /* find verification key: bad jks, cannot find key in jks */ diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index fad52d0c59d..30ad00cfbc9 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -52,7 +52,7 @@ typedef struct { static void on_oauth2_response(void *user_data, grpc_credentials_md *md_elems, size_t num_md, grpc_credentials_status status, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { oauth2_request *request = user_data; char *token = NULL; gpr_slice token_slice; @@ -73,11 +73,12 @@ static void on_oauth2_response(void *user_data, grpc_credentials_md *md_elems, gpr_mu_unlock(GRPC_POLLSET_MU(&request->pollset)); } -static void do_nothing(void *unused, int success, grpc_call_list *call_list) {} +static void do_nothing(void *unused, int success, + grpc_closure_list *closure_list) {} char *grpc_test_fetch_oauth2_token_with_credentials(grpc_credentials *creds) { oauth2_request request; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_closure do_nothing_closure; grpc_pollset_init(&request.pollset); request.is_done = 0; @@ -85,20 +86,20 @@ char *grpc_test_fetch_oauth2_token_with_credentials(grpc_credentials *creds) { grpc_closure_init(&do_nothing_closure, do_nothing, NULL); grpc_credentials_get_request_metadata( - creds, &request.pollset, "", on_oauth2_response, &request, &call_list); + creds, &request.pollset, "", on_oauth2_response, &request, &closure_list); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&request.pollset)); while (!request.is_done) { grpc_pollset_worker worker; grpc_pollset_work(&request.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); } gpr_mu_unlock(GRPC_POLLSET_MU(&request.pollset)); - grpc_pollset_shutdown(&request.pollset, &do_nothing_closure, &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&request.pollset, &do_nothing_closure, &closure_list); + grpc_closure_list_run(&closure_list); grpc_pollset_destroy(&request.pollset); 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 5604d869c8d..646109c0a1f 100644 --- a/test/core/security/print_google_default_creds_token.c +++ b/test/core/security/print_google_default_creds_token.c @@ -51,7 +51,7 @@ typedef struct { static void on_metadata_response(void *user_data, grpc_credentials_md *md_elems, size_t num_md, grpc_credentials_status status, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { synchronizer *sync = user_data; if (status == GRPC_CREDENTIALS_ERROR) { fprintf(stderr, "Fetching token failed.\n"); @@ -70,7 +70,7 @@ static void on_metadata_response(void *user_data, grpc_credentials_md *md_elems, int main(int argc, char **argv) { int result = 0; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; synchronizer sync; grpc_credentials *creds = NULL; char *service_url = "https://test.foo.google.com/Foo"; @@ -93,15 +93,15 @@ int main(int argc, char **argv) { grpc_credentials_get_request_metadata(creds, &sync.pollset, service_url, on_metadata_response, &sync, - &call_list); + &closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); while (!sync.is_done) { grpc_pollset_worker worker; grpc_pollset_work(&sync.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index 2e0f17f3ab0..f68fde4c0ac 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -49,15 +49,15 @@ static grpc_pollset g_pollset; static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( size_t slice_size, gpr_slice *leftover_slices, size_t leftover_nslices) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; tsi_frame_protector *fake_read_protector = tsi_create_fake_protector(NULL); tsi_frame_protector *fake_write_protector = tsi_create_fake_protector(NULL); grpc_endpoint_test_fixture f; grpc_endpoint_pair tcp; tcp = grpc_iomgr_create_endpoint_pair("fixture", slice_size); - grpc_endpoint_add_to_pollset(tcp.client, &g_pollset, &call_list); - grpc_endpoint_add_to_pollset(tcp.server, &g_pollset, &call_list); + grpc_endpoint_add_to_pollset(tcp.client, &g_pollset, &closure_list); + grpc_endpoint_add_to_pollset(tcp.server, &g_pollset, &closure_list); if (leftover_nslices == 0) { f.client_ep = @@ -110,7 +110,7 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( f.server_ep = grpc_secure_endpoint_create(fake_write_protector, tcp.server, NULL, 0); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); return f; } @@ -138,7 +138,8 @@ static grpc_endpoint_test_config configs[] = { secure_endpoint_create_fixture_tcp_socketpair_leftover, clean_up}, }; -static void inc_call_ctr(void *arg, int success, grpc_call_list *call_list) { +static void inc_call_ctr(void *arg, int success, + grpc_closure_list *closure_list) { ++*(int *)arg; } @@ -147,37 +148,38 @@ static void test_leftover(grpc_endpoint_test_config config, size_t slice_size) { gpr_slice_buffer incoming; gpr_slice s = gpr_slice_from_copied_string("hello world 12345678900987654321"); - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; int n = 0; grpc_closure done_closure; gpr_log(GPR_INFO, "Start test left over"); gpr_slice_buffer_init(&incoming); grpc_closure_init(&done_closure, inc_call_ctr, &n); - grpc_endpoint_read(f.client_ep, &incoming, &done_closure, &call_list); - grpc_call_list_run(&call_list); + grpc_endpoint_read(f.client_ep, &incoming, &done_closure, &closure_list); + grpc_closure_list_run(&closure_list); GPR_ASSERT(n == 1); GPR_ASSERT(incoming.count == 1); GPR_ASSERT(0 == gpr_slice_cmp(s, incoming.slices[0])); - grpc_endpoint_shutdown(f.client_ep, &call_list); - grpc_endpoint_shutdown(f.server_ep, &call_list); - grpc_endpoint_destroy(f.client_ep, &call_list); - grpc_endpoint_destroy(f.server_ep, &call_list); - grpc_call_list_run(&call_list); + grpc_endpoint_shutdown(f.client_ep, &closure_list); + grpc_endpoint_shutdown(f.server_ep, &closure_list); + grpc_endpoint_destroy(f.client_ep, &closure_list); + grpc_endpoint_destroy(f.server_ep, &closure_list); + grpc_closure_list_run(&closure_list); gpr_slice_unref(s); gpr_slice_buffer_destroy(&incoming); clean_up(); } -static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { +static void destroy_pollset(void *p, int success, + grpc_closure_list *closure_list) { grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_test_init(argc, argv); grpc_init(); @@ -185,8 +187,8 @@ int main(int argc, char **argv) { grpc_endpoint_tests(configs[0], &g_pollset); test_leftover(configs[1], 1); grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run(&closure_list); grpc_shutdown(); return 0; diff --git a/test/core/security/verify_jwt.c b/test/core/security/verify_jwt.c index 417152a3007..9be6ee6e336 100644 --- a/test/core/security/verify_jwt.c +++ b/test/core/security/verify_jwt.c @@ -89,7 +89,7 @@ int main(int argc, char **argv) { gpr_cmdline *cl; char *jwt = NULL; char *aud = NULL; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; cl = gpr_cmdline_create("JWT verifier tool"); gpr_cmdline_add_string(cl, "jwt", "JSON web token to verify", &jwt); @@ -107,15 +107,15 @@ int main(int argc, char **argv) { sync.is_done = 0; grpc_jwt_verifier_verify(verifier, &sync.pollset, jwt, aud, - on_jwt_verification_done, &sync, &call_list); + on_jwt_verification_done, &sync, &closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); while (!sync.is_done) { grpc_pollset_worker worker; grpc_pollset_work(&sync.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &call_list); + gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index 85a021da89d..3dee8f23afc 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -76,13 +76,13 @@ static void test_wait_empty(void) { } static void do_nothing_end_completion(void *arg, grpc_cq_completion *c, - grpc_call_list *call_list) {} + grpc_closure_list *closure_list) {} static void test_cq_end_op(void) { grpc_event ev; grpc_completion_queue *cc; grpc_cq_completion completion; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; void *tag = create_test_tag(); LOG_TEST("test_cq_end_op"); @@ -91,7 +91,7 @@ static void test_cq_end_op(void) { grpc_cq_begin_op(cc); grpc_cq_end_op(cc, tag, 1, do_nothing_end_completion, NULL, &completion, - &call_list); + &closure_list); ev = grpc_completion_queue_next(cc, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); @@ -99,7 +99,7 @@ static void test_cq_end_op(void) { GPR_ASSERT(ev.success); shutdown_and_destroy(cc); - GPR_ASSERT(grpc_call_list_empty(call_list)); + GPR_ASSERT(grpc_closure_list_empty(closure_list)); } static void test_shutdown_then_next_polling(void) { @@ -133,7 +133,7 @@ static void test_pluck(void) { grpc_completion_queue *cc; void *tags[128]; grpc_cq_completion completions[GPR_ARRAY_SIZE(tags)]; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; unsigned i, j; LOG_TEST("test_pluck"); @@ -150,7 +150,7 @@ static void test_pluck(void) { for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { grpc_cq_begin_op(cc); grpc_cq_end_op(cc, tags[i], 1, do_nothing_end_completion, NULL, - &completions[i], &call_list); + &completions[i], &closure_list); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { @@ -162,7 +162,7 @@ static void test_pluck(void) { for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { grpc_cq_begin_op(cc); grpc_cq_end_op(cc, tags[i], 1, do_nothing_end_completion, NULL, - &completions[i], &call_list); + &completions[i], &closure_list); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { @@ -172,7 +172,7 @@ static void test_pluck(void) { } shutdown_and_destroy(cc); - GPR_ASSERT(grpc_call_list_empty(call_list)); + GPR_ASSERT(grpc_closure_list_empty(closure_list)); } #define TEST_THREAD_EVENTS 10000 @@ -193,14 +193,14 @@ gpr_timespec ten_seconds_time(void) { } static void free_completion(void *arg, grpc_cq_completion *completion, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { gpr_free(completion); } static void producer_thread(void *arg) { test_thread_options *opt = arg; int i; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_log(GPR_INFO, "producer %d started", opt->id); gpr_event_set(&opt->on_started, (void *)(gpr_intptr)1); @@ -218,14 +218,14 @@ 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(opt->cc, (void *)(gpr_intptr)1, 1, free_completion, NULL, - gpr_malloc(sizeof(grpc_cq_completion)), &call_list); + gpr_malloc(sizeof(grpc_cq_completion)), &closure_list); opt->events_triggered++; - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } gpr_log(GPR_INFO, "producer %d phase 2 done", opt->id); gpr_event_set(&opt->on_finished, (void *)(gpr_intptr)1); - GPR_ASSERT(grpc_call_list_empty(call_list)); + GPR_ASSERT(grpc_closure_list_empty(closure_list)); } static void consumer_thread(void *arg) { diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index 98b5686e911..1987700139e 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -73,14 +73,14 @@ typedef struct freereq { } freereq; static void destroy_pollset_and_shutdown(void *p, int success, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { grpc_pollset_destroy(p); grpc_shutdown(); } static void freed_port_from_server(void *arg, const grpc_httpcli_response *response, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { freereq *pr = arg; gpr_mu_lock(GRPC_POLLSET_MU(&pr->pollset)); pr->done = 1; @@ -93,7 +93,7 @@ static void free_port_using_server(char *server, int port) { grpc_httpcli_request req; freereq pr; char *path; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_closure shutdown_closure; grpc_init(); @@ -111,19 +111,19 @@ static void free_port_using_server(char *server, int port) { grpc_httpcli_context_init(&context); grpc_httpcli_get(&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), freed_port_from_server, - &pr, &call_list); + &pr, &closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); while (!pr.done) { grpc_pollset_worker worker; grpc_pollset_work(&pr.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1), &call_list); + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1), &closure_list); } gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); grpc_httpcli_context_destroy(&context); - grpc_call_list_run(&call_list); - grpc_pollset_shutdown(&pr.pollset, &shutdown_closure, &call_list); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); + grpc_pollset_shutdown(&pr.pollset, &shutdown_closure, &closure_list); + grpc_closure_list_run(&closure_list); gpr_free(path); } @@ -210,7 +210,7 @@ typedef struct portreq { static void got_port_from_server(void *arg, const grpc_httpcli_response *response, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { size_t i; int port = 0; portreq *pr = arg; @@ -226,7 +226,7 @@ static void got_port_from_server(void *arg, sleep(1); grpc_httpcli_get(pr->ctx, &pr->pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), got_port_from_server, - pr, call_list); + pr, closure_list); return; } GPR_ASSERT(response); @@ -246,7 +246,7 @@ static int pick_port_using_server(char *server) { grpc_httpcli_context context; grpc_httpcli_request req; portreq pr; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_closure shutdown_closure; grpc_init(); @@ -266,19 +266,19 @@ static int pick_port_using_server(char *server) { grpc_httpcli_context_init(&context); grpc_httpcli_get(&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), got_port_from_server, - &pr, &call_list); - grpc_call_list_run(&call_list); + &pr, &closure_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); while (pr.port == -1) { grpc_pollset_worker worker; grpc_pollset_work(&pr.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1), &call_list); + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1), &closure_list); } gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); grpc_httpcli_context_destroy(&context); - grpc_pollset_shutdown(&pr.pollset, &shutdown_closure, &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&pr.pollset, &shutdown_closure, &closure_list); + grpc_closure_list_run(&closure_list); return pr.port; } diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index eeb3ecb55a8..8092cbc73a0 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -66,15 +66,15 @@ static void pretty_print_backoffs(reconnect_server *server) { } static void on_connect(void *arg, grpc_endpoint *tcp, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { char *peer; char *last_colon; reconnect_server *server = (reconnect_server *)arg; gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); timestamp_list *new_tail; peer = grpc_endpoint_get_peer(tcp); - grpc_endpoint_shutdown(tcp, call_list); - grpc_endpoint_destroy(tcp, call_list); + grpc_endpoint_shutdown(tcp, closure_list); + grpc_endpoint_destroy(tcp, closure_list); if (peer) { last_colon = strrchr(peer, ':'); if (server->peer == NULL) { @@ -115,7 +115,7 @@ void reconnect_server_init(reconnect_server *server) { void reconnect_server_start(reconnect_server *server, int port) { struct sockaddr_in addr; int port_added; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; addr.sin_family = AF_INET; addr.sin_port = htons((gpr_uint16)port); @@ -127,10 +127,10 @@ void reconnect_server_start(reconnect_server *server, int port) { GPR_ASSERT(port_added == port); grpc_tcp_server_start(server->tcp_server, server->pollsets, 1, on_connect, - server, &call_list); + server, &closure_list); gpr_log(GPR_INFO, "reconnect tcp server listening on 0.0.0.0:%d", port); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } void reconnect_server_poll(reconnect_server *server, int seconds) { @@ -138,12 +138,12 @@ void reconnect_server_poll(reconnect_server *server, int seconds) { gpr_timespec deadline = gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), gpr_time_from_seconds(seconds, GPR_TIMESPAN)); - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_mu_lock(GRPC_POLLSET_MU(&server->pollset)); grpc_pollset_work(&server->pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline, &call_list); + deadline, &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&server->pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } void reconnect_server_clear_timestamps(reconnect_server *server) { @@ -158,18 +158,20 @@ void reconnect_server_clear_timestamps(reconnect_server *server) { server->peer = NULL; } -static void do_nothing(void *ignored, int success, grpc_call_list *call_list) {} +static void do_nothing(void *ignored, int success, + grpc_closure_list *closure_list) {} void reconnect_server_destroy(reconnect_server *server) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_closure do_nothing_closure[2]; grpc_closure_init(&do_nothing_closure[0], do_nothing, NULL); grpc_closure_init(&do_nothing_closure[1], do_nothing, NULL); grpc_tcp_server_destroy(server->tcp_server, &do_nothing_closure[0], - &call_list); + &closure_list); reconnect_server_clear_timestamps(server); - grpc_pollset_shutdown(&server->pollset, &do_nothing_closure[1], &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&server->pollset, &do_nothing_closure[1], + &closure_list); + grpc_closure_list_run(&closure_list); grpc_pollset_destroy(&server->pollset); grpc_shutdown(); } From af73d78b7838deb94673815ba3c1b0ebcadc5927 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 09:30:46 -0700 Subject: [PATCH 24/56] clang-format all core files --- src/core/channel/channel_args.c | 8 +++----- src/core/channel/channel_args.h | 4 +--- src/core/channel/client_channel.c | 4 ++-- .../client_config/lb_policies/pick_first.c | 3 ++- src/core/client_config/lb_policy_registry.c | 6 +++--- .../resolvers/sockaddr_resolver.c | 7 +++---- .../resolvers/zookeeper_resolver.c | 3 +-- src/core/compression/algorithm.c | 2 +- src/core/iomgr/iocp_windows.c | 2 +- src/core/iomgr/pollset_windows.c | 2 +- src/core/iomgr/socket_windows.c | 3 ++- src/core/iomgr/tcp_client_windows.c | 2 +- src/core/iomgr/tcp_server_windows.c | 9 +++++---- src/core/iomgr/tcp_windows.c | 8 ++++---- src/core/profiling/basic_timers.c | 8 ++++---- src/core/security/credentials.c | 3 +-- src/core/security/credentials.h | 1 - src/core/security/server_auth_filter.c | 4 ++-- src/core/support/stack_lockfree.c | 2 +- src/core/support/sync_win32.c | 2 +- src/core/support/time_precise.h | 2 +- src/core/surface/server.c | 2 +- src/core/surface/version.c | 4 +--- src/core/transport/chttp2/stream_encoder.c | 2 +- src/core/transport/connectivity_state.c | 1 - test/core/client_config/uri_parser_test.c | 2 +- test/core/end2end/dualstack_socket_test.c | 18 +++++++++--------- test/core/end2end/fixtures/h2_oauth2.c | 4 +--- test/core/end2end/fixtures/proxy.c | 4 +--- test/core/iomgr/tcp_client_posix_test.c | 13 +++++++------ test/core/util/port_posix.c | 4 ++-- 31 files changed, 64 insertions(+), 75 deletions(-) diff --git a/src/core/channel/channel_args.c b/src/core/channel/channel_args.c index 591135cd6f2..487db1119a5 100644 --- a/src/core/channel/channel_args.c +++ b/src/core/channel/channel_args.c @@ -151,8 +151,8 @@ grpc_channel_args *grpc_channel_args_set_compression_algorithm( /** Returns 1 if the argument for compression algorithm's enabled states bitset * was found in \a a, returning the arg's value in \a states. Otherwise, returns * 0. */ -static int find_compression_algorithm_states_bitset( - const grpc_channel_args *a, int **states_arg) { +static int find_compression_algorithm_states_bitset(const grpc_channel_args *a, + int **states_arg) { if (a != NULL) { size_t i; for (i = 0; i < a->num_args; ++i) { @@ -167,9 +167,7 @@ static int find_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_channel_args **a, grpc_compression_algorithm algorithm, int state) { int *states_arg; grpc_channel_args *result = *a; const int states_arg_found = diff --git a/src/core/channel/channel_args.h b/src/core/channel/channel_args.h index 06a6012dee8..f9e7b058606 100644 --- a/src/core/channel/channel_args.h +++ b/src/core/channel/channel_args.h @@ -75,9 +75,7 @@ grpc_channel_args *grpc_channel_args_set_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_channel_args **a, grpc_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/channel/client_channel.c b/src/core/channel/client_channel.c index 54adeaee9d9..903f9eab50d 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -679,8 +679,8 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, grpc_pollset_set_init(&chand->pollset_set); grpc_closure_init(&chand->on_config_changed, cc_on_config_changed, chand); - grpc_connectivity_state_init(&chand->state_tracker, - GRPC_CHANNEL_IDLE, "client_channel"); + grpc_connectivity_state_init(&chand->state_tracker, GRPC_CHANNEL_IDLE, + "client_channel"); } /* Destructor for channel_data */ diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index 39e9e6c0d74..7557053711a 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -337,7 +337,8 @@ static grpc_lb_policy *create_pick_first(grpc_lb_policy_factory *factory, GPR_ASSERT(args->num_subchannels > 0); memset(p, 0, sizeof(*p)); grpc_lb_policy_init(&p->base, &pick_first_lb_policy_vtable); - p->subchannels = gpr_malloc(sizeof(grpc_subchannel *) * args->num_subchannels); + p->subchannels = + gpr_malloc(sizeof(grpc_subchannel *) * args->num_subchannels); p->num_subchannels = args->num_subchannels; grpc_connectivity_state_init(&p->state_tracker, GRPC_CHANNEL_IDLE, "pick_first"); diff --git a/src/core/client_config/lb_policy_registry.c b/src/core/client_config/lb_policy_registry.c index ae4a077ef3e..fc302e82d7e 100644 --- a/src/core/client_config/lb_policy_registry.c +++ b/src/core/client_config/lb_policy_registry.c @@ -65,7 +65,7 @@ void grpc_register_lb_policy(grpc_lb_policy_factory *factory) { g_all_of_the_lb_policies[g_number_of_lb_policies++] = factory; } -static grpc_lb_policy_factory *lookup_factory(const char* name) { +static grpc_lb_policy_factory *lookup_factory(const char *name) { int i; if (name == NULL) return NULL; @@ -82,7 +82,7 @@ static grpc_lb_policy_factory *lookup_factory(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( - factory, args); + grpc_lb_policy *lb_policy = + grpc_lb_policy_factory_create_lb_policy(factory, args); return lb_policy; } diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index da6b5518f8a..378813f45b4 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -146,8 +146,7 @@ static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r, memset(&lb_policy_args, 0, sizeof(lb_policy_args)); lb_policy_args.subchannels = subchannels; lb_policy_args.num_subchannels = r->num_addrs; - lb_policy = - grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); + lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); gpr_free(subchannels); grpc_client_config_set_lb_policy(cfg, lb_policy); GRPC_LB_POLICY_UNREF(lb_policy, "sockaddr", closure_list); @@ -333,9 +332,9 @@ static grpc_resolver *sockaddr_create( r->addrs = gpr_malloc(sizeof(struct sockaddr_storage) * r->num_addrs); r->addrs_len = gpr_malloc(sizeof(*r->addrs_len) * r->num_addrs); - for(i = 0; i < r->num_addrs; i++) { + for (i = 0; i < r->num_addrs; i++) { grpc_uri ith_uri = *args->uri; - char* part_str = gpr_dump_slice(path_parts.slices[i], GPR_DUMP_ASCII); + char *part_str = gpr_dump_slice(path_parts.slices[i], GPR_DUMP_ASCII); ith_uri.path = part_str; if (!parse(&ith_uri, &r->addrs[i], &r->addrs_len[i])) { errors_found = 1; /* GPR_TRUE */ diff --git a/src/core/client_config/resolvers/zookeeper_resolver.c b/src/core/client_config/resolvers/zookeeper_resolver.c index c785e769396..db2bf7552f2 100644 --- a/src/core/client_config/resolvers/zookeeper_resolver.c +++ b/src/core/client_config/resolvers/zookeeper_resolver.c @@ -202,8 +202,7 @@ static void zookeeper_on_resolved(void *arg, } lb_policy_args.subchannels = subchannels; lb_policy_args.num_subchannels = addresses->naddrs; - lb_policy = - grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); + lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); grpc_client_config_set_lb_policy(config, lb_policy); GRPC_LB_POLICY_UNREF(lb_policy, "construction"); grpc_resolved_addresses_destroy(addresses); diff --git a/src/core/compression/algorithm.c b/src/core/compression/algorithm.c index 76d42fde0f7..8adde13b1ec 100644 --- a/src/core/compression/algorithm.c +++ b/src/core/compression/algorithm.c @@ -106,7 +106,7 @@ grpc_compression_level grpc_compression_level_for_algorithm( } void grpc_compression_options_init(grpc_compression_options *opts) { - opts->enabled_algorithms_bitset = (1u << GRPC_COMPRESS_ALGORITHMS_COUNT)-1; + opts->enabled_algorithms_bitset = (1u << GRPC_COMPRESS_ALGORITHMS_COUNT) - 1; opts->default_compression_algorithm = GRPC_COMPRESS_NONE; } diff --git a/src/core/iomgr/iocp_windows.c b/src/core/iomgr/iocp_windows.c index 006f8b2abff..54048910a23 100644 --- a/src/core/iomgr/iocp_windows.c +++ b/src/core/iomgr/iocp_windows.c @@ -110,7 +110,7 @@ static void do_iocp_work() { } static void iocp_loop(void *p) { - while (gpr_atm_acq_load(&g_custom_events) || + while (gpr_atm_acq_load(&g_custom_events) || !gpr_event_get(&g_shutdown_iocp)) { do_iocp_work(); } diff --git a/src/core/iomgr/pollset_windows.c b/src/core/iomgr/pollset_windows.c index 07522c8a0c3..e6791d49438 100644 --- a/src/core/iomgr/pollset_windows.c +++ b/src/core/iomgr/pollset_windows.c @@ -99,7 +99,7 @@ void grpc_pollset_destroy(grpc_pollset *pollset) { gpr_mu_destroy(&pollset->mu); } -void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, +void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, gpr_timespec now, gpr_timespec deadline) { int added_worker = 0; worker->next = worker->prev = NULL; diff --git a/src/core/iomgr/socket_windows.c b/src/core/iomgr/socket_windows.c index 557ca82226d..fafb7b6622b 100644 --- a/src/core/iomgr/socket_windows.c +++ b/src/core/iomgr/socket_windows.c @@ -82,7 +82,8 @@ void grpc_winsocket_shutdown(grpc_winsocket *winsocket) { DisconnectEx(winsocket->socket, NULL, 0, 0); } else { char *utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "Unable to retrieve DisconnectEx pointer : %s", utf8_message); + gpr_log(GPR_ERROR, "Unable to retrieve DisconnectEx pointer : %s", + utf8_message); gpr_free(utf8_message); } closesocket(winsocket->socket); diff --git a/src/core/iomgr/tcp_client_windows.c b/src/core/iomgr/tcp_client_windows.c index a42ec7cf11a..28f1bc96c8d 100644 --- a/src/core/iomgr/tcp_client_windows.c +++ b/src/core/iomgr/tcp_client_windows.c @@ -90,7 +90,7 @@ static void on_connect(void *acp, int from_iocp) { grpc_winsocket_callback_info *info = &ac->socket->write_info; void (*cb)(void *arg, grpc_endpoint *tcp) = ac->cb; void *cb_arg = ac->cb_arg; - + grpc_alarm_cancel(&ac->alarm); gpr_mu_lock(&ac->mu); diff --git a/src/core/iomgr/tcp_server_windows.c b/src/core/iomgr/tcp_server_windows.c index 63d90cd4258..cd8565fa270 100644 --- a/src/core/iomgr/tcp_server_windows.c +++ b/src/core/iomgr/tcp_server_windows.c @@ -86,7 +86,7 @@ struct grpc_tcp_server { size_t port_capacity; /* shutdown callback */ - void(*shutdown_complete)(void *); + void (*shutdown_complete)(void *); void *shutdown_complete_arg; }; @@ -132,8 +132,8 @@ void grpc_tcp_server_destroy(grpc_tcp_server *s, gpr_mu_lock(&s->mu); s->shutdown_complete = shutdown_complete - ? shutdown_complete - : dont_care_about_shutdown_completion; + ? shutdown_complete + : dont_care_about_shutdown_completion; s->shutdown_complete_arg = shutdown_complete_arg; /* First, shutdown all fd's. This will queue abortion calls for all @@ -206,7 +206,8 @@ static void decrement_active_ports_and_notify(server_port *sp) { sp->shutting_down = 0; gpr_mu_lock(&sp->server->mu); GPR_ASSERT(sp->server->active_ports > 0); - if (0 == --sp->server->active_ports && sp->server->shutdown_complete != NULL) { + if (0 == --sp->server->active_ports && + sp->server->shutdown_complete != NULL) { notify = 1; } gpr_mu_unlock(&sp->server->mu); diff --git a/src/core/iomgr/tcp_windows.c b/src/core/iomgr/tcp_windows.c index e361d22dc39..ab309180eb1 100644 --- a/src/core/iomgr/tcp_windows.c +++ b/src/core/iomgr/tcp_windows.c @@ -108,18 +108,18 @@ static void tcp_free(grpc_tcp *tcp) { #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_tcp *tcp, const char *reason, const char *file, - int line) { + int line) { gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "TCP unref %p : %s %d -> %d", tcp, - reason, tcp->refcount.count, tcp->refcount.count - 1); + reason, tcp->refcount.count, tcp->refcount.count - 1); if (gpr_unref(&tcp->refcount)) { tcp_free(tcp); } } static void tcp_ref(grpc_tcp *tcp, const char *reason, const char *file, - int line) { + int line) { gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "TCP ref %p : %s %d -> %d", tcp, - reason, tcp->refcount.count, tcp->refcount.count + 1); + reason, tcp->refcount.count, tcp->refcount.count + 1); gpr_ref(&tcp->refcount); } #else diff --git a/src/core/profiling/basic_timers.c b/src/core/profiling/basic_timers.c index 4b6a0d2f56b..15e636d5d6e 100644 --- a/src/core/profiling/basic_timers.c +++ b/src/core/profiling/basic_timers.c @@ -70,10 +70,10 @@ static void log_report() { int i; for (i = 0; i < count; i++) { grpc_timer_entry* entry = &(log[i]); - printf("GRPC_LAT_PROF %ld.%09d %p %c %d(%s) %p %s %d\n", - entry->tm.tv_sec, entry->tm.tv_nsec, - (void*)(gpr_intptr)gpr_thd_currentid(), entry->type, entry->tag, - entry->tagstr, entry->id, entry->file, entry->line); + printf("GRPC_LAT_PROF %ld.%09d %p %c %d(%s) %p %s %d\n", entry->tm.tv_sec, + entry->tm.tv_nsec, (void*)(gpr_intptr)gpr_thd_currentid(), + entry->type, entry->tag, entry->tagstr, entry->id, entry->file, + entry->line); } /* Now clear out the log */ diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index 0a49834d40b..abfaa5eb180 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -712,8 +712,7 @@ static void refresh_token_fetch_oauth2( gpr_free(body); } -grpc_credentials * -grpc_refresh_token_credentials_create_from_auth_refresh_token( +grpc_credentials *grpc_refresh_token_credentials_create_from_auth_refresh_token( grpc_auth_refresh_token refresh_token) { grpc_google_refresh_token_credentials *c; if (!grpc_auth_refresh_token_is_valid(&refresh_token)) { diff --git a/src/core/security/credentials.h b/src/core/security/credentials.h index edc0a61f03b..09b32132ed2 100644 --- a/src/core/security/credentials.h +++ b/src/core/security/credentials.h @@ -218,7 +218,6 @@ typedef struct { grpc_server_credentials *c, grpc_security_connector **sc); } grpc_server_credentials_vtable; - /* TODO(jboeuf): Add a refcount. */ struct grpc_server_credentials { const grpc_server_credentials_vtable *vtable; diff --git a/src/core/security/server_auth_filter.c b/src/core/security/server_auth_filter.c index e65578e479e..0816b5fc22a 100644 --- a/src/core/security/server_auth_filter.c +++ b/src/core/security/server_auth_filter.c @@ -136,8 +136,8 @@ static void on_md_processing_done( gpr_slice message; grpc_metadata_array_destroy(&calld->md); error_details = error_details != NULL - ? error_details - : "Authentication metadata processing failed."; + ? error_details + : "Authentication metadata processing failed."; message = gpr_slice_from_copied_string(error_details); grpc_sopb_reset(calld->recv_ops); grpc_transport_stream_op_add_close(&calld->transport_op, status, &message); diff --git a/src/core/support/stack_lockfree.c b/src/core/support/stack_lockfree.c index 180ba19c680..78825250ef7 100644 --- a/src/core/support/stack_lockfree.c +++ b/src/core/support/stack_lockfree.c @@ -67,7 +67,7 @@ typedef union lockfree_node { #define ENTRY_ALIGNMENT_BITS 3 /* make sure that entries aligned to 8-bytes */ #define INVALID_ENTRY_INDEX \ ((1 << 16) - 1) /* reserve this entry as invalid \ - */ + */ struct gpr_stack_lockfree { lockfree_node *entries; diff --git a/src/core/support/sync_win32.c b/src/core/support/sync_win32.c index f5464770676..69dd46399a6 100644 --- a/src/core/support/sync_win32.c +++ b/src/core/support/sync_win32.c @@ -90,7 +90,7 @@ int gpr_cv_wait(gpr_cv *cv, gpr_mu *mu, gpr_timespec abs_deadline) { gpr_timespec now = gpr_now(abs_deadline.clock_type); gpr_int64 now_ms = (gpr_int64)now.tv_sec * 1000 + now.tv_nsec / 1000000; gpr_int64 deadline_ms = - (gpr_int64)abs_deadline.tv_sec * 1000 + abs_deadline.tv_nsec / 1000000; + (gpr_int64)abs_deadline.tv_sec * 1000 + abs_deadline.tv_nsec / 1000000; if (now_ms >= deadline_ms) { timeout = 1; } else { diff --git a/src/core/support/time_precise.h b/src/core/support/time_precise.h index 574ebb84489..cd201faab95 100644 --- a/src/core/support/time_precise.h +++ b/src/core/support/time_precise.h @@ -83,7 +83,7 @@ static void gpr_precise_clock_now(gpr_timespec *clk) { clk->tv_nsec = counter % cycles_per_second; } -#else /* GRPC_TIMERS_RDTSC */ +#else /* GRPC_TIMERS_RDTSC */ static void gpr_precise_clock_now(gpr_timespec *clk) { *clk = gpr_now(GPR_CLOCK_REALTIME); clk->clock_type = GPR_CLOCK_PRECISE; diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 520065a4841..cedc20efd3b 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -1012,7 +1012,7 @@ void grpc_server_setup_transport(grpc_server *s, grpc_transport *transport, void done_published_shutdown(void *done_arg, grpc_cq_completion *storage, grpc_closure_list *closure_list) { - (void) done_arg; + (void)done_arg; gpr_free(storage); } diff --git a/src/core/surface/version.c b/src/core/surface/version.c index 4b90e06a043..e559d51448a 100644 --- a/src/core/surface/version.c +++ b/src/core/surface/version.c @@ -36,6 +36,4 @@ #include -const char *grpc_version_string(void) { - return "0.11.0.0"; -} +const char *grpc_version_string(void) { return "0.11.0.0"; } diff --git a/src/core/transport/chttp2/stream_encoder.c b/src/core/transport/chttp2/stream_encoder.c index 6a22532bc2c..eb02ccdec37 100644 --- a/src/core/transport/chttp2/stream_encoder.c +++ b/src/core/transport/chttp2/stream_encoder.c @@ -377,7 +377,7 @@ static grpc_mdelem *hpack_enc(grpc_chttp2_hpack_compressor *c, gpr_uint32 indices_key; int should_add_elem; - GPR_ASSERT (GPR_SLICE_LENGTH(elem->key->slice) > 0); + GPR_ASSERT(GPR_SLICE_LENGTH(elem->key->slice) > 0); if (GPR_SLICE_START_PTR(elem->key->slice)[0] != ':') { /* regular header */ st->seen_regular_header = 1; } else if (st->seen_regular_header != 0) { /* reserved header */ diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c index 638ec62e734..fe80f9b0e96 100644 --- a/src/core/transport/connectivity_state.c +++ b/src/core/transport/connectivity_state.c @@ -137,4 +137,3 @@ void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, gpr_free(w); } } - diff --git a/test/core/client_config/uri_parser_test.c b/test/core/client_config/uri_parser_test.c index 580c18b699d..df12d6b4cb7 100644 --- a/test/core/client_config/uri_parser_test.c +++ b/test/core/client_config/uri_parser_test.c @@ -41,7 +41,7 @@ static void test_succeeds(const char *uri_text, const char *scheme, const char *authority, const char *path, - const char *query, const char* fragment) { + const char *query, const char *fragment) { grpc_uri *uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp(scheme, uri->scheme)); diff --git a/test/core/end2end/dualstack_socket_test.c b/test/core/end2end/dualstack_socket_test.c index fec9667db86..ec98cf39b4a 100644 --- a/test/core/end2end/dualstack_socket_test.c +++ b/test/core/end2end/dualstack_socket_test.c @@ -125,7 +125,7 @@ void test_connect(const char *server_host, const char *client_host, int port, gpr_slice_new((char *)client_host, strlen(client_host), do_nothing); gpr_slice_buffer_init(&uri_parts); gpr_slice_split(uri_slice, ",", &uri_parts); - hosts_with_port = gpr_malloc(sizeof(char*) * uri_parts.count); + hosts_with_port = gpr_malloc(sizeof(char *) * uri_parts.count); for (i = 0; i < uri_parts.count; i++) { char *uri_part_str = gpr_dump_slice(uri_parts.slices[i], GPR_DUMP_ASCII); gpr_asprintf(&hosts_with_port[i], "%s:%d", uri_part_str, port); @@ -322,19 +322,19 @@ int main(int argc, char **argv) { if (!external_dns_works("loopback46.unittest.grpc.io")) { gpr_log(GPR_INFO, "Skipping tests that depend on *.unittest.grpc.io."); } else { - test_connect("loopback46.unittest.grpc.io", - "loopback4.unittest.grpc.io", 0, 1); - test_connect("loopback4.unittest.grpc.io", - "loopback46.unittest.grpc.io", 0, 1); + test_connect("loopback46.unittest.grpc.io", "loopback4.unittest.grpc.io", + 0, 1); + test_connect("loopback4.unittest.grpc.io", "loopback46.unittest.grpc.io", + 0, 1); if (do_ipv6) { test_connect("loopback46.unittest.grpc.io", "loopback6.unittest.grpc.io", 0, 1); test_connect("loopback6.unittest.grpc.io", "loopback46.unittest.grpc.io", 0, 1); - test_connect("loopback4.unittest.grpc.io", - "loopback6.unittest.grpc.io", 0, 0); - test_connect("loopback6.unittest.grpc.io", - "loopback4.unittest.grpc.io", 0, 0); + test_connect("loopback4.unittest.grpc.io", "loopback6.unittest.grpc.io", + 0, 0); + test_connect("loopback6.unittest.grpc.io", "loopback4.unittest.grpc.io", + 0, 0); } } } diff --git a/test/core/end2end/fixtures/h2_oauth2.c b/test/core/end2end/fixtures/h2_oauth2.c index e61e276fff8..b4b2e026844 100644 --- a/test/core/end2end/fixtures/h2_oauth2.c +++ b/test/core/end2end/fixtures/h2_oauth2.c @@ -67,9 +67,7 @@ static const grpc_metadata *find_metadata(const grpc_metadata *md, return NULL; } -typedef struct { - size_t pseudo_refcount; -} test_processor_state; +typedef struct { size_t pseudo_refcount; } test_processor_state; static void process_oauth2_success(void *state, grpc_auth_context *ctx, const grpc_metadata *md, size_t md_count, diff --git a/test/core/end2end/fixtures/proxy.c b/test/core/end2end/fixtures/proxy.c index b7933586530..434e75dd15e 100644 --- a/test/core/end2end/fixtures/proxy.c +++ b/test/core/end2end/fixtures/proxy.c @@ -157,9 +157,7 @@ static void unrefpc(proxy_call *pc, const char *reason) { } } -static void refpc(proxy_call *pc, const char *reason) { - gpr_ref(&pc->refs); -} +static void refpc(proxy_call *pc, const char *reason) { gpr_ref(&pc->refs); } static void on_c2p_sent_initial_metadata(void *arg, int success) { proxy_call *pc = arg; diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index 436e5cf7dfa..250b071fc1b 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -227,16 +227,17 @@ void test_times_out(void) { gpr_timespec continue_verifying_time = gpr_time_from_seconds(5, GPR_TIMESPAN); gpr_timespec grace_time = gpr_time_from_seconds(3, GPR_TIMESPAN); - gpr_timespec finish_time = gpr_time_add(connect_deadline, continue_verifying_time); - gpr_timespec restart_verifying_time = gpr_time_add(connect_deadline, grace_time); + gpr_timespec finish_time = + gpr_time_add(connect_deadline, continue_verifying_time); + gpr_timespec restart_verifying_time = + gpr_time_add(connect_deadline, grace_time); int is_after_deadline = gpr_time_cmp(now, connect_deadline) > 0; if (gpr_time_cmp(now, finish_time) > 0) { break; } - gpr_log(GPR_DEBUG, "now=%d.%09d connect_deadline=%d.%09d", - now.tv_sec, now.tv_nsec, connect_deadline.tv_sec, connect_deadline.tv_nsec); - if (is_after_deadline && - gpr_time_cmp(now, restart_verifying_time) <= 0) { + gpr_log(GPR_DEBUG, "now=%d.%09d connect_deadline=%d.%09d", now.tv_sec, + now.tv_nsec, connect_deadline.tv_sec, connect_deadline.tv_nsec); + if (is_after_deadline && gpr_time_cmp(now, restart_verifying_time) <= 0) { /* allow some slack before insisting that things be done */ } else { GPR_ASSERT(g_connections_complete == diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index 1987700139e..602af23c157 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -127,7 +127,7 @@ static void free_port_using_server(char *server, int port) { gpr_free(path); } -static void free_chosen_ports() { +static void free_chosen_ports() { char *env = gpr_getenv("GRPC_TEST_PORT_SERVER"); if (env != NULL) { size_t i; @@ -137,7 +137,7 @@ static void free_chosen_ports() { gpr_free(env); } - gpr_free(chosen_ports); + gpr_free(chosen_ports); } static void chose_port(int port) { From 298751c1195523ef6228595043b583c3a6270e08 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 09:41:05 -0700 Subject: [PATCH 25/56] Split closures from iomgr.h --- BUILD | 9 ++ Makefile | 2 + build.yaml | 39 ++++----- gRPC.podspec | 5 ++ src/core/iomgr/alarm.h | 1 + src/core/iomgr/alarm_internal.h | 1 + src/core/iomgr/closure.c | 83 ++++++++++++++++++ src/core/iomgr/closure.h | 85 +++++++++++++++++++ src/core/iomgr/exec_ctx.h | 39 +++++++++ src/core/iomgr/iomgr.c | 49 ----------- src/core/iomgr/iomgr.h | 46 ---------- src/core/iomgr/pollset_posix.h | 1 + src/core/iomgr/resolve_address.h | 1 + src/core/iomgr/workqueue.h | 1 + src/core/transport/chttp2/frame_data.h | 2 +- src/core/transport/chttp2/frame_goaway.h | 2 +- src/core/transport/chttp2/frame_ping.h | 2 +- src/core/transport/chttp2/frame_rst_stream.h | 2 +- src/core/transport/chttp2/frame_settings.h | 2 +- .../transport/chttp2/frame_window_update.h | 2 +- src/core/transport/chttp2/hpack_parser.h | 2 +- src/core/transport/connectivity_state.h | 2 +- tools/doxygen/Doxyfile.core.internal | 3 + tools/run_tests/sources_and_headers.json | 10 +++ vsprojects/vcxproj/grpc/grpc.vcxproj | 4 + vsprojects/vcxproj/grpc/grpc.vcxproj.filters | 9 ++ .../grpc_unsecure/grpc_unsecure.vcxproj | 4 + .../grpc_unsecure.vcxproj.filters | 9 ++ 28 files changed, 295 insertions(+), 122 deletions(-) create mode 100644 src/core/iomgr/closure.c create mode 100644 src/core/iomgr/closure.h create mode 100644 src/core/iomgr/exec_ctx.h diff --git a/BUILD b/BUILD index a7653d6f6d3..6574e6f537d 100644 --- a/BUILD +++ b/BUILD @@ -179,8 +179,10 @@ cc_library( "src/core/iomgr/alarm.h", "src/core/iomgr/alarm_heap.h", "src/core/iomgr/alarm_internal.h", + "src/core/iomgr/closure.h", "src/core/iomgr/endpoint.h", "src/core/iomgr/endpoint_pair.h", + "src/core/iomgr/exec_ctx.h", "src/core/iomgr/fd_posix.h", "src/core/iomgr/iocp_windows.h", "src/core/iomgr/iomgr.h", @@ -310,6 +312,7 @@ cc_library( "src/core/httpcli/parser.c", "src/core/iomgr/alarm.c", "src/core/iomgr/alarm_heap.c", + "src/core/iomgr/closure.c", "src/core/iomgr/endpoint.c", "src/core/iomgr/endpoint_pair_posix.c", "src/core/iomgr/endpoint_pair_windows.c", @@ -460,8 +463,10 @@ cc_library( "src/core/iomgr/alarm.h", "src/core/iomgr/alarm_heap.h", "src/core/iomgr/alarm_internal.h", + "src/core/iomgr/closure.h", "src/core/iomgr/endpoint.h", "src/core/iomgr/endpoint_pair.h", + "src/core/iomgr/exec_ctx.h", "src/core/iomgr/fd_posix.h", "src/core/iomgr/iocp_windows.h", "src/core/iomgr/iomgr.h", @@ -571,6 +576,7 @@ cc_library( "src/core/httpcli/parser.c", "src/core/iomgr/alarm.c", "src/core/iomgr/alarm_heap.c", + "src/core/iomgr/closure.c", "src/core/iomgr/endpoint.c", "src/core/iomgr/endpoint_pair_posix.c", "src/core/iomgr/endpoint_pair_windows.c", @@ -1092,6 +1098,7 @@ objc_library( "src/core/httpcli/parser.c", "src/core/iomgr/alarm.c", "src/core/iomgr/alarm_heap.c", + "src/core/iomgr/closure.c", "src/core/iomgr/endpoint.c", "src/core/iomgr/endpoint_pair_posix.c", "src/core/iomgr/endpoint_pair_windows.c", @@ -1239,8 +1246,10 @@ objc_library( "src/core/iomgr/alarm.h", "src/core/iomgr/alarm_heap.h", "src/core/iomgr/alarm_internal.h", + "src/core/iomgr/closure.h", "src/core/iomgr/endpoint.h", "src/core/iomgr/endpoint_pair.h", + "src/core/iomgr/exec_ctx.h", "src/core/iomgr/fd_posix.h", "src/core/iomgr/iocp_windows.h", "src/core/iomgr/iomgr.h", diff --git a/Makefile b/Makefile index a66d3665c44..05aa6ee4126 100644 --- a/Makefile +++ b/Makefile @@ -4075,6 +4075,7 @@ LIBGRPC_SRC = \ src/core/httpcli/parser.c \ src/core/iomgr/alarm.c \ src/core/iomgr/alarm_heap.c \ + src/core/iomgr/closure.c \ src/core/iomgr/endpoint.c \ src/core/iomgr/endpoint_pair_posix.c \ src/core/iomgr/endpoint_pair_windows.c \ @@ -4355,6 +4356,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/httpcli/parser.c \ src/core/iomgr/alarm.c \ src/core/iomgr/alarm_heap.c \ + src/core/iomgr/closure.c \ src/core/iomgr/endpoint.c \ src/core/iomgr/endpoint_pair_posix.c \ src/core/iomgr/endpoint_pair_windows.c \ diff --git a/build.yaml b/build.yaml index f16cb28c54d..8e87d18bbe4 100644 --- a/build.yaml +++ b/build.yaml @@ -55,19 +55,20 @@ filegroups: src/core/client_config/uri_parser.h, src/core/compression/message_compress.h, src/core/debug/trace.h, src/core/httpcli/format_request.h, src/core/httpcli/httpcli.h, src/core/httpcli/parser.h, src/core/iomgr/alarm.h, src/core/iomgr/alarm_heap.h, - src/core/iomgr/alarm_internal.h, src/core/iomgr/endpoint.h, src/core/iomgr/endpoint_pair.h, - src/core/iomgr/fd_posix.h, src/core/iomgr/iocp_windows.h, src/core/iomgr/iomgr.h, - src/core/iomgr/iomgr_internal.h, src/core/iomgr/iomgr_posix.h, src/core/iomgr/pollset.h, - src/core/iomgr/pollset_posix.h, src/core/iomgr/pollset_set.h, src/core/iomgr/pollset_set_posix.h, - src/core/iomgr/pollset_set_windows.h, src/core/iomgr/pollset_windows.h, src/core/iomgr/resolve_address.h, - src/core/iomgr/sockaddr.h, src/core/iomgr/sockaddr_posix.h, src/core/iomgr/sockaddr_utils.h, - src/core/iomgr/sockaddr_win32.h, src/core/iomgr/socket_utils_posix.h, src/core/iomgr/socket_windows.h, - src/core/iomgr/tcp_client.h, src/core/iomgr/tcp_posix.h, src/core/iomgr/tcp_server.h, - src/core/iomgr/tcp_windows.h, src/core/iomgr/time_averaged_stats.h, src/core/iomgr/udp_server.h, - src/core/iomgr/wakeup_fd_pipe.h, src/core/iomgr/wakeup_fd_posix.h, src/core/iomgr/workqueue.h, - src/core/iomgr/workqueue_posix.h, src/core/iomgr/workqueue_windows.h, src/core/json/json.h, - src/core/json/json_common.h, src/core/json/json_reader.h, src/core/json/json_writer.h, - src/core/profiling/timers.h, src/core/statistics/census_interface.h, src/core/statistics/census_rpc_stats.h, + src/core/iomgr/alarm_internal.h, src/core/iomgr/closure.h, src/core/iomgr/endpoint.h, + src/core/iomgr/endpoint_pair.h, src/core/iomgr/exec_ctx.h, src/core/iomgr/fd_posix.h, + src/core/iomgr/iocp_windows.h, src/core/iomgr/iomgr.h, src/core/iomgr/iomgr_internal.h, + src/core/iomgr/iomgr_posix.h, src/core/iomgr/pollset.h, src/core/iomgr/pollset_posix.h, + src/core/iomgr/pollset_set.h, src/core/iomgr/pollset_set_posix.h, src/core/iomgr/pollset_set_windows.h, + src/core/iomgr/pollset_windows.h, src/core/iomgr/resolve_address.h, src/core/iomgr/sockaddr.h, + src/core/iomgr/sockaddr_posix.h, src/core/iomgr/sockaddr_utils.h, src/core/iomgr/sockaddr_win32.h, + src/core/iomgr/socket_utils_posix.h, src/core/iomgr/socket_windows.h, src/core/iomgr/tcp_client.h, + src/core/iomgr/tcp_posix.h, src/core/iomgr/tcp_server.h, src/core/iomgr/tcp_windows.h, + src/core/iomgr/time_averaged_stats.h, src/core/iomgr/udp_server.h, src/core/iomgr/wakeup_fd_pipe.h, + src/core/iomgr/wakeup_fd_posix.h, src/core/iomgr/workqueue.h, src/core/iomgr/workqueue_posix.h, + src/core/iomgr/workqueue_windows.h, src/core/json/json.h, src/core/json/json_common.h, + src/core/json/json_reader.h, src/core/json/json_writer.h, src/core/profiling/timers.h, + src/core/statistics/census_interface.h, src/core/statistics/census_rpc_stats.h, src/core/surface/byte_buffer_queue.h, src/core/surface/call.h, src/core/surface/channel.h, src/core/surface/completion_queue.h, src/core/surface/event_string.h, src/core/surface/init.h, src/core/surface/server.h, src/core/surface/surface_trace.h, src/core/transport/chttp2/alpn.h, @@ -97,12 +98,12 @@ filegroups: src/core/client_config/uri_parser.c, src/core/compression/algorithm.c, src/core/compression/message_compress.c, src/core/debug/trace.c, src/core/httpcli/format_request.c, src/core/httpcli/httpcli.c, src/core/httpcli/parser.c, src/core/iomgr/alarm.c, src/core/iomgr/alarm_heap.c, - src/core/iomgr/endpoint.c, src/core/iomgr/endpoint_pair_posix.c, src/core/iomgr/endpoint_pair_windows.c, - src/core/iomgr/fd_posix.c, src/core/iomgr/iocp_windows.c, src/core/iomgr/iomgr.c, - src/core/iomgr/iomgr_posix.c, src/core/iomgr/iomgr_windows.c, src/core/iomgr/pollset_multipoller_with_epoll.c, - src/core/iomgr/pollset_multipoller_with_poll_posix.c, src/core/iomgr/pollset_posix.c, - src/core/iomgr/pollset_set_posix.c, src/core/iomgr/pollset_set_windows.c, src/core/iomgr/pollset_windows.c, - src/core/iomgr/resolve_address_posix.c, src/core/iomgr/resolve_address_windows.c, + src/core/iomgr/closure.c, src/core/iomgr/endpoint.c, src/core/iomgr/endpoint_pair_posix.c, + src/core/iomgr/endpoint_pair_windows.c, src/core/iomgr/fd_posix.c, src/core/iomgr/iocp_windows.c, + src/core/iomgr/iomgr.c, src/core/iomgr/iomgr_posix.c, src/core/iomgr/iomgr_windows.c, + src/core/iomgr/pollset_multipoller_with_epoll.c, src/core/iomgr/pollset_multipoller_with_poll_posix.c, + src/core/iomgr/pollset_posix.c, src/core/iomgr/pollset_set_posix.c, src/core/iomgr/pollset_set_windows.c, + src/core/iomgr/pollset_windows.c, src/core/iomgr/resolve_address_posix.c, src/core/iomgr/resolve_address_windows.c, src/core/iomgr/sockaddr_utils.c, src/core/iomgr/socket_utils_common_posix.c, src/core/iomgr/socket_utils_linux.c, src/core/iomgr/socket_utils_posix.c, src/core/iomgr/socket_windows.c, src/core/iomgr/tcp_client_posix.c, src/core/iomgr/tcp_client_windows.c, src/core/iomgr/tcp_posix.c, src/core/iomgr/tcp_server_posix.c, diff --git a/gRPC.podspec b/gRPC.podspec index 173628f247d..9a6b89f26fd 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -181,8 +181,10 @@ Pod::Spec.new do |s| 'src/core/iomgr/alarm.h', 'src/core/iomgr/alarm_heap.h', 'src/core/iomgr/alarm_internal.h', + 'src/core/iomgr/closure.h', 'src/core/iomgr/endpoint.h', 'src/core/iomgr/endpoint_pair.h', + 'src/core/iomgr/exec_ctx.h', 'src/core/iomgr/fd_posix.h', 'src/core/iomgr/iocp_windows.h', 'src/core/iomgr/iomgr.h', @@ -319,6 +321,7 @@ Pod::Spec.new do |s| 'src/core/httpcli/parser.c', 'src/core/iomgr/alarm.c', 'src/core/iomgr/alarm_heap.c', + 'src/core/iomgr/closure.c', 'src/core/iomgr/endpoint.c', 'src/core/iomgr/endpoint_pair_posix.c', 'src/core/iomgr/endpoint_pair_windows.c', @@ -466,8 +469,10 @@ Pod::Spec.new do |s| 'src/core/iomgr/alarm.h', 'src/core/iomgr/alarm_heap.h', 'src/core/iomgr/alarm_internal.h', + 'src/core/iomgr/closure.h', 'src/core/iomgr/endpoint.h', 'src/core/iomgr/endpoint_pair.h', + 'src/core/iomgr/exec_ctx.h', 'src/core/iomgr/fd_posix.h', 'src/core/iomgr/iocp_windows.h', 'src/core/iomgr/iomgr.h', diff --git a/src/core/iomgr/alarm.h b/src/core/iomgr/alarm.h index 09bfa887569..e420c3a9102 100644 --- a/src/core/iomgr/alarm.h +++ b/src/core/iomgr/alarm.h @@ -35,6 +35,7 @@ #define GRPC_INTERNAL_CORE_IOMGR_ALARM_H #include "src/core/iomgr/iomgr.h" +#include "src/core/iomgr/exec_ctx.h" #include #include diff --git a/src/core/iomgr/alarm_internal.h b/src/core/iomgr/alarm_internal.h index aebc789ec67..4d6076ac5c1 100644 --- a/src/core/iomgr/alarm_internal.h +++ b/src/core/iomgr/alarm_internal.h @@ -34,6 +34,7 @@ #ifndef GRPC_INTERNAL_CORE_IOMGR_ALARM_INTERNAL_H #define GRPC_INTERNAL_CORE_IOMGR_ALARM_INTERNAL_H +#include "src/core/iomgr/exec_ctx.h" #include #include diff --git a/src/core/iomgr/closure.c b/src/core/iomgr/closure.c new file mode 100644 index 00000000000..1827ac3e28b --- /dev/null +++ b/src/core/iomgr/closure.c @@ -0,0 +1,83 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include "src/core/iomgr/closure.h" + +void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, + void *cb_arg) { + closure->cb = cb; + closure->cb_arg = cb_arg; + closure->next = NULL; +} + +void grpc_closure_list_add(grpc_closure_list *closure_list, + grpc_closure *closure, int success) { + if (closure == NULL) return; + closure->next = NULL; + closure->success = success; + if (closure_list->head == NULL) { + closure_list->head = closure; + } else { + closure_list->tail->next = closure; + } + closure_list->tail = closure; +} + +void grpc_closure_list_run(grpc_closure_list *closure_list) { + while (!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; + c->cb(c->cb_arg, c->success, closure_list); + c = next; + } + } +} + +int grpc_closure_list_empty(grpc_closure_list closure_list) { + return closure_list.head == NULL; +} + +void grpc_closure_list_move(grpc_closure_list *src, grpc_closure_list *dst) { + if (src->head == NULL) { + return; + } + if (dst->head == NULL) { + *dst = *src; + } else { + dst->tail->next = src->head; + dst->tail = src->tail; + } + src->head = src->tail = NULL; +} diff --git a/src/core/iomgr/closure.h b/src/core/iomgr/closure.h new file mode 100644 index 00000000000..e8e1e046144 --- /dev/null +++ b/src/core/iomgr/closure.h @@ -0,0 +1,85 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef GRPC_INTERNAL_CORE_IOMGR_CLOSURE_H +#define GRPC_INTERNAL_CORE_IOMGR_CLOSURE_H + +#include + +struct grpc_closure; +typedef struct grpc_closure grpc_closure; + +typedef struct grpc_closure_list { + grpc_closure *head; + grpc_closure *tail; +} grpc_closure_list; + +/** gRPC Callback definition. + * + * \param arg Arbitrary input. + * \param success An indication on the state of the iomgr. On false, cleanup + * actions should be taken (eg, shutdown). */ +typedef void (*grpc_iomgr_cb_func)(void *arg, int success, + grpc_closure_list *closure_list); + +/** A closure over a grpc_iomgr_cb_func. */ +struct grpc_closure { + /** Bound callback. */ + grpc_iomgr_cb_func cb; + + /** Arguments to be passed to "cb". */ + void *cb_arg; + + /** Internal. A boolean indication to "cb" on the state of the iomgr. + * For instance, closures created during a shutdown would have this field set + * to false. */ + int success; + + /**< Internal. Do not touch */ + struct grpc_closure *next; +}; + +/** Initializes \a closure with \a cb and \a cb_arg. */ +void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, + void *cb_arg); + +#define GRPC_CLOSURE_LIST_INIT \ + { NULL, NULL } + +void grpc_closure_list_add(grpc_closure_list *list, grpc_closure *closure, + int success); +void grpc_closure_list_run(grpc_closure_list *list); +void grpc_closure_list_move(grpc_closure_list *src, grpc_closure_list *dst); +int grpc_closure_list_empty(grpc_closure_list list); + +#endif /* GRPC_INTERNAL_CORE_IOMGR_CLOSURE_H */ diff --git a/src/core/iomgr/exec_ctx.h b/src/core/iomgr/exec_ctx.h new file mode 100644 index 00000000000..4d30feb26b7 --- /dev/null +++ b/src/core/iomgr/exec_ctx.h @@ -0,0 +1,39 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef GRPC_INTERNAL_CORE_IOMGR_EXEC_CTX_H +#define GRPC_INTERNAL_CORE_IOMGR_EXEC_CTX_H + +#include "src/core/iomgr/closure.h" + +#endif diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index 9456bad7169..f009eb3f699 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -160,52 +160,3 @@ void grpc_iomgr_unregister_object(grpc_iomgr_object *obj) { gpr_mu_unlock(&g_mu); gpr_free(obj->name); } - -void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, - void *cb_arg) { - closure->cb = cb; - closure->cb_arg = cb_arg; - closure->next = NULL; -} - -void grpc_closure_list_add(grpc_closure_list *closure_list, - grpc_closure *closure, int success) { - if (closure == NULL) return; - closure->next = NULL; - closure->success = success; - if (closure_list->head == NULL) { - closure_list->head = closure; - } else { - closure_list->tail->next = closure; - } - closure_list->tail = closure; -} - -void grpc_closure_list_run(grpc_closure_list *closure_list) { - while (!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; - c->cb(c->cb_arg, c->success, closure_list); - c = next; - } - } -} - -int grpc_closure_list_empty(grpc_closure_list closure_list) { - return closure_list.head == NULL; -} - -void grpc_closure_list_move(grpc_closure_list *src, grpc_closure_list *dst) { - if (src->head == NULL) { - return; - } - if (dst->head == NULL) { - *dst = *src; - } else { - dst->tail->next = src->head; - dst->tail = src->tail; - } - src->head = src->tail = NULL; -} diff --git a/src/core/iomgr/iomgr.h b/src/core/iomgr/iomgr.h index bc015706a31..c9ea84c6050 100644 --- a/src/core/iomgr/iomgr.h +++ b/src/core/iomgr/iomgr.h @@ -34,52 +34,6 @@ #ifndef GRPC_INTERNAL_CORE_IOMGR_IOMGR_H #define GRPC_INTERNAL_CORE_IOMGR_IOMGR_H -struct grpc_closure; -typedef struct grpc_closure grpc_closure; - -typedef struct grpc_closure_list { - grpc_closure *head; - grpc_closure *tail; -} grpc_closure_list; - -/** gRPC Callback definition. - * - * \param arg Arbitrary input. - * \param success An indication on the state of the iomgr. On false, cleanup - * actions should be taken (eg, shutdown). */ -typedef void (*grpc_iomgr_cb_func)(void *arg, int success, - grpc_closure_list *closure_list); - -/** A closure over a grpc_iomgr_cb_func. */ -struct grpc_closure { - /** Bound callback. */ - grpc_iomgr_cb_func cb; - - /** Arguments to be passed to "cb". */ - void *cb_arg; - - /** Internal. A boolean indication to "cb" on the state of the iomgr. - * For instance, closures created during a shutdown would have this field set - * to false. */ - int success; - - /**< Internal. Do not touch */ - struct grpc_closure *next; -}; - -/** Initializes \a closure with \a cb and \a cb_arg. */ -void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, - void *cb_arg); - -#define GRPC_CLOSURE_LIST_INIT \ - { NULL, NULL } - -void grpc_closure_list_add(grpc_closure_list *list, grpc_closure *closure, - int success); -void grpc_closure_list_run(grpc_closure_list *list); -void grpc_closure_list_move(grpc_closure_list *src, grpc_closure_list *dst); -int grpc_closure_list_empty(grpc_closure_list list); - /** Initializes the iomgr. */ void grpc_iomgr_init(void); diff --git a/src/core/iomgr/pollset_posix.h b/src/core/iomgr/pollset_posix.h index 2f50cd22091..4064d117b7d 100644 --- a/src/core/iomgr/pollset_posix.h +++ b/src/core/iomgr/pollset_posix.h @@ -37,6 +37,7 @@ #include #include +#include "src/core/iomgr/exec_ctx.h" #include "src/core/iomgr/iomgr.h" #include "src/core/iomgr/wakeup_fd_posix.h" diff --git a/src/core/iomgr/resolve_address.h b/src/core/iomgr/resolve_address.h index 174432225e7..54e8add5605 100644 --- a/src/core/iomgr/resolve_address.h +++ b/src/core/iomgr/resolve_address.h @@ -35,6 +35,7 @@ #define GRPC_INTERNAL_CORE_IOMGR_RESOLVE_ADDRESS_H #include +#include "src/core/iomgr/exec_ctx.h" #include "src/core/iomgr/iomgr.h" #define GRPC_MAX_SOCKADDR_SIZE 128 diff --git a/src/core/iomgr/workqueue.h b/src/core/iomgr/workqueue.h index 0bec714d4f1..0bc7e314e14 100644 --- a/src/core/iomgr/workqueue.h +++ b/src/core/iomgr/workqueue.h @@ -36,6 +36,7 @@ #include "src/core/iomgr/iomgr.h" #include "src/core/iomgr/pollset.h" +#include "src/core/iomgr/closure.h" #ifdef GPR_POSIX_SOCKET #include "src/core/iomgr/workqueue_posix.h" diff --git a/src/core/transport/chttp2/frame_data.h b/src/core/transport/chttp2/frame_data.h index 89a503eb7ca..ccd56a132c9 100644 --- a/src/core/transport/chttp2/frame_data.h +++ b/src/core/transport/chttp2/frame_data.h @@ -36,7 +36,7 @@ /* Parser for GRPC streams embedded in DATA frames */ -#include "src/core/iomgr/iomgr.h" +#include "src/core/iomgr/exec_ctx.h" #include #include #include "src/core/transport/stream_op.h" diff --git a/src/core/transport/chttp2/frame_goaway.h b/src/core/transport/chttp2/frame_goaway.h index 6f9ce94a0cb..e45d55418c5 100644 --- a/src/core/transport/chttp2/frame_goaway.h +++ b/src/core/transport/chttp2/frame_goaway.h @@ -34,7 +34,7 @@ #ifndef GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_GOAWAY_H #define GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_GOAWAY_H -#include "src/core/iomgr/iomgr.h" +#include "src/core/iomgr/exec_ctx.h" #include "src/core/transport/chttp2/frame.h" #include #include diff --git a/src/core/transport/chttp2/frame_ping.h b/src/core/transport/chttp2/frame_ping.h index fb31147ed45..42240029047 100644 --- a/src/core/transport/chttp2/frame_ping.h +++ b/src/core/transport/chttp2/frame_ping.h @@ -34,8 +34,8 @@ #ifndef GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_PING_H #define GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_PING_H +#include "src/core/iomgr/exec_ctx.h" #include -#include "src/core/iomgr/iomgr.h" #include "src/core/transport/chttp2/frame.h" typedef struct { diff --git a/src/core/transport/chttp2/frame_rst_stream.h b/src/core/transport/chttp2/frame_rst_stream.h index 05d9e560f4e..5d660968ad6 100644 --- a/src/core/transport/chttp2/frame_rst_stream.h +++ b/src/core/transport/chttp2/frame_rst_stream.h @@ -36,7 +36,7 @@ #include #include "src/core/transport/chttp2/frame.h" -#include "src/core/iomgr/iomgr.h" +#include "src/core/iomgr/exec_ctx.h" typedef struct { gpr_uint8 byte; diff --git a/src/core/transport/chttp2/frame_settings.h b/src/core/transport/chttp2/frame_settings.h index 7931b8b2ca1..f08d527d386 100644 --- a/src/core/transport/chttp2/frame_settings.h +++ b/src/core/transport/chttp2/frame_settings.h @@ -37,7 +37,7 @@ #include #include #include "src/core/transport/chttp2/frame.h" -#include "src/core/iomgr/iomgr.h" +#include "src/core/iomgr/exec_ctx.h" typedef enum { GRPC_CHTTP2_SPS_ID0, diff --git a/src/core/transport/chttp2/frame_window_update.h b/src/core/transport/chttp2/frame_window_update.h index 08931044e48..b8fe9095b7d 100644 --- a/src/core/transport/chttp2/frame_window_update.h +++ b/src/core/transport/chttp2/frame_window_update.h @@ -34,7 +34,7 @@ #ifndef GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_WINDOW_UPDATE_H #define GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_WINDOW_UPDATE_H -#include "src/core/iomgr/iomgr.h" +#include "src/core/iomgr/exec_ctx.h" #include #include "src/core/transport/chttp2/frame.h" diff --git a/src/core/transport/chttp2/hpack_parser.h b/src/core/transport/chttp2/hpack_parser.h index 946f8e34ef5..0d6d268a065 100644 --- a/src/core/transport/chttp2/hpack_parser.h +++ b/src/core/transport/chttp2/hpack_parser.h @@ -37,7 +37,7 @@ #include #include -#include "src/core/iomgr/iomgr.h" +#include "src/core/iomgr/exec_ctx.h" #include "src/core/transport/chttp2/frame.h" #include "src/core/transport/chttp2/hpack_table.h" #include "src/core/transport/metadata.h" diff --git a/src/core/transport/connectivity_state.h b/src/core/transport/connectivity_state.h index 26f8874fbc4..9b4d8da882e 100644 --- a/src/core/transport/connectivity_state.h +++ b/src/core/transport/connectivity_state.h @@ -35,7 +35,7 @@ #define GRPC_INTERNAL_CORE_TRANSPORT_CONNECTIVITY_STATE_H #include -#include "src/core/iomgr/iomgr.h" +#include "src/core/iomgr/exec_ctx.h" typedef struct grpc_connectivity_state_watcher { /** we keep watchers in a linked list */ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 832346587f0..04729c3a4d6 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -815,8 +815,10 @@ src/core/httpcli/parser.h \ src/core/iomgr/alarm.h \ src/core/iomgr/alarm_heap.h \ src/core/iomgr/alarm_internal.h \ +src/core/iomgr/closure.h \ src/core/iomgr/endpoint.h \ src/core/iomgr/endpoint_pair.h \ +src/core/iomgr/exec_ctx.h \ src/core/iomgr/fd_posix.h \ src/core/iomgr/iocp_windows.h \ src/core/iomgr/iomgr.h \ @@ -946,6 +948,7 @@ src/core/httpcli/httpcli.c \ src/core/httpcli/parser.c \ src/core/iomgr/alarm.c \ src/core/iomgr/alarm_heap.c \ +src/core/iomgr/closure.c \ src/core/iomgr/endpoint.c \ src/core/iomgr/endpoint_pair_posix.c \ src/core/iomgr/endpoint_pair_windows.c \ diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 5eb82b79606..27a41206c4b 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -12311,8 +12311,10 @@ "src/core/iomgr/alarm.h", "src/core/iomgr/alarm_heap.h", "src/core/iomgr/alarm_internal.h", + "src/core/iomgr/closure.h", "src/core/iomgr/endpoint.h", "src/core/iomgr/endpoint_pair.h", + "src/core/iomgr/exec_ctx.h", "src/core/iomgr/fd_posix.h", "src/core/iomgr/iocp_windows.h", "src/core/iomgr/iomgr.h", @@ -12485,11 +12487,14 @@ "src/core/iomgr/alarm_heap.c", "src/core/iomgr/alarm_heap.h", "src/core/iomgr/alarm_internal.h", + "src/core/iomgr/closure.c", + "src/core/iomgr/closure.h", "src/core/iomgr/endpoint.c", "src/core/iomgr/endpoint.h", "src/core/iomgr/endpoint_pair.h", "src/core/iomgr/endpoint_pair_posix.c", "src/core/iomgr/endpoint_pair_windows.c", + "src/core/iomgr/exec_ctx.h", "src/core/iomgr/fd_posix.c", "src/core/iomgr/fd_posix.h", "src/core/iomgr/iocp_windows.c", @@ -12808,8 +12813,10 @@ "src/core/iomgr/alarm.h", "src/core/iomgr/alarm_heap.h", "src/core/iomgr/alarm_internal.h", + "src/core/iomgr/closure.h", "src/core/iomgr/endpoint.h", "src/core/iomgr/endpoint_pair.h", + "src/core/iomgr/exec_ctx.h", "src/core/iomgr/fd_posix.h", "src/core/iomgr/iocp_windows.h", "src/core/iomgr/iomgr.h", @@ -12967,11 +12974,14 @@ "src/core/iomgr/alarm_heap.c", "src/core/iomgr/alarm_heap.h", "src/core/iomgr/alarm_internal.h", + "src/core/iomgr/closure.c", + "src/core/iomgr/closure.h", "src/core/iomgr/endpoint.c", "src/core/iomgr/endpoint.h", "src/core/iomgr/endpoint_pair.h", "src/core/iomgr/endpoint_pair_posix.c", "src/core/iomgr/endpoint_pair_windows.c", + "src/core/iomgr/exec_ctx.h", "src/core/iomgr/fd_posix.c", "src/core/iomgr/fd_posix.h", "src/core/iomgr/iocp_windows.c", diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index f7217b1904c..d88e038cf7d 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -277,8 +277,10 @@ + + @@ -466,6 +468,8 @@ + + diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index d373226d86b..a835e8bfaa2 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -169,6 +169,9 @@ src\core\iomgr + + src\core\iomgr + src\core\iomgr @@ -608,12 +611,18 @@ src\core\iomgr + + src\core\iomgr + src\core\iomgr src\core\iomgr + + src\core\iomgr + src\core\iomgr diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index ecc1d26e645..d8e9c1de2b3 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -256,8 +256,10 @@ + + @@ -405,6 +407,8 @@ + + diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index 3813fb5b539..b2f963611ce 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -109,6 +109,9 @@ src\core\iomgr + + src\core\iomgr + src\core\iomgr @@ -506,12 +509,18 @@ src\core\iomgr + + src\core\iomgr + src\core\iomgr src\core\iomgr + + src\core\iomgr + src\core\iomgr From 45724b35e411fef7c5da66a74c78428c11d56843 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 10:42:19 -0700 Subject: [PATCH 26/56] indent pass to get logical source lines on one physical line --- src/core/census/aggregation.h | 21 +- src/core/census/context.c | 5 +- src/core/census/context.h | 11 +- src/core/census/grpc_context.c | 24 +- src/core/census/grpc_filter.c | 228 +- src/core/census/initialize.c | 42 +- src/core/census/operation.c | 30 +- src/core/census/tracing.c | 15 +- src/core/channel/channel_args.c | 251 +- src/core/channel/channel_args.h | 25 +- src/core/channel/channel_stack.c | 189 +- src/core/channel/channel_stack.h | 94 +- src/core/channel/client_channel.c | 1040 ++++--- src/core/channel/client_channel.h | 23 +- src/core/channel/compress_filter.c | 452 ++- src/core/channel/connected_channel.c | 121 +- src/core/channel/connected_channel.h | 3 +- src/core/channel/context.h | 8 +- src/core/channel/http_client_filter.c | 315 +- src/core/channel/http_server_filter.c | 384 +-- src/core/channel/noop_filter.c | 89 +- src/core/client_config/client_config.c | 51 +- src/core/client_config/client_config.h | 13 +- src/core/client_config/connector.c | 31 +- src/core/client_config/connector.h | 37 +- .../client_config/lb_policies/pick_first.c | 463 +-- .../client_config/lb_policies/pick_first.h | 2 +- .../client_config/lb_policies/round_robin.c | 727 ++--- .../client_config/lb_policies/round_robin.h | 2 +- src/core/client_config/lb_policy.c | 89 +- src/core/client_config/lb_policy.h | 67 +- src/core/client_config/lb_policy_factory.c | 23 +- src/core/client_config/lb_policy_factory.h | 23 +- src/core/client_config/lb_policy_registry.c | 58 +- src/core/client_config/lb_policy_registry.h | 9 +- src/core/client_config/resolver.c | 70 +- src/core/client_config/resolver.h | 45 +- src/core/client_config/resolver_factory.c | 32 +- src/core/client_config/resolver_factory.h | 28 +- src/core/client_config/resolver_registry.c | 126 +- src/core/client_config/resolver_registry.h | 11 +- .../client_config/resolvers/dns_resolver.c | 286 +- .../client_config/resolvers/dns_resolver.h | 2 +- .../resolvers/sockaddr_resolver.c | 429 +-- .../resolvers/sockaddr_resolver.h | 6 +- .../resolvers/zookeeper_resolver.c | 628 ++-- .../resolvers/zookeeper_resolver.h | 2 +- src/core/client_config/subchannel.c | 874 +++--- src/core/client_config/subchannel.h | 53 +- src/core/client_config/subchannel_factory.c | 21 +- src/core/client_config/subchannel_factory.h | 24 +- .../add_channel_arg.c | 9 +- .../add_channel_arg.h | 5 +- .../merge_channel_args.c | 62 +- .../merge_channel_args.h | 5 +- src/core/client_config/uri_parser.c | 319 +- src/core/client_config/uri_parser.h | 7 +- src/core/compression/algorithm.c | 103 +- src/core/compression/message_compress.c | 207 +- src/core/compression/message_compress.h | 6 +- src/core/debug/trace.c | 137 +- src/core/debug/trace.h | 6 +- src/core/httpcli/format_request.c | 112 +- src/core/httpcli/format_request.h | 6 +- src/core/httpcli/httpcli.c | 319 +- src/core/httpcli/httpcli.h | 62 +- src/core/httpcli/httpcli_security_connector.c | 201 +- src/core/httpcli/parser.c | 256 +- src/core/httpcli/parser.h | 14 +- src/core/iomgr/alarm.c | 392 +-- src/core/iomgr/alarm.h | 11 +- src/core/iomgr/alarm_heap.c | 152 +- src/core/iomgr/alarm_heap.h | 17 +- src/core/iomgr/alarm_internal.h | 11 +- src/core/iomgr/closure.c | 78 +- src/core/iomgr/closure.h | 21 +- src/core/iomgr/endpoint.c | 48 +- src/core/iomgr/endpoint.h | 43 +- src/core/iomgr/endpoint_pair.h | 6 +- src/core/iomgr/endpoint_pair_posix.c | 35 +- src/core/iomgr/endpoint_pair_windows.c | 54 +- src/core/iomgr/fd_posix.c | 558 ++-- src/core/iomgr/fd_posix.h | 48 +- src/core/iomgr/iocp_windows.c | 216 +- src/core/iomgr/iocp_windows.h | 14 +- src/core/iomgr/iomgr.c | 159 +- src/core/iomgr/iomgr.h | 4 +- src/core/iomgr/iomgr_internal.h | 11 +- src/core/iomgr/iomgr_posix.c | 18 +- src/core/iomgr/iomgr_posix.h | 4 +- src/core/iomgr/iomgr_windows.c | 32 +- src/core/iomgr/pollset.h | 14 +- .../iomgr/pollset_multipoller_with_epoll.c | 287 +- .../pollset_multipoller_with_poll_posix.c | 248 +- src/core/iomgr/pollset_posix.c | 689 +++-- src/core/iomgr/pollset_posix.h | 52 +- src/core/iomgr/pollset_set.h | 12 +- src/core/iomgr/pollset_set_posix.c | 144 +- src/core/iomgr/pollset_set_posix.h | 9 +- src/core/iomgr/pollset_set_windows.c | 28 +- src/core/iomgr/pollset_set_windows.h | 5 +- src/core/iomgr/pollset_windows.c | 160 +- src/core/iomgr/pollset_windows.h | 6 +- src/core/iomgr/resolve_address.h | 17 +- src/core/iomgr/resolve_address_posix.c | 177 +- src/core/iomgr/resolve_address_windows.c | 141 +- src/core/iomgr/sockaddr_utils.c | 271 +- src/core/iomgr/sockaddr_utils.h | 24 +- src/core/iomgr/sockaddr_win32.h | 2 +- src/core/iomgr/socket_utils_common_posix.c | 234 +- src/core/iomgr/socket_utils_linux.c | 7 +- src/core/iomgr/socket_utils_posix.c | 38 +- src/core/iomgr/socket_utils_posix.h | 21 +- src/core/iomgr/socket_windows.c | 56 +- src/core/iomgr/socket_windows.h | 14 +- src/core/iomgr/tcp_client.h | 6 +- src/core/iomgr/tcp_client_posix.c | 363 +-- src/core/iomgr/tcp_client_windows.c | 207 +- src/core/iomgr/tcp_posix.c | 582 ++-- src/core/iomgr/tcp_posix.h | 3 +- src/core/iomgr/tcp_server.h | 18 +- src/core/iomgr/tcp_server_posix.c | 600 ++-- src/core/iomgr/tcp_server_windows.c | 544 ++-- src/core/iomgr/tcp_windows.c | 428 +-- src/core/iomgr/tcp_windows.h | 4 +- src/core/iomgr/time_averaged_stats.c | 44 +- src/core/iomgr/time_averaged_stats.h | 12 +- src/core/iomgr/udp_server.c | 459 +-- src/core/iomgr/udp_server.h | 16 +- src/core/iomgr/wakeup_fd_eventfd.c | 48 +- src/core/iomgr/wakeup_fd_nospecial.c | 9 +- src/core/iomgr/wakeup_fd_pipe.c | 69 +- src/core/iomgr/wakeup_fd_posix.c | 51 +- src/core/iomgr/wakeup_fd_posix.h | 30 +- src/core/iomgr/workqueue.h | 24 +- src/core/iomgr/workqueue_posix.c | 145 +- src/core/iomgr/workqueue_posix.h | 3 +- src/core/json/json.c | 41 +- src/core/json/json.h | 25 +- src/core/json/json_common.h | 3 +- src/core/json/json_reader.c | 1257 ++++---- src/core/json/json_reader.h | 60 +- src/core/json/json_string.c | 399 +-- src/core/json/json_writer.c | 385 +-- src/core/json/json_writer.h | 35 +- src/core/profiling/basic_timers.c | 115 +- src/core/profiling/stap_timers.c | 28 +- src/core/profiling/timers.h | 94 +- src/core/security/base64.c | 311 +- src/core/security/base64.h | 8 +- src/core/security/client_auth_filter.c | 445 +-- src/core/security/credentials.c | 1797 +++++------ src/core/security/credentials.h | 172 +- src/core/security/credentials_metadata.c | 105 +- src/core/security/credentials_posix.c | 21 +- src/core/security/credentials_win32.c | 21 +- .../security/google_default_credentials.c | 239 +- src/core/security/handshake.c | 349 +-- src/core/security/handshake.h | 7 +- src/core/security/json_token.c | 540 ++-- src/core/security/json_token.h | 37 +- src/core/security/jwt_verifier.c | 1174 ++++---- src/core/security/jwt_verifier.h | 47 +- src/core/security/secure_endpoint.c | 519 ++-- src/core/security/secure_endpoint.h | 4 +- src/core/security/security_connector.c | 927 +++--- src/core/security/security_connector.h | 105 +- src/core/security/security_context.c | 396 +-- src/core/security/security_context.h | 43 +- src/core/security/server_auth_filter.c | 282 +- src/core/security/server_secure_chttp2.c | 338 ++- src/core/statistics/census_init.c | 16 +- src/core/statistics/census_interface.h | 15 +- src/core/statistics/census_log.c | 609 ++-- src/core/statistics/census_log.h | 18 +- src/core/statistics/census_rpc_stats.c | 342 ++- src/core/statistics/census_rpc_stats.h | 70 +- src/core/statistics/census_tracing.c | 330 ++- src/core/statistics/census_tracing.h | 47 +- src/core/statistics/hash_table.c | 392 ++- src/core/statistics/hash_table.h | 43 +- src/core/statistics/window_stats.c | 378 +-- src/core/statistics/window_stats.h | 31 +- src/core/support/alloc.c | 52 +- src/core/support/cmdline.c | 388 ++- src/core/support/cpu_iphone.c | 12 +- src/core/support/cpu_linux.c | 40 +- src/core/support/cpu_posix.c | 37 +- src/core/support/cpu_windows.c | 12 +- src/core/support/env.h | 9 +- src/core/support/env_linux.c | 16 +- src/core/support/env_posix.c | 16 +- src/core/support/env_win32.c | 21 +- src/core/support/file.c | 72 +- src/core/support/file.h | 10 +- src/core/support/file_posix.c | 52 +- src/core/support/file_win32.c | 33 +- src/core/support/histogram.c | 276 +- src/core/support/host_port.c | 121 +- src/core/support/log.c | 26 +- src/core/support/log_android.c | 36 +- src/core/support/log_linux.c | 58 +- src/core/support/log_posix.c | 73 +- src/core/support/log_win32.c | 95 +- src/core/support/murmur_hash.c | 44 +- src/core/support/murmur_hash.h | 2 +- src/core/support/slice.c | 429 +-- src/core/support/slice_buffer.c | 288 +- src/core/support/stack_lockfree.c | 114 +- src/core/support/stack_lockfree.h | 8 +- src/core/support/string.c | 350 ++- src/core/support/string.h | 42 +- src/core/support/string_posix.c | 54 +- src/core/support/string_win32.c | 83 +- src/core/support/string_win32.h | 4 +- src/core/support/subprocess_posix.c | 98 +- src/core/support/sync.c | 124 +- src/core/support/sync_posix.c | 90 +- src/core/support/sync_win32.c | 122 +- src/core/support/thd.c | 31 +- src/core/support/thd_posix.c | 66 +- src/core/support/thd_win32.c | 107 +- src/core/support/time.c | 457 +-- src/core/support/time_posix.c | 107 +- src/core/support/time_precise.h | 46 +- src/core/support/time_win32.c | 56 +- src/core/support/tls_pthread.c | 6 +- src/core/surface/byte_buffer.c | 87 +- src/core/surface/byte_buffer_queue.c | 91 +- src/core/surface/byte_buffer_queue.h | 18 +- src/core/surface/byte_buffer_reader.c | 95 +- src/core/surface/call.c | 2627 +++++++++-------- src/core/surface/call.h | 171 +- src/core/surface/call_details.c | 14 +- src/core/surface/call_log_batch.c | 124 +- src/core/surface/channel.c | 429 +-- src/core/surface/channel.h | 34 +- src/core/surface/channel_connectivity.c | 192 +- src/core/surface/channel_create.c | 204 +- src/core/surface/completion_queue.c | 439 +-- src/core/surface/completion_queue.h | 30 +- src/core/surface/event_string.c | 50 +- src/core/surface/event_string.h | 2 +- src/core/surface/init.c | 139 +- src/core/surface/init.h | 4 +- src/core/surface/init_secure.c | 8 +- src/core/surface/init_unsecure.c | 5 +- src/core/surface/lame_client.c | 175 +- src/core/surface/metadata_array.c | 12 +- src/core/surface/secure_channel_create.c | 331 ++- src/core/surface/server.c | 1570 +++++----- src/core/surface/server.h | 22 +- src/core/surface/server_chttp2.c | 129 +- src/core/surface/server_create.c | 11 +- src/core/surface/version.c | 6 +- src/core/transport/chttp2/alpn.c | 26 +- src/core/transport/chttp2/alpn.h | 6 +- src/core/transport/chttp2/bin_encoder.c | 214 +- src/core/transport/chttp2/bin_encoder.h | 8 +- src/core/transport/chttp2/frame.h | 3 +- src/core/transport/chttp2/frame_data.c | 215 +- src/core/transport/chttp2/frame_data.h | 21 +- src/core/transport/chttp2/frame_goaway.c | 218 +- src/core/transport/chttp2/frame_goaway.h | 22 +- src/core/transport/chttp2/frame_ping.c | 82 +- src/core/transport/chttp2/frame_ping.h | 13 +- src/core/transport/chttp2/frame_rst_stream.c | 78 +- src/core/transport/chttp2/frame_rst_stream.h | 13 +- src/core/transport/chttp2/frame_settings.c | 353 +-- src/core/transport/chttp2/frame_settings.h | 32 +- .../transport/chttp2/frame_window_update.c | 107 +- .../transport/chttp2/frame_window_update.h | 15 +- src/core/transport/chttp2/hpack_parser.c | 2003 +++++++------ src/core/transport/chttp2/hpack_parser.h | 30 +- src/core/transport/chttp2/hpack_table.c | 424 ++- src/core/transport/chttp2/hpack_table.h | 18 +- src/core/transport/chttp2/http2_errors.h | 3 +- src/core/transport/chttp2/huffsyms.c | 130 +- src/core/transport/chttp2/huffsyms.h | 3 +- src/core/transport/chttp2/incoming_metadata.c | 200 +- src/core/transport/chttp2/incoming_metadata.h | 35 +- src/core/transport/chttp2/internal.h | 246 +- src/core/transport/chttp2/parsing.c | 1154 ++++---- src/core/transport/chttp2/status_conversion.c | 36 +- src/core/transport/chttp2/status_conversion.h | 10 +- src/core/transport/chttp2/stream_encoder.c | 925 +++--- src/core/transport/chttp2/stream_encoder.h | 17 +- src/core/transport/chttp2/stream_lists.c | 488 +-- src/core/transport/chttp2/stream_map.c | 218 +- src/core/transport/chttp2/stream_map.h | 26 +- src/core/transport/chttp2/timeout_encoding.c | 258 +- src/core/transport/chttp2/timeout_encoding.h | 4 +- src/core/transport/chttp2/varint.c | 56 +- src/core/transport/chttp2/varint.h | 6 +- src/core/transport/chttp2/writing.c | 311 +- src/core/transport/chttp2_transport.c | 1737 ++++++----- src/core/transport/chttp2_transport.h | 9 +- src/core/transport/connectivity_state.c | 139 +- src/core/transport/connectivity_state.h | 25 +- src/core/transport/metadata.c | 867 +++--- src/core/transport/metadata.h | 84 +- src/core/transport/stream_op.c | 451 +-- src/core/transport/stream_op.h | 82 +- src/core/transport/transport.c | 148 +- src/core/transport/transport.h | 56 +- src/core/transport/transport_impl.h | 27 +- src/core/transport/transport_op_string.c | 208 +- src/core/tsi/fake_transport_security.c | 688 +++-- src/core/tsi/fake_transport_security.h | 10 +- src/core/tsi/ssl_transport_security.c | 2176 +++++++------- src/core/tsi/ssl_transport_security.h | 33 +- src/core/tsi/transport_security.c | 325 +- src/core/tsi/transport_security.h | 89 +- src/core/tsi/transport_security_interface.h | 110 +- test/core/bad_client/bad_client.c | 143 +- test/core/bad_client/bad_client.h | 7 +- .../core/bad_client/tests/connection_prefix.c | 67 +- .../bad_client/tests/initial_settings_frame.c | 79 +- test/core/channel/channel_args_test.c | 125 +- test/core/channel/channel_stack_test.c | 146 +- test/core/client_config/lb_policies_test.c | 879 +++--- test/core/client_config/uri_parser_test.c | 74 +- test/core/compression/compression_test.c | 55 +- test/core/compression/message_compress_test.c | 181 +- test/core/end2end/cq_verifier.c | 287 +- test/core/end2end/cq_verifier.h | 15 +- test/core/end2end/data/server1_cert.c | 163 +- test/core/end2end/data/server1_key.c | 149 +- test/core/end2end/data/test_root_cert.c | 135 +- test/core/end2end/dualstack_socket_test.c | 451 +-- test/core/end2end/end2end_tests.h | 19 +- test/core/end2end/fixtures/h2_compress.c | 108 +- test/core/end2end/fixtures/h2_fakesec.c | 153 +- test/core/end2end/fixtures/h2_full+poll.c | 76 +- test/core/end2end/fixtures/h2_full.c | 78 +- test/core/end2end/fixtures/h2_oauth2.c | 260 +- test/core/end2end/fixtures/h2_proxy.c | 97 +- .../core/end2end/fixtures/h2_sockpair+trace.c | 136 +- test/core/end2end/fixtures/h2_sockpair.c | 124 +- .../core/end2end/fixtures/h2_sockpair_1byte.c | 124 +- test/core/end2end/fixtures/h2_ssl+poll.c | 192 +- test/core/end2end/fixtures/h2_ssl.c | 191 +- test/core/end2end/fixtures/h2_ssl_proxy.c | 230 +- test/core/end2end/fixtures/h2_uds+poll.c | 75 +- test/core/end2end/fixtures/h2_uds.c | 75 +- test/core/end2end/fixtures/proxy.c | 541 ++-- test/core/end2end/fixtures/proxy.h | 16 +- .../end2end/multiple_server_queues_test.c | 43 +- test/core/end2end/no_server_test.c | 56 +- test/core/end2end/tests/bad_hostname.c | 154 +- test/core/end2end/tests/binary_metadata.c | 259 +- test/core/end2end/tests/call_creds.c | 477 +-- test/core/end2end/tests/cancel_after_accept.c | 189 +- .../end2end/tests/cancel_after_client_done.c | 189 +- test/core/end2end/tests/cancel_after_invoke.c | 165 +- .../core/end2end/tests/cancel_before_invoke.c | 161 +- test/core/end2end/tests/cancel_in_a_vacuum.c | 124 +- test/core/end2end/tests/cancel_test_helpers.h | 17 +- .../end2end/tests/census_simple_request.c | 173 +- .../core/end2end/tests/channel_connectivity.c | 120 +- test/core/end2end/tests/compressed_payload.c | 297 +- test/core/end2end/tests/default_host.c | 203 +- test/core/end2end/tests/disappearing_server.c | 180 +- test/core/end2end/tests/empty_batch.c | 129 +- .../end2end/tests/graceful_server_shutdown.c | 169 +- test/core/end2end/tests/high_initial_seqno.c | 191 +- .../core/end2end/tests/invoke_large_request.c | 202 +- test/core/end2end/tests/large_metadata.c | 199 +- .../end2end/tests/max_concurrent_streams.c | 335 ++- test/core/end2end/tests/max_message_length.c | 173 +- test/core/end2end/tests/metadata.c | 219 +- test/core/end2end/tests/no_op.c | 102 +- test/core/end2end/tests/payload.c | 228 +- test/core/end2end/tests/ping_pong_streaming.c | 284 +- test/core/end2end/tests/registered_call.c | 208 +- test/core/end2end/tests/request_with_flags.c | 193 +- .../core/end2end/tests/request_with_payload.c | 187 +- .../end2end/tests/server_finishes_request.c | 176 +- .../end2end/tests/shutdown_finishes_calls.c | 160 +- .../end2end/tests/shutdown_finishes_tags.c | 117 +- .../end2end/tests/simple_delayed_request.c | 188 +- test/core/end2end/tests/simple_request.c | 231 +- test/core/end2end/tests/trailing_metadata.c | 226 +- test/core/fling/client.c | 220 +- test/core/fling/fling_stream_test.c | 103 +- test/core/fling/fling_test.c | 66 +- test/core/fling/server.c | 361 ++- test/core/httpcli/format_request_test.c | 110 +- test/core/httpcli/httpcli_test.c | 184 +- test/core/httpcli/parser_test.c | 167 +- test/core/iomgr/alarm_heap_test.c | 364 ++- test/core/iomgr/alarm_list_test.c | 170 +- test/core/iomgr/endpoint_pair_test.c | 47 +- test/core/iomgr/endpoint_tests.c | 249 +- test/core/iomgr/endpoint_tests.h | 13 +- test/core/iomgr/fd_conservation_posix_test.c | 27 +- test/core/iomgr/fd_posix_test.c | 580 ++-- test/core/iomgr/resolve_address_test.c | 155 +- test/core/iomgr/sockaddr_utils_test.c | 242 +- test/core/iomgr/tcp_client_posix_test.c | 313 +- test/core/iomgr/tcp_posix_test.c | 512 ++-- test/core/iomgr/tcp_server_posix_test.c | 198 +- test/core/iomgr/time_averaged_stats_test.c | 252 +- test/core/iomgr/udp_server_test.c | 190 +- test/core/iomgr/workqueue_test.c | 73 +- test/core/json/json_rewrite.c | 291 +- test/core/json/json_rewrite_test.c | 362 ++- test/core/json/json_test.c | 252 +- .../network_benchmarks/low_level_ping_pong.c | 922 +++--- test/core/profiling/timers_test.c | 85 +- test/core/security/auth_context_test.c | 190 +- test/core/security/base64_test.c | 285 +- test/core/security/create_jwt.c | 103 +- test/core/security/credentials_test.c | 1452 +++++---- test/core/security/fetch_oauth2.c | 113 +- test/core/security/json_token_test.c | 683 ++--- test/core/security/jwt_verifier_test.c | 751 ++--- test/core/security/oauth2_utils.c | 76 +- test/core/security/oauth2_utils.h | 7 +- .../print_google_default_creds_token.c | 94 +- test/core/security/secure_endpoint_test.c | 229 +- test/core/security/security_connector_test.c | 310 +- test/core/security/verify_jwt.c | 108 +- test/core/statistics/census_log_tests.c | 701 +++-- test/core/statistics/census_log_tests.h | 26 +- test/core/statistics/census_stub_test.c | 44 +- test/core/statistics/hash_table_test.c | 420 +-- .../multiple_writers_circular_buffer_test.c | 10 +- test/core/statistics/multiple_writers_test.c | 10 +- test/core/statistics/performance_test.c | 10 +- test/core/statistics/quick_test.c | 26 +- test/core/statistics/rpc_stats_test.c | 236 +- test/core/statistics/small_log_test.c | 10 +- test/core/statistics/trace_test.c | 288 +- test/core/statistics/window_stats_test.c | 349 ++- test/core/support/cmdline_test.c | 366 +-- test/core/support/env_test.c | 24 +- test/core/support/file_test.c | 177 +- test/core/support/histogram_test.c | 226 +- test/core/support/host_port_test.c | 47 +- test/core/support/log_test.c | 30 +- test/core/support/murmur_hash_test.c | 49 +- test/core/support/slice_buffer_test.c | 69 +- test/core/support/slice_test.c | 260 +- test/core/support/stack_lockfree_test.c | 147 +- test/core/support/string_test.c | 377 +-- test/core/support/sync_test.c | 529 ++-- test/core/support/thd_test.c | 79 +- test/core/support/time_test.c | 351 +-- test/core/support/tls_test.c | 47 +- test/core/support/useful_test.c | 54 +- test/core/surface/byte_buffer_reader_test.c | 207 +- test/core/surface/completion_queue_test.c | 441 +-- test/core/surface/lame_client_test.c | 53 +- test/core/surface/multi_init_test.c | 48 +- test/core/transport/chttp2/alpn_test.c | 24 +- test/core/transport/chttp2/bin_encoder_test.c | 196 +- .../core/transport/chttp2/hpack_parser_test.c | 208 +- test/core/transport/chttp2/hpack_table_test.c | 379 +-- .../transport/chttp2/status_conversion_test.c | 148 +- .../transport/chttp2/stream_encoder_test.c | 441 +-- test/core/transport/chttp2/stream_map_test.c | 275 +- .../transport/chttp2/timeout_encoding_test.c | 181 +- test/core/transport/metadata_test.c | 338 ++- test/core/transport/stream_op_test.c | 109 +- test/core/tsi/transport_security_test.c | 388 +-- test/core/util/grpc_profiler.c | 37 +- test/core/util/grpc_profiler.h | 13 +- test/core/util/parse_hexstring.c | 46 +- test/core/util/parse_hexstring.h | 2 +- test/core/util/port.h | 9 +- test/core/util/port_posix.c | 402 +-- test/core/util/port_windows.c | 291 +- test/core/util/reconnect_server.c | 188 +- test/core/util/reconnect_server.h | 41 +- test/core/util/slice_splitter.c | 125 +- test/core/util/slice_splitter.h | 18 +- test/core/util/test_config.c | 95 +- test/core/util/test_config.h | 13 +- 479 files changed, 47920 insertions(+), 41646 deletions(-) diff --git a/src/core/census/aggregation.h b/src/core/census/aggregation.h index e9bc6ada960..779615f0c96 100644 --- a/src/core/census/aggregation.h +++ b/src/core/census/aggregation.h @@ -37,30 +37,31 @@ #define GRPC_INTERNAL_CORE_CENSUS_AGGREGATION_H /** Structure used to describe an aggregation type. */ -struct census_aggregation_ops { +struct census_aggregation_ops +{ /* Create a new aggregation. The pointer returned can be used in future calls to clone(), free(), record(), data() and reset(). */ - void *(*create)(const void *create_arg); + void *(*create) (const void *create_arg); /* Make a copy of an aggregation created by create() */ - void *(*clone)(const void *aggregation); + void *(*clone) (const void *aggregation); /* Destroy an aggregation created by create() */ - void (*free)(void *aggregation); + void (*free) (void *aggregation); /* Record a new value against aggregation. */ - void (*record)(void *aggregation, double value); + void (*record) (void *aggregation, double value); /* Return current aggregation data. The caller must cast this object into the correct type for the aggregation result. The object returned can be freed by using free_data(). */ - void *(*data)(const void *aggregation); + void *(*data) (const void *aggregation); /* free data returned by data() */ - void (*free_data)(void *data); + void (*free_data) (void *data); /* Reset an aggregation to default (zero) values. */ - void (*reset)(void *aggregation); + void (*reset) (void *aggregation); /* Merge 'from' aggregation into 'to'. Both aggregations must be compatible */ - void (*merge)(void *to, const void *from); + void (*merge) (void *to, const void *from); /* Fill buffer with printable string version of aggregation contents. For debugging only. Returns the number of bytes added to buffer (a value == n implies the buffer was of insufficient size). */ - size_t (*print)(const void *aggregation, char *buffer, size_t n); + size_t (*print) (const void *aggregation, char *buffer, size_t n); }; #endif /* GRPC_INTERNAL_CORE_CENSUS_AGGREGATION_H */ diff --git a/src/core/census/context.c b/src/core/census/context.c index cab58b653cb..0a9f129d56a 100644 --- a/src/core/census/context.c +++ b/src/core/census/context.c @@ -39,8 +39,9 @@ /* Placeholder implementation only. */ -size_t census_context_serialize(const census_context *context, char *buffer, - size_t buf_size) { +size_t +census_context_serialize (const census_context * context, char *buffer, size_t buf_size) +{ /* TODO(aveitch): implement serialization */ return 0; } diff --git a/src/core/census/context.h b/src/core/census/context.h index d43a69f7e54..4da979dc33c 100644 --- a/src/core/census/context.h +++ b/src/core/census/context.h @@ -38,12 +38,13 @@ /* census_context is the in-memory representation of information needed to * maintain tracing, RPC statistics and resource usage information. */ -struct census_context { - gpr_uint64 op_id; /* Operation identifier - unique per-context */ - gpr_uint64 trace_id; /* Globally unique trace identifier */ +struct census_context +{ + gpr_uint64 op_id; /* Operation identifier - unique per-context */ + gpr_uint64 trace_id; /* Globally unique trace identifier */ /* TODO(aveitch) Add census tags: - const census_tag_set *tags; - */ + const census_tag_set *tags; + */ }; #endif /* GRPC_INTERNAL_CORE_CENSUS_CONTEXT_H */ diff --git a/src/core/census/grpc_context.c b/src/core/census/grpc_context.c index 429f3ec9db0..4520c680102 100644 --- a/src/core/census/grpc_context.c +++ b/src/core/census/grpc_context.c @@ -35,15 +35,21 @@ #include #include "src/core/surface/call.h" -void grpc_census_call_set_context(grpc_call *call, census_context *context) { - if (census_enabled() == CENSUS_FEATURE_NONE) { - return; - } - if (context != NULL) { - grpc_call_context_set(call, GRPC_CONTEXT_TRACING, context, NULL); - } +void +grpc_census_call_set_context (grpc_call * call, census_context * context) +{ + if (census_enabled () == CENSUS_FEATURE_NONE) + { + return; + } + if (context != NULL) + { + grpc_call_context_set (call, GRPC_CONTEXT_TRACING, context, NULL); + } } -census_context *grpc_census_call_get_context(grpc_call *call) { - return (census_context *)grpc_call_context_get(call, GRPC_CONTEXT_TRACING); +census_context * +grpc_census_call_get_context (grpc_call * call) +{ + return (census_context *) grpc_call_context_get (call, GRPC_CONTEXT_TRACING); } diff --git a/src/core/census/grpc_filter.c b/src/core/census/grpc_filter.c index 26de5142c5d..5e9822dd73c 100644 --- a/src/core/census/grpc_filter.c +++ b/src/core/census/grpc_filter.c @@ -46,150 +46,166 @@ #include #include -typedef struct call_data { +typedef struct call_data +{ census_op_id op_id; - census_context* ctxt; + census_context *ctxt; gpr_timespec start_ts; int error; /* recv callback */ - grpc_stream_op_buffer* recv_ops; - grpc_closure* on_done_recv; + grpc_stream_op_buffer *recv_ops; + grpc_closure *on_done_recv; } call_data; -typedef struct channel_data { - grpc_mdstr* path_str; /* pointer to meta data str with key == ":path" */ +typedef struct channel_data +{ + grpc_mdstr *path_str; /* pointer to meta data str with key == ":path" */ } channel_data; -static void extract_and_annotate_method_tag(grpc_stream_op_buffer* sopb, - call_data* calld, - channel_data* chand) { - grpc_linked_mdelem* m; +static void +extract_and_annotate_method_tag (grpc_stream_op_buffer * sopb, call_data * calld, channel_data * chand) +{ + grpc_linked_mdelem *m; size_t i; - for (i = 0; i < sopb->nops; i++) { - grpc_stream_op* op = &sopb->ops[i]; - if (op->type != GRPC_OP_METADATA) continue; - for (m = op->data.metadata.list.head; m != NULL; m = m->next) { - if (m->md->key == chand->path_str) { - gpr_log(GPR_DEBUG, "%s", - (const char*)GPR_SLICE_START_PTR(m->md->value->slice)); - /* Add method tag here */ - } + for (i = 0; i < sopb->nops; i++) + { + grpc_stream_op *op = &sopb->ops[i]; + if (op->type != GRPC_OP_METADATA) + continue; + for (m = op->data.metadata.list.head; m != NULL; m = m->next) + { + if (m->md->key == chand->path_str) + { + gpr_log (GPR_DEBUG, "%s", (const char *) GPR_SLICE_START_PTR (m->md->value->slice)); + /* Add method tag here */ + } + } } - } } -static void client_mutate_op(grpc_call_element* elem, - grpc_transport_stream_op* op) { - call_data* calld = elem->call_data; - channel_data* chand = elem->channel_data; - if (op->send_ops) { - extract_and_annotate_method_tag(op->send_ops, calld, chand); - } +static void +client_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) +{ + call_data *calld = elem->call_data; + channel_data *chand = elem->channel_data; + if (op->send_ops) + { + extract_and_annotate_method_tag (op->send_ops, calld, chand); + } } -static void client_start_transport_op(grpc_call_element* elem, - grpc_transport_stream_op* op, - grpc_closure_list* closure_list) { - client_mutate_op(elem, op); - grpc_call_next_op(elem, op, closure_list); +static void +client_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + client_mutate_op (elem, op); + grpc_call_next_op (elem, op, closure_list); } -static void server_on_done_recv(void* ptr, int success, - grpc_closure_list* closure_list) { - grpc_call_element* elem = ptr; - call_data* calld = elem->call_data; - channel_data* chand = elem->channel_data; - if (success) { - extract_and_annotate_method_tag(calld->recv_ops, calld, chand); - } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, closure_list); +static void +server_on_done_recv (void *ptr, int success, grpc_closure_list * closure_list) +{ + grpc_call_element *elem = ptr; + call_data *calld = elem->call_data; + channel_data *chand = elem->channel_data; + if (success) + { + extract_and_annotate_method_tag (calld->recv_ops, calld, chand); + } + calld->on_done_recv->cb (calld->on_done_recv->cb_arg, success, closure_list); } -static void server_mutate_op(grpc_call_element* elem, - grpc_transport_stream_op* op) { - call_data* calld = elem->call_data; - if (op->recv_ops) { - /* substitute our callback for the op callback */ - calld->recv_ops = op->recv_ops; - calld->on_done_recv = op->on_done_recv; - op->on_done_recv = calld->on_done_recv; - } +static void +server_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) +{ + call_data *calld = elem->call_data; + if (op->recv_ops) + { + /* substitute our callback for the op callback */ + calld->recv_ops = op->recv_ops; + calld->on_done_recv = op->on_done_recv; + op->on_done_recv = calld->on_done_recv; + } } -static void server_start_transport_op(grpc_call_element* elem, - grpc_transport_stream_op* op, - grpc_closure_list* closure_list) { - 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(elem, op, closure_list); +static void +server_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + 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 (elem, op, closure_list); } -static void client_init_call_elem(grpc_call_element* elem, - const void* server_transport_data, - grpc_transport_stream_op* initial_op, - grpc_closure_list* closure_list) { - call_data* d = elem->call_data; - GPR_ASSERT(d != NULL); - d->start_ts = gpr_now(GPR_CLOCK_REALTIME); - if (initial_op) client_mutate_op(elem, initial_op); +static void +client_init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ + call_data *d = elem->call_data; + GPR_ASSERT (d != NULL); + d->start_ts = gpr_now (GPR_CLOCK_REALTIME); + if (initial_op) + client_mutate_op (elem, initial_op); } -static void client_destroy_call_elem(grpc_call_element* elem, - grpc_closure_list* closure_list) { - call_data* d = elem->call_data; - GPR_ASSERT(d != NULL); +static void +client_destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +{ + call_data *d = elem->call_data; + GPR_ASSERT (d != NULL); /* TODO(hongyu): record rpc client stats and census_rpc_end_op here */ } -static void server_init_call_elem(grpc_call_element* elem, - const void* server_transport_data, - grpc_transport_stream_op* initial_op, - grpc_closure_list* closure_list) { - call_data* d = elem->call_data; - GPR_ASSERT(d != NULL); - d->start_ts = gpr_now(GPR_CLOCK_REALTIME); +static void +server_init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ + call_data *d = elem->call_data; + GPR_ASSERT (d != NULL); + d->start_ts = gpr_now (GPR_CLOCK_REALTIME); /* TODO(hongyu): call census_tracing_start_op here. */ - grpc_closure_init(d->on_done_recv, server_on_done_recv, elem); - if (initial_op) server_mutate_op(elem, initial_op); + grpc_closure_init (d->on_done_recv, server_on_done_recv, elem); + if (initial_op) + server_mutate_op (elem, initial_op); } -static void server_destroy_call_elem(grpc_call_element* elem, - grpc_closure_list* closure_list) { - call_data* d = elem->call_data; - GPR_ASSERT(d != NULL); +static void +server_destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +{ + call_data *d = elem->call_data; + GPR_ASSERT (d != NULL); /* TODO(hongyu): record rpc server stats and census_tracing_end_op here */ } -static void init_channel_elem(grpc_channel_element* elem, grpc_channel* master, - const grpc_channel_args* args, grpc_mdctx* mdctx, - int is_first, int is_last, - grpc_closure_list* closure_list) { - channel_data* chand = elem->channel_data; - GPR_ASSERT(chand != NULL); - chand->path_str = grpc_mdstr_from_string(mdctx, ":path", 0); +static void +init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +{ + channel_data *chand = elem->channel_data; + GPR_ASSERT (chand != NULL); + chand->path_str = grpc_mdstr_from_string (mdctx, ":path", 0); } -static void destroy_channel_elem(grpc_channel_element* elem, - grpc_closure_list* closure_list) { - channel_data* chand = elem->channel_data; - GPR_ASSERT(chand != NULL); - if (chand->path_str != NULL) { - GRPC_MDSTR_UNREF(chand->path_str); - } +static void +destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +{ + channel_data *chand = elem->channel_data; + GPR_ASSERT (chand != NULL); + if (chand->path_str != NULL) + { + GRPC_MDSTR_UNREF (chand->path_str); + } } const grpc_channel_filter grpc_client_census_filter = { - client_start_transport_op, grpc_channel_next_op, - sizeof(call_data), client_init_call_elem, - client_destroy_call_elem, sizeof(channel_data), - init_channel_elem, destroy_channel_elem, - grpc_call_next_get_peer, "census-client"}; + client_start_transport_op, grpc_channel_next_op, + sizeof (call_data), client_init_call_elem, + client_destroy_call_elem, sizeof (channel_data), + init_channel_elem, destroy_channel_elem, + grpc_call_next_get_peer, "census-client" +}; const grpc_channel_filter grpc_server_census_filter = { - server_start_transport_op, grpc_channel_next_op, - sizeof(call_data), server_init_call_elem, - server_destroy_call_elem, sizeof(channel_data), - init_channel_elem, destroy_channel_elem, - grpc_call_next_get_peer, "census-server"}; + server_start_transport_op, grpc_channel_next_op, + sizeof (call_data), server_init_call_elem, + server_destroy_call_elem, sizeof (channel_data), + init_channel_elem, destroy_channel_elem, + grpc_call_next_get_peer, "census-server" +}; diff --git a/src/core/census/initialize.c b/src/core/census/initialize.c index 8d60f790eb7..dab83541686 100644 --- a/src/core/census/initialize.c +++ b/src/core/census/initialize.c @@ -35,23 +35,39 @@ static int features_enabled = CENSUS_FEATURE_NONE; -int census_initialize(int features) { - if (features_enabled != CENSUS_FEATURE_NONE) { - return 1; - } - if (features != CENSUS_FEATURE_NONE) { - return 1; - } else { - features_enabled = features; - return 0; - } +int +census_initialize (int features) +{ + if (features_enabled != CENSUS_FEATURE_NONE) + { + return 1; + } + if (features != CENSUS_FEATURE_NONE) + { + return 1; + } + else + { + features_enabled = features; + return 0; + } } -void census_shutdown(void) { features_enabled = CENSUS_FEATURE_NONE; } +void +census_shutdown (void) +{ + features_enabled = CENSUS_FEATURE_NONE; +} -int census_supported(void) { +int +census_supported (void) +{ /* TODO(aveitch): improve this as we implement features... */ return CENSUS_FEATURE_NONE; } -int census_enabled(void) { return features_enabled; } +int +census_enabled (void) +{ + return features_enabled; +} diff --git a/src/core/census/operation.c b/src/core/census/operation.c index 118eb0a47ad..b409c17d48e 100644 --- a/src/core/census/operation.c +++ b/src/core/census/operation.c @@ -34,30 +34,34 @@ /* TODO(aveitch): These are all placeholder implementations. */ -census_timestamp census_start_rpc_op_timestamp(void) { +census_timestamp +census_start_rpc_op_timestamp (void) +{ census_timestamp ct; /* TODO(aveitch): assumes gpr_timespec implementation of census_timestamp. */ - ct.ts = gpr_now(GPR_CLOCK_MONOTONIC); + ct.ts = gpr_now (GPR_CLOCK_MONOTONIC); return ct; } -census_context *census_start_client_rpc_op( - const census_context *context, gpr_int64 rpc_name_id, - const census_rpc_name_info *rpc_name_info, const char *peer, int trace_mask, - const census_timestamp *start_time) { +census_context * +census_start_client_rpc_op (const census_context * context, gpr_int64 rpc_name_id, const census_rpc_name_info * rpc_name_info, const char *peer, int trace_mask, const census_timestamp * start_time) +{ return NULL; } -census_context *census_start_server_rpc_op( - const char *buffer, gpr_int64 rpc_name_id, - const census_rpc_name_info *rpc_name_info, const char *peer, int trace_mask, - census_timestamp *start_time) { +census_context * +census_start_server_rpc_op (const char *buffer, gpr_int64 rpc_name_id, const census_rpc_name_info * rpc_name_info, const char *peer, int trace_mask, census_timestamp * start_time) +{ return NULL; } -census_context *census_start_op(census_context *context, const char *family, - const char *name, int trace_mask) { +census_context * +census_start_op (census_context * context, const char *family, const char *name, int trace_mask) +{ return NULL; } -void census_end_op(census_context *context, int status) {} +void +census_end_op (census_context * context, int status) +{ +} diff --git a/src/core/census/tracing.c b/src/core/census/tracing.c index ae38773c0a1..272efd4ca03 100644 --- a/src/core/census/tracing.c +++ b/src/core/census/tracing.c @@ -35,11 +35,18 @@ /* TODO(aveitch): These are all placeholder implementations. */ -int census_trace_mask(const census_context *context) { +int +census_trace_mask (const census_context * context) +{ return CENSUS_TRACE_MASK_NONE; } -void census_set_trace_mask(int trace_mask) {} +void +census_set_trace_mask (int trace_mask) +{ +} -void census_trace_print(census_context *context, gpr_uint32 type, - const char *buffer, size_t n) {} +void +census_trace_print (census_context * context, gpr_uint32 type, const char *buffer, size_t n) +{ +} diff --git a/src/core/channel/channel_args.c b/src/core/channel/channel_args.c index 487db1119a5..4207a97114a 100644 --- a/src/core/channel/channel_args.c +++ b/src/core/channel/channel_args.c @@ -41,169 +41,206 @@ #include -static grpc_arg copy_arg(const grpc_arg *src) { +static grpc_arg +copy_arg (const grpc_arg * src) +{ grpc_arg dst; dst.type = src->type; - dst.key = gpr_strdup(src->key); - switch (dst.type) { + dst.key = gpr_strdup (src->key); + switch (dst.type) + { case GRPC_ARG_STRING: - dst.value.string = gpr_strdup(src->value.string); + dst.value.string = gpr_strdup (src->value.string); break; case GRPC_ARG_INTEGER: dst.value.integer = src->value.integer; break; case GRPC_ARG_POINTER: dst.value.pointer = src->value.pointer; - dst.value.pointer.p = src->value.pointer.copy - ? src->value.pointer.copy(src->value.pointer.p) - : src->value.pointer.p; + dst.value.pointer.p = src->value.pointer.copy ? src->value.pointer.copy (src->value.pointer.p) : src->value.pointer.p; break; - } + } return dst; } -grpc_channel_args *grpc_channel_args_copy_and_add(const grpc_channel_args *src, - const grpc_arg *to_add, - size_t num_to_add) { - grpc_channel_args *dst = gpr_malloc(sizeof(grpc_channel_args)); +grpc_channel_args * +grpc_channel_args_copy_and_add (const grpc_channel_args * src, const grpc_arg * to_add, size_t num_to_add) +{ + grpc_channel_args *dst = gpr_malloc (sizeof (grpc_channel_args)); size_t i; size_t src_num_args = (src == NULL) ? 0 : src->num_args; - if (!src && !to_add) { - dst->num_args = 0; - dst->args = NULL; - return dst; - } + if (!src && !to_add) + { + dst->num_args = 0; + dst->args = NULL; + return dst; + } dst->num_args = src_num_args + num_to_add; - dst->args = gpr_malloc(sizeof(grpc_arg) * dst->num_args); - for (i = 0; i < src_num_args; i++) { - dst->args[i] = copy_arg(&src->args[i]); - } - for (i = 0; i < num_to_add; i++) { - dst->args[i + src_num_args] = copy_arg(&to_add[i]); - } + dst->args = gpr_malloc (sizeof (grpc_arg) * dst->num_args); + for (i = 0; i < src_num_args; i++) + { + dst->args[i] = copy_arg (&src->args[i]); + } + for (i = 0; i < num_to_add; i++) + { + dst->args[i + src_num_args] = copy_arg (&to_add[i]); + } return dst; } -grpc_channel_args *grpc_channel_args_copy(const grpc_channel_args *src) { - return grpc_channel_args_copy_and_add(src, NULL, 0); +grpc_channel_args * +grpc_channel_args_copy (const grpc_channel_args * src) +{ + return grpc_channel_args_copy_and_add (src, NULL, 0); } -grpc_channel_args *grpc_channel_args_merge(const grpc_channel_args *a, - const grpc_channel_args *b) { - return grpc_channel_args_copy_and_add(a, b->args, b->num_args); +grpc_channel_args * +grpc_channel_args_merge (const grpc_channel_args * a, const grpc_channel_args * b) +{ + return grpc_channel_args_copy_and_add (a, b->args, b->num_args); } -void grpc_channel_args_destroy(grpc_channel_args *a) { +void +grpc_channel_args_destroy (grpc_channel_args * a) +{ size_t i; - for (i = 0; i < a->num_args; i++) { - switch (a->args[i].type) { - case GRPC_ARG_STRING: - gpr_free(a->args[i].value.string); - break; - case GRPC_ARG_INTEGER: - break; - case GRPC_ARG_POINTER: - if (a->args[i].value.pointer.destroy) { - a->args[i].value.pointer.destroy(a->args[i].value.pointer.p); - } - break; + for (i = 0; i < a->num_args; i++) + { + switch (a->args[i].type) + { + case GRPC_ARG_STRING: + gpr_free (a->args[i].value.string); + break; + case GRPC_ARG_INTEGER: + break; + case GRPC_ARG_POINTER: + if (a->args[i].value.pointer.destroy) + { + a->args[i].value.pointer.destroy (a->args[i].value.pointer.p); + } + break; + } + gpr_free (a->args[i].key); } - gpr_free(a->args[i].key); - } - gpr_free(a->args); - gpr_free(a); + gpr_free (a->args); + gpr_free (a); } -int grpc_channel_args_is_census_enabled(const grpc_channel_args *a) { +int +grpc_channel_args_is_census_enabled (const grpc_channel_args * a) +{ size_t i; - if (a == NULL) return 0; - for (i = 0; i < a->num_args; i++) { - if (0 == strcmp(a->args[i].key, GRPC_ARG_ENABLE_CENSUS)) { - return a->args[i].value.integer != 0; + if (a == NULL) + return 0; + for (i = 0; i < a->num_args; i++) + { + if (0 == strcmp (a->args[i].key, GRPC_ARG_ENABLE_CENSUS)) + { + return a->args[i].value.integer != 0; + } } - } return 0; } -grpc_compression_algorithm grpc_channel_args_get_compression_algorithm( - const grpc_channel_args *a) { +grpc_compression_algorithm +grpc_channel_args_get_compression_algorithm (const grpc_channel_args * a) +{ size_t i; - if (a == NULL) return 0; - for (i = 0; i < a->num_args; ++i) { - if (a->args[i].type == GRPC_ARG_INTEGER && - !strcmp(GRPC_COMPRESSION_ALGORITHM_ARG, a->args[i].key)) { - return (grpc_compression_algorithm)a->args[i].value.integer; - break; + if (a == NULL) + return 0; + for (i = 0; i < a->num_args; ++i) + { + if (a->args[i].type == GRPC_ARG_INTEGER && !strcmp (GRPC_COMPRESSION_ALGORITHM_ARG, a->args[i].key)) + { + return (grpc_compression_algorithm) a->args[i].value.integer; + break; + } } - } return GRPC_COMPRESS_NONE; } -grpc_channel_args *grpc_channel_args_set_compression_algorithm( - grpc_channel_args *a, grpc_compression_algorithm algorithm) { +grpc_channel_args * +grpc_channel_args_set_compression_algorithm (grpc_channel_args * a, grpc_compression_algorithm algorithm) +{ grpc_arg tmp; tmp.type = GRPC_ARG_INTEGER; tmp.key = GRPC_COMPRESSION_ALGORITHM_ARG; tmp.value.integer = algorithm; - return grpc_channel_args_copy_and_add(a, &tmp, 1); + return grpc_channel_args_copy_and_add (a, &tmp, 1); } /** Returns 1 if the argument for compression algorithm's enabled states bitset * was found in \a a, returning the arg's value in \a states. Otherwise, returns * 0. */ -static int find_compression_algorithm_states_bitset(const grpc_channel_args *a, - int **states_arg) { - if (a != NULL) { - size_t i; - for (i = 0; i < a->num_args; ++i) { - if (a->args[i].type == GRPC_ARG_INTEGER && - !strcmp(GRPC_COMPRESSION_ALGORITHM_STATE_ARG, a->args[i].key)) { - *states_arg = &a->args[i].value.integer; - return 1; /* GPR_TRUE */ - } +static int +find_compression_algorithm_states_bitset (const grpc_channel_args * a, int **states_arg) +{ + if (a != NULL) + { + size_t i; + for (i = 0; i < a->num_args; ++i) + { + if (a->args[i].type == GRPC_ARG_INTEGER && !strcmp (GRPC_COMPRESSION_ALGORITHM_STATE_ARG, a->args[i].key)) + { + *states_arg = &a->args[i].value.integer; + return 1; /* GPR_TRUE */ + } + } } - } - return 0; /* GPR_FALSE */ + return 0; /* GPR_FALSE */ } -grpc_channel_args *grpc_channel_args_compression_algorithm_set_state( - grpc_channel_args **a, grpc_compression_algorithm algorithm, int state) { +grpc_channel_args * +grpc_channel_args_compression_algorithm_set_state (grpc_channel_args ** a, grpc_compression_algorithm algorithm, int state) +{ int *states_arg; grpc_channel_args *result = *a; - const int states_arg_found = - find_compression_algorithm_states_bitset(*a, &states_arg); + const int states_arg_found = find_compression_algorithm_states_bitset (*a, &states_arg); - if (states_arg_found) { - if (state != 0) { - GPR_BITSET((unsigned *)states_arg, algorithm); - } else { - GPR_BITCLEAR((unsigned *)states_arg, algorithm); + if (states_arg_found) + { + if (state != 0) + { + GPR_BITSET ((unsigned *) states_arg, algorithm); + } + else + { + GPR_BITCLEAR ((unsigned *) states_arg, algorithm); + } } - } else { - /* create a new arg */ - grpc_arg tmp; - tmp.type = GRPC_ARG_INTEGER; - tmp.key = GRPC_COMPRESSION_ALGORITHM_STATE_ARG; - /* all enabled by default */ - tmp.value.integer = (1u << GRPC_COMPRESS_ALGORITHMS_COUNT) - 1; - if (state != 0) { - GPR_BITSET((unsigned *)&tmp.value.integer, algorithm); - } else { - GPR_BITCLEAR((unsigned *)&tmp.value.integer, algorithm); + else + { + /* create a new arg */ + grpc_arg tmp; + tmp.type = GRPC_ARG_INTEGER; + tmp.key = GRPC_COMPRESSION_ALGORITHM_STATE_ARG; + /* all enabled by default */ + tmp.value.integer = (1u << GRPC_COMPRESS_ALGORITHMS_COUNT) - 1; + if (state != 0) + { + GPR_BITSET ((unsigned *) &tmp.value.integer, algorithm); + } + else + { + GPR_BITCLEAR ((unsigned *) &tmp.value.integer, algorithm); + } + result = grpc_channel_args_copy_and_add (*a, &tmp, 1); + grpc_channel_args_destroy (*a); + *a = result; } - result = grpc_channel_args_copy_and_add(*a, &tmp, 1); - grpc_channel_args_destroy(*a); - *a = result; - } return result; } -int grpc_channel_args_compression_algorithm_get_states( - const grpc_channel_args *a) { +int +grpc_channel_args_compression_algorithm_get_states (const grpc_channel_args * a) +{ int *states_arg; - if (find_compression_algorithm_states_bitset(a, &states_arg)) { - return *states_arg; - } else { - return (1u << GRPC_COMPRESS_ALGORITHMS_COUNT) - 1; /* All algs. enabled */ - } + if (find_compression_algorithm_states_bitset (a, &states_arg)) + { + return *states_arg; + } + else + { + return (1u << GRPC_COMPRESS_ALGORITHMS_COUNT) - 1; /* All algs. enabled */ + } } diff --git a/src/core/channel/channel_args.h b/src/core/channel/channel_args.h index f9e7b058606..bcfd8c46a0d 100644 --- a/src/core/channel/channel_args.h +++ b/src/core/channel/channel_args.h @@ -38,34 +38,29 @@ #include /* Copy some arguments */ -grpc_channel_args *grpc_channel_args_copy(const grpc_channel_args *src); +grpc_channel_args *grpc_channel_args_copy (const grpc_channel_args * src); /** Copy some arguments and add the to_add parameter in the end. If to_add is NULL, it is equivalent to call grpc_channel_args_copy. */ -grpc_channel_args *grpc_channel_args_copy_and_add(const grpc_channel_args *src, - const grpc_arg *to_add, - size_t num_to_add); +grpc_channel_args *grpc_channel_args_copy_and_add (const grpc_channel_args * src, const grpc_arg * to_add, size_t num_to_add); /** Copy args from a then args from b into a new channel args */ -grpc_channel_args *grpc_channel_args_merge(const grpc_channel_args *a, - const grpc_channel_args *b); +grpc_channel_args *grpc_channel_args_merge (const grpc_channel_args * a, const grpc_channel_args * b); /** Destroy arguments created by grpc_channel_args_copy */ -void grpc_channel_args_destroy(grpc_channel_args *a); +void grpc_channel_args_destroy (grpc_channel_args * a); /** Reads census_enabled settings from channel args. Returns 1 if census_enabled * is specified in channel args, otherwise returns 0. */ -int grpc_channel_args_is_census_enabled(const grpc_channel_args *a); +int grpc_channel_args_is_census_enabled (const grpc_channel_args * a); /** Returns the compression algorithm set in \a a. */ -grpc_compression_algorithm grpc_channel_args_get_compression_algorithm( - const grpc_channel_args *a); +grpc_compression_algorithm grpc_channel_args_get_compression_algorithm (const grpc_channel_args * a); /** Returns a channel arg instance with compression enabled. If \a a is * non-NULL, its args are copied. N.B. GRPC_COMPRESS_NONE disables compression * for the channel. */ -grpc_channel_args *grpc_channel_args_set_compression_algorithm( - grpc_channel_args *a, grpc_compression_algorithm algorithm); +grpc_channel_args *grpc_channel_args_set_compression_algorithm (grpc_channel_args * a, grpc_compression_algorithm algorithm); /** Sets the support for the given compression algorithm. By default, all * compression algorithms are enabled. It's an error to disable an algorithm set @@ -74,15 +69,13 @@ grpc_channel_args *grpc_channel_args_set_compression_algorithm( * Returns an instance will the updated algorithm states. The \a a pointer is * 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_channel_args *grpc_channel_args_compression_algorithm_set_state (grpc_channel_args ** a, grpc_compression_algorithm algorithm, int enabled); /** Returns the bitset representing the support state (true for enabled, false * for disabled) for compression algorithms. * * The i-th bit of the returned bitset corresponds to the i-th entry in the * grpc_compression_algorithm enum. */ -int grpc_channel_args_compression_algorithm_get_states( - const grpc_channel_args *a); +int grpc_channel_args_compression_algorithm_get_states (const grpc_channel_args * a); #endif /* GRPC_INTERNAL_CORE_CHANNEL_CHANNEL_ARGS_H */ diff --git a/src/core/channel/channel_stack.c b/src/core/channel/channel_stack.c index 47f1f8e828d..aafc0ede9c8 100644 --- a/src/core/channel/channel_stack.c +++ b/src/core/channel/channel_stack.c @@ -59,21 +59,20 @@ int grpc_trace_channel = 0; #define ROUND_UP_TO_ALIGNMENT_SIZE(x) \ (((x) + GPR_MAX_ALIGNMENT - 1u) & ~(GPR_MAX_ALIGNMENT - 1u)) -size_t grpc_channel_stack_size(const grpc_channel_filter **filters, - size_t filter_count) { +size_t +grpc_channel_stack_size (const grpc_channel_filter ** filters, size_t filter_count) +{ /* always need the header, and size for the channel elements */ - size_t size = - ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(grpc_channel_stack)) + - ROUND_UP_TO_ALIGNMENT_SIZE(filter_count * sizeof(grpc_channel_element)); + size_t size = ROUND_UP_TO_ALIGNMENT_SIZE (sizeof (grpc_channel_stack)) + ROUND_UP_TO_ALIGNMENT_SIZE (filter_count * sizeof (grpc_channel_element)); size_t i; - GPR_ASSERT((GPR_MAX_ALIGNMENT & (GPR_MAX_ALIGNMENT - 1)) == 0 && - "GPR_MAX_ALIGNMENT must be a power of two"); + GPR_ASSERT ((GPR_MAX_ALIGNMENT & (GPR_MAX_ALIGNMENT - 1)) == 0 && "GPR_MAX_ALIGNMENT must be a power of two"); /* add the size for each filter */ - for (i = 0; i < filter_count; i++) { - size += ROUND_UP_TO_ALIGNMENT_SIZE(filters[i]->sizeof_channel_data); - } + for (i = 0; i < filter_count; i++) + { + size += ROUND_UP_TO_ALIGNMENT_SIZE (filters[i]->sizeof_channel_data); + } return size; } @@ -86,144 +85,142 @@ size_t grpc_channel_stack_size(const grpc_channel_filter **filters, ((grpc_call_element *)((char *)(stk) + \ ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(grpc_call_stack)))) -grpc_channel_element *grpc_channel_stack_element( - grpc_channel_stack *channel_stack, size_t index) { - return CHANNEL_ELEMS_FROM_STACK(channel_stack) + index; +grpc_channel_element * +grpc_channel_stack_element (grpc_channel_stack * channel_stack, size_t index) +{ + return CHANNEL_ELEMS_FROM_STACK (channel_stack) + index; } -grpc_channel_element *grpc_channel_stack_last_element( - grpc_channel_stack *channel_stack) { - return grpc_channel_stack_element(channel_stack, channel_stack->count - 1); +grpc_channel_element * +grpc_channel_stack_last_element (grpc_channel_stack * channel_stack) +{ + return grpc_channel_stack_element (channel_stack, channel_stack->count - 1); } -grpc_call_element *grpc_call_stack_element(grpc_call_stack *call_stack, - size_t index) { - return CALL_ELEMS_FROM_STACK(call_stack) + index; +grpc_call_element * +grpc_call_stack_element (grpc_call_stack * call_stack, size_t index) +{ + return CALL_ELEMS_FROM_STACK (call_stack) + index; } -void grpc_channel_stack_init(const grpc_channel_filter **filters, - size_t filter_count, grpc_channel *master, - const grpc_channel_args *args, - grpc_mdctx *metadata_context, - grpc_channel_stack *stack, - grpc_closure_list *closure_list) { - size_t call_size = - ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(grpc_call_stack)) + - ROUND_UP_TO_ALIGNMENT_SIZE(filter_count * sizeof(grpc_call_element)); +void +grpc_channel_stack_init (const grpc_channel_filter ** filters, size_t filter_count, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, grpc_channel_stack * stack, grpc_closure_list * closure_list) +{ + size_t call_size = ROUND_UP_TO_ALIGNMENT_SIZE (sizeof (grpc_call_stack)) + ROUND_UP_TO_ALIGNMENT_SIZE (filter_count * sizeof (grpc_call_element)); grpc_channel_element *elems; char *user_data; size_t i; stack->count = filter_count; - elems = CHANNEL_ELEMS_FROM_STACK(stack); - user_data = - ((char *)elems) + - ROUND_UP_TO_ALIGNMENT_SIZE(filter_count * sizeof(grpc_channel_element)); + elems = CHANNEL_ELEMS_FROM_STACK (stack); + user_data = ((char *) elems) + ROUND_UP_TO_ALIGNMENT_SIZE (filter_count * sizeof (grpc_channel_element)); /* init per-filter data */ - for (i = 0; i < filter_count; i++) { - elems[i].filter = filters[i]; - elems[i].channel_data = user_data; - elems[i].filter->init_channel_elem(&elems[i], master, args, - metadata_context, i == 0, - i == (filter_count - 1), closure_list); - user_data += ROUND_UP_TO_ALIGNMENT_SIZE(filters[i]->sizeof_channel_data); - call_size += ROUND_UP_TO_ALIGNMENT_SIZE(filters[i]->sizeof_call_data); - } - - GPR_ASSERT(user_data > (char *)stack); - GPR_ASSERT((gpr_uintptr)(user_data - (char *)stack) == - grpc_channel_stack_size(filters, filter_count)); + for (i = 0; i < filter_count; i++) + { + elems[i].filter = filters[i]; + elems[i].channel_data = user_data; + elems[i].filter->init_channel_elem (&elems[i], master, args, metadata_context, i == 0, i == (filter_count - 1), closure_list); + user_data += ROUND_UP_TO_ALIGNMENT_SIZE (filters[i]->sizeof_channel_data); + call_size += ROUND_UP_TO_ALIGNMENT_SIZE (filters[i]->sizeof_call_data); + } + + GPR_ASSERT (user_data > (char *) stack); + GPR_ASSERT ((gpr_uintptr) (user_data - (char *) stack) == grpc_channel_stack_size (filters, filter_count)); stack->call_stack_size = call_size; } -void grpc_channel_stack_destroy(grpc_channel_stack *stack, - grpc_closure_list *closure_list) { - grpc_channel_element *channel_elems = CHANNEL_ELEMS_FROM_STACK(stack); +void +grpc_channel_stack_destroy (grpc_channel_stack * stack, grpc_closure_list * closure_list) +{ + 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], - closure_list); - } + for (i = 0; i < count; i++) + { + channel_elems[i].filter->destroy_channel_elem (&channel_elems[i], closure_list); + } } -void grpc_call_stack_init(grpc_channel_stack *channel_stack, - const void *transport_server_data, - grpc_transport_stream_op *initial_op, - grpc_call_stack *call_stack, - grpc_closure_list *closure_list) { - grpc_channel_element *channel_elems = CHANNEL_ELEMS_FROM_STACK(channel_stack); +void +grpc_call_stack_init (grpc_channel_stack * channel_stack, const void *transport_server_data, grpc_transport_stream_op * initial_op, grpc_call_stack * call_stack, grpc_closure_list * closure_list) +{ + grpc_channel_element *channel_elems = CHANNEL_ELEMS_FROM_STACK (channel_stack); size_t count = channel_stack->count; grpc_call_element *call_elems; char *user_data; size_t i; call_stack->count = count; - call_elems = CALL_ELEMS_FROM_STACK(call_stack); - user_data = ((char *)call_elems) + - ROUND_UP_TO_ALIGNMENT_SIZE(count * sizeof(grpc_call_element)); + call_elems = CALL_ELEMS_FROM_STACK (call_stack); + user_data = ((char *) call_elems) + ROUND_UP_TO_ALIGNMENT_SIZE (count * sizeof (grpc_call_element)); /* init per-filter data */ - for (i = 0; i < count; i++) { - 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; - call_elems[i].filter->init_call_elem(&call_elems[i], transport_server_data, - initial_op, closure_list); - user_data += - ROUND_UP_TO_ALIGNMENT_SIZE(call_elems[i].filter->sizeof_call_data); - } + for (i = 0; i < count; i++) + { + 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; + call_elems[i].filter->init_call_elem (&call_elems[i], transport_server_data, initial_op, closure_list); + user_data += ROUND_UP_TO_ALIGNMENT_SIZE (call_elems[i].filter->sizeof_call_data); + } } -void grpc_call_stack_destroy(grpc_call_stack *stack, - grpc_closure_list *closure_list) { - grpc_call_element *elems = CALL_ELEMS_FROM_STACK(stack); +void +grpc_call_stack_destroy (grpc_call_stack * stack, grpc_closure_list * closure_list) +{ + grpc_call_element *elems = CALL_ELEMS_FROM_STACK (stack); size_t count = stack->count; size_t i; /* destroy per-filter data */ - for (i = 0; i < count; i++) { - elems[i].filter->destroy_call_elem(&elems[i], closure_list); - } + for (i = 0; i < count; i++) + { + elems[i].filter->destroy_call_elem (&elems[i], closure_list); + } } -void grpc_call_next_op(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { +void +grpc_call_next_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ grpc_call_element *next_elem = elem + 1; - next_elem->filter->start_transport_stream_op(next_elem, op, closure_list); + next_elem->filter->start_transport_stream_op (next_elem, op, closure_list); } -char *grpc_call_next_get_peer(grpc_call_element *elem, - grpc_closure_list *closure_list) { +char * +grpc_call_next_get_peer (grpc_call_element * elem, grpc_closure_list * closure_list) +{ grpc_call_element *next_elem = elem + 1; - return next_elem->filter->get_peer(next_elem, closure_list); + return next_elem->filter->get_peer (next_elem, closure_list); } -void grpc_channel_next_op(grpc_channel_element *elem, grpc_transport_op *op, - grpc_closure_list *closure_list) { +void +grpc_channel_next_op (grpc_channel_element * elem, grpc_transport_op * op, grpc_closure_list * closure_list) +{ grpc_channel_element *next_elem = elem + 1; - next_elem->filter->start_transport_op(next_elem, op, closure_list); + next_elem->filter->start_transport_op (next_elem, op, closure_list); } -grpc_channel_stack *grpc_channel_stack_from_top_element( - grpc_channel_element *elem) { - return (grpc_channel_stack *)((char *)(elem)-ROUND_UP_TO_ALIGNMENT_SIZE( - sizeof(grpc_channel_stack))); +grpc_channel_stack * +grpc_channel_stack_from_top_element (grpc_channel_element * elem) +{ + return (grpc_channel_stack *) ((char *) (elem) - ROUND_UP_TO_ALIGNMENT_SIZE (sizeof (grpc_channel_stack))); } -grpc_call_stack *grpc_call_stack_from_top_element(grpc_call_element *elem) { - return (grpc_call_stack *)((char *)(elem)-ROUND_UP_TO_ALIGNMENT_SIZE( - sizeof(grpc_call_stack))); +grpc_call_stack * +grpc_call_stack_from_top_element (grpc_call_element * elem) +{ + return (grpc_call_stack *) ((char *) (elem) - ROUND_UP_TO_ALIGNMENT_SIZE (sizeof (grpc_call_stack))); } -void grpc_call_element_send_cancel(grpc_call_element *cur_elem, - grpc_closure_list *closure_list) { +void +grpc_call_element_send_cancel (grpc_call_element * cur_elem, grpc_closure_list * closure_list) +{ grpc_transport_stream_op op; - memset(&op, 0, sizeof(op)); + memset (&op, 0, sizeof (op)); op.cancel_with_status = GRPC_STATUS_CANCELLED; - grpc_call_next_op(cur_elem, &op, closure_list); + grpc_call_next_op (cur_elem, &op, closure_list); } diff --git a/src/core/channel/channel_stack.h b/src/core/channel/channel_stack.h index b3facd4f014..937bb04edaf 100644 --- a/src/core/channel/channel_stack.h +++ b/src/core/channel/channel_stack.h @@ -61,17 +61,15 @@ typedef struct grpc_call_element grpc_call_element; 4. a name, which is useful when debugging Members are laid out in approximate frequency of use order. */ -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)(grpc_call_element *elem, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list); + void (*start_transport_stream_op) (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list); /* 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, - grpc_closure_list *closure_list); + void (*start_transport_op) (grpc_channel_element * elem, grpc_transport_op * op, grpc_closure_list * closure_list); /* sizeof(per call data) */ size_t sizeof_call_data; @@ -82,15 +80,11 @@ typedef struct { server_transport_data is an opaque pointer. If it is NULL, this call is on a client; if it is non-NULL, then it points to memory owned by the transport and is on the server. Most filters want to ignore this - argument.*/ - void (*init_call_elem)(grpc_call_element *elem, - const void *server_transport_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list); + argument. */ + void (*init_call_elem) (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list); /* Destroy per call data. The filter does not need to do any chaining */ - void (*destroy_call_elem)(grpc_call_element *elem, - grpc_closure_list *closure_list); + void (*destroy_call_elem) (grpc_call_element * elem, grpc_closure_list * closure_list); /* sizeof(per channel data) */ size_t sizeof_channel_data; @@ -100,17 +94,13 @@ typedef struct { is_first, is_last designate this elements position in the stack, and are useful for asserting correct configuration by upper layer code. The filter does not need to do any chaining */ - void (*init_channel_elem)(grpc_channel_element *elem, grpc_channel *master, - const grpc_channel_args *args, - grpc_mdctx *metadata_context, int is_first, - int is_last, grpc_closure_list *closure_list); + void (*init_channel_elem) (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last, grpc_closure_list * closure_list); /* Destroy per channel data. The filter does not need to do any chaining */ - void (*destroy_channel_elem)(grpc_channel_element *elem, - grpc_closure_list *closure_list); + void (*destroy_channel_elem) (grpc_channel_element * elem, grpc_closure_list * closure_list); /* Implement grpc_call_get_peer() */ - char *(*get_peer)(grpc_call_element *elem, grpc_closure_list *closure_list); + char *(*get_peer) (grpc_call_element * elem, grpc_closure_list * closure_list); /* The name of this filter */ const char *name; @@ -118,7 +108,8 @@ typedef struct { /* A channel_element tracks its filter and the filter requested memory within a channel allocation */ -struct grpc_channel_element { +struct grpc_channel_element +{ const grpc_channel_filter *filter; void *channel_data; }; @@ -126,7 +117,8 @@ struct grpc_channel_element { /* A call_element tracks its filter, the filter requested memory within a channel allocation, and the filter requested memory within a call allocation */ -struct grpc_call_element { +struct grpc_call_element +{ const grpc_channel_filter *filter; void *channel_data; void *call_data; @@ -134,7 +126,8 @@ struct grpc_call_element { /* A channel stack tracks a set of related filters for one channel, and guarantees they live within a single malloc() allocation */ -typedef struct { +typedef struct +{ size_t count; /* Memory required for a call stack (computed at channel stack initialization) */ @@ -143,65 +136,48 @@ typedef struct { /* A call stack tracks a set of related filters for one call, and guarantees they live within a single malloc() allocation */ -typedef struct { size_t count; } grpc_call_stack; +typedef struct +{ + size_t count; +} grpc_call_stack; /* Get a channel element given a channel stack and its index */ -grpc_channel_element *grpc_channel_stack_element(grpc_channel_stack *stack, - size_t i); +grpc_channel_element *grpc_channel_stack_element (grpc_channel_stack * stack, size_t i); /* Get the last channel element in a channel stack */ -grpc_channel_element *grpc_channel_stack_last_element( - grpc_channel_stack *stack); +grpc_channel_element *grpc_channel_stack_last_element (grpc_channel_stack * stack); /* Get a call stack element given a call stack and an index */ -grpc_call_element *grpc_call_stack_element(grpc_call_stack *stack, size_t i); +grpc_call_element *grpc_call_stack_element (grpc_call_stack * stack, size_t i); /* Determine memory required for a channel stack containing a set of filters */ -size_t grpc_channel_stack_size(const grpc_channel_filter **filters, - size_t filter_count); +size_t grpc_channel_stack_size (const grpc_channel_filter ** filters, size_t filter_count); /* Initialize a channel stack given some filters */ -void grpc_channel_stack_init(const grpc_channel_filter **filters, - size_t filter_count, grpc_channel *master, - const grpc_channel_args *args, - grpc_mdctx *metadata_context, - grpc_channel_stack *stack, - grpc_closure_list *closure_list); +void grpc_channel_stack_init (const grpc_channel_filter ** filters, size_t filter_count, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, grpc_channel_stack * stack, grpc_closure_list * closure_list); /* Destroy a channel stack */ -void grpc_channel_stack_destroy(grpc_channel_stack *stack, - grpc_closure_list *closure_list); +void grpc_channel_stack_destroy (grpc_channel_stack * stack, grpc_closure_list * closure_list); /* 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. */ -void grpc_call_stack_init(grpc_channel_stack *channel_stack, - const void *transport_server_data, - grpc_transport_stream_op *initial_op, - grpc_call_stack *call_stack, - grpc_closure_list *closure_list); +void grpc_call_stack_init (grpc_channel_stack * channel_stack, const void *transport_server_data, grpc_transport_stream_op * initial_op, grpc_call_stack * call_stack, grpc_closure_list * closure_list); /* Destroy a call stack */ -void grpc_call_stack_destroy(grpc_call_stack *stack, - grpc_closure_list *closure_list); +void grpc_call_stack_destroy (grpc_call_stack * stack, grpc_closure_list * closure_list); /* Call the next operation in a call stack */ -void grpc_call_next_op(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_closure_list *closure_list); +void grpc_call_next_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list); /* 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, - grpc_closure_list *closure_list); +void grpc_channel_next_op (grpc_channel_element * elem, grpc_transport_op * op, grpc_closure_list * closure_list); /* Pass through a request to get_peer to the next child element */ -char *grpc_call_next_get_peer(grpc_call_element *elem, - grpc_closure_list *closure_list); +char *grpc_call_next_get_peer (grpc_call_element * elem, grpc_closure_list * closure_list); /* Given the top element of a channel stack, get the channel stack itself */ -grpc_channel_stack *grpc_channel_stack_from_top_element( - grpc_channel_element *elem); +grpc_channel_stack *grpc_channel_stack_from_top_element (grpc_channel_element * elem); /* Given the top element of a call stack, get the call stack itself */ -grpc_call_stack *grpc_call_stack_from_top_element(grpc_call_element *elem); +grpc_call_stack *grpc_call_stack_from_top_element (grpc_call_element * elem); -void grpc_call_log_op(char *file, int line, gpr_log_severity severity, - grpc_call_element *elem, grpc_transport_stream_op *op); +void grpc_call_log_op (char *file, int line, gpr_log_severity severity, grpc_call_element * elem, grpc_transport_stream_op * op); -void grpc_call_element_send_cancel(grpc_call_element *cur_elem, - grpc_closure_list *closure_list); +void grpc_call_element_send_cancel (grpc_call_element * cur_elem, grpc_closure_list * closure_list); extern int grpc_trace_channel; diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 903f9eab50d..40b428cf3e3 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -51,7 +51,8 @@ typedef struct call_data call_data; -typedef struct { +typedef struct +{ /** metadata context for this channel */ grpc_mdctx *mdctx; /** resolver for this channel */ @@ -89,14 +90,16 @@ typedef struct { to watch for state changes from the lb_policy. When a state change is seen, we update the channel, and create a new watcher */ -typedef struct { +typedef struct +{ channel_data *chand; grpc_closure on_changed; grpc_connectivity_state state; grpc_lb_policy *lb_policy; } lb_policy_connectivity_watcher; -typedef enum { +typedef enum +{ CALL_CREATED, CALL_WAITING_FOR_SEND, CALL_WAITING_FOR_CONFIG, @@ -106,7 +109,8 @@ typedef enum { CALL_CANCELLED } call_state; -struct call_data { +struct call_data +{ /* owning element */ grpc_call_element *elem; @@ -123,367 +127,406 @@ struct call_data { grpc_linked_mdelem details; }; -static grpc_closure *merge_into_waiting_op(grpc_call_element *elem, - grpc_transport_stream_op *new_op) - GRPC_MUST_USE_RESULT; +static grpc_closure * +merge_into_waiting_op (grpc_call_element * elem, grpc_transport_stream_op * new_op) + GRPC_MUST_USE_RESULT; -static void handle_op_after_cancellation(grpc_call_element *elem, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { + static void handle_op_after_cancellation (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - if (op->send_ops) { - grpc_stream_ops_unref_owned_objects(op->send_ops->ops, op->send_ops->nops); - op->on_done_send->cb(op->on_done_send->cb_arg, 0, closure_list); - } - if (op->recv_ops) { - char status[GPR_LTOA_MIN_BUFSIZE]; - grpc_metadata_batch mdb; - gpr_ltoa(GRPC_STATUS_CANCELLED, status); - calld->status.md = - grpc_mdelem_from_strings(chand->mdctx, "grpc-status", status); - calld->details.md = - grpc_mdelem_from_strings(chand->mdctx, "grpc-message", "Cancelled"); - calld->status.prev = calld->details.next = NULL; - calld->status.next = &calld->details; - calld->details.prev = &calld->status; - mdb.list.head = &calld->status; - mdb.list.tail = &calld->details; - mdb.garbage.head = mdb.garbage.tail = NULL; - mdb.deadline = gpr_inf_future(GPR_CLOCK_REALTIME); - grpc_sopb_add_metadata(op->recv_ops, mdb); - *op->recv_state = GRPC_STREAM_CLOSED; - op->on_done_recv->cb(op->on_done_recv->cb_arg, 1, closure_list); - } - if (op->on_consumed) { - op->on_consumed->cb(op->on_consumed->cb_arg, 0, closure_list); - } + if (op->send_ops) + { + grpc_stream_ops_unref_owned_objects (op->send_ops->ops, op->send_ops->nops); + op->on_done_send->cb (op->on_done_send->cb_arg, 0, closure_list); + } + if (op->recv_ops) + { + char status[GPR_LTOA_MIN_BUFSIZE]; + grpc_metadata_batch mdb; + gpr_ltoa (GRPC_STATUS_CANCELLED, status); + calld->status.md = grpc_mdelem_from_strings (chand->mdctx, "grpc-status", status); + calld->details.md = grpc_mdelem_from_strings (chand->mdctx, "grpc-message", "Cancelled"); + calld->status.prev = calld->details.next = NULL; + calld->status.next = &calld->details; + calld->details.prev = &calld->status; + mdb.list.head = &calld->status; + mdb.list.tail = &calld->details; + mdb.garbage.head = mdb.garbage.tail = NULL; + mdb.deadline = gpr_inf_future (GPR_CLOCK_REALTIME); + grpc_sopb_add_metadata (op->recv_ops, mdb); + *op->recv_state = GRPC_STREAM_CLOSED; + op->on_done_recv->cb (op->on_done_recv->cb_arg, 1, closure_list); + } + if (op->on_consumed) + { + op->on_consumed->cb (op->on_consumed->cb_arg, 0, closure_list); + } } -typedef struct { +typedef struct +{ grpc_closure closure; grpc_call_element *elem; } waiting_call; -static void perform_transport_stream_op(grpc_call_element *elem, - grpc_transport_stream_op *op, - int continuation, - grpc_closure_list *closure_list); +static void perform_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, int continuation, grpc_closure_list * closure_list); -static void continue_with_pick(void *arg, int iomgr_success, - grpc_closure_list *closure_list) { +static void +continue_with_pick (void *arg, int iomgr_success, grpc_closure_list * closure_list) +{ waiting_call *wc = arg; call_data *calld = wc->elem->call_data; - perform_transport_stream_op(wc->elem, &calld->waiting_op, 1, closure_list); - gpr_free(wc); + perform_transport_stream_op (wc->elem, &calld->waiting_op, 1, closure_list); + gpr_free (wc); } -static void add_to_lb_policy_wait_queue_locked_state_config( - grpc_call_element *elem) { +static void +add_to_lb_policy_wait_queue_locked_state_config (grpc_call_element * elem) +{ channel_data *chand = elem->channel_data; - waiting_call *wc = gpr_malloc(sizeof(*wc)); - grpc_closure_init(&wc->closure, continue_with_pick, wc); + waiting_call *wc = gpr_malloc (sizeof (*wc)); + grpc_closure_init (&wc->closure, continue_with_pick, wc); wc->elem = elem; - grpc_closure_list_add(&chand->waiting_for_config_closures, &wc->closure, 1); + grpc_closure_list_add (&chand->waiting_for_config_closures, &wc->closure, 1); } -static int is_empty(void *p, int len) { +static int +is_empty (void *p, int len) +{ char *ptr = p; int i; - for (i = 0; i < len; i++) { - if (ptr[i] != 0) return 0; - } + for (i = 0; i < len; i++) + { + if (ptr[i] != 0) + return 0; + } return 1; } -static void started_call(void *arg, int iomgr_success, - grpc_closure_list *closure_list) { +static void +started_call (void *arg, int iomgr_success, grpc_closure_list * closure_list) +{ call_data *calld = arg; grpc_transport_stream_op op; int have_waiting; - gpr_mu_lock(&calld->mu_state); - if (calld->state == CALL_CANCELLED && calld->subchannel_call != NULL) { - memset(&op, 0, sizeof(op)); - op.cancel_with_status = GRPC_STATUS_CANCELLED; - gpr_mu_unlock(&calld->mu_state); - grpc_subchannel_call_process_op(calld->subchannel_call, &op, closure_list); - } else if (calld->state == CALL_WAITING_FOR_CALL) { - have_waiting = !is_empty(&calld->waiting_op, sizeof(calld->waiting_op)); - if (calld->subchannel_call != NULL) { - calld->state = CALL_ACTIVE; - gpr_mu_unlock(&calld->mu_state); - if (have_waiting) { - grpc_subchannel_call_process_op(calld->subchannel_call, - &calld->waiting_op, closure_list); - } - } else { - calld->state = CALL_CANCELLED; - gpr_mu_unlock(&calld->mu_state); - if (have_waiting) { - handle_op_after_cancellation(calld->elem, &calld->waiting_op, - closure_list); - } - } - } else { - GPR_ASSERT(calld->state == CALL_CANCELLED); - gpr_mu_unlock(&calld->mu_state); - } + gpr_mu_lock (&calld->mu_state); + if (calld->state == CALL_CANCELLED && calld->subchannel_call != NULL) + { + memset (&op, 0, sizeof (op)); + op.cancel_with_status = GRPC_STATUS_CANCELLED; + gpr_mu_unlock (&calld->mu_state); + grpc_subchannel_call_process_op (calld->subchannel_call, &op, closure_list); + } + else if (calld->state == CALL_WAITING_FOR_CALL) + { + have_waiting = !is_empty (&calld->waiting_op, sizeof (calld->waiting_op)); + if (calld->subchannel_call != NULL) + { + calld->state = CALL_ACTIVE; + gpr_mu_unlock (&calld->mu_state); + if (have_waiting) + { + grpc_subchannel_call_process_op (calld->subchannel_call, &calld->waiting_op, closure_list); + } + } + else + { + calld->state = CALL_CANCELLED; + gpr_mu_unlock (&calld->mu_state); + if (have_waiting) + { + handle_op_after_cancellation (calld->elem, &calld->waiting_op, closure_list); + } + } + } + else + { + GPR_ASSERT (calld->state == CALL_CANCELLED); + gpr_mu_unlock (&calld->mu_state); + } } -static void picked_target(void *arg, int iomgr_success, - grpc_closure_list *closure_list) { +static void +picked_target (void *arg, int iomgr_success, grpc_closure_list * closure_list) +{ call_data *calld = arg; grpc_pollset *pollset; - if (calld->picked_channel == NULL) { - /* treat this like a cancellation */ - calld->waiting_op.cancel_with_status = GRPC_STATUS_UNAVAILABLE; - perform_transport_stream_op(calld->elem, &calld->waiting_op, 1, - closure_list); - } else { - gpr_mu_lock(&calld->mu_state); - if (calld->state == CALL_CANCELLED) { - gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(calld->elem, &calld->waiting_op, - closure_list); - } else { - GPR_ASSERT(calld->state == CALL_WAITING_FOR_PICK); - calld->state = CALL_WAITING_FOR_CALL; - pollset = calld->waiting_op.bind_pollset; - gpr_mu_unlock(&calld->mu_state); - grpc_closure_init(&calld->async_setup_task, started_call, calld); - grpc_subchannel_create_call(calld->picked_channel, pollset, - &calld->subchannel_call, - &calld->async_setup_task, closure_list); - } - } + if (calld->picked_channel == NULL) + { + /* treat this like a cancellation */ + calld->waiting_op.cancel_with_status = GRPC_STATUS_UNAVAILABLE; + perform_transport_stream_op (calld->elem, &calld->waiting_op, 1, closure_list); + } + else + { + gpr_mu_lock (&calld->mu_state); + if (calld->state == CALL_CANCELLED) + { + gpr_mu_unlock (&calld->mu_state); + handle_op_after_cancellation (calld->elem, &calld->waiting_op, closure_list); + } + else + { + GPR_ASSERT (calld->state == CALL_WAITING_FOR_PICK); + calld->state = CALL_WAITING_FOR_CALL; + pollset = calld->waiting_op.bind_pollset; + gpr_mu_unlock (&calld->mu_state); + grpc_closure_init (&calld->async_setup_task, started_call, calld); + grpc_subchannel_create_call (calld->picked_channel, pollset, &calld->subchannel_call, &calld->async_setup_task, closure_list); + } + } } -static grpc_closure *merge_into_waiting_op(grpc_call_element *elem, - grpc_transport_stream_op *new_op) { +static grpc_closure * +merge_into_waiting_op (grpc_call_element * elem, grpc_transport_stream_op * new_op) +{ call_data *calld = elem->call_data; grpc_closure *consumed_op = NULL; grpc_transport_stream_op *waiting_op = &calld->waiting_op; - GPR_ASSERT((waiting_op->send_ops != NULL) + (new_op->send_ops != NULL) <= 1); - GPR_ASSERT((waiting_op->recv_ops != NULL) + (new_op->recv_ops != NULL) <= 1); - if (new_op->send_ops != NULL) { - waiting_op->send_ops = new_op->send_ops; - waiting_op->is_last_send = new_op->is_last_send; - waiting_op->on_done_send = new_op->on_done_send; - } - if (new_op->recv_ops != NULL) { - waiting_op->recv_ops = new_op->recv_ops; - waiting_op->recv_state = new_op->recv_state; - waiting_op->on_done_recv = new_op->on_done_recv; - } - if (new_op->on_consumed != NULL) { - if (waiting_op->on_consumed != NULL) { - consumed_op = waiting_op->on_consumed; - } - waiting_op->on_consumed = new_op->on_consumed; - } - if (new_op->cancel_with_status != GRPC_STATUS_OK) { - waiting_op->cancel_with_status = new_op->cancel_with_status; - } + GPR_ASSERT ((waiting_op->send_ops != NULL) + (new_op->send_ops != NULL) <= 1); + GPR_ASSERT ((waiting_op->recv_ops != NULL) + (new_op->recv_ops != NULL) <= 1); + if (new_op->send_ops != NULL) + { + waiting_op->send_ops = new_op->send_ops; + waiting_op->is_last_send = new_op->is_last_send; + waiting_op->on_done_send = new_op->on_done_send; + } + if (new_op->recv_ops != NULL) + { + waiting_op->recv_ops = new_op->recv_ops; + waiting_op->recv_state = new_op->recv_state; + waiting_op->on_done_recv = new_op->on_done_recv; + } + if (new_op->on_consumed != NULL) + { + if (waiting_op->on_consumed != NULL) + { + consumed_op = waiting_op->on_consumed; + } + waiting_op->on_consumed = new_op->on_consumed; + } + if (new_op->cancel_with_status != GRPC_STATUS_OK) + { + waiting_op->cancel_with_status = new_op->cancel_with_status; + } return consumed_op; } -static char *cc_get_peer(grpc_call_element *elem, - grpc_closure_list *closure_list) { +static char * +cc_get_peer (grpc_call_element * elem, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_subchannel_call *subchannel_call; char *result; - gpr_mu_lock(&calld->mu_state); - if (calld->state == CALL_ACTIVE) { - subchannel_call = calld->subchannel_call; - GRPC_SUBCHANNEL_CALL_REF(subchannel_call, "get_peer"); - gpr_mu_unlock(&calld->mu_state); - result = grpc_subchannel_call_get_peer(subchannel_call, closure_list); - GRPC_SUBCHANNEL_CALL_UNREF(subchannel_call, "get_peer", closure_list); - return result; - } else { - gpr_mu_unlock(&calld->mu_state); - return grpc_channel_get_target(chand->master); - } + gpr_mu_lock (&calld->mu_state); + if (calld->state == CALL_ACTIVE) + { + subchannel_call = calld->subchannel_call; + GRPC_SUBCHANNEL_CALL_REF (subchannel_call, "get_peer"); + gpr_mu_unlock (&calld->mu_state); + result = grpc_subchannel_call_get_peer (subchannel_call, closure_list); + GRPC_SUBCHANNEL_CALL_UNREF (subchannel_call, "get_peer", closure_list); + return result; + } + else + { + gpr_mu_unlock (&calld->mu_state); + return grpc_channel_get_target (chand->master); + } } -static void perform_transport_stream_op(grpc_call_element *elem, - grpc_transport_stream_op *op, - int continuation, - grpc_closure_list *closure_list) { +static void +perform_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, int continuation, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_subchannel_call *subchannel_call; grpc_lb_policy *lb_policy; grpc_transport_stream_op op2; - GPR_ASSERT(elem->filter == &grpc_client_channel_filter); - GRPC_CALL_LOG_OP(GPR_INFO, elem, op); + GPR_ASSERT (elem->filter == &grpc_client_channel_filter); + GRPC_CALL_LOG_OP (GPR_INFO, elem, op); - gpr_mu_lock(&calld->mu_state); - switch (calld->state) { + gpr_mu_lock (&calld->mu_state); + switch (calld->state) + { case CALL_ACTIVE: - GPR_ASSERT(!continuation); + GPR_ASSERT (!continuation); subchannel_call = calld->subchannel_call; - gpr_mu_unlock(&calld->mu_state); - grpc_subchannel_call_process_op(subchannel_call, op, closure_list); + gpr_mu_unlock (&calld->mu_state); + grpc_subchannel_call_process_op (subchannel_call, op, closure_list); break; case CALL_CANCELLED: - gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(elem, op, closure_list); + gpr_mu_unlock (&calld->mu_state); + handle_op_after_cancellation (elem, op, closure_list); break; case CALL_WAITING_FOR_SEND: - GPR_ASSERT(!continuation); - grpc_closure_list_add(closure_list, merge_into_waiting_op(elem, op), 1); - if (!calld->waiting_op.send_ops && - calld->waiting_op.cancel_with_status == GRPC_STATUS_OK) { - gpr_mu_unlock(&calld->mu_state); - break; - } + GPR_ASSERT (!continuation); + grpc_closure_list_add (closure_list, merge_into_waiting_op (elem, op), 1); + if (!calld->waiting_op.send_ops && calld->waiting_op.cancel_with_status == GRPC_STATUS_OK) + { + gpr_mu_unlock (&calld->mu_state); + break; + } *op = calld->waiting_op; - memset(&calld->waiting_op, 0, sizeof(calld->waiting_op)); + memset (&calld->waiting_op, 0, sizeof (calld->waiting_op)); continuation = 1; - /* fall through */ + /* fall through */ case CALL_WAITING_FOR_CONFIG: case CALL_WAITING_FOR_PICK: case CALL_WAITING_FOR_CALL: - if (!continuation) { - if (op->cancel_with_status != GRPC_STATUS_OK) { - calld->state = CALL_CANCELLED; - op2 = calld->waiting_op; - memset(&calld->waiting_op, 0, sizeof(calld->waiting_op)); - if (op->on_consumed) { - calld->waiting_op.on_consumed = op->on_consumed; - op->on_consumed = NULL; - } else if (op2.on_consumed) { - calld->waiting_op.on_consumed = op2.on_consumed; - op2.on_consumed = NULL; - } - gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(elem, op, closure_list); - handle_op_after_cancellation(elem, &op2, closure_list); - } else { - grpc_closure_list_add(closure_list, merge_into_waiting_op(elem, op), - 1); - gpr_mu_unlock(&calld->mu_state); - } - break; - } - /* fall through */ + if (!continuation) + { + if (op->cancel_with_status != GRPC_STATUS_OK) + { + calld->state = CALL_CANCELLED; + op2 = calld->waiting_op; + memset (&calld->waiting_op, 0, sizeof (calld->waiting_op)); + if (op->on_consumed) + { + calld->waiting_op.on_consumed = op->on_consumed; + op->on_consumed = NULL; + } + else if (op2.on_consumed) + { + calld->waiting_op.on_consumed = op2.on_consumed; + op2.on_consumed = NULL; + } + gpr_mu_unlock (&calld->mu_state); + handle_op_after_cancellation (elem, op, closure_list); + handle_op_after_cancellation (elem, &op2, closure_list); + } + else + { + grpc_closure_list_add (closure_list, merge_into_waiting_op (elem, op), 1); + gpr_mu_unlock (&calld->mu_state); + } + break; + } + /* fall through */ case CALL_CREATED: - if (op->cancel_with_status != GRPC_STATUS_OK) { - calld->state = CALL_CANCELLED; - gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(elem, op, closure_list); - } else { - calld->waiting_op = *op; - - if (op->send_ops == NULL) { - /* need to have some send ops before we can select the - lb target */ - calld->state = CALL_WAITING_FOR_SEND; - gpr_mu_unlock(&calld->mu_state); - } else { - gpr_mu_lock(&chand->mu_config); - lb_policy = chand->lb_policy; - if (lb_policy) { - grpc_transport_stream_op *op = &calld->waiting_op; - grpc_pollset *bind_pollset = op->bind_pollset; - grpc_metadata_batch *initial_metadata = - &op->send_ops->ops[0].data.metadata; - GRPC_LB_POLICY_REF(lb_policy, "pick"); - gpr_mu_unlock(&chand->mu_config); - calld->state = CALL_WAITING_FOR_PICK; - - GPR_ASSERT(op->bind_pollset); - GPR_ASSERT(op->send_ops); - GPR_ASSERT(op->send_ops->nops >= 1); - GPR_ASSERT(op->send_ops->ops[0].type == GRPC_OP_METADATA); - gpr_mu_unlock(&calld->mu_state); - - grpc_closure_init(&calld->async_setup_task, picked_target, calld); - grpc_lb_policy_pick(lb_policy, bind_pollset, initial_metadata, - &calld->picked_channel, - &calld->async_setup_task, closure_list); - - GRPC_LB_POLICY_UNREF(lb_policy, "pick", closure_list); - } else if (chand->resolver != NULL) { - calld->state = CALL_WAITING_FOR_CONFIG; - add_to_lb_policy_wait_queue_locked_state_config(elem); - if (!chand->started_resolving && chand->resolver != NULL) { - GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); - chand->started_resolving = 1; - grpc_resolver_next(chand->resolver, - &chand->incoming_configuration, - &chand->on_config_changed, closure_list); - } - gpr_mu_unlock(&chand->mu_config); - gpr_mu_unlock(&calld->mu_state); - } else { - calld->state = CALL_CANCELLED; - gpr_mu_unlock(&chand->mu_config); - gpr_mu_unlock(&calld->mu_state); - handle_op_after_cancellation(elem, op, closure_list); - } - } - } + if (op->cancel_with_status != GRPC_STATUS_OK) + { + calld->state = CALL_CANCELLED; + gpr_mu_unlock (&calld->mu_state); + handle_op_after_cancellation (elem, op, closure_list); + } + else + { + calld->waiting_op = *op; + + if (op->send_ops == NULL) + { + /* need to have some send ops before we can select the + lb target */ + calld->state = CALL_WAITING_FOR_SEND; + gpr_mu_unlock (&calld->mu_state); + } + else + { + gpr_mu_lock (&chand->mu_config); + lb_policy = chand->lb_policy; + if (lb_policy) + { + grpc_transport_stream_op *op = &calld->waiting_op; + grpc_pollset *bind_pollset = op->bind_pollset; + grpc_metadata_batch *initial_metadata = &op->send_ops->ops[0].data.metadata; + GRPC_LB_POLICY_REF (lb_policy, "pick"); + gpr_mu_unlock (&chand->mu_config); + calld->state = CALL_WAITING_FOR_PICK; + + GPR_ASSERT (op->bind_pollset); + GPR_ASSERT (op->send_ops); + GPR_ASSERT (op->send_ops->nops >= 1); + GPR_ASSERT (op->send_ops->ops[0].type == GRPC_OP_METADATA); + gpr_mu_unlock (&calld->mu_state); + + grpc_closure_init (&calld->async_setup_task, picked_target, calld); + grpc_lb_policy_pick (lb_policy, bind_pollset, initial_metadata, &calld->picked_channel, &calld->async_setup_task, closure_list); + + GRPC_LB_POLICY_UNREF (lb_policy, "pick", closure_list); + } + else if (chand->resolver != NULL) + { + calld->state = CALL_WAITING_FOR_CONFIG; + add_to_lb_policy_wait_queue_locked_state_config (elem); + if (!chand->started_resolving && chand->resolver != NULL) + { + GRPC_CHANNEL_INTERNAL_REF (chand->master, "resolver"); + chand->started_resolving = 1; + grpc_resolver_next (chand->resolver, &chand->incoming_configuration, &chand->on_config_changed, closure_list); + } + gpr_mu_unlock (&chand->mu_config); + gpr_mu_unlock (&calld->mu_state); + } + else + { + calld->state = CALL_CANCELLED; + gpr_mu_unlock (&chand->mu_config); + gpr_mu_unlock (&calld->mu_state); + handle_op_after_cancellation (elem, op, closure_list); + } + } + } break; - } + } } -static void cc_start_transport_stream_op(grpc_call_element *elem, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { - perform_transport_stream_op(elem, op, 0, closure_list); +static void +cc_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + perform_transport_stream_op (elem, op, 0, closure_list); } -static void watch_lb_policy(channel_data *chand, grpc_lb_policy *lb_policy, - grpc_connectivity_state current_state, - grpc_closure_list *cl); +static void watch_lb_policy (channel_data * chand, grpc_lb_policy * lb_policy, grpc_connectivity_state current_state, grpc_closure_list * cl); -static void on_lb_policy_state_changed_locked(lb_policy_connectivity_watcher *w, - grpc_closure_list *cl) { +static void +on_lb_policy_state_changed_locked (lb_policy_connectivity_watcher * w, grpc_closure_list * cl) +{ /* check if the notification is for a stale policy */ - if (w->lb_policy != w->chand->lb_policy) return; + if (w->lb_policy != w->chand->lb_policy) + return; - grpc_connectivity_state_set(&w->chand->state_tracker, w->state, "lb_changed", - cl); - if (w->state != GRPC_CHANNEL_FATAL_FAILURE) { - watch_lb_policy(w->chand, w->lb_policy, w->state, cl); - } + grpc_connectivity_state_set (&w->chand->state_tracker, w->state, "lb_changed", cl); + if (w->state != GRPC_CHANNEL_FATAL_FAILURE) + { + watch_lb_policy (w->chand, w->lb_policy, w->state, cl); + } } -static void on_lb_policy_state_changed(void *arg, int iomgr_success, - grpc_closure_list *closure_list) { +static void +on_lb_policy_state_changed (void *arg, int iomgr_success, grpc_closure_list * closure_list) +{ lb_policy_connectivity_watcher *w = arg; - gpr_mu_lock(&w->chand->mu_config); - on_lb_policy_state_changed_locked(w, closure_list); - gpr_mu_unlock(&w->chand->mu_config); + gpr_mu_lock (&w->chand->mu_config); + on_lb_policy_state_changed_locked (w, closure_list); + gpr_mu_unlock (&w->chand->mu_config); - GRPC_CHANNEL_INTERNAL_UNREF(w->chand->master, "watch_lb_policy", - closure_list); - gpr_free(w); + GRPC_CHANNEL_INTERNAL_UNREF (w->chand->master, "watch_lb_policy", closure_list); + gpr_free (w); } -static void watch_lb_policy(channel_data *chand, grpc_lb_policy *lb_policy, - grpc_connectivity_state current_state, - grpc_closure_list *closure_list) { - lb_policy_connectivity_watcher *w = gpr_malloc(sizeof(*w)); - GRPC_CHANNEL_INTERNAL_REF(chand->master, "watch_lb_policy"); +static void +watch_lb_policy (channel_data * chand, grpc_lb_policy * lb_policy, grpc_connectivity_state current_state, grpc_closure_list * closure_list) +{ + lb_policy_connectivity_watcher *w = gpr_malloc (sizeof (*w)); + GRPC_CHANNEL_INTERNAL_REF (chand->master, "watch_lb_policy"); w->chand = chand; - grpc_closure_init(&w->on_changed, on_lb_policy_state_changed, w); + grpc_closure_init (&w->on_changed, on_lb_policy_state_changed, w); w->state = current_state; w->lb_policy = lb_policy; - grpc_lb_policy_notify_on_state_change(lb_policy, &w->state, &w->on_changed, - closure_list); + grpc_lb_policy_notify_on_state_change (lb_policy, &w->state, &w->on_changed, closure_list); } -static void cc_on_config_changed(void *arg, int iomgr_success, - grpc_closure_list *closure_list) { +static void +cc_on_config_changed (void *arg, int iomgr_success, grpc_closure_list * closure_list) +{ channel_data *chand = arg; grpc_lb_policy *lb_policy = NULL; grpc_lb_policy *old_lb_policy; @@ -491,298 +534,313 @@ static void cc_on_config_changed(void *arg, int iomgr_success, grpc_connectivity_state state = GRPC_CHANNEL_TRANSIENT_FAILURE; int exit_idle = 0; - if (chand->incoming_configuration != NULL) { - lb_policy = grpc_client_config_get_lb_policy(chand->incoming_configuration); - if (lb_policy != NULL) { - GRPC_LB_POLICY_REF(lb_policy, "channel"); - GRPC_LB_POLICY_REF(lb_policy, "config_change"); - state = grpc_lb_policy_check_connectivity(lb_policy, closure_list); + if (chand->incoming_configuration != NULL) + { + lb_policy = grpc_client_config_get_lb_policy (chand->incoming_configuration); + if (lb_policy != NULL) + { + GRPC_LB_POLICY_REF (lb_policy, "channel"); + GRPC_LB_POLICY_REF (lb_policy, "config_change"); + state = grpc_lb_policy_check_connectivity (lb_policy, closure_list); + } + + grpc_client_config_unref (chand->incoming_configuration, closure_list); } - grpc_client_config_unref(chand->incoming_configuration, closure_list); - } - chand->incoming_configuration = NULL; - gpr_mu_lock(&chand->mu_config); + gpr_mu_lock (&chand->mu_config); old_lb_policy = chand->lb_policy; chand->lb_policy = lb_policy; - if (lb_policy != NULL || chand->resolver == NULL /* disconnected */) { - grpc_closure_list_move(&chand->waiting_for_config_closures, closure_list); - } - if (lb_policy != NULL && chand->exit_idle_when_lb_policy_arrives) { - GRPC_LB_POLICY_REF(lb_policy, "exit_idle"); - exit_idle = 1; - chand->exit_idle_when_lb_policy_arrives = 0; - } - - if (iomgr_success && chand->resolver) { - grpc_resolver *resolver = chand->resolver; - GRPC_RESOLVER_REF(resolver, "channel-next"); - grpc_connectivity_state_set(&chand->state_tracker, state, "new_lb+resolver", - closure_list); - if (lb_policy != NULL) { - watch_lb_policy(chand, lb_policy, state, closure_list); - } - gpr_mu_unlock(&chand->mu_config); - GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); - grpc_resolver_next(resolver, &chand->incoming_configuration, - &chand->on_config_changed, closure_list); - GRPC_RESOLVER_UNREF(resolver, "channel-next", closure_list); - } else { - old_resolver = chand->resolver; - chand->resolver = NULL; - grpc_connectivity_state_set(&chand->state_tracker, - GRPC_CHANNEL_FATAL_FAILURE, "resolver_gone", - closure_list); - gpr_mu_unlock(&chand->mu_config); - if (old_resolver != NULL) { - grpc_resolver_shutdown(old_resolver, closure_list); - GRPC_RESOLVER_UNREF(old_resolver, "channel", closure_list); - } - } - - if (exit_idle) { - grpc_lb_policy_exit_idle(lb_policy, closure_list); - GRPC_LB_POLICY_UNREF(lb_policy, "exit_idle", closure_list); - } - - if (old_lb_policy != NULL) { - grpc_lb_policy_shutdown(old_lb_policy, closure_list); - GRPC_LB_POLICY_UNREF(old_lb_policy, "channel", closure_list); - } - - if (lb_policy != NULL) { - GRPC_LB_POLICY_UNREF(lb_policy, "config_change", closure_list); - } - - GRPC_CHANNEL_INTERNAL_UNREF(chand->master, "resolver", closure_list); + if (lb_policy != NULL || chand->resolver == NULL /* disconnected */ ) + { + grpc_closure_list_move (&chand->waiting_for_config_closures, closure_list); + } + if (lb_policy != NULL && chand->exit_idle_when_lb_policy_arrives) + { + GRPC_LB_POLICY_REF (lb_policy, "exit_idle"); + exit_idle = 1; + chand->exit_idle_when_lb_policy_arrives = 0; + } + + if (iomgr_success && chand->resolver) + { + grpc_resolver *resolver = chand->resolver; + GRPC_RESOLVER_REF (resolver, "channel-next"); + grpc_connectivity_state_set (&chand->state_tracker, state, "new_lb+resolver", closure_list); + if (lb_policy != NULL) + { + watch_lb_policy (chand, lb_policy, state, closure_list); + } + gpr_mu_unlock (&chand->mu_config); + GRPC_CHANNEL_INTERNAL_REF (chand->master, "resolver"); + grpc_resolver_next (resolver, &chand->incoming_configuration, &chand->on_config_changed, closure_list); + GRPC_RESOLVER_UNREF (resolver, "channel-next", closure_list); + } + else + { + old_resolver = chand->resolver; + chand->resolver = NULL; + grpc_connectivity_state_set (&chand->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "resolver_gone", closure_list); + gpr_mu_unlock (&chand->mu_config); + if (old_resolver != NULL) + { + grpc_resolver_shutdown (old_resolver, closure_list); + GRPC_RESOLVER_UNREF (old_resolver, "channel", closure_list); + } + } + + if (exit_idle) + { + grpc_lb_policy_exit_idle (lb_policy, closure_list); + GRPC_LB_POLICY_UNREF (lb_policy, "exit_idle", closure_list); + } + + if (old_lb_policy != NULL) + { + grpc_lb_policy_shutdown (old_lb_policy, closure_list); + GRPC_LB_POLICY_UNREF (old_lb_policy, "channel", closure_list); + } + + if (lb_policy != NULL) + { + GRPC_LB_POLICY_UNREF (lb_policy, "config_change", closure_list); + } + + GRPC_CHANNEL_INTERNAL_UNREF (chand->master, "resolver", closure_list); } -static void cc_start_transport_op(grpc_channel_element *elem, - grpc_transport_op *op, - grpc_closure_list *closure_list) { +static void +cc_start_transport_op (grpc_channel_element * elem, grpc_transport_op * op, grpc_closure_list * closure_list) +{ grpc_lb_policy *lb_policy = NULL; channel_data *chand = elem->channel_data; grpc_resolver *destroy_resolver = NULL; - grpc_closure_list_add(closure_list, op->on_consumed, 1); - - GPR_ASSERT(op->set_accept_stream == NULL); - GPR_ASSERT(op->bind_pollset == NULL); - - gpr_mu_lock(&chand->mu_config); - if (op->on_connectivity_state_change != NULL) { - grpc_connectivity_state_notify_on_state_change( - &chand->state_tracker, op->connectivity_state, - op->on_connectivity_state_change, closure_list); - op->on_connectivity_state_change = NULL; - op->connectivity_state = NULL; - } - - if (!is_empty(op, sizeof(*op))) { - lb_policy = chand->lb_policy; - if (lb_policy) { - GRPC_LB_POLICY_REF(lb_policy, "broadcast"); - } - } - - if (op->disconnect && chand->resolver != NULL) { - grpc_connectivity_state_set(&chand->state_tracker, - GRPC_CHANNEL_FATAL_FAILURE, "disconnect", - closure_list); - destroy_resolver = chand->resolver; - chand->resolver = NULL; - if (chand->lb_policy != NULL) { - grpc_lb_policy_shutdown(chand->lb_policy, closure_list); - GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel", closure_list); - chand->lb_policy = NULL; - } - } - gpr_mu_unlock(&chand->mu_config); - - if (destroy_resolver) { - grpc_resolver_shutdown(destroy_resolver, closure_list); - GRPC_RESOLVER_UNREF(destroy_resolver, "channel", closure_list); - } - - if (lb_policy) { - grpc_lb_policy_broadcast(lb_policy, op, closure_list); - GRPC_LB_POLICY_UNREF(lb_policy, "broadcast", closure_list); - } + grpc_closure_list_add (closure_list, op->on_consumed, 1); + + GPR_ASSERT (op->set_accept_stream == NULL); + GPR_ASSERT (op->bind_pollset == NULL); + + gpr_mu_lock (&chand->mu_config); + if (op->on_connectivity_state_change != NULL) + { + grpc_connectivity_state_notify_on_state_change (&chand->state_tracker, op->connectivity_state, op->on_connectivity_state_change, closure_list); + op->on_connectivity_state_change = NULL; + op->connectivity_state = NULL; + } + + if (!is_empty (op, sizeof (*op))) + { + lb_policy = chand->lb_policy; + if (lb_policy) + { + GRPC_LB_POLICY_REF (lb_policy, "broadcast"); + } + } + + if (op->disconnect && chand->resolver != NULL) + { + grpc_connectivity_state_set (&chand->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "disconnect", closure_list); + destroy_resolver = chand->resolver; + chand->resolver = NULL; + if (chand->lb_policy != NULL) + { + grpc_lb_policy_shutdown (chand->lb_policy, closure_list); + GRPC_LB_POLICY_UNREF (chand->lb_policy, "channel", closure_list); + chand->lb_policy = NULL; + } + } + gpr_mu_unlock (&chand->mu_config); + + if (destroy_resolver) + { + grpc_resolver_shutdown (destroy_resolver, closure_list); + GRPC_RESOLVER_UNREF (destroy_resolver, "channel", closure_list); + } + + if (lb_policy) + { + grpc_lb_policy_broadcast (lb_policy, op, closure_list); + GRPC_LB_POLICY_UNREF (lb_policy, "broadcast", closure_list); + } } /* Constructor for call_data */ -static void init_call_elem(grpc_call_element *elem, - const void *server_transport_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list) { +static void +init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; /* TODO(ctiller): is there something useful we can do here? */ - GPR_ASSERT(initial_op == NULL); + GPR_ASSERT (initial_op == NULL); - GPR_ASSERT(elem->filter == &grpc_client_channel_filter); - GPR_ASSERT(server_transport_data == NULL); - gpr_mu_init(&calld->mu_state); + GPR_ASSERT (elem->filter == &grpc_client_channel_filter); + GPR_ASSERT (server_transport_data == NULL); + gpr_mu_init (&calld->mu_state); calld->elem = elem; calld->state = CALL_CREATED; - calld->deadline = gpr_inf_future(GPR_CLOCK_REALTIME); + calld->deadline = gpr_inf_future (GPR_CLOCK_REALTIME); } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element *elem, - grpc_closure_list *closure_list) { +static void +destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; grpc_subchannel_call *subchannel_call; /* if the call got activated, we need to destroy the child stack also, and remove it from the in-flight requests tracked by the child_entry we picked */ - gpr_mu_lock(&calld->mu_state); - switch (calld->state) { + gpr_mu_lock (&calld->mu_state); + switch (calld->state) + { case CALL_ACTIVE: subchannel_call = calld->subchannel_call; - gpr_mu_unlock(&calld->mu_state); - GRPC_SUBCHANNEL_CALL_UNREF(subchannel_call, "client_channel", - closure_list); + gpr_mu_unlock (&calld->mu_state); + GRPC_SUBCHANNEL_CALL_UNREF (subchannel_call, "client_channel", closure_list); break; case CALL_CREATED: case CALL_CANCELLED: - gpr_mu_unlock(&calld->mu_state); + gpr_mu_unlock (&calld->mu_state); break; case CALL_WAITING_FOR_PICK: case CALL_WAITING_FOR_CONFIG: case CALL_WAITING_FOR_CALL: case CALL_WAITING_FOR_SEND: - gpr_log(GPR_ERROR, "should never reach here"); - abort(); + gpr_log (GPR_ERROR, "should never reach here"); + abort (); break; - } + } } /* Constructor for channel_data */ -static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, - const grpc_channel_args *args, - grpc_mdctx *metadata_context, int is_first, - int is_last, grpc_closure_list *closure_list) { +static void +init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last, grpc_closure_list * closure_list) +{ channel_data *chand = elem->channel_data; - memset(chand, 0, sizeof(*chand)); + memset (chand, 0, sizeof (*chand)); - GPR_ASSERT(is_last); - GPR_ASSERT(elem->filter == &grpc_client_channel_filter); + GPR_ASSERT (is_last); + GPR_ASSERT (elem->filter == &grpc_client_channel_filter); - gpr_mu_init(&chand->mu_config); + gpr_mu_init (&chand->mu_config); chand->mdctx = metadata_context; chand->master = master; - grpc_pollset_set_init(&chand->pollset_set); - grpc_closure_init(&chand->on_config_changed, cc_on_config_changed, chand); + grpc_pollset_set_init (&chand->pollset_set); + grpc_closure_init (&chand->on_config_changed, cc_on_config_changed, chand); - grpc_connectivity_state_init(&chand->state_tracker, GRPC_CHANNEL_IDLE, - "client_channel"); + grpc_connectivity_state_init (&chand->state_tracker, GRPC_CHANNEL_IDLE, "client_channel"); } /* Destructor for channel_data */ -static void destroy_channel_elem(grpc_channel_element *elem, - grpc_closure_list *closure_list) { +static void +destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +{ channel_data *chand = elem->channel_data; - if (chand->resolver != NULL) { - grpc_resolver_shutdown(chand->resolver, closure_list); - GRPC_RESOLVER_UNREF(chand->resolver, "channel", closure_list); - } - if (chand->lb_policy != NULL) { - GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel", closure_list); - } - grpc_connectivity_state_destroy(&chand->state_tracker, closure_list); - grpc_pollset_set_destroy(&chand->pollset_set); - gpr_mu_destroy(&chand->mu_config); + if (chand->resolver != NULL) + { + grpc_resolver_shutdown (chand->resolver, closure_list); + GRPC_RESOLVER_UNREF (chand->resolver, "channel", closure_list); + } + if (chand->lb_policy != NULL) + { + GRPC_LB_POLICY_UNREF (chand->lb_policy, "channel", closure_list); + } + grpc_connectivity_state_destroy (&chand->state_tracker, closure_list); + grpc_pollset_set_destroy (&chand->pollset_set); + gpr_mu_destroy (&chand->mu_config); } const grpc_channel_filter grpc_client_channel_filter = { - cc_start_transport_stream_op, - cc_start_transport_op, - sizeof(call_data), - init_call_elem, - destroy_call_elem, - sizeof(channel_data), - init_channel_elem, - destroy_channel_elem, - cc_get_peer, - "client-channel", + cc_start_transport_stream_op, + cc_start_transport_op, + sizeof (call_data), + init_call_elem, + destroy_call_elem, + sizeof (channel_data), + init_channel_elem, + destroy_channel_elem, + cc_get_peer, + "client-channel", }; -void grpc_client_channel_set_resolver(grpc_channel_stack *channel_stack, - grpc_resolver *resolver, - grpc_closure_list *closure_list) { +void +grpc_client_channel_set_resolver (grpc_channel_stack * channel_stack, grpc_resolver * resolver, grpc_closure_list * closure_list) +{ /* post construction initialization: set the transport setup pointer */ - grpc_channel_element *elem = grpc_channel_stack_last_element(channel_stack); + grpc_channel_element *elem = grpc_channel_stack_last_element (channel_stack); channel_data *chand = elem->channel_data; - gpr_mu_lock(&chand->mu_config); - GPR_ASSERT(!chand->resolver); + gpr_mu_lock (&chand->mu_config); + GPR_ASSERT (!chand->resolver); chand->resolver = resolver; - GRPC_RESOLVER_REF(resolver, "channel"); - if (!grpc_closure_list_empty(chand->waiting_for_config_closures) || - chand->exit_idle_when_lb_policy_arrives) { - chand->started_resolving = 1; - GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); - grpc_resolver_next(resolver, &chand->incoming_configuration, - &chand->on_config_changed, closure_list); - } - gpr_mu_unlock(&chand->mu_config); + GRPC_RESOLVER_REF (resolver, "channel"); + if (!grpc_closure_list_empty (chand->waiting_for_config_closures) || chand->exit_idle_when_lb_policy_arrives) + { + chand->started_resolving = 1; + GRPC_CHANNEL_INTERNAL_REF (chand->master, "resolver"); + grpc_resolver_next (resolver, &chand->incoming_configuration, &chand->on_config_changed, closure_list); + } + gpr_mu_unlock (&chand->mu_config); } -grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_channel_element *elem, int try_to_connect, - grpc_closure_list *closure_list) { +grpc_connectivity_state +grpc_client_channel_check_connectivity_state (grpc_channel_element * elem, int try_to_connect, grpc_closure_list * closure_list) +{ channel_data *chand = elem->channel_data; grpc_connectivity_state out; - gpr_mu_lock(&chand->mu_config); - out = grpc_connectivity_state_check(&chand->state_tracker); - if (out == GRPC_CHANNEL_IDLE && try_to_connect) { - if (chand->lb_policy != NULL) { - grpc_lb_policy_exit_idle(chand->lb_policy, closure_list); - } else { - chand->exit_idle_when_lb_policy_arrives = 1; - if (!chand->started_resolving && chand->resolver != NULL) { - GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); - chand->started_resolving = 1; - grpc_resolver_next(chand->resolver, &chand->incoming_configuration, - &chand->on_config_changed, closure_list); - } - } - } - gpr_mu_unlock(&chand->mu_config); + gpr_mu_lock (&chand->mu_config); + out = grpc_connectivity_state_check (&chand->state_tracker); + if (out == GRPC_CHANNEL_IDLE && try_to_connect) + { + if (chand->lb_policy != NULL) + { + grpc_lb_policy_exit_idle (chand->lb_policy, closure_list); + } + else + { + chand->exit_idle_when_lb_policy_arrives = 1; + if (!chand->started_resolving && chand->resolver != NULL) + { + GRPC_CHANNEL_INTERNAL_REF (chand->master, "resolver"); + chand->started_resolving = 1; + grpc_resolver_next (chand->resolver, &chand->incoming_configuration, &chand->on_config_changed, closure_list); + } + } + } + gpr_mu_unlock (&chand->mu_config); return out; } -void grpc_client_channel_watch_connectivity_state( - grpc_channel_element *elem, grpc_connectivity_state *state, - grpc_closure *on_complete, grpc_closure_list *closure_list) { +void +grpc_client_channel_watch_connectivity_state (grpc_channel_element * elem, grpc_connectivity_state * state, grpc_closure * on_complete, grpc_closure_list * closure_list) +{ channel_data *chand = elem->channel_data; - gpr_mu_lock(&chand->mu_config); - grpc_connectivity_state_notify_on_state_change(&chand->state_tracker, state, - on_complete, closure_list); - gpr_mu_unlock(&chand->mu_config); + gpr_mu_lock (&chand->mu_config); + grpc_connectivity_state_notify_on_state_change (&chand->state_tracker, state, on_complete, closure_list); + gpr_mu_unlock (&chand->mu_config); } -grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set( - grpc_channel_element *elem) { +grpc_pollset_set * +grpc_client_channel_get_connecting_pollset_set (grpc_channel_element * elem) +{ channel_data *chand = elem->channel_data; return &chand->pollset_set; } -void grpc_client_channel_add_interested_party(grpc_channel_element *elem, - grpc_pollset *pollset, - grpc_closure_list *closure_list) { +void +grpc_client_channel_add_interested_party (grpc_channel_element * elem, grpc_pollset * pollset, grpc_closure_list * closure_list) +{ channel_data *chand = elem->channel_data; - grpc_pollset_set_add_pollset(&chand->pollset_set, pollset, closure_list); + grpc_pollset_set_add_pollset (&chand->pollset_set, pollset, closure_list); } -void grpc_client_channel_del_interested_party(grpc_channel_element *elem, - grpc_pollset *pollset, - grpc_closure_list *closure_list) { +void +grpc_client_channel_del_interested_party (grpc_channel_element * elem, grpc_pollset * pollset, grpc_closure_list * closure_list) +{ channel_data *chand = elem->channel_data; - grpc_pollset_set_del_pollset(&chand->pollset_set, pollset, closure_list); + grpc_pollset_set_del_pollset (&chand->pollset_set, pollset, closure_list); } diff --git a/src/core/channel/client_channel.h b/src/core/channel/client_channel.h index d200f6e4b04..468cf5ef3ea 100644 --- a/src/core/channel/client_channel.h +++ b/src/core/channel/client_channel.h @@ -49,26 +49,15 @@ extern const grpc_channel_filter grpc_client_channel_filter; /* post-construction initializer to let the client channel know which transport setup it should cancel upon destruction, or initiate when it needs a connection */ -void grpc_client_channel_set_resolver(grpc_channel_stack *channel_stack, - grpc_resolver *resolver, - grpc_closure_list *closure_list); +void grpc_client_channel_set_resolver (grpc_channel_stack * channel_stack, grpc_resolver * resolver, grpc_closure_list * closure_list); -grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_channel_element *elem, int try_to_connect, - grpc_closure_list *closure_list); +grpc_connectivity_state grpc_client_channel_check_connectivity_state (grpc_channel_element * elem, int try_to_connect, grpc_closure_list * closure_list); -void grpc_client_channel_watch_connectivity_state( - grpc_channel_element *elem, grpc_connectivity_state *state, - grpc_closure *on_complete, grpc_closure_list *closure_list); +void grpc_client_channel_watch_connectivity_state (grpc_channel_element * elem, grpc_connectivity_state * state, grpc_closure * on_complete, grpc_closure_list * closure_list); -grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set( - grpc_channel_element *elem); +grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set (grpc_channel_element * elem); -void grpc_client_channel_add_interested_party(grpc_channel_element *channel, - grpc_pollset *pollset, - grpc_closure_list *closure_list); -void grpc_client_channel_del_interested_party(grpc_channel_element *channel, - grpc_pollset *pollset, - grpc_closure_list *closure_list); +void grpc_client_channel_add_interested_party (grpc_channel_element * channel, grpc_pollset * pollset, grpc_closure_list * closure_list); +void grpc_client_channel_del_interested_party (grpc_channel_element * channel, grpc_pollset * pollset, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_CHANNEL_CLIENT_CHANNEL_H */ diff --git a/src/core/channel/compress_filter.c b/src/core/channel/compress_filter.c index 911c689d54d..a1c03dc9d91 100644 --- a/src/core/channel/compress_filter.c +++ b/src/core/channel/compress_filter.c @@ -44,13 +44,14 @@ #include "src/core/compression/message_compress.h" #include "src/core/support/string.h" -typedef struct call_data { +typedef struct call_data +{ gpr_slice_buffer slices; /**< Buffers up input slices to be compressed */ grpc_linked_mdelem compression_algorithm_storage; grpc_linked_mdelem accept_encoding_storage; - gpr_uint32 - remaining_slice_bytes; /**< Input data to be read, as per BEGIN_MESSAGE */ - int written_initial_metadata; /**< Already processed initial md? */ + gpr_uint32 remaining_slice_bytes; + /**< Input data to be read, as per BEGIN_MESSAGE */ + int written_initial_metadata; /**< Already processed initial md? */ /** Compression algorithm we'll try to use. It may be given by incoming * metadata, or by the channel's default compression settings. */ grpc_compression_algorithm compression_algorithm; @@ -58,7 +59,8 @@ typedef struct call_data { int has_compression_algorithm; } call_data; -typedef struct channel_data { +typedef struct channel_data +{ /** Metadata key for the incoming (requested) compression algorithm */ grpc_mdstr *mdstr_request_compression_algorithm_key; /** Metadata key for the outgoing (used) compression algorithm */ @@ -80,59 +82,62 @@ typedef struct channel_data { * larger than the raw input). * * Returns 1 if the data was actually compress and 0 otherwise. */ -static int compress_send_sb(grpc_compression_algorithm algorithm, - gpr_slice_buffer *slices) { +static int +compress_send_sb (grpc_compression_algorithm algorithm, gpr_slice_buffer * slices) +{ int did_compress; gpr_slice_buffer tmp; - gpr_slice_buffer_init(&tmp); - did_compress = grpc_msg_compress(algorithm, slices, &tmp); - if (did_compress) { - gpr_slice_buffer_swap(slices, &tmp); - } - gpr_slice_buffer_destroy(&tmp); + gpr_slice_buffer_init (&tmp); + did_compress = grpc_msg_compress (algorithm, slices, &tmp); + if (did_compress) + { + gpr_slice_buffer_swap (slices, &tmp); + } + gpr_slice_buffer_destroy (&tmp); return did_compress; } /** For each \a md element from the incoming metadata, filter out the entry for * "grpc-encoding", using its value to populate the call data's * compression_algorithm field. */ -static grpc_mdelem *compression_md_filter(void *user_data, grpc_mdelem *md) { +static grpc_mdelem * +compression_md_filter (void *user_data, grpc_mdelem * md) +{ grpc_call_element *elem = user_data; call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; - if (md->key == channeld->mdstr_request_compression_algorithm_key) { - const char *md_c_str = grpc_mdstr_as_c_string(md->value); - if (!grpc_compression_algorithm_parse(md_c_str, strlen(md_c_str), - &calld->compression_algorithm)) { - gpr_log(GPR_ERROR, - "Invalid compression algorithm: '%s' (unknown). Ignoring.", - md_c_str); - calld->compression_algorithm = GRPC_COMPRESS_NONE; - } - if (grpc_compression_options_is_algorithm_enabled( - &channeld->compression_options, calld->compression_algorithm) == - 0) { - gpr_log(GPR_ERROR, - "Invalid compression algorithm: '%s' (previously disabled). " - "Ignoring.", - md_c_str); - calld->compression_algorithm = GRPC_COMPRESS_NONE; + if (md->key == channeld->mdstr_request_compression_algorithm_key) + { + const char *md_c_str = grpc_mdstr_as_c_string (md->value); + if (!grpc_compression_algorithm_parse (md_c_str, strlen (md_c_str), &calld->compression_algorithm)) + { + gpr_log (GPR_ERROR, "Invalid compression algorithm: '%s' (unknown). Ignoring.", md_c_str); + calld->compression_algorithm = GRPC_COMPRESS_NONE; + } + if (grpc_compression_options_is_algorithm_enabled (&channeld->compression_options, calld->compression_algorithm) == 0) + { + gpr_log (GPR_ERROR, "Invalid compression algorithm: '%s' (previously disabled). " "Ignoring.", md_c_str); + calld->compression_algorithm = GRPC_COMPRESS_NONE; + } + calld->has_compression_algorithm = 1; + return NULL; } - calld->has_compression_algorithm = 1; - return NULL; - } return md; } -static int skip_compression(channel_data *channeld, call_data *calld) { - if (calld->has_compression_algorithm) { - if (calld->compression_algorithm == GRPC_COMPRESS_NONE) { - return 1; +static int +skip_compression (channel_data * channeld, call_data * calld) +{ + if (calld->has_compression_algorithm) + { + if (calld->compression_algorithm == GRPC_COMPRESS_NONE) + { + return 1; + } + return 0; /* we have an actual call-specific algorithm */ } - return 0; /* we have an actual call-specific algorithm */ - } /* no per-call compression override */ return channeld->default_compression_algorithm == GRPC_COMPRESS_NONE; } @@ -141,126 +146,127 @@ static int skip_compression(channel_data *channeld, call_data *calld) { * the associated GRPC_OP_BEGIN_MESSAGE accordingly (new compressed length, * flags indicating compression is in effect) and replaces \a send_ops with it. * */ -static void finish_compressed_sopb(grpc_stream_op_buffer *send_ops, - grpc_call_element *elem) { +static void +finish_compressed_sopb (grpc_stream_op_buffer * send_ops, grpc_call_element * elem) +{ size_t i; call_data *calld = elem->call_data; - int new_slices_added = 0; /* GPR_FALSE */ + int new_slices_added = 0; /* GPR_FALSE */ grpc_metadata_batch metadata; grpc_stream_op_buffer new_send_ops; - grpc_sopb_init(&new_send_ops); - - for (i = 0; i < send_ops->nops; i++) { - grpc_stream_op *sop = &send_ops->ops[i]; - switch (sop->type) { - case GRPC_OP_BEGIN_MESSAGE: - GPR_ASSERT(calld->slices.length <= GPR_UINT32_MAX); - grpc_sopb_add_begin_message( - &new_send_ops, (gpr_uint32)calld->slices.length, - sop->data.begin_message.flags | GRPC_WRITE_INTERNAL_COMPRESS); - break; - case GRPC_OP_SLICE: - /* Once we reach the slices section of the original buffer, simply add - * all the new (compressed) slices. We obviously want to do this only - * once, hence the "new_slices_added" guard. */ - if (!new_slices_added) { - size_t j; - for (j = 0; j < calld->slices.count; ++j) { - grpc_sopb_add_slice(&new_send_ops, - gpr_slice_ref(calld->slices.slices[j])); - } - new_slices_added = 1; /* GPR_TRUE */ - } - break; - case GRPC_OP_METADATA: - /* move the metadata to the new buffer. */ - grpc_metadata_batch_move(&metadata, &sop->data.metadata); - grpc_sopb_add_metadata(&new_send_ops, metadata); - break; - case GRPC_NO_OP: - break; + grpc_sopb_init (&new_send_ops); + + for (i = 0; i < send_ops->nops; i++) + { + grpc_stream_op *sop = &send_ops->ops[i]; + switch (sop->type) + { + case GRPC_OP_BEGIN_MESSAGE: + GPR_ASSERT (calld->slices.length <= GPR_UINT32_MAX); + grpc_sopb_add_begin_message (&new_send_ops, (gpr_uint32) calld->slices.length, sop->data.begin_message.flags | GRPC_WRITE_INTERNAL_COMPRESS); + break; + case GRPC_OP_SLICE: + /* Once we reach the slices section of the original buffer, simply add + * all the new (compressed) slices. We obviously want to do this only + * once, hence the "new_slices_added" guard. */ + if (!new_slices_added) + { + size_t j; + for (j = 0; j < calld->slices.count; ++j) + { + grpc_sopb_add_slice (&new_send_ops, gpr_slice_ref (calld->slices.slices[j])); + } + new_slices_added = 1; /* GPR_TRUE */ + } + break; + case GRPC_OP_METADATA: + /* move the metadata to the new buffer. */ + grpc_metadata_batch_move (&metadata, &sop->data.metadata); + grpc_sopb_add_metadata (&new_send_ops, metadata); + break; + case GRPC_NO_OP: + break; + } } - } - grpc_sopb_swap(send_ops, &new_send_ops); - grpc_sopb_destroy(&new_send_ops); + grpc_sopb_swap (send_ops, &new_send_ops); + grpc_sopb_destroy (&new_send_ops); } /** Filter's "main" function, called for any incoming grpc_transport_stream_op * instance that holds a non-zero number of send operations, accesible to this * function in \a send_ops. */ -static void process_send_ops(grpc_call_element *elem, - grpc_stream_op_buffer *send_ops) { +static void +process_send_ops (grpc_call_element * elem, grpc_stream_op_buffer * send_ops) +{ call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; size_t i; int did_compress = 0; /* In streaming calls, we need to reset the previously accumulated slices */ - gpr_slice_buffer_reset_and_unref(&calld->slices); - for (i = 0; i < send_ops->nops; ++i) { - grpc_stream_op *sop = &send_ops->ops[i]; - switch (sop->type) { - case GRPC_OP_BEGIN_MESSAGE: - /* buffer up slices until we've processed all the expected ones (as - * given by GRPC_OP_BEGIN_MESSAGE) */ - calld->remaining_slice_bytes = sop->data.begin_message.length; - if (sop->data.begin_message.flags & GRPC_WRITE_NO_COMPRESS) { - calld->has_compression_algorithm = 1; /* GPR_TRUE */ - calld->compression_algorithm = GRPC_COMPRESS_NONE; - } - break; - case GRPC_OP_METADATA: - if (!calld->written_initial_metadata) { - /* Parse incoming request for compression. If any, it'll be available - * at calld->compression_algorithm */ - grpc_metadata_batch_filter(&(sop->data.metadata), - compression_md_filter, elem); - if (!calld->has_compression_algorithm) { - /* If no algorithm was found in the metadata and we aren't - * exceptionally skipping compression, fall back to the channel - * default */ - calld->compression_algorithm = - channeld->default_compression_algorithm; - calld->has_compression_algorithm = 1; /* GPR_TRUE */ - } - /* hint compression algorithm */ - grpc_metadata_batch_add_tail( - &(sop->data.metadata), &calld->compression_algorithm_storage, - GRPC_MDELEM_REF(channeld->mdelem_compression_algorithms - [calld->compression_algorithm])); - - /* convey supported compression algorithms */ - grpc_metadata_batch_add_tail( - &(sop->data.metadata), &calld->accept_encoding_storage, - GRPC_MDELEM_REF(channeld->mdelem_accept_encoding)); - - calld->written_initial_metadata = 1; /* GPR_TRUE */ - } - break; - case GRPC_OP_SLICE: - if (skip_compression(channeld, calld)) continue; - GPR_ASSERT(calld->remaining_slice_bytes > 0); - /* Increase input ref count, gpr_slice_buffer_add takes ownership. */ - gpr_slice_buffer_add(&calld->slices, gpr_slice_ref(sop->data.slice)); - GPR_ASSERT(GPR_SLICE_LENGTH(sop->data.slice) >= - calld->remaining_slice_bytes); - calld->remaining_slice_bytes -= - (gpr_uint32)GPR_SLICE_LENGTH(sop->data.slice); - if (calld->remaining_slice_bytes == 0) { - did_compress = - compress_send_sb(calld->compression_algorithm, &calld->slices); - } - break; - case GRPC_NO_OP: - break; + gpr_slice_buffer_reset_and_unref (&calld->slices); + for (i = 0; i < send_ops->nops; ++i) + { + grpc_stream_op *sop = &send_ops->ops[i]; + switch (sop->type) + { + case GRPC_OP_BEGIN_MESSAGE: + /* buffer up slices until we've processed all the expected ones (as + * given by GRPC_OP_BEGIN_MESSAGE) */ + calld->remaining_slice_bytes = sop->data.begin_message.length; + if (sop->data.begin_message.flags & GRPC_WRITE_NO_COMPRESS) + { + calld->has_compression_algorithm = 1; /* GPR_TRUE */ + calld->compression_algorithm = GRPC_COMPRESS_NONE; + } + break; + case GRPC_OP_METADATA: + if (!calld->written_initial_metadata) + { + /* Parse incoming request for compression. If any, it'll be available + * at calld->compression_algorithm */ + grpc_metadata_batch_filter (&(sop->data.metadata), compression_md_filter, elem); + if (!calld->has_compression_algorithm) + { + /* If no algorithm was found in the metadata and we aren't + * exceptionally skipping compression, fall back to the channel + * default */ + calld->compression_algorithm = channeld->default_compression_algorithm; + calld->has_compression_algorithm = 1; /* GPR_TRUE */ + } + /* hint compression algorithm */ + grpc_metadata_batch_add_tail (&(sop->data.metadata), &calld->compression_algorithm_storage, GRPC_MDELEM_REF (channeld->mdelem_compression_algorithms[calld->compression_algorithm])); + + /* convey supported compression algorithms */ + grpc_metadata_batch_add_tail (&(sop->data.metadata), &calld->accept_encoding_storage, GRPC_MDELEM_REF (channeld->mdelem_accept_encoding)); + + calld->written_initial_metadata = 1; /* GPR_TRUE */ + } + break; + case GRPC_OP_SLICE: + if (skip_compression (channeld, calld)) + continue; + GPR_ASSERT (calld->remaining_slice_bytes > 0); + /* Increase input ref count, gpr_slice_buffer_add takes ownership. */ + gpr_slice_buffer_add (&calld->slices, gpr_slice_ref (sop->data.slice)); + GPR_ASSERT (GPR_SLICE_LENGTH (sop->data.slice) >= calld->remaining_slice_bytes); + calld->remaining_slice_bytes -= (gpr_uint32) GPR_SLICE_LENGTH (sop->data.slice); + if (calld->remaining_slice_bytes == 0) + { + did_compress = compress_send_sb (calld->compression_algorithm, &calld->slices); + } + break; + case GRPC_NO_OP: + break; + } } - } /* Modify the send_ops stream_op_buffer depending on whether compression was * carried out */ - if (did_compress) { - finish_compressed_sopb(send_ops, elem); - } + if (did_compress) + { + finish_compressed_sopb (send_ops, elem); + } } /* Called either: @@ -268,50 +274,52 @@ static void process_send_ops(grpc_call_element *elem, - a network event (or similar) from below, to receive something op contains type and call direction information, in addition to the data that is being sent or received. */ -static void compress_start_transport_stream_op( - grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { - if (op->send_ops && op->send_ops->nops > 0) { - process_send_ops(elem, op->send_ops); - } +static void +compress_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + if (op->send_ops && op->send_ops->nops > 0) + { + process_send_ops (elem, op->send_ops); + } /* pass control down the stack */ - grpc_call_next_op(elem, op, closure_list); + grpc_call_next_op (elem, op, closure_list); } /* Constructor for call_data */ -static void init_call_elem(grpc_call_element *elem, - const void *server_transport_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list) { +static void +init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; /* initialize members */ - gpr_slice_buffer_init(&calld->slices); + gpr_slice_buffer_init (&calld->slices); calld->has_compression_algorithm = 0; - calld->written_initial_metadata = 0; /* GPR_FALSE */ - - if (initial_op) { - if (initial_op->send_ops && initial_op->send_ops->nops > 0) { - process_send_ops(elem, initial_op->send_ops); + calld->written_initial_metadata = 0; /* GPR_FALSE */ + + if (initial_op) + { + if (initial_op->send_ops && initial_op->send_ops->nops > 0) + { + process_send_ops (elem, initial_op->send_ops); + } } - } } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element *elem, - grpc_closure_list *closure_list) { +static void +destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +{ /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; - gpr_slice_buffer_destroy(&calld->slices); + gpr_slice_buffer_destroy (&calld->slices); } /* Constructor for channel_data */ -static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, - const grpc_channel_args *args, grpc_mdctx *mdctx, - int is_first, int is_last, - grpc_closure_list *closure_list) { +static void +init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +{ channel_data *channeld = elem->channel_data; grpc_compression_algorithm algo_idx; const char *supported_algorithms_names[GRPC_COMPRESS_ALGORITHMS_COUNT - 1]; @@ -319,82 +327,72 @@ static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, char *accept_encoding_str; size_t accept_encoding_str_len; - grpc_compression_options_init(&channeld->compression_options); - channeld->compression_options.enabled_algorithms_bitset = - (gpr_uint32)grpc_channel_args_compression_algorithm_get_states(args); + grpc_compression_options_init (&channeld->compression_options); + channeld->compression_options.enabled_algorithms_bitset = (gpr_uint32) grpc_channel_args_compression_algorithm_get_states (args); - channeld->default_compression_algorithm = - grpc_channel_args_get_compression_algorithm(args); + channeld->default_compression_algorithm = grpc_channel_args_get_compression_algorithm (args); /* Make sure the default isn't disabled. */ - GPR_ASSERT(grpc_compression_options_is_algorithm_enabled( - &channeld->compression_options, channeld->default_compression_algorithm)); - channeld->compression_options.default_compression_algorithm = - channeld->default_compression_algorithm; - - channeld->mdstr_request_compression_algorithm_key = - grpc_mdstr_from_string(mdctx, GRPC_COMPRESS_REQUEST_ALGORITHM_KEY, 0); - - channeld->mdstr_outgoing_compression_algorithm_key = - grpc_mdstr_from_string(mdctx, "grpc-encoding", 0); - - channeld->mdstr_compression_capabilities_key = - grpc_mdstr_from_string(mdctx, "grpc-accept-encoding", 0); - - for (algo_idx = 0; algo_idx < GRPC_COMPRESS_ALGORITHMS_COUNT; ++algo_idx) { - char *algorithm_name; - /* skip disabled algorithms */ - if (grpc_compression_options_is_algorithm_enabled( - &channeld->compression_options, algo_idx) == 0) { - continue; - } - GPR_ASSERT(grpc_compression_algorithm_name(algo_idx, &algorithm_name) != 0); - channeld->mdelem_compression_algorithms[algo_idx] = - grpc_mdelem_from_metadata_strings( - mdctx, - GRPC_MDSTR_REF(channeld->mdstr_outgoing_compression_algorithm_key), - grpc_mdstr_from_string(mdctx, algorithm_name, 0)); - if (algo_idx > 0) { - supported_algorithms_names[supported_algorithms_idx++] = algorithm_name; + GPR_ASSERT (grpc_compression_options_is_algorithm_enabled (&channeld->compression_options, channeld->default_compression_algorithm)); + channeld->compression_options.default_compression_algorithm = channeld->default_compression_algorithm; + + channeld->mdstr_request_compression_algorithm_key = grpc_mdstr_from_string (mdctx, GRPC_COMPRESS_REQUEST_ALGORITHM_KEY, 0); + + channeld->mdstr_outgoing_compression_algorithm_key = grpc_mdstr_from_string (mdctx, "grpc-encoding", 0); + + channeld->mdstr_compression_capabilities_key = grpc_mdstr_from_string (mdctx, "grpc-accept-encoding", 0); + + for (algo_idx = 0; algo_idx < GRPC_COMPRESS_ALGORITHMS_COUNT; ++algo_idx) + { + char *algorithm_name; + /* skip disabled algorithms */ + if (grpc_compression_options_is_algorithm_enabled (&channeld->compression_options, algo_idx) == 0) + { + continue; + } + GPR_ASSERT (grpc_compression_algorithm_name (algo_idx, &algorithm_name) != 0); + channeld->mdelem_compression_algorithms[algo_idx] = grpc_mdelem_from_metadata_strings (mdctx, GRPC_MDSTR_REF (channeld->mdstr_outgoing_compression_algorithm_key), grpc_mdstr_from_string (mdctx, algorithm_name, 0)); + if (algo_idx > 0) + { + supported_algorithms_names[supported_algorithms_idx++] = algorithm_name; + } } - } /* TODO(dgq): gpr_strjoin_sep could be made to work with statically allocated * arrays, as to avoid the heap allocs */ - accept_encoding_str = - gpr_strjoin_sep(supported_algorithms_names, supported_algorithms_idx, ",", - &accept_encoding_str_len); + accept_encoding_str = gpr_strjoin_sep (supported_algorithms_names, supported_algorithms_idx, ",", &accept_encoding_str_len); - channeld->mdelem_accept_encoding = grpc_mdelem_from_metadata_strings( - mdctx, GRPC_MDSTR_REF(channeld->mdstr_compression_capabilities_key), - grpc_mdstr_from_string(mdctx, accept_encoding_str, 0)); - gpr_free(accept_encoding_str); + channeld->mdelem_accept_encoding = grpc_mdelem_from_metadata_strings (mdctx, GRPC_MDSTR_REF (channeld->mdstr_compression_capabilities_key), grpc_mdstr_from_string (mdctx, accept_encoding_str, 0)); + gpr_free (accept_encoding_str); - GPR_ASSERT(!is_last); + GPR_ASSERT (!is_last); } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element *elem, - grpc_closure_list *closure_list) { +static void +destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +{ channel_data *channeld = elem->channel_data; grpc_compression_algorithm algo_idx; - GRPC_MDSTR_UNREF(channeld->mdstr_request_compression_algorithm_key); - GRPC_MDSTR_UNREF(channeld->mdstr_outgoing_compression_algorithm_key); - GRPC_MDSTR_UNREF(channeld->mdstr_compression_capabilities_key); - for (algo_idx = 0; algo_idx < GRPC_COMPRESS_ALGORITHMS_COUNT; ++algo_idx) { - GRPC_MDELEM_UNREF(channeld->mdelem_compression_algorithms[algo_idx]); - } - GRPC_MDELEM_UNREF(channeld->mdelem_accept_encoding); + GRPC_MDSTR_UNREF (channeld->mdstr_request_compression_algorithm_key); + GRPC_MDSTR_UNREF (channeld->mdstr_outgoing_compression_algorithm_key); + GRPC_MDSTR_UNREF (channeld->mdstr_compression_capabilities_key); + for (algo_idx = 0; algo_idx < GRPC_COMPRESS_ALGORITHMS_COUNT; ++algo_idx) + { + GRPC_MDELEM_UNREF (channeld->mdelem_compression_algorithms[algo_idx]); + } + GRPC_MDELEM_UNREF (channeld->mdelem_accept_encoding); } const grpc_channel_filter grpc_compress_filter = { - compress_start_transport_stream_op, - grpc_channel_next_op, - sizeof(call_data), - init_call_elem, - destroy_call_elem, - sizeof(channel_data), - init_channel_elem, - destroy_channel_elem, - grpc_call_next_get_peer, - "compress"}; + compress_start_transport_stream_op, + grpc_channel_next_op, + sizeof (call_data), + init_call_elem, + destroy_call_elem, + sizeof (channel_data), + init_channel_elem, + destroy_channel_elem, + grpc_call_next_get_peer, + "compress" +}; diff --git a/src/core/channel/connected_channel.c b/src/core/channel/connected_channel.c index b58e180a43d..7ba412fe5cf 100644 --- a/src/core/channel/connected_channel.c +++ b/src/core/channel/connected_channel.c @@ -46,11 +46,15 @@ #define MAX_BUFFER_LENGTH 8192 -typedef struct connected_channel_channel_data { +typedef struct connected_channel_channel_data +{ grpc_transport *transport; } channel_data; -typedef struct connected_channel_call_data { void *unused; } call_data; +typedef struct connected_channel_call_data +{ + void *unused; +} call_data; /* We perform a small hack to locate transport data alongside the connected channel data in call allocations, to allow everything to be pulled in minimal @@ -61,98 +65,95 @@ typedef struct connected_channel_call_data { void *unused; } call_data; /* Intercept a call operation and either push it directly up or translate it into transport stream operations */ -static void con_start_transport_stream_op(grpc_call_element *elem, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { +static void +con_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); - GRPC_CALL_LOG_OP(GPR_INFO, elem, op); + GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); + GRPC_CALL_LOG_OP (GPR_INFO, elem, op); - grpc_transport_perform_stream_op(chand->transport, - TRANSPORT_STREAM_FROM_CALL_DATA(calld), op, - closure_list); + grpc_transport_perform_stream_op (chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (calld), op, closure_list); } -static void con_start_transport_op(grpc_channel_element *elem, - grpc_transport_op *op, - grpc_closure_list *closure_list) { +static void +con_start_transport_op (grpc_channel_element * elem, grpc_transport_op * op, grpc_closure_list * closure_list) +{ channel_data *chand = elem->channel_data; - grpc_transport_perform_op(chand->transport, op, closure_list); + grpc_transport_perform_op (chand->transport, op, closure_list); } /* Constructor for call_data */ -static void init_call_elem(grpc_call_element *elem, - const void *server_transport_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list) { +static void +init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; int r; - GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); - r = grpc_transport_init_stream( - chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), - server_transport_data, initial_op, closure_list); - GPR_ASSERT(r == 0); + GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); + r = grpc_transport_init_stream (chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (calld), server_transport_data, initial_op, closure_list); + GPR_ASSERT (r == 0); } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element *elem, - grpc_closure_list *closure_list) { +static void +destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); - grpc_transport_destroy_stream( - chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), closure_list); + GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); + grpc_transport_destroy_stream (chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (calld), closure_list); } /* Constructor for channel_data */ -static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, - const grpc_channel_args *args, grpc_mdctx *mdctx, - int is_first, int is_last, - grpc_closure_list *closure_list) { - channel_data *cd = (channel_data *)elem->channel_data; - GPR_ASSERT(is_last); - GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); +static void +init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +{ + channel_data *cd = (channel_data *) elem->channel_data; + GPR_ASSERT (is_last); + GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); cd->transport = NULL; } /* Destructor for channel_data */ -static void destroy_channel_elem(grpc_channel_element *elem, - grpc_closure_list *closure_list) { - channel_data *cd = (channel_data *)elem->channel_data; - GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); - grpc_transport_destroy(cd->transport, closure_list); +static void +destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +{ + channel_data *cd = (channel_data *) elem->channel_data; + GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); + grpc_transport_destroy (cd->transport, closure_list); } -static char *con_get_peer(grpc_call_element *elem, - grpc_closure_list *closure_list) { +static char * +con_get_peer (grpc_call_element * elem, grpc_closure_list * closure_list) +{ channel_data *chand = elem->channel_data; - return grpc_transport_get_peer(chand->transport, closure_list); + return grpc_transport_get_peer (chand->transport, closure_list); } const grpc_channel_filter grpc_connected_channel_filter = { - con_start_transport_stream_op, - con_start_transport_op, - sizeof(call_data), - init_call_elem, - destroy_call_elem, - sizeof(channel_data), - init_channel_elem, - destroy_channel_elem, - con_get_peer, - "connected", + con_start_transport_stream_op, + con_start_transport_op, + sizeof (call_data), + init_call_elem, + destroy_call_elem, + sizeof (channel_data), + init_channel_elem, + destroy_channel_elem, + con_get_peer, + "connected", }; -void grpc_connected_channel_bind_transport(grpc_channel_stack *channel_stack, - grpc_transport *transport) { +void +grpc_connected_channel_bind_transport (grpc_channel_stack * channel_stack, grpc_transport * transport) +{ /* Assumes that the connected channel filter is always the last filter in a channel stack */ - grpc_channel_element *elem = grpc_channel_stack_last_element(channel_stack); - channel_data *cd = (channel_data *)elem->channel_data; - GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); - GPR_ASSERT(cd->transport == NULL); + grpc_channel_element *elem = grpc_channel_stack_last_element (channel_stack); + channel_data *cd = (channel_data *) elem->channel_data; + GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); + GPR_ASSERT (cd->transport == NULL); cd->transport = transport; /* HACK(ctiller): increase call stack size for the channel to make space @@ -161,5 +162,5 @@ void grpc_connected_channel_bind_transport(grpc_channel_stack *channel_stack, This is only "safe" because call stacks place no additional data after the last call element, and the last call element MUST be the connected channel. */ - channel_stack->call_stack_size += grpc_transport_stream_size(transport); + channel_stack->call_stack_size += grpc_transport_stream_size (transport); } diff --git a/src/core/channel/connected_channel.h b/src/core/channel/connected_channel.h index b615b0d3509..67bcd6c911c 100644 --- a/src/core/channel/connected_channel.h +++ b/src/core/channel/connected_channel.h @@ -43,7 +43,6 @@ extern const grpc_channel_filter grpc_connected_channel_filter; /* Post construction fixup: set the transport in the connected channel. Must be called before any call stack using this filter is used. */ -void grpc_connected_channel_bind_transport(grpc_channel_stack *channel_stack, - grpc_transport *transport); +void grpc_connected_channel_bind_transport (grpc_channel_stack * channel_stack, grpc_transport * transport); #endif /* GRPC_INTERNAL_CORE_CHANNEL_CONNECTED_CHANNEL_H */ diff --git a/src/core/channel/context.h b/src/core/channel/context.h index ac5796b9ef1..076dc7189b2 100644 --- a/src/core/channel/context.h +++ b/src/core/channel/context.h @@ -35,15 +35,17 @@ #define GRPC_INTERNAL_CORE_CHANNEL_CONTEXT_H /* Call object context pointers */ -typedef enum { +typedef enum +{ GRPC_CONTEXT_SECURITY = 0, GRPC_CONTEXT_TRACING, GRPC_CONTEXT_COUNT } grpc_context_index; -typedef struct { +typedef struct +{ void *value; - void (*destroy)(void *); + void (*destroy) (void *); } grpc_call_context_element; #endif /* GRPC_INTERNAL_CORE_CHANNEL_CONTEXT_H */ diff --git a/src/core/channel/http_client_filter.c b/src/core/channel/http_client_filter.c index 6fbe4738e75..1a166833e77 100644 --- a/src/core/channel/http_client_filter.c +++ b/src/core/channel/http_client_filter.c @@ -37,7 +37,8 @@ #include #include "src/core/support/string.h" -typedef struct call_data { +typedef struct call_data +{ grpc_linked_mdelem method; grpc_linked_mdelem scheme; grpc_linked_mdelem authority; @@ -57,7 +58,8 @@ typedef struct call_data { grpc_closure hc_on_recv; } call_data; -typedef struct channel_data { +typedef struct channel_data +{ grpc_mdelem *te_trailers; grpc_mdelem *method; grpc_mdelem *scheme; @@ -67,224 +69,255 @@ typedef struct channel_data { grpc_mdelem *user_agent; } channel_data; -typedef struct { +typedef struct +{ grpc_call_element *elem; grpc_closure_list *closure_list; } client_recv_filter_args; -static grpc_mdelem *client_recv_filter(void *user_data, grpc_mdelem *md) { +static grpc_mdelem * +client_recv_filter (void *user_data, grpc_mdelem * md) +{ client_recv_filter_args *a = user_data; grpc_call_element *elem = a->elem; channel_data *channeld = elem->channel_data; - if (md == channeld->status) { - return NULL; - } else if (md->key == channeld->status->key) { - grpc_call_element_send_cancel(elem, a->closure_list); - return NULL; - } else if (md->key == channeld->content_type->key) { - return NULL; - } + if (md == channeld->status) + { + return NULL; + } + else if (md->key == channeld->status->key) + { + grpc_call_element_send_cancel (elem, a->closure_list); + return NULL; + } + else if (md->key == channeld->content_type->key) + { + return NULL; + } return md; } -static void hc_on_recv(void *user_data, int success, - grpc_closure_list *closure_list) { +static void +hc_on_recv (void *user_data, int success, grpc_closure_list * closure_list) +{ grpc_call_element *elem = user_data; call_data *calld = elem->call_data; size_t i; size_t nops = calld->recv_ops->nops; grpc_stream_op *ops = calld->recv_ops->ops; - for (i = 0; i < nops; i++) { - grpc_stream_op *op = &ops[i]; - client_recv_filter_args a; - if (op->type != GRPC_OP_METADATA) continue; - calld->got_initial_metadata = 1; - a.elem = elem; - a.closure_list = closure_list; - grpc_metadata_batch_filter(&op->data.metadata, client_recv_filter, &a); - } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, closure_list); + for (i = 0; i < nops; i++) + { + grpc_stream_op *op = &ops[i]; + client_recv_filter_args a; + if (op->type != GRPC_OP_METADATA) + continue; + calld->got_initial_metadata = 1; + a.elem = elem; + a.closure_list = closure_list; + grpc_metadata_batch_filter (&op->data.metadata, client_recv_filter, &a); + } + calld->on_done_recv->cb (calld->on_done_recv->cb_arg, success, closure_list); } -static grpc_mdelem *client_strip_filter(void *user_data, grpc_mdelem *md) { +static grpc_mdelem * +client_strip_filter (void *user_data, grpc_mdelem * md) +{ grpc_call_element *elem = user_data; channel_data *channeld = elem->channel_data; /* eat the things we'd like to set ourselves */ - if (md->key == channeld->method->key) return NULL; - if (md->key == channeld->scheme->key) return NULL; - if (md->key == channeld->te_trailers->key) return NULL; - if (md->key == channeld->content_type->key) return NULL; - if (md->key == channeld->user_agent->key) return NULL; + if (md->key == channeld->method->key) + return NULL; + if (md->key == channeld->scheme->key) + return NULL; + if (md->key == channeld->te_trailers->key) + return NULL; + if (md->key == channeld->content_type->key) + return NULL; + if (md->key == channeld->user_agent->key) + return NULL; return md; } -static void hc_mutate_op(grpc_call_element *elem, - grpc_transport_stream_op *op) { +static void +hc_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) +{ /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; size_t i; - if (op->send_ops && !calld->sent_initial_metadata) { - size_t nops = op->send_ops->nops; - grpc_stream_op *ops = op->send_ops->ops; - for (i = 0; i < nops; i++) { - grpc_stream_op *op = &ops[i]; - if (op->type != GRPC_OP_METADATA) continue; - calld->sent_initial_metadata = 1; - grpc_metadata_batch_filter(&op->data.metadata, client_strip_filter, elem); - /* Send : prefixed headers, which have to be before any application - layer headers. */ - grpc_metadata_batch_add_head(&op->data.metadata, &calld->method, - GRPC_MDELEM_REF(channeld->method)); - grpc_metadata_batch_add_head(&op->data.metadata, &calld->scheme, - GRPC_MDELEM_REF(channeld->scheme)); - grpc_metadata_batch_add_tail(&op->data.metadata, &calld->te_trailers, - GRPC_MDELEM_REF(channeld->te_trailers)); - grpc_metadata_batch_add_tail(&op->data.metadata, &calld->content_type, - GRPC_MDELEM_REF(channeld->content_type)); - grpc_metadata_batch_add_tail(&op->data.metadata, &calld->user_agent, - GRPC_MDELEM_REF(channeld->user_agent)); - break; + if (op->send_ops && !calld->sent_initial_metadata) + { + size_t nops = op->send_ops->nops; + grpc_stream_op *ops = op->send_ops->ops; + for (i = 0; i < nops; i++) + { + grpc_stream_op *op = &ops[i]; + if (op->type != GRPC_OP_METADATA) + continue; + calld->sent_initial_metadata = 1; + grpc_metadata_batch_filter (&op->data.metadata, client_strip_filter, elem); + /* Send : prefixed headers, which have to be before any application + layer headers. */ + grpc_metadata_batch_add_head (&op->data.metadata, &calld->method, GRPC_MDELEM_REF (channeld->method)); + grpc_metadata_batch_add_head (&op->data.metadata, &calld->scheme, GRPC_MDELEM_REF (channeld->scheme)); + grpc_metadata_batch_add_tail (&op->data.metadata, &calld->te_trailers, GRPC_MDELEM_REF (channeld->te_trailers)); + grpc_metadata_batch_add_tail (&op->data.metadata, &calld->content_type, GRPC_MDELEM_REF (channeld->content_type)); + grpc_metadata_batch_add_tail (&op->data.metadata, &calld->user_agent, GRPC_MDELEM_REF (channeld->user_agent)); + break; + } } - } - if (op->recv_ops && !calld->got_initial_metadata) { - /* substitute our callback for the higher callback */ - calld->recv_ops = op->recv_ops; - calld->on_done_recv = op->on_done_recv; - op->on_done_recv = &calld->hc_on_recv; - } + if (op->recv_ops && !calld->got_initial_metadata) + { + /* substitute our callback for the higher callback */ + calld->recv_ops = op->recv_ops; + calld->on_done_recv = op->on_done_recv; + op->on_done_recv = &calld->hc_on_recv; + } } -static void hc_start_transport_op(grpc_call_element *elem, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { - GRPC_CALL_LOG_OP(GPR_INFO, elem, op); - hc_mutate_op(elem, op); - grpc_call_next_op(elem, op, closure_list); +static void +hc_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + GRPC_CALL_LOG_OP (GPR_INFO, elem, op); + hc_mutate_op (elem, op); + grpc_call_next_op (elem, op, closure_list); } /* Constructor for call_data */ -static void init_call_elem(grpc_call_element *elem, - const void *server_transport_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list) { +static void +init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; calld->sent_initial_metadata = 0; calld->got_initial_metadata = 0; calld->on_done_recv = NULL; - grpc_closure_init(&calld->hc_on_recv, hc_on_recv, elem); - if (initial_op) hc_mutate_op(elem, initial_op); + grpc_closure_init (&calld->hc_on_recv, hc_on_recv, elem); + if (initial_op) + hc_mutate_op (elem, initial_op); } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element *elem, - grpc_closure_list *closure_list) {} +static void +destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +{ +} -static const char *scheme_from_args(const grpc_channel_args *args) { +static const char * +scheme_from_args (const grpc_channel_args * args) +{ unsigned i; - if (args != NULL) { - for (i = 0; i < args->num_args; ++i) { - if (args->args[i].type == GRPC_ARG_STRING && - strcmp(args->args[i].key, GRPC_ARG_HTTP2_SCHEME) == 0) { - return args->args[i].value.string; - } + if (args != NULL) + { + for (i = 0; i < args->num_args; ++i) + { + if (args->args[i].type == GRPC_ARG_STRING && strcmp (args->args[i].key, GRPC_ARG_HTTP2_SCHEME) == 0) + { + return args->args[i].value.string; + } + } } - } return "http"; } -static grpc_mdstr *user_agent_from_args(grpc_mdctx *mdctx, - const grpc_channel_args *args) { +static grpc_mdstr * +user_agent_from_args (grpc_mdctx * mdctx, const grpc_channel_args * args) +{ gpr_strvec v; size_t i; int is_first = 1; char *tmp; grpc_mdstr *result; - gpr_strvec_init(&v); + gpr_strvec_init (&v); - for (i = 0; args && i < args->num_args; i++) { - if (0 == strcmp(args->args[i].key, GRPC_ARG_PRIMARY_USER_AGENT_STRING)) { - if (args->args[i].type != GRPC_ARG_STRING) { - gpr_log(GPR_ERROR, "Channel argument '%s' should be a string", - GRPC_ARG_PRIMARY_USER_AGENT_STRING); - } else { - if (!is_first) gpr_strvec_add(&v, gpr_strdup(" ")); - is_first = 0; - gpr_strvec_add(&v, gpr_strdup(args->args[i].value.string)); - } + for (i = 0; args && i < args->num_args; i++) + { + if (0 == strcmp (args->args[i].key, GRPC_ARG_PRIMARY_USER_AGENT_STRING)) + { + if (args->args[i].type != GRPC_ARG_STRING) + { + gpr_log (GPR_ERROR, "Channel argument '%s' should be a string", GRPC_ARG_PRIMARY_USER_AGENT_STRING); + } + else + { + if (!is_first) + gpr_strvec_add (&v, gpr_strdup (" ")); + is_first = 0; + gpr_strvec_add (&v, gpr_strdup (args->args[i].value.string)); + } + } } - } - gpr_asprintf(&tmp, "%sgrpc-c/%s (%s)", is_first ? "" : " ", - grpc_version_string(), GPR_PLATFORM_STRING); + gpr_asprintf (&tmp, "%sgrpc-c/%s (%s)", is_first ? "" : " ", grpc_version_string (), GPR_PLATFORM_STRING); is_first = 0; - gpr_strvec_add(&v, tmp); + gpr_strvec_add (&v, tmp); - for (i = 0; args && i < args->num_args; i++) { - if (0 == strcmp(args->args[i].key, GRPC_ARG_SECONDARY_USER_AGENT_STRING)) { - if (args->args[i].type != GRPC_ARG_STRING) { - gpr_log(GPR_ERROR, "Channel argument '%s' should be a string", - GRPC_ARG_SECONDARY_USER_AGENT_STRING); - } else { - if (!is_first) gpr_strvec_add(&v, gpr_strdup(" ")); - is_first = 0; - gpr_strvec_add(&v, gpr_strdup(args->args[i].value.string)); - } + for (i = 0; args && i < args->num_args; i++) + { + if (0 == strcmp (args->args[i].key, GRPC_ARG_SECONDARY_USER_AGENT_STRING)) + { + if (args->args[i].type != GRPC_ARG_STRING) + { + gpr_log (GPR_ERROR, "Channel argument '%s' should be a string", GRPC_ARG_SECONDARY_USER_AGENT_STRING); + } + else + { + if (!is_first) + gpr_strvec_add (&v, gpr_strdup (" ")); + is_first = 0; + gpr_strvec_add (&v, gpr_strdup (args->args[i].value.string)); + } + } } - } - tmp = gpr_strvec_flatten(&v, NULL); - gpr_strvec_destroy(&v); - result = grpc_mdstr_from_string(mdctx, tmp, 0); - gpr_free(tmp); + tmp = gpr_strvec_flatten (&v, NULL); + gpr_strvec_destroy (&v); + result = grpc_mdstr_from_string (mdctx, tmp, 0); + gpr_free (tmp); return result; } /* Constructor for channel_data */ -static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, - const grpc_channel_args *channel_args, - grpc_mdctx *mdctx, int is_first, int is_last, - grpc_closure_list *closure_list) { +static void +init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * channel_args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +{ /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; /* The first and the last filters tend to be implemented differently to handle the case that there's no 'next' filter to call on the up or down path */ - GPR_ASSERT(!is_last); + GPR_ASSERT (!is_last); /* initialize members */ - channeld->te_trailers = grpc_mdelem_from_strings(mdctx, "te", "trailers"); - channeld->method = grpc_mdelem_from_strings(mdctx, ":method", "POST"); - channeld->scheme = grpc_mdelem_from_strings(mdctx, ":scheme", - scheme_from_args(channel_args)); - channeld->content_type = - grpc_mdelem_from_strings(mdctx, "content-type", "application/grpc"); - channeld->status = grpc_mdelem_from_strings(mdctx, ":status", "200"); - channeld->user_agent = grpc_mdelem_from_metadata_strings( - mdctx, grpc_mdstr_from_string(mdctx, "user-agent", 0), - user_agent_from_args(mdctx, channel_args)); + channeld->te_trailers = grpc_mdelem_from_strings (mdctx, "te", "trailers"); + channeld->method = grpc_mdelem_from_strings (mdctx, ":method", "POST"); + channeld->scheme = grpc_mdelem_from_strings (mdctx, ":scheme", scheme_from_args (channel_args)); + channeld->content_type = grpc_mdelem_from_strings (mdctx, "content-type", "application/grpc"); + channeld->status = grpc_mdelem_from_strings (mdctx, ":status", "200"); + channeld->user_agent = grpc_mdelem_from_metadata_strings (mdctx, grpc_mdstr_from_string (mdctx, "user-agent", 0), user_agent_from_args (mdctx, channel_args)); } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element *elem, - grpc_closure_list *closure_list) { +static void +destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +{ /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; - GRPC_MDELEM_UNREF(channeld->te_trailers); - GRPC_MDELEM_UNREF(channeld->method); - GRPC_MDELEM_UNREF(channeld->scheme); - GRPC_MDELEM_UNREF(channeld->content_type); - GRPC_MDELEM_UNREF(channeld->status); - GRPC_MDELEM_UNREF(channeld->user_agent); + GRPC_MDELEM_UNREF (channeld->te_trailers); + GRPC_MDELEM_UNREF (channeld->method); + GRPC_MDELEM_UNREF (channeld->scheme); + GRPC_MDELEM_UNREF (channeld->content_type); + GRPC_MDELEM_UNREF (channeld->status); + GRPC_MDELEM_UNREF (channeld->user_agent); } const grpc_channel_filter grpc_http_client_filter = { - hc_start_transport_op, grpc_channel_next_op, sizeof(call_data), - init_call_elem, destroy_call_elem, sizeof(channel_data), - init_channel_elem, destroy_channel_elem, grpc_call_next_get_peer, - "http-client"}; + hc_start_transport_op, grpc_channel_next_op, sizeof (call_data), + init_call_elem, destroy_call_elem, sizeof (channel_data), + init_channel_elem, destroy_channel_elem, grpc_call_next_get_peer, + "http-client" +}; diff --git a/src/core/channel/http_server_filter.c b/src/core/channel/http_server_filter.c index fb1f0b05544..949868b4036 100644 --- a/src/core/channel/http_server_filter.c +++ b/src/core/channel/http_server_filter.c @@ -37,7 +37,8 @@ #include #include -typedef struct call_data { +typedef struct call_data +{ gpr_uint8 got_initial_metadata; gpr_uint8 seen_path; gpr_uint8 seen_post; @@ -57,7 +58,8 @@ typedef struct call_data { grpc_closure hs_on_recv; } call_data; -typedef struct channel_data { +typedef struct channel_data +{ grpc_mdelem *te_trailers; grpc_mdelem *method_post; grpc_mdelem *http_scheme; @@ -74,236 +76,268 @@ typedef struct channel_data { grpc_mdctx *mdctx; } channel_data; -typedef struct { +typedef struct +{ grpc_call_element *elem; grpc_closure_list *closure_list; } server_filter_args; -static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { +static grpc_mdelem * +server_filter (void *user_data, grpc_mdelem * md) +{ server_filter_args *a = user_data; grpc_call_element *elem = a->elem; channel_data *channeld = elem->channel_data; call_data *calld = elem->call_data; /* Check if it is one of the headers we care about. */ - if (md == channeld->te_trailers || md == channeld->method_post || - md == channeld->http_scheme || md == channeld->https_scheme || - md == channeld->grpc_scheme || md == channeld->content_type) { - /* swallow it */ - if (md == channeld->method_post) { - calld->seen_post = 1; - } else if (md->key == channeld->http_scheme->key) { - calld->seen_scheme = 1; - } else if (md == channeld->te_trailers) { - calld->seen_te_trailers = 1; + if (md == channeld->te_trailers || md == channeld->method_post || md == channeld->http_scheme || md == channeld->https_scheme || md == channeld->grpc_scheme || md == channeld->content_type) + { + /* swallow it */ + if (md == channeld->method_post) + { + calld->seen_post = 1; + } + else if (md->key == channeld->http_scheme->key) + { + calld->seen_scheme = 1; + } + else if (md == channeld->te_trailers) + { + calld->seen_te_trailers = 1; + } + /* TODO(klempner): Track that we've seen all the headers we should + require */ + return NULL; } - /* TODO(klempner): Track that we've seen all the headers we should - require */ - return NULL; - } else if (md->key == channeld->content_type->key) { - if (strncmp(grpc_mdstr_as_c_string(md->value), "application/grpc+", 17) == - 0) { - /* Although the C implementation doesn't (currently) generate them, - any custom +-suffix is explicitly valid. */ - /* TODO(klempner): We should consider preallocating common values such - as +proto or +json, or at least stashing them if we see them. */ - /* TODO(klempner): Should we be surfacing this to application code? */ - } else { - /* TODO(klempner): We're currently allowing this, but we shouldn't - see it without a proxy so log for now. */ - gpr_log(GPR_INFO, "Unexpected content-type %s", - channeld->content_type->key); + else if (md->key == channeld->content_type->key) + { + if (strncmp (grpc_mdstr_as_c_string (md->value), "application/grpc+", 17) == 0) + { + /* Although the C implementation doesn't (currently) generate them, + any custom +-suffix is explicitly valid. */ + /* TODO(klempner): We should consider preallocating common values such + as +proto or +json, or at least stashing them if we see them. */ + /* TODO(klempner): Should we be surfacing this to application code? */ + } + else + { + /* TODO(klempner): We're currently allowing this, but we shouldn't + see it without a proxy so log for now. */ + gpr_log (GPR_INFO, "Unexpected content-type %s", channeld->content_type->key); + } + return NULL; } - return NULL; - } else if (md->key == channeld->te_trailers->key || - md->key == channeld->method_post->key || - md->key == channeld->http_scheme->key) { - gpr_log(GPR_ERROR, "Invalid %s: header: '%s'", - grpc_mdstr_as_c_string(md->key), grpc_mdstr_as_c_string(md->value)); - /* swallow it and error everything out. */ - /* TODO(klempner): We ought to generate more descriptive error messages - on the wire here. */ - grpc_call_element_send_cancel(elem, a->closure_list); - return NULL; - } else if (md->key == channeld->path_key) { - if (calld->seen_path) { - gpr_log(GPR_ERROR, "Received :path twice"); + else if (md->key == channeld->te_trailers->key || md->key == channeld->method_post->key || md->key == channeld->http_scheme->key) + { + gpr_log (GPR_ERROR, "Invalid %s: header: '%s'", grpc_mdstr_as_c_string (md->key), grpc_mdstr_as_c_string (md->value)); + /* swallow it and error everything out. */ + /* TODO(klempner): We ought to generate more descriptive error messages + on the wire here. */ + grpc_call_element_send_cancel (elem, a->closure_list); return NULL; } - calld->seen_path = 1; - return md; - } else if (md->key == channeld->authority_key) { - calld->seen_authority = 1; - return md; - } else if (md->key == channeld->host_key) { - /* translate host to :authority since :authority may be - omitted */ - grpc_mdelem *authority = grpc_mdelem_from_metadata_strings( - channeld->mdctx, GRPC_MDSTR_REF(channeld->authority_key), - GRPC_MDSTR_REF(md->value)); - GRPC_MDELEM_UNREF(md); - calld->seen_authority = 1; - return authority; - } else { - return md; - } + else if (md->key == channeld->path_key) + { + if (calld->seen_path) + { + gpr_log (GPR_ERROR, "Received :path twice"); + return NULL; + } + calld->seen_path = 1; + return md; + } + else if (md->key == channeld->authority_key) + { + calld->seen_authority = 1; + return md; + } + else if (md->key == channeld->host_key) + { + /* translate host to :authority since :authority may be + omitted */ + grpc_mdelem *authority = grpc_mdelem_from_metadata_strings (channeld->mdctx, GRPC_MDSTR_REF (channeld->authority_key), + GRPC_MDSTR_REF (md->value)); + GRPC_MDELEM_UNREF (md); + calld->seen_authority = 1; + return authority; + } + else + { + return md; + } } -static void hs_on_recv(void *user_data, int success, - grpc_closure_list *closure_list) { +static void +hs_on_recv (void *user_data, int success, grpc_closure_list * closure_list) +{ grpc_call_element *elem = user_data; call_data *calld = elem->call_data; - if (success) { - size_t i; - size_t nops = calld->recv_ops->nops; - grpc_stream_op *ops = calld->recv_ops->ops; - for (i = 0; i < nops; i++) { - grpc_stream_op *op = &ops[i]; - server_filter_args a; - if (op->type != GRPC_OP_METADATA) continue; - calld->got_initial_metadata = 1; - a.elem = elem; - a.closure_list = closure_list; - grpc_metadata_batch_filter(&op->data.metadata, server_filter, &a); - /* Have we seen the required http2 transport headers? - (:method, :scheme, content-type, with :path and :authority covered - at the channel level right now) */ - if (calld->seen_post && calld->seen_scheme && calld->seen_te_trailers && - calld->seen_path && calld->seen_authority) { - /* do nothing */ - } else { - if (!calld->seen_path) { - gpr_log(GPR_ERROR, "Missing :path header"); - } - if (!calld->seen_authority) { - gpr_log(GPR_ERROR, "Missing :authority header"); - } - if (!calld->seen_post) { - gpr_log(GPR_ERROR, "Missing :method header"); - } - if (!calld->seen_scheme) { - gpr_log(GPR_ERROR, "Missing :scheme header"); - } - if (!calld->seen_te_trailers) { - gpr_log(GPR_ERROR, "Missing te trailers header"); - } - /* Error this call out */ - success = 0; - grpc_call_element_send_cancel(elem, closure_list); - } + if (success) + { + size_t i; + size_t nops = calld->recv_ops->nops; + grpc_stream_op *ops = calld->recv_ops->ops; + for (i = 0; i < nops; i++) + { + grpc_stream_op *op = &ops[i]; + server_filter_args a; + if (op->type != GRPC_OP_METADATA) + continue; + calld->got_initial_metadata = 1; + a.elem = elem; + a.closure_list = closure_list; + grpc_metadata_batch_filter (&op->data.metadata, server_filter, &a); + /* Have we seen the required http2 transport headers? + (:method, :scheme, content-type, with :path and :authority covered + at the channel level right now) */ + if (calld->seen_post && calld->seen_scheme && calld->seen_te_trailers && calld->seen_path && calld->seen_authority) + { + /* do nothing */ + } + else + { + if (!calld->seen_path) + { + gpr_log (GPR_ERROR, "Missing :path header"); + } + if (!calld->seen_authority) + { + gpr_log (GPR_ERROR, "Missing :authority header"); + } + if (!calld->seen_post) + { + gpr_log (GPR_ERROR, "Missing :method header"); + } + if (!calld->seen_scheme) + { + gpr_log (GPR_ERROR, "Missing :scheme header"); + } + if (!calld->seen_te_trailers) + { + gpr_log (GPR_ERROR, "Missing te trailers header"); + } + /* Error this call out */ + success = 0; + grpc_call_element_send_cancel (elem, closure_list); + } + } } - } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, closure_list); + calld->on_done_recv->cb (calld->on_done_recv->cb_arg, success, closure_list); } -static void hs_mutate_op(grpc_call_element *elem, - grpc_transport_stream_op *op) { +static void +hs_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) +{ /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; size_t i; - if (op->send_ops && !calld->sent_status) { - size_t nops = op->send_ops->nops; - grpc_stream_op *ops = op->send_ops->ops; - for (i = 0; i < nops; i++) { - grpc_stream_op *op = &ops[i]; - if (op->type != GRPC_OP_METADATA) continue; - calld->sent_status = 1; - grpc_metadata_batch_add_head(&op->data.metadata, &calld->status, - GRPC_MDELEM_REF(channeld->status_ok)); - grpc_metadata_batch_add_tail(&op->data.metadata, &calld->content_type, - GRPC_MDELEM_REF(channeld->content_type)); - break; + if (op->send_ops && !calld->sent_status) + { + size_t nops = op->send_ops->nops; + grpc_stream_op *ops = op->send_ops->ops; + for (i = 0; i < nops; i++) + { + grpc_stream_op *op = &ops[i]; + if (op->type != GRPC_OP_METADATA) + continue; + calld->sent_status = 1; + grpc_metadata_batch_add_head (&op->data.metadata, &calld->status, GRPC_MDELEM_REF (channeld->status_ok)); + grpc_metadata_batch_add_tail (&op->data.metadata, &calld->content_type, GRPC_MDELEM_REF (channeld->content_type)); + break; + } } - } - if (op->recv_ops && !calld->got_initial_metadata) { - /* substitute our callback for the higher callback */ - calld->recv_ops = op->recv_ops; - calld->on_done_recv = op->on_done_recv; - op->on_done_recv = &calld->hs_on_recv; - } + if (op->recv_ops && !calld->got_initial_metadata) + { + /* substitute our callback for the higher callback */ + calld->recv_ops = op->recv_ops; + calld->on_done_recv = op->on_done_recv; + op->on_done_recv = &calld->hs_on_recv; + } } -static void hs_start_transport_op(grpc_call_element *elem, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { - GRPC_CALL_LOG_OP(GPR_INFO, elem, op); - hs_mutate_op(elem, op); - grpc_call_next_op(elem, op, closure_list); +static void +hs_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + GRPC_CALL_LOG_OP (GPR_INFO, elem, op); + hs_mutate_op (elem, op); + grpc_call_next_op (elem, op, closure_list); } /* Constructor for call_data */ -static void init_call_elem(grpc_call_element *elem, - const void *server_transport_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list) { +static void +init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; /* initialize members */ - memset(calld, 0, sizeof(*calld)); - grpc_closure_init(&calld->hs_on_recv, hs_on_recv, elem); - if (initial_op) hs_mutate_op(elem, initial_op); + memset (calld, 0, sizeof (*calld)); + grpc_closure_init (&calld->hs_on_recv, hs_on_recv, elem); + if (initial_op) + hs_mutate_op (elem, initial_op); } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element *elem, - grpc_closure_list *closure_list) {} +static void +destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +{ +} /* Constructor for channel_data */ -static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, - const grpc_channel_args *args, grpc_mdctx *mdctx, - int is_first, int is_last, - grpc_closure_list *closure_list) { +static void +init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +{ /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; /* The first and the last filters tend to be implemented differently to handle the case that there's no 'next' filter to call on the up or down path */ - GPR_ASSERT(!is_first); - GPR_ASSERT(!is_last); + GPR_ASSERT (!is_first); + GPR_ASSERT (!is_last); /* initialize members */ - channeld->te_trailers = grpc_mdelem_from_strings(mdctx, "te", "trailers"); - channeld->status_ok = grpc_mdelem_from_strings(mdctx, ":status", "200"); - channeld->status_not_found = - grpc_mdelem_from_strings(mdctx, ":status", "404"); - channeld->method_post = grpc_mdelem_from_strings(mdctx, ":method", "POST"); - channeld->http_scheme = grpc_mdelem_from_strings(mdctx, ":scheme", "http"); - channeld->https_scheme = grpc_mdelem_from_strings(mdctx, ":scheme", "https"); - channeld->grpc_scheme = grpc_mdelem_from_strings(mdctx, ":scheme", "grpc"); - channeld->path_key = grpc_mdstr_from_string(mdctx, ":path", 0); - channeld->authority_key = grpc_mdstr_from_string(mdctx, ":authority", 0); - channeld->host_key = grpc_mdstr_from_string(mdctx, "host", 0); - channeld->content_type = - grpc_mdelem_from_strings(mdctx, "content-type", "application/grpc"); + channeld->te_trailers = grpc_mdelem_from_strings (mdctx, "te", "trailers"); + channeld->status_ok = grpc_mdelem_from_strings (mdctx, ":status", "200"); + channeld->status_not_found = grpc_mdelem_from_strings (mdctx, ":status", "404"); + channeld->method_post = grpc_mdelem_from_strings (mdctx, ":method", "POST"); + channeld->http_scheme = grpc_mdelem_from_strings (mdctx, ":scheme", "http"); + channeld->https_scheme = grpc_mdelem_from_strings (mdctx, ":scheme", "https"); + channeld->grpc_scheme = grpc_mdelem_from_strings (mdctx, ":scheme", "grpc"); + channeld->path_key = grpc_mdstr_from_string (mdctx, ":path", 0); + channeld->authority_key = grpc_mdstr_from_string (mdctx, ":authority", 0); + channeld->host_key = grpc_mdstr_from_string (mdctx, "host", 0); + channeld->content_type = grpc_mdelem_from_strings (mdctx, "content-type", "application/grpc"); channeld->mdctx = mdctx; } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element *elem, - grpc_closure_list *closure_list) { +static void +destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +{ /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; - GRPC_MDELEM_UNREF(channeld->te_trailers); - GRPC_MDELEM_UNREF(channeld->status_ok); - GRPC_MDELEM_UNREF(channeld->status_not_found); - GRPC_MDELEM_UNREF(channeld->method_post); - GRPC_MDELEM_UNREF(channeld->http_scheme); - GRPC_MDELEM_UNREF(channeld->https_scheme); - GRPC_MDELEM_UNREF(channeld->grpc_scheme); - GRPC_MDELEM_UNREF(channeld->content_type); - GRPC_MDSTR_UNREF(channeld->path_key); - GRPC_MDSTR_UNREF(channeld->authority_key); - GRPC_MDSTR_UNREF(channeld->host_key); + GRPC_MDELEM_UNREF (channeld->te_trailers); + GRPC_MDELEM_UNREF (channeld->status_ok); + GRPC_MDELEM_UNREF (channeld->status_not_found); + GRPC_MDELEM_UNREF (channeld->method_post); + GRPC_MDELEM_UNREF (channeld->http_scheme); + GRPC_MDELEM_UNREF (channeld->https_scheme); + GRPC_MDELEM_UNREF (channeld->grpc_scheme); + GRPC_MDELEM_UNREF (channeld->content_type); + GRPC_MDSTR_UNREF (channeld->path_key); + GRPC_MDSTR_UNREF (channeld->authority_key); + GRPC_MDSTR_UNREF (channeld->host_key); } const grpc_channel_filter grpc_http_server_filter = { - hs_start_transport_op, grpc_channel_next_op, sizeof(call_data), - init_call_elem, destroy_call_elem, sizeof(channel_data), - init_channel_elem, destroy_channel_elem, grpc_call_next_get_peer, - "http-server"}; + hs_start_transport_op, grpc_channel_next_op, sizeof (call_data), + init_call_elem, destroy_call_elem, sizeof (channel_data), + init_channel_elem, destroy_channel_elem, grpc_call_next_get_peer, + "http-server" +}; diff --git a/src/core/channel/noop_filter.c b/src/core/channel/noop_filter.c index e4f6c7f8375..a93497c5092 100644 --- a/src/core/channel/noop_filter.c +++ b/src/core/channel/noop_filter.c @@ -34,25 +34,31 @@ #include "src/core/channel/noop_filter.h" #include -typedef struct call_data { - int unused; /* C89 requires at least one struct element */ +typedef struct call_data +{ + int unused; /* C89 requires at least one struct element */ } call_data; -typedef struct channel_data { - int unused; /* C89 requires at least one struct element */ +typedef struct channel_data +{ + int unused; /* C89 requires at least one struct element */ } channel_data; /* used to silence 'variable not used' warnings */ -static void ignore_unused(void *ignored) {} +static void +ignore_unused (void *ignored) +{ +} -static void noop_mutate_op(grpc_call_element *elem, - grpc_transport_stream_op *op) { +static void +noop_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) +{ /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; - ignore_unused(calld); - ignore_unused(channeld); + ignore_unused (calld); + ignore_unused (channeld); /* do nothing */ } @@ -62,20 +68,19 @@ static void noop_mutate_op(grpc_call_element *elem, - a network event (or similar) from below, to receive something op contains type and call direction information, in addition to the data that is being sent or received. */ -static void noop_start_transport_stream_op(grpc_call_element *elem, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { - noop_mutate_op(elem, op); +static void +noop_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + noop_mutate_op (elem, op); /* pass control down the stack */ - grpc_call_next_op(elem, op, closure_list); + grpc_call_next_op (elem, op, closure_list); } /* Constructor for call_data */ -static void init_call_elem(grpc_call_element *elem, - const void *server_transport_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list) { +static void +init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; @@ -83,47 +88,51 @@ static void init_call_elem(grpc_call_element *elem, /* initialize members */ calld->unused = channeld->unused; - if (initial_op) noop_mutate_op(elem, initial_op); + if (initial_op) + noop_mutate_op (elem, initial_op); } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element *elem, - grpc_closure_list *closure_list) {} +static void +destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +{ +} /* Constructor for channel_data */ -static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, - const grpc_channel_args *args, grpc_mdctx *mdctx, - int is_first, int is_last, - grpc_closure_list *closure_list) { +static void +init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +{ /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; /* The first and the last filters tend to be implemented differently to handle the case that there's no 'next' filter to call on the up or down path */ - GPR_ASSERT(!is_first); - GPR_ASSERT(!is_last); + GPR_ASSERT (!is_first); + GPR_ASSERT (!is_last); /* initialize members */ channeld->unused = 0; } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element *elem, - grpc_closure_list *closure_list) { +static void +destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +{ /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; - ignore_unused(channeld); + ignore_unused (channeld); } -const grpc_channel_filter grpc_no_op_filter = {noop_start_transport_stream_op, - grpc_channel_next_op, - sizeof(call_data), - init_call_elem, - destroy_call_elem, - sizeof(channel_data), - init_channel_elem, - destroy_channel_elem, - grpc_call_next_get_peer, - "no-op"}; +const grpc_channel_filter grpc_no_op_filter = { noop_start_transport_stream_op, + grpc_channel_next_op, + sizeof (call_data), + init_call_elem, + destroy_call_elem, + sizeof (channel_data), + init_channel_elem, + destroy_channel_elem, + grpc_call_next_get_peer, + "no-op" +}; diff --git a/src/core/client_config/client_config.c b/src/core/client_config/client_config.c index 636ab6d1da3..69d52be70ba 100644 --- a/src/core/client_config/client_config.c +++ b/src/core/client_config/client_config.c @@ -37,37 +37,50 @@ #include -struct grpc_client_config { +struct grpc_client_config +{ gpr_refcount refs; grpc_lb_policy *lb_policy; }; -grpc_client_config *grpc_client_config_create() { - grpc_client_config *c = gpr_malloc(sizeof(*c)); - memset(c, 0, sizeof(*c)); - gpr_ref_init(&c->refs, 1); +grpc_client_config * +grpc_client_config_create () +{ + grpc_client_config *c = gpr_malloc (sizeof (*c)); + memset (c, 0, sizeof (*c)); + gpr_ref_init (&c->refs, 1); return c; } -void grpc_client_config_ref(grpc_client_config *c) { gpr_ref(&c->refs); } +void +grpc_client_config_ref (grpc_client_config * c) +{ + gpr_ref (&c->refs); +} -void grpc_client_config_unref(grpc_client_config *c, - grpc_closure_list *closure_list) { - if (gpr_unref(&c->refs)) { - GRPC_LB_POLICY_UNREF(c->lb_policy, "client_config", closure_list); - gpr_free(c); - } +void +grpc_client_config_unref (grpc_client_config * c, grpc_closure_list * closure_list) +{ + if (gpr_unref (&c->refs)) + { + GRPC_LB_POLICY_UNREF (c->lb_policy, "client_config", closure_list); + gpr_free (c); + } } -void grpc_client_config_set_lb_policy(grpc_client_config *c, - grpc_lb_policy *lb_policy) { - GPR_ASSERT(c->lb_policy == NULL); - if (lb_policy) { - GRPC_LB_POLICY_REF(lb_policy, "client_config"); - } +void +grpc_client_config_set_lb_policy (grpc_client_config * c, grpc_lb_policy * lb_policy) +{ + GPR_ASSERT (c->lb_policy == NULL); + if (lb_policy) + { + GRPC_LB_POLICY_REF (lb_policy, "client_config"); + } c->lb_policy = lb_policy; } -grpc_lb_policy *grpc_client_config_get_lb_policy(grpc_client_config *c) { +grpc_lb_policy * +grpc_client_config_get_lb_policy (grpc_client_config * c) +{ return c->lb_policy; } diff --git a/src/core/client_config/client_config.h b/src/core/client_config/client_config.h index 8281dbe662f..49585a1c62b 100644 --- a/src/core/client_config/client_config.h +++ b/src/core/client_config/client_config.h @@ -40,14 +40,11 @@ grpc_resolver */ typedef struct grpc_client_config grpc_client_config; -grpc_client_config *grpc_client_config_create(); -void grpc_client_config_ref(grpc_client_config *client_config); -void grpc_client_config_unref(grpc_client_config *client_config, - grpc_closure_list *closure_list); +grpc_client_config *grpc_client_config_create (); +void grpc_client_config_ref (grpc_client_config * client_config); +void grpc_client_config_unref (grpc_client_config * client_config, grpc_closure_list * closure_list); -void grpc_client_config_set_lb_policy(grpc_client_config *client_config, - grpc_lb_policy *lb_policy); -grpc_lb_policy *grpc_client_config_get_lb_policy( - grpc_client_config *client_config); +void grpc_client_config_set_lb_policy (grpc_client_config * client_config, grpc_lb_policy * lb_policy); +grpc_lb_policy *grpc_client_config_get_lb_policy (grpc_client_config * client_config); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_CLIENT_CONFIG_H */ diff --git a/src/core/client_config/connector.c b/src/core/client_config/connector.c index 39581b00fc9..2f50ce36fef 100644 --- a/src/core/client_config/connector.c +++ b/src/core/client_config/connector.c @@ -33,25 +33,26 @@ #include "src/core/client_config/connector.h" -void grpc_connector_ref(grpc_connector *connector) { - connector->vtable->ref(connector); +void +grpc_connector_ref (grpc_connector * connector) +{ + connector->vtable->ref (connector); } -void grpc_connector_unref(grpc_connector *connector, - grpc_closure_list *closure_list) { - connector->vtable->unref(connector, closure_list); +void +grpc_connector_unref (grpc_connector * connector, grpc_closure_list * closure_list) +{ + connector->vtable->unref (connector, closure_list); } -void grpc_connector_connect(grpc_connector *connector, - const grpc_connect_in_args *in_args, - grpc_connect_out_args *out_args, - grpc_closure *notify, - grpc_closure_list *closure_list) { - connector->vtable->connect(connector, in_args, out_args, notify, - closure_list); +void +grpc_connector_connect (grpc_connector * connector, const grpc_connect_in_args * in_args, grpc_connect_out_args * out_args, grpc_closure * notify, grpc_closure_list * closure_list) +{ + connector->vtable->connect (connector, in_args, out_args, notify, closure_list); } -void grpc_connector_shutdown(grpc_connector *connector, - grpc_closure_list *closure_list) { - connector->vtable->shutdown(connector, closure_list); +void +grpc_connector_shutdown (grpc_connector * connector, grpc_closure_list * closure_list) +{ + connector->vtable->shutdown (connector, closure_list); } diff --git a/src/core/client_config/connector.h b/src/core/client_config/connector.h index fd46392dd87..12df36c08ea 100644 --- a/src/core/client_config/connector.h +++ b/src/core/client_config/connector.h @@ -41,11 +41,13 @@ typedef struct grpc_connector grpc_connector; typedef struct grpc_connector_vtable grpc_connector_vtable; -struct grpc_connector { +struct grpc_connector +{ const grpc_connector_vtable *vtable; }; -typedef struct { +typedef struct +{ /** set of pollsets interested in this connection */ grpc_pollset_set *interested_parties; /** address to connect to */ @@ -57,7 +59,8 @@ typedef struct { const grpc_channel_args *channel_args; } grpc_connect_in_args; -typedef struct { +typedef struct +{ /** the connected transport */ grpc_transport *transport; /** any additional filters (owned by the caller of connect) */ @@ -65,29 +68,21 @@ typedef struct { size_t num_filters; } grpc_connect_out_args; -struct grpc_connector_vtable { - void (*ref)(grpc_connector *connector); - void (*unref)(grpc_connector *connector, grpc_closure_list *closure_list); +struct grpc_connector_vtable +{ + void (*ref) (grpc_connector * connector); + void (*unref) (grpc_connector * connector, grpc_closure_list * closure_list); /** Implementation of grpc_connector_shutdown */ - void (*shutdown)(grpc_connector *connector, grpc_closure_list *closure_list); + void (*shutdown) (grpc_connector * connector, grpc_closure_list * closure_list); /** Implementation of grpc_connector_connect */ - void (*connect)(grpc_connector *connector, - const grpc_connect_in_args *in_args, - grpc_connect_out_args *out_args, grpc_closure *notify, - grpc_closure_list *closure_list); + void (*connect) (grpc_connector * connector, const grpc_connect_in_args * in_args, grpc_connect_out_args * out_args, grpc_closure * notify, grpc_closure_list * closure_list); }; -void grpc_connector_ref(grpc_connector *connector); -void grpc_connector_unref(grpc_connector *connector, - grpc_closure_list *closure_list); +void grpc_connector_ref (grpc_connector * connector); +void grpc_connector_unref (grpc_connector * connector, grpc_closure_list * closure_list); /** Connect using the connector: max one outstanding call at a time */ -void grpc_connector_connect(grpc_connector *connector, - const grpc_connect_in_args *in_args, - grpc_connect_out_args *out_args, - grpc_closure *notify, - grpc_closure_list *closure_list); +void grpc_connector_connect (grpc_connector * connector, const grpc_connect_in_args * in_args, grpc_connect_out_args * out_args, grpc_closure * notify, grpc_closure_list * closure_list); /** Cancel any pending connection */ -void grpc_connector_shutdown(grpc_connector *connector, - grpc_closure_list *closure_list); +void grpc_connector_shutdown (grpc_connector * connector, grpc_closure_list * closure_list); #endif diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index 7557053711a..b8991dfaa7f 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -39,14 +39,16 @@ #include #include "src/core/transport/connectivity_state.h" -typedef struct pending_pick { +typedef struct pending_pick +{ struct pending_pick *next; grpc_pollset *pollset; grpc_subchannel **target; grpc_closure *on_complete; } pending_pick; -typedef struct { +typedef struct +{ /** base policy: must be first */ grpc_lb_policy base; /** all our subchannels */ @@ -76,286 +78,303 @@ typedef struct { grpc_connectivity_state_tracker state_tracker; } pick_first_lb_policy; -static void del_interested_parties_locked(pick_first_lb_policy *p, - grpc_closure_list *closure_list) { +static void +del_interested_parties_locked (pick_first_lb_policy * p, grpc_closure_list * closure_list) +{ pending_pick *pp; - for (pp = p->pending_picks; pp; pp = pp->next) { - grpc_subchannel_del_interested_party(p->subchannels[p->checking_subchannel], - pp->pollset, closure_list); - } + for (pp = p->pending_picks; pp; pp = pp->next) + { + grpc_subchannel_del_interested_party (p->subchannels[p->checking_subchannel], pp->pollset, closure_list); + } } -static void add_interested_parties_locked(pick_first_lb_policy *p, - grpc_closure_list *closure_list) { +static void +add_interested_parties_locked (pick_first_lb_policy * p, grpc_closure_list * closure_list) +{ pending_pick *pp; - for (pp = p->pending_picks; pp; pp = pp->next) { - grpc_subchannel_add_interested_party(p->subchannels[p->checking_subchannel], - pp->pollset, closure_list); - } + for (pp = p->pending_picks; pp; pp = pp->next) + { + grpc_subchannel_add_interested_party (p->subchannels[p->checking_subchannel], pp->pollset, closure_list); + } } -void pf_destroy(grpc_lb_policy *pol, grpc_closure_list *closure_list) { - pick_first_lb_policy *p = (pick_first_lb_policy *)pol; +void +pf_destroy (grpc_lb_policy * pol, grpc_closure_list * closure_list) +{ + pick_first_lb_policy *p = (pick_first_lb_policy *) pol; size_t i; - GPR_ASSERT(p->pending_picks == NULL); - for (i = 0; i < p->num_subchannels; i++) { - GRPC_SUBCHANNEL_UNREF(p->subchannels[i], "pick_first", closure_list); - } - grpc_connectivity_state_destroy(&p->state_tracker, closure_list); - gpr_free(p->subchannels); - gpr_mu_destroy(&p->mu); - gpr_free(p); + GPR_ASSERT (p->pending_picks == NULL); + for (i = 0; i < p->num_subchannels; i++) + { + GRPC_SUBCHANNEL_UNREF (p->subchannels[i], "pick_first", closure_list); + } + grpc_connectivity_state_destroy (&p->state_tracker, closure_list); + gpr_free (p->subchannels); + gpr_mu_destroy (&p->mu); + gpr_free (p); } -void pf_shutdown(grpc_lb_policy *pol, grpc_closure_list *closure_list) { - pick_first_lb_policy *p = (pick_first_lb_policy *)pol; +void +pf_shutdown (grpc_lb_policy * pol, grpc_closure_list * closure_list) +{ + pick_first_lb_policy *p = (pick_first_lb_policy *) pol; pending_pick *pp; - gpr_mu_lock(&p->mu); - del_interested_parties_locked(p, closure_list); + gpr_mu_lock (&p->mu); + del_interested_parties_locked (p, closure_list); p->shutdown = 1; pp = p->pending_picks; p->pending_picks = NULL; - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, - "shutdown", closure_list); - gpr_mu_unlock(&p->mu); - while (pp != NULL) { - pending_pick *next = pp->next; - *pp->target = NULL; - grpc_closure_list_add(closure_list, pp->on_complete, 1); - gpr_free(pp); - pp = next; - } + grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "shutdown", closure_list); + gpr_mu_unlock (&p->mu); + while (pp != NULL) + { + pending_pick *next = pp->next; + *pp->target = NULL; + grpc_closure_list_add (closure_list, pp->on_complete, 1); + gpr_free (pp); + pp = next; + } } -static void start_picking(pick_first_lb_policy *p, - grpc_closure_list *closure_list) { +static void +start_picking (pick_first_lb_policy * p, grpc_closure_list * closure_list) +{ p->started_picking = 1; p->checking_subchannel = 0; p->checking_connectivity = GRPC_CHANNEL_IDLE; - GRPC_LB_POLICY_REF(&p->base, "pick_first_connectivity"); - grpc_subchannel_notify_on_state_change( - p->subchannels[p->checking_subchannel], &p->checking_connectivity, - &p->connectivity_changed, closure_list); + GRPC_LB_POLICY_REF (&p->base, "pick_first_connectivity"); + grpc_subchannel_notify_on_state_change (p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed, closure_list); } -void pf_exit_idle(grpc_lb_policy *pol, grpc_closure_list *closure_list) { - pick_first_lb_policy *p = (pick_first_lb_policy *)pol; - gpr_mu_lock(&p->mu); - if (!p->started_picking) { - start_picking(p, closure_list); - } - gpr_mu_unlock(&p->mu); +void +pf_exit_idle (grpc_lb_policy * pol, grpc_closure_list * closure_list) +{ + pick_first_lb_policy *p = (pick_first_lb_policy *) pol; + gpr_mu_lock (&p->mu); + if (!p->started_picking) + { + start_picking (p, closure_list); + } + gpr_mu_unlock (&p->mu); } -void pf_pick(grpc_lb_policy *pol, grpc_pollset *pollset, - grpc_metadata_batch *initial_metadata, grpc_subchannel **target, - grpc_closure *on_complete, grpc_closure_list *closure_list) { - pick_first_lb_policy *p = (pick_first_lb_policy *)pol; +void +pf_pick (grpc_lb_policy * pol, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete, grpc_closure_list * closure_list) +{ + pick_first_lb_policy *p = (pick_first_lb_policy *) pol; pending_pick *pp; - gpr_mu_lock(&p->mu); - if (p->selected) { - gpr_mu_unlock(&p->mu); - *target = p->selected; - grpc_closure_list_add(closure_list, on_complete, 1); - } else { - if (!p->started_picking) { - start_picking(p, closure_list); + gpr_mu_lock (&p->mu); + if (p->selected) + { + gpr_mu_unlock (&p->mu); + *target = p->selected; + grpc_closure_list_add (closure_list, on_complete, 1); + } + else + { + if (!p->started_picking) + { + start_picking (p, closure_list); + } + grpc_subchannel_add_interested_party (p->subchannels[p->checking_subchannel], pollset, closure_list); + pp = gpr_malloc (sizeof (*pp)); + pp->next = p->pending_picks; + pp->pollset = pollset; + pp->target = target; + pp->on_complete = on_complete; + p->pending_picks = pp; + gpr_mu_unlock (&p->mu); } - grpc_subchannel_add_interested_party(p->subchannels[p->checking_subchannel], - pollset, closure_list); - pp = gpr_malloc(sizeof(*pp)); - pp->next = p->pending_picks; - pp->pollset = pollset; - pp->target = target; - pp->on_complete = on_complete; - p->pending_picks = pp; - gpr_mu_unlock(&p->mu); - } } -static void pf_connectivity_changed(void *arg, int iomgr_success, - grpc_closure_list *closure_list) { +static void +pf_connectivity_changed (void *arg, int iomgr_success, grpc_closure_list * closure_list) +{ pick_first_lb_policy *p = arg; pending_pick *pp; - gpr_mu_lock(&p->mu); + gpr_mu_lock (&p->mu); - if (p->shutdown) { - gpr_mu_unlock(&p->mu); - GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity", closure_list); - return; - } else if (p->selected != NULL) { - grpc_connectivity_state_set(&p->state_tracker, p->checking_connectivity, - "selected_changed", closure_list); - if (p->checking_connectivity != GRPC_CHANNEL_FATAL_FAILURE) { - grpc_subchannel_notify_on_state_change( - p->selected, &p->checking_connectivity, &p->connectivity_changed, - closure_list); - } else { - GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity", closure_list); + if (p->shutdown) + { + gpr_mu_unlock (&p->mu); + GRPC_LB_POLICY_UNREF (&p->base, "pick_first_connectivity", closure_list); + return; } - } else { - loop: - switch (p->checking_connectivity) { - case GRPC_CHANNEL_READY: - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_READY, - "connecting_ready", closure_list); - p->selected = p->subchannels[p->checking_subchannel]; - while ((pp = p->pending_picks)) { - p->pending_picks = pp->next; - *pp->target = p->selected; - grpc_subchannel_del_interested_party(p->selected, pp->pollset, - closure_list); - grpc_closure_list_add(closure_list, pp->on_complete, 1); - gpr_free(pp); - } - grpc_subchannel_notify_on_state_change( - p->selected, &p->checking_connectivity, &p->connectivity_changed, - closure_list); - break; - case GRPC_CHANNEL_TRANSIENT_FAILURE: - grpc_connectivity_state_set( - &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, - "connecting_transient_failure", closure_list); - del_interested_parties_locked(p, closure_list); - p->checking_subchannel = - (p->checking_subchannel + 1) % p->num_subchannels; - p->checking_connectivity = grpc_subchannel_check_connectivity( - p->subchannels[p->checking_subchannel]); - add_interested_parties_locked(p, closure_list); - if (p->checking_connectivity == GRPC_CHANNEL_TRANSIENT_FAILURE) { - grpc_subchannel_notify_on_state_change( - p->subchannels[p->checking_subchannel], &p->checking_connectivity, - &p->connectivity_changed, closure_list); - } else { - goto loop; - } - break; - case GRPC_CHANNEL_CONNECTING: - case GRPC_CHANNEL_IDLE: - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_CONNECTING, - "connecting_changed", closure_list); - grpc_subchannel_notify_on_state_change( - p->subchannels[p->checking_subchannel], &p->checking_connectivity, - &p->connectivity_changed, closure_list); - break; - case GRPC_CHANNEL_FATAL_FAILURE: - del_interested_parties_locked(p, closure_list); - GPR_SWAP(grpc_subchannel *, p->subchannels[p->checking_subchannel], - p->subchannels[p->num_subchannels - 1]); - p->num_subchannels--; - GRPC_SUBCHANNEL_UNREF(p->subchannels[p->num_subchannels], "pick_first", - closure_list); - if (p->num_subchannels == 0) { - grpc_connectivity_state_set(&p->state_tracker, - GRPC_CHANNEL_FATAL_FAILURE, - "no_more_channels", closure_list); - while ((pp = p->pending_picks)) { - p->pending_picks = pp->next; - *pp->target = NULL; - grpc_closure_list_add(closure_list, pp->on_complete, 1); - gpr_free(pp); - } - GRPC_LB_POLICY_UNREF(&p->base, "pick_first_connectivity", - closure_list); - } else { - grpc_connectivity_state_set(&p->state_tracker, - GRPC_CHANNEL_TRANSIENT_FAILURE, - "subchannel_failed", closure_list); - p->checking_subchannel %= p->num_subchannels; - p->checking_connectivity = grpc_subchannel_check_connectivity( - p->subchannels[p->checking_subchannel]); - add_interested_parties_locked(p, closure_list); - goto loop; - } + else if (p->selected != NULL) + { + grpc_connectivity_state_set (&p->state_tracker, p->checking_connectivity, "selected_changed", closure_list); + if (p->checking_connectivity != GRPC_CHANNEL_FATAL_FAILURE) + { + grpc_subchannel_notify_on_state_change (p->selected, &p->checking_connectivity, &p->connectivity_changed, closure_list); + } + else + { + GRPC_LB_POLICY_UNREF (&p->base, "pick_first_connectivity", closure_list); + } + } + else + { + loop: + switch (p->checking_connectivity) + { + case GRPC_CHANNEL_READY: + grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_READY, "connecting_ready", closure_list); + p->selected = p->subchannels[p->checking_subchannel]; + while ((pp = p->pending_picks)) + { + p->pending_picks = pp->next; + *pp->target = p->selected; + grpc_subchannel_del_interested_party (p->selected, pp->pollset, closure_list); + grpc_closure_list_add (closure_list, pp->on_complete, 1); + gpr_free (pp); + } + grpc_subchannel_notify_on_state_change (p->selected, &p->checking_connectivity, &p->connectivity_changed, closure_list); + break; + case GRPC_CHANNEL_TRANSIENT_FAILURE: + grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "connecting_transient_failure", closure_list); + del_interested_parties_locked (p, closure_list); + p->checking_subchannel = (p->checking_subchannel + 1) % p->num_subchannels; + p->checking_connectivity = grpc_subchannel_check_connectivity (p->subchannels[p->checking_subchannel]); + add_interested_parties_locked (p, closure_list); + if (p->checking_connectivity == GRPC_CHANNEL_TRANSIENT_FAILURE) + { + grpc_subchannel_notify_on_state_change (p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed, closure_list); + } + else + { + goto loop; + } + break; + case GRPC_CHANNEL_CONNECTING: + case GRPC_CHANNEL_IDLE: + grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_CONNECTING, "connecting_changed", closure_list); + grpc_subchannel_notify_on_state_change (p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed, closure_list); + break; + case GRPC_CHANNEL_FATAL_FAILURE: + del_interested_parties_locked (p, closure_list); + GPR_SWAP (grpc_subchannel *, p->subchannels[p->checking_subchannel], p->subchannels[p->num_subchannels - 1]); + p->num_subchannels--; + GRPC_SUBCHANNEL_UNREF (p->subchannels[p->num_subchannels], "pick_first", closure_list); + if (p->num_subchannels == 0) + { + grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "no_more_channels", closure_list); + while ((pp = p->pending_picks)) + { + p->pending_picks = pp->next; + *pp->target = NULL; + grpc_closure_list_add (closure_list, pp->on_complete, 1); + gpr_free (pp); + } + GRPC_LB_POLICY_UNREF (&p->base, "pick_first_connectivity", closure_list); + } + else + { + grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "subchannel_failed", closure_list); + p->checking_subchannel %= p->num_subchannels; + p->checking_connectivity = grpc_subchannel_check_connectivity (p->subchannels[p->checking_subchannel]); + add_interested_parties_locked (p, closure_list); + goto loop; + } + } } - } - gpr_mu_unlock(&p->mu); + gpr_mu_unlock (&p->mu); } -static void pf_broadcast(grpc_lb_policy *pol, grpc_transport_op *op, - grpc_closure_list *closure_list) { - pick_first_lb_policy *p = (pick_first_lb_policy *)pol; +static void +pf_broadcast (grpc_lb_policy * pol, grpc_transport_op * op, grpc_closure_list * closure_list) +{ + pick_first_lb_policy *p = (pick_first_lb_policy *) pol; size_t i; size_t n; grpc_subchannel **subchannels; - gpr_mu_lock(&p->mu); + gpr_mu_lock (&p->mu); n = p->num_subchannels; - subchannels = gpr_malloc(n * sizeof(*subchannels)); - for (i = 0; i < n; i++) { - subchannels[i] = p->subchannels[i]; - GRPC_SUBCHANNEL_REF(subchannels[i], "pf_broadcast"); - } - gpr_mu_unlock(&p->mu); + subchannels = gpr_malloc (n * sizeof (*subchannels)); + for (i = 0; i < n; i++) + { + subchannels[i] = p->subchannels[i]; + GRPC_SUBCHANNEL_REF (subchannels[i], "pf_broadcast"); + } + gpr_mu_unlock (&p->mu); - for (i = 0; i < n; i++) { - grpc_subchannel_process_transport_op(subchannels[i], op, closure_list); - GRPC_SUBCHANNEL_UNREF(subchannels[i], "pf_broadcast", closure_list); - } - gpr_free(subchannels); + for (i = 0; i < n; i++) + { + grpc_subchannel_process_transport_op (subchannels[i], op, closure_list); + GRPC_SUBCHANNEL_UNREF (subchannels[i], "pf_broadcast", closure_list); + } + gpr_free (subchannels); } -static grpc_connectivity_state pf_check_connectivity( - grpc_lb_policy *pol, grpc_closure_list *closure_list) { - pick_first_lb_policy *p = (pick_first_lb_policy *)pol; +static grpc_connectivity_state +pf_check_connectivity (grpc_lb_policy * pol, grpc_closure_list * closure_list) +{ + pick_first_lb_policy *p = (pick_first_lb_policy *) pol; grpc_connectivity_state st; - gpr_mu_lock(&p->mu); - st = grpc_connectivity_state_check(&p->state_tracker); - gpr_mu_unlock(&p->mu); + gpr_mu_lock (&p->mu); + st = grpc_connectivity_state_check (&p->state_tracker); + gpr_mu_unlock (&p->mu); return st; } -void pf_notify_on_state_change(grpc_lb_policy *pol, - grpc_connectivity_state *current, - grpc_closure *notify, - grpc_closure_list *closure_list) { - pick_first_lb_policy *p = (pick_first_lb_policy *)pol; - gpr_mu_lock(&p->mu); - grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, - notify, closure_list); - gpr_mu_unlock(&p->mu); +void +pf_notify_on_state_change (grpc_lb_policy * pol, grpc_connectivity_state * current, grpc_closure * notify, grpc_closure_list * closure_list) +{ + pick_first_lb_policy *p = (pick_first_lb_policy *) pol; + gpr_mu_lock (&p->mu); + grpc_connectivity_state_notify_on_state_change (&p->state_tracker, current, notify, closure_list); + gpr_mu_unlock (&p->mu); } static const grpc_lb_policy_vtable pick_first_lb_policy_vtable = { - pf_destroy, - pf_shutdown, - pf_pick, - pf_exit_idle, - pf_broadcast, - pf_check_connectivity, - pf_notify_on_state_change}; + pf_destroy, + pf_shutdown, + pf_pick, + pf_exit_idle, + pf_broadcast, + pf_check_connectivity, + pf_notify_on_state_change +}; -static void pick_first_factory_ref(grpc_lb_policy_factory *factory) {} +static void +pick_first_factory_ref (grpc_lb_policy_factory * factory) +{ +} -static void pick_first_factory_unref(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, - grpc_lb_policy_args *args) { - pick_first_lb_policy *p = gpr_malloc(sizeof(*p)); - GPR_ASSERT(args->num_subchannels > 0); - memset(p, 0, sizeof(*p)); - grpc_lb_policy_init(&p->base, &pick_first_lb_policy_vtable); - p->subchannels = - gpr_malloc(sizeof(grpc_subchannel *) * args->num_subchannels); +static grpc_lb_policy * +create_pick_first (grpc_lb_policy_factory * factory, grpc_lb_policy_args * args) +{ + pick_first_lb_policy *p = gpr_malloc (sizeof (*p)); + GPR_ASSERT (args->num_subchannels > 0); + memset (p, 0, sizeof (*p)); + grpc_lb_policy_init (&p->base, &pick_first_lb_policy_vtable); + p->subchannels = gpr_malloc (sizeof (grpc_subchannel *) * args->num_subchannels); p->num_subchannels = args->num_subchannels; - grpc_connectivity_state_init(&p->state_tracker, GRPC_CHANNEL_IDLE, - "pick_first"); - memcpy(p->subchannels, args->subchannels, - sizeof(grpc_subchannel *) * args->num_subchannels); - grpc_closure_init(&p->connectivity_changed, pf_connectivity_changed, p); - gpr_mu_init(&p->mu); + grpc_connectivity_state_init (&p->state_tracker, GRPC_CHANNEL_IDLE, "pick_first"); + memcpy (p->subchannels, args->subchannels, sizeof (grpc_subchannel *) * args->num_subchannels); + grpc_closure_init (&p->connectivity_changed, pf_connectivity_changed, p); + gpr_mu_init (&p->mu); return &p->base; } static const grpc_lb_policy_factory_vtable pick_first_factory_vtable = { - pick_first_factory_ref, pick_first_factory_unref, create_pick_first, - "pick_first"}; + pick_first_factory_ref, pick_first_factory_unref, create_pick_first, + "pick_first" +}; static grpc_lb_policy_factory pick_first_lb_policy_factory = { - &pick_first_factory_vtable}; + &pick_first_factory_vtable +}; -grpc_lb_policy_factory *grpc_pick_first_lb_factory_create() { +grpc_lb_policy_factory * +grpc_pick_first_lb_factory_create () +{ return &pick_first_lb_policy_factory; } diff --git a/src/core/client_config/lb_policies/pick_first.h b/src/core/client_config/lb_policies/pick_first.h index 3ca53ad42af..72a4e7c32c8 100644 --- a/src/core/client_config/lb_policies/pick_first.h +++ b/src/core/client_config/lb_policies/pick_first.h @@ -38,6 +38,6 @@ /** Returns a load balancing factory for the pick first policy, which picks up * the first subchannel from \a subchannels to succesfully connect */ -grpc_lb_policy_factory *grpc_pick_first_lb_factory_create(); +grpc_lb_policy_factory *grpc_pick_first_lb_factory_create (); #endif diff --git a/src/core/client_config/lb_policies/round_robin.c b/src/core/client_config/lb_policies/round_robin.c index b4139719f40..2e64da9e103 100644 --- a/src/core/client_config/lb_policies/round_robin.c +++ b/src/core/client_config/lb_policies/round_robin.c @@ -43,7 +43,8 @@ int grpc_lb_round_robin_trace = 0; /** List of entities waiting for a pick. * * Once a pick is available, \a target is updated and \a on_complete called. */ -typedef struct pending_pick { +typedef struct pending_pick +{ struct pending_pick *next; grpc_pollset *pollset; grpc_subchannel **target; @@ -51,18 +52,21 @@ typedef struct pending_pick { } pending_pick; /** List of subchannels in a connectivity READY state */ -typedef struct ready_list { +typedef struct ready_list +{ grpc_subchannel *subchannel; struct ready_list *next; struct ready_list *prev; } ready_list; -typedef struct { +typedef struct +{ size_t subchannel_idx; /**< Index over p->subchannels */ - void *p; /**< round_robin_lb_policy instance */ + void *p; /**< round_robin_lb_policy instance */ } connectivity_changed_cb_arg; -typedef struct { +typedef struct +{ /** base policy: must be first */ grpc_lb_policy base; @@ -106,225 +110,264 @@ typedef struct { * * Note that this function does *not* advance p->ready_list_last_pick. Use \a * advance_last_picked_locked() for that. */ -static ready_list *peek_next_connected_locked(const round_robin_lb_policy *p) { +static ready_list * +peek_next_connected_locked (const round_robin_lb_policy * p) +{ ready_list *selected; selected = p->ready_list_last_pick->next; - while (selected != NULL) { - if (selected == &p->ready_list) { - GPR_ASSERT(selected->subchannel == NULL); - /* skip dummy root */ - selected = selected->next; - } else { - GPR_ASSERT(selected->subchannel != NULL); - return selected; + while (selected != NULL) + { + if (selected == &p->ready_list) + { + GPR_ASSERT (selected->subchannel == NULL); + /* skip dummy root */ + selected = selected->next; + } + else + { + GPR_ASSERT (selected->subchannel != NULL); + return selected; + } } - } return NULL; } /** Advance the \a ready_list picking head. */ -static void advance_last_picked_locked(round_robin_lb_policy *p) { - if (p->ready_list_last_pick->next != NULL) { /* non-empty list */ - p->ready_list_last_pick = p->ready_list_last_pick->next; - if (p->ready_list_last_pick == &p->ready_list) { - /* skip dummy root */ +static void +advance_last_picked_locked (round_robin_lb_policy * p) +{ + if (p->ready_list_last_pick->next != NULL) + { /* non-empty list */ p->ready_list_last_pick = p->ready_list_last_pick->next; + if (p->ready_list_last_pick == &p->ready_list) + { + /* skip dummy root */ + p->ready_list_last_pick = p->ready_list_last_pick->next; + } + } + else + { /* should be an empty list */ + GPR_ASSERT (p->ready_list_last_pick == &p->ready_list); + } + + if (grpc_lb_round_robin_trace) + { + gpr_log (GPR_DEBUG, "[READYLIST] ADVANCED LAST PICK. NOW AT NODE %p (SC %p)", p->ready_list_last_pick, p->ready_list_last_pick->subchannel); } - } else { /* should be an empty list */ - GPR_ASSERT(p->ready_list_last_pick == &p->ready_list); - } - - if (grpc_lb_round_robin_trace) { - gpr_log(GPR_DEBUG, "[READYLIST] ADVANCED LAST PICK. NOW AT NODE %p (SC %p)", - p->ready_list_last_pick, p->ready_list_last_pick->subchannel); - } } /** Prepends (relative to the root at p->ready_list) the connected subchannel \a * csc to the list of ready subchannels. */ -static ready_list *add_connected_sc_locked(round_robin_lb_policy *p, - grpc_subchannel *csc) { - ready_list *new_elem = gpr_malloc(sizeof(ready_list)); +static ready_list * +add_connected_sc_locked (round_robin_lb_policy * p, grpc_subchannel * csc) +{ + ready_list *new_elem = gpr_malloc (sizeof (ready_list)); new_elem->subchannel = csc; - if (p->ready_list.prev == NULL) { - /* first element */ - new_elem->next = &p->ready_list; - new_elem->prev = &p->ready_list; - p->ready_list.next = new_elem; - p->ready_list.prev = new_elem; - } else { - new_elem->next = &p->ready_list; - new_elem->prev = p->ready_list.prev; - p->ready_list.prev->next = new_elem; - p->ready_list.prev = new_elem; - } - if (grpc_lb_round_robin_trace) { - gpr_log(GPR_DEBUG, "[READYLIST] ADDING NODE %p (SC %p)", new_elem, csc); - } + if (p->ready_list.prev == NULL) + { + /* first element */ + new_elem->next = &p->ready_list; + new_elem->prev = &p->ready_list; + p->ready_list.next = new_elem; + p->ready_list.prev = new_elem; + } + else + { + new_elem->next = &p->ready_list; + new_elem->prev = p->ready_list.prev; + p->ready_list.prev->next = new_elem; + p->ready_list.prev = new_elem; + } + if (grpc_lb_round_robin_trace) + { + gpr_log (GPR_DEBUG, "[READYLIST] ADDING NODE %p (SC %p)", new_elem, csc); + } return new_elem; } /** Removes \a node from the list of connected subchannels */ -static void remove_disconnected_sc_locked(round_robin_lb_policy *p, - ready_list *node) { - if (node == NULL) { - return; - } - if (node == p->ready_list_last_pick) { - /* If removing the lastly picked node, reset the last pick pointer to the - * dummy root of the list */ - p->ready_list_last_pick = &p->ready_list; - } +static void +remove_disconnected_sc_locked (round_robin_lb_policy * p, ready_list * node) +{ + if (node == NULL) + { + return; + } + if (node == p->ready_list_last_pick) + { + /* If removing the lastly picked node, reset the last pick pointer to the + * dummy root of the list */ + p->ready_list_last_pick = &p->ready_list; + } /* removing last item */ - if (node->next == &p->ready_list && node->prev == &p->ready_list) { - GPR_ASSERT(p->ready_list.next == node); - GPR_ASSERT(p->ready_list.prev == node); - p->ready_list.next = NULL; - p->ready_list.prev = NULL; - } else { - node->prev->next = node->next; - node->next->prev = node->prev; - } - - if (grpc_lb_round_robin_trace) { - gpr_log(GPR_DEBUG, "[READYLIST] REMOVED NODE %p (SC %p)", node, - node->subchannel); - } + if (node->next == &p->ready_list && node->prev == &p->ready_list) + { + GPR_ASSERT (p->ready_list.next == node); + GPR_ASSERT (p->ready_list.prev == node); + p->ready_list.next = NULL; + p->ready_list.prev = NULL; + } + else + { + node->prev->next = node->next; + node->next->prev = node->prev; + } + + if (grpc_lb_round_robin_trace) + { + gpr_log (GPR_DEBUG, "[READYLIST] REMOVED NODE %p (SC %p)", node, node->subchannel); + } node->next = NULL; node->prev = NULL; node->subchannel = NULL; - gpr_free(node); + gpr_free (node); } -static void del_interested_parties_locked(round_robin_lb_policy *p, - const size_t subchannel_idx, - grpc_closure_list *closure_list) { +static void +del_interested_parties_locked (round_robin_lb_policy * p, const size_t subchannel_idx, grpc_closure_list * closure_list) +{ pending_pick *pp; - for (pp = p->pending_picks; pp; pp = pp->next) { - grpc_subchannel_del_interested_party(p->subchannels[subchannel_idx], - pp->pollset, closure_list); - } + for (pp = p->pending_picks; pp; pp = pp->next) + { + grpc_subchannel_del_interested_party (p->subchannels[subchannel_idx], pp->pollset, closure_list); + } } -void rr_destroy(grpc_lb_policy *pol, grpc_closure_list *closure_list) { - round_robin_lb_policy *p = (round_robin_lb_policy *)pol; +void +rr_destroy (grpc_lb_policy * pol, grpc_closure_list * closure_list) +{ + round_robin_lb_policy *p = (round_robin_lb_policy *) pol; size_t i; ready_list *elem; - for (i = 0; i < p->num_subchannels; i++) { - del_interested_parties_locked(p, i, closure_list); - } - for (i = 0; i < p->num_subchannels; i++) { - GRPC_SUBCHANNEL_UNREF(p->subchannels[i], "round_robin", closure_list); - } - gpr_free(p->connectivity_changed_cbs); - gpr_free(p->subchannel_connectivity); - - grpc_connectivity_state_destroy(&p->state_tracker, closure_list); - gpr_free(p->subchannels); - gpr_mu_destroy(&p->mu); + for (i = 0; i < p->num_subchannels; i++) + { + del_interested_parties_locked (p, i, closure_list); + } + for (i = 0; i < p->num_subchannels; i++) + { + GRPC_SUBCHANNEL_UNREF (p->subchannels[i], "round_robin", closure_list); + } + gpr_free (p->connectivity_changed_cbs); + gpr_free (p->subchannel_connectivity); + + grpc_connectivity_state_destroy (&p->state_tracker, closure_list); + gpr_free (p->subchannels); + gpr_mu_destroy (&p->mu); elem = p->ready_list.next; - while (elem != NULL && elem != &p->ready_list) { - ready_list *tmp; - tmp = elem->next; - elem->next = NULL; - elem->prev = NULL; - elem->subchannel = NULL; - gpr_free(elem); - elem = tmp; - } - gpr_free(p->subchannel_index_to_readylist_node); - gpr_free(p->cb_args); - gpr_free(p); + while (elem != NULL && elem != &p->ready_list) + { + ready_list *tmp; + tmp = elem->next; + elem->next = NULL; + elem->prev = NULL; + elem->subchannel = NULL; + gpr_free (elem); + elem = tmp; + } + gpr_free (p->subchannel_index_to_readylist_node); + gpr_free (p->cb_args); + gpr_free (p); } -void rr_shutdown(grpc_lb_policy *pol, grpc_closure_list *closure_list) { +void +rr_shutdown (grpc_lb_policy * pol, grpc_closure_list * closure_list) +{ size_t i; - round_robin_lb_policy *p = (round_robin_lb_policy *)pol; + round_robin_lb_policy *p = (round_robin_lb_policy *) pol; pending_pick *pp; - gpr_mu_lock(&p->mu); + gpr_mu_lock (&p->mu); - for (i = 0; i < p->num_subchannels; i++) { - del_interested_parties_locked(p, i, closure_list); - } + for (i = 0; i < p->num_subchannels; i++) + { + del_interested_parties_locked (p, i, closure_list); + } p->shutdown = 1; - while ((pp = p->pending_picks)) { - p->pending_picks = pp->next; - *pp->target = NULL; - grpc_closure_list_add(closure_list, pp->on_complete, 0); - gpr_free(pp); - } - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, - "shutdown", closure_list); - gpr_mu_unlock(&p->mu); + while ((pp = p->pending_picks)) + { + p->pending_picks = pp->next; + *pp->target = NULL; + grpc_closure_list_add (closure_list, pp->on_complete, 0); + gpr_free (pp); + } + grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "shutdown", closure_list); + gpr_mu_unlock (&p->mu); } -static void start_picking(round_robin_lb_policy *p, - grpc_closure_list *closure_list) { +static void +start_picking (round_robin_lb_policy * p, grpc_closure_list * closure_list) +{ size_t i; p->started_picking = 1; - for (i = 0; i < p->num_subchannels; i++) { - p->subchannel_connectivity[i] = GRPC_CHANNEL_IDLE; - grpc_subchannel_notify_on_state_change( - p->subchannels[i], &p->subchannel_connectivity[i], - &p->connectivity_changed_cbs[i], closure_list); - GRPC_LB_POLICY_REF(&p->base, "round_robin_connectivity"); - } + for (i = 0; i < p->num_subchannels; i++) + { + p->subchannel_connectivity[i] = GRPC_CHANNEL_IDLE; + grpc_subchannel_notify_on_state_change (p->subchannels[i], &p->subchannel_connectivity[i], &p->connectivity_changed_cbs[i], closure_list); + GRPC_LB_POLICY_REF (&p->base, "round_robin_connectivity"); + } } -void rr_exit_idle(grpc_lb_policy *pol, grpc_closure_list *closure_list) { - round_robin_lb_policy *p = (round_robin_lb_policy *)pol; - gpr_mu_lock(&p->mu); - if (!p->started_picking) { - start_picking(p, closure_list); - } - gpr_mu_unlock(&p->mu); +void +rr_exit_idle (grpc_lb_policy * pol, grpc_closure_list * closure_list) +{ + round_robin_lb_policy *p = (round_robin_lb_policy *) pol; + gpr_mu_lock (&p->mu); + if (!p->started_picking) + { + start_picking (p, closure_list); + } + gpr_mu_unlock (&p->mu); } -void rr_pick(grpc_lb_policy *pol, grpc_pollset *pollset, - grpc_metadata_batch *initial_metadata, grpc_subchannel **target, - grpc_closure *on_complete, grpc_closure_list *closure_list) { +void +rr_pick (grpc_lb_policy * pol, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete, grpc_closure_list * closure_list) +{ size_t i; - round_robin_lb_policy *p = (round_robin_lb_policy *)pol; + round_robin_lb_policy *p = (round_robin_lb_policy *) pol; pending_pick *pp; ready_list *selected; - gpr_mu_lock(&p->mu); - if ((selected = peek_next_connected_locked(p))) { - gpr_mu_unlock(&p->mu); - *target = selected->subchannel; - if (grpc_lb_round_robin_trace) { - gpr_log(GPR_DEBUG, "[RR PICK] TARGET <-- SUBCHANNEL %p (NODE %p)", - selected->subchannel, selected); - } - /* only advance the last picked pointer if the selection was used */ - advance_last_picked_locked(p); - on_complete->cb(on_complete->cb_arg, 1, closure_list); - } else { - if (!p->started_picking) { - start_picking(p, closure_list); + gpr_mu_lock (&p->mu); + if ((selected = peek_next_connected_locked (p))) + { + gpr_mu_unlock (&p->mu); + *target = selected->subchannel; + if (grpc_lb_round_robin_trace) + { + gpr_log (GPR_DEBUG, "[RR PICK] TARGET <-- SUBCHANNEL %p (NODE %p)", selected->subchannel, selected); + } + /* only advance the last picked pointer if the selection was used */ + advance_last_picked_locked (p); + on_complete->cb (on_complete->cb_arg, 1, closure_list); } - for (i = 0; i < p->num_subchannels; i++) { - grpc_subchannel_add_interested_party(p->subchannels[i], pollset, - closure_list); + else + { + if (!p->started_picking) + { + start_picking (p, closure_list); + } + for (i = 0; i < p->num_subchannels; i++) + { + grpc_subchannel_add_interested_party (p->subchannels[i], pollset, closure_list); + } + pp = gpr_malloc (sizeof (*pp)); + pp->next = p->pending_picks; + pp->pollset = pollset; + pp->target = target; + pp->on_complete = on_complete; + p->pending_picks = pp; + gpr_mu_unlock (&p->mu); } - pp = gpr_malloc(sizeof(*pp)); - pp->next = p->pending_picks; - pp->pollset = pollset; - pp->target = target; - pp->on_complete = on_complete; - p->pending_picks = pp; - gpr_mu_unlock(&p->mu); - } } -static void rr_connectivity_changed(void *arg, int iomgr_success, - grpc_closure_list *closure_list) { +static void +rr_connectivity_changed (void *arg, int iomgr_success, grpc_closure_list * closure_list) +{ connectivity_changed_cb_arg *cb_arg = arg; round_robin_lb_policy *p = cb_arg->p; /* index over p->subchannels of this cb's subchannel */ @@ -337,198 +380,194 @@ static void rr_connectivity_changed(void *arg, int iomgr_success, /* connectivity state of this cb's subchannel */ grpc_connectivity_state *this_connectivity; - gpr_mu_lock(&p->mu); + gpr_mu_lock (&p->mu); this_connectivity = &p->subchannel_connectivity[this_idx]; - if (p->shutdown) { - unref = 1; - } else { - switch (*this_connectivity) { - case GRPC_CHANNEL_READY: - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_READY, - "connecting_ready", closure_list); - /* add the newly connected subchannel to the list of connected ones. - * Note that it goes to the "end of the line". */ - p->subchannel_index_to_readylist_node[this_idx] = - add_connected_sc_locked(p, p->subchannels[this_idx]); - /* at this point we know there's at least one suitable subchannel. Go - * ahead and pick one and notify the pending suitors in - * p->pending_picks. This preemtively replicates rr_pick()'s actions. */ - selected = peek_next_connected_locked(p); - if (p->pending_picks != NULL) { - /* if the selected subchannel is going to be used for the pending - * picks, update the last picked pointer */ - advance_last_picked_locked(p); - } - while ((pp = p->pending_picks)) { - p->pending_picks = pp->next; - *pp->target = selected->subchannel; - if (grpc_lb_round_robin_trace) { - gpr_log(GPR_DEBUG, - "[RR CONN CHANGED] TARGET <-- SUBCHANNEL %p (NODE %p)", - selected->subchannel, selected); - } - grpc_subchannel_del_interested_party(selected->subchannel, - pp->pollset, closure_list); - grpc_closure_list_add(closure_list, pp->on_complete, 1); - gpr_free(pp); - } - grpc_subchannel_notify_on_state_change( - p->subchannels[this_idx], this_connectivity, - &p->connectivity_changed_cbs[this_idx], closure_list); - break; - case GRPC_CHANNEL_CONNECTING: - case GRPC_CHANNEL_IDLE: - grpc_connectivity_state_set(&p->state_tracker, *this_connectivity, - "connecting_changed", closure_list); - grpc_subchannel_notify_on_state_change( - p->subchannels[this_idx], this_connectivity, - &p->connectivity_changed_cbs[this_idx], closure_list); - break; - case GRPC_CHANNEL_TRANSIENT_FAILURE: - del_interested_parties_locked(p, this_idx, closure_list); - /* renew state notification */ - grpc_subchannel_notify_on_state_change( - p->subchannels[this_idx], this_connectivity, - &p->connectivity_changed_cbs[this_idx], closure_list); - - /* remove from ready list if still present */ - if (p->subchannel_index_to_readylist_node[this_idx] != NULL) { - remove_disconnected_sc_locked( - p, p->subchannel_index_to_readylist_node[this_idx]); - p->subchannel_index_to_readylist_node[this_idx] = NULL; - } - grpc_connectivity_state_set( - &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, - "connecting_transient_failure", closure_list); - break; - case GRPC_CHANNEL_FATAL_FAILURE: - del_interested_parties_locked(p, this_idx, closure_list); - if (p->subchannel_index_to_readylist_node[this_idx] != NULL) { - remove_disconnected_sc_locked( - p, p->subchannel_index_to_readylist_node[this_idx]); - p->subchannel_index_to_readylist_node[this_idx] = NULL; - } - - GPR_SWAP(grpc_subchannel *, p->subchannels[this_idx], - p->subchannels[p->num_subchannels - 1]); - p->num_subchannels--; - GRPC_SUBCHANNEL_UNREF(p->subchannels[p->num_subchannels], "round_robin", - closure_list); - - if (p->num_subchannels == 0) { - grpc_connectivity_state_set(&p->state_tracker, - GRPC_CHANNEL_FATAL_FAILURE, - "no_more_channels", closure_list); - while ((pp = p->pending_picks)) { - p->pending_picks = pp->next; - *pp->target = NULL; - grpc_closure_list_add(closure_list, pp->on_complete, 1); - gpr_free(pp); - } - unref = 1; - } else { - grpc_connectivity_state_set(&p->state_tracker, - GRPC_CHANNEL_TRANSIENT_FAILURE, - "subchannel_failed", closure_list); - } - } /* switch */ - } /* !unref */ - - gpr_mu_unlock(&p->mu); - - if (unref) { - GRPC_LB_POLICY_UNREF(&p->base, "round_robin_connectivity", closure_list); - } + if (p->shutdown) + { + unref = 1; + } + else + { + switch (*this_connectivity) + { + case GRPC_CHANNEL_READY: + grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_READY, "connecting_ready", closure_list); + /* add the newly connected subchannel to the list of connected ones. + * Note that it goes to the "end of the line". */ + p->subchannel_index_to_readylist_node[this_idx] = add_connected_sc_locked (p, p->subchannels[this_idx]); + /* at this point we know there's at least one suitable subchannel. Go + * ahead and pick one and notify the pending suitors in + * p->pending_picks. This preemtively replicates rr_pick()'s actions. */ + selected = peek_next_connected_locked (p); + if (p->pending_picks != NULL) + { + /* if the selected subchannel is going to be used for the pending + * picks, update the last picked pointer */ + advance_last_picked_locked (p); + } + while ((pp = p->pending_picks)) + { + p->pending_picks = pp->next; + *pp->target = selected->subchannel; + if (grpc_lb_round_robin_trace) + { + gpr_log (GPR_DEBUG, "[RR CONN CHANGED] TARGET <-- SUBCHANNEL %p (NODE %p)", selected->subchannel, selected); + } + grpc_subchannel_del_interested_party (selected->subchannel, pp->pollset, closure_list); + grpc_closure_list_add (closure_list, pp->on_complete, 1); + gpr_free (pp); + } + grpc_subchannel_notify_on_state_change (p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx], closure_list); + break; + case GRPC_CHANNEL_CONNECTING: + case GRPC_CHANNEL_IDLE: + grpc_connectivity_state_set (&p->state_tracker, *this_connectivity, "connecting_changed", closure_list); + grpc_subchannel_notify_on_state_change (p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx], closure_list); + break; + case GRPC_CHANNEL_TRANSIENT_FAILURE: + del_interested_parties_locked (p, this_idx, closure_list); + /* renew state notification */ + grpc_subchannel_notify_on_state_change (p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx], closure_list); + + /* remove from ready list if still present */ + if (p->subchannel_index_to_readylist_node[this_idx] != NULL) + { + remove_disconnected_sc_locked (p, p->subchannel_index_to_readylist_node[this_idx]); + p->subchannel_index_to_readylist_node[this_idx] = NULL; + } + grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "connecting_transient_failure", closure_list); + break; + case GRPC_CHANNEL_FATAL_FAILURE: + del_interested_parties_locked (p, this_idx, closure_list); + if (p->subchannel_index_to_readylist_node[this_idx] != NULL) + { + remove_disconnected_sc_locked (p, p->subchannel_index_to_readylist_node[this_idx]); + p->subchannel_index_to_readylist_node[this_idx] = NULL; + } + + GPR_SWAP (grpc_subchannel *, p->subchannels[this_idx], p->subchannels[p->num_subchannels - 1]); + p->num_subchannels--; + GRPC_SUBCHANNEL_UNREF (p->subchannels[p->num_subchannels], "round_robin", closure_list); + + if (p->num_subchannels == 0) + { + grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "no_more_channels", closure_list); + while ((pp = p->pending_picks)) + { + p->pending_picks = pp->next; + *pp->target = NULL; + grpc_closure_list_add (closure_list, pp->on_complete, 1); + gpr_free (pp); + } + unref = 1; + } + else + { + grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "subchannel_failed", closure_list); + } + } /* switch */ + } /* !unref */ + + gpr_mu_unlock (&p->mu); + + if (unref) + { + GRPC_LB_POLICY_UNREF (&p->base, "round_robin_connectivity", closure_list); + } } -static void rr_broadcast(grpc_lb_policy *pol, grpc_transport_op *op, - grpc_closure_list *closure_list) { - round_robin_lb_policy *p = (round_robin_lb_policy *)pol; +static void +rr_broadcast (grpc_lb_policy * pol, grpc_transport_op * op, grpc_closure_list * closure_list) +{ + round_robin_lb_policy *p = (round_robin_lb_policy *) pol; size_t i; size_t n; grpc_subchannel **subchannels; - gpr_mu_lock(&p->mu); + gpr_mu_lock (&p->mu); n = p->num_subchannels; - subchannels = gpr_malloc(n * sizeof(*subchannels)); - for (i = 0; i < n; i++) { - subchannels[i] = p->subchannels[i]; - GRPC_SUBCHANNEL_REF(subchannels[i], "rr_broadcast"); - } - gpr_mu_unlock(&p->mu); - - for (i = 0; i < n; i++) { - grpc_subchannel_process_transport_op(subchannels[i], op, closure_list); - GRPC_SUBCHANNEL_UNREF(subchannels[i], "rr_broadcast", closure_list); - } - gpr_free(subchannels); + subchannels = gpr_malloc (n * sizeof (*subchannels)); + for (i = 0; i < n; i++) + { + subchannels[i] = p->subchannels[i]; + GRPC_SUBCHANNEL_REF (subchannels[i], "rr_broadcast"); + } + gpr_mu_unlock (&p->mu); + + for (i = 0; i < n; i++) + { + grpc_subchannel_process_transport_op (subchannels[i], op, closure_list); + GRPC_SUBCHANNEL_UNREF (subchannels[i], "rr_broadcast", closure_list); + } + gpr_free (subchannels); } -static grpc_connectivity_state rr_check_connectivity( - grpc_lb_policy *pol, grpc_closure_list *closure_list) { - round_robin_lb_policy *p = (round_robin_lb_policy *)pol; +static grpc_connectivity_state +rr_check_connectivity (grpc_lb_policy * pol, grpc_closure_list * closure_list) +{ + round_robin_lb_policy *p = (round_robin_lb_policy *) pol; grpc_connectivity_state st; - gpr_mu_lock(&p->mu); - st = grpc_connectivity_state_check(&p->state_tracker); - gpr_mu_unlock(&p->mu); + gpr_mu_lock (&p->mu); + st = grpc_connectivity_state_check (&p->state_tracker); + gpr_mu_unlock (&p->mu); return st; } -static void rr_notify_on_state_change(grpc_lb_policy *pol, - grpc_connectivity_state *current, - grpc_closure *notify, - grpc_closure_list *closure_list) { - round_robin_lb_policy *p = (round_robin_lb_policy *)pol; - gpr_mu_lock(&p->mu); - grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, - notify, closure_list); - gpr_mu_unlock(&p->mu); +static void +rr_notify_on_state_change (grpc_lb_policy * pol, grpc_connectivity_state * current, grpc_closure * notify, grpc_closure_list * closure_list) +{ + round_robin_lb_policy *p = (round_robin_lb_policy *) pol; + gpr_mu_lock (&p->mu); + grpc_connectivity_state_notify_on_state_change (&p->state_tracker, current, notify, closure_list); + gpr_mu_unlock (&p->mu); } static const grpc_lb_policy_vtable round_robin_lb_policy_vtable = { - rr_destroy, - rr_shutdown, - rr_pick, - rr_exit_idle, - rr_broadcast, - rr_check_connectivity, - rr_notify_on_state_change}; - -static void round_robin_factory_ref(grpc_lb_policy_factory *factory) {} + rr_destroy, + rr_shutdown, + rr_pick, + rr_exit_idle, + rr_broadcast, + rr_check_connectivity, + rr_notify_on_state_change +}; + +static void +round_robin_factory_ref (grpc_lb_policy_factory * factory) +{ +} -static void round_robin_factory_unref(grpc_lb_policy_factory *factory) {} +static void +round_robin_factory_unref (grpc_lb_policy_factory * factory) +{ +} -static grpc_lb_policy *create_round_robin(grpc_lb_policy_factory *factory, - grpc_lb_policy_args *args) { +static grpc_lb_policy * +create_round_robin (grpc_lb_policy_factory * factory, grpc_lb_policy_args * args) +{ size_t i; - round_robin_lb_policy *p = gpr_malloc(sizeof(*p)); - GPR_ASSERT(args->num_subchannels > 0); - memset(p, 0, sizeof(*p)); - grpc_lb_policy_init(&p->base, &round_robin_lb_policy_vtable); - p->subchannels = - gpr_malloc(sizeof(grpc_subchannel *) * args->num_subchannels); + round_robin_lb_policy *p = gpr_malloc (sizeof (*p)); + GPR_ASSERT (args->num_subchannels > 0); + memset (p, 0, sizeof (*p)); + grpc_lb_policy_init (&p->base, &round_robin_lb_policy_vtable); + p->subchannels = gpr_malloc (sizeof (grpc_subchannel *) * args->num_subchannels); p->num_subchannels = args->num_subchannels; - grpc_connectivity_state_init(&p->state_tracker, GRPC_CHANNEL_IDLE, - "round_robin"); - memcpy(p->subchannels, args->subchannels, - sizeof(grpc_subchannel *) * args->num_subchannels); - - gpr_mu_init(&p->mu); - p->connectivity_changed_cbs = - gpr_malloc(sizeof(grpc_closure) * args->num_subchannels); - p->subchannel_connectivity = - gpr_malloc(sizeof(grpc_connectivity_state) * args->num_subchannels); - - p->cb_args = - gpr_malloc(sizeof(connectivity_changed_cb_arg) * args->num_subchannels); - for (i = 0; i < args->num_subchannels; i++) { - p->cb_args[i].subchannel_idx = i; - p->cb_args[i].p = p; - grpc_closure_init(&p->connectivity_changed_cbs[i], rr_connectivity_changed, - &p->cb_args[i]); - } + grpc_connectivity_state_init (&p->state_tracker, GRPC_CHANNEL_IDLE, "round_robin"); + memcpy (p->subchannels, args->subchannels, sizeof (grpc_subchannel *) * args->num_subchannels); + + gpr_mu_init (&p->mu); + p->connectivity_changed_cbs = gpr_malloc (sizeof (grpc_closure) * args->num_subchannels); + p->subchannel_connectivity = gpr_malloc (sizeof (grpc_connectivity_state) * args->num_subchannels); + + p->cb_args = gpr_malloc (sizeof (connectivity_changed_cb_arg) * args->num_subchannels); + for (i = 0; i < args->num_subchannels; i++) + { + p->cb_args[i].subchannel_idx = i; + p->cb_args[i].p = p; + grpc_closure_init (&p->connectivity_changed_cbs[i], rr_connectivity_changed, &p->cb_args[i]); + } /* The (dummy node) root of the ready list */ p->ready_list.subchannel = NULL; @@ -536,20 +575,22 @@ static grpc_lb_policy *create_round_robin(grpc_lb_policy_factory *factory, p->ready_list.next = NULL; p->ready_list_last_pick = &p->ready_list; - p->subchannel_index_to_readylist_node = - gpr_malloc(sizeof(grpc_subchannel *) * args->num_subchannels); - memset(p->subchannel_index_to_readylist_node, 0, - sizeof(grpc_subchannel *) * args->num_subchannels); + p->subchannel_index_to_readylist_node = gpr_malloc (sizeof (grpc_subchannel *) * args->num_subchannels); + memset (p->subchannel_index_to_readylist_node, 0, sizeof (grpc_subchannel *) * args->num_subchannels); return &p->base; } static const grpc_lb_policy_factory_vtable round_robin_factory_vtable = { - round_robin_factory_ref, round_robin_factory_unref, create_round_robin, - "round_robin"}; + round_robin_factory_ref, round_robin_factory_unref, create_round_robin, + "round_robin" +}; static grpc_lb_policy_factory round_robin_lb_policy_factory = { - &round_robin_factory_vtable}; + &round_robin_factory_vtable +}; -grpc_lb_policy_factory *grpc_round_robin_lb_factory_create() { +grpc_lb_policy_factory * +grpc_round_robin_lb_factory_create () +{ return &round_robin_lb_policy_factory; } diff --git a/src/core/client_config/lb_policies/round_robin.h b/src/core/client_config/lb_policies/round_robin.h index cf1f69c85f6..213995aa3fd 100644 --- a/src/core/client_config/lb_policies/round_robin.h +++ b/src/core/client_config/lb_policies/round_robin.h @@ -41,6 +41,6 @@ extern int grpc_lb_round_robin_trace; #include "src/core/client_config/lb_policy_factory.h" /** Returns a load balancing factory for the round robin policy */ -grpc_lb_policy_factory *grpc_round_robin_lb_factory_create(); +grpc_lb_policy_factory *grpc_round_robin_lb_factory_create (); #endif diff --git a/src/core/client_config/lb_policy.c b/src/core/client_config/lb_policy.c index 99eb69613b8..40d9079f342 100644 --- a/src/core/client_config/lb_policy.c +++ b/src/core/client_config/lb_policy.c @@ -33,69 +33,74 @@ #include "src/core/client_config/lb_policy.h" -void grpc_lb_policy_init(grpc_lb_policy *policy, - const grpc_lb_policy_vtable *vtable) { +void +grpc_lb_policy_init (grpc_lb_policy * policy, const grpc_lb_policy_vtable * vtable) +{ policy->vtable = vtable; - gpr_ref_init(&policy->refs, 1); + gpr_ref_init (&policy->refs, 1); } #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG -void grpc_lb_policy_ref(grpc_lb_policy *policy, const char *file, int line, - const char *reason) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "LB_POLICY:%p ref %d -> %d %s", - policy, (int)policy->refs.count, (int)policy->refs.count + 1, reason); +void +grpc_lb_policy_ref (grpc_lb_policy * policy, const char *file, int line, const char *reason) +{ + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "LB_POLICY:%p ref %d -> %d %s", policy, (int) policy->refs.count, (int) policy->refs.count + 1, reason); #else -void grpc_lb_policy_ref(grpc_lb_policy *policy) { +void +grpc_lb_policy_ref (grpc_lb_policy * policy) +{ #endif - gpr_ref(&policy->refs); + gpr_ref (&policy->refs); } #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG -void grpc_lb_policy_unref(grpc_lb_policy *policy, - grpc_closure_list *closure_list, const char *file, - int line, const char *reason) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "LB_POLICY:%p unref %d -> %d %s", - policy, (int)policy->refs.count, (int)policy->refs.count - 1, reason); +void +grpc_lb_policy_unref (grpc_lb_policy * policy, grpc_closure_list * closure_list, const char *file, int line, const char *reason) +{ + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "LB_POLICY:%p unref %d -> %d %s", policy, (int) policy->refs.count, (int) policy->refs.count - 1, reason); #else -void grpc_lb_policy_unref(grpc_lb_policy *policy, - grpc_closure_list *closure_list) { +void +grpc_lb_policy_unref (grpc_lb_policy * policy, grpc_closure_list * closure_list) +{ #endif - if (gpr_unref(&policy->refs)) { - policy->vtable->destroy(policy, closure_list); - } + if (gpr_unref (&policy->refs)) + { + policy->vtable->destroy (policy, closure_list); + } } -void grpc_lb_policy_shutdown(grpc_lb_policy *policy, - grpc_closure_list *closure_list) { - policy->vtable->shutdown(policy, closure_list); +void +grpc_lb_policy_shutdown (grpc_lb_policy * policy, grpc_closure_list * closure_list) +{ + policy->vtable->shutdown (policy, closure_list); } -void grpc_lb_policy_pick(grpc_lb_policy *policy, grpc_pollset *pollset, - grpc_metadata_batch *initial_metadata, - grpc_subchannel **target, grpc_closure *on_complete, - grpc_closure_list *closure_list) { - policy->vtable->pick(policy, pollset, initial_metadata, target, on_complete, - closure_list); +void +grpc_lb_policy_pick (grpc_lb_policy * policy, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete, grpc_closure_list * closure_list) +{ + policy->vtable->pick (policy, pollset, initial_metadata, target, on_complete, closure_list); } -void grpc_lb_policy_broadcast(grpc_lb_policy *policy, grpc_transport_op *op, - grpc_closure_list *closure_list) { - policy->vtable->broadcast(policy, op, closure_list); +void +grpc_lb_policy_broadcast (grpc_lb_policy * policy, grpc_transport_op * op, grpc_closure_list * closure_list) +{ + policy->vtable->broadcast (policy, op, closure_list); } -void grpc_lb_policy_exit_idle(grpc_lb_policy *policy, - grpc_closure_list *closure_list) { - policy->vtable->exit_idle(policy, closure_list); +void +grpc_lb_policy_exit_idle (grpc_lb_policy * policy, grpc_closure_list * closure_list) +{ + policy->vtable->exit_idle (policy, closure_list); } -void grpc_lb_policy_notify_on_state_change(grpc_lb_policy *policy, - grpc_connectivity_state *state, - grpc_closure *closure, - grpc_closure_list *closure_list) { - policy->vtable->notify_on_state_change(policy, state, closure, closure_list); +void +grpc_lb_policy_notify_on_state_change (grpc_lb_policy * policy, grpc_connectivity_state * state, grpc_closure * closure, grpc_closure_list * closure_list) +{ + policy->vtable->notify_on_state_change (policy, state, closure, closure_list); } -grpc_connectivity_state grpc_lb_policy_check_connectivity( - grpc_lb_policy *policy, grpc_closure_list *closure_list) { - return policy->vtable->check_connectivity(policy, closure_list); +grpc_connectivity_state +grpc_lb_policy_check_connectivity (grpc_lb_policy * policy, grpc_closure_list * closure_list) +{ + return policy->vtable->check_connectivity (policy, closure_list); } diff --git a/src/core/client_config/lb_policy.h b/src/core/client_config/lb_policy.h index 5e3c016eb26..d530e5b7e1c 100644 --- a/src/core/client_config/lb_policy.h +++ b/src/core/client_config/lb_policy.h @@ -42,41 +42,35 @@ typedef struct grpc_lb_policy grpc_lb_policy; typedef struct grpc_lb_policy_vtable grpc_lb_policy_vtable; -typedef void (*grpc_lb_completion)(void *cb_arg, grpc_subchannel *subchannel, - grpc_status_code status, const char *errmsg); +typedef void (*grpc_lb_completion) (void *cb_arg, grpc_subchannel * subchannel, grpc_status_code status, const char *errmsg); -struct grpc_lb_policy { +struct grpc_lb_policy +{ const grpc_lb_policy_vtable *vtable; gpr_refcount refs; }; -struct grpc_lb_policy_vtable { - void (*destroy)(grpc_lb_policy *policy, grpc_closure_list *closure_list); +struct grpc_lb_policy_vtable +{ + void (*destroy) (grpc_lb_policy * policy, grpc_closure_list * closure_list); - void (*shutdown)(grpc_lb_policy *policy, grpc_closure_list *closure_list); + void (*shutdown) (grpc_lb_policy * policy, grpc_closure_list * closure_list); /** implement grpc_lb_policy_pick */ - void (*pick)(grpc_lb_policy *policy, grpc_pollset *pollset, - grpc_metadata_batch *initial_metadata, grpc_subchannel **target, - grpc_closure *on_complete, grpc_closure_list *closure_list); + void (*pick) (grpc_lb_policy * policy, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete, grpc_closure_list * closure_list); /** try to enter a READY connectivity state */ - void (*exit_idle)(grpc_lb_policy *policy, grpc_closure_list *closure_list); + void (*exit_idle) (grpc_lb_policy * policy, grpc_closure_list * closure_list); /** broadcast a transport op to all subchannels */ - void (*broadcast)(grpc_lb_policy *policy, grpc_transport_op *op, - grpc_closure_list *closure_list); + void (*broadcast) (grpc_lb_policy * policy, grpc_transport_op * op, grpc_closure_list * closure_list); /** check the current connectivity of the lb_policy */ - grpc_connectivity_state (*check_connectivity)( - grpc_lb_policy *policy, grpc_closure_list *closure_list); + grpc_connectivity_state (*check_connectivity) (grpc_lb_policy * policy, grpc_closure_list * closure_list); /** call notify when the connectivity state of a channel changes from *state. Updates *state with the new state of the policy */ - void (*notify_on_state_change)(grpc_lb_policy *policy, - grpc_connectivity_state *state, - grpc_closure *closure, - grpc_closure_list *closure_list); + void (*notify_on_state_change) (grpc_lb_policy * policy, grpc_connectivity_state * state, grpc_closure * closure, grpc_closure_list * closure_list); }; #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG @@ -84,48 +78,33 @@ struct grpc_lb_policy_vtable { grpc_lb_policy_ref((p), __FILE__, __LINE__, (r)) #define GRPC_LB_POLICY_UNREF(p, r, cl) \ grpc_lb_policy_unref((p), (cl), __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, - grpc_closure_list *closure_list, const char *file, - int line, const char *reason); +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, grpc_closure_list * closure_list, 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, cl) grpc_lb_policy_unref((p), (cl)) -void grpc_lb_policy_ref(grpc_lb_policy *policy); -void grpc_lb_policy_unref(grpc_lb_policy *policy, - grpc_closure_list *closure_list); +void grpc_lb_policy_ref (grpc_lb_policy * policy); +void grpc_lb_policy_unref (grpc_lb_policy * policy, grpc_closure_list * closure_list); #endif /** called by concrete implementations to initialize the base struct */ -void grpc_lb_policy_init(grpc_lb_policy *policy, - const grpc_lb_policy_vtable *vtable); +void grpc_lb_policy_init (grpc_lb_policy * policy, const grpc_lb_policy_vtable * vtable); /** Start shutting down (fail any pending picks) */ -void grpc_lb_policy_shutdown(grpc_lb_policy *policy, - grpc_closure_list *closure_list); +void grpc_lb_policy_shutdown (grpc_lb_policy * policy, grpc_closure_list * closure_list); /** Given initial metadata in \a initial_metadata, find an appropriate target for this rpc, and 'return' it by calling \a on_complete after setting \a target. Picking can be asynchronous. Any IO should be done under \a pollset. */ -void grpc_lb_policy_pick(grpc_lb_policy *policy, grpc_pollset *pollset, - grpc_metadata_batch *initial_metadata, - grpc_subchannel **target, grpc_closure *on_complete, - grpc_closure_list *closure_list); +void grpc_lb_policy_pick (grpc_lb_policy * policy, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete, grpc_closure_list * closure_list); -void grpc_lb_policy_broadcast(grpc_lb_policy *policy, grpc_transport_op *op, - grpc_closure_list *closure_list); +void grpc_lb_policy_broadcast (grpc_lb_policy * policy, grpc_transport_op * op, grpc_closure_list * closure_list); -void grpc_lb_policy_exit_idle(grpc_lb_policy *policy, - grpc_closure_list *closure_list); +void grpc_lb_policy_exit_idle (grpc_lb_policy * policy, grpc_closure_list * closure_list); -void grpc_lb_policy_notify_on_state_change(grpc_lb_policy *policy, - grpc_connectivity_state *state, - grpc_closure *closure, - grpc_closure_list *closure_list); +void grpc_lb_policy_notify_on_state_change (grpc_lb_policy * policy, grpc_connectivity_state * state, grpc_closure * closure, grpc_closure_list * closure_list); -grpc_connectivity_state grpc_lb_policy_check_connectivity( - grpc_lb_policy *policy, grpc_closure_list *closure_list); +grpc_connectivity_state grpc_lb_policy_check_connectivity (grpc_lb_policy * policy, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_CONFIG_LB_POLICY_H */ diff --git a/src/core/client_config/lb_policy_factory.c b/src/core/client_config/lb_policy_factory.c index 0c097e05421..9d202d0c363 100644 --- a/src/core/client_config/lb_policy_factory.c +++ b/src/core/client_config/lb_policy_factory.c @@ -33,15 +33,22 @@ #include "src/core/client_config/lb_policy_factory.h" -void grpc_lb_policy_factory_ref(grpc_lb_policy_factory *factory) { - factory->vtable->ref(factory); +void +grpc_lb_policy_factory_ref (grpc_lb_policy_factory * factory) +{ + factory->vtable->ref (factory); } -void grpc_lb_policy_factory_unref(grpc_lb_policy_factory *factory) { - factory->vtable->unref(factory); + +void +grpc_lb_policy_factory_unref (grpc_lb_policy_factory * factory) +{ + factory->vtable->unref (factory); } -grpc_lb_policy *grpc_lb_policy_factory_create_lb_policy( - grpc_lb_policy_factory *factory, grpc_lb_policy_args *args) { - if (factory == NULL) return NULL; - return factory->vtable->create_lb_policy(factory, args); +grpc_lb_policy * +grpc_lb_policy_factory_create_lb_policy (grpc_lb_policy_factory * factory, grpc_lb_policy_args * args) +{ + if (factory == NULL) + return NULL; + return factory->vtable->create_lb_policy (factory, args); } diff --git a/src/core/client_config/lb_policy_factory.h b/src/core/client_config/lb_policy_factory.h index 04610316ee4..a00b5142dcf 100644 --- a/src/core/client_config/lb_policy_factory.h +++ b/src/core/client_config/lb_policy_factory.h @@ -42,32 +42,33 @@ typedef struct grpc_lb_policy_factory_vtable grpc_lb_policy_factory_vtable; /** grpc_lb_policy provides grpc_client_config objects to grpc_channel objects */ -struct grpc_lb_policy_factory { +struct grpc_lb_policy_factory +{ const grpc_lb_policy_factory_vtable *vtable; }; -typedef struct grpc_lb_policy_args { +typedef struct grpc_lb_policy_args +{ grpc_subchannel **subchannels; size_t num_subchannels; } grpc_lb_policy_args; -struct grpc_lb_policy_factory_vtable { - void (*ref)(grpc_lb_policy_factory *factory); - void (*unref)(grpc_lb_policy_factory *factory); +struct grpc_lb_policy_factory_vtable +{ + void (*ref) (grpc_lb_policy_factory * factory); + 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_args *args); + grpc_lb_policy *(*create_lb_policy) (grpc_lb_policy_factory * factory, grpc_lb_policy_args * args); /** Name for the LB policy this factory implements */ const char *name; }; -void grpc_lb_policy_factory_ref(grpc_lb_policy_factory *factory); -void grpc_lb_policy_factory_unref(grpc_lb_policy_factory *factory); +void grpc_lb_policy_factory_ref (grpc_lb_policy_factory * factory); +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_lb_policy *grpc_lb_policy_factory_create_lb_policy (grpc_lb_policy_factory * factory, grpc_lb_policy_args * args); #endif /* GRPC_INTERNAL_CORE_CONFIG_LB_POLICY_FACTORY_H */ diff --git a/src/core/client_config/lb_policy_registry.c b/src/core/client_config/lb_policy_registry.c index fc302e82d7e..4d7cc7c128d 100644 --- a/src/core/client_config/lb_policy_registry.c +++ b/src/core/client_config/lb_policy_registry.c @@ -42,47 +42,59 @@ static int g_number_of_lb_policies = 0; static grpc_lb_policy_factory *g_default_lb_policy_factory; -void grpc_lb_policy_registry_init(grpc_lb_policy_factory *default_factory) { +void +grpc_lb_policy_registry_init (grpc_lb_policy_factory * default_factory) +{ g_number_of_lb_policies = 0; g_default_lb_policy_factory = default_factory; } -void grpc_lb_policy_registry_shutdown(void) { +void +grpc_lb_policy_registry_shutdown (void) +{ int i; - for (i = 0; i < g_number_of_lb_policies; i++) { - grpc_lb_policy_factory_unref(g_all_of_the_lb_policies[i]); - } + for (i = 0; i < g_number_of_lb_policies; i++) + { + grpc_lb_policy_factory_unref (g_all_of_the_lb_policies[i]); + } } -void grpc_register_lb_policy(grpc_lb_policy_factory *factory) { +void +grpc_register_lb_policy (grpc_lb_policy_factory * factory) +{ int i; - for (i = 0; i < g_number_of_lb_policies; i++) { - GPR_ASSERT(0 != strcmp(factory->vtable->name, - g_all_of_the_lb_policies[i]->vtable->name)); - } - GPR_ASSERT(g_number_of_lb_policies != MAX_POLICIES); - grpc_lb_policy_factory_ref(factory); + for (i = 0; i < g_number_of_lb_policies; i++) + { + GPR_ASSERT (0 != strcmp (factory->vtable->name, g_all_of_the_lb_policies[i]->vtable->name)); + } + GPR_ASSERT (g_number_of_lb_policies != MAX_POLICIES); + grpc_lb_policy_factory_ref (factory); g_all_of_the_lb_policies[g_number_of_lb_policies++] = factory; } -static grpc_lb_policy_factory *lookup_factory(const char *name) { +static grpc_lb_policy_factory * +lookup_factory (const char *name) +{ int i; - if (name == NULL) return NULL; + if (name == NULL) + return NULL; - for (i = 0; i < g_number_of_lb_policies; i++) { - if (0 == strcmp(name, g_all_of_the_lb_policies[i]->vtable->name)) { - return g_all_of_the_lb_policies[i]; + for (i = 0; i < g_number_of_lb_policies; i++) + { + if (0 == strcmp (name, g_all_of_the_lb_policies[i]->vtable->name)) + { + return g_all_of_the_lb_policies[i]; + } } - } return NULL; } -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(factory, args); +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 (factory, args); return lb_policy; } diff --git a/src/core/client_config/lb_policy_registry.h b/src/core/client_config/lb_policy_registry.h index 96fc2a16285..dea0cfc0fd1 100644 --- a/src/core/client_config/lb_policy_registry.h +++ b/src/core/client_config/lb_policy_registry.h @@ -38,17 +38,16 @@ /** Initialize the registry and set \a default_factory as the factory to be * returned when no name is provided in a lookup */ -void grpc_lb_policy_registry_init(grpc_lb_policy_factory *default_factory); -void grpc_lb_policy_registry_shutdown(void); +void grpc_lb_policy_registry_init (grpc_lb_policy_factory * default_factory); +void grpc_lb_policy_registry_shutdown (void); /** Register a LB policy factory. */ -void grpc_register_lb_policy(grpc_lb_policy_factory *factory); +void grpc_register_lb_policy (grpc_lb_policy_factory * factory); /** Create a \a grpc_lb_policy instance. * * 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_args *args); +grpc_lb_policy *grpc_lb_policy_create (const char *name, grpc_lb_policy_args * args); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_LB_POLICY_REGISTRY_H */ diff --git a/src/core/client_config/resolver.c b/src/core/client_config/resolver.c index 21186d7aa18..089ce6cd18c 100644 --- a/src/core/client_config/resolver.c +++ b/src/core/client_config/resolver.c @@ -33,56 +33,56 @@ #include "src/core/client_config/resolver.h" -void grpc_resolver_init(grpc_resolver *resolver, - const grpc_resolver_vtable *vtable) { +void +grpc_resolver_init (grpc_resolver * resolver, const grpc_resolver_vtable * vtable) +{ resolver->vtable = vtable; - gpr_ref_init(&resolver->refs, 1); + gpr_ref_init (&resolver->refs, 1); } #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG -void grpc_resolver_ref(grpc_resolver *resolver, grpc_closure_list *closure_list, - const char *file, int line, const char *reason) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "RESOLVER:%p ref %d -> %d %s", - resolver, (int)resolver->refs.count, (int)resolver->refs.count + 1, - reason); +void +grpc_resolver_ref (grpc_resolver * resolver, grpc_closure_list * closure_list, const char *file, int line, const char *reason) +{ + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "RESOLVER:%p ref %d -> %d %s", resolver, (int) resolver->refs.count, (int) resolver->refs.count + 1, reason); #else -void grpc_resolver_ref(grpc_resolver *resolver) { +void +grpc_resolver_ref (grpc_resolver * resolver) +{ #endif - gpr_ref(&resolver->refs); + gpr_ref (&resolver->refs); } #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG -void grpc_resolver_unref(grpc_resolver *resolver, - grpc_closure_list *closure_list, const char *file, - int line, const char *reason) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "RESOLVER:%p unref %d -> %d %s", - resolver, (int)resolver->refs.count, (int)resolver->refs.count - 1, - reason); +void +grpc_resolver_unref (grpc_resolver * resolver, grpc_closure_list * closure_list, const char *file, int line, const char *reason) +{ + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "RESOLVER:%p unref %d -> %d %s", resolver, (int) resolver->refs.count, (int) resolver->refs.count - 1, reason); #else -void grpc_resolver_unref(grpc_resolver *resolver, - grpc_closure_list *closure_list) { +void +grpc_resolver_unref (grpc_resolver * resolver, grpc_closure_list * closure_list) +{ #endif - if (gpr_unref(&resolver->refs)) { - resolver->vtable->destroy(resolver, closure_list); - } + if (gpr_unref (&resolver->refs)) + { + resolver->vtable->destroy (resolver, closure_list); + } } -void grpc_resolver_shutdown(grpc_resolver *resolver, - grpc_closure_list *closure_list) { - resolver->vtable->shutdown(resolver, closure_list); +void +grpc_resolver_shutdown (grpc_resolver * resolver, grpc_closure_list * closure_list) +{ + resolver->vtable->shutdown (resolver, closure_list); } -void grpc_resolver_channel_saw_error(grpc_resolver *resolver, - struct sockaddr *failing_address, - int failing_address_len, - grpc_closure_list *closure_list) { - resolver->vtable->channel_saw_error(resolver, failing_address, - failing_address_len, closure_list); +void +grpc_resolver_channel_saw_error (grpc_resolver * resolver, struct sockaddr *failing_address, int failing_address_len, grpc_closure_list * closure_list) +{ + resolver->vtable->channel_saw_error (resolver, failing_address, failing_address_len, closure_list); } -void grpc_resolver_next(grpc_resolver *resolver, - grpc_client_config **target_config, - grpc_closure *on_complete, - grpc_closure_list *closure_list) { - resolver->vtable->next(resolver, target_config, on_complete, closure_list); +void +grpc_resolver_next (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list) +{ + resolver->vtable->next (resolver, target_config, on_complete, closure_list); } diff --git a/src/core/client_config/resolver.h b/src/core/client_config/resolver.h index 0c39d37018a..b51ef89bd51 100644 --- a/src/core/client_config/resolver.h +++ b/src/core/client_config/resolver.h @@ -43,50 +43,40 @@ typedef struct grpc_resolver_vtable grpc_resolver_vtable; /** grpc_resolver provides grpc_client_config objects to grpc_channel objects */ -struct grpc_resolver { +struct grpc_resolver +{ const grpc_resolver_vtable *vtable; gpr_refcount refs; }; -struct grpc_resolver_vtable { - void (*destroy)(grpc_resolver *resolver, grpc_closure_list *closure_list); - void (*shutdown)(grpc_resolver *resolver, grpc_closure_list *closure_list); - void (*channel_saw_error)(grpc_resolver *resolver, - struct sockaddr *failing_address, - int failing_address_len, - grpc_closure_list *closure_list); - void (*next)(grpc_resolver *resolver, grpc_client_config **target_config, - grpc_closure *on_complete, grpc_closure_list *closure_list); +struct grpc_resolver_vtable +{ + void (*destroy) (grpc_resolver * resolver, grpc_closure_list * closure_list); + void (*shutdown) (grpc_resolver * resolver, grpc_closure_list * closure_list); + void (*channel_saw_error) (grpc_resolver * resolver, struct sockaddr * failing_address, int failing_address_len, grpc_closure_list * closure_list); + void (*next) (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list); }; #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG #define GRPC_RESOLVER_REF(p, r) grpc_resolver_ref((p), __FILE__, __LINE__, (r)) #define GRPC_RESOLVER_UNREF(p, r, cl) \ grpc_resolver_unref((p), (cl), __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, grpc_closure_list *closure_list, - const char *file, int line, const char *reason); +void grpc_resolver_ref (grpc_resolver * policy, const char *file, int line, const char *reason); +void grpc_resolver_unref (grpc_resolver * policy, grpc_closure_list * closure_list, 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, cl) grpc_resolver_unref((p), (cl)) -void grpc_resolver_ref(grpc_resolver *policy); -void grpc_resolver_unref(grpc_resolver *policy, - grpc_closure_list *closure_list); +void grpc_resolver_ref (grpc_resolver * policy); +void grpc_resolver_unref (grpc_resolver * policy, grpc_closure_list * closure_list); #endif -void grpc_resolver_init(grpc_resolver *resolver, - const grpc_resolver_vtable *vtable); +void grpc_resolver_init (grpc_resolver * resolver, const grpc_resolver_vtable * vtable); -void grpc_resolver_shutdown(grpc_resolver *resolver, - grpc_closure_list *closure_list); +void grpc_resolver_shutdown (grpc_resolver * resolver, grpc_closure_list * closure_list); /** Notification that the channel has seen an error on some address. Can be used as a hint that re-resolution is desirable soon. */ -void grpc_resolver_channel_saw_error(grpc_resolver *resolver, - struct sockaddr *failing_address, - int failing_address_len, - grpc_closure_list *closure_list); +void grpc_resolver_channel_saw_error (grpc_resolver * resolver, struct sockaddr *failing_address, int failing_address_len, grpc_closure_list * closure_list); /** Get the next client config. Called by the channel to fetch a new configuration. Expected to set *target_config with a new configuration, @@ -94,9 +84,6 @@ void grpc_resolver_channel_saw_error(grpc_resolver *resolver, If resolution is fatally broken, set *target_config to NULL and schedule on_complete. */ -void grpc_resolver_next(grpc_resolver *resolver, - grpc_client_config **target_config, - grpc_closure *on_complete, - grpc_closure_list *closure_list); +void grpc_resolver_next (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_CONFIG_RESOLVER_H */ diff --git a/src/core/client_config/resolver_factory.c b/src/core/client_config/resolver_factory.c index af04f7d9c71..d4f8201918a 100644 --- a/src/core/client_config/resolver_factory.c +++ b/src/core/client_config/resolver_factory.c @@ -33,23 +33,31 @@ #include "src/core/client_config/resolver_factory.h" -void grpc_resolver_factory_ref(grpc_resolver_factory *factory) { - factory->vtable->ref(factory); +void +grpc_resolver_factory_ref (grpc_resolver_factory * factory) +{ + factory->vtable->ref (factory); } -void grpc_resolver_factory_unref(grpc_resolver_factory *factory) { - factory->vtable->unref(factory); +void +grpc_resolver_factory_unref (grpc_resolver_factory * factory) +{ + factory->vtable->unref (factory); } /** Create a resolver instance for a name */ -grpc_resolver *grpc_resolver_factory_create_resolver( - grpc_resolver_factory *factory, grpc_resolver_args *args) { - if (factory == NULL) return NULL; - return factory->vtable->create_resolver(factory, args); +grpc_resolver * +grpc_resolver_factory_create_resolver (grpc_resolver_factory * factory, grpc_resolver_args * args) +{ + if (factory == NULL) + return NULL; + return factory->vtable->create_resolver (factory, args); } -char *grpc_resolver_factory_get_default_authority( - grpc_resolver_factory *factory, grpc_uri *uri) { - if (factory == NULL) return NULL; - return factory->vtable->get_default_authority(factory, uri); +char * +grpc_resolver_factory_get_default_authority (grpc_resolver_factory * factory, grpc_uri * uri) +{ + if (factory == NULL) + return NULL; + return factory->vtable->get_default_authority (factory, uri); } diff --git a/src/core/client_config/resolver_factory.h b/src/core/client_config/resolver_factory.h index 4c4df353f7c..920776886a2 100644 --- a/src/core/client_config/resolver_factory.h +++ b/src/core/client_config/resolver_factory.h @@ -43,40 +43,40 @@ typedef struct grpc_resolver_factory_vtable grpc_resolver_factory_vtable; /** grpc_resolver provides grpc_client_config objects to grpc_channel objects */ -struct grpc_resolver_factory { +struct grpc_resolver_factory +{ const grpc_resolver_factory_vtable *vtable; }; -typedef struct grpc_resolver_args { +typedef struct grpc_resolver_args +{ grpc_uri *uri; grpc_subchannel_factory *subchannel_factory; } grpc_resolver_args; -struct grpc_resolver_factory_vtable { - void (*ref)(grpc_resolver_factory *factory); - void (*unref)(grpc_resolver_factory *factory); +struct grpc_resolver_factory_vtable +{ + void (*ref) (grpc_resolver_factory * factory); + void (*unref) (grpc_resolver_factory * factory); /** Implementation of grpc_resolver_factory_create_resolver */ - grpc_resolver *(*create_resolver)(grpc_resolver_factory *factory, - grpc_resolver_args *args); + grpc_resolver *(*create_resolver) (grpc_resolver_factory * factory, grpc_resolver_args * args); /** Implementation of grpc_resolver_factory_get_default_authority */ - char *(*get_default_authority)(grpc_resolver_factory *factory, grpc_uri *uri); + char *(*get_default_authority) (grpc_resolver_factory * factory, grpc_uri * uri); /** URI scheme that this factory implements */ const char *scheme; }; -void grpc_resolver_factory_ref(grpc_resolver_factory *resolver); -void grpc_resolver_factory_unref(grpc_resolver_factory *resolver); +void grpc_resolver_factory_ref (grpc_resolver_factory * resolver); +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_resolver *grpc_resolver_factory_create_resolver (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. */ -char *grpc_resolver_factory_get_default_authority( - grpc_resolver_factory *factory, grpc_uri *uri); +char *grpc_resolver_factory_get_default_authority (grpc_resolver_factory * factory, grpc_uri * uri); #endif /* GRPC_INTERNAL_CORE_CONFIG_RESOLVER_FACTORY_H */ diff --git a/src/core/client_config/resolver_registry.c b/src/core/client_config/resolver_registry.c index 89a945c2d31..1ebf43048ed 100644 --- a/src/core/client_config/resolver_registry.c +++ b/src/core/client_config/resolver_registry.c @@ -46,92 +46,112 @@ static int g_number_of_resolvers = 0; static char *g_default_resolver_prefix; -void grpc_resolver_registry_init(const char *default_resolver_prefix) { +void +grpc_resolver_registry_init (const char *default_resolver_prefix) +{ g_number_of_resolvers = 0; - g_default_resolver_prefix = gpr_strdup(default_resolver_prefix); + g_default_resolver_prefix = gpr_strdup (default_resolver_prefix); } -void grpc_resolver_registry_shutdown(void) { +void +grpc_resolver_registry_shutdown (void) +{ int i; - for (i = 0; i < g_number_of_resolvers; i++) { - grpc_resolver_factory_unref(g_all_of_the_resolvers[i]); - } - gpr_free(g_default_resolver_prefix); + for (i = 0; i < g_number_of_resolvers; i++) + { + grpc_resolver_factory_unref (g_all_of_the_resolvers[i]); + } + gpr_free (g_default_resolver_prefix); } -void grpc_register_resolver_type(grpc_resolver_factory *factory) { +void +grpc_register_resolver_type (grpc_resolver_factory * factory) +{ int i; - for (i = 0; i < g_number_of_resolvers; i++) { - GPR_ASSERT(0 != strcmp(factory->vtable->scheme, - g_all_of_the_resolvers[i]->vtable->scheme)); - } - GPR_ASSERT(g_number_of_resolvers != MAX_RESOLVERS); - grpc_resolver_factory_ref(factory); + for (i = 0; i < g_number_of_resolvers; i++) + { + GPR_ASSERT (0 != strcmp (factory->vtable->scheme, g_all_of_the_resolvers[i]->vtable->scheme)); + } + GPR_ASSERT (g_number_of_resolvers != MAX_RESOLVERS); + grpc_resolver_factory_ref (factory); g_all_of_the_resolvers[g_number_of_resolvers++] = factory; } -static grpc_resolver_factory *lookup_factory(grpc_uri *uri) { +static grpc_resolver_factory * +lookup_factory (grpc_uri * uri) +{ int i; /* handling NULL uri's here simplifies grpc_resolver_create */ - if (!uri) return NULL; - - for (i = 0; i < g_number_of_resolvers; i++) { - if (0 == strcmp(uri->scheme, g_all_of_the_resolvers[i]->vtable->scheme)) { - return g_all_of_the_resolvers[i]; + if (!uri) + return NULL; + + for (i = 0; i < g_number_of_resolvers; i++) + { + if (0 == strcmp (uri->scheme, g_all_of_the_resolvers[i]->vtable->scheme)) + { + return g_all_of_the_resolvers[i]; + } } - } return NULL; } -static grpc_resolver_factory *resolve_factory(const char *target, - grpc_uri **uri) { +static grpc_resolver_factory * +resolve_factory (const char *target, grpc_uri ** uri) +{ char *tmp; grpc_resolver_factory *factory = NULL; - GPR_ASSERT(uri != NULL); - *uri = grpc_uri_parse(target, 1); - factory = lookup_factory(*uri); - if (factory == NULL) { - if (g_default_resolver_prefix != NULL) { - grpc_uri_destroy(*uri); - gpr_asprintf(&tmp, "%s%s", g_default_resolver_prefix, target); - *uri = grpc_uri_parse(tmp, 1); - factory = lookup_factory(*uri); - if (factory == NULL) { - grpc_uri_destroy(grpc_uri_parse(target, 0)); - grpc_uri_destroy(grpc_uri_parse(tmp, 0)); - gpr_log(GPR_ERROR, "don't know how to resolve '%s' or '%s'", target, - tmp); - } - gpr_free(tmp); - } else { - grpc_uri_destroy(grpc_uri_parse(target, 0)); - gpr_log(GPR_ERROR, "don't know how to resolve '%s'", target); + GPR_ASSERT (uri != NULL); + *uri = grpc_uri_parse (target, 1); + factory = lookup_factory (*uri); + if (factory == NULL) + { + if (g_default_resolver_prefix != NULL) + { + grpc_uri_destroy (*uri); + gpr_asprintf (&tmp, "%s%s", g_default_resolver_prefix, target); + *uri = grpc_uri_parse (tmp, 1); + factory = lookup_factory (*uri); + if (factory == NULL) + { + grpc_uri_destroy (grpc_uri_parse (target, 0)); + grpc_uri_destroy (grpc_uri_parse (tmp, 0)); + gpr_log (GPR_ERROR, "don't know how to resolve '%s' or '%s'", target, tmp); + } + gpr_free (tmp); + } + else + { + grpc_uri_destroy (grpc_uri_parse (target, 0)); + gpr_log (GPR_ERROR, "don't know how to resolve '%s'", target); + } } - } return factory; } -grpc_resolver *grpc_resolver_create( - const char *target, grpc_subchannel_factory *subchannel_factory) { +grpc_resolver * +grpc_resolver_create (const char *target, grpc_subchannel_factory * subchannel_factory) +{ grpc_uri *uri = NULL; - grpc_resolver_factory *factory = resolve_factory(target, &uri); + grpc_resolver_factory *factory = resolve_factory (target, &uri); grpc_resolver *resolver; grpc_resolver_args args; - memset(&args, 0, sizeof(args)); + memset (&args, 0, sizeof (args)); args.uri = uri; args.subchannel_factory = subchannel_factory; - resolver = grpc_resolver_factory_create_resolver(factory, &args); - grpc_uri_destroy(uri); + resolver = grpc_resolver_factory_create_resolver (factory, &args); + grpc_uri_destroy (uri); return resolver; } -char *grpc_get_default_authority(const char *target) { +char * +grpc_get_default_authority (const char *target) +{ grpc_uri *uri = NULL; - grpc_resolver_factory *factory = resolve_factory(target, &uri); - char *authority = grpc_resolver_factory_get_default_authority(factory, uri); - grpc_uri_destroy(uri); + grpc_resolver_factory *factory = resolve_factory (target, &uri); + char *authority = grpc_resolver_factory_get_default_authority (factory, uri); + grpc_uri_destroy (uri); return authority; } diff --git a/src/core/client_config/resolver_registry.h b/src/core/client_config/resolver_registry.h index 5a7193b7ae2..d52e50fd133 100644 --- a/src/core/client_config/resolver_registry.h +++ b/src/core/client_config/resolver_registry.h @@ -36,15 +36,15 @@ #include "src/core/client_config/resolver_factory.h" -void grpc_resolver_registry_init(const char *default_prefix); -void grpc_resolver_registry_shutdown(void); +void grpc_resolver_registry_init (const char *default_prefix); +void grpc_resolver_registry_shutdown (void); /** Register a resolver type. URI's of \a scheme will be resolved with the given resolver. If \a priority is greater than zero, then the resolver will be eligible to resolve names that are passed in with no scheme. Higher priority resolvers will be tried before lower priority schemes. */ -void grpc_register_resolver_type(grpc_resolver_factory *factory); +void grpc_register_resolver_type (grpc_resolver_factory * factory); /** Create a resolver given \a target. First tries to parse \a target as a URI. If this succeeds, tries @@ -55,11 +55,10 @@ void grpc_register_resolver_type(grpc_resolver_factory *factory); If a resolver factory was found, use it to instantiate a resolver and return it. If a resolver factory was not found, return NULL. */ -grpc_resolver *grpc_resolver_create( - const char *target, grpc_subchannel_factory *subchannel_factory); +grpc_resolver *grpc_resolver_create (const char *target, grpc_subchannel_factory * subchannel_factory); /** 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 (const char *target); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_RESOLVER_REGISTRY_H */ diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index 73723350cb2..10d6cfa13eb 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -44,7 +44,8 @@ #include "src/core/iomgr/resolve_address.h" #include "src/core/support/string.h" -typedef struct { +typedef struct +{ /** base class: must be first */ grpc_resolver base; /** refcount */ @@ -74,162 +75,175 @@ typedef struct { grpc_client_config *resolved_config; } dns_resolver; -static void dns_destroy(grpc_resolver *r, grpc_closure_list *closure_list); +static void dns_destroy (grpc_resolver * r, grpc_closure_list * closure_list); -static void dns_start_resolving_locked(dns_resolver *r); -static void dns_maybe_finish_next_locked(dns_resolver *r, - grpc_closure_list *closure_list); +static void dns_start_resolving_locked (dns_resolver * r); +static void dns_maybe_finish_next_locked (dns_resolver * r, grpc_closure_list * closure_list); -static void dns_shutdown(grpc_resolver *r, grpc_closure_list *closure_list); -static void dns_channel_saw_error(grpc_resolver *r, - struct sockaddr *failing_address, - int failing_address_len, - grpc_closure_list *closure_list); -static void dns_next(grpc_resolver *r, grpc_client_config **target_config, - grpc_closure *on_complete, - grpc_closure_list *closure_list); +static void dns_shutdown (grpc_resolver * r, grpc_closure_list * closure_list); +static void dns_channel_saw_error (grpc_resolver * r, struct sockaddr *failing_address, int failing_address_len, grpc_closure_list * closure_list); +static void dns_next (grpc_resolver * r, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list); static const grpc_resolver_vtable dns_resolver_vtable = { - dns_destroy, dns_shutdown, dns_channel_saw_error, dns_next}; + dns_destroy, dns_shutdown, dns_channel_saw_error, dns_next +}; -static void dns_shutdown(grpc_resolver *resolver, - grpc_closure_list *closure_list) { - dns_resolver *r = (dns_resolver *)resolver; - gpr_mu_lock(&r->mu); - if (r->next_completion != NULL) { - *r->target_config = NULL; - grpc_closure_list_add(closure_list, r->next_completion, 1); - r->next_completion = NULL; - } - gpr_mu_unlock(&r->mu); +static void +dns_shutdown (grpc_resolver * resolver, grpc_closure_list * closure_list) +{ + dns_resolver *r = (dns_resolver *) resolver; + gpr_mu_lock (&r->mu); + if (r->next_completion != NULL) + { + *r->target_config = NULL; + grpc_closure_list_add (closure_list, r->next_completion, 1); + r->next_completion = NULL; + } + gpr_mu_unlock (&r->mu); } -static void dns_channel_saw_error(grpc_resolver *resolver, struct sockaddr *sa, - int len, grpc_closure_list *closure_list) { - dns_resolver *r = (dns_resolver *)resolver; - gpr_mu_lock(&r->mu); - if (!r->resolving) { - dns_start_resolving_locked(r); - } - gpr_mu_unlock(&r->mu); +static void +dns_channel_saw_error (grpc_resolver * resolver, struct sockaddr *sa, int len, grpc_closure_list * closure_list) +{ + dns_resolver *r = (dns_resolver *) resolver; + gpr_mu_lock (&r->mu); + if (!r->resolving) + { + dns_start_resolving_locked (r); + } + gpr_mu_unlock (&r->mu); } -static void dns_next(grpc_resolver *resolver, - grpc_client_config **target_config, - grpc_closure *on_complete, - grpc_closure_list *closure_list) { - dns_resolver *r = (dns_resolver *)resolver; - gpr_mu_lock(&r->mu); - GPR_ASSERT(!r->next_completion); +static void +dns_next (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list) +{ + dns_resolver *r = (dns_resolver *) resolver; + gpr_mu_lock (&r->mu); + GPR_ASSERT (!r->next_completion); r->next_completion = on_complete; r->target_config = target_config; - if (r->resolved_version == 0 && !r->resolving) { - dns_start_resolving_locked(r); - } else { - dns_maybe_finish_next_locked(r, closure_list); - } - gpr_mu_unlock(&r->mu); + if (r->resolved_version == 0 && !r->resolving) + { + dns_start_resolving_locked (r); + } + else + { + dns_maybe_finish_next_locked (r, closure_list); + } + gpr_mu_unlock (&r->mu); } -static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses, - grpc_closure_list *closure_list) { +static void +dns_on_resolved (void *arg, grpc_resolved_addresses * addresses, grpc_closure_list * closure_list) +{ dns_resolver *r = arg; grpc_client_config *config = NULL; grpc_subchannel **subchannels; grpc_subchannel_args args; grpc_lb_policy *lb_policy; size_t i; - if (addresses) { - grpc_lb_policy_args lb_policy_args; - config = grpc_client_config_create(); - subchannels = gpr_malloc(sizeof(grpc_subchannel *) * addresses->naddrs); - for (i = 0; i < addresses->naddrs; i++) { - memset(&args, 0, sizeof(args)); - args.addr = (struct sockaddr *)(addresses->addrs[i].addr); - args.addr_len = (size_t)addresses->addrs[i].len; - subchannels[i] = grpc_subchannel_factory_create_subchannel( - r->subchannel_factory, &args, closure_list); + if (addresses) + { + grpc_lb_policy_args lb_policy_args; + config = grpc_client_config_create (); + subchannels = gpr_malloc (sizeof (grpc_subchannel *) * addresses->naddrs); + for (i = 0; i < addresses->naddrs; i++) + { + memset (&args, 0, sizeof (args)); + args.addr = (struct sockaddr *) (addresses->addrs[i].addr); + args.addr_len = (size_t) addresses->addrs[i].len; + subchannels[i] = grpc_subchannel_factory_create_subchannel (r->subchannel_factory, &args, closure_list); + } + memset (&lb_policy_args, 0, sizeof (lb_policy_args)); + lb_policy_args.subchannels = subchannels; + lb_policy_args.num_subchannels = addresses->naddrs; + lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args); + grpc_client_config_set_lb_policy (config, lb_policy); + GRPC_LB_POLICY_UNREF (lb_policy, "construction", closure_list); + grpc_resolved_addresses_destroy (addresses); + gpr_free (subchannels); } - memset(&lb_policy_args, 0, sizeof(lb_policy_args)); - lb_policy_args.subchannels = subchannels; - lb_policy_args.num_subchannels = addresses->naddrs; - lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); - grpc_client_config_set_lb_policy(config, lb_policy); - GRPC_LB_POLICY_UNREF(lb_policy, "construction", closure_list); - grpc_resolved_addresses_destroy(addresses); - gpr_free(subchannels); - } - gpr_mu_lock(&r->mu); - GPR_ASSERT(r->resolving); + gpr_mu_lock (&r->mu); + GPR_ASSERT (r->resolving); r->resolving = 0; - if (r->resolved_config) { - grpc_client_config_unref(r->resolved_config, closure_list); - } + if (r->resolved_config) + { + grpc_client_config_unref (r->resolved_config, closure_list); + } r->resolved_config = config; r->resolved_version++; - dns_maybe_finish_next_locked(r, closure_list); - gpr_mu_unlock(&r->mu); + dns_maybe_finish_next_locked (r, closure_list); + gpr_mu_unlock (&r->mu); - GRPC_RESOLVER_UNREF(&r->base, "dns-resolving", closure_list); + GRPC_RESOLVER_UNREF (&r->base, "dns-resolving", closure_list); } -static void dns_start_resolving_locked(dns_resolver *r) { - GRPC_RESOLVER_REF(&r->base, "dns-resolving"); - GPR_ASSERT(!r->resolving); +static void +dns_start_resolving_locked (dns_resolver * r) +{ + GRPC_RESOLVER_REF (&r->base, "dns-resolving"); + GPR_ASSERT (!r->resolving); r->resolving = 1; - grpc_resolve_address(r->name, r->default_port, dns_on_resolved, r); + grpc_resolve_address (r->name, r->default_port, dns_on_resolved, r); } -static void dns_maybe_finish_next_locked(dns_resolver *r, - grpc_closure_list *closure_list) { - if (r->next_completion != NULL && - r->resolved_version != r->published_version) { - *r->target_config = r->resolved_config; - if (r->resolved_config) { - grpc_client_config_ref(r->resolved_config); +static void +dns_maybe_finish_next_locked (dns_resolver * r, grpc_closure_list * closure_list) +{ + if (r->next_completion != NULL && r->resolved_version != r->published_version) + { + *r->target_config = r->resolved_config; + if (r->resolved_config) + { + grpc_client_config_ref (r->resolved_config); + } + grpc_closure_list_add (closure_list, r->next_completion, 1); + r->next_completion = NULL; + r->published_version = r->resolved_version; } - grpc_closure_list_add(closure_list, r->next_completion, 1); - r->next_completion = NULL; - r->published_version = r->resolved_version; - } } -static void dns_destroy(grpc_resolver *gr, grpc_closure_list *closure_list) { - dns_resolver *r = (dns_resolver *)gr; - gpr_mu_destroy(&r->mu); - if (r->resolved_config) { - grpc_client_config_unref(r->resolved_config, closure_list); - } - grpc_subchannel_factory_unref(r->subchannel_factory, closure_list); - gpr_free(r->name); - gpr_free(r->default_port); - gpr_free(r->lb_policy_name); - gpr_free(r); +static void +dns_destroy (grpc_resolver * gr, grpc_closure_list * closure_list) +{ + dns_resolver *r = (dns_resolver *) gr; + gpr_mu_destroy (&r->mu); + if (r->resolved_config) + { + grpc_client_config_unref (r->resolved_config, closure_list); + } + grpc_subchannel_factory_unref (r->subchannel_factory, closure_list); + gpr_free (r->name); + gpr_free (r->default_port); + gpr_free (r->lb_policy_name); + gpr_free (r); } -static grpc_resolver *dns_create(grpc_resolver_args *args, - const char *default_port, - const char *lb_policy_name) { +static grpc_resolver * +dns_create (grpc_resolver_args * args, const char *default_port, const char *lb_policy_name) +{ dns_resolver *r; const char *path = args->uri->path; - if (0 != strcmp(args->uri->authority, "")) { - gpr_log(GPR_ERROR, "authority based dns uri's not supported"); - return NULL; - } + if (0 != strcmp (args->uri->authority, "")) + { + gpr_log (GPR_ERROR, "authority based dns uri's not supported"); + return NULL; + } - if (path[0] == '/') ++path; + if (path[0] == '/') + ++path; - r = gpr_malloc(sizeof(dns_resolver)); - memset(r, 0, sizeof(*r)); - gpr_ref_init(&r->refs, 1); - gpr_mu_init(&r->mu); - grpc_resolver_init(&r->base, &dns_resolver_vtable); - r->name = gpr_strdup(path); - r->default_port = gpr_strdup(default_port); + r = gpr_malloc (sizeof (dns_resolver)); + memset (r, 0, sizeof (*r)); + gpr_ref_init (&r->refs, 1); + gpr_mu_init (&r->mu); + grpc_resolver_init (&r->base, &dns_resolver_vtable); + r->name = gpr_strdup (path); + r->default_port = gpr_strdup (default_port); r->subchannel_factory = args->subchannel_factory; - grpc_subchannel_factory_ref(r->subchannel_factory); - r->lb_policy_name = gpr_strdup(lb_policy_name); + grpc_subchannel_factory_ref (r->subchannel_factory); + r->lb_policy_name = gpr_strdup (lb_policy_name); return &r->base; } @@ -237,27 +251,39 @@ static grpc_resolver *dns_create(grpc_resolver_args *args, * FACTORY */ -static void dns_factory_ref(grpc_resolver_factory *factory) {} +static void +dns_factory_ref (grpc_resolver_factory * factory) +{ +} -static void dns_factory_unref(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", "pick_first"); +static grpc_resolver * +dns_factory_create_resolver (grpc_resolver_factory * factory, grpc_resolver_args * args) +{ + return dns_create (args, "https", "pick_first"); } -char *dns_factory_get_default_host_name(grpc_resolver_factory *factory, - grpc_uri *uri) { +char * +dns_factory_get_default_host_name (grpc_resolver_factory * factory, grpc_uri * uri) +{ const char *path = uri->path; - if (path[0] == '/') ++path; - return gpr_strdup(path); + if (path[0] == '/') + ++path; + return gpr_strdup (path); } static const grpc_resolver_factory_vtable dns_factory_vtable = { - dns_factory_ref, dns_factory_unref, dns_factory_create_resolver, - dns_factory_get_default_host_name, "dns"}; -static grpc_resolver_factory dns_resolver_factory = {&dns_factory_vtable}; + dns_factory_ref, dns_factory_unref, dns_factory_create_resolver, + dns_factory_get_default_host_name, "dns" +}; +static grpc_resolver_factory dns_resolver_factory = { &dns_factory_vtable }; -grpc_resolver_factory *grpc_dns_resolver_factory_create() { +grpc_resolver_factory * +grpc_dns_resolver_factory_create () +{ return &dns_resolver_factory; } diff --git a/src/core/client_config/resolvers/dns_resolver.h b/src/core/client_config/resolvers/dns_resolver.h index a3ef3161a63..bb434991490 100644 --- a/src/core/client_config/resolvers/dns_resolver.h +++ b/src/core/client_config/resolvers/dns_resolver.h @@ -37,6 +37,6 @@ #include "src/core/client_config/resolver_factory.h" /** Create a dns resolver factory */ -grpc_resolver_factory *grpc_dns_resolver_factory_create(void); +grpc_resolver_factory *grpc_dns_resolver_factory_create (void); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_RESOLVERS_DNS_RESOLVER_H */ diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index 378813f45b4..5358caf3bdc 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -49,7 +49,8 @@ #include "src/core/iomgr/resolve_address.h" #include "src/core/support/string.h" -typedef struct { +typedef struct +{ /** base class: must be first */ grpc_resolver base; /** refcount */ @@ -76,285 +77,314 @@ typedef struct { grpc_client_config **target_config; } sockaddr_resolver; -static void sockaddr_destroy(grpc_resolver *r, grpc_closure_list *closure_list); +static void sockaddr_destroy (grpc_resolver * r, grpc_closure_list * closure_list); -static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r, - grpc_closure_list *closure_list); +static void sockaddr_maybe_finish_next_locked (sockaddr_resolver * r, grpc_closure_list * closure_list); -static void sockaddr_shutdown(grpc_resolver *r, - grpc_closure_list *closure_list); -static void sockaddr_channel_saw_error(grpc_resolver *r, - struct sockaddr *failing_address, - int failing_address_len, - grpc_closure_list *closure_list); -static void sockaddr_next(grpc_resolver *r, grpc_client_config **target_config, - grpc_closure *on_complete, - grpc_closure_list *closure_list); +static void sockaddr_shutdown (grpc_resolver * r, grpc_closure_list * closure_list); +static void sockaddr_channel_saw_error (grpc_resolver * r, struct sockaddr *failing_address, int failing_address_len, grpc_closure_list * closure_list); +static void sockaddr_next (grpc_resolver * r, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list); static const grpc_resolver_vtable sockaddr_resolver_vtable = { - sockaddr_destroy, sockaddr_shutdown, sockaddr_channel_saw_error, - sockaddr_next}; - -static void sockaddr_shutdown(grpc_resolver *resolver, - grpc_closure_list *closure_list) { - sockaddr_resolver *r = (sockaddr_resolver *)resolver; - gpr_mu_lock(&r->mu); - if (r->next_completion != NULL) { - *r->target_config = NULL; - grpc_closure_list_add(closure_list, r->next_completion, 1); - r->next_completion = NULL; - } - gpr_mu_unlock(&r->mu); + sockaddr_destroy, sockaddr_shutdown, sockaddr_channel_saw_error, + sockaddr_next +}; + +static void +sockaddr_shutdown (grpc_resolver * resolver, grpc_closure_list * closure_list) +{ + sockaddr_resolver *r = (sockaddr_resolver *) resolver; + gpr_mu_lock (&r->mu); + if (r->next_completion != NULL) + { + *r->target_config = NULL; + grpc_closure_list_add (closure_list, r->next_completion, 1); + r->next_completion = NULL; + } + gpr_mu_unlock (&r->mu); +} + +static void +sockaddr_channel_saw_error (grpc_resolver * resolver, struct sockaddr *sa, int len, grpc_closure_list * closure_list) +{ } -static void sockaddr_channel_saw_error(grpc_resolver *resolver, - struct sockaddr *sa, int len, - grpc_closure_list *closure_list) {} - -static void sockaddr_next(grpc_resolver *resolver, - grpc_client_config **target_config, - grpc_closure *on_complete, - grpc_closure_list *closure_list) { - sockaddr_resolver *r = (sockaddr_resolver *)resolver; - gpr_mu_lock(&r->mu); - GPR_ASSERT(!r->next_completion); +static void +sockaddr_next (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list) +{ + sockaddr_resolver *r = (sockaddr_resolver *) resolver; + gpr_mu_lock (&r->mu); + GPR_ASSERT (!r->next_completion); r->next_completion = on_complete; r->target_config = target_config; - sockaddr_maybe_finish_next_locked(r, closure_list); - gpr_mu_unlock(&r->mu); + sockaddr_maybe_finish_next_locked (r, closure_list); + gpr_mu_unlock (&r->mu); } -static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r, - grpc_closure_list *closure_list) { +static void +sockaddr_maybe_finish_next_locked (sockaddr_resolver * r, grpc_closure_list * closure_list) +{ grpc_client_config *cfg; grpc_lb_policy *lb_policy; grpc_lb_policy_args lb_policy_args; grpc_subchannel **subchannels; grpc_subchannel_args args; - if (r->next_completion != NULL && !r->published) { - size_t i; - cfg = grpc_client_config_create(); - subchannels = gpr_malloc(sizeof(grpc_subchannel *) * r->num_addrs); - for (i = 0; i < r->num_addrs; i++) { - memset(&args, 0, sizeof(args)); - args.addr = (struct sockaddr *)&r->addrs[i]; - args.addr_len = r->addrs_len[i]; - subchannels[i] = grpc_subchannel_factory_create_subchannel( - r->subchannel_factory, &args, closure_list); + if (r->next_completion != NULL && !r->published) + { + size_t i; + cfg = grpc_client_config_create (); + subchannels = gpr_malloc (sizeof (grpc_subchannel *) * r->num_addrs); + for (i = 0; i < r->num_addrs; i++) + { + memset (&args, 0, sizeof (args)); + args.addr = (struct sockaddr *) &r->addrs[i]; + args.addr_len = r->addrs_len[i]; + subchannels[i] = grpc_subchannel_factory_create_subchannel (r->subchannel_factory, &args, closure_list); + } + memset (&lb_policy_args, 0, sizeof (lb_policy_args)); + lb_policy_args.subchannels = subchannels; + lb_policy_args.num_subchannels = r->num_addrs; + lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args); + gpr_free (subchannels); + grpc_client_config_set_lb_policy (cfg, lb_policy); + GRPC_LB_POLICY_UNREF (lb_policy, "sockaddr", closure_list); + r->published = 1; + *r->target_config = cfg; + grpc_closure_list_add (closure_list, r->next_completion, 1); + r->next_completion = NULL; } - memset(&lb_policy_args, 0, sizeof(lb_policy_args)); - lb_policy_args.subchannels = subchannels; - lb_policy_args.num_subchannels = r->num_addrs; - lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); - gpr_free(subchannels); - grpc_client_config_set_lb_policy(cfg, lb_policy); - GRPC_LB_POLICY_UNREF(lb_policy, "sockaddr", closure_list); - r->published = 1; - *r->target_config = cfg; - grpc_closure_list_add(closure_list, r->next_completion, 1); - r->next_completion = NULL; - } } -static void sockaddr_destroy(grpc_resolver *gr, - grpc_closure_list *closure_list) { - sockaddr_resolver *r = (sockaddr_resolver *)gr; - gpr_mu_destroy(&r->mu); - grpc_subchannel_factory_unref(r->subchannel_factory, closure_list); - gpr_free(r->addrs); - gpr_free(r->addrs_len); - gpr_free(r->lb_policy_name); - gpr_free(r); +static void +sockaddr_destroy (grpc_resolver * gr, grpc_closure_list * closure_list) +{ + sockaddr_resolver *r = (sockaddr_resolver *) gr; + gpr_mu_destroy (&r->mu); + grpc_subchannel_factory_unref (r->subchannel_factory, closure_list); + gpr_free (r->addrs); + gpr_free (r->addrs_len); + gpr_free (r->lb_policy_name); + gpr_free (r); } #ifdef GPR_POSIX_SOCKET -static int parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, - size_t *len) { - struct sockaddr_un *un = (struct sockaddr_un *)addr; +static int +parse_unix (grpc_uri * uri, struct sockaddr_storage *addr, size_t * len) +{ + struct sockaddr_un *un = (struct sockaddr_un *) addr; un->sun_family = AF_UNIX; - strcpy(un->sun_path, uri->path); - *len = strlen(un->sun_path) + sizeof(un->sun_family) + 1; + strcpy (un->sun_path, uri->path); + *len = strlen (un->sun_path) + sizeof (un->sun_family) + 1; return 1; } -static char *unix_get_default_authority(grpc_resolver_factory *factory, - grpc_uri *uri) { - return gpr_strdup("localhost"); +static char * +unix_get_default_authority (grpc_resolver_factory * factory, grpc_uri * uri) +{ + return gpr_strdup ("localhost"); } #endif -static char *ip_get_default_authority(grpc_uri *uri) { +static char * +ip_get_default_authority (grpc_uri * uri) +{ const char *path = uri->path; - if (path[0] == '/') ++path; - return gpr_strdup(path); + if (path[0] == '/') + ++path; + return gpr_strdup (path); } -static char *ipv4_get_default_authority(grpc_resolver_factory *factory, - grpc_uri *uri) { - return ip_get_default_authority(uri); +static char * +ipv4_get_default_authority (grpc_resolver_factory * factory, grpc_uri * uri) +{ + return ip_get_default_authority (uri); } -static char *ipv6_get_default_authority(grpc_resolver_factory *factory, - grpc_uri *uri) { - return ip_get_default_authority(uri); +static char * +ipv6_get_default_authority (grpc_resolver_factory * factory, grpc_uri * uri) +{ + return ip_get_default_authority (uri); } -static int parse_ipv4(grpc_uri *uri, struct sockaddr_storage *addr, - size_t *len) { +static int +parse_ipv4 (grpc_uri * uri, struct sockaddr_storage *addr, size_t * len) +{ const char *host_port = uri->path; char *host; char *port; int port_num; int result = 0; - struct sockaddr_in *in = (struct sockaddr_in *)addr; + struct sockaddr_in *in = (struct sockaddr_in *) addr; - if (*host_port == '/') ++host_port; - if (!gpr_split_host_port(host_port, &host, &port)) { - return 0; - } + if (*host_port == '/') + ++host_port; + if (!gpr_split_host_port (host_port, &host, &port)) + { + return 0; + } - memset(in, 0, sizeof(*in)); - *len = sizeof(*in); + memset (in, 0, sizeof (*in)); + *len = sizeof (*in); in->sin_family = AF_INET; - if (inet_pton(AF_INET, host, &in->sin_addr) == 0) { - gpr_log(GPR_ERROR, "invalid ipv4 address: '%s'", host); - goto done; - } + if (inet_pton (AF_INET, host, &in->sin_addr) == 0) + { + gpr_log (GPR_ERROR, "invalid ipv4 address: '%s'", host); + goto done; + } - if (port != NULL) { - if (sscanf(port, "%d", &port_num) != 1 || port_num < 0 || - port_num > 65535) { - gpr_log(GPR_ERROR, "invalid ipv4 port: '%s'", port); + if (port != NULL) + { + if (sscanf (port, "%d", &port_num) != 1 || port_num < 0 || port_num > 65535) + { + gpr_log (GPR_ERROR, "invalid ipv4 port: '%s'", port); + goto done; + } + in->sin_port = htons ((gpr_uint16) port_num); + } + else + { + gpr_log (GPR_ERROR, "no port given for ipv4 scheme"); goto done; } - in->sin_port = htons((gpr_uint16)port_num); - } else { - gpr_log(GPR_ERROR, "no port given for ipv4 scheme"); - goto done; - } result = 1; done: - gpr_free(host); - gpr_free(port); + gpr_free (host); + gpr_free (port); return result; } -static int parse_ipv6(grpc_uri *uri, struct sockaddr_storage *addr, - size_t *len) { +static int +parse_ipv6 (grpc_uri * uri, struct sockaddr_storage *addr, size_t * len) +{ const char *host_port = uri->path; char *host; char *port; int port_num; int result = 0; - struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)addr; + struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) addr; - if (*host_port == '/') ++host_port; - if (!gpr_split_host_port(host_port, &host, &port)) { - return 0; - } + if (*host_port == '/') + ++host_port; + if (!gpr_split_host_port (host_port, &host, &port)) + { + return 0; + } - memset(in6, 0, sizeof(*in6)); - *len = sizeof(*in6); + memset (in6, 0, sizeof (*in6)); + *len = sizeof (*in6); in6->sin6_family = AF_INET6; - if (inet_pton(AF_INET6, host, &in6->sin6_addr) == 0) { - gpr_log(GPR_ERROR, "invalid ipv6 address: '%s'", host); - goto done; - } + if (inet_pton (AF_INET6, host, &in6->sin6_addr) == 0) + { + gpr_log (GPR_ERROR, "invalid ipv6 address: '%s'", host); + goto done; + } - if (port != NULL) { - if (sscanf(port, "%d", &port_num) != 1 || port_num < 0 || - port_num > 65535) { - gpr_log(GPR_ERROR, "invalid ipv6 port: '%s'", port); + if (port != NULL) + { + if (sscanf (port, "%d", &port_num) != 1 || port_num < 0 || port_num > 65535) + { + gpr_log (GPR_ERROR, "invalid ipv6 port: '%s'", port); + goto done; + } + in6->sin6_port = htons ((gpr_uint16) port_num); + } + else + { + gpr_log (GPR_ERROR, "no port given for ipv6 scheme"); goto done; } - in6->sin6_port = htons((gpr_uint16)port_num); - } else { - gpr_log(GPR_ERROR, "no port given for ipv6 scheme"); - goto done; - } result = 1; done: - gpr_free(host); - gpr_free(port); + gpr_free (host); + gpr_free (port); return result; } -static void do_nothing(void *ignored) {} -static grpc_resolver *sockaddr_create( - grpc_resolver_args *args, const char *default_lb_policy_name, - int parse(grpc_uri *uri, struct sockaddr_storage *dst, size_t *len)) { +static void +do_nothing (void *ignored) +{ +} + +static grpc_resolver * +sockaddr_create (grpc_resolver_args * args, const char *default_lb_policy_name, int parse (grpc_uri * uri, struct sockaddr_storage *dst, size_t * len)) +{ size_t i; - int errors_found = 0; /* GPR_FALSE */ + int errors_found = 0; /* GPR_FALSE */ sockaddr_resolver *r; gpr_slice path_slice; gpr_slice_buffer path_parts; - if (0 != strcmp(args->uri->authority, "")) { - gpr_log(GPR_ERROR, "authority based uri's not supported by the %s scheme", - args->uri->scheme); - return NULL; - } + if (0 != strcmp (args->uri->authority, "")) + { + gpr_log (GPR_ERROR, "authority based uri's not supported by the %s scheme", args->uri->scheme); + return NULL; + } - r = gpr_malloc(sizeof(sockaddr_resolver)); - memset(r, 0, sizeof(*r)); + r = gpr_malloc (sizeof (sockaddr_resolver)); + memset (r, 0, sizeof (*r)); r->lb_policy_name = NULL; - if (0 != strcmp(args->uri->query, "")) { - gpr_slice query_slice; - gpr_slice_buffer query_parts; - - query_slice = - gpr_slice_new(args->uri->query, strlen(args->uri->query), do_nothing); - gpr_slice_buffer_init(&query_parts); - gpr_slice_split(query_slice, "=", &query_parts); - GPR_ASSERT(query_parts.count == 2); - if (0 == gpr_slice_str_cmp(query_parts.slices[0], "lb_policy")) { - r->lb_policy_name = gpr_dump_slice(query_parts.slices[1], GPR_DUMP_ASCII); + if (0 != strcmp (args->uri->query, "")) + { + gpr_slice query_slice; + gpr_slice_buffer query_parts; + + query_slice = gpr_slice_new (args->uri->query, strlen (args->uri->query), do_nothing); + gpr_slice_buffer_init (&query_parts); + gpr_slice_split (query_slice, "=", &query_parts); + GPR_ASSERT (query_parts.count == 2); + if (0 == gpr_slice_str_cmp (query_parts.slices[0], "lb_policy")) + { + r->lb_policy_name = gpr_dump_slice (query_parts.slices[1], GPR_DUMP_ASCII); + } + gpr_slice_buffer_destroy (&query_parts); + gpr_slice_unref (query_slice); + } + if (r->lb_policy_name == NULL) + { + r->lb_policy_name = gpr_strdup (default_lb_policy_name); } - gpr_slice_buffer_destroy(&query_parts); - gpr_slice_unref(query_slice); - } - if (r->lb_policy_name == NULL) { - r->lb_policy_name = gpr_strdup(default_lb_policy_name); - } - path_slice = - gpr_slice_new(args->uri->path, strlen(args->uri->path), do_nothing); - gpr_slice_buffer_init(&path_parts); + path_slice = gpr_slice_new (args->uri->path, strlen (args->uri->path), do_nothing); + gpr_slice_buffer_init (&path_parts); - gpr_slice_split(path_slice, ",", &path_parts); + gpr_slice_split (path_slice, ",", &path_parts); r->num_addrs = path_parts.count; - r->addrs = gpr_malloc(sizeof(struct sockaddr_storage) * r->num_addrs); - r->addrs_len = gpr_malloc(sizeof(*r->addrs_len) * r->num_addrs); - - for (i = 0; i < r->num_addrs; i++) { - grpc_uri ith_uri = *args->uri; - char *part_str = gpr_dump_slice(path_parts.slices[i], GPR_DUMP_ASCII); - ith_uri.path = part_str; - if (!parse(&ith_uri, &r->addrs[i], &r->addrs_len[i])) { - errors_found = 1; /* GPR_TRUE */ + r->addrs = gpr_malloc (sizeof (struct sockaddr_storage) * r->num_addrs); + r->addrs_len = gpr_malloc (sizeof (*r->addrs_len) * r->num_addrs); + + for (i = 0; i < r->num_addrs; i++) + { + grpc_uri ith_uri = *args->uri; + char *part_str = gpr_dump_slice (path_parts.slices[i], GPR_DUMP_ASCII); + ith_uri.path = part_str; + if (!parse (&ith_uri, &r->addrs[i], &r->addrs_len[i])) + { + errors_found = 1; /* GPR_TRUE */ + } + gpr_free (part_str); + if (errors_found) + break; } - gpr_free(part_str); - if (errors_found) break; - } - gpr_slice_buffer_destroy(&path_parts); - gpr_slice_unref(path_slice); - if (errors_found) { - gpr_free(r); - return NULL; - } + gpr_slice_buffer_destroy (&path_parts); + gpr_slice_unref (path_slice); + if (errors_found) + { + gpr_free (r); + return NULL; + } - gpr_ref_init(&r->refs, 1); - gpr_mu_init(&r->mu); - grpc_resolver_init(&r->base, &sockaddr_resolver_vtable); + gpr_ref_init (&r->refs, 1); + gpr_mu_init (&r->mu); + grpc_resolver_init (&r->base, &sockaddr_resolver_vtable); r->subchannel_factory = args->subchannel_factory; - grpc_subchannel_factory_ref(r->subchannel_factory); + grpc_subchannel_factory_ref (r->subchannel_factory); return &r->base; } @@ -363,9 +393,15 @@ static grpc_resolver *sockaddr_create( * FACTORY */ -static void sockaddr_factory_ref(grpc_resolver_factory *factory) {} +static void +sockaddr_factory_ref (grpc_resolver_factory * factory) +{ +} -static void sockaddr_factory_unref(grpc_resolver_factory *factory) {} +static void +sockaddr_factory_unref (grpc_resolver_factory * factory) +{ +} #define DECL_FACTORY(name) \ static grpc_resolver *name##_factory_create_resolver( \ @@ -382,7 +418,6 @@ static void sockaddr_factory_unref(grpc_resolver_factory *factory) {} } #ifdef GPR_POSIX_SOCKET -DECL_FACTORY(unix) +DECL_FACTORY (unix) #endif -DECL_FACTORY(ipv4) -DECL_FACTORY(ipv6) + DECL_FACTORY (ipv4) DECL_FACTORY (ipv6) diff --git a/src/core/client_config/resolvers/sockaddr_resolver.h b/src/core/client_config/resolvers/sockaddr_resolver.h index 1b7a18f9c2a..c778812e497 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.h +++ b/src/core/client_config/resolvers/sockaddr_resolver.h @@ -38,13 +38,13 @@ #include "src/core/client_config/resolver_factory.h" -grpc_resolver_factory *grpc_ipv4_resolver_factory_create(void); +grpc_resolver_factory *grpc_ipv4_resolver_factory_create (void); -grpc_resolver_factory *grpc_ipv6_resolver_factory_create(void); +grpc_resolver_factory *grpc_ipv6_resolver_factory_create (void); #ifdef GPR_POSIX_SOCKET /** Create a unix resolver factory */ -grpc_resolver_factory *grpc_unix_resolver_factory_create(void); +grpc_resolver_factory *grpc_unix_resolver_factory_create (void); #endif #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_RESOLVERS_UNIX_RESOLVER_H */ diff --git a/src/core/client_config/resolvers/zookeeper_resolver.c b/src/core/client_config/resolvers/zookeeper_resolver.c index db2bf7552f2..3e2040c4127 100644 --- a/src/core/client_config/resolvers/zookeeper_resolver.c +++ b/src/core/client_config/resolvers/zookeeper_resolver.c @@ -50,7 +50,8 @@ /** Zookeeper session expiration time in milliseconds */ #define GRPC_ZOOKEEPER_SESSION_TIMEOUT 15000 -typedef struct { +typedef struct +{ /** base class: must be first */ grpc_resolver base; /** refcount */ @@ -87,101 +88,119 @@ typedef struct { int resolved_num; } zookeeper_resolver; -static void zookeeper_destroy(grpc_resolver *r); +static void zookeeper_destroy (grpc_resolver * r); -static void zookeeper_start_resolving_locked(zookeeper_resolver *r); -static grpc_closure *zookeeper_maybe_finish_next_locked(zookeeper_resolver *r) - GRPC_MUST_USE_RESULT; +static void zookeeper_start_resolving_locked (zookeeper_resolver * r); +static grpc_closure * +zookeeper_maybe_finish_next_locked (zookeeper_resolver * r) + GRPC_MUST_USE_RESULT; -static void zookeeper_shutdown(grpc_resolver *r); -static void zookeeper_channel_saw_error(grpc_resolver *r, - struct sockaddr *failing_address, - int failing_address_len); -static void zookeeper_next(grpc_resolver *r, grpc_client_config **target_config, - grpc_closure *on_complete); + static void zookeeper_shutdown (grpc_resolver * r); + static void zookeeper_channel_saw_error (grpc_resolver * r, struct sockaddr *failing_address, int failing_address_len); + static void zookeeper_next (grpc_resolver * r, grpc_client_config ** target_config, grpc_closure * on_complete); -static const grpc_resolver_vtable zookeeper_resolver_vtable = { - zookeeper_destroy, zookeeper_shutdown, zookeeper_channel_saw_error, - zookeeper_next}; + static const grpc_resolver_vtable zookeeper_resolver_vtable = { + zookeeper_destroy, zookeeper_shutdown, zookeeper_channel_saw_error, + zookeeper_next + }; -static void zookeeper_shutdown(grpc_resolver *resolver) { - zookeeper_resolver *r = (zookeeper_resolver *)resolver; +static void +zookeeper_shutdown (grpc_resolver * resolver) +{ + zookeeper_resolver *r = (zookeeper_resolver *) resolver; grpc_closure *call = NULL; - gpr_mu_lock(&r->mu); - if (r->next_completion != NULL) { - *r->target_config = NULL; - call = r->next_completion; - r->next_completion = NULL; - } - zookeeper_close(r->zookeeper_handle); - gpr_mu_unlock(&r->mu); - if (call != NULL) { - call->cb(call->cb_arg, 1); - } + gpr_mu_lock (&r->mu); + if (r->next_completion != NULL) + { + *r->target_config = NULL; + call = r->next_completion; + r->next_completion = NULL; + } + zookeeper_close (r->zookeeper_handle); + gpr_mu_unlock (&r->mu); + if (call != NULL) + { + call->cb (call->cb_arg, 1); + } } -static void zookeeper_channel_saw_error(grpc_resolver *resolver, - struct sockaddr *sa, int len) { - zookeeper_resolver *r = (zookeeper_resolver *)resolver; - gpr_mu_lock(&r->mu); - if (r->resolving == 0) { - zookeeper_start_resolving_locked(r); - } - gpr_mu_unlock(&r->mu); +static void +zookeeper_channel_saw_error (grpc_resolver * resolver, struct sockaddr *sa, int len) +{ + zookeeper_resolver *r = (zookeeper_resolver *) resolver; + gpr_mu_lock (&r->mu); + if (r->resolving == 0) + { + zookeeper_start_resolving_locked (r); + } + gpr_mu_unlock (&r->mu); } -static void zookeeper_next(grpc_resolver *resolver, - grpc_client_config **target_config, - grpc_closure *on_complete) { - zookeeper_resolver *r = (zookeeper_resolver *)resolver; +static void +zookeeper_next (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete) +{ + zookeeper_resolver *r = (zookeeper_resolver *) resolver; grpc_closure *call; - gpr_mu_lock(&r->mu); - GPR_ASSERT(r->next_completion == NULL); + gpr_mu_lock (&r->mu); + GPR_ASSERT (r->next_completion == NULL); r->next_completion = on_complete; r->target_config = target_config; - if (r->resolved_version == 0 && r->resolving == 0) { - zookeeper_start_resolving_locked(r); - } else { - call = zookeeper_maybe_finish_next_locked(r); - } - gpr_mu_unlock(&r->mu); - if (call) call->cb(call->cb_arg, 1); + if (r->resolved_version == 0 && r->resolving == 0) + { + zookeeper_start_resolving_locked (r); + } + else + { + call = zookeeper_maybe_finish_next_locked (r); + } + gpr_mu_unlock (&r->mu); + if (call) + call->cb (call->cb_arg, 1); } /** Zookeeper global watcher for connection management TODO: better connection management besides logs */ -static void zookeeper_global_watcher(zhandle_t *zookeeper_handle, int type, - int state, const char *path, - void *watcher_ctx) { - if (type == ZOO_SESSION_EVENT) { - if (state == ZOO_EXPIRED_SESSION_STATE) { - gpr_log(GPR_ERROR, "Zookeeper session expired"); - } else if (state == ZOO_AUTH_FAILED_STATE) { - gpr_log(GPR_ERROR, "Zookeeper authentication failed"); +static void +zookeeper_global_watcher (zhandle_t * zookeeper_handle, int type, int state, const char *path, void *watcher_ctx) +{ + if (type == ZOO_SESSION_EVENT) + { + if (state == ZOO_EXPIRED_SESSION_STATE) + { + gpr_log (GPR_ERROR, "Zookeeper session expired"); + } + else if (state == ZOO_AUTH_FAILED_STATE) + { + gpr_log (GPR_ERROR, "Zookeeper authentication failed"); + } } - } } /** Zookeeper watcher triggered by changes to watched nodes Once triggered, it tries to resolve again to get updated addresses */ -static void zookeeper_watcher(zhandle_t *zookeeper_handle, int type, int state, - const char *path, void *watcher_ctx) { - if (watcher_ctx != NULL) { - zookeeper_resolver *r = (zookeeper_resolver *)watcher_ctx; - if (state == ZOO_CONNECTED_STATE) { - gpr_mu_lock(&r->mu); - if (r->resolving == 0) { - zookeeper_start_resolving_locked(r); - } - gpr_mu_unlock(&r->mu); +static void +zookeeper_watcher (zhandle_t * zookeeper_handle, int type, int state, const char *path, void *watcher_ctx) +{ + if (watcher_ctx != NULL) + { + zookeeper_resolver *r = (zookeeper_resolver *) watcher_ctx; + if (state == ZOO_CONNECTED_STATE) + { + gpr_mu_lock (&r->mu); + if (r->resolving == 0) + { + zookeeper_start_resolving_locked (r); + } + gpr_mu_unlock (&r->mu); + } } - } } /** Callback function after getting all resolved addresses Creates a subchannel for each address */ -static void zookeeper_on_resolved(void *arg, - grpc_resolved_addresses *addresses) { +static void +zookeeper_on_resolved (void *arg, grpc_resolved_addresses * addresses) +{ zookeeper_resolver *r = arg; grpc_client_config *config = NULL; grpc_subchannel **subchannels; @@ -189,74 +208,77 @@ static void zookeeper_on_resolved(void *arg, grpc_lb_policy *lb_policy; grpc_closure *call; size_t i; - if (addresses != NULL) { - grpc_lb_policy_args lb_policy_args; - config = grpc_client_config_create(); - subchannels = gpr_malloc(sizeof(grpc_subchannel *) * addresses->naddrs); - for (i = 0; i < addresses->naddrs; i++) { - memset(&args, 0, sizeof(args)); - args.addr = (struct sockaddr *)(addresses->addrs[i].addr); - args.addr_len = addresses->addrs[i].len; - subchannels[i] = grpc_subchannel_factory_create_subchannel( - r->subchannel_factory, &args); + if (addresses != NULL) + { + grpc_lb_policy_args lb_policy_args; + config = grpc_client_config_create (); + subchannels = gpr_malloc (sizeof (grpc_subchannel *) * addresses->naddrs); + for (i = 0; i < addresses->naddrs; i++) + { + memset (&args, 0, sizeof (args)); + args.addr = (struct sockaddr *) (addresses->addrs[i].addr); + args.addr_len = addresses->addrs[i].len; + subchannels[i] = grpc_subchannel_factory_create_subchannel (r->subchannel_factory, &args); + } + lb_policy_args.subchannels = subchannels; + lb_policy_args.num_subchannels = addresses->naddrs; + lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args); + grpc_client_config_set_lb_policy (config, lb_policy); + GRPC_LB_POLICY_UNREF (lb_policy, "construction"); + grpc_resolved_addresses_destroy (addresses); + gpr_free (subchannels); } - lb_policy_args.subchannels = subchannels; - lb_policy_args.num_subchannels = addresses->naddrs; - lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); - grpc_client_config_set_lb_policy(config, lb_policy); - GRPC_LB_POLICY_UNREF(lb_policy, "construction"); - grpc_resolved_addresses_destroy(addresses); - gpr_free(subchannels); - } - gpr_mu_lock(&r->mu); - GPR_ASSERT(r->resolving == 1); + gpr_mu_lock (&r->mu); + GPR_ASSERT (r->resolving == 1); r->resolving = 0; - if (r->resolved_config != NULL) { - grpc_client_config_unref(r->resolved_config); - } + if (r->resolved_config != NULL) + { + grpc_client_config_unref (r->resolved_config); + } r->resolved_config = config; r->resolved_version++; - call = zookeeper_maybe_finish_next_locked(r); - gpr_mu_unlock(&r->mu); + call = zookeeper_maybe_finish_next_locked (r); + gpr_mu_unlock (&r->mu); - if (call) call->cb(call->cb_arg, 1); + if (call) + call->cb (call->cb_arg, 1); - GRPC_RESOLVER_UNREF(&r->base, "zookeeper-resolving"); + GRPC_RESOLVER_UNREF (&r->base, "zookeeper-resolving"); } /** Callback function for each DNS resolved address */ -static void zookeeper_dns_resolved(void *arg, - grpc_resolved_addresses *addresses) { +static void +zookeeper_dns_resolved (void *arg, grpc_resolved_addresses * addresses) +{ size_t i; zookeeper_resolver *r = arg; int resolve_done = 0; - gpr_mu_lock(&r->mu); + gpr_mu_lock (&r->mu); r->resolved_num++; - r->resolved_addrs->addrs = - gpr_realloc(r->resolved_addrs->addrs, - sizeof(grpc_resolved_address) * - (r->resolved_addrs->naddrs + addresses->naddrs)); - for (i = 0; i < addresses->naddrs; i++) { - memcpy(r->resolved_addrs->addrs[i + r->resolved_addrs->naddrs].addr, - addresses->addrs[i].addr, addresses->addrs[i].len); - r->resolved_addrs->addrs[i + r->resolved_addrs->naddrs].len = - addresses->addrs[i].len; - } + r->resolved_addrs->addrs = gpr_realloc (r->resolved_addrs->addrs, sizeof (grpc_resolved_address) * (r->resolved_addrs->naddrs + addresses->naddrs)); + for (i = 0; i < addresses->naddrs; i++) + { + memcpy (r->resolved_addrs->addrs[i + r->resolved_addrs->naddrs].addr, addresses->addrs[i].addr, addresses->addrs[i].len); + r->resolved_addrs->addrs[i + r->resolved_addrs->naddrs].len = addresses->addrs[i].len; + } r->resolved_addrs->naddrs += addresses->naddrs; - grpc_resolved_addresses_destroy(addresses); + grpc_resolved_addresses_destroy (addresses); /** Wait for all addresses to be resolved */ resolve_done = (r->resolved_num == r->resolved_total); - gpr_mu_unlock(&r->mu); - if (resolve_done) { - zookeeper_on_resolved(r, r->resolved_addrs); - } + gpr_mu_unlock (&r->mu); + if (resolve_done) + { + zookeeper_on_resolved (r, r->resolved_addrs); + } } /** Parses JSON format address of a zookeeper node */ -static char *zookeeper_parse_address(const char *value, size_t value_len) { +static char * +zookeeper_parse_address (const char *value, size_t value_len) +{ grpc_json *json; grpc_json *cur; const char *host; @@ -264,255 +286,301 @@ static char *zookeeper_parse_address(const char *value, size_t value_len) { char *buffer; char *address = NULL; - buffer = gpr_malloc(value_len); - memcpy(buffer, value, value_len); - json = grpc_json_parse_string_with_len(buffer, value_len); - if (json != NULL) { - host = NULL; - port = NULL; - for (cur = json->child; cur != NULL; cur = cur->next) { - if (!strcmp(cur->key, "host")) { - host = cur->value; - if (port != NULL) { - break; - } - } else if (!strcmp(cur->key, "port")) { - port = cur->value; - if (host != NULL) { - break; - } - } - } - if (host != NULL && port != NULL) { - gpr_asprintf(&address, "%s:%s", host, port); + buffer = gpr_malloc (value_len); + memcpy (buffer, value, value_len); + json = grpc_json_parse_string_with_len (buffer, value_len); + if (json != NULL) + { + host = NULL; + port = NULL; + for (cur = json->child; cur != NULL; cur = cur->next) + { + if (!strcmp (cur->key, "host")) + { + host = cur->value; + if (port != NULL) + { + break; + } + } + else if (!strcmp (cur->key, "port")) + { + port = cur->value; + if (host != NULL) + { + break; + } + } + } + if (host != NULL && port != NULL) + { + gpr_asprintf (&address, "%s:%s", host, port); + } + grpc_json_destroy (json); } - grpc_json_destroy(json); - } - gpr_free(buffer); + gpr_free (buffer); return address; } -static void zookeeper_get_children_node_completion(int rc, const char *value, - int value_len, - const struct Stat *stat, - const void *arg) { +static void +zookeeper_get_children_node_completion (int rc, const char *value, int value_len, const struct Stat *stat, const void *arg) +{ char *address = NULL; - zookeeper_resolver *r = (zookeeper_resolver *)arg; + zookeeper_resolver *r = (zookeeper_resolver *) arg; int resolve_done = 0; - if (rc != 0) { - gpr_log(GPR_ERROR, "Error in getting a child node of %s", r->name); - return; - } + if (rc != 0) + { + gpr_log (GPR_ERROR, "Error in getting a child node of %s", r->name); + return; + } - address = zookeeper_parse_address(value, (size_t)value_len); - if (address != NULL) { + address = zookeeper_parse_address (value, (size_t) value_len); + if (address != NULL) + { /** Further resolves address by DNS */ - grpc_resolve_address(address, NULL, zookeeper_dns_resolved, r); - gpr_free(address); - } else { - gpr_log(GPR_ERROR, "Error in resolving a child node of %s", r->name); - gpr_mu_lock(&r->mu); - r->resolved_total--; - resolve_done = (r->resolved_num == r->resolved_total); - gpr_mu_unlock(&r->mu); - if (resolve_done) { - zookeeper_on_resolved(r, r->resolved_addrs); + grpc_resolve_address (address, NULL, zookeeper_dns_resolved, r); + gpr_free (address); + } + else + { + gpr_log (GPR_ERROR, "Error in resolving a child node of %s", r->name); + gpr_mu_lock (&r->mu); + r->resolved_total--; + resolve_done = (r->resolved_num == r->resolved_total); + gpr_mu_unlock (&r->mu); + if (resolve_done) + { + zookeeper_on_resolved (r, r->resolved_addrs); + } } - } } -static void zookeeper_get_children_completion( - int rc, const struct String_vector *children, const void *arg) { +static void +zookeeper_get_children_completion (int rc, const struct String_vector *children, const void *arg) +{ char *path; int status; int i; - zookeeper_resolver *r = (zookeeper_resolver *)arg; + zookeeper_resolver *r = (zookeeper_resolver *) arg; - if (rc != 0) { - gpr_log(GPR_ERROR, "Error in getting zookeeper children of %s", r->name); - return; - } + if (rc != 0) + { + gpr_log (GPR_ERROR, "Error in getting zookeeper children of %s", r->name); + return; + } - if (children->count == 0) { - gpr_log(GPR_ERROR, "Error in resolving zookeeper address %s", r->name); - return; - } + if (children->count == 0) + { + gpr_log (GPR_ERROR, "Error in resolving zookeeper address %s", r->name); + return; + } - r->resolved_addrs = gpr_malloc(sizeof(grpc_resolved_addresses)); + r->resolved_addrs = gpr_malloc (sizeof (grpc_resolved_addresses)); r->resolved_addrs->addrs = NULL; r->resolved_addrs->naddrs = 0; r->resolved_total = children->count; /** TODO: Replace expensive heap allocation with stack if we can get maximum length of zookeeper path */ - for (i = 0; i < children->count; i++) { - gpr_asprintf(&path, "%s/%s", r->name, children->data[i]); - status = zoo_awget(r->zookeeper_handle, path, zookeeper_watcher, r, - zookeeper_get_children_node_completion, r); - gpr_free(path); - if (status != 0) { - gpr_log(GPR_ERROR, "Error in getting zookeeper node %s", path); + for (i = 0; i < children->count; i++) + { + gpr_asprintf (&path, "%s/%s", r->name, children->data[i]); + status = zoo_awget (r->zookeeper_handle, path, zookeeper_watcher, r, zookeeper_get_children_node_completion, r); + gpr_free (path); + if (status != 0) + { + gpr_log (GPR_ERROR, "Error in getting zookeeper node %s", path); + } } - } } -static void zookeeper_get_node_completion(int rc, const char *value, - int value_len, - const struct Stat *stat, - const void *arg) { +static void +zookeeper_get_node_completion (int rc, const char *value, int value_len, const struct Stat *stat, const void *arg) +{ int status; char *address = NULL; - zookeeper_resolver *r = (zookeeper_resolver *)arg; + zookeeper_resolver *r = (zookeeper_resolver *) arg; r->resolved_addrs = NULL; r->resolved_total = 0; r->resolved_num = 0; - if (rc != 0) { - gpr_log(GPR_ERROR, "Error in getting zookeeper node %s", r->name); - return; - } + if (rc != 0) + { + gpr_log (GPR_ERROR, "Error in getting zookeeper node %s", r->name); + return; + } /** If zookeeper node of path r->name does not have address (i.e. service node), get its children */ - address = zookeeper_parse_address(value, (size_t)value_len); - if (address != NULL) { - r->resolved_addrs = gpr_malloc(sizeof(grpc_resolved_addresses)); - r->resolved_addrs->addrs = NULL; - r->resolved_addrs->naddrs = 0; - r->resolved_total = 1; + address = zookeeper_parse_address (value, (size_t) value_len); + if (address != NULL) + { + r->resolved_addrs = gpr_malloc (sizeof (grpc_resolved_addresses)); + r->resolved_addrs->addrs = NULL; + r->resolved_addrs->naddrs = 0; + r->resolved_total = 1; /** Further resolves address by DNS */ - grpc_resolve_address(address, NULL, zookeeper_dns_resolved, r); - gpr_free(address); - return; - } - - status = zoo_awget_children(r->zookeeper_handle, r->name, zookeeper_watcher, - r, zookeeper_get_children_completion, r); - if (status != 0) { - gpr_log(GPR_ERROR, "Error in getting zookeeper children of %s", r->name); - } + grpc_resolve_address (address, NULL, zookeeper_dns_resolved, r); + gpr_free (address); + return; + } + + status = zoo_awget_children (r->zookeeper_handle, r->name, zookeeper_watcher, r, zookeeper_get_children_completion, r); + if (status != 0) + { + gpr_log (GPR_ERROR, "Error in getting zookeeper children of %s", r->name); + } } -static void zookeeper_resolve_address(zookeeper_resolver *r) { +static void +zookeeper_resolve_address (zookeeper_resolver * r) +{ int status; - status = zoo_awget(r->zookeeper_handle, r->name, zookeeper_watcher, r, - zookeeper_get_node_completion, r); - if (status != 0) { - gpr_log(GPR_ERROR, "Error in getting zookeeper node %s", r->name); - } + status = zoo_awget (r->zookeeper_handle, r->name, zookeeper_watcher, r, zookeeper_get_node_completion, r); + if (status != 0) + { + gpr_log (GPR_ERROR, "Error in getting zookeeper node %s", r->name); + } } -static void zookeeper_start_resolving_locked(zookeeper_resolver *r) { - GRPC_RESOLVER_REF(&r->base, "zookeeper-resolving"); - GPR_ASSERT(r->resolving == 0); +static void +zookeeper_start_resolving_locked (zookeeper_resolver * r) +{ + GRPC_RESOLVER_REF (&r->base, "zookeeper-resolving"); + GPR_ASSERT (r->resolving == 0); r->resolving = 1; - zookeeper_resolve_address(r); + zookeeper_resolve_address (r); } -static grpc_closure *zookeeper_maybe_finish_next_locked(zookeeper_resolver *r) { +static grpc_closure * +zookeeper_maybe_finish_next_locked (zookeeper_resolver * r) +{ grpc_closure *call = NULL; - if (r->next_completion != NULL && - r->resolved_version != r->published_version) { - *r->target_config = r->resolved_config; - if (r->resolved_config != NULL) { - grpc_client_config_ref(r->resolved_config); + if (r->next_completion != NULL && r->resolved_version != r->published_version) + { + *r->target_config = r->resolved_config; + if (r->resolved_config != NULL) + { + grpc_client_config_ref (r->resolved_config); + } + call = r->next_completion; + r->next_completion = NULL; + r->published_version = r->resolved_version; } - call = r->next_completion; - r->next_completion = NULL; - r->published_version = r->resolved_version; - } return call; } -static void zookeeper_destroy(grpc_resolver *gr) { - zookeeper_resolver *r = (zookeeper_resolver *)gr; - gpr_mu_destroy(&r->mu); - if (r->resolved_config != NULL) { - grpc_client_config_unref(r->resolved_config); - } - grpc_subchannel_factory_unref(r->subchannel_factory); - gpr_free(r->name); - gpr_free(r->lb_policy_name); - gpr_free(r); +static void +zookeeper_destroy (grpc_resolver * gr) +{ + zookeeper_resolver *r = (zookeeper_resolver *) gr; + gpr_mu_destroy (&r->mu); + if (r->resolved_config != NULL) + { + grpc_client_config_unref (r->resolved_config); + } + grpc_subchannel_factory_unref (r->subchannel_factory); + gpr_free (r->name); + gpr_free (r->lb_policy_name); + gpr_free (r); } -static grpc_resolver *zookeeper_create(grpc_resolver_args *args, - const char *lb_policy_name) { +static grpc_resolver * +zookeeper_create (grpc_resolver_args * args, const char *lb_policy_name) +{ zookeeper_resolver *r; size_t length; char *path = args->uri->path; - if (0 == strcmp(args->uri->authority, "")) { - gpr_log(GPR_ERROR, "No authority specified in zookeeper uri"); - return NULL; - } + if (0 == strcmp (args->uri->authority, "")) + { + gpr_log (GPR_ERROR, "No authority specified in zookeeper uri"); + return NULL; + } /** Removes the trailing slash if exists */ - length = strlen(path); - if (length > 1 && path[length - 1] == '/') { - path[length - 1] = 0; - } - - r = gpr_malloc(sizeof(zookeeper_resolver)); - memset(r, 0, sizeof(*r)); - gpr_ref_init(&r->refs, 1); - gpr_mu_init(&r->mu); - grpc_resolver_init(&r->base, &zookeeper_resolver_vtable); - r->name = gpr_strdup(path); + length = strlen (path); + if (length > 1 && path[length - 1] == '/') + { + path[length - 1] = 0; + } + + r = gpr_malloc (sizeof (zookeeper_resolver)); + memset (r, 0, sizeof (*r)); + gpr_ref_init (&r->refs, 1); + gpr_mu_init (&r->mu); + grpc_resolver_init (&r->base, &zookeeper_resolver_vtable); + r->name = gpr_strdup (path); r->subchannel_factory = args->subchannel_factory; - grpc_subchannel_factory_ref(r->subchannel_factory); + grpc_subchannel_factory_ref (r->subchannel_factory); - r->lb_policy_name = gpr_strdup(lb_policy_name); + r->lb_policy_name = gpr_strdup (lb_policy_name); /** Initializes zookeeper client */ - zoo_set_debug_level(ZOO_LOG_LEVEL_WARN); - r->zookeeper_handle = - zookeeper_init(args->uri->authority, zookeeper_global_watcher, - GRPC_ZOOKEEPER_SESSION_TIMEOUT, 0, 0, 0); - if (r->zookeeper_handle == NULL) { - gpr_log(GPR_ERROR, "Unable to connect to zookeeper server"); - return NULL; - } + zoo_set_debug_level (ZOO_LOG_LEVEL_WARN); + r->zookeeper_handle = zookeeper_init (args->uri->authority, zookeeper_global_watcher, GRPC_ZOOKEEPER_SESSION_TIMEOUT, 0, 0, 0); + if (r->zookeeper_handle == NULL) + { + gpr_log (GPR_ERROR, "Unable to connect to zookeeper server"); + return NULL; + } return &r->base; } -static void zookeeper_plugin_init() { - grpc_register_resolver_type(grpc_zookeeper_resolver_factory_create()); +static void +zookeeper_plugin_init () +{ + grpc_register_resolver_type (grpc_zookeeper_resolver_factory_create ()); } -void grpc_zookeeper_register() { - grpc_register_plugin(zookeeper_plugin_init, NULL); +void +grpc_zookeeper_register () +{ + grpc_register_plugin (zookeeper_plugin_init, NULL); } /* * FACTORY */ -static void zookeeper_factory_ref(grpc_resolver_factory *factory) {} +static void +zookeeper_factory_ref (grpc_resolver_factory * factory) +{ +} -static void zookeeper_factory_unref(grpc_resolver_factory *factory) {} +static void +zookeeper_factory_unref (grpc_resolver_factory * factory) +{ +} -static char *zookeeper_factory_get_default_hostname( - grpc_resolver_factory *factory, grpc_uri *uri) { +static char * +zookeeper_factory_get_default_hostname (grpc_resolver_factory * factory, grpc_uri * uri) +{ return NULL; } -static grpc_resolver *zookeeper_factory_create_resolver( - grpc_resolver_factory *factory, grpc_resolver_args *args) { - return zookeeper_create(args, "pick_first"); +static grpc_resolver * +zookeeper_factory_create_resolver (grpc_resolver_factory * factory, grpc_resolver_args * args) +{ + return zookeeper_create (args, "pick_first"); } static const grpc_resolver_factory_vtable zookeeper_factory_vtable = { - zookeeper_factory_ref, zookeeper_factory_unref, - zookeeper_factory_create_resolver, zookeeper_factory_get_default_hostname, - "zookeeper"}; + zookeeper_factory_ref, zookeeper_factory_unref, + zookeeper_factory_create_resolver, zookeeper_factory_get_default_hostname, + "zookeeper" +}; + static grpc_resolver_factory zookeeper_resolver_factory = { - &zookeeper_factory_vtable}; + &zookeeper_factory_vtable +}; -grpc_resolver_factory *grpc_zookeeper_resolver_factory_create() { +grpc_resolver_factory * +grpc_zookeeper_resolver_factory_create () +{ return &zookeeper_resolver_factory; } diff --git a/src/core/client_config/resolvers/zookeeper_resolver.h b/src/core/client_config/resolvers/zookeeper_resolver.h index a6f002dd6d4..86b4480b15b 100644 --- a/src/core/client_config/resolvers/zookeeper_resolver.h +++ b/src/core/client_config/resolvers/zookeeper_resolver.h @@ -37,6 +37,6 @@ #include "src/core/client_config/resolver_factory.h" /** Create a zookeeper resolver factory */ -grpc_resolver_factory *grpc_zookeeper_resolver_factory_create(void); +grpc_resolver_factory *grpc_zookeeper_resolver_factory_create (void); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_RESOLVERS_ZOOKEEPER_RESOLVER_H */ diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index d41bf8f566a..778d1e8b500 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -50,7 +50,8 @@ #define GRPC_SUBCHANNEL_RECONNECT_MAX_BACKOFF_SECONDS 120 #define GRPC_SUBCHANNEL_RECONNECT_JITTER 0.2 -typedef struct { +typedef struct +{ /* all fields protected by subchannel->mu */ /** refcount */ int refs; @@ -58,14 +59,16 @@ typedef struct { grpc_subchannel *subchannel; } connection; -typedef struct { +typedef struct +{ grpc_closure closure; size_t version; grpc_subchannel *subchannel; grpc_connectivity_state connectivity_state; } state_watcher; -typedef struct waiting_for_connect { +typedef struct waiting_for_connect +{ struct waiting_for_connect *next; grpc_closure *notify; grpc_pollset *pollset; @@ -74,7 +77,8 @@ typedef struct waiting_for_connect { grpc_closure continuation; } waiting_for_connect; -struct grpc_subchannel { +struct grpc_subchannel +{ grpc_connector *connector; /** non-transport related channel filters */ @@ -135,7 +139,8 @@ struct grpc_subchannel { gpr_uint32 random; }; -struct grpc_subchannel_call { +struct grpc_subchannel_call +{ connection *connection; gpr_refcount refs; }; @@ -143,26 +148,19 @@ struct grpc_subchannel_call { #define SUBCHANNEL_CALL_TO_CALL_STACK(call) ((grpc_call_stack *)((call) + 1)) #define CHANNEL_STACK_FROM_CONNECTION(con) ((grpc_channel_stack *)((con) + 1)) -static grpc_subchannel_call *create_call(connection *con, - grpc_closure_list *closure_list); -static void connectivity_state_changed_locked(grpc_subchannel *c, - const char *reason, - grpc_closure_list *closure_list); -static grpc_connectivity_state compute_connectivity_locked(grpc_subchannel *c); -static gpr_timespec compute_connect_deadline(grpc_subchannel *c); -static void subchannel_connected(void *subchannel, int iomgr_success, - grpc_closure_list *closure_list); - -static void subchannel_ref_locked( - grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -static int subchannel_unref_locked( - grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; -static void connection_ref_locked(connection *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -static grpc_subchannel *connection_unref_locked( - connection *c, grpc_closure_list *closure_list - GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; -static void subchannel_destroy(grpc_subchannel *c, - grpc_closure_list *closure_list); +static grpc_subchannel_call *create_call (connection * con, grpc_closure_list * closure_list); +static void connectivity_state_changed_locked (grpc_subchannel * c, const char *reason, grpc_closure_list * closure_list); +static grpc_connectivity_state compute_connectivity_locked (grpc_subchannel * c); +static gpr_timespec compute_connect_deadline (grpc_subchannel * c); +static void subchannel_connected (void *subchannel, int iomgr_success, grpc_closure_list * closure_list); + +static void subchannel_ref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +static int +subchannel_unref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) + GRPC_MUST_USE_RESULT; + static void connection_ref_locked (connection * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); + static grpc_subchannel *connection_unref_locked (connection * c, grpc_closure_list * closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; + static void subchannel_destroy (grpc_subchannel * c, grpc_closure_list * closure_list); #ifdef GRPC_SUBCHANNEL_REFCOUNT_DEBUG #define SUBCHANNEL_REF_LOCKED(p, r) \ @@ -198,30 +196,34 @@ static void subchannel_destroy(grpc_subchannel *c, * connection implementation */ -static void connection_destroy(connection *c, grpc_closure_list *closure_list) { - GPR_ASSERT(c->refs == 0); - grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CONNECTION(c), closure_list); - gpr_free(c); + static void connection_destroy (connection * c, grpc_closure_list * closure_list) +{ + GPR_ASSERT (c->refs == 0); + grpc_channel_stack_destroy (CHANNEL_STACK_FROM_CONNECTION (c), closure_list); + gpr_free (c); } -static void connection_ref_locked( - connection *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - REF_LOG("CONNECTION", c); - subchannel_ref_locked(c->subchannel REF_PASS_ARGS); +static void +connection_ref_locked (connection * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) +{ + REF_LOG ("CONNECTION", c); + subchannel_ref_locked (c->subchannel REF_PASS_ARGS); ++c->refs; } -static grpc_subchannel *connection_unref_locked( - connection *c, - grpc_closure_list *closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { +static grpc_subchannel * +connection_unref_locked (connection * c, grpc_closure_list * closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) +{ grpc_subchannel *destroy = NULL; - UNREF_LOG("CONNECTION", c); - if (subchannel_unref_locked(c->subchannel REF_PASS_ARGS)) { - destroy = c->subchannel; - } - if (--c->refs == 0 && c->subchannel->active != c) { - connection_destroy(c, closure_list); - } + UNREF_LOG ("CONNECTION", c); + if (subchannel_unref_locked (c->subchannel REF_PASS_ARGS)) + { + destroy = c->subchannel; + } + if (--c->refs == 0 && c->subchannel->active != c) + { + connection_destroy (c, closure_list); + } return destroy; } @@ -229,241 +231,261 @@ static grpc_subchannel *connection_unref_locked( * grpc_subchannel implementation */ -static void subchannel_ref_locked( - grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - REF_LOG("SUBCHANNEL", c); +static void +subchannel_ref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) +{ + REF_LOG ("SUBCHANNEL", c); ++c->refs; } -static int subchannel_unref_locked( - grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - UNREF_LOG("SUBCHANNEL", c); +static int +subchannel_unref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) +{ + UNREF_LOG ("SUBCHANNEL", c); return --c->refs == 0; } -void grpc_subchannel_ref(grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - gpr_mu_lock(&c->mu); - subchannel_ref_locked(c REF_PASS_ARGS); - gpr_mu_unlock(&c->mu); +void +grpc_subchannel_ref (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) +{ + gpr_mu_lock (&c->mu); + subchannel_ref_locked (c REF_PASS_ARGS); + gpr_mu_unlock (&c->mu); } -void grpc_subchannel_unref(grpc_subchannel *c, - grpc_closure_list *closure_list - GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { +void +grpc_subchannel_unref (grpc_subchannel * c, grpc_closure_list * closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) +{ int destroy; - gpr_mu_lock(&c->mu); - destroy = subchannel_unref_locked(c REF_PASS_ARGS); - gpr_mu_unlock(&c->mu); - if (destroy) subchannel_destroy(c, closure_list); -} - -static void subchannel_destroy(grpc_subchannel *c, - grpc_closure_list *closure_list) { - if (c->active != NULL) { - connection_destroy(c->active, closure_list); - } - gpr_free(c->filters); - grpc_channel_args_destroy(c->args); - gpr_free(c->addr); - grpc_mdctx_unref(c->mdctx); - grpc_connectivity_state_destroy(&c->state_tracker, closure_list); - grpc_connector_unref(c->connector, closure_list); - gpr_free(c); + gpr_mu_lock (&c->mu); + destroy = subchannel_unref_locked (c REF_PASS_ARGS); + gpr_mu_unlock (&c->mu); + if (destroy) + subchannel_destroy (c, closure_list); +} + +static void +subchannel_destroy (grpc_subchannel * c, grpc_closure_list * closure_list) +{ + if (c->active != NULL) + { + connection_destroy (c->active, closure_list); + } + gpr_free (c->filters); + grpc_channel_args_destroy (c->args); + gpr_free (c->addr); + grpc_mdctx_unref (c->mdctx); + grpc_connectivity_state_destroy (&c->state_tracker, closure_list); + grpc_connector_unref (c->connector, closure_list); + gpr_free (c); } -void grpc_subchannel_add_interested_party(grpc_subchannel *c, - grpc_pollset *pollset, - grpc_closure_list *closure_list) { - grpc_pollset_set_add_pollset(c->pollset_set, pollset, closure_list); +void +grpc_subchannel_add_interested_party (grpc_subchannel * c, grpc_pollset * pollset, grpc_closure_list * closure_list) +{ + grpc_pollset_set_add_pollset (c->pollset_set, pollset, closure_list); } -void grpc_subchannel_del_interested_party(grpc_subchannel *c, - grpc_pollset *pollset, - grpc_closure_list *closure_list) { - grpc_pollset_set_del_pollset(c->pollset_set, pollset, closure_list); +void +grpc_subchannel_del_interested_party (grpc_subchannel * c, grpc_pollset * pollset, grpc_closure_list * closure_list) +{ + grpc_pollset_set_del_pollset (c->pollset_set, pollset, closure_list); } -static gpr_uint32 random_seed() { - return (gpr_uint32)(gpr_time_to_millis(gpr_now(GPR_CLOCK_MONOTONIC))); +static gpr_uint32 +random_seed () +{ + return (gpr_uint32) (gpr_time_to_millis (gpr_now (GPR_CLOCK_MONOTONIC))); } -grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, - grpc_subchannel_args *args) { - grpc_subchannel *c = gpr_malloc(sizeof(*c)); - grpc_channel_element *parent_elem = grpc_channel_stack_last_element( - grpc_channel_get_channel_stack(args->master)); - memset(c, 0, sizeof(*c)); +grpc_subchannel * +grpc_subchannel_create (grpc_connector * connector, grpc_subchannel_args * args) +{ + grpc_subchannel *c = gpr_malloc (sizeof (*c)); + grpc_channel_element *parent_elem = grpc_channel_stack_last_element (grpc_channel_get_channel_stack (args->master)); + memset (c, 0, sizeof (*c)); c->refs = 1; c->connector = connector; - grpc_connector_ref(c->connector); + grpc_connector_ref (c->connector); c->num_filters = args->filter_count; - c->filters = gpr_malloc(sizeof(grpc_channel_filter *) * c->num_filters); - memcpy(c->filters, args->filters, - sizeof(grpc_channel_filter *) * c->num_filters); - c->addr = gpr_malloc(args->addr_len); - memcpy(c->addr, args->addr, args->addr_len); + c->filters = gpr_malloc (sizeof (grpc_channel_filter *) * c->num_filters); + memcpy (c->filters, args->filters, sizeof (grpc_channel_filter *) * c->num_filters); + c->addr = gpr_malloc (args->addr_len); + memcpy (c->addr, args->addr, args->addr_len); c->addr_len = args->addr_len; - c->args = grpc_channel_args_copy(args->args); + c->args = grpc_channel_args_copy (args->args); c->mdctx = args->mdctx; c->master = args->master; - c->pollset_set = grpc_client_channel_get_connecting_pollset_set(parent_elem); - c->random = random_seed(); - grpc_mdctx_ref(c->mdctx); - grpc_closure_init(&c->connected, subchannel_connected, c); - grpc_connectivity_state_init(&c->state_tracker, GRPC_CHANNEL_IDLE, - "subchannel"); - gpr_mu_init(&c->mu); + c->pollset_set = grpc_client_channel_get_connecting_pollset_set (parent_elem); + c->random = random_seed (); + grpc_mdctx_ref (c->mdctx); + grpc_closure_init (&c->connected, subchannel_connected, c); + grpc_connectivity_state_init (&c->state_tracker, GRPC_CHANNEL_IDLE, "subchannel"); + gpr_mu_init (&c->mu); return c; } -static void continue_connect(grpc_subchannel *c, - grpc_closure_list *closure_list) { +static void +continue_connect (grpc_subchannel * c, grpc_closure_list * closure_list) +{ grpc_connect_in_args args; args.interested_parties = c->pollset_set; args.addr = c->addr; args.addr_len = c->addr_len; - args.deadline = compute_connect_deadline(c); + args.deadline = compute_connect_deadline (c); args.channel_args = c->args; - grpc_connector_connect(c->connector, &args, &c->connecting_result, - &c->connected, closure_list); + grpc_connector_connect (c->connector, &args, &c->connecting_result, &c->connected, closure_list); } -static void start_connect(grpc_subchannel *c, grpc_closure_list *closure_list) { - c->backoff_delta = gpr_time_from_seconds( - GRPC_SUBCHANNEL_INITIAL_CONNECT_BACKOFF_SECONDS, GPR_TIMESPAN); - c->next_attempt = - gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), c->backoff_delta); - continue_connect(c, closure_list); +static void +start_connect (grpc_subchannel * c, grpc_closure_list * closure_list) +{ + c->backoff_delta = gpr_time_from_seconds (GRPC_SUBCHANNEL_INITIAL_CONNECT_BACKOFF_SECONDS, GPR_TIMESPAN); + c->next_attempt = gpr_time_add (gpr_now (GPR_CLOCK_MONOTONIC), c->backoff_delta); + continue_connect (c, closure_list); } -static void continue_creating_call(void *arg, int iomgr_success, - grpc_closure_list *closure_list) { +static void +continue_creating_call (void *arg, int iomgr_success, grpc_closure_list * closure_list) +{ waiting_for_connect *w4c = arg; - grpc_subchannel_del_interested_party(w4c->subchannel, w4c->pollset, - closure_list); - grpc_subchannel_create_call(w4c->subchannel, w4c->pollset, w4c->target, - w4c->notify, closure_list); - GRPC_SUBCHANNEL_UNREF(w4c->subchannel, "waiting_for_connect", closure_list); - gpr_free(w4c); -} - -void grpc_subchannel_create_call(grpc_subchannel *c, grpc_pollset *pollset, - grpc_subchannel_call **target, - grpc_closure *notify, - grpc_closure_list *closure_list) { - connection *con; - gpr_mu_lock(&c->mu); - if (c->active != NULL) { - con = c->active; - CONNECTION_REF_LOCKED(con, "call"); - gpr_mu_unlock(&c->mu); - - *target = create_call(con, closure_list); - notify->cb(notify->cb_arg, 1, closure_list); - } else { - waiting_for_connect *w4c = gpr_malloc(sizeof(*w4c)); - w4c->next = c->waiting; - w4c->notify = notify; - w4c->pollset = pollset; - w4c->target = target; - w4c->subchannel = c; - /* released when clearing w4c */ - SUBCHANNEL_REF_LOCKED(c, "waiting_for_connect"); - grpc_closure_init(&w4c->continuation, continue_creating_call, w4c); - c->waiting = w4c; - grpc_subchannel_add_interested_party(c, pollset, closure_list); - if (!c->connecting) { - c->connecting = 1; - connectivity_state_changed_locked(c, "create_call", closure_list); - /* released by connection */ - SUBCHANNEL_REF_LOCKED(c, "connecting"); - GRPC_CHANNEL_INTERNAL_REF(c->master, "connecting"); - gpr_mu_unlock(&c->mu); + grpc_subchannel_del_interested_party (w4c->subchannel, w4c->pollset, closure_list); + grpc_subchannel_create_call (w4c->subchannel, w4c->pollset, w4c->target, w4c->notify, closure_list); + GRPC_SUBCHANNEL_UNREF (w4c->subchannel, "waiting_for_connect", closure_list); + gpr_free (w4c); +} - start_connect(c, closure_list); - } else { - gpr_mu_unlock(&c->mu); +void +grpc_subchannel_create_call (grpc_subchannel * c, grpc_pollset * pollset, grpc_subchannel_call ** target, grpc_closure * notify, grpc_closure_list * closure_list) +{ + connection *con; + gpr_mu_lock (&c->mu); + if (c->active != NULL) + { + con = c->active; + CONNECTION_REF_LOCKED (con, "call"); + gpr_mu_unlock (&c->mu); + + *target = create_call (con, closure_list); + notify->cb (notify->cb_arg, 1, closure_list); + } + else + { + waiting_for_connect *w4c = gpr_malloc (sizeof (*w4c)); + w4c->next = c->waiting; + w4c->notify = notify; + w4c->pollset = pollset; + w4c->target = target; + w4c->subchannel = c; + /* released when clearing w4c */ + SUBCHANNEL_REF_LOCKED (c, "waiting_for_connect"); + grpc_closure_init (&w4c->continuation, continue_creating_call, w4c); + c->waiting = w4c; + grpc_subchannel_add_interested_party (c, pollset, closure_list); + if (!c->connecting) + { + c->connecting = 1; + connectivity_state_changed_locked (c, "create_call", closure_list); + /* released by connection */ + SUBCHANNEL_REF_LOCKED (c, "connecting"); + GRPC_CHANNEL_INTERNAL_REF (c->master, "connecting"); + gpr_mu_unlock (&c->mu); + + start_connect (c, closure_list); + } + else + { + gpr_mu_unlock (&c->mu); + } } - } } -grpc_connectivity_state grpc_subchannel_check_connectivity(grpc_subchannel *c) { +grpc_connectivity_state +grpc_subchannel_check_connectivity (grpc_subchannel * c) +{ grpc_connectivity_state state; - gpr_mu_lock(&c->mu); - state = grpc_connectivity_state_check(&c->state_tracker); - gpr_mu_unlock(&c->mu); + gpr_mu_lock (&c->mu); + state = grpc_connectivity_state_check (&c->state_tracker); + gpr_mu_unlock (&c->mu); return state; } -void grpc_subchannel_notify_on_state_change(grpc_subchannel *c, - grpc_connectivity_state *state, - grpc_closure *notify, - grpc_closure_list *closure_list) { +void +grpc_subchannel_notify_on_state_change (grpc_subchannel * c, grpc_connectivity_state * state, grpc_closure * notify, grpc_closure_list * closure_list) +{ int do_connect = 0; - gpr_mu_lock(&c->mu); - if (grpc_connectivity_state_notify_on_state_change(&c->state_tracker, state, - notify, closure_list)) { - do_connect = 1; - c->connecting = 1; - /* released by connection */ - SUBCHANNEL_REF_LOCKED(c, "connecting"); - GRPC_CHANNEL_INTERNAL_REF(c->master, "connecting"); - connectivity_state_changed_locked(c, "state_change", closure_list); - } - gpr_mu_unlock(&c->mu); - - if (do_connect) { - start_connect(c, closure_list); - } -} - -void grpc_subchannel_process_transport_op(grpc_subchannel *c, - grpc_transport_op *op, - grpc_closure_list *closure_list) { + gpr_mu_lock (&c->mu); + if (grpc_connectivity_state_notify_on_state_change (&c->state_tracker, state, notify, closure_list)) + { + do_connect = 1; + c->connecting = 1; + /* released by connection */ + SUBCHANNEL_REF_LOCKED (c, "connecting"); + GRPC_CHANNEL_INTERNAL_REF (c->master, "connecting"); + connectivity_state_changed_locked (c, "state_change", closure_list); + } + gpr_mu_unlock (&c->mu); + + if (do_connect) + { + start_connect (c, closure_list); + } +} + +void +grpc_subchannel_process_transport_op (grpc_subchannel * c, grpc_transport_op * op, grpc_closure_list * closure_list) +{ connection *con = NULL; grpc_subchannel *destroy; int cancel_alarm = 0; - gpr_mu_lock(&c->mu); - if (c->active != NULL) { - con = c->active; - CONNECTION_REF_LOCKED(con, "transport-op"); - } - if (op->disconnect) { - c->disconnected = 1; - connectivity_state_changed_locked(c, "disconnect", closure_list); - if (c->have_alarm) { - cancel_alarm = 1; + gpr_mu_lock (&c->mu); + if (c->active != NULL) + { + con = c->active; + CONNECTION_REF_LOCKED (con, "transport-op"); + } + if (op->disconnect) + { + c->disconnected = 1; + connectivity_state_changed_locked (c, "disconnect", closure_list); + if (c->have_alarm) + { + cancel_alarm = 1; + } } - } - gpr_mu_unlock(&c->mu); - - if (con != NULL) { - 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, closure_list); - - gpr_mu_lock(&c->mu); - destroy = CONNECTION_UNREF_LOCKED(con, "transport-op", closure_list); - gpr_mu_unlock(&c->mu); - if (destroy) { - subchannel_destroy(destroy, closure_list); + gpr_mu_unlock (&c->mu); + + if (con != NULL) + { + 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, closure_list); + + gpr_mu_lock (&c->mu); + destroy = CONNECTION_UNREF_LOCKED (con, "transport-op", closure_list); + gpr_mu_unlock (&c->mu); + if (destroy) + { + subchannel_destroy (destroy, closure_list); + } } - } - if (cancel_alarm) { - grpc_alarm_cancel(&c->alarm, closure_list); - } + if (cancel_alarm) + { + grpc_alarm_cancel (&c->alarm, closure_list); + } - if (op->disconnect) { - grpc_connector_shutdown(c->connector, closure_list); - } + if (op->disconnect) + { + grpc_connector_shutdown (c->connector, closure_list); + } } -static void on_state_changed(void *p, int iomgr_success, - grpc_closure_list *closure_list) { +static void +on_state_changed (void *p, int iomgr_success, grpc_closure_list * closure_list) +{ state_watcher *sw = p; grpc_subchannel *c = sw->subchannel; gpr_mu *mu = &c->mu; @@ -472,57 +494,59 @@ static void on_state_changed(void *p, int iomgr_success, grpc_channel_element *elem; connection *destroy_connection = NULL; - gpr_mu_lock(mu); + gpr_mu_lock (mu); /* if we failed or there is a version number mismatch, just leave this closure */ - if (!iomgr_success || sw->subchannel->active_version != sw->version) { - goto done; - } + if (!iomgr_success || sw->subchannel->active_version != sw->version) + { + goto done; + } - switch (sw->connectivity_state) { + switch (sw->connectivity_state) + { case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_READY: case GRPC_CHANNEL_IDLE: /* all is still good: keep watching */ - memset(&op, 0, sizeof(op)); + memset (&op, 0, sizeof (op)); op.connectivity_state = &sw->connectivity_state; op.on_connectivity_state_change = &sw->closure; - elem = grpc_channel_stack_element( - CHANNEL_STACK_FROM_CONNECTION(c->active), 0); - elem->filter->start_transport_op(elem, &op, closure_list); + elem = grpc_channel_stack_element (CHANNEL_STACK_FROM_CONNECTION (c->active), 0); + elem->filter->start_transport_op (elem, &op, closure_list); /* early out */ - gpr_mu_unlock(mu); + gpr_mu_unlock (mu); return; case GRPC_CHANNEL_FATAL_FAILURE: case GRPC_CHANNEL_TRANSIENT_FAILURE: /* things have gone wrong, deactivate and enter idle */ - if (sw->subchannel->active->refs == 0) { - destroy_connection = sw->subchannel->active; - } + if (sw->subchannel->active->refs == 0) + { + destroy_connection = sw->subchannel->active; + } sw->subchannel->active = NULL; - grpc_connectivity_state_set( - &c->state_tracker, c->disconnected ? GRPC_CHANNEL_FATAL_FAILURE - : GRPC_CHANNEL_TRANSIENT_FAILURE, - "connection_failed", closure_list); + grpc_connectivity_state_set (&c->state_tracker, c->disconnected ? GRPC_CHANNEL_FATAL_FAILURE : GRPC_CHANNEL_TRANSIENT_FAILURE, "connection_failed", closure_list); break; - } + } done: - connectivity_state_changed_locked(c, "transport_state_changed", closure_list); - destroy = SUBCHANNEL_UNREF_LOCKED(c, "state_watcher"); - gpr_free(sw); - gpr_mu_unlock(mu); - if (destroy) { - subchannel_destroy(c, closure_list); - } - if (destroy_connection != NULL) { - connection_destroy(destroy_connection, closure_list); - } -} - -static void publish_transport(grpc_subchannel *c, - grpc_closure_list *closure_list) { + connectivity_state_changed_locked (c, "transport_state_changed", closure_list); + destroy = SUBCHANNEL_UNREF_LOCKED (c, "state_watcher"); + gpr_free (sw); + gpr_mu_unlock (mu); + if (destroy) + { + subchannel_destroy (c, closure_list); + } + if (destroy_connection != NULL) + { + connection_destroy (destroy_connection, closure_list); + } +} + +static void +publish_transport (grpc_subchannel * c, grpc_closure_list * closure_list) +{ size_t channel_stack_size; connection *con; grpc_channel_stack *stk; @@ -536,46 +560,46 @@ static void publish_transport(grpc_subchannel *c, /* build final filter list */ num_filters = c->num_filters + c->connecting_result.num_filters + 1; - filters = gpr_malloc(sizeof(*filters) * num_filters); - memcpy(filters, c->filters, sizeof(*filters) * c->num_filters); - memcpy(filters + c->num_filters, c->connecting_result.filters, - sizeof(*filters) * c->connecting_result.num_filters); + filters = gpr_malloc (sizeof (*filters) * num_filters); + memcpy (filters, c->filters, sizeof (*filters) * c->num_filters); + memcpy (filters + c->num_filters, c->connecting_result.filters, sizeof (*filters) * c->connecting_result.num_filters); filters[num_filters - 1] = &grpc_connected_channel_filter; /* construct channel stack */ - channel_stack_size = grpc_channel_stack_size(filters, num_filters); - con = gpr_malloc(sizeof(connection) + channel_stack_size); - stk = (grpc_channel_stack *)(con + 1); + channel_stack_size = grpc_channel_stack_size (filters, num_filters); + con = gpr_malloc (sizeof (connection) + channel_stack_size); + stk = (grpc_channel_stack *) (con + 1); con->refs = 0; con->subchannel = c; - grpc_channel_stack_init(filters, num_filters, c->master, c->args, c->mdctx, - stk, closure_list); - grpc_connected_channel_bind_transport(stk, c->connecting_result.transport); - gpr_free(c->connecting_result.filters); - memset(&c->connecting_result, 0, sizeof(c->connecting_result)); + grpc_channel_stack_init (filters, num_filters, c->master, c->args, c->mdctx, stk, closure_list); + grpc_connected_channel_bind_transport (stk, c->connecting_result.transport); + gpr_free (c->connecting_result.filters); + memset (&c->connecting_result, 0, sizeof (c->connecting_result)); /* initialize state watcher */ - sw = gpr_malloc(sizeof(*sw)); - grpc_closure_init(&sw->closure, on_state_changed, sw); + sw = gpr_malloc (sizeof (*sw)); + grpc_closure_init (&sw->closure, on_state_changed, sw); sw->subchannel = c; sw->connectivity_state = GRPC_CHANNEL_READY; - gpr_mu_lock(&c->mu); + gpr_mu_lock (&c->mu); - if (c->disconnected) { - gpr_mu_unlock(&c->mu); - gpr_free(sw); - gpr_free(filters); - grpc_channel_stack_destroy(stk, closure_list); - GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting", closure_list); - GRPC_SUBCHANNEL_UNREF(c, "connecting", closure_list); - return; - } + if (c->disconnected) + { + gpr_mu_unlock (&c->mu); + gpr_free (sw); + gpr_free (filters); + grpc_channel_stack_destroy (stk, closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (c->master, "connecting", closure_list); + GRPC_SUBCHANNEL_UNREF (c, "connecting", closure_list); + return; + } /* publish */ - if (c->active != NULL && c->active->refs == 0) { - destroy_connection = c->active; - } + if (c->active != NULL && c->active->refs == 0) + { + destroy_connection = c->active; + } c->active = con; c->active_version++; sw->version = c->active_version; @@ -583,184 +607,202 @@ static void publish_transport(grpc_subchannel *c, /* watch for changes; subchannel ref for connecting is donated to the state watcher */ - memset(&op, 0, sizeof(op)); + memset (&op, 0, sizeof (op)); op.connectivity_state = &sw->connectivity_state; op.on_connectivity_state_change = &sw->closure; op.bind_pollset_set = c->pollset_set; - SUBCHANNEL_REF_LOCKED(c, "state_watcher"); - GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting", closure_list); - GPR_ASSERT(!SUBCHANNEL_UNREF_LOCKED(c, "connecting")); - elem = - grpc_channel_stack_element(CHANNEL_STACK_FROM_CONNECTION(c->active), 0); - elem->filter->start_transport_op(elem, &op, closure_list); + SUBCHANNEL_REF_LOCKED (c, "state_watcher"); + GRPC_CHANNEL_INTERNAL_UNREF (c->master, "connecting", closure_list); + GPR_ASSERT (!SUBCHANNEL_UNREF_LOCKED (c, "connecting")); + elem = grpc_channel_stack_element (CHANNEL_STACK_FROM_CONNECTION (c->active), 0); + elem->filter->start_transport_op (elem, &op, closure_list); /* signal completion */ - connectivity_state_changed_locked(c, "connected", closure_list); + connectivity_state_changed_locked (c, "connected", closure_list); w4c = c->waiting; c->waiting = NULL; - gpr_mu_unlock(&c->mu); + gpr_mu_unlock (&c->mu); - while (w4c != NULL) { - waiting_for_connect *next = w4c->next; - grpc_closure_list_add(closure_list, &w4c->continuation, 1); - w4c = next; - } + while (w4c != NULL) + { + waiting_for_connect *next = w4c->next; + grpc_closure_list_add (closure_list, &w4c->continuation, 1); + w4c = next; + } - gpr_free(filters); + gpr_free (filters); - if (destroy_connection != NULL) { - connection_destroy(destroy_connection, closure_list); - } + if (destroy_connection != NULL) + { + connection_destroy (destroy_connection, closure_list); + } } /* Generate a random number between 0 and 1. */ -static double generate_uniform_random_number(grpc_subchannel *c) { - c->random = (1103515245 * c->random + 12345) % ((gpr_uint32)1 << 31); - return c->random / (double)((gpr_uint32)1 << 31); +static double +generate_uniform_random_number (grpc_subchannel * c) +{ + c->random = (1103515245 * c->random + 12345) % ((gpr_uint32) 1 << 31); + return c->random / (double) ((gpr_uint32) 1 << 31); } /* Update backoff_delta and next_attempt in subchannel */ -static void update_reconnect_parameters(grpc_subchannel *c) { +static void +update_reconnect_parameters (grpc_subchannel * c) +{ gpr_int32 backoff_delta_millis, jitter; - gpr_int32 max_backoff_millis = - GRPC_SUBCHANNEL_RECONNECT_MAX_BACKOFF_SECONDS * 1000; + gpr_int32 max_backoff_millis = GRPC_SUBCHANNEL_RECONNECT_MAX_BACKOFF_SECONDS * 1000; double jitter_range; - backoff_delta_millis = - (gpr_int32)(gpr_time_to_millis(c->backoff_delta) * - GRPC_SUBCHANNEL_RECONNECT_BACKOFF_MULTIPLIER); - if (backoff_delta_millis > max_backoff_millis) { - backoff_delta_millis = max_backoff_millis; - } - c->backoff_delta = gpr_time_from_millis(backoff_delta_millis, GPR_TIMESPAN); - c->next_attempt = - gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), c->backoff_delta); + backoff_delta_millis = (gpr_int32) (gpr_time_to_millis (c->backoff_delta) * GRPC_SUBCHANNEL_RECONNECT_BACKOFF_MULTIPLIER); + if (backoff_delta_millis > max_backoff_millis) + { + backoff_delta_millis = max_backoff_millis; + } + c->backoff_delta = gpr_time_from_millis (backoff_delta_millis, GPR_TIMESPAN); + c->next_attempt = gpr_time_add (gpr_now (GPR_CLOCK_MONOTONIC), c->backoff_delta); jitter_range = GRPC_SUBCHANNEL_RECONNECT_JITTER * backoff_delta_millis; - jitter = - (gpr_int32)((2 * generate_uniform_random_number(c) - 1) * jitter_range); - c->next_attempt = - gpr_time_add(c->next_attempt, gpr_time_from_millis(jitter, GPR_TIMESPAN)); + jitter = (gpr_int32) ((2 * generate_uniform_random_number (c) - 1) * jitter_range); + c->next_attempt = gpr_time_add (c->next_attempt, gpr_time_from_millis (jitter, GPR_TIMESPAN)); } -static void on_alarm(void *arg, int iomgr_success, - grpc_closure_list *closure_list) { +static void +on_alarm (void *arg, int iomgr_success, grpc_closure_list * closure_list) +{ grpc_subchannel *c = arg; - gpr_mu_lock(&c->mu); + gpr_mu_lock (&c->mu); c->have_alarm = 0; - if (c->disconnected) { - iomgr_success = 0; - } - connectivity_state_changed_locked(c, "alarm", closure_list); - gpr_mu_unlock(&c->mu); - if (iomgr_success) { - update_reconnect_parameters(c); - continue_connect(c, closure_list); - } else { - GRPC_CHANNEL_INTERNAL_UNREF(c->master, "connecting", closure_list); - GRPC_SUBCHANNEL_UNREF(c, "connecting", closure_list); - } -} - -static void subchannel_connected(void *arg, int iomgr_success, - grpc_closure_list *closure_list) { + if (c->disconnected) + { + iomgr_success = 0; + } + connectivity_state_changed_locked (c, "alarm", closure_list); + gpr_mu_unlock (&c->mu); + if (iomgr_success) + { + update_reconnect_parameters (c); + continue_connect (c, closure_list); + } + else + { + GRPC_CHANNEL_INTERNAL_UNREF (c->master, "connecting", closure_list); + GRPC_SUBCHANNEL_UNREF (c, "connecting", closure_list); + } +} + +static void +subchannel_connected (void *arg, int iomgr_success, grpc_closure_list * closure_list) +{ grpc_subchannel *c = arg; - if (c->connecting_result.transport != NULL) { - publish_transport(c, closure_list); - } else { - gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); - gpr_mu_lock(&c->mu); - GPR_ASSERT(!c->have_alarm); - c->have_alarm = 1; - connectivity_state_changed_locked(c, "connect_failed", closure_list); - grpc_alarm_init(&c->alarm, c->next_attempt, on_alarm, c, now, closure_list); - gpr_mu_unlock(&c->mu); - } -} - -static gpr_timespec compute_connect_deadline(grpc_subchannel *c) { - gpr_timespec current_deadline = - gpr_time_add(c->next_attempt, c->backoff_delta); - gpr_timespec min_deadline = gpr_time_add( - gpr_now(GPR_CLOCK_MONOTONIC), - gpr_time_from_seconds(GRPC_SUBCHANNEL_MIN_CONNECT_TIMEOUT_SECONDS, - GPR_TIMESPAN)); - return gpr_time_cmp(current_deadline, min_deadline) > 0 ? current_deadline - : min_deadline; -} - -static grpc_connectivity_state compute_connectivity_locked(grpc_subchannel *c) { - if (c->disconnected) { - return GRPC_CHANNEL_FATAL_FAILURE; - } - if (c->connecting) { - if (c->have_alarm) { - return GRPC_CHANNEL_TRANSIENT_FAILURE; + if (c->connecting_result.transport != NULL) + { + publish_transport (c, closure_list); + } + else + { + gpr_timespec now = gpr_now (GPR_CLOCK_MONOTONIC); + gpr_mu_lock (&c->mu); + GPR_ASSERT (!c->have_alarm); + c->have_alarm = 1; + connectivity_state_changed_locked (c, "connect_failed", closure_list); + grpc_alarm_init (&c->alarm, c->next_attempt, on_alarm, c, now, closure_list); + gpr_mu_unlock (&c->mu); + } +} + +static gpr_timespec +compute_connect_deadline (grpc_subchannel * c) +{ + gpr_timespec current_deadline = gpr_time_add (c->next_attempt, c->backoff_delta); + gpr_timespec min_deadline = gpr_time_add (gpr_now (GPR_CLOCK_MONOTONIC), + gpr_time_from_seconds (GRPC_SUBCHANNEL_MIN_CONNECT_TIMEOUT_SECONDS, + GPR_TIMESPAN)); + return gpr_time_cmp (current_deadline, min_deadline) > 0 ? current_deadline : min_deadline; +} + +static grpc_connectivity_state +compute_connectivity_locked (grpc_subchannel * c) +{ + if (c->disconnected) + { + return GRPC_CHANNEL_FATAL_FAILURE; + } + if (c->connecting) + { + if (c->have_alarm) + { + return GRPC_CHANNEL_TRANSIENT_FAILURE; + } + return GRPC_CHANNEL_CONNECTING; + } + if (c->active) + { + return GRPC_CHANNEL_READY; } - return GRPC_CHANNEL_CONNECTING; - } - if (c->active) { - return GRPC_CHANNEL_READY; - } return GRPC_CHANNEL_IDLE; } -static void connectivity_state_changed_locked(grpc_subchannel *c, - const char *reason, - grpc_closure_list *closure_list) { - grpc_connectivity_state current = compute_connectivity_locked(c); - grpc_connectivity_state_set(&c->state_tracker, current, reason, closure_list); +static void +connectivity_state_changed_locked (grpc_subchannel * c, const char *reason, grpc_closure_list * closure_list) +{ + grpc_connectivity_state current = compute_connectivity_locked (c); + grpc_connectivity_state_set (&c->state_tracker, current, reason, closure_list); } /* * grpc_subchannel_call implementation */ -void grpc_subchannel_call_ref( - grpc_subchannel_call *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - gpr_ref(&c->refs); -} - -void grpc_subchannel_call_unref(grpc_subchannel_call *c, - grpc_closure_list *closure_list - GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - if (gpr_unref(&c->refs)) { - gpr_mu *mu = &c->connection->subchannel->mu; - grpc_subchannel *destroy; - grpc_call_stack_destroy(SUBCHANNEL_CALL_TO_CALL_STACK(c), closure_list); - gpr_mu_lock(mu); - destroy = CONNECTION_UNREF_LOCKED(c->connection, "call", closure_list); - gpr_mu_unlock(mu); - gpr_free(c); - if (destroy != NULL) { - subchannel_destroy(destroy, closure_list); +void +grpc_subchannel_call_ref (grpc_subchannel_call * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) +{ + gpr_ref (&c->refs); +} + +void +grpc_subchannel_call_unref (grpc_subchannel_call * c, grpc_closure_list * closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) +{ + if (gpr_unref (&c->refs)) + { + gpr_mu *mu = &c->connection->subchannel->mu; + grpc_subchannel *destroy; + grpc_call_stack_destroy (SUBCHANNEL_CALL_TO_CALL_STACK (c), closure_list); + gpr_mu_lock (mu); + destroy = CONNECTION_UNREF_LOCKED (c->connection, "call", closure_list); + gpr_mu_unlock (mu); + gpr_free (c); + if (destroy != NULL) + { + subchannel_destroy (destroy, closure_list); + } } - } } -char *grpc_subchannel_call_get_peer(grpc_subchannel_call *call, - grpc_closure_list *closure_list) { - grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK(call); - grpc_call_element *top_elem = grpc_call_stack_element(call_stack, 0); - return top_elem->filter->get_peer(top_elem, closure_list); +char * +grpc_subchannel_call_get_peer (grpc_subchannel_call * call, grpc_closure_list * closure_list) +{ + grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK (call); + grpc_call_element *top_elem = grpc_call_stack_element (call_stack, 0); + return top_elem->filter->get_peer (top_elem, closure_list); } -void grpc_subchannel_call_process_op(grpc_subchannel_call *call, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { - grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK(call); - grpc_call_element *top_elem = grpc_call_stack_element(call_stack, 0); - top_elem->filter->start_transport_stream_op(top_elem, op, closure_list); +void +grpc_subchannel_call_process_op (grpc_subchannel_call * call, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK (call); + grpc_call_element *top_elem = grpc_call_stack_element (call_stack, 0); + top_elem->filter->start_transport_stream_op (top_elem, op, closure_list); } -static grpc_subchannel_call *create_call(connection *con, - grpc_closure_list *closure_list) { - grpc_channel_stack *chanstk = CHANNEL_STACK_FROM_CONNECTION(con); - grpc_subchannel_call *call = - gpr_malloc(sizeof(grpc_subchannel_call) + chanstk->call_stack_size); - grpc_call_stack *callstk = SUBCHANNEL_CALL_TO_CALL_STACK(call); +static grpc_subchannel_call * +create_call (connection * con, grpc_closure_list * closure_list) +{ + grpc_channel_stack *chanstk = CHANNEL_STACK_FROM_CONNECTION (con); + grpc_subchannel_call *call = gpr_malloc (sizeof (grpc_subchannel_call) + chanstk->call_stack_size); + grpc_call_stack *callstk = SUBCHANNEL_CALL_TO_CALL_STACK (call); call->connection = con; - gpr_ref_init(&call->refs, 1); - grpc_call_stack_init(chanstk, NULL, NULL, callstk, closure_list); + gpr_ref_init (&call->refs, 1); + grpc_call_stack_init (chanstk, NULL, NULL, callstk, closure_list); return call; } diff --git a/src/core/client_config/subchannel.h b/src/core/client_config/subchannel.h index 57cc248fecc..69cf07f6264 100644 --- a/src/core/client_config/subchannel.h +++ b/src/core/client_config/subchannel.h @@ -64,59 +64,37 @@ typedef struct grpc_subchannel_args grpc_subchannel_args; #define GRPC_SUBCHANNEL_REF_EXTRA_ARGS #endif -void grpc_subchannel_ref( - grpc_subchannel *channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void grpc_subchannel_unref(grpc_subchannel *channel, - grpc_closure_list *closure_list - 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_closure_list *closure_list - GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_subchannel_ref (grpc_subchannel * channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_subchannel_unref (grpc_subchannel * channel, grpc_closure_list * closure_list 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_closure_list * closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS); /** construct a call (possibly asynchronously) */ -void grpc_subchannel_create_call(grpc_subchannel *subchannel, - grpc_pollset *pollset, - grpc_subchannel_call **target, - grpc_closure *notify, - grpc_closure_list *closure_list); +void grpc_subchannel_create_call (grpc_subchannel * subchannel, grpc_pollset * pollset, grpc_subchannel_call ** target, grpc_closure * notify, grpc_closure_list * closure_list); /** process a transport level op */ -void grpc_subchannel_process_transport_op(grpc_subchannel *subchannel, - grpc_transport_op *op, - grpc_closure_list *closure_list); +void grpc_subchannel_process_transport_op (grpc_subchannel * subchannel, grpc_transport_op * op, grpc_closure_list * closure_list); /** poll the current connectivity state of a channel */ -grpc_connectivity_state grpc_subchannel_check_connectivity( - grpc_subchannel *channel); +grpc_connectivity_state grpc_subchannel_check_connectivity (grpc_subchannel * channel); /** 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_subchannel *channel, - grpc_connectivity_state *state, - grpc_closure *notify, - grpc_closure_list *closure_list); +void grpc_subchannel_notify_on_state_change (grpc_subchannel * channel, grpc_connectivity_state * state, grpc_closure * notify, grpc_closure_list * closure_list); /** express interest in \a channel's activities through \a pollset. */ -void grpc_subchannel_add_interested_party(grpc_subchannel *channel, - grpc_pollset *pollset, - grpc_closure_list *closure_list); +void grpc_subchannel_add_interested_party (grpc_subchannel * channel, grpc_pollset * pollset, grpc_closure_list * closure_list); /** stop following \a channel's activity through \a pollset. */ -void grpc_subchannel_del_interested_party(grpc_subchannel *channel, - grpc_pollset *pollset, - grpc_closure_list *closure_list); +void grpc_subchannel_del_interested_party (grpc_subchannel * channel, grpc_pollset * pollset, grpc_closure_list * closure_list); /** continue processing a transport op */ -void grpc_subchannel_call_process_op(grpc_subchannel_call *subchannel_call, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list); +void grpc_subchannel_call_process_op (grpc_subchannel_call * subchannel_call, grpc_transport_stream_op * op, grpc_closure_list * closure_list); /** continue querying for peer */ -char *grpc_subchannel_call_get_peer(grpc_subchannel_call *subchannel_call, - grpc_closure_list *closure_list); +char *grpc_subchannel_call_get_peer (grpc_subchannel_call * subchannel_call, grpc_closure_list * closure_list); -struct grpc_subchannel_args { +struct grpc_subchannel_args +{ /** Channel filters for this channel - wrapped factories will likely want to mutate this */ const grpc_channel_filter **filters; @@ -134,7 +112,6 @@ struct grpc_subchannel_args { }; /** create a subchannel given a connector */ -grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, - grpc_subchannel_args *args); +grpc_subchannel *grpc_subchannel_create (grpc_connector * connector, grpc_subchannel_args * args); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_SUBCHANNEL_H */ diff --git a/src/core/client_config/subchannel_factory.c b/src/core/client_config/subchannel_factory.c index 51b805f2f52..29e854e2ede 100644 --- a/src/core/client_config/subchannel_factory.c +++ b/src/core/client_config/subchannel_factory.c @@ -33,17 +33,20 @@ #include "src/core/client_config/subchannel_factory.h" -void grpc_subchannel_factory_ref(grpc_subchannel_factory *factory) { - factory->vtable->ref(factory); +void +grpc_subchannel_factory_ref (grpc_subchannel_factory * factory) +{ + factory->vtable->ref (factory); } -void grpc_subchannel_factory_unref(grpc_subchannel_factory *factory, - grpc_closure_list *closure_list) { - factory->vtable->unref(factory, closure_list); +void +grpc_subchannel_factory_unref (grpc_subchannel_factory * factory, grpc_closure_list * closure_list) +{ + factory->vtable->unref (factory, closure_list); } -grpc_subchannel *grpc_subchannel_factory_create_subchannel( - grpc_subchannel_factory *factory, grpc_subchannel_args *args, - grpc_closure_list *closure_list) { - return factory->vtable->create_subchannel(factory, args, closure_list); +grpc_subchannel * +grpc_subchannel_factory_create_subchannel (grpc_subchannel_factory * factory, grpc_subchannel_args * args, grpc_closure_list * closure_list) +{ + return factory->vtable->create_subchannel (factory, args, closure_list); } diff --git a/src/core/client_config/subchannel_factory.h b/src/core/client_config/subchannel_factory.h index ea19ab89447..771638e0fb3 100644 --- a/src/core/client_config/subchannel_factory.h +++ b/src/core/client_config/subchannel_factory.h @@ -42,26 +42,22 @@ typedef struct grpc_subchannel_factory_vtable grpc_subchannel_factory_vtable; /** Constructor for new configured channels. Creating decorators around this type is encouraged to adapt behavior. */ -struct grpc_subchannel_factory { +struct grpc_subchannel_factory +{ const grpc_subchannel_factory_vtable *vtable; }; -struct grpc_subchannel_factory_vtable { - void (*ref)(grpc_subchannel_factory *factory); - void (*unref)(grpc_subchannel_factory *factory, - grpc_closure_list *closure_list); - grpc_subchannel *(*create_subchannel)(grpc_subchannel_factory *factory, - grpc_subchannel_args *args, - grpc_closure_list *closure_list); +struct grpc_subchannel_factory_vtable +{ + void (*ref) (grpc_subchannel_factory * factory); + void (*unref) (grpc_subchannel_factory * factory, grpc_closure_list * closure_list); + grpc_subchannel *(*create_subchannel) (grpc_subchannel_factory * factory, grpc_subchannel_args * args, grpc_closure_list * closure_list); }; -void grpc_subchannel_factory_ref(grpc_subchannel_factory *factory); -void grpc_subchannel_factory_unref(grpc_subchannel_factory *factory, - grpc_closure_list *closure_list); +void grpc_subchannel_factory_ref (grpc_subchannel_factory * factory); +void grpc_subchannel_factory_unref (grpc_subchannel_factory * factory, grpc_closure_list * closure_list); /** Create a new grpc_subchannel */ -grpc_subchannel *grpc_subchannel_factory_create_subchannel( - grpc_subchannel_factory *factory, grpc_subchannel_args *args, - grpc_closure_list *closure_list); +grpc_subchannel *grpc_subchannel_factory_create_subchannel (grpc_subchannel_factory * factory, grpc_subchannel_args * args, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_SUBCHANNEL_FACTORY_H */ diff --git a/src/core/client_config/subchannel_factory_decorators/add_channel_arg.c b/src/core/client_config/subchannel_factory_decorators/add_channel_arg.c index 585e465fa49..220f00106b5 100644 --- a/src/core/client_config/subchannel_factory_decorators/add_channel_arg.c +++ b/src/core/client_config/subchannel_factory_decorators/add_channel_arg.c @@ -34,10 +34,11 @@ #include "src/core/client_config/subchannel_factory_decorators/add_channel_arg.h" #include "src/core/client_config/subchannel_factory_decorators/merge_channel_args.h" -grpc_subchannel_factory *grpc_subchannel_factory_add_channel_arg( - grpc_subchannel_factory *input, const grpc_arg *arg) { +grpc_subchannel_factory * +grpc_subchannel_factory_add_channel_arg (grpc_subchannel_factory * input, const grpc_arg * arg) +{ grpc_channel_args args; args.num_args = 1; - args.args = (grpc_arg *)arg; - return grpc_subchannel_factory_merge_channel_args(input, &args); + args.args = (grpc_arg *) arg; + return grpc_subchannel_factory_merge_channel_args (input, &args); } diff --git a/src/core/client_config/subchannel_factory_decorators/add_channel_arg.h b/src/core/client_config/subchannel_factory_decorators/add_channel_arg.h index 8457294000d..38f9c48d7a5 100644 --- a/src/core/client_config/subchannel_factory_decorators/add_channel_arg.h +++ b/src/core/client_config/subchannel_factory_decorators/add_channel_arg.h @@ -39,8 +39,7 @@ /** Takes a subchannel factory, returns a new one that mutates incoming channel_args by adding a new argument; ownership of input, arg is retained by the caller. */ -grpc_subchannel_factory *grpc_subchannel_factory_add_channel_arg( - grpc_subchannel_factory *input, const grpc_arg *arg); +grpc_subchannel_factory *grpc_subchannel_factory_add_channel_arg (grpc_subchannel_factory * input, const grpc_arg * arg); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_SUBCHANNEL_FACTORY_DECORATORS_ADD_CHANNEL_ARG_H \ - */ + */ diff --git a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c index cf5fb00cdf8..993b95296b8 100644 --- a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c +++ b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c @@ -35,52 +35,58 @@ #include #include "src/core/channel/channel_args.h" -typedef struct { +typedef struct +{ grpc_subchannel_factory base; gpr_refcount refs; grpc_subchannel_factory *wrapped; grpc_channel_args *merge_args; } merge_args_factory; -static void merge_args_factory_ref(grpc_subchannel_factory *scf) { - merge_args_factory *f = (merge_args_factory *)scf; - gpr_ref(&f->refs); +static void +merge_args_factory_ref (grpc_subchannel_factory * scf) +{ + merge_args_factory *f = (merge_args_factory *) scf; + gpr_ref (&f->refs); } -static void merge_args_factory_unref(grpc_subchannel_factory *scf, - grpc_closure_list *closure_list) { - merge_args_factory *f = (merge_args_factory *)scf; - if (gpr_unref(&f->refs)) { - grpc_subchannel_factory_unref(f->wrapped, closure_list); - grpc_channel_args_destroy(f->merge_args); - gpr_free(f); - } +static void +merge_args_factory_unref (grpc_subchannel_factory * scf, grpc_closure_list * closure_list) +{ + merge_args_factory *f = (merge_args_factory *) scf; + if (gpr_unref (&f->refs)) + { + grpc_subchannel_factory_unref (f->wrapped, closure_list); + grpc_channel_args_destroy (f->merge_args); + gpr_free (f); + } } -static grpc_subchannel *merge_args_factory_create_subchannel( - grpc_subchannel_factory *scf, grpc_subchannel_args *args, - grpc_closure_list *closure_list) { - merge_args_factory *f = (merge_args_factory *)scf; - grpc_channel_args *final_args = - grpc_channel_args_merge(args->args, f->merge_args); +static grpc_subchannel * +merge_args_factory_create_subchannel (grpc_subchannel_factory * scf, grpc_subchannel_args * args, grpc_closure_list * closure_list) +{ + merge_args_factory *f = (merge_args_factory *) scf; + grpc_channel_args *final_args = grpc_channel_args_merge (args->args, f->merge_args); grpc_subchannel *s; args->args = final_args; - s = grpc_subchannel_factory_create_subchannel(f->wrapped, args, closure_list); - grpc_channel_args_destroy(final_args); + s = grpc_subchannel_factory_create_subchannel (f->wrapped, args, closure_list); + grpc_channel_args_destroy (final_args); return s; } static const grpc_subchannel_factory_vtable merge_args_factory_vtable = { - merge_args_factory_ref, merge_args_factory_unref, - merge_args_factory_create_subchannel}; + merge_args_factory_ref, merge_args_factory_unref, + merge_args_factory_create_subchannel +}; -grpc_subchannel_factory *grpc_subchannel_factory_merge_channel_args( - grpc_subchannel_factory *input, const grpc_channel_args *args) { - merge_args_factory *f = gpr_malloc(sizeof(*f)); +grpc_subchannel_factory * +grpc_subchannel_factory_merge_channel_args (grpc_subchannel_factory * input, const grpc_channel_args * args) +{ + merge_args_factory *f = gpr_malloc (sizeof (*f)); f->base.vtable = &merge_args_factory_vtable; - gpr_ref_init(&f->refs, 1); - grpc_subchannel_factory_ref(input); + gpr_ref_init (&f->refs, 1); + grpc_subchannel_factory_ref (input); f->wrapped = input; - f->merge_args = grpc_channel_args_copy(args); + f->merge_args = grpc_channel_args_copy (args); return &f->base; } diff --git a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.h b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.h index f4757f06507..5155509a479 100644 --- a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.h +++ b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.h @@ -39,8 +39,7 @@ /** Takes a subchannel factory, returns a new one that mutates incoming channel_args by adding a new argument; ownership of input, args is retained by the caller. */ -grpc_subchannel_factory *grpc_subchannel_factory_merge_channel_args( - grpc_subchannel_factory *input, const grpc_channel_args *args); +grpc_subchannel_factory *grpc_subchannel_factory_merge_channel_args (grpc_subchannel_factory * input, const grpc_channel_args * args); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_SUBCHANNEL_FACTORY_DECORATORS_MERGE_CHANNEL_ARGS_H \ - */ + */ diff --git a/src/core/client_config/uri_parser.c b/src/core/client_config/uri_parser.c index 2738e2df576..4f4cc5b9c4d 100644 --- a/src/core/client_config/uri_parser.c +++ b/src/core/client_config/uri_parser.c @@ -42,31 +42,35 @@ /** a size_t default value... maps to all 1's */ #define NOT_SET (~(size_t)0) -static grpc_uri *bad_uri(const char *uri_text, size_t pos, const char *section, - int suppress_errors) { +static grpc_uri * +bad_uri (const char *uri_text, size_t pos, const char *section, int suppress_errors) +{ char *line_prefix; size_t pfx_len; - if (!suppress_errors) { - gpr_asprintf(&line_prefix, "bad uri.%s: '", section); - pfx_len = strlen(line_prefix) + pos; - gpr_log(GPR_ERROR, "%s%s'", line_prefix, uri_text); - gpr_free(line_prefix); + if (!suppress_errors) + { + gpr_asprintf (&line_prefix, "bad uri.%s: '", section); + pfx_len = strlen (line_prefix) + pos; + gpr_log (GPR_ERROR, "%s%s'", line_prefix, uri_text); + gpr_free (line_prefix); - line_prefix = gpr_malloc(pfx_len + 1); - memset(line_prefix, ' ', pfx_len); - line_prefix[pfx_len] = 0; - gpr_log(GPR_ERROR, "%s^ here", line_prefix); - gpr_free(line_prefix); - } + line_prefix = gpr_malloc (pfx_len + 1); + memset (line_prefix, ' ', pfx_len); + line_prefix[pfx_len] = 0; + gpr_log (GPR_ERROR, "%s^ here", line_prefix); + gpr_free (line_prefix); + } return NULL; } /** Returns a copy of \a src[begin, end) */ -static char *copy_component(const char *src, size_t begin, size_t end) { - char *out = gpr_malloc(end - begin + 1); - memcpy(out, src + begin, end - begin); +static char * +copy_component (const char *src, size_t begin, size_t end) +{ + char *out = gpr_malloc (end - begin + 1); + memcpy (out, src + begin, end - begin); out[end - begin] = 0; return out; } @@ -74,67 +78,77 @@ static char *copy_component(const char *src, size_t begin, size_t end) { /** Returns how many chars to advance if \a uri_text[i] begins a valid \a pchar * production. If \a uri_text[i] introduces an invalid \a pchar (such as percent * sign not followed by two hex digits), NOT_SET is returned. */ -static size_t parse_pchar(const char *uri_text, size_t i) { +static size_t +parse_pchar (const char *uri_text, size_t i) +{ /* pchar = unreserved / pct-encoded / sub-delims / ":" / "@" * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" * pct-encoded = "%" HEXDIG HEXDIG * sub-delims = "!" / "$" / "&" / "'" / "(" / ")" - / "*" / "+" / "," / ";" / "=" */ + / "*" / "+" / "," / ";" / "=" */ char c = uri_text[i]; - if (((c >= 'A') && (c <= 'Z')) || ((c >= 'a') && (c <= 'z')) || - ((c >= '0') && (c <= '9')) || - (c == '-' || c == '.' || c == '_' || c == '~') || /* unreserved */ - - (c == '!' || c == '$' || c == '&' || c == '\'' || c == '$' || c == '&' || - c == '(' || c == ')' || c == '*' || c == '+' || c == ',' || c == ';' || - c == '=') /* sub-delims */) { - return 1; - } - if (c == '%') { /* pct-encoded */ - size_t j; - if (uri_text[i + 1] == 0 || uri_text[i + 2] == 0) { - return NOT_SET; + if (((c >= 'A') && (c <= 'Z')) || ((c >= 'a') && (c <= 'z')) || ((c >= '0') && (c <= '9')) || (c == '-' || c == '.' || c == '_' || c == '~') || /* unreserved */ + (c == '!' || c == '$' || c == '&' || c == '\'' || c == '$' || c == '&' || c == '(' || c == ')' || c == '*' || c == '+' || c == ',' || c == ';' || c == '=') /* sub-delims */ ) + { + return 1; } - for (j = i + 1; j < 2; j++) { - c = uri_text[j]; - if (!(((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) || - ((c >= 'A') && (c <= 'F')))) { - return NOT_SET; - } + if (c == '%') + { /* pct-encoded */ + size_t j; + if (uri_text[i + 1] == 0 || uri_text[i + 2] == 0) + { + return NOT_SET; + } + for (j = i + 1; j < 2; j++) + { + c = uri_text[j]; + if (!(((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) || ((c >= 'A') && (c <= 'F')))) + { + return NOT_SET; + } + } + return 2; } - return 2; - } return 0; } /* *( pchar / "?" / "/" ) */ -static int parse_fragment_or_query(const char *uri_text, size_t *i) { +static int +parse_fragment_or_query (const char *uri_text, size_t * i) +{ char c; - while ((c = uri_text[*i]) != 0) { - const size_t advance = parse_pchar(uri_text, *i); /* pchar */ - switch (advance) { - case 0: /* uri_text[i] isn't in pchar */ - /* maybe it's ? or / */ - if (uri_text[*i] == '?' || uri_text[*i] == '/') { - (*i)++; - break; - } else { - return 1; - } - gpr_log(GPR_ERROR, "should never reach here"); - abort(); - default: - (*i) += advance; - break; - case NOT_SET: /* uri_text[i] introduces an invalid URI */ - return 0; + while ((c = uri_text[*i]) != 0) + { + const size_t advance = parse_pchar (uri_text, *i); /* pchar */ + switch (advance) + { + case 0: /* uri_text[i] isn't in pchar */ + /* maybe it's ? or / */ + if (uri_text[*i] == '?' || uri_text[*i] == '/') + { + (*i)++; + break; + } + else + { + return 1; + } + gpr_log (GPR_ERROR, "should never reach here"); + abort (); + default: + (*i) += advance; + break; + case NOT_SET: /* uri_text[i] introduces an invalid URI */ + return 0; + } } - } /* *i is the first uri_text position past the \a query production, maybe \0 */ return 1; } -grpc_uri *grpc_uri_parse(const char *uri_text, int suppress_errors) { +grpc_uri * +grpc_uri_parse (const char *uri_text, int suppress_errors) +{ grpc_uri *uri; size_t scheme_begin = 0; size_t scheme_end = NOT_SET; @@ -148,96 +162,127 @@ grpc_uri *grpc_uri_parse(const char *uri_text, int suppress_errors) { size_t fragment_end = NOT_SET; size_t i; - for (i = scheme_begin; uri_text[i] != 0; i++) { - if (uri_text[i] == ':') { - scheme_end = i; + for (i = scheme_begin; uri_text[i] != 0; i++) + { + if (uri_text[i] == ':') + { + scheme_end = i; + break; + } + if (uri_text[i] >= 'a' && uri_text[i] <= 'z') + continue; + if (uri_text[i] >= 'A' && uri_text[i] <= 'Z') + continue; + if (i != scheme_begin) + { + if (uri_text[i] >= '0' && uri_text[i] <= '9') + continue; + if (uri_text[i] == '+') + continue; + if (uri_text[i] == '-') + continue; + if (uri_text[i] == '.') + continue; + } break; } - if (uri_text[i] >= 'a' && uri_text[i] <= 'z') continue; - if (uri_text[i] >= 'A' && uri_text[i] <= 'Z') continue; - if (i != scheme_begin) { - if (uri_text[i] >= '0' && uri_text[i] <= '9') continue; - if (uri_text[i] == '+') continue; - if (uri_text[i] == '-') continue; - if (uri_text[i] == '.') continue; + if (scheme_end == NOT_SET) + { + return bad_uri (uri_text, i, "scheme", suppress_errors); } - break; - } - if (scheme_end == NOT_SET) { - return bad_uri(uri_text, i, "scheme", suppress_errors); - } - - if (uri_text[scheme_end + 1] == '/' && uri_text[scheme_end + 2] == '/') { - authority_begin = scheme_end + 3; - for (i = authority_begin; uri_text[i] != 0 && authority_end == NOT_SET; - i++) { - if (uri_text[i] == '/' || uri_text[i] == '?' || uri_text[i] == '#') { - authority_end = i; - } + + if (uri_text[scheme_end + 1] == '/' && uri_text[scheme_end + 2] == '/') + { + authority_begin = scheme_end + 3; + for (i = authority_begin; uri_text[i] != 0 && authority_end == NOT_SET; i++) + { + if (uri_text[i] == '/' || uri_text[i] == '?' || uri_text[i] == '#') + { + authority_end = i; + } + } + if (authority_end == NOT_SET && uri_text[i] == 0) + { + authority_end = i; + } + if (authority_end == NOT_SET) + { + return bad_uri (uri_text, i, "authority", suppress_errors); + } + /* TODO(ctiller): parse the authority correctly */ + path_begin = authority_end; } - if (authority_end == NOT_SET && uri_text[i] == 0) { - authority_end = i; + else + { + path_begin = scheme_end + 1; } - if (authority_end == NOT_SET) { - return bad_uri(uri_text, i, "authority", suppress_errors); + + for (i = path_begin; uri_text[i] != 0; i++) + { + if (uri_text[i] == '?' || uri_text[i] == '#') + { + path_end = i; + break; + } } - /* TODO(ctiller): parse the authority correctly */ - path_begin = authority_end; - } else { - path_begin = scheme_end + 1; - } - - for (i = path_begin; uri_text[i] != 0; i++) { - if (uri_text[i] == '?' || uri_text[i] == '#') { + if (path_end == NOT_SET && uri_text[i] == 0) + { path_end = i; - break; } - } - if (path_end == NOT_SET && uri_text[i] == 0) { - path_end = i; - } - if (path_end == NOT_SET) { - return bad_uri(uri_text, i, "path", suppress_errors); - } - - if (uri_text[i] == '?') { - query_begin = ++i; - if (!parse_fragment_or_query(uri_text, &i)) { - return bad_uri(uri_text, i, "query", suppress_errors); - } else if (uri_text[i] != 0 && uri_text[i] != '#') { - /* We must be at the end or at the beginning of a fragment */ - return bad_uri(uri_text, i, "query", suppress_errors); + if (path_end == NOT_SET) + { + return bad_uri (uri_text, i, "path", suppress_errors); + } + + if (uri_text[i] == '?') + { + query_begin = ++i; + if (!parse_fragment_or_query (uri_text, &i)) + { + return bad_uri (uri_text, i, "query", suppress_errors); + } + else if (uri_text[i] != 0 && uri_text[i] != '#') + { + /* We must be at the end or at the beginning of a fragment */ + return bad_uri (uri_text, i, "query", suppress_errors); + } + query_end = i; } - query_end = i; - } - if (uri_text[i] == '#') { - fragment_begin = ++i; - if (!parse_fragment_or_query(uri_text, &i)) { - return bad_uri(uri_text, i - fragment_end, "fragment", suppress_errors); - } else if (uri_text[i] != 0) { - /* We must be at the end */ - return bad_uri(uri_text, i, "fragment", suppress_errors); + if (uri_text[i] == '#') + { + fragment_begin = ++i; + if (!parse_fragment_or_query (uri_text, &i)) + { + return bad_uri (uri_text, i - fragment_end, "fragment", suppress_errors); + } + else if (uri_text[i] != 0) + { + /* We must be at the end */ + return bad_uri (uri_text, i, "fragment", suppress_errors); + } + fragment_end = i; } - fragment_end = i; - } - uri = gpr_malloc(sizeof(*uri)); - memset(uri, 0, sizeof(*uri)); - uri->scheme = copy_component(uri_text, scheme_begin, scheme_end); - uri->authority = copy_component(uri_text, authority_begin, authority_end); - uri->path = copy_component(uri_text, path_begin, path_end); - uri->query = copy_component(uri_text, query_begin, query_end); - uri->fragment = copy_component(uri_text, fragment_begin, fragment_end); + uri = gpr_malloc (sizeof (*uri)); + memset (uri, 0, sizeof (*uri)); + uri->scheme = copy_component (uri_text, scheme_begin, scheme_end); + uri->authority = copy_component (uri_text, authority_begin, authority_end); + uri->path = copy_component (uri_text, path_begin, path_end); + uri->query = copy_component (uri_text, query_begin, query_end); + uri->fragment = copy_component (uri_text, fragment_begin, fragment_end); return uri; } -void grpc_uri_destroy(grpc_uri *uri) { - if (!uri) return; - gpr_free(uri->scheme); - gpr_free(uri->authority); - gpr_free(uri->path); - gpr_free(uri->query); - gpr_free(uri->fragment); - gpr_free(uri); +void +grpc_uri_destroy (grpc_uri * uri) +{ + if (!uri) + return; + gpr_free (uri->scheme); + gpr_free (uri->authority); + gpr_free (uri->path); + gpr_free (uri->query); + gpr_free (uri->fragment); + gpr_free (uri); } diff --git a/src/core/client_config/uri_parser.h b/src/core/client_config/uri_parser.h index b8daa13bd4f..1eb26e7ca67 100644 --- a/src/core/client_config/uri_parser.h +++ b/src/core/client_config/uri_parser.h @@ -34,7 +34,8 @@ #ifndef GRPC_INTERNAL_CORE_CLIENT_CONFIG_URI_PARSER_H #define GRPC_INTERNAL_CORE_CLIENT_CONFIG_URI_PARSER_H -typedef struct { +typedef struct +{ char *scheme; char *authority; char *path; @@ -43,9 +44,9 @@ typedef struct { } grpc_uri; /** parse a uri, return NULL on failure */ -grpc_uri *grpc_uri_parse(const char *uri_text, int suppress_errors); +grpc_uri *grpc_uri_parse (const char *uri_text, int suppress_errors); /** destroy a uri */ -void grpc_uri_destroy(grpc_uri *uri); +void grpc_uri_destroy (grpc_uri * uri); #endif diff --git a/src/core/compression/algorithm.c b/src/core/compression/algorithm.c index 8adde13b1ec..2627761d900 100644 --- a/src/core/compression/algorithm.c +++ b/src/core/compression/algorithm.c @@ -37,30 +37,41 @@ #include #include -int grpc_compression_algorithm_parse(const char *name, size_t name_length, - grpc_compression_algorithm *algorithm) { +int +grpc_compression_algorithm_parse (const char *name, size_t name_length, grpc_compression_algorithm * algorithm) +{ /* we use strncmp not only because it's safer (even though in this case it * doesn't matter, given that we are comparing against string literals, but * because this way we needn't have "name" nil-terminated (useful for slice * data, for example) */ - if (name_length == 0) { - return 0; - } - if (strncmp(name, "identity", name_length) == 0) { - *algorithm = GRPC_COMPRESS_NONE; - } else if (strncmp(name, "gzip", name_length) == 0) { - *algorithm = GRPC_COMPRESS_GZIP; - } else if (strncmp(name, "deflate", name_length) == 0) { - *algorithm = GRPC_COMPRESS_DEFLATE; - } else { - return 0; - } + if (name_length == 0) + { + return 0; + } + if (strncmp (name, "identity", name_length) == 0) + { + *algorithm = GRPC_COMPRESS_NONE; + } + else if (strncmp (name, "gzip", name_length) == 0) + { + *algorithm = GRPC_COMPRESS_GZIP; + } + else if (strncmp (name, "deflate", name_length) == 0) + { + *algorithm = GRPC_COMPRESS_DEFLATE; + } + else + { + return 0; + } return 1; } -int grpc_compression_algorithm_name(grpc_compression_algorithm algorithm, - char **name) { - switch (algorithm) { +int +grpc_compression_algorithm_name (grpc_compression_algorithm algorithm, char **name) +{ + switch (algorithm) + { case GRPC_COMPRESS_NONE: *name = "identity"; break; @@ -72,15 +83,17 @@ int grpc_compression_algorithm_name(grpc_compression_algorithm algorithm, break; default: return 0; - } + } return 1; } /* TODO(dgq): Add the ability to specify parameters to the individual * compression algorithms */ -grpc_compression_algorithm grpc_compression_algorithm_for_level( - grpc_compression_level level) { - switch (level) { +grpc_compression_algorithm +grpc_compression_algorithm_for_level (grpc_compression_level level) +{ + switch (level) + { case GRPC_COMPRESS_LEVEL_NONE: return GRPC_COMPRESS_NONE; case GRPC_COMPRESS_LEVEL_LOW: @@ -89,39 +102,45 @@ grpc_compression_algorithm grpc_compression_algorithm_for_level( return GRPC_COMPRESS_DEFLATE; default: /* we shouldn't be making it here */ - abort(); - } + abort (); + } } -grpc_compression_level grpc_compression_level_for_algorithm( - grpc_compression_algorithm algorithm) { +grpc_compression_level +grpc_compression_level_for_algorithm (grpc_compression_algorithm algorithm) +{ grpc_compression_level clevel; - for (clevel = GRPC_COMPRESS_LEVEL_NONE; clevel < GRPC_COMPRESS_LEVEL_COUNT; - ++clevel) { - if (grpc_compression_algorithm_for_level(clevel) == algorithm) { - return clevel; + for (clevel = GRPC_COMPRESS_LEVEL_NONE; clevel < GRPC_COMPRESS_LEVEL_COUNT; ++clevel) + { + if (grpc_compression_algorithm_for_level (clevel) == algorithm) + { + return clevel; + } } - } - abort(); + abort (); } -void grpc_compression_options_init(grpc_compression_options *opts) { +void +grpc_compression_options_init (grpc_compression_options * opts) +{ opts->enabled_algorithms_bitset = (1u << GRPC_COMPRESS_ALGORITHMS_COUNT) - 1; opts->default_compression_algorithm = GRPC_COMPRESS_NONE; } -void grpc_compression_options_enable_algorithm( - grpc_compression_options *opts, grpc_compression_algorithm algorithm) { - GPR_BITSET(&opts->enabled_algorithms_bitset, algorithm); +void +grpc_compression_options_enable_algorithm (grpc_compression_options * opts, grpc_compression_algorithm algorithm) +{ + GPR_BITSET (&opts->enabled_algorithms_bitset, algorithm); } -void grpc_compression_options_disable_algorithm( - grpc_compression_options *opts, grpc_compression_algorithm algorithm) { - GPR_BITCLEAR(&opts->enabled_algorithms_bitset, algorithm); +void +grpc_compression_options_disable_algorithm (grpc_compression_options * opts, grpc_compression_algorithm algorithm) +{ + GPR_BITCLEAR (&opts->enabled_algorithms_bitset, algorithm); } -int grpc_compression_options_is_algorithm_enabled( - const grpc_compression_options *opts, - grpc_compression_algorithm algorithm) { - return GPR_BITGET(opts->enabled_algorithms_bitset, algorithm); +int +grpc_compression_options_is_algorithm_enabled (const grpc_compression_options * opts, grpc_compression_algorithm algorithm) +{ + return GPR_BITGET (opts->enabled_algorithms_bitset, algorithm); } diff --git a/src/core/compression/message_compress.c b/src/core/compression/message_compress.c index 01db7134c3c..ac079f87242 100644 --- a/src/core/compression/message_compress.c +++ b/src/core/compression/message_compress.c @@ -42,153 +42,176 @@ #define OUTPUT_BLOCK_SIZE 1024 -static int zlib_body(z_stream *zs, gpr_slice_buffer *input, - gpr_slice_buffer *output, - int (*flate)(z_stream *zs, int flush)) { +static int +zlib_body (z_stream * zs, gpr_slice_buffer * input, gpr_slice_buffer * output, int (*flate) (z_stream * zs, int flush)) +{ int r; int flush; size_t i; - gpr_slice outbuf = gpr_slice_malloc(OUTPUT_BLOCK_SIZE); - const uInt uint_max = ~(uInt)0; + gpr_slice outbuf = gpr_slice_malloc (OUTPUT_BLOCK_SIZE); + const uInt uint_max = ~(uInt) 0; - GPR_ASSERT(GPR_SLICE_LENGTH(outbuf) <= uint_max); - zs->avail_out = (uInt)GPR_SLICE_LENGTH(outbuf); - zs->next_out = GPR_SLICE_START_PTR(outbuf); + GPR_ASSERT (GPR_SLICE_LENGTH (outbuf) <= uint_max); + zs->avail_out = (uInt) GPR_SLICE_LENGTH (outbuf); + zs->next_out = GPR_SLICE_START_PTR (outbuf); flush = Z_NO_FLUSH; - for (i = 0; i < input->count; i++) { - if (i == input->count - 1) flush = Z_FINISH; - GPR_ASSERT(GPR_SLICE_LENGTH(input->slices[i]) <= uint_max); - zs->avail_in = (uInt)GPR_SLICE_LENGTH(input->slices[i]); - zs->next_in = GPR_SLICE_START_PTR(input->slices[i]); - do { - if (zs->avail_out == 0) { - gpr_slice_buffer_add_indexed(output, outbuf); - outbuf = gpr_slice_malloc(OUTPUT_BLOCK_SIZE); - GPR_ASSERT(GPR_SLICE_LENGTH(outbuf) <= uint_max); - zs->avail_out = (uInt)GPR_SLICE_LENGTH(outbuf); - zs->next_out = GPR_SLICE_START_PTR(outbuf); - } - r = flate(zs, flush); - if (r == Z_STREAM_ERROR) { - gpr_log(GPR_INFO, "zlib: stream error"); - goto error; - } - } while (zs->avail_out == 0); - if (zs->avail_in) { - gpr_log(GPR_INFO, "zlib: not all input consumed"); - goto error; + for (i = 0; i < input->count; i++) + { + if (i == input->count - 1) + flush = Z_FINISH; + GPR_ASSERT (GPR_SLICE_LENGTH (input->slices[i]) <= uint_max); + zs->avail_in = (uInt) GPR_SLICE_LENGTH (input->slices[i]); + zs->next_in = GPR_SLICE_START_PTR (input->slices[i]); + do + { + if (zs->avail_out == 0) + { + gpr_slice_buffer_add_indexed (output, outbuf); + outbuf = gpr_slice_malloc (OUTPUT_BLOCK_SIZE); + GPR_ASSERT (GPR_SLICE_LENGTH (outbuf) <= uint_max); + zs->avail_out = (uInt) GPR_SLICE_LENGTH (outbuf); + zs->next_out = GPR_SLICE_START_PTR (outbuf); + } + r = flate (zs, flush); + if (r == Z_STREAM_ERROR) + { + gpr_log (GPR_INFO, "zlib: stream error"); + goto error; + } + } + while (zs->avail_out == 0); + if (zs->avail_in) + { + gpr_log (GPR_INFO, "zlib: not all input consumed"); + goto error; + } } - } - GPR_ASSERT(outbuf.refcount); + GPR_ASSERT (outbuf.refcount); outbuf.data.refcounted.length -= zs->avail_out; - gpr_slice_buffer_add_indexed(output, outbuf); + gpr_slice_buffer_add_indexed (output, outbuf); return 1; error: - gpr_slice_unref(outbuf); + gpr_slice_unref (outbuf); return 0; } -static int zlib_compress(gpr_slice_buffer *input, gpr_slice_buffer *output, - int gzip) { +static int +zlib_compress (gpr_slice_buffer * input, gpr_slice_buffer * output, int gzip) +{ z_stream zs; int r; size_t i; size_t count_before = output->count; size_t length_before = output->length; - memset(&zs, 0, sizeof(zs)); - r = deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 | (gzip ? 16 : 0), - 8, Z_DEFAULT_STRATEGY); - if (r != Z_OK) { - gpr_log(GPR_ERROR, "deflateInit2 returns %d", r); - return 0; - } - r = zlib_body(&zs, input, output, deflate) && output->length < input->length; - if (!r) { - for (i = count_before; i < output->count; i++) { - gpr_slice_unref(output->slices[i]); + memset (&zs, 0, sizeof (zs)); + r = deflateInit2 (&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 | (gzip ? 16 : 0), 8, Z_DEFAULT_STRATEGY); + if (r != Z_OK) + { + gpr_log (GPR_ERROR, "deflateInit2 returns %d", r); + return 0; + } + r = zlib_body (&zs, input, output, deflate) && output->length < input->length; + if (!r) + { + for (i = count_before; i < output->count; i++) + { + gpr_slice_unref (output->slices[i]); + } + output->count = count_before; + output->length = length_before; } - output->count = count_before; - output->length = length_before; - } - deflateEnd(&zs); + deflateEnd (&zs); return r; } -static int zlib_decompress(gpr_slice_buffer *input, gpr_slice_buffer *output, - int gzip) { +static int +zlib_decompress (gpr_slice_buffer * input, gpr_slice_buffer * output, int gzip) +{ z_stream zs; int r; size_t i; size_t count_before = output->count; size_t length_before = output->length; - memset(&zs, 0, sizeof(zs)); - r = inflateInit2(&zs, 15 | (gzip ? 16 : 0)); - if (r != Z_OK) { - gpr_log(GPR_ERROR, "inflateInit2 returns %d", r); - return 0; - } - r = zlib_body(&zs, input, output, inflate); - if (!r) { - for (i = count_before; i < output->count; i++) { - gpr_slice_unref(output->slices[i]); + memset (&zs, 0, sizeof (zs)); + r = inflateInit2 (&zs, 15 | (gzip ? 16 : 0)); + if (r != Z_OK) + { + gpr_log (GPR_ERROR, "inflateInit2 returns %d", r); + return 0; } - output->count = count_before; - output->length = length_before; - } - inflateEnd(&zs); + r = zlib_body (&zs, input, output, inflate); + if (!r) + { + for (i = count_before; i < output->count; i++) + { + gpr_slice_unref (output->slices[i]); + } + output->count = count_before; + output->length = length_before; + } + inflateEnd (&zs); return r; } -static int copy(gpr_slice_buffer *input, gpr_slice_buffer *output) { +static int +copy (gpr_slice_buffer * input, gpr_slice_buffer * output) +{ size_t i; - for (i = 0; i < input->count; i++) { - gpr_slice_buffer_add(output, gpr_slice_ref(input->slices[i])); - } + for (i = 0; i < input->count; i++) + { + gpr_slice_buffer_add (output, gpr_slice_ref (input->slices[i])); + } return 1; } -int compress_inner(grpc_compression_algorithm algorithm, - gpr_slice_buffer *input, gpr_slice_buffer *output) { - switch (algorithm) { +int +compress_inner (grpc_compression_algorithm algorithm, gpr_slice_buffer * input, gpr_slice_buffer * output) +{ + switch (algorithm) + { case GRPC_COMPRESS_NONE: /* the fallback path always needs to be send uncompressed: we simply rely on that here */ return 0; case GRPC_COMPRESS_DEFLATE: - return zlib_compress(input, output, 0); + return zlib_compress (input, output, 0); case GRPC_COMPRESS_GZIP: - return zlib_compress(input, output, 1); + return zlib_compress (input, output, 1); case GRPC_COMPRESS_ALGORITHMS_COUNT: break; - } - gpr_log(GPR_ERROR, "invalid compression algorithm %d", algorithm); + } + gpr_log (GPR_ERROR, "invalid compression algorithm %d", algorithm); return 0; } -int grpc_msg_compress(grpc_compression_algorithm algorithm, - gpr_slice_buffer *input, gpr_slice_buffer *output) { - if (!compress_inner(algorithm, input, output)) { - copy(input, output); - return 0; - } +int +grpc_msg_compress (grpc_compression_algorithm algorithm, gpr_slice_buffer * input, gpr_slice_buffer * output) +{ + if (!compress_inner (algorithm, input, output)) + { + copy (input, output); + return 0; + } return 1; } -int grpc_msg_decompress(grpc_compression_algorithm algorithm, - gpr_slice_buffer *input, gpr_slice_buffer *output) { - switch (algorithm) { +int +grpc_msg_decompress (grpc_compression_algorithm algorithm, gpr_slice_buffer * input, gpr_slice_buffer * output) +{ + switch (algorithm) + { case GRPC_COMPRESS_NONE: - return copy(input, output); + return copy (input, output); case GRPC_COMPRESS_DEFLATE: - return zlib_decompress(input, output, 0); + return zlib_decompress (input, output, 0); case GRPC_COMPRESS_GZIP: - return zlib_decompress(input, output, 1); + return zlib_decompress (input, output, 1); case GRPC_COMPRESS_ALGORITHMS_COUNT: break; - } - gpr_log(GPR_ERROR, "invalid compression algorithm %d", algorithm); + } + gpr_log (GPR_ERROR, "invalid compression algorithm %d", algorithm); return 0; } diff --git a/src/core/compression/message_compress.h b/src/core/compression/message_compress.h index b3eb8f579f7..c052adda941 100644 --- a/src/core/compression/message_compress.h +++ b/src/core/compression/message_compress.h @@ -40,13 +40,11 @@ /* 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, - gpr_slice_buffer *input, gpr_slice_buffer *output); +int grpc_msg_compress (grpc_compression_algorithm algorithm, gpr_slice_buffer * input, gpr_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, - gpr_slice_buffer *input, gpr_slice_buffer *output); +int grpc_msg_decompress (grpc_compression_algorithm algorithm, gpr_slice_buffer * input, gpr_slice_buffer * output); #endif /* GRPC_INTERNAL_CORE_COMPRESSION_MESSAGE_COMPRESS_H */ diff --git a/src/core/debug/trace.c b/src/core/debug/trace.c index 3b35d81cd84..d43d999762e 100644 --- a/src/core/debug/trace.c +++ b/src/core/debug/trace.c @@ -40,15 +40,18 @@ #include #include "src/core/support/env.h" -typedef struct tracer { +typedef struct tracer +{ const char *name; int *flag; struct tracer *next; } tracer; static tracer *tracers; -void grpc_register_tracer(const char *name, int *flag) { - tracer *t = gpr_malloc(sizeof(*t)); +void +grpc_register_tracer (const char *name, int *flag) +{ + tracer *t = gpr_malloc (sizeof (*t)); t->name = name; t->flag = flag; t->next = tracers; @@ -56,81 +59,107 @@ void grpc_register_tracer(const char *name, int *flag) { tracers = t; } -static void add(const char *beg, const char *end, char ***ss, size_t *ns) { +static void +add (const char *beg, const char *end, char ***ss, size_t * ns) +{ size_t n = *ns; size_t np = n + 1; char *s; size_t len; - GPR_ASSERT(end >= beg); - len = (size_t)(end - beg); - s = gpr_malloc(len + 1); - memcpy(s, beg, len); + GPR_ASSERT (end >= beg); + len = (size_t) (end - beg); + s = gpr_malloc (len + 1); + memcpy (s, beg, len); s[len] = 0; - *ss = gpr_realloc(*ss, sizeof(char **) * np); + *ss = gpr_realloc (*ss, sizeof (char **) * np); (*ss)[n] = s; *ns = np; } -static void split(const char *s, char ***ss, size_t *ns) { - const char *c = strchr(s, ','); - if (c == NULL) { - add(s, s + strlen(s), ss, ns); - } else { - add(s, c, ss, ns); - split(c + 1, ss, ns); - } +static void +split (const char *s, char ***ss, size_t * ns) +{ + const char *c = strchr (s, ','); + if (c == NULL) + { + add (s, s + strlen (s), ss, ns); + } + else + { + add (s, c, ss, ns); + split (c + 1, ss, ns); + } } -static void parse(const char *s) { +static void +parse (const char *s) +{ char **strings = NULL; size_t nstrings = 0; size_t i; - split(s, &strings, &nstrings); + split (s, &strings, &nstrings); - for (i = 0; i < nstrings; i++) { - grpc_tracer_set_enabled(strings[i], 1); - } + for (i = 0; i < nstrings; i++) + { + grpc_tracer_set_enabled (strings[i], 1); + } - for (i = 0; i < nstrings; i++) { - gpr_free(strings[i]); - } - gpr_free(strings); + for (i = 0; i < nstrings; i++) + { + gpr_free (strings[i]); + } + gpr_free (strings); } -void grpc_tracer_init(const char *env_var) { - char *e = gpr_getenv(env_var); - if (e != NULL) { - parse(e); - gpr_free(e); - } +void +grpc_tracer_init (const char *env_var) +{ + char *e = gpr_getenv (env_var); + if (e != NULL) + { + parse (e); + gpr_free (e); + } } -void grpc_tracer_shutdown(void) { - while (tracers) { - tracer *t = tracers; - tracers = t->next; - gpr_free(t); - } +void +grpc_tracer_shutdown (void) +{ + while (tracers) + { + tracer *t = tracers; + tracers = t->next; + gpr_free (t); + } } -int grpc_tracer_set_enabled(const char *name, int enabled) { +int +grpc_tracer_set_enabled (const char *name, int enabled) +{ tracer *t; - if (0 == strcmp(name, "all")) { - for (t = tracers; t; t = t->next) { - *t->flag = 1; - } - } else { - int found = 0; - for (t = tracers; t; t = t->next) { - if (0 == strcmp(name, t->name)) { - *t->flag = enabled; - found = 1; - } + if (0 == strcmp (name, "all")) + { + for (t = tracers; t; t = t->next) + { + *t->flag = 1; + } } - if (!found) { - gpr_log(GPR_ERROR, "Unknown trace var: '%s'", name); - return 0; /* early return */ + else + { + int found = 0; + for (t = tracers; t; t = t->next) + { + if (0 == strcmp (name, t->name)) + { + *t->flag = enabled; + found = 1; + } + } + if (!found) + { + gpr_log (GPR_ERROR, "Unknown trace var: '%s'", name); + return 0; /* early return */ + } } - } return 1; } diff --git a/src/core/debug/trace.h b/src/core/debug/trace.h index dc5875976e2..d11074d7c66 100644 --- a/src/core/debug/trace.h +++ b/src/core/debug/trace.h @@ -36,8 +36,8 @@ #include -void grpc_register_tracer(const char *name, int *flag); -void grpc_tracer_init(const char *env_var_name); -void grpc_tracer_shutdown(void); +void grpc_register_tracer (const char *name, int *flag); +void grpc_tracer_init (const char *env_var_name); +void grpc_tracer_shutdown (void); #endif /* GRPC_INTERNAL_CORE_DEBUG_TRACE_H */ diff --git a/src/core/httpcli/format_request.c b/src/core/httpcli/format_request.c index 6189fce86b4..367fef9e32f 100644 --- a/src/core/httpcli/format_request.c +++ b/src/core/httpcli/format_request.c @@ -43,78 +43,86 @@ #include #include -static void fill_common_header(const grpc_httpcli_request *request, - gpr_strvec *buf) { +static void +fill_common_header (const grpc_httpcli_request * request, gpr_strvec * buf) +{ size_t i; - gpr_strvec_add(buf, gpr_strdup(request->path)); - gpr_strvec_add(buf, gpr_strdup(" HTTP/1.0\r\n")); + gpr_strvec_add (buf, gpr_strdup (request->path)); + gpr_strvec_add (buf, gpr_strdup (" HTTP/1.0\r\n")); /* just in case some crazy server really expects HTTP/1.1 */ - gpr_strvec_add(buf, gpr_strdup("Host: ")); - gpr_strvec_add(buf, gpr_strdup(request->host)); - gpr_strvec_add(buf, gpr_strdup("\r\n")); - gpr_strvec_add(buf, gpr_strdup("Connection: close\r\n")); - gpr_strvec_add(buf, - gpr_strdup("User-Agent: " GRPC_HTTPCLI_USER_AGENT "\r\n")); + gpr_strvec_add (buf, gpr_strdup ("Host: ")); + gpr_strvec_add (buf, gpr_strdup (request->host)); + gpr_strvec_add (buf, gpr_strdup ("\r\n")); + gpr_strvec_add (buf, gpr_strdup ("Connection: close\r\n")); + gpr_strvec_add (buf, gpr_strdup ("User-Agent: " GRPC_HTTPCLI_USER_AGENT "\r\n")); /* user supplied headers */ - for (i = 0; i < request->hdr_count; i++) { - gpr_strvec_add(buf, gpr_strdup(request->hdrs[i].key)); - gpr_strvec_add(buf, gpr_strdup(": ")); - gpr_strvec_add(buf, gpr_strdup(request->hdrs[i].value)); - gpr_strvec_add(buf, gpr_strdup("\r\n")); - } + for (i = 0; i < request->hdr_count; i++) + { + gpr_strvec_add (buf, gpr_strdup (request->hdrs[i].key)); + gpr_strvec_add (buf, gpr_strdup (": ")); + gpr_strvec_add (buf, gpr_strdup (request->hdrs[i].value)); + gpr_strvec_add (buf, gpr_strdup ("\r\n")); + } } -gpr_slice grpc_httpcli_format_get_request(const grpc_httpcli_request *request) { +gpr_slice +grpc_httpcli_format_get_request (const grpc_httpcli_request * request) +{ gpr_strvec out; char *flat; size_t flat_len; - gpr_strvec_init(&out); - gpr_strvec_add(&out, gpr_strdup("GET ")); - fill_common_header(request, &out); - gpr_strvec_add(&out, gpr_strdup("\r\n")); + gpr_strvec_init (&out); + gpr_strvec_add (&out, gpr_strdup ("GET ")); + fill_common_header (request, &out); + gpr_strvec_add (&out, gpr_strdup ("\r\n")); - flat = gpr_strvec_flatten(&out, &flat_len); - gpr_strvec_destroy(&out); + flat = gpr_strvec_flatten (&out, &flat_len); + gpr_strvec_destroy (&out); - return gpr_slice_new(flat, flat_len, gpr_free); + return gpr_slice_new (flat, flat_len, gpr_free); } -gpr_slice grpc_httpcli_format_post_request(const grpc_httpcli_request *request, - const char *body_bytes, - size_t body_size) { +gpr_slice +grpc_httpcli_format_post_request (const grpc_httpcli_request * request, const char *body_bytes, size_t body_size) +{ gpr_strvec out; char *tmp; size_t out_len; size_t i; - gpr_strvec_init(&out); + gpr_strvec_init (&out); - gpr_strvec_add(&out, gpr_strdup("POST ")); - fill_common_header(request, &out); - if (body_bytes) { - gpr_uint8 has_content_type = 0; - for (i = 0; i < request->hdr_count; i++) { - if (strcmp(request->hdrs[i].key, "Content-Type") == 0) { - has_content_type = 1; - break; - } - } - if (!has_content_type) { - gpr_strvec_add(&out, gpr_strdup("Content-Type: text/plain\r\n")); + gpr_strvec_add (&out, gpr_strdup ("POST ")); + fill_common_header (request, &out); + if (body_bytes) + { + gpr_uint8 has_content_type = 0; + for (i = 0; i < request->hdr_count; i++) + { + if (strcmp (request->hdrs[i].key, "Content-Type") == 0) + { + has_content_type = 1; + break; + } + } + if (!has_content_type) + { + gpr_strvec_add (&out, gpr_strdup ("Content-Type: text/plain\r\n")); + } + gpr_asprintf (&tmp, "Content-Length: %lu\r\n", (unsigned long) body_size); + gpr_strvec_add (&out, tmp); } - gpr_asprintf(&tmp, "Content-Length: %lu\r\n", (unsigned long)body_size); - gpr_strvec_add(&out, tmp); - } - gpr_strvec_add(&out, gpr_strdup("\r\n")); - tmp = gpr_strvec_flatten(&out, &out_len); - gpr_strvec_destroy(&out); + gpr_strvec_add (&out, gpr_strdup ("\r\n")); + tmp = gpr_strvec_flatten (&out, &out_len); + gpr_strvec_destroy (&out); - if (body_bytes) { - tmp = gpr_realloc(tmp, out_len + body_size); - memcpy(tmp + out_len, body_bytes, body_size); - out_len += body_size; - } + if (body_bytes) + { + tmp = gpr_realloc (tmp, out_len + body_size); + memcpy (tmp + out_len, body_bytes, body_size); + out_len += body_size; + } - return gpr_slice_new(tmp, out_len, gpr_free); + return gpr_slice_new (tmp, out_len, gpr_free); } diff --git a/src/core/httpcli/format_request.h b/src/core/httpcli/format_request.h index c8dc8f7d4ee..2238c0da502 100644 --- a/src/core/httpcli/format_request.h +++ b/src/core/httpcli/format_request.h @@ -37,9 +37,7 @@ #include "src/core/httpcli/httpcli.h" #include -gpr_slice grpc_httpcli_format_get_request(const grpc_httpcli_request *request); -gpr_slice grpc_httpcli_format_post_request(const grpc_httpcli_request *request, - const char *body_bytes, - size_t body_size); +gpr_slice grpc_httpcli_format_get_request (const grpc_httpcli_request * request); +gpr_slice grpc_httpcli_format_post_request (const grpc_httpcli_request * request, const char *body_bytes, size_t body_size); #endif /* GRPC_INTERNAL_CORE_HTTPCLI_FORMAT_REQUEST_H */ diff --git a/src/core/httpcli/httpcli.c b/src/core/httpcli/httpcli.c index 6422bfb840a..1196f237a02 100644 --- a/src/core/httpcli/httpcli.c +++ b/src/core/httpcli/httpcli.c @@ -46,7 +46,8 @@ #include #include -typedef struct { +typedef struct +{ gpr_slice request_text; grpc_httpcli_parser parser; grpc_resolved_addresses *addresses; @@ -71,220 +72,230 @@ typedef struct { static grpc_httpcli_get_override g_get_override = NULL; static grpc_httpcli_post_override g_post_override = NULL; -static void plaintext_handshake( - void *arg, grpc_endpoint *endpoint, const char *host, - void (*on_done)(void *arg, grpc_endpoint *endpoint, - grpc_closure_list *closure_list), - grpc_closure_list *closure_list) { - on_done(arg, endpoint, closure_list); +static void +plaintext_handshake (void *arg, grpc_endpoint * endpoint, const char *host, void (*on_done) (void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list), grpc_closure_list * closure_list) +{ + on_done (arg, endpoint, closure_list); } -const grpc_httpcli_handshaker grpc_httpcli_plaintext = {"http", - plaintext_handshake}; +const grpc_httpcli_handshaker grpc_httpcli_plaintext = { "http", + plaintext_handshake +}; -void grpc_httpcli_context_init(grpc_httpcli_context *context) { - grpc_pollset_set_init(&context->pollset_set); +void +grpc_httpcli_context_init (grpc_httpcli_context * context) +{ + grpc_pollset_set_init (&context->pollset_set); } -void grpc_httpcli_context_destroy(grpc_httpcli_context *context) { - grpc_pollset_set_destroy(&context->pollset_set); +void +grpc_httpcli_context_destroy (grpc_httpcli_context * context) +{ + grpc_pollset_set_destroy (&context->pollset_set); } -static void next_address(internal_request *req, - grpc_closure_list *closure_list); +static void next_address (internal_request * req, grpc_closure_list * closure_list); -static void finish(internal_request *req, int success, - grpc_closure_list *closure_list) { - grpc_pollset_set_del_pollset(&req->context->pollset_set, req->pollset, - closure_list); - req->on_response(req->user_data, success ? &req->parser.r : NULL, - closure_list); - grpc_httpcli_parser_destroy(&req->parser); - if (req->addresses != NULL) { - grpc_resolved_addresses_destroy(req->addresses); - } - if (req->ep != NULL) { - grpc_endpoint_destroy(req->ep, closure_list); - } - gpr_slice_unref(req->request_text); - gpr_free(req->host); - grpc_iomgr_unregister_object(&req->iomgr_obj); - gpr_slice_buffer_destroy(&req->incoming); - gpr_slice_buffer_destroy(&req->outgoing); - gpr_free(req); +static void +finish (internal_request * req, int success, grpc_closure_list * closure_list) +{ + grpc_pollset_set_del_pollset (&req->context->pollset_set, req->pollset, closure_list); + req->on_response (req->user_data, success ? &req->parser.r : NULL, closure_list); + grpc_httpcli_parser_destroy (&req->parser); + if (req->addresses != NULL) + { + grpc_resolved_addresses_destroy (req->addresses); + } + if (req->ep != NULL) + { + grpc_endpoint_destroy (req->ep, closure_list); + } + gpr_slice_unref (req->request_text); + gpr_free (req->host); + grpc_iomgr_unregister_object (&req->iomgr_obj); + gpr_slice_buffer_destroy (&req->incoming); + gpr_slice_buffer_destroy (&req->outgoing); + gpr_free (req); } -static void on_read(void *user_data, int success, - grpc_closure_list *closure_list); +static void on_read (void *user_data, int success, grpc_closure_list * closure_list); -static void do_read(internal_request *req, grpc_closure_list *closure_list) { - grpc_endpoint_read(req->ep, &req->incoming, &req->on_read, closure_list); +static void +do_read (internal_request * req, grpc_closure_list * closure_list) +{ + grpc_endpoint_read (req->ep, &req->incoming, &req->on_read, closure_list); } -static void on_read(void *user_data, int success, - grpc_closure_list *closure_list) { +static void +on_read (void *user_data, int success, grpc_closure_list * closure_list) +{ internal_request *req = user_data; size_t i; - for (i = 0; i < req->incoming.count; i++) { - if (GPR_SLICE_LENGTH(req->incoming.slices[i])) { - req->have_read_byte = 1; - if (!grpc_httpcli_parser_parse(&req->parser, req->incoming.slices[i])) { - finish(req, 0, closure_list); - return; - } + for (i = 0; i < req->incoming.count; i++) + { + if (GPR_SLICE_LENGTH (req->incoming.slices[i])) + { + req->have_read_byte = 1; + if (!grpc_httpcli_parser_parse (&req->parser, req->incoming.slices[i])) + { + finish (req, 0, closure_list); + return; + } + } } - } - if (success) { - do_read(req, closure_list); - } else if (!req->have_read_byte) { - next_address(req, closure_list); - } else { - finish(req, grpc_httpcli_parser_eof(&req->parser), closure_list); - } + if (success) + { + do_read (req, closure_list); + } + else if (!req->have_read_byte) + { + next_address (req, closure_list); + } + else + { + finish (req, grpc_httpcli_parser_eof (&req->parser), closure_list); + } } -static void on_written(internal_request *req, grpc_closure_list *closure_list) { - do_read(req, closure_list); +static void +on_written (internal_request * req, grpc_closure_list * closure_list) +{ + do_read (req, closure_list); } -static void done_write(void *arg, int success, - grpc_closure_list *closure_list) { +static void +done_write (void *arg, int success, grpc_closure_list * closure_list) +{ internal_request *req = arg; - if (success) { - on_written(req, closure_list); - } else { - next_address(req, closure_list); - } + if (success) + { + on_written (req, closure_list); + } + else + { + next_address (req, closure_list); + } } -static void start_write(internal_request *req, - grpc_closure_list *closure_list) { - gpr_slice_ref(req->request_text); - gpr_slice_buffer_add(&req->outgoing, req->request_text); - grpc_endpoint_write(req->ep, &req->outgoing, &req->done_write, closure_list); +static void +start_write (internal_request * req, grpc_closure_list * closure_list) +{ + gpr_slice_ref (req->request_text); + gpr_slice_buffer_add (&req->outgoing, req->request_text); + grpc_endpoint_write (req->ep, &req->outgoing, &req->done_write, closure_list); } -static void on_handshake_done(void *arg, grpc_endpoint *ep, - grpc_closure_list *closure_list) { +static void +on_handshake_done (void *arg, grpc_endpoint * ep, grpc_closure_list * closure_list) +{ internal_request *req = arg; - if (!ep) { - next_address(req, closure_list); - return; - } + if (!ep) + { + next_address (req, closure_list); + return; + } req->ep = ep; - start_write(req, closure_list); + start_write (req, closure_list); } -static void on_connected(void *arg, int success, - grpc_closure_list *closure_list) { +static void +on_connected (void *arg, int success, grpc_closure_list * closure_list) +{ internal_request *req = arg; - if (!req->ep) { - next_address(req, closure_list); - return; - } - req->handshaker->handshake(req, req->ep, req->host, on_handshake_done, - closure_list); + if (!req->ep) + { + next_address (req, closure_list); + return; + } + req->handshaker->handshake (req, req->ep, req->host, on_handshake_done, closure_list); } -static void next_address(internal_request *req, - grpc_closure_list *closure_list) { +static void +next_address (internal_request * req, grpc_closure_list * closure_list) +{ grpc_resolved_address *addr; - if (req->next_address == req->addresses->naddrs) { - finish(req, 0, closure_list); - return; - } + if (req->next_address == req->addresses->naddrs) + { + finish (req, 0, closure_list); + return; + } addr = &req->addresses->addrs[req->next_address++]; - grpc_closure_init(&req->connected, on_connected, req); - grpc_tcp_client_connect(&req->connected, &req->ep, &req->context->pollset_set, - (struct sockaddr *)&addr->addr, addr->len, - req->deadline, closure_list); + grpc_closure_init (&req->connected, on_connected, req); + grpc_tcp_client_connect (&req->connected, &req->ep, &req->context->pollset_set, (struct sockaddr *) &addr->addr, addr->len, req->deadline, closure_list); } -static void on_resolved(void *arg, grpc_resolved_addresses *addresses, - grpc_closure_list *closure_list) { +static void +on_resolved (void *arg, grpc_resolved_addresses * addresses, grpc_closure_list * closure_list) +{ internal_request *req = arg; - if (!addresses) { - finish(req, 0, closure_list); - return; - } + if (!addresses) + { + finish (req, 0, closure_list); + return; + } req->addresses = addresses; req->next_address = 0; - next_address(req, closure_list); + next_address (req, closure_list); } -static void internal_request_begin( - grpc_httpcli_context *context, grpc_pollset *pollset, - const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data, const char *name, - gpr_slice request_text, grpc_closure_list *closure_list) { - internal_request *req = gpr_malloc(sizeof(internal_request)); - memset(req, 0, sizeof(*req)); +static void +internal_request_begin (grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, const char *name, gpr_slice request_text, grpc_closure_list * closure_list) +{ + internal_request *req = gpr_malloc (sizeof (internal_request)); + memset (req, 0, sizeof (*req)); req->request_text = request_text; - grpc_httpcli_parser_init(&req->parser); + grpc_httpcli_parser_init (&req->parser); req->on_response = on_response; req->user_data = user_data; req->deadline = deadline; - req->handshaker = - request->handshaker ? request->handshaker : &grpc_httpcli_plaintext; + req->handshaker = request->handshaker ? request->handshaker : &grpc_httpcli_plaintext; req->context = context; req->pollset = pollset; - grpc_closure_init(&req->on_read, on_read, req); - grpc_closure_init(&req->done_write, done_write, req); - gpr_slice_buffer_init(&req->incoming); - gpr_slice_buffer_init(&req->outgoing); - grpc_iomgr_register_object(&req->iomgr_obj, name); - req->host = gpr_strdup(request->host); + grpc_closure_init (&req->on_read, on_read, req); + grpc_closure_init (&req->done_write, done_write, req); + gpr_slice_buffer_init (&req->incoming); + gpr_slice_buffer_init (&req->outgoing); + grpc_iomgr_register_object (&req->iomgr_obj, name); + req->host = gpr_strdup (request->host); - grpc_pollset_set_add_pollset(&req->context->pollset_set, req->pollset, - closure_list); - grpc_resolve_address(request->host, req->handshaker->default_port, - on_resolved, req); + grpc_pollset_set_add_pollset (&req->context->pollset_set, req->pollset, closure_list); + grpc_resolve_address (request->host, req->handshaker->default_port, on_resolved, req); } -void grpc_httpcli_get(grpc_httpcli_context *context, grpc_pollset *pollset, - const grpc_httpcli_request *request, - gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data, - grpc_closure_list *closure_list) { +void +grpc_httpcli_get (grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ char *name; - if (g_get_override && - g_get_override(request, deadline, on_response, user_data, closure_list)) { - return; - } - gpr_asprintf(&name, "HTTP:GET:%s:%s", request->host, request->path); - internal_request_begin( - context, pollset, request, deadline, on_response, user_data, name, - grpc_httpcli_format_get_request(request), closure_list); - gpr_free(name); + if (g_get_override && g_get_override (request, deadline, on_response, user_data, closure_list)) + { + return; + } + gpr_asprintf (&name, "HTTP:GET:%s:%s", request->host, request->path); + internal_request_begin (context, pollset, request, deadline, on_response, user_data, name, grpc_httpcli_format_get_request (request), closure_list); + gpr_free (name); } -void grpc_httpcli_post(grpc_httpcli_context *context, grpc_pollset *pollset, - const grpc_httpcli_request *request, - const char *body_bytes, size_t body_size, - gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data, - grpc_closure_list *closure_list) { +void +grpc_httpcli_post (grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ char *name; - if (g_post_override && - g_post_override(request, body_bytes, body_size, deadline, on_response, - user_data, closure_list)) { - return; - } - gpr_asprintf(&name, "HTTP:POST:%s:%s", request->host, request->path); - internal_request_begin( - context, pollset, request, deadline, on_response, user_data, name, - grpc_httpcli_format_post_request(request, body_bytes, body_size), - closure_list); - gpr_free(name); + if (g_post_override && g_post_override (request, body_bytes, body_size, deadline, on_response, user_data, closure_list)) + { + return; + } + gpr_asprintf (&name, "HTTP:POST:%s:%s", request->host, request->path); + internal_request_begin (context, pollset, request, deadline, on_response, user_data, name, grpc_httpcli_format_post_request (request, body_bytes, body_size), closure_list); + gpr_free (name); } -void grpc_httpcli_set_override(grpc_httpcli_get_override get, - grpc_httpcli_post_override post) { +void +grpc_httpcli_set_override (grpc_httpcli_get_override get, grpc_httpcli_post_override post) +{ g_get_override = get; g_post_override = post; } diff --git a/src/core/httpcli/httpcli.h b/src/core/httpcli/httpcli.h index 2460c6ca606..cfe7e4b2aff 100644 --- a/src/core/httpcli/httpcli.h +++ b/src/core/httpcli/httpcli.h @@ -47,7 +47,8 @@ #define GRPC_HTTPCLI_MAX_HEADER_LENGTH 4096 /* A single header to be passed in a request */ -typedef struct grpc_httpcli_header { +typedef struct grpc_httpcli_header +{ char *key; char *value; } grpc_httpcli_header; @@ -55,30 +56,30 @@ typedef struct grpc_httpcli_header { /* Tracks in-progress http requests TODO(ctiller): allow caching and capturing multiple requests for the same content and combining them */ -typedef struct grpc_httpcli_context { +typedef struct grpc_httpcli_context +{ grpc_pollset_set pollset_set; } grpc_httpcli_context; -typedef struct { +typedef struct +{ const char *default_port; - void (*handshake)(void *arg, grpc_endpoint *endpoint, const char *host, - void (*on_done)(void *arg, grpc_endpoint *endpoint, - grpc_closure_list *closure_list), - grpc_closure_list *closure_list); + void (*handshake) (void *arg, grpc_endpoint * endpoint, const char *host, void (*on_done) (void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list), grpc_closure_list * closure_list); } grpc_httpcli_handshaker; extern const grpc_httpcli_handshaker grpc_httpcli_plaintext; extern const grpc_httpcli_handshaker grpc_httpcli_ssl; /* A request */ -typedef struct grpc_httpcli_request { +typedef struct grpc_httpcli_request +{ /* The host name to connect to */ char *host; /* The path of the resource to fetch */ char *path; /* Additional headers: count and key/values; the following are supplied automatically and MUST NOT be set here: - Host, Connection, User-Agent */ + Host, Connection, User-Agent */ size_t hdr_count; grpc_httpcli_header *hdrs; /* handshaker to use ssl for the request */ @@ -86,7 +87,8 @@ typedef struct grpc_httpcli_request { } grpc_httpcli_request; /* A response */ -typedef struct grpc_httpcli_response { +typedef struct grpc_httpcli_response +{ /* HTTP status code */ int status; /* Headers: count and key/values */ @@ -98,12 +100,10 @@ typedef struct grpc_httpcli_response { } grpc_httpcli_response; /* Callback for grpc_httpcli_get and grpc_httpcli_post. */ -typedef void (*grpc_httpcli_response_cb)(void *user_data, - const grpc_httpcli_response *response, - grpc_closure_list *closure_list); +typedef void (*grpc_httpcli_response_cb) (void *user_data, const grpc_httpcli_response * response, grpc_closure_list * closure_list); -void grpc_httpcli_context_init(grpc_httpcli_context *context); -void grpc_httpcli_context_destroy(grpc_httpcli_context *context); +void grpc_httpcli_context_init (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 @@ -115,11 +115,7 @@ void grpc_httpcli_context_destroy(grpc_httpcli_context *context); 'deadline' contains a deadline for the request (or gpr_inf_future) 'on_response' is a callback to report results to (and 'user_data' is a user supplied pointer to pass to said call) */ -void grpc_httpcli_get(grpc_httpcli_context *context, grpc_pollset *pollset, - const grpc_httpcli_request *request, - gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data, - grpc_closure_list *closure_list); +void grpc_httpcli_get (grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list); /* Asynchronously perform a HTTP POST. 'context' specifies the http context under which to do the post @@ -136,28 +132,12 @@ void grpc_httpcli_get(grpc_httpcli_context *context, grpc_pollset *pollset, 'on_response' is a callback to report results to (and 'user_data' is a user supplied pointer to pass to said call) Does not support ?var1=val1&var2=val2 in the path. */ -void grpc_httpcli_post(grpc_httpcli_context *context, grpc_pollset *pollset, - const grpc_httpcli_request *request, - const char *body_bytes, size_t body_size, - gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data, - grpc_closure_list *closure_list); +void grpc_httpcli_post (grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list); /* override functions return 1 if they handled the request, 0 otherwise */ -typedef int (*grpc_httpcli_get_override)(const grpc_httpcli_request *request, - gpr_timespec deadline, - grpc_httpcli_response_cb on_response, - void *user_data, - grpc_closure_list *closure_list); -typedef int (*grpc_httpcli_post_override)(const grpc_httpcli_request *request, - const char *body_bytes, - size_t body_size, - gpr_timespec deadline, - grpc_httpcli_response_cb on_response, - void *user_data, - grpc_closure_list *closure_list); - -void grpc_httpcli_set_override(grpc_httpcli_get_override get, - grpc_httpcli_post_override post); +typedef int (*grpc_httpcli_get_override) (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list); +typedef int (*grpc_httpcli_post_override) (const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list); + +void grpc_httpcli_set_override (grpc_httpcli_get_override get, grpc_httpcli_post_override post); #endif /* GRPC_INTERNAL_CORE_HTTPCLI_HTTPCLI_H */ diff --git a/src/core/httpcli/httpcli_security_connector.c b/src/core/httpcli/httpcli_security_connector.c index 1ae1d7f09b0..00fb1fa4587 100644 --- a/src/core/httpcli/httpcli_security_connector.c +++ b/src/core/httpcli/httpcli_security_connector.c @@ -42,149 +42,146 @@ #include #include "src/core/tsi/ssl_transport_security.h" -typedef struct { +typedef struct +{ grpc_channel_security_connector base; tsi_ssl_handshaker_factory *handshaker_factory; char *secure_peer_name; } grpc_httpcli_ssl_channel_security_connector; -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) { - tsi_ssl_handshaker_factory_destroy(c->handshaker_factory); - } - if (c->secure_peer_name != NULL) gpr_free(c->secure_peer_name); - gpr_free(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) + { + tsi_ssl_handshaker_factory_destroy (c->handshaker_factory); + } + if (c->secure_peer_name != NULL) + gpr_free (c->secure_peer_name); + gpr_free (sc); } -static void httpcli_ssl_do_handshake(grpc_security_connector *sc, - grpc_endpoint *nonsecure_endpoint, - grpc_security_handshake_done_cb cb, - void *user_data, - grpc_closure_list *closure_list) { - grpc_httpcli_ssl_channel_security_connector *c = - (grpc_httpcli_ssl_channel_security_connector *)sc; +static void +httpcli_ssl_do_handshake (grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_httpcli_ssl_channel_security_connector *c = (grpc_httpcli_ssl_channel_security_connector *) sc; tsi_result result = TSI_OK; tsi_handshaker *handshaker; - if (c->handshaker_factory == NULL) { - cb(user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, closure_list); - return; - } - result = tsi_ssl_handshaker_factory_create_handshaker( - c->handshaker_factory, c->secure_peer_name, &handshaker); - if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Handshaker creation failed with error %s.", - tsi_result_to_string(result)); - cb(user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, closure_list); - } else { - grpc_do_security_handshake(handshaker, sc, nonsecure_endpoint, cb, - user_data, closure_list); - } + if (c->handshaker_factory == NULL) + { + cb (user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, closure_list); + return; + } + result = tsi_ssl_handshaker_factory_create_handshaker (c->handshaker_factory, c->secure_peer_name, &handshaker); + if (result != TSI_OK) + { + gpr_log (GPR_ERROR, "Handshaker creation failed with error %s.", tsi_result_to_string (result)); + cb (user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, closure_list); + } + else + { + grpc_do_security_handshake (handshaker, sc, nonsecure_endpoint, cb, user_data, closure_list); + } } -static grpc_security_status httpcli_ssl_check_peer(grpc_security_connector *sc, - tsi_peer peer, - grpc_security_check_cb cb, - void *user_data) { - grpc_httpcli_ssl_channel_security_connector *c = - (grpc_httpcli_ssl_channel_security_connector *)sc; +static grpc_security_status +httpcli_ssl_check_peer (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data) +{ + grpc_httpcli_ssl_channel_security_connector *c = (grpc_httpcli_ssl_channel_security_connector *) sc; grpc_security_status status = GRPC_SECURITY_OK; /* Check the peer name. */ - if (c->secure_peer_name != NULL && - !tsi_ssl_peer_matches_name(&peer, c->secure_peer_name)) { - gpr_log(GPR_ERROR, "Peer name %s is not in peer certificate", - c->secure_peer_name); - status = GRPC_SECURITY_ERROR; - } - tsi_peer_destruct(&peer); + if (c->secure_peer_name != NULL && !tsi_ssl_peer_matches_name (&peer, c->secure_peer_name)) + { + gpr_log (GPR_ERROR, "Peer name %s is not in peer certificate", c->secure_peer_name); + status = GRPC_SECURITY_ERROR; + } + tsi_peer_destruct (&peer); return status; } static grpc_security_connector_vtable httpcli_ssl_vtable = { - httpcli_ssl_destroy, httpcli_ssl_do_handshake, httpcli_ssl_check_peer}; + httpcli_ssl_destroy, httpcli_ssl_do_handshake, httpcli_ssl_check_peer +}; -static grpc_security_status httpcli_ssl_channel_security_connector_create( - const unsigned char *pem_root_certs, size_t pem_root_certs_size, - const char *secure_peer_name, grpc_channel_security_connector **sc) { +static grpc_security_status +httpcli_ssl_channel_security_connector_create (const unsigned char *pem_root_certs, size_t pem_root_certs_size, const char *secure_peer_name, grpc_channel_security_connector ** sc) +{ tsi_result result = TSI_OK; grpc_httpcli_ssl_channel_security_connector *c; - if (secure_peer_name != NULL && pem_root_certs == NULL) { - gpr_log(GPR_ERROR, - "Cannot assert a secure peer name without a trust root."); - return GRPC_SECURITY_ERROR; - } + if (secure_peer_name != NULL && pem_root_certs == NULL) + { + gpr_log (GPR_ERROR, "Cannot assert a secure peer name without a trust root."); + return GRPC_SECURITY_ERROR; + } - c = gpr_malloc(sizeof(grpc_httpcli_ssl_channel_security_connector)); - memset(c, 0, sizeof(grpc_httpcli_ssl_channel_security_connector)); + c = gpr_malloc (sizeof (grpc_httpcli_ssl_channel_security_connector)); + memset (c, 0, sizeof (grpc_httpcli_ssl_channel_security_connector)); - gpr_ref_init(&c->base.base.refcount, 1); + gpr_ref_init (&c->base.base.refcount, 1); c->base.base.is_client_side = 1; c->base.base.vtable = &httpcli_ssl_vtable; - if (secure_peer_name != NULL) { - c->secure_peer_name = gpr_strdup(secure_peer_name); - } - result = tsi_create_ssl_client_handshaker_factory( - NULL, 0, NULL, 0, pem_root_certs, pem_root_certs_size, NULL, NULL, NULL, - 0, &c->handshaker_factory); - 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); - *sc = NULL; - return GRPC_SECURITY_ERROR; - } + if (secure_peer_name != NULL) + { + c->secure_peer_name = gpr_strdup (secure_peer_name); + } + result = tsi_create_ssl_client_handshaker_factory (NULL, 0, NULL, 0, pem_root_certs, pem_root_certs_size, NULL, NULL, NULL, 0, &c->handshaker_factory); + 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); + *sc = NULL; + return GRPC_SECURITY_ERROR; + } *sc = &c->base; return GRPC_SECURITY_OK; } /* handshaker */ -typedef struct { - void (*func)(void *arg, grpc_endpoint *endpoint, - grpc_closure_list *closure_list); +typedef struct +{ + void (*func) (void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list); void *arg; } on_done_closure; -static void on_secure_transport_setup_done(void *rp, - grpc_security_status status, - grpc_endpoint *wrapped_endpoint, - grpc_endpoint *secure_endpoint, - grpc_closure_list *closure_list) { +static void +on_secure_transport_setup_done (void *rp, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint, grpc_closure_list * closure_list) +{ on_done_closure *c = rp; - if (status != GRPC_SECURITY_OK) { - gpr_log(GPR_ERROR, "Secure transport setup failed with error %d.", status); - c->func(c->arg, NULL, closure_list); - } else { - c->func(c->arg, secure_endpoint, closure_list); - } - gpr_free(c); + if (status != GRPC_SECURITY_OK) + { + gpr_log (GPR_ERROR, "Secure transport setup failed with error %d.", status); + c->func (c->arg, NULL, closure_list); + } + else + { + c->func (c->arg, secure_endpoint, closure_list); + } + gpr_free (c); } -static void ssl_handshake(void *arg, grpc_endpoint *tcp, const char *host, - void (*on_done)(void *arg, grpc_endpoint *endpoint, - grpc_closure_list *closure_list), - grpc_closure_list *closure_list) { +static void +ssl_handshake (void *arg, grpc_endpoint * tcp, const char *host, void (*on_done) (void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list), grpc_closure_list * closure_list) +{ grpc_channel_security_connector *sc = NULL; const unsigned char *pem_root_certs = NULL; - on_done_closure *c = gpr_malloc(sizeof(*c)); - size_t pem_root_certs_size = grpc_get_default_ssl_roots(&pem_root_certs); - if (pem_root_certs == NULL || pem_root_certs_size == 0) { - gpr_log(GPR_ERROR, "Could not get default pem root certs."); - on_done(arg, NULL, closure_list); - gpr_free(c); - return; - } + on_done_closure *c = gpr_malloc (sizeof (*c)); + size_t pem_root_certs_size = grpc_get_default_ssl_roots (&pem_root_certs); + if (pem_root_certs == NULL || pem_root_certs_size == 0) + { + gpr_log (GPR_ERROR, "Could not get default pem root certs."); + on_done (arg, NULL, closure_list); + gpr_free (c); + return; + } c->func = on_done; c->arg = arg; - GPR_ASSERT(httpcli_ssl_channel_security_connector_create( - pem_root_certs, pem_root_certs_size, host, &sc) == - GRPC_SECURITY_OK); - grpc_security_connector_do_handshake( - &sc->base, tcp, on_secure_transport_setup_done, c, closure_list); - GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "httpcli"); + GPR_ASSERT (httpcli_ssl_channel_security_connector_create (pem_root_certs, pem_root_certs_size, host, &sc) == GRPC_SECURITY_OK); + grpc_security_connector_do_handshake (&sc->base, tcp, on_secure_transport_setup_done, c, closure_list); + GRPC_SECURITY_CONNECTOR_UNREF (&sc->base, "httpcli"); } -const grpc_httpcli_handshaker grpc_httpcli_ssl = {"https", ssl_handshake}; +const grpc_httpcli_handshaker grpc_httpcli_ssl = { "https", ssl_handshake }; diff --git a/src/core/httpcli/parser.c b/src/core/httpcli/parser.c index 404906d5ae2..3c9211efba0 100644 --- a/src/core/httpcli/parser.c +++ b/src/core/httpcli/parser.c @@ -39,178 +39,220 @@ #include #include -static int handle_response_line(grpc_httpcli_parser *parser) { +static int +handle_response_line (grpc_httpcli_parser * parser) +{ gpr_uint8 *beg = parser->cur_line; gpr_uint8 *cur = beg; gpr_uint8 *end = beg + parser->cur_line_length; - if (cur == end || *cur++ != 'H') goto error; - if (cur == end || *cur++ != 'T') goto error; - if (cur == end || *cur++ != 'T') goto error; - if (cur == end || *cur++ != 'P') goto error; - if (cur == end || *cur++ != '/') goto error; - if (cur == end || *cur++ != '1') goto error; - if (cur == end || *cur++ != '.') goto error; - if (cur == end || *cur < '0' || *cur++ > '1') goto error; - if (cur == end || *cur++ != ' ') goto error; - if (cur == end || *cur < '1' || *cur++ > '9') goto error; - if (cur == end || *cur < '0' || *cur++ > '9') goto error; - if (cur == end || *cur < '0' || *cur++ > '9') goto error; - parser->r.status = - (cur[-3] - '0') * 100 + (cur[-2] - '0') * 10 + (cur[-1] - '0'); - if (cur == end || *cur++ != ' ') goto error; + if (cur == end || *cur++ != 'H') + goto error; + if (cur == end || *cur++ != 'T') + goto error; + if (cur == end || *cur++ != 'T') + goto error; + if (cur == end || *cur++ != 'P') + goto error; + if (cur == end || *cur++ != '/') + goto error; + if (cur == end || *cur++ != '1') + goto error; + if (cur == end || *cur++ != '.') + goto error; + if (cur == end || *cur < '0' || *cur++ > '1') + goto error; + if (cur == end || *cur++ != ' ') + goto error; + if (cur == end || *cur < '1' || *cur++ > '9') + goto error; + if (cur == end || *cur < '0' || *cur++ > '9') + goto error; + if (cur == end || *cur < '0' || *cur++ > '9') + goto error; + parser->r.status = (cur[-3] - '0') * 100 + (cur[-2] - '0') * 10 + (cur[-1] - '0'); + if (cur == end || *cur++ != ' ') + goto error; /* we don't really care about the status code message */ return 1; error: - gpr_log(GPR_ERROR, "Failed parsing response line"); + gpr_log (GPR_ERROR, "Failed parsing response line"); return 0; } -static char *buf2str(void *buffer, size_t length) { - char *out = gpr_malloc(length + 1); - memcpy(out, buffer, length); +static char * +buf2str (void *buffer, size_t length) +{ + char *out = gpr_malloc (length + 1); + memcpy (out, buffer, length); out[length] = 0; return out; } -static int add_header(grpc_httpcli_parser *parser) { +static int +add_header (grpc_httpcli_parser * parser) +{ gpr_uint8 *beg = parser->cur_line; gpr_uint8 *cur = beg; gpr_uint8 *end = beg + parser->cur_line_length; - grpc_httpcli_header hdr = {NULL, NULL}; + grpc_httpcli_header hdr = { NULL, NULL }; - GPR_ASSERT(cur != end); + GPR_ASSERT (cur != end); - if (*cur == ' ' || *cur == '\t') { - gpr_log(GPR_ERROR, "Continued header lines not supported yet"); - goto error; - } + if (*cur == ' ' || *cur == '\t') + { + gpr_log (GPR_ERROR, "Continued header lines not supported yet"); + goto error; + } - while (cur != end && *cur != ':') { - cur++; - } - if (cur == end) { - gpr_log(GPR_ERROR, "Didn't find ':' in header string"); - goto error; - } - GPR_ASSERT(cur >= beg); - hdr.key = buf2str(beg, (size_t)(cur - beg)); - cur++; /* skip : */ - - while (cur != end && (*cur == ' ' || *cur == '\t')) { - cur++; - } - GPR_ASSERT(end - cur >= 2); - hdr.value = buf2str(cur, (size_t)(end - cur) - 2); - - if (parser->r.hdr_count == parser->hdr_capacity) { - parser->hdr_capacity = - GPR_MAX(parser->hdr_capacity + 1, parser->hdr_capacity * 3 / 2); - parser->r.hdrs = gpr_realloc( - parser->r.hdrs, parser->hdr_capacity * sizeof(*parser->r.hdrs)); - } + while (cur != end && *cur != ':') + { + cur++; + } + if (cur == end) + { + gpr_log (GPR_ERROR, "Didn't find ':' in header string"); + goto error; + } + GPR_ASSERT (cur >= beg); + hdr.key = buf2str (beg, (size_t) (cur - beg)); + cur++; /* skip : */ + + while (cur != end && (*cur == ' ' || *cur == '\t')) + { + cur++; + } + GPR_ASSERT (end - cur >= 2); + hdr.value = buf2str (cur, (size_t) (end - cur) - 2); + + if (parser->r.hdr_count == parser->hdr_capacity) + { + parser->hdr_capacity = GPR_MAX (parser->hdr_capacity + 1, parser->hdr_capacity * 3 / 2); + parser->r.hdrs = gpr_realloc (parser->r.hdrs, parser->hdr_capacity * sizeof (*parser->r.hdrs)); + } parser->r.hdrs[parser->r.hdr_count++] = hdr; return 1; error: - gpr_free(hdr.key); - gpr_free(hdr.value); + gpr_free (hdr.key); + gpr_free (hdr.value); return 0; } -static int finish_line(grpc_httpcli_parser *parser) { - switch (parser->state) { +static int +finish_line (grpc_httpcli_parser * parser) +{ + switch (parser->state) + { case GRPC_HTTPCLI_INITIAL_RESPONSE: - if (!handle_response_line(parser)) { - return 0; - } + if (!handle_response_line (parser)) + { + return 0; + } parser->state = GRPC_HTTPCLI_HEADERS; break; case GRPC_HTTPCLI_HEADERS: - if (parser->cur_line_length == 2) { - parser->state = GRPC_HTTPCLI_BODY; - break; - } - if (!add_header(parser)) { - return 0; - } + if (parser->cur_line_length == 2) + { + parser->state = GRPC_HTTPCLI_BODY; + break; + } + if (!add_header (parser)) + { + return 0; + } break; case GRPC_HTTPCLI_BODY: - gpr_log(GPR_ERROR, "should never reach here"); - abort(); - } + gpr_log (GPR_ERROR, "should never reach here"); + abort (); + } parser->cur_line_length = 0; return 1; } -static int addbyte(grpc_httpcli_parser *parser, gpr_uint8 byte) { - switch (parser->state) { +static int +addbyte (grpc_httpcli_parser * parser, gpr_uint8 byte) +{ + switch (parser->state) + { case GRPC_HTTPCLI_INITIAL_RESPONSE: case GRPC_HTTPCLI_HEADERS: - if (parser->cur_line_length >= GRPC_HTTPCLI_MAX_HEADER_LENGTH) { - gpr_log(GPR_ERROR, "HTTP client max line length (%d) exceeded", - GRPC_HTTPCLI_MAX_HEADER_LENGTH); - return 0; - } + if (parser->cur_line_length >= GRPC_HTTPCLI_MAX_HEADER_LENGTH) + { + gpr_log (GPR_ERROR, "HTTP client max line length (%d) exceeded", GRPC_HTTPCLI_MAX_HEADER_LENGTH); + return 0; + } parser->cur_line[parser->cur_line_length] = byte; parser->cur_line_length++; - if (parser->cur_line_length >= 2 && - parser->cur_line[parser->cur_line_length - 2] == '\r' && - parser->cur_line[parser->cur_line_length - 1] == '\n') { - return finish_line(parser); - } else { - return 1; - } - gpr_log(GPR_ERROR, "should never reach here"); - abort(); + if (parser->cur_line_length >= 2 && parser->cur_line[parser->cur_line_length - 2] == '\r' && parser->cur_line[parser->cur_line_length - 1] == '\n') + { + return finish_line (parser); + } + else + { + return 1; + } + gpr_log (GPR_ERROR, "should never reach here"); + abort (); case GRPC_HTTPCLI_BODY: - if (parser->r.body_length == parser->body_capacity) { - parser->body_capacity = GPR_MAX(8, parser->body_capacity * 3 / 2); - parser->r.body = - gpr_realloc((void *)parser->r.body, parser->body_capacity); - } - parser->r.body[parser->r.body_length] = (char)byte; + if (parser->r.body_length == parser->body_capacity) + { + parser->body_capacity = GPR_MAX (8, parser->body_capacity * 3 / 2); + parser->r.body = gpr_realloc ((void *) parser->r.body, parser->body_capacity); + } + parser->r.body[parser->r.body_length] = (char) byte; parser->r.body_length++; return 1; - } - gpr_log(GPR_ERROR, "should never reach here"); - abort(); + } + gpr_log (GPR_ERROR, "should never reach here"); + abort (); return 0; } -void grpc_httpcli_parser_init(grpc_httpcli_parser *parser) { - memset(parser, 0, sizeof(*parser)); +void +grpc_httpcli_parser_init (grpc_httpcli_parser * parser) +{ + memset (parser, 0, sizeof (*parser)); parser->state = GRPC_HTTPCLI_INITIAL_RESPONSE; parser->r.status = 500; } -void grpc_httpcli_parser_destroy(grpc_httpcli_parser *parser) { +void +grpc_httpcli_parser_destroy (grpc_httpcli_parser * parser) +{ size_t i; - gpr_free(parser->r.body); - for (i = 0; i < parser->r.hdr_count; i++) { - gpr_free(parser->r.hdrs[i].key); - gpr_free(parser->r.hdrs[i].value); - } - gpr_free(parser->r.hdrs); + gpr_free (parser->r.body); + for (i = 0; i < parser->r.hdr_count; i++) + { + gpr_free (parser->r.hdrs[i].key); + gpr_free (parser->r.hdrs[i].value); + } + gpr_free (parser->r.hdrs); } -int grpc_httpcli_parser_parse(grpc_httpcli_parser *parser, gpr_slice slice) { +int +grpc_httpcli_parser_parse (grpc_httpcli_parser * parser, gpr_slice slice) +{ size_t i; - for (i = 0; i < GPR_SLICE_LENGTH(slice); i++) { - if (!addbyte(parser, GPR_SLICE_START_PTR(slice)[i])) { - return 0; + for (i = 0; i < GPR_SLICE_LENGTH (slice); i++) + { + if (!addbyte (parser, GPR_SLICE_START_PTR (slice)[i])) + { + return 0; + } } - } return 1; } -int grpc_httpcli_parser_eof(grpc_httpcli_parser *parser) { +int +grpc_httpcli_parser_eof (grpc_httpcli_parser * parser) +{ return parser->state == GRPC_HTTPCLI_BODY; } diff --git a/src/core/httpcli/parser.h b/src/core/httpcli/parser.h index 3fbb4c7479e..9f7e04824c0 100644 --- a/src/core/httpcli/parser.h +++ b/src/core/httpcli/parser.h @@ -38,13 +38,15 @@ #include #include -typedef enum { +typedef enum +{ GRPC_HTTPCLI_INITIAL_RESPONSE, GRPC_HTTPCLI_HEADERS, GRPC_HTTPCLI_BODY } grpc_httpcli_parser_state; -typedef struct { +typedef struct +{ grpc_httpcli_parser_state state; grpc_httpcli_response r; @@ -55,10 +57,10 @@ typedef struct { size_t cur_line_length; } grpc_httpcli_parser; -void grpc_httpcli_parser_init(grpc_httpcli_parser *parser); -void grpc_httpcli_parser_destroy(grpc_httpcli_parser *parser); +void grpc_httpcli_parser_init (grpc_httpcli_parser * parser); +void grpc_httpcli_parser_destroy (grpc_httpcli_parser * parser); -int grpc_httpcli_parser_parse(grpc_httpcli_parser *parser, gpr_slice slice); -int grpc_httpcli_parser_eof(grpc_httpcli_parser *parser); +int grpc_httpcli_parser_parse (grpc_httpcli_parser * parser, gpr_slice slice); +int grpc_httpcli_parser_eof (grpc_httpcli_parser * parser); #endif /* GRPC_INTERNAL_CORE_HTTPCLI_PARSER_H */ diff --git a/src/core/iomgr/alarm.c b/src/core/iomgr/alarm.c index d26dc57b096..68455372e7b 100644 --- a/src/core/iomgr/alarm.c +++ b/src/core/iomgr/alarm.c @@ -48,7 +48,8 @@ #define MIN_QUEUE_WINDOW_DURATION 0.01 #define MAX_QUEUE_WINDOW_DURATION 1 -typedef struct { +typedef struct +{ gpr_mu mu; grpc_time_averaged_stats stats; /* All and only alarms with deadlines <= this will be in the heap. */ @@ -72,128 +73,140 @@ static shard_type g_shards[NUM_SHARDS]; /* Protected by g_mu */ static shard_type *g_shard_queue[NUM_SHARDS]; -static int run_some_expired_alarms(gpr_timespec now, gpr_timespec *next, - int success, - grpc_closure_list *closure_list); +static int run_some_expired_alarms (gpr_timespec now, gpr_timespec * next, int success, grpc_closure_list * closure_list); -static gpr_timespec compute_min_deadline(shard_type *shard) { - return grpc_alarm_heap_is_empty(&shard->heap) - ? shard->queue_deadline_cap - : grpc_alarm_heap_top(&shard->heap)->deadline; +static gpr_timespec +compute_min_deadline (shard_type * shard) +{ + return grpc_alarm_heap_is_empty (&shard->heap) ? shard->queue_deadline_cap : grpc_alarm_heap_top (&shard->heap)->deadline; } -void grpc_alarm_list_init(gpr_timespec now) { +void +grpc_alarm_list_init (gpr_timespec now) +{ gpr_uint32 i; - gpr_mu_init(&g_mu); - gpr_mu_init(&g_checker_mu); + gpr_mu_init (&g_mu); + gpr_mu_init (&g_checker_mu); g_clock_type = now.clock_type; - for (i = 0; i < NUM_SHARDS; i++) { - shard_type *shard = &g_shards[i]; - gpr_mu_init(&shard->mu); - grpc_time_averaged_stats_init(&shard->stats, 1.0 / ADD_DEADLINE_SCALE, 0.1, - 0.5); - shard->queue_deadline_cap = now; - shard->shard_queue_index = i; - grpc_alarm_heap_init(&shard->heap); - shard->list.next = shard->list.prev = &shard->list; - shard->min_deadline = compute_min_deadline(shard); - g_shard_queue[i] = shard; - } + for (i = 0; i < NUM_SHARDS; i++) + { + shard_type *shard = &g_shards[i]; + gpr_mu_init (&shard->mu); + grpc_time_averaged_stats_init (&shard->stats, 1.0 / ADD_DEADLINE_SCALE, 0.1, 0.5); + shard->queue_deadline_cap = now; + shard->shard_queue_index = i; + grpc_alarm_heap_init (&shard->heap); + shard->list.next = shard->list.prev = &shard->list; + shard->min_deadline = compute_min_deadline (shard); + g_shard_queue[i] = shard; + } } -void grpc_alarm_list_shutdown(grpc_closure_list *closure_list) { +void +grpc_alarm_list_shutdown (grpc_closure_list * closure_list) +{ int i; - run_some_expired_alarms(gpr_inf_future(g_clock_type), NULL, 0, closure_list); - for (i = 0; i < NUM_SHARDS; i++) { - shard_type *shard = &g_shards[i]; - gpr_mu_destroy(&shard->mu); - grpc_alarm_heap_destroy(&shard->heap); - } - gpr_mu_destroy(&g_mu); - gpr_mu_destroy(&g_checker_mu); + run_some_expired_alarms (gpr_inf_future (g_clock_type), NULL, 0, closure_list); + for (i = 0; i < NUM_SHARDS; i++) + { + shard_type *shard = &g_shards[i]; + gpr_mu_destroy (&shard->mu); + grpc_alarm_heap_destroy (&shard->heap); + } + gpr_mu_destroy (&g_mu); + gpr_mu_destroy (&g_checker_mu); } /* This is a cheap, but good enough, pointer hash for sharding the tasks: */ -static size_t shard_idx(const grpc_alarm *info) { - size_t x = (size_t)info; +static size_t +shard_idx (const grpc_alarm * info) +{ + size_t x = (size_t) info; return ((x >> 4) ^ (x >> 9) ^ (x >> 14)) & (NUM_SHARDS - 1); } -static double ts_to_dbl(gpr_timespec ts) { - return (double)ts.tv_sec + 1e-9 * ts.tv_nsec; +static double +ts_to_dbl (gpr_timespec ts) +{ + return (double) ts.tv_sec + 1e-9 * ts.tv_nsec; } -static gpr_timespec dbl_to_ts(double d) { +static gpr_timespec +dbl_to_ts (double d) +{ gpr_timespec ts; - ts.tv_sec = (time_t)d; - ts.tv_nsec = (int)(1e9 * (d - (double)ts.tv_sec)); + ts.tv_sec = (time_t) d; + ts.tv_nsec = (int) (1e9 * (d - (double) ts.tv_sec)); ts.clock_type = GPR_TIMESPAN; return ts; } -static void list_join(grpc_alarm *head, grpc_alarm *alarm) { +static void +list_join (grpc_alarm * head, grpc_alarm * alarm) +{ alarm->next = head; alarm->prev = head->prev; alarm->next->prev = alarm->prev->next = alarm; } -static void list_remove(grpc_alarm *alarm) { +static void +list_remove (grpc_alarm * alarm) +{ alarm->next->prev = alarm->prev; alarm->prev->next = alarm->next; } -static void swap_adjacent_shards_in_queue(gpr_uint32 first_shard_queue_index) { +static void +swap_adjacent_shards_in_queue (gpr_uint32 first_shard_queue_index) +{ shard_type *temp; temp = g_shard_queue[first_shard_queue_index]; - g_shard_queue[first_shard_queue_index] = - g_shard_queue[first_shard_queue_index + 1]; + g_shard_queue[first_shard_queue_index] = g_shard_queue[first_shard_queue_index + 1]; g_shard_queue[first_shard_queue_index + 1] = temp; - g_shard_queue[first_shard_queue_index]->shard_queue_index = - first_shard_queue_index; - g_shard_queue[first_shard_queue_index + 1]->shard_queue_index = - first_shard_queue_index + 1; + g_shard_queue[first_shard_queue_index]->shard_queue_index = first_shard_queue_index; + g_shard_queue[first_shard_queue_index + 1]->shard_queue_index = first_shard_queue_index + 1; } -static void note_deadline_change(shard_type *shard) { - while (shard->shard_queue_index > 0 && - gpr_time_cmp( - shard->min_deadline, - g_shard_queue[shard->shard_queue_index - 1]->min_deadline) < 0) { - swap_adjacent_shards_in_queue(shard->shard_queue_index - 1); - } - while (shard->shard_queue_index < NUM_SHARDS - 1 && - gpr_time_cmp( - shard->min_deadline, - g_shard_queue[shard->shard_queue_index + 1]->min_deadline) > 0) { - swap_adjacent_shards_in_queue(shard->shard_queue_index); - } +static void +note_deadline_change (shard_type * shard) +{ + while (shard->shard_queue_index > 0 && gpr_time_cmp (shard->min_deadline, g_shard_queue[shard->shard_queue_index - 1]->min_deadline) < 0) + { + swap_adjacent_shards_in_queue (shard->shard_queue_index - 1); + } + while (shard->shard_queue_index < NUM_SHARDS - 1 && gpr_time_cmp (shard->min_deadline, g_shard_queue[shard->shard_queue_index + 1]->min_deadline) > 0) + { + swap_adjacent_shards_in_queue (shard->shard_queue_index); + } } -void grpc_alarm_init(grpc_alarm *alarm, gpr_timespec deadline, - grpc_iomgr_cb_func alarm_cb, void *alarm_cb_arg, - gpr_timespec now, grpc_closure_list *closure_list) { +void +grpc_alarm_init (grpc_alarm * alarm, gpr_timespec deadline, grpc_iomgr_cb_func alarm_cb, void *alarm_cb_arg, gpr_timespec now, grpc_closure_list * closure_list) +{ int is_first_alarm = 0; - shard_type *shard = &g_shards[shard_idx(alarm)]; - GPR_ASSERT(deadline.clock_type == g_clock_type); - GPR_ASSERT(now.clock_type == g_clock_type); - grpc_closure_init(&alarm->closure, alarm_cb, alarm_cb_arg); + shard_type *shard = &g_shards[shard_idx (alarm)]; + GPR_ASSERT (deadline.clock_type == g_clock_type); + GPR_ASSERT (now.clock_type == g_clock_type); + grpc_closure_init (&alarm->closure, alarm_cb, alarm_cb_arg); alarm->deadline = deadline; alarm->triggered = 0; /* TODO(ctiller): check deadline expired */ - gpr_mu_lock(&shard->mu); - grpc_time_averaged_stats_add_sample(&shard->stats, - ts_to_dbl(gpr_time_sub(deadline, now))); - if (gpr_time_cmp(deadline, shard->queue_deadline_cap) < 0) { - is_first_alarm = grpc_alarm_heap_add(&shard->heap, alarm); - } else { - alarm->heap_index = INVALID_HEAP_INDEX; - list_join(&shard->list, alarm); - } - gpr_mu_unlock(&shard->mu); + gpr_mu_lock (&shard->mu); + grpc_time_averaged_stats_add_sample (&shard->stats, ts_to_dbl (gpr_time_sub (deadline, now))); + if (gpr_time_cmp (deadline, shard->queue_deadline_cap) < 0) + { + is_first_alarm = grpc_alarm_heap_add (&shard->heap, alarm); + } + else + { + alarm->heap_index = INVALID_HEAP_INDEX; + list_join (&shard->list, alarm); + } + gpr_mu_unlock (&shard->mu); /* Deadline may have decreased, we need to adjust the master queue. Note that there is a potential racy unlocked region here. There could be a @@ -206,34 +219,42 @@ void grpc_alarm_init(grpc_alarm *alarm, gpr_timespec deadline, trigger the new alarm because the min_deadline hadn't yet been reduced. In that case, the alarm will simply have to wait for the next grpc_alarm_check. */ - if (is_first_alarm) { - gpr_mu_lock(&g_mu); - if (gpr_time_cmp(deadline, shard->min_deadline) < 0) { - gpr_timespec old_min_deadline = g_shard_queue[0]->min_deadline; - shard->min_deadline = deadline; - note_deadline_change(shard); - if (shard->shard_queue_index == 0 && - gpr_time_cmp(deadline, old_min_deadline) < 0) { - grpc_kick_poller(); - } + if (is_first_alarm) + { + gpr_mu_lock (&g_mu); + if (gpr_time_cmp (deadline, shard->min_deadline) < 0) + { + gpr_timespec old_min_deadline = g_shard_queue[0]->min_deadline; + shard->min_deadline = deadline; + note_deadline_change (shard); + if (shard->shard_queue_index == 0 && gpr_time_cmp (deadline, old_min_deadline) < 0) + { + grpc_kick_poller (); + } + } + gpr_mu_unlock (&g_mu); } - gpr_mu_unlock(&g_mu); - } } -void grpc_alarm_cancel(grpc_alarm *alarm, grpc_closure_list *closure_list) { - shard_type *shard = &g_shards[shard_idx(alarm)]; - gpr_mu_lock(&shard->mu); - if (!alarm->triggered) { - grpc_closure_list_add(closure_list, &alarm->closure, 0); - alarm->triggered = 1; - if (alarm->heap_index == INVALID_HEAP_INDEX) { - list_remove(alarm); - } else { - grpc_alarm_heap_remove(&shard->heap, alarm); +void +grpc_alarm_cancel (grpc_alarm * alarm, grpc_closure_list * closure_list) +{ + shard_type *shard = &g_shards[shard_idx (alarm)]; + gpr_mu_lock (&shard->mu); + if (!alarm->triggered) + { + grpc_closure_list_add (closure_list, &alarm->closure, 0); + alarm->triggered = 1; + if (alarm->heap_index == INVALID_HEAP_INDEX) + { + list_remove (alarm); + } + else + { + grpc_alarm_heap_remove (&shard->heap, alarm); + } } - } - gpr_mu_unlock(&shard->mu); + gpr_mu_unlock (&shard->mu); } /* This is called when the queue is empty and "now" has reached the @@ -241,115 +262,126 @@ void grpc_alarm_cancel(grpc_alarm *alarm, grpc_closure_list *closure_list) { for alarms that fall at or under it. Returns true if the queue is no longer empty. REQUIRES: shard->mu locked */ -static int refill_queue(shard_type *shard, gpr_timespec now) { +static int +refill_queue (shard_type * shard, gpr_timespec now) +{ /* Compute the new queue window width and bound by the limits: */ - double computed_deadline_delta = - grpc_time_averaged_stats_update_average(&shard->stats) * - ADD_DEADLINE_SCALE; - double deadline_delta = - GPR_CLAMP(computed_deadline_delta, MIN_QUEUE_WINDOW_DURATION, - MAX_QUEUE_WINDOW_DURATION); + double computed_deadline_delta = grpc_time_averaged_stats_update_average (&shard->stats) * ADD_DEADLINE_SCALE; + double deadline_delta = GPR_CLAMP (computed_deadline_delta, MIN_QUEUE_WINDOW_DURATION, + MAX_QUEUE_WINDOW_DURATION); grpc_alarm *alarm, *next; /* Compute the new cap and put all alarms under it into the queue: */ - shard->queue_deadline_cap = gpr_time_add( - gpr_time_max(now, shard->queue_deadline_cap), dbl_to_ts(deadline_delta)); - for (alarm = shard->list.next; alarm != &shard->list; alarm = next) { - next = alarm->next; - - if (gpr_time_cmp(alarm->deadline, shard->queue_deadline_cap) < 0) { - list_remove(alarm); - grpc_alarm_heap_add(&shard->heap, alarm); + shard->queue_deadline_cap = gpr_time_add (gpr_time_max (now, shard->queue_deadline_cap), dbl_to_ts (deadline_delta)); + for (alarm = shard->list.next; alarm != &shard->list; alarm = next) + { + next = alarm->next; + + if (gpr_time_cmp (alarm->deadline, shard->queue_deadline_cap) < 0) + { + list_remove (alarm); + grpc_alarm_heap_add (&shard->heap, alarm); + } } - } - return !grpc_alarm_heap_is_empty(&shard->heap); + return !grpc_alarm_heap_is_empty (&shard->heap); } /* This pops the next non-cancelled alarm with deadline <= now from the queue, or returns NULL if there isn't one. REQUIRES: shard->mu locked */ -static grpc_alarm *pop_one(shard_type *shard, gpr_timespec now) { +static grpc_alarm * +pop_one (shard_type * shard, gpr_timespec now) +{ grpc_alarm *alarm; - for (;;) { - if (grpc_alarm_heap_is_empty(&shard->heap)) { - if (gpr_time_cmp(now, shard->queue_deadline_cap) < 0) return NULL; - if (!refill_queue(shard, now)) return NULL; + for (;;) + { + if (grpc_alarm_heap_is_empty (&shard->heap)) + { + if (gpr_time_cmp (now, shard->queue_deadline_cap) < 0) + return NULL; + if (!refill_queue (shard, now)) + return NULL; + } + alarm = grpc_alarm_heap_top (&shard->heap); + if (gpr_time_cmp (alarm->deadline, now) > 0) + return NULL; + alarm->triggered = 1; + grpc_alarm_heap_pop (&shard->heap); + return alarm; } - alarm = grpc_alarm_heap_top(&shard->heap); - if (gpr_time_cmp(alarm->deadline, now) > 0) return NULL; - alarm->triggered = 1; - grpc_alarm_heap_pop(&shard->heap); - return alarm; - } } /* REQUIRES: shard->mu unlocked */ -static size_t pop_alarms(shard_type *shard, gpr_timespec now, - gpr_timespec *new_min_deadline, int success, - grpc_closure_list *closure_list) { +static size_t +pop_alarms (shard_type * shard, gpr_timespec now, gpr_timespec * new_min_deadline, int success, grpc_closure_list * closure_list) +{ size_t n = 0; grpc_alarm *alarm; - gpr_mu_lock(&shard->mu); - while ((alarm = pop_one(shard, now))) { - grpc_closure_list_add(closure_list, &alarm->closure, success); - n++; - } - *new_min_deadline = compute_min_deadline(shard); - gpr_mu_unlock(&shard->mu); + gpr_mu_lock (&shard->mu); + while ((alarm = pop_one (shard, now))) + { + grpc_closure_list_add (closure_list, &alarm->closure, success); + n++; + } + *new_min_deadline = compute_min_deadline (shard); + gpr_mu_unlock (&shard->mu); return n; } -static int run_some_expired_alarms(gpr_timespec now, gpr_timespec *next, - int success, - grpc_closure_list *closure_list) { +static int +run_some_expired_alarms (gpr_timespec now, gpr_timespec * next, int success, grpc_closure_list * closure_list) +{ size_t n = 0; /* TODO(ctiller): verify that there are any alarms (atomically) here */ - if (gpr_mu_trylock(&g_checker_mu)) { - gpr_mu_lock(&g_mu); - - while (gpr_time_cmp(g_shard_queue[0]->min_deadline, now) < 0) { - gpr_timespec new_min_deadline; - - /* For efficiency, we pop as many available alarms as we can from the - shard. This may violate perfect alarm deadline ordering, but that - shouldn't be a big deal because we don't make ordering guarantees. */ - n += pop_alarms(g_shard_queue[0], now, &new_min_deadline, success, - closure_list); - - /* An grpc_alarm_init() on the shard could intervene here, adding a new - alarm that is earlier than new_min_deadline. However, - grpc_alarm_init() will block on the master_lock before it can call - set_min_deadline, so this one will complete first and then the AddAlarm - will reduce the min_deadline (perhaps unnecessarily). */ - g_shard_queue[0]->min_deadline = new_min_deadline; - note_deadline_change(g_shard_queue[0]); + if (gpr_mu_trylock (&g_checker_mu)) + { + gpr_mu_lock (&g_mu); + + while (gpr_time_cmp (g_shard_queue[0]->min_deadline, now) < 0) + { + gpr_timespec new_min_deadline; + + /* For efficiency, we pop as many available alarms as we can from the + shard. This may violate perfect alarm deadline ordering, but that + shouldn't be a big deal because we don't make ordering guarantees. */ + n += pop_alarms (g_shard_queue[0], now, &new_min_deadline, success, closure_list); + + /* An grpc_alarm_init() on the shard could intervene here, adding a new + alarm that is earlier than new_min_deadline. However, + grpc_alarm_init() will block on the master_lock before it can call + set_min_deadline, so this one will complete first and then the AddAlarm + will reduce the min_deadline (perhaps unnecessarily). */ + g_shard_queue[0]->min_deadline = new_min_deadline; + note_deadline_change (g_shard_queue[0]); + } + + if (next) + { + *next = gpr_time_min (*next, g_shard_queue[0]->min_deadline); + } + + gpr_mu_unlock (&g_mu); + gpr_mu_unlock (&g_checker_mu); } - if (next) { - *next = gpr_time_min(*next, g_shard_queue[0]->min_deadline); - } - - gpr_mu_unlock(&g_mu); - gpr_mu_unlock(&g_checker_mu); - } - - return (int)n; + return (int) n; } -int grpc_alarm_check(gpr_timespec now, gpr_timespec *next, - grpc_closure_list *closure_list) { - GPR_ASSERT(now.clock_type == g_clock_type); - return run_some_expired_alarms( - now, next, gpr_time_cmp(now, gpr_inf_future(now.clock_type)) != 0, - closure_list); +int +grpc_alarm_check (gpr_timespec now, gpr_timespec * next, grpc_closure_list * closure_list) +{ + GPR_ASSERT (now.clock_type == g_clock_type); + return run_some_expired_alarms (now, next, gpr_time_cmp (now, gpr_inf_future (now.clock_type)) != 0, closure_list); } -gpr_timespec grpc_alarm_list_next_timeout(void) { +gpr_timespec +grpc_alarm_list_next_timeout (void) +{ gpr_timespec out; - gpr_mu_lock(&g_mu); + gpr_mu_lock (&g_mu); out = g_shard_queue[0]->min_deadline; - gpr_mu_unlock(&g_mu); + gpr_mu_unlock (&g_mu); return out; } diff --git a/src/core/iomgr/alarm.h b/src/core/iomgr/alarm.h index e420c3a9102..30cffa94a58 100644 --- a/src/core/iomgr/alarm.h +++ b/src/core/iomgr/alarm.h @@ -39,9 +39,10 @@ #include #include -typedef struct grpc_alarm { +typedef struct grpc_alarm +{ gpr_timespec deadline; - gpr_uint32 heap_index; /* INVALID_HEAP_INDEX if not in heap */ + gpr_uint32 heap_index; /* INVALID_HEAP_INDEX if not in heap */ int triggered; struct grpc_alarm *next; struct grpc_alarm *prev; @@ -54,9 +55,7 @@ typedef struct grpc_alarm { and application code should check the status 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_alarm_init(grpc_alarm *alarm, gpr_timespec deadline, - grpc_iomgr_cb_func alarm_cb, void *alarm_cb_arg, - gpr_timespec now, grpc_closure_list *closure_list); +void grpc_alarm_init (grpc_alarm * alarm, gpr_timespec deadline, grpc_iomgr_cb_func alarm_cb, void *alarm_cb_arg, gpr_timespec now, grpc_closure_list * closure_list); /* Note that there is no alarm destroy function. This is because the alarm is a one-time occurrence with a guarantee that the callback will @@ -84,6 +83,6 @@ void grpc_alarm_init(grpc_alarm *alarm, gpr_timespec deadline, matches this aim. Requires: cancel() must happen after add() on a given alarm */ -void grpc_alarm_cancel(grpc_alarm *alarm, grpc_closure_list *closure_list); +void grpc_alarm_cancel (grpc_alarm * alarm, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_ALARM_H */ diff --git a/src/core/iomgr/alarm_heap.c b/src/core/iomgr/alarm_heap.c index 769142e425d..12e1631476e 100644 --- a/src/core/iomgr/alarm_heap.c +++ b/src/core/iomgr/alarm_heap.c @@ -43,14 +43,18 @@ position. This functor is called each time immediately after modifying a value in the underlying container, with the offset of the modified element as its argument. */ -static void adjust_upwards(grpc_alarm **first, gpr_uint32 i, grpc_alarm *t) { - while (i > 0) { - gpr_uint32 parent = (gpr_uint32)(((int)i - 1) / 2); - if (gpr_time_cmp(first[parent]->deadline, t->deadline) >= 0) break; - first[i] = first[parent]; - first[i]->heap_index = i; - i = parent; - } +static void +adjust_upwards (grpc_alarm ** first, gpr_uint32 i, grpc_alarm * t) +{ + while (i > 0) + { + gpr_uint32 parent = (gpr_uint32) (((int) i - 1) / 2); + if (gpr_time_cmp (first[parent]->deadline, t->deadline) >= 0) + break; + first[i] = first[parent]; + first[i]->heap_index = i; + i = parent; + } first[i] = t; t->heap_index = i; } @@ -58,24 +62,24 @@ static void adjust_upwards(grpc_alarm **first, gpr_uint32 i, grpc_alarm *t) { /* Adjusts a heap so as to move a hole at position i farther away from the root, until a suitable position is found for element t. Then, copies t into that position. */ -static void adjust_downwards(grpc_alarm **first, gpr_uint32 i, - gpr_uint32 length, grpc_alarm *t) { - for (;;) { - gpr_uint32 left_child = 1u + 2u * i; - gpr_uint32 right_child; - gpr_uint32 next_i; - if (left_child >= length) break; - right_child = left_child + 1; - next_i = right_child < length && - gpr_time_cmp(first[left_child]->deadline, - first[right_child]->deadline) < 0 - ? right_child - : left_child; - if (gpr_time_cmp(t->deadline, first[next_i]->deadline) >= 0) break; - first[i] = first[next_i]; - first[i]->heap_index = i; - i = next_i; - } +static void +adjust_downwards (grpc_alarm ** first, gpr_uint32 i, gpr_uint32 length, grpc_alarm * t) +{ + for (;;) + { + gpr_uint32 left_child = 1u + 2u * i; + gpr_uint32 right_child; + gpr_uint32 next_i; + if (left_child >= length) + break; + right_child = left_child + 1; + next_i = right_child < length && gpr_time_cmp (first[left_child]->deadline, first[right_child]->deadline) < 0 ? right_child : left_child; + if (gpr_time_cmp (t->deadline, first[next_i]->deadline) >= 0) + break; + first[i] = first[next_i]; + first[i]->heap_index = i; + i = next_i; + } first[i] = t; t->heap_index = i; } @@ -83,66 +87,88 @@ static void adjust_downwards(grpc_alarm **first, gpr_uint32 i, #define SHRINK_MIN_ELEMS 8 #define SHRINK_FULLNESS_FACTOR 2 -static void maybe_shrink(grpc_alarm_heap *heap) { - if (heap->alarm_count >= 8 && - heap->alarm_count <= heap->alarm_capacity / SHRINK_FULLNESS_FACTOR / 2) { - heap->alarm_capacity = heap->alarm_count * SHRINK_FULLNESS_FACTOR; - heap->alarms = - gpr_realloc(heap->alarms, heap->alarm_capacity * sizeof(grpc_alarm *)); - } +static void +maybe_shrink (grpc_alarm_heap * heap) +{ + if (heap->alarm_count >= 8 && heap->alarm_count <= heap->alarm_capacity / SHRINK_FULLNESS_FACTOR / 2) + { + heap->alarm_capacity = heap->alarm_count * SHRINK_FULLNESS_FACTOR; + heap->alarms = gpr_realloc (heap->alarms, heap->alarm_capacity * sizeof (grpc_alarm *)); + } } -static void note_changed_priority(grpc_alarm_heap *heap, grpc_alarm *alarm) { +static void +note_changed_priority (grpc_alarm_heap * heap, grpc_alarm * alarm) +{ gpr_uint32 i = alarm->heap_index; - gpr_uint32 parent = (gpr_uint32)(((int)i - 1) / 2); - if (gpr_time_cmp(heap->alarms[parent]->deadline, alarm->deadline) < 0) { - adjust_upwards(heap->alarms, i, alarm); - } else { - adjust_downwards(heap->alarms, i, heap->alarm_count, alarm); - } + gpr_uint32 parent = (gpr_uint32) (((int) i - 1) / 2); + if (gpr_time_cmp (heap->alarms[parent]->deadline, alarm->deadline) < 0) + { + adjust_upwards (heap->alarms, i, alarm); + } + else + { + adjust_downwards (heap->alarms, i, heap->alarm_count, alarm); + } } -void grpc_alarm_heap_init(grpc_alarm_heap *heap) { - memset(heap, 0, sizeof(*heap)); +void +grpc_alarm_heap_init (grpc_alarm_heap * heap) +{ + memset (heap, 0, sizeof (*heap)); } -void grpc_alarm_heap_destroy(grpc_alarm_heap *heap) { gpr_free(heap->alarms); } +void +grpc_alarm_heap_destroy (grpc_alarm_heap * heap) +{ + gpr_free (heap->alarms); +} -int grpc_alarm_heap_add(grpc_alarm_heap *heap, grpc_alarm *alarm) { - if (heap->alarm_count == heap->alarm_capacity) { - heap->alarm_capacity = - GPR_MAX(heap->alarm_capacity + 1, heap->alarm_capacity * 3 / 2); - heap->alarms = - gpr_realloc(heap->alarms, heap->alarm_capacity * sizeof(grpc_alarm *)); - } +int +grpc_alarm_heap_add (grpc_alarm_heap * heap, grpc_alarm * alarm) +{ + if (heap->alarm_count == heap->alarm_capacity) + { + heap->alarm_capacity = GPR_MAX (heap->alarm_capacity + 1, heap->alarm_capacity * 3 / 2); + heap->alarms = gpr_realloc (heap->alarms, heap->alarm_capacity * sizeof (grpc_alarm *)); + } alarm->heap_index = heap->alarm_count; - adjust_upwards(heap->alarms, heap->alarm_count, alarm); + adjust_upwards (heap->alarms, heap->alarm_count, alarm); heap->alarm_count++; return alarm->heap_index == 0; } -void grpc_alarm_heap_remove(grpc_alarm_heap *heap, grpc_alarm *alarm) { +void +grpc_alarm_heap_remove (grpc_alarm_heap * heap, grpc_alarm * alarm) +{ gpr_uint32 i = alarm->heap_index; - if (i == heap->alarm_count - 1) { - heap->alarm_count--; - maybe_shrink(heap); - return; - } + if (i == heap->alarm_count - 1) + { + heap->alarm_count--; + maybe_shrink (heap); + return; + } heap->alarms[i] = heap->alarms[heap->alarm_count - 1]; heap->alarms[i]->heap_index = i; heap->alarm_count--; - maybe_shrink(heap); - note_changed_priority(heap, heap->alarms[i]); + maybe_shrink (heap); + note_changed_priority (heap, heap->alarms[i]); } -int grpc_alarm_heap_is_empty(grpc_alarm_heap *heap) { +int +grpc_alarm_heap_is_empty (grpc_alarm_heap * heap) +{ return heap->alarm_count == 0; } -grpc_alarm *grpc_alarm_heap_top(grpc_alarm_heap *heap) { +grpc_alarm * +grpc_alarm_heap_top (grpc_alarm_heap * heap) +{ return heap->alarms[0]; } -void grpc_alarm_heap_pop(grpc_alarm_heap *heap) { - grpc_alarm_heap_remove(heap, grpc_alarm_heap_top(heap)); +void +grpc_alarm_heap_pop (grpc_alarm_heap * heap) +{ + grpc_alarm_heap_remove (heap, grpc_alarm_heap_top (heap)); } diff --git a/src/core/iomgr/alarm_heap.h b/src/core/iomgr/alarm_heap.h index 91d6ee3ca22..1970897356f 100644 --- a/src/core/iomgr/alarm_heap.h +++ b/src/core/iomgr/alarm_heap.h @@ -36,22 +36,23 @@ #include "src/core/iomgr/alarm.h" -typedef struct { +typedef struct +{ grpc_alarm **alarms; gpr_uint32 alarm_count; gpr_uint32 alarm_capacity; } grpc_alarm_heap; /* return 1 if the new alarm is the first alarm in the heap */ -int grpc_alarm_heap_add(grpc_alarm_heap *heap, grpc_alarm *alarm); +int grpc_alarm_heap_add (grpc_alarm_heap * heap, grpc_alarm * alarm); -void grpc_alarm_heap_init(grpc_alarm_heap *heap); -void grpc_alarm_heap_destroy(grpc_alarm_heap *heap); +void grpc_alarm_heap_init (grpc_alarm_heap * heap); +void grpc_alarm_heap_destroy (grpc_alarm_heap * heap); -void grpc_alarm_heap_remove(grpc_alarm_heap *heap, grpc_alarm *alarm); -grpc_alarm *grpc_alarm_heap_top(grpc_alarm_heap *heap); -void grpc_alarm_heap_pop(grpc_alarm_heap *heap); +void grpc_alarm_heap_remove (grpc_alarm_heap * heap, grpc_alarm * alarm); +grpc_alarm *grpc_alarm_heap_top (grpc_alarm_heap * heap); +void grpc_alarm_heap_pop (grpc_alarm_heap * heap); -int grpc_alarm_heap_is_empty(grpc_alarm_heap *heap); +int grpc_alarm_heap_is_empty (grpc_alarm_heap * heap); #endif /* GRPC_INTERNAL_CORE_IOMGR_ALARM_HEAP_H */ diff --git a/src/core/iomgr/alarm_internal.h b/src/core/iomgr/alarm_internal.h index 4d6076ac5c1..5bcfee11cdb 100644 --- a/src/core/iomgr/alarm_internal.h +++ b/src/core/iomgr/alarm_internal.h @@ -49,15 +49,14 @@ with high probability at least one thread in the system will see an update at any time slice. */ -int grpc_alarm_check(gpr_timespec now, gpr_timespec *next, - grpc_closure_list *closure_list); -void grpc_alarm_list_init(gpr_timespec now); -void grpc_alarm_list_shutdown(grpc_closure_list *closure_list); +int grpc_alarm_check (gpr_timespec now, gpr_timespec * next, grpc_closure_list * closure_list); +void grpc_alarm_list_init (gpr_timespec now); +void grpc_alarm_list_shutdown (grpc_closure_list * closure_list); -gpr_timespec grpc_alarm_list_next_timeout(void); +gpr_timespec grpc_alarm_list_next_timeout (void); /* the following must be implemented by each iomgr implementation */ -void grpc_kick_poller(void); +void grpc_kick_poller (void); #endif /* GRPC_INTERNAL_CORE_IOMGR_ALARM_INTERNAL_H */ diff --git a/src/core/iomgr/closure.c b/src/core/iomgr/closure.c index 1827ac3e28b..ae4350e8a92 100644 --- a/src/core/iomgr/closure.c +++ b/src/core/iomgr/closure.c @@ -33,51 +33,69 @@ #include "src/core/iomgr/closure.h" -void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, - void *cb_arg) { +void +grpc_closure_init (grpc_closure * closure, grpc_iomgr_cb_func cb, void *cb_arg) +{ closure->cb = cb; closure->cb_arg = cb_arg; closure->next = NULL; } -void grpc_closure_list_add(grpc_closure_list *closure_list, - grpc_closure *closure, int success) { - if (closure == NULL) return; +void +grpc_closure_list_add (grpc_closure_list * closure_list, grpc_closure * closure, int success) +{ + if (closure == NULL) + return; closure->next = NULL; closure->success = success; - if (closure_list->head == NULL) { - closure_list->head = closure; - } else { - closure_list->tail->next = closure; - } + if (closure_list->head == NULL) + { + closure_list->head = closure; + } + else + { + closure_list->tail->next = closure; + } closure_list->tail = closure; } -void grpc_closure_list_run(grpc_closure_list *closure_list) { - while (!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; - c->cb(c->cb_arg, c->success, closure_list); - c = next; +void +grpc_closure_list_run (grpc_closure_list * closure_list) +{ + while (!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; + c->cb (c->cb_arg, c->success, closure_list); + c = next; + } } - } } -int grpc_closure_list_empty(grpc_closure_list closure_list) { +int +grpc_closure_list_empty (grpc_closure_list closure_list) +{ return closure_list.head == NULL; } -void grpc_closure_list_move(grpc_closure_list *src, grpc_closure_list *dst) { - if (src->head == NULL) { - return; - } - if (dst->head == NULL) { - *dst = *src; - } else { - dst->tail->next = src->head; - dst->tail = src->tail; - } +void +grpc_closure_list_move (grpc_closure_list * src, grpc_closure_list * dst) +{ + if (src->head == NULL) + { + return; + } + if (dst->head == NULL) + { + *dst = *src; + } + else + { + dst->tail->next = src->head; + dst->tail = src->tail; + } src->head = src->tail = NULL; } diff --git a/src/core/iomgr/closure.h b/src/core/iomgr/closure.h index e8e1e046144..3566f0b9851 100644 --- a/src/core/iomgr/closure.h +++ b/src/core/iomgr/closure.h @@ -39,7 +39,8 @@ struct grpc_closure; typedef struct grpc_closure grpc_closure; -typedef struct grpc_closure_list { +typedef struct grpc_closure_list +{ grpc_closure *head; grpc_closure *tail; } grpc_closure_list; @@ -49,11 +50,11 @@ typedef struct grpc_closure_list { * \param arg Arbitrary input. * \param success An indication on the state of the iomgr. On false, cleanup * actions should be taken (eg, shutdown). */ -typedef void (*grpc_iomgr_cb_func)(void *arg, int success, - grpc_closure_list *closure_list); +typedef void (*grpc_iomgr_cb_func) (void *arg, int success, grpc_closure_list * closure_list); /** A closure over a grpc_iomgr_cb_func. */ -struct grpc_closure { +struct grpc_closure +{ /** Bound callback. */ grpc_iomgr_cb_func cb; @@ -70,16 +71,14 @@ struct grpc_closure { }; /** Initializes \a closure with \a cb and \a cb_arg. */ -void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, - void *cb_arg); +void grpc_closure_init (grpc_closure * closure, grpc_iomgr_cb_func cb, void *cb_arg); #define GRPC_CLOSURE_LIST_INIT \ { NULL, NULL } -void grpc_closure_list_add(grpc_closure_list *list, grpc_closure *closure, - int success); -void grpc_closure_list_run(grpc_closure_list *list); -void grpc_closure_list_move(grpc_closure_list *src, grpc_closure_list *dst); -int grpc_closure_list_empty(grpc_closure_list list); +void grpc_closure_list_add (grpc_closure_list * list, grpc_closure * closure, int success); +void grpc_closure_list_run (grpc_closure_list * list); +void grpc_closure_list_move (grpc_closure_list * src, grpc_closure_list * dst); +int grpc_closure_list_empty (grpc_closure_list list); #endif /* GRPC_INTERNAL_CORE_IOMGR_CLOSURE_H */ diff --git a/src/core/iomgr/endpoint.c b/src/core/iomgr/endpoint.c index db2a738d09a..cc71177723b 100644 --- a/src/core/iomgr/endpoint.c +++ b/src/core/iomgr/endpoint.c @@ -33,36 +33,44 @@ #include "src/core/iomgr/endpoint.h" -void grpc_endpoint_read(grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_closure *cb, grpc_closure_list *closure_list) { - ep->vtable->read(ep, slices, cb, closure_list); +void +grpc_endpoint_read (grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list) +{ + ep->vtable->read (ep, slices, cb, closure_list); } -void grpc_endpoint_write(grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_closure *cb, grpc_closure_list *closure_list) { - ep->vtable->write(ep, slices, cb, closure_list); +void +grpc_endpoint_write (grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list) +{ + ep->vtable->write (ep, slices, cb, closure_list); } -void grpc_endpoint_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset, - grpc_closure_list *closure_list) { - ep->vtable->add_to_pollset(ep, pollset, closure_list); +void +grpc_endpoint_add_to_pollset (grpc_endpoint * ep, grpc_pollset * pollset, grpc_closure_list * closure_list) +{ + ep->vtable->add_to_pollset (ep, pollset, closure_list); } -void grpc_endpoint_add_to_pollset_set(grpc_endpoint *ep, - grpc_pollset_set *pollset_set, - grpc_closure_list *closure_list) { - ep->vtable->add_to_pollset_set(ep, pollset_set, closure_list); +void +grpc_endpoint_add_to_pollset_set (grpc_endpoint * ep, grpc_pollset_set * pollset_set, grpc_closure_list * closure_list) +{ + ep->vtable->add_to_pollset_set (ep, pollset_set, closure_list); } -void grpc_endpoint_shutdown(grpc_endpoint *ep, - grpc_closure_list *closure_list) { - ep->vtable->shutdown(ep, closure_list); +void +grpc_endpoint_shutdown (grpc_endpoint * ep, grpc_closure_list * closure_list) +{ + ep->vtable->shutdown (ep, closure_list); } -void grpc_endpoint_destroy(grpc_endpoint *ep, grpc_closure_list *closure_list) { - ep->vtable->destroy(ep, closure_list); +void +grpc_endpoint_destroy (grpc_endpoint * ep, grpc_closure_list * closure_list) +{ + ep->vtable->destroy (ep, closure_list); } -char *grpc_endpoint_get_peer(grpc_endpoint *ep) { - return ep->vtable->get_peer(ep); +char * +grpc_endpoint_get_peer (grpc_endpoint * ep) +{ + return ep->vtable->get_peer (ep); } diff --git a/src/core/iomgr/endpoint.h b/src/core/iomgr/endpoint.h index cb722e32e9d..99d7f46e559 100644 --- a/src/core/iomgr/endpoint.h +++ b/src/core/iomgr/endpoint.h @@ -46,28 +46,24 @@ typedef struct grpc_endpoint grpc_endpoint; typedef struct grpc_endpoint_vtable grpc_endpoint_vtable; -struct grpc_endpoint_vtable { - void (*read)(grpc_endpoint *ep, gpr_slice_buffer *slices, grpc_closure *cb, - grpc_closure_list *closure_list); - void (*write)(grpc_endpoint *ep, gpr_slice_buffer *slices, grpc_closure *cb, - grpc_closure_list *closure_list); - void (*add_to_pollset)(grpc_endpoint *ep, grpc_pollset *pollset, - grpc_closure_list *closure_list); - void (*add_to_pollset_set)(grpc_endpoint *ep, grpc_pollset_set *pollset, - grpc_closure_list *closure_list); - void (*shutdown)(grpc_endpoint *ep, grpc_closure_list *closure_list); - void (*destroy)(grpc_endpoint *ep, grpc_closure_list *closure_list); - char *(*get_peer)(grpc_endpoint *ep); +struct grpc_endpoint_vtable +{ + void (*read) (grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list); + void (*write) (grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list); + void (*add_to_pollset) (grpc_endpoint * ep, grpc_pollset * pollset, grpc_closure_list * closure_list); + void (*add_to_pollset_set) (grpc_endpoint * ep, grpc_pollset_set * pollset, grpc_closure_list * closure_list); + void (*shutdown) (grpc_endpoint * ep, grpc_closure_list * closure_list); + void (*destroy) (grpc_endpoint * ep, grpc_closure_list * closure_list); + char *(*get_peer) (grpc_endpoint * ep); }; /* When data is available on the connection, calls the callback with slices. Callback success indicates that the endpoint can accept more reads, failure indicates the endpoint is closed. Valid slices may be placed into \a slices even on callback success == 0. */ -void grpc_endpoint_read(grpc_endpoint *ep, gpr_slice_buffer *slices, - grpc_closure *cb, grpc_closure_list *closure_list); +void grpc_endpoint_read (grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list); -char *grpc_endpoint_get_peer(grpc_endpoint *ep); +char *grpc_endpoint_get_peer (grpc_endpoint * ep); /* Write slices out to the socket. @@ -79,23 +75,20 @@ char *grpc_endpoint_get_peer(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, gpr_slice_buffer *slices, - grpc_closure *cb, grpc_closure_list *closure_list); +void grpc_endpoint_write (grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list); /* Causes any pending read/write callbacks to run immediately with success==0 */ -void grpc_endpoint_shutdown(grpc_endpoint *ep, grpc_closure_list *closure_list); -void grpc_endpoint_destroy(grpc_endpoint *ep, grpc_closure_list *closure_list); +void grpc_endpoint_shutdown (grpc_endpoint * ep, grpc_closure_list * closure_list); +void grpc_endpoint_destroy (grpc_endpoint * ep, grpc_closure_list * closure_list); /* 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_endpoint *ep, grpc_pollset *pollset, - grpc_closure_list *closure_list); -void grpc_endpoint_add_to_pollset_set(grpc_endpoint *ep, - grpc_pollset_set *pollset_set, - grpc_closure_list *closure_list); +void grpc_endpoint_add_to_pollset (grpc_endpoint * ep, grpc_pollset * pollset, grpc_closure_list * closure_list); +void grpc_endpoint_add_to_pollset_set (grpc_endpoint * ep, grpc_pollset_set * pollset_set, grpc_closure_list * closure_list); -struct grpc_endpoint { +struct grpc_endpoint +{ const grpc_endpoint_vtable *vtable; }; diff --git a/src/core/iomgr/endpoint_pair.h b/src/core/iomgr/endpoint_pair.h index 095ec5fcc9f..31816c4916a 100644 --- a/src/core/iomgr/endpoint_pair.h +++ b/src/core/iomgr/endpoint_pair.h @@ -36,12 +36,12 @@ #include "src/core/iomgr/endpoint.h" -typedef struct { +typedef struct +{ grpc_endpoint *client; grpc_endpoint *server; } grpc_endpoint_pair; -grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name, - size_t read_slice_size); +grpc_endpoint_pair grpc_iomgr_create_endpoint_pair (const char *name, size_t read_slice_size); #endif /* GRPC_INTERNAL_CORE_IOMGR_ENDPOINT_PAIR_H */ diff --git a/src/core/iomgr/endpoint_pair_posix.c b/src/core/iomgr/endpoint_pair_posix.c index deae9c68757..5a810fb0102 100644 --- a/src/core/iomgr/endpoint_pair_posix.c +++ b/src/core/iomgr/endpoint_pair_posix.c @@ -49,30 +49,31 @@ #include #include -static void create_sockets(int sv[2]) { +static void +create_sockets (int sv[2]) +{ int flags; - GPR_ASSERT(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); - flags = fcntl(sv[0], F_GETFL, 0); - GPR_ASSERT(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK) == 0); - flags = fcntl(sv[1], F_GETFL, 0); - GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0); + GPR_ASSERT (socketpair (AF_UNIX, SOCK_STREAM, 0, sv) == 0); + flags = fcntl (sv[0], F_GETFL, 0); + GPR_ASSERT (fcntl (sv[0], F_SETFL, flags | O_NONBLOCK) == 0); + flags = fcntl (sv[1], F_GETFL, 0); + GPR_ASSERT (fcntl (sv[1], F_SETFL, flags | O_NONBLOCK) == 0); } -grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name, - size_t read_slice_size) { +grpc_endpoint_pair +grpc_iomgr_create_endpoint_pair (const char *name, size_t read_slice_size) +{ int sv[2]; grpc_endpoint_pair p; char *final_name; - create_sockets(sv); + create_sockets (sv); - gpr_asprintf(&final_name, "%s:client", name); - p.client = grpc_tcp_create(grpc_fd_create(sv[1], final_name), read_slice_size, - "socketpair-server"); - gpr_free(final_name); - gpr_asprintf(&final_name, "%s:server", name); - p.server = grpc_tcp_create(grpc_fd_create(sv[0], final_name), read_slice_size, - "socketpair-client"); - gpr_free(final_name); + gpr_asprintf (&final_name, "%s:client", name); + p.client = grpc_tcp_create (grpc_fd_create (sv[1], final_name), read_slice_size, "socketpair-server"); + gpr_free (final_name); + gpr_asprintf (&final_name, "%s:server", name); + p.server = grpc_tcp_create (grpc_fd_create (sv[0], final_name), read_slice_size, "socketpair-client"); + gpr_free (final_name); return p; } diff --git a/src/core/iomgr/endpoint_pair_windows.c b/src/core/iomgr/endpoint_pair_windows.c index db9d092dcab..990548913a1 100644 --- a/src/core/iomgr/endpoint_pair_windows.c +++ b/src/core/iomgr/endpoint_pair_windows.c @@ -45,52 +45,48 @@ #include "src/core/iomgr/socket_windows.h" #include -static void create_sockets(SOCKET sv[2]) { +static void +create_sockets (SOCKET sv[2]) +{ SOCKET svr_sock = INVALID_SOCKET; SOCKET lst_sock = INVALID_SOCKET; SOCKET cli_sock = INVALID_SOCKET; SOCKADDR_IN addr; - int addr_len = sizeof(addr); + int addr_len = sizeof (addr); - lst_sock = WSASocket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, - WSA_FLAG_OVERLAPPED); - GPR_ASSERT(lst_sock != INVALID_SOCKET); + lst_sock = WSASocket (AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + GPR_ASSERT (lst_sock != INVALID_SOCKET); - memset(&addr, 0, sizeof(addr)); - addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + memset (&addr, 0, sizeof (addr)); + addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK); addr.sin_family = AF_INET; - GPR_ASSERT(bind(lst_sock, (struct sockaddr *)&addr, sizeof(addr)) != - SOCKET_ERROR); - GPR_ASSERT(listen(lst_sock, SOMAXCONN) != SOCKET_ERROR); - GPR_ASSERT(getsockname(lst_sock, (struct sockaddr *)&addr, &addr_len) != - SOCKET_ERROR); + GPR_ASSERT (bind (lst_sock, (struct sockaddr *) &addr, sizeof (addr)) != SOCKET_ERROR); + GPR_ASSERT (listen (lst_sock, SOMAXCONN) != SOCKET_ERROR); + GPR_ASSERT (getsockname (lst_sock, (struct sockaddr *) &addr, &addr_len) != SOCKET_ERROR); - cli_sock = WSASocket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, - WSA_FLAG_OVERLAPPED); - GPR_ASSERT(cli_sock != INVALID_SOCKET); + cli_sock = WSASocket (AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + GPR_ASSERT (cli_sock != INVALID_SOCKET); - GPR_ASSERT(WSAConnect(cli_sock, (struct sockaddr *)&addr, addr_len, NULL, - NULL, NULL, NULL) == 0); - svr_sock = accept(lst_sock, (struct sockaddr *)&addr, &addr_len); - GPR_ASSERT(svr_sock != INVALID_SOCKET); + GPR_ASSERT (WSAConnect (cli_sock, (struct sockaddr *) &addr, addr_len, NULL, NULL, NULL, NULL) == 0); + svr_sock = accept (lst_sock, (struct sockaddr *) &addr, &addr_len); + GPR_ASSERT (svr_sock != INVALID_SOCKET); - closesocket(lst_sock); - grpc_tcp_prepare_socket(cli_sock); - grpc_tcp_prepare_socket(svr_sock); + closesocket (lst_sock); + grpc_tcp_prepare_socket (cli_sock); + grpc_tcp_prepare_socket (svr_sock); sv[1] = cli_sock; sv[0] = svr_sock; } -grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name, - size_t read_slice_size) { +grpc_endpoint_pair +grpc_iomgr_create_endpoint_pair (const char *name, size_t read_slice_size) +{ SOCKET sv[2]; grpc_endpoint_pair p; - create_sockets(sv); - p.client = grpc_tcp_create(grpc_winsocket_create(sv[1], "endpoint:client"), - "endpoint:server"); - p.server = grpc_tcp_create(grpc_winsocket_create(sv[0], "endpoint:server"), - "endpoint:client"); + create_sockets (sv); + p.client = grpc_tcp_create (grpc_winsocket_create (sv[1], "endpoint:client"), "endpoint:server"); + p.server = grpc_tcp_create (grpc_winsocket_create (sv[0], "endpoint:server"), "endpoint:client"); return p; } diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index 5e455f32d77..279ed280018 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -45,10 +45,11 @@ #include #include -enum descriptor_state { +enum descriptor_state +{ NOT_READY = 0, READY = 1 -}; /* or a pointer to a closure to call */ +}; /* or a pointer to a closure to call */ /* We need to keep a freelist not because of any concerns of malloc performance * but instead so that implementations with multiple threads in (for example) @@ -70,35 +71,40 @@ enum descriptor_state { static grpc_fd *fd_freelist = NULL; static gpr_mu fd_freelist_mu; -static void freelist_fd(grpc_fd *fd) { - gpr_mu_lock(&fd_freelist_mu); +static void +freelist_fd (grpc_fd * fd) +{ + gpr_mu_lock (&fd_freelist_mu); fd->freelist_next = fd_freelist; fd_freelist = fd; - grpc_iomgr_unregister_object(&fd->iomgr_object); - gpr_mu_unlock(&fd_freelist_mu); + grpc_iomgr_unregister_object (&fd->iomgr_object); + gpr_mu_unlock (&fd_freelist_mu); } -static grpc_fd *alloc_fd(int fd) { +static grpc_fd * +alloc_fd (int fd) +{ grpc_fd *r = NULL; - gpr_mu_lock(&fd_freelist_mu); - if (fd_freelist != NULL) { - r = fd_freelist; - fd_freelist = fd_freelist->freelist_next; - } - gpr_mu_unlock(&fd_freelist_mu); - if (r == NULL) { - r = gpr_malloc(sizeof(grpc_fd)); - gpr_mu_init(&r->set_state_mu); - gpr_mu_init(&r->watcher_mu); - } - - gpr_atm_rel_store(&r->refst, 1); - gpr_atm_rel_store(&r->readst, NOT_READY); - gpr_atm_rel_store(&r->writest, NOT_READY); - gpr_atm_rel_store(&r->shutdown, 0); + gpr_mu_lock (&fd_freelist_mu); + if (fd_freelist != NULL) + { + r = fd_freelist; + fd_freelist = fd_freelist->freelist_next; + } + gpr_mu_unlock (&fd_freelist_mu); + if (r == NULL) + { + r = gpr_malloc (sizeof (grpc_fd)); + gpr_mu_init (&r->set_state_mu); + gpr_mu_init (&r->watcher_mu); + } + + gpr_atm_rel_store (&r->refst, 1); + gpr_atm_rel_store (&r->readst, NOT_READY); + gpr_atm_rel_store (&r->writest, NOT_READY); + gpr_atm_rel_store (&r->shutdown, 0); r->fd = fd; - r->inactive_watcher_root.next = r->inactive_watcher_root.prev = - &r->inactive_watcher_root; + r->inactive_watcher_root.next = r->inactive_watcher_root.prev = &r->inactive_watcher_root; r->freelist_next = NULL; r->read_watcher = r->write_watcher = NULL; r->on_done_closure = NULL; @@ -106,147 +112,198 @@ static grpc_fd *alloc_fd(int fd) { return r; } -static void destroy(grpc_fd *fd) { - gpr_mu_destroy(&fd->set_state_mu); - gpr_mu_destroy(&fd->watcher_mu); - gpr_free(fd); +static void +destroy (grpc_fd * fd) +{ + gpr_mu_destroy (&fd->set_state_mu); + gpr_mu_destroy (&fd->watcher_mu); + gpr_free (fd); } #ifdef GRPC_FD_REF_COUNT_DEBUG #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__) -static void ref_by(grpc_fd *fd, int n, const char *reason, const char *file, - int line) { - gpr_log(GPR_DEBUG, "FD %d %p ref %d %d -> %d [%s; %s:%d]", fd->fd, fd, n, - gpr_atm_no_barrier_load(&fd->refst), - gpr_atm_no_barrier_load(&fd->refst) + n, reason, file, line); +static void +ref_by (grpc_fd * fd, int n, const char *reason, const char *file, int line) +{ + gpr_log (GPR_DEBUG, "FD %d %p ref %d %d -> %d [%s; %s:%d]", fd->fd, fd, n, gpr_atm_no_barrier_load (&fd->refst), gpr_atm_no_barrier_load (&fd->refst) + n, reason, file, line); #else #define REF_BY(fd, n, reason) ref_by(fd, n) #define UNREF_BY(fd, n, reason) unref_by(fd, n) -static void ref_by(grpc_fd *fd, int n) { +static void +ref_by (grpc_fd * fd, int n) +{ #endif - GPR_ASSERT(gpr_atm_no_barrier_fetch_add(&fd->refst, n) > 0); + GPR_ASSERT (gpr_atm_no_barrier_fetch_add (&fd->refst, n) > 0); } #ifdef GRPC_FD_REF_COUNT_DEBUG -static void unref_by(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) +{ gpr_atm old; - gpr_log(GPR_DEBUG, "FD %d %p unref %d %d -> %d [%s; %s:%d]", fd->fd, fd, n, - gpr_atm_no_barrier_load(&fd->refst), - gpr_atm_no_barrier_load(&fd->refst) - n, reason, file, line); + gpr_log (GPR_DEBUG, "FD %d %p unref %d %d -> %d [%s; %s:%d]", fd->fd, fd, n, gpr_atm_no_barrier_load (&fd->refst), 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_fd * fd, int n) +{ gpr_atm old; #endif - old = gpr_atm_full_fetch_add(&fd->refst, -n); - if (old == n) { - freelist_fd(fd); - } else { - GPR_ASSERT(old > n); - } + old = gpr_atm_full_fetch_add (&fd->refst, -n); + if (old == n) + { + freelist_fd (fd); + } + else + { + GPR_ASSERT (old > n); + } } -void grpc_fd_global_init(void) { gpr_mu_init(&fd_freelist_mu); } - -void grpc_fd_global_shutdown(void) { - gpr_mu_lock(&fd_freelist_mu); - gpr_mu_unlock(&fd_freelist_mu); - while (fd_freelist != NULL) { - grpc_fd *fd = fd_freelist; - fd_freelist = fd_freelist->freelist_next; - destroy(fd); - } - gpr_mu_destroy(&fd_freelist_mu); +void +grpc_fd_global_init (void) +{ + gpr_mu_init (&fd_freelist_mu); } -grpc_fd *grpc_fd_create(int fd, const char *name) { - grpc_fd *r = alloc_fd(fd); - grpc_iomgr_register_object(&r->iomgr_object, name); +void +grpc_fd_global_shutdown (void) +{ + gpr_mu_lock (&fd_freelist_mu); + gpr_mu_unlock (&fd_freelist_mu); + while (fd_freelist != NULL) + { + grpc_fd *fd = fd_freelist; + fd_freelist = fd_freelist->freelist_next; + destroy (fd); + } + gpr_mu_destroy (&fd_freelist_mu); +} + +grpc_fd * +grpc_fd_create (int fd, const char *name) +{ + grpc_fd *r = alloc_fd (fd); + grpc_iomgr_register_object (&r->iomgr_object, name); return r; } -int grpc_fd_is_orphaned(grpc_fd *fd) { - return (gpr_atm_acq_load(&fd->refst) & 1) == 0; +int +grpc_fd_is_orphaned (grpc_fd * fd) +{ + return (gpr_atm_acq_load (&fd->refst) & 1) == 0; } -static void pollset_kick_locked(grpc_pollset *pollset) { - gpr_mu_lock(GRPC_POLLSET_MU(pollset)); - grpc_pollset_kick(pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(pollset)); +static void +pollset_kick_locked (grpc_pollset * pollset) +{ + gpr_mu_lock (GRPC_POLLSET_MU (pollset)); + grpc_pollset_kick (pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (pollset)); } -static void maybe_wake_one_watcher_locked(grpc_fd *fd) { - if (fd->inactive_watcher_root.next != &fd->inactive_watcher_root) { - pollset_kick_locked(fd->inactive_watcher_root.next->pollset); - } else if (fd->read_watcher) { - pollset_kick_locked(fd->read_watcher->pollset); - } else if (fd->write_watcher) { - pollset_kick_locked(fd->write_watcher->pollset); - } +static void +maybe_wake_one_watcher_locked (grpc_fd * fd) +{ + if (fd->inactive_watcher_root.next != &fd->inactive_watcher_root) + { + pollset_kick_locked (fd->inactive_watcher_root.next->pollset); + } + else if (fd->read_watcher) + { + pollset_kick_locked (fd->read_watcher->pollset); + } + else if (fd->write_watcher) + { + pollset_kick_locked (fd->write_watcher->pollset); + } } -static void maybe_wake_one_watcher(grpc_fd *fd) { - gpr_mu_lock(&fd->watcher_mu); - maybe_wake_one_watcher_locked(fd); - gpr_mu_unlock(&fd->watcher_mu); +static void +maybe_wake_one_watcher (grpc_fd * fd) +{ + gpr_mu_lock (&fd->watcher_mu); + maybe_wake_one_watcher_locked (fd); + gpr_mu_unlock (&fd->watcher_mu); } -static void wake_all_watchers_locked(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(watcher->pollset); - } - if (fd->read_watcher) { - pollset_kick_locked(fd->read_watcher->pollset); - } - if (fd->write_watcher && fd->write_watcher != fd->read_watcher) { - pollset_kick_locked(fd->write_watcher->pollset); - } + for (watcher = fd->inactive_watcher_root.next; watcher != &fd->inactive_watcher_root; watcher = watcher->next) + { + pollset_kick_locked (watcher->pollset); + } + if (fd->read_watcher) + { + pollset_kick_locked (fd->read_watcher->pollset); + } + if (fd->write_watcher && fd->write_watcher != fd->read_watcher) + { + pollset_kick_locked (fd->write_watcher->pollset); + } } -static int has_watchers(grpc_fd *fd) { - return fd->read_watcher != NULL || fd->write_watcher != NULL || - fd->inactive_watcher_root.next != &fd->inactive_watcher_root; +static int +has_watchers (grpc_fd * fd) +{ + return fd->read_watcher != NULL || fd->write_watcher != NULL || fd->inactive_watcher_root.next != &fd->inactive_watcher_root; } -void grpc_fd_orphan(grpc_fd *fd, grpc_closure *on_done, const char *reason, - grpc_closure_list *closure_list) { +void +grpc_fd_orphan (grpc_fd * fd, grpc_closure * on_done, const char *reason, grpc_closure_list * closure_list) +{ fd->on_done_closure = on_done; - shutdown(fd->fd, SHUT_RDWR); - gpr_mu_lock(&fd->watcher_mu); - REF_BY(fd, 1, reason); /* remove active status, but keep referenced */ - if (!has_watchers(fd)) { - fd->closed = 1; - close(fd->fd); - grpc_closure_list_add(closure_list, fd->on_done_closure, 1); - } else { - wake_all_watchers_locked(fd); - } - gpr_mu_unlock(&fd->watcher_mu); - UNREF_BY(fd, 2, reason); /* drop the reference */ + shutdown (fd->fd, SHUT_RDWR); + gpr_mu_lock (&fd->watcher_mu); + REF_BY (fd, 1, reason); /* remove active status, but keep referenced */ + if (!has_watchers (fd)) + { + fd->closed = 1; + close (fd->fd); + grpc_closure_list_add (closure_list, fd->on_done_closure, 1); + } + else + { + wake_all_watchers_locked (fd); + } + gpr_mu_unlock (&fd->watcher_mu); + UNREF_BY (fd, 2, reason); /* drop the reference */ } /* increment refcount by two to avoid changing the orphan bit */ #ifdef GRPC_FD_REF_COUNT_DEBUG -void grpc_fd_ref(grpc_fd *fd, const char *reason, const char *file, int line) { - ref_by(fd, 2, reason, file, line); +void +grpc_fd_ref (grpc_fd * fd, const char *reason, const char *file, int line) +{ + ref_by (fd, 2, reason, file, line); } -void grpc_fd_unref(grpc_fd *fd, const char *reason, const char *file, - int line) { - unref_by(fd, 2, reason, file, line); +void +grpc_fd_unref (grpc_fd * fd, const char *reason, const char *file, int line) +{ + unref_by (fd, 2, reason, file, line); } #else -void grpc_fd_ref(grpc_fd *fd) { ref_by(fd, 2); } +void +grpc_fd_ref (grpc_fd * fd) +{ + ref_by (fd, 2); +} -void grpc_fd_unref(grpc_fd *fd) { unref_by(fd, 2); } +void +grpc_fd_unref (grpc_fd * fd) +{ + unref_by (fd, 2); +} #endif -static void notify_on(grpc_fd *fd, gpr_atm *st, grpc_closure *closure, - grpc_closure_list *closure_list) { - switch (gpr_atm_acq_load(st)) { +static void +notify_on (grpc_fd * fd, gpr_atm * st, grpc_closure * closure, grpc_closure_list * closure_list) +{ + switch (gpr_atm_acq_load (st)) + { case NOT_READY: /* There is no race if the descriptor is already ready, so we skip the interlocked op in that case. As long as the app doesn't @@ -254,178 +311,195 @@ static void notify_on(grpc_fd *fd, gpr_atm *st, grpc_closure *closure, oldval should never be anything other than READY or NOT_READY. We don't check for user error on the fast path. */ - if (gpr_atm_rel_cas(st, NOT_READY, (gpr_intptr)closure)) { - /* swap was successful -- the closure will run after the next - set_ready call. NOTE: we don't have an ABA problem here, - since we should never have concurrent calls to the same - notify_on function. */ - maybe_wake_one_watcher(fd); - return; - } - /* swap was unsuccessful due to an intervening set_ready call. - Fall through to the READY code below */ + if (gpr_atm_rel_cas (st, NOT_READY, (gpr_intptr) closure)) + { + /* swap was successful -- the closure will run after the next + set_ready call. NOTE: we don't have an ABA problem here, + since we should never have concurrent calls to the same + notify_on function. */ + maybe_wake_one_watcher (fd); + return; + } + /* swap was unsuccessful due to an intervening set_ready call. + Fall through to the READY code below */ case READY: - GPR_ASSERT(gpr_atm_no_barrier_load(st) == READY); - gpr_atm_rel_store(st, NOT_READY); - grpc_closure_list_add(closure_list, closure, - !gpr_atm_acq_load(&fd->shutdown)); + GPR_ASSERT (gpr_atm_no_barrier_load (st) == READY); + gpr_atm_rel_store (st, NOT_READY); + grpc_closure_list_add (closure_list, closure, !gpr_atm_acq_load (&fd->shutdown)); return; - default: /* WAITING */ + default: /* WAITING */ /* upcallptr was set to a different closure. This is an error! */ - gpr_log(GPR_ERROR, - "User called a notify_on function with a previous callback still " - "pending"); - abort(); - } - gpr_log(GPR_ERROR, "Corrupt memory in &st->state"); - abort(); + gpr_log (GPR_ERROR, "User called a notify_on function with a previous callback still " "pending"); + abort (); + } + gpr_log (GPR_ERROR, "Corrupt memory in &st->state"); + abort (); } -static void set_ready_locked(grpc_fd *fd, gpr_atm *st, - grpc_closure_list *closure_list) { - gpr_intptr state = gpr_atm_acq_load(st); +static void +set_ready_locked (grpc_fd * fd, gpr_atm * st, grpc_closure_list * closure_list) +{ + gpr_intptr state = gpr_atm_acq_load (st); - switch (state) { + switch (state) + { case READY: /* duplicate ready, ignore */ return; case NOT_READY: - if (gpr_atm_rel_cas(st, NOT_READY, READY)) { - /* swap was successful -- the closure will run after the next - notify_on call. */ - return; - } + if (gpr_atm_rel_cas (st, NOT_READY, READY)) + { + /* swap was successful -- the closure will run after the next + notify_on call. */ + return; + } /* swap was unsuccessful due to an intervening set_ready call. Fall through to the WAITING code below */ - state = gpr_atm_acq_load(st); - default: /* waiting */ - GPR_ASSERT(gpr_atm_no_barrier_load(st) != READY && - gpr_atm_no_barrier_load(st) != NOT_READY); - grpc_closure_list_add(closure_list, (grpc_closure *)state, - !gpr_atm_acq_load(&fd->shutdown)); - gpr_atm_rel_store(st, NOT_READY); + state = gpr_atm_acq_load (st); + default: /* waiting */ + GPR_ASSERT (gpr_atm_no_barrier_load (st) != READY && gpr_atm_no_barrier_load (st) != NOT_READY); + grpc_closure_list_add (closure_list, (grpc_closure *) state, !gpr_atm_acq_load (&fd->shutdown)); + gpr_atm_rel_store (st, NOT_READY); return; - } + } } -static void set_ready(grpc_fd *fd, gpr_atm *st, - grpc_closure_list *closure_list) { +static void +set_ready (grpc_fd * fd, gpr_atm * st, grpc_closure_list * closure_list) +{ /* only one set_ready can be active at once (but there may be a racing notify_on) */ - gpr_mu_lock(&fd->set_state_mu); - set_ready_locked(fd, st, closure_list); - gpr_mu_unlock(&fd->set_state_mu); + gpr_mu_lock (&fd->set_state_mu); + set_ready_locked (fd, st, closure_list); + gpr_mu_unlock (&fd->set_state_mu); } -void grpc_fd_shutdown(grpc_fd *fd, grpc_closure_list *closure_list) { - gpr_mu_lock(&fd->set_state_mu); - GPR_ASSERT(!gpr_atm_no_barrier_load(&fd->shutdown)); - gpr_atm_rel_store(&fd->shutdown, 1); - set_ready_locked(fd, &fd->readst, closure_list); - set_ready_locked(fd, &fd->writest, closure_list); - gpr_mu_unlock(&fd->set_state_mu); +void +grpc_fd_shutdown (grpc_fd * fd, grpc_closure_list * closure_list) +{ + gpr_mu_lock (&fd->set_state_mu); + GPR_ASSERT (!gpr_atm_no_barrier_load (&fd->shutdown)); + gpr_atm_rel_store (&fd->shutdown, 1); + set_ready_locked (fd, &fd->readst, closure_list); + set_ready_locked (fd, &fd->writest, closure_list); + gpr_mu_unlock (&fd->set_state_mu); } -void grpc_fd_notify_on_read(grpc_fd *fd, grpc_closure *closure, - grpc_closure_list *closure_list) { - notify_on(fd, &fd->readst, closure, closure_list); +void +grpc_fd_notify_on_read (grpc_fd * fd, grpc_closure * closure, grpc_closure_list * closure_list) +{ + notify_on (fd, &fd->readst, closure, closure_list); } -void grpc_fd_notify_on_write(grpc_fd *fd, grpc_closure *closure, - grpc_closure_list *closure_list) { - notify_on(fd, &fd->writest, closure, closure_list); +void +grpc_fd_notify_on_write (grpc_fd * fd, grpc_closure * closure, grpc_closure_list * closure_list) +{ + notify_on (fd, &fd->writest, closure, closure_list); } -gpr_uint32 grpc_fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset, - gpr_uint32 read_mask, gpr_uint32 write_mask, - grpc_fd_watcher *watcher) { +gpr_uint32 +grpc_fd_begin_poll (grpc_fd * fd, grpc_pollset * pollset, gpr_uint32 read_mask, gpr_uint32 write_mask, grpc_fd_watcher * watcher) +{ gpr_uint32 mask = 0; /* keep track of pollers that have requested our events, in case they change */ - GRPC_FD_REF(fd, "poll"); + GRPC_FD_REF (fd, "poll"); - gpr_mu_lock(&fd->watcher_mu); + gpr_mu_lock (&fd->watcher_mu); /* if we are shutdown, then don't add to the watcher set */ - if (gpr_atm_no_barrier_load(&fd->shutdown)) { - watcher->fd = NULL; - watcher->pollset = NULL; - gpr_mu_unlock(&fd->watcher_mu); - GRPC_FD_UNREF(fd, "poll"); - return 0; - } + if (gpr_atm_no_barrier_load (&fd->shutdown)) + { + watcher->fd = NULL; + watcher->pollset = NULL; + gpr_mu_unlock (&fd->watcher_mu); + GRPC_FD_UNREF (fd, "poll"); + return 0; + } /* if there is nobody polling for read, but we need to, then start doing so */ - if (read_mask && !fd->read_watcher && - (gpr_uintptr)gpr_atm_acq_load(&fd->readst) > READY) { - fd->read_watcher = watcher; - mask |= read_mask; - } + if (read_mask && !fd->read_watcher && (gpr_uintptr) gpr_atm_acq_load (&fd->readst) > READY) + { + fd->read_watcher = watcher; + mask |= read_mask; + } /* if there is nobody polling for write, but we need to, then start doing so */ - if (write_mask && !fd->write_watcher && - (gpr_uintptr)gpr_atm_acq_load(&fd->writest) > READY) { - fd->write_watcher = watcher; - mask |= write_mask; - } + if (write_mask && !fd->write_watcher && (gpr_uintptr) gpr_atm_acq_load (&fd->writest) > READY) + { + fd->write_watcher = watcher; + mask |= write_mask; + } /* if not polling, remember this watcher in case we need someone to later */ - if (mask == 0) { - watcher->next = &fd->inactive_watcher_root; - watcher->prev = watcher->next->prev; - watcher->next->prev = watcher->prev->next = watcher; - } + if (mask == 0) + { + watcher->next = &fd->inactive_watcher_root; + watcher->prev = watcher->next->prev; + watcher->next->prev = watcher->prev->next = watcher; + } watcher->pollset = pollset; watcher->fd = fd; - gpr_mu_unlock(&fd->watcher_mu); + gpr_mu_unlock (&fd->watcher_mu); return mask; } -void grpc_fd_end_poll(grpc_fd_watcher *watcher, int got_read, int got_write, - grpc_closure_list *closure_list) { +void +grpc_fd_end_poll (grpc_fd_watcher * watcher, int got_read, int got_write, grpc_closure_list * closure_list) +{ int was_polling = 0; int kick = 0; grpc_fd *fd = watcher->fd; - if (fd == NULL) { - return; - } - - gpr_mu_lock(&fd->watcher_mu); - if (watcher == fd->read_watcher) { - /* remove read watcher, kick if we still need a read */ - was_polling = 1; - kick = kick || !got_read; - fd->read_watcher = NULL; - } - if (watcher == fd->write_watcher) { - /* remove write watcher, kick if we still need a write */ - was_polling = 1; - kick = kick || !got_write; - fd->write_watcher = NULL; - } - if (!was_polling) { - /* remove from inactive list */ - watcher->next->prev = watcher->prev; - watcher->prev->next = watcher->next; - } - if (kick) { - maybe_wake_one_watcher_locked(fd); - } - if (grpc_fd_is_orphaned(fd) && !has_watchers(fd) && !fd->closed) { - fd->closed = 1; - close(fd->fd); - grpc_closure_list_add(closure_list, fd->on_done_closure, 1); - } - gpr_mu_unlock(&fd->watcher_mu); - - GRPC_FD_UNREF(fd, "poll"); + if (fd == NULL) + { + return; + } + + gpr_mu_lock (&fd->watcher_mu); + if (watcher == fd->read_watcher) + { + /* remove read watcher, kick if we still need a read */ + was_polling = 1; + kick = kick || !got_read; + fd->read_watcher = NULL; + } + if (watcher == fd->write_watcher) + { + /* remove write watcher, kick if we still need a write */ + was_polling = 1; + kick = kick || !got_write; + fd->write_watcher = NULL; + } + if (!was_polling) + { + /* remove from inactive list */ + watcher->next->prev = watcher->prev; + watcher->prev->next = watcher->next; + } + if (kick) + { + maybe_wake_one_watcher_locked (fd); + } + if (grpc_fd_is_orphaned (fd) && !has_watchers (fd) && !fd->closed) + { + fd->closed = 1; + close (fd->fd); + grpc_closure_list_add (closure_list, fd->on_done_closure, 1); + } + gpr_mu_unlock (&fd->watcher_mu); + + GRPC_FD_UNREF (fd, "poll"); } -void grpc_fd_become_readable(grpc_fd *fd, grpc_closure_list *closure_list) { - set_ready(fd, &fd->readst, closure_list); +void +grpc_fd_become_readable (grpc_fd * fd, grpc_closure_list * closure_list) +{ + set_ready (fd, &fd->readst, closure_list); } -void grpc_fd_become_writable(grpc_fd *fd, grpc_closure_list *closure_list) { - set_ready(fd, &fd->writest, closure_list); +void +grpc_fd_become_writable (grpc_fd * fd, grpc_closure_list * closure_list) +{ + set_ready (fd, &fd->writest, closure_list); } #endif diff --git a/src/core/iomgr/fd_posix.h b/src/core/iomgr/fd_posix.h index eab0daa00d5..53850f44177 100644 --- a/src/core/iomgr/fd_posix.h +++ b/src/core/iomgr/fd_posix.h @@ -42,18 +42,20 @@ typedef struct grpc_fd grpc_fd; -typedef struct grpc_fd_watcher { +typedef struct grpc_fd_watcher +{ struct grpc_fd_watcher *next; struct grpc_fd_watcher *prev; grpc_pollset *pollset; grpc_fd *fd; } grpc_fd_watcher; -struct grpc_fd { +struct grpc_fd +{ int fd; /* refst format: - bit0: 1=active/0=orphaned - bit1-n: refcount + bit0: 1=active/0=orphaned + bit1-n: refcount meaning that mostly we ref by two to avoid altering the orphaned bit, and just unref by 1 when we're ready to flag the object as orphaned */ gpr_atm refst; @@ -103,7 +105,7 @@ struct grpc_fd { /* Create a wrapped file descriptor. Requires fd is a non-blocking file descriptor. This takes ownership of closing fd. */ -grpc_fd *grpc_fd_create(int fd, const char *name); +grpc_fd *grpc_fd_create (int fd, const char *name); /* Releases fd to be asynchronously destroyed. on_done is called when the underlying file descriptor is definitely close()d. @@ -111,8 +113,7 @@ grpc_fd *grpc_fd_create(int fd, const char *name); 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, const char *reason, - grpc_closure_list *closure_list); +void grpc_fd_orphan (grpc_fd * fd, grpc_closure * on_done, const char *reason, grpc_closure_list * closure_list); /* Begin polling on an fd. Registers that the given pollset is interested in this fd - so that if read @@ -125,19 +126,16 @@ void grpc_fd_orphan(grpc_fd *fd, grpc_closure *on_done, const char *reason, Polling strategies that do not need to alter their behavior depending on the fd's current interest (such as epoll) do not need to call this function. MUST NOT be called with a pollset lock taken */ -gpr_uint32 grpc_fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset, - gpr_uint32 read_mask, gpr_uint32 write_mask, - grpc_fd_watcher *rec); +gpr_uint32 grpc_fd_begin_poll (grpc_fd * fd, grpc_pollset * pollset, gpr_uint32 read_mask, gpr_uint32 write_mask, grpc_fd_watcher * rec); /* Complete polling previously started with grpc_fd_begin_poll MUST NOT be called with a pollset lock taken */ -void grpc_fd_end_poll(grpc_fd_watcher *rec, int got_read, int got_write, - grpc_closure_list *closure_list); +void grpc_fd_end_poll (grpc_fd_watcher * rec, int got_read, int got_write, grpc_closure_list * closure_list); /* Return 1 if this fd is orphaned, 0 otherwise */ -int grpc_fd_is_orphaned(grpc_fd *fd); +int grpc_fd_is_orphaned (grpc_fd * fd); /* Cause any current callbacks to error out with GRPC_CALLBACK_CANCELLED. */ -void grpc_fd_shutdown(grpc_fd *fd, grpc_closure_list *closure_list); +void grpc_fd_shutdown (grpc_fd * fd, grpc_closure_list * closure_list); /* Register read interest, causing read_cb to be called once when fd becomes readable, on deadline specified by deadline, or on shutdown triggered by @@ -152,34 +150,32 @@ void grpc_fd_shutdown(grpc_fd *fd, grpc_closure_list *closure_list); 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, - grpc_closure_list *closure_list); +void grpc_fd_notify_on_read (grpc_fd * fd, grpc_closure * closure, grpc_closure_list * closure_list); /* Exactly the same semantics as above, except based on writable events. */ -void grpc_fd_notify_on_write(grpc_fd *fd, grpc_closure *closure, - grpc_closure_list *closure_list); +void grpc_fd_notify_on_write (grpc_fd * fd, grpc_closure * closure, grpc_closure_list * closure_list); /* Notification from the poller to an fd that it has become readable or writable. If allow_synchronous_callback is 1, allow running the fd callback inline in this callstack, otherwise register an asynchronous callback and return */ -void grpc_fd_become_readable(grpc_fd *fd, grpc_closure_list *closure_list); -void grpc_fd_become_writable(grpc_fd *fd, grpc_closure_list *closure_list); +void grpc_fd_become_readable (grpc_fd * fd, grpc_closure_list * closure_list); +void grpc_fd_become_writable (grpc_fd * fd, grpc_closure_list * closure_list); /* Reference counting for fds */ #ifdef GRPC_FD_REF_COUNT_DEBUG -void grpc_fd_ref(grpc_fd *fd, const char *reason, const char *file, int line); -void grpc_fd_unref(grpc_fd *fd, const char *reason, const char *file, int line); +void grpc_fd_ref (grpc_fd * fd, const char *reason, const char *file, int line); +void grpc_fd_unref (grpc_fd * fd, const char *reason, const char *file, int line); #define GRPC_FD_REF(fd, reason) grpc_fd_ref(fd, reason, __FILE__, __LINE__) #define GRPC_FD_UNREF(fd, reason) grpc_fd_unref(fd, reason, __FILE__, __LINE__) #else -void grpc_fd_ref(grpc_fd *fd); -void grpc_fd_unref(grpc_fd *fd); +void grpc_fd_ref (grpc_fd * fd); +void grpc_fd_unref (grpc_fd * fd); #define GRPC_FD_REF(fd, reason) grpc_fd_ref(fd) #define GRPC_FD_UNREF(fd, reason) grpc_fd_unref(fd) #endif -void grpc_fd_global_init(void); -void grpc_fd_global_shutdown(void); +void grpc_fd_global_init (void); +void grpc_fd_global_shutdown (void); #endif /* GRPC_INTERNAL_CORE_IOMGR_FD_POSIX_H */ diff --git a/src/core/iomgr/iocp_windows.c b/src/core/iomgr/iocp_windows.c index 54048910a23..d934e638ace 100644 --- a/src/core/iomgr/iocp_windows.c +++ b/src/core/iomgr/iocp_windows.c @@ -56,7 +56,9 @@ static gpr_atm g_custom_events = 0; static HANDLE g_iocp; -static void do_iocp_work() { +static void +do_iocp_work () +{ BOOL success; DWORD bytes = 0; DWORD flags = 0; @@ -64,135 +66,159 @@ static void do_iocp_work() { LPOVERLAPPED overlapped; grpc_winsocket *socket; grpc_winsocket_callback_info *info; - void (*f)(void *, int) = NULL; + void (*f) (void *, int) = NULL; void *opaque = NULL; - success = GetQueuedCompletionStatus(g_iocp, &bytes, &completion_key, - &overlapped, INFINITE); + success = GetQueuedCompletionStatus (g_iocp, &bytes, &completion_key, &overlapped, INFINITE); /* success = 0 and overlapped = NULL means the deadline got attained. Which is impossible. since our wait time is +inf */ - GPR_ASSERT(success || overlapped); - GPR_ASSERT(completion_key && overlapped); - if (overlapped == &g_iocp_custom_overlap) { - gpr_atm_full_fetch_add(&g_custom_events, -1); - if (completion_key == (ULONG_PTR)&g_iocp_kick_token) { - /* We were awoken from a kick. */ - return; + GPR_ASSERT (success || overlapped); + GPR_ASSERT (completion_key && overlapped); + if (overlapped == &g_iocp_custom_overlap) + { + gpr_atm_full_fetch_add (&g_custom_events, -1); + if (completion_key == (ULONG_PTR) & g_iocp_kick_token) + { + /* We were awoken from a kick. */ + return; + } + gpr_log (GPR_ERROR, "Unknown custom completion key."); + abort (); } - gpr_log(GPR_ERROR, "Unknown custom completion key."); - abort(); - } - - socket = (grpc_winsocket *)completion_key; - if (overlapped == &socket->write_info.overlapped) { - info = &socket->write_info; - } else if (overlapped == &socket->read_info.overlapped) { - info = &socket->read_info; - } else { - gpr_log(GPR_ERROR, "Unknown IOCP operation"); - abort(); - } - success = WSAGetOverlappedResult(socket->socket, &info->overlapped, &bytes, - FALSE, &flags); + + socket = (grpc_winsocket *) completion_key; + if (overlapped == &socket->write_info.overlapped) + { + info = &socket->write_info; + } + else if (overlapped == &socket->read_info.overlapped) + { + info = &socket->read_info; + } + else + { + gpr_log (GPR_ERROR, "Unknown IOCP operation"); + abort (); + } + success = WSAGetOverlappedResult (socket->socket, &info->overlapped, &bytes, FALSE, &flags); info->bytes_transfered = bytes; - info->wsa_error = success ? 0 : WSAGetLastError(); - GPR_ASSERT(overlapped == &info->overlapped); - GPR_ASSERT(!info->has_pending_iocp); - gpr_mu_lock(&socket->state_mu); - if (info->cb) { - f = info->cb; - opaque = info->opaque; - info->cb = NULL; - } else { - info->has_pending_iocp = 1; - } - gpr_mu_unlock(&socket->state_mu); - if (f) f(opaque, 1); + info->wsa_error = success ? 0 : WSAGetLastError (); + GPR_ASSERT (overlapped == &info->overlapped); + GPR_ASSERT (!info->has_pending_iocp); + gpr_mu_lock (&socket->state_mu); + if (info->cb) + { + f = info->cb; + opaque = info->opaque; + info->cb = NULL; + } + else + { + info->has_pending_iocp = 1; + } + gpr_mu_unlock (&socket->state_mu); + if (f) + f (opaque, 1); } -static void iocp_loop(void *p) { - while (gpr_atm_acq_load(&g_custom_events) || - !gpr_event_get(&g_shutdown_iocp)) { - do_iocp_work(); - } +static void +iocp_loop (void *p) +{ + while (gpr_atm_acq_load (&g_custom_events) || !gpr_event_get (&g_shutdown_iocp)) + { + do_iocp_work (); + } - gpr_event_set(&g_iocp_done, (void *)1); + gpr_event_set (&g_iocp_done, (void *) 1); } -void grpc_iocp_init(void) { +void +grpc_iocp_init (void) +{ gpr_thd_id id; - g_iocp = - CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, (ULONG_PTR)NULL, 0); - GPR_ASSERT(g_iocp); + g_iocp = CreateIoCompletionPort (INVALID_HANDLE_VALUE, NULL, (ULONG_PTR) NULL, 0); + GPR_ASSERT (g_iocp); - gpr_event_init(&g_iocp_done); - gpr_event_init(&g_shutdown_iocp); - gpr_thd_new(&id, iocp_loop, NULL, NULL); + gpr_event_init (&g_iocp_done); + gpr_event_init (&g_shutdown_iocp); + gpr_thd_new (&id, iocp_loop, NULL, NULL); } -void grpc_iocp_kick(void) { +void +grpc_iocp_kick (void) +{ BOOL success; - gpr_atm_full_fetch_add(&g_custom_events, 1); - success = PostQueuedCompletionStatus(g_iocp, 0, (ULONG_PTR)&g_iocp_kick_token, - &g_iocp_custom_overlap); - GPR_ASSERT(success); + gpr_atm_full_fetch_add (&g_custom_events, 1); + success = PostQueuedCompletionStatus (g_iocp, 0, (ULONG_PTR) & g_iocp_kick_token, &g_iocp_custom_overlap); + GPR_ASSERT (success); } -void grpc_iocp_shutdown(void) { +void +grpc_iocp_shutdown (void) +{ BOOL success; - gpr_event_set(&g_shutdown_iocp, (void *)1); - grpc_iocp_kick(); - gpr_event_wait(&g_iocp_done, gpr_inf_future(GPR_CLOCK_REALTIME)); - success = CloseHandle(g_iocp); - GPR_ASSERT(success); + gpr_event_set (&g_shutdown_iocp, (void *) 1); + grpc_iocp_kick (); + gpr_event_wait (&g_iocp_done, gpr_inf_future (GPR_CLOCK_REALTIME)); + success = CloseHandle (g_iocp); + GPR_ASSERT (success); } -void grpc_iocp_add_socket(grpc_winsocket *socket) { +void +grpc_iocp_add_socket (grpc_winsocket * socket) +{ HANDLE ret; - if (socket->added_to_iocp) return; - ret = CreateIoCompletionPort((HANDLE)socket->socket, g_iocp, - (gpr_uintptr)socket, 0); - if (!ret) { - char *utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "Unable to add socket to iocp: %s", utf8_message); - gpr_free(utf8_message); - __debugbreak(); - abort(); - } + if (socket->added_to_iocp) + return; + ret = CreateIoCompletionPort ((HANDLE) socket->socket, g_iocp, (gpr_uintptr) socket, 0); + if (!ret) + { + char *utf8_message = gpr_format_message (WSAGetLastError ()); + gpr_log (GPR_ERROR, "Unable to add socket to iocp: %s", utf8_message); + gpr_free (utf8_message); + __debugbreak (); + abort (); + } socket->added_to_iocp = 1; - GPR_ASSERT(ret == g_iocp); + GPR_ASSERT (ret == g_iocp); } /* Calling notify_on_read or write means either of two things: -) 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, - void (*cb)(void *, int), void *opaque, - grpc_winsocket_callback_info *info) { +static void +socket_notify_on_iocp (grpc_winsocket * socket, void (*cb) (void *, int), void *opaque, grpc_winsocket_callback_info * info) +{ int run_now = 0; - GPR_ASSERT(!info->cb); - gpr_mu_lock(&socket->state_mu); - if (info->has_pending_iocp) { - run_now = 1; - info->has_pending_iocp = 0; - } else { - info->cb = cb; - info->opaque = opaque; - } - gpr_mu_unlock(&socket->state_mu); - if (run_now) cb(opaque, 1); + GPR_ASSERT (!info->cb); + gpr_mu_lock (&socket->state_mu); + if (info->has_pending_iocp) + { + run_now = 1; + info->has_pending_iocp = 0; + } + else + { + info->cb = cb; + info->opaque = opaque; + } + gpr_mu_unlock (&socket->state_mu); + if (run_now) + cb (opaque, 1); } -void grpc_socket_notify_on_write(grpc_winsocket *socket, - void (*cb)(void *, int), void *opaque) { - socket_notify_on_iocp(socket, cb, opaque, &socket->write_info); +void +grpc_socket_notify_on_write (grpc_winsocket * socket, void (*cb) (void *, int), void *opaque) +{ + socket_notify_on_iocp (socket, cb, opaque, &socket->write_info); } -void grpc_socket_notify_on_read(grpc_winsocket *socket, void (*cb)(void *, int), - void *opaque) { - socket_notify_on_iocp(socket, cb, opaque, &socket->read_info); +void +grpc_socket_notify_on_read (grpc_winsocket * socket, void (*cb) (void *, int), void *opaque) +{ + socket_notify_on_iocp (socket, cb, opaque, &socket->read_info); } #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/iocp_windows.h b/src/core/iomgr/iocp_windows.h index 7d2dc45176b..972378f1db8 100644 --- a/src/core/iomgr/iocp_windows.h +++ b/src/core/iomgr/iocp_windows.h @@ -38,15 +38,13 @@ #include "src/core/iomgr/socket_windows.h" -void grpc_iocp_init(void); -void grpc_iocp_kick(void); -void grpc_iocp_shutdown(void); -void grpc_iocp_add_socket(grpc_winsocket *); +void grpc_iocp_init (void); +void grpc_iocp_kick (void); +void grpc_iocp_shutdown (void); +void grpc_iocp_add_socket (grpc_winsocket *); -void grpc_socket_notify_on_write(grpc_winsocket *, - void (*cb)(void *, int success), void *opaque); +void grpc_socket_notify_on_write (grpc_winsocket *, void (*cb) (void *, int success), void *opaque); -void grpc_socket_notify_on_read(grpc_winsocket *, - void (*cb)(void *, int success), void *opaque); +void grpc_socket_notify_on_read (grpc_winsocket *, void (*cb) (void *, int success), void *opaque); #endif /* GRPC_INTERNAL_CORE_IOMGR_IOCP_WINDOWS_H */ diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index f009eb3f699..20b01ed4be3 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -51,112 +51,127 @@ static gpr_cv g_rcv; static int g_shutdown; static grpc_iomgr_object g_root_object; -void grpc_kick_poller(void) { +void +grpc_kick_poller (void) +{ /* Empty. The background callback executor polls periodically. The activity * the kicker is trying to draw the executor's attention to will be picked up * either by one of the periodic wakeups or by one of the polling application * threads. */ } -void grpc_iomgr_init(void) { +void +grpc_iomgr_init (void) +{ g_shutdown = 0; - gpr_mu_init(&g_mu); - gpr_cv_init(&g_rcv); - grpc_alarm_list_init(gpr_now(GPR_CLOCK_MONOTONIC)); + gpr_mu_init (&g_mu); + gpr_cv_init (&g_rcv); + grpc_alarm_list_init (gpr_now (GPR_CLOCK_MONOTONIC)); g_root_object.next = g_root_object.prev = &g_root_object; g_root_object.name = "root"; - grpc_iomgr_platform_init(); + grpc_iomgr_platform_init (); } -static size_t count_objects(void) { +static size_t +count_objects (void) +{ grpc_iomgr_object *obj; size_t n = 0; - for (obj = g_root_object.next; obj != &g_root_object; obj = obj->next) { - n++; - } + for (obj = g_root_object.next; obj != &g_root_object; obj = obj->next) + { + n++; + } return n; } -static void dump_objects(const char *kind) { +static void +dump_objects (const char *kind) +{ grpc_iomgr_object *obj; - for (obj = g_root_object.next; obj != &g_root_object; obj = obj->next) { - gpr_log(GPR_DEBUG, "%s OBJECT: %s %p", kind, obj->name, obj); - } + for (obj = g_root_object.next; obj != &g_root_object; obj = obj->next) + { + gpr_log (GPR_DEBUG, "%s OBJECT: %s %p", kind, obj->name, obj); + } } -void grpc_iomgr_shutdown(void) { - 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); +void +grpc_iomgr_shutdown (void) +{ + 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_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - gpr_mu_lock(&g_mu); + 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 %d iomgr objects to be destroyed", - count_objects()); - } - last_warning_time = gpr_now(GPR_CLOCK_REALTIME); - } - if (grpc_alarm_check(gpr_inf_future(GPR_CLOCK_MONOTONIC), NULL, - &closure_list)) { - gpr_mu_unlock(&g_mu); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(&g_mu); - continue; - } - if (g_root_object.next != &g_root_object) { - int timeout = 0; - 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) { - timeout = 1; - break; - } - } - if (timeout && g_root_object.next != &g_root_object) { - gpr_log(GPR_DEBUG, - "Failed to free %d iomgr objects before shutdown deadline: " - "memory leaks are likely", - count_objects()); - dump_objects("LEAKED"); - break; - } + 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 %d iomgr objects to be destroyed", count_objects ()); + } + last_warning_time = gpr_now (GPR_CLOCK_REALTIME); + } + if (grpc_alarm_check (gpr_inf_future (GPR_CLOCK_MONOTONIC), NULL, &closure_list)) + { + gpr_mu_unlock (&g_mu); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (&g_mu); + continue; + } + if (g_root_object.next != &g_root_object) + { + int timeout = 0; + 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) + { + timeout = 1; + break; + } + } + if (timeout && g_root_object.next != &g_root_object) + { + gpr_log (GPR_DEBUG, "Failed to free %d iomgr objects before shutdown deadline: " "memory leaks are likely", count_objects ()); + dump_objects ("LEAKED"); + break; + } + } } - } - gpr_mu_unlock(&g_mu); + gpr_mu_unlock (&g_mu); - grpc_alarm_list_shutdown(&closure_list); - grpc_closure_list_run(&closure_list); + grpc_alarm_list_shutdown (&closure_list); + grpc_closure_list_run (&closure_list); /* ensure all threads have left g_mu */ - gpr_mu_lock(&g_mu); - gpr_mu_unlock(&g_mu); + gpr_mu_lock (&g_mu); + gpr_mu_unlock (&g_mu); - grpc_iomgr_platform_shutdown(); - gpr_mu_destroy(&g_mu); - gpr_cv_destroy(&g_rcv); + grpc_iomgr_platform_shutdown (); + gpr_mu_destroy (&g_mu); + gpr_cv_destroy (&g_rcv); } -void grpc_iomgr_register_object(grpc_iomgr_object *obj, const char *name) { - obj->name = gpr_strdup(name); - gpr_mu_lock(&g_mu); +void +grpc_iomgr_register_object (grpc_iomgr_object * obj, const char *name) +{ + obj->name = gpr_strdup (name); + gpr_mu_lock (&g_mu); obj->next = &g_root_object; obj->prev = g_root_object.prev; obj->next->prev = obj->prev->next = obj; - gpr_mu_unlock(&g_mu); + gpr_mu_unlock (&g_mu); } -void grpc_iomgr_unregister_object(grpc_iomgr_object *obj) { - gpr_mu_lock(&g_mu); +void +grpc_iomgr_unregister_object (grpc_iomgr_object * obj) +{ + gpr_mu_lock (&g_mu); obj->next->prev = obj->prev; obj->prev->next = obj->next; - gpr_cv_signal(&g_rcv); - gpr_mu_unlock(&g_mu); - gpr_free(obj->name); + gpr_cv_signal (&g_rcv); + gpr_mu_unlock (&g_mu); + gpr_free (obj->name); } diff --git a/src/core/iomgr/iomgr.h b/src/core/iomgr/iomgr.h index c9ea84c6050..dc9f3c9b4ea 100644 --- a/src/core/iomgr/iomgr.h +++ b/src/core/iomgr/iomgr.h @@ -35,9 +35,9 @@ #define GRPC_INTERNAL_CORE_IOMGR_IOMGR_H /** Initializes the iomgr. */ -void grpc_iomgr_init(void); +void grpc_iomgr_init (void); /** Signals the intention to shutdown the iomgr. */ -void grpc_iomgr_shutdown(void); +void grpc_iomgr_shutdown (void); #endif /* GRPC_INTERNAL_CORE_IOMGR_IOMGR_H */ diff --git a/src/core/iomgr/iomgr_internal.h b/src/core/iomgr/iomgr_internal.h index f266732c96b..9793734722b 100644 --- a/src/core/iomgr/iomgr_internal.h +++ b/src/core/iomgr/iomgr_internal.h @@ -37,16 +37,17 @@ #include "src/core/iomgr/iomgr.h" #include -typedef struct grpc_iomgr_object { +typedef struct grpc_iomgr_object +{ char *name; struct grpc_iomgr_object *next; struct grpc_iomgr_object *prev; } grpc_iomgr_object; -void grpc_iomgr_register_object(grpc_iomgr_object *obj, const char *name); -void grpc_iomgr_unregister_object(grpc_iomgr_object *obj); +void grpc_iomgr_register_object (grpc_iomgr_object * obj, const char *name); +void grpc_iomgr_unregister_object (grpc_iomgr_object * obj); -void grpc_iomgr_platform_init(void); -void grpc_iomgr_platform_shutdown(void); +void grpc_iomgr_platform_init (void); +void grpc_iomgr_platform_shutdown (void); #endif /* GRPC_INTERNAL_CORE_IOMGR_IOMGR_INTERNAL_H */ diff --git a/src/core/iomgr/iomgr_posix.c b/src/core/iomgr/iomgr_posix.c index 2425e599415..5bc7b0eca30 100644 --- a/src/core/iomgr/iomgr_posix.c +++ b/src/core/iomgr/iomgr_posix.c @@ -40,15 +40,19 @@ #include "src/core/iomgr/fd_posix.h" #include "src/core/iomgr/tcp_posix.h" -void grpc_iomgr_platform_init(void) { - grpc_fd_global_init(); - grpc_pollset_global_init(); - grpc_register_tracer("tcp", &grpc_tcp_trace); +void +grpc_iomgr_platform_init (void) +{ + grpc_fd_global_init (); + grpc_pollset_global_init (); + grpc_register_tracer ("tcp", &grpc_tcp_trace); } -void grpc_iomgr_platform_shutdown(void) { - grpc_pollset_global_shutdown(); - grpc_fd_global_shutdown(); +void +grpc_iomgr_platform_shutdown (void) +{ + grpc_pollset_global_shutdown (); + grpc_fd_global_shutdown (); } #endif /* GRPC_POSIX_SOCKET */ diff --git a/src/core/iomgr/iomgr_posix.h b/src/core/iomgr/iomgr_posix.h index 716fedb6368..6725523a8bb 100644 --- a/src/core/iomgr/iomgr_posix.h +++ b/src/core/iomgr/iomgr_posix.h @@ -36,7 +36,7 @@ #include "src/core/iomgr/iomgr_internal.h" -void grpc_pollset_global_init(void); -void grpc_pollset_global_shutdown(void); +void grpc_pollset_global_init (void); +void grpc_pollset_global_shutdown (void); #endif /* GRPC_INTERNAL_CORE_IOMGR_IOMGR_POSIX_H */ diff --git a/src/core/iomgr/iomgr_windows.c b/src/core/iomgr/iomgr_windows.c index b49cb87e97b..4b2e154d0df 100644 --- a/src/core/iomgr/iomgr_windows.c +++ b/src/core/iomgr/iomgr_windows.c @@ -47,25 +47,33 @@ ports. All of what we're doing here is basically make sure that Windows sockets are initialized in and out. */ -static void winsock_init(void) { +static void +winsock_init (void) +{ WSADATA wsaData; - int status = WSAStartup(MAKEWORD(2, 0), &wsaData); - GPR_ASSERT(status == 0); + int status = WSAStartup (MAKEWORD (2, 0), &wsaData); + GPR_ASSERT (status == 0); } -static void winsock_shutdown(void) { - int status = WSACleanup(); - GPR_ASSERT(status == 0); +static void +winsock_shutdown (void) +{ + int status = WSACleanup (); + GPR_ASSERT (status == 0); } -void grpc_iomgr_platform_init(void) { - winsock_init(); - grpc_iocp_init(); +void +grpc_iomgr_platform_init (void) +{ + winsock_init (); + grpc_iocp_init (); } -void grpc_iomgr_platform_shutdown(void) { - grpc_iocp_shutdown(); - winsock_shutdown(); +void +grpc_iomgr_platform_shutdown (void) +{ + grpc_iocp_shutdown (); + winsock_shutdown (); } #endif /* GRPC_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/pollset.h b/src/core/iomgr/pollset.h index b5d71bfb4ca..f17a85d8a84 100644 --- a/src/core/iomgr/pollset.h +++ b/src/core/iomgr/pollset.h @@ -54,10 +54,9 @@ #include "src/core/iomgr/pollset_windows.h" #endif -void grpc_pollset_init(grpc_pollset *pollset); -void grpc_pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure, - grpc_closure_list *closure_list); -void grpc_pollset_destroy(grpc_pollset *pollset); +void grpc_pollset_init (grpc_pollset * pollset); +void grpc_pollset_shutdown (grpc_pollset * pollset, grpc_closure * closure, grpc_closure_list * closure_list); +void grpc_pollset_destroy (grpc_pollset * pollset); /* Do some work on a pollset. May involve invoking asynchronous callbacks, or actually polling file @@ -77,14 +76,11 @@ void grpc_pollset_destroy(grpc_pollset *pollset); May call grpc_closure_list_run on grpc_closure_list, without holding the pollset lock */ -void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, - gpr_timespec now, gpr_timespec deadline, - grpc_closure_list *closure_list); +void grpc_pollset_work (grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec now, gpr_timespec deadline, grpc_closure_list * closure_list); /* Break one polling thread out of polling work for this pollset. If specific_worker is GRPC_POLLSET_KICK_BROADCAST, kick ALL the workers. Otherwise, if specific_worker is non-NULL, then kick that worker. */ -void grpc_pollset_kick(grpc_pollset *pollset, - grpc_pollset_worker *specific_worker); +void grpc_pollset_kick (grpc_pollset * pollset, grpc_pollset_worker * specific_worker); #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_H */ diff --git a/src/core/iomgr/pollset_multipoller_with_epoll.c b/src/core/iomgr/pollset_multipoller_with_epoll.c index a83086572e1..2f824882a6d 100644 --- a/src/core/iomgr/pollset_multipoller_with_epoll.c +++ b/src/core/iomgr/pollset_multipoller_with_epoll.c @@ -45,24 +45,28 @@ #include #include -typedef struct wakeup_fd_hdl { +typedef struct wakeup_fd_hdl +{ grpc_wakeup_fd wakeup_fd; struct wakeup_fd_hdl *next; } wakeup_fd_hdl; -typedef struct { +typedef struct +{ grpc_pollset *pollset; grpc_fd *fd; grpc_closure closure; } delayed_add; -typedef struct { +typedef struct +{ int epoll_fd; wakeup_fd_hdl *free_wakeup_fds; } pollset_hdr; -static void finally_add_fd(grpc_pollset *pollset, grpc_fd *fd, - grpc_closure_list *closure_list) { +static void +finally_add_fd (grpc_pollset * pollset, grpc_fd * fd, grpc_closure_list * closure_list) +{ pollset_hdr *h = pollset->data.ptr; struct epoll_event ev; int err; @@ -71,88 +75,98 @@ static void finally_add_fd(grpc_pollset *pollset, grpc_fd *fd, /* We pretend to be polling whilst adding an fd to keep the fd from being closed during the add. This may result in a spurious wakeup being assigned to this pollset whilst adding, but that should be benign. */ - GPR_ASSERT(grpc_fd_begin_poll(fd, pollset, 0, 0, &watcher) == 0); - if (watcher.fd != NULL) { - ev.events = (uint32_t)(EPOLLIN | EPOLLOUT | EPOLLET); - ev.data.ptr = fd; - err = epoll_ctl(h->epoll_fd, EPOLL_CTL_ADD, fd->fd, &ev); - if (err < 0) { - /* FDs may be added to a pollset multiple times, so EEXIST is normal. */ - if (errno != EEXIST) { - gpr_log(GPR_ERROR, "epoll_ctl add for %d failed: %s", fd->fd, - strerror(errno)); - } + GPR_ASSERT (grpc_fd_begin_poll (fd, pollset, 0, 0, &watcher) == 0); + if (watcher.fd != NULL) + { + ev.events = (uint32_t) (EPOLLIN | EPOLLOUT | EPOLLET); + ev.data.ptr = fd; + err = epoll_ctl (h->epoll_fd, EPOLL_CTL_ADD, fd->fd, &ev); + if (err < 0) + { + /* FDs may be added to a pollset multiple times, so EEXIST is normal. */ + if (errno != EEXIST) + { + gpr_log (GPR_ERROR, "epoll_ctl add for %d failed: %s", fd->fd, strerror (errno)); + } + } } - } - grpc_fd_end_poll(&watcher, 0, 0, closure_list); + grpc_fd_end_poll (&watcher, 0, 0, closure_list); } -static void perform_delayed_add(void *arg, int iomgr_status, - grpc_closure_list *closure_list) { +static void +perform_delayed_add (void *arg, int iomgr_status, grpc_closure_list * closure_list) +{ delayed_add *da = arg; - if (!grpc_fd_is_orphaned(da->fd)) { - finally_add_fd(da->pollset, da->fd, closure_list); - } + if (!grpc_fd_is_orphaned (da->fd)) + { + finally_add_fd (da->pollset, da->fd, closure_list); + } - gpr_mu_lock(&da->pollset->mu); + gpr_mu_lock (&da->pollset->mu); da->pollset->in_flight_cbs--; - if (da->pollset->shutting_down) { - /* We don't care about this pollset anymore. */ - if (da->pollset->in_flight_cbs == 0 && !da->pollset->called_shutdown) { - da->pollset->called_shutdown = 1; - grpc_closure_list_add(closure_list, da->pollset->shutdown_done, 1); + if (da->pollset->shutting_down) + { + /* We don't care about this pollset anymore. */ + if (da->pollset->in_flight_cbs == 0 && !da->pollset->called_shutdown) + { + da->pollset->called_shutdown = 1; + grpc_closure_list_add (closure_list, da->pollset->shutdown_done, 1); + } } - } - gpr_mu_unlock(&da->pollset->mu); + gpr_mu_unlock (&da->pollset->mu); - GRPC_FD_UNREF(da->fd, "delayed_add"); + GRPC_FD_UNREF (da->fd, "delayed_add"); - gpr_free(da); + gpr_free (da); } -static void multipoll_with_epoll_pollset_add_fd( - grpc_pollset *pollset, grpc_fd *fd, int and_unlock_pollset, - grpc_closure_list *closure_list) { - if (and_unlock_pollset) { - gpr_mu_unlock(&pollset->mu); - finally_add_fd(pollset, fd, closure_list); - } else { - delayed_add *da = gpr_malloc(sizeof(*da)); - da->pollset = pollset; - da->fd = fd; - GRPC_FD_REF(fd, "delayed_add"); - grpc_closure_init(&da->closure, perform_delayed_add, da); - pollset->in_flight_cbs++; - grpc_closure_list_add(closure_list, &da->closure, 1); - } +static void +multipoll_with_epoll_pollset_add_fd (grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list) +{ + if (and_unlock_pollset) + { + gpr_mu_unlock (&pollset->mu); + finally_add_fd (pollset, fd, closure_list); + } + else + { + delayed_add *da = gpr_malloc (sizeof (*da)); + da->pollset = pollset; + da->fd = fd; + GRPC_FD_REF (fd, "delayed_add"); + grpc_closure_init (&da->closure, perform_delayed_add, da); + pollset->in_flight_cbs++; + grpc_closure_list_add (closure_list, &da->closure, 1); + } } -static void multipoll_with_epoll_pollset_del_fd( - grpc_pollset *pollset, grpc_fd *fd, int and_unlock_pollset, - grpc_closure_list *closure_list) { +static void +multipoll_with_epoll_pollset_del_fd (grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list) +{ pollset_hdr *h = pollset->data.ptr; int err; - if (and_unlock_pollset) { - gpr_mu_unlock(&pollset->mu); - } + if (and_unlock_pollset) + { + gpr_mu_unlock (&pollset->mu); + } /* Note that this can race with concurrent poll, but that should be fine since * at worst it creates a spurious read event on a reused grpc_fd object. */ - err = epoll_ctl(h->epoll_fd, EPOLL_CTL_DEL, fd->fd, NULL); - if (err < 0) { - gpr_log(GPR_ERROR, "epoll_ctl del for %d failed: %s", fd->fd, - strerror(errno)); - } + err = epoll_ctl (h->epoll_fd, EPOLL_CTL_DEL, fd->fd, NULL); + if (err < 0) + { + gpr_log (GPR_ERROR, "epoll_ctl del for %d failed: %s", fd->fd, strerror (errno)); + } } /* TODO(klempner): We probably want to turn this down a bit */ #define GRPC_EPOLL_MAX_EVENTS 1000 -static void multipoll_with_epoll_pollset_maybe_work_and_unlock( - grpc_pollset *pollset, grpc_pollset_worker *worker, gpr_timespec deadline, - gpr_timespec now, grpc_closure_list *closure_list) { +static void +multipoll_with_epoll_pollset_maybe_work_and_unlock (grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now, grpc_closure_list * closure_list) +{ struct epoll_event ep_ev[GRPC_EPOLL_MAX_EVENTS]; int ep_rv; int poll_rv; @@ -166,93 +180,116 @@ static void multipoll_with_epoll_pollset_maybe_work_and_unlock( * here. */ - gpr_mu_unlock(&pollset->mu); + gpr_mu_unlock (&pollset->mu); - timeout_ms = grpc_poll_deadline_to_millis_timeout(deadline, now); + timeout_ms = grpc_poll_deadline_to_millis_timeout (deadline, now); - pfds[0].fd = GRPC_WAKEUP_FD_GET_READ_FD(&worker->wakeup_fd); + pfds[0].fd = GRPC_WAKEUP_FD_GET_READ_FD (&worker->wakeup_fd); pfds[0].events = POLLIN; pfds[0].revents = 0; pfds[1].fd = h->epoll_fd; pfds[1].events = POLLIN; pfds[1].revents = 0; - poll_rv = grpc_poll_function(pfds, 2, timeout_ms); + poll_rv = grpc_poll_function (pfds, 2, timeout_ms); - if (poll_rv < 0) { - if (errno != EINTR) { - gpr_log(GPR_ERROR, "poll() failed: %s", strerror(errno)); + if (poll_rv < 0) + { + if (errno != EINTR) + { + gpr_log (GPR_ERROR, "poll() failed: %s", strerror (errno)); + } } - } else if (poll_rv == 0) { - /* do nothing */ - } else { - if (pfds[0].revents) { - grpc_wakeup_fd_consume_wakeup(&worker->wakeup_fd); + else if (poll_rv == 0) + { + /* do nothing */ } - if (pfds[1].revents) { - do { - ep_rv = epoll_wait(h->epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS, 0); - if (ep_rv < 0) { - if (errno != EINTR) { - gpr_log(GPR_ERROR, "epoll_wait() failed: %s", strerror(errno)); - } - } else { - int i; - for (i = 0; i < ep_rv; ++i) { - grpc_fd *fd = ep_ev[i].data.ptr; - /* TODO(klempner): We might want to consider making err and pri - * separate events */ - int cancel = ep_ev[i].events & (EPOLLERR | EPOLLHUP); - int read = ep_ev[i].events & (EPOLLIN | EPOLLPRI); - int write = ep_ev[i].events & EPOLLOUT; - if (read || cancel) { - grpc_fd_become_readable(fd, closure_list); - } - if (write || cancel) { - grpc_fd_become_writable(fd, closure_list); - } - } - } - } while (ep_rv == GRPC_EPOLL_MAX_EVENTS); + else + { + if (pfds[0].revents) + { + grpc_wakeup_fd_consume_wakeup (&worker->wakeup_fd); + } + if (pfds[1].revents) + { + do + { + ep_rv = epoll_wait (h->epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS, 0); + if (ep_rv < 0) + { + if (errno != EINTR) + { + gpr_log (GPR_ERROR, "epoll_wait() failed: %s", strerror (errno)); + } + } + else + { + int i; + for (i = 0; i < ep_rv; ++i) + { + grpc_fd *fd = ep_ev[i].data.ptr; + /* TODO(klempner): We might want to consider making err and pri + * separate events */ + int cancel = ep_ev[i].events & (EPOLLERR | EPOLLHUP); + int read = ep_ev[i].events & (EPOLLIN | EPOLLPRI); + int write = ep_ev[i].events & EPOLLOUT; + if (read || cancel) + { + grpc_fd_become_readable (fd, closure_list); + } + if (write || cancel) + { + grpc_fd_become_writable (fd, closure_list); + } + } + } + } + while (ep_rv == GRPC_EPOLL_MAX_EVENTS); + } } - } } -static void multipoll_with_epoll_pollset_finish_shutdown( - grpc_pollset *pollset) {} +static void +multipoll_with_epoll_pollset_finish_shutdown (grpc_pollset * pollset) +{ +} -static void multipoll_with_epoll_pollset_destroy(grpc_pollset *pollset) { +static void +multipoll_with_epoll_pollset_destroy (grpc_pollset * pollset) +{ pollset_hdr *h = pollset->data.ptr; - close(h->epoll_fd); - gpr_free(h); + close (h->epoll_fd); + gpr_free (h); } static const grpc_pollset_vtable multipoll_with_epoll_pollset = { - multipoll_with_epoll_pollset_add_fd, multipoll_with_epoll_pollset_del_fd, - multipoll_with_epoll_pollset_maybe_work_and_unlock, - multipoll_with_epoll_pollset_finish_shutdown, - multipoll_with_epoll_pollset_destroy}; - -static void epoll_become_multipoller(grpc_pollset *pollset, grpc_fd **fds, - size_t nfds, - grpc_closure_list *closure_list) { + multipoll_with_epoll_pollset_add_fd, multipoll_with_epoll_pollset_del_fd, + multipoll_with_epoll_pollset_maybe_work_and_unlock, + multipoll_with_epoll_pollset_finish_shutdown, + multipoll_with_epoll_pollset_destroy +}; + +static void +epoll_become_multipoller (grpc_pollset * pollset, grpc_fd ** fds, size_t nfds, grpc_closure_list * closure_list) +{ size_t i; - pollset_hdr *h = gpr_malloc(sizeof(pollset_hdr)); + pollset_hdr *h = gpr_malloc (sizeof (pollset_hdr)); pollset->vtable = &multipoll_with_epoll_pollset; pollset->data.ptr = h; - h->epoll_fd = epoll_create1(EPOLL_CLOEXEC); - if (h->epoll_fd < 0) { - /* TODO(klempner): Fall back to poll here, especially on ENOSYS */ - gpr_log(GPR_ERROR, "epoll_create1 failed: %s", strerror(errno)); - abort(); - } - for (i = 0; i < nfds; i++) { - multipoll_with_epoll_pollset_add_fd(pollset, fds[i], 0, closure_list); - } + h->epoll_fd = epoll_create1 (EPOLL_CLOEXEC); + if (h->epoll_fd < 0) + { + /* TODO(klempner): Fall back to poll here, especially on ENOSYS */ + gpr_log (GPR_ERROR, "epoll_create1 failed: %s", strerror (errno)); + abort (); + } + for (i = 0; i < nfds; i++) + { + multipoll_with_epoll_pollset_add_fd (pollset, fds[i], 0, closure_list); + } } -grpc_platform_become_multipoller_type grpc_platform_become_multipoller = - epoll_become_multipoller; +grpc_platform_become_multipoller_type grpc_platform_become_multipoller = epoll_become_multipoller; #endif /* GPR_LINUX_MULTIPOLL_WITH_EPOLL */ diff --git a/src/core/iomgr/pollset_multipoller_with_poll_posix.c b/src/core/iomgr/pollset_multipoller_with_poll_posix.c index a3aa7e69fac..9e3f6d2a0e7 100644 --- a/src/core/iomgr/pollset_multipoller_with_poll_posix.c +++ b/src/core/iomgr/pollset_multipoller_with_poll_posix.c @@ -48,7 +48,8 @@ #include #include -typedef struct { +typedef struct +{ /* all polled fds */ size_t fd_count; size_t fd_capacity; @@ -59,46 +60,52 @@ typedef struct { grpc_fd **dels; } pollset_hdr; -static void multipoll_with_poll_pollset_add_fd( - grpc_pollset *pollset, grpc_fd *fd, int and_unlock_pollset, - grpc_closure_list *closure_list) { +static void +multipoll_with_poll_pollset_add_fd (grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list) +{ size_t i; pollset_hdr *h = pollset->data.ptr; /* TODO(ctiller): this is O(num_fds^2); maybe switch to a hash set here */ - for (i = 0; i < h->fd_count; i++) { - if (h->fds[i] == fd) goto exit; - } - if (h->fd_count == h->fd_capacity) { - h->fd_capacity = GPR_MAX(h->fd_capacity + 8, h->fd_count * 3 / 2); - h->fds = gpr_realloc(h->fds, sizeof(grpc_fd *) * h->fd_capacity); - } + for (i = 0; i < h->fd_count; i++) + { + if (h->fds[i] == fd) + goto exit; + } + if (h->fd_count == h->fd_capacity) + { + h->fd_capacity = GPR_MAX (h->fd_capacity + 8, h->fd_count * 3 / 2); + h->fds = gpr_realloc (h->fds, sizeof (grpc_fd *) * h->fd_capacity); + } h->fds[h->fd_count++] = fd; - GRPC_FD_REF(fd, "multipoller"); + GRPC_FD_REF (fd, "multipoller"); exit: - if (and_unlock_pollset) { - gpr_mu_unlock(&pollset->mu); - } + if (and_unlock_pollset) + { + gpr_mu_unlock (&pollset->mu); + } } -static void multipoll_with_poll_pollset_del_fd( - grpc_pollset *pollset, grpc_fd *fd, int and_unlock_pollset, - grpc_closure_list *closure_list) { +static void +multipoll_with_poll_pollset_del_fd (grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list) +{ /* will get removed next poll cycle */ pollset_hdr *h = pollset->data.ptr; - if (h->del_count == h->del_capacity) { - h->del_capacity = GPR_MAX(h->del_capacity + 8, h->del_count * 3 / 2); - h->dels = gpr_realloc(h->dels, sizeof(grpc_fd *) * h->del_capacity); - } + if (h->del_count == h->del_capacity) + { + h->del_capacity = GPR_MAX (h->del_capacity + 8, h->del_count * 3 / 2); + h->dels = gpr_realloc (h->dels, sizeof (grpc_fd *) * h->del_capacity); + } h->dels[h->del_count++] = fd; - GRPC_FD_REF(fd, "multipoller_del"); - if (and_unlock_pollset) { - gpr_mu_unlock(&pollset->mu); - } + GRPC_FD_REF (fd, "multipoller_del"); + if (and_unlock_pollset) + { + gpr_mu_unlock (&pollset->mu); + } } -static void multipoll_with_poll_pollset_maybe_work_and_unlock( - grpc_pollset *pollset, grpc_pollset_worker *worker, gpr_timespec deadline, - gpr_timespec now, grpc_closure_list *closure_list) { +static void +multipoll_with_poll_pollset_maybe_work_and_unlock (grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now, grpc_closure_list * closure_list) +{ int timeout; int r; size_t i, j, fd_count; @@ -109,125 +116,150 @@ static void multipoll_with_poll_pollset_maybe_work_and_unlock( struct pollfd *pfds; h = pollset->data.ptr; - timeout = grpc_poll_deadline_to_millis_timeout(deadline, now); + timeout = grpc_poll_deadline_to_millis_timeout (deadline, now); /* TODO(ctiller): perform just one malloc here if we exceed the inline case */ - pfds = gpr_malloc(sizeof(*pfds) * (h->fd_count + 1)); - watchers = gpr_malloc(sizeof(*watchers) * (h->fd_count + 1)); + pfds = gpr_malloc (sizeof (*pfds) * (h->fd_count + 1)); + watchers = gpr_malloc (sizeof (*watchers) * (h->fd_count + 1)); fd_count = 0; pfd_count = 1; - pfds[0].fd = GRPC_WAKEUP_FD_GET_READ_FD(&worker->wakeup_fd); + pfds[0].fd = GRPC_WAKEUP_FD_GET_READ_FD (&worker->wakeup_fd); pfds[0].events = POLLIN; pfds[0].revents = POLLOUT; - for (i = 0; i < h->fd_count; i++) { - int remove = grpc_fd_is_orphaned(h->fds[i]); - for (j = 0; !remove && j < h->del_count; j++) { - if (h->fds[i] == h->dels[j]) remove = 1; + for (i = 0; i < h->fd_count; i++) + { + int remove = grpc_fd_is_orphaned (h->fds[i]); + for (j = 0; !remove && j < h->del_count; j++) + { + if (h->fds[i] == h->dels[j]) + remove = 1; + } + if (remove) + { + GRPC_FD_UNREF (h->fds[i], "multipoller"); + } + else + { + h->fds[fd_count++] = h->fds[i]; + watchers[pfd_count].fd = h->fds[i]; + pfds[pfd_count].fd = h->fds[i]->fd; + pfds[pfd_count].revents = 0; + pfd_count++; + } } - if (remove) { - GRPC_FD_UNREF(h->fds[i], "multipoller"); - } else { - h->fds[fd_count++] = h->fds[i]; - watchers[pfd_count].fd = h->fds[i]; - pfds[pfd_count].fd = h->fds[i]->fd; - pfds[pfd_count].revents = 0; - pfd_count++; + for (j = 0; j < h->del_count; j++) + { + GRPC_FD_UNREF (h->dels[j], "multipoller_del"); } - } - for (j = 0; j < h->del_count; j++) { - GRPC_FD_UNREF(h->dels[j], "multipoller_del"); - } h->del_count = 0; h->fd_count = fd_count; - gpr_mu_unlock(&pollset->mu); + gpr_mu_unlock (&pollset->mu); - for (i = 1; i < pfd_count; i++) { - pfds[i].events = (short)grpc_fd_begin_poll(watchers[i].fd, pollset, POLLIN, - POLLOUT, &watchers[i]); - } + for (i = 1; i < pfd_count; i++) + { + pfds[i].events = (short) grpc_fd_begin_poll (watchers[i].fd, pollset, POLLIN, POLLOUT, &watchers[i]); + } - r = grpc_poll_function(pfds, pfd_count, timeout); + r = grpc_poll_function (pfds, pfd_count, timeout); - for (i = 1; i < pfd_count; i++) { - grpc_fd_end_poll(&watchers[i], pfds[i].revents & POLLIN, - pfds[i].revents & POLLOUT, closure_list); - } + for (i = 1; i < pfd_count; i++) + { + grpc_fd_end_poll (&watchers[i], pfds[i].revents & POLLIN, pfds[i].revents & POLLOUT, closure_list); + } - if (r < 0) { - if (errno != EINTR) { - gpr_log(GPR_ERROR, "poll() failed: %s", strerror(errno)); + if (r < 0) + { + if (errno != EINTR) + { + gpr_log (GPR_ERROR, "poll() failed: %s", strerror (errno)); + } } - } else if (r == 0) { - /* do nothing */ - } else { - if (pfds[0].revents & POLLIN) { - grpc_wakeup_fd_consume_wakeup(&worker->wakeup_fd); + else if (r == 0) + { + /* do nothing */ } - for (i = 1; i < pfd_count; i++) { - if (watchers[i].fd == NULL) { - continue; - } - if (pfds[i].revents & (POLLIN | POLLHUP | POLLERR)) { - grpc_fd_become_readable(watchers[i].fd, closure_list); - } - if (pfds[i].revents & (POLLOUT | POLLHUP | POLLERR)) { - grpc_fd_become_writable(watchers[i].fd, closure_list); - } + else + { + if (pfds[0].revents & POLLIN) + { + grpc_wakeup_fd_consume_wakeup (&worker->wakeup_fd); + } + for (i = 1; i < pfd_count; i++) + { + if (watchers[i].fd == NULL) + { + continue; + } + if (pfds[i].revents & (POLLIN | POLLHUP | POLLERR)) + { + grpc_fd_become_readable (watchers[i].fd, closure_list); + } + if (pfds[i].revents & (POLLOUT | POLLHUP | POLLERR)) + { + grpc_fd_become_writable (watchers[i].fd, closure_list); + } + } } - } - gpr_free(pfds); - gpr_free(watchers); + gpr_free (pfds); + gpr_free (watchers); } -static void multipoll_with_poll_pollset_finish_shutdown(grpc_pollset *pollset) { +static void +multipoll_with_poll_pollset_finish_shutdown (grpc_pollset * pollset) +{ size_t i; pollset_hdr *h = pollset->data.ptr; - for (i = 0; i < h->fd_count; i++) { - GRPC_FD_UNREF(h->fds[i], "multipoller"); - } - for (i = 0; i < h->del_count; i++) { - GRPC_FD_UNREF(h->dels[i], "multipoller_del"); - } + for (i = 0; i < h->fd_count; i++) + { + GRPC_FD_UNREF (h->fds[i], "multipoller"); + } + for (i = 0; i < h->del_count; i++) + { + GRPC_FD_UNREF (h->dels[i], "multipoller_del"); + } h->fd_count = 0; h->del_count = 0; } -static void multipoll_with_poll_pollset_destroy(grpc_pollset *pollset) { +static void +multipoll_with_poll_pollset_destroy (grpc_pollset * pollset) +{ pollset_hdr *h = pollset->data.ptr; - multipoll_with_poll_pollset_finish_shutdown(pollset); - gpr_free(h->fds); - gpr_free(h->dels); - gpr_free(h); + multipoll_with_poll_pollset_finish_shutdown (pollset); + gpr_free (h->fds); + gpr_free (h->dels); + gpr_free (h); } static const grpc_pollset_vtable multipoll_with_poll_pollset = { - multipoll_with_poll_pollset_add_fd, multipoll_with_poll_pollset_del_fd, - multipoll_with_poll_pollset_maybe_work_and_unlock, - multipoll_with_poll_pollset_finish_shutdown, - multipoll_with_poll_pollset_destroy}; - -void grpc_poll_become_multipoller(grpc_pollset *pollset, grpc_fd **fds, - size_t nfds, - grpc_closure_list *closure_list) { + multipoll_with_poll_pollset_add_fd, multipoll_with_poll_pollset_del_fd, + multipoll_with_poll_pollset_maybe_work_and_unlock, + multipoll_with_poll_pollset_finish_shutdown, + multipoll_with_poll_pollset_destroy +}; + +void +grpc_poll_become_multipoller (grpc_pollset * pollset, grpc_fd ** fds, size_t nfds, grpc_closure_list * closure_list) +{ size_t i; - pollset_hdr *h = gpr_malloc(sizeof(pollset_hdr)); + pollset_hdr *h = gpr_malloc (sizeof (pollset_hdr)); pollset->vtable = &multipoll_with_poll_pollset; pollset->data.ptr = h; h->fd_count = nfds; h->fd_capacity = nfds; - h->fds = gpr_malloc(nfds * sizeof(grpc_fd *)); + h->fds = gpr_malloc (nfds * sizeof (grpc_fd *)); h->del_count = 0; h->del_capacity = 0; h->dels = NULL; - for (i = 0; i < nfds; i++) { - h->fds[i] = fds[i]; - GRPC_FD_REF(fds[i], "multipoller"); - } + for (i = 0; i < nfds; i++) + { + h->fds[i] = fds[i]; + GRPC_FD_REF (fds[i], "multipoller"); + } } #endif /* GPR_POSIX_SOCKET */ #ifdef GPR_POSIX_MULTIPOLL_WITH_POLL -grpc_platform_become_multipoller_type grpc_platform_become_multipoller = - grpc_poll_become_multipoller; +grpc_platform_become_multipoller_type grpc_platform_become_multipoller = grpc_poll_become_multipoller; #endif diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 82ef0298a23..93ab7faa302 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -53,235 +53,281 @@ #include #include -GPR_TLS_DECL(g_current_thread_poller); -GPR_TLS_DECL(g_current_thread_worker); +GPR_TLS_DECL (g_current_thread_poller); +GPR_TLS_DECL (g_current_thread_worker); grpc_poll_function_type grpc_poll_function = poll; -static void remove_worker(grpc_pollset *p, grpc_pollset_worker *worker) { +static void +remove_worker (grpc_pollset * p, grpc_pollset_worker * worker) +{ worker->prev->next = worker->next; worker->next->prev = worker->prev; } -int grpc_pollset_has_workers(grpc_pollset *p) { +int +grpc_pollset_has_workers (grpc_pollset * p) +{ return p->root_worker.next != &p->root_worker; } -static grpc_pollset_worker *pop_front_worker(grpc_pollset *p) { - if (grpc_pollset_has_workers(p)) { - grpc_pollset_worker *w = p->root_worker.next; - remove_worker(p, w); - return w; - } else { - return NULL; - } +static grpc_pollset_worker * +pop_front_worker (grpc_pollset * p) +{ + if (grpc_pollset_has_workers (p)) + { + grpc_pollset_worker *w = p->root_worker.next; + remove_worker (p, w); + return w; + } + else + { + return NULL; + } } -static void push_back_worker(grpc_pollset *p, grpc_pollset_worker *worker) { +static void +push_back_worker (grpc_pollset * p, grpc_pollset_worker * worker) +{ worker->next = &p->root_worker; worker->prev = worker->next->prev; worker->prev->next = worker->next->prev = worker; } -static void push_front_worker(grpc_pollset *p, grpc_pollset_worker *worker) { +static void +push_front_worker (grpc_pollset * p, grpc_pollset_worker * worker) +{ worker->prev = &p->root_worker; worker->next = worker->prev->next; worker->prev->next = worker->next->prev = worker; } -void grpc_pollset_kick(grpc_pollset *p, grpc_pollset_worker *specific_worker) { +void +grpc_pollset_kick (grpc_pollset * p, grpc_pollset_worker * specific_worker) +{ /* pollset->mu already held */ - if (specific_worker != NULL) { - if (specific_worker == GRPC_POLLSET_KICK_BROADCAST) { - for (specific_worker = p->root_worker.next; - specific_worker != &p->root_worker; - specific_worker = specific_worker->next) { - grpc_wakeup_fd_wakeup(&specific_worker->wakeup_fd); - } - p->kicked_without_pollers = 1; - } else if (gpr_tls_get(&g_current_thread_worker) != - (gpr_intptr)specific_worker) { - grpc_wakeup_fd_wakeup(&specific_worker->wakeup_fd); - } - } else if (gpr_tls_get(&g_current_thread_poller) != (gpr_intptr)p) { - specific_worker = pop_front_worker(p); - if (specific_worker != NULL) { - push_back_worker(p, specific_worker); - grpc_wakeup_fd_wakeup(&specific_worker->wakeup_fd); - } else { - p->kicked_without_pollers = 1; - } - } + if (specific_worker != NULL) + { + if (specific_worker == GRPC_POLLSET_KICK_BROADCAST) + { + for (specific_worker = p->root_worker.next; specific_worker != &p->root_worker; specific_worker = specific_worker->next) + { + grpc_wakeup_fd_wakeup (&specific_worker->wakeup_fd); + } + p->kicked_without_pollers = 1; + } + else if (gpr_tls_get (&g_current_thread_worker) != (gpr_intptr) specific_worker) + { + grpc_wakeup_fd_wakeup (&specific_worker->wakeup_fd); + } + } + else if (gpr_tls_get (&g_current_thread_poller) != (gpr_intptr) p) + { + specific_worker = pop_front_worker (p); + if (specific_worker != NULL) + { + push_back_worker (p, specific_worker); + grpc_wakeup_fd_wakeup (&specific_worker->wakeup_fd); + } + else + { + p->kicked_without_pollers = 1; + } + } } /* global state management */ -void grpc_pollset_global_init(void) { - gpr_tls_init(&g_current_thread_poller); - grpc_wakeup_fd_global_init(); +void +grpc_pollset_global_init (void) +{ + gpr_tls_init (&g_current_thread_poller); + grpc_wakeup_fd_global_init (); } -void grpc_pollset_global_shutdown(void) { - gpr_tls_destroy(&g_current_thread_poller); - grpc_wakeup_fd_global_destroy(); +void +grpc_pollset_global_shutdown (void) +{ + gpr_tls_destroy (&g_current_thread_poller); + grpc_wakeup_fd_global_destroy (); } /* main interface */ -static void become_basic_pollset(grpc_pollset *pollset, grpc_fd *fd_or_null); +static void become_basic_pollset (grpc_pollset * pollset, grpc_fd * fd_or_null); -void grpc_pollset_init(grpc_pollset *pollset) { - gpr_mu_init(&pollset->mu); +void +grpc_pollset_init (grpc_pollset * pollset) +{ + gpr_mu_init (&pollset->mu); pollset->root_worker.next = pollset->root_worker.prev = &pollset->root_worker; pollset->in_flight_cbs = 0; pollset->shutting_down = 0; pollset->called_shutdown = 0; pollset->idle_jobs.head = pollset->idle_jobs.tail = NULL; - become_basic_pollset(pollset, NULL); + become_basic_pollset (pollset, NULL); } -void grpc_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, - grpc_closure_list *closure_list) { - gpr_mu_lock(&pollset->mu); - pollset->vtable->add_fd(pollset, fd, 1, closure_list); +void +grpc_pollset_add_fd (grpc_pollset * pollset, grpc_fd * fd, grpc_closure_list * closure_list) +{ + gpr_mu_lock (&pollset->mu); + pollset->vtable->add_fd (pollset, fd, 1, closure_list); /* the following (enabled only in debug) will reacquire and then release our lock - meaning that if the unlocking flag passed to del_fd above is not respected, the code will deadlock (in a way that we have a chance of debugging) */ #ifndef NDEBUG - gpr_mu_lock(&pollset->mu); - gpr_mu_unlock(&pollset->mu); + gpr_mu_lock (&pollset->mu); + gpr_mu_unlock (&pollset->mu); #endif } -void grpc_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd, - grpc_closure_list *closure_list) { - gpr_mu_lock(&pollset->mu); - pollset->vtable->del_fd(pollset, fd, 1, closure_list); +void +grpc_pollset_del_fd (grpc_pollset * pollset, grpc_fd * fd, grpc_closure_list * closure_list) +{ + gpr_mu_lock (&pollset->mu); + pollset->vtable->del_fd (pollset, fd, 1, closure_list); /* the following (enabled only in debug) will reacquire and then release our lock - meaning that if the unlocking flag passed to del_fd above is not respected, the code will deadlock (in a way that we have a chance of debugging) */ #ifndef NDEBUG - gpr_mu_lock(&pollset->mu); - gpr_mu_unlock(&pollset->mu); + gpr_mu_lock (&pollset->mu); + gpr_mu_unlock (&pollset->mu); #endif } -static void finish_shutdown(grpc_pollset *pollset, - grpc_closure_list *closure_list) { - pollset->vtable->finish_shutdown(pollset); - grpc_closure_list_add(closure_list, pollset->shutdown_done, 1); +static void +finish_shutdown (grpc_pollset * pollset, grpc_closure_list * closure_list) +{ + pollset->vtable->finish_shutdown (pollset); + grpc_closure_list_add (closure_list, pollset->shutdown_done, 1); } -void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, - gpr_timespec now, gpr_timespec deadline, - grpc_closure_list *closure_list) { +void +grpc_pollset_work (grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec now, gpr_timespec deadline, grpc_closure_list * closure_list) +{ /* pollset->mu already held */ int added_worker = 0; int locked = 1; /* this must happen before we (potentially) drop pollset->mu */ worker->next = worker->prev = NULL; /* TODO(ctiller): pool these */ - grpc_wakeup_fd_init(&worker->wakeup_fd); - if (!grpc_pollset_has_workers(pollset) && - !grpc_closure_list_empty(pollset->idle_jobs)) { - grpc_closure_list_move(&pollset->idle_jobs, closure_list); - goto done; - } - if (grpc_alarm_check(now, &deadline, closure_list)) { - goto done; - } - if (pollset->shutting_down) { - goto done; - } - if (pollset->in_flight_cbs) { - /* Give do_promote priority so we don't starve it out */ - gpr_mu_unlock(&pollset->mu); - locked = 0; - goto done; - } - if (!pollset->kicked_without_pollers) { - push_front_worker(pollset, worker); - added_worker = 1; - gpr_tls_set(&g_current_thread_poller, (gpr_intptr)pollset); - pollset->vtable->maybe_work_and_unlock(pollset, worker, deadline, now, - closure_list); - locked = 0; - gpr_tls_set(&g_current_thread_poller, 0); - } else { - pollset->kicked_without_pollers = 0; - } + grpc_wakeup_fd_init (&worker->wakeup_fd); + if (!grpc_pollset_has_workers (pollset) && !grpc_closure_list_empty (pollset->idle_jobs)) + { + grpc_closure_list_move (&pollset->idle_jobs, closure_list); + goto done; + } + if (grpc_alarm_check (now, &deadline, closure_list)) + { + goto done; + } + if (pollset->shutting_down) + { + goto done; + } + if (pollset->in_flight_cbs) + { + /* Give do_promote priority so we don't starve it out */ + gpr_mu_unlock (&pollset->mu); + locked = 0; + goto done; + } + if (!pollset->kicked_without_pollers) + { + push_front_worker (pollset, worker); + added_worker = 1; + gpr_tls_set (&g_current_thread_poller, (gpr_intptr) pollset); + pollset->vtable->maybe_work_and_unlock (pollset, worker, deadline, now, closure_list); + locked = 0; + gpr_tls_set (&g_current_thread_poller, 0); + } + else + { + pollset->kicked_without_pollers = 0; + } done: - if (!locked) { - grpc_closure_list_run(closure_list); - gpr_mu_lock(&pollset->mu); - locked = 1; - } - grpc_wakeup_fd_destroy(&worker->wakeup_fd); - if (added_worker) { - remove_worker(pollset, worker); - } - if (pollset->shutting_down) { - if (grpc_pollset_has_workers(pollset)) { - grpc_pollset_kick(pollset, NULL); - } else if (!pollset->called_shutdown && pollset->in_flight_cbs == 0) { - pollset->called_shutdown = 1; - gpr_mu_unlock(&pollset->mu); - finish_shutdown(pollset, closure_list); - grpc_closure_list_run(closure_list); - /* Continuing to access pollset here is safe -- it is the caller's - * responsibility to not destroy when it has outstanding calls to - * grpc_pollset_work. - * TODO(dklempner): Can we refactor the shutdown logic to avoid this? */ - gpr_mu_lock(&pollset->mu); - } - } + if (!locked) + { + grpc_closure_list_run (closure_list); + gpr_mu_lock (&pollset->mu); + locked = 1; + } + grpc_wakeup_fd_destroy (&worker->wakeup_fd); + if (added_worker) + { + remove_worker (pollset, worker); + } + if (pollset->shutting_down) + { + if (grpc_pollset_has_workers (pollset)) + { + grpc_pollset_kick (pollset, NULL); + } + else if (!pollset->called_shutdown && pollset->in_flight_cbs == 0) + { + pollset->called_shutdown = 1; + gpr_mu_unlock (&pollset->mu); + finish_shutdown (pollset, closure_list); + grpc_closure_list_run (closure_list); + /* Continuing to access pollset here is safe -- it is the caller's + * responsibility to not destroy when it has outstanding calls to + * grpc_pollset_work. + * TODO(dklempner): Can we refactor the shutdown logic to avoid this? */ + gpr_mu_lock (&pollset->mu); + } + } } -void grpc_pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure, - grpc_closure_list *closure_list) { +void +grpc_pollset_shutdown (grpc_pollset * pollset, grpc_closure * closure, grpc_closure_list * closure_list) +{ int call_shutdown = 0; - gpr_mu_lock(&pollset->mu); - GPR_ASSERT(!pollset->shutting_down); + gpr_mu_lock (&pollset->mu); + GPR_ASSERT (!pollset->shutting_down); pollset->shutting_down = 1; - if (!pollset->called_shutdown && pollset->in_flight_cbs == 0 && - !grpc_pollset_has_workers(pollset)) { - pollset->called_shutdown = 1; - call_shutdown = 1; - } + if (!pollset->called_shutdown && pollset->in_flight_cbs == 0 && !grpc_pollset_has_workers (pollset)) + { + pollset->called_shutdown = 1; + call_shutdown = 1; + } pollset->shutdown_done = closure; - grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); - gpr_mu_unlock(&pollset->mu); + grpc_pollset_kick (pollset, GRPC_POLLSET_KICK_BROADCAST); + gpr_mu_unlock (&pollset->mu); - if (call_shutdown) { - finish_shutdown(pollset, closure_list); - } + if (call_shutdown) + { + finish_shutdown (pollset, closure_list); + } } -void grpc_pollset_destroy(grpc_pollset *pollset) { - GPR_ASSERT(pollset->shutting_down); - GPR_ASSERT(pollset->in_flight_cbs == 0); - GPR_ASSERT(!grpc_pollset_has_workers(pollset)); - pollset->vtable->destroy(pollset); - gpr_mu_destroy(&pollset->mu); +void +grpc_pollset_destroy (grpc_pollset * pollset) +{ + GPR_ASSERT (pollset->shutting_down); + GPR_ASSERT (pollset->in_flight_cbs == 0); + GPR_ASSERT (!grpc_pollset_has_workers (pollset)); + pollset->vtable->destroy (pollset); + gpr_mu_destroy (&pollset->mu); } -int grpc_poll_deadline_to_millis_timeout(gpr_timespec deadline, - gpr_timespec now) { +int +grpc_poll_deadline_to_millis_timeout (gpr_timespec deadline, gpr_timespec now) +{ gpr_timespec timeout; static const int max_spin_polling_us = 10; - if (gpr_time_cmp(deadline, gpr_inf_future(deadline.clock_type)) == 0) { - return -1; - } - if (gpr_time_cmp(deadline, gpr_time_add(now, gpr_time_from_micros( - max_spin_polling_us, - GPR_TIMESPAN))) <= 0) { - return 0; - } - timeout = gpr_time_sub(deadline, now); - return gpr_time_to_millis(gpr_time_add( - timeout, gpr_time_from_nanos(GPR_NS_PER_SEC - 1, GPR_TIMESPAN))); + if (gpr_time_cmp (deadline, gpr_inf_future (deadline.clock_type)) == 0) + { + return -1; + } + if (gpr_time_cmp (deadline, gpr_time_add (now, gpr_time_from_micros (max_spin_polling_us, GPR_TIMESPAN))) <= 0) + { + return 0; + } + timeout = gpr_time_sub (deadline, now); + return gpr_time_to_millis (gpr_time_add (timeout, gpr_time_from_nanos (GPR_NS_PER_SEC - 1, GPR_TIMESPAN))); } /* @@ -289,15 +335,17 @@ int grpc_poll_deadline_to_millis_timeout(gpr_timespec deadline, * descriptor via poll() */ -typedef struct grpc_unary_promote_args { +typedef struct grpc_unary_promote_args +{ const grpc_pollset_vtable *original_vtable; grpc_pollset *pollset; grpc_fd *fd; grpc_closure promotion_closure; } grpc_unary_promote_args; -static void basic_do_promote(void *args, int success, - grpc_closure_list *closure_list) { +static void +basic_do_promote (void *args, int success, grpc_closure_list * closure_list) +{ grpc_unary_promote_args *up_args = args; const grpc_pollset_vtable *original_vtable = up_args->original_vtable; grpc_pollset *pollset = up_args->pollset; @@ -312,125 +360,145 @@ static void basic_do_promote(void *args, int success, * 4. The pollset may be shutting down. */ - gpr_mu_lock(&pollset->mu); + gpr_mu_lock (&pollset->mu); /* First we need to ensure that nobody is polling concurrently */ - GPR_ASSERT(!grpc_pollset_has_workers(pollset)); + GPR_ASSERT (!grpc_pollset_has_workers (pollset)); - gpr_free(up_args); + gpr_free (up_args); /* At this point the pollset may no longer be a unary poller. In that case * we should just call the right add function and be done. */ /* TODO(klempner): If we're not careful this could cause infinite recursion. * That's not a problem for now because empty_pollset has a trivial poller * and we don't have any mechanism to unbecome multipoller. */ pollset->in_flight_cbs--; - if (pollset->shutting_down) { - /* We don't care about this pollset anymore. */ - if (pollset->in_flight_cbs == 0 && !pollset->called_shutdown) { - GPR_ASSERT(!grpc_pollset_has_workers(pollset)); - pollset->called_shutdown = 1; - grpc_closure_list_add(closure_list, pollset->shutdown_done, 1); - } - } else if (grpc_fd_is_orphaned(fd)) { - /* Don't try to add it to anything, we'll drop our ref on it below */ - } else if (pollset->vtable != original_vtable) { - pollset->vtable->add_fd(pollset, fd, 0, closure_list); - } else if (fd != pollset->data.ptr) { - grpc_fd *fds[2]; - fds[0] = pollset->data.ptr; - fds[1] = fd; - - if (fds[0] && !grpc_fd_is_orphaned(fds[0])) { - grpc_platform_become_multipoller(pollset, fds, GPR_ARRAY_SIZE(fds), - closure_list); - GRPC_FD_UNREF(fds[0], "basicpoll"); - } else { - /* old fd is orphaned and we haven't cleaned it up until now, so remain a - * unary poller */ - /* Note that it is possible that fds[1] is also orphaned at this point. - * That's okay, we'll correct it at the next add or poll. */ - if (fds[0]) GRPC_FD_UNREF(fds[0], "basicpoll"); - pollset->data.ptr = fd; - GRPC_FD_REF(fd, "basicpoll"); - } - } - - gpr_mu_unlock(&pollset->mu); + if (pollset->shutting_down) + { + /* We don't care about this pollset anymore. */ + if (pollset->in_flight_cbs == 0 && !pollset->called_shutdown) + { + GPR_ASSERT (!grpc_pollset_has_workers (pollset)); + pollset->called_shutdown = 1; + grpc_closure_list_add (closure_list, pollset->shutdown_done, 1); + } + } + else if (grpc_fd_is_orphaned (fd)) + { + /* Don't try to add it to anything, we'll drop our ref on it below */ + } + else if (pollset->vtable != original_vtable) + { + pollset->vtable->add_fd (pollset, fd, 0, closure_list); + } + else if (fd != pollset->data.ptr) + { + grpc_fd *fds[2]; + fds[0] = pollset->data.ptr; + fds[1] = fd; + + if (fds[0] && !grpc_fd_is_orphaned (fds[0])) + { + grpc_platform_become_multipoller (pollset, fds, GPR_ARRAY_SIZE (fds), closure_list); + GRPC_FD_UNREF (fds[0], "basicpoll"); + } + else + { + /* old fd is orphaned and we haven't cleaned it up until now, so remain a + * unary poller */ + /* Note that it is possible that fds[1] is also orphaned at this point. + * That's okay, we'll correct it at the next add or poll. */ + if (fds[0]) + GRPC_FD_UNREF (fds[0], "basicpoll"); + pollset->data.ptr = fd; + GRPC_FD_REF (fd, "basicpoll"); + } + } + + gpr_mu_unlock (&pollset->mu); /* Matching ref in basic_pollset_add_fd */ - GRPC_FD_UNREF(fd, "basicpoll_add"); + GRPC_FD_UNREF (fd, "basicpoll_add"); - grpc_closure_list_run(closure_list); + grpc_closure_list_run (closure_list); } -static void basic_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd, - int and_unlock_pollset, - grpc_closure_list *closure_list) { +static void +basic_pollset_add_fd (grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list) +{ grpc_unary_promote_args *up_args; - GPR_ASSERT(fd); - if (fd == pollset->data.ptr) goto exit; - - if (!grpc_pollset_has_workers(pollset)) { - /* Fast path -- no in flight cbs */ - /* TODO(klempner): Comment this out and fix any test failures or establish - * they are due to timing issues */ - grpc_fd *fds[2]; - fds[0] = pollset->data.ptr; - fds[1] = fd; - - if (fds[0] == NULL) { - pollset->data.ptr = fd; - GRPC_FD_REF(fd, "basicpoll"); - } else if (!grpc_fd_is_orphaned(fds[0])) { - grpc_platform_become_multipoller(pollset, fds, GPR_ARRAY_SIZE(fds), - closure_list); - GRPC_FD_UNREF(fds[0], "basicpoll"); - } else { - /* old fd is orphaned and we haven't cleaned it up until now, so remain a - * unary poller */ - GRPC_FD_UNREF(fds[0], "basicpoll"); - pollset->data.ptr = fd; - GRPC_FD_REF(fd, "basicpoll"); - } + GPR_ASSERT (fd); + if (fd == pollset->data.ptr) goto exit; - } + + if (!grpc_pollset_has_workers (pollset)) + { + /* Fast path -- no in flight cbs */ + /* TODO(klempner): Comment this out and fix any test failures or establish + * they are due to timing issues */ + grpc_fd *fds[2]; + fds[0] = pollset->data.ptr; + fds[1] = fd; + + if (fds[0] == NULL) + { + pollset->data.ptr = fd; + GRPC_FD_REF (fd, "basicpoll"); + } + else if (!grpc_fd_is_orphaned (fds[0])) + { + grpc_platform_become_multipoller (pollset, fds, GPR_ARRAY_SIZE (fds), closure_list); + GRPC_FD_UNREF (fds[0], "basicpoll"); + } + else + { + /* old fd is orphaned and we haven't cleaned it up until now, so remain a + * unary poller */ + GRPC_FD_UNREF (fds[0], "basicpoll"); + pollset->data.ptr = fd; + GRPC_FD_REF (fd, "basicpoll"); + } + goto exit; + } /* Now we need to promote. This needs to happen when we're not polling. Since * this may be called from poll, the wait needs to happen asynchronously. */ - GRPC_FD_REF(fd, "basicpoll_add"); + GRPC_FD_REF (fd, "basicpoll_add"); pollset->in_flight_cbs++; - up_args = gpr_malloc(sizeof(*up_args)); + up_args = gpr_malloc (sizeof (*up_args)); up_args->fd = fd; up_args->original_vtable = pollset->vtable; up_args->pollset = pollset; up_args->promotion_closure.cb = basic_do_promote; up_args->promotion_closure.cb_arg = up_args; - grpc_closure_list_add(&pollset->idle_jobs, &up_args->promotion_closure, 1); - grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); + grpc_closure_list_add (&pollset->idle_jobs, &up_args->promotion_closure, 1); + grpc_pollset_kick (pollset, GRPC_POLLSET_KICK_BROADCAST); exit: - if (and_unlock_pollset) { - gpr_mu_unlock(&pollset->mu); - } + if (and_unlock_pollset) + { + gpr_mu_unlock (&pollset->mu); + } } -static void basic_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd, - int and_unlock_pollset, - grpc_closure_list *closure_list) { - GPR_ASSERT(fd); - if (fd == pollset->data.ptr) { - GRPC_FD_UNREF(pollset->data.ptr, "basicpoll"); - pollset->data.ptr = NULL; - } - - if (and_unlock_pollset) { - gpr_mu_unlock(&pollset->mu); - } +static void +basic_pollset_del_fd (grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list) +{ + GPR_ASSERT (fd); + if (fd == pollset->data.ptr) + { + GRPC_FD_UNREF (pollset->data.ptr, "basicpoll"); + pollset->data.ptr = NULL; + } + + if (and_unlock_pollset) + { + gpr_mu_unlock (&pollset->mu); + } } -static void basic_pollset_maybe_work_and_unlock( - grpc_pollset *pollset, grpc_pollset_worker *worker, gpr_timespec deadline, - gpr_timespec now, grpc_closure_list *closure_list) { +static void +basic_pollset_maybe_work_and_unlock (grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now, grpc_closure_list * closure_list) +{ struct pollfd pfd[2]; grpc_fd *fd; grpc_fd_watcher fd_watcher; @@ -439,77 +507,98 @@ static void basic_pollset_maybe_work_and_unlock( nfds_t nfds; fd = pollset->data.ptr; - if (fd && grpc_fd_is_orphaned(fd)) { - GRPC_FD_UNREF(fd, "basicpoll"); - fd = pollset->data.ptr = NULL; - } - timeout = grpc_poll_deadline_to_millis_timeout(deadline, now); - pfd[0].fd = GRPC_WAKEUP_FD_GET_READ_FD(&worker->wakeup_fd); + if (fd && grpc_fd_is_orphaned (fd)) + { + GRPC_FD_UNREF (fd, "basicpoll"); + fd = pollset->data.ptr = NULL; + } + timeout = grpc_poll_deadline_to_millis_timeout (deadline, now); + pfd[0].fd = GRPC_WAKEUP_FD_GET_READ_FD (&worker->wakeup_fd); pfd[0].events = POLLIN; pfd[0].revents = 0; nfds = 1; - if (fd) { - pfd[1].fd = fd->fd; - pfd[1].revents = 0; - gpr_mu_unlock(&pollset->mu); - pfd[1].events = - (short)grpc_fd_begin_poll(fd, pollset, POLLIN, POLLOUT, &fd_watcher); - if (pfd[1].events != 0) { - nfds++; - } - } else { - gpr_mu_unlock(&pollset->mu); - } + if (fd) + { + pfd[1].fd = fd->fd; + pfd[1].revents = 0; + gpr_mu_unlock (&pollset->mu); + pfd[1].events = (short) grpc_fd_begin_poll (fd, pollset, POLLIN, POLLOUT, &fd_watcher); + if (pfd[1].events != 0) + { + nfds++; + } + } + else + { + gpr_mu_unlock (&pollset->mu); + } /* poll fd count (argument 2) is shortened by one if we have no events to poll on - such that it only includes the kicker */ - r = grpc_poll_function(pfd, nfds, timeout); - GRPC_TIMER_MARK(GRPC_PTAG_POLL_FINISHED, r); - - if (fd) { - grpc_fd_end_poll(&fd_watcher, pfd[1].revents & POLLIN, - pfd[1].revents & POLLOUT, closure_list); - } - - if (r < 0) { - if (errno != EINTR) { - gpr_log(GPR_ERROR, "poll() failed: %s", strerror(errno)); - } - } else if (r == 0) { - /* do nothing */ - } else { - if (pfd[0].revents & POLLIN) { - grpc_wakeup_fd_consume_wakeup(&worker->wakeup_fd); - } - if (nfds > 1) { - if (pfd[1].revents & (POLLIN | POLLHUP | POLLERR)) { - grpc_fd_become_readable(fd, closure_list); - } - if (pfd[1].revents & (POLLOUT | POLLHUP | POLLERR)) { - grpc_fd_become_writable(fd, closure_list); - } - } - } + r = grpc_poll_function (pfd, nfds, timeout); + GRPC_TIMER_MARK (GRPC_PTAG_POLL_FINISHED, r); + + if (fd) + { + grpc_fd_end_poll (&fd_watcher, pfd[1].revents & POLLIN, pfd[1].revents & POLLOUT, closure_list); + } + + if (r < 0) + { + if (errno != EINTR) + { + gpr_log (GPR_ERROR, "poll() failed: %s", strerror (errno)); + } + } + else if (r == 0) + { + /* do nothing */ + } + else + { + if (pfd[0].revents & POLLIN) + { + grpc_wakeup_fd_consume_wakeup (&worker->wakeup_fd); + } + if (nfds > 1) + { + if (pfd[1].revents & (POLLIN | POLLHUP | POLLERR)) + { + grpc_fd_become_readable (fd, closure_list); + } + if (pfd[1].revents & (POLLOUT | POLLHUP | POLLERR)) + { + grpc_fd_become_writable (fd, closure_list); + } + } + } } -static void basic_pollset_destroy(grpc_pollset *pollset) { - if (pollset->data.ptr != NULL) { - GRPC_FD_UNREF(pollset->data.ptr, "basicpoll"); - pollset->data.ptr = NULL; - } +static void +basic_pollset_destroy (grpc_pollset * pollset) +{ + if (pollset->data.ptr != NULL) + { + GRPC_FD_UNREF (pollset->data.ptr, "basicpoll"); + pollset->data.ptr = NULL; + } } static const grpc_pollset_vtable basic_pollset = { - basic_pollset_add_fd, basic_pollset_del_fd, - basic_pollset_maybe_work_and_unlock, basic_pollset_destroy, - basic_pollset_destroy}; - -static void become_basic_pollset(grpc_pollset *pollset, grpc_fd *fd_or_null) { + basic_pollset_add_fd, basic_pollset_del_fd, + basic_pollset_maybe_work_and_unlock, basic_pollset_destroy, + basic_pollset_destroy +}; + +static void +become_basic_pollset (grpc_pollset * pollset, grpc_fd * fd_or_null) +{ pollset->vtable = &basic_pollset; pollset->data.ptr = fd_or_null; - if (fd_or_null != NULL) { - GRPC_FD_REF(fd_or_null, "basicpoll"); - } + if (fd_or_null != NULL) + { + GRPC_FD_REF (fd_or_null, "basicpoll"); + } } #endif /* GPR_POSIX_POLLSET */ diff --git a/src/core/iomgr/pollset_posix.h b/src/core/iomgr/pollset_posix.h index 4064d117b7d..6bcc4f6a616 100644 --- a/src/core/iomgr/pollset_posix.h +++ b/src/core/iomgr/pollset_posix.h @@ -48,13 +48,15 @@ typedef struct grpc_pollset_vtable grpc_pollset_vtable; use the struct tag */ struct grpc_fd; -typedef struct grpc_pollset_worker { +typedef struct grpc_pollset_worker +{ grpc_wakeup_fd wakeup_fd; struct grpc_pollset_worker *next; struct grpc_pollset_worker *prev; } grpc_pollset_worker; -typedef struct grpc_pollset { +typedef struct grpc_pollset +{ /* pollsets under posix can mutate representation as fds are added and removed. For example, we may choose a poll() based implementation on linux for @@ -68,39 +70,34 @@ typedef struct grpc_pollset { int kicked_without_pollers; grpc_closure *shutdown_done; grpc_closure_list idle_jobs; - union { + union + { int fd; void *ptr; } data; } grpc_pollset; -struct grpc_pollset_vtable { - void (*add_fd)(grpc_pollset *pollset, struct grpc_fd *fd, - int and_unlock_pollset, grpc_closure_list *closure_list); - void (*del_fd)(grpc_pollset *pollset, struct grpc_fd *fd, - int and_unlock_pollset, grpc_closure_list *closure_list); - void (*maybe_work_and_unlock)(grpc_pollset *pollset, - grpc_pollset_worker *worker, - gpr_timespec deadline, gpr_timespec now, - grpc_closure_list *closure_list); - void (*finish_shutdown)(grpc_pollset *pollset); - void (*destroy)(grpc_pollset *pollset); +struct grpc_pollset_vtable +{ + void (*add_fd) (grpc_pollset * pollset, struct grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list); + void (*del_fd) (grpc_pollset * pollset, struct grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list); + void (*maybe_work_and_unlock) (grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now, grpc_closure_list * closure_list); + void (*finish_shutdown) (grpc_pollset * pollset); + void (*destroy) (grpc_pollset * pollset); }; #define GRPC_POLLSET_MU(pollset) (&(pollset)->mu) /* Add an fd to a pollset */ -void grpc_pollset_add_fd(grpc_pollset *pollset, struct grpc_fd *fd, - grpc_closure_list *closure_list); +void grpc_pollset_add_fd (grpc_pollset * pollset, struct grpc_fd *fd, grpc_closure_list * closure_list); /* Force remove an fd from a pollset (normally they are removed on the next poll after an fd is orphaned) */ -void grpc_pollset_del_fd(grpc_pollset *pollset, struct grpc_fd *fd, - grpc_closure_list *closure_list); +void grpc_pollset_del_fd (grpc_pollset * pollset, struct grpc_fd *fd, grpc_closure_list * closure_list); /* Returns the fd to listen on for kicks */ -int grpc_kick_read_fd(grpc_pollset *p); +int grpc_kick_read_fd (grpc_pollset * p); /* Call after polling has been kicked to leave the kicked state */ -void grpc_kick_drain(grpc_pollset *p); +void grpc_kick_drain (grpc_pollset * p); /* Convert a timespec to milliseconds: - very small or negative poll times are clamped to zero to do a @@ -109,25 +106,20 @@ void grpc_kick_drain(grpc_pollset *p); - longer than a millisecond polls are rounded up to the next nearest millisecond to avoid spinning - infinite timeouts are converted to -1 */ -int grpc_poll_deadline_to_millis_timeout(gpr_timespec deadline, - gpr_timespec now); +int grpc_poll_deadline_to_millis_timeout (gpr_timespec deadline, gpr_timespec now); /* turn a pollset into a multipoller: platform specific */ -typedef void (*grpc_platform_become_multipoller_type)( - grpc_pollset *pollset, struct grpc_fd **fds, size_t fd_count, - grpc_closure_list *closure_list); +typedef void (*grpc_platform_become_multipoller_type) (grpc_pollset * pollset, struct grpc_fd ** fds, size_t fd_count, grpc_closure_list * closure_list); extern grpc_platform_become_multipoller_type grpc_platform_become_multipoller; -void grpc_poll_become_multipoller(grpc_pollset *pollset, struct grpc_fd **fds, - size_t fd_count, - grpc_closure_list *closure_list); +void grpc_poll_become_multipoller (grpc_pollset * pollset, struct grpc_fd **fds, size_t fd_count, grpc_closure_list * closure_list); /* Return 1 if the pollset has active threads in grpc_pollset_work (pollset must * be locked) */ -int grpc_pollset_has_workers(grpc_pollset *pollset); +int grpc_pollset_has_workers (grpc_pollset * pollset); /* override to allow tests to hook poll() usage */ -typedef int (*grpc_poll_function_type)(struct pollfd *, nfds_t, int); +typedef int (*grpc_poll_function_type) (struct pollfd *, nfds_t, int); extern grpc_poll_function_type grpc_poll_function; #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_POSIX_H */ diff --git a/src/core/iomgr/pollset_set.h b/src/core/iomgr/pollset_set.h index 5b5b20ef66a..3e5cd8d7e6a 100644 --- a/src/core/iomgr/pollset_set.h +++ b/src/core/iomgr/pollset_set.h @@ -49,13 +49,9 @@ #include "src/core/iomgr/pollset_set_windows.h" #endif -void grpc_pollset_set_init(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, - grpc_closure_list *closure_list); -void grpc_pollset_set_del_pollset(grpc_pollset_set *pollset_set, - grpc_pollset *pollset, - grpc_closure_list *closure_list); +void grpc_pollset_set_init (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, grpc_closure_list * closure_list); +void grpc_pollset_set_del_pollset (grpc_pollset_set * pollset_set, grpc_pollset * pollset, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_H */ diff --git a/src/core/iomgr/pollset_set_posix.c b/src/core/iomgr/pollset_set_posix.c index 810543cc2e1..285f4eb24a8 100644 --- a/src/core/iomgr/pollset_set_posix.c +++ b/src/core/iomgr/pollset_set_posix.c @@ -43,93 +43,105 @@ #include "src/core/iomgr/pollset_set.h" -void grpc_pollset_set_init(grpc_pollset_set *pollset_set) { - memset(pollset_set, 0, sizeof(*pollset_set)); - gpr_mu_init(&pollset_set->mu); +void +grpc_pollset_set_init (grpc_pollset_set * pollset_set) +{ + memset (pollset_set, 0, sizeof (*pollset_set)); + gpr_mu_init (&pollset_set->mu); } -void grpc_pollset_set_destroy(grpc_pollset_set *pollset_set) { +void +grpc_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++) { - GRPC_FD_UNREF(pollset_set->fds[i], "pollset"); - } - gpr_free(pollset_set->pollsets); - gpr_free(pollset_set->fds); + gpr_mu_destroy (&pollset_set->mu); + for (i = 0; i < pollset_set->fd_count; i++) + { + GRPC_FD_UNREF (pollset_set->fds[i], "pollset"); + } + gpr_free (pollset_set->pollsets); + gpr_free (pollset_set->fds); } -void grpc_pollset_set_add_pollset(grpc_pollset_set *pollset_set, - grpc_pollset *pollset, - grpc_closure_list *closure_list) { +void +grpc_pollset_set_add_pollset (grpc_pollset_set * pollset_set, grpc_pollset * pollset, grpc_closure_list * closure_list) +{ size_t i, j; - gpr_mu_lock(&pollset_set->mu); - if (pollset_set->pollset_count == pollset_set->pollset_capacity) { - pollset_set->pollset_capacity = - GPR_MAX(8, 2 * pollset_set->pollset_capacity); - pollset_set->pollsets = - gpr_realloc(pollset_set->pollsets, pollset_set->pollset_capacity * - sizeof(*pollset_set->pollsets)); - } + gpr_mu_lock (&pollset_set->mu); + if (pollset_set->pollset_count == pollset_set->pollset_capacity) + { + pollset_set->pollset_capacity = GPR_MAX (8, 2 * pollset_set->pollset_capacity); + pollset_set->pollsets = gpr_realloc (pollset_set->pollsets, pollset_set->pollset_capacity * sizeof (*pollset_set->pollsets)); + } pollset_set->pollsets[pollset_set->pollset_count++] = pollset; - for (i = 0, j = 0; i < pollset_set->fd_count; i++) { - if (grpc_fd_is_orphaned(pollset_set->fds[i])) { - GRPC_FD_UNREF(pollset_set->fds[i], "pollset"); - } else { - grpc_pollset_add_fd(pollset, pollset_set->fds[i], closure_list); - pollset_set->fds[j++] = pollset_set->fds[i]; + for (i = 0, j = 0; i < pollset_set->fd_count; i++) + { + if (grpc_fd_is_orphaned (pollset_set->fds[i])) + { + GRPC_FD_UNREF (pollset_set->fds[i], "pollset"); + } + else + { + grpc_pollset_add_fd (pollset, pollset_set->fds[i], closure_list); + pollset_set->fds[j++] = pollset_set->fds[i]; + } } - } pollset_set->fd_count = j; - gpr_mu_unlock(&pollset_set->mu); + gpr_mu_unlock (&pollset_set->mu); } -void grpc_pollset_set_del_pollset(grpc_pollset_set *pollset_set, - grpc_pollset *pollset, - grpc_closure_list *closure_list) { +void +grpc_pollset_set_del_pollset (grpc_pollset_set * pollset_set, grpc_pollset * pollset, grpc_closure_list * closure_list) +{ size_t i; - gpr_mu_lock(&pollset_set->mu); - for (i = 0; i < pollset_set->pollset_count; i++) { - if (pollset_set->pollsets[i] == pollset) { - pollset_set->pollset_count--; - GPR_SWAP(grpc_pollset *, pollset_set->pollsets[i], - pollset_set->pollsets[pollset_set->pollset_count]); - break; + gpr_mu_lock (&pollset_set->mu); + for (i = 0; i < pollset_set->pollset_count; i++) + { + if (pollset_set->pollsets[i] == pollset) + { + pollset_set->pollset_count--; + GPR_SWAP (grpc_pollset *, pollset_set->pollsets[i], pollset_set->pollsets[pollset_set->pollset_count]); + break; + } } - } - gpr_mu_unlock(&pollset_set->mu); + gpr_mu_unlock (&pollset_set->mu); } -void grpc_pollset_set_add_fd(grpc_pollset_set *pollset_set, grpc_fd *fd, - grpc_closure_list *closure_list) { +void +grpc_pollset_set_add_fd (grpc_pollset_set * pollset_set, grpc_fd * fd, grpc_closure_list * closure_list) +{ size_t i; - gpr_mu_lock(&pollset_set->mu); - if (pollset_set->fd_count == pollset_set->fd_capacity) { - pollset_set->fd_capacity = GPR_MAX(8, 2 * pollset_set->fd_capacity); - pollset_set->fds = gpr_realloc( - pollset_set->fds, pollset_set->fd_capacity * sizeof(*pollset_set->fds)); - } - GRPC_FD_REF(fd, "pollset_set"); + gpr_mu_lock (&pollset_set->mu); + if (pollset_set->fd_count == pollset_set->fd_capacity) + { + pollset_set->fd_capacity = GPR_MAX (8, 2 * pollset_set->fd_capacity); + pollset_set->fds = gpr_realloc (pollset_set->fds, pollset_set->fd_capacity * sizeof (*pollset_set->fds)); + } + GRPC_FD_REF (fd, "pollset_set"); pollset_set->fds[pollset_set->fd_count++] = fd; - for (i = 0; i < pollset_set->pollset_count; i++) { - grpc_pollset_add_fd(pollset_set->pollsets[i], fd, closure_list); - } - gpr_mu_unlock(&pollset_set->mu); + for (i = 0; i < pollset_set->pollset_count; i++) + { + grpc_pollset_add_fd (pollset_set->pollsets[i], fd, closure_list); + } + gpr_mu_unlock (&pollset_set->mu); } -void grpc_pollset_set_del_fd(grpc_pollset_set *pollset_set, grpc_fd *fd, - grpc_closure_list *closure_list) { +void +grpc_pollset_set_del_fd (grpc_pollset_set * pollset_set, grpc_fd * fd, grpc_closure_list * closure_list) +{ size_t i; - gpr_mu_lock(&pollset_set->mu); - for (i = 0; i < pollset_set->fd_count; i++) { - if (pollset_set->fds[i] == fd) { - pollset_set->fd_count--; - GPR_SWAP(grpc_fd *, pollset_set->fds[i], - pollset_set->fds[pollset_set->fd_count]); - GRPC_FD_UNREF(fd, "pollset_set"); - break; + gpr_mu_lock (&pollset_set->mu); + for (i = 0; i < pollset_set->fd_count; i++) + { + if (pollset_set->fds[i] == fd) + { + pollset_set->fd_count--; + GPR_SWAP (grpc_fd *, pollset_set->fds[i], pollset_set->fds[pollset_set->fd_count]); + GRPC_FD_UNREF (fd, "pollset_set"); + break; + } } - } - gpr_mu_unlock(&pollset_set->mu); + gpr_mu_unlock (&pollset_set->mu); } #endif /* GPR_POSIX_SOCKET */ diff --git a/src/core/iomgr/pollset_set_posix.h b/src/core/iomgr/pollset_set_posix.h index 40d7a9b259b..2a4a0457000 100644 --- a/src/core/iomgr/pollset_set_posix.h +++ b/src/core/iomgr/pollset_set_posix.h @@ -37,7 +37,8 @@ #include "src/core/iomgr/fd_posix.h" #include "src/core/iomgr/pollset_posix.h" -typedef struct grpc_pollset_set { +typedef struct grpc_pollset_set +{ gpr_mu mu; size_t pollset_count; @@ -49,9 +50,7 @@ typedef struct grpc_pollset_set { grpc_fd **fds; } grpc_pollset_set; -void grpc_pollset_set_add_fd(grpc_pollset_set *pollset_set, grpc_fd *fd, - grpc_closure_list *closure_list); -void grpc_pollset_set_del_fd(grpc_pollset_set *pollset_set, grpc_fd *fd, - grpc_closure_list *closure_list); +void grpc_pollset_set_add_fd (grpc_pollset_set * pollset_set, grpc_fd * fd, grpc_closure_list * closure_list); +void grpc_pollset_set_del_fd (grpc_pollset_set * pollset_set, grpc_fd * fd, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_WINDOWS_H */ diff --git a/src/core/iomgr/pollset_set_windows.c b/src/core/iomgr/pollset_set_windows.c index b9c209cd2c7..642e6fb983c 100644 --- a/src/core/iomgr/pollset_set_windows.c +++ b/src/core/iomgr/pollset_set_windows.c @@ -37,14 +37,24 @@ #include "src/core/iomgr/pollset_set.h" -void grpc_pollset_set_init(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_pollset_set *pollset_set, - grpc_pollset *pollset) {} +void +grpc_pollset_set_init (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_pollset_set * pollset_set, grpc_pollset * pollset) +{ +} #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/pollset_set_windows.h b/src/core/iomgr/pollset_set_windows.h index cada0d2b61f..0fb03cd27a4 100644 --- a/src/core/iomgr/pollset_set_windows.h +++ b/src/core/iomgr/pollset_set_windows.h @@ -34,6 +34,9 @@ #ifndef GRPC_INTERNAL_CORE_IOMGR_POLLSET_SET_WINDOWS_H #define GRPC_INTERNAL_CORE_IOMGR_POLLSET_SET_WINDOWS_H -typedef struct grpc_pollset_set { void *unused; } grpc_pollset_set; +typedef struct grpc_pollset_set +{ + void *unused; +} grpc_pollset_set; #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_WINDOWS_H */ diff --git a/src/core/iomgr/pollset_windows.c b/src/core/iomgr/pollset_windows.c index e6791d49438..da0024b921d 100644 --- a/src/core/iomgr/pollset_windows.c +++ b/src/core/iomgr/pollset_windows.c @@ -42,32 +42,45 @@ #include "src/core/iomgr/pollset.h" #include "src/core/iomgr/pollset_windows.h" -static void remove_worker(grpc_pollset *p, grpc_pollset_worker *worker) { +static void +remove_worker (grpc_pollset * p, grpc_pollset_worker * worker) +{ worker->prev->next = worker->next; worker->next->prev = worker->prev; } -static int has_workers(grpc_pollset *p) { +static int +has_workers (grpc_pollset * p) +{ return p->root_worker.next != &p->root_worker; } -static grpc_pollset_worker *pop_front_worker(grpc_pollset *p) { - if (has_workers(p)) { - grpc_pollset_worker *w = p->root_worker.next; - remove_worker(p, w); - return w; - } else { - return NULL; - } +static grpc_pollset_worker * +pop_front_worker (grpc_pollset * p) +{ + if (has_workers (p)) + { + grpc_pollset_worker *w = p->root_worker.next; + remove_worker (p, w); + return w; + } + else + { + return NULL; + } } -static void push_back_worker(grpc_pollset *p, grpc_pollset_worker *worker) { +static void +push_back_worker (grpc_pollset * p, grpc_pollset_worker * worker) +{ worker->next = &p->root_worker; worker->prev = worker->next->prev; worker->prev->next = worker->next->prev = worker; } -static void push_front_worker(grpc_pollset *p, grpc_pollset_worker *worker) { +static void +push_front_worker (grpc_pollset * p, grpc_pollset_worker * worker) +{ worker->prev = &p->root_worker; worker->next = worker->prev->next; worker->prev->next = worker->next->prev = worker; @@ -78,73 +91,94 @@ static void push_front_worker(grpc_pollset *p, grpc_pollset_worker *worker) { set of features for the sake of the rest of grpc. But grpc_pollset_work won't actually do any polling, and return as quickly as possible. */ -void grpc_pollset_init(grpc_pollset *pollset) { - memset(pollset, 0, sizeof(*pollset)); - gpr_mu_init(&pollset->mu); +void +grpc_pollset_init (grpc_pollset * pollset) +{ + memset (pollset, 0, sizeof (*pollset)); + gpr_mu_init (&pollset->mu); pollset->root_worker.next = pollset->root_worker.prev = &pollset->root_worker; pollset->kicked_without_pollers = 0; } -void grpc_pollset_shutdown(grpc_pollset *pollset, - void (*shutdown_done)(void *arg), - void *shutdown_done_arg) { - gpr_mu_lock(&pollset->mu); +void +grpc_pollset_shutdown (grpc_pollset * pollset, void (*shutdown_done) (void *arg), void *shutdown_done_arg) +{ + gpr_mu_lock (&pollset->mu); pollset->shutting_down = 1; - grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); - gpr_mu_unlock(&pollset->mu); - shutdown_done(shutdown_done_arg); + grpc_pollset_kick (pollset, GRPC_POLLSET_KICK_BROADCAST); + gpr_mu_unlock (&pollset->mu); + shutdown_done (shutdown_done_arg); } -void grpc_pollset_destroy(grpc_pollset *pollset) { - gpr_mu_destroy(&pollset->mu); +void +grpc_pollset_destroy (grpc_pollset * pollset) +{ + gpr_mu_destroy (&pollset->mu); } -void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, - gpr_timespec now, gpr_timespec deadline) { +void +grpc_pollset_work (grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec now, gpr_timespec deadline) +{ int added_worker = 0; worker->next = worker->prev = NULL; - gpr_cv_init(&worker->cv); - if (grpc_maybe_call_delayed_callbacks(&pollset->mu, 1 /* GPR_TRUE */)) { - goto done; - } - if (grpc_alarm_check(&pollset->mu, now, &deadline)) { - goto done; - } - if (!pollset->kicked_without_pollers && !pollset->shutting_down) { - push_front_worker(pollset, worker); - added_worker = 1; - gpr_cv_wait(&worker->cv, &pollset->mu, deadline); - } else { - pollset->kicked_without_pollers = 0; - } + gpr_cv_init (&worker->cv); + if (grpc_maybe_call_delayed_callbacks (&pollset->mu, 1 /* GPR_TRUE */ )) + { + goto done; + } + if (grpc_alarm_check (&pollset->mu, now, &deadline)) + { + goto done; + } + if (!pollset->kicked_without_pollers && !pollset->shutting_down) + { + push_front_worker (pollset, worker); + added_worker = 1; + gpr_cv_wait (&worker->cv, &pollset->mu, deadline); + } + else + { + pollset->kicked_without_pollers = 0; + } done: - gpr_cv_destroy(&worker->cv); - if (added_worker) { - remove_worker(pollset, worker); - } + gpr_cv_destroy (&worker->cv); + if (added_worker) + { + remove_worker (pollset, worker); + } } -void grpc_pollset_kick(grpc_pollset *p, grpc_pollset_worker *specific_worker) { - if (specific_worker != NULL) { - if (specific_worker == GRPC_POLLSET_KICK_BROADCAST) { - for (specific_worker = p->root_worker.next; - specific_worker != &p->root_worker; - specific_worker = specific_worker->next) { - gpr_cv_signal(&specific_worker->cv); - } - p->kicked_without_pollers = 1; - } else { - gpr_cv_signal(&specific_worker->cv); +void +grpc_pollset_kick (grpc_pollset * p, grpc_pollset_worker * specific_worker) +{ + if (specific_worker != NULL) + { + if (specific_worker == GRPC_POLLSET_KICK_BROADCAST) + { + for (specific_worker = p->root_worker.next; specific_worker != &p->root_worker; specific_worker = specific_worker->next) + { + gpr_cv_signal (&specific_worker->cv); + } + p->kicked_without_pollers = 1; + } + else + { + gpr_cv_signal (&specific_worker->cv); + } } - } else { - specific_worker = pop_front_worker(p); - if (specific_worker != NULL) { - push_back_worker(p, specific_worker); - gpr_cv_signal(&specific_worker->cv); - } else { - p->kicked_without_pollers = 1; + else + { + specific_worker = pop_front_worker (p); + if (specific_worker != NULL) + { + push_back_worker (p, specific_worker); + gpr_cv_signal (&specific_worker->cv); + } + else + { + p->kicked_without_pollers = 1; + } } - } } #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/pollset_windows.h b/src/core/iomgr/pollset_windows.h index 4efa5a1717c..6da7415709c 100644 --- a/src/core/iomgr/pollset_windows.h +++ b/src/core/iomgr/pollset_windows.h @@ -43,13 +43,15 @@ used to synchronize with the IOCP, and workers are condition variables used to block threads until work is ready. */ -typedef struct grpc_pollset_worker { +typedef struct grpc_pollset_worker +{ gpr_cv cv; struct grpc_pollset_worker *next; struct grpc_pollset_worker *prev; } grpc_pollset_worker; -typedef struct grpc_pollset { +typedef struct grpc_pollset +{ gpr_mu mu; int shutting_down; int kicked_without_pollers; diff --git a/src/core/iomgr/resolve_address.h b/src/core/iomgr/resolve_address.h index 54e8add5605..44db1a7cc74 100644 --- a/src/core/iomgr/resolve_address.h +++ b/src/core/iomgr/resolve_address.h @@ -40,12 +40,14 @@ #define GRPC_MAX_SOCKADDR_SIZE 128 -typedef struct { +typedef struct +{ char addr[GRPC_MAX_SOCKADDR_SIZE]; size_t len; } grpc_resolved_address; -typedef struct { +typedef struct +{ size_t naddrs; grpc_resolved_address *addrs; } grpc_resolved_addresses; @@ -54,19 +56,16 @@ typedef struct { On success: addresses is the result, and the callee must call grpc_resolved_addresses_destroy when it's done with them On failure: addresses is NULL */ -typedef void (*grpc_resolve_cb)(void *arg, grpc_resolved_addresses *addresses, - grpc_closure_list *closure_list); +typedef void (*grpc_resolve_cb) (void *arg, grpc_resolved_addresses * addresses, grpc_closure_list * closure_list); /* 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 */ -void grpc_resolve_address(const char *addr, const char *default_port, - grpc_resolve_cb cb, void *arg); +void grpc_resolve_address (const char *addr, const char *default_port, grpc_resolve_cb cb, void *arg); /* Destroy resolved addresses */ -void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addresses); +void grpc_resolved_addresses_destroy (grpc_resolved_addresses * addresses); /* Resolve addr in a blocking fashion. Returns NULL on failure. On success, result must be freed with grpc_resolved_addresses_destroy. */ -grpc_resolved_addresses *grpc_blocking_resolve_address( - const char *addr, const char *default_port); +grpc_resolved_addresses *grpc_blocking_resolve_address (const char *addr, const char *default_port); #endif /* GRPC_INTERNAL_CORE_IOMGR_RESOLVE_ADDRESS_H */ diff --git a/src/core/iomgr/resolve_address_posix.c b/src/core/iomgr/resolve_address_posix.c index f0a230bab2e..d3bc77ff8e5 100644 --- a/src/core/iomgr/resolve_address_posix.c +++ b/src/core/iomgr/resolve_address_posix.c @@ -51,7 +51,8 @@ #include #include -typedef struct { +typedef struct +{ char *name; char *default_port; grpc_resolve_cb cb; @@ -59,8 +60,9 @@ typedef struct { grpc_iomgr_object iomgr_object; } request; -grpc_resolved_addresses *grpc_blocking_resolve_address( - const char *name, const char *default_port) { +grpc_resolved_addresses * +grpc_blocking_resolve_address (const char *name, const char *default_port) +{ struct addrinfo hints; struct addrinfo *result = NULL, *resp; char *host; @@ -70,114 +72,127 @@ grpc_resolved_addresses *grpc_blocking_resolve_address( grpc_resolved_addresses *addrs = NULL; struct sockaddr_un *un; - if (name[0] == 'u' && name[1] == 'n' && name[2] == 'i' && name[3] == 'x' && - name[4] == ':' && name[5] != 0) { - addrs = gpr_malloc(sizeof(grpc_resolved_addresses)); - addrs->naddrs = 1; - addrs->addrs = gpr_malloc(sizeof(grpc_resolved_address)); - un = (struct sockaddr_un *)addrs->addrs->addr; - un->sun_family = AF_UNIX; - strcpy(un->sun_path, name + 5); - addrs->addrs->len = strlen(un->sun_path) + sizeof(un->sun_family) + 1; - return addrs; - } + if (name[0] == 'u' && name[1] == 'n' && name[2] == 'i' && name[3] == 'x' && name[4] == ':' && name[5] != 0) + { + addrs = gpr_malloc (sizeof (grpc_resolved_addresses)); + addrs->naddrs = 1; + addrs->addrs = gpr_malloc (sizeof (grpc_resolved_address)); + un = (struct sockaddr_un *) addrs->addrs->addr; + un->sun_family = AF_UNIX; + strcpy (un->sun_path, name + 5); + addrs->addrs->len = strlen (un->sun_path) + sizeof (un->sun_family) + 1; + return addrs; + } /* parse name, splitting it into host and port parts */ - gpr_split_host_port(name, &host, &port); - if (host == NULL) { - gpr_log(GPR_ERROR, "unparseable host:port: '%s'", name); - goto done; - } - if (port == NULL) { - if (default_port == NULL) { - gpr_log(GPR_ERROR, "no port in name '%s'", name); + gpr_split_host_port (name, &host, &port); + if (host == NULL) + { + gpr_log (GPR_ERROR, "unparseable host:port: '%s'", name); goto done; } - port = gpr_strdup(default_port); - } + if (port == NULL) + { + if (default_port == NULL) + { + gpr_log (GPR_ERROR, "no port in name '%s'", name); + goto done; + } + port = gpr_strdup (default_port); + } /* Call getaddrinfo */ - memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_UNSPEC; /* ipv4 or ipv6 */ - hints.ai_socktype = SOCK_STREAM; /* stream socket */ - hints.ai_flags = AI_PASSIVE; /* for wildcard IP address */ - - s = getaddrinfo(host, port, &hints, &result); - if (s != 0) { - /* Retry if well-known service name is recognized */ - char *svc[][2] = {{"http", "80"}, {"https", "443"}}; - int i; - for (i = 0; i < (int)(sizeof(svc) / sizeof(svc[0])); i++) { - if (strcmp(port, svc[i][0]) == 0) { - s = getaddrinfo(host, svc[i][1], &hints, &result); - break; - } + memset (&hints, 0, sizeof (hints)); + hints.ai_family = AF_UNSPEC; /* ipv4 or ipv6 */ + hints.ai_socktype = SOCK_STREAM; /* stream socket */ + hints.ai_flags = AI_PASSIVE; /* for wildcard IP address */ + + s = getaddrinfo (host, port, &hints, &result); + if (s != 0) + { + /* Retry if well-known service name is recognized */ + char *svc[][2] = { {"http", "80"}, {"https", "443"} }; + int i; + for (i = 0; i < (int) (sizeof (svc) / sizeof (svc[0])); i++) + { + if (strcmp (port, svc[i][0]) == 0) + { + s = getaddrinfo (host, svc[i][1], &hints, &result); + break; + } + } } - } - if (s != 0) { - gpr_log(GPR_ERROR, "getaddrinfo: %s", gai_strerror(s)); - goto done; - } + if (s != 0) + { + gpr_log (GPR_ERROR, "getaddrinfo: %s", gai_strerror (s)); + goto done; + } /* Success path: set addrs non-NULL, fill it in */ - addrs = gpr_malloc(sizeof(grpc_resolved_addresses)); + addrs = gpr_malloc (sizeof (grpc_resolved_addresses)); addrs->naddrs = 0; - for (resp = result; resp != NULL; resp = resp->ai_next) { - addrs->naddrs++; - } - addrs->addrs = gpr_malloc(sizeof(grpc_resolved_address) * addrs->naddrs); + for (resp = result; resp != NULL; resp = resp->ai_next) + { + addrs->naddrs++; + } + addrs->addrs = gpr_malloc (sizeof (grpc_resolved_address) * addrs->naddrs); i = 0; - for (resp = result; resp != NULL; resp = resp->ai_next) { - memcpy(&addrs->addrs[i].addr, resp->ai_addr, resp->ai_addrlen); - addrs->addrs[i].len = resp->ai_addrlen; - i++; - } + for (resp = result; resp != NULL; resp = resp->ai_next) + { + memcpy (&addrs->addrs[i].addr, resp->ai_addr, resp->ai_addrlen); + addrs->addrs[i].len = resp->ai_addrlen; + i++; + } done: - gpr_free(host); - gpr_free(port); - if (result) { - freeaddrinfo(result); - } + gpr_free (host); + gpr_free (port); + if (result) + { + freeaddrinfo (result); + } return addrs; } /* Thread function to asynch-ify grpc_blocking_resolve_address */ -static void do_request_thread(void *rp) { +static void +do_request_thread (void *rp) +{ request *r = rp; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_resolved_addresses *resolved = - grpc_blocking_resolve_address(r->name, r->default_port); + grpc_resolved_addresses *resolved = grpc_blocking_resolve_address (r->name, r->default_port); void *arg = r->arg; grpc_resolve_cb cb = r->cb; - gpr_free(r->name); - gpr_free(r->default_port); - cb(arg, resolved, &closure_list); - grpc_iomgr_unregister_object(&r->iomgr_object); - gpr_free(r); - grpc_closure_list_run(&closure_list); + gpr_free (r->name); + gpr_free (r->default_port); + cb (arg, resolved, &closure_list); + grpc_iomgr_unregister_object (&r->iomgr_object); + gpr_free (r); + grpc_closure_list_run (&closure_list); } -void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) { - gpr_free(addrs->addrs); - gpr_free(addrs); +void +grpc_resolved_addresses_destroy (grpc_resolved_addresses * addrs) +{ + gpr_free (addrs->addrs); + gpr_free (addrs); } -void grpc_resolve_address(const char *name, const char *default_port, - grpc_resolve_cb cb, void *arg) { - request *r = gpr_malloc(sizeof(request)); +void +grpc_resolve_address (const char *name, const char *default_port, grpc_resolve_cb cb, void *arg) +{ + request *r = gpr_malloc (sizeof (request)); gpr_thd_id id; char *tmp; - gpr_asprintf(&tmp, "resolve_address:name='%s':default_port='%s'", name, - default_port); - grpc_iomgr_register_object(&r->iomgr_object, tmp); - gpr_free(tmp); - r->name = gpr_strdup(name); - r->default_port = gpr_strdup(default_port); + gpr_asprintf (&tmp, "resolve_address:name='%s':default_port='%s'", name, default_port); + grpc_iomgr_register_object (&r->iomgr_object, tmp); + gpr_free (tmp); + r->name = gpr_strdup (name); + r->default_port = gpr_strdup (default_port); r->cb = cb; r->arg = arg; - gpr_thd_new(&id, do_request_thread, r, NULL); + gpr_thd_new (&id, do_request_thread, r, NULL); } #endif diff --git a/src/core/iomgr/resolve_address_windows.c b/src/core/iomgr/resolve_address_windows.c index fb5fd0d4f63..4a85a0a7ad9 100644 --- a/src/core/iomgr/resolve_address_windows.c +++ b/src/core/iomgr/resolve_address_windows.c @@ -50,7 +50,8 @@ #include #include -typedef struct { +typedef struct +{ char *name; char *default_port; grpc_resolve_cb cb; @@ -58,8 +59,9 @@ typedef struct { grpc_iomgr_object iomgr_object; } request; -grpc_resolved_addresses *grpc_blocking_resolve_address( - const char *name, const char *default_port) { +grpc_resolved_addresses * +grpc_blocking_resolve_address (const char *name, const char *default_port) +{ struct addrinfo hints; struct addrinfo *result = NULL, *resp; char *host; @@ -69,95 +71,106 @@ grpc_resolved_addresses *grpc_blocking_resolve_address( grpc_resolved_addresses *addrs = NULL; /* parse name, splitting it into host and port parts */ - gpr_split_host_port(name, &host, &port); - if (host == NULL) { - gpr_log(GPR_ERROR, "unparseable host:port: '%s'", name); - goto done; - } - if (port == NULL) { - if (default_port == NULL) { - gpr_log(GPR_ERROR, "no port in name '%s'", name); + gpr_split_host_port (name, &host, &port); + if (host == NULL) + { + gpr_log (GPR_ERROR, "unparseable host:port: '%s'", name); goto done; } - port = gpr_strdup(default_port); - } + if (port == NULL) + { + if (default_port == NULL) + { + gpr_log (GPR_ERROR, "no port in name '%s'", name); + goto done; + } + port = gpr_strdup (default_port); + } /* Call getaddrinfo */ - memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_UNSPEC; /* ipv4 or ipv6 */ - hints.ai_socktype = SOCK_STREAM; /* stream socket */ - hints.ai_flags = AI_PASSIVE; /* for wildcard IP address */ - - s = getaddrinfo(host, port, &hints, &result); - if (s != 0) { - gpr_log(GPR_ERROR, "getaddrinfo: %s", gai_strerror(s)); - goto done; - } + memset (&hints, 0, sizeof (hints)); + hints.ai_family = AF_UNSPEC; /* ipv4 or ipv6 */ + hints.ai_socktype = SOCK_STREAM; /* stream socket */ + hints.ai_flags = AI_PASSIVE; /* for wildcard IP address */ + + s = getaddrinfo (host, port, &hints, &result); + if (s != 0) + { + gpr_log (GPR_ERROR, "getaddrinfo: %s", gai_strerror (s)); + goto done; + } /* Success path: set addrs non-NULL, fill it in */ - addrs = gpr_malloc(sizeof(grpc_resolved_addresses)); + addrs = gpr_malloc (sizeof (grpc_resolved_addresses)); addrs->naddrs = 0; - for (resp = result; resp != NULL; resp = resp->ai_next) { - addrs->naddrs++; - } - addrs->addrs = gpr_malloc(sizeof(grpc_resolved_address) * addrs->naddrs); + for (resp = result; resp != NULL; resp = resp->ai_next) + { + addrs->naddrs++; + } + addrs->addrs = gpr_malloc (sizeof (grpc_resolved_address) * addrs->naddrs); i = 0; - for (resp = result; resp != NULL; resp = resp->ai_next) { - memcpy(&addrs->addrs[i].addr, resp->ai_addr, resp->ai_addrlen); - addrs->addrs[i].len = resp->ai_addrlen; - i++; - } + for (resp = result; resp != NULL; resp = resp->ai_next) + { + memcpy (&addrs->addrs[i].addr, resp->ai_addr, resp->ai_addrlen); + addrs->addrs[i].len = resp->ai_addrlen; + i++; + } { - for (i = 0; i < addrs->naddrs; i++) { - char *buf; - grpc_sockaddr_to_string(&buf, (struct sockaddr *)&addrs->addrs[i].addr, - 0); - gpr_free(buf); - } + for (i = 0; i < addrs->naddrs; i++) + { + char *buf; + grpc_sockaddr_to_string (&buf, (struct sockaddr *) &addrs->addrs[i].addr, 0); + gpr_free (buf); + } } done: - gpr_free(host); - gpr_free(port); - if (result) { - freeaddrinfo(result); - } + gpr_free (host); + gpr_free (port); + if (result) + { + freeaddrinfo (result); + } return addrs; } /* Thread function to asynch-ify grpc_blocking_resolve_address */ -static void do_request(void *rp) { +static void +do_request (void *rp) +{ request *r = rp; - grpc_resolved_addresses *resolved = - grpc_blocking_resolve_address(r->name, r->default_port); + grpc_resolved_addresses *resolved = grpc_blocking_resolve_address (r->name, r->default_port); void *arg = r->arg; grpc_resolve_cb cb = r->cb; - gpr_free(r->name); - gpr_free(r->default_port); - grpc_iomgr_unregister_object(&r->iomgr_object); - gpr_free(r); - cb(arg, resolved); + gpr_free (r->name); + gpr_free (r->default_port); + grpc_iomgr_unregister_object (&r->iomgr_object); + gpr_free (r); + cb (arg, resolved); } -void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) { - gpr_free(addrs->addrs); - gpr_free(addrs); +void +grpc_resolved_addresses_destroy (grpc_resolved_addresses * addrs) +{ + gpr_free (addrs->addrs); + gpr_free (addrs); } -void grpc_resolve_address(const char *name, const char *default_port, - grpc_resolve_cb cb, void *arg) { - request *r = gpr_malloc(sizeof(request)); +void +grpc_resolve_address (const char *name, const char *default_port, grpc_resolve_cb cb, void *arg) +{ + request *r = gpr_malloc (sizeof (request)); gpr_thd_id id; const char *label; - gpr_asprintf(&label, "resolve:%s", name); - grpc_iomgr_register_object(&r->iomgr_object, label); - gpr_free(label); - r->name = gpr_strdup(name); - r->default_port = gpr_strdup(default_port); + gpr_asprintf (&label, "resolve:%s", name); + grpc_iomgr_register_object (&r->iomgr_object, label); + gpr_free (label); + r->name = gpr_strdup (name); + r->default_port = gpr_strdup (default_port); r->cb = cb; r->arg = arg; - gpr_thd_new(&id, do_request, r, NULL); + gpr_thd_new (&id, do_request, r, NULL); } #endif diff --git a/src/core/iomgr/sockaddr_utils.c b/src/core/iomgr/sockaddr_utils.c index 0e4bf245498..d55d26ff046 100644 --- a/src/core/iomgr/sockaddr_utils.c +++ b/src/core/iomgr/sockaddr_utils.c @@ -48,96 +48,119 @@ #include "src/core/support/string.h" -static const gpr_uint8 kV4MappedPrefix[] = {0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0xff, 0xff}; - -int grpc_sockaddr_is_v4mapped(const struct sockaddr *addr, - struct sockaddr_in *addr4_out) { - GPR_ASSERT(addr != (struct sockaddr *)addr4_out); - if (addr->sa_family == AF_INET6) { - const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *)addr; - if (memcmp(addr6->sin6_addr.s6_addr, kV4MappedPrefix, - sizeof(kV4MappedPrefix)) == 0) { - if (addr4_out != NULL) { - /* Normalize ::ffff:0.0.0.0/96 to IPv4. */ - memset(addr4_out, 0, sizeof(*addr4_out)); - addr4_out->sin_family = AF_INET; - /* s6_addr32 would be nice, but it's non-standard. */ - memcpy(&addr4_out->sin_addr, &addr6->sin6_addr.s6_addr[12], 4); - addr4_out->sin_port = addr6->sin6_port; - } - return 1; +static const gpr_uint8 kV4MappedPrefix[] = { 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0xff, 0xff +}; + +int +grpc_sockaddr_is_v4mapped (const struct sockaddr *addr, struct sockaddr_in *addr4_out) +{ + GPR_ASSERT (addr != (struct sockaddr *) addr4_out); + if (addr->sa_family == AF_INET6) + { + const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *) addr; + if (memcmp (addr6->sin6_addr.s6_addr, kV4MappedPrefix, sizeof (kV4MappedPrefix)) == 0) + { + if (addr4_out != NULL) + { + /* Normalize ::ffff:0.0.0.0/96 to IPv4. */ + memset (addr4_out, 0, sizeof (*addr4_out)); + addr4_out->sin_family = AF_INET; + /* s6_addr32 would be nice, but it's non-standard. */ + memcpy (&addr4_out->sin_addr, &addr6->sin6_addr.s6_addr[12], 4); + addr4_out->sin_port = addr6->sin6_port; + } + return 1; + } } - } return 0; } -int grpc_sockaddr_to_v4mapped(const struct sockaddr *addr, - struct sockaddr_in6 *addr6_out) { - GPR_ASSERT(addr != (struct sockaddr *)addr6_out); - if (addr->sa_family == AF_INET) { - const struct sockaddr_in *addr4 = (const struct sockaddr_in *)addr; - memset(addr6_out, 0, sizeof(*addr6_out)); - addr6_out->sin6_family = AF_INET6; - memcpy(&addr6_out->sin6_addr.s6_addr[0], kV4MappedPrefix, 12); - memcpy(&addr6_out->sin6_addr.s6_addr[12], &addr4->sin_addr, 4); - addr6_out->sin6_port = addr4->sin_port; - return 1; - } +int +grpc_sockaddr_to_v4mapped (const struct sockaddr *addr, struct sockaddr_in6 *addr6_out) +{ + GPR_ASSERT (addr != (struct sockaddr *) addr6_out); + if (addr->sa_family == AF_INET) + { + const struct sockaddr_in *addr4 = (const struct sockaddr_in *) addr; + memset (addr6_out, 0, sizeof (*addr6_out)); + addr6_out->sin6_family = AF_INET6; + memcpy (&addr6_out->sin6_addr.s6_addr[0], kV4MappedPrefix, 12); + memcpy (&addr6_out->sin6_addr.s6_addr[12], &addr4->sin_addr, 4); + addr6_out->sin6_port = addr4->sin_port; + return 1; + } return 0; } -int grpc_sockaddr_is_wildcard(const struct sockaddr *addr, int *port_out) { +int +grpc_sockaddr_is_wildcard (const struct sockaddr *addr, int *port_out) +{ struct sockaddr_in addr4_normalized; - if (grpc_sockaddr_is_v4mapped(addr, &addr4_normalized)) { - addr = (struct sockaddr *)&addr4_normalized; - } - if (addr->sa_family == AF_INET) { - /* Check for 0.0.0.0 */ - const struct sockaddr_in *addr4 = (const struct sockaddr_in *)addr; - if (addr4->sin_addr.s_addr != 0) { - return 0; + if (grpc_sockaddr_is_v4mapped (addr, &addr4_normalized)) + { + addr = (struct sockaddr *) &addr4_normalized; } - *port_out = ntohs(addr4->sin_port); - return 1; - } else if (addr->sa_family == AF_INET6) { - /* Check for :: */ - const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *)addr; - int i; - for (i = 0; i < 16; i++) { - if (addr6->sin6_addr.s6_addr[i] != 0) { - return 0; - } + if (addr->sa_family == AF_INET) + { + /* Check for 0.0.0.0 */ + const struct sockaddr_in *addr4 = (const struct sockaddr_in *) addr; + if (addr4->sin_addr.s_addr != 0) + { + return 0; + } + *port_out = ntohs (addr4->sin_port); + return 1; + } + else if (addr->sa_family == AF_INET6) + { + /* Check for :: */ + const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *) addr; + int i; + for (i = 0; i < 16; i++) + { + if (addr6->sin6_addr.s6_addr[i] != 0) + { + return 0; + } + } + *port_out = ntohs (addr6->sin6_port); + return 1; + } + else + { + return 0; } - *port_out = ntohs(addr6->sin6_port); - return 1; - } else { - return 0; - } } -void grpc_sockaddr_make_wildcards(int port, struct sockaddr_in *wild4_out, - struct sockaddr_in6 *wild6_out) { - grpc_sockaddr_make_wildcard4(port, wild4_out); - grpc_sockaddr_make_wildcard6(port, wild6_out); +void +grpc_sockaddr_make_wildcards (int port, struct sockaddr_in *wild4_out, struct sockaddr_in6 *wild6_out) +{ + grpc_sockaddr_make_wildcard4 (port, wild4_out); + grpc_sockaddr_make_wildcard6 (port, wild6_out); } -void grpc_sockaddr_make_wildcard4(int port, struct sockaddr_in *wild_out) { - GPR_ASSERT(port >= 0 && port < 65536); - memset(wild_out, 0, sizeof(*wild_out)); +void +grpc_sockaddr_make_wildcard4 (int port, struct sockaddr_in *wild_out) +{ + GPR_ASSERT (port >= 0 && port < 65536); + memset (wild_out, 0, sizeof (*wild_out)); wild_out->sin_family = AF_INET; - wild_out->sin_port = htons((gpr_uint16)port); + wild_out->sin_port = htons ((gpr_uint16) port); } -void grpc_sockaddr_make_wildcard6(int port, struct sockaddr_in6 *wild_out) { - GPR_ASSERT(port >= 0 && port < 65536); - memset(wild_out, 0, sizeof(*wild_out)); +void +grpc_sockaddr_make_wildcard6 (int port, struct sockaddr_in6 *wild_out) +{ + GPR_ASSERT (port >= 0 && port < 65536); + memset (wild_out, 0, sizeof (*wild_out)); wild_out->sin6_family = AF_INET6; - wild_out->sin6_port = htons((gpr_uint16)port); + wild_out->sin6_port = htons ((gpr_uint16) port); } -int grpc_sockaddr_to_string(char **out, const struct sockaddr *addr, - int normalize) { +int +grpc_sockaddr_to_string (char **out, const struct sockaddr *addr, int normalize) +{ const int save_errno = errno; struct sockaddr_in addr_normalized; char ntop_buf[INET6_ADDRSTRLEN]; @@ -146,87 +169,101 @@ int grpc_sockaddr_to_string(char **out, const struct sockaddr *addr, int ret; *out = NULL; - if (normalize && grpc_sockaddr_is_v4mapped(addr, &addr_normalized)) { - addr = (const struct sockaddr *)&addr_normalized; - } - if (addr->sa_family == AF_INET) { - const struct sockaddr_in *addr4 = (const struct sockaddr_in *)addr; - ip = &addr4->sin_addr; - port = ntohs(addr4->sin_port); - } else if (addr->sa_family == AF_INET6) { - const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *)addr; - ip = &addr6->sin6_addr; - port = ntohs(addr6->sin6_port); - } - if (ip != NULL && - inet_ntop(addr->sa_family, ip, ntop_buf, sizeof(ntop_buf)) != NULL) { - ret = gpr_join_host_port(out, ntop_buf, port); - } else { - ret = gpr_asprintf(out, "(sockaddr family=%d)", addr->sa_family); - } + if (normalize && grpc_sockaddr_is_v4mapped (addr, &addr_normalized)) + { + addr = (const struct sockaddr *) &addr_normalized; + } + if (addr->sa_family == AF_INET) + { + const struct sockaddr_in *addr4 = (const struct sockaddr_in *) addr; + ip = &addr4->sin_addr; + port = ntohs (addr4->sin_port); + } + else if (addr->sa_family == AF_INET6) + { + const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *) addr; + ip = &addr6->sin6_addr; + port = ntohs (addr6->sin6_port); + } + if (ip != NULL && inet_ntop (addr->sa_family, ip, ntop_buf, sizeof (ntop_buf)) != NULL) + { + ret = gpr_join_host_port (out, ntop_buf, port); + } + else + { + ret = gpr_asprintf (out, "(sockaddr family=%d)", addr->sa_family); + } /* This is probably redundant, but we wouldn't want to log the wrong error. */ errno = save_errno; return ret; } -char *grpc_sockaddr_to_uri(const struct sockaddr *addr) { +char * +grpc_sockaddr_to_uri (const struct sockaddr *addr) +{ char *temp; char *result; struct sockaddr_in addr_normalized; - if (grpc_sockaddr_is_v4mapped(addr, &addr_normalized)) { - addr = (const struct sockaddr *)&addr_normalized; - } + if (grpc_sockaddr_is_v4mapped (addr, &addr_normalized)) + { + addr = (const struct sockaddr *) &addr_normalized; + } - switch (addr->sa_family) { + switch (addr->sa_family) + { case AF_INET: - grpc_sockaddr_to_string(&temp, addr, 0); - gpr_asprintf(&result, "ipv4:%s", temp); - gpr_free(temp); + grpc_sockaddr_to_string (&temp, addr, 0); + gpr_asprintf (&result, "ipv4:%s", temp); + gpr_free (temp); return result; case AF_INET6: - grpc_sockaddr_to_string(&temp, addr, 0); - gpr_asprintf(&result, "ipv6:%s", temp); - gpr_free(temp); + grpc_sockaddr_to_string (&temp, addr, 0); + gpr_asprintf (&result, "ipv6:%s", temp); + gpr_free (temp); return result; #ifdef GPR_POSIX_SOCKET case AF_UNIX: - gpr_asprintf(&result, "unix:%s", ((struct sockaddr_un *)addr)->sun_path); + gpr_asprintf (&result, "unix:%s", ((struct sockaddr_un *) addr)->sun_path); return result; #endif - } + } return NULL; } -int grpc_sockaddr_get_port(const struct sockaddr *addr) { - switch (addr->sa_family) { +int +grpc_sockaddr_get_port (const struct sockaddr *addr) +{ + switch (addr->sa_family) + { case AF_INET: - return ntohs(((struct sockaddr_in *)addr)->sin_port); + return ntohs (((struct sockaddr_in *) addr)->sin_port); case AF_INET6: - return ntohs(((struct sockaddr_in6 *)addr)->sin6_port); + return ntohs (((struct sockaddr_in6 *) addr)->sin6_port); case AF_UNIX: return 1; default: - gpr_log(GPR_ERROR, "Unknown socket family %d in grpc_sockaddr_get_port", - addr->sa_family); + gpr_log (GPR_ERROR, "Unknown socket family %d in grpc_sockaddr_get_port", addr->sa_family); return 0; - } + } } -int grpc_sockaddr_set_port(const struct sockaddr *addr, int port) { - switch (addr->sa_family) { +int +grpc_sockaddr_set_port (const struct sockaddr *addr, int port) +{ + switch (addr->sa_family) + { case AF_INET: - GPR_ASSERT(port >= 0 && port < 65536); - ((struct sockaddr_in *)addr)->sin_port = htons((gpr_uint16)port); + GPR_ASSERT (port >= 0 && port < 65536); + ((struct sockaddr_in *) addr)->sin_port = htons ((gpr_uint16) port); return 1; case AF_INET6: - GPR_ASSERT(port >= 0 && port < 65536); - ((struct sockaddr_in6 *)addr)->sin6_port = htons((gpr_uint16)port); + GPR_ASSERT (port >= 0 && port < 65536); + ((struct sockaddr_in6 *) addr)->sin6_port = htons ((gpr_uint16) port); return 1; default: - gpr_log(GPR_ERROR, "Unknown socket family %d in grpc_sockaddr_set_port", - addr->sa_family); + gpr_log (GPR_ERROR, "Unknown socket family %d in grpc_sockaddr_set_port", addr->sa_family); return 0; - } + } } diff --git a/src/core/iomgr/sockaddr_utils.h b/src/core/iomgr/sockaddr_utils.h index 6f7a279900d..bfbe37a28b8 100644 --- a/src/core/iomgr/sockaddr_utils.h +++ b/src/core/iomgr/sockaddr_utils.h @@ -41,33 +41,30 @@ If addr4_out is non-NULL, the inner IPv4 address will be copied here when returning true. */ -int grpc_sockaddr_is_v4mapped(const struct sockaddr *addr, - struct sockaddr_in *addr4_out); +int grpc_sockaddr_is_v4mapped (const struct sockaddr *addr, struct sockaddr_in *addr4_out); /* If addr is an AF_INET address, writes the corresponding ::ffff:0.0.0.0/96 address to addr6_out and returns true. Otherwise returns false. */ -int grpc_sockaddr_to_v4mapped(const struct sockaddr *addr, - struct sockaddr_in6 *addr6_out); +int grpc_sockaddr_to_v4mapped (const struct sockaddr *addr, struct sockaddr_in6 *addr6_out); /* If addr is ::, 0.0.0.0, or ::ffff:0.0.0.0, writes the port number to *port_out (if not NULL) and returns true, otherwise returns false. */ -int grpc_sockaddr_is_wildcard(const struct sockaddr *addr, int *port_out); +int grpc_sockaddr_is_wildcard (const struct sockaddr *addr, int *port_out); /* Writes 0.0.0.0:port and [::]:port to separate sockaddrs. */ -void grpc_sockaddr_make_wildcards(int port, struct sockaddr_in *wild4_out, - struct sockaddr_in6 *wild6_out); +void grpc_sockaddr_make_wildcards (int port, struct sockaddr_in *wild4_out, struct sockaddr_in6 *wild6_out); /* Writes 0.0.0.0:port. */ -void grpc_sockaddr_make_wildcard4(int port, struct sockaddr_in *wild_out); +void grpc_sockaddr_make_wildcard4 (int port, struct sockaddr_in *wild_out); /* Writes [::]:port. */ -void grpc_sockaddr_make_wildcard6(int port, struct sockaddr_in6 *wild_out); +void grpc_sockaddr_make_wildcard6 (int port, struct sockaddr_in6 *wild_out); /* Return the IP port number of a sockaddr */ -int grpc_sockaddr_get_port(const struct sockaddr *addr); +int grpc_sockaddr_get_port (const struct sockaddr *addr); /* Set IP port number of a sockaddr */ -int grpc_sockaddr_set_port(const struct sockaddr *addr, int port); +int grpc_sockaddr_set_port (const struct sockaddr *addr, int port); /* Converts a sockaddr into a newly-allocated human-readable string. @@ -81,9 +78,8 @@ int grpc_sockaddr_set_port(const struct sockaddr *addr, int port); In the unlikely event of an error, returns -1 and sets *out to NULL. The existing value of errno is always preserved. */ -int grpc_sockaddr_to_string(char **out, const struct sockaddr *addr, - int normalize); +int grpc_sockaddr_to_string (char **out, const struct sockaddr *addr, int normalize); -char *grpc_sockaddr_to_uri(const struct sockaddr *addr); +char *grpc_sockaddr_to_uri (const struct sockaddr *addr); #endif /* GRPC_INTERNAL_CORE_IOMGR_SOCKADDR_UTILS_H */ diff --git a/src/core/iomgr/sockaddr_win32.h b/src/core/iomgr/sockaddr_win32.h index fe2be991454..a5bcf9146f0 100644 --- a/src/core/iomgr/sockaddr_win32.h +++ b/src/core/iomgr/sockaddr_win32.h @@ -40,7 +40,7 @@ #ifdef __MINGW32__ /* mingw seems to be missing that definition. */ -const char *inet_ntop(int af, const void *src, char *dst, socklen_t size); +const char *inet_ntop (int af, const void *src, char *dst, socklen_t size); #endif #endif /* GRPC_INTERNAL_CORE_IOMGR_SOCKADDR_WIN32_H */ diff --git a/src/core/iomgr/socket_utils_common_posix.c b/src/core/iomgr/socket_utils_common_posix.c index a9af5947009..668383ff6ed 100644 --- a/src/core/iomgr/socket_utils_common_posix.c +++ b/src/core/iomgr/socket_utils_common_posix.c @@ -57,103 +57,126 @@ #include /* set a socket to non blocking mode */ -int grpc_set_socket_nonblocking(int fd, int non_blocking) { - int oldflags = fcntl(fd, F_GETFL, 0); - if (oldflags < 0) { - return 0; - } - - if (non_blocking) { - oldflags |= O_NONBLOCK; - } else { - oldflags &= ~O_NONBLOCK; - } - - if (fcntl(fd, F_SETFL, oldflags) != 0) { - return 0; - } +int +grpc_set_socket_nonblocking (int fd, int non_blocking) +{ + int oldflags = fcntl (fd, F_GETFL, 0); + if (oldflags < 0) + { + return 0; + } + + if (non_blocking) + { + oldflags |= O_NONBLOCK; + } + else + { + oldflags &= ~O_NONBLOCK; + } + + if (fcntl (fd, F_SETFL, oldflags) != 0) + { + return 0; + } return 1; } -int grpc_set_socket_no_sigpipe_if_possible(int fd) { +int +grpc_set_socket_no_sigpipe_if_possible (int fd) +{ #ifdef GPR_HAVE_SO_NOSIGPIPE int val = 1; int newval; - socklen_t intlen = sizeof(newval); - return 0 == setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof(val)) && - 0 == getsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &newval, &intlen) && - (newval != 0) == val; + socklen_t intlen = sizeof (newval); + return 0 == setsockopt (fd, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof (val)) && 0 == getsockopt (fd, SOL_SOCKET, SO_NOSIGPIPE, &newval, &intlen) && (newval != 0) == val; #else return 1; #endif } /* set a socket to close on exec */ -int grpc_set_socket_cloexec(int fd, int close_on_exec) { - int oldflags = fcntl(fd, F_GETFD, 0); - if (oldflags < 0) { - return 0; - } - - if (close_on_exec) { - oldflags |= FD_CLOEXEC; - } else { - oldflags &= ~FD_CLOEXEC; - } - - if (fcntl(fd, F_SETFD, oldflags) != 0) { - return 0; - } +int +grpc_set_socket_cloexec (int fd, int close_on_exec) +{ + int oldflags = fcntl (fd, F_GETFD, 0); + if (oldflags < 0) + { + return 0; + } + + if (close_on_exec) + { + oldflags |= FD_CLOEXEC; + } + else + { + oldflags &= ~FD_CLOEXEC; + } + + if (fcntl (fd, F_SETFD, oldflags) != 0) + { + return 0; + } return 1; } /* set a socket to reuse old addresses */ -int grpc_set_socket_reuse_addr(int fd, int reuse) { +int +grpc_set_socket_reuse_addr (int fd, int reuse) +{ int val = (reuse != 0); int newval; - socklen_t intlen = sizeof(newval); - return 0 == setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) && - 0 == getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &newval, &intlen) && - (newval != 0) == val; + socklen_t intlen = sizeof (newval); + return 0 == setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof (val)) && 0 == getsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &newval, &intlen) && (newval != 0) == val; } /* disable nagle */ -int grpc_set_socket_low_latency(int fd, int low_latency) { +int +grpc_set_socket_low_latency (int fd, int low_latency) +{ int val = (low_latency != 0); int newval; - socklen_t intlen = sizeof(newval); - return 0 == setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)) && - 0 == getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &newval, &intlen) && - (newval != 0) == val; + socklen_t intlen = sizeof (newval); + return 0 == setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)) && 0 == getsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &newval, &intlen) && (newval != 0) == val; } static gpr_once g_probe_ipv6_once = GPR_ONCE_INIT; static int g_ipv6_loopback_available; -static void probe_ipv6_once(void) { - int fd = socket(AF_INET6, SOCK_STREAM, 0); +static void +probe_ipv6_once (void) +{ + int fd = socket (AF_INET6, SOCK_STREAM, 0); g_ipv6_loopback_available = 0; - if (fd < 0) { - gpr_log(GPR_INFO, "Disabling AF_INET6 sockets because socket() failed."); - } else { - struct sockaddr_in6 addr; - memset(&addr, 0, sizeof(addr)); - addr.sin6_family = AF_INET6; - addr.sin6_addr.s6_addr[15] = 1; /* [::1]:0 */ - if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) == 0) { - g_ipv6_loopback_available = 1; - } else { - gpr_log(GPR_INFO, - "Disabling AF_INET6 sockets because ::1 is not available."); + if (fd < 0) + { + gpr_log (GPR_INFO, "Disabling AF_INET6 sockets because socket() failed."); + } + else + { + struct sockaddr_in6 addr; + memset (&addr, 0, sizeof (addr)); + addr.sin6_family = AF_INET6; + addr.sin6_addr.s6_addr[15] = 1; /* [::1]:0 */ + if (bind (fd, (struct sockaddr *) &addr, sizeof (addr)) == 0) + { + g_ipv6_loopback_available = 1; + } + else + { + gpr_log (GPR_INFO, "Disabling AF_INET6 sockets because ::1 is not available."); + } + close (fd); } - close(fd); - } } -int grpc_ipv6_loopback_available(void) { - gpr_once_init(&g_probe_ipv6_once, probe_ipv6_once); +int +grpc_ipv6_loopback_available (void) +{ + gpr_once_init (&g_probe_ipv6_once, probe_ipv6_once); return g_ipv6_loopback_available; } @@ -162,47 +185,60 @@ int grpc_ipv6_loopback_available(void) { also speak IPv4. */ int grpc_forbid_dualstack_sockets_for_testing = 0; -static int set_socket_dualstack(int fd) { - if (!grpc_forbid_dualstack_sockets_for_testing) { - const int off = 0; - return 0 == setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &off, sizeof(off)); - } else { - /* Force an IPv6-only socket, for testing purposes. */ - const int on = 1; - setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)); - return 0; - } +static int +set_socket_dualstack (int fd) +{ + if (!grpc_forbid_dualstack_sockets_for_testing) + { + const int off = 0; + return 0 == setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, &off, sizeof (off)); + } + else + { + /* Force an IPv6-only socket, for testing purposes. */ + const int on = 1; + setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof (on)); + return 0; + } } -int grpc_create_dualstack_socket(const struct sockaddr *addr, int type, - int protocol, grpc_dualstack_mode *dsmode) { +int +grpc_create_dualstack_socket (const struct sockaddr *addr, int type, int protocol, grpc_dualstack_mode * dsmode) +{ int family = addr->sa_family; - if (family == AF_INET6) { - int fd; - if (grpc_ipv6_loopback_available()) { - fd = socket(family, type, protocol); - } else { - fd = -1; - errno = EAFNOSUPPORT; - } - /* Check if we've got a valid dualstack socket. */ - if (fd >= 0 && set_socket_dualstack(fd)) { - *dsmode = GRPC_DSMODE_DUALSTACK; - return fd; - } - /* If this isn't an IPv4 address, then return whatever we've got. */ - if (!grpc_sockaddr_is_v4mapped(addr, NULL)) { - *dsmode = GRPC_DSMODE_IPV6; - return fd; - } - /* Fall back to AF_INET. */ - if (fd >= 0) { - close(fd); + if (family == AF_INET6) + { + int fd; + if (grpc_ipv6_loopback_available ()) + { + fd = socket (family, type, protocol); + } + else + { + fd = -1; + errno = EAFNOSUPPORT; + } + /* Check if we've got a valid dualstack socket. */ + if (fd >= 0 && set_socket_dualstack (fd)) + { + *dsmode = GRPC_DSMODE_DUALSTACK; + return fd; + } + /* If this isn't an IPv4 address, then return whatever we've got. */ + if (!grpc_sockaddr_is_v4mapped (addr, NULL)) + { + *dsmode = GRPC_DSMODE_IPV6; + return fd; + } + /* Fall back to AF_INET. */ + if (fd >= 0) + { + close (fd); + } + family = AF_INET; } - family = AF_INET; - } *dsmode = family == AF_INET ? GRPC_DSMODE_IPV4 : GRPC_DSMODE_NONE; - return socket(family, type, protocol); + return socket (family, type, protocol); } #endif diff --git a/src/core/iomgr/socket_utils_linux.c b/src/core/iomgr/socket_utils_linux.c index a87625262b2..a21ae656fb7 100644 --- a/src/core/iomgr/socket_utils_linux.c +++ b/src/core/iomgr/socket_utils_linux.c @@ -40,12 +40,13 @@ #include #include -int grpc_accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, - int nonblock, int cloexec) { +int +grpc_accept4 (int sockfd, struct sockaddr *addr, socklen_t * addrlen, int nonblock, int cloexec) +{ int flags = 0; flags |= nonblock ? SOCK_NONBLOCK : 0; flags |= cloexec ? SOCK_CLOEXEC : 0; - return accept4(sockfd, addr, addrlen, flags); + return accept4 (sockfd, addr, addrlen, flags); } #endif diff --git a/src/core/iomgr/socket_utils_posix.c b/src/core/iomgr/socket_utils_posix.c index 3c56b467443..1e32d7461fd 100644 --- a/src/core/iomgr/socket_utils_posix.c +++ b/src/core/iomgr/socket_utils_posix.c @@ -43,27 +43,35 @@ #include -int grpc_accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, - int nonblock, int cloexec) { +int +grpc_accept4 (int sockfd, struct sockaddr *addr, socklen_t * addrlen, int nonblock, int cloexec) +{ int fd, flags; - fd = accept(sockfd, addr, addrlen); - if (fd >= 0) { - if (nonblock) { - flags = fcntl(fd, F_GETFL, 0); - if (flags < 0) goto close_and_error; - if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) != 0) goto close_and_error; + fd = accept (sockfd, addr, addrlen); + if (fd >= 0) + { + if (nonblock) + { + flags = fcntl (fd, F_GETFL, 0); + if (flags < 0) + goto close_and_error; + if (fcntl (fd, F_SETFL, flags | O_NONBLOCK) != 0) + goto close_and_error; + } + if (cloexec) + { + flags = fcntl (fd, F_GETFD, 0); + if (flags < 0) + goto close_and_error; + if (fcntl (fd, F_SETFD, flags | FD_CLOEXEC) != 0) + goto close_and_error; + } } - if (cloexec) { - flags = fcntl(fd, F_GETFD, 0); - if (flags < 0) goto close_and_error; - if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) != 0) goto close_and_error; - } - } return fd; close_and_error: - close(fd); + close (fd); return -1; } diff --git a/src/core/iomgr/socket_utils_posix.h b/src/core/iomgr/socket_utils_posix.h index d330d1986eb..8e0492802a1 100644 --- a/src/core/iomgr/socket_utils_posix.h +++ b/src/core/iomgr/socket_utils_posix.h @@ -38,20 +38,19 @@ #include /* a wrapper for accept or accept4 */ -int grpc_accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, - int nonblock, int cloexec); +int grpc_accept4 (int sockfd, struct sockaddr *addr, socklen_t * addrlen, int nonblock, int cloexec); /* set a socket to non blocking mode */ -int grpc_set_socket_nonblocking(int fd, int non_blocking); +int grpc_set_socket_nonblocking (int fd, int non_blocking); /* set a socket to close on exec */ -int grpc_set_socket_cloexec(int fd, int close_on_exec); +int grpc_set_socket_cloexec (int fd, int close_on_exec); /* set a socket to reuse old addresses */ -int grpc_set_socket_reuse_addr(int fd, int reuse); +int grpc_set_socket_reuse_addr (int fd, int reuse); /* disable nagle */ -int grpc_set_socket_low_latency(int fd, int low_latency); +int grpc_set_socket_low_latency (int fd, int low_latency); /* Returns true if this system can create AF_INET6 sockets bound to ::1. The value is probed once, and cached for the life of the process. @@ -61,19 +60,20 @@ int grpc_set_socket_low_latency(int fd, int low_latency); and bind IPv6 sockets, but cannot connect to a getsockname() of [::]:port without a valid loopback interface. Rather than expose this half-broken state to library users, we turn off IPv6 sockets. */ -int grpc_ipv6_loopback_available(void); +int grpc_ipv6_loopback_available (void); /* Tries to set SO_NOSIGPIPE if available on this platform. Returns 1 on success, 0 on failure. If SO_NO_SIGPIPE is not available, returns 1. */ -int grpc_set_socket_no_sigpipe_if_possible(int fd); +int grpc_set_socket_no_sigpipe_if_possible (int fd); /* An enum to keep track of IPv4/IPv6 socket modes. Currently, this information is only used when a socket is first created, but in the future we may wish to store it alongside the fd. This would let calls like sendto() know which family to use without asking the kernel first. */ -typedef enum grpc_dualstack_mode { +typedef enum grpc_dualstack_mode +{ /* Uninitialized, or a non-IP socket. */ GRPC_DSMODE_NONE, /* AF_INET only. */ @@ -107,7 +107,6 @@ extern int grpc_forbid_dualstack_sockets_for_testing; IPv4, so that bind() or connect() see the correct family. Also, it's important to distinguish between DUALSTACK and IPV6 when listening on the [::] wildcard address. */ -int grpc_create_dualstack_socket(const struct sockaddr *addr, int type, - int protocol, grpc_dualstack_mode *dsmode); +int grpc_create_dualstack_socket (const struct sockaddr *addr, int type, int protocol, grpc_dualstack_mode * dsmode); #endif /* GRPC_INTERNAL_CORE_IOMGR_SOCKET_UTILS_POSIX_H */ diff --git a/src/core/iomgr/socket_windows.c b/src/core/iomgr/socket_windows.c index fafb7b6622b..3e0cad0c7bf 100644 --- a/src/core/iomgr/socket_windows.c +++ b/src/core/iomgr/socket_windows.c @@ -49,16 +49,18 @@ #include "src/core/iomgr/pollset_windows.h" #include "src/core/iomgr/socket_windows.h" -grpc_winsocket *grpc_winsocket_create(SOCKET socket, const char *name) { +grpc_winsocket * +grpc_winsocket_create (SOCKET socket, const char *name) +{ char *final_name; - grpc_winsocket *r = gpr_malloc(sizeof(grpc_winsocket)); - memset(r, 0, sizeof(grpc_winsocket)); + grpc_winsocket *r = gpr_malloc (sizeof (grpc_winsocket)); + memset (r, 0, sizeof (grpc_winsocket)); r->socket = socket; - gpr_mu_init(&r->state_mu); - gpr_asprintf(&final_name, "%s:socket=0x%p", name, r); - grpc_iomgr_register_object(&r->iomgr_object, final_name); - gpr_free(final_name); - grpc_iocp_add_socket(r); + gpr_mu_init (&r->state_mu); + gpr_asprintf (&final_name, "%s:socket=0x%p", name, r); + grpc_iomgr_register_object (&r->iomgr_object, final_name); + gpr_free (final_name); + grpc_iocp_add_socket (r); return r; } @@ -66,7 +68,9 @@ grpc_winsocket *grpc_winsocket_create(SOCKET socket, const char *name) { operations to abort them. We need to do that this way because of the various callsites of that function, which happens to be in various mutex hold states, and that'd be unsafe to call them directly. */ -void grpc_winsocket_shutdown(grpc_winsocket *winsocket) { +void +grpc_winsocket_shutdown (grpc_winsocket * winsocket) +{ /* Grab the function pointer for DisconnectEx for that specific socket. It may change depending on the interface. */ int status; @@ -74,25 +78,27 @@ void grpc_winsocket_shutdown(grpc_winsocket *winsocket) { LPFN_DISCONNECTEX DisconnectEx; DWORD ioctl_num_bytes; - status = WSAIoctl(winsocket->socket, SIO_GET_EXTENSION_FUNCTION_POINTER, - &guid, sizeof(guid), &DisconnectEx, sizeof(DisconnectEx), - &ioctl_num_bytes, NULL, NULL); + status = WSAIoctl (winsocket->socket, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof (guid), &DisconnectEx, sizeof (DisconnectEx), &ioctl_num_bytes, NULL, NULL); - if (status == 0) { - DisconnectEx(winsocket->socket, NULL, 0, 0); - } else { - char *utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "Unable to retrieve DisconnectEx pointer : %s", - utf8_message); - gpr_free(utf8_message); - } - closesocket(winsocket->socket); + if (status == 0) + { + DisconnectEx (winsocket->socket, NULL, 0, 0); + } + else + { + char *utf8_message = gpr_format_message (WSAGetLastError ()); + gpr_log (GPR_ERROR, "Unable to retrieve DisconnectEx pointer : %s", utf8_message); + gpr_free (utf8_message); + } + closesocket (winsocket->socket); } -void grpc_winsocket_destroy(grpc_winsocket *winsocket) { - grpc_iomgr_unregister_object(&winsocket->iomgr_object); - gpr_mu_destroy(&winsocket->state_mu); - gpr_free(winsocket); +void +grpc_winsocket_destroy (grpc_winsocket * winsocket) +{ + grpc_iomgr_unregister_object (&winsocket->iomgr_object); + gpr_mu_destroy (&winsocket->state_mu); + gpr_free (winsocket); } #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/socket_windows.h b/src/core/iomgr/socket_windows.h index 45bc6572257..df2a7304138 100644 --- a/src/core/iomgr/socket_windows.h +++ b/src/core/iomgr/socket_windows.h @@ -45,7 +45,8 @@ /* This holds the data for an outstanding read or write on a socket. The mutex to protect the concurrent access to that data is the one inside the winsocket wrapper. */ -typedef struct grpc_winsocket_callback_info { +typedef struct grpc_winsocket_callback_info +{ /* This is supposed to be a WSAOVERLAPPED, but in order to get that definition, we need to include ws2tcpip.h, which needs to be included from the top, otherwise it'll clash with a previous inclusion of @@ -54,7 +55,7 @@ typedef struct grpc_winsocket_callback_info { OVERLAPPED overlapped; /* The callback information for the pending operation. May be empty if the caller hasn't registered a callback yet. */ - void (*cb)(void *opaque, int success); + void (*cb) (void *opaque, int success); void *opaque; /* A boolean to describe if the IO Completion Port got a notification for that operation. This will happen if the operation completed before the @@ -79,7 +80,8 @@ typedef struct grpc_winsocket_callback_info { operation callbacks for connect and listen. But given the scope of listen and accept, we don't need to go to that extent and waste memory. Also, this is closer to what happens in posix world. */ -typedef struct grpc_winsocket { +typedef struct grpc_winsocket +{ SOCKET socket; grpc_winsocket_callback_info write_info; @@ -99,13 +101,13 @@ typedef struct grpc_winsocket { /* Create a wrapped windows handle. This takes ownership of it, meaning that it will be responsible for closing it. */ -grpc_winsocket *grpc_winsocket_create(SOCKET socket, const char *name); +grpc_winsocket *grpc_winsocket_create (SOCKET socket, const char *name); /* Initiate an asynchronous shutdown of the socket. Will call off any pending operation to cancel them. */ -void grpc_winsocket_shutdown(grpc_winsocket *socket); +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_winsocket_destroy (grpc_winsocket * socket); #endif /* GRPC_INTERNAL_CORE_IOMGR_SOCKET_WINDOWS_H */ diff --git a/src/core/iomgr/tcp_client.h b/src/core/iomgr/tcp_client.h index 971e984e540..a97ca351284 100644 --- a/src/core/iomgr/tcp_client.h +++ b/src/core/iomgr/tcp_client.h @@ -44,10 +44,6 @@ 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, - grpc_pollset_set *interested_parties, - const struct sockaddr *addr, size_t addr_len, - gpr_timespec deadline, - grpc_closure_list *closure_list); +void grpc_tcp_client_connect (grpc_closure * on_connect, grpc_endpoint ** endpoint, grpc_pollset_set * interested_parties, const struct sockaddr *addr, size_t addr_len, gpr_timespec deadline, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_TCP_CLIENT_H */ diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c index e23551c4c0c..14255bda074 100644 --- a/src/core/iomgr/tcp_client_posix.c +++ b/src/core/iomgr/tcp_client_posix.c @@ -56,7 +56,8 @@ extern int grpc_tcp_trace; -typedef struct { +typedef struct +{ gpr_mu mu; grpc_fd *fd; gpr_timespec deadline; @@ -69,51 +70,57 @@ typedef struct { grpc_closure *closure; } async_connect; -static int prepare_socket(const struct sockaddr *addr, int fd) { - if (fd < 0) { - goto error; - } +static int +prepare_socket (const struct sockaddr *addr, int fd) +{ + if (fd < 0) + { + goto error; + } - if (!grpc_set_socket_nonblocking(fd, 1) || !grpc_set_socket_cloexec(fd, 1) || - (addr->sa_family != AF_UNIX && !grpc_set_socket_low_latency(fd, 1)) || - !grpc_set_socket_no_sigpipe_if_possible(fd)) { - gpr_log(GPR_ERROR, "Unable to configure socket %d: %s", fd, - strerror(errno)); - goto error; - } + if (!grpc_set_socket_nonblocking (fd, 1) || !grpc_set_socket_cloexec (fd, 1) || (addr->sa_family != AF_UNIX && !grpc_set_socket_low_latency (fd, 1)) || !grpc_set_socket_no_sigpipe_if_possible (fd)) + { + gpr_log (GPR_ERROR, "Unable to configure socket %d: %s", fd, strerror (errno)); + goto error; + } return 1; error: - if (fd >= 0) { - close(fd); - } + if (fd >= 0) + { + close (fd); + } return 0; } -static void tc_on_alarm(void *acp, int success, - grpc_closure_list *closure_list) { +static void +tc_on_alarm (void *acp, int success, grpc_closure_list * closure_list) +{ int done; async_connect *ac = acp; - if (grpc_tcp_trace) { - gpr_log(GPR_DEBUG, "CLIENT_CONNECT: %s: on_alarm: success=%d", ac->addr_str, - success); - } - gpr_mu_lock(&ac->mu); - if (ac->fd != NULL) { - grpc_fd_shutdown(ac->fd, closure_list); - } + if (grpc_tcp_trace) + { + gpr_log (GPR_DEBUG, "CLIENT_CONNECT: %s: on_alarm: success=%d", ac->addr_str, success); + } + gpr_mu_lock (&ac->mu); + if (ac->fd != NULL) + { + grpc_fd_shutdown (ac->fd, closure_list); + } done = (--ac->refs == 0); - gpr_mu_unlock(&ac->mu); - if (done) { - gpr_mu_destroy(&ac->mu); - gpr_free(ac->addr_str); - gpr_free(ac); - } + gpr_mu_unlock (&ac->mu); + if (done) + { + gpr_mu_destroy (&ac->mu); + gpr_free (ac->addr_str); + gpr_free (ac); + } } -static void on_writable(void *acp, int success, - grpc_closure_list *closure_list) { +static void +on_writable (void *acp, int success, grpc_closure_list * closure_list) +{ async_connect *ac = acp; int so_error = 0; socklen_t so_error_size; @@ -123,93 +130,107 @@ static void on_writable(void *acp, int success, grpc_closure *closure = ac->closure; grpc_fd *fd; - if (grpc_tcp_trace) { - gpr_log(GPR_DEBUG, "CLIENT_CONNECT: %s: on_writable: success=%d", - ac->addr_str, success); - } + if (grpc_tcp_trace) + { + gpr_log (GPR_DEBUG, "CLIENT_CONNECT: %s: on_writable: success=%d", ac->addr_str, success); + } - gpr_mu_lock(&ac->mu); - GPR_ASSERT(ac->fd); + gpr_mu_lock (&ac->mu); + GPR_ASSERT (ac->fd); fd = ac->fd; ac->fd = NULL; - gpr_mu_unlock(&ac->mu); - - grpc_alarm_cancel(&ac->alarm, closure_list); - - gpr_mu_lock(&ac->mu); - if (success) { - do { - so_error_size = sizeof(so_error); - err = getsockopt(fd->fd, SOL_SOCKET, SO_ERROR, &so_error, &so_error_size); - } while (err < 0 && errno == EINTR); - if (err < 0) { - gpr_log(GPR_ERROR, "getsockopt(ERROR): %s", strerror(errno)); - goto finish; - } else if (so_error != 0) { - if (so_error == ENOBUFS) { - /* We will get one of these errors if we have run out of - memory in the kernel for the data structures allocated - when you connect a socket. If this happens it is very - likely that if we wait a little bit then try again the - connection will work (since other programs or this - program will close their network connections and free up - memory). This does _not_ indicate that there is anything - wrong with the server we are connecting to, this is a - local problem. - - If you are looking at this code, then chances are that - your program or another program on the same computer - opened too many network connections. The "easy" fix: - 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, closure_list); - return; - } else { - switch (so_error) { - case ECONNREFUSED: - gpr_log(GPR_ERROR, "socket error: connection refused"); - break; - default: - gpr_log(GPR_ERROR, "socket error: %d", so_error); - break; - } - goto finish; - } - } else { - grpc_pollset_set_del_fd(ac->interested_parties, fd, closure_list); - *ep = grpc_tcp_create(fd, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, ac->addr_str); - fd = NULL; + gpr_mu_unlock (&ac->mu); + + grpc_alarm_cancel (&ac->alarm, closure_list); + + gpr_mu_lock (&ac->mu); + if (success) + { + do + { + so_error_size = sizeof (so_error); + err = getsockopt (fd->fd, SOL_SOCKET, SO_ERROR, &so_error, &so_error_size); + } + while (err < 0 && errno == EINTR); + if (err < 0) + { + gpr_log (GPR_ERROR, "getsockopt(ERROR): %s", strerror (errno)); + goto finish; + } + else if (so_error != 0) + { + if (so_error == ENOBUFS) + { + /* We will get one of these errors if we have run out of + memory in the kernel for the data structures allocated + when you connect a socket. If this happens it is very + likely that if we wait a little bit then try again the + connection will work (since other programs or this + program will close their network connections and free up + memory). This does _not_ indicate that there is anything + wrong with the server we are connecting to, this is a + local problem. + + If you are looking at this code, then chances are that + your program or another program on the same computer + opened too many network connections. The "easy" fix: + 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, closure_list); + return; + } + else + { + switch (so_error) + { + case ECONNREFUSED: + gpr_log (GPR_ERROR, "socket error: connection refused"); + break; + default: + gpr_log (GPR_ERROR, "socket error: %d", so_error); + break; + } + goto finish; + } + } + else + { + grpc_pollset_set_del_fd (ac->interested_parties, fd, closure_list); + *ep = grpc_tcp_create (fd, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, ac->addr_str); + fd = NULL; + goto finish; + } + } + else + { + gpr_log (GPR_ERROR, "on_writable failed during connect"); goto finish; } - } else { - gpr_log(GPR_ERROR, "on_writable failed during connect"); - goto finish; - } - abort(); + abort (); finish: - if (fd != NULL) { - grpc_pollset_set_del_fd(ac->interested_parties, fd, closure_list); - grpc_fd_orphan(fd, NULL, "tcp_client_orphan", closure_list); - fd = NULL; - } + if (fd != NULL) + { + grpc_pollset_set_del_fd (ac->interested_parties, fd, closure_list); + grpc_fd_orphan (fd, NULL, "tcp_client_orphan", closure_list); + fd = NULL; + } done = (--ac->refs == 0); - gpr_mu_unlock(&ac->mu); - if (done) { - gpr_mu_destroy(&ac->mu); - gpr_free(ac->addr_str); - gpr_free(ac); - } - grpc_closure_list_add(closure_list, closure, *ep != NULL); + gpr_mu_unlock (&ac->mu); + if (done) + { + gpr_mu_destroy (&ac->mu); + gpr_free (ac->addr_str); + gpr_free (ac); + } + grpc_closure_list_add (closure_list, closure, *ep != NULL); } -void grpc_tcp_client_connect(grpc_closure *closure, grpc_endpoint **ep, - grpc_pollset_set *interested_parties, - const struct sockaddr *addr, size_t addr_len, - gpr_timespec deadline, - grpc_closure_list *closure_list) { +void +grpc_tcp_client_connect (grpc_closure * closure, grpc_endpoint ** ep, grpc_pollset_set * interested_parties, const struct sockaddr *addr, size_t addr_len, gpr_timespec deadline, grpc_closure_list * closure_list) +{ int fd; grpc_dualstack_mode dsmode; int err; @@ -223,78 +244,84 @@ void grpc_tcp_client_connect(grpc_closure *closure, grpc_endpoint **ep, *ep = NULL; /* Use dualstack sockets where available. */ - if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) { - addr = (const struct sockaddr *)&addr6_v4mapped; - addr_len = sizeof(addr6_v4mapped); - } - - fd = grpc_create_dualstack_socket(addr, SOCK_STREAM, 0, &dsmode); - if (fd < 0) { - gpr_log(GPR_ERROR, "Unable to create socket: %s", strerror(errno)); - } - 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 = (struct sockaddr *)&addr4_copy; - addr_len = sizeof(addr4_copy); - } - if (!prepare_socket(addr, fd)) { - grpc_closure_list_add(closure_list, closure, 0); - return; - } - - do { - GPR_ASSERT(addr_len < ~(socklen_t)0); - err = connect(fd, 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) { - *ep = grpc_tcp_create(fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str); - grpc_closure_list_add(closure_list, closure, 1); - goto done; - } - - if (errno != EWOULDBLOCK && errno != EINPROGRESS) { - gpr_log(GPR_ERROR, "connect error to '%s': %s", addr_str, strerror(errno)); - grpc_fd_orphan(fdobj, NULL, "tcp_client_connect_error", closure_list); - grpc_closure_list_add(closure_list, closure, 0); - goto done; - } - - grpc_pollset_set_add_fd(interested_parties, fdobj, closure_list); - - ac = gpr_malloc(sizeof(async_connect)); + if (grpc_sockaddr_to_v4mapped (addr, &addr6_v4mapped)) + { + addr = (const struct sockaddr *) &addr6_v4mapped; + addr_len = sizeof (addr6_v4mapped); + } + + fd = grpc_create_dualstack_socket (addr, SOCK_STREAM, 0, &dsmode); + if (fd < 0) + { + gpr_log (GPR_ERROR, "Unable to create socket: %s", strerror (errno)); + } + 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 = (struct sockaddr *) &addr4_copy; + addr_len = sizeof (addr4_copy); + } + if (!prepare_socket (addr, fd)) + { + grpc_closure_list_add (closure_list, closure, 0); + return; + } + + do + { + GPR_ASSERT (addr_len < ~(socklen_t) 0); + err = connect (fd, 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) + { + *ep = grpc_tcp_create (fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str); + grpc_closure_list_add (closure_list, closure, 1); + goto done; + } + + if (errno != EWOULDBLOCK && errno != EINPROGRESS) + { + gpr_log (GPR_ERROR, "connect error to '%s': %s", addr_str, strerror (errno)); + grpc_fd_orphan (fdobj, NULL, "tcp_client_connect_error", closure_list); + grpc_closure_list_add (closure_list, closure, 0); + goto done; + } + + grpc_pollset_set_add_fd (interested_parties, fdobj, closure_list); + + ac = gpr_malloc (sizeof (async_connect)); ac->closure = closure; ac->ep = ep; ac->fd = fdobj; ac->interested_parties = interested_parties; ac->addr_str = addr_str; addr_str = NULL; - gpr_mu_init(&ac->mu); + gpr_mu_init (&ac->mu); ac->refs = 2; ac->write_closure.cb = on_writable; ac->write_closure.cb_arg = ac; - if (grpc_tcp_trace) { - gpr_log(GPR_DEBUG, "CLIENT_CONNECT: %s: asynchronously connecting", - ac->addr_str); - } + if (grpc_tcp_trace) + { + gpr_log (GPR_DEBUG, "CLIENT_CONNECT: %s: asynchronously connecting", ac->addr_str); + } - gpr_mu_lock(&ac->mu); - grpc_alarm_init(&ac->alarm, - gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC), - tc_on_alarm, ac, gpr_now(GPR_CLOCK_MONOTONIC), closure_list); - grpc_fd_notify_on_write(ac->fd, &ac->write_closure, closure_list); - gpr_mu_unlock(&ac->mu); + gpr_mu_lock (&ac->mu); + grpc_alarm_init (&ac->alarm, gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC), tc_on_alarm, ac, gpr_now (GPR_CLOCK_MONOTONIC), closure_list); + grpc_fd_notify_on_write (ac->fd, &ac->write_closure, closure_list); + gpr_mu_unlock (&ac->mu); done: - gpr_free(name); - gpr_free(addr_str); + gpr_free (name); + gpr_free (addr_str); } #endif diff --git a/src/core/iomgr/tcp_client_windows.c b/src/core/iomgr/tcp_client_windows.c index 28f1bc96c8d..03a9a9c9d69 100644 --- a/src/core/iomgr/tcp_client_windows.c +++ b/src/core/iomgr/tcp_client_windows.c @@ -51,8 +51,9 @@ #include "src/core/iomgr/sockaddr_utils.h" #include "src/core/iomgr/socket_windows.h" -typedef struct { - void (*cb)(void *arg, grpc_endpoint *tcp); +typedef struct +{ + void (*cb) (void *arg, grpc_endpoint * tcp); void *cb_arg; gpr_mu mu; grpc_winsocket *socket; @@ -62,67 +63,79 @@ typedef struct { int refs; } async_connect; -static void async_connect_unlock_and_cleanup(async_connect *ac) { +static void +async_connect_unlock_and_cleanup (async_connect * ac) +{ int done = (--ac->refs == 0); - gpr_mu_unlock(&ac->mu); - if (done) { - if (ac->socket != NULL) grpc_winsocket_destroy(ac->socket); - gpr_mu_destroy(&ac->mu); - gpr_free(ac->addr_name); - gpr_free(ac); - } + gpr_mu_unlock (&ac->mu); + if (done) + { + if (ac->socket != NULL) + grpc_winsocket_destroy (ac->socket); + gpr_mu_destroy (&ac->mu); + gpr_free (ac->addr_name); + gpr_free (ac); + } } -static void on_alarm(void *acp, int occured) { +static void +on_alarm (void *acp, int occured) +{ async_connect *ac = acp; - gpr_mu_lock(&ac->mu); + gpr_mu_lock (&ac->mu); /* If the alarm didn't occur, it got cancelled. */ - if (ac->socket != NULL && occured) { - grpc_winsocket_shutdown(ac->socket); - } - async_connect_unlock_and_cleanup(ac); + if (ac->socket != NULL && occured) + { + grpc_winsocket_shutdown (ac->socket); + } + async_connect_unlock_and_cleanup (ac); } -static void on_connect(void *acp, int from_iocp) { +static void +on_connect (void *acp, int from_iocp) +{ async_connect *ac = acp; SOCKET sock = ac->socket->socket; grpc_endpoint *ep = NULL; grpc_winsocket_callback_info *info = &ac->socket->write_info; - void (*cb)(void *arg, grpc_endpoint *tcp) = ac->cb; + void (*cb) (void *arg, grpc_endpoint * tcp) = ac->cb; void *cb_arg = ac->cb_arg; - grpc_alarm_cancel(&ac->alarm); - - gpr_mu_lock(&ac->mu); - - if (from_iocp) { - DWORD transfered_bytes = 0; - DWORD flags; - BOOL wsa_success = WSAGetOverlappedResult(sock, &info->overlapped, - &transfered_bytes, FALSE, &flags); - GPR_ASSERT(transfered_bytes == 0); - if (!wsa_success) { - char *utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "on_connect error: %s", utf8_message); - gpr_free(utf8_message); - } else { - ep = grpc_tcp_create(ac->socket, ac->addr_name); - ac->socket = NULL; + grpc_alarm_cancel (&ac->alarm); + + gpr_mu_lock (&ac->mu); + + if (from_iocp) + { + DWORD transfered_bytes = 0; + DWORD flags; + BOOL wsa_success = WSAGetOverlappedResult (sock, &info->overlapped, + &transfered_bytes, FALSE, &flags); + GPR_ASSERT (transfered_bytes == 0); + if (!wsa_success) + { + char *utf8_message = gpr_format_message (WSAGetLastError ()); + gpr_log (GPR_ERROR, "on_connect error: %s", utf8_message); + gpr_free (utf8_message); + } + else + { + ep = grpc_tcp_create (ac->socket, ac->addr_name); + ac->socket = NULL; + } } - } - async_connect_unlock_and_cleanup(ac); + async_connect_unlock_and_cleanup (ac); /* If the connection was aborted, the callback was already called when the deadline was met. */ - cb(cb_arg, ep); + cb (cb_arg, ep); } /* Tries to issue one async connection, then schedules both an IOCP notification request for the connection, and one timeout alert. */ -void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *tcp), - void *arg, grpc_pollset_set *interested_parties, - const struct sockaddr *addr, int addr_len, - gpr_timespec deadline) { +void +grpc_tcp_client_connect (void (*cb) (void *arg, grpc_endpoint * tcp), void *arg, grpc_pollset_set * interested_parties, const struct sockaddr *addr, int addr_len, gpr_timespec deadline) +{ SOCKET sock = INVALID_SOCKET; BOOL success; int status; @@ -138,79 +151,85 @@ void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *tcp), grpc_winsocket_callback_info *info; /* Use dualstack sockets where available. */ - if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) { - addr = (const struct sockaddr *)&addr6_v4mapped; - addr_len = sizeof(addr6_v4mapped); - } - - sock = WSASocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0, - WSA_FLAG_OVERLAPPED); - if (sock == INVALID_SOCKET) { - message = "Unable to create socket: %s"; - goto failure; - } - - if (!grpc_tcp_prepare_socket(sock)) { - message = "Unable to set socket options: %s"; - goto failure; - } + if (grpc_sockaddr_to_v4mapped (addr, &addr6_v4mapped)) + { + addr = (const struct sockaddr *) &addr6_v4mapped; + addr_len = sizeof (addr6_v4mapped); + } + + sock = WSASocket (AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + if (sock == INVALID_SOCKET) + { + message = "Unable to create socket: %s"; + goto failure; + } + + if (!grpc_tcp_prepare_socket (sock)) + { + message = "Unable to set socket options: %s"; + goto failure; + } /* Grab the function pointer for ConnectEx for that specific socket. It may change depending on the interface. */ - status = - WSAIoctl(sock, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof(guid), - &ConnectEx, sizeof(ConnectEx), &ioctl_num_bytes, NULL, NULL); + status = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof (guid), &ConnectEx, sizeof (ConnectEx), &ioctl_num_bytes, NULL, NULL); - if (status != 0) { - message = "Unable to retrieve ConnectEx pointer: %s"; - goto failure; - } + if (status != 0) + { + message = "Unable to retrieve ConnectEx pointer: %s"; + goto failure; + } - grpc_sockaddr_make_wildcard6(0, &local_address); + grpc_sockaddr_make_wildcard6 (0, &local_address); - status = bind(sock, (struct sockaddr *)&local_address, sizeof(local_address)); - if (status != 0) { - message = "Unable to bind socket: %s"; - goto failure; - } + status = bind (sock, (struct sockaddr *) &local_address, sizeof (local_address)); + if (status != 0) + { + message = "Unable to bind socket: %s"; + goto failure; + } - socket = grpc_winsocket_create(sock, "client"); + socket = grpc_winsocket_create (sock, "client"); info = &socket->write_info; - success = ConnectEx(sock, addr, addr_len, NULL, 0, NULL, &info->overlapped); + success = ConnectEx (sock, addr, addr_len, NULL, 0, NULL, &info->overlapped); /* It wouldn't be unusual to get a success immediately. But we'll still get an IOCP notification, so let's ignore it. */ - if (!success) { - int error = WSAGetLastError(); - if (error != ERROR_IO_PENDING) { - message = "ConnectEx failed: %s"; - goto failure; + if (!success) + { + int error = WSAGetLastError (); + if (error != ERROR_IO_PENDING) + { + message = "ConnectEx failed: %s"; + goto failure; + } } - } - ac = gpr_malloc(sizeof(async_connect)); + ac = gpr_malloc (sizeof (async_connect)); ac->cb = cb; ac->cb_arg = arg; ac->socket = socket; - gpr_mu_init(&ac->mu); + gpr_mu_init (&ac->mu); ac->refs = 2; - ac->addr_name = grpc_sockaddr_to_uri(addr); + ac->addr_name = grpc_sockaddr_to_uri (addr); - grpc_alarm_init(&ac->alarm, deadline, on_alarm, ac, - gpr_now(GPR_CLOCK_MONOTONIC)); - grpc_socket_notify_on_write(socket, on_connect, ac); + grpc_alarm_init (&ac->alarm, deadline, on_alarm, ac, gpr_now (GPR_CLOCK_MONOTONIC)); + grpc_socket_notify_on_write (socket, on_connect, ac); return; failure: - utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, message, utf8_message); - gpr_free(utf8_message); - if (socket != NULL) { - grpc_winsocket_destroy(socket); - } else if (sock != INVALID_SOCKET) { - closesocket(sock); - } - cb(arg, NULL); + utf8_message = gpr_format_message (WSAGetLastError ()); + gpr_log (GPR_ERROR, message, utf8_message); + gpr_free (utf8_message); + if (socket != NULL) + { + grpc_winsocket_destroy (socket); + } + else if (sock != INVALID_SOCKET) + { + closesocket (sock); + } + cb (arg, NULL); } #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c index 942ab8b71df..da65a90eb46 100644 --- a/src/core/iomgr/tcp_posix.c +++ b/src/core/iomgr/tcp_posix.c @@ -69,12 +69,13 @@ typedef size_t msg_iovlen_type; int grpc_tcp_trace = 0; -typedef struct { +typedef struct +{ grpc_endpoint base; grpc_fd *em_fd; int fd; int finished_edge; - msg_iovlen_type iov_size; /* Number of slices to allocate per read attempt */ + msg_iovlen_type iov_size; /* Number of slices to allocate per read attempt */ size_t slice_size; gpr_refcount refcount; @@ -94,20 +95,24 @@ typedef struct { char *peer_string; } grpc_tcp; -static void tcp_handle_read(void *arg /* grpc_tcp */, int success, - grpc_closure_list *closure_list); -static void tcp_handle_write(void *arg /* grpc_tcp */, int success, - grpc_closure_list *closure_list); +static void tcp_handle_read (void *arg /* grpc_tcp */ , int success, + grpc_closure_list * closure_list); +static void tcp_handle_write (void *arg /* grpc_tcp */ , int success, + grpc_closure_list * closure_list); -static void tcp_shutdown(grpc_endpoint *ep, grpc_closure_list *closure_list) { - grpc_tcp *tcp = (grpc_tcp *)ep; - grpc_fd_shutdown(tcp->em_fd, closure_list); +static void +tcp_shutdown (grpc_endpoint * ep, grpc_closure_list * closure_list) +{ + grpc_tcp *tcp = (grpc_tcp *) ep; + grpc_fd_shutdown (tcp->em_fd, closure_list); } -static void tcp_free(grpc_tcp *tcp, grpc_closure_list *closure_list) { - grpc_fd_orphan(tcp->em_fd, NULL, "tcp_unref_orphan", closure_list); - gpr_free(tcp->peer_string); - gpr_free(tcp); +static void +tcp_free (grpc_tcp * tcp, grpc_closure_list * closure_list) +{ + grpc_fd_orphan (tcp->em_fd, NULL, "tcp_unref_orphan", closure_list); + gpr_free (tcp->peer_string); + gpr_free (tcp); } /*#define GRPC_TCP_REFCOUNT_DEBUG*/ @@ -115,78 +120,94 @@ static void tcp_free(grpc_tcp *tcp, grpc_closure_list *closure_list) { #define TCP_UNREF(tcp, reason, cl) \ tcp_unref((tcp), (cl), (reason), __FILE__, __LINE__) #define TCP_REF(tcp, reason) tcp_ref((tcp), (reason), __FILE__, __LINE__) -static void tcp_unref(grpc_tcp *tcp, grpc_closure_list *closure_list, - const char *reason, const char *file, int line) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "TCP unref %p : %s %d -> %d", tcp, - reason, tcp->refcount.count, tcp->refcount.count - 1); - if (gpr_unref(&tcp->refcount)) { - tcp_free(tcp, closure_list); - } +static void +tcp_unref (grpc_tcp * tcp, grpc_closure_list * closure_list, const char *reason, const char *file, int line) +{ + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "TCP unref %p : %s %d -> %d", tcp, reason, tcp->refcount.count, tcp->refcount.count - 1); + if (gpr_unref (&tcp->refcount)) + { + tcp_free (tcp, closure_list); + } } -static void tcp_ref(grpc_tcp *tcp, const char *reason, const char *file, - int line) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "TCP ref %p : %s %d -> %d", tcp, - reason, tcp->refcount.count, tcp->refcount.count + 1); - gpr_ref(&tcp->refcount); +static void +tcp_ref (grpc_tcp * tcp, const char *reason, const char *file, int line) +{ + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "TCP ref %p : %s %d -> %d", tcp, reason, tcp->refcount.count, tcp->refcount.count + 1); + gpr_ref (&tcp->refcount); } #else #define TCP_UNREF(tcp, reason, cl) tcp_unref((tcp), (cl)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void tcp_unref(grpc_tcp *tcp, grpc_closure_list *closure_list) { - if (gpr_unref(&tcp->refcount)) { - tcp_free(tcp, closure_list); - } +static void +tcp_unref (grpc_tcp * tcp, grpc_closure_list * closure_list) +{ + if (gpr_unref (&tcp->refcount)) + { + tcp_free (tcp, closure_list); + } } -static void tcp_ref(grpc_tcp *tcp) { gpr_ref(&tcp->refcount); } +static void +tcp_ref (grpc_tcp * tcp) +{ + gpr_ref (&tcp->refcount); +} #endif -static void tcp_destroy(grpc_endpoint *ep, grpc_closure_list *closure_list) { - grpc_tcp *tcp = (grpc_tcp *)ep; - TCP_UNREF(tcp, "destroy", closure_list); +static void +tcp_destroy (grpc_endpoint * ep, grpc_closure_list * closure_list) +{ + grpc_tcp *tcp = (grpc_tcp *) ep; + TCP_UNREF (tcp, "destroy", closure_list); } -static void call_read_cb(grpc_tcp *tcp, int success, - grpc_closure_list *closure_list) { +static void +call_read_cb (grpc_tcp * tcp, int success, grpc_closure_list * closure_list) +{ grpc_closure *cb = tcp->read_cb; - if (grpc_tcp_trace) { - size_t i; - gpr_log(GPR_DEBUG, "read: success=%d", success); - for (i = 0; i < tcp->incoming_buffer->count; i++) { - char *dump = gpr_dump_slice(tcp->incoming_buffer->slices[i], - GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_DEBUG, "READ %p: %s", tcp, dump); - gpr_free(dump); + if (grpc_tcp_trace) + { + size_t i; + gpr_log (GPR_DEBUG, "read: success=%d", success); + for (i = 0; i < tcp->incoming_buffer->count; i++) + { + char *dump = gpr_dump_slice (tcp->incoming_buffer->slices[i], + GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log (GPR_DEBUG, "READ %p: %s", tcp, dump); + gpr_free (dump); + } } - } tcp->read_cb = NULL; tcp->incoming_buffer = NULL; - cb->cb(cb->cb_arg, success, closure_list); + cb->cb (cb->cb_arg, success, closure_list); } #define MAX_READ_IOVEC 4 -static void tcp_continue_read(grpc_tcp *tcp, grpc_closure_list *closure_list) { +static void +tcp_continue_read (grpc_tcp * tcp, grpc_closure_list * closure_list) +{ struct msghdr msg; struct iovec iov[MAX_READ_IOVEC]; ssize_t read_bytes; size_t i; - GPR_ASSERT(!tcp->finished_edge); - GPR_ASSERT(tcp->iov_size <= MAX_READ_IOVEC); - GPR_ASSERT(tcp->incoming_buffer->count <= MAX_READ_IOVEC); - GRPC_TIMER_BEGIN(GRPC_PTAG_HANDLE_READ, 0); + GPR_ASSERT (!tcp->finished_edge); + GPR_ASSERT (tcp->iov_size <= MAX_READ_IOVEC); + GPR_ASSERT (tcp->incoming_buffer->count <= MAX_READ_IOVEC); + GRPC_TIMER_BEGIN (GRPC_PTAG_HANDLE_READ, 0); - while (tcp->incoming_buffer->count < (size_t)tcp->iov_size) { - gpr_slice_buffer_add_indexed(tcp->incoming_buffer, - gpr_slice_malloc(tcp->slice_size)); - } - for (i = 0; i < tcp->incoming_buffer->count; i++) { - iov[i].iov_base = GPR_SLICE_START_PTR(tcp->incoming_buffer->slices[i]); - iov[i].iov_len = GPR_SLICE_LENGTH(tcp->incoming_buffer->slices[i]); - } + while (tcp->incoming_buffer->count < (size_t) tcp->iov_size) + { + gpr_slice_buffer_add_indexed (tcp->incoming_buffer, gpr_slice_malloc (tcp->slice_size)); + } + for (i = 0; i < tcp->incoming_buffer->count; i++) + { + iov[i].iov_base = GPR_SLICE_START_PTR (tcp->incoming_buffer->slices[i]); + iov[i].iov_len = GPR_SLICE_LENGTH (tcp->incoming_buffer->slices[i]); + } msg.msg_name = NULL; msg.msg_namelen = 0; @@ -196,83 +217,107 @@ static void tcp_continue_read(grpc_tcp *tcp, grpc_closure_list *closure_list) { msg.msg_controllen = 0; msg.msg_flags = 0; - GRPC_TIMER_BEGIN(GRPC_PTAG_RECVMSG, 0); - do { - read_bytes = recvmsg(tcp->fd, &msg, 0); - } while (read_bytes < 0 && errno == EINTR); - GRPC_TIMER_END(GRPC_PTAG_RECVMSG, 0); - - if (read_bytes < 0) { - /* NB: After calling call_read_cb a parallel call of the read handler may - * be running. */ - if (errno == EAGAIN) { - if (tcp->iov_size > 1) { - tcp->iov_size /= 2; - } - /* We've consumed the edge, request a new one */ - grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_closure, closure_list); - } else { - /* TODO(klempner): Log interesting errors */ - gpr_slice_buffer_reset_and_unref(tcp->incoming_buffer); - call_read_cb(tcp, 0, closure_list); - TCP_UNREF(tcp, "read", closure_list); + GRPC_TIMER_BEGIN (GRPC_PTAG_RECVMSG, 0); + do + { + read_bytes = recvmsg (tcp->fd, &msg, 0); + } + while (read_bytes < 0 && errno == EINTR); + GRPC_TIMER_END (GRPC_PTAG_RECVMSG, 0); + + if (read_bytes < 0) + { + /* NB: After calling call_read_cb a parallel call of the read handler may + * be running. */ + if (errno == EAGAIN) + { + if (tcp->iov_size > 1) + { + tcp->iov_size /= 2; + } + /* We've consumed the edge, request a new one */ + grpc_fd_notify_on_read (tcp->em_fd, &tcp->read_closure, closure_list); + } + else + { + /* TODO(klempner): Log interesting errors */ + gpr_slice_buffer_reset_and_unref (tcp->incoming_buffer); + call_read_cb (tcp, 0, closure_list); + TCP_UNREF (tcp, "read", closure_list); + } + } + else if (read_bytes == 0) + { + /* 0 read size ==> end of stream */ + gpr_slice_buffer_reset_and_unref (tcp->incoming_buffer); + call_read_cb (tcp, 0, closure_list); + TCP_UNREF (tcp, "read", closure_list); } - } else if (read_bytes == 0) { - /* 0 read size ==> end of stream */ - gpr_slice_buffer_reset_and_unref(tcp->incoming_buffer); - call_read_cb(tcp, 0, closure_list); - TCP_UNREF(tcp, "read", closure_list); - } else { - GPR_ASSERT((size_t)read_bytes <= tcp->incoming_buffer->length); - if ((size_t)read_bytes < tcp->incoming_buffer->length) { - gpr_slice_buffer_trim_end( - tcp->incoming_buffer, - tcp->incoming_buffer->length - (size_t)read_bytes); - } else if (tcp->iov_size < MAX_READ_IOVEC) { - ++tcp->iov_size; + else + { + GPR_ASSERT ((size_t) read_bytes <= tcp->incoming_buffer->length); + if ((size_t) read_bytes < tcp->incoming_buffer->length) + { + gpr_slice_buffer_trim_end (tcp->incoming_buffer, tcp->incoming_buffer->length - (size_t) read_bytes); + } + else if (tcp->iov_size < MAX_READ_IOVEC) + { + ++tcp->iov_size; + } + GPR_ASSERT ((size_t) read_bytes == tcp->incoming_buffer->length); + call_read_cb (tcp, 1, closure_list); + TCP_UNREF (tcp, "read", closure_list); } - GPR_ASSERT((size_t)read_bytes == tcp->incoming_buffer->length); - call_read_cb(tcp, 1, closure_list); - TCP_UNREF(tcp, "read", closure_list); - } - GRPC_TIMER_END(GRPC_PTAG_HANDLE_READ, 0); + GRPC_TIMER_END (GRPC_PTAG_HANDLE_READ, 0); } -static void tcp_handle_read(void *arg /* grpc_tcp */, int success, - grpc_closure_list *closure_list) { - grpc_tcp *tcp = (grpc_tcp *)arg; - GPR_ASSERT(!tcp->finished_edge); - - if (!success) { - gpr_slice_buffer_reset_and_unref(tcp->incoming_buffer); - call_read_cb(tcp, 0, closure_list); - TCP_UNREF(tcp, "read", closure_list); - } else { - tcp_continue_read(tcp, closure_list); - } +static void +tcp_handle_read (void *arg /* grpc_tcp */ , int success, + grpc_closure_list * closure_list) +{ + grpc_tcp *tcp = (grpc_tcp *) arg; + GPR_ASSERT (!tcp->finished_edge); + + if (!success) + { + gpr_slice_buffer_reset_and_unref (tcp->incoming_buffer); + call_read_cb (tcp, 0, closure_list); + TCP_UNREF (tcp, "read", closure_list); + } + else + { + tcp_continue_read (tcp, closure_list); + } } -static void tcp_read(grpc_endpoint *ep, gpr_slice_buffer *incoming_buffer, - grpc_closure *cb, grpc_closure_list *closure_list) { - grpc_tcp *tcp = (grpc_tcp *)ep; - GPR_ASSERT(tcp->read_cb == NULL); +static void +tcp_read (grpc_endpoint * ep, gpr_slice_buffer * incoming_buffer, grpc_closure * cb, grpc_closure_list * closure_list) +{ + grpc_tcp *tcp = (grpc_tcp *) ep; + GPR_ASSERT (tcp->read_cb == NULL); tcp->read_cb = cb; tcp->incoming_buffer = incoming_buffer; - gpr_slice_buffer_reset_and_unref(incoming_buffer); - TCP_REF(tcp, "read"); - if (tcp->finished_edge) { - tcp->finished_edge = 0; - grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_closure, closure_list); - } else { - grpc_closure_list_add(closure_list, &tcp->read_closure, 1); - } + gpr_slice_buffer_reset_and_unref (incoming_buffer); + TCP_REF (tcp, "read"); + if (tcp->finished_edge) + { + tcp->finished_edge = 0; + grpc_fd_notify_on_read (tcp->em_fd, &tcp->read_closure, closure_list); + } + else + { + grpc_closure_list_add (closure_list, &tcp->read_closure, 1); + } } -typedef enum { FLUSH_DONE, FLUSH_PENDING, FLUSH_ERROR } flush_result; +typedef enum +{ FLUSH_DONE, FLUSH_PENDING, FLUSH_ERROR } flush_result; #define MAX_WRITE_IOVEC 16 -static flush_result tcp_flush(grpc_tcp *tcp) { +static flush_result +tcp_flush (grpc_tcp * tcp) +{ struct msghdr msg; struct iovec iov[MAX_WRITE_IOVEC]; msg_iovlen_type iov_size; @@ -282,169 +327,190 @@ static flush_result tcp_flush(grpc_tcp *tcp) { size_t unwind_slice_idx; size_t unwind_byte_idx; - for (;;) { - sending_length = 0; - unwind_slice_idx = tcp->outgoing_slice_idx; - unwind_byte_idx = tcp->outgoing_byte_idx; - for (iov_size = 0; tcp->outgoing_slice_idx != tcp->outgoing_buffer->count && - iov_size != MAX_WRITE_IOVEC; - iov_size++) { - iov[iov_size].iov_base = - GPR_SLICE_START_PTR( - tcp->outgoing_buffer->slices[tcp->outgoing_slice_idx]) + - tcp->outgoing_byte_idx; - iov[iov_size].iov_len = - GPR_SLICE_LENGTH( - tcp->outgoing_buffer->slices[tcp->outgoing_slice_idx]) - - tcp->outgoing_byte_idx; - sending_length += iov[iov_size].iov_len; - tcp->outgoing_slice_idx++; - tcp->outgoing_byte_idx = 0; - } - GPR_ASSERT(iov_size > 0); - - msg.msg_name = NULL; - msg.msg_namelen = 0; - msg.msg_iov = iov; - msg.msg_iovlen = iov_size; - msg.msg_control = NULL; - msg.msg_controllen = 0; - msg.msg_flags = 0; - - GRPC_TIMER_BEGIN(GRPC_PTAG_SENDMSG, 0); - do { - /* TODO(klempner): Cork if this is a partial write */ - sent_length = sendmsg(tcp->fd, &msg, SENDMSG_FLAGS); - } while (sent_length < 0 && errno == EINTR); - GRPC_TIMER_END(GRPC_PTAG_SENDMSG, 0); - - if (sent_length < 0) { - if (errno == EAGAIN) { - tcp->outgoing_slice_idx = unwind_slice_idx; - tcp->outgoing_byte_idx = unwind_byte_idx; - return FLUSH_PENDING; - } else { - /* TODO(klempner): Log some of these */ - return FLUSH_ERROR; - } - } - - GPR_ASSERT(tcp->outgoing_byte_idx == 0); - trailing = sending_length - (size_t)sent_length; - while (trailing > 0) { - size_t slice_length; - - tcp->outgoing_slice_idx--; - slice_length = GPR_SLICE_LENGTH( - tcp->outgoing_buffer->slices[tcp->outgoing_slice_idx]); - if (slice_length > trailing) { - tcp->outgoing_byte_idx = slice_length - trailing; - break; - } else { - trailing -= slice_length; - } - } - - if (tcp->outgoing_slice_idx == tcp->outgoing_buffer->count) { - return FLUSH_DONE; - } - }; + for (;;) + { + sending_length = 0; + unwind_slice_idx = tcp->outgoing_slice_idx; + unwind_byte_idx = tcp->outgoing_byte_idx; + for (iov_size = 0; tcp->outgoing_slice_idx != tcp->outgoing_buffer->count && iov_size != MAX_WRITE_IOVEC; iov_size++) + { + iov[iov_size].iov_base = GPR_SLICE_START_PTR (tcp->outgoing_buffer->slices[tcp->outgoing_slice_idx]) + tcp->outgoing_byte_idx; + iov[iov_size].iov_len = GPR_SLICE_LENGTH (tcp->outgoing_buffer->slices[tcp->outgoing_slice_idx]) - tcp->outgoing_byte_idx; + sending_length += iov[iov_size].iov_len; + tcp->outgoing_slice_idx++; + tcp->outgoing_byte_idx = 0; + } + GPR_ASSERT (iov_size > 0); + + msg.msg_name = NULL; + msg.msg_namelen = 0; + msg.msg_iov = iov; + msg.msg_iovlen = iov_size; + msg.msg_control = NULL; + msg.msg_controllen = 0; + msg.msg_flags = 0; + + GRPC_TIMER_BEGIN (GRPC_PTAG_SENDMSG, 0); + do + { + /* TODO(klempner): Cork if this is a partial write */ + sent_length = sendmsg (tcp->fd, &msg, SENDMSG_FLAGS); + } + while (sent_length < 0 && errno == EINTR); + GRPC_TIMER_END (GRPC_PTAG_SENDMSG, 0); + + if (sent_length < 0) + { + if (errno == EAGAIN) + { + tcp->outgoing_slice_idx = unwind_slice_idx; + tcp->outgoing_byte_idx = unwind_byte_idx; + return FLUSH_PENDING; + } + else + { + /* TODO(klempner): Log some of these */ + return FLUSH_ERROR; + } + } + + GPR_ASSERT (tcp->outgoing_byte_idx == 0); + trailing = sending_length - (size_t) sent_length; + while (trailing > 0) + { + size_t slice_length; + + tcp->outgoing_slice_idx--; + slice_length = GPR_SLICE_LENGTH (tcp->outgoing_buffer->slices[tcp->outgoing_slice_idx]); + if (slice_length > trailing) + { + tcp->outgoing_byte_idx = slice_length - trailing; + break; + } + else + { + trailing -= slice_length; + } + } + + if (tcp->outgoing_slice_idx == tcp->outgoing_buffer->count) + { + return FLUSH_DONE; + } + }; } -static void tcp_handle_write(void *arg /* grpc_tcp */, int success, - grpc_closure_list *closure_list) { - grpc_tcp *tcp = (grpc_tcp *)arg; +static void +tcp_handle_write (void *arg /* grpc_tcp */ , int success, + grpc_closure_list * closure_list) +{ + grpc_tcp *tcp = (grpc_tcp *) arg; flush_result status; grpc_closure *cb; - if (!success) { - cb = tcp->write_cb; - tcp->write_cb = NULL; - cb->cb(cb->cb_arg, 0, closure_list); - TCP_UNREF(tcp, "write", closure_list); - return; - } - - GRPC_TIMER_BEGIN(GRPC_PTAG_TCP_CB_WRITE, 0); - status = tcp_flush(tcp); - if (status == FLUSH_PENDING) { - grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_closure, closure_list); - } else { - cb = tcp->write_cb; - tcp->write_cb = NULL; - cb->cb(cb->cb_arg, status == FLUSH_DONE, closure_list); - TCP_UNREF(tcp, "write", closure_list); - } - GRPC_TIMER_END(GRPC_PTAG_TCP_CB_WRITE, 0); + if (!success) + { + cb = tcp->write_cb; + tcp->write_cb = NULL; + cb->cb (cb->cb_arg, 0, closure_list); + TCP_UNREF (tcp, "write", closure_list); + return; + } + + GRPC_TIMER_BEGIN (GRPC_PTAG_TCP_CB_WRITE, 0); + status = tcp_flush (tcp); + if (status == FLUSH_PENDING) + { + grpc_fd_notify_on_write (tcp->em_fd, &tcp->write_closure, closure_list); + } + else + { + cb = tcp->write_cb; + tcp->write_cb = NULL; + cb->cb (cb->cb_arg, status == FLUSH_DONE, closure_list); + TCP_UNREF (tcp, "write", closure_list); + } + GRPC_TIMER_END (GRPC_PTAG_TCP_CB_WRITE, 0); } -static void tcp_write(grpc_endpoint *ep, gpr_slice_buffer *buf, - grpc_closure *cb, grpc_closure_list *closure_list) { - grpc_tcp *tcp = (grpc_tcp *)ep; +static void +tcp_write (grpc_endpoint * ep, gpr_slice_buffer * buf, grpc_closure * cb, grpc_closure_list * closure_list) +{ + grpc_tcp *tcp = (grpc_tcp *) ep; flush_result status; - if (grpc_tcp_trace) { - size_t i; + if (grpc_tcp_trace) + { + size_t i; - for (i = 0; i < buf->count; i++) { - char *data = - gpr_dump_slice(buf->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_DEBUG, "WRITE %p: %s", tcp, data); - gpr_free(data); + for (i = 0; i < buf->count; i++) + { + char *data = gpr_dump_slice (buf->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log (GPR_DEBUG, "WRITE %p: %s", tcp, data); + gpr_free (data); + } } - } - GRPC_TIMER_BEGIN(GRPC_PTAG_TCP_WRITE, 0); - GPR_ASSERT(tcp->write_cb == NULL); + GRPC_TIMER_BEGIN (GRPC_PTAG_TCP_WRITE, 0); + GPR_ASSERT (tcp->write_cb == NULL); - if (buf->length == 0) { - GRPC_TIMER_END(GRPC_PTAG_TCP_WRITE, 0); - grpc_closure_list_add(closure_list, cb, 1); - return; - } + if (buf->length == 0) + { + GRPC_TIMER_END (GRPC_PTAG_TCP_WRITE, 0); + grpc_closure_list_add (closure_list, cb, 1); + return; + } tcp->outgoing_buffer = buf; tcp->outgoing_slice_idx = 0; tcp->outgoing_byte_idx = 0; - status = tcp_flush(tcp); - if (status == FLUSH_PENDING) { - TCP_REF(tcp, "write"); - tcp->write_cb = cb; - grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_closure, closure_list); - } else { - grpc_closure_list_add(closure_list, cb, status == FLUSH_DONE); - } + status = tcp_flush (tcp); + if (status == FLUSH_PENDING) + { + TCP_REF (tcp, "write"); + tcp->write_cb = cb; + grpc_fd_notify_on_write (tcp->em_fd, &tcp->write_closure, closure_list); + } + else + { + grpc_closure_list_add (closure_list, cb, status == FLUSH_DONE); + } - GRPC_TIMER_END(GRPC_PTAG_TCP_WRITE, 0); + GRPC_TIMER_END (GRPC_PTAG_TCP_WRITE, 0); } -static void tcp_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset, - grpc_closure_list *closure_list) { - grpc_tcp *tcp = (grpc_tcp *)ep; - grpc_pollset_add_fd(pollset, tcp->em_fd, closure_list); +static void +tcp_add_to_pollset (grpc_endpoint * ep, grpc_pollset * pollset, grpc_closure_list * closure_list) +{ + grpc_tcp *tcp = (grpc_tcp *) ep; + grpc_pollset_add_fd (pollset, tcp->em_fd, closure_list); } -static void tcp_add_to_pollset_set(grpc_endpoint *ep, - grpc_pollset_set *pollset_set, - grpc_closure_list *closure_list) { - grpc_tcp *tcp = (grpc_tcp *)ep; - grpc_pollset_set_add_fd(pollset_set, tcp->em_fd, closure_list); +static void +tcp_add_to_pollset_set (grpc_endpoint * ep, grpc_pollset_set * pollset_set, grpc_closure_list * closure_list) +{ + grpc_tcp *tcp = (grpc_tcp *) ep; + grpc_pollset_set_add_fd (pollset_set, tcp->em_fd, closure_list); } -static char *tcp_get_peer(grpc_endpoint *ep) { - grpc_tcp *tcp = (grpc_tcp *)ep; - return gpr_strdup(tcp->peer_string); +static char * +tcp_get_peer (grpc_endpoint * ep) +{ + grpc_tcp *tcp = (grpc_tcp *) ep; + return gpr_strdup (tcp->peer_string); } static const grpc_endpoint_vtable vtable = { - tcp_read, tcp_write, tcp_add_to_pollset, tcp_add_to_pollset_set, - tcp_shutdown, tcp_destroy, tcp_get_peer}; - -grpc_endpoint *grpc_tcp_create(grpc_fd *em_fd, size_t slice_size, - const char *peer_string) { - grpc_tcp *tcp = (grpc_tcp *)gpr_malloc(sizeof(grpc_tcp)); + tcp_read, tcp_write, tcp_add_to_pollset, tcp_add_to_pollset_set, + tcp_shutdown, tcp_destroy, tcp_get_peer +}; + +grpc_endpoint * +grpc_tcp_create (grpc_fd * em_fd, size_t slice_size, const char *peer_string) +{ + grpc_tcp *tcp = (grpc_tcp *) gpr_malloc (sizeof (grpc_tcp)); tcp->base.vtable = &vtable; - tcp->peer_string = gpr_strdup(peer_string); + tcp->peer_string = gpr_strdup (peer_string); tcp->fd = em_fd->fd; tcp->read_cb = NULL; tcp->write_cb = NULL; @@ -453,7 +519,7 @@ grpc_endpoint *grpc_tcp_create(grpc_fd *em_fd, size_t slice_size, tcp->iov_size = 1; tcp->finished_edge = 1; /* paired with unref in grpc_tcp_destroy */ - gpr_ref_init(&tcp->refcount, 1); + gpr_ref_init (&tcp->refcount, 1); tcp->em_fd = em_fd; tcp->read_closure.cb = tcp_handle_read; tcp->read_closure.cb_arg = tcp; diff --git a/src/core/iomgr/tcp_posix.h b/src/core/iomgr/tcp_posix.h index 40b3ae26798..4f73be4b9de 100644 --- a/src/core/iomgr/tcp_posix.h +++ b/src/core/iomgr/tcp_posix.h @@ -53,7 +53,6 @@ extern int 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, size_t read_slice_size, - const char *peer_string); +grpc_endpoint *grpc_tcp_create (grpc_fd * fd, size_t read_slice_size, const char *peer_string); #endif /* GRPC_INTERNAL_CORE_IOMGR_TCP_POSIX_H */ diff --git a/src/core/iomgr/tcp_server.h b/src/core/iomgr/tcp_server.h index 034f10eff70..bb1d50576c9 100644 --- a/src/core/iomgr/tcp_server.h +++ b/src/core/iomgr/tcp_server.h @@ -40,17 +40,13 @@ typedef struct grpc_tcp_server grpc_tcp_server; /* Called for newly connected TCP connections. */ -typedef void (*grpc_tcp_server_cb)(void *arg, grpc_endpoint *ep, - grpc_closure_list *closure_list); +typedef void (*grpc_tcp_server_cb) (void *arg, grpc_endpoint * ep, grpc_closure_list * closure_list); /* Create a server, initially not bound to any ports */ -grpc_tcp_server *grpc_tcp_server_create(void); +grpc_tcp_server *grpc_tcp_server_create (void); /* Start listening to bound ports */ -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_closure_list *closure_list); +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_closure_list * closure_list); /* Add a port to the server, returning port number on success, or negative on failure. @@ -63,17 +59,15 @@ void grpc_tcp_server_start(grpc_tcp_server *server, grpc_pollset **pollsets, For raw access to the underlying sockets, see grpc_tcp_server_get_fd(). */ /* TODO(ctiller): deprecate this, and make grpc_tcp_server_add_ports to handle all of the multiple socket port matching logic in one place */ -int grpc_tcp_server_add_port(grpc_tcp_server *s, const void *addr, - size_t addr_len); +int grpc_tcp_server_add_port (grpc_tcp_server * s, const void *addr, size_t addr_len); /* Returns the file descriptor of the Nth listening socket on this server, or -1 if the index is out of bounds. The file descriptor remains owned by the server, and will be cleaned up when grpc_tcp_server_destroy is called. */ -int grpc_tcp_server_get_fd(grpc_tcp_server *s, unsigned index); +int grpc_tcp_server_get_fd (grpc_tcp_server * s, unsigned index); -void grpc_tcp_server_destroy(grpc_tcp_server *server, grpc_closure *closure, - grpc_closure_list *closure_list); +void grpc_tcp_server_destroy (grpc_tcp_server * server, grpc_closure * closure, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_IOMGR_TCP_SERVER_H */ diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c index e6c6a36602a..7b9cfe09cb7 100644 --- a/src/core/iomgr/tcp_server_posix.c +++ b/src/core/iomgr/tcp_server_posix.c @@ -74,11 +74,13 @@ static gpr_once s_init_max_accept_queue_size; static int s_max_accept_queue_size; /* one listening port */ -typedef struct { +typedef struct +{ int fd; grpc_fd *emfd; grpc_tcp_server *server; - union { + union + { gpr_uint8 untyped[GRPC_MAX_SOCKADDR_SIZE]; struct sockaddr sockaddr; struct sockaddr_un un; @@ -88,16 +90,20 @@ typedef struct { grpc_closure destroyed_closure; } server_port; -static void unlink_if_unix_domain_socket(const struct sockaddr_un *un) { +static void +unlink_if_unix_domain_socket (const struct sockaddr_un *un) +{ struct stat st; - if (stat(un->sun_path, &st) == 0 && (st.st_mode & S_IFMT) == S_IFSOCK) { - unlink(un->sun_path); - } + if (stat (un->sun_path, &st) == 0 && (st.st_mode & S_IFMT) == S_IFSOCK) + { + unlink (un->sun_path); + } } /* the overall server */ -struct grpc_tcp_server { +struct grpc_tcp_server +{ /* Called whenever accept() succeeds on a server port. */ grpc_tcp_server_cb on_accept_cb; void *on_accept_cb_arg; @@ -126,283 +132,321 @@ struct grpc_tcp_server { size_t pollset_count; }; -grpc_tcp_server *grpc_tcp_server_create(void) { - grpc_tcp_server *s = gpr_malloc(sizeof(grpc_tcp_server)); - gpr_mu_init(&s->mu); +grpc_tcp_server * +grpc_tcp_server_create (void) +{ + grpc_tcp_server *s = gpr_malloc (sizeof (grpc_tcp_server)); + gpr_mu_init (&s->mu); s->active_ports = 0; s->destroyed_ports = 0; s->shutdown = 0; s->on_accept_cb = NULL; s->on_accept_cb_arg = NULL; - s->ports = gpr_malloc(sizeof(server_port) * INIT_PORT_CAP); + s->ports = gpr_malloc (sizeof (server_port) * INIT_PORT_CAP); s->nports = 0; s->port_capacity = INIT_PORT_CAP; return s; } -static void finish_shutdown(grpc_tcp_server *s, - grpc_closure_list *closure_list) { - grpc_closure_list_add(closure_list, s->shutdown_complete, 1); +static void +finish_shutdown (grpc_tcp_server * s, grpc_closure_list * closure_list) +{ + grpc_closure_list_add (closure_list, s->shutdown_complete, 1); - gpr_mu_destroy(&s->mu); + gpr_mu_destroy (&s->mu); - gpr_free(s->ports); - gpr_free(s); + gpr_free (s->ports); + gpr_free (s); } -static void destroyed_port(void *server, int success, - grpc_closure_list *closure_list) { +static void +destroyed_port (void *server, int success, grpc_closure_list * closure_list) +{ grpc_tcp_server *s = server; - gpr_mu_lock(&s->mu); + gpr_mu_lock (&s->mu); s->destroyed_ports++; - if (s->destroyed_ports == s->nports) { - gpr_mu_unlock(&s->mu); - finish_shutdown(s, closure_list); - } else { - GPR_ASSERT(s->destroyed_ports < s->nports); - gpr_mu_unlock(&s->mu); - } + if (s->destroyed_ports == s->nports) + { + gpr_mu_unlock (&s->mu); + finish_shutdown (s, closure_list); + } + else + { + GPR_ASSERT (s->destroyed_ports < s->nports); + gpr_mu_unlock (&s->mu); + } } /* 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, - grpc_closure_list *closure_list) { +static void +deactivated_all_ports (grpc_tcp_server * s, grpc_closure_list * closure_list) +{ size_t i; /* delete ALL the things */ - gpr_mu_lock(&s->mu); - - if (!s->shutdown) { - gpr_mu_unlock(&s->mu); - return; - } - - if (s->nports) { - for (i = 0; i < s->nports; i++) { - server_port *sp = &s->ports[i]; - if (sp->addr.sockaddr.sa_family == AF_UNIX) { - unlink_if_unix_domain_socket(&sp->addr.un); - } - sp->destroyed_closure.cb = destroyed_port; - sp->destroyed_closure.cb_arg = s; - grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, "tcp_listener_shutdown", - closure_list); + gpr_mu_lock (&s->mu); + + if (!s->shutdown) + { + gpr_mu_unlock (&s->mu); + return; + } + + if (s->nports) + { + for (i = 0; i < s->nports; i++) + { + server_port *sp = &s->ports[i]; + if (sp->addr.sockaddr.sa_family == AF_UNIX) + { + unlink_if_unix_domain_socket (&sp->addr.un); + } + sp->destroyed_closure.cb = destroyed_port; + sp->destroyed_closure.cb_arg = s; + grpc_fd_orphan (sp->emfd, &sp->destroyed_closure, "tcp_listener_shutdown", closure_list); + } + gpr_mu_unlock (&s->mu); + } + else + { + gpr_mu_unlock (&s->mu); + finish_shutdown (s, closure_list); } - gpr_mu_unlock(&s->mu); - } else { - gpr_mu_unlock(&s->mu); - finish_shutdown(s, closure_list); - } } -void grpc_tcp_server_destroy(grpc_tcp_server *s, grpc_closure *closure, - grpc_closure_list *closure_list) { +void +grpc_tcp_server_destroy (grpc_tcp_server * s, grpc_closure * closure, grpc_closure_list * closure_list) +{ size_t i; - gpr_mu_lock(&s->mu); + gpr_mu_lock (&s->mu); - GPR_ASSERT(!s->shutdown); + GPR_ASSERT (!s->shutdown); s->shutdown = 1; s->shutdown_complete = closure; /* shutdown all fd's */ - if (s->active_ports) { - for (i = 0; i < s->nports; i++) { - grpc_fd_shutdown(s->ports[i].emfd, closure_list); + if (s->active_ports) + { + for (i = 0; i < s->nports; i++) + { + grpc_fd_shutdown (s->ports[i].emfd, closure_list); + } + gpr_mu_unlock (&s->mu); + } + else + { + gpr_mu_unlock (&s->mu); + deactivated_all_ports (s, closure_list); } - gpr_mu_unlock(&s->mu); - } else { - gpr_mu_unlock(&s->mu); - deactivated_all_ports(s, closure_list); - } } /* get max listen queue size on linux */ -static void init_max_accept_queue_size(void) { +static void +init_max_accept_queue_size (void) +{ int n = SOMAXCONN; char buf[64]; - FILE *fp = fopen("/proc/sys/net/core/somaxconn", "r"); - if (fp == NULL) { - /* 2.4 kernel. */ - s_max_accept_queue_size = SOMAXCONN; - return; - } - if (fgets(buf, sizeof buf, fp)) { - char *end; - long i = strtol(buf, &end, 10); - if (i > 0 && i <= INT_MAX && end && *end == 0) { - n = (int)i; + FILE *fp = fopen ("/proc/sys/net/core/somaxconn", "r"); + if (fp == NULL) + { + /* 2.4 kernel. */ + s_max_accept_queue_size = SOMAXCONN; + return; } - } - fclose(fp); + if (fgets (buf, sizeof buf, fp)) + { + char *end; + long i = strtol (buf, &end, 10); + if (i > 0 && i <= INT_MAX && end && *end == 0) + { + n = (int) i; + } + } + fclose (fp); s_max_accept_queue_size = n; - if (s_max_accept_queue_size < MIN_SAFE_ACCEPT_QUEUE_SIZE) { - gpr_log(GPR_INFO, - "Suspiciously small accept queue (%d) will probably lead to " - "connection drops", - s_max_accept_queue_size); - } + if (s_max_accept_queue_size < MIN_SAFE_ACCEPT_QUEUE_SIZE) + { + gpr_log (GPR_INFO, "Suspiciously small accept queue (%d) will probably lead to " "connection drops", s_max_accept_queue_size); + } } -static int get_max_accept_queue_size(void) { - gpr_once_init(&s_init_max_accept_queue_size, init_max_accept_queue_size); +static int +get_max_accept_queue_size (void) +{ + gpr_once_init (&s_init_max_accept_queue_size, init_max_accept_queue_size); return s_max_accept_queue_size; } /* Prepare a recently-created socket for listening. */ -static int prepare_socket(int fd, const struct sockaddr *addr, - size_t addr_len) { +static int +prepare_socket (int fd, const struct sockaddr *addr, size_t addr_len) +{ struct sockaddr_storage sockname_temp; socklen_t sockname_len; - if (fd < 0) { - goto error; - } - - if (!grpc_set_socket_nonblocking(fd, 1) || !grpc_set_socket_cloexec(fd, 1) || - (addr->sa_family != AF_UNIX && (!grpc_set_socket_low_latency(fd, 1) || - !grpc_set_socket_reuse_addr(fd, 1))) || - !grpc_set_socket_no_sigpipe_if_possible(fd)) { - gpr_log(GPR_ERROR, "Unable to configure socket %d: %s", fd, - strerror(errno)); - goto error; - } - - GPR_ASSERT(addr_len < ~(socklen_t)0); - if (bind(fd, addr, (socklen_t)addr_len) < 0) { - char *addr_str; - grpc_sockaddr_to_string(&addr_str, addr, 0); - gpr_log(GPR_ERROR, "bind addr=%s: %s", addr_str, strerror(errno)); - gpr_free(addr_str); - goto error; - } - - if (listen(fd, get_max_accept_queue_size()) < 0) { - gpr_log(GPR_ERROR, "listen: %s", strerror(errno)); - goto error; - } - - sockname_len = sizeof(sockname_temp); - if (getsockname(fd, (struct sockaddr *)&sockname_temp, &sockname_len) < 0) { - goto error; - } - - return grpc_sockaddr_get_port((struct sockaddr *)&sockname_temp); + if (fd < 0) + { + goto error; + } + + if (!grpc_set_socket_nonblocking (fd, 1) || !grpc_set_socket_cloexec (fd, 1) || (addr->sa_family != AF_UNIX && (!grpc_set_socket_low_latency (fd, 1) || !grpc_set_socket_reuse_addr (fd, 1))) || !grpc_set_socket_no_sigpipe_if_possible (fd)) + { + gpr_log (GPR_ERROR, "Unable to configure socket %d: %s", fd, strerror (errno)); + goto error; + } + + GPR_ASSERT (addr_len < ~(socklen_t) 0); + if (bind (fd, addr, (socklen_t) addr_len) < 0) + { + char *addr_str; + grpc_sockaddr_to_string (&addr_str, addr, 0); + gpr_log (GPR_ERROR, "bind addr=%s: %s", addr_str, strerror (errno)); + gpr_free (addr_str); + goto error; + } + + if (listen (fd, get_max_accept_queue_size ()) < 0) + { + gpr_log (GPR_ERROR, "listen: %s", strerror (errno)); + goto error; + } + + sockname_len = sizeof (sockname_temp); + if (getsockname (fd, (struct sockaddr *) &sockname_temp, &sockname_len) < 0) + { + goto error; + } + + return grpc_sockaddr_get_port ((struct sockaddr *) &sockname_temp); error: - if (fd >= 0) { - close(fd); - } + if (fd >= 0) + { + close (fd); + } return -1; } /* event manager callback when reads are ready */ -static void on_read(void *arg, int success, grpc_closure_list *closure_list) { +static void +on_read (void *arg, int success, grpc_closure_list * closure_list) +{ server_port *sp = arg; grpc_fd *fdobj; size_t i; - if (!success) { - goto error; - } + if (!success) + { + goto error; + } /* loop until accept4 returns EAGAIN, and then re-arm notification */ - for (;;) { - struct sockaddr_storage addr; - socklen_t addrlen = sizeof(addr); - char *addr_str; - char *name; - /* Note: If we ever decide to return this address to the user, remember to - strip off the ::ffff:0.0.0.0/96 prefix first. */ - int fd = grpc_accept4(sp->fd, (struct sockaddr *)&addr, &addrlen, 1, 1); - if (fd < 0) { - switch (errno) { - case EINTR: - continue; - case EAGAIN: - grpc_fd_notify_on_read(sp->emfd, &sp->read_closure, closure_list); - return; - default: - gpr_log(GPR_ERROR, "Failed accept4: %s", strerror(errno)); - goto error; - } + for (;;) + { + struct sockaddr_storage addr; + socklen_t addrlen = sizeof (addr); + char *addr_str; + char *name; + /* Note: If we ever decide to return this address to the user, remember to + strip off the ::ffff:0.0.0.0/96 prefix first. */ + int fd = grpc_accept4 (sp->fd, (struct sockaddr *) &addr, &addrlen, 1, 1); + if (fd < 0) + { + switch (errno) + { + case EINTR: + continue; + case EAGAIN: + grpc_fd_notify_on_read (sp->emfd, &sp->read_closure, closure_list); + return; + default: + gpr_log (GPR_ERROR, "Failed accept4: %s", strerror (errno)); + goto error; + } + } + + grpc_set_socket_no_sigpipe_if_possible (fd); + + addr_str = grpc_sockaddr_to_uri ((struct sockaddr *) &addr); + gpr_asprintf (&name, "tcp-server-connection:%s", addr_str); + + if (grpc_tcp_trace) + { + gpr_log (GPR_DEBUG, "SERVER_CONNECT: incoming connection: %s", addr_str); + } + + fdobj = grpc_fd_create (fd, name); + /* TODO(ctiller): revise this when we have server-side sharding + of channels -- we certainly should not be automatically adding every + incoming channel to every pollset owned by the server */ + for (i = 0; i < sp->server->pollset_count; i++) + { + grpc_pollset_add_fd (sp->server->pollsets[i], fdobj, closure_list); + } + sp->server->on_accept_cb (sp->server->on_accept_cb_arg, grpc_tcp_create (fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str), closure_list); + + gpr_free (name); + gpr_free (addr_str); } - grpc_set_socket_no_sigpipe_if_possible(fd); + abort (); - addr_str = grpc_sockaddr_to_uri((struct sockaddr *)&addr); - gpr_asprintf(&name, "tcp-server-connection:%s", addr_str); - - if (grpc_tcp_trace) { - gpr_log(GPR_DEBUG, "SERVER_CONNECT: incoming connection: %s", addr_str); +error: + gpr_mu_lock (&sp->server->mu); + if (0 == --sp->server->active_ports) + { + gpr_mu_unlock (&sp->server->mu); + deactivated_all_ports (sp->server, closure_list); } - - fdobj = grpc_fd_create(fd, name); - /* TODO(ctiller): revise this when we have server-side sharding - of channels -- we certainly should not be automatically adding every - incoming channel to every pollset owned by the server */ - for (i = 0; i < sp->server->pollset_count; i++) { - grpc_pollset_add_fd(sp->server->pollsets[i], fdobj, closure_list); + else + { + gpr_mu_unlock (&sp->server->mu); } - sp->server->on_accept_cb( - sp->server->on_accept_cb_arg, - grpc_tcp_create(fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str), - closure_list); - - gpr_free(name); - gpr_free(addr_str); - } - - abort(); - -error: - gpr_mu_lock(&sp->server->mu); - if (0 == --sp->server->active_ports) { - gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(sp->server, closure_list); - } else { - gpr_mu_unlock(&sp->server->mu); - } } -static int add_socket_to_server(grpc_tcp_server *s, int fd, - const struct sockaddr *addr, size_t addr_len) { +static int +add_socket_to_server (grpc_tcp_server * s, int fd, const struct sockaddr *addr, size_t addr_len) +{ server_port *sp; int port; char *addr_str; char *name; - port = prepare_socket(fd, addr, addr_len); - if (port >= 0) { - grpc_sockaddr_to_string(&addr_str, (struct sockaddr *)&addr, 1); - gpr_asprintf(&name, "tcp-server-listener:%s", addr_str); - gpr_mu_lock(&s->mu); - GPR_ASSERT(!s->on_accept_cb && "must add ports before starting server"); - /* append it to the list under a lock */ - if (s->nports == s->port_capacity) { - s->port_capacity *= 2; - s->ports = gpr_realloc(s->ports, sizeof(server_port) * s->port_capacity); + port = prepare_socket (fd, addr, addr_len); + if (port >= 0) + { + grpc_sockaddr_to_string (&addr_str, (struct sockaddr *) &addr, 1); + gpr_asprintf (&name, "tcp-server-listener:%s", addr_str); + gpr_mu_lock (&s->mu); + GPR_ASSERT (!s->on_accept_cb && "must add ports before starting server"); + /* append it to the list under a lock */ + if (s->nports == s->port_capacity) + { + s->port_capacity *= 2; + s->ports = gpr_realloc (s->ports, sizeof (server_port) * s->port_capacity); + } + sp = &s->ports[s->nports++]; + sp->server = s; + sp->fd = fd; + sp->emfd = grpc_fd_create (fd, name); + memcpy (sp->addr.untyped, addr, addr_len); + sp->addr_len = addr_len; + GPR_ASSERT (sp->emfd); + gpr_mu_unlock (&s->mu); + gpr_free (addr_str); + gpr_free (name); } - sp = &s->ports[s->nports++]; - sp->server = s; - sp->fd = fd; - sp->emfd = grpc_fd_create(fd, name); - memcpy(sp->addr.untyped, addr, addr_len); - sp->addr_len = addr_len; - GPR_ASSERT(sp->emfd); - gpr_mu_unlock(&s->mu); - gpr_free(addr_str); - gpr_free(name); - } return port; } -int grpc_tcp_server_add_port(grpc_tcp_server *s, const void *addr, - size_t addr_len) { +int +grpc_tcp_server_add_port (grpc_tcp_server * s, const void *addr, size_t addr_len) +{ int allocated_port1 = -1; int allocated_port2 = -1; unsigned i; @@ -417,100 +461,110 @@ int grpc_tcp_server_add_port(grpc_tcp_server *s, const void *addr, socklen_t sockname_len; int port; - if (((struct sockaddr *)addr)->sa_family == AF_UNIX) { - unlink_if_unix_domain_socket(addr); - } + if (((struct sockaddr *) addr)->sa_family == AF_UNIX) + { + unlink_if_unix_domain_socket (addr); + } /* Check if this is a wildcard port, and if so, try to keep the port the same as some previously created listener. */ - if (grpc_sockaddr_get_port(addr) == 0) { - for (i = 0; i < s->nports; i++) { - sockname_len = sizeof(sockname_temp); - if (0 == getsockname(s->ports[i].fd, (struct sockaddr *)&sockname_temp, - &sockname_len)) { - port = grpc_sockaddr_get_port((struct sockaddr *)&sockname_temp); - if (port > 0) { - allocated_addr = malloc(addr_len); - memcpy(allocated_addr, addr, addr_len); - grpc_sockaddr_set_port(allocated_addr, port); - addr = allocated_addr; - break; - } - } + if (grpc_sockaddr_get_port (addr) == 0) + { + for (i = 0; i < s->nports; i++) + { + sockname_len = sizeof (sockname_temp); + if (0 == getsockname (s->ports[i].fd, (struct sockaddr *) &sockname_temp, &sockname_len)) + { + port = grpc_sockaddr_get_port ((struct sockaddr *) &sockname_temp); + if (port > 0) + { + allocated_addr = malloc (addr_len); + memcpy (allocated_addr, addr, addr_len); + grpc_sockaddr_set_port (allocated_addr, port); + addr = allocated_addr; + break; + } + } + } } - } - if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) { - addr = (const struct sockaddr *)&addr6_v4mapped; - addr_len = sizeof(addr6_v4mapped); - } + if (grpc_sockaddr_to_v4mapped (addr, &addr6_v4mapped)) + { + addr = (const struct sockaddr *) &addr6_v4mapped; + addr_len = sizeof (addr6_v4mapped); + } /* Treat :: or 0.0.0.0 as a family-agnostic wildcard. */ - if (grpc_sockaddr_is_wildcard(addr, &port)) { - grpc_sockaddr_make_wildcards(port, &wild4, &wild6); - - /* Try listening on IPv6 first. */ - addr = (struct sockaddr *)&wild6; - addr_len = sizeof(wild6); - fd = grpc_create_dualstack_socket(addr, SOCK_STREAM, 0, &dsmode); - allocated_port1 = add_socket_to_server(s, fd, addr, addr_len); - if (fd >= 0 && dsmode == GRPC_DSMODE_DUALSTACK) { - goto done; + if (grpc_sockaddr_is_wildcard (addr, &port)) + { + grpc_sockaddr_make_wildcards (port, &wild4, &wild6); + + /* Try listening on IPv6 first. */ + addr = (struct sockaddr *) &wild6; + addr_len = sizeof (wild6); + fd = grpc_create_dualstack_socket (addr, SOCK_STREAM, 0, &dsmode); + allocated_port1 = add_socket_to_server (s, fd, addr, addr_len); + if (fd >= 0 && dsmode == GRPC_DSMODE_DUALSTACK) + { + goto done; + } + + /* If we didn't get a dualstack socket, also listen on 0.0.0.0. */ + if (port == 0 && allocated_port1 > 0) + { + grpc_sockaddr_set_port ((struct sockaddr *) &wild4, allocated_port1); + } + addr = (struct sockaddr *) &wild4; + addr_len = sizeof (wild4); } - /* If we didn't get a dualstack socket, also listen on 0.0.0.0. */ - if (port == 0 && allocated_port1 > 0) { - grpc_sockaddr_set_port((struct sockaddr *)&wild4, allocated_port1); + fd = grpc_create_dualstack_socket (addr, SOCK_STREAM, 0, &dsmode); + if (fd < 0) + { + gpr_log (GPR_ERROR, "Unable to create socket: %s", strerror (errno)); + } + if (dsmode == GRPC_DSMODE_IPV4 && grpc_sockaddr_is_v4mapped (addr, &addr4_copy)) + { + addr = (struct sockaddr *) &addr4_copy; + addr_len = sizeof (addr4_copy); } - addr = (struct sockaddr *)&wild4; - addr_len = sizeof(wild4); - } - - fd = grpc_create_dualstack_socket(addr, SOCK_STREAM, 0, &dsmode); - if (fd < 0) { - gpr_log(GPR_ERROR, "Unable to create socket: %s", strerror(errno)); - } - if (dsmode == GRPC_DSMODE_IPV4 && - grpc_sockaddr_is_v4mapped(addr, &addr4_copy)) { - addr = (struct sockaddr *)&addr4_copy; - addr_len = sizeof(addr4_copy); - } - allocated_port2 = add_socket_to_server(s, fd, addr, addr_len); + allocated_port2 = add_socket_to_server (s, fd, addr, addr_len); done: - gpr_free(allocated_addr); + gpr_free (allocated_addr); return allocated_port1 >= 0 ? allocated_port1 : allocated_port2; } -int grpc_tcp_server_get_fd(grpc_tcp_server *s, unsigned index) { +int +grpc_tcp_server_get_fd (grpc_tcp_server * s, unsigned index) +{ return (index < s->nports) ? s->ports[index].fd : -1; } -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, - grpc_closure_list *closure_list) { +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, grpc_closure_list * closure_list) +{ size_t i, j; - GPR_ASSERT(on_accept_cb); - gpr_mu_lock(&s->mu); - GPR_ASSERT(!s->on_accept_cb); - GPR_ASSERT(s->active_ports == 0); + GPR_ASSERT (on_accept_cb); + gpr_mu_lock (&s->mu); + GPR_ASSERT (!s->on_accept_cb); + GPR_ASSERT (s->active_ports == 0); s->on_accept_cb = on_accept_cb; s->on_accept_cb_arg = on_accept_cb_arg; s->pollsets = pollsets; s->pollset_count = pollset_count; - for (i = 0; i < s->nports; i++) { - for (j = 0; j < pollset_count; j++) { - grpc_pollset_add_fd(pollsets[j], s->ports[i].emfd, closure_list); + for (i = 0; i < s->nports; i++) + { + for (j = 0; j < pollset_count; j++) + { + grpc_pollset_add_fd (pollsets[j], s->ports[i].emfd, closure_list); + } + s->ports[i].read_closure.cb = on_read; + s->ports[i].read_closure.cb_arg = &s->ports[i]; + grpc_fd_notify_on_read (s->ports[i].emfd, &s->ports[i].read_closure, closure_list); + s->active_ports++; } - s->ports[i].read_closure.cb = on_read; - s->ports[i].read_closure.cb_arg = &s->ports[i]; - grpc_fd_notify_on_read(s->ports[i].emfd, &s->ports[i].read_closure, - closure_list); - s->active_ports++; - } - gpr_mu_unlock(&s->mu); + gpr_mu_unlock (&s->mu); } #endif diff --git a/src/core/iomgr/tcp_server_windows.c b/src/core/iomgr/tcp_server_windows.c index cd8565fa270..9d4e0e1531f 100644 --- a/src/core/iomgr/tcp_server_windows.c +++ b/src/core/iomgr/tcp_server_windows.c @@ -55,10 +55,11 @@ #define MIN_SAFE_ACCEPT_QUEUE_SIZE 100 /* one listening port */ -typedef struct server_port { +typedef struct server_port +{ /* This seemingly magic number comes from AcceptEx's documentation. each address buffer needs to have at least 16 more bytes at their end. */ - gpr_uint8 addresses[(sizeof(struct sockaddr_in6) + 16) * 2]; + gpr_uint8 addresses[(sizeof (struct sockaddr_in6) + 16) * 2]; /* This will hold the socket for the next accept. */ SOCKET new_socket; /* The listener winsocked. */ @@ -70,7 +71,8 @@ typedef struct server_port { } server_port; /* the overall server */ -struct grpc_tcp_server { +struct grpc_tcp_server +{ /* Called whenever accept() succeeds on a server port. */ grpc_tcp_server_cb on_accept_cb; void *on_accept_cb_arg; @@ -86,201 +88,226 @@ struct grpc_tcp_server { size_t port_capacity; /* shutdown callback */ - void (*shutdown_complete)(void *); + void (*shutdown_complete) (void *); void *shutdown_complete_arg; }; /* Public function. Allocates the proper data structures to hold a grpc_tcp_server. */ -grpc_tcp_server *grpc_tcp_server_create(void) { - grpc_tcp_server *s = gpr_malloc(sizeof(grpc_tcp_server)); - gpr_mu_init(&s->mu); +grpc_tcp_server * +grpc_tcp_server_create (void) +{ + grpc_tcp_server *s = gpr_malloc (sizeof (grpc_tcp_server)); + gpr_mu_init (&s->mu); s->active_ports = 0; s->on_accept_cb = NULL; s->on_accept_cb_arg = NULL; - s->ports = gpr_malloc(sizeof(server_port) * INIT_PORT_CAP); + s->ports = gpr_malloc (sizeof (server_port) * INIT_PORT_CAP); s->nports = 0; s->port_capacity = INIT_PORT_CAP; s->shutdown_complete = NULL; return s; } -static void dont_care_about_shutdown_completion(void *arg) {} +static void +dont_care_about_shutdown_completion (void *arg) +{ +} -static void finish_shutdown(grpc_tcp_server *s) { +static void +finish_shutdown (grpc_tcp_server * s) +{ size_t i; - s->shutdown_complete(s->shutdown_complete_arg); + s->shutdown_complete (s->shutdown_complete_arg); /* Now that the accepts have been aborted, we can destroy the sockets. - The IOCP won't get notified on these, so we can flag them as already - closed by the system. */ - for (i = 0; i < s->nports; i++) { - server_port *sp = &s->ports[i]; - grpc_winsocket_destroy(sp->socket); - } - gpr_free(s->ports); - gpr_free(s); + The IOCP won't get notified on these, so we can flag them as already + closed by the system. */ + for (i = 0; i < s->nports; i++) + { + server_port *sp = &s->ports[i]; + grpc_winsocket_destroy (sp->socket); + } + gpr_free (s->ports); + gpr_free (s); } /* Public function. Stops and destroys a grpc_tcp_server. */ -void grpc_tcp_server_destroy(grpc_tcp_server *s, - void (*shutdown_complete)(void *shutdown_done_arg), - void *shutdown_complete_arg) { +void +grpc_tcp_server_destroy (grpc_tcp_server * s, void (*shutdown_complete) (void *shutdown_done_arg), void *shutdown_complete_arg) +{ size_t i; int immediately_done = 0; - gpr_mu_lock(&s->mu); + gpr_mu_lock (&s->mu); - s->shutdown_complete = shutdown_complete - ? shutdown_complete - : dont_care_about_shutdown_completion; + s->shutdown_complete = shutdown_complete ? shutdown_complete : dont_care_about_shutdown_completion; s->shutdown_complete_arg = shutdown_complete_arg; /* 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) { - immediately_done = 1; - } - for (i = 0; i < s->nports; i++) { - server_port *sp = &s->ports[i]; - sp->shutting_down = 1; - grpc_winsocket_shutdown(sp->socket); - } - gpr_mu_unlock(&s->mu); - - if (immediately_done) { - finish_shutdown(s); - } + if (s->active_ports == 0) + { + immediately_done = 1; + } + for (i = 0; i < s->nports; i++) + { + server_port *sp = &s->ports[i]; + sp->shutting_down = 1; + grpc_winsocket_shutdown (sp->socket); + } + gpr_mu_unlock (&s->mu); + + if (immediately_done) + { + finish_shutdown (s); + } } /* Prepare (bind) a recently-created socket for listening. */ -static int prepare_socket(SOCKET sock, const struct sockaddr *addr, - int addr_len) { +static int +prepare_socket (SOCKET sock, const struct sockaddr *addr, int addr_len) +{ struct sockaddr_storage sockname_temp; socklen_t sockname_len; - if (sock == INVALID_SOCKET) goto error; - - if (!grpc_tcp_prepare_socket(sock)) { - char *utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "Unable to prepare socket: %s", utf8_message); - gpr_free(utf8_message); - goto error; - } - - if (bind(sock, addr, addr_len) == SOCKET_ERROR) { - char *addr_str; - char *utf8_message = gpr_format_message(WSAGetLastError()); - grpc_sockaddr_to_string(&addr_str, addr, 0); - gpr_log(GPR_ERROR, "bind addr=%s: %s", addr_str, utf8_message); - gpr_free(utf8_message); - gpr_free(addr_str); + if (sock == INVALID_SOCKET) goto error; - } - if (listen(sock, SOMAXCONN) == SOCKET_ERROR) { - char *utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "listen: %s", utf8_message); - gpr_free(utf8_message); - goto error; - } - - sockname_len = sizeof(sockname_temp); - if (getsockname(sock, (struct sockaddr *)&sockname_temp, &sockname_len) == - SOCKET_ERROR) { - char *utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "getsockname: %s", utf8_message); - gpr_free(utf8_message); - goto error; - } + if (!grpc_tcp_prepare_socket (sock)) + { + char *utf8_message = gpr_format_message (WSAGetLastError ()); + gpr_log (GPR_ERROR, "Unable to prepare socket: %s", utf8_message); + gpr_free (utf8_message); + goto error; + } - return grpc_sockaddr_get_port((struct sockaddr *)&sockname_temp); + if (bind (sock, addr, addr_len) == SOCKET_ERROR) + { + char *addr_str; + char *utf8_message = gpr_format_message (WSAGetLastError ()); + grpc_sockaddr_to_string (&addr_str, addr, 0); + gpr_log (GPR_ERROR, "bind addr=%s: %s", addr_str, utf8_message); + gpr_free (utf8_message); + gpr_free (addr_str); + goto error; + } + + if (listen (sock, SOMAXCONN) == SOCKET_ERROR) + { + char *utf8_message = gpr_format_message (WSAGetLastError ()); + gpr_log (GPR_ERROR, "listen: %s", utf8_message); + gpr_free (utf8_message); + goto error; + } + + sockname_len = sizeof (sockname_temp); + if (getsockname (sock, (struct sockaddr *) &sockname_temp, &sockname_len) == SOCKET_ERROR) + { + char *utf8_message = gpr_format_message (WSAGetLastError ()); + gpr_log (GPR_ERROR, "getsockname: %s", utf8_message); + gpr_free (utf8_message); + goto error; + } + + return grpc_sockaddr_get_port ((struct sockaddr *) &sockname_temp); error: - if (sock != INVALID_SOCKET) closesocket(sock); + if (sock != INVALID_SOCKET) + closesocket (sock); return -1; } -static void decrement_active_ports_and_notify(server_port *sp) { +static void +decrement_active_ports_and_notify (server_port * sp) +{ int notify = 0; sp->shutting_down = 0; - gpr_mu_lock(&sp->server->mu); - GPR_ASSERT(sp->server->active_ports > 0); - if (0 == --sp->server->active_ports && - sp->server->shutdown_complete != NULL) { - notify = 1; - } - gpr_mu_unlock(&sp->server->mu); - if (notify) { - finish_shutdown(sp->server); - } + gpr_mu_lock (&sp->server->mu); + GPR_ASSERT (sp->server->active_ports > 0); + if (0 == --sp->server->active_ports && sp->server->shutdown_complete != NULL) + { + notify = 1; + } + gpr_mu_unlock (&sp->server->mu); + if (notify) + { + finish_shutdown (sp->server); + } } /* start_accept will reference that for the IOCP notification request. */ -static void on_accept(void *arg, int from_iocp); +static void on_accept (void *arg, int from_iocp); /* 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 void start_accept(server_port *port) { +static void +start_accept (server_port * port) +{ SOCKET sock = INVALID_SOCKET; char *message; char *utf8_message; BOOL success; - DWORD addrlen = sizeof(struct sockaddr_in6) + 16; + DWORD addrlen = sizeof (struct sockaddr_in6) + 16; DWORD bytes_received = 0; - sock = WSASocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0, - WSA_FLAG_OVERLAPPED); + sock = WSASocket (AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); - if (sock == INVALID_SOCKET) { - message = "Unable to create socket: %s"; - goto failure; - } + if (sock == INVALID_SOCKET) + { + message = "Unable to create socket: %s"; + goto failure; + } - if (!grpc_tcp_prepare_socket(sock)) { - message = "Unable to prepare socket: %s"; - goto failure; - } + if (!grpc_tcp_prepare_socket (sock)) + { + message = "Unable to prepare socket: %s"; + goto failure; + } /* Start the "accept" asynchronously. */ - success = port->AcceptEx(port->socket->socket, sock, port->addresses, 0, - addrlen, addrlen, &bytes_received, - &port->socket->read_info.overlapped); + success = port->AcceptEx (port->socket->socket, sock, port->addresses, 0, addrlen, addrlen, &bytes_received, &port->socket->read_info.overlapped); /* It is possible to get an accept immediately without delay. However, we will still get an IOCP notification for it. So let's just ignore it. */ - if (!success) { - int error = WSAGetLastError(); - if (error != ERROR_IO_PENDING) { - message = "AcceptEx failed: %s"; - goto failure; + if (!success) + { + int error = WSAGetLastError (); + if (error != ERROR_IO_PENDING) + { + message = "AcceptEx failed: %s"; + goto failure; + } } - } /* 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, on_accept, port); + grpc_socket_notify_on_read (port->socket, on_accept, port); return; failure: - if (port->shutting_down) { - /* We are abandoning the listener port, take that into account to prevent - occasional hangs on shutdown. The hang happens when sp->shutting_down - change is not seen by on_accept and we proceed to trying new accept, - but we fail there because the listening port has been closed in the - meantime. */ - decrement_active_ports_and_notify(port); - return; - } - utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, message, utf8_message); - gpr_free(utf8_message); - if (sock != INVALID_SOCKET) closesocket(sock); + if (port->shutting_down) + { + /* We are abandoning the listener port, take that into account to prevent + occasional hangs on shutdown. The hang happens when sp->shutting_down + change is not seen by on_accept and we proceed to trying new accept, + but we fail there because the listening port has been closed in the + meantime. */ + decrement_active_ports_and_notify (port); + return; + } + utf8_message = gpr_format_message (WSAGetLastError ()); + gpr_log (GPR_ERROR, message, utf8_message); + gpr_free (utf8_message); + if (sock != INVALID_SOCKET) + closesocket (sock); } /* Event manager callback when reads are ready. */ -static void on_accept(void *arg, int from_iocp) { +static void +on_accept (void *arg, int from_iocp) +{ server_port *sp = arg; SOCKET sock = sp->new_socket; grpc_winsocket_callback_info *info = &sp->socket->read_info; @@ -288,7 +315,7 @@ static void on_accept(void *arg, int from_iocp) { struct sockaddr_storage peer_name; char *peer_name_string; char *fd_name; - int peer_name_len = sizeof(peer_name); + int peer_name_len = sizeof (peer_name); DWORD transfered_bytes; DWORD flags; BOOL wsa_success; @@ -297,65 +324,76 @@ static void on_accept(void *arg, int from_iocp) { /* The general mechanism for shutting down is to queue abortion calls. While this is necessary in the read/write case, it's useless for the accept case. We only need to adjust the pending callback count */ - if (!from_iocp) { - return; - } + if (!from_iocp) + { + return; + } /* The IOCP notified us of a completed operation. Let's grab the results, - and act accordingly. */ + and act accordingly. */ transfered_bytes = 0; - wsa_success = WSAGetOverlappedResult(sock, &info->overlapped, - &transfered_bytes, FALSE, &flags); - if (!wsa_success) { - if (sp->shutting_down) { - /* During the shutdown case, we ARE expecting an error. So that's well, - and we can wake up the shutdown thread. */ - decrement_active_ports_and_notify(sp); - return; - } else { - char *utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "on_accept error: %s", utf8_message); - gpr_free(utf8_message); - closesocket(sock); + wsa_success = WSAGetOverlappedResult (sock, &info->overlapped, &transfered_bytes, FALSE, &flags); + if (!wsa_success) + { + if (sp->shutting_down) + { + /* During the shutdown case, we ARE expecting an error. So that's well, + and we can wake up the shutdown thread. */ + decrement_active_ports_and_notify (sp); + return; + } + else + { + char *utf8_message = gpr_format_message (WSAGetLastError ()); + gpr_log (GPR_ERROR, "on_accept error: %s", utf8_message); + gpr_free (utf8_message); + closesocket (sock); + } } - } else { - if (!sp->shutting_down) { - peer_name_string = NULL; - err = setsockopt(sock, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, - (char *)&sp->socket->socket, sizeof(sp->socket->socket)); - if (err) { - char *utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "setsockopt error: %s", utf8_message); - gpr_free(utf8_message); - } - err = getpeername(sock, (struct sockaddr *)&peer_name, &peer_name_len); - if (!err) { - peer_name_string = grpc_sockaddr_to_uri((struct sockaddr *)&peer_name); - } else { - char *utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "getpeername error: %s", utf8_message); - gpr_free(utf8_message); - } - gpr_asprintf(&fd_name, "tcp_server:%s", peer_name_string); - ep = grpc_tcp_create(grpc_winsocket_create(sock, fd_name), - peer_name_string); - gpr_free(fd_name); - gpr_free(peer_name_string); + else + { + if (!sp->shutting_down) + { + peer_name_string = NULL; + err = setsockopt (sock, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char *) &sp->socket->socket, sizeof (sp->socket->socket)); + if (err) + { + char *utf8_message = gpr_format_message (WSAGetLastError ()); + gpr_log (GPR_ERROR, "setsockopt error: %s", utf8_message); + gpr_free (utf8_message); + } + err = getpeername (sock, (struct sockaddr *) &peer_name, &peer_name_len); + if (!err) + { + peer_name_string = grpc_sockaddr_to_uri ((struct sockaddr *) &peer_name); + } + else + { + char *utf8_message = gpr_format_message (WSAGetLastError ()); + gpr_log (GPR_ERROR, "getpeername error: %s", utf8_message); + gpr_free (utf8_message); + } + gpr_asprintf (&fd_name, "tcp_server:%s", peer_name_string); + ep = grpc_tcp_create (grpc_winsocket_create (sock, fd_name), peer_name_string); + gpr_free (fd_name); + gpr_free (peer_name_string); + } } - } /* The only time we should call our callback, is where we successfully managed to accept a connection, and created an endpoint. */ - if (ep) sp->server->on_accept_cb(sp->server->on_accept_cb_arg, ep); + if (ep) + sp->server->on_accept_cb (sp->server->on_accept_cb_arg, ep); /* 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. */ - start_accept(sp); + start_accept (sp); } -static int add_socket_to_server(grpc_tcp_server *s, SOCKET sock, - const struct sockaddr *addr, int addr_len) { +static int +add_socket_to_server (grpc_tcp_server * s, SOCKET sock, const struct sockaddr *addr, int addr_len) +{ server_port *sp; int port; int status; @@ -363,46 +401,49 @@ static int add_socket_to_server(grpc_tcp_server *s, SOCKET sock, DWORD ioctl_num_bytes; LPFN_ACCEPTEX AcceptEx; - if (sock == INVALID_SOCKET) return -1; + if (sock == INVALID_SOCKET) + return -1; /* We need to grab the AcceptEx pointer for that port, as it may be interface-dependent. We'll cache it to avoid doing that again. */ - status = - WSAIoctl(sock, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof(guid), - &AcceptEx, sizeof(AcceptEx), &ioctl_num_bytes, NULL, NULL); - - if (status != 0) { - char *utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "on_connect error: %s", utf8_message); - gpr_free(utf8_message); - closesocket(sock); - return -1; - } - - port = prepare_socket(sock, addr, addr_len); - if (port >= 0) { - gpr_mu_lock(&s->mu); - GPR_ASSERT(!s->on_accept_cb && "must add ports before starting server"); - /* append it to the list under a lock */ - if (s->nports == s->port_capacity) { - s->port_capacity *= 2; - s->ports = gpr_realloc(s->ports, sizeof(server_port) * s->port_capacity); + status = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof (guid), &AcceptEx, sizeof (AcceptEx), &ioctl_num_bytes, NULL, NULL); + + if (status != 0) + { + char *utf8_message = gpr_format_message (WSAGetLastError ()); + gpr_log (GPR_ERROR, "on_connect error: %s", utf8_message); + gpr_free (utf8_message); + closesocket (sock); + return -1; + } + + port = prepare_socket (sock, addr, addr_len); + if (port >= 0) + { + gpr_mu_lock (&s->mu); + GPR_ASSERT (!s->on_accept_cb && "must add ports before starting server"); + /* append it to the list under a lock */ + if (s->nports == s->port_capacity) + { + s->port_capacity *= 2; + s->ports = gpr_realloc (s->ports, sizeof (server_port) * s->port_capacity); + } + sp = &s->ports[s->nports++]; + sp->server = s; + sp->socket = grpc_winsocket_create (sock, "listener"); + sp->shutting_down = 0; + sp->AcceptEx = AcceptEx; + sp->new_socket = INVALID_SOCKET; + GPR_ASSERT (sp->socket); + gpr_mu_unlock (&s->mu); } - sp = &s->ports[s->nports++]; - sp->server = s; - sp->socket = grpc_winsocket_create(sock, "listener"); - sp->shutting_down = 0; - sp->AcceptEx = AcceptEx; - sp->new_socket = INVALID_SOCKET; - GPR_ASSERT(sp->socket); - gpr_mu_unlock(&s->mu); - } return port; } -int grpc_tcp_server_add_port(grpc_tcp_server *s, const void *addr, - int addr_len) { +int +grpc_tcp_server_add_port (grpc_tcp_server * s, const void *addr, int addr_len) +{ int allocated_port = -1; unsigned i; SOCKET sock; @@ -415,70 +456,77 @@ int grpc_tcp_server_add_port(grpc_tcp_server *s, const void *addr, /* Check if this is a wildcard port, and if so, try to keep the port the same as some previously created listener. */ - if (grpc_sockaddr_get_port(addr) == 0) { - for (i = 0; i < s->nports; i++) { - sockname_len = sizeof(sockname_temp); - if (0 == getsockname(s->ports[i].socket->socket, - (struct sockaddr *)&sockname_temp, &sockname_len)) { - port = grpc_sockaddr_get_port((struct sockaddr *)&sockname_temp); - if (port > 0) { - allocated_addr = malloc(addr_len); - memcpy(allocated_addr, addr, addr_len); - grpc_sockaddr_set_port(allocated_addr, port); - addr = allocated_addr; - break; - } - } + if (grpc_sockaddr_get_port (addr) == 0) + { + for (i = 0; i < s->nports; i++) + { + sockname_len = sizeof (sockname_temp); + if (0 == getsockname (s->ports[i].socket->socket, (struct sockaddr *) &sockname_temp, &sockname_len)) + { + port = grpc_sockaddr_get_port ((struct sockaddr *) &sockname_temp); + if (port > 0) + { + allocated_addr = malloc (addr_len); + memcpy (allocated_addr, addr, addr_len); + grpc_sockaddr_set_port (allocated_addr, port); + addr = allocated_addr; + break; + } + } + } } - } - if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) { - addr = (const struct sockaddr *)&addr6_v4mapped; - addr_len = sizeof(addr6_v4mapped); - } + if (grpc_sockaddr_to_v4mapped (addr, &addr6_v4mapped)) + { + addr = (const struct sockaddr *) &addr6_v4mapped; + addr_len = sizeof (addr6_v4mapped); + } /* Treat :: or 0.0.0.0 as a family-agnostic wildcard. */ - if (grpc_sockaddr_is_wildcard(addr, &port)) { - grpc_sockaddr_make_wildcard6(port, &wildcard); + if (grpc_sockaddr_is_wildcard (addr, &port)) + { + grpc_sockaddr_make_wildcard6 (port, &wildcard); - addr = (struct sockaddr *)&wildcard; - addr_len = sizeof(wildcard); - } + addr = (struct sockaddr *) &wildcard; + addr_len = sizeof (wildcard); + } - sock = WSASocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0, - WSA_FLAG_OVERLAPPED); - if (sock == INVALID_SOCKET) { - char *utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "unable to create socket: %s", utf8_message); - gpr_free(utf8_message); - } + sock = WSASocket (AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + if (sock == INVALID_SOCKET) + { + char *utf8_message = gpr_format_message (WSAGetLastError ()); + gpr_log (GPR_ERROR, "unable to create socket: %s", utf8_message); + gpr_free (utf8_message); + } - allocated_port = add_socket_to_server(s, sock, addr, addr_len); - gpr_free(allocated_addr); + allocated_port = add_socket_to_server (s, sock, addr, addr_len); + gpr_free (allocated_addr); return allocated_port; } -SOCKET grpc_tcp_server_get_socket(grpc_tcp_server *s, unsigned index) { +SOCKET +grpc_tcp_server_get_socket (grpc_tcp_server * s, unsigned index) +{ return (index < s->nports) ? s->ports[index].socket->socket : INVALID_SOCKET; } -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) { +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) +{ size_t i; - GPR_ASSERT(on_accept_cb); - gpr_mu_lock(&s->mu); - GPR_ASSERT(!s->on_accept_cb); - GPR_ASSERT(s->active_ports == 0); + GPR_ASSERT (on_accept_cb); + gpr_mu_lock (&s->mu); + GPR_ASSERT (!s->on_accept_cb); + GPR_ASSERT (s->active_ports == 0); s->on_accept_cb = on_accept_cb; s->on_accept_cb_arg = on_accept_cb_arg; - for (i = 0; i < s->nports; i++) { - start_accept(s->ports + i); - s->active_ports++; - } - gpr_mu_unlock(&s->mu); + for (i = 0; i < s->nports; i++) + { + start_accept (s->ports + i); + s->active_ports++; + } + gpr_mu_unlock (&s->mu); } #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/tcp_windows.c b/src/core/iomgr/tcp_windows.c index ab309180eb1..9837b026b13 100644 --- a/src/core/iomgr/tcp_windows.c +++ b/src/core/iomgr/tcp_windows.c @@ -51,30 +51,37 @@ #include "src/core/iomgr/socket_windows.h" #include "src/core/iomgr/tcp_client.h" -static int set_non_block(SOCKET sock) { +static int +set_non_block (SOCKET sock) +{ int status; unsigned long param = 1; DWORD ret; - status = - WSAIoctl(sock, FIONBIO, ¶m, sizeof(param), NULL, 0, &ret, NULL, NULL); + status = WSAIoctl (sock, FIONBIO, ¶m, sizeof (param), NULL, 0, &ret, NULL, NULL); return status == 0; } -static int set_dualstack(SOCKET sock) { +static int +set_dualstack (SOCKET sock) +{ int status; unsigned long param = 0; - status = setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)¶m, - sizeof(param)); + status = setsockopt (sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char *) ¶m, sizeof (param)); return status == 0; } -int grpc_tcp_prepare_socket(SOCKET sock) { - if (!set_non_block(sock)) return 0; - if (!set_dualstack(sock)) return 0; +int +grpc_tcp_prepare_socket (SOCKET sock) +{ + if (!set_non_block (sock)) + return 0; + if (!set_dualstack (sock)) + return 0; return 1; } -typedef struct grpc_tcp { +typedef struct grpc_tcp +{ /* This is our C++ class derivation emulation. */ grpc_endpoint base; /* The one socket this endpoint is using. */ @@ -96,46 +103,58 @@ typedef struct grpc_tcp { char *peer_string; } grpc_tcp; -static void tcp_free(grpc_tcp *tcp) { - grpc_winsocket_destroy(tcp->socket); - gpr_mu_destroy(&tcp->mu); - gpr_free(tcp->peer_string); - gpr_free(tcp); +static void +tcp_free (grpc_tcp * tcp) +{ + grpc_winsocket_destroy (tcp->socket); + gpr_mu_destroy (&tcp->mu); + gpr_free (tcp->peer_string); + gpr_free (tcp); } /*#define GRPC_TCP_REFCOUNT_DEBUG*/ #ifdef GRPC_TCP_REFCOUNT_DEBUG #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_tcp *tcp, const char *reason, const char *file, - int line) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "TCP unref %p : %s %d -> %d", tcp, - reason, tcp->refcount.count, tcp->refcount.count - 1); - if (gpr_unref(&tcp->refcount)) { - tcp_free(tcp); - } +static void +tcp_unref (grpc_tcp * tcp, const char *reason, const char *file, int line) +{ + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "TCP unref %p : %s %d -> %d", tcp, reason, tcp->refcount.count, tcp->refcount.count - 1); + if (gpr_unref (&tcp->refcount)) + { + tcp_free (tcp); + } } -static void tcp_ref(grpc_tcp *tcp, const char *reason, const char *file, - int line) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "TCP ref %p : %s %d -> %d", tcp, - reason, tcp->refcount.count, tcp->refcount.count + 1); - gpr_ref(&tcp->refcount); +static void +tcp_ref (grpc_tcp * tcp, const char *reason, const char *file, int line) +{ + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "TCP ref %p : %s %d -> %d", tcp, reason, tcp->refcount.count, tcp->refcount.count + 1); + gpr_ref (&tcp->refcount); } #else #define TCP_UNREF(tcp, reason) tcp_unref((tcp)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void tcp_unref(grpc_tcp *tcp) { - if (gpr_unref(&tcp->refcount)) { - tcp_free(tcp); - } +static void +tcp_unref (grpc_tcp * tcp) +{ + if (gpr_unref (&tcp->refcount)) + { + tcp_free (tcp); + } } -static void tcp_ref(grpc_tcp *tcp) { gpr_ref(&tcp->refcount); } +static void +tcp_ref (grpc_tcp * tcp) +{ + gpr_ref (&tcp->refcount); +} #endif /* Asynchronous callback from the IOCP, or the background thread. */ -static int on_read(grpc_tcp *tcp, int success) { +static int +on_read (grpc_tcp * tcp, int success) +{ grpc_winsocket *socket = tcp->socket; gpr_slice sub; gpr_slice *slice = NULL; @@ -143,45 +162,56 @@ static int on_read(grpc_tcp *tcp, int success) { grpc_winsocket_callback_info *info = &socket->read_info; int do_abort = 0; - if (success) { - if (socket->read_info.wsa_error != 0) { - if (socket->read_info.wsa_error != WSAECONNRESET) { - char *utf8_message = gpr_format_message(info->wsa_error); - gpr_log(GPR_ERROR, "ReadFile overlapped error: %s", utf8_message); - gpr_free(utf8_message); - } - success = 0; - gpr_slice_unref(tcp->read_slice); - } else { - if (info->bytes_transfered != 0) { - sub = gpr_slice_sub_no_ref(tcp->read_slice, 0, info->bytes_transfered); - gpr_slice_buffer_add(tcp->read_slices, sub); - success = 1; - } else { - gpr_slice_unref(tcp->read_slice); - success = 0; - } + if (success) + { + if (socket->read_info.wsa_error != 0) + { + if (socket->read_info.wsa_error != WSAECONNRESET) + { + char *utf8_message = gpr_format_message (info->wsa_error); + gpr_log (GPR_ERROR, "ReadFile overlapped error: %s", utf8_message); + gpr_free (utf8_message); + } + success = 0; + gpr_slice_unref (tcp->read_slice); + } + else + { + if (info->bytes_transfered != 0) + { + sub = gpr_slice_sub_no_ref (tcp->read_slice, 0, info->bytes_transfered); + gpr_slice_buffer_add (tcp->read_slices, sub); + success = 1; + } + else + { + gpr_slice_unref (tcp->read_slice); + success = 0; + } + } } - } return success; } -static void on_read_cb(void *tcpp, int from_iocp) { +static void +on_read_cb (void *tcpp, int from_iocp) +{ grpc_tcp *tcp = tcpp; grpc_closure *cb = tcp->read_cb; - int success = on_read(tcp, from_iocp); + int success = on_read (tcp, from_iocp); tcp->read_cb = NULL; - TCP_UNREF(tcp, "read"); - if (cb) { - cb->cb(cb->cb_arg, success); - } + TCP_UNREF (tcp, "read"); + if (cb) + { + cb->cb (cb->cb_arg, success); + } } -static grpc_endpoint_op_status win_read(grpc_endpoint *ep, - gpr_slice_buffer *read_slices, - grpc_closure *cb) { - grpc_tcp *tcp = (grpc_tcp *)ep; +static grpc_endpoint_op_status +win_read (grpc_endpoint * ep, gpr_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; int status; @@ -189,88 +219,97 @@ static grpc_endpoint_op_status win_read(grpc_endpoint *ep, DWORD flags = 0; WSABUF buffer; - if (tcp->shutting_down) { - return GRPC_ENDPOINT_ERROR; - } + if (tcp->shutting_down) + { + return GRPC_ENDPOINT_ERROR; + } tcp->read_cb = cb; tcp->read_slices = read_slices; - gpr_slice_buffer_reset_and_unref(read_slices); + gpr_slice_buffer_reset_and_unref (read_slices); - tcp->read_slice = gpr_slice_malloc(8192); + tcp->read_slice = gpr_slice_malloc (8192); - buffer.len = GPR_SLICE_LENGTH(tcp->read_slice); - buffer.buf = (char *)GPR_SLICE_START_PTR(tcp->read_slice); + buffer.len = GPR_SLICE_LENGTH (tcp->read_slice); + buffer.buf = (char *) GPR_SLICE_START_PTR (tcp->read_slice); /* First let's try a synchronous, non-blocking read. */ - status = - WSARecv(tcp->socket->socket, &buffer, 1, &bytes_read, &flags, NULL, NULL); - info->wsa_error = status == 0 ? 0 : WSAGetLastError(); + status = WSARecv (tcp->socket->socket, &buffer, 1, &bytes_read, &flags, NULL, NULL); + info->wsa_error = status == 0 ? 0 : WSAGetLastError (); /* Did we get data immediately ? Yay. */ - if (info->wsa_error != WSAEWOULDBLOCK) { - int ok; - info->bytes_transfered = bytes_read; - ok = on_read(tcp, 1); - return ok ? GRPC_ENDPOINT_DONE : GRPC_ENDPOINT_ERROR; - } + if (info->wsa_error != WSAEWOULDBLOCK) + { + int ok; + info->bytes_transfered = bytes_read; + ok = on_read (tcp, 1); + return ok ? GRPC_ENDPOINT_DONE : GRPC_ENDPOINT_ERROR; + } - TCP_REF(tcp, "read"); + TCP_REF (tcp, "read"); /* Otherwise, let's retry, by queuing a read. */ - memset(&tcp->socket->read_info.overlapped, 0, sizeof(OVERLAPPED)); - status = WSARecv(tcp->socket->socket, &buffer, 1, &bytes_read, &flags, - &info->overlapped, NULL); - - if (status != 0) { - int wsa_error = WSAGetLastError(); - if (wsa_error != WSA_IO_PENDING) { - int ok; - info->wsa_error = wsa_error; - ok = on_read(tcp, 1); - return ok ? GRPC_ENDPOINT_DONE : GRPC_ENDPOINT_ERROR; + memset (&tcp->socket->read_info.overlapped, 0, sizeof (OVERLAPPED)); + status = WSARecv (tcp->socket->socket, &buffer, 1, &bytes_read, &flags, &info->overlapped, NULL); + + if (status != 0) + { + int wsa_error = WSAGetLastError (); + if (wsa_error != WSA_IO_PENDING) + { + int ok; + info->wsa_error = wsa_error; + ok = on_read (tcp, 1); + return ok ? GRPC_ENDPOINT_DONE : GRPC_ENDPOINT_ERROR; + } } - } - grpc_socket_notify_on_read(tcp->socket, on_read_cb, tcp); + grpc_socket_notify_on_read (tcp->socket, on_read_cb, tcp); return GRPC_ENDPOINT_PENDING; } /* Asynchronous callback from the IOCP, or the background thread. */ -static void on_write(void *tcpp, int success) { - grpc_tcp *tcp = (grpc_tcp *)tcpp; +static void +on_write (void *tcpp, int success) +{ + grpc_tcp *tcp = (grpc_tcp *) tcpp; grpc_winsocket *handle = tcp->socket; grpc_winsocket_callback_info *info = &handle->write_info; grpc_closure *cb; int do_abort = 0; - gpr_mu_lock(&tcp->mu); + gpr_mu_lock (&tcp->mu); cb = tcp->write_cb; tcp->write_cb = NULL; - gpr_mu_unlock(&tcp->mu); - - if (success) { - if (info->wsa_error != 0) { - if (info->wsa_error != WSAECONNRESET) { - char *utf8_message = gpr_format_message(info->wsa_error); - gpr_log(GPR_ERROR, "WSASend overlapped error: %s", utf8_message); - gpr_free(utf8_message); - } - success = 0; - } else { - GPR_ASSERT(info->bytes_transfered == tcp->write_slices->length); + gpr_mu_unlock (&tcp->mu); + + if (success) + { + if (info->wsa_error != 0) + { + if (info->wsa_error != WSAECONNRESET) + { + char *utf8_message = gpr_format_message (info->wsa_error); + gpr_log (GPR_ERROR, "WSASend overlapped error: %s", utf8_message); + gpr_free (utf8_message); + } + success = 0; + } + else + { + GPR_ASSERT (info->bytes_transfered == tcp->write_slices->length); + } } - } - TCP_UNREF(tcp, "write"); - cb->cb(cb->cb_arg, success); + TCP_UNREF (tcp, "write"); + cb->cb (cb->cb_arg, success); } /* Initiates a write. */ -static grpc_endpoint_op_status win_write(grpc_endpoint *ep, - gpr_slice_buffer *slices, - grpc_closure *cb) { - grpc_tcp *tcp = (grpc_tcp *)ep; +static grpc_endpoint_op_status +win_write (grpc_endpoint * ep, gpr_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; unsigned i; @@ -280,82 +319,96 @@ static grpc_endpoint_op_status win_write(grpc_endpoint *ep, WSABUF *allocated = NULL; WSABUF *buffers = local_buffers; - if (tcp->shutting_down) { - return GRPC_ENDPOINT_ERROR; - } + if (tcp->shutting_down) + { + return GRPC_ENDPOINT_ERROR; + } tcp->write_cb = cb; tcp->write_slices = slices; - if (tcp->write_slices->count > GPR_ARRAY_SIZE(local_buffers)) { - buffers = (WSABUF *)gpr_malloc(sizeof(WSABUF) * tcp->write_slices->count); - allocated = buffers; - } + if (tcp->write_slices->count > GPR_ARRAY_SIZE (local_buffers)) + { + buffers = (WSABUF *) gpr_malloc (sizeof (WSABUF) * tcp->write_slices->count); + allocated = buffers; + } - for (i = 0; i < tcp->write_slices->count; i++) { - buffers[i].len = GPR_SLICE_LENGTH(tcp->write_slices->slices[i]); - buffers[i].buf = (char *)GPR_SLICE_START_PTR(tcp->write_slices->slices[i]); - } + for (i = 0; i < tcp->write_slices->count; i++) + { + buffers[i].len = GPR_SLICE_LENGTH (tcp->write_slices->slices[i]); + buffers[i].buf = (char *) GPR_SLICE_START_PTR (tcp->write_slices->slices[i]); + } /* First, let's try a synchronous, non-blocking write. */ - status = WSASend(socket->socket, buffers, tcp->write_slices->count, - &bytes_sent, 0, NULL, NULL); - info->wsa_error = status == 0 ? 0 : WSAGetLastError(); + status = WSASend (socket->socket, buffers, tcp->write_slices->count, &bytes_sent, 0, NULL, NULL); + info->wsa_error = status == 0 ? 0 : WSAGetLastError (); /* We would kind of expect to get a WSAEWOULDBLOCK here, especially on a busy connection that has its send queue filled up. But if we don't, then we can avoid doing an async write operation at all. */ - if (info->wsa_error != WSAEWOULDBLOCK) { - grpc_endpoint_op_status ret = GRPC_ENDPOINT_ERROR; - if (status == 0) { - ret = GRPC_ENDPOINT_DONE; - GPR_ASSERT(bytes_sent == tcp->write_slices->length); - } else { - if (socket->read_info.wsa_error != WSAECONNRESET) { - char *utf8_message = gpr_format_message(info->wsa_error); - gpr_log(GPR_ERROR, "WSASend error: %s", utf8_message); - gpr_free(utf8_message); - } + if (info->wsa_error != WSAEWOULDBLOCK) + { + grpc_endpoint_op_status ret = GRPC_ENDPOINT_ERROR; + if (status == 0) + { + ret = GRPC_ENDPOINT_DONE; + GPR_ASSERT (bytes_sent == tcp->write_slices->length); + } + else + { + if (socket->read_info.wsa_error != WSAECONNRESET) + { + char *utf8_message = gpr_format_message (info->wsa_error); + gpr_log (GPR_ERROR, "WSASend error: %s", utf8_message); + gpr_free (utf8_message); + } + } + if (allocated) + gpr_free (allocated); + return ret; } - if (allocated) gpr_free(allocated); - return ret; - } - TCP_REF(tcp, "write"); + TCP_REF (tcp, "write"); /* If we got a WSAEWOULDBLOCK earlier, then we need to re-do the same operation, this time asynchronously. */ - memset(&socket->write_info.overlapped, 0, sizeof(OVERLAPPED)); - status = WSASend(socket->socket, buffers, tcp->write_slices->count, - &bytes_sent, 0, &socket->write_info.overlapped, NULL); - if (allocated) gpr_free(allocated); - - if (status != 0) { - int wsa_error = WSAGetLastError(); - if (wsa_error != WSA_IO_PENDING) { - TCP_UNREF(tcp, "write"); - return GRPC_ENDPOINT_ERROR; + memset (&socket->write_info.overlapped, 0, sizeof (OVERLAPPED)); + status = WSASend (socket->socket, buffers, tcp->write_slices->count, &bytes_sent, 0, &socket->write_info.overlapped, NULL); + if (allocated) + gpr_free (allocated); + + if (status != 0) + { + int wsa_error = WSAGetLastError (); + if (wsa_error != WSA_IO_PENDING) + { + TCP_UNREF (tcp, "write"); + return GRPC_ENDPOINT_ERROR; + } } - } /* 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, on_write, tcp); + grpc_socket_notify_on_write (socket, on_write, tcp); return GRPC_ENDPOINT_PENDING; } -static void win_add_to_pollset(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); + (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_endpoint * ep, grpc_pollset_set * pss) +{ grpc_tcp *tcp; - (void)pss; - tcp = (grpc_tcp *)ep; - grpc_iocp_add_socket(tcp->socket); + (void) pss; + tcp = (grpc_tcp *) ep; + grpc_iocp_add_socket (tcp->socket); } /* Initiates a shutdown of the TCP endpoint. This will queue abort callbacks @@ -364,38 +417,47 @@ static void win_add_to_pollset_set(grpc_endpoint *ep, grpc_pollset_set *pss) { 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_tcp *tcp = (grpc_tcp *)ep; - gpr_mu_lock(&tcp->mu); +static void +win_shutdown (grpc_endpoint * ep) +{ + 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 callback. See the comments in on_read and on_write. */ tcp->shutting_down = 1; - grpc_winsocket_shutdown(tcp->socket); - gpr_mu_unlock(&tcp->mu); + grpc_winsocket_shutdown (tcp->socket); + gpr_mu_unlock (&tcp->mu); } -static void win_destroy(grpc_endpoint *ep) { - grpc_tcp *tcp = (grpc_tcp *)ep; - TCP_UNREF(tcp, "destroy"); +static void +win_destroy (grpc_endpoint * ep) +{ + grpc_tcp *tcp = (grpc_tcp *) ep; + TCP_UNREF (tcp, "destroy"); } -static char *win_get_peer(grpc_endpoint *ep) { - grpc_tcp *tcp = (grpc_tcp *)ep; - return gpr_strdup(tcp->peer_string); +static char * +win_get_peer (grpc_endpoint * ep) +{ + grpc_tcp *tcp = (grpc_tcp *) ep; + return gpr_strdup (tcp->peer_string); } static grpc_endpoint_vtable vtable = { - win_read, win_write, win_add_to_pollset, win_add_to_pollset_set, - win_shutdown, win_destroy, win_get_peer}; - -grpc_endpoint *grpc_tcp_create(grpc_winsocket *socket, char *peer_string) { - grpc_tcp *tcp = (grpc_tcp *)gpr_malloc(sizeof(grpc_tcp)); - memset(tcp, 0, sizeof(grpc_tcp)); + win_read, win_write, win_add_to_pollset, win_add_to_pollset_set, + win_shutdown, win_destroy, win_get_peer +}; + +grpc_endpoint * +grpc_tcp_create (grpc_winsocket * socket, char *peer_string) +{ + grpc_tcp *tcp = (grpc_tcp *) gpr_malloc (sizeof (grpc_tcp)); + memset (tcp, 0, sizeof (grpc_tcp)); tcp->base.vtable = &vtable; tcp->socket = socket; - gpr_mu_init(&tcp->mu); - gpr_ref_init(&tcp->refcount, 1); - tcp->peer_string = gpr_strdup(peer_string); + gpr_mu_init (&tcp->mu); + gpr_ref_init (&tcp->refcount, 1); + tcp->peer_string = gpr_strdup (peer_string); return &tcp->base; } diff --git a/src/core/iomgr/tcp_windows.h b/src/core/iomgr/tcp_windows.h index deb3e48293c..2b87a875adb 100644 --- a/src/core/iomgr/tcp_windows.h +++ b/src/core/iomgr/tcp_windows.h @@ -50,8 +50,8 @@ /* Create a tcp endpoint given a winsock handle. * Takes ownership of the handle. */ -grpc_endpoint *grpc_tcp_create(grpc_winsocket *socket, char *peer_string); +grpc_endpoint *grpc_tcp_create (grpc_winsocket * socket, char *peer_string); -int grpc_tcp_prepare_socket(SOCKET sock); +int grpc_tcp_prepare_socket (SOCKET sock); #endif /* GRPC_INTERNAL_CORE_IOMGR_TCP_WINDOWS_H */ diff --git a/src/core/iomgr/time_averaged_stats.c b/src/core/iomgr/time_averaged_stats.c index f881dde9fc2..c2d1cdf2125 100644 --- a/src/core/iomgr/time_averaged_stats.c +++ b/src/core/iomgr/time_averaged_stats.c @@ -33,9 +33,9 @@ #include "src/core/iomgr/time_averaged_stats.h" -void grpc_time_averaged_stats_init(grpc_time_averaged_stats *stats, - double init_avg, double regress_weight, - double persistence_factor) { +void +grpc_time_averaged_stats_init (grpc_time_averaged_stats * stats, double init_avg, double regress_weight, double persistence_factor) +{ stats->init_avg = init_avg; stats->regress_weight = regress_weight; stats->persistence_factor = persistence_factor; @@ -45,31 +45,33 @@ void grpc_time_averaged_stats_init(grpc_time_averaged_stats *stats, stats->aggregate_weighted_avg = init_avg; } -void grpc_time_averaged_stats_add_sample(grpc_time_averaged_stats *stats, - double value) { +void +grpc_time_averaged_stats_add_sample (grpc_time_averaged_stats * stats, double value) +{ stats->batch_total_value += value; ++stats->batch_num_samples; } -double grpc_time_averaged_stats_update_average( - grpc_time_averaged_stats *stats) { +double +grpc_time_averaged_stats_update_average (grpc_time_averaged_stats * stats) +{ /* Start with the current batch: */ double weighted_sum = stats->batch_total_value; double total_weight = stats->batch_num_samples; - if (stats->regress_weight > 0) { - /* Add in the regression towards init_avg_: */ - weighted_sum += stats->regress_weight * stats->init_avg; - total_weight += stats->regress_weight; - } - if (stats->persistence_factor > 0) { - /* Add in the persistence: */ - const double prev_sample_weight = - stats->persistence_factor * stats->aggregate_total_weight; - weighted_sum += prev_sample_weight * stats->aggregate_weighted_avg; - total_weight += prev_sample_weight; - } - stats->aggregate_weighted_avg = - (total_weight > 0) ? (weighted_sum / total_weight) : stats->init_avg; + if (stats->regress_weight > 0) + { + /* Add in the regression towards init_avg_: */ + weighted_sum += stats->regress_weight * stats->init_avg; + total_weight += stats->regress_weight; + } + if (stats->persistence_factor > 0) + { + /* Add in the persistence: */ + const double prev_sample_weight = stats->persistence_factor * stats->aggregate_total_weight; + weighted_sum += prev_sample_weight * stats->aggregate_weighted_avg; + total_weight += prev_sample_weight; + } + stats->aggregate_weighted_avg = (total_weight > 0) ? (weighted_sum / total_weight) : stats->init_avg; stats->aggregate_total_weight = total_weight; stats->batch_num_samples = 0; stats->batch_total_value = 0; diff --git a/src/core/iomgr/time_averaged_stats.h b/src/core/iomgr/time_averaged_stats.h index e6dec1b4cd6..c4f9a610634 100644 --- a/src/core/iomgr/time_averaged_stats.h +++ b/src/core/iomgr/time_averaged_stats.h @@ -39,7 +39,8 @@ weighted mean. It is designed for batch operations where we do many adds before updating the average. */ -typedef struct { +typedef struct +{ /* The initial average value. This is the reported average until the first grpc_time_averaged_stats_update_average call. If a positive regress_weight is used, we also regress towards this value on each update. */ @@ -75,14 +76,11 @@ typedef struct { /* See the comments on the members above for an explanation of init_avg, regress_weight, and persistence_factor. */ -void grpc_time_averaged_stats_init(grpc_time_averaged_stats *stats, - double init_avg, double regress_weight, - double persistence_factor); +void grpc_time_averaged_stats_init (grpc_time_averaged_stats * stats, double init_avg, double regress_weight, double persistence_factor); /* Add a sample to the current batch. */ -void grpc_time_averaged_stats_add_sample(grpc_time_averaged_stats *stats, - double value); +void grpc_time_averaged_stats_add_sample (grpc_time_averaged_stats * stats, double value); /* Complete a batch and compute the new estimate of the average sample value. */ -double grpc_time_averaged_stats_update_average(grpc_time_averaged_stats *stats); +double grpc_time_averaged_stats_update_average (grpc_time_averaged_stats * stats); #endif /* GRPC_INTERNAL_CORE_IOMGR_TIME_AVERAGED_STATS_H */ diff --git a/src/core/iomgr/udp_server.c b/src/core/iomgr/udp_server.c index 0f0bea82ab1..490b3de205a 100644 --- a/src/core/iomgr/udp_server.c +++ b/src/core/iomgr/udp_server.c @@ -69,11 +69,13 @@ #define INIT_PORT_CAP 2 /* one listening port */ -typedef struct { +typedef struct +{ int fd; grpc_fd *emfd; grpc_udp_server *server; - union { + union + { gpr_uint8 untyped[GRPC_MAX_SOCKADDR_SIZE]; struct sockaddr sockaddr; struct sockaddr_un un; @@ -84,16 +86,20 @@ typedef struct { grpc_udp_server_read_cb read_cb; } server_port; -static void unlink_if_unix_domain_socket(const struct sockaddr_un *un) { +static void +unlink_if_unix_domain_socket (const struct sockaddr_un *un) +{ struct stat st; - if (stat(un->sun_path, &st) == 0 && (st.st_mode & S_IFMT) == S_IFSOCK) { - unlink(un->sun_path); - } + if (stat (un->sun_path, &st) == 0 && (st.st_mode & S_IFMT) == S_IFSOCK) + { + unlink (un->sun_path); + } } /* the overall server */ -struct grpc_udp_server { +struct grpc_udp_server +{ gpr_mu mu; gpr_cv cv; @@ -119,206 +125,237 @@ struct grpc_udp_server { size_t pollset_count; }; -grpc_udp_server *grpc_udp_server_create(void) { - grpc_udp_server *s = gpr_malloc(sizeof(grpc_udp_server)); - gpr_mu_init(&s->mu); - gpr_cv_init(&s->cv); +grpc_udp_server * +grpc_udp_server_create (void) +{ + grpc_udp_server *s = gpr_malloc (sizeof (grpc_udp_server)); + gpr_mu_init (&s->mu); + gpr_cv_init (&s->cv); s->active_ports = 0; s->destroyed_ports = 0; s->shutdown = 0; - s->ports = gpr_malloc(sizeof(server_port) * INIT_PORT_CAP); + s->ports = gpr_malloc (sizeof (server_port) * INIT_PORT_CAP); s->nports = 0; s->port_capacity = INIT_PORT_CAP; return s; } -static void finish_shutdown(grpc_udp_server *s, - grpc_closure_list *closure_list) { - grpc_closure_list_add(closure_list, s->shutdown_complete, 1); +static void +finish_shutdown (grpc_udp_server * s, grpc_closure_list * closure_list) +{ + grpc_closure_list_add (closure_list, s->shutdown_complete, 1); - gpr_mu_destroy(&s->mu); - gpr_cv_destroy(&s->cv); + gpr_mu_destroy (&s->mu); + gpr_cv_destroy (&s->cv); - gpr_free(s->ports); - gpr_free(s); + gpr_free (s->ports); + gpr_free (s); } -static void destroyed_port(void *server, int success, - grpc_closure_list *closure_list) { +static void +destroyed_port (void *server, int success, grpc_closure_list * closure_list) +{ grpc_udp_server *s = server; - gpr_mu_lock(&s->mu); + gpr_mu_lock (&s->mu); s->destroyed_ports++; - if (s->destroyed_ports == s->nports) { - gpr_mu_unlock(&s->mu); - finish_shutdown(s, closure_list); - } else { - gpr_mu_unlock(&s->mu); - } + if (s->destroyed_ports == s->nports) + { + gpr_mu_unlock (&s->mu); + finish_shutdown (s, closure_list); + } + else + { + gpr_mu_unlock (&s->mu); + } } /* 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, - grpc_closure_list *closure_list) { +static void +deactivated_all_ports (grpc_udp_server * s, grpc_closure_list * closure_list) +{ size_t i; /* delete ALL the things */ - gpr_mu_lock(&s->mu); - - if (!s->shutdown) { - gpr_mu_unlock(&s->mu); - return; - } - - if (s->nports) { - for (i = 0; i < s->nports; i++) { - server_port *sp = &s->ports[i]; - if (sp->addr.sockaddr.sa_family == AF_UNIX) { - unlink_if_unix_domain_socket(&sp->addr.un); - } - sp->destroyed_closure.cb = destroyed_port; - sp->destroyed_closure.cb_arg = s; - grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, "udp_listener_shutdown", - closure_list); + gpr_mu_lock (&s->mu); + + if (!s->shutdown) + { + gpr_mu_unlock (&s->mu); + return; + } + + if (s->nports) + { + for (i = 0; i < s->nports; i++) + { + server_port *sp = &s->ports[i]; + if (sp->addr.sockaddr.sa_family == AF_UNIX) + { + unlink_if_unix_domain_socket (&sp->addr.un); + } + sp->destroyed_closure.cb = destroyed_port; + sp->destroyed_closure.cb_arg = s; + grpc_fd_orphan (sp->emfd, &sp->destroyed_closure, "udp_listener_shutdown", closure_list); + } + gpr_mu_unlock (&s->mu); + } + else + { + gpr_mu_unlock (&s->mu); + finish_shutdown (s, closure_list); } - gpr_mu_unlock(&s->mu); - } else { - gpr_mu_unlock(&s->mu); - finish_shutdown(s, closure_list); - } } -void grpc_udp_server_destroy(grpc_udp_server *s, grpc_closure *on_done, - grpc_closure_list *closure_list) { +void +grpc_udp_server_destroy (grpc_udp_server * s, grpc_closure * on_done, grpc_closure_list * closure_list) +{ size_t i; - gpr_mu_lock(&s->mu); + gpr_mu_lock (&s->mu); - GPR_ASSERT(!s->shutdown); + GPR_ASSERT (!s->shutdown); s->shutdown = 1; s->shutdown_complete = on_done; /* shutdown all fd's */ - if (s->active_ports) { - for (i = 0; i < s->nports; i++) { - grpc_fd_shutdown(s->ports[i].emfd, closure_list); + if (s->active_ports) + { + for (i = 0; i < s->nports; i++) + { + grpc_fd_shutdown (s->ports[i].emfd, closure_list); + } + gpr_mu_unlock (&s->mu); + } + else + { + gpr_mu_unlock (&s->mu); + deactivated_all_ports (s, closure_list); } - gpr_mu_unlock(&s->mu); - } else { - gpr_mu_unlock(&s->mu); - deactivated_all_ports(s, closure_list); - } } /* Prepare a recently-created socket for listening. */ -static int prepare_socket(int fd, const struct sockaddr *addr, - size_t addr_len) { +static int +prepare_socket (int fd, const struct sockaddr *addr, size_t addr_len) +{ struct sockaddr_storage sockname_temp; socklen_t sockname_len; int get_local_ip; int rc; - if (fd < 0) { - goto error; - } + if (fd < 0) + { + goto error; + } - if (!grpc_set_socket_nonblocking(fd, 1) || !grpc_set_socket_cloexec(fd, 1)) { - gpr_log(GPR_ERROR, "Unable to configure socket %d: %s", fd, - strerror(errno)); - } + if (!grpc_set_socket_nonblocking (fd, 1) || !grpc_set_socket_cloexec (fd, 1)) + { + gpr_log (GPR_ERROR, "Unable to configure socket %d: %s", fd, strerror (errno)); + } get_local_ip = 1; - rc = setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &get_local_ip, - sizeof(get_local_ip)); - if (rc == 0 && addr->sa_family == AF_INET6) { + rc = setsockopt (fd, IPPROTO_IP, IP_PKTINFO, &get_local_ip, sizeof (get_local_ip)); + if (rc == 0 && addr->sa_family == AF_INET6) + { #if !TARGET_OS_IPHONE - rc = setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &get_local_ip, - sizeof(get_local_ip)); + rc = setsockopt (fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &get_local_ip, sizeof (get_local_ip)); #endif - } + } - GPR_ASSERT(addr_len < ~(socklen_t)0); - if (bind(fd, addr, (socklen_t)addr_len) < 0) { - char *addr_str; - grpc_sockaddr_to_string(&addr_str, addr, 0); - gpr_log(GPR_ERROR, "bind addr=%s: %s", addr_str, strerror(errno)); - gpr_free(addr_str); - goto error; - } + GPR_ASSERT (addr_len < ~(socklen_t) 0); + if (bind (fd, addr, (socklen_t) addr_len) < 0) + { + char *addr_str; + grpc_sockaddr_to_string (&addr_str, addr, 0); + gpr_log (GPR_ERROR, "bind addr=%s: %s", addr_str, strerror (errno)); + gpr_free (addr_str); + goto error; + } - sockname_len = sizeof(sockname_temp); - if (getsockname(fd, (struct sockaddr *)&sockname_temp, &sockname_len) < 0) { - goto error; - } + sockname_len = sizeof (sockname_temp); + if (getsockname (fd, (struct sockaddr *) &sockname_temp, &sockname_len) < 0) + { + goto error; + } - return grpc_sockaddr_get_port((struct sockaddr *)&sockname_temp); + return grpc_sockaddr_get_port ((struct sockaddr *) &sockname_temp); error: - if (fd >= 0) { - close(fd); - } + if (fd >= 0) + { + close (fd); + } return -1; } /* event manager callback when reads are ready */ -static void on_read(void *arg, int success, grpc_closure_list *closure_list) { +static void +on_read (void *arg, int success, grpc_closure_list * closure_list) +{ server_port *sp = arg; - if (success == 0) { - gpr_mu_lock(&sp->server->mu); - if (0 == --sp->server->active_ports) { - gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(sp->server, closure_list); - } else { - gpr_mu_unlock(&sp->server->mu); + if (success == 0) + { + gpr_mu_lock (&sp->server->mu); + if (0 == --sp->server->active_ports) + { + gpr_mu_unlock (&sp->server->mu); + deactivated_all_ports (sp->server, closure_list); + } + else + { + gpr_mu_unlock (&sp->server->mu); + } + return; } - return; - } /* Tell the registered callback that data is available to read. */ - GPR_ASSERT(sp->read_cb); - sp->read_cb(sp->fd); + GPR_ASSERT (sp->read_cb); + sp->read_cb (sp->fd); /* Re-arm the notification event so we get another chance to read. */ - grpc_fd_notify_on_read(sp->emfd, &sp->read_closure, closure_list); + grpc_fd_notify_on_read (sp->emfd, &sp->read_closure, closure_list); } -static int add_socket_to_server(grpc_udp_server *s, int fd, - const struct sockaddr *addr, size_t addr_len, - grpc_udp_server_read_cb read_cb) { +static int +add_socket_to_server (grpc_udp_server * s, int fd, const struct sockaddr *addr, size_t addr_len, grpc_udp_server_read_cb read_cb) +{ server_port *sp; int port; char *addr_str; char *name; - port = prepare_socket(fd, addr, addr_len); - if (port >= 0) { - grpc_sockaddr_to_string(&addr_str, (struct sockaddr *)&addr, 1); - gpr_asprintf(&name, "udp-server-listener:%s", addr_str); - gpr_mu_lock(&s->mu); - /* append it to the list under a lock */ - if (s->nports == s->port_capacity) { - s->port_capacity *= 2; - s->ports = gpr_realloc(s->ports, sizeof(server_port) * s->port_capacity); + port = prepare_socket (fd, addr, addr_len); + if (port >= 0) + { + grpc_sockaddr_to_string (&addr_str, (struct sockaddr *) &addr, 1); + gpr_asprintf (&name, "udp-server-listener:%s", addr_str); + gpr_mu_lock (&s->mu); + /* append it to the list under a lock */ + if (s->nports == s->port_capacity) + { + s->port_capacity *= 2; + s->ports = gpr_realloc (s->ports, sizeof (server_port) * s->port_capacity); + } + sp = &s->ports[s->nports++]; + sp->server = s; + sp->fd = fd; + sp->emfd = grpc_fd_create (fd, name); + memcpy (sp->addr.untyped, addr, addr_len); + sp->addr_len = addr_len; + sp->read_cb = read_cb; + GPR_ASSERT (sp->emfd); + gpr_mu_unlock (&s->mu); } - sp = &s->ports[s->nports++]; - sp->server = s; - sp->fd = fd; - sp->emfd = grpc_fd_create(fd, name); - memcpy(sp->addr.untyped, addr, addr_len); - sp->addr_len = addr_len; - sp->read_cb = read_cb; - GPR_ASSERT(sp->emfd); - gpr_mu_unlock(&s->mu); - } return port; } -int grpc_udp_server_add_port(grpc_udp_server *s, const void *addr, - size_t addr_len, grpc_udp_server_read_cb read_cb) { +int +grpc_udp_server_add_port (grpc_udp_server * s, const void *addr, size_t addr_len, grpc_udp_server_read_cb read_cb) +{ int allocated_port1 = -1; int allocated_port2 = -1; unsigned i; @@ -333,103 +370,117 @@ int grpc_udp_server_add_port(grpc_udp_server *s, const void *addr, socklen_t sockname_len; int port; - if (((struct sockaddr *)addr)->sa_family == AF_UNIX) { - unlink_if_unix_domain_socket(addr); - } + if (((struct sockaddr *) addr)->sa_family == AF_UNIX) + { + unlink_if_unix_domain_socket (addr); + } /* Check if this is a wildcard port, and if so, try to keep the port the same as some previously created listener. */ - if (grpc_sockaddr_get_port(addr) == 0) { - for (i = 0; i < s->nports; i++) { - sockname_len = sizeof(sockname_temp); - if (0 == getsockname(s->ports[i].fd, (struct sockaddr *)&sockname_temp, - &sockname_len)) { - port = grpc_sockaddr_get_port((struct sockaddr *)&sockname_temp); - if (port > 0) { - allocated_addr = malloc(addr_len); - memcpy(allocated_addr, addr, addr_len); - grpc_sockaddr_set_port(allocated_addr, port); - addr = allocated_addr; - break; - } - } + if (grpc_sockaddr_get_port (addr) == 0) + { + for (i = 0; i < s->nports; i++) + { + sockname_len = sizeof (sockname_temp); + if (0 == getsockname (s->ports[i].fd, (struct sockaddr *) &sockname_temp, &sockname_len)) + { + port = grpc_sockaddr_get_port ((struct sockaddr *) &sockname_temp); + if (port > 0) + { + allocated_addr = malloc (addr_len); + memcpy (allocated_addr, addr, addr_len); + grpc_sockaddr_set_port (allocated_addr, port); + addr = allocated_addr; + break; + } + } + } } - } - if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) { - addr = (const struct sockaddr *)&addr6_v4mapped; - addr_len = sizeof(addr6_v4mapped); - } + if (grpc_sockaddr_to_v4mapped (addr, &addr6_v4mapped)) + { + addr = (const struct sockaddr *) &addr6_v4mapped; + addr_len = sizeof (addr6_v4mapped); + } /* Treat :: or 0.0.0.0 as a family-agnostic wildcard. */ - if (grpc_sockaddr_is_wildcard(addr, &port)) { - grpc_sockaddr_make_wildcards(port, &wild4, &wild6); - - /* Try listening on IPv6 first. */ - addr = (struct sockaddr *)&wild6; - addr_len = sizeof(wild6); - fd = grpc_create_dualstack_socket(addr, SOCK_DGRAM, IPPROTO_UDP, &dsmode); - allocated_port1 = add_socket_to_server(s, fd, addr, addr_len, read_cb); - if (fd >= 0 && dsmode == GRPC_DSMODE_DUALSTACK) { - goto done; + if (grpc_sockaddr_is_wildcard (addr, &port)) + { + grpc_sockaddr_make_wildcards (port, &wild4, &wild6); + + /* Try listening on IPv6 first. */ + addr = (struct sockaddr *) &wild6; + addr_len = sizeof (wild6); + fd = grpc_create_dualstack_socket (addr, SOCK_DGRAM, IPPROTO_UDP, &dsmode); + allocated_port1 = add_socket_to_server (s, fd, addr, addr_len, read_cb); + if (fd >= 0 && dsmode == GRPC_DSMODE_DUALSTACK) + { + goto done; + } + + /* If we didn't get a dualstack socket, also listen on 0.0.0.0. */ + if (port == 0 && allocated_port1 > 0) + { + grpc_sockaddr_set_port ((struct sockaddr *) &wild4, allocated_port1); + } + addr = (struct sockaddr *) &wild4; + addr_len = sizeof (wild4); } - /* If we didn't get a dualstack socket, also listen on 0.0.0.0. */ - if (port == 0 && allocated_port1 > 0) { - grpc_sockaddr_set_port((struct sockaddr *)&wild4, allocated_port1); + fd = grpc_create_dualstack_socket (addr, SOCK_DGRAM, IPPROTO_UDP, &dsmode); + if (fd < 0) + { + gpr_log (GPR_ERROR, "Unable to create socket: %s", strerror (errno)); } - addr = (struct sockaddr *)&wild4; - addr_len = sizeof(wild4); - } - - fd = grpc_create_dualstack_socket(addr, SOCK_DGRAM, IPPROTO_UDP, &dsmode); - if (fd < 0) { - gpr_log(GPR_ERROR, "Unable to create socket: %s", strerror(errno)); - } - if (dsmode == GRPC_DSMODE_IPV4 && - grpc_sockaddr_is_v4mapped(addr, &addr4_copy)) { - addr = (struct sockaddr *)&addr4_copy; - addr_len = sizeof(addr4_copy); - } - allocated_port2 = add_socket_to_server(s, fd, addr, addr_len, read_cb); + if (dsmode == GRPC_DSMODE_IPV4 && grpc_sockaddr_is_v4mapped (addr, &addr4_copy)) + { + addr = (struct sockaddr *) &addr4_copy; + addr_len = sizeof (addr4_copy); + } + allocated_port2 = add_socket_to_server (s, fd, addr, addr_len, read_cb); done: - gpr_free(allocated_addr); + gpr_free (allocated_addr); return allocated_port1 >= 0 ? allocated_port1 : allocated_port2; } -int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index) { +int +grpc_udp_server_get_fd (grpc_udp_server * s, unsigned index) +{ return (index < s->nports) ? s->ports[index].fd : -1; } -void grpc_udp_server_start(grpc_udp_server *s, grpc_pollset **pollsets, - size_t pollset_count, - grpc_closure_list *closure_list) { +void +grpc_udp_server_start (grpc_udp_server * s, grpc_pollset ** pollsets, size_t pollset_count, grpc_closure_list * closure_list) +{ size_t i, j; - gpr_mu_lock(&s->mu); - GPR_ASSERT(s->active_ports == 0); + gpr_mu_lock (&s->mu); + GPR_ASSERT (s->active_ports == 0); s->pollsets = pollsets; - for (i = 0; i < s->nports; i++) { - for (j = 0; j < pollset_count; j++) { - grpc_pollset_add_fd(pollsets[j], s->ports[i].emfd, closure_list); + for (i = 0; i < s->nports; i++) + { + for (j = 0; j < pollset_count; j++) + { + grpc_pollset_add_fd (pollsets[j], s->ports[i].emfd, closure_list); + } + s->ports[i].read_closure.cb = on_read; + s->ports[i].read_closure.cb_arg = &s->ports[i]; + grpc_fd_notify_on_read (s->ports[i].emfd, &s->ports[i].read_closure, closure_list); + s->active_ports++; } - s->ports[i].read_closure.cb = on_read; - s->ports[i].read_closure.cb_arg = &s->ports[i]; - grpc_fd_notify_on_read(s->ports[i].emfd, &s->ports[i].read_closure, - closure_list); - s->active_ports++; - } - gpr_mu_unlock(&s->mu); + gpr_mu_unlock (&s->mu); } /* TODO(rjshade): Add a test for this method. */ -void grpc_udp_server_write(server_port *sp, const char *buffer, size_t buf_len, - const struct sockaddr *peer_address) { +void +grpc_udp_server_write (server_port * sp, const char *buffer, size_t buf_len, const struct sockaddr *peer_address) +{ ssize_t rc; - rc = sendto(sp->fd, buffer, buf_len, 0, peer_address, sizeof(peer_address)); - if (rc < 0) { - gpr_log(GPR_ERROR, "Unable to send data: %s", strerror(errno)); - } + rc = sendto (sp->fd, buffer, buf_len, 0, peer_address, sizeof (peer_address)); + if (rc < 0) + { + gpr_log (GPR_ERROR, "Unable to send data: %s", strerror (errno)); + } } #endif diff --git a/src/core/iomgr/udp_server.h b/src/core/iomgr/udp_server.h index b66a2d79a23..458773a1212 100644 --- a/src/core/iomgr/udp_server.h +++ b/src/core/iomgr/udp_server.h @@ -40,17 +40,15 @@ 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)(int fd); +typedef void (*grpc_udp_server_read_cb) (int fd); /* Create a server, initially not bound to any ports */ -grpc_udp_server *grpc_udp_server_create(void); +grpc_udp_server *grpc_udp_server_create (void); /* Start listening to bound ports */ -void grpc_udp_server_start(grpc_udp_server *udp_server, grpc_pollset **pollsets, - size_t pollset_count, - grpc_closure_list *closure_list); +void grpc_udp_server_start (grpc_udp_server * udp_server, grpc_pollset ** pollsets, size_t pollset_count, grpc_closure_list * closure_list); -int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index); +int grpc_udp_server_get_fd (grpc_udp_server * s, unsigned index); /* Add a port to the server, returning port number on success, or negative on failure. @@ -62,11 +60,9 @@ int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index); /* TODO(ctiller): deprecate this, and make grpc_udp_server_add_ports to handle all of the multiple socket port matching logic in one place */ -int grpc_udp_server_add_port(grpc_udp_server *s, const void *addr, - size_t addr_len, grpc_udp_server_read_cb read_cb); +int grpc_udp_server_add_port (grpc_udp_server * s, const void *addr, size_t addr_len, grpc_udp_server_read_cb read_cb); -void grpc_udp_server_destroy(grpc_udp_server *server, grpc_closure *on_done, - grpc_closure_list *closure_list); +void grpc_udp_server_destroy (grpc_udp_server * server, grpc_closure * on_done, grpc_closure_list * closure_list); /* Write the contents of buffer to the underlying UDP socket. */ /* diff --git a/src/core/iomgr/wakeup_fd_eventfd.c b/src/core/iomgr/wakeup_fd_eventfd.c index ba622eb1ee7..23b5033fcf5 100644 --- a/src/core/iomgr/wakeup_fd_eventfd.c +++ b/src/core/iomgr/wakeup_fd_eventfd.c @@ -42,40 +42,56 @@ #include "src/core/iomgr/wakeup_fd_posix.h" #include -static void eventfd_create(grpc_wakeup_fd *fd_info) { - int efd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); +static void +eventfd_create (grpc_wakeup_fd * fd_info) +{ + int efd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); /* TODO(klempner): Handle failure more gracefully */ - GPR_ASSERT(efd >= 0); + GPR_ASSERT (efd >= 0); fd_info->read_fd = efd; fd_info->write_fd = -1; } -static void eventfd_consume(grpc_wakeup_fd *fd_info) { +static void +eventfd_consume (grpc_wakeup_fd * fd_info) +{ eventfd_t value; int err; - do { - err = eventfd_read(fd_info->read_fd, &value); - } while (err < 0 && errno == EINTR); + do + { + err = eventfd_read (fd_info->read_fd, &value); + } + while (err < 0 && errno == EINTR); } -static void eventfd_wakeup(grpc_wakeup_fd *fd_info) { +static void +eventfd_wakeup (grpc_wakeup_fd * fd_info) +{ int err; - do { - err = eventfd_write(fd_info->read_fd, 1); - } while (err < 0 && errno == EINTR); + do + { + err = eventfd_write (fd_info->read_fd, 1); + } + while (err < 0 && errno == EINTR); } -static void eventfd_destroy(grpc_wakeup_fd *fd_info) { - if (fd_info->read_fd != 0) close(fd_info->read_fd); +static void +eventfd_destroy (grpc_wakeup_fd * fd_info) +{ + if (fd_info->read_fd != 0) + close (fd_info->read_fd); } -static int eventfd_check_availability(void) { +static int +eventfd_check_availability (void) +{ /* TODO(klempner): Actually check if eventfd is available */ return 1; } const grpc_wakeup_fd_vtable grpc_specialized_wakeup_fd_vtable = { - eventfd_create, eventfd_consume, eventfd_wakeup, eventfd_destroy, - eventfd_check_availability}; + eventfd_create, eventfd_consume, eventfd_wakeup, eventfd_destroy, + eventfd_check_availability +}; #endif /* GPR_LINUX_EVENTFD */ diff --git a/src/core/iomgr/wakeup_fd_nospecial.c b/src/core/iomgr/wakeup_fd_nospecial.c index 78d763c103a..95b819393f3 100644 --- a/src/core/iomgr/wakeup_fd_nospecial.c +++ b/src/core/iomgr/wakeup_fd_nospecial.c @@ -43,9 +43,14 @@ #include "src/core/iomgr/wakeup_fd_posix.h" #include -static int check_availability_invalid(void) { return 0; } +static int +check_availability_invalid (void) +{ + return 0; +} const grpc_wakeup_fd_vtable grpc_specialized_wakeup_fd_vtable = { - NULL, NULL, NULL, NULL, check_availability_invalid}; + NULL, NULL, NULL, NULL, check_availability_invalid +}; #endif /* GPR_POSIX_NO_SPECIAL_WAKEUP_FD */ diff --git a/src/core/iomgr/wakeup_fd_pipe.c b/src/core/iomgr/wakeup_fd_pipe.c index 63e3a22811d..4c87e3e1d9a 100644 --- a/src/core/iomgr/wakeup_fd_pipe.c +++ b/src/core/iomgr/wakeup_fd_pipe.c @@ -44,54 +44,71 @@ #include "src/core/iomgr/socket_utils_posix.h" #include -static void pipe_init(grpc_wakeup_fd *fd_info) { +static void +pipe_init (grpc_wakeup_fd * fd_info) +{ int pipefd[2]; /* TODO(klempner): Make this nonfatal */ - GPR_ASSERT(0 == pipe(pipefd)); - GPR_ASSERT(grpc_set_socket_nonblocking(pipefd[0], 1)); - GPR_ASSERT(grpc_set_socket_nonblocking(pipefd[1], 1)); + GPR_ASSERT (0 == pipe (pipefd)); + GPR_ASSERT (grpc_set_socket_nonblocking (pipefd[0], 1)); + GPR_ASSERT (grpc_set_socket_nonblocking (pipefd[1], 1)); fd_info->read_fd = pipefd[0]; fd_info->write_fd = pipefd[1]; } -static void pipe_consume(grpc_wakeup_fd *fd_info) { +static void +pipe_consume (grpc_wakeup_fd * fd_info) +{ char buf[128]; ssize_t r; - for (;;) { - r = read(fd_info->read_fd, buf, sizeof(buf)); - if (r > 0) continue; - if (r == 0) return; - switch (errno) { - case EAGAIN: - return; - case EINTR: - continue; - default: - gpr_log(GPR_ERROR, "error reading pipe: %s", strerror(errno)); - return; + for (;;) + { + r = read (fd_info->read_fd, buf, sizeof (buf)); + if (r > 0) + continue; + if (r == 0) + return; + switch (errno) + { + case EAGAIN: + return; + case EINTR: + continue; + default: + gpr_log (GPR_ERROR, "error reading pipe: %s", strerror (errno)); + return; + } } - } } -static void pipe_wakeup(grpc_wakeup_fd *fd_info) { +static void +pipe_wakeup (grpc_wakeup_fd * fd_info) +{ char c = 0; - while (write(fd_info->write_fd, &c, 1) != 1 && errno == EINTR) + while (write (fd_info->write_fd, &c, 1) != 1 && errno == EINTR) ; } -static void pipe_destroy(grpc_wakeup_fd *fd_info) { - if (fd_info->read_fd != 0) close(fd_info->read_fd); - if (fd_info->write_fd != 0) close(fd_info->write_fd); +static void +pipe_destroy (grpc_wakeup_fd * fd_info) +{ + if (fd_info->read_fd != 0) + close (fd_info->read_fd); + if (fd_info->write_fd != 0) + close (fd_info->write_fd); } -static int pipe_check_availability(void) { +static int +pipe_check_availability (void) +{ /* Assume that pipes are always available. */ return 1; } const grpc_wakeup_fd_vtable grpc_pipe_wakeup_fd_vtable = { - pipe_init, pipe_consume, pipe_wakeup, pipe_destroy, - pipe_check_availability}; + pipe_init, pipe_consume, pipe_wakeup, pipe_destroy, + pipe_check_availability +}; #endif /* GPR_POSIX_WAKUP_FD */ diff --git a/src/core/iomgr/wakeup_fd_posix.c b/src/core/iomgr/wakeup_fd_posix.c index d09fb78d123..dae3e94f650 100644 --- a/src/core/iomgr/wakeup_fd_posix.c +++ b/src/core/iomgr/wakeup_fd_posix.c @@ -41,34 +41,53 @@ static const grpc_wakeup_fd_vtable *wakeup_fd_vtable = NULL; -void grpc_wakeup_fd_global_init(void) { - if (grpc_specialized_wakeup_fd_vtable.check_availability()) { - wakeup_fd_vtable = &grpc_specialized_wakeup_fd_vtable; - } else { - wakeup_fd_vtable = &grpc_pipe_wakeup_fd_vtable; - } +void +grpc_wakeup_fd_global_init (void) +{ + if (grpc_specialized_wakeup_fd_vtable.check_availability ()) + { + wakeup_fd_vtable = &grpc_specialized_wakeup_fd_vtable; + } + else + { + wakeup_fd_vtable = &grpc_pipe_wakeup_fd_vtable; + } } -void grpc_wakeup_fd_global_init_force_fallback(void) { +void +grpc_wakeup_fd_global_init_force_fallback (void) +{ wakeup_fd_vtable = &grpc_pipe_wakeup_fd_vtable; } -void grpc_wakeup_fd_global_destroy(void) { wakeup_fd_vtable = NULL; } +void +grpc_wakeup_fd_global_destroy (void) +{ + wakeup_fd_vtable = NULL; +} -void grpc_wakeup_fd_init(grpc_wakeup_fd *fd_info) { - wakeup_fd_vtable->init(fd_info); +void +grpc_wakeup_fd_init (grpc_wakeup_fd * fd_info) +{ + wakeup_fd_vtable->init (fd_info); } -void grpc_wakeup_fd_consume_wakeup(grpc_wakeup_fd *fd_info) { - wakeup_fd_vtable->consume(fd_info); +void +grpc_wakeup_fd_consume_wakeup (grpc_wakeup_fd * fd_info) +{ + wakeup_fd_vtable->consume (fd_info); } -void grpc_wakeup_fd_wakeup(grpc_wakeup_fd *fd_info) { - wakeup_fd_vtable->wakeup(fd_info); +void +grpc_wakeup_fd_wakeup (grpc_wakeup_fd * fd_info) +{ + wakeup_fd_vtable->wakeup (fd_info); } -void grpc_wakeup_fd_destroy(grpc_wakeup_fd *fd_info) { - wakeup_fd_vtable->destroy(fd_info); +void +grpc_wakeup_fd_destroy (grpc_wakeup_fd * fd_info) +{ + wakeup_fd_vtable->destroy (fd_info); } #endif /* GPR_POSIX_WAKEUP_FD */ diff --git a/src/core/iomgr/wakeup_fd_posix.h b/src/core/iomgr/wakeup_fd_posix.h index b6c086900d5..63efde714fd 100644 --- a/src/core/iomgr/wakeup_fd_posix.h +++ b/src/core/iomgr/wakeup_fd_posix.h @@ -62,35 +62,37 @@ #ifndef GRPC_INTERNAL_CORE_IOMGR_WAKEUP_FD_POSIX_H #define GRPC_INTERNAL_CORE_IOMGR_WAKEUP_FD_POSIX_H -void grpc_wakeup_fd_global_init(void); -void grpc_wakeup_fd_global_destroy(void); +void grpc_wakeup_fd_global_init (void); +void grpc_wakeup_fd_global_destroy (void); /* Force using the fallback implementation. This is intended for testing * purposes only.*/ -void grpc_wakeup_fd_global_init_force_fallback(void); +void grpc_wakeup_fd_global_init_force_fallback (void); typedef struct grpc_wakeup_fd grpc_wakeup_fd; -typedef struct grpc_wakeup_fd_vtable { - void (*init)(grpc_wakeup_fd *fd_info); - void (*consume)(grpc_wakeup_fd *fd_info); - void (*wakeup)(grpc_wakeup_fd *fd_info); - void (*destroy)(grpc_wakeup_fd *fd_info); +typedef struct grpc_wakeup_fd_vtable +{ + void (*init) (grpc_wakeup_fd * fd_info); + void (*consume) (grpc_wakeup_fd * fd_info); + void (*wakeup) (grpc_wakeup_fd * fd_info); + void (*destroy) (grpc_wakeup_fd * fd_info); /* Must be called before calling any other functions */ - int (*check_availability)(void); + int (*check_availability) (void); } grpc_wakeup_fd_vtable; -struct grpc_wakeup_fd { +struct grpc_wakeup_fd +{ int read_fd; int write_fd; }; #define GRPC_WAKEUP_FD_GET_READ_FD(fd_info) ((fd_info)->read_fd) -void grpc_wakeup_fd_init(grpc_wakeup_fd *fd_info); -void grpc_wakeup_fd_consume_wakeup(grpc_wakeup_fd *fd_info); -void grpc_wakeup_fd_wakeup(grpc_wakeup_fd *fd_info); -void grpc_wakeup_fd_destroy(grpc_wakeup_fd *fd_info); +void grpc_wakeup_fd_init (grpc_wakeup_fd * fd_info); +void grpc_wakeup_fd_consume_wakeup (grpc_wakeup_fd * fd_info); +void grpc_wakeup_fd_wakeup (grpc_wakeup_fd * fd_info); +void grpc_wakeup_fd_destroy (grpc_wakeup_fd * fd_info); /* Defined in some specialized implementation's .c file, or by * wakeup_fd_nospecial.c if no such implementation exists. */ diff --git a/src/core/iomgr/workqueue.h b/src/core/iomgr/workqueue.h index 0bc7e314e14..8a825ba8e39 100644 --- a/src/core/iomgr/workqueue.h +++ b/src/core/iomgr/workqueue.h @@ -51,10 +51,9 @@ struct grpc_workqueue; typedef struct grpc_workqueue grpc_workqueue; /** Create a work queue */ -grpc_workqueue *grpc_workqueue_create(grpc_closure_list *closure_list); +grpc_workqueue *grpc_workqueue_create (grpc_closure_list * closure_list); -void grpc_workqueue_flush(grpc_workqueue *workqueue, - grpc_closure_list *closure_list); +void grpc_workqueue_flush (grpc_workqueue * workqueue, grpc_closure_list * closure_list); #define GRPC_WORKQUEUE_REFCOUNT_DEBUG #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG @@ -62,26 +61,19 @@ void grpc_workqueue_flush(grpc_workqueue *workqueue, grpc_workqueue_ref((p), __FILE__, __LINE__, (r)) #define GRPC_WORKQUEUE_UNREF(p, r, cl) \ grpc_workqueue_unref((p), (cl), __FILE__, __LINE__, (r)) -void grpc_workqueue_ref(grpc_workqueue *workqueue, const char *file, int line, - const char *reason); -void grpc_workqueue_unref(grpc_workqueue *workqueue, - grpc_closure_list *closure_list, const char *file, - int line, const char *reason); +void grpc_workqueue_ref (grpc_workqueue * workqueue, const char *file, int line, const char *reason); +void grpc_workqueue_unref (grpc_workqueue * workqueue, grpc_closure_list * closure_list, const char *file, int line, const char *reason); #else #define GRPC_WORKQUEUE_REF(p, r) grpc_workqueue_ref((p)) #define GRPC_WORKQUEUE_UNREF(p, r, cl) grpc_workqueue_unref((p), (cl)) -void grpc_workqueue_ref(grpc_workqueue *workqueue); -void grpc_workqueue_unref(grpc_workqueue *workqueue, - grpc_closure_list *closure_list); +void grpc_workqueue_ref (grpc_workqueue * workqueue); +void grpc_workqueue_unref (grpc_workqueue * workqueue, grpc_closure_list * closure_list); #endif /** Bind this workqueue to a pollset */ -void grpc_workqueue_add_to_pollset(grpc_workqueue *workqueue, - grpc_pollset *pollset, - grpc_closure_list *closure_list); +void grpc_workqueue_add_to_pollset (grpc_workqueue * workqueue, grpc_pollset * pollset, grpc_closure_list * closure_list); /** Add a work item to a workqueue */ -void grpc_workqueue_push(grpc_workqueue *workqueue, grpc_closure *closure, - int success); +void grpc_workqueue_push (grpc_workqueue * workqueue, grpc_closure * closure, int success); #endif diff --git a/src/core/iomgr/workqueue_posix.c b/src/core/iomgr/workqueue_posix.c index 9ecd59d390b..e13404b2618 100644 --- a/src/core/iomgr/workqueue_posix.c +++ b/src/core/iomgr/workqueue_posix.c @@ -45,103 +45,110 @@ #include "src/core/iomgr/fd_posix.h" -static void on_readable(void *arg, int success, - grpc_closure_list *closure_list); +static void on_readable (void *arg, int success, grpc_closure_list * closure_list); -grpc_workqueue *grpc_workqueue_create(grpc_closure_list *closure_list) { +grpc_workqueue * +grpc_workqueue_create (grpc_closure_list * closure_list) +{ char name[32]; - grpc_workqueue *workqueue = gpr_malloc(sizeof(grpc_workqueue)); - gpr_ref_init(&workqueue->refs, 1); - gpr_mu_init(&workqueue->mu); + grpc_workqueue *workqueue = gpr_malloc (sizeof (grpc_workqueue)); + gpr_ref_init (&workqueue->refs, 1); + gpr_mu_init (&workqueue->mu); workqueue->closure_list.head = workqueue->closure_list.tail = NULL; - grpc_wakeup_fd_init(&workqueue->wakeup_fd); - sprintf(name, "workqueue:%p", (void *)workqueue); - workqueue->wakeup_read_fd = - grpc_fd_create(GRPC_WAKEUP_FD_GET_READ_FD(&workqueue->wakeup_fd), name); - grpc_closure_init(&workqueue->read_closure, on_readable, workqueue); - grpc_fd_notify_on_read(workqueue->wakeup_read_fd, &workqueue->read_closure, - closure_list); + grpc_wakeup_fd_init (&workqueue->wakeup_fd); + sprintf (name, "workqueue:%p", (void *) workqueue); + workqueue->wakeup_read_fd = grpc_fd_create (GRPC_WAKEUP_FD_GET_READ_FD (&workqueue->wakeup_fd), name); + grpc_closure_init (&workqueue->read_closure, on_readable, workqueue); + grpc_fd_notify_on_read (workqueue->wakeup_read_fd, &workqueue->read_closure, closure_list); return workqueue; } -static void workqueue_destroy(grpc_workqueue *workqueue, - grpc_closure_list *closure_list) { - GPR_ASSERT(grpc_closure_list_empty(workqueue->closure_list)); - grpc_fd_shutdown(workqueue->wakeup_read_fd, closure_list); +static void +workqueue_destroy (grpc_workqueue * workqueue, grpc_closure_list * closure_list) +{ + GPR_ASSERT (grpc_closure_list_empty (workqueue->closure_list)); + grpc_fd_shutdown (workqueue->wakeup_read_fd, closure_list); } #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG -void grpc_workqueue_ref(grpc_workqueue *workqueue, const char *file, int line, - const char *reason) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p ref %d -> %d %s", - workqueue, (int)workqueue->refs.count, (int)workqueue->refs.count + 1, - reason); +void +grpc_workqueue_ref (grpc_workqueue * workqueue, const char *file, int line, const char *reason) +{ + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p ref %d -> %d %s", workqueue, (int) workqueue->refs.count, (int) workqueue->refs.count + 1, reason); #else -void grpc_workqueue_ref(grpc_workqueue *workqueue) { +void +grpc_workqueue_ref (grpc_workqueue * workqueue) +{ #endif - gpr_ref(&workqueue->refs); + gpr_ref (&workqueue->refs); } #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG -void grpc_workqueue_unref(grpc_workqueue *workqueue, - grpc_closure_list *closure_list, const char *file, - int line, const char *reason) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p unref %d -> %d %s", - workqueue, (int)workqueue->refs.count, (int)workqueue->refs.count - 1, - reason); +void +grpc_workqueue_unref (grpc_workqueue * workqueue, grpc_closure_list * closure_list, const char *file, int line, const char *reason) +{ + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p unref %d -> %d %s", workqueue, (int) workqueue->refs.count, (int) workqueue->refs.count - 1, reason); #else -void grpc_workqueue_unref(grpc_workqueue *workqueue, - grpc_closure_list *closure_list) { +void +grpc_workqueue_unref (grpc_workqueue * workqueue, grpc_closure_list * closure_list) +{ #endif - if (gpr_unref(&workqueue->refs)) { - workqueue_destroy(workqueue, closure_list); - } + if (gpr_unref (&workqueue->refs)) + { + workqueue_destroy (workqueue, closure_list); + } } -void grpc_workqueue_add_to_pollset(grpc_workqueue *workqueue, - grpc_pollset *pollset, - grpc_closure_list *closure_list) { - grpc_pollset_add_fd(pollset, workqueue->wakeup_read_fd, closure_list); +void +grpc_workqueue_add_to_pollset (grpc_workqueue * workqueue, grpc_pollset * pollset, grpc_closure_list * closure_list) +{ + grpc_pollset_add_fd (pollset, workqueue->wakeup_read_fd, closure_list); } -void grpc_workqueue_flush(grpc_workqueue *workqueue, - grpc_closure_list *closure_list) { - gpr_mu_lock(&workqueue->mu); - grpc_closure_list_move(&workqueue->closure_list, closure_list); - gpr_mu_unlock(&workqueue->mu); +void +grpc_workqueue_flush (grpc_workqueue * workqueue, grpc_closure_list * closure_list) +{ + gpr_mu_lock (&workqueue->mu); + grpc_closure_list_move (&workqueue->closure_list, closure_list); + gpr_mu_unlock (&workqueue->mu); } -static void on_readable(void *arg, int success, - grpc_closure_list *closure_list) { +static void +on_readable (void *arg, int success, grpc_closure_list * closure_list) +{ grpc_workqueue *workqueue = arg; - if (!success) { - gpr_mu_destroy(&workqueue->mu); - /* HACK: let wakeup_fd code know that we stole the fd */ - workqueue->wakeup_fd.read_fd = 0; - grpc_wakeup_fd_destroy(&workqueue->wakeup_fd); - grpc_fd_orphan(workqueue->wakeup_read_fd, NULL, "destroy", closure_list); - gpr_free(workqueue); - } else { - gpr_mu_lock(&workqueue->mu); - grpc_closure_list_move(&workqueue->closure_list, closure_list); - grpc_wakeup_fd_consume_wakeup(&workqueue->wakeup_fd); - gpr_mu_unlock(&workqueue->mu); - grpc_fd_notify_on_read(workqueue->wakeup_read_fd, &workqueue->read_closure, - closure_list); - } + if (!success) + { + gpr_mu_destroy (&workqueue->mu); + /* HACK: let wakeup_fd code know that we stole the fd */ + workqueue->wakeup_fd.read_fd = 0; + grpc_wakeup_fd_destroy (&workqueue->wakeup_fd); + grpc_fd_orphan (workqueue->wakeup_read_fd, NULL, "destroy", closure_list); + gpr_free (workqueue); + } + else + { + gpr_mu_lock (&workqueue->mu); + grpc_closure_list_move (&workqueue->closure_list, closure_list); + grpc_wakeup_fd_consume_wakeup (&workqueue->wakeup_fd); + gpr_mu_unlock (&workqueue->mu); + grpc_fd_notify_on_read (workqueue->wakeup_read_fd, &workqueue->read_closure, closure_list); + } } -void grpc_workqueue_push(grpc_workqueue *workqueue, grpc_closure *closure, - int success) { +void +grpc_workqueue_push (grpc_workqueue * workqueue, grpc_closure * closure, int success) +{ closure->success = success; closure->next = NULL; - gpr_mu_lock(&workqueue->mu); - if (grpc_closure_list_empty(workqueue->closure_list)) { - grpc_wakeup_fd_wakeup(&workqueue->wakeup_fd); - } - grpc_closure_list_add(&workqueue->closure_list, closure, success); - gpr_mu_unlock(&workqueue->mu); + gpr_mu_lock (&workqueue->mu); + if (grpc_closure_list_empty (workqueue->closure_list)) + { + grpc_wakeup_fd_wakeup (&workqueue->wakeup_fd); + } + grpc_closure_list_add (&workqueue->closure_list, closure, success); + gpr_mu_unlock (&workqueue->mu); } #endif /* GPR_POSIX_SOCKET */ diff --git a/src/core/iomgr/workqueue_posix.h b/src/core/iomgr/workqueue_posix.h index 589034fe1bb..48c5af9caee 100644 --- a/src/core/iomgr/workqueue_posix.h +++ b/src/core/iomgr/workqueue_posix.h @@ -36,7 +36,8 @@ struct grpc_fd; -struct grpc_workqueue { +struct grpc_workqueue +{ gpr_refcount refs; gpr_mu mu; diff --git a/src/core/json/json.c b/src/core/json/json.c index 96e11eebb11..a44e74b1e1d 100644 --- a/src/core/json/json.c +++ b/src/core/json/json.c @@ -37,28 +37,37 @@ #include "src/core/json/json.h" -grpc_json *grpc_json_create(grpc_json_type type) { - grpc_json *json = gpr_malloc(sizeof(*json)); - memset(json, 0, sizeof(*json)); +grpc_json * +grpc_json_create (grpc_json_type type) +{ + grpc_json *json = gpr_malloc (sizeof (*json)); + memset (json, 0, sizeof (*json)); json->type = type; return json; } -void grpc_json_destroy(grpc_json *json) { - while (json->child) { - grpc_json_destroy(json->child); - } +void +grpc_json_destroy (grpc_json * json) +{ + while (json->child) + { + grpc_json_destroy (json->child); + } - if (json->next) { - json->next->prev = json->prev; - } + if (json->next) + { + json->next->prev = json->prev; + } - if (json->prev) { - json->prev->next = json->next; - } else if (json->parent) { - json->parent->child = json->next; - } + if (json->prev) + { + json->prev->next = json->next; + } + else if (json->parent) + { + json->parent->child = json->next; + } - gpr_free(json); + gpr_free (json); } diff --git a/src/core/json/json.h b/src/core/json/json.h index 573584bf6fb..37584ee2622 100644 --- a/src/core/json/json.h +++ b/src/core/json/json.h @@ -41,15 +41,16 @@ /* A tree-like structure to hold json values. The key and value pointers * are not owned by it. */ -typedef struct grpc_json { - struct grpc_json* next; - struct grpc_json* prev; - struct grpc_json* child; - struct grpc_json* parent; +typedef struct grpc_json +{ + struct grpc_json *next; + struct grpc_json *prev; + struct grpc_json *child; + struct grpc_json *parent; grpc_json_type type; - const char* key; - const char* value; + const char *key; + const char *value; } grpc_json; /* The next two functions are going to parse the input string, and @@ -65,8 +66,8 @@ typedef struct grpc_json { * * Delete the allocated tree afterward using grpc_json_destroy(). */ -grpc_json* grpc_json_parse_string_with_len(char* input, size_t size); -grpc_json* grpc_json_parse_string(char* input); +grpc_json *grpc_json_parse_string_with_len (char *input, size_t size); +grpc_json *grpc_json_parse_string (char *input); /* This function will create a new string using gpr_realloc, and will * deserialize the grpc_json tree into it. It'll be zero-terminated, @@ -76,13 +77,13 @@ grpc_json* grpc_json_parse_string(char* input); * If indent is 0, then newlines will be suppressed as well, and the * output will be condensed at its maximum. */ -char* grpc_json_dump_to_string(grpc_json* json, int indent); +char *grpc_json_dump_to_string (grpc_json * json, int indent); /* Use these to create or delete a grpc_json object. * Deletion is recursive. We will not attempt to free any of the strings * in any of the objects of that tree. */ -grpc_json* grpc_json_create(grpc_json_type type); -void grpc_json_destroy(grpc_json* json); +grpc_json *grpc_json_create (grpc_json_type type); +void grpc_json_destroy (grpc_json * json); #endif /* GRPC_INTERNAL_CORE_JSON_JSON_H */ diff --git a/src/core/json/json_common.h b/src/core/json/json_common.h index 481695b38b8..f9dbeb47664 100644 --- a/src/core/json/json_common.h +++ b/src/core/json/json_common.h @@ -35,7 +35,8 @@ #define GRPC_INTERNAL_CORE_JSON_JSON_COMMON_H /* The various json types. */ -typedef enum { +typedef enum +{ GRPC_JSON_OBJECT, GRPC_JSON_ARRAY, GRPC_JSON_STRING, diff --git a/src/core/json/json_reader.c b/src/core/json/json_reader.c index c22d4edd470..70dfe0efcf6 100644 --- a/src/core/json/json_reader.c +++ b/src/core/json/json_reader.c @@ -37,623 +37,718 @@ #include "src/core/json/json_reader.h" -static void json_reader_string_clear(grpc_json_reader* reader) { - reader->vtable->string_clear(reader->userdata); +static void +json_reader_string_clear (grpc_json_reader * reader) +{ + reader->vtable->string_clear (reader->userdata); } -static void json_reader_string_add_char(grpc_json_reader* reader, - gpr_uint32 c) { - reader->vtable->string_add_char(reader->userdata, c); +static void +json_reader_string_add_char (grpc_json_reader * reader, gpr_uint32 c) +{ + reader->vtable->string_add_char (reader->userdata, c); } -static void json_reader_string_add_utf32(grpc_json_reader* reader, - gpr_uint32 utf32) { - reader->vtable->string_add_utf32(reader->userdata, utf32); +static void +json_reader_string_add_utf32 (grpc_json_reader * reader, gpr_uint32 utf32) +{ + reader->vtable->string_add_utf32 (reader->userdata, utf32); } -static gpr_uint32 grpc_json_reader_read_char(grpc_json_reader* reader) { - return reader->vtable->read_char(reader->userdata); +static gpr_uint32 +grpc_json_reader_read_char (grpc_json_reader * reader) +{ + return reader->vtable->read_char (reader->userdata); } -static void json_reader_container_begins(grpc_json_reader* reader, - grpc_json_type type) { - reader->vtable->container_begins(reader->userdata, type); +static void +json_reader_container_begins (grpc_json_reader * reader, grpc_json_type type) +{ + reader->vtable->container_begins (reader->userdata, type); } -static grpc_json_type grpc_json_reader_container_ends( - grpc_json_reader* reader) { - return reader->vtable->container_ends(reader->userdata); +static grpc_json_type +grpc_json_reader_container_ends (grpc_json_reader * reader) +{ + return reader->vtable->container_ends (reader->userdata); } -static void json_reader_set_key(grpc_json_reader* reader) { - reader->vtable->set_key(reader->userdata); +static void +json_reader_set_key (grpc_json_reader * reader) +{ + reader->vtable->set_key (reader->userdata); } -static void json_reader_set_string(grpc_json_reader* reader) { - reader->vtable->set_string(reader->userdata); +static void +json_reader_set_string (grpc_json_reader * reader) +{ + reader->vtable->set_string (reader->userdata); } -static int json_reader_set_number(grpc_json_reader* reader) { - return reader->vtable->set_number(reader->userdata); +static int +json_reader_set_number (grpc_json_reader * reader) +{ + return reader->vtable->set_number (reader->userdata); } -static void json_reader_set_true(grpc_json_reader* reader) { - reader->vtable->set_true(reader->userdata); +static void +json_reader_set_true (grpc_json_reader * reader) +{ + reader->vtable->set_true (reader->userdata); } -static void json_reader_set_false(grpc_json_reader* reader) { - reader->vtable->set_false(reader->userdata); +static void +json_reader_set_false (grpc_json_reader * reader) +{ + reader->vtable->set_false (reader->userdata); } -static void json_reader_set_null(grpc_json_reader* reader) { - reader->vtable->set_null(reader->userdata); +static void +json_reader_set_null (grpc_json_reader * reader) +{ + reader->vtable->set_null (reader->userdata); } /* Call this function to initialize the reader structure. */ -void grpc_json_reader_init(grpc_json_reader* reader, - grpc_json_reader_vtable* vtable, void* userdata) { - memset(reader, 0, sizeof(*reader)); +void +grpc_json_reader_init (grpc_json_reader * reader, grpc_json_reader_vtable * vtable, void *userdata) +{ + memset (reader, 0, sizeof (*reader)); reader->vtable = vtable; reader->userdata = userdata; - json_reader_string_clear(reader); + json_reader_string_clear (reader); reader->state = GRPC_JSON_STATE_VALUE_BEGIN; } -int grpc_json_reader_is_complete(grpc_json_reader* reader) { - return ((reader->depth == 0) && - ((reader->state == GRPC_JSON_STATE_END) || - (reader->state == GRPC_JSON_STATE_VALUE_END))); +int +grpc_json_reader_is_complete (grpc_json_reader * reader) +{ + return ((reader->depth == 0) && ((reader->state == GRPC_JSON_STATE_END) || (reader->state == GRPC_JSON_STATE_VALUE_END))); } -grpc_json_reader_status grpc_json_reader_run(grpc_json_reader* reader) { +grpc_json_reader_status +grpc_json_reader_run (grpc_json_reader * reader) +{ gpr_uint32 c, success; /* This state-machine is a strict implementation of ECMA-404 */ - for (;;) { - c = grpc_json_reader_read_char(reader); - switch (c) { - /* Let's process the error cases first. */ - case GRPC_JSON_READ_CHAR_ERROR: - return GRPC_JSON_READ_ERROR; - - case GRPC_JSON_READ_CHAR_EAGAIN: - return GRPC_JSON_EAGAIN; - - case GRPC_JSON_READ_CHAR_EOF: - if (grpc_json_reader_is_complete(reader)) { - return GRPC_JSON_DONE; - } else { - return GRPC_JSON_PARSE_ERROR; - } - break; - - /* Processing whitespaces. */ - case ' ': - case '\t': - case '\n': - case '\r': - switch (reader->state) { - case GRPC_JSON_STATE_OBJECT_KEY_BEGIN: - case GRPC_JSON_STATE_OBJECT_KEY_END: - case GRPC_JSON_STATE_VALUE_BEGIN: - case GRPC_JSON_STATE_VALUE_END: - case GRPC_JSON_STATE_END: - break; - - case GRPC_JSON_STATE_OBJECT_KEY_STRING: - case GRPC_JSON_STATE_VALUE_STRING: - if (c != ' ') return GRPC_JSON_PARSE_ERROR; - if (reader->unicode_high_surrogate != 0) - return GRPC_JSON_PARSE_ERROR; - json_reader_string_add_char(reader, c); - break; - - case GRPC_JSON_STATE_VALUE_NUMBER: - case GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL: - case GRPC_JSON_STATE_VALUE_NUMBER_ZERO: - case GRPC_JSON_STATE_VALUE_NUMBER_EPM: - success = (gpr_uint32)json_reader_set_number(reader); - if (!success) return GRPC_JSON_PARSE_ERROR; - json_reader_string_clear(reader); - reader->state = GRPC_JSON_STATE_VALUE_END; - break; - - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - /* Value, object or array terminations. */ - case ',': - case '}': - case ']': - switch (reader->state) { - case GRPC_JSON_STATE_OBJECT_KEY_STRING: - case GRPC_JSON_STATE_VALUE_STRING: - if (reader->unicode_high_surrogate != 0) - return GRPC_JSON_PARSE_ERROR; - json_reader_string_add_char(reader, c); - break; - - case GRPC_JSON_STATE_VALUE_NUMBER: - case GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL: - case GRPC_JSON_STATE_VALUE_NUMBER_ZERO: - case GRPC_JSON_STATE_VALUE_NUMBER_EPM: - success = (gpr_uint32)json_reader_set_number(reader); - if (!success) return GRPC_JSON_PARSE_ERROR; - json_reader_string_clear(reader); - reader->state = GRPC_JSON_STATE_VALUE_END; - /* The missing break here is intentional. */ - - case GRPC_JSON_STATE_VALUE_END: - case GRPC_JSON_STATE_OBJECT_KEY_BEGIN: - case GRPC_JSON_STATE_VALUE_BEGIN: - if (c == ',') { - if (reader->state != GRPC_JSON_STATE_VALUE_END) { - return GRPC_JSON_PARSE_ERROR; - } - if (reader->in_object) { - reader->state = GRPC_JSON_STATE_OBJECT_KEY_BEGIN; - } else { - reader->state = GRPC_JSON_STATE_VALUE_BEGIN; - } - } else { - if (reader->depth-- == 0) return GRPC_JSON_PARSE_ERROR; - if ((c == '}') && !reader->in_object) { - return GRPC_JSON_PARSE_ERROR; - } - if ((c == '}') && - (reader->state == GRPC_JSON_STATE_OBJECT_KEY_BEGIN) && - !reader->container_just_begun) { - return GRPC_JSON_PARSE_ERROR; - } - if ((c == ']') && !reader->in_array) return GRPC_JSON_PARSE_ERROR; - if ((c == ']') && - (reader->state == GRPC_JSON_STATE_VALUE_BEGIN) && - !reader->container_just_begun) { - return GRPC_JSON_PARSE_ERROR; - } - reader->state = GRPC_JSON_STATE_VALUE_END; - switch (grpc_json_reader_container_ends(reader)) { - case GRPC_JSON_OBJECT: - reader->in_object = 1; - reader->in_array = 0; - break; - case GRPC_JSON_ARRAY: - reader->in_object = 0; - reader->in_array = 1; - break; - case GRPC_JSON_TOP_LEVEL: - if (reader->depth != 0) return GRPC_JSON_INTERNAL_ERROR; - reader->in_object = 0; - reader->in_array = 0; - reader->state = GRPC_JSON_STATE_END; - break; - default: - return GRPC_JSON_INTERNAL_ERROR; - } - } - break; - - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - /* In-string escaping. */ - case '\\': - switch (reader->state) { - case GRPC_JSON_STATE_OBJECT_KEY_STRING: - reader->escaped_string_was_key = 1; - reader->state = GRPC_JSON_STATE_STRING_ESCAPE; - break; - - case GRPC_JSON_STATE_VALUE_STRING: - reader->escaped_string_was_key = 0; - reader->state = GRPC_JSON_STATE_STRING_ESCAPE; - break; - - /* This is the \\ case. */ - case GRPC_JSON_STATE_STRING_ESCAPE: - if (reader->unicode_high_surrogate != 0) - return GRPC_JSON_PARSE_ERROR; - json_reader_string_add_char(reader, '\\'); - if (reader->escaped_string_was_key) { - reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; - } else { - reader->state = GRPC_JSON_STATE_VALUE_STRING; - } - break; - - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - default: - reader->container_just_begun = 0; - switch (reader->state) { - case GRPC_JSON_STATE_OBJECT_KEY_BEGIN: - if (c != '"') return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; - break; - - case GRPC_JSON_STATE_OBJECT_KEY_STRING: - if (reader->unicode_high_surrogate != 0) - return GRPC_JSON_PARSE_ERROR; - if (c == '"') { - reader->state = GRPC_JSON_STATE_OBJECT_KEY_END; - json_reader_set_key(reader); - json_reader_string_clear(reader); - } else { - if (c <= 0x001f) return GRPC_JSON_PARSE_ERROR; - json_reader_string_add_char(reader, c); - } - break; - - case GRPC_JSON_STATE_VALUE_STRING: - if (reader->unicode_high_surrogate != 0) - return GRPC_JSON_PARSE_ERROR; - if (c == '"') { - reader->state = GRPC_JSON_STATE_VALUE_END; - json_reader_set_string(reader); - json_reader_string_clear(reader); - } else { - if (c < 32) return GRPC_JSON_PARSE_ERROR; - json_reader_string_add_char(reader, c); - } - break; - - case GRPC_JSON_STATE_OBJECT_KEY_END: - if (c != ':') return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_BEGIN; - break; - - case GRPC_JSON_STATE_VALUE_BEGIN: - switch (c) { - case 't': - reader->state = GRPC_JSON_STATE_VALUE_TRUE_R; - break; - - case 'f': - reader->state = GRPC_JSON_STATE_VALUE_FALSE_A; - break; - - case 'n': - reader->state = GRPC_JSON_STATE_VALUE_NULL_U; - break; - - case '"': - reader->state = GRPC_JSON_STATE_VALUE_STRING; - break; - - case '0': - json_reader_string_add_char(reader, c); - reader->state = GRPC_JSON_STATE_VALUE_NUMBER_ZERO; - break; - - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - case '-': - json_reader_string_add_char(reader, c); - reader->state = GRPC_JSON_STATE_VALUE_NUMBER; - break; - - case '{': - reader->container_just_begun = 1; - json_reader_container_begins(reader, GRPC_JSON_OBJECT); - reader->depth++; - reader->state = GRPC_JSON_STATE_OBJECT_KEY_BEGIN; - reader->in_object = 1; - reader->in_array = 0; - break; - - case '[': - reader->container_just_begun = 1; - json_reader_container_begins(reader, GRPC_JSON_ARRAY); - reader->depth++; - reader->in_object = 0; - reader->in_array = 1; - break; - } - break; - - case GRPC_JSON_STATE_STRING_ESCAPE: - if (reader->escaped_string_was_key) { - reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; - } else { - reader->state = GRPC_JSON_STATE_VALUE_STRING; - } - if (reader->unicode_high_surrogate && c != 'u') - return GRPC_JSON_PARSE_ERROR; - switch (c) { - case '"': - case '/': - json_reader_string_add_char(reader, c); - break; - case 'b': - json_reader_string_add_char(reader, '\b'); - break; - case 'f': - json_reader_string_add_char(reader, '\f'); - break; - case 'n': - json_reader_string_add_char(reader, '\n'); - break; - case 'r': - json_reader_string_add_char(reader, '\r'); - break; - case 't': - json_reader_string_add_char(reader, '\t'); - break; - case 'u': - reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U1; - reader->unicode_char = 0; - break; - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - case GRPC_JSON_STATE_STRING_ESCAPE_U1: - case GRPC_JSON_STATE_STRING_ESCAPE_U2: - case GRPC_JSON_STATE_STRING_ESCAPE_U3: - case GRPC_JSON_STATE_STRING_ESCAPE_U4: - if ((c >= '0') && (c <= '9')) { - c -= '0'; - } else if ((c >= 'A') && (c <= 'F')) { - c -= 'A' - 10; - } else if ((c >= 'a') && (c <= 'f')) { - c -= 'a' - 10; - } else { - return GRPC_JSON_PARSE_ERROR; - } - reader->unicode_char = (gpr_uint16)(reader->unicode_char << 4); - reader->unicode_char = (gpr_uint16)(reader->unicode_char | c); - - switch (reader->state) { - case GRPC_JSON_STATE_STRING_ESCAPE_U1: - reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U2; - break; - case GRPC_JSON_STATE_STRING_ESCAPE_U2: - reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U3; - break; - case GRPC_JSON_STATE_STRING_ESCAPE_U3: - reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U4; - break; - case GRPC_JSON_STATE_STRING_ESCAPE_U4: - /* See grpc_json_writer_escape_string to have a description - * of what's going on here. - */ - if ((reader->unicode_char & 0xfc00) == 0xd800) { - /* high surrogate utf-16 */ - if (reader->unicode_high_surrogate != 0) - return GRPC_JSON_PARSE_ERROR; - reader->unicode_high_surrogate = reader->unicode_char; - } else if ((reader->unicode_char & 0xfc00) == 0xdc00) { - /* low surrogate utf-16 */ - gpr_uint32 utf32; - if (reader->unicode_high_surrogate == 0) - return GRPC_JSON_PARSE_ERROR; - utf32 = 0x10000; - utf32 += (gpr_uint32)( - (reader->unicode_high_surrogate - 0xd800) * 0x400); - utf32 += (gpr_uint32)(reader->unicode_char - 0xdc00); - json_reader_string_add_utf32(reader, utf32); - reader->unicode_high_surrogate = 0; - } else { - /* anything else */ - if (reader->unicode_high_surrogate != 0) - return GRPC_JSON_PARSE_ERROR; - json_reader_string_add_utf32(reader, reader->unicode_char); - } - if (reader->escaped_string_was_key) { - reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; - } else { - reader->state = GRPC_JSON_STATE_VALUE_STRING; - } - break; - default: - return GRPC_JSON_INTERNAL_ERROR; - } - break; - - case GRPC_JSON_STATE_VALUE_NUMBER: - json_reader_string_add_char(reader, c); - switch (c) { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - break; - case 'e': - case 'E': - reader->state = GRPC_JSON_STATE_VALUE_NUMBER_E; - break; - case '.': - reader->state = GRPC_JSON_STATE_VALUE_NUMBER_DOT; - break; - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - case GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL: - json_reader_string_add_char(reader, c); - switch (c) { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - break; - case 'e': - case 'E': - reader->state = GRPC_JSON_STATE_VALUE_NUMBER_E; - break; - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - case GRPC_JSON_STATE_VALUE_NUMBER_ZERO: - if (c != '.') return GRPC_JSON_PARSE_ERROR; - json_reader_string_add_char(reader, c); - reader->state = GRPC_JSON_STATE_VALUE_NUMBER_DOT; - break; - - case GRPC_JSON_STATE_VALUE_NUMBER_DOT: - json_reader_string_add_char(reader, c); - switch (c) { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - reader->state = GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL; - break; - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - case GRPC_JSON_STATE_VALUE_NUMBER_E: - json_reader_string_add_char(reader, c); - switch (c) { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - case '+': - case '-': - reader->state = GRPC_JSON_STATE_VALUE_NUMBER_EPM; - break; - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - case GRPC_JSON_STATE_VALUE_NUMBER_EPM: - json_reader_string_add_char(reader, c); - switch (c) { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - break; - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - case GRPC_JSON_STATE_VALUE_TRUE_R: - if (c != 'r') return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_TRUE_U; - break; - - case GRPC_JSON_STATE_VALUE_TRUE_U: - if (c != 'u') return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_TRUE_E; - break; - - case GRPC_JSON_STATE_VALUE_TRUE_E: - if (c != 'e') return GRPC_JSON_PARSE_ERROR; - json_reader_set_true(reader); - reader->state = GRPC_JSON_STATE_VALUE_END; - break; - - case GRPC_JSON_STATE_VALUE_FALSE_A: - if (c != 'a') return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_FALSE_L; - break; - - case GRPC_JSON_STATE_VALUE_FALSE_L: - if (c != 'l') return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_FALSE_S; - break; - - case GRPC_JSON_STATE_VALUE_FALSE_S: - if (c != 's') return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_FALSE_E; - break; - - case GRPC_JSON_STATE_VALUE_FALSE_E: - if (c != 'e') return GRPC_JSON_PARSE_ERROR; - json_reader_set_false(reader); - reader->state = GRPC_JSON_STATE_VALUE_END; - break; - - case GRPC_JSON_STATE_VALUE_NULL_U: - if (c != 'u') return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_NULL_L1; - break; - - case GRPC_JSON_STATE_VALUE_NULL_L1: - if (c != 'l') return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_NULL_L2; - break; - - case GRPC_JSON_STATE_VALUE_NULL_L2: - if (c != 'l') return GRPC_JSON_PARSE_ERROR; - json_reader_set_null(reader); - reader->state = GRPC_JSON_STATE_VALUE_END; - break; - - /* All of the VALUE_END cases are handled in the specialized case - * above. */ - case GRPC_JSON_STATE_VALUE_END: - switch (c) { - case ',': - case '}': - case ']': - return GRPC_JSON_INTERNAL_ERROR; - break; - - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - case GRPC_JSON_STATE_END: - return GRPC_JSON_PARSE_ERROR; - } + for (;;) + { + c = grpc_json_reader_read_char (reader); + switch (c) + { + /* Let's process the error cases first. */ + case GRPC_JSON_READ_CHAR_ERROR: + return GRPC_JSON_READ_ERROR; + + case GRPC_JSON_READ_CHAR_EAGAIN: + return GRPC_JSON_EAGAIN; + + case GRPC_JSON_READ_CHAR_EOF: + if (grpc_json_reader_is_complete (reader)) + { + return GRPC_JSON_DONE; + } + else + { + return GRPC_JSON_PARSE_ERROR; + } + break; + + /* Processing whitespaces. */ + case ' ': + case '\t': + case '\n': + case '\r': + switch (reader->state) + { + case GRPC_JSON_STATE_OBJECT_KEY_BEGIN: + case GRPC_JSON_STATE_OBJECT_KEY_END: + case GRPC_JSON_STATE_VALUE_BEGIN: + case GRPC_JSON_STATE_VALUE_END: + case GRPC_JSON_STATE_END: + break; + + case GRPC_JSON_STATE_OBJECT_KEY_STRING: + case GRPC_JSON_STATE_VALUE_STRING: + if (c != ' ') + return GRPC_JSON_PARSE_ERROR; + if (reader->unicode_high_surrogate != 0) + return GRPC_JSON_PARSE_ERROR; + json_reader_string_add_char (reader, c); + break; + + case GRPC_JSON_STATE_VALUE_NUMBER: + case GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL: + case GRPC_JSON_STATE_VALUE_NUMBER_ZERO: + case GRPC_JSON_STATE_VALUE_NUMBER_EPM: + success = (gpr_uint32) json_reader_set_number (reader); + if (!success) + return GRPC_JSON_PARSE_ERROR; + json_reader_string_clear (reader); + reader->state = GRPC_JSON_STATE_VALUE_END; + break; + + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + /* Value, object or array terminations. */ + case ',': + case '}': + case ']': + switch (reader->state) + { + case GRPC_JSON_STATE_OBJECT_KEY_STRING: + case GRPC_JSON_STATE_VALUE_STRING: + if (reader->unicode_high_surrogate != 0) + return GRPC_JSON_PARSE_ERROR; + json_reader_string_add_char (reader, c); + break; + + case GRPC_JSON_STATE_VALUE_NUMBER: + case GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL: + case GRPC_JSON_STATE_VALUE_NUMBER_ZERO: + case GRPC_JSON_STATE_VALUE_NUMBER_EPM: + success = (gpr_uint32) json_reader_set_number (reader); + if (!success) + return GRPC_JSON_PARSE_ERROR; + json_reader_string_clear (reader); + reader->state = GRPC_JSON_STATE_VALUE_END; + /* The missing break here is intentional. */ + + case GRPC_JSON_STATE_VALUE_END: + case GRPC_JSON_STATE_OBJECT_KEY_BEGIN: + case GRPC_JSON_STATE_VALUE_BEGIN: + if (c == ',') + { + if (reader->state != GRPC_JSON_STATE_VALUE_END) + { + return GRPC_JSON_PARSE_ERROR; + } + if (reader->in_object) + { + reader->state = GRPC_JSON_STATE_OBJECT_KEY_BEGIN; + } + else + { + reader->state = GRPC_JSON_STATE_VALUE_BEGIN; + } + } + else + { + if (reader->depth-- == 0) + return GRPC_JSON_PARSE_ERROR; + if ((c == '}') && !reader->in_object) + { + return GRPC_JSON_PARSE_ERROR; + } + if ((c == '}') && (reader->state == GRPC_JSON_STATE_OBJECT_KEY_BEGIN) && !reader->container_just_begun) + { + return GRPC_JSON_PARSE_ERROR; + } + if ((c == ']') && !reader->in_array) + return GRPC_JSON_PARSE_ERROR; + if ((c == ']') && (reader->state == GRPC_JSON_STATE_VALUE_BEGIN) && !reader->container_just_begun) + { + return GRPC_JSON_PARSE_ERROR; + } + reader->state = GRPC_JSON_STATE_VALUE_END; + switch (grpc_json_reader_container_ends (reader)) + { + case GRPC_JSON_OBJECT: + reader->in_object = 1; + reader->in_array = 0; + break; + case GRPC_JSON_ARRAY: + reader->in_object = 0; + reader->in_array = 1; + break; + case GRPC_JSON_TOP_LEVEL: + if (reader->depth != 0) + return GRPC_JSON_INTERNAL_ERROR; + reader->in_object = 0; + reader->in_array = 0; + reader->state = GRPC_JSON_STATE_END; + break; + default: + return GRPC_JSON_INTERNAL_ERROR; + } + } + break; + + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + /* In-string escaping. */ + case '\\': + switch (reader->state) + { + case GRPC_JSON_STATE_OBJECT_KEY_STRING: + reader->escaped_string_was_key = 1; + reader->state = GRPC_JSON_STATE_STRING_ESCAPE; + break; + + case GRPC_JSON_STATE_VALUE_STRING: + reader->escaped_string_was_key = 0; + reader->state = GRPC_JSON_STATE_STRING_ESCAPE; + break; + + /* This is the \\ case. */ + case GRPC_JSON_STATE_STRING_ESCAPE: + if (reader->unicode_high_surrogate != 0) + return GRPC_JSON_PARSE_ERROR; + json_reader_string_add_char (reader, '\\'); + if (reader->escaped_string_was_key) + { + reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; + } + else + { + reader->state = GRPC_JSON_STATE_VALUE_STRING; + } + break; + + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + default: + reader->container_just_begun = 0; + switch (reader->state) + { + case GRPC_JSON_STATE_OBJECT_KEY_BEGIN: + if (c != '"') + return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; + break; + + case GRPC_JSON_STATE_OBJECT_KEY_STRING: + if (reader->unicode_high_surrogate != 0) + return GRPC_JSON_PARSE_ERROR; + if (c == '"') + { + reader->state = GRPC_JSON_STATE_OBJECT_KEY_END; + json_reader_set_key (reader); + json_reader_string_clear (reader); + } + else + { + if (c <= 0x001f) + return GRPC_JSON_PARSE_ERROR; + json_reader_string_add_char (reader, c); + } + break; + + case GRPC_JSON_STATE_VALUE_STRING: + if (reader->unicode_high_surrogate != 0) + return GRPC_JSON_PARSE_ERROR; + if (c == '"') + { + reader->state = GRPC_JSON_STATE_VALUE_END; + json_reader_set_string (reader); + json_reader_string_clear (reader); + } + else + { + if (c < 32) + return GRPC_JSON_PARSE_ERROR; + json_reader_string_add_char (reader, c); + } + break; + + case GRPC_JSON_STATE_OBJECT_KEY_END: + if (c != ':') + return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_BEGIN; + break; + + case GRPC_JSON_STATE_VALUE_BEGIN: + switch (c) + { + case 't': + reader->state = GRPC_JSON_STATE_VALUE_TRUE_R; + break; + + case 'f': + reader->state = GRPC_JSON_STATE_VALUE_FALSE_A; + break; + + case 'n': + reader->state = GRPC_JSON_STATE_VALUE_NULL_U; + break; + + case '"': + reader->state = GRPC_JSON_STATE_VALUE_STRING; + break; + + case '0': + json_reader_string_add_char (reader, c); + reader->state = GRPC_JSON_STATE_VALUE_NUMBER_ZERO; + break; + + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '-': + json_reader_string_add_char (reader, c); + reader->state = GRPC_JSON_STATE_VALUE_NUMBER; + break; + + case '{': + reader->container_just_begun = 1; + json_reader_container_begins (reader, GRPC_JSON_OBJECT); + reader->depth++; + reader->state = GRPC_JSON_STATE_OBJECT_KEY_BEGIN; + reader->in_object = 1; + reader->in_array = 0; + break; + + case '[': + reader->container_just_begun = 1; + json_reader_container_begins (reader, GRPC_JSON_ARRAY); + reader->depth++; + reader->in_object = 0; + reader->in_array = 1; + break; + } + break; + + case GRPC_JSON_STATE_STRING_ESCAPE: + if (reader->escaped_string_was_key) + { + reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; + } + else + { + reader->state = GRPC_JSON_STATE_VALUE_STRING; + } + if (reader->unicode_high_surrogate && c != 'u') + return GRPC_JSON_PARSE_ERROR; + switch (c) + { + case '"': + case '/': + json_reader_string_add_char (reader, c); + break; + case 'b': + json_reader_string_add_char (reader, '\b'); + break; + case 'f': + json_reader_string_add_char (reader, '\f'); + break; + case 'n': + json_reader_string_add_char (reader, '\n'); + break; + case 'r': + json_reader_string_add_char (reader, '\r'); + break; + case 't': + json_reader_string_add_char (reader, '\t'); + break; + case 'u': + reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U1; + reader->unicode_char = 0; + break; + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + case GRPC_JSON_STATE_STRING_ESCAPE_U1: + case GRPC_JSON_STATE_STRING_ESCAPE_U2: + case GRPC_JSON_STATE_STRING_ESCAPE_U3: + case GRPC_JSON_STATE_STRING_ESCAPE_U4: + if ((c >= '0') && (c <= '9')) + { + c -= '0'; + } + else if ((c >= 'A') && (c <= 'F')) + { + c -= 'A' - 10; + } + else if ((c >= 'a') && (c <= 'f')) + { + c -= 'a' - 10; + } + else + { + return GRPC_JSON_PARSE_ERROR; + } + reader->unicode_char = (gpr_uint16) (reader->unicode_char << 4); + reader->unicode_char = (gpr_uint16) (reader->unicode_char | c); + + switch (reader->state) + { + case GRPC_JSON_STATE_STRING_ESCAPE_U1: + reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U2; + break; + case GRPC_JSON_STATE_STRING_ESCAPE_U2: + reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U3; + break; + case GRPC_JSON_STATE_STRING_ESCAPE_U3: + reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U4; + break; + case GRPC_JSON_STATE_STRING_ESCAPE_U4: + /* See grpc_json_writer_escape_string to have a description + * of what's going on here. + */ + if ((reader->unicode_char & 0xfc00) == 0xd800) + { + /* high surrogate utf-16 */ + if (reader->unicode_high_surrogate != 0) + return GRPC_JSON_PARSE_ERROR; + reader->unicode_high_surrogate = reader->unicode_char; + } + else if ((reader->unicode_char & 0xfc00) == 0xdc00) + { + /* low surrogate utf-16 */ + gpr_uint32 utf32; + if (reader->unicode_high_surrogate == 0) + return GRPC_JSON_PARSE_ERROR; + utf32 = 0x10000; + utf32 += (gpr_uint32) ((reader->unicode_high_surrogate - 0xd800) * 0x400); + utf32 += (gpr_uint32) (reader->unicode_char - 0xdc00); + json_reader_string_add_utf32 (reader, utf32); + reader->unicode_high_surrogate = 0; + } + else + { + /* anything else */ + if (reader->unicode_high_surrogate != 0) + return GRPC_JSON_PARSE_ERROR; + json_reader_string_add_utf32 (reader, reader->unicode_char); + } + if (reader->escaped_string_was_key) + { + reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; + } + else + { + reader->state = GRPC_JSON_STATE_VALUE_STRING; + } + break; + default: + return GRPC_JSON_INTERNAL_ERROR; + } + break; + + case GRPC_JSON_STATE_VALUE_NUMBER: + json_reader_string_add_char (reader, c); + switch (c) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + break; + case 'e': + case 'E': + reader->state = GRPC_JSON_STATE_VALUE_NUMBER_E; + break; + case '.': + reader->state = GRPC_JSON_STATE_VALUE_NUMBER_DOT; + break; + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + case GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL: + json_reader_string_add_char (reader, c); + switch (c) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + break; + case 'e': + case 'E': + reader->state = GRPC_JSON_STATE_VALUE_NUMBER_E; + break; + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + case GRPC_JSON_STATE_VALUE_NUMBER_ZERO: + if (c != '.') + return GRPC_JSON_PARSE_ERROR; + json_reader_string_add_char (reader, c); + reader->state = GRPC_JSON_STATE_VALUE_NUMBER_DOT; + break; + + case GRPC_JSON_STATE_VALUE_NUMBER_DOT: + json_reader_string_add_char (reader, c); + switch (c) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + reader->state = GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL; + break; + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + case GRPC_JSON_STATE_VALUE_NUMBER_E: + json_reader_string_add_char (reader, c); + switch (c) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '+': + case '-': + reader->state = GRPC_JSON_STATE_VALUE_NUMBER_EPM; + break; + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + case GRPC_JSON_STATE_VALUE_NUMBER_EPM: + json_reader_string_add_char (reader, c); + switch (c) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + break; + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + case GRPC_JSON_STATE_VALUE_TRUE_R: + if (c != 'r') + return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_TRUE_U; + break; + + case GRPC_JSON_STATE_VALUE_TRUE_U: + if (c != 'u') + return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_TRUE_E; + break; + + case GRPC_JSON_STATE_VALUE_TRUE_E: + if (c != 'e') + return GRPC_JSON_PARSE_ERROR; + json_reader_set_true (reader); + reader->state = GRPC_JSON_STATE_VALUE_END; + break; + + case GRPC_JSON_STATE_VALUE_FALSE_A: + if (c != 'a') + return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_FALSE_L; + break; + + case GRPC_JSON_STATE_VALUE_FALSE_L: + if (c != 'l') + return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_FALSE_S; + break; + + case GRPC_JSON_STATE_VALUE_FALSE_S: + if (c != 's') + return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_FALSE_E; + break; + + case GRPC_JSON_STATE_VALUE_FALSE_E: + if (c != 'e') + return GRPC_JSON_PARSE_ERROR; + json_reader_set_false (reader); + reader->state = GRPC_JSON_STATE_VALUE_END; + break; + + case GRPC_JSON_STATE_VALUE_NULL_U: + if (c != 'u') + return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_NULL_L1; + break; + + case GRPC_JSON_STATE_VALUE_NULL_L1: + if (c != 'l') + return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_NULL_L2; + break; + + case GRPC_JSON_STATE_VALUE_NULL_L2: + if (c != 'l') + return GRPC_JSON_PARSE_ERROR; + json_reader_set_null (reader); + reader->state = GRPC_JSON_STATE_VALUE_END; + break; + + /* All of the VALUE_END cases are handled in the specialized case + * above. */ + case GRPC_JSON_STATE_VALUE_END: + switch (c) + { + case ',': + case '}': + case ']': + return GRPC_JSON_INTERNAL_ERROR; + break; + + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + case GRPC_JSON_STATE_END: + return GRPC_JSON_PARSE_ERROR; + } + } } - } return GRPC_JSON_INTERNAL_ERROR; } diff --git a/src/core/json/json_reader.h b/src/core/json/json_reader.h index 4d5487f7904..f77036b4cba 100644 --- a/src/core/json/json_reader.h +++ b/src/core/json/json_reader.h @@ -37,7 +37,8 @@ #include #include "src/core/json/json_common.h" -typedef enum { +typedef enum +{ GRPC_JSON_STATE_OBJECT_KEY_BEGIN, GRPC_JSON_STATE_OBJECT_KEY_STRING, GRPC_JSON_STATE_OBJECT_KEY_END, @@ -68,7 +69,8 @@ typedef enum { GRPC_JSON_STATE_END } grpc_json_reader_state; -enum { +enum +{ /* The first non-unicode value is 0x110000. But let's pick * a value high enough to start our error codes from. These * values are safe to return from the read_char function. @@ -80,38 +82,40 @@ enum { struct grpc_json_reader; -typedef struct grpc_json_reader_vtable { +typedef struct grpc_json_reader_vtable +{ /* Clears your internal string scratchpad. */ - void (*string_clear)(void* userdata); + void (*string_clear) (void *userdata); /* Adds a char to the string scratchpad. */ - void (*string_add_char)(void* userdata, gpr_uint32 c); + void (*string_add_char) (void *userdata, gpr_uint32 c); /* Adds a utf32 char to the string scratchpad. */ - void (*string_add_utf32)(void* userdata, gpr_uint32 c); + void (*string_add_utf32) (void *userdata, gpr_uint32 c); /* Reads a character from your input. May be utf-8, 16 or 32. */ - gpr_uint32 (*read_char)(void* userdata); + gpr_uint32 (*read_char) (void *userdata); /* Starts a container of type GRPC_JSON_ARRAY or GRPC_JSON_OBJECT. */ - void (*container_begins)(void* userdata, grpc_json_type type); + void (*container_begins) (void *userdata, grpc_json_type type); /* Ends the current container. Must return the type of its parent. */ - grpc_json_type (*container_ends)(void* userdata); + grpc_json_type (*container_ends) (void *userdata); /* Your internal string scratchpad is an object's key. */ - void (*set_key)(void* userdata); + void (*set_key) (void *userdata); /* Your internal string scratchpad is a string value. */ - void (*set_string)(void* userdata); + void (*set_string) (void *userdata); /* Your internal string scratchpad is a numerical value. Return 1 if valid. */ - int (*set_number)(void* userdata); + int (*set_number) (void *userdata); /* Sets the values true, false or null. */ - void (*set_true)(void* userdata); - void (*set_false)(void* userdata); - void (*set_null)(void* userdata); + void (*set_true) (void *userdata); + void (*set_false) (void *userdata); + void (*set_null) (void *userdata); } grpc_json_reader_vtable; -typedef struct grpc_json_reader { +typedef struct grpc_json_reader +{ /* That structure is fully private, and initialized by grpc_json_reader_init. * The definition is public so you can put it on your stack. */ - void* userdata; - grpc_json_reader_vtable* vtable; + void *userdata; + grpc_json_reader_vtable *vtable; int depth; int in_object; int in_array; @@ -122,12 +126,13 @@ typedef struct grpc_json_reader { } grpc_json_reader; /* The return type of the parser. */ -typedef enum { - GRPC_JSON_DONE, /* The parser finished successfully. */ - GRPC_JSON_EAGAIN, /* The parser yields to get more data. */ - GRPC_JSON_READ_ERROR, /* The parser passes through a read error. */ - GRPC_JSON_PARSE_ERROR, /* The parser found an error in the json stream. */ - GRPC_JSON_INTERNAL_ERROR /* The parser got an internal error. */ +typedef enum +{ + GRPC_JSON_DONE, /* The parser finished successfully. */ + GRPC_JSON_EAGAIN, /* The parser yields to get more data. */ + GRPC_JSON_READ_ERROR, /* The parser passes through a read error. */ + GRPC_JSON_PARSE_ERROR, /* The parser found an error in the json stream. */ + GRPC_JSON_INTERNAL_ERROR /* The parser got an internal error. */ } grpc_json_reader_status; /* Call this function to start parsing the input. It will return the following: @@ -144,17 +149,16 @@ typedef enum { * . GRPC_JSON_INTERNAL_ERROR if the parser somehow ended into an invalid * internal state. */ -grpc_json_reader_status grpc_json_reader_run(grpc_json_reader* reader); +grpc_json_reader_status grpc_json_reader_run (grpc_json_reader * reader); /* Call this function to initialize the reader structure. */ -void grpc_json_reader_init(grpc_json_reader* reader, - grpc_json_reader_vtable* vtable, void* userdata); +void grpc_json_reader_init (grpc_json_reader * reader, grpc_json_reader_vtable * vtable, void *userdata); /* You may call this from the read_char callback if you don't know where is the * end of your input stream, and you'd like the json reader to hint you that it * has completed reading its input, so you can return an EOF to it. Note that * there might still be trailing whitespaces after that point. */ -int grpc_json_reader_is_complete(grpc_json_reader* reader); +int grpc_json_reader_is_complete (grpc_json_reader * reader); #endif /* GRPC_INTERNAL_CORE_JSON_JSON_READER_H */ diff --git a/src/core/json/json_string.c b/src/core/json/json_string.c index e6622ec4610..ea596ee8fd2 100644 --- a/src/core/json/json_string.c +++ b/src/core/json/json_string.c @@ -52,22 +52,24 @@ * Note that this works because the act of parsing json always reduces its * input size, and never expands it. */ -typedef struct { - grpc_json* top; - grpc_json* current_container; - grpc_json* current_value; - gpr_uint8* input; - gpr_uint8* key; - gpr_uint8* string; - gpr_uint8* string_ptr; +typedef struct +{ + grpc_json *top; + grpc_json *current_container; + grpc_json *current_value; + gpr_uint8 *input; + gpr_uint8 *key; + gpr_uint8 *string; + gpr_uint8 *string_ptr; size_t remaining_input; } json_reader_userdata; /* This json writer will put everything in a big string. * The point is that we allocate that string in chunks of 256 bytes. */ -typedef struct { - char* output; +typedef struct +{ + char *output; size_t free_space; size_t string_len; size_t allocated; @@ -77,104 +79,130 @@ typedef struct { * and will enlarge it if necessary. We're only allocating chunks of 256 * bytes at a time (or multiples thereof). */ -static void json_writer_output_check(void* userdata, size_t needed) { - json_writer_userdata* state = userdata; - if (state->free_space >= needed) return; +static void +json_writer_output_check (void *userdata, size_t needed) +{ + json_writer_userdata *state = userdata; + if (state->free_space >= needed) + return; needed -= state->free_space; /* Round up by 256 bytes. */ needed = (needed + 0xff) & ~0xffU; - state->output = gpr_realloc(state->output, state->allocated + needed); + state->output = gpr_realloc (state->output, state->allocated + needed); state->free_space += needed; state->allocated += needed; } /* These are needed by the writer's implementation. */ -static void json_writer_output_char(void* userdata, char c) { - json_writer_userdata* state = userdata; - json_writer_output_check(userdata, 1); +static void +json_writer_output_char (void *userdata, char c) +{ + json_writer_userdata *state = userdata; + json_writer_output_check (userdata, 1); state->output[state->string_len++] = c; state->free_space--; } -static void json_writer_output_string_with_len(void* userdata, const char* str, - size_t len) { - json_writer_userdata* state = userdata; - json_writer_output_check(userdata, len); - memcpy(state->output + state->string_len, str, len); +static void +json_writer_output_string_with_len (void *userdata, const char *str, size_t len) +{ + json_writer_userdata *state = userdata; + json_writer_output_check (userdata, len); + memcpy (state->output + state->string_len, str, len); state->string_len += len; state->free_space -= len; } -static void json_writer_output_string(void* userdata, const char* str) { - size_t len = strlen(str); - json_writer_output_string_with_len(userdata, str, len); +static void +json_writer_output_string (void *userdata, const char *str) +{ + size_t len = strlen (str); + json_writer_output_string_with_len (userdata, str, len); } /* The reader asks us to clear our scratchpad. In our case, we'll simply mark * the end of the current string, and advance our output pointer. */ -static void json_reader_string_clear(void* userdata) { - json_reader_userdata* state = userdata; - if (state->string) { - GPR_ASSERT(state->string_ptr < state->input); - *state->string_ptr++ = 0; - } +static void +json_reader_string_clear (void *userdata) +{ + json_reader_userdata *state = userdata; + if (state->string) + { + GPR_ASSERT (state->string_ptr < state->input); + *state->string_ptr++ = 0; + } state->string = state->string_ptr; } -static void json_reader_string_add_char(void* userdata, gpr_uint32 c) { - json_reader_userdata* state = userdata; - GPR_ASSERT(state->string_ptr < state->input); - GPR_ASSERT(c <= 0xff); - *state->string_ptr++ = (gpr_uint8)c; +static void +json_reader_string_add_char (void *userdata, gpr_uint32 c) +{ + json_reader_userdata *state = userdata; + GPR_ASSERT (state->string_ptr < state->input); + GPR_ASSERT (c <= 0xff); + *state->string_ptr++ = (gpr_uint8) c; } /* We are converting a UTF-32 character into UTF-8 here, * as described by RFC3629. */ -static void json_reader_string_add_utf32(void* userdata, gpr_uint32 c) { - if (c <= 0x7f) { - json_reader_string_add_char(userdata, c); - } else if (c <= 0x7ff) { - gpr_uint32 b1 = 0xc0 | ((c >> 6) & 0x1f); - gpr_uint32 b2 = 0x80 | (c & 0x3f); - json_reader_string_add_char(userdata, b1); - json_reader_string_add_char(userdata, b2); - } else if (c <= 0xffff) { - gpr_uint32 b1 = 0xe0 | ((c >> 12) & 0x0f); - gpr_uint32 b2 = 0x80 | ((c >> 6) & 0x3f); - gpr_uint32 b3 = 0x80 | (c & 0x3f); - json_reader_string_add_char(userdata, b1); - json_reader_string_add_char(userdata, b2); - json_reader_string_add_char(userdata, b3); - } else if (c <= 0x1fffff) { - gpr_uint32 b1 = 0xf0 | ((c >> 18) & 0x07); - gpr_uint32 b2 = 0x80 | ((c >> 12) & 0x3f); - gpr_uint32 b3 = 0x80 | ((c >> 6) & 0x3f); - gpr_uint32 b4 = 0x80 | (c & 0x3f); - json_reader_string_add_char(userdata, b1); - json_reader_string_add_char(userdata, b2); - json_reader_string_add_char(userdata, b3); - json_reader_string_add_char(userdata, b4); - } +static void +json_reader_string_add_utf32 (void *userdata, gpr_uint32 c) +{ + if (c <= 0x7f) + { + json_reader_string_add_char (userdata, c); + } + else if (c <= 0x7ff) + { + gpr_uint32 b1 = 0xc0 | ((c >> 6) & 0x1f); + gpr_uint32 b2 = 0x80 | (c & 0x3f); + json_reader_string_add_char (userdata, b1); + json_reader_string_add_char (userdata, b2); + } + else if (c <= 0xffff) + { + gpr_uint32 b1 = 0xe0 | ((c >> 12) & 0x0f); + gpr_uint32 b2 = 0x80 | ((c >> 6) & 0x3f); + gpr_uint32 b3 = 0x80 | (c & 0x3f); + json_reader_string_add_char (userdata, b1); + json_reader_string_add_char (userdata, b2); + json_reader_string_add_char (userdata, b3); + } + else if (c <= 0x1fffff) + { + gpr_uint32 b1 = 0xf0 | ((c >> 18) & 0x07); + gpr_uint32 b2 = 0x80 | ((c >> 12) & 0x3f); + gpr_uint32 b3 = 0x80 | ((c >> 6) & 0x3f); + gpr_uint32 b4 = 0x80 | (c & 0x3f); + json_reader_string_add_char (userdata, b1); + json_reader_string_add_char (userdata, b2); + json_reader_string_add_char (userdata, b3); + json_reader_string_add_char (userdata, b4); + } } /* We consider that the input may be a zero-terminated string. So we * can end up hitting eof before the end of the alleged string length. */ -static gpr_uint32 json_reader_read_char(void* userdata) { +static gpr_uint32 +json_reader_read_char (void *userdata) +{ gpr_uint32 r; - json_reader_userdata* state = userdata; + json_reader_userdata *state = userdata; - if (state->remaining_input == 0) return GRPC_JSON_READ_CHAR_EOF; + if (state->remaining_input == 0) + return GRPC_JSON_READ_CHAR_EOF; r = *state->input++; state->remaining_input--; - if (r == 0) { - state->remaining_input = 0; - return GRPC_JSON_READ_CHAR_EOF; - } + if (r == 0) + { + state->remaining_input = 0; + return GRPC_JSON_READ_CHAR_EOF; + } return r; } @@ -182,39 +210,48 @@ static gpr_uint32 json_reader_read_char(void* userdata) { /* Helper function to create a new grpc_json object and link it into * our tree-in-progress inside our opaque structure. */ -static grpc_json* json_create_and_link(void* userdata, grpc_json_type type) { - json_reader_userdata* state = userdata; - grpc_json* json = grpc_json_create(type); +static grpc_json * +json_create_and_link (void *userdata, grpc_json_type type) +{ + json_reader_userdata *state = userdata; + grpc_json *json = grpc_json_create (type); json->parent = state->current_container; json->prev = state->current_value; state->current_value = json; - if (json->prev) { - json->prev->next = json; - } - if (json->parent) { - if (!json->parent->child) { - json->parent->child = json; + if (json->prev) + { + json->prev->next = json; + } + if (json->parent) + { + if (!json->parent->child) + { + json->parent->child = json; + } + if (json->parent->type == GRPC_JSON_OBJECT) + { + json->key = (char *) state->key; + } } - if (json->parent->type == GRPC_JSON_OBJECT) { - json->key = (char*)state->key; + if (!state->top) + { + state->top = json; } - } - if (!state->top) { - state->top = json; - } return json; } -static void json_reader_container_begins(void* userdata, grpc_json_type type) { - json_reader_userdata* state = userdata; - grpc_json* container; +static void +json_reader_container_begins (void *userdata, grpc_json_type type) +{ + json_reader_userdata *state = userdata; + grpc_json *container; - GPR_ASSERT(type == GRPC_JSON_ARRAY || type == GRPC_JSON_OBJECT); + GPR_ASSERT (type == GRPC_JSON_ARRAY || type == GRPC_JSON_OBJECT); - container = json_create_and_link(userdata, type); + container = json_create_and_link (userdata, type); state->current_container = container; state->current_value = NULL; } @@ -228,18 +265,21 @@ static void json_reader_container_begins(void* userdata, grpc_json_type type) { * Also note that if we're at the top of the tree, and the last container * ends, we have to return GRPC_JSON_TOP_LEVEL. */ -static grpc_json_type json_reader_container_ends(void* userdata) { +static grpc_json_type +json_reader_container_ends (void *userdata) +{ grpc_json_type container_type = GRPC_JSON_TOP_LEVEL; - json_reader_userdata* state = userdata; + json_reader_userdata *state = userdata; - GPR_ASSERT(state->current_container); + GPR_ASSERT (state->current_container); state->current_value = state->current_container; state->current_container = state->current_container->parent; - if (state->current_container) { - container_type = state->current_container->type; - } + if (state->current_container) + { + container_type = state->current_container->type; + } return container_type; } @@ -250,130 +290,155 @@ static grpc_json_type json_reader_container_ends(void* userdata) { * Note that in the set_number case, we're not going to try interpreting it. * We'll keep it as a string, and leave it to the caller to evaluate it. */ -static void json_reader_set_key(void* userdata) { - json_reader_userdata* state = userdata; +static void +json_reader_set_key (void *userdata) +{ + json_reader_userdata *state = userdata; state->key = state->string; } -static void json_reader_set_string(void* userdata) { - json_reader_userdata* state = userdata; - grpc_json* json = json_create_and_link(userdata, GRPC_JSON_STRING); - json->value = (char*)state->string; +static void +json_reader_set_string (void *userdata) +{ + json_reader_userdata *state = userdata; + grpc_json *json = json_create_and_link (userdata, GRPC_JSON_STRING); + json->value = (char *) state->string; } -static int json_reader_set_number(void* userdata) { - json_reader_userdata* state = userdata; - grpc_json* json = json_create_and_link(userdata, GRPC_JSON_NUMBER); - json->value = (char*)state->string; +static int +json_reader_set_number (void *userdata) +{ + json_reader_userdata *state = userdata; + grpc_json *json = json_create_and_link (userdata, GRPC_JSON_NUMBER); + json->value = (char *) state->string; return 1; } /* The object types true, false and null are self-sufficient, and don't need * any more information beside their type. */ -static void json_reader_set_true(void* userdata) { - json_create_and_link(userdata, GRPC_JSON_TRUE); +static void +json_reader_set_true (void *userdata) +{ + json_create_and_link (userdata, GRPC_JSON_TRUE); } -static void json_reader_set_false(void* userdata) { - json_create_and_link(userdata, GRPC_JSON_FALSE); +static void +json_reader_set_false (void *userdata) +{ + json_create_and_link (userdata, GRPC_JSON_FALSE); } -static void json_reader_set_null(void* userdata) { - json_create_and_link(userdata, GRPC_JSON_NULL); +static void +json_reader_set_null (void *userdata) +{ + json_create_and_link (userdata, GRPC_JSON_NULL); } static grpc_json_reader_vtable reader_vtable = { - json_reader_string_clear, json_reader_string_add_char, - json_reader_string_add_utf32, json_reader_read_char, - json_reader_container_begins, json_reader_container_ends, - json_reader_set_key, json_reader_set_string, - json_reader_set_number, json_reader_set_true, - json_reader_set_false, json_reader_set_null}; + json_reader_string_clear, json_reader_string_add_char, + json_reader_string_add_utf32, json_reader_read_char, + json_reader_container_begins, json_reader_container_ends, + json_reader_set_key, json_reader_set_string, + json_reader_set_number, json_reader_set_true, + json_reader_set_false, json_reader_set_null +}; /* And finally, let's define our public API. */ -grpc_json* grpc_json_parse_string_with_len(char* input, size_t size) { +grpc_json * +grpc_json_parse_string_with_len (char *input, size_t size) +{ grpc_json_reader reader; json_reader_userdata state; - grpc_json* json = NULL; + grpc_json *json = NULL; grpc_json_reader_status status; - if (!input) return NULL; + if (!input) + return NULL; state.top = state.current_container = state.current_value = NULL; state.string = state.key = NULL; - state.string_ptr = state.input = (gpr_uint8*)input; + state.string_ptr = state.input = (gpr_uint8 *) input; state.remaining_input = size; - grpc_json_reader_init(&reader, &reader_vtable, &state); + grpc_json_reader_init (&reader, &reader_vtable, &state); - status = grpc_json_reader_run(&reader); + status = grpc_json_reader_run (&reader); json = state.top; - if ((status != GRPC_JSON_DONE) && json) { - grpc_json_destroy(json); - json = NULL; - } + if ((status != GRPC_JSON_DONE) && json) + { + grpc_json_destroy (json); + json = NULL; + } return json; } #define UNBOUND_JSON_STRING_LENGTH 0x7fffffff -grpc_json* grpc_json_parse_string(char* input) { - return grpc_json_parse_string_with_len(input, UNBOUND_JSON_STRING_LENGTH); +grpc_json * +grpc_json_parse_string (char *input) +{ + return grpc_json_parse_string_with_len (input, UNBOUND_JSON_STRING_LENGTH); } -static void json_dump_recursive(grpc_json_writer* writer, grpc_json* json, - int in_object) { - while (json) { - if (in_object) grpc_json_writer_object_key(writer, json->key); - - switch (json->type) { - case GRPC_JSON_OBJECT: - case GRPC_JSON_ARRAY: - grpc_json_writer_container_begins(writer, json->type); - if (json->child) - json_dump_recursive(writer, json->child, - json->type == GRPC_JSON_OBJECT); - grpc_json_writer_container_ends(writer, json->type); - break; - case GRPC_JSON_STRING: - grpc_json_writer_value_string(writer, json->value); - break; - case GRPC_JSON_NUMBER: - grpc_json_writer_value_raw(writer, json->value); - break; - case GRPC_JSON_TRUE: - grpc_json_writer_value_raw_with_len(writer, "true", 4); - break; - case GRPC_JSON_FALSE: - grpc_json_writer_value_raw_with_len(writer, "false", 5); - break; - case GRPC_JSON_NULL: - grpc_json_writer_value_raw_with_len(writer, "null", 4); - break; - default: - abort(); +static void +json_dump_recursive (grpc_json_writer * writer, grpc_json * json, int in_object) +{ + while (json) + { + if (in_object) + grpc_json_writer_object_key (writer, json->key); + + switch (json->type) + { + case GRPC_JSON_OBJECT: + case GRPC_JSON_ARRAY: + grpc_json_writer_container_begins (writer, json->type); + if (json->child) + json_dump_recursive (writer, json->child, json->type == GRPC_JSON_OBJECT); + grpc_json_writer_container_ends (writer, json->type); + break; + case GRPC_JSON_STRING: + grpc_json_writer_value_string (writer, json->value); + break; + case GRPC_JSON_NUMBER: + grpc_json_writer_value_raw (writer, json->value); + break; + case GRPC_JSON_TRUE: + grpc_json_writer_value_raw_with_len (writer, "true", 4); + break; + case GRPC_JSON_FALSE: + grpc_json_writer_value_raw_with_len (writer, "false", 5); + break; + case GRPC_JSON_NULL: + grpc_json_writer_value_raw_with_len (writer, "null", 4); + break; + default: + abort (); + } + json = json->next; } - json = json->next; - } } static grpc_json_writer_vtable writer_vtable = { - json_writer_output_char, json_writer_output_string, - json_writer_output_string_with_len}; + json_writer_output_char, json_writer_output_string, + json_writer_output_string_with_len +}; -char* grpc_json_dump_to_string(grpc_json* json, int indent) { +char * +grpc_json_dump_to_string (grpc_json * json, int indent) +{ grpc_json_writer writer; json_writer_userdata state; state.output = NULL; state.free_space = state.string_len = state.allocated = 0; - grpc_json_writer_init(&writer, indent, &writer_vtable, &state); + grpc_json_writer_init (&writer, indent, &writer_vtable, &state); - json_dump_recursive(&writer, json, 0); + json_dump_recursive (&writer, json, 0); - json_writer_output_char(&state, 0); + json_writer_output_char (&state, 0); return state.output; } diff --git a/src/core/json/json_writer.c b/src/core/json/json_writer.c index ca9c8358252..fc49d72998d 100644 --- a/src/core/json/json_writer.c +++ b/src/core/json/json_writer.c @@ -37,224 +37,273 @@ #include "src/core/json/json_writer.h" -static void json_writer_output_char(grpc_json_writer* writer, char c) { - writer->vtable->output_char(writer->userdata, c); +static void +json_writer_output_char (grpc_json_writer * writer, char c) +{ + writer->vtable->output_char (writer->userdata, c); } -static void json_writer_output_string(grpc_json_writer* writer, - const char* str) { - writer->vtable->output_string(writer->userdata, str); +static void +json_writer_output_string (grpc_json_writer * writer, const char *str) +{ + writer->vtable->output_string (writer->userdata, str); } -static void json_writer_output_string_with_len(grpc_json_writer* writer, - const char* str, size_t len) { - writer->vtable->output_string_with_len(writer->userdata, str, len); +static void +json_writer_output_string_with_len (grpc_json_writer * writer, const char *str, size_t len) +{ + writer->vtable->output_string_with_len (writer->userdata, str, len); } -void grpc_json_writer_init(grpc_json_writer* writer, int indent, - grpc_json_writer_vtable* vtable, void* userdata) { - memset(writer, 0, sizeof(*writer)); +void +grpc_json_writer_init (grpc_json_writer * writer, int indent, grpc_json_writer_vtable * vtable, void *userdata) +{ + memset (writer, 0, sizeof (*writer)); writer->container_empty = 1; writer->indent = indent; writer->vtable = vtable; writer->userdata = userdata; } -static void json_writer_output_indent(grpc_json_writer* writer) { - static const char spacesstr[] = - " " - " " - " " - " "; +static void +json_writer_output_indent (grpc_json_writer * writer) +{ + static const char spacesstr[] = " " " " " " " "; - unsigned spaces = (unsigned)(writer->depth * writer->indent); + unsigned spaces = (unsigned) (writer->depth * writer->indent); - if (writer->indent == 0) return; - - if (writer->got_key) { - json_writer_output_char(writer, ' '); + if (writer->indent == 0) return; - } - while (spaces >= (sizeof(spacesstr) - 1)) { - json_writer_output_string_with_len(writer, spacesstr, - sizeof(spacesstr) - 1); - spaces -= (unsigned)(sizeof(spacesstr) - 1); - } + if (writer->got_key) + { + json_writer_output_char (writer, ' '); + return; + } - if (spaces == 0) return; + while (spaces >= (sizeof (spacesstr) - 1)) + { + json_writer_output_string_with_len (writer, spacesstr, sizeof (spacesstr) - 1); + spaces -= (unsigned) (sizeof (spacesstr) - 1); + } - json_writer_output_string_with_len( - writer, spacesstr + sizeof(spacesstr) - 1 - spaces, spaces); + if (spaces == 0) + return; + + json_writer_output_string_with_len (writer, spacesstr + sizeof (spacesstr) - 1 - spaces, spaces); } -static void json_writer_value_end(grpc_json_writer* writer) { - if (writer->container_empty) { - writer->container_empty = 0; - if ((writer->indent == 0) || (writer->depth == 0)) return; - json_writer_output_char(writer, '\n'); - } else { - json_writer_output_char(writer, ','); - if (writer->indent == 0) return; - json_writer_output_char(writer, '\n'); - } +static void +json_writer_value_end (grpc_json_writer * writer) +{ + if (writer->container_empty) + { + writer->container_empty = 0; + if ((writer->indent == 0) || (writer->depth == 0)) + return; + json_writer_output_char (writer, '\n'); + } + else + { + json_writer_output_char (writer, ','); + if (writer->indent == 0) + return; + json_writer_output_char (writer, '\n'); + } } -static void json_writer_escape_utf16(grpc_json_writer* writer, - gpr_uint16 utf16) { +static void +json_writer_escape_utf16 (grpc_json_writer * writer, gpr_uint16 utf16) +{ static const char hex[] = "0123456789abcdef"; - json_writer_output_string_with_len(writer, "\\u", 2); - json_writer_output_char(writer, hex[(utf16 >> 12) & 0x0f]); - json_writer_output_char(writer, hex[(utf16 >> 8) & 0x0f]); - json_writer_output_char(writer, hex[(utf16 >> 4) & 0x0f]); - json_writer_output_char(writer, hex[(utf16)&0x0f]); + json_writer_output_string_with_len (writer, "\\u", 2); + json_writer_output_char (writer, hex[(utf16 >> 12) & 0x0f]); + json_writer_output_char (writer, hex[(utf16 >> 8) & 0x0f]); + json_writer_output_char (writer, hex[(utf16 >> 4) & 0x0f]); + json_writer_output_char (writer, hex[(utf16) & 0x0f]); } -static void json_writer_escape_string(grpc_json_writer* writer, - const char* string) { - json_writer_output_char(writer, '"'); +static void +json_writer_escape_string (grpc_json_writer * writer, const char *string) +{ + json_writer_output_char (writer, '"'); - for (;;) { - gpr_uint8 c = (gpr_uint8)*string++; - if (c == 0) { - break; - } else if ((c >= 32) && (c <= 126)) { - if ((c == '\\') || (c == '"')) json_writer_output_char(writer, '\\'); - json_writer_output_char(writer, (char)c); - } else if ((c < 32) || (c == 127)) { - switch (c) { - case '\b': - json_writer_output_string_with_len(writer, "\\b", 2); - break; - case '\f': - json_writer_output_string_with_len(writer, "\\f", 2); - break; - case '\n': - json_writer_output_string_with_len(writer, "\\n", 2); - break; - case '\r': - json_writer_output_string_with_len(writer, "\\r", 2); - break; - case '\t': - json_writer_output_string_with_len(writer, "\\t", 2); - break; - default: - json_writer_escape_utf16(writer, c); - break; - } - } else { - gpr_uint32 utf32 = 0; - int extra = 0; - int i; - int valid = 1; - if ((c & 0xe0) == 0xc0) { - utf32 = c & 0x1f; - extra = 1; - } else if ((c & 0xf0) == 0xe0) { - utf32 = c & 0x0f; - extra = 2; - } else if ((c & 0xf8) == 0xf0) { - utf32 = c & 0x07; - extra = 3; - } else { - break; - } - for (i = 0; i < extra; i++) { - utf32 <<= 6; - c = (gpr_uint8)(*string++); - /* Breaks out and bail on any invalid UTF-8 sequence, including \0. */ - if ((c & 0xc0) != 0x80) { - valid = 0; - break; - } - utf32 |= c & 0x3f; - } - if (!valid) break; - /* The range 0xd800 - 0xdfff is reserved by the surrogates ad vitam. - * Any other range is technically reserved for future usage, so if we - * don't want the software to break in the future, we have to allow - * anything else. The first non-unicode character is 0x110000. */ - if (((utf32 >= 0xd800) && (utf32 <= 0xdfff)) || (utf32 >= 0x110000)) - break; - if (utf32 >= 0x10000) { - /* If utf32 contains a character that is above 0xffff, it needs to be - * broken down into a utf-16 surrogate pair. A surrogate pair is first - * a high surrogate, followed by a low surrogate. Each surrogate holds - * 10 bits of usable data, thus allowing a total of 20 bits of data. - * The high surrogate marker is 0xd800, while the low surrogate marker - * is 0xdc00. The low 10 bits of each will be the usable data. - * - * After re-combining the 20 bits of data, one has to add 0x10000 to - * the resulting value, in order to obtain the original character. - * This is obviously because the range 0x0000 - 0xffff can be written - * without any special trick. - * - * Since 0x10ffff is the highest allowed character, we're working in - * the range 0x00000 - 0xfffff after we decrement it by 0x10000. - * That range is exactly 20 bits. - */ - utf32 -= 0x10000; - json_writer_escape_utf16(writer, (gpr_uint16)(0xd800 | (utf32 >> 10))); - json_writer_escape_utf16(writer, - (gpr_uint16)(0xdc00 | (utf32 & 0x3ff))); - } else { - json_writer_escape_utf16(writer, (gpr_uint16)utf32); - } + for (;;) + { + gpr_uint8 c = (gpr_uint8) * string++; + if (c == 0) + { + break; + } + else if ((c >= 32) && (c <= 126)) + { + if ((c == '\\') || (c == '"')) + json_writer_output_char (writer, '\\'); + json_writer_output_char (writer, (char) c); + } + else if ((c < 32) || (c == 127)) + { + switch (c) + { + case '\b': + json_writer_output_string_with_len (writer, "\\b", 2); + break; + case '\f': + json_writer_output_string_with_len (writer, "\\f", 2); + break; + case '\n': + json_writer_output_string_with_len (writer, "\\n", 2); + break; + case '\r': + json_writer_output_string_with_len (writer, "\\r", 2); + break; + case '\t': + json_writer_output_string_with_len (writer, "\\t", 2); + break; + default: + json_writer_escape_utf16 (writer, c); + break; + } + } + else + { + gpr_uint32 utf32 = 0; + int extra = 0; + int i; + int valid = 1; + if ((c & 0xe0) == 0xc0) + { + utf32 = c & 0x1f; + extra = 1; + } + else if ((c & 0xf0) == 0xe0) + { + utf32 = c & 0x0f; + extra = 2; + } + else if ((c & 0xf8) == 0xf0) + { + utf32 = c & 0x07; + extra = 3; + } + else + { + break; + } + for (i = 0; i < extra; i++) + { + utf32 <<= 6; + c = (gpr_uint8) (*string++); + /* Breaks out and bail on any invalid UTF-8 sequence, including \0. */ + if ((c & 0xc0) != 0x80) + { + valid = 0; + break; + } + utf32 |= c & 0x3f; + } + if (!valid) + break; + /* The range 0xd800 - 0xdfff is reserved by the surrogates ad vitam. + * Any other range is technically reserved for future usage, so if we + * don't want the software to break in the future, we have to allow + * anything else. The first non-unicode character is 0x110000. */ + if (((utf32 >= 0xd800) && (utf32 <= 0xdfff)) || (utf32 >= 0x110000)) + break; + if (utf32 >= 0x10000) + { + /* If utf32 contains a character that is above 0xffff, it needs to be + * broken down into a utf-16 surrogate pair. A surrogate pair is first + * a high surrogate, followed by a low surrogate. Each surrogate holds + * 10 bits of usable data, thus allowing a total of 20 bits of data. + * The high surrogate marker is 0xd800, while the low surrogate marker + * is 0xdc00. The low 10 bits of each will be the usable data. + * + * After re-combining the 20 bits of data, one has to add 0x10000 to + * the resulting value, in order to obtain the original character. + * This is obviously because the range 0x0000 - 0xffff can be written + * without any special trick. + * + * Since 0x10ffff is the highest allowed character, we're working in + * the range 0x00000 - 0xfffff after we decrement it by 0x10000. + * That range is exactly 20 bits. + */ + utf32 -= 0x10000; + json_writer_escape_utf16 (writer, (gpr_uint16) (0xd800 | (utf32 >> 10))); + json_writer_escape_utf16 (writer, (gpr_uint16) (0xdc00 | (utf32 & 0x3ff))); + } + else + { + json_writer_escape_utf16 (writer, (gpr_uint16) utf32); + } + } } - } - json_writer_output_char(writer, '"'); + json_writer_output_char (writer, '"'); } -void grpc_json_writer_container_begins(grpc_json_writer* writer, - grpc_json_type type) { - if (!writer->got_key) json_writer_value_end(writer); - json_writer_output_indent(writer); - json_writer_output_char(writer, type == GRPC_JSON_OBJECT ? '{' : '['); +void +grpc_json_writer_container_begins (grpc_json_writer * writer, grpc_json_type type) +{ + if (!writer->got_key) + json_writer_value_end (writer); + json_writer_output_indent (writer); + json_writer_output_char (writer, type == GRPC_JSON_OBJECT ? '{' : '['); writer->container_empty = 1; writer->got_key = 0; writer->depth++; } -void grpc_json_writer_container_ends(grpc_json_writer* writer, - grpc_json_type type) { +void +grpc_json_writer_container_ends (grpc_json_writer * writer, grpc_json_type type) +{ if (writer->indent && !writer->container_empty) - json_writer_output_char(writer, '\n'); + json_writer_output_char (writer, '\n'); writer->depth--; - if (!writer->container_empty) json_writer_output_indent(writer); - json_writer_output_char(writer, type == GRPC_JSON_OBJECT ? '}' : ']'); + if (!writer->container_empty) + json_writer_output_indent (writer); + json_writer_output_char (writer, type == GRPC_JSON_OBJECT ? '}' : ']'); writer->container_empty = 0; writer->got_key = 0; } -void grpc_json_writer_object_key(grpc_json_writer* writer, const char* string) { - json_writer_value_end(writer); - json_writer_output_indent(writer); - json_writer_escape_string(writer, string); - json_writer_output_char(writer, ':'); +void +grpc_json_writer_object_key (grpc_json_writer * writer, const char *string) +{ + json_writer_value_end (writer); + json_writer_output_indent (writer); + json_writer_escape_string (writer, string); + json_writer_output_char (writer, ':'); writer->got_key = 1; } -void grpc_json_writer_value_raw(grpc_json_writer* writer, const char* string) { - if (!writer->got_key) json_writer_value_end(writer); - json_writer_output_indent(writer); - json_writer_output_string(writer, string); +void +grpc_json_writer_value_raw (grpc_json_writer * writer, const char *string) +{ + if (!writer->got_key) + json_writer_value_end (writer); + json_writer_output_indent (writer); + json_writer_output_string (writer, string); writer->got_key = 0; } -void grpc_json_writer_value_raw_with_len(grpc_json_writer* writer, - const char* string, size_t len) { - if (!writer->got_key) json_writer_value_end(writer); - json_writer_output_indent(writer); - json_writer_output_string_with_len(writer, string, len); +void +grpc_json_writer_value_raw_with_len (grpc_json_writer * writer, const char *string, size_t len) +{ + if (!writer->got_key) + json_writer_value_end (writer); + json_writer_output_indent (writer); + json_writer_output_string_with_len (writer, string, len); writer->got_key = 0; } -void grpc_json_writer_value_string(grpc_json_writer* writer, - const char* string) { - if (!writer->got_key) json_writer_value_end(writer); - json_writer_output_indent(writer); - json_writer_escape_string(writer, string); +void +grpc_json_writer_value_string (grpc_json_writer * writer, const char *string) +{ + if (!writer->got_key) + json_writer_value_end (writer); + json_writer_output_indent (writer); + json_writer_escape_string (writer, string); writer->got_key = 0; } diff --git a/src/core/json/json_writer.h b/src/core/json/json_writer.h index a299dfabf80..d7dfe2846f3 100644 --- a/src/core/json/json_writer.h +++ b/src/core/json/json_writer.h @@ -50,19 +50,21 @@ #include "src/core/json/json_common.h" -typedef struct grpc_json_writer_vtable { +typedef struct grpc_json_writer_vtable +{ /* Adds a character to the output stream. */ - void (*output_char)(void* userdata, char); + void (*output_char) (void *userdata, char); /* Adds a zero-terminated string to the output stream. */ - void (*output_string)(void* userdata, const char* str); + void (*output_string) (void *userdata, const char *str); /* Adds a fixed-length string to the output stream. */ - void (*output_string_with_len)(void* userdata, const char* str, size_t len); + void (*output_string_with_len) (void *userdata, const char *str, size_t len); } grpc_json_writer_vtable; -typedef struct grpc_json_writer { - void* userdata; - grpc_json_writer_vtable* vtable; +typedef struct grpc_json_writer +{ + void *userdata; + grpc_json_writer_vtable *vtable; int indent; int depth; int container_empty; @@ -74,24 +76,19 @@ typedef struct grpc_json_writer { * use indent=0, then the output will not have any newlines either, thus * emitting a condensed json output. */ -void grpc_json_writer_init(grpc_json_writer* writer, int indent, - grpc_json_writer_vtable* vtable, void* userdata); +void grpc_json_writer_init (grpc_json_writer * writer, int indent, grpc_json_writer_vtable * vtable, void *userdata); /* Signals the beginning of a container. */ -void grpc_json_writer_container_begins(grpc_json_writer* writer, - grpc_json_type type); +void grpc_json_writer_container_begins (grpc_json_writer * writer, grpc_json_type type); /* Signals the end of a container. */ -void grpc_json_writer_container_ends(grpc_json_writer* writer, - grpc_json_type type); +void grpc_json_writer_container_ends (grpc_json_writer * writer, grpc_json_type type); /* Writes down an object key for the next value. */ -void grpc_json_writer_object_key(grpc_json_writer* writer, const char* string); +void grpc_json_writer_object_key (grpc_json_writer * writer, const char *string); /* Sets a raw value. Useful for numbers. */ -void grpc_json_writer_value_raw(grpc_json_writer* writer, const char* string); +void grpc_json_writer_value_raw (grpc_json_writer * writer, const char *string); /* Sets a raw value with its length. Useful for values like true or false. */ -void grpc_json_writer_value_raw_with_len(grpc_json_writer* writer, - const char* string, size_t len); +void grpc_json_writer_value_raw_with_len (grpc_json_writer * writer, const char *string, size_t len); /* Sets a string value. It'll be escaped, and utf-8 validated. */ -void grpc_json_writer_value_string(grpc_json_writer* writer, - const char* string); +void grpc_json_writer_value_string (grpc_json_writer * writer, const char *string); #endif /* GRPC_INTERNAL_CORE_JSON_JSON_WRITER_H */ diff --git a/src/core/profiling/basic_timers.c b/src/core/profiling/basic_timers.c index 15e636d5d6e..d4506857b15 100644 --- a/src/core/profiling/basic_timers.c +++ b/src/core/profiling/basic_timers.c @@ -44,20 +44,22 @@ #include #include -typedef enum { +typedef enum +{ BEGIN = '{', END = '}', MARK = '.', IMPORTANT = '!' } marker_type; -typedef struct grpc_timer_entry { +typedef struct grpc_timer_entry +{ gpr_timespec tm; int tag; - const char* tagstr; + const char *tagstr; marker_type type; - void* id; - const char* file; + void *id; + const char *file; int line; } grpc_timer_entry; @@ -66,32 +68,34 @@ typedef struct grpc_timer_entry { static __thread grpc_timer_entry log[MAX_COUNT]; static __thread int count; -static void log_report() { +static void +log_report () +{ int i; - for (i = 0; i < count; i++) { - grpc_timer_entry* entry = &(log[i]); - printf("GRPC_LAT_PROF %ld.%09d %p %c %d(%s) %p %s %d\n", entry->tm.tv_sec, - entry->tm.tv_nsec, (void*)(gpr_intptr)gpr_thd_currentid(), - entry->type, entry->tag, entry->tagstr, entry->id, entry->file, - entry->line); - } + for (i = 0; i < count; i++) + { + grpc_timer_entry *entry = &(log[i]); + printf ("GRPC_LAT_PROF %ld.%09d %p %c %d(%s) %p %s %d\n", entry->tm.tv_sec, entry->tm.tv_nsec, (void *) (gpr_intptr) gpr_thd_currentid (), entry->type, entry->tag, entry->tagstr, entry->id, entry->file, entry->line); + } /* Now clear out the log */ count = 0; } -static void grpc_timers_log_add(int tag, const char* tagstr, marker_type type, - void* id, const char* file, int line) { - grpc_timer_entry* entry; +static void +grpc_timers_log_add (int tag, const char *tagstr, marker_type type, void *id, const char *file, int line) +{ + grpc_timer_entry *entry; /* TODO (vpai) : Improve concurrency */ - if (count == MAX_COUNT) { - log_report(); - } + if (count == MAX_COUNT) + { + log_report (); + } entry = &log[count++]; - entry->tm = gpr_now(GPR_CLOCK_PRECISE); + entry->tm = gpr_now (GPR_CLOCK_PRECISE); entry->tag = tag; entry->tagstr = tagstr; entry->type = type; @@ -101,40 +105,61 @@ static void grpc_timers_log_add(int tag, const char* tagstr, marker_type type, } /* Latency profiler API implementation. */ -void grpc_timer_add_mark(int tag, const char* tagstr, void* id, - const char* file, int line) { - if (tag < GRPC_PTAG_IGNORE_THRESHOLD) { - grpc_timers_log_add(tag, tagstr, MARK, id, file, line); - } +void +grpc_timer_add_mark (int tag, const char *tagstr, void *id, const char *file, int line) +{ + if (tag < GRPC_PTAG_IGNORE_THRESHOLD) + { + grpc_timers_log_add (tag, tagstr, MARK, id, file, line); + } } -void grpc_timer_add_important_mark(int tag, const char* tagstr, void* id, - const char* file, int line) { - if (tag < GRPC_PTAG_IGNORE_THRESHOLD) { - grpc_timers_log_add(tag, tagstr, IMPORTANT, id, file, line); - } +void +grpc_timer_add_important_mark (int tag, const char *tagstr, void *id, const char *file, int line) +{ + if (tag < GRPC_PTAG_IGNORE_THRESHOLD) + { + grpc_timers_log_add (tag, tagstr, IMPORTANT, id, file, line); + } } -void grpc_timer_begin(int tag, const char* tagstr, void* id, const char* file, - int line) { - if (tag < GRPC_PTAG_IGNORE_THRESHOLD) { - grpc_timers_log_add(tag, tagstr, BEGIN, id, file, line); - } +void +grpc_timer_begin (int tag, const char *tagstr, void *id, const char *file, int line) +{ + if (tag < GRPC_PTAG_IGNORE_THRESHOLD) + { + grpc_timers_log_add (tag, tagstr, BEGIN, id, file, line); + } } -void grpc_timer_end(int tag, const char* tagstr, void* id, const char* file, - int line) { - if (tag < GRPC_PTAG_IGNORE_THRESHOLD) { - grpc_timers_log_add(tag, tagstr, END, id, file, line); - } +void +grpc_timer_end (int tag, const char *tagstr, void *id, const char *file, int line) +{ + if (tag < GRPC_PTAG_IGNORE_THRESHOLD) + { + grpc_timers_log_add (tag, tagstr, END, id, file, line); + } } /* Basic profiler specific API functions. */ -void grpc_timers_global_init(void) {} +void +grpc_timers_global_init (void) +{ +} -void grpc_timers_global_destroy(void) {} +void +grpc_timers_global_destroy (void) +{ +} -#else /* !GRPC_BASIC_PROFILER */ -void grpc_timers_global_init(void) {} -void grpc_timers_global_destroy(void) {} +#else /* !GRPC_BASIC_PROFILER */ +void +grpc_timers_global_init (void) +{ +} + +void +grpc_timers_global_destroy (void) +{ +} #endif /* GRPC_BASIC_PROFILER */ diff --git a/src/core/profiling/stap_timers.c b/src/core/profiling/stap_timers.c index 99975163f93..f284e32433b 100644 --- a/src/core/profiling/stap_timers.c +++ b/src/core/profiling/stap_timers.c @@ -42,24 +42,28 @@ #include "src/core/profiling/stap_probes.h" /* Latency profiler API implementation. */ -void grpc_timer_add_mark(int tag, const char* tagstr, void* id, - const char* file, int line) { - _STAP_ADD_MARK(tag); +void +grpc_timer_add_mark (int tag, const char *tagstr, void *id, const char *file, int line) +{ + _STAP_ADD_MARK (tag); } -void grpc_timer_add_important_mark(int tag, const char* tagstr, void* id, - const char* file, int line) { - _STAP_ADD_IMPORTANT_MARK(tag); +void +grpc_timer_add_important_mark (int tag, const char *tagstr, void *id, const char *file, int line) +{ + _STAP_ADD_IMPORTANT_MARK (tag); } -void grpc_timer_begin(int tag, const char* tagstr, void* id, const char* file, - int line) { - _STAP_TIMING_NS_BEGIN(tag); +void +grpc_timer_begin (int tag, const char *tagstr, void *id, const char *file, int line) +{ + _STAP_TIMING_NS_BEGIN (tag); } -void grpc_timer_end(int tag, const char* tagstr, void* id, const char* file, - int line) { - _STAP_TIMING_NS_END(tag); +void +grpc_timer_end (int tag, const char *tagstr, void *id, const char *file, int line) +{ + _STAP_TIMING_NS_END (tag); } #endif /* GRPC_STAP_PROFILER */ diff --git a/src/core/profiling/timers.h b/src/core/profiling/timers.h index 92dbab90425..34929d8217b 100644 --- a/src/core/profiling/timers.h +++ b/src/core/profiling/timers.h @@ -35,51 +35,49 @@ #define GRPC_CORE_PROFILING_TIMERS_H #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif -void grpc_timers_global_init(void); -void grpc_timers_global_destroy(void); - -void grpc_timer_add_mark(int tag, const char *tagstr, void *id, - const char *file, int line); -void grpc_timer_add_important_mark(int tag, const char *tagstr, void *id, - const char *file, int line); -void grpc_timer_begin(int tag, const char *tagstr, void *id, const char *file, - int line); -void grpc_timer_end(int tag, const char *tagstr, void *id, const char *file, - int line); - -enum grpc_profiling_tags { - /* Any GRPC_PTAG_* >= than the threshold won't generate any profiling mark. */ - GRPC_PTAG_IGNORE_THRESHOLD = 1000000, - - /* Re. Protos. */ - GRPC_PTAG_PROTO_SERIALIZE = 100 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_PROTO_DESERIALIZE = 101 + GRPC_PTAG_IGNORE_THRESHOLD, - - /* Re. sockets. */ - GRPC_PTAG_HANDLE_READ = 200 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_SENDMSG = 201 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_RECVMSG = 202 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_POLL_FINISHED = 203 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_TCP_CB_WRITE = 204 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_TCP_WRITE = 205 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_CALL_ON_DONE_RECV = 206 + GRPC_PTAG_IGNORE_THRESHOLD, - - /* C++ */ - GRPC_PTAG_CPP_CALL_CREATED = 300 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_CPP_PERFORM_OPS = 301 + GRPC_PTAG_IGNORE_THRESHOLD, - - /* Transports */ - GRPC_PTAG_HTTP2_UNLOCK = 401 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_HTTP2_UNLOCK_CLEANUP = 402 + GRPC_PTAG_IGNORE_THRESHOLD, - - /* > 1024 Unassigned reserved. For any miscellaneous use. - * Use addition to generate tags from this base or take advantage of the 10 - * zero'd bits for OR-ing. */ - GRPC_PTAG_OTHER_BASE = 1024 -}; + void grpc_timers_global_init (void); + void grpc_timers_global_destroy (void); + + void grpc_timer_add_mark (int tag, const char *tagstr, void *id, const char *file, int line); + void grpc_timer_add_important_mark (int tag, const char *tagstr, void *id, const char *file, int line); + void grpc_timer_begin (int tag, const char *tagstr, void *id, const char *file, int line); + void grpc_timer_end (int tag, const char *tagstr, void *id, const char *file, int line); + + enum grpc_profiling_tags + { + /* Any GRPC_PTAG_* >= than the threshold won't generate any profiling mark. */ + GRPC_PTAG_IGNORE_THRESHOLD = 1000000, + + /* Re. Protos. */ + GRPC_PTAG_PROTO_SERIALIZE = 100 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_PROTO_DESERIALIZE = 101 + GRPC_PTAG_IGNORE_THRESHOLD, + + /* Re. sockets. */ + GRPC_PTAG_HANDLE_READ = 200 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_SENDMSG = 201 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_RECVMSG = 202 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_POLL_FINISHED = 203 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_TCP_CB_WRITE = 204 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_TCP_WRITE = 205 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_CALL_ON_DONE_RECV = 206 + GRPC_PTAG_IGNORE_THRESHOLD, + + /* C++ */ + GRPC_PTAG_CPP_CALL_CREATED = 300 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_CPP_PERFORM_OPS = 301 + GRPC_PTAG_IGNORE_THRESHOLD, + + /* Transports */ + GRPC_PTAG_HTTP2_UNLOCK = 401 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_HTTP2_UNLOCK_CLEANUP = 402 + GRPC_PTAG_IGNORE_THRESHOLD, + + /* > 1024 Unassigned reserved. For any miscellaneous use. + * Use addition to generate tags from this base or take advantage of the 10 + * zero'd bits for OR-ing. */ + GRPC_PTAG_OTHER_BASE = 1024 + }; #if !(defined(GRPC_STAP_PROFILER) + defined(GRPC_BASIC_PROFILER)) /* No profiling. No-op all the things. */ @@ -99,7 +97,7 @@ enum grpc_profiling_tags { do { \ } while (0) -#else /* at least one profiler requested... */ +#else /* at least one profiler requested... */ /* ... hopefully only one. */ #if defined(GRPC_STAP_PROFILER) && defined(GRPC_BASIC_PROFILER) #error "GRPC_STAP_PROFILER and GRPC_BASIC_PROFILER are mutually exclusive." @@ -131,16 +129,16 @@ enum grpc_profiling_tags { #ifdef GRPC_STAP_PROFILER /* Empty placeholder for now. */ -#endif /* GRPC_STAP_PROFILER */ +#endif /* GRPC_STAP_PROFILER */ #ifdef GRPC_BASIC_PROFILER /* Empty placeholder for now. */ -#endif /* GRPC_BASIC_PROFILER */ +#endif /* GRPC_BASIC_PROFILER */ -#endif /* at least one profiler requested. */ +#endif /* at least one profiler requested. */ #ifdef __cplusplus } #endif -#endif /* GRPC_CORE_PROFILING_TIMERS_H */ +#endif /* GRPC_CORE_PROFILING_TIMERS_H */ diff --git a/src/core/security/base64.c b/src/core/security/base64.c index 5226d2c5786..4d86da9453a 100644 --- a/src/core/security/base64.c +++ b/src/core/security/base64.c @@ -42,22 +42,21 @@ /* --- Constants. --- */ static const char base64_bytes[] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 0x3E, -1, -1, -1, 0x3F, - 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, -1, -1, - -1, 0x7F, -1, -1, -1, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, - 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, - 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, -1, -1, -1, -1, -1, - -1, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, - 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, - 0x31, 0x32, 0x33, -1, -1, -1, -1, -1}; - -static const char base64_url_unsafe_chars[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -static const char base64_url_safe_chars[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 0x3E, -1, -1, -1, 0x3F, + 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, -1, -1, + -1, 0x7F, -1, -1, -1, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, + 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, + 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, -1, -1, -1, -1, -1, + -1, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, + 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, + 0x31, 0x32, 0x33, -1, -1, -1, -1, -1 +}; + +static const char base64_url_unsafe_chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +static const char base64_url_safe_chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; #define GRPC_BASE64_PAD_CHAR '=' #define GRPC_BASE64_PAD_BYTE 0x7F @@ -66,168 +65,194 @@ static const char base64_url_safe_chars[] = /* --- base64 functions. --- */ -char *grpc_base64_encode(const void *vdata, size_t data_size, int url_safe, - int multiline) { +char * +grpc_base64_encode (const void *vdata, size_t data_size, int url_safe, int multiline) +{ const unsigned char *data = vdata; - const char *base64_chars = - url_safe ? base64_url_safe_chars : base64_url_unsafe_chars; - size_t result_projected_size = - 4 * ((data_size + 3) / 3) + - 2 * (multiline ? (data_size / (3 * GRPC_BASE64_MULTILINE_NUM_BLOCKS)) - : 0) + - 1; - char *result = gpr_malloc(result_projected_size); + const char *base64_chars = url_safe ? base64_url_safe_chars : base64_url_unsafe_chars; + size_t result_projected_size = 4 * ((data_size + 3) / 3) + 2 * (multiline ? (data_size / (3 * GRPC_BASE64_MULTILINE_NUM_BLOCKS)) : 0) + 1; + char *result = gpr_malloc (result_projected_size); char *current = result; size_t num_blocks = 0; size_t i = 0; /* Encode each block. */ - while (data_size >= 3) { - *current++ = base64_chars[(data[i] >> 2) & 0x3F]; - *current++ = - base64_chars[((data[i] & 0x03) << 4) | ((data[i + 1] >> 4) & 0x0F)]; - *current++ = - base64_chars[((data[i + 1] & 0x0F) << 2) | ((data[i + 2] >> 6) & 0x03)]; - *current++ = base64_chars[data[i + 2] & 0x3F]; - - data_size -= 3; - i += 3; - if (multiline && (++num_blocks == GRPC_BASE64_MULTILINE_NUM_BLOCKS)) { - *current++ = '\r'; - *current++ = '\n'; - num_blocks = 0; + while (data_size >= 3) + { + *current++ = base64_chars[(data[i] >> 2) & 0x3F]; + *current++ = base64_chars[((data[i] & 0x03) << 4) | ((data[i + 1] >> 4) & 0x0F)]; + *current++ = base64_chars[((data[i + 1] & 0x0F) << 2) | ((data[i + 2] >> 6) & 0x03)]; + *current++ = base64_chars[data[i + 2] & 0x3F]; + + data_size -= 3; + i += 3; + if (multiline && (++num_blocks == GRPC_BASE64_MULTILINE_NUM_BLOCKS)) + { + *current++ = '\r'; + *current++ = '\n'; + num_blocks = 0; + } } - } /* Take care of the tail. */ - if (data_size == 2) { - *current++ = base64_chars[(data[i] >> 2) & 0x3F]; - *current++ = - base64_chars[((data[i] & 0x03) << 4) | ((data[i + 1] >> 4) & 0x0F)]; - *current++ = base64_chars[(data[i + 1] & 0x0F) << 2]; - *current++ = GRPC_BASE64_PAD_CHAR; - } else if (data_size == 1) { - *current++ = base64_chars[(data[i] >> 2) & 0x3F]; - *current++ = base64_chars[(data[i] & 0x03) << 4]; - *current++ = GRPC_BASE64_PAD_CHAR; - *current++ = GRPC_BASE64_PAD_CHAR; - } - - GPR_ASSERT(current >= result); - GPR_ASSERT((gpr_uintptr)(current - result) < result_projected_size); + if (data_size == 2) + { + *current++ = base64_chars[(data[i] >> 2) & 0x3F]; + *current++ = base64_chars[((data[i] & 0x03) << 4) | ((data[i + 1] >> 4) & 0x0F)]; + *current++ = base64_chars[(data[i + 1] & 0x0F) << 2]; + *current++ = GRPC_BASE64_PAD_CHAR; + } + else if (data_size == 1) + { + *current++ = base64_chars[(data[i] >> 2) & 0x3F]; + *current++ = base64_chars[(data[i] & 0x03) << 4]; + *current++ = GRPC_BASE64_PAD_CHAR; + *current++ = GRPC_BASE64_PAD_CHAR; + } + + GPR_ASSERT (current >= result); + GPR_ASSERT ((gpr_uintptr) (current - result) < result_projected_size); result[current - result] = '\0'; return result; } -gpr_slice grpc_base64_decode(const char *b64, int url_safe) { - return grpc_base64_decode_with_len(b64, strlen(b64), url_safe); +gpr_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, - size_t *result_offset) { - gpr_uint32 packed = ((gpr_uint32)codes[0] << 2) | ((gpr_uint32)codes[1] >> 4); - result[(*result_offset)++] = (unsigned char)packed; +static void +decode_one_char (const unsigned char *codes, unsigned char *result, size_t * result_offset) +{ + gpr_uint32 packed = ((gpr_uint32) codes[0] << 2) | ((gpr_uint32) codes[1] >> 4); + result[(*result_offset)++] = (unsigned char) packed; } -static void decode_two_chars(const unsigned char *codes, unsigned char *result, - size_t *result_offset) { - gpr_uint32 packed = ((gpr_uint32)codes[0] << 10) | - ((gpr_uint32)codes[1] << 4) | ((gpr_uint32)codes[2] >> 2); - result[(*result_offset)++] = (unsigned char)(packed >> 8); - result[(*result_offset)++] = (unsigned char)(packed); +static void +decode_two_chars (const unsigned char *codes, unsigned char *result, size_t * result_offset) +{ + gpr_uint32 packed = ((gpr_uint32) codes[0] << 10) | ((gpr_uint32) codes[1] << 4) | ((gpr_uint32) codes[2] >> 2); + result[(*result_offset)++] = (unsigned char) (packed >> 8); + result[(*result_offset)++] = (unsigned char) (packed); } -static int decode_group(const unsigned char *codes, size_t num_codes, - unsigned char *result, size_t *result_offset) { - GPR_ASSERT(num_codes <= 4); +static int +decode_group (const unsigned char *codes, size_t num_codes, unsigned char *result, size_t * result_offset) +{ + GPR_ASSERT (num_codes <= 4); /* Short end groups that may not have padding. */ - if (num_codes == 1) { - gpr_log(GPR_ERROR, "Invalid group. Must be at least 2 bytes."); - return 0; - } - if (num_codes == 2) { - decode_one_char(codes, result, result_offset); - return 1; - } - if (num_codes == 3) { - decode_two_chars(codes, result, result_offset); - return 1; - } + if (num_codes == 1) + { + gpr_log (GPR_ERROR, "Invalid group. Must be at least 2 bytes."); + return 0; + } + if (num_codes == 2) + { + decode_one_char (codes, result, result_offset); + return 1; + } + if (num_codes == 3) + { + decode_two_chars (codes, result, result_offset); + return 1; + } /* Regular 4 byte groups with padding or not. */ - GPR_ASSERT(num_codes == 4); - if (codes[0] == GRPC_BASE64_PAD_BYTE || codes[1] == GRPC_BASE64_PAD_BYTE) { - gpr_log(GPR_ERROR, "Invalid padding detected."); - return 0; - } - if (codes[2] == GRPC_BASE64_PAD_BYTE) { - if (codes[3] == GRPC_BASE64_PAD_BYTE) { - decode_one_char(codes, result, result_offset); - } else { - gpr_log(GPR_ERROR, "Invalid padding detected."); + GPR_ASSERT (num_codes == 4); + if (codes[0] == GRPC_BASE64_PAD_BYTE || codes[1] == GRPC_BASE64_PAD_BYTE) + { + gpr_log (GPR_ERROR, "Invalid padding detected."); return 0; } - } else if (codes[3] == GRPC_BASE64_PAD_BYTE) { - decode_two_chars(codes, result, result_offset); - } else { - /* No padding. */ - gpr_uint32 packed = ((gpr_uint32)codes[0] << 18) | - ((gpr_uint32)codes[1] << 12) | - ((gpr_uint32)codes[2] << 6) | codes[3]; - result[(*result_offset)++] = (unsigned char)(packed >> 16); - result[(*result_offset)++] = (unsigned char)(packed >> 8); - result[(*result_offset)++] = (unsigned char)(packed); - } + if (codes[2] == GRPC_BASE64_PAD_BYTE) + { + if (codes[3] == GRPC_BASE64_PAD_BYTE) + { + decode_one_char (codes, result, result_offset); + } + else + { + gpr_log (GPR_ERROR, "Invalid padding detected."); + return 0; + } + } + else if (codes[3] == GRPC_BASE64_PAD_BYTE) + { + decode_two_chars (codes, result, result_offset); + } + else + { + /* No padding. */ + gpr_uint32 packed = ((gpr_uint32) codes[0] << 18) | ((gpr_uint32) codes[1] << 12) | ((gpr_uint32) codes[2] << 6) | codes[3]; + result[(*result_offset)++] = (unsigned char) (packed >> 16); + result[(*result_offset)++] = (unsigned char) (packed >> 8); + result[(*result_offset)++] = (unsigned char) (packed); + } return 1; } -gpr_slice grpc_base64_decode_with_len(const char *b64, size_t b64_len, - int url_safe) { - gpr_slice result = gpr_slice_malloc(b64_len); - unsigned char *current = GPR_SLICE_START_PTR(result); +gpr_slice +grpc_base64_decode_with_len (const char *b64, size_t b64_len, int url_safe) +{ + gpr_slice result = gpr_slice_malloc (b64_len); + unsigned char *current = GPR_SLICE_START_PTR (result); size_t result_size = 0; unsigned char codes[4]; size_t num_codes = 0; - while (b64_len--) { - unsigned char c = (unsigned char)(*b64++); - signed char code; - if (c >= GPR_ARRAY_SIZE(base64_bytes)) continue; - if (url_safe) { - if (c == '+' || c == '/') { - gpr_log(GPR_ERROR, "Invalid character for url safe base64 %c", c); - goto fail; - } - if (c == '-') { - c = '+'; - } else if (c == '_') { - c = '/'; - } - } - code = base64_bytes[c]; - if (code == -1) { - if (c != '\r' && c != '\n') { - gpr_log(GPR_ERROR, "Invalid character %c", c); - goto fail; - } - } else { - codes[num_codes++] = (unsigned char)code; - if (num_codes == 4) { - if (!decode_group(codes, num_codes, current, &result_size)) goto fail; - num_codes = 0; - } + while (b64_len--) + { + unsigned char c = (unsigned char) (*b64++); + signed char code; + if (c >= GPR_ARRAY_SIZE (base64_bytes)) + continue; + if (url_safe) + { + if (c == '+' || c == '/') + { + gpr_log (GPR_ERROR, "Invalid character for url safe base64 %c", c); + goto fail; + } + if (c == '-') + { + c = '+'; + } + else if (c == '_') + { + c = '/'; + } + } + code = base64_bytes[c]; + if (code == -1) + { + if (c != '\r' && c != '\n') + { + gpr_log (GPR_ERROR, "Invalid character %c", c); + goto fail; + } + } + else + { + codes[num_codes++] = (unsigned char) code; + if (num_codes == 4) + { + if (!decode_group (codes, num_codes, current, &result_size)) + goto fail; + num_codes = 0; + } + } } - } - if (num_codes != 0 && - !decode_group(codes, num_codes, current, &result_size)) { - goto fail; - } - GPR_SLICE_SET_LENGTH(result, result_size); + if (num_codes != 0 && !decode_group (codes, num_codes, current, &result_size)) + { + goto fail; + } + GPR_SLICE_SET_LENGTH (result, result_size); return result; fail: - gpr_slice_unref(result); - return gpr_empty_slice(); + gpr_slice_unref (result); + return gpr_empty_slice (); } diff --git a/src/core/security/base64.h b/src/core/security/base64.h index 31ae982691a..9d4b44c4b0e 100644 --- a/src/core/security/base64.h +++ b/src/core/security/base64.h @@ -38,15 +38,13 @@ /* Encodes data using base64. It is the caller's responsability to free the returned char * using gpr_free. Returns NULL on NULL input. */ -char *grpc_base64_encode(const void *data, size_t data_size, int url_safe, - int multiline); +char *grpc_base64_encode (const void *data, size_t data_size, int url_safe, int multiline); /* Decodes data according to the base64 specification. Returns an empty slice in case of failure. */ -gpr_slice grpc_base64_decode(const char *b64, int url_safe); +gpr_slice grpc_base64_decode (const char *b64, int url_safe); /* Same as above except that the length is provided by the caller. */ -gpr_slice grpc_base64_decode_with_len(const char *b64, size_t b64_len, - int url_safe); +gpr_slice grpc_base64_decode_with_len (const char *b64, size_t b64_len, int url_safe); #endif /* GRPC_INTERNAL_CORE_SECURITY_BASE64_H */ diff --git a/src/core/security/client_auth_filter.c b/src/core/security/client_auth_filter.c index 5955b84962a..660ef713fab 100644 --- a/src/core/security/client_auth_filter.c +++ b/src/core/security/client_auth_filter.c @@ -49,7 +49,8 @@ #define MAX_CREDENTIALS_METADATA_COUNT 4 /* We can have a per-call credentials. */ -typedef struct { +typedef struct +{ grpc_credentials *creds; grpc_mdstr *host; grpc_mdstr *method; @@ -67,7 +68,8 @@ typedef struct { } call_data; /* We can have a per-channel credentials. */ -typedef struct { +typedef struct +{ grpc_channel_security_connector *security_connector; grpc_mdctx *md_ctx; grpc_mdstr *authority_string; @@ -76,129 +78,130 @@ typedef struct { grpc_mdstr *status_key; } channel_data; -static void reset_service_url(call_data *calld) { - if (calld->service_url != NULL) { - gpr_free(calld->service_url); - calld->service_url = NULL; - } +static void +reset_service_url (call_data * calld) +{ + if (calld->service_url != NULL) + { + gpr_free (calld->service_url); + calld->service_url = NULL; + } } -static void bubble_up_error(grpc_call_element *elem, grpc_status_code status, - const char *error_msg, - grpc_closure_list *closure_list) { +static void +bubble_up_error (grpc_call_element * elem, grpc_status_code status, const char *error_msg, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; - gpr_log(GPR_ERROR, "Client side authentication failure: %s", error_msg); - grpc_transport_stream_op_add_cancellation(&calld->op, status); - grpc_call_next_op(elem, &calld->op, closure_list); + gpr_log (GPR_ERROR, "Client side authentication failure: %s", error_msg); + grpc_transport_stream_op_add_cancellation (&calld->op, status); + grpc_call_next_op (elem, &calld->op, closure_list); } -static void on_credentials_metadata(void *user_data, - grpc_credentials_md *md_elems, - size_t num_md, - grpc_credentials_status status, - grpc_closure_list *closure_list) { - grpc_call_element *elem = (grpc_call_element *)user_data; +static void +on_credentials_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +{ + grpc_call_element *elem = (grpc_call_element *) user_data; call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_transport_stream_op *op = &calld->op; grpc_metadata_batch *mdb; size_t i; - reset_service_url(calld); - if (status != GRPC_CREDENTIALS_OK) { - bubble_up_error(elem, GRPC_STATUS_UNAUTHENTICATED, - "Credentials failed to get metadata.", closure_list); - return; - } - GPR_ASSERT(num_md <= MAX_CREDENTIALS_METADATA_COUNT); - GPR_ASSERT(op->send_ops && op->send_ops->nops > calld->op_md_idx && - op->send_ops->ops[calld->op_md_idx].type == GRPC_OP_METADATA); + reset_service_url (calld); + if (status != GRPC_CREDENTIALS_OK) + { + bubble_up_error (elem, GRPC_STATUS_UNAUTHENTICATED, "Credentials failed to get metadata.", closure_list); + return; + } + GPR_ASSERT (num_md <= MAX_CREDENTIALS_METADATA_COUNT); + GPR_ASSERT (op->send_ops && op->send_ops->nops > calld->op_md_idx && op->send_ops->ops[calld->op_md_idx].type == GRPC_OP_METADATA); mdb = &op->send_ops->ops[calld->op_md_idx].data.metadata; - for (i = 0; i < num_md; i++) { - grpc_metadata_batch_add_tail( - mdb, &calld->md_links[i], - grpc_mdelem_from_slices(chand->md_ctx, gpr_slice_ref(md_elems[i].key), - gpr_slice_ref(md_elems[i].value))); - } - grpc_call_next_op(elem, op, closure_list); + for (i = 0; i < num_md; i++) + { + grpc_metadata_batch_add_tail (mdb, &calld->md_links[i], grpc_mdelem_from_slices (chand->md_ctx, gpr_slice_ref (md_elems[i].key), gpr_slice_ref (md_elems[i].value))); + } + grpc_call_next_op (elem, op, closure_list); } -void build_service_url(const char *url_scheme, call_data *calld) { - char *service = gpr_strdup(grpc_mdstr_as_c_string(calld->method)); - char *last_slash = strrchr(service, '/'); - if (last_slash == NULL) { - gpr_log(GPR_ERROR, "No '/' found in fully qualified method name"); - service[0] = '\0'; - } else if (last_slash == service) { - /* No service part in fully qualified method name: will just be "/". */ - service[1] = '\0'; - } else { - *last_slash = '\0'; - } - if (url_scheme == NULL) url_scheme = ""; - reset_service_url(calld); - gpr_asprintf(&calld->service_url, "%s://%s%s", url_scheme, - grpc_mdstr_as_c_string(calld->host), service); - gpr_free(service); +void +build_service_url (const char *url_scheme, call_data * calld) +{ + char *service = gpr_strdup (grpc_mdstr_as_c_string (calld->method)); + char *last_slash = strrchr (service, '/'); + if (last_slash == NULL) + { + gpr_log (GPR_ERROR, "No '/' found in fully qualified method name"); + service[0] = '\0'; + } + else if (last_slash == service) + { + /* No service part in fully qualified method name: will just be "/". */ + service[1] = '\0'; + } + else + { + *last_slash = '\0'; + } + if (url_scheme == NULL) + url_scheme = ""; + reset_service_url (calld); + gpr_asprintf (&calld->service_url, "%s://%s%s", url_scheme, grpc_mdstr_as_c_string (calld->host), service); + gpr_free (service); } -static void send_security_metadata(grpc_call_element *elem, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { +static void +send_security_metadata (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - grpc_client_security_context *ctx = - (grpc_client_security_context *)op->context[GRPC_CONTEXT_SECURITY].value; - grpc_credentials *channel_creds = - chand->security_connector->request_metadata_creds; - int channel_creds_has_md = - (channel_creds != NULL) && - grpc_credentials_has_request_metadata(channel_creds); - int call_creds_has_md = (ctx != NULL) && (ctx->creds != NULL) && - grpc_credentials_has_request_metadata(ctx->creds); - - if (!channel_creds_has_md && !call_creds_has_md) { - /* Skip sending metadata altogether. */ - grpc_call_next_op(elem, op, closure_list); - return; - } + grpc_client_security_context *ctx = (grpc_client_security_context *) op->context[GRPC_CONTEXT_SECURITY].value; + grpc_credentials *channel_creds = chand->security_connector->request_metadata_creds; + int channel_creds_has_md = (channel_creds != NULL) && grpc_credentials_has_request_metadata (channel_creds); + int call_creds_has_md = (ctx != NULL) && (ctx->creds != NULL) && grpc_credentials_has_request_metadata (ctx->creds); - if (channel_creds_has_md && call_creds_has_md) { - calld->creds = - grpc_composite_credentials_create(channel_creds, ctx->creds, NULL); - if (calld->creds == NULL) { - bubble_up_error(elem, GRPC_STATUS_INVALID_ARGUMENT, - "Incompatible credentials set on channel and call.", - closure_list); + if (!channel_creds_has_md && !call_creds_has_md) + { + /* Skip sending metadata altogether. */ + grpc_call_next_op (elem, op, closure_list); return; } - } else { - calld->creds = - grpc_credentials_ref(call_creds_has_md ? ctx->creds : channel_creds); - } - build_service_url(chand->security_connector->base.url_scheme, calld); - calld->op = *op; /* Copy op (originates from the caller's stack). */ - GPR_ASSERT(calld->pollset); - grpc_credentials_get_request_metadata( - calld->creds, calld->pollset, calld->service_url, on_credentials_metadata, - elem, closure_list); + if (channel_creds_has_md && call_creds_has_md) + { + calld->creds = grpc_composite_credentials_create (channel_creds, ctx->creds, NULL); + if (calld->creds == NULL) + { + bubble_up_error (elem, GRPC_STATUS_INVALID_ARGUMENT, "Incompatible credentials set on channel and call.", closure_list); + return; + } + } + else + { + calld->creds = grpc_credentials_ref (call_creds_has_md ? ctx->creds : channel_creds); + } + + build_service_url (chand->security_connector->base.url_scheme, calld); + calld->op = *op; /* Copy op (originates from the caller's stack). */ + GPR_ASSERT (calld->pollset); + grpc_credentials_get_request_metadata (calld->creds, calld->pollset, calld->service_url, on_credentials_metadata, elem, closure_list); } -static void on_host_checked(void *user_data, grpc_security_status status, - grpc_closure_list *closure_list) { - grpc_call_element *elem = (grpc_call_element *)user_data; +static void +on_host_checked (void *user_data, grpc_security_status status, grpc_closure_list * closure_list) +{ + grpc_call_element *elem = (grpc_call_element *) user_data; call_data *calld = elem->call_data; - if (status == GRPC_SECURITY_OK) { - send_security_metadata(elem, &calld->op, closure_list); - } else { - char *error_msg; - gpr_asprintf(&error_msg, "Invalid host %s set in :authority metadata.", - grpc_mdstr_as_c_string(calld->host)); - bubble_up_error(elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg, - closure_list); - gpr_free(error_msg); - } + if (status == GRPC_SECURITY_OK) + { + send_security_metadata (elem, &calld->op, closure_list); + } + else + { + char *error_msg; + gpr_asprintf (&error_msg, "Invalid host %s set in :authority metadata.", grpc_mdstr_as_c_string (calld->host)); + bubble_up_error (elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg, closure_list); + gpr_free (error_msg); + } } /* Called either: @@ -206,9 +209,9 @@ static void on_host_checked(void *user_data, grpc_security_status status, - a network event (or similar) from below, to receive something op contains type and call direction information, in addition to the data that is being sent or received. */ -static void auth_start_transport_op(grpc_call_element *elem, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { +static void +auth_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -216,152 +219,162 @@ static void auth_start_transport_op(grpc_call_element *elem, size_t i; grpc_client_security_context *sec_ctx = NULL; - if (calld->security_context_set == 0) { - calld->security_context_set = 1; - GPR_ASSERT(op->context); - if (op->context[GRPC_CONTEXT_SECURITY].value == NULL) { - op->context[GRPC_CONTEXT_SECURITY].value = - grpc_client_security_context_create(); - op->context[GRPC_CONTEXT_SECURITY].destroy = - grpc_client_security_context_destroy; + if (calld->security_context_set == 0) + { + calld->security_context_set = 1; + GPR_ASSERT (op->context); + if (op->context[GRPC_CONTEXT_SECURITY].value == NULL) + { + op->context[GRPC_CONTEXT_SECURITY].value = grpc_client_security_context_create (); + op->context[GRPC_CONTEXT_SECURITY].destroy = grpc_client_security_context_destroy; + } + sec_ctx = op->context[GRPC_CONTEXT_SECURITY].value; + GRPC_AUTH_CONTEXT_UNREF (sec_ctx->auth_context, "client auth filter"); + sec_ctx->auth_context = GRPC_AUTH_CONTEXT_REF (chand->security_connector->base.auth_context, "client_auth_filter"); } - sec_ctx = op->context[GRPC_CONTEXT_SECURITY].value; - GRPC_AUTH_CONTEXT_UNREF(sec_ctx->auth_context, "client auth filter"); - sec_ctx->auth_context = GRPC_AUTH_CONTEXT_REF( - chand->security_connector->base.auth_context, "client_auth_filter"); - } - if (op->bind_pollset) { - calld->pollset = op->bind_pollset; - } + if (op->bind_pollset) + { + calld->pollset = op->bind_pollset; + } - if (op->send_ops && !calld->sent_initial_metadata) { - size_t nops = op->send_ops->nops; - grpc_stream_op *ops = op->send_ops->ops; - for (i = 0; i < nops; i++) { - grpc_stream_op *sop = &ops[i]; - if (sop->type != GRPC_OP_METADATA) continue; - calld->op_md_idx = i; - calld->sent_initial_metadata = 1; - for (l = sop->data.metadata.list.head; l != NULL; l = l->next) { - grpc_mdelem *md = l->md; - /* Pointer comparison is OK for md_elems created from the same context. - */ - if (md->key == chand->authority_string) { - if (calld->host != NULL) GRPC_MDSTR_UNREF(calld->host); - calld->host = GRPC_MDSTR_REF(md->value); - } else if (md->key == chand->path_string) { - if (calld->method != NULL) GRPC_MDSTR_UNREF(calld->method); - calld->method = GRPC_MDSTR_REF(md->value); - } - } - if (calld->host != NULL) { - grpc_security_status status; - const char *call_host = grpc_mdstr_as_c_string(calld->host); - calld->op = *op; /* Copy op (originates from the caller's stack). */ - status = grpc_channel_security_connector_check_call_host( - chand->security_connector, call_host, on_host_checked, elem, - closure_list); - if (status != GRPC_SECURITY_OK) { - if (status == GRPC_SECURITY_ERROR) { - char *error_msg; - gpr_asprintf(&error_msg, - "Invalid host %s set in :authority metadata.", - call_host); - bubble_up_error(elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg, - closure_list); - gpr_free(error_msg); - } - return; /* early exit */ - } - } - send_security_metadata(elem, op, closure_list); - return; /* early exit */ + if (op->send_ops && !calld->sent_initial_metadata) + { + size_t nops = op->send_ops->nops; + grpc_stream_op *ops = op->send_ops->ops; + for (i = 0; i < nops; i++) + { + grpc_stream_op *sop = &ops[i]; + if (sop->type != GRPC_OP_METADATA) + continue; + calld->op_md_idx = i; + calld->sent_initial_metadata = 1; + for (l = sop->data.metadata.list.head; l != NULL; l = l->next) + { + grpc_mdelem *md = l->md; + /* Pointer comparison is OK for md_elems created from the same context. + */ + if (md->key == chand->authority_string) + { + if (calld->host != NULL) + GRPC_MDSTR_UNREF (calld->host); + calld->host = GRPC_MDSTR_REF (md->value); + } + else if (md->key == chand->path_string) + { + if (calld->method != NULL) + GRPC_MDSTR_UNREF (calld->method); + calld->method = GRPC_MDSTR_REF (md->value); + } + } + if (calld->host != NULL) + { + grpc_security_status status; + const char *call_host = grpc_mdstr_as_c_string (calld->host); + calld->op = *op; /* Copy op (originates from the caller's stack). */ + status = grpc_channel_security_connector_check_call_host (chand->security_connector, call_host, on_host_checked, elem, closure_list); + if (status != GRPC_SECURITY_OK) + { + if (status == GRPC_SECURITY_ERROR) + { + char *error_msg; + gpr_asprintf (&error_msg, "Invalid host %s set in :authority metadata.", call_host); + bubble_up_error (elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg, closure_list); + gpr_free (error_msg); + } + return; /* early exit */ + } + } + send_security_metadata (elem, op, closure_list); + return; /* early exit */ + } } - } /* pass control down the stack */ - grpc_call_next_op(elem, op, closure_list); + grpc_call_next_op (elem, op, closure_list); } /* Constructor for call_data */ -static void init_call_elem(grpc_call_element *elem, - const void *server_transport_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list) { +static void +init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; - memset(calld, 0, sizeof(*calld)); - GPR_ASSERT(!initial_op || !initial_op->send_ops); + memset (calld, 0, sizeof (*calld)); + GPR_ASSERT (!initial_op || !initial_op->send_ops); } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element *elem, - grpc_closure_list *closure_list) { +static void +destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; - grpc_credentials_unref(calld->creds); - if (calld->host != NULL) { - GRPC_MDSTR_UNREF(calld->host); - } - if (calld->method != NULL) { - GRPC_MDSTR_UNREF(calld->method); - } - reset_service_url(calld); + grpc_credentials_unref (calld->creds); + if (calld->host != NULL) + { + GRPC_MDSTR_UNREF (calld->host); + } + if (calld->method != NULL) + { + GRPC_MDSTR_UNREF (calld->method); + } + reset_service_url (calld); } /* Constructor for channel_data */ -static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, - const grpc_channel_args *args, - grpc_mdctx *metadata_context, int is_first, - int is_last, grpc_closure_list *closure_list) { - grpc_security_connector *sc = grpc_find_security_connector_in_args(args); +static void +init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last, grpc_closure_list * closure_list) +{ + grpc_security_connector *sc = grpc_find_security_connector_in_args (args); /* grab pointers to our data from the channel element */ channel_data *chand = elem->channel_data; /* The first and the last filters tend to be implemented differently to handle the case that there's no 'next' filter to call on the up or down path */ - GPR_ASSERT(!is_last); - GPR_ASSERT(sc != NULL); + GPR_ASSERT (!is_last); + GPR_ASSERT (sc != NULL); /* initialize members */ - GPR_ASSERT(sc->is_client_side); - chand->security_connector = - (grpc_channel_security_connector *)GRPC_SECURITY_CONNECTOR_REF( - sc, "client_auth_filter"); + GPR_ASSERT (sc->is_client_side); + chand->security_connector = (grpc_channel_security_connector *) GRPC_SECURITY_CONNECTOR_REF (sc, "client_auth_filter"); chand->md_ctx = metadata_context; - chand->authority_string = - grpc_mdstr_from_string(chand->md_ctx, ":authority", 0); - chand->path_string = grpc_mdstr_from_string(chand->md_ctx, ":path", 0); - chand->error_msg_key = - grpc_mdstr_from_string(chand->md_ctx, "grpc-message", 0); - chand->status_key = grpc_mdstr_from_string(chand->md_ctx, "grpc-status", 0); + chand->authority_string = grpc_mdstr_from_string (chand->md_ctx, ":authority", 0); + chand->path_string = grpc_mdstr_from_string (chand->md_ctx, ":path", 0); + chand->error_msg_key = grpc_mdstr_from_string (chand->md_ctx, "grpc-message", 0); + chand->status_key = grpc_mdstr_from_string (chand->md_ctx, "grpc-status", 0); } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element *elem, - grpc_closure_list *closure_list) { +static void +destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +{ /* grab pointers to our data from the channel element */ channel_data *chand = elem->channel_data; grpc_channel_security_connector *ctx = chand->security_connector; if (ctx != NULL) - GRPC_SECURITY_CONNECTOR_UNREF(&ctx->base, "client_auth_filter"); - if (chand->authority_string != NULL) { - GRPC_MDSTR_UNREF(chand->authority_string); - } - if (chand->error_msg_key != NULL) { - GRPC_MDSTR_UNREF(chand->error_msg_key); - } - if (chand->status_key != NULL) { - GRPC_MDSTR_UNREF(chand->status_key); - } - if (chand->path_string != NULL) { - GRPC_MDSTR_UNREF(chand->path_string); - } + GRPC_SECURITY_CONNECTOR_UNREF (&ctx->base, "client_auth_filter"); + if (chand->authority_string != NULL) + { + GRPC_MDSTR_UNREF (chand->authority_string); + } + if (chand->error_msg_key != NULL) + { + GRPC_MDSTR_UNREF (chand->error_msg_key); + } + if (chand->status_key != NULL) + { + GRPC_MDSTR_UNREF (chand->status_key); + } + if (chand->path_string != NULL) + { + GRPC_MDSTR_UNREF (chand->path_string); + } } const grpc_channel_filter grpc_client_auth_filter = { - auth_start_transport_op, grpc_channel_next_op, - sizeof(call_data), init_call_elem, - destroy_call_elem, sizeof(channel_data), - init_channel_elem, destroy_channel_elem, - grpc_call_next_get_peer, "client-auth"}; + auth_start_transport_op, grpc_channel_next_op, + sizeof (call_data), init_call_elem, + destroy_call_elem, sizeof (channel_data), + init_channel_elem, destroy_channel_elem, + grpc_call_next_get_peer, "client-auth" +}; diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index abfaa5eb180..ade70dddbcd 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -52,873 +52,935 @@ /* -- Common. -- */ -struct grpc_credentials_metadata_request { +struct grpc_credentials_metadata_request +{ grpc_credentials *creds; grpc_credentials_metadata_cb cb; void *user_data; }; static grpc_credentials_metadata_request * -grpc_credentials_metadata_request_create(grpc_credentials *creds, - grpc_credentials_metadata_cb cb, - void *user_data) { - grpc_credentials_metadata_request *r = - gpr_malloc(sizeof(grpc_credentials_metadata_request)); - r->creds = grpc_credentials_ref(creds); +grpc_credentials_metadata_request_create (grpc_credentials * creds, grpc_credentials_metadata_cb cb, void *user_data) +{ + grpc_credentials_metadata_request *r = gpr_malloc (sizeof (grpc_credentials_metadata_request)); + r->creds = grpc_credentials_ref (creds); r->cb = cb; r->user_data = user_data; return r; } -static void grpc_credentials_metadata_request_destroy( - grpc_credentials_metadata_request *r) { - grpc_credentials_unref(r->creds); - gpr_free(r); +static void +grpc_credentials_metadata_request_destroy (grpc_credentials_metadata_request * r) +{ + grpc_credentials_unref (r->creds); + gpr_free (r); } -grpc_credentials *grpc_credentials_ref(grpc_credentials *creds) { - if (creds == NULL) return NULL; - gpr_ref(&creds->refcount); +grpc_credentials * +grpc_credentials_ref (grpc_credentials * creds) +{ + if (creds == NULL) + return NULL; + gpr_ref (&creds->refcount); return creds; } -void grpc_credentials_unref(grpc_credentials *creds) { - if (creds == NULL) return; - if (gpr_unref(&creds->refcount)) { - creds->vtable->destruct(creds); - gpr_free(creds); - } +void +grpc_credentials_unref (grpc_credentials * creds) +{ + if (creds == NULL) + return; + if (gpr_unref (&creds->refcount)) + { + creds->vtable->destruct (creds); + gpr_free (creds); + } } -void grpc_credentials_release(grpc_credentials *creds) { - grpc_credentials_unref(creds); +void +grpc_credentials_release (grpc_credentials * creds) +{ + grpc_credentials_unref (creds); } -int grpc_credentials_has_request_metadata(grpc_credentials *creds) { - if (creds == NULL) return 0; - return creds->vtable->has_request_metadata(creds); +int +grpc_credentials_has_request_metadata (grpc_credentials * creds) +{ + if (creds == NULL) + return 0; + return creds->vtable->has_request_metadata (creds); } -int grpc_credentials_has_request_metadata_only(grpc_credentials *creds) { - if (creds == NULL) return 0; - return creds->vtable->has_request_metadata_only(creds); +int +grpc_credentials_has_request_metadata_only (grpc_credentials * creds) +{ + if (creds == NULL) + return 0; + return creds->vtable->has_request_metadata_only (creds); } -void grpc_credentials_get_request_metadata(grpc_credentials *creds, - grpc_pollset *pollset, - const char *service_url, - grpc_credentials_metadata_cb cb, - void *user_data, - grpc_closure_list *closure_list) { - if (creds == NULL || !grpc_credentials_has_request_metadata(creds) || - creds->vtable->get_request_metadata == NULL) { - if (cb != NULL) { - cb(user_data, NULL, 0, GRPC_CREDENTIALS_OK, closure_list); +void +grpc_credentials_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + if (creds == NULL || !grpc_credentials_has_request_metadata (creds) || creds->vtable->get_request_metadata == NULL) + { + if (cb != NULL) + { + cb (user_data, NULL, 0, GRPC_CREDENTIALS_OK, closure_list); + } + return; } - return; - } - creds->vtable->get_request_metadata(creds, pollset, service_url, cb, - user_data, closure_list); + creds->vtable->get_request_metadata (creds, pollset, service_url, cb, user_data, closure_list); } -grpc_security_status grpc_credentials_create_security_connector( - grpc_credentials *creds, const char *target, const grpc_channel_args *args, - grpc_credentials *request_metadata_creds, - grpc_channel_security_connector **sc, grpc_channel_args **new_args) { +grpc_security_status +grpc_credentials_create_security_connector (grpc_credentials * creds, const char *target, const grpc_channel_args * args, grpc_credentials * request_metadata_creds, grpc_channel_security_connector ** sc, grpc_channel_args ** new_args) +{ *new_args = NULL; - if (creds == NULL || creds->vtable->create_security_connector == NULL || - grpc_credentials_has_request_metadata_only(creds)) { - gpr_log(GPR_ERROR, - "Invalid credentials for creating a security connector."); - return GRPC_SECURITY_ERROR; - } - return creds->vtable->create_security_connector( - creds, target, args, request_metadata_creds, sc, new_args); + if (creds == NULL || creds->vtable->create_security_connector == NULL || grpc_credentials_has_request_metadata_only (creds)) + { + gpr_log (GPR_ERROR, "Invalid credentials for creating a security connector."); + return GRPC_SECURITY_ERROR; + } + return creds->vtable->create_security_connector (creds, target, args, request_metadata_creds, sc, new_args); } -grpc_server_credentials *grpc_server_credentials_ref( - grpc_server_credentials *creds) { - if (creds == NULL) return NULL; - gpr_ref(&creds->refcount); +grpc_server_credentials * +grpc_server_credentials_ref (grpc_server_credentials * creds) +{ + if (creds == NULL) + return NULL; + gpr_ref (&creds->refcount); return creds; } -void grpc_server_credentials_unref(grpc_server_credentials *creds) { - if (creds == NULL) return; - if (gpr_unref(&creds->refcount)) { - creds->vtable->destruct(creds); - if (creds->processor.destroy != NULL && creds->processor.state != NULL) { - creds->processor.destroy(creds->processor.state); +void +grpc_server_credentials_unref (grpc_server_credentials * creds) +{ + if (creds == NULL) + return; + if (gpr_unref (&creds->refcount)) + { + creds->vtable->destruct (creds); + if (creds->processor.destroy != NULL && creds->processor.state != NULL) + { + creds->processor.destroy (creds->processor.state); + } + gpr_free (creds); } - gpr_free(creds); - } } -void grpc_server_credentials_release(grpc_server_credentials *creds) { - grpc_server_credentials_unref(creds); +void +grpc_server_credentials_release (grpc_server_credentials * creds) +{ + grpc_server_credentials_unref (creds); } -grpc_security_status grpc_server_credentials_create_security_connector( - grpc_server_credentials *creds, grpc_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(creds, sc); +grpc_security_status +grpc_server_credentials_create_security_connector (grpc_server_credentials * creds, grpc_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 (creds, sc); } -void grpc_server_credentials_set_auth_metadata_processor( - grpc_server_credentials *creds, grpc_auth_metadata_processor processor) { - if (creds == NULL) return; - if (creds->processor.destroy != NULL && creds->processor.state != NULL) { - creds->processor.destroy(creds->processor.state); - } +void +grpc_server_credentials_set_auth_metadata_processor (grpc_server_credentials * creds, grpc_auth_metadata_processor processor) +{ + if (creds == NULL) + return; + if (creds->processor.destroy != NULL && creds->processor.state != NULL) + { + creds->processor.destroy (creds->processor.state); + } creds->processor = processor; } /* -- Ssl credentials. -- */ -static void ssl_destruct(grpc_credentials *creds) { - grpc_ssl_credentials *c = (grpc_ssl_credentials *)creds; - if (c->config.pem_root_certs != NULL) gpr_free(c->config.pem_root_certs); - if (c->config.pem_private_key != NULL) gpr_free(c->config.pem_private_key); - if (c->config.pem_cert_chain != NULL) gpr_free(c->config.pem_cert_chain); -} - -static void ssl_server_destruct(grpc_server_credentials *creds) { - grpc_ssl_server_credentials *c = (grpc_ssl_server_credentials *)creds; +static void +ssl_destruct (grpc_credentials * creds) +{ + grpc_ssl_credentials *c = (grpc_ssl_credentials *) creds; + if (c->config.pem_root_certs != NULL) + gpr_free (c->config.pem_root_certs); + if (c->config.pem_private_key != NULL) + gpr_free (c->config.pem_private_key); + if (c->config.pem_cert_chain != NULL) + gpr_free (c->config.pem_cert_chain); +} + +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++) { - if (c->config.pem_private_keys[i] != NULL) { - gpr_free(c->config.pem_private_keys[i]); + for (i = 0; i < c->config.num_key_cert_pairs; i++) + { + if (c->config.pem_private_keys[i] != NULL) + { + gpr_free (c->config.pem_private_keys[i]); + } + if (c->config.pem_cert_chains[i] != NULL) + { + gpr_free (c->config.pem_cert_chains[i]); + } } - if (c->config.pem_cert_chains[i] != NULL) { - gpr_free(c->config.pem_cert_chains[i]); + if (c->config.pem_private_keys != NULL) + gpr_free (c->config.pem_private_keys); + if (c->config.pem_private_keys_sizes != NULL) + { + gpr_free (c->config.pem_private_keys_sizes); } - } - if (c->config.pem_private_keys != NULL) gpr_free(c->config.pem_private_keys); - if (c->config.pem_private_keys_sizes != NULL) { - gpr_free(c->config.pem_private_keys_sizes); - } - if (c->config.pem_cert_chains != NULL) gpr_free(c->config.pem_cert_chains); - if (c->config.pem_cert_chains_sizes != NULL) { - gpr_free(c->config.pem_cert_chains_sizes); - } - if (c->config.pem_root_certs != NULL) gpr_free(c->config.pem_root_certs); + if (c->config.pem_cert_chains != NULL) + gpr_free (c->config.pem_cert_chains); + if (c->config.pem_cert_chains_sizes != NULL) + { + gpr_free (c->config.pem_cert_chains_sizes); + } + if (c->config.pem_root_certs != NULL) + gpr_free (c->config.pem_root_certs); } -static int ssl_has_request_metadata(const grpc_credentials *creds) { return 0; } +static int +ssl_has_request_metadata (const grpc_credentials * creds) +{ + return 0; +} -static int ssl_has_request_metadata_only(const grpc_credentials *creds) { +static int +ssl_has_request_metadata_only (const grpc_credentials * creds) +{ return 0; } -static grpc_security_status ssl_create_security_connector( - grpc_credentials *creds, const char *target, const grpc_channel_args *args, - grpc_credentials *request_metadata_creds, - grpc_channel_security_connector **sc, grpc_channel_args **new_args) { - grpc_ssl_credentials *c = (grpc_ssl_credentials *)creds; +static grpc_security_status +ssl_create_security_connector (grpc_credentials * creds, const char *target, const grpc_channel_args * args, grpc_credentials * request_metadata_creds, 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; size_t i = 0; const char *overridden_target_name = NULL; grpc_arg arg; - for (i = 0; args && i < args->num_args; i++) { - grpc_arg *arg = &args->args[i]; - if (strcmp(arg->key, GRPC_SSL_TARGET_NAME_OVERRIDE_ARG) == 0 && - arg->type == GRPC_ARG_STRING) { - overridden_target_name = arg->value.string; - break; + for (i = 0; args && i < args->num_args; i++) + { + grpc_arg *arg = &args->args[i]; + if (strcmp (arg->key, GRPC_SSL_TARGET_NAME_OVERRIDE_ARG) == 0 && arg->type == GRPC_ARG_STRING) + { + overridden_target_name = arg->value.string; + break; + } + } + status = grpc_ssl_channel_security_connector_create (request_metadata_creds, &c->config, target, overridden_target_name, sc); + if (status != GRPC_SECURITY_OK) + { + return status; } - } - status = grpc_ssl_channel_security_connector_create( - request_metadata_creds, &c->config, target, overridden_target_name, sc); - if (status != GRPC_SECURITY_OK) { - return status; - } arg.type = GRPC_ARG_STRING; arg.key = GRPC_ARG_HTTP2_SCHEME; arg.value.string = "https"; - *new_args = grpc_channel_args_copy_and_add(args, &arg, 1); + *new_args = grpc_channel_args_copy_and_add (args, &arg, 1); return status; } -static grpc_security_status ssl_server_create_security_connector( - grpc_server_credentials *creds, grpc_security_connector **sc) { - grpc_ssl_server_credentials *c = (grpc_ssl_server_credentials *)creds; - return grpc_ssl_server_security_connector_create(&c->config, sc); +static grpc_security_status +ssl_server_create_security_connector (grpc_server_credentials * creds, grpc_security_connector ** sc) +{ + grpc_ssl_server_credentials *c = (grpc_ssl_server_credentials *) creds; + return grpc_ssl_server_security_connector_create (&c->config, sc); } static grpc_credentials_vtable ssl_vtable = { - ssl_destruct, ssl_has_request_metadata, ssl_has_request_metadata_only, NULL, - ssl_create_security_connector}; + ssl_destruct, ssl_has_request_metadata, ssl_has_request_metadata_only, NULL, + ssl_create_security_connector +}; static grpc_server_credentials_vtable ssl_server_vtable = { - ssl_server_destruct, ssl_server_create_security_connector}; + ssl_server_destruct, ssl_server_create_security_connector +}; -static void ssl_copy_key_material(const char *input, unsigned char **output, - size_t *output_size) { - *output_size = strlen(input); - *output = gpr_malloc(*output_size); - memcpy(*output, input, *output_size); +static void +ssl_copy_key_material (const char *input, unsigned char **output, size_t * output_size) +{ + *output_size = strlen (input); + *output = gpr_malloc (*output_size); + memcpy (*output, input, *output_size); } -static void ssl_build_config(const char *pem_root_certs, - grpc_ssl_pem_key_cert_pair *pem_key_cert_pair, - grpc_ssl_config *config) { - if (pem_root_certs != NULL) { - ssl_copy_key_material(pem_root_certs, &config->pem_root_certs, - &config->pem_root_certs_size); - } - if (pem_key_cert_pair != NULL) { - GPR_ASSERT(pem_key_cert_pair->private_key != NULL); - GPR_ASSERT(pem_key_cert_pair->cert_chain != NULL); - ssl_copy_key_material(pem_key_cert_pair->private_key, - &config->pem_private_key, - &config->pem_private_key_size); - ssl_copy_key_material(pem_key_cert_pair->cert_chain, - &config->pem_cert_chain, - &config->pem_cert_chain_size); - } +static void +ssl_build_config (const char *pem_root_certs, grpc_ssl_pem_key_cert_pair * pem_key_cert_pair, grpc_ssl_config * config) +{ + if (pem_root_certs != NULL) + { + ssl_copy_key_material (pem_root_certs, &config->pem_root_certs, &config->pem_root_certs_size); + } + if (pem_key_cert_pair != NULL) + { + GPR_ASSERT (pem_key_cert_pair->private_key != NULL); + GPR_ASSERT (pem_key_cert_pair->cert_chain != NULL); + ssl_copy_key_material (pem_key_cert_pair->private_key, &config->pem_private_key, &config->pem_private_key_size); + ssl_copy_key_material (pem_key_cert_pair->cert_chain, &config->pem_cert_chain, &config->pem_cert_chain_size); + } } -static void ssl_build_server_config( - const char *pem_root_certs, grpc_ssl_pem_key_cert_pair *pem_key_cert_pairs, - size_t num_key_cert_pairs, int force_client_auth, - grpc_ssl_server_config *config) { +static void +ssl_build_server_config (const char *pem_root_certs, grpc_ssl_pem_key_cert_pair * pem_key_cert_pairs, size_t num_key_cert_pairs, int force_client_auth, grpc_ssl_server_config * config) +{ size_t i; config->force_client_auth = force_client_auth; - if (pem_root_certs != NULL) { - ssl_copy_key_material(pem_root_certs, &config->pem_root_certs, - &config->pem_root_certs_size); - } - if (num_key_cert_pairs > 0) { - GPR_ASSERT(pem_key_cert_pairs != NULL); - config->pem_private_keys = - gpr_malloc(num_key_cert_pairs * sizeof(unsigned char *)); - config->pem_cert_chains = - gpr_malloc(num_key_cert_pairs * sizeof(unsigned char *)); - config->pem_private_keys_sizes = - gpr_malloc(num_key_cert_pairs * sizeof(size_t)); - config->pem_cert_chains_sizes = - gpr_malloc(num_key_cert_pairs * sizeof(size_t)); - } + if (pem_root_certs != NULL) + { + ssl_copy_key_material (pem_root_certs, &config->pem_root_certs, &config->pem_root_certs_size); + } + if (num_key_cert_pairs > 0) + { + GPR_ASSERT (pem_key_cert_pairs != NULL); + config->pem_private_keys = gpr_malloc (num_key_cert_pairs * sizeof (unsigned char *)); + config->pem_cert_chains = gpr_malloc (num_key_cert_pairs * sizeof (unsigned char *)); + config->pem_private_keys_sizes = gpr_malloc (num_key_cert_pairs * sizeof (size_t)); + config->pem_cert_chains_sizes = gpr_malloc (num_key_cert_pairs * sizeof (size_t)); + } config->num_key_cert_pairs = num_key_cert_pairs; - for (i = 0; i < num_key_cert_pairs; i++) { - GPR_ASSERT(pem_key_cert_pairs[i].private_key != NULL); - GPR_ASSERT(pem_key_cert_pairs[i].cert_chain != NULL); - ssl_copy_key_material(pem_key_cert_pairs[i].private_key, - &config->pem_private_keys[i], - &config->pem_private_keys_sizes[i]); - ssl_copy_key_material(pem_key_cert_pairs[i].cert_chain, - &config->pem_cert_chains[i], - &config->pem_cert_chains_sizes[i]); - } + for (i = 0; i < num_key_cert_pairs; i++) + { + GPR_ASSERT (pem_key_cert_pairs[i].private_key != NULL); + GPR_ASSERT (pem_key_cert_pairs[i].cert_chain != NULL); + ssl_copy_key_material (pem_key_cert_pairs[i].private_key, &config->pem_private_keys[i], &config->pem_private_keys_sizes[i]); + ssl_copy_key_material (pem_key_cert_pairs[i].cert_chain, &config->pem_cert_chains[i], &config->pem_cert_chains_sizes[i]); + } } -grpc_credentials *grpc_ssl_credentials_create( - const char *pem_root_certs, grpc_ssl_pem_key_cert_pair *pem_key_cert_pair, - void *reserved) { - grpc_ssl_credentials *c = gpr_malloc(sizeof(grpc_ssl_credentials)); - GPR_ASSERT(reserved == NULL); - memset(c, 0, sizeof(grpc_ssl_credentials)); +grpc_credentials * +grpc_ssl_credentials_create (const char *pem_root_certs, grpc_ssl_pem_key_cert_pair * pem_key_cert_pair, void *reserved) +{ + grpc_ssl_credentials *c = gpr_malloc (sizeof (grpc_ssl_credentials)); + GPR_ASSERT (reserved == NULL); + memset (c, 0, sizeof (grpc_ssl_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_SSL; c->base.vtable = &ssl_vtable; - gpr_ref_init(&c->base.refcount, 1); - ssl_build_config(pem_root_certs, pem_key_cert_pair, &c->config); + gpr_ref_init (&c->base.refcount, 1); + ssl_build_config (pem_root_certs, pem_key_cert_pair, &c->config); return &c->base; } -grpc_server_credentials *grpc_ssl_server_credentials_create( - const char *pem_root_certs, grpc_ssl_pem_key_cert_pair *pem_key_cert_pairs, - size_t num_key_cert_pairs, int force_client_auth, void *reserved) { - grpc_ssl_server_credentials *c = - gpr_malloc(sizeof(grpc_ssl_server_credentials)); - GPR_ASSERT(reserved == NULL); - memset(c, 0, sizeof(grpc_ssl_server_credentials)); +grpc_server_credentials * +grpc_ssl_server_credentials_create (const char *pem_root_certs, grpc_ssl_pem_key_cert_pair * pem_key_cert_pairs, size_t num_key_cert_pairs, int force_client_auth, void *reserved) +{ + grpc_ssl_server_credentials *c = gpr_malloc (sizeof (grpc_ssl_server_credentials)); + GPR_ASSERT (reserved == NULL); + memset (c, 0, sizeof (grpc_ssl_server_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_SSL; - gpr_ref_init(&c->base.refcount, 1); + gpr_ref_init (&c->base.refcount, 1); c->base.vtable = &ssl_server_vtable; - ssl_build_server_config(pem_root_certs, pem_key_cert_pairs, - num_key_cert_pairs, force_client_auth, &c->config); + ssl_build_server_config (pem_root_certs, pem_key_cert_pairs, num_key_cert_pairs, force_client_auth, &c->config); return &c->base; } /* -- Jwt credentials -- */ -static void jwt_reset_cache(grpc_service_account_jwt_access_credentials *c) { - if (c->cached.jwt_md != NULL) { - grpc_credentials_md_store_unref(c->cached.jwt_md); - c->cached.jwt_md = NULL; - } - if (c->cached.service_url != NULL) { - gpr_free(c->cached.service_url); - c->cached.service_url = NULL; - } - c->cached.jwt_expiration = gpr_inf_past(GPR_CLOCK_REALTIME); +static void +jwt_reset_cache (grpc_service_account_jwt_access_credentials * c) +{ + if (c->cached.jwt_md != NULL) + { + grpc_credentials_md_store_unref (c->cached.jwt_md); + c->cached.jwt_md = NULL; + } + if (c->cached.service_url != NULL) + { + gpr_free (c->cached.service_url); + c->cached.service_url = NULL; + } + c->cached.jwt_expiration = gpr_inf_past (GPR_CLOCK_REALTIME); } -static void jwt_destruct(grpc_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); - gpr_mu_destroy(&c->cache_mu); +static void +jwt_destruct (grpc_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); + gpr_mu_destroy (&c->cache_mu); } -static int jwt_has_request_metadata(const grpc_credentials *creds) { return 1; } +static int +jwt_has_request_metadata (const grpc_credentials * creds) +{ + return 1; +} -static int jwt_has_request_metadata_only(const grpc_credentials *creds) { +static int +jwt_has_request_metadata_only (const grpc_credentials * creds) +{ return 1; } -static void jwt_get_request_metadata(grpc_credentials *creds, - grpc_pollset *pollset, - const char *service_url, - grpc_credentials_metadata_cb cb, - void *user_data, - grpc_closure_list *closure_list) { - grpc_service_account_jwt_access_credentials *c = - (grpc_service_account_jwt_access_credentials *)creds; - gpr_timespec refresh_threshold = gpr_time_from_seconds( - GRPC_SECURE_TOKEN_REFRESH_THRESHOLD_SECS, GPR_TIMESPAN); +static void +jwt_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_service_account_jwt_access_credentials *c = (grpc_service_account_jwt_access_credentials *) creds; + gpr_timespec refresh_threshold = gpr_time_from_seconds (GRPC_SECURE_TOKEN_REFRESH_THRESHOLD_SECS, GPR_TIMESPAN); /* See if we can return a cached jwt. */ grpc_credentials_md_store *jwt_md = NULL; { - gpr_mu_lock(&c->cache_mu); - if (c->cached.service_url != NULL && - strcmp(c->cached.service_url, service_url) == 0 && - c->cached.jwt_md != NULL && - (gpr_time_cmp(gpr_time_sub(c->cached.jwt_expiration, - gpr_now(GPR_CLOCK_REALTIME)), - refresh_threshold) > 0)) { - jwt_md = grpc_credentials_md_store_ref(c->cached.jwt_md); - } - gpr_mu_unlock(&c->cache_mu); + gpr_mu_lock (&c->cache_mu); + if (c->cached.service_url != NULL && strcmp (c->cached.service_url, service_url) == 0 && c->cached.jwt_md != NULL && (gpr_time_cmp (gpr_time_sub (c->cached.jwt_expiration, gpr_now (GPR_CLOCK_REALTIME)), refresh_threshold) > 0)) + { + jwt_md = grpc_credentials_md_store_ref (c->cached.jwt_md); + } + gpr_mu_unlock (&c->cache_mu); } - if (jwt_md == NULL) { - char *jwt = NULL; - /* Generate a new jwt. */ - gpr_mu_lock(&c->cache_mu); - jwt_reset_cache(c); - jwt = grpc_jwt_encode_and_sign(&c->key, service_url, c->jwt_lifetime, NULL); - if (jwt != NULL) { - char *md_value; - gpr_asprintf(&md_value, "Bearer %s", jwt); - gpr_free(jwt); - c->cached.jwt_expiration = - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), c->jwt_lifetime); - c->cached.service_url = gpr_strdup(service_url); - c->cached.jwt_md = grpc_credentials_md_store_create(1); - grpc_credentials_md_store_add_cstrings( - c->cached.jwt_md, GRPC_AUTHORIZATION_METADATA_KEY, md_value); - gpr_free(md_value); - jwt_md = grpc_credentials_md_store_ref(c->cached.jwt_md); + if (jwt_md == NULL) + { + char *jwt = NULL; + /* Generate a new jwt. */ + gpr_mu_lock (&c->cache_mu); + jwt_reset_cache (c); + jwt = grpc_jwt_encode_and_sign (&c->key, service_url, c->jwt_lifetime, NULL); + if (jwt != NULL) + { + char *md_value; + gpr_asprintf (&md_value, "Bearer %s", jwt); + gpr_free (jwt); + c->cached.jwt_expiration = gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), c->jwt_lifetime); + c->cached.service_url = gpr_strdup (service_url); + c->cached.jwt_md = grpc_credentials_md_store_create (1); + grpc_credentials_md_store_add_cstrings (c->cached.jwt_md, GRPC_AUTHORIZATION_METADATA_KEY, md_value); + gpr_free (md_value); + jwt_md = grpc_credentials_md_store_ref (c->cached.jwt_md); + } + gpr_mu_unlock (&c->cache_mu); } - gpr_mu_unlock(&c->cache_mu); - } - if (jwt_md != NULL) { - cb(user_data, jwt_md->entries, jwt_md->num_entries, GRPC_CREDENTIALS_OK, - closure_list); - grpc_credentials_md_store_unref(jwt_md); - } else { - cb(user_data, NULL, 0, GRPC_CREDENTIALS_ERROR, closure_list); - } + if (jwt_md != NULL) + { + cb (user_data, jwt_md->entries, jwt_md->num_entries, GRPC_CREDENTIALS_OK, closure_list); + grpc_credentials_md_store_unref (jwt_md); + } + else + { + cb (user_data, NULL, 0, GRPC_CREDENTIALS_ERROR, closure_list); + } } static grpc_credentials_vtable jwt_vtable = { - jwt_destruct, jwt_has_request_metadata, jwt_has_request_metadata_only, - jwt_get_request_metadata, NULL}; + jwt_destruct, jwt_has_request_metadata, jwt_has_request_metadata_only, + jwt_get_request_metadata, NULL +}; grpc_credentials * -grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - grpc_auth_json_key key, gpr_timespec token_lifetime) { +grpc_service_account_jwt_access_credentials_create_from_auth_json_key (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"); - return NULL; - } - c = gpr_malloc(sizeof(grpc_service_account_jwt_access_credentials)); - memset(c, 0, sizeof(grpc_service_account_jwt_access_credentials)); + if (!grpc_auth_json_key_is_valid (&key)) + { + gpr_log (GPR_ERROR, "Invalid input for jwt credentials creation"); + return NULL; + } + c = gpr_malloc (sizeof (grpc_service_account_jwt_access_credentials)); + memset (c, 0, sizeof (grpc_service_account_jwt_access_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_JWT; - gpr_ref_init(&c->base.refcount, 1); + gpr_ref_init (&c->base.refcount, 1); c->base.vtable = &jwt_vtable; c->key = key; c->jwt_lifetime = token_lifetime; - gpr_mu_init(&c->cache_mu); - jwt_reset_cache(c); + gpr_mu_init (&c->cache_mu); + jwt_reset_cache (c); return &c->base; } -grpc_credentials *grpc_service_account_jwt_access_credentials_create( - const char *json_key, gpr_timespec token_lifetime, void *reserved) { - GPR_ASSERT(reserved == NULL); - return grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - grpc_auth_json_key_create_from_string(json_key), token_lifetime); +grpc_credentials * +grpc_service_account_jwt_access_credentials_create (const char *json_key, gpr_timespec token_lifetime, void *reserved) +{ + GPR_ASSERT (reserved == NULL); + return grpc_service_account_jwt_access_credentials_create_from_auth_json_key (grpc_auth_json_key_create_from_string (json_key), token_lifetime); } /* -- Oauth2TokenFetcher credentials -- */ -static void oauth2_token_fetcher_destruct(grpc_credentials *creds) { - grpc_oauth2_token_fetcher_credentials *c = - (grpc_oauth2_token_fetcher_credentials *)creds; - grpc_credentials_md_store_unref(c->access_token_md); - gpr_mu_destroy(&c->mu); - grpc_httpcli_context_destroy(&c->httpcli_context); +static void +oauth2_token_fetcher_destruct (grpc_credentials * creds) +{ + grpc_oauth2_token_fetcher_credentials *c = (grpc_oauth2_token_fetcher_credentials *) creds; + grpc_credentials_md_store_unref (c->access_token_md); + gpr_mu_destroy (&c->mu); + grpc_httpcli_context_destroy (&c->httpcli_context); } -static int oauth2_token_fetcher_has_request_metadata( - const grpc_credentials *creds) { +static int +oauth2_token_fetcher_has_request_metadata (const grpc_credentials * creds) +{ return 1; } -static int oauth2_token_fetcher_has_request_metadata_only( - const grpc_credentials *creds) { +static int +oauth2_token_fetcher_has_request_metadata_only (const grpc_credentials * creds) +{ return 1; } grpc_credentials_status -grpc_oauth2_token_fetcher_credentials_parse_server_response( - const grpc_httpcli_response *response, grpc_credentials_md_store **token_md, - gpr_timespec *token_lifetime) { +grpc_oauth2_token_fetcher_credentials_parse_server_response (const grpc_httpcli_response * response, grpc_credentials_md_store ** token_md, gpr_timespec * token_lifetime) +{ char *null_terminated_body = NULL; char *new_access_token = NULL; grpc_credentials_status status = GRPC_CREDENTIALS_OK; grpc_json *json = NULL; - if (response == NULL) { - gpr_log(GPR_ERROR, "Received NULL response."); - status = GRPC_CREDENTIALS_ERROR; - goto end; - } - - if (response->body_length > 0) { - null_terminated_body = gpr_malloc(response->body_length + 1); - null_terminated_body[response->body_length] = '\0'; - memcpy(null_terminated_body, response->body, response->body_length); - } - - if (response->status != 200) { - gpr_log(GPR_ERROR, "Call to http server ended with error %d [%s].", - response->status, - null_terminated_body != NULL ? null_terminated_body : ""); - status = GRPC_CREDENTIALS_ERROR; - goto end; - } else { - grpc_json *access_token = NULL; - grpc_json *token_type = NULL; - grpc_json *expires_in = NULL; - grpc_json *ptr; - json = grpc_json_parse_string(null_terminated_body); - if (json == NULL) { - gpr_log(GPR_ERROR, "Could not parse JSON from %s", null_terminated_body); - status = GRPC_CREDENTIALS_ERROR; - goto end; - } - if (json->type != GRPC_JSON_OBJECT) { - gpr_log(GPR_ERROR, "Response should be a JSON object"); + if (response == NULL) + { + gpr_log (GPR_ERROR, "Received NULL response."); status = GRPC_CREDENTIALS_ERROR; goto end; } - for (ptr = json->child; ptr; ptr = ptr->next) { - if (strcmp(ptr->key, "access_token") == 0) { - access_token = ptr; - } else if (strcmp(ptr->key, "token_type") == 0) { - token_type = ptr; - } else if (strcmp(ptr->key, "expires_in") == 0) { - expires_in = ptr; - } + + if (response->body_length > 0) + { + null_terminated_body = gpr_malloc (response->body_length + 1); + null_terminated_body[response->body_length] = '\0'; + memcpy (null_terminated_body, response->body, response->body_length); } - if (access_token == NULL || access_token->type != GRPC_JSON_STRING) { - gpr_log(GPR_ERROR, "Missing or invalid access_token in JSON."); + + if (response->status != 200) + { + gpr_log (GPR_ERROR, "Call to http server ended with error %d [%s].", response->status, null_terminated_body != NULL ? null_terminated_body : ""); status = GRPC_CREDENTIALS_ERROR; goto end; } - if (token_type == NULL || token_type->type != GRPC_JSON_STRING) { - gpr_log(GPR_ERROR, "Missing or invalid token_type in JSON."); - status = GRPC_CREDENTIALS_ERROR; - goto end; + else + { + grpc_json *access_token = NULL; + grpc_json *token_type = NULL; + grpc_json *expires_in = NULL; + grpc_json *ptr; + json = grpc_json_parse_string (null_terminated_body); + if (json == NULL) + { + gpr_log (GPR_ERROR, "Could not parse JSON from %s", null_terminated_body); + status = GRPC_CREDENTIALS_ERROR; + goto end; + } + if (json->type != GRPC_JSON_OBJECT) + { + gpr_log (GPR_ERROR, "Response should be a JSON object"); + status = GRPC_CREDENTIALS_ERROR; + goto end; + } + for (ptr = json->child; ptr; ptr = ptr->next) + { + if (strcmp (ptr->key, "access_token") == 0) + { + access_token = ptr; + } + else if (strcmp (ptr->key, "token_type") == 0) + { + token_type = ptr; + } + else if (strcmp (ptr->key, "expires_in") == 0) + { + expires_in = ptr; + } + } + if (access_token == NULL || access_token->type != GRPC_JSON_STRING) + { + gpr_log (GPR_ERROR, "Missing or invalid access_token in JSON."); + status = GRPC_CREDENTIALS_ERROR; + goto end; + } + if (token_type == NULL || token_type->type != GRPC_JSON_STRING) + { + gpr_log (GPR_ERROR, "Missing or invalid token_type in JSON."); + status = GRPC_CREDENTIALS_ERROR; + goto end; + } + if (expires_in == NULL || expires_in->type != GRPC_JSON_NUMBER) + { + gpr_log (GPR_ERROR, "Missing or invalid expires_in in JSON."); + status = GRPC_CREDENTIALS_ERROR; + goto end; + } + gpr_asprintf (&new_access_token, "%s %s", token_type->value, access_token->value); + token_lifetime->tv_sec = strtol (expires_in->value, NULL, 10); + token_lifetime->tv_nsec = 0; + token_lifetime->clock_type = GPR_TIMESPAN; + if (*token_md != NULL) + grpc_credentials_md_store_unref (*token_md); + *token_md = grpc_credentials_md_store_create (1); + grpc_credentials_md_store_add_cstrings (*token_md, GRPC_AUTHORIZATION_METADATA_KEY, new_access_token); + status = GRPC_CREDENTIALS_OK; } - if (expires_in == NULL || expires_in->type != GRPC_JSON_NUMBER) { - gpr_log(GPR_ERROR, "Missing or invalid expires_in in JSON."); - status = GRPC_CREDENTIALS_ERROR; - goto end; - } - gpr_asprintf(&new_access_token, "%s %s", token_type->value, - access_token->value); - token_lifetime->tv_sec = strtol(expires_in->value, NULL, 10); - token_lifetime->tv_nsec = 0; - token_lifetime->clock_type = GPR_TIMESPAN; - if (*token_md != NULL) grpc_credentials_md_store_unref(*token_md); - *token_md = grpc_credentials_md_store_create(1); - grpc_credentials_md_store_add_cstrings( - *token_md, GRPC_AUTHORIZATION_METADATA_KEY, new_access_token); - status = GRPC_CREDENTIALS_OK; - } end: - if (status != GRPC_CREDENTIALS_OK && (*token_md != NULL)) { - grpc_credentials_md_store_unref(*token_md); - *token_md = NULL; - } - if (null_terminated_body != NULL) gpr_free(null_terminated_body); - if (new_access_token != NULL) gpr_free(new_access_token); - if (json != NULL) grpc_json_destroy(json); + if (status != GRPC_CREDENTIALS_OK && (*token_md != NULL)) + { + grpc_credentials_md_store_unref (*token_md); + *token_md = NULL; + } + if (null_terminated_body != NULL) + gpr_free (null_terminated_body); + if (new_access_token != NULL) + gpr_free (new_access_token); + if (json != NULL) + grpc_json_destroy (json); return status; } -static void on_oauth2_token_fetcher_http_response( - void *user_data, const grpc_httpcli_response *response, - grpc_closure_list *closure_list) { - grpc_credentials_metadata_request *r = - (grpc_credentials_metadata_request *)user_data; - grpc_oauth2_token_fetcher_credentials *c = - (grpc_oauth2_token_fetcher_credentials *)r->creds; +static void +on_oauth2_token_fetcher_http_response (void *user_data, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +{ + grpc_credentials_metadata_request *r = (grpc_credentials_metadata_request *) user_data; + grpc_oauth2_token_fetcher_credentials *c = (grpc_oauth2_token_fetcher_credentials *) r->creds; gpr_timespec token_lifetime; grpc_credentials_status status; - gpr_mu_lock(&c->mu); - status = grpc_oauth2_token_fetcher_credentials_parse_server_response( - response, &c->access_token_md, &token_lifetime); - if (status == GRPC_CREDENTIALS_OK) { - c->token_expiration = - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), token_lifetime); - r->cb(r->user_data, c->access_token_md->entries, - c->access_token_md->num_entries, status, closure_list); - } else { - c->token_expiration = gpr_inf_past(GPR_CLOCK_REALTIME); - r->cb(r->user_data, NULL, 0, status, closure_list); - } - gpr_mu_unlock(&c->mu); - grpc_credentials_metadata_request_destroy(r); -} - -static void oauth2_token_fetcher_get_request_metadata( - grpc_credentials *creds, grpc_pollset *pollset, const char *service_url, - grpc_credentials_metadata_cb cb, void *user_data, - grpc_closure_list *closure_list) { - grpc_oauth2_token_fetcher_credentials *c = - (grpc_oauth2_token_fetcher_credentials *)creds; - gpr_timespec refresh_threshold = gpr_time_from_seconds( - GRPC_SECURE_TOKEN_REFRESH_THRESHOLD_SECS, GPR_TIMESPAN); + gpr_mu_lock (&c->mu); + status = grpc_oauth2_token_fetcher_credentials_parse_server_response (response, &c->access_token_md, &token_lifetime); + if (status == GRPC_CREDENTIALS_OK) + { + c->token_expiration = gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), token_lifetime); + r->cb (r->user_data, c->access_token_md->entries, c->access_token_md->num_entries, status, closure_list); + } + else + { + c->token_expiration = gpr_inf_past (GPR_CLOCK_REALTIME); + r->cb (r->user_data, NULL, 0, status, closure_list); + } + gpr_mu_unlock (&c->mu); + grpc_credentials_metadata_request_destroy (r); +} + +static void +oauth2_token_fetcher_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_oauth2_token_fetcher_credentials *c = (grpc_oauth2_token_fetcher_credentials *) creds; + gpr_timespec refresh_threshold = gpr_time_from_seconds (GRPC_SECURE_TOKEN_REFRESH_THRESHOLD_SECS, GPR_TIMESPAN); grpc_credentials_md_store *cached_access_token_md = NULL; { - gpr_mu_lock(&c->mu); - if (c->access_token_md != NULL && - (gpr_time_cmp( - gpr_time_sub(c->token_expiration, gpr_now(GPR_CLOCK_REALTIME)), - refresh_threshold) > 0)) { - cached_access_token_md = - grpc_credentials_md_store_ref(c->access_token_md); - } - gpr_mu_unlock(&c->mu); - } - if (cached_access_token_md != NULL) { - cb(user_data, cached_access_token_md->entries, - cached_access_token_md->num_entries, GRPC_CREDENTIALS_OK, closure_list); - grpc_credentials_md_store_unref(cached_access_token_md); - } else { - c->fetch_func( - grpc_credentials_metadata_request_create(creds, cb, user_data), - &c->httpcli_context, pollset, on_oauth2_token_fetcher_http_response, - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), refresh_threshold), - closure_list); + gpr_mu_lock (&c->mu); + if (c->access_token_md != NULL && (gpr_time_cmp (gpr_time_sub (c->token_expiration, gpr_now (GPR_CLOCK_REALTIME)), refresh_threshold) > 0)) + { + cached_access_token_md = grpc_credentials_md_store_ref (c->access_token_md); + } + gpr_mu_unlock (&c->mu); } + if (cached_access_token_md != NULL) + { + cb (user_data, cached_access_token_md->entries, cached_access_token_md->num_entries, GRPC_CREDENTIALS_OK, closure_list); + grpc_credentials_md_store_unref (cached_access_token_md); + } + else + { + c->fetch_func (grpc_credentials_metadata_request_create (creds, cb, user_data), &c->httpcli_context, pollset, on_oauth2_token_fetcher_http_response, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), refresh_threshold), closure_list); + } } -static void init_oauth2_token_fetcher(grpc_oauth2_token_fetcher_credentials *c, - grpc_fetch_oauth2_func fetch_func) { - memset(c, 0, sizeof(grpc_oauth2_token_fetcher_credentials)); +static void +init_oauth2_token_fetcher (grpc_oauth2_token_fetcher_credentials * c, grpc_fetch_oauth2_func fetch_func) +{ + memset (c, 0, sizeof (grpc_oauth2_token_fetcher_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_OAUTH2; - gpr_ref_init(&c->base.refcount, 1); - gpr_mu_init(&c->mu); - c->token_expiration = gpr_inf_past(GPR_CLOCK_REALTIME); + gpr_ref_init (&c->base.refcount, 1); + gpr_mu_init (&c->mu); + c->token_expiration = gpr_inf_past (GPR_CLOCK_REALTIME); c->fetch_func = fetch_func; - grpc_httpcli_context_init(&c->httpcli_context); + grpc_httpcli_context_init (&c->httpcli_context); } /* -- GoogleComputeEngine credentials. -- */ static grpc_credentials_vtable compute_engine_vtable = { - oauth2_token_fetcher_destruct, oauth2_token_fetcher_has_request_metadata, - oauth2_token_fetcher_has_request_metadata_only, - oauth2_token_fetcher_get_request_metadata, NULL}; - -static void compute_engine_fetch_oauth2( - grpc_credentials_metadata_request *metadata_req, - grpc_httpcli_context *httpcli_context, grpc_pollset *pollset, - grpc_httpcli_response_cb response_cb, gpr_timespec deadline, - grpc_closure_list *closure_list) { - grpc_httpcli_header header = {"Metadata-Flavor", "Google"}; + oauth2_token_fetcher_destruct, oauth2_token_fetcher_has_request_metadata, + oauth2_token_fetcher_has_request_metadata_only, + oauth2_token_fetcher_get_request_metadata, NULL +}; + +static void +compute_engine_fetch_oauth2 (grpc_credentials_metadata_request * metadata_req, grpc_httpcli_context * httpcli_context, grpc_pollset * pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline, grpc_closure_list * closure_list) +{ + grpc_httpcli_header header = { "Metadata-Flavor", "Google" }; grpc_httpcli_request request; - memset(&request, 0, sizeof(grpc_httpcli_request)); + memset (&request, 0, sizeof (grpc_httpcli_request)); request.host = GRPC_COMPUTE_ENGINE_METADATA_HOST; request.path = GRPC_COMPUTE_ENGINE_METADATA_TOKEN_PATH; request.hdr_count = 1; request.hdrs = &header; - grpc_httpcli_get(httpcli_context, pollset, &request, deadline, response_cb, - metadata_req, closure_list); + grpc_httpcli_get (httpcli_context, pollset, &request, deadline, response_cb, metadata_req, closure_list); } -grpc_credentials *grpc_google_compute_engine_credentials_create( - void *reserved) { - grpc_oauth2_token_fetcher_credentials *c = - gpr_malloc(sizeof(grpc_oauth2_token_fetcher_credentials)); - GPR_ASSERT(reserved == NULL); - init_oauth2_token_fetcher(c, compute_engine_fetch_oauth2); +grpc_credentials * +grpc_google_compute_engine_credentials_create (void *reserved) +{ + grpc_oauth2_token_fetcher_credentials *c = gpr_malloc (sizeof (grpc_oauth2_token_fetcher_credentials)); + GPR_ASSERT (reserved == NULL); + init_oauth2_token_fetcher (c, compute_engine_fetch_oauth2); c->base.vtable = &compute_engine_vtable; return &c->base; } /* -- GoogleRefreshToken credentials. -- */ -static void refresh_token_destruct(grpc_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); +static void +refresh_token_destruct (grpc_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); } static grpc_credentials_vtable refresh_token_vtable = { - refresh_token_destruct, oauth2_token_fetcher_has_request_metadata, - oauth2_token_fetcher_has_request_metadata_only, - oauth2_token_fetcher_get_request_metadata, NULL}; - -static void refresh_token_fetch_oauth2( - grpc_credentials_metadata_request *metadata_req, - grpc_httpcli_context *httpcli_context, grpc_pollset *pollset, - grpc_httpcli_response_cb response_cb, gpr_timespec deadline, - grpc_closure_list *closure_list) { - grpc_google_refresh_token_credentials *c = - (grpc_google_refresh_token_credentials *)metadata_req->creds; - grpc_httpcli_header header = {"Content-Type", - "application/x-www-form-urlencoded"}; + refresh_token_destruct, oauth2_token_fetcher_has_request_metadata, + oauth2_token_fetcher_has_request_metadata_only, + oauth2_token_fetcher_get_request_metadata, NULL +}; + +static void +refresh_token_fetch_oauth2 (grpc_credentials_metadata_request * metadata_req, grpc_httpcli_context * httpcli_context, grpc_pollset * pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline, grpc_closure_list * closure_list) +{ + grpc_google_refresh_token_credentials *c = (grpc_google_refresh_token_credentials *) metadata_req->creds; + grpc_httpcli_header header = { "Content-Type", + "application/x-www-form-urlencoded" + }; grpc_httpcli_request request; char *body = NULL; - gpr_asprintf(&body, GRPC_REFRESH_TOKEN_POST_BODY_FORMAT_STRING, - c->refresh_token.client_id, c->refresh_token.client_secret, - c->refresh_token.refresh_token); - memset(&request, 0, sizeof(grpc_httpcli_request)); + gpr_asprintf (&body, GRPC_REFRESH_TOKEN_POST_BODY_FORMAT_STRING, c->refresh_token.client_id, c->refresh_token.client_secret, c->refresh_token.refresh_token); + memset (&request, 0, sizeof (grpc_httpcli_request)); request.host = GRPC_GOOGLE_OAUTH2_SERVICE_HOST; request.path = GRPC_GOOGLE_OAUTH2_SERVICE_TOKEN_PATH; request.hdr_count = 1; request.hdrs = &header; request.handshaker = &grpc_httpcli_ssl; - grpc_httpcli_post(httpcli_context, pollset, &request, body, strlen(body), - deadline, response_cb, metadata_req, closure_list); - gpr_free(body); + grpc_httpcli_post (httpcli_context, pollset, &request, body, strlen (body), deadline, response_cb, metadata_req, closure_list); + gpr_free (body); } -grpc_credentials *grpc_refresh_token_credentials_create_from_auth_refresh_token( - grpc_auth_refresh_token refresh_token) { +grpc_credentials * +grpc_refresh_token_credentials_create_from_auth_refresh_token (grpc_auth_refresh_token refresh_token) +{ grpc_google_refresh_token_credentials *c; - if (!grpc_auth_refresh_token_is_valid(&refresh_token)) { - gpr_log(GPR_ERROR, "Invalid input for refresh token credentials creation"); - return NULL; - } - c = gpr_malloc(sizeof(grpc_google_refresh_token_credentials)); - memset(c, 0, sizeof(grpc_google_refresh_token_credentials)); - init_oauth2_token_fetcher(&c->base, refresh_token_fetch_oauth2); + if (!grpc_auth_refresh_token_is_valid (&refresh_token)) + { + gpr_log (GPR_ERROR, "Invalid input for refresh token credentials creation"); + return NULL; + } + c = gpr_malloc (sizeof (grpc_google_refresh_token_credentials)); + memset (c, 0, sizeof (grpc_google_refresh_token_credentials)); + init_oauth2_token_fetcher (&c->base, refresh_token_fetch_oauth2); c->base.base.vtable = &refresh_token_vtable; c->refresh_token = refresh_token; return &c->base.base; } -grpc_credentials *grpc_google_refresh_token_credentials_create( - const char *json_refresh_token, void *reserved) { - GPR_ASSERT(reserved == NULL); - return grpc_refresh_token_credentials_create_from_auth_refresh_token( - grpc_auth_refresh_token_create_from_string(json_refresh_token)); +grpc_credentials * +grpc_google_refresh_token_credentials_create (const char *json_refresh_token, void *reserved) +{ + GPR_ASSERT (reserved == NULL); + return grpc_refresh_token_credentials_create_from_auth_refresh_token (grpc_auth_refresh_token_create_from_string (json_refresh_token)); } /* -- Metadata-only credentials. -- */ -static void md_only_test_destruct(grpc_credentials *creds) { - grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)creds; - grpc_credentials_md_store_unref(c->md_store); +static void +md_only_test_destruct (grpc_credentials * creds) +{ + grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *) creds; + grpc_credentials_md_store_unref (c->md_store); } -static int md_only_test_has_request_metadata(const grpc_credentials *creds) { +static int +md_only_test_has_request_metadata (const grpc_credentials * creds) +{ return 1; } -static int md_only_test_has_request_metadata_only( - const grpc_credentials *creds) { +static int +md_only_test_has_request_metadata_only (const grpc_credentials * creds) +{ return 1; } -static void on_simulated_token_fetch_done(void *user_data) { - grpc_credentials_metadata_request *r = - (grpc_credentials_metadata_request *)user_data; - grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)r->creds; +static void +on_simulated_token_fetch_done (void *user_data) +{ + grpc_credentials_metadata_request *r = (grpc_credentials_metadata_request *) user_data; + grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *) r->creds; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - r->cb(r->user_data, c->md_store->entries, c->md_store->num_entries, - GRPC_CREDENTIALS_OK, &closure_list); - grpc_credentials_metadata_request_destroy(r); - grpc_closure_list_run(&closure_list); -} - -static void md_only_test_get_request_metadata(grpc_credentials *creds, - grpc_pollset *pollset, - const char *service_url, - grpc_credentials_metadata_cb cb, - void *user_data, - grpc_closure_list *closure_list) { - grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)creds; - - if (c->is_async) { - gpr_thd_id thd_id; - grpc_credentials_metadata_request *cb_arg = - grpc_credentials_metadata_request_create(creds, cb, user_data); - gpr_thd_new(&thd_id, on_simulated_token_fetch_done, cb_arg, NULL); - } else { - cb(user_data, c->md_store->entries, 1, GRPC_CREDENTIALS_OK, closure_list); - } + r->cb (r->user_data, c->md_store->entries, c->md_store->num_entries, GRPC_CREDENTIALS_OK, &closure_list); + grpc_credentials_metadata_request_destroy (r); + grpc_closure_list_run (&closure_list); +} + +static void +md_only_test_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *) creds; + + if (c->is_async) + { + gpr_thd_id thd_id; + grpc_credentials_metadata_request *cb_arg = grpc_credentials_metadata_request_create (creds, cb, user_data); + gpr_thd_new (&thd_id, on_simulated_token_fetch_done, cb_arg, NULL); + } + else + { + cb (user_data, c->md_store->entries, 1, GRPC_CREDENTIALS_OK, closure_list); + } } static grpc_credentials_vtable md_only_test_vtable = { - md_only_test_destruct, md_only_test_has_request_metadata, - md_only_test_has_request_metadata_only, md_only_test_get_request_metadata, - NULL}; - -grpc_credentials *grpc_md_only_test_credentials_create(const char *md_key, - const char *md_value, - int is_async) { - grpc_md_only_test_credentials *c = - gpr_malloc(sizeof(grpc_md_only_test_credentials)); - memset(c, 0, sizeof(grpc_md_only_test_credentials)); + md_only_test_destruct, md_only_test_has_request_metadata, + md_only_test_has_request_metadata_only, md_only_test_get_request_metadata, + NULL +}; + +grpc_credentials * +grpc_md_only_test_credentials_create (const char *md_key, const char *md_value, int is_async) +{ + grpc_md_only_test_credentials *c = gpr_malloc (sizeof (grpc_md_only_test_credentials)); + memset (c, 0, sizeof (grpc_md_only_test_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_OAUTH2; c->base.vtable = &md_only_test_vtable; - gpr_ref_init(&c->base.refcount, 1); - c->md_store = grpc_credentials_md_store_create(1); - grpc_credentials_md_store_add_cstrings(c->md_store, md_key, md_value); + gpr_ref_init (&c->base.refcount, 1); + c->md_store = grpc_credentials_md_store_create (1); + grpc_credentials_md_store_add_cstrings (c->md_store, md_key, md_value); c->is_async = is_async; return &c->base; } /* -- Oauth2 Access Token credentials. -- */ -static void access_token_destruct(grpc_credentials *creds) { - grpc_access_token_credentials *c = (grpc_access_token_credentials *)creds; - grpc_credentials_md_store_unref(c->access_token_md); +static void +access_token_destruct (grpc_credentials * creds) +{ + grpc_access_token_credentials *c = (grpc_access_token_credentials *) creds; + grpc_credentials_md_store_unref (c->access_token_md); } -static int access_token_has_request_metadata(const grpc_credentials *creds) { +static int +access_token_has_request_metadata (const grpc_credentials * creds) +{ return 1; } -static int access_token_has_request_metadata_only( - const grpc_credentials *creds) { +static int +access_token_has_request_metadata_only (const grpc_credentials * creds) +{ return 1; } -static void access_token_get_request_metadata(grpc_credentials *creds, - grpc_pollset *pollset, - const char *service_url, - grpc_credentials_metadata_cb cb, - void *user_data, - grpc_closure_list *closure_list) { - grpc_access_token_credentials *c = (grpc_access_token_credentials *)creds; - cb(user_data, c->access_token_md->entries, 1, GRPC_CREDENTIALS_OK, - closure_list); +static void +access_token_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_access_token_credentials *c = (grpc_access_token_credentials *) creds; + cb (user_data, c->access_token_md->entries, 1, GRPC_CREDENTIALS_OK, closure_list); } static grpc_credentials_vtable access_token_vtable = { - access_token_destruct, access_token_has_request_metadata, - access_token_has_request_metadata_only, access_token_get_request_metadata, - NULL}; - -grpc_credentials *grpc_access_token_credentials_create(const char *access_token, - void *reserved) { - grpc_access_token_credentials *c = - gpr_malloc(sizeof(grpc_access_token_credentials)); + access_token_destruct, access_token_has_request_metadata, + access_token_has_request_metadata_only, access_token_get_request_metadata, + NULL +}; + +grpc_credentials * +grpc_access_token_credentials_create (const char *access_token, void *reserved) +{ + grpc_access_token_credentials *c = gpr_malloc (sizeof (grpc_access_token_credentials)); char *token_md_value; - GPR_ASSERT(reserved == NULL); - memset(c, 0, sizeof(grpc_access_token_credentials)); + GPR_ASSERT (reserved == NULL); + memset (c, 0, sizeof (grpc_access_token_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_OAUTH2; c->base.vtable = &access_token_vtable; - gpr_ref_init(&c->base.refcount, 1); - c->access_token_md = grpc_credentials_md_store_create(1); - gpr_asprintf(&token_md_value, "Bearer %s", access_token); - grpc_credentials_md_store_add_cstrings( - c->access_token_md, GRPC_AUTHORIZATION_METADATA_KEY, token_md_value); - gpr_free(token_md_value); + gpr_ref_init (&c->base.refcount, 1); + c->access_token_md = grpc_credentials_md_store_create (1); + gpr_asprintf (&token_md_value, "Bearer %s", access_token); + grpc_credentials_md_store_add_cstrings (c->access_token_md, GRPC_AUTHORIZATION_METADATA_KEY, token_md_value); + gpr_free (token_md_value); return &c->base; } /* -- Fake transport security credentials. -- */ -static void fake_transport_security_credentials_destruct( - grpc_credentials *creds) { +static void +fake_transport_security_credentials_destruct (grpc_credentials * creds) +{ /* Nothing to do here. */ } -static void fake_transport_security_server_credentials_destruct( - grpc_server_credentials *creds) { +static void +fake_transport_security_server_credentials_destruct (grpc_server_credentials * creds) +{ /* Nothing to do here. */ } -static int fake_transport_security_has_request_metadata( - const grpc_credentials *creds) { +static int +fake_transport_security_has_request_metadata (const grpc_credentials * creds) +{ return 0; } -static int fake_transport_security_has_request_metadata_only( - const grpc_credentials *creds) { +static int +fake_transport_security_has_request_metadata_only (const grpc_credentials * creds) +{ return 0; } -static grpc_security_status fake_transport_security_create_security_connector( - grpc_credentials *c, const char *target, const grpc_channel_args *args, - grpc_credentials *request_metadata_creds, - grpc_channel_security_connector **sc, grpc_channel_args **new_args) { - *sc = grpc_fake_channel_security_connector_create(request_metadata_creds, 1); +static grpc_security_status +fake_transport_security_create_security_connector (grpc_credentials * c, const char *target, const grpc_channel_args * args, grpc_credentials * request_metadata_creds, grpc_channel_security_connector ** sc, grpc_channel_args ** new_args) +{ + *sc = grpc_fake_channel_security_connector_create (request_metadata_creds, 1); return GRPC_SECURITY_OK; } static grpc_security_status -fake_transport_security_server_create_security_connector( - grpc_server_credentials *c, grpc_security_connector **sc) { - *sc = grpc_fake_server_security_connector_create(); +fake_transport_security_server_create_security_connector (grpc_server_credentials * c, grpc_security_connector ** sc) +{ + *sc = grpc_fake_server_security_connector_create (); return GRPC_SECURITY_OK; } static grpc_credentials_vtable fake_transport_security_credentials_vtable = { - fake_transport_security_credentials_destruct, - fake_transport_security_has_request_metadata, - fake_transport_security_has_request_metadata_only, NULL, - fake_transport_security_create_security_connector}; - -static grpc_server_credentials_vtable - fake_transport_security_server_credentials_vtable = { - fake_transport_security_server_credentials_destruct, - fake_transport_security_server_create_security_connector}; - -grpc_credentials *grpc_fake_transport_security_credentials_create(void) { - grpc_credentials *c = gpr_malloc(sizeof(grpc_credentials)); - memset(c, 0, sizeof(grpc_credentials)); + fake_transport_security_credentials_destruct, + fake_transport_security_has_request_metadata, + fake_transport_security_has_request_metadata_only, NULL, + fake_transport_security_create_security_connector +}; + +static grpc_server_credentials_vtable fake_transport_security_server_credentials_vtable = { + fake_transport_security_server_credentials_destruct, + fake_transport_security_server_create_security_connector +}; + +grpc_credentials * +grpc_fake_transport_security_credentials_create (void) +{ + grpc_credentials *c = gpr_malloc (sizeof (grpc_credentials)); + memset (c, 0, sizeof (grpc_credentials)); c->type = GRPC_CREDENTIALS_TYPE_FAKE_TRANSPORT_SECURITY; c->vtable = &fake_transport_security_credentials_vtable; - gpr_ref_init(&c->refcount, 1); + gpr_ref_init (&c->refcount, 1); return c; } -grpc_server_credentials *grpc_fake_transport_security_server_credentials_create( - void) { - grpc_server_credentials *c = gpr_malloc(sizeof(grpc_server_credentials)); - memset(c, 0, sizeof(grpc_server_credentials)); +grpc_server_credentials * +grpc_fake_transport_security_server_credentials_create (void) +{ + grpc_server_credentials *c = gpr_malloc (sizeof (grpc_server_credentials)); + memset (c, 0, sizeof (grpc_server_credentials)); c->type = GRPC_CREDENTIALS_TYPE_FAKE_TRANSPORT_SECURITY; - gpr_ref_init(&c->refcount, 1); + gpr_ref_init (&c->refcount, 1); c->vtable = &fake_transport_security_server_credentials_vtable; return c; } /* -- Composite credentials. -- */ -typedef struct { +typedef struct +{ grpc_composite_credentials *composite_creds; size_t creds_index; grpc_credentials_md_store *md_elems; @@ -928,366 +990,407 @@ typedef struct { grpc_credentials_metadata_cb cb; } grpc_composite_credentials_metadata_context; -static void composite_destruct(grpc_credentials *creds) { - grpc_composite_credentials *c = (grpc_composite_credentials *)creds; +static void +composite_destruct (grpc_credentials * creds) +{ + grpc_composite_credentials *c = (grpc_composite_credentials *) creds; size_t i; - for (i = 0; i < c->inner.num_creds; i++) { - grpc_credentials_unref(c->inner.creds_array[i]); - } - gpr_free(c->inner.creds_array); + for (i = 0; i < c->inner.num_creds; i++) + { + grpc_credentials_unref (c->inner.creds_array[i]); + } + gpr_free (c->inner.creds_array); } -static int composite_has_request_metadata(const grpc_credentials *creds) { - const grpc_composite_credentials *c = - (const grpc_composite_credentials *)creds; +static int +composite_has_request_metadata (const grpc_credentials * creds) +{ + const grpc_composite_credentials *c = (const grpc_composite_credentials *) creds; size_t i; - for (i = 0; i < c->inner.num_creds; i++) { - if (grpc_credentials_has_request_metadata(c->inner.creds_array[i])) { - return 1; + for (i = 0; i < c->inner.num_creds; i++) + { + if (grpc_credentials_has_request_metadata (c->inner.creds_array[i])) + { + return 1; + } } - } return 0; } -static int composite_has_request_metadata_only(const grpc_credentials *creds) { - const grpc_composite_credentials *c = - (const grpc_composite_credentials *)creds; +static int +composite_has_request_metadata_only (const grpc_credentials * creds) +{ + const grpc_composite_credentials *c = (const grpc_composite_credentials *) creds; size_t i; - for (i = 0; i < c->inner.num_creds; i++) { - if (!grpc_credentials_has_request_metadata_only(c->inner.creds_array[i])) { - return 0; + for (i = 0; i < c->inner.num_creds; i++) + { + if (!grpc_credentials_has_request_metadata_only (c->inner.creds_array[i])) + { + return 0; + } } - } return 1; } -static void composite_md_context_destroy( - grpc_composite_credentials_metadata_context *ctx) { - grpc_credentials_md_store_unref(ctx->md_elems); - if (ctx->service_url != NULL) gpr_free(ctx->service_url); - gpr_free(ctx); +static void +composite_md_context_destroy (grpc_composite_credentials_metadata_context * ctx) +{ + grpc_credentials_md_store_unref (ctx->md_elems); + if (ctx->service_url != NULL) + gpr_free (ctx->service_url); + gpr_free (ctx); } -static void composite_metadata_cb(void *user_data, - grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status, - grpc_closure_list *closure_list) { - grpc_composite_credentials_metadata_context *ctx = - (grpc_composite_credentials_metadata_context *)user_data; - if (status != GRPC_CREDENTIALS_OK) { - ctx->cb(ctx->user_data, NULL, 0, status, closure_list); - return; - } +static void +composite_metadata_cb (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +{ + grpc_composite_credentials_metadata_context *ctx = (grpc_composite_credentials_metadata_context *) user_data; + if (status != GRPC_CREDENTIALS_OK) + { + ctx->cb (ctx->user_data, NULL, 0, status, closure_list); + return; + } /* Copy the metadata in the context. */ - if (num_md > 0) { - size_t i; - for (i = 0; i < num_md; i++) { - grpc_credentials_md_store_add(ctx->md_elems, md_elems[i].key, - md_elems[i].value); + if (num_md > 0) + { + size_t i; + for (i = 0; i < num_md; i++) + { + grpc_credentials_md_store_add (ctx->md_elems, md_elems[i].key, md_elems[i].value); + } } - } /* See if we need to get some more metadata. */ - while (ctx->creds_index < ctx->composite_creds->inner.num_creds) { - grpc_credentials *inner_creds = - ctx->composite_creds->inner.creds_array[ctx->creds_index++]; - if (grpc_credentials_has_request_metadata(inner_creds)) { - grpc_credentials_get_request_metadata( - inner_creds, ctx->pollset, ctx->service_url, composite_metadata_cb, - ctx, closure_list); - return; + while (ctx->creds_index < ctx->composite_creds->inner.num_creds) + { + grpc_credentials *inner_creds = ctx->composite_creds->inner.creds_array[ctx->creds_index++]; + if (grpc_credentials_has_request_metadata (inner_creds)) + { + grpc_credentials_get_request_metadata (inner_creds, ctx->pollset, ctx->service_url, composite_metadata_cb, ctx, closure_list); + return; + } } - } /* We're done!. */ - ctx->cb(ctx->user_data, ctx->md_elems->entries, ctx->md_elems->num_entries, - GRPC_CREDENTIALS_OK, closure_list); - composite_md_context_destroy(ctx); - grpc_closure_list_run(closure_list); -} - -static void composite_get_request_metadata(grpc_credentials *creds, - grpc_pollset *pollset, - const char *service_url, - grpc_credentials_metadata_cb cb, - void *user_data, - grpc_closure_list *closure_list) { - grpc_composite_credentials *c = (grpc_composite_credentials *)creds; + ctx->cb (ctx->user_data, ctx->md_elems->entries, ctx->md_elems->num_entries, GRPC_CREDENTIALS_OK, closure_list); + composite_md_context_destroy (ctx); + grpc_closure_list_run (closure_list); +} + +static void +composite_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_composite_credentials *c = (grpc_composite_credentials *) creds; grpc_composite_credentials_metadata_context *ctx; - if (!grpc_credentials_has_request_metadata(creds)) { - cb(user_data, NULL, 0, GRPC_CREDENTIALS_OK, closure_list); - return; - } - ctx = gpr_malloc(sizeof(grpc_composite_credentials_metadata_context)); - memset(ctx, 0, sizeof(grpc_composite_credentials_metadata_context)); - ctx->service_url = gpr_strdup(service_url); + if (!grpc_credentials_has_request_metadata (creds)) + { + cb (user_data, NULL, 0, GRPC_CREDENTIALS_OK, closure_list); + return; + } + ctx = gpr_malloc (sizeof (grpc_composite_credentials_metadata_context)); + memset (ctx, 0, sizeof (grpc_composite_credentials_metadata_context)); + ctx->service_url = gpr_strdup (service_url); ctx->user_data = user_data; ctx->cb = cb; ctx->composite_creds = c; ctx->pollset = pollset; - ctx->md_elems = grpc_credentials_md_store_create(c->inner.num_creds); - while (ctx->creds_index < c->inner.num_creds) { - grpc_credentials *inner_creds = c->inner.creds_array[ctx->creds_index++]; - if (grpc_credentials_has_request_metadata(inner_creds)) { - grpc_credentials_get_request_metadata(inner_creds, pollset, service_url, - composite_metadata_cb, ctx, - closure_list); - return; + ctx->md_elems = grpc_credentials_md_store_create (c->inner.num_creds); + while (ctx->creds_index < c->inner.num_creds) + { + grpc_credentials *inner_creds = c->inner.creds_array[ctx->creds_index++]; + if (grpc_credentials_has_request_metadata (inner_creds)) + { + grpc_credentials_get_request_metadata (inner_creds, pollset, service_url, composite_metadata_cb, ctx, closure_list); + return; + } } - } - GPR_ASSERT(0); /* Should have exited before. */ -} - -static grpc_security_status composite_create_security_connector( - grpc_credentials *creds, const char *target, const grpc_channel_args *args, - grpc_credentials *request_metadata_creds, - grpc_channel_security_connector **sc, grpc_channel_args **new_args) { - grpc_composite_credentials *c = (grpc_composite_credentials *)creds; - if (c->connector_creds == NULL) { - gpr_log(GPR_ERROR, - "Cannot create security connector, missing connector credentials."); - return GRPC_SECURITY_ERROR; - } - return grpc_credentials_create_security_connector(c->connector_creds, target, - args, creds, sc, new_args); + GPR_ASSERT (0); /* Should have exited before. */ +} + +static grpc_security_status +composite_create_security_connector (grpc_credentials * creds, const char *target, const grpc_channel_args * args, grpc_credentials * request_metadata_creds, grpc_channel_security_connector ** sc, grpc_channel_args ** new_args) +{ + grpc_composite_credentials *c = (grpc_composite_credentials *) creds; + if (c->connector_creds == NULL) + { + gpr_log (GPR_ERROR, "Cannot create security connector, missing connector credentials."); + return GRPC_SECURITY_ERROR; + } + return grpc_credentials_create_security_connector (c->connector_creds, target, args, creds, sc, new_args); } static grpc_credentials_vtable composite_credentials_vtable = { - composite_destruct, composite_has_request_metadata, - composite_has_request_metadata_only, composite_get_request_metadata, - composite_create_security_connector}; + composite_destruct, composite_has_request_metadata, + composite_has_request_metadata_only, composite_get_request_metadata, + composite_create_security_connector +}; -static grpc_credentials_array get_creds_array(grpc_credentials **creds_addr) { +static grpc_credentials_array +get_creds_array (grpc_credentials ** creds_addr) +{ grpc_credentials_array result; grpc_credentials *creds = *creds_addr; result.creds_array = creds_addr; result.num_creds = 1; - if (strcmp(creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0) { - result = *grpc_composite_credentials_get_credentials(creds); - } + if (strcmp (creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0) + { + result = *grpc_composite_credentials_get_credentials (creds); + } return result; } -grpc_credentials *grpc_composite_credentials_create(grpc_credentials *creds1, - grpc_credentials *creds2, - void *reserved) { +grpc_credentials * +grpc_composite_credentials_create (grpc_credentials * creds1, grpc_credentials * creds2, void *reserved) +{ size_t i; size_t creds_array_byte_size; grpc_credentials_array creds1_array; grpc_credentials_array creds2_array; grpc_composite_credentials *c; - GPR_ASSERT(reserved == NULL); - GPR_ASSERT(creds1 != NULL); - GPR_ASSERT(creds2 != NULL); - c = gpr_malloc(sizeof(grpc_composite_credentials)); - memset(c, 0, sizeof(grpc_composite_credentials)); + GPR_ASSERT (reserved == NULL); + GPR_ASSERT (creds1 != NULL); + GPR_ASSERT (creds2 != NULL); + c = gpr_malloc (sizeof (grpc_composite_credentials)); + memset (c, 0, sizeof (grpc_composite_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_COMPOSITE; c->base.vtable = &composite_credentials_vtable; - gpr_ref_init(&c->base.refcount, 1); - creds1_array = get_creds_array(&creds1); - creds2_array = get_creds_array(&creds2); + gpr_ref_init (&c->base.refcount, 1); + creds1_array = get_creds_array (&creds1); + creds2_array = get_creds_array (&creds2); c->inner.num_creds = creds1_array.num_creds + creds2_array.num_creds; - creds_array_byte_size = c->inner.num_creds * sizeof(grpc_credentials *); - c->inner.creds_array = gpr_malloc(creds_array_byte_size); - memset(c->inner.creds_array, 0, creds_array_byte_size); - for (i = 0; i < creds1_array.num_creds; i++) { - grpc_credentials *cur_creds = creds1_array.creds_array[i]; - if (!grpc_credentials_has_request_metadata_only(cur_creds)) { - if (c->connector_creds == NULL) { - c->connector_creds = cur_creds; - } else { - gpr_log(GPR_ERROR, "Cannot compose multiple connector credentials."); - goto fail; - } + creds_array_byte_size = c->inner.num_creds * sizeof (grpc_credentials *); + c->inner.creds_array = gpr_malloc (creds_array_byte_size); + memset (c->inner.creds_array, 0, creds_array_byte_size); + for (i = 0; i < creds1_array.num_creds; i++) + { + grpc_credentials *cur_creds = creds1_array.creds_array[i]; + if (!grpc_credentials_has_request_metadata_only (cur_creds)) + { + if (c->connector_creds == NULL) + { + c->connector_creds = cur_creds; + } + else + { + gpr_log (GPR_ERROR, "Cannot compose multiple connector credentials."); + goto fail; + } + } + c->inner.creds_array[i] = grpc_credentials_ref (cur_creds); } - c->inner.creds_array[i] = grpc_credentials_ref(cur_creds); - } - for (i = 0; i < creds2_array.num_creds; i++) { - grpc_credentials *cur_creds = creds2_array.creds_array[i]; - if (!grpc_credentials_has_request_metadata_only(cur_creds)) { - if (c->connector_creds == NULL) { - c->connector_creds = cur_creds; - } else { - gpr_log(GPR_ERROR, "Cannot compose multiple connector credentials."); - goto fail; - } + for (i = 0; i < creds2_array.num_creds; i++) + { + grpc_credentials *cur_creds = creds2_array.creds_array[i]; + if (!grpc_credentials_has_request_metadata_only (cur_creds)) + { + if (c->connector_creds == NULL) + { + c->connector_creds = cur_creds; + } + else + { + gpr_log (GPR_ERROR, "Cannot compose multiple connector credentials."); + goto fail; + } + } + c->inner.creds_array[i + creds1_array.num_creds] = grpc_credentials_ref (cur_creds); } - c->inner.creds_array[i + creds1_array.num_creds] = - grpc_credentials_ref(cur_creds); - } return &c->base; fail: - grpc_credentials_unref(&c->base); + grpc_credentials_unref (&c->base); return NULL; } -const grpc_credentials_array *grpc_composite_credentials_get_credentials( - grpc_credentials *creds) { - const grpc_composite_credentials *c = - (const grpc_composite_credentials *)creds; - GPR_ASSERT(strcmp(creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0); +const grpc_credentials_array * +grpc_composite_credentials_get_credentials (grpc_credentials * creds) +{ + const grpc_composite_credentials *c = (const grpc_composite_credentials *) creds; + GPR_ASSERT (strcmp (creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0); return &c->inner; } -grpc_credentials *grpc_credentials_contains_type( - grpc_credentials *creds, const char *type, - grpc_credentials **composite_creds) { +grpc_credentials * +grpc_credentials_contains_type (grpc_credentials * creds, const char *type, grpc_credentials ** composite_creds) +{ size_t i; - if (strcmp(creds->type, type) == 0) { - if (composite_creds != NULL) *composite_creds = NULL; - return creds; - } else if (strcmp(creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0) { - const grpc_credentials_array *inner_creds_array = - grpc_composite_credentials_get_credentials(creds); - for (i = 0; i < inner_creds_array->num_creds; i++) { - if (strcmp(type, inner_creds_array->creds_array[i]->type) == 0) { - if (composite_creds != NULL) *composite_creds = creds; - return inner_creds_array->creds_array[i]; - } + if (strcmp (creds->type, type) == 0) + { + if (composite_creds != NULL) + *composite_creds = NULL; + return creds; + } + else if (strcmp (creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0) + { + const grpc_credentials_array *inner_creds_array = grpc_composite_credentials_get_credentials (creds); + for (i = 0; i < inner_creds_array->num_creds; i++) + { + if (strcmp (type, inner_creds_array->creds_array[i]->type) == 0) + { + if (composite_creds != NULL) + *composite_creds = creds; + return inner_creds_array->creds_array[i]; + } + } } - } return NULL; } /* -- IAM credentials. -- */ -static void iam_destruct(grpc_credentials *creds) { - grpc_google_iam_credentials *c = (grpc_google_iam_credentials *)creds; - grpc_credentials_md_store_unref(c->iam_md); +static void +iam_destruct (grpc_credentials * creds) +{ + grpc_google_iam_credentials *c = (grpc_google_iam_credentials *) creds; + grpc_credentials_md_store_unref (c->iam_md); } -static int iam_has_request_metadata(const grpc_credentials *creds) { return 1; } +static int +iam_has_request_metadata (const grpc_credentials * creds) +{ + return 1; +} -static int iam_has_request_metadata_only(const grpc_credentials *creds) { +static int +iam_has_request_metadata_only (const grpc_credentials * creds) +{ return 1; } -static void iam_get_request_metadata(grpc_credentials *creds, - grpc_pollset *pollset, - const char *service_url, - grpc_credentials_metadata_cb cb, - void *user_data, - grpc_closure_list *closure_list) { - grpc_google_iam_credentials *c = (grpc_google_iam_credentials *)creds; - cb(user_data, c->iam_md->entries, c->iam_md->num_entries, GRPC_CREDENTIALS_OK, - closure_list); +static void +iam_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_google_iam_credentials *c = (grpc_google_iam_credentials *) creds; + cb (user_data, c->iam_md->entries, c->iam_md->num_entries, GRPC_CREDENTIALS_OK, closure_list); } static grpc_credentials_vtable iam_vtable = { - iam_destruct, iam_has_request_metadata, iam_has_request_metadata_only, - iam_get_request_metadata, NULL}; + iam_destruct, iam_has_request_metadata, iam_has_request_metadata_only, + iam_get_request_metadata, NULL +}; -grpc_credentials *grpc_google_iam_credentials_create( - const char *token, const char *authority_selector, void *reserved) { +grpc_credentials * +grpc_google_iam_credentials_create (const char *token, const char *authority_selector, void *reserved) +{ grpc_google_iam_credentials *c; - GPR_ASSERT(reserved == NULL); - GPR_ASSERT(token != NULL); - GPR_ASSERT(authority_selector != NULL); - c = gpr_malloc(sizeof(grpc_google_iam_credentials)); - memset(c, 0, sizeof(grpc_google_iam_credentials)); + GPR_ASSERT (reserved == NULL); + GPR_ASSERT (token != NULL); + GPR_ASSERT (authority_selector != NULL); + c = gpr_malloc (sizeof (grpc_google_iam_credentials)); + memset (c, 0, sizeof (grpc_google_iam_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_IAM; c->base.vtable = &iam_vtable; - gpr_ref_init(&c->base.refcount, 1); - c->iam_md = grpc_credentials_md_store_create(2); - grpc_credentials_md_store_add_cstrings( - c->iam_md, GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, token); - grpc_credentials_md_store_add_cstrings( - c->iam_md, GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, authority_selector); + gpr_ref_init (&c->base.refcount, 1); + c->iam_md = grpc_credentials_md_store_create (2); + grpc_credentials_md_store_add_cstrings (c->iam_md, GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, token); + grpc_credentials_md_store_add_cstrings (c->iam_md, GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, authority_selector); return &c->base; } /* -- Plugin credentials. -- */ -typedef struct { +typedef struct +{ void *user_data; grpc_credentials_metadata_cb cb; } grpc_metadata_plugin_request; -static void plugin_destruct(grpc_credentials *creds) { - grpc_plugin_credentials *c = (grpc_plugin_credentials *)creds; - if (c->plugin.state != NULL && c->plugin.destroy != NULL) { - c->plugin.destroy(c->plugin.state); - } +static void +plugin_destruct (grpc_credentials * creds) +{ + grpc_plugin_credentials *c = (grpc_plugin_credentials *) creds; + if (c->plugin.state != NULL && c->plugin.destroy != NULL) + { + c->plugin.destroy (c->plugin.state); + } } -static int plugin_has_request_metadata(const grpc_credentials *creds) { +static int +plugin_has_request_metadata (const grpc_credentials * creds) +{ return 1; } -static int plugin_has_request_metadata_only(const grpc_credentials *creds) { +static int +plugin_has_request_metadata_only (const grpc_credentials * creds) +{ return 1; } -static void plugin_md_request_metadata_ready(void *request, - const grpc_metadata *md, - size_t num_md, - grpc_status_code status, - const char *error_details) { +static void +plugin_md_request_metadata_ready (void *request, const grpc_metadata * md, size_t num_md, grpc_status_code status, const char *error_details) +{ /* called from application code */ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_metadata_plugin_request *r = (grpc_metadata_plugin_request *)request; - if (status != GRPC_STATUS_OK) { - if (error_details != NULL) { - gpr_log(GPR_ERROR, "Getting metadata from plugin failed with error: %s", - error_details); + grpc_metadata_plugin_request *r = (grpc_metadata_plugin_request *) request; + if (status != GRPC_STATUS_OK) + { + if (error_details != NULL) + { + gpr_log (GPR_ERROR, "Getting metadata from plugin failed with error: %s", error_details); + } + r->cb (r->user_data, NULL, 0, GRPC_CREDENTIALS_ERROR, &closure_list); } - r->cb(r->user_data, NULL, 0, GRPC_CREDENTIALS_ERROR, &closure_list); - } else { - size_t i; - grpc_credentials_md *md_array = NULL; - if (num_md > 0) { - md_array = gpr_malloc(num_md * sizeof(grpc_credentials_md)); - for (i = 0; i < num_md; i++) { - md_array[i].key = gpr_slice_from_copied_string(md[i].key); - md_array[i].value = - gpr_slice_from_copied_buffer(md[i].value, md[i].value_length); - } + else + { + size_t i; + grpc_credentials_md *md_array = NULL; + if (num_md > 0) + { + md_array = gpr_malloc (num_md * sizeof (grpc_credentials_md)); + for (i = 0; i < num_md; i++) + { + md_array[i].key = gpr_slice_from_copied_string (md[i].key); + md_array[i].value = gpr_slice_from_copied_buffer (md[i].value, md[i].value_length); + } + } + r->cb (r->user_data, md_array, num_md, GRPC_CREDENTIALS_OK, &closure_list); + if (md_array != NULL) + { + for (i = 0; i < num_md; i++) + { + gpr_slice_unref (md_array[i].key); + gpr_slice_unref (md_array[i].value); + } + gpr_free (md_array); + } } - r->cb(r->user_data, md_array, num_md, GRPC_CREDENTIALS_OK, &closure_list); - if (md_array != NULL) { - for (i = 0; i < num_md; i++) { - gpr_slice_unref(md_array[i].key); - gpr_slice_unref(md_array[i].value); - } - gpr_free(md_array); + gpr_free (r); +} + +static void +plugin_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_plugin_credentials *c = (grpc_plugin_credentials *) creds; + if (c->plugin.get_metadata != NULL) + { + grpc_metadata_plugin_request *request = gpr_malloc (sizeof (*request)); + memset (request, 0, sizeof (*request)); + request->user_data = user_data; + request->cb = cb; + c->plugin.get_metadata (c->plugin.state, service_url, plugin_md_request_metadata_ready, request); + } + else + { + cb (user_data, NULL, 0, GRPC_CREDENTIALS_OK, closure_list); } - } - gpr_free(r); -} - -static void plugin_get_request_metadata(grpc_credentials *creds, - grpc_pollset *pollset, - const char *service_url, - grpc_credentials_metadata_cb cb, - void *user_data, - grpc_closure_list *closure_list) { - grpc_plugin_credentials *c = (grpc_plugin_credentials *)creds; - if (c->plugin.get_metadata != NULL) { - grpc_metadata_plugin_request *request = gpr_malloc(sizeof(*request)); - memset(request, 0, sizeof(*request)); - request->user_data = user_data; - request->cb = cb; - c->plugin.get_metadata(c->plugin.state, service_url, - plugin_md_request_metadata_ready, request); - } else { - cb(user_data, NULL, 0, GRPC_CREDENTIALS_OK, closure_list); - } } static grpc_credentials_vtable plugin_vtable = { - plugin_destruct, plugin_has_request_metadata, - plugin_has_request_metadata_only, plugin_get_request_metadata, NULL}; - -grpc_credentials *grpc_metadata_credentials_create_from_plugin( - grpc_metadata_credentials_plugin plugin, void *reserved) { - grpc_plugin_credentials *c = gpr_malloc(sizeof(*c)); - GPR_ASSERT(reserved == NULL); - memset(c, 0, sizeof(*c)); + plugin_destruct, plugin_has_request_metadata, + plugin_has_request_metadata_only, plugin_get_request_metadata, NULL +}; + +grpc_credentials * +grpc_metadata_credentials_create_from_plugin (grpc_metadata_credentials_plugin plugin, void *reserved) +{ + grpc_plugin_credentials *c = gpr_malloc (sizeof (*c)); + GPR_ASSERT (reserved == NULL); + memset (c, 0, sizeof (*c)); c->base.type = GRPC_CREDENTIALS_TYPE_METADATA_PLUGIN; c->base.vtable = &plugin_vtable; - gpr_ref_init(&c->base.refcount, 1); + gpr_ref_init (&c->base.refcount, 1); c->plugin = plugin; return &c->base; } diff --git a/src/core/security/credentials.h b/src/core/security/credentials.h index 09b32132ed2..2de67e40c8b 100644 --- a/src/core/security/credentials.h +++ b/src/core/security/credentials.h @@ -47,7 +47,8 @@ struct grpc_httpcli_response; /* --- Constants. --- */ -typedef enum { +typedef enum +{ GRPC_CREDENTIALS_OK = 0, GRPC_CREDENTIALS_ERROR } grpc_credentials_status; @@ -89,172 +90,146 @@ typedef enum { /* --- grpc_credentials_md. --- */ -typedef struct { +typedef struct +{ gpr_slice key; gpr_slice value; } grpc_credentials_md; -typedef struct { +typedef struct +{ grpc_credentials_md *entries; size_t num_entries; size_t allocated; gpr_refcount refcount; } grpc_credentials_md_store; -grpc_credentials_md_store *grpc_credentials_md_store_create( - size_t initial_capacity); +grpc_credentials_md_store *grpc_credentials_md_store_create (size_t initial_capacity); /* Will ref key and value. */ -void grpc_credentials_md_store_add(grpc_credentials_md_store *store, - gpr_slice key, gpr_slice value); -void grpc_credentials_md_store_add_cstrings(grpc_credentials_md_store *store, - const char *key, const char *value); -grpc_credentials_md_store *grpc_credentials_md_store_ref( - grpc_credentials_md_store *store); -void grpc_credentials_md_store_unref(grpc_credentials_md_store *store); +void grpc_credentials_md_store_add (grpc_credentials_md_store * store, gpr_slice key, gpr_slice value); +void grpc_credentials_md_store_add_cstrings (grpc_credentials_md_store * store, const char *key, const char *value); +grpc_credentials_md_store *grpc_credentials_md_store_ref (grpc_credentials_md_store * store); +void grpc_credentials_md_store_unref (grpc_credentials_md_store * store); /* --- grpc_credentials. --- */ /* Creates a fake transport security credentials object for testing. */ -grpc_credentials *grpc_fake_transport_security_credentials_create(void); +grpc_credentials *grpc_fake_transport_security_credentials_create (void); /* Creates a fake server transport security credentials object for testing. */ -grpc_server_credentials *grpc_fake_transport_security_server_credentials_create( - void); +grpc_server_credentials *grpc_fake_transport_security_server_credentials_create (void); /* It is the caller's responsibility to gpr_free the result if not NULL. */ -char *grpc_get_well_known_google_credentials_file_path(void); - -typedef void (*grpc_credentials_metadata_cb)(void *user_data, - grpc_credentials_md *md_elems, - size_t num_md, - grpc_credentials_status status, - grpc_closure_list *closure_list); - -typedef struct { - void (*destruct)(grpc_credentials *c); - int (*has_request_metadata)(const grpc_credentials *c); - int (*has_request_metadata_only)(const grpc_credentials *c); - void (*get_request_metadata)(grpc_credentials *c, grpc_pollset *pollset, - const char *service_url, - grpc_credentials_metadata_cb cb, void *user_data, - grpc_closure_list *closure_list); - grpc_security_status (*create_security_connector)( - grpc_credentials *c, const char *target, const grpc_channel_args *args, - grpc_credentials *request_metadata_creds, - grpc_channel_security_connector **sc, grpc_channel_args **new_args); +char *grpc_get_well_known_google_credentials_file_path (void); + +typedef void (*grpc_credentials_metadata_cb) (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list); + +typedef struct +{ + void (*destruct) (grpc_credentials * c); + int (*has_request_metadata) (const grpc_credentials * c); + int (*has_request_metadata_only) (const grpc_credentials * c); + void (*get_request_metadata) (grpc_credentials * c, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list); + grpc_security_status (*create_security_connector) (grpc_credentials * c, const char *target, const grpc_channel_args * args, grpc_credentials * request_metadata_creds, grpc_channel_security_connector ** sc, grpc_channel_args ** new_args); } grpc_credentials_vtable; -struct grpc_credentials { +struct grpc_credentials +{ const grpc_credentials_vtable *vtable; const char *type; gpr_refcount refcount; }; -grpc_credentials *grpc_credentials_ref(grpc_credentials *creds); -void grpc_credentials_unref(grpc_credentials *creds); -int grpc_credentials_has_request_metadata(grpc_credentials *creds); -int grpc_credentials_has_request_metadata_only(grpc_credentials *creds); -void grpc_credentials_get_request_metadata(grpc_credentials *creds, - grpc_pollset *pollset, - const char *service_url, - grpc_credentials_metadata_cb cb, - void *user_data, - grpc_closure_list *closure_list); +grpc_credentials *grpc_credentials_ref (grpc_credentials * creds); +void grpc_credentials_unref (grpc_credentials * creds); +int grpc_credentials_has_request_metadata (grpc_credentials * creds); +int grpc_credentials_has_request_metadata_only (grpc_credentials * creds); +void grpc_credentials_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list); /* 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_credentials_create_security_connector( - grpc_credentials *creds, const char *target, const grpc_channel_args *args, - grpc_credentials *request_metadata_creds, - grpc_channel_security_connector **sc, grpc_channel_args **new_args); +grpc_security_status grpc_credentials_create_security_connector (grpc_credentials * creds, const char *target, const grpc_channel_args * args, grpc_credentials * request_metadata_creds, grpc_channel_security_connector ** sc, grpc_channel_args ** new_args); -typedef struct { +typedef struct +{ grpc_credentials **creds_array; size_t num_creds; } grpc_credentials_array; -const grpc_credentials_array *grpc_composite_credentials_get_credentials( - grpc_credentials *composite_creds); +const grpc_credentials_array *grpc_composite_credentials_get_credentials (grpc_credentials * composite_creds); /* Returns creds if creds is of the specified type or the inner creds of the specified type (if found), if the creds is of type COMPOSITE. If composite_creds is not NULL, *composite_creds will point to creds if of type COMPOSITE in case of success. */ -grpc_credentials *grpc_credentials_contains_type( - grpc_credentials *creds, const char *type, - grpc_credentials **composite_creds); +grpc_credentials *grpc_credentials_contains_type (grpc_credentials * creds, const char *type, grpc_credentials ** composite_creds); /* Exposed for testing only. */ -grpc_credentials_status -grpc_oauth2_token_fetcher_credentials_parse_server_response( - const struct grpc_httpcli_response *response, - grpc_credentials_md_store **token_md, gpr_timespec *token_lifetime); -void grpc_flush_cached_google_default_credentials(void); +grpc_credentials_status grpc_oauth2_token_fetcher_credentials_parse_server_response (const struct grpc_httpcli_response *response, grpc_credentials_md_store ** token_md, gpr_timespec * token_lifetime); +void grpc_flush_cached_google_default_credentials (void); /* Metadata-only credentials with the specified key and value where asynchronicity can be simulated for testing. */ -grpc_credentials *grpc_md_only_test_credentials_create(const char *md_key, - const char *md_value, - int is_async); +grpc_credentials *grpc_md_only_test_credentials_create (const char *md_key, const char *md_value, int is_async); /* Private constructor for jwt credentials from an already parsed json key. Takes ownership of the key. */ -grpc_credentials * -grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - grpc_auth_json_key key, gpr_timespec token_lifetime); +grpc_credentials *grpc_service_account_jwt_access_credentials_create_from_auth_json_key (grpc_auth_json_key key, gpr_timespec token_lifetime); /* Private constructor for refresh token credentials from an already parsed refresh token. Takes ownership of the refresh token. */ -grpc_credentials *grpc_refresh_token_credentials_create_from_auth_refresh_token( - grpc_auth_refresh_token token); +grpc_credentials *grpc_refresh_token_credentials_create_from_auth_refresh_token (grpc_auth_refresh_token token); /* --- grpc_server_credentials. --- */ -typedef struct { - void (*destruct)(grpc_server_credentials *c); - grpc_security_status (*create_security_connector)( - grpc_server_credentials *c, grpc_security_connector **sc); +typedef struct +{ + void (*destruct) (grpc_server_credentials * c); + grpc_security_status (*create_security_connector) (grpc_server_credentials * c, grpc_security_connector ** sc); } grpc_server_credentials_vtable; /* TODO(jboeuf): Add a refcount. */ -struct grpc_server_credentials { +struct grpc_server_credentials +{ const grpc_server_credentials_vtable *vtable; const char *type; gpr_refcount refcount; grpc_auth_metadata_processor processor; }; -grpc_security_status grpc_server_credentials_create_security_connector( - grpc_server_credentials *creds, grpc_security_connector **sc); +grpc_security_status grpc_server_credentials_create_security_connector (grpc_server_credentials * creds, grpc_security_connector ** sc); -grpc_server_credentials *grpc_server_credentials_ref( - grpc_server_credentials *creds); +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_server_credentials * creds); /* -- Ssl credentials. -- */ -typedef struct { +typedef struct +{ grpc_credentials base; grpc_ssl_config config; } grpc_ssl_credentials; -typedef struct { +typedef struct +{ grpc_server_credentials base; grpc_ssl_server_config config; } grpc_ssl_server_credentials; /* -- Jwt credentials -- */ -typedef struct { +typedef struct +{ grpc_credentials base; /* Have a simple cache for now with just 1 entry. We could have a map based on the service_url for a more sophisticated one. */ gpr_mu cache_mu; - struct { + struct + { grpc_credentials_md_store *jwt_md; char *service_url; gpr_timespec jwt_expiration; @@ -269,17 +244,12 @@ typedef struct { This object is a base for credentials that need to acquire an oauth2 token from an http service. */ -typedef struct grpc_credentials_metadata_request - grpc_credentials_metadata_request; +typedef struct grpc_credentials_metadata_request grpc_credentials_metadata_request; -typedef void (*grpc_fetch_oauth2_func)(grpc_credentials_metadata_request *req, - grpc_httpcli_context *http_context, - grpc_pollset *pollset, - grpc_httpcli_response_cb response_cb, - gpr_timespec deadline, - grpc_closure_list *closure_list); +typedef void (*grpc_fetch_oauth2_func) (grpc_credentials_metadata_request * req, grpc_httpcli_context * http_context, grpc_pollset * pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline, grpc_closure_list * closure_list); -typedef struct { +typedef struct +{ grpc_credentials base; gpr_mu mu; grpc_credentials_md_store *access_token_md; @@ -290,21 +260,24 @@ typedef struct { /* -- GoogleRefreshToken credentials. -- */ -typedef struct { +typedef struct +{ grpc_oauth2_token_fetcher_credentials base; grpc_auth_refresh_token refresh_token; } grpc_google_refresh_token_credentials; /* -- Oauth2 Access Token credentials. -- */ -typedef struct { +typedef struct +{ grpc_credentials base; grpc_credentials_md_store *access_token_md; } grpc_access_token_credentials; /* -- Metadata-only Test credentials. -- */ -typedef struct { +typedef struct +{ grpc_credentials base; grpc_credentials_md_store *md_store; int is_async; @@ -312,14 +285,16 @@ typedef struct { /* -- GoogleIAM credentials. -- */ -typedef struct { +typedef struct +{ grpc_credentials base; grpc_credentials_md_store *iam_md; } grpc_google_iam_credentials; /* -- Composite credentials. -- */ -typedef struct { +typedef struct +{ grpc_credentials base; grpc_credentials_array inner; grpc_credentials *connector_creds; @@ -327,7 +302,8 @@ typedef struct { /* -- Plugin credentials. -- */ -typedef struct { +typedef struct +{ grpc_credentials base; grpc_metadata_credentials_plugin plugin; grpc_credentials_md_store *plugin_md; diff --git a/src/core/security/credentials_metadata.c b/src/core/security/credentials_metadata.c index b8a132f1eaf..f9a5f5fd4f7 100644 --- a/src/core/security/credentials_metadata.c +++ b/src/core/security/credentials_metadata.c @@ -37,65 +37,78 @@ #include -static void store_ensure_capacity(grpc_credentials_md_store *store) { - if (store->num_entries == store->allocated) { - store->allocated = (store->allocated == 0) ? 1 : store->allocated * 2; - store->entries = gpr_realloc( - store->entries, store->allocated * sizeof(grpc_credentials_md)); - } +static void +store_ensure_capacity (grpc_credentials_md_store * store) +{ + if (store->num_entries == store->allocated) + { + store->allocated = (store->allocated == 0) ? 1 : store->allocated * 2; + store->entries = gpr_realloc (store->entries, store->allocated * sizeof (grpc_credentials_md)); + } } -grpc_credentials_md_store *grpc_credentials_md_store_create( - size_t initial_capacity) { - grpc_credentials_md_store *store = - gpr_malloc(sizeof(grpc_credentials_md_store)); - memset(store, 0, sizeof(grpc_credentials_md_store)); - if (initial_capacity > 0) { - store->entries = gpr_malloc(initial_capacity * sizeof(grpc_credentials_md)); - store->allocated = initial_capacity; - } - gpr_ref_init(&store->refcount, 1); +grpc_credentials_md_store * +grpc_credentials_md_store_create (size_t initial_capacity) +{ + grpc_credentials_md_store *store = gpr_malloc (sizeof (grpc_credentials_md_store)); + memset (store, 0, sizeof (grpc_credentials_md_store)); + if (initial_capacity > 0) + { + store->entries = gpr_malloc (initial_capacity * sizeof (grpc_credentials_md)); + store->allocated = initial_capacity; + } + gpr_ref_init (&store->refcount, 1); return store; } -void grpc_credentials_md_store_add(grpc_credentials_md_store *store, - gpr_slice key, gpr_slice value) { - if (store == NULL) return; - store_ensure_capacity(store); - store->entries[store->num_entries].key = gpr_slice_ref(key); - store->entries[store->num_entries].value = gpr_slice_ref(value); +void +grpc_credentials_md_store_add (grpc_credentials_md_store * store, gpr_slice key, gpr_slice value) +{ + if (store == NULL) + return; + store_ensure_capacity (store); + store->entries[store->num_entries].key = gpr_slice_ref (key); + store->entries[store->num_entries].value = gpr_slice_ref (value); store->num_entries++; } -void grpc_credentials_md_store_add_cstrings(grpc_credentials_md_store *store, - const char *key, - const char *value) { - if (store == NULL) return; - store_ensure_capacity(store); - store->entries[store->num_entries].key = gpr_slice_from_copied_string(key); - store->entries[store->num_entries].value = - gpr_slice_from_copied_string(value); +void +grpc_credentials_md_store_add_cstrings (grpc_credentials_md_store * store, const char *key, const char *value) +{ + if (store == NULL) + return; + store_ensure_capacity (store); + store->entries[store->num_entries].key = gpr_slice_from_copied_string (key); + store->entries[store->num_entries].value = gpr_slice_from_copied_string (value); store->num_entries++; } -grpc_credentials_md_store *grpc_credentials_md_store_ref( - grpc_credentials_md_store *store) { - if (store == NULL) return NULL; - gpr_ref(&store->refcount); +grpc_credentials_md_store * +grpc_credentials_md_store_ref (grpc_credentials_md_store * store) +{ + if (store == NULL) + return NULL; + gpr_ref (&store->refcount); return store; } -void grpc_credentials_md_store_unref(grpc_credentials_md_store *store) { - if (store == NULL) return; - if (gpr_unref(&store->refcount)) { - if (store->entries != NULL) { - size_t i; - for (i = 0; i < store->num_entries; i++) { - gpr_slice_unref(store->entries[i].key); - gpr_slice_unref(store->entries[i].value); - } - gpr_free(store->entries); +void +grpc_credentials_md_store_unref (grpc_credentials_md_store * store) +{ + if (store == NULL) + return; + if (gpr_unref (&store->refcount)) + { + if (store->entries != NULL) + { + size_t i; + for (i = 0; i < store->num_entries; i++) + { + gpr_slice_unref (store->entries[i].key); + gpr_slice_unref (store->entries[i].value); + } + gpr_free (store->entries); + } + gpr_free (store); } - gpr_free(store); - } } diff --git a/src/core/security/credentials_posix.c b/src/core/security/credentials_posix.c index 20f67a7f149..ba897bd7c5e 100644 --- a/src/core/security/credentials_posix.c +++ b/src/core/security/credentials_posix.c @@ -44,17 +44,18 @@ #include "src/core/support/env.h" #include "src/core/support/string.h" -char *grpc_get_well_known_google_credentials_file_path(void) { +char * +grpc_get_well_known_google_credentials_file_path (void) +{ char *result = NULL; - char *home = gpr_getenv("HOME"); - if (home == NULL) { - gpr_log(GPR_ERROR, "Could not get HOME environment variable."); - return NULL; - } - gpr_asprintf(&result, "%s/.config/%s/%s", home, - GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY, - GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE); - gpr_free(home); + char *home = gpr_getenv ("HOME"); + if (home == NULL) + { + gpr_log (GPR_ERROR, "Could not get HOME environment variable."); + return NULL; + } + gpr_asprintf (&result, "%s/.config/%s/%s", home, GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY, GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE); + gpr_free (home); return result; } diff --git a/src/core/security/credentials_win32.c b/src/core/security/credentials_win32.c index 92dfd9bdfe6..26306471214 100644 --- a/src/core/security/credentials_win32.c +++ b/src/core/security/credentials_win32.c @@ -44,17 +44,18 @@ #include "src/core/support/env.h" #include "src/core/support/string.h" -char *grpc_get_well_known_google_credentials_file_path(void) { +char * +grpc_get_well_known_google_credentials_file_path (void) +{ char *result = NULL; - char *appdata_path = gpr_getenv("APPDATA"); - if (appdata_path == NULL) { - gpr_log(GPR_ERROR, "Could not get APPDATA environment variable."); - return NULL; - } - gpr_asprintf(&result, "%s/%s/%s", appdata_path, - GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY, - GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE); - gpr_free(appdata_path); + char *appdata_path = gpr_getenv ("APPDATA"); + if (appdata_path == NULL) + { + gpr_log (GPR_ERROR, "Could not get APPDATA environment variable."); + return NULL; + } + gpr_asprintf (&result, "%s/%s/%s", appdata_path, GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY, GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE); + gpr_free (appdata_path); return result; } diff --git a/src/core/security/google_default_credentials.c b/src/core/security/google_default_credentials.c index 4a7ab53c1e3..308f9a39f64 100644 --- a/src/core/security/google_default_credentials.c +++ b/src/core/security/google_default_credentials.c @@ -54,42 +54,53 @@ static int compute_engine_detection_done = 0; static gpr_mu g_mu; static gpr_once g_once = GPR_ONCE_INIT; -static void init_default_credentials(void) { gpr_mu_init(&g_mu); } +static void +init_default_credentials (void) +{ + gpr_mu_init (&g_mu); +} -typedef struct { +typedef struct +{ grpc_pollset pollset; int is_done; int success; } compute_engine_detector; -static void on_compute_engine_detection_http_response( - void *user_data, const grpc_httpcli_response *response, - grpc_closure_list *closure_list) { - compute_engine_detector *detector = (compute_engine_detector *)user_data; - if (response != NULL && response->status == 200 && response->hdr_count > 0) { - /* Internet providers can return a generic response to all requests, so - it is necessary to check that metadata header is present also. */ - size_t i; - for (i = 0; i < response->hdr_count; i++) { - grpc_httpcli_header *header = &response->hdrs[i]; - if (strcmp(header->key, "Metadata-Flavor") == 0 && - strcmp(header->value, "Google") == 0) { - detector->success = 1; - break; - } +static void +on_compute_engine_detection_http_response (void *user_data, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +{ + compute_engine_detector *detector = (compute_engine_detector *) user_data; + if (response != NULL && response->status == 200 && response->hdr_count > 0) + { + /* Internet providers can return a generic response to all requests, so + it is necessary to check that metadata header is present also. */ + size_t i; + for (i = 0; i < response->hdr_count; i++) + { + grpc_httpcli_header *header = &response->hdrs[i]; + if (strcmp (header->key, "Metadata-Flavor") == 0 && strcmp (header->value, "Google") == 0) + { + detector->success = 1; + break; + } + } } - } - gpr_mu_lock(GRPC_POLLSET_MU(&detector->pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&detector->pollset)); detector->is_done = 1; - grpc_pollset_kick(&detector->pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&detector->pollset)); + grpc_pollset_kick (&detector->pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&detector->pollset)); } -static void destroy_pollset(void *p, int s, grpc_closure_list *closure_list) { - grpc_pollset_destroy(p); +static void +destroy_pollset (void *p, int s, grpc_closure_list * closure_list) +{ + grpc_pollset_destroy (p); } -static int is_stack_running_on_compute_engine(void) { +static int +is_stack_running_on_compute_engine (void) +{ compute_engine_detector detector; grpc_httpcli_request request; grpc_httpcli_context context; @@ -98,137 +109,147 @@ static int is_stack_running_on_compute_engine(void) { /* The http call is local. If it takes more than one sec, it is for sure not on compute engine. */ - gpr_timespec max_detection_delay = gpr_time_from_seconds(1, GPR_TIMESPAN); + gpr_timespec max_detection_delay = gpr_time_from_seconds (1, GPR_TIMESPAN); - grpc_pollset_init(&detector.pollset); + grpc_pollset_init (&detector.pollset); detector.is_done = 0; detector.success = 0; - memset(&request, 0, sizeof(grpc_httpcli_request)); + memset (&request, 0, sizeof (grpc_httpcli_request)); request.host = GRPC_COMPUTE_ENGINE_DETECTION_HOST; request.path = "/"; - grpc_httpcli_context_init(&context); + grpc_httpcli_context_init (&context); - grpc_httpcli_get( - &context, &detector.pollset, &request, - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), max_detection_delay), - on_compute_engine_detection_http_response, &detector, &closure_list); + grpc_httpcli_get (&context, &detector.pollset, &request, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), max_detection_delay), on_compute_engine_detection_http_response, &detector, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_closure_list_run (&closure_list); /* 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. */ - gpr_mu_lock(GRPC_POLLSET_MU(&detector.pollset)); - while (!detector.is_done) { - grpc_pollset_worker worker; - grpc_pollset_work(&detector.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); - } - gpr_mu_unlock(GRPC_POLLSET_MU(&detector.pollset)); - - grpc_httpcli_context_destroy(&context); - grpc_closure_init(&destroy_closure, destroy_pollset, &detector.pollset); - grpc_pollset_shutdown(&detector.pollset, &destroy_closure, &closure_list); - grpc_closure_list_run(&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&detector.pollset)); + while (!detector.is_done) + { + grpc_pollset_worker worker; + grpc_pollset_work (&detector.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + } + gpr_mu_unlock (GRPC_POLLSET_MU (&detector.pollset)); + + grpc_httpcli_context_destroy (&context); + grpc_closure_init (&destroy_closure, destroy_pollset, &detector.pollset); + grpc_pollset_shutdown (&detector.pollset, &destroy_closure, &closure_list); + grpc_closure_list_run (&closure_list); return detector.success; } /* Takes ownership of creds_path if not NULL. */ -static grpc_credentials *create_default_creds_from_path(char *creds_path) { +static grpc_credentials * +create_default_creds_from_path (char *creds_path) +{ grpc_json *json = NULL; grpc_auth_json_key key; grpc_auth_refresh_token token; grpc_credentials *result = NULL; - gpr_slice creds_data = gpr_empty_slice(); + gpr_slice creds_data = gpr_empty_slice (); int file_ok = 0; - if (creds_path == NULL) goto end; - creds_data = gpr_load_file(creds_path, 0, &file_ok); - if (!file_ok) goto end; - json = grpc_json_parse_string_with_len( - (char *)GPR_SLICE_START_PTR(creds_data), GPR_SLICE_LENGTH(creds_data)); - if (json == NULL) goto end; + if (creds_path == NULL) + goto end; + creds_data = gpr_load_file (creds_path, 0, &file_ok); + if (!file_ok) + goto end; + json = grpc_json_parse_string_with_len ((char *) GPR_SLICE_START_PTR (creds_data), GPR_SLICE_LENGTH (creds_data)); + if (json == NULL) + goto end; /* First, try an auth json key. */ - key = grpc_auth_json_key_create_from_json(json); - 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); - goto end; - } + key = grpc_auth_json_key_create_from_json (json); + 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); + goto end; + } /* Then try a refresh token if the auth json key was invalid. */ - token = grpc_auth_refresh_token_create_from_json(json); - if (grpc_auth_refresh_token_is_valid(&token)) { - result = - grpc_refresh_token_credentials_create_from_auth_refresh_token(token); - goto end; - } + token = grpc_auth_refresh_token_create_from_json (json); + if (grpc_auth_refresh_token_is_valid (&token)) + { + result = grpc_refresh_token_credentials_create_from_auth_refresh_token (token); + goto end; + } end: - if (creds_path != NULL) gpr_free(creds_path); - gpr_slice_unref(creds_data); - if (json != NULL) grpc_json_destroy(json); + if (creds_path != NULL) + gpr_free (creds_path); + gpr_slice_unref (creds_data); + if (json != NULL) + grpc_json_destroy (json); return result; } -grpc_credentials *grpc_google_default_credentials_create(void) { +grpc_credentials * +grpc_google_default_credentials_create (void) +{ grpc_credentials *result = NULL; int serving_cached_credentials = 0; - gpr_once_init(&g_once, init_default_credentials); + gpr_once_init (&g_once, init_default_credentials); - gpr_mu_lock(&g_mu); + gpr_mu_lock (&g_mu); - if (default_credentials != NULL) { - result = grpc_credentials_ref(default_credentials); - serving_cached_credentials = 1; - goto end; - } + if (default_credentials != NULL) + { + result = grpc_credentials_ref (default_credentials); + serving_cached_credentials = 1; + goto end; + } /* First, try the environment variable. */ - result = create_default_creds_from_path( - gpr_getenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR)); - if (result != NULL) goto end; + result = create_default_creds_from_path (gpr_getenv (GRPC_GOOGLE_CREDENTIALS_ENV_VAR)); + if (result != NULL) + goto end; /* Then the well-known file. */ - result = create_default_creds_from_path( - grpc_get_well_known_google_credentials_file_path()); - if (result != NULL) goto end; + result = create_default_creds_from_path (grpc_get_well_known_google_credentials_file_path ()); + if (result != NULL) + goto end; /* 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(); - compute_engine_detection_done = 1; - if (need_compute_engine_creds) { - result = grpc_google_compute_engine_credentials_create(NULL); + if (!compute_engine_detection_done) + { + int need_compute_engine_creds = is_stack_running_on_compute_engine (); + compute_engine_detection_done = 1; + if (need_compute_engine_creds) + { + result = grpc_google_compute_engine_credentials_create (NULL); + } } - } end: - if (!serving_cached_credentials && result != NULL) { - /* Blend with default ssl credentials and add a global reference so that it - can be cached and re-served. */ - grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL); - default_credentials = grpc_credentials_ref( - grpc_composite_credentials_create(ssl_creds, result, NULL)); - GPR_ASSERT(default_credentials != NULL); - grpc_credentials_unref(ssl_creds); - grpc_credentials_unref(result); - result = default_credentials; - } - gpr_mu_unlock(&g_mu); + if (!serving_cached_credentials && result != NULL) + { + /* Blend with default ssl credentials and add a global reference so that it + can be cached and re-served. */ + grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL); + default_credentials = grpc_credentials_ref (grpc_composite_credentials_create (ssl_creds, result, NULL)); + GPR_ASSERT (default_credentials != NULL); + grpc_credentials_unref (ssl_creds); + grpc_credentials_unref (result); + result = default_credentials; + } + gpr_mu_unlock (&g_mu); return result; } -void grpc_flush_cached_google_default_credentials(void) { - gpr_once_init(&g_once, init_default_credentials); - gpr_mu_lock(&g_mu); - if (default_credentials != NULL) { - grpc_credentials_unref(default_credentials); - default_credentials = NULL; - } - gpr_mu_unlock(&g_mu); +void +grpc_flush_cached_google_default_credentials (void) +{ + gpr_once_init (&g_once, init_default_credentials); + gpr_mu_lock (&g_mu); + if (default_credentials != NULL) + { + grpc_credentials_unref (default_credentials); + default_credentials = NULL; + } + gpr_mu_unlock (&g_mu); } diff --git a/src/core/security/handshake.c b/src/core/security/handshake.c index caad12a6533..85f84ac963e 100644 --- a/src/core/security/handshake.c +++ b/src/core/security/handshake.c @@ -42,7 +42,8 @@ #define GRPC_INITIAL_HANDSHAKE_BUFFER_SIZE 256 -typedef struct { +typedef struct +{ grpc_security_connector *connector; tsi_handshaker *handshaker; unsigned char *handshake_buffer; @@ -58,123 +59,131 @@ typedef struct { grpc_closure on_handshake_data_received_from_peer; } grpc_security_handshake; -static void on_handshake_data_received_from_peer( - void *setup, int success, grpc_closure_list *closure_list); +static void on_handshake_data_received_from_peer (void *setup, int success, grpc_closure_list * closure_list); -static void on_handshake_data_sent_to_peer(void *setup, int success, - grpc_closure_list *closure_list); +static void on_handshake_data_sent_to_peer (void *setup, int success, grpc_closure_list * closure_list); -static void security_handshake_done(grpc_security_handshake *h, int is_success, - grpc_closure_list *closure_list) { - if (is_success) { - h->cb(h->user_data, GRPC_SECURITY_OK, h->wrapped_endpoint, - h->secure_endpoint, closure_list); - } else { - if (h->secure_endpoint != NULL) { - grpc_endpoint_shutdown(h->secure_endpoint, closure_list); - grpc_endpoint_destroy(h->secure_endpoint, closure_list); - } else { - grpc_endpoint_destroy(h->wrapped_endpoint, closure_list); +static void +security_handshake_done (grpc_security_handshake * h, int is_success, grpc_closure_list * closure_list) +{ + if (is_success) + { + h->cb (h->user_data, GRPC_SECURITY_OK, h->wrapped_endpoint, h->secure_endpoint, closure_list); } - h->cb(h->user_data, GRPC_SECURITY_ERROR, h->wrapped_endpoint, NULL, - closure_list); - } - if (h->handshaker != NULL) tsi_handshaker_destroy(h->handshaker); - if (h->handshake_buffer != NULL) gpr_free(h->handshake_buffer); - gpr_slice_buffer_destroy(&h->left_overs); - gpr_slice_buffer_destroy(&h->outgoing); - gpr_slice_buffer_destroy(&h->incoming); - GRPC_SECURITY_CONNECTOR_UNREF(h->connector, "handshake"); - gpr_free(h); + else + { + if (h->secure_endpoint != NULL) + { + grpc_endpoint_shutdown (h->secure_endpoint, closure_list); + grpc_endpoint_destroy (h->secure_endpoint, closure_list); + } + else + { + grpc_endpoint_destroy (h->wrapped_endpoint, closure_list); + } + h->cb (h->user_data, GRPC_SECURITY_ERROR, h->wrapped_endpoint, NULL, closure_list); + } + if (h->handshaker != NULL) + tsi_handshaker_destroy (h->handshaker); + if (h->handshake_buffer != NULL) + gpr_free (h->handshake_buffer); + gpr_slice_buffer_destroy (&h->left_overs); + gpr_slice_buffer_destroy (&h->outgoing); + gpr_slice_buffer_destroy (&h->incoming); + GRPC_SECURITY_CONNECTOR_UNREF (h->connector, "handshake"); + gpr_free (h); } -static void on_peer_checked(void *user_data, grpc_security_status status, - grpc_closure_list *closure_list) { +static void +on_peer_checked (void *user_data, grpc_security_status status, grpc_closure_list * closure_list) +{ grpc_security_handshake *h = user_data; tsi_frame_protector *protector; tsi_result result; - if (status != GRPC_SECURITY_OK) { - gpr_log(GPR_ERROR, "Error checking peer."); - security_handshake_done(h, 0, closure_list); - return; - } - result = - tsi_handshaker_create_frame_protector(h->handshaker, NULL, &protector); - if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Frame protector creation failed with error %s.", - tsi_result_to_string(result)); - security_handshake_done(h, 0, closure_list); - return; - } - h->secure_endpoint = - grpc_secure_endpoint_create(protector, h->wrapped_endpoint, - h->left_overs.slices, h->left_overs.count); + if (status != GRPC_SECURITY_OK) + { + gpr_log (GPR_ERROR, "Error checking peer."); + security_handshake_done (h, 0, closure_list); + return; + } + result = tsi_handshaker_create_frame_protector (h->handshaker, NULL, &protector); + if (result != TSI_OK) + { + gpr_log (GPR_ERROR, "Frame protector creation failed with error %s.", tsi_result_to_string (result)); + security_handshake_done (h, 0, closure_list); + return; + } + h->secure_endpoint = grpc_secure_endpoint_create (protector, h->wrapped_endpoint, h->left_overs.slices, h->left_overs.count); h->left_overs.count = 0; h->left_overs.length = 0; - security_handshake_done(h, 1, closure_list); + security_handshake_done (h, 1, closure_list); return; } -static void check_peer(grpc_security_handshake *h, - grpc_closure_list *closure_list) { +static void +check_peer (grpc_security_handshake * h, grpc_closure_list * closure_list) +{ grpc_security_status peer_status; tsi_peer peer; - tsi_result result = tsi_handshaker_extract_peer(h->handshaker, &peer); + tsi_result result = tsi_handshaker_extract_peer (h->handshaker, &peer); - if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Peer extraction failed with error %s", - tsi_result_to_string(result)); - security_handshake_done(h, 0, closure_list); - return; - } - peer_status = grpc_security_connector_check_peer(h->connector, peer, - on_peer_checked, h); - if (peer_status == GRPC_SECURITY_ERROR) { - gpr_log(GPR_ERROR, "Peer check failed."); - security_handshake_done(h, 0, closure_list); - return; - } else if (peer_status == GRPC_SECURITY_OK) { - on_peer_checked(h, peer_status, closure_list); - } + if (result != TSI_OK) + { + gpr_log (GPR_ERROR, "Peer extraction failed with error %s", tsi_result_to_string (result)); + security_handshake_done (h, 0, closure_list); + return; + } + peer_status = grpc_security_connector_check_peer (h->connector, peer, on_peer_checked, h); + if (peer_status == GRPC_SECURITY_ERROR) + { + gpr_log (GPR_ERROR, "Peer check failed."); + security_handshake_done (h, 0, closure_list); + return; + } + else if (peer_status == GRPC_SECURITY_OK) + { + on_peer_checked (h, peer_status, closure_list); + } } -static void send_handshake_bytes_to_peer(grpc_security_handshake *h, - grpc_closure_list *closure_list) { +static void +send_handshake_bytes_to_peer (grpc_security_handshake * h, grpc_closure_list * closure_list) +{ size_t offset = 0; tsi_result result = TSI_OK; gpr_slice to_send; - do { - size_t to_send_size = h->handshake_buffer_size - offset; - result = tsi_handshaker_get_bytes_to_send_to_peer( - h->handshaker, h->handshake_buffer + offset, &to_send_size); - offset += to_send_size; - if (result == TSI_INCOMPLETE_DATA) { - h->handshake_buffer_size *= 2; - h->handshake_buffer = - gpr_realloc(h->handshake_buffer, h->handshake_buffer_size); + do + { + size_t to_send_size = h->handshake_buffer_size - offset; + result = tsi_handshaker_get_bytes_to_send_to_peer (h->handshaker, h->handshake_buffer + offset, &to_send_size); + offset += to_send_size; + if (result == TSI_INCOMPLETE_DATA) + { + h->handshake_buffer_size *= 2; + h->handshake_buffer = gpr_realloc (h->handshake_buffer, h->handshake_buffer_size); + } } - } while (result == TSI_INCOMPLETE_DATA); + while (result == TSI_INCOMPLETE_DATA); - if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Handshake failed with error %s", - tsi_result_to_string(result)); - security_handshake_done(h, 0, closure_list); - return; - } + if (result != TSI_OK) + { + gpr_log (GPR_ERROR, "Handshake failed with error %s", tsi_result_to_string (result)); + security_handshake_done (h, 0, closure_list); + return; + } - to_send = - gpr_slice_from_copied_buffer((const char *)h->handshake_buffer, offset); - gpr_slice_buffer_reset_and_unref(&h->outgoing); - gpr_slice_buffer_add(&h->outgoing, to_send); + to_send = gpr_slice_from_copied_buffer ((const char *) h->handshake_buffer, offset); + gpr_slice_buffer_reset_and_unref (&h->outgoing); + gpr_slice_buffer_add (&h->outgoing, to_send); /* TODO(klempner,jboeuf): This should probably use the client setup - deadline */ - grpc_endpoint_write(h->wrapped_endpoint, &h->outgoing, - &h->on_handshake_data_sent_to_peer, closure_list); + deadline */ + grpc_endpoint_write (h->wrapped_endpoint, &h->outgoing, &h->on_handshake_data_sent_to_peer, closure_list); } -static void on_handshake_data_received_from_peer( - void *handshake, int success, grpc_closure_list *closure_list) { +static void +on_handshake_data_received_from_peer (void *handshake, int success, grpc_closure_list * closure_list) +{ grpc_security_handshake *h = handshake; size_t consumed_slice_size = 0; tsi_result result = TSI_OK; @@ -182,108 +191,106 @@ static void on_handshake_data_received_from_peer( size_t num_left_overs; int has_left_overs_in_current_slice = 0; - if (!success) { - gpr_log(GPR_ERROR, "Read failed."); - security_handshake_done(h, 0, closure_list); - return; - } + if (!success) + { + gpr_log (GPR_ERROR, "Read failed."); + security_handshake_done (h, 0, closure_list); + return; + } + + for (i = 0; i < h->incoming.count; i++) + { + consumed_slice_size = GPR_SLICE_LENGTH (h->incoming.slices[i]); + result = tsi_handshaker_process_bytes_from_peer (h->handshaker, GPR_SLICE_START_PTR (h->incoming.slices[i]), &consumed_slice_size); + if (!tsi_handshaker_is_in_progress (h->handshaker)) + break; + } - for (i = 0; i < h->incoming.count; i++) { - consumed_slice_size = GPR_SLICE_LENGTH(h->incoming.slices[i]); - result = tsi_handshaker_process_bytes_from_peer( - h->handshaker, GPR_SLICE_START_PTR(h->incoming.slices[i]), - &consumed_slice_size); - if (!tsi_handshaker_is_in_progress(h->handshaker)) break; - } + if (tsi_handshaker_is_in_progress (h->handshaker)) + { + /* We may need more data. */ + if (result == TSI_INCOMPLETE_DATA) + { + grpc_endpoint_read (h->wrapped_endpoint, &h->incoming, &h->on_handshake_data_received_from_peer, closure_list); + return; + } + else + { + send_handshake_bytes_to_peer (h, closure_list); + return; + } + } - if (tsi_handshaker_is_in_progress(h->handshaker)) { - /* We may need more data. */ - if (result == TSI_INCOMPLETE_DATA) { - grpc_endpoint_read(h->wrapped_endpoint, &h->incoming, - &h->on_handshake_data_received_from_peer, - closure_list); - return; - } else { - send_handshake_bytes_to_peer(h, closure_list); + if (result != TSI_OK) + { + gpr_log (GPR_ERROR, "Handshake failed with error %s", tsi_result_to_string (result)); + security_handshake_done (h, 0, closure_list); return; } - } - - if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Handshake failed with error %s", - tsi_result_to_string(result)); - security_handshake_done(h, 0, closure_list); - return; - } /* Handshake is done and successful this point. */ - has_left_overs_in_current_slice = - (consumed_slice_size < GPR_SLICE_LENGTH(h->incoming.slices[i])); - num_left_overs = - (has_left_overs_in_current_slice ? 1 : 0) + h->incoming.count - i - 1; - if (num_left_overs == 0) { - check_peer(h, closure_list); - return; - } + has_left_overs_in_current_slice = (consumed_slice_size < GPR_SLICE_LENGTH (h->incoming.slices[i])); + num_left_overs = (has_left_overs_in_current_slice ? 1 : 0) + h->incoming.count - i - 1; + if (num_left_overs == 0) + { + check_peer (h, closure_list); + return; + } /* Put the leftovers in our buffer (ownership transfered). */ - if (has_left_overs_in_current_slice) { - gpr_slice_buffer_add( - &h->left_overs, - gpr_slice_split_tail(&h->incoming.slices[i], consumed_slice_size)); - gpr_slice_unref( - h->incoming.slices[i]); /* split_tail above increments refcount. */ - } - gpr_slice_buffer_addn( - &h->left_overs, &h->incoming.slices[i + 1], - num_left_overs - (size_t)has_left_overs_in_current_slice); - check_peer(h, closure_list); + if (has_left_overs_in_current_slice) + { + gpr_slice_buffer_add (&h->left_overs, gpr_slice_split_tail (&h->incoming.slices[i], consumed_slice_size)); + gpr_slice_unref (h->incoming.slices[i]); /* split_tail above increments refcount. */ + } + gpr_slice_buffer_addn (&h->left_overs, &h->incoming.slices[i + 1], num_left_overs - (size_t) has_left_overs_in_current_slice); + check_peer (h, closure_list); } /* If handshake is NULL, the handshake is done. */ -static void on_handshake_data_sent_to_peer(void *handshake, int success, - grpc_closure_list *closure_list) { +static void +on_handshake_data_sent_to_peer (void *handshake, int success, grpc_closure_list * closure_list) +{ grpc_security_handshake *h = handshake; /* Make sure that write is OK. */ - if (!success) { - gpr_log(GPR_ERROR, "Write failed."); - if (handshake != NULL) security_handshake_done(h, 0, closure_list); - return; - } + if (!success) + { + gpr_log (GPR_ERROR, "Write failed."); + if (handshake != NULL) + security_handshake_done (h, 0, closure_list); + return; + } /* We may be done. */ - if (tsi_handshaker_is_in_progress(h->handshaker)) { - /* TODO(klempner,jboeuf): This should probably use the client setup - deadline */ - grpc_endpoint_read(h->wrapped_endpoint, &h->incoming, - &h->on_handshake_data_received_from_peer, closure_list); - } else { - check_peer(h, closure_list); - } + if (tsi_handshaker_is_in_progress (h->handshaker)) + { + /* TODO(klempner,jboeuf): This should probably use the client setup + deadline */ + grpc_endpoint_read (h->wrapped_endpoint, &h->incoming, &h->on_handshake_data_received_from_peer, closure_list); + } + else + { + check_peer (h, closure_list); + } } -void grpc_do_security_handshake(tsi_handshaker *handshaker, - grpc_security_connector *connector, - grpc_endpoint *nonsecure_endpoint, - grpc_security_handshake_done_cb cb, - void *user_data, - grpc_closure_list *closure_list) { - grpc_security_handshake *h = gpr_malloc(sizeof(grpc_security_handshake)); - memset(h, 0, sizeof(grpc_security_handshake)); +void +grpc_do_security_handshake (tsi_handshaker * handshaker, grpc_security_connector * connector, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_security_handshake *h = gpr_malloc (sizeof (grpc_security_handshake)); + memset (h, 0, sizeof (grpc_security_handshake)); h->handshaker = handshaker; - h->connector = GRPC_SECURITY_CONNECTOR_REF(connector, "handshake"); + h->connector = GRPC_SECURITY_CONNECTOR_REF (connector, "handshake"); h->handshake_buffer_size = GRPC_INITIAL_HANDSHAKE_BUFFER_SIZE; - h->handshake_buffer = gpr_malloc(h->handshake_buffer_size); + h->handshake_buffer = gpr_malloc (h->handshake_buffer_size); h->wrapped_endpoint = nonsecure_endpoint; h->user_data = user_data; h->cb = cb; - grpc_closure_init(&h->on_handshake_data_sent_to_peer, - on_handshake_data_sent_to_peer, h); - grpc_closure_init(&h->on_handshake_data_received_from_peer, - on_handshake_data_received_from_peer, h); - gpr_slice_buffer_init(&h->left_overs); - gpr_slice_buffer_init(&h->outgoing); - gpr_slice_buffer_init(&h->incoming); - send_handshake_bytes_to_peer(h, closure_list); + grpc_closure_init (&h->on_handshake_data_sent_to_peer, on_handshake_data_sent_to_peer, h); + grpc_closure_init (&h->on_handshake_data_received_from_peer, on_handshake_data_received_from_peer, h); + gpr_slice_buffer_init (&h->left_overs); + gpr_slice_buffer_init (&h->outgoing); + gpr_slice_buffer_init (&h->incoming); + send_handshake_bytes_to_peer (h, closure_list); } diff --git a/src/core/security/handshake.h b/src/core/security/handshake.h index 368e8bf5e1b..4d518e7edf1 100644 --- a/src/core/security/handshake.h +++ b/src/core/security/handshake.h @@ -38,11 +38,6 @@ #include "src/core/security/security_connector.h" /* Calls the callback upon completion. Takes owership of handshaker. */ -void grpc_do_security_handshake(tsi_handshaker *handshaker, - grpc_security_connector *connector, - grpc_endpoint *nonsecure_endpoint, - grpc_security_handshake_done_cb cb, - void *user_data, - grpc_closure_list *closure_list); +void grpc_do_security_handshake (tsi_handshaker * handshaker, grpc_security_connector * connector, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_SECURITY_HANDSHAKE_H */ diff --git a/src/core/security/json_token.c b/src/core/security/json_token.c index 021912f3337..cf9b25bdc6c 100644 --- a/src/core/security/json_token.c +++ b/src/core/security/json_token.c @@ -49,7 +49,7 @@ /* --- Constants. --- */ /* 1 hour max. */ -const gpr_timespec grpc_max_auth_token_lifetime = {3600, 0, GPR_TIMESPAN}; +const gpr_timespec grpc_max_auth_token_lifetime = { 3600, 0, GPR_TIMESPAN }; #define GRPC_JWT_RSA_SHA256_ALGORITHM "RS256" #define GRPC_JWT_TYPE "JWT" @@ -60,346 +60,398 @@ static grpc_jwt_encode_and_sign_override g_jwt_encode_and_sign_override = NULL; /* --- grpc_auth_json_key. --- */ -static const char *json_get_string_property(const grpc_json *json, - const char *prop_name) { +static const char * +json_get_string_property (const grpc_json * json, const char *prop_name) +{ grpc_json *child; - for (child = json->child; child != NULL; child = child->next) { - if (strcmp(child->key, prop_name) == 0) break; - } - if (child == NULL || child->type != GRPC_JSON_STRING) { - gpr_log(GPR_ERROR, "Invalid or missing %s property.", prop_name); - return NULL; - } + for (child = json->child; child != NULL; child = child->next) + { + if (strcmp (child->key, prop_name) == 0) + break; + } + if (child == NULL || child->type != GRPC_JSON_STRING) + { + gpr_log (GPR_ERROR, "Invalid or missing %s property.", prop_name); + return NULL; + } return child->value; } -static int set_json_key_string_property(const grpc_json *json, - const char *prop_name, - char **json_key_field) { - const char *prop_value = json_get_string_property(json, prop_name); - if (prop_value == NULL) return 0; - *json_key_field = gpr_strdup(prop_value); +static int +set_json_key_string_property (const grpc_json * json, const char *prop_name, char **json_key_field) +{ + const char *prop_value = json_get_string_property (json, prop_name); + if (prop_value == NULL) + return 0; + *json_key_field = gpr_strdup (prop_value); return 1; } -int grpc_auth_json_key_is_valid(const grpc_auth_json_key *json_key) { - return (json_key != NULL) && - strcmp(json_key->type, GRPC_AUTH_JSON_TYPE_INVALID); +int +grpc_auth_json_key_is_valid (const grpc_auth_json_key * json_key) +{ + return (json_key != NULL) && strcmp (json_key->type, GRPC_AUTH_JSON_TYPE_INVALID); } -grpc_auth_json_key grpc_auth_json_key_create_from_json(const grpc_json *json) { +grpc_auth_json_key +grpc_auth_json_key_create_from_json (const grpc_json * json) +{ grpc_auth_json_key result; BIO *bio = NULL; const char *prop_value; int success = 0; - memset(&result, 0, sizeof(grpc_auth_json_key)); + memset (&result, 0, sizeof (grpc_auth_json_key)); result.type = GRPC_AUTH_JSON_TYPE_INVALID; - if (json == NULL) { - gpr_log(GPR_ERROR, "Invalid json."); - goto end; - } - - prop_value = json_get_string_property(json, "type"); - if (prop_value == NULL || - strcmp(prop_value, GRPC_AUTH_JSON_TYPE_SERVICE_ACCOUNT)) { - goto end; - } + if (json == NULL) + { + gpr_log (GPR_ERROR, "Invalid json."); + goto end; + } + + prop_value = json_get_string_property (json, "type"); + if (prop_value == NULL || strcmp (prop_value, GRPC_AUTH_JSON_TYPE_SERVICE_ACCOUNT)) + { + goto end; + } result.type = GRPC_AUTH_JSON_TYPE_SERVICE_ACCOUNT; - if (!set_json_key_string_property(json, "private_key_id", - &result.private_key_id) || - !set_json_key_string_property(json, "client_id", &result.client_id) || - !set_json_key_string_property(json, "client_email", - &result.client_email)) { - goto end; - } - - prop_value = json_get_string_property(json, "private_key"); - if (prop_value == NULL) { - goto end; - } - bio = BIO_new(BIO_s_mem()); - success = BIO_puts(bio, prop_value); - if ((success < 0) || ((size_t)success != strlen(prop_value))) { - gpr_log(GPR_ERROR, "Could not write into openssl BIO."); - goto end; - } - result.private_key = PEM_read_bio_RSAPrivateKey(bio, NULL, NULL, ""); - if (result.private_key == NULL) { - gpr_log(GPR_ERROR, "Could not deserialize private key."); - goto end; - } + if (!set_json_key_string_property (json, "private_key_id", &result.private_key_id) || !set_json_key_string_property (json, "client_id", &result.client_id) || !set_json_key_string_property (json, "client_email", &result.client_email)) + { + goto end; + } + + prop_value = json_get_string_property (json, "private_key"); + if (prop_value == NULL) + { + goto end; + } + bio = BIO_new (BIO_s_mem ()); + success = BIO_puts (bio, prop_value); + if ((success < 0) || ((size_t) success != strlen (prop_value))) + { + gpr_log (GPR_ERROR, "Could not write into openssl BIO."); + goto end; + } + result.private_key = PEM_read_bio_RSAPrivateKey (bio, NULL, NULL, ""); + if (result.private_key == NULL) + { + gpr_log (GPR_ERROR, "Could not deserialize private key."); + goto end; + } success = 1; end: - if (bio != NULL) BIO_free(bio); - if (!success) grpc_auth_json_key_destruct(&result); + if (bio != NULL) + BIO_free (bio); + if (!success) + grpc_auth_json_key_destruct (&result); return result; } -grpc_auth_json_key grpc_auth_json_key_create_from_string( - const char *json_string) { - char *scratchpad = gpr_strdup(json_string); - grpc_json *json = grpc_json_parse_string(scratchpad); - grpc_auth_json_key result = grpc_auth_json_key_create_from_json(json); - if (json != NULL) grpc_json_destroy(json); - gpr_free(scratchpad); +grpc_auth_json_key +grpc_auth_json_key_create_from_string (const char *json_string) +{ + char *scratchpad = gpr_strdup (json_string); + grpc_json *json = grpc_json_parse_string (scratchpad); + grpc_auth_json_key result = grpc_auth_json_key_create_from_json (json); + if (json != NULL) + grpc_json_destroy (json); + gpr_free (scratchpad); return result; } -void grpc_auth_json_key_destruct(grpc_auth_json_key *json_key) { - if (json_key == NULL) return; +void +grpc_auth_json_key_destruct (grpc_auth_json_key * json_key) +{ + if (json_key == NULL) + return; json_key->type = GRPC_AUTH_JSON_TYPE_INVALID; - if (json_key->client_id != NULL) { - gpr_free(json_key->client_id); - json_key->client_id = NULL; - } - if (json_key->private_key_id != NULL) { - gpr_free(json_key->private_key_id); - json_key->private_key_id = NULL; - } - if (json_key->client_email != NULL) { - gpr_free(json_key->client_email); - json_key->client_email = NULL; - } - if (json_key->private_key != NULL) { - RSA_free(json_key->private_key); - json_key->private_key = NULL; - } + if (json_key->client_id != NULL) + { + gpr_free (json_key->client_id); + json_key->client_id = NULL; + } + if (json_key->private_key_id != NULL) + { + gpr_free (json_key->private_key_id); + json_key->private_key_id = NULL; + } + if (json_key->client_email != NULL) + { + gpr_free (json_key->client_email); + json_key->client_email = NULL; + } + if (json_key->private_key != NULL) + { + RSA_free (json_key->private_key); + json_key->private_key = NULL; + } } /* --- jwt encoding and signature. --- */ -static grpc_json *create_child(grpc_json *brother, grpc_json *parent, - const char *key, const char *value, - grpc_json_type type) { - grpc_json *child = grpc_json_create(type); - if (brother) brother->next = child; - if (!parent->child) parent->child = child; +static grpc_json * +create_child (grpc_json * brother, grpc_json * parent, const char *key, const char *value, grpc_json_type type) +{ + grpc_json *child = grpc_json_create (type); + if (brother) + brother->next = child; + if (!parent->child) + parent->child = child; child->parent = parent; child->value = value; child->key = key; return child; } -static char *encoded_jwt_header(const char *key_id, const char *algorithm) { - grpc_json *json = grpc_json_create(GRPC_JSON_OBJECT); +static char * +encoded_jwt_header (const char *key_id, const char *algorithm) +{ + grpc_json *json = grpc_json_create (GRPC_JSON_OBJECT); grpc_json *child = NULL; char *json_str = NULL; char *result = NULL; - child = create_child(NULL, json, "alg", algorithm, GRPC_JSON_STRING); - child = create_child(child, json, "typ", GRPC_JWT_TYPE, GRPC_JSON_STRING); - create_child(child, json, "kid", key_id, GRPC_JSON_STRING); + child = create_child (NULL, json, "alg", algorithm, GRPC_JSON_STRING); + child = create_child (child, json, "typ", GRPC_JWT_TYPE, GRPC_JSON_STRING); + create_child (child, json, "kid", key_id, GRPC_JSON_STRING); - json_str = grpc_json_dump_to_string(json, 0); - result = grpc_base64_encode(json_str, strlen(json_str), 1, 0); - gpr_free(json_str); - grpc_json_destroy(json); + json_str = grpc_json_dump_to_string (json, 0); + result = grpc_base64_encode (json_str, strlen (json_str), 1, 0); + gpr_free (json_str); + grpc_json_destroy (json); return result; } -static char *encoded_jwt_claim(const grpc_auth_json_key *json_key, - const char *audience, - gpr_timespec token_lifetime, const char *scope) { - grpc_json *json = grpc_json_create(GRPC_JSON_OBJECT); +static char * +encoded_jwt_claim (const grpc_auth_json_key * json_key, const char *audience, gpr_timespec token_lifetime, const char *scope) +{ + grpc_json *json = grpc_json_create (GRPC_JSON_OBJECT); grpc_json *child = NULL; char *json_str = NULL; char *result = NULL; - gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); - gpr_timespec expiration = gpr_time_add(now, token_lifetime); + gpr_timespec now = gpr_now (GPR_CLOCK_REALTIME); + gpr_timespec expiration = gpr_time_add (now, token_lifetime); char now_str[GPR_LTOA_MIN_BUFSIZE]; char expiration_str[GPR_LTOA_MIN_BUFSIZE]; - if (gpr_time_cmp(token_lifetime, grpc_max_auth_token_lifetime) > 0) { - gpr_log(GPR_INFO, "Cropping token lifetime to maximum allowed value."); - expiration = gpr_time_add(now, grpc_max_auth_token_lifetime); - } - gpr_ltoa(now.tv_sec, now_str); - gpr_ltoa(expiration.tv_sec, expiration_str); - - child = - create_child(NULL, json, "iss", json_key->client_email, GRPC_JSON_STRING); - if (scope != NULL) { - child = create_child(child, json, "scope", scope, GRPC_JSON_STRING); - } else { - /* Unscoped JWTs need a sub field. */ - child = create_child(child, json, "sub", json_key->client_email, - GRPC_JSON_STRING); - } - - child = create_child(child, json, "aud", audience, GRPC_JSON_STRING); - child = create_child(child, json, "iat", now_str, GRPC_JSON_NUMBER); - create_child(child, json, "exp", expiration_str, GRPC_JSON_NUMBER); - - json_str = grpc_json_dump_to_string(json, 0); - result = grpc_base64_encode(json_str, strlen(json_str), 1, 0); - gpr_free(json_str); - grpc_json_destroy(json); + if (gpr_time_cmp (token_lifetime, grpc_max_auth_token_lifetime) > 0) + { + gpr_log (GPR_INFO, "Cropping token lifetime to maximum allowed value."); + expiration = gpr_time_add (now, grpc_max_auth_token_lifetime); + } + gpr_ltoa (now.tv_sec, now_str); + gpr_ltoa (expiration.tv_sec, expiration_str); + + child = create_child (NULL, json, "iss", json_key->client_email, GRPC_JSON_STRING); + if (scope != NULL) + { + child = create_child (child, json, "scope", scope, GRPC_JSON_STRING); + } + else + { + /* Unscoped JWTs need a sub field. */ + child = create_child (child, json, "sub", json_key->client_email, GRPC_JSON_STRING); + } + + child = create_child (child, json, "aud", audience, GRPC_JSON_STRING); + child = create_child (child, json, "iat", now_str, GRPC_JSON_NUMBER); + create_child (child, json, "exp", expiration_str, GRPC_JSON_NUMBER); + + json_str = grpc_json_dump_to_string (json, 0); + result = grpc_base64_encode (json_str, strlen (json_str), 1, 0); + gpr_free (json_str); + grpc_json_destroy (json); return result; } -static char *dot_concat_and_free_strings(char *str1, char *str2) { - size_t str1_len = strlen(str1); - size_t str2_len = strlen(str2); - size_t result_len = str1_len + 1 /* dot */ + str2_len; - char *result = gpr_malloc(result_len + 1 /* NULL terminated */); +static char * +dot_concat_and_free_strings (char *str1, char *str2) +{ + size_t str1_len = strlen (str1); + size_t str2_len = strlen (str2); + size_t result_len = str1_len + 1 /* dot */ + str2_len; + char *result = gpr_malloc (result_len + 1 /* NULL terminated */ ); char *current = result; - memcpy(current, str1, str1_len); + memcpy (current, str1, str1_len); current += str1_len; *(current++) = '.'; - memcpy(current, str2, str2_len); + memcpy (current, str2, str2_len); current += str2_len; - GPR_ASSERT(current >= result); - GPR_ASSERT((gpr_uintptr)(current - result) == result_len); + GPR_ASSERT (current >= result); + GPR_ASSERT ((gpr_uintptr) (current - result) == result_len); *current = '\0'; - gpr_free(str1); - gpr_free(str2); + gpr_free (str1); + gpr_free (str2); return result; } -const EVP_MD *openssl_digest_from_algorithm(const char *algorithm) { - if (strcmp(algorithm, GRPC_JWT_RSA_SHA256_ALGORITHM) == 0) { - return EVP_sha256(); - } else { - gpr_log(GPR_ERROR, "Unknown algorithm %s.", algorithm); - return NULL; - } +const EVP_MD * +openssl_digest_from_algorithm (const char *algorithm) +{ + if (strcmp (algorithm, GRPC_JWT_RSA_SHA256_ALGORITHM) == 0) + { + return EVP_sha256 (); + } + else + { + gpr_log (GPR_ERROR, "Unknown algorithm %s.", algorithm); + return NULL; + } } -char *compute_and_encode_signature(const grpc_auth_json_key *json_key, - const char *signature_algorithm, - const char *to_sign) { - const EVP_MD *md = openssl_digest_from_algorithm(signature_algorithm); +char * +compute_and_encode_signature (const grpc_auth_json_key * json_key, const char *signature_algorithm, const char *to_sign) +{ + const EVP_MD *md = openssl_digest_from_algorithm (signature_algorithm); EVP_MD_CTX *md_ctx = NULL; - EVP_PKEY *key = EVP_PKEY_new(); + EVP_PKEY *key = EVP_PKEY_new (); size_t sig_len = 0; unsigned char *sig = NULL; char *result = NULL; - if (md == NULL) return NULL; - md_ctx = EVP_MD_CTX_create(); - if (md_ctx == NULL) { - gpr_log(GPR_ERROR, "Could not create MD_CTX"); - goto end; - } - EVP_PKEY_set1_RSA(key, json_key->private_key); - if (EVP_DigestSignInit(md_ctx, NULL, md, NULL, key) != 1) { - gpr_log(GPR_ERROR, "DigestInit failed."); - goto end; - } - if (EVP_DigestSignUpdate(md_ctx, to_sign, strlen(to_sign)) != 1) { - gpr_log(GPR_ERROR, "DigestUpdate failed."); - goto end; - } - if (EVP_DigestSignFinal(md_ctx, NULL, &sig_len) != 1) { - gpr_log(GPR_ERROR, "DigestFinal (get signature length) failed."); - goto end; - } - sig = gpr_malloc(sig_len); - if (EVP_DigestSignFinal(md_ctx, sig, &sig_len) != 1) { - gpr_log(GPR_ERROR, "DigestFinal (signature compute) failed."); - goto end; - } - result = grpc_base64_encode(sig, sig_len, 1, 0); + if (md == NULL) + return NULL; + md_ctx = EVP_MD_CTX_create (); + if (md_ctx == NULL) + { + gpr_log (GPR_ERROR, "Could not create MD_CTX"); + goto end; + } + EVP_PKEY_set1_RSA (key, json_key->private_key); + if (EVP_DigestSignInit (md_ctx, NULL, md, NULL, key) != 1) + { + gpr_log (GPR_ERROR, "DigestInit failed."); + goto end; + } + if (EVP_DigestSignUpdate (md_ctx, to_sign, strlen (to_sign)) != 1) + { + gpr_log (GPR_ERROR, "DigestUpdate failed."); + goto end; + } + if (EVP_DigestSignFinal (md_ctx, NULL, &sig_len) != 1) + { + gpr_log (GPR_ERROR, "DigestFinal (get signature length) failed."); + goto end; + } + sig = gpr_malloc (sig_len); + if (EVP_DigestSignFinal (md_ctx, sig, &sig_len) != 1) + { + gpr_log (GPR_ERROR, "DigestFinal (signature compute) failed."); + goto end; + } + result = grpc_base64_encode (sig, sig_len, 1, 0); end: - if (key != NULL) EVP_PKEY_free(key); - if (md_ctx != NULL) EVP_MD_CTX_destroy(md_ctx); - if (sig != NULL) gpr_free(sig); + if (key != NULL) + EVP_PKEY_free (key); + if (md_ctx != NULL) + EVP_MD_CTX_destroy (md_ctx); + if (sig != NULL) + gpr_free (sig); return result; } -char *grpc_jwt_encode_and_sign(const grpc_auth_json_key *json_key, - const char *audience, - gpr_timespec token_lifetime, const char *scope) { - if (g_jwt_encode_and_sign_override != NULL) { - return g_jwt_encode_and_sign_override(json_key, audience, token_lifetime, - scope); - } else { - const char *sig_algo = GRPC_JWT_RSA_SHA256_ALGORITHM; - char *to_sign = dot_concat_and_free_strings( - encoded_jwt_header(json_key->private_key_id, sig_algo), - encoded_jwt_claim(json_key, audience, token_lifetime, scope)); - char *sig = compute_and_encode_signature(json_key, sig_algo, to_sign); - if (sig == NULL) { - gpr_free(to_sign); - return NULL; +char * +grpc_jwt_encode_and_sign (const grpc_auth_json_key * json_key, const char *audience, gpr_timespec token_lifetime, const char *scope) +{ + if (g_jwt_encode_and_sign_override != NULL) + { + return g_jwt_encode_and_sign_override (json_key, audience, token_lifetime, scope); + } + else + { + const char *sig_algo = GRPC_JWT_RSA_SHA256_ALGORITHM; + char *to_sign = dot_concat_and_free_strings (encoded_jwt_header (json_key->private_key_id, sig_algo), + encoded_jwt_claim (json_key, audience, token_lifetime, scope)); + char *sig = compute_and_encode_signature (json_key, sig_algo, to_sign); + if (sig == NULL) + { + gpr_free (to_sign); + return NULL; + } + return dot_concat_and_free_strings (to_sign, sig); } - return dot_concat_and_free_strings(to_sign, sig); - } } -void grpc_jwt_encode_and_sign_set_override( - grpc_jwt_encode_and_sign_override func) { +void +grpc_jwt_encode_and_sign_set_override (grpc_jwt_encode_and_sign_override func) +{ g_jwt_encode_and_sign_override = func; } /* --- grpc_auth_refresh_token --- */ -int grpc_auth_refresh_token_is_valid( - const grpc_auth_refresh_token *refresh_token) { - return (refresh_token != NULL) && - strcmp(refresh_token->type, GRPC_AUTH_JSON_TYPE_INVALID); +int +grpc_auth_refresh_token_is_valid (const grpc_auth_refresh_token * refresh_token) +{ + return (refresh_token != NULL) && strcmp (refresh_token->type, GRPC_AUTH_JSON_TYPE_INVALID); } -grpc_auth_refresh_token grpc_auth_refresh_token_create_from_json( - const grpc_json *json) { +grpc_auth_refresh_token +grpc_auth_refresh_token_create_from_json (const grpc_json * json) +{ grpc_auth_refresh_token result; const char *prop_value; int success = 0; - memset(&result, 0, sizeof(grpc_auth_refresh_token)); + memset (&result, 0, sizeof (grpc_auth_refresh_token)); result.type = GRPC_AUTH_JSON_TYPE_INVALID; - if (json == NULL) { - gpr_log(GPR_ERROR, "Invalid json."); - goto end; - } - - prop_value = json_get_string_property(json, "type"); - if (prop_value == NULL || - strcmp(prop_value, GRPC_AUTH_JSON_TYPE_AUTHORIZED_USER)) { - goto end; - } + if (json == NULL) + { + gpr_log (GPR_ERROR, "Invalid json."); + goto end; + } + + prop_value = json_get_string_property (json, "type"); + if (prop_value == NULL || strcmp (prop_value, GRPC_AUTH_JSON_TYPE_AUTHORIZED_USER)) + { + goto end; + } result.type = GRPC_AUTH_JSON_TYPE_AUTHORIZED_USER; - if (!set_json_key_string_property(json, "client_secret", - &result.client_secret) || - !set_json_key_string_property(json, "client_id", &result.client_id) || - !set_json_key_string_property(json, "refresh_token", - &result.refresh_token)) { - goto end; - } + if (!set_json_key_string_property (json, "client_secret", &result.client_secret) || !set_json_key_string_property (json, "client_id", &result.client_id) || !set_json_key_string_property (json, "refresh_token", &result.refresh_token)) + { + goto end; + } success = 1; end: - if (!success) grpc_auth_refresh_token_destruct(&result); + if (!success) + grpc_auth_refresh_token_destruct (&result); return result; } -grpc_auth_refresh_token grpc_auth_refresh_token_create_from_string( - const char *json_string) { - char *scratchpad = gpr_strdup(json_string); - grpc_json *json = grpc_json_parse_string(scratchpad); - grpc_auth_refresh_token result = - grpc_auth_refresh_token_create_from_json(json); - if (json != NULL) grpc_json_destroy(json); - gpr_free(scratchpad); +grpc_auth_refresh_token +grpc_auth_refresh_token_create_from_string (const char *json_string) +{ + char *scratchpad = gpr_strdup (json_string); + grpc_json *json = grpc_json_parse_string (scratchpad); + grpc_auth_refresh_token result = grpc_auth_refresh_token_create_from_json (json); + if (json != NULL) + grpc_json_destroy (json); + gpr_free (scratchpad); return result; } -void grpc_auth_refresh_token_destruct(grpc_auth_refresh_token *refresh_token) { - if (refresh_token == NULL) return; +void +grpc_auth_refresh_token_destruct (grpc_auth_refresh_token * refresh_token) +{ + if (refresh_token == NULL) + return; refresh_token->type = GRPC_AUTH_JSON_TYPE_INVALID; - if (refresh_token->client_id != NULL) { - gpr_free(refresh_token->client_id); - refresh_token->client_id = NULL; - } - if (refresh_token->client_secret != NULL) { - gpr_free(refresh_token->client_secret); - refresh_token->client_secret = NULL; - } - if (refresh_token->refresh_token != NULL) { - gpr_free(refresh_token->refresh_token); - refresh_token->refresh_token = NULL; - } + if (refresh_token->client_id != NULL) + { + gpr_free (refresh_token->client_id); + refresh_token->client_id = NULL; + } + if (refresh_token->client_secret != NULL) + { + gpr_free (refresh_token->client_secret); + refresh_token->client_secret = NULL; + } + if (refresh_token->refresh_token != NULL) + { + gpr_free (refresh_token->refresh_token); + refresh_token->refresh_token = NULL; + } } diff --git a/src/core/security/json_token.h b/src/core/security/json_token.h index 7e06864ff3a..1955bd5b895 100644 --- a/src/core/security/json_token.h +++ b/src/core/security/json_token.h @@ -49,7 +49,8 @@ /* --- auth_json_key parsing. --- */ -typedef struct { +typedef struct +{ const char *type; char *private_key_id; char *client_id; @@ -58,40 +59,35 @@ typedef struct { } grpc_auth_json_key; /* Returns 1 if the object is valid, 0 otherwise. */ -int grpc_auth_json_key_is_valid(const grpc_auth_json_key *json_key); +int grpc_auth_json_key_is_valid (const grpc_auth_json_key * json_key); /* Creates a json_key object from string. Returns an invalid object if a parsing error has been encountered. */ -grpc_auth_json_key grpc_auth_json_key_create_from_string( - const char *json_string); +grpc_auth_json_key grpc_auth_json_key_create_from_string (const char *json_string); /* Creates a json_key object from parsed json. Returns an invalid object if a parsing error has been encountered. */ -grpc_auth_json_key grpc_auth_json_key_create_from_json(const grpc_json *json); +grpc_auth_json_key grpc_auth_json_key_create_from_json (const grpc_json * json); /* Destructs the object. */ -void grpc_auth_json_key_destruct(grpc_auth_json_key *json_key); +void grpc_auth_json_key_destruct (grpc_auth_json_key * json_key); /* --- json token encoding and signing. --- */ /* Caller is responsible for calling gpr_free on the returned value. May return NULL on invalid input. The scope parameter may be NULL. */ -char *grpc_jwt_encode_and_sign(const grpc_auth_json_key *json_key, - const char *audience, - gpr_timespec token_lifetime, const char *scope); +char *grpc_jwt_encode_and_sign (const grpc_auth_json_key * json_key, const char *audience, gpr_timespec token_lifetime, const char *scope); /* Override encode_and_sign function for testing. */ -typedef char *(*grpc_jwt_encode_and_sign_override)( - const grpc_auth_json_key *json_key, const char *audience, - gpr_timespec token_lifetime, const char *scope); +typedef char *(*grpc_jwt_encode_and_sign_override) (const grpc_auth_json_key * json_key, const char *audience, gpr_timespec token_lifetime, const char *scope); /* Set a custom encode_and_sign override for testing. */ -void grpc_jwt_encode_and_sign_set_override( - grpc_jwt_encode_and_sign_override func); +void grpc_jwt_encode_and_sign_set_override (grpc_jwt_encode_and_sign_override func); /* --- auth_refresh_token parsing. --- */ -typedef struct { +typedef struct +{ const char *type; char *client_id; char *client_secret; @@ -99,20 +95,17 @@ typedef struct { } grpc_auth_refresh_token; /* Returns 1 if the object is valid, 0 otherwise. */ -int grpc_auth_refresh_token_is_valid( - const grpc_auth_refresh_token *refresh_token); +int grpc_auth_refresh_token_is_valid (const grpc_auth_refresh_token * refresh_token); /* Creates a refresh token object from string. Returns an invalid object if a parsing error has been encountered. */ -grpc_auth_refresh_token grpc_auth_refresh_token_create_from_string( - const char *json_string); +grpc_auth_refresh_token grpc_auth_refresh_token_create_from_string (const char *json_string); /* Creates a refresh token object from parsed json. Returns an invalid object if a parsing error has been encountered. */ -grpc_auth_refresh_token grpc_auth_refresh_token_create_from_json( - const grpc_json *json); +grpc_auth_refresh_token grpc_auth_refresh_token_create_from_json (const grpc_json * json); /* Destructs the object. */ -void grpc_auth_refresh_token_destruct(grpc_auth_refresh_token *refresh_token); +void grpc_auth_refresh_token_destruct (grpc_auth_refresh_token * refresh_token); #endif /* GRPC_INTERNAL_CORE_SECURITY_JSON_TOKEN_H */ diff --git a/src/core/security/jwt_verifier.c b/src/core/security/jwt_verifier.c index be861693468..f7c9c7f4d1f 100644 --- a/src/core/security/jwt_verifier.c +++ b/src/core/security/jwt_verifier.c @@ -47,9 +47,11 @@ /* --- Utils. --- */ -const char *grpc_jwt_verifier_status_to_string( - grpc_jwt_verifier_status status) { - switch (status) { +const char * +grpc_jwt_verifier_status_to_string (grpc_jwt_verifier_status status) +{ + switch (status) + { case GRPC_JWT_VERIFIER_OK: return "OK"; case GRPC_JWT_VERIFIER_BAD_SIGNATURE: @@ -66,62 +68,78 @@ const char *grpc_jwt_verifier_status_to_string( return "GENERIC_ERROR"; default: return "UNKNOWN"; - } + } } -static const EVP_MD *evp_md_from_alg(const char *alg) { - if (strcmp(alg, "RS256") == 0) { - return EVP_sha256(); - } else if (strcmp(alg, "RS384") == 0) { - return EVP_sha384(); - } else if (strcmp(alg, "RS512") == 0) { - return EVP_sha512(); - } else { - return NULL; - } +static const EVP_MD * +evp_md_from_alg (const char *alg) +{ + if (strcmp (alg, "RS256") == 0) + { + return EVP_sha256 (); + } + else if (strcmp (alg, "RS384") == 0) + { + return EVP_sha384 (); + } + else if (strcmp (alg, "RS512") == 0) + { + return EVP_sha512 (); + } + else + { + return NULL; + } } -static grpc_json *parse_json_part_from_jwt(const char *str, size_t len, - gpr_slice *buffer) { +static grpc_json * +parse_json_part_from_jwt (const char *str, size_t len, gpr_slice * buffer) +{ grpc_json *json; - *buffer = grpc_base64_decode_with_len(str, len, 1); - if (GPR_SLICE_IS_EMPTY(*buffer)) { - gpr_log(GPR_ERROR, "Invalid base64."); - return NULL; - } - json = grpc_json_parse_string_with_len((char *)GPR_SLICE_START_PTR(*buffer), - GPR_SLICE_LENGTH(*buffer)); - if (json == NULL) { - gpr_slice_unref(*buffer); - gpr_log(GPR_ERROR, "JSON parsing error."); - } + *buffer = grpc_base64_decode_with_len (str, len, 1); + if (GPR_SLICE_IS_EMPTY (*buffer)) + { + gpr_log (GPR_ERROR, "Invalid base64."); + return NULL; + } + json = grpc_json_parse_string_with_len ((char *) GPR_SLICE_START_PTR (*buffer), GPR_SLICE_LENGTH (*buffer)); + if (json == NULL) + { + gpr_slice_unref (*buffer); + gpr_log (GPR_ERROR, "JSON parsing error."); + } return json; } -static const char *validate_string_field(const grpc_json *json, - const char *key) { - if (json->type != GRPC_JSON_STRING) { - gpr_log(GPR_ERROR, "Invalid %s field [%s]", key, json->value); - return NULL; - } +static const char * +validate_string_field (const grpc_json * json, const char *key) +{ + if (json->type != GRPC_JSON_STRING) + { + gpr_log (GPR_ERROR, "Invalid %s field [%s]", key, json->value); + return NULL; + } return json->value; } -static gpr_timespec validate_time_field(const grpc_json *json, - const char *key) { - gpr_timespec result = gpr_time_0(GPR_CLOCK_REALTIME); - if (json->type != GRPC_JSON_NUMBER) { - gpr_log(GPR_ERROR, "Invalid %s field [%s]", key, json->value); - return result; - } - result.tv_sec = strtol(json->value, NULL, 10); +static gpr_timespec +validate_time_field (const grpc_json * json, const char *key) +{ + gpr_timespec result = gpr_time_0 (GPR_CLOCK_REALTIME); + if (json->type != GRPC_JSON_NUMBER) + { + gpr_log (GPR_ERROR, "Invalid %s field [%s]", key, json->value); + return result; + } + result.tv_sec = strtol (json->value, NULL, 10); return result; } /* --- JOSE header. see http://tools.ietf.org/html/rfc7515#section-4 --- */ -typedef struct { +typedef struct +{ const char *alg; const char *kid; const char *typ; @@ -129,54 +147,68 @@ typedef struct { gpr_slice buffer; } jose_header; -static void jose_header_destroy(jose_header *h) { - gpr_slice_unref(h->buffer); - gpr_free(h); +static void +jose_header_destroy (jose_header * h) +{ + gpr_slice_unref (h->buffer); + gpr_free (h); } /* Takes ownership of json and buffer. */ -static jose_header *jose_header_from_json(grpc_json *json, gpr_slice buffer) { +static jose_header * +jose_header_from_json (grpc_json * json, gpr_slice buffer) +{ grpc_json *cur; - jose_header *h = gpr_malloc(sizeof(jose_header)); - memset(h, 0, sizeof(jose_header)); + jose_header *h = gpr_malloc (sizeof (jose_header)); + memset (h, 0, sizeof (jose_header)); h->buffer = buffer; - for (cur = json->child; cur != NULL; cur = cur->next) { - if (strcmp(cur->key, "alg") == 0) { - /* We only support RSA-1.5 signatures for now. - Beware of this if we add HMAC support: - https://auth0.com/blog/2015/03/31/critical-vulnerabilities-in-json-web-token-libraries/ - */ - if (cur->type != GRPC_JSON_STRING || strncmp(cur->value, "RS", 2) || - evp_md_from_alg(cur->value) == NULL) { - gpr_log(GPR_ERROR, "Invalid alg field [%s]", cur->value); - goto error; - } - h->alg = cur->value; - } else if (strcmp(cur->key, "typ") == 0) { - h->typ = validate_string_field(cur, "typ"); - if (h->typ == NULL) goto error; - } else if (strcmp(cur->key, "kid") == 0) { - h->kid = validate_string_field(cur, "kid"); - if (h->kid == NULL) goto error; - } - } - if (h->alg == NULL) { - gpr_log(GPR_ERROR, "Missing alg field."); - goto error; - } - grpc_json_destroy(json); + for (cur = json->child; cur != NULL; cur = cur->next) + { + if (strcmp (cur->key, "alg") == 0) + { + /* We only support RSA-1.5 signatures for now. + Beware of this if we add HMAC support: + https://auth0.com/blog/2015/03/31/critical-vulnerabilities-in-json-web-token-libraries/ + */ + if (cur->type != GRPC_JSON_STRING || strncmp (cur->value, "RS", 2) || evp_md_from_alg (cur->value) == NULL) + { + gpr_log (GPR_ERROR, "Invalid alg field [%s]", cur->value); + goto error; + } + h->alg = cur->value; + } + else if (strcmp (cur->key, "typ") == 0) + { + h->typ = validate_string_field (cur, "typ"); + if (h->typ == NULL) + goto error; + } + else if (strcmp (cur->key, "kid") == 0) + { + h->kid = validate_string_field (cur, "kid"); + if (h->kid == NULL) + goto error; + } + } + if (h->alg == NULL) + { + gpr_log (GPR_ERROR, "Missing alg field."); + goto error; + } + grpc_json_destroy (json); h->buffer = buffer; return h; error: - grpc_json_destroy(json); - jose_header_destroy(h); + grpc_json_destroy (json); + jose_header_destroy (h); return NULL; } /* --- JWT claims. see http://tools.ietf.org/html/rfc7519#section-4.1 */ -struct grpc_jwt_claims { +struct grpc_jwt_claims +{ /* Well known properties already parsed. */ const char *sub; const char *iss; @@ -190,135 +222,185 @@ struct grpc_jwt_claims { gpr_slice buffer; }; -void grpc_jwt_claims_destroy(grpc_jwt_claims *claims) { - grpc_json_destroy(claims->json); - gpr_slice_unref(claims->buffer); - gpr_free(claims); +void +grpc_jwt_claims_destroy (grpc_jwt_claims * claims) +{ + grpc_json_destroy (claims->json); + gpr_slice_unref (claims->buffer); + gpr_free (claims); } -const grpc_json *grpc_jwt_claims_json(const grpc_jwt_claims *claims) { - if (claims == NULL) return NULL; +const grpc_json * +grpc_jwt_claims_json (const grpc_jwt_claims * claims) +{ + if (claims == NULL) + return NULL; return claims->json; } -const char *grpc_jwt_claims_subject(const grpc_jwt_claims *claims) { - if (claims == NULL) return NULL; +const char * +grpc_jwt_claims_subject (const grpc_jwt_claims * claims) +{ + if (claims == NULL) + return NULL; return claims->sub; } -const char *grpc_jwt_claims_issuer(const grpc_jwt_claims *claims) { - if (claims == NULL) return NULL; +const char * +grpc_jwt_claims_issuer (const grpc_jwt_claims * claims) +{ + if (claims == NULL) + return NULL; return claims->iss; } -const char *grpc_jwt_claims_id(const grpc_jwt_claims *claims) { - if (claims == NULL) return NULL; +const char * +grpc_jwt_claims_id (const grpc_jwt_claims * claims) +{ + if (claims == NULL) + return NULL; return claims->jti; } -const char *grpc_jwt_claims_audience(const grpc_jwt_claims *claims) { - if (claims == NULL) return NULL; +const char * +grpc_jwt_claims_audience (const grpc_jwt_claims * claims) +{ + if (claims == NULL) + return NULL; return claims->aud; } -gpr_timespec grpc_jwt_claims_issued_at(const grpc_jwt_claims *claims) { - if (claims == NULL) return gpr_inf_past(GPR_CLOCK_REALTIME); +gpr_timespec +grpc_jwt_claims_issued_at (const grpc_jwt_claims * claims) +{ + if (claims == NULL) + return gpr_inf_past (GPR_CLOCK_REALTIME); return claims->iat; } -gpr_timespec grpc_jwt_claims_expires_at(const grpc_jwt_claims *claims) { - if (claims == NULL) return gpr_inf_future(GPR_CLOCK_REALTIME); +gpr_timespec +grpc_jwt_claims_expires_at (const grpc_jwt_claims * claims) +{ + if (claims == NULL) + return gpr_inf_future (GPR_CLOCK_REALTIME); return claims->exp; } -gpr_timespec grpc_jwt_claims_not_before(const grpc_jwt_claims *claims) { - if (claims == NULL) return gpr_inf_past(GPR_CLOCK_REALTIME); +gpr_timespec +grpc_jwt_claims_not_before (const grpc_jwt_claims * claims) +{ + if (claims == NULL) + return gpr_inf_past (GPR_CLOCK_REALTIME); return claims->nbf; } /* Takes ownership of json and buffer even in case of failure. */ -grpc_jwt_claims *grpc_jwt_claims_from_json(grpc_json *json, gpr_slice buffer) { +grpc_jwt_claims * +grpc_jwt_claims_from_json (grpc_json * json, gpr_slice buffer) +{ grpc_json *cur; - grpc_jwt_claims *claims = gpr_malloc(sizeof(grpc_jwt_claims)); - memset(claims, 0, sizeof(grpc_jwt_claims)); + grpc_jwt_claims *claims = gpr_malloc (sizeof (grpc_jwt_claims)); + memset (claims, 0, sizeof (grpc_jwt_claims)); claims->json = json; claims->buffer = buffer; - claims->iat = gpr_inf_past(GPR_CLOCK_REALTIME); - claims->nbf = gpr_inf_past(GPR_CLOCK_REALTIME); - claims->exp = gpr_inf_future(GPR_CLOCK_REALTIME); + claims->iat = gpr_inf_past (GPR_CLOCK_REALTIME); + claims->nbf = gpr_inf_past (GPR_CLOCK_REALTIME); + claims->exp = gpr_inf_future (GPR_CLOCK_REALTIME); /* Per the spec, all fields are optional. */ - for (cur = json->child; cur != NULL; cur = cur->next) { - if (strcmp(cur->key, "sub") == 0) { - claims->sub = validate_string_field(cur, "sub"); - if (claims->sub == NULL) goto error; - } else if (strcmp(cur->key, "iss") == 0) { - claims->iss = validate_string_field(cur, "iss"); - if (claims->iss == NULL) goto error; - } else if (strcmp(cur->key, "aud") == 0) { - claims->aud = validate_string_field(cur, "aud"); - if (claims->aud == NULL) goto error; - } else if (strcmp(cur->key, "jti") == 0) { - claims->jti = validate_string_field(cur, "jti"); - if (claims->jti == NULL) goto error; - } else if (strcmp(cur->key, "iat") == 0) { - claims->iat = validate_time_field(cur, "iat"); - if (gpr_time_cmp(claims->iat, gpr_time_0(GPR_CLOCK_REALTIME)) == 0) - goto error; - } else if (strcmp(cur->key, "exp") == 0) { - claims->exp = validate_time_field(cur, "exp"); - if (gpr_time_cmp(claims->exp, gpr_time_0(GPR_CLOCK_REALTIME)) == 0) - goto error; - } else if (strcmp(cur->key, "nbf") == 0) { - claims->nbf = validate_time_field(cur, "nbf"); - if (gpr_time_cmp(claims->nbf, gpr_time_0(GPR_CLOCK_REALTIME)) == 0) - goto error; - } - } + for (cur = json->child; cur != NULL; cur = cur->next) + { + if (strcmp (cur->key, "sub") == 0) + { + claims->sub = validate_string_field (cur, "sub"); + if (claims->sub == NULL) + goto error; + } + else if (strcmp (cur->key, "iss") == 0) + { + claims->iss = validate_string_field (cur, "iss"); + if (claims->iss == NULL) + goto error; + } + else if (strcmp (cur->key, "aud") == 0) + { + claims->aud = validate_string_field (cur, "aud"); + if (claims->aud == NULL) + goto error; + } + else if (strcmp (cur->key, "jti") == 0) + { + claims->jti = validate_string_field (cur, "jti"); + if (claims->jti == NULL) + goto error; + } + else if (strcmp (cur->key, "iat") == 0) + { + claims->iat = validate_time_field (cur, "iat"); + if (gpr_time_cmp (claims->iat, gpr_time_0 (GPR_CLOCK_REALTIME)) == 0) + goto error; + } + else if (strcmp (cur->key, "exp") == 0) + { + claims->exp = validate_time_field (cur, "exp"); + if (gpr_time_cmp (claims->exp, gpr_time_0 (GPR_CLOCK_REALTIME)) == 0) + goto error; + } + else if (strcmp (cur->key, "nbf") == 0) + { + claims->nbf = validate_time_field (cur, "nbf"); + if (gpr_time_cmp (claims->nbf, gpr_time_0 (GPR_CLOCK_REALTIME)) == 0) + goto error; + } + } return claims; error: - grpc_jwt_claims_destroy(claims); + grpc_jwt_claims_destroy (claims); return NULL; } -grpc_jwt_verifier_status grpc_jwt_claims_check(const grpc_jwt_claims *claims, - const char *audience) { +grpc_jwt_verifier_status +grpc_jwt_claims_check (const grpc_jwt_claims * claims, const char *audience) +{ gpr_timespec skewed_now; int audience_ok; - GPR_ASSERT(claims != NULL); - - skewed_now = - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), grpc_jwt_verifier_clock_skew); - if (gpr_time_cmp(skewed_now, claims->nbf) < 0) { - gpr_log(GPR_ERROR, "JWT is not valid yet."); - return GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE; - } - skewed_now = - gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), grpc_jwt_verifier_clock_skew); - if (gpr_time_cmp(skewed_now, claims->exp) > 0) { - gpr_log(GPR_ERROR, "JWT is expired."); - return GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE; - } - - if (audience == NULL) { - audience_ok = claims->aud == NULL; - } else { - audience_ok = claims->aud != NULL && strcmp(audience, claims->aud) == 0; - } - if (!audience_ok) { - gpr_log(GPR_ERROR, "Audience mismatch: expected %s and found %s.", - audience == NULL ? "NULL" : audience, - claims->aud == NULL ? "NULL" : claims->aud); - return GRPC_JWT_VERIFIER_BAD_AUDIENCE; - } + GPR_ASSERT (claims != NULL); + + skewed_now = gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), grpc_jwt_verifier_clock_skew); + if (gpr_time_cmp (skewed_now, claims->nbf) < 0) + { + gpr_log (GPR_ERROR, "JWT is not valid yet."); + return GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE; + } + skewed_now = gpr_time_sub (gpr_now (GPR_CLOCK_REALTIME), grpc_jwt_verifier_clock_skew); + if (gpr_time_cmp (skewed_now, claims->exp) > 0) + { + gpr_log (GPR_ERROR, "JWT is expired."); + return GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE; + } + + if (audience == NULL) + { + audience_ok = claims->aud == NULL; + } + else + { + audience_ok = claims->aud != NULL && strcmp (audience, claims->aud) == 0; + } + if (!audience_ok) + { + gpr_log (GPR_ERROR, "Audience mismatch: expected %s and found %s.", audience == NULL ? "NULL" : audience, claims->aud == NULL ? "NULL" : claims->aud); + return GRPC_JWT_VERIFIER_BAD_AUDIENCE; + } return GRPC_JWT_VERIFIER_OK; } /* --- verifier_cb_ctx object. --- */ -typedef struct { +typedef struct +{ grpc_jwt_verifier *verifier; grpc_pollset *pollset; jose_header *header; @@ -331,379 +413,436 @@ typedef struct { } verifier_cb_ctx; /* Takes ownership of the header, claims and signature. */ -static verifier_cb_ctx *verifier_cb_ctx_create( - grpc_jwt_verifier *verifier, grpc_pollset *pollset, jose_header *header, - grpc_jwt_claims *claims, const char *audience, gpr_slice signature, - const char *signed_jwt, size_t signed_jwt_len, void *user_data, - grpc_jwt_verification_done_cb cb) { - verifier_cb_ctx *ctx = gpr_malloc(sizeof(verifier_cb_ctx)); - memset(ctx, 0, sizeof(verifier_cb_ctx)); +static verifier_cb_ctx * +verifier_cb_ctx_create (grpc_jwt_verifier * verifier, grpc_pollset * pollset, jose_header * header, grpc_jwt_claims * claims, const char *audience, gpr_slice signature, const char *signed_jwt, size_t signed_jwt_len, void *user_data, grpc_jwt_verification_done_cb cb) +{ + verifier_cb_ctx *ctx = gpr_malloc (sizeof (verifier_cb_ctx)); + memset (ctx, 0, sizeof (verifier_cb_ctx)); ctx->verifier = verifier; ctx->pollset = pollset; ctx->header = header; - ctx->audience = gpr_strdup(audience); + ctx->audience = gpr_strdup (audience); ctx->claims = claims; ctx->signature = signature; - ctx->signed_data = gpr_slice_from_copied_buffer(signed_jwt, signed_jwt_len); + ctx->signed_data = gpr_slice_from_copied_buffer (signed_jwt, signed_jwt_len); ctx->user_data = user_data; ctx->user_cb = cb; return 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(ctx->claims); - gpr_slice_unref(ctx->signature); - gpr_slice_unref(ctx->signed_data); - jose_header_destroy(ctx->header); +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 (ctx->claims); + gpr_slice_unref (ctx->signature); + gpr_slice_unref (ctx->signed_data); + jose_header_destroy (ctx->header); /* TODO: see what to do with claims... */ - gpr_free(ctx); + gpr_free (ctx); } /* --- grpc_jwt_verifier object. --- */ /* Clock skew defaults to one minute. */ -gpr_timespec grpc_jwt_verifier_clock_skew = {60, 0, GPR_TIMESPAN}; +gpr_timespec grpc_jwt_verifier_clock_skew = { 60, 0, GPR_TIMESPAN }; /* Max delay defaults to one minute. */ -gpr_timespec grpc_jwt_verifier_max_delay = {60, 0, GPR_TIMESPAN}; +gpr_timespec grpc_jwt_verifier_max_delay = { 60, 0, GPR_TIMESPAN }; -typedef struct { +typedef struct +{ char *email_domain; char *key_url_prefix; } email_key_mapping; -struct grpc_jwt_verifier { +struct grpc_jwt_verifier +{ email_key_mapping *mappings; - size_t num_mappings; /* Should be very few, linear search ok. */ + size_t num_mappings; /* Should be very few, linear search ok. */ size_t allocated_mappings; grpc_httpcli_context http_ctx; }; -static grpc_json *json_from_http(const grpc_httpcli_response *response) { +static grpc_json * +json_from_http (const grpc_httpcli_response * response) +{ grpc_json *json = NULL; - if (response == NULL) { - gpr_log(GPR_ERROR, "HTTP response is NULL."); - return NULL; - } - if (response->status != 200) { - gpr_log(GPR_ERROR, "Call to http server failed with error %d.", - response->status); - return NULL; - } + if (response == NULL) + { + gpr_log (GPR_ERROR, "HTTP response is NULL."); + return NULL; + } + if (response->status != 200) + { + gpr_log (GPR_ERROR, "Call to http server failed with error %d.", response->status); + return NULL; + } - json = grpc_json_parse_string_with_len(response->body, response->body_length); - if (json == NULL) { - gpr_log(GPR_ERROR, "Invalid JSON found in response."); - } + json = grpc_json_parse_string_with_len (response->body, response->body_length); + if (json == NULL) + { + gpr_log (GPR_ERROR, "Invalid JSON found in response."); + } return json; } -static const grpc_json *find_property_by_name(const grpc_json *json, - const char *name) { +static const grpc_json * +find_property_by_name (const grpc_json * json, const char *name) +{ const grpc_json *cur; - for (cur = json->child; cur != NULL; cur = cur->next) { - if (strcmp(cur->key, name) == 0) return cur; - } + for (cur = json->child; cur != NULL; cur = cur->next) + { + if (strcmp (cur->key, name) == 0) + return cur; + } return NULL; } -static EVP_PKEY *extract_pkey_from_x509(const char *x509_str) { +static EVP_PKEY * +extract_pkey_from_x509 (const char *x509_str) +{ X509 *x509 = NULL; EVP_PKEY *result = NULL; - BIO *bio = BIO_new(BIO_s_mem()); - size_t len = strlen(x509_str); - GPR_ASSERT(len < INT_MAX); - BIO_write(bio, x509_str, (int)len); - x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL); - if (x509 == NULL) { - gpr_log(GPR_ERROR, "Unable to parse x509 cert."); - goto end; - } - result = X509_get_pubkey(x509); - if (result == NULL) { - gpr_log(GPR_ERROR, "Cannot find public key in X509 cert."); - } + BIO *bio = BIO_new (BIO_s_mem ()); + size_t len = strlen (x509_str); + GPR_ASSERT (len < INT_MAX); + BIO_write (bio, x509_str, (int) len); + x509 = PEM_read_bio_X509 (bio, NULL, NULL, NULL); + if (x509 == NULL) + { + gpr_log (GPR_ERROR, "Unable to parse x509 cert."); + goto end; + } + result = X509_get_pubkey (x509); + if (result == NULL) + { + gpr_log (GPR_ERROR, "Cannot find public key in X509 cert."); + } end: - BIO_free(bio); - if (x509 != NULL) X509_free(x509); + BIO_free (bio); + if (x509 != NULL) + X509_free (x509); return result; } -static BIGNUM *bignum_from_base64(const char *b64) { +static BIGNUM * +bignum_from_base64 (const char *b64) +{ BIGNUM *result = NULL; gpr_slice bin; - if (b64 == NULL) return NULL; - bin = grpc_base64_decode(b64, 1); - if (GPR_SLICE_IS_EMPTY(bin)) { - gpr_log(GPR_ERROR, "Invalid base64 for big num."); + if (b64 == NULL) return NULL; - } - result = - BN_bin2bn(GPR_SLICE_START_PTR(bin), (int)GPR_SLICE_LENGTH(bin), NULL); - gpr_slice_unref(bin); + bin = grpc_base64_decode (b64, 1); + if (GPR_SLICE_IS_EMPTY (bin)) + { + gpr_log (GPR_ERROR, "Invalid base64 for big num."); + return NULL; + } + result = BN_bin2bn (GPR_SLICE_START_PTR (bin), (int) GPR_SLICE_LENGTH (bin), NULL); + gpr_slice_unref (bin); return result; } -static EVP_PKEY *pkey_from_jwk(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; - GPR_ASSERT(kty != NULL && json != NULL); - if (strcmp(kty, "RSA") != 0) { - gpr_log(GPR_ERROR, "Unsupported key type %s.", kty); - goto end; - } - rsa = RSA_new(); - if (rsa == NULL) { - gpr_log(GPR_ERROR, "Could not create rsa key."); - goto end; - } - for (key_prop = json->child; key_prop != NULL; key_prop = key_prop->next) { - if (strcmp(key_prop->key, "n") == 0) { - rsa->n = bignum_from_base64(validate_string_field(key_prop, "n")); - if (rsa->n == NULL) goto end; - } else if (strcmp(key_prop->key, "e") == 0) { - rsa->e = bignum_from_base64(validate_string_field(key_prop, "e")); - if (rsa->e == NULL) goto end; - } - } - if (rsa->e == NULL || rsa->n == NULL) { - gpr_log(GPR_ERROR, "Missing RSA public key field."); - goto end; - } - result = EVP_PKEY_new(); - EVP_PKEY_set1_RSA(result, rsa); /* uprefs rsa. */ + GPR_ASSERT (kty != NULL && json != NULL); + if (strcmp (kty, "RSA") != 0) + { + gpr_log (GPR_ERROR, "Unsupported key type %s.", kty); + goto end; + } + rsa = RSA_new (); + if (rsa == NULL) + { + gpr_log (GPR_ERROR, "Could not create rsa key."); + goto end; + } + for (key_prop = json->child; key_prop != NULL; key_prop = key_prop->next) + { + if (strcmp (key_prop->key, "n") == 0) + { + rsa->n = bignum_from_base64 (validate_string_field (key_prop, "n")); + if (rsa->n == NULL) + goto end; + } + else if (strcmp (key_prop->key, "e") == 0) + { + rsa->e = bignum_from_base64 (validate_string_field (key_prop, "e")); + if (rsa->e == NULL) + goto end; + } + } + if (rsa->e == NULL || rsa->n == NULL) + { + gpr_log (GPR_ERROR, "Missing RSA public key field."); + goto end; + } + result = EVP_PKEY_new (); + EVP_PKEY_set1_RSA (result, rsa); /* uprefs rsa. */ end: - if (rsa != NULL) RSA_free(rsa); + if (rsa != NULL) + RSA_free (rsa); return result; } -static EVP_PKEY *find_verification_key(const grpc_json *json, - const char *header_alg, - const char *header_kid) { +static EVP_PKEY * +find_verification_key (const grpc_json * json, const char *header_alg, const char *header_kid) +{ const grpc_json *jkey; const grpc_json *jwk_keys; /* Try to parse the json as a JWK set: https://tools.ietf.org/html/rfc7517#section-5. */ - jwk_keys = find_property_by_name(json, "keys"); - if (jwk_keys == NULL) { - /* Use the google proprietary format which is: - { : , : , ... } */ - const grpc_json *cur = find_property_by_name(json, header_kid); - if (cur == NULL) return NULL; - return extract_pkey_from_x509(cur->value); - } - - if (jwk_keys->type != GRPC_JSON_ARRAY) { - gpr_log(GPR_ERROR, - "Unexpected value type of keys property in jwks key set."); - return NULL; - } + jwk_keys = find_property_by_name (json, "keys"); + if (jwk_keys == NULL) + { + /* Use the google proprietary format which is: + { : , : , ... } */ + const grpc_json *cur = find_property_by_name (json, header_kid); + if (cur == NULL) + return NULL; + return extract_pkey_from_x509 (cur->value); + } + + if (jwk_keys->type != GRPC_JSON_ARRAY) + { + gpr_log (GPR_ERROR, "Unexpected value type of keys property in jwks key set."); + return NULL; + } /* Key format is specified in: https://tools.ietf.org/html/rfc7518#section-6. */ - for (jkey = jwk_keys->child; jkey != NULL; jkey = jkey->next) { - grpc_json *key_prop; - const char *alg = NULL; - const char *kid = NULL; - const char *kty = NULL; - - if (jkey->type != GRPC_JSON_OBJECT) continue; - for (key_prop = jkey->child; key_prop != NULL; key_prop = key_prop->next) { - if (strcmp(key_prop->key, "alg") == 0 && - key_prop->type == GRPC_JSON_STRING) { - alg = key_prop->value; - } else if (strcmp(key_prop->key, "kid") == 0 && - key_prop->type == GRPC_JSON_STRING) { - kid = key_prop->value; - } else if (strcmp(key_prop->key, "kty") == 0 && - key_prop->type == GRPC_JSON_STRING) { - kty = key_prop->value; - } - } - if (alg != NULL && kid != NULL && kty != NULL && - strcmp(kid, header_kid) == 0 && strcmp(alg, header_alg) == 0) { - return pkey_from_jwk(jkey, kty); - } - } - gpr_log(GPR_ERROR, - "Could not find matching key in key set for kid=%s and alg=%s", - header_kid, header_alg); + for (jkey = jwk_keys->child; jkey != NULL; jkey = jkey->next) + { + grpc_json *key_prop; + const char *alg = NULL; + const char *kid = NULL; + const char *kty = NULL; + + if (jkey->type != GRPC_JSON_OBJECT) + continue; + for (key_prop = jkey->child; key_prop != NULL; key_prop = key_prop->next) + { + if (strcmp (key_prop->key, "alg") == 0 && key_prop->type == GRPC_JSON_STRING) + { + alg = key_prop->value; + } + else if (strcmp (key_prop->key, "kid") == 0 && key_prop->type == GRPC_JSON_STRING) + { + kid = key_prop->value; + } + else if (strcmp (key_prop->key, "kty") == 0 && key_prop->type == GRPC_JSON_STRING) + { + kty = key_prop->value; + } + } + if (alg != NULL && kid != NULL && kty != NULL && strcmp (kid, header_kid) == 0 && strcmp (alg, header_alg) == 0) + { + return pkey_from_jwk (jkey, kty); + } + } + gpr_log (GPR_ERROR, "Could not find matching key in key set for kid=%s and alg=%s", header_kid, header_alg); return NULL; } -static int verify_jwt_signature(EVP_PKEY *key, const char *alg, - gpr_slice signature, gpr_slice signed_data) { - EVP_MD_CTX *md_ctx = EVP_MD_CTX_create(); - const EVP_MD *md = evp_md_from_alg(alg); +static int +verify_jwt_signature (EVP_PKEY * key, const char *alg, gpr_slice signature, gpr_slice signed_data) +{ + EVP_MD_CTX *md_ctx = EVP_MD_CTX_create (); + const EVP_MD *md = evp_md_from_alg (alg); int result = 0; - GPR_ASSERT(md != NULL); /* Checked before. */ - if (md_ctx == NULL) { - gpr_log(GPR_ERROR, "Could not create EVP_MD_CTX."); - goto end; - } - if (EVP_DigestVerifyInit(md_ctx, NULL, md, NULL, key) != 1) { - gpr_log(GPR_ERROR, "EVP_DigestVerifyInit failed."); - goto end; - } - if (EVP_DigestVerifyUpdate(md_ctx, GPR_SLICE_START_PTR(signed_data), - GPR_SLICE_LENGTH(signed_data)) != 1) { - gpr_log(GPR_ERROR, "EVP_DigestVerifyUpdate failed."); - goto end; - } - if (EVP_DigestVerifyFinal(md_ctx, GPR_SLICE_START_PTR(signature), - GPR_SLICE_LENGTH(signature)) != 1) { - gpr_log(GPR_ERROR, "JWT signature verification failed."); - goto end; - } + GPR_ASSERT (md != NULL); /* Checked before. */ + if (md_ctx == NULL) + { + gpr_log (GPR_ERROR, "Could not create EVP_MD_CTX."); + goto end; + } + if (EVP_DigestVerifyInit (md_ctx, NULL, md, NULL, key) != 1) + { + gpr_log (GPR_ERROR, "EVP_DigestVerifyInit failed."); + goto end; + } + if (EVP_DigestVerifyUpdate (md_ctx, GPR_SLICE_START_PTR (signed_data), GPR_SLICE_LENGTH (signed_data)) != 1) + { + gpr_log (GPR_ERROR, "EVP_DigestVerifyUpdate failed."); + goto end; + } + if (EVP_DigestVerifyFinal (md_ctx, GPR_SLICE_START_PTR (signature), GPR_SLICE_LENGTH (signature)) != 1) + { + gpr_log (GPR_ERROR, "JWT signature verification failed."); + goto end; + } result = 1; end: - if (md_ctx != NULL) EVP_MD_CTX_destroy(md_ctx); + if (md_ctx != NULL) + EVP_MD_CTX_destroy (md_ctx); return result; } -static void on_keys_retrieved(void *user_data, - const grpc_httpcli_response *response, - grpc_closure_list *closure_list) { - grpc_json *json = json_from_http(response); - verifier_cb_ctx *ctx = (verifier_cb_ctx *)user_data; +static void +on_keys_retrieved (void *user_data, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +{ + grpc_json *json = json_from_http (response); + verifier_cb_ctx *ctx = (verifier_cb_ctx *) user_data; EVP_PKEY *verification_key = NULL; grpc_jwt_verifier_status status = GRPC_JWT_VERIFIER_GENERIC_ERROR; grpc_jwt_claims *claims = NULL; - if (json == NULL) { - status = GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR; - goto end; - } - verification_key = - 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); - status = GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR; - goto end; - } - - if (!verify_jwt_signature(verification_key, ctx->header->alg, ctx->signature, - ctx->signed_data)) { - status = GRPC_JWT_VERIFIER_BAD_SIGNATURE; - goto end; - } - - status = grpc_jwt_claims_check(ctx->claims, ctx->audience); - if (status == GRPC_JWT_VERIFIER_OK) { - /* Pass ownership. */ - claims = ctx->claims; - ctx->claims = NULL; - } + if (json == NULL) + { + status = GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR; + goto end; + } + verification_key = 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); + status = GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR; + goto end; + } + + if (!verify_jwt_signature (verification_key, ctx->header->alg, ctx->signature, ctx->signed_data)) + { + status = GRPC_JWT_VERIFIER_BAD_SIGNATURE; + goto end; + } + + status = grpc_jwt_claims_check (ctx->claims, ctx->audience); + if (status == GRPC_JWT_VERIFIER_OK) + { + /* Pass ownership. */ + claims = ctx->claims; + ctx->claims = NULL; + } end: - if (json != NULL) grpc_json_destroy(json); - if (verification_key != NULL) EVP_PKEY_free(verification_key); - ctx->user_cb(ctx->user_data, status, claims); - verifier_cb_ctx_destroy(ctx); + if (json != NULL) + grpc_json_destroy (json); + if (verification_key != NULL) + EVP_PKEY_free (verification_key); + ctx->user_cb (ctx->user_data, status, claims); + verifier_cb_ctx_destroy (ctx); } -static void on_openid_config_retrieved(void *user_data, - const grpc_httpcli_response *response, - grpc_closure_list *closure_list) { +static void +on_openid_config_retrieved (void *user_data, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +{ const grpc_json *cur; - grpc_json *json = json_from_http(response); - verifier_cb_ctx *ctx = (verifier_cb_ctx *)user_data; + grpc_json *json = json_from_http (response); + verifier_cb_ctx *ctx = (verifier_cb_ctx *) user_data; grpc_httpcli_request req; const char *jwks_uri; - /* TODO(jboeuf): Cache the jwks_uri in order to avoid this hop next time.*/ - if (json == NULL) goto error; - cur = find_property_by_name(json, "jwks_uri"); - if (cur == NULL) { - gpr_log(GPR_ERROR, "Could not find jwks_uri in openid config."); + /* TODO(jboeuf): Cache the jwks_uri in order to avoid this hop next time. */ + if (json == NULL) goto error; - } - jwks_uri = validate_string_field(cur, "jwks_uri"); - if (jwks_uri == NULL) goto error; - if (strstr(jwks_uri, "https://") != jwks_uri) { - gpr_log(GPR_ERROR, "Invalid non https jwks_uri: %s.", jwks_uri); + cur = find_property_by_name (json, "jwks_uri"); + if (cur == NULL) + { + gpr_log (GPR_ERROR, "Could not find jwks_uri in openid config."); + goto error; + } + jwks_uri = validate_string_field (cur, "jwks_uri"); + if (jwks_uri == NULL) goto error; - } + if (strstr (jwks_uri, "https://") != jwks_uri) + { + gpr_log (GPR_ERROR, "Invalid non https jwks_uri: %s.", jwks_uri); + goto error; + } jwks_uri += 8; req.handshaker = &grpc_httpcli_ssl; - req.host = gpr_strdup(jwks_uri); - req.path = strchr(jwks_uri, '/'); - if (req.path == NULL) { - req.path = ""; - } else { - *(req.host + (req.path - jwks_uri)) = '\0'; - } - grpc_httpcli_get( - &ctx->verifier->http_ctx, ctx->pollset, &req, - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), - on_keys_retrieved, ctx, closure_list); - grpc_json_destroy(json); - gpr_free(req.host); + req.host = gpr_strdup (jwks_uri); + req.path = strchr (jwks_uri, '/'); + if (req.path == NULL) + { + req.path = ""; + } + else + { + *(req.host + (req.path - jwks_uri)) = '\0'; + } + grpc_httpcli_get (&ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), on_keys_retrieved, ctx, closure_list); + grpc_json_destroy (json); + gpr_free (req.host); return; error: - if (json != NULL) grpc_json_destroy(json); - ctx->user_cb(ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, NULL); - verifier_cb_ctx_destroy(ctx); + if (json != NULL) + grpc_json_destroy (json); + 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, - const char *email_domain) { +static email_key_mapping * +verifier_get_mapping (grpc_jwt_verifier * v, const char *email_domain) +{ size_t i; - if (v->mappings == NULL) return NULL; - for (i = 0; i < v->num_mappings; i++) { - if (strcmp(email_domain, v->mappings[i].email_domain) == 0) { - return &v->mappings[i]; + if (v->mappings == NULL) + return NULL; + for (i = 0; i < v->num_mappings; i++) + { + if (strcmp (email_domain, v->mappings[i].email_domain) == 0) + { + return &v->mappings[i]; + } } - } return NULL; } -static void verifier_put_mapping(grpc_jwt_verifier *v, const char *email_domain, - const char *key_url_prefix) { - email_key_mapping *mapping = verifier_get_mapping(v, email_domain); - GPR_ASSERT(v->num_mappings < v->allocated_mappings); - if (mapping != NULL) { - gpr_free(mapping->key_url_prefix); - mapping->key_url_prefix = gpr_strdup(key_url_prefix); - return; - } - v->mappings[v->num_mappings].email_domain = gpr_strdup(email_domain); - v->mappings[v->num_mappings].key_url_prefix = gpr_strdup(key_url_prefix); +static void +verifier_put_mapping (grpc_jwt_verifier * v, const char *email_domain, const char *key_url_prefix) +{ + email_key_mapping *mapping = verifier_get_mapping (v, email_domain); + GPR_ASSERT (v->num_mappings < v->allocated_mappings); + if (mapping != NULL) + { + gpr_free (mapping->key_url_prefix); + mapping->key_url_prefix = gpr_strdup (key_url_prefix); + return; + } + v->mappings[v->num_mappings].email_domain = gpr_strdup (email_domain); + v->mappings[v->num_mappings].key_url_prefix = gpr_strdup (key_url_prefix); v->num_mappings++; - GPR_ASSERT(v->num_mappings <= v->allocated_mappings); + GPR_ASSERT (v->num_mappings <= v->allocated_mappings); } /* Takes ownership of ctx. */ -static void retrieve_key_and_verify(verifier_cb_ctx *ctx, - grpc_closure_list *closure_list) { +static void +retrieve_key_and_verify (verifier_cb_ctx * ctx, grpc_closure_list * closure_list) +{ const char *at_sign; grpc_httpcli_response_cb http_cb; char *path_prefix = NULL; const char *iss; grpc_httpcli_request req; - memset(&req, 0, sizeof(grpc_httpcli_request)); + memset (&req, 0, sizeof (grpc_httpcli_request)); req.handshaker = &grpc_httpcli_ssl; - GPR_ASSERT(ctx != NULL && ctx->header != NULL && ctx->claims != NULL); + GPR_ASSERT (ctx != NULL && ctx->header != NULL && ctx->claims != NULL); iss = ctx->claims->iss; - if (ctx->header->kid == NULL) { - gpr_log(GPR_ERROR, "Missing kid in jose header."); - goto error; - } - if (iss == NULL) { - gpr_log(GPR_ERROR, "Missing iss in claims."); - goto error; - } + if (ctx->header->kid == NULL) + { + gpr_log (GPR_ERROR, "Missing kid in jose header."); + goto error; + } + if (iss == NULL) + { + gpr_log (GPR_ERROR, "Missing iss in claims."); + goto error; + } /* This code relies on: https://openid.net/specs/openid-connect-discovery-1_0.html @@ -713,56 +852,60 @@ static void retrieve_key_and_verify(verifier_cb_ctx *ctx, /* Very non-sophisticated way to detect an email address. Should be good enough for now... */ - at_sign = strchr(iss, '@'); - if (at_sign != NULL) { - email_key_mapping *mapping; - const char *email_domain = at_sign + 1; - GPR_ASSERT(ctx->verifier != NULL); - mapping = verifier_get_mapping(ctx->verifier, email_domain); - if (mapping == NULL) { - gpr_log(GPR_ERROR, "Missing mapping for issuer email."); - goto error; + at_sign = strchr (iss, '@'); + if (at_sign != NULL) + { + email_key_mapping *mapping; + const char *email_domain = at_sign + 1; + GPR_ASSERT (ctx->verifier != NULL); + mapping = verifier_get_mapping (ctx->verifier, email_domain); + if (mapping == NULL) + { + gpr_log (GPR_ERROR, "Missing mapping for issuer email."); + goto error; + } + req.host = gpr_strdup (mapping->key_url_prefix); + path_prefix = strchr (req.host, '/'); + if (path_prefix == NULL) + { + gpr_asprintf (&req.path, "/%s", iss); + } + else + { + *(path_prefix++) = '\0'; + gpr_asprintf (&req.path, "/%s/%s", path_prefix, iss); + } + http_cb = on_keys_retrieved; } - req.host = gpr_strdup(mapping->key_url_prefix); - path_prefix = strchr(req.host, '/'); - if (path_prefix == NULL) { - gpr_asprintf(&req.path, "/%s", iss); - } else { - *(path_prefix++) = '\0'; - gpr_asprintf(&req.path, "/%s/%s", path_prefix, iss); - } - http_cb = on_keys_retrieved; - } else { - req.host = gpr_strdup(strstr(iss, "https://") == iss ? iss + 8 : iss); - path_prefix = strchr(req.host, '/'); - if (path_prefix == NULL) { - req.path = gpr_strdup(GRPC_OPENID_CONFIG_URL_SUFFIX); - } else { - *(path_prefix++) = 0; - gpr_asprintf(&req.path, "/%s%s", path_prefix, - GRPC_OPENID_CONFIG_URL_SUFFIX); - } - http_cb = on_openid_config_retrieved; - } - - grpc_httpcli_get( - &ctx->verifier->http_ctx, ctx->pollset, &req, - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), - http_cb, ctx, closure_list); - gpr_free(req.host); - gpr_free(req.path); + else + { + req.host = gpr_strdup (strstr (iss, "https://") == iss ? iss + 8 : iss); + path_prefix = strchr (req.host, '/'); + if (path_prefix == NULL) + { + req.path = gpr_strdup (GRPC_OPENID_CONFIG_URL_SUFFIX); + } + else + { + *(path_prefix++) = 0; + gpr_asprintf (&req.path, "/%s%s", path_prefix, GRPC_OPENID_CONFIG_URL_SUFFIX); + } + http_cb = on_openid_config_retrieved; + } + + grpc_httpcli_get (&ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), http_cb, ctx, closure_list); + gpr_free (req.host); + gpr_free (req.path); return; error: - ctx->user_cb(ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, NULL); - verifier_cb_ctx_destroy(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_jwt_verifier *verifier, - grpc_pollset *pollset, const char *jwt, - const char *audience, - grpc_jwt_verification_done_cb cb, void *user_data, - grpc_closure_list *closure_list) { +void +grpc_jwt_verifier_verify (grpc_jwt_verifier * verifier, grpc_pollset * pollset, const char *jwt, const char *audience, grpc_jwt_verification_done_cb cb, void *user_data, grpc_closure_list * closure_list) +{ const char *dot = NULL; grpc_json *json; jose_header *header = NULL; @@ -773,71 +916,82 @@ void grpc_jwt_verifier_verify(grpc_jwt_verifier *verifier, size_t signed_jwt_len; const char *cur = jwt; - GPR_ASSERT(verifier != NULL && jwt != NULL && audience != NULL && cb != NULL); - dot = strchr(cur, '.'); - if (dot == NULL) goto error; - json = parse_json_part_from_jwt(cur, (size_t)(dot - cur), &header_buffer); - if (json == NULL) goto error; - header = jose_header_from_json(json, header_buffer); - if (header == NULL) goto error; + GPR_ASSERT (verifier != NULL && jwt != NULL && audience != NULL && cb != NULL); + dot = strchr (cur, '.'); + if (dot == NULL) + goto error; + json = parse_json_part_from_jwt (cur, (size_t) (dot - cur), &header_buffer); + if (json == NULL) + goto error; + 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(cur, (size_t)(dot - cur), &claims_buffer); - if (json == NULL) goto error; - claims = grpc_jwt_claims_from_json(json, claims_buffer); - if (claims == NULL) goto error; - - signed_jwt_len = (size_t)(dot - jwt); + dot = strchr (cur, '.'); + if (dot == NULL) + goto error; + json = parse_json_part_from_jwt (cur, (size_t) (dot - cur), &claims_buffer); + if (json == NULL) + goto error; + 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(cur, 1); - if (GPR_SLICE_IS_EMPTY(signature)) goto error; - retrieve_key_and_verify( - verifier_cb_ctx_create(verifier, pollset, header, claims, audience, - signature, jwt, signed_jwt_len, user_data, cb), - closure_list); + signature = grpc_base64_decode (cur, 1); + if (GPR_SLICE_IS_EMPTY (signature)) + goto error; + retrieve_key_and_verify (verifier_cb_ctx_create (verifier, pollset, header, claims, audience, signature, jwt, signed_jwt_len, user_data, cb), closure_list); return; error: - if (header != NULL) jose_header_destroy(header); - if (claims != NULL) grpc_jwt_claims_destroy(claims); - cb(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( - const grpc_jwt_verifier_email_domain_key_url_mapping *mappings, - size_t num_mappings) { - grpc_jwt_verifier *v = gpr_malloc(sizeof(grpc_jwt_verifier)); - memset(v, 0, sizeof(grpc_jwt_verifier)); - grpc_httpcli_context_init(&v->http_ctx); +grpc_jwt_verifier * +grpc_jwt_verifier_create (const grpc_jwt_verifier_email_domain_key_url_mapping * mappings, size_t num_mappings) +{ + grpc_jwt_verifier *v = gpr_malloc (sizeof (grpc_jwt_verifier)); + memset (v, 0, sizeof (grpc_jwt_verifier)); + grpc_httpcli_context_init (&v->http_ctx); /* We know at least of one mapping. */ v->allocated_mappings = 1 + num_mappings; - v->mappings = gpr_malloc(v->allocated_mappings * sizeof(email_key_mapping)); - verifier_put_mapping(v, GRPC_GOOGLE_SERVICE_ACCOUNTS_EMAIL_DOMAIN, - GRPC_GOOGLE_SERVICE_ACCOUNTS_KEY_URL_PREFIX); + v->mappings = gpr_malloc (v->allocated_mappings * sizeof (email_key_mapping)); + verifier_put_mapping (v, GRPC_GOOGLE_SERVICE_ACCOUNTS_EMAIL_DOMAIN, GRPC_GOOGLE_SERVICE_ACCOUNTS_KEY_URL_PREFIX); /* User-Provided mappings. */ - if (mappings != NULL) { - size_t i; - for (i = 0; i < num_mappings; i++) { - verifier_put_mapping(v, mappings[i].email_domain, - mappings[i].key_url_prefix); + if (mappings != NULL) + { + size_t i; + for (i = 0; i < num_mappings; i++) + { + verifier_put_mapping (v, mappings[i].email_domain, mappings[i].key_url_prefix); + } } - } return v; } -void grpc_jwt_verifier_destroy(grpc_jwt_verifier *v) { +void +grpc_jwt_verifier_destroy (grpc_jwt_verifier * v) +{ size_t i; - if (v == NULL) return; - 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); - gpr_free(v->mappings[i].key_url_prefix); - } - gpr_free(v->mappings); - } - gpr_free(v); + if (v == NULL) + return; + 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); + gpr_free (v->mappings[i].key_url_prefix); + } + gpr_free (v->mappings); + } + gpr_free (v); } diff --git a/src/core/security/jwt_verifier.h b/src/core/security/jwt_verifier.h index b270280cc10..4a1748898eb 100644 --- a/src/core/security/jwt_verifier.h +++ b/src/core/security/jwt_verifier.h @@ -50,7 +50,8 @@ /* --- grpc_jwt_verifier_status. --- */ -typedef enum { +typedef enum +{ GRPC_JWT_VERIFIER_OK = 0, GRPC_JWT_VERIFIER_BAD_SIGNATURE, GRPC_JWT_VERIFIER_BAD_FORMAT, @@ -60,31 +61,32 @@ typedef enum { GRPC_JWT_VERIFIER_GENERIC_ERROR } grpc_jwt_verifier_status; -const char *grpc_jwt_verifier_status_to_string(grpc_jwt_verifier_status status); +const char *grpc_jwt_verifier_status_to_string (grpc_jwt_verifier_status status); /* --- grpc_jwt_claims. --- */ typedef struct grpc_jwt_claims grpc_jwt_claims; -void grpc_jwt_claims_destroy(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); +const grpc_json *grpc_jwt_claims_json (const grpc_jwt_claims * claims); /* Access to registered claims in https://tools.ietf.org/html/rfc7519#page-9 */ -const char *grpc_jwt_claims_subject(const grpc_jwt_claims *claims); -const char *grpc_jwt_claims_issuer(const grpc_jwt_claims *claims); -const char *grpc_jwt_claims_id(const grpc_jwt_claims *claims); -const char *grpc_jwt_claims_audience(const grpc_jwt_claims *claims); -gpr_timespec grpc_jwt_claims_issued_at(const grpc_jwt_claims *claims); -gpr_timespec grpc_jwt_claims_expires_at(const grpc_jwt_claims *claims); -gpr_timespec grpc_jwt_claims_not_before(const grpc_jwt_claims *claims); +const char *grpc_jwt_claims_subject (const grpc_jwt_claims * claims); +const char *grpc_jwt_claims_issuer (const grpc_jwt_claims * claims); +const char *grpc_jwt_claims_id (const grpc_jwt_claims * claims); +const char *grpc_jwt_claims_audience (const grpc_jwt_claims * claims); +gpr_timespec grpc_jwt_claims_issued_at (const grpc_jwt_claims * claims); +gpr_timespec grpc_jwt_claims_expires_at (const grpc_jwt_claims * claims); +gpr_timespec grpc_jwt_claims_not_before (const grpc_jwt_claims * claims); /* --- grpc_jwt_verifier. --- */ typedef struct grpc_jwt_verifier grpc_jwt_verifier; -typedef struct { +typedef struct +{ /* The email domain is the part after the @ sign. */ const char *email_domain; @@ -104,32 +106,23 @@ extern gpr_timespec grpc_jwt_verifier_max_delay; A verifier object has one built-in mapping (unless overridden): GRPC_GOOGLE_SERVICE_ACCOUNTS_EMAIL_DOMAIN -> GRPC_GOOGLE_SERVICE_ACCOUNTS_KEY_URL_PREFIX.*/ -grpc_jwt_verifier *grpc_jwt_verifier_create( - const grpc_jwt_verifier_email_domain_key_url_mapping *mappings, - size_t num_mappings); +grpc_jwt_verifier *grpc_jwt_verifier_create (const grpc_jwt_verifier_email_domain_key_url_mapping * mappings, 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_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, - grpc_jwt_verifier_status status, - grpc_jwt_claims *claims); +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_jwt_verifier *verifier, - grpc_pollset *pollset, const char *jwt, - const char *audience, - grpc_jwt_verification_done_cb cb, void *user_data, - grpc_closure_list *closure_list); +void grpc_jwt_verifier_verify (grpc_jwt_verifier * verifier, grpc_pollset * pollset, const char *jwt, const char *audience, grpc_jwt_verification_done_cb cb, void *user_data, grpc_closure_list * closure_list); /* --- TESTING ONLY exposed functions. --- */ -grpc_jwt_claims *grpc_jwt_claims_from_json(grpc_json *json, gpr_slice buffer); -grpc_jwt_verifier_status grpc_jwt_claims_check(const grpc_jwt_claims *claims, - const char *audience); +grpc_jwt_claims *grpc_jwt_claims_from_json (grpc_json * json, gpr_slice buffer); +grpc_jwt_verifier_status grpc_jwt_claims_check (const grpc_jwt_claims * claims, const char *audience); #endif /* GRPC_INTERNAL_CORE_SECURITY_JWT_VERIFIER_H */ diff --git a/src/core/security/secure_endpoint.c b/src/core/security/secure_endpoint.c index a6fc7e94a08..64c501860ff 100644 --- a/src/core/security/secure_endpoint.c +++ b/src/core/security/secure_endpoint.c @@ -43,7 +43,8 @@ #define STAGING_BUFFER_SIZE 8192 -typedef struct { +typedef struct +{ grpc_endpoint base; grpc_endpoint *wrapped_ep; struct tsi_frame_protector *protector; @@ -67,18 +68,19 @@ typedef struct { int grpc_trace_secure_endpoint = 0; -static void destroy(secure_endpoint *secure_ep, - grpc_closure_list *closure_list) { +static void +destroy (secure_endpoint * secure_ep, grpc_closure_list * closure_list) +{ secure_endpoint *ep = secure_ep; - grpc_endpoint_destroy(ep->wrapped_ep, closure_list); - tsi_frame_protector_destroy(ep->protector); - gpr_slice_buffer_destroy(&ep->leftover_bytes); - gpr_slice_unref(ep->read_staging_buffer); - gpr_slice_unref(ep->write_staging_buffer); - gpr_slice_buffer_destroy(&ep->output_buffer); - gpr_slice_buffer_destroy(&ep->source_buffer); - gpr_mu_destroy(&ep->protector_mu); - gpr_free(ep); + grpc_endpoint_destroy (ep->wrapped_ep, closure_list); + tsi_frame_protector_destroy (ep->protector); + gpr_slice_buffer_destroy (&ep->leftover_bytes); + gpr_slice_unref (ep->read_staging_buffer); + gpr_slice_unref (ep->write_staging_buffer); + gpr_slice_buffer_destroy (&ep->output_buffer); + gpr_slice_buffer_destroy (&ep->source_buffer); + gpr_mu_destroy (&ep->protector_mu); + gpr_free (ep); } /*#define GRPC_SECURE_ENDPOINT_REFCOUNT_DEBUG*/ @@ -87,299 +89,326 @@ static void destroy(secure_endpoint *secure_ep, secure_endpoint_unref((ep), (cl), (reason), __FILE__, __LINE__) #define SECURE_ENDPOINT_REF(ep, reason) \ secure_endpoint_ref((ep), (reason), __FILE__, __LINE__) -static void secure_endpoint_unref(secure_endpoint *ep, - grpc_closure_list *closure_list, - const char *reason, const char *file, - int line) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "SECENDP unref %p : %s %d -> %d", - ep, reason, ep->ref.count, ep->ref.count - 1); - if (gpr_unref(&ep->ref)) { - destroy(ep, closure_list); - } +static void +secure_endpoint_unref (secure_endpoint * ep, grpc_closure_list * closure_list, const char *reason, const char *file, int line) +{ + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "SECENDP unref %p : %s %d -> %d", ep, reason, ep->ref.count, ep->ref.count - 1); + if (gpr_unref (&ep->ref)) + { + destroy (ep, closure_list); + } } -static void secure_endpoint_ref(secure_endpoint *ep, const char *reason, - const char *file, int line) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "SECENDP ref %p : %s %d -> %d", - ep, reason, ep->ref.count, ep->ref.count + 1); - gpr_ref(&ep->ref); +static void +secure_endpoint_ref (secure_endpoint * ep, const char *reason, const char *file, int line) +{ + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "SECENDP ref %p : %s %d -> %d", ep, reason, ep->ref.count, ep->ref.count + 1); + gpr_ref (&ep->ref); } #else #define SECURE_ENDPOINT_UNREF(ep, reason, cl) secure_endpoint_unref((ep), (cl)) #define SECURE_ENDPOINT_REF(ep, reason) secure_endpoint_ref((ep)) -static void secure_endpoint_unref(secure_endpoint *ep, - grpc_closure_list *closure_list) { - if (gpr_unref(&ep->ref)) { - destroy(ep, closure_list); - } +static void +secure_endpoint_unref (secure_endpoint * ep, grpc_closure_list * closure_list) +{ + if (gpr_unref (&ep->ref)) + { + destroy (ep, closure_list); + } } -static void secure_endpoint_ref(secure_endpoint *ep) { gpr_ref(&ep->ref); } +static void +secure_endpoint_ref (secure_endpoint * ep) +{ + gpr_ref (&ep->ref); +} #endif -static void flush_read_staging_buffer(secure_endpoint *ep, gpr_uint8 **cur, - gpr_uint8 **end) { - gpr_slice_buffer_add(ep->read_buffer, ep->read_staging_buffer); - ep->read_staging_buffer = gpr_slice_malloc(STAGING_BUFFER_SIZE); - *cur = GPR_SLICE_START_PTR(ep->read_staging_buffer); - *end = GPR_SLICE_END_PTR(ep->read_staging_buffer); +static void +flush_read_staging_buffer (secure_endpoint * ep, gpr_uint8 ** cur, gpr_uint8 ** end) +{ + gpr_slice_buffer_add (ep->read_buffer, ep->read_staging_buffer); + ep->read_staging_buffer = gpr_slice_malloc (STAGING_BUFFER_SIZE); + *cur = GPR_SLICE_START_PTR (ep->read_staging_buffer); + *end = GPR_SLICE_END_PTR (ep->read_staging_buffer); } -static void call_read_cb(secure_endpoint *ep, int success, - grpc_closure_list *closure_list) { - if (grpc_trace_secure_endpoint) { - size_t i; - for (i = 0; i < ep->read_buffer->count; i++) { - char *data = gpr_dump_slice(ep->read_buffer->slices[i], - GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_DEBUG, "READ %p: %s", ep, data); - gpr_free(data); +static void +call_read_cb (secure_endpoint * ep, int success, grpc_closure_list * closure_list) +{ + if (grpc_trace_secure_endpoint) + { + size_t i; + for (i = 0; i < ep->read_buffer->count; i++) + { + char *data = gpr_dump_slice (ep->read_buffer->slices[i], + GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log (GPR_DEBUG, "READ %p: %s", ep, data); + gpr_free (data); + } } - } ep->read_buffer = NULL; - grpc_closure_list_add(closure_list, ep->read_cb, success); - SECURE_ENDPOINT_UNREF(ep, "read", closure_list); + grpc_closure_list_add (closure_list, ep->read_cb, success); + SECURE_ENDPOINT_UNREF (ep, "read", closure_list); } -static void on_read(void *user_data, int success, - grpc_closure_list *closure_list) { +static void +on_read (void *user_data, int success, grpc_closure_list * closure_list) +{ unsigned i; gpr_uint8 keep_looping = 0; tsi_result result = TSI_OK; - secure_endpoint *ep = (secure_endpoint *)user_data; - gpr_uint8 *cur = GPR_SLICE_START_PTR(ep->read_staging_buffer); - gpr_uint8 *end = GPR_SLICE_END_PTR(ep->read_staging_buffer); - - if (!success) { - gpr_slice_buffer_reset_and_unref(ep->read_buffer); - call_read_cb(ep, 0, closure_list); - return; - } + secure_endpoint *ep = (secure_endpoint *) user_data; + gpr_uint8 *cur = GPR_SLICE_START_PTR (ep->read_staging_buffer); + gpr_uint8 *end = GPR_SLICE_END_PTR (ep->read_staging_buffer); + + if (!success) + { + gpr_slice_buffer_reset_and_unref (ep->read_buffer); + call_read_cb (ep, 0, closure_list); + return; + } /* TODO(yangg) check error, maybe bail out early */ - for (i = 0; i < ep->source_buffer.count; i++) { - gpr_slice encrypted = ep->source_buffer.slices[i]; - gpr_uint8 *message_bytes = GPR_SLICE_START_PTR(encrypted); - size_t message_size = GPR_SLICE_LENGTH(encrypted); - - while (message_size > 0 || keep_looping) { - size_t unprotected_buffer_size_written = (size_t)(end - cur); - size_t processed_message_size = message_size; - gpr_mu_lock(&ep->protector_mu); - result = tsi_frame_protector_unprotect(ep->protector, message_bytes, - &processed_message_size, cur, - &unprotected_buffer_size_written); - gpr_mu_unlock(&ep->protector_mu); - if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Decryption error: %s", - tsi_result_to_string(result)); - break; - } - message_bytes += processed_message_size; - message_size -= processed_message_size; - cur += unprotected_buffer_size_written; - - if (cur == end) { - flush_read_staging_buffer(ep, &cur, &end); - /* Force to enter the loop again to extract buffered bytes in protector. - The bytes could be buffered because of running out of staging_buffer. - If this happens at the end of all slices, doing another unprotect - avoids leaving data in the protector. */ - keep_looping = 1; - } else if (unprotected_buffer_size_written > 0) { - keep_looping = 1; - } else { - keep_looping = 0; - } + for (i = 0; i < ep->source_buffer.count; i++) + { + gpr_slice encrypted = ep->source_buffer.slices[i]; + gpr_uint8 *message_bytes = GPR_SLICE_START_PTR (encrypted); + size_t message_size = GPR_SLICE_LENGTH (encrypted); + + while (message_size > 0 || keep_looping) + { + size_t unprotected_buffer_size_written = (size_t) (end - cur); + size_t processed_message_size = message_size; + gpr_mu_lock (&ep->protector_mu); + result = tsi_frame_protector_unprotect (ep->protector, message_bytes, &processed_message_size, cur, &unprotected_buffer_size_written); + gpr_mu_unlock (&ep->protector_mu); + if (result != TSI_OK) + { + gpr_log (GPR_ERROR, "Decryption error: %s", tsi_result_to_string (result)); + break; + } + message_bytes += processed_message_size; + message_size -= processed_message_size; + cur += unprotected_buffer_size_written; + + if (cur == end) + { + flush_read_staging_buffer (ep, &cur, &end); + /* Force to enter the loop again to extract buffered bytes in protector. + The bytes could be buffered because of running out of staging_buffer. + If this happens at the end of all slices, doing another unprotect + avoids leaving data in the protector. */ + keep_looping = 1; + } + else if (unprotected_buffer_size_written > 0) + { + keep_looping = 1; + } + else + { + keep_looping = 0; + } + } + if (result != TSI_OK) + break; } - if (result != TSI_OK) break; - } - if (cur != GPR_SLICE_START_PTR(ep->read_staging_buffer)) { - gpr_slice_buffer_add( - ep->read_buffer, - gpr_slice_split_head( - &ep->read_staging_buffer, - (size_t)(cur - GPR_SLICE_START_PTR(ep->read_staging_buffer)))); - } + if (cur != GPR_SLICE_START_PTR (ep->read_staging_buffer)) + { + gpr_slice_buffer_add (ep->read_buffer, gpr_slice_split_head (&ep->read_staging_buffer, (size_t) (cur - GPR_SLICE_START_PTR (ep->read_staging_buffer)))); + } /* TODO(yangg) experiment with moving this block after read_cb to see if it helps latency */ - gpr_slice_buffer_reset_and_unref(&ep->source_buffer); + gpr_slice_buffer_reset_and_unref (&ep->source_buffer); - if (result != TSI_OK) { - gpr_slice_buffer_reset_and_unref(ep->read_buffer); - call_read_cb(ep, 0, closure_list); - return; - } + if (result != TSI_OK) + { + gpr_slice_buffer_reset_and_unref (ep->read_buffer); + call_read_cb (ep, 0, closure_list); + return; + } - call_read_cb(ep, 1, closure_list); + call_read_cb (ep, 1, closure_list); } -static void endpoint_read(grpc_endpoint *secure_ep, gpr_slice_buffer *slices, - grpc_closure *cb, grpc_closure_list *closure_list) { - secure_endpoint *ep = (secure_endpoint *)secure_ep; +static void +endpoint_read (grpc_endpoint * secure_ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list) +{ + secure_endpoint *ep = (secure_endpoint *) secure_ep; ep->read_cb = cb; ep->read_buffer = slices; - gpr_slice_buffer_reset_and_unref(ep->read_buffer); - - SECURE_ENDPOINT_REF(ep, "read"); - if (ep->leftover_bytes.count) { - gpr_slice_buffer_swap(&ep->leftover_bytes, &ep->source_buffer); - GPR_ASSERT(ep->leftover_bytes.count == 0); - on_read(ep, 1, closure_list); - return; - } - - grpc_endpoint_read(ep->wrapped_ep, &ep->source_buffer, &ep->on_read, - closure_list); + gpr_slice_buffer_reset_and_unref (ep->read_buffer); + + SECURE_ENDPOINT_REF (ep, "read"); + if (ep->leftover_bytes.count) + { + gpr_slice_buffer_swap (&ep->leftover_bytes, &ep->source_buffer); + GPR_ASSERT (ep->leftover_bytes.count == 0); + on_read (ep, 1, closure_list); + return; + } + + grpc_endpoint_read (ep->wrapped_ep, &ep->source_buffer, &ep->on_read, closure_list); } -static void flush_write_staging_buffer(secure_endpoint *ep, gpr_uint8 **cur, - gpr_uint8 **end) { - gpr_slice_buffer_add(&ep->output_buffer, ep->write_staging_buffer); - ep->write_staging_buffer = gpr_slice_malloc(STAGING_BUFFER_SIZE); - *cur = GPR_SLICE_START_PTR(ep->write_staging_buffer); - *end = GPR_SLICE_END_PTR(ep->write_staging_buffer); +static void +flush_write_staging_buffer (secure_endpoint * ep, gpr_uint8 ** cur, gpr_uint8 ** end) +{ + gpr_slice_buffer_add (&ep->output_buffer, ep->write_staging_buffer); + ep->write_staging_buffer = gpr_slice_malloc (STAGING_BUFFER_SIZE); + *cur = GPR_SLICE_START_PTR (ep->write_staging_buffer); + *end = GPR_SLICE_END_PTR (ep->write_staging_buffer); } -static void endpoint_write(grpc_endpoint *secure_ep, gpr_slice_buffer *slices, - grpc_closure *cb, grpc_closure_list *closure_list) { +static void +endpoint_write (grpc_endpoint * secure_ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list) +{ unsigned i; tsi_result result = TSI_OK; - secure_endpoint *ep = (secure_endpoint *)secure_ep; - gpr_uint8 *cur = GPR_SLICE_START_PTR(ep->write_staging_buffer); - gpr_uint8 *end = GPR_SLICE_END_PTR(ep->write_staging_buffer); - - gpr_slice_buffer_reset_and_unref(&ep->output_buffer); - - if (grpc_trace_secure_endpoint) { - for (i = 0; i < slices->count; i++) { - char *data = - gpr_dump_slice(slices->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_DEBUG, "WRITE %p: %s", ep, data); - gpr_free(data); + secure_endpoint *ep = (secure_endpoint *) secure_ep; + gpr_uint8 *cur = GPR_SLICE_START_PTR (ep->write_staging_buffer); + gpr_uint8 *end = GPR_SLICE_END_PTR (ep->write_staging_buffer); + + gpr_slice_buffer_reset_and_unref (&ep->output_buffer); + + if (grpc_trace_secure_endpoint) + { + for (i = 0; i < slices->count; i++) + { + char *data = gpr_dump_slice (slices->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log (GPR_DEBUG, "WRITE %p: %s", ep, data); + gpr_free (data); + } } - } - - for (i = 0; i < slices->count; i++) { - gpr_slice plain = slices->slices[i]; - gpr_uint8 *message_bytes = GPR_SLICE_START_PTR(plain); - size_t message_size = GPR_SLICE_LENGTH(plain); - while (message_size > 0) { - size_t protected_buffer_size_to_send = (size_t)(end - cur); - size_t processed_message_size = message_size; - gpr_mu_lock(&ep->protector_mu); - result = tsi_frame_protector_protect(ep->protector, message_bytes, - &processed_message_size, cur, - &protected_buffer_size_to_send); - gpr_mu_unlock(&ep->protector_mu); - if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Encryption error: %s", - tsi_result_to_string(result)); - break; - } - message_bytes += processed_message_size; - message_size -= processed_message_size; - cur += protected_buffer_size_to_send; - - if (cur == end) { - flush_write_staging_buffer(ep, &cur, &end); - } + + for (i = 0; i < slices->count; i++) + { + gpr_slice plain = slices->slices[i]; + gpr_uint8 *message_bytes = GPR_SLICE_START_PTR (plain); + size_t message_size = GPR_SLICE_LENGTH (plain); + while (message_size > 0) + { + size_t protected_buffer_size_to_send = (size_t) (end - cur); + size_t processed_message_size = message_size; + gpr_mu_lock (&ep->protector_mu); + result = tsi_frame_protector_protect (ep->protector, message_bytes, &processed_message_size, cur, &protected_buffer_size_to_send); + gpr_mu_unlock (&ep->protector_mu); + if (result != TSI_OK) + { + gpr_log (GPR_ERROR, "Encryption error: %s", tsi_result_to_string (result)); + break; + } + message_bytes += processed_message_size; + message_size -= processed_message_size; + cur += protected_buffer_size_to_send; + + if (cur == end) + { + flush_write_staging_buffer (ep, &cur, &end); + } + } + if (result != TSI_OK) + break; } - if (result != TSI_OK) break; - } - if (result == TSI_OK) { - size_t still_pending_size; - do { - size_t protected_buffer_size_to_send = (size_t)(end - cur); - gpr_mu_lock(&ep->protector_mu); - result = tsi_frame_protector_protect_flush(ep->protector, cur, - &protected_buffer_size_to_send, - &still_pending_size); - gpr_mu_unlock(&ep->protector_mu); - if (result != TSI_OK) break; - cur += protected_buffer_size_to_send; - if (cur == end) { - flush_write_staging_buffer(ep, &cur, &end); - } - } while (still_pending_size > 0); - if (cur != GPR_SLICE_START_PTR(ep->write_staging_buffer)) { - gpr_slice_buffer_add( - &ep->output_buffer, - gpr_slice_split_head( - &ep->write_staging_buffer, - (size_t)(cur - GPR_SLICE_START_PTR(ep->write_staging_buffer)))); + if (result == TSI_OK) + { + size_t still_pending_size; + do + { + size_t protected_buffer_size_to_send = (size_t) (end - cur); + gpr_mu_lock (&ep->protector_mu); + result = tsi_frame_protector_protect_flush (ep->protector, cur, &protected_buffer_size_to_send, &still_pending_size); + gpr_mu_unlock (&ep->protector_mu); + if (result != TSI_OK) + break; + cur += protected_buffer_size_to_send; + if (cur == end) + { + flush_write_staging_buffer (ep, &cur, &end); + } + } + while (still_pending_size > 0); + if (cur != GPR_SLICE_START_PTR (ep->write_staging_buffer)) + { + gpr_slice_buffer_add (&ep->output_buffer, gpr_slice_split_head (&ep->write_staging_buffer, (size_t) (cur - GPR_SLICE_START_PTR (ep->write_staging_buffer)))); + } } - } - if (result != TSI_OK) { - /* TODO(yangg) do different things according to the error type? */ - gpr_slice_buffer_reset_and_unref(&ep->output_buffer); - grpc_closure_list_add(closure_list, cb, 0); - return; - } + if (result != TSI_OK) + { + /* TODO(yangg) do different things according to the error type? */ + gpr_slice_buffer_reset_and_unref (&ep->output_buffer); + grpc_closure_list_add (closure_list, cb, 0); + return; + } - grpc_endpoint_write(ep->wrapped_ep, &ep->output_buffer, cb, closure_list); + grpc_endpoint_write (ep->wrapped_ep, &ep->output_buffer, cb, closure_list); } -static void endpoint_shutdown(grpc_endpoint *secure_ep, - grpc_closure_list *closure_list) { - secure_endpoint *ep = (secure_endpoint *)secure_ep; - grpc_endpoint_shutdown(ep->wrapped_ep, closure_list); +static void +endpoint_shutdown (grpc_endpoint * secure_ep, grpc_closure_list * closure_list) +{ + secure_endpoint *ep = (secure_endpoint *) secure_ep; + grpc_endpoint_shutdown (ep->wrapped_ep, closure_list); } -static void endpoint_destroy(grpc_endpoint *secure_ep, - grpc_closure_list *closure_list) { - secure_endpoint *ep = (secure_endpoint *)secure_ep; - SECURE_ENDPOINT_UNREF(ep, "destroy", closure_list); +static void +endpoint_destroy (grpc_endpoint * secure_ep, grpc_closure_list * closure_list) +{ + secure_endpoint *ep = (secure_endpoint *) secure_ep; + SECURE_ENDPOINT_UNREF (ep, "destroy", closure_list); } -static void endpoint_add_to_pollset(grpc_endpoint *secure_ep, - grpc_pollset *pollset, - grpc_closure_list *closure_list) { - secure_endpoint *ep = (secure_endpoint *)secure_ep; - grpc_endpoint_add_to_pollset(ep->wrapped_ep, pollset, closure_list); +static void +endpoint_add_to_pollset (grpc_endpoint * secure_ep, grpc_pollset * pollset, grpc_closure_list * closure_list) +{ + secure_endpoint *ep = (secure_endpoint *) secure_ep; + grpc_endpoint_add_to_pollset (ep->wrapped_ep, pollset, closure_list); } -static void endpoint_add_to_pollset_set(grpc_endpoint *secure_ep, - grpc_pollset_set *pollset_set, - grpc_closure_list *closure_list) { - secure_endpoint *ep = (secure_endpoint *)secure_ep; - grpc_endpoint_add_to_pollset_set(ep->wrapped_ep, pollset_set, closure_list); +static void +endpoint_add_to_pollset_set (grpc_endpoint * secure_ep, grpc_pollset_set * pollset_set, grpc_closure_list * closure_list) +{ + secure_endpoint *ep = (secure_endpoint *) secure_ep; + grpc_endpoint_add_to_pollset_set (ep->wrapped_ep, pollset_set, closure_list); } -static char *endpoint_get_peer(grpc_endpoint *secure_ep) { - secure_endpoint *ep = (secure_endpoint *)secure_ep; - return grpc_endpoint_get_peer(ep->wrapped_ep); +static char * +endpoint_get_peer (grpc_endpoint * secure_ep) +{ + secure_endpoint *ep = (secure_endpoint *) secure_ep; + return grpc_endpoint_get_peer (ep->wrapped_ep); } static const grpc_endpoint_vtable vtable = { - endpoint_read, endpoint_write, - endpoint_add_to_pollset, endpoint_add_to_pollset_set, - endpoint_shutdown, endpoint_destroy, - endpoint_get_peer}; - -grpc_endpoint *grpc_secure_endpoint_create( - struct tsi_frame_protector *protector, grpc_endpoint *transport, - gpr_slice *leftover_slices, size_t leftover_nslices) { + endpoint_read, endpoint_write, + endpoint_add_to_pollset, endpoint_add_to_pollset_set, + endpoint_shutdown, endpoint_destroy, + endpoint_get_peer +}; + +grpc_endpoint * +grpc_secure_endpoint_create (struct tsi_frame_protector *protector, grpc_endpoint * transport, gpr_slice * leftover_slices, size_t leftover_nslices) +{ size_t i; - secure_endpoint *ep = (secure_endpoint *)gpr_malloc(sizeof(secure_endpoint)); + secure_endpoint *ep = (secure_endpoint *) gpr_malloc (sizeof (secure_endpoint)); ep->base.vtable = &vtable; ep->wrapped_ep = transport; ep->protector = protector; - gpr_slice_buffer_init(&ep->leftover_bytes); - for (i = 0; i < leftover_nslices; i++) { - gpr_slice_buffer_add(&ep->leftover_bytes, - gpr_slice_ref(leftover_slices[i])); - } - ep->write_staging_buffer = gpr_slice_malloc(STAGING_BUFFER_SIZE); - ep->read_staging_buffer = gpr_slice_malloc(STAGING_BUFFER_SIZE); - gpr_slice_buffer_init(&ep->output_buffer); - gpr_slice_buffer_init(&ep->source_buffer); + gpr_slice_buffer_init (&ep->leftover_bytes); + for (i = 0; i < leftover_nslices; i++) + { + gpr_slice_buffer_add (&ep->leftover_bytes, gpr_slice_ref (leftover_slices[i])); + } + ep->write_staging_buffer = gpr_slice_malloc (STAGING_BUFFER_SIZE); + ep->read_staging_buffer = gpr_slice_malloc (STAGING_BUFFER_SIZE); + gpr_slice_buffer_init (&ep->output_buffer); + gpr_slice_buffer_init (&ep->source_buffer); ep->read_buffer = NULL; - grpc_closure_init(&ep->on_read, on_read, ep); - gpr_mu_init(&ep->protector_mu); - gpr_ref_init(&ep->ref, 1); + grpc_closure_init (&ep->on_read, on_read, ep); + gpr_mu_init (&ep->protector_mu); + gpr_ref_init (&ep->ref, 1); return &ep->base; } diff --git a/src/core/security/secure_endpoint.h b/src/core/security/secure_endpoint.h index c563bdd9c50..e80a177dd55 100644 --- a/src/core/security/secure_endpoint.h +++ b/src/core/security/secure_endpoint.h @@ -42,8 +42,6 @@ struct tsi_frame_protector; extern int grpc_trace_secure_endpoint; /* Takes ownership of protector and to_wrap, and refs leftover_slices. */ -grpc_endpoint *grpc_secure_endpoint_create( - struct tsi_frame_protector *protector, grpc_endpoint *to_wrap, - gpr_slice *leftover_slices, size_t leftover_nslices); +grpc_endpoint *grpc_secure_endpoint_create (struct tsi_frame_protector *protector, grpc_endpoint * to_wrap, gpr_slice * leftover_slices, size_t leftover_nslices); #endif /* GRPC_INTERNAL_CORE_SECURITY_SECURE_ENDPOINT_H */ diff --git a/src/core/security/security_connector.c b/src/core/security/security_connector.c index 280036bc0eb..694004e4e0a 100644 --- a/src/core/security/security_connector.c +++ b/src/core/security/security_connector.c @@ -57,8 +57,7 @@ #ifndef INSTALL_PREFIX static const char *installed_roots_path = "/usr/share/grpc/roots.pem"; #else -static const char *installed_roots_path = - INSTALL_PREFIX "/share/grpc/roots.pem"; +static const char *installed_roots_path = INSTALL_PREFIX "/share/grpc/roots.pem"; #endif /* -- Cipher suites. -- */ @@ -72,108 +71,127 @@ static const char *installed_roots_path = static gpr_once cipher_suites_once = GPR_ONCE_INIT; static const char *cipher_suites = NULL; -static void init_cipher_suites(void) { - char *overridden = gpr_getenv("GRPC_SSL_CIPHER_SUITES"); +static void +init_cipher_suites (void) +{ + char *overridden = gpr_getenv ("GRPC_SSL_CIPHER_SUITES"); cipher_suites = overridden != NULL ? overridden : GRPC_SSL_CIPHER_SUITES; } -static const char *ssl_cipher_suites(void) { - gpr_once_init(&cipher_suites_once, init_cipher_suites); +static const char * +ssl_cipher_suites (void) +{ + gpr_once_init (&cipher_suites_once, init_cipher_suites); return cipher_suites; } /* -- Common methods. -- */ /* Returns the first property with that name. */ -const tsi_peer_property *tsi_peer_get_property_by_name(const tsi_peer *peer, - const char *name) { +const tsi_peer_property * +tsi_peer_get_property_by_name (const tsi_peer * peer, const char *name) +{ size_t i; - if (peer == NULL) return NULL; - for (i = 0; i < peer->property_count; i++) { - const tsi_peer_property *property = &peer->properties[i]; - if (name == NULL && property->name == NULL) { - return property; - } - if (name != NULL && property->name != NULL && - strcmp(property->name, name) == 0) { - return property; + if (peer == NULL) + return NULL; + for (i = 0; i < peer->property_count; i++) + { + const tsi_peer_property *property = &peer->properties[i]; + if (name == NULL && property->name == NULL) + { + return property; + } + if (name != NULL && property->name != NULL && strcmp (property->name, name) == 0) + { + return property; + } } - } return NULL; } -void grpc_security_connector_do_handshake(grpc_security_connector *sc, - grpc_endpoint *nonsecure_endpoint, - grpc_security_handshake_done_cb cb, - void *user_data, - grpc_closure_list *closure_list) { - if (sc == NULL || nonsecure_endpoint == NULL) { - cb(user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, closure_list); - } else { - sc->vtable->do_handshake(sc, nonsecure_endpoint, cb, user_data, - closure_list); - } -} - -grpc_security_status grpc_security_connector_check_peer( - grpc_security_connector *sc, tsi_peer peer, grpc_security_check_cb cb, - void *user_data) { - if (sc == NULL) { - tsi_peer_destruct(&peer); - return GRPC_SECURITY_ERROR; - } - return sc->vtable->check_peer(sc, peer, cb, user_data); +void +grpc_security_connector_do_handshake (grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + if (sc == NULL || nonsecure_endpoint == NULL) + { + cb (user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, closure_list); + } + else + { + sc->vtable->do_handshake (sc, nonsecure_endpoint, cb, user_data, closure_list); + } } -grpc_security_status grpc_channel_security_connector_check_call_host( - grpc_channel_security_connector *sc, const char *host, - grpc_security_check_cb cb, void *user_data, - grpc_closure_list *closure_list) { - if (sc == NULL || sc->check_call_host == NULL) return GRPC_SECURITY_ERROR; - return sc->check_call_host(sc, host, cb, user_data, closure_list); +grpc_security_status +grpc_security_connector_check_peer (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data) +{ + if (sc == NULL) + { + tsi_peer_destruct (&peer); + return GRPC_SECURITY_ERROR; + } + return sc->vtable->check_peer (sc, peer, cb, user_data); +} + +grpc_security_status +grpc_channel_security_connector_check_call_host (grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + if (sc == NULL || sc->check_call_host == NULL) + return GRPC_SECURITY_ERROR; + return sc->check_call_host (sc, host, cb, user_data, closure_list); } #ifdef GRPC_SECURITY_CONNECTOR_REFCOUNT_DEBUG -grpc_security_connector *grpc_security_connector_ref( - grpc_security_connector *sc, const char *file, int line, - const char *reason) { - if (sc == NULL) return NULL; - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "SECURITY_CONNECTOR:%p ref %d -> %d %s", sc, - (int)sc->refcount.count, (int)sc->refcount.count + 1, reason); +grpc_security_connector * +grpc_security_connector_ref (grpc_security_connector * sc, const char *file, int line, const char *reason) +{ + if (sc == NULL) + return NULL; + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "SECURITY_CONNECTOR:%p ref %d -> %d %s", sc, (int) sc->refcount.count, (int) sc->refcount.count + 1, reason); #else -grpc_security_connector *grpc_security_connector_ref( - grpc_security_connector *sc) { - if (sc == NULL) return NULL; +grpc_security_connector * +grpc_security_connector_ref (grpc_security_connector * sc) +{ + if (sc == NULL) + return NULL; #endif - gpr_ref(&sc->refcount); + gpr_ref (&sc->refcount); return sc; } #ifdef GRPC_SECURITY_CONNECTOR_REFCOUNT_DEBUG -void grpc_security_connector_unref(grpc_security_connector *sc, - const char *file, int line, - const char *reason) { - if (sc == NULL) return; - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "SECURITY_CONNECTOR:%p unref %d -> %d %s", sc, - (int)sc->refcount.count, (int)sc->refcount.count - 1, reason); +void +grpc_security_connector_unref (grpc_security_connector * sc, const char *file, int line, const char *reason) +{ + if (sc == NULL) + return; + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "SECURITY_CONNECTOR:%p unref %d -> %d %s", sc, (int) sc->refcount.count, (int) sc->refcount.count - 1, reason); #else -void grpc_security_connector_unref(grpc_security_connector *sc) { - if (sc == NULL) return; +void +grpc_security_connector_unref (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 (sc); } -static void connector_pointer_arg_destroy(void *p) { - GRPC_SECURITY_CONNECTOR_UNREF(p, "connector_pointer_arg"); +static void +connector_pointer_arg_destroy (void *p) +{ + GRPC_SECURITY_CONNECTOR_UNREF (p, "connector_pointer_arg"); } -static void *connector_pointer_arg_copy(void *p) { - return GRPC_SECURITY_CONNECTOR_REF(p, "connector_pointer_arg"); +static void * +connector_pointer_arg_copy (void *p) +{ + return GRPC_SECURITY_CONNECTOR_REF (p, "connector_pointer_arg"); } -grpc_arg grpc_security_connector_to_arg(grpc_security_connector *sc) { +grpc_arg +grpc_security_connector_to_arg (grpc_security_connector * sc) +{ grpc_arg result; result.type = GRPC_ARG_POINTER; result.key = GRPC_SECURITY_CONNECTOR_ARG; @@ -183,151 +201,159 @@ grpc_arg grpc_security_connector_to_arg(grpc_security_connector *sc) { return result; } -grpc_security_connector *grpc_security_connector_from_arg(const grpc_arg *arg) { - if (strcmp(arg->key, GRPC_SECURITY_CONNECTOR_ARG)) return NULL; - if (arg->type != GRPC_ARG_POINTER) { - gpr_log(GPR_ERROR, "Invalid type %d for arg %s", arg->type, - GRPC_SECURITY_CONNECTOR_ARG); +grpc_security_connector * +grpc_security_connector_from_arg (const grpc_arg * arg) +{ + if (strcmp (arg->key, GRPC_SECURITY_CONNECTOR_ARG)) return NULL; - } + if (arg->type != GRPC_ARG_POINTER) + { + gpr_log (GPR_ERROR, "Invalid type %d for arg %s", arg->type, GRPC_SECURITY_CONNECTOR_ARG); + return NULL; + } return arg->value.pointer.p; } -grpc_security_connector *grpc_find_security_connector_in_args( - const grpc_channel_args *args) { +grpc_security_connector * +grpc_find_security_connector_in_args (const grpc_channel_args * args) +{ size_t i; - if (args == NULL) return NULL; - for (i = 0; i < args->num_args; i++) { - grpc_security_connector *sc = - grpc_security_connector_from_arg(&args->args[i]); - if (sc != NULL) return sc; - } + if (args == NULL) + return NULL; + for (i = 0; i < args->num_args; i++) + { + grpc_security_connector *sc = grpc_security_connector_from_arg (&args->args[i]); + if (sc != NULL) + return sc; + } return NULL; } -static int check_request_metadata_creds(grpc_credentials *creds) { - if (creds != NULL && !grpc_credentials_has_request_metadata(creds)) { - gpr_log(GPR_ERROR, - "Incompatible credentials for channel security connector: needs to " - "set request metadata."); - return 0; - } +static int +check_request_metadata_creds (grpc_credentials * creds) +{ + if (creds != NULL && !grpc_credentials_has_request_metadata (creds)) + { + gpr_log (GPR_ERROR, "Incompatible credentials for channel security connector: needs to " "set request metadata."); + return 0; + } return 1; } /* -- Fake implementation. -- */ -typedef struct { +typedef struct +{ grpc_channel_security_connector base; int call_host_check_is_async; } grpc_fake_channel_security_connector; -static void fake_channel_destroy(grpc_security_connector *sc) { - grpc_channel_security_connector *c = (grpc_channel_security_connector *)sc; - grpc_credentials_unref(c->request_metadata_creds); - GRPC_AUTH_CONTEXT_UNREF(sc->auth_context, "connector"); - gpr_free(sc); +static void +fake_channel_destroy (grpc_security_connector * sc) +{ + grpc_channel_security_connector *c = (grpc_channel_security_connector *) sc; + grpc_credentials_unref (c->request_metadata_creds); + GRPC_AUTH_CONTEXT_UNREF (sc->auth_context, "connector"); + gpr_free (sc); } -static void fake_server_destroy(grpc_security_connector *sc) { - GRPC_AUTH_CONTEXT_UNREF(sc->auth_context, "connector"); - gpr_free(sc); +static void +fake_server_destroy (grpc_security_connector * sc) +{ + GRPC_AUTH_CONTEXT_UNREF (sc->auth_context, "connector"); + gpr_free (sc); } -static grpc_security_status fake_check_peer(grpc_security_connector *sc, - tsi_peer peer, - grpc_security_check_cb cb, - void *user_data) { +static grpc_security_status +fake_check_peer (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data) +{ const char *prop_name; grpc_security_status status = GRPC_SECURITY_OK; - if (peer.property_count != 1) { - gpr_log(GPR_ERROR, "Fake peers should only have 1 property."); - status = GRPC_SECURITY_ERROR; - goto end; - } + if (peer.property_count != 1) + { + gpr_log (GPR_ERROR, "Fake peers should only have 1 property."); + status = GRPC_SECURITY_ERROR; + goto end; + } prop_name = peer.properties[0].name; - if (prop_name == NULL || - strcmp(prop_name, TSI_CERTIFICATE_TYPE_PEER_PROPERTY)) { - gpr_log(GPR_ERROR, "Unexpected property in fake peer: %s.", - prop_name == NULL ? "" : prop_name); - status = GRPC_SECURITY_ERROR; - goto end; - } - if (strncmp(peer.properties[0].value.data, TSI_FAKE_CERTIFICATE_TYPE, - peer.properties[0].value.length)) { - gpr_log(GPR_ERROR, "Invalid value for cert type property."); - status = GRPC_SECURITY_ERROR; - goto end; - } - GRPC_AUTH_CONTEXT_UNREF(sc->auth_context, "connector"); - sc->auth_context = grpc_auth_context_create(NULL); - grpc_auth_context_add_cstring_property( - sc->auth_context, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME, - GRPC_FAKE_TRANSPORT_SECURITY_TYPE); + if (prop_name == NULL || strcmp (prop_name, TSI_CERTIFICATE_TYPE_PEER_PROPERTY)) + { + gpr_log (GPR_ERROR, "Unexpected property in fake peer: %s.", prop_name == NULL ? "" : prop_name); + status = GRPC_SECURITY_ERROR; + goto end; + } + if (strncmp (peer.properties[0].value.data, TSI_FAKE_CERTIFICATE_TYPE, peer.properties[0].value.length)) + { + gpr_log (GPR_ERROR, "Invalid value for cert type property."); + status = GRPC_SECURITY_ERROR; + goto end; + } + GRPC_AUTH_CONTEXT_UNREF (sc->auth_context, "connector"); + sc->auth_context = grpc_auth_context_create (NULL); + grpc_auth_context_add_cstring_property (sc->auth_context, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME, GRPC_FAKE_TRANSPORT_SECURITY_TYPE); end: - tsi_peer_destruct(&peer); + tsi_peer_destruct (&peer); return status; } -static grpc_security_status fake_channel_check_call_host( - grpc_channel_security_connector *sc, const char *host, - grpc_security_check_cb cb, void *user_data, - grpc_closure_list *closure_list) { - grpc_fake_channel_security_connector *c = - (grpc_fake_channel_security_connector *)sc; - if (c->call_host_check_is_async) { - cb(user_data, GRPC_SECURITY_OK, closure_list); - return GRPC_SECURITY_PENDING; - } else { - return GRPC_SECURITY_OK; - } +static grpc_security_status +fake_channel_check_call_host (grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_fake_channel_security_connector *c = (grpc_fake_channel_security_connector *) sc; + if (c->call_host_check_is_async) + { + cb (user_data, GRPC_SECURITY_OK, closure_list); + return GRPC_SECURITY_PENDING; + } + else + { + return GRPC_SECURITY_OK; + } } -static void fake_channel_do_handshake(grpc_security_connector *sc, - grpc_endpoint *nonsecure_endpoint, - grpc_security_handshake_done_cb cb, - void *user_data, - grpc_closure_list *closure_list) { - grpc_do_security_handshake(tsi_create_fake_handshaker(1), sc, - nonsecure_endpoint, cb, user_data, closure_list); +static void +fake_channel_do_handshake (grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_do_security_handshake (tsi_create_fake_handshaker (1), sc, nonsecure_endpoint, cb, user_data, closure_list); } -static void fake_server_do_handshake(grpc_security_connector *sc, - grpc_endpoint *nonsecure_endpoint, - grpc_security_handshake_done_cb cb, - void *user_data, - grpc_closure_list *closure_list) { - grpc_do_security_handshake(tsi_create_fake_handshaker(0), sc, - nonsecure_endpoint, cb, user_data, closure_list); +static void +fake_server_do_handshake (grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_do_security_handshake (tsi_create_fake_handshaker (0), sc, nonsecure_endpoint, cb, user_data, closure_list); } static grpc_security_connector_vtable fake_channel_vtable = { - fake_channel_destroy, fake_channel_do_handshake, fake_check_peer}; + fake_channel_destroy, fake_channel_do_handshake, fake_check_peer +}; static grpc_security_connector_vtable fake_server_vtable = { - fake_server_destroy, fake_server_do_handshake, fake_check_peer}; - -grpc_channel_security_connector *grpc_fake_channel_security_connector_create( - grpc_credentials *request_metadata_creds, int call_host_check_is_async) { - grpc_fake_channel_security_connector *c = - gpr_malloc(sizeof(grpc_fake_channel_security_connector)); - memset(c, 0, sizeof(grpc_fake_channel_security_connector)); - gpr_ref_init(&c->base.base.refcount, 1); + fake_server_destroy, fake_server_do_handshake, fake_check_peer +}; + +grpc_channel_security_connector * +grpc_fake_channel_security_connector_create (grpc_credentials * request_metadata_creds, int call_host_check_is_async) +{ + grpc_fake_channel_security_connector *c = gpr_malloc (sizeof (grpc_fake_channel_security_connector)); + memset (c, 0, sizeof (grpc_fake_channel_security_connector)); + gpr_ref_init (&c->base.base.refcount, 1); c->base.base.is_client_side = 1; c->base.base.url_scheme = GRPC_FAKE_SECURITY_URL_SCHEME; c->base.base.vtable = &fake_channel_vtable; - GPR_ASSERT(check_request_metadata_creds(request_metadata_creds)); - c->base.request_metadata_creds = grpc_credentials_ref(request_metadata_creds); + GPR_ASSERT (check_request_metadata_creds (request_metadata_creds)); + c->base.request_metadata_creds = grpc_credentials_ref (request_metadata_creds); c->base.check_call_host = fake_channel_check_call_host; c->call_host_check_is_async = call_host_check_is_async; return &c->base; } -grpc_security_connector *grpc_fake_server_security_connector_create(void) { - grpc_security_connector *c = gpr_malloc(sizeof(grpc_security_connector)); - memset(c, 0, sizeof(grpc_security_connector)); - gpr_ref_init(&c->refcount, 1); +grpc_security_connector * +grpc_fake_server_security_connector_create (void) +{ + grpc_security_connector *c = gpr_malloc (sizeof (grpc_security_connector)); + memset (c, 0, sizeof (grpc_security_connector)); + gpr_ref_init (&c->refcount, 1); c->is_client_side = 0; c->vtable = &fake_server_vtable; c->url_scheme = GRPC_FAKE_SECURITY_URL_SCHEME; @@ -336,7 +362,8 @@ grpc_security_connector *grpc_fake_server_security_connector_create(void) { /* --- Ssl implementation. --- */ -typedef struct { +typedef struct +{ grpc_channel_security_connector base; tsi_ssl_handshaker_factory *handshaker_factory; char *target_name; @@ -344,254 +371,268 @@ typedef struct { tsi_peer peer; } grpc_ssl_channel_security_connector; -typedef struct { +typedef struct +{ grpc_security_connector base; tsi_ssl_handshaker_factory *handshaker_factory; } grpc_ssl_server_security_connector; -static void ssl_channel_destroy(grpc_security_connector *sc) { - grpc_ssl_channel_security_connector *c = - (grpc_ssl_channel_security_connector *)sc; - grpc_credentials_unref(c->base.request_metadata_creds); - if (c->handshaker_factory != NULL) { - tsi_ssl_handshaker_factory_destroy(c->handshaker_factory); - } - if (c->target_name != NULL) gpr_free(c->target_name); - if (c->overridden_target_name != NULL) gpr_free(c->overridden_target_name); - tsi_peer_destruct(&c->peer); - GRPC_AUTH_CONTEXT_UNREF(sc->auth_context, "connector"); - gpr_free(sc); -} - -static void ssl_server_destroy(grpc_security_connector *sc) { - grpc_ssl_server_security_connector *c = - (grpc_ssl_server_security_connector *)sc; - if (c->handshaker_factory != NULL) { - tsi_ssl_handshaker_factory_destroy(c->handshaker_factory); - } - GRPC_AUTH_CONTEXT_UNREF(sc->auth_context, "connector"); - gpr_free(sc); -} - -static grpc_security_status ssl_create_handshaker( - tsi_ssl_handshaker_factory *handshaker_factory, int is_client, - const char *peer_name, tsi_handshaker **handshaker) { +static void +ssl_channel_destroy (grpc_security_connector * sc) +{ + grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *) sc; + grpc_credentials_unref (c->base.request_metadata_creds); + if (c->handshaker_factory != NULL) + { + tsi_ssl_handshaker_factory_destroy (c->handshaker_factory); + } + if (c->target_name != NULL) + gpr_free (c->target_name); + if (c->overridden_target_name != NULL) + gpr_free (c->overridden_target_name); + tsi_peer_destruct (&c->peer); + GRPC_AUTH_CONTEXT_UNREF (sc->auth_context, "connector"); + gpr_free (sc); +} + +static void +ssl_server_destroy (grpc_security_connector * sc) +{ + grpc_ssl_server_security_connector *c = (grpc_ssl_server_security_connector *) sc; + if (c->handshaker_factory != NULL) + { + tsi_ssl_handshaker_factory_destroy (c->handshaker_factory); + } + GRPC_AUTH_CONTEXT_UNREF (sc->auth_context, "connector"); + gpr_free (sc); +} + +static grpc_security_status +ssl_create_handshaker (tsi_ssl_handshaker_factory * handshaker_factory, int is_client, const char *peer_name, tsi_handshaker ** handshaker) +{ tsi_result result = TSI_OK; - if (handshaker_factory == NULL) return GRPC_SECURITY_ERROR; - result = tsi_ssl_handshaker_factory_create_handshaker( - handshaker_factory, is_client ? peer_name : NULL, handshaker); - if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Handshaker creation failed with error %s.", - tsi_result_to_string(result)); + if (handshaker_factory == NULL) return GRPC_SECURITY_ERROR; - } + result = tsi_ssl_handshaker_factory_create_handshaker (handshaker_factory, is_client ? peer_name : NULL, handshaker); + if (result != TSI_OK) + { + gpr_log (GPR_ERROR, "Handshaker creation failed with error %s.", tsi_result_to_string (result)); + return GRPC_SECURITY_ERROR; + } return GRPC_SECURITY_OK; } -static void ssl_channel_do_handshake(grpc_security_connector *sc, - grpc_endpoint *nonsecure_endpoint, - grpc_security_handshake_done_cb cb, - void *user_data, - grpc_closure_list *closure_list) { - grpc_ssl_channel_security_connector *c = - (grpc_ssl_channel_security_connector *)sc; +static void +ssl_channel_do_handshake (grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *) sc; tsi_handshaker *handshaker; - grpc_security_status status = ssl_create_handshaker( - c->handshaker_factory, 1, - c->overridden_target_name != NULL ? c->overridden_target_name - : c->target_name, - &handshaker); - if (status != GRPC_SECURITY_OK) { - cb(user_data, status, nonsecure_endpoint, NULL, closure_list); - } else { - grpc_do_security_handshake(handshaker, sc, nonsecure_endpoint, cb, - user_data, closure_list); - } -} - -static void ssl_server_do_handshake(grpc_security_connector *sc, - grpc_endpoint *nonsecure_endpoint, - grpc_security_handshake_done_cb cb, - void *user_data, - grpc_closure_list *closure_list) { - grpc_ssl_server_security_connector *c = - (grpc_ssl_server_security_connector *)sc; + grpc_security_status status = ssl_create_handshaker (c->handshaker_factory, 1, + c->overridden_target_name != NULL ? c->overridden_target_name : c->target_name, + &handshaker); + if (status != GRPC_SECURITY_OK) + { + cb (user_data, status, nonsecure_endpoint, NULL, closure_list); + } + else + { + grpc_do_security_handshake (handshaker, sc, nonsecure_endpoint, cb, user_data, closure_list); + } +} + +static void +ssl_server_do_handshake (grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_ssl_server_security_connector *c = (grpc_ssl_server_security_connector *) sc; tsi_handshaker *handshaker; - grpc_security_status status = - ssl_create_handshaker(c->handshaker_factory, 0, NULL, &handshaker); - if (status != GRPC_SECURITY_OK) { - cb(user_data, status, nonsecure_endpoint, NULL, closure_list); - } else { - grpc_do_security_handshake(handshaker, sc, nonsecure_endpoint, cb, - user_data, closure_list); - } + grpc_security_status status = ssl_create_handshaker (c->handshaker_factory, 0, NULL, &handshaker); + if (status != GRPC_SECURITY_OK) + { + cb (user_data, status, nonsecure_endpoint, NULL, closure_list); + } + else + { + grpc_do_security_handshake (handshaker, sc, nonsecure_endpoint, cb, user_data, closure_list); + } } -static int ssl_host_matches_name(const tsi_peer *peer, const char *peer_name) { +static int +ssl_host_matches_name (const tsi_peer * peer, const char *peer_name) +{ char *allocated_name = NULL; int r; - if (strchr(peer_name, ':') != NULL) { - char *ignored_port; - gpr_split_host_port(peer_name, &allocated_name, &ignored_port); - gpr_free(ignored_port); - peer_name = allocated_name; - if (!peer_name) return 0; - } - r = tsi_ssl_peer_matches_name(peer, peer_name); - gpr_free(allocated_name); + if (strchr (peer_name, ':') != NULL) + { + char *ignored_port; + gpr_split_host_port (peer_name, &allocated_name, &ignored_port); + gpr_free (ignored_port); + peer_name = allocated_name; + if (!peer_name) + return 0; + } + r = tsi_ssl_peer_matches_name (peer, peer_name); + gpr_free (allocated_name); return r; } -grpc_auth_context *tsi_ssl_peer_to_auth_context(const tsi_peer *peer) { +grpc_auth_context * +tsi_ssl_peer_to_auth_context (const tsi_peer * peer) +{ size_t i; grpc_auth_context *ctx = NULL; const char *peer_identity_property_name = NULL; /* The caller has checked the certificate type property. */ - GPR_ASSERT(peer->property_count >= 1); - ctx = grpc_auth_context_create(NULL); - grpc_auth_context_add_cstring_property( - ctx, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME, - GRPC_SSL_TRANSPORT_SECURITY_TYPE); - for (i = 0; i < peer->property_count; i++) { - const tsi_peer_property *prop = &peer->properties[i]; - if (prop->name == NULL) continue; - if (strcmp(prop->name, TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY) == 0) { - /* If there is no subject alt name, have the CN as the identity. */ - if (peer_identity_property_name == NULL) { - peer_identity_property_name = GRPC_X509_CN_PROPERTY_NAME; - } - grpc_auth_context_add_property(ctx, GRPC_X509_CN_PROPERTY_NAME, - prop->value.data, prop->value.length); - } else if (strcmp(prop->name, - TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY) == 0) { - peer_identity_property_name = GRPC_X509_SAN_PROPERTY_NAME; - grpc_auth_context_add_property(ctx, GRPC_X509_SAN_PROPERTY_NAME, - prop->value.data, prop->value.length); - } - } - if (peer_identity_property_name != NULL) { - GPR_ASSERT(grpc_auth_context_set_peer_identity_property_name( - ctx, peer_identity_property_name) == 1); - } + GPR_ASSERT (peer->property_count >= 1); + ctx = grpc_auth_context_create (NULL); + grpc_auth_context_add_cstring_property (ctx, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME, GRPC_SSL_TRANSPORT_SECURITY_TYPE); + for (i = 0; i < peer->property_count; i++) + { + const tsi_peer_property *prop = &peer->properties[i]; + if (prop->name == NULL) + continue; + if (strcmp (prop->name, TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY) == 0) + { + /* If there is no subject alt name, have the CN as the identity. */ + if (peer_identity_property_name == NULL) + { + peer_identity_property_name = GRPC_X509_CN_PROPERTY_NAME; + } + grpc_auth_context_add_property (ctx, GRPC_X509_CN_PROPERTY_NAME, prop->value.data, prop->value.length); + } + else if (strcmp (prop->name, TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY) == 0) + { + peer_identity_property_name = GRPC_X509_SAN_PROPERTY_NAME; + grpc_auth_context_add_property (ctx, GRPC_X509_SAN_PROPERTY_NAME, prop->value.data, prop->value.length); + } + } + if (peer_identity_property_name != NULL) + { + GPR_ASSERT (grpc_auth_context_set_peer_identity_property_name (ctx, peer_identity_property_name) == 1); + } return ctx; } -static grpc_security_status ssl_check_peer(grpc_security_connector *sc, - const char *peer_name, - const tsi_peer *peer) { +static grpc_security_status +ssl_check_peer (grpc_security_connector * sc, const char *peer_name, const tsi_peer * peer) +{ /* Check the ALPN. */ - const tsi_peer_property *p = - tsi_peer_get_property_by_name(peer, TSI_SSL_ALPN_SELECTED_PROTOCOL); - if (p == NULL) { - gpr_log(GPR_ERROR, "Missing selected ALPN property."); - return GRPC_SECURITY_ERROR; - } - if (!grpc_chttp2_is_alpn_version_supported(p->value.data, p->value.length)) { - gpr_log(GPR_ERROR, "Invalid ALPN value."); - return GRPC_SECURITY_ERROR; - } + const tsi_peer_property *p = tsi_peer_get_property_by_name (peer, TSI_SSL_ALPN_SELECTED_PROTOCOL); + if (p == NULL) + { + gpr_log (GPR_ERROR, "Missing selected ALPN property."); + return GRPC_SECURITY_ERROR; + } + if (!grpc_chttp2_is_alpn_version_supported (p->value.data, p->value.length)) + { + gpr_log (GPR_ERROR, "Invalid ALPN value."); + return GRPC_SECURITY_ERROR; + } /* Check the peer name if specified. */ - if (peer_name != NULL && !ssl_host_matches_name(peer, peer_name)) { - gpr_log(GPR_ERROR, "Peer name %s is not in peer certificate", peer_name); - return GRPC_SECURITY_ERROR; - } - if (sc->auth_context != NULL) { - GRPC_AUTH_CONTEXT_UNREF(sc->auth_context, "connector"); - } - sc->auth_context = tsi_ssl_peer_to_auth_context(peer); + if (peer_name != NULL && !ssl_host_matches_name (peer, peer_name)) + { + gpr_log (GPR_ERROR, "Peer name %s is not in peer certificate", peer_name); + return GRPC_SECURITY_ERROR; + } + if (sc->auth_context != NULL) + { + GRPC_AUTH_CONTEXT_UNREF (sc->auth_context, "connector"); + } + sc->auth_context = tsi_ssl_peer_to_auth_context (peer); return GRPC_SECURITY_OK; } -static grpc_security_status ssl_channel_check_peer(grpc_security_connector *sc, - tsi_peer peer, - grpc_security_check_cb cb, - void *user_data) { - grpc_ssl_channel_security_connector *c = - (grpc_ssl_channel_security_connector *)sc; +static grpc_security_status +ssl_channel_check_peer (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data) +{ + grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *) sc; grpc_security_status status; - tsi_peer_destruct(&c->peer); + tsi_peer_destruct (&c->peer); c->peer = peer; - status = ssl_check_peer(sc, c->overridden_target_name != NULL - ? c->overridden_target_name - : c->target_name, - &peer); + status = ssl_check_peer (sc, c->overridden_target_name != NULL ? c->overridden_target_name : c->target_name, &peer); return status; } -static grpc_security_status ssl_server_check_peer(grpc_security_connector *sc, - tsi_peer peer, - grpc_security_check_cb cb, - void *user_data) { - grpc_security_status status = ssl_check_peer(sc, NULL, &peer); - tsi_peer_destruct(&peer); +static grpc_security_status +ssl_server_check_peer (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data) +{ + grpc_security_status status = ssl_check_peer (sc, NULL, &peer); + tsi_peer_destruct (&peer); return status; } -static grpc_security_status ssl_channel_check_call_host( - grpc_channel_security_connector *sc, const char *host, - grpc_security_check_cb cb, void *user_data, - grpc_closure_list *closure_list) { - grpc_ssl_channel_security_connector *c = - (grpc_ssl_channel_security_connector *)sc; +static grpc_security_status +ssl_channel_check_call_host (grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data, grpc_closure_list * closure_list) +{ + grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *) sc; - if (ssl_host_matches_name(&c->peer, host)) return GRPC_SECURITY_OK; + if (ssl_host_matches_name (&c->peer, host)) + return GRPC_SECURITY_OK; /* If the target name was overridden, then the original target_name was 'checked' transitively during the previous peer check at the end of the handshake. */ - if (c->overridden_target_name != NULL && strcmp(host, c->target_name) == 0) { - return GRPC_SECURITY_OK; - } else { - return GRPC_SECURITY_ERROR; - } + if (c->overridden_target_name != NULL && strcmp (host, c->target_name) == 0) + { + return GRPC_SECURITY_OK; + } + else + { + return GRPC_SECURITY_ERROR; + } } static grpc_security_connector_vtable ssl_channel_vtable = { - ssl_channel_destroy, ssl_channel_do_handshake, ssl_channel_check_peer}; + ssl_channel_destroy, ssl_channel_do_handshake, ssl_channel_check_peer +}; static grpc_security_connector_vtable ssl_server_vtable = { - ssl_server_destroy, ssl_server_do_handshake, ssl_server_check_peer}; + ssl_server_destroy, ssl_server_do_handshake, ssl_server_check_peer +}; static gpr_slice default_pem_root_certs; -static void init_default_pem_root_certs(void) { +static void +init_default_pem_root_certs (void) +{ /* First try to load the roots from the environment. */ - char *default_root_certs_path = - gpr_getenv(GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR); - if (default_root_certs_path == NULL) { - default_pem_root_certs = gpr_empty_slice(); - } else { - default_pem_root_certs = gpr_load_file(default_root_certs_path, 0, NULL); - gpr_free(default_root_certs_path); - } + char *default_root_certs_path = gpr_getenv (GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR); + if (default_root_certs_path == NULL) + { + default_pem_root_certs = gpr_empty_slice (); + } + else + { + default_pem_root_certs = gpr_load_file (default_root_certs_path, 0, NULL); + gpr_free (default_root_certs_path); + } /* Fall back to installed certs if needed. */ - if (GPR_SLICE_IS_EMPTY(default_pem_root_certs)) { - default_pem_root_certs = gpr_load_file(installed_roots_path, 0, NULL); - } + if (GPR_SLICE_IS_EMPTY (default_pem_root_certs)) + { + default_pem_root_certs = gpr_load_file (installed_roots_path, 0, NULL); + } } -size_t grpc_get_default_ssl_roots(const unsigned char **pem_root_certs) { +size_t +grpc_get_default_ssl_roots (const unsigned char **pem_root_certs) +{ /* TODO(jboeuf@google.com): Maybe revisit the approach which consists in loading all the roots once for the lifetime of the process. */ static gpr_once once = GPR_ONCE_INIT; - gpr_once_init(&once, init_default_pem_root_certs); - *pem_root_certs = GPR_SLICE_START_PTR(default_pem_root_certs); - return GPR_SLICE_LENGTH(default_pem_root_certs); -} - -grpc_security_status grpc_ssl_channel_security_connector_create( - grpc_credentials *request_metadata_creds, const grpc_ssl_config *config, - const char *target_name, const char *overridden_target_name, - grpc_channel_security_connector **sc) { - size_t num_alpn_protocols = grpc_chttp2_num_alpn_versions(); - const unsigned char **alpn_protocol_strings = - gpr_malloc(sizeof(const char *) * num_alpn_protocols); - unsigned char *alpn_protocol_string_lengths = - gpr_malloc(sizeof(unsigned char) * num_alpn_protocols); + gpr_once_init (&once, init_default_pem_root_certs); + *pem_root_certs = GPR_SLICE_START_PTR (default_pem_root_certs); + return GPR_SLICE_LENGTH (default_pem_root_certs); +} + +grpc_security_status +grpc_ssl_channel_security_connector_create (grpc_credentials * request_metadata_creds, const grpc_ssl_config * config, const char *target_name, const char *overridden_target_name, grpc_channel_security_connector ** sc) +{ + size_t num_alpn_protocols = grpc_chttp2_num_alpn_versions (); + const unsigned char **alpn_protocol_strings = gpr_malloc (sizeof (const char *) * num_alpn_protocols); + unsigned char *alpn_protocol_string_lengths = gpr_malloc (sizeof (unsigned char) * num_alpn_protocols); tsi_result result = TSI_OK; grpc_ssl_channel_security_connector *c; size_t i; @@ -599,120 +640,112 @@ grpc_security_status grpc_ssl_channel_security_connector_create( size_t pem_root_certs_size; char *port; - for (i = 0; i < num_alpn_protocols; i++) { - alpn_protocol_strings[i] = - (const unsigned char *)grpc_chttp2_get_alpn_version_index(i); - alpn_protocol_string_lengths[i] = - (unsigned char)strlen(grpc_chttp2_get_alpn_version_index(i)); - } - - if (config == NULL || target_name == NULL) { - gpr_log(GPR_ERROR, "An ssl channel needs a config and a target name."); - goto error; - } - if (!check_request_metadata_creds(request_metadata_creds)) { - goto error; - } - if (config->pem_root_certs == NULL) { - pem_root_certs_size = grpc_get_default_ssl_roots(&pem_root_certs); - if (pem_root_certs == NULL || pem_root_certs_size == 0) { - gpr_log(GPR_ERROR, "Could not get default pem root certs."); + for (i = 0; i < num_alpn_protocols; i++) + { + alpn_protocol_strings[i] = (const unsigned char *) grpc_chttp2_get_alpn_version_index (i); + alpn_protocol_string_lengths[i] = (unsigned char) strlen (grpc_chttp2_get_alpn_version_index (i)); + } + + if (config == NULL || target_name == NULL) + { + gpr_log (GPR_ERROR, "An ssl channel needs a config and a target name."); + goto error; + } + if (!check_request_metadata_creds (request_metadata_creds)) + { goto error; } - } else { - pem_root_certs = config->pem_root_certs; - pem_root_certs_size = config->pem_root_certs_size; - } + if (config->pem_root_certs == NULL) + { + pem_root_certs_size = grpc_get_default_ssl_roots (&pem_root_certs); + if (pem_root_certs == NULL || pem_root_certs_size == 0) + { + gpr_log (GPR_ERROR, "Could not get default pem root certs."); + goto error; + } + } + else + { + pem_root_certs = config->pem_root_certs; + pem_root_certs_size = config->pem_root_certs_size; + } - c = gpr_malloc(sizeof(grpc_ssl_channel_security_connector)); - memset(c, 0, sizeof(grpc_ssl_channel_security_connector)); + c = gpr_malloc (sizeof (grpc_ssl_channel_security_connector)); + memset (c, 0, sizeof (grpc_ssl_channel_security_connector)); - gpr_ref_init(&c->base.base.refcount, 1); + gpr_ref_init (&c->base.base.refcount, 1); c->base.base.vtable = &ssl_channel_vtable; c->base.base.is_client_side = 1; c->base.base.url_scheme = GRPC_SSL_URL_SCHEME; - c->base.request_metadata_creds = grpc_credentials_ref(request_metadata_creds); + c->base.request_metadata_creds = grpc_credentials_ref (request_metadata_creds); c->base.check_call_host = ssl_channel_check_call_host; - gpr_split_host_port(target_name, &c->target_name, &port); - gpr_free(port); - if (overridden_target_name != NULL) { - c->overridden_target_name = gpr_strdup(overridden_target_name); - } - result = tsi_create_ssl_client_handshaker_factory( - config->pem_private_key, config->pem_private_key_size, - config->pem_cert_chain, config->pem_cert_chain_size, pem_root_certs, - pem_root_certs_size, ssl_cipher_suites(), alpn_protocol_strings, - alpn_protocol_string_lengths, (uint16_t)num_alpn_protocols, - &c->handshaker_factory); - 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); - *sc = NULL; - goto error; - } + gpr_split_host_port (target_name, &c->target_name, &port); + gpr_free (port); + if (overridden_target_name != NULL) + { + c->overridden_target_name = gpr_strdup (overridden_target_name); + } + result = tsi_create_ssl_client_handshaker_factory (config->pem_private_key, config->pem_private_key_size, config->pem_cert_chain, config->pem_cert_chain_size, pem_root_certs, pem_root_certs_size, ssl_cipher_suites (), alpn_protocol_strings, alpn_protocol_string_lengths, (uint16_t) num_alpn_protocols, &c->handshaker_factory); + 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); + *sc = NULL; + goto error; + } *sc = &c->base; - gpr_free(alpn_protocol_strings); - gpr_free(alpn_protocol_string_lengths); + gpr_free (alpn_protocol_strings); + gpr_free (alpn_protocol_string_lengths); return GRPC_SECURITY_OK; error: - gpr_free(alpn_protocol_strings); - gpr_free(alpn_protocol_string_lengths); + gpr_free (alpn_protocol_strings); + gpr_free (alpn_protocol_string_lengths); return GRPC_SECURITY_ERROR; } -grpc_security_status grpc_ssl_server_security_connector_create( - const grpc_ssl_server_config *config, grpc_security_connector **sc) { - size_t num_alpn_protocols = grpc_chttp2_num_alpn_versions(); - const unsigned char **alpn_protocol_strings = - gpr_malloc(sizeof(const char *) * num_alpn_protocols); - unsigned char *alpn_protocol_string_lengths = - gpr_malloc(sizeof(unsigned char) * num_alpn_protocols); +grpc_security_status +grpc_ssl_server_security_connector_create (const grpc_ssl_server_config * config, grpc_security_connector ** sc) +{ + size_t num_alpn_protocols = grpc_chttp2_num_alpn_versions (); + const unsigned char **alpn_protocol_strings = gpr_malloc (sizeof (const char *) * num_alpn_protocols); + unsigned char *alpn_protocol_string_lengths = gpr_malloc (sizeof (unsigned char) * num_alpn_protocols); tsi_result result = TSI_OK; grpc_ssl_server_security_connector *c; size_t i; - for (i = 0; i < num_alpn_protocols; i++) { - alpn_protocol_strings[i] = - (const unsigned char *)grpc_chttp2_get_alpn_version_index(i); - alpn_protocol_string_lengths[i] = - (unsigned char)strlen(grpc_chttp2_get_alpn_version_index(i)); - } - - if (config == NULL || config->num_key_cert_pairs == 0) { - gpr_log(GPR_ERROR, "An SSL server needs a key and a cert."); - goto error; - } - c = gpr_malloc(sizeof(grpc_ssl_server_security_connector)); - memset(c, 0, sizeof(grpc_ssl_server_security_connector)); - - gpr_ref_init(&c->base.refcount, 1); + for (i = 0; i < num_alpn_protocols; i++) + { + alpn_protocol_strings[i] = (const unsigned char *) grpc_chttp2_get_alpn_version_index (i); + alpn_protocol_string_lengths[i] = (unsigned char) strlen (grpc_chttp2_get_alpn_version_index (i)); + } + + if (config == NULL || config->num_key_cert_pairs == 0) + { + gpr_log (GPR_ERROR, "An SSL server needs a key and a cert."); + goto error; + } + c = gpr_malloc (sizeof (grpc_ssl_server_security_connector)); + memset (c, 0, sizeof (grpc_ssl_server_security_connector)); + + gpr_ref_init (&c->base.refcount, 1); c->base.url_scheme = GRPC_SSL_URL_SCHEME; c->base.vtable = &ssl_server_vtable; - result = tsi_create_ssl_server_handshaker_factory( - (const unsigned char **)config->pem_private_keys, - config->pem_private_keys_sizes, - (const unsigned char **)config->pem_cert_chains, - config->pem_cert_chains_sizes, config->num_key_cert_pairs, - config->pem_root_certs, config->pem_root_certs_size, - config->force_client_auth, ssl_cipher_suites(), alpn_protocol_strings, - alpn_protocol_string_lengths, (uint16_t)num_alpn_protocols, - &c->handshaker_factory); - if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Handshaker factory creation failed with %s.", - tsi_result_to_string(result)); - ssl_server_destroy(&c->base); - *sc = NULL; - goto error; - } + result = tsi_create_ssl_server_handshaker_factory ((const unsigned char **) config->pem_private_keys, config->pem_private_keys_sizes, (const unsigned char **) config->pem_cert_chains, config->pem_cert_chains_sizes, config->num_key_cert_pairs, config->pem_root_certs, config->pem_root_certs_size, config->force_client_auth, ssl_cipher_suites (), alpn_protocol_strings, alpn_protocol_string_lengths, (uint16_t) num_alpn_protocols, &c->handshaker_factory); + if (result != TSI_OK) + { + gpr_log (GPR_ERROR, "Handshaker factory creation failed with %s.", tsi_result_to_string (result)); + ssl_server_destroy (&c->base); + *sc = NULL; + goto error; + } *sc = &c->base; - gpr_free(alpn_protocol_strings); - gpr_free(alpn_protocol_string_lengths); + gpr_free (alpn_protocol_strings); + gpr_free (alpn_protocol_string_lengths); return GRPC_SECURITY_OK; error: - gpr_free(alpn_protocol_strings); - gpr_free(alpn_protocol_string_lengths); + gpr_free (alpn_protocol_strings); + gpr_free (alpn_protocol_string_lengths); return GRPC_SECURITY_ERROR; } diff --git a/src/core/security/security_connector.h b/src/core/security/security_connector.h index 0f161d0e374..913e01978df 100644 --- a/src/core/security/security_connector.h +++ b/src/core/security/security_connector.h @@ -40,7 +40,8 @@ /* --- status enum. --- */ -typedef enum { +typedef enum +{ GRPC_SECURITY_OK = 0, GRPC_SECURITY_PENDING, GRPC_SECURITY_ERROR @@ -60,33 +61,25 @@ typedef struct grpc_security_connector grpc_security_connector; #define GRPC_SECURITY_CONNECTOR_ARG "grpc.security_connector" -typedef void (*grpc_security_check_cb)(void *user_data, - grpc_security_status status, - grpc_closure_list *closure_list); +typedef void (*grpc_security_check_cb) (void *user_data, grpc_security_status status, grpc_closure_list * closure_list); /* Ownership of the secure_endpoint is transfered. */ -typedef void (*grpc_security_handshake_done_cb)( - void *user_data, grpc_security_status status, - grpc_endpoint *wrapped_endpoint, grpc_endpoint *secure_endpoint, - grpc_closure_list *closure_list); - -typedef struct { - void (*destroy)(grpc_security_connector *sc); - void (*do_handshake)(grpc_security_connector *sc, - grpc_endpoint *nonsecure_endpoint, - grpc_security_handshake_done_cb cb, void *user_data, - grpc_closure_list *closure_list); - grpc_security_status (*check_peer)(grpc_security_connector *sc, tsi_peer peer, - grpc_security_check_cb cb, - void *user_data); +typedef void (*grpc_security_handshake_done_cb) (void *user_data, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint, grpc_closure_list * closure_list); + +typedef struct +{ + void (*destroy) (grpc_security_connector * sc); + void (*do_handshake) (grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list); + grpc_security_status (*check_peer) (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data); } grpc_security_connector_vtable; -struct grpc_security_connector { +struct grpc_security_connector +{ const grpc_security_connector_vtable *vtable; gpr_refcount refcount; int is_client_side; const char *url_scheme; - grpc_auth_context *auth_context; /* Populated after the peer is checked. */ + grpc_auth_context *auth_context; /* Populated after the peer is checked. */ }; /* Refcounting. */ @@ -95,26 +88,17 @@ struct grpc_security_connector { grpc_security_connector_ref((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_security_connector *policy, - const char *file, int line, - const char *reason); +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, 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)) -grpc_security_connector *grpc_security_connector_ref( - grpc_security_connector *policy); -void grpc_security_connector_unref(grpc_security_connector *policy); +grpc_security_connector *grpc_security_connector_ref (grpc_security_connector * policy); +void grpc_security_connector_unref (grpc_security_connector * policy); #endif /* Handshake. */ -void grpc_security_connector_do_handshake(grpc_security_connector *connector, - grpc_endpoint *nonsecure_endpoint, - grpc_security_handshake_done_cb cb, - void *user_data, - grpc_closure_list *closure_list); +void grpc_security_connector_do_handshake (grpc_security_connector * connector, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list); /* Check the peer. Implementations can choose to check the peer either synchronously or @@ -123,19 +107,16 @@ void grpc_security_connector_do_handshake(grpc_security_connector *connector, GRPC_SECURITY_PENDING unless an error is detected early on. Ownership of the peer is transfered. */ -grpc_security_status grpc_security_connector_check_peer( - grpc_security_connector *sc, tsi_peer peer, grpc_security_check_cb cb, - void *user_data); +grpc_security_status grpc_security_connector_check_peer (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data); /* Util to encapsulate the connector in a channel arg. */ -grpc_arg grpc_security_connector_to_arg(grpc_security_connector *sc); +grpc_arg grpc_security_connector_to_arg (grpc_security_connector * sc); /* Util to get the connector from a channel arg. */ -grpc_security_connector *grpc_security_connector_from_arg(const grpc_arg *arg); +grpc_security_connector *grpc_security_connector_from_arg (const grpc_arg * arg); /* Util to find the connector from channel args. */ -grpc_security_connector *grpc_find_security_connector_in_args( - const grpc_channel_args *args); +grpc_security_connector *grpc_find_security_connector_in_args (const grpc_channel_args * args); /* --- channel_security_connector object. --- @@ -144,14 +125,11 @@ grpc_security_connector *grpc_find_security_connector_in_args( typedef struct grpc_channel_security_connector grpc_channel_security_connector; -struct grpc_channel_security_connector { - grpc_security_connector base; /* requires is_client_side to be non 0. */ +struct grpc_channel_security_connector +{ + grpc_security_connector base; /* requires is_client_side to be non 0. */ grpc_credentials *request_metadata_creds; - grpc_security_status (*check_call_host)(grpc_channel_security_connector *sc, - const char *host, - grpc_security_check_cb cb, - void *user_data, - grpc_closure_list *closure_list); + grpc_security_status (*check_call_host) (grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data, grpc_closure_list * closure_list); }; /* Checks that the host that will be set for a call is acceptable. @@ -159,24 +137,21 @@ struct grpc_channel_security_connector { asynchronously. In the first case, a successful call will return GRPC_SECURITY_OK. In the asynchronous case, the call will return GRPC_SECURITY_PENDING unless an error is detected early on. */ -grpc_security_status grpc_channel_security_connector_check_call_host( - grpc_channel_security_connector *sc, const char *host, - grpc_security_check_cb cb, void *user_data, - grpc_closure_list *closure_list); +grpc_security_status grpc_channel_security_connector_check_call_host (grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data, grpc_closure_list * closure_list); /* --- Creation security connectors. --- */ /* For TESTING ONLY! Creates a fake connector that emulates real channel security. */ -grpc_channel_security_connector *grpc_fake_channel_security_connector_create( - grpc_credentials *request_metadata_creds, int call_host_check_is_async); +grpc_channel_security_connector *grpc_fake_channel_security_connector_create (grpc_credentials * request_metadata_creds, int call_host_check_is_async); /* For TESTING ONLY! Creates a fake connector that emulates real server security. */ -grpc_security_connector *grpc_fake_server_security_connector_create(void); +grpc_security_connector *grpc_fake_server_security_connector_create (void); /* Config for ssl clients. */ -typedef struct { +typedef struct +{ unsigned char *pem_private_key; size_t pem_private_key_size; unsigned char *pem_cert_chain; @@ -198,16 +173,14 @@ typedef struct { This function returns GRPC_SECURITY_OK in case of success or a specific error code otherwise. */ -grpc_security_status grpc_ssl_channel_security_connector_create( - grpc_credentials *request_metadata_creds, const grpc_ssl_config *config, - const char *target_name, const char *overridden_target_name, - grpc_channel_security_connector **sc); +grpc_security_status grpc_ssl_channel_security_connector_create (grpc_credentials * request_metadata_creds, const grpc_ssl_config * config, const char *target_name, const char *overridden_target_name, grpc_channel_security_connector ** sc); /* Gets the default ssl roots. */ -size_t grpc_get_default_ssl_roots(const unsigned char **pem_root_certs); +size_t grpc_get_default_ssl_roots (const unsigned char **pem_root_certs); /* Config for ssl servers. */ -typedef struct { +typedef struct +{ unsigned char **pem_private_keys; size_t *pem_private_keys_sizes; unsigned char **pem_cert_chains; @@ -224,14 +197,12 @@ typedef struct { This function returns GRPC_SECURITY_OK in case of success or a specific error code otherwise. */ -grpc_security_status grpc_ssl_server_security_connector_create( - const grpc_ssl_server_config *config, grpc_security_connector **sc); +grpc_security_status grpc_ssl_server_security_connector_create (const grpc_ssl_server_config * config, grpc_security_connector ** sc); /* Util. */ -const tsi_peer_property *tsi_peer_get_property_by_name(const tsi_peer *peer, - const char *name); +const tsi_peer_property *tsi_peer_get_property_by_name (const tsi_peer * peer, const char *name); /* Exposed for testing only. */ -grpc_auth_context *tsi_ssl_peer_to_auth_context(const tsi_peer *peer); +grpc_auth_context *tsi_ssl_peer_to_auth_context (const tsi_peer * peer); #endif /* GRPC_INTERNAL_CORE_SECURITY_SECURITY_CONNECTOR_H */ diff --git a/src/core/security/security_context.c b/src/core/security/security_context.c index 95d80ba122f..5b3326d341e 100644 --- a/src/core/security/security_context.c +++ b/src/core/security/security_context.c @@ -44,271 +44,317 @@ /* --- grpc_call --- */ -grpc_call_error grpc_call_set_credentials(grpc_call *call, - grpc_credentials *creds) { +grpc_call_error +grpc_call_set_credentials (grpc_call * call, grpc_credentials * creds) +{ grpc_client_security_context *ctx = NULL; - if (!grpc_call_is_client(call)) { - gpr_log(GPR_ERROR, "Method is client-side only."); - return GRPC_CALL_ERROR_NOT_ON_SERVER; - } - if (creds != NULL && !grpc_credentials_has_request_metadata_only(creds)) { - gpr_log(GPR_ERROR, "Incompatible credentials to set on a call."); - return GRPC_CALL_ERROR; - } - ctx = (grpc_client_security_context *)grpc_call_context_get( - call, GRPC_CONTEXT_SECURITY); - if (ctx == NULL) { - ctx = grpc_client_security_context_create(); - ctx->creds = grpc_credentials_ref(creds); - grpc_call_context_set(call, GRPC_CONTEXT_SECURITY, ctx, - grpc_client_security_context_destroy); - } else { - grpc_credentials_unref(ctx->creds); - ctx->creds = grpc_credentials_ref(creds); - } + if (!grpc_call_is_client (call)) + { + gpr_log (GPR_ERROR, "Method is client-side only."); + return GRPC_CALL_ERROR_NOT_ON_SERVER; + } + if (creds != NULL && !grpc_credentials_has_request_metadata_only (creds)) + { + gpr_log (GPR_ERROR, "Incompatible credentials to set on a call."); + return GRPC_CALL_ERROR; + } + ctx = (grpc_client_security_context *) grpc_call_context_get (call, GRPC_CONTEXT_SECURITY); + if (ctx == NULL) + { + ctx = grpc_client_security_context_create (); + ctx->creds = grpc_credentials_ref (creds); + grpc_call_context_set (call, GRPC_CONTEXT_SECURITY, ctx, grpc_client_security_context_destroy); + } + else + { + grpc_credentials_unref (ctx->creds); + ctx->creds = grpc_credentials_ref (creds); + } return GRPC_CALL_OK; } -grpc_auth_context *grpc_call_auth_context(grpc_call *call) { - void *sec_ctx = grpc_call_context_get(call, GRPC_CONTEXT_SECURITY); - if (sec_ctx == NULL) return NULL; - return grpc_call_is_client(call) - ? GRPC_AUTH_CONTEXT_REF( - ((grpc_client_security_context *)sec_ctx)->auth_context, - "grpc_call_auth_context client") - : GRPC_AUTH_CONTEXT_REF( - ((grpc_server_security_context *)sec_ctx)->auth_context, - "grpc_call_auth_context server"); +grpc_auth_context * +grpc_call_auth_context (grpc_call * call) +{ + void *sec_ctx = grpc_call_context_get (call, GRPC_CONTEXT_SECURITY); + if (sec_ctx == NULL) + return NULL; + return grpc_call_is_client (call) ? GRPC_AUTH_CONTEXT_REF (((grpc_client_security_context *) sec_ctx)->auth_context, "grpc_call_auth_context client") : GRPC_AUTH_CONTEXT_REF (((grpc_server_security_context *) sec_ctx)->auth_context, "grpc_call_auth_context server"); } -void grpc_auth_context_release(grpc_auth_context *context) { - GRPC_AUTH_CONTEXT_UNREF(context, "grpc_auth_context_unref"); +void +grpc_auth_context_release (grpc_auth_context * context) +{ + GRPC_AUTH_CONTEXT_UNREF (context, "grpc_auth_context_unref"); } /* --- grpc_client_security_context --- */ -grpc_client_security_context *grpc_client_security_context_create(void) { - grpc_client_security_context *ctx = - gpr_malloc(sizeof(grpc_client_security_context)); - memset(ctx, 0, sizeof(grpc_client_security_context)); +grpc_client_security_context * +grpc_client_security_context_create (void) +{ + grpc_client_security_context *ctx = gpr_malloc (sizeof (grpc_client_security_context)); + memset (ctx, 0, sizeof (grpc_client_security_context)); return ctx; } -void grpc_client_security_context_destroy(void *ctx) { - grpc_client_security_context *c = (grpc_client_security_context *)ctx; - grpc_credentials_unref(c->creds); - GRPC_AUTH_CONTEXT_UNREF(c->auth_context, "client_security_context"); - gpr_free(ctx); +void +grpc_client_security_context_destroy (void *ctx) +{ + grpc_client_security_context *c = (grpc_client_security_context *) ctx; + grpc_credentials_unref (c->creds); + GRPC_AUTH_CONTEXT_UNREF (c->auth_context, "client_security_context"); + gpr_free (ctx); } /* --- grpc_server_security_context --- */ -grpc_server_security_context *grpc_server_security_context_create(void) { - grpc_server_security_context *ctx = - gpr_malloc(sizeof(grpc_server_security_context)); - memset(ctx, 0, sizeof(grpc_server_security_context)); +grpc_server_security_context * +grpc_server_security_context_create (void) +{ + grpc_server_security_context *ctx = gpr_malloc (sizeof (grpc_server_security_context)); + memset (ctx, 0, sizeof (grpc_server_security_context)); return ctx; } -void grpc_server_security_context_destroy(void *ctx) { - grpc_server_security_context *c = (grpc_server_security_context *)ctx; - GRPC_AUTH_CONTEXT_UNREF(c->auth_context, "server_security_context"); - gpr_free(ctx); +void +grpc_server_security_context_destroy (void *ctx) +{ + grpc_server_security_context *c = (grpc_server_security_context *) ctx; + GRPC_AUTH_CONTEXT_UNREF (c->auth_context, "server_security_context"); + gpr_free (ctx); } /* --- grpc_auth_context --- */ -static grpc_auth_property_iterator empty_iterator = {NULL, 0, NULL}; - -grpc_auth_context *grpc_auth_context_create(grpc_auth_context *chained) { - grpc_auth_context *ctx = gpr_malloc(sizeof(grpc_auth_context)); - memset(ctx, 0, sizeof(grpc_auth_context)); - gpr_ref_init(&ctx->refcount, 1); - if (chained != NULL) { - ctx->chained = GRPC_AUTH_CONTEXT_REF(chained, "chained"); - ctx->peer_identity_property_name = - ctx->chained->peer_identity_property_name; - } +static grpc_auth_property_iterator empty_iterator = { NULL, 0, NULL }; + +grpc_auth_context * +grpc_auth_context_create (grpc_auth_context * chained) +{ + grpc_auth_context *ctx = gpr_malloc (sizeof (grpc_auth_context)); + memset (ctx, 0, sizeof (grpc_auth_context)); + gpr_ref_init (&ctx->refcount, 1); + if (chained != NULL) + { + ctx->chained = GRPC_AUTH_CONTEXT_REF (chained, "chained"); + ctx->peer_identity_property_name = ctx->chained->peer_identity_property_name; + } return ctx; } #ifdef GRPC_AUTH_CONTEXT_REFCOUNT_DEBUG -grpc_auth_context *grpc_auth_context_ref(grpc_auth_context *ctx, - const char *file, int line, - const char *reason) { - if (ctx == NULL) return NULL; - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "AUTH_CONTEXT:%p ref %d -> %d %s", ctx, (int)ctx->refcount.count, - (int)ctx->refcount.count + 1, reason); +grpc_auth_context * +grpc_auth_context_ref (grpc_auth_context * ctx, const char *file, int line, const char *reason) +{ + if (ctx == NULL) + return NULL; + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "AUTH_CONTEXT:%p ref %d -> %d %s", ctx, (int) ctx->refcount.count, (int) ctx->refcount.count + 1, reason); #else -grpc_auth_context *grpc_auth_context_ref(grpc_auth_context *ctx) { - if (ctx == NULL) return NULL; +grpc_auth_context * +grpc_auth_context_ref (grpc_auth_context * ctx) +{ + if (ctx == NULL) + return NULL; #endif - gpr_ref(&ctx->refcount); + gpr_ref (&ctx->refcount); return ctx; } #ifdef GRPC_AUTH_CONTEXT_REFCOUNT_DEBUG -void grpc_auth_context_unref(grpc_auth_context *ctx, const char *file, int line, - const char *reason) { - if (ctx == NULL) return; - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "AUTH_CONTEXT:%p unref %d -> %d %s", ctx, (int)ctx->refcount.count, - (int)ctx->refcount.count - 1, reason); +void +grpc_auth_context_unref (grpc_auth_context * ctx, const char *file, int line, const char *reason) +{ + if (ctx == NULL) + return; + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "AUTH_CONTEXT:%p unref %d -> %d %s", ctx, (int) ctx->refcount.count, (int) ctx->refcount.count - 1, reason); #else -void grpc_auth_context_unref(grpc_auth_context *ctx) { - if (ctx == NULL) return; +void +grpc_auth_context_unref (grpc_auth_context * ctx) +{ + if (ctx == NULL) + return; #endif - if (gpr_unref(&ctx->refcount)) { - size_t i; - GRPC_AUTH_CONTEXT_UNREF(ctx->chained, "chained"); - if (ctx->properties.array != NULL) { - for (i = 0; i < ctx->properties.count; i++) { - grpc_auth_property_reset(&ctx->properties.array[i]); - } - gpr_free(ctx->properties.array); + if (gpr_unref (&ctx->refcount)) + { + size_t i; + GRPC_AUTH_CONTEXT_UNREF (ctx->chained, "chained"); + if (ctx->properties.array != NULL) + { + for (i = 0; i < ctx->properties.count; i++) + { + grpc_auth_property_reset (&ctx->properties.array[i]); + } + gpr_free (ctx->properties.array); + } + gpr_free (ctx); } - gpr_free(ctx); - } } -const char *grpc_auth_context_peer_identity_property_name( - const grpc_auth_context *ctx) { +const char * +grpc_auth_context_peer_identity_property_name (const grpc_auth_context * ctx) +{ return ctx->peer_identity_property_name; } -int grpc_auth_context_set_peer_identity_property_name(grpc_auth_context *ctx, - const char *name) { - grpc_auth_property_iterator it = - grpc_auth_context_find_properties_by_name(ctx, name); - const grpc_auth_property *prop = grpc_auth_property_iterator_next(&it); - if (prop == NULL) { - gpr_log(GPR_ERROR, "Property name %s not found in auth context.", - name != NULL ? name : "NULL"); - return 0; - } +int +grpc_auth_context_set_peer_identity_property_name (grpc_auth_context * ctx, const char *name) +{ + grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name (ctx, name); + const grpc_auth_property *prop = grpc_auth_property_iterator_next (&it); + if (prop == NULL) + { + gpr_log (GPR_ERROR, "Property name %s not found in auth context.", name != NULL ? name : "NULL"); + return 0; + } ctx->peer_identity_property_name = prop->name; return 1; } -int grpc_auth_context_peer_is_authenticated(const grpc_auth_context *ctx) { +int +grpc_auth_context_peer_is_authenticated (const grpc_auth_context * ctx) +{ return ctx->peer_identity_property_name == NULL ? 0 : 1; } -grpc_auth_property_iterator grpc_auth_context_property_iterator( - const grpc_auth_context *ctx) { +grpc_auth_property_iterator +grpc_auth_context_property_iterator (const grpc_auth_context * ctx) +{ grpc_auth_property_iterator it = empty_iterator; - if (ctx == NULL) return it; + if (ctx == NULL) + return it; it.ctx = ctx; return it; } -const grpc_auth_property *grpc_auth_property_iterator_next( - grpc_auth_property_iterator *it) { - if (it == NULL || it->ctx == NULL) return NULL; - while (it->index == it->ctx->properties.count) { - if (it->ctx->chained == NULL) return NULL; - it->ctx = it->ctx->chained; - it->index = 0; - } - if (it->name == NULL) { - return &it->ctx->properties.array[it->index++]; - } else { - while (it->index < it->ctx->properties.count) { - const grpc_auth_property *prop = &it->ctx->properties.array[it->index++]; - GPR_ASSERT(prop->name != NULL); - if (strcmp(it->name, prop->name) == 0) { - return prop; - } +const grpc_auth_property * +grpc_auth_property_iterator_next (grpc_auth_property_iterator * it) +{ + if (it == NULL || it->ctx == NULL) + return NULL; + while (it->index == it->ctx->properties.count) + { + if (it->ctx->chained == NULL) + return NULL; + it->ctx = it->ctx->chained; + it->index = 0; + } + if (it->name == NULL) + { + return &it->ctx->properties.array[it->index++]; + } + else + { + while (it->index < it->ctx->properties.count) + { + const grpc_auth_property *prop = &it->ctx->properties.array[it->index++]; + GPR_ASSERT (prop->name != NULL); + if (strcmp (it->name, prop->name) == 0) + { + return prop; + } + } + /* We could not find the name, try another round. */ + return grpc_auth_property_iterator_next (it); } - /* We could not find the name, try another round. */ - return grpc_auth_property_iterator_next(it); - } } -grpc_auth_property_iterator grpc_auth_context_find_properties_by_name( - const grpc_auth_context *ctx, const char *name) { +grpc_auth_property_iterator +grpc_auth_context_find_properties_by_name (const grpc_auth_context * ctx, const char *name) +{ grpc_auth_property_iterator it = empty_iterator; - if (ctx == NULL || name == NULL) return empty_iterator; + if (ctx == NULL || name == NULL) + return empty_iterator; it.ctx = ctx; it.name = name; return it; } -grpc_auth_property_iterator grpc_auth_context_peer_identity( - const grpc_auth_context *ctx) { - if (ctx == NULL) return empty_iterator; - return grpc_auth_context_find_properties_by_name( - ctx, ctx->peer_identity_property_name); +grpc_auth_property_iterator +grpc_auth_context_peer_identity (const grpc_auth_context * ctx) +{ + if (ctx == NULL) + return empty_iterator; + return grpc_auth_context_find_properties_by_name (ctx, ctx->peer_identity_property_name); } -static void ensure_auth_context_capacity(grpc_auth_context *ctx) { - if (ctx->properties.count == ctx->properties.capacity) { - ctx->properties.capacity = - GPR_MAX(ctx->properties.capacity + 8, ctx->properties.capacity * 2); - ctx->properties.array = - gpr_realloc(ctx->properties.array, - ctx->properties.capacity * sizeof(grpc_auth_property)); - } +static void +ensure_auth_context_capacity (grpc_auth_context * ctx) +{ + if (ctx->properties.count == ctx->properties.capacity) + { + ctx->properties.capacity = GPR_MAX (ctx->properties.capacity + 8, ctx->properties.capacity * 2); + ctx->properties.array = gpr_realloc (ctx->properties.array, ctx->properties.capacity * sizeof (grpc_auth_property)); + } } -void grpc_auth_context_add_property(grpc_auth_context *ctx, const char *name, - const char *value, size_t value_length) { +void +grpc_auth_context_add_property (grpc_auth_context * ctx, const char *name, const char *value, size_t value_length) +{ grpc_auth_property *prop; - ensure_auth_context_capacity(ctx); + ensure_auth_context_capacity (ctx); prop = &ctx->properties.array[ctx->properties.count++]; - prop->name = gpr_strdup(name); - prop->value = gpr_malloc(value_length + 1); - memcpy(prop->value, value, value_length); + prop->name = gpr_strdup (name); + prop->value = gpr_malloc (value_length + 1); + memcpy (prop->value, value, value_length); prop->value[value_length] = '\0'; prop->value_length = value_length; } -void grpc_auth_context_add_cstring_property(grpc_auth_context *ctx, - const char *name, - const char *value) { +void +grpc_auth_context_add_cstring_property (grpc_auth_context * ctx, const char *name, const char *value) +{ grpc_auth_property *prop; - ensure_auth_context_capacity(ctx); + ensure_auth_context_capacity (ctx); prop = &ctx->properties.array[ctx->properties.count++]; - prop->name = gpr_strdup(name); - prop->value = gpr_strdup(value); - prop->value_length = strlen(value); + prop->name = gpr_strdup (name); + prop->value = gpr_strdup (value); + prop->value_length = strlen (value); } -void grpc_auth_property_reset(grpc_auth_property *property) { - gpr_free(property->name); - gpr_free(property->value); - memset(property, 0, sizeof(grpc_auth_property)); +void +grpc_auth_property_reset (grpc_auth_property * property) +{ + gpr_free (property->name); + gpr_free (property->value); + memset (property, 0, sizeof (grpc_auth_property)); } -grpc_arg grpc_auth_metadata_processor_to_arg(grpc_auth_metadata_processor *p) { +grpc_arg +grpc_auth_metadata_processor_to_arg (grpc_auth_metadata_processor * p) +{ grpc_arg arg; - memset(&arg, 0, sizeof(grpc_arg)); + memset (&arg, 0, sizeof (grpc_arg)); arg.type = GRPC_ARG_POINTER; arg.key = GRPC_AUTH_METADATA_PROCESSOR_ARG; arg.value.pointer.p = p; return arg; } -grpc_auth_metadata_processor *grpc_auth_metadata_processor_from_arg( - const grpc_arg *arg) { - if (strcmp(arg->key, GRPC_AUTH_METADATA_PROCESSOR_ARG) != 0) return NULL; - if (arg->type != GRPC_ARG_POINTER) { - gpr_log(GPR_ERROR, "Invalid type %d for arg %s", arg->type, - GRPC_AUTH_METADATA_PROCESSOR_ARG); +grpc_auth_metadata_processor * +grpc_auth_metadata_processor_from_arg (const grpc_arg * arg) +{ + if (strcmp (arg->key, GRPC_AUTH_METADATA_PROCESSOR_ARG) != 0) return NULL; - } + if (arg->type != GRPC_ARG_POINTER) + { + gpr_log (GPR_ERROR, "Invalid type %d for arg %s", arg->type, GRPC_AUTH_METADATA_PROCESSOR_ARG); + return NULL; + } return arg->value.pointer.p; } -grpc_auth_metadata_processor *grpc_find_auth_metadata_processor_in_args( - const grpc_channel_args *args) { +grpc_auth_metadata_processor * +grpc_find_auth_metadata_processor_in_args (const grpc_channel_args * args) +{ size_t i; - if (args == NULL) return NULL; - for (i = 0; i < args->num_args; i++) { - grpc_auth_metadata_processor *p = - grpc_auth_metadata_processor_from_arg(&args->args[i]); - if (p != NULL) return p; - } + if (args == NULL) + return NULL; + for (i = 0; i < args->num_args; i++) + { + grpc_auth_metadata_processor *p = grpc_auth_metadata_processor_from_arg (&args->args[i]); + if (p != NULL) + return p; + } return NULL; } diff --git a/src/core/security/security_context.h b/src/core/security/security_context.h index a9a03064108..93b31f60d64 100644 --- a/src/core/security/security_context.h +++ b/src/core/security/security_context.h @@ -43,13 +43,15 @@ /* Property names are always NULL terminated. */ -typedef struct { +typedef struct +{ grpc_auth_property *array; size_t count; size_t capacity; } grpc_auth_property_array; -struct grpc_auth_context { +struct grpc_auth_context +{ struct grpc_auth_context *chained; grpc_auth_property_array properties; gpr_refcount refcount; @@ -58,7 +60,7 @@ struct grpc_auth_context { }; /* Creation. */ -grpc_auth_context *grpc_auth_context_create(grpc_auth_context *chained); +grpc_auth_context *grpc_auth_context_create (grpc_auth_context * chained); /* Refcounting. */ #ifdef GRPC_AUTH_CONTEXT_REFCOUNT_DEBUG @@ -66,50 +68,47 @@ grpc_auth_context *grpc_auth_context_create(grpc_auth_context *chained); grpc_auth_context_ref((p), __FILE__, __LINE__, (r)) #define GRPC_AUTH_CONTEXT_UNREF(p, r) \ grpc_auth_context_unref((p), __FILE__, __LINE__, (r)) -grpc_auth_context *grpc_auth_context_ref(grpc_auth_context *policy, - const char *file, int line, - const char *reason); -void grpc_auth_context_unref(grpc_auth_context *policy, const char *file, - int line, const char *reason); +grpc_auth_context *grpc_auth_context_ref (grpc_auth_context * policy, const char *file, int line, const char *reason); +void grpc_auth_context_unref (grpc_auth_context * policy, const char *file, int line, const char *reason); #else #define GRPC_AUTH_CONTEXT_REF(p, r) grpc_auth_context_ref((p)) #define GRPC_AUTH_CONTEXT_UNREF(p, r) grpc_auth_context_unref((p)) -grpc_auth_context *grpc_auth_context_ref(grpc_auth_context *policy); -void grpc_auth_context_unref(grpc_auth_context *policy); +grpc_auth_context *grpc_auth_context_ref (grpc_auth_context * policy); +void grpc_auth_context_unref (grpc_auth_context * policy); #endif -void grpc_auth_property_reset(grpc_auth_property *property); +void grpc_auth_property_reset (grpc_auth_property * property); /* --- grpc_client_security_context --- Internal client-side security context. */ -typedef struct { +typedef struct +{ grpc_credentials *creds; grpc_auth_context *auth_context; } grpc_client_security_context; -grpc_client_security_context *grpc_client_security_context_create(void); -void grpc_client_security_context_destroy(void *ctx); +grpc_client_security_context *grpc_client_security_context_create (void); +void grpc_client_security_context_destroy (void *ctx); /* --- grpc_server_security_context --- Internal server-side security context. */ -typedef struct { +typedef struct +{ grpc_auth_context *auth_context; } grpc_server_security_context; -grpc_server_security_context *grpc_server_security_context_create(void); -void grpc_server_security_context_destroy(void *ctx); +grpc_server_security_context *grpc_server_security_context_create (void); +void grpc_server_security_context_destroy (void *ctx); /* --- Auth metadata processing. --- */ #define GRPC_AUTH_METADATA_PROCESSOR_ARG "grpc.auth_metadata_processor" -grpc_arg grpc_auth_metadata_processor_to_arg(grpc_auth_metadata_processor *p); -grpc_auth_metadata_processor *grpc_auth_metadata_processor_from_arg( - const grpc_arg *arg); -grpc_auth_metadata_processor *grpc_find_auth_metadata_processor_in_args( - const grpc_channel_args *args); +grpc_arg grpc_auth_metadata_processor_to_arg (grpc_auth_metadata_processor * p); +grpc_auth_metadata_processor *grpc_auth_metadata_processor_from_arg (const grpc_arg * arg); +grpc_auth_metadata_processor *grpc_find_auth_metadata_processor_in_args (const grpc_channel_args * args); #endif /* GRPC_INTERNAL_CORE_SECURITY_SECURITY_CONTEXT_H */ diff --git a/src/core/security/server_auth_filter.c b/src/core/security/server_auth_filter.c index 0816b5fc22a..66316f788ef 100644 --- a/src/core/security/server_auth_filter.c +++ b/src/core/security/server_auth_filter.c @@ -40,7 +40,8 @@ #include #include -typedef struct call_data { +typedef struct call_data +{ gpr_uint8 got_client_metadata; grpc_stream_op_buffer *recv_ops; /* Closure to call when finished with the auth_on_recv hook. */ @@ -57,132 +58,139 @@ typedef struct call_data { grpc_auth_context *auth_context; } call_data; -typedef struct channel_data { +typedef struct channel_data +{ grpc_security_connector *security_connector; grpc_auth_metadata_processor processor; grpc_mdctx *mdctx; } channel_data; -static grpc_metadata_array metadata_batch_to_md_array( - const grpc_metadata_batch *batch) { +static grpc_metadata_array +metadata_batch_to_md_array (const grpc_metadata_batch * batch) +{ grpc_linked_mdelem *l; grpc_metadata_array result; - grpc_metadata_array_init(&result); - for (l = batch->list.head; l != NULL; l = l->next) { - grpc_metadata *usr_md = NULL; - grpc_mdelem *md = l->md; - grpc_mdstr *key = md->key; - grpc_mdstr *value = md->value; - if (result.count == result.capacity) { - result.capacity = GPR_MAX(result.capacity + 8, result.capacity * 2); - result.metadata = - gpr_realloc(result.metadata, result.capacity * sizeof(grpc_metadata)); + grpc_metadata_array_init (&result); + for (l = batch->list.head; l != NULL; l = l->next) + { + grpc_metadata *usr_md = NULL; + grpc_mdelem *md = l->md; + grpc_mdstr *key = md->key; + grpc_mdstr *value = md->value; + if (result.count == result.capacity) + { + result.capacity = GPR_MAX (result.capacity + 8, result.capacity * 2); + result.metadata = gpr_realloc (result.metadata, result.capacity * sizeof (grpc_metadata)); + } + usr_md = &result.metadata[result.count++]; + usr_md->key = grpc_mdstr_as_c_string (key); + usr_md->value = grpc_mdstr_as_c_string (value); + usr_md->value_length = GPR_SLICE_LENGTH (value->slice); } - usr_md = &result.metadata[result.count++]; - usr_md->key = grpc_mdstr_as_c_string(key); - usr_md->value = grpc_mdstr_as_c_string(value); - usr_md->value_length = GPR_SLICE_LENGTH(value->slice); - } return result; } -static grpc_mdelem *remove_consumed_md(void *user_data, grpc_mdelem *md) { +static grpc_mdelem * +remove_consumed_md (void *user_data, grpc_mdelem * md) +{ grpc_call_element *elem = user_data; call_data *calld = elem->call_data; size_t i; - for (i = 0; i < calld->num_consumed_md; i++) { - const grpc_metadata *consumed_md = &calld->consumed_md[i]; - /* Maybe we could do a pointer comparison but we do not have any guarantee - that the metadata processor used the same pointers for consumed_md in the - callback. */ - if (GPR_SLICE_LENGTH(md->key->slice) != strlen(consumed_md->key) || - GPR_SLICE_LENGTH(md->value->slice) != consumed_md->value_length) { - continue; + for (i = 0; i < calld->num_consumed_md; i++) + { + const grpc_metadata *consumed_md = &calld->consumed_md[i]; + /* Maybe we could do a pointer comparison but we do not have any guarantee + that the metadata processor used the same pointers for consumed_md in the + callback. */ + if (GPR_SLICE_LENGTH (md->key->slice) != strlen (consumed_md->key) || GPR_SLICE_LENGTH (md->value->slice) != consumed_md->value_length) + { + continue; + } + if (memcmp (GPR_SLICE_START_PTR (md->key->slice), consumed_md->key, GPR_SLICE_LENGTH (md->key->slice)) == 0 && memcmp (GPR_SLICE_START_PTR (md->value->slice), consumed_md->value, GPR_SLICE_LENGTH (md->value->slice)) == 0) + { + return NULL; /* Delete. */ + } } - if (memcmp(GPR_SLICE_START_PTR(md->key->slice), consumed_md->key, - GPR_SLICE_LENGTH(md->key->slice)) == 0 && - memcmp(GPR_SLICE_START_PTR(md->value->slice), consumed_md->value, - GPR_SLICE_LENGTH(md->value->slice)) == 0) { - return NULL; /* Delete. */ - } - } return md; } /* called from application code */ -static void on_md_processing_done( - void *user_data, const grpc_metadata *consumed_md, size_t num_consumed_md, - const grpc_metadata *response_md, size_t num_response_md, - grpc_status_code status, const char *error_details) { +static void +on_md_processing_done (void *user_data, const grpc_metadata * consumed_md, size_t num_consumed_md, const grpc_metadata * response_md, size_t num_response_md, grpc_status_code status, const char *error_details) +{ grpc_call_element *elem = user_data; call_data *calld = elem->call_data; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; /* TODO(jboeuf): Implement support for response_md. */ - if (response_md != NULL && num_response_md > 0) { - gpr_log(GPR_INFO, - "response_md in auth metadata processing not supported for now. " - "Ignoring..."); - } + if (response_md != NULL && num_response_md > 0) + { + gpr_log (GPR_INFO, "response_md in auth metadata processing not supported for now. " "Ignoring..."); + } - if (status == GRPC_STATUS_OK) { - calld->consumed_md = consumed_md; - calld->num_consumed_md = num_consumed_md; - grpc_metadata_batch_filter(&calld->md_op->data.metadata, remove_consumed_md, - elem); - grpc_metadata_array_destroy(&calld->md); - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, 1, &closure_list); - } else { - gpr_slice message; - grpc_metadata_array_destroy(&calld->md); - error_details = error_details != NULL - ? error_details - : "Authentication metadata processing failed."; - message = gpr_slice_from_copied_string(error_details); - grpc_sopb_reset(calld->recv_ops); - grpc_transport_stream_op_add_close(&calld->transport_op, status, &message); - grpc_call_next_op(elem, &calld->transport_op, &closure_list); - } + if (status == GRPC_STATUS_OK) + { + calld->consumed_md = consumed_md; + calld->num_consumed_md = num_consumed_md; + grpc_metadata_batch_filter (&calld->md_op->data.metadata, remove_consumed_md, elem); + grpc_metadata_array_destroy (&calld->md); + calld->on_done_recv->cb (calld->on_done_recv->cb_arg, 1, &closure_list); + } + else + { + gpr_slice message; + grpc_metadata_array_destroy (&calld->md); + error_details = error_details != NULL ? error_details : "Authentication metadata processing failed."; + message = gpr_slice_from_copied_string (error_details); + grpc_sopb_reset (calld->recv_ops); + grpc_transport_stream_op_add_close (&calld->transport_op, status, &message); + grpc_call_next_op (elem, &calld->transport_op, &closure_list); + } - grpc_closure_list_run(&closure_list); + grpc_closure_list_run (&closure_list); } -static void auth_on_recv(void *user_data, int success, - grpc_closure_list *closure_list) { +static void +auth_on_recv (void *user_data, int success, grpc_closure_list * closure_list) +{ grpc_call_element *elem = user_data; call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - if (success) { - size_t i; - size_t nops = calld->recv_ops->nops; - grpc_stream_op *ops = calld->recv_ops->ops; - for (i = 0; i < nops; i++) { - grpc_stream_op *op = &ops[i]; - if (op->type != GRPC_OP_METADATA || calld->got_client_metadata) continue; - calld->got_client_metadata = 1; - if (chand->processor.process == NULL) continue; - calld->md_op = op; - calld->md = metadata_batch_to_md_array(&op->data.metadata); - chand->processor.process(chand->processor.state, calld->auth_context, - calld->md.metadata, calld->md.count, - on_md_processing_done, elem); - return; + if (success) + { + size_t i; + size_t nops = calld->recv_ops->nops; + grpc_stream_op *ops = calld->recv_ops->ops; + for (i = 0; i < nops; i++) + { + grpc_stream_op *op = &ops[i]; + if (op->type != GRPC_OP_METADATA || calld->got_client_metadata) + continue; + calld->got_client_metadata = 1; + if (chand->processor.process == NULL) + continue; + calld->md_op = op; + calld->md = metadata_batch_to_md_array (&op->data.metadata); + chand->processor.process (chand->processor.state, calld->auth_context, calld->md.metadata, calld->md.count, on_md_processing_done, elem); + return; + } } - } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, closure_list); + calld->on_done_recv->cb (calld->on_done_recv->cb_arg, success, closure_list); } -static void set_recv_ops_md_callbacks(grpc_call_element *elem, - grpc_transport_stream_op *op) { +static void +set_recv_ops_md_callbacks (grpc_call_element * elem, grpc_transport_stream_op * op) +{ call_data *calld = elem->call_data; - if (op->recv_ops && !calld->got_client_metadata) { - /* substitute our callback for the higher callback */ - calld->recv_ops = op->recv_ops; - calld->on_done_recv = op->on_done_recv; - op->on_done_recv = &calld->auth_on_recv; - calld->transport_op = *op; - } + if (op->recv_ops && !calld->got_client_metadata) + { + /* substitute our callback for the higher callback */ + calld->recv_ops = op->recv_ops; + calld->on_done_recv = op->on_done_recv; + op->on_done_recv = &calld->auth_on_recv; + calld->transport_op = *op; + } } /* Called either: @@ -190,92 +198,88 @@ static void set_recv_ops_md_callbacks(grpc_call_element *elem, - a network event (or similar) from below, to receive something op contains type and call direction information, in addition to the data that is being sent or received. */ -static void auth_start_transport_op(grpc_call_element *elem, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { - set_recv_ops_md_callbacks(elem, op); - grpc_call_next_op(elem, op, closure_list); +static void +auth_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + set_recv_ops_md_callbacks (elem, op); + grpc_call_next_op (elem, op, closure_list); } /* Constructor for call_data */ -static void init_call_elem(grpc_call_element *elem, - const void *server_transport_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list) { +static void +init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_server_security_context *server_ctx = NULL; /* initialize members */ - memset(calld, 0, sizeof(*calld)); - grpc_closure_init(&calld->auth_on_recv, auth_on_recv, elem); + memset (calld, 0, sizeof (*calld)); + grpc_closure_init (&calld->auth_on_recv, auth_on_recv, elem); - GPR_ASSERT(initial_op && initial_op->context != NULL && - initial_op->context[GRPC_CONTEXT_SECURITY].value == NULL); + GPR_ASSERT (initial_op && initial_op->context != NULL && initial_op->context[GRPC_CONTEXT_SECURITY].value == NULL); /* Create a security context for the call and reference the auth context from the channel. */ - if (initial_op->context[GRPC_CONTEXT_SECURITY].value != NULL) { - initial_op->context[GRPC_CONTEXT_SECURITY].destroy( - initial_op->context[GRPC_CONTEXT_SECURITY].value); - } - server_ctx = grpc_server_security_context_create(); - server_ctx->auth_context = - grpc_auth_context_create(chand->security_connector->auth_context); + if (initial_op->context[GRPC_CONTEXT_SECURITY].value != NULL) + { + initial_op->context[GRPC_CONTEXT_SECURITY].destroy (initial_op->context[GRPC_CONTEXT_SECURITY].value); + } + server_ctx = grpc_server_security_context_create (); + server_ctx->auth_context = grpc_auth_context_create (chand->security_connector->auth_context); server_ctx->auth_context->pollset = initial_op->bind_pollset; initial_op->context[GRPC_CONTEXT_SECURITY].value = server_ctx; - initial_op->context[GRPC_CONTEXT_SECURITY].destroy = - grpc_server_security_context_destroy; + initial_op->context[GRPC_CONTEXT_SECURITY].destroy = grpc_server_security_context_destroy; calld->auth_context = server_ctx->auth_context; /* Set the metadata callbacks. */ - set_recv_ops_md_callbacks(elem, initial_op); + set_recv_ops_md_callbacks (elem, initial_op); } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element *elem, - grpc_closure_list *closure_list) {} +static void +destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +{ +} /* Constructor for channel_data */ -static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, - const grpc_channel_args *args, grpc_mdctx *mdctx, - int is_first, int is_last, - grpc_closure_list *closure_list) { - grpc_security_connector *sc = grpc_find_security_connector_in_args(args); - grpc_auth_metadata_processor *processor = - grpc_find_auth_metadata_processor_in_args(args); +static void +init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +{ + grpc_security_connector *sc = grpc_find_security_connector_in_args (args); + grpc_auth_metadata_processor *processor = grpc_find_auth_metadata_processor_in_args (args); /* grab pointers to our data from the channel element */ channel_data *chand = elem->channel_data; /* The first and the last filters tend to be implemented differently to handle the case that there's no 'next' filter to call on the up or down path */ - GPR_ASSERT(!is_first); - GPR_ASSERT(!is_last); - GPR_ASSERT(sc != NULL); - GPR_ASSERT(processor != NULL); + GPR_ASSERT (!is_first); + GPR_ASSERT (!is_last); + GPR_ASSERT (sc != NULL); + GPR_ASSERT (processor != NULL); /* initialize members */ - GPR_ASSERT(!sc->is_client_side); - chand->security_connector = - GRPC_SECURITY_CONNECTOR_REF(sc, "server_auth_filter"); + GPR_ASSERT (!sc->is_client_side); + chand->security_connector = GRPC_SECURITY_CONNECTOR_REF (sc, "server_auth_filter"); chand->mdctx = mdctx; chand->processor = *processor; } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element *elem, - grpc_closure_list *closure_list) { +static void +destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +{ /* grab pointers to our data from the channel element */ channel_data *chand = elem->channel_data; - GRPC_SECURITY_CONNECTOR_UNREF(chand->security_connector, - "server_auth_filter"); + GRPC_SECURITY_CONNECTOR_UNREF (chand->security_connector, "server_auth_filter"); } const grpc_channel_filter grpc_server_auth_filter = { - auth_start_transport_op, grpc_channel_next_op, - sizeof(call_data), init_call_elem, - destroy_call_elem, sizeof(channel_data), - init_channel_elem, destroy_channel_elem, - grpc_call_next_get_peer, "server-auth"}; + auth_start_transport_op, grpc_channel_next_op, + sizeof (call_data), init_call_elem, + destroy_call_elem, sizeof (channel_data), + init_channel_elem, destroy_channel_elem, + grpc_call_next_get_peer, "server-auth" +}; diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index 268ae582804..42c4b63868c 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -51,12 +51,14 @@ #include #include -typedef struct tcp_endpoint_list { +typedef struct tcp_endpoint_list +{ grpc_endpoint *tcp_endpoint; struct tcp_endpoint_list *next; } tcp_endpoint_list; -typedef struct grpc_server_secure_state { +typedef struct grpc_server_secure_state +{ grpc_server *server; grpc_tcp_server *tcp; grpc_security_connector *sc; @@ -69,151 +71,160 @@ typedef struct grpc_server_secure_state { grpc_closure *destroy_callback; } grpc_server_secure_state; -static void state_ref(grpc_server_secure_state *state) { - gpr_ref(&state->refcount); +static void +state_ref (grpc_server_secure_state * state) +{ + gpr_ref (&state->refcount); } -static void state_unref(grpc_server_secure_state *state) { - if (gpr_unref(&state->refcount)) { - /* ensure all threads have unlocked */ - gpr_mu_lock(&state->mu); - gpr_mu_unlock(&state->mu); - /* clean up */ - GRPC_SECURITY_CONNECTOR_UNREF(state->sc, "server"); - grpc_server_credentials_unref(state->creds); - gpr_free(state); - } +static void +state_unref (grpc_server_secure_state * state) +{ + if (gpr_unref (&state->refcount)) + { + /* ensure all threads have unlocked */ + gpr_mu_lock (&state->mu); + gpr_mu_unlock (&state->mu); + /* clean up */ + GRPC_SECURITY_CONNECTOR_UNREF (state->sc, "server"); + grpc_server_credentials_unref (state->creds); + gpr_free (state); + } } -static void setup_transport(void *statep, grpc_transport *transport, - grpc_mdctx *mdctx, - grpc_closure_list *closure_list) { +static void +setup_transport (void *statep, grpc_transport * transport, grpc_mdctx * mdctx, grpc_closure_list * closure_list) +{ static grpc_channel_filter const *extra_filters[] = { - &grpc_server_auth_filter, &grpc_http_server_filter}; + &grpc_server_auth_filter, &grpc_http_server_filter + }; grpc_server_secure_state *state = statep; grpc_channel_args *args_copy; grpc_arg args_to_add[2]; - args_to_add[0] = grpc_security_connector_to_arg(state->sc); - args_to_add[1] = - grpc_auth_metadata_processor_to_arg(&state->creds->processor); - args_copy = grpc_channel_args_copy_and_add( - grpc_server_get_channel_args(state->server), args_to_add, - GPR_ARRAY_SIZE(args_to_add)); - grpc_server_setup_transport(state->server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, args_copy, - closure_list); - grpc_channel_args_destroy(args_copy); + args_to_add[0] = grpc_security_connector_to_arg (state->sc); + args_to_add[1] = grpc_auth_metadata_processor_to_arg (&state->creds->processor); + args_copy = grpc_channel_args_copy_and_add (grpc_server_get_channel_args (state->server), args_to_add, GPR_ARRAY_SIZE (args_to_add)); + grpc_server_setup_transport (state->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, args_copy, closure_list); + grpc_channel_args_destroy (args_copy); } -static int remove_tcp_from_list_locked(grpc_server_secure_state *state, - grpc_endpoint *tcp) { +static int +remove_tcp_from_list_locked (grpc_server_secure_state * state, grpc_endpoint * tcp) +{ tcp_endpoint_list *node = state->handshaking_tcp_endpoints; tcp_endpoint_list *tmp = NULL; - if (node && node->tcp_endpoint == tcp) { - state->handshaking_tcp_endpoints = state->handshaking_tcp_endpoints->next; - gpr_free(node); - return 0; - } - while (node) { - if (node->next->tcp_endpoint == tcp) { - tmp = node->next; - node->next = node->next->next; - gpr_free(tmp); + if (node && node->tcp_endpoint == tcp) + { + state->handshaking_tcp_endpoints = state->handshaking_tcp_endpoints->next; + gpr_free (node); return 0; } - node = node->next; - } + while (node) + { + if (node->next->tcp_endpoint == tcp) + { + tmp = node->next; + node->next = node->next->next; + gpr_free (tmp); + return 0; + } + node = node->next; + } return -1; } -static void on_secure_handshake_done(void *statep, grpc_security_status status, - grpc_endpoint *wrapped_endpoint, - grpc_endpoint *secure_endpoint, - grpc_closure_list *closure_list) { +static void +on_secure_handshake_done (void *statep, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint, grpc_closure_list * closure_list) +{ grpc_server_secure_state *state = statep; grpc_transport *transport; grpc_mdctx *mdctx; - if (status == GRPC_SECURITY_OK) { - gpr_mu_lock(&state->mu); - remove_tcp_from_list_locked(state, wrapped_endpoint); - if (!state->is_shutdown) { - mdctx = grpc_mdctx_create(); - transport = grpc_create_chttp2_transport( - grpc_server_get_channel_args(state->server), secure_endpoint, mdctx, - 0, closure_list); - setup_transport(state, transport, mdctx, closure_list); - grpc_chttp2_transport_start_reading(transport, NULL, 0, closure_list); - } else { - /* We need to consume this here, because the server may already have gone - * away. */ - grpc_endpoint_destroy(secure_endpoint, closure_list); + if (status == GRPC_SECURITY_OK) + { + gpr_mu_lock (&state->mu); + remove_tcp_from_list_locked (state, wrapped_endpoint); + if (!state->is_shutdown) + { + mdctx = grpc_mdctx_create (); + transport = grpc_create_chttp2_transport (grpc_server_get_channel_args (state->server), secure_endpoint, mdctx, 0, closure_list); + setup_transport (state, transport, mdctx, closure_list); + grpc_chttp2_transport_start_reading (transport, NULL, 0, closure_list); + } + else + { + /* We need to consume this here, because the server may already have gone + * away. */ + grpc_endpoint_destroy (secure_endpoint, closure_list); + } + gpr_mu_unlock (&state->mu); } - gpr_mu_unlock(&state->mu); - } else { - gpr_mu_lock(&state->mu); - remove_tcp_from_list_locked(state, wrapped_endpoint); - gpr_mu_unlock(&state->mu); - gpr_log(GPR_ERROR, "Secure transport failed with error %d", status); - } - state_unref(state); + else + { + gpr_mu_lock (&state->mu); + remove_tcp_from_list_locked (state, wrapped_endpoint); + gpr_mu_unlock (&state->mu); + gpr_log (GPR_ERROR, "Secure transport failed with error %d", status); + } + state_unref (state); } -static void on_accept(void *statep, grpc_endpoint *tcp, - grpc_closure_list *closure_list) { +static void +on_accept (void *statep, grpc_endpoint * tcp, grpc_closure_list * closure_list) +{ grpc_server_secure_state *state = statep; tcp_endpoint_list *node; - state_ref(state); - node = gpr_malloc(sizeof(tcp_endpoint_list)); + state_ref (state); + node = gpr_malloc (sizeof (tcp_endpoint_list)); node->tcp_endpoint = tcp; - gpr_mu_lock(&state->mu); + gpr_mu_lock (&state->mu); node->next = state->handshaking_tcp_endpoints; state->handshaking_tcp_endpoints = node; - gpr_mu_unlock(&state->mu); - grpc_security_connector_do_handshake(state->sc, tcp, on_secure_handshake_done, - state, closure_list); + gpr_mu_unlock (&state->mu); + grpc_security_connector_do_handshake (state->sc, tcp, on_secure_handshake_done, state, closure_list); } /* Server callback: start listening on our ports */ -static void start(grpc_server *server, void *statep, grpc_pollset **pollsets, - size_t pollset_count, grpc_closure_list *closure_list) { +static void +start (grpc_server * server, void *statep, grpc_pollset ** pollsets, size_t pollset_count, grpc_closure_list * closure_list) +{ grpc_server_secure_state *state = statep; - grpc_tcp_server_start(state->tcp, pollsets, pollset_count, on_accept, state, - closure_list); + grpc_tcp_server_start (state->tcp, pollsets, pollset_count, on_accept, state, closure_list); } -static void destroy_done(void *statep, int success, - grpc_closure_list *closure_list) { +static void +destroy_done (void *statep, int success, grpc_closure_list * closure_list) +{ grpc_server_secure_state *state = statep; - state->destroy_callback->cb(state->destroy_callback->cb_arg, success, - closure_list); - gpr_mu_lock(&state->mu); - while (state->handshaking_tcp_endpoints != NULL) { - grpc_endpoint_shutdown(state->handshaking_tcp_endpoints->tcp_endpoint, - closure_list); - remove_tcp_from_list_locked(state, - state->handshaking_tcp_endpoints->tcp_endpoint); - } - gpr_mu_unlock(&state->mu); - state_unref(state); + state->destroy_callback->cb (state->destroy_callback->cb_arg, success, closure_list); + gpr_mu_lock (&state->mu); + while (state->handshaking_tcp_endpoints != NULL) + { + grpc_endpoint_shutdown (state->handshaking_tcp_endpoints->tcp_endpoint, closure_list); + remove_tcp_from_list_locked (state, state->handshaking_tcp_endpoints->tcp_endpoint); + } + gpr_mu_unlock (&state->mu); + state_unref (state); } /* Server callback: destroy the tcp listener (so we don't generate further callbacks) */ -static void destroy(grpc_server *server, void *statep, grpc_closure *callback, - grpc_closure_list *closure_list) { +static void +destroy (grpc_server * server, void *statep, grpc_closure * callback, grpc_closure_list * closure_list) +{ grpc_server_secure_state *state = statep; grpc_tcp_server *tcp; - gpr_mu_lock(&state->mu); + gpr_mu_lock (&state->mu); state->is_shutdown = 1; state->destroy_callback = callback; tcp = state->tcp; - gpr_mu_unlock(&state->mu); - grpc_closure_init(&state->destroy_closure, destroy_done, state); - grpc_tcp_server_destroy(tcp, &state->destroy_closure, closure_list); + gpr_mu_unlock (&state->mu); + grpc_closure_init (&state->destroy_closure, destroy_done, state); + grpc_tcp_server_destroy (tcp, &state->destroy_closure, closure_list); } -int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, - grpc_server_credentials *creds) { +int +grpc_server_add_secure_http2_port (grpc_server * server, const char *addr, grpc_server_credentials * creds) +{ grpc_resolved_addresses *resolved = NULL; grpc_tcp_server *tcp = NULL; grpc_server_secure_state *state = NULL; @@ -226,83 +237,92 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; /* create security context */ - if (creds == NULL) goto error; - status = grpc_server_credentials_create_security_connector(creds, &sc); - if (status != GRPC_SECURITY_OK) { - gpr_log(GPR_ERROR, - "Unable to create secure server with credentials of type %s.", - creds->type); + if (creds == NULL) goto error; - } + status = grpc_server_credentials_create_security_connector (creds, &sc); + if (status != GRPC_SECURITY_OK) + { + gpr_log (GPR_ERROR, "Unable to create secure server with credentials of type %s.", creds->type); + goto error; + } /* resolve address */ - resolved = grpc_blocking_resolve_address(addr, "https"); - if (!resolved) { - goto error; - } + resolved = grpc_blocking_resolve_address (addr, "https"); + if (!resolved) + { + goto error; + } - tcp = grpc_tcp_server_create(); - if (!tcp) { - goto error; - } + tcp = grpc_tcp_server_create (); + if (!tcp) + { + goto error; + } - for (i = 0; i < resolved->naddrs; i++) { - port_temp = grpc_tcp_server_add_port( - tcp, (struct sockaddr *)&resolved->addrs[i].addr, - resolved->addrs[i].len); - if (port_temp >= 0) { - if (port_num == -1) { - port_num = port_temp; - } else { - GPR_ASSERT(port_num == port_temp); - } - count++; + for (i = 0; i < resolved->naddrs; i++) + { + port_temp = grpc_tcp_server_add_port (tcp, (struct sockaddr *) &resolved->addrs[i].addr, resolved->addrs[i].len); + if (port_temp >= 0) + { + if (port_num == -1) + { + port_num = port_temp; + } + else + { + GPR_ASSERT (port_num == port_temp); + } + count++; + } } - } - if (count == 0) { - gpr_log(GPR_ERROR, "No address added out of total %d resolved", - resolved->naddrs); - goto error; - } - if (count != resolved->naddrs) { - gpr_log(GPR_ERROR, "Only %d addresses added out of total %d resolved", - count, resolved->naddrs); - /* if it's an error, don't we want to goto error; here ? */ - } - grpc_resolved_addresses_destroy(resolved); + if (count == 0) + { + gpr_log (GPR_ERROR, "No address added out of total %d resolved", resolved->naddrs); + goto error; + } + if (count != resolved->naddrs) + { + gpr_log (GPR_ERROR, "Only %d addresses added out of total %d resolved", count, resolved->naddrs); + /* if it's an error, don't we want to goto error; here ? */ + } + grpc_resolved_addresses_destroy (resolved); - state = gpr_malloc(sizeof(*state)); - memset(state, 0, sizeof(*state)); + state = gpr_malloc (sizeof (*state)); + memset (state, 0, sizeof (*state)); state->server = server; state->tcp = tcp; state->sc = sc; - state->creds = grpc_server_credentials_ref(creds); + state->creds = grpc_server_credentials_ref (creds); state->handshaking_tcp_endpoints = NULL; state->is_shutdown = 0; - gpr_mu_init(&state->mu); - gpr_ref_init(&state->refcount, 1); + gpr_mu_init (&state->mu); + gpr_ref_init (&state->refcount, 1); /* Register with the server only upon success */ - grpc_server_add_listener(server, state, start, destroy, &closure_list); + grpc_server_add_listener (server, state, start, destroy, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_closure_list_run (&closure_list); return port_num; /* Error path: cleanup and return */ error: - if (sc) { - GRPC_SECURITY_CONNECTOR_UNREF(sc, "server"); - } - if (resolved) { - grpc_resolved_addresses_destroy(resolved); - } - if (tcp) { - grpc_tcp_server_destroy(tcp, NULL, &closure_list); - } - if (state) { - gpr_free(state); - } - grpc_closure_list_run(&closure_list); + if (sc) + { + GRPC_SECURITY_CONNECTOR_UNREF (sc, "server"); + } + if (resolved) + { + grpc_resolved_addresses_destroy (resolved); + } + if (tcp) + { + grpc_tcp_server_destroy (tcp, NULL, &closure_list); + } + if (state) + { + gpr_free (state); + } + grpc_closure_list_run (&closure_list); return 0; } diff --git a/src/core/statistics/census_init.c b/src/core/statistics/census_init.c index e6306f5e6fa..abe1acf1709 100644 --- a/src/core/statistics/census_init.c +++ b/src/core/statistics/census_init.c @@ -37,12 +37,16 @@ #include "src/core/statistics/census_rpc_stats.h" #include "src/core/statistics/census_tracing.h" -void census_init(void) { - census_tracing_init(); - census_stats_store_init(); +void +census_init (void) +{ + census_tracing_init (); + census_stats_store_init (); } -void census_shutdown(void) { - census_stats_store_shutdown(); - census_tracing_shutdown(); +void +census_shutdown (void) +{ + census_stats_store_shutdown (); + census_tracing_shutdown (); } diff --git a/src/core/statistics/census_interface.h b/src/core/statistics/census_interface.h index ac1ff24866b..22b3cc8c883 100644 --- a/src/core/statistics/census_interface.h +++ b/src/core/statistics/census_interface.h @@ -41,7 +41,8 @@ /* Structure of a census op id. Define as structure because 64bit integer is not available on every platform for C89. */ -typedef struct census_op_id { +typedef struct census_op_id +{ gpr_uint32 upper; gpr_uint32 lower; } census_op_id; @@ -49,10 +50,10 @@ typedef struct census_op_id { typedef struct census_rpc_stats census_rpc_stats; /* Initializes Census library. No-op if Census is already initialized. */ -void census_init(void); +void census_init (void); /* Shutdown Census Library. */ -void census_shutdown(void); +void census_shutdown (void); /* Annotates grpc method name on a census_op_id. The method name has the format of /. Returns 0 iff @@ -61,16 +62,16 @@ void census_shutdown(void); TODO(hongyu): Figure out valid characters set for service name and command name and document requirements here.*/ -int census_add_method_tag(census_op_id op_id, const char* method_name); +int census_add_method_tag (census_op_id op_id, const char *method_name); /* Annotates tracing information to a specific op_id. Up to CENSUS_MAX_ANNOTATION_LENGTH bytes are recorded. */ -void census_tracing_print(census_op_id op_id, const char* annotation); +void census_tracing_print (census_op_id op_id, const char *annotation); /* Starts tracing for an RPC. Returns a locally unique census_op_id */ -census_op_id census_tracing_start_op(void); +census_op_id census_tracing_start_op (void); /* Ends tracing. Calling this function will invalidate the input op_id. */ -void census_tracing_end_op(census_op_id op_id); +void census_tracing_end_op (census_op_id op_id); #endif /* GRPC_INTERNAL_CORE_STATISTICS_CENSUS_INTERFACE_H */ diff --git a/src/core/statistics/census_log.c b/src/core/statistics/census_log.c index ec56ce38df7..16a9e28b1fb 100644 --- a/src/core/statistics/census_log.c +++ b/src/core/statistics/census_log.c @@ -101,15 +101,17 @@ /* End of platform specific code */ -typedef struct census_log_block_list_struct { - struct census_log_block_list_struct* next; - struct census_log_block_list_struct* prev; - struct census_log_block* block; +typedef struct census_log_block_list_struct +{ + struct census_log_block_list_struct *next; + struct census_log_block_list_struct *prev; + struct census_log_block *block; } cl_block_list_struct; -typedef struct census_log_block { +typedef struct census_log_block +{ /* Pointer to underlying buffer */ - char* buffer; + char *buffer; gpr_atm writer_lock; gpr_atm reader_lock; /* Keeps completely written bytes. Declared atomic because accessed @@ -146,14 +148,16 @@ typedef struct census_log_block { } cl_block; /* A list of cl_blocks, doubly-linked through cl_block::link. */ -typedef struct census_log_block_list { - gpr_int32 count; /* Number of items in list. */ - cl_block_list_struct ht; /* head/tail of linked list. */ +typedef struct census_log_block_list +{ + gpr_int32 count; /* Number of items in list. */ + cl_block_list_struct ht; /* head/tail of linked list. */ } cl_block_list; /* Cacheline aligned block pointers to avoid false sharing. Block pointer must be initialized via set_block(), before calling other functions */ -typedef struct census_log_core_local_block { +typedef struct census_log_core_local_block +{ gpr_atm block; /* Ensure cachline alignment: we assume sizeof(gpr_atm) == 4 or 8 */ #if defined(GPR_ARCH_64) @@ -170,26 +174,27 @@ typedef struct census_log_core_local_block { #endif } cl_core_local_block; -struct census_log { +struct census_log +{ int discard_old_records; /* Number of cores (aka hardware-contexts) */ unsigned num_cores; /* number of CENSUS_LOG_2_MAX_RECORD_SIZE blocks in log */ gpr_int32 num_blocks; - cl_block* blocks; /* Block metadata. */ - cl_core_local_block* core_local_blocks; /* Keeps core to block mappings. */ + cl_block *blocks; /* Block metadata. */ + cl_core_local_block *core_local_blocks; /* Keeps core to block mappings. */ gpr_mu lock; - int initialized; /* has log been initialized? */ + int initialized; /* has log been initialized? */ /* Keeps the state of the reader iterator. A value of 0 indicates that iterator has reached the end. census_log_init_reader() resets the value to num_core to restart iteration. */ gpr_uint32 read_iterator_state; /* Points to the block being read. If non-NULL, the block is locked for reading (block_being_read_->reader_lock is held). */ - cl_block* block_being_read; + cl_block *block_being_read; /* A non-zero value indicates that log is full. */ gpr_atm is_full; - char* buffer; + char *buffer; cl_block_list free_block_list; cl_block_list dirty_block_list; gpr_atm out_of_space_count; @@ -201,44 +206,61 @@ static struct census_log g_log; /* Functions that operate on an atomic memory location used as a lock */ /* Returns non-zero if lock is acquired */ -static int cl_try_lock(gpr_atm* lock) { return gpr_atm_acq_cas(lock, 0, 1); } +static int +cl_try_lock (gpr_atm * lock) +{ + return gpr_atm_acq_cas (lock, 0, 1); +} -static void cl_unlock(gpr_atm* lock) { gpr_atm_rel_store(lock, 0); } +static void +cl_unlock (gpr_atm * lock) +{ + gpr_atm_rel_store (lock, 0); +} /* Functions that operate on cl_core_local_block's */ -static void cl_core_local_block_set_block(cl_core_local_block* clb, - cl_block* block) { - gpr_atm_rel_store(&clb->block, (gpr_atm)block); +static void +cl_core_local_block_set_block (cl_core_local_block * clb, cl_block * block) +{ + gpr_atm_rel_store (&clb->block, (gpr_atm) block); } -static cl_block* cl_core_local_block_get_block(cl_core_local_block* clb) { - return (cl_block*)gpr_atm_acq_load(&clb->block); +static cl_block * +cl_core_local_block_get_block (cl_core_local_block * clb) +{ + return (cl_block *) gpr_atm_acq_load (&clb->block); } /* Functions that operate on cl_block_list_struct's */ -static void cl_block_list_struct_initialize(cl_block_list_struct* bls, - cl_block* block) { +static void +cl_block_list_struct_initialize (cl_block_list_struct * bls, cl_block * block) +{ bls->next = bls->prev = bls; bls->block = block; } /* Functions that operate on cl_block_list's */ -static void cl_block_list_initialize(cl_block_list* list) { +static void +cl_block_list_initialize (cl_block_list * list) +{ list->count = 0; - cl_block_list_struct_initialize(&list->ht, NULL); + cl_block_list_struct_initialize (&list->ht, NULL); } /* Returns head of *this, or NULL if empty. */ -static cl_block* cl_block_list_head(cl_block_list* list) { +static cl_block * +cl_block_list_head (cl_block_list * list) +{ return list->ht.next->block; } /* Insert element *e after *pos. */ -static void cl_block_list_insert(cl_block_list* list, cl_block_list_struct* pos, - cl_block_list_struct* e) { +static void +cl_block_list_insert (cl_block_list * list, cl_block_list_struct * pos, cl_block_list_struct * e) +{ list->count++; e->next = pos->next; e->prev = pos; @@ -247,17 +269,23 @@ static void cl_block_list_insert(cl_block_list* list, cl_block_list_struct* pos, } /* Insert block at the head of the list */ -static void cl_block_list_insert_at_head(cl_block_list* list, cl_block* block) { - cl_block_list_insert(list, &list->ht, &block->link); +static void +cl_block_list_insert_at_head (cl_block_list * list, cl_block * block) +{ + cl_block_list_insert (list, &list->ht, &block->link); } /* Insert block at the tail of the list */ -static void cl_block_list_insert_at_tail(cl_block_list* list, cl_block* block) { - cl_block_list_insert(list, list->ht.prev, &block->link); +static void +cl_block_list_insert_at_tail (cl_block_list * list, cl_block * block) +{ + cl_block_list_insert (list, list->ht.prev, &block->link); } /* Removes block *b. Requires *b be in the list. */ -static void cl_block_list_remove(cl_block_list* list, cl_block* b) { +static void +cl_block_list_remove (cl_block_list * list, cl_block * b) +{ list->count--; b->link.next->prev = b->link.prev; b->link.prev->next = b->link.next; @@ -265,23 +293,28 @@ static void cl_block_list_remove(cl_block_list* list, cl_block* b) { /* Functions that operate on cl_block's */ -static void cl_block_initialize(cl_block* block, char* buffer) { +static void +cl_block_initialize (cl_block * block, char *buffer) +{ block->buffer = buffer; - gpr_atm_rel_store(&block->writer_lock, 0); - gpr_atm_rel_store(&block->reader_lock, 0); - gpr_atm_rel_store(&block->bytes_committed, 0); + gpr_atm_rel_store (&block->writer_lock, 0); + gpr_atm_rel_store (&block->reader_lock, 0); + gpr_atm_rel_store (&block->bytes_committed, 0); block->bytes_read = 0; - cl_block_list_struct_initialize(&block->link, block); + cl_block_list_struct_initialize (&block->link, block); } /* Guards against exposing partially written buffer to the reader. */ -static void cl_block_set_bytes_committed(cl_block* block, - gpr_int32 bytes_committed) { - gpr_atm_rel_store(&block->bytes_committed, bytes_committed); +static void +cl_block_set_bytes_committed (cl_block * block, gpr_int32 bytes_committed) +{ + gpr_atm_rel_store (&block->bytes_committed, bytes_committed); } -static gpr_int32 cl_block_get_bytes_committed(cl_block* block) { - return gpr_atm_acq_load(&block->bytes_committed); +static gpr_int32 +cl_block_get_bytes_committed (cl_block * block) +{ + return gpr_atm_acq_load (&block->bytes_committed); } /* Tries to disable future read/write access to this block. Succeeds if: @@ -291,51 +324,62 @@ static gpr_int32 cl_block_get_bytes_committed(cl_block* block) { On success, clears the block state and returns with writer_lock_ and reader_lock_ held. These locks are released by a subsequent cl_block_access_enable() call. */ -static int cl_block_try_disable_access(cl_block* block, int discard_data) { - if (!cl_try_lock(&block->writer_lock)) { - return 0; - } - if (!cl_try_lock(&block->reader_lock)) { - cl_unlock(&block->writer_lock); - return 0; - } - if (!discard_data && - (block->bytes_read != cl_block_get_bytes_committed(block))) { - cl_unlock(&block->reader_lock); - cl_unlock(&block->writer_lock); - return 0; - } - cl_block_set_bytes_committed(block, 0); +static int +cl_block_try_disable_access (cl_block * block, int discard_data) +{ + if (!cl_try_lock (&block->writer_lock)) + { + return 0; + } + if (!cl_try_lock (&block->reader_lock)) + { + cl_unlock (&block->writer_lock); + return 0; + } + if (!discard_data && (block->bytes_read != cl_block_get_bytes_committed (block))) + { + cl_unlock (&block->reader_lock); + cl_unlock (&block->writer_lock); + return 0; + } + cl_block_set_bytes_committed (block, 0); block->bytes_read = 0; return 1; } -static void cl_block_enable_access(cl_block* block) { - cl_unlock(&block->reader_lock); - cl_unlock(&block->writer_lock); +static void +cl_block_enable_access (cl_block * block) +{ + cl_unlock (&block->reader_lock); + cl_unlock (&block->writer_lock); } /* Returns with writer_lock held. */ -static void* cl_block_start_write(cl_block* block, size_t size) { +static void * +cl_block_start_write (cl_block * block, size_t size) +{ gpr_int32 bytes_committed; - if (!cl_try_lock(&block->writer_lock)) { - return NULL; - } - bytes_committed = cl_block_get_bytes_committed(block); - if (bytes_committed + size > CENSUS_LOG_MAX_RECORD_SIZE) { - cl_unlock(&block->writer_lock); - return NULL; - } + if (!cl_try_lock (&block->writer_lock)) + { + return NULL; + } + bytes_committed = cl_block_get_bytes_committed (block); + if (bytes_committed + size > CENSUS_LOG_MAX_RECORD_SIZE) + { + cl_unlock (&block->writer_lock); + return NULL; + } return block->buffer + bytes_committed; } /* Releases writer_lock and increments committed bytes by 'bytes_written'. 'bytes_written' must be <= 'size' specified in the corresponding StartWrite() call. This function is thread-safe. */ -static void cl_block_end_write(cl_block* block, size_t bytes_written) { - cl_block_set_bytes_committed( - block, cl_block_get_bytes_committed(block) + bytes_written); - cl_unlock(&block->writer_lock); +static void +cl_block_end_write (cl_block * block, size_t bytes_written) +{ + cl_block_set_bytes_committed (block, cl_block_get_bytes_committed (block) + bytes_written); + cl_unlock (&block->writer_lock); } /* Returns a pointer to the first unread byte in buffer. The number of bytes @@ -343,49 +387,60 @@ static void cl_block_end_write(cl_block* block, size_t bytes_written) { released by a subsequent cl_block_end_read() call. Returns NULL if: - read in progress - no data available */ -static void* cl_block_start_read(cl_block* block, size_t* bytes_available) { - void* record; - if (!cl_try_lock(&block->reader_lock)) { - return NULL; - } +static void * +cl_block_start_read (cl_block * block, size_t * bytes_available) +{ + void *record; + if (!cl_try_lock (&block->reader_lock)) + { + return NULL; + } /* bytes_committed may change from under us. Use bytes_available to update bytes_read below. */ - *bytes_available = cl_block_get_bytes_committed(block) - block->bytes_read; - if (*bytes_available == 0) { - cl_unlock(&block->reader_lock); - return NULL; - } + *bytes_available = cl_block_get_bytes_committed (block) - block->bytes_read; + if (*bytes_available == 0) + { + cl_unlock (&block->reader_lock); + return NULL; + } record = block->buffer + block->bytes_read; block->bytes_read += *bytes_available; return record; } -static void cl_block_end_read(cl_block* block) { - cl_unlock(&block->reader_lock); +static void +cl_block_end_read (cl_block * block) +{ + cl_unlock (&block->reader_lock); } /* Internal functions operating on g_log */ /* Allocates a new free block (or recycles an available dirty block if log is configured to discard old records). Returns NULL if out-of-space. */ -static cl_block* cl_allocate_block(void) { - cl_block* block = cl_block_list_head(&g_log.free_block_list); - if (block != NULL) { - cl_block_list_remove(&g_log.free_block_list, block); - return block; - } - if (!g_log.discard_old_records) { - /* No free block and log is configured to keep old records. */ - return NULL; - } - /* Recycle dirty block. Start from the oldest. */ - for (block = cl_block_list_head(&g_log.dirty_block_list); block != NULL; - block = block->link.next->block) { - if (cl_block_try_disable_access(block, 1 /* discard data */)) { - cl_block_list_remove(&g_log.dirty_block_list, block); +static cl_block * +cl_allocate_block (void) +{ + cl_block *block = cl_block_list_head (&g_log.free_block_list); + if (block != NULL) + { + cl_block_list_remove (&g_log.free_block_list, block); return block; } - } + if (!g_log.discard_old_records) + { + /* No free block and log is configured to keep old records. */ + return NULL; + } + /* Recycle dirty block. Start from the oldest. */ + for (block = cl_block_list_head (&g_log.dirty_block_list); block != NULL; block = block->link.next->block) + { + if (cl_block_try_disable_access (block, 1 /* discard data */ )) + { + cl_block_list_remove (&g_log.dirty_block_list, block); + return block; + } + } return NULL; } @@ -395,210 +450,250 @@ static cl_block* cl_allocate_block(void) { - allocated a new block OR - 'core_id' => 'old_block' mapping changed (another thread allocated a block before lock was acquired). */ -static int cl_allocate_core_local_block(gpr_int32 core_id, - cl_block* old_block) { +static int +cl_allocate_core_local_block (gpr_int32 core_id, cl_block * old_block) +{ /* Now that we have the lock, check if core-local mapping has changed. */ - cl_core_local_block* core_local_block = &g_log.core_local_blocks[core_id]; - cl_block* block = cl_core_local_block_get_block(core_local_block); - if ((block != NULL) && (block != old_block)) { - return 1; - } - if (block != NULL) { - cl_core_local_block_set_block(core_local_block, NULL); - cl_block_list_insert_at_tail(&g_log.dirty_block_list, block); - } - block = cl_allocate_block(); - if (block == NULL) { - gpr_atm_rel_store(&g_log.is_full, 1); - return 0; - } - cl_core_local_block_set_block(core_local_block, block); - cl_block_enable_access(block); + cl_core_local_block *core_local_block = &g_log.core_local_blocks[core_id]; + cl_block *block = cl_core_local_block_get_block (core_local_block); + if ((block != NULL) && (block != old_block)) + { + return 1; + } + if (block != NULL) + { + cl_core_local_block_set_block (core_local_block, NULL); + cl_block_list_insert_at_tail (&g_log.dirty_block_list, block); + } + block = cl_allocate_block (); + if (block == NULL) + { + gpr_atm_rel_store (&g_log.is_full, 1); + return 0; + } + cl_core_local_block_set_block (core_local_block, block); + cl_block_enable_access (block); return 1; } -static cl_block* cl_get_block(void* record) { - gpr_uintptr p = (gpr_uintptr)((char*)record - g_log.buffer); +static cl_block * +cl_get_block (void *record) +{ + gpr_uintptr p = (gpr_uintptr) ((char *) record - g_log.buffer); gpr_uintptr index = p >> CENSUS_LOG_2_MAX_RECORD_SIZE; return &g_log.blocks[index]; } /* Gets the next block to read and tries to free 'prev' block (if not NULL). Returns NULL if reached the end. */ -static cl_block* cl_next_block_to_read(cl_block* prev) { - cl_block* block = NULL; - if (g_log.read_iterator_state == g_log.num_cores) { - /* We are traversing dirty list; find the next dirty block. */ - if (prev != NULL) { - /* Try to free the previous block if there is no unread data. This block - may have unread data if previously incomplete record completed between - read_next() calls. */ - block = prev->link.next->block; - if (cl_block_try_disable_access(prev, 0 /* do not discard data */)) { - cl_block_list_remove(&g_log.dirty_block_list, prev); - cl_block_list_insert_at_head(&g_log.free_block_list, prev); - gpr_atm_rel_store(&g_log.is_full, 0); - } - } else { - block = cl_block_list_head(&g_log.dirty_block_list); +static cl_block * +cl_next_block_to_read (cl_block * prev) +{ + cl_block *block = NULL; + if (g_log.read_iterator_state == g_log.num_cores) + { + /* We are traversing dirty list; find the next dirty block. */ + if (prev != NULL) + { + /* Try to free the previous block if there is no unread data. This block + may have unread data if previously incomplete record completed between + read_next() calls. */ + block = prev->link.next->block; + if (cl_block_try_disable_access (prev, 0 /* do not discard data */ )) + { + cl_block_list_remove (&g_log.dirty_block_list, prev); + cl_block_list_insert_at_head (&g_log.free_block_list, prev); + gpr_atm_rel_store (&g_log.is_full, 0); + } + } + else + { + block = cl_block_list_head (&g_log.dirty_block_list); + } + if (block != NULL) + { + return block; + } + /* We are done with the dirty list; moving on to core-local blocks. */ } - if (block != NULL) { - return block; - } - /* We are done with the dirty list; moving on to core-local blocks. */ - } - while (g_log.read_iterator_state > 0) { - g_log.read_iterator_state--; - block = cl_core_local_block_get_block( - &g_log.core_local_blocks[g_log.read_iterator_state]); - if (block != NULL) { - return block; + while (g_log.read_iterator_state > 0) + { + g_log.read_iterator_state--; + block = cl_core_local_block_get_block (&g_log.core_local_blocks[g_log.read_iterator_state]); + if (block != NULL) + { + return block; + } } - } return NULL; } /* External functions: primary stats_log interface */ -void census_log_initialize(size_t size_in_mb, int discard_old_records) { +void +census_log_initialize (size_t size_in_mb, int discard_old_records) +{ gpr_int32 ix; /* Check cacheline alignment. */ - GPR_ASSERT(sizeof(cl_block) % GPR_CACHELINE_SIZE == 0); - GPR_ASSERT(sizeof(cl_core_local_block) % GPR_CACHELINE_SIZE == 0); - GPR_ASSERT(!g_log.initialized); + GPR_ASSERT (sizeof (cl_block) % GPR_CACHELINE_SIZE == 0); + GPR_ASSERT (sizeof (cl_core_local_block) % GPR_CACHELINE_SIZE == 0); + GPR_ASSERT (!g_log.initialized); g_log.discard_old_records = discard_old_records; - g_log.num_cores = gpr_cpu_num_cores(); + g_log.num_cores = gpr_cpu_num_cores (); /* Ensure at least as many blocks as there are cores. */ - g_log.num_blocks = GPR_MAX( - g_log.num_cores, (size_in_mb << 20) >> CENSUS_LOG_2_MAX_RECORD_SIZE); - gpr_mu_init(&g_log.lock); + g_log.num_blocks = GPR_MAX (g_log.num_cores, (size_in_mb << 20) >> CENSUS_LOG_2_MAX_RECORD_SIZE); + gpr_mu_init (&g_log.lock); g_log.read_iterator_state = 0; g_log.block_being_read = NULL; - gpr_atm_rel_store(&g_log.is_full, 0); - g_log.core_local_blocks = (cl_core_local_block*)gpr_malloc_aligned( - g_log.num_cores * sizeof(cl_core_local_block), GPR_CACHELINE_SIZE_LOG); - memset(g_log.core_local_blocks, 0, - g_log.num_cores * sizeof(cl_core_local_block)); - g_log.blocks = (cl_block*)gpr_malloc_aligned( - g_log.num_blocks * sizeof(cl_block), GPR_CACHELINE_SIZE_LOG); - memset(g_log.blocks, 0, g_log.num_blocks * sizeof(cl_block)); - g_log.buffer = gpr_malloc(g_log.num_blocks * CENSUS_LOG_MAX_RECORD_SIZE); - memset(g_log.buffer, 0, g_log.num_blocks * CENSUS_LOG_MAX_RECORD_SIZE); - cl_block_list_initialize(&g_log.free_block_list); - cl_block_list_initialize(&g_log.dirty_block_list); - for (ix = 0; ix < g_log.num_blocks; ++ix) { - cl_block* block = g_log.blocks + ix; - cl_block_initialize(block, - g_log.buffer + (CENSUS_LOG_MAX_RECORD_SIZE * ix)); - cl_block_try_disable_access(block, 1 /* discard data */); - cl_block_list_insert_at_tail(&g_log.free_block_list, block); - } - gpr_atm_rel_store(&g_log.out_of_space_count, 0); + gpr_atm_rel_store (&g_log.is_full, 0); + g_log.core_local_blocks = (cl_core_local_block *) gpr_malloc_aligned (g_log.num_cores * sizeof (cl_core_local_block), GPR_CACHELINE_SIZE_LOG); + memset (g_log.core_local_blocks, 0, g_log.num_cores * sizeof (cl_core_local_block)); + g_log.blocks = (cl_block *) gpr_malloc_aligned (g_log.num_blocks * sizeof (cl_block), GPR_CACHELINE_SIZE_LOG); + memset (g_log.blocks, 0, g_log.num_blocks * sizeof (cl_block)); + g_log.buffer = gpr_malloc (g_log.num_blocks * CENSUS_LOG_MAX_RECORD_SIZE); + memset (g_log.buffer, 0, g_log.num_blocks * CENSUS_LOG_MAX_RECORD_SIZE); + cl_block_list_initialize (&g_log.free_block_list); + cl_block_list_initialize (&g_log.dirty_block_list); + for (ix = 0; ix < g_log.num_blocks; ++ix) + { + cl_block *block = g_log.blocks + ix; + cl_block_initialize (block, g_log.buffer + (CENSUS_LOG_MAX_RECORD_SIZE * ix)); + cl_block_try_disable_access (block, 1 /* discard data */ ); + cl_block_list_insert_at_tail (&g_log.free_block_list, block); + } + gpr_atm_rel_store (&g_log.out_of_space_count, 0); g_log.initialized = 1; } -void census_log_shutdown(void) { - GPR_ASSERT(g_log.initialized); - gpr_mu_destroy(&g_log.lock); - gpr_free_aligned(g_log.core_local_blocks); +void +census_log_shutdown (void) +{ + GPR_ASSERT (g_log.initialized); + gpr_mu_destroy (&g_log.lock); + gpr_free_aligned (g_log.core_local_blocks); g_log.core_local_blocks = NULL; - gpr_free_aligned(g_log.blocks); + gpr_free_aligned (g_log.blocks); g_log.blocks = NULL; - gpr_free(g_log.buffer); + gpr_free (g_log.buffer); g_log.buffer = NULL; g_log.initialized = 0; } -void* census_log_start_write(size_t size) { +void * +census_log_start_write (size_t size) +{ /* Used to bound number of times block allocation is attempted. */ gpr_int32 attempts_remaining = g_log.num_blocks; /* TODO(aveitch): move this inside the do loop when current_cpu is fixed */ - gpr_int32 core_id = gpr_cpu_current_cpu(); - GPR_ASSERT(g_log.initialized); - if (size > CENSUS_LOG_MAX_RECORD_SIZE) { - return NULL; - } - do { - int allocated; - void* record = NULL; - cl_block* block = - cl_core_local_block_get_block(&g_log.core_local_blocks[core_id]); - if (block && (record = cl_block_start_write(block, size))) { - return record; - } - /* Need to allocate a new block. We are here if: - - No block associated with the core OR - - Write in-progress on the block OR - - block is out of space */ - if (gpr_atm_acq_load(&g_log.is_full)) { - gpr_atm_no_barrier_fetch_add(&g_log.out_of_space_count, 1); + gpr_int32 core_id = gpr_cpu_current_cpu (); + GPR_ASSERT (g_log.initialized); + if (size > CENSUS_LOG_MAX_RECORD_SIZE) + { return NULL; } - gpr_mu_lock(&g_log.lock); - allocated = cl_allocate_core_local_block(core_id, block); - gpr_mu_unlock(&g_log.lock); - if (!allocated) { - gpr_atm_no_barrier_fetch_add(&g_log.out_of_space_count, 1); - return NULL; + do + { + int allocated; + void *record = NULL; + cl_block *block = cl_core_local_block_get_block (&g_log.core_local_blocks[core_id]); + if (block && (record = cl_block_start_write (block, size))) + { + return record; + } + /* Need to allocate a new block. We are here if: + - No block associated with the core OR + - Write in-progress on the block OR + - block is out of space */ + if (gpr_atm_acq_load (&g_log.is_full)) + { + gpr_atm_no_barrier_fetch_add (&g_log.out_of_space_count, 1); + return NULL; + } + gpr_mu_lock (&g_log.lock); + allocated = cl_allocate_core_local_block (core_id, block); + gpr_mu_unlock (&g_log.lock); + if (!allocated) + { + gpr_atm_no_barrier_fetch_add (&g_log.out_of_space_count, 1); + return NULL; + } } - } while (attempts_remaining--); + while (attempts_remaining--); /* Give up. */ - gpr_atm_no_barrier_fetch_add(&g_log.out_of_space_count, 1); + gpr_atm_no_barrier_fetch_add (&g_log.out_of_space_count, 1); return NULL; } -void census_log_end_write(void* record, size_t bytes_written) { - GPR_ASSERT(g_log.initialized); - cl_block_end_write(cl_get_block(record), bytes_written); +void +census_log_end_write (void *record, size_t bytes_written) +{ + GPR_ASSERT (g_log.initialized); + cl_block_end_write (cl_get_block (record), bytes_written); } -void census_log_init_reader(void) { - GPR_ASSERT(g_log.initialized); - gpr_mu_lock(&g_log.lock); +void +census_log_init_reader (void) +{ + GPR_ASSERT (g_log.initialized); + gpr_mu_lock (&g_log.lock); /* If a block is locked for reading unlock it. */ - if (g_log.block_being_read != NULL) { - cl_block_end_read(g_log.block_being_read); - g_log.block_being_read = NULL; - } + if (g_log.block_being_read != NULL) + { + cl_block_end_read (g_log.block_being_read); + g_log.block_being_read = NULL; + } g_log.read_iterator_state = g_log.num_cores; - gpr_mu_unlock(&g_log.lock); -} - -const void* census_log_read_next(size_t* bytes_available) { - GPR_ASSERT(g_log.initialized); - gpr_mu_lock(&g_log.lock); - if (g_log.block_being_read != NULL) { - cl_block_end_read(g_log.block_being_read); - } - do { - g_log.block_being_read = cl_next_block_to_read(g_log.block_being_read); - if (g_log.block_being_read != NULL) { - void* record = - cl_block_start_read(g_log.block_being_read, bytes_available); - if (record != NULL) { - gpr_mu_unlock(&g_log.lock); - return record; - } + gpr_mu_unlock (&g_log.lock); +} + +const void * +census_log_read_next (size_t * bytes_available) +{ + GPR_ASSERT (g_log.initialized); + gpr_mu_lock (&g_log.lock); + if (g_log.block_being_read != NULL) + { + cl_block_end_read (g_log.block_being_read); + } + do + { + g_log.block_being_read = cl_next_block_to_read (g_log.block_being_read); + if (g_log.block_being_read != NULL) + { + void *record = cl_block_start_read (g_log.block_being_read, bytes_available); + if (record != NULL) + { + gpr_mu_unlock (&g_log.lock); + return record; + } + } } - } while (g_log.block_being_read != NULL); - gpr_mu_unlock(&g_log.lock); + while (g_log.block_being_read != NULL); + gpr_mu_unlock (&g_log.lock); return NULL; } -size_t census_log_remaining_space(void) { +size_t +census_log_remaining_space (void) +{ size_t space; - GPR_ASSERT(g_log.initialized); - gpr_mu_lock(&g_log.lock); - if (g_log.discard_old_records) { - /* Remaining space is not meaningful; just return the entire log space. */ - space = g_log.num_blocks << CENSUS_LOG_2_MAX_RECORD_SIZE; - } else { - space = g_log.free_block_list.count * CENSUS_LOG_MAX_RECORD_SIZE; - } - gpr_mu_unlock(&g_log.lock); + GPR_ASSERT (g_log.initialized); + gpr_mu_lock (&g_log.lock); + if (g_log.discard_old_records) + { + /* Remaining space is not meaningful; just return the entire log space. */ + space = g_log.num_blocks << CENSUS_LOG_2_MAX_RECORD_SIZE; + } + else + { + space = g_log.free_block_list.count * CENSUS_LOG_MAX_RECORD_SIZE; + } + gpr_mu_unlock (&g_log.lock); return space; } -int census_log_out_of_space_count(void) { - GPR_ASSERT(g_log.initialized); - return gpr_atm_acq_load(&g_log.out_of_space_count); +int +census_log_out_of_space_count (void) +{ + GPR_ASSERT (g_log.initialized); + return gpr_atm_acq_load (&g_log.out_of_space_count); } diff --git a/src/core/statistics/census_log.h b/src/core/statistics/census_log.h index 60b6d597dff..3c0c2dc52da 100644 --- a/src/core/statistics/census_log.h +++ b/src/core/statistics/census_log.h @@ -37,7 +37,7 @@ #include /* Maximum record size, in bytes. */ -#define CENSUS_LOG_2_MAX_RECORD_SIZE 14 /* 2^14 = 16KB */ +#define CENSUS_LOG_2_MAX_RECORD_SIZE 14 /* 2^14 = 16KB */ #define CENSUS_LOG_MAX_RECORD_SIZE (1 << CENSUS_LOG_2_MAX_RECORD_SIZE) /* Initialize the statistics logging subsystem with the given log size. A log @@ -47,13 +47,13 @@ when the log is full. This function must be called before any other census_log functions. */ -void census_log_initialize(size_t size_in_mb, int discard_old_records); +void census_log_initialize (size_t size_in_mb, int discard_old_records); /* Shutdown the logging subsystem. Caller must ensure that: - no in progress or future call to any census_log functions - no incomplete records */ -void census_log_shutdown(void); +void census_log_shutdown (void); /* Allocates and returns a 'size' bytes record and marks it in use. A subsequent census_log_end_write() marks the record complete. The @@ -62,9 +62,9 @@ void census_log_shutdown(void); - log is configured to keep old records OR - all blocks are pinned by incomplete records. */ -void* census_log_start_write(size_t size); +void *census_log_start_write (size_t size); -void census_log_end_write(void* record, size_t bytes_written); +void census_log_end_write (void *record, size_t bytes_written); /* census_log_read_next() iterates over blocks with data and for each block returns a pointer to the first unread byte. The number of bytes that can be @@ -74,18 +74,18 @@ void census_log_end_write(void* record, size_t bytes_written); is read. census_log_init_reader() starts the iteration or aborts the current iteration. */ -void census_log_init_reader(void); -const void* census_log_read_next(size_t* bytes_available); +void census_log_init_reader (void); +const void *census_log_read_next (size_t * bytes_available); /* Returns estimated remaining space across all blocks, in bytes. If log is configured to discard old records, returns total log space. Otherwise, returns space available in empty blocks (partially filled blocks are treated as full). */ -size_t census_log_remaining_space(void); +size_t census_log_remaining_space (void); /* Returns the number of times gprc_stats_log_start_write() failed due to out-of-space. */ -int census_log_out_of_space_count(void); +int census_log_out_of_space_count (void); #endif /* GRPC_INTERNAL_CORE_STATISTICS_CENSUS_LOG_H */ diff --git a/src/core/statistics/census_rpc_stats.c b/src/core/statistics/census_rpc_stats.c index b836987cf08..87e05e19f26 100644 --- a/src/core/statistics/census_rpc_stats.c +++ b/src/core/statistics/census_rpc_stats.c @@ -56,46 +56,65 @@ typedef census_per_method_rpc_stats per_method_stats; static gpr_once g_stats_store_mu_init = GPR_ONCE_INIT; /* Guards two stats stores. */ static gpr_mu g_mu; -static census_ht* g_client_stats_store = NULL; -static census_ht* g_server_stats_store = NULL; +static census_ht *g_client_stats_store = NULL; +static census_ht *g_server_stats_store = NULL; -static void init_mutex(void) { gpr_mu_init(&g_mu); } +static void +init_mutex (void) +{ + gpr_mu_init (&g_mu); +} -static void init_mutex_once(void) { - gpr_once_init(&g_stats_store_mu_init, init_mutex); +static void +init_mutex_once (void) +{ + gpr_once_init (&g_stats_store_mu_init, init_mutex); } -static int cmp_str_keys(const void* k1, const void* k2) { - return strcmp((const char*)k1, (const char*)k2); +static int +cmp_str_keys (const void *k1, const void *k2) +{ + return strcmp ((const char *) k1, (const char *) k2); } /* TODO(hongyu): replace it with cityhash64 */ -static gpr_uint64 simple_hash(const void* k) { - size_t len = strlen(k); - gpr_uint64 higher = gpr_murmur_hash3((const char*)k, len / 2, 0); - return higher << 32 | - gpr_murmur_hash3((const char*)k + len / 2, len - len / 2, 0); +static gpr_uint64 +simple_hash (const void *k) +{ + size_t len = strlen (k); + gpr_uint64 higher = gpr_murmur_hash3 ((const char *) k, len / 2, 0); + return higher << 32 | gpr_murmur_hash3 ((const char *) k + len / 2, len - len / 2, 0); } -static void delete_stats(void* stats) { - census_window_stats_destroy((struct census_window_stats*)stats); +static void +delete_stats (void *stats) +{ + census_window_stats_destroy ((struct census_window_stats *) stats); } -static void delete_key(void* key) { gpr_free(key); } +static void +delete_key (void *key) +{ + gpr_free (key); +} static const census_ht_option ht_opt = { - CENSUS_HT_POINTER /* key type */, 1999 /* n_of_buckets */, - simple_hash /* hash function */, cmp_str_keys /* key comparator */, - delete_stats /* data deleter */, delete_key /* key deleter */ + CENSUS_HT_POINTER /* key type */ , 1999 /* n_of_buckets */ , + simple_hash /* hash function */ , cmp_str_keys /* key comparator */ , + delete_stats /* data deleter */ , delete_key /* key deleter */ }; -static void init_rpc_stats(void* stats) { - memset(stats, 0, sizeof(census_rpc_stats)); +static void +init_rpc_stats (void *stats) +{ + memset (stats, 0, sizeof (census_rpc_stats)); } -static void stat_add_proportion(double p, void* base, const void* addme) { - census_rpc_stats* b = (census_rpc_stats*)base; - census_rpc_stats* a = (census_rpc_stats*)addme; +static void +stat_add_proportion (double p, void *base, const void *addme) +{ + census_rpc_stats *b = (census_rpc_stats *) base; + census_rpc_stats *a = (census_rpc_stats *) addme; b->cnt += p * a->cnt; b->rpc_error_cnt += p * a->rpc_error_cnt; b->app_error_cnt += p * a->app_error_cnt; @@ -106,147 +125,186 @@ static void stat_add_proportion(double p, void* base, const void* addme) { b->wire_response_bytes += p * a->wire_response_bytes; } -static void stat_add(void* base, const void* addme) { - stat_add_proportion(1.0, base, addme); +static void +stat_add (void *base, const void *addme) +{ + stat_add_proportion (1.0, base, addme); } static gpr_timespec min_hour_total_intervals[3] = { - {60, 0}, {3600, 0}, {36000000, 0}}; + {60, 0}, {3600, 0}, {36000000, 0} +}; static const census_window_stats_stat_info window_stats_settings = { - sizeof(census_rpc_stats), init_rpc_stats, stat_add, stat_add_proportion}; + sizeof (census_rpc_stats), init_rpc_stats, stat_add, stat_add_proportion +}; -census_rpc_stats* census_rpc_stats_create_empty(void) { - census_rpc_stats* ret = - (census_rpc_stats*)gpr_malloc(sizeof(census_rpc_stats)); - memset(ret, 0, sizeof(census_rpc_stats)); +census_rpc_stats * +census_rpc_stats_create_empty (void) +{ + census_rpc_stats *ret = (census_rpc_stats *) gpr_malloc (sizeof (census_rpc_stats)); + memset (ret, 0, sizeof (census_rpc_stats)); return ret; } -void census_aggregated_rpc_stats_set_empty(census_aggregated_rpc_stats* data) { +void +census_aggregated_rpc_stats_set_empty (census_aggregated_rpc_stats * data) +{ int i = 0; - for (i = 0; i < data->num_entries; i++) { - if (data->stats[i].method != NULL) { - gpr_free((void*)data->stats[i].method); + for (i = 0; i < data->num_entries; i++) + { + if (data->stats[i].method != NULL) + { + gpr_free ((void *) data->stats[i].method); + } + } + if (data->stats != NULL) + { + gpr_free (data->stats); } - } - if (data->stats != NULL) { - gpr_free(data->stats); - } data->num_entries = 0; data->stats = NULL; } -static void record_stats(census_ht* store, census_op_id op_id, - const census_rpc_stats* stats) { - gpr_mu_lock(&g_mu); - if (store != NULL) { - census_trace_obj* trace = NULL; - census_internal_lock_trace_store(); - trace = census_get_trace_obj_locked(op_id); - if (trace != NULL) { - const char* method_name = census_get_trace_method_name(trace); - struct census_window_stats* window_stats = NULL; - census_ht_key key; - key.ptr = (void*)method_name; - window_stats = census_ht_find(store, key); - census_internal_unlock_trace_store(); - if (window_stats == NULL) { - window_stats = census_window_stats_create(3, min_hour_total_intervals, - 30, &window_stats_settings); - key.ptr = gpr_strdup(key.ptr); - census_ht_insert(store, key, (void*)window_stats); - } - census_window_stats_add(window_stats, gpr_now(GPR_CLOCK_REALTIME), stats); - } else { - census_internal_unlock_trace_store(); +static void +record_stats (census_ht * store, census_op_id op_id, const census_rpc_stats * stats) +{ + gpr_mu_lock (&g_mu); + if (store != NULL) + { + census_trace_obj *trace = NULL; + census_internal_lock_trace_store (); + trace = census_get_trace_obj_locked (op_id); + if (trace != NULL) + { + const char *method_name = census_get_trace_method_name (trace); + struct census_window_stats *window_stats = NULL; + census_ht_key key; + key.ptr = (void *) method_name; + window_stats = census_ht_find (store, key); + census_internal_unlock_trace_store (); + if (window_stats == NULL) + { + window_stats = census_window_stats_create (3, min_hour_total_intervals, 30, &window_stats_settings); + key.ptr = gpr_strdup (key.ptr); + census_ht_insert (store, key, (void *) window_stats); + } + census_window_stats_add (window_stats, gpr_now (GPR_CLOCK_REALTIME), stats); + } + else + { + census_internal_unlock_trace_store (); + } } - } - gpr_mu_unlock(&g_mu); + gpr_mu_unlock (&g_mu); } -void census_record_rpc_client_stats(census_op_id op_id, - const census_rpc_stats* stats) { - record_stats(g_client_stats_store, op_id, stats); +void +census_record_rpc_client_stats (census_op_id op_id, const census_rpc_stats * stats) +{ + record_stats (g_client_stats_store, op_id, stats); } -void census_record_rpc_server_stats(census_op_id op_id, - const census_rpc_stats* stats) { - record_stats(g_server_stats_store, op_id, stats); +void +census_record_rpc_server_stats (census_op_id op_id, const census_rpc_stats * stats) +{ + record_stats (g_server_stats_store, op_id, stats); } /* Get stats from input stats store */ -static void get_stats(census_ht* store, census_aggregated_rpc_stats* data) { - GPR_ASSERT(data != NULL); - if (data->num_entries != 0) { - census_aggregated_rpc_stats_set_empty(data); - } - gpr_mu_lock(&g_mu); - if (store != NULL) { - size_t n; - unsigned i, j; - gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); - census_ht_kv* kv = census_ht_get_all_elements(store, &n); - if (kv != NULL) { - data->num_entries = n; - data->stats = (per_method_stats*)gpr_malloc(sizeof(per_method_stats) * n); - for (i = 0; i < n; i++) { - census_window_stats_sums sums[NUM_INTERVALS]; - for (j = 0; j < NUM_INTERVALS; j++) { - sums[j].statistic = (void*)census_rpc_stats_create_empty(); - } - data->stats[i].method = gpr_strdup(kv[i].k.ptr); - census_window_stats_get_sums(kv[i].v, now, sums); - data->stats[i].minute_stats = - *(census_rpc_stats*)sums[MINUTE_INTERVAL].statistic; - data->stats[i].hour_stats = - *(census_rpc_stats*)sums[HOUR_INTERVAL].statistic; - data->stats[i].total_stats = - *(census_rpc_stats*)sums[TOTAL_INTERVAL].statistic; - for (j = 0; j < NUM_INTERVALS; j++) { - gpr_free(sums[j].statistic); - } - } - gpr_free(kv); +static void +get_stats (census_ht * store, census_aggregated_rpc_stats * data) +{ + GPR_ASSERT (data != NULL); + if (data->num_entries != 0) + { + census_aggregated_rpc_stats_set_empty (data); + } + gpr_mu_lock (&g_mu); + if (store != NULL) + { + size_t n; + unsigned i, j; + gpr_timespec now = gpr_now (GPR_CLOCK_REALTIME); + census_ht_kv *kv = census_ht_get_all_elements (store, &n); + if (kv != NULL) + { + data->num_entries = n; + data->stats = (per_method_stats *) gpr_malloc (sizeof (per_method_stats) * n); + for (i = 0; i < n; i++) + { + census_window_stats_sums sums[NUM_INTERVALS]; + for (j = 0; j < NUM_INTERVALS; j++) + { + sums[j].statistic = (void *) census_rpc_stats_create_empty (); + } + data->stats[i].method = gpr_strdup (kv[i].k.ptr); + census_window_stats_get_sums (kv[i].v, now, sums); + data->stats[i].minute_stats = *(census_rpc_stats *) sums[MINUTE_INTERVAL].statistic; + data->stats[i].hour_stats = *(census_rpc_stats *) sums[HOUR_INTERVAL].statistic; + data->stats[i].total_stats = *(census_rpc_stats *) sums[TOTAL_INTERVAL].statistic; + for (j = 0; j < NUM_INTERVALS; j++) + { + gpr_free (sums[j].statistic); + } + } + gpr_free (kv); + } + } + gpr_mu_unlock (&g_mu); +} + +void +census_get_client_stats (census_aggregated_rpc_stats * data) +{ + get_stats (g_client_stats_store, data); +} + +void +census_get_server_stats (census_aggregated_rpc_stats * data) +{ + get_stats (g_server_stats_store, data); +} + +void +census_stats_store_init (void) +{ + init_mutex_once (); + gpr_mu_lock (&g_mu); + if (g_client_stats_store == NULL && g_server_stats_store == NULL) + { + g_client_stats_store = census_ht_create (&ht_opt); + g_server_stats_store = census_ht_create (&ht_opt); + } + else + { + gpr_log (GPR_ERROR, "Census stats store already initialized."); + } + gpr_mu_unlock (&g_mu); +} + +void +census_stats_store_shutdown (void) +{ + init_mutex_once (); + gpr_mu_lock (&g_mu); + if (g_client_stats_store != NULL) + { + census_ht_destroy (g_client_stats_store); + g_client_stats_store = NULL; + } + else + { + gpr_log (GPR_ERROR, "Census server stats store not initialized."); + } + if (g_server_stats_store != NULL) + { + census_ht_destroy (g_server_stats_store); + g_server_stats_store = NULL; + } + else + { + gpr_log (GPR_ERROR, "Census client stats store not initialized."); } - } - gpr_mu_unlock(&g_mu); -} - -void census_get_client_stats(census_aggregated_rpc_stats* data) { - get_stats(g_client_stats_store, data); -} - -void census_get_server_stats(census_aggregated_rpc_stats* data) { - get_stats(g_server_stats_store, data); -} - -void census_stats_store_init(void) { - init_mutex_once(); - gpr_mu_lock(&g_mu); - if (g_client_stats_store == NULL && g_server_stats_store == NULL) { - g_client_stats_store = census_ht_create(&ht_opt); - g_server_stats_store = census_ht_create(&ht_opt); - } else { - gpr_log(GPR_ERROR, "Census stats store already initialized."); - } - gpr_mu_unlock(&g_mu); -} - -void census_stats_store_shutdown(void) { - init_mutex_once(); - gpr_mu_lock(&g_mu); - if (g_client_stats_store != NULL) { - census_ht_destroy(g_client_stats_store); - g_client_stats_store = NULL; - } else { - gpr_log(GPR_ERROR, "Census server stats store not initialized."); - } - if (g_server_stats_store != NULL) { - census_ht_destroy(g_server_stats_store); - g_server_stats_store = NULL; - } else { - gpr_log(GPR_ERROR, "Census client stats store not initialized."); - } - gpr_mu_unlock(&g_mu); + gpr_mu_unlock (&g_mu); } diff --git a/src/core/statistics/census_rpc_stats.h b/src/core/statistics/census_rpc_stats.h index aec31c19717..7119699f6ea 100644 --- a/src/core/statistics/census_rpc_stats.h +++ b/src/core/statistics/census_rpc_stats.h @@ -38,45 +38,47 @@ #include #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif -struct census_rpc_stats { - gpr_uint64 cnt; - gpr_uint64 rpc_error_cnt; - gpr_uint64 app_error_cnt; - double elapsed_time_ms; - double api_request_bytes; - double wire_request_bytes; - double api_response_bytes; - double wire_response_bytes; -}; + struct census_rpc_stats + { + gpr_uint64 cnt; + gpr_uint64 rpc_error_cnt; + gpr_uint64 app_error_cnt; + double elapsed_time_ms; + double api_request_bytes; + double wire_request_bytes; + double api_response_bytes; + double wire_response_bytes; + }; /* Creates an empty rpc stats object on heap. */ -census_rpc_stats* census_rpc_stats_create_empty(void); - -typedef struct census_per_method_rpc_stats { - const char* method; - census_rpc_stats minute_stats; /* cumulative stats in the past minute */ - census_rpc_stats hour_stats; /* cumulative stats in the past hour */ - census_rpc_stats total_stats; /* cumulative stats from last gc */ -} census_per_method_rpc_stats; - -typedef struct census_aggregated_rpc_stats { - int num_entries; - census_per_method_rpc_stats* stats; -} census_aggregated_rpc_stats; + census_rpc_stats *census_rpc_stats_create_empty (void); + + typedef struct census_per_method_rpc_stats + { + const char *method; + census_rpc_stats minute_stats; /* cumulative stats in the past minute */ + census_rpc_stats hour_stats; /* cumulative stats in the past hour */ + census_rpc_stats total_stats; /* cumulative stats from last gc */ + } census_per_method_rpc_stats; + + typedef struct census_aggregated_rpc_stats + { + int num_entries; + census_per_method_rpc_stats *stats; + } census_aggregated_rpc_stats; /* Initializes an aggregated rpc stats object to an empty state. */ -void census_aggregated_rpc_stats_set_empty(census_aggregated_rpc_stats* data); + void census_aggregated_rpc_stats_set_empty (census_aggregated_rpc_stats * data); /* Records client side stats of a rpc. */ -void census_record_rpc_client_stats(census_op_id op_id, - const census_rpc_stats* stats); + void census_record_rpc_client_stats (census_op_id op_id, const census_rpc_stats * stats); /* Records server side stats of a rpc. */ -void census_record_rpc_server_stats(census_op_id op_id, - const census_rpc_stats* stats); + void census_record_rpc_server_stats (census_op_id op_id, const census_rpc_stats * stats); /* The following two functions are intended for inprocess query of per-service per-method stats from grpc implementations. */ @@ -84,18 +86,18 @@ void census_record_rpc_server_stats(census_op_id op_id, /* Populates *data_map with server side aggregated per-service per-method stats. DO NOT CALL from outside of grpc code. */ -void census_get_server_stats(census_aggregated_rpc_stats* data_map); + void census_get_server_stats (census_aggregated_rpc_stats * data_map); /* Populates *data_map with client side aggregated per-service per-method stats. DO NOT CALL from outside of grpc code. */ -void census_get_client_stats(census_aggregated_rpc_stats* data_map); + void census_get_client_stats (census_aggregated_rpc_stats * data_map); -void census_stats_store_init(void); -void census_stats_store_shutdown(void); + void census_stats_store_init (void); + void census_stats_store_shutdown (void); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_STATISTICS_CENSUS_RPC_STATS_H */ +#endif /* GRPC_INTERNAL_CORE_STATISTICS_CENSUS_RPC_STATS_H */ diff --git a/src/core/statistics/census_tracing.c b/src/core/statistics/census_tracing.c index f2a09dc06e6..f914cae1b04 100644 --- a/src/core/statistics/census_tracing.c +++ b/src/core/statistics/census_tracing.c @@ -44,197 +44,255 @@ #include #include -void census_trace_obj_destroy(census_trace_obj* obj) { - census_trace_annotation* p = obj->annotations; - while (p != NULL) { - census_trace_annotation* next = p->next; - gpr_free(p); - p = next; - } - gpr_free(obj->method); - gpr_free(obj); +void +census_trace_obj_destroy (census_trace_obj * obj) +{ + census_trace_annotation *p = obj->annotations; + while (p != NULL) + { + census_trace_annotation *next = p->next; + gpr_free (p); + p = next; + } + gpr_free (obj->method); + gpr_free (obj); } -static void delete_trace_obj(void* obj) { - census_trace_obj_destroy((census_trace_obj*)obj); +static void +delete_trace_obj (void *obj) +{ + census_trace_obj_destroy ((census_trace_obj *) obj); } static const census_ht_option ht_opt = { - CENSUS_HT_UINT64 /* key type*/, - 571 /* n_of_buckets */, - NULL /* hash */, - NULL /* compare_keys */, - delete_trace_obj /* delete data */, - NULL /* delete key */ + CENSUS_HT_UINT64 /* key type */ , + 571 /* n_of_buckets */ , + NULL /* hash */ , + NULL /* compare_keys */ , + delete_trace_obj /* delete data */ , + NULL /* delete key */ }; static gpr_once g_init_mutex_once = GPR_ONCE_INIT; -static gpr_mu g_mu; /* Guards following two static variables. */ -static census_ht* g_trace_store = NULL; +static gpr_mu g_mu; /* Guards following two static variables. */ +static census_ht *g_trace_store = NULL; static gpr_uint64 g_id = 0; -static census_ht_key op_id_as_key(census_op_id* id) { - return *(census_ht_key*)id; +static census_ht_key +op_id_as_key (census_op_id * id) +{ + return *(census_ht_key *) id; } -static gpr_uint64 op_id_2_uint64(census_op_id* id) { +static gpr_uint64 +op_id_2_uint64 (census_op_id * id) +{ gpr_uint64 ret; - memcpy(&ret, id, sizeof(census_op_id)); + memcpy (&ret, id, sizeof (census_op_id)); return ret; } -static void init_mutex(void) { gpr_mu_init(&g_mu); } +static void +init_mutex (void) +{ + gpr_mu_init (&g_mu); +} -static void init_mutex_once(void) { - gpr_once_init(&g_init_mutex_once, init_mutex); +static void +init_mutex_once (void) +{ + gpr_once_init (&g_init_mutex_once, init_mutex); } -census_op_id census_tracing_start_op(void) { - gpr_mu_lock(&g_mu); +census_op_id +census_tracing_start_op (void) +{ + gpr_mu_lock (&g_mu); { - census_trace_obj* ret = gpr_malloc(sizeof(census_trace_obj)); - memset(ret, 0, sizeof(census_trace_obj)); + census_trace_obj *ret = gpr_malloc (sizeof (census_trace_obj)); + memset (ret, 0, sizeof (census_trace_obj)); g_id++; - memcpy(&ret->id, &g_id, sizeof(census_op_id)); + memcpy (&ret->id, &g_id, sizeof (census_op_id)); ret->rpc_stats.cnt = 1; - ret->ts = gpr_now(GPR_CLOCK_REALTIME); - census_ht_insert(g_trace_store, op_id_as_key(&ret->id), (void*)ret); - gpr_log(GPR_DEBUG, "Start tracing for id %lu", g_id); - gpr_mu_unlock(&g_mu); + ret->ts = gpr_now (GPR_CLOCK_REALTIME); + census_ht_insert (g_trace_store, op_id_as_key (&ret->id), (void *) ret); + gpr_log (GPR_DEBUG, "Start tracing for id %lu", g_id); + gpr_mu_unlock (&g_mu); return ret->id; } } -int census_add_method_tag(census_op_id op_id, const char* method) { +int +census_add_method_tag (census_op_id op_id, const char *method) +{ int ret = 0; - census_trace_obj* trace = NULL; - gpr_mu_lock(&g_mu); - trace = census_ht_find(g_trace_store, op_id_as_key(&op_id)); - if (trace == NULL) { - ret = 1; - } else { - trace->method = gpr_strdup(method); - } - gpr_mu_unlock(&g_mu); + census_trace_obj *trace = NULL; + gpr_mu_lock (&g_mu); + trace = census_ht_find (g_trace_store, op_id_as_key (&op_id)); + if (trace == NULL) + { + ret = 1; + } + else + { + trace->method = gpr_strdup (method); + } + gpr_mu_unlock (&g_mu); return ret; } -void census_tracing_print(census_op_id op_id, const char* anno_txt) { - census_trace_obj* trace = NULL; - gpr_mu_lock(&g_mu); - trace = census_ht_find(g_trace_store, op_id_as_key(&op_id)); - if (trace != NULL) { - census_trace_annotation* anno = gpr_malloc(sizeof(census_trace_annotation)); - anno->ts = gpr_now(GPR_CLOCK_REALTIME); +void +census_tracing_print (census_op_id op_id, const char *anno_txt) +{ + census_trace_obj *trace = NULL; + gpr_mu_lock (&g_mu); + trace = census_ht_find (g_trace_store, op_id_as_key (&op_id)); + if (trace != NULL) { - char* d = anno->txt; - const char* s = anno_txt; - int n = 0; - for (; n < CENSUS_MAX_ANNOTATION_LENGTH && *s != '\0'; ++n) { - *d++ = *s++; + census_trace_annotation *anno = gpr_malloc (sizeof (census_trace_annotation)); + anno->ts = gpr_now (GPR_CLOCK_REALTIME); + { + char *d = anno->txt; + const char *s = anno_txt; + int n = 0; + for (; n < CENSUS_MAX_ANNOTATION_LENGTH && *s != '\0'; ++n) + { + *d++ = *s++; + } + *d = '\0'; } - *d = '\0'; + anno->next = trace->annotations; + trace->annotations = anno; } - anno->next = trace->annotations; - trace->annotations = anno; - } - gpr_mu_unlock(&g_mu); -} - -void census_tracing_end_op(census_op_id op_id) { - census_trace_obj* trace = NULL; - gpr_mu_lock(&g_mu); - trace = census_ht_find(g_trace_store, op_id_as_key(&op_id)); - if (trace != NULL) { - trace->rpc_stats.elapsed_time_ms = gpr_timespec_to_micros( - gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), trace->ts)); - gpr_log(GPR_DEBUG, "End tracing for id %lu, method %s, latency %f us", - op_id_2_uint64(&op_id), trace->method, - trace->rpc_stats.elapsed_time_ms); - census_ht_erase(g_trace_store, op_id_as_key(&op_id)); - } - gpr_mu_unlock(&g_mu); + gpr_mu_unlock (&g_mu); } -void census_tracing_init(void) { - init_mutex_once(); - gpr_mu_lock(&g_mu); - if (g_trace_store == NULL) { - g_id = 1; - g_trace_store = census_ht_create(&ht_opt); - } else { - gpr_log(GPR_ERROR, "Census trace store already initialized."); - } - gpr_mu_unlock(&g_mu); +void +census_tracing_end_op (census_op_id op_id) +{ + census_trace_obj *trace = NULL; + gpr_mu_lock (&g_mu); + trace = census_ht_find (g_trace_store, op_id_as_key (&op_id)); + if (trace != NULL) + { + trace->rpc_stats.elapsed_time_ms = gpr_timespec_to_micros (gpr_time_sub (gpr_now (GPR_CLOCK_REALTIME), trace->ts)); + gpr_log (GPR_DEBUG, "End tracing for id %lu, method %s, latency %f us", op_id_2_uint64 (&op_id), trace->method, trace->rpc_stats.elapsed_time_ms); + census_ht_erase (g_trace_store, op_id_as_key (&op_id)); + } + gpr_mu_unlock (&g_mu); } -void census_tracing_shutdown(void) { - gpr_mu_lock(&g_mu); - if (g_trace_store != NULL) { - census_ht_destroy(g_trace_store); - g_trace_store = NULL; - } else { - gpr_log(GPR_ERROR, "Census trace store is not initialized."); - } - gpr_mu_unlock(&g_mu); +void +census_tracing_init (void) +{ + init_mutex_once (); + gpr_mu_lock (&g_mu); + if (g_trace_store == NULL) + { + g_id = 1; + g_trace_store = census_ht_create (&ht_opt); + } + else + { + gpr_log (GPR_ERROR, "Census trace store already initialized."); + } + gpr_mu_unlock (&g_mu); } -void census_internal_lock_trace_store(void) { gpr_mu_lock(&g_mu); } +void +census_tracing_shutdown (void) +{ + gpr_mu_lock (&g_mu); + if (g_trace_store != NULL) + { + census_ht_destroy (g_trace_store); + g_trace_store = NULL; + } + else + { + gpr_log (GPR_ERROR, "Census trace store is not initialized."); + } + gpr_mu_unlock (&g_mu); +} -void census_internal_unlock_trace_store(void) { gpr_mu_unlock(&g_mu); } +void +census_internal_lock_trace_store (void) +{ + gpr_mu_lock (&g_mu); +} -census_trace_obj* census_get_trace_obj_locked(census_op_id op_id) { - if (g_trace_store == NULL) { - gpr_log(GPR_ERROR, "Census trace store is not initialized."); - return NULL; - } - return (census_trace_obj*)census_ht_find(g_trace_store, op_id_as_key(&op_id)); +void +census_internal_unlock_trace_store (void) +{ + gpr_mu_unlock (&g_mu); +} + +census_trace_obj * +census_get_trace_obj_locked (census_op_id op_id) +{ + if (g_trace_store == NULL) + { + gpr_log (GPR_ERROR, "Census trace store is not initialized."); + return NULL; + } + return (census_trace_obj *) census_ht_find (g_trace_store, op_id_as_key (&op_id)); } -const char* census_get_trace_method_name(const census_trace_obj* trace) { +const char * +census_get_trace_method_name (const census_trace_obj * trace) +{ return trace->method; } -static census_trace_annotation* dup_annotation_chain( - census_trace_annotation* from) { - census_trace_annotation* ret = NULL; - census_trace_annotation** to = &ret; - for (; from != NULL; from = from->next) { - *to = gpr_malloc(sizeof(census_trace_annotation)); - memcpy(*to, from, sizeof(census_trace_annotation)); - to = &(*to)->next; - } +static census_trace_annotation * +dup_annotation_chain (census_trace_annotation * from) +{ + census_trace_annotation *ret = NULL; + census_trace_annotation **to = &ret; + for (; from != NULL; from = from->next) + { + *to = gpr_malloc (sizeof (census_trace_annotation)); + memcpy (*to, from, sizeof (census_trace_annotation)); + to = &(*to)->next; + } return ret; } -static census_trace_obj* trace_obj_dup(census_trace_obj* from) { - census_trace_obj* to = NULL; - GPR_ASSERT(from != NULL); - to = gpr_malloc(sizeof(census_trace_obj)); +static census_trace_obj * +trace_obj_dup (census_trace_obj * from) +{ + census_trace_obj *to = NULL; + GPR_ASSERT (from != NULL); + to = gpr_malloc (sizeof (census_trace_obj)); to->id = from->id; to->ts = from->ts; to->rpc_stats = from->rpc_stats; - to->method = gpr_strdup(from->method); - to->annotations = dup_annotation_chain(from->annotations); + to->method = gpr_strdup (from->method); + to->annotations = dup_annotation_chain (from->annotations); return to; } -census_trace_obj** census_get_active_ops(int* num_active_ops) { - census_trace_obj** ret = NULL; - gpr_mu_lock(&g_mu); - if (g_trace_store != NULL) { - size_t n = 0; - census_ht_kv* all_kvs = census_ht_get_all_elements(g_trace_store, &n); - *num_active_ops = (int)n; - if (n != 0) { - size_t i = 0; - ret = gpr_malloc(sizeof(census_trace_obj*) * n); - for (i = 0; i < n; i++) { - ret[i] = trace_obj_dup((census_trace_obj*)all_kvs[i].v); - } +census_trace_obj ** +census_get_active_ops (int *num_active_ops) +{ + census_trace_obj **ret = NULL; + gpr_mu_lock (&g_mu); + if (g_trace_store != NULL) + { + size_t n = 0; + census_ht_kv *all_kvs = census_ht_get_all_elements (g_trace_store, &n); + *num_active_ops = (int) n; + if (n != 0) + { + size_t i = 0; + ret = gpr_malloc (sizeof (census_trace_obj *) * n); + for (i = 0; i < n; i++) + { + ret[i] = trace_obj_dup ((census_trace_obj *) all_kvs[i].v); + } + } + gpr_free (all_kvs); } - gpr_free(all_kvs); - } - gpr_mu_unlock(&g_mu); + gpr_mu_unlock (&g_mu); return ret; } diff --git a/src/core/statistics/census_tracing.h b/src/core/statistics/census_tracing.h index 08305c24695..02888296a9d 100644 --- a/src/core/statistics/census_tracing.h +++ b/src/core/statistics/census_tracing.h @@ -43,54 +43,57 @@ They are not recommended for external use. */ #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif /* Struct for a trace annotation. */ -typedef struct census_trace_annotation { - gpr_timespec ts; /* timestamp of the annotation */ - char txt[CENSUS_MAX_ANNOTATION_LENGTH + 1]; /* actual txt annotation */ - struct census_trace_annotation* next; -} census_trace_annotation; + typedef struct census_trace_annotation + { + gpr_timespec ts; /* timestamp of the annotation */ + char txt[CENSUS_MAX_ANNOTATION_LENGTH + 1]; /* actual txt annotation */ + struct census_trace_annotation *next; + } census_trace_annotation; -typedef struct census_trace_obj { - census_op_id id; - gpr_timespec ts; - census_rpc_stats rpc_stats; - char* method; - census_trace_annotation* annotations; -} census_trace_obj; + typedef struct census_trace_obj + { + census_op_id id; + gpr_timespec ts; + census_rpc_stats rpc_stats; + char *method; + census_trace_annotation *annotations; + } census_trace_obj; /* Deletes trace object. */ -void census_trace_obj_destroy(census_trace_obj* obj); + void census_trace_obj_destroy (census_trace_obj * obj); /* Initializes trace store. This function is thread safe. */ -void census_tracing_init(void); + void census_tracing_init (void); /* Shutsdown trace store. This function is thread safe. */ -void census_tracing_shutdown(void); + void census_tracing_shutdown (void); /* Gets trace obj corresponding to the input op_id. Returns NULL if trace store is not initialized or trace obj is not found. Requires trace store being locked before calling this function. */ -census_trace_obj* census_get_trace_obj_locked(census_op_id op_id); + census_trace_obj *census_get_trace_obj_locked (census_op_id op_id); /* The following two functions acquire and release the trace store global lock. They are for census internal use only. */ -void census_internal_lock_trace_store(void); -void census_internal_unlock_trace_store(void); + void census_internal_lock_trace_store (void); + void census_internal_unlock_trace_store (void); /* Gets method name associated with the input trace object. */ -const char* census_get_trace_method_name(const census_trace_obj* trace); + const char *census_get_trace_method_name (const census_trace_obj * trace); /* Returns an array of pointers to trace objects of currently active operations and fills in number of active operations. Returns NULL if there are no active operations. Caller owns the returned objects. */ -census_trace_obj** census_get_active_ops(int* num_active_ops); + census_trace_obj **census_get_active_ops (int *num_active_ops); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_STATISTICS_CENSUS_TRACING_H */ +#endif /* GRPC_INTERNAL_CORE_STATISTICS_CENSUS_TRACING_H */ diff --git a/src/core/statistics/hash_table.c b/src/core/statistics/hash_table.c index 56bdcc2ffff..e0f89233d20 100644 --- a/src/core/statistics/hash_table.c +++ b/src/core/statistics/hash_table.c @@ -43,30 +43,33 @@ #define CENSUS_HT_NUM_BUCKETS 1999 /* A single hash table data entry */ -typedef struct ht_entry { +typedef struct ht_entry +{ census_ht_key key; - void* data; - struct ht_entry* next; + void *data; + struct ht_entry *next; } ht_entry; /* hash table bucket */ -typedef struct bucket { +typedef struct bucket +{ /* NULL if bucket is empty */ - ht_entry* next; + ht_entry *next; /* -1 if all buckets are empty. */ gpr_int32 prev_non_empty_bucket; /* -1 if all buckets are empty. */ gpr_int32 next_non_empty_bucket; } bucket; -struct unresizable_hash_table { +struct unresizable_hash_table +{ /* Number of entries in the table */ size_t size; /* Number of buckets */ gpr_uint32 num_buckets; /* Array of buckets initialized at creation time. Memory consumption is 16 bytes per bucket on a 64-bit platform. */ - bucket* buckets; + bucket *buckets; /* Index of the first non-empty bucket. -1 iff size == 0. */ gpr_int32 first_non_empty_bucket; /* Index of the last non_empty bucket. -1 iff size == 0. */ @@ -75,25 +78,30 @@ struct unresizable_hash_table { census_ht_option options; }; -typedef struct entry_locator { +typedef struct entry_locator +{ gpr_int32 bucket_idx; int is_first_in_chain; int found; - ht_entry* prev_entry; + ht_entry *prev_entry; } entry_locator; /* Asserts if option is not valid. */ -void check_options(const census_ht_option* option) { - GPR_ASSERT(option != NULL); - GPR_ASSERT(option->num_buckets > 0); - GPR_ASSERT(option->key_type == CENSUS_HT_UINT64 || - option->key_type == CENSUS_HT_POINTER); - if (option->key_type == CENSUS_HT_UINT64) { - GPR_ASSERT(option->hash == NULL); - } else if (option->key_type == CENSUS_HT_POINTER) { - GPR_ASSERT(option->hash != NULL); - GPR_ASSERT(option->compare_keys != NULL); - } +void +check_options (const census_ht_option * option) +{ + GPR_ASSERT (option != NULL); + GPR_ASSERT (option->num_buckets > 0); + GPR_ASSERT (option->key_type == CENSUS_HT_UINT64 || option->key_type == CENSUS_HT_POINTER); + if (option->key_type == CENSUS_HT_UINT64) + { + GPR_ASSERT (option->hash == NULL); + } + else if (option->key_type == CENSUS_HT_POINTER) + { + GPR_ASSERT (option->hash != NULL); + GPR_ASSERT (option->compare_keys != NULL); + } } #define REMOVE_NEXT(options, ptr) \ @@ -103,119 +111,147 @@ void check_options(const census_ht_option* option) { delete_entry(options, tmp); \ } while (0) -static void delete_entry(const census_ht_option* opt, ht_entry* p) { - if (opt->delete_data != NULL) { - opt->delete_data(p->data); - } - if (opt->delete_key != NULL) { - opt->delete_key(p->key.ptr); - } - gpr_free(p); +static void +delete_entry (const census_ht_option * opt, ht_entry * p) +{ + if (opt->delete_data != NULL) + { + opt->delete_data (p->data); + } + if (opt->delete_key != NULL) + { + opt->delete_key (p->key.ptr); + } + gpr_free (p); } -static gpr_uint64 hash(const census_ht_option* opt, census_ht_key key) { - return opt->key_type == CENSUS_HT_UINT64 ? key.val : opt->hash(key.ptr); +static gpr_uint64 +hash (const census_ht_option * opt, census_ht_key key) +{ + return opt->key_type == CENSUS_HT_UINT64 ? key.val : opt->hash (key.ptr); } -census_ht* census_ht_create(const census_ht_option* option) { +census_ht * +census_ht_create (const census_ht_option * option) +{ int i; - census_ht* ret = NULL; - check_options(option); - ret = (census_ht*)gpr_malloc(sizeof(census_ht)); + census_ht *ret = NULL; + check_options (option); + ret = (census_ht *) gpr_malloc (sizeof (census_ht)); ret->size = 0; ret->num_buckets = option->num_buckets; - ret->buckets = (bucket*)gpr_malloc(sizeof(bucket) * ret->num_buckets); + ret->buckets = (bucket *) gpr_malloc (sizeof (bucket) * ret->num_buckets); ret->options = *option; /* initialize each bucket */ - for (i = 0; i < ret->options.num_buckets; i++) { - ret->buckets[i].prev_non_empty_bucket = -1; - ret->buckets[i].next_non_empty_bucket = -1; - ret->buckets[i].next = NULL; - } + for (i = 0; i < ret->options.num_buckets; i++) + { + ret->buckets[i].prev_non_empty_bucket = -1; + ret->buckets[i].next_non_empty_bucket = -1; + ret->buckets[i].next = NULL; + } return ret; } -static gpr_int32 find_bucket_idx(const census_ht* ht, census_ht_key key) { - return hash(&ht->options, key) % ht->num_buckets; +static gpr_int32 +find_bucket_idx (const census_ht * ht, census_ht_key key) +{ + return hash (&ht->options, key) % ht->num_buckets; } -static int keys_match(const census_ht_option* opt, const ht_entry* p, - const census_ht_key key) { - GPR_ASSERT(opt->key_type == CENSUS_HT_UINT64 || - opt->key_type == CENSUS_HT_POINTER); - if (opt->key_type == CENSUS_HT_UINT64) return p->key.val == key.val; - return !opt->compare_keys((p->key).ptr, key.ptr); +static int +keys_match (const census_ht_option * opt, const ht_entry * p, const census_ht_key key) +{ + GPR_ASSERT (opt->key_type == CENSUS_HT_UINT64 || opt->key_type == CENSUS_HT_POINTER); + if (opt->key_type == CENSUS_HT_UINT64) + return p->key.val == key.val; + return !opt->compare_keys ((p->key).ptr, key.ptr); } -static entry_locator ht_find(const census_ht* ht, census_ht_key key) { - entry_locator loc = {0, 0, 0, NULL}; +static entry_locator +ht_find (const census_ht * ht, census_ht_key key) +{ + entry_locator loc = { 0, 0, 0, NULL }; gpr_int32 idx = 0; - ht_entry* ptr = NULL; - GPR_ASSERT(ht != NULL); - idx = find_bucket_idx(ht, key); + ht_entry *ptr = NULL; + GPR_ASSERT (ht != NULL); + idx = find_bucket_idx (ht, key); ptr = ht->buckets[idx].next; - if (ptr == NULL) { - /* bucket is empty */ - return loc; - } - if (keys_match(&ht->options, ptr, key)) { - loc.bucket_idx = idx; - loc.is_first_in_chain = 1; - loc.found = 1; - return loc; - } else { - for (; ptr->next != NULL; ptr = ptr->next) { - if (keys_match(&ht->options, ptr->next, key)) { - loc.bucket_idx = idx; - loc.is_first_in_chain = 0; - loc.found = 1; - loc.prev_entry = ptr; - return loc; - } + if (ptr == NULL) + { + /* bucket is empty */ + return loc; + } + if (keys_match (&ht->options, ptr, key)) + { + loc.bucket_idx = idx; + loc.is_first_in_chain = 1; + loc.found = 1; + return loc; + } + else + { + for (; ptr->next != NULL; ptr = ptr->next) + { + if (keys_match (&ht->options, ptr->next, key)) + { + loc.bucket_idx = idx; + loc.is_first_in_chain = 0; + loc.found = 1; + loc.prev_entry = ptr; + return loc; + } + } } - } /* Could not find the key */ return loc; } -void* census_ht_find(const census_ht* ht, census_ht_key key) { - entry_locator loc = ht_find(ht, key); - if (loc.found == 0) { - return NULL; - } - return loc.is_first_in_chain ? ht->buckets[loc.bucket_idx].next->data - : loc.prev_entry->next->data; +void * +census_ht_find (const census_ht * ht, census_ht_key key) +{ + entry_locator loc = ht_find (ht, key); + if (loc.found == 0) + { + return NULL; + } + return loc.is_first_in_chain ? ht->buckets[loc.bucket_idx].next->data : loc.prev_entry->next->data; } -void census_ht_insert(census_ht* ht, census_ht_key key, void* data) { - gpr_int32 idx = find_bucket_idx(ht, key); - ht_entry* ptr = NULL; - entry_locator loc = ht_find(ht, key); - if (loc.found) { - /* Replace old value with new value. */ - ptr = loc.is_first_in_chain ? ht->buckets[loc.bucket_idx].next - : loc.prev_entry->next; - if (ht->options.delete_data != NULL) { - ht->options.delete_data(ptr->data); +void +census_ht_insert (census_ht * ht, census_ht_key key, void *data) +{ + gpr_int32 idx = find_bucket_idx (ht, key); + ht_entry *ptr = NULL; + entry_locator loc = ht_find (ht, key); + if (loc.found) + { + /* Replace old value with new value. */ + ptr = loc.is_first_in_chain ? ht->buckets[loc.bucket_idx].next : loc.prev_entry->next; + if (ht->options.delete_data != NULL) + { + ht->options.delete_data (ptr->data); + } + ptr->data = data; + return; } - ptr->data = data; - return; - } /* first entry in the table. */ - if (ht->size == 0) { - ht->buckets[idx].next_non_empty_bucket = -1; - ht->buckets[idx].prev_non_empty_bucket = -1; - ht->first_non_empty_bucket = idx; - ht->last_non_empty_bucket = idx; - } else if (ht->buckets[idx].next == NULL) { - /* first entry in the bucket. */ - ht->buckets[ht->last_non_empty_bucket].next_non_empty_bucket = idx; - ht->buckets[idx].prev_non_empty_bucket = ht->last_non_empty_bucket; - ht->buckets[idx].next_non_empty_bucket = -1; - ht->last_non_empty_bucket = idx; - } - ptr = (ht_entry*)gpr_malloc(sizeof(ht_entry)); + if (ht->size == 0) + { + ht->buckets[idx].next_non_empty_bucket = -1; + ht->buckets[idx].prev_non_empty_bucket = -1; + ht->first_non_empty_bucket = idx; + ht->last_non_empty_bucket = idx; + } + else if (ht->buckets[idx].next == NULL) + { + /* first entry in the bucket. */ + ht->buckets[ht->last_non_empty_bucket].next_non_empty_bucket = idx; + ht->buckets[idx].prev_non_empty_bucket = ht->last_non_empty_bucket; + ht->buckets[idx].next_non_empty_bucket = -1; + ht->last_non_empty_bucket = idx; + } + ptr = (ht_entry *) gpr_malloc (sizeof (ht_entry)); ptr->key = key; ptr->data = data; ptr->next = ht->buckets[idx].next; @@ -223,81 +259,109 @@ void census_ht_insert(census_ht* ht, census_ht_key key, void* data) { ht->size++; } -void census_ht_erase(census_ht* ht, census_ht_key key) { - entry_locator loc = ht_find(ht, key); - if (loc.found == 0) { - /* noop if not found */ - return; - } +void +census_ht_erase (census_ht * ht, census_ht_key key) +{ + entry_locator loc = ht_find (ht, key); + if (loc.found == 0) + { + /* noop if not found */ + return; + } ht->size--; - if (loc.is_first_in_chain) { - bucket* b = &ht->buckets[loc.bucket_idx]; - GPR_ASSERT(b->next != NULL); - /* The only entry in the bucket */ - if (b->next->next == NULL) { - int prev = b->prev_non_empty_bucket; - int next = b->next_non_empty_bucket; - if (prev != -1) { - ht->buckets[prev].next_non_empty_bucket = next; - } else { - ht->first_non_empty_bucket = next; - } - if (next != -1) { - ht->buckets[next].prev_non_empty_bucket = prev; - } else { - ht->last_non_empty_bucket = prev; - } + if (loc.is_first_in_chain) + { + bucket *b = &ht->buckets[loc.bucket_idx]; + GPR_ASSERT (b->next != NULL); + /* The only entry in the bucket */ + if (b->next->next == NULL) + { + int prev = b->prev_non_empty_bucket; + int next = b->next_non_empty_bucket; + if (prev != -1) + { + ht->buckets[prev].next_non_empty_bucket = next; + } + else + { + ht->first_non_empty_bucket = next; + } + if (next != -1) + { + ht->buckets[next].prev_non_empty_bucket = prev; + } + else + { + ht->last_non_empty_bucket = prev; + } + } + REMOVE_NEXT (&ht->options, b); + } + else + { + GPR_ASSERT (loc.prev_entry->next != NULL); + REMOVE_NEXT (&ht->options, loc.prev_entry); } - REMOVE_NEXT(&ht->options, b); - } else { - GPR_ASSERT(loc.prev_entry->next != NULL); - REMOVE_NEXT(&ht->options, loc.prev_entry); - } } /* Returns NULL if input table is empty. */ -census_ht_kv* census_ht_get_all_elements(const census_ht* ht, size_t* num) { - census_ht_kv* ret = NULL; +census_ht_kv * +census_ht_get_all_elements (const census_ht * ht, size_t * num) +{ + census_ht_kv *ret = NULL; int i = 0; gpr_int32 idx = -1; - GPR_ASSERT(ht != NULL && num != NULL); + GPR_ASSERT (ht != NULL && num != NULL); *num = ht->size; - if (*num == 0) { - return NULL; - } + if (*num == 0) + { + return NULL; + } - ret = (census_ht_kv*)gpr_malloc(sizeof(census_ht_kv) * ht->size); + ret = (census_ht_kv *) gpr_malloc (sizeof (census_ht_kv) * ht->size); idx = ht->first_non_empty_bucket; - while (idx >= 0) { - ht_entry* ptr = ht->buckets[idx].next; - for (; ptr != NULL; ptr = ptr->next) { - ret[i].k = ptr->key; - ret[i].v = ptr->data; - i++; + while (idx >= 0) + { + ht_entry *ptr = ht->buckets[idx].next; + for (; ptr != NULL; ptr = ptr->next) + { + ret[i].k = ptr->key; + ret[i].v = ptr->data; + i++; + } + idx = ht->buckets[idx].next_non_empty_bucket; } - idx = ht->buckets[idx].next_non_empty_bucket; - } return ret; } -static void ht_delete_entry_chain(const census_ht_option* options, - ht_entry* first) { - if (first == NULL) { - return; - } - if (first->next != NULL) { - ht_delete_entry_chain(options, first->next); - } - delete_entry(options, first); +static void +ht_delete_entry_chain (const census_ht_option * options, ht_entry * first) +{ + if (first == NULL) + { + return; + } + if (first->next != NULL) + { + ht_delete_entry_chain (options, first->next); + } + delete_entry (options, first); } -void census_ht_destroy(census_ht* ht) { +void +census_ht_destroy (census_ht * ht) +{ unsigned i; - for (i = 0; i < ht->num_buckets; ++i) { - ht_delete_entry_chain(&ht->options, ht->buckets[i].next); - } - gpr_free(ht->buckets); - gpr_free(ht); + for (i = 0; i < ht->num_buckets; ++i) + { + ht_delete_entry_chain (&ht->options, ht->buckets[i].next); + } + gpr_free (ht->buckets); + gpr_free (ht); } -size_t census_ht_get_size(const census_ht* ht) { return ht->size; } +size_t +census_ht_get_size (const census_ht * ht) +{ + return ht->size; +} diff --git a/src/core/statistics/hash_table.h b/src/core/statistics/hash_table.h index b7f8e11af47..21f223cceb0 100644 --- a/src/core/statistics/hash_table.h +++ b/src/core/statistics/hash_table.h @@ -59,73 +59,76 @@ typedef struct unresizable_hash_table census_ht; /* Currently, the hash_table can take two types of keys. (uint64 for trace store and const char* for stats store). */ -typedef union { +typedef union +{ gpr_uint64 val; - void* ptr; + void *ptr; } census_ht_key; -typedef enum census_ht_key_type { +typedef enum census_ht_key_type +{ CENSUS_HT_UINT64 = 0, CENSUS_HT_POINTER = 1 } census_ht_key_type; -typedef struct census_ht_option { +typedef struct census_ht_option +{ /* Type of hash key */ census_ht_key_type key_type; /* Desired number of buckets, preferably a prime number */ gpr_int32 num_buckets; /* Fucntion to calculate uint64 hash value of the key. Only takes effect if key_type is POINTER. */ - gpr_uint64 (*hash)(const void*); + gpr_uint64 (*hash) (const void *); /* Function to compare two keys, returns 0 iff equal. Only takes effect if key_type is POINTER */ - int (*compare_keys)(const void* k1, const void* k2); + int (*compare_keys) (const void *k1, const void *k2); /* Value deleter. NULL if no specialized delete function is needed. */ - void (*delete_data)(void*); + void (*delete_data) (void *); /* Key deleter. NULL if table does not own the key. (e.g. key is part of the value or key is not owned by the table.) */ - void (*delete_key)(void*); + void (*delete_key) (void *); } census_ht_option; /* Creates a hashtable with fixed number of buckets according to the settings specified in 'options' arg. Function pointers "hash" and "compare_keys" must be provided if key_type is POINTER. Asserts if fail to create. */ -census_ht* census_ht_create(const census_ht_option* options); +census_ht *census_ht_create (const census_ht_option * options); /* Deletes hash table instance. Frees all dynamic memory owned by ht.*/ -void census_ht_destroy(census_ht* ht); +void census_ht_destroy (census_ht * ht); /* Inserts the input key-val pair into hash_table. If an entry with the same key exists in the table, the corresponding value will be overwritten by the input val. */ -void census_ht_insert(census_ht* ht, census_ht_key key, void* val); +void census_ht_insert (census_ht * ht, census_ht_key key, void *val); /* Returns pointer to data, returns NULL if not found. */ -void* census_ht_find(const census_ht* ht, census_ht_key key); +void *census_ht_find (const census_ht * ht, census_ht_key key); /* Erase hash table entry with input key. Noop if key is not found. */ -void census_ht_erase(census_ht* ht, census_ht_key key); +void census_ht_erase (census_ht * ht, census_ht_key key); -typedef struct census_ht_kv { +typedef struct census_ht_kv +{ census_ht_key k; - void* v; + void *v; } census_ht_kv; /* Returns an array of pointers to all values in the hash table. Order of the elements can be arbitrary. Sets 'num' to the size of returned array. Caller owns returned array. */ -census_ht_kv* census_ht_get_all_elements(const census_ht* ht, size_t* num); +census_ht_kv *census_ht_get_all_elements (const census_ht * ht, size_t * num); /* Returns number of elements kept. */ -size_t census_ht_get_size(const census_ht* ht); +size_t census_ht_get_size (const census_ht * ht); /* Functor applied on each key-value pair while iterating through entries in the table. The functor should not mutate data. */ -typedef void (*census_ht_itr_cb)(census_ht_key key, const void* val_ptr, - void* state); +typedef void (*census_ht_itr_cb) (census_ht_key key, const void *val_ptr, void *state); /* Iterates through all key-value pairs in the hash_table. The callback function should not invalidate data entries. */ -gpr_uint64 census_ht_for_all(const census_ht* ht, census_ht_itr_cb); +gpr_uint64 census_ht_for_all (const census_ht * ht, census_ht_itr_cb); #endif /* GRPC_INTERNAL_CORE_STATISTICS_HASH_TABLE_H */ diff --git a/src/core/statistics/window_stats.c b/src/core/statistics/window_stats.c index a64e0805652..385d75d4f4e 100644 --- a/src/core/statistics/window_stats.c +++ b/src/core/statistics/window_stats.c @@ -46,16 +46,18 @@ typedef struct census_window_stats_sum cws_sum; /* Each interval is composed of a number of buckets, which hold a count of entries and a single statistic */ -typedef struct census_window_stats_bucket { +typedef struct census_window_stats_bucket +{ gpr_int64 count; - void* statistic; + void *statistic; } cws_bucket; /* Each interval has a set of buckets, and the variables needed to keep track of their current state */ -typedef struct census_window_stats_interval_stats { +typedef struct census_window_stats_interval_stats +{ /* The buckets. There will be 'granularity' + 1 of these. */ - cws_bucket* buckets; + cws_bucket *buckets; /* Index of the bucket containing the smallest time interval. */ int bottom_bucket; /* The smallest time storable in the current window. */ @@ -66,7 +68,8 @@ typedef struct census_window_stats_interval_stats { gpr_int64 width; } cws_interval_stats; -typedef struct census_window_stats { +typedef struct census_window_stats +{ /* Number of intervals. */ int nintervals; /* Number of buckets in each interval. 'granularity' + 1. */ @@ -74,7 +77,7 @@ typedef struct census_window_stats { /* Record of stat_info. */ cws_stat_info stat_info; /* Stats for each interval. */ - cws_interval_stats* interval_stats; + cws_interval_stats *interval_stats; /* The time the newset stat was recorded. */ gpr_int64 newest_time; } window_stats; @@ -87,231 +90,252 @@ typedef struct census_window_stats { /* The maximum seconds value we can have in a valid timespec. More than this will result in overflow in timespec_to_ns(). This works out to ~292 years. TODO: consider using doubles instead of int64. */ -static gpr_int64 max_seconds = - (GPR_INT64_MAX - GPR_NS_PER_SEC) / GPR_NS_PER_SEC; +static gpr_int64 max_seconds = (GPR_INT64_MAX - GPR_NS_PER_SEC) / GPR_NS_PER_SEC; -static gpr_int64 timespec_to_ns(const gpr_timespec ts) { - if (ts.tv_sec > max_seconds) { - return GPR_INT64_MAX - 1; - } - return (gpr_int64)ts.tv_sec * GPR_NS_PER_SEC + ts.tv_nsec; +static gpr_int64 +timespec_to_ns (const gpr_timespec ts) +{ + if (ts.tv_sec > max_seconds) + { + return GPR_INT64_MAX - 1; + } + return (gpr_int64) ts.tv_sec * GPR_NS_PER_SEC + ts.tv_nsec; } -static void cws_initialize_statistic(void* statistic, - const cws_stat_info* stat_info) { - if (stat_info->stat_initialize == NULL) { - memset(statistic, 0, stat_info->stat_size); - } else { - stat_info->stat_initialize(statistic); - } +static void +cws_initialize_statistic (void *statistic, const cws_stat_info * stat_info) +{ + if (stat_info->stat_initialize == NULL) + { + memset (statistic, 0, stat_info->stat_size); + } + else + { + stat_info->stat_initialize (statistic); + } } /* Create and initialize a statistic */ -static void* cws_create_statistic(const cws_stat_info* stat_info) { - void* stat = gpr_malloc(stat_info->stat_size); - cws_initialize_statistic(stat, stat_info); +static void * +cws_create_statistic (const cws_stat_info * stat_info) +{ + void *stat = gpr_malloc (stat_info->stat_size); + cws_initialize_statistic (stat, stat_info); return stat; } -window_stats* census_window_stats_create(int nintervals, - const gpr_timespec intervals[], - int granularity, - const cws_stat_info* stat_info) { - window_stats* ret; +window_stats * +census_window_stats_create (int nintervals, const gpr_timespec intervals[], int granularity, const cws_stat_info * stat_info) +{ + window_stats *ret; int i; /* validate inputs */ - GPR_ASSERT(nintervals > 0 && granularity > 2 && intervals != NULL && - stat_info != NULL); - for (i = 0; i < nintervals; i++) { - gpr_int64 ns = timespec_to_ns(intervals[i]); - GPR_ASSERT(intervals[i].tv_sec >= 0 && intervals[i].tv_nsec >= 0 && - intervals[i].tv_nsec < GPR_NS_PER_SEC && ns >= 100 && - granularity * 10 <= ns); - } + GPR_ASSERT (nintervals > 0 && granularity > 2 && intervals != NULL && stat_info != NULL); + for (i = 0; i < nintervals; i++) + { + gpr_int64 ns = timespec_to_ns (intervals[i]); + GPR_ASSERT (intervals[i].tv_sec >= 0 && intervals[i].tv_nsec >= 0 && intervals[i].tv_nsec < GPR_NS_PER_SEC && ns >= 100 && granularity * 10 <= ns); + } /* Allocate and initialize relevant data structures */ - ret = (window_stats*)gpr_malloc(sizeof(window_stats)); + ret = (window_stats *) gpr_malloc (sizeof (window_stats)); ret->nintervals = nintervals; ret->nbuckets = granularity + 1; ret->stat_info = *stat_info; - ret->interval_stats = - (cws_interval_stats*)gpr_malloc(nintervals * sizeof(cws_interval_stats)); - for (i = 0; i < nintervals; i++) { - gpr_int64 size_ns = timespec_to_ns(intervals[i]); - cws_interval_stats* is = ret->interval_stats + i; - cws_bucket* buckets = is->buckets = - (cws_bucket*)gpr_malloc(ret->nbuckets * sizeof(cws_bucket)); - int b; - for (b = 0; b < ret->nbuckets; b++) { - buckets[b].statistic = cws_create_statistic(stat_info); - buckets[b].count = 0; - } - is->bottom_bucket = 0; - is->bottom = 0; - is->width = size_ns / granularity; - /* Check for possible overflow issues, and maximize interval size if the - user requested something large enough. */ - if ((GPR_INT64_MAX - is->width) > size_ns) { - is->top = size_ns + is->width; - } else { - is->top = GPR_INT64_MAX; - is->width = GPR_INT64_MAX / (granularity + 1); - } - /* If size doesn't divide evenly, we can have a width slightly too small; - better to have it slightly large. */ - if ((size_ns - (granularity + 1) * is->width) > 0) { - is->width += 1; + ret->interval_stats = (cws_interval_stats *) gpr_malloc (nintervals * sizeof (cws_interval_stats)); + for (i = 0; i < nintervals; i++) + { + gpr_int64 size_ns = timespec_to_ns (intervals[i]); + cws_interval_stats *is = ret->interval_stats + i; + cws_bucket *buckets = is->buckets = (cws_bucket *) gpr_malloc (ret->nbuckets * sizeof (cws_bucket)); + int b; + for (b = 0; b < ret->nbuckets; b++) + { + buckets[b].statistic = cws_create_statistic (stat_info); + buckets[b].count = 0; + } + is->bottom_bucket = 0; + is->bottom = 0; + is->width = size_ns / granularity; + /* Check for possible overflow issues, and maximize interval size if the + user requested something large enough. */ + if ((GPR_INT64_MAX - is->width) > size_ns) + { + is->top = size_ns + is->width; + } + else + { + is->top = GPR_INT64_MAX; + is->width = GPR_INT64_MAX / (granularity + 1); + } + /* If size doesn't divide evenly, we can have a width slightly too small; + better to have it slightly large. */ + if ((size_ns - (granularity + 1) * is->width) > 0) + { + is->width += 1; + } } - } ret->newest_time = 0; return ret; } /* When we try adding a measurement above the current interval range, we need to "shift" the buckets sufficiently to cover the new range. */ -static void cws_shift_buckets(const window_stats* wstats, - cws_interval_stats* is, gpr_int64 when_ns) { +static void +cws_shift_buckets (const window_stats * wstats, cws_interval_stats * is, gpr_int64 when_ns) +{ int i; /* number of bucket time widths to "shift" */ int shift; /* number of buckets to clear */ int nclear; - GPR_ASSERT(when_ns >= is->top); + GPR_ASSERT (when_ns >= is->top); /* number of bucket time widths to "shift" */ shift = ((when_ns - is->top) / is->width) + 1; /* number of buckets to clear - limited by actual number of buckets */ - nclear = GPR_MIN(shift, wstats->nbuckets); - for (i = 0; i < nclear; i++) { - int b = BUCKET_IDX(is, i, wstats); - is->buckets[b].count = 0; - cws_initialize_statistic(is->buckets[b].statistic, &wstats->stat_info); - } + nclear = GPR_MIN (shift, wstats->nbuckets); + for (i = 0; i < nclear; i++) + { + int b = BUCKET_IDX (is, i, wstats); + is->buckets[b].count = 0; + cws_initialize_statistic (is->buckets[b].statistic, &wstats->stat_info); + } /* adjust top/bottom times and current bottom bucket */ - is->bottom_bucket = BUCKET_IDX(is, shift, wstats); + is->bottom_bucket = BUCKET_IDX (is, shift, wstats); is->top += shift * is->width; is->bottom += shift * is->width; } -void census_window_stats_add(window_stats* wstats, const gpr_timespec when, - const void* stat_value) { +void +census_window_stats_add (window_stats * wstats, const gpr_timespec when, const void *stat_value) +{ int i; - gpr_int64 when_ns = timespec_to_ns(when); - GPR_ASSERT(wstats->interval_stats != NULL); - for (i = 0; i < wstats->nintervals; i++) { - cws_interval_stats* is = wstats->interval_stats + i; - cws_bucket* bucket; - if (when_ns < is->bottom) { /* Below smallest time in interval: drop */ - continue; + gpr_int64 when_ns = timespec_to_ns (when); + GPR_ASSERT (wstats->interval_stats != NULL); + for (i = 0; i < wstats->nintervals; i++) + { + cws_interval_stats *is = wstats->interval_stats + i; + cws_bucket *bucket; + if (when_ns < is->bottom) + { /* Below smallest time in interval: drop */ + continue; + } + if (when_ns >= is->top) + { /* above limit: shift buckets */ + cws_shift_buckets (wstats, is, when_ns); + } + /* Add the stat. */ + GPR_ASSERT (is->bottom <= when_ns && when_ns < is->top); + bucket = is->buckets + BUCKET_IDX (is, (when_ns - is->bottom) / is->width, wstats); + bucket->count++; + wstats->stat_info.stat_add (bucket->statistic, stat_value); } - if (when_ns >= is->top) { /* above limit: shift buckets */ - cws_shift_buckets(wstats, is, when_ns); + if (when_ns > wstats->newest_time) + { + wstats->newest_time = when_ns; } - /* Add the stat. */ - GPR_ASSERT(is->bottom <= when_ns && when_ns < is->top); - bucket = is->buckets + - BUCKET_IDX(is, (when_ns - is->bottom) / is->width, wstats); - bucket->count++; - wstats->stat_info.stat_add(bucket->statistic, stat_value); - } - if (when_ns > wstats->newest_time) { - wstats->newest_time = when_ns; - } } /* Add a specific bucket contents to an accumulating total. */ -static void cws_add_bucket_to_sum(cws_sum* sum, const cws_bucket* bucket, - const cws_stat_info* stat_info) { +static void +cws_add_bucket_to_sum (cws_sum * sum, const cws_bucket * bucket, const cws_stat_info * stat_info) +{ sum->count += bucket->count; - stat_info->stat_add(sum->statistic, bucket->statistic); + stat_info->stat_add (sum->statistic, bucket->statistic); } /* Add a proportion to an accumulating sum. */ -static void cws_add_proportion_to_sum(double p, cws_sum* sum, - const cws_bucket* bucket, - const cws_stat_info* stat_info) { +static void +cws_add_proportion_to_sum (double p, cws_sum * sum, const cws_bucket * bucket, const cws_stat_info * stat_info) +{ sum->count += p * bucket->count; - stat_info->stat_add_proportion(p, sum->statistic, bucket->statistic); + stat_info->stat_add_proportion (p, sum->statistic, bucket->statistic); } -void census_window_stats_get_sums(const window_stats* wstats, - const gpr_timespec when, cws_sum sums[]) { +void +census_window_stats_get_sums (const window_stats * wstats, const gpr_timespec when, cws_sum sums[]) +{ int i; - gpr_int64 when_ns = timespec_to_ns(when); - GPR_ASSERT(wstats->interval_stats != NULL); - for (i = 0; i < wstats->nintervals; i++) { - int when_bucket; - int new_bucket; - double last_proportion = 1.0; - double bottom_proportion; - cws_interval_stats* is = wstats->interval_stats + i; - cws_sum* sum = sums + i; - sum->count = 0; - cws_initialize_statistic(sum->statistic, &wstats->stat_info); - if (when_ns < is->bottom) { - continue; - } - if (when_ns >= is->top) { - cws_shift_buckets(wstats, is, when_ns); - } - /* Calculating the appropriate amount of which buckets to use can get - complicated. Essentially there are two cases: - 1) if the "top" bucket (new_bucket, where the newest additions to the - stats recorded are entered) corresponds to 'when', then we need - to take a proportion of it - (if when < newest_time) or the full - thing. We also (possibly) need to take a corresponding - proportion of the bottom bucket. - 2) Other cases, we just take a straight proportion. - */ - when_bucket = (when_ns - is->bottom) / is->width; - new_bucket = (wstats->newest_time - is->bottom) / is->width; - if (new_bucket == when_bucket) { - gpr_int64 bottom_bucket_time = is->bottom + when_bucket * is->width; - if (when_ns < wstats->newest_time) { - last_proportion = (double)(when_ns - bottom_bucket_time) / - (double)(wstats->newest_time - bottom_bucket_time); - bottom_proportion = - (double)(is->width - (when_ns - bottom_bucket_time)) / is->width; - } else { - bottom_proportion = - (double)(is->width - (wstats->newest_time - bottom_bucket_time)) / - is->width; - } - } else { - last_proportion = - (double)(when_ns + 1 - is->bottom - when_bucket * is->width) / - is->width; - bottom_proportion = 1.0 - last_proportion; + gpr_int64 when_ns = timespec_to_ns (when); + GPR_ASSERT (wstats->interval_stats != NULL); + for (i = 0; i < wstats->nintervals; i++) + { + int when_bucket; + int new_bucket; + double last_proportion = 1.0; + double bottom_proportion; + cws_interval_stats *is = wstats->interval_stats + i; + cws_sum *sum = sums + i; + sum->count = 0; + cws_initialize_statistic (sum->statistic, &wstats->stat_info); + if (when_ns < is->bottom) + { + continue; + } + if (when_ns >= is->top) + { + cws_shift_buckets (wstats, is, when_ns); + } + /* Calculating the appropriate amount of which buckets to use can get + complicated. Essentially there are two cases: + 1) if the "top" bucket (new_bucket, where the newest additions to the + stats recorded are entered) corresponds to 'when', then we need + to take a proportion of it - (if when < newest_time) or the full + thing. We also (possibly) need to take a corresponding + proportion of the bottom bucket. + 2) Other cases, we just take a straight proportion. + */ + when_bucket = (when_ns - is->bottom) / is->width; + new_bucket = (wstats->newest_time - is->bottom) / is->width; + if (new_bucket == when_bucket) + { + gpr_int64 bottom_bucket_time = is->bottom + when_bucket * is->width; + if (when_ns < wstats->newest_time) + { + last_proportion = (double) (when_ns - bottom_bucket_time) / (double) (wstats->newest_time - bottom_bucket_time); + bottom_proportion = (double) (is->width - (when_ns - bottom_bucket_time)) / is->width; + } + else + { + bottom_proportion = (double) (is->width - (wstats->newest_time - bottom_bucket_time)) / is->width; + } + } + else + { + last_proportion = (double) (when_ns + 1 - is->bottom - when_bucket * is->width) / is->width; + bottom_proportion = 1.0 - last_proportion; + } + cws_add_proportion_to_sum (last_proportion, sum, is->buckets + BUCKET_IDX (is, when_bucket, wstats), &wstats->stat_info); + if (when_bucket != 0) + { /* last bucket isn't also bottom bucket */ + int b; + /* Add all of "bottom" bucket if we are looking at a subset of the + full interval, or a proportion if we are adding full interval. */ + cws_add_proportion_to_sum ((when_bucket == wstats->nbuckets - 1 ? bottom_proportion : 1.0), sum, is->buckets + is->bottom_bucket, &wstats->stat_info); + /* Add all the remaining buckets (everything but top and bottom). */ + for (b = 1; b < when_bucket; b++) + { + cws_add_bucket_to_sum (sum, is->buckets + BUCKET_IDX (is, b, wstats), &wstats->stat_info); + } + } } - cws_add_proportion_to_sum(last_proportion, sum, - is->buckets + BUCKET_IDX(is, when_bucket, wstats), - &wstats->stat_info); - if (when_bucket != 0) { /* last bucket isn't also bottom bucket */ - int b; - /* Add all of "bottom" bucket if we are looking at a subset of the - full interval, or a proportion if we are adding full interval. */ - cws_add_proportion_to_sum( - (when_bucket == wstats->nbuckets - 1 ? bottom_proportion : 1.0), sum, - is->buckets + is->bottom_bucket, &wstats->stat_info); - /* Add all the remaining buckets (everything but top and bottom). */ - for (b = 1; b < when_bucket; b++) { - cws_add_bucket_to_sum(sum, is->buckets + BUCKET_IDX(is, b, wstats), - &wstats->stat_info); - } - } - } } -void census_window_stats_destroy(window_stats* wstats) { +void +census_window_stats_destroy (window_stats * wstats) +{ int i; - GPR_ASSERT(wstats->interval_stats != NULL); - for (i = 0; i < wstats->nintervals; i++) { - int b; - for (b = 0; b < wstats->nbuckets; b++) { - gpr_free(wstats->interval_stats[i].buckets[b].statistic); + GPR_ASSERT (wstats->interval_stats != NULL); + for (i = 0; i < wstats->nintervals; i++) + { + int b; + for (b = 0; b < wstats->nbuckets; b++) + { + gpr_free (wstats->interval_stats[i].buckets[b].statistic); + } + gpr_free (wstats->interval_stats[i].buckets); } - gpr_free(wstats->interval_stats[i].buckets); - } - gpr_free(wstats->interval_stats); + gpr_free (wstats->interval_stats); /* Ensure any use-after free triggers assert. */ wstats->interval_stats = NULL; - gpr_free(wstats); + gpr_free (wstats); } diff --git a/src/core/statistics/window_stats.h b/src/core/statistics/window_stats.h index 0020f6b44ca..ce67633b56c 100644 --- a/src/core/statistics/window_stats.h +++ b/src/core/statistics/window_stats.h @@ -115,18 +115,19 @@ struct census_window_stats; /* Information provided by API user on the information they want to record */ -typedef struct census_window_stats_stat_info { +typedef struct census_window_stats_stat_info +{ /* Number of bytes in user-defined object. */ size_t stat_size; /* Function to initialize a user-defined statistics object. If this is set * to NULL, then the object will be zero-initialized. */ - void (*stat_initialize)(void* stat); + void (*stat_initialize) (void *stat); /* Function to add one user-defined statistics object ('addme') to 'base' */ - void (*stat_add)(void* base, const void* addme); + void (*stat_add) (void *base, const void *addme); /* As for previous function, but only add a proportion 'p'. This API will currently only use 'p' values in the range [0,1], but other values are possible in the future, and should be supported. */ - void (*stat_add_proportion)(double p, void* base, const void* addme); + void (*stat_add_proportion) (double p, void *base, const void *addme); } census_window_stats_stat_info; /* Create a new window_stats object. 'nintervals' is the number of @@ -138,36 +139,32 @@ typedef struct census_window_stats_stat_info { years will be treated as essentially infinite in size. This function will GPR_ASSERT() if the object cannot be created or any of the parameters have invalid values. This function is thread-safe. */ -struct census_window_stats* census_window_stats_create( - int nintervals, const gpr_timespec intervals[], int granularity, - const census_window_stats_stat_info* stat_info); +struct census_window_stats *census_window_stats_create (int nintervals, const gpr_timespec intervals[], int granularity, const census_window_stats_stat_info * stat_info); /* Add a new measurement (in 'stat_value'), as of a given time ('when'). This function is thread-compatible. */ -void census_window_stats_add(struct census_window_stats* wstats, - const gpr_timespec when, const void* stat_value); +void census_window_stats_add (struct census_window_stats *wstats, const gpr_timespec when, const void *stat_value); /* Structure used to record a single intervals sum for a given statistic */ -typedef struct census_window_stats_sum { +typedef struct census_window_stats_sum +{ /* Total count of samples. Note that because some internal interpolation - is performed, the count of samples returned for each interval may not be an - integral value. */ + is performed, the count of samples returned for each interval may not be an + integral value. */ double count; /* Sum for statistic */ - void* statistic; + void *statistic; } census_window_stats_sums; /* Retrieve a set of all values stored in a window_stats object 'wstats'. The number of 'sums' MUST be the same as the number 'nintervals' used in census_window_stats_create(). This function is thread-compatible. */ -void census_window_stats_get_sums(const struct census_window_stats* wstats, - const gpr_timespec when, - struct census_window_stats_sum sums[]); +void census_window_stats_get_sums (const struct census_window_stats *wstats, const gpr_timespec when, struct census_window_stats_sum sums[]); /* Destroy a window_stats object. Once this function has been called, the object will no longer be usable from any of the above functions (and calling them will most likely result in a NULL-pointer dereference or assertion failure). This function is thread-compatible. */ -void census_window_stats_destroy(struct census_window_stats* wstats); +void census_window_stats_destroy (struct census_window_stats *wstats); #endif /* GRPC_INTERNAL_CORE_STATISTICS_WINDOW_STATS_H */ diff --git a/src/core/support/alloc.c b/src/core/support/alloc.c index d2ed82e7717..d83a1684e6f 100644 --- a/src/core/support/alloc.c +++ b/src/core/support/alloc.c @@ -36,31 +36,47 @@ #include #include -void *gpr_malloc(size_t size) { - void *p = malloc(size); - if (!p) { - abort(); - } +void * +gpr_malloc (size_t size) +{ + void *p = malloc (size); + if (!p) + { + abort (); + } return p; } -void gpr_free(void *p) { free(p); } +void +gpr_free (void *p) +{ + free (p); +} -void *gpr_realloc(void *p, size_t size) { - p = realloc(p, size); - if (!p) { - abort(); - } +void * +gpr_realloc (void *p, size_t size) +{ + p = realloc (p, size); + if (!p) + { + abort (); + } return p; } -void *gpr_malloc_aligned(size_t size, size_t alignment_log) { - size_t alignment = ((size_t)1) << alignment_log; - size_t extra = alignment - 1 + sizeof(void *); - void *p = gpr_malloc(size + extra); - void **ret = (void **)(((gpr_uintptr)p + extra) & ~(alignment - 1)); +void * +gpr_malloc_aligned (size_t size, size_t alignment_log) +{ + size_t alignment = ((size_t) 1) << alignment_log; + size_t extra = alignment - 1 + sizeof (void *); + void *p = gpr_malloc (size + extra); + void **ret = (void **) (((gpr_uintptr) p + extra) & ~(alignment - 1)); ret[-1] = p; - return (void *)ret; + return (void *) ret; } -void gpr_free_aligned(void *ptr) { free(((void **)ptr)[-1]); } +void +gpr_free_aligned (void *ptr) +{ + free (((void **) ptr)[-1]); +} diff --git a/src/core/support/cmdline.c b/src/core/support/cmdline.c index 45a3182f73a..1975212385e 100644 --- a/src/core/support/cmdline.c +++ b/src/core/support/cmdline.c @@ -42,9 +42,11 @@ #include #include -typedef enum { ARGTYPE_INT, ARGTYPE_BOOL, ARGTYPE_STRING } argtype; +typedef enum +{ ARGTYPE_INT, ARGTYPE_BOOL, ARGTYPE_STRING } argtype; -typedef struct arg { +typedef struct arg +{ const char *name; const char *help; argtype type; @@ -52,25 +54,28 @@ typedef struct arg { struct arg *next; } arg; -struct gpr_cmdline { +struct gpr_cmdline +{ const char *description; arg *args; const char *argv0; const char *extra_arg_name; const char *extra_arg_help; - void (*extra_arg)(void *user_data, const char *arg); + void (*extra_arg) (void *user_data, const char *arg); void *extra_arg_user_data; - void (*state)(gpr_cmdline *cl, char *arg); + void (*state) (gpr_cmdline * cl, char *arg); arg *cur_arg; }; -static void normal_state(gpr_cmdline *cl, char *arg); +static void normal_state (gpr_cmdline * cl, char *arg); -gpr_cmdline *gpr_cmdline_create(const char *description) { - gpr_cmdline *cl = gpr_malloc(sizeof(gpr_cmdline)); - memset(cl, 0, sizeof(gpr_cmdline)); +gpr_cmdline * +gpr_cmdline_create (const char *description) +{ + gpr_cmdline *cl = gpr_malloc (sizeof (gpr_cmdline)); + memset (cl, 0, sizeof (gpr_cmdline)); cl->description = description; cl->state = normal_state; @@ -78,25 +83,30 @@ gpr_cmdline *gpr_cmdline_create(const char *description) { return cl; } -void gpr_cmdline_destroy(gpr_cmdline *cl) { - while (cl->args) { - arg *a = cl->args; - cl->args = a->next; - gpr_free(a); - } - gpr_free(cl); +void +gpr_cmdline_destroy (gpr_cmdline * cl) +{ + while (cl->args) + { + arg *a = cl->args; + cl->args = a->next; + gpr_free (a); + } + gpr_free (cl); } -static void add_arg(gpr_cmdline *cl, const char *name, const char *help, - argtype type, void *value) { +static void +add_arg (gpr_cmdline * cl, const char *name, const char *help, argtype type, void *value) +{ arg *a; - for (a = cl->args; a; a = a->next) { - GPR_ASSERT(0 != strcmp(a->name, name)); - } + for (a = cl->args; a; a = a->next) + { + GPR_ASSERT (0 != strcmp (a->name, name)); + } - a = gpr_malloc(sizeof(arg)); - memset(a, 0, sizeof(arg)); + a = gpr_malloc (sizeof (arg)); + memset (a, 0, sizeof (arg)); a->name = name; a->help = help; a->type = type; @@ -105,26 +115,29 @@ static void add_arg(gpr_cmdline *cl, const char *name, const char *help, cl->args = a; } -void gpr_cmdline_add_int(gpr_cmdline *cl, const char *name, const char *help, - int *value) { - add_arg(cl, name, help, ARGTYPE_INT, value); +void +gpr_cmdline_add_int (gpr_cmdline * cl, const char *name, const char *help, int *value) +{ + add_arg (cl, name, help, ARGTYPE_INT, value); } -void gpr_cmdline_add_flag(gpr_cmdline *cl, const char *name, const char *help, - int *value) { - add_arg(cl, name, help, ARGTYPE_BOOL, value); +void +gpr_cmdline_add_flag (gpr_cmdline * cl, const char *name, const char *help, int *value) +{ + add_arg (cl, name, help, ARGTYPE_BOOL, value); } -void gpr_cmdline_add_string(gpr_cmdline *cl, const char *name, const char *help, - char **value) { - add_arg(cl, name, help, ARGTYPE_STRING, value); +void +gpr_cmdline_add_string (gpr_cmdline * cl, const char *name, const char *help, char **value) +{ + add_arg (cl, name, help, ARGTYPE_STRING, value); } -void gpr_cmdline_on_extra_arg( - gpr_cmdline *cl, const char *name, const char *help, - void (*on_extra_arg)(void *user_data, const char *arg), void *user_data) { - GPR_ASSERT(!cl->extra_arg); - GPR_ASSERT(on_extra_arg); +void +gpr_cmdline_on_extra_arg (gpr_cmdline * cl, const char *name, const char *help, void (*on_extra_arg) (void *user_data, const char *arg), void *user_data) +{ + GPR_ASSERT (!cl->extra_arg); + GPR_ASSERT (on_extra_arg); cl->extra_arg = on_extra_arg; cl->extra_arg_user_data = user_data; @@ -135,189 +148,238 @@ void gpr_cmdline_on_extra_arg( /* recursively descend argument list, adding the last element to s first - so that arguments are added in the order they were added to the list by api calls */ -static void add_args_to_usage(gpr_strvec *s, arg *a) { +static void +add_args_to_usage (gpr_strvec * s, arg * a) +{ char *tmp; - if (!a) return; - add_args_to_usage(s, a->next); + if (!a) + return; + add_args_to_usage (s, a->next); - switch (a->type) { + switch (a->type) + { case ARGTYPE_BOOL: - gpr_asprintf(&tmp, " [--%s|--no-%s]", a->name, a->name); - gpr_strvec_add(s, tmp); + gpr_asprintf (&tmp, " [--%s|--no-%s]", a->name, a->name); + gpr_strvec_add (s, tmp); break; case ARGTYPE_STRING: - gpr_asprintf(&tmp, " [--%s=string]", a->name); - gpr_strvec_add(s, tmp); + gpr_asprintf (&tmp, " [--%s=string]", a->name); + gpr_strvec_add (s, tmp); break; case ARGTYPE_INT: - gpr_asprintf(&tmp, " [--%s=int]", a->name); - gpr_strvec_add(s, tmp); + gpr_asprintf (&tmp, " [--%s=int]", a->name); + gpr_strvec_add (s, tmp); break; - } + } } -char *gpr_cmdline_usage_string(gpr_cmdline *cl, const char *argv0) { +char * +gpr_cmdline_usage_string (gpr_cmdline * cl, const char *argv0) +{ /* TODO(ctiller): make this prettier */ gpr_strvec s; char *tmp; - const char *name = strrchr(argv0, '/'); - - if (name) { - name++; - } else { - name = argv0; - } - - gpr_strvec_init(&s); - - gpr_asprintf(&tmp, "Usage: %s", name); - gpr_strvec_add(&s, tmp); - add_args_to_usage(&s, cl->args); - if (cl->extra_arg) { - gpr_asprintf(&tmp, " [%s...]", cl->extra_arg_name); - gpr_strvec_add(&s, tmp); - } - gpr_strvec_add(&s, gpr_strdup("\n")); - - tmp = gpr_strvec_flatten(&s, NULL); - gpr_strvec_destroy(&s); + const char *name = strrchr (argv0, '/'); + + if (name) + { + name++; + } + else + { + name = argv0; + } + + gpr_strvec_init (&s); + + gpr_asprintf (&tmp, "Usage: %s", name); + gpr_strvec_add (&s, tmp); + add_args_to_usage (&s, cl->args); + if (cl->extra_arg) + { + gpr_asprintf (&tmp, " [%s...]", cl->extra_arg_name); + gpr_strvec_add (&s, tmp); + } + gpr_strvec_add (&s, gpr_strdup ("\n")); + + tmp = gpr_strvec_flatten (&s, NULL); + gpr_strvec_destroy (&s); return tmp; } -static void print_usage_and_die(gpr_cmdline *cl) { - char *usage = gpr_cmdline_usage_string(cl, cl->argv0); - fprintf(stderr, "%s", usage); - gpr_free(usage); - exit(1); +static void +print_usage_and_die (gpr_cmdline * cl) +{ + char *usage = gpr_cmdline_usage_string (cl, cl->argv0); + fprintf (stderr, "%s", usage); + gpr_free (usage); + exit (1); } -static void extra_state(gpr_cmdline *cl, char *arg) { - if (!cl->extra_arg) print_usage_and_die(cl); - cl->extra_arg(cl->extra_arg_user_data, arg); +static void +extra_state (gpr_cmdline * cl, char *arg) +{ + if (!cl->extra_arg) + print_usage_and_die (cl); + cl->extra_arg (cl->extra_arg_user_data, arg); } -static arg *find_arg(gpr_cmdline *cl, char *name) { +static arg * +find_arg (gpr_cmdline * cl, char *name) +{ arg *a; - for (a = cl->args; a; a = a->next) { - if (0 == strcmp(a->name, name)) { - break; + for (a = cl->args; a; a = a->next) + { + if (0 == strcmp (a->name, name)) + { + break; + } } - } - if (!a) { - fprintf(stderr, "Unknown argument: %s\n", name); - print_usage_and_die(cl); - } + if (!a) + { + fprintf (stderr, "Unknown argument: %s\n", name); + print_usage_and_die (cl); + } return a; } -static void value_state(gpr_cmdline *cl, char *arg) { +static void +value_state (gpr_cmdline * cl, char *arg) +{ long intval; char *end; - GPR_ASSERT(cl->cur_arg); + GPR_ASSERT (cl->cur_arg); - switch (cl->cur_arg->type) { + switch (cl->cur_arg->type) + { case ARGTYPE_INT: - intval = strtol(arg, &end, 0); - if (*end || intval < INT_MIN || intval > INT_MAX) { - fprintf(stderr, "expected integer, got '%s' for %s\n", arg, - cl->cur_arg->name); - print_usage_and_die(cl); - } - *(int *)cl->cur_arg->value = (int)intval; + intval = strtol (arg, &end, 0); + if (*end || intval < INT_MIN || intval > INT_MAX) + { + fprintf (stderr, "expected integer, got '%s' for %s\n", arg, cl->cur_arg->name); + print_usage_and_die (cl); + } + *(int *) cl->cur_arg->value = (int) intval; break; case ARGTYPE_BOOL: - if (0 == strcmp(arg, "1") || 0 == strcmp(arg, "true")) { - *(int *)cl->cur_arg->value = 1; - } else if (0 == strcmp(arg, "0") || 0 == strcmp(arg, "false")) { - *(int *)cl->cur_arg->value = 0; - } else { - fprintf(stderr, "expected boolean, got '%s' for %s\n", arg, - cl->cur_arg->name); - print_usage_and_die(cl); - } + if (0 == strcmp (arg, "1") || 0 == strcmp (arg, "true")) + { + *(int *) cl->cur_arg->value = 1; + } + else if (0 == strcmp (arg, "0") || 0 == strcmp (arg, "false")) + { + *(int *) cl->cur_arg->value = 0; + } + else + { + fprintf (stderr, "expected boolean, got '%s' for %s\n", arg, cl->cur_arg->name); + print_usage_and_die (cl); + } break; case ARGTYPE_STRING: - *(char **)cl->cur_arg->value = arg; + *(char **) cl->cur_arg->value = arg; break; - } + } cl->state = normal_state; } -static void normal_state(gpr_cmdline *cl, char *arg) { +static void +normal_state (gpr_cmdline * cl, char *arg) +{ char *eq = NULL; char *tmp = NULL; char *arg_name = NULL; - if (0 == strcmp(arg, "-help") || 0 == strcmp(arg, "--help") || - 0 == strcmp(arg, "-h")) { - print_usage_and_die(cl); - } + if (0 == strcmp (arg, "-help") || 0 == strcmp (arg, "--help") || 0 == strcmp (arg, "-h")) + { + print_usage_and_die (cl); + } cl->cur_arg = NULL; - if (arg[0] == '-') { - if (arg[1] == '-') { - if (arg[2] == 0) { - /* handle '--' to move to just extra args */ - cl->state = extra_state; - return; - } - arg += 2; - } else { - arg += 1; - } - /* first byte of arg is now past the leading '-' or '--' */ - if (arg[0] == 'n' && arg[1] == 'o' && arg[2] == '-') { - /* arg is of the form '--no-foo' - it's a flag disable */ - arg += 3; - cl->cur_arg = find_arg(cl, arg); - if (cl->cur_arg->type != ARGTYPE_BOOL) { - fprintf(stderr, "%s is not a flag argument\n", arg); - print_usage_and_die(cl); - } - *(int *)cl->cur_arg->value = 0; - return; /* early out */ + if (arg[0] == '-') + { + if (arg[1] == '-') + { + if (arg[2] == 0) + { + /* handle '--' to move to just extra args */ + cl->state = extra_state; + return; + } + arg += 2; + } + else + { + arg += 1; + } + /* first byte of arg is now past the leading '-' or '--' */ + if (arg[0] == 'n' && arg[1] == 'o' && arg[2] == '-') + { + /* arg is of the form '--no-foo' - it's a flag disable */ + arg += 3; + cl->cur_arg = find_arg (cl, arg); + if (cl->cur_arg->type != ARGTYPE_BOOL) + { + fprintf (stderr, "%s is not a flag argument\n", arg); + print_usage_and_die (cl); + } + *(int *) cl->cur_arg->value = 0; + return; /* early out */ + } + eq = strchr (arg, '='); + if (eq != NULL) + { + /* copy the string into a temp buffer and extract the name */ + tmp = arg_name = gpr_malloc ((size_t) (eq - arg + 1)); + memcpy (arg_name, arg, (size_t) (eq - arg)); + arg_name[eq - arg] = 0; + } + else + { + arg_name = arg; + } + cl->cur_arg = find_arg (cl, arg_name); + if (eq != NULL) + { + /* arg was of the type --foo=value, parse the value */ + value_state (cl, eq + 1); + } + else if (cl->cur_arg->type != ARGTYPE_BOOL) + { + /* flag types don't have a '--foo value' variant, other types do */ + cl->state = value_state; + } + else + { + /* flag parameter: just set the value */ + *(int *) cl->cur_arg->value = 1; + } } - eq = strchr(arg, '='); - if (eq != NULL) { - /* copy the string into a temp buffer and extract the name */ - tmp = arg_name = gpr_malloc((size_t)(eq - arg + 1)); - memcpy(arg_name, arg, (size_t)(eq - arg)); - arg_name[eq - arg] = 0; - } else { - arg_name = arg; + else + { + extra_state (cl, arg); } - cl->cur_arg = find_arg(cl, arg_name); - if (eq != NULL) { - /* arg was of the type --foo=value, parse the value */ - value_state(cl, eq + 1); - } else if (cl->cur_arg->type != ARGTYPE_BOOL) { - /* flag types don't have a '--foo value' variant, other types do */ - cl->state = value_state; - } else { - /* flag parameter: just set the value */ - *(int *)cl->cur_arg->value = 1; - } - } else { - extra_state(cl, arg); - } - gpr_free(tmp); + gpr_free (tmp); } -void gpr_cmdline_parse(gpr_cmdline *cl, int argc, char **argv) { +void +gpr_cmdline_parse (gpr_cmdline * cl, int argc, char **argv) +{ int i; - GPR_ASSERT(argc >= 1); + GPR_ASSERT (argc >= 1); cl->argv0 = argv[0]; - for (i = 1; i < argc; i++) { - cl->state(cl, argv[i]); - } + for (i = 1; i < argc; i++) + { + cl->state (cl, argv[i]); + } } diff --git a/src/core/support/cpu_iphone.c b/src/core/support/cpu_iphone.c index 82b49b47bc0..0d679414acd 100644 --- a/src/core/support/cpu_iphone.c +++ b/src/core/support/cpu_iphone.c @@ -36,7 +36,11 @@ #ifdef GPR_CPU_IPHONE /* Probably 2 instead of 1, but see comment on gpr_cpu_current_cpu. */ -unsigned gpr_cpu_num_cores(void) { return 1; } +unsigned +gpr_cpu_num_cores (void) +{ + return 1; +} /* Most code that's using this is using it to shard across work queues. So unless profiling shows it's a problem or there appears a way to detect the @@ -44,6 +48,10 @@ unsigned gpr_cpu_num_cores(void) { return 1; } Note that the interface in cpu.h lets gpr_cpu_num_cores return 0, but doing it makes it impossible for gpr_cpu_current_cpu to satisfy its stated range, and some code might be relying on it. */ -unsigned gpr_cpu_current_cpu(void) { return 0; } +unsigned +gpr_cpu_current_cpu (void) +{ + return 0; +} #endif /* GPR_CPU_IPHONE */ diff --git a/src/core/support/cpu_linux.c b/src/core/support/cpu_linux.c index 7af6a8f0090..b969218ba9b 100644 --- a/src/core/support/cpu_linux.c +++ b/src/core/support/cpu_linux.c @@ -50,29 +50,37 @@ static int ncpus = 0; -static void init_num_cpus() { +static void +init_num_cpus () +{ /* This must be signed. sysconf returns -1 when the number cannot be determined */ - ncpus = (int)sysconf(_SC_NPROCESSORS_ONLN); - if (ncpus < 1) { - gpr_log(GPR_ERROR, "Cannot determine number of CPUs: assuming 1"); - ncpus = 1; - } + ncpus = (int) sysconf (_SC_NPROCESSORS_ONLN); + if (ncpus < 1) + { + gpr_log (GPR_ERROR, "Cannot determine number of CPUs: assuming 1"); + ncpus = 1; + } } -unsigned gpr_cpu_num_cores(void) { +unsigned +gpr_cpu_num_cores (void) +{ static gpr_once once = GPR_ONCE_INIT; - gpr_once_init(&once, init_num_cpus); - return (unsigned)ncpus; + gpr_once_init (&once, init_num_cpus); + return (unsigned) ncpus; } -unsigned gpr_cpu_current_cpu(void) { - int cpu = sched_getcpu(); - if (cpu < 0) { - gpr_log(GPR_ERROR, "Error determining current CPU: %s\n", strerror(errno)); - return 0; - } - return (unsigned)cpu; +unsigned +gpr_cpu_current_cpu (void) +{ + int cpu = sched_getcpu (); + if (cpu < 0) + { + gpr_log (GPR_ERROR, "Error determining current CPU: %s\n", strerror (errno)); + return 0; + } + return (unsigned) cpu; } #endif /* GPR_CPU_LINUX */ diff --git a/src/core/support/cpu_posix.c b/src/core/support/cpu_posix.c index 55d92c0555f..22282cae9fc 100644 --- a/src/core/support/cpu_posix.c +++ b/src/core/support/cpu_posix.c @@ -46,32 +46,41 @@ static __thread char magic_thread_local; static long ncpus = 0; -static void init_ncpus() { - ncpus = sysconf(_SC_NPROCESSORS_ONLN); - if (ncpus < 1 || ncpus > GPR_UINT32_MAX) { - gpr_log(GPR_ERROR, "Cannot determine number of CPUs: assuming 1"); - ncpus = 1; - } +static void +init_ncpus () +{ + ncpus = sysconf (_SC_NPROCESSORS_ONLN); + if (ncpus < 1 || ncpus > GPR_UINT32_MAX) + { + gpr_log (GPR_ERROR, "Cannot determine number of CPUs: assuming 1"); + ncpus = 1; + } } -unsigned gpr_cpu_num_cores(void) { +unsigned +gpr_cpu_num_cores (void) +{ static gpr_once once = GPR_ONCE_INIT; - gpr_once_init(&once, init_ncpus); - return (unsigned)ncpus; + gpr_once_init (&once, init_ncpus); + return (unsigned) ncpus; } /* This is a cheap, but good enough, pointer hash for sharding things: */ -static size_t shard_ptr(const void *info) { - size_t x = (size_t)info; - return ((x >> 4) ^ (x >> 9) ^ (x >> 14)) % gpr_cpu_num_cores(); +static size_t +shard_ptr (const void *info) +{ + size_t x = (size_t) info; + return ((x >> 4) ^ (x >> 9) ^ (x >> 14)) % gpr_cpu_num_cores (); } -unsigned gpr_cpu_current_cpu(void) { +unsigned +gpr_cpu_current_cpu (void) +{ /* NOTE: there's no way I know to return the actual cpu index portably... most code that's using this is using it to shard across work queues though, so here we use thread identity instead to achieve a similar though not identical effect */ - return (unsigned)shard_ptr(&magic_thread_local); + return (unsigned) shard_ptr (&magic_thread_local); } #endif /* GPR_CPU_POSIX */ diff --git a/src/core/support/cpu_windows.c b/src/core/support/cpu_windows.c index ce32eb0a9d6..e6696db913a 100644 --- a/src/core/support/cpu_windows.c +++ b/src/core/support/cpu_windows.c @@ -36,12 +36,18 @@ #ifdef GPR_WIN32 #include -unsigned gpr_cpu_num_cores(void) { +unsigned +gpr_cpu_num_cores (void) +{ SYSTEM_INFO si; - GetSystemInfo(&si); + GetSystemInfo (&si); return si.dwNumberOfProcessors; } -unsigned gpr_cpu_current_cpu(void) { return GetCurrentProcessorNumber(); } +unsigned +gpr_cpu_current_cpu (void) +{ + return GetCurrentProcessorNumber (); +} #endif /* GPR_WIN32 */ diff --git a/src/core/support/env.h b/src/core/support/env.h index 24172d86737..69887b2c49c 100644 --- a/src/core/support/env.h +++ b/src/core/support/env.h @@ -39,7 +39,8 @@ #include #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif /* Env utility functions */ @@ -48,13 +49,13 @@ extern "C" { Returns a newly allocated string. It is the responsability of the caller to gpr_free the return value if not NULL (which means that the environment variable exists). */ -char *gpr_getenv(const char *name); + char *gpr_getenv (const char *name); /* Sets the the environment with the specified name to the specified value. */ -void gpr_setenv(const char *name, const char *value); + void gpr_setenv (const char *name, const char *value); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_SUPPORT_ENV_H */ +#endif /* GRPC_INTERNAL_CORE_SUPPORT_ENV_H */ diff --git a/src/core/support/env_linux.c b/src/core/support/env_linux.c index 2e03365e338..cdb6c759502 100644 --- a/src/core/support/env_linux.c +++ b/src/core/support/env_linux.c @@ -49,14 +49,18 @@ #include "src/core/support/string.h" -char *gpr_getenv(const char *name) { - char *result = secure_getenv(name); - return result == NULL ? result : gpr_strdup(result); +char * +gpr_getenv (const char *name) +{ + char *result = secure_getenv (name); + return result == NULL ? result : gpr_strdup (result); } -void gpr_setenv(const char *name, const char *value) { - int res = setenv(name, value, 1); - GPR_ASSERT(res == 0); +void +gpr_setenv (const char *name, const char *value) +{ + int res = setenv (name, value, 1); + GPR_ASSERT (res == 0); } #endif /* GPR_LINUX_ENV */ diff --git a/src/core/support/env_posix.c b/src/core/support/env_posix.c index 1dd2af56bcb..e30b67ed20b 100644 --- a/src/core/support/env_posix.c +++ b/src/core/support/env_posix.c @@ -44,14 +44,18 @@ #include "src/core/support/string.h" #include -char *gpr_getenv(const char *name) { - char *result = getenv(name); - return result == NULL ? result : gpr_strdup(result); +char * +gpr_getenv (const char *name) +{ + char *result = getenv (name); + return result == NULL ? result : gpr_strdup (result); } -void gpr_setenv(const char *name, const char *value) { - int res = setenv(name, value, 1); - GPR_ASSERT(res == 0); +void +gpr_setenv (const char *name, const char *value) +{ + int res = setenv (name, value, 1); + GPR_ASSERT (res == 0); } #endif /* GPR_POSIX_ENV */ diff --git a/src/core/support/env_win32.c b/src/core/support/env_win32.c index 6b1ff102b04..976f031eb1f 100644 --- a/src/core/support/env_win32.c +++ b/src/core/support/env_win32.c @@ -44,22 +44,27 @@ #include #include -char *gpr_getenv(const char *name) { +char * +gpr_getenv (const char *name) +{ size_t size; char *result = NULL; char *duplicated; errno_t err; - err = _dupenv_s(&result, &size, name); - if (err) return NULL; - duplicated = gpr_strdup(result); - free(result); + err = _dupenv_s (&result, &size, name); + if (err) + return NULL; + duplicated = gpr_strdup (result); + free (result); return duplicated; } -void gpr_setenv(const char *name, const char *value) { - errno_t res = _putenv_s(name, value); - GPR_ASSERT(res == 0); +void +gpr_setenv (const char *name, const char *value) +{ + errno_t res = _putenv_s (name, value); + GPR_ASSERT (res == 0); } #endif /* GPR_WIN32 */ diff --git a/src/core/support/file.c b/src/core/support/file.c index c1361d8a9e3..96ca7e19da1 100644 --- a/src/core/support/file.c +++ b/src/core/support/file.c @@ -42,46 +42,52 @@ #include "src/core/support/string.h" -gpr_slice gpr_load_file(const char *filename, int add_null_terminator, - int *success) { +gpr_slice +gpr_load_file (const char *filename, int add_null_terminator, int *success) +{ unsigned char *contents = NULL; size_t contents_size = 0; char *error_msg = NULL; - gpr_slice result = gpr_empty_slice(); - FILE *file = fopen(filename, "rb"); + gpr_slice result = gpr_empty_slice (); + FILE *file = fopen (filename, "rb"); size_t bytes_read = 0; - if (file == NULL) { - gpr_asprintf(&error_msg, "Could not open file %s (error = %s).", filename, - strerror(errno)); - GPR_ASSERT(error_msg != NULL); - goto end; - } - fseek(file, 0, SEEK_END); + if (file == NULL) + { + gpr_asprintf (&error_msg, "Could not open file %s (error = %s).", filename, strerror (errno)); + GPR_ASSERT (error_msg != NULL); + goto end; + } + fseek (file, 0, SEEK_END); /* Converting to size_t on the assumption that it will not fail */ - contents_size = (size_t)ftell(file); - fseek(file, 0, SEEK_SET); - contents = gpr_malloc(contents_size + (add_null_terminator ? 1 : 0)); - bytes_read = fread(contents, 1, contents_size, file); - if (bytes_read < contents_size) { - GPR_ASSERT(ferror(file)); - gpr_asprintf(&error_msg, "Error %s occured while reading file %s.", - strerror(errno), filename); - GPR_ASSERT(error_msg != NULL); - goto end; - } - if (success != NULL) *success = 1; - if (add_null_terminator) { - contents[contents_size++] = 0; - } - result = gpr_slice_new(contents, contents_size, gpr_free); + contents_size = (size_t) ftell (file); + fseek (file, 0, SEEK_SET); + contents = gpr_malloc (contents_size + (add_null_terminator ? 1 : 0)); + bytes_read = fread (contents, 1, contents_size, file); + if (bytes_read < contents_size) + { + GPR_ASSERT (ferror (file)); + gpr_asprintf (&error_msg, "Error %s occured while reading file %s.", strerror (errno), filename); + GPR_ASSERT (error_msg != NULL); + goto end; + } + if (success != NULL) + *success = 1; + if (add_null_terminator) + { + contents[contents_size++] = 0; + } + result = gpr_slice_new (contents, contents_size, gpr_free); end: - if (error_msg != NULL) { - gpr_log(GPR_ERROR, "%s", error_msg); - gpr_free(error_msg); - if (success != NULL) *success = 0; - } - if (file != NULL) fclose(file); + if (error_msg != NULL) + { + gpr_log (GPR_ERROR, "%s", error_msg); + gpr_free (error_msg); + if (success != NULL) + *success = 0; + } + if (file != NULL) + fclose (file); return result; } diff --git a/src/core/support/file.h b/src/core/support/file.h index d8b7cea44fd..9b42f09f765 100644 --- a/src/core/support/file.h +++ b/src/core/support/file.h @@ -39,7 +39,8 @@ #include #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif /* File utility functions */ @@ -47,17 +48,16 @@ extern "C" { /* Loads the content of a file into a slice. add_null_terminator will add a NULL terminator if non-zero. The success parameter, if not NULL, will be set to 1 in case of success and 0 in case of failure. */ -gpr_slice gpr_load_file(const char *filename, int add_null_terminator, - int *success); + gpr_slice gpr_load_file (const char *filename, int add_null_terminator, int *success); /* Creates a temporary file from a prefix. If tmp_filename is not NULL, *tmp_filename is assigned the name of the created file and it is the responsibility of the caller to gpr_free it unless an error occurs in which case it will be set to NULL. */ -FILE *gpr_tmpfile(const char *prefix, char **tmp_filename); + FILE *gpr_tmpfile (const char *prefix, char **tmp_filename); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_SUPPORT_FILE_H */ +#endif /* GRPC_INTERNAL_CORE_SUPPORT_FILE_H */ diff --git a/src/core/support/file_posix.c b/src/core/support/file_posix.c index c11c07148ab..d68a334eea7 100644 --- a/src/core/support/file_posix.c +++ b/src/core/support/file_posix.c @@ -48,37 +48,43 @@ #include "src/core/support/string.h" -FILE *gpr_tmpfile(const char *prefix, char **tmp_filename) { +FILE * +gpr_tmpfile (const char *prefix, char **tmp_filename) +{ FILE *result = NULL; char *template; int fd; - if (tmp_filename != NULL) *tmp_filename = NULL; + if (tmp_filename != NULL) + *tmp_filename = NULL; - gpr_asprintf(&template, "/tmp/%s_XXXXXX", prefix); - GPR_ASSERT(template != NULL); + gpr_asprintf (&template, "/tmp/%s_XXXXXX", prefix); + GPR_ASSERT (template != NULL); - fd = mkstemp(template); - if (fd == -1) { - gpr_log(GPR_ERROR, "mkstemp failed for template %s with error %s.", - template, strerror(errno)); - goto end; - } - result = fdopen(fd, "w+"); - if (result == NULL) { - gpr_log(GPR_ERROR, "Could not open file %s from fd %d (error = %s).", - template, fd, strerror(errno)); - unlink(template); - close(fd); - goto end; - } + fd = mkstemp (template); + if (fd == -1) + { + gpr_log (GPR_ERROR, "mkstemp failed for template %s with error %s.", template, strerror (errno)); + goto end; + } + result = fdopen (fd, "w+"); + if (result == NULL) + { + gpr_log (GPR_ERROR, "Could not open file %s from fd %d (error = %s).", template, fd, strerror (errno)); + unlink (template); + close (fd); + goto end; + } end: - if (result != NULL && tmp_filename != NULL) { - *tmp_filename = template; - } else { - gpr_free(template); - } + if (result != NULL && tmp_filename != NULL) + { + *tmp_filename = template; + } + else + { + gpr_free (template); + } return result; } diff --git a/src/core/support/file_win32.c b/src/core/support/file_win32.c index 355744f79a5..26c1c2664f8 100644 --- a/src/core/support/file_win32.c +++ b/src/core/support/file_win32.c @@ -47,7 +47,9 @@ #include "src/core/support/file.h" #include "src/core/support/string_win32.h" -FILE *gpr_tmpfile(const char *prefix, char **tmp_filename_out) { +FILE * +gpr_tmpfile (const char *prefix, char **tmp_filename_out) +{ FILE *result = NULL; LPTSTR template_string = NULL; TCHAR tmp_path[MAX_PATH]; @@ -55,29 +57,34 @@ FILE *gpr_tmpfile(const char *prefix, char **tmp_filename_out) { DWORD status; UINT success; - if (tmp_filename_out != NULL) *tmp_filename_out = NULL; + if (tmp_filename_out != NULL) + *tmp_filename_out = NULL; /* Convert our prefix to TCHAR. */ - template_string = gpr_char_to_tchar(prefix); - GPR_ASSERT(template_string); + template_string = gpr_char_to_tchar (prefix); + GPR_ASSERT (template_string); /* Get the path to the best temporary folder available. */ - status = GetTempPath(MAX_PATH, tmp_path); - if (status == 0 || status > MAX_PATH) goto end; + status = GetTempPath (MAX_PATH, tmp_path); + if (status == 0 || status > MAX_PATH) + goto end; /* Generate a unique filename with our template + temporary path. */ - success = GetTempFileName(tmp_path, template_string, 0, tmp_filename); - if (!success) goto end; + success = GetTempFileName (tmp_path, template_string, 0, tmp_filename); + if (!success) + goto end; /* Open a file there. */ - if (_tfopen_s(&result, tmp_filename, TEXT("wb+")) != 0) goto end; + if (_tfopen_s (&result, tmp_filename, TEXT ("wb+")) != 0) + goto end; end: - if (result && tmp_filename_out) { - *tmp_filename_out = gpr_tchar_to_char(tmp_filename); - } + if (result && tmp_filename_out) + { + *tmp_filename_out = gpr_tchar_to_char (tmp_filename); + } - gpr_free(template_string); + gpr_free (template_string); return result; } diff --git a/src/core/support/histogram.c b/src/core/support/histogram.c index 78dbf98684a..0383c5433b4 100644 --- a/src/core/support/histogram.c +++ b/src/core/support/histogram.c @@ -47,7 +47,8 @@ Bucket n (n>=1) contains [m**n, m**(n+1)) There are sufficient buckets to reach max_bucket_start */ -struct gpr_histogram { +struct gpr_histogram +{ /* Sum of all values seen so far */ double sum; /* Sum of squares of all values seen so far */ @@ -70,175 +71,224 @@ struct gpr_histogram { }; /* determine a bucket index given a value - does no bounds checking */ -static size_t bucket_for_unchecked(gpr_histogram *h, double x) { - return (size_t)(log(x) * h->one_on_log_multiplier); +static size_t +bucket_for_unchecked (gpr_histogram * h, double x) +{ + return (size_t) (log (x) * h->one_on_log_multiplier); } /* bounds checked version of the above */ -static size_t bucket_for(gpr_histogram *h, double x) { - size_t bucket = bucket_for_unchecked(h, GPR_CLAMP(x, 1.0, h->max_possible)); - GPR_ASSERT(bucket < h->num_buckets); +static size_t +bucket_for (gpr_histogram * h, double x) +{ + size_t bucket = bucket_for_unchecked (h, GPR_CLAMP (x, 1.0, h->max_possible)); + GPR_ASSERT (bucket < h->num_buckets); return bucket; } /* at what value does a bucket start? */ -static double bucket_start(gpr_histogram *h, double x) { - return pow(h->multiplier, x); +static double +bucket_start (gpr_histogram * h, double x) +{ + return pow (h->multiplier, x); } -gpr_histogram *gpr_histogram_create(double resolution, - double max_bucket_start) { - gpr_histogram *h = gpr_malloc(sizeof(gpr_histogram)); - GPR_ASSERT(resolution > 0.0); - GPR_ASSERT(max_bucket_start > resolution); +gpr_histogram * +gpr_histogram_create (double resolution, double max_bucket_start) +{ + gpr_histogram *h = gpr_malloc (sizeof (gpr_histogram)); + GPR_ASSERT (resolution > 0.0); + GPR_ASSERT (max_bucket_start > resolution); h->sum = 0.0; h->sum_of_squares = 0.0; h->multiplier = 1.0 + resolution; - h->one_on_log_multiplier = 1.0 / log(1.0 + resolution); + h->one_on_log_multiplier = 1.0 / log (1.0 + resolution); h->max_possible = max_bucket_start; h->count = 0.0; h->min_seen = max_bucket_start; h->max_seen = 0.0; - h->num_buckets = bucket_for_unchecked(h, max_bucket_start) + 1; - GPR_ASSERT(h->num_buckets > 1); - GPR_ASSERT(h->num_buckets < 100000000); - h->buckets = gpr_malloc(sizeof(gpr_uint32) * h->num_buckets); - memset(h->buckets, 0, sizeof(gpr_uint32) * h->num_buckets); + h->num_buckets = bucket_for_unchecked (h, max_bucket_start) + 1; + GPR_ASSERT (h->num_buckets > 1); + GPR_ASSERT (h->num_buckets < 100000000); + h->buckets = gpr_malloc (sizeof (gpr_uint32) * h->num_buckets); + memset (h->buckets, 0, sizeof (gpr_uint32) * h->num_buckets); return h; } -void gpr_histogram_destroy(gpr_histogram *h) { - gpr_free(h->buckets); - gpr_free(h); +void +gpr_histogram_destroy (gpr_histogram * h) +{ + gpr_free (h->buckets); + gpr_free (h); } -void gpr_histogram_add(gpr_histogram *h, double x) { +void +gpr_histogram_add (gpr_histogram * h, double x) +{ h->sum += x; h->sum_of_squares += x * x; h->count++; - if (x < h->min_seen) { - h->min_seen = x; - } - if (x > h->max_seen) { - h->max_seen = x; - } - h->buckets[bucket_for(h, x)]++; -} - -int gpr_histogram_merge(gpr_histogram *dst, gpr_histogram *src) { - if ((dst->num_buckets != src->num_buckets) || - (dst->multiplier != src->multiplier)) { - /* Fail because these histograms don't match */ - return 0; - } - gpr_histogram_merge_contents(dst, src->buckets, src->num_buckets, - src->min_seen, src->max_seen, src->sum, - src->sum_of_squares, src->count); + if (x < h->min_seen) + { + h->min_seen = x; + } + if (x > h->max_seen) + { + h->max_seen = x; + } + h->buckets[bucket_for (h, x)]++; +} + +int +gpr_histogram_merge (gpr_histogram * dst, gpr_histogram * src) +{ + if ((dst->num_buckets != src->num_buckets) || (dst->multiplier != src->multiplier)) + { + /* Fail because these histograms don't match */ + return 0; + } + gpr_histogram_merge_contents (dst, src->buckets, src->num_buckets, src->min_seen, src->max_seen, src->sum, src->sum_of_squares, src->count); return 1; } -void gpr_histogram_merge_contents(gpr_histogram *dst, const gpr_uint32 *data, - size_t data_count, double min_seen, - double max_seen, double sum, - double sum_of_squares, double count) { +void +gpr_histogram_merge_contents (gpr_histogram * dst, const gpr_uint32 * data, size_t data_count, double min_seen, double max_seen, double sum, double sum_of_squares, double count) +{ size_t i; - GPR_ASSERT(dst->num_buckets == data_count); + GPR_ASSERT (dst->num_buckets == data_count); dst->sum += sum; dst->sum_of_squares += sum_of_squares; dst->count += count; - if (min_seen < dst->min_seen) { - dst->min_seen = min_seen; - } - if (max_seen > dst->max_seen) { - dst->max_seen = max_seen; - } - for (i = 0; i < dst->num_buckets; i++) { - dst->buckets[i] += data[i]; - } -} - -static double threshold_for_count_below(gpr_histogram *h, double count_below) { + if (min_seen < dst->min_seen) + { + dst->min_seen = min_seen; + } + if (max_seen > dst->max_seen) + { + dst->max_seen = max_seen; + } + for (i = 0; i < dst->num_buckets; i++) + { + dst->buckets[i] += data[i]; + } +} + +static double +threshold_for_count_below (gpr_histogram * h, double count_below) +{ double count_so_far; double lower_bound; double upper_bound; size_t lower_idx; size_t upper_idx; - if (h->count == 0) { - return 0.0; - } + if (h->count == 0) + { + return 0.0; + } - if (count_below <= 0) { - return h->min_seen; - } - if (count_below >= h->count) { - return h->max_seen; - } + if (count_below <= 0) + { + return h->min_seen; + } + if (count_below >= h->count) + { + return h->max_seen; + } /* find the lowest bucket that gets us above count_below */ count_so_far = 0.0; - for (lower_idx = 0; lower_idx < h->num_buckets; lower_idx++) { - count_so_far += h->buckets[lower_idx]; - if (count_so_far >= count_below) { - break; + for (lower_idx = 0; lower_idx < h->num_buckets; lower_idx++) + { + count_so_far += h->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 = lower_idx + 1; upper_idx < h->num_buckets; upper_idx++) + { + if (h->buckets[upper_idx]) + { + break; + } + } + return (bucket_start (h, (double) lower_idx) + bucket_start (h, (double) upper_idx)) / 2.0; } - } - 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 = lower_idx + 1; upper_idx < h->num_buckets; upper_idx++) { - if (h->buckets[upper_idx]) { - break; - } + else + { + /* treat values as uniform throughout the bucket, and find where this value + should lie */ + lower_bound = bucket_start (h, (double) lower_idx); + upper_bound = bucket_start (h, (double) (lower_idx + 1)); + return GPR_CLAMP (upper_bound - (upper_bound - lower_bound) * (count_so_far - count_below) / h->buckets[lower_idx], h->min_seen, h->max_seen); } - return (bucket_start(h, (double)lower_idx) + - bucket_start(h, (double)upper_idx)) / - 2.0; - } else { - /* treat values as uniform throughout the bucket, and find where this value - should lie */ - lower_bound = bucket_start(h, (double)lower_idx); - upper_bound = bucket_start(h, (double)(lower_idx + 1)); - return GPR_CLAMP(upper_bound - - (upper_bound - lower_bound) * - (count_so_far - count_below) / - h->buckets[lower_idx], - h->min_seen, h->max_seen); - } -} - -double gpr_histogram_percentile(gpr_histogram *h, double percentile) { - return threshold_for_count_below(h, h->count * percentile / 100.0); -} - -double gpr_histogram_mean(gpr_histogram *h) { - GPR_ASSERT(h->count); +} + +double +gpr_histogram_percentile (gpr_histogram * h, double percentile) +{ + return threshold_for_count_below (h, h->count * percentile / 100.0); +} + +double +gpr_histogram_mean (gpr_histogram * h) +{ + GPR_ASSERT (h->count); return h->sum / h->count; } -double gpr_histogram_stddev(gpr_histogram *h) { - return sqrt(gpr_histogram_variance(h)); +double +gpr_histogram_stddev (gpr_histogram * h) +{ + return sqrt (gpr_histogram_variance (h)); } -double gpr_histogram_variance(gpr_histogram *h) { - if (h->count == 0) return 0.0; - return (h->sum_of_squares * h->count - h->sum * h->sum) / - (h->count * h->count); +double +gpr_histogram_variance (gpr_histogram * h) +{ + if (h->count == 0) + return 0.0; + return (h->sum_of_squares * h->count - h->sum * h->sum) / (h->count * h->count); } -double gpr_histogram_maximum(gpr_histogram *h) { return h->max_seen; } +double +gpr_histogram_maximum (gpr_histogram * h) +{ + return h->max_seen; +} -double gpr_histogram_minimum(gpr_histogram *h) { return h->min_seen; } +double +gpr_histogram_minimum (gpr_histogram * h) +{ + return h->min_seen; +} -double gpr_histogram_count(gpr_histogram *h) { return h->count; } +double +gpr_histogram_count (gpr_histogram * h) +{ + return h->count; +} -double gpr_histogram_sum(gpr_histogram *h) { return h->sum; } +double +gpr_histogram_sum (gpr_histogram * h) +{ + return h->sum; +} -double gpr_histogram_sum_of_squares(gpr_histogram *h) { +double +gpr_histogram_sum_of_squares (gpr_histogram * h) +{ return h->sum_of_squares; } -const gpr_uint32 *gpr_histogram_get_contents(gpr_histogram *h, size_t *size) { +const gpr_uint32 * +gpr_histogram_get_contents (gpr_histogram * h, size_t * size) +{ *size = h->num_buckets; return h->buckets; } diff --git a/src/core/support/host_port.c b/src/core/support/host_port.c index a28f04df9ca..a95b9d0d81f 100644 --- a/src/core/support/host_port.c +++ b/src/core/support/host_port.c @@ -40,17 +40,24 @@ #include #include -int gpr_join_host_port(char **out, const char *host, int port) { - if (host[0] != '[' && strchr(host, ':') != NULL) { - /* IPv6 literals must be enclosed in brackets. */ - return gpr_asprintf(out, "[%s]:%d", host, port); - } else { - /* Ordinary non-bracketed host:port. */ - return gpr_asprintf(out, "%s:%d", host, port); - } +int +gpr_join_host_port (char **out, const char *host, int port) +{ + if (host[0] != '[' && strchr (host, ':') != NULL) + { + /* IPv6 literals must be enclosed in brackets. */ + return gpr_asprintf (out, "[%s]:%d", host, port); + } + else + { + /* Ordinary non-bracketed host:port. */ + return gpr_asprintf (out, "%s:%d", host, port); + } } -int gpr_split_host_port(const char *name, char **host, char **port) { +int +gpr_split_host_port (const char *name, char **host, char **port) +{ const char *host_start; size_t host_len; const char *port_start; @@ -58,53 +65,67 @@ int gpr_split_host_port(const char *name, char **host, char **port) { *host = NULL; *port = NULL; - if (name[0] == '[') { - /* Parse a bracketed host, typically an IPv6 literal. */ - const char *rbracket = strchr(name, ']'); - if (rbracket == NULL) { - /* Unmatched [ */ - return 0; - } - if (rbracket[1] == '\0') { - /* ] */ - port_start = NULL; - } else if (rbracket[1] == ':') { - /* ]: */ - port_start = rbracket + 2; - } else { - /* ] */ - return 0; + if (name[0] == '[') + { + /* Parse a bracketed host, typically an IPv6 literal. */ + const char *rbracket = strchr (name, ']'); + if (rbracket == NULL) + { + /* Unmatched [ */ + return 0; + } + if (rbracket[1] == '\0') + { + /* ] */ + port_start = NULL; + } + else if (rbracket[1] == ':') + { + /* ]: */ + port_start = rbracket + 2; + } + else + { + /* ] */ + return 0; + } + host_start = name + 1; + host_len = (size_t) (rbracket - host_start); + if (memchr (host_start, ':', host_len) == NULL) + { + /* Require all bracketed hosts to contain a colon, because a hostname or + IPv4 address should never use brackets. */ + return 0; + } } - host_start = name + 1; - host_len = (size_t)(rbracket - host_start); - if (memchr(host_start, ':', host_len) == NULL) { - /* Require all bracketed hosts to contain a colon, because a hostname or - IPv4 address should never use brackets. */ - return 0; + else + { + const char *colon = strchr (name, ':'); + if (colon != NULL && strchr (colon + 1, ':') == NULL) + { + /* Exactly 1 colon. Split into host:port. */ + host_start = name; + host_len = (size_t) (colon - name); + port_start = colon + 1; + } + else + { + /* 0 or 2+ colons. Bare hostname or IPv6 litearal. */ + host_start = name; + host_len = strlen (name); + port_start = NULL; + } } - } else { - const char *colon = strchr(name, ':'); - if (colon != NULL && strchr(colon + 1, ':') == NULL) { - /* Exactly 1 colon. Split into host:port. */ - host_start = name; - host_len = (size_t)(colon - name); - port_start = colon + 1; - } else { - /* 0 or 2+ colons. Bare hostname or IPv6 litearal. */ - host_start = name; - host_len = strlen(name); - port_start = NULL; - } - } /* Allocate return values. */ - *host = gpr_malloc(host_len + 1); - memcpy(*host, host_start, host_len); + *host = gpr_malloc (host_len + 1); + memcpy (*host, host_start, host_len); (*host)[host_len] = '\0'; - if (port_start != NULL) { - *port = gpr_strdup(port_start); - } + if (port_start != NULL) + { + *port = gpr_strdup (port_start); + } return 1; } diff --git a/src/core/support/log.c b/src/core/support/log.c index f52c2035b9c..60dcdf1369e 100644 --- a/src/core/support/log.c +++ b/src/core/support/log.c @@ -36,30 +36,38 @@ #include #include -extern void gpr_default_log(gpr_log_func_args *args); +extern void gpr_default_log (gpr_log_func_args * args); static gpr_log_func g_log_func = gpr_default_log; -const char *gpr_log_severity_string(gpr_log_severity severity) { - switch (severity) { +const char * +gpr_log_severity_string (gpr_log_severity severity) +{ + switch (severity) + { case GPR_LOG_SEVERITY_DEBUG: return "D"; case GPR_LOG_SEVERITY_INFO: return "I"; case GPR_LOG_SEVERITY_ERROR: return "E"; - } + } return "UNKNOWN"; } -void gpr_log_message(const char *file, int line, gpr_log_severity severity, - const char *message) { +void +gpr_log_message (const char *file, int line, gpr_log_severity severity, const char *message) +{ gpr_log_func_args lfargs; - memset(&lfargs, 0, sizeof(lfargs)); + memset (&lfargs, 0, sizeof (lfargs)); lfargs.file = file; lfargs.line = line; lfargs.severity = severity; lfargs.message = message; - g_log_func(&lfargs); + g_log_func (&lfargs); } -void gpr_set_log_function(gpr_log_func f) { g_log_func = f; } +void +gpr_set_log_function (gpr_log_func f) +{ + g_log_func = f; +} diff --git a/src/core/support/log_android.c b/src/core/support/log_android.c index 5d0c7d820d8..891281444df 100644 --- a/src/core/support/log_android.c +++ b/src/core/support/log_android.c @@ -42,46 +42,52 @@ #include #include -static android_LogPriority severity_to_log_priority(gpr_log_severity severity) { - switch (severity) { +static android_LogPriority +severity_to_log_priority (gpr_log_severity severity) +{ + switch (severity) + { case GPR_LOG_SEVERITY_DEBUG: return ANDROID_LOG_DEBUG; case GPR_LOG_SEVERITY_INFO: return ANDROID_LOG_INFO; case GPR_LOG_SEVERITY_ERROR: return ANDROID_LOG_ERROR; - } + } return ANDROID_LOG_DEFAULT; } -void gpr_log(const char *file, int line, gpr_log_severity severity, - const char *format, ...) { +void +gpr_log (const char *file, int line, gpr_log_severity severity, const char *format, ...) +{ char *message = NULL; va_list args; - va_start(args, format); - vasprintf(&message, format, args); - va_end(args); - gpr_log_message(file, line, severity, message); - free(message); + va_start (args, format); + vasprintf (&message, format, args); + va_end (args); + gpr_log_message (file, line, severity, message); + free (message); } -void gpr_default_log(gpr_log_func_args *args) { +void +gpr_default_log (gpr_log_func_args * args) +{ char *final_slash; const char *display_file; char *output = NULL; - final_slash = strrchr(args->file, '/'); + final_slash = strrchr (args->file, '/'); if (final_slash == NULL) display_file = args->file; else display_file = final_slash + 1; - asprintf(&output, "%s:%d] %s", display_file, args->line, args->message); + asprintf (&output, "%s:%d] %s", display_file, args->line, args->message); - __android_log_write(severity_to_log_priority(args->severity), "GRPC", output); + __android_log_write (severity_to_log_priority (args->severity), "GRPC", output); /* allocated by asprintf => use free, not gpr_free */ - free(output); + free (output); } #endif /* GPR_ANDROID */ diff --git a/src/core/support/log_linux.c b/src/core/support/log_linux.c index 02f64d8b7e4..7f52b74b0e4 100644 --- a/src/core/support/log_linux.c +++ b/src/core/support/log_linux.c @@ -55,49 +55,57 @@ #include #include -static long gettid(void) { return syscall(__NR_gettid); } +static long +gettid (void) +{ + return syscall (__NR_gettid); +} -void gpr_log(const char *file, int line, gpr_log_severity severity, - const char *format, ...) { +void +gpr_log (const char *file, int line, gpr_log_severity severity, const char *format, ...) +{ char *message = NULL; va_list args; - va_start(args, format); - if (vasprintf(&message, format, args) == -1) { - va_end(args); - return; - } - va_end(args); - gpr_log_message(file, line, severity, message); - free(message); + va_start (args, format); + if (vasprintf (&message, format, args) == -1) + { + va_end (args); + return; + } + va_end (args); + gpr_log_message (file, line, severity, message); + free (message); } -void gpr_default_log(gpr_log_func_args *args) { +void +gpr_default_log (gpr_log_func_args * args) +{ char *final_slash; char *prefix; const char *display_file; char time_buffer[64]; - gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + gpr_timespec now = gpr_now (GPR_CLOCK_REALTIME); struct tm tm; - final_slash = strrchr(args->file, '/'); + final_slash = strrchr (args->file, '/'); if (final_slash == NULL) display_file = args->file; else display_file = final_slash + 1; - if (!localtime_r(&now.tv_sec, &tm)) { - strcpy(time_buffer, "error:localtime"); - } else if (0 == - strftime(time_buffer, sizeof(time_buffer), "%m%d %H:%M:%S", &tm)) { - strcpy(time_buffer, "error:strftime"); - } + if (!localtime_r (&now.tv_sec, &tm)) + { + strcpy (time_buffer, "error:localtime"); + } + else if (0 == strftime (time_buffer, sizeof (time_buffer), "%m%d %H:%M:%S", &tm)) + { + strcpy (time_buffer, "error:strftime"); + } - gpr_asprintf(&prefix, "%s%s.%09d %7tu %s:%d]", - gpr_log_severity_string(args->severity), time_buffer, - (int)(now.tv_nsec), gettid(), display_file, args->line); + gpr_asprintf (&prefix, "%s%s.%09d %7tu %s:%d]", gpr_log_severity_string (args->severity), time_buffer, (int) (now.tv_nsec), gettid (), display_file, args->line); - fprintf(stderr, "%-60s %s\n", prefix, args->message); - gpr_free(prefix); + fprintf (stderr, "%-60s %s\n", prefix, args->message); + gpr_free (prefix); } #endif diff --git a/src/core/support/log_posix.c b/src/core/support/log_posix.c index 8b050dbee70..46ab98f140c 100644 --- a/src/core/support/log_posix.c +++ b/src/core/support/log_posix.c @@ -45,56 +45,67 @@ #include #include -static gpr_intptr gettid(void) { return (gpr_intptr)pthread_self(); } +static gpr_intptr +gettid (void) +{ + return (gpr_intptr) pthread_self (); +} -void gpr_log(const char *file, int line, gpr_log_severity severity, - const char *format, ...) { +void +gpr_log (const char *file, int line, gpr_log_severity severity, const char *format, ...) +{ char buf[64]; char *allocated = NULL; char *message = NULL; int ret; va_list args; - va_start(args, format); - ret = vsnprintf(buf, sizeof(buf), format, args); - va_end(args); - if (ret < 0) { - message = NULL; - } else if ((size_t)ret <= sizeof(buf) - 1) { - message = buf; - } else { - message = allocated = gpr_malloc((size_t)ret + 1); - va_start(args, format); - vsnprintf(message, (size_t)(ret + 1), format, args); - va_end(args); - } - gpr_log_message(file, line, severity, message); - gpr_free(allocated); + va_start (args, format); + ret = vsnprintf (buf, sizeof (buf), format, args); + va_end (args); + if (ret < 0) + { + message = NULL; + } + else if ((size_t) ret <= sizeof (buf) - 1) + { + message = buf; + } + else + { + message = allocated = gpr_malloc ((size_t) ret + 1); + va_start (args, format); + vsnprintf (message, (size_t) (ret + 1), format, args); + va_end (args); + } + gpr_log_message (file, line, severity, message); + gpr_free (allocated); } -void gpr_default_log(gpr_log_func_args *args) { +void +gpr_default_log (gpr_log_func_args * args) +{ char *final_slash; const char *display_file; char time_buffer[64]; - gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + gpr_timespec now = gpr_now (GPR_CLOCK_REALTIME); struct tm tm; - final_slash = strrchr(args->file, '/'); + final_slash = strrchr (args->file, '/'); if (final_slash == NULL) display_file = args->file; else display_file = final_slash + 1; - if (!localtime_r(&now.tv_sec, &tm)) { - strcpy(time_buffer, "error:localtime"); - } else if (0 == - strftime(time_buffer, sizeof(time_buffer), "%m%d %H:%M:%S", &tm)) { - strcpy(time_buffer, "error:strftime"); - } + if (!localtime_r (&now.tv_sec, &tm)) + { + strcpy (time_buffer, "error:localtime"); + } + else if (0 == strftime (time_buffer, sizeof (time_buffer), "%m%d %H:%M:%S", &tm)) + { + strcpy (time_buffer, "error:strftime"); + } - fprintf(stderr, "%s%s.%09d %7tu %s:%d] %s\n", - gpr_log_severity_string(args->severity), time_buffer, - (int)(now.tv_nsec), gettid(), display_file, args->line, - args->message); + fprintf (stderr, "%s%s.%09d %7tu %s:%d] %s\n", gpr_log_severity_string (args->severity), time_buffer, (int) (now.tv_nsec), gettid (), display_file, args->line, args->message); } #endif /* defined(GPR_POSIX_LOG) */ diff --git a/src/core/support/log_win32.c b/src/core/support/log_win32.c index b68239f8f58..aa31fa6de0f 100644 --- a/src/core/support/log_win32.c +++ b/src/core/support/log_win32.c @@ -47,76 +47,83 @@ #include "src/core/support/string.h" #include "src/core/support/string_win32.h" -void gpr_log(const char *file, int line, gpr_log_severity severity, - const char *format, ...) { +void +gpr_log (const char *file, int line, gpr_log_severity severity, const char *format, ...) +{ char *message = NULL; va_list args; int ret; /* Determine the length. */ - va_start(args, format); - ret = _vscprintf(format, args); - va_end(args); - if (ret < 0) { - message = NULL; - } else { - /* Allocate a new buffer, with space for the NUL terminator. */ - size_t strp_buflen = (size_t)ret + 1; - message = gpr_malloc(strp_buflen); - - /* Print to the buffer. */ - va_start(args, format); - ret = vsnprintf_s(message, strp_buflen, _TRUNCATE, format, args); - va_end(args); - if ((size_t)ret != strp_buflen - 1) { - /* This should never happen. */ - gpr_free(message); + va_start (args, format); + ret = _vscprintf (format, args); + va_end (args); + if (ret < 0) + { message = NULL; } - } + else + { + /* Allocate a new buffer, with space for the NUL terminator. */ + size_t strp_buflen = (size_t) ret + 1; + message = gpr_malloc (strp_buflen); + + /* Print to the buffer. */ + va_start (args, format); + ret = vsnprintf_s (message, strp_buflen, _TRUNCATE, format, args); + va_end (args); + if ((size_t) ret != strp_buflen - 1) + { + /* This should never happen. */ + gpr_free (message); + message = NULL; + } + } - gpr_log_message(file, line, severity, message); - gpr_free(message); + gpr_log_message (file, line, severity, message); + gpr_free (message); } /* Simple starter implementation */ -void gpr_default_log(gpr_log_func_args *args) { +void +gpr_default_log (gpr_log_func_args * args) +{ char *final_slash; const char *display_file; char time_buffer[64]; - gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + gpr_timespec now = gpr_now (GPR_CLOCK_REALTIME); struct tm tm; - final_slash = strrchr(args->file, '\\'); + final_slash = strrchr (args->file, '\\'); if (final_slash == NULL) display_file = args->file; else display_file = final_slash + 1; - if (localtime_s(&tm, &now.tv_sec)) { - strcpy(time_buffer, "error:localtime"); - } else if (0 == - strftime(time_buffer, sizeof(time_buffer), "%m%d %H:%M:%S", &tm)) { - strcpy(time_buffer, "error:strftime"); - } + if (localtime_s (&tm, &now.tv_sec)) + { + strcpy (time_buffer, "error:localtime"); + } + else if (0 == strftime (time_buffer, sizeof (time_buffer), "%m%d %H:%M:%S", &tm)) + { + strcpy (time_buffer, "error:strftime"); + } - fprintf(stderr, "%s%s.%09u %5lu %s:%d] %s\n", - gpr_log_severity_string(args->severity), time_buffer, - (int)(now.tv_nsec), GetCurrentThreadId(), display_file, args->line, - args->message); + fprintf (stderr, "%s%s.%09u %5lu %s:%d] %s\n", gpr_log_severity_string (args->severity), time_buffer, (int) (now.tv_nsec), GetCurrentThreadId (), display_file, args->line, args->message); } -char *gpr_format_message(DWORD messageid) { +char * +gpr_format_message (DWORD messageid) +{ LPTSTR tmessage; char *message; - DWORD status = FormatMessage( - FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, messageid, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)(&tmessage), 0, NULL); - if (status == 0) return gpr_strdup("Unable to retrieve error string"); - message = gpr_tchar_to_char(tmessage); - LocalFree(tmessage); + DWORD status = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, messageid, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) (&tmessage), 0, NULL); + if (status == 0) + return gpr_strdup ("Unable to retrieve error string"); + message = gpr_tchar_to_char (tmessage); + LocalFree (tmessage); return message; } diff --git a/src/core/support/murmur_hash.c b/src/core/support/murmur_hash.c index 37fdca82ba0..e4ac59467d5 100644 --- a/src/core/support/murmur_hash.c +++ b/src/core/support/murmur_hash.c @@ -46,8 +46,10 @@ handle aligned reads, do the conversion here */ #define GETBLOCK32(p, i) (p)[(i)] -gpr_uint32 gpr_murmur_hash3(const void *key, size_t len, gpr_uint32 seed) { - const gpr_uint8 *data = (const gpr_uint8 *)key; +gpr_uint32 +gpr_murmur_hash3 (const void *key, size_t len, gpr_uint32 seed) +{ + const gpr_uint8 *data = (const gpr_uint8 *) key; const size_t nblocks = len / 4; int i; @@ -57,40 +59,42 @@ gpr_uint32 gpr_murmur_hash3(const void *key, size_t len, gpr_uint32 seed) { const gpr_uint32 c1 = 0xcc9e2d51; const gpr_uint32 c2 = 0x1b873593; - const gpr_uint32 *blocks = ((const gpr_uint32 *)key) + nblocks; - const gpr_uint8 *tail = (const gpr_uint8 *)(data + nblocks * 4); + const gpr_uint32 *blocks = ((const gpr_uint32 *) key) + nblocks; + const gpr_uint8 *tail = (const gpr_uint8 *) (data + nblocks * 4); /* body */ - for (i = -(int)nblocks; i; i++) { - k1 = GETBLOCK32(blocks, i); + for (i = -(int) nblocks; i; i++) + { + k1 = GETBLOCK32 (blocks, i); - k1 *= c1; - k1 = ROTL32(k1, 15); - k1 *= c2; + k1 *= c1; + k1 = ROTL32 (k1, 15); + k1 *= c2; - h1 ^= k1; - h1 = ROTL32(h1, 13); - h1 = h1 * 5 + 0xe6546b64; - } + h1 ^= k1; + h1 = ROTL32 (h1, 13); + h1 = h1 * 5 + 0xe6546b64; + } k1 = 0; /* tail */ - switch (len & 3) { + switch (len & 3) + { case 3: - k1 ^= ((gpr_uint32)tail[2]) << 16; + k1 ^= ((gpr_uint32) tail[2]) << 16; case 2: - k1 ^= ((gpr_uint32)tail[1]) << 8; + k1 ^= ((gpr_uint32) tail[1]) << 8; case 1: k1 ^= tail[0]; k1 *= c1; - k1 = ROTL32(k1, 15); + k1 = ROTL32 (k1, 15); k1 *= c2; h1 ^= k1; - }; + }; /* finalization */ - h1 ^= (gpr_uint32)len; - FMIX32(h1); + h1 ^= (gpr_uint32) len; + FMIX32 (h1); return h1; } diff --git a/src/core/support/murmur_hash.h b/src/core/support/murmur_hash.h index 343fcb99f7d..0ef198e88ea 100644 --- a/src/core/support/murmur_hash.h +++ b/src/core/support/murmur_hash.h @@ -39,6 +39,6 @@ #include /* compute the hash of key (length len) */ -gpr_uint32 gpr_murmur_hash3(const void *key, size_t len, gpr_uint32 seed); +gpr_uint32 gpr_murmur_hash3 (const void *key, size_t len, gpr_uint32 seed); #endif /* GRPC_INTERNAL_CORE_SUPPORT_MURMUR_HASH_H */ diff --git a/src/core/support/slice.c b/src/core/support/slice.c index 53024e88f1b..d866b99eb70 100644 --- a/src/core/support/slice.c +++ b/src/core/support/slice.c @@ -37,52 +37,68 @@ #include -gpr_slice gpr_empty_slice(void) { +gpr_slice +gpr_empty_slice (void) +{ gpr_slice out; out.refcount = 0; out.data.inlined.length = 0; return out; } -gpr_slice gpr_slice_ref(gpr_slice slice) { - if (slice.refcount) { - slice.refcount->ref(slice.refcount); - } +gpr_slice +gpr_slice_ref (gpr_slice slice) +{ + if (slice.refcount) + { + slice.refcount->ref (slice.refcount); + } return slice; } -void gpr_slice_unref(gpr_slice slice) { - if (slice.refcount) { - slice.refcount->unref(slice.refcount); - } +void +gpr_slice_unref (gpr_slice slice) +{ + if (slice.refcount) + { + slice.refcount->unref (slice.refcount); + } } /* gpr_slice_new support structures - we create a refcount object extended with the user provided data pointer & destroy function */ -typedef struct new_slice_refcount { +typedef struct new_slice_refcount +{ gpr_slice_refcount rc; gpr_refcount refs; - void (*user_destroy)(void *); + void (*user_destroy) (void *); void *user_data; } new_slice_refcount; -static void new_slice_ref(void *p) { +static void +new_slice_ref (void *p) +{ new_slice_refcount *r = p; - gpr_ref(&r->refs); + gpr_ref (&r->refs); } -static void new_slice_unref(void *p) { +static void +new_slice_unref (void *p) +{ new_slice_refcount *r = p; - if (gpr_unref(&r->refs)) { - r->user_destroy(r->user_data); - gpr_free(r); - } + if (gpr_unref (&r->refs)) + { + r->user_destroy (r->user_data); + gpr_free (r); + } } -gpr_slice gpr_slice_new(void *p, size_t len, void (*destroy)(void *)) { +gpr_slice +gpr_slice_new (void *p, size_t len, void (*destroy) (void *)) +{ gpr_slice slice; - new_slice_refcount *rc = gpr_malloc(sizeof(new_slice_refcount)); - gpr_ref_init(&rc->refs, 1); + new_slice_refcount *rc = gpr_malloc (sizeof (new_slice_refcount)); + gpr_ref_init (&rc->refs, 1); rc->rc.ref = new_slice_ref; rc->rc.unref = new_slice_unref; rc->user_destroy = destroy; @@ -96,33 +112,39 @@ gpr_slice gpr_slice_new(void *p, size_t len, void (*destroy)(void *)) { /* gpr_slice_new_with_len support structures - we create a refcount object extended with the user provided data pointer & destroy function */ -typedef struct new_with_len_slice_refcount { +typedef struct new_with_len_slice_refcount +{ gpr_slice_refcount rc; gpr_refcount refs; void *user_data; size_t user_length; - void (*user_destroy)(void *, size_t); + void (*user_destroy) (void *, size_t); } new_with_len_slice_refcount; -static void new_with_len_ref(void *p) { +static void +new_with_len_ref (void *p) +{ new_with_len_slice_refcount *r = p; - gpr_ref(&r->refs); + gpr_ref (&r->refs); } -static void new_with_len_unref(void *p) { +static void +new_with_len_unref (void *p) +{ new_with_len_slice_refcount *r = p; - if (gpr_unref(&r->refs)) { - r->user_destroy(r->user_data, r->user_length); - gpr_free(r); - } + if (gpr_unref (&r->refs)) + { + r->user_destroy (r->user_data, r->user_length); + gpr_free (r); + } } -gpr_slice gpr_slice_new_with_len(void *p, size_t len, - void (*destroy)(void *, size_t)) { +gpr_slice +gpr_slice_new_with_len (void *p, size_t len, void (*destroy) (void *, size_t)) +{ gpr_slice slice; - new_with_len_slice_refcount *rc = - gpr_malloc(sizeof(new_with_len_slice_refcount)); - gpr_ref_init(&rc->refs, 1); + new_with_len_slice_refcount *rc = gpr_malloc (sizeof (new_with_len_slice_refcount)); + gpr_ref_init (&rc->refs, 1); rc->rc.ref = new_with_len_ref; rc->rc.unref = new_with_len_unref; rc->user_destroy = destroy; @@ -135,201 +157,242 @@ gpr_slice gpr_slice_new_with_len(void *p, size_t len, return slice; } -gpr_slice gpr_slice_from_copied_buffer(const char *source, size_t length) { - gpr_slice slice = gpr_slice_malloc(length); - memcpy(GPR_SLICE_START_PTR(slice), source, length); +gpr_slice +gpr_slice_from_copied_buffer (const char *source, size_t length) +{ + gpr_slice slice = gpr_slice_malloc (length); + memcpy (GPR_SLICE_START_PTR (slice), source, length); return slice; } -gpr_slice gpr_slice_from_copied_string(const char *source) { - return gpr_slice_from_copied_buffer(source, strlen(source)); +gpr_slice +gpr_slice_from_copied_string (const char *source) +{ + return gpr_slice_from_copied_buffer (source, strlen (source)); } -typedef struct { +typedef struct +{ gpr_slice_refcount base; gpr_refcount refs; } malloc_refcount; -static void malloc_ref(void *p) { +static void +malloc_ref (void *p) +{ malloc_refcount *r = p; - gpr_ref(&r->refs); + gpr_ref (&r->refs); } -static void malloc_unref(void *p) { +static void +malloc_unref (void *p) +{ malloc_refcount *r = p; - if (gpr_unref(&r->refs)) { - gpr_free(r); - } + if (gpr_unref (&r->refs)) + { + gpr_free (r); + } } -gpr_slice gpr_slice_malloc(size_t length) { +gpr_slice +gpr_slice_malloc (size_t length) +{ gpr_slice slice; - if (length > sizeof(slice.data.inlined.bytes)) { - /* Memory layout used by the slice created here: - - +-----------+----------------------------------------------------------+ - | refcount | bytes | - +-----------+----------------------------------------------------------+ - - refcount is a malloc_refcount - bytes is an array of bytes of the requested length - Both parts are placed in the same allocation returned from gpr_malloc */ - malloc_refcount *rc = gpr_malloc(sizeof(malloc_refcount) + length); - - /* Initial refcount on rc is 1 - and it's up to the caller to release - this reference. */ - gpr_ref_init(&rc->refs, 1); - - rc->base.ref = malloc_ref; - rc->base.unref = malloc_unref; - - /* Build up the slice to be returned. */ - /* The slices refcount points back to the allocated block. */ - slice.refcount = &rc->base; - /* The data bytes are placed immediately after the refcount struct */ - slice.data.refcounted.bytes = (gpr_uint8 *)(rc + 1); - /* And the length of the block is set to the requested length */ - slice.data.refcounted.length = length; - } else { - /* small slice: just inline the data */ - slice.refcount = NULL; - slice.data.inlined.length = (gpr_uint8)length; - } + if (length > sizeof (slice.data.inlined.bytes)) + { + /* Memory layout used by the slice created here: + + +-----------+----------------------------------------------------------+ + | refcount | bytes | + +-----------+----------------------------------------------------------+ + + refcount is a malloc_refcount + bytes is an array of bytes of the requested length + Both parts are placed in the same allocation returned from gpr_malloc */ + malloc_refcount *rc = gpr_malloc (sizeof (malloc_refcount) + length); + + /* Initial refcount on rc is 1 - and it's up to the caller to release + this reference. */ + gpr_ref_init (&rc->refs, 1); + + rc->base.ref = malloc_ref; + rc->base.unref = malloc_unref; + + /* Build up the slice to be returned. */ + /* The slices refcount points back to the allocated block. */ + slice.refcount = &rc->base; + /* The data bytes are placed immediately after the refcount struct */ + slice.data.refcounted.bytes = (gpr_uint8 *) (rc + 1); + /* And the length of the block is set to the requested length */ + slice.data.refcounted.length = length; + } + else + { + /* small slice: just inline the data */ + slice.refcount = NULL; + slice.data.inlined.length = (gpr_uint8) length; + } return slice; } -gpr_slice gpr_slice_sub_no_ref(gpr_slice source, size_t begin, size_t end) { +gpr_slice +gpr_slice_sub_no_ref (gpr_slice source, size_t begin, size_t end) +{ gpr_slice subset; - GPR_ASSERT(end >= begin); - - if (source.refcount) { - /* Enforce preconditions */ - GPR_ASSERT(source.data.refcounted.length >= end); - - /* Build the result */ - subset.refcount = source.refcount; - /* Point into the source array */ - subset.data.refcounted.bytes = source.data.refcounted.bytes + begin; - subset.data.refcounted.length = end - begin; - } else { - /* Enforce preconditions */ - GPR_ASSERT(source.data.inlined.length >= end); - subset.refcount = NULL; - subset.data.inlined.length = (gpr_uint8)(end - begin); - memcpy(subset.data.inlined.bytes, source.data.inlined.bytes + begin, - end - begin); - } + GPR_ASSERT (end >= begin); + + if (source.refcount) + { + /* Enforce preconditions */ + GPR_ASSERT (source.data.refcounted.length >= end); + + /* Build the result */ + subset.refcount = source.refcount; + /* Point into the source array */ + subset.data.refcounted.bytes = source.data.refcounted.bytes + begin; + subset.data.refcounted.length = end - begin; + } + else + { + /* Enforce preconditions */ + GPR_ASSERT (source.data.inlined.length >= end); + subset.refcount = NULL; + subset.data.inlined.length = (gpr_uint8) (end - begin); + memcpy (subset.data.inlined.bytes, source.data.inlined.bytes + begin, end - begin); + } return subset; } -gpr_slice gpr_slice_sub(gpr_slice source, size_t begin, size_t end) { +gpr_slice +gpr_slice_sub (gpr_slice source, size_t begin, size_t end) +{ gpr_slice subset; - if (end - begin <= sizeof(subset.data.inlined.bytes)) { - subset.refcount = NULL; - subset.data.inlined.length = (gpr_uint8)(end - begin); - memcpy(subset.data.inlined.bytes, GPR_SLICE_START_PTR(source) + begin, - end - begin); - } else { - subset = gpr_slice_sub_no_ref(source, begin, end); - /* Bump the refcount */ - subset.refcount->ref(subset.refcount); - } + if (end - begin <= sizeof (subset.data.inlined.bytes)) + { + subset.refcount = NULL; + subset.data.inlined.length = (gpr_uint8) (end - begin); + memcpy (subset.data.inlined.bytes, GPR_SLICE_START_PTR (source) + begin, end - begin); + } + else + { + subset = gpr_slice_sub_no_ref (source, begin, end); + /* Bump the refcount */ + subset.refcount->ref (subset.refcount); + } return subset; } -gpr_slice gpr_slice_split_tail(gpr_slice *source, size_t split) { +gpr_slice +gpr_slice_split_tail (gpr_slice * source, size_t split) +{ gpr_slice tail; - if (source->refcount == NULL) { - /* inlined data, copy it out */ - GPR_ASSERT(source->data.inlined.length >= split); - tail.refcount = NULL; - tail.data.inlined.length = (gpr_uint8)(source->data.inlined.length - split); - memcpy(tail.data.inlined.bytes, source->data.inlined.bytes + split, - tail.data.inlined.length); - source->data.inlined.length = (gpr_uint8)split; - } else { - size_t tail_length = source->data.refcounted.length - split; - GPR_ASSERT(source->data.refcounted.length >= split); - if (tail_length < sizeof(tail.data.inlined.bytes)) { - /* Copy out the bytes - it'll be cheaper than refcounting */ + if (source->refcount == NULL) + { + /* inlined data, copy it out */ + GPR_ASSERT (source->data.inlined.length >= split); tail.refcount = NULL; - tail.data.inlined.length = (gpr_uint8)tail_length; - memcpy(tail.data.inlined.bytes, source->data.refcounted.bytes + split, - tail_length); - } else { - /* Build the result */ - tail.refcount = source->refcount; - /* Bump the refcount */ - tail.refcount->ref(tail.refcount); - /* Point into the source array */ - tail.data.refcounted.bytes = source->data.refcounted.bytes + split; - tail.data.refcounted.length = tail_length; + tail.data.inlined.length = (gpr_uint8) (source->data.inlined.length - split); + memcpy (tail.data.inlined.bytes, source->data.inlined.bytes + split, tail.data.inlined.length); + source->data.inlined.length = (gpr_uint8) split; + } + else + { + size_t tail_length = source->data.refcounted.length - split; + GPR_ASSERT (source->data.refcounted.length >= split); + if (tail_length < sizeof (tail.data.inlined.bytes)) + { + /* Copy out the bytes - it'll be cheaper than refcounting */ + tail.refcount = NULL; + tail.data.inlined.length = (gpr_uint8) tail_length; + memcpy (tail.data.inlined.bytes, source->data.refcounted.bytes + split, tail_length); + } + else + { + /* Build the result */ + tail.refcount = source->refcount; + /* Bump the refcount */ + tail.refcount->ref (tail.refcount); + /* Point into the source array */ + tail.data.refcounted.bytes = source->data.refcounted.bytes + split; + tail.data.refcounted.length = tail_length; + } + source->data.refcounted.length = split; } - source->data.refcounted.length = split; - } return tail; } -gpr_slice gpr_slice_split_head(gpr_slice *source, size_t split) { +gpr_slice +gpr_slice_split_head (gpr_slice * source, size_t split) +{ gpr_slice head; - if (source->refcount == NULL) { - GPR_ASSERT(source->data.inlined.length >= split); - - head.refcount = NULL; - head.data.inlined.length = (gpr_uint8)split; - memcpy(head.data.inlined.bytes, source->data.inlined.bytes, split); - source->data.inlined.length = - (gpr_uint8)(source->data.inlined.length - split); - memmove(source->data.inlined.bytes, source->data.inlined.bytes + split, - source->data.inlined.length); - } else if (split < sizeof(head.data.inlined.bytes)) { - GPR_ASSERT(source->data.refcounted.length >= split); - - head.refcount = NULL; - head.data.inlined.length = (gpr_uint8)split; - memcpy(head.data.inlined.bytes, source->data.refcounted.bytes, split); - source->data.refcounted.bytes += split; - source->data.refcounted.length -= split; - } else { - GPR_ASSERT(source->data.refcounted.length >= split); - - /* Build the result */ - head.refcount = source->refcount; - /* Bump the refcount */ - head.refcount->ref(head.refcount); - /* Point into the source array */ - head.data.refcounted.bytes = source->data.refcounted.bytes; - head.data.refcounted.length = split; - source->data.refcounted.bytes += split; - source->data.refcounted.length -= split; - } + if (source->refcount == NULL) + { + GPR_ASSERT (source->data.inlined.length >= split); + + head.refcount = NULL; + head.data.inlined.length = (gpr_uint8) split; + memcpy (head.data.inlined.bytes, source->data.inlined.bytes, split); + source->data.inlined.length = (gpr_uint8) (source->data.inlined.length - split); + memmove (source->data.inlined.bytes, source->data.inlined.bytes + split, source->data.inlined.length); + } + else if (split < sizeof (head.data.inlined.bytes)) + { + GPR_ASSERT (source->data.refcounted.length >= split); + + head.refcount = NULL; + head.data.inlined.length = (gpr_uint8) split; + memcpy (head.data.inlined.bytes, source->data.refcounted.bytes, split); + source->data.refcounted.bytes += split; + source->data.refcounted.length -= split; + } + else + { + GPR_ASSERT (source->data.refcounted.length >= split); + + /* Build the result */ + head.refcount = source->refcount; + /* Bump the refcount */ + head.refcount->ref (head.refcount); + /* Point into the source array */ + head.data.refcounted.bytes = source->data.refcounted.bytes; + head.data.refcounted.length = split; + source->data.refcounted.bytes += split; + source->data.refcounted.length -= split; + } return head; } -int gpr_slice_cmp(gpr_slice a, gpr_slice b) { - int d = (int)(GPR_SLICE_LENGTH(a) - GPR_SLICE_LENGTH(b)); - if (d != 0) return d; - return memcmp(GPR_SLICE_START_PTR(a), GPR_SLICE_START_PTR(b), - GPR_SLICE_LENGTH(a)); +int +gpr_slice_cmp (gpr_slice a, gpr_slice b) +{ + int d = (int) (GPR_SLICE_LENGTH (a) - GPR_SLICE_LENGTH (b)); + if (d != 0) + return d; + return memcmp (GPR_SLICE_START_PTR (a), GPR_SLICE_START_PTR (b), GPR_SLICE_LENGTH (a)); } -int gpr_slice_str_cmp(gpr_slice a, const char *b) { - size_t b_length = strlen(b); - int d = (int)(GPR_SLICE_LENGTH(a) - b_length); - if (d != 0) return d; - return memcmp(GPR_SLICE_START_PTR(a), b, b_length); +int +gpr_slice_str_cmp (gpr_slice a, const char *b) +{ + size_t b_length = strlen (b); + int d = (int) (GPR_SLICE_LENGTH (a) - b_length); + if (d != 0) + return d; + return memcmp (GPR_SLICE_START_PTR (a), b, b_length); } -char *gpr_slice_to_cstring(gpr_slice slice) { - char *result = gpr_malloc(GPR_SLICE_LENGTH(slice) + 1); - memcpy(result, GPR_SLICE_START_PTR(slice), GPR_SLICE_LENGTH(slice)); - result[GPR_SLICE_LENGTH(slice)] = '\0'; +char * +gpr_slice_to_cstring (gpr_slice slice) +{ + char *result = gpr_malloc (GPR_SLICE_LENGTH (slice) + 1); + memcpy (result, GPR_SLICE_START_PTR (slice), GPR_SLICE_LENGTH (slice)); + result[GPR_SLICE_LENGTH (slice)] = '\0'; return result; } diff --git a/src/core/support/slice_buffer.c b/src/core/support/slice_buffer.c index 8873d459d56..fac90ea6a63 100644 --- a/src/core/support/slice_buffer.c +++ b/src/core/support/slice_buffer.c @@ -42,190 +42,240 @@ /* grow a buffer; requires GRPC_SLICE_BUFFER_INLINE_ELEMENTS > 1 */ #define GROW(x) (3 * (x) / 2) -static void maybe_embiggen(gpr_slice_buffer *sb) { - if (sb->count == sb->capacity) { - sb->capacity = GROW(sb->capacity); - GPR_ASSERT(sb->capacity > sb->count); - if (sb->slices == sb->inlined) { - sb->slices = gpr_malloc(sb->capacity * sizeof(gpr_slice)); - memcpy(sb->slices, sb->inlined, sb->count * sizeof(gpr_slice)); - } else { - sb->slices = gpr_realloc(sb->slices, sb->capacity * sizeof(gpr_slice)); +static void +maybe_embiggen (gpr_slice_buffer * sb) +{ + if (sb->count == sb->capacity) + { + sb->capacity = GROW (sb->capacity); + GPR_ASSERT (sb->capacity > sb->count); + if (sb->slices == sb->inlined) + { + sb->slices = gpr_malloc (sb->capacity * sizeof (gpr_slice)); + memcpy (sb->slices, sb->inlined, sb->count * sizeof (gpr_slice)); + } + else + { + sb->slices = gpr_realloc (sb->slices, sb->capacity * sizeof (gpr_slice)); + } } - } } -void gpr_slice_buffer_init(gpr_slice_buffer *sb) { +void +gpr_slice_buffer_init (gpr_slice_buffer * sb) +{ sb->count = 0; sb->length = 0; sb->capacity = GRPC_SLICE_BUFFER_INLINE_ELEMENTS; sb->slices = sb->inlined; } -void gpr_slice_buffer_destroy(gpr_slice_buffer *sb) { - gpr_slice_buffer_reset_and_unref(sb); - if (sb->slices != sb->inlined) { - gpr_free(sb->slices); - } +void +gpr_slice_buffer_destroy (gpr_slice_buffer * sb) +{ + gpr_slice_buffer_reset_and_unref (sb); + if (sb->slices != sb->inlined) + { + gpr_free (sb->slices); + } } -gpr_uint8 *gpr_slice_buffer_tiny_add(gpr_slice_buffer *sb, size_t n) { +gpr_uint8 * +gpr_slice_buffer_tiny_add (gpr_slice_buffer * sb, size_t n) +{ gpr_slice *back; gpr_uint8 *out; sb->length += n; - if (sb->count == 0) goto add_new; + if (sb->count == 0) + goto add_new; back = &sb->slices[sb->count - 1]; - if (back->refcount) goto add_new; - if ((back->data.inlined.length + n) > sizeof(back->data.inlined.bytes)) + if (back->refcount) + goto add_new; + if ((back->data.inlined.length + n) > sizeof (back->data.inlined.bytes)) goto add_new; out = back->data.inlined.bytes + back->data.inlined.length; - back->data.inlined.length = (gpr_uint8)(back->data.inlined.length + n); + back->data.inlined.length = (gpr_uint8) (back->data.inlined.length + n); return out; add_new: - maybe_embiggen(sb); + maybe_embiggen (sb); back = &sb->slices[sb->count]; sb->count++; back->refcount = NULL; - back->data.inlined.length = (gpr_uint8)n; + back->data.inlined.length = (gpr_uint8) n; return back->data.inlined.bytes; } -size_t gpr_slice_buffer_add_indexed(gpr_slice_buffer *sb, gpr_slice s) { +size_t +gpr_slice_buffer_add_indexed (gpr_slice_buffer * sb, gpr_slice s) +{ size_t out = sb->count; - maybe_embiggen(sb); + maybe_embiggen (sb); sb->slices[out] = s; - sb->length += GPR_SLICE_LENGTH(s); + sb->length += GPR_SLICE_LENGTH (s); sb->count = out + 1; return out; } -void gpr_slice_buffer_add(gpr_slice_buffer *sb, gpr_slice s) { +void +gpr_slice_buffer_add (gpr_slice_buffer * sb, gpr_slice s) +{ size_t n = sb->count; /* if both the last slice in the slice buffer and the slice being added are inlined (that is, that they carry their data inside the slice data structure), and the back slice is not full, then concatenate directly into the back slice, preventing many small slices being passed into writes */ - if (!s.refcount && n) { - gpr_slice *back = &sb->slices[n - 1]; - if (!back->refcount && back->data.inlined.length < GPR_SLICE_INLINED_SIZE) { - if (s.data.inlined.length + back->data.inlined.length <= - GPR_SLICE_INLINED_SIZE) { - memcpy(back->data.inlined.bytes + back->data.inlined.length, - s.data.inlined.bytes, s.data.inlined.length); - back->data.inlined.length = - (gpr_uint8)(back->data.inlined.length + s.data.inlined.length); - } else { - size_t cp1 = GPR_SLICE_INLINED_SIZE - back->data.inlined.length; - memcpy(back->data.inlined.bytes + back->data.inlined.length, - s.data.inlined.bytes, cp1); - back->data.inlined.length = GPR_SLICE_INLINED_SIZE; - maybe_embiggen(sb); - back = &sb->slices[n]; - sb->count = n + 1; - back->refcount = NULL; - back->data.inlined.length = (gpr_uint8)(s.data.inlined.length - cp1); - memcpy(back->data.inlined.bytes, s.data.inlined.bytes + cp1, - s.data.inlined.length - cp1); - } - sb->length += s.data.inlined.length; - return; /* early out */ + if (!s.refcount && n) + { + gpr_slice *back = &sb->slices[n - 1]; + if (!back->refcount && back->data.inlined.length < GPR_SLICE_INLINED_SIZE) + { + if (s.data.inlined.length + back->data.inlined.length <= GPR_SLICE_INLINED_SIZE) + { + memcpy (back->data.inlined.bytes + back->data.inlined.length, s.data.inlined.bytes, s.data.inlined.length); + back->data.inlined.length = (gpr_uint8) (back->data.inlined.length + s.data.inlined.length); + } + else + { + size_t cp1 = GPR_SLICE_INLINED_SIZE - back->data.inlined.length; + memcpy (back->data.inlined.bytes + back->data.inlined.length, s.data.inlined.bytes, cp1); + back->data.inlined.length = GPR_SLICE_INLINED_SIZE; + maybe_embiggen (sb); + back = &sb->slices[n]; + sb->count = n + 1; + back->refcount = NULL; + back->data.inlined.length = (gpr_uint8) (s.data.inlined.length - cp1); + memcpy (back->data.inlined.bytes, s.data.inlined.bytes + cp1, s.data.inlined.length - cp1); + } + sb->length += s.data.inlined.length; + return; /* early out */ + } } - } - gpr_slice_buffer_add_indexed(sb, s); + gpr_slice_buffer_add_indexed (sb, s); } -void gpr_slice_buffer_addn(gpr_slice_buffer *sb, gpr_slice *s, size_t n) { +void +gpr_slice_buffer_addn (gpr_slice_buffer * sb, gpr_slice * s, size_t n) +{ size_t i; - for (i = 0; i < n; i++) { - gpr_slice_buffer_add(sb, s[i]); - } + for (i = 0; i < n; i++) + { + gpr_slice_buffer_add (sb, s[i]); + } } -void gpr_slice_buffer_pop(gpr_slice_buffer *sb) { - if (sb->count != 0) { - size_t count = --sb->count; - sb->length -= GPR_SLICE_LENGTH(sb->slices[count]); - } +void +gpr_slice_buffer_pop (gpr_slice_buffer * sb) +{ + if (sb->count != 0) + { + size_t count = --sb->count; + sb->length -= GPR_SLICE_LENGTH (sb->slices[count]); + } } -void gpr_slice_buffer_reset_and_unref(gpr_slice_buffer *sb) { +void +gpr_slice_buffer_reset_and_unref (gpr_slice_buffer * sb) +{ size_t i; - for (i = 0; i < sb->count; i++) { - gpr_slice_unref(sb->slices[i]); - } + for (i = 0; i < sb->count; i++) + { + gpr_slice_unref (sb->slices[i]); + } sb->count = 0; sb->length = 0; } -void gpr_slice_buffer_swap(gpr_slice_buffer *a, gpr_slice_buffer *b) { - GPR_SWAP(size_t, a->count, b->count); - GPR_SWAP(size_t, a->capacity, b->capacity); - GPR_SWAP(size_t, a->length, b->length); - - if (a->slices == a->inlined) { - if (b->slices == b->inlined) { - /* swap contents of inlined buffer */ - gpr_slice temp[GRPC_SLICE_BUFFER_INLINE_ELEMENTS]; - memcpy(temp, a->slices, b->count * sizeof(gpr_slice)); - memcpy(a->slices, b->slices, a->count * sizeof(gpr_slice)); - memcpy(b->slices, temp, b->count * sizeof(gpr_slice)); - } else { - /* a is inlined, b is not - copy a inlined into b, fix pointers */ - a->slices = b->slices; - b->slices = b->inlined; - memcpy(b->slices, a->inlined, b->count * sizeof(gpr_slice)); +void +gpr_slice_buffer_swap (gpr_slice_buffer * a, gpr_slice_buffer * b) +{ + GPR_SWAP (size_t, a->count, b->count); + GPR_SWAP (size_t, a->capacity, b->capacity); + GPR_SWAP (size_t, a->length, b->length); + + if (a->slices == a->inlined) + { + if (b->slices == b->inlined) + { + /* swap contents of inlined buffer */ + gpr_slice temp[GRPC_SLICE_BUFFER_INLINE_ELEMENTS]; + memcpy (temp, a->slices, b->count * sizeof (gpr_slice)); + memcpy (a->slices, b->slices, a->count * sizeof (gpr_slice)); + memcpy (b->slices, temp, b->count * sizeof (gpr_slice)); + } + else + { + /* a is inlined, b is not - copy a inlined into b, fix pointers */ + a->slices = b->slices; + b->slices = b->inlined; + memcpy (b->slices, a->inlined, b->count * sizeof (gpr_slice)); + } + } + else if (b->slices == b->inlined) + { + /* b is inlined, a is not - copy b inlined int a, fix pointers */ + b->slices = a->slices; + a->slices = a->inlined; + memcpy (a->slices, b->inlined, a->count * sizeof (gpr_slice)); + } + else + { + /* no inlining: easy swap */ + GPR_SWAP (gpr_slice *, a->slices, b->slices); } - } else if (b->slices == b->inlined) { - /* b is inlined, a is not - copy b inlined int a, fix pointers */ - b->slices = a->slices; - a->slices = a->inlined; - memcpy(a->slices, b->inlined, a->count * sizeof(gpr_slice)); - } else { - /* no inlining: easy swap */ - GPR_SWAP(gpr_slice *, a->slices, b->slices); - } } -void gpr_slice_buffer_move_into(gpr_slice_buffer *src, gpr_slice_buffer *dst) { +void +gpr_slice_buffer_move_into (gpr_slice_buffer * src, gpr_slice_buffer * dst) +{ /* anything to move? */ - if (src->count == 0) { - return; - } + if (src->count == 0) + { + return; + } /* anything in dst? */ - if (dst->count == 0) { - gpr_slice_buffer_swap(src, dst); - return; - } + if (dst->count == 0) + { + gpr_slice_buffer_swap (src, dst); + return; + } /* both buffers have data - copy, and reset src */ - gpr_slice_buffer_addn(dst, src->slices, src->count); + gpr_slice_buffer_addn (dst, src->slices, src->count); src->count = 0; src->length = 0; } -void gpr_slice_buffer_trim_end(gpr_slice_buffer *sb, size_t n) { - GPR_ASSERT(n <= sb->length); +void +gpr_slice_buffer_trim_end (gpr_slice_buffer * sb, size_t n) +{ + GPR_ASSERT (n <= sb->length); sb->length -= n; - for (;;) { - size_t idx = sb->count - 1; - gpr_slice slice = sb->slices[idx]; - size_t slice_len = GPR_SLICE_LENGTH(slice); - if (slice_len > n) { - sb->slices[idx] = gpr_slice_sub_no_ref(slice, 0, slice_len - n); - return; - } else if (slice_len == n) { - gpr_slice_unref(slice); - sb->count = idx; - return; - } else { - gpr_slice_unref(slice); - n -= slice_len; - sb->count = idx; + for (;;) + { + size_t idx = sb->count - 1; + gpr_slice slice = sb->slices[idx]; + size_t slice_len = GPR_SLICE_LENGTH (slice); + if (slice_len > n) + { + sb->slices[idx] = gpr_slice_sub_no_ref (slice, 0, slice_len - n); + return; + } + else if (slice_len == n) + { + gpr_slice_unref (slice); + sb->count = idx; + return; + } + else + { + gpr_slice_unref (slice); + n -= slice_len; + sb->count = idx; + } } - } } diff --git a/src/core/support/stack_lockfree.c b/src/core/support/stack_lockfree.c index 78825250ef7..19171af8a22 100644 --- a/src/core/support/stack_lockfree.c +++ b/src/core/support/stack_lockfree.c @@ -43,7 +43,8 @@ /* The lockfree node structure is a single architecture-level word that allows for an atomic CAS to set it up. */ -struct lockfree_node_contents { +struct lockfree_node_contents +{ /* next thing to look at. Actual index for head, next index otherwise */ gpr_uint16 index; #ifdef GPR_ARCH_64 @@ -59,115 +60,126 @@ struct lockfree_node_contents { }; /* Use a union to make sure that these are in the same bits as an atm word */ -typedef union lockfree_node { +typedef union lockfree_node +{ gpr_atm atm; struct lockfree_node_contents contents; } lockfree_node; -#define ENTRY_ALIGNMENT_BITS 3 /* make sure that entries aligned to 8-bytes */ +#define ENTRY_ALIGNMENT_BITS 3 /* make sure that entries aligned to 8-bytes */ #define INVALID_ENTRY_INDEX \ - ((1 << 16) - 1) /* reserve this entry as invalid \ - */ + ((1 << 16) - 1) /* reserve this entry as invalid \ + */ -struct gpr_stack_lockfree { +struct gpr_stack_lockfree +{ lockfree_node *entries; - lockfree_node head; /* An atomic entry describing curr head */ + lockfree_node head; /* An atomic entry describing curr head */ #ifndef NDEBUG /* Bitmap of pushed entries to check for double-push or pop */ - gpr_atm pushed[(INVALID_ENTRY_INDEX + 1) / (8 * sizeof(gpr_atm))]; + gpr_atm pushed[(INVALID_ENTRY_INDEX + 1) / (8 * sizeof (gpr_atm))]; #endif }; -gpr_stack_lockfree *gpr_stack_lockfree_create(size_t entries) { +gpr_stack_lockfree * +gpr_stack_lockfree_create (size_t entries) +{ gpr_stack_lockfree *stack; - stack = gpr_malloc(sizeof(*stack)); + stack = gpr_malloc (sizeof (*stack)); /* Since we only allocate 16 bits to represent an entry number, * make sure that we are within the desired range */ /* Reserve the highest entry number as a dummy */ - GPR_ASSERT(entries < INVALID_ENTRY_INDEX); - stack->entries = gpr_malloc_aligned(entries * sizeof(stack->entries[0]), - ENTRY_ALIGNMENT_BITS); + GPR_ASSERT (entries < INVALID_ENTRY_INDEX); + stack->entries = gpr_malloc_aligned (entries * sizeof (stack->entries[0]), ENTRY_ALIGNMENT_BITS); /* Clear out all entries */ - memset(stack->entries, 0, entries * sizeof(stack->entries[0])); - memset(&stack->head, 0, sizeof(stack->head)); + memset (stack->entries, 0, entries * sizeof (stack->entries[0])); + memset (&stack->head, 0, sizeof (stack->head)); #ifndef NDEBUG - memset(&stack->pushed, 0, sizeof(stack->pushed)); + memset (&stack->pushed, 0, sizeof (stack->pushed)); #endif - GPR_ASSERT(sizeof(stack->entries->atm) == sizeof(stack->entries->contents)); + GPR_ASSERT (sizeof (stack->entries->atm) == sizeof (stack->entries->contents)); /* Point the head at reserved dummy entry */ stack->head.contents.index = INVALID_ENTRY_INDEX; return stack; } -void gpr_stack_lockfree_destroy(gpr_stack_lockfree *stack) { - gpr_free_aligned(stack->entries); - gpr_free(stack); +void +gpr_stack_lockfree_destroy (gpr_stack_lockfree * stack) +{ + gpr_free_aligned (stack->entries); + gpr_free (stack); } -int gpr_stack_lockfree_push(gpr_stack_lockfree *stack, int entry) { +int +gpr_stack_lockfree_push (gpr_stack_lockfree * stack, int entry) +{ lockfree_node head; lockfree_node newhead; lockfree_node curent; lockfree_node newent; /* First fill in the entry's index and aba ctr for new head */ - newhead.contents.index = (gpr_uint16)entry; + newhead.contents.index = (gpr_uint16) entry; /* Also post-increment the aba_ctr */ - curent.atm = gpr_atm_no_barrier_load(&stack->entries[entry].atm); + curent.atm = gpr_atm_no_barrier_load (&stack->entries[entry].atm); newhead.contents.aba_ctr = ++curent.contents.aba_ctr; - gpr_atm_no_barrier_store(&stack->entries[entry].atm, curent.atm); + gpr_atm_no_barrier_store (&stack->entries[entry].atm, curent.atm); #ifndef NDEBUG /* Check for double push */ { - int pushed_index = entry / (int)(8 * sizeof(gpr_atm)); - int pushed_bit = entry % (int)(8 * sizeof(gpr_atm)); + int pushed_index = entry / (int) (8 * sizeof (gpr_atm)); + int pushed_bit = entry % (int) (8 * sizeof (gpr_atm)); gpr_atm old_val; - old_val = gpr_atm_no_barrier_fetch_add(&stack->pushed[pushed_index], - (gpr_atm)(1UL << pushed_bit)); - GPR_ASSERT((old_val & (gpr_atm)(1UL << pushed_bit)) == 0); + old_val = gpr_atm_no_barrier_fetch_add (&stack->pushed[pushed_index], (gpr_atm) (1UL << pushed_bit)); + GPR_ASSERT ((old_val & (gpr_atm) (1UL << pushed_bit)) == 0); } #endif - do { - /* Atomically get the existing head value for use */ - head.atm = gpr_atm_no_barrier_load(&(stack->head.atm)); - /* Point to it */ - newent.atm = gpr_atm_no_barrier_load(&stack->entries[entry].atm); - newent.contents.index = head.contents.index; - gpr_atm_no_barrier_store(&stack->entries[entry].atm, newent.atm); - } while (!gpr_atm_rel_cas(&(stack->head.atm), head.atm, newhead.atm)); + do + { + /* Atomically get the existing head value for use */ + head.atm = gpr_atm_no_barrier_load (&(stack->head.atm)); + /* Point to it */ + newent.atm = gpr_atm_no_barrier_load (&stack->entries[entry].atm); + newent.contents.index = head.contents.index; + gpr_atm_no_barrier_store (&stack->entries[entry].atm, newent.atm); + } + while (!gpr_atm_rel_cas (&(stack->head.atm), head.atm, newhead.atm)); /* Use rel_cas above to make sure that entry index is set properly */ return head.contents.index == INVALID_ENTRY_INDEX; } -int gpr_stack_lockfree_pop(gpr_stack_lockfree *stack) { +int +gpr_stack_lockfree_pop (gpr_stack_lockfree * stack) +{ lockfree_node head; lockfree_node newhead; - do { - head.atm = gpr_atm_acq_load(&(stack->head.atm)); - if (head.contents.index == INVALID_ENTRY_INDEX) { - return -1; - } - newhead.atm = - gpr_atm_no_barrier_load(&(stack->entries[head.contents.index].atm)); + do + { + head.atm = gpr_atm_acq_load (&(stack->head.atm)); + if (head.contents.index == INVALID_ENTRY_INDEX) + { + return -1; + } + newhead.atm = gpr_atm_no_barrier_load (&(stack->entries[head.contents.index].atm)); - } while (!gpr_atm_no_barrier_cas(&(stack->head.atm), head.atm, newhead.atm)); + } + while (!gpr_atm_no_barrier_cas (&(stack->head.atm), head.atm, newhead.atm)); #ifndef NDEBUG /* Check for valid pop */ { - int pushed_index = head.contents.index / (8 * sizeof(gpr_atm)); - int pushed_bit = head.contents.index % (8 * sizeof(gpr_atm)); + int pushed_index = head.contents.index / (8 * sizeof (gpr_atm)); + int pushed_bit = head.contents.index % (8 * sizeof (gpr_atm)); gpr_atm old_val; - old_val = gpr_atm_no_barrier_fetch_add(&stack->pushed[pushed_index], - -(gpr_atm)(1UL << pushed_bit)); - GPR_ASSERT((old_val & (gpr_atm)(1UL << pushed_bit)) != 0); + old_val = gpr_atm_no_barrier_fetch_add (&stack->pushed[pushed_index], -(gpr_atm) (1UL << pushed_bit)); + GPR_ASSERT ((old_val & (gpr_atm) (1UL << pushed_bit)) != 0); } #endif diff --git a/src/core/support/stack_lockfree.h b/src/core/support/stack_lockfree.h index 2bbbe3bd956..2f966d29636 100644 --- a/src/core/support/stack_lockfree.h +++ b/src/core/support/stack_lockfree.h @@ -40,14 +40,14 @@ typedef struct gpr_stack_lockfree gpr_stack_lockfree; /* This stack must specify the maximum number of entries to track. The current implementation only allows up to 65534 entries */ -gpr_stack_lockfree* gpr_stack_lockfree_create(size_t entries); -void gpr_stack_lockfree_destroy(gpr_stack_lockfree* stack); +gpr_stack_lockfree *gpr_stack_lockfree_create (size_t entries); +void gpr_stack_lockfree_destroy (gpr_stack_lockfree * stack); /* Pass in a valid entry number for the next stack entry */ /* Returns 1 if this is the first element on the stack, 0 otherwise */ -int gpr_stack_lockfree_push(gpr_stack_lockfree*, int entry); +int gpr_stack_lockfree_push (gpr_stack_lockfree *, int entry); /* Returns -1 on empty or the actual entry number */ -int gpr_stack_lockfree_pop(gpr_stack_lockfree* stack); +int gpr_stack_lockfree_pop (gpr_stack_lockfree * stack); #endif /* GRPC_INTERNAL_CORE_SUPPORT_STACK_LOCKFREE_H */ diff --git a/src/core/support/string.c b/src/core/support/string.c index e0ffeb8a4af..28207f5dc2b 100644 --- a/src/core/support/string.c +++ b/src/core/support/string.c @@ -42,169 +42,215 @@ #include #include -char *gpr_strdup(const char *src) { +char * +gpr_strdup (const char *src) +{ char *dst; size_t len; - if (!src) { - return NULL; - } + if (!src) + { + return NULL; + } - len = strlen(src) + 1; - dst = gpr_malloc(len); + len = strlen (src) + 1; + dst = gpr_malloc (len); - memcpy(dst, src, len); + memcpy (dst, src, len); return dst; } -typedef struct { +typedef struct +{ size_t capacity; size_t length; char *data; } dump_out; -static dump_out dump_out_create(void) { - dump_out r = {0, 0, NULL}; +static dump_out +dump_out_create (void) +{ + dump_out r = { 0, 0, NULL }; return r; } -static void dump_out_append(dump_out *out, char c) { - if (out->length == out->capacity) { - out->capacity = GPR_MAX(8, 2 * out->capacity); - out->data = gpr_realloc(out->data, out->capacity); - } +static void +dump_out_append (dump_out * out, char c) +{ + if (out->length == out->capacity) + { + out->capacity = GPR_MAX (8, 2 * out->capacity); + out->data = gpr_realloc (out->data, out->capacity); + } out->data[out->length++] = c; } -static void hexdump(dump_out *out, const char *buf, size_t len) { +static void +hexdump (dump_out * out, const char *buf, size_t len) +{ static const char hex[16] = "0123456789abcdef"; - const gpr_uint8 *const beg = (const gpr_uint8 *)buf; + const gpr_uint8 *const beg = (const gpr_uint8 *) buf; const gpr_uint8 *const end = beg + len; const gpr_uint8 *cur; - for (cur = beg; cur != end; ++cur) { - if (cur != beg) dump_out_append(out, ' '); - dump_out_append(out, hex[*cur >> 4]); - dump_out_append(out, hex[*cur & 0xf]); - } + for (cur = beg; cur != end; ++cur) + { + if (cur != beg) + dump_out_append (out, ' '); + dump_out_append (out, hex[*cur >> 4]); + dump_out_append (out, hex[*cur & 0xf]); + } } -static void asciidump(dump_out *out, const char *buf, size_t len) { - const gpr_uint8 *const beg = (const gpr_uint8 *)buf; +static void +asciidump (dump_out * out, const char *buf, size_t len) +{ + const gpr_uint8 *const beg = (const gpr_uint8 *) buf; const gpr_uint8 *const end = beg + len; const gpr_uint8 *cur; int out_was_empty = (out->length == 0); - if (!out_was_empty) { - dump_out_append(out, ' '); - dump_out_append(out, '\''); - } - for (cur = beg; cur != end; ++cur) { - dump_out_append(out, (char)(isprint(*cur) ? *(char *)cur : '.')); - } - if (!out_was_empty) { - dump_out_append(out, '\''); - } + if (!out_was_empty) + { + dump_out_append (out, ' '); + dump_out_append (out, '\''); + } + for (cur = beg; cur != end; ++cur) + { + dump_out_append (out, (char) (isprint (*cur) ? *(char *) cur : '.')); + } + if (!out_was_empty) + { + dump_out_append (out, '\''); + } } -char *gpr_dump(const char *buf, size_t len, gpr_uint32 flags) { - dump_out out = dump_out_create(); - if (flags & GPR_DUMP_HEX) { - hexdump(&out, buf, len); - } - if (flags & GPR_DUMP_ASCII) { - asciidump(&out, buf, len); - } - dump_out_append(&out, 0); +char * +gpr_dump (const char *buf, size_t len, gpr_uint32 flags) +{ + dump_out out = dump_out_create (); + if (flags & GPR_DUMP_HEX) + { + hexdump (&out, buf, len); + } + if (flags & GPR_DUMP_ASCII) + { + asciidump (&out, buf, len); + } + dump_out_append (&out, 0); return out.data; } -char *gpr_dump_slice(gpr_slice s, gpr_uint32 flags) { - return gpr_dump((const char *)GPR_SLICE_START_PTR(s), GPR_SLICE_LENGTH(s), - flags); +char * +gpr_dump_slice (gpr_slice s, gpr_uint32 flags) +{ + return gpr_dump ((const char *) GPR_SLICE_START_PTR (s), GPR_SLICE_LENGTH (s), flags); } -int gpr_parse_bytes_to_uint32(const char *buf, size_t len, gpr_uint32 *result) { +int +gpr_parse_bytes_to_uint32 (const char *buf, size_t len, gpr_uint32 * result) +{ gpr_uint32 out = 0; gpr_uint32 new; size_t i; - if (len == 0) return 0; /* must have some bytes */ - - for (i = 0; i < len; i++) { - if (buf[i] < '0' || buf[i] > '9') return 0; /* bad char */ - new = 10 * out + (gpr_uint32)(buf[i] - '0'); - if (new < out) return 0; /* overflow */ - out = new; - } + if (len == 0) + return 0; /* must have some bytes */ + + for (i = 0; i < len; i++) + { + if (buf[i] < '0' || buf[i] > '9') + return 0; /* bad char */ + new = 10 * out + (gpr_uint32) (buf[i] - '0'); + if (new < out) + return 0; /* overflow */ + out = new; + } *result = out; return 1; } -void gpr_reverse_bytes(char *str, int len) { +void +gpr_reverse_bytes (char *str, int len) +{ char *p1, *p2; - for (p1 = str, p2 = str + len - 1; p2 > p1; ++p1, --p2) { - char temp = *p1; - *p1 = *p2; - *p2 = temp; - } + for (p1 = str, p2 = str + len - 1; p2 > p1; ++p1, --p2) + { + char temp = *p1; + *p1 = *p2; + *p2 = temp; + } } -int gpr_ltoa(long value, char *string) { +int +gpr_ltoa (long value, char *string) +{ int i = 0; int neg = value < 0; - if (value == 0) { - string[0] = '0'; - string[1] = 0; - return 1; - } - - if (neg) value = -value; - while (value) { - string[i++] = (char)('0' + value % 10); - value /= 10; - } - if (neg) string[i++] = '-'; - gpr_reverse_bytes(string, i); + if (value == 0) + { + string[0] = '0'; + string[1] = 0; + return 1; + } + + if (neg) + value = -value; + while (value) + { + string[i++] = (char) ('0' + value % 10); + value /= 10; + } + if (neg) + string[i++] = '-'; + gpr_reverse_bytes (string, i); string[i] = 0; return i; } -char *gpr_strjoin(const char **strs, size_t nstrs, size_t *final_length) { - return gpr_strjoin_sep(strs, nstrs, "", final_length); +char * +gpr_strjoin (const char **strs, size_t nstrs, size_t * final_length) +{ + return gpr_strjoin_sep (strs, nstrs, "", final_length); } -char *gpr_strjoin_sep(const char **strs, size_t nstrs, const char *sep, - size_t *final_length) { - const size_t sep_len = strlen(sep); +char * +gpr_strjoin_sep (const char **strs, size_t nstrs, const char *sep, size_t * final_length) +{ + const size_t sep_len = strlen (sep); size_t out_length = 0; size_t i; char *out; - for (i = 0; i < nstrs; i++) { - out_length += strlen(strs[i]); - } - out_length += 1; /* null terminator */ - if (nstrs > 0) { - out_length += sep_len * (nstrs - 1); /* separators */ - } - out = gpr_malloc(out_length); + for (i = 0; i < nstrs; i++) + { + out_length += strlen (strs[i]); + } + out_length += 1; /* null terminator */ + if (nstrs > 0) + { + out_length += sep_len * (nstrs - 1); /* separators */ + } + out = gpr_malloc (out_length); out_length = 0; - for (i = 0; i < nstrs; i++) { - const size_t slen = strlen(strs[i]); - if (i != 0) { - memcpy(out + out_length, sep, sep_len); - out_length += sep_len; + for (i = 0; i < nstrs; i++) + { + const size_t slen = strlen (strs[i]); + if (i != 0) + { + memcpy (out + out_length, sep, sep_len); + out_length += sep_len; + } + memcpy (out + out_length, strs[i], slen); + out_length += slen; } - memcpy(out + out_length, strs[i], slen); - out_length += slen; - } out[out_length] = 0; - if (final_length != NULL) { - *final_length = out_length; - } + if (final_length != NULL) + { + *final_length = out_length; + } return out; } @@ -213,63 +259,83 @@ char *gpr_strjoin_sep(const char **strs, size_t nstrs, const char *sep, * str. * * Returns 1 and updates \a begin and \a end. Returns 0 otherwise. */ -static int slice_find_separator_offset(const gpr_slice str, const char *sep, - const size_t read_offset, size_t *begin, - size_t *end) { +static int +slice_find_separator_offset (const gpr_slice str, const char *sep, const size_t read_offset, size_t * begin, size_t * end) +{ size_t i; - const gpr_uint8 *str_ptr = GPR_SLICE_START_PTR(str) + read_offset; - const size_t str_len = GPR_SLICE_LENGTH(str) - read_offset; - const size_t sep_len = strlen(sep); - if (str_len < sep_len) { - return 0; - } - - for (i = 0; i <= str_len - sep_len; i++) { - if (memcmp(str_ptr + i, sep, sep_len) == 0) { - *begin = read_offset; - *end = read_offset + i; - return 1; + const gpr_uint8 *str_ptr = GPR_SLICE_START_PTR (str) + read_offset; + const size_t str_len = GPR_SLICE_LENGTH (str) - read_offset; + const size_t sep_len = strlen (sep); + if (str_len < sep_len) + { + return 0; + } + + for (i = 0; i <= str_len - sep_len; i++) + { + if (memcmp (str_ptr + i, sep, sep_len) == 0) + { + *begin = read_offset; + *end = read_offset + i; + return 1; + } } - } return 0; } -void gpr_slice_split(gpr_slice str, const char *sep, gpr_slice_buffer *dst) { - const size_t sep_len = strlen(sep); +void +gpr_slice_split (gpr_slice str, const char *sep, gpr_slice_buffer * dst) +{ + const size_t sep_len = strlen (sep); size_t begin, end; - GPR_ASSERT(sep_len > 0); - - if (slice_find_separator_offset(str, sep, 0, &begin, &end) != 0) { - do { - gpr_slice_buffer_add_indexed(dst, gpr_slice_sub(str, begin, end)); - } while (slice_find_separator_offset(str, sep, end + sep_len, &begin, - &end) != 0); - gpr_slice_buffer_add_indexed( - dst, gpr_slice_sub(str, end + sep_len, GPR_SLICE_LENGTH(str))); - } else { /* no sep found, add whole input */ - gpr_slice_buffer_add_indexed(dst, gpr_slice_ref(str)); - } + GPR_ASSERT (sep_len > 0); + + if (slice_find_separator_offset (str, sep, 0, &begin, &end) != 0) + { + do + { + gpr_slice_buffer_add_indexed (dst, gpr_slice_sub (str, begin, end)); + } + while (slice_find_separator_offset (str, sep, end + sep_len, &begin, &end) != 0); + gpr_slice_buffer_add_indexed (dst, gpr_slice_sub (str, end + sep_len, GPR_SLICE_LENGTH (str))); + } + else + { /* no sep found, add whole input */ + gpr_slice_buffer_add_indexed (dst, gpr_slice_ref (str)); + } } -void gpr_strvec_init(gpr_strvec *sv) { memset(sv, 0, sizeof(*sv)); } +void +gpr_strvec_init (gpr_strvec * sv) +{ + memset (sv, 0, sizeof (*sv)); +} -void gpr_strvec_destroy(gpr_strvec *sv) { +void +gpr_strvec_destroy (gpr_strvec * sv) +{ size_t i; - for (i = 0; i < sv->count; i++) { - gpr_free(sv->strs[i]); - } - gpr_free(sv->strs); + for (i = 0; i < sv->count; i++) + { + gpr_free (sv->strs[i]); + } + gpr_free (sv->strs); } -void gpr_strvec_add(gpr_strvec *sv, char *str) { - if (sv->count == sv->capacity) { - sv->capacity = GPR_MAX(sv->capacity + 8, sv->capacity * 2); - sv->strs = gpr_realloc(sv->strs, sizeof(char *) * sv->capacity); - } +void +gpr_strvec_add (gpr_strvec * sv, char *str) +{ + if (sv->count == sv->capacity) + { + sv->capacity = GPR_MAX (sv->capacity + 8, sv->capacity * 2); + sv->strs = gpr_realloc (sv->strs, sizeof (char *) * sv->capacity); + } sv->strs[sv->count++] = str; } -char *gpr_strvec_flatten(gpr_strvec *sv, size_t *final_length) { - return gpr_strjoin((const char **)sv->strs, sv->count, final_length); +char * +gpr_strvec_flatten (gpr_strvec * sv, size_t * final_length) +{ + return gpr_strjoin ((const char **) sv->strs, sv->count, final_length); } diff --git a/src/core/support/string.h b/src/core/support/string.h index a28e00fd3ec..4304bcb5f5d 100644 --- a/src/core/support/string.h +++ b/src/core/support/string.h @@ -41,7 +41,8 @@ #include #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif /* String utility functions */ @@ -52,15 +53,14 @@ extern "C" { /* Converts array buf, of length len, into a C string according to the flags. Result should be freed with gpr_free() */ -char *gpr_dump(const char *buf, size_t len, gpr_uint32 flags); + char *gpr_dump (const char *buf, size_t len, gpr_uint32 flags); /* Calls gpr_dump on a slice. */ -char *gpr_dump_slice(gpr_slice slice, gpr_uint32 flags); + char *gpr_dump_slice (gpr_slice slice, gpr_uint32 flags); /* Parses an array of bytes into an integer (base 10). Returns 1 on success, 0 on failure. */ -int gpr_parse_bytes_to_uint32(const char *data, size_t length, - gpr_uint32 *result); + int gpr_parse_bytes_to_uint32 (const char *data, size_t length, gpr_uint32 * result); /* Minimum buffer size for calling ltoa */ #define GPR_LTOA_MIN_BUFSIZE (3 * sizeof(long)) @@ -68,44 +68,44 @@ int gpr_parse_bytes_to_uint32(const char *data, size_t length, /* Convert a long to a string in base 10; returns the length of the output string (or 0 on failure). output must be at least GPR_LTOA_MIN_BUFSIZE bytes long. */ -int gpr_ltoa(long value, char *output); + int gpr_ltoa (long value, char *output); /* Reverse a run of bytes */ -void gpr_reverse_bytes(char *str, int len); + void gpr_reverse_bytes (char *str, int len); /* Join a set of strings, returning the resulting string. Total combined length (excluding null terminator) is returned in total_length if it is non-null. */ -char *gpr_strjoin(const char **strs, size_t nstrs, size_t *total_length); + char *gpr_strjoin (const char **strs, size_t nstrs, size_t * total_length); /* Join a set of strings using a separator, returning the resulting string. Total combined length (excluding null terminator) is returned in total_length if it is non-null. */ -char *gpr_strjoin_sep(const char **strs, size_t nstrs, const char *sep, - size_t *total_length); + char *gpr_strjoin_sep (const char **strs, size_t nstrs, const char *sep, size_t * total_length); /** Split \a str by the separator \a sep. Results are stored in \a dst, which * should be a properly initialized instance. */ -void gpr_slice_split(gpr_slice str, const char *sep, gpr_slice_buffer *dst); + void gpr_slice_split (gpr_slice str, const char *sep, gpr_slice_buffer * dst); /* A vector of strings... for building up a final string one piece at a time */ -typedef struct { - char **strs; - size_t count; - size_t capacity; -} gpr_strvec; + typedef struct + { + char **strs; + size_t count; + size_t capacity; + } gpr_strvec; /* Initialize/destroy */ -void gpr_strvec_init(gpr_strvec *strs); -void gpr_strvec_destroy(gpr_strvec *strs); + void gpr_strvec_init (gpr_strvec * strs); + void gpr_strvec_destroy (gpr_strvec * strs); /* Add a string to a strvec, takes ownership of the string */ -void gpr_strvec_add(gpr_strvec *strs, char *add); + void gpr_strvec_add (gpr_strvec * strs, char *add); /* Return a joined string with all added substrings, optionally setting total_length as per gpr_strjoin */ -char *gpr_strvec_flatten(gpr_strvec *strs, size_t *total_length); + char *gpr_strvec_flatten (gpr_strvec * strs, size_t * total_length); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_SUPPORT_STRING_H */ +#endif /* GRPC_INTERNAL_CORE_SUPPORT_STRING_H */ diff --git a/src/core/support/string_posix.c b/src/core/support/string_posix.c index 25c333db4ed..729d5b1a9c3 100644 --- a/src/core/support/string_posix.c +++ b/src/core/support/string_posix.c @@ -41,44 +41,50 @@ #include -int gpr_asprintf(char **strp, const char *format, ...) { +int +gpr_asprintf (char **strp, const char *format, ...) +{ va_list args; int ret; char buf[64]; size_t strp_buflen; /* Use a constant-sized buffer to determine the length. */ - va_start(args, format); - ret = vsnprintf(buf, sizeof(buf), format, args); - va_end(args); - if (ret < 0) { - *strp = NULL; - return -1; - } + va_start (args, format); + ret = vsnprintf (buf, sizeof (buf), format, args); + va_end (args); + if (ret < 0) + { + *strp = NULL; + return -1; + } /* Allocate a new buffer, with space for the NUL terminator. */ - strp_buflen = (size_t)ret + 1; - if ((*strp = gpr_malloc(strp_buflen)) == NULL) { - /* This shouldn't happen, because gpr_malloc() calls abort(). */ - return -1; - } + strp_buflen = (size_t) ret + 1; + if ((*strp = gpr_malloc (strp_buflen)) == NULL) + { + /* This shouldn't happen, because gpr_malloc() calls abort(). */ + return -1; + } /* Return early if we have all the bytes. */ - if (strp_buflen <= sizeof(buf)) { - memcpy(*strp, buf, strp_buflen); - return ret; - } + if (strp_buflen <= sizeof (buf)) + { + memcpy (*strp, buf, strp_buflen); + return ret; + } /* Try again using the larger buffer. */ - va_start(args, format); - ret = vsnprintf(*strp, strp_buflen, format, args); - va_end(args); - if ((size_t)ret == strp_buflen - 1) { - return ret; - } + va_start (args, format); + ret = vsnprintf (*strp, strp_buflen, format, args); + va_end (args); + if ((size_t) ret == strp_buflen - 1) + { + return ret; + } /* This should never happen. */ - gpr_free(*strp); + gpr_free (*strp); *strp = NULL; return -1; } diff --git a/src/core/support/string_win32.c b/src/core/support/string_win32.c index 8ffb0a225e5..6d1909fa049 100644 --- a/src/core/support/string_win32.c +++ b/src/core/support/string_win32.c @@ -45,63 +45,82 @@ #include "src/core/support/string.h" -int gpr_asprintf(char **strp, const char *format, ...) { +int +gpr_asprintf (char **strp, const char *format, ...) +{ va_list args; int ret; size_t strp_buflen; /* Determine the length. */ - va_start(args, format); - ret = _vscprintf(format, args); - va_end(args); - if (ret < 0) { - *strp = NULL; - return -1; - } + va_start (args, format); + ret = _vscprintf (format, args); + va_end (args); + if (ret < 0) + { + *strp = NULL; + return -1; + } /* Allocate a new buffer, with space for the NUL terminator. */ - strp_buflen = (size_t)ret + 1; - if ((*strp = gpr_malloc(strp_buflen)) == NULL) { - /* This shouldn't happen, because gpr_malloc() calls abort(). */ - return -1; - } + strp_buflen = (size_t) ret + 1; + if ((*strp = gpr_malloc (strp_buflen)) == NULL) + { + /* This shouldn't happen, because gpr_malloc() calls abort(). */ + return -1; + } /* Print to the buffer. */ - va_start(args, format); - ret = vsnprintf_s(*strp, strp_buflen, _TRUNCATE, format, args); - va_end(args); - if ((size_t)ret == strp_buflen - 1) { - return ret; - } + va_start (args, format); + ret = vsnprintf_s (*strp, strp_buflen, _TRUNCATE, format, args); + va_end (args); + if ((size_t) ret == strp_buflen - 1) + { + return ret; + } /* This should never happen. */ - gpr_free(*strp); + gpr_free (*strp); *strp = NULL; return -1; } #if defined UNICODE || defined _UNICODE -LPTSTR gpr_char_to_tchar(LPCSTR input) { +LPTSTR +gpr_char_to_tchar (LPCSTR input) +{ LPTSTR ret; - int needed = MultiByteToWideChar(CP_UTF8, 0, input, -1, NULL, 0); - if (needed == 0) return NULL; - ret = gpr_malloc(needed * sizeof(TCHAR)); - MultiByteToWideChar(CP_UTF8, 0, input, -1, ret, needed); + int needed = MultiByteToWideChar (CP_UTF8, 0, input, -1, NULL, 0); + if (needed == 0) + return NULL; + ret = gpr_malloc (needed * sizeof (TCHAR)); + MultiByteToWideChar (CP_UTF8, 0, input, -1, ret, needed); return ret; } -LPSTR gpr_tchar_to_char(LPCTSTR input) { +LPSTR +gpr_tchar_to_char (LPCTSTR input) +{ LPSTR ret; - int needed = WideCharToMultiByte(CP_UTF8, 0, input, -1, NULL, 0, NULL, NULL); - if (needed == 0) return NULL; - ret = gpr_malloc(needed); - WideCharToMultiByte(CP_UTF8, 0, input, -1, ret, needed, NULL, NULL); + int needed = WideCharToMultiByte (CP_UTF8, 0, input, -1, NULL, 0, NULL, NULL); + if (needed == 0) + return NULL; + ret = gpr_malloc (needed); + WideCharToMultiByte (CP_UTF8, 0, input, -1, ret, needed, NULL, NULL); return ret; } #else -char *gpr_tchar_to_char(LPTSTR input) { return gpr_strdup(input); } +char * +gpr_tchar_to_char (LPTSTR input) +{ + return gpr_strdup (input); +} -char *gpr_char_to_tchar(LPTSTR input) { return gpr_strdup(input); } +char * +gpr_char_to_tchar (LPTSTR input) +{ + return gpr_strdup (input); +} #endif #endif /* GPR_WIN32 */ diff --git a/src/core/support/string_win32.h b/src/core/support/string_win32.h index e3043656fba..a07bdd9c47b 100644 --- a/src/core/support/string_win32.h +++ b/src/core/support/string_win32.h @@ -39,8 +39,8 @@ #ifdef GPR_WIN32 /* These allocate new strings using gpr_malloc to convert from and to utf-8. */ -LPTSTR gpr_char_to_tchar(LPCSTR input); -LPSTR gpr_tchar_to_char(LPCTSTR input); +LPTSTR gpr_char_to_tchar (LPCSTR input); +LPSTR gpr_tchar_to_char (LPCTSTR input); #endif /* GPR_WIN32 */ diff --git a/src/core/support/subprocess_posix.c b/src/core/support/subprocess_posix.c index 171054e4da6..eb5cc63d626 100644 --- a/src/core/support/subprocess_posix.c +++ b/src/core/support/subprocess_posix.c @@ -50,63 +50,85 @@ #include #include -struct gpr_subprocess { +struct gpr_subprocess +{ int pid; int joined; }; -const char *gpr_subprocess_binary_extension() { return ""; } +const char * +gpr_subprocess_binary_extension () +{ + return ""; +} -gpr_subprocess *gpr_subprocess_create(int argc, const char **argv) { +gpr_subprocess * +gpr_subprocess_create (int argc, const char **argv) +{ gpr_subprocess *r; int pid; char **exec_args; - pid = fork(); - if (pid == -1) { - return NULL; - } else if (pid == 0) { - exec_args = gpr_malloc(((size_t)argc + 1) * sizeof(char *)); - memcpy(exec_args, argv, (size_t)argc * sizeof(char *)); - exec_args[argc] = NULL; - execv(exec_args[0], exec_args); - /* if we reach here, an error has occurred */ - gpr_log(GPR_ERROR, "execv '%s' failed: %s", exec_args[0], strerror(errno)); - _exit(1); - return NULL; - } else { - r = gpr_malloc(sizeof(gpr_subprocess)); - memset(r, 0, sizeof(*r)); - r->pid = pid; - return r; - } + pid = fork (); + if (pid == -1) + { + return NULL; + } + else if (pid == 0) + { + exec_args = gpr_malloc (((size_t) argc + 1) * sizeof (char *)); + memcpy (exec_args, argv, (size_t) argc * sizeof (char *)); + exec_args[argc] = NULL; + execv (exec_args[0], exec_args); + /* if we reach here, an error has occurred */ + gpr_log (GPR_ERROR, "execv '%s' failed: %s", exec_args[0], strerror (errno)); + _exit (1); + return NULL; + } + else + { + r = gpr_malloc (sizeof (gpr_subprocess)); + memset (r, 0, sizeof (*r)); + r->pid = pid; + return r; + } } -void gpr_subprocess_destroy(gpr_subprocess *p) { - if (!p->joined) { - kill(p->pid, SIGKILL); - gpr_subprocess_join(p); - } - gpr_free(p); +void +gpr_subprocess_destroy (gpr_subprocess * p) +{ + if (!p->joined) + { + kill (p->pid, SIGKILL); + gpr_subprocess_join (p); + } + gpr_free (p); } -int gpr_subprocess_join(gpr_subprocess *p) { +int +gpr_subprocess_join (gpr_subprocess * p) +{ int status; retry: - if (waitpid(p->pid, &status, 0) == -1) { - if (errno == EINTR) { - goto retry; + if (waitpid (p->pid, &status, 0) == -1) + { + if (errno == EINTR) + { + goto retry; + } + gpr_log (GPR_ERROR, "waitpid failed: %s", strerror (errno)); + return -1; } - gpr_log(GPR_ERROR, "waitpid failed: %s", strerror(errno)); - return -1; - } return status; } -void gpr_subprocess_interrupt(gpr_subprocess *p) { - if (!p->joined) { - kill(p->pid, SIGINT); - } +void +gpr_subprocess_interrupt (gpr_subprocess * p) +{ + if (!p->joined) + { + kill (p->pid, SIGINT); + } } #endif /* GPR_POSIX_SUBPROCESS */ diff --git a/src/core/support/sync.c b/src/core/support/sync.c index d3cf77faea9..de3ec7c86f6 100644 --- a/src/core/support/sync.c +++ b/src/core/support/sync.c @@ -39,84 +39,120 @@ /* Number of mutexes to allocate for events, to avoid lock contention. Should be a prime. */ -enum { event_sync_partitions = 31 }; +enum +{ event_sync_partitions = 31 }; /* Events are partitioned by address to avoid lock contention. */ -static struct sync_array_s { +static struct sync_array_s +{ gpr_mu mu; gpr_cv cv; } sync_array[event_sync_partitions]; /* This routine is executed once on first use, via event_once */ static gpr_once event_once = GPR_ONCE_INIT; -static void event_initialize(void) { +static void +event_initialize (void) +{ int i; - for (i = 0; i != event_sync_partitions; i++) { - gpr_mu_init(&sync_array[i].mu); - gpr_cv_init(&sync_array[i].cv); - } + for (i = 0; i != event_sync_partitions; i++) + { + gpr_mu_init (&sync_array[i].mu); + gpr_cv_init (&sync_array[i].cv); + } } /* Hash ev into an element of sync_array[]. */ -static struct sync_array_s *hash(gpr_event *ev) { - return &sync_array[((gpr_uintptr)ev) % event_sync_partitions]; +static struct sync_array_s * +hash (gpr_event * ev) +{ + return &sync_array[((gpr_uintptr) ev) % event_sync_partitions]; } -void gpr_event_init(gpr_event *ev) { - gpr_once_init(&event_once, &event_initialize); +void +gpr_event_init (gpr_event * ev) +{ + gpr_once_init (&event_once, &event_initialize); ev->state = 0; } -void gpr_event_set(gpr_event *ev, void *value) { - struct sync_array_s *s = hash(ev); - gpr_mu_lock(&s->mu); - GPR_ASSERT(gpr_atm_acq_load(&ev->state) == 0); - gpr_atm_rel_store(&ev->state, (gpr_atm)value); - gpr_cv_broadcast(&s->cv); - gpr_mu_unlock(&s->mu); - GPR_ASSERT(value != NULL); +void +gpr_event_set (gpr_event * ev, void *value) +{ + struct sync_array_s *s = hash (ev); + gpr_mu_lock (&s->mu); + GPR_ASSERT (gpr_atm_acq_load (&ev->state) == 0); + gpr_atm_rel_store (&ev->state, (gpr_atm) value); + gpr_cv_broadcast (&s->cv); + gpr_mu_unlock (&s->mu); + GPR_ASSERT (value != NULL); } -void *gpr_event_get(gpr_event *ev) { - return (void *)gpr_atm_acq_load(&ev->state); +void * +gpr_event_get (gpr_event * ev) +{ + return (void *) gpr_atm_acq_load (&ev->state); } -void *gpr_event_wait(gpr_event *ev, gpr_timespec abs_deadline) { - void *result = (void *)gpr_atm_acq_load(&ev->state); - if (result == NULL) { - struct sync_array_s *s = hash(ev); - gpr_mu_lock(&s->mu); - do { - result = (void *)gpr_atm_acq_load(&ev->state); - } while (result == NULL && !gpr_cv_wait(&s->cv, &s->mu, abs_deadline)); - gpr_mu_unlock(&s->mu); - } +void * +gpr_event_wait (gpr_event * ev, gpr_timespec abs_deadline) +{ + void *result = (void *) gpr_atm_acq_load (&ev->state); + if (result == NULL) + { + struct sync_array_s *s = hash (ev); + gpr_mu_lock (&s->mu); + do + { + result = (void *) gpr_atm_acq_load (&ev->state); + } + while (result == NULL && !gpr_cv_wait (&s->cv, &s->mu, abs_deadline)); + gpr_mu_unlock (&s->mu); + } return result; } -void gpr_ref_init(gpr_refcount *r, int n) { gpr_atm_rel_store(&r->count, n); } +void +gpr_ref_init (gpr_refcount * r, int n) +{ + gpr_atm_rel_store (&r->count, n); +} -void gpr_ref(gpr_refcount *r) { gpr_atm_no_barrier_fetch_add(&r->count, 1); } +void +gpr_ref (gpr_refcount * r) +{ + gpr_atm_no_barrier_fetch_add (&r->count, 1); +} -void gpr_refn(gpr_refcount *r, int n) { - gpr_atm_no_barrier_fetch_add(&r->count, n); +void +gpr_refn (gpr_refcount * r, int n) +{ + gpr_atm_no_barrier_fetch_add (&r->count, n); } -int gpr_unref(gpr_refcount *r) { - gpr_atm prior = gpr_atm_full_fetch_add(&r->count, -1); - GPR_ASSERT(prior > 0); +int +gpr_unref (gpr_refcount * r) +{ + gpr_atm prior = gpr_atm_full_fetch_add (&r->count, -1); + GPR_ASSERT (prior > 0); return prior == 1; } -void gpr_stats_init(gpr_stats_counter *c, gpr_intptr n) { - gpr_atm_rel_store(&c->value, n); +void +gpr_stats_init (gpr_stats_counter * c, gpr_intptr n) +{ + gpr_atm_rel_store (&c->value, n); } -void gpr_stats_inc(gpr_stats_counter *c, gpr_intptr inc) { - gpr_atm_no_barrier_fetch_add(&c->value, inc); +void +gpr_stats_inc (gpr_stats_counter * c, gpr_intptr inc) +{ + gpr_atm_no_barrier_fetch_add (&c->value, inc); } -gpr_intptr gpr_stats_read(const gpr_stats_counter *c) { +gpr_intptr +gpr_stats_read (const gpr_stats_counter * c) +{ /* don't need acquire-load, but we have no no-barrier load yet */ - return gpr_atm_acq_load(&c->value); + return gpr_atm_acq_load (&c->value); } diff --git a/src/core/support/sync_posix.c b/src/core/support/sync_posix.c index 6f078cd4bb6..e7ca7e01d43 100644 --- a/src/core/support/sync_posix.c +++ b/src/core/support/sync_posix.c @@ -41,52 +41,90 @@ #include #include -void gpr_mu_init(gpr_mu *mu) { GPR_ASSERT(pthread_mutex_init(mu, NULL) == 0); } +void +gpr_mu_init (gpr_mu * mu) +{ + GPR_ASSERT (pthread_mutex_init (mu, NULL) == 0); +} -void gpr_mu_destroy(gpr_mu *mu) { GPR_ASSERT(pthread_mutex_destroy(mu) == 0); } +void +gpr_mu_destroy (gpr_mu * mu) +{ + GPR_ASSERT (pthread_mutex_destroy (mu) == 0); +} -void gpr_mu_lock(gpr_mu *mu) { GPR_ASSERT(pthread_mutex_lock(mu) == 0); } +void +gpr_mu_lock (gpr_mu * mu) +{ + GPR_ASSERT (pthread_mutex_lock (mu) == 0); +} -void gpr_mu_unlock(gpr_mu *mu) { GPR_ASSERT(pthread_mutex_unlock(mu) == 0); } +void +gpr_mu_unlock (gpr_mu * mu) +{ + GPR_ASSERT (pthread_mutex_unlock (mu) == 0); +} -int gpr_mu_trylock(gpr_mu *mu) { - int err = pthread_mutex_trylock(mu); - GPR_ASSERT(err == 0 || err == EBUSY); +int +gpr_mu_trylock (gpr_mu * mu) +{ + int err = pthread_mutex_trylock (mu); + GPR_ASSERT (err == 0 || err == EBUSY); return err == 0; } /*----------------------------------------*/ -void gpr_cv_init(gpr_cv *cv) { GPR_ASSERT(pthread_cond_init(cv, NULL) == 0); } +void +gpr_cv_init (gpr_cv * cv) +{ + GPR_ASSERT (pthread_cond_init (cv, NULL) == 0); +} -void gpr_cv_destroy(gpr_cv *cv) { GPR_ASSERT(pthread_cond_destroy(cv) == 0); } +void +gpr_cv_destroy (gpr_cv * cv) +{ + GPR_ASSERT (pthread_cond_destroy (cv) == 0); +} -int gpr_cv_wait(gpr_cv *cv, gpr_mu *mu, gpr_timespec abs_deadline) { +int +gpr_cv_wait (gpr_cv * cv, gpr_mu * mu, gpr_timespec abs_deadline) +{ int err = 0; - if (gpr_time_cmp(abs_deadline, gpr_inf_future(abs_deadline.clock_type)) == - 0) { - err = pthread_cond_wait(cv, mu); - } else { - struct timespec abs_deadline_ts; - abs_deadline = gpr_convert_clock_type(abs_deadline, GPR_CLOCK_REALTIME); - abs_deadline_ts.tv_sec = abs_deadline.tv_sec; - abs_deadline_ts.tv_nsec = abs_deadline.tv_nsec; - err = pthread_cond_timedwait(cv, mu, &abs_deadline_ts); - } - GPR_ASSERT(err == 0 || err == ETIMEDOUT || err == EAGAIN); + if (gpr_time_cmp (abs_deadline, gpr_inf_future (abs_deadline.clock_type)) == 0) + { + err = pthread_cond_wait (cv, mu); + } + else + { + struct timespec abs_deadline_ts; + abs_deadline = gpr_convert_clock_type (abs_deadline, GPR_CLOCK_REALTIME); + abs_deadline_ts.tv_sec = abs_deadline.tv_sec; + abs_deadline_ts.tv_nsec = abs_deadline.tv_nsec; + err = pthread_cond_timedwait (cv, mu, &abs_deadline_ts); + } + GPR_ASSERT (err == 0 || err == ETIMEDOUT || err == EAGAIN); return err == ETIMEDOUT; } -void gpr_cv_signal(gpr_cv *cv) { GPR_ASSERT(pthread_cond_signal(cv) == 0); } +void +gpr_cv_signal (gpr_cv * cv) +{ + GPR_ASSERT (pthread_cond_signal (cv) == 0); +} -void gpr_cv_broadcast(gpr_cv *cv) { - GPR_ASSERT(pthread_cond_broadcast(cv) == 0); +void +gpr_cv_broadcast (gpr_cv * cv) +{ + GPR_ASSERT (pthread_cond_broadcast (cv) == 0); } /*----------------------------------------*/ -void gpr_once_init(gpr_once *once, void (*init_function)(void)) { - GPR_ASSERT(pthread_once(once, init_function) == 0); +void +gpr_once_init (gpr_once * once, void (*init_function) (void)) +{ + GPR_ASSERT (pthread_once (once, init_function) == 0); } #endif /* GRP_POSIX_SYNC */ diff --git a/src/core/support/sync_win32.c b/src/core/support/sync_win32.c index 69dd46399a6..9cfcad9fe7e 100644 --- a/src/core/support/sync_win32.c +++ b/src/core/support/sync_win32.c @@ -41,88 +41,126 @@ #include #include -void gpr_mu_init(gpr_mu *mu) { - InitializeCriticalSection(&mu->cs); +void +gpr_mu_init (gpr_mu * mu) +{ + InitializeCriticalSection (&mu->cs); mu->locked = 0; } -void gpr_mu_destroy(gpr_mu *mu) { DeleteCriticalSection(&mu->cs); } +void +gpr_mu_destroy (gpr_mu * mu) +{ + DeleteCriticalSection (&mu->cs); +} -void gpr_mu_lock(gpr_mu *mu) { - EnterCriticalSection(&mu->cs); - GPR_ASSERT(!mu->locked); +void +gpr_mu_lock (gpr_mu * mu) +{ + EnterCriticalSection (&mu->cs); + GPR_ASSERT (!mu->locked); mu->locked = 1; } -void gpr_mu_unlock(gpr_mu *mu) { +void +gpr_mu_unlock (gpr_mu * mu) +{ mu->locked = 0; - LeaveCriticalSection(&mu->cs); + LeaveCriticalSection (&mu->cs); } -int gpr_mu_trylock(gpr_mu *mu) { - int result = TryEnterCriticalSection(&mu->cs); - if (result) { - if (mu->locked) { /* This thread already holds the lock. */ - LeaveCriticalSection(&mu->cs); /* Decrement lock count. */ - result = 0; /* Indicate failure */ +int +gpr_mu_trylock (gpr_mu * mu) +{ + int result = TryEnterCriticalSection (&mu->cs); + if (result) + { + if (mu->locked) + { /* This thread already holds the lock. */ + LeaveCriticalSection (&mu->cs); /* Decrement lock count. */ + result = 0; /* Indicate failure */ + } + mu->locked = 1; } - mu->locked = 1; - } return result; } /*----------------------------------------*/ -void gpr_cv_init(gpr_cv *cv) { InitializeConditionVariable(cv); } +void +gpr_cv_init (gpr_cv * cv) +{ + InitializeConditionVariable (cv); +} -void gpr_cv_destroy(gpr_cv *cv) { +void +gpr_cv_destroy (gpr_cv * cv) +{ /* Condition variables don't need destruction in Win32. */ } -int gpr_cv_wait(gpr_cv *cv, gpr_mu *mu, gpr_timespec abs_deadline) { +int +gpr_cv_wait (gpr_cv * cv, gpr_mu * mu, gpr_timespec abs_deadline) +{ int timeout = 0; DWORD timeout_max_ms; mu->locked = 0; - if (gpr_time_cmp(abs_deadline, gpr_inf_future(abs_deadline.clock_type)) == - 0) { - SleepConditionVariableCS(cv, &mu->cs, INFINITE); - } else { - gpr_timespec now = gpr_now(abs_deadline.clock_type); - gpr_int64 now_ms = (gpr_int64)now.tv_sec * 1000 + now.tv_nsec / 1000000; - gpr_int64 deadline_ms = - (gpr_int64)abs_deadline.tv_sec * 1000 + abs_deadline.tv_nsec / 1000000; - if (now_ms >= deadline_ms) { - timeout = 1; - } else { - timeout_max_ms = (DWORD)min(deadline_ms - now_ms, INFINITE - 1); - timeout = (SleepConditionVariableCS(cv, &mu->cs, timeout_max_ms) == 0 && - GetLastError() == ERROR_TIMEOUT); + if (gpr_time_cmp (abs_deadline, gpr_inf_future (abs_deadline.clock_type)) == 0) + { + SleepConditionVariableCS (cv, &mu->cs, INFINITE); + } + else + { + gpr_timespec now = gpr_now (abs_deadline.clock_type); + gpr_int64 now_ms = (gpr_int64) now.tv_sec * 1000 + now.tv_nsec / 1000000; + gpr_int64 deadline_ms = (gpr_int64) abs_deadline.tv_sec * 1000 + abs_deadline.tv_nsec / 1000000; + if (now_ms >= deadline_ms) + { + timeout = 1; + } + else + { + timeout_max_ms = (DWORD) min (deadline_ms - now_ms, INFINITE - 1); + timeout = (SleepConditionVariableCS (cv, &mu->cs, timeout_max_ms) == 0 && GetLastError () == ERROR_TIMEOUT); + } } - } mu->locked = 1; return timeout; } -void gpr_cv_signal(gpr_cv *cv) { WakeConditionVariable(cv); } +void +gpr_cv_signal (gpr_cv * cv) +{ + WakeConditionVariable (cv); +} -void gpr_cv_broadcast(gpr_cv *cv) { WakeAllConditionVariable(cv); } +void +gpr_cv_broadcast (gpr_cv * cv) +{ + WakeAllConditionVariable (cv); +} /*----------------------------------------*/ static void *dummy; -struct run_once_func_arg { - void (*init_function)(void); +struct run_once_func_arg +{ + void (*init_function) (void); }; -static BOOL CALLBACK run_once_func(gpr_once *once, void *v, void **pv) { +static BOOL CALLBACK +run_once_func (gpr_once * once, void *v, void **pv) +{ struct run_once_func_arg *arg = v; - (*arg->init_function)(); + (*arg->init_function) (); return 1; } -void gpr_once_init(gpr_once *once, void (*init_function)(void)) { +void +gpr_once_init (gpr_once * once, void (*init_function) (void)) +{ struct run_once_func_arg arg; arg.init_function = init_function; - InitOnceExecuteOnce(once, run_once_func, &arg, &dummy); + InitOnceExecuteOnce (once, run_once_func, &arg, &dummy); } #endif /* GPR_WIN32 */ diff --git a/src/core/support/thd.c b/src/core/support/thd.c index 32c0db5b66f..3023cc7802d 100644 --- a/src/core/support/thd.c +++ b/src/core/support/thd.c @@ -37,28 +37,41 @@ #include -enum { GPR_THD_JOINABLE = 1 }; +enum +{ GPR_THD_JOINABLE = 1 }; -gpr_thd_options gpr_thd_options_default(void) { +gpr_thd_options +gpr_thd_options_default (void) +{ gpr_thd_options options; - memset(&options, 0, sizeof(options)); + memset (&options, 0, sizeof (options)); return options; } -void gpr_thd_options_set_detached(gpr_thd_options *options) { +void +gpr_thd_options_set_detached (gpr_thd_options * options) +{ options->flags &= ~GPR_THD_JOINABLE; } -void gpr_thd_options_set_joinable(gpr_thd_options *options) { +void +gpr_thd_options_set_joinable (gpr_thd_options * options) +{ options->flags |= GPR_THD_JOINABLE; } -int gpr_thd_options_is_detached(const gpr_thd_options *options) { - if (!options) return 1; +int +gpr_thd_options_is_detached (const gpr_thd_options * options) +{ + if (!options) + return 1; return (options->flags & GPR_THD_JOINABLE) == 0; } -int gpr_thd_options_is_joinable(const gpr_thd_options *options) { - if (!options) return 0; +int +gpr_thd_options_is_joinable (const gpr_thd_options * options) +{ + if (!options) + return 0; return (options->flags & GPR_THD_JOINABLE) == GPR_THD_JOINABLE; } diff --git a/src/core/support/thd_posix.c b/src/core/support/thd_posix.c index c36d94d044d..0091d3a289e 100644 --- a/src/core/support/thd_posix.c +++ b/src/core/support/thd_posix.c @@ -45,47 +45,61 @@ #include #include -struct thd_arg { - void (*body)(void *arg); /* body of a thread */ - void *arg; /* argument to a thread */ +struct thd_arg +{ + void (*body) (void *arg); /* body of a thread */ + void *arg; /* argument to a thread */ }; /* Body of every thread started via gpr_thd_new. */ -static void *thread_body(void *v) { - struct thd_arg a = *(struct thd_arg *)v; - gpr_free(v); - (*a.body)(a.arg); +static void * +thread_body (void *v) +{ + struct thd_arg a = *(struct thd_arg *) v; + gpr_free (v); + (*a.body) (a.arg); return NULL; } -int gpr_thd_new(gpr_thd_id *t, void (*thd_body)(void *arg), void *arg, - const gpr_thd_options *options) { +int +gpr_thd_new (gpr_thd_id * t, void (*thd_body) (void *arg), void *arg, const gpr_thd_options * options) +{ int thread_started; pthread_attr_t attr; pthread_t p; - struct thd_arg *a = gpr_malloc(sizeof(*a)); + struct thd_arg *a = gpr_malloc (sizeof (*a)); a->body = thd_body; a->arg = arg; - GPR_ASSERT(pthread_attr_init(&attr) == 0); - if (gpr_thd_options_is_detached(options)) { - GPR_ASSERT(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) == - 0); - } else { - GPR_ASSERT(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE) == - 0); - } - thread_started = (pthread_create(&p, &attr, &thread_body, a) == 0); - GPR_ASSERT(pthread_attr_destroy(&attr) == 0); - if (!thread_started) { - gpr_free(a); - } - *t = (gpr_thd_id)p; + GPR_ASSERT (pthread_attr_init (&attr) == 0); + if (gpr_thd_options_is_detached (options)) + { + GPR_ASSERT (pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED) == 0); + } + else + { + GPR_ASSERT (pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_JOINABLE) == 0); + } + thread_started = (pthread_create (&p, &attr, &thread_body, a) == 0); + GPR_ASSERT (pthread_attr_destroy (&attr) == 0); + if (!thread_started) + { + gpr_free (a); + } + *t = (gpr_thd_id) p; return thread_started; } -gpr_thd_id gpr_thd_currentid(void) { return (gpr_thd_id)pthread_self(); } +gpr_thd_id +gpr_thd_currentid (void) +{ + return (gpr_thd_id) pthread_self (); +} -void gpr_thd_join(gpr_thd_id t) { pthread_join((pthread_t)t, NULL); } +void +gpr_thd_join (gpr_thd_id t) +{ + pthread_join ((pthread_t) t, NULL); +} #endif /* GPR_POSIX_SYNC */ diff --git a/src/core/support/thd_win32.c b/src/core/support/thd_win32.c index a9db180c1b0..ffb5be30282 100644 --- a/src/core/support/thd_win32.c +++ b/src/core/support/thd_win32.c @@ -50,68 +50,91 @@ #error "Unknown compiler - please file a bug report" #endif -struct thd_info { - void (*body)(void *arg); /* body of a thread */ - void *arg; /* argument to a thread */ - HANDLE join_event; /* if joinable, the join event */ - int joinable; /* true if not detached */ +struct thd_info +{ + void (*body) (void *arg); /* body of a thread */ + void *arg; /* argument to a thread */ + HANDLE join_event; /* if joinable, the join event */ + int joinable; /* true if not detached */ }; static thread_local struct thd_info *g_thd_info; /* Destroys a thread info */ -static void destroy_thread(struct thd_info *t) { - if (t->joinable) CloseHandle(t->join_event); - gpr_free(t); +static void +destroy_thread (struct thd_info *t) +{ + if (t->joinable) + CloseHandle (t->join_event); + gpr_free (t); } /* Body of every thread started via gpr_thd_new. */ -static DWORD WINAPI thread_body(void *v) { - g_thd_info = (struct thd_info *)v; - g_thd_info->body(g_thd_info->arg); - if (g_thd_info->joinable) { - BOOL ret = SetEvent(g_thd_info->join_event); - GPR_ASSERT(ret); - } else { - destroy_thread(g_thd_info); - } +static DWORD WINAPI +thread_body (void *v) +{ + g_thd_info = (struct thd_info *) v; + g_thd_info->body (g_thd_info->arg); + if (g_thd_info->joinable) + { + BOOL ret = SetEvent (g_thd_info->join_event); + GPR_ASSERT (ret); + } + else + { + destroy_thread (g_thd_info); + } return 0; } -int gpr_thd_new(gpr_thd_id *t, void (*thd_body)(void *arg), void *arg, - const gpr_thd_options *options) { +int +gpr_thd_new (gpr_thd_id * t, void (*thd_body) (void *arg), void *arg, const gpr_thd_options * options) +{ HANDLE handle; - struct thd_info *info = gpr_malloc(sizeof(*info)); + struct thd_info *info = gpr_malloc (sizeof (*info)); info->body = thd_body; info->arg = arg; *t = 0; - if (gpr_thd_options_is_joinable(options)) { - info->joinable = 1; - info->join_event = CreateEvent(NULL, FALSE, FALSE, NULL); - if (info->join_event == NULL) { - gpr_free(info); - return 0; + if (gpr_thd_options_is_joinable (options)) + { + info->joinable = 1; + info->join_event = CreateEvent (NULL, FALSE, FALSE, NULL); + if (info->join_event == NULL) + { + gpr_free (info); + return 0; + } + } + else + { + info->joinable = 0; + } + handle = CreateThread (NULL, 64 * 1024, thread_body, info, 0, NULL); + if (handle == NULL) + { + destroy_thread (info); + } + else + { + *t = (gpr_thd_id) info; + CloseHandle (handle); } - } else { - info->joinable = 0; - } - handle = CreateThread(NULL, 64 * 1024, thread_body, info, 0, NULL); - if (handle == NULL) { - destroy_thread(info); - } else { - *t = (gpr_thd_id)info; - CloseHandle(handle); - } return handle != NULL; } -gpr_thd_id gpr_thd_currentid(void) { return (gpr_thd_id)g_thd_info; } +gpr_thd_id +gpr_thd_currentid (void) +{ + return (gpr_thd_id) g_thd_info; +} -void gpr_thd_join(gpr_thd_id t) { - struct thd_info *info = (struct thd_info *)t; - DWORD ret = WaitForSingleObject(info->join_event, INFINITE); - GPR_ASSERT(ret == WAIT_OBJECT_0); - destroy_thread(info); +void +gpr_thd_join (gpr_thd_id t) +{ + struct thd_info *info = (struct thd_info *) t; + DWORD ret = WaitForSingleObject (info->join_event, INFINITE); + GPR_ASSERT (ret == WAIT_OBJECT_0); + destroy_thread (info); } #endif /* GPR_WIN32 */ diff --git a/src/core/support/time.c b/src/core/support/time.c index 929adac918c..c6fdeaee0b6 100644 --- a/src/core/support/time.c +++ b/src/core/support/time.c @@ -39,21 +39,28 @@ #include #include -int gpr_time_cmp(gpr_timespec a, gpr_timespec b) { +int +gpr_time_cmp (gpr_timespec a, gpr_timespec b) +{ int cmp = (a.tv_sec > b.tv_sec) - (a.tv_sec < b.tv_sec); - GPR_ASSERT(a.clock_type == b.clock_type); - if (cmp == 0) { - cmp = (a.tv_nsec > b.tv_nsec) - (a.tv_nsec < b.tv_nsec); - } + GPR_ASSERT (a.clock_type == b.clock_type); + if (cmp == 0) + { + cmp = (a.tv_nsec > b.tv_nsec) - (a.tv_nsec < b.tv_nsec); + } return cmp; } -gpr_timespec gpr_time_min(gpr_timespec a, gpr_timespec b) { - return gpr_time_cmp(a, b) < 0 ? a : b; +gpr_timespec +gpr_time_min (gpr_timespec a, gpr_timespec b) +{ + return gpr_time_cmp (a, b) < 0 ? a : b; } -gpr_timespec gpr_time_max(gpr_timespec a, gpr_timespec b) { - return gpr_time_cmp(a, b) > 0 ? a : b; +gpr_timespec +gpr_time_max (gpr_timespec a, gpr_timespec b) +{ + return gpr_time_cmp (a, b) > 0 ? a : b; } /* There's no standard TIME_T_MIN and TIME_T_MAX, so we construct them. The @@ -72,7 +79,9 @@ gpr_timespec gpr_time_max(gpr_timespec a, gpr_timespec b) { ((t)(TYPE_IS_SIGNED(t) ? (TOP_BIT_OF_TYPE(t) - 1) \ : ((TOP_BIT_OF_TYPE(t) - 1) << 1) + 1)) -gpr_timespec gpr_time_0(gpr_clock_type type) { +gpr_timespec +gpr_time_0 (gpr_clock_type type) +{ gpr_timespec out; out.tv_sec = 0; out.tv_nsec = 0; @@ -80,17 +89,21 @@ gpr_timespec gpr_time_0(gpr_clock_type type) { return out; } -gpr_timespec gpr_inf_future(gpr_clock_type type) { +gpr_timespec +gpr_inf_future (gpr_clock_type type) +{ gpr_timespec out; - out.tv_sec = TYPE_MAX(time_t); + out.tv_sec = TYPE_MAX (time_t); out.tv_nsec = 0; out.clock_type = type; return out; } -gpr_timespec gpr_inf_past(gpr_clock_type type) { +gpr_timespec +gpr_inf_past (gpr_clock_type type) +{ gpr_timespec out; - out.tv_sec = TYPE_MIN(time_t); + out.tv_sec = TYPE_MIN (time_t); out.tv_nsec = 0; out.clock_type = type; return out; @@ -99,222 +112,318 @@ gpr_timespec gpr_inf_past(gpr_clock_type type) { /* TODO(ctiller): consider merging _nanos, _micros, _millis into a single function for maintainability. Similarly for _seconds, _minutes, and _hours */ -gpr_timespec gpr_time_from_nanos(long ns, gpr_clock_type type) { +gpr_timespec +gpr_time_from_nanos (long ns, gpr_clock_type type) +{ gpr_timespec result; result.clock_type = type; - if (ns == LONG_MAX) { - result = gpr_inf_future(type); - } else if (ns == LONG_MIN) { - result = gpr_inf_past(type); - } else if (ns >= 0) { - result.tv_sec = ns / GPR_NS_PER_SEC; - result.tv_nsec = (int)(ns - result.tv_sec * GPR_NS_PER_SEC); - } else { - /* Calculation carefully formulated to avoid any possible under/overflow. */ - result.tv_sec = (-(999999999 - (ns + GPR_NS_PER_SEC)) / GPR_NS_PER_SEC) - 1; - result.tv_nsec = (int)(ns - result.tv_sec * GPR_NS_PER_SEC); - } + if (ns == LONG_MAX) + { + result = gpr_inf_future (type); + } + else if (ns == LONG_MIN) + { + result = gpr_inf_past (type); + } + else if (ns >= 0) + { + result.tv_sec = ns / GPR_NS_PER_SEC; + result.tv_nsec = (int) (ns - result.tv_sec * GPR_NS_PER_SEC); + } + else + { + /* Calculation carefully formulated to avoid any possible under/overflow. */ + result.tv_sec = (-(999999999 - (ns + GPR_NS_PER_SEC)) / GPR_NS_PER_SEC) - 1; + result.tv_nsec = (int) (ns - result.tv_sec * GPR_NS_PER_SEC); + } return result; } -gpr_timespec gpr_time_from_micros(long us, gpr_clock_type type) { +gpr_timespec +gpr_time_from_micros (long us, gpr_clock_type type) +{ gpr_timespec result; result.clock_type = type; - if (us == LONG_MAX) { - result = gpr_inf_future(type); - } else if (us == LONG_MIN) { - result = gpr_inf_past(type); - } else if (us >= 0) { - result.tv_sec = us / 1000000; - result.tv_nsec = (int)((us - result.tv_sec * 1000000) * 1000); - } else { - /* Calculation carefully formulated to avoid any possible under/overflow. */ - result.tv_sec = (-(999999 - (us + 1000000)) / 1000000) - 1; - result.tv_nsec = (int)((us - result.tv_sec * 1000000) * 1000); - } + if (us == LONG_MAX) + { + result = gpr_inf_future (type); + } + else if (us == LONG_MIN) + { + result = gpr_inf_past (type); + } + else if (us >= 0) + { + result.tv_sec = us / 1000000; + result.tv_nsec = (int) ((us - result.tv_sec * 1000000) * 1000); + } + else + { + /* Calculation carefully formulated to avoid any possible under/overflow. */ + result.tv_sec = (-(999999 - (us + 1000000)) / 1000000) - 1; + result.tv_nsec = (int) ((us - result.tv_sec * 1000000) * 1000); + } return result; } -gpr_timespec gpr_time_from_millis(long ms, gpr_clock_type type) { +gpr_timespec +gpr_time_from_millis (long ms, gpr_clock_type type) +{ gpr_timespec result; result.clock_type = type; - if (ms == LONG_MAX) { - result = gpr_inf_future(type); - } else if (ms == LONG_MIN) { - result = gpr_inf_past(type); - } else if (ms >= 0) { - result.tv_sec = ms / 1000; - result.tv_nsec = (int)((ms - result.tv_sec * 1000) * 1000000); - } else { - /* Calculation carefully formulated to avoid any possible under/overflow. */ - result.tv_sec = (-(999 - (ms + 1000)) / 1000) - 1; - result.tv_nsec = (int)((ms - result.tv_sec * 1000) * 1000000); - } + if (ms == LONG_MAX) + { + result = gpr_inf_future (type); + } + else if (ms == LONG_MIN) + { + result = gpr_inf_past (type); + } + else if (ms >= 0) + { + result.tv_sec = ms / 1000; + result.tv_nsec = (int) ((ms - result.tv_sec * 1000) * 1000000); + } + else + { + /* Calculation carefully formulated to avoid any possible under/overflow. */ + result.tv_sec = (-(999 - (ms + 1000)) / 1000) - 1; + result.tv_nsec = (int) ((ms - result.tv_sec * 1000) * 1000000); + } return result; } -gpr_timespec gpr_time_from_seconds(long s, gpr_clock_type type) { +gpr_timespec +gpr_time_from_seconds (long s, gpr_clock_type type) +{ gpr_timespec result; result.clock_type = type; - if (s == LONG_MAX) { - result = gpr_inf_future(type); - } else if (s == LONG_MIN) { - result = gpr_inf_past(type); - } else { - result.tv_sec = s; - result.tv_nsec = 0; - } + if (s == LONG_MAX) + { + result = gpr_inf_future (type); + } + else if (s == LONG_MIN) + { + result = gpr_inf_past (type); + } + else + { + result.tv_sec = s; + result.tv_nsec = 0; + } return result; } -gpr_timespec gpr_time_from_minutes(long m, gpr_clock_type type) { +gpr_timespec +gpr_time_from_minutes (long m, gpr_clock_type type) +{ gpr_timespec result; result.clock_type = type; - if (m >= LONG_MAX / 60) { - result = gpr_inf_future(type); - } else if (m <= LONG_MIN / 60) { - result = gpr_inf_past(type); - } else { - result.tv_sec = m * 60; - result.tv_nsec = 0; - } + if (m >= LONG_MAX / 60) + { + result = gpr_inf_future (type); + } + else if (m <= LONG_MIN / 60) + { + result = gpr_inf_past (type); + } + else + { + result.tv_sec = m * 60; + result.tv_nsec = 0; + } return result; } -gpr_timespec gpr_time_from_hours(long h, gpr_clock_type type) { +gpr_timespec +gpr_time_from_hours (long h, gpr_clock_type type) +{ gpr_timespec result; result.clock_type = type; - if (h >= LONG_MAX / 3600) { - result = gpr_inf_future(type); - } else if (h <= LONG_MIN / 3600) { - result = gpr_inf_past(type); - } else { - result.tv_sec = h * 3600; - result.tv_nsec = 0; - } + if (h >= LONG_MAX / 3600) + { + result = gpr_inf_future (type); + } + else if (h <= LONG_MIN / 3600) + { + result = gpr_inf_past (type); + } + else + { + result.tv_sec = h * 3600; + result.tv_nsec = 0; + } return result; } -gpr_timespec gpr_time_add(gpr_timespec a, gpr_timespec b) { +gpr_timespec +gpr_time_add (gpr_timespec a, gpr_timespec b) +{ gpr_timespec sum; int inc = 0; - GPR_ASSERT(b.clock_type == GPR_TIMESPAN); + GPR_ASSERT (b.clock_type == GPR_TIMESPAN); sum.clock_type = a.clock_type; sum.tv_nsec = a.tv_nsec + b.tv_nsec; - if (sum.tv_nsec >= GPR_NS_PER_SEC) { - sum.tv_nsec -= GPR_NS_PER_SEC; - inc++; - } - if (a.tv_sec == TYPE_MAX(time_t) || a.tv_sec == TYPE_MIN(time_t)) { - sum = a; - } else if (b.tv_sec == TYPE_MAX(time_t) || - (b.tv_sec >= 0 && a.tv_sec >= TYPE_MAX(time_t) - b.tv_sec)) { - sum = gpr_inf_future(sum.clock_type); - } else if (b.tv_sec == TYPE_MIN(time_t) || - (b.tv_sec <= 0 && a.tv_sec <= TYPE_MIN(time_t) - b.tv_sec)) { - sum = gpr_inf_past(sum.clock_type); - } else { - sum.tv_sec = a.tv_sec + b.tv_sec; - if (inc != 0 && sum.tv_sec == TYPE_MAX(time_t) - 1) { - sum = gpr_inf_future(sum.clock_type); - } else { - sum.tv_sec += inc; - } - } + if (sum.tv_nsec >= GPR_NS_PER_SEC) + { + sum.tv_nsec -= GPR_NS_PER_SEC; + inc++; + } + if (a.tv_sec == TYPE_MAX (time_t) || a.tv_sec == TYPE_MIN (time_t)) + { + sum = a; + } + else if (b.tv_sec == TYPE_MAX (time_t) || (b.tv_sec >= 0 && a.tv_sec >= TYPE_MAX (time_t) - b.tv_sec)) + { + sum = gpr_inf_future (sum.clock_type); + } + else if (b.tv_sec == TYPE_MIN (time_t) || (b.tv_sec <= 0 && a.tv_sec <= TYPE_MIN (time_t) - b.tv_sec)) + { + sum = gpr_inf_past (sum.clock_type); + } + else + { + sum.tv_sec = a.tv_sec + b.tv_sec; + if (inc != 0 && sum.tv_sec == TYPE_MAX (time_t) - 1) + { + sum = gpr_inf_future (sum.clock_type); + } + else + { + sum.tv_sec += inc; + } + } return sum; } -gpr_timespec gpr_time_sub(gpr_timespec a, gpr_timespec b) { +gpr_timespec +gpr_time_sub (gpr_timespec a, gpr_timespec b) +{ gpr_timespec diff; int dec = 0; - if (b.clock_type == GPR_TIMESPAN) { - diff.clock_type = a.clock_type; - } else { - GPR_ASSERT(a.clock_type == b.clock_type); - diff.clock_type = GPR_TIMESPAN; - } + if (b.clock_type == GPR_TIMESPAN) + { + diff.clock_type = a.clock_type; + } + else + { + GPR_ASSERT (a.clock_type == b.clock_type); + diff.clock_type = GPR_TIMESPAN; + } diff.tv_nsec = a.tv_nsec - b.tv_nsec; - if (diff.tv_nsec < 0) { - diff.tv_nsec += GPR_NS_PER_SEC; - dec++; - } - if (a.tv_sec == TYPE_MAX(time_t) || a.tv_sec == TYPE_MIN(time_t)) { - diff = a; - } else if (b.tv_sec == TYPE_MIN(time_t) || - (b.tv_sec <= 0 && a.tv_sec >= TYPE_MAX(time_t) + b.tv_sec)) { - diff = gpr_inf_future(GPR_CLOCK_REALTIME); - } else if (b.tv_sec == TYPE_MAX(time_t) || - (b.tv_sec >= 0 && a.tv_sec <= TYPE_MIN(time_t) + b.tv_sec)) { - diff = gpr_inf_past(GPR_CLOCK_REALTIME); - } else { - diff.tv_sec = a.tv_sec - b.tv_sec; - if (dec != 0 && diff.tv_sec == TYPE_MIN(time_t) + 1) { - diff = gpr_inf_past(GPR_CLOCK_REALTIME); - } else { - diff.tv_sec -= dec; - } - } + if (diff.tv_nsec < 0) + { + diff.tv_nsec += GPR_NS_PER_SEC; + dec++; + } + if (a.tv_sec == TYPE_MAX (time_t) || a.tv_sec == TYPE_MIN (time_t)) + { + diff = a; + } + else if (b.tv_sec == TYPE_MIN (time_t) || (b.tv_sec <= 0 && a.tv_sec >= TYPE_MAX (time_t) + b.tv_sec)) + { + diff = gpr_inf_future (GPR_CLOCK_REALTIME); + } + else if (b.tv_sec == TYPE_MAX (time_t) || (b.tv_sec >= 0 && a.tv_sec <= TYPE_MIN (time_t) + b.tv_sec)) + { + diff = gpr_inf_past (GPR_CLOCK_REALTIME); + } + else + { + diff.tv_sec = a.tv_sec - b.tv_sec; + if (dec != 0 && diff.tv_sec == TYPE_MIN (time_t) + 1) + { + diff = gpr_inf_past (GPR_CLOCK_REALTIME); + } + else + { + diff.tv_sec -= dec; + } + } return diff; } -int gpr_time_similar(gpr_timespec a, gpr_timespec b, gpr_timespec threshold) { +int +gpr_time_similar (gpr_timespec a, gpr_timespec b, gpr_timespec threshold) +{ int cmp_ab; - GPR_ASSERT(a.clock_type == b.clock_type); - GPR_ASSERT(threshold.clock_type == GPR_TIMESPAN); + GPR_ASSERT (a.clock_type == b.clock_type); + GPR_ASSERT (threshold.clock_type == GPR_TIMESPAN); - cmp_ab = gpr_time_cmp(a, b); - if (cmp_ab == 0) return 1; - if (cmp_ab < 0) { - return gpr_time_cmp(gpr_time_sub(b, a), threshold) <= 0; - } else { - return gpr_time_cmp(gpr_time_sub(a, b), threshold) <= 0; - } + cmp_ab = gpr_time_cmp (a, b); + if (cmp_ab == 0) + return 1; + if (cmp_ab < 0) + { + return gpr_time_cmp (gpr_time_sub (b, a), threshold) <= 0; + } + else + { + return gpr_time_cmp (gpr_time_sub (a, b), threshold) <= 0; + } } -gpr_int32 gpr_time_to_millis(gpr_timespec t) { - if (t.tv_sec >= 2147483) { - if (t.tv_sec == 2147483 && t.tv_nsec < 648 * GPR_NS_PER_MS) { - return 2147483 * GPR_MS_PER_SEC + t.tv_nsec / GPR_NS_PER_MS; - } - return 2147483647; - } else if (t.tv_sec <= -2147483) { - /* TODO(ctiller): correct handling here (it's so far in the past do we - care?) */ - return -2147483647; - } else { - return (gpr_int32)(t.tv_sec * GPR_MS_PER_SEC + t.tv_nsec / GPR_NS_PER_MS); - } +gpr_int32 +gpr_time_to_millis (gpr_timespec t) +{ + if (t.tv_sec >= 2147483) + { + if (t.tv_sec == 2147483 && t.tv_nsec < 648 * GPR_NS_PER_MS) + { + return 2147483 * GPR_MS_PER_SEC + t.tv_nsec / GPR_NS_PER_MS; + } + return 2147483647; + } + else if (t.tv_sec <= -2147483) + { + /* TODO(ctiller): correct handling here (it's so far in the past do we + care?) */ + return -2147483647; + } + else + { + return (gpr_int32) (t.tv_sec * GPR_MS_PER_SEC + t.tv_nsec / GPR_NS_PER_MS); + } } -double gpr_timespec_to_micros(gpr_timespec t) { - return (double)t.tv_sec * GPR_US_PER_SEC + t.tv_nsec * 1e-3; +double +gpr_timespec_to_micros (gpr_timespec t) +{ + return (double) t.tv_sec * GPR_US_PER_SEC + t.tv_nsec * 1e-3; } -gpr_timespec gpr_convert_clock_type(gpr_timespec t, gpr_clock_type clock_type) { - if (t.clock_type == clock_type) { - return t; - } - - if (t.tv_nsec == 0) { - if (t.tv_sec == TYPE_MAX(time_t)) { - t.clock_type = clock_type; +gpr_timespec +gpr_convert_clock_type (gpr_timespec t, gpr_clock_type clock_type) +{ + if (t.clock_type == clock_type) + { return t; } - if (t.tv_sec == TYPE_MIN(time_t)) { - t.clock_type = clock_type; - return t; + + if (t.tv_nsec == 0) + { + if (t.tv_sec == TYPE_MAX (time_t)) + { + t.clock_type = clock_type; + return t; + } + if (t.tv_sec == TYPE_MIN (time_t)) + { + t.clock_type = clock_type; + return t; + } } - } - if (clock_type == GPR_TIMESPAN) { - return gpr_time_sub(t, gpr_now(t.clock_type)); - } + if (clock_type == GPR_TIMESPAN) + { + return gpr_time_sub (t, gpr_now (t.clock_type)); + } - if (t.clock_type == GPR_TIMESPAN) { - return gpr_time_add(gpr_now(clock_type), t); - } + if (t.clock_type == GPR_TIMESPAN) + { + return gpr_time_add (gpr_now (clock_type), t); + } - return gpr_time_add(gpr_now(clock_type), - gpr_time_sub(t, gpr_now(t.clock_type))); + return gpr_time_add (gpr_now (clock_type), gpr_time_sub (t, gpr_now (t.clock_type))); } diff --git a/src/core/support/time_posix.c b/src/core/support/time_posix.c index dcecff0d05d..34cbd4b3c88 100644 --- a/src/core/support/time_posix.c +++ b/src/core/support/time_posix.c @@ -42,7 +42,9 @@ #include #include -static struct timespec timespec_from_gpr(gpr_timespec gts) { +static struct timespec +timespec_from_gpr (gpr_timespec gts) +{ struct timespec rv; rv.tv_sec = gts.tv_sec; rv.tv_nsec = gts.tv_nsec; @@ -50,31 +52,40 @@ static struct timespec timespec_from_gpr(gpr_timespec gts) { } #if _POSIX_TIMERS > 0 -static gpr_timespec gpr_from_timespec(struct timespec ts, - gpr_clock_type clock) { +static gpr_timespec +gpr_from_timespec (struct timespec ts, gpr_clock_type clock) +{ gpr_timespec rv; rv.tv_sec = ts.tv_sec; - rv.tv_nsec = (int)ts.tv_nsec; + rv.tv_nsec = (int) ts.tv_nsec; rv.clock_type = clock; return rv; } /** maps gpr_clock_type --> clockid_t for clock_gettime */ -static clockid_t clockid_for_gpr_clock[] = {CLOCK_MONOTONIC, CLOCK_REALTIME}; +static clockid_t clockid_for_gpr_clock[] = { CLOCK_MONOTONIC, CLOCK_REALTIME }; -void gpr_time_init(void) {} +void +gpr_time_init (void) +{ +} -gpr_timespec gpr_now(gpr_clock_type clock) { +gpr_timespec +gpr_now (gpr_clock_type clock) +{ struct timespec now; - GPR_ASSERT(clock != GPR_TIMESPAN); - if (clock == GPR_CLOCK_PRECISE) { - gpr_timespec ret; - gpr_precise_clock_now(&ret); - return ret; - } else { - clock_gettime(clockid_for_gpr_clock[clock], &now); - return gpr_from_timespec(now, clock); - } + GPR_ASSERT (clock != GPR_TIMESPAN); + if (clock == GPR_CLOCK_PRECISE) + { + gpr_timespec ret; + gpr_precise_clock_now (&ret); + return ret; + } + else + { + clock_gettime (clockid_for_gpr_clock[clock], &now); + return gpr_from_timespec (now, clock); + } } #else /* For some reason Apple's OSes haven't implemented clock_gettime. */ @@ -86,61 +97,71 @@ gpr_timespec gpr_now(gpr_clock_type clock) { static double g_time_scale; static uint64_t g_time_start; -void gpr_time_init(void) { - mach_timebase_info_data_t tb = {0, 1}; - mach_timebase_info(&tb); +void +gpr_time_init (void) +{ + mach_timebase_info_data_t tb = { 0, 1 }; + mach_timebase_info (&tb); g_time_scale = tb.numer; g_time_scale /= tb.denom; - g_time_start = mach_absolute_time(); + g_time_start = mach_absolute_time (); } -gpr_timespec gpr_now(gpr_clock_type clock) { +gpr_timespec +gpr_now (gpr_clock_type clock) +{ gpr_timespec now; struct timeval now_tv; double now_dbl; now.clock_type = clock; - switch (clock) { + switch (clock) + { case GPR_CLOCK_REALTIME: - gettimeofday(&now_tv, NULL); + gettimeofday (&now_tv, NULL); now.tv_sec = now_tv.tv_sec; now.tv_nsec = now_tv.tv_usec * 1000; break; case GPR_CLOCK_MONOTONIC: - now_dbl = (mach_absolute_time() - g_time_start) * g_time_scale; - now.tv_sec = (time_t)(now_dbl * 1e-9); - now.tv_nsec = (int)(now_dbl - ((double)now.tv_sec) * 1e9); + now_dbl = (mach_absolute_time () - g_time_start) * g_time_scale; + now.tv_sec = (time_t) (now_dbl * 1e-9); + now.tv_nsec = (int) (now_dbl - ((double) now.tv_sec) * 1e9); break; case GPR_CLOCK_PRECISE: - gpr_precise_clock_now(&now); + gpr_precise_clock_now (&now); break; case GPR_TIMESPAN: - abort(); - } + abort (); + } return now; } #endif -void gpr_sleep_until(gpr_timespec until) { +void +gpr_sleep_until (gpr_timespec until) +{ gpr_timespec now; gpr_timespec delta; struct timespec delta_ts; - for (;;) { - /* We could simplify by using clock_nanosleep instead, but it might be - * slightly less portable. */ - now = gpr_now(until.clock_type); - if (gpr_time_cmp(until, now) <= 0) { - return; - } - - delta = gpr_time_sub(until, now); - delta_ts = timespec_from_gpr(delta); - if (nanosleep(&delta_ts, NULL) == 0) { - break; + for (;;) + { + /* We could simplify by using clock_nanosleep instead, but it might be + * slightly less portable. */ + now = gpr_now (until.clock_type); + if (gpr_time_cmp (until, now) <= 0) + { + return; + } + + delta = gpr_time_sub (until, now); + delta_ts = timespec_from_gpr (delta); + if (nanosleep (&delta_ts, NULL) == 0) + { + break; + } } - } } #endif /* GPR_POSIX_TIME */ diff --git a/src/core/support/time_precise.h b/src/core/support/time_precise.h index cd201faab95..81b3049b729 100644 --- a/src/core/support/time_precise.h +++ b/src/core/support/time_precise.h @@ -40,52 +40,64 @@ #ifdef GRPC_TIMERS_RDTSC #if defined(__i386__) -static void gpr_get_cycle_counter(long long int *clk) { +static void +gpr_get_cycle_counter (long long int *clk) +{ long long int ret; - __asm__ volatile("rdtsc" : "=A"(ret)); + __asm__ volatile ("rdtsc":"=A" (ret)); *clk = ret; } // ---------------------------------------------------------------- #elif defined(__x86_64__) || defined(__amd64__) -static void gpr_get_cycle_counter(long long int *clk) { +static void +gpr_get_cycle_counter (long long int *clk) +{ unsigned long long low, high; - __asm__ volatile("rdtsc" : "=a"(low), "=d"(high)); + __asm__ volatile ("rdtsc":"=a" (low), "=d" (high)); *clk = (high << 32) | low; } #endif static gpr_once precise_clock_init = GPR_ONCE_INIT; static long long cycles_per_second = 0; -static void gpr_precise_clock_init() { - time_t start = time(NULL); +static void +gpr_precise_clock_init () +{ + time_t start = time (NULL); gpr_precise_clock start_cycle; gpr_precise_clock end_cycle; - while (time(NULL) == start) + while (time (NULL) == start) ; - gpr_get_cycle_counter(&start_cycle); - while (time(NULL) == start + 1) + gpr_get_cycle_counter (&start_cycle); + while (time (NULL) == start + 1) ; - gpr_get_cycle_counter(&end_cycle); + gpr_get_cycle_counter (&end_cycle); cycles_per_second = end_cycle - start_cycle; } -static double grpc_precise_clock_scaling_factor() { - gpr_once_init(&precise_clock_init, grpc_precise_clock_init); +static double +grpc_precise_clock_scaling_factor () +{ + gpr_once_init (&precise_clock_init, grpc_precise_clock_init); return 1e6 / cycles_per_second; } -static void gpr_precise_clock_now(gpr_timespec *clk) { +static void +gpr_precise_clock_now (gpr_timespec * clk) +{ long long int counter; - gpr_get_cycle_counter(&counter); + gpr_get_cycle_counter (&counter); clk->clock = GPR_CLOCK_REALTIME; clk->tv_sec = counter / cycles_per_second; clk->tv_nsec = counter % cycles_per_second; } -#else /* GRPC_TIMERS_RDTSC */ -static void gpr_precise_clock_now(gpr_timespec *clk) { - *clk = gpr_now(GPR_CLOCK_REALTIME); +#else /* GRPC_TIMERS_RDTSC */ +static void +gpr_precise_clock_now (gpr_timespec * clk) +{ + *clk = gpr_now (GPR_CLOCK_REALTIME); clk->clock_type = GPR_CLOCK_PRECISE; } #endif /* GRPC_TIMERS_RDTSC */ diff --git a/src/core/support/time_win32.c b/src/core/support/time_win32.c index f794855429b..5af49fe5cda 100644 --- a/src/core/support/time_win32.c +++ b/src/core/support/time_win32.c @@ -44,56 +44,64 @@ static LARGE_INTEGER g_start_time; static double g_time_scale; -void gpr_time_init(void) { +void +gpr_time_init (void) +{ LARGE_INTEGER frequency; - QueryPerformanceFrequency(&frequency); - QueryPerformanceCounter(&g_start_time); + QueryPerformanceFrequency (&frequency); + QueryPerformanceCounter (&g_start_time); g_time_scale = 1.0 / frequency.QuadPart; } -gpr_timespec gpr_now(gpr_clock_type clock) { +gpr_timespec +gpr_now (gpr_clock_type clock) +{ gpr_timespec now_tv; struct _timeb now_tb; LARGE_INTEGER timestamp; double now_dbl; now_tv.clock_type = clock; - switch (clock) { + switch (clock) + { case GPR_CLOCK_REALTIME: - _ftime_s(&now_tb); + _ftime_s (&now_tb); now_tv.tv_sec = now_tb.time; now_tv.tv_nsec = now_tb.millitm * 1000000; break; case GPR_CLOCK_MONOTONIC: - QueryPerformanceCounter(×tamp); + QueryPerformanceCounter (×tamp); now_dbl = (timestamp.QuadPart - g_start_time.QuadPart) * g_time_scale; - now_tv.tv_sec = (time_t)now_dbl; - now_tv.tv_nsec = (int)((now_dbl - (double)now_tv.tv_sec) * 1e9); + now_tv.tv_sec = (time_t) now_dbl; + now_tv.tv_nsec = (int) ((now_dbl - (double) now_tv.tv_sec) * 1e9); break; case GPR_CLOCK_PRECISE: - gpr_precise_clock_now(&now_tv); + gpr_precise_clock_now (&now_tv); break; - } + } return now_tv; } -void gpr_sleep_until(gpr_timespec until) { +void +gpr_sleep_until (gpr_timespec until) +{ gpr_timespec now; gpr_timespec delta; DWORD sleep_millis; - for (;;) { - /* We could simplify by using clock_nanosleep instead, but it might be - * slightly less portable. */ - now = gpr_now(until.clock_type); - if (gpr_time_cmp(until, now) <= 0) { - return; - } + for (;;) + { + /* We could simplify by using clock_nanosleep instead, but it might be + * slightly less portable. */ + now = gpr_now (until.clock_type); + if (gpr_time_cmp (until, now) <= 0) + { + return; + } - delta = gpr_time_sub(until, now); - sleep_millis = - (DWORD)delta.tv_sec * GPR_MS_PER_SEC + delta.tv_nsec / GPR_NS_PER_MS; - Sleep(sleep_millis); - } + delta = gpr_time_sub (until, now); + sleep_millis = (DWORD) delta.tv_sec * GPR_MS_PER_SEC + delta.tv_nsec / GPR_NS_PER_MS; + Sleep (sleep_millis); + } } #endif /* GPR_WIN32 */ diff --git a/src/core/support/tls_pthread.c b/src/core/support/tls_pthread.c index 2d28226fc47..d24b2bc114f 100644 --- a/src/core/support/tls_pthread.c +++ b/src/core/support/tls_pthread.c @@ -37,8 +37,10 @@ #include -gpr_intptr gpr_tls_set(struct gpr_pthread_thread_local *tls, gpr_intptr value) { - GPR_ASSERT(0 == pthread_setspecific(tls->key, (void *)value)); +gpr_intptr +gpr_tls_set (struct gpr_pthread_thread_local * tls, gpr_intptr value) +{ + GPR_ASSERT (0 == pthread_setspecific (tls->key, (void *) value)); return value; } diff --git a/src/core/surface/byte_buffer.c b/src/core/surface/byte_buffer.c index a930949f2d4..c26e3e13174 100644 --- a/src/core/surface/byte_buffer.c +++ b/src/core/surface/byte_buffer.c @@ -35,66 +35,79 @@ #include #include -grpc_byte_buffer *grpc_raw_byte_buffer_create(gpr_slice *slices, - size_t nslices) { - return grpc_raw_compressed_byte_buffer_create(slices, nslices, - GRPC_COMPRESS_NONE); +grpc_byte_buffer * +grpc_raw_byte_buffer_create (gpr_slice * slices, size_t nslices) +{ + return grpc_raw_compressed_byte_buffer_create (slices, nslices, GRPC_COMPRESS_NONE); } -grpc_byte_buffer *grpc_raw_compressed_byte_buffer_create( - gpr_slice *slices, size_t nslices, grpc_compression_algorithm compression) { +grpc_byte_buffer * +grpc_raw_compressed_byte_buffer_create (gpr_slice * slices, size_t nslices, grpc_compression_algorithm compression) +{ size_t i; - grpc_byte_buffer *bb = malloc(sizeof(grpc_byte_buffer)); + grpc_byte_buffer *bb = malloc (sizeof (grpc_byte_buffer)); bb->type = GRPC_BB_RAW; bb->data.raw.compression = compression; - gpr_slice_buffer_init(&bb->data.raw.slice_buffer); - for (i = 0; i < nslices; i++) { - gpr_slice_ref(slices[i]); - gpr_slice_buffer_add(&bb->data.raw.slice_buffer, slices[i]); - } + gpr_slice_buffer_init (&bb->data.raw.slice_buffer); + for (i = 0; i < nslices; i++) + { + gpr_slice_ref (slices[i]); + gpr_slice_buffer_add (&bb->data.raw.slice_buffer, slices[i]); + } return bb; } -grpc_byte_buffer *grpc_raw_byte_buffer_from_reader( - grpc_byte_buffer_reader *reader) { - grpc_byte_buffer *bb = malloc(sizeof(grpc_byte_buffer)); +grpc_byte_buffer * +grpc_raw_byte_buffer_from_reader (grpc_byte_buffer_reader * reader) +{ + grpc_byte_buffer *bb = malloc (sizeof (grpc_byte_buffer)); gpr_slice slice; bb->type = GRPC_BB_RAW; bb->data.raw.compression = GRPC_COMPRESS_NONE; - gpr_slice_buffer_init(&bb->data.raw.slice_buffer); + gpr_slice_buffer_init (&bb->data.raw.slice_buffer); - while (grpc_byte_buffer_reader_next(reader, &slice)) { - gpr_slice_buffer_add(&bb->data.raw.slice_buffer, slice); - } + while (grpc_byte_buffer_reader_next (reader, &slice)) + { + gpr_slice_buffer_add (&bb->data.raw.slice_buffer, slice); + } return bb; } -grpc_byte_buffer *grpc_byte_buffer_copy(grpc_byte_buffer *bb) { - switch (bb->type) { +grpc_byte_buffer * +grpc_byte_buffer_copy (grpc_byte_buffer * bb) +{ + switch (bb->type) + { case GRPC_BB_RAW: - return grpc_raw_byte_buffer_create(bb->data.raw.slice_buffer.slices, - bb->data.raw.slice_buffer.count); - } - gpr_log(GPR_INFO, "should never get here"); - abort(); + return grpc_raw_byte_buffer_create (bb->data.raw.slice_buffer.slices, bb->data.raw.slice_buffer.count); + } + gpr_log (GPR_INFO, "should never get here"); + abort (); return NULL; } -void grpc_byte_buffer_destroy(grpc_byte_buffer *bb) { - if (!bb) return; - switch (bb->type) { +void +grpc_byte_buffer_destroy (grpc_byte_buffer * bb) +{ + if (!bb) + return; + switch (bb->type) + { case GRPC_BB_RAW: - gpr_slice_buffer_destroy(&bb->data.raw.slice_buffer); + gpr_slice_buffer_destroy (&bb->data.raw.slice_buffer); break; - } - free(bb); + } + free (bb); } -size_t grpc_byte_buffer_length(grpc_byte_buffer *bb) { - switch (bb->type) { +size_t +grpc_byte_buffer_length (grpc_byte_buffer * bb) +{ + switch (bb->type) + { case GRPC_BB_RAW: return bb->data.raw.slice_buffer.length; - } - gpr_log(GPR_ERROR, "should never reach here"); - abort(); + } + gpr_log (GPR_ERROR, "should never reach here"); + abort (); } diff --git a/src/core/surface/byte_buffer_queue.c b/src/core/surface/byte_buffer_queue.c index e47dc4f4ce6..543da6a0006 100644 --- a/src/core/surface/byte_buffer_queue.c +++ b/src/core/surface/byte_buffer_queue.c @@ -35,63 +35,86 @@ #include #include -static void bba_destroy(grpc_bbq_array *array, size_t start_pos) { +static void +bba_destroy (grpc_bbq_array * array, size_t start_pos) +{ size_t i; - for (i = start_pos; i < array->count; i++) { - grpc_byte_buffer_destroy(array->data[i]); - } - gpr_free(array->data); + for (i = start_pos; i < array->count; i++) + { + grpc_byte_buffer_destroy (array->data[i]); + } + gpr_free (array->data); } /* Append an operation to an array, expanding as needed */ -static void bba_push(grpc_bbq_array *a, grpc_byte_buffer *buffer) { - if (a->count == a->capacity) { - a->capacity = GPR_MAX(a->capacity * 2, 8); - a->data = gpr_realloc(a->data, sizeof(grpc_byte_buffer *) * a->capacity); - } +static void +bba_push (grpc_bbq_array * a, grpc_byte_buffer * buffer) +{ + if (a->count == a->capacity) + { + a->capacity = GPR_MAX (a->capacity * 2, 8); + a->data = gpr_realloc (a->data, sizeof (grpc_byte_buffer *) * a->capacity); + } a->data[a->count++] = buffer; } -void grpc_bbq_destroy(grpc_byte_buffer_queue *q) { - bba_destroy(&q->filling, 0); - bba_destroy(&q->draining, q->drain_pos); +void +grpc_bbq_destroy (grpc_byte_buffer_queue * q) +{ + bba_destroy (&q->filling, 0); + bba_destroy (&q->draining, q->drain_pos); } -int grpc_bbq_empty(grpc_byte_buffer_queue *q) { +int +grpc_bbq_empty (grpc_byte_buffer_queue * q) +{ return (q->drain_pos == q->draining.count && q->filling.count == 0); } -void grpc_bbq_push(grpc_byte_buffer_queue *q, grpc_byte_buffer *buffer) { - q->bytes += grpc_byte_buffer_length(buffer); - bba_push(&q->filling, buffer); +void +grpc_bbq_push (grpc_byte_buffer_queue * q, grpc_byte_buffer * buffer) +{ + q->bytes += grpc_byte_buffer_length (buffer); + bba_push (&q->filling, buffer); } -void grpc_bbq_flush(grpc_byte_buffer_queue *q) { +void +grpc_bbq_flush (grpc_byte_buffer_queue * q) +{ grpc_byte_buffer *bb; - while ((bb = grpc_bbq_pop(q))) { - grpc_byte_buffer_destroy(bb); - } + while ((bb = grpc_bbq_pop (q))) + { + grpc_byte_buffer_destroy (bb); + } } -size_t grpc_bbq_bytes(grpc_byte_buffer_queue *q) { return q->bytes; } +size_t +grpc_bbq_bytes (grpc_byte_buffer_queue * q) +{ + return q->bytes; +} -grpc_byte_buffer *grpc_bbq_pop(grpc_byte_buffer_queue *q) { +grpc_byte_buffer * +grpc_bbq_pop (grpc_byte_buffer_queue * q) +{ grpc_bbq_array temp_array; grpc_byte_buffer *out; - if (q->drain_pos == q->draining.count) { - if (q->filling.count == 0) { - return NULL; + if (q->drain_pos == q->draining.count) + { + if (q->filling.count == 0) + { + return NULL; + } + q->draining.count = 0; + q->drain_pos = 0; + /* swap arrays */ + temp_array = q->filling; + q->filling = q->draining; + q->draining = temp_array; } - q->draining.count = 0; - q->drain_pos = 0; - /* swap arrays */ - temp_array = q->filling; - q->filling = q->draining; - q->draining = temp_array; - } out = q->draining.data[q->drain_pos++]; - q->bytes -= grpc_byte_buffer_length(out); + q->bytes -= grpc_byte_buffer_length (out); return out; } diff --git a/src/core/surface/byte_buffer_queue.h b/src/core/surface/byte_buffer_queue.h index 2c3b22d24e9..3e344c1e54c 100644 --- a/src/core/surface/byte_buffer_queue.h +++ b/src/core/surface/byte_buffer_queue.h @@ -38,25 +38,27 @@ /* TODO(ctiller): inline an element or two into this struct to avoid per-call allocations */ -typedef struct { +typedef struct +{ grpc_byte_buffer **data; size_t count; size_t capacity; } grpc_bbq_array; /* should be initialized by zeroing memory */ -typedef struct { +typedef struct +{ size_t drain_pos; grpc_bbq_array filling; grpc_bbq_array draining; size_t bytes; } grpc_byte_buffer_queue; -void grpc_bbq_destroy(grpc_byte_buffer_queue *q); -grpc_byte_buffer *grpc_bbq_pop(grpc_byte_buffer_queue *q); -void grpc_bbq_flush(grpc_byte_buffer_queue *q); -int grpc_bbq_empty(grpc_byte_buffer_queue *q); -void grpc_bbq_push(grpc_byte_buffer_queue *q, grpc_byte_buffer *bb); -size_t grpc_bbq_bytes(grpc_byte_buffer_queue *q); +void grpc_bbq_destroy (grpc_byte_buffer_queue * q); +grpc_byte_buffer *grpc_bbq_pop (grpc_byte_buffer_queue * q); +void grpc_bbq_flush (grpc_byte_buffer_queue * q); +int grpc_bbq_empty (grpc_byte_buffer_queue * q); +void grpc_bbq_push (grpc_byte_buffer_queue * q, grpc_byte_buffer * bb); +size_t grpc_bbq_bytes (grpc_byte_buffer_queue * q); #endif /* GRPC_INTERNAL_CORE_SURFACE_BYTE_BUFFER_QUEUE_H */ diff --git a/src/core/surface/byte_buffer_reader.c b/src/core/surface/byte_buffer_reader.c index 283db83833d..c4c9e43d7e8 100644 --- a/src/core/surface/byte_buffer_reader.c +++ b/src/core/surface/byte_buffer_reader.c @@ -42,64 +42,77 @@ #include "src/core/compression/message_compress.h" -static int is_compressed(grpc_byte_buffer *buffer) { - switch (buffer->type) { +static int +is_compressed (grpc_byte_buffer * buffer) +{ + switch (buffer->type) + { case GRPC_BB_RAW: - if (buffer->data.raw.compression == GRPC_COMPRESS_NONE) { - return 0 /* GPR_FALSE */; - } + if (buffer->data.raw.compression == GRPC_COMPRESS_NONE) + { + return 0 /* GPR_FALSE */ ; + } break; - } - return 1 /* GPR_TRUE */; + } + return 1 /* GPR_TRUE */ ; } -void grpc_byte_buffer_reader_init(grpc_byte_buffer_reader *reader, - grpc_byte_buffer *buffer) { +void +grpc_byte_buffer_reader_init (grpc_byte_buffer_reader * reader, grpc_byte_buffer * buffer) +{ gpr_slice_buffer decompressed_slices_buffer; reader->buffer_in = buffer; - switch (reader->buffer_in->type) { + switch (reader->buffer_in->type) + { case GRPC_BB_RAW: - gpr_slice_buffer_init(&decompressed_slices_buffer); - if (is_compressed(reader->buffer_in)) { - grpc_msg_decompress(reader->buffer_in->data.raw.compression, - &reader->buffer_in->data.raw.slice_buffer, - &decompressed_slices_buffer); - reader->buffer_out = - grpc_raw_byte_buffer_create(decompressed_slices_buffer.slices, - decompressed_slices_buffer.count); - gpr_slice_buffer_destroy(&decompressed_slices_buffer); - } else { /* not compressed, use the input buffer as output */ - reader->buffer_out = reader->buffer_in; - } + gpr_slice_buffer_init (&decompressed_slices_buffer); + if (is_compressed (reader->buffer_in)) + { + grpc_msg_decompress (reader->buffer_in->data.raw.compression, &reader->buffer_in->data.raw.slice_buffer, &decompressed_slices_buffer); + reader->buffer_out = grpc_raw_byte_buffer_create (decompressed_slices_buffer.slices, decompressed_slices_buffer.count); + gpr_slice_buffer_destroy (&decompressed_slices_buffer); + } + else + { /* not compressed, use the input buffer as output */ + reader->buffer_out = reader->buffer_in; + } reader->current.index = 0; break; - } + } } -void grpc_byte_buffer_reader_destroy(grpc_byte_buffer_reader *reader) { - switch (reader->buffer_in->type) { +void +grpc_byte_buffer_reader_destroy (grpc_byte_buffer_reader * reader) +{ + switch (reader->buffer_in->type) + { case GRPC_BB_RAW: /* keeping the same if-else structure as in the init function */ - if (is_compressed(reader->buffer_in)) { - grpc_byte_buffer_destroy(reader->buffer_out); - } + if (is_compressed (reader->buffer_in)) + { + grpc_byte_buffer_destroy (reader->buffer_out); + } break; - } + } } -int grpc_byte_buffer_reader_next(grpc_byte_buffer_reader *reader, - gpr_slice *slice) { - switch (reader->buffer_in->type) { - case GRPC_BB_RAW: { - gpr_slice_buffer *slice_buffer; - slice_buffer = &reader->buffer_out->data.raw.slice_buffer; - if (reader->current.index < slice_buffer->count) { - *slice = gpr_slice_ref(slice_buffer->slices[reader->current.index]); - reader->current.index += 1; - return 1; +int +grpc_byte_buffer_reader_next (grpc_byte_buffer_reader * reader, gpr_slice * slice) +{ + switch (reader->buffer_in->type) + { + case GRPC_BB_RAW: + { + gpr_slice_buffer *slice_buffer; + slice_buffer = &reader->buffer_out->data.raw.slice_buffer; + if (reader->current.index < slice_buffer->count) + { + *slice = gpr_slice_ref (slice_buffer->slices[reader->current.index]); + reader->current.index += 1; + return 1; + } + break; } - break; } - } return 0; } diff --git a/src/core/surface/call.c b/src/core/surface/call.c index 1e371a4cbc0..5a76245a655 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -61,7 +61,8 @@ - status/close recv (depending on client/server) */ #define MAX_CONCURRENT_COMPLETIONS 6 -typedef struct { +typedef struct +{ grpc_ioreq_completion_func on_complete; void *user_data; int success; @@ -73,7 +74,8 @@ typedef struct { #define MAX_SEND_INITIAL_METADATA_COUNT 3 -typedef struct { +typedef struct +{ /* Overall status of the operation: starts OK, may degrade to non-OK */ gpr_uint8 success; @@ -90,7 +92,8 @@ typedef struct { enumerates them all, and acts as a priority sorting for which status to return to the application - earlier entries override later ones */ -typedef enum { +typedef enum +{ /* Status came from the application layer overriding whatever the wire says */ STATUS_FROM_API_OVERRIDE = 0, @@ -104,14 +107,16 @@ typedef enum { STATUS_SOURCE_COUNT } status_source; -typedef struct { +typedef struct +{ gpr_uint8 is_set; grpc_status_code code; grpc_mdstr *details; } received_status; /* How far through the GRPC stream have we read? */ -typedef enum { +typedef enum +{ /* We are still waiting for initial metadata to complete */ READ_STATE_INITIAL = 0, /* We have gotten initial metadata, and are reading either @@ -123,13 +128,15 @@ typedef enum { READ_STATE_STREAM_CLOSED } read_state; -typedef enum { +typedef enum +{ WRITE_STATE_INITIAL = 0, WRITE_STATE_STARTED, WRITE_STATE_WRITE_CLOSED } write_state; -struct grpc_call { +struct grpc_call +{ grpc_completion_queue *cq; grpc_channel *channel; grpc_call *parent; @@ -180,15 +187,15 @@ struct grpc_call { request_set[op] is an integer specifying a set of operations to which the request belongs: - - if it is < GRPC_IOREQ_OP_COUNT, then this operation is pending - completion, and the integer represents to which group of operations - the ioreq belongs. Each group is represented by one master, and the - integer in request_set is an index into masters to find the master - data. - - if it is REQSET_EMPTY, the ioreq op is inactive and available to be - started - - finally, if request_set[op] is REQSET_DONE, then the operation is - complete and unavailable to be started again + - if it is < GRPC_IOREQ_OP_COUNT, then this operation is pending + completion, and the integer represents to which group of operations + the ioreq belongs. Each group is represented by one master, and the + integer in request_set is an index into masters to find the master + data. + - if it is REQSET_EMPTY, the ioreq op is inactive and available to be + started + - finally, if request_set[op] is REQSET_DONE, then the operation is + complete and unavailable to be started again request_data[op] is the request data as supplied by the initiator of a request, and is valid iff request_set[op] <= GRPC_IOREQ_OP_COUNT. @@ -276,331 +283,363 @@ struct grpc_call { #define CALL_FROM_TOP_ELEM(top_elem) \ CALL_FROM_CALL_STACK(grpc_call_stack_from_top_element(top_elem)) -static void set_deadline_alarm(grpc_call *call, gpr_timespec deadline, - grpc_closure_list *closure_list); -static void call_on_done_recv(void *call, int success, - grpc_closure_list *closure_list); -static void call_on_done_send(void *call, int success, - grpc_closure_list *closure_list); -static int fill_send_ops(grpc_call *call, grpc_transport_stream_op *op); -static void execute_op(grpc_call *call, grpc_transport_stream_op *op, - grpc_closure_list *closure_list); -static void recv_metadata(grpc_call *call, grpc_metadata_batch *metadata, - grpc_closure_list *closure_list); -static void finish_read_ops(grpc_call *call); -static grpc_call_error cancel_with_status(grpc_call *c, grpc_status_code status, - const char *description); -static void finished_loose_op(void *call, int success, - grpc_closure_list *closure_list); - -static void lock(grpc_call *call); -static void unlock(grpc_call *call, grpc_closure_list *closure_list); - -grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, - gpr_uint32 propagation_mask, - grpc_completion_queue *cq, - const void *server_transport_data, - grpc_mdelem **add_initial_metadata, - size_t add_initial_metadata_count, - gpr_timespec send_deadline) { +static void set_deadline_alarm (grpc_call * call, gpr_timespec deadline, grpc_closure_list * closure_list); +static void call_on_done_recv (void *call, int success, grpc_closure_list * closure_list); +static void call_on_done_send (void *call, int success, grpc_closure_list * closure_list); +static int fill_send_ops (grpc_call * call, grpc_transport_stream_op * op); +static void execute_op (grpc_call * call, grpc_transport_stream_op * op, grpc_closure_list * closure_list); +static void recv_metadata (grpc_call * call, grpc_metadata_batch * metadata, grpc_closure_list * closure_list); +static void finish_read_ops (grpc_call * call); +static grpc_call_error cancel_with_status (grpc_call * c, grpc_status_code status, const char *description); +static void finished_loose_op (void *call, int success, grpc_closure_list * closure_list); + +static void lock (grpc_call * call); +static void unlock (grpc_call * call, grpc_closure_list * closure_list); + +grpc_call * +grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 propagation_mask, grpc_completion_queue * cq, const void *server_transport_data, grpc_mdelem ** add_initial_metadata, size_t add_initial_metadata_count, gpr_timespec send_deadline) +{ size_t i; grpc_transport_stream_op initial_op; grpc_transport_stream_op *initial_op_ptr = NULL; - grpc_channel_stack *channel_stack = grpc_channel_get_channel_stack(channel); + grpc_channel_stack *channel_stack = grpc_channel_get_channel_stack (channel); grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_call *call = - gpr_malloc(sizeof(grpc_call) + channel_stack->call_stack_size); - memset(call, 0, sizeof(grpc_call)); - gpr_mu_init(&call->mu); - gpr_mu_init(&call->completion_mu); + grpc_call *call = gpr_malloc (sizeof (grpc_call) + channel_stack->call_stack_size); + memset (call, 0, sizeof (grpc_call)); + gpr_mu_init (&call->mu); + gpr_mu_init (&call->completion_mu); call->channel = channel; call->cq = cq; - if (cq != NULL) { - GRPC_CQ_INTERNAL_REF(cq, "bind"); - } + if (cq != NULL) + { + GRPC_CQ_INTERNAL_REF (cq, "bind"); + } call->parent = parent_call; call->is_client = server_transport_data == NULL; - for (i = 0; i < GRPC_IOREQ_OP_COUNT; i++) { - call->request_set[i] = REQSET_EMPTY; - } - if (call->is_client) { - call->request_set[GRPC_IOREQ_SEND_TRAILING_METADATA] = REQSET_DONE; - call->request_set[GRPC_IOREQ_SEND_STATUS] = REQSET_DONE; - } - GPR_ASSERT(add_initial_metadata_count < MAX_SEND_INITIAL_METADATA_COUNT); - for (i = 0; i < add_initial_metadata_count; i++) { - call->send_initial_metadata[i].md = add_initial_metadata[i]; - } + for (i = 0; i < GRPC_IOREQ_OP_COUNT; i++) + { + call->request_set[i] = REQSET_EMPTY; + } + if (call->is_client) + { + call->request_set[GRPC_IOREQ_SEND_TRAILING_METADATA] = REQSET_DONE; + call->request_set[GRPC_IOREQ_SEND_STATUS] = REQSET_DONE; + } + GPR_ASSERT (add_initial_metadata_count < MAX_SEND_INITIAL_METADATA_COUNT); + for (i = 0; i < add_initial_metadata_count; i++) + { + call->send_initial_metadata[i].md = add_initial_metadata[i]; + } call->send_initial_metadata_count = add_initial_metadata_count; call->send_deadline = send_deadline; - GRPC_CHANNEL_INTERNAL_REF(channel, "call"); - call->metadata_context = grpc_channel_get_metadata_context(channel); - grpc_sopb_init(&call->send_ops); - grpc_sopb_init(&call->recv_ops); - gpr_slice_buffer_init(&call->incoming_message); - grpc_closure_init(&call->on_done_recv, call_on_done_recv, call); - grpc_closure_init(&call->on_done_send, call_on_done_send, call); - grpc_closure_init(&call->on_done_bind, finished_loose_op, call); + GRPC_CHANNEL_INTERNAL_REF (channel, "call"); + call->metadata_context = grpc_channel_get_metadata_context (channel); + grpc_sopb_init (&call->send_ops); + grpc_sopb_init (&call->recv_ops); + gpr_slice_buffer_init (&call->incoming_message); + grpc_closure_init (&call->on_done_recv, call_on_done_recv, call); + grpc_closure_init (&call->on_done_send, call_on_done_send, call); + grpc_closure_init (&call->on_done_bind, finished_loose_op, call); /* dropped in destroy and when READ_STATE_STREAM_CLOSED received */ - gpr_ref_init(&call->internal_refcount, 2); + gpr_ref_init (&call->internal_refcount, 2); /* server hack: start reads immediately so we can get initial metadata. TODO(ctiller): figure out a cleaner solution */ - if (!call->is_client) { - memset(&initial_op, 0, sizeof(initial_op)); - initial_op.recv_ops = &call->recv_ops; - initial_op.recv_state = &call->recv_state; - initial_op.on_done_recv = &call->on_done_recv; - initial_op.context = call->context; - call->receiving = 1; - GRPC_CALL_INTERNAL_REF(call, "receiving"); - initial_op_ptr = &initial_op; - } - grpc_call_stack_init(channel_stack, server_transport_data, initial_op_ptr, - CALL_STACK_FROM_CALL(call), &closure_list); - if (parent_call != NULL) { - GRPC_CALL_INTERNAL_REF(parent_call, "child"); - GPR_ASSERT(call->is_client); - GPR_ASSERT(!parent_call->is_client); - - gpr_mu_lock(&parent_call->mu); - - if (propagation_mask & GRPC_PROPAGATE_DEADLINE) { - send_deadline = gpr_time_min( - gpr_convert_clock_type(send_deadline, - parent_call->send_deadline.clock_type), - parent_call->send_deadline); - } - /* for now GRPC_PROPAGATE_TRACING_CONTEXT *MUST* be passed with - * GRPC_PROPAGATE_STATS_CONTEXT */ - /* TODO(ctiller): This should change to use the appropriate census start_op - * call. */ - if (propagation_mask & GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT) { - GPR_ASSERT(propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT); - grpc_call_context_set(call, GRPC_CONTEXT_TRACING, - parent_call->context[GRPC_CONTEXT_TRACING].value, - NULL); - } else { - GPR_ASSERT(propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT); - } - if (propagation_mask & GRPC_PROPAGATE_CANCELLATION) { - call->cancellation_is_inherited = 1; - } - - if (parent_call->first_child == NULL) { - parent_call->first_child = call; - call->sibling_next = call->sibling_prev = call; - } else { - call->sibling_next = parent_call->first_child; - call->sibling_prev = parent_call->first_child->sibling_prev; - call->sibling_next->sibling_prev = call->sibling_prev->sibling_next = - call; - } - - gpr_mu_unlock(&parent_call->mu); - } - if (gpr_time_cmp(send_deadline, gpr_inf_future(send_deadline.clock_type)) != - 0) { - set_deadline_alarm(call, send_deadline, &closure_list); - } - grpc_closure_list_run(&closure_list); + if (!call->is_client) + { + memset (&initial_op, 0, sizeof (initial_op)); + initial_op.recv_ops = &call->recv_ops; + initial_op.recv_state = &call->recv_state; + initial_op.on_done_recv = &call->on_done_recv; + initial_op.context = call->context; + call->receiving = 1; + GRPC_CALL_INTERNAL_REF (call, "receiving"); + initial_op_ptr = &initial_op; + } + grpc_call_stack_init (channel_stack, server_transport_data, initial_op_ptr, CALL_STACK_FROM_CALL (call), &closure_list); + if (parent_call != NULL) + { + GRPC_CALL_INTERNAL_REF (parent_call, "child"); + GPR_ASSERT (call->is_client); + GPR_ASSERT (!parent_call->is_client); + + gpr_mu_lock (&parent_call->mu); + + if (propagation_mask & GRPC_PROPAGATE_DEADLINE) + { + send_deadline = gpr_time_min (gpr_convert_clock_type (send_deadline, parent_call->send_deadline.clock_type), parent_call->send_deadline); + } + /* for now GRPC_PROPAGATE_TRACING_CONTEXT *MUST* be passed with + * GRPC_PROPAGATE_STATS_CONTEXT */ + /* TODO(ctiller): This should change to use the appropriate census start_op + * call. */ + if (propagation_mask & GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT) + { + GPR_ASSERT (propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT); + grpc_call_context_set (call, GRPC_CONTEXT_TRACING, parent_call->context[GRPC_CONTEXT_TRACING].value, NULL); + } + else + { + GPR_ASSERT (propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT); + } + if (propagation_mask & GRPC_PROPAGATE_CANCELLATION) + { + call->cancellation_is_inherited = 1; + } + + if (parent_call->first_child == NULL) + { + parent_call->first_child = call; + call->sibling_next = call->sibling_prev = call; + } + else + { + call->sibling_next = parent_call->first_child; + call->sibling_prev = parent_call->first_child->sibling_prev; + call->sibling_next->sibling_prev = call->sibling_prev->sibling_next = call; + } + + gpr_mu_unlock (&parent_call->mu); + } + if (gpr_time_cmp (send_deadline, gpr_inf_future (send_deadline.clock_type)) != 0) + { + set_deadline_alarm (call, send_deadline, &closure_list); + } + grpc_closure_list_run (&closure_list); return call; } -void grpc_call_set_completion_queue(grpc_call *call, grpc_completion_queue *cq, - grpc_closure_list *closure_list) { - lock(call); +void +grpc_call_set_completion_queue (grpc_call * call, grpc_completion_queue * cq, grpc_closure_list * closure_list) +{ + lock (call); call->cq = cq; - if (cq) { - GRPC_CQ_INTERNAL_REF(cq, "bind"); - } - unlock(call, closure_list); + if (cq) + { + GRPC_CQ_INTERNAL_REF (cq, "bind"); + } + unlock (call, closure_list); } -grpc_completion_queue *grpc_call_get_completion_queue(grpc_call *call) { +grpc_completion_queue * +grpc_call_get_completion_queue (grpc_call * call) +{ return call->cq; } -static grpc_cq_completion *allocate_completion(grpc_call *call) { +static grpc_cq_completion * +allocate_completion (grpc_call * call) +{ gpr_uint8 i; - gpr_mu_lock(&call->completion_mu); - for (i = 0; i < GPR_ARRAY_SIZE(call->completions); i++) { - if (call->allocated_completions & (1u << i)) { - continue; - } - call->allocated_completions |= (gpr_uint8)(1u << i); - gpr_mu_unlock(&call->completion_mu); - return &call->completions[i]; - } - gpr_log(GPR_ERROR, "should never reach here"); - abort(); + gpr_mu_lock (&call->completion_mu); + for (i = 0; i < GPR_ARRAY_SIZE (call->completions); i++) + { + if (call->allocated_completions & (1u << i)) + { + continue; + } + call->allocated_completions |= (gpr_uint8) (1u << i); + gpr_mu_unlock (&call->completion_mu); + return &call->completions[i]; + } + gpr_log (GPR_ERROR, "should never reach here"); + abort (); } -static void done_completion(void *call, grpc_cq_completion *completion, - grpc_closure_list *closure_list) { +static void +done_completion (void *call, grpc_cq_completion * completion, grpc_closure_list * closure_list) +{ grpc_call *c = call; - gpr_mu_lock(&c->completion_mu); - c->allocated_completions &= - (gpr_uint8) ~(1u << (completion - c->completions)); - gpr_mu_unlock(&c->completion_mu); - GRPC_CALL_INTERNAL_UNREF(c, "completion", closure_list); + gpr_mu_lock (&c->completion_mu); + c->allocated_completions &= (gpr_uint8) ~ (1u << (completion - c->completions)); + gpr_mu_unlock (&c->completion_mu); + GRPC_CALL_INTERNAL_UNREF (c, "completion", closure_list); } #ifdef GRPC_CALL_REF_COUNT_DEBUG -void grpc_call_internal_ref(grpc_call *c, const char *reason) { - gpr_log(GPR_DEBUG, "CALL: ref %p %d -> %d [%s]", c, - c->internal_refcount.count, c->internal_refcount.count + 1, reason); +void +grpc_call_internal_ref (grpc_call * c, const char *reason) +{ + gpr_log (GPR_DEBUG, "CALL: ref %p %d -> %d [%s]", c, c->internal_refcount.count, c->internal_refcount.count + 1, reason); #else -void grpc_call_internal_ref(grpc_call *c) { +void +grpc_call_internal_ref (grpc_call * c) +{ #endif - gpr_ref(&c->internal_refcount); + gpr_ref (&c->internal_refcount); } -static void destroy_call(grpc_call *call, grpc_closure_list *closure_list) { +static void +destroy_call (grpc_call * call, grpc_closure_list * closure_list) +{ size_t i; grpc_call *c = call; - grpc_call_stack_destroy(CALL_STACK_FROM_CALL(c), closure_list); - GRPC_CHANNEL_INTERNAL_UNREF(c->channel, "call", closure_list); - gpr_mu_destroy(&c->mu); - gpr_mu_destroy(&c->completion_mu); - for (i = 0; i < STATUS_SOURCE_COUNT; i++) { - if (c->status[i].details) { - GRPC_MDSTR_UNREF(c->status[i].details); - } - } - for (i = 0; i < c->owned_metadata_count; i++) { - GRPC_MDELEM_UNREF(c->owned_metadata[i]); - } - gpr_free(c->owned_metadata); - for (i = 0; i < GPR_ARRAY_SIZE(c->buffered_metadata); i++) { - gpr_free(c->buffered_metadata[i].metadata); - } - for (i = 0; i < c->send_initial_metadata_count; i++) { - GRPC_MDELEM_UNREF(c->send_initial_metadata[i].md); - } - for (i = 0; i < GRPC_CONTEXT_COUNT; i++) { - if (c->context[i].destroy) { - c->context[i].destroy(c->context[i].value); - } - } - grpc_sopb_destroy(&c->send_ops); - grpc_sopb_destroy(&c->recv_ops); - grpc_bbq_destroy(&c->incoming_queue); - gpr_slice_buffer_destroy(&c->incoming_message); - if (c->cq) { - GRPC_CQ_INTERNAL_UNREF(c->cq, "bind"); - } - gpr_free(c); + grpc_call_stack_destroy (CALL_STACK_FROM_CALL (c), closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (c->channel, "call", closure_list); + gpr_mu_destroy (&c->mu); + gpr_mu_destroy (&c->completion_mu); + for (i = 0; i < STATUS_SOURCE_COUNT; i++) + { + if (c->status[i].details) + { + GRPC_MDSTR_UNREF (c->status[i].details); + } + } + for (i = 0; i < c->owned_metadata_count; i++) + { + GRPC_MDELEM_UNREF (c->owned_metadata[i]); + } + gpr_free (c->owned_metadata); + for (i = 0; i < GPR_ARRAY_SIZE (c->buffered_metadata); i++) + { + gpr_free (c->buffered_metadata[i].metadata); + } + for (i = 0; i < c->send_initial_metadata_count; i++) + { + GRPC_MDELEM_UNREF (c->send_initial_metadata[i].md); + } + for (i = 0; i < GRPC_CONTEXT_COUNT; i++) + { + if (c->context[i].destroy) + { + c->context[i].destroy (c->context[i].value); + } + } + grpc_sopb_destroy (&c->send_ops); + grpc_sopb_destroy (&c->recv_ops); + grpc_bbq_destroy (&c->incoming_queue); + gpr_slice_buffer_destroy (&c->incoming_message); + if (c->cq) + { + GRPC_CQ_INTERNAL_UNREF (c->cq, "bind"); + } + gpr_free (c); } #ifdef GRPC_CALL_REF_COUNT_DEBUG -void grpc_call_internal_unref(grpc_call *c, const char *reason, - grpc_closure_list *closure_list) { - gpr_log(GPR_DEBUG, "CALL: unref %p %d -> %d [%s]", c, - c->internal_refcount.count, c->internal_refcount.count - 1, reason); +void +grpc_call_internal_unref (grpc_call * c, const char *reason, grpc_closure_list * closure_list) +{ + gpr_log (GPR_DEBUG, "CALL: unref %p %d -> %d [%s]", c, c->internal_refcount.count, c->internal_refcount.count - 1, reason); #else -void grpc_call_internal_unref(grpc_call *c, grpc_closure_list *closure_list) { +void +grpc_call_internal_unref (grpc_call * c, grpc_closure_list * closure_list) +{ #endif - if (gpr_unref(&c->internal_refcount)) { - destroy_call(c, closure_list); - } + if (gpr_unref (&c->internal_refcount)) + { + destroy_call (c, closure_list); + } } -static void set_status_code(grpc_call *call, status_source source, - gpr_uint32 status) { - if (call->status[source].is_set) return; +static void +set_status_code (grpc_call * call, status_source source, gpr_uint32 status) +{ + if (call->status[source].is_set) + return; call->status[source].is_set = 1; - call->status[source].code = (grpc_status_code)status; + call->status[source].code = (grpc_status_code) status; call->error_status_set = status != GRPC_STATUS_OK; - if (status != GRPC_STATUS_OK && !grpc_bbq_empty(&call->incoming_queue)) { - grpc_bbq_flush(&call->incoming_queue); - } + if (status != GRPC_STATUS_OK && !grpc_bbq_empty (&call->incoming_queue)) + { + grpc_bbq_flush (&call->incoming_queue); + } } -static void set_compression_algorithm(grpc_call *call, - grpc_compression_algorithm algo) { +static void +set_compression_algorithm (grpc_call * call, grpc_compression_algorithm algo) +{ call->compression_algorithm = algo; } -grpc_compression_algorithm grpc_call_get_compression_algorithm( - const grpc_call *call) { +grpc_compression_algorithm +grpc_call_get_compression_algorithm (const grpc_call * call) +{ return call->compression_algorithm; } -static void set_encodings_accepted_by_peer( - grpc_call *call, const gpr_slice accept_encoding_slice) { +static void +set_encodings_accepted_by_peer (grpc_call * call, const gpr_slice accept_encoding_slice) +{ size_t i; grpc_compression_algorithm algorithm; gpr_slice_buffer accept_encoding_parts; - gpr_slice_buffer_init(&accept_encoding_parts); - gpr_slice_split(accept_encoding_slice, ",", &accept_encoding_parts); + gpr_slice_buffer_init (&accept_encoding_parts); + gpr_slice_split (accept_encoding_slice, ",", &accept_encoding_parts); /* No need to zero call->encodings_accepted_by_peer: grpc_call_create already * zeroes the whole grpc_call */ /* Always support no compression */ - GPR_BITSET(&call->encodings_accepted_by_peer, GRPC_COMPRESS_NONE); - for (i = 0; i < accept_encoding_parts.count; i++) { - const gpr_slice *accept_encoding_entry_slice = - &accept_encoding_parts.slices[i]; - if (grpc_compression_algorithm_parse( - (const char *)GPR_SLICE_START_PTR(*accept_encoding_entry_slice), - GPR_SLICE_LENGTH(*accept_encoding_entry_slice), &algorithm)) { - GPR_BITSET(&call->encodings_accepted_by_peer, algorithm); - } else { - char *accept_encoding_entry_str = - gpr_dump_slice(*accept_encoding_entry_slice, GPR_DUMP_ASCII); - gpr_log(GPR_ERROR, - "Invalid entry in accept encoding metadata: '%s'. Ignoring.", - accept_encoding_entry_str); - gpr_free(accept_encoding_entry_str); - } - } + GPR_BITSET (&call->encodings_accepted_by_peer, GRPC_COMPRESS_NONE); + for (i = 0; i < accept_encoding_parts.count; i++) + { + const gpr_slice *accept_encoding_entry_slice = &accept_encoding_parts.slices[i]; + if (grpc_compression_algorithm_parse ((const char *) GPR_SLICE_START_PTR (*accept_encoding_entry_slice), GPR_SLICE_LENGTH (*accept_encoding_entry_slice), &algorithm)) + { + GPR_BITSET (&call->encodings_accepted_by_peer, algorithm); + } + else + { + char *accept_encoding_entry_str = gpr_dump_slice (*accept_encoding_entry_slice, GPR_DUMP_ASCII); + gpr_log (GPR_ERROR, "Invalid entry in accept encoding metadata: '%s'. Ignoring.", accept_encoding_entry_str); + gpr_free (accept_encoding_entry_str); + } + } } -gpr_uint32 grpc_call_get_encodings_accepted_by_peer(grpc_call *call) { +gpr_uint32 +grpc_call_get_encodings_accepted_by_peer (grpc_call * call) +{ return call->encodings_accepted_by_peer; } -gpr_uint32 grpc_call_get_message_flags(const grpc_call *call) { +gpr_uint32 +grpc_call_get_message_flags (const grpc_call * call) +{ return call->incoming_message_flags; } -static void set_status_details(grpc_call *call, status_source source, - grpc_mdstr *status) { - if (call->status[source].details != NULL) { - GRPC_MDSTR_UNREF(call->status[source].details); - } +static void +set_status_details (grpc_call * call, status_source source, grpc_mdstr * status) +{ + if (call->status[source].details != NULL) + { + GRPC_MDSTR_UNREF (call->status[source].details); + } call->status[source].details = status; } -static int is_op_live(grpc_call *call, grpc_ioreq_op op) { +static int +is_op_live (grpc_call * call, grpc_ioreq_op op) +{ gpr_uint8 set = call->request_set[op]; reqinfo_master *master; - if (set >= GRPC_IOREQ_OP_COUNT) return 0; + if (set >= GRPC_IOREQ_OP_COUNT) + return 0; master = &call->masters[set]; return (master->complete_mask & (1u << op)) == 0; } -static void lock(grpc_call *call) { gpr_mu_lock(&call->mu); } +static void +lock (grpc_call * call) +{ + gpr_mu_lock (&call->mu); +} -static int need_more_data(grpc_call *call) { - if (call->read_state == READ_STATE_STREAM_CLOSED) return 0; +static int +need_more_data (grpc_call * call) +{ + if (call->read_state == READ_STATE_STREAM_CLOSED) + return 0; /* TODO(ctiller): this needs some serious cleanup */ - return is_op_live(call, GRPC_IOREQ_RECV_INITIAL_METADATA) || - (is_op_live(call, GRPC_IOREQ_RECV_MESSAGE) && - grpc_bbq_empty(&call->incoming_queue)) || - is_op_live(call, GRPC_IOREQ_RECV_TRAILING_METADATA) || - is_op_live(call, GRPC_IOREQ_RECV_STATUS) || - is_op_live(call, GRPC_IOREQ_RECV_STATUS_DETAILS) || - (is_op_live(call, GRPC_IOREQ_RECV_CLOSE) && - grpc_bbq_empty(&call->incoming_queue)) || - (call->write_state == WRITE_STATE_INITIAL && !call->is_client) || - (call->cancel_with_status != GRPC_STATUS_OK) || call->destroy_called; + return is_op_live (call, GRPC_IOREQ_RECV_INITIAL_METADATA) || (is_op_live (call, GRPC_IOREQ_RECV_MESSAGE) && grpc_bbq_empty (&call->incoming_queue)) || is_op_live (call, GRPC_IOREQ_RECV_TRAILING_METADATA) || is_op_live (call, GRPC_IOREQ_RECV_STATUS) || is_op_live (call, GRPC_IOREQ_RECV_STATUS_DETAILS) || (is_op_live (call, GRPC_IOREQ_RECV_CLOSE) && grpc_bbq_empty (&call->incoming_queue)) || (call->write_state == WRITE_STATE_INITIAL && !call->is_client) || (call->cancel_with_status != GRPC_STATUS_OK) || call->destroy_called; } -static void unlock(grpc_call *call, grpc_closure_list *closure_list) { +static void +unlock (grpc_call * call, grpc_closure_list * closure_list) +{ grpc_transport_stream_op op; completed_request completed_requests[GRPC_IOREQ_OP_COUNT]; int completing_requests = 0; @@ -609,610 +648,677 @@ static void unlock(grpc_call *call, grpc_closure_list *closure_list) { const size_t MAX_RECV_PEEK_AHEAD = 65536; size_t buffered_bytes; - memset(&op, 0, sizeof(op)); + memset (&op, 0, sizeof (op)); op.cancel_with_status = call->cancel_with_status; start_op = op.cancel_with_status != GRPC_STATUS_OK; - call->cancel_with_status = GRPC_STATUS_OK; /* reset */ - - if (!call->receiving && need_more_data(call)) { - if (grpc_bbq_empty(&call->incoming_queue) && call->reading_message) { - op.max_recv_bytes = call->incoming_message_length - - call->incoming_message.length + MAX_RECV_PEEK_AHEAD; - } else { - buffered_bytes = grpc_bbq_bytes(&call->incoming_queue); - if (buffered_bytes > MAX_RECV_PEEK_AHEAD) { - op.max_recv_bytes = 0; - } else { - op.max_recv_bytes = MAX_RECV_PEEK_AHEAD - buffered_bytes; - } - } - /* TODO(ctiller): 1024 is basically to cover a bug - I don't understand yet */ - if (op.max_recv_bytes > 1024) { - op.recv_ops = &call->recv_ops; - op.recv_state = &call->recv_state; - op.on_done_recv = &call->on_done_recv; - call->receiving = 1; - GRPC_CALL_INTERNAL_REF(call, "receiving"); - start_op = 1; + call->cancel_with_status = GRPC_STATUS_OK; /* reset */ + + if (!call->receiving && need_more_data (call)) + { + if (grpc_bbq_empty (&call->incoming_queue) && call->reading_message) + { + op.max_recv_bytes = call->incoming_message_length - call->incoming_message.length + MAX_RECV_PEEK_AHEAD; + } + else + { + buffered_bytes = grpc_bbq_bytes (&call->incoming_queue); + if (buffered_bytes > MAX_RECV_PEEK_AHEAD) + { + op.max_recv_bytes = 0; + } + else + { + op.max_recv_bytes = MAX_RECV_PEEK_AHEAD - buffered_bytes; + } + } + /* TODO(ctiller): 1024 is basically to cover a bug + I don't understand yet */ + if (op.max_recv_bytes > 1024) + { + op.recv_ops = &call->recv_ops; + op.recv_state = &call->recv_state; + op.on_done_recv = &call->on_done_recv; + call->receiving = 1; + GRPC_CALL_INTERNAL_REF (call, "receiving"); + start_op = 1; + } + } + + if (!call->sending) + { + if (fill_send_ops (call, &op)) + { + call->sending = 1; + GRPC_CALL_INTERNAL_REF (call, "sending"); + start_op = 1; + } } - } - if (!call->sending) { - if (fill_send_ops(call, &op)) { - call->sending = 1; - GRPC_CALL_INTERNAL_REF(call, "sending"); + if (!call->bound_pollset && call->cq && (!call->is_client || start_op)) + { + call->bound_pollset = 1; + op.bind_pollset = grpc_cq_pollset (call->cq); start_op = 1; } - } - - if (!call->bound_pollset && call->cq && (!call->is_client || start_op)) { - call->bound_pollset = 1; - op.bind_pollset = grpc_cq_pollset(call->cq); - start_op = 1; - } - - if (!call->completing && call->num_completed_requests != 0) { - completing_requests = call->num_completed_requests; - memcpy(completed_requests, call->completed_requests, - sizeof(completed_requests)); - call->num_completed_requests = 0; - call->completing = 1; - GRPC_CALL_INTERNAL_REF(call, "completing"); - } - - gpr_mu_unlock(&call->mu); - - if (start_op) { - execute_op(call, &op, closure_list); - } - - if (completing_requests > 0) { - for (i = 0; i < completing_requests; i++) { - completed_requests[i].on_complete(call, completed_requests[i].success, - completed_requests[i].user_data, - closure_list); - } - lock(call); - call->completing = 0; - unlock(call, closure_list); - GRPC_CALL_INTERNAL_UNREF(call, "completing", closure_list); - } + + if (!call->completing && call->num_completed_requests != 0) + { + completing_requests = call->num_completed_requests; + memcpy (completed_requests, call->completed_requests, sizeof (completed_requests)); + call->num_completed_requests = 0; + call->completing = 1; + GRPC_CALL_INTERNAL_REF (call, "completing"); + } + + gpr_mu_unlock (&call->mu); + + if (start_op) + { + execute_op (call, &op, closure_list); + } + + if (completing_requests > 0) + { + for (i = 0; i < completing_requests; i++) + { + completed_requests[i].on_complete (call, completed_requests[i].success, completed_requests[i].user_data, closure_list); + } + lock (call); + call->completing = 0; + unlock (call, closure_list); + GRPC_CALL_INTERNAL_UNREF (call, "completing", closure_list); + } } -static void get_final_status(grpc_call *call, grpc_ioreq_data out) { +static void +get_final_status (grpc_call * call, grpc_ioreq_data out) +{ int i; - for (i = 0; i < STATUS_SOURCE_COUNT; i++) { - if (call->status[i].is_set) { - out.recv_status.set_value(call->status[i].code, - out.recv_status.user_data); - return; + for (i = 0; i < STATUS_SOURCE_COUNT; i++) + { + if (call->status[i].is_set) + { + out.recv_status.set_value (call->status[i].code, out.recv_status.user_data); + return; + } + } + if (call->is_client) + { + out.recv_status.set_value (GRPC_STATUS_UNKNOWN, out.recv_status.user_data); + } + else + { + out.recv_status.set_value (GRPC_STATUS_OK, out.recv_status.user_data); } - } - if (call->is_client) { - out.recv_status.set_value(GRPC_STATUS_UNKNOWN, out.recv_status.user_data); - } else { - out.recv_status.set_value(GRPC_STATUS_OK, out.recv_status.user_data); - } } -static void get_final_details(grpc_call *call, grpc_ioreq_data out) { +static void +get_final_details (grpc_call * call, grpc_ioreq_data out) +{ int i; - for (i = 0; i < STATUS_SOURCE_COUNT; i++) { - if (call->status[i].is_set) { - if (call->status[i].details) { - gpr_slice details = call->status[i].details->slice; - size_t len = GPR_SLICE_LENGTH(details); - if (len + 1 > *out.recv_status_details.details_capacity) { - *out.recv_status_details.details_capacity = GPR_MAX( - len + 1, *out.recv_status_details.details_capacity * 3 / 2); - *out.recv_status_details.details = - gpr_realloc(*out.recv_status_details.details, - *out.recv_status_details.details_capacity); - } - memcpy(*out.recv_status_details.details, GPR_SLICE_START_PTR(details), - len); - (*out.recv_status_details.details)[len] = 0; - } else { - goto no_details; - } - return; + for (i = 0; i < STATUS_SOURCE_COUNT; i++) + { + if (call->status[i].is_set) + { + if (call->status[i].details) + { + gpr_slice details = call->status[i].details->slice; + size_t len = GPR_SLICE_LENGTH (details); + if (len + 1 > *out.recv_status_details.details_capacity) + { + *out.recv_status_details.details_capacity = GPR_MAX (len + 1, *out.recv_status_details.details_capacity * 3 / 2); + *out.recv_status_details.details = gpr_realloc (*out.recv_status_details.details, *out.recv_status_details.details_capacity); + } + memcpy (*out.recv_status_details.details, GPR_SLICE_START_PTR (details), len); + (*out.recv_status_details.details)[len] = 0; + } + else + { + goto no_details; + } + return; + } } - } no_details: - if (0 == *out.recv_status_details.details_capacity) { - *out.recv_status_details.details_capacity = 8; - *out.recv_status_details.details = - gpr_malloc(*out.recv_status_details.details_capacity); - } + if (0 == *out.recv_status_details.details_capacity) + { + *out.recv_status_details.details_capacity = 8; + *out.recv_status_details.details = gpr_malloc (*out.recv_status_details.details_capacity); + } **out.recv_status_details.details = 0; } -static void finish_live_ioreq_op(grpc_call *call, grpc_ioreq_op op, - int success) { +static void +finish_live_ioreq_op (grpc_call * call, grpc_ioreq_op op, int success) +{ completed_request *cr; gpr_uint8 master_set = call->request_set[op]; reqinfo_master *master; size_t i; /* ioreq is live: we need to do something */ master = &call->masters[master_set]; - master->complete_mask |= (gpr_uint16)(1u << op); - if (!success) { - master->success = 0; - } - if (master->complete_mask == master->need_mask) { - for (i = 0; i < GRPC_IOREQ_OP_COUNT; i++) { - if (call->request_set[i] != master_set) { - continue; - } - call->request_set[i] = REQSET_DONE; - switch ((grpc_ioreq_op)i) { - case GRPC_IOREQ_RECV_MESSAGE: - case GRPC_IOREQ_SEND_MESSAGE: - call->request_set[i] = REQSET_EMPTY; - if (!master->success) { - call->write_state = WRITE_STATE_WRITE_CLOSED; - } - break; - case GRPC_IOREQ_SEND_STATUS: - if (call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details != - NULL) { - GRPC_MDSTR_UNREF( - call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details); - call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details = - NULL; - } - break; - case GRPC_IOREQ_RECV_CLOSE: - case GRPC_IOREQ_SEND_INITIAL_METADATA: - case GRPC_IOREQ_SEND_TRAILING_METADATA: - case GRPC_IOREQ_SEND_CLOSE: - break; - case GRPC_IOREQ_RECV_STATUS: - get_final_status(call, call->request_data[GRPC_IOREQ_RECV_STATUS]); - break; - case GRPC_IOREQ_RECV_STATUS_DETAILS: - get_final_details(call, - call->request_data[GRPC_IOREQ_RECV_STATUS_DETAILS]); - break; - case GRPC_IOREQ_RECV_INITIAL_METADATA: - GPR_SWAP(grpc_metadata_array, call->buffered_metadata[0], - *call->request_data[GRPC_IOREQ_RECV_INITIAL_METADATA] - .recv_metadata); - break; - case GRPC_IOREQ_RECV_TRAILING_METADATA: - GPR_SWAP(grpc_metadata_array, call->buffered_metadata[1], - *call->request_data[GRPC_IOREQ_RECV_TRAILING_METADATA] - .recv_metadata); - break; - case GRPC_IOREQ_OP_COUNT: - abort(); - break; - } - } - cr = &call->completed_requests[call->num_completed_requests++]; - cr->success = master->success; - cr->on_complete = master->on_complete; - cr->user_data = master->user_data; - } + master->complete_mask |= (gpr_uint16) (1u << op); + if (!success) + { + master->success = 0; + } + if (master->complete_mask == master->need_mask) + { + for (i = 0; i < GRPC_IOREQ_OP_COUNT; i++) + { + if (call->request_set[i] != master_set) + { + continue; + } + call->request_set[i] = REQSET_DONE; + switch ((grpc_ioreq_op) i) + { + case GRPC_IOREQ_RECV_MESSAGE: + case GRPC_IOREQ_SEND_MESSAGE: + call->request_set[i] = REQSET_EMPTY; + if (!master->success) + { + call->write_state = WRITE_STATE_WRITE_CLOSED; + } + break; + case GRPC_IOREQ_SEND_STATUS: + if (call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details != NULL) + { + GRPC_MDSTR_UNREF (call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details); + call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details = NULL; + } + break; + case GRPC_IOREQ_RECV_CLOSE: + case GRPC_IOREQ_SEND_INITIAL_METADATA: + case GRPC_IOREQ_SEND_TRAILING_METADATA: + case GRPC_IOREQ_SEND_CLOSE: + break; + case GRPC_IOREQ_RECV_STATUS: + get_final_status (call, call->request_data[GRPC_IOREQ_RECV_STATUS]); + break; + case GRPC_IOREQ_RECV_STATUS_DETAILS: + get_final_details (call, call->request_data[GRPC_IOREQ_RECV_STATUS_DETAILS]); + break; + case GRPC_IOREQ_RECV_INITIAL_METADATA: + GPR_SWAP (grpc_metadata_array, call->buffered_metadata[0], *call->request_data[GRPC_IOREQ_RECV_INITIAL_METADATA].recv_metadata); + break; + case GRPC_IOREQ_RECV_TRAILING_METADATA: + GPR_SWAP (grpc_metadata_array, call->buffered_metadata[1], *call->request_data[GRPC_IOREQ_RECV_TRAILING_METADATA].recv_metadata); + break; + case GRPC_IOREQ_OP_COUNT: + abort (); + break; + } + } + cr = &call->completed_requests[call->num_completed_requests++]; + cr->success = master->success; + cr->on_complete = master->on_complete; + cr->user_data = master->user_data; + } } -static void finish_ioreq_op(grpc_call *call, grpc_ioreq_op op, int success) { - if (is_op_live(call, op)) { - finish_live_ioreq_op(call, op, success); - } +static void +finish_ioreq_op (grpc_call * call, grpc_ioreq_op op, int success) +{ + if (is_op_live (call, op)) + { + finish_live_ioreq_op (call, op, success); + } } -static void early_out_write_ops(grpc_call *call) { - switch (call->write_state) { +static void +early_out_write_ops (grpc_call * call) +{ + switch (call->write_state) + { case WRITE_STATE_WRITE_CLOSED: - finish_ioreq_op(call, GRPC_IOREQ_SEND_MESSAGE, 0); - finish_ioreq_op(call, GRPC_IOREQ_SEND_STATUS, 0); - finish_ioreq_op(call, GRPC_IOREQ_SEND_TRAILING_METADATA, 0); - finish_ioreq_op(call, GRPC_IOREQ_SEND_CLOSE, 1); - /* fallthrough */ + finish_ioreq_op (call, GRPC_IOREQ_SEND_MESSAGE, 0); + finish_ioreq_op (call, GRPC_IOREQ_SEND_STATUS, 0); + finish_ioreq_op (call, GRPC_IOREQ_SEND_TRAILING_METADATA, 0); + finish_ioreq_op (call, GRPC_IOREQ_SEND_CLOSE, 1); + /* fallthrough */ case WRITE_STATE_STARTED: - finish_ioreq_op(call, GRPC_IOREQ_SEND_INITIAL_METADATA, 0); - /* fallthrough */ + finish_ioreq_op (call, GRPC_IOREQ_SEND_INITIAL_METADATA, 0); + /* fallthrough */ case WRITE_STATE_INITIAL: /* do nothing */ break; - } + } } -static void call_on_done_send(void *pc, int success, - grpc_closure_list *closure_list) { +static void +call_on_done_send (void *pc, int success, grpc_closure_list * closure_list) +{ grpc_call *call = pc; - lock(call); - if (call->last_send_contains & (1 << GRPC_IOREQ_SEND_INITIAL_METADATA)) { - finish_ioreq_op(call, GRPC_IOREQ_SEND_INITIAL_METADATA, success); - call->write_state = WRITE_STATE_STARTED; - } - if (call->last_send_contains & (1 << GRPC_IOREQ_SEND_MESSAGE)) { - finish_ioreq_op(call, GRPC_IOREQ_SEND_MESSAGE, success); - } - if (call->last_send_contains & (1 << GRPC_IOREQ_SEND_CLOSE)) { - finish_ioreq_op(call, GRPC_IOREQ_SEND_TRAILING_METADATA, success); - finish_ioreq_op(call, GRPC_IOREQ_SEND_STATUS, success); - finish_ioreq_op(call, GRPC_IOREQ_SEND_CLOSE, 1); - call->write_state = WRITE_STATE_WRITE_CLOSED; - } - if (!success) { - call->write_state = WRITE_STATE_WRITE_CLOSED; - early_out_write_ops(call); - } + lock (call); + if (call->last_send_contains & (1 << GRPC_IOREQ_SEND_INITIAL_METADATA)) + { + finish_ioreq_op (call, GRPC_IOREQ_SEND_INITIAL_METADATA, success); + call->write_state = WRITE_STATE_STARTED; + } + if (call->last_send_contains & (1 << GRPC_IOREQ_SEND_MESSAGE)) + { + finish_ioreq_op (call, GRPC_IOREQ_SEND_MESSAGE, success); + } + if (call->last_send_contains & (1 << GRPC_IOREQ_SEND_CLOSE)) + { + finish_ioreq_op (call, GRPC_IOREQ_SEND_TRAILING_METADATA, success); + finish_ioreq_op (call, GRPC_IOREQ_SEND_STATUS, success); + finish_ioreq_op (call, GRPC_IOREQ_SEND_CLOSE, 1); + call->write_state = WRITE_STATE_WRITE_CLOSED; + } + if (!success) + { + call->write_state = WRITE_STATE_WRITE_CLOSED; + early_out_write_ops (call); + } call->send_ops.nops = 0; call->last_send_contains = 0; call->sending = 0; - unlock(call, closure_list); - GRPC_CALL_INTERNAL_UNREF(call, "sending", closure_list); + unlock (call, closure_list); + GRPC_CALL_INTERNAL_UNREF (call, "sending", closure_list); } -static void finish_message(grpc_call *call) { - if (call->error_status_set == 0) { - /* TODO(ctiller): this could be a lot faster if coded directly */ - grpc_byte_buffer *byte_buffer; - /* some aliases for readability */ - gpr_slice *slices = call->incoming_message.slices; - const size_t nslices = call->incoming_message.count; - - if ((call->incoming_message_flags & GRPC_WRITE_INTERNAL_COMPRESS) && - (call->compression_algorithm > GRPC_COMPRESS_NONE)) { - byte_buffer = grpc_raw_compressed_byte_buffer_create( - slices, nslices, call->compression_algorithm); - } else { - byte_buffer = grpc_raw_byte_buffer_create(slices, nslices); - } - grpc_bbq_push(&call->incoming_queue, byte_buffer); - } - gpr_slice_buffer_reset_and_unref(&call->incoming_message); - GPR_ASSERT(call->incoming_message.count == 0); +static void +finish_message (grpc_call * call) +{ + if (call->error_status_set == 0) + { + /* TODO(ctiller): this could be a lot faster if coded directly */ + grpc_byte_buffer *byte_buffer; + /* some aliases for readability */ + gpr_slice *slices = call->incoming_message.slices; + const size_t nslices = call->incoming_message.count; + + if ((call->incoming_message_flags & GRPC_WRITE_INTERNAL_COMPRESS) && (call->compression_algorithm > GRPC_COMPRESS_NONE)) + { + byte_buffer = grpc_raw_compressed_byte_buffer_create (slices, nslices, call->compression_algorithm); + } + else + { + byte_buffer = grpc_raw_byte_buffer_create (slices, nslices); + } + grpc_bbq_push (&call->incoming_queue, byte_buffer); + } + gpr_slice_buffer_reset_and_unref (&call->incoming_message); + GPR_ASSERT (call->incoming_message.count == 0); call->reading_message = 0; } -static int begin_message(grpc_call *call, grpc_begin_message msg) { +static int +begin_message (grpc_call * call, grpc_begin_message msg) +{ /* can't begin a message when we're still reading a message */ - if (call->reading_message) { - char *message = NULL; - gpr_asprintf( - &message, "Message terminated early; read %d bytes, expected %d", - (int)call->incoming_message.length, (int)call->incoming_message_length); - cancel_with_status(call, GRPC_STATUS_INVALID_ARGUMENT, message); - gpr_free(message); - return 0; - } + if (call->reading_message) + { + char *message = NULL; + gpr_asprintf (&message, "Message terminated early; read %d bytes, expected %d", (int) call->incoming_message.length, (int) call->incoming_message_length); + cancel_with_status (call, GRPC_STATUS_INVALID_ARGUMENT, message); + gpr_free (message); + return 0; + } /* sanity check: if message flags indicate a compressed message, the * compression level should already be present in the call, as parsed off its * corresponding metadata. */ - if ((msg.flags & GRPC_WRITE_INTERNAL_COMPRESS) && - (call->compression_algorithm == GRPC_COMPRESS_NONE)) { - char *message = NULL; - char *alg_name; - if (!grpc_compression_algorithm_name(call->compression_algorithm, - &alg_name)) { - /* This shouldn't happen, other than due to data corruption */ - alg_name = ""; - } - gpr_asprintf(&message, - "Invalid compression algorithm (%s) for compressed message.", - alg_name); - cancel_with_status(call, GRPC_STATUS_INTERNAL, message); - gpr_free(message); - return 0; - } + if ((msg.flags & GRPC_WRITE_INTERNAL_COMPRESS) && (call->compression_algorithm == GRPC_COMPRESS_NONE)) + { + char *message = NULL; + char *alg_name; + if (!grpc_compression_algorithm_name (call->compression_algorithm, &alg_name)) + { + /* This shouldn't happen, other than due to data corruption */ + alg_name = ""; + } + gpr_asprintf (&message, "Invalid compression algorithm (%s) for compressed message.", alg_name); + cancel_with_status (call, GRPC_STATUS_INTERNAL, message); + gpr_free (message); + return 0; + } /* stash away parameters, and prepare for incoming slices */ - if (msg.length > grpc_channel_get_max_message_length(call->channel)) { - char *message = NULL; - gpr_asprintf( - &message, - "Maximum message length of %d exceeded by a message of length %d", - grpc_channel_get_max_message_length(call->channel), msg.length); - cancel_with_status(call, GRPC_STATUS_INVALID_ARGUMENT, message); - gpr_free(message); - return 0; - } else if (msg.length > 0) { - call->reading_message = 1; - call->incoming_message_length = msg.length; - call->incoming_message_flags = msg.flags; - return 1; - } else { - finish_message(call); - return 1; - } + if (msg.length > grpc_channel_get_max_message_length (call->channel)) + { + char *message = NULL; + gpr_asprintf (&message, "Maximum message length of %d exceeded by a message of length %d", grpc_channel_get_max_message_length (call->channel), msg.length); + cancel_with_status (call, GRPC_STATUS_INVALID_ARGUMENT, message); + gpr_free (message); + return 0; + } + else if (msg.length > 0) + { + call->reading_message = 1; + call->incoming_message_length = msg.length; + call->incoming_message_flags = msg.flags; + return 1; + } + else + { + finish_message (call); + return 1; + } } -static int add_slice_to_message(grpc_call *call, gpr_slice slice) { - if (GPR_SLICE_LENGTH(slice) == 0) { - gpr_slice_unref(slice); - return 1; - } +static int +add_slice_to_message (grpc_call * call, gpr_slice slice) +{ + if (GPR_SLICE_LENGTH (slice) == 0) + { + gpr_slice_unref (slice); + return 1; + } /* we have to be reading a message to know what to do here */ - if (!call->reading_message) { - cancel_with_status(call, GRPC_STATUS_INVALID_ARGUMENT, - "Received payload data while not reading a message"); - return 0; - } + if (!call->reading_message) + { + cancel_with_status (call, GRPC_STATUS_INVALID_ARGUMENT, "Received payload data while not reading a message"); + return 0; + } /* append the slice to the incoming buffer */ - gpr_slice_buffer_add(&call->incoming_message, slice); - if (call->incoming_message.length > call->incoming_message_length) { - /* if we got too many bytes, complain */ - char *message = NULL; - gpr_asprintf( - &message, "Receiving message overflow; read %d bytes, expected %d", - (int)call->incoming_message.length, (int)call->incoming_message_length); - cancel_with_status(call, GRPC_STATUS_INVALID_ARGUMENT, message); - gpr_free(message); - return 0; - } else if (call->incoming_message.length == call->incoming_message_length) { - finish_message(call); - return 1; - } else { - return 1; - } + gpr_slice_buffer_add (&call->incoming_message, slice); + if (call->incoming_message.length > call->incoming_message_length) + { + /* if we got too many bytes, complain */ + char *message = NULL; + gpr_asprintf (&message, "Receiving message overflow; read %d bytes, expected %d", (int) call->incoming_message.length, (int) call->incoming_message_length); + cancel_with_status (call, GRPC_STATUS_INVALID_ARGUMENT, message); + gpr_free (message); + return 0; + } + else if (call->incoming_message.length == call->incoming_message_length) + { + finish_message (call); + return 1; + } + else + { + return 1; + } } -static void call_on_done_recv(void *pc, int success, - grpc_closure_list *closure_list) { +static void +call_on_done_recv (void *pc, int success, grpc_closure_list * closure_list) +{ grpc_call *call = pc; grpc_call *child_call; grpc_call *next_child_call; size_t i; - GRPC_TIMER_BEGIN(GRPC_PTAG_CALL_ON_DONE_RECV, 0); - lock(call); + GRPC_TIMER_BEGIN (GRPC_PTAG_CALL_ON_DONE_RECV, 0); + lock (call); call->receiving = 0; - if (success) { - for (i = 0; success && i < call->recv_ops.nops; i++) { - grpc_stream_op *op = &call->recv_ops.ops[i]; - switch (op->type) { - case GRPC_NO_OP: - break; - case GRPC_OP_METADATA: - recv_metadata(call, &op->data.metadata, closure_list); - break; - case GRPC_OP_BEGIN_MESSAGE: - success = begin_message(call, op->data.begin_message); - break; - case GRPC_OP_SLICE: - success = add_slice_to_message(call, op->data.slice); - break; - } - } - if (!success) { - grpc_stream_ops_unref_owned_objects(&call->recv_ops.ops[i], - call->recv_ops.nops - i); - } - if (call->recv_state == GRPC_STREAM_RECV_CLOSED) { - GPR_ASSERT(call->read_state <= READ_STATE_READ_CLOSED); - call->read_state = READ_STATE_READ_CLOSED; - } - if (call->recv_state == GRPC_STREAM_CLOSED) { - GPR_ASSERT(call->read_state <= READ_STATE_STREAM_CLOSED); - call->read_state = READ_STATE_STREAM_CLOSED; - if (call->have_alarm) { - grpc_alarm_cancel(&call->alarm, closure_list); - } - /* propagate cancellation to any interested children */ - child_call = call->first_child; - if (child_call != NULL) { - do { - next_child_call = child_call->sibling_next; - if (child_call->cancellation_is_inherited) { - GRPC_CALL_INTERNAL_REF(child_call, "propagate_cancel"); - grpc_call_cancel(child_call, NULL); - GRPC_CALL_INTERNAL_UNREF(child_call, "propagate_cancel", - closure_list); - } - child_call = next_child_call; - } while (child_call != call->first_child); - } - GRPC_CALL_INTERNAL_UNREF(call, "closed", closure_list); - } - finish_read_ops(call); - } else { - finish_ioreq_op(call, GRPC_IOREQ_RECV_MESSAGE, 0); - finish_ioreq_op(call, GRPC_IOREQ_RECV_STATUS, 0); - finish_ioreq_op(call, GRPC_IOREQ_RECV_CLOSE, 0); - finish_ioreq_op(call, GRPC_IOREQ_RECV_TRAILING_METADATA, 0); - finish_ioreq_op(call, GRPC_IOREQ_RECV_INITIAL_METADATA, 0); - finish_ioreq_op(call, GRPC_IOREQ_RECV_STATUS_DETAILS, 0); - } + if (success) + { + for (i = 0; success && i < call->recv_ops.nops; i++) + { + grpc_stream_op *op = &call->recv_ops.ops[i]; + switch (op->type) + { + case GRPC_NO_OP: + break; + case GRPC_OP_METADATA: + recv_metadata (call, &op->data.metadata, closure_list); + break; + case GRPC_OP_BEGIN_MESSAGE: + success = begin_message (call, op->data.begin_message); + break; + case GRPC_OP_SLICE: + success = add_slice_to_message (call, op->data.slice); + break; + } + } + if (!success) + { + grpc_stream_ops_unref_owned_objects (&call->recv_ops.ops[i], call->recv_ops.nops - i); + } + if (call->recv_state == GRPC_STREAM_RECV_CLOSED) + { + GPR_ASSERT (call->read_state <= READ_STATE_READ_CLOSED); + call->read_state = READ_STATE_READ_CLOSED; + } + if (call->recv_state == GRPC_STREAM_CLOSED) + { + GPR_ASSERT (call->read_state <= READ_STATE_STREAM_CLOSED); + call->read_state = READ_STATE_STREAM_CLOSED; + if (call->have_alarm) + { + grpc_alarm_cancel (&call->alarm, closure_list); + } + /* propagate cancellation to any interested children */ + child_call = call->first_child; + if (child_call != NULL) + { + do + { + next_child_call = child_call->sibling_next; + if (child_call->cancellation_is_inherited) + { + GRPC_CALL_INTERNAL_REF (child_call, "propagate_cancel"); + grpc_call_cancel (child_call, NULL); + GRPC_CALL_INTERNAL_UNREF (child_call, "propagate_cancel", closure_list); + } + child_call = next_child_call; + } + while (child_call != call->first_child); + } + GRPC_CALL_INTERNAL_UNREF (call, "closed", closure_list); + } + finish_read_ops (call); + } + else + { + finish_ioreq_op (call, GRPC_IOREQ_RECV_MESSAGE, 0); + finish_ioreq_op (call, GRPC_IOREQ_RECV_STATUS, 0); + finish_ioreq_op (call, GRPC_IOREQ_RECV_CLOSE, 0); + finish_ioreq_op (call, GRPC_IOREQ_RECV_TRAILING_METADATA, 0); + finish_ioreq_op (call, GRPC_IOREQ_RECV_INITIAL_METADATA, 0); + finish_ioreq_op (call, GRPC_IOREQ_RECV_STATUS_DETAILS, 0); + } call->recv_ops.nops = 0; - unlock(call, closure_list); + unlock (call, closure_list); - GRPC_CALL_INTERNAL_UNREF(call, "receiving", closure_list); - GRPC_TIMER_END(GRPC_PTAG_CALL_ON_DONE_RECV, 0); + GRPC_CALL_INTERNAL_UNREF (call, "receiving", closure_list); + GRPC_TIMER_END (GRPC_PTAG_CALL_ON_DONE_RECV, 0); } -static int prepare_application_metadata(grpc_call *call, size_t count, - grpc_metadata *metadata) { +static int +prepare_application_metadata (grpc_call * call, size_t count, grpc_metadata * metadata) +{ size_t i; - for (i = 0; i < count; i++) { - grpc_metadata *md = &metadata[i]; - grpc_metadata *next_md = (i == count - 1) ? NULL : &metadata[i + 1]; - grpc_metadata *prev_md = (i == 0) ? NULL : &metadata[i - 1]; - grpc_linked_mdelem *l = (grpc_linked_mdelem *)&md->internal_data; - GPR_ASSERT(sizeof(grpc_linked_mdelem) == sizeof(md->internal_data)); - l->md = grpc_mdelem_from_string_and_buffer(call->metadata_context, md->key, - (const gpr_uint8 *)md->value, - md->value_length, 1); - if (!grpc_mdstr_is_legal_header(l->md->key)) { - gpr_log(GPR_ERROR, "attempt to send invalid metadata key: %s", - grpc_mdstr_as_c_string(l->md->key)); - return 0; - } else if (!grpc_mdstr_is_bin_suffixed(l->md->key) && - !grpc_mdstr_is_legal_nonbin_header(l->md->value)) { - gpr_log(GPR_ERROR, "attempt to send invalid metadata value"); - return 0; + for (i = 0; i < count; i++) + { + grpc_metadata *md = &metadata[i]; + grpc_metadata *next_md = (i == count - 1) ? NULL : &metadata[i + 1]; + grpc_metadata *prev_md = (i == 0) ? NULL : &metadata[i - 1]; + grpc_linked_mdelem *l = (grpc_linked_mdelem *) & md->internal_data; + GPR_ASSERT (sizeof (grpc_linked_mdelem) == sizeof (md->internal_data)); + l->md = grpc_mdelem_from_string_and_buffer (call->metadata_context, md->key, (const gpr_uint8 *) md->value, md->value_length, 1); + if (!grpc_mdstr_is_legal_header (l->md->key)) + { + gpr_log (GPR_ERROR, "attempt to send invalid metadata key: %s", grpc_mdstr_as_c_string (l->md->key)); + return 0; + } + else if (!grpc_mdstr_is_bin_suffixed (l->md->key) && !grpc_mdstr_is_legal_nonbin_header (l->md->value)) + { + gpr_log (GPR_ERROR, "attempt to send invalid metadata value"); + return 0; + } + l->next = next_md ? (grpc_linked_mdelem *) & next_md->internal_data : NULL; + l->prev = prev_md ? (grpc_linked_mdelem *) & prev_md->internal_data : NULL; } - l->next = next_md ? (grpc_linked_mdelem *)&next_md->internal_data : NULL; - l->prev = prev_md ? (grpc_linked_mdelem *)&prev_md->internal_data : NULL; - } return 1; } -static grpc_mdelem_list chain_metadata_from_app(grpc_call *call, size_t count, - grpc_metadata *metadata) { +static grpc_mdelem_list +chain_metadata_from_app (grpc_call * call, size_t count, grpc_metadata * metadata) +{ grpc_mdelem_list out; - if (count == 0) { - out.head = out.tail = NULL; - return out; - } - out.head = (grpc_linked_mdelem *)&(metadata[0].internal_data); - out.tail = (grpc_linked_mdelem *)&(metadata[count - 1].internal_data); + if (count == 0) + { + out.head = out.tail = NULL; + return out; + } + out.head = (grpc_linked_mdelem *) & (metadata[0].internal_data); + out.tail = (grpc_linked_mdelem *) & (metadata[count - 1].internal_data); return out; } /* Copy the contents of a byte buffer into stream ops */ -static void copy_byte_buffer_to_stream_ops(grpc_byte_buffer *byte_buffer, - grpc_stream_op_buffer *sopb) { +static void +copy_byte_buffer_to_stream_ops (grpc_byte_buffer * byte_buffer, grpc_stream_op_buffer * sopb) +{ size_t i; - switch (byte_buffer->type) { + switch (byte_buffer->type) + { case GRPC_BB_RAW: - for (i = 0; i < byte_buffer->data.raw.slice_buffer.count; i++) { - gpr_slice slice = byte_buffer->data.raw.slice_buffer.slices[i]; - gpr_slice_ref(slice); - grpc_sopb_add_slice(sopb, slice); - } + for (i = 0; i < byte_buffer->data.raw.slice_buffer.count; i++) + { + gpr_slice slice = byte_buffer->data.raw.slice_buffer.slices[i]; + gpr_slice_ref (slice); + grpc_sopb_add_slice (sopb, slice); + } break; - } + } } -static int fill_send_ops(grpc_call *call, grpc_transport_stream_op *op) { +static int +fill_send_ops (grpc_call * call, grpc_transport_stream_op * op) +{ grpc_ioreq_data data; gpr_uint32 flags; grpc_metadata_batch mdb; size_t i; - GPR_ASSERT(op->send_ops == NULL); + GPR_ASSERT (op->send_ops == NULL); - switch (call->write_state) { + switch (call->write_state) + { case WRITE_STATE_INITIAL: - if (!is_op_live(call, GRPC_IOREQ_SEND_INITIAL_METADATA)) { - break; - } + if (!is_op_live (call, GRPC_IOREQ_SEND_INITIAL_METADATA)) + { + break; + } data = call->request_data[GRPC_IOREQ_SEND_INITIAL_METADATA]; - mdb.list = chain_metadata_from_app(call, data.send_metadata.count, - data.send_metadata.metadata); + mdb.list = chain_metadata_from_app (call, data.send_metadata.count, data.send_metadata.metadata); mdb.garbage.head = mdb.garbage.tail = NULL; mdb.deadline = call->send_deadline; - for (i = 0; i < call->send_initial_metadata_count; i++) { - grpc_metadata_batch_link_head(&mdb, &call->send_initial_metadata[i]); - } - grpc_sopb_add_metadata(&call->send_ops, mdb); + for (i = 0; i < call->send_initial_metadata_count; i++) + { + grpc_metadata_batch_link_head (&mdb, &call->send_initial_metadata[i]); + } + grpc_sopb_add_metadata (&call->send_ops, mdb); op->send_ops = &call->send_ops; call->last_send_contains |= 1 << GRPC_IOREQ_SEND_INITIAL_METADATA; call->send_initial_metadata_count = 0; - /* fall through intended */ + /* fall through intended */ case WRITE_STATE_STARTED: - if (is_op_live(call, GRPC_IOREQ_SEND_MESSAGE)) { - size_t length; - data = call->request_data[GRPC_IOREQ_SEND_MESSAGE]; - flags = call->request_flags[GRPC_IOREQ_SEND_MESSAGE]; - length = grpc_byte_buffer_length(data.send_message); - GPR_ASSERT(length <= GPR_UINT32_MAX); - grpc_sopb_add_begin_message(&call->send_ops, (gpr_uint32)length, flags); - copy_byte_buffer_to_stream_ops(data.send_message, &call->send_ops); - op->send_ops = &call->send_ops; - call->last_send_contains |= 1 << GRPC_IOREQ_SEND_MESSAGE; - } - if (is_op_live(call, GRPC_IOREQ_SEND_CLOSE)) { - op->is_last_send = 1; - op->send_ops = &call->send_ops; - call->last_send_contains |= 1 << GRPC_IOREQ_SEND_CLOSE; - if (!call->is_client) { - /* send trailing metadata */ - data = call->request_data[GRPC_IOREQ_SEND_TRAILING_METADATA]; - mdb.list = chain_metadata_from_app(call, data.send_metadata.count, - data.send_metadata.metadata); - mdb.garbage.head = mdb.garbage.tail = NULL; - mdb.deadline = gpr_inf_future(GPR_CLOCK_REALTIME); - /* send status */ - /* TODO(ctiller): cache common status values */ - data = call->request_data[GRPC_IOREQ_SEND_STATUS]; - grpc_metadata_batch_add_tail( - &mdb, &call->status_link, - grpc_channel_get_reffed_status_elem(call->channel, - data.send_status.code)); - if (data.send_status.details) { - grpc_metadata_batch_add_tail( - &mdb, &call->details_link, - grpc_mdelem_from_metadata_strings( - call->metadata_context, - GRPC_MDSTR_REF( - grpc_channel_get_message_string(call->channel)), - data.send_status.details)); - call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details = - NULL; - } - grpc_sopb_add_metadata(&call->send_ops, mdb); - } - } + if (is_op_live (call, GRPC_IOREQ_SEND_MESSAGE)) + { + size_t length; + data = call->request_data[GRPC_IOREQ_SEND_MESSAGE]; + flags = call->request_flags[GRPC_IOREQ_SEND_MESSAGE]; + length = grpc_byte_buffer_length (data.send_message); + GPR_ASSERT (length <= GPR_UINT32_MAX); + grpc_sopb_add_begin_message (&call->send_ops, (gpr_uint32) length, flags); + copy_byte_buffer_to_stream_ops (data.send_message, &call->send_ops); + op->send_ops = &call->send_ops; + call->last_send_contains |= 1 << GRPC_IOREQ_SEND_MESSAGE; + } + if (is_op_live (call, GRPC_IOREQ_SEND_CLOSE)) + { + op->is_last_send = 1; + op->send_ops = &call->send_ops; + call->last_send_contains |= 1 << GRPC_IOREQ_SEND_CLOSE; + if (!call->is_client) + { + /* send trailing metadata */ + data = call->request_data[GRPC_IOREQ_SEND_TRAILING_METADATA]; + mdb.list = chain_metadata_from_app (call, data.send_metadata.count, data.send_metadata.metadata); + mdb.garbage.head = mdb.garbage.tail = NULL; + mdb.deadline = gpr_inf_future (GPR_CLOCK_REALTIME); + /* send status */ + /* TODO(ctiller): cache common status values */ + data = call->request_data[GRPC_IOREQ_SEND_STATUS]; + grpc_metadata_batch_add_tail (&mdb, &call->status_link, grpc_channel_get_reffed_status_elem (call->channel, data.send_status.code)); + if (data.send_status.details) + { + grpc_metadata_batch_add_tail (&mdb, &call->details_link, grpc_mdelem_from_metadata_strings (call->metadata_context, GRPC_MDSTR_REF (grpc_channel_get_message_string (call->channel)), data.send_status.details)); + call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details = NULL; + } + grpc_sopb_add_metadata (&call->send_ops, mdb); + } + } break; case WRITE_STATE_WRITE_CLOSED: break; - } - if (op->send_ops) { - op->on_done_send = &call->on_done_send; - } + } + if (op->send_ops) + { + op->on_done_send = &call->on_done_send; + } return op->send_ops != NULL; } -static grpc_call_error start_ioreq_error(grpc_call *call, - gpr_uint32 mutated_ops, - grpc_call_error ret) { +static grpc_call_error +start_ioreq_error (grpc_call * call, gpr_uint32 mutated_ops, grpc_call_error ret) +{ size_t i; - for (i = 0; i < GRPC_IOREQ_OP_COUNT; i++) { - if (mutated_ops & (1u << i)) { - call->request_set[i] = REQSET_EMPTY; + for (i = 0; i < GRPC_IOREQ_OP_COUNT; i++) + { + if (mutated_ops & (1u << i)) + { + call->request_set[i] = REQSET_EMPTY; + } } - } return ret; } -static void finish_read_ops(grpc_call *call) { +static void +finish_read_ops (grpc_call * call) +{ int empty; - if (is_op_live(call, GRPC_IOREQ_RECV_MESSAGE)) { - empty = - (NULL == (*call->request_data[GRPC_IOREQ_RECV_MESSAGE].recv_message = - grpc_bbq_pop(&call->incoming_queue))); - if (!empty) { - finish_live_ioreq_op(call, GRPC_IOREQ_RECV_MESSAGE, 1); - empty = grpc_bbq_empty(&call->incoming_queue); + if (is_op_live (call, GRPC_IOREQ_RECV_MESSAGE)) + { + empty = (NULL == (*call->request_data[GRPC_IOREQ_RECV_MESSAGE].recv_message = grpc_bbq_pop (&call->incoming_queue))); + if (!empty) + { + finish_live_ioreq_op (call, GRPC_IOREQ_RECV_MESSAGE, 1); + empty = grpc_bbq_empty (&call->incoming_queue); + } + } + else + { + empty = grpc_bbq_empty (&call->incoming_queue); } - } else { - empty = grpc_bbq_empty(&call->incoming_queue); - } - switch (call->read_state) { + switch (call->read_state) + { case READ_STATE_STREAM_CLOSED: - if (empty && !call->have_alarm) { - finish_ioreq_op(call, GRPC_IOREQ_RECV_CLOSE, 1); - } - /* fallthrough */ + if (empty && !call->have_alarm) + { + finish_ioreq_op (call, GRPC_IOREQ_RECV_CLOSE, 1); + } + /* fallthrough */ case READ_STATE_READ_CLOSED: - if (empty) { - finish_ioreq_op(call, GRPC_IOREQ_RECV_MESSAGE, 1); - } - finish_ioreq_op(call, GRPC_IOREQ_RECV_STATUS, 1); - finish_ioreq_op(call, GRPC_IOREQ_RECV_STATUS_DETAILS, 1); - finish_ioreq_op(call, GRPC_IOREQ_RECV_TRAILING_METADATA, 1); - /* fallthrough */ + if (empty) + { + finish_ioreq_op (call, GRPC_IOREQ_RECV_MESSAGE, 1); + } + finish_ioreq_op (call, GRPC_IOREQ_RECV_STATUS, 1); + finish_ioreq_op (call, GRPC_IOREQ_RECV_STATUS_DETAILS, 1); + finish_ioreq_op (call, GRPC_IOREQ_RECV_TRAILING_METADATA, 1); + /* fallthrough */ case READ_STATE_GOT_INITIAL_METADATA: - finish_ioreq_op(call, GRPC_IOREQ_RECV_INITIAL_METADATA, 1); - /* fallthrough */ + finish_ioreq_op (call, GRPC_IOREQ_RECV_INITIAL_METADATA, 1); + /* fallthrough */ case READ_STATE_INITIAL: /* do nothing */ break; - } + } } -static grpc_call_error start_ioreq(grpc_call *call, const grpc_ioreq *reqs, - size_t nreqs, - grpc_ioreq_completion_func completion, - void *user_data) { +static grpc_call_error +start_ioreq (grpc_call * call, const grpc_ioreq * reqs, size_t nreqs, grpc_ioreq_completion_func completion, void *user_data) +{ size_t i; gpr_uint16 have_ops = 0; grpc_ioreq_op op; @@ -1220,43 +1326,46 @@ static grpc_call_error start_ioreq(grpc_call *call, const grpc_ioreq *reqs, grpc_ioreq_data data; gpr_uint8 set; - if (nreqs == 0) { - return GRPC_CALL_OK; - } + if (nreqs == 0) + { + return GRPC_CALL_OK; + } set = reqs[0].op; - for (i = 0; i < nreqs; i++) { - op = reqs[i].op; - if (call->request_set[op] < GRPC_IOREQ_OP_COUNT) { - return start_ioreq_error(call, have_ops, - GRPC_CALL_ERROR_TOO_MANY_OPERATIONS); - } else if (call->request_set[op] == REQSET_DONE) { - return start_ioreq_error(call, have_ops, GRPC_CALL_ERROR_ALREADY_INVOKED); - } - data = reqs[i].data; - if (op == GRPC_IOREQ_SEND_INITIAL_METADATA || - op == GRPC_IOREQ_SEND_TRAILING_METADATA) { - if (!prepare_application_metadata(call, data.send_metadata.count, - data.send_metadata.metadata)) { - return start_ioreq_error(call, have_ops, - GRPC_CALL_ERROR_INVALID_METADATA); - } - } - if (op == GRPC_IOREQ_SEND_STATUS) { - set_status_code(call, STATUS_FROM_SERVER_STATUS, - (gpr_uint32)reqs[i].data.send_status.code); - if (reqs[i].data.send_status.details) { - set_status_details(call, STATUS_FROM_SERVER_STATUS, - GRPC_MDSTR_REF(reqs[i].data.send_status.details)); - } - } - have_ops |= (gpr_uint16)(1u << op); - - call->request_data[op] = data; - call->request_flags[op] = reqs[i].flags; - call->request_set[op] = set; - } + for (i = 0; i < nreqs; i++) + { + op = reqs[i].op; + if (call->request_set[op] < GRPC_IOREQ_OP_COUNT) + { + return start_ioreq_error (call, have_ops, GRPC_CALL_ERROR_TOO_MANY_OPERATIONS); + } + else if (call->request_set[op] == REQSET_DONE) + { + return start_ioreq_error (call, have_ops, GRPC_CALL_ERROR_ALREADY_INVOKED); + } + data = reqs[i].data; + if (op == GRPC_IOREQ_SEND_INITIAL_METADATA || op == GRPC_IOREQ_SEND_TRAILING_METADATA) + { + if (!prepare_application_metadata (call, data.send_metadata.count, data.send_metadata.metadata)) + { + return start_ioreq_error (call, have_ops, GRPC_CALL_ERROR_INVALID_METADATA); + } + } + if (op == GRPC_IOREQ_SEND_STATUS) + { + set_status_code (call, STATUS_FROM_SERVER_STATUS, (gpr_uint32) reqs[i].data.send_status.code); + if (reqs[i].data.send_status.details) + { + set_status_details (call, STATUS_FROM_SERVER_STATUS, GRPC_MDSTR_REF (reqs[i].data.send_status.details)); + } + } + have_ops |= (gpr_uint16) (1u << op); + + call->request_data[op] = data; + call->request_flags[op] = reqs[i].flags; + call->request_set[op] = set; + } master = &call->masters[set]; master->success = 1; @@ -1265,220 +1374,251 @@ static grpc_call_error start_ioreq(grpc_call *call, const grpc_ioreq *reqs, master->on_complete = completion; master->user_data = user_data; - finish_read_ops(call); - early_out_write_ops(call); + finish_read_ops (call); + early_out_write_ops (call); return GRPC_CALL_OK; } -grpc_call_error grpc_call_start_ioreq_and_call_back( - grpc_call *call, const grpc_ioreq *reqs, size_t nreqs, - grpc_ioreq_completion_func on_complete, void *user_data, - grpc_closure_list *closure_list) { +grpc_call_error +grpc_call_start_ioreq_and_call_back (grpc_call * call, const grpc_ioreq * reqs, size_t nreqs, grpc_ioreq_completion_func on_complete, void *user_data, grpc_closure_list * closure_list) +{ grpc_call_error err; - lock(call); - err = start_ioreq(call, reqs, nreqs, on_complete, user_data); - unlock(call, closure_list); + lock (call); + err = start_ioreq (call, reqs, nreqs, on_complete, user_data); + unlock (call, closure_list); return err; } -void grpc_call_destroy(grpc_call *c) { +void +grpc_call_destroy (grpc_call * c) +{ int cancel; grpc_call *parent = c->parent; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - if (parent) { - gpr_mu_lock(&parent->mu); - if (c == parent->first_child) { - parent->first_child = c->sibling_next; - if (c == parent->first_child) { - parent->first_child = NULL; - } - c->sibling_prev->sibling_next = c->sibling_next; - c->sibling_next->sibling_prev = c->sibling_prev; - } - gpr_mu_unlock(&parent->mu); - GRPC_CALL_INTERNAL_UNREF(parent, "child", &closure_list); - } - - lock(c); - GPR_ASSERT(!c->destroy_called); + if (parent) + { + gpr_mu_lock (&parent->mu); + if (c == parent->first_child) + { + parent->first_child = c->sibling_next; + if (c == parent->first_child) + { + parent->first_child = NULL; + } + c->sibling_prev->sibling_next = c->sibling_next; + c->sibling_next->sibling_prev = c->sibling_prev; + } + gpr_mu_unlock (&parent->mu); + GRPC_CALL_INTERNAL_UNREF (parent, "child", &closure_list); + } + + lock (c); + GPR_ASSERT (!c->destroy_called); c->destroy_called = 1; - if (c->have_alarm) { - grpc_alarm_cancel(&c->alarm, &closure_list); - } + if (c->have_alarm) + { + grpc_alarm_cancel (&c->alarm, &closure_list); + } cancel = c->read_state != READ_STATE_STREAM_CLOSED; - unlock(c, &closure_list); - if (cancel) grpc_call_cancel(c, NULL); - GRPC_CALL_INTERNAL_UNREF(c, "destroy", &closure_list); - grpc_closure_list_run(&closure_list); + unlock (c, &closure_list); + if (cancel) + grpc_call_cancel (c, NULL); + GRPC_CALL_INTERNAL_UNREF (c, "destroy", &closure_list); + grpc_closure_list_run (&closure_list); } -grpc_call_error grpc_call_cancel(grpc_call *call, void *reserved) { - GPR_ASSERT(!reserved); - return grpc_call_cancel_with_status(call, GRPC_STATUS_CANCELLED, "Cancelled", - NULL); +grpc_call_error +grpc_call_cancel (grpc_call * call, void *reserved) +{ + GPR_ASSERT (!reserved); + return grpc_call_cancel_with_status (call, GRPC_STATUS_CANCELLED, "Cancelled", NULL); } -grpc_call_error grpc_call_cancel_with_status(grpc_call *c, - grpc_status_code status, - const char *description, - void *reserved) { +grpc_call_error +grpc_call_cancel_with_status (grpc_call * c, grpc_status_code status, const char *description, void *reserved) +{ grpc_call_error r; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - GPR_ASSERT(reserved == NULL); - lock(c); - r = cancel_with_status(c, status, description); - unlock(c, &closure_list); - grpc_closure_list_run(&closure_list); + GPR_ASSERT (reserved == NULL); + lock (c); + r = cancel_with_status (c, status, description); + unlock (c, &closure_list); + grpc_closure_list_run (&closure_list); return r; } -static grpc_call_error cancel_with_status(grpc_call *c, grpc_status_code status, - const char *description) { - grpc_mdstr *details = - description ? grpc_mdstr_from_string(c->metadata_context, description, 0) - : NULL; +static grpc_call_error +cancel_with_status (grpc_call * c, grpc_status_code status, const char *description) +{ + grpc_mdstr *details = description ? grpc_mdstr_from_string (c->metadata_context, description, 0) : NULL; - GPR_ASSERT(status != GRPC_STATUS_OK); + GPR_ASSERT (status != GRPC_STATUS_OK); - set_status_code(c, STATUS_FROM_API_OVERRIDE, (gpr_uint32)status); - set_status_details(c, STATUS_FROM_API_OVERRIDE, details); + set_status_code (c, STATUS_FROM_API_OVERRIDE, (gpr_uint32) status); + set_status_details (c, STATUS_FROM_API_OVERRIDE, details); c->cancel_with_status = status; return GRPC_CALL_OK; } -static void finished_loose_op(void *call, int success_ignored, - grpc_closure_list *closure_list) { - GRPC_CALL_INTERNAL_UNREF(call, "loose-op", closure_list); +static void +finished_loose_op (void *call, int success_ignored, grpc_closure_list * closure_list) +{ + GRPC_CALL_INTERNAL_UNREF (call, "loose-op", closure_list); } -typedef struct { +typedef struct +{ grpc_call *call; grpc_closure closure; } finished_loose_op_allocated_args; -static void finished_loose_op_allocated(void *alloc, int success, - grpc_closure_list *closure_list) { +static void +finished_loose_op_allocated (void *alloc, int success, grpc_closure_list * closure_list) +{ finished_loose_op_allocated_args *args = alloc; - finished_loose_op(args->call, success, closure_list); - gpr_free(args); + finished_loose_op (args->call, success, closure_list); + gpr_free (args); } -static void execute_op(grpc_call *call, grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { +static void +execute_op (grpc_call * call, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ grpc_call_element *elem; - GPR_ASSERT(op->on_consumed == NULL); - if (op->cancel_with_status != GRPC_STATUS_OK || op->bind_pollset) { - GRPC_CALL_INTERNAL_REF(call, "loose-op"); - if (op->bind_pollset) { - op->on_consumed = &call->on_done_bind; - } else { - finished_loose_op_allocated_args *args = gpr_malloc(sizeof(*args)); - args->call = call; - grpc_closure_init(&args->closure, finished_loose_op_allocated, args); - op->on_consumed = &args->closure; + GPR_ASSERT (op->on_consumed == NULL); + if (op->cancel_with_status != GRPC_STATUS_OK || op->bind_pollset) + { + GRPC_CALL_INTERNAL_REF (call, "loose-op"); + if (op->bind_pollset) + { + op->on_consumed = &call->on_done_bind; + } + else + { + finished_loose_op_allocated_args *args = gpr_malloc (sizeof (*args)); + args->call = call; + grpc_closure_init (&args->closure, finished_loose_op_allocated, args); + op->on_consumed = &args->closure; + } } - } - elem = CALL_ELEM_FROM_CALL(call, 0); + elem = CALL_ELEM_FROM_CALL (call, 0); op->context = call->context; - elem->filter->start_transport_stream_op(elem, op, closure_list); + elem->filter->start_transport_stream_op (elem, op, closure_list); } -char *grpc_call_get_peer(grpc_call *call) { - grpc_call_element *elem = CALL_ELEM_FROM_CALL(call, 0); +char * +grpc_call_get_peer (grpc_call * call) +{ + grpc_call_element *elem = CALL_ELEM_FROM_CALL (call, 0); grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - char *result = elem->filter->get_peer(elem, &closure_list); - grpc_closure_list_run(&closure_list); + char *result = elem->filter->get_peer (elem, &closure_list); + grpc_closure_list_run (&closure_list); return result; } -grpc_call *grpc_call_from_top_element(grpc_call_element *elem) { - return CALL_FROM_TOP_ELEM(elem); +grpc_call * +grpc_call_from_top_element (grpc_call_element * elem) +{ + return CALL_FROM_TOP_ELEM (elem); } -static void call_alarm(void *arg, int success, - grpc_closure_list *closure_list) { +static void +call_alarm (void *arg, int success, grpc_closure_list * closure_list) +{ grpc_call *call = arg; - lock(call); + lock (call); call->have_alarm = 0; - if (success) { - cancel_with_status(call, GRPC_STATUS_DEADLINE_EXCEEDED, - "Deadline Exceeded"); - } - finish_read_ops(call); - unlock(call, closure_list); - GRPC_CALL_INTERNAL_UNREF(call, "alarm", closure_list); + if (success) + { + cancel_with_status (call, GRPC_STATUS_DEADLINE_EXCEEDED, "Deadline Exceeded"); + } + finish_read_ops (call); + unlock (call, closure_list); + GRPC_CALL_INTERNAL_UNREF (call, "alarm", closure_list); } -static void set_deadline_alarm(grpc_call *call, gpr_timespec deadline, - grpc_closure_list *closure_list) { - if (call->have_alarm) { - gpr_log(GPR_ERROR, "Attempt to set deadline alarm twice"); - assert(0); - return; - } - GRPC_CALL_INTERNAL_REF(call, "alarm"); +static void +set_deadline_alarm (grpc_call * call, gpr_timespec deadline, grpc_closure_list * closure_list) +{ + if (call->have_alarm) + { + gpr_log (GPR_ERROR, "Attempt to set deadline alarm twice"); + assert (0); + return; + } + GRPC_CALL_INTERNAL_REF (call, "alarm"); call->have_alarm = 1; - call->send_deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC); - grpc_alarm_init(&call->alarm, call->send_deadline, call_alarm, call, - gpr_now(GPR_CLOCK_MONOTONIC), closure_list); + call->send_deadline = gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC); + grpc_alarm_init (&call->alarm, call->send_deadline, call_alarm, call, gpr_now (GPR_CLOCK_MONOTONIC), closure_list); } /* we offset status by a small amount when storing it into transport metadata as metadata cannot store a 0 value (which is used as OK for grpc_status_codes */ #define STATUS_OFFSET 1 -static void destroy_status(void *ignored) {} +static void +destroy_status (void *ignored) +{ +} -static gpr_uint32 decode_status(grpc_mdelem *md) { +static gpr_uint32 +decode_status (grpc_mdelem * md) +{ gpr_uint32 status; - void *user_data = grpc_mdelem_get_user_data(md, destroy_status); - if (user_data) { - status = ((gpr_uint32)(gpr_intptr)user_data) - STATUS_OFFSET; - } else { - if (!gpr_parse_bytes_to_uint32(grpc_mdstr_as_c_string(md->value), - GPR_SLICE_LENGTH(md->value->slice), - &status)) { - status = GRPC_STATUS_UNKNOWN; /* could not parse status code */ - } - grpc_mdelem_set_user_data(md, destroy_status, - (void *)(gpr_intptr)(status + STATUS_OFFSET)); - } + void *user_data = grpc_mdelem_get_user_data (md, destroy_status); + if (user_data) + { + status = ((gpr_uint32) (gpr_intptr) user_data) - STATUS_OFFSET; + } + else + { + if (!gpr_parse_bytes_to_uint32 (grpc_mdstr_as_c_string (md->value), GPR_SLICE_LENGTH (md->value->slice), &status)) + { + status = GRPC_STATUS_UNKNOWN; /* could not parse status code */ + } + grpc_mdelem_set_user_data (md, destroy_status, (void *) (gpr_intptr) (status + STATUS_OFFSET)); + } return status; } /* just as for status above, we need to offset: metadata userdata can't hold a * zero (null), which in this case is used to signal no compression */ #define COMPRESS_OFFSET 1 -static void destroy_compression(void *ignored) {} +static void +destroy_compression (void *ignored) +{ +} -static gpr_uint32 decode_compression(grpc_mdelem *md) { +static gpr_uint32 +decode_compression (grpc_mdelem * md) +{ grpc_compression_algorithm algorithm; - void *user_data = grpc_mdelem_get_user_data(md, destroy_compression); - if (user_data) { - algorithm = - ((grpc_compression_algorithm)(gpr_intptr)user_data) - COMPRESS_OFFSET; - } else { - const char *md_c_str = grpc_mdstr_as_c_string(md->value); - if (!grpc_compression_algorithm_parse(md_c_str, strlen(md_c_str), - &algorithm)) { - gpr_log(GPR_ERROR, "Invalid compression algorithm: '%s'", md_c_str); - assert(0); - } - grpc_mdelem_set_user_data( - md, destroy_compression, - (void *)(gpr_intptr)(algorithm + COMPRESS_OFFSET)); - } + void *user_data = grpc_mdelem_get_user_data (md, destroy_compression); + if (user_data) + { + algorithm = ((grpc_compression_algorithm) (gpr_intptr) user_data) - COMPRESS_OFFSET; + } + else + { + const char *md_c_str = grpc_mdstr_as_c_string (md->value); + if (!grpc_compression_algorithm_parse (md_c_str, strlen (md_c_str), &algorithm)) + { + gpr_log (GPR_ERROR, "Invalid compression algorithm: '%s'", md_c_str); + assert (0); + } + grpc_mdelem_set_user_data (md, destroy_compression, (void *) (gpr_intptr) (algorithm + COMPRESS_OFFSET)); + } return algorithm; } -static void recv_metadata(grpc_call *call, grpc_metadata_batch *md, - grpc_closure_list *closure_list) { +static void +recv_metadata (grpc_call * call, grpc_metadata_batch * md, grpc_closure_list * closure_list) +{ grpc_linked_mdelem *l; grpc_metadata_array *dest; grpc_metadata *mdusr; @@ -1486,356 +1626,397 @@ static void recv_metadata(grpc_call *call, grpc_metadata_batch *md, grpc_mdctx *mdctx = call->metadata_context; is_trailing = call->read_state >= READ_STATE_GOT_INITIAL_METADATA; - for (l = md->list.head; l != NULL; l = l->next) { - grpc_mdelem *md = l->md; - grpc_mdstr *key = md->key; - if (key == grpc_channel_get_status_string(call->channel)) { - set_status_code(call, STATUS_FROM_WIRE, decode_status(md)); - } else if (key == grpc_channel_get_message_string(call->channel)) { - set_status_details(call, STATUS_FROM_WIRE, GRPC_MDSTR_REF(md->value)); - } else if (key == - grpc_channel_get_compression_algorithm_string(call->channel)) { - set_compression_algorithm(call, decode_compression(md)); - } else if (key == grpc_channel_get_encodings_accepted_by_peer_string( - call->channel)) { - set_encodings_accepted_by_peer(call, md->value->slice); - } else { - dest = &call->buffered_metadata[is_trailing]; - if (dest->count == dest->capacity) { - dest->capacity = GPR_MAX(dest->capacity + 8, dest->capacity * 2); - dest->metadata = - gpr_realloc(dest->metadata, sizeof(grpc_metadata) * dest->capacity); - } - mdusr = &dest->metadata[dest->count++]; - mdusr->key = grpc_mdstr_as_c_string(md->key); - mdusr->value = grpc_mdstr_as_c_string(md->value); - mdusr->value_length = GPR_SLICE_LENGTH(md->value->slice); - if (call->owned_metadata_count == call->owned_metadata_capacity) { - call->owned_metadata_capacity = - GPR_MAX(call->owned_metadata_capacity + 8, - call->owned_metadata_capacity * 2); - call->owned_metadata = - gpr_realloc(call->owned_metadata, - sizeof(grpc_mdelem *) * call->owned_metadata_capacity); - } - call->owned_metadata[call->owned_metadata_count++] = md; - l->md = 0; - } - } - if (gpr_time_cmp(md->deadline, gpr_inf_future(md->deadline.clock_type)) != - 0 && - !call->is_client) { - set_deadline_alarm(call, md->deadline, closure_list); - } - if (!is_trailing) { - call->read_state = READ_STATE_GOT_INITIAL_METADATA; - } - - grpc_mdctx_lock(mdctx); - for (l = md->list.head; l; l = l->next) { - if (l->md) GRPC_MDCTX_LOCKED_MDELEM_UNREF(mdctx, l->md); - } - for (l = md->garbage.head; l; l = l->next) { - GRPC_MDCTX_LOCKED_MDELEM_UNREF(mdctx, l->md); - } - grpc_mdctx_unlock(mdctx); + for (l = md->list.head; l != NULL; l = l->next) + { + grpc_mdelem *md = l->md; + grpc_mdstr *key = md->key; + if (key == grpc_channel_get_status_string (call->channel)) + { + set_status_code (call, STATUS_FROM_WIRE, decode_status (md)); + } + else if (key == grpc_channel_get_message_string (call->channel)) + { + set_status_details (call, STATUS_FROM_WIRE, GRPC_MDSTR_REF (md->value)); + } + else if (key == grpc_channel_get_compression_algorithm_string (call->channel)) + { + set_compression_algorithm (call, decode_compression (md)); + } + else if (key == grpc_channel_get_encodings_accepted_by_peer_string (call->channel)) + { + set_encodings_accepted_by_peer (call, md->value->slice); + } + else + { + dest = &call->buffered_metadata[is_trailing]; + if (dest->count == dest->capacity) + { + dest->capacity = GPR_MAX (dest->capacity + 8, dest->capacity * 2); + dest->metadata = gpr_realloc (dest->metadata, sizeof (grpc_metadata) * dest->capacity); + } + mdusr = &dest->metadata[dest->count++]; + mdusr->key = grpc_mdstr_as_c_string (md->key); + mdusr->value = grpc_mdstr_as_c_string (md->value); + mdusr->value_length = GPR_SLICE_LENGTH (md->value->slice); + if (call->owned_metadata_count == call->owned_metadata_capacity) + { + call->owned_metadata_capacity = GPR_MAX (call->owned_metadata_capacity + 8, call->owned_metadata_capacity * 2); + call->owned_metadata = gpr_realloc (call->owned_metadata, sizeof (grpc_mdelem *) * call->owned_metadata_capacity); + } + call->owned_metadata[call->owned_metadata_count++] = md; + l->md = 0; + } + } + if (gpr_time_cmp (md->deadline, gpr_inf_future (md->deadline.clock_type)) != 0 && !call->is_client) + { + set_deadline_alarm (call, md->deadline, closure_list); + } + if (!is_trailing) + { + call->read_state = READ_STATE_GOT_INITIAL_METADATA; + } + + grpc_mdctx_lock (mdctx); + for (l = md->list.head; l; l = l->next) + { + if (l->md) + GRPC_MDCTX_LOCKED_MDELEM_UNREF (mdctx, l->md); + } + for (l = md->garbage.head; l; l = l->next) + { + GRPC_MDCTX_LOCKED_MDELEM_UNREF (mdctx, l->md); + } + grpc_mdctx_unlock (mdctx); } -grpc_call_stack *grpc_call_get_call_stack(grpc_call *call) { - return CALL_STACK_FROM_CALL(call); +grpc_call_stack * +grpc_call_get_call_stack (grpc_call * call) +{ + return CALL_STACK_FROM_CALL (call); } /* * BATCH API IMPLEMENTATION */ -static void set_status_value_directly(grpc_status_code status, void *dest) { - *(grpc_status_code *)dest = status; +static void +set_status_value_directly (grpc_status_code status, void *dest) +{ + *(grpc_status_code *) dest = status; } -static void set_cancelled_value(grpc_status_code status, void *dest) { - *(grpc_status_code *)dest = (status != GRPC_STATUS_OK); +static void +set_cancelled_value (grpc_status_code status, void *dest) +{ + *(grpc_status_code *) dest = (status != GRPC_STATUS_OK); } -static void finish_batch(grpc_call *call, int success, void *tag, - grpc_closure_list *closure_list) { - grpc_cq_end_op(call->cq, tag, success, done_completion, call, - allocate_completion(call), closure_list); +static void +finish_batch (grpc_call * call, int success, void *tag, grpc_closure_list * closure_list) +{ + grpc_cq_end_op (call->cq, tag, success, done_completion, call, allocate_completion (call), closure_list); } -static void finish_batch_with_close(grpc_call *call, int success, void *tag, - grpc_closure_list *closure_list) { - grpc_cq_end_op(call->cq, tag, 1, done_completion, call, - allocate_completion(call), closure_list); +static void +finish_batch_with_close (grpc_call * call, int success, void *tag, grpc_closure_list * closure_list) +{ + grpc_cq_end_op (call->cq, tag, 1, done_completion, call, allocate_completion (call), closure_list); } -static int are_write_flags_valid(gpr_uint32 flags) { +static int +are_write_flags_valid (gpr_uint32 flags) +{ /* check that only bits in GRPC_WRITE_(INTERNAL?)_USED_MASK are set */ - const gpr_uint32 allowed_write_positions = - (GRPC_WRITE_USED_MASK | GRPC_WRITE_INTERNAL_USED_MASK); + const gpr_uint32 allowed_write_positions = (GRPC_WRITE_USED_MASK | GRPC_WRITE_INTERNAL_USED_MASK); const gpr_uint32 invalid_positions = ~allowed_write_positions; return !(flags & invalid_positions); } -grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, - size_t nops, void *tag, void *reserved) { +grpc_call_error +grpc_call_start_batch (grpc_call * call, const grpc_op * ops, size_t nops, void *tag, void *reserved) +{ grpc_ioreq reqs[GRPC_IOREQ_OP_COUNT]; size_t in; size_t out; const grpc_op *op; grpc_ioreq *req; - void (*finish_func)(grpc_call *, int, void *, grpc_closure_list *) = - finish_batch; + void (*finish_func) (grpc_call *, int, void *, grpc_closure_list *) = finish_batch; grpc_call_error error; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - if (reserved != NULL) { - error = GRPC_CALL_ERROR; - goto done; - } + if (reserved != NULL) + { + error = GRPC_CALL_ERROR; + goto done; + } - GRPC_CALL_LOG_BATCH(GPR_INFO, call, ops, nops, tag); + GRPC_CALL_LOG_BATCH (GPR_INFO, call, ops, nops, tag); - if (nops == 0) { - grpc_cq_begin_op(call->cq); - GRPC_CALL_INTERNAL_REF(call, "completion"); - grpc_cq_end_op(call->cq, tag, 1, done_completion, call, - allocate_completion(call), &closure_list); - error = GRPC_CALL_OK; - goto done; - } + if (nops == 0) + { + grpc_cq_begin_op (call->cq); + GRPC_CALL_INTERNAL_REF (call, "completion"); + grpc_cq_end_op (call->cq, tag, 1, done_completion, call, allocate_completion (call), &closure_list); + error = GRPC_CALL_OK; + goto done; + } /* rewrite batch ops into ioreq ops */ - for (in = 0, out = 0; in < nops; in++) { - op = &ops[in]; - if (op->reserved != NULL) { - error = GRPC_CALL_ERROR; - goto done; + for (in = 0, out = 0; in < nops; in++) + { + op = &ops[in]; + if (op->reserved != NULL) + { + error = GRPC_CALL_ERROR; + goto done; + } + switch (op->op) + { + case GRPC_OP_SEND_INITIAL_METADATA: + /* Flag validation: currently allow no flags */ + if (op->flags != 0) + { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) + { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_SEND_INITIAL_METADATA; + req->data.send_metadata.count = op->data.send_initial_metadata.count; + req->data.send_metadata.metadata = op->data.send_initial_metadata.metadata; + req->flags = op->flags; + break; + case GRPC_OP_SEND_MESSAGE: + if (!are_write_flags_valid (op->flags)) + { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + if (op->data.send_message == NULL) + { + error = GRPC_CALL_ERROR_INVALID_MESSAGE; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) + { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_SEND_MESSAGE; + req->data.send_message = op->data.send_message; + req->flags = op->flags; + break; + case GRPC_OP_SEND_CLOSE_FROM_CLIENT: + /* Flag validation: currently allow no flags */ + if (op->flags != 0) + { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + if (!call->is_client) + { + error = GRPC_CALL_ERROR_NOT_ON_SERVER; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) + { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_SEND_CLOSE; + req->flags = op->flags; + break; + case GRPC_OP_SEND_STATUS_FROM_SERVER: + /* Flag validation: currently allow no flags */ + if (op->flags != 0) + { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + if (call->is_client) + { + error = GRPC_CALL_ERROR_NOT_ON_CLIENT; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) + { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_SEND_TRAILING_METADATA; + req->flags = op->flags; + req->data.send_metadata.count = op->data.send_status_from_server.trailing_metadata_count; + req->data.send_metadata.metadata = op->data.send_status_from_server.trailing_metadata; + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) + { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_SEND_STATUS; + req->data.send_status.code = op->data.send_status_from_server.status; + req->data.send_status.details = op->data.send_status_from_server.status_details != NULL ? grpc_mdstr_from_string (call->metadata_context, op->data.send_status_from_server.status_details, 0) : NULL; + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) + { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_SEND_CLOSE; + break; + case GRPC_OP_RECV_INITIAL_METADATA: + /* Flag validation: currently allow no flags */ + if (op->flags != 0) + { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + if (!call->is_client) + { + error = GRPC_CALL_ERROR_NOT_ON_SERVER; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) + { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_INITIAL_METADATA; + req->data.recv_metadata = op->data.recv_initial_metadata; + req->data.recv_metadata->count = 0; + req->flags = op->flags; + break; + case GRPC_OP_RECV_MESSAGE: + /* Flag validation: currently allow no flags */ + if (op->flags != 0) + { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) + { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_MESSAGE; + req->data.recv_message = op->data.recv_message; + req->flags = op->flags; + break; + case GRPC_OP_RECV_STATUS_ON_CLIENT: + /* Flag validation: currently allow no flags */ + if (op->flags != 0) + { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + if (!call->is_client) + { + error = GRPC_CALL_ERROR_NOT_ON_SERVER; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) + { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_STATUS; + req->flags = op->flags; + req->data.recv_status.set_value = set_status_value_directly; + req->data.recv_status.user_data = op->data.recv_status_on_client.status; + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) + { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_STATUS_DETAILS; + req->data.recv_status_details.details = op->data.recv_status_on_client.status_details; + req->data.recv_status_details.details_capacity = op->data.recv_status_on_client.status_details_capacity; + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) + { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_TRAILING_METADATA; + req->data.recv_metadata = op->data.recv_status_on_client.trailing_metadata; + req->data.recv_metadata->count = 0; + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) + { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_CLOSE; + finish_func = finish_batch_with_close; + break; + case GRPC_OP_RECV_CLOSE_ON_SERVER: + /* Flag validation: currently allow no flags */ + if (op->flags != 0) + { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) + { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_STATUS; + req->flags = op->flags; + req->data.recv_status.set_value = set_cancelled_value; + req->data.recv_status.user_data = op->data.recv_close_on_server.cancelled; + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) + { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_CLOSE; + finish_func = finish_batch_with_close; + break; + } } - switch (op->op) { - case GRPC_OP_SEND_INITIAL_METADATA: - /* Flag validation: currently allow no flags */ - if (op->flags != 0) { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_SEND_INITIAL_METADATA; - req->data.send_metadata.count = op->data.send_initial_metadata.count; - req->data.send_metadata.metadata = - op->data.send_initial_metadata.metadata; - req->flags = op->flags; - break; - case GRPC_OP_SEND_MESSAGE: - if (!are_write_flags_valid(op->flags)) { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - if (op->data.send_message == NULL) { - error = GRPC_CALL_ERROR_INVALID_MESSAGE; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_SEND_MESSAGE; - req->data.send_message = op->data.send_message; - req->flags = op->flags; - break; - case GRPC_OP_SEND_CLOSE_FROM_CLIENT: - /* Flag validation: currently allow no flags */ - if (op->flags != 0) { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - if (!call->is_client) { - error = GRPC_CALL_ERROR_NOT_ON_SERVER; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_SEND_CLOSE; - req->flags = op->flags; - break; - case GRPC_OP_SEND_STATUS_FROM_SERVER: - /* Flag validation: currently allow no flags */ - if (op->flags != 0) { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - if (call->is_client) { - error = GRPC_CALL_ERROR_NOT_ON_CLIENT; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_SEND_TRAILING_METADATA; - req->flags = op->flags; - req->data.send_metadata.count = - op->data.send_status_from_server.trailing_metadata_count; - req->data.send_metadata.metadata = - op->data.send_status_from_server.trailing_metadata; - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_SEND_STATUS; - req->data.send_status.code = op->data.send_status_from_server.status; - req->data.send_status.details = - op->data.send_status_from_server.status_details != NULL - ? grpc_mdstr_from_string( - call->metadata_context, - op->data.send_status_from_server.status_details, 0) - : NULL; - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_SEND_CLOSE; - break; - case GRPC_OP_RECV_INITIAL_METADATA: - /* Flag validation: currently allow no flags */ - if (op->flags != 0) { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - if (!call->is_client) { - error = GRPC_CALL_ERROR_NOT_ON_SERVER; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_INITIAL_METADATA; - req->data.recv_metadata = op->data.recv_initial_metadata; - req->data.recv_metadata->count = 0; - req->flags = op->flags; - break; - case GRPC_OP_RECV_MESSAGE: - /* Flag validation: currently allow no flags */ - if (op->flags != 0) { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_MESSAGE; - req->data.recv_message = op->data.recv_message; - req->flags = op->flags; - break; - case GRPC_OP_RECV_STATUS_ON_CLIENT: - /* Flag validation: currently allow no flags */ - if (op->flags != 0) { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - if (!call->is_client) { - error = GRPC_CALL_ERROR_NOT_ON_SERVER; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_STATUS; - req->flags = op->flags; - req->data.recv_status.set_value = set_status_value_directly; - req->data.recv_status.user_data = op->data.recv_status_on_client.status; - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_STATUS_DETAILS; - req->data.recv_status_details.details = - op->data.recv_status_on_client.status_details; - req->data.recv_status_details.details_capacity = - op->data.recv_status_on_client.status_details_capacity; - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_TRAILING_METADATA; - req->data.recv_metadata = - op->data.recv_status_on_client.trailing_metadata; - req->data.recv_metadata->count = 0; - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_CLOSE; - finish_func = finish_batch_with_close; - break; - case GRPC_OP_RECV_CLOSE_ON_SERVER: - /* Flag validation: currently allow no flags */ - if (op->flags != 0) { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_STATUS; - req->flags = op->flags; - req->data.recv_status.set_value = set_cancelled_value; - req->data.recv_status.user_data = - op->data.recv_close_on_server.cancelled; - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_CLOSE; - finish_func = finish_batch_with_close; - break; - } - } - - GRPC_CALL_INTERNAL_REF(call, "completion"); - grpc_cq_begin_op(call->cq); - - error = grpc_call_start_ioreq_and_call_back(call, reqs, out, finish_func, tag, - &closure_list); + + GRPC_CALL_INTERNAL_REF (call, "completion"); + grpc_cq_begin_op (call->cq); + + error = grpc_call_start_ioreq_and_call_back (call, reqs, out, finish_func, tag, &closure_list); done: - grpc_closure_list_run(&closure_list); + grpc_closure_list_run (&closure_list); return error; } -void grpc_call_context_set(grpc_call *call, grpc_context_index elem, - void *value, void (*destroy)(void *value)) { - if (call->context[elem].destroy) { - call->context[elem].destroy(call->context[elem].value); - } +void +grpc_call_context_set (grpc_call * call, grpc_context_index elem, void *value, void (*destroy) (void *value)) +{ + if (call->context[elem].destroy) + { + call->context[elem].destroy (call->context[elem].value); + } call->context[elem].value = value; call->context[elem].destroy = destroy; } -void *grpc_call_context_get(grpc_call *call, grpc_context_index elem) { +void * +grpc_call_context_get (grpc_call * call, grpc_context_index elem) +{ return call->context[elem].value; } -gpr_uint8 grpc_call_is_client(grpc_call *call) { return call->is_client; } +gpr_uint8 +grpc_call_is_client (grpc_call * call) +{ + return call->is_client; +} diff --git a/src/core/surface/call.h b/src/core/surface/call.h index 4476ab915be..a859fbf2182 100644 --- a/src/core/surface/call.h +++ b/src/core/surface/call.h @@ -39,120 +39,104 @@ #include #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif /* Primitive operation types - grpc_op's get rewritten into these */ -typedef enum { - GRPC_IOREQ_RECV_INITIAL_METADATA, - GRPC_IOREQ_RECV_MESSAGE, - GRPC_IOREQ_RECV_TRAILING_METADATA, - GRPC_IOREQ_RECV_STATUS, - GRPC_IOREQ_RECV_STATUS_DETAILS, - GRPC_IOREQ_RECV_CLOSE, - GRPC_IOREQ_SEND_INITIAL_METADATA, - GRPC_IOREQ_SEND_MESSAGE, - GRPC_IOREQ_SEND_TRAILING_METADATA, - GRPC_IOREQ_SEND_STATUS, - GRPC_IOREQ_SEND_CLOSE, - GRPC_IOREQ_OP_COUNT -} grpc_ioreq_op; - -typedef union { - grpc_metadata_array *recv_metadata; - grpc_byte_buffer **recv_message; - struct { - void (*set_value)(grpc_status_code status, void *user_data); - void *user_data; - } recv_status; - struct { - char **details; - size_t *details_capacity; - } recv_status_details; - struct { - size_t count; - grpc_metadata *metadata; - } send_metadata; - grpc_byte_buffer *send_message; - struct { - grpc_status_code code; - grpc_mdstr *details; - } send_status; -} grpc_ioreq_data; - -typedef struct { - grpc_ioreq_op op; - gpr_uint32 flags; /**< A copy of the write flags from grpc_op */ - grpc_ioreq_data data; -} grpc_ioreq; - -typedef void (*grpc_ioreq_completion_func)(grpc_call *call, int success, - void *user_data, - grpc_closure_list *closure_list); - -grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, - gpr_uint32 propagation_mask, - grpc_completion_queue *cq, - const void *server_transport_data, - grpc_mdelem **add_initial_metadata, - size_t add_initial_metadata_count, - gpr_timespec send_deadline); - -void grpc_call_set_completion_queue(grpc_call *call, grpc_completion_queue *cq, - grpc_closure_list *closure_list); -grpc_completion_queue *grpc_call_get_completion_queue(grpc_call *call); + typedef enum + { + GRPC_IOREQ_RECV_INITIAL_METADATA, + GRPC_IOREQ_RECV_MESSAGE, + GRPC_IOREQ_RECV_TRAILING_METADATA, + GRPC_IOREQ_RECV_STATUS, + GRPC_IOREQ_RECV_STATUS_DETAILS, + GRPC_IOREQ_RECV_CLOSE, + GRPC_IOREQ_SEND_INITIAL_METADATA, + GRPC_IOREQ_SEND_MESSAGE, + GRPC_IOREQ_SEND_TRAILING_METADATA, + GRPC_IOREQ_SEND_STATUS, + GRPC_IOREQ_SEND_CLOSE, + GRPC_IOREQ_OP_COUNT + } grpc_ioreq_op; + + typedef union + { + grpc_metadata_array *recv_metadata; + grpc_byte_buffer **recv_message; + struct + { + void (*set_value) (grpc_status_code status, void *user_data); + void *user_data; + } recv_status; + struct + { + char **details; + size_t *details_capacity; + } recv_status_details; + struct + { + size_t count; + grpc_metadata *metadata; + } send_metadata; + grpc_byte_buffer *send_message; + struct + { + grpc_status_code code; + grpc_mdstr *details; + } send_status; + } grpc_ioreq_data; + + typedef struct + { + grpc_ioreq_op op; + gpr_uint32 flags; + /**< A copy of the write flags from grpc_op */ + grpc_ioreq_data data; + } grpc_ioreq; + + typedef void (*grpc_ioreq_completion_func) (grpc_call * call, int success, void *user_data, grpc_closure_list * closure_list); + + grpc_call *grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 propagation_mask, grpc_completion_queue * cq, const void *server_transport_data, grpc_mdelem ** add_initial_metadata, size_t add_initial_metadata_count, gpr_timespec send_deadline); + + void grpc_call_set_completion_queue (grpc_call * call, grpc_completion_queue * cq, grpc_closure_list * closure_list); + grpc_completion_queue *grpc_call_get_completion_queue (grpc_call * call); #ifdef GRPC_CALL_REF_COUNT_DEBUG -void grpc_call_internal_ref(grpc_call *call, const char *reason); -void grpc_call_internal_unref(grpc_call *call, const char *reason, - grpc_closure_list *closure_list); + void grpc_call_internal_ref (grpc_call * call, const char *reason); + void grpc_call_internal_unref (grpc_call * call, const char *reason, grpc_closure_list * closure_list); #define GRPC_CALL_INTERNAL_REF(call, reason) \ grpc_call_internal_ref(call, reason) #define GRPC_CALL_INTERNAL_UNREF(call, reason, closure_list) \ grpc_call_internal_unref(call, reason, closure_list) #else -void grpc_call_internal_ref(grpc_call *call); -void grpc_call_internal_unref(grpc_call *call, grpc_closure_list *closure_list); + void grpc_call_internal_ref (grpc_call * call); + void grpc_call_internal_unref (grpc_call * call, grpc_closure_list * closure_list); #define GRPC_CALL_INTERNAL_REF(call, reason) grpc_call_internal_ref(call) #define GRPC_CALL_INTERNAL_UNREF(call, reason, closure_list) \ grpc_call_internal_unref(call, closure_list) #endif -grpc_call_error grpc_call_start_ioreq_and_call_back( - grpc_call *call, const grpc_ioreq *reqs, size_t nreqs, - grpc_ioreq_completion_func on_complete, void *user_data, - grpc_closure_list *closure_list); + grpc_call_error grpc_call_start_ioreq_and_call_back (grpc_call * call, const grpc_ioreq * reqs, size_t nreqs, grpc_ioreq_completion_func on_complete, void *user_data, grpc_closure_list * closure_list); -grpc_call_stack *grpc_call_get_call_stack(grpc_call *call); + grpc_call_stack *grpc_call_get_call_stack (grpc_call * call); /* Given the top call_element, get the call object. */ -grpc_call *grpc_call_from_top_element(grpc_call_element *surface_element); + grpc_call *grpc_call_from_top_element (grpc_call_element * surface_element); -extern int grpc_trace_batch; + extern int grpc_trace_batch; -void grpc_call_log_batch(char *file, int line, gpr_log_severity severity, - grpc_call *call, const grpc_op *ops, size_t nops, - void *tag); + void grpc_call_log_batch (char *file, int line, gpr_log_severity severity, grpc_call * call, const grpc_op * ops, size_t nops, void *tag); -void grpc_server_log_request_call(char *file, int line, - gpr_log_severity severity, - grpc_server *server, grpc_call **call, - grpc_call_details *details, - grpc_metadata_array *initial_metadata, - grpc_completion_queue *cq_bound_to_call, - grpc_completion_queue *cq_for_notification, - void *tag); + void grpc_server_log_request_call (char *file, int line, gpr_log_severity severity, grpc_server * server, grpc_call ** call, grpc_call_details * details, grpc_metadata_array * initial_metadata, grpc_completion_queue * cq_bound_to_call, grpc_completion_queue * cq_for_notification, void *tag); -void grpc_server_log_shutdown(char *file, int line, gpr_log_severity severity, - grpc_server *server, grpc_completion_queue *cq, - void *tag); + void grpc_server_log_shutdown (char *file, int line, gpr_log_severity severity, grpc_server * server, grpc_completion_queue * cq, void *tag); /* Set a context pointer. No thread safety guarantees are made wrt this value. */ -void grpc_call_context_set(grpc_call *call, grpc_context_index elem, - void *value, void (*destroy)(void *value)); + void grpc_call_context_set (grpc_call * call, grpc_context_index elem, void *value, void (*destroy) (void *value)); /* Get a context pointer. */ -void *grpc_call_context_get(grpc_call *call, grpc_context_index elem); + void *grpc_call_context_get (grpc_call * call, grpc_context_index elem); #define GRPC_CALL_LOG_BATCH(sev, call, ops, nops, tag) \ if (grpc_trace_batch) grpc_call_log_batch(sev, call, ops, nops, tag) @@ -167,21 +151,20 @@ void *grpc_call_context_get(grpc_call *call, grpc_context_index elem); #define GRPC_SERVER_LOG_SHUTDOWN(sev, server, cq, tag) \ if (grpc_trace_batch) grpc_server_log_shutdown(sev, server, cq, tag) -gpr_uint8 grpc_call_is_client(grpc_call *call); + gpr_uint8 grpc_call_is_client (grpc_call * call); -grpc_compression_algorithm grpc_call_get_compression_algorithm( - const grpc_call *call); + grpc_compression_algorithm grpc_call_get_compression_algorithm (const grpc_call * call); -gpr_uint32 grpc_call_get_message_flags(const grpc_call *call); + gpr_uint32 grpc_call_get_message_flags (const grpc_call * call); /** Returns a bitset for the encodings (compression algorithms) supported by \a * call's peer. * * To be indexed by grpc_compression_algorithm enum values. */ -gpr_uint32 grpc_call_get_encodings_accepted_by_peer(grpc_call *call); + gpr_uint32 grpc_call_get_encodings_accepted_by_peer (grpc_call * call); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_SURFACE_CALL_H */ +#endif /* GRPC_INTERNAL_CORE_SURFACE_CALL_H */ diff --git a/src/core/surface/call_details.c b/src/core/surface/call_details.c index 67862d7afe1..ac9ba7ebe20 100644 --- a/src/core/surface/call_details.c +++ b/src/core/surface/call_details.c @@ -36,11 +36,15 @@ #include -void grpc_call_details_init(grpc_call_details *cd) { - memset(cd, 0, sizeof(*cd)); +void +grpc_call_details_init (grpc_call_details * cd) +{ + memset (cd, 0, sizeof (*cd)); } -void grpc_call_details_destroy(grpc_call_details *cd) { - gpr_free(cd->method); - gpr_free(cd->host); +void +grpc_call_details_destroy (grpc_call_details * cd) +{ + gpr_free (cd->method); + gpr_free (cd->host); } diff --git a/src/core/surface/call_log_batch.c b/src/core/surface/call_log_batch.c index 5a3ef1e5f4b..3b0f922cdab 100644 --- a/src/core/surface/call_log_batch.c +++ b/src/core/surface/call_log_batch.c @@ -39,109 +39,91 @@ int grpc_trace_batch = 0; -static void add_metadata(gpr_strvec *b, const grpc_metadata *md, size_t count) { +static void +add_metadata (gpr_strvec * b, const grpc_metadata * md, size_t count) +{ size_t i; - for (i = 0; i < count; i++) { - gpr_strvec_add(b, gpr_strdup("\nkey=")); - gpr_strvec_add(b, gpr_strdup(md[i].key)); + for (i = 0; i < count; i++) + { + gpr_strvec_add (b, gpr_strdup ("\nkey=")); + gpr_strvec_add (b, gpr_strdup (md[i].key)); - gpr_strvec_add(b, gpr_strdup(" value=")); - gpr_strvec_add(b, gpr_dump(md[i].value, md[i].value_length, - GPR_DUMP_HEX | GPR_DUMP_ASCII)); - } + gpr_strvec_add (b, gpr_strdup (" value=")); + gpr_strvec_add (b, gpr_dump (md[i].value, md[i].value_length, GPR_DUMP_HEX | GPR_DUMP_ASCII)); + } } -char *grpc_op_string(const grpc_op *op) { +char * +grpc_op_string (const grpc_op * op) +{ char *tmp; char *out; gpr_strvec b; - gpr_strvec_init(&b); + gpr_strvec_init (&b); - switch (op->op) { + switch (op->op) + { case GRPC_OP_SEND_INITIAL_METADATA: - gpr_strvec_add(&b, gpr_strdup("SEND_INITIAL_METADATA")); - add_metadata(&b, op->data.send_initial_metadata.metadata, - op->data.send_initial_metadata.count); + gpr_strvec_add (&b, gpr_strdup ("SEND_INITIAL_METADATA")); + add_metadata (&b, op->data.send_initial_metadata.metadata, op->data.send_initial_metadata.count); break; case GRPC_OP_SEND_MESSAGE: - gpr_asprintf(&tmp, "SEND_MESSAGE ptr=%p", op->data.send_message); - gpr_strvec_add(&b, tmp); + gpr_asprintf (&tmp, "SEND_MESSAGE ptr=%p", op->data.send_message); + gpr_strvec_add (&b, tmp); break; case GRPC_OP_SEND_CLOSE_FROM_CLIENT: - gpr_strvec_add(&b, gpr_strdup("SEND_CLOSE_FROM_CLIENT")); + gpr_strvec_add (&b, gpr_strdup ("SEND_CLOSE_FROM_CLIENT")); break; case GRPC_OP_SEND_STATUS_FROM_SERVER: - gpr_asprintf(&tmp, "SEND_STATUS_FROM_SERVER status=%d details=%s", - op->data.send_status_from_server.status, - op->data.send_status_from_server.status_details); - gpr_strvec_add(&b, tmp); - add_metadata(&b, op->data.send_status_from_server.trailing_metadata, - op->data.send_status_from_server.trailing_metadata_count); + gpr_asprintf (&tmp, "SEND_STATUS_FROM_SERVER status=%d details=%s", op->data.send_status_from_server.status, op->data.send_status_from_server.status_details); + gpr_strvec_add (&b, tmp); + add_metadata (&b, op->data.send_status_from_server.trailing_metadata, op->data.send_status_from_server.trailing_metadata_count); break; case GRPC_OP_RECV_INITIAL_METADATA: - gpr_asprintf(&tmp, "RECV_INITIAL_METADATA ptr=%p", - op->data.recv_initial_metadata); - gpr_strvec_add(&b, tmp); + gpr_asprintf (&tmp, "RECV_INITIAL_METADATA ptr=%p", op->data.recv_initial_metadata); + gpr_strvec_add (&b, tmp); break; case GRPC_OP_RECV_MESSAGE: - gpr_asprintf(&tmp, "RECV_MESSAGE ptr=%p", op->data.recv_message); - gpr_strvec_add(&b, tmp); + gpr_asprintf (&tmp, "RECV_MESSAGE ptr=%p", op->data.recv_message); + gpr_strvec_add (&b, tmp); break; case GRPC_OP_RECV_STATUS_ON_CLIENT: - gpr_asprintf(&tmp, - "RECV_STATUS_ON_CLIENT metadata=%p status=%p details=%p", - op->data.recv_status_on_client.trailing_metadata, - op->data.recv_status_on_client.status, - op->data.recv_status_on_client.status_details); - gpr_strvec_add(&b, tmp); + gpr_asprintf (&tmp, "RECV_STATUS_ON_CLIENT metadata=%p status=%p details=%p", op->data.recv_status_on_client.trailing_metadata, op->data.recv_status_on_client.status, op->data.recv_status_on_client.status_details); + gpr_strvec_add (&b, tmp); break; case GRPC_OP_RECV_CLOSE_ON_SERVER: - gpr_asprintf(&tmp, "RECV_CLOSE_ON_SERVER cancelled=%p", - op->data.recv_close_on_server.cancelled); - gpr_strvec_add(&b, tmp); - } - out = gpr_strvec_flatten(&b, NULL); - gpr_strvec_destroy(&b); + gpr_asprintf (&tmp, "RECV_CLOSE_ON_SERVER cancelled=%p", op->data.recv_close_on_server.cancelled); + gpr_strvec_add (&b, tmp); + } + out = gpr_strvec_flatten (&b, NULL); + gpr_strvec_destroy (&b); return out; } -void grpc_call_log_batch(char *file, int line, gpr_log_severity severity, - grpc_call *call, const grpc_op *ops, size_t nops, - void *tag) { +void +grpc_call_log_batch (char *file, int line, gpr_log_severity severity, grpc_call * call, const grpc_op * ops, size_t nops, void *tag) +{ char *tmp; size_t i; - gpr_log(file, line, severity, - "grpc_call_start_batch(call=%p, ops=%p, nops=%d, tag=%p)", call, ops, - nops, tag); - for (i = 0; i < nops; i++) { - tmp = grpc_op_string(&ops[i]); - gpr_log(file, line, severity, "ops[%d]: %s", i, tmp); - gpr_free(tmp); - } + gpr_log (file, line, severity, "grpc_call_start_batch(call=%p, ops=%p, nops=%d, tag=%p)", call, ops, nops, tag); + for (i = 0; i < nops; i++) + { + tmp = grpc_op_string (&ops[i]); + gpr_log (file, line, severity, "ops[%d]: %s", i, tmp); + gpr_free (tmp); + } } -void grpc_server_log_request_call(char *file, int line, - gpr_log_severity severity, - grpc_server *server, grpc_call **call, - grpc_call_details *details, - grpc_metadata_array *initial_metadata, - grpc_completion_queue *cq_bound_to_call, - grpc_completion_queue *cq_for_notification, - void *tag) { - gpr_log(file, line, severity, - "grpc_server_request_call(server=%p, call=%p, details=%p, " - "initial_metadata=%p, cq_bound_to_call=%p, cq_for_notification=%p, " - "tag=%p)", - server, call, details, initial_metadata, cq_bound_to_call, - cq_for_notification, tag); +void +grpc_server_log_request_call (char *file, int line, gpr_log_severity severity, grpc_server * server, grpc_call ** call, grpc_call_details * details, grpc_metadata_array * initial_metadata, grpc_completion_queue * cq_bound_to_call, grpc_completion_queue * cq_for_notification, void *tag) +{ + gpr_log (file, line, severity, "grpc_server_request_call(server=%p, call=%p, details=%p, " "initial_metadata=%p, cq_bound_to_call=%p, cq_for_notification=%p, " "tag=%p)", server, call, details, initial_metadata, cq_bound_to_call, cq_for_notification, tag); } -void grpc_server_log_shutdown(char *file, int line, gpr_log_severity severity, - grpc_server *server, grpc_completion_queue *cq, - void *tag) { - gpr_log(file, line, severity, - "grpc_server_shutdown_and_notify(server=%p, cq=%p, tag=%p)", server, - cq, tag); +void +grpc_server_log_shutdown (char *file, int line, gpr_log_severity severity, grpc_server * server, grpc_completion_queue * cq, void *tag) +{ + gpr_log (file, line, severity, "grpc_server_shutdown_and_notify(server=%p, cq=%p, tag=%p)", server, cq, tag); } diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index 1214425e090..440b6494f1e 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -53,13 +53,15 @@ * (OK, Cancelled, Unknown). */ #define NUM_CACHED_STATUS_ELEMS 3 -typedef struct registered_call { +typedef struct registered_call +{ grpc_mdelem *path; grpc_mdelem *authority; struct registered_call *next; } registered_call; -struct grpc_channel { +struct grpc_channel +{ int is_client; gpr_refcount refs; gpr_uint32 max_message_length; @@ -89,284 +91,297 @@ struct grpc_channel { /* the protobuf library will (by default) start warning at 100megs */ #define DEFAULT_MAX_MESSAGE_LENGTH (100 * 1024 * 1024) -grpc_channel *grpc_channel_create_from_filters( - const char *target, const grpc_channel_filter **filters, size_t num_filters, - const grpc_channel_args *args, grpc_mdctx *mdctx, int is_client, - grpc_closure_list *closure_list) { +grpc_channel * +grpc_channel_create_from_filters (const char *target, const grpc_channel_filter ** filters, size_t num_filters, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_client, grpc_closure_list * closure_list) +{ size_t i; - size_t size = - sizeof(grpc_channel) + grpc_channel_stack_size(filters, num_filters); - grpc_channel *channel = gpr_malloc(size); - memset(channel, 0, sizeof(*channel)); - channel->target = gpr_strdup(target); - GPR_ASSERT(grpc_is_initialized() && "call grpc_init()"); + size_t size = sizeof (grpc_channel) + grpc_channel_stack_size (filters, num_filters); + grpc_channel *channel = gpr_malloc (size); + memset (channel, 0, sizeof (*channel)); + channel->target = gpr_strdup (target); + GPR_ASSERT (grpc_is_initialized () && "call grpc_init()"); channel->is_client = is_client; /* decremented by grpc_channel_destroy */ - gpr_ref_init(&channel->refs, 1); + gpr_ref_init (&channel->refs, 1); channel->metadata_context = mdctx; - channel->grpc_status_string = grpc_mdstr_from_string(mdctx, "grpc-status", 0); - channel->grpc_compression_algorithm_string = - grpc_mdstr_from_string(mdctx, "grpc-encoding", 0); - channel->grpc_encodings_accepted_by_peer_string = - grpc_mdstr_from_string(mdctx, "grpc-accept-encoding", 0); - channel->grpc_message_string = - grpc_mdstr_from_string(mdctx, "grpc-message", 0); - for (i = 0; i < NUM_CACHED_STATUS_ELEMS; i++) { - char buf[GPR_LTOA_MIN_BUFSIZE]; - gpr_ltoa((long)i, buf); - channel->grpc_status_elem[i] = grpc_mdelem_from_metadata_strings( - mdctx, GRPC_MDSTR_REF(channel->grpc_status_string), - grpc_mdstr_from_string(mdctx, buf, 0)); - } - channel->path_string = grpc_mdstr_from_string(mdctx, ":path", 0); - channel->authority_string = grpc_mdstr_from_string(mdctx, ":authority", 0); - gpr_mu_init(&channel->registered_call_mu); + channel->grpc_status_string = grpc_mdstr_from_string (mdctx, "grpc-status", 0); + channel->grpc_compression_algorithm_string = grpc_mdstr_from_string (mdctx, "grpc-encoding", 0); + channel->grpc_encodings_accepted_by_peer_string = grpc_mdstr_from_string (mdctx, "grpc-accept-encoding", 0); + channel->grpc_message_string = grpc_mdstr_from_string (mdctx, "grpc-message", 0); + for (i = 0; i < NUM_CACHED_STATUS_ELEMS; i++) + { + char buf[GPR_LTOA_MIN_BUFSIZE]; + gpr_ltoa ((long) i, buf); + channel->grpc_status_elem[i] = grpc_mdelem_from_metadata_strings (mdctx, GRPC_MDSTR_REF (channel->grpc_status_string), grpc_mdstr_from_string (mdctx, buf, 0)); + } + channel->path_string = grpc_mdstr_from_string (mdctx, ":path", 0); + channel->authority_string = grpc_mdstr_from_string (mdctx, ":authority", 0); + gpr_mu_init (&channel->registered_call_mu); channel->registered_calls = NULL; channel->max_message_length = DEFAULT_MAX_MESSAGE_LENGTH; - if (args) { - for (i = 0; i < args->num_args; i++) { - if (0 == strcmp(args->args[i].key, GRPC_ARG_MAX_MESSAGE_LENGTH)) { - if (args->args[i].type != GRPC_ARG_INTEGER) { - gpr_log(GPR_ERROR, "%s ignored: it must be an integer", - GRPC_ARG_MAX_MESSAGE_LENGTH); - } else if (args->args[i].value.integer < 0) { - gpr_log(GPR_ERROR, "%s ignored: it must be >= 0", - GRPC_ARG_MAX_MESSAGE_LENGTH); - } else { - channel->max_message_length = (gpr_uint32)args->args[i].value.integer; - } - } else if (0 == strcmp(args->args[i].key, GRPC_ARG_DEFAULT_AUTHORITY)) { - if (args->args[i].type != GRPC_ARG_STRING) { - gpr_log(GPR_ERROR, "%s: must be an string", - GRPC_ARG_DEFAULT_AUTHORITY); - } else { - if (channel->default_authority) { - /* setting this takes precedence over anything else */ - GRPC_MDELEM_UNREF(channel->default_authority); - } - channel->default_authority = grpc_mdelem_from_strings( - mdctx, ":authority", args->args[i].value.string); - } - } else if (0 == - strcmp(args->args[i].key, GRPC_SSL_TARGET_NAME_OVERRIDE_ARG)) { - if (args->args[i].type != GRPC_ARG_STRING) { - gpr_log(GPR_ERROR, "%s: must be an string", - GRPC_SSL_TARGET_NAME_OVERRIDE_ARG); - } else { - if (channel->default_authority) { - /* other ways of setting this (notably ssl) take precedence */ - gpr_log(GPR_ERROR, "%s: default host already set some other way", - GRPC_ARG_DEFAULT_AUTHORITY); - } else { - channel->default_authority = grpc_mdelem_from_strings( - mdctx, ":authority", args->args[i].value.string); - } - } - } + if (args) + { + for (i = 0; i < args->num_args; i++) + { + if (0 == strcmp (args->args[i].key, GRPC_ARG_MAX_MESSAGE_LENGTH)) + { + if (args->args[i].type != GRPC_ARG_INTEGER) + { + gpr_log (GPR_ERROR, "%s ignored: it must be an integer", GRPC_ARG_MAX_MESSAGE_LENGTH); + } + else if (args->args[i].value.integer < 0) + { + gpr_log (GPR_ERROR, "%s ignored: it must be >= 0", GRPC_ARG_MAX_MESSAGE_LENGTH); + } + else + { + channel->max_message_length = (gpr_uint32) args->args[i].value.integer; + } + } + else if (0 == strcmp (args->args[i].key, GRPC_ARG_DEFAULT_AUTHORITY)) + { + if (args->args[i].type != GRPC_ARG_STRING) + { + gpr_log (GPR_ERROR, "%s: must be an string", GRPC_ARG_DEFAULT_AUTHORITY); + } + else + { + if (channel->default_authority) + { + /* setting this takes precedence over anything else */ + GRPC_MDELEM_UNREF (channel->default_authority); + } + channel->default_authority = grpc_mdelem_from_strings (mdctx, ":authority", args->args[i].value.string); + } + } + else if (0 == strcmp (args->args[i].key, GRPC_SSL_TARGET_NAME_OVERRIDE_ARG)) + { + if (args->args[i].type != GRPC_ARG_STRING) + { + gpr_log (GPR_ERROR, "%s: must be an string", GRPC_SSL_TARGET_NAME_OVERRIDE_ARG); + } + else + { + if (channel->default_authority) + { + /* other ways of setting this (notably ssl) take precedence */ + gpr_log (GPR_ERROR, "%s: default host already set some other way", GRPC_ARG_DEFAULT_AUTHORITY); + } + else + { + channel->default_authority = grpc_mdelem_from_strings (mdctx, ":authority", args->args[i].value.string); + } + } + } + } } - } - - if (channel->is_client && channel->default_authority == NULL && - target != NULL) { - char *default_authority = grpc_get_default_authority(target); - if (default_authority) { - channel->default_authority = grpc_mdelem_from_strings( - channel->metadata_context, ":authority", default_authority); + + if (channel->is_client && channel->default_authority == NULL && target != NULL) + { + char *default_authority = grpc_get_default_authority (target); + if (default_authority) + { + channel->default_authority = grpc_mdelem_from_strings (channel->metadata_context, ":authority", default_authority); + } + gpr_free (default_authority); } - gpr_free(default_authority); - } - grpc_channel_stack_init(filters, num_filters, channel, args, - channel->metadata_context, - CHANNEL_STACK_FROM_CHANNEL(channel), closure_list); + grpc_channel_stack_init (filters, num_filters, channel, args, channel->metadata_context, CHANNEL_STACK_FROM_CHANNEL (channel), closure_list); return channel; } -char *grpc_channel_get_target(grpc_channel *channel) { - return gpr_strdup(channel->target); +char * +grpc_channel_get_target (grpc_channel * channel) +{ + return gpr_strdup (channel->target); } -static grpc_call *grpc_channel_create_call_internal( - grpc_channel *channel, grpc_call *parent_call, gpr_uint32 propagation_mask, - grpc_completion_queue *cq, grpc_mdelem *path_mdelem, - grpc_mdelem *authority_mdelem, gpr_timespec deadline) { +static grpc_call * +grpc_channel_create_call_internal (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 propagation_mask, grpc_completion_queue * cq, grpc_mdelem * path_mdelem, grpc_mdelem * authority_mdelem, gpr_timespec deadline) +{ grpc_mdelem *send_metadata[2]; size_t num_metadata = 0; - GPR_ASSERT(channel->is_client); + GPR_ASSERT (channel->is_client); send_metadata[num_metadata++] = path_mdelem; - if (authority_mdelem != NULL) { - send_metadata[num_metadata++] = authority_mdelem; - } else if (channel->default_authority != NULL) { - send_metadata[num_metadata++] = GRPC_MDELEM_REF(channel->default_authority); - } - - return grpc_call_create(channel, parent_call, propagation_mask, cq, NULL, - send_metadata, num_metadata, deadline); + if (authority_mdelem != NULL) + { + send_metadata[num_metadata++] = authority_mdelem; + } + else if (channel->default_authority != NULL) + { + send_metadata[num_metadata++] = GRPC_MDELEM_REF (channel->default_authority); + } + + return grpc_call_create (channel, parent_call, propagation_mask, cq, NULL, send_metadata, num_metadata, deadline); } -grpc_call *grpc_channel_create_call(grpc_channel *channel, - grpc_call *parent_call, - gpr_uint32 propagation_mask, - grpc_completion_queue *cq, - const char *method, const char *host, - gpr_timespec deadline, void *reserved) { - GPR_ASSERT(!reserved); - return grpc_channel_create_call_internal( - channel, parent_call, propagation_mask, cq, - grpc_mdelem_from_metadata_strings( - channel->metadata_context, GRPC_MDSTR_REF(channel->path_string), - grpc_mdstr_from_string(channel->metadata_context, method, 0)), - host ? grpc_mdelem_from_metadata_strings( - channel->metadata_context, - GRPC_MDSTR_REF(channel->authority_string), - grpc_mdstr_from_string(channel->metadata_context, host, 0)) - : NULL, - deadline); +grpc_call * +grpc_channel_create_call (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 propagation_mask, grpc_completion_queue * cq, const char *method, const char *host, gpr_timespec deadline, void *reserved) +{ + GPR_ASSERT (!reserved); + return grpc_channel_create_call_internal (channel, parent_call, propagation_mask, cq, grpc_mdelem_from_metadata_strings (channel->metadata_context, GRPC_MDSTR_REF (channel->path_string), grpc_mdstr_from_string (channel->metadata_context, method, 0)), host ? grpc_mdelem_from_metadata_strings (channel->metadata_context, GRPC_MDSTR_REF (channel->authority_string), grpc_mdstr_from_string (channel->metadata_context, host, 0)) : NULL, deadline); } -void *grpc_channel_register_call(grpc_channel *channel, const char *method, - const char *host, void *reserved) { - registered_call *rc = gpr_malloc(sizeof(registered_call)); - GPR_ASSERT(!reserved); - rc->path = grpc_mdelem_from_metadata_strings( - channel->metadata_context, GRPC_MDSTR_REF(channel->path_string), - grpc_mdstr_from_string(channel->metadata_context, method, 0)); - rc->authority = - host ? grpc_mdelem_from_metadata_strings( - channel->metadata_context, - GRPC_MDSTR_REF(channel->authority_string), - grpc_mdstr_from_string(channel->metadata_context, host, 0)) - : NULL; - gpr_mu_lock(&channel->registered_call_mu); +void * +grpc_channel_register_call (grpc_channel * channel, const char *method, const char *host, void *reserved) +{ + registered_call *rc = gpr_malloc (sizeof (registered_call)); + GPR_ASSERT (!reserved); + rc->path = grpc_mdelem_from_metadata_strings (channel->metadata_context, GRPC_MDSTR_REF (channel->path_string), grpc_mdstr_from_string (channel->metadata_context, method, 0)); + rc->authority = host ? grpc_mdelem_from_metadata_strings (channel->metadata_context, GRPC_MDSTR_REF (channel->authority_string), grpc_mdstr_from_string (channel->metadata_context, host, 0)) : NULL; + gpr_mu_lock (&channel->registered_call_mu); rc->next = channel->registered_calls; channel->registered_calls = rc; - gpr_mu_unlock(&channel->registered_call_mu); + gpr_mu_unlock (&channel->registered_call_mu); return rc; } -grpc_call *grpc_channel_create_registered_call( - grpc_channel *channel, grpc_call *parent_call, gpr_uint32 propagation_mask, - grpc_completion_queue *completion_queue, void *registered_call_handle, - gpr_timespec deadline, void *reserved) { +grpc_call * +grpc_channel_create_registered_call (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 propagation_mask, grpc_completion_queue * completion_queue, void *registered_call_handle, gpr_timespec deadline, void *reserved) +{ registered_call *rc = registered_call_handle; - GPR_ASSERT(!reserved); - return grpc_channel_create_call_internal( - channel, parent_call, propagation_mask, completion_queue, - GRPC_MDELEM_REF(rc->path), - rc->authority ? GRPC_MDELEM_REF(rc->authority) : NULL, deadline); + GPR_ASSERT (!reserved); + return grpc_channel_create_call_internal (channel, parent_call, propagation_mask, completion_queue, GRPC_MDELEM_REF (rc->path), rc->authority ? GRPC_MDELEM_REF (rc->authority) : NULL, deadline); } #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG -void grpc_channel_internal_ref(grpc_channel *c, const char *reason) { - gpr_log(GPR_DEBUG, "CHANNEL: ref %p %d -> %d [%s]", c, c->refs.count, - c->refs.count + 1, reason); +void +grpc_channel_internal_ref (grpc_channel * c, const char *reason) +{ + gpr_log (GPR_DEBUG, "CHANNEL: ref %p %d -> %d [%s]", c, c->refs.count, c->refs.count + 1, reason); #else -void grpc_channel_internal_ref(grpc_channel *c) { +void +grpc_channel_internal_ref (grpc_channel * c) +{ #endif - gpr_ref(&c->refs); + gpr_ref (&c->refs); } -static void destroy_channel(grpc_channel *channel, - grpc_closure_list *closure_list) { +static void +destroy_channel (grpc_channel * channel, grpc_closure_list * closure_list) +{ size_t i; - grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CHANNEL(channel), closure_list); - for (i = 0; i < NUM_CACHED_STATUS_ELEMS; i++) { - GRPC_MDELEM_UNREF(channel->grpc_status_elem[i]); - } - GRPC_MDSTR_UNREF(channel->grpc_status_string); - GRPC_MDSTR_UNREF(channel->grpc_compression_algorithm_string); - GRPC_MDSTR_UNREF(channel->grpc_encodings_accepted_by_peer_string); - GRPC_MDSTR_UNREF(channel->grpc_message_string); - GRPC_MDSTR_UNREF(channel->path_string); - GRPC_MDSTR_UNREF(channel->authority_string); - while (channel->registered_calls) { - registered_call *rc = channel->registered_calls; - channel->registered_calls = rc->next; - GRPC_MDELEM_UNREF(rc->path); - if (rc->authority) { - GRPC_MDELEM_UNREF(rc->authority); + grpc_channel_stack_destroy (CHANNEL_STACK_FROM_CHANNEL (channel), closure_list); + for (i = 0; i < NUM_CACHED_STATUS_ELEMS; i++) + { + GRPC_MDELEM_UNREF (channel->grpc_status_elem[i]); } - gpr_free(rc); - } - if (channel->default_authority != NULL) { - GRPC_MDELEM_UNREF(channel->default_authority); - } - grpc_mdctx_unref(channel->metadata_context); - gpr_mu_destroy(&channel->registered_call_mu); - gpr_free(channel->target); - gpr_free(channel); + GRPC_MDSTR_UNREF (channel->grpc_status_string); + GRPC_MDSTR_UNREF (channel->grpc_compression_algorithm_string); + GRPC_MDSTR_UNREF (channel->grpc_encodings_accepted_by_peer_string); + GRPC_MDSTR_UNREF (channel->grpc_message_string); + GRPC_MDSTR_UNREF (channel->path_string); + GRPC_MDSTR_UNREF (channel->authority_string); + while (channel->registered_calls) + { + registered_call *rc = channel->registered_calls; + channel->registered_calls = rc->next; + GRPC_MDELEM_UNREF (rc->path); + if (rc->authority) + { + GRPC_MDELEM_UNREF (rc->authority); + } + gpr_free (rc); + } + if (channel->default_authority != NULL) + { + GRPC_MDELEM_UNREF (channel->default_authority); + } + grpc_mdctx_unref (channel->metadata_context); + gpr_mu_destroy (&channel->registered_call_mu); + gpr_free (channel->target); + gpr_free (channel); } #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG -void grpc_channel_internal_unref(grpc_channel *channel, const char *reason, - grpc_closure_list *closure_list) { - gpr_log(GPR_DEBUG, "CHANNEL: unref %p %d -> %d [%s]", channel, - channel->refs.count, channel->refs.count - 1, reason); +void +grpc_channel_internal_unref (grpc_channel * channel, const char *reason, grpc_closure_list * closure_list) +{ + gpr_log (GPR_DEBUG, "CHANNEL: unref %p %d -> %d [%s]", channel, channel->refs.count, channel->refs.count - 1, reason); #else -void grpc_channel_internal_unref(grpc_channel *channel, - grpc_closure_list *closure_list) { +void +grpc_channel_internal_unref (grpc_channel * channel, grpc_closure_list * closure_list) +{ #endif - if (gpr_unref(&channel->refs)) { - destroy_channel(channel, closure_list); - } + if (gpr_unref (&channel->refs)) + { + destroy_channel (channel, closure_list); + } } -void grpc_channel_destroy(grpc_channel *channel) { +void +grpc_channel_destroy (grpc_channel * channel) +{ grpc_transport_op op; grpc_channel_element *elem; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - memset(&op, 0, sizeof(op)); + memset (&op, 0, sizeof (op)); op.disconnect = 1; - elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CHANNEL(channel), 0); - elem->filter->start_transport_op(elem, &op, &closure_list); + elem = grpc_channel_stack_element (CHANNEL_STACK_FROM_CHANNEL (channel), 0); + elem->filter->start_transport_op (elem, &op, &closure_list); - GRPC_CHANNEL_INTERNAL_UNREF(channel, "channel", &closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (channel, "channel", &closure_list); - grpc_closure_list_run(&closure_list); + grpc_closure_list_run (&closure_list); } -grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel) { - return CHANNEL_STACK_FROM_CHANNEL(channel); +grpc_channel_stack * +grpc_channel_get_channel_stack (grpc_channel * channel) +{ + return CHANNEL_STACK_FROM_CHANNEL (channel); } -grpc_mdctx *grpc_channel_get_metadata_context(grpc_channel *channel) { +grpc_mdctx * +grpc_channel_get_metadata_context (grpc_channel * channel) +{ return channel->metadata_context; } -grpc_mdstr *grpc_channel_get_status_string(grpc_channel *channel) { +grpc_mdstr * +grpc_channel_get_status_string (grpc_channel * channel) +{ return channel->grpc_status_string; } -grpc_mdstr *grpc_channel_get_compression_algorithm_string( - grpc_channel *channel) { +grpc_mdstr * +grpc_channel_get_compression_algorithm_string (grpc_channel * channel) +{ return channel->grpc_compression_algorithm_string; } -grpc_mdstr *grpc_channel_get_encodings_accepted_by_peer_string( - grpc_channel *channel) { +grpc_mdstr * +grpc_channel_get_encodings_accepted_by_peer_string (grpc_channel * channel) +{ return channel->grpc_encodings_accepted_by_peer_string; } -grpc_mdelem *grpc_channel_get_reffed_status_elem(grpc_channel *channel, int i) { - if (i >= 0 && i < NUM_CACHED_STATUS_ELEMS) { - return GRPC_MDELEM_REF(channel->grpc_status_elem[i]); - } else { - char tmp[GPR_LTOA_MIN_BUFSIZE]; - gpr_ltoa(i, tmp); - return grpc_mdelem_from_metadata_strings( - channel->metadata_context, GRPC_MDSTR_REF(channel->grpc_status_string), - grpc_mdstr_from_string(channel->metadata_context, tmp, 0)); - } +grpc_mdelem * +grpc_channel_get_reffed_status_elem (grpc_channel * channel, int i) +{ + if (i >= 0 && i < NUM_CACHED_STATUS_ELEMS) + { + return GRPC_MDELEM_REF (channel->grpc_status_elem[i]); + } + else + { + char tmp[GPR_LTOA_MIN_BUFSIZE]; + gpr_ltoa (i, tmp); + return grpc_mdelem_from_metadata_strings (channel->metadata_context, GRPC_MDSTR_REF (channel->grpc_status_string), grpc_mdstr_from_string (channel->metadata_context, tmp, 0)); + } } -grpc_mdstr *grpc_channel_get_message_string(grpc_channel *channel) { +grpc_mdstr * +grpc_channel_get_message_string (grpc_channel * channel) +{ return channel->grpc_message_string; } -gpr_uint32 grpc_channel_get_max_message_length(grpc_channel *channel) { +gpr_uint32 +grpc_channel_get_max_message_length (grpc_channel * channel) +{ return channel->max_message_length; } diff --git a/src/core/surface/channel.h b/src/core/surface/channel.h index e9c29481474..91a038892ef 100644 --- a/src/core/surface/channel.h +++ b/src/core/surface/channel.h @@ -37,43 +37,35 @@ #include "src/core/channel/channel_stack.h" #include "src/core/client_config/subchannel_factory.h" -grpc_channel *grpc_channel_create_from_filters( - const char *target, const grpc_channel_filter **filters, size_t count, - const grpc_channel_args *args, grpc_mdctx *mdctx, int is_client, - grpc_closure_list *closure_list); +grpc_channel *grpc_channel_create_from_filters (const char *target, const grpc_channel_filter ** filters, size_t count, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_client, grpc_closure_list * closure_list); /** Get a (borrowed) pointer to this channels underlying channel stack */ -grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel); +grpc_channel_stack *grpc_channel_get_channel_stack (grpc_channel * channel); /** Get a (borrowed) pointer to the channel wide metadata context */ -grpc_mdctx *grpc_channel_get_metadata_context(grpc_channel *channel); +grpc_mdctx *grpc_channel_get_metadata_context (grpc_channel * channel); /** Get a grpc_mdelem of grpc-status: X where X is the numeric value of status_code. The returned elem is owned by the caller. */ -grpc_mdelem *grpc_channel_get_reffed_status_elem(grpc_channel *channel, - int status_code); -grpc_mdstr *grpc_channel_get_status_string(grpc_channel *channel); -grpc_mdstr *grpc_channel_get_compression_algorithm_string( - grpc_channel *channel); -grpc_mdstr *grpc_channel_get_encodings_accepted_by_peer_string( - grpc_channel *channel); -grpc_mdstr *grpc_channel_get_message_string(grpc_channel *channel); -gpr_uint32 grpc_channel_get_max_message_length(grpc_channel *channel); +grpc_mdelem *grpc_channel_get_reffed_status_elem (grpc_channel * channel, int status_code); +grpc_mdstr *grpc_channel_get_status_string (grpc_channel * channel); +grpc_mdstr *grpc_channel_get_compression_algorithm_string (grpc_channel * channel); +grpc_mdstr *grpc_channel_get_encodings_accepted_by_peer_string (grpc_channel * channel); +grpc_mdstr *grpc_channel_get_message_string (grpc_channel * channel); +gpr_uint32 grpc_channel_get_max_message_length (grpc_channel * channel); #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG -void grpc_channel_internal_ref(grpc_channel *channel, const char *reason); -void grpc_channel_internal_unref(grpc_channel *channel, const char *reason, - grpc_closure_list *closure_list); +void grpc_channel_internal_ref (grpc_channel * channel, const char *reason); +void grpc_channel_internal_unref (grpc_channel * channel, const char *reason, grpc_closure_list * closure_list); #define GRPC_CHANNEL_INTERNAL_REF(channel, reason) \ grpc_channel_internal_ref(channel, reason) #define GRPC_CHANNEL_INTERNAL_UNREF(channel, reason, closure_list) \ grpc_channel_internal_unref(channel, reason, closure_list) #else -void grpc_channel_internal_ref(grpc_channel *channel); -void grpc_channel_internal_unref(grpc_channel *channel, - grpc_closure_list *closure_list); +void grpc_channel_internal_ref (grpc_channel * channel); +void grpc_channel_internal_unref (grpc_channel * channel, grpc_closure_list * closure_list); #define GRPC_CHANNEL_INTERNAL_REF(channel, reason) \ grpc_channel_internal_ref(channel) #define GRPC_CHANNEL_INTERNAL_UNREF(channel, reason, closure_list) \ diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index d09e9bef799..0a7e8e38373 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -40,34 +40,33 @@ #include "src/core/iomgr/alarm.h" #include "src/core/surface/completion_queue.h" -grpc_connectivity_state grpc_channel_check_connectivity_state( - grpc_channel *channel, int try_to_connect) { +grpc_connectivity_state +grpc_channel_check_connectivity_state (grpc_channel * channel, int try_to_connect) +{ /* 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_channel_element *client_channel_elem = grpc_channel_stack_last_element (grpc_channel_get_channel_stack (channel)); grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_connectivity_state state; - if (client_channel_elem->filter != &grpc_client_channel_filter) { - 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); - return GRPC_CHANNEL_FATAL_FAILURE; - } - state = grpc_client_channel_check_connectivity_state( - client_channel_elem, try_to_connect, &closure_list); - grpc_closure_list_run(&closure_list); + if (client_channel_elem->filter != &grpc_client_channel_filter) + { + 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); + return GRPC_CHANNEL_FATAL_FAILURE; + } + state = grpc_client_channel_check_connectivity_state (client_channel_elem, try_to_connect, &closure_list); + grpc_closure_list_run (&closure_list); return state; } -typedef enum { +typedef enum +{ WAITING, CALLING_BACK, CALLING_BACK_AND_FINISHED, CALLED_BACK } callback_phase; -typedef struct { +typedef struct +{ gpr_mu mu; callback_phase phase; int success; @@ -81,23 +80,26 @@ typedef struct { void *tag; } state_watcher; -static void delete_state_watcher(state_watcher *w, - grpc_closure_list *closure_list) { - GRPC_CHANNEL_INTERNAL_UNREF(w->channel, "watch_connectivity", closure_list); - gpr_mu_destroy(&w->mu); - gpr_free(w); +static void +delete_state_watcher (state_watcher * w, grpc_closure_list * closure_list) +{ + GRPC_CHANNEL_INTERNAL_UNREF (w->channel, "watch_connectivity", closure_list); + gpr_mu_destroy (&w->mu); + gpr_free (w); } -static void finished_completion(void *pw, grpc_cq_completion *ignored, - grpc_closure_list *closure_list) { +static void +finished_completion (void *pw, grpc_cq_completion * ignored, grpc_closure_list * closure_list) +{ int delete = 0; state_watcher *w = pw; - gpr_mu_lock(&w->mu); - switch (w->phase) { + gpr_mu_lock (&w->mu); + switch (w->phase) + { case WAITING: case CALLED_BACK: - gpr_log(GPR_ERROR, "should never reach here"); - abort(); + gpr_log (GPR_ERROR, "should never reach here"); + abort (); break; case CALLING_BACK: w->phase = CALLED_BACK; @@ -105,82 +107,86 @@ static void finished_completion(void *pw, grpc_cq_completion *ignored, case CALLING_BACK_AND_FINISHED: delete = 1; break; - } - gpr_mu_unlock(&w->mu); + } + gpr_mu_unlock (&w->mu); - if (delete) { - delete_state_watcher(w, closure_list); - } + if (delete) + { + delete_state_watcher (w, closure_list); + } } -static void partly_done(state_watcher *w, int due_to_completion, - grpc_closure_list *closure_list) { +static void +partly_done (state_watcher * w, int due_to_completion, grpc_closure_list * closure_list) +{ int delete = 0; grpc_channel_element *client_channel_elem = NULL; - gpr_mu_lock(&w->mu); - if (w->removed == 0) { - w->removed = 1; - client_channel_elem = grpc_channel_stack_last_element( - grpc_channel_get_channel_stack(w->channel)); - grpc_client_channel_del_interested_party( - client_channel_elem, grpc_cq_pollset(w->cq), closure_list); - } - gpr_mu_unlock(&w->mu); - if (due_to_completion) { - gpr_mu_lock(&w->mu); - w->success = 1; - gpr_mu_unlock(&w->mu); - grpc_alarm_cancel(&w->alarm, closure_list); - } - - gpr_mu_lock(&w->mu); - switch (w->phase) { + gpr_mu_lock (&w->mu); + if (w->removed == 0) + { + w->removed = 1; + client_channel_elem = grpc_channel_stack_last_element (grpc_channel_get_channel_stack (w->channel)); + grpc_client_channel_del_interested_party (client_channel_elem, grpc_cq_pollset (w->cq), closure_list); + } + gpr_mu_unlock (&w->mu); + if (due_to_completion) + { + gpr_mu_lock (&w->mu); + w->success = 1; + gpr_mu_unlock (&w->mu); + grpc_alarm_cancel (&w->alarm, closure_list); + } + + gpr_mu_lock (&w->mu); + switch (w->phase) + { case WAITING: w->phase = CALLING_BACK; - grpc_cq_end_op(w->cq, w->tag, w->success, finished_completion, w, - &w->completion_storage, closure_list); + grpc_cq_end_op (w->cq, w->tag, w->success, finished_completion, w, &w->completion_storage, closure_list); break; case CALLING_BACK: w->phase = CALLING_BACK_AND_FINISHED; break; case CALLING_BACK_AND_FINISHED: - gpr_log(GPR_ERROR, "should never reach here"); - abort(); + gpr_log (GPR_ERROR, "should never reach here"); + abort (); break; case CALLED_BACK: delete = 1; break; - } - gpr_mu_unlock(&w->mu); + } + gpr_mu_unlock (&w->mu); - if (delete) { - delete_state_watcher(w, closure_list); - } + if (delete) + { + delete_state_watcher (w, closure_list); + } } -static void watch_complete(void *pw, int success, - grpc_closure_list *closure_list) { - partly_done(pw, 1, closure_list); +static void +watch_complete (void *pw, int success, grpc_closure_list * closure_list) +{ + partly_done (pw, 1, closure_list); } -static void timeout_complete(void *pw, int success, - grpc_closure_list *closure_list) { - partly_done(pw, 0, closure_list); +static void +timeout_complete (void *pw, int success, grpc_closure_list * closure_list) +{ + partly_done (pw, 0, closure_list); } -void grpc_channel_watch_connectivity_state( - grpc_channel *channel, grpc_connectivity_state last_observed_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)); +void +grpc_channel_watch_connectivity_state (grpc_channel * channel, grpc_connectivity_state last_observed_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_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - state_watcher *w = gpr_malloc(sizeof(*w)); + state_watcher *w = gpr_malloc (sizeof (*w)); - grpc_cq_begin_op(cq); + grpc_cq_begin_op (cq); - gpr_mu_init(&w->mu); - grpc_closure_init(&w->on_complete, watch_complete, w); + gpr_mu_init (&w->mu); + grpc_closure_init (&w->on_complete, watch_complete, w); w->phase = WAITING; w->state = last_observed_state; w->success = 0; @@ -189,23 +195,19 @@ void grpc_channel_watch_connectivity_state( w->tag = tag; w->channel = channel; - grpc_alarm_init( - &w->alarm, gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC), - timeout_complete, w, gpr_now(GPR_CLOCK_MONOTONIC), &closure_list); - - if (client_channel_elem->filter != &grpc_client_channel_filter) { - gpr_log(GPR_ERROR, - "grpc_channel_watch_connectivity_state called on something that is " - "not a client channel, but '%s'", - client_channel_elem->filter->name); - grpc_closure_list_add(&closure_list, &w->on_complete, 1); - } else { - GRPC_CHANNEL_INTERNAL_REF(channel, "watch_connectivity"); - grpc_client_channel_add_interested_party( - client_channel_elem, grpc_cq_pollset(cq), &closure_list); - grpc_client_channel_watch_connectivity_state( - client_channel_elem, &w->state, &w->on_complete, &closure_list); - } - - grpc_closure_list_run(&closure_list); + grpc_alarm_init (&w->alarm, gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC), timeout_complete, w, gpr_now (GPR_CLOCK_MONOTONIC), &closure_list); + + if (client_channel_elem->filter != &grpc_client_channel_filter) + { + gpr_log (GPR_ERROR, "grpc_channel_watch_connectivity_state called on something that is " "not a client channel, but '%s'", client_channel_elem->filter->name); + grpc_closure_list_add (&closure_list, &w->on_complete, 1); + } + else + { + GRPC_CHANNEL_INTERNAL_REF (channel, "watch_connectivity"); + grpc_client_channel_add_interested_party (client_channel_elem, grpc_cq_pollset (cq), &closure_list); + grpc_client_channel_watch_connectivity_state (client_channel_elem, &w->state, &w->on_complete, &closure_list); + } + + grpc_closure_list_run (&closure_list); } diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index fc9ed584916..c45ebf324ff 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -48,7 +48,8 @@ #include "src/core/surface/channel.h" #include "src/core/transport/chttp2_transport.h" -typedef struct { +typedef struct +{ grpc_connector base; gpr_refcount refs; @@ -63,66 +64,73 @@ typedef struct { grpc_closure connected; } connector; -static void connector_ref(grpc_connector *con) { - connector *c = (connector *)con; - gpr_ref(&c->refs); +static void +connector_ref (grpc_connector * con) +{ + connector *c = (connector *) con; + gpr_ref (&c->refs); } -static void connector_unref(grpc_connector *con, - grpc_closure_list *closure_list) { - connector *c = (connector *)con; - if (gpr_unref(&c->refs)) { - grpc_mdctx_unref(c->mdctx); - gpr_free(c); - } +static void +connector_unref (grpc_connector * con, grpc_closure_list * closure_list) +{ + connector *c = (connector *) con; + if (gpr_unref (&c->refs)) + { + grpc_mdctx_unref (c->mdctx); + gpr_free (c); + } } -static void connected(void *arg, int success, grpc_closure_list *closure_list) { +static void +connected (void *arg, int success, grpc_closure_list * closure_list) +{ connector *c = arg; grpc_closure *notify; grpc_endpoint *tcp = c->tcp; - if (tcp != NULL) { - c->result->transport = grpc_create_chttp2_transport( - c->args.channel_args, tcp, c->mdctx, 1, closure_list); - grpc_chttp2_transport_start_reading(c->result->transport, NULL, 0, - closure_list); - GPR_ASSERT(c->result->transport); - c->result->filters = gpr_malloc(sizeof(grpc_channel_filter *)); - c->result->filters[0] = &grpc_http_client_filter; - c->result->num_filters = 1; - } else { - memset(c->result, 0, sizeof(*c->result)); - } + if (tcp != NULL) + { + c->result->transport = grpc_create_chttp2_transport (c->args.channel_args, tcp, c->mdctx, 1, closure_list); + grpc_chttp2_transport_start_reading (c->result->transport, NULL, 0, closure_list); + GPR_ASSERT (c->result->transport); + c->result->filters = gpr_malloc (sizeof (grpc_channel_filter *)); + c->result->filters[0] = &grpc_http_client_filter; + c->result->num_filters = 1; + } + else + { + memset (c->result, 0, sizeof (*c->result)); + } notify = c->notify; c->notify = NULL; - notify->cb(notify->cb_arg, 1, closure_list); + notify->cb (notify->cb_arg, 1, closure_list); } -static void connector_shutdown(grpc_connector *con, - grpc_closure_list *closure_list) {} - -static void connector_connect(grpc_connector *con, - const grpc_connect_in_args *args, - grpc_connect_out_args *result, - grpc_closure *notify, - grpc_closure_list *closure_list) { - connector *c = (connector *)con; - GPR_ASSERT(c->notify == NULL); - GPR_ASSERT(notify->cb); +static void +connector_shutdown (grpc_connector * con, grpc_closure_list * closure_list) +{ +} + +static void +connector_connect (grpc_connector * con, const grpc_connect_in_args * args, grpc_connect_out_args * result, grpc_closure * notify, grpc_closure_list * closure_list) +{ + connector *c = (connector *) con; + GPR_ASSERT (c->notify == NULL); + GPR_ASSERT (notify->cb); c->notify = notify; c->args = *args; c->result = result; c->tcp = NULL; - grpc_closure_init(&c->connected, connected, c); - grpc_tcp_client_connect(&c->connected, &c->tcp, args->interested_parties, - args->addr, args->addr_len, args->deadline, - closure_list); + grpc_closure_init (&c->connected, connected, c); + grpc_tcp_client_connect (&c->connected, &c->tcp, args->interested_parties, args->addr, args->addr_len, args->deadline, closure_list); } static const grpc_connector_vtable connector_vtable = { - connector_ref, connector_unref, connector_shutdown, connector_connect}; + connector_ref, connector_unref, connector_shutdown, connector_connect +}; -typedef struct { +typedef struct +{ grpc_subchannel_factory base; gpr_refcount refs; grpc_mdctx *mdctx; @@ -130,93 +138,97 @@ typedef struct { grpc_channel *master; } subchannel_factory; -static void subchannel_factory_ref(grpc_subchannel_factory *scf) { - subchannel_factory *f = (subchannel_factory *)scf; - gpr_ref(&f->refs); +static void +subchannel_factory_ref (grpc_subchannel_factory * scf) +{ + subchannel_factory *f = (subchannel_factory *) scf; + gpr_ref (&f->refs); } -static void subchannel_factory_unref(grpc_subchannel_factory *scf, - grpc_closure_list *closure_list) { - subchannel_factory *f = (subchannel_factory *)scf; - if (gpr_unref(&f->refs)) { - GRPC_CHANNEL_INTERNAL_UNREF(f->master, "subchannel_factory", closure_list); - grpc_channel_args_destroy(f->merge_args); - grpc_mdctx_unref(f->mdctx); - gpr_free(f); - } +static void +subchannel_factory_unref (grpc_subchannel_factory * scf, grpc_closure_list * closure_list) +{ + subchannel_factory *f = (subchannel_factory *) scf; + if (gpr_unref (&f->refs)) + { + GRPC_CHANNEL_INTERNAL_UNREF (f->master, "subchannel_factory", closure_list); + grpc_channel_args_destroy (f->merge_args); + grpc_mdctx_unref (f->mdctx); + gpr_free (f); + } } -static grpc_subchannel *subchannel_factory_create_subchannel( - grpc_subchannel_factory *scf, grpc_subchannel_args *args, - grpc_closure_list *closure_list) { - subchannel_factory *f = (subchannel_factory *)scf; - connector *c = gpr_malloc(sizeof(*c)); - grpc_channel_args *final_args = - grpc_channel_args_merge(args->args, f->merge_args); +static grpc_subchannel * +subchannel_factory_create_subchannel (grpc_subchannel_factory * scf, grpc_subchannel_args * args, grpc_closure_list * closure_list) +{ + subchannel_factory *f = (subchannel_factory *) scf; + connector *c = gpr_malloc (sizeof (*c)); + grpc_channel_args *final_args = grpc_channel_args_merge (args->args, f->merge_args); grpc_subchannel *s; - memset(c, 0, sizeof(*c)); + memset (c, 0, sizeof (*c)); c->base.vtable = &connector_vtable; c->mdctx = f->mdctx; - grpc_mdctx_ref(c->mdctx); - gpr_ref_init(&c->refs, 1); + grpc_mdctx_ref (c->mdctx); + gpr_ref_init (&c->refs, 1); args->mdctx = f->mdctx; args->args = final_args; args->master = f->master; - s = grpc_subchannel_create(&c->base, args); - grpc_connector_unref(&c->base, closure_list); - grpc_channel_args_destroy(final_args); + s = grpc_subchannel_create (&c->base, args); + grpc_connector_unref (&c->base, closure_list); + grpc_channel_args_destroy (final_args); return s; } static const grpc_subchannel_factory_vtable subchannel_factory_vtable = { - subchannel_factory_ref, subchannel_factory_unref, - subchannel_factory_create_subchannel}; + subchannel_factory_ref, subchannel_factory_unref, + subchannel_factory_create_subchannel +}; /* Create a client channel: Asynchronously: - resolve target - connect to it (trying alternatives as presented) - perform handshakes */ -grpc_channel *grpc_insecure_channel_create(const char *target, - const grpc_channel_args *args, - void *reserved) { +grpc_channel * +grpc_insecure_channel_create (const char *target, const grpc_channel_args * args, void *reserved) +{ grpc_channel *channel = NULL; #define MAX_FILTERS 3 const grpc_channel_filter *filters[MAX_FILTERS]; grpc_resolver *resolver; subchannel_factory *f; - grpc_mdctx *mdctx = grpc_mdctx_create(); + grpc_mdctx *mdctx = grpc_mdctx_create (); grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; size_t n = 0; - GPR_ASSERT(!reserved); - if (grpc_channel_args_is_census_enabled(args)) { - filters[n++] = &grpc_client_census_filter; - } + GPR_ASSERT (!reserved); + if (grpc_channel_args_is_census_enabled (args)) + { + filters[n++] = &grpc_client_census_filter; + } filters[n++] = &grpc_compress_filter; filters[n++] = &grpc_client_channel_filter; - GPR_ASSERT(n <= MAX_FILTERS); + GPR_ASSERT (n <= MAX_FILTERS); - channel = grpc_channel_create_from_filters(target, filters, n, args, mdctx, 1, - &closure_list); + channel = grpc_channel_create_from_filters (target, filters, n, args, mdctx, 1, &closure_list); - f = gpr_malloc(sizeof(*f)); + f = gpr_malloc (sizeof (*f)); f->base.vtable = &subchannel_factory_vtable; - gpr_ref_init(&f->refs, 1); - grpc_mdctx_ref(mdctx); + gpr_ref_init (&f->refs, 1); + grpc_mdctx_ref (mdctx); f->mdctx = mdctx; - f->merge_args = grpc_channel_args_copy(args); + f->merge_args = grpc_channel_args_copy (args); f->master = channel; - GRPC_CHANNEL_INTERNAL_REF(f->master, "subchannel_factory"); - resolver = grpc_resolver_create(target, &f->base); - if (!resolver) { - return NULL; - } - - grpc_client_channel_set_resolver(grpc_channel_get_channel_stack(channel), - resolver, &closure_list); - GRPC_RESOLVER_UNREF(resolver, "create", &closure_list); - grpc_subchannel_factory_unref(&f->base, &closure_list); - - grpc_closure_list_run(&closure_list); + GRPC_CHANNEL_INTERNAL_REF (f->master, "subchannel_factory"); + resolver = grpc_resolver_create (target, &f->base); + if (!resolver) + { + return NULL; + } + + grpc_client_channel_set_resolver (grpc_channel_get_channel_stack (channel), resolver, &closure_list); + GRPC_RESOLVER_UNREF (resolver, "create", &closure_list); + grpc_subchannel_factory_unref (&f->base, &closure_list); + + grpc_closure_list_run (&closure_list); return channel; } diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index cb839b069d5..ab9a323c7a6 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -45,13 +45,15 @@ #include #include -typedef struct { +typedef struct +{ grpc_pollset_worker *worker; void *tag; } plucker; /* Completion queue structure */ -struct grpc_completion_queue { +struct grpc_completion_queue +{ /** completed events */ grpc_cq_completion completed_head; grpc_cq_completion *completed_tail; @@ -70,73 +72,80 @@ struct grpc_completion_queue { grpc_closure pollset_destroy_done; }; -static void on_pollset_destroy_done(void *cc, int success, - grpc_closure_list *closure_list); +static void on_pollset_destroy_done (void *cc, int success, grpc_closure_list * closure_list); -grpc_completion_queue *grpc_completion_queue_create(void *reserved) { - grpc_completion_queue *cc = gpr_malloc(sizeof(grpc_completion_queue)); - GPR_ASSERT(!reserved); - memset(cc, 0, sizeof(*cc)); +grpc_completion_queue * +grpc_completion_queue_create (void *reserved) +{ + grpc_completion_queue *cc = gpr_malloc (sizeof (grpc_completion_queue)); + GPR_ASSERT (!reserved); + memset (cc, 0, sizeof (*cc)); /* Initial ref is dropped by grpc_completion_queue_shutdown */ - gpr_ref_init(&cc->pending_events, 1); + gpr_ref_init (&cc->pending_events, 1); /* One for destroy(), one for pollset_shutdown */ - gpr_ref_init(&cc->owning_refs, 2); - grpc_pollset_init(&cc->pollset); + gpr_ref_init (&cc->owning_refs, 2); + grpc_pollset_init (&cc->pollset); cc->completed_tail = &cc->completed_head; - cc->completed_head.next = (gpr_uintptr)cc->completed_tail; - grpc_closure_init(&cc->pollset_destroy_done, on_pollset_destroy_done, cc); + cc->completed_head.next = (gpr_uintptr) cc->completed_tail; + grpc_closure_init (&cc->pollset_destroy_done, on_pollset_destroy_done, cc); return cc; } #ifdef GRPC_CQ_REF_COUNT_DEBUG -void grpc_cq_internal_ref(grpc_completion_queue *cc, const char *reason, - const char *file, int line) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "CQ:%p ref %d -> %d %s", cc, - (int)cc->owning_refs.count, (int)cc->owning_refs.count + 1, reason); +void +grpc_cq_internal_ref (grpc_completion_queue * cc, const char *reason, const char *file, int line) +{ + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "CQ:%p ref %d -> %d %s", cc, (int) cc->owning_refs.count, (int) cc->owning_refs.count + 1, reason); #else -void grpc_cq_internal_ref(grpc_completion_queue *cc) { +void +grpc_cq_internal_ref (grpc_completion_queue * cc) +{ #endif - gpr_ref(&cc->owning_refs); + gpr_ref (&cc->owning_refs); } -static void on_pollset_destroy_done(void *arg, int success, - grpc_closure_list *closure_list) { +static void +on_pollset_destroy_done (void *arg, int success, grpc_closure_list * closure_list) +{ grpc_completion_queue *cc = arg; - GRPC_CQ_INTERNAL_UNREF(cc, "pollset_destroy"); + GRPC_CQ_INTERNAL_UNREF (cc, "pollset_destroy"); } #ifdef GRPC_CQ_REF_COUNT_DEBUG -void grpc_cq_internal_unref(grpc_completion_queue *cc, const char *reason, - const char *file, int line) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "CQ:%p unref %d -> %d %s", cc, - (int)cc->owning_refs.count, (int)cc->owning_refs.count - 1, reason); +void +grpc_cq_internal_unref (grpc_completion_queue * cc, const char *reason, const char *file, int line) +{ + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "CQ:%p unref %d -> %d %s", cc, (int) cc->owning_refs.count, (int) cc->owning_refs.count - 1, reason); #else -void grpc_cq_internal_unref(grpc_completion_queue *cc) { +void +grpc_cq_internal_unref (grpc_completion_queue * cc) +{ #endif - if (gpr_unref(&cc->owning_refs)) { - GPR_ASSERT(cc->completed_head.next == (gpr_uintptr)&cc->completed_head); - grpc_pollset_destroy(&cc->pollset); - gpr_free(cc); - } + if (gpr_unref (&cc->owning_refs)) + { + GPR_ASSERT (cc->completed_head.next == (gpr_uintptr) & cc->completed_head); + grpc_pollset_destroy (&cc->pollset); + gpr_free (cc); + } } -void grpc_cq_begin_op(grpc_completion_queue *cc) { +void +grpc_cq_begin_op (grpc_completion_queue * cc) +{ #ifndef NDEBUG - gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); - GPR_ASSERT(!cc->shutdown_called); - gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&cc->pollset)); + GPR_ASSERT (!cc->shutdown_called); + gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); #endif - gpr_ref(&cc->pending_events); + gpr_ref (&cc->pending_events); } /* Signal the end of an operation - if this is the last waiting-to-be-queued event, then enter shutdown mode */ /* Queue a GRPC_OP_COMPLETED operation */ -void grpc_cq_end_op(grpc_completion_queue *cc, void *tag, int success, - void (*done)(void *done_arg, grpc_cq_completion *storage, - grpc_closure_list *closure_list), - void *done_arg, grpc_cq_completion *storage, - grpc_closure_list *closure_list) { +void +grpc_cq_end_op (grpc_completion_queue * cc, void *tag, int success, void (*done) (void *done_arg, grpc_cq_completion * storage, grpc_closure_list * closure_list), void *done_arg, grpc_cq_completion * storage, grpc_closure_list * closure_list) +{ int shutdown; int i; grpc_pollset_worker *pluck_worker; @@ -144,114 +153,127 @@ void grpc_cq_end_op(grpc_completion_queue *cc, void *tag, int success, storage->tag = tag; storage->done = done; storage->done_arg = done_arg; - storage->next = - ((gpr_uintptr)&cc->completed_head) | ((gpr_uintptr)(success != 0)); + storage->next = ((gpr_uintptr) & cc->completed_head) | ((gpr_uintptr) (success != 0)); - gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); - shutdown = gpr_unref(&cc->pending_events); - if (!shutdown) { - cc->completed_tail->next = - ((gpr_uintptr)storage) | (1u & (gpr_uintptr)cc->completed_tail->next); - cc->completed_tail = storage; - pluck_worker = NULL; - for (i = 0; i < cc->num_pluckers; i++) { - if (cc->pluckers[i].tag == tag) { - pluck_worker = cc->pluckers[i].worker; - break; - } + gpr_mu_lock (GRPC_POLLSET_MU (&cc->pollset)); + shutdown = gpr_unref (&cc->pending_events); + if (!shutdown) + { + cc->completed_tail->next = ((gpr_uintptr) storage) | (1u & (gpr_uintptr) cc->completed_tail->next); + cc->completed_tail = storage; + pluck_worker = NULL; + for (i = 0; i < cc->num_pluckers; i++) + { + if (cc->pluckers[i].tag == tag) + { + pluck_worker = cc->pluckers[i].worker; + break; + } + } + grpc_pollset_kick (&cc->pollset, pluck_worker); + gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); + } + else + { + cc->completed_tail->next = ((gpr_uintptr) storage) | (1u & (gpr_uintptr) cc->completed_tail->next); + cc->completed_tail = storage; + GPR_ASSERT (!cc->shutdown); + GPR_ASSERT (cc->shutdown_called); + cc->shutdown = 1; + gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); + grpc_pollset_shutdown (&cc->pollset, &cc->pollset_destroy_done, closure_list); } - grpc_pollset_kick(&cc->pollset, pluck_worker); - gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - } else { - cc->completed_tail->next = - ((gpr_uintptr)storage) | (1u & (gpr_uintptr)cc->completed_tail->next); - cc->completed_tail = storage; - GPR_ASSERT(!cc->shutdown); - GPR_ASSERT(cc->shutdown_called); - cc->shutdown = 1; - gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - grpc_pollset_shutdown(&cc->pollset, &cc->pollset_destroy_done, - closure_list); - } } -grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, - gpr_timespec deadline, void *reserved) { +grpc_event +grpc_completion_queue_next (grpc_completion_queue * cc, gpr_timespec deadline, void *reserved) +{ grpc_event ret; grpc_pollset_worker worker; int first_loop = 1; gpr_timespec now; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - GPR_ASSERT(!reserved); + GPR_ASSERT (!reserved); - deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC); + deadline = gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC); - GRPC_CQ_INTERNAL_REF(cc, "next"); - gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); - for (;;) { - if (cc->completed_tail != &cc->completed_head) { - grpc_cq_completion *c = (grpc_cq_completion *)cc->completed_head.next; - cc->completed_head.next = c->next & ~(gpr_uintptr)1; - if (c == cc->completed_tail) { - cc->completed_tail = &cc->completed_head; - } - gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - ret.type = GRPC_OP_COMPLETE; - ret.success = c->next & 1u; - ret.tag = c->tag; - c->done(c->done_arg, c, &closure_list); - break; - } - if (cc->shutdown) { - gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - memset(&ret, 0, sizeof(ret)); - ret.type = GRPC_QUEUE_SHUTDOWN; - break; - } - now = gpr_now(GPR_CLOCK_MONOTONIC); - if (!first_loop && gpr_time_cmp(now, deadline) >= 0) { - gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - memset(&ret, 0, sizeof(ret)); - ret.type = GRPC_QUEUE_TIMEOUT; - break; + GRPC_CQ_INTERNAL_REF (cc, "next"); + gpr_mu_lock (GRPC_POLLSET_MU (&cc->pollset)); + for (;;) + { + if (cc->completed_tail != &cc->completed_head) + { + grpc_cq_completion *c = (grpc_cq_completion *) cc->completed_head.next; + cc->completed_head.next = c->next & ~(gpr_uintptr) 1; + if (c == cc->completed_tail) + { + cc->completed_tail = &cc->completed_head; + } + gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); + ret.type = GRPC_OP_COMPLETE; + ret.success = c->next & 1u; + ret.tag = c->tag; + c->done (c->done_arg, c, &closure_list); + break; + } + if (cc->shutdown) + { + gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); + memset (&ret, 0, sizeof (ret)); + ret.type = GRPC_QUEUE_SHUTDOWN; + break; + } + now = gpr_now (GPR_CLOCK_MONOTONIC); + if (!first_loop && gpr_time_cmp (now, deadline) >= 0) + { + gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); + memset (&ret, 0, sizeof (ret)); + ret.type = GRPC_QUEUE_TIMEOUT; + break; + } + first_loop = 0; + grpc_pollset_work (&cc->pollset, &worker, now, deadline, &closure_list); } - first_loop = 0; - grpc_pollset_work(&cc->pollset, &worker, now, deadline, &closure_list); - } - GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret); - GRPC_CQ_INTERNAL_UNREF(cc, "next"); - grpc_closure_list_run(&closure_list); + GRPC_SURFACE_TRACE_RETURNED_EVENT (cc, &ret); + GRPC_CQ_INTERNAL_UNREF (cc, "next"); + grpc_closure_list_run (&closure_list); return ret; } -static int add_plucker(grpc_completion_queue *cc, void *tag, - grpc_pollset_worker *worker) { - if (cc->num_pluckers == GRPC_MAX_COMPLETION_QUEUE_PLUCKERS) { - return 0; - } +static int +add_plucker (grpc_completion_queue * cc, void *tag, grpc_pollset_worker * worker) +{ + if (cc->num_pluckers == GRPC_MAX_COMPLETION_QUEUE_PLUCKERS) + { + return 0; + } cc->pluckers[cc->num_pluckers].tag = tag; cc->pluckers[cc->num_pluckers].worker = worker; cc->num_pluckers++; return 1; } -static void del_plucker(grpc_completion_queue *cc, void *tag, - grpc_pollset_worker *worker) { +static void +del_plucker (grpc_completion_queue * cc, void *tag, grpc_pollset_worker * worker) +{ int i; - for (i = 0; i < cc->num_pluckers; i++) { - if (cc->pluckers[i].tag == tag && cc->pluckers[i].worker == worker) { - cc->num_pluckers--; - GPR_SWAP(plucker, cc->pluckers[i], cc->pluckers[cc->num_pluckers]); - return; + for (i = 0; i < cc->num_pluckers; i++) + { + if (cc->pluckers[i].tag == tag && cc->pluckers[i].worker == worker) + { + cc->num_pluckers--; + GPR_SWAP (plucker, cc->pluckers[i], cc->pluckers[cc->num_pluckers]); + return; + } } - } - gpr_log(GPR_ERROR, "should never reach here"); - abort(); + gpr_log (GPR_ERROR, "should never reach here"); + abort (); } -grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, - gpr_timespec deadline, void *reserved) { +grpc_event +grpc_completion_queue_pluck (grpc_completion_queue * cc, void *tag, gpr_timespec deadline, void *reserved) +{ grpc_event ret; grpc_cq_completion *c; grpc_cq_completion *prev; @@ -260,99 +282,116 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, int first_loop = 1; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - GPR_ASSERT(!reserved); + GPR_ASSERT (!reserved); - deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC); + deadline = gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC); - GRPC_CQ_INTERNAL_REF(cc, "pluck"); - gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); - for (;;) { - prev = &cc->completed_head; - while ((c = (grpc_cq_completion *)(prev->next & ~(gpr_uintptr)1)) != - &cc->completed_head) { - if (c->tag == tag) { - prev->next = - (prev->next & (gpr_uintptr)1) | (c->next & ~(gpr_uintptr)1); - if (c == cc->completed_tail) { - cc->completed_tail = prev; - } - gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - ret.type = GRPC_OP_COMPLETE; - ret.success = c->next & 1u; - ret.tag = c->tag; - c->done(c->done_arg, c, &closure_list); - goto done; - } - prev = c; - } - if (cc->shutdown) { - gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - memset(&ret, 0, sizeof(ret)); - ret.type = GRPC_QUEUE_SHUTDOWN; - break; + GRPC_CQ_INTERNAL_REF (cc, "pluck"); + gpr_mu_lock (GRPC_POLLSET_MU (&cc->pollset)); + for (;;) + { + prev = &cc->completed_head; + while ((c = (grpc_cq_completion *) (prev->next & ~(gpr_uintptr) 1)) != &cc->completed_head) + { + if (c->tag == tag) + { + prev->next = (prev->next & (gpr_uintptr) 1) | (c->next & ~(gpr_uintptr) 1); + if (c == cc->completed_tail) + { + cc->completed_tail = prev; + } + gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); + ret.type = GRPC_OP_COMPLETE; + ret.success = c->next & 1u; + ret.tag = c->tag; + c->done (c->done_arg, c, &closure_list); + goto done; + } + prev = c; + } + if (cc->shutdown) + { + gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); + memset (&ret, 0, sizeof (ret)); + ret.type = GRPC_QUEUE_SHUTDOWN; + break; + } + if (!add_plucker (cc, tag, &worker)) + { + gpr_log (GPR_DEBUG, "Too many outstanding grpc_completion_queue_pluck calls: maximum " "is %d", GRPC_MAX_COMPLETION_QUEUE_PLUCKERS); + gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); + memset (&ret, 0, sizeof (ret)); + /* TODO(ctiller): should we use a different result here */ + ret.type = GRPC_QUEUE_TIMEOUT; + break; + } + now = gpr_now (GPR_CLOCK_MONOTONIC); + if (!first_loop && gpr_time_cmp (now, deadline) >= 0) + { + del_plucker (cc, tag, &worker); + gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); + memset (&ret, 0, sizeof (ret)); + ret.type = GRPC_QUEUE_TIMEOUT; + break; + } + first_loop = 0; + grpc_pollset_work (&cc->pollset, &worker, now, deadline, &closure_list); + del_plucker (cc, tag, &worker); } - if (!add_plucker(cc, tag, &worker)) { - gpr_log(GPR_DEBUG, - "Too many outstanding grpc_completion_queue_pluck calls: maximum " - "is %d", - GRPC_MAX_COMPLETION_QUEUE_PLUCKERS); - gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - memset(&ret, 0, sizeof(ret)); - /* TODO(ctiller): should we use a different result here */ - ret.type = GRPC_QUEUE_TIMEOUT; - break; - } - now = gpr_now(GPR_CLOCK_MONOTONIC); - if (!first_loop && gpr_time_cmp(now, deadline) >= 0) { - del_plucker(cc, tag, &worker); - gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - memset(&ret, 0, sizeof(ret)); - ret.type = GRPC_QUEUE_TIMEOUT; - break; - } - first_loop = 0; - grpc_pollset_work(&cc->pollset, &worker, now, deadline, &closure_list); - del_plucker(cc, tag, &worker); - } done: - GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret); - GRPC_CQ_INTERNAL_UNREF(cc, "pluck"); - grpc_closure_list_run(&closure_list); + GRPC_SURFACE_TRACE_RETURNED_EVENT (cc, &ret); + GRPC_CQ_INTERNAL_UNREF (cc, "pluck"); + grpc_closure_list_run (&closure_list); return ret; } /* 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 *cc) { +void +grpc_completion_queue_shutdown (grpc_completion_queue * cc) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); - if (cc->shutdown_called) { - gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - return; - } + gpr_mu_lock (GRPC_POLLSET_MU (&cc->pollset)); + if (cc->shutdown_called) + { + gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); + return; + } cc->shutdown_called = 1; - gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); + gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); - if (gpr_unref(&cc->pending_events)) { - gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); - GPR_ASSERT(!cc->shutdown); - cc->shutdown = 1; - gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - grpc_pollset_shutdown(&cc->pollset, &cc->pollset_destroy_done, - &closure_list); - } - grpc_closure_list_run(&closure_list); + if (gpr_unref (&cc->pending_events)) + { + gpr_mu_lock (GRPC_POLLSET_MU (&cc->pollset)); + GPR_ASSERT (!cc->shutdown); + cc->shutdown = 1; + gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); + grpc_pollset_shutdown (&cc->pollset, &cc->pollset_destroy_done, &closure_list); + } + grpc_closure_list_run (&closure_list); } -void grpc_completion_queue_destroy(grpc_completion_queue *cc) { - grpc_completion_queue_shutdown(cc); - GRPC_CQ_INTERNAL_UNREF(cc, "destroy"); +void +grpc_completion_queue_destroy (grpc_completion_queue * cc) +{ + grpc_completion_queue_shutdown (cc); + GRPC_CQ_INTERNAL_UNREF (cc, "destroy"); } -grpc_pollset *grpc_cq_pollset(grpc_completion_queue *cc) { +grpc_pollset * +grpc_cq_pollset (grpc_completion_queue * cc) +{ return &cc->pollset; } -void grpc_cq_mark_server_cq(grpc_completion_queue *cc) { cc->is_server_cq = 1; } +void +grpc_cq_mark_server_cq (grpc_completion_queue * cc) +{ + cc->is_server_cq = 1; +} -int grpc_cq_is_server_cq(grpc_completion_queue *cc) { return cc->is_server_cq; } +int +grpc_cq_is_server_cq (grpc_completion_queue * cc) +{ + return cc->is_server_cq; +} diff --git a/src/core/surface/completion_queue.h b/src/core/surface/completion_queue.h index 7e88b471da0..7ef4ed7c490 100644 --- a/src/core/surface/completion_queue.h +++ b/src/core/surface/completion_queue.h @@ -39,48 +39,42 @@ #include "src/core/iomgr/pollset.h" #include -typedef struct grpc_cq_completion { +typedef struct grpc_cq_completion +{ /** user supplied tag */ 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, - grpc_closure_list *closure_list); + void (*done) (void *done_arg, struct grpc_cq_completion * c, grpc_closure_list * closure_list); void *done_arg; /** next pointer; low bit is used to indicate success or not */ gpr_uintptr next; } grpc_cq_completion; #ifdef GRPC_CQ_REF_COUNT_DEBUG -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_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); #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__) #else -void grpc_cq_internal_ref(grpc_completion_queue *cc); -void grpc_cq_internal_unref(grpc_completion_queue *cc); +void grpc_cq_internal_ref (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(cc, reason) grpc_cq_internal_unref(cc) #endif /* Flag that an operation is beginning: the completion channel will not finish shutdown until a corrensponding grpc_cq_end_* call is made */ -void grpc_cq_begin_op(grpc_completion_queue *cc); +void grpc_cq_begin_op (grpc_completion_queue * cc); /* Queue a GRPC_OP_COMPLETED operation */ -void grpc_cq_end_op(grpc_completion_queue *cc, void *tag, int success, - void (*done)(void *done_arg, grpc_cq_completion *storage, - grpc_closure_list *closure_list), - void *done_arg, grpc_cq_completion *storage, - grpc_closure_list *closure_list); +void grpc_cq_end_op (grpc_completion_queue * cc, void *tag, int success, void (*done) (void *done_arg, grpc_cq_completion * storage, grpc_closure_list * closure_list), void *done_arg, grpc_cq_completion * storage, grpc_closure_list * closure_list); -grpc_pollset *grpc_cq_pollset(grpc_completion_queue *cc); +grpc_pollset *grpc_cq_pollset (grpc_completion_queue * cc); -void grpc_cq_mark_server_cq(grpc_completion_queue *cc); -int grpc_cq_is_server_cq(grpc_completion_queue *cc); +void grpc_cq_mark_server_cq (grpc_completion_queue * cc); +int grpc_cq_is_server_cq (grpc_completion_queue * cc); #endif /* GRPC_INTERNAL_CORE_SURFACE_COMPLETION_QUEUE_H */ diff --git a/src/core/surface/event_string.c b/src/core/surface/event_string.c index 33cd4a43aa0..ac5cb657cd0 100644 --- a/src/core/surface/event_string.c +++ b/src/core/surface/event_string.c @@ -39,43 +39,55 @@ #include #include -static void addhdr(gpr_strvec *buf, grpc_event *ev) { +static void +addhdr (gpr_strvec * buf, grpc_event * ev) +{ char *tmp; - gpr_asprintf(&tmp, "tag:%p", ev->tag); - gpr_strvec_add(buf, tmp); + gpr_asprintf (&tmp, "tag:%p", ev->tag); + gpr_strvec_add (buf, tmp); } -static const char *errstr(int success) { return success ? "OK" : "ERROR"; } +static const char * +errstr (int success) +{ + return success ? "OK" : "ERROR"; +} -static void adderr(gpr_strvec *buf, int success) { +static void +adderr (gpr_strvec * buf, int success) +{ char *tmp; - gpr_asprintf(&tmp, " %s", errstr(success)); - gpr_strvec_add(buf, tmp); + gpr_asprintf (&tmp, " %s", errstr (success)); + gpr_strvec_add (buf, tmp); } -char *grpc_event_string(grpc_event *ev) { +char * +grpc_event_string (grpc_event * ev) +{ char *out; gpr_strvec buf; - if (ev == NULL) return gpr_strdup("null"); + if (ev == NULL) + return gpr_strdup ("null"); - gpr_strvec_init(&buf); + gpr_strvec_init (&buf); - switch (ev->type) { + switch (ev->type) + { case GRPC_QUEUE_TIMEOUT: - gpr_strvec_add(&buf, gpr_strdup("QUEUE_TIMEOUT")); + gpr_strvec_add (&buf, gpr_strdup ("QUEUE_TIMEOUT")); break; case GRPC_QUEUE_SHUTDOWN: - gpr_strvec_add(&buf, gpr_strdup("QUEUE_SHUTDOWN")); + gpr_strvec_add (&buf, gpr_strdup ("QUEUE_SHUTDOWN")); break; case GRPC_OP_COMPLETE: - gpr_strvec_add(&buf, gpr_strdup("OP_COMPLETE: ")); - addhdr(&buf, ev); - adderr(&buf, ev->success); + gpr_strvec_add (&buf, gpr_strdup ("OP_COMPLETE: ")); + addhdr (&buf, ev); + adderr (&buf, ev->success); break; - } + } - out = gpr_strvec_flatten(&buf, NULL); - gpr_strvec_destroy(&buf); + out = gpr_strvec_flatten (&buf, NULL); + gpr_strvec_destroy (&buf); return out; } diff --git a/src/core/surface/event_string.h b/src/core/surface/event_string.h index 07c474e3a02..6f2dfe0282a 100644 --- a/src/core/surface/event_string.h +++ b/src/core/surface/event_string.h @@ -37,6 +37,6 @@ #include /* Returns a string describing an event. Must be later freed with gpr_free() */ -char *grpc_event_string(grpc_event *ev); +char *grpc_event_string (grpc_event * ev); #endif /* GRPC_INTERNAL_CORE_SURFACE_EVENT_STRING_H */ diff --git a/src/core/surface/init.c b/src/core/surface/init.c index 93c27c77bf6..4d0be4f7b90 100644 --- a/src/core/surface/init.c +++ b/src/core/surface/init.c @@ -61,91 +61,110 @@ static gpr_once g_basic_init = GPR_ONCE_INIT; static gpr_mu g_init_mu; static int g_initializations; -static void do_basic_init(void) { - gpr_mu_init(&g_init_mu); +static void +do_basic_init (void) +{ + gpr_mu_init (&g_init_mu); g_initializations = 0; } -typedef struct grpc_plugin { - void (*init)(); - void (*destroy)(); +typedef struct grpc_plugin +{ + void (*init) (); + void (*destroy) (); } grpc_plugin; static grpc_plugin g_all_of_the_plugins[MAX_PLUGINS]; static int g_number_of_plugins = 0; -void grpc_register_plugin(void (*init)(void), void (*destroy)(void)) { - GPR_ASSERT(g_number_of_plugins != MAX_PLUGINS); +void +grpc_register_plugin (void (*init) (void), void (*destroy) (void)) +{ + GPR_ASSERT (g_number_of_plugins != MAX_PLUGINS); g_all_of_the_plugins[g_number_of_plugins].init = init; g_all_of_the_plugins[g_number_of_plugins].destroy = destroy; g_number_of_plugins++; } -void grpc_init(void) { +void +grpc_init (void) +{ int i; - gpr_once_init(&g_basic_init, do_basic_init); + gpr_once_init (&g_basic_init, do_basic_init); - gpr_mu_lock(&g_init_mu); - if (++g_initializations == 1) { - gpr_time_init(); - grpc_lb_policy_registry_init(grpc_pick_first_lb_factory_create()); - grpc_register_lb_policy(grpc_pick_first_lb_factory_create()); - grpc_register_lb_policy(grpc_round_robin_lb_factory_create()); - grpc_resolver_registry_init("dns:///"); - grpc_register_resolver_type(grpc_dns_resolver_factory_create()); - grpc_register_resolver_type(grpc_ipv4_resolver_factory_create()); - grpc_register_resolver_type(grpc_ipv6_resolver_factory_create()); + gpr_mu_lock (&g_init_mu); + if (++g_initializations == 1) + { + gpr_time_init (); + grpc_lb_policy_registry_init (grpc_pick_first_lb_factory_create ()); + grpc_register_lb_policy (grpc_pick_first_lb_factory_create ()); + grpc_register_lb_policy (grpc_round_robin_lb_factory_create ()); + grpc_resolver_registry_init ("dns:///"); + grpc_register_resolver_type (grpc_dns_resolver_factory_create ()); + grpc_register_resolver_type (grpc_ipv4_resolver_factory_create ()); + grpc_register_resolver_type (grpc_ipv6_resolver_factory_create ()); #ifdef GPR_POSIX_SOCKET - grpc_register_resolver_type(grpc_unix_resolver_factory_create()); + grpc_register_resolver_type (grpc_unix_resolver_factory_create ()); #endif - grpc_register_tracer("channel", &grpc_trace_channel); - grpc_register_tracer("surface", &grpc_surface_trace); - grpc_register_tracer("http", &grpc_http_trace); - grpc_register_tracer("flowctl", &grpc_flowctl_trace); - grpc_register_tracer("batch", &grpc_trace_batch); - grpc_register_tracer("connectivity_state", &grpc_connectivity_state_trace); - grpc_security_pre_init(); - grpc_iomgr_init(); - grpc_tracer_init("GRPC_TRACE"); - /* Only initialize census if noone else has. */ - if (census_enabled() == CENSUS_FEATURE_NONE) { - if (census_initialize(census_supported())) { /* enable all features. */ - gpr_log(GPR_ERROR, "Could not initialize census."); - } + grpc_register_tracer ("channel", &grpc_trace_channel); + grpc_register_tracer ("surface", &grpc_surface_trace); + grpc_register_tracer ("http", &grpc_http_trace); + grpc_register_tracer ("flowctl", &grpc_flowctl_trace); + grpc_register_tracer ("batch", &grpc_trace_batch); + grpc_register_tracer ("connectivity_state", &grpc_connectivity_state_trace); + grpc_security_pre_init (); + grpc_iomgr_init (); + grpc_tracer_init ("GRPC_TRACE"); + /* Only initialize census if noone else has. */ + if (census_enabled () == CENSUS_FEATURE_NONE) + { + if (census_initialize (census_supported ())) + { /* enable all features. */ + gpr_log (GPR_ERROR, "Could not initialize census."); + } + } + grpc_timers_global_init (); + for (i = 0; i < g_number_of_plugins; i++) + { + if (g_all_of_the_plugins[i].init != NULL) + { + g_all_of_the_plugins[i].init (); + } + } } - grpc_timers_global_init(); - for (i = 0; i < g_number_of_plugins; i++) { - if (g_all_of_the_plugins[i].init != NULL) { - g_all_of_the_plugins[i].init(); - } - } - } - gpr_mu_unlock(&g_init_mu); + gpr_mu_unlock (&g_init_mu); } -void grpc_shutdown(void) { +void +grpc_shutdown (void) +{ int i; - gpr_mu_lock(&g_init_mu); - if (--g_initializations == 0) { - grpc_iomgr_shutdown(); - census_shutdown(); - grpc_timers_global_destroy(); - grpc_tracer_shutdown(); - grpc_resolver_registry_shutdown(); - for (i = 0; i < g_number_of_plugins; i++) { - if (g_all_of_the_plugins[i].destroy != NULL) { - g_all_of_the_plugins[i].destroy(); - } + gpr_mu_lock (&g_init_mu); + if (--g_initializations == 0) + { + grpc_iomgr_shutdown (); + census_shutdown (); + grpc_timers_global_destroy (); + grpc_tracer_shutdown (); + grpc_resolver_registry_shutdown (); + for (i = 0; i < g_number_of_plugins; i++) + { + if (g_all_of_the_plugins[i].destroy != NULL) + { + g_all_of_the_plugins[i].destroy (); + } + } } - } - gpr_mu_unlock(&g_init_mu); + gpr_mu_unlock (&g_init_mu); } -int grpc_is_initialized(void) { +int +grpc_is_initialized (void) +{ int r; - gpr_once_init(&g_basic_init, do_basic_init); - gpr_mu_lock(&g_init_mu); + gpr_once_init (&g_basic_init, do_basic_init); + gpr_mu_lock (&g_init_mu); r = g_initializations > 0; - gpr_mu_unlock(&g_init_mu); + gpr_mu_unlock (&g_init_mu); return r; } diff --git a/src/core/surface/init.h b/src/core/surface/init.h index 771c30f4125..e880e3b2c0d 100644 --- a/src/core/surface/init.h +++ b/src/core/surface/init.h @@ -34,7 +34,7 @@ #ifndef GRPC_INTERNAL_CORE_SURFACE_INIT_H #define GRPC_INTERNAL_CORE_SURFACE_INIT_H -void grpc_security_pre_init(void); -int grpc_is_initialized(void); +void grpc_security_pre_init (void); +int grpc_is_initialized (void); #endif /* GRPC_INTERNAL_CORE_SURFACE_INIT_H */ diff --git a/src/core/surface/init_secure.c b/src/core/surface/init_secure.c index fa20e91583c..2ae1dd8b6fd 100644 --- a/src/core/surface/init_secure.c +++ b/src/core/surface/init_secure.c @@ -36,7 +36,9 @@ #include "src/core/security/secure_endpoint.h" #include "src/core/tsi/transport_security_interface.h" -void grpc_security_pre_init(void) { - grpc_register_tracer("secure_endpoint", &grpc_trace_secure_endpoint); - grpc_register_tracer("transport_security", &tsi_tracing_enabled); +void +grpc_security_pre_init (void) +{ + grpc_register_tracer ("secure_endpoint", &grpc_trace_secure_endpoint); + grpc_register_tracer ("transport_security", &tsi_tracing_enabled); } diff --git a/src/core/surface/init_unsecure.c b/src/core/surface/init_unsecure.c index 630d564a7d8..5b8a0abf6f6 100644 --- a/src/core/surface/init_unsecure.c +++ b/src/core/surface/init_unsecure.c @@ -33,4 +33,7 @@ #include "src/core/surface/init.h" -void grpc_security_pre_init(void) {} +void +grpc_security_pre_init (void) +{ +} diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c index 53334e7c5bf..d8cf7db601c 100644 --- a/src/core/surface/lame_client.c +++ b/src/core/surface/lame_client.c @@ -42,128 +42,135 @@ #include #include -typedef struct { +typedef struct +{ grpc_linked_mdelem status; grpc_linked_mdelem details; } call_data; -typedef struct { +typedef struct +{ grpc_mdctx *mdctx; grpc_channel *master; grpc_status_code error_code; const char *error_message; } channel_data; -static void lame_start_transport_stream_op(grpc_call_element *elem, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { +static void +lame_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - GRPC_CALL_LOG_OP(GPR_INFO, elem, op); - if (op->send_ops != NULL) { - grpc_stream_ops_unref_owned_objects(op->send_ops->ops, op->send_ops->nops); - op->on_done_send->cb(op->on_done_send->cb_arg, 0, closure_list); - } - if (op->recv_ops != NULL) { - char tmp[GPR_LTOA_MIN_BUFSIZE]; - grpc_metadata_batch mdb; - gpr_ltoa(chand->error_code, tmp); - calld->status.md = - grpc_mdelem_from_strings(chand->mdctx, "grpc-status", tmp); - calld->details.md = grpc_mdelem_from_strings(chand->mdctx, "grpc-message", - chand->error_message); - calld->status.prev = calld->details.next = NULL; - calld->status.next = &calld->details; - calld->details.prev = &calld->status; - mdb.list.head = &calld->status; - mdb.list.tail = &calld->details; - mdb.garbage.head = mdb.garbage.tail = NULL; - mdb.deadline = gpr_inf_future(GPR_CLOCK_REALTIME); - grpc_sopb_add_metadata(op->recv_ops, mdb); - *op->recv_state = GRPC_STREAM_CLOSED; - op->on_done_recv->cb(op->on_done_recv->cb_arg, 1, closure_list); - } - if (op->on_consumed != NULL) { - op->on_consumed->cb(op->on_consumed->cb_arg, 0, closure_list); - } + GRPC_CALL_LOG_OP (GPR_INFO, elem, op); + if (op->send_ops != NULL) + { + grpc_stream_ops_unref_owned_objects (op->send_ops->ops, op->send_ops->nops); + op->on_done_send->cb (op->on_done_send->cb_arg, 0, closure_list); + } + if (op->recv_ops != NULL) + { + char tmp[GPR_LTOA_MIN_BUFSIZE]; + grpc_metadata_batch mdb; + gpr_ltoa (chand->error_code, tmp); + calld->status.md = grpc_mdelem_from_strings (chand->mdctx, "grpc-status", tmp); + calld->details.md = grpc_mdelem_from_strings (chand->mdctx, "grpc-message", chand->error_message); + calld->status.prev = calld->details.next = NULL; + calld->status.next = &calld->details; + calld->details.prev = &calld->status; + mdb.list.head = &calld->status; + mdb.list.tail = &calld->details; + mdb.garbage.head = mdb.garbage.tail = NULL; + mdb.deadline = gpr_inf_future (GPR_CLOCK_REALTIME); + grpc_sopb_add_metadata (op->recv_ops, mdb); + *op->recv_state = GRPC_STREAM_CLOSED; + op->on_done_recv->cb (op->on_done_recv->cb_arg, 1, closure_list); + } + if (op->on_consumed != NULL) + { + op->on_consumed->cb (op->on_consumed->cb_arg, 0, closure_list); + } } -static char *lame_get_peer(grpc_call_element *elem, - grpc_closure_list *closure_list) { +static char * +lame_get_peer (grpc_call_element * elem, grpc_closure_list * closure_list) +{ channel_data *chand = elem->channel_data; - return grpc_channel_get_target(chand->master); + return grpc_channel_get_target (chand->master); } -static void lame_start_transport_op(grpc_channel_element *elem, - grpc_transport_op *op, - grpc_closure_list *closure_list) { - if (op->on_connectivity_state_change) { - GPR_ASSERT(*op->connectivity_state != GRPC_CHANNEL_FATAL_FAILURE); - *op->connectivity_state = GRPC_CHANNEL_FATAL_FAILURE; - op->on_connectivity_state_change->cb( - op->on_connectivity_state_change->cb_arg, 1, closure_list); - } - if (op->on_consumed != NULL) { - op->on_consumed->cb(op->on_consumed->cb_arg, 1, closure_list); - } +static void +lame_start_transport_op (grpc_channel_element * elem, grpc_transport_op * op, grpc_closure_list * closure_list) +{ + if (op->on_connectivity_state_change) + { + GPR_ASSERT (*op->connectivity_state != GRPC_CHANNEL_FATAL_FAILURE); + *op->connectivity_state = GRPC_CHANNEL_FATAL_FAILURE; + op->on_connectivity_state_change->cb (op->on_connectivity_state_change->cb_arg, 1, closure_list); + } + if (op->on_consumed != NULL) + { + op->on_consumed->cb (op->on_consumed->cb_arg, 1, closure_list); + } } -static void init_call_elem(grpc_call_element *elem, - const void *transport_server_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list) { - if (initial_op) { - grpc_transport_stream_op_finish_with_failure(initial_op, closure_list); - } +static void +init_call_elem (grpc_call_element * elem, const void *transport_server_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ + if (initial_op) + { + grpc_transport_stream_op_finish_with_failure (initial_op, closure_list); + } } -static void destroy_call_elem(grpc_call_element *elem, - grpc_closure_list *closure_list) {} +static void +destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +{ +} -static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, - const grpc_channel_args *args, grpc_mdctx *mdctx, - int is_first, int is_last, - grpc_closure_list *closure_list) { +static void +init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +{ channel_data *chand = elem->channel_data; - GPR_ASSERT(is_first); - GPR_ASSERT(is_last); + GPR_ASSERT (is_first); + GPR_ASSERT (is_last); chand->mdctx = mdctx; chand->master = master; } -static void destroy_channel_elem(grpc_channel_element *elem, - grpc_closure_list *closure_list) {} +static void +destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +{ +} static const grpc_channel_filter lame_filter = { - lame_start_transport_stream_op, - lame_start_transport_op, - sizeof(call_data), - init_call_elem, - destroy_call_elem, - sizeof(channel_data), - init_channel_elem, - destroy_channel_elem, - lame_get_peer, - "lame-client", + lame_start_transport_stream_op, + lame_start_transport_op, + sizeof (call_data), + init_call_elem, + destroy_call_elem, + sizeof (channel_data), + init_channel_elem, + destroy_channel_elem, + lame_get_peer, + "lame-client", }; #define CHANNEL_STACK_FROM_CHANNEL(c) ((grpc_channel_stack *)((c) + 1)) -grpc_channel *grpc_lame_client_channel_create(const char *target, - grpc_status_code error_code, - const char *error_message) { +grpc_channel * +grpc_lame_client_channel_create (const char *target, grpc_status_code error_code, const char *error_message) +{ grpc_channel *channel; grpc_channel_element *elem; channel_data *chand; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - static const grpc_channel_filter *filters[] = {&lame_filter}; - channel = grpc_channel_create_from_filters( - target, filters, 1, NULL, grpc_mdctx_create(), 1, &closure_list); - elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - GPR_ASSERT(elem->filter == &lame_filter); - chand = (channel_data *)elem->channel_data; + static const grpc_channel_filter *filters[] = { &lame_filter }; + channel = grpc_channel_create_from_filters (target, filters, 1, NULL, grpc_mdctx_create (), 1, &closure_list); + elem = grpc_channel_stack_element (grpc_channel_get_channel_stack (channel), 0); + GPR_ASSERT (elem->filter == &lame_filter); + chand = (channel_data *) elem->channel_data; chand->error_code = error_code; chand->error_message = error_message; - grpc_closure_list_run(&closure_list); + grpc_closure_list_run (&closure_list); return channel; } diff --git a/src/core/surface/metadata_array.c b/src/core/surface/metadata_array.c index 40109774975..5abc582f647 100644 --- a/src/core/surface/metadata_array.c +++ b/src/core/surface/metadata_array.c @@ -36,10 +36,14 @@ #include -void grpc_metadata_array_init(grpc_metadata_array *array) { - memset(array, 0, sizeof(*array)); +void +grpc_metadata_array_init (grpc_metadata_array * array) +{ + memset (array, 0, sizeof (*array)); } -void grpc_metadata_array_destroy(grpc_metadata_array *array) { - gpr_free(array->metadata); +void +grpc_metadata_array_destroy (grpc_metadata_array * array) +{ + gpr_free (array->metadata); } diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 45567428e90..64a2d14a493 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -51,7 +51,8 @@ #include "src/core/transport/chttp2_transport.h" #include "src/core/tsi/transport_security_interface.h" -typedef struct { +typedef struct +{ grpc_connector base; gpr_refcount refs; @@ -70,111 +71,120 @@ typedef struct { grpc_mdctx *mdctx; } connector; -static void connector_ref(grpc_connector *con) { - connector *c = (connector *)con; - gpr_ref(&c->refs); +static void +connector_ref (grpc_connector * con) +{ + connector *c = (connector *) con; + gpr_ref (&c->refs); } -static void connector_unref(grpc_connector *con, - grpc_closure_list *closure_list) { - connector *c = (connector *)con; - if (gpr_unref(&c->refs)) { - grpc_mdctx_unref(c->mdctx); - gpr_free(c); - } +static void +connector_unref (grpc_connector * con, grpc_closure_list * closure_list) +{ + connector *c = (connector *) con; + if (gpr_unref (&c->refs)) + { + grpc_mdctx_unref (c->mdctx); + gpr_free (c); + } } -static void on_secure_handshake_done(void *arg, grpc_security_status status, - grpc_endpoint *wrapped_endpoint, - grpc_endpoint *secure_endpoint, - grpc_closure_list *closure_list) { +static void +on_secure_handshake_done (void *arg, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint, grpc_closure_list * closure_list) +{ connector *c = arg; grpc_closure *notify; - gpr_mu_lock(&c->mu); - if (c->connecting_endpoint == NULL) { - memset(c->result, 0, sizeof(*c->result)); - gpr_mu_unlock(&c->mu); - } else if (status != GRPC_SECURITY_OK) { - GPR_ASSERT(c->connecting_endpoint == wrapped_endpoint); - gpr_log(GPR_ERROR, "Secure handshake failed with error %d.", status); - memset(c->result, 0, sizeof(*c->result)); - c->connecting_endpoint = NULL; - gpr_mu_unlock(&c->mu); - } else { - GPR_ASSERT(c->connecting_endpoint == wrapped_endpoint); - c->connecting_endpoint = NULL; - gpr_mu_unlock(&c->mu); - c->result->transport = grpc_create_chttp2_transport( - c->args.channel_args, secure_endpoint, c->mdctx, 1, closure_list); - grpc_chttp2_transport_start_reading(c->result->transport, NULL, 0, - closure_list); - c->result->filters = gpr_malloc(sizeof(grpc_channel_filter *) * 2); - c->result->filters[0] = &grpc_http_client_filter; - c->result->filters[1] = &grpc_client_auth_filter; - c->result->num_filters = 2; - } + gpr_mu_lock (&c->mu); + if (c->connecting_endpoint == NULL) + { + memset (c->result, 0, sizeof (*c->result)); + gpr_mu_unlock (&c->mu); + } + else if (status != GRPC_SECURITY_OK) + { + GPR_ASSERT (c->connecting_endpoint == wrapped_endpoint); + gpr_log (GPR_ERROR, "Secure handshake failed with error %d.", status); + memset (c->result, 0, sizeof (*c->result)); + c->connecting_endpoint = NULL; + gpr_mu_unlock (&c->mu); + } + else + { + GPR_ASSERT (c->connecting_endpoint == wrapped_endpoint); + c->connecting_endpoint = NULL; + gpr_mu_unlock (&c->mu); + c->result->transport = grpc_create_chttp2_transport (c->args.channel_args, secure_endpoint, c->mdctx, 1, closure_list); + grpc_chttp2_transport_start_reading (c->result->transport, NULL, 0, closure_list); + c->result->filters = gpr_malloc (sizeof (grpc_channel_filter *) * 2); + c->result->filters[0] = &grpc_http_client_filter; + c->result->filters[1] = &grpc_client_auth_filter; + c->result->num_filters = 2; + } notify = c->notify; c->notify = NULL; - notify->cb(notify->cb_arg, 1, closure_list); + notify->cb (notify->cb_arg, 1, closure_list); } -static void connected(void *arg, int success, grpc_closure_list *closure_list) { +static void +connected (void *arg, int success, grpc_closure_list * closure_list) +{ connector *c = arg; grpc_closure *notify; grpc_endpoint *tcp = c->newly_connecting_endpoint; - if (tcp != NULL) { - gpr_mu_lock(&c->mu); - GPR_ASSERT(c->connecting_endpoint == NULL); - c->connecting_endpoint = tcp; - gpr_mu_unlock(&c->mu); - grpc_security_connector_do_handshake(&c->security_connector->base, tcp, - on_secure_handshake_done, c, - closure_list); - } else { - memset(c->result, 0, sizeof(*c->result)); - notify = c->notify; - c->notify = NULL; - notify->cb(notify->cb_arg, 1, closure_list); - } + if (tcp != NULL) + { + gpr_mu_lock (&c->mu); + GPR_ASSERT (c->connecting_endpoint == NULL); + c->connecting_endpoint = tcp; + gpr_mu_unlock (&c->mu); + grpc_security_connector_do_handshake (&c->security_connector->base, tcp, on_secure_handshake_done, c, closure_list); + } + else + { + memset (c->result, 0, sizeof (*c->result)); + notify = c->notify; + c->notify = NULL; + notify->cb (notify->cb_arg, 1, closure_list); + } } -static void connector_shutdown(grpc_connector *con, - grpc_closure_list *closure_list) { - connector *c = (connector *)con; +static void +connector_shutdown (grpc_connector * con, grpc_closure_list * closure_list) +{ + connector *c = (connector *) con; grpc_endpoint *ep; - gpr_mu_lock(&c->mu); + gpr_mu_lock (&c->mu); ep = c->connecting_endpoint; c->connecting_endpoint = NULL; - gpr_mu_unlock(&c->mu); - if (ep) { - grpc_endpoint_shutdown(ep, closure_list); - } + gpr_mu_unlock (&c->mu); + if (ep) + { + grpc_endpoint_shutdown (ep, closure_list); + } } -static void connector_connect(grpc_connector *con, - const grpc_connect_in_args *args, - grpc_connect_out_args *result, - grpc_closure *notify, - grpc_closure_list *closure_list) { - connector *c = (connector *)con; - GPR_ASSERT(c->notify == NULL); - GPR_ASSERT(notify->cb); +static void +connector_connect (grpc_connector * con, const grpc_connect_in_args * args, grpc_connect_out_args * result, grpc_closure * notify, grpc_closure_list * closure_list) +{ + connector *c = (connector *) con; + GPR_ASSERT (c->notify == NULL); + GPR_ASSERT (notify->cb); c->notify = notify; c->args = *args; c->result = result; - gpr_mu_lock(&c->mu); - GPR_ASSERT(c->connecting_endpoint == NULL); - gpr_mu_unlock(&c->mu); - grpc_closure_init(&c->connected_closure, connected, c); - grpc_tcp_client_connect(&c->connected_closure, &c->newly_connecting_endpoint, - args->interested_parties, args->addr, args->addr_len, - args->deadline, closure_list); + gpr_mu_lock (&c->mu); + GPR_ASSERT (c->connecting_endpoint == NULL); + gpr_mu_unlock (&c->mu); + grpc_closure_init (&c->connected_closure, connected, c); + grpc_tcp_client_connect (&c->connected_closure, &c->newly_connecting_endpoint, args->interested_parties, args->addr, args->addr_len, args->deadline, closure_list); } static const grpc_connector_vtable connector_vtable = { - connector_ref, connector_unref, connector_shutdown, connector_connect}; + connector_ref, connector_unref, connector_shutdown, connector_connect +}; -typedef struct { +typedef struct +{ grpc_subchannel_factory base; gpr_refcount refs; grpc_mdctx *mdctx; @@ -183,59 +193,61 @@ typedef struct { grpc_channel *master; } subchannel_factory; -static void subchannel_factory_ref(grpc_subchannel_factory *scf) { - subchannel_factory *f = (subchannel_factory *)scf; - gpr_ref(&f->refs); +static void +subchannel_factory_ref (grpc_subchannel_factory * scf) +{ + subchannel_factory *f = (subchannel_factory *) scf; + gpr_ref (&f->refs); } -static void subchannel_factory_unref(grpc_subchannel_factory *scf, - grpc_closure_list *closure_list) { - subchannel_factory *f = (subchannel_factory *)scf; - if (gpr_unref(&f->refs)) { - GRPC_SECURITY_CONNECTOR_UNREF(&f->security_connector->base, - "subchannel_factory"); - GRPC_CHANNEL_INTERNAL_UNREF(f->master, "subchannel_factory", closure_list); - grpc_channel_args_destroy(f->merge_args); - grpc_mdctx_unref(f->mdctx); - gpr_free(f); - } +static void +subchannel_factory_unref (grpc_subchannel_factory * scf, grpc_closure_list * closure_list) +{ + subchannel_factory *f = (subchannel_factory *) scf; + if (gpr_unref (&f->refs)) + { + GRPC_SECURITY_CONNECTOR_UNREF (&f->security_connector->base, "subchannel_factory"); + GRPC_CHANNEL_INTERNAL_UNREF (f->master, "subchannel_factory", closure_list); + grpc_channel_args_destroy (f->merge_args); + grpc_mdctx_unref (f->mdctx); + gpr_free (f); + } } -static grpc_subchannel *subchannel_factory_create_subchannel( - grpc_subchannel_factory *scf, grpc_subchannel_args *args, - grpc_closure_list *closure_list) { - subchannel_factory *f = (subchannel_factory *)scf; - connector *c = gpr_malloc(sizeof(*c)); - grpc_channel_args *final_args = - grpc_channel_args_merge(args->args, f->merge_args); +static grpc_subchannel * +subchannel_factory_create_subchannel (grpc_subchannel_factory * scf, grpc_subchannel_args * args, grpc_closure_list * closure_list) +{ + subchannel_factory *f = (subchannel_factory *) scf; + connector *c = gpr_malloc (sizeof (*c)); + grpc_channel_args *final_args = grpc_channel_args_merge (args->args, f->merge_args); grpc_subchannel *s; - memset(c, 0, sizeof(*c)); + memset (c, 0, sizeof (*c)); c->base.vtable = &connector_vtable; c->security_connector = f->security_connector; c->mdctx = f->mdctx; - grpc_mdctx_ref(c->mdctx); - gpr_ref_init(&c->refs, 1); + grpc_mdctx_ref (c->mdctx); + gpr_ref_init (&c->refs, 1); args->args = final_args; args->master = f->master; args->mdctx = f->mdctx; - s = grpc_subchannel_create(&c->base, args); - grpc_connector_unref(&c->base, closure_list); - grpc_channel_args_destroy(final_args); + s = grpc_subchannel_create (&c->base, args); + grpc_connector_unref (&c->base, closure_list); + grpc_channel_args_destroy (final_args); return s; } static const grpc_subchannel_factory_vtable subchannel_factory_vtable = { - subchannel_factory_ref, subchannel_factory_unref, - subchannel_factory_create_subchannel}; + subchannel_factory_ref, subchannel_factory_unref, + subchannel_factory_create_subchannel +}; /* Create a secure client channel: Asynchronously: - resolve target - connect to it (trying alternatives as presented) - perform handshakes */ -grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, - const char *target, - const grpc_channel_args *args, - void *reserved) { +grpc_channel * +grpc_secure_channel_create (grpc_credentials * creds, const char *target, const grpc_channel_args * args, void *reserved) +{ grpc_channel *channel; grpc_arg connector_arg; grpc_channel_args *args_copy; @@ -249,64 +261,59 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; size_t n = 0; - GPR_ASSERT(reserved == NULL); - if (grpc_find_security_connector_in_args(args) != NULL) { - gpr_log(GPR_ERROR, "Cannot set security context in channel args."); - return grpc_lame_client_channel_create( - target, GRPC_STATUS_INVALID_ARGUMENT, - "Security connector exists in channel args."); - } - - if (grpc_credentials_create_security_connector( - creds, target, args, NULL, &connector, &new_args_from_connector) != - GRPC_SECURITY_OK) { - return grpc_lame_client_channel_create( - target, GRPC_STATUS_INVALID_ARGUMENT, - "Failed to create security connector."); - } - mdctx = grpc_mdctx_create(); - - connector_arg = grpc_security_connector_to_arg(&connector->base); - args_copy = grpc_channel_args_copy_and_add( - new_args_from_connector != NULL ? new_args_from_connector : args, - &connector_arg, 1); - if (grpc_channel_args_is_census_enabled(args)) { - filters[n++] = &grpc_client_census_filter; - } + GPR_ASSERT (reserved == NULL); + if (grpc_find_security_connector_in_args (args) != NULL) + { + gpr_log (GPR_ERROR, "Cannot set security context in channel args."); + return grpc_lame_client_channel_create (target, GRPC_STATUS_INVALID_ARGUMENT, "Security connector exists in channel args."); + } + + if (grpc_credentials_create_security_connector (creds, target, args, NULL, &connector, &new_args_from_connector) != GRPC_SECURITY_OK) + { + return grpc_lame_client_channel_create (target, GRPC_STATUS_INVALID_ARGUMENT, "Failed to create security connector."); + } + mdctx = grpc_mdctx_create (); + + connector_arg = grpc_security_connector_to_arg (&connector->base); + args_copy = grpc_channel_args_copy_and_add (new_args_from_connector != NULL ? new_args_from_connector : args, &connector_arg, 1); + if (grpc_channel_args_is_census_enabled (args)) + { + filters[n++] = &grpc_client_census_filter; + } filters[n++] = &grpc_compress_filter; filters[n++] = &grpc_client_channel_filter; - GPR_ASSERT(n <= MAX_FILTERS); + GPR_ASSERT (n <= MAX_FILTERS); - channel = grpc_channel_create_from_filters(target, filters, n, args_copy, - mdctx, 1, &closure_list); + channel = grpc_channel_create_from_filters (target, filters, n, args_copy, mdctx, 1, &closure_list); - f = gpr_malloc(sizeof(*f)); + f = gpr_malloc (sizeof (*f)); f->base.vtable = &subchannel_factory_vtable; - gpr_ref_init(&f->refs, 1); - grpc_mdctx_ref(mdctx); + gpr_ref_init (&f->refs, 1); + grpc_mdctx_ref (mdctx); f->mdctx = mdctx; - GRPC_SECURITY_CONNECTOR_REF(&connector->base, "subchannel_factory"); + GRPC_SECURITY_CONNECTOR_REF (&connector->base, "subchannel_factory"); f->security_connector = connector; - f->merge_args = grpc_channel_args_copy(args_copy); + f->merge_args = grpc_channel_args_copy (args_copy); f->master = channel; - GRPC_CHANNEL_INTERNAL_REF(channel, "subchannel_factory"); - resolver = grpc_resolver_create(target, &f->base); - if (!resolver) { - return NULL; - } - - grpc_client_channel_set_resolver(grpc_channel_get_channel_stack(channel), - resolver, &closure_list); - GRPC_RESOLVER_UNREF(resolver, "create", &closure_list); - grpc_subchannel_factory_unref(&f->base, &closure_list); - GRPC_SECURITY_CONNECTOR_UNREF(&connector->base, "channel_create"); - - grpc_channel_args_destroy(args_copy); - if (new_args_from_connector != NULL) { - grpc_channel_args_destroy(new_args_from_connector); - } - - grpc_closure_list_run(&closure_list); + GRPC_CHANNEL_INTERNAL_REF (channel, "subchannel_factory"); + resolver = grpc_resolver_create (target, &f->base); + if (!resolver) + { + return NULL; + } + + grpc_client_channel_set_resolver (grpc_channel_get_channel_stack (channel), resolver, &closure_list); + GRPC_RESOLVER_UNREF (resolver, "create", &closure_list); + grpc_subchannel_factory_unref (&f->base, &closure_list); + GRPC_SECURITY_CONNECTOR_UNREF (&connector->base, "channel_create"); + + grpc_channel_args_destroy (args_copy); + if (new_args_from_connector != NULL) + { + grpc_channel_args_destroy (new_args_from_connector); + } + + grpc_closure_list_run (&closure_list); return channel; } diff --git a/src/core/surface/server.c b/src/core/surface/server.c index cedc20efd3b..8df578d1923 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -54,12 +54,11 @@ #include "src/core/surface/init.h" #include "src/core/transport/metadata.h" -typedef struct listener { +typedef struct listener +{ void *arg; - void (*start)(grpc_server *server, void *arg, grpc_pollset **pollsets, - size_t pollset_count, grpc_closure_list *closure_list); - void (*destroy)(grpc_server *server, void *arg, grpc_closure *closure, - grpc_closure_list *closure_list); + void (*start) (grpc_server * server, void *arg, grpc_pollset ** pollsets, size_t pollset_count, grpc_closure_list * closure_list); + void (*destroy) (grpc_server * server, void *arg, grpc_closure * closure, grpc_closure_list * closure_list); struct listener *next; grpc_closure destroy_done; } listener; @@ -68,14 +67,17 @@ typedef struct call_data call_data; typedef struct channel_data channel_data; typedef struct registered_method registered_method; -typedef struct { +typedef struct +{ call_data *next; call_data *prev; } call_link; -typedef enum { BATCH_CALL, REGISTERED_CALL } requested_call_type; +typedef enum +{ BATCH_CALL, REGISTERED_CALL } requested_call_type; -typedef struct requested_call { +typedef struct requested_call +{ requested_call_type type; void *tag; grpc_server *server; @@ -83,12 +85,15 @@ typedef struct requested_call { grpc_completion_queue *cq_for_notification; grpc_call **call; grpc_cq_completion completion; - union { - struct { + union + { + struct + { grpc_call_details *details; grpc_metadata_array *initial_metadata; } batch; - struct { + struct + { registered_method *registered_method; gpr_timespec *deadline; grpc_metadata_array *initial_metadata; @@ -97,13 +102,15 @@ typedef struct requested_call { } data; } requested_call; -typedef struct channel_registered_method { +typedef struct channel_registered_method +{ registered_method *server_registered_method; grpc_mdstr *method; grpc_mdstr *host; } channel_registered_method; -struct channel_data { +struct channel_data +{ grpc_server *server; grpc_connectivity_state connectivity_state; grpc_channel *channel; @@ -119,13 +126,15 @@ struct channel_data { grpc_closure channel_connectivity_changed; }; -typedef struct shutdown_tag { +typedef struct shutdown_tag +{ void *tag; grpc_completion_queue *cq; grpc_cq_completion completion; } shutdown_tag; -typedef enum { +typedef enum +{ /* waiting for metadata */ NOT_STARTED, /* inital metadata read, not flow controlled in yet */ @@ -138,7 +147,8 @@ typedef enum { typedef struct request_matcher request_matcher; -struct call_data { +struct call_data +{ grpc_call *call; /** protects state */ @@ -163,25 +173,29 @@ struct call_data { call_data *pending_next; }; -struct request_matcher { +struct request_matcher +{ call_data *pending_head; call_data *pending_tail; gpr_stack_lockfree *requests; }; -struct registered_method { +struct registered_method +{ char *method; char *host; request_matcher request_matcher; registered_method *next; }; -typedef struct { +typedef struct +{ grpc_channel **channels; size_t num_channels; } channel_broadcaster; -struct grpc_server { +struct grpc_server +{ size_t channel_filter_count; const grpc_channel_filter **channel_filters; grpc_channel_args *channel_args; @@ -197,8 +211,8 @@ struct grpc_server { If they are ever required to be nested, you must lock mu_global before mu_call. This is currently used in shutdown processing (grpc_server_shutdown_and_notify and maybe_finish_shutdown) */ - gpr_mu mu_global; /* mutex for server and channel state */ - gpr_mu mu_call; /* mutex for call-specific state */ + gpr_mu mu_global; /* mutex for server and channel state */ + gpr_mu mu_call; /* mutex for call-specific state */ registered_method *registered_methods; request_matcher unregistered_request_matcher; @@ -226,237 +240,267 @@ struct grpc_server { #define SERVER_FROM_CALL_ELEM(elem) \ (((channel_data *)(elem)->channel_data)->server) -static void begin_call(grpc_server *server, call_data *calld, - requested_call *rc, grpc_closure_list *closure_list); -static void fail_call(grpc_server *server, requested_call *rc, - grpc_closure_list *closure_list); +static void begin_call (grpc_server * server, call_data * calld, requested_call * rc, grpc_closure_list * closure_list); +static void fail_call (grpc_server * server, requested_call * rc, grpc_closure_list * closure_list); /* Before calling maybe_finish_shutdown, we must hold mu_global and not hold mu_call */ -static void maybe_finish_shutdown(grpc_server *server, - grpc_closure_list *closure_list); +static void maybe_finish_shutdown (grpc_server * server, grpc_closure_list * closure_list); /* * channel broadcaster */ /* assumes server locked */ -static void channel_broadcaster_init(grpc_server *s, channel_broadcaster *cb) { +static void +channel_broadcaster_init (grpc_server * s, channel_broadcaster * cb) +{ channel_data *c; size_t count = 0; - for (c = s->root_channel_data.next; c != &s->root_channel_data; c = c->next) { - count++; - } + for (c = s->root_channel_data.next; c != &s->root_channel_data; c = c->next) + { + count++; + } cb->num_channels = count; - cb->channels = gpr_malloc(sizeof(*cb->channels) * cb->num_channels); + cb->channels = gpr_malloc (sizeof (*cb->channels) * cb->num_channels); count = 0; - for (c = s->root_channel_data.next; c != &s->root_channel_data; c = c->next) { - cb->channels[count++] = c->channel; - GRPC_CHANNEL_INTERNAL_REF(c->channel, "broadcast"); - } + for (c = s->root_channel_data.next; c != &s->root_channel_data; c = c->next) + { + cb->channels[count++] = c->channel; + GRPC_CHANNEL_INTERNAL_REF (c->channel, "broadcast"); + } } -struct shutdown_cleanup_args { +struct shutdown_cleanup_args +{ grpc_closure closure; gpr_slice slice; }; -static void shutdown_cleanup(void *arg, int iomgr_status_ignored, - grpc_closure_list *closure_list) { +static void +shutdown_cleanup (void *arg, int iomgr_status_ignored, grpc_closure_list * closure_list) +{ struct shutdown_cleanup_args *a = arg; - gpr_slice_unref(a->slice); - gpr_free(a); + gpr_slice_unref (a->slice); + gpr_free (a); } -static void send_shutdown(grpc_channel *channel, int send_goaway, - int send_disconnect, - grpc_closure_list *closure_list) { +static void +send_shutdown (grpc_channel * channel, int send_goaway, int send_disconnect, grpc_closure_list * closure_list) +{ grpc_transport_op op; struct shutdown_cleanup_args *sc; grpc_channel_element *elem; - memset(&op, 0, sizeof(op)); + memset (&op, 0, sizeof (op)); op.send_goaway = send_goaway; - sc = gpr_malloc(sizeof(*sc)); - sc->slice = gpr_slice_from_copied_string("Server shutdown"); + sc = gpr_malloc (sizeof (*sc)); + sc->slice = gpr_slice_from_copied_string ("Server shutdown"); op.goaway_message = &sc->slice; op.goaway_status = GRPC_STATUS_OK; op.disconnect = send_disconnect; - grpc_closure_init(&sc->closure, shutdown_cleanup, sc); + grpc_closure_init (&sc->closure, shutdown_cleanup, sc); op.on_consumed = &sc->closure; - elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - elem->filter->start_transport_op(elem, &op, closure_list); + elem = grpc_channel_stack_element (grpc_channel_get_channel_stack (channel), 0); + elem->filter->start_transport_op (elem, &op, closure_list); } -static void channel_broadcaster_shutdown(channel_broadcaster *cb, - int send_goaway, int force_disconnect, - grpc_closure_list *closure_list) { +static void +channel_broadcaster_shutdown (channel_broadcaster * cb, int send_goaway, int force_disconnect, grpc_closure_list * closure_list) +{ size_t i; - for (i = 0; i < cb->num_channels; i++) { - send_shutdown(cb->channels[i], send_goaway, force_disconnect, closure_list); - GRPC_CHANNEL_INTERNAL_UNREF(cb->channels[i], "broadcast", closure_list); - } - gpr_free(cb->channels); + for (i = 0; i < cb->num_channels; i++) + { + send_shutdown (cb->channels[i], send_goaway, force_disconnect, closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (cb->channels[i], "broadcast", closure_list); + } + gpr_free (cb->channels); } /* * request_matcher */ -static void request_matcher_init(request_matcher *request_matcher, - size_t entries) { - memset(request_matcher, 0, sizeof(*request_matcher)); - request_matcher->requests = gpr_stack_lockfree_create(entries); +static void +request_matcher_init (request_matcher * request_matcher, size_t entries) +{ + memset (request_matcher, 0, sizeof (*request_matcher)); + request_matcher->requests = gpr_stack_lockfree_create (entries); } -static void request_matcher_destroy(request_matcher *request_matcher) { - GPR_ASSERT(gpr_stack_lockfree_pop(request_matcher->requests) == -1); - gpr_stack_lockfree_destroy(request_matcher->requests); +static void +request_matcher_destroy (request_matcher * request_matcher) +{ + GPR_ASSERT (gpr_stack_lockfree_pop (request_matcher->requests) == -1); + gpr_stack_lockfree_destroy (request_matcher->requests); } -static void kill_zombie(void *elem, int success, - grpc_closure_list *closure_list) { - grpc_call_destroy(grpc_call_from_top_element(elem)); +static void +kill_zombie (void *elem, int success, grpc_closure_list * closure_list) +{ + grpc_call_destroy (grpc_call_from_top_element (elem)); } -static void request_matcher_zombify_all_pending_calls( - request_matcher *request_matcher, grpc_closure_list *closure_list) { - while (request_matcher->pending_head) { - call_data *calld = request_matcher->pending_head; - request_matcher->pending_head = calld->pending_next; - gpr_mu_lock(&calld->mu_state); - calld->state = ZOMBIED; - gpr_mu_unlock(&calld->mu_state); - grpc_closure_init( - &calld->kill_zombie_closure, kill_zombie, - grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0)); - grpc_closure_list_add(closure_list, &calld->kill_zombie_closure, 1); - } +static void +request_matcher_zombify_all_pending_calls (request_matcher * request_matcher, grpc_closure_list * closure_list) +{ + while (request_matcher->pending_head) + { + call_data *calld = request_matcher->pending_head; + request_matcher->pending_head = calld->pending_next; + gpr_mu_lock (&calld->mu_state); + calld->state = ZOMBIED; + gpr_mu_unlock (&calld->mu_state); + grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element (grpc_call_get_call_stack (calld->call), 0)); + grpc_closure_list_add (closure_list, &calld->kill_zombie_closure, 1); + } } -static void request_matcher_kill_requests(grpc_server *server, - request_matcher *rm, - grpc_closure_list *closure_list) { +static void +request_matcher_kill_requests (grpc_server * server, request_matcher * rm, grpc_closure_list * closure_list) +{ int request_id; - while ((request_id = gpr_stack_lockfree_pop(rm->requests)) != -1) { - fail_call(server, &server->requested_calls[request_id], closure_list); - } + while ((request_id = gpr_stack_lockfree_pop (rm->requests)) != -1) + { + fail_call (server, &server->requested_calls[request_id], closure_list); + } } /* * server proper */ -static void server_ref(grpc_server *server) { - gpr_ref(&server->internal_refcount); +static void +server_ref (grpc_server * server) +{ + gpr_ref (&server->internal_refcount); } -static void server_delete(grpc_server *server, - grpc_closure_list *closure_list) { +static void +server_delete (grpc_server * server, grpc_closure_list * closure_list) +{ registered_method *rm; size_t i; - grpc_channel_args_destroy(server->channel_args); - gpr_mu_destroy(&server->mu_global); - gpr_mu_destroy(&server->mu_call); - gpr_free(server->channel_filters); - while ((rm = server->registered_methods) != NULL) { - server->registered_methods = rm->next; - request_matcher_destroy(&rm->request_matcher); - gpr_free(rm->method); - gpr_free(rm->host); - gpr_free(rm); - } - for (i = 0; i < server->cq_count; i++) { - GRPC_CQ_INTERNAL_UNREF(server->cqs[i], "server"); - } - request_matcher_destroy(&server->unregistered_request_matcher); - gpr_stack_lockfree_destroy(server->request_freelist); - gpr_free(server->cqs); - gpr_free(server->pollsets); - gpr_free(server->shutdown_tags); - gpr_free(server->requested_calls); - gpr_free(server); + grpc_channel_args_destroy (server->channel_args); + gpr_mu_destroy (&server->mu_global); + gpr_mu_destroy (&server->mu_call); + gpr_free (server->channel_filters); + while ((rm = server->registered_methods) != NULL) + { + server->registered_methods = rm->next; + request_matcher_destroy (&rm->request_matcher); + gpr_free (rm->method); + gpr_free (rm->host); + gpr_free (rm); + } + for (i = 0; i < server->cq_count; i++) + { + GRPC_CQ_INTERNAL_UNREF (server->cqs[i], "server"); + } + request_matcher_destroy (&server->unregistered_request_matcher); + gpr_stack_lockfree_destroy (server->request_freelist); + gpr_free (server->cqs); + gpr_free (server->pollsets); + gpr_free (server->shutdown_tags); + gpr_free (server->requested_calls); + gpr_free (server); } -static void server_unref(grpc_server *server, grpc_closure_list *closure_list) { - if (gpr_unref(&server->internal_refcount)) { - server_delete(server, closure_list); - } +static void +server_unref (grpc_server * server, grpc_closure_list * closure_list) +{ + if (gpr_unref (&server->internal_refcount)) + { + server_delete (server, closure_list); + } } -static int is_channel_orphaned(channel_data *chand) { +static int +is_channel_orphaned (channel_data * chand) +{ return chand->next == chand; } -static void orphan_channel(channel_data *chand) { +static void +orphan_channel (channel_data * chand) +{ chand->next->prev = chand->prev; chand->prev->next = chand->next; chand->next = chand->prev = chand; } -static void finish_destroy_channel(void *cd, int success, - grpc_closure_list *closure_list) { +static void +finish_destroy_channel (void *cd, int success, grpc_closure_list * closure_list) +{ channel_data *chand = cd; grpc_server *server = chand->server; - gpr_log(GPR_DEBUG, "finish_destroy_channel: %p", chand->channel); - GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "server", closure_list); - server_unref(server, closure_list); + gpr_log (GPR_DEBUG, "finish_destroy_channel: %p", chand->channel); + GRPC_CHANNEL_INTERNAL_UNREF (chand->channel, "server", closure_list); + server_unref (server, closure_list); } -static void destroy_channel(channel_data *chand, - grpc_closure_list *closure_list) { - if (is_channel_orphaned(chand)) return; - GPR_ASSERT(chand->server != NULL); - orphan_channel(chand); - server_ref(chand->server); - maybe_finish_shutdown(chand->server, closure_list); +static void +destroy_channel (channel_data * chand, grpc_closure_list * closure_list) +{ + if (is_channel_orphaned (chand)) + return; + GPR_ASSERT (chand->server != NULL); + orphan_channel (chand); + server_ref (chand->server); + maybe_finish_shutdown (chand->server, closure_list); chand->finish_destroy_channel_closure.cb = finish_destroy_channel; chand->finish_destroy_channel_closure.cb_arg = chand; - grpc_closure_list_add(closure_list, &chand->finish_destroy_channel_closure, - 1); + grpc_closure_list_add (closure_list, &chand->finish_destroy_channel_closure, 1); } -static void finish_start_new_rpc(grpc_server *server, grpc_call_element *elem, - request_matcher *request_matcher, - grpc_closure_list *closure_list) { +static void +finish_start_new_rpc (grpc_server * server, grpc_call_element * elem, request_matcher * request_matcher, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; int request_id; - if (gpr_atm_acq_load(&server->shutdown_flag)) { - gpr_mu_lock(&calld->mu_state); - calld->state = ZOMBIED; - gpr_mu_unlock(&calld->mu_state); - grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); - grpc_closure_list_add(closure_list, &calld->kill_zombie_closure, 1); - return; - } - - request_id = gpr_stack_lockfree_pop(request_matcher->requests); - if (request_id == -1) { - gpr_mu_lock(&server->mu_call); - gpr_mu_lock(&calld->mu_state); - calld->state = PENDING; - gpr_mu_unlock(&calld->mu_state); - if (request_matcher->pending_head == NULL) { - request_matcher->pending_tail = request_matcher->pending_head = calld; - } else { - request_matcher->pending_tail->pending_next = calld; - request_matcher->pending_tail = calld; + if (gpr_atm_acq_load (&server->shutdown_flag)) + { + gpr_mu_lock (&calld->mu_state); + calld->state = ZOMBIED; + gpr_mu_unlock (&calld->mu_state); + grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, elem); + grpc_closure_list_add (closure_list, &calld->kill_zombie_closure, 1); + return; + } + + request_id = gpr_stack_lockfree_pop (request_matcher->requests); + if (request_id == -1) + { + gpr_mu_lock (&server->mu_call); + gpr_mu_lock (&calld->mu_state); + calld->state = PENDING; + gpr_mu_unlock (&calld->mu_state); + if (request_matcher->pending_head == NULL) + { + request_matcher->pending_tail = request_matcher->pending_head = calld; + } + else + { + request_matcher->pending_tail->pending_next = calld; + request_matcher->pending_tail = calld; + } + calld->pending_next = NULL; + gpr_mu_unlock (&server->mu_call); + } + else + { + gpr_mu_lock (&calld->mu_state); + calld->state = ACTIVATED; + gpr_mu_unlock (&calld->mu_state); + begin_call (server, calld, &server->requested_calls[request_id], closure_list); } - calld->pending_next = NULL; - gpr_mu_unlock(&server->mu_call); - } else { - gpr_mu_lock(&calld->mu_state); - calld->state = ACTIVATED; - gpr_mu_unlock(&calld->mu_state); - begin_call(server, calld, &server->requested_calls[request_id], - closure_list); - } } -static void start_new_rpc(grpc_call_element *elem, - grpc_closure_list *closure_list) { +static void +start_new_rpc (grpc_call_element * elem, grpc_closure_list * closure_list) +{ channel_data *chand = elem->channel_data; call_data *calld = elem->call_data; grpc_server *server = chand->server; @@ -464,383 +508,411 @@ static void start_new_rpc(grpc_call_element *elem, gpr_uint32 hash; channel_registered_method *rm; - if (chand->registered_methods && calld->path && calld->host) { - /* TODO(ctiller): unify these two searches */ - /* check for an exact match with host */ - hash = GRPC_MDSTR_KV_HASH(calld->host->hash, calld->path->hash); - for (i = 0; i <= chand->registered_method_max_probes; i++) { - rm = &chand->registered_methods[(hash + i) % - chand->registered_method_slots]; - if (!rm) break; - if (rm->host != calld->host) continue; - if (rm->method != calld->path) continue; - finish_start_new_rpc(server, elem, - &rm->server_registered_method->request_matcher, - closure_list); - return; - } - /* check for a wildcard method definition (no host set) */ - hash = GRPC_MDSTR_KV_HASH(0, calld->path->hash); - for (i = 0; i <= chand->registered_method_max_probes; i++) { - rm = &chand->registered_methods[(hash + i) % - chand->registered_method_slots]; - if (!rm) break; - if (rm->host != NULL) continue; - if (rm->method != calld->path) continue; - finish_start_new_rpc(server, elem, - &rm->server_registered_method->request_matcher, - closure_list); - return; + if (chand->registered_methods && calld->path && calld->host) + { + /* TODO(ctiller): unify these two searches */ + /* check for an exact match with host */ + hash = GRPC_MDSTR_KV_HASH (calld->host->hash, calld->path->hash); + for (i = 0; i <= chand->registered_method_max_probes; i++) + { + rm = &chand->registered_methods[(hash + i) % chand->registered_method_slots]; + if (!rm) + break; + if (rm->host != calld->host) + continue; + if (rm->method != calld->path) + continue; + finish_start_new_rpc (server, elem, &rm->server_registered_method->request_matcher, closure_list); + return; + } + /* check for a wildcard method definition (no host set) */ + hash = GRPC_MDSTR_KV_HASH (0, calld->path->hash); + for (i = 0; i <= chand->registered_method_max_probes; i++) + { + rm = &chand->registered_methods[(hash + i) % chand->registered_method_slots]; + if (!rm) + break; + if (rm->host != NULL) + continue; + if (rm->method != calld->path) + continue; + finish_start_new_rpc (server, elem, &rm->server_registered_method->request_matcher, closure_list); + return; + } } - } - finish_start_new_rpc(server, elem, &server->unregistered_request_matcher, - closure_list); + finish_start_new_rpc (server, elem, &server->unregistered_request_matcher, closure_list); } -static int num_listeners(grpc_server *server) { +static int +num_listeners (grpc_server * server) +{ listener *l; int n = 0; - for (l = server->listeners; l; l = l->next) { - n++; - } + for (l = server->listeners; l; l = l->next) + { + n++; + } return n; } -static void done_shutdown_event(void *server, grpc_cq_completion *completion, - grpc_closure_list *closure_list) { - server_unref(server, closure_list); +static void +done_shutdown_event (void *server, grpc_cq_completion * completion, grpc_closure_list * closure_list) +{ + server_unref (server, closure_list); } -static int num_channels(grpc_server *server) { +static int +num_channels (grpc_server * server) +{ channel_data *chand; int n = 0; - for (chand = server->root_channel_data.next; - chand != &server->root_channel_data; chand = chand->next) { - n++; - } + for (chand = server->root_channel_data.next; chand != &server->root_channel_data; chand = chand->next) + { + n++; + } return n; } -static void kill_pending_work_locked(grpc_server *server, - grpc_closure_list *closure_list) { +static void +kill_pending_work_locked (grpc_server * server, grpc_closure_list * closure_list) +{ registered_method *rm; - request_matcher_kill_requests(server, &server->unregistered_request_matcher, - closure_list); - request_matcher_zombify_all_pending_calls( - &server->unregistered_request_matcher, closure_list); - for (rm = server->registered_methods; rm; rm = rm->next) { - request_matcher_kill_requests(server, &rm->request_matcher, closure_list); - request_matcher_zombify_all_pending_calls(&rm->request_matcher, - closure_list); - } + request_matcher_kill_requests (server, &server->unregistered_request_matcher, closure_list); + request_matcher_zombify_all_pending_calls (&server->unregistered_request_matcher, closure_list); + for (rm = server->registered_methods; rm; rm = rm->next) + { + request_matcher_kill_requests (server, &rm->request_matcher, closure_list); + request_matcher_zombify_all_pending_calls (&rm->request_matcher, closure_list); + } } -static void maybe_finish_shutdown(grpc_server *server, - grpc_closure_list *closure_list) { +static void +maybe_finish_shutdown (grpc_server * server, grpc_closure_list * closure_list) +{ size_t i; - if (!gpr_atm_acq_load(&server->shutdown_flag) || server->shutdown_published) { - return; - } - - kill_pending_work_locked(server, closure_list); - - if (server->root_channel_data.next != &server->root_channel_data || - server->listeners_destroyed < num_listeners(server)) { - if (gpr_time_cmp(gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), - server->last_shutdown_message_time), - gpr_time_from_seconds(1, GPR_TIMESPAN)) >= 0) { - server->last_shutdown_message_time = gpr_now(GPR_CLOCK_REALTIME); - gpr_log(GPR_DEBUG, - "Waiting for %d channels and %d/%d listeners to be destroyed" - " before shutting down server", - num_channels(server), - num_listeners(server) - server->listeners_destroyed, - num_listeners(server)); + if (!gpr_atm_acq_load (&server->shutdown_flag) || server->shutdown_published) + { + return; + } + + kill_pending_work_locked (server, closure_list); + + if (server->root_channel_data.next != &server->root_channel_data || server->listeners_destroyed < num_listeners (server)) + { + if (gpr_time_cmp (gpr_time_sub (gpr_now (GPR_CLOCK_REALTIME), server->last_shutdown_message_time), gpr_time_from_seconds (1, GPR_TIMESPAN)) >= 0) + { + server->last_shutdown_message_time = gpr_now (GPR_CLOCK_REALTIME); + gpr_log (GPR_DEBUG, "Waiting for %d channels and %d/%d listeners to be destroyed" " before shutting down server", num_channels (server), num_listeners (server) - server->listeners_destroyed, num_listeners (server)); + } + return; } - return; - } 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, 1, - done_shutdown_event, server, - &server->shutdown_tags[i].completion, closure_list); - } + 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, 1, done_shutdown_event, server, &server->shutdown_tags[i].completion, closure_list); + } } -static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { +static grpc_mdelem * +server_filter (void *user_data, grpc_mdelem * md) +{ grpc_call_element *elem = user_data; channel_data *chand = elem->channel_data; call_data *calld = elem->call_data; - if (md->key == chand->path_key) { - calld->path = GRPC_MDSTR_REF(md->value); - return NULL; - } else if (md->key == chand->authority_key) { - calld->host = GRPC_MDSTR_REF(md->value); - return NULL; - } + if (md->key == chand->path_key) + { + calld->path = GRPC_MDSTR_REF (md->value); + return NULL; + } + else if (md->key == chand->authority_key) + { + calld->host = GRPC_MDSTR_REF (md->value); + return NULL; + } return md; } -static void server_on_recv(void *ptr, int success, - grpc_closure_list *closure_list) { +static void +server_on_recv (void *ptr, int success, grpc_closure_list * closure_list) +{ grpc_call_element *elem = ptr; call_data *calld = elem->call_data; gpr_timespec op_deadline; - if (success && !calld->got_initial_metadata) { - size_t i; - size_t nops = calld->recv_ops->nops; - grpc_stream_op *ops = calld->recv_ops->ops; - for (i = 0; i < nops; i++) { - grpc_stream_op *op = &ops[i]; - if (op->type != GRPC_OP_METADATA) continue; - grpc_metadata_batch_filter(&op->data.metadata, server_filter, elem); - op_deadline = op->data.metadata.deadline; - if (0 != - gpr_time_cmp(op_deadline, gpr_inf_future(op_deadline.clock_type))) { - calld->deadline = op->data.metadata.deadline; - } - if (calld->host && calld->path) { - calld->got_initial_metadata = 1; - start_new_rpc(elem, closure_list); - } - break; + if (success && !calld->got_initial_metadata) + { + size_t i; + size_t nops = calld->recv_ops->nops; + grpc_stream_op *ops = calld->recv_ops->ops; + for (i = 0; i < nops; i++) + { + grpc_stream_op *op = &ops[i]; + if (op->type != GRPC_OP_METADATA) + continue; + grpc_metadata_batch_filter (&op->data.metadata, server_filter, elem); + op_deadline = op->data.metadata.deadline; + if (0 != gpr_time_cmp (op_deadline, gpr_inf_future (op_deadline.clock_type))) + { + calld->deadline = op->data.metadata.deadline; + } + if (calld->host && calld->path) + { + calld->got_initial_metadata = 1; + start_new_rpc (elem, closure_list); + } + break; + } } - } - switch (*calld->recv_state) { + switch (*calld->recv_state) + { case GRPC_STREAM_OPEN: break; case GRPC_STREAM_SEND_CLOSED: break; case GRPC_STREAM_RECV_CLOSED: - gpr_mu_lock(&calld->mu_state); - if (calld->state == NOT_STARTED) { - calld->state = ZOMBIED; - gpr_mu_unlock(&calld->mu_state); - grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); - grpc_closure_list_add(closure_list, &calld->kill_zombie_closure, 1); - } else { - gpr_mu_unlock(&calld->mu_state); - } + gpr_mu_lock (&calld->mu_state); + if (calld->state == NOT_STARTED) + { + calld->state = ZOMBIED; + gpr_mu_unlock (&calld->mu_state); + grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, elem); + grpc_closure_list_add (closure_list, &calld->kill_zombie_closure, 1); + } + else + { + gpr_mu_unlock (&calld->mu_state); + } break; case GRPC_STREAM_CLOSED: - gpr_mu_lock(&calld->mu_state); - if (calld->state == NOT_STARTED) { - calld->state = ZOMBIED; - gpr_mu_unlock(&calld->mu_state); - grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); - grpc_closure_list_add(closure_list, &calld->kill_zombie_closure, 1); - } else if (calld->state == PENDING) { - calld->state = ZOMBIED; - gpr_mu_unlock(&calld->mu_state); - /* zombied call will be destroyed when it's removed from the pending - queue... later */ - } else { - gpr_mu_unlock(&calld->mu_state); - } + gpr_mu_lock (&calld->mu_state); + if (calld->state == NOT_STARTED) + { + calld->state = ZOMBIED; + gpr_mu_unlock (&calld->mu_state); + grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, elem); + grpc_closure_list_add (closure_list, &calld->kill_zombie_closure, 1); + } + else if (calld->state == PENDING) + { + calld->state = ZOMBIED; + gpr_mu_unlock (&calld->mu_state); + /* zombied call will be destroyed when it's removed from the pending + queue... later */ + } + else + { + gpr_mu_unlock (&calld->mu_state); + } break; - } + } - calld->on_done_recv->cb(calld->on_done_recv->cb_arg, success, closure_list); + calld->on_done_recv->cb (calld->on_done_recv->cb_arg, success, closure_list); } -static void server_mutate_op(grpc_call_element *elem, - grpc_transport_stream_op *op) { +static void +server_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) +{ call_data *calld = elem->call_data; - if (op->recv_ops) { - /* substitute our callback for the higher callback */ - calld->recv_ops = op->recv_ops; - calld->recv_state = op->recv_state; - calld->on_done_recv = op->on_done_recv; - op->on_done_recv = &calld->server_on_recv; - } + if (op->recv_ops) + { + /* substitute our callback for the higher callback */ + calld->recv_ops = op->recv_ops; + calld->recv_state = op->recv_state; + calld->on_done_recv = op->on_done_recv; + op->on_done_recv = &calld->server_on_recv; + } } -static void server_start_transport_stream_op(grpc_call_element *elem, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { - GRPC_CALL_LOG_OP(GPR_INFO, elem, op); - server_mutate_op(elem, op); - grpc_call_next_op(elem, op, closure_list); +static void +server_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + GRPC_CALL_LOG_OP (GPR_INFO, elem, op); + server_mutate_op (elem, op); + grpc_call_next_op (elem, op, closure_list); } -static void accept_stream(void *cd, grpc_transport *transport, - const void *transport_server_data) { +static void +accept_stream (void *cd, grpc_transport * transport, const void *transport_server_data) +{ channel_data *chand = cd; /* create a call */ - grpc_call_create(chand->channel, NULL, 0, NULL, transport_server_data, NULL, - 0, gpr_inf_future(GPR_CLOCK_MONOTONIC)); + grpc_call_create (chand->channel, NULL, 0, NULL, transport_server_data, NULL, 0, gpr_inf_future (GPR_CLOCK_MONOTONIC)); } -static void channel_connectivity_changed(void *cd, int iomgr_status_ignored, - grpc_closure_list *closure_list) { +static void +channel_connectivity_changed (void *cd, int iomgr_status_ignored, grpc_closure_list * closure_list) +{ channel_data *chand = cd; grpc_server *server = chand->server; - if (chand->connectivity_state != GRPC_CHANNEL_FATAL_FAILURE) { - grpc_transport_op op; - memset(&op, 0, sizeof(op)); - 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_get_channel_stack(chand->channel), 0), - &op, closure_list); - } else { - gpr_mu_lock(&server->mu_global); - destroy_channel(chand, closure_list); - gpr_mu_unlock(&server->mu_global); - GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "connectivity", closure_list); - } + if (chand->connectivity_state != GRPC_CHANNEL_FATAL_FAILURE) + { + grpc_transport_op op; + memset (&op, 0, sizeof (op)); + 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_get_channel_stack (chand->channel), 0), &op, closure_list); + } + else + { + gpr_mu_lock (&server->mu_global); + destroy_channel (chand, closure_list); + gpr_mu_unlock (&server->mu_global); + GRPC_CHANNEL_INTERNAL_UNREF (chand->channel, "connectivity", closure_list); + } } -static void init_call_elem(grpc_call_element *elem, - const void *server_transport_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list) { +static void +init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - memset(calld, 0, sizeof(call_data)); - calld->deadline = gpr_inf_future(GPR_CLOCK_REALTIME); - calld->call = grpc_call_from_top_element(elem); - gpr_mu_init(&calld->mu_state); + memset (calld, 0, sizeof (call_data)); + calld->deadline = gpr_inf_future (GPR_CLOCK_REALTIME); + calld->call = grpc_call_from_top_element (elem); + gpr_mu_init (&calld->mu_state); - grpc_closure_init(&calld->server_on_recv, server_on_recv, elem); + grpc_closure_init (&calld->server_on_recv, server_on_recv, elem); - server_ref(chand->server); + server_ref (chand->server); - if (initial_op) server_mutate_op(elem, initial_op); + if (initial_op) + server_mutate_op (elem, initial_op); } -static void destroy_call_elem(grpc_call_element *elem, - grpc_closure_list *closure_list) { +static void +destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +{ channel_data *chand = elem->channel_data; call_data *calld = elem->call_data; - GPR_ASSERT(calld->state != PENDING); + GPR_ASSERT (calld->state != PENDING); - if (calld->host) { - GRPC_MDSTR_UNREF(calld->host); - } - if (calld->path) { - GRPC_MDSTR_UNREF(calld->path); - } + if (calld->host) + { + GRPC_MDSTR_UNREF (calld->host); + } + if (calld->path) + { + GRPC_MDSTR_UNREF (calld->path); + } - gpr_mu_destroy(&calld->mu_state); + gpr_mu_destroy (&calld->mu_state); - server_unref(chand->server, closure_list); + server_unref (chand->server, closure_list); } -static void init_channel_elem(grpc_channel_element *elem, grpc_channel *master, - const grpc_channel_args *args, - grpc_mdctx *metadata_context, int is_first, - int is_last, grpc_closure_list *closure_list) { +static void +init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last, grpc_closure_list * closure_list) +{ channel_data *chand = elem->channel_data; - GPR_ASSERT(is_first); - GPR_ASSERT(!is_last); + GPR_ASSERT (is_first); + GPR_ASSERT (!is_last); chand->server = NULL; chand->channel = NULL; - chand->path_key = grpc_mdstr_from_string(metadata_context, ":path", 0); - chand->authority_key = - grpc_mdstr_from_string(metadata_context, ":authority", 0); + chand->path_key = grpc_mdstr_from_string (metadata_context, ":path", 0); + chand->authority_key = grpc_mdstr_from_string (metadata_context, ":authority", 0); chand->next = chand->prev = chand; chand->registered_methods = NULL; chand->connectivity_state = GRPC_CHANNEL_IDLE; - grpc_closure_init(&chand->channel_connectivity_changed, - channel_connectivity_changed, chand); + grpc_closure_init (&chand->channel_connectivity_changed, channel_connectivity_changed, chand); } -static void destroy_channel_elem(grpc_channel_element *elem, - grpc_closure_list *closure_list) { +static void +destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +{ size_t i; channel_data *chand = elem->channel_data; - if (chand->registered_methods) { - for (i = 0; i < chand->registered_method_slots; i++) { - if (chand->registered_methods[i].method) { - GRPC_MDSTR_UNREF(chand->registered_methods[i].method); - } - if (chand->registered_methods[i].host) { - GRPC_MDSTR_UNREF(chand->registered_methods[i].host); - } + if (chand->registered_methods) + { + for (i = 0; i < chand->registered_method_slots; i++) + { + if (chand->registered_methods[i].method) + { + GRPC_MDSTR_UNREF (chand->registered_methods[i].method); + } + if (chand->registered_methods[i].host) + { + GRPC_MDSTR_UNREF (chand->registered_methods[i].host); + } + } + gpr_free (chand->registered_methods); + } + if (chand->server) + { + gpr_mu_lock (&chand->server->mu_global); + chand->next->prev = chand->prev; + chand->prev->next = chand->next; + chand->next = chand->prev = chand; + maybe_finish_shutdown (chand->server, closure_list); + gpr_mu_unlock (&chand->server->mu_global); + GRPC_MDSTR_UNREF (chand->path_key); + GRPC_MDSTR_UNREF (chand->authority_key); + server_unref (chand->server, closure_list); } - gpr_free(chand->registered_methods); - } - if (chand->server) { - gpr_mu_lock(&chand->server->mu_global); - chand->next->prev = chand->prev; - chand->prev->next = chand->next; - chand->next = chand->prev = chand; - maybe_finish_shutdown(chand->server, closure_list); - gpr_mu_unlock(&chand->server->mu_global); - GRPC_MDSTR_UNREF(chand->path_key); - GRPC_MDSTR_UNREF(chand->authority_key); - server_unref(chand->server, closure_list); - } } static const grpc_channel_filter server_surface_filter = { - server_start_transport_stream_op, - grpc_channel_next_op, - sizeof(call_data), - init_call_elem, - destroy_call_elem, - sizeof(channel_data), - init_channel_elem, - destroy_channel_elem, - grpc_call_next_get_peer, - "server", + server_start_transport_stream_op, + grpc_channel_next_op, + sizeof (call_data), + init_call_elem, + destroy_call_elem, + sizeof (channel_data), + init_channel_elem, + destroy_channel_elem, + grpc_call_next_get_peer, + "server", }; -void grpc_server_register_completion_queue(grpc_server *server, - grpc_completion_queue *cq, - void *reserved) { +void +grpc_server_register_completion_queue (grpc_server * server, grpc_completion_queue * cq, void *reserved) +{ size_t i, n; - GPR_ASSERT(!reserved); - for (i = 0; i < server->cq_count; i++) { - if (server->cqs[i] == cq) return; - } - GRPC_CQ_INTERNAL_REF(cq, "server"); - grpc_cq_mark_server_cq(cq); + GPR_ASSERT (!reserved); + for (i = 0; i < server->cq_count; i++) + { + if (server->cqs[i] == cq) + return; + } + GRPC_CQ_INTERNAL_REF (cq, "server"); + grpc_cq_mark_server_cq (cq); n = server->cq_count++; - server->cqs = gpr_realloc(server->cqs, - server->cq_count * sizeof(grpc_completion_queue *)); + server->cqs = gpr_realloc (server->cqs, server->cq_count * sizeof (grpc_completion_queue *)); server->cqs[n] = cq; } -grpc_server *grpc_server_create_from_filters( - const grpc_channel_filter **filters, size_t filter_count, - const grpc_channel_args *args) { +grpc_server * +grpc_server_create_from_filters (const grpc_channel_filter ** filters, size_t filter_count, const grpc_channel_args * args) +{ size_t i; /* TODO(census): restore this once we finalize census filter etc. int census_enabled = grpc_channel_args_is_census_enabled(args); */ int census_enabled = 0; - grpc_server *server = gpr_malloc(sizeof(grpc_server)); + grpc_server *server = gpr_malloc (sizeof (grpc_server)); - GPR_ASSERT(grpc_is_initialized() && "call grpc_init()"); + GPR_ASSERT (grpc_is_initialized () && "call grpc_init()"); - memset(server, 0, sizeof(grpc_server)); + memset (server, 0, sizeof (grpc_server)); - gpr_mu_init(&server->mu_global); - gpr_mu_init(&server->mu_call); + gpr_mu_init (&server->mu_global); + gpr_mu_init (&server->mu_call); /* decremented by grpc_server_destroy */ - gpr_ref_init(&server->internal_refcount, 1); - server->root_channel_data.next = server->root_channel_data.prev = - &server->root_channel_data; + gpr_ref_init (&server->internal_refcount, 1); + server->root_channel_data.next = server->root_channel_data.prev = &server->root_channel_data; /* TODO(ctiller): expose a channel_arg for this */ server->max_requested_calls = 32768; - server->request_freelist = - gpr_stack_lockfree_create(server->max_requested_calls); - for (i = 0; i < (size_t)server->max_requested_calls; i++) { - gpr_stack_lockfree_push(server->request_freelist, (int)i); - } - request_matcher_init(&server->unregistered_request_matcher, - server->max_requested_calls); - server->requested_calls = gpr_malloc(server->max_requested_calls * - sizeof(*server->requested_calls)); + server->request_freelist = gpr_stack_lockfree_create (server->max_requested_calls); + for (i = 0; i < (size_t) server->max_requested_calls; i++) + { + gpr_stack_lockfree_push (server->request_freelist, (int) i); + } + request_matcher_init (&server->unregistered_request_matcher, server->max_requested_calls); + server->requested_calls = gpr_malloc (server->max_requested_calls * sizeof (*server->requested_calls)); /* Server filter stack is: @@ -849,78 +921,87 @@ grpc_server *grpc_server_create_from_filters( {passed in filter stack} grpc_connected_channel_filter - for interfacing with transports */ server->channel_filter_count = filter_count + 1u + (census_enabled ? 1u : 0u); - server->channel_filters = - gpr_malloc(server->channel_filter_count * sizeof(grpc_channel_filter *)); + server->channel_filters = gpr_malloc (server->channel_filter_count * sizeof (grpc_channel_filter *)); server->channel_filters[0] = &server_surface_filter; - if (census_enabled) { - server->channel_filters[1] = &grpc_server_census_filter; - } - for (i = 0; i < filter_count; i++) { - server->channel_filters[i + 1u + (census_enabled ? 1u : 0u)] = filters[i]; - } + if (census_enabled) + { + server->channel_filters[1] = &grpc_server_census_filter; + } + for (i = 0; i < filter_count; i++) + { + server->channel_filters[i + 1u + (census_enabled ? 1u : 0u)] = filters[i]; + } - server->channel_args = grpc_channel_args_copy(args); + server->channel_args = grpc_channel_args_copy (args); return server; } -static int streq(const char *a, const char *b) { - if (a == NULL && b == NULL) return 1; - if (a == NULL) return 0; - if (b == NULL) return 0; - return 0 == strcmp(a, b); +static int +streq (const char *a, const char *b) +{ + if (a == NULL && b == NULL) + return 1; + if (a == NULL) + return 0; + if (b == NULL) + return 0; + return 0 == strcmp (a, b); } -void *grpc_server_register_method(grpc_server *server, const char *method, - const char *host) { +void * +grpc_server_register_method (grpc_server * server, const char *method, const char *host) +{ registered_method *m; - if (!method) { - gpr_log(GPR_ERROR, - "grpc_server_register_method method string cannot be NULL"); - return NULL; - } - for (m = server->registered_methods; m; m = m->next) { - if (streq(m->method, method) && streq(m->host, host)) { - gpr_log(GPR_ERROR, "duplicate registration for %s@%s", method, - host ? host : "*"); + if (!method) + { + gpr_log (GPR_ERROR, "grpc_server_register_method method string cannot be NULL"); return NULL; } - } - m = gpr_malloc(sizeof(registered_method)); - memset(m, 0, sizeof(*m)); - request_matcher_init(&m->request_matcher, server->max_requested_calls); - m->method = gpr_strdup(method); - m->host = gpr_strdup(host); + for (m = server->registered_methods; m; m = m->next) + { + if (streq (m->method, method) && streq (m->host, host)) + { + gpr_log (GPR_ERROR, "duplicate registration for %s@%s", method, host ? host : "*"); + return NULL; + } + } + m = gpr_malloc (sizeof (registered_method)); + memset (m, 0, sizeof (*m)); + request_matcher_init (&m->request_matcher, server->max_requested_calls); + m->method = gpr_strdup (method); + m->host = gpr_strdup (host); m->next = server->registered_methods; server->registered_methods = m; return m; } -void grpc_server_start(grpc_server *server) { +void +grpc_server_start (grpc_server * server) +{ listener *l; size_t i; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - server->pollsets = gpr_malloc(sizeof(grpc_pollset *) * server->cq_count); - for (i = 0; i < server->cq_count; i++) { - server->pollsets[i] = grpc_cq_pollset(server->cqs[i]); - } + server->pollsets = gpr_malloc (sizeof (grpc_pollset *) * server->cq_count); + for (i = 0; i < server->cq_count; i++) + { + server->pollsets[i] = grpc_cq_pollset (server->cqs[i]); + } - for (l = server->listeners; l; l = l->next) { - l->start(server, l->arg, server->pollsets, server->cq_count, &closure_list); - } + for (l = server->listeners; l; l = l->next) + { + l->start (server, l->arg, server->pollsets, server->cq_count, &closure_list); + } - grpc_closure_list_run(&closure_list); + grpc_closure_list_run (&closure_list); } -void grpc_server_setup_transport(grpc_server *s, grpc_transport *transport, - grpc_channel_filter const **extra_filters, - size_t num_extra_filters, grpc_mdctx *mdctx, - const grpc_channel_args *args, - grpc_closure_list *closure_list) { +void +grpc_server_setup_transport (grpc_server * s, grpc_transport * transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx * mdctx, const grpc_channel_args * args, grpc_closure_list * closure_list) +{ size_t num_filters = s->channel_filter_count + num_extra_filters + 1; - grpc_channel_filter const **filters = - gpr_malloc(sizeof(grpc_channel_filter *) * num_filters); + grpc_channel_filter const **filters = gpr_malloc (sizeof (grpc_channel_filter *) * num_filters); size_t i; size_t num_registered_methods; size_t alloc; @@ -936,189 +1017,194 @@ void grpc_server_setup_transport(grpc_server *s, grpc_transport *transport, gpr_uint32 max_probes = 0; grpc_transport_op op; - for (i = 0; i < s->channel_filter_count; i++) { - filters[i] = s->channel_filters[i]; - } - for (; i < s->channel_filter_count + num_extra_filters; i++) { - filters[i] = extra_filters[i - s->channel_filter_count]; - } + for (i = 0; i < s->channel_filter_count; i++) + { + filters[i] = s->channel_filters[i]; + } + for (; i < s->channel_filter_count + num_extra_filters; i++) + { + filters[i] = extra_filters[i - s->channel_filter_count]; + } filters[i] = &grpc_connected_channel_filter; - for (i = 0; i < s->cq_count; i++) { - memset(&op, 0, sizeof(op)); - op.bind_pollset = grpc_cq_pollset(s->cqs[i]); - grpc_transport_perform_op(transport, &op, closure_list); - } - - channel = grpc_channel_create_from_filters(NULL, filters, num_filters, args, - mdctx, 0, closure_list); - chand = (channel_data *)grpc_channel_stack_element( - grpc_channel_get_channel_stack(channel), 0) - ->channel_data; + for (i = 0; i < s->cq_count; i++) + { + memset (&op, 0, sizeof (op)); + op.bind_pollset = grpc_cq_pollset (s->cqs[i]); + grpc_transport_perform_op (transport, &op, closure_list); + } + + channel = grpc_channel_create_from_filters (NULL, filters, num_filters, args, mdctx, 0, closure_list); + chand = (channel_data *) grpc_channel_stack_element (grpc_channel_get_channel_stack (channel), 0)->channel_data; chand->server = s; - server_ref(s); + server_ref (s); chand->channel = channel; num_registered_methods = 0; - for (rm = s->registered_methods; rm; rm = rm->next) { - num_registered_methods++; - } + for (rm = s->registered_methods; rm; rm = rm->next) + { + num_registered_methods++; + } /* build a lookup table phrased in terms of mdstr's in this channels context to quickly find registered methods */ - if (num_registered_methods > 0) { - slots = 2 * num_registered_methods; - alloc = sizeof(channel_registered_method) * slots; - chand->registered_methods = gpr_malloc(alloc); - memset(chand->registered_methods, 0, alloc); - for (rm = s->registered_methods; rm; rm = rm->next) { - host = rm->host ? grpc_mdstr_from_string(mdctx, rm->host, 0) : NULL; - method = grpc_mdstr_from_string(mdctx, rm->method, 0); - hash = GRPC_MDSTR_KV_HASH(host ? host->hash : 0, method->hash); - for (probes = 0; chand->registered_methods[(hash + probes) % slots] - .server_registered_method != NULL; - probes++) - ; - if (probes > max_probes) max_probes = probes; - crm = &chand->registered_methods[(hash + probes) % slots]; - crm->server_registered_method = rm; - crm->host = host; - crm->method = method; + if (num_registered_methods > 0) + { + slots = 2 * num_registered_methods; + alloc = sizeof (channel_registered_method) * slots; + chand->registered_methods = gpr_malloc (alloc); + memset (chand->registered_methods, 0, alloc); + for (rm = s->registered_methods; rm; rm = rm->next) + { + host = rm->host ? grpc_mdstr_from_string (mdctx, rm->host, 0) : NULL; + method = grpc_mdstr_from_string (mdctx, rm->method, 0); + hash = GRPC_MDSTR_KV_HASH (host ? host->hash : 0, method->hash); + for (probes = 0; chand->registered_methods[(hash + probes) % slots].server_registered_method != NULL; probes++) + ; + if (probes > max_probes) + max_probes = probes; + crm = &chand->registered_methods[(hash + probes) % slots]; + crm->server_registered_method = rm; + crm->host = host; + crm->method = method; + } + GPR_ASSERT (slots <= GPR_UINT32_MAX); + chand->registered_method_slots = (gpr_uint32) slots; + chand->registered_method_max_probes = max_probes; } - GPR_ASSERT(slots <= GPR_UINT32_MAX); - chand->registered_method_slots = (gpr_uint32)slots; - chand->registered_method_max_probes = max_probes; - } - grpc_connected_channel_bind_transport(grpc_channel_get_channel_stack(channel), - transport); + grpc_connected_channel_bind_transport (grpc_channel_get_channel_stack (channel), transport); - gpr_mu_lock(&s->mu_global); + gpr_mu_lock (&s->mu_global); chand->next = &s->root_channel_data; chand->prev = chand->next->prev; chand->next->prev = chand->prev->next = chand; - gpr_mu_unlock(&s->mu_global); + gpr_mu_unlock (&s->mu_global); - gpr_free(filters); + gpr_free (filters); - GRPC_CHANNEL_INTERNAL_REF(channel, "connectivity"); - memset(&op, 0, sizeof(op)); + GRPC_CHANNEL_INTERNAL_REF (channel, "connectivity"); + memset (&op, 0, sizeof (op)); op.set_accept_stream = accept_stream; op.set_accept_stream_user_data = chand; op.on_connectivity_state_change = &chand->channel_connectivity_changed; op.connectivity_state = &chand->connectivity_state; - op.disconnect = gpr_atm_acq_load(&s->shutdown_flag) != 0; - grpc_transport_perform_op(transport, &op, closure_list); + op.disconnect = gpr_atm_acq_load (&s->shutdown_flag) != 0; + grpc_transport_perform_op (transport, &op, closure_list); } -void done_published_shutdown(void *done_arg, grpc_cq_completion *storage, - grpc_closure_list *closure_list) { - (void)done_arg; - gpr_free(storage); +void +done_published_shutdown (void *done_arg, grpc_cq_completion * storage, grpc_closure_list * closure_list) +{ + (void) done_arg; + gpr_free (storage); } -static void listener_destroy_done(void *s, int success, - grpc_closure_list *closure_list) { +static void +listener_destroy_done (void *s, int success, grpc_closure_list * closure_list) +{ grpc_server *server = s; - gpr_mu_lock(&server->mu_global); + gpr_mu_lock (&server->mu_global); server->listeners_destroyed++; - maybe_finish_shutdown(server, closure_list); - gpr_mu_unlock(&server->mu_global); + maybe_finish_shutdown (server, closure_list); + gpr_mu_unlock (&server->mu_global); } -void grpc_server_shutdown_and_notify(grpc_server *server, - grpc_completion_queue *cq, void *tag) { +void +grpc_server_shutdown_and_notify (grpc_server * server, grpc_completion_queue * cq, void *tag) +{ listener *l; shutdown_tag *sdt; channel_broadcaster broadcaster; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - GRPC_SERVER_LOG_SHUTDOWN(GPR_INFO, server, cq, tag); + GRPC_SERVER_LOG_SHUTDOWN (GPR_INFO, server, cq, tag); /* lock, and gather up some stuff to do */ - gpr_mu_lock(&server->mu_global); - grpc_cq_begin_op(cq); - if (server->shutdown_published) { - grpc_cq_end_op(cq, tag, 1, done_published_shutdown, NULL, - gpr_malloc(sizeof(grpc_cq_completion)), &closure_list); - gpr_mu_unlock(&server->mu_global); - goto done; - } - server->shutdown_tags = - gpr_realloc(server->shutdown_tags, - sizeof(shutdown_tag) * (server->num_shutdown_tags + 1)); + gpr_mu_lock (&server->mu_global); + grpc_cq_begin_op (cq); + if (server->shutdown_published) + { + grpc_cq_end_op (cq, tag, 1, done_published_shutdown, NULL, gpr_malloc (sizeof (grpc_cq_completion)), &closure_list); + gpr_mu_unlock (&server->mu_global); + goto done; + } + server->shutdown_tags = gpr_realloc (server->shutdown_tags, sizeof (shutdown_tag) * (server->num_shutdown_tags + 1)); sdt = &server->shutdown_tags[server->num_shutdown_tags++]; sdt->tag = tag; sdt->cq = cq; - if (gpr_atm_acq_load(&server->shutdown_flag)) { - gpr_mu_unlock(&server->mu_global); - goto done; - } + if (gpr_atm_acq_load (&server->shutdown_flag)) + { + gpr_mu_unlock (&server->mu_global); + goto done; + } - server->last_shutdown_message_time = gpr_now(GPR_CLOCK_REALTIME); + server->last_shutdown_message_time = gpr_now (GPR_CLOCK_REALTIME); - channel_broadcaster_init(server, &broadcaster); + channel_broadcaster_init (server, &broadcaster); /* collect all unregistered then registered calls */ - gpr_mu_lock(&server->mu_call); - kill_pending_work_locked(server, &closure_list); - gpr_mu_unlock(&server->mu_call); + gpr_mu_lock (&server->mu_call); + kill_pending_work_locked (server, &closure_list); + gpr_mu_unlock (&server->mu_call); - gpr_atm_rel_store(&server->shutdown_flag, 1); - maybe_finish_shutdown(server, &closure_list); - gpr_mu_unlock(&server->mu_global); + gpr_atm_rel_store (&server->shutdown_flag, 1); + maybe_finish_shutdown (server, &closure_list); + 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); - l->destroy(server, l->arg, &l->destroy_done, &closure_list); - } + for (l = server->listeners; l; l = l->next) + { + grpc_closure_init (&l->destroy_done, listener_destroy_done, server); + l->destroy (server, l->arg, &l->destroy_done, &closure_list); + } - channel_broadcaster_shutdown(&broadcaster, 1, 0, &closure_list); + channel_broadcaster_shutdown (&broadcaster, 1, 0, &closure_list); done: - grpc_closure_list_run(&closure_list); + grpc_closure_list_run (&closure_list); } -void grpc_server_cancel_all_calls(grpc_server *server) { +void +grpc_server_cancel_all_calls (grpc_server * server) +{ channel_broadcaster broadcaster; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - gpr_mu_lock(&server->mu_global); - channel_broadcaster_init(server, &broadcaster); - gpr_mu_unlock(&server->mu_global); + gpr_mu_lock (&server->mu_global); + channel_broadcaster_init (server, &broadcaster); + gpr_mu_unlock (&server->mu_global); - channel_broadcaster_shutdown(&broadcaster, 0, 1, &closure_list); - grpc_closure_list_run(&closure_list); + channel_broadcaster_shutdown (&broadcaster, 0, 1, &closure_list); + grpc_closure_list_run (&closure_list); } -void grpc_server_destroy(grpc_server *server) { +void +grpc_server_destroy (grpc_server * server) +{ listener *l; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - gpr_mu_lock(&server->mu_global); - GPR_ASSERT(gpr_atm_acq_load(&server->shutdown_flag) || !server->listeners); - GPR_ASSERT(server->listeners_destroyed == num_listeners(server)); + gpr_mu_lock (&server->mu_global); + GPR_ASSERT (gpr_atm_acq_load (&server->shutdown_flag) || !server->listeners); + GPR_ASSERT (server->listeners_destroyed == num_listeners (server)); - while (server->listeners) { - l = server->listeners; - server->listeners = l->next; - gpr_free(l); - } + while (server->listeners) + { + l = server->listeners; + server->listeners = l->next; + gpr_free (l); + } - gpr_mu_unlock(&server->mu_global); + gpr_mu_unlock (&server->mu_global); - server_unref(server, &closure_list); - grpc_closure_list_run(&closure_list); + server_unref (server, &closure_list); + grpc_closure_list_run (&closure_list); } -void grpc_server_add_listener( - grpc_server *server, void *arg, - void (*start)(grpc_server *server, void *arg, grpc_pollset **pollsets, - size_t pollset_count, grpc_closure_list *closure_list), - void (*destroy)(grpc_server *server, void *arg, grpc_closure *on_done, - grpc_closure_list *closure_list), - grpc_closure_list *closure_list) { - listener *l = gpr_malloc(sizeof(listener)); +void +grpc_server_add_listener (grpc_server * server, void *arg, void (*start) (grpc_server * server, void *arg, grpc_pollset ** pollsets, size_t pollset_count, grpc_closure_list * closure_list), void (*destroy) (grpc_server * server, void *arg, grpc_closure * on_done, grpc_closure_list * closure_list), grpc_closure_list * closure_list) +{ + listener *l = gpr_malloc (sizeof (listener)); l->arg = arg; l->start = start; l->destroy = destroy; @@ -1126,79 +1212,82 @@ void grpc_server_add_listener( server->listeners = l; } -static grpc_call_error queue_call_request(grpc_server *server, - requested_call *rc, - grpc_closure_list *closure_list) { +static grpc_call_error +queue_call_request (grpc_server * server, requested_call * rc, grpc_closure_list * closure_list) +{ call_data *calld = NULL; request_matcher *request_matcher = NULL; int request_id; - if (gpr_atm_acq_load(&server->shutdown_flag)) { - fail_call(server, rc, closure_list); - return GRPC_CALL_OK; - } - request_id = gpr_stack_lockfree_pop(server->request_freelist); - if (request_id == -1) { - /* out of request ids: just fail this one */ - fail_call(server, rc, closure_list); - return GRPC_CALL_OK; - } - switch (rc->type) { + if (gpr_atm_acq_load (&server->shutdown_flag)) + { + fail_call (server, rc, closure_list); + return GRPC_CALL_OK; + } + request_id = gpr_stack_lockfree_pop (server->request_freelist); + if (request_id == -1) + { + /* out of request ids: just fail this one */ + fail_call (server, rc, closure_list); + return GRPC_CALL_OK; + } + switch (rc->type) + { case BATCH_CALL: request_matcher = &server->unregistered_request_matcher; break; case REGISTERED_CALL: request_matcher = &rc->data.registered.registered_method->request_matcher; break; - } + } server->requested_calls[request_id] = *rc; - gpr_free(rc); - if (gpr_stack_lockfree_push(request_matcher->requests, request_id)) { - /* this was the first queued request: we need to lock and start - matching calls */ - gpr_mu_lock(&server->mu_call); - while ((calld = request_matcher->pending_head) != NULL) { - request_id = gpr_stack_lockfree_pop(request_matcher->requests); - if (request_id == -1) break; - request_matcher->pending_head = calld->pending_next; - gpr_mu_unlock(&server->mu_call); - gpr_mu_lock(&calld->mu_state); - if (calld->state == ZOMBIED) { - gpr_mu_unlock(&calld->mu_state); - grpc_closure_init( - &calld->kill_zombie_closure, kill_zombie, - grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0)); - grpc_closure_list_add(closure_list, &calld->kill_zombie_closure, 1); - } else { - GPR_ASSERT(calld->state == PENDING); - calld->state = ACTIVATED; - gpr_mu_unlock(&calld->mu_state); - begin_call(server, calld, &server->requested_calls[request_id], - closure_list); - } - gpr_mu_lock(&server->mu_call); + gpr_free (rc); + if (gpr_stack_lockfree_push (request_matcher->requests, request_id)) + { + /* this was the first queued request: we need to lock and start + matching calls */ + gpr_mu_lock (&server->mu_call); + while ((calld = request_matcher->pending_head) != NULL) + { + request_id = gpr_stack_lockfree_pop (request_matcher->requests); + if (request_id == -1) + break; + request_matcher->pending_head = calld->pending_next; + gpr_mu_unlock (&server->mu_call); + gpr_mu_lock (&calld->mu_state); + if (calld->state == ZOMBIED) + { + gpr_mu_unlock (&calld->mu_state); + grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element (grpc_call_get_call_stack (calld->call), 0)); + grpc_closure_list_add (closure_list, &calld->kill_zombie_closure, 1); + } + else + { + GPR_ASSERT (calld->state == PENDING); + calld->state = ACTIVATED; + gpr_mu_unlock (&calld->mu_state); + begin_call (server, calld, &server->requested_calls[request_id], closure_list); + } + gpr_mu_lock (&server->mu_call); + } + gpr_mu_unlock (&server->mu_call); } - gpr_mu_unlock(&server->mu_call); - } return GRPC_CALL_OK; } -grpc_call_error grpc_server_request_call( - grpc_server *server, grpc_call **call, grpc_call_details *details, - grpc_metadata_array *initial_metadata, - grpc_completion_queue *cq_bound_to_call, - grpc_completion_queue *cq_for_notification, void *tag) { +grpc_call_error +grpc_server_request_call (grpc_server * server, grpc_call ** call, grpc_call_details * details, grpc_metadata_array * initial_metadata, grpc_completion_queue * cq_bound_to_call, grpc_completion_queue * cq_for_notification, void *tag) +{ grpc_call_error error; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - requested_call *rc = gpr_malloc(sizeof(*rc)); - GRPC_SERVER_LOG_REQUEST_CALL(GPR_INFO, server, call, details, - initial_metadata, cq_bound_to_call, - cq_for_notification, tag); - if (!grpc_cq_is_server_cq(cq_for_notification)) { - gpr_free(rc); - error = GRPC_CALL_ERROR_NOT_SERVER_COMPLETION_QUEUE; - goto done; - } - grpc_cq_begin_op(cq_for_notification); + requested_call *rc = gpr_malloc (sizeof (*rc)); + GRPC_SERVER_LOG_REQUEST_CALL (GPR_INFO, server, call, details, initial_metadata, cq_bound_to_call, cq_for_notification, tag); + if (!grpc_cq_is_server_cq (cq_for_notification)) + { + gpr_free (rc); + error = GRPC_CALL_ERROR_NOT_SERVER_COMPLETION_QUEUE; + goto done; + } + grpc_cq_begin_op (cq_for_notification); details->reserved = NULL; rc->type = BATCH_CALL; rc->server = server; @@ -1208,27 +1297,26 @@ grpc_call_error grpc_server_request_call( rc->call = call; rc->data.batch.details = details; rc->data.batch.initial_metadata = initial_metadata; - error = queue_call_request(server, rc, &closure_list); + error = queue_call_request (server, rc, &closure_list); done: - grpc_closure_list_run(&closure_list); + grpc_closure_list_run (&closure_list); return error; } -grpc_call_error grpc_server_request_registered_call( - grpc_server *server, void *rm, grpc_call **call, gpr_timespec *deadline, - grpc_metadata_array *initial_metadata, grpc_byte_buffer **optional_payload, - grpc_completion_queue *cq_bound_to_call, - grpc_completion_queue *cq_for_notification, void *tag) { +grpc_call_error +grpc_server_request_registered_call (grpc_server * server, void *rm, grpc_call ** call, gpr_timespec * deadline, grpc_metadata_array * initial_metadata, grpc_byte_buffer ** optional_payload, grpc_completion_queue * cq_bound_to_call, grpc_completion_queue * cq_for_notification, void *tag) +{ grpc_call_error error; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - requested_call *rc = gpr_malloc(sizeof(*rc)); + requested_call *rc = gpr_malloc (sizeof (*rc)); registered_method *registered_method = rm; - if (!grpc_cq_is_server_cq(cq_for_notification)) { - gpr_free(rc); - error = GRPC_CALL_ERROR_NOT_SERVER_COMPLETION_QUEUE; - goto done; - } - grpc_cq_begin_op(cq_for_notification); + if (!grpc_cq_is_server_cq (cq_for_notification)) + { + gpr_free (rc); + error = GRPC_CALL_ERROR_NOT_SERVER_COMPLETION_QUEUE; + goto done; + } + grpc_cq_begin_op (cq_for_notification); rc->type = REGISTERED_CALL; rc->server = server; rc->tag = tag; @@ -1239,32 +1327,36 @@ grpc_call_error grpc_server_request_registered_call( rc->data.registered.deadline = deadline; rc->data.registered.initial_metadata = initial_metadata; rc->data.registered.optional_payload = optional_payload; - error = queue_call_request(server, rc, &closure_list); + error = queue_call_request (server, rc, &closure_list); done: - grpc_closure_list_run(&closure_list); + grpc_closure_list_run (&closure_list); return error; } -static void publish_registered_or_batch(grpc_call *call, int success, void *tag, - grpc_closure_list *closure_list); -static void publish_was_not_set(grpc_call *call, int success, void *tag, - grpc_closure_list *closure_list) { - abort(); +static void publish_registered_or_batch (grpc_call * call, int success, void *tag, grpc_closure_list * closure_list); +static void +publish_was_not_set (grpc_call * call, int success, void *tag, grpc_closure_list * closure_list) +{ + abort (); } -static void cpstr(char **dest, size_t *capacity, grpc_mdstr *value) { +static void +cpstr (char **dest, size_t * capacity, grpc_mdstr * value) +{ gpr_slice slice = value->slice; - size_t len = GPR_SLICE_LENGTH(slice); + size_t len = GPR_SLICE_LENGTH (slice); - if (len + 1 > *capacity) { - *capacity = GPR_MAX(len + 1, *capacity * 2); - *dest = gpr_realloc(*dest, *capacity); - } - memcpy(*dest, grpc_mdstr_as_c_string(value), len + 1); + if (len + 1 > *capacity) + { + *capacity = GPR_MAX (len + 1, *capacity * 2); + *dest = gpr_realloc (*dest, *capacity); + } + memcpy (*dest, grpc_mdstr_as_c_string (value), len + 1); } -static void begin_call(grpc_server *server, call_data *calld, - requested_call *rc, grpc_closure_list *closure_list) { +static void +begin_call (grpc_server * server, call_data * calld, requested_call * rc, grpc_closure_list * closure_list) +{ grpc_ioreq_completion_func publish = publish_was_not_set; grpc_ioreq req[2]; grpc_ioreq *r = req; @@ -1275,18 +1367,16 @@ static void begin_call(grpc_server *server, call_data *calld, fill in the metadata array passed by the client, we need to perform an ioreq op, that should complete immediately. */ - grpc_call_set_completion_queue(calld->call, rc->cq_bound_to_call, - closure_list); + grpc_call_set_completion_queue (calld->call, rc->cq_bound_to_call, closure_list); *rc->call = calld->call; calld->cq_new = rc->cq_for_notification; - switch (rc->type) { + switch (rc->type) + { case BATCH_CALL: - GPR_ASSERT(calld->host != NULL); - GPR_ASSERT(calld->path != NULL); - cpstr(&rc->data.batch.details->host, - &rc->data.batch.details->host_capacity, calld->host); - cpstr(&rc->data.batch.details->method, - &rc->data.batch.details->method_capacity, calld->path); + GPR_ASSERT (calld->host != NULL); + GPR_ASSERT (calld->path != NULL); + cpstr (&rc->data.batch.details->host, &rc->data.batch.details->host_capacity, calld->host); + cpstr (&rc->data.batch.details->method, &rc->data.batch.details->method_capacity, calld->path); rc->data.batch.details->deadline = calld->deadline; r->op = GRPC_IOREQ_RECV_INITIAL_METADATA; r->data.recv_metadata = rc->data.batch.initial_metadata; @@ -1300,75 +1390,81 @@ static void begin_call(grpc_server *server, call_data *calld, r->data.recv_metadata = rc->data.registered.initial_metadata; r->flags = 0; r++; - if (rc->data.registered.optional_payload) { - r->op = GRPC_IOREQ_RECV_MESSAGE; - r->data.recv_message = rc->data.registered.optional_payload; - r->flags = 0; - r++; - } + if (rc->data.registered.optional_payload) + { + r->op = GRPC_IOREQ_RECV_MESSAGE; + r->data.recv_message = rc->data.registered.optional_payload; + r->flags = 0; + r++; + } publish = publish_registered_or_batch; break; - } + } - GRPC_CALL_INTERNAL_REF(calld->call, "server"); - grpc_call_start_ioreq_and_call_back(calld->call, req, (size_t)(r - req), - publish, rc, closure_list); + GRPC_CALL_INTERNAL_REF (calld->call, "server"); + grpc_call_start_ioreq_and_call_back (calld->call, req, (size_t) (r - req), publish, rc, closure_list); } -static void done_request_event(void *req, grpc_cq_completion *c, - grpc_closure_list *closure_list) { +static void +done_request_event (void *req, grpc_cq_completion * c, grpc_closure_list * closure_list) +{ requested_call *rc = req; grpc_server *server = rc->server; - if (rc >= server->requested_calls && - rc < server->requested_calls + server->max_requested_calls) { - GPR_ASSERT(rc - server->requested_calls <= INT_MAX); - gpr_stack_lockfree_push(server->request_freelist, - (int)(rc - server->requested_calls)); - } else { - gpr_free(req); - } + if (rc >= server->requested_calls && rc < server->requested_calls + server->max_requested_calls) + { + GPR_ASSERT (rc - server->requested_calls <= INT_MAX); + gpr_stack_lockfree_push (server->request_freelist, (int) (rc - server->requested_calls)); + } + else + { + gpr_free (req); + } - server_unref(server, closure_list); + server_unref (server, closure_list); } -static void fail_call(grpc_server *server, requested_call *rc, - grpc_closure_list *closure_list) { +static void +fail_call (grpc_server * server, requested_call * rc, grpc_closure_list * closure_list) +{ *rc->call = NULL; - switch (rc->type) { + switch (rc->type) + { case BATCH_CALL: rc->data.batch.initial_metadata->count = 0; break; case REGISTERED_CALL: rc->data.registered.initial_metadata->count = 0; break; - } - server_ref(server); - grpc_cq_end_op(rc->cq_for_notification, rc->tag, 0, done_request_event, rc, - &rc->completion, closure_list); + } + server_ref (server); + grpc_cq_end_op (rc->cq_for_notification, rc->tag, 0, done_request_event, rc, &rc->completion, closure_list); } -static void publish_registered_or_batch(grpc_call *call, int success, void *prc, - grpc_closure_list *closure_list) { - grpc_call_element *elem = - grpc_call_stack_element(grpc_call_get_call_stack(call), 0); +static void +publish_registered_or_batch (grpc_call * call, int success, void *prc, grpc_closure_list * closure_list) +{ + grpc_call_element *elem = grpc_call_stack_element (grpc_call_get_call_stack (call), 0); requested_call *rc = prc; call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - server_ref(chand->server); - grpc_cq_end_op(calld->cq_new, rc->tag, success, done_request_event, rc, - &rc->completion, closure_list); - GRPC_CALL_INTERNAL_UNREF(call, "server", closure_list); + server_ref (chand->server); + grpc_cq_end_op (calld->cq_new, rc->tag, success, done_request_event, rc, &rc->completion, closure_list); + GRPC_CALL_INTERNAL_UNREF (call, "server", closure_list); } -const grpc_channel_args *grpc_server_get_channel_args(grpc_server *server) { +const grpc_channel_args * +grpc_server_get_channel_args (grpc_server * server) +{ return server->channel_args; } -int grpc_server_has_open_connections(grpc_server *server) { +int +grpc_server_has_open_connections (grpc_server * server) +{ int r; - gpr_mu_lock(&server->mu_global); + gpr_mu_lock (&server->mu_global); r = server->root_channel_data.next != &server->root_channel_data; - gpr_mu_unlock(&server->mu_global); + gpr_mu_unlock (&server->mu_global); return r; } diff --git a/src/core/surface/server.h b/src/core/surface/server.h index 985fb01893e..081377167a2 100644 --- a/src/core/surface/server.h +++ b/src/core/surface/server.h @@ -39,30 +39,18 @@ #include "src/core/transport/transport.h" /* Create a server */ -grpc_server *grpc_server_create_from_filters( - const grpc_channel_filter **filters, size_t filter_count, - const grpc_channel_args *args); +grpc_server *grpc_server_create_from_filters (const grpc_channel_filter ** filters, size_t filter_count, const grpc_channel_args * args); /* 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, grpc_closure_list *closure_list), - void (*destroy)(grpc_server *server, void *arg, grpc_closure *on_done, - grpc_closure_list *closure_list), - grpc_closure_list *closure_list); +void grpc_server_add_listener (grpc_server * server, void *listener, void (*start) (grpc_server * server, void *arg, grpc_pollset ** pollsets, size_t npollsets, grpc_closure_list * closure_list), void (*destroy) (grpc_server * server, void *arg, grpc_closure * on_done, grpc_closure_list * closure_list), grpc_closure_list * closure_list); /* Setup a transport - creates a channel stack, binds the transport to the server */ -void grpc_server_setup_transport(grpc_server *server, grpc_transport *transport, - grpc_channel_filter const **extra_filters, - size_t num_extra_filters, grpc_mdctx *mdctx, - const grpc_channel_args *args, - grpc_closure_list *closure_list); +void grpc_server_setup_transport (grpc_server * server, grpc_transport * transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx * mdctx, const grpc_channel_args * args, grpc_closure_list * closure_list); -const grpc_channel_args *grpc_server_get_channel_args(grpc_server *server); +const grpc_channel_args *grpc_server_get_channel_args (grpc_server * server); -int grpc_server_has_open_connections(grpc_server *server); +int grpc_server_has_open_connections (grpc_server * server); #endif /* GRPC_INTERNAL_CORE_SURFACE_SERVER_H */ diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c index ad44aed73ba..47b96f8f1eb 100644 --- a/src/core/surface/server_chttp2.c +++ b/src/core/surface/server_chttp2.c @@ -42,18 +42,18 @@ #include #include -static void setup_transport(void *server, grpc_transport *transport, - grpc_mdctx *mdctx, - grpc_closure_list *closure_list) { +static void +setup_transport (void *server, grpc_transport * transport, grpc_mdctx * mdctx, grpc_closure_list * closure_list) +{ static grpc_channel_filter const *extra_filters[] = { - &grpc_http_server_filter}; - grpc_server_setup_transport( - server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - grpc_server_get_channel_args(server), closure_list); + &grpc_http_server_filter + }; + grpc_server_setup_transport (server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (server), closure_list); } -static void new_transport(void *server, grpc_endpoint *tcp, - grpc_closure_list *closure_list) { +static void +new_transport (void *server, grpc_endpoint * tcp, grpc_closure_list * closure_list) +{ /* * Beware that the call to grpc_create_chttp2_transport() has to happen before * grpc_tcp_server_destroy(). This is fine here, but similar code @@ -61,30 +61,32 @@ static void new_transport(void *server, grpc_endpoint *tcp, * (as in server_secure_chttp2.c) needs to add synchronization to avoid this * case. */ - grpc_mdctx *mdctx = grpc_mdctx_create(); - grpc_transport *transport = grpc_create_chttp2_transport( - grpc_server_get_channel_args(server), tcp, mdctx, 0, closure_list); - setup_transport(server, transport, mdctx, closure_list); - grpc_chttp2_transport_start_reading(transport, NULL, 0, closure_list); + grpc_mdctx *mdctx = grpc_mdctx_create (); + grpc_transport *transport = grpc_create_chttp2_transport (grpc_server_get_channel_args (server), tcp, mdctx, 0, closure_list); + setup_transport (server, transport, mdctx, closure_list); + grpc_chttp2_transport_start_reading (transport, NULL, 0, closure_list); } /* Server callback: start listening on our ports */ -static void start(grpc_server *server, void *tcpp, grpc_pollset **pollsets, - size_t pollset_count, grpc_closure_list *closure_list) { +static void +start (grpc_server * server, void *tcpp, grpc_pollset ** pollsets, size_t pollset_count, grpc_closure_list * closure_list) +{ grpc_tcp_server *tcp = tcpp; - grpc_tcp_server_start(tcp, pollsets, pollset_count, new_transport, server, - closure_list); + grpc_tcp_server_start (tcp, pollsets, pollset_count, new_transport, server, closure_list); } /* Server callback: destroy the tcp listener (so we don't generate further callbacks) */ -static void destroy(grpc_server *server, void *tcpp, grpc_closure *destroy_done, - grpc_closure_list *closure_list) { +static void +destroy (grpc_server * server, void *tcpp, grpc_closure * destroy_done, grpc_closure_list * closure_list) +{ grpc_tcp_server *tcp = tcpp; - grpc_tcp_server_destroy(tcp, destroy_done, closure_list); + grpc_tcp_server_destroy (tcp, destroy_done, closure_list); } -int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) { +int +grpc_server_add_insecure_http2_port (grpc_server * server, const char *addr) +{ grpc_resolved_addresses *resolved = NULL; grpc_tcp_server *tcp = NULL; size_t i; @@ -93,55 +95,62 @@ int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) { int port_temp; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - resolved = grpc_blocking_resolve_address(addr, "http"); - if (!resolved) { - goto error; - } + resolved = grpc_blocking_resolve_address (addr, "http"); + if (!resolved) + { + goto error; + } - tcp = grpc_tcp_server_create(); - if (!tcp) { - goto error; - } + tcp = grpc_tcp_server_create (); + if (!tcp) + { + goto error; + } - for (i = 0; i < resolved->naddrs; i++) { - port_temp = grpc_tcp_server_add_port( - tcp, (struct sockaddr *)&resolved->addrs[i].addr, - resolved->addrs[i].len); - if (port_temp >= 0) { - if (port_num == -1) { - port_num = port_temp; - } else { - GPR_ASSERT(port_num == port_temp); - } - count++; + for (i = 0; i < resolved->naddrs; i++) + { + port_temp = grpc_tcp_server_add_port (tcp, (struct sockaddr *) &resolved->addrs[i].addr, resolved->addrs[i].len); + if (port_temp >= 0) + { + if (port_num == -1) + { + port_num = port_temp; + } + else + { + GPR_ASSERT (port_num == port_temp); + } + count++; + } + } + if (count == 0) + { + gpr_log (GPR_ERROR, "No address added out of total %d resolved", resolved->naddrs); + goto error; } - } - if (count == 0) { - gpr_log(GPR_ERROR, "No address added out of total %d resolved", - resolved->naddrs); - goto error; - } - if (count != resolved->naddrs) { - gpr_log(GPR_ERROR, "Only %d addresses added out of total %d resolved", - count, resolved->naddrs); - } - grpc_resolved_addresses_destroy(resolved); + if (count != resolved->naddrs) + { + gpr_log (GPR_ERROR, "Only %d addresses added out of total %d resolved", count, resolved->naddrs); + } + grpc_resolved_addresses_destroy (resolved); /* Register with the server only upon success */ - grpc_server_add_listener(server, tcp, start, destroy, &closure_list); + grpc_server_add_listener (server, tcp, start, destroy, &closure_list); goto done; /* Error path: cleanup and return */ error: - if (resolved) { - grpc_resolved_addresses_destroy(resolved); - } - if (tcp) { - grpc_tcp_server_destroy(tcp, NULL, NULL); - } + if (resolved) + { + grpc_resolved_addresses_destroy (resolved); + } + if (tcp) + { + grpc_tcp_server_destroy (tcp, NULL, NULL); + } port_num = 0; done: - grpc_closure_list_run(&closure_list); + grpc_closure_list_run (&closure_list); return port_num; } diff --git a/src/core/surface/server_create.c b/src/core/surface/server_create.c index fc7ae820f53..d2f7b8e262d 100644 --- a/src/core/surface/server_create.c +++ b/src/core/surface/server_create.c @@ -36,9 +36,10 @@ #include "src/core/surface/server.h" #include "src/core/channel/compress_filter.h" -grpc_server *grpc_server_create(const grpc_channel_args *args, void *reserved) { - const grpc_channel_filter *filters[] = {&grpc_compress_filter}; - (void)reserved; - return grpc_server_create_from_filters(filters, GPR_ARRAY_SIZE(filters), - args); +grpc_server * +grpc_server_create (const grpc_channel_args * args, void *reserved) +{ + const grpc_channel_filter *filters[] = { &grpc_compress_filter }; + (void) reserved; + return grpc_server_create_from_filters (filters, GPR_ARRAY_SIZE (filters), args); } diff --git a/src/core/surface/version.c b/src/core/surface/version.c index e559d51448a..e4deaa68191 100644 --- a/src/core/surface/version.c +++ b/src/core/surface/version.c @@ -36,4 +36,8 @@ #include -const char *grpc_version_string(void) { return "0.11.0.0"; } +const char * +grpc_version_string (void) +{ + return "0.11.0.0"; +} diff --git a/src/core/transport/chttp2/alpn.c b/src/core/transport/chttp2/alpn.c index 69da4e6718e..f008615c9a5 100644 --- a/src/core/transport/chttp2/alpn.c +++ b/src/core/transport/chttp2/alpn.c @@ -36,21 +36,29 @@ #include /* in order of preference */ -static const char *const supported_versions[] = {"h2"}; +static const char *const supported_versions[] = { "h2" }; -int grpc_chttp2_is_alpn_version_supported(const char *version, size_t size) { +int +grpc_chttp2_is_alpn_version_supported (const char *version, size_t size) +{ size_t i; - for (i = 0; i < GPR_ARRAY_SIZE(supported_versions); i++) { - if (!strncmp(version, supported_versions[i], size)) return 1; - } + for (i = 0; i < GPR_ARRAY_SIZE (supported_versions); i++) + { + if (!strncmp (version, supported_versions[i], size)) + return 1; + } return 0; } -size_t grpc_chttp2_num_alpn_versions(void) { - return GPR_ARRAY_SIZE(supported_versions); +size_t +grpc_chttp2_num_alpn_versions (void) +{ + return GPR_ARRAY_SIZE (supported_versions); } -const char *grpc_chttp2_get_alpn_version_index(size_t i) { - GPR_ASSERT(i < GPR_ARRAY_SIZE(supported_versions)); +const char * +grpc_chttp2_get_alpn_version_index (size_t i) +{ + GPR_ASSERT (i < GPR_ARRAY_SIZE (supported_versions)); return supported_versions[i]; } diff --git a/src/core/transport/chttp2/alpn.h b/src/core/transport/chttp2/alpn.h index f38b4c3167e..b45081eccff 100644 --- a/src/core/transport/chttp2/alpn.h +++ b/src/core/transport/chttp2/alpn.h @@ -37,13 +37,13 @@ #include /* Retuns 1 if the version is supported, 0 otherwise. */ -int grpc_chttp2_is_alpn_version_supported(const char *version, size_t size); +int grpc_chttp2_is_alpn_version_supported (const char *version, size_t size); /* Returns the number of protocol versions to advertise */ -size_t grpc_chttp2_num_alpn_versions(void); +size_t grpc_chttp2_num_alpn_versions (void); /* Returns the protocol version at index i (0 <= i < * grpc_chttp2_num_alpn_versions()) */ -const char *grpc_chttp2_get_alpn_version_index(size_t i); +const char *grpc_chttp2_get_alpn_version_index (size_t i); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_ALPN_H */ diff --git a/src/core/transport/chttp2/bin_encoder.c b/src/core/transport/chttp2/bin_encoder.c index e21d8000832..929f65ad66d 100644 --- a/src/core/transport/chttp2/bin_encoder.c +++ b/src/core/transport/chttp2/bin_encoder.c @@ -38,51 +38,56 @@ #include "src/core/transport/chttp2/huffsyms.h" #include -static const char alphabet[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +static const char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -typedef struct { +typedef struct +{ gpr_uint16 bits; gpr_uint8 length; } b64_huff_sym; static const b64_huff_sym huff_alphabet[64] = { - {0x21, 6}, {0x5d, 7}, {0x5e, 7}, {0x5f, 7}, {0x60, 7}, {0x61, 7}, - {0x62, 7}, {0x63, 7}, {0x64, 7}, {0x65, 7}, {0x66, 7}, {0x67, 7}, - {0x68, 7}, {0x69, 7}, {0x6a, 7}, {0x6b, 7}, {0x6c, 7}, {0x6d, 7}, - {0x6e, 7}, {0x6f, 7}, {0x70, 7}, {0x71, 7}, {0x72, 7}, {0xfc, 8}, - {0x73, 7}, {0xfd, 8}, {0x3, 5}, {0x23, 6}, {0x4, 5}, {0x24, 6}, - {0x5, 5}, {0x25, 6}, {0x26, 6}, {0x27, 6}, {0x6, 5}, {0x74, 7}, - {0x75, 7}, {0x28, 6}, {0x29, 6}, {0x2a, 6}, {0x7, 5}, {0x2b, 6}, - {0x76, 7}, {0x2c, 6}, {0x8, 5}, {0x9, 5}, {0x2d, 6}, {0x77, 7}, - {0x78, 7}, {0x79, 7}, {0x7a, 7}, {0x7b, 7}, {0x0, 5}, {0x1, 5}, - {0x2, 5}, {0x19, 6}, {0x1a, 6}, {0x1b, 6}, {0x1c, 6}, {0x1d, 6}, - {0x1e, 6}, {0x1f, 6}, {0x7fb, 11}, {0x18, 6}}; - -static const gpr_uint8 tail_xtra[3] = {0, 2, 3}; - -gpr_slice grpc_chttp2_base64_encode(gpr_slice input) { - size_t input_length = GPR_SLICE_LENGTH(input); + {0x21, 6}, {0x5d, 7}, {0x5e, 7}, {0x5f, 7}, {0x60, 7}, {0x61, 7}, + {0x62, 7}, {0x63, 7}, {0x64, 7}, {0x65, 7}, {0x66, 7}, {0x67, 7}, + {0x68, 7}, {0x69, 7}, {0x6a, 7}, {0x6b, 7}, {0x6c, 7}, {0x6d, 7}, + {0x6e, 7}, {0x6f, 7}, {0x70, 7}, {0x71, 7}, {0x72, 7}, {0xfc, 8}, + {0x73, 7}, {0xfd, 8}, {0x3, 5}, {0x23, 6}, {0x4, 5}, {0x24, 6}, + {0x5, 5}, {0x25, 6}, {0x26, 6}, {0x27, 6}, {0x6, 5}, {0x74, 7}, + {0x75, 7}, {0x28, 6}, {0x29, 6}, {0x2a, 6}, {0x7, 5}, {0x2b, 6}, + {0x76, 7}, {0x2c, 6}, {0x8, 5}, {0x9, 5}, {0x2d, 6}, {0x77, 7}, + {0x78, 7}, {0x79, 7}, {0x7a, 7}, {0x7b, 7}, {0x0, 5}, {0x1, 5}, + {0x2, 5}, {0x19, 6}, {0x1a, 6}, {0x1b, 6}, {0x1c, 6}, {0x1d, 6}, + {0x1e, 6}, {0x1f, 6}, {0x7fb, 11}, {0x18, 6} +}; + +static const gpr_uint8 tail_xtra[3] = { 0, 2, 3 }; + +gpr_slice +grpc_chttp2_base64_encode (gpr_slice input) +{ + size_t input_length = GPR_SLICE_LENGTH (input); size_t input_triplets = input_length / 3; size_t tail_case = input_length % 3; size_t output_length = input_triplets * 4 + tail_xtra[tail_case]; - gpr_slice output = gpr_slice_malloc(output_length); - gpr_uint8 *in = GPR_SLICE_START_PTR(input); - char *out = (char *)GPR_SLICE_START_PTR(output); + gpr_slice output = gpr_slice_malloc (output_length); + gpr_uint8 *in = GPR_SLICE_START_PTR (input); + char *out = (char *) GPR_SLICE_START_PTR (output); size_t i; /* encode full triplets */ - for (i = 0; i < input_triplets; i++) { - out[0] = alphabet[in[0] >> 2]; - out[1] = alphabet[((in[0] & 0x3) << 4) | (in[1] >> 4)]; - out[2] = alphabet[((in[1] & 0xf) << 2) | (in[2] >> 6)]; - out[3] = alphabet[in[2] & 0x3f]; - out += 4; - in += 3; - } + for (i = 0; i < input_triplets; i++) + { + out[0] = alphabet[in[0] >> 2]; + out[1] = alphabet[((in[0] & 0x3) << 4) | (in[1] >> 4)]; + out[2] = alphabet[((in[1] & 0xf) << 2) | (in[2] >> 6)]; + out[3] = alphabet[in[2] & 0x3f]; + out += 4; + in += 3; + } /* encode the remaining bytes */ - switch (tail_case) { + switch (tail_case) + { case 0: break; case 1: @@ -98,14 +103,16 @@ gpr_slice grpc_chttp2_base64_encode(gpr_slice input) { out += 3; in += 2; break; - } + } - GPR_ASSERT(out == (char *)GPR_SLICE_END_PTR(output)); - GPR_ASSERT(in == GPR_SLICE_END_PTR(input)); + GPR_ASSERT (out == (char *) GPR_SLICE_END_PTR (output)); + GPR_ASSERT (in == GPR_SLICE_END_PTR (input)); return output; } -gpr_slice grpc_chttp2_huffman_compress(gpr_slice input) { +gpr_slice +grpc_chttp2_huffman_compress (gpr_slice input) +{ size_t nbits; gpr_uint8 *in; gpr_uint8 *out; @@ -114,73 +121,85 @@ gpr_slice grpc_chttp2_huffman_compress(gpr_slice input) { gpr_uint32 temp_length = 0; nbits = 0; - for (in = GPR_SLICE_START_PTR(input); in != GPR_SLICE_END_PTR(input); ++in) { - nbits += grpc_chttp2_huffsyms[*in].length; - } - - output = gpr_slice_malloc(nbits / 8 + (nbits % 8 != 0)); - out = GPR_SLICE_START_PTR(output); - for (in = GPR_SLICE_START_PTR(input); in != GPR_SLICE_END_PTR(input); ++in) { - int sym = *in; - temp <<= grpc_chttp2_huffsyms[sym].length; - temp |= grpc_chttp2_huffsyms[sym].bits; - temp_length += grpc_chttp2_huffsyms[sym].length; - - while (temp_length > 8) { - temp_length -= 8; - *out++ = (gpr_uint8)(temp >> temp_length); + for (in = GPR_SLICE_START_PTR (input); in != GPR_SLICE_END_PTR (input); ++in) + { + nbits += grpc_chttp2_huffsyms[*in].length; } - } - if (temp_length) { - *out++ = (gpr_uint8)(temp << (8u - temp_length)) | - (gpr_uint8)(0xffu >> temp_length); - } + output = gpr_slice_malloc (nbits / 8 + (nbits % 8 != 0)); + out = GPR_SLICE_START_PTR (output); + for (in = GPR_SLICE_START_PTR (input); in != GPR_SLICE_END_PTR (input); ++in) + { + int sym = *in; + temp <<= grpc_chttp2_huffsyms[sym].length; + temp |= grpc_chttp2_huffsyms[sym].bits; + temp_length += grpc_chttp2_huffsyms[sym].length; + + while (temp_length > 8) + { + temp_length -= 8; + *out++ = (gpr_uint8) (temp >> temp_length); + } + } - GPR_ASSERT(out == GPR_SLICE_END_PTR(output)); + if (temp_length) + { + *out++ = (gpr_uint8) (temp << (8u - temp_length)) | (gpr_uint8) (0xffu >> temp_length); + } + + GPR_ASSERT (out == GPR_SLICE_END_PTR (output)); return output; } -typedef struct { +typedef struct +{ gpr_uint32 temp; gpr_uint32 temp_length; gpr_uint8 *out; } huff_out; -static void enc_flush_some(huff_out *out) { - while (out->temp_length > 8) { - out->temp_length -= 8; - *out->out++ = (gpr_uint8)(out->temp >> out->temp_length); - } +static void +enc_flush_some (huff_out * out) +{ + while (out->temp_length > 8) + { + out->temp_length -= 8; + *out->out++ = (gpr_uint8) (out->temp >> out->temp_length); + } } -static void enc_add2(huff_out *out, gpr_uint8 a, gpr_uint8 b) { +static void +enc_add2 (huff_out * out, gpr_uint8 a, gpr_uint8 b) +{ b64_huff_sym sa = huff_alphabet[a]; b64_huff_sym sb = huff_alphabet[b]; - out->temp = (out->temp << (sa.length + sb.length)) | - ((gpr_uint32)sa.bits << sb.length) | sb.bits; - out->temp_length += (gpr_uint32)sa.length + (gpr_uint32)sb.length; - enc_flush_some(out); + out->temp = (out->temp << (sa.length + sb.length)) | ((gpr_uint32) sa.bits << sb.length) | sb.bits; + out->temp_length += (gpr_uint32) sa.length + (gpr_uint32) sb.length; + enc_flush_some (out); } -static void enc_add1(huff_out *out, gpr_uint8 a) { +static void +enc_add1 (huff_out * out, gpr_uint8 a) +{ b64_huff_sym sa = huff_alphabet[a]; out->temp = (out->temp << sa.length) | sa.bits; out->temp_length += sa.length; - enc_flush_some(out); + enc_flush_some (out); } -gpr_slice grpc_chttp2_base64_encode_and_huffman_compress(gpr_slice input) { - size_t input_length = GPR_SLICE_LENGTH(input); +gpr_slice +grpc_chttp2_base64_encode_and_huffman_compress (gpr_slice input) +{ + size_t input_length = GPR_SLICE_LENGTH (input); size_t input_triplets = input_length / 3; size_t tail_case = input_length % 3; size_t output_syms = input_triplets * 4 + tail_xtra[tail_case]; size_t max_output_bits = 11 * output_syms; size_t max_output_length = max_output_bits / 8 + (max_output_bits % 8 != 0); - gpr_slice output = gpr_slice_malloc(max_output_length); - gpr_uint8 *in = GPR_SLICE_START_PTR(input); - gpr_uint8 *start_out = GPR_SLICE_START_PTR(output); + gpr_slice output = gpr_slice_malloc (max_output_length); + gpr_uint8 *in = GPR_SLICE_START_PTR (input); + gpr_uint8 *start_out = GPR_SLICE_START_PTR (output); huff_out out; size_t i; @@ -189,42 +208,45 @@ gpr_slice grpc_chttp2_base64_encode_and_huffman_compress(gpr_slice input) { out.out = start_out; /* encode full triplets */ - for (i = 0; i < input_triplets; i++) { - enc_add2(&out, in[0] >> 2, (gpr_uint8)((in[0] & 0x3) << 4) | (in[1] >> 4)); - enc_add2(&out, (gpr_uint8)((in[1] & 0xf) << 2) | (in[2] >> 6), - (gpr_uint8)(in[2] & 0x3f)); - in += 3; - } + for (i = 0; i < input_triplets; i++) + { + enc_add2 (&out, in[0] >> 2, (gpr_uint8) ((in[0] & 0x3) << 4) | (in[1] >> 4)); + enc_add2 (&out, (gpr_uint8) ((in[1] & 0xf) << 2) | (in[2] >> 6), (gpr_uint8) (in[2] & 0x3f)); + in += 3; + } /* encode the remaining bytes */ - switch (tail_case) { + switch (tail_case) + { case 0: break; case 1: - enc_add2(&out, in[0] >> 2, (gpr_uint8)((in[0] & 0x3) << 4)); + enc_add2 (&out, in[0] >> 2, (gpr_uint8) ((in[0] & 0x3) << 4)); in += 1; break; case 2: - enc_add2(&out, in[0] >> 2, - (gpr_uint8)((in[0] & 0x3) << 4) | (gpr_uint8)(in[1] >> 4)); - enc_add1(&out, (gpr_uint8)((in[1] & 0xf) << 2)); + enc_add2 (&out, in[0] >> 2, (gpr_uint8) ((in[0] & 0x3) << 4) | (gpr_uint8) (in[1] >> 4)); + enc_add1 (&out, (gpr_uint8) ((in[1] & 0xf) << 2)); in += 2; break; - } + } - if (out.temp_length) { - *out.out++ = (gpr_uint8)(out.temp << (8u - out.temp_length)) | - (gpr_uint8)(0xffu >> out.temp_length); - } + if (out.temp_length) + { + *out.out++ = (gpr_uint8) (out.temp << (8u - out.temp_length)) | (gpr_uint8) (0xffu >> out.temp_length); + } - GPR_ASSERT(out.out <= GPR_SLICE_END_PTR(output)); - GPR_SLICE_SET_LENGTH(output, out.out - start_out); + GPR_ASSERT (out.out <= GPR_SLICE_END_PTR (output)); + GPR_SLICE_SET_LENGTH (output, out.out - start_out); - GPR_ASSERT(in == GPR_SLICE_END_PTR(input)); + GPR_ASSERT (in == GPR_SLICE_END_PTR (input)); return output; } -int grpc_is_binary_header(const char *key, size_t length) { - if (length < 5) return 0; - return 0 == memcmp(key + length - 4, "-bin", 4); +int +grpc_is_binary_header (const char *key, size_t length) +{ + if (length < 5) + return 0; + return 0 == memcmp (key + length - 4, "-bin", 4); } diff --git a/src/core/transport/chttp2/bin_encoder.h b/src/core/transport/chttp2/bin_encoder.h index d3e5a855ddb..6e57615f7fb 100644 --- a/src/core/transport/chttp2/bin_encoder.h +++ b/src/core/transport/chttp2/bin_encoder.h @@ -38,19 +38,19 @@ /* base64 encode a slice. Returns a new slice, does not take ownership of the input */ -gpr_slice grpc_chttp2_base64_encode(gpr_slice input); +gpr_slice grpc_chttp2_base64_encode (gpr_slice input); /* Compress a slice with the static huffman encoder detailed in the hpack standard. Returns a new slice, does not take ownership of the input */ -gpr_slice grpc_chttp2_huffman_compress(gpr_slice input); +gpr_slice grpc_chttp2_huffman_compress (gpr_slice input); /* equivalent to: gpr_slice x = grpc_chttp2_base64_encode(input); gpr_slice y = grpc_chttp2_huffman_compress(x); gpr_slice_unref(x); return y; */ -gpr_slice grpc_chttp2_base64_encode_and_huffman_compress(gpr_slice input); +gpr_slice grpc_chttp2_base64_encode_and_huffman_compress (gpr_slice input); -int grpc_is_binary_header(const char *key, size_t length); +int grpc_is_binary_header (const char *key, size_t length); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_BIN_ENCODER_H */ diff --git a/src/core/transport/chttp2/frame.h b/src/core/transport/chttp2/frame.h index 879ee036fac..84aa1549675 100644 --- a/src/core/transport/chttp2/frame.h +++ b/src/core/transport/chttp2/frame.h @@ -39,7 +39,8 @@ /* Common definitions for frame handling in the chttp2 transport */ -typedef enum { +typedef enum +{ GRPC_CHTTP2_PARSE_OK, GRPC_CHTTP2_STREAM_ERROR, GRPC_CHTTP2_CONNECTION_ERROR diff --git a/src/core/transport/chttp2/frame_data.c b/src/core/transport/chttp2/frame_data.c index a58189a1366..461a1e26f85 100644 --- a/src/core/transport/chttp2/frame_data.c +++ b/src/core/transport/chttp2/frame_data.c @@ -42,133 +42,146 @@ #include #include "src/core/transport/transport.h" -grpc_chttp2_parse_error grpc_chttp2_data_parser_init( - grpc_chttp2_data_parser *parser) { +grpc_chttp2_parse_error +grpc_chttp2_data_parser_init (grpc_chttp2_data_parser * parser) +{ parser->state = GRPC_CHTTP2_DATA_FH_0; - grpc_sopb_init(&parser->incoming_sopb); + grpc_sopb_init (&parser->incoming_sopb); return GRPC_CHTTP2_PARSE_OK; } -void grpc_chttp2_data_parser_destroy(grpc_chttp2_data_parser *parser) { - grpc_sopb_destroy(&parser->incoming_sopb); +void +grpc_chttp2_data_parser_destroy (grpc_chttp2_data_parser * parser) +{ + grpc_sopb_destroy (&parser->incoming_sopb); } -grpc_chttp2_parse_error grpc_chttp2_data_parser_begin_frame( - grpc_chttp2_data_parser *parser, gpr_uint8 flags) { - if (flags & ~GRPC_CHTTP2_DATA_FLAG_END_STREAM) { - gpr_log(GPR_ERROR, "unsupported data flags: 0x%02x", flags); - return GRPC_CHTTP2_STREAM_ERROR; - } +grpc_chttp2_parse_error +grpc_chttp2_data_parser_begin_frame (grpc_chttp2_data_parser * parser, gpr_uint8 flags) +{ + if (flags & ~GRPC_CHTTP2_DATA_FLAG_END_STREAM) + { + gpr_log (GPR_ERROR, "unsupported data flags: 0x%02x", flags); + return GRPC_CHTTP2_STREAM_ERROR; + } - if (flags & GRPC_CHTTP2_DATA_FLAG_END_STREAM) { - parser->is_last_frame = 1; - } else { - parser->is_last_frame = 0; - } + if (flags & GRPC_CHTTP2_DATA_FLAG_END_STREAM) + { + parser->is_last_frame = 1; + } + else + { + parser->is_last_frame = 0; + } return GRPC_CHTTP2_PARSE_OK; } -grpc_chttp2_parse_error grpc_chttp2_data_parser_parse( - void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list) { - gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); - gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); +grpc_chttp2_parse_error +grpc_chttp2_data_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +{ + gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); + gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); gpr_uint8 *cur = beg; grpc_chttp2_data_parser *p = parser; gpr_uint32 message_flags = 0; - if (is_last && p->is_last_frame) { - stream_parsing->received_close = 1; - } + if (is_last && p->is_last_frame) + { + stream_parsing->received_close = 1; + } - if (cur == end) { - return GRPC_CHTTP2_PARSE_OK; - } + if (cur == end) + { + return GRPC_CHTTP2_PARSE_OK; + } - switch (p->state) { - fh_0: + switch (p->state) + { + fh_0: case GRPC_CHTTP2_DATA_FH_0: p->frame_type = *cur; - switch (p->frame_type) { - case 0: - p->is_frame_compressed = 0; /* GPR_FALSE */ - break; - case 1: - p->is_frame_compressed = 1; /* GPR_TRUE */ - break; - default: - gpr_log(GPR_ERROR, "Bad GRPC frame type 0x%02x", p->frame_type); - return GRPC_CHTTP2_STREAM_ERROR; - } - if (++cur == end) { - p->state = GRPC_CHTTP2_DATA_FH_1; - return GRPC_CHTTP2_PARSE_OK; - } - /* fallthrough */ + switch (p->frame_type) + { + case 0: + p->is_frame_compressed = 0; /* GPR_FALSE */ + break; + case 1: + p->is_frame_compressed = 1; /* GPR_TRUE */ + break; + default: + gpr_log (GPR_ERROR, "Bad GRPC frame type 0x%02x", p->frame_type); + return GRPC_CHTTP2_STREAM_ERROR; + } + if (++cur == end) + { + p->state = GRPC_CHTTP2_DATA_FH_1; + return GRPC_CHTTP2_PARSE_OK; + } + /* fallthrough */ case GRPC_CHTTP2_DATA_FH_1: - p->frame_size = ((gpr_uint32)*cur) << 24; - if (++cur == end) { - p->state = GRPC_CHTTP2_DATA_FH_2; - return GRPC_CHTTP2_PARSE_OK; - } - /* fallthrough */ + p->frame_size = ((gpr_uint32) * cur) << 24; + if (++cur == end) + { + p->state = GRPC_CHTTP2_DATA_FH_2; + return GRPC_CHTTP2_PARSE_OK; + } + /* fallthrough */ case GRPC_CHTTP2_DATA_FH_2: - p->frame_size |= ((gpr_uint32)*cur) << 16; - if (++cur == end) { - p->state = GRPC_CHTTP2_DATA_FH_3; - return GRPC_CHTTP2_PARSE_OK; - } - /* fallthrough */ + p->frame_size |= ((gpr_uint32) * cur) << 16; + if (++cur == end) + { + p->state = GRPC_CHTTP2_DATA_FH_3; + return GRPC_CHTTP2_PARSE_OK; + } + /* fallthrough */ case GRPC_CHTTP2_DATA_FH_3: - p->frame_size |= ((gpr_uint32)*cur) << 8; - if (++cur == end) { - p->state = GRPC_CHTTP2_DATA_FH_4; - return GRPC_CHTTP2_PARSE_OK; - } - /* fallthrough */ + p->frame_size |= ((gpr_uint32) * cur) << 8; + if (++cur == end) + { + p->state = GRPC_CHTTP2_DATA_FH_4; + return GRPC_CHTTP2_PARSE_OK; + } + /* fallthrough */ case GRPC_CHTTP2_DATA_FH_4: - p->frame_size |= ((gpr_uint32)*cur); + p->frame_size |= ((gpr_uint32) * cur); p->state = GRPC_CHTTP2_DATA_FRAME; ++cur; - if (p->is_frame_compressed) { - message_flags |= GRPC_WRITE_INTERNAL_COMPRESS; - } - grpc_sopb_add_begin_message(&p->incoming_sopb, p->frame_size, - message_flags); - /* fallthrough */ + if (p->is_frame_compressed) + { + message_flags |= GRPC_WRITE_INTERNAL_COMPRESS; + } + grpc_sopb_add_begin_message (&p->incoming_sopb, p->frame_size, message_flags); + /* fallthrough */ case GRPC_CHTTP2_DATA_FRAME: - if (cur == end) { - grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, - stream_parsing); - return GRPC_CHTTP2_PARSE_OK; - } - grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, - stream_parsing); - if ((gpr_uint32)(end - cur) == p->frame_size) { - grpc_sopb_add_slice( - &p->incoming_sopb, - gpr_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg))); - p->state = GRPC_CHTTP2_DATA_FH_0; - return GRPC_CHTTP2_PARSE_OK; - } else if ((gpr_uint32)(end - cur) > p->frame_size) { - grpc_sopb_add_slice(&p->incoming_sopb, - gpr_slice_sub(slice, (size_t)(cur - beg), - (size_t)(cur + p->frame_size - beg))); - cur += p->frame_size; - goto fh_0; /* loop */ - } else { - grpc_sopb_add_slice( - &p->incoming_sopb, - gpr_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg))); - GPR_ASSERT(end - cur <= p->frame_size); - p->frame_size -= (gpr_uint32)(end - cur); - return GRPC_CHTTP2_PARSE_OK; - } - } + if (cur == end) + { + grpc_chttp2_list_add_parsing_seen_stream (transport_parsing, stream_parsing); + return GRPC_CHTTP2_PARSE_OK; + } + grpc_chttp2_list_add_parsing_seen_stream (transport_parsing, stream_parsing); + if ((gpr_uint32) (end - cur) == p->frame_size) + { + grpc_sopb_add_slice (&p->incoming_sopb, gpr_slice_sub (slice, (size_t) (cur - beg), (size_t) (end - beg))); + p->state = GRPC_CHTTP2_DATA_FH_0; + return GRPC_CHTTP2_PARSE_OK; + } + else if ((gpr_uint32) (end - cur) > p->frame_size) + { + grpc_sopb_add_slice (&p->incoming_sopb, gpr_slice_sub (slice, (size_t) (cur - beg), (size_t) (cur + p->frame_size - beg))); + cur += p->frame_size; + goto fh_0; /* loop */ + } + else + { + grpc_sopb_add_slice (&p->incoming_sopb, gpr_slice_sub (slice, (size_t) (cur - beg), (size_t) (end - beg))); + GPR_ASSERT (end - cur <= p->frame_size); + p->frame_size -= (gpr_uint32) (end - cur); + return GRPC_CHTTP2_PARSE_OK; + } + } - gpr_log(GPR_ERROR, "should never reach here"); - abort(); + gpr_log (GPR_ERROR, "should never reach here"); + abort (); return GRPC_CHTTP2_CONNECTION_ERROR; } diff --git a/src/core/transport/chttp2/frame_data.h b/src/core/transport/chttp2/frame_data.h index ccd56a132c9..6284433b191 100644 --- a/src/core/transport/chttp2/frame_data.h +++ b/src/core/transport/chttp2/frame_data.h @@ -42,7 +42,8 @@ #include "src/core/transport/stream_op.h" #include "src/core/transport/chttp2/frame.h" -typedef enum { +typedef enum +{ GRPC_CHTTP2_DATA_FH_0, GRPC_CHTTP2_DATA_FH_1, GRPC_CHTTP2_DATA_FH_2, @@ -51,7 +52,8 @@ typedef enum { GRPC_CHTTP2_DATA_FRAME } grpc_chttp2_stream_state; -typedef struct { +typedef struct +{ grpc_chttp2_stream_state state; gpr_uint8 is_last_frame; gpr_uint8 frame_type; @@ -62,23 +64,18 @@ typedef struct { } grpc_chttp2_data_parser; /* initialize per-stream state for data frame parsing */ -grpc_chttp2_parse_error grpc_chttp2_data_parser_init( - grpc_chttp2_data_parser *parser); +grpc_chttp2_parse_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_chttp2_data_parser * parser); /* start processing a new data frame */ -grpc_chttp2_parse_error grpc_chttp2_data_parser_begin_frame( - grpc_chttp2_data_parser *parser, gpr_uint8 flags); +grpc_chttp2_parse_error grpc_chttp2_data_parser_begin_frame (grpc_chttp2_data_parser * parser, gpr_uint8 flags); /* handle a slice of a data frame - is_last indicates the last slice of a frame */ -grpc_chttp2_parse_error grpc_chttp2_data_parser_parse( - void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list); +grpc_chttp2_parse_error grpc_chttp2_data_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); /* create a slice with an empty data frame and is_last set */ -gpr_slice grpc_chttp2_data_frame_create_empty_close(gpr_uint32 id); +gpr_slice grpc_chttp2_data_frame_create_empty_close (gpr_uint32 id); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_DATA_H */ diff --git a/src/core/transport/chttp2/frame_goaway.c b/src/core/transport/chttp2/frame_goaway.c index d338b566112..f990e86465b 100644 --- a/src/core/transport/chttp2/frame_goaway.c +++ b/src/core/transport/chttp2/frame_goaway.c @@ -39,137 +39,151 @@ #include #include -void grpc_chttp2_goaway_parser_init(grpc_chttp2_goaway_parser *p) { +void +grpc_chttp2_goaway_parser_init (grpc_chttp2_goaway_parser * p) +{ p->debug_data = NULL; } -void grpc_chttp2_goaway_parser_destroy(grpc_chttp2_goaway_parser *p) { - gpr_free(p->debug_data); +void +grpc_chttp2_goaway_parser_destroy (grpc_chttp2_goaway_parser * p) +{ + gpr_free (p->debug_data); } -grpc_chttp2_parse_error grpc_chttp2_goaway_parser_begin_frame( - grpc_chttp2_goaway_parser *p, gpr_uint32 length, gpr_uint8 flags) { - if (length < 8) { - gpr_log(GPR_ERROR, "goaway frame too short (%d bytes)", length); - return GRPC_CHTTP2_CONNECTION_ERROR; - } +grpc_chttp2_parse_error +grpc_chttp2_goaway_parser_begin_frame (grpc_chttp2_goaway_parser * p, gpr_uint32 length, gpr_uint8 flags) +{ + if (length < 8) + { + gpr_log (GPR_ERROR, "goaway frame too short (%d bytes)", length); + return GRPC_CHTTP2_CONNECTION_ERROR; + } - gpr_free(p->debug_data); + gpr_free (p->debug_data); p->debug_length = length - 8; - p->debug_data = gpr_malloc(p->debug_length); + p->debug_data = gpr_malloc (p->debug_length); p->debug_pos = 0; p->state = GRPC_CHTTP2_GOAWAY_LSI0; return GRPC_CHTTP2_PARSE_OK; } -grpc_chttp2_parse_error grpc_chttp2_goaway_parser_parse( - void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list) { - gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); - gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); +grpc_chttp2_parse_error +grpc_chttp2_goaway_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +{ + gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); + gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); gpr_uint8 *cur = beg; grpc_chttp2_goaway_parser *p = parser; - switch (p->state) { + switch (p->state) + { case GRPC_CHTTP2_GOAWAY_LSI0: - if (cur == end) { - p->state = GRPC_CHTTP2_GOAWAY_LSI0; - return GRPC_CHTTP2_PARSE_OK; - } - p->last_stream_id = ((gpr_uint32)*cur) << 24; + if (cur == end) + { + p->state = GRPC_CHTTP2_GOAWAY_LSI0; + return GRPC_CHTTP2_PARSE_OK; + } + p->last_stream_id = ((gpr_uint32) * cur) << 24; ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_LSI1: - if (cur == end) { - p->state = GRPC_CHTTP2_GOAWAY_LSI1; - return GRPC_CHTTP2_PARSE_OK; - } - p->last_stream_id |= ((gpr_uint32)*cur) << 16; + if (cur == end) + { + p->state = GRPC_CHTTP2_GOAWAY_LSI1; + return GRPC_CHTTP2_PARSE_OK; + } + p->last_stream_id |= ((gpr_uint32) * cur) << 16; ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_LSI2: - if (cur == end) { - p->state = GRPC_CHTTP2_GOAWAY_LSI2; - return GRPC_CHTTP2_PARSE_OK; - } - p->last_stream_id |= ((gpr_uint32)*cur) << 8; + if (cur == end) + { + p->state = GRPC_CHTTP2_GOAWAY_LSI2; + return GRPC_CHTTP2_PARSE_OK; + } + p->last_stream_id |= ((gpr_uint32) * cur) << 8; ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_LSI3: - if (cur == end) { - p->state = GRPC_CHTTP2_GOAWAY_LSI3; - return GRPC_CHTTP2_PARSE_OK; - } - p->last_stream_id |= ((gpr_uint32)*cur); + if (cur == end) + { + p->state = GRPC_CHTTP2_GOAWAY_LSI3; + return GRPC_CHTTP2_PARSE_OK; + } + p->last_stream_id |= ((gpr_uint32) * cur); ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_ERR0: - if (cur == end) { - p->state = GRPC_CHTTP2_GOAWAY_ERR0; - return GRPC_CHTTP2_PARSE_OK; - } - p->error_code = ((gpr_uint32)*cur) << 24; + if (cur == end) + { + p->state = GRPC_CHTTP2_GOAWAY_ERR0; + return GRPC_CHTTP2_PARSE_OK; + } + p->error_code = ((gpr_uint32) * cur) << 24; ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_ERR1: - if (cur == end) { - p->state = GRPC_CHTTP2_GOAWAY_ERR1; - return GRPC_CHTTP2_PARSE_OK; - } - p->error_code |= ((gpr_uint32)*cur) << 16; + if (cur == end) + { + p->state = GRPC_CHTTP2_GOAWAY_ERR1; + return GRPC_CHTTP2_PARSE_OK; + } + p->error_code |= ((gpr_uint32) * cur) << 16; ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_ERR2: - if (cur == end) { - p->state = GRPC_CHTTP2_GOAWAY_ERR2; - return GRPC_CHTTP2_PARSE_OK; - } - p->error_code |= ((gpr_uint32)*cur) << 8; + if (cur == end) + { + p->state = GRPC_CHTTP2_GOAWAY_ERR2; + return GRPC_CHTTP2_PARSE_OK; + } + p->error_code |= ((gpr_uint32) * cur) << 8; ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_ERR3: - if (cur == end) { - p->state = GRPC_CHTTP2_GOAWAY_ERR3; - return GRPC_CHTTP2_PARSE_OK; - } - p->error_code |= ((gpr_uint32)*cur); + if (cur == end) + { + p->state = GRPC_CHTTP2_GOAWAY_ERR3; + return GRPC_CHTTP2_PARSE_OK; + } + p->error_code |= ((gpr_uint32) * cur); ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_DEBUG: - memcpy(p->debug_data + p->debug_pos, cur, (size_t)(end - cur)); - GPR_ASSERT(end - cur < GPR_UINT32_MAX - p->debug_pos); - p->debug_pos += (gpr_uint32)(end - cur); + memcpy (p->debug_data + p->debug_pos, cur, (size_t) (end - cur)); + GPR_ASSERT (end - cur < GPR_UINT32_MAX - p->debug_pos); + p->debug_pos += (gpr_uint32) (end - cur); p->state = GRPC_CHTTP2_GOAWAY_DEBUG; - if (is_last) { - transport_parsing->goaway_received = 1; - transport_parsing->goaway_last_stream_index = p->last_stream_id; - gpr_slice_unref(transport_parsing->goaway_text); - transport_parsing->goaway_error = (grpc_status_code)p->error_code; - transport_parsing->goaway_text = - gpr_slice_new(p->debug_data, p->debug_length, gpr_free); - p->debug_data = NULL; - } + if (is_last) + { + transport_parsing->goaway_received = 1; + transport_parsing->goaway_last_stream_index = p->last_stream_id; + gpr_slice_unref (transport_parsing->goaway_text); + transport_parsing->goaway_error = (grpc_status_code) p->error_code; + transport_parsing->goaway_text = gpr_slice_new (p->debug_data, p->debug_length, gpr_free); + p->debug_data = NULL; + } return GRPC_CHTTP2_PARSE_OK; - } - gpr_log(GPR_ERROR, "Should never end up here"); - abort(); + } + gpr_log (GPR_ERROR, "Should never end up here"); + abort (); return GRPC_CHTTP2_CONNECTION_ERROR; } -void grpc_chttp2_goaway_append(gpr_uint32 last_stream_id, gpr_uint32 error_code, - gpr_slice debug_data, - gpr_slice_buffer *slice_buffer) { - gpr_slice header = gpr_slice_malloc(9 + 4 + 4); - gpr_uint8 *p = GPR_SLICE_START_PTR(header); +void +grpc_chttp2_goaway_append (gpr_uint32 last_stream_id, gpr_uint32 error_code, gpr_slice debug_data, gpr_slice_buffer * slice_buffer) +{ + gpr_slice header = gpr_slice_malloc (9 + 4 + 4); + gpr_uint8 *p = GPR_SLICE_START_PTR (header); gpr_uint32 frame_length; - GPR_ASSERT(GPR_SLICE_LENGTH(debug_data) < GPR_UINT32_MAX - 4 - 4); - frame_length = 4 + 4 + (gpr_uint32)GPR_SLICE_LENGTH(debug_data); + GPR_ASSERT (GPR_SLICE_LENGTH (debug_data) < GPR_UINT32_MAX - 4 - 4); + frame_length = 4 + 4 + (gpr_uint32) GPR_SLICE_LENGTH (debug_data); /* frame header: length */ - *p++ = (gpr_uint8)(frame_length >> 16); - *p++ = (gpr_uint8)(frame_length >> 8); - *p++ = (gpr_uint8)(frame_length); + *p++ = (gpr_uint8) (frame_length >> 16); + *p++ = (gpr_uint8) (frame_length >> 8); + *p++ = (gpr_uint8) (frame_length); /* frame header: type */ *p++ = GRPC_CHTTP2_FRAME_GOAWAY; /* frame header: flags */ @@ -180,16 +194,16 @@ void grpc_chttp2_goaway_append(gpr_uint32 last_stream_id, gpr_uint32 error_code, *p++ = 0; *p++ = 0; /* payload: last stream id */ - *p++ = (gpr_uint8)(last_stream_id >> 24); - *p++ = (gpr_uint8)(last_stream_id >> 16); - *p++ = (gpr_uint8)(last_stream_id >> 8); - *p++ = (gpr_uint8)(last_stream_id); + *p++ = (gpr_uint8) (last_stream_id >> 24); + *p++ = (gpr_uint8) (last_stream_id >> 16); + *p++ = (gpr_uint8) (last_stream_id >> 8); + *p++ = (gpr_uint8) (last_stream_id); /* payload: error code */ - *p++ = (gpr_uint8)(error_code >> 24); - *p++ = (gpr_uint8)(error_code >> 16); - *p++ = (gpr_uint8)(error_code >> 8); - *p++ = (gpr_uint8)(error_code); - GPR_ASSERT(p == GPR_SLICE_END_PTR(header)); - gpr_slice_buffer_add(slice_buffer, header); - gpr_slice_buffer_add(slice_buffer, debug_data); + *p++ = (gpr_uint8) (error_code >> 24); + *p++ = (gpr_uint8) (error_code >> 16); + *p++ = (gpr_uint8) (error_code >> 8); + *p++ = (gpr_uint8) (error_code); + GPR_ASSERT (p == GPR_SLICE_END_PTR (header)); + gpr_slice_buffer_add (slice_buffer, header); + gpr_slice_buffer_add (slice_buffer, debug_data); } diff --git a/src/core/transport/chttp2/frame_goaway.h b/src/core/transport/chttp2/frame_goaway.h index e45d55418c5..7cacec5f94f 100644 --- a/src/core/transport/chttp2/frame_goaway.h +++ b/src/core/transport/chttp2/frame_goaway.h @@ -40,7 +40,8 @@ #include #include -typedef enum { +typedef enum +{ GRPC_CHTTP2_GOAWAY_LSI0, GRPC_CHTTP2_GOAWAY_LSI1, GRPC_CHTTP2_GOAWAY_LSI2, @@ -52,7 +53,8 @@ typedef enum { GRPC_CHTTP2_GOAWAY_DEBUG } grpc_chttp2_goaway_parse_state; -typedef struct { +typedef struct +{ grpc_chttp2_goaway_parse_state state; gpr_uint32 last_stream_id; gpr_uint32 error_code; @@ -61,17 +63,11 @@ typedef struct { gpr_uint32 debug_pos; } grpc_chttp2_goaway_parser; -void grpc_chttp2_goaway_parser_init(grpc_chttp2_goaway_parser *p); -void grpc_chttp2_goaway_parser_destroy(grpc_chttp2_goaway_parser *p); -grpc_chttp2_parse_error grpc_chttp2_goaway_parser_begin_frame( - grpc_chttp2_goaway_parser *parser, gpr_uint32 length, gpr_uint8 flags); -grpc_chttp2_parse_error grpc_chttp2_goaway_parser_parse( - void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list); +void grpc_chttp2_goaway_parser_init (grpc_chttp2_goaway_parser * p); +void grpc_chttp2_goaway_parser_destroy (grpc_chttp2_goaway_parser * p); +grpc_chttp2_parse_error grpc_chttp2_goaway_parser_begin_frame (grpc_chttp2_goaway_parser * parser, gpr_uint32 length, gpr_uint8 flags); +grpc_chttp2_parse_error grpc_chttp2_goaway_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); -void grpc_chttp2_goaway_append(gpr_uint32 last_stream_id, gpr_uint32 error_code, - gpr_slice debug_data, - gpr_slice_buffer *slice_buffer); +void grpc_chttp2_goaway_append (gpr_uint32 last_stream_id, gpr_uint32 error_code, gpr_slice debug_data, gpr_slice_buffer * slice_buffer); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_GOAWAY_H */ diff --git a/src/core/transport/chttp2/frame_ping.c b/src/core/transport/chttp2/frame_ping.c index d4bf43eb37c..6cd1fae1a61 100644 --- a/src/core/transport/chttp2/frame_ping.c +++ b/src/core/transport/chttp2/frame_ping.c @@ -39,9 +39,11 @@ #include #include -gpr_slice grpc_chttp2_ping_create(gpr_uint8 ack, gpr_uint8 *opaque_8bytes) { - gpr_slice slice = gpr_slice_malloc(9 + 8); - gpr_uint8 *p = GPR_SLICE_START_PTR(slice); +gpr_slice +grpc_chttp2_ping_create (gpr_uint8 ack, gpr_uint8 * opaque_8bytes) +{ + gpr_slice slice = gpr_slice_malloc (9 + 8); + gpr_uint8 *p = GPR_SLICE_START_PTR (slice); *p++ = 0; *p++ = 0; @@ -52,55 +54,61 @@ gpr_slice grpc_chttp2_ping_create(gpr_uint8 ack, gpr_uint8 *opaque_8bytes) { *p++ = 0; *p++ = 0; *p++ = 0; - memcpy(p, opaque_8bytes, 8); + memcpy (p, opaque_8bytes, 8); return slice; } -grpc_chttp2_parse_error grpc_chttp2_ping_parser_begin_frame( - grpc_chttp2_ping_parser *parser, gpr_uint32 length, gpr_uint8 flags) { - if (flags & 0xfe || length != 8) { - gpr_log(GPR_ERROR, "invalid ping: length=%d, flags=%02x", length, flags); - return GRPC_CHTTP2_CONNECTION_ERROR; - } +grpc_chttp2_parse_error +grpc_chttp2_ping_parser_begin_frame (grpc_chttp2_ping_parser * parser, gpr_uint32 length, gpr_uint8 flags) +{ + if (flags & 0xfe || length != 8) + { + gpr_log (GPR_ERROR, "invalid ping: length=%d, flags=%02x", length, flags); + return GRPC_CHTTP2_CONNECTION_ERROR; + } parser->byte = 0; parser->is_ack = flags; return GRPC_CHTTP2_PARSE_OK; } -grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse( - void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list) { - gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); - gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); +grpc_chttp2_parse_error +grpc_chttp2_ping_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +{ + gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); + gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); gpr_uint8 *cur = beg; grpc_chttp2_ping_parser *p = parser; grpc_chttp2_outstanding_ping *ping; - while (p->byte != 8 && cur != end) { - p->opaque_8bytes[p->byte] = *cur; - cur++; - p->byte++; - } + while (p->byte != 8 && cur != end) + { + p->opaque_8bytes[p->byte] = *cur; + cur++; + p->byte++; + } - if (p->byte == 8) { - GPR_ASSERT(is_last); - if (p->is_ack) { - for (ping = transport_parsing->pings.next; - ping != &transport_parsing->pings; ping = ping->next) { - if (0 == memcmp(p->opaque_8bytes, ping->id, 8)) { - grpc_closure_list_add(closure_list, ping->on_recv, 1); - } - ping->next->prev = ping->prev; - ping->prev->next = ping->next; - gpr_free(ping); - } - } else { - gpr_slice_buffer_add(&transport_parsing->qbuf, - grpc_chttp2_ping_create(1, p->opaque_8bytes)); + if (p->byte == 8) + { + GPR_ASSERT (is_last); + if (p->is_ack) + { + for (ping = transport_parsing->pings.next; ping != &transport_parsing->pings; ping = ping->next) + { + if (0 == memcmp (p->opaque_8bytes, ping->id, 8)) + { + grpc_closure_list_add (closure_list, ping->on_recv, 1); + } + ping->next->prev = ping->prev; + ping->prev->next = ping->next; + gpr_free (ping); + } + } + else + { + gpr_slice_buffer_add (&transport_parsing->qbuf, grpc_chttp2_ping_create (1, p->opaque_8bytes)); + } } - } return GRPC_CHTTP2_PARSE_OK; } diff --git a/src/core/transport/chttp2/frame_ping.h b/src/core/transport/chttp2/frame_ping.h index 42240029047..65a666bc18b 100644 --- a/src/core/transport/chttp2/frame_ping.h +++ b/src/core/transport/chttp2/frame_ping.h @@ -38,19 +38,16 @@ #include #include "src/core/transport/chttp2/frame.h" -typedef struct { +typedef struct +{ gpr_uint8 byte; gpr_uint8 is_ack; gpr_uint8 opaque_8bytes[8]; } grpc_chttp2_ping_parser; -gpr_slice grpc_chttp2_ping_create(gpr_uint8 ack, gpr_uint8 *opaque_8bytes); +gpr_slice grpc_chttp2_ping_create (gpr_uint8 ack, gpr_uint8 * opaque_8bytes); -grpc_chttp2_parse_error grpc_chttp2_ping_parser_begin_frame( - grpc_chttp2_ping_parser *parser, gpr_uint32 length, gpr_uint8 flags); -grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse( - void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list); +grpc_chttp2_parse_error grpc_chttp2_ping_parser_begin_frame (grpc_chttp2_ping_parser * parser, gpr_uint32 length, gpr_uint8 flags); +grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_PING_H */ diff --git a/src/core/transport/chttp2/frame_rst_stream.c b/src/core/transport/chttp2/frame_rst_stream.c index 4d8323c11dd..c4bca3e680c 100644 --- a/src/core/transport/chttp2/frame_rst_stream.c +++ b/src/core/transport/chttp2/frame_rst_stream.c @@ -38,63 +38,63 @@ #include "src/core/transport/chttp2/frame.h" -gpr_slice grpc_chttp2_rst_stream_create(gpr_uint32 id, gpr_uint32 code) { - gpr_slice slice = gpr_slice_malloc(13); - gpr_uint8 *p = GPR_SLICE_START_PTR(slice); +gpr_slice +grpc_chttp2_rst_stream_create (gpr_uint32 id, gpr_uint32 code) +{ + gpr_slice slice = gpr_slice_malloc (13); + gpr_uint8 *p = GPR_SLICE_START_PTR (slice); *p++ = 0; *p++ = 0; *p++ = 4; *p++ = GRPC_CHTTP2_FRAME_RST_STREAM; *p++ = 0; - *p++ = (gpr_uint8)(id >> 24); - *p++ = (gpr_uint8)(id >> 16); - *p++ = (gpr_uint8)(id >> 8); - *p++ = (gpr_uint8)(id); - *p++ = (gpr_uint8)(code >> 24); - *p++ = (gpr_uint8)(code >> 16); - *p++ = (gpr_uint8)(code >> 8); - *p++ = (gpr_uint8)(code); + *p++ = (gpr_uint8) (id >> 24); + *p++ = (gpr_uint8) (id >> 16); + *p++ = (gpr_uint8) (id >> 8); + *p++ = (gpr_uint8) (id); + *p++ = (gpr_uint8) (code >> 24); + *p++ = (gpr_uint8) (code >> 16); + *p++ = (gpr_uint8) (code >> 8); + *p++ = (gpr_uint8) (code); return slice; } -grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_begin_frame( - grpc_chttp2_rst_stream_parser *parser, gpr_uint32 length, gpr_uint8 flags) { - if (length != 4) { - gpr_log(GPR_ERROR, "invalid rst_stream: length=%d, flags=%02x", length, - flags); - return GRPC_CHTTP2_CONNECTION_ERROR; - } +grpc_chttp2_parse_error +grpc_chttp2_rst_stream_parser_begin_frame (grpc_chttp2_rst_stream_parser * parser, gpr_uint32 length, gpr_uint8 flags) +{ + if (length != 4) + { + gpr_log (GPR_ERROR, "invalid rst_stream: length=%d, flags=%02x", length, flags); + return GRPC_CHTTP2_CONNECTION_ERROR; + } parser->byte = 0; return GRPC_CHTTP2_PARSE_OK; } -grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_parse( - void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list) { - gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); - gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); +grpc_chttp2_parse_error +grpc_chttp2_rst_stream_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +{ + gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); + gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); gpr_uint8 *cur = beg; grpc_chttp2_rst_stream_parser *p = parser; - while (p->byte != 4 && cur != end) { - p->reason_bytes[p->byte] = *cur; - cur++; - p->byte++; - } + while (p->byte != 4 && cur != end) + { + p->reason_bytes[p->byte] = *cur; + cur++; + p->byte++; + } - if (p->byte == 4) { - GPR_ASSERT(is_last); - stream_parsing->received_close = 1; - stream_parsing->saw_rst_stream = 1; - stream_parsing->rst_stream_reason = - (((gpr_uint32)p->reason_bytes[0]) << 24) | - (((gpr_uint32)p->reason_bytes[1]) << 16) | - (((gpr_uint32)p->reason_bytes[2]) << 8) | - (((gpr_uint32)p->reason_bytes[3])); - } + if (p->byte == 4) + { + GPR_ASSERT (is_last); + stream_parsing->received_close = 1; + stream_parsing->saw_rst_stream = 1; + stream_parsing->rst_stream_reason = (((gpr_uint32) p->reason_bytes[0]) << 24) | (((gpr_uint32) p->reason_bytes[1]) << 16) | (((gpr_uint32) p->reason_bytes[2]) << 8) | (((gpr_uint32) p->reason_bytes[3])); + } return GRPC_CHTTP2_PARSE_OK; } diff --git a/src/core/transport/chttp2/frame_rst_stream.h b/src/core/transport/chttp2/frame_rst_stream.h index 5d660968ad6..781f4e5743e 100644 --- a/src/core/transport/chttp2/frame_rst_stream.h +++ b/src/core/transport/chttp2/frame_rst_stream.h @@ -38,18 +38,15 @@ #include "src/core/transport/chttp2/frame.h" #include "src/core/iomgr/exec_ctx.h" -typedef struct { +typedef struct +{ gpr_uint8 byte; gpr_uint8 reason_bytes[4]; } grpc_chttp2_rst_stream_parser; -gpr_slice grpc_chttp2_rst_stream_create(gpr_uint32 stream_id, gpr_uint32 code); +gpr_slice grpc_chttp2_rst_stream_create (gpr_uint32 stream_id, gpr_uint32 code); -grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_begin_frame( - grpc_chttp2_rst_stream_parser *parser, gpr_uint32 length, gpr_uint8 flags); -grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_parse( - void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list); +grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_begin_frame (grpc_chttp2_rst_stream_parser * parser, gpr_uint32 length, gpr_uint8 flags); +grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_RST_STREAM_H */ diff --git a/src/core/transport/chttp2/frame_settings.c b/src/core/transport/chttp2/frame_settings.c index 235ff5a352f..7f2d5ba3fe0 100644 --- a/src/core/transport/chttp2/frame_settings.c +++ b/src/core/transport/chttp2/frame_settings.c @@ -43,27 +43,27 @@ #include /* HTTP/2 mandated initial connection settings */ -const grpc_chttp2_setting_parameters - grpc_chttp2_settings_parameters[GRPC_CHTTP2_NUM_SETTINGS] = { - {NULL, 0, 0, 0, GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, - {"HEADER_TABLE_SIZE", 4096, 0, 0xffffffff, - GRPC_CHTTP2_CLAMP_INVALID_VALUE}, - {"ENABLE_PUSH", 1, 0, 1, GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, - {"MAX_CONCURRENT_STREAMS", 0xffffffffu, 0, 0xffffffffu, - GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, - {"INITIAL_WINDOW_SIZE", 65535, 0, 0xffffffffu, - GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, - {"MAX_FRAME_SIZE", 16384, 16384, 16777215, - GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, - {"MAX_HEADER_LIST_SIZE", 0xffffffffu, 0, 0xffffffffu, - GRPC_CHTTP2_CLAMP_INVALID_VALUE}, +const grpc_chttp2_setting_parameters grpc_chttp2_settings_parameters[GRPC_CHTTP2_NUM_SETTINGS] = { + {NULL, 0, 0, 0, GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, + {"HEADER_TABLE_SIZE", 4096, 0, 0xffffffff, + GRPC_CHTTP2_CLAMP_INVALID_VALUE}, + {"ENABLE_PUSH", 1, 0, 1, GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, + {"MAX_CONCURRENT_STREAMS", 0xffffffffu, 0, 0xffffffffu, + GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, + {"INITIAL_WINDOW_SIZE", 65535, 0, 0xffffffffu, + GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, + {"MAX_FRAME_SIZE", 16384, 16384, 16777215, + GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, + {"MAX_HEADER_LIST_SIZE", 0xffffffffu, 0, 0xffffffffu, + GRPC_CHTTP2_CLAMP_INVALID_VALUE}, }; -static gpr_uint8 *fill_header(gpr_uint8 *out, gpr_uint32 length, - gpr_uint8 flags) { - *out++ = (gpr_uint8)(length >> 16); - *out++ = (gpr_uint8)(length >> 8); - *out++ = (gpr_uint8)(length); +static gpr_uint8 * +fill_header (gpr_uint8 * out, gpr_uint32 length, gpr_uint8 flags) +{ + *out++ = (gpr_uint8) (length >> 16); + *out++ = (gpr_uint8) (length >> 8); + *out++ = (gpr_uint8) (length); *out++ = GRPC_CHTTP2_FRAME_SETTINGS; *out++ = flags; *out++ = 0; @@ -73,175 +73,194 @@ static gpr_uint8 *fill_header(gpr_uint8 *out, gpr_uint32 length, return out; } -gpr_slice grpc_chttp2_settings_create(gpr_uint32 *old, const gpr_uint32 *new, - gpr_uint32 force_mask, size_t count) { +gpr_slice +grpc_chttp2_settings_create (gpr_uint32 * old, const gpr_uint32 * new, gpr_uint32 force_mask, size_t count) +{ size_t i; gpr_uint32 n = 0; gpr_slice output; gpr_uint8 *p; - for (i = 0; i < count; i++) { - n += (new[i] != old[i] || (force_mask & (1u << i)) != 0); - } - - output = gpr_slice_malloc(9 + 6 * n); - p = fill_header(GPR_SLICE_START_PTR(output), 6 * n, 0); - - for (i = 0; i < count; i++) { - if (new[i] != old[i] || (force_mask & (1u << i)) != 0) { - GPR_ASSERT(i); - *p++ = (gpr_uint8)(i >> 8); - *p++ = (gpr_uint8)(i); - *p++ = (gpr_uint8)(new[i] >> 24); - *p++ = (gpr_uint8)(new[i] >> 16); - *p++ = (gpr_uint8)(new[i] >> 8); - *p++ = (gpr_uint8)(new[i]); - old[i] = new[i]; + for (i = 0; i < count; i++) + { + n += (new[i] != old[i] || (force_mask & (1u << i)) != 0); } - } - GPR_ASSERT(p == GPR_SLICE_END_PTR(output)); + output = gpr_slice_malloc (9 + 6 * n); + p = fill_header (GPR_SLICE_START_PTR (output), 6 * n, 0); + + for (i = 0; i < count; i++) + { + if (new[i] != old[i] || (force_mask & (1u << i)) != 0) + { + GPR_ASSERT (i); + *p++ = (gpr_uint8) (i >> 8); + *p++ = (gpr_uint8) (i); + *p++ = (gpr_uint8) (new[i] >> 24); + *p++ = (gpr_uint8) (new[i] >> 16); + *p++ = (gpr_uint8) (new[i] >> 8); + *p++ = (gpr_uint8) (new[i]); + old[i] = new[i]; + } + } + + GPR_ASSERT (p == GPR_SLICE_END_PTR (output)); return output; } -gpr_slice grpc_chttp2_settings_ack_create(void) { - gpr_slice output = gpr_slice_malloc(9); - fill_header(GPR_SLICE_START_PTR(output), 0, GRPC_CHTTP2_FLAG_ACK); +gpr_slice +grpc_chttp2_settings_ack_create (void) +{ + gpr_slice output = gpr_slice_malloc (9); + fill_header (GPR_SLICE_START_PTR (output), 0, GRPC_CHTTP2_FLAG_ACK); return output; } -grpc_chttp2_parse_error grpc_chttp2_settings_parser_begin_frame( - grpc_chttp2_settings_parser *parser, gpr_uint32 length, gpr_uint8 flags, - gpr_uint32 *settings) { +grpc_chttp2_parse_error +grpc_chttp2_settings_parser_begin_frame (grpc_chttp2_settings_parser * parser, gpr_uint32 length, gpr_uint8 flags, gpr_uint32 * settings) +{ parser->target_settings = settings; - memcpy(parser->incoming_settings, settings, - GRPC_CHTTP2_NUM_SETTINGS * sizeof(gpr_uint32)); + memcpy (parser->incoming_settings, settings, GRPC_CHTTP2_NUM_SETTINGS * sizeof (gpr_uint32)); parser->is_ack = 0; parser->state = GRPC_CHTTP2_SPS_ID0; - if (flags == GRPC_CHTTP2_FLAG_ACK) { - parser->is_ack = 1; - if (length != 0) { - gpr_log(GPR_ERROR, "non-empty settings ack frame received"); + if (flags == GRPC_CHTTP2_FLAG_ACK) + { + parser->is_ack = 1; + if (length != 0) + { + gpr_log (GPR_ERROR, "non-empty settings ack frame received"); + return GRPC_CHTTP2_CONNECTION_ERROR; + } + return GRPC_CHTTP2_PARSE_OK; + } + else if (flags != 0) + { + gpr_log (GPR_ERROR, "invalid flags on settings frame"); + return GRPC_CHTTP2_CONNECTION_ERROR; + } + else if (length % 6 != 0) + { + gpr_log (GPR_ERROR, "settings frames must be a multiple of six bytes"); return GRPC_CHTTP2_CONNECTION_ERROR; } - return GRPC_CHTTP2_PARSE_OK; - } else if (flags != 0) { - gpr_log(GPR_ERROR, "invalid flags on settings frame"); - return GRPC_CHTTP2_CONNECTION_ERROR; - } else if (length % 6 != 0) { - gpr_log(GPR_ERROR, "settings frames must be a multiple of six bytes"); - return GRPC_CHTTP2_CONNECTION_ERROR; - } else { - return GRPC_CHTTP2_PARSE_OK; - } + else + { + return GRPC_CHTTP2_PARSE_OK; + } } -grpc_chttp2_parse_error grpc_chttp2_settings_parser_parse( - void *p, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list) { +grpc_chttp2_parse_error +grpc_chttp2_settings_parser_parse (void *p, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +{ grpc_chttp2_settings_parser *parser = p; - const gpr_uint8 *cur = GPR_SLICE_START_PTR(slice); - const gpr_uint8 *end = GPR_SLICE_END_PTR(slice); - - if (parser->is_ack) { - return GRPC_CHTTP2_PARSE_OK; - } - - for (;;) { - switch (parser->state) { - case GRPC_CHTTP2_SPS_ID0: - if (cur == end) { - parser->state = GRPC_CHTTP2_SPS_ID0; - if (is_last) { - transport_parsing->settings_updated = 1; - memcpy(parser->target_settings, parser->incoming_settings, - GRPC_CHTTP2_NUM_SETTINGS * sizeof(gpr_uint32)); - gpr_slice_buffer_add(&transport_parsing->qbuf, - grpc_chttp2_settings_ack_create()); - } - return GRPC_CHTTP2_PARSE_OK; - } - parser->id = (gpr_uint16)(((gpr_uint16)*cur) << 8); - cur++; - /* fallthrough */ - case GRPC_CHTTP2_SPS_ID1: - if (cur == end) { - parser->state = GRPC_CHTTP2_SPS_ID1; - return GRPC_CHTTP2_PARSE_OK; - } - parser->id = (gpr_uint16)(parser->id | (*cur)); - cur++; - /* fallthrough */ - case GRPC_CHTTP2_SPS_VAL0: - if (cur == end) { - parser->state = GRPC_CHTTP2_SPS_VAL0; - return GRPC_CHTTP2_PARSE_OK; - } - parser->value = ((gpr_uint32)*cur) << 24; - cur++; - /* fallthrough */ - case GRPC_CHTTP2_SPS_VAL1: - if (cur == end) { - parser->state = GRPC_CHTTP2_SPS_VAL1; - return GRPC_CHTTP2_PARSE_OK; - } - parser->value |= ((gpr_uint32)*cur) << 16; - cur++; - /* fallthrough */ - case GRPC_CHTTP2_SPS_VAL2: - if (cur == end) { - parser->state = GRPC_CHTTP2_SPS_VAL2; - return GRPC_CHTTP2_PARSE_OK; - } - parser->value |= ((gpr_uint32)*cur) << 8; - cur++; - /* fallthrough */ - case GRPC_CHTTP2_SPS_VAL3: - if (cur == end) { - parser->state = GRPC_CHTTP2_SPS_VAL3; - return GRPC_CHTTP2_PARSE_OK; - } else { - parser->state = GRPC_CHTTP2_SPS_ID0; - } - parser->value |= *cur; - cur++; - - if (parser->id > 0 && parser->id < GRPC_CHTTP2_NUM_SETTINGS) { - const grpc_chttp2_setting_parameters *sp = - &grpc_chttp2_settings_parameters[parser->id]; - if (parser->value < sp->min_value || parser->value > sp->max_value) { - switch (sp->invalid_value_behavior) { - case GRPC_CHTTP2_CLAMP_INVALID_VALUE: - parser->value = - GPR_CLAMP(parser->value, sp->min_value, sp->max_value); - break; - case GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE: - gpr_log(GPR_ERROR, "invalid value %u passed for %s", - parser->value, sp->name); - return GRPC_CHTTP2_CONNECTION_ERROR; - } - } - if (parser->id == GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE && - parser->incoming_settings[parser->id] != parser->value) { - transport_parsing->initial_window_update = - (gpr_int64)parser->value - - parser->incoming_settings[parser->id]; - gpr_log(GPR_DEBUG, "adding %d for initial_window change", - (int)transport_parsing->initial_window_update); - } - parser->incoming_settings[parser->id] = parser->value; - if (grpc_http_trace) { - gpr_log(GPR_DEBUG, "CHTTP2:%s: got setting %d = %d", - transport_parsing->is_client ? "CLI" : "SVR", parser->id, - parser->value); - } - } else { - gpr_log(GPR_ERROR, "CHTTP2: Ignoring unknown setting %d (value %d)", - parser->id, parser->value); - } - break; + const gpr_uint8 *cur = GPR_SLICE_START_PTR (slice); + const gpr_uint8 *end = GPR_SLICE_END_PTR (slice); + + if (parser->is_ack) + { + return GRPC_CHTTP2_PARSE_OK; + } + + for (;;) + { + switch (parser->state) + { + case GRPC_CHTTP2_SPS_ID0: + if (cur == end) + { + parser->state = GRPC_CHTTP2_SPS_ID0; + if (is_last) + { + transport_parsing->settings_updated = 1; + memcpy (parser->target_settings, parser->incoming_settings, GRPC_CHTTP2_NUM_SETTINGS * sizeof (gpr_uint32)); + gpr_slice_buffer_add (&transport_parsing->qbuf, grpc_chttp2_settings_ack_create ()); + } + return GRPC_CHTTP2_PARSE_OK; + } + parser->id = (gpr_uint16) (((gpr_uint16) * cur) << 8); + cur++; + /* fallthrough */ + case GRPC_CHTTP2_SPS_ID1: + if (cur == end) + { + parser->state = GRPC_CHTTP2_SPS_ID1; + return GRPC_CHTTP2_PARSE_OK; + } + parser->id = (gpr_uint16) (parser->id | (*cur)); + cur++; + /* fallthrough */ + case GRPC_CHTTP2_SPS_VAL0: + if (cur == end) + { + parser->state = GRPC_CHTTP2_SPS_VAL0; + return GRPC_CHTTP2_PARSE_OK; + } + parser->value = ((gpr_uint32) * cur) << 24; + cur++; + /* fallthrough */ + case GRPC_CHTTP2_SPS_VAL1: + if (cur == end) + { + parser->state = GRPC_CHTTP2_SPS_VAL1; + return GRPC_CHTTP2_PARSE_OK; + } + parser->value |= ((gpr_uint32) * cur) << 16; + cur++; + /* fallthrough */ + case GRPC_CHTTP2_SPS_VAL2: + if (cur == end) + { + parser->state = GRPC_CHTTP2_SPS_VAL2; + return GRPC_CHTTP2_PARSE_OK; + } + parser->value |= ((gpr_uint32) * cur) << 8; + cur++; + /* fallthrough */ + case GRPC_CHTTP2_SPS_VAL3: + if (cur == end) + { + parser->state = GRPC_CHTTP2_SPS_VAL3; + return GRPC_CHTTP2_PARSE_OK; + } + else + { + parser->state = GRPC_CHTTP2_SPS_ID0; + } + parser->value |= *cur; + cur++; + + if (parser->id > 0 && parser->id < GRPC_CHTTP2_NUM_SETTINGS) + { + const grpc_chttp2_setting_parameters *sp = &grpc_chttp2_settings_parameters[parser->id]; + if (parser->value < sp->min_value || parser->value > sp->max_value) + { + switch (sp->invalid_value_behavior) + { + case GRPC_CHTTP2_CLAMP_INVALID_VALUE: + parser->value = GPR_CLAMP (parser->value, sp->min_value, sp->max_value); + break; + case GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE: + gpr_log (GPR_ERROR, "invalid value %u passed for %s", parser->value, sp->name); + return GRPC_CHTTP2_CONNECTION_ERROR; + } + } + if (parser->id == GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE && parser->incoming_settings[parser->id] != parser->value) + { + transport_parsing->initial_window_update = (gpr_int64) parser->value - parser->incoming_settings[parser->id]; + gpr_log (GPR_DEBUG, "adding %d for initial_window change", (int) transport_parsing->initial_window_update); + } + parser->incoming_settings[parser->id] = parser->value; + if (grpc_http_trace) + { + gpr_log (GPR_DEBUG, "CHTTP2:%s: got setting %d = %d", transport_parsing->is_client ? "CLI" : "SVR", parser->id, parser->value); + } + } + else + { + gpr_log (GPR_ERROR, "CHTTP2: Ignoring unknown setting %d (value %d)", parser->id, parser->value); + } + break; + } } - } } diff --git a/src/core/transport/chttp2/frame_settings.h b/src/core/transport/chttp2/frame_settings.h index f08d527d386..36c2c1d6d46 100644 --- a/src/core/transport/chttp2/frame_settings.h +++ b/src/core/transport/chttp2/frame_settings.h @@ -39,7 +39,8 @@ #include "src/core/transport/chttp2/frame.h" #include "src/core/iomgr/exec_ctx.h" -typedef enum { +typedef enum +{ GRPC_CHTTP2_SPS_ID0, GRPC_CHTTP2_SPS_ID1, GRPC_CHTTP2_SPS_VAL0, @@ -49,7 +50,8 @@ typedef enum { } grpc_chttp2_settings_parse_state; /* The things HTTP/2 defines as connection level settings */ -typedef enum { +typedef enum +{ GRPC_CHTTP2_SETTINGS_HEADER_TABLE_SIZE = 1, GRPC_CHTTP2_SETTINGS_ENABLE_PUSH = 2, GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS = 3, @@ -59,7 +61,8 @@ typedef enum { GRPC_CHTTP2_NUM_SETTINGS } grpc_chttp2_setting_id; -typedef struct { +typedef struct +{ grpc_chttp2_settings_parse_state state; gpr_uint32 *target_settings; gpr_uint8 is_ack; @@ -68,12 +71,14 @@ typedef struct { gpr_uint32 incoming_settings[GRPC_CHTTP2_NUM_SETTINGS]; } grpc_chttp2_settings_parser; -typedef enum { +typedef enum +{ GRPC_CHTTP2_CLAMP_INVALID_VALUE, GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE } grpc_chttp2_invalid_value_behavior; -typedef struct { +typedef struct +{ const char *name; gpr_uint32 default_value; gpr_uint32 min_value; @@ -82,21 +87,14 @@ typedef struct { } grpc_chttp2_setting_parameters; /* HTTP/2 mandated connection setting parameters */ -extern const grpc_chttp2_setting_parameters - grpc_chttp2_settings_parameters[GRPC_CHTTP2_NUM_SETTINGS]; +extern const grpc_chttp2_setting_parameters grpc_chttp2_settings_parameters[GRPC_CHTTP2_NUM_SETTINGS]; /* Create a settings frame by diffing old & new, and updating old to be new */ -gpr_slice grpc_chttp2_settings_create(gpr_uint32 *old, const gpr_uint32 *new, - gpr_uint32 force_mask, size_t count); +gpr_slice grpc_chttp2_settings_create (gpr_uint32 * old, const gpr_uint32 * new, gpr_uint32 force_mask, size_t count); /* Create an ack settings frame */ -gpr_slice grpc_chttp2_settings_ack_create(void); +gpr_slice grpc_chttp2_settings_ack_create (void); -grpc_chttp2_parse_error grpc_chttp2_settings_parser_begin_frame( - grpc_chttp2_settings_parser *parser, gpr_uint32 length, gpr_uint8 flags, - gpr_uint32 *settings); -grpc_chttp2_parse_error grpc_chttp2_settings_parser_parse( - void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list); +grpc_chttp2_parse_error grpc_chttp2_settings_parser_begin_frame (grpc_chttp2_settings_parser * parser, gpr_uint32 length, gpr_uint8 flags, gpr_uint32 * settings); +grpc_chttp2_parse_error grpc_chttp2_settings_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_SETTINGS_H */ diff --git a/src/core/transport/chttp2/frame_window_update.c b/src/core/transport/chttp2/frame_window_update.c index b0f5f8698bd..e18fc1f694c 100644 --- a/src/core/transport/chttp2/frame_window_update.c +++ b/src/core/transport/chttp2/frame_window_update.c @@ -36,80 +36,83 @@ #include -gpr_slice grpc_chttp2_window_update_create(gpr_uint32 id, - gpr_uint32 window_update) { - gpr_slice slice = gpr_slice_malloc(13); - gpr_uint8 *p = GPR_SLICE_START_PTR(slice); +gpr_slice +grpc_chttp2_window_update_create (gpr_uint32 id, gpr_uint32 window_update) +{ + gpr_slice slice = gpr_slice_malloc (13); + gpr_uint8 *p = GPR_SLICE_START_PTR (slice); - GPR_ASSERT(window_update); + GPR_ASSERT (window_update); *p++ = 0; *p++ = 0; *p++ = 4; *p++ = GRPC_CHTTP2_FRAME_WINDOW_UPDATE; *p++ = 0; - *p++ = (gpr_uint8)(id >> 24); - *p++ = (gpr_uint8)(id >> 16); - *p++ = (gpr_uint8)(id >> 8); - *p++ = (gpr_uint8)(id); - *p++ = (gpr_uint8)(window_update >> 24); - *p++ = (gpr_uint8)(window_update >> 16); - *p++ = (gpr_uint8)(window_update >> 8); - *p++ = (gpr_uint8)(window_update); + *p++ = (gpr_uint8) (id >> 24); + *p++ = (gpr_uint8) (id >> 16); + *p++ = (gpr_uint8) (id >> 8); + *p++ = (gpr_uint8) (id); + *p++ = (gpr_uint8) (window_update >> 24); + *p++ = (gpr_uint8) (window_update >> 16); + *p++ = (gpr_uint8) (window_update >> 8); + *p++ = (gpr_uint8) (window_update); return slice; } -grpc_chttp2_parse_error grpc_chttp2_window_update_parser_begin_frame( - grpc_chttp2_window_update_parser *parser, gpr_uint32 length, - gpr_uint8 flags) { - if (flags || length != 4) { - gpr_log(GPR_ERROR, "invalid window update: length=%d, flags=%02x", length, - flags); - return GRPC_CHTTP2_CONNECTION_ERROR; - } +grpc_chttp2_parse_error +grpc_chttp2_window_update_parser_begin_frame (grpc_chttp2_window_update_parser * parser, gpr_uint32 length, gpr_uint8 flags) +{ + if (flags || length != 4) + { + gpr_log (GPR_ERROR, "invalid window update: length=%d, flags=%02x", length, flags); + return GRPC_CHTTP2_CONNECTION_ERROR; + } parser->byte = 0; parser->amount = 0; return GRPC_CHTTP2_PARSE_OK; } -grpc_chttp2_parse_error grpc_chttp2_window_update_parser_parse( - void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list) { - gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); - gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); +grpc_chttp2_parse_error +grpc_chttp2_window_update_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +{ + gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); + gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); gpr_uint8 *cur = beg; grpc_chttp2_window_update_parser *p = parser; - while (p->byte != 4 && cur != end) { - p->amount |= ((gpr_uint32)*cur) << (8 * (3 - p->byte)); - cur++; - p->byte++; - } - - if (p->byte == 4) { - if (p->amount == 0 || (p->amount & 0x80000000u)) { - gpr_log(GPR_ERROR, "invalid window update bytes: %d", p->amount); - return GRPC_CHTTP2_CONNECTION_ERROR; + while (p->byte != 4 && cur != end) + { + p->amount |= ((gpr_uint32) * cur) << (8 * (3 - p->byte)); + cur++; + p->byte++; } - GPR_ASSERT(is_last); - if (transport_parsing->incoming_stream_id != 0) { - if (stream_parsing != NULL) { - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM("update", transport_parsing, - stream_parsing, outgoing_window_update, - p->amount); - stream_parsing->outgoing_window_update += p->amount; - grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, - stream_parsing); - } - } else { - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT("update", transport_parsing, - outgoing_window_update, p->amount); - transport_parsing->outgoing_window_update += p->amount; + if (p->byte == 4) + { + if (p->amount == 0 || (p->amount & 0x80000000u)) + { + gpr_log (GPR_ERROR, "invalid window update bytes: %d", p->amount); + return GRPC_CHTTP2_CONNECTION_ERROR; + } + GPR_ASSERT (is_last); + + if (transport_parsing->incoming_stream_id != 0) + { + if (stream_parsing != NULL) + { + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("update", transport_parsing, stream_parsing, outgoing_window_update, p->amount); + stream_parsing->outgoing_window_update += p->amount; + grpc_chttp2_list_add_parsing_seen_stream (transport_parsing, stream_parsing); + } + } + else + { + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("update", transport_parsing, outgoing_window_update, p->amount); + transport_parsing->outgoing_window_update += p->amount; + } } - } return GRPC_CHTTP2_PARSE_OK; } diff --git a/src/core/transport/chttp2/frame_window_update.h b/src/core/transport/chttp2/frame_window_update.h index b8fe9095b7d..57d77b41cfe 100644 --- a/src/core/transport/chttp2/frame_window_update.h +++ b/src/core/transport/chttp2/frame_window_update.h @@ -38,21 +38,16 @@ #include #include "src/core/transport/chttp2/frame.h" -typedef struct { +typedef struct +{ gpr_uint8 byte; gpr_uint8 is_connection_update; gpr_uint32 amount; } grpc_chttp2_window_update_parser; -gpr_slice grpc_chttp2_window_update_create(gpr_uint32 id, - gpr_uint32 window_delta); +gpr_slice grpc_chttp2_window_update_create (gpr_uint32 id, gpr_uint32 window_delta); -grpc_chttp2_parse_error grpc_chttp2_window_update_parser_begin_frame( - grpc_chttp2_window_update_parser *parser, gpr_uint32 length, - gpr_uint8 flags); -grpc_chttp2_parse_error grpc_chttp2_window_update_parser_parse( - void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list); +grpc_chttp2_parse_error grpc_chttp2_window_update_parser_begin_frame (grpc_chttp2_window_update_parser * parser, gpr_uint32 length, gpr_uint8 flags); +grpc_chttp2_parse_error grpc_chttp2_window_update_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_WINDOW_UPDATE_H */ diff --git a/src/core/transport/chttp2/hpack_parser.c b/src/core/transport/chttp2/hpack_parser.c index e66a918fcdc..f3af6d91d25 100644 --- a/src/core/transport/chttp2/hpack_parser.c +++ b/src/core/transport/chttp2/hpack_parser.c @@ -45,7 +45,8 @@ #include #include -typedef enum { +typedef enum +{ NOT_BINARY, B64_BYTE0, B64_BYTE1, @@ -68,61 +69,34 @@ typedef enum { a set of indirect jumps, and so not waste stack space. */ /* forward declarations for parsing states */ -static int parse_begin(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end); -static int parse_error(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end); - -static int parse_string_prefix(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end); -static int parse_key_string(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end); -static int parse_value_string_with_indexed_key(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, - const gpr_uint8 *end); -static int parse_value_string_with_literal_key(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, - const gpr_uint8 *end); - -static int parse_value0(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end); -static int parse_value1(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end); -static int parse_value2(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end); -static int parse_value3(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end); -static int parse_value4(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end); -static int parse_value5up(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end); - -static int parse_indexed_field(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end); -static int parse_indexed_field_x(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end); -static int parse_lithdr_incidx(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end); -static int parse_lithdr_incidx_x(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end); -static int parse_lithdr_incidx_v(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end); -static int parse_lithdr_notidx(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end); -static int parse_lithdr_notidx_x(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end); -static int parse_lithdr_notidx_v(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end); -static int parse_lithdr_nvridx(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end); -static int parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end); -static int parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end); -static int parse_max_tbl_size(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end); -static int parse_max_tbl_size_x(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end); +static int parse_begin (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_error (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); + +static int parse_string_prefix (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_key_string (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_value_string_with_indexed_key (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_value_string_with_literal_key (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); + +static int parse_value0 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_value1 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_value2 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_value3 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_value4 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_value5up (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); + +static int parse_indexed_field (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_indexed_field_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_lithdr_incidx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_lithdr_incidx_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_lithdr_incidx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_lithdr_notidx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_lithdr_notidx_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_lithdr_notidx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_lithdr_nvridx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_lithdr_nvridx_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_lithdr_nvridx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_max_tbl_size (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_max_tbl_size_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); /* we translate the first byte of a hpack field into one of these decoding cases, then use a lookup table to jump directly to the appropriate parser. @@ -130,7 +104,8 @@ static int parse_max_tbl_size_x(grpc_chttp2_hpack_parser *p, _X => the integer index is all ones, meaning we need to do varint decoding _V => the integer index is all zeros, meaning we need to decode an additional string value */ -typedef enum { +typedef enum +{ INDEXED_FIELD, INDEXED_FIELD_X, LITHDR_INCIDX, @@ -150,81 +125,82 @@ typedef enum { /* jump table of parse state functions -- order must match first_byte_type above */ static const grpc_chttp2_hpack_parser_state first_byte_action[] = { - parse_indexed_field, parse_indexed_field_x, - parse_lithdr_incidx, parse_lithdr_incidx_x, - parse_lithdr_incidx_v, parse_lithdr_notidx, - parse_lithdr_notidx_x, parse_lithdr_notidx_v, - parse_lithdr_nvridx, parse_lithdr_nvridx_x, - parse_lithdr_nvridx_v, parse_max_tbl_size, - parse_max_tbl_size_x, parse_error}; + parse_indexed_field, parse_indexed_field_x, + parse_lithdr_incidx, parse_lithdr_incidx_x, + parse_lithdr_incidx_v, parse_lithdr_notidx, + parse_lithdr_notidx_x, parse_lithdr_notidx_v, + parse_lithdr_nvridx, parse_lithdr_nvridx_x, + parse_lithdr_nvridx_v, parse_max_tbl_size, + parse_max_tbl_size_x, parse_error +}; /* indexes the first byte to a parse state function - generated by gen_hpack_tables.c */ static const gpr_uint8 first_byte_lut[256] = { - LITHDR_NOTIDX_V, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, - LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, - LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, - LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX_X, - LITHDR_NVRIDX_V, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, - LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, - LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, - LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX_X, - ILLEGAL, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, - MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, - MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, - MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, - MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, - MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, - MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, - MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE_X, - LITHDR_INCIDX_V, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX_X, - ILLEGAL, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD_X, + LITHDR_NOTIDX_V, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, + LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, + LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, + LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX_X, + LITHDR_NVRIDX_V, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, + LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, + LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, + LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX_X, + ILLEGAL, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, + MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, + MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, + MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, + MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, + MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, + MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, + MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE_X, + LITHDR_INCIDX_V, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX_X, + ILLEGAL, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD_X, }; /* state table for huffman decoding: given a state, gives an index/16 into @@ -233,1118 +209,1217 @@ static const gpr_uint8 first_byte_lut[256] = { generated by gen_hpack_tables.c */ static const gpr_uint8 next_tbl[256] = { - 0, 1, 2, 3, 4, 1, 2, 5, 6, 1, 7, 8, 1, 3, 3, 9, 10, 11, 1, 1, - 1, 12, 1, 2, 13, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 14, 1, 15, 16, 1, 17, 1, 15, 2, 7, 3, 18, 19, 1, 1, 1, 1, 20, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 15, 2, 2, 7, 21, 1, 22, 1, 1, 1, 1, 1, - 1, 1, 1, 15, 2, 2, 2, 2, 2, 2, 23, 24, 25, 1, 1, 1, 1, 2, 2, 2, - 26, 3, 3, 27, 10, 28, 1, 1, 1, 1, 1, 1, 2, 3, 29, 10, 30, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 31, 1, 1, 1, 1, 1, 1, 1, 2, - 2, 2, 2, 2, 2, 2, 2, 32, 1, 1, 15, 33, 1, 34, 35, 9, 36, 1, 1, 1, - 1, 1, 1, 1, 37, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 26, 9, - 38, 1, 1, 1, 1, 1, 1, 1, 15, 2, 2, 2, 2, 26, 3, 3, 39, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 7, 3, 3, 3, 40, 2, - 41, 1, 1, 1, 42, 43, 1, 1, 44, 1, 1, 1, 1, 15, 2, 2, 2, 2, 2, 2, - 3, 3, 3, 45, 46, 1, 1, 2, 2, 2, 35, 3, 3, 18, 47, 2, + 0, 1, 2, 3, 4, 1, 2, 5, 6, 1, 7, 8, 1, 3, 3, 9, 10, 11, 1, 1, + 1, 12, 1, 2, 13, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 14, 1, 15, 16, 1, 17, 1, 15, 2, 7, 3, 18, 19, 1, 1, 1, 1, 20, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 15, 2, 2, 7, 21, 1, 22, 1, 1, 1, 1, 1, + 1, 1, 1, 15, 2, 2, 2, 2, 2, 2, 23, 24, 25, 1, 1, 1, 1, 2, 2, 2, + 26, 3, 3, 27, 10, 28, 1, 1, 1, 1, 1, 1, 2, 3, 29, 10, 30, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 31, 1, 1, 1, 1, 1, 1, 1, 2, + 2, 2, 2, 2, 2, 2, 2, 32, 1, 1, 15, 33, 1, 34, 35, 9, 36, 1, 1, 1, + 1, 1, 1, 1, 37, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 26, 9, + 38, 1, 1, 1, 1, 1, 1, 1, 15, 2, 2, 2, 2, 26, 3, 3, 39, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 7, 3, 3, 3, 40, 2, + 41, 1, 1, 1, 42, 43, 1, 1, 44, 1, 1, 1, 1, 15, 2, 2, 2, 2, 2, 2, + 3, 3, 3, 45, 46, 1, 1, 2, 2, 2, 35, 3, 3, 18, 47, 2, }; + /* next state, based upon current state and the current nibble: see above. generated by gen_hpack_tables.c */ static const gpr_int16 next_sub_tbl[48 * 16] = { - 1, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, - 218, 2, 6, 10, 13, 14, 15, 16, 17, 2, 6, 10, 13, 14, 15, - 16, 17, 3, 7, 11, 24, 3, 7, 11, 24, 3, 7, 11, 24, 3, - 7, 11, 24, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, - 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, - 199, 200, 201, 202, 203, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 9, 133, 134, 135, 136, 137, 138, 139, 140, - 141, 142, 143, 144, 145, 146, 147, 3, 7, 11, 24, 3, 7, 11, 24, - 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 12, 132, 4, 8, 4, 8, 4, 8, - 4, 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 18, 19, 20, 21, 4, 8, 4, - 8, 4, 8, 4, 8, 4, 8, 0, 0, 0, 22, 23, 91, 25, 26, - 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 3, - 7, 11, 24, 3, 7, 11, 24, 0, 0, 0, 0, 0, 41, 42, 43, - 2, 6, 10, 13, 14, 15, 16, 17, 3, 7, 11, 24, 3, 7, 11, - 24, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, - 44, 45, 2, 6, 10, 13, 14, 15, 16, 17, 46, 47, 48, 49, 50, - 51, 52, 57, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 53, 54, 55, 56, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 73, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 88, 89, 90, 3, 7, 11, 24, 3, 7, 11, - 24, 3, 7, 11, 24, 0, 0, 0, 0, 3, 7, 11, 24, 3, 7, - 11, 24, 4, 8, 4, 8, 0, 0, 0, 92, 0, 0, 0, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 3, 7, 11, 24, - 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, - 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 4, - 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, - 0, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, - 131, 2, 6, 10, 13, 14, 15, 16, 17, 4, 8, 4, 8, 4, 8, - 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 148, - 149, 150, 151, 3, 7, 11, 24, 4, 8, 4, 8, 0, 0, 0, 0, - 0, 0, 152, 153, 3, 7, 11, 24, 3, 7, 11, 24, 3, 7, 11, - 24, 154, 155, 156, 164, 3, 7, 11, 24, 3, 7, 11, 24, 3, 7, - 11, 24, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 157, 158, 159, 160, 161, 162, 163, 165, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 191, 192, 193, 194, 195, 196, 4, 8, 4, 8, 4, 8, - 4, 8, 4, 8, 4, 8, 4, 8, 197, 198, 4, 8, 4, 8, 4, - 8, 4, 8, 0, 0, 0, 0, 0, 0, 219, 220, 3, 7, 11, 24, - 4, 8, 4, 8, 4, 8, 0, 0, 221, 222, 223, 224, 3, 7, 11, - 24, 3, 7, 11, 24, 4, 8, 4, 8, 4, 8, 225, 228, 4, 8, - 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 226, 227, 229, - 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, - 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 245, 246, 247, 248, 249, 250, 251, 252, - 253, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 255, + 1, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, + 218, 2, 6, 10, 13, 14, 15, 16, 17, 2, 6, 10, 13, 14, 15, + 16, 17, 3, 7, 11, 24, 3, 7, 11, 24, 3, 7, 11, 24, 3, + 7, 11, 24, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, + 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, + 199, 200, 201, 202, 203, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 9, 133, 134, 135, 136, 137, 138, 139, 140, + 141, 142, 143, 144, 145, 146, 147, 3, 7, 11, 24, 3, 7, 11, 24, + 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 12, 132, 4, 8, 4, 8, 4, 8, + 4, 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 18, 19, 20, 21, 4, 8, 4, + 8, 4, 8, 4, 8, 4, 8, 0, 0, 0, 22, 23, 91, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 3, + 7, 11, 24, 3, 7, 11, 24, 0, 0, 0, 0, 0, 41, 42, 43, + 2, 6, 10, 13, 14, 15, 16, 17, 3, 7, 11, 24, 3, 7, 11, + 24, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, + 44, 45, 2, 6, 10, 13, 14, 15, 16, 17, 46, 47, 48, 49, 50, + 51, 52, 57, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 53, 54, 55, 56, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 73, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, 89, 90, 3, 7, 11, 24, 3, 7, 11, + 24, 3, 7, 11, 24, 0, 0, 0, 0, 3, 7, 11, 24, 3, 7, + 11, 24, 4, 8, 4, 8, 0, 0, 0, 92, 0, 0, 0, 93, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 3, 7, 11, 24, + 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, + 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 4, + 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, + 0, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 2, 6, 10, 13, 14, 15, 16, 17, 4, 8, 4, 8, 4, 8, + 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 148, + 149, 150, 151, 3, 7, 11, 24, 4, 8, 4, 8, 0, 0, 0, 0, + 0, 0, 152, 153, 3, 7, 11, 24, 3, 7, 11, 24, 3, 7, 11, + 24, 154, 155, 156, 164, 3, 7, 11, 24, 3, 7, 11, 24, 3, 7, + 11, 24, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 157, 158, 159, 160, 161, 162, 163, 165, 166, 167, 168, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, + 188, 189, 190, 191, 192, 193, 194, 195, 196, 4, 8, 4, 8, 4, 8, + 4, 8, 4, 8, 4, 8, 4, 8, 197, 198, 4, 8, 4, 8, 4, + 8, 4, 8, 0, 0, 0, 0, 0, 0, 219, 220, 3, 7, 11, 24, + 4, 8, 4, 8, 4, 8, 0, 0, 221, 222, 223, 224, 3, 7, 11, + 24, 3, 7, 11, 24, 4, 8, 4, 8, 4, 8, 225, 228, 4, 8, + 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 226, 227, 229, + 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, + 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 245, 246, 247, 248, 249, 250, 251, 252, + 253, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 255, }; + /* emission table: indexed like next_tbl, ultimately gives the byte to be emitted, or -1 for no byte, or 256 for end of stream generated by gen_hpack_tables.c */ static const gpr_uint16 emit_tbl[256] = { - 0, 1, 2, 3, 4, 5, 6, 7, 0, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 0, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 0, 55, 56, - 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 0, - 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, - 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, - 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, - 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 0, - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 0, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, - 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, - 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, - 219, 220, 221, 0, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, - 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, - 248, + 0, 1, 2, 3, 4, 5, 6, 7, 0, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 0, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 0, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 0, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, + 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, + 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 0, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 0, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, + 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, + 219, 220, 221, 0, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, + 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, + 248, }; + /* generated by gen_hpack_tables.c */ static const gpr_int16 emit_sub_tbl[249 * 16] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 48, 48, 48, 48, 48, 48, 48, 48, 49, 49, 49, 49, 49, 49, - 49, 49, 48, 48, 48, 48, 49, 49, 49, 49, 50, 50, 50, 50, 97, - 97, 97, 97, 48, 48, 49, 49, 50, 50, 97, 97, 99, 99, 101, 101, - 105, 105, 111, 111, 48, 49, 50, 97, 99, 101, 105, 111, 115, 116, -1, - -1, -1, -1, -1, -1, 32, 32, 32, 32, 32, 32, 32, 32, 37, 37, - 37, 37, 37, 37, 37, 37, 99, 99, 99, 99, 101, 101, 101, 101, 105, - 105, 105, 105, 111, 111, 111, 111, 115, 115, 116, 116, 32, 37, 45, 46, - 47, 51, 52, 53, 54, 55, 56, 57, 61, 61, 61, 61, 61, 61, 61, - 61, 65, 65, 65, 65, 65, 65, 65, 65, 115, 115, 115, 115, 116, 116, - 116, 116, 32, 32, 37, 37, 45, 45, 46, 46, 61, 65, 95, 98, 100, - 102, 103, 104, 108, 109, 110, 112, 114, 117, -1, -1, 58, 58, 58, 58, - 58, 58, 58, 58, 66, 66, 66, 66, 66, 66, 66, 66, 47, 47, 51, - 51, 52, 52, 53, 53, 54, 54, 55, 55, 56, 56, 57, 57, 61, 61, - 65, 65, 95, 95, 98, 98, 100, 100, 102, 102, 103, 103, 104, 104, 108, - 108, 109, 109, 110, 110, 112, 112, 114, 114, 117, 117, 58, 66, 67, 68, - 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 89, 106, 107, 113, 118, 119, 120, 121, 122, -1, -1, - -1, -1, 38, 38, 38, 38, 38, 38, 38, 38, 42, 42, 42, 42, 42, - 42, 42, 42, 44, 44, 44, 44, 44, 44, 44, 44, 59, 59, 59, 59, - 59, 59, 59, 59, 88, 88, 88, 88, 88, 88, 88, 88, 90, 90, 90, - 90, 90, 90, 90, 90, 33, 33, 34, 34, 40, 40, 41, 41, 63, 63, - 39, 43, 124, -1, -1, -1, 35, 35, 35, 35, 35, 35, 35, 35, 62, - 62, 62, 62, 62, 62, 62, 62, 0, 0, 0, 0, 36, 36, 36, 36, - 64, 64, 64, 64, 91, 91, 91, 91, 69, 69, 69, 69, 69, 69, 69, - 69, 70, 70, 70, 70, 70, 70, 70, 70, 71, 71, 71, 71, 71, 71, - 71, 71, 72, 72, 72, 72, 72, 72, 72, 72, 73, 73, 73, 73, 73, - 73, 73, 73, 74, 74, 74, 74, 74, 74, 74, 74, 75, 75, 75, 75, - 75, 75, 75, 75, 76, 76, 76, 76, 76, 76, 76, 76, 77, 77, 77, - 77, 77, 77, 77, 77, 78, 78, 78, 78, 78, 78, 78, 78, 79, 79, - 79, 79, 79, 79, 79, 79, 80, 80, 80, 80, 80, 80, 80, 80, 81, - 81, 81, 81, 81, 81, 81, 81, 82, 82, 82, 82, 82, 82, 82, 82, - 83, 83, 83, 83, 83, 83, 83, 83, 84, 84, 84, 84, 84, 84, 84, - 84, 85, 85, 85, 85, 85, 85, 85, 85, 86, 86, 86, 86, 86, 86, - 86, 86, 87, 87, 87, 87, 87, 87, 87, 87, 89, 89, 89, 89, 89, - 89, 89, 89, 106, 106, 106, 106, 106, 106, 106, 106, 107, 107, 107, 107, - 107, 107, 107, 107, 113, 113, 113, 113, 113, 113, 113, 113, 118, 118, 118, - 118, 118, 118, 118, 118, 119, 119, 119, 119, 119, 119, 119, 119, 120, 120, - 120, 120, 120, 120, 120, 120, 121, 121, 121, 121, 121, 121, 121, 121, 122, - 122, 122, 122, 122, 122, 122, 122, 38, 38, 38, 38, 42, 42, 42, 42, - 44, 44, 44, 44, 59, 59, 59, 59, 88, 88, 88, 88, 90, 90, 90, - 90, 33, 34, 40, 41, 63, -1, -1, -1, 39, 39, 39, 39, 39, 39, - 39, 39, 43, 43, 43, 43, 43, 43, 43, 43, 124, 124, 124, 124, 124, - 124, 124, 124, 35, 35, 35, 35, 62, 62, 62, 62, 0, 0, 36, 36, - 64, 64, 91, 91, 93, 93, 126, 126, 94, 125, -1, -1, 60, 60, 60, - 60, 60, 60, 60, 60, 96, 96, 96, 96, 96, 96, 96, 96, 123, 123, - 123, 123, 123, 123, 123, 123, -1, -1, -1, -1, -1, -1, -1, -1, 92, - 92, 92, 92, 92, 92, 92, 92, 195, 195, 195, 195, 195, 195, 195, 195, - 208, 208, 208, 208, 208, 208, 208, 208, 128, 128, 128, 128, 130, 130, 130, - 130, 131, 131, 131, 131, 162, 162, 162, 162, 184, 184, 184, 184, 194, 194, - 194, 194, 224, 224, 224, 224, 226, 226, 226, 226, 153, 153, 161, 161, 167, - 167, 172, 172, 176, 176, 177, 177, 179, 179, 209, 209, 216, 216, 217, 217, - 227, 227, 229, 229, 230, 230, 129, 132, 133, 134, 136, 146, 154, 156, 160, - 163, 164, 169, 170, 173, 178, 181, 185, 186, 187, 189, 190, 196, 198, 228, - 232, 233, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 135, - 135, 135, 135, 135, 135, 135, 135, 137, 137, 137, 137, 137, 137, 137, 137, - 138, 138, 138, 138, 138, 138, 138, 138, 139, 139, 139, 139, 139, 139, 139, - 139, 140, 140, 140, 140, 140, 140, 140, 140, 141, 141, 141, 141, 141, 141, - 141, 141, 143, 143, 143, 143, 143, 143, 143, 143, 147, 147, 147, 147, 147, - 147, 147, 147, 149, 149, 149, 149, 149, 149, 149, 149, 150, 150, 150, 150, - 150, 150, 150, 150, 151, 151, 151, 151, 151, 151, 151, 151, 152, 152, 152, - 152, 152, 152, 152, 152, 155, 155, 155, 155, 155, 155, 155, 155, 157, 157, - 157, 157, 157, 157, 157, 157, 158, 158, 158, 158, 158, 158, 158, 158, 165, - 165, 165, 165, 165, 165, 165, 165, 166, 166, 166, 166, 166, 166, 166, 166, - 168, 168, 168, 168, 168, 168, 168, 168, 174, 174, 174, 174, 174, 174, 174, - 174, 175, 175, 175, 175, 175, 175, 175, 175, 180, 180, 180, 180, 180, 180, - 180, 180, 182, 182, 182, 182, 182, 182, 182, 182, 183, 183, 183, 183, 183, - 183, 183, 183, 188, 188, 188, 188, 188, 188, 188, 188, 191, 191, 191, 191, - 191, 191, 191, 191, 197, 197, 197, 197, 197, 197, 197, 197, 231, 231, 231, - 231, 231, 231, 231, 231, 239, 239, 239, 239, 239, 239, 239, 239, 9, 9, - 9, 9, 142, 142, 142, 142, 144, 144, 144, 144, 145, 145, 145, 145, 148, - 148, 148, 148, 159, 159, 159, 159, 171, 171, 171, 171, 206, 206, 206, 206, - 215, 215, 215, 215, 225, 225, 225, 225, 236, 236, 236, 236, 237, 237, 237, - 237, 199, 199, 207, 207, 234, 234, 235, 235, 192, 193, 200, 201, 202, 205, - 210, 213, 218, 219, 238, 240, 242, 243, 255, -1, 203, 203, 203, 203, 203, - 203, 203, 203, 204, 204, 204, 204, 204, 204, 204, 204, 211, 211, 211, 211, - 211, 211, 211, 211, 212, 212, 212, 212, 212, 212, 212, 212, 214, 214, 214, - 214, 214, 214, 214, 214, 221, 221, 221, 221, 221, 221, 221, 221, 222, 222, - 222, 222, 222, 222, 222, 222, 223, 223, 223, 223, 223, 223, 223, 223, 241, - 241, 241, 241, 241, 241, 241, 241, 244, 244, 244, 244, 244, 244, 244, 244, - 245, 245, 245, 245, 245, 245, 245, 245, 246, 246, 246, 246, 246, 246, 246, - 246, 247, 247, 247, 247, 247, 247, 247, 247, 248, 248, 248, 248, 248, 248, - 248, 248, 250, 250, 250, 250, 250, 250, 250, 250, 251, 251, 251, 251, 251, - 251, 251, 251, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, - 253, 253, 253, 253, 254, 254, 254, 254, 254, 254, 254, 254, 2, 2, 2, - 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, - 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 11, 11, 11, 11, 12, - 12, 12, 12, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, - 17, 17, 17, 17, 18, 18, 18, 18, 19, 19, 19, 19, 20, 20, 20, - 20, 21, 21, 21, 21, 23, 23, 23, 23, 24, 24, 24, 24, 25, 25, - 25, 25, 26, 26, 26, 26, 27, 27, 27, 27, 28, 28, 28, 28, 29, - 29, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31, 127, 127, 127, 127, - 220, 220, 220, 220, 249, 249, 249, 249, 10, 13, 22, 256, 93, 93, 93, - 93, 126, 126, 126, 126, 94, 94, 125, 125, 60, 96, 123, -1, 92, 195, - 208, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 128, - 128, 128, 128, 128, 128, 128, 128, 130, 130, 130, 130, 130, 130, 130, 130, - 131, 131, 131, 131, 131, 131, 131, 131, 162, 162, 162, 162, 162, 162, 162, - 162, 184, 184, 184, 184, 184, 184, 184, 184, 194, 194, 194, 194, 194, 194, - 194, 194, 224, 224, 224, 224, 224, 224, 224, 224, 226, 226, 226, 226, 226, - 226, 226, 226, 153, 153, 153, 153, 161, 161, 161, 161, 167, 167, 167, 167, - 172, 172, 172, 172, 176, 176, 176, 176, 177, 177, 177, 177, 179, 179, 179, - 179, 209, 209, 209, 209, 216, 216, 216, 216, 217, 217, 217, 217, 227, 227, - 227, 227, 229, 229, 229, 229, 230, 230, 230, 230, 129, 129, 132, 132, 133, - 133, 134, 134, 136, 136, 146, 146, 154, 154, 156, 156, 160, 160, 163, 163, - 164, 164, 169, 169, 170, 170, 173, 173, 178, 178, 181, 181, 185, 185, 186, - 186, 187, 187, 189, 189, 190, 190, 196, 196, 198, 198, 228, 228, 232, 232, - 233, 233, 1, 135, 137, 138, 139, 140, 141, 143, 147, 149, 150, 151, 152, - 155, 157, 158, 165, 166, 168, 174, 175, 180, 182, 183, 188, 191, 197, 231, - 239, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 9, 9, 9, - 9, 9, 9, 9, 9, 142, 142, 142, 142, 142, 142, 142, 142, 144, 144, - 144, 144, 144, 144, 144, 144, 145, 145, 145, 145, 145, 145, 145, 145, 148, - 148, 148, 148, 148, 148, 148, 148, 159, 159, 159, 159, 159, 159, 159, 159, - 171, 171, 171, 171, 171, 171, 171, 171, 206, 206, 206, 206, 206, 206, 206, - 206, 215, 215, 215, 215, 215, 215, 215, 215, 225, 225, 225, 225, 225, 225, - 225, 225, 236, 236, 236, 236, 236, 236, 236, 236, 237, 237, 237, 237, 237, - 237, 237, 237, 199, 199, 199, 199, 207, 207, 207, 207, 234, 234, 234, 234, - 235, 235, 235, 235, 192, 192, 193, 193, 200, 200, 201, 201, 202, 202, 205, - 205, 210, 210, 213, 213, 218, 218, 219, 219, 238, 238, 240, 240, 242, 242, - 243, 243, 255, 255, 203, 204, 211, 212, 214, 221, 222, 223, 241, 244, 245, - 246, 247, 248, 250, 251, 252, 253, 254, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 2, 2, 2, 2, 2, 2, 2, - 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, - 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, - 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, - 8, 8, 8, 8, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, - 12, 12, 12, 12, 12, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, - 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 17, - 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, - 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, - 20, 21, 21, 21, 21, 21, 21, 21, 21, 23, 23, 23, 23, 23, 23, - 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, - 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, - 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, - 29, 29, 29, 29, 29, 30, 30, 30, 30, 30, 30, 30, 30, 31, 31, - 31, 31, 31, 31, 31, 31, 127, 127, 127, 127, 127, 127, 127, 127, 220, - 220, 220, 220, 220, 220, 220, 220, 249, 249, 249, 249, 249, 249, 249, 249, - 10, 10, 13, 13, 22, 22, 256, 256, 67, 67, 67, 67, 67, 67, 67, - 67, 68, 68, 68, 68, 68, 68, 68, 68, 95, 95, 95, 95, 95, 95, - 95, 95, 98, 98, 98, 98, 98, 98, 98, 98, 100, 100, 100, 100, 100, - 100, 100, 100, 102, 102, 102, 102, 102, 102, 102, 102, 103, 103, 103, 103, - 103, 103, 103, 103, 104, 104, 104, 104, 104, 104, 104, 104, 108, 108, 108, - 108, 108, 108, 108, 108, 109, 109, 109, 109, 109, 109, 109, 109, 110, 110, - 110, 110, 110, 110, 110, 110, 112, 112, 112, 112, 112, 112, 112, 112, 114, - 114, 114, 114, 114, 114, 114, 114, 117, 117, 117, 117, 117, 117, 117, 117, - 58, 58, 58, 58, 66, 66, 66, 66, 67, 67, 67, 67, 68, 68, 68, - 68, 69, 69, 69, 69, 70, 70, 70, 70, 71, 71, 71, 71, 72, 72, - 72, 72, 73, 73, 73, 73, 74, 74, 74, 74, 75, 75, 75, 75, 76, - 76, 76, 76, 77, 77, 77, 77, 78, 78, 78, 78, 79, 79, 79, 79, - 80, 80, 80, 80, 81, 81, 81, 81, 82, 82, 82, 82, 83, 83, 83, - 83, 84, 84, 84, 84, 85, 85, 85, 85, 86, 86, 86, 86, 87, 87, - 87, 87, 89, 89, 89, 89, 106, 106, 106, 106, 107, 107, 107, 107, 113, - 113, 113, 113, 118, 118, 118, 118, 119, 119, 119, 119, 120, 120, 120, 120, - 121, 121, 121, 121, 122, 122, 122, 122, 38, 38, 42, 42, 44, 44, 59, - 59, 88, 88, 90, 90, -1, -1, -1, -1, 33, 33, 33, 33, 33, 33, - 33, 33, 34, 34, 34, 34, 34, 34, 34, 34, 40, 40, 40, 40, 40, - 40, 40, 40, 41, 41, 41, 41, 41, 41, 41, 41, 63, 63, 63, 63, - 63, 63, 63, 63, 39, 39, 39, 39, 43, 43, 43, 43, 124, 124, 124, - 124, 35, 35, 62, 62, 0, 36, 64, 91, 93, 126, -1, -1, 94, 94, - 94, 94, 94, 94, 94, 94, 125, 125, 125, 125, 125, 125, 125, 125, 60, - 60, 60, 60, 96, 96, 96, 96, 123, 123, 123, 123, -1, -1, -1, -1, - 92, 92, 92, 92, 195, 195, 195, 195, 208, 208, 208, 208, 128, 128, 130, - 130, 131, 131, 162, 162, 184, 184, 194, 194, 224, 224, 226, 226, 153, 161, - 167, 172, 176, 177, 179, 209, 216, 217, 227, 229, 230, -1, -1, -1, -1, - -1, -1, -1, 129, 129, 129, 129, 129, 129, 129, 129, 132, 132, 132, 132, - 132, 132, 132, 132, 133, 133, 133, 133, 133, 133, 133, 133, 134, 134, 134, - 134, 134, 134, 134, 134, 136, 136, 136, 136, 136, 136, 136, 136, 146, 146, - 146, 146, 146, 146, 146, 146, 154, 154, 154, 154, 154, 154, 154, 154, 156, - 156, 156, 156, 156, 156, 156, 156, 160, 160, 160, 160, 160, 160, 160, 160, - 163, 163, 163, 163, 163, 163, 163, 163, 164, 164, 164, 164, 164, 164, 164, - 164, 169, 169, 169, 169, 169, 169, 169, 169, 170, 170, 170, 170, 170, 170, - 170, 170, 173, 173, 173, 173, 173, 173, 173, 173, 178, 178, 178, 178, 178, - 178, 178, 178, 181, 181, 181, 181, 181, 181, 181, 181, 185, 185, 185, 185, - 185, 185, 185, 185, 186, 186, 186, 186, 186, 186, 186, 186, 187, 187, 187, - 187, 187, 187, 187, 187, 189, 189, 189, 189, 189, 189, 189, 189, 190, 190, - 190, 190, 190, 190, 190, 190, 196, 196, 196, 196, 196, 196, 196, 196, 198, - 198, 198, 198, 198, 198, 198, 198, 228, 228, 228, 228, 228, 228, 228, 228, - 232, 232, 232, 232, 232, 232, 232, 232, 233, 233, 233, 233, 233, 233, 233, - 233, 1, 1, 1, 1, 135, 135, 135, 135, 137, 137, 137, 137, 138, 138, - 138, 138, 139, 139, 139, 139, 140, 140, 140, 140, 141, 141, 141, 141, 143, - 143, 143, 143, 147, 147, 147, 147, 149, 149, 149, 149, 150, 150, 150, 150, - 151, 151, 151, 151, 152, 152, 152, 152, 155, 155, 155, 155, 157, 157, 157, - 157, 158, 158, 158, 158, 165, 165, 165, 165, 166, 166, 166, 166, 168, 168, - 168, 168, 174, 174, 174, 174, 175, 175, 175, 175, 180, 180, 180, 180, 182, - 182, 182, 182, 183, 183, 183, 183, 188, 188, 188, 188, 191, 191, 191, 191, - 197, 197, 197, 197, 231, 231, 231, 231, 239, 239, 239, 239, 9, 9, 142, - 142, 144, 144, 145, 145, 148, 148, 159, 159, 171, 171, 206, 206, 215, 215, - 225, 225, 236, 236, 237, 237, 199, 207, 234, 235, 192, 192, 192, 192, 192, - 192, 192, 192, 193, 193, 193, 193, 193, 193, 193, 193, 200, 200, 200, 200, - 200, 200, 200, 200, 201, 201, 201, 201, 201, 201, 201, 201, 202, 202, 202, - 202, 202, 202, 202, 202, 205, 205, 205, 205, 205, 205, 205, 205, 210, 210, - 210, 210, 210, 210, 210, 210, 213, 213, 213, 213, 213, 213, 213, 213, 218, - 218, 218, 218, 218, 218, 218, 218, 219, 219, 219, 219, 219, 219, 219, 219, - 238, 238, 238, 238, 238, 238, 238, 238, 240, 240, 240, 240, 240, 240, 240, - 240, 242, 242, 242, 242, 242, 242, 242, 242, 243, 243, 243, 243, 243, 243, - 243, 243, 255, 255, 255, 255, 255, 255, 255, 255, 203, 203, 203, 203, 204, - 204, 204, 204, 211, 211, 211, 211, 212, 212, 212, 212, 214, 214, 214, 214, - 221, 221, 221, 221, 222, 222, 222, 222, 223, 223, 223, 223, 241, 241, 241, - 241, 244, 244, 244, 244, 245, 245, 245, 245, 246, 246, 246, 246, 247, 247, - 247, 247, 248, 248, 248, 248, 250, 250, 250, 250, 251, 251, 251, 251, 252, - 252, 252, 252, 253, 253, 253, 253, 254, 254, 254, 254, 2, 2, 3, 3, - 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 11, 11, 12, 12, 14, - 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, - 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, - 30, 31, 31, 127, 127, 220, 220, 249, 249, -1, -1, 10, 10, 10, 10, - 10, 10, 10, 10, 13, 13, 13, 13, 13, 13, 13, 13, 22, 22, 22, - 22, 22, 22, 22, 22, 256, 256, 256, 256, 256, 256, 256, 256, 45, 45, - 45, 45, 45, 45, 45, 45, 46, 46, 46, 46, 46, 46, 46, 46, 47, - 47, 47, 47, 47, 47, 47, 47, 51, 51, 51, 51, 51, 51, 51, 51, - 52, 52, 52, 52, 52, 52, 52, 52, 53, 53, 53, 53, 53, 53, 53, - 53, 54, 54, 54, 54, 54, 54, 54, 54, 55, 55, 55, 55, 55, 55, - 55, 55, 56, 56, 56, 56, 56, 56, 56, 56, 57, 57, 57, 57, 57, - 57, 57, 57, 50, 50, 50, 50, 50, 50, 50, 50, 97, 97, 97, 97, - 97, 97, 97, 97, 99, 99, 99, 99, 99, 99, 99, 99, 101, 101, 101, - 101, 101, 101, 101, 101, 105, 105, 105, 105, 105, 105, 105, 105, 111, 111, - 111, 111, 111, 111, 111, 111, 115, 115, 115, 115, 115, 115, 115, 115, 116, - 116, 116, 116, 116, 116, 116, 116, 32, 32, 32, 32, 37, 37, 37, 37, - 45, 45, 45, 45, 46, 46, 46, 46, 47, 47, 47, 47, 51, 51, 51, - 51, 52, 52, 52, 52, 53, 53, 53, 53, 54, 54, 54, 54, 55, 55, - 55, 55, 56, 56, 56, 56, 57, 57, 57, 57, 61, 61, 61, 61, 65, - 65, 65, 65, 95, 95, 95, 95, 98, 98, 98, 98, 100, 100, 100, 100, - 102, 102, 102, 102, 103, 103, 103, 103, 104, 104, 104, 104, 108, 108, 108, - 108, 109, 109, 109, 109, 110, 110, 110, 110, 112, 112, 112, 112, 114, 114, - 114, 114, 117, 117, 117, 117, 58, 58, 66, 66, 67, 67, 68, 68, 69, - 69, 70, 70, 71, 71, 72, 72, 73, 73, 74, 74, 75, 75, 76, 76, - 77, 77, 78, 78, 79, 79, 80, 80, 81, 81, 82, 82, 83, 83, 84, - 84, 85, 85, 86, 86, 87, 87, 89, 89, 106, 106, 107, 107, 113, 113, - 118, 118, 119, 119, 120, 120, 121, 121, 122, 122, 38, 42, 44, 59, 88, - 90, -1, -1, 33, 33, 33, 33, 34, 34, 34, 34, 40, 40, 40, 40, - 41, 41, 41, 41, 63, 63, 63, 63, 39, 39, 43, 43, 124, 124, 35, - 62, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 36, 36, - 36, 36, 36, 36, 36, 36, 64, 64, 64, 64, 64, 64, 64, 64, 91, - 91, 91, 91, 91, 91, 91, 91, 93, 93, 93, 93, 93, 93, 93, 93, - 126, 126, 126, 126, 126, 126, 126, 126, 94, 94, 94, 94, 125, 125, 125, - 125, 60, 60, 96, 96, 123, 123, -1, -1, 92, 92, 195, 195, 208, 208, - 128, 130, 131, 162, 184, 194, 224, 226, -1, -1, 153, 153, 153, 153, 153, - 153, 153, 153, 161, 161, 161, 161, 161, 161, 161, 161, 167, 167, 167, 167, - 167, 167, 167, 167, 172, 172, 172, 172, 172, 172, 172, 172, 176, 176, 176, - 176, 176, 176, 176, 176, 177, 177, 177, 177, 177, 177, 177, 177, 179, 179, - 179, 179, 179, 179, 179, 179, 209, 209, 209, 209, 209, 209, 209, 209, 216, - 216, 216, 216, 216, 216, 216, 216, 217, 217, 217, 217, 217, 217, 217, 217, - 227, 227, 227, 227, 227, 227, 227, 227, 229, 229, 229, 229, 229, 229, 229, - 229, 230, 230, 230, 230, 230, 230, 230, 230, 129, 129, 129, 129, 132, 132, - 132, 132, 133, 133, 133, 133, 134, 134, 134, 134, 136, 136, 136, 136, 146, - 146, 146, 146, 154, 154, 154, 154, 156, 156, 156, 156, 160, 160, 160, 160, - 163, 163, 163, 163, 164, 164, 164, 164, 169, 169, 169, 169, 170, 170, 170, - 170, 173, 173, 173, 173, 178, 178, 178, 178, 181, 181, 181, 181, 185, 185, - 185, 185, 186, 186, 186, 186, 187, 187, 187, 187, 189, 189, 189, 189, 190, - 190, 190, 190, 196, 196, 196, 196, 198, 198, 198, 198, 228, 228, 228, 228, - 232, 232, 232, 232, 233, 233, 233, 233, 1, 1, 135, 135, 137, 137, 138, - 138, 139, 139, 140, 140, 141, 141, 143, 143, 147, 147, 149, 149, 150, 150, - 151, 151, 152, 152, 155, 155, 157, 157, 158, 158, 165, 165, 166, 166, 168, - 168, 174, 174, 175, 175, 180, 180, 182, 182, 183, 183, 188, 188, 191, 191, - 197, 197, 231, 231, 239, 239, 9, 142, 144, 145, 148, 159, 171, 206, 215, - 225, 236, 237, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 199, 199, - 199, 199, 199, 199, 199, 199, 207, 207, 207, 207, 207, 207, 207, 207, 234, - 234, 234, 234, 234, 234, 234, 234, 235, 235, 235, 235, 235, 235, 235, 235, - 192, 192, 192, 192, 193, 193, 193, 193, 200, 200, 200, 200, 201, 201, 201, - 201, 202, 202, 202, 202, 205, 205, 205, 205, 210, 210, 210, 210, 213, 213, - 213, 213, 218, 218, 218, 218, 219, 219, 219, 219, 238, 238, 238, 238, 240, - 240, 240, 240, 242, 242, 242, 242, 243, 243, 243, 243, 255, 255, 255, 255, - 203, 203, 204, 204, 211, 211, 212, 212, 214, 214, 221, 221, 222, 222, 223, - 223, 241, 241, 244, 244, 245, 245, 246, 246, 247, 247, 248, 248, 250, 250, - 251, 251, 252, 252, 253, 253, 254, 254, 2, 3, 4, 5, 6, 7, 8, - 11, 12, 14, 15, 16, 17, 18, 19, 20, 21, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 127, 220, 249, -1, 10, 10, 10, 10, 13, 13, 13, - 13, 22, 22, 22, 22, 256, 256, 256, 256, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 48, 48, 48, 48, 48, 48, 48, 48, 49, 49, 49, 49, 49, 49, + 49, 49, 48, 48, 48, 48, 49, 49, 49, 49, 50, 50, 50, 50, 97, + 97, 97, 97, 48, 48, 49, 49, 50, 50, 97, 97, 99, 99, 101, 101, + 105, 105, 111, 111, 48, 49, 50, 97, 99, 101, 105, 111, 115, 116, -1, + -1, -1, -1, -1, -1, 32, 32, 32, 32, 32, 32, 32, 32, 37, 37, + 37, 37, 37, 37, 37, 37, 99, 99, 99, 99, 101, 101, 101, 101, 105, + 105, 105, 105, 111, 111, 111, 111, 115, 115, 116, 116, 32, 37, 45, 46, + 47, 51, 52, 53, 54, 55, 56, 57, 61, 61, 61, 61, 61, 61, 61, + 61, 65, 65, 65, 65, 65, 65, 65, 65, 115, 115, 115, 115, 116, 116, + 116, 116, 32, 32, 37, 37, 45, 45, 46, 46, 61, 65, 95, 98, 100, + 102, 103, 104, 108, 109, 110, 112, 114, 117, -1, -1, 58, 58, 58, 58, + 58, 58, 58, 58, 66, 66, 66, 66, 66, 66, 66, 66, 47, 47, 51, + 51, 52, 52, 53, 53, 54, 54, 55, 55, 56, 56, 57, 57, 61, 61, + 65, 65, 95, 95, 98, 98, 100, 100, 102, 102, 103, 103, 104, 104, 108, + 108, 109, 109, 110, 110, 112, 112, 114, 114, 117, 117, 58, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 89, 106, 107, 113, 118, 119, 120, 121, 122, -1, -1, + -1, -1, 38, 38, 38, 38, 38, 38, 38, 38, 42, 42, 42, 42, 42, + 42, 42, 42, 44, 44, 44, 44, 44, 44, 44, 44, 59, 59, 59, 59, + 59, 59, 59, 59, 88, 88, 88, 88, 88, 88, 88, 88, 90, 90, 90, + 90, 90, 90, 90, 90, 33, 33, 34, 34, 40, 40, 41, 41, 63, 63, + 39, 43, 124, -1, -1, -1, 35, 35, 35, 35, 35, 35, 35, 35, 62, + 62, 62, 62, 62, 62, 62, 62, 0, 0, 0, 0, 36, 36, 36, 36, + 64, 64, 64, 64, 91, 91, 91, 91, 69, 69, 69, 69, 69, 69, 69, + 69, 70, 70, 70, 70, 70, 70, 70, 70, 71, 71, 71, 71, 71, 71, + 71, 71, 72, 72, 72, 72, 72, 72, 72, 72, 73, 73, 73, 73, 73, + 73, 73, 73, 74, 74, 74, 74, 74, 74, 74, 74, 75, 75, 75, 75, + 75, 75, 75, 75, 76, 76, 76, 76, 76, 76, 76, 76, 77, 77, 77, + 77, 77, 77, 77, 77, 78, 78, 78, 78, 78, 78, 78, 78, 79, 79, + 79, 79, 79, 79, 79, 79, 80, 80, 80, 80, 80, 80, 80, 80, 81, + 81, 81, 81, 81, 81, 81, 81, 82, 82, 82, 82, 82, 82, 82, 82, + 83, 83, 83, 83, 83, 83, 83, 83, 84, 84, 84, 84, 84, 84, 84, + 84, 85, 85, 85, 85, 85, 85, 85, 85, 86, 86, 86, 86, 86, 86, + 86, 86, 87, 87, 87, 87, 87, 87, 87, 87, 89, 89, 89, 89, 89, + 89, 89, 89, 106, 106, 106, 106, 106, 106, 106, 106, 107, 107, 107, 107, + 107, 107, 107, 107, 113, 113, 113, 113, 113, 113, 113, 113, 118, 118, 118, + 118, 118, 118, 118, 118, 119, 119, 119, 119, 119, 119, 119, 119, 120, 120, + 120, 120, 120, 120, 120, 120, 121, 121, 121, 121, 121, 121, 121, 121, 122, + 122, 122, 122, 122, 122, 122, 122, 38, 38, 38, 38, 42, 42, 42, 42, + 44, 44, 44, 44, 59, 59, 59, 59, 88, 88, 88, 88, 90, 90, 90, + 90, 33, 34, 40, 41, 63, -1, -1, -1, 39, 39, 39, 39, 39, 39, + 39, 39, 43, 43, 43, 43, 43, 43, 43, 43, 124, 124, 124, 124, 124, + 124, 124, 124, 35, 35, 35, 35, 62, 62, 62, 62, 0, 0, 36, 36, + 64, 64, 91, 91, 93, 93, 126, 126, 94, 125, -1, -1, 60, 60, 60, + 60, 60, 60, 60, 60, 96, 96, 96, 96, 96, 96, 96, 96, 123, 123, + 123, 123, 123, 123, 123, 123, -1, -1, -1, -1, -1, -1, -1, -1, 92, + 92, 92, 92, 92, 92, 92, 92, 195, 195, 195, 195, 195, 195, 195, 195, + 208, 208, 208, 208, 208, 208, 208, 208, 128, 128, 128, 128, 130, 130, 130, + 130, 131, 131, 131, 131, 162, 162, 162, 162, 184, 184, 184, 184, 194, 194, + 194, 194, 224, 224, 224, 224, 226, 226, 226, 226, 153, 153, 161, 161, 167, + 167, 172, 172, 176, 176, 177, 177, 179, 179, 209, 209, 216, 216, 217, 217, + 227, 227, 229, 229, 230, 230, 129, 132, 133, 134, 136, 146, 154, 156, 160, + 163, 164, 169, 170, 173, 178, 181, 185, 186, 187, 189, 190, 196, 198, 228, + 232, 233, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 135, + 135, 135, 135, 135, 135, 135, 135, 137, 137, 137, 137, 137, 137, 137, 137, + 138, 138, 138, 138, 138, 138, 138, 138, 139, 139, 139, 139, 139, 139, 139, + 139, 140, 140, 140, 140, 140, 140, 140, 140, 141, 141, 141, 141, 141, 141, + 141, 141, 143, 143, 143, 143, 143, 143, 143, 143, 147, 147, 147, 147, 147, + 147, 147, 147, 149, 149, 149, 149, 149, 149, 149, 149, 150, 150, 150, 150, + 150, 150, 150, 150, 151, 151, 151, 151, 151, 151, 151, 151, 152, 152, 152, + 152, 152, 152, 152, 152, 155, 155, 155, 155, 155, 155, 155, 155, 157, 157, + 157, 157, 157, 157, 157, 157, 158, 158, 158, 158, 158, 158, 158, 158, 165, + 165, 165, 165, 165, 165, 165, 165, 166, 166, 166, 166, 166, 166, 166, 166, + 168, 168, 168, 168, 168, 168, 168, 168, 174, 174, 174, 174, 174, 174, 174, + 174, 175, 175, 175, 175, 175, 175, 175, 175, 180, 180, 180, 180, 180, 180, + 180, 180, 182, 182, 182, 182, 182, 182, 182, 182, 183, 183, 183, 183, 183, + 183, 183, 183, 188, 188, 188, 188, 188, 188, 188, 188, 191, 191, 191, 191, + 191, 191, 191, 191, 197, 197, 197, 197, 197, 197, 197, 197, 231, 231, 231, + 231, 231, 231, 231, 231, 239, 239, 239, 239, 239, 239, 239, 239, 9, 9, + 9, 9, 142, 142, 142, 142, 144, 144, 144, 144, 145, 145, 145, 145, 148, + 148, 148, 148, 159, 159, 159, 159, 171, 171, 171, 171, 206, 206, 206, 206, + 215, 215, 215, 215, 225, 225, 225, 225, 236, 236, 236, 236, 237, 237, 237, + 237, 199, 199, 207, 207, 234, 234, 235, 235, 192, 193, 200, 201, 202, 205, + 210, 213, 218, 219, 238, 240, 242, 243, 255, -1, 203, 203, 203, 203, 203, + 203, 203, 203, 204, 204, 204, 204, 204, 204, 204, 204, 211, 211, 211, 211, + 211, 211, 211, 211, 212, 212, 212, 212, 212, 212, 212, 212, 214, 214, 214, + 214, 214, 214, 214, 214, 221, 221, 221, 221, 221, 221, 221, 221, 222, 222, + 222, 222, 222, 222, 222, 222, 223, 223, 223, 223, 223, 223, 223, 223, 241, + 241, 241, 241, 241, 241, 241, 241, 244, 244, 244, 244, 244, 244, 244, 244, + 245, 245, 245, 245, 245, 245, 245, 245, 246, 246, 246, 246, 246, 246, 246, + 246, 247, 247, 247, 247, 247, 247, 247, 247, 248, 248, 248, 248, 248, 248, + 248, 248, 250, 250, 250, 250, 250, 250, 250, 250, 251, 251, 251, 251, 251, + 251, 251, 251, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, + 253, 253, 253, 253, 254, 254, 254, 254, 254, 254, 254, 254, 2, 2, 2, + 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, + 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 11, 11, 11, 11, 12, + 12, 12, 12, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, + 17, 17, 17, 17, 18, 18, 18, 18, 19, 19, 19, 19, 20, 20, 20, + 20, 21, 21, 21, 21, 23, 23, 23, 23, 24, 24, 24, 24, 25, 25, + 25, 25, 26, 26, 26, 26, 27, 27, 27, 27, 28, 28, 28, 28, 29, + 29, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31, 127, 127, 127, 127, + 220, 220, 220, 220, 249, 249, 249, 249, 10, 13, 22, 256, 93, 93, 93, + 93, 126, 126, 126, 126, 94, 94, 125, 125, 60, 96, 123, -1, 92, 195, + 208, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 128, + 128, 128, 128, 128, 128, 128, 128, 130, 130, 130, 130, 130, 130, 130, 130, + 131, 131, 131, 131, 131, 131, 131, 131, 162, 162, 162, 162, 162, 162, 162, + 162, 184, 184, 184, 184, 184, 184, 184, 184, 194, 194, 194, 194, 194, 194, + 194, 194, 224, 224, 224, 224, 224, 224, 224, 224, 226, 226, 226, 226, 226, + 226, 226, 226, 153, 153, 153, 153, 161, 161, 161, 161, 167, 167, 167, 167, + 172, 172, 172, 172, 176, 176, 176, 176, 177, 177, 177, 177, 179, 179, 179, + 179, 209, 209, 209, 209, 216, 216, 216, 216, 217, 217, 217, 217, 227, 227, + 227, 227, 229, 229, 229, 229, 230, 230, 230, 230, 129, 129, 132, 132, 133, + 133, 134, 134, 136, 136, 146, 146, 154, 154, 156, 156, 160, 160, 163, 163, + 164, 164, 169, 169, 170, 170, 173, 173, 178, 178, 181, 181, 185, 185, 186, + 186, 187, 187, 189, 189, 190, 190, 196, 196, 198, 198, 228, 228, 232, 232, + 233, 233, 1, 135, 137, 138, 139, 140, 141, 143, 147, 149, 150, 151, 152, + 155, 157, 158, 165, 166, 168, 174, 175, 180, 182, 183, 188, 191, 197, 231, + 239, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 9, 9, 9, + 9, 9, 9, 9, 9, 142, 142, 142, 142, 142, 142, 142, 142, 144, 144, + 144, 144, 144, 144, 144, 144, 145, 145, 145, 145, 145, 145, 145, 145, 148, + 148, 148, 148, 148, 148, 148, 148, 159, 159, 159, 159, 159, 159, 159, 159, + 171, 171, 171, 171, 171, 171, 171, 171, 206, 206, 206, 206, 206, 206, 206, + 206, 215, 215, 215, 215, 215, 215, 215, 215, 225, 225, 225, 225, 225, 225, + 225, 225, 236, 236, 236, 236, 236, 236, 236, 236, 237, 237, 237, 237, 237, + 237, 237, 237, 199, 199, 199, 199, 207, 207, 207, 207, 234, 234, 234, 234, + 235, 235, 235, 235, 192, 192, 193, 193, 200, 200, 201, 201, 202, 202, 205, + 205, 210, 210, 213, 213, 218, 218, 219, 219, 238, 238, 240, 240, 242, 242, + 243, 243, 255, 255, 203, 204, 211, 212, 214, 221, 222, 223, 241, 244, 245, + 246, 247, 248, 250, 251, 252, 253, 254, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 2, 2, 2, 2, 2, 2, 2, + 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, + 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, + 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, + 8, 8, 8, 8, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, + 12, 12, 12, 12, 12, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, + 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 17, + 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, + 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, + 20, 21, 21, 21, 21, 21, 21, 21, 21, 23, 23, 23, 23, 23, 23, + 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, + 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, + 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, + 29, 29, 29, 29, 29, 30, 30, 30, 30, 30, 30, 30, 30, 31, 31, + 31, 31, 31, 31, 31, 31, 127, 127, 127, 127, 127, 127, 127, 127, 220, + 220, 220, 220, 220, 220, 220, 220, 249, 249, 249, 249, 249, 249, 249, 249, + 10, 10, 13, 13, 22, 22, 256, 256, 67, 67, 67, 67, 67, 67, 67, + 67, 68, 68, 68, 68, 68, 68, 68, 68, 95, 95, 95, 95, 95, 95, + 95, 95, 98, 98, 98, 98, 98, 98, 98, 98, 100, 100, 100, 100, 100, + 100, 100, 100, 102, 102, 102, 102, 102, 102, 102, 102, 103, 103, 103, 103, + 103, 103, 103, 103, 104, 104, 104, 104, 104, 104, 104, 104, 108, 108, 108, + 108, 108, 108, 108, 108, 109, 109, 109, 109, 109, 109, 109, 109, 110, 110, + 110, 110, 110, 110, 110, 110, 112, 112, 112, 112, 112, 112, 112, 112, 114, + 114, 114, 114, 114, 114, 114, 114, 117, 117, 117, 117, 117, 117, 117, 117, + 58, 58, 58, 58, 66, 66, 66, 66, 67, 67, 67, 67, 68, 68, 68, + 68, 69, 69, 69, 69, 70, 70, 70, 70, 71, 71, 71, 71, 72, 72, + 72, 72, 73, 73, 73, 73, 74, 74, 74, 74, 75, 75, 75, 75, 76, + 76, 76, 76, 77, 77, 77, 77, 78, 78, 78, 78, 79, 79, 79, 79, + 80, 80, 80, 80, 81, 81, 81, 81, 82, 82, 82, 82, 83, 83, 83, + 83, 84, 84, 84, 84, 85, 85, 85, 85, 86, 86, 86, 86, 87, 87, + 87, 87, 89, 89, 89, 89, 106, 106, 106, 106, 107, 107, 107, 107, 113, + 113, 113, 113, 118, 118, 118, 118, 119, 119, 119, 119, 120, 120, 120, 120, + 121, 121, 121, 121, 122, 122, 122, 122, 38, 38, 42, 42, 44, 44, 59, + 59, 88, 88, 90, 90, -1, -1, -1, -1, 33, 33, 33, 33, 33, 33, + 33, 33, 34, 34, 34, 34, 34, 34, 34, 34, 40, 40, 40, 40, 40, + 40, 40, 40, 41, 41, 41, 41, 41, 41, 41, 41, 63, 63, 63, 63, + 63, 63, 63, 63, 39, 39, 39, 39, 43, 43, 43, 43, 124, 124, 124, + 124, 35, 35, 62, 62, 0, 36, 64, 91, 93, 126, -1, -1, 94, 94, + 94, 94, 94, 94, 94, 94, 125, 125, 125, 125, 125, 125, 125, 125, 60, + 60, 60, 60, 96, 96, 96, 96, 123, 123, 123, 123, -1, -1, -1, -1, + 92, 92, 92, 92, 195, 195, 195, 195, 208, 208, 208, 208, 128, 128, 130, + 130, 131, 131, 162, 162, 184, 184, 194, 194, 224, 224, 226, 226, 153, 161, + 167, 172, 176, 177, 179, 209, 216, 217, 227, 229, 230, -1, -1, -1, -1, + -1, -1, -1, 129, 129, 129, 129, 129, 129, 129, 129, 132, 132, 132, 132, + 132, 132, 132, 132, 133, 133, 133, 133, 133, 133, 133, 133, 134, 134, 134, + 134, 134, 134, 134, 134, 136, 136, 136, 136, 136, 136, 136, 136, 146, 146, + 146, 146, 146, 146, 146, 146, 154, 154, 154, 154, 154, 154, 154, 154, 156, + 156, 156, 156, 156, 156, 156, 156, 160, 160, 160, 160, 160, 160, 160, 160, + 163, 163, 163, 163, 163, 163, 163, 163, 164, 164, 164, 164, 164, 164, 164, + 164, 169, 169, 169, 169, 169, 169, 169, 169, 170, 170, 170, 170, 170, 170, + 170, 170, 173, 173, 173, 173, 173, 173, 173, 173, 178, 178, 178, 178, 178, + 178, 178, 178, 181, 181, 181, 181, 181, 181, 181, 181, 185, 185, 185, 185, + 185, 185, 185, 185, 186, 186, 186, 186, 186, 186, 186, 186, 187, 187, 187, + 187, 187, 187, 187, 187, 189, 189, 189, 189, 189, 189, 189, 189, 190, 190, + 190, 190, 190, 190, 190, 190, 196, 196, 196, 196, 196, 196, 196, 196, 198, + 198, 198, 198, 198, 198, 198, 198, 228, 228, 228, 228, 228, 228, 228, 228, + 232, 232, 232, 232, 232, 232, 232, 232, 233, 233, 233, 233, 233, 233, 233, + 233, 1, 1, 1, 1, 135, 135, 135, 135, 137, 137, 137, 137, 138, 138, + 138, 138, 139, 139, 139, 139, 140, 140, 140, 140, 141, 141, 141, 141, 143, + 143, 143, 143, 147, 147, 147, 147, 149, 149, 149, 149, 150, 150, 150, 150, + 151, 151, 151, 151, 152, 152, 152, 152, 155, 155, 155, 155, 157, 157, 157, + 157, 158, 158, 158, 158, 165, 165, 165, 165, 166, 166, 166, 166, 168, 168, + 168, 168, 174, 174, 174, 174, 175, 175, 175, 175, 180, 180, 180, 180, 182, + 182, 182, 182, 183, 183, 183, 183, 188, 188, 188, 188, 191, 191, 191, 191, + 197, 197, 197, 197, 231, 231, 231, 231, 239, 239, 239, 239, 9, 9, 142, + 142, 144, 144, 145, 145, 148, 148, 159, 159, 171, 171, 206, 206, 215, 215, + 225, 225, 236, 236, 237, 237, 199, 207, 234, 235, 192, 192, 192, 192, 192, + 192, 192, 192, 193, 193, 193, 193, 193, 193, 193, 193, 200, 200, 200, 200, + 200, 200, 200, 200, 201, 201, 201, 201, 201, 201, 201, 201, 202, 202, 202, + 202, 202, 202, 202, 202, 205, 205, 205, 205, 205, 205, 205, 205, 210, 210, + 210, 210, 210, 210, 210, 210, 213, 213, 213, 213, 213, 213, 213, 213, 218, + 218, 218, 218, 218, 218, 218, 218, 219, 219, 219, 219, 219, 219, 219, 219, + 238, 238, 238, 238, 238, 238, 238, 238, 240, 240, 240, 240, 240, 240, 240, + 240, 242, 242, 242, 242, 242, 242, 242, 242, 243, 243, 243, 243, 243, 243, + 243, 243, 255, 255, 255, 255, 255, 255, 255, 255, 203, 203, 203, 203, 204, + 204, 204, 204, 211, 211, 211, 211, 212, 212, 212, 212, 214, 214, 214, 214, + 221, 221, 221, 221, 222, 222, 222, 222, 223, 223, 223, 223, 241, 241, 241, + 241, 244, 244, 244, 244, 245, 245, 245, 245, 246, 246, 246, 246, 247, 247, + 247, 247, 248, 248, 248, 248, 250, 250, 250, 250, 251, 251, 251, 251, 252, + 252, 252, 252, 253, 253, 253, 253, 254, 254, 254, 254, 2, 2, 3, 3, + 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 11, 11, 12, 12, 14, + 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, + 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, + 30, 31, 31, 127, 127, 220, 220, 249, 249, -1, -1, 10, 10, 10, 10, + 10, 10, 10, 10, 13, 13, 13, 13, 13, 13, 13, 13, 22, 22, 22, + 22, 22, 22, 22, 22, 256, 256, 256, 256, 256, 256, 256, 256, 45, 45, + 45, 45, 45, 45, 45, 45, 46, 46, 46, 46, 46, 46, 46, 46, 47, + 47, 47, 47, 47, 47, 47, 47, 51, 51, 51, 51, 51, 51, 51, 51, + 52, 52, 52, 52, 52, 52, 52, 52, 53, 53, 53, 53, 53, 53, 53, + 53, 54, 54, 54, 54, 54, 54, 54, 54, 55, 55, 55, 55, 55, 55, + 55, 55, 56, 56, 56, 56, 56, 56, 56, 56, 57, 57, 57, 57, 57, + 57, 57, 57, 50, 50, 50, 50, 50, 50, 50, 50, 97, 97, 97, 97, + 97, 97, 97, 97, 99, 99, 99, 99, 99, 99, 99, 99, 101, 101, 101, + 101, 101, 101, 101, 101, 105, 105, 105, 105, 105, 105, 105, 105, 111, 111, + 111, 111, 111, 111, 111, 111, 115, 115, 115, 115, 115, 115, 115, 115, 116, + 116, 116, 116, 116, 116, 116, 116, 32, 32, 32, 32, 37, 37, 37, 37, + 45, 45, 45, 45, 46, 46, 46, 46, 47, 47, 47, 47, 51, 51, 51, + 51, 52, 52, 52, 52, 53, 53, 53, 53, 54, 54, 54, 54, 55, 55, + 55, 55, 56, 56, 56, 56, 57, 57, 57, 57, 61, 61, 61, 61, 65, + 65, 65, 65, 95, 95, 95, 95, 98, 98, 98, 98, 100, 100, 100, 100, + 102, 102, 102, 102, 103, 103, 103, 103, 104, 104, 104, 104, 108, 108, 108, + 108, 109, 109, 109, 109, 110, 110, 110, 110, 112, 112, 112, 112, 114, 114, + 114, 114, 117, 117, 117, 117, 58, 58, 66, 66, 67, 67, 68, 68, 69, + 69, 70, 70, 71, 71, 72, 72, 73, 73, 74, 74, 75, 75, 76, 76, + 77, 77, 78, 78, 79, 79, 80, 80, 81, 81, 82, 82, 83, 83, 84, + 84, 85, 85, 86, 86, 87, 87, 89, 89, 106, 106, 107, 107, 113, 113, + 118, 118, 119, 119, 120, 120, 121, 121, 122, 122, 38, 42, 44, 59, 88, + 90, -1, -1, 33, 33, 33, 33, 34, 34, 34, 34, 40, 40, 40, 40, + 41, 41, 41, 41, 63, 63, 63, 63, 39, 39, 43, 43, 124, 124, 35, + 62, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 36, 36, + 36, 36, 36, 36, 36, 36, 64, 64, 64, 64, 64, 64, 64, 64, 91, + 91, 91, 91, 91, 91, 91, 91, 93, 93, 93, 93, 93, 93, 93, 93, + 126, 126, 126, 126, 126, 126, 126, 126, 94, 94, 94, 94, 125, 125, 125, + 125, 60, 60, 96, 96, 123, 123, -1, -1, 92, 92, 195, 195, 208, 208, + 128, 130, 131, 162, 184, 194, 224, 226, -1, -1, 153, 153, 153, 153, 153, + 153, 153, 153, 161, 161, 161, 161, 161, 161, 161, 161, 167, 167, 167, 167, + 167, 167, 167, 167, 172, 172, 172, 172, 172, 172, 172, 172, 176, 176, 176, + 176, 176, 176, 176, 176, 177, 177, 177, 177, 177, 177, 177, 177, 179, 179, + 179, 179, 179, 179, 179, 179, 209, 209, 209, 209, 209, 209, 209, 209, 216, + 216, 216, 216, 216, 216, 216, 216, 217, 217, 217, 217, 217, 217, 217, 217, + 227, 227, 227, 227, 227, 227, 227, 227, 229, 229, 229, 229, 229, 229, 229, + 229, 230, 230, 230, 230, 230, 230, 230, 230, 129, 129, 129, 129, 132, 132, + 132, 132, 133, 133, 133, 133, 134, 134, 134, 134, 136, 136, 136, 136, 146, + 146, 146, 146, 154, 154, 154, 154, 156, 156, 156, 156, 160, 160, 160, 160, + 163, 163, 163, 163, 164, 164, 164, 164, 169, 169, 169, 169, 170, 170, 170, + 170, 173, 173, 173, 173, 178, 178, 178, 178, 181, 181, 181, 181, 185, 185, + 185, 185, 186, 186, 186, 186, 187, 187, 187, 187, 189, 189, 189, 189, 190, + 190, 190, 190, 196, 196, 196, 196, 198, 198, 198, 198, 228, 228, 228, 228, + 232, 232, 232, 232, 233, 233, 233, 233, 1, 1, 135, 135, 137, 137, 138, + 138, 139, 139, 140, 140, 141, 141, 143, 143, 147, 147, 149, 149, 150, 150, + 151, 151, 152, 152, 155, 155, 157, 157, 158, 158, 165, 165, 166, 166, 168, + 168, 174, 174, 175, 175, 180, 180, 182, 182, 183, 183, 188, 188, 191, 191, + 197, 197, 231, 231, 239, 239, 9, 142, 144, 145, 148, 159, 171, 206, 215, + 225, 236, 237, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 199, 199, + 199, 199, 199, 199, 199, 199, 207, 207, 207, 207, 207, 207, 207, 207, 234, + 234, 234, 234, 234, 234, 234, 234, 235, 235, 235, 235, 235, 235, 235, 235, + 192, 192, 192, 192, 193, 193, 193, 193, 200, 200, 200, 200, 201, 201, 201, + 201, 202, 202, 202, 202, 205, 205, 205, 205, 210, 210, 210, 210, 213, 213, + 213, 213, 218, 218, 218, 218, 219, 219, 219, 219, 238, 238, 238, 238, 240, + 240, 240, 240, 242, 242, 242, 242, 243, 243, 243, 243, 255, 255, 255, 255, + 203, 203, 204, 204, 211, 211, 212, 212, 214, 214, 221, 221, 222, 222, 223, + 223, 241, 241, 244, 244, 245, 245, 246, 246, 247, 247, 248, 248, 250, 250, + 251, 251, 252, 252, 253, 253, 254, 254, 2, 3, 4, 5, 6, 7, 8, + 11, 12, 14, 15, 16, 17, 18, 19, 20, 21, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 127, 220, 249, -1, 10, 10, 10, 10, 13, 13, 13, + 13, 22, 22, 22, 22, 256, 256, 256, 256, }; static const gpr_uint8 inverse_base64[256] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 62, 255, - 255, 255, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 255, 255, - 255, 64, 255, 255, 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 255, 255, 255, 255, 255, 255, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 49, 50, 51, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 62, 255, + 255, 255, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 255, 255, + 255, 64, 255, 255, 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 255, 255, 255, 255, 255, 255, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, }; /* emission helpers */ -static void on_hdr(grpc_chttp2_hpack_parser *p, grpc_mdelem *md, - int add_to_table) { - if (add_to_table) { - GRPC_MDELEM_REF(md); - grpc_chttp2_hptbl_add(&p->table, md); - } - p->on_header(p->on_header_user_data, md); +static void +on_hdr (grpc_chttp2_hpack_parser * p, grpc_mdelem * md, int add_to_table) +{ + if (add_to_table) + { + GRPC_MDELEM_REF (md); + grpc_chttp2_hptbl_add (&p->table, md); + } + p->on_header (p->on_header_user_data, md); } -static grpc_mdstr *take_string(grpc_chttp2_hpack_parser *p, - grpc_chttp2_hpack_parser_string *str) { - grpc_mdstr *s = grpc_mdstr_from_buffer(p->table.mdctx, (gpr_uint8 *)str->str, - str->length); +static grpc_mdstr * +take_string (grpc_chttp2_hpack_parser * p, grpc_chttp2_hpack_parser_string * str) +{ + grpc_mdstr *s = grpc_mdstr_from_buffer (p->table.mdctx, (gpr_uint8 *) str->str, + str->length); str->length = 0; return s; } /* jump to the next state */ -static int parse_next(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { +static int +parse_next (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ p->state = *p->next_state++; - return p->state(p, cur, end); + return p->state (p, cur, end); } /* begin parsing a header: all functionality is encoded into lookup tables above */ -static int parse_begin(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { - if (cur == end) { - p->state = parse_begin; - return 1; - } - - return first_byte_action[first_byte_lut[*cur]](p, cur, end); +static int +parse_begin (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + if (cur == end) + { + p->state = parse_begin; + return 1; + } + + return first_byte_action[first_byte_lut[*cur]] (p, cur, end); } /* stream dependency and prioritization data: we just skip it */ -static int parse_stream_weight(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { - if (cur == end) { - p->state = parse_stream_weight; - return 1; - } - - return p->after_prioritization(p, cur + 1, end); +static int +parse_stream_weight (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + if (cur == end) + { + p->state = parse_stream_weight; + return 1; + } + + return p->after_prioritization (p, cur + 1, end); } -static int parse_stream_dep3(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { - if (cur == end) { - p->state = parse_stream_dep3; - return 1; - } +static int +parse_stream_dep3 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + if (cur == end) + { + p->state = parse_stream_dep3; + return 1; + } - return parse_stream_weight(p, cur + 1, end); + return parse_stream_weight (p, cur + 1, end); } -static int parse_stream_dep2(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { - if (cur == end) { - p->state = parse_stream_dep2; - return 1; - } +static int +parse_stream_dep2 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + if (cur == end) + { + p->state = parse_stream_dep2; + return 1; + } - return parse_stream_dep3(p, cur + 1, end); + return parse_stream_dep3 (p, cur + 1, end); } -static int parse_stream_dep1(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { - if (cur == end) { - p->state = parse_stream_dep1; - return 1; - } +static int +parse_stream_dep1 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + if (cur == end) + { + p->state = parse_stream_dep1; + return 1; + } - return parse_stream_dep2(p, cur + 1, end); + return parse_stream_dep2 (p, cur + 1, end); } -static int parse_stream_dep0(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { - if (cur == end) { - p->state = parse_stream_dep0; - return 1; - } +static int +parse_stream_dep0 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + if (cur == end) + { + p->state = parse_stream_dep0; + return 1; + } - return parse_stream_dep1(p, cur + 1, end); + return parse_stream_dep1 (p, cur + 1, end); } /* emit an indexed field; for now just logs it to console; jumps to begin the next field on completion */ -static int finish_indexed_field(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { - grpc_mdelem *md = grpc_chttp2_hptbl_lookup(&p->table, p->index); - GRPC_MDELEM_REF(md); - on_hdr(p, md, 0); - return parse_begin(p, cur, end); +static int +finish_indexed_field (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + grpc_mdelem *md = grpc_chttp2_hptbl_lookup (&p->table, p->index); + GRPC_MDELEM_REF (md); + on_hdr (p, md, 0); + return parse_begin (p, cur, end); } /* parse an indexed field with index < 127 */ -static int parse_indexed_field(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { +static int +parse_indexed_field (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ p->index = (*cur) & 0x7f; - return finish_indexed_field(p, cur + 1, end); + return finish_indexed_field (p, cur + 1, end); } /* parse an indexed field with index >= 127 */ -static int parse_indexed_field_x(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { +static int +parse_indexed_field_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ static const grpc_chttp2_hpack_parser_state and_then[] = { - finish_indexed_field}; + finish_indexed_field + }; p->next_state = and_then; p->index = 0x7f; p->parsing.value = &p->index; - return parse_value0(p, cur + 1, end); + return parse_value0 (p, cur + 1, end); } /* finish a literal header with incremental indexing: just log, and jump to ' begin */ -static int finish_lithdr_incidx(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { - grpc_mdelem *md = grpc_chttp2_hptbl_lookup(&p->table, p->index); - on_hdr(p, grpc_mdelem_from_metadata_strings(p->table.mdctx, - GRPC_MDSTR_REF(md->key), - take_string(p, &p->value)), - 1); - return parse_begin(p, cur, end); +static int +finish_lithdr_incidx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + grpc_mdelem *md = grpc_chttp2_hptbl_lookup (&p->table, p->index); + on_hdr (p, grpc_mdelem_from_metadata_strings (p->table.mdctx, GRPC_MDSTR_REF (md->key), take_string (p, &p->value)), 1); + return parse_begin (p, cur, end); } /* finish a literal header with incremental indexing with no index */ -static int finish_lithdr_incidx_v(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { - on_hdr(p, grpc_mdelem_from_metadata_strings(p->table.mdctx, - take_string(p, &p->key), - take_string(p, &p->value)), - 1); - return parse_begin(p, cur, end); +static int +finish_lithdr_incidx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + on_hdr (p, grpc_mdelem_from_metadata_strings (p->table.mdctx, take_string (p, &p->key), take_string (p, &p->value)), 1); + return parse_begin (p, cur, end); } /* parse a literal header with incremental indexing; index < 63 */ -static int parse_lithdr_incidx(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { +static int +parse_lithdr_incidx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_value_string_with_indexed_key, finish_lithdr_incidx}; + parse_value_string_with_indexed_key, finish_lithdr_incidx + }; p->next_state = and_then; p->index = (*cur) & 0x3f; - return parse_string_prefix(p, cur + 1, end); + return parse_string_prefix (p, cur + 1, end); } /* parse a literal header with incremental indexing; index >= 63 */ -static int parse_lithdr_incidx_x(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { +static int +parse_lithdr_incidx_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_string_prefix, parse_value_string_with_indexed_key, - finish_lithdr_incidx}; + parse_string_prefix, parse_value_string_with_indexed_key, + finish_lithdr_incidx + }; p->next_state = and_then; p->index = 0x3f; p->parsing.value = &p->index; - return parse_value0(p, cur + 1, end); + return parse_value0 (p, cur + 1, end); } /* parse a literal header with incremental indexing; index = 0 */ -static int parse_lithdr_incidx_v(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { +static int +parse_lithdr_incidx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_key_string, parse_string_prefix, - parse_value_string_with_literal_key, finish_lithdr_incidx_v}; + parse_key_string, parse_string_prefix, + parse_value_string_with_literal_key, finish_lithdr_incidx_v + }; p->next_state = and_then; - return parse_string_prefix(p, cur + 1, end); + return parse_string_prefix (p, cur + 1, end); } /* finish a literal header without incremental indexing */ -static int finish_lithdr_notidx(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { - grpc_mdelem *md = grpc_chttp2_hptbl_lookup(&p->table, p->index); - on_hdr(p, grpc_mdelem_from_metadata_strings(p->table.mdctx, - GRPC_MDSTR_REF(md->key), - take_string(p, &p->value)), - 0); - return parse_begin(p, cur, end); +static int +finish_lithdr_notidx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + grpc_mdelem *md = grpc_chttp2_hptbl_lookup (&p->table, p->index); + on_hdr (p, grpc_mdelem_from_metadata_strings (p->table.mdctx, GRPC_MDSTR_REF (md->key), take_string (p, &p->value)), 0); + return parse_begin (p, cur, end); } /* finish a literal header without incremental indexing with index = 0 */ -static int finish_lithdr_notidx_v(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { - on_hdr(p, grpc_mdelem_from_metadata_strings(p->table.mdctx, - take_string(p, &p->key), - take_string(p, &p->value)), - 0); - return parse_begin(p, cur, end); +static int +finish_lithdr_notidx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + on_hdr (p, grpc_mdelem_from_metadata_strings (p->table.mdctx, take_string (p, &p->key), take_string (p, &p->value)), 0); + return parse_begin (p, cur, end); } /* parse a literal header without incremental indexing; index < 15 */ -static int parse_lithdr_notidx(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { +static int +parse_lithdr_notidx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_value_string_with_indexed_key, finish_lithdr_notidx}; + parse_value_string_with_indexed_key, finish_lithdr_notidx + }; p->next_state = and_then; p->index = (*cur) & 0xf; - return parse_string_prefix(p, cur + 1, end); + return parse_string_prefix (p, cur + 1, end); } /* parse a literal header without incremental indexing; index >= 15 */ -static int parse_lithdr_notidx_x(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { +static int +parse_lithdr_notidx_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_string_prefix, parse_value_string_with_indexed_key, - finish_lithdr_notidx}; + parse_string_prefix, parse_value_string_with_indexed_key, + finish_lithdr_notidx + }; p->next_state = and_then; p->index = 0xf; p->parsing.value = &p->index; - return parse_value0(p, cur + 1, end); + return parse_value0 (p, cur + 1, end); } /* parse a literal header without incremental indexing; index == 0 */ -static int parse_lithdr_notidx_v(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { +static int +parse_lithdr_notidx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_key_string, parse_string_prefix, - parse_value_string_with_literal_key, finish_lithdr_notidx_v}; + parse_key_string, parse_string_prefix, + parse_value_string_with_literal_key, finish_lithdr_notidx_v + }; p->next_state = and_then; - return parse_string_prefix(p, cur + 1, end); + return parse_string_prefix (p, cur + 1, end); } /* finish a literal header that is never indexed */ -static int finish_lithdr_nvridx(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { - grpc_mdelem *md = grpc_chttp2_hptbl_lookup(&p->table, p->index); - on_hdr(p, grpc_mdelem_from_metadata_strings(p->table.mdctx, - GRPC_MDSTR_REF(md->key), - take_string(p, &p->value)), - 0); - return parse_begin(p, cur, end); +static int +finish_lithdr_nvridx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + grpc_mdelem *md = grpc_chttp2_hptbl_lookup (&p->table, p->index); + on_hdr (p, grpc_mdelem_from_metadata_strings (p->table.mdctx, GRPC_MDSTR_REF (md->key), take_string (p, &p->value)), 0); + return parse_begin (p, cur, end); } /* finish a literal header that is never indexed with an extra value */ -static int finish_lithdr_nvridx_v(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { - on_hdr(p, grpc_mdelem_from_metadata_strings(p->table.mdctx, - take_string(p, &p->key), - take_string(p, &p->value)), - 0); - return parse_begin(p, cur, end); +static int +finish_lithdr_nvridx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + on_hdr (p, grpc_mdelem_from_metadata_strings (p->table.mdctx, take_string (p, &p->key), take_string (p, &p->value)), 0); + return parse_begin (p, cur, end); } /* parse a literal header that is never indexed; index < 15 */ -static int parse_lithdr_nvridx(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { +static int +parse_lithdr_nvridx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_value_string_with_indexed_key, finish_lithdr_nvridx}; + parse_value_string_with_indexed_key, finish_lithdr_nvridx + }; p->next_state = and_then; p->index = (*cur) & 0xf; - return parse_string_prefix(p, cur + 1, end); + return parse_string_prefix (p, cur + 1, end); } /* parse a literal header that is never indexed; index >= 15 */ -static int parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { +static int +parse_lithdr_nvridx_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_string_prefix, parse_value_string_with_indexed_key, - finish_lithdr_nvridx}; + parse_string_prefix, parse_value_string_with_indexed_key, + finish_lithdr_nvridx + }; p->next_state = and_then; p->index = 0xf; p->parsing.value = &p->index; - return parse_value0(p, cur + 1, end); + return parse_value0 (p, cur + 1, end); } /* parse a literal header that is never indexed; index == 0 */ -static int parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { +static int +parse_lithdr_nvridx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_key_string, parse_string_prefix, - parse_value_string_with_literal_key, finish_lithdr_nvridx_v}; + parse_key_string, parse_string_prefix, + parse_value_string_with_literal_key, finish_lithdr_nvridx_v + }; p->next_state = and_then; - return parse_string_prefix(p, cur + 1, end); + return parse_string_prefix (p, cur + 1, end); } /* finish parsing a max table size change */ -static int finish_max_tbl_size(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { - gpr_log(GPR_INFO, "MAX TABLE SIZE: %d", p->index); - abort(); /* not implemented */ - return parse_begin(p, cur, end); +static int +finish_max_tbl_size (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + gpr_log (GPR_INFO, "MAX TABLE SIZE: %d", p->index); + abort (); /* not implemented */ + return parse_begin (p, cur, end); } /* parse a max table size change, max size < 15 */ -static int parse_max_tbl_size(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { +static int +parse_max_tbl_size (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ p->index = (*cur) & 0xf; - return finish_max_tbl_size(p, cur + 1, end); + return finish_max_tbl_size (p, cur + 1, end); } /* parse a max table size change, max size >= 15 */ -static int parse_max_tbl_size_x(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { +static int +parse_max_tbl_size_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ static const grpc_chttp2_hpack_parser_state and_then[] = { - finish_max_tbl_size}; + finish_max_tbl_size + }; p->next_state = and_then; p->index = 0xf; p->parsing.value = &p->index; - return parse_value0(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 int parse_error(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { +static int +parse_error (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ p->state = parse_error; return 0; } /* parse the 1st byte of a varint into p->parsing.value no overflow is possible */ -static int parse_value0(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { - if (cur == end) { - p->state = parse_value0; - return 1; - } +static int +parse_value0 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + if (cur == end) + { + p->state = parse_value0; + return 1; + } *p->parsing.value += (*cur) & 0x7f; - if ((*cur) & 0x80) { - return parse_value1(p, cur + 1, end); - } else { - return parse_next(p, cur + 1, end); - } + if ((*cur) & 0x80) + { + return parse_value1 (p, cur + 1, end); + } + else + { + return parse_next (p, cur + 1, end); + } } /* parse the 2nd byte of a varint into p->parsing.value no overflow is possible */ -static int parse_value1(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { - if (cur == end) { - p->state = parse_value1; - return 1; - } - - *p->parsing.value += (((gpr_uint32)*cur) & 0x7f) << 7; - - if ((*cur) & 0x80) { - return parse_value2(p, cur + 1, end); - } else { - return parse_next(p, cur + 1, end); - } +static int +parse_value1 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + if (cur == end) + { + p->state = parse_value1; + return 1; + } + + *p->parsing.value += (((gpr_uint32) * cur) & 0x7f) << 7; + + if ((*cur) & 0x80) + { + return parse_value2 (p, cur + 1, end); + } + else + { + return parse_next (p, cur + 1, end); + } } /* parse the 3rd byte of a varint into p->parsing.value no overflow is possible */ -static int parse_value2(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { - if (cur == end) { - p->state = parse_value2; - return 1; - } - - *p->parsing.value += (((gpr_uint32)*cur) & 0x7f) << 14; - - if ((*cur) & 0x80) { - return parse_value3(p, cur + 1, end); - } else { - return parse_next(p, cur + 1, end); - } +static int +parse_value2 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + if (cur == end) + { + p->state = parse_value2; + return 1; + } + + *p->parsing.value += (((gpr_uint32) * cur) & 0x7f) << 14; + + if ((*cur) & 0x80) + { + return parse_value3 (p, cur + 1, end); + } + else + { + return parse_next (p, cur + 1, end); + } } /* parse the 4th byte of a varint into p->parsing.value no overflow is possible */ -static int parse_value3(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { - if (cur == end) { - p->state = parse_value3; - return 1; - } - - *p->parsing.value += (((gpr_uint32)*cur) & 0x7f) << 21; - - if ((*cur) & 0x80) { - return parse_value4(p, cur + 1, end); - } else { - return parse_next(p, cur + 1, end); - } +static int +parse_value3 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + if (cur == end) + { + p->state = parse_value3; + return 1; + } + + *p->parsing.value += (((gpr_uint32) * cur) & 0x7f) << 21; + + if ((*cur) & 0x80) + { + return parse_value4 (p, cur + 1, end); + } + else + { + 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 int parse_value4(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { +static int +parse_value4 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ gpr_uint8 c; gpr_uint32 cur_value; gpr_uint32 add_value; - if (cur == end) { - p->state = parse_value4; - return 1; - } + if (cur == end) + { + p->state = parse_value4; + return 1; + } c = (*cur) & 0x7f; - if (c > 0xf) { - goto error; - } + if (c > 0xf) + { + goto error; + } cur_value = *p->parsing.value; - add_value = ((gpr_uint32)c) << 28; - if (add_value > 0xffffffffu - cur_value) { - goto error; - } + add_value = ((gpr_uint32) c) << 28; + if (add_value > 0xffffffffu - cur_value) + { + goto error; + } *p->parsing.value = cur_value + add_value; - if ((*cur) & 0x80) { - return parse_value5up(p, cur + 1, end); - } else { - return parse_next(p, cur + 1, end); - } + if ((*cur) & 0x80) + { + return parse_value5up (p, cur + 1, end); + } + else + { + return parse_next (p, cur + 1, end); + } error: - gpr_log(GPR_ERROR, - "integer overflow in hpack integer decoding: have 0x%08x, " - "got byte 0x%02x", - *p->parsing.value, *cur); - return parse_error(p, cur, end); + gpr_log (GPR_ERROR, "integer overflow in hpack integer decoding: have 0x%08x, " "got byte 0x%02x", *p->parsing.value, *cur); + return parse_error (p, cur, end); } /* 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 int parse_value5up(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { - while (cur != end && *cur == 0x80) { - ++cur; - } - - if (cur == end) { - p->state = parse_value5up; - return 1; - } - - if (*cur == 0) { - return parse_next(p, cur + 1, end); - } - - gpr_log(GPR_ERROR, - "integer overflow in hpack integer decoding: have 0x%08x, " - "got byte 0x%02x sometime after byte 4"); - return parse_error(p, cur, end); +static int +parse_value5up (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + while (cur != end && *cur == 0x80) + { + ++cur; + } + + if (cur == end) + { + p->state = parse_value5up; + return 1; + } + + if (*cur == 0) + { + return parse_next (p, cur + 1, end); + } + + gpr_log (GPR_ERROR, "integer overflow in hpack integer decoding: have 0x%08x, " "got byte 0x%02x sometime after byte 4"); + return parse_error (p, cur, end); } /* parse a string prefix */ -static int parse_string_prefix(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, const gpr_uint8 *end) { - if (cur == end) { - p->state = parse_string_prefix; - return 1; - } +static int +parse_string_prefix (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + if (cur == end) + { + p->state = parse_string_prefix; + return 1; + } p->strlen = (*cur) & 0x7f; p->huff = (*cur) >> 7; - if (p->strlen == 0x7f) { - p->parsing.value = &p->strlen; - return parse_value0(p, cur + 1, end); - } else { - return parse_next(p, cur + 1, end); - } + if (p->strlen == 0x7f) + { + p->parsing.value = &p->strlen; + return parse_value0 (p, cur + 1, end); + } + else + { + return parse_next (p, cur + 1, end); + } } /* append some bytes to a string */ -static void append_bytes(grpc_chttp2_hpack_parser_string *str, - const gpr_uint8 *data, size_t length) { - if (length + str->length > str->capacity) { - GPR_ASSERT(str->length + length <= GPR_UINT32_MAX); - str->capacity = (gpr_uint32)(str->length + length); - str->str = gpr_realloc(str->str, str->capacity); - } - memcpy(str->str + str->length, data, length); - GPR_ASSERT(length <= GPR_UINT32_MAX - str->length); - str->length += (gpr_uint32)length; +static void +append_bytes (grpc_chttp2_hpack_parser_string * str, const gpr_uint8 * data, size_t length) +{ + if (length + str->length > str->capacity) + { + GPR_ASSERT (str->length + length <= GPR_UINT32_MAX); + str->capacity = (gpr_uint32) (str->length + length); + str->str = gpr_realloc (str->str, str->capacity); + } + memcpy (str->str + str->length, data, length); + GPR_ASSERT (length <= GPR_UINT32_MAX - str->length); + str->length += (gpr_uint32) length; } -static int append_string(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { +static int +append_string (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ grpc_chttp2_hpack_parser_string *str = p->parsing.str; gpr_uint32 bits; gpr_uint8 decoded[3]; - switch ((binary_state)p->binary) { + switch ((binary_state) p->binary) + { case NOT_BINARY: - append_bytes(str, cur, (size_t)(end - cur)); + append_bytes (str, cur, (size_t) (end - cur)); return 1; b64_byte0: case B64_BYTE0: - if (cur == end) { - p->binary = B64_BYTE0; - return 1; - } + if (cur == end) + { + p->binary = B64_BYTE0; + return 1; + } bits = inverse_base64[*cur]; ++cur; if (bits == 255) - return 0; + return 0; else if (bits == 64) - goto b64_byte0; + goto b64_byte0; p->base64_buffer = bits << 18; - /* fallthrough */ + /* fallthrough */ b64_byte1: case B64_BYTE1: - if (cur == end) { - p->binary = B64_BYTE1; - return 1; - } + if (cur == end) + { + p->binary = B64_BYTE1; + return 1; + } bits = inverse_base64[*cur]; ++cur; if (bits == 255) - return 0; + return 0; else if (bits == 64) - goto b64_byte1; + goto b64_byte1; p->base64_buffer |= bits << 12; - /* fallthrough */ + /* fallthrough */ b64_byte2: case B64_BYTE2: - if (cur == end) { - p->binary = B64_BYTE2; - return 1; - } + if (cur == end) + { + p->binary = B64_BYTE2; + return 1; + } bits = inverse_base64[*cur]; ++cur; if (bits == 255) - return 0; + return 0; else if (bits == 64) - goto b64_byte2; + goto b64_byte2; p->base64_buffer |= bits << 6; - /* fallthrough */ + /* fallthrough */ b64_byte3: case B64_BYTE3: - if (cur == end) { - p->binary = B64_BYTE3; - return 1; - } + if (cur == end) + { + p->binary = B64_BYTE3; + return 1; + } bits = inverse_base64[*cur]; ++cur; if (bits == 255) - return 0; + return 0; else if (bits == 64) - goto b64_byte3; + goto b64_byte3; p->base64_buffer |= bits; bits = p->base64_buffer; - decoded[0] = (gpr_uint8)(bits >> 16); - decoded[1] = (gpr_uint8)(bits >> 8); - decoded[2] = (gpr_uint8)(bits); - append_bytes(str, decoded, 3); + decoded[0] = (gpr_uint8) (bits >> 16); + decoded[1] = (gpr_uint8) (bits >> 8); + decoded[2] = (gpr_uint8) (bits); + append_bytes (str, decoded, 3); goto b64_byte0; - } - gpr_log(GPR_ERROR, "should never reach here"); - abort(); + } + gpr_log (GPR_ERROR, "should never reach here"); + abort (); return 1; } /* append a null terminator to a string */ -static int finish_str(grpc_chttp2_hpack_parser *p) { +static int +finish_str (grpc_chttp2_hpack_parser * p) +{ gpr_uint8 terminator = 0; gpr_uint8 decoded[2]; gpr_uint32 bits; grpc_chttp2_hpack_parser_string *str = p->parsing.str; - switch ((binary_state)p->binary) { + switch ((binary_state) p->binary) + { case NOT_BINARY: break; case B64_BYTE0: break; case B64_BYTE1: - gpr_log(GPR_ERROR, "illegal base64 encoding"); - return 0; /* illegal encoding */ + gpr_log (GPR_ERROR, "illegal base64 encoding"); + return 0; /* illegal encoding */ case B64_BYTE2: bits = p->base64_buffer; - if (bits & 0xffff) { - gpr_log(GPR_ERROR, "trailing bits in base64 encoding: 0x%04x", - bits & 0xffff); - return 0; - } - decoded[0] = (gpr_uint8)(bits >> 16); - append_bytes(str, decoded, 1); + if (bits & 0xffff) + { + gpr_log (GPR_ERROR, "trailing bits in base64 encoding: 0x%04x", bits & 0xffff); + return 0; + } + decoded[0] = (gpr_uint8) (bits >> 16); + append_bytes (str, decoded, 1); break; case B64_BYTE3: bits = p->base64_buffer; - if (bits & 0xff) { - gpr_log(GPR_ERROR, "trailing bits in base64 encoding: 0x%02x", - bits & 0xff); - return 0; - } - decoded[0] = (gpr_uint8)(bits >> 16); - decoded[1] = (gpr_uint8)(bits >> 8); - append_bytes(str, decoded, 2); + if (bits & 0xff) + { + gpr_log (GPR_ERROR, "trailing bits in base64 encoding: 0x%02x", bits & 0xff); + return 0; + } + decoded[0] = (gpr_uint8) (bits >> 16); + decoded[1] = (gpr_uint8) (bits >> 8); + append_bytes (str, decoded, 2); break; - } - append_bytes(str, &terminator, 1); - p->parsing.str->length--; /* don't actually count the null terminator */ + } + append_bytes (str, &terminator, 1); + p->parsing.str->length--; /* don't actually count the null terminator */ return 1; } /* decode a nibble from a huffman encoded stream */ -static int huff_nibble(grpc_chttp2_hpack_parser *p, gpr_uint8 nibble) { +static int +huff_nibble (grpc_chttp2_hpack_parser * p, gpr_uint8 nibble) +{ gpr_int16 emit = emit_sub_tbl[16 * emit_tbl[p->huff_state] + nibble]; gpr_int16 next = next_sub_tbl[16 * next_tbl[p->huff_state] + nibble]; - if (emit != -1) { - if (emit >= 0 && emit < 256) { - gpr_uint8 c = (gpr_uint8)emit; - if (!append_string(p, &c, (&c) + 1)) return 0; - } else { - assert(emit == 256); + if (emit != -1) + { + if (emit >= 0 && emit < 256) + { + gpr_uint8 c = (gpr_uint8) emit; + if (!append_string (p, &c, (&c) + 1)) + return 0; + } + else + { + assert (emit == 256); + } } - } p->huff_state = next; return 1; } /* decode full bytes from a huffman encoded stream */ -static int add_huff_bytes(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { - for (; cur != end; ++cur) { - if (!huff_nibble(p, *cur >> 4) || !huff_nibble(p, *cur & 0xf)) return 0; - } +static int +add_huff_bytes (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + for (; cur != end; ++cur) + { + if (!huff_nibble (p, *cur >> 4) || !huff_nibble (p, *cur & 0xf)) + return 0; + } return 1; } /* decode some string bytes based on the current decoding mode (huffman or not) */ -static int add_str_bytes(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { - if (p->huff) { - return add_huff_bytes(p, cur, end); - } else { - return append_string(p, cur, end); - } +static int +add_str_bytes (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + if (p->huff) + { + return add_huff_bytes (p, cur, end); + } + else + { + return append_string (p, cur, end); + } } /* parse a string - tries to do large chunks at a time */ -static int parse_string(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { +static int +parse_string (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ size_t remaining = p->strlen - p->strgot; - size_t given = (size_t)(end - cur); - if (remaining <= given) { - return add_str_bytes(p, cur, cur + remaining) && finish_str(p) && - parse_next(p, cur + remaining, end); - } else { - if (!add_str_bytes(p, cur, cur + given)) return 0; - GPR_ASSERT(given <= GPR_UINT32_MAX - p->strgot); - p->strgot += (gpr_uint32)given; - p->state = parse_string; - return 1; - } + size_t given = (size_t) (end - cur); + if (remaining <= given) + { + return add_str_bytes (p, cur, cur + remaining) && finish_str (p) && parse_next (p, cur + remaining, end); + } + else + { + if (!add_str_bytes (p, cur, cur + given)) + return 0; + GPR_ASSERT (given <= GPR_UINT32_MAX - p->strgot); + p->strgot += (gpr_uint32) given; + p->state = parse_string; + return 1; + } } /* begin parsing a string - performs setup, calls parse_string */ -static int begin_parse_string(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end, gpr_uint8 binary, - grpc_chttp2_hpack_parser_string *str) { +static int +begin_parse_string (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end, gpr_uint8 binary, grpc_chttp2_hpack_parser_string * str) +{ p->strgot = 0; str->length = 0; p->parsing.str = str; p->huff_state = 0; p->binary = binary; - return parse_string(p, cur, end); + return parse_string (p, cur, end); } /* parse the key string */ -static int parse_key_string(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end) { - return begin_parse_string(p, cur, end, NOT_BINARY, &p->key); +static int +parse_key_string (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + return begin_parse_string (p, cur, end, NOT_BINARY, &p->key); } /* check if a key represents a binary header or not */ -typedef enum { BINARY_HEADER, PLAINTEXT_HEADER, ERROR_HEADER } is_binary_header; +typedef enum +{ BINARY_HEADER, PLAINTEXT_HEADER, ERROR_HEADER } is_binary_header; -static is_binary_header is_binary_literal_header(grpc_chttp2_hpack_parser *p) { - return grpc_is_binary_header(p->key.str, p->key.length) ? BINARY_HEADER - : PLAINTEXT_HEADER; +static is_binary_header +is_binary_literal_header (grpc_chttp2_hpack_parser * p) +{ + return grpc_is_binary_header (p->key.str, p->key.length) ? BINARY_HEADER : PLAINTEXT_HEADER; } -static is_binary_header is_binary_indexed_header(grpc_chttp2_hpack_parser *p) { - grpc_mdelem *elem = grpc_chttp2_hptbl_lookup(&p->table, p->index); - if (!elem) return ERROR_HEADER; - return grpc_is_binary_header( - (const char *)GPR_SLICE_START_PTR(elem->key->slice), - GPR_SLICE_LENGTH(elem->key->slice)) - ? BINARY_HEADER - : PLAINTEXT_HEADER; +static is_binary_header +is_binary_indexed_header (grpc_chttp2_hpack_parser * p) +{ + grpc_mdelem *elem = grpc_chttp2_hptbl_lookup (&p->table, p->index); + if (!elem) + return ERROR_HEADER; + return grpc_is_binary_header ((const char *) GPR_SLICE_START_PTR (elem->key->slice), GPR_SLICE_LENGTH (elem->key->slice)) ? BINARY_HEADER : PLAINTEXT_HEADER; } /* parse the value string */ -static int parse_value_string(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, - const gpr_uint8 *end, is_binary_header type) { - switch (type) { +static int +parse_value_string (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end, is_binary_header type) +{ + switch (type) + { case BINARY_HEADER: - return begin_parse_string(p, cur, end, B64_BYTE0, &p->value); + return begin_parse_string (p, cur, end, B64_BYTE0, &p->value); case PLAINTEXT_HEADER: - return begin_parse_string(p, cur, end, NOT_BINARY, &p->value); + return begin_parse_string (p, cur, end, NOT_BINARY, &p->value); case ERROR_HEADER: return 0; - } + } /* Add code to prevent return without value error */ - gpr_log(GPR_ERROR, "Should never reach beyond switch in parse_value_string"); - abort(); + gpr_log (GPR_ERROR, "Should never reach beyond switch in parse_value_string"); + abort (); return 0; } -static int parse_value_string_with_indexed_key(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, - const gpr_uint8 *end) { - return parse_value_string(p, cur, end, is_binary_indexed_header(p)); +static int +parse_value_string_with_indexed_key (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + return parse_value_string (p, cur, end, is_binary_indexed_header (p)); } -static int parse_value_string_with_literal_key(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *cur, - const gpr_uint8 *end) { - return parse_value_string(p, cur, end, is_binary_literal_header(p)); +static int +parse_value_string_with_literal_key (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) +{ + return parse_value_string (p, cur, end, is_binary_literal_header (p)); } /* PUBLIC INTERFACE */ -static void on_header_not_set(void *user_data, grpc_mdelem *md) { - char *keyhex = gpr_dump_slice(md->key->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); - char *valuehex = - gpr_dump_slice(md->value->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_ERROR, "on_header callback not set; key=%s value=%s", keyhex, - valuehex); - gpr_free(keyhex); - gpr_free(valuehex); - GRPC_MDELEM_UNREF(md); - abort(); +static void +on_header_not_set (void *user_data, grpc_mdelem * md) +{ + char *keyhex = gpr_dump_slice (md->key->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); + char *valuehex = gpr_dump_slice (md->value->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log (GPR_ERROR, "on_header callback not set; key=%s value=%s", keyhex, valuehex); + gpr_free (keyhex); + gpr_free (valuehex); + GRPC_MDELEM_UNREF (md); + abort (); } -void grpc_chttp2_hpack_parser_init(grpc_chttp2_hpack_parser *p, - grpc_mdctx *mdctx) { +void +grpc_chttp2_hpack_parser_init (grpc_chttp2_hpack_parser * p, grpc_mdctx * mdctx) +{ p->on_header = on_header_not_set; p->on_header_user_data = NULL; p->state = parse_begin; @@ -1354,58 +1429,62 @@ void grpc_chttp2_hpack_parser_init(grpc_chttp2_hpack_parser *p, p->value.str = NULL; p->value.capacity = 0; p->value.length = 0; - grpc_chttp2_hptbl_init(&p->table, mdctx); + grpc_chttp2_hptbl_init (&p->table, mdctx); } -void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser *p) { +void +grpc_chttp2_hpack_parser_set_has_priority (grpc_chttp2_hpack_parser * p) +{ p->after_prioritization = p->state; p->state = parse_stream_dep0; } -void grpc_chttp2_hpack_parser_destroy(grpc_chttp2_hpack_parser *p) { - grpc_chttp2_hptbl_destroy(&p->table); - gpr_free(p->key.str); - gpr_free(p->value.str); +void +grpc_chttp2_hpack_parser_destroy (grpc_chttp2_hpack_parser * p) +{ + grpc_chttp2_hptbl_destroy (&p->table); + gpr_free (p->key.str); + gpr_free (p->value.str); } -int grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *beg, const gpr_uint8 *end) { +int +grpc_chttp2_hpack_parser_parse (grpc_chttp2_hpack_parser * p, const gpr_uint8 * beg, const gpr_uint8 * end) +{ /* TODO(ctiller): limit the distance of end from beg, and perform multiple - steps in the event of a large chunk of data to limit - stack space usage when no tail call optimization is - available */ - return p->state(p, beg, end); + steps in the event of a large chunk of data to limit + stack space usage when no tail call optimization is + available */ + return p->state (p, beg, end); } -grpc_chttp2_parse_error grpc_chttp2_header_parser_parse( - void *hpack_parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list) { +grpc_chttp2_parse_error +grpc_chttp2_header_parser_parse (void *hpack_parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +{ grpc_chttp2_hpack_parser *parser = hpack_parser; - if (!grpc_chttp2_hpack_parser_parse(parser, GPR_SLICE_START_PTR(slice), - GPR_SLICE_END_PTR(slice))) { - return GRPC_CHTTP2_CONNECTION_ERROR; - } - if (is_last) { - if (parser->is_boundary && parser->state != parse_begin) { - gpr_log(GPR_ERROR, - "end of header frame not aligned with a hpack record boundary"); + if (!grpc_chttp2_hpack_parser_parse (parser, GPR_SLICE_START_PTR (slice), GPR_SLICE_END_PTR (slice))) + { return GRPC_CHTTP2_CONNECTION_ERROR; } - if (parser->is_boundary) { - grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into( - &stream_parsing->incoming_metadata, - &stream_parsing->data_parser.incoming_sopb); - grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, - stream_parsing); - } - if (parser->is_eof) { - stream_parsing->received_close = 1; + if (is_last) + { + if (parser->is_boundary && parser->state != parse_begin) + { + gpr_log (GPR_ERROR, "end of header frame not aligned with a hpack record boundary"); + return GRPC_CHTTP2_CONNECTION_ERROR; + } + if (parser->is_boundary) + { + grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into (&stream_parsing->incoming_metadata, &stream_parsing->data_parser.incoming_sopb); + grpc_chttp2_list_add_parsing_seen_stream (transport_parsing, stream_parsing); + } + if (parser->is_eof) + { + stream_parsing->received_close = 1; + } + parser->on_header = on_header_not_set; + parser->on_header_user_data = NULL; + parser->is_boundary = 0xde; + parser->is_eof = 0xde; } - parser->on_header = on_header_not_set; - parser->on_header_user_data = NULL; - parser->is_boundary = 0xde; - parser->is_eof = 0xde; - } return GRPC_CHTTP2_PARSE_OK; } diff --git a/src/core/transport/chttp2/hpack_parser.h b/src/core/transport/chttp2/hpack_parser.h index 0d6d268a065..6d21202d4d6 100644 --- a/src/core/transport/chttp2/hpack_parser.h +++ b/src/core/transport/chttp2/hpack_parser.h @@ -44,19 +44,19 @@ typedef struct grpc_chttp2_hpack_parser grpc_chttp2_hpack_parser; -typedef int (*grpc_chttp2_hpack_parser_state)(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *beg, - const gpr_uint8 *end); +typedef int (*grpc_chttp2_hpack_parser_state) (grpc_chttp2_hpack_parser * p, const gpr_uint8 * beg, const gpr_uint8 * end); -typedef struct { +typedef struct +{ char *str; gpr_uint32 length; gpr_uint32 capacity; } grpc_chttp2_hpack_parser_string; -struct grpc_chttp2_hpack_parser { +struct grpc_chttp2_hpack_parser +{ /* user specified callback for each header output */ - void (*on_header)(void *user_data, grpc_mdelem *md); + void (*on_header) (void *user_data, grpc_mdelem * md); void *on_header_user_data; /* current parse state - or a function that implements it */ @@ -66,7 +66,8 @@ struct grpc_chttp2_hpack_parser { /* what to do after skipping prioritization data */ grpc_chttp2_hpack_parser_state after_prioritization; /* the value we're currently parsing */ - union { + union + { gpr_uint32 *value; grpc_chttp2_hpack_parser_string *str; } parsing; @@ -95,21 +96,16 @@ struct grpc_chttp2_hpack_parser { grpc_chttp2_hptbl table; }; -void grpc_chttp2_hpack_parser_init(grpc_chttp2_hpack_parser *p, - grpc_mdctx *mdctx); -void grpc_chttp2_hpack_parser_destroy(grpc_chttp2_hpack_parser *p); +void grpc_chttp2_hpack_parser_init (grpc_chttp2_hpack_parser * p, grpc_mdctx * mdctx); +void grpc_chttp2_hpack_parser_destroy (grpc_chttp2_hpack_parser * p); -void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser *p); +void grpc_chttp2_hpack_parser_set_has_priority (grpc_chttp2_hpack_parser * p); /* returns 1 on success, 0 on error */ -int grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser *p, - const gpr_uint8 *beg, const gpr_uint8 *end); +int grpc_chttp2_hpack_parser_parse (grpc_chttp2_hpack_parser * p, const gpr_uint8 * beg, const gpr_uint8 * end); /* wraps grpc_chttp2_hpack_parser_parse to provide a frame level parser for the transport */ -grpc_chttp2_parse_error grpc_chttp2_header_parser_parse( - void *hpack_parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list); +grpc_chttp2_parse_error grpc_chttp2_header_parser_parse (void *hpack_parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_HPACK_PARSER_H */ diff --git a/src/core/transport/chttp2/hpack_table.c b/src/core/transport/chttp2/hpack_table.c index e18778ab0b7..099766c85ea 100644 --- a/src/core/transport/chttp2/hpack_table.c +++ b/src/core/transport/chttp2/hpack_table.c @@ -39,191 +39,329 @@ #include #include "src/core/support/murmur_hash.h" -static struct { +static struct +{ const char *key; const char *value; -} static_table[] = { - /* 0: */ {NULL, NULL}, - /* 1: */ {":authority", ""}, - /* 2: */ {":method", "GET"}, - /* 3: */ {":method", "POST"}, - /* 4: */ {":path", "/"}, - /* 5: */ {":path", "/index.html"}, - /* 6: */ {":scheme", "http"}, - /* 7: */ {":scheme", "https"}, - /* 8: */ {":status", "200"}, - /* 9: */ {":status", "204"}, - /* 10: */ {":status", "206"}, - /* 11: */ {":status", "304"}, - /* 12: */ {":status", "400"}, - /* 13: */ {":status", "404"}, - /* 14: */ {":status", "500"}, - /* 15: */ {"accept-charset", ""}, - /* 16: */ {"accept-encoding", "gzip, deflate"}, - /* 17: */ {"accept-language", ""}, - /* 18: */ {"accept-ranges", ""}, - /* 19: */ {"accept", ""}, - /* 20: */ {"access-control-allow-origin", ""}, - /* 21: */ {"age", ""}, - /* 22: */ {"allow", ""}, - /* 23: */ {"authorization", ""}, - /* 24: */ {"cache-control", ""}, - /* 25: */ {"content-disposition", ""}, - /* 26: */ {"content-encoding", ""}, - /* 27: */ {"content-language", ""}, - /* 28: */ {"content-length", ""}, - /* 29: */ {"content-location", ""}, - /* 30: */ {"content-range", ""}, - /* 31: */ {"content-type", ""}, - /* 32: */ {"cookie", ""}, - /* 33: */ {"date", ""}, - /* 34: */ {"etag", ""}, - /* 35: */ {"expect", ""}, - /* 36: */ {"expires", ""}, - /* 37: */ {"from", ""}, - /* 38: */ {"host", ""}, - /* 39: */ {"if-match", ""}, - /* 40: */ {"if-modified-since", ""}, - /* 41: */ {"if-none-match", ""}, - /* 42: */ {"if-range", ""}, - /* 43: */ {"if-unmodified-since", ""}, - /* 44: */ {"last-modified", ""}, - /* 45: */ {"link", ""}, - /* 46: */ {"location", ""}, - /* 47: */ {"max-forwards", ""}, - /* 48: */ {"proxy-authenticate", ""}, - /* 49: */ {"proxy-authorization", ""}, - /* 50: */ {"range", ""}, - /* 51: */ {"referer", ""}, - /* 52: */ {"refresh", ""}, - /* 53: */ {"retry-after", ""}, - /* 54: */ {"server", ""}, - /* 55: */ {"set-cookie", ""}, - /* 56: */ {"strict-transport-security", ""}, - /* 57: */ {"transfer-encoding", ""}, - /* 58: */ {"user-agent", ""}, - /* 59: */ {"vary", ""}, - /* 60: */ {"via", ""}, - /* 61: */ {"www-authenticate", ""}, -}; - -void grpc_chttp2_hptbl_init(grpc_chttp2_hptbl *tbl, grpc_mdctx *mdctx) { +} static_table[] = +{ + /* 0: */ + { + NULL, NULL}, + /* 1: */ + { + ":authority", ""}, + /* 2: */ + { + ":method", "GET"}, + /* 3: */ + { + ":method", "POST"}, + /* 4: */ + { + ":path", "/"}, + /* 5: */ + { + ":path", "/index.html"}, + /* 6: */ + { + ":scheme", "http"}, + /* 7: */ + { + ":scheme", "https"}, + /* 8: */ + { + ":status", "200"}, + /* 9: */ + { + ":status", "204"}, + /* 10: */ + { + ":status", "206"}, + /* 11: */ + { + ":status", "304"}, + /* 12: */ + { + ":status", "400"}, + /* 13: */ + { + ":status", "404"}, + /* 14: */ + { + ":status", "500"}, + /* 15: */ + { + "accept-charset", ""}, + /* 16: */ + { + "accept-encoding", "gzip, deflate"}, + /* 17: */ + { + "accept-language", ""}, + /* 18: */ + { + "accept-ranges", ""}, + /* 19: */ + { + "accept", ""}, + /* 20: */ + { + "access-control-allow-origin", ""}, + /* 21: */ + { + "age", ""}, + /* 22: */ + { + "allow", ""}, + /* 23: */ + { + "authorization", ""}, + /* 24: */ + { + "cache-control", ""}, + /* 25: */ + { + "content-disposition", ""}, + /* 26: */ + { + "content-encoding", ""}, + /* 27: */ + { + "content-language", ""}, + /* 28: */ + { + "content-length", ""}, + /* 29: */ + { + "content-location", ""}, + /* 30: */ + { + "content-range", ""}, + /* 31: */ + { + "content-type", ""}, + /* 32: */ + { + "cookie", ""}, + /* 33: */ + { + "date", ""}, + /* 34: */ + { + "etag", ""}, + /* 35: */ + { + "expect", ""}, + /* 36: */ + { + "expires", ""}, + /* 37: */ + { + "from", ""}, + /* 38: */ + { + "host", ""}, + /* 39: */ + { + "if-match", ""}, + /* 40: */ + { + "if-modified-since", ""}, + /* 41: */ + { + "if-none-match", ""}, + /* 42: */ + { + "if-range", ""}, + /* 43: */ + { + "if-unmodified-since", ""}, + /* 44: */ + { + "last-modified", ""}, + /* 45: */ + { + "link", ""}, + /* 46: */ + { + "location", ""}, + /* 47: */ + { + "max-forwards", ""}, + /* 48: */ + { + "proxy-authenticate", ""}, + /* 49: */ + { + "proxy-authorization", ""}, + /* 50: */ + { + "range", ""}, + /* 51: */ + { + "referer", ""}, + /* 52: */ + { + "refresh", ""}, + /* 53: */ + { + "retry-after", ""}, + /* 54: */ + { + "server", ""}, + /* 55: */ + { + "set-cookie", ""}, + /* 56: */ + { + "strict-transport-security", ""}, + /* 57: */ + { + "transfer-encoding", ""}, + /* 58: */ + { + "user-agent", ""}, + /* 59: */ + { + "vary", ""}, + /* 60: */ + { + "via", ""}, + /* 61: */ + { +"www-authenticate", ""},}; + +void +grpc_chttp2_hptbl_init (grpc_chttp2_hptbl * tbl, grpc_mdctx * mdctx) +{ size_t i; - memset(tbl, 0, sizeof(*tbl)); + memset (tbl, 0, sizeof (*tbl)); tbl->mdctx = mdctx; tbl->max_bytes = GRPC_CHTTP2_INITIAL_HPACK_TABLE_SIZE; - for (i = 1; i <= GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) { - tbl->static_ents[i - 1] = grpc_mdelem_from_strings( - mdctx, static_table[i].key, static_table[i].value); - } + for (i = 1; i <= GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) + { + tbl->static_ents[i - 1] = grpc_mdelem_from_strings (mdctx, static_table[i].key, static_table[i].value); + } } -void grpc_chttp2_hptbl_destroy(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(tbl->static_ents[i]); - } - for (i = 0; i < tbl->num_ents; i++) { - GRPC_MDELEM_UNREF( - tbl->ents[(tbl->first_ent + i) % GRPC_CHTTP2_MAX_TABLE_COUNT]); - } + for (i = 0; i < GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) + { + GRPC_MDELEM_UNREF (tbl->static_ents[i]); + } + for (i = 0; i < tbl->num_ents; i++) + { + GRPC_MDELEM_UNREF (tbl->ents[(tbl->first_ent + i) % GRPC_CHTTP2_MAX_TABLE_COUNT]); + } } -grpc_mdelem *grpc_chttp2_hptbl_lookup(const grpc_chttp2_hptbl *tbl, - gpr_uint32 index) { +grpc_mdelem * +grpc_chttp2_hptbl_lookup (const grpc_chttp2_hptbl * tbl, gpr_uint32 index) +{ /* Static table comes first, just return an entry from it */ - if (index <= GRPC_CHTTP2_LAST_STATIC_ENTRY) { - return tbl->static_ents[index - 1]; - } + if (index <= GRPC_CHTTP2_LAST_STATIC_ENTRY) + { + return tbl->static_ents[index - 1]; + } /* Otherwise, find the value in the list of valid entries */ index -= (GRPC_CHTTP2_LAST_STATIC_ENTRY + 1); - if (index < tbl->num_ents) { - gpr_uint32 offset = (tbl->num_ents - 1u - index + tbl->first_ent) % - GRPC_CHTTP2_MAX_TABLE_COUNT; - return tbl->ents[offset]; - } + if (index < tbl->num_ents) + { + gpr_uint32 offset = (tbl->num_ents - 1u - index + tbl->first_ent) % GRPC_CHTTP2_MAX_TABLE_COUNT; + return tbl->ents[offset]; + } /* Invalid entry: return error */ return NULL; } /* Evict one element from the table */ -static void evict1(grpc_chttp2_hptbl *tbl) { +static void +evict1 (grpc_chttp2_hptbl * tbl) +{ grpc_mdelem *first_ent = tbl->ents[tbl->first_ent]; - size_t elem_bytes = GPR_SLICE_LENGTH(first_ent->key->slice) + - GPR_SLICE_LENGTH(first_ent->value->slice) + - GRPC_CHTTP2_HPACK_ENTRY_OVERHEAD; - GPR_ASSERT(elem_bytes <= tbl->mem_used); - tbl->mem_used = (gpr_uint16)(tbl->mem_used - elem_bytes); - tbl->first_ent = - (gpr_uint16)((tbl->first_ent + 1) % GRPC_CHTTP2_MAX_TABLE_COUNT); + size_t elem_bytes = GPR_SLICE_LENGTH (first_ent->key->slice) + GPR_SLICE_LENGTH (first_ent->value->slice) + GRPC_CHTTP2_HPACK_ENTRY_OVERHEAD; + GPR_ASSERT (elem_bytes <= tbl->mem_used); + tbl->mem_used = (gpr_uint16) (tbl->mem_used - elem_bytes); + tbl->first_ent = (gpr_uint16) ((tbl->first_ent + 1) % GRPC_CHTTP2_MAX_TABLE_COUNT); tbl->num_ents--; - GRPC_MDELEM_UNREF(first_ent); + GRPC_MDELEM_UNREF (first_ent); } -void grpc_chttp2_hptbl_add(grpc_chttp2_hptbl *tbl, grpc_mdelem *md) { +void +grpc_chttp2_hptbl_add (grpc_chttp2_hptbl * tbl, grpc_mdelem * md) +{ /* determine how many bytes of buffer this entry represents */ - size_t elem_bytes = GPR_SLICE_LENGTH(md->key->slice) + - GPR_SLICE_LENGTH(md->value->slice) + - GRPC_CHTTP2_HPACK_ENTRY_OVERHEAD; + size_t elem_bytes = GPR_SLICE_LENGTH (md->key->slice) + GPR_SLICE_LENGTH (md->value->slice) + GRPC_CHTTP2_HPACK_ENTRY_OVERHEAD; /* we can't add elements bigger than the max table size */ - if (elem_bytes > tbl->max_bytes) { - /* HPACK draft 10 section 4.4 states: - * If the size of the new entry is less than or equal to the maximum - * size, that entry is added to the table. It is not an error to - * attempt to add an entry that is larger than the maximum size; an - * attempt to add an entry larger than the entire table causes - * the table - * to be emptied of all existing entries, and results in an - * empty table. - */ - while (tbl->num_ents) { - evict1(tbl); + if (elem_bytes > tbl->max_bytes) + { + /* HPACK draft 10 section 4.4 states: + * If the size of the new entry is less than or equal to the maximum + * size, that entry is added to the table. It is not an error to + * attempt to add an entry that is larger than the maximum size; an + * attempt to add an entry larger than the entire table causes + * the table + * to be emptied of all existing entries, and results in an + * empty table. + */ + while (tbl->num_ents) + { + evict1 (tbl); + } + return; } - return; - } /* evict entries to ensure no overflow */ - while (elem_bytes > (size_t)tbl->max_bytes - tbl->mem_used) { - evict1(tbl); - } + while (elem_bytes > (size_t) tbl->max_bytes - tbl->mem_used) + { + evict1 (tbl); + } /* copy the finalized entry in */ tbl->ents[tbl->last_ent] = md; /* update accounting values */ - tbl->last_ent = - (gpr_uint16)((tbl->last_ent + 1) % GRPC_CHTTP2_MAX_TABLE_COUNT); + tbl->last_ent = (gpr_uint16) ((tbl->last_ent + 1) % GRPC_CHTTP2_MAX_TABLE_COUNT); tbl->num_ents++; - tbl->mem_used = (gpr_uint16)(tbl->mem_used + elem_bytes); + tbl->mem_used = (gpr_uint16) (tbl->mem_used + elem_bytes); } -grpc_chttp2_hptbl_find_result grpc_chttp2_hptbl_find( - const grpc_chttp2_hptbl *tbl, grpc_mdelem *md) { - grpc_chttp2_hptbl_find_result r = {0, 0}; +grpc_chttp2_hptbl_find_result +grpc_chttp2_hptbl_find (const grpc_chttp2_hptbl * tbl, grpc_mdelem * md) +{ + grpc_chttp2_hptbl_find_result r = { 0, 0 }; gpr_uint16 i; /* See if the string is in the static table */ - for (i = 0; i < GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) { - grpc_mdelem *ent = tbl->static_ents[i]; - if (md->key != ent->key) continue; - r.index = (gpr_uint16)(i + 1); - r.has_value = md->value == ent->value; - if (r.has_value) return r; - } + for (i = 0; i < GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) + { + grpc_mdelem *ent = tbl->static_ents[i]; + if (md->key != ent->key) + continue; + r.index = (gpr_uint16) (i + 1); + r.has_value = md->value == ent->value; + if (r.has_value) + return r; + } /* Scan the dynamic table */ - for (i = 0; i < tbl->num_ents; i++) { - gpr_uint16 idx = - (gpr_uint16)(tbl->num_ents - i + GRPC_CHTTP2_LAST_STATIC_ENTRY); - grpc_mdelem *ent = - tbl->ents[(tbl->first_ent + i) % GRPC_CHTTP2_MAX_TABLE_COUNT]; - if (md->key != ent->key) continue; - r.index = idx; - r.has_value = md->value == ent->value; - if (r.has_value) return r; - } + for (i = 0; i < tbl->num_ents; i++) + { + gpr_uint16 idx = (gpr_uint16) (tbl->num_ents - i + GRPC_CHTTP2_LAST_STATIC_ENTRY); + grpc_mdelem *ent = tbl->ents[(tbl->first_ent + i) % GRPC_CHTTP2_MAX_TABLE_COUNT]; + if (md->key != ent->key) + continue; + r.index = idx; + r.has_value = md->value == ent->value; + if (r.has_value) + return r; + } return r; } diff --git a/src/core/transport/chttp2/hpack_table.h b/src/core/transport/chttp2/hpack_table.h index 4f882e2e03b..5c58a351862 100644 --- a/src/core/transport/chttp2/hpack_table.h +++ b/src/core/transport/chttp2/hpack_table.h @@ -56,7 +56,8 @@ GRPC_CHTTP2_HPACK_ENTRY_OVERHEAD) /* hpack decoder table */ -typedef struct { +typedef struct +{ grpc_mdctx *mdctx; /* the first used entry in ents */ gpr_uint16 first_ent; @@ -77,21 +78,20 @@ typedef struct { } grpc_chttp2_hptbl; /* initialize a hpack table */ -void grpc_chttp2_hptbl_init(grpc_chttp2_hptbl *tbl, grpc_mdctx *mdctx); -void grpc_chttp2_hptbl_destroy(grpc_chttp2_hptbl *tbl); +void grpc_chttp2_hptbl_init (grpc_chttp2_hptbl * tbl, grpc_mdctx * mdctx); +void grpc_chttp2_hptbl_destroy (grpc_chttp2_hptbl * tbl); /* lookup a table entry based on its hpack index */ -grpc_mdelem *grpc_chttp2_hptbl_lookup(const grpc_chttp2_hptbl *tbl, - gpr_uint32 index); +grpc_mdelem *grpc_chttp2_hptbl_lookup (const grpc_chttp2_hptbl * tbl, gpr_uint32 index); /* add a table entry to the index */ -void grpc_chttp2_hptbl_add(grpc_chttp2_hptbl *tbl, grpc_mdelem *md); +void grpc_chttp2_hptbl_add (grpc_chttp2_hptbl * tbl, grpc_mdelem * md); /* 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 */ -typedef struct { +typedef struct +{ gpr_uint16 index; gpr_uint8 has_value; } grpc_chttp2_hptbl_find_result; -grpc_chttp2_hptbl_find_result grpc_chttp2_hptbl_find( - const grpc_chttp2_hptbl *tbl, grpc_mdelem *md); +grpc_chttp2_hptbl_find_result grpc_chttp2_hptbl_find (const grpc_chttp2_hptbl * tbl, grpc_mdelem * md); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_HPACK_TABLE_H */ diff --git a/src/core/transport/chttp2/http2_errors.h b/src/core/transport/chttp2/http2_errors.h index a4f309e0565..8385d6ba449 100644 --- a/src/core/transport/chttp2/http2_errors.h +++ b/src/core/transport/chttp2/http2_errors.h @@ -35,7 +35,8 @@ #define GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_HTTP2_ERRORS_H /* error codes for RST_STREAM from http2 draft 14 section 7 */ -typedef enum { +typedef enum +{ GRPC_CHTTP2_NO_ERROR = 0x0, GRPC_CHTTP2_PROTOCOL_ERROR = 0x1, GRPC_CHTTP2_INTERNAL_ERROR = 0x2, diff --git a/src/core/transport/chttp2/huffsyms.c b/src/core/transport/chttp2/huffsyms.c index 6f5cf6a2a92..058c6ee61e2 100644 --- a/src/core/transport/chttp2/huffsyms.c +++ b/src/core/transport/chttp2/huffsyms.c @@ -37,69 +37,69 @@ command: :%s/.* \([0-9a-f]\+\) \[ *\([0-9]\+\)\]/{0x\1, \2},/g */ const grpc_chttp2_huffsym grpc_chttp2_huffsyms[GRPC_CHTTP2_NUM_HUFFSYMS] = { - {0x1ff8, 13}, {0x7fffd8, 23}, {0xfffffe2, 28}, {0xfffffe3, 28}, - {0xfffffe4, 28}, {0xfffffe5, 28}, {0xfffffe6, 28}, {0xfffffe7, 28}, - {0xfffffe8, 28}, {0xffffea, 24}, {0x3ffffffc, 30}, {0xfffffe9, 28}, - {0xfffffea, 28}, {0x3ffffffd, 30}, {0xfffffeb, 28}, {0xfffffec, 28}, - {0xfffffed, 28}, {0xfffffee, 28}, {0xfffffef, 28}, {0xffffff0, 28}, - {0xffffff1, 28}, {0xffffff2, 28}, {0x3ffffffe, 30}, {0xffffff3, 28}, - {0xffffff4, 28}, {0xffffff5, 28}, {0xffffff6, 28}, {0xffffff7, 28}, - {0xffffff8, 28}, {0xffffff9, 28}, {0xffffffa, 28}, {0xffffffb, 28}, - {0x14, 6}, {0x3f8, 10}, {0x3f9, 10}, {0xffa, 12}, - {0x1ff9, 13}, {0x15, 6}, {0xf8, 8}, {0x7fa, 11}, - {0x3fa, 10}, {0x3fb, 10}, {0xf9, 8}, {0x7fb, 11}, - {0xfa, 8}, {0x16, 6}, {0x17, 6}, {0x18, 6}, - {0x0, 5}, {0x1, 5}, {0x2, 5}, {0x19, 6}, - {0x1a, 6}, {0x1b, 6}, {0x1c, 6}, {0x1d, 6}, - {0x1e, 6}, {0x1f, 6}, {0x5c, 7}, {0xfb, 8}, - {0x7ffc, 15}, {0x20, 6}, {0xffb, 12}, {0x3fc, 10}, - {0x1ffa, 13}, {0x21, 6}, {0x5d, 7}, {0x5e, 7}, - {0x5f, 7}, {0x60, 7}, {0x61, 7}, {0x62, 7}, - {0x63, 7}, {0x64, 7}, {0x65, 7}, {0x66, 7}, - {0x67, 7}, {0x68, 7}, {0x69, 7}, {0x6a, 7}, - {0x6b, 7}, {0x6c, 7}, {0x6d, 7}, {0x6e, 7}, - {0x6f, 7}, {0x70, 7}, {0x71, 7}, {0x72, 7}, - {0xfc, 8}, {0x73, 7}, {0xfd, 8}, {0x1ffb, 13}, - {0x7fff0, 19}, {0x1ffc, 13}, {0x3ffc, 14}, {0x22, 6}, - {0x7ffd, 15}, {0x3, 5}, {0x23, 6}, {0x4, 5}, - {0x24, 6}, {0x5, 5}, {0x25, 6}, {0x26, 6}, - {0x27, 6}, {0x6, 5}, {0x74, 7}, {0x75, 7}, - {0x28, 6}, {0x29, 6}, {0x2a, 6}, {0x7, 5}, - {0x2b, 6}, {0x76, 7}, {0x2c, 6}, {0x8, 5}, - {0x9, 5}, {0x2d, 6}, {0x77, 7}, {0x78, 7}, - {0x79, 7}, {0x7a, 7}, {0x7b, 7}, {0x7ffe, 15}, - {0x7fc, 11}, {0x3ffd, 14}, {0x1ffd, 13}, {0xffffffc, 28}, - {0xfffe6, 20}, {0x3fffd2, 22}, {0xfffe7, 20}, {0xfffe8, 20}, - {0x3fffd3, 22}, {0x3fffd4, 22}, {0x3fffd5, 22}, {0x7fffd9, 23}, - {0x3fffd6, 22}, {0x7fffda, 23}, {0x7fffdb, 23}, {0x7fffdc, 23}, - {0x7fffdd, 23}, {0x7fffde, 23}, {0xffffeb, 24}, {0x7fffdf, 23}, - {0xffffec, 24}, {0xffffed, 24}, {0x3fffd7, 22}, {0x7fffe0, 23}, - {0xffffee, 24}, {0x7fffe1, 23}, {0x7fffe2, 23}, {0x7fffe3, 23}, - {0x7fffe4, 23}, {0x1fffdc, 21}, {0x3fffd8, 22}, {0x7fffe5, 23}, - {0x3fffd9, 22}, {0x7fffe6, 23}, {0x7fffe7, 23}, {0xffffef, 24}, - {0x3fffda, 22}, {0x1fffdd, 21}, {0xfffe9, 20}, {0x3fffdb, 22}, - {0x3fffdc, 22}, {0x7fffe8, 23}, {0x7fffe9, 23}, {0x1fffde, 21}, - {0x7fffea, 23}, {0x3fffdd, 22}, {0x3fffde, 22}, {0xfffff0, 24}, - {0x1fffdf, 21}, {0x3fffdf, 22}, {0x7fffeb, 23}, {0x7fffec, 23}, - {0x1fffe0, 21}, {0x1fffe1, 21}, {0x3fffe0, 22}, {0x1fffe2, 21}, - {0x7fffed, 23}, {0x3fffe1, 22}, {0x7fffee, 23}, {0x7fffef, 23}, - {0xfffea, 20}, {0x3fffe2, 22}, {0x3fffe3, 22}, {0x3fffe4, 22}, - {0x7ffff0, 23}, {0x3fffe5, 22}, {0x3fffe6, 22}, {0x7ffff1, 23}, - {0x3ffffe0, 26}, {0x3ffffe1, 26}, {0xfffeb, 20}, {0x7fff1, 19}, - {0x3fffe7, 22}, {0x7ffff2, 23}, {0x3fffe8, 22}, {0x1ffffec, 25}, - {0x3ffffe2, 26}, {0x3ffffe3, 26}, {0x3ffffe4, 26}, {0x7ffffde, 27}, - {0x7ffffdf, 27}, {0x3ffffe5, 26}, {0xfffff1, 24}, {0x1ffffed, 25}, - {0x7fff2, 19}, {0x1fffe3, 21}, {0x3ffffe6, 26}, {0x7ffffe0, 27}, - {0x7ffffe1, 27}, {0x3ffffe7, 26}, {0x7ffffe2, 27}, {0xfffff2, 24}, - {0x1fffe4, 21}, {0x1fffe5, 21}, {0x3ffffe8, 26}, {0x3ffffe9, 26}, - {0xffffffd, 28}, {0x7ffffe3, 27}, {0x7ffffe4, 27}, {0x7ffffe5, 27}, - {0xfffec, 20}, {0xfffff3, 24}, {0xfffed, 20}, {0x1fffe6, 21}, - {0x3fffe9, 22}, {0x1fffe7, 21}, {0x1fffe8, 21}, {0x7ffff3, 23}, - {0x3fffea, 22}, {0x3fffeb, 22}, {0x1ffffee, 25}, {0x1ffffef, 25}, - {0xfffff4, 24}, {0xfffff5, 24}, {0x3ffffea, 26}, {0x7ffff4, 23}, - {0x3ffffeb, 26}, {0x7ffffe6, 27}, {0x3ffffec, 26}, {0x3ffffed, 26}, - {0x7ffffe7, 27}, {0x7ffffe8, 27}, {0x7ffffe9, 27}, {0x7ffffea, 27}, - {0x7ffffeb, 27}, {0xffffffe, 28}, {0x7ffffec, 27}, {0x7ffffed, 27}, - {0x7ffffee, 27}, {0x7ffffef, 27}, {0x7fffff0, 27}, {0x3ffffee, 26}, - {0x3fffffff, 30}, + {0x1ff8, 13}, {0x7fffd8, 23}, {0xfffffe2, 28}, {0xfffffe3, 28}, + {0xfffffe4, 28}, {0xfffffe5, 28}, {0xfffffe6, 28}, {0xfffffe7, 28}, + {0xfffffe8, 28}, {0xffffea, 24}, {0x3ffffffc, 30}, {0xfffffe9, 28}, + {0xfffffea, 28}, {0x3ffffffd, 30}, {0xfffffeb, 28}, {0xfffffec, 28}, + {0xfffffed, 28}, {0xfffffee, 28}, {0xfffffef, 28}, {0xffffff0, 28}, + {0xffffff1, 28}, {0xffffff2, 28}, {0x3ffffffe, 30}, {0xffffff3, 28}, + {0xffffff4, 28}, {0xffffff5, 28}, {0xffffff6, 28}, {0xffffff7, 28}, + {0xffffff8, 28}, {0xffffff9, 28}, {0xffffffa, 28}, {0xffffffb, 28}, + {0x14, 6}, {0x3f8, 10}, {0x3f9, 10}, {0xffa, 12}, + {0x1ff9, 13}, {0x15, 6}, {0xf8, 8}, {0x7fa, 11}, + {0x3fa, 10}, {0x3fb, 10}, {0xf9, 8}, {0x7fb, 11}, + {0xfa, 8}, {0x16, 6}, {0x17, 6}, {0x18, 6}, + {0x0, 5}, {0x1, 5}, {0x2, 5}, {0x19, 6}, + {0x1a, 6}, {0x1b, 6}, {0x1c, 6}, {0x1d, 6}, + {0x1e, 6}, {0x1f, 6}, {0x5c, 7}, {0xfb, 8}, + {0x7ffc, 15}, {0x20, 6}, {0xffb, 12}, {0x3fc, 10}, + {0x1ffa, 13}, {0x21, 6}, {0x5d, 7}, {0x5e, 7}, + {0x5f, 7}, {0x60, 7}, {0x61, 7}, {0x62, 7}, + {0x63, 7}, {0x64, 7}, {0x65, 7}, {0x66, 7}, + {0x67, 7}, {0x68, 7}, {0x69, 7}, {0x6a, 7}, + {0x6b, 7}, {0x6c, 7}, {0x6d, 7}, {0x6e, 7}, + {0x6f, 7}, {0x70, 7}, {0x71, 7}, {0x72, 7}, + {0xfc, 8}, {0x73, 7}, {0xfd, 8}, {0x1ffb, 13}, + {0x7fff0, 19}, {0x1ffc, 13}, {0x3ffc, 14}, {0x22, 6}, + {0x7ffd, 15}, {0x3, 5}, {0x23, 6}, {0x4, 5}, + {0x24, 6}, {0x5, 5}, {0x25, 6}, {0x26, 6}, + {0x27, 6}, {0x6, 5}, {0x74, 7}, {0x75, 7}, + {0x28, 6}, {0x29, 6}, {0x2a, 6}, {0x7, 5}, + {0x2b, 6}, {0x76, 7}, {0x2c, 6}, {0x8, 5}, + {0x9, 5}, {0x2d, 6}, {0x77, 7}, {0x78, 7}, + {0x79, 7}, {0x7a, 7}, {0x7b, 7}, {0x7ffe, 15}, + {0x7fc, 11}, {0x3ffd, 14}, {0x1ffd, 13}, {0xffffffc, 28}, + {0xfffe6, 20}, {0x3fffd2, 22}, {0xfffe7, 20}, {0xfffe8, 20}, + {0x3fffd3, 22}, {0x3fffd4, 22}, {0x3fffd5, 22}, {0x7fffd9, 23}, + {0x3fffd6, 22}, {0x7fffda, 23}, {0x7fffdb, 23}, {0x7fffdc, 23}, + {0x7fffdd, 23}, {0x7fffde, 23}, {0xffffeb, 24}, {0x7fffdf, 23}, + {0xffffec, 24}, {0xffffed, 24}, {0x3fffd7, 22}, {0x7fffe0, 23}, + {0xffffee, 24}, {0x7fffe1, 23}, {0x7fffe2, 23}, {0x7fffe3, 23}, + {0x7fffe4, 23}, {0x1fffdc, 21}, {0x3fffd8, 22}, {0x7fffe5, 23}, + {0x3fffd9, 22}, {0x7fffe6, 23}, {0x7fffe7, 23}, {0xffffef, 24}, + {0x3fffda, 22}, {0x1fffdd, 21}, {0xfffe9, 20}, {0x3fffdb, 22}, + {0x3fffdc, 22}, {0x7fffe8, 23}, {0x7fffe9, 23}, {0x1fffde, 21}, + {0x7fffea, 23}, {0x3fffdd, 22}, {0x3fffde, 22}, {0xfffff0, 24}, + {0x1fffdf, 21}, {0x3fffdf, 22}, {0x7fffeb, 23}, {0x7fffec, 23}, + {0x1fffe0, 21}, {0x1fffe1, 21}, {0x3fffe0, 22}, {0x1fffe2, 21}, + {0x7fffed, 23}, {0x3fffe1, 22}, {0x7fffee, 23}, {0x7fffef, 23}, + {0xfffea, 20}, {0x3fffe2, 22}, {0x3fffe3, 22}, {0x3fffe4, 22}, + {0x7ffff0, 23}, {0x3fffe5, 22}, {0x3fffe6, 22}, {0x7ffff1, 23}, + {0x3ffffe0, 26}, {0x3ffffe1, 26}, {0xfffeb, 20}, {0x7fff1, 19}, + {0x3fffe7, 22}, {0x7ffff2, 23}, {0x3fffe8, 22}, {0x1ffffec, 25}, + {0x3ffffe2, 26}, {0x3ffffe3, 26}, {0x3ffffe4, 26}, {0x7ffffde, 27}, + {0x7ffffdf, 27}, {0x3ffffe5, 26}, {0xfffff1, 24}, {0x1ffffed, 25}, + {0x7fff2, 19}, {0x1fffe3, 21}, {0x3ffffe6, 26}, {0x7ffffe0, 27}, + {0x7ffffe1, 27}, {0x3ffffe7, 26}, {0x7ffffe2, 27}, {0xfffff2, 24}, + {0x1fffe4, 21}, {0x1fffe5, 21}, {0x3ffffe8, 26}, {0x3ffffe9, 26}, + {0xffffffd, 28}, {0x7ffffe3, 27}, {0x7ffffe4, 27}, {0x7ffffe5, 27}, + {0xfffec, 20}, {0xfffff3, 24}, {0xfffed, 20}, {0x1fffe6, 21}, + {0x3fffe9, 22}, {0x1fffe7, 21}, {0x1fffe8, 21}, {0x7ffff3, 23}, + {0x3fffea, 22}, {0x3fffeb, 22}, {0x1ffffee, 25}, {0x1ffffef, 25}, + {0xfffff4, 24}, {0xfffff5, 24}, {0x3ffffea, 26}, {0x7ffff4, 23}, + {0x3ffffeb, 26}, {0x7ffffe6, 27}, {0x3ffffec, 26}, {0x3ffffed, 26}, + {0x7ffffe7, 27}, {0x7ffffe8, 27}, {0x7ffffe9, 27}, {0x7ffffea, 27}, + {0x7ffffeb, 27}, {0xffffffe, 28}, {0x7ffffec, 27}, {0x7ffffed, 27}, + {0x7ffffee, 27}, {0x7ffffef, 27}, {0x7fffff0, 27}, {0x3ffffee, 26}, + {0x3fffffff, 30}, }; diff --git a/src/core/transport/chttp2/huffsyms.h b/src/core/transport/chttp2/huffsyms.h index a3cdba8235a..04f062dd5e9 100644 --- a/src/core/transport/chttp2/huffsyms.h +++ b/src/core/transport/chttp2/huffsyms.h @@ -38,7 +38,8 @@ #define GRPC_CHTTP2_NUM_HUFFSYMS 257 -typedef struct { +typedef struct +{ unsigned bits; unsigned length; } grpc_chttp2_huffsym; diff --git a/src/core/transport/chttp2/incoming_metadata.c b/src/core/transport/chttp2/incoming_metadata.c index d216c421139..93eee0be3f0 100644 --- a/src/core/transport/chttp2/incoming_metadata.c +++ b/src/core/transport/chttp2/incoming_metadata.c @@ -40,43 +40,50 @@ #include #include -void grpc_chttp2_incoming_metadata_buffer_init( - grpc_chttp2_incoming_metadata_buffer *buffer) { - buffer->deadline = gpr_inf_future(GPR_CLOCK_REALTIME); +void +grpc_chttp2_incoming_metadata_buffer_init (grpc_chttp2_incoming_metadata_buffer * buffer) +{ + buffer->deadline = gpr_inf_future (GPR_CLOCK_REALTIME); } -void grpc_chttp2_incoming_metadata_buffer_destroy( - grpc_chttp2_incoming_metadata_buffer *buffer) { +void +grpc_chttp2_incoming_metadata_buffer_destroy (grpc_chttp2_incoming_metadata_buffer * buffer) +{ size_t i; - for (i = 0; i < buffer->count; i++) { - GRPC_MDELEM_UNREF(buffer->elems[i].md); - } - gpr_free(buffer->elems); + for (i = 0; i < buffer->count; i++) + { + GRPC_MDELEM_UNREF (buffer->elems[i].md); + } + gpr_free (buffer->elems); } -void grpc_chttp2_incoming_metadata_buffer_add( - grpc_chttp2_incoming_metadata_buffer *buffer, grpc_mdelem *elem) { - if (buffer->capacity == buffer->count) { - buffer->capacity = GPR_MAX(8, 2 * buffer->capacity); - buffer->elems = - gpr_realloc(buffer->elems, sizeof(*buffer->elems) * buffer->capacity); - } +void +grpc_chttp2_incoming_metadata_buffer_add (grpc_chttp2_incoming_metadata_buffer * buffer, grpc_mdelem * elem) +{ + if (buffer->capacity == buffer->count) + { + buffer->capacity = GPR_MAX (8, 2 * buffer->capacity); + buffer->elems = gpr_realloc (buffer->elems, sizeof (*buffer->elems) * buffer->capacity); + } buffer->elems[buffer->count++].md = elem; } -void grpc_chttp2_incoming_metadata_buffer_set_deadline( - grpc_chttp2_incoming_metadata_buffer *buffer, gpr_timespec deadline) { +void +grpc_chttp2_incoming_metadata_buffer_set_deadline (grpc_chttp2_incoming_metadata_buffer * buffer, gpr_timespec deadline) +{ buffer->deadline = deadline; } -void grpc_chttp2_incoming_metadata_live_op_buffer_end( - grpc_chttp2_incoming_metadata_live_op_buffer *buffer) { - gpr_free(buffer->elems); +void +grpc_chttp2_incoming_metadata_live_op_buffer_end (grpc_chttp2_incoming_metadata_live_op_buffer * buffer) +{ + gpr_free (buffer->elems); buffer->elems = NULL; } -void grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into( - grpc_chttp2_incoming_metadata_buffer *buffer, grpc_stream_op_buffer *sopb) { +void +grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into (grpc_chttp2_incoming_metadata_buffer * buffer, grpc_stream_op_buffer * sopb) +{ grpc_metadata_batch b; b.list.head = NULL; @@ -84,52 +91,56 @@ void grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into( we can reconstitute the list. We can't do list building here as later incoming metadata may reallocate the underlying array. */ - b.list.tail = (void *)(gpr_intptr)buffer->count; + b.list.tail = (void *) (gpr_intptr) buffer->count; b.garbage.head = b.garbage.tail = NULL; b.deadline = buffer->deadline; - buffer->deadline = gpr_inf_future(GPR_CLOCK_REALTIME); + buffer->deadline = gpr_inf_future (GPR_CLOCK_REALTIME); - grpc_sopb_add_metadata(sopb, b); + grpc_sopb_add_metadata (sopb, b); } -void grpc_chttp2_incoming_metadata_buffer_swap( - grpc_chttp2_incoming_metadata_buffer *a, - grpc_chttp2_incoming_metadata_buffer *b) { - GPR_SWAP(grpc_chttp2_incoming_metadata_buffer, *a, *b); +void +grpc_chttp2_incoming_metadata_buffer_swap (grpc_chttp2_incoming_metadata_buffer * a, grpc_chttp2_incoming_metadata_buffer * b) +{ + GPR_SWAP (grpc_chttp2_incoming_metadata_buffer, *a, *b); } -void grpc_incoming_metadata_buffer_move_to_referencing_sopb( - grpc_chttp2_incoming_metadata_buffer *src, - grpc_chttp2_incoming_metadata_buffer *dst, grpc_stream_op_buffer *sopb) { +void +grpc_incoming_metadata_buffer_move_to_referencing_sopb (grpc_chttp2_incoming_metadata_buffer * src, grpc_chttp2_incoming_metadata_buffer * dst, grpc_stream_op_buffer * sopb) +{ size_t delta; size_t i; - dst->deadline = gpr_time_min(src->deadline, dst->deadline); - - if (src->count == 0) { - return; - } - if (dst->count == 0) { - grpc_chttp2_incoming_metadata_buffer_swap(src, dst); - return; - } + dst->deadline = gpr_time_min (src->deadline, dst->deadline); + + if (src->count == 0) + { + return; + } + if (dst->count == 0) + { + grpc_chttp2_incoming_metadata_buffer_swap (src, dst); + return; + } delta = dst->count; - if (dst->capacity < src->count + dst->count) { - dst->capacity = GPR_MAX(dst->capacity * 2, src->count + dst->count); - dst->elems = gpr_realloc(dst->elems, dst->capacity * sizeof(*dst->elems)); - } - memcpy(dst->elems + dst->count, src->elems, src->count * sizeof(*src->elems)); + if (dst->capacity < src->count + dst->count) + { + dst->capacity = GPR_MAX (dst->capacity * 2, src->count + dst->count); + dst->elems = gpr_realloc (dst->elems, dst->capacity * sizeof (*dst->elems)); + } + memcpy (dst->elems + dst->count, src->elems, src->count * sizeof (*src->elems)); dst->count += src->count; - for (i = 0; i < sopb->nops; i++) { - if (sopb->ops[i].type != GRPC_OP_METADATA) continue; - sopb->ops[i].data.metadata.list.tail = - (void *)(delta + (gpr_uintptr)sopb->ops[i].data.metadata.list.tail); - } + for (i = 0; i < sopb->nops; i++) + { + if (sopb->ops[i].type != GRPC_OP_METADATA) + continue; + sopb->ops[i].data.metadata.list.tail = (void *) (delta + (gpr_uintptr) sopb->ops[i].data.metadata.list.tail); + } src->count = 0; } -void grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op( - grpc_chttp2_incoming_metadata_buffer *buffer, grpc_stream_op_buffer *sopb, - grpc_chttp2_incoming_metadata_live_op_buffer *live_op_buffer) { +void +grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op (grpc_chttp2_incoming_metadata_buffer * buffer, grpc_stream_op_buffer * sopb, grpc_chttp2_incoming_metadata_live_op_buffer * live_op_buffer) +{ grpc_stream_op *ops = sopb->ops; size_t nops = sopb->nops; size_t i; @@ -141,42 +152,49 @@ void grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op( /* rework the array of metadata into a linked list, making use of the breadcrumbs we left in metadata batches during add_metadata_batch */ - for (i = 0; i < nops; i++) { - grpc_stream_op *op = &ops[i]; - if (op->type != GRPC_OP_METADATA) continue; - found_metadata = 1; - /* we left a breadcrumb indicating where the end of this list is, - and since we add sequentially, we know from the end of the last - segment where this segment begins */ - last_mdidx = (size_t)(gpr_intptr)(op->data.metadata.list.tail); - GPR_ASSERT(last_mdidx > mdidx); - GPR_ASSERT(last_mdidx <= buffer->count); - /* turn the array into a doubly linked list */ - op->data.metadata.list.head = &buffer->elems[mdidx]; - op->data.metadata.list.tail = &buffer->elems[last_mdidx - 1]; - for (j = mdidx + 1; j < last_mdidx; j++) { - buffer->elems[j].prev = &buffer->elems[j - 1]; - buffer->elems[j - 1].next = &buffer->elems[j]; + for (i = 0; i < nops; i++) + { + grpc_stream_op *op = &ops[i]; + if (op->type != GRPC_OP_METADATA) + continue; + found_metadata = 1; + /* we left a breadcrumb indicating where the end of this list is, + and since we add sequentially, we know from the end of the last + segment where this segment begins */ + last_mdidx = (size_t) (gpr_intptr) (op->data.metadata.list.tail); + GPR_ASSERT (last_mdidx > mdidx); + GPR_ASSERT (last_mdidx <= buffer->count); + /* turn the array into a doubly linked list */ + op->data.metadata.list.head = &buffer->elems[mdidx]; + op->data.metadata.list.tail = &buffer->elems[last_mdidx - 1]; + for (j = mdidx + 1; j < last_mdidx; j++) + { + buffer->elems[j].prev = &buffer->elems[j - 1]; + buffer->elems[j - 1].next = &buffer->elems[j]; + } + buffer->elems[mdidx].prev = NULL; + buffer->elems[last_mdidx - 1].next = NULL; + /* track where we're up to */ + mdidx = last_mdidx; } - buffer->elems[mdidx].prev = NULL; - buffer->elems[last_mdidx - 1].next = NULL; - /* track where we're up to */ - mdidx = last_mdidx; - } - if (found_metadata) { - live_op_buffer->elems = buffer->elems; - if (mdidx != buffer->count) { - /* we have a partially read metadata batch still in incoming_metadata */ - size_t new_count = buffer->count - mdidx; - size_t copy_bytes = sizeof(*buffer->elems) * new_count; - GPR_ASSERT(mdidx < buffer->count); - buffer->elems = gpr_malloc(copy_bytes); - memcpy(live_op_buffer->elems + mdidx, buffer->elems, copy_bytes); - buffer->count = buffer->capacity = new_count; - } else { - buffer->elems = NULL; - buffer->count = 0; - buffer->capacity = 0; + if (found_metadata) + { + live_op_buffer->elems = buffer->elems; + if (mdidx != buffer->count) + { + /* we have a partially read metadata batch still in incoming_metadata */ + size_t new_count = buffer->count - mdidx; + size_t copy_bytes = sizeof (*buffer->elems) * new_count; + GPR_ASSERT (mdidx < buffer->count); + buffer->elems = gpr_malloc (copy_bytes); + memcpy (live_op_buffer->elems + mdidx, buffer->elems, copy_bytes); + buffer->count = buffer->capacity = new_count; + } + else + { + buffer->elems = NULL; + buffer->count = 0; + buffer->capacity = 0; + } } - } } diff --git a/src/core/transport/chttp2/incoming_metadata.h b/src/core/transport/chttp2/incoming_metadata.h index 2f1de411bae..7ca0f722c3d 100644 --- a/src/core/transport/chttp2/incoming_metadata.h +++ b/src/core/transport/chttp2/incoming_metadata.h @@ -36,45 +36,36 @@ #include "src/core/transport/transport.h" -typedef struct { +typedef struct +{ grpc_linked_mdelem *elems; size_t count; size_t capacity; gpr_timespec deadline; } grpc_chttp2_incoming_metadata_buffer; -typedef struct { +typedef struct +{ grpc_linked_mdelem *elems; } grpc_chttp2_incoming_metadata_live_op_buffer; /** assumes everything initially zeroed */ -void grpc_chttp2_incoming_metadata_buffer_init( - grpc_chttp2_incoming_metadata_buffer *buffer); -void grpc_chttp2_incoming_metadata_buffer_destroy( - grpc_chttp2_incoming_metadata_buffer *buffer); -void grpc_chttp2_incoming_metadata_buffer_reset( - grpc_chttp2_incoming_metadata_buffer *buffer); +void grpc_chttp2_incoming_metadata_buffer_init (grpc_chttp2_incoming_metadata_buffer * buffer); +void grpc_chttp2_incoming_metadata_buffer_destroy (grpc_chttp2_incoming_metadata_buffer * buffer); +void grpc_chttp2_incoming_metadata_buffer_reset (grpc_chttp2_incoming_metadata_buffer * buffer); -void grpc_chttp2_incoming_metadata_buffer_add( - grpc_chttp2_incoming_metadata_buffer *buffer, grpc_mdelem *elem); -void grpc_chttp2_incoming_metadata_buffer_set_deadline( - grpc_chttp2_incoming_metadata_buffer *buffer, gpr_timespec deadline); +void grpc_chttp2_incoming_metadata_buffer_add (grpc_chttp2_incoming_metadata_buffer * buffer, grpc_mdelem * elem); +void grpc_chttp2_incoming_metadata_buffer_set_deadline (grpc_chttp2_incoming_metadata_buffer * buffer, gpr_timespec deadline); /** extend sopb with a metadata batch; this must be post-processed by grpc_chttp2_incoming_metadata_buffer_postprocess_sopb before being handed out of the transport */ -void grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into( - grpc_chttp2_incoming_metadata_buffer *buffer, grpc_stream_op_buffer *sopb); +void grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into (grpc_chttp2_incoming_metadata_buffer * buffer, grpc_stream_op_buffer * sopb); -void grpc_incoming_metadata_buffer_move_to_referencing_sopb( - grpc_chttp2_incoming_metadata_buffer *src, - grpc_chttp2_incoming_metadata_buffer *dst, grpc_stream_op_buffer *sopb); +void grpc_incoming_metadata_buffer_move_to_referencing_sopb (grpc_chttp2_incoming_metadata_buffer * src, grpc_chttp2_incoming_metadata_buffer * dst, grpc_stream_op_buffer * sopb); -void grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op( - grpc_chttp2_incoming_metadata_buffer *buffer, grpc_stream_op_buffer *sopb, - grpc_chttp2_incoming_metadata_live_op_buffer *live_op_buffer); +void grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op (grpc_chttp2_incoming_metadata_buffer * buffer, grpc_stream_op_buffer * sopb, grpc_chttp2_incoming_metadata_live_op_buffer * live_op_buffer); -void grpc_chttp2_incoming_metadata_live_op_buffer_end( - grpc_chttp2_incoming_metadata_live_op_buffer *live_op_buffer); +void grpc_chttp2_incoming_metadata_live_op_buffer_end (grpc_chttp2_incoming_metadata_live_op_buffer * live_op_buffer); #endif /* GRPC_INTERNAL_CORE_CHTTP2_INCOMING_METADATA_H */ diff --git a/src/core/transport/chttp2/internal.h b/src/core/transport/chttp2/internal.h index 14a6c909ee0..1ef9c1af872 100644 --- a/src/core/transport/chttp2/internal.h +++ b/src/core/transport/chttp2/internal.h @@ -54,7 +54,8 @@ typedef struct grpc_chttp2_stream grpc_chttp2_stream; /* streams are kept in various linked lists depending on what things need to happen to them... this enum labels each list */ -typedef enum { +typedef enum +{ GRPC_CHTTP2_LIST_ALL_STREAMS, GRPC_CHTTP2_LIST_READ_WRITE_STATE_CHANGED, GRPC_CHTTP2_LIST_WRITABLE, @@ -67,11 +68,12 @@ typedef enum { /** streams that are waiting to start because there are too many concurrent streams on the connection */ GRPC_CHTTP2_LIST_WAITING_FOR_CONCURRENCY, - STREAM_LIST_COUNT /* must be last */ + STREAM_LIST_COUNT /* must be last */ } grpc_chttp2_stream_list_id; /* deframer state for the overall http2 stream of bytes */ -typedef enum { +typedef enum +{ /* prefix: one entry per http2 connection prefix byte */ GRPC_DTS_CLIENT_PREFIX_0 = 0, GRPC_DTS_CLIENT_PREFIX_1, @@ -113,7 +115,8 @@ typedef enum { GRPC_DTS_FRAME } grpc_chttp2_deframe_transport_state; -typedef enum { +typedef enum +{ GRPC_WRITE_STATE_OPEN, GRPC_WRITE_STATE_QUEUED_CLOSE, GRPC_WRITE_STATE_SENT_CLOSE @@ -123,24 +126,28 @@ typedef enum { #define GRPC_CHTTP2_WRITING_DATA 1 #define GRPC_CHTTP2_WRITING_WINDOW 2 -typedef enum { +typedef enum +{ GRPC_DONT_SEND_CLOSED = 0, GRPC_SEND_CLOSED, GRPC_SEND_CLOSED_WITH_RST_STREAM } grpc_chttp2_send_closed; -typedef struct { +typedef struct +{ grpc_chttp2_stream *head; grpc_chttp2_stream *tail; } grpc_chttp2_stream_list; -typedef struct { +typedef struct +{ grpc_chttp2_stream *next; grpc_chttp2_stream *prev; } grpc_chttp2_stream_link; /* We keep several sets of connection wide parameters */ -typedef enum { +typedef enum +{ /* The settings our peer has asked for (and we have acked) */ GRPC_PEER_SETTINGS = 0, /* The settings we'd like to have */ @@ -153,14 +160,16 @@ typedef enum { } grpc_chttp2_setting_set; /* Outstanding ping request data */ -typedef struct grpc_chttp2_outstanding_ping { +typedef struct grpc_chttp2_outstanding_ping +{ gpr_uint8 id[8]; grpc_closure *on_recv; struct grpc_chttp2_outstanding_ping *next; struct grpc_chttp2_outstanding_ping *prev; } grpc_chttp2_outstanding_ping; -typedef struct { +typedef struct +{ /** data to write next write */ gpr_slice_buffer qbuf; @@ -204,7 +213,8 @@ typedef struct { gpr_uint32 concurrent_stream_count; } grpc_chttp2_transport_global; -typedef struct { +typedef struct +{ /** data to write now */ gpr_slice_buffer outbuf; /** hpack encoding */ @@ -215,7 +225,8 @@ typedef struct { grpc_closure done_cb; } grpc_chttp2_transport_writing; -struct grpc_chttp2_transport_parsing { +struct grpc_chttp2_transport_parsing +{ /** is this transport a client? (boolean) */ gpr_uint8 is_client; @@ -236,7 +247,8 @@ struct grpc_chttp2_transport_parsing { /** parser for headers */ grpc_chttp2_hpack_parser hpack_parser; /** simple one shot parsers */ - union { + union + { grpc_chttp2_window_update_parser window_update; grpc_chttp2_settings_parser settings; grpc_chttp2_ping_parser ping; @@ -265,10 +277,7 @@ struct grpc_chttp2_transport_parsing { /* active parser */ void *parser_data; grpc_chttp2_stream_parsing *incoming_stream; - grpc_chttp2_parse_error (*parser)( - void *parser_user_data, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list); + grpc_chttp2_parse_error (*parser) (void *parser_user_data, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); /* received settings */ gpr_uint32 settings[GRPC_CHTTP2_NUM_SETTINGS]; @@ -284,8 +293,9 @@ struct grpc_chttp2_transport_parsing { grpc_chttp2_outstanding_ping pings; }; -struct grpc_chttp2_transport { - grpc_transport base; /* must be first */ +struct grpc_chttp2_transport +{ + grpc_transport base; /* must be first */ grpc_endpoint *ep; grpc_mdctx *metadata_context; gpr_refcount refs; @@ -343,10 +353,10 @@ struct grpc_chttp2_transport { publish the accepted server stream */ grpc_chttp2_stream **accepting_stream; - struct { + struct + { /* accept stream callback */ - void (*accept_stream)(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 */ @@ -354,7 +364,8 @@ struct grpc_chttp2_transport { } channel_callback; }; -typedef struct { +typedef struct +{ /** HTTP2 stream id for this stream, or zero if one has not been assigned */ gpr_uint32 id; @@ -410,7 +421,8 @@ typedef struct { grpc_chttp2_incoming_metadata_live_op_buffer outstanding_metadata; } grpc_chttp2_stream_global; -typedef struct { +typedef struct +{ /** HTTP2 stream id for this stream, or zero if one has not been assigned */ gpr_uint32 id; /** sops that have passed flow control to be written */ @@ -421,7 +433,8 @@ typedef struct { gpr_uint32 announce_window; } grpc_chttp2_stream_writing; -struct grpc_chttp2_stream_parsing { +struct grpc_chttp2_stream_parsing +{ /** HTTP2 stream id for this stream, or zero if one has not been assigned */ gpr_uint32 id; /** has this stream received a close */ @@ -443,7 +456,8 @@ struct grpc_chttp2_stream_parsing { grpc_chttp2_incoming_metadata_buffer incoming_metadata; }; -struct grpc_chttp2_stream { +struct grpc_chttp2_stream +{ grpc_chttp2_stream_global global; grpc_chttp2_stream_writing writing; grpc_chttp2_stream_parsing parsing; @@ -465,140 +479,71 @@ struct grpc_chttp2_stream { /** Someone is unlocking the transport mutex: check to see if writes are required, and schedule them if so */ -int grpc_chttp2_unlocking_check_writes(grpc_chttp2_transport_global *global, - grpc_chttp2_transport_writing *writing); -void grpc_chttp2_perform_writes( - grpc_chttp2_transport_writing *transport_writing, grpc_endpoint *endpoint, - grpc_closure_list *closure_list); -void grpc_chttp2_terminate_writing(void *transport_writing, int success, - grpc_closure_list *closure_list); -void grpc_chttp2_cleanup_writing(grpc_chttp2_transport_global *global, - grpc_chttp2_transport_writing *writing, - grpc_closure_list *closure_list); - -void grpc_chttp2_prepare_to_read(grpc_chttp2_transport_global *global, - grpc_chttp2_transport_parsing *parsing); +int grpc_chttp2_unlocking_check_writes (grpc_chttp2_transport_global * global, grpc_chttp2_transport_writing * writing); +void grpc_chttp2_perform_writes (grpc_chttp2_transport_writing * transport_writing, grpc_endpoint * endpoint, grpc_closure_list * closure_list); +void grpc_chttp2_terminate_writing (void *transport_writing, int success, grpc_closure_list * closure_list); +void grpc_chttp2_cleanup_writing (grpc_chttp2_transport_global * global, grpc_chttp2_transport_writing * writing, grpc_closure_list * closure_list); + +void grpc_chttp2_prepare_to_read (grpc_chttp2_transport_global * global, grpc_chttp2_transport_parsing * parsing); /** 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 */ -int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, - gpr_slice slice, grpc_closure_list *closure_list); -void grpc_chttp2_publish_reads(grpc_chttp2_transport_global *global, - grpc_chttp2_transport_parsing *parsing, - grpc_closure_list *closure_list); +int grpc_chttp2_perform_read (grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice, grpc_closure_list * closure_list); +void grpc_chttp2_publish_reads (grpc_chttp2_transport_global * global, grpc_chttp2_transport_parsing * parsing, grpc_closure_list * closure_list); /** Get a writable stream returns non-zero if there was a stream available */ -void grpc_chttp2_list_add_writable_stream( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global); -void grpc_chttp2_list_add_first_writable_stream( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global); -int grpc_chttp2_list_pop_writable_stream( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_transport_writing *transport_writing, - grpc_chttp2_stream_global **stream_global, - grpc_chttp2_stream_writing **stream_writing); -void grpc_chttp2_list_remove_writable_stream( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global); - -void grpc_chttp2_list_add_incoming_window_updated( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global); -int grpc_chttp2_list_pop_incoming_window_updated( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_global **stream_global, - grpc_chttp2_stream_parsing **stream_parsing); -void grpc_chttp2_list_remove_incoming_window_updated( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global); - -void grpc_chttp2_list_add_writing_stream( - grpc_chttp2_transport_writing *transport_writing, - grpc_chttp2_stream_writing *stream_writing); -int grpc_chttp2_list_have_writing_streams( - grpc_chttp2_transport_writing *transport_writing); -int grpc_chttp2_list_pop_writing_stream( - grpc_chttp2_transport_writing *transport_writing, - grpc_chttp2_stream_writing **stream_writing); - -void grpc_chttp2_list_add_written_stream( - grpc_chttp2_transport_writing *transport_writing, - grpc_chttp2_stream_writing *stream_writing); -int grpc_chttp2_list_pop_written_stream( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_transport_writing *transport_writing, - grpc_chttp2_stream_global **stream_global, - grpc_chttp2_stream_writing **stream_writing); - -void grpc_chttp2_list_add_parsing_seen_stream( - grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing); -int grpc_chttp2_list_pop_parsing_seen_stream( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_global **stream_global, - grpc_chttp2_stream_parsing **stream_parsing); - -void grpc_chttp2_list_add_waiting_for_concurrency( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global); -int grpc_chttp2_list_pop_waiting_for_concurrency( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global **stream_global); - -void grpc_chttp2_list_add_closed_waiting_for_parsing( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global); -int grpc_chttp2_list_pop_closed_waiting_for_parsing( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global **stream_global); - -void grpc_chttp2_list_add_cancelled_waiting_for_writing( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global); -int grpc_chttp2_list_pop_cancelled_waiting_for_writing( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global **stream_global); - -void grpc_chttp2_list_add_read_write_state_changed( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global); -int grpc_chttp2_list_pop_read_write_state_changed( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global **stream_global); - -grpc_chttp2_stream_parsing *grpc_chttp2_parsing_lookup_stream( - grpc_chttp2_transport_parsing *transport_parsing, gpr_uint32 id); -grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream( - grpc_chttp2_transport_parsing *transport_parsing, gpr_uint32 id); - -void grpc_chttp2_add_incoming_goaway( - grpc_chttp2_transport_global *transport_global, gpr_uint32 goaway_error, - gpr_slice goaway_text, grpc_closure_list *closure_list); - -void grpc_chttp2_register_stream(grpc_chttp2_transport *t, - grpc_chttp2_stream *s); +void grpc_chttp2_list_add_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); +void grpc_chttp2_list_add_first_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); +int grpc_chttp2_list_pop_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_writing ** stream_writing); +void grpc_chttp2_list_remove_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); + +void grpc_chttp2_list_add_incoming_window_updated (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); +int grpc_chttp2_list_pop_incoming_window_updated (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_parsing ** stream_parsing); +void grpc_chttp2_list_remove_incoming_window_updated (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); + +void grpc_chttp2_list_add_writing_stream (grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_writing * stream_writing); +int grpc_chttp2_list_have_writing_streams (grpc_chttp2_transport_writing * transport_writing); +int grpc_chttp2_list_pop_writing_stream (grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_writing ** stream_writing); + +void grpc_chttp2_list_add_written_stream (grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_writing * stream_writing); +int grpc_chttp2_list_pop_written_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_writing ** stream_writing); + +void grpc_chttp2_list_add_parsing_seen_stream (grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing); +int grpc_chttp2_list_pop_parsing_seen_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_parsing ** stream_parsing); + +void grpc_chttp2_list_add_waiting_for_concurrency (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); +int grpc_chttp2_list_pop_waiting_for_concurrency (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global); + +void grpc_chttp2_list_add_closed_waiting_for_parsing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); +int grpc_chttp2_list_pop_closed_waiting_for_parsing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global); + +void grpc_chttp2_list_add_cancelled_waiting_for_writing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); +int grpc_chttp2_list_pop_cancelled_waiting_for_writing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global); + +void grpc_chttp2_list_add_read_write_state_changed (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); +int grpc_chttp2_list_pop_read_write_state_changed (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global); + +grpc_chttp2_stream_parsing *grpc_chttp2_parsing_lookup_stream (grpc_chttp2_transport_parsing * transport_parsing, gpr_uint32 id); +grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream (grpc_chttp2_transport_parsing * transport_parsing, gpr_uint32 id); + +void grpc_chttp2_add_incoming_goaway (grpc_chttp2_transport_global * transport_global, gpr_uint32 goaway_error, gpr_slice goaway_text, grpc_closure_list * closure_list); + +void grpc_chttp2_register_stream (grpc_chttp2_transport * t, grpc_chttp2_stream * s); /* returns 1 if this is the last stream, 0 otherwise */ -int grpc_chttp2_unregister_stream(grpc_chttp2_transport *t, - grpc_chttp2_stream *s) GRPC_MUST_USE_RESULT; -int grpc_chttp2_has_streams(grpc_chttp2_transport *t); -void grpc_chttp2_for_all_streams( - grpc_chttp2_transport_global *transport_global, void *user_data, - void (*cb)(grpc_chttp2_transport_global *transport_global, void *user_data, - grpc_chttp2_stream_global *stream_global)); +int +grpc_chttp2_unregister_stream (grpc_chttp2_transport * t, grpc_chttp2_stream * s) + GRPC_MUST_USE_RESULT; + int grpc_chttp2_has_streams (grpc_chttp2_transport * t); + void grpc_chttp2_for_all_streams (grpc_chttp2_transport_global * transport_global, void *user_data, void (*cb) (grpc_chttp2_transport_global * transport_global, void *user_data, grpc_chttp2_stream_global * stream_global)); -void grpc_chttp2_parsing_become_skip_parser( - grpc_chttp2_transport_parsing *transport_parsing); + void grpc_chttp2_parsing_become_skip_parser (grpc_chttp2_transport_parsing * transport_parsing); #define GRPC_CHTTP2_CLIENT_CONNECT_STRING "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" #define GRPC_CHTTP2_CLIENT_CONNECT_STRLEN \ (sizeof(GRPC_CHTTP2_CLIENT_CONNECT_STRING) - 1) -extern int grpc_http_trace; -extern int grpc_flowctl_trace; + extern int grpc_http_trace; + extern int grpc_flowctl_trace; #define GRPC_CHTTP2_IF_TRACING(stmt) \ if (!(grpc_http_trace)) \ @@ -623,9 +568,6 @@ extern int grpc_flowctl_trace; (gpr_int64)(context->var), (gpr_int64)(delta)); \ } -void grpc_chttp2_flowctl_trace(const char *file, int line, const char *reason, - const char *context, const char *var, - int is_client, gpr_uint32 stream_id, - gpr_int64 current_value, gpr_int64 delta); + void grpc_chttp2_flowctl_trace (const char *file, int line, const char *reason, const char *context, const char *var, int is_client, gpr_uint32 stream_id, gpr_int64 current_value, gpr_int64 delta); #endif diff --git a/src/core/transport/chttp2/parsing.c b/src/core/transport/chttp2/parsing.c index f6ce35f9acc..944066eab39 100644 --- a/src/core/transport/chttp2/parsing.c +++ b/src/core/transport/chttp2/parsing.c @@ -42,58 +42,46 @@ #include #include -static int init_frame_parser(grpc_chttp2_transport_parsing *transport_parsing); -static int init_header_frame_parser( - grpc_chttp2_transport_parsing *transport_parsing, int is_continuation); -static int init_data_frame_parser( - grpc_chttp2_transport_parsing *transport_parsing); -static int init_rst_stream_parser( - grpc_chttp2_transport_parsing *transport_parsing); -static int init_settings_frame_parser( - grpc_chttp2_transport_parsing *transport_parsing); -static int init_window_update_frame_parser( - grpc_chttp2_transport_parsing *transport_parsing); -static int init_ping_parser(grpc_chttp2_transport_parsing *transport_parsing); -static int init_goaway_parser(grpc_chttp2_transport_parsing *transport_parsing); -static int init_skip_frame_parser( - grpc_chttp2_transport_parsing *transport_parsing, int is_header); - -static int parse_frame_slice(grpc_chttp2_transport_parsing *transport_parsing, - gpr_slice slice, int is_last, - grpc_closure_list *closure_list); - -void grpc_chttp2_prepare_to_read( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_transport_parsing *transport_parsing) { +static int init_frame_parser (grpc_chttp2_transport_parsing * transport_parsing); +static int init_header_frame_parser (grpc_chttp2_transport_parsing * transport_parsing, int is_continuation); +static int init_data_frame_parser (grpc_chttp2_transport_parsing * transport_parsing); +static int init_rst_stream_parser (grpc_chttp2_transport_parsing * transport_parsing); +static int init_settings_frame_parser (grpc_chttp2_transport_parsing * transport_parsing); +static int init_window_update_frame_parser (grpc_chttp2_transport_parsing * transport_parsing); +static int init_ping_parser (grpc_chttp2_transport_parsing * transport_parsing); +static int init_goaway_parser (grpc_chttp2_transport_parsing * transport_parsing); +static int init_skip_frame_parser (grpc_chttp2_transport_parsing * transport_parsing, int is_header); + +static int parse_frame_slice (grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); + +void +grpc_chttp2_prepare_to_read (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing) +{ grpc_chttp2_stream_global *stream_global; grpc_chttp2_stream_parsing *stream_parsing; transport_parsing->next_stream_id = transport_global->next_stream_id; /* update the parsing view of incoming window */ - if (transport_parsing->incoming_window != transport_global->incoming_window) { - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT( - "parse", transport_parsing, incoming_window, - (gpr_int64)transport_global->incoming_window - - (gpr_int64)transport_parsing->incoming_window); - transport_parsing->incoming_window = transport_global->incoming_window; - } - while (grpc_chttp2_list_pop_incoming_window_updated( - transport_global, transport_parsing, &stream_global, &stream_parsing)) { - stream_parsing->id = stream_global->id; - if (stream_parsing->incoming_window != stream_global->incoming_window) { - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( - "parse", transport_parsing, stream_parsing, incoming_window, - (gpr_int64)stream_global->incoming_window - - (gpr_int64)stream_parsing->incoming_window); - stream_parsing->incoming_window = stream_global->incoming_window; - } - } + if (transport_parsing->incoming_window != transport_global->incoming_window) + { + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("parse", transport_parsing, incoming_window, (gpr_int64) transport_global->incoming_window - (gpr_int64) transport_parsing->incoming_window); + transport_parsing->incoming_window = transport_global->incoming_window; + } + while (grpc_chttp2_list_pop_incoming_window_updated (transport_global, transport_parsing, &stream_global, &stream_parsing)) + { + stream_parsing->id = stream_global->id; + if (stream_parsing->incoming_window != stream_global->incoming_window) + { + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("parse", transport_parsing, stream_parsing, incoming_window, (gpr_int64) stream_global->incoming_window - (gpr_int64) stream_parsing->incoming_window); + stream_parsing->incoming_window = stream_global->incoming_window; + } + } } -void grpc_chttp2_publish_reads(grpc_chttp2_transport_global *transport_global, - grpc_chttp2_transport_parsing *transport_parsing, - grpc_closure_list *closure_list) { +void +grpc_chttp2_publish_reads (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing, grpc_closure_list * closure_list) +{ grpc_chttp2_stream_global *stream_global; grpc_chttp2_stream_parsing *stream_parsing; @@ -105,145 +93,126 @@ void grpc_chttp2_publish_reads(grpc_chttp2_transport_global *transport_global, ID. So, since we don't have server pushed streams, client should send GOAWAY last-grpc_chttp2_stream-id=0 in this case. */ - if (!transport_parsing->is_client) { - transport_global->last_incoming_stream_id = - transport_parsing->incoming_stream_id; - } + if (!transport_parsing->is_client) + { + transport_global->last_incoming_stream_id = transport_parsing->incoming_stream_id; + } /* copy parsing qbuf to global qbuf */ - gpr_slice_buffer_move_into(&transport_parsing->qbuf, &transport_global->qbuf); + gpr_slice_buffer_move_into (&transport_parsing->qbuf, &transport_global->qbuf); /* update global settings */ - if (transport_parsing->settings_updated) { - memcpy(transport_global->settings[GRPC_PEER_SETTINGS], - transport_parsing->settings, sizeof(transport_parsing->settings)); - transport_parsing->settings_updated = 0; - } + if (transport_parsing->settings_updated) + { + memcpy (transport_global->settings[GRPC_PEER_SETTINGS], transport_parsing->settings, sizeof (transport_parsing->settings)); + transport_parsing->settings_updated = 0; + } /* update settings based on ack if received */ - if (transport_parsing->settings_ack_received) { - memcpy(transport_global->settings[GRPC_ACKED_SETTINGS], - transport_global->settings[GRPC_SENT_SETTINGS], - GRPC_CHTTP2_NUM_SETTINGS * sizeof(gpr_uint32)); - transport_parsing->settings_ack_received = 0; - } + if (transport_parsing->settings_ack_received) + { + memcpy (transport_global->settings[GRPC_ACKED_SETTINGS], transport_global->settings[GRPC_SENT_SETTINGS], GRPC_CHTTP2_NUM_SETTINGS * sizeof (gpr_uint32)); + transport_parsing->settings_ack_received = 0; + } /* move goaway to the global state if we received one (it will be published later */ - if (transport_parsing->goaway_received) { - grpc_chttp2_add_incoming_goaway( - transport_global, (gpr_uint32)transport_parsing->goaway_error, - transport_parsing->goaway_text, closure_list); - transport_parsing->goaway_text = gpr_empty_slice(); - transport_parsing->goaway_received = 0; - } + if (transport_parsing->goaway_received) + { + grpc_chttp2_add_incoming_goaway (transport_global, (gpr_uint32) transport_parsing->goaway_error, transport_parsing->goaway_text, closure_list); + transport_parsing->goaway_text = gpr_empty_slice (); + transport_parsing->goaway_received = 0; + } /* propagate flow control tokens to global state */ - if (transport_parsing->outgoing_window_update) { - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT( - "parsed", transport_global, outgoing_window, - transport_parsing->outgoing_window_update); - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT( - "parsed", transport_parsing, outgoing_window_update, - -(gpr_int64)transport_parsing->outgoing_window_update); - transport_global->outgoing_window += - transport_parsing->outgoing_window_update; - transport_parsing->outgoing_window_update = 0; - } - - if (transport_parsing->incoming_window_delta) { - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT( - "parsed", transport_global, incoming_window, - -(gpr_int64)transport_parsing->incoming_window_delta); - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT( - "parsed", transport_parsing, incoming_window_delta, - -(gpr_int64)transport_parsing->incoming_window_delta); - transport_global->incoming_window -= - transport_parsing->incoming_window_delta; - transport_parsing->incoming_window_delta = 0; - } + if (transport_parsing->outgoing_window_update) + { + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("parsed", transport_global, outgoing_window, transport_parsing->outgoing_window_update); + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("parsed", transport_parsing, outgoing_window_update, -(gpr_int64) transport_parsing->outgoing_window_update); + transport_global->outgoing_window += transport_parsing->outgoing_window_update; + transport_parsing->outgoing_window_update = 0; + } + + if (transport_parsing->incoming_window_delta) + { + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("parsed", transport_global, incoming_window, -(gpr_int64) transport_parsing->incoming_window_delta); + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("parsed", transport_parsing, incoming_window_delta, -(gpr_int64) transport_parsing->incoming_window_delta); + transport_global->incoming_window -= transport_parsing->incoming_window_delta; + transport_parsing->incoming_window_delta = 0; + } /* for each stream that saw an update, fixup global state */ - while (grpc_chttp2_list_pop_parsing_seen_stream( - transport_global, transport_parsing, &stream_global, &stream_parsing)) { - /* update incoming flow control window */ - if (stream_parsing->incoming_window_delta) { - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( - "parsed", transport_parsing, stream_global, incoming_window, - -(gpr_int64)stream_parsing->incoming_window_delta); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( - "parsed", transport_parsing, stream_parsing, incoming_window_delta, - -(gpr_int64)stream_parsing->incoming_window_delta); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( - "parsed", transport_parsing, stream_global, max_recv_bytes, - -(gpr_int64)stream_parsing->incoming_window_delta); - stream_global->incoming_window -= stream_parsing->incoming_window_delta; - GPR_ASSERT(stream_global->max_recv_bytes >= - stream_parsing->incoming_window_delta); - stream_global->max_recv_bytes -= stream_parsing->incoming_window_delta; - stream_parsing->incoming_window_delta = 0; - grpc_chttp2_list_add_writable_stream(transport_global, stream_global); - } - - /* update outgoing flow control window */ - if (stream_parsing->outgoing_window_update) { - int was_zero = stream_global->outgoing_window <= 0; - int is_zero; - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM("parsed", transport_parsing, - stream_global, outgoing_window, - stream_parsing->outgoing_window_update); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( - "parsed", transport_parsing, stream_parsing, outgoing_window_update, - -(gpr_int64)stream_parsing->outgoing_window_update); - GPR_ASSERT(stream_parsing->outgoing_window_update <= GPR_UINT32_MAX); - stream_global->outgoing_window += - (gpr_uint32)stream_parsing->outgoing_window_update; - stream_parsing->outgoing_window_update = 0; - is_zero = stream_global->outgoing_window <= 0; - if (was_zero && !is_zero) { - grpc_chttp2_list_add_writable_stream(transport_global, stream_global); - } - } - - /* updating closed status */ - if (stream_parsing->received_close) { - stream_global->read_closed = 1; - grpc_chttp2_list_add_read_write_state_changed(transport_global, - stream_global); - } - if (stream_parsing->saw_rst_stream) { - stream_global->cancelled = 1; - stream_global->cancelled_status = grpc_chttp2_http2_error_to_grpc_status( - (grpc_chttp2_error_code)stream_parsing->rst_stream_reason); - if (stream_parsing->rst_stream_reason == GRPC_CHTTP2_NO_ERROR) { - stream_global->published_cancelled = 1; - } - grpc_chttp2_list_add_read_write_state_changed(transport_global, - stream_global); - } - - /* publish incoming stream ops */ - if (stream_parsing->data_parser.incoming_sopb.nops > 0) { - grpc_incoming_metadata_buffer_move_to_referencing_sopb( - &stream_parsing->incoming_metadata, &stream_global->incoming_metadata, - &stream_parsing->data_parser.incoming_sopb); - grpc_sopb_move_to(&stream_parsing->data_parser.incoming_sopb, - &stream_global->incoming_sopb); - grpc_chttp2_list_add_read_write_state_changed(transport_global, - stream_global); - } - } + while (grpc_chttp2_list_pop_parsing_seen_stream (transport_global, transport_parsing, &stream_global, &stream_parsing)) + { + /* update incoming flow control window */ + if (stream_parsing->incoming_window_delta) + { + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("parsed", transport_parsing, stream_global, incoming_window, -(gpr_int64) stream_parsing->incoming_window_delta); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("parsed", transport_parsing, stream_parsing, incoming_window_delta, -(gpr_int64) stream_parsing->incoming_window_delta); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("parsed", transport_parsing, stream_global, max_recv_bytes, -(gpr_int64) stream_parsing->incoming_window_delta); + stream_global->incoming_window -= stream_parsing->incoming_window_delta; + GPR_ASSERT (stream_global->max_recv_bytes >= stream_parsing->incoming_window_delta); + stream_global->max_recv_bytes -= stream_parsing->incoming_window_delta; + stream_parsing->incoming_window_delta = 0; + grpc_chttp2_list_add_writable_stream (transport_global, stream_global); + } + + /* update outgoing flow control window */ + if (stream_parsing->outgoing_window_update) + { + int was_zero = stream_global->outgoing_window <= 0; + int is_zero; + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("parsed", transport_parsing, stream_global, outgoing_window, stream_parsing->outgoing_window_update); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("parsed", transport_parsing, stream_parsing, outgoing_window_update, -(gpr_int64) stream_parsing->outgoing_window_update); + GPR_ASSERT (stream_parsing->outgoing_window_update <= GPR_UINT32_MAX); + stream_global->outgoing_window += (gpr_uint32) stream_parsing->outgoing_window_update; + stream_parsing->outgoing_window_update = 0; + is_zero = stream_global->outgoing_window <= 0; + if (was_zero && !is_zero) + { + grpc_chttp2_list_add_writable_stream (transport_global, stream_global); + } + } + + /* updating closed status */ + if (stream_parsing->received_close) + { + stream_global->read_closed = 1; + grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); + } + if (stream_parsing->saw_rst_stream) + { + stream_global->cancelled = 1; + stream_global->cancelled_status = grpc_chttp2_http2_error_to_grpc_status ((grpc_chttp2_error_code) stream_parsing->rst_stream_reason); + if (stream_parsing->rst_stream_reason == GRPC_CHTTP2_NO_ERROR) + { + stream_global->published_cancelled = 1; + } + grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); + } + + /* publish incoming stream ops */ + if (stream_parsing->data_parser.incoming_sopb.nops > 0) + { + grpc_incoming_metadata_buffer_move_to_referencing_sopb (&stream_parsing->incoming_metadata, &stream_global->incoming_metadata, &stream_parsing->data_parser.incoming_sopb); + grpc_sopb_move_to (&stream_parsing->data_parser.incoming_sopb, &stream_global->incoming_sopb); + grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); + } + } } -int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, - gpr_slice slice, grpc_closure_list *closure_list) { - gpr_uint8 *beg = GPR_SLICE_START_PTR(slice); - gpr_uint8 *end = GPR_SLICE_END_PTR(slice); +int +grpc_chttp2_perform_read (grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice, grpc_closure_list * closure_list) +{ + gpr_uint8 *beg = GPR_SLICE_START_PTR (slice); + gpr_uint8 *end = GPR_SLICE_END_PTR (slice); gpr_uint8 *cur = beg; - if (cur == end) return 1; + if (cur == end) + return 1; - switch (transport_parsing->deframe_state) { + switch (transport_parsing->deframe_state) + { case GRPC_DTS_CLIENT_PREFIX_0: case GRPC_DTS_CLIENT_PREFIX_1: case GRPC_DTS_CLIENT_PREFIX_2: @@ -268,300 +237,294 @@ int grpc_chttp2_perform_read(grpc_chttp2_transport_parsing *transport_parsing, case GRPC_DTS_CLIENT_PREFIX_21: case GRPC_DTS_CLIENT_PREFIX_22: case GRPC_DTS_CLIENT_PREFIX_23: - while (cur != end && transport_parsing->deframe_state != GRPC_DTS_FH_0) { - if (*cur != GRPC_CHTTP2_CLIENT_CONNECT_STRING[transport_parsing - ->deframe_state]) { - gpr_log(GPR_INFO, - "Connect string mismatch: expected '%c' (%d) got '%c' (%d) " - "at byte %d", - GRPC_CHTTP2_CLIENT_CONNECT_STRING[transport_parsing - ->deframe_state], - (int)(gpr_uint8)GRPC_CHTTP2_CLIENT_CONNECT_STRING - [transport_parsing->deframe_state], - *cur, (int)*cur, transport_parsing->deframe_state); - return 0; - } - ++cur; - ++transport_parsing->deframe_state; - } - if (cur == end) { - return 1; - } - /* fallthrough */ + while (cur != end && transport_parsing->deframe_state != GRPC_DTS_FH_0) + { + if (*cur != GRPC_CHTTP2_CLIENT_CONNECT_STRING[transport_parsing->deframe_state]) + { + gpr_log (GPR_INFO, "Connect string mismatch: expected '%c' (%d) got '%c' (%d) " "at byte %d", GRPC_CHTTP2_CLIENT_CONNECT_STRING[transport_parsing->deframe_state], (int) (gpr_uint8) GRPC_CHTTP2_CLIENT_CONNECT_STRING[transport_parsing->deframe_state], *cur, (int) *cur, transport_parsing->deframe_state); + return 0; + } + ++cur; + ++transport_parsing->deframe_state; + } + if (cur == end) + { + return 1; + } + /* fallthrough */ dts_fh_0: case GRPC_DTS_FH_0: - GPR_ASSERT(cur < end); - transport_parsing->incoming_frame_size = ((gpr_uint32)*cur) << 16; - if (++cur == end) { - transport_parsing->deframe_state = GRPC_DTS_FH_1; - return 1; - } - /* fallthrough */ + GPR_ASSERT (cur < end); + transport_parsing->incoming_frame_size = ((gpr_uint32) * cur) << 16; + if (++cur == end) + { + transport_parsing->deframe_state = GRPC_DTS_FH_1; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_1: - GPR_ASSERT(cur < end); - transport_parsing->incoming_frame_size |= ((gpr_uint32)*cur) << 8; - if (++cur == end) { - transport_parsing->deframe_state = GRPC_DTS_FH_2; - return 1; - } - /* fallthrough */ + GPR_ASSERT (cur < end); + transport_parsing->incoming_frame_size |= ((gpr_uint32) * cur) << 8; + if (++cur == end) + { + transport_parsing->deframe_state = GRPC_DTS_FH_2; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_2: - GPR_ASSERT(cur < end); + GPR_ASSERT (cur < end); transport_parsing->incoming_frame_size |= *cur; - if (++cur == end) { - transport_parsing->deframe_state = GRPC_DTS_FH_3; - return 1; - } - /* fallthrough */ + if (++cur == end) + { + transport_parsing->deframe_state = GRPC_DTS_FH_3; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_3: - GPR_ASSERT(cur < end); + GPR_ASSERT (cur < end); transport_parsing->incoming_frame_type = *cur; - if (++cur == end) { - transport_parsing->deframe_state = GRPC_DTS_FH_4; - return 1; - } - /* fallthrough */ + if (++cur == end) + { + transport_parsing->deframe_state = GRPC_DTS_FH_4; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_4: - GPR_ASSERT(cur < end); + GPR_ASSERT (cur < end); transport_parsing->incoming_frame_flags = *cur; - if (++cur == end) { - transport_parsing->deframe_state = GRPC_DTS_FH_5; - return 1; - } - /* fallthrough */ + if (++cur == end) + { + transport_parsing->deframe_state = GRPC_DTS_FH_5; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_5: - GPR_ASSERT(cur < end); - transport_parsing->incoming_stream_id = (((gpr_uint32)*cur) & 0x7f) << 24; - if (++cur == end) { - transport_parsing->deframe_state = GRPC_DTS_FH_6; - return 1; - } - /* fallthrough */ + GPR_ASSERT (cur < end); + transport_parsing->incoming_stream_id = (((gpr_uint32) * cur) & 0x7f) << 24; + if (++cur == end) + { + transport_parsing->deframe_state = GRPC_DTS_FH_6; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_6: - GPR_ASSERT(cur < end); - transport_parsing->incoming_stream_id |= ((gpr_uint32)*cur) << 16; - if (++cur == end) { - transport_parsing->deframe_state = GRPC_DTS_FH_7; - return 1; - } - /* fallthrough */ + GPR_ASSERT (cur < end); + transport_parsing->incoming_stream_id |= ((gpr_uint32) * cur) << 16; + if (++cur == end) + { + transport_parsing->deframe_state = GRPC_DTS_FH_7; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_7: - GPR_ASSERT(cur < end); - transport_parsing->incoming_stream_id |= ((gpr_uint32)*cur) << 8; - if (++cur == end) { - transport_parsing->deframe_state = GRPC_DTS_FH_8; - return 1; - } - /* fallthrough */ + GPR_ASSERT (cur < end); + transport_parsing->incoming_stream_id |= ((gpr_uint32) * cur) << 8; + if (++cur == end) + { + transport_parsing->deframe_state = GRPC_DTS_FH_8; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_8: - GPR_ASSERT(cur < end); - transport_parsing->incoming_stream_id |= ((gpr_uint32)*cur); + GPR_ASSERT (cur < end); + transport_parsing->incoming_stream_id |= ((gpr_uint32) * cur); transport_parsing->deframe_state = GRPC_DTS_FRAME; - if (!init_frame_parser(transport_parsing)) { - return 0; - } - if (transport_parsing->incoming_stream_id) { - transport_parsing->last_incoming_stream_id = - transport_parsing->incoming_stream_id; - } - if (transport_parsing->incoming_frame_size == 0) { - if (!parse_frame_slice(transport_parsing, gpr_empty_slice(), 1, - closure_list)) { - return 0; - } - transport_parsing->incoming_stream = NULL; - if (++cur == end) { - transport_parsing->deframe_state = GRPC_DTS_FH_0; - return 1; - } - goto dts_fh_0; /* loop */ - } - if (++cur == end) { - return 1; - } - /* fallthrough */ + if (!init_frame_parser (transport_parsing)) + { + return 0; + } + if (transport_parsing->incoming_stream_id) + { + transport_parsing->last_incoming_stream_id = transport_parsing->incoming_stream_id; + } + if (transport_parsing->incoming_frame_size == 0) + { + if (!parse_frame_slice (transport_parsing, gpr_empty_slice (), 1, closure_list)) + { + return 0; + } + transport_parsing->incoming_stream = NULL; + if (++cur == end) + { + transport_parsing->deframe_state = GRPC_DTS_FH_0; + return 1; + } + goto dts_fh_0; /* loop */ + } + if (++cur == end) + { + return 1; + } + /* fallthrough */ case GRPC_DTS_FRAME: - GPR_ASSERT(cur < end); - if ((gpr_uint32)(end - cur) == transport_parsing->incoming_frame_size) { - if (!parse_frame_slice(transport_parsing, - gpr_slice_sub_no_ref(slice, (size_t)(cur - beg), - (size_t)(end - beg)), - 1, closure_list)) { - return 0; - } - transport_parsing->deframe_state = GRPC_DTS_FH_0; - transport_parsing->incoming_stream = NULL; - return 1; - } else if ((gpr_uint32)(end - cur) > - transport_parsing->incoming_frame_size) { - size_t cur_offset = (size_t)(cur - beg); - if (!parse_frame_slice( - transport_parsing, - gpr_slice_sub_no_ref( - slice, cur_offset, - cur_offset + transport_parsing->incoming_frame_size), - 1, closure_list)) { - return 0; - } - cur += transport_parsing->incoming_frame_size; - transport_parsing->incoming_stream = NULL; - goto dts_fh_0; /* loop */ - } else { - if (!parse_frame_slice(transport_parsing, - gpr_slice_sub_no_ref(slice, (size_t)(cur - beg), - (size_t)(end - beg)), - 0, closure_list)) { - return 0; - } - transport_parsing->incoming_frame_size -= (gpr_uint32)(end - cur); - return 1; - } - gpr_log(GPR_ERROR, "should never reach here"); - abort(); - } - - gpr_log(GPR_ERROR, "should never reach here"); - abort(); + GPR_ASSERT (cur < end); + if ((gpr_uint32) (end - cur) == transport_parsing->incoming_frame_size) + { + if (!parse_frame_slice (transport_parsing, gpr_slice_sub_no_ref (slice, (size_t) (cur - beg), (size_t) (end - beg)), 1, closure_list)) + { + return 0; + } + transport_parsing->deframe_state = GRPC_DTS_FH_0; + transport_parsing->incoming_stream = NULL; + return 1; + } + else if ((gpr_uint32) (end - cur) > transport_parsing->incoming_frame_size) + { + size_t cur_offset = (size_t) (cur - beg); + if (!parse_frame_slice (transport_parsing, gpr_slice_sub_no_ref (slice, cur_offset, cur_offset + transport_parsing->incoming_frame_size), 1, closure_list)) + { + return 0; + } + cur += transport_parsing->incoming_frame_size; + transport_parsing->incoming_stream = NULL; + goto dts_fh_0; /* loop */ + } + else + { + if (!parse_frame_slice (transport_parsing, gpr_slice_sub_no_ref (slice, (size_t) (cur - beg), (size_t) (end - beg)), 0, closure_list)) + { + return 0; + } + transport_parsing->incoming_frame_size -= (gpr_uint32) (end - cur); + return 1; + } + gpr_log (GPR_ERROR, "should never reach here"); + abort (); + } + + gpr_log (GPR_ERROR, "should never reach here"); + abort (); return 0; } -static int init_frame_parser(grpc_chttp2_transport_parsing *transport_parsing) { - if (transport_parsing->expect_continuation_stream_id != 0) { - if (transport_parsing->incoming_frame_type != - GRPC_CHTTP2_FRAME_CONTINUATION) { - gpr_log(GPR_ERROR, "Expected CONTINUATION frame, got frame type %02x", - transport_parsing->incoming_frame_type); - return 0; - } - if (transport_parsing->expect_continuation_stream_id != - transport_parsing->incoming_stream_id) { - gpr_log(GPR_ERROR, - "Expected CONTINUATION frame for grpc_chttp2_stream %08x, got " - "grpc_chttp2_stream %08x", - transport_parsing->expect_continuation_stream_id, - transport_parsing->incoming_stream_id); - return 0; +static int +init_frame_parser (grpc_chttp2_transport_parsing * transport_parsing) +{ + if (transport_parsing->expect_continuation_stream_id != 0) + { + if (transport_parsing->incoming_frame_type != GRPC_CHTTP2_FRAME_CONTINUATION) + { + gpr_log (GPR_ERROR, "Expected CONTINUATION frame, got frame type %02x", transport_parsing->incoming_frame_type); + return 0; + } + if (transport_parsing->expect_continuation_stream_id != transport_parsing->incoming_stream_id) + { + gpr_log (GPR_ERROR, "Expected CONTINUATION frame for grpc_chttp2_stream %08x, got " "grpc_chttp2_stream %08x", transport_parsing->expect_continuation_stream_id, transport_parsing->incoming_stream_id); + return 0; + } + return init_header_frame_parser (transport_parsing, 1); } - return init_header_frame_parser(transport_parsing, 1); - } - switch (transport_parsing->incoming_frame_type) { + switch (transport_parsing->incoming_frame_type) + { case GRPC_CHTTP2_FRAME_DATA: - return init_data_frame_parser(transport_parsing); + return init_data_frame_parser (transport_parsing); case GRPC_CHTTP2_FRAME_HEADER: - return init_header_frame_parser(transport_parsing, 0); + return init_header_frame_parser (transport_parsing, 0); case GRPC_CHTTP2_FRAME_CONTINUATION: - gpr_log(GPR_ERROR, "Unexpected CONTINUATION frame"); + gpr_log (GPR_ERROR, "Unexpected CONTINUATION frame"); return 0; case GRPC_CHTTP2_FRAME_RST_STREAM: - return init_rst_stream_parser(transport_parsing); + return init_rst_stream_parser (transport_parsing); case GRPC_CHTTP2_FRAME_SETTINGS: - return init_settings_frame_parser(transport_parsing); + return init_settings_frame_parser (transport_parsing); case GRPC_CHTTP2_FRAME_WINDOW_UPDATE: - return init_window_update_frame_parser(transport_parsing); + return init_window_update_frame_parser (transport_parsing); case GRPC_CHTTP2_FRAME_PING: - return init_ping_parser(transport_parsing); + return init_ping_parser (transport_parsing); case GRPC_CHTTP2_FRAME_GOAWAY: - return init_goaway_parser(transport_parsing); + return init_goaway_parser (transport_parsing); default: - gpr_log(GPR_ERROR, "Unknown frame type %02x", - transport_parsing->incoming_frame_type); - return init_skip_frame_parser(transport_parsing, 0); - } + gpr_log (GPR_ERROR, "Unknown frame type %02x", transport_parsing->incoming_frame_type); + return init_skip_frame_parser (transport_parsing, 0); + } } -static grpc_chttp2_parse_error skip_parser( - void *parser, grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last, - grpc_closure_list *closure_list) { +static grpc_chttp2_parse_error +skip_parser (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +{ return GRPC_CHTTP2_PARSE_OK; } -static void skip_header(void *tp, grpc_mdelem *md) { GRPC_MDELEM_UNREF(md); } - -static int init_skip_frame_parser( - grpc_chttp2_transport_parsing *transport_parsing, int is_header) { - if (is_header) { - gpr_uint8 is_eoh = transport_parsing->expect_continuation_stream_id != 0; - transport_parsing->parser = grpc_chttp2_header_parser_parse; - transport_parsing->parser_data = &transport_parsing->hpack_parser; - transport_parsing->hpack_parser.on_header = skip_header; - transport_parsing->hpack_parser.on_header_user_data = NULL; - transport_parsing->hpack_parser.is_boundary = is_eoh; - transport_parsing->hpack_parser.is_eof = - (gpr_uint8)(is_eoh ? transport_parsing->header_eof : 0); - } else { - transport_parsing->parser = skip_parser; - } +static void +skip_header (void *tp, grpc_mdelem * md) +{ + GRPC_MDELEM_UNREF (md); +} + +static int +init_skip_frame_parser (grpc_chttp2_transport_parsing * transport_parsing, int is_header) +{ + if (is_header) + { + gpr_uint8 is_eoh = transport_parsing->expect_continuation_stream_id != 0; + transport_parsing->parser = grpc_chttp2_header_parser_parse; + transport_parsing->parser_data = &transport_parsing->hpack_parser; + transport_parsing->hpack_parser.on_header = skip_header; + transport_parsing->hpack_parser.on_header_user_data = NULL; + transport_parsing->hpack_parser.is_boundary = is_eoh; + transport_parsing->hpack_parser.is_eof = (gpr_uint8) (is_eoh ? transport_parsing->header_eof : 0); + } + else + { + transport_parsing->parser = skip_parser; + } return 1; } -void grpc_chttp2_parsing_become_skip_parser( - grpc_chttp2_transport_parsing *transport_parsing) { - init_skip_frame_parser( - transport_parsing, - transport_parsing->parser == grpc_chttp2_header_parser_parse); +void +grpc_chttp2_parsing_become_skip_parser (grpc_chttp2_transport_parsing * transport_parsing) +{ + init_skip_frame_parser (transport_parsing, transport_parsing->parser == grpc_chttp2_header_parser_parse); } -static grpc_chttp2_parse_error update_incoming_window( - grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing) { - if (transport_parsing->incoming_frame_size > - transport_parsing->incoming_window) { - gpr_log(GPR_ERROR, "frame of size %d overflows incoming window of %d", - transport_parsing->incoming_frame_size, - transport_parsing->incoming_window); - return GRPC_CHTTP2_CONNECTION_ERROR; - } - - if (transport_parsing->incoming_frame_size > - stream_parsing->incoming_window) { - gpr_log(GPR_ERROR, "frame of size %d overflows incoming window of %d", - transport_parsing->incoming_frame_size, - stream_parsing->incoming_window); - return GRPC_CHTTP2_CONNECTION_ERROR; - } - - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT( - "data", transport_parsing, incoming_window, - -(gpr_int64)transport_parsing->incoming_frame_size); - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT("data", transport_parsing, - incoming_window_delta, - transport_parsing->incoming_frame_size); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( - "data", transport_parsing, stream_parsing, incoming_window, - -(gpr_int64)transport_parsing->incoming_frame_size); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM("data", transport_parsing, stream_parsing, - incoming_window_delta, - transport_parsing->incoming_frame_size); +static grpc_chttp2_parse_error +update_incoming_window (grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing) +{ + if (transport_parsing->incoming_frame_size > transport_parsing->incoming_window) + { + gpr_log (GPR_ERROR, "frame of size %d overflows incoming window of %d", transport_parsing->incoming_frame_size, transport_parsing->incoming_window); + return GRPC_CHTTP2_CONNECTION_ERROR; + } + + if (transport_parsing->incoming_frame_size > stream_parsing->incoming_window) + { + gpr_log (GPR_ERROR, "frame of size %d overflows incoming window of %d", transport_parsing->incoming_frame_size, stream_parsing->incoming_window); + return GRPC_CHTTP2_CONNECTION_ERROR; + } + + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("data", transport_parsing, incoming_window, -(gpr_int64) transport_parsing->incoming_frame_size); + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("data", transport_parsing, incoming_window_delta, transport_parsing->incoming_frame_size); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("data", transport_parsing, stream_parsing, incoming_window, -(gpr_int64) transport_parsing->incoming_frame_size); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("data", transport_parsing, stream_parsing, incoming_window_delta, transport_parsing->incoming_frame_size); transport_parsing->incoming_window -= transport_parsing->incoming_frame_size; - transport_parsing->incoming_window_delta += - transport_parsing->incoming_frame_size; + transport_parsing->incoming_window_delta += transport_parsing->incoming_frame_size; stream_parsing->incoming_window -= transport_parsing->incoming_frame_size; - stream_parsing->incoming_window_delta += - transport_parsing->incoming_frame_size; - grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, stream_parsing); + stream_parsing->incoming_window_delta += transport_parsing->incoming_frame_size; + grpc_chttp2_list_add_parsing_seen_stream (transport_parsing, stream_parsing); return GRPC_CHTTP2_PARSE_OK; } -static int init_data_frame_parser( - grpc_chttp2_transport_parsing *transport_parsing) { - grpc_chttp2_stream_parsing *stream_parsing = - grpc_chttp2_parsing_lookup_stream(transport_parsing, - transport_parsing->incoming_stream_id); +static int +init_data_frame_parser (grpc_chttp2_transport_parsing * transport_parsing) +{ + grpc_chttp2_stream_parsing *stream_parsing = grpc_chttp2_parsing_lookup_stream (transport_parsing, + transport_parsing->incoming_stream_id); grpc_chttp2_parse_error err = GRPC_CHTTP2_PARSE_OK; if (!stream_parsing || stream_parsing->received_close) - return init_skip_frame_parser(transport_parsing, 0); - if (err == GRPC_CHTTP2_PARSE_OK) { - err = update_incoming_window(transport_parsing, stream_parsing); - } - if (err == GRPC_CHTTP2_PARSE_OK) { - err = grpc_chttp2_data_parser_begin_frame( - &stream_parsing->data_parser, transport_parsing->incoming_frame_flags); - } - switch (err) { + return init_skip_frame_parser (transport_parsing, 0); + if (err == GRPC_CHTTP2_PARSE_OK) + { + err = update_incoming_window (transport_parsing, stream_parsing); + } + if (err == GRPC_CHTTP2_PARSE_OK) + { + err = grpc_chttp2_data_parser_begin_frame (&stream_parsing->data_parser, transport_parsing->incoming_frame_flags); + } + switch (err) + { case GRPC_CHTTP2_PARSE_OK: transport_parsing->incoming_stream = stream_parsing; transport_parsing->parser = grpc_chttp2_data_parser_parse; @@ -571,215 +534,214 @@ static int init_data_frame_parser( stream_parsing->received_close = 1; stream_parsing->saw_rst_stream = 1; stream_parsing->rst_stream_reason = GRPC_CHTTP2_PROTOCOL_ERROR; - gpr_slice_buffer_add( - &transport_parsing->qbuf, - grpc_chttp2_rst_stream_create(transport_parsing->incoming_stream_id, - GRPC_CHTTP2_PROTOCOL_ERROR)); - return init_skip_frame_parser(transport_parsing, 0); + gpr_slice_buffer_add (&transport_parsing->qbuf, grpc_chttp2_rst_stream_create (transport_parsing->incoming_stream_id, GRPC_CHTTP2_PROTOCOL_ERROR)); + return init_skip_frame_parser (transport_parsing, 0); case GRPC_CHTTP2_CONNECTION_ERROR: return 0; - } - gpr_log(GPR_ERROR, "should never reach here"); - abort(); + } + gpr_log (GPR_ERROR, "should never reach here"); + abort (); return 0; } -static void free_timeout(void *p) { gpr_free(p); } +static void +free_timeout (void *p) +{ + gpr_free (p); +} -static void on_header(void *tp, grpc_mdelem *md) { +static void +on_header (void *tp, grpc_mdelem * md) +{ grpc_chttp2_transport_parsing *transport_parsing = tp; - grpc_chttp2_stream_parsing *stream_parsing = - transport_parsing->incoming_stream; - - GPR_ASSERT(stream_parsing); - - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_INFO, "HTTP:%d:HDR:%s: %s: %s", stream_parsing->id, - transport_parsing->is_client ? "CLI" : "SVR", - grpc_mdstr_as_c_string(md->key), grpc_mdstr_as_c_string(md->value))); - - if (md->key == transport_parsing->str_grpc_timeout) { - gpr_timespec *cached_timeout = grpc_mdelem_get_user_data(md, free_timeout); - if (!cached_timeout) { - /* not already parsed: parse it now, and store the result away */ - cached_timeout = gpr_malloc(sizeof(gpr_timespec)); - if (!grpc_chttp2_decode_timeout(grpc_mdstr_as_c_string(md->value), - cached_timeout)) { - gpr_log(GPR_ERROR, "Ignoring bad timeout value '%s'", - grpc_mdstr_as_c_string(md->value)); - *cached_timeout = gpr_inf_future(GPR_CLOCK_REALTIME); - } - grpc_mdelem_set_user_data(md, free_timeout, cached_timeout); - } - grpc_chttp2_incoming_metadata_buffer_set_deadline( - &stream_parsing->incoming_metadata, - gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), *cached_timeout)); - GRPC_MDELEM_UNREF(md); - } else { - grpc_chttp2_incoming_metadata_buffer_add(&stream_parsing->incoming_metadata, - md); - } - - grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, stream_parsing); + grpc_chttp2_stream_parsing *stream_parsing = transport_parsing->incoming_stream; + + GPR_ASSERT (stream_parsing); + + GRPC_CHTTP2_IF_TRACING (gpr_log (GPR_INFO, "HTTP:%d:HDR:%s: %s: %s", stream_parsing->id, transport_parsing->is_client ? "CLI" : "SVR", grpc_mdstr_as_c_string (md->key), grpc_mdstr_as_c_string (md->value))); + + if (md->key == transport_parsing->str_grpc_timeout) + { + gpr_timespec *cached_timeout = grpc_mdelem_get_user_data (md, free_timeout); + if (!cached_timeout) + { + /* not already parsed: parse it now, and store the result away */ + cached_timeout = gpr_malloc (sizeof (gpr_timespec)); + if (!grpc_chttp2_decode_timeout (grpc_mdstr_as_c_string (md->value), cached_timeout)) + { + gpr_log (GPR_ERROR, "Ignoring bad timeout value '%s'", grpc_mdstr_as_c_string (md->value)); + *cached_timeout = gpr_inf_future (GPR_CLOCK_REALTIME); + } + grpc_mdelem_set_user_data (md, free_timeout, cached_timeout); + } + grpc_chttp2_incoming_metadata_buffer_set_deadline (&stream_parsing->incoming_metadata, gpr_time_add (gpr_now (GPR_CLOCK_MONOTONIC), *cached_timeout)); + GRPC_MDELEM_UNREF (md); + } + else + { + grpc_chttp2_incoming_metadata_buffer_add (&stream_parsing->incoming_metadata, md); + } + + grpc_chttp2_list_add_parsing_seen_stream (transport_parsing, stream_parsing); } -static int init_header_frame_parser( - grpc_chttp2_transport_parsing *transport_parsing, int is_continuation) { - gpr_uint8 is_eoh = (transport_parsing->incoming_frame_flags & - GRPC_CHTTP2_DATA_FLAG_END_HEADERS) != 0; +static int +init_header_frame_parser (grpc_chttp2_transport_parsing * transport_parsing, int is_continuation) +{ + gpr_uint8 is_eoh = (transport_parsing->incoming_frame_flags & GRPC_CHTTP2_DATA_FLAG_END_HEADERS) != 0; int via_accept = 0; grpc_chttp2_stream_parsing *stream_parsing; - if (is_eoh) { - transport_parsing->expect_continuation_stream_id = 0; - } else { - transport_parsing->expect_continuation_stream_id = - transport_parsing->incoming_stream_id; - } + if (is_eoh) + { + transport_parsing->expect_continuation_stream_id = 0; + } + else + { + transport_parsing->expect_continuation_stream_id = transport_parsing->incoming_stream_id; + } - if (!is_continuation) { - transport_parsing->header_eof = (transport_parsing->incoming_frame_flags & - GRPC_CHTTP2_DATA_FLAG_END_STREAM) != 0; - } + if (!is_continuation) + { + transport_parsing->header_eof = (transport_parsing->incoming_frame_flags & GRPC_CHTTP2_DATA_FLAG_END_STREAM) != 0; + } /* could be a new grpc_chttp2_stream or an existing grpc_chttp2_stream */ - stream_parsing = grpc_chttp2_parsing_lookup_stream( - transport_parsing, transport_parsing->incoming_stream_id); - if (stream_parsing == NULL) { - if (is_continuation) { - gpr_log(GPR_ERROR, - "grpc_chttp2_stream disbanded before CONTINUATION received"); - return init_skip_frame_parser(transport_parsing, 1); - } - if (transport_parsing->is_client) { - if ((transport_parsing->incoming_stream_id & 1) && - transport_parsing->incoming_stream_id < - transport_parsing->next_stream_id) { - /* this is an old (probably cancelled) grpc_chttp2_stream */ - } else { - gpr_log(GPR_ERROR, - "ignoring new grpc_chttp2_stream creation on client"); - } - return init_skip_frame_parser(transport_parsing, 1); - } else if (transport_parsing->last_incoming_stream_id > - transport_parsing->incoming_stream_id) { - gpr_log(GPR_ERROR, - "ignoring out of order new grpc_chttp2_stream request on server; " - "last grpc_chttp2_stream " - "id=%d, new grpc_chttp2_stream id=%d", - transport_parsing->last_incoming_stream_id, - transport_parsing->incoming_stream_id); - return init_skip_frame_parser(transport_parsing, 1); - } else if ((transport_parsing->incoming_stream_id & 1) == 0) { - gpr_log(GPR_ERROR, - "ignoring grpc_chttp2_stream with non-client generated index %d", - transport_parsing->incoming_stream_id); - return init_skip_frame_parser(transport_parsing, 1); - } - stream_parsing = transport_parsing->incoming_stream = - grpc_chttp2_parsing_accept_stream( - transport_parsing, transport_parsing->incoming_stream_id); - if (stream_parsing == NULL) { - gpr_log(GPR_ERROR, "grpc_chttp2_stream not accepted"); - return init_skip_frame_parser(transport_parsing, 1); - } - via_accept = 1; - } else { - transport_parsing->incoming_stream = stream_parsing; - } - GPR_ASSERT(stream_parsing != NULL && (via_accept == 0 || via_accept == 1)); - if (stream_parsing->received_close) { - gpr_log(GPR_ERROR, "skipping already closed grpc_chttp2_stream header"); - transport_parsing->incoming_stream = NULL; - return init_skip_frame_parser(transport_parsing, 1); - } + stream_parsing = grpc_chttp2_parsing_lookup_stream (transport_parsing, transport_parsing->incoming_stream_id); + if (stream_parsing == NULL) + { + if (is_continuation) + { + gpr_log (GPR_ERROR, "grpc_chttp2_stream disbanded before CONTINUATION received"); + return init_skip_frame_parser (transport_parsing, 1); + } + if (transport_parsing->is_client) + { + if ((transport_parsing->incoming_stream_id & 1) && transport_parsing->incoming_stream_id < transport_parsing->next_stream_id) + { + /* this is an old (probably cancelled) grpc_chttp2_stream */ + } + else + { + gpr_log (GPR_ERROR, "ignoring new grpc_chttp2_stream creation on client"); + } + return init_skip_frame_parser (transport_parsing, 1); + } + else if (transport_parsing->last_incoming_stream_id > transport_parsing->incoming_stream_id) + { + gpr_log (GPR_ERROR, "ignoring out of order new grpc_chttp2_stream request on server; " "last grpc_chttp2_stream " "id=%d, new grpc_chttp2_stream id=%d", transport_parsing->last_incoming_stream_id, transport_parsing->incoming_stream_id); + return init_skip_frame_parser (transport_parsing, 1); + } + else if ((transport_parsing->incoming_stream_id & 1) == 0) + { + gpr_log (GPR_ERROR, "ignoring grpc_chttp2_stream with non-client generated index %d", transport_parsing->incoming_stream_id); + return init_skip_frame_parser (transport_parsing, 1); + } + stream_parsing = transport_parsing->incoming_stream = grpc_chttp2_parsing_accept_stream (transport_parsing, transport_parsing->incoming_stream_id); + if (stream_parsing == NULL) + { + gpr_log (GPR_ERROR, "grpc_chttp2_stream not accepted"); + return init_skip_frame_parser (transport_parsing, 1); + } + via_accept = 1; + } + else + { + transport_parsing->incoming_stream = stream_parsing; + } + GPR_ASSERT (stream_parsing != NULL && (via_accept == 0 || via_accept == 1)); + if (stream_parsing->received_close) + { + gpr_log (GPR_ERROR, "skipping already closed grpc_chttp2_stream header"); + transport_parsing->incoming_stream = NULL; + return init_skip_frame_parser (transport_parsing, 1); + } transport_parsing->parser = grpc_chttp2_header_parser_parse; transport_parsing->parser_data = &transport_parsing->hpack_parser; transport_parsing->hpack_parser.on_header = on_header; transport_parsing->hpack_parser.on_header_user_data = transport_parsing; transport_parsing->hpack_parser.is_boundary = is_eoh; - transport_parsing->hpack_parser.is_eof = - (gpr_uint8)(is_eoh ? transport_parsing->header_eof : 0); - if (!is_continuation && (transport_parsing->incoming_frame_flags & - GRPC_CHTTP2_FLAG_HAS_PRIORITY)) { - grpc_chttp2_hpack_parser_set_has_priority(&transport_parsing->hpack_parser); - } + transport_parsing->hpack_parser.is_eof = (gpr_uint8) (is_eoh ? transport_parsing->header_eof : 0); + if (!is_continuation && (transport_parsing->incoming_frame_flags & GRPC_CHTTP2_FLAG_HAS_PRIORITY)) + { + grpc_chttp2_hpack_parser_set_has_priority (&transport_parsing->hpack_parser); + } return 1; } -static int init_window_update_frame_parser( - grpc_chttp2_transport_parsing *transport_parsing) { - int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_window_update_parser_begin_frame( - &transport_parsing->simple.window_update, - transport_parsing->incoming_frame_size, - transport_parsing->incoming_frame_flags); - if (transport_parsing->incoming_stream_id) { - transport_parsing->incoming_stream = grpc_chttp2_parsing_lookup_stream( - transport_parsing, transport_parsing->incoming_stream_id); - } +static int +init_window_update_frame_parser (grpc_chttp2_transport_parsing * transport_parsing) +{ + int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_window_update_parser_begin_frame (&transport_parsing->simple.window_update, + transport_parsing->incoming_frame_size, + transport_parsing->incoming_frame_flags); + if (transport_parsing->incoming_stream_id) + { + transport_parsing->incoming_stream = grpc_chttp2_parsing_lookup_stream (transport_parsing, transport_parsing->incoming_stream_id); + } transport_parsing->parser = grpc_chttp2_window_update_parser_parse; transport_parsing->parser_data = &transport_parsing->simple.window_update; return ok; } -static int init_ping_parser(grpc_chttp2_transport_parsing *transport_parsing) { - int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_ping_parser_begin_frame( - &transport_parsing->simple.ping, - transport_parsing->incoming_frame_size, - transport_parsing->incoming_frame_flags); +static int +init_ping_parser (grpc_chttp2_transport_parsing * transport_parsing) +{ + int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_ping_parser_begin_frame (&transport_parsing->simple.ping, + transport_parsing->incoming_frame_size, + transport_parsing->incoming_frame_flags); transport_parsing->parser = grpc_chttp2_ping_parser_parse; transport_parsing->parser_data = &transport_parsing->simple.ping; return ok; } -static int init_rst_stream_parser( - grpc_chttp2_transport_parsing *transport_parsing) { - int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_rst_stream_parser_begin_frame( - &transport_parsing->simple.rst_stream, - transport_parsing->incoming_frame_size, - transport_parsing->incoming_frame_flags); - transport_parsing->incoming_stream = grpc_chttp2_parsing_lookup_stream( - transport_parsing, transport_parsing->incoming_stream_id); - if (!transport_parsing->incoming_stream) { - return init_skip_frame_parser(transport_parsing, 0); - } +static int +init_rst_stream_parser (grpc_chttp2_transport_parsing * transport_parsing) +{ + int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_rst_stream_parser_begin_frame (&transport_parsing->simple.rst_stream, + transport_parsing->incoming_frame_size, + transport_parsing->incoming_frame_flags); + transport_parsing->incoming_stream = grpc_chttp2_parsing_lookup_stream (transport_parsing, transport_parsing->incoming_stream_id); + if (!transport_parsing->incoming_stream) + { + return init_skip_frame_parser (transport_parsing, 0); + } transport_parsing->parser = grpc_chttp2_rst_stream_parser_parse; transport_parsing->parser_data = &transport_parsing->simple.rst_stream; return ok; } -static int init_goaway_parser( - grpc_chttp2_transport_parsing *transport_parsing) { - int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_goaway_parser_begin_frame( - &transport_parsing->goaway_parser, - transport_parsing->incoming_frame_size, - transport_parsing->incoming_frame_flags); +static int +init_goaway_parser (grpc_chttp2_transport_parsing * transport_parsing) +{ + int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_goaway_parser_begin_frame (&transport_parsing->goaway_parser, + transport_parsing->incoming_frame_size, + transport_parsing->incoming_frame_flags); transport_parsing->parser = grpc_chttp2_goaway_parser_parse; transport_parsing->parser_data = &transport_parsing->goaway_parser; return ok; } -static int init_settings_frame_parser( - grpc_chttp2_transport_parsing *transport_parsing) { +static int +init_settings_frame_parser (grpc_chttp2_transport_parsing * transport_parsing) +{ int ok; - if (transport_parsing->incoming_stream_id != 0) { - gpr_log(GPR_ERROR, "settings frame received for grpc_chttp2_stream %d", - transport_parsing->incoming_stream_id); - return 0; - } - - ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_settings_parser_begin_frame( - &transport_parsing->simple.settings, - transport_parsing->incoming_frame_size, - transport_parsing->incoming_frame_flags, - transport_parsing->settings); - if (!ok) { - return 0; - } - if (transport_parsing->incoming_frame_flags & GRPC_CHTTP2_FLAG_ACK) { - transport_parsing->settings_ack_received = 1; - } + if (transport_parsing->incoming_stream_id != 0) + { + gpr_log (GPR_ERROR, "settings frame received for grpc_chttp2_stream %d", transport_parsing->incoming_stream_id); + return 0; + } + + ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_settings_parser_begin_frame (&transport_parsing->simple.settings, transport_parsing->incoming_frame_size, transport_parsing->incoming_frame_flags, transport_parsing->settings); + if (!ok) + { + return 0; + } + if (transport_parsing->incoming_frame_flags & GRPC_CHTTP2_FLAG_ACK) + { + transport_parsing->settings_ack_received = 1; + } transport_parsing->parser = grpc_chttp2_settings_parser_parse; transport_parsing->parser_data = &transport_parsing->simple.settings; return ok; @@ -791,35 +753,31 @@ static int is_window_update_legal(gpr_int64 window_update, gpr_int64 window) { } */ -static int parse_frame_slice(grpc_chttp2_transport_parsing *transport_parsing, - gpr_slice slice, int is_last, - grpc_closure_list *closure_list) { - grpc_chttp2_stream_parsing *stream_parsing = - transport_parsing->incoming_stream; - switch (transport_parsing->parser(transport_parsing->parser_data, - transport_parsing, stream_parsing, slice, - is_last, closure_list)) { +static int +parse_frame_slice (grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +{ + grpc_chttp2_stream_parsing *stream_parsing = transport_parsing->incoming_stream; + switch (transport_parsing->parser (transport_parsing->parser_data, transport_parsing, stream_parsing, slice, is_last, closure_list)) + { case GRPC_CHTTP2_PARSE_OK: - if (stream_parsing) { - grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, - stream_parsing); - } + if (stream_parsing) + { + grpc_chttp2_list_add_parsing_seen_stream (transport_parsing, stream_parsing); + } return 1; case GRPC_CHTTP2_STREAM_ERROR: - grpc_chttp2_parsing_become_skip_parser(transport_parsing); - if (stream_parsing) { - stream_parsing->saw_rst_stream = 1; - stream_parsing->rst_stream_reason = GRPC_CHTTP2_PROTOCOL_ERROR; - gpr_slice_buffer_add( - &transport_parsing->qbuf, - grpc_chttp2_rst_stream_create(transport_parsing->incoming_stream_id, - GRPC_CHTTP2_PROTOCOL_ERROR)); - } + grpc_chttp2_parsing_become_skip_parser (transport_parsing); + if (stream_parsing) + { + stream_parsing->saw_rst_stream = 1; + stream_parsing->rst_stream_reason = GRPC_CHTTP2_PROTOCOL_ERROR; + gpr_slice_buffer_add (&transport_parsing->qbuf, grpc_chttp2_rst_stream_create (transport_parsing->incoming_stream_id, GRPC_CHTTP2_PROTOCOL_ERROR)); + } return 1; case GRPC_CHTTP2_CONNECTION_ERROR: return 0; - } - gpr_log(GPR_ERROR, "should never reach here"); - abort(); + } + gpr_log (GPR_ERROR, "should never reach here"); + abort (); return 0; } diff --git a/src/core/transport/chttp2/status_conversion.c b/src/core/transport/chttp2/status_conversion.c index bf214b017a2..8be4dc61504 100644 --- a/src/core/transport/chttp2/status_conversion.c +++ b/src/core/transport/chttp2/status_conversion.c @@ -33,8 +33,11 @@ #include "src/core/transport/chttp2/status_conversion.h" -int grpc_chttp2_grpc_status_to_http2_error(grpc_status_code status) { - switch (status) { +int +grpc_chttp2_grpc_status_to_http2_error (grpc_status_code status) +{ + switch (status) + { case GRPC_STATUS_OK: return GRPC_CHTTP2_NO_ERROR; case GRPC_STATUS_CANCELLED: @@ -47,12 +50,14 @@ int grpc_chttp2_grpc_status_to_http2_error(grpc_status_code status) { return GRPC_CHTTP2_REFUSED_STREAM; default: return GRPC_CHTTP2_INTERNAL_ERROR; - } + } } -grpc_status_code grpc_chttp2_http2_error_to_grpc_status( - grpc_chttp2_error_code error) { - switch (error) { +grpc_status_code +grpc_chttp2_http2_error_to_grpc_status (grpc_chttp2_error_code error) +{ + switch (error) + { case GRPC_CHTTP2_NO_ERROR: /* should never be received */ return GRPC_STATUS_INTERNAL; @@ -66,12 +71,15 @@ grpc_status_code grpc_chttp2_http2_error_to_grpc_status( return GRPC_STATUS_UNAVAILABLE; default: return GRPC_STATUS_INTERNAL; - } + } } -grpc_status_code grpc_chttp2_http2_status_to_grpc_status(int status) { - switch (status) { - /* these HTTP2 status codes are called out explicitly in status.proto */ +grpc_status_code +grpc_chttp2_http2_status_to_grpc_status (int status) +{ + switch (status) + { + /* these HTTP2 status codes are called out explicitly in status.proto */ case 200: return GRPC_STATUS_OK; case 400: @@ -98,12 +106,14 @@ grpc_status_code grpc_chttp2_http2_status_to_grpc_status(int status) { return GRPC_STATUS_UNAVAILABLE; case 504: return GRPC_STATUS_DEADLINE_EXCEEDED; - /* everything else is unknown */ + /* everything else is unknown */ default: return GRPC_STATUS_UNKNOWN; - } + } } -int grpc_chttp2_grpc_status_to_http2_status(grpc_status_code status) { +int +grpc_chttp2_grpc_status_to_http2_status (grpc_status_code status) +{ return 200; } diff --git a/src/core/transport/chttp2/status_conversion.h b/src/core/transport/chttp2/status_conversion.h index 0ec5b560b8e..ae5b4960df2 100644 --- a/src/core/transport/chttp2/status_conversion.h +++ b/src/core/transport/chttp2/status_conversion.h @@ -38,13 +38,11 @@ #include "src/core/transport/chttp2/http2_errors.h" /* Conversion of grpc status codes to http2 error codes (for RST_STREAM) */ -grpc_chttp2_error_code grpc_chttp2_grpc_status_to_http2_error( - grpc_status_code status); -grpc_status_code grpc_chttp2_http2_error_to_grpc_status( - grpc_chttp2_error_code error); +grpc_chttp2_error_code grpc_chttp2_grpc_status_to_http2_error (grpc_status_code status); +grpc_status_code grpc_chttp2_http2_error_to_grpc_status (grpc_chttp2_error_code error); /* Conversion of HTTP status codes (:status) to grpc status codes */ -grpc_status_code grpc_chttp2_http2_status_to_grpc_status(int status); -int grpc_chttp2_grpc_status_to_http2_status(grpc_status_code status); +grpc_status_code grpc_chttp2_http2_status_to_grpc_status (int status); +int grpc_chttp2_grpc_status_to_http2_status (grpc_status_code status); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_STATUS_CONVERSION_H */ diff --git a/src/core/transport/chttp2/stream_encoder.c b/src/core/transport/chttp2/stream_encoder.c index eb02ccdec37..cafd735ba2e 100644 --- a/src/core/transport/chttp2/stream_encoder.c +++ b/src/core/transport/chttp2/stream_encoder.c @@ -55,9 +55,11 @@ #define MAX_DECODER_SPACE_USAGE 512 /* what kind of frame our we encoding? */ -typedef enum { HEADER, DATA, NONE } frame_type; +typedef enum +{ HEADER, DATA, NONE } frame_type; -typedef struct { +typedef struct +{ frame_type cur_frame_type; /* number of bytes in 'output' when we started the frame - used to calculate frame length */ @@ -74,28 +76,30 @@ typedef struct { } framer_state; /* fills p (which is expected to be 9 bytes long) with a data frame header */ -static void fill_header(gpr_uint8 *p, gpr_uint8 type, gpr_uint32 id, size_t len, - gpr_uint8 flags) { - GPR_ASSERT(len < 16777316); - *p++ = (gpr_uint8)(len >> 16); - *p++ = (gpr_uint8)(len >> 8); - *p++ = (gpr_uint8)(len); +static void +fill_header (gpr_uint8 * p, gpr_uint8 type, gpr_uint32 id, size_t len, gpr_uint8 flags) +{ + GPR_ASSERT (len < 16777316); + *p++ = (gpr_uint8) (len >> 16); + *p++ = (gpr_uint8) (len >> 8); + *p++ = (gpr_uint8) (len); *p++ = type; *p++ = flags; - *p++ = (gpr_uint8)(id >> 24); - *p++ = (gpr_uint8)(id >> 16); - *p++ = (gpr_uint8)(id >> 8); - *p++ = (gpr_uint8)(id); + *p++ = (gpr_uint8) (id >> 24); + *p++ = (gpr_uint8) (id >> 16); + *p++ = (gpr_uint8) (id >> 8); + *p++ = (gpr_uint8) (id); } /* finish a frame - fill in the previously reserved header */ -static void finish_frame(framer_state *st, int is_header_boundary, - int is_last_in_stream) { +static void +finish_frame (framer_state * st, int is_header_boundary, int is_last_in_stream) +{ gpr_uint8 type = 0xff; - switch (st->cur_frame_type) { + switch (st->cur_frame_type) + { case HEADER: - type = st->last_was_header ? GRPC_CHTTP2_FRAME_CONTINUATION - : GRPC_CHTTP2_FRAME_HEADER; + type = st->last_was_header ? GRPC_CHTTP2_FRAME_CONTINUATION : GRPC_CHTTP2_FRAME_HEADER; st->last_was_header = 1; break; case DATA: @@ -105,397 +109,435 @@ static void finish_frame(framer_state *st, int is_header_boundary, break; case NONE: return; - } - fill_header( - GPR_SLICE_START_PTR(st->output->slices[st->header_idx]), type, - st->stream_id, st->output->length - st->output_length_at_start_of_frame, - (gpr_uint8)( - (is_last_in_stream ? GRPC_CHTTP2_DATA_FLAG_END_STREAM : 0) | - (is_header_boundary ? GRPC_CHTTP2_DATA_FLAG_END_HEADERS : 0))); + } + fill_header (GPR_SLICE_START_PTR (st->output->slices[st->header_idx]), type, st->stream_id, st->output->length - st->output_length_at_start_of_frame, (gpr_uint8) ((is_last_in_stream ? GRPC_CHTTP2_DATA_FLAG_END_STREAM : 0) | (is_header_boundary ? GRPC_CHTTP2_DATA_FLAG_END_HEADERS : 0))); st->cur_frame_type = NONE; } /* begin a new frame: reserve off header space, remember how many bytes we'd output before beginning */ -static void begin_frame(framer_state *st, frame_type type) { - GPR_ASSERT(type != NONE); - GPR_ASSERT(st->cur_frame_type == NONE); +static void +begin_frame (framer_state * st, frame_type type) +{ + GPR_ASSERT (type != NONE); + GPR_ASSERT (st->cur_frame_type == NONE); st->cur_frame_type = type; - st->header_idx = - gpr_slice_buffer_add_indexed(st->output, gpr_slice_malloc(9)); + st->header_idx = gpr_slice_buffer_add_indexed (st->output, gpr_slice_malloc (9)); st->output_length_at_start_of_frame = st->output->length; } -static void begin_new_frame(framer_state *st, frame_type type) { - finish_frame(st, 1, 0); +static void +begin_new_frame (framer_state * st, frame_type type) +{ + finish_frame (st, 1, 0); st->last_was_header = 0; - begin_frame(st, type); + begin_frame (st, type); } /* make sure that the current frame is of the type desired, and has sufficient space to add at least about_to_add bytes -- finishes the current frame if needed */ -static void ensure_frame_type(framer_state *st, frame_type type, - size_t need_bytes) { - if (st->cur_frame_type == type && - st->output->length - st->output_length_at_start_of_frame + need_bytes <= - GRPC_CHTTP2_MAX_PAYLOAD_LENGTH) { - return; - } - finish_frame(st, type != HEADER, 0); - begin_frame(st, type); +static void +ensure_frame_type (framer_state * st, frame_type type, size_t need_bytes) +{ + if (st->cur_frame_type == type && st->output->length - st->output_length_at_start_of_frame + need_bytes <= GRPC_CHTTP2_MAX_PAYLOAD_LENGTH) + { + return; + } + finish_frame (st, type != HEADER, 0); + begin_frame (st, type); } /* increment a filter count, halve all counts if one element reaches max */ -static void inc_filter(gpr_uint8 idx, gpr_uint32 *sum, gpr_uint8 *elems) { +static void +inc_filter (gpr_uint8 idx, gpr_uint32 * sum, gpr_uint8 * elems) +{ elems[idx]++; - if (elems[idx] < 255) { - (*sum)++; - } else { - int i; - *sum = 0; - for (i = 0; i < GRPC_CHTTP2_HPACKC_NUM_FILTERS; i++) { - elems[i] /= 2; - (*sum) += elems[i]; - } - } + if (elems[idx] < 255) + { + (*sum)++; + } + else + { + int i; + *sum = 0; + for (i = 0; i < GRPC_CHTTP2_HPACKC_NUM_FILTERS; i++) + { + elems[i] /= 2; + (*sum) += elems[i]; + } + } } -static void add_header_data(framer_state *st, gpr_slice slice) { - size_t len = GPR_SLICE_LENGTH(slice); +static void +add_header_data (framer_state * st, gpr_slice slice) +{ + size_t len = GPR_SLICE_LENGTH (slice); size_t remaining; - if (len == 0) return; - ensure_frame_type(st, HEADER, 1); - remaining = GRPC_CHTTP2_MAX_PAYLOAD_LENGTH + - st->output_length_at_start_of_frame - st->output->length; - if (len <= remaining) { - gpr_slice_buffer_add(st->output, slice); - } else { - gpr_slice_buffer_add(st->output, gpr_slice_split_head(&slice, remaining)); - add_header_data(st, slice); - } + if (len == 0) + return; + ensure_frame_type (st, HEADER, 1); + remaining = GRPC_CHTTP2_MAX_PAYLOAD_LENGTH + st->output_length_at_start_of_frame - st->output->length; + if (len <= remaining) + { + gpr_slice_buffer_add (st->output, slice); + } + else + { + gpr_slice_buffer_add (st->output, gpr_slice_split_head (&slice, remaining)); + add_header_data (st, slice); + } } -static gpr_uint8 *add_tiny_header_data(framer_state *st, size_t len) { - ensure_frame_type(st, HEADER, len); - return gpr_slice_buffer_tiny_add(st->output, len); +static gpr_uint8 * +add_tiny_header_data (framer_state * st, size_t len) +{ + ensure_frame_type (st, HEADER, len); + return gpr_slice_buffer_tiny_add (st->output, len); } /* add an element to the decoder table: returns metadata element to unref */ -static grpc_mdelem *add_elem(grpc_chttp2_hpack_compressor *c, - grpc_mdelem *elem) { +static grpc_mdelem * +add_elem (grpc_chttp2_hpack_compressor * c, grpc_mdelem * elem) +{ gpr_uint32 key_hash = elem->key->hash; - gpr_uint32 elem_hash = GRPC_MDSTR_KV_HASH(key_hash, elem->value->hash); + gpr_uint32 elem_hash = GRPC_MDSTR_KV_HASH (key_hash, elem->value->hash); gpr_uint32 new_index = c->tail_remote_index + c->table_elems + 1; - size_t elem_size = 32 + GPR_SLICE_LENGTH(elem->key->slice) + - GPR_SLICE_LENGTH(elem->value->slice); + size_t elem_size = 32 + GPR_SLICE_LENGTH (elem->key->slice) + GPR_SLICE_LENGTH (elem->value->slice); grpc_mdelem *elem_to_unref; - GPR_ASSERT(elem_size < 65536); + GPR_ASSERT (elem_size < 65536); /* Reserve space for this element in the remote table: if this overflows the current table, drop elements until it fits, matching the decompressor algorithm */ /* TODO(ctiller): constant */ - while (c->table_size + elem_size > 4096) { - c->tail_remote_index++; - GPR_ASSERT(c->tail_remote_index > 0); - GPR_ASSERT(c->table_size >= - c->table_elem_size[c->tail_remote_index % - GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS]); - GPR_ASSERT(c->table_elems > 0); - c->table_size = - (gpr_uint16)(c->table_size - - c->table_elem_size[c->tail_remote_index % - GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS]); - c->table_elems--; - } - GPR_ASSERT(c->table_elems < GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS); - c->table_elem_size[new_index % GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS] = - (gpr_uint16)elem_size; - c->table_size = (gpr_uint16)(c->table_size + elem_size); + while (c->table_size + elem_size > 4096) + { + c->tail_remote_index++; + GPR_ASSERT (c->tail_remote_index > 0); + GPR_ASSERT (c->table_size >= c->table_elem_size[c->tail_remote_index % GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS]); + GPR_ASSERT (c->table_elems > 0); + c->table_size = (gpr_uint16) (c->table_size - c->table_elem_size[c->tail_remote_index % GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS]); + c->table_elems--; + } + GPR_ASSERT (c->table_elems < GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS); + c->table_elem_size[new_index % GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS] = (gpr_uint16) elem_size; + c->table_size = (gpr_uint16) (c->table_size + elem_size); c->table_elems++; /* Store this element into {entries,indices}_elem */ - if (c->entries_elems[HASH_FRAGMENT_2(elem_hash)] == elem) { - /* already there: update with new index */ - c->indices_elems[HASH_FRAGMENT_2(elem_hash)] = new_index; - elem_to_unref = elem; - } else if (c->entries_elems[HASH_FRAGMENT_3(elem_hash)] == elem) { - /* already there (cuckoo): update with new index */ - c->indices_elems[HASH_FRAGMENT_3(elem_hash)] = new_index; - elem_to_unref = elem; - } else if (c->entries_elems[HASH_FRAGMENT_2(elem_hash)] == NULL) { - /* not there, but a free element: add */ - c->entries_elems[HASH_FRAGMENT_2(elem_hash)] = elem; - c->indices_elems[HASH_FRAGMENT_2(elem_hash)] = new_index; - elem_to_unref = NULL; - } else if (c->entries_elems[HASH_FRAGMENT_3(elem_hash)] == NULL) { - /* not there (cuckoo), but a free element: add */ - c->entries_elems[HASH_FRAGMENT_3(elem_hash)] = elem; - c->indices_elems[HASH_FRAGMENT_3(elem_hash)] = new_index; - elem_to_unref = NULL; - } else if (c->indices_elems[HASH_FRAGMENT_2(elem_hash)] < - c->indices_elems[HASH_FRAGMENT_3(elem_hash)]) { - /* not there: replace oldest */ - elem_to_unref = c->entries_elems[HASH_FRAGMENT_2(elem_hash)]; - c->entries_elems[HASH_FRAGMENT_2(elem_hash)] = elem; - c->indices_elems[HASH_FRAGMENT_2(elem_hash)] = new_index; - } else { - /* not there: replace oldest */ - elem_to_unref = c->entries_elems[HASH_FRAGMENT_3(elem_hash)]; - c->entries_elems[HASH_FRAGMENT_3(elem_hash)] = elem; - c->indices_elems[HASH_FRAGMENT_3(elem_hash)] = new_index; - } + if (c->entries_elems[HASH_FRAGMENT_2 (elem_hash)] == elem) + { + /* already there: update with new index */ + c->indices_elems[HASH_FRAGMENT_2 (elem_hash)] = new_index; + elem_to_unref = elem; + } + else if (c->entries_elems[HASH_FRAGMENT_3 (elem_hash)] == elem) + { + /* already there (cuckoo): update with new index */ + c->indices_elems[HASH_FRAGMENT_3 (elem_hash)] = new_index; + elem_to_unref = elem; + } + else if (c->entries_elems[HASH_FRAGMENT_2 (elem_hash)] == NULL) + { + /* not there, but a free element: add */ + c->entries_elems[HASH_FRAGMENT_2 (elem_hash)] = elem; + c->indices_elems[HASH_FRAGMENT_2 (elem_hash)] = new_index; + elem_to_unref = NULL; + } + else if (c->entries_elems[HASH_FRAGMENT_3 (elem_hash)] == NULL) + { + /* not there (cuckoo), but a free element: add */ + c->entries_elems[HASH_FRAGMENT_3 (elem_hash)] = elem; + c->indices_elems[HASH_FRAGMENT_3 (elem_hash)] = new_index; + elem_to_unref = NULL; + } + else if (c->indices_elems[HASH_FRAGMENT_2 (elem_hash)] < c->indices_elems[HASH_FRAGMENT_3 (elem_hash)]) + { + /* not there: replace oldest */ + elem_to_unref = c->entries_elems[HASH_FRAGMENT_2 (elem_hash)]; + c->entries_elems[HASH_FRAGMENT_2 (elem_hash)] = elem; + c->indices_elems[HASH_FRAGMENT_2 (elem_hash)] = new_index; + } + else + { + /* not there: replace oldest */ + elem_to_unref = c->entries_elems[HASH_FRAGMENT_3 (elem_hash)]; + c->entries_elems[HASH_FRAGMENT_3 (elem_hash)] = elem; + c->indices_elems[HASH_FRAGMENT_3 (elem_hash)] = new_index; + } /* do exactly the same for the key (so we can find by that again too) */ - if (c->entries_keys[HASH_FRAGMENT_2(key_hash)] == elem->key) { - c->indices_keys[HASH_FRAGMENT_2(key_hash)] = new_index; - } else if (c->entries_keys[HASH_FRAGMENT_3(key_hash)] == elem->key) { - c->indices_keys[HASH_FRAGMENT_3(key_hash)] = new_index; - } else if (c->entries_keys[HASH_FRAGMENT_2(key_hash)] == NULL) { - c->entries_keys[HASH_FRAGMENT_2(key_hash)] = GRPC_MDSTR_REF(elem->key); - c->indices_keys[HASH_FRAGMENT_2(key_hash)] = new_index; - } else if (c->entries_keys[HASH_FRAGMENT_3(key_hash)] == NULL) { - c->entries_keys[HASH_FRAGMENT_3(key_hash)] = GRPC_MDSTR_REF(elem->key); - 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_MDSTR_UNREF(c->entries_keys[HASH_FRAGMENT_2(key_hash)]); - c->entries_keys[HASH_FRAGMENT_2(key_hash)] = GRPC_MDSTR_REF(elem->key); - c->indices_keys[HASH_FRAGMENT_2(key_hash)] = new_index; - } else { - GRPC_MDSTR_UNREF(c->entries_keys[HASH_FRAGMENT_3(key_hash)]); - c->entries_keys[HASH_FRAGMENT_3(key_hash)] = GRPC_MDSTR_REF(elem->key); - c->indices_keys[HASH_FRAGMENT_3(key_hash)] = new_index; - } + if (c->entries_keys[HASH_FRAGMENT_2 (key_hash)] == elem->key) + { + c->indices_keys[HASH_FRAGMENT_2 (key_hash)] = new_index; + } + else if (c->entries_keys[HASH_FRAGMENT_3 (key_hash)] == elem->key) + { + c->indices_keys[HASH_FRAGMENT_3 (key_hash)] = new_index; + } + else if (c->entries_keys[HASH_FRAGMENT_2 (key_hash)] == NULL) + { + c->entries_keys[HASH_FRAGMENT_2 (key_hash)] = GRPC_MDSTR_REF (elem->key); + c->indices_keys[HASH_FRAGMENT_2 (key_hash)] = new_index; + } + else if (c->entries_keys[HASH_FRAGMENT_3 (key_hash)] == NULL) + { + c->entries_keys[HASH_FRAGMENT_3 (key_hash)] = GRPC_MDSTR_REF (elem->key); + 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_MDSTR_UNREF (c->entries_keys[HASH_FRAGMENT_2 (key_hash)]); + c->entries_keys[HASH_FRAGMENT_2 (key_hash)] = GRPC_MDSTR_REF (elem->key); + c->indices_keys[HASH_FRAGMENT_2 (key_hash)] = new_index; + } + else + { + GRPC_MDSTR_UNREF (c->entries_keys[HASH_FRAGMENT_3 (key_hash)]); + c->entries_keys[HASH_FRAGMENT_3 (key_hash)] = GRPC_MDSTR_REF (elem->key); + c->indices_keys[HASH_FRAGMENT_3 (key_hash)] = new_index; + } return elem_to_unref; } -static void emit_indexed(grpc_chttp2_hpack_compressor *c, gpr_uint32 index, - framer_state *st) { - gpr_uint32 len = GRPC_CHTTP2_VARINT_LENGTH(index, 1); - GRPC_CHTTP2_WRITE_VARINT(index, 1, 0x80, add_tiny_header_data(st, len), len); +static void +emit_indexed (grpc_chttp2_hpack_compressor * c, gpr_uint32 index, framer_state * st) +{ + gpr_uint32 len = GRPC_CHTTP2_VARINT_LENGTH (index, 1); + GRPC_CHTTP2_WRITE_VARINT (index, 1, 0x80, add_tiny_header_data (st, len), len); } -static gpr_slice get_wire_value(grpc_mdelem *elem, gpr_uint8 *huffman_prefix) { - if (grpc_is_binary_header((const char *)GPR_SLICE_START_PTR(elem->key->slice), - GPR_SLICE_LENGTH(elem->key->slice))) { - *huffman_prefix = 0x80; - return grpc_mdstr_as_base64_encoded_and_huffman_compressed(elem->value); - } +static gpr_slice +get_wire_value (grpc_mdelem * elem, gpr_uint8 * huffman_prefix) +{ + if (grpc_is_binary_header ((const char *) GPR_SLICE_START_PTR (elem->key->slice), GPR_SLICE_LENGTH (elem->key->slice))) + { + *huffman_prefix = 0x80; + return grpc_mdstr_as_base64_encoded_and_huffman_compressed (elem->value); + } /* TODO(ctiller): opportunistically compress non-binary headers */ *huffman_prefix = 0x00; return elem->value->slice; } -static void emit_lithdr_incidx(grpc_chttp2_hpack_compressor *c, - gpr_uint32 key_index, grpc_mdelem *elem, - framer_state *st) { - gpr_uint32 len_pfx = GRPC_CHTTP2_VARINT_LENGTH(key_index, 2); +static void +emit_lithdr_incidx (grpc_chttp2_hpack_compressor * c, gpr_uint32 key_index, grpc_mdelem * elem, framer_state * st) +{ + gpr_uint32 len_pfx = GRPC_CHTTP2_VARINT_LENGTH (key_index, 2); gpr_uint8 huffman_prefix; - gpr_slice value_slice = get_wire_value(elem, &huffman_prefix); - size_t len_val = GPR_SLICE_LENGTH(value_slice); + gpr_slice value_slice = get_wire_value (elem, &huffman_prefix); + size_t len_val = GPR_SLICE_LENGTH (value_slice); gpr_uint32 len_val_len; - GPR_ASSERT(len_val <= GPR_UINT32_MAX); - len_val_len = GRPC_CHTTP2_VARINT_LENGTH((gpr_uint32)len_val, 1); - GRPC_CHTTP2_WRITE_VARINT(key_index, 2, 0x40, - add_tiny_header_data(st, len_pfx), len_pfx); - GRPC_CHTTP2_WRITE_VARINT((gpr_uint32)len_val, 1, 0x00, - add_tiny_header_data(st, len_val_len), len_val_len); - add_header_data(st, gpr_slice_ref(value_slice)); + GPR_ASSERT (len_val <= GPR_UINT32_MAX); + len_val_len = GRPC_CHTTP2_VARINT_LENGTH ((gpr_uint32) len_val, 1); + GRPC_CHTTP2_WRITE_VARINT (key_index, 2, 0x40, add_tiny_header_data (st, len_pfx), len_pfx); + GRPC_CHTTP2_WRITE_VARINT ((gpr_uint32) len_val, 1, 0x00, add_tiny_header_data (st, len_val_len), len_val_len); + add_header_data (st, gpr_slice_ref (value_slice)); } -static void emit_lithdr_noidx(grpc_chttp2_hpack_compressor *c, - gpr_uint32 key_index, grpc_mdelem *elem, - framer_state *st) { - gpr_uint32 len_pfx = GRPC_CHTTP2_VARINT_LENGTH(key_index, 4); +static void +emit_lithdr_noidx (grpc_chttp2_hpack_compressor * c, gpr_uint32 key_index, grpc_mdelem * elem, framer_state * st) +{ + gpr_uint32 len_pfx = GRPC_CHTTP2_VARINT_LENGTH (key_index, 4); gpr_uint8 huffman_prefix; - gpr_slice value_slice = get_wire_value(elem, &huffman_prefix); - size_t len_val = GPR_SLICE_LENGTH(value_slice); + gpr_slice value_slice = get_wire_value (elem, &huffman_prefix); + size_t len_val = GPR_SLICE_LENGTH (value_slice); gpr_uint32 len_val_len; - GPR_ASSERT(len_val <= GPR_UINT32_MAX); - len_val_len = GRPC_CHTTP2_VARINT_LENGTH((gpr_uint32)len_val, 1); - GRPC_CHTTP2_WRITE_VARINT(key_index, 4, 0x00, - add_tiny_header_data(st, len_pfx), len_pfx); - GRPC_CHTTP2_WRITE_VARINT((gpr_uint32)len_val, 1, 0x00, - add_tiny_header_data(st, len_val_len), len_val_len); - add_header_data(st, gpr_slice_ref(value_slice)); + GPR_ASSERT (len_val <= GPR_UINT32_MAX); + len_val_len = GRPC_CHTTP2_VARINT_LENGTH ((gpr_uint32) len_val, 1); + GRPC_CHTTP2_WRITE_VARINT (key_index, 4, 0x00, add_tiny_header_data (st, len_pfx), len_pfx); + GRPC_CHTTP2_WRITE_VARINT ((gpr_uint32) len_val, 1, 0x00, add_tiny_header_data (st, len_val_len), len_val_len); + add_header_data (st, gpr_slice_ref (value_slice)); } -static void emit_lithdr_incidx_v(grpc_chttp2_hpack_compressor *c, - grpc_mdelem *elem, framer_state *st) { - gpr_uint32 len_key = (gpr_uint32)GPR_SLICE_LENGTH(elem->key->slice); +static void +emit_lithdr_incidx_v (grpc_chttp2_hpack_compressor * c, grpc_mdelem * elem, framer_state * st) +{ + gpr_uint32 len_key = (gpr_uint32) GPR_SLICE_LENGTH (elem->key->slice); gpr_uint8 huffman_prefix; - gpr_slice value_slice = get_wire_value(elem, &huffman_prefix); - gpr_uint32 len_val = (gpr_uint32)GPR_SLICE_LENGTH(value_slice); - gpr_uint32 len_key_len = GRPC_CHTTP2_VARINT_LENGTH(len_key, 1); - gpr_uint32 len_val_len = GRPC_CHTTP2_VARINT_LENGTH(len_val, 1); - GPR_ASSERT(len_key <= GPR_UINT32_MAX); - GPR_ASSERT(GPR_SLICE_LENGTH(value_slice) <= GPR_UINT32_MAX); - *add_tiny_header_data(st, 1) = 0x40; - GRPC_CHTTP2_WRITE_VARINT(len_key, 1, 0x00, - add_tiny_header_data(st, len_key_len), len_key_len); - add_header_data(st, gpr_slice_ref(elem->key->slice)); - GRPC_CHTTP2_WRITE_VARINT(len_val, 1, huffman_prefix, - add_tiny_header_data(st, len_val_len), len_val_len); - add_header_data(st, gpr_slice_ref(value_slice)); + gpr_slice value_slice = get_wire_value (elem, &huffman_prefix); + gpr_uint32 len_val = (gpr_uint32) GPR_SLICE_LENGTH (value_slice); + gpr_uint32 len_key_len = GRPC_CHTTP2_VARINT_LENGTH (len_key, 1); + gpr_uint32 len_val_len = GRPC_CHTTP2_VARINT_LENGTH (len_val, 1); + GPR_ASSERT (len_key <= GPR_UINT32_MAX); + GPR_ASSERT (GPR_SLICE_LENGTH (value_slice) <= GPR_UINT32_MAX); + *add_tiny_header_data (st, 1) = 0x40; + GRPC_CHTTP2_WRITE_VARINT (len_key, 1, 0x00, add_tiny_header_data (st, len_key_len), len_key_len); + add_header_data (st, gpr_slice_ref (elem->key->slice)); + GRPC_CHTTP2_WRITE_VARINT (len_val, 1, huffman_prefix, add_tiny_header_data (st, len_val_len), len_val_len); + add_header_data (st, gpr_slice_ref (value_slice)); } -static void emit_lithdr_noidx_v(grpc_chttp2_hpack_compressor *c, - grpc_mdelem *elem, framer_state *st) { - gpr_uint32 len_key = (gpr_uint32)GPR_SLICE_LENGTH(elem->key->slice); +static void +emit_lithdr_noidx_v (grpc_chttp2_hpack_compressor * c, grpc_mdelem * elem, framer_state * st) +{ + gpr_uint32 len_key = (gpr_uint32) GPR_SLICE_LENGTH (elem->key->slice); gpr_uint8 huffman_prefix; - gpr_slice value_slice = get_wire_value(elem, &huffman_prefix); - gpr_uint32 len_val = (gpr_uint32)GPR_SLICE_LENGTH(value_slice); - gpr_uint32 len_key_len = GRPC_CHTTP2_VARINT_LENGTH(len_key, 1); - gpr_uint32 len_val_len = GRPC_CHTTP2_VARINT_LENGTH(len_val, 1); - GPR_ASSERT(len_key <= GPR_UINT32_MAX); - GPR_ASSERT(GPR_SLICE_LENGTH(value_slice) <= GPR_UINT32_MAX); - *add_tiny_header_data(st, 1) = 0x00; - GRPC_CHTTP2_WRITE_VARINT(len_key, 1, 0x00, - add_tiny_header_data(st, len_key_len), len_key_len); - add_header_data(st, gpr_slice_ref(elem->key->slice)); - GRPC_CHTTP2_WRITE_VARINT(len_val, 1, huffman_prefix, - add_tiny_header_data(st, len_val_len), len_val_len); - add_header_data(st, gpr_slice_ref(value_slice)); + gpr_slice value_slice = get_wire_value (elem, &huffman_prefix); + gpr_uint32 len_val = (gpr_uint32) GPR_SLICE_LENGTH (value_slice); + gpr_uint32 len_key_len = GRPC_CHTTP2_VARINT_LENGTH (len_key, 1); + gpr_uint32 len_val_len = GRPC_CHTTP2_VARINT_LENGTH (len_val, 1); + GPR_ASSERT (len_key <= GPR_UINT32_MAX); + GPR_ASSERT (GPR_SLICE_LENGTH (value_slice) <= GPR_UINT32_MAX); + *add_tiny_header_data (st, 1) = 0x00; + GRPC_CHTTP2_WRITE_VARINT (len_key, 1, 0x00, add_tiny_header_data (st, len_key_len), len_key_len); + add_header_data (st, gpr_slice_ref (elem->key->slice)); + GRPC_CHTTP2_WRITE_VARINT (len_val, 1, huffman_prefix, add_tiny_header_data (st, len_val_len), len_val_len); + add_header_data (st, gpr_slice_ref (value_slice)); } -static gpr_uint32 dynidx(grpc_chttp2_hpack_compressor *c, gpr_uint32 index) { - return 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY + c->tail_remote_index + - c->table_elems - index; +static gpr_uint32 +dynidx (grpc_chttp2_hpack_compressor * c, gpr_uint32 index) +{ + return 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY + c->tail_remote_index + c->table_elems - index; } /* encode an mdelem; returns metadata element to unref */ -static grpc_mdelem *hpack_enc(grpc_chttp2_hpack_compressor *c, - grpc_mdelem *elem, framer_state *st) { +static grpc_mdelem * +hpack_enc (grpc_chttp2_hpack_compressor * c, grpc_mdelem * elem, framer_state * st) +{ gpr_uint32 key_hash = elem->key->hash; - gpr_uint32 elem_hash = GRPC_MDSTR_KV_HASH(key_hash, elem->value->hash); + gpr_uint32 elem_hash = GRPC_MDSTR_KV_HASH (key_hash, elem->value->hash); size_t decoder_space_usage; gpr_uint32 indices_key; int should_add_elem; - GPR_ASSERT(GPR_SLICE_LENGTH(elem->key->slice) > 0); - if (GPR_SLICE_START_PTR(elem->key->slice)[0] != ':') { /* regular header */ - st->seen_regular_header = 1; - } else if (st->seen_regular_header != 0) { /* reserved header */ - gpr_log(GPR_ERROR, - "Reserved header (colon-prefixed) happening after regular ones."); - abort(); - } + GPR_ASSERT (GPR_SLICE_LENGTH (elem->key->slice) > 0); + if (GPR_SLICE_START_PTR (elem->key->slice)[0] != ':') + { /* regular header */ + st->seen_regular_header = 1; + } + else if (st->seen_regular_header != 0) + { /* reserved header */ + gpr_log (GPR_ERROR, "Reserved header (colon-prefixed) happening after regular ones."); + abort (); + } - inc_filter(HASH_FRAGMENT_1(elem_hash), &c->filter_elems_sum, c->filter_elems); + inc_filter (HASH_FRAGMENT_1 (elem_hash), &c->filter_elems_sum, c->filter_elems); /* is this elem currently in the decoders table? */ - if (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); - return elem; - } - - if (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); - return elem; - } + if (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); + return elem; + } + + if (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); + return elem; + } /* should this elem be in the table? */ - decoder_space_usage = 32 + GPR_SLICE_LENGTH(elem->key->slice) + - GPR_SLICE_LENGTH(elem->value->slice); - should_add_elem = decoder_space_usage < MAX_DECODER_SPACE_USAGE && - c->filter_elems[HASH_FRAGMENT_1(elem_hash)] >= - c->filter_elems_sum / ONE_ON_ADD_PROBABILITY; + decoder_space_usage = 32 + GPR_SLICE_LENGTH (elem->key->slice) + GPR_SLICE_LENGTH (elem->value->slice); + should_add_elem = decoder_space_usage < MAX_DECODER_SPACE_USAGE && c->filter_elems[HASH_FRAGMENT_1 (elem_hash)] >= c->filter_elems_sum / ONE_ON_ADD_PROBABILITY; /* no hits for the elem... maybe there's a key? */ - indices_key = c->indices_keys[HASH_FRAGMENT_2(key_hash)]; - if (c->entries_keys[HASH_FRAGMENT_2(key_hash)] == elem->key && - indices_key > c->tail_remote_index) { - /* HIT: key (first cuckoo hash) */ - if (should_add_elem) { - emit_lithdr_incidx(c, dynidx(c, indices_key), elem, st); - return add_elem(c, elem); - } else { - emit_lithdr_noidx(c, dynidx(c, indices_key), elem, st); - return elem; + indices_key = c->indices_keys[HASH_FRAGMENT_2 (key_hash)]; + if (c->entries_keys[HASH_FRAGMENT_2 (key_hash)] == elem->key && indices_key > c->tail_remote_index) + { + /* HIT: key (first cuckoo hash) */ + if (should_add_elem) + { + emit_lithdr_incidx (c, dynidx (c, indices_key), elem, st); + return add_elem (c, elem); + } + else + { + emit_lithdr_noidx (c, dynidx (c, indices_key), elem, st); + return elem; + } + abort (); } - abort(); - } - - indices_key = c->indices_keys[HASH_FRAGMENT_3(key_hash)]; - if (c->entries_keys[HASH_FRAGMENT_3(key_hash)] == elem->key && - indices_key > c->tail_remote_index) { - /* HIT: key (first cuckoo hash) */ - if (should_add_elem) { - emit_lithdr_incidx(c, dynidx(c, indices_key), elem, st); - return add_elem(c, elem); - } else { - emit_lithdr_noidx(c, dynidx(c, indices_key), elem, st); - return elem; + + indices_key = c->indices_keys[HASH_FRAGMENT_3 (key_hash)]; + if (c->entries_keys[HASH_FRAGMENT_3 (key_hash)] == elem->key && indices_key > c->tail_remote_index) + { + /* HIT: key (first cuckoo hash) */ + if (should_add_elem) + { + emit_lithdr_incidx (c, dynidx (c, indices_key), elem, st); + return add_elem (c, elem); + } + else + { + emit_lithdr_noidx (c, dynidx (c, indices_key), elem, st); + return elem; + } + abort (); } - abort(); - } /* no elem, key in the table... fall back to literal emission */ - if (should_add_elem) { - emit_lithdr_incidx_v(c, elem, st); - return add_elem(c, elem); - } else { - emit_lithdr_noidx_v(c, elem, st); - return elem; - } - abort(); + if (should_add_elem) + { + emit_lithdr_incidx_v (c, elem, st); + return add_elem (c, elem); + } + else + { + emit_lithdr_noidx_v (c, elem, st); + return elem; + } + abort (); } #define STRLEN_LIT(x) (sizeof(x) - 1) #define TIMEOUT_KEY "grpc-timeout" -static void deadline_enc(grpc_chttp2_hpack_compressor *c, gpr_timespec deadline, - framer_state *st) { +static void +deadline_enc (grpc_chttp2_hpack_compressor * c, gpr_timespec deadline, framer_state * st) +{ char timeout_str[GRPC_CHTTP2_TIMEOUT_ENCODE_MIN_BUFSIZE]; grpc_mdelem *mdelem; - grpc_chttp2_encode_timeout( - gpr_time_sub(deadline, gpr_now(deadline.clock_type)), timeout_str); - mdelem = grpc_mdelem_from_metadata_strings( - c->mdctx, GRPC_MDSTR_REF(c->timeout_key_str), - grpc_mdstr_from_string(c->mdctx, timeout_str, 0)); - mdelem = hpack_enc(c, mdelem, st); - if (mdelem) GRPC_MDELEM_UNREF(mdelem); + grpc_chttp2_encode_timeout (gpr_time_sub (deadline, gpr_now (deadline.clock_type)), timeout_str); + mdelem = grpc_mdelem_from_metadata_strings (c->mdctx, GRPC_MDSTR_REF (c->timeout_key_str), grpc_mdstr_from_string (c->mdctx, timeout_str, 0)); + mdelem = hpack_enc (c, mdelem, st); + if (mdelem) + GRPC_MDELEM_UNREF (mdelem); } -gpr_slice grpc_chttp2_data_frame_create_empty_close(gpr_uint32 id) { - gpr_slice slice = gpr_slice_malloc(9); - fill_header(GPR_SLICE_START_PTR(slice), GRPC_CHTTP2_FRAME_DATA, id, 0, 1); +gpr_slice +grpc_chttp2_data_frame_create_empty_close (gpr_uint32 id) +{ + gpr_slice slice = gpr_slice_malloc (9); + fill_header (GPR_SLICE_START_PTR (slice), GRPC_CHTTP2_FRAME_DATA, id, 0, 1); return slice; } -void grpc_chttp2_hpack_compressor_init(grpc_chttp2_hpack_compressor *c, - grpc_mdctx *ctx) { - memset(c, 0, sizeof(*c)); +void +grpc_chttp2_hpack_compressor_init (grpc_chttp2_hpack_compressor * c, grpc_mdctx * ctx) +{ + memset (c, 0, sizeof (*c)); c->mdctx = ctx; - c->timeout_key_str = grpc_mdstr_from_string(ctx, "grpc-timeout", 0); + c->timeout_key_str = grpc_mdstr_from_string (ctx, "grpc-timeout", 0); } -void grpc_chttp2_hpack_compressor_destroy(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]) GRPC_MDSTR_UNREF(c->entries_keys[i]); - if (c->entries_elems[i]) GRPC_MDELEM_UNREF(c->entries_elems[i]); - } - GRPC_MDSTR_UNREF(c->timeout_key_str); + for (i = 0; i < GRPC_CHTTP2_HPACKC_NUM_VALUES; i++) + { + if (c->entries_keys[i]) + GRPC_MDSTR_UNREF (c->entries_keys[i]); + if (c->entries_elems[i]) + GRPC_MDELEM_UNREF (c->entries_elems[i]); + } + GRPC_MDSTR_UNREF (c->timeout_key_str); } -gpr_uint32 grpc_chttp2_preencode(grpc_stream_op *inops, size_t *inops_count, - gpr_uint32 max_flow_controlled_bytes, - grpc_stream_op_buffer *outops) { +gpr_uint32 +grpc_chttp2_preencode (grpc_stream_op * inops, size_t * inops_count, gpr_uint32 max_flow_controlled_bytes, grpc_stream_op_buffer * outops) +{ gpr_slice slice; grpc_stream_op *op; gpr_uint32 max_take_size; @@ -504,78 +546,85 @@ gpr_uint32 grpc_chttp2_preencode(grpc_stream_op *inops, size_t *inops_count, gpr_uint8 *p; gpr_uint8 compressed_flag_set = 0; - while (curop < *inops_count) { - GPR_ASSERT(flow_controlled_bytes_taken <= max_flow_controlled_bytes); - op = &inops[curop]; - switch (op->type) { - case GRPC_NO_OP: - /* skip */ - curop++; - break; - case GRPC_OP_METADATA: - grpc_metadata_batch_assert_ok(&op->data.metadata); - /* these just get copied as they don't impact the number of flow - controlled bytes */ - grpc_sopb_append(outops, op, 1); - curop++; - break; - case GRPC_OP_BEGIN_MESSAGE: - /* begin op: for now we just convert the op to a slice and fall - through - this lets us reuse the slice framing code below */ - compressed_flag_set = - (op->data.begin_message.flags & GRPC_WRITE_INTERNAL_COMPRESS) != 0; - slice = gpr_slice_malloc(5); - - p = GPR_SLICE_START_PTR(slice); - p[0] = compressed_flag_set; - p[1] = (gpr_uint8)(op->data.begin_message.length >> 24); - p[2] = (gpr_uint8)(op->data.begin_message.length >> 16); - p[3] = (gpr_uint8)(op->data.begin_message.length >> 8); - p[4] = (gpr_uint8)(op->data.begin_message.length); - op->type = GRPC_OP_SLICE; - op->data.slice = slice; - /* fallthrough */ - case GRPC_OP_SLICE: - slice = op->data.slice; - if (!GPR_SLICE_LENGTH(slice)) { - /* skip zero length slices */ - gpr_slice_unref(slice); - curop++; - break; - } - max_take_size = max_flow_controlled_bytes - flow_controlled_bytes_taken; - if (max_take_size == 0) { - goto exit_loop; - } - if (GPR_SLICE_LENGTH(slice) > max_take_size) { - slice = gpr_slice_split_head(&op->data.slice, max_take_size); - grpc_sopb_add_slice(outops, slice); - } else { - /* consume this op immediately */ - grpc_sopb_append(outops, op, 1); - curop++; - } - flow_controlled_bytes_taken += (gpr_uint32)GPR_SLICE_LENGTH(slice); - break; - } - } + while (curop < *inops_count) + { + GPR_ASSERT (flow_controlled_bytes_taken <= max_flow_controlled_bytes); + op = &inops[curop]; + switch (op->type) + { + case GRPC_NO_OP: + /* skip */ + curop++; + break; + case GRPC_OP_METADATA: + grpc_metadata_batch_assert_ok (&op->data.metadata); + /* these just get copied as they don't impact the number of flow + controlled bytes */ + grpc_sopb_append (outops, op, 1); + curop++; + break; + case GRPC_OP_BEGIN_MESSAGE: + /* begin op: for now we just convert the op to a slice and fall + through - this lets us reuse the slice framing code below */ + compressed_flag_set = (op->data.begin_message.flags & GRPC_WRITE_INTERNAL_COMPRESS) != 0; + slice = gpr_slice_malloc (5); + + p = GPR_SLICE_START_PTR (slice); + p[0] = compressed_flag_set; + p[1] = (gpr_uint8) (op->data.begin_message.length >> 24); + p[2] = (gpr_uint8) (op->data.begin_message.length >> 16); + p[3] = (gpr_uint8) (op->data.begin_message.length >> 8); + p[4] = (gpr_uint8) (op->data.begin_message.length); + op->type = GRPC_OP_SLICE; + op->data.slice = slice; + /* fallthrough */ + case GRPC_OP_SLICE: + slice = op->data.slice; + if (!GPR_SLICE_LENGTH (slice)) + { + /* skip zero length slices */ + gpr_slice_unref (slice); + curop++; + break; + } + max_take_size = max_flow_controlled_bytes - flow_controlled_bytes_taken; + if (max_take_size == 0) + { + goto exit_loop; + } + if (GPR_SLICE_LENGTH (slice) > max_take_size) + { + slice = gpr_slice_split_head (&op->data.slice, max_take_size); + grpc_sopb_add_slice (outops, slice); + } + else + { + /* consume this op immediately */ + grpc_sopb_append (outops, op, 1); + curop++; + } + flow_controlled_bytes_taken += (gpr_uint32) GPR_SLICE_LENGTH (slice); + break; + } + } exit_loop: *inops_count -= curop; - memmove(inops, inops + curop, *inops_count * sizeof(grpc_stream_op)); - - for (curop = 0; curop < *inops_count; curop++) { - if (inops[curop].type == GRPC_OP_METADATA) { - grpc_metadata_batch_assert_ok(&inops[curop].data.metadata); + memmove (inops, inops + curop, *inops_count * sizeof (grpc_stream_op)); + + for (curop = 0; curop < *inops_count; curop++) + { + if (inops[curop].type == GRPC_OP_METADATA) + { + grpc_metadata_batch_assert_ok (&inops[curop].data.metadata); + } } - } return flow_controlled_bytes_taken; } -void grpc_chttp2_encode(grpc_stream_op *ops, size_t ops_count, int eof, - gpr_uint32 stream_id, - grpc_chttp2_hpack_compressor *compressor, - gpr_slice_buffer *output) { +void +grpc_chttp2_encode (grpc_stream_op * ops, size_t ops_count, int eof, gpr_uint32 stream_id, grpc_chttp2_hpack_compressor * compressor, gpr_slice_buffer * output) +{ framer_state st; gpr_slice slice; grpc_stream_op *op; @@ -587,7 +636,7 @@ void grpc_chttp2_encode(grpc_stream_op *ops, size_t ops_count, int eof, int need_unref = 0; gpr_timespec deadline; - GPR_ASSERT(stream_id != 0); + GPR_ASSERT (stream_id != 0); st.cur_frame_type = NONE; st.last_was_header = 0; @@ -595,70 +644,80 @@ void grpc_chttp2_encode(grpc_stream_op *ops, size_t ops_count, int eof, st.stream_id = stream_id; st.output = output; - while (curop < ops_count) { - op = &ops[curop]; - switch (op->type) { - case GRPC_NO_OP: - case GRPC_OP_BEGIN_MESSAGE: - gpr_log( - GPR_ERROR, - "These stream ops should be filtered out by grpc_chttp2_preencode"); - abort(); - case GRPC_OP_METADATA: - /* Encode a metadata batch; store the returned values, representing - a metadata element that needs to be unreffed back into the metadata - slot. THIS MAY NOT BE THE SAME ELEMENT (if a decoder table slot got - updated). After this loop, we'll do a batch unref of elements. */ - begin_new_frame(&st, HEADER); - need_unref |= op->data.metadata.garbage.head != NULL; - grpc_metadata_batch_assert_ok(&op->data.metadata); - for (l = op->data.metadata.list.head; l; l = l->next) { - l->md = hpack_enc(compressor, l->md, &st); - need_unref |= l->md != NULL; - } - deadline = op->data.metadata.deadline; - if (gpr_time_cmp(deadline, gpr_inf_future(deadline.clock_type)) != 0) { - deadline_enc(compressor, deadline, &st); - } - curop++; - break; - case GRPC_OP_SLICE: - slice = op->data.slice; - if (st.cur_frame_type == DATA && - st.output->length - st.output_length_at_start_of_frame == - GRPC_CHTTP2_MAX_PAYLOAD_LENGTH) { - finish_frame(&st, 0, 0); - } - ensure_frame_type(&st, DATA, 1); - max_take_size = GRPC_CHTTP2_MAX_PAYLOAD_LENGTH + - st.output_length_at_start_of_frame - st.output->length; - if (GPR_SLICE_LENGTH(slice) > max_take_size) { - slice = gpr_slice_split_head(&op->data.slice, max_take_size); - } else { - /* consume this op immediately */ - curop++; - } - gpr_slice_buffer_add(output, slice); - break; - } - } - if (eof && st.cur_frame_type == NONE) { - begin_frame(&st, DATA); - } - finish_frame(&st, 1, eof); - - if (need_unref) { - grpc_mdctx_lock(mdctx); - for (unref_op = 0; unref_op < curop; unref_op++) { - op = &ops[unref_op]; - if (op->type != GRPC_OP_METADATA) continue; - for (l = op->data.metadata.list.head; l; l = l->next) { - if (l->md) GRPC_MDCTX_LOCKED_MDELEM_UNREF(mdctx, l->md); - } - for (l = op->data.metadata.garbage.head; l; l = l->next) { - GRPC_MDCTX_LOCKED_MDELEM_UNREF(mdctx, l->md); - } - } - grpc_mdctx_unlock(mdctx); - } + while (curop < ops_count) + { + op = &ops[curop]; + switch (op->type) + { + case GRPC_NO_OP: + case GRPC_OP_BEGIN_MESSAGE: + gpr_log (GPR_ERROR, "These stream ops should be filtered out by grpc_chttp2_preencode"); + abort (); + case GRPC_OP_METADATA: + /* Encode a metadata batch; store the returned values, representing + a metadata element that needs to be unreffed back into the metadata + slot. THIS MAY NOT BE THE SAME ELEMENT (if a decoder table slot got + updated). After this loop, we'll do a batch unref of elements. */ + begin_new_frame (&st, HEADER); + need_unref |= op->data.metadata.garbage.head != NULL; + grpc_metadata_batch_assert_ok (&op->data.metadata); + for (l = op->data.metadata.list.head; l; l = l->next) + { + l->md = hpack_enc (compressor, l->md, &st); + need_unref |= l->md != NULL; + } + deadline = op->data.metadata.deadline; + if (gpr_time_cmp (deadline, gpr_inf_future (deadline.clock_type)) != 0) + { + deadline_enc (compressor, deadline, &st); + } + curop++; + break; + case GRPC_OP_SLICE: + slice = op->data.slice; + if (st.cur_frame_type == DATA && st.output->length - st.output_length_at_start_of_frame == GRPC_CHTTP2_MAX_PAYLOAD_LENGTH) + { + finish_frame (&st, 0, 0); + } + ensure_frame_type (&st, DATA, 1); + max_take_size = GRPC_CHTTP2_MAX_PAYLOAD_LENGTH + st.output_length_at_start_of_frame - st.output->length; + if (GPR_SLICE_LENGTH (slice) > max_take_size) + { + slice = gpr_slice_split_head (&op->data.slice, max_take_size); + } + else + { + /* consume this op immediately */ + curop++; + } + gpr_slice_buffer_add (output, slice); + break; + } + } + if (eof && st.cur_frame_type == NONE) + { + begin_frame (&st, DATA); + } + finish_frame (&st, 1, eof); + + if (need_unref) + { + grpc_mdctx_lock (mdctx); + for (unref_op = 0; unref_op < curop; unref_op++) + { + op = &ops[unref_op]; + if (op->type != GRPC_OP_METADATA) + continue; + for (l = op->data.metadata.list.head; l; l = l->next) + { + if (l->md) + GRPC_MDCTX_LOCKED_MDELEM_UNREF (mdctx, l->md); + } + for (l = op->data.metadata.garbage.head; l; l = l->next) + { + GRPC_MDCTX_LOCKED_MDELEM_UNREF (mdctx, l->md); + } + } + grpc_mdctx_unlock (mdctx); + } } diff --git a/src/core/transport/chttp2/stream_encoder.h b/src/core/transport/chttp2/stream_encoder.h index db52f2a0f6c..32f003d000c 100644 --- a/src/core/transport/chttp2/stream_encoder.h +++ b/src/core/transport/chttp2/stream_encoder.h @@ -45,7 +45,8 @@ #define GRPC_CHTTP2_HPACKC_NUM_VALUES 256 #define GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS (4096 / 32) -typedef struct { +typedef struct +{ gpr_uint32 filter_elems_sum; /* one before the lowest usable table index */ gpr_uint32 tail_remote_index; @@ -74,20 +75,14 @@ typedef struct { gpr_uint16 table_elem_size[GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS]; } grpc_chttp2_hpack_compressor; -void grpc_chttp2_hpack_compressor_init(grpc_chttp2_hpack_compressor *c, - grpc_mdctx *mdctx); -void grpc_chttp2_hpack_compressor_destroy(grpc_chttp2_hpack_compressor *c); +void grpc_chttp2_hpack_compressor_init (grpc_chttp2_hpack_compressor * c, grpc_mdctx * mdctx); +void grpc_chttp2_hpack_compressor_destroy (grpc_chttp2_hpack_compressor * c); /* select stream ops to be encoded, moving them from inops to outops, and moving subsequent ops in inops forward in the queue */ -gpr_uint32 grpc_chttp2_preencode(grpc_stream_op *inops, size_t *inops_count, - gpr_uint32 max_flow_controlled_bytes, - grpc_stream_op_buffer *outops); +gpr_uint32 grpc_chttp2_preencode (grpc_stream_op * inops, size_t * inops_count, gpr_uint32 max_flow_controlled_bytes, grpc_stream_op_buffer * outops); /* encode stream ops to output */ -void grpc_chttp2_encode(grpc_stream_op *ops, size_t ops_count, int eof, - gpr_uint32 stream_id, - grpc_chttp2_hpack_compressor *compressor, - gpr_slice_buffer *output); +void grpc_chttp2_encode (grpc_stream_op * ops, size_t ops_count, int eof, gpr_uint32 stream_id, grpc_chttp2_hpack_compressor * compressor, gpr_slice_buffer * output); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_STREAM_ENCODER_H */ diff --git a/src/core/transport/chttp2/stream_lists.c b/src/core/transport/chttp2/stream_lists.c index 781db7b0d69..43d7b0b39f2 100644 --- a/src/core/transport/chttp2/stream_lists.c +++ b/src/core/transport/chttp2/stream_lists.c @@ -58,346 +58,348 @@ /* core list management */ -static int stream_list_empty(grpc_chttp2_transport *t, - grpc_chttp2_stream_list_id id) { +static int +stream_list_empty (grpc_chttp2_transport * t, grpc_chttp2_stream_list_id id) +{ return t->lists[id].head == NULL; } -static int stream_list_pop(grpc_chttp2_transport *t, - grpc_chttp2_stream **stream, - grpc_chttp2_stream_list_id id) { +static int +stream_list_pop (grpc_chttp2_transport * t, grpc_chttp2_stream ** stream, grpc_chttp2_stream_list_id id) +{ grpc_chttp2_stream *s = t->lists[id].head; - if (s) { - grpc_chttp2_stream *new_head = s->links[id].next; - GPR_ASSERT(s->included[id]); - if (new_head) { - t->lists[id].head = new_head; - new_head->links[id].prev = NULL; - } else { - t->lists[id].head = NULL; - t->lists[id].tail = NULL; + if (s) + { + grpc_chttp2_stream *new_head = s->links[id].next; + GPR_ASSERT (s->included[id]); + if (new_head) + { + t->lists[id].head = new_head; + new_head->links[id].prev = NULL; + } + else + { + t->lists[id].head = NULL; + t->lists[id].tail = NULL; + } + s->included[id] = 0; } - s->included[id] = 0; - } *stream = s; return s != 0; } -static void stream_list_remove(grpc_chttp2_transport *t, grpc_chttp2_stream *s, - grpc_chttp2_stream_list_id id) { - GPR_ASSERT(s->included[id]); +static void +stream_list_remove (grpc_chttp2_transport * t, grpc_chttp2_stream * s, grpc_chttp2_stream_list_id id) +{ + GPR_ASSERT (s->included[id]); s->included[id] = 0; - if (s->links[id].prev) { - s->links[id].prev->links[id].next = s->links[id].next; - } else { - GPR_ASSERT(t->lists[id].head == s); - t->lists[id].head = s->links[id].next; - } - if (s->links[id].next) { - s->links[id].next->links[id].prev = s->links[id].prev; - } else { - t->lists[id].tail = s->links[id].prev; - } -} - -static void stream_list_maybe_remove(grpc_chttp2_transport *t, - grpc_chttp2_stream *s, - grpc_chttp2_stream_list_id id) { - if (s->included[id]) { - stream_list_remove(t, s, id); - } -} - -static void stream_list_add_head(grpc_chttp2_transport *t, - grpc_chttp2_stream *s, - grpc_chttp2_stream_list_id id) { + if (s->links[id].prev) + { + s->links[id].prev->links[id].next = s->links[id].next; + } + else + { + GPR_ASSERT (t->lists[id].head == s); + t->lists[id].head = s->links[id].next; + } + if (s->links[id].next) + { + s->links[id].next->links[id].prev = s->links[id].prev; + } + else + { + t->lists[id].tail = s->links[id].prev; + } +} + +static void +stream_list_maybe_remove (grpc_chttp2_transport * t, grpc_chttp2_stream * s, grpc_chttp2_stream_list_id id) +{ + if (s->included[id]) + { + stream_list_remove (t, s, id); + } +} + +static void +stream_list_add_head (grpc_chttp2_transport * t, grpc_chttp2_stream * s, grpc_chttp2_stream_list_id id) +{ grpc_chttp2_stream *old_head; - GPR_ASSERT(!s->included[id]); + GPR_ASSERT (!s->included[id]); old_head = t->lists[id].head; s->links[id].next = old_head; s->links[id].prev = NULL; - if (old_head) { - old_head->links[id].prev = s; - } else { - t->lists[id].tail = s; - } + if (old_head) + { + old_head->links[id].prev = s; + } + else + { + t->lists[id].tail = s; + } t->lists[id].head = s; s->included[id] = 1; } -static void stream_list_add_tail(grpc_chttp2_transport *t, - grpc_chttp2_stream *s, - grpc_chttp2_stream_list_id id) { +static void +stream_list_add_tail (grpc_chttp2_transport * t, grpc_chttp2_stream * s, grpc_chttp2_stream_list_id id) +{ grpc_chttp2_stream *old_tail; - GPR_ASSERT(!s->included[id]); + GPR_ASSERT (!s->included[id]); old_tail = t->lists[id].tail; s->links[id].next = NULL; s->links[id].prev = old_tail; - if (old_tail) { - old_tail->links[id].next = s; - } else { - t->lists[id].head = s; - } + if (old_tail) + { + old_tail->links[id].next = s; + } + else + { + t->lists[id].head = s; + } t->lists[id].tail = s; s->included[id] = 1; } -static void stream_list_add(grpc_chttp2_transport *t, grpc_chttp2_stream *s, - grpc_chttp2_stream_list_id id) { - if (s->included[id]) { - return; - } - stream_list_add_tail(t, s, id); +static void +stream_list_add (grpc_chttp2_transport * t, grpc_chttp2_stream * s, grpc_chttp2_stream_list_id id) +{ + if (s->included[id]) + { + return; + } + stream_list_add_tail (t, s, id); } /* wrappers for specializations */ -void grpc_chttp2_list_add_writable_stream( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global) { - GPR_ASSERT(stream_global->id != 0); - stream_list_add(TRANSPORT_FROM_GLOBAL(transport_global), - STREAM_FROM_GLOBAL(stream_global), GRPC_CHTTP2_LIST_WRITABLE); +void +grpc_chttp2_list_add_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) +{ + GPR_ASSERT (stream_global->id != 0); + stream_list_add (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_WRITABLE); } -void grpc_chttp2_list_add_first_writable_stream( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global) { - GPR_ASSERT(stream_global->id != 0); - stream_list_add_head(TRANSPORT_FROM_GLOBAL(transport_global), - STREAM_FROM_GLOBAL(stream_global), - GRPC_CHTTP2_LIST_WRITABLE); +void +grpc_chttp2_list_add_first_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) +{ + GPR_ASSERT (stream_global->id != 0); + stream_list_add_head (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_WRITABLE); } -int grpc_chttp2_list_pop_writable_stream( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_transport_writing *transport_writing, - grpc_chttp2_stream_global **stream_global, - grpc_chttp2_stream_writing **stream_writing) { +int +grpc_chttp2_list_pop_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_writing ** stream_writing) +{ grpc_chttp2_stream *stream; - int r = stream_list_pop(TRANSPORT_FROM_GLOBAL(transport_global), &stream, - GRPC_CHTTP2_LIST_WRITABLE); - if (r != 0) { - *stream_global = &stream->global; - *stream_writing = &stream->writing; - } + int r = stream_list_pop (TRANSPORT_FROM_GLOBAL (transport_global), &stream, + GRPC_CHTTP2_LIST_WRITABLE); + if (r != 0) + { + *stream_global = &stream->global; + *stream_writing = &stream->writing; + } return r; } -void grpc_chttp2_list_remove_writable_stream( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global) { - stream_list_maybe_remove(TRANSPORT_FROM_GLOBAL(transport_global), - STREAM_FROM_GLOBAL(stream_global), - GRPC_CHTTP2_LIST_WRITABLE); +void +grpc_chttp2_list_remove_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) +{ + stream_list_maybe_remove (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_WRITABLE); } -void grpc_chttp2_list_add_writing_stream( - grpc_chttp2_transport_writing *transport_writing, - grpc_chttp2_stream_writing *stream_writing) { - stream_list_add(TRANSPORT_FROM_WRITING(transport_writing), - STREAM_FROM_WRITING(stream_writing), - GRPC_CHTTP2_LIST_WRITING); +void +grpc_chttp2_list_add_writing_stream (grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_writing * stream_writing) +{ + stream_list_add (TRANSPORT_FROM_WRITING (transport_writing), STREAM_FROM_WRITING (stream_writing), GRPC_CHTTP2_LIST_WRITING); } -int grpc_chttp2_list_have_writing_streams( - grpc_chttp2_transport_writing *transport_writing) { - return !stream_list_empty(TRANSPORT_FROM_WRITING(transport_writing), - GRPC_CHTTP2_LIST_WRITING); +int +grpc_chttp2_list_have_writing_streams (grpc_chttp2_transport_writing * transport_writing) +{ + return !stream_list_empty (TRANSPORT_FROM_WRITING (transport_writing), GRPC_CHTTP2_LIST_WRITING); } -int grpc_chttp2_list_pop_writing_stream( - grpc_chttp2_transport_writing *transport_writing, - grpc_chttp2_stream_writing **stream_writing) { +int +grpc_chttp2_list_pop_writing_stream (grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_writing ** stream_writing) +{ grpc_chttp2_stream *stream; - int r = stream_list_pop(TRANSPORT_FROM_WRITING(transport_writing), &stream, - GRPC_CHTTP2_LIST_WRITING); - if (r != 0) { - *stream_writing = &stream->writing; - } + int r = stream_list_pop (TRANSPORT_FROM_WRITING (transport_writing), &stream, + GRPC_CHTTP2_LIST_WRITING); + if (r != 0) + { + *stream_writing = &stream->writing; + } return r; } -void grpc_chttp2_list_add_written_stream( - grpc_chttp2_transport_writing *transport_writing, - grpc_chttp2_stream_writing *stream_writing) { - stream_list_add(TRANSPORT_FROM_WRITING(transport_writing), - STREAM_FROM_WRITING(stream_writing), - GRPC_CHTTP2_LIST_WRITTEN); +void +grpc_chttp2_list_add_written_stream (grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_writing * stream_writing) +{ + stream_list_add (TRANSPORT_FROM_WRITING (transport_writing), STREAM_FROM_WRITING (stream_writing), GRPC_CHTTP2_LIST_WRITTEN); } -int grpc_chttp2_list_pop_written_stream( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_transport_writing *transport_writing, - grpc_chttp2_stream_global **stream_global, - grpc_chttp2_stream_writing **stream_writing) { +int +grpc_chttp2_list_pop_written_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_writing ** stream_writing) +{ grpc_chttp2_stream *stream; - int r = stream_list_pop(TRANSPORT_FROM_WRITING(transport_writing), &stream, - GRPC_CHTTP2_LIST_WRITTEN); - if (r != 0) { - *stream_global = &stream->global; - *stream_writing = &stream->writing; - } + int r = stream_list_pop (TRANSPORT_FROM_WRITING (transport_writing), &stream, + GRPC_CHTTP2_LIST_WRITTEN); + if (r != 0) + { + *stream_global = &stream->global; + *stream_writing = &stream->writing; + } return r; } -void grpc_chttp2_list_add_parsing_seen_stream( - grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_parsing *stream_parsing) { - stream_list_add(TRANSPORT_FROM_PARSING(transport_parsing), - STREAM_FROM_PARSING(stream_parsing), - GRPC_CHTTP2_LIST_PARSING_SEEN); +void +grpc_chttp2_list_add_parsing_seen_stream (grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing) +{ + stream_list_add (TRANSPORT_FROM_PARSING (transport_parsing), STREAM_FROM_PARSING (stream_parsing), GRPC_CHTTP2_LIST_PARSING_SEEN); } -int grpc_chttp2_list_pop_parsing_seen_stream( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_global **stream_global, - grpc_chttp2_stream_parsing **stream_parsing) { +int +grpc_chttp2_list_pop_parsing_seen_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_parsing ** stream_parsing) +{ grpc_chttp2_stream *stream; - int r = stream_list_pop(TRANSPORT_FROM_PARSING(transport_parsing), &stream, - GRPC_CHTTP2_LIST_PARSING_SEEN); - if (r != 0) { - *stream_global = &stream->global; - *stream_parsing = &stream->parsing; - } + int r = stream_list_pop (TRANSPORT_FROM_PARSING (transport_parsing), &stream, + GRPC_CHTTP2_LIST_PARSING_SEEN); + if (r != 0) + { + *stream_global = &stream->global; + *stream_parsing = &stream->parsing; + } return r; } -void grpc_chttp2_list_add_waiting_for_concurrency( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global) { - stream_list_add(TRANSPORT_FROM_GLOBAL(transport_global), - STREAM_FROM_GLOBAL(stream_global), - GRPC_CHTTP2_LIST_WAITING_FOR_CONCURRENCY); +void +grpc_chttp2_list_add_waiting_for_concurrency (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) +{ + stream_list_add (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_WAITING_FOR_CONCURRENCY); } -int grpc_chttp2_list_pop_waiting_for_concurrency( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global **stream_global) { +int +grpc_chttp2_list_pop_waiting_for_concurrency (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global) +{ grpc_chttp2_stream *stream; - int r = stream_list_pop(TRANSPORT_FROM_GLOBAL(transport_global), &stream, - GRPC_CHTTP2_LIST_WAITING_FOR_CONCURRENCY); - if (r != 0) { - *stream_global = &stream->global; - } + int r = stream_list_pop (TRANSPORT_FROM_GLOBAL (transport_global), &stream, + GRPC_CHTTP2_LIST_WAITING_FOR_CONCURRENCY); + if (r != 0) + { + *stream_global = &stream->global; + } return r; } -void grpc_chttp2_list_add_closed_waiting_for_parsing( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global) { - stream_list_add(TRANSPORT_FROM_GLOBAL(transport_global), - STREAM_FROM_GLOBAL(stream_global), - GRPC_CHTTP2_LIST_CLOSED_WAITING_FOR_PARSING); +void +grpc_chttp2_list_add_closed_waiting_for_parsing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) +{ + stream_list_add (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_CLOSED_WAITING_FOR_PARSING); } -int grpc_chttp2_list_pop_closed_waiting_for_parsing( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global **stream_global) { +int +grpc_chttp2_list_pop_closed_waiting_for_parsing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global) +{ grpc_chttp2_stream *stream; - int r = stream_list_pop(TRANSPORT_FROM_GLOBAL(transport_global), &stream, - GRPC_CHTTP2_LIST_CLOSED_WAITING_FOR_PARSING); - if (r != 0) { - *stream_global = &stream->global; - } + int r = stream_list_pop (TRANSPORT_FROM_GLOBAL (transport_global), &stream, + GRPC_CHTTP2_LIST_CLOSED_WAITING_FOR_PARSING); + if (r != 0) + { + *stream_global = &stream->global; + } return r; } -void grpc_chttp2_list_add_cancelled_waiting_for_writing( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global) { - stream_list_add(TRANSPORT_FROM_GLOBAL(transport_global), - STREAM_FROM_GLOBAL(stream_global), - GRPC_CHTTP2_LIST_CANCELLED_WAITING_FOR_WRITING); +void +grpc_chttp2_list_add_cancelled_waiting_for_writing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) +{ + stream_list_add (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_CANCELLED_WAITING_FOR_WRITING); } -int grpc_chttp2_list_pop_cancelled_waiting_for_writing( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global **stream_global) { +int +grpc_chttp2_list_pop_cancelled_waiting_for_writing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global) +{ grpc_chttp2_stream *stream; - int r = stream_list_pop(TRANSPORT_FROM_GLOBAL(transport_global), &stream, - GRPC_CHTTP2_LIST_CANCELLED_WAITING_FOR_WRITING); - if (r != 0) { - *stream_global = &stream->global; - } + int r = stream_list_pop (TRANSPORT_FROM_GLOBAL (transport_global), &stream, + GRPC_CHTTP2_LIST_CANCELLED_WAITING_FOR_WRITING); + if (r != 0) + { + *stream_global = &stream->global; + } return r; } -void grpc_chttp2_list_add_incoming_window_updated( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global) { - stream_list_add(TRANSPORT_FROM_GLOBAL(transport_global), - STREAM_FROM_GLOBAL(stream_global), - GRPC_CHTTP2_LIST_INCOMING_WINDOW_UPDATED); +void +grpc_chttp2_list_add_incoming_window_updated (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) +{ + stream_list_add (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_INCOMING_WINDOW_UPDATED); } -int grpc_chttp2_list_pop_incoming_window_updated( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_transport_parsing *transport_parsing, - grpc_chttp2_stream_global **stream_global, - grpc_chttp2_stream_parsing **stream_parsing) { +int +grpc_chttp2_list_pop_incoming_window_updated (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_parsing ** stream_parsing) +{ grpc_chttp2_stream *stream; - int r = stream_list_pop(TRANSPORT_FROM_GLOBAL(transport_global), &stream, - GRPC_CHTTP2_LIST_INCOMING_WINDOW_UPDATED); - if (r != 0) { - *stream_global = &stream->global; - *stream_parsing = &stream->parsing; - } + int r = stream_list_pop (TRANSPORT_FROM_GLOBAL (transport_global), &stream, + GRPC_CHTTP2_LIST_INCOMING_WINDOW_UPDATED); + if (r != 0) + { + *stream_global = &stream->global; + *stream_parsing = &stream->parsing; + } return r; } -void grpc_chttp2_list_remove_incoming_window_updated( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global) { - stream_list_maybe_remove(TRANSPORT_FROM_GLOBAL(transport_global), - STREAM_FROM_GLOBAL(stream_global), - GRPC_CHTTP2_LIST_INCOMING_WINDOW_UPDATED); +void +grpc_chttp2_list_remove_incoming_window_updated (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) +{ + stream_list_maybe_remove (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_INCOMING_WINDOW_UPDATED); } -void grpc_chttp2_list_add_read_write_state_changed( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global) { - stream_list_add(TRANSPORT_FROM_GLOBAL(transport_global), - STREAM_FROM_GLOBAL(stream_global), - GRPC_CHTTP2_LIST_READ_WRITE_STATE_CHANGED); +void +grpc_chttp2_list_add_read_write_state_changed (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) +{ + stream_list_add (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_READ_WRITE_STATE_CHANGED); } -int grpc_chttp2_list_pop_read_write_state_changed( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global **stream_global) { +int +grpc_chttp2_list_pop_read_write_state_changed (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global) +{ grpc_chttp2_stream *stream; - int r = stream_list_pop(TRANSPORT_FROM_GLOBAL(transport_global), &stream, - GRPC_CHTTP2_LIST_READ_WRITE_STATE_CHANGED); - if (r != 0) { - *stream_global = &stream->global; - } + int r = stream_list_pop (TRANSPORT_FROM_GLOBAL (transport_global), &stream, + GRPC_CHTTP2_LIST_READ_WRITE_STATE_CHANGED); + if (r != 0) + { + *stream_global = &stream->global; + } return r; } -void grpc_chttp2_register_stream(grpc_chttp2_transport *t, - grpc_chttp2_stream *s) { - stream_list_add_tail(t, s, GRPC_CHTTP2_LIST_ALL_STREAMS); +void +grpc_chttp2_register_stream (grpc_chttp2_transport * t, grpc_chttp2_stream * s) +{ + stream_list_add_tail (t, s, GRPC_CHTTP2_LIST_ALL_STREAMS); } -int grpc_chttp2_unregister_stream(grpc_chttp2_transport *t, - grpc_chttp2_stream *s) { - stream_list_maybe_remove(t, s, GRPC_CHTTP2_LIST_ALL_STREAMS); - return stream_list_empty(t, GRPC_CHTTP2_LIST_ALL_STREAMS); +int +grpc_chttp2_unregister_stream (grpc_chttp2_transport * t, grpc_chttp2_stream * s) +{ + stream_list_maybe_remove (t, s, GRPC_CHTTP2_LIST_ALL_STREAMS); + return stream_list_empty (t, GRPC_CHTTP2_LIST_ALL_STREAMS); } -int grpc_chttp2_has_streams(grpc_chttp2_transport *t) { - return !stream_list_empty(t, GRPC_CHTTP2_LIST_ALL_STREAMS); +int +grpc_chttp2_has_streams (grpc_chttp2_transport * t) +{ + return !stream_list_empty (t, GRPC_CHTTP2_LIST_ALL_STREAMS); } -void grpc_chttp2_for_all_streams( - grpc_chttp2_transport_global *transport_global, void *user_data, - void (*cb)(grpc_chttp2_transport_global *transport_global, void *user_data, - grpc_chttp2_stream_global *stream_global)) { +void +grpc_chttp2_for_all_streams (grpc_chttp2_transport_global * transport_global, void *user_data, void (*cb) (grpc_chttp2_transport_global * transport_global, void *user_data, grpc_chttp2_stream_global * stream_global)) +{ grpc_chttp2_stream *s; - grpc_chttp2_transport *t = TRANSPORT_FROM_GLOBAL(transport_global); - for (s = t->lists[GRPC_CHTTP2_LIST_ALL_STREAMS].head; s != NULL; - s = s->links[GRPC_CHTTP2_LIST_ALL_STREAMS].next) { - cb(transport_global, user_data, &s->global); - } + grpc_chttp2_transport *t = TRANSPORT_FROM_GLOBAL (transport_global); + for (s = t->lists[GRPC_CHTTP2_LIST_ALL_STREAMS].head; s != NULL; s = s->links[GRPC_CHTTP2_LIST_ALL_STREAMS].next) + { + cb (transport_global, user_data, &s->global); + } } diff --git a/src/core/transport/chttp2/stream_map.c b/src/core/transport/chttp2/stream_map.c index bd16153ed1d..00878c1d2a3 100644 --- a/src/core/transport/chttp2/stream_map.c +++ b/src/core/transport/chttp2/stream_map.c @@ -39,98 +39,117 @@ #include #include -void grpc_chttp2_stream_map_init(grpc_chttp2_stream_map *map, - size_t initial_capacity) { - GPR_ASSERT(initial_capacity > 1); - map->keys = gpr_malloc(sizeof(gpr_uint32) * initial_capacity); - map->values = gpr_malloc(sizeof(void *) * initial_capacity); +void +grpc_chttp2_stream_map_init (grpc_chttp2_stream_map * map, size_t initial_capacity) +{ + GPR_ASSERT (initial_capacity > 1); + map->keys = gpr_malloc (sizeof (gpr_uint32) * initial_capacity); + map->values = gpr_malloc (sizeof (void *) * initial_capacity); map->count = 0; map->free = 0; map->capacity = initial_capacity; } -void grpc_chttp2_stream_map_destroy(grpc_chttp2_stream_map *map) { - gpr_free(map->keys); - gpr_free(map->values); +void +grpc_chttp2_stream_map_destroy (grpc_chttp2_stream_map * map) +{ + gpr_free (map->keys); + gpr_free (map->values); } -static size_t compact(gpr_uint32 *keys, void **values, size_t count) { +static size_t +compact (gpr_uint32 * keys, void **values, size_t count) +{ size_t i, out; - for (i = 0, out = 0; i < count; i++) { - if (values[i]) { - keys[out] = keys[i]; - values[out] = values[i]; - out++; + for (i = 0, out = 0; i < count; i++) + { + if (values[i]) + { + keys[out] = keys[i]; + values[out] = values[i]; + out++; + } } - } return out; } -void grpc_chttp2_stream_map_add(grpc_chttp2_stream_map *map, gpr_uint32 key, - void *value) { +void +grpc_chttp2_stream_map_add (grpc_chttp2_stream_map * map, gpr_uint32 key, void *value) +{ size_t count = map->count; size_t capacity = map->capacity; gpr_uint32 *keys = map->keys; void **values = map->values; - GPR_ASSERT(count == 0 || keys[count - 1] < key); - GPR_ASSERT(value); - - if (count == capacity) { - if (map->free > capacity / 4) { - count = compact(keys, values, count); - map->free = 0; - } else { - /* resize when less than 25% of the table is free, because compaction - won't help much */ - map->capacity = capacity = 3 * capacity / 2; - map->keys = keys = gpr_realloc(keys, capacity * sizeof(gpr_uint32)); - map->values = values = gpr_realloc(values, capacity * sizeof(void *)); + GPR_ASSERT (count == 0 || keys[count - 1] < key); + GPR_ASSERT (value); + + if (count == capacity) + { + if (map->free > capacity / 4) + { + count = compact (keys, values, count); + map->free = 0; + } + else + { + /* resize when less than 25% of the table is free, because compaction + won't help much */ + map->capacity = capacity = 3 * capacity / 2; + map->keys = keys = gpr_realloc (keys, capacity * sizeof (gpr_uint32)); + map->values = values = gpr_realloc (values, capacity * sizeof (void *)); + } } - } keys[count] = key; values[count] = value; map->count = count + 1; } -void grpc_chttp2_stream_map_move_into(grpc_chttp2_stream_map *src, - grpc_chttp2_stream_map *dst) { +void +grpc_chttp2_stream_map_move_into (grpc_chttp2_stream_map * src, grpc_chttp2_stream_map * dst) +{ /* if src is empty we dont need to do anything */ - if (src->count == src->free) { - return; - } + if (src->count == src->free) + { + return; + } /* if dst is empty we simply need to swap */ - if (dst->count == dst->free) { - GPR_SWAP(grpc_chttp2_stream_map, *src, *dst); - return; - } + if (dst->count == dst->free) + { + GPR_SWAP (grpc_chttp2_stream_map, *src, *dst); + return; + } /* the first element of src must be greater than the last of dst... * however the maps may need compacting for this property to hold */ - if (src->keys[0] <= dst->keys[dst->count - 1]) { - src->count = compact(src->keys, src->values, src->count); - src->free = 0; - dst->count = compact(dst->keys, dst->values, dst->count); - dst->free = 0; - } - GPR_ASSERT(src->keys[0] > dst->keys[dst->count - 1]); + if (src->keys[0] <= dst->keys[dst->count - 1]) + { + src->count = compact (src->keys, src->values, src->count); + src->free = 0; + dst->count = compact (dst->keys, dst->values, dst->count); + dst->free = 0; + } + GPR_ASSERT (src->keys[0] > dst->keys[dst->count - 1]); /* if dst doesn't have capacity, resize */ - if (dst->count + src->count > dst->capacity) { - dst->capacity = GPR_MAX(dst->capacity * 3 / 2, dst->count + src->count); - dst->keys = gpr_realloc(dst->keys, dst->capacity * sizeof(gpr_uint32)); - dst->values = gpr_realloc(dst->values, dst->capacity * sizeof(void *)); - } - memcpy(dst->keys + dst->count, src->keys, src->count * sizeof(gpr_uint32)); - memcpy(dst->values + dst->count, src->values, src->count * sizeof(void *)); + if (dst->count + src->count > dst->capacity) + { + dst->capacity = GPR_MAX (dst->capacity * 3 / 2, dst->count + src->count); + dst->keys = gpr_realloc (dst->keys, dst->capacity * sizeof (gpr_uint32)); + dst->values = gpr_realloc (dst->values, dst->capacity * sizeof (void *)); + } + memcpy (dst->keys + dst->count, src->keys, src->count * sizeof (gpr_uint32)); + memcpy (dst->values + dst->count, src->values, src->count * sizeof (void *)); dst->count += src->count; dst->free += src->free; src->count = 0; src->free = 0; } -static void **find(grpc_chttp2_stream_map *map, gpr_uint32 key) { +static void ** +find (grpc_chttp2_stream_map * map, gpr_uint32 key) +{ size_t min_idx = 0; size_t max_idx = map->count; size_t mid_idx; @@ -138,60 +157,75 @@ static void **find(grpc_chttp2_stream_map *map, gpr_uint32 key) { void **values = map->values; gpr_uint32 mid_key; - if (max_idx == 0) return NULL; - - while (min_idx < max_idx) { - /* find the midpoint, avoiding overflow */ - mid_idx = min_idx + ((max_idx - min_idx) / 2); - mid_key = keys[mid_idx]; - - if (mid_key < key) { - min_idx = mid_idx + 1; - } else if (mid_key > key) { - max_idx = mid_idx; - } else /* mid_key == key */ { - return &values[mid_idx]; + if (max_idx == 0) + return NULL; + + while (min_idx < max_idx) + { + /* find the midpoint, avoiding overflow */ + mid_idx = min_idx + ((max_idx - min_idx) / 2); + mid_key = keys[mid_idx]; + + if (mid_key < key) + { + min_idx = mid_idx + 1; + } + else if (mid_key > key) + { + max_idx = mid_idx; + } + else /* mid_key == key */ + { + return &values[mid_idx]; + } } - } return NULL; } -void *grpc_chttp2_stream_map_delete(grpc_chttp2_stream_map *map, - gpr_uint32 key) { - void **pvalue = find(map, key); +void * +grpc_chttp2_stream_map_delete (grpc_chttp2_stream_map * map, gpr_uint32 key) +{ + void **pvalue = find (map, key); void *out = NULL; - if (pvalue != NULL) { - out = *pvalue; - *pvalue = NULL; - map->free += (out != NULL); - /* recognize complete emptyness and ensure we can skip - * defragmentation later */ - if (map->free == map->count) { - map->free = map->count = 0; + if (pvalue != NULL) + { + out = *pvalue; + *pvalue = NULL; + map->free += (out != NULL); + /* recognize complete emptyness and ensure we can skip + * defragmentation later */ + if (map->free == map->count) + { + map->free = map->count = 0; + } } - } return out; } -void *grpc_chttp2_stream_map_find(grpc_chttp2_stream_map *map, gpr_uint32 key) { - void **pvalue = find(map, key); +void * +grpc_chttp2_stream_map_find (grpc_chttp2_stream_map * map, gpr_uint32 key) +{ + void **pvalue = find (map, key); return pvalue != NULL ? *pvalue : NULL; } -size_t grpc_chttp2_stream_map_size(grpc_chttp2_stream_map *map) { +size_t +grpc_chttp2_stream_map_size (grpc_chttp2_stream_map * map) +{ return map->count - map->free; } -void grpc_chttp2_stream_map_for_each(grpc_chttp2_stream_map *map, - void (*f)(void *user_data, gpr_uint32 key, - void *value), - void *user_data) { +void +grpc_chttp2_stream_map_for_each (grpc_chttp2_stream_map * map, void (*f) (void *user_data, gpr_uint32 key, void *value), void *user_data) +{ size_t i; - for (i = 0; i < map->count; i++) { - if (map->values[i]) { - f(user_data, map->keys[i], map->values[i]); + for (i = 0; i < map->count; i++) + { + if (map->values[i]) + { + f (user_data, map->keys[i], map->values[i]); + } } - } } diff --git a/src/core/transport/chttp2/stream_map.h b/src/core/transport/chttp2/stream_map.h index 71b05820541..2af61212da1 100644 --- a/src/core/transport/chttp2/stream_map.h +++ b/src/core/transport/chttp2/stream_map.h @@ -44,7 +44,8 @@ Lookups are performed with binary search. Adds are restricted to strictly higher keys than previously seen (this is guaranteed by http2). */ -typedef struct { +typedef struct +{ gpr_uint32 *keys; void **values; size_t count; @@ -52,34 +53,27 @@ typedef struct { size_t capacity; } grpc_chttp2_stream_map; -void grpc_chttp2_stream_map_init(grpc_chttp2_stream_map *map, - size_t initial_capacity); -void grpc_chttp2_stream_map_destroy(grpc_chttp2_stream_map *map); +void grpc_chttp2_stream_map_init (grpc_chttp2_stream_map * map, size_t initial_capacity); +void grpc_chttp2_stream_map_destroy (grpc_chttp2_stream_map * map); /* Add a new key: given http2 semantics, new keys must always be greater than existing keys - this is asserted */ -void grpc_chttp2_stream_map_add(grpc_chttp2_stream_map *map, gpr_uint32 key, - void *value); +void grpc_chttp2_stream_map_add (grpc_chttp2_stream_map * map, gpr_uint32 key, void *value); /* Delete an existing key - returns the previous value of the key if it existed, or NULL otherwise */ -void *grpc_chttp2_stream_map_delete(grpc_chttp2_stream_map *map, - gpr_uint32 key); +void *grpc_chttp2_stream_map_delete (grpc_chttp2_stream_map * map, gpr_uint32 key); /* Move all elements of src into dst */ -void grpc_chttp2_stream_map_move_into(grpc_chttp2_stream_map *src, - grpc_chttp2_stream_map *dst); +void grpc_chttp2_stream_map_move_into (grpc_chttp2_stream_map * src, grpc_chttp2_stream_map * dst); /* Return an existing key, or NULL if it does not exist */ -void *grpc_chttp2_stream_map_find(grpc_chttp2_stream_map *map, gpr_uint32 key); +void *grpc_chttp2_stream_map_find (grpc_chttp2_stream_map * map, gpr_uint32 key); /* How many (populated) entries are in the stream map? */ -size_t grpc_chttp2_stream_map_size(grpc_chttp2_stream_map *map); +size_t grpc_chttp2_stream_map_size (grpc_chttp2_stream_map * map); /* Callback on each stream */ -void grpc_chttp2_stream_map_for_each(grpc_chttp2_stream_map *map, - void (*f)(void *user_data, gpr_uint32 key, - void *value), - void *user_data); +void grpc_chttp2_stream_map_for_each (grpc_chttp2_stream_map * map, void (*f) (void *user_data, gpr_uint32 key, void *value), void *user_data); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_STREAM_MAP_H */ diff --git a/src/core/transport/chttp2/timeout_encoding.c b/src/core/transport/chttp2/timeout_encoding.c index 8a9b290ecb9..e2412424033 100644 --- a/src/core/transport/chttp2/timeout_encoding.c +++ b/src/core/transport/chttp2/timeout_encoding.c @@ -38,147 +38,215 @@ #include "src/core/support/string.h" -static int round_up(int x, int divisor) { +static int +round_up (int x, int divisor) +{ return (x / divisor + (x % divisor != 0)) * divisor; } /* round an integer up to the next value with three significant figures */ -static int round_up_to_three_sig_figs(int x) { - if (x < 1000) return x; - if (x < 10000) return round_up(x, 10); - if (x < 100000) return round_up(x, 100); - if (x < 1000000) return round_up(x, 1000); - if (x < 10000000) return round_up(x, 10000); - if (x < 100000000) return round_up(x, 100000); - if (x < 1000000000) return round_up(x, 1000000); - return round_up(x, 10000000); +static int +round_up_to_three_sig_figs (int x) +{ + if (x < 1000) + return x; + if (x < 10000) + return round_up (x, 10); + if (x < 100000) + return round_up (x, 100); + if (x < 1000000) + return round_up (x, 1000); + if (x < 10000000) + return round_up (x, 10000); + if (x < 100000000) + return round_up (x, 100000); + if (x < 1000000000) + return round_up (x, 1000000); + return round_up (x, 10000000); } /* encode our minimum viable timeout value */ -static void enc_tiny(char *buffer) { memcpy(buffer, "1n", 3); } +static void +enc_tiny (char *buffer) +{ + memcpy (buffer, "1n", 3); +} -static void enc_ext(char *buffer, long value, char ext) { - int n = gpr_ltoa(value, buffer); +static void +enc_ext (char *buffer, long value, char ext) +{ + int n = gpr_ltoa (value, buffer); buffer[n] = ext; buffer[n + 1] = 0; } -static void enc_seconds(char *buffer, long sec) { - if (sec % 3600 == 0) { - enc_ext(buffer, sec / 3600, 'H'); - } else if (sec % 60 == 0) { - enc_ext(buffer, sec / 60, 'M'); - } else { - enc_ext(buffer, sec, 'S'); - } +static void +enc_seconds (char *buffer, long sec) +{ + if (sec % 3600 == 0) + { + enc_ext (buffer, sec / 3600, 'H'); + } + else if (sec % 60 == 0) + { + enc_ext (buffer, sec / 60, 'M'); + } + else + { + enc_ext (buffer, sec, 'S'); + } } -static void enc_nanos(char *buffer, int x) { - x = round_up_to_three_sig_figs(x); - if (x < 100000) { - if (x % 1000 == 0) { - enc_ext(buffer, x / 1000, 'u'); - } else { - enc_ext(buffer, x, 'n'); - } - } else if (x < 100000000) { - if (x % 1000000 == 0) { - enc_ext(buffer, x / 1000000, 'm'); - } else { - enc_ext(buffer, x / 1000, 'u'); - } - } else if (x < 1000000000) { - enc_ext(buffer, x / 1000000, 'm'); - } else { - /* note that this is only ever called with times of less than one second, - so if we reach here the time must have been rounded up to a whole second - (and no more) */ - memcpy(buffer, "1S", 3); - } +static void +enc_nanos (char *buffer, int x) +{ + x = round_up_to_three_sig_figs (x); + if (x < 100000) + { + if (x % 1000 == 0) + { + enc_ext (buffer, x / 1000, 'u'); + } + else + { + enc_ext (buffer, x, 'n'); + } + } + else if (x < 100000000) + { + if (x % 1000000 == 0) + { + enc_ext (buffer, x / 1000000, 'm'); + } + else + { + enc_ext (buffer, x / 1000, 'u'); + } + } + else if (x < 1000000000) + { + enc_ext (buffer, x / 1000000, 'm'); + } + else + { + /* note that this is only ever called with times of less than one second, + so if we reach here the time must have been rounded up to a whole second + (and no more) */ + memcpy (buffer, "1S", 3); + } } -static void enc_micros(char *buffer, int x) { - x = round_up_to_three_sig_figs(x); - if (x < 100000) { - if (x % 1000 == 0) { - enc_ext(buffer, x / 1000, 'm'); - } else { - enc_ext(buffer, x, 'u'); - } - } else if (x < 100000000) { - if (x % 1000000 == 0) { - enc_ext(buffer, x / 1000000, 'S'); - } else { - enc_ext(buffer, x / 1000, 'm'); - } - } else { - enc_ext(buffer, x / 1000000, 'S'); - } +static void +enc_micros (char *buffer, int x) +{ + x = round_up_to_three_sig_figs (x); + if (x < 100000) + { + if (x % 1000 == 0) + { + enc_ext (buffer, x / 1000, 'm'); + } + else + { + enc_ext (buffer, x, 'u'); + } + } + else if (x < 100000000) + { + if (x % 1000000 == 0) + { + enc_ext (buffer, x / 1000000, 'S'); + } + else + { + enc_ext (buffer, x / 1000, 'm'); + } + } + else + { + enc_ext (buffer, x / 1000000, 'S'); + } } -void grpc_chttp2_encode_timeout(gpr_timespec timeout, char *buffer) { - if (timeout.tv_sec < 0) { - enc_tiny(buffer); - } else if (timeout.tv_sec == 0) { - enc_nanos(buffer, timeout.tv_nsec); - } else if (timeout.tv_sec < 1000 && timeout.tv_nsec != 0) { - enc_micros(buffer, - (int)(timeout.tv_sec * 1000000) + - (timeout.tv_nsec / 1000 + (timeout.tv_nsec % 1000 != 0))); - } else { - enc_seconds(buffer, timeout.tv_sec + (timeout.tv_nsec != 0)); - } +void +grpc_chttp2_encode_timeout (gpr_timespec timeout, char *buffer) +{ + if (timeout.tv_sec < 0) + { + enc_tiny (buffer); + } + else if (timeout.tv_sec == 0) + { + enc_nanos (buffer, timeout.tv_nsec); + } + else if (timeout.tv_sec < 1000 && timeout.tv_nsec != 0) + { + enc_micros (buffer, (int) (timeout.tv_sec * 1000000) + (timeout.tv_nsec / 1000 + (timeout.tv_nsec % 1000 != 0))); + } + else + { + enc_seconds (buffer, timeout.tv_sec + (timeout.tv_nsec != 0)); + } } -static int is_all_whitespace(const char *p) { - while (*p == ' ') p++; +static int +is_all_whitespace (const char *p) +{ + while (*p == ' ') + p++; return *p == 0; } -int grpc_chttp2_decode_timeout(const char *buffer, gpr_timespec *timeout) { +int +grpc_chttp2_decode_timeout (const char *buffer, gpr_timespec * timeout) +{ gpr_uint32 x = 0; - const gpr_uint8 *p = (const gpr_uint8 *)buffer; + const gpr_uint8 *p = (const gpr_uint8 *) buffer; int have_digit = 0; /* skip whitespace */ for (; *p == ' '; p++) ; /* decode numeric part */ - for (; *p >= '0' && *p <= '9'; p++) { - gpr_uint32 xp = x * 10u + (gpr_uint32)*p - (gpr_uint32)'0'; - have_digit = 1; - if (xp < x) { - *timeout = gpr_inf_future(GPR_CLOCK_REALTIME); - return 1; - } - x = xp; - } - if (!have_digit) return 0; + for (; *p >= '0' && *p <= '9'; p++) + { + gpr_uint32 xp = x * 10u + (gpr_uint32) * p - (gpr_uint32) '0'; + have_digit = 1; + if (xp < x) + { + *timeout = gpr_inf_future (GPR_CLOCK_REALTIME); + return 1; + } + x = xp; + } + if (!have_digit) + return 0; /* skip whitespace */ for (; *p == ' '; p++) ; /* decode unit specifier */ - switch (*p) { + switch (*p) + { case 'n': - *timeout = gpr_time_from_nanos(x, GPR_TIMESPAN); + *timeout = gpr_time_from_nanos (x, GPR_TIMESPAN); break; case 'u': - *timeout = gpr_time_from_micros(x, GPR_TIMESPAN); + *timeout = gpr_time_from_micros (x, GPR_TIMESPAN); break; case 'm': - *timeout = gpr_time_from_millis(x, GPR_TIMESPAN); + *timeout = gpr_time_from_millis (x, GPR_TIMESPAN); break; case 'S': - *timeout = gpr_time_from_seconds(x, GPR_TIMESPAN); + *timeout = gpr_time_from_seconds (x, GPR_TIMESPAN); break; case 'M': - *timeout = gpr_time_from_minutes(x, GPR_TIMESPAN); + *timeout = gpr_time_from_minutes (x, GPR_TIMESPAN); break; case 'H': - *timeout = gpr_time_from_hours(x, GPR_TIMESPAN); + *timeout = gpr_time_from_hours (x, GPR_TIMESPAN); break; default: return 0; - } + } p++; - return is_all_whitespace((const char *)p); + return is_all_whitespace ((const char *) p); } diff --git a/src/core/transport/chttp2/timeout_encoding.h b/src/core/transport/chttp2/timeout_encoding.h index 9d8756e799d..b68ce2e5d6f 100644 --- a/src/core/transport/chttp2/timeout_encoding.h +++ b/src/core/transport/chttp2/timeout_encoding.h @@ -41,7 +41,7 @@ /* Encode/decode timeouts to the GRPC over HTTP2 format; encoding may round up arbitrarily */ -void grpc_chttp2_encode_timeout(gpr_timespec timeout, char *buffer); -int grpc_chttp2_decode_timeout(const char *buffer, gpr_timespec *timeout); +void grpc_chttp2_encode_timeout (gpr_timespec timeout, char *buffer); +int grpc_chttp2_decode_timeout (const char *buffer, gpr_timespec * timeout); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_TIMEOUT_ENCODING_H */ diff --git a/src/core/transport/chttp2/varint.c b/src/core/transport/chttp2/varint.c index 056f68047b3..f478a9d847d 100644 --- a/src/core/transport/chttp2/varint.c +++ b/src/core/transport/chttp2/varint.c @@ -33,34 +33,46 @@ #include "src/core/transport/chttp2/varint.h" -gpr_uint32 grpc_chttp2_hpack_varint_length(gpr_uint32 tail_value) { - if (tail_value < (1 << 7)) { - return 2; - } else if (tail_value < (1 << 14)) { - return 3; - } else if (tail_value < (1 << 21)) { - return 4; - } else if (tail_value < (1 << 28)) { - return 5; - } else { - return 6; - } +gpr_uint32 +grpc_chttp2_hpack_varint_length (gpr_uint32 tail_value) +{ + if (tail_value < (1 << 7)) + { + return 2; + } + else if (tail_value < (1 << 14)) + { + return 3; + } + else if (tail_value < (1 << 21)) + { + return 4; + } + else if (tail_value < (1 << 28)) + { + return 5; + } + else + { + return 6; + } } -void grpc_chttp2_hpack_write_varint_tail(gpr_uint32 tail_value, - gpr_uint8* target, - gpr_uint32 tail_length) { - switch (tail_length) { +void +grpc_chttp2_hpack_write_varint_tail (gpr_uint32 tail_value, gpr_uint8 * target, gpr_uint32 tail_length) +{ + switch (tail_length) + { case 5: - target[4] = (gpr_uint8)((tail_value >> 28) | 0x80); + target[4] = (gpr_uint8) ((tail_value >> 28) | 0x80); case 4: - target[3] = (gpr_uint8)((tail_value >> 21) | 0x80); + target[3] = (gpr_uint8) ((tail_value >> 21) | 0x80); case 3: - target[2] = (gpr_uint8)((tail_value >> 14) | 0x80); + target[2] = (gpr_uint8) ((tail_value >> 14) | 0x80); case 2: - target[1] = (gpr_uint8)((tail_value >> 7) | 0x80); + target[1] = (gpr_uint8) ((tail_value >> 7) | 0x80); case 1: - target[0] = (gpr_uint8)((tail_value) | 0x80); - } + target[0] = (gpr_uint8) ((tail_value) | 0x80); + } target[tail_length - 1] &= 0x7f; } diff --git a/src/core/transport/chttp2/varint.h b/src/core/transport/chttp2/varint.h index 4dfcc76773e..4193305d0f7 100644 --- a/src/core/transport/chttp2/varint.h +++ b/src/core/transport/chttp2/varint.h @@ -41,11 +41,9 @@ /* length of a value that needs varint tail encoding (it's bigger than can be bitpacked into the opcode byte) - returned value includes the length of the opcode byte */ -gpr_uint32 grpc_chttp2_hpack_varint_length(gpr_uint32 tail_value); +gpr_uint32 grpc_chttp2_hpack_varint_length (gpr_uint32 tail_value); -void grpc_chttp2_hpack_write_varint_tail(gpr_uint32 tail_value, - gpr_uint8* target, - gpr_uint32 tail_length); +void grpc_chttp2_hpack_write_varint_tail (gpr_uint32 tail_value, gpr_uint8 * target, gpr_uint32 tail_length); /* maximum value that can be bitpacked with the opcode if the opcode has a prefix diff --git a/src/core/transport/chttp2/writing.c b/src/core/transport/chttp2/writing.c index e6f169c2807..edf40f54fb4 100644 --- a/src/core/transport/chttp2/writing.c +++ b/src/core/transport/chttp2/writing.c @@ -39,205 +39,174 @@ #include "src/core/transport/chttp2/http2_errors.h" -static void finalize_outbuf(grpc_chttp2_transport_writing *transport_writing); +static void finalize_outbuf (grpc_chttp2_transport_writing * transport_writing); -int grpc_chttp2_unlocking_check_writes( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_transport_writing *transport_writing) { +int +grpc_chttp2_unlocking_check_writes (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_writing * transport_writing) +{ grpc_chttp2_stream_global *stream_global; grpc_chttp2_stream_writing *stream_writing; grpc_chttp2_stream_global *first_reinserted_stream = NULL; gpr_uint32 window_delta; /* simple writes are queued to qbuf, and flushed here */ - gpr_slice_buffer_swap(&transport_global->qbuf, &transport_writing->outbuf); - GPR_ASSERT(transport_global->qbuf.count == 0); - - if (transport_global->dirtied_local_settings && - !transport_global->sent_local_settings) { - gpr_slice_buffer_add( - &transport_writing->outbuf, - grpc_chttp2_settings_create( - transport_global->settings[GRPC_SENT_SETTINGS], - transport_global->settings[GRPC_LOCAL_SETTINGS], - transport_global->force_send_settings, GRPC_CHTTP2_NUM_SETTINGS)); - transport_global->force_send_settings = 0; - transport_global->dirtied_local_settings = 0; - transport_global->sent_local_settings = 1; - } + gpr_slice_buffer_swap (&transport_global->qbuf, &transport_writing->outbuf); + GPR_ASSERT (transport_global->qbuf.count == 0); + + if (transport_global->dirtied_local_settings && !transport_global->sent_local_settings) + { + gpr_slice_buffer_add (&transport_writing->outbuf, grpc_chttp2_settings_create (transport_global->settings[GRPC_SENT_SETTINGS], transport_global->settings[GRPC_LOCAL_SETTINGS], transport_global->force_send_settings, GRPC_CHTTP2_NUM_SETTINGS)); + transport_global->force_send_settings = 0; + transport_global->dirtied_local_settings = 0; + transport_global->sent_local_settings = 1; + } /* for each grpc_chttp2_stream that's become writable, frame it's data (according to available window sizes) and add to the output buffer */ - while (grpc_chttp2_list_pop_writable_stream( - transport_global, transport_writing, &stream_global, &stream_writing)) { - if (stream_global == first_reinserted_stream) { - /* prevent infinite loop */ - grpc_chttp2_list_add_first_writable_stream(transport_global, - stream_global); - break; - } - - stream_writing->id = stream_global->id; - stream_writing->send_closed = GRPC_DONT_SEND_CLOSED; - - if (stream_global->outgoing_sopb) { - window_delta = grpc_chttp2_preencode( - stream_global->outgoing_sopb->ops, - &stream_global->outgoing_sopb->nops, - (gpr_uint32)GPR_MIN(GPR_MIN(transport_global->outgoing_window, - stream_global->outgoing_window), - GPR_UINT32_MAX), - &stream_writing->sopb); - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT( - "write", transport_global, outgoing_window, -(gpr_int64)window_delta); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM("write", transport_global, stream_global, - outgoing_window, - -(gpr_int64)window_delta); - transport_global->outgoing_window -= window_delta; - stream_global->outgoing_window -= window_delta; - - if (stream_global->write_state == GRPC_WRITE_STATE_QUEUED_CLOSE && - stream_global->outgoing_sopb->nops == 0) { - if (!transport_global->is_client && !stream_global->read_closed) { - stream_writing->send_closed = GRPC_SEND_CLOSED_WITH_RST_STREAM; - } else { - stream_writing->send_closed = GRPC_SEND_CLOSED; - } - } - - if (stream_global->outgoing_window > 0 && - stream_global->outgoing_sopb->nops != 0) { - grpc_chttp2_list_add_writable_stream(transport_global, stream_global); - if (first_reinserted_stream == NULL && - transport_global->outgoing_window == 0) { - first_reinserted_stream = stream_global; - } - } - } - - if (!stream_global->read_closed && - stream_global->unannounced_incoming_window > 0) { - GPR_ASSERT(stream_writing->announce_window == 0); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( - "write", transport_writing, stream_writing, announce_window, - stream_global->unannounced_incoming_window); - stream_writing->announce_window = - stream_global->unannounced_incoming_window; - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( - "write", transport_global, stream_global, incoming_window, - stream_global->unannounced_incoming_window); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( - "write", transport_global, stream_global, unannounced_incoming_window, - -(gpr_int64)stream_global->unannounced_incoming_window); - stream_global->incoming_window += - stream_global->unannounced_incoming_window; - stream_global->unannounced_incoming_window = 0; - grpc_chttp2_list_add_incoming_window_updated(transport_global, - stream_global); - stream_global->writing_now |= GRPC_CHTTP2_WRITING_WINDOW; - } - if (stream_writing->sopb.nops > 0 || - stream_writing->send_closed != GRPC_DONT_SEND_CLOSED) { - stream_global->writing_now |= GRPC_CHTTP2_WRITING_DATA; + while (grpc_chttp2_list_pop_writable_stream (transport_global, transport_writing, &stream_global, &stream_writing)) + { + if (stream_global == first_reinserted_stream) + { + /* prevent infinite loop */ + grpc_chttp2_list_add_first_writable_stream (transport_global, stream_global); + break; + } + + stream_writing->id = stream_global->id; + stream_writing->send_closed = GRPC_DONT_SEND_CLOSED; + + if (stream_global->outgoing_sopb) + { + window_delta = grpc_chttp2_preencode (stream_global->outgoing_sopb->ops, &stream_global->outgoing_sopb->nops, (gpr_uint32) GPR_MIN (GPR_MIN (transport_global->outgoing_window, stream_global->outgoing_window), GPR_UINT32_MAX), &stream_writing->sopb); + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("write", transport_global, outgoing_window, -(gpr_int64) window_delta); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("write", transport_global, stream_global, outgoing_window, -(gpr_int64) window_delta); + transport_global->outgoing_window -= window_delta; + stream_global->outgoing_window -= window_delta; + + if (stream_global->write_state == GRPC_WRITE_STATE_QUEUED_CLOSE && stream_global->outgoing_sopb->nops == 0) + { + if (!transport_global->is_client && !stream_global->read_closed) + { + stream_writing->send_closed = GRPC_SEND_CLOSED_WITH_RST_STREAM; + } + else + { + stream_writing->send_closed = GRPC_SEND_CLOSED; + } + } + + if (stream_global->outgoing_window > 0 && stream_global->outgoing_sopb->nops != 0) + { + grpc_chttp2_list_add_writable_stream (transport_global, stream_global); + if (first_reinserted_stream == NULL && transport_global->outgoing_window == 0) + { + first_reinserted_stream = stream_global; + } + } + } + + if (!stream_global->read_closed && stream_global->unannounced_incoming_window > 0) + { + GPR_ASSERT (stream_writing->announce_window == 0); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("write", transport_writing, stream_writing, announce_window, stream_global->unannounced_incoming_window); + stream_writing->announce_window = stream_global->unannounced_incoming_window; + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("write", transport_global, stream_global, incoming_window, stream_global->unannounced_incoming_window); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("write", transport_global, stream_global, unannounced_incoming_window, -(gpr_int64) stream_global->unannounced_incoming_window); + stream_global->incoming_window += stream_global->unannounced_incoming_window; + stream_global->unannounced_incoming_window = 0; + grpc_chttp2_list_add_incoming_window_updated (transport_global, stream_global); + stream_global->writing_now |= GRPC_CHTTP2_WRITING_WINDOW; + } + if (stream_writing->sopb.nops > 0 || stream_writing->send_closed != GRPC_DONT_SEND_CLOSED) + { + stream_global->writing_now |= GRPC_CHTTP2_WRITING_DATA; + } + if (stream_global->writing_now != 0) + { + grpc_chttp2_list_add_writing_stream (transport_writing, stream_writing); + } } - if (stream_global->writing_now != 0) { - grpc_chttp2_list_add_writing_stream(transport_writing, stream_writing); - } - } /* if the grpc_chttp2_transport is ready to send a window update, do so here also; 3/4 is a magic number that will likely get tuned soon */ - if (transport_global->incoming_window < - transport_global->connection_window_target * 3 / 4) { - window_delta = transport_global->connection_window_target - - transport_global->incoming_window; - gpr_slice_buffer_add(&transport_writing->outbuf, - grpc_chttp2_window_update_create(0, window_delta)); - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT("write", transport_global, - incoming_window, window_delta); - transport_global->incoming_window += window_delta; - } - - return transport_writing->outbuf.count > 0 || - grpc_chttp2_list_have_writing_streams(transport_writing); + if (transport_global->incoming_window < transport_global->connection_window_target * 3 / 4) + { + window_delta = transport_global->connection_window_target - transport_global->incoming_window; + gpr_slice_buffer_add (&transport_writing->outbuf, grpc_chttp2_window_update_create (0, window_delta)); + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("write", transport_global, incoming_window, window_delta); + transport_global->incoming_window += window_delta; + } + + return transport_writing->outbuf.count > 0 || grpc_chttp2_list_have_writing_streams (transport_writing); } -void grpc_chttp2_perform_writes( - grpc_chttp2_transport_writing *transport_writing, grpc_endpoint *endpoint, - grpc_closure_list *closure_list) { - GPR_ASSERT(transport_writing->outbuf.count > 0 || - grpc_chttp2_list_have_writing_streams(transport_writing)); +void +grpc_chttp2_perform_writes (grpc_chttp2_transport_writing * transport_writing, grpc_endpoint * endpoint, grpc_closure_list * closure_list) +{ + GPR_ASSERT (transport_writing->outbuf.count > 0 || grpc_chttp2_list_have_writing_streams (transport_writing)); - finalize_outbuf(transport_writing); + finalize_outbuf (transport_writing); - GPR_ASSERT(transport_writing->outbuf.count > 0); - GPR_ASSERT(endpoint); + GPR_ASSERT (transport_writing->outbuf.count > 0); + GPR_ASSERT (endpoint); - grpc_endpoint_write(endpoint, &transport_writing->outbuf, - &transport_writing->done_cb, closure_list); + grpc_endpoint_write (endpoint, &transport_writing->outbuf, &transport_writing->done_cb, closure_list); } -static void finalize_outbuf(grpc_chttp2_transport_writing *transport_writing) { +static void +finalize_outbuf (grpc_chttp2_transport_writing * transport_writing) +{ grpc_chttp2_stream_writing *stream_writing; - while ( - grpc_chttp2_list_pop_writing_stream(transport_writing, &stream_writing)) { - if (stream_writing->sopb.nops > 0 || - stream_writing->send_closed != GRPC_DONT_SEND_CLOSED) { - grpc_chttp2_encode(stream_writing->sopb.ops, stream_writing->sopb.nops, - stream_writing->send_closed != GRPC_DONT_SEND_CLOSED, - stream_writing->id, - &transport_writing->hpack_compressor, - &transport_writing->outbuf); - stream_writing->sopb.nops = 0; + while (grpc_chttp2_list_pop_writing_stream (transport_writing, &stream_writing)) + { + if (stream_writing->sopb.nops > 0 || stream_writing->send_closed != GRPC_DONT_SEND_CLOSED) + { + grpc_chttp2_encode (stream_writing->sopb.ops, stream_writing->sopb.nops, stream_writing->send_closed != GRPC_DONT_SEND_CLOSED, stream_writing->id, &transport_writing->hpack_compressor, &transport_writing->outbuf); + stream_writing->sopb.nops = 0; + } + if (stream_writing->announce_window > 0) + { + gpr_slice_buffer_add (&transport_writing->outbuf, grpc_chttp2_window_update_create (stream_writing->id, stream_writing->announce_window)); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("write", transport_writing, stream_writing, announce_window, -(gpr_int64) stream_writing->announce_window); + stream_writing->announce_window = 0; + } + if (stream_writing->send_closed == GRPC_SEND_CLOSED_WITH_RST_STREAM) + { + gpr_slice_buffer_add (&transport_writing->outbuf, grpc_chttp2_rst_stream_create (stream_writing->id, GRPC_CHTTP2_NO_ERROR)); + } + grpc_chttp2_list_add_written_stream (transport_writing, stream_writing); } - if (stream_writing->announce_window > 0) { - gpr_slice_buffer_add( - &transport_writing->outbuf, - grpc_chttp2_window_update_create(stream_writing->id, - stream_writing->announce_window)); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( - "write", transport_writing, stream_writing, announce_window, - -(gpr_int64)stream_writing->announce_window); - stream_writing->announce_window = 0; - } - if (stream_writing->send_closed == GRPC_SEND_CLOSED_WITH_RST_STREAM) { - gpr_slice_buffer_add(&transport_writing->outbuf, - grpc_chttp2_rst_stream_create(stream_writing->id, - GRPC_CHTTP2_NO_ERROR)); - } - grpc_chttp2_list_add_written_stream(transport_writing, stream_writing); - } } -void grpc_chttp2_cleanup_writing( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_transport_writing *transport_writing, - grpc_closure_list *closure_list) { +void +grpc_chttp2_cleanup_writing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_writing * transport_writing, grpc_closure_list * closure_list) +{ grpc_chttp2_stream_writing *stream_writing; grpc_chttp2_stream_global *stream_global; - while (grpc_chttp2_list_pop_written_stream( - transport_global, transport_writing, &stream_global, &stream_writing)) { - GPR_ASSERT(stream_global->writing_now != 0); - if (stream_writing->send_closed != GRPC_DONT_SEND_CLOSED) { - stream_global->write_state = GRPC_WRITE_STATE_SENT_CLOSE; - if (!transport_global->is_client) { - stream_global->read_closed = 1; - } - } - if (stream_global->writing_now & GRPC_CHTTP2_WRITING_DATA) { - if (stream_global->outgoing_sopb != NULL && - stream_global->outgoing_sopb->nops == 0) { - GPR_ASSERT(stream_global->write_state != GRPC_WRITE_STATE_QUEUED_CLOSE); - stream_global->outgoing_sopb = NULL; - grpc_closure_list_add(closure_list, stream_global->send_done_closure, - 1); - } + while (grpc_chttp2_list_pop_written_stream (transport_global, transport_writing, &stream_global, &stream_writing)) + { + GPR_ASSERT (stream_global->writing_now != 0); + if (stream_writing->send_closed != GRPC_DONT_SEND_CLOSED) + { + stream_global->write_state = GRPC_WRITE_STATE_SENT_CLOSE; + if (!transport_global->is_client) + { + stream_global->read_closed = 1; + } + } + if (stream_global->writing_now & GRPC_CHTTP2_WRITING_DATA) + { + if (stream_global->outgoing_sopb != NULL && stream_global->outgoing_sopb->nops == 0) + { + GPR_ASSERT (stream_global->write_state != GRPC_WRITE_STATE_QUEUED_CLOSE); + stream_global->outgoing_sopb = NULL; + grpc_closure_list_add (closure_list, stream_global->send_done_closure, 1); + } + } + stream_global->writing_now = 0; + grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); } - stream_global->writing_now = 0; - grpc_chttp2_list_add_read_write_state_changed(transport_global, - stream_global); - } - gpr_slice_buffer_reset_and_unref(&transport_writing->outbuf); + gpr_slice_buffer_reset_and_unref (&transport_writing->outbuf); } diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index 766b55b5fa7..f99fa52dcc6 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -77,169 +77,153 @@ int grpc_flowctl_trace = 0; static const grpc_transport_vtable vtable; -static void lock(grpc_chttp2_transport *t); -static void unlock(grpc_chttp2_transport *t, grpc_closure_list *closure_list); +static void lock (grpc_chttp2_transport * t); +static void unlock (grpc_chttp2_transport * t, grpc_closure_list * closure_list); -static void unlock_check_read_write_state(grpc_chttp2_transport *t, - grpc_closure_list *closure_list); +static void unlock_check_read_write_state (grpc_chttp2_transport * t, grpc_closure_list * closure_list); /* forward declarations of various callbacks that we'll build closures around */ -static void writing_action(void *t, int iomgr_success_ignored, - grpc_closure_list *closure_list); +static void writing_action (void *t, int iomgr_success_ignored, grpc_closure_list * closure_list); /** Set a transport level setting, and push it to our peer */ -static void push_setting(grpc_chttp2_transport *t, grpc_chttp2_setting_id id, - gpr_uint32 value); +static void push_setting (grpc_chttp2_transport * t, grpc_chttp2_setting_id id, gpr_uint32 value); /** Endpoint callback to process incoming data */ -static void recv_data(void *tp, int success, grpc_closure_list *closure_list); +static void recv_data (void *tp, int success, grpc_closure_list * closure_list); /** Start disconnection chain */ -static void drop_connection(grpc_chttp2_transport *t, - grpc_closure_list *closure_list); +static void drop_connection (grpc_chttp2_transport * t, grpc_closure_list * closure_list); /** Perform a transport_op */ -static void perform_stream_op_locked( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global, grpc_transport_stream_op *op, - grpc_closure_list *closure_list); +static void perform_stream_op_locked (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_transport_stream_op * op, grpc_closure_list * closure_list); /** Cancel a stream: coming from the transport API */ -static void cancel_from_api(grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global, - grpc_status_code status); +static void cancel_from_api (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_status_code status); -static void close_from_api(grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global, - grpc_status_code status, - gpr_slice *optional_message); +static void close_from_api (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_status_code status, gpr_slice * optional_message); /** Add endpoint from this transport to pollset */ -static void add_to_pollset_locked(grpc_chttp2_transport *t, - grpc_pollset *pollset, - grpc_closure_list *closure_list); -static void add_to_pollset_set_locked(grpc_chttp2_transport *t, - grpc_pollset_set *pollset_set, - grpc_closure_list *closure_list); +static void add_to_pollset_locked (grpc_chttp2_transport * t, grpc_pollset * pollset, grpc_closure_list * closure_list); +static void add_to_pollset_set_locked (grpc_chttp2_transport * t, grpc_pollset_set * pollset_set, grpc_closure_list * closure_list); /** Start new streams that have been created if we can */ -static void maybe_start_some_streams( - grpc_chttp2_transport_global *transport_global, - grpc_closure_list *closure_list); +static void maybe_start_some_streams (grpc_chttp2_transport_global * transport_global, grpc_closure_list * closure_list); -static void connectivity_state_set( - grpc_chttp2_transport_global *transport_global, - grpc_connectivity_state state, const char *reason, - grpc_closure_list *closure_list); +static void connectivity_state_set (grpc_chttp2_transport_global * transport_global, grpc_connectivity_state state, const char *reason, grpc_closure_list * closure_list); /* * CONSTRUCTION/DESTRUCTION/REFCOUNTING */ -static void destruct_transport(grpc_chttp2_transport *t, - grpc_closure_list *closure_list) { +static void +destruct_transport (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +{ size_t i; - gpr_mu_lock(&t->mu); + gpr_mu_lock (&t->mu); - GPR_ASSERT(t->ep == NULL); + GPR_ASSERT (t->ep == NULL); - gpr_slice_buffer_destroy(&t->global.qbuf); + gpr_slice_buffer_destroy (&t->global.qbuf); - gpr_slice_buffer_destroy(&t->writing.outbuf); - grpc_chttp2_hpack_compressor_destroy(&t->writing.hpack_compressor); + gpr_slice_buffer_destroy (&t->writing.outbuf); + grpc_chttp2_hpack_compressor_destroy (&t->writing.hpack_compressor); - gpr_slice_buffer_destroy(&t->parsing.qbuf); - gpr_slice_buffer_destroy(&t->read_buffer); - grpc_chttp2_hpack_parser_destroy(&t->parsing.hpack_parser); - grpc_chttp2_goaway_parser_destroy(&t->parsing.goaway_parser); + gpr_slice_buffer_destroy (&t->parsing.qbuf); + gpr_slice_buffer_destroy (&t->read_buffer); + grpc_chttp2_hpack_parser_destroy (&t->parsing.hpack_parser); + grpc_chttp2_goaway_parser_destroy (&t->parsing.goaway_parser); - GRPC_MDSTR_UNREF(t->parsing.str_grpc_timeout); + GRPC_MDSTR_UNREF (t->parsing.str_grpc_timeout); - for (i = 0; i < STREAM_LIST_COUNT; i++) { - GPR_ASSERT(t->lists[i].head == NULL); - GPR_ASSERT(t->lists[i].tail == NULL); - } + for (i = 0; i < STREAM_LIST_COUNT; i++) + { + GPR_ASSERT (t->lists[i].head == NULL); + GPR_ASSERT (t->lists[i].tail == NULL); + } - GPR_ASSERT(grpc_chttp2_stream_map_size(&t->parsing_stream_map) == 0); - GPR_ASSERT(grpc_chttp2_stream_map_size(&t->new_stream_map) == 0); + GPR_ASSERT (grpc_chttp2_stream_map_size (&t->parsing_stream_map) == 0); + GPR_ASSERT (grpc_chttp2_stream_map_size (&t->new_stream_map) == 0); - grpc_chttp2_stream_map_destroy(&t->parsing_stream_map); - grpc_chttp2_stream_map_destroy(&t->new_stream_map); - grpc_connectivity_state_destroy(&t->channel_callback.state_tracker, - closure_list); + grpc_chttp2_stream_map_destroy (&t->parsing_stream_map); + grpc_chttp2_stream_map_destroy (&t->new_stream_map); + grpc_connectivity_state_destroy (&t->channel_callback.state_tracker, closure_list); - gpr_mu_unlock(&t->mu); - gpr_mu_destroy(&t->mu); + gpr_mu_unlock (&t->mu); + gpr_mu_destroy (&t->mu); /* callback remaining pings: they're not allowed to call into the transpot, and maybe they hold resources that need to be freed */ - while (t->global.pings.next != &t->global.pings) { - grpc_chttp2_outstanding_ping *ping = t->global.pings.next; - grpc_closure_list_add(closure_list, ping->on_recv, 0); - ping->next->prev = ping->prev; - ping->prev->next = ping->next; - gpr_free(ping); - } - - grpc_mdctx_unref(t->metadata_context); - - gpr_free(t->peer_string); - gpr_free(t); + while (t->global.pings.next != &t->global.pings) + { + grpc_chttp2_outstanding_ping *ping = t->global.pings.next; + grpc_closure_list_add (closure_list, ping->on_recv, 0); + ping->next->prev = ping->prev; + ping->prev->next = ping->next; + gpr_free (ping); + } + + grpc_mdctx_unref (t->metadata_context); + + gpr_free (t->peer_string); + gpr_free (t); } #ifdef REFCOUNTING_DEBUG #define REF_TRANSPORT(t, r) ref_transport(t, r, __FILE__, __LINE__) #define UNREF_TRANSPORT(t, r, cl) unref_transport(t, cl, r, __FILE__, __LINE__) -static void unref_transport(grpc_chttp2_transport *t, - grpc_closure_list *closure_list, const char *reason, - const char *file, int line) { - gpr_log(GPR_DEBUG, "chttp2:unref:%p %d->%d %s [%s:%d]", t, t->refs.count, - t->refs.count - 1, reason, file, line); - if (!gpr_unref(&t->refs)) return; - destruct_transport(t, closure_list); +static void +unref_transport (grpc_chttp2_transport * t, grpc_closure_list * closure_list, const char *reason, const char *file, int line) +{ + gpr_log (GPR_DEBUG, "chttp2:unref:%p %d->%d %s [%s:%d]", t, t->refs.count, t->refs.count - 1, reason, file, line); + if (!gpr_unref (&t->refs)) + return; + destruct_transport (t, closure_list); } -static void ref_transport(grpc_chttp2_transport *t, const char *reason, - const char *file, int line) { - gpr_log(GPR_DEBUG, "chttp2: ref:%p %d->%d %s [%s:%d]", t, t->refs.count, - t->refs.count + 1, reason, file, line); - gpr_ref(&t->refs); +static void +ref_transport (grpc_chttp2_transport * t, const char *reason, const char *file, int line) +{ + gpr_log (GPR_DEBUG, "chttp2: ref:%p %d->%d %s [%s:%d]", t, t->refs.count, t->refs.count + 1, reason, file, line); + gpr_ref (&t->refs); } #else #define REF_TRANSPORT(t, r) ref_transport(t) #define UNREF_TRANSPORT(t, r, cl) unref_transport(t, cl) -static void unref_transport(grpc_chttp2_transport *t, - grpc_closure_list *closure_list) { - if (!gpr_unref(&t->refs)) return; - destruct_transport(t, closure_list); +static void +unref_transport (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +{ + if (!gpr_unref (&t->refs)) + return; + destruct_transport (t, closure_list); } -static void ref_transport(grpc_chttp2_transport *t) { gpr_ref(&t->refs); } +static void +ref_transport (grpc_chttp2_transport * t) +{ + gpr_ref (&t->refs); +} #endif -static void init_transport(grpc_chttp2_transport *t, - const grpc_channel_args *channel_args, - grpc_endpoint *ep, grpc_mdctx *mdctx, - gpr_uint8 is_client, - grpc_closure_list *closure_list) { +static void +init_transport (grpc_chttp2_transport * t, const grpc_channel_args * channel_args, grpc_endpoint * ep, grpc_mdctx * mdctx, gpr_uint8 is_client, grpc_closure_list * closure_list) +{ size_t i; int j; - GPR_ASSERT(strlen(GRPC_CHTTP2_CLIENT_CONNECT_STRING) == - GRPC_CHTTP2_CLIENT_CONNECT_STRLEN); + GPR_ASSERT (strlen (GRPC_CHTTP2_CLIENT_CONNECT_STRING) == GRPC_CHTTP2_CLIENT_CONNECT_STRLEN); - memset(t, 0, sizeof(*t)); + memset (t, 0, sizeof (*t)); t->base.vtable = &vtable; t->ep = ep; /* one ref is for destroy, the other for when ep becomes NULL */ - gpr_ref_init(&t->refs, 2); + gpr_ref_init (&t->refs, 2); /* ref is dropped at transport close() */ - gpr_ref_init(&t->shutdown_ep_refs, 1); - gpr_mu_init(&t->mu); - grpc_mdctx_ref(mdctx); - t->peer_string = grpc_endpoint_get_peer(ep); + gpr_ref_init (&t->shutdown_ep_refs, 1); + gpr_mu_init (&t->mu); + grpc_mdctx_ref (mdctx); + t->peer_string = grpc_endpoint_get_peer (ep); t->metadata_context = mdctx; t->endpoint_reading = 1; t->global.next_stream_id = is_client ? 1 : 2; @@ -250,51 +234,46 @@ static void init_transport(grpc_chttp2_transport *t, t->global.ping_counter = 1; t->global.pings.next = t->global.pings.prev = &t->global.pings; t->parsing.is_client = is_client; - t->parsing.str_grpc_timeout = - grpc_mdstr_from_string(t->metadata_context, "grpc-timeout", 0); - t->parsing.deframe_state = - is_client ? GRPC_DTS_FH_0 : GRPC_DTS_CLIENT_PREFIX_0; + t->parsing.str_grpc_timeout = grpc_mdstr_from_string (t->metadata_context, "grpc-timeout", 0); + t->parsing.deframe_state = is_client ? GRPC_DTS_FH_0 : GRPC_DTS_CLIENT_PREFIX_0; t->writing.is_client = is_client; - grpc_connectivity_state_init( - &t->channel_callback.state_tracker, GRPC_CHANNEL_READY, - is_client ? "client_transport" : "server_transport"); - - gpr_slice_buffer_init(&t->global.qbuf); - - gpr_slice_buffer_init(&t->writing.outbuf); - grpc_chttp2_hpack_compressor_init(&t->writing.hpack_compressor, mdctx); - grpc_closure_init(&t->writing_action, writing_action, t); - - gpr_slice_buffer_init(&t->parsing.qbuf); - grpc_chttp2_goaway_parser_init(&t->parsing.goaway_parser); - grpc_chttp2_hpack_parser_init(&t->parsing.hpack_parser, t->metadata_context); - - grpc_closure_init(&t->writing.done_cb, grpc_chttp2_terminate_writing, - &t->writing); - grpc_closure_init(&t->recv_data, recv_data, t); - gpr_slice_buffer_init(&t->read_buffer); - - if (is_client) { - gpr_slice_buffer_add( - &t->global.qbuf, - gpr_slice_from_copied_string(GRPC_CHTTP2_CLIENT_CONNECT_STRING)); - } + grpc_connectivity_state_init (&t->channel_callback.state_tracker, GRPC_CHANNEL_READY, is_client ? "client_transport" : "server_transport"); + + gpr_slice_buffer_init (&t->global.qbuf); + + gpr_slice_buffer_init (&t->writing.outbuf); + grpc_chttp2_hpack_compressor_init (&t->writing.hpack_compressor, mdctx); + grpc_closure_init (&t->writing_action, writing_action, t); + + gpr_slice_buffer_init (&t->parsing.qbuf); + grpc_chttp2_goaway_parser_init (&t->parsing.goaway_parser); + grpc_chttp2_hpack_parser_init (&t->parsing.hpack_parser, t->metadata_context); + + grpc_closure_init (&t->writing.done_cb, grpc_chttp2_terminate_writing, &t->writing); + grpc_closure_init (&t->recv_data, recv_data, t); + gpr_slice_buffer_init (&t->read_buffer); + + if (is_client) + { + gpr_slice_buffer_add (&t->global.qbuf, gpr_slice_from_copied_string (GRPC_CHTTP2_CLIENT_CONNECT_STRING)); + } /* 8 is a random stab in the dark as to a good initial size: it's small enough that it shouldn't waste memory for infrequently used connections, yet large enough that the exponential growth should happen nicely when it's needed. TODO(ctiller): tune this */ - grpc_chttp2_stream_map_init(&t->parsing_stream_map, 8); - grpc_chttp2_stream_map_init(&t->new_stream_map, 8); + grpc_chttp2_stream_map_init (&t->parsing_stream_map, 8); + grpc_chttp2_stream_map_init (&t->new_stream_map, 8); /* copy in initial settings to all setting sets */ - for (i = 0; i < GRPC_CHTTP2_NUM_SETTINGS; i++) { - t->parsing.settings[i] = grpc_chttp2_settings_parameters[i].default_value; - for (j = 0; j < GRPC_NUM_SETTING_SETS; j++) { - t->global.settings[j][i] = - grpc_chttp2_settings_parameters[i].default_value; + for (i = 0; i < GRPC_CHTTP2_NUM_SETTINGS; i++) + { + t->parsing.settings[i] = grpc_chttp2_settings_parameters[i].default_value; + for (j = 0; j < GRPC_NUM_SETTING_SETS; j++) + { + t->global.settings[j][i] = grpc_chttp2_settings_parameters[i].default_value; + } } - } t->global.dirtied_local_settings = 1; /* Hack: it's common for implementations to assume 65536 bytes initial send window -- this should by rights be 0 */ @@ -302,207 +281,220 @@ static void init_transport(grpc_chttp2_transport *t, t->global.sent_local_settings = 0; /* configure http2 the way we like it */ - if (is_client) { - push_setting(t, GRPC_CHTTP2_SETTINGS_ENABLE_PUSH, 0); - push_setting(t, GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 0); - } - push_setting(t, GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, DEFAULT_WINDOW); - - if (channel_args) { - for (i = 0; i < channel_args->num_args; i++) { - if (0 == - strcmp(channel_args->args[i].key, GRPC_ARG_MAX_CONCURRENT_STREAMS)) { - if (is_client) { - gpr_log(GPR_ERROR, "%s: is ignored on the client", - GRPC_ARG_MAX_CONCURRENT_STREAMS); - } else if (channel_args->args[i].type != GRPC_ARG_INTEGER) { - gpr_log(GPR_ERROR, "%s: must be an integer", - GRPC_ARG_MAX_CONCURRENT_STREAMS); - } else { - push_setting(t, GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, - (gpr_uint32)channel_args->args[i].value.integer); - } - } else if (0 == strcmp(channel_args->args[i].key, - GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER)) { - if (channel_args->args[i].type != GRPC_ARG_INTEGER) { - gpr_log(GPR_ERROR, "%s: must be an integer", - GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER); - } else if ((t->global.next_stream_id & 1) != - (channel_args->args[i].value.integer & 1)) { - gpr_log(GPR_ERROR, "%s: low bit must be %d on %s", - GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER, - t->global.next_stream_id & 1, - is_client ? "client" : "server"); - } else { - t->global.next_stream_id = - (gpr_uint32)channel_args->args[i].value.integer; - } - } + if (is_client) + { + push_setting (t, GRPC_CHTTP2_SETTINGS_ENABLE_PUSH, 0); + push_setting (t, GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 0); + } + push_setting (t, GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, DEFAULT_WINDOW); + + if (channel_args) + { + for (i = 0; i < channel_args->num_args; i++) + { + if (0 == strcmp (channel_args->args[i].key, GRPC_ARG_MAX_CONCURRENT_STREAMS)) + { + if (is_client) + { + gpr_log (GPR_ERROR, "%s: is ignored on the client", GRPC_ARG_MAX_CONCURRENT_STREAMS); + } + else if (channel_args->args[i].type != GRPC_ARG_INTEGER) + { + gpr_log (GPR_ERROR, "%s: must be an integer", GRPC_ARG_MAX_CONCURRENT_STREAMS); + } + else + { + push_setting (t, GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, (gpr_uint32) channel_args->args[i].value.integer); + } + } + else if (0 == strcmp (channel_args->args[i].key, GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER)) + { + if (channel_args->args[i].type != GRPC_ARG_INTEGER) + { + gpr_log (GPR_ERROR, "%s: must be an integer", GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER); + } + else if ((t->global.next_stream_id & 1) !=(channel_args->args[i].value.integer & 1)) + { + gpr_log (GPR_ERROR, "%s: low bit must be %d on %s", GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER, t->global.next_stream_id & 1, is_client ? "client" : "server"); + } + else + { + t->global.next_stream_id = (gpr_uint32) channel_args->args[i].value.integer; + } + } + } } - } } -static void destroy_transport(grpc_transport *gt, - grpc_closure_list *closure_list) { - grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; +static void +destroy_transport (grpc_transport * gt, grpc_closure_list * closure_list) +{ + grpc_chttp2_transport *t = (grpc_chttp2_transport *) gt; - lock(t); + lock (t); t->destroying = 1; - drop_connection(t, closure_list); - unlock(t, closure_list); + drop_connection (t, closure_list); + unlock (t, closure_list); - UNREF_TRANSPORT(t, "destroy", closure_list); + UNREF_TRANSPORT (t, "destroy", closure_list); } /** block grpc_endpoint_shutdown being called until a paired allow_endpoint_shutdown is made */ -static void prevent_endpoint_shutdown(grpc_chttp2_transport *t) { - GPR_ASSERT(t->ep); - gpr_ref(&t->shutdown_ep_refs); +static void +prevent_endpoint_shutdown (grpc_chttp2_transport * t) +{ + GPR_ASSERT (t->ep); + gpr_ref (&t->shutdown_ep_refs); } -static void allow_endpoint_shutdown_locked(grpc_chttp2_transport *t, - grpc_closure_list *closure_list) { - if (gpr_unref(&t->shutdown_ep_refs)) { - if (t->ep) { - grpc_endpoint_shutdown(t->ep, closure_list); +static void +allow_endpoint_shutdown_locked (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +{ + if (gpr_unref (&t->shutdown_ep_refs)) + { + if (t->ep) + { + grpc_endpoint_shutdown (t->ep, closure_list); + } } - } } -static void allow_endpoint_shutdown_unlocked(grpc_chttp2_transport *t, - grpc_closure_list *closure_list) { - if (gpr_unref(&t->shutdown_ep_refs)) { - gpr_mu_lock(&t->mu); - if (t->ep) { - grpc_endpoint_shutdown(t->ep, closure_list); +static void +allow_endpoint_shutdown_unlocked (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +{ + if (gpr_unref (&t->shutdown_ep_refs)) + { + gpr_mu_lock (&t->mu); + if (t->ep) + { + grpc_endpoint_shutdown (t->ep, closure_list); + } + gpr_mu_unlock (&t->mu); } - gpr_mu_unlock(&t->mu); - } } -static void destroy_endpoint(grpc_chttp2_transport *t, - grpc_closure_list *closure_list) { - grpc_endpoint_destroy(t->ep, closure_list); +static void +destroy_endpoint (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +{ + grpc_endpoint_destroy (t->ep, closure_list); t->ep = NULL; /* safe because we'll still have the ref for write */ - UNREF_TRANSPORT(t, "disconnect", closure_list); + UNREF_TRANSPORT (t, "disconnect", closure_list); } -static void close_transport_locked(grpc_chttp2_transport *t, - grpc_closure_list *closure_list) { - if (!t->closed) { - t->closed = 1; - connectivity_state_set(&t->global, GRPC_CHANNEL_FATAL_FAILURE, - "close_transport", closure_list); - if (t->ep) { - allow_endpoint_shutdown_locked(t, closure_list); +static void +close_transport_locked (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +{ + if (!t->closed) + { + t->closed = 1; + connectivity_state_set (&t->global, GRPC_CHANNEL_FATAL_FAILURE, "close_transport", closure_list); + if (t->ep) + { + allow_endpoint_shutdown_locked (t, closure_list); + } } - } } -static int init_stream(grpc_transport *gt, grpc_stream *gs, - const void *server_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list) { - grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; - grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; - - memset(s, 0, sizeof(*s)); - - grpc_chttp2_incoming_metadata_buffer_init(&s->parsing.incoming_metadata); - grpc_chttp2_incoming_metadata_buffer_init(&s->global.incoming_metadata); - grpc_sopb_init(&s->writing.sopb); - grpc_sopb_init(&s->global.incoming_sopb); - grpc_chttp2_data_parser_init(&s->parsing.data_parser); - - REF_TRANSPORT(t, "stream"); - - lock(t); - grpc_chttp2_register_stream(t, s); - if (server_data) { - GPR_ASSERT(t->parsing_active); - s->global.id = (gpr_uint32)(gpr_uintptr)server_data; - s->global.outgoing_window = - t->global.settings[GRPC_PEER_SETTINGS] - [GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; - s->global.max_recv_bytes = s->parsing.incoming_window = - s->global.incoming_window = - t->global.settings[GRPC_SENT_SETTINGS] - [GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; - *t->accepting_stream = s; - grpc_chttp2_stream_map_add(&t->parsing_stream_map, s->global.id, s); - s->global.in_stream_map = 1; - } +static int +init_stream (grpc_transport * gt, grpc_stream * gs, const void *server_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ + grpc_chttp2_transport *t = (grpc_chttp2_transport *) gt; + grpc_chttp2_stream *s = (grpc_chttp2_stream *) gs; + + memset (s, 0, sizeof (*s)); + + grpc_chttp2_incoming_metadata_buffer_init (&s->parsing.incoming_metadata); + grpc_chttp2_incoming_metadata_buffer_init (&s->global.incoming_metadata); + grpc_sopb_init (&s->writing.sopb); + grpc_sopb_init (&s->global.incoming_sopb); + grpc_chttp2_data_parser_init (&s->parsing.data_parser); + + REF_TRANSPORT (t, "stream"); + + lock (t); + grpc_chttp2_register_stream (t, s); + if (server_data) + { + GPR_ASSERT (t->parsing_active); + s->global.id = (gpr_uint32) (gpr_uintptr) server_data; + s->global.outgoing_window = t->global.settings[GRPC_PEER_SETTINGS][GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; + s->global.max_recv_bytes = s->parsing.incoming_window = s->global.incoming_window = t->global.settings[GRPC_SENT_SETTINGS][GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; + *t->accepting_stream = s; + grpc_chttp2_stream_map_add (&t->parsing_stream_map, s->global.id, s); + s->global.in_stream_map = 1; + } if (initial_op) - perform_stream_op_locked(&t->global, &s->global, initial_op, closure_list); - unlock(t, closure_list); + perform_stream_op_locked (&t->global, &s->global, initial_op, closure_list); + unlock (t, closure_list); return 0; } -static void destroy_stream(grpc_transport *gt, grpc_stream *gs, - grpc_closure_list *closure_list) { - grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; - grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; +static void +destroy_stream (grpc_transport * gt, grpc_stream * gs, grpc_closure_list * closure_list) +{ + grpc_chttp2_transport *t = (grpc_chttp2_transport *) gt; + grpc_chttp2_stream *s = (grpc_chttp2_stream *) gs; int i; - gpr_mu_lock(&t->mu); - - GPR_ASSERT(s->global.published_state == GRPC_STREAM_CLOSED || - s->global.id == 0); - GPR_ASSERT(!s->global.in_stream_map); - if (grpc_chttp2_unregister_stream(t, s) && t->global.sent_goaway) { - close_transport_locked(t, closure_list); - } - if (!t->parsing_active && s->global.id) { - GPR_ASSERT(grpc_chttp2_stream_map_find(&t->parsing_stream_map, - s->global.id) == NULL); - } - - grpc_chttp2_list_remove_incoming_window_updated(&t->global, &s->global); - grpc_chttp2_list_remove_writable_stream(&t->global, &s->global); - - gpr_mu_unlock(&t->mu); - - for (i = 0; i < STREAM_LIST_COUNT; i++) { - if (s->included[i]) { - gpr_log(GPR_ERROR, "%s stream %d still included in list %d", - t->global.is_client ? "client" : "server", s->global.id, i); - abort(); + gpr_mu_lock (&t->mu); + + GPR_ASSERT (s->global.published_state == GRPC_STREAM_CLOSED || s->global.id == 0); + GPR_ASSERT (!s->global.in_stream_map); + if (grpc_chttp2_unregister_stream (t, s) && t->global.sent_goaway) + { + close_transport_locked (t, closure_list); + } + if (!t->parsing_active && s->global.id) + { + GPR_ASSERT (grpc_chttp2_stream_map_find (&t->parsing_stream_map, s->global.id) == NULL); + } + + grpc_chttp2_list_remove_incoming_window_updated (&t->global, &s->global); + grpc_chttp2_list_remove_writable_stream (&t->global, &s->global); + + gpr_mu_unlock (&t->mu); + + for (i = 0; i < STREAM_LIST_COUNT; i++) + { + if (s->included[i]) + { + gpr_log (GPR_ERROR, "%s stream %d still included in list %d", t->global.is_client ? "client" : "server", s->global.id, i); + abort (); + } } - } - - GPR_ASSERT(s->global.outgoing_sopb == NULL); - GPR_ASSERT(s->global.publish_sopb == NULL); - grpc_sopb_destroy(&s->writing.sopb); - grpc_sopb_destroy(&s->global.incoming_sopb); - grpc_chttp2_data_parser_destroy(&s->parsing.data_parser); - grpc_chttp2_incoming_metadata_buffer_destroy(&s->parsing.incoming_metadata); - grpc_chttp2_incoming_metadata_buffer_destroy(&s->global.incoming_metadata); - grpc_chttp2_incoming_metadata_live_op_buffer_end( - &s->global.outstanding_metadata); - - UNREF_TRANSPORT(t, "stream", closure_list); + + GPR_ASSERT (s->global.outgoing_sopb == NULL); + GPR_ASSERT (s->global.publish_sopb == NULL); + grpc_sopb_destroy (&s->writing.sopb); + grpc_sopb_destroy (&s->global.incoming_sopb); + grpc_chttp2_data_parser_destroy (&s->parsing.data_parser); + grpc_chttp2_incoming_metadata_buffer_destroy (&s->parsing.incoming_metadata); + grpc_chttp2_incoming_metadata_buffer_destroy (&s->global.incoming_metadata); + grpc_chttp2_incoming_metadata_live_op_buffer_end (&s->global.outstanding_metadata); + + UNREF_TRANSPORT (t, "stream", closure_list); } -grpc_chttp2_stream_parsing *grpc_chttp2_parsing_lookup_stream( - grpc_chttp2_transport_parsing *transport_parsing, gpr_uint32 id) { - grpc_chttp2_transport *t = TRANSPORT_FROM_PARSING(transport_parsing); - grpc_chttp2_stream *s = - grpc_chttp2_stream_map_find(&t->parsing_stream_map, id); +grpc_chttp2_stream_parsing * +grpc_chttp2_parsing_lookup_stream (grpc_chttp2_transport_parsing * transport_parsing, gpr_uint32 id) +{ + grpc_chttp2_transport *t = TRANSPORT_FROM_PARSING (transport_parsing); + grpc_chttp2_stream *s = grpc_chttp2_stream_map_find (&t->parsing_stream_map, id); return s ? &s->parsing : NULL; } -grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream( - grpc_chttp2_transport_parsing *transport_parsing, gpr_uint32 id) { +grpc_chttp2_stream_parsing * +grpc_chttp2_parsing_accept_stream (grpc_chttp2_transport_parsing * transport_parsing, gpr_uint32 id) +{ grpc_chttp2_stream *accepting; - grpc_chttp2_transport *t = TRANSPORT_FROM_PARSING(transport_parsing); - GPR_ASSERT(t->accepting_stream == NULL); + grpc_chttp2_transport *t = TRANSPORT_FROM_PARSING (transport_parsing); + GPR_ASSERT (t->accepting_stream == NULL); t->accepting_stream = &accepting; - t->channel_callback.accept_stream(t->channel_callback.accept_stream_user_data, - &t->base, (void *)(gpr_uintptr)id); + t->channel_callback.accept_stream (t->channel_callback.accept_stream_user_data, &t->base, (void *) (gpr_uintptr) id); t->accepting_stream = NULL; return &accepting->parsing; } @@ -517,469 +509,467 @@ grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream( is always queued, as are callbacks to process data. During unlock() we check our todo lists and initiate callbacks and flush writes. */ -static void lock(grpc_chttp2_transport *t) { gpr_mu_lock(&t->mu); } +static void +lock (grpc_chttp2_transport * t) +{ + gpr_mu_lock (&t->mu); +} -static void unlock(grpc_chttp2_transport *t, grpc_closure_list *closure_list) { - unlock_check_read_write_state(t, closure_list); - if (!t->writing_active && !t->closed && - grpc_chttp2_unlocking_check_writes(&t->global, &t->writing)) { - t->writing_active = 1; - REF_TRANSPORT(t, "writing"); - grpc_closure_list_add(closure_list, &t->writing_action, 1); - prevent_endpoint_shutdown(t); - } +static void +unlock (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +{ + unlock_check_read_write_state (t, closure_list); + if (!t->writing_active && !t->closed && grpc_chttp2_unlocking_check_writes (&t->global, &t->writing)) + { + t->writing_active = 1; + REF_TRANSPORT (t, "writing"); + grpc_closure_list_add (closure_list, &t->writing_action, 1); + prevent_endpoint_shutdown (t); + } - gpr_mu_unlock(&t->mu); + gpr_mu_unlock (&t->mu); } /* * OUTPUT PROCESSING */ -static void push_setting(grpc_chttp2_transport *t, grpc_chttp2_setting_id id, - gpr_uint32 value) { - const grpc_chttp2_setting_parameters *sp = - &grpc_chttp2_settings_parameters[id]; - gpr_uint32 use_value = GPR_CLAMP(value, sp->min_value, sp->max_value); - if (use_value != value) { - gpr_log(GPR_INFO, "Requested parameter %s clamped from %d to %d", sp->name, - value, use_value); - } - if (use_value != t->global.settings[GRPC_LOCAL_SETTINGS][id]) { - t->global.settings[GRPC_LOCAL_SETTINGS][id] = use_value; - t->global.dirtied_local_settings = 1; - } +static void +push_setting (grpc_chttp2_transport * t, grpc_chttp2_setting_id id, gpr_uint32 value) +{ + const grpc_chttp2_setting_parameters *sp = &grpc_chttp2_settings_parameters[id]; + gpr_uint32 use_value = GPR_CLAMP (value, sp->min_value, sp->max_value); + if (use_value != value) + { + gpr_log (GPR_INFO, "Requested parameter %s clamped from %d to %d", sp->name, value, use_value); + } + if (use_value != t->global.settings[GRPC_LOCAL_SETTINGS][id]) + { + t->global.settings[GRPC_LOCAL_SETTINGS][id] = use_value; + t->global.dirtied_local_settings = 1; + } } -void grpc_chttp2_terminate_writing(void *transport_writing_ptr, int success, - grpc_closure_list *closure_list) { +void +grpc_chttp2_terminate_writing (void *transport_writing_ptr, int success, grpc_closure_list * closure_list) +{ grpc_chttp2_transport_writing *transport_writing = transport_writing_ptr; - grpc_chttp2_transport *t = TRANSPORT_FROM_WRITING(transport_writing); + grpc_chttp2_transport *t = TRANSPORT_FROM_WRITING (transport_writing); - lock(t); + lock (t); - allow_endpoint_shutdown_locked(t, closure_list); + allow_endpoint_shutdown_locked (t, closure_list); - if (!success) { - drop_connection(t, closure_list); - } + if (!success) + { + drop_connection (t, closure_list); + } /* cleanup writing related jazz */ - grpc_chttp2_cleanup_writing(&t->global, &t->writing, closure_list); + grpc_chttp2_cleanup_writing (&t->global, &t->writing, closure_list); /* leave the writing flag up on shutdown to prevent further writes in unlock() from starting */ t->writing_active = 0; - if (t->ep && !t->endpoint_reading) { - destroy_endpoint(t, closure_list); - } + if (t->ep && !t->endpoint_reading) + { + destroy_endpoint (t, closure_list); + } - unlock(t, closure_list); + unlock (t, closure_list); - UNREF_TRANSPORT(t, "writing", closure_list); + UNREF_TRANSPORT (t, "writing", closure_list); } -static void writing_action(void *gt, int iomgr_success_ignored, - grpc_closure_list *closure_list) { +static void +writing_action (void *gt, int iomgr_success_ignored, grpc_closure_list * closure_list) +{ grpc_chttp2_transport *t = gt; - grpc_chttp2_perform_writes(&t->writing, t->ep, closure_list); + grpc_chttp2_perform_writes (&t->writing, t->ep, closure_list); } -void grpc_chttp2_add_incoming_goaway( - grpc_chttp2_transport_global *transport_global, gpr_uint32 goaway_error, - gpr_slice goaway_text, grpc_closure_list *closure_list) { - char *msg = gpr_dump_slice(goaway_text, GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_DEBUG, "got goaway [%d]: %s", goaway_error, msg); - gpr_free(msg); - gpr_slice_unref(goaway_text); +void +grpc_chttp2_add_incoming_goaway (grpc_chttp2_transport_global * transport_global, gpr_uint32 goaway_error, gpr_slice goaway_text, grpc_closure_list * closure_list) +{ + char *msg = gpr_dump_slice (goaway_text, GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log (GPR_DEBUG, "got goaway [%d]: %s", goaway_error, msg); + gpr_free (msg); + gpr_slice_unref (goaway_text); transport_global->seen_goaway = 1; - connectivity_state_set(transport_global, GRPC_CHANNEL_FATAL_FAILURE, - "got_goaway", closure_list); + connectivity_state_set (transport_global, GRPC_CHANNEL_FATAL_FAILURE, "got_goaway", closure_list); } -static void maybe_start_some_streams( - grpc_chttp2_transport_global *transport_global, - grpc_closure_list *closure_list) { +static void +maybe_start_some_streams (grpc_chttp2_transport_global * transport_global, grpc_closure_list * closure_list) +{ grpc_chttp2_stream_global *stream_global; /* start streams where we have free grpc_chttp2_stream ids and free * concurrency */ - while (transport_global->next_stream_id <= MAX_CLIENT_STREAM_ID && - transport_global->concurrent_stream_count < - transport_global - ->settings[GRPC_PEER_SETTINGS] - [GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS] && - grpc_chttp2_list_pop_waiting_for_concurrency(transport_global, - &stream_global)) { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_DEBUG, "HTTP:%s: Allocating new grpc_chttp2_stream %p to id %d", - transport_global->is_client ? "CLI" : "SVR", stream_global, - transport_global->next_stream_id)); - - GPR_ASSERT(stream_global->id == 0); - stream_global->id = transport_global->next_stream_id; - transport_global->next_stream_id += 2; - - if (transport_global->next_stream_id >= MAX_CLIENT_STREAM_ID) { - connectivity_state_set(transport_global, GRPC_CHANNEL_TRANSIENT_FAILURE, - "no_more_stream_ids", closure_list); + while (transport_global->next_stream_id <= MAX_CLIENT_STREAM_ID && transport_global->concurrent_stream_count < transport_global->settings[GRPC_PEER_SETTINGS][GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS] && grpc_chttp2_list_pop_waiting_for_concurrency (transport_global, &stream_global)) + { + GRPC_CHTTP2_IF_TRACING (gpr_log (GPR_DEBUG, "HTTP:%s: Allocating new grpc_chttp2_stream %p to id %d", transport_global->is_client ? "CLI" : "SVR", stream_global, transport_global->next_stream_id)); + + GPR_ASSERT (stream_global->id == 0); + stream_global->id = transport_global->next_stream_id; + transport_global->next_stream_id += 2; + + if (transport_global->next_stream_id >= MAX_CLIENT_STREAM_ID) + { + connectivity_state_set (transport_global, GRPC_CHANNEL_TRANSIENT_FAILURE, "no_more_stream_ids", closure_list); + } + + stream_global->outgoing_window = transport_global->settings[GRPC_PEER_SETTINGS][GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; + stream_global->incoming_window = transport_global->settings[GRPC_SENT_SETTINGS][GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; + stream_global->max_recv_bytes = GPR_MAX (stream_global->incoming_window, stream_global->max_recv_bytes); + grpc_chttp2_stream_map_add (&TRANSPORT_FROM_GLOBAL (transport_global)->new_stream_map, stream_global->id, STREAM_FROM_GLOBAL (stream_global)); + stream_global->in_stream_map = 1; + transport_global->concurrent_stream_count++; + grpc_chttp2_list_add_incoming_window_updated (transport_global, stream_global); + grpc_chttp2_list_add_writable_stream (transport_global, stream_global); } - - stream_global->outgoing_window = - transport_global->settings[GRPC_PEER_SETTINGS] - [GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; - stream_global->incoming_window = - transport_global->settings[GRPC_SENT_SETTINGS] - [GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; - stream_global->max_recv_bytes = - GPR_MAX(stream_global->incoming_window, stream_global->max_recv_bytes); - grpc_chttp2_stream_map_add( - &TRANSPORT_FROM_GLOBAL(transport_global)->new_stream_map, - stream_global->id, STREAM_FROM_GLOBAL(stream_global)); - stream_global->in_stream_map = 1; - transport_global->concurrent_stream_count++; - grpc_chttp2_list_add_incoming_window_updated(transport_global, - stream_global); - grpc_chttp2_list_add_writable_stream(transport_global, stream_global); - } /* cancel out streams that will never be started */ - while (transport_global->next_stream_id >= MAX_CLIENT_STREAM_ID && - grpc_chttp2_list_pop_waiting_for_concurrency(transport_global, - &stream_global)) { - cancel_from_api(transport_global, stream_global, GRPC_STATUS_UNAVAILABLE); - } + while (transport_global->next_stream_id >= MAX_CLIENT_STREAM_ID && grpc_chttp2_list_pop_waiting_for_concurrency (transport_global, &stream_global)) + { + cancel_from_api (transport_global, stream_global, GRPC_STATUS_UNAVAILABLE); + } } -static void perform_stream_op_locked( - grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global, grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { - if (op->cancel_with_status != GRPC_STATUS_OK) { - cancel_from_api(transport_global, stream_global, op->cancel_with_status); - } - - if (op->close_with_status != GRPC_STATUS_OK) { - close_from_api(transport_global, stream_global, op->close_with_status, - op->optional_close_message); - } - - if (op->send_ops) { - GPR_ASSERT(stream_global->outgoing_sopb == NULL); - stream_global->send_done_closure = op->on_done_send; - if (!stream_global->cancelled) { - stream_global->written_anything = 1; - stream_global->outgoing_sopb = op->send_ops; - if (op->is_last_send && - stream_global->write_state == GRPC_WRITE_STATE_OPEN) { - stream_global->write_state = GRPC_WRITE_STATE_QUEUED_CLOSE; - } - if (stream_global->id == 0) { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_DEBUG, - "HTTP:%s: New grpc_chttp2_stream %p waiting for concurrency", - transport_global->is_client ? "CLI" : "SVR", stream_global)); - grpc_chttp2_list_add_waiting_for_concurrency(transport_global, - stream_global); - maybe_start_some_streams(transport_global, closure_list); - } else if (stream_global->outgoing_window > 0) { - grpc_chttp2_list_add_writable_stream(transport_global, stream_global); - } - } else { - grpc_sopb_reset(op->send_ops); - grpc_closure_list_add(closure_list, stream_global->send_done_closure, 0); +static void +perform_stream_op_locked (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + if (op->cancel_with_status != GRPC_STATUS_OK) + { + cancel_from_api (transport_global, stream_global, op->cancel_with_status); + } + + if (op->close_with_status != GRPC_STATUS_OK) + { + close_from_api (transport_global, stream_global, op->close_with_status, op->optional_close_message); } - } - - if (op->recv_ops) { - GPR_ASSERT(stream_global->publish_sopb == NULL); - GPR_ASSERT(stream_global->published_state != GRPC_STREAM_CLOSED); - stream_global->recv_done_closure = op->on_done_recv; - stream_global->publish_sopb = op->recv_ops; - stream_global->publish_sopb->nops = 0; - stream_global->publish_state = op->recv_state; - /* clamp max recv bytes */ - op->max_recv_bytes = GPR_MIN(op->max_recv_bytes, GPR_UINT32_MAX); - if (stream_global->max_recv_bytes < op->max_recv_bytes) { - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( - "op", transport_global, stream_global, max_recv_bytes, - op->max_recv_bytes - stream_global->max_recv_bytes); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( - "op", transport_global, stream_global, unannounced_incoming_window, - op->max_recv_bytes - stream_global->max_recv_bytes); - stream_global->unannounced_incoming_window += - (gpr_uint32)op->max_recv_bytes - stream_global->max_recv_bytes; - stream_global->max_recv_bytes = (gpr_uint32)op->max_recv_bytes; + + if (op->send_ops) + { + GPR_ASSERT (stream_global->outgoing_sopb == NULL); + stream_global->send_done_closure = op->on_done_send; + if (!stream_global->cancelled) + { + stream_global->written_anything = 1; + stream_global->outgoing_sopb = op->send_ops; + if (op->is_last_send && stream_global->write_state == GRPC_WRITE_STATE_OPEN) + { + stream_global->write_state = GRPC_WRITE_STATE_QUEUED_CLOSE; + } + if (stream_global->id == 0) + { + GRPC_CHTTP2_IF_TRACING (gpr_log (GPR_DEBUG, "HTTP:%s: New grpc_chttp2_stream %p waiting for concurrency", transport_global->is_client ? "CLI" : "SVR", stream_global)); + grpc_chttp2_list_add_waiting_for_concurrency (transport_global, stream_global); + maybe_start_some_streams (transport_global, closure_list); + } + else if (stream_global->outgoing_window > 0) + { + grpc_chttp2_list_add_writable_stream (transport_global, stream_global); + } + } + else + { + grpc_sopb_reset (op->send_ops); + grpc_closure_list_add (closure_list, stream_global->send_done_closure, 0); + } } - grpc_chttp2_incoming_metadata_live_op_buffer_end( - &stream_global->outstanding_metadata); - grpc_chttp2_list_add_read_write_state_changed(transport_global, - stream_global); - if (stream_global->id != 0) { - grpc_chttp2_list_add_writable_stream(transport_global, stream_global); + + if (op->recv_ops) + { + GPR_ASSERT (stream_global->publish_sopb == NULL); + GPR_ASSERT (stream_global->published_state != GRPC_STREAM_CLOSED); + stream_global->recv_done_closure = op->on_done_recv; + stream_global->publish_sopb = op->recv_ops; + stream_global->publish_sopb->nops = 0; + stream_global->publish_state = op->recv_state; + /* clamp max recv bytes */ + op->max_recv_bytes = GPR_MIN (op->max_recv_bytes, GPR_UINT32_MAX); + if (stream_global->max_recv_bytes < op->max_recv_bytes) + { + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("op", transport_global, stream_global, max_recv_bytes, op->max_recv_bytes - stream_global->max_recv_bytes); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("op", transport_global, stream_global, unannounced_incoming_window, op->max_recv_bytes - stream_global->max_recv_bytes); + stream_global->unannounced_incoming_window += (gpr_uint32) op->max_recv_bytes - stream_global->max_recv_bytes; + stream_global->max_recv_bytes = (gpr_uint32) op->max_recv_bytes; + } + grpc_chttp2_incoming_metadata_live_op_buffer_end (&stream_global->outstanding_metadata); + grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); + if (stream_global->id != 0) + { + grpc_chttp2_list_add_writable_stream (transport_global, stream_global); + } } - } - if (op->bind_pollset) { - add_to_pollset_locked(TRANSPORT_FROM_GLOBAL(transport_global), - op->bind_pollset, closure_list); - } + if (op->bind_pollset) + { + add_to_pollset_locked (TRANSPORT_FROM_GLOBAL (transport_global), op->bind_pollset, closure_list); + } - grpc_closure_list_add(closure_list, op->on_consumed, 1); + grpc_closure_list_add (closure_list, op->on_consumed, 1); } -static void perform_stream_op(grpc_transport *gt, grpc_stream *gs, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { - grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; - grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; +static void +perform_stream_op (grpc_transport * gt, grpc_stream * gs, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + grpc_chttp2_transport *t = (grpc_chttp2_transport *) gt; + grpc_chttp2_stream *s = (grpc_chttp2_stream *) gs; - lock(t); - perform_stream_op_locked(&t->global, &s->global, op, closure_list); - unlock(t, closure_list); + lock (t); + perform_stream_op_locked (&t->global, &s->global, op, closure_list); + unlock (t, closure_list); } -static void send_ping_locked(grpc_chttp2_transport *t, grpc_closure *on_recv) { - grpc_chttp2_outstanding_ping *p = gpr_malloc(sizeof(*p)); +static void +send_ping_locked (grpc_chttp2_transport * t, grpc_closure * on_recv) +{ + grpc_chttp2_outstanding_ping *p = gpr_malloc (sizeof (*p)); p->next = &t->global.pings; p->prev = p->next->prev; p->prev->next = p->next->prev = p; - p->id[0] = (gpr_uint8)((t->global.ping_counter >> 56) & 0xff); - p->id[1] = (gpr_uint8)((t->global.ping_counter >> 48) & 0xff); - p->id[2] = (gpr_uint8)((t->global.ping_counter >> 40) & 0xff); - p->id[3] = (gpr_uint8)((t->global.ping_counter >> 32) & 0xff); - p->id[4] = (gpr_uint8)((t->global.ping_counter >> 24) & 0xff); - p->id[5] = (gpr_uint8)((t->global.ping_counter >> 16) & 0xff); - p->id[6] = (gpr_uint8)((t->global.ping_counter >> 8) & 0xff); - p->id[7] = (gpr_uint8)(t->global.ping_counter & 0xff); + p->id[0] = (gpr_uint8) ((t->global.ping_counter >> 56) &0xff); + p->id[1] = (gpr_uint8) ((t->global.ping_counter >> 48) &0xff); + p->id[2] = (gpr_uint8) ((t->global.ping_counter >> 40) &0xff); + p->id[3] = (gpr_uint8) ((t->global.ping_counter >> 32) &0xff); + p->id[4] = (gpr_uint8) ((t->global.ping_counter >> 24) &0xff); + p->id[5] = (gpr_uint8) ((t->global.ping_counter >> 16) &0xff); + p->id[6] = (gpr_uint8) ((t->global.ping_counter >> 8) &0xff); + p->id[7] = (gpr_uint8) (t->global.ping_counter & 0xff); p->on_recv = on_recv; - gpr_slice_buffer_add(&t->global.qbuf, grpc_chttp2_ping_create(0, p->id)); + gpr_slice_buffer_add (&t->global.qbuf, grpc_chttp2_ping_create (0, p->id)); } -static void perform_transport_op(grpc_transport *gt, grpc_transport_op *op, - grpc_closure_list *closure_list) { - grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; +static void +perform_transport_op (grpc_transport * gt, grpc_transport_op * op, grpc_closure_list * closure_list) +{ + grpc_chttp2_transport *t = (grpc_chttp2_transport *) gt; int close_transport = 0; - lock(t); - - grpc_closure_list_add(closure_list, op->on_consumed, 1); - - if (op->on_connectivity_state_change) { - grpc_connectivity_state_notify_on_state_change( - &t->channel_callback.state_tracker, op->connectivity_state, - op->on_connectivity_state_change, closure_list); - } - - if (op->send_goaway) { - t->global.sent_goaway = 1; - grpc_chttp2_goaway_append( - t->global.last_incoming_stream_id, - (gpr_uint32)grpc_chttp2_grpc_status_to_http2_error(op->goaway_status), - gpr_slice_ref(*op->goaway_message), &t->global.qbuf); - close_transport = !grpc_chttp2_has_streams(t); - } - - if (op->set_accept_stream != NULL) { - t->channel_callback.accept_stream = op->set_accept_stream; - t->channel_callback.accept_stream_user_data = - op->set_accept_stream_user_data; - } - - if (op->bind_pollset) { - add_to_pollset_locked(t, op->bind_pollset, closure_list); - } - - if (op->bind_pollset_set) { - add_to_pollset_set_locked(t, op->bind_pollset_set, closure_list); - } - - if (op->send_ping) { - send_ping_locked(t, op->send_ping); - } - - if (op->disconnect) { - close_transport_locked(t, closure_list); - } - - unlock(t, closure_list); - - if (close_transport) { - lock(t); - close_transport_locked(t, closure_list); - unlock(t, closure_list); - } + lock (t); + + grpc_closure_list_add (closure_list, op->on_consumed, 1); + + if (op->on_connectivity_state_change) + { + grpc_connectivity_state_notify_on_state_change (&t->channel_callback.state_tracker, op->connectivity_state, op->on_connectivity_state_change, closure_list); + } + + if (op->send_goaway) + { + t->global.sent_goaway = 1; + grpc_chttp2_goaway_append (t->global.last_incoming_stream_id, (gpr_uint32) grpc_chttp2_grpc_status_to_http2_error (op->goaway_status), gpr_slice_ref (*op->goaway_message), &t->global.qbuf); + close_transport = !grpc_chttp2_has_streams (t); + } + + if (op->set_accept_stream != NULL) + { + t->channel_callback.accept_stream = op->set_accept_stream; + t->channel_callback.accept_stream_user_data = op->set_accept_stream_user_data; + } + + if (op->bind_pollset) + { + add_to_pollset_locked (t, op->bind_pollset, closure_list); + } + + if (op->bind_pollset_set) + { + add_to_pollset_set_locked (t, op->bind_pollset_set, closure_list); + } + + if (op->send_ping) + { + send_ping_locked (t, op->send_ping); + } + + if (op->disconnect) + { + close_transport_locked (t, closure_list); + } + + unlock (t, closure_list); + + if (close_transport) + { + lock (t); + close_transport_locked (t, closure_list); + unlock (t, closure_list); + } } /* * INPUT PROCESSING */ -static grpc_stream_state compute_state(gpr_uint8 write_closed, - gpr_uint8 read_closed) { - if (write_closed && read_closed) return GRPC_STREAM_CLOSED; - if (write_closed) return GRPC_STREAM_SEND_CLOSED; - if (read_closed) return GRPC_STREAM_RECV_CLOSED; +static grpc_stream_state +compute_state (gpr_uint8 write_closed, gpr_uint8 read_closed) +{ + if (write_closed && read_closed) + return GRPC_STREAM_CLOSED; + if (write_closed) + return GRPC_STREAM_SEND_CLOSED; + if (read_closed) + return GRPC_STREAM_RECV_CLOSED; return GRPC_STREAM_OPEN; } -static void remove_stream(grpc_chttp2_transport *t, gpr_uint32 id, - grpc_closure_list *closure_list) { +static void +remove_stream (grpc_chttp2_transport * t, gpr_uint32 id, grpc_closure_list * closure_list) +{ size_t new_stream_count; - grpc_chttp2_stream *s = - grpc_chttp2_stream_map_delete(&t->parsing_stream_map, id); - if (!s) { - s = grpc_chttp2_stream_map_delete(&t->new_stream_map, id); - } - grpc_chttp2_list_remove_writable_stream(&t->global, &s->global); - GPR_ASSERT(s); + grpc_chttp2_stream *s = grpc_chttp2_stream_map_delete (&t->parsing_stream_map, id); + if (!s) + { + s = grpc_chttp2_stream_map_delete (&t->new_stream_map, id); + } + grpc_chttp2_list_remove_writable_stream (&t->global, &s->global); + GPR_ASSERT (s); s->global.in_stream_map = 0; - if (t->parsing.incoming_stream == &s->parsing) { - t->parsing.incoming_stream = NULL; - grpc_chttp2_parsing_become_skip_parser(&t->parsing); - } - if (grpc_chttp2_unregister_stream(t, s) && t->global.sent_goaway) { - close_transport_locked(t, closure_list); - } - - new_stream_count = grpc_chttp2_stream_map_size(&t->parsing_stream_map) + - grpc_chttp2_stream_map_size(&t->new_stream_map); - GPR_ASSERT(new_stream_count <= GPR_UINT32_MAX); - if (new_stream_count != t->global.concurrent_stream_count) { - t->global.concurrent_stream_count = (gpr_uint32)new_stream_count; - maybe_start_some_streams(&t->global, closure_list); - } + if (t->parsing.incoming_stream == &s->parsing) + { + t->parsing.incoming_stream = NULL; + grpc_chttp2_parsing_become_skip_parser (&t->parsing); + } + if (grpc_chttp2_unregister_stream (t, s) && t->global.sent_goaway) + { + close_transport_locked (t, closure_list); + } + + new_stream_count = grpc_chttp2_stream_map_size (&t->parsing_stream_map) + grpc_chttp2_stream_map_size (&t->new_stream_map); + GPR_ASSERT (new_stream_count <= GPR_UINT32_MAX); + if (new_stream_count != t->global.concurrent_stream_count) + { + t->global.concurrent_stream_count = (gpr_uint32) new_stream_count; + maybe_start_some_streams (&t->global, closure_list); + } } -static void unlock_check_read_write_state(grpc_chttp2_transport *t, - grpc_closure_list *closure_list) { +static void +unlock_check_read_write_state (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +{ grpc_chttp2_transport_global *transport_global = &t->global; grpc_chttp2_stream_global *stream_global; grpc_stream_state state; - if (!t->parsing_active) { - /* if a stream is in the stream map, and gets cancelled, we need to ensure - we are not parsing before continuing the cancellation to keep things in - a sane state */ - while (grpc_chttp2_list_pop_closed_waiting_for_parsing(transport_global, - &stream_global)) { - GPR_ASSERT(stream_global->in_stream_map); - GPR_ASSERT(stream_global->write_state != GRPC_WRITE_STATE_OPEN); - GPR_ASSERT(stream_global->read_closed); - remove_stream(t, stream_global->id, closure_list); - grpc_chttp2_list_add_read_write_state_changed(transport_global, - stream_global); + if (!t->parsing_active) + { + /* if a stream is in the stream map, and gets cancelled, we need to ensure + we are not parsing before continuing the cancellation to keep things in + a sane state */ + while (grpc_chttp2_list_pop_closed_waiting_for_parsing (transport_global, &stream_global)) + { + GPR_ASSERT (stream_global->in_stream_map); + GPR_ASSERT (stream_global->write_state != GRPC_WRITE_STATE_OPEN); + GPR_ASSERT (stream_global->read_closed); + remove_stream (t, stream_global->id, closure_list); + grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); + } } - } - if (!t->writing_active) { - while (grpc_chttp2_list_pop_cancelled_waiting_for_writing(transport_global, - &stream_global)) { - grpc_chttp2_list_add_read_write_state_changed(transport_global, - stream_global); - } - } - - while (grpc_chttp2_list_pop_read_write_state_changed(transport_global, - &stream_global)) { - if (stream_global->cancelled) { - if (t->writing_active && - stream_global->write_state != GRPC_WRITE_STATE_SENT_CLOSE) { - grpc_chttp2_list_add_cancelled_waiting_for_writing(transport_global, - stream_global); - } else { - stream_global->write_state = GRPC_WRITE_STATE_SENT_CLOSE; - if (stream_global->outgoing_sopb != NULL) { - grpc_sopb_reset(stream_global->outgoing_sopb); - stream_global->outgoing_sopb = NULL; - grpc_closure_list_add(closure_list, stream_global->send_done_closure, - 1); - } - stream_global->read_closed = 1; - if (!stream_global->published_cancelled) { - char buffer[GPR_LTOA_MIN_BUFSIZE]; - gpr_ltoa(stream_global->cancelled_status, buffer); - grpc_chttp2_incoming_metadata_buffer_add( - &stream_global->incoming_metadata, - grpc_mdelem_from_strings(t->metadata_context, "grpc-status", - buffer)); - grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into( - &stream_global->incoming_metadata, &stream_global->incoming_sopb); - stream_global->published_cancelled = 1; - } - } - } - if (stream_global->write_state == GRPC_WRITE_STATE_SENT_CLOSE && - stream_global->read_closed && stream_global->in_stream_map) { - if (t->parsing_active) { - grpc_chttp2_list_add_closed_waiting_for_parsing(transport_global, - stream_global); - } else { - remove_stream(t, stream_global->id, closure_list); - } - } - if (!stream_global->publish_sopb) { - continue; + if (!t->writing_active) + { + while (grpc_chttp2_list_pop_cancelled_waiting_for_writing (transport_global, &stream_global)) + { + grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); + } } - if (stream_global->writing_now != 0) { - continue; - } - /* FIXME(ctiller): we include in_stream_map in our computation of - whether the stream is write-closed. This is completely bogus, - but has the effect of delaying stream-closed until the stream - is indeed evicted from the stream map, making it safe to delete. - To fix this will require having an edge after stream-closed - indicating that the stream is closed AND safe to delete. */ - state = compute_state( - stream_global->write_state == GRPC_WRITE_STATE_SENT_CLOSE && - !stream_global->in_stream_map, - stream_global->read_closed); - if (stream_global->incoming_sopb.nops == 0 && - state == stream_global->published_state) { - continue; + + while (grpc_chttp2_list_pop_read_write_state_changed (transport_global, &stream_global)) + { + if (stream_global->cancelled) + { + if (t->writing_active && stream_global->write_state != GRPC_WRITE_STATE_SENT_CLOSE) + { + grpc_chttp2_list_add_cancelled_waiting_for_writing (transport_global, stream_global); + } + else + { + stream_global->write_state = GRPC_WRITE_STATE_SENT_CLOSE; + if (stream_global->outgoing_sopb != NULL) + { + grpc_sopb_reset (stream_global->outgoing_sopb); + stream_global->outgoing_sopb = NULL; + grpc_closure_list_add (closure_list, stream_global->send_done_closure, 1); + } + stream_global->read_closed = 1; + if (!stream_global->published_cancelled) + { + char buffer[GPR_LTOA_MIN_BUFSIZE]; + gpr_ltoa (stream_global->cancelled_status, buffer); + grpc_chttp2_incoming_metadata_buffer_add (&stream_global->incoming_metadata, grpc_mdelem_from_strings (t->metadata_context, "grpc-status", buffer)); + grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into (&stream_global->incoming_metadata, &stream_global->incoming_sopb); + stream_global->published_cancelled = 1; + } + } + } + if (stream_global->write_state == GRPC_WRITE_STATE_SENT_CLOSE && stream_global->read_closed && stream_global->in_stream_map) + { + if (t->parsing_active) + { + grpc_chttp2_list_add_closed_waiting_for_parsing (transport_global, stream_global); + } + else + { + remove_stream (t, stream_global->id, closure_list); + } + } + if (!stream_global->publish_sopb) + { + continue; + } + if (stream_global->writing_now != 0) + { + continue; + } + /* FIXME(ctiller): we include in_stream_map in our computation of + whether the stream is write-closed. This is completely bogus, + but has the effect of delaying stream-closed until the stream + is indeed evicted from the stream map, making it safe to delete. + To fix this will require having an edge after stream-closed + indicating that the stream is closed AND safe to delete. */ + state = compute_state (stream_global->write_state == GRPC_WRITE_STATE_SENT_CLOSE && !stream_global->in_stream_map, stream_global->read_closed); + if (stream_global->incoming_sopb.nops == 0 && state == stream_global->published_state) + { + continue; + } + grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op (&stream_global->incoming_metadata, &stream_global->incoming_sopb, &stream_global->outstanding_metadata); + grpc_sopb_swap (stream_global->publish_sopb, &stream_global->incoming_sopb); + stream_global->published_state = *stream_global->publish_state = state; + grpc_closure_list_add (closure_list, stream_global->recv_done_closure, 1); + stream_global->recv_done_closure = NULL; + stream_global->publish_sopb = NULL; + stream_global->publish_state = NULL; } - grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op( - &stream_global->incoming_metadata, &stream_global->incoming_sopb, - &stream_global->outstanding_metadata); - grpc_sopb_swap(stream_global->publish_sopb, &stream_global->incoming_sopb); - stream_global->published_state = *stream_global->publish_state = state; - grpc_closure_list_add(closure_list, stream_global->recv_done_closure, 1); - stream_global->recv_done_closure = NULL; - stream_global->publish_sopb = NULL; - stream_global->publish_state = NULL; - } } -static void cancel_from_api(grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global, - grpc_status_code status) { +static void +cancel_from_api (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_status_code status) +{ stream_global->cancelled = 1; stream_global->cancelled_status = status; - if (stream_global->id != 0) { - gpr_slice_buffer_add( - &transport_global->qbuf, - grpc_chttp2_rst_stream_create( - stream_global->id, - (gpr_uint32)grpc_chttp2_grpc_status_to_http2_error(status))); - } - grpc_chttp2_list_add_read_write_state_changed(transport_global, - stream_global); + if (stream_global->id != 0) + { + gpr_slice_buffer_add (&transport_global->qbuf, grpc_chttp2_rst_stream_create (stream_global->id, (gpr_uint32) grpc_chttp2_grpc_status_to_http2_error (status))); + } + grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); } -static void close_from_api(grpc_chttp2_transport_global *transport_global, - grpc_chttp2_stream_global *stream_global, - grpc_status_code status, - gpr_slice *optional_message) { +static void +close_from_api (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_status_code status, gpr_slice * optional_message) +{ gpr_slice hdr; gpr_slice status_hdr; gpr_slice message_pfx; gpr_uint8 *p; gpr_uint32 len = 0; - GPR_ASSERT(status >= 0 && (int)status < 100); + GPR_ASSERT (status >= 0 && (int) status < 100); stream_global->cancelled = 1; stream_global->cancelled_status = status; - GPR_ASSERT(stream_global->id != 0); - GPR_ASSERT(!stream_global->written_anything); + GPR_ASSERT (stream_global->id != 0); + GPR_ASSERT (!stream_global->written_anything); /* Hand roll a header block. This is unnecessarily ugly - at some point we should find a more elegant @@ -987,10 +977,10 @@ static void close_from_api(grpc_chttp2_transport_global *transport_global, It's complicated by the fact that our send machinery would be dead by the time we got around to sending this, so instead we ignore HPACK compression and just write the uncompressed bytes onto the wire. */ - status_hdr = gpr_slice_malloc(15 + (status >= 10)); - p = GPR_SLICE_START_PTR(status_hdr); - *p++ = 0x40; /* literal header */ - *p++ = 11; /* len(grpc-status) */ + status_hdr = gpr_slice_malloc (15 + (status >= 10)); + p = GPR_SLICE_START_PTR (status_hdr); + *p++ = 0x40; /* literal header */ + *p++ = 11; /* len(grpc-status) */ *p++ = 'g'; *p++ = 'r'; *p++ = 'p'; @@ -1002,88 +992,94 @@ static void close_from_api(grpc_chttp2_transport_global *transport_global, *p++ = 't'; *p++ = 'u'; *p++ = 's'; - if (status < 10) { - *p++ = 1; - *p++ = (gpr_uint8)('0' + status); - } else { - *p++ = 2; - *p++ = (gpr_uint8)('0' + (status / 10)); - *p++ = (gpr_uint8)('0' + (status % 10)); - } - GPR_ASSERT(p == GPR_SLICE_END_PTR(status_hdr)); - len += (gpr_uint32)GPR_SLICE_LENGTH(status_hdr); - - if (optional_message) { - GPR_ASSERT(GPR_SLICE_LENGTH(*optional_message) < 127); - message_pfx = gpr_slice_malloc(15); - p = GPR_SLICE_START_PTR(message_pfx); - *p++ = 0x40; - *p++ = 12; /* len(grpc-message) */ - *p++ = 'g'; - *p++ = 'r'; - *p++ = 'p'; - *p++ = 'c'; - *p++ = '-'; - *p++ = 'm'; - *p++ = 'e'; - *p++ = 's'; - *p++ = 's'; - *p++ = 'a'; - *p++ = 'g'; - *p++ = 'e'; - *p++ = (gpr_uint8)GPR_SLICE_LENGTH(*optional_message); - GPR_ASSERT(p == GPR_SLICE_END_PTR(message_pfx)); - len += (gpr_uint32)GPR_SLICE_LENGTH(message_pfx); - len += (gpr_uint32)GPR_SLICE_LENGTH(*optional_message); - } - - hdr = gpr_slice_malloc(9); - p = GPR_SLICE_START_PTR(hdr); - *p++ = (gpr_uint8)(len >> 16); - *p++ = (gpr_uint8)(len >> 8); - *p++ = (gpr_uint8)(len); + if (status < 10) + { + *p++ = 1; + *p++ = (gpr_uint8) ('0' + status); + } + else + { + *p++ = 2; + *p++ = (gpr_uint8) ('0' + (status / 10)); + *p++ = (gpr_uint8) ('0' + (status % 10)); + } + GPR_ASSERT (p == GPR_SLICE_END_PTR (status_hdr)); + len += (gpr_uint32) GPR_SLICE_LENGTH (status_hdr); + + if (optional_message) + { + GPR_ASSERT (GPR_SLICE_LENGTH (*optional_message) < 127); + message_pfx = gpr_slice_malloc (15); + p = GPR_SLICE_START_PTR (message_pfx); + *p++ = 0x40; + *p++ = 12; /* len(grpc-message) */ + *p++ = 'g'; + *p++ = 'r'; + *p++ = 'p'; + *p++ = 'c'; + *p++ = '-'; + *p++ = 'm'; + *p++ = 'e'; + *p++ = 's'; + *p++ = 's'; + *p++ = 'a'; + *p++ = 'g'; + *p++ = 'e'; + *p++ = (gpr_uint8) GPR_SLICE_LENGTH (*optional_message); + GPR_ASSERT (p == GPR_SLICE_END_PTR (message_pfx)); + len += (gpr_uint32) GPR_SLICE_LENGTH (message_pfx); + len += (gpr_uint32) GPR_SLICE_LENGTH (*optional_message); + } + + hdr = gpr_slice_malloc (9); + p = GPR_SLICE_START_PTR (hdr); + *p++ = (gpr_uint8) (len >> 16); + *p++ = (gpr_uint8) (len >> 8); + *p++ = (gpr_uint8) (len); *p++ = GRPC_CHTTP2_FRAME_HEADER; *p++ = GRPC_CHTTP2_DATA_FLAG_END_STREAM | GRPC_CHTTP2_DATA_FLAG_END_HEADERS; - *p++ = (gpr_uint8)(stream_global->id >> 24); - *p++ = (gpr_uint8)(stream_global->id >> 16); - *p++ = (gpr_uint8)(stream_global->id >> 8); - *p++ = (gpr_uint8)(stream_global->id); - GPR_ASSERT(p == GPR_SLICE_END_PTR(hdr)); - - gpr_slice_buffer_add(&transport_global->qbuf, hdr); - gpr_slice_buffer_add(&transport_global->qbuf, status_hdr); - if (optional_message) { - gpr_slice_buffer_add(&transport_global->qbuf, message_pfx); - gpr_slice_buffer_add(&transport_global->qbuf, - gpr_slice_ref(*optional_message)); - } - - gpr_slice_buffer_add( - &transport_global->qbuf, - grpc_chttp2_rst_stream_create(stream_global->id, GRPC_CHTTP2_NO_ERROR)); - - grpc_chttp2_list_add_read_write_state_changed(transport_global, - stream_global); + *p++ = (gpr_uint8) (stream_global->id >> 24); + *p++ = (gpr_uint8) (stream_global->id >> 16); + *p++ = (gpr_uint8) (stream_global->id >> 8); + *p++ = (gpr_uint8) (stream_global->id); + GPR_ASSERT (p == GPR_SLICE_END_PTR (hdr)); + + gpr_slice_buffer_add (&transport_global->qbuf, hdr); + gpr_slice_buffer_add (&transport_global->qbuf, status_hdr); + if (optional_message) + { + gpr_slice_buffer_add (&transport_global->qbuf, message_pfx); + gpr_slice_buffer_add (&transport_global->qbuf, gpr_slice_ref (*optional_message)); + } + + gpr_slice_buffer_add (&transport_global->qbuf, grpc_chttp2_rst_stream_create (stream_global->id, GRPC_CHTTP2_NO_ERROR)); + + grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); } -static void cancel_stream_cb(grpc_chttp2_transport_global *transport_global, - void *user_data, - grpc_chttp2_stream_global *stream_global) { - cancel_from_api(transport_global, stream_global, GRPC_STATUS_UNAVAILABLE); +static void +cancel_stream_cb (grpc_chttp2_transport_global * transport_global, void *user_data, grpc_chttp2_stream_global * stream_global) +{ + cancel_from_api (transport_global, stream_global, GRPC_STATUS_UNAVAILABLE); } -static void end_all_the_calls(grpc_chttp2_transport *t) { - grpc_chttp2_for_all_streams(&t->global, NULL, cancel_stream_cb); +static void +end_all_the_calls (grpc_chttp2_transport * t) +{ + grpc_chttp2_for_all_streams (&t->global, NULL, cancel_stream_cb); } -static void drop_connection(grpc_chttp2_transport *t, - grpc_closure_list *closure_list) { - close_transport_locked(t, closure_list); - end_all_the_calls(t); +static void +drop_connection (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +{ + close_transport_locked (t, closure_list); + end_all_the_calls (t); } /** update window from a settings change */ -static void update_global_window(void *args, gpr_uint32 id, void *stream) { +static void +update_global_window (void *args, gpr_uint32 id, void *stream) +{ grpc_chttp2_transport *t = args; grpc_chttp2_stream *s = stream; grpc_chttp2_transport_global *transport_global = &t->global; @@ -1091,181 +1087,184 @@ static void update_global_window(void *args, gpr_uint32 id, void *stream) { int was_zero; int is_zero; - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM("settings", transport_global, stream_global, - outgoing_window, - t->parsing.initial_window_update); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("settings", transport_global, stream_global, outgoing_window, t->parsing.initial_window_update); was_zero = stream_global->outgoing_window <= 0; stream_global->outgoing_window += t->parsing.initial_window_update; is_zero = stream_global->outgoing_window <= 0; - if (was_zero && !is_zero) { - grpc_chttp2_list_add_writable_stream(transport_global, stream_global); - } + if (was_zero && !is_zero) + { + grpc_chttp2_list_add_writable_stream (transport_global, stream_global); + } } -static void read_error_locked(grpc_chttp2_transport *t, - grpc_closure_list *closure_list) { +static void +read_error_locked (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +{ t->endpoint_reading = 0; - if (!t->writing_active && t->ep) { - destroy_endpoint(t, closure_list); - } + if (!t->writing_active && t->ep) + { + destroy_endpoint (t, closure_list); + } } /* tcp read callback */ -static void recv_data(void *tp, int success, grpc_closure_list *closure_list) { +static void +recv_data (void *tp, int success, grpc_closure_list * closure_list) +{ size_t i; int keep_reading = 0; grpc_chttp2_transport *t = tp; - lock(t); + lock (t); i = 0; - GPR_ASSERT(!t->parsing_active); - if (!t->closed) { - t->parsing_active = 1; - /* merge stream lists */ - grpc_chttp2_stream_map_move_into(&t->new_stream_map, - &t->parsing_stream_map); - grpc_chttp2_prepare_to_read(&t->global, &t->parsing); - gpr_mu_unlock(&t->mu); - for (; i < t->read_buffer.count && - grpc_chttp2_perform_read(&t->parsing, t->read_buffer.slices[i], - closure_list); - i++) - ; - gpr_mu_lock(&t->mu); - if (i != t->read_buffer.count) { - drop_connection(t, closure_list); + GPR_ASSERT (!t->parsing_active); + if (!t->closed) + { + t->parsing_active = 1; + /* merge stream lists */ + grpc_chttp2_stream_map_move_into (&t->new_stream_map, &t->parsing_stream_map); + grpc_chttp2_prepare_to_read (&t->global, &t->parsing); + gpr_mu_unlock (&t->mu); + for (; i < t->read_buffer.count && grpc_chttp2_perform_read (&t->parsing, t->read_buffer.slices[i], closure_list); i++) + ; + gpr_mu_lock (&t->mu); + if (i != t->read_buffer.count) + { + drop_connection (t, closure_list); + } + /* merge stream lists */ + grpc_chttp2_stream_map_move_into (&t->new_stream_map, &t->parsing_stream_map); + t->global.concurrent_stream_count = (gpr_uint32) grpc_chttp2_stream_map_size (&t->parsing_stream_map); + if (t->parsing.initial_window_update != 0) + { + grpc_chttp2_stream_map_for_each (&t->parsing_stream_map, update_global_window, t); + t->parsing.initial_window_update = 0; + } + /* handle higher level things */ + grpc_chttp2_publish_reads (&t->global, &t->parsing, closure_list); + t->parsing_active = 0; + } + if (!success || i != t->read_buffer.count) + { + drop_connection (t, closure_list); + read_error_locked (t, closure_list); + } + else if (!t->closed) + { + keep_reading = 1; + REF_TRANSPORT (t, "keep_reading"); + prevent_endpoint_shutdown (t); + } + gpr_slice_buffer_reset_and_unref (&t->read_buffer); + unlock (t, closure_list); + + if (keep_reading) + { + grpc_endpoint_read (t->ep, &t->read_buffer, &t->recv_data, closure_list); + allow_endpoint_shutdown_unlocked (t, closure_list); + UNREF_TRANSPORT (t, "keep_reading", closure_list); } - /* merge stream lists */ - grpc_chttp2_stream_map_move_into(&t->new_stream_map, - &t->parsing_stream_map); - t->global.concurrent_stream_count = - (gpr_uint32)grpc_chttp2_stream_map_size(&t->parsing_stream_map); - if (t->parsing.initial_window_update != 0) { - grpc_chttp2_stream_map_for_each(&t->parsing_stream_map, - update_global_window, t); - t->parsing.initial_window_update = 0; + else + { + UNREF_TRANSPORT (t, "recv_data", closure_list); } - /* handle higher level things */ - grpc_chttp2_publish_reads(&t->global, &t->parsing, closure_list); - t->parsing_active = 0; - } - if (!success || i != t->read_buffer.count) { - drop_connection(t, closure_list); - read_error_locked(t, closure_list); - } else if (!t->closed) { - keep_reading = 1; - REF_TRANSPORT(t, "keep_reading"); - prevent_endpoint_shutdown(t); - } - gpr_slice_buffer_reset_and_unref(&t->read_buffer); - unlock(t, closure_list); - - if (keep_reading) { - grpc_endpoint_read(t->ep, &t->read_buffer, &t->recv_data, closure_list); - allow_endpoint_shutdown_unlocked(t, closure_list); - UNREF_TRANSPORT(t, "keep_reading", closure_list); - } else { - UNREF_TRANSPORT(t, "recv_data", closure_list); - } } /* * CALLBACK LOOP */ -static void connectivity_state_set( - grpc_chttp2_transport_global *transport_global, - grpc_connectivity_state state, const char *reason, - grpc_closure_list *closure_list) { - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_DEBUG, "set connectivity_state=%d", state)); - grpc_connectivity_state_set( - &TRANSPORT_FROM_GLOBAL(transport_global)->channel_callback.state_tracker, - state, reason, closure_list); +static void +connectivity_state_set (grpc_chttp2_transport_global * transport_global, grpc_connectivity_state state, const char *reason, grpc_closure_list * closure_list) +{ + GRPC_CHTTP2_IF_TRACING (gpr_log (GPR_DEBUG, "set connectivity_state=%d", state)); + grpc_connectivity_state_set (&TRANSPORT_FROM_GLOBAL (transport_global)->channel_callback.state_tracker, state, reason, closure_list); } /* * POLLSET STUFF */ -static void add_to_pollset_locked(grpc_chttp2_transport *t, - grpc_pollset *pollset, - grpc_closure_list *closure_list) { - if (t->ep) { - grpc_endpoint_add_to_pollset(t->ep, pollset, closure_list); - } +static void +add_to_pollset_locked (grpc_chttp2_transport * t, grpc_pollset * pollset, grpc_closure_list * closure_list) +{ + if (t->ep) + { + grpc_endpoint_add_to_pollset (t->ep, pollset, closure_list); + } } -static void add_to_pollset_set_locked(grpc_chttp2_transport *t, - grpc_pollset_set *pollset_set, - grpc_closure_list *closure_list) { - if (t->ep) { - grpc_endpoint_add_to_pollset_set(t->ep, pollset_set, closure_list); - } +static void +add_to_pollset_set_locked (grpc_chttp2_transport * t, grpc_pollset_set * pollset_set, grpc_closure_list * closure_list) +{ + if (t->ep) + { + grpc_endpoint_add_to_pollset_set (t->ep, pollset_set, closure_list); + } } /* * TRACING */ -void grpc_chttp2_flowctl_trace(const char *file, int line, const char *reason, - const char *context, const char *var, - int is_client, gpr_uint32 stream_id, - gpr_int64 current_value, gpr_int64 delta) { +void +grpc_chttp2_flowctl_trace (const char *file, int line, const char *reason, const char *context, const char *var, int is_client, gpr_uint32 stream_id, gpr_int64 current_value, gpr_int64 delta) +{ char *identifier; char *context_scope; char *context_thread; - char *underscore_pos = strchr(context, '_'); - GPR_ASSERT(underscore_pos); - context_thread = gpr_strdup(underscore_pos + 1); - context_scope = gpr_strdup(context); + char *underscore_pos = strchr (context, '_'); + GPR_ASSERT (underscore_pos); + context_thread = gpr_strdup (underscore_pos + 1); + context_scope = gpr_strdup (context); context_scope[underscore_pos - context] = 0; - if (stream_id) { - gpr_asprintf(&identifier, "%s[%d]", context_scope, stream_id); - } else { - identifier = gpr_strdup(context_scope); - } - gpr_log(GPR_INFO, - "FLOWCTL: %s %-10s %8s %-27s %8lld %c %8lld = %8lld %-10s [%s:%d]", - is_client ? "client" : "server", identifier, context_thread, var, - current_value, delta < 0 ? '-' : '+', delta < 0 ? -delta : delta, - current_value + delta, reason, file, line); - gpr_free(identifier); - gpr_free(context_thread); - gpr_free(context_scope); + if (stream_id) + { + gpr_asprintf (&identifier, "%s[%d]", context_scope, stream_id); + } + else + { + identifier = gpr_strdup (context_scope); + } + gpr_log (GPR_INFO, "FLOWCTL: %s %-10s %8s %-27s %8lld %c %8lld = %8lld %-10s [%s:%d]", is_client ? "client" : "server", identifier, context_thread, var, current_value, delta < 0 ? '-' : '+', delta < 0 ? -delta : delta, current_value + delta, reason, file, line); + gpr_free (identifier); + gpr_free (context_thread); + gpr_free (context_scope); } /* * INTEGRATION GLUE */ -static char *chttp2_get_peer(grpc_transport *t, - grpc_closure_list *closure_list) { - return gpr_strdup(((grpc_chttp2_transport *)t)->peer_string); +static char * +chttp2_get_peer (grpc_transport * t, grpc_closure_list * closure_list) +{ + return gpr_strdup (((grpc_chttp2_transport *) t)->peer_string); } -static const grpc_transport_vtable vtable = {sizeof(grpc_chttp2_stream), - init_stream, - perform_stream_op, - perform_transport_op, - destroy_stream, - destroy_transport, - chttp2_get_peer}; - -grpc_transport *grpc_create_chttp2_transport( - const grpc_channel_args *channel_args, grpc_endpoint *ep, grpc_mdctx *mdctx, - int is_client, grpc_closure_list *closure_list) { - grpc_chttp2_transport *t = gpr_malloc(sizeof(grpc_chttp2_transport)); - init_transport(t, channel_args, ep, mdctx, is_client != 0, closure_list); +static const grpc_transport_vtable vtable = { sizeof (grpc_chttp2_stream), + init_stream, + perform_stream_op, + perform_transport_op, + destroy_stream, + destroy_transport, + chttp2_get_peer +}; + +grpc_transport * +grpc_create_chttp2_transport (const grpc_channel_args * channel_args, grpc_endpoint * ep, grpc_mdctx * mdctx, int is_client, grpc_closure_list * closure_list) +{ + grpc_chttp2_transport *t = gpr_malloc (sizeof (grpc_chttp2_transport)); + init_transport (t, channel_args, ep, mdctx, is_client != 0, closure_list); return &t->base; } -void grpc_chttp2_transport_start_reading(grpc_transport *transport, - gpr_slice *slices, size_t nslices, - grpc_closure_list *closure_list) { - grpc_chttp2_transport *t = (grpc_chttp2_transport *)transport; - REF_TRANSPORT(t, "recv_data"); /* matches unref inside recv_data */ - gpr_slice_buffer_addn(&t->read_buffer, slices, nslices); - recv_data(t, 1, closure_list); +void +grpc_chttp2_transport_start_reading (grpc_transport * transport, gpr_slice * slices, size_t nslices, grpc_closure_list * closure_list) +{ + grpc_chttp2_transport *t = (grpc_chttp2_transport *) transport; + REF_TRANSPORT (t, "recv_data"); /* matches unref inside recv_data */ + gpr_slice_buffer_addn (&t->read_buffer, slices, nslices); + recv_data (t, 1, closure_list); } diff --git a/src/core/transport/chttp2_transport.h b/src/core/transport/chttp2_transport.h index 93a654bc83e..69f98d34896 100644 --- a/src/core/transport/chttp2_transport.h +++ b/src/core/transport/chttp2_transport.h @@ -40,13 +40,8 @@ extern int grpc_http_trace; extern int grpc_flowctl_trace; -grpc_transport *grpc_create_chttp2_transport( - const grpc_channel_args *channel_args, grpc_endpoint *ep, - grpc_mdctx *metadata_context, int is_client, - grpc_closure_list *closure_list); +grpc_transport *grpc_create_chttp2_transport (const grpc_channel_args * channel_args, grpc_endpoint * ep, grpc_mdctx * metadata_context, int is_client, grpc_closure_list * closure_list); -void grpc_chttp2_transport_start_reading(grpc_transport *transport, - gpr_slice *slices, size_t nslices, - grpc_closure_list *closure_list); +void grpc_chttp2_transport_start_reading (grpc_transport * transport, gpr_slice * slices, size_t nslices, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_TRANSPORT_H */ diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c index fe80f9b0e96..08ecfb9fd57 100644 --- a/src/core/transport/connectivity_state.c +++ b/src/core/transport/connectivity_state.c @@ -41,8 +41,11 @@ int grpc_connectivity_state_trace = 0; -const char *grpc_connectivity_state_name(grpc_connectivity_state state) { - switch (state) { +const char * +grpc_connectivity_state_name (grpc_connectivity_state state) +{ + switch (state) + { case GRPC_CHANNEL_IDLE: return "IDLE"; case GRPC_CHANNEL_CONNECTING: @@ -53,87 +56,95 @@ const char *grpc_connectivity_state_name(grpc_connectivity_state state) { return "TRANSIENT_FAILURE"; case GRPC_CHANNEL_FATAL_FAILURE: return "FATAL_FAILURE"; - } - abort(); + } + abort (); return "UNKNOWN"; } -void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, - grpc_connectivity_state init_state, - const char *name) { +void +grpc_connectivity_state_init (grpc_connectivity_state_tracker * tracker, grpc_connectivity_state init_state, const char *name) +{ tracker->current_state = init_state; tracker->watchers = NULL; - tracker->name = gpr_strdup(name); + tracker->name = gpr_strdup (name); } -void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker, - grpc_closure_list *closure_list) { +void +grpc_connectivity_state_destroy (grpc_connectivity_state_tracker * tracker, grpc_closure_list * closure_list) +{ int success; grpc_connectivity_state_watcher *w; - while ((w = tracker->watchers)) { - tracker->watchers = w->next; + while ((w = tracker->watchers)) + { + tracker->watchers = w->next; - if (GRPC_CHANNEL_FATAL_FAILURE != *w->current) { - *w->current = GRPC_CHANNEL_FATAL_FAILURE; - success = 1; - } else { - success = 0; + if (GRPC_CHANNEL_FATAL_FAILURE != *w->current) + { + *w->current = GRPC_CHANNEL_FATAL_FAILURE; + success = 1; + } + else + { + success = 0; + } + grpc_closure_list_add (closure_list, w->notify, success); + gpr_free (w); } - grpc_closure_list_add(closure_list, w->notify, success); - gpr_free(w); - } - gpr_free(tracker->name); + gpr_free (tracker->name); } -grpc_connectivity_state grpc_connectivity_state_check( - grpc_connectivity_state_tracker *tracker) { - if (grpc_connectivity_state_trace) { - gpr_log(GPR_DEBUG, "CONWATCH: %s: get %s", tracker->name, - grpc_connectivity_state_name(tracker->current_state)); - } +grpc_connectivity_state +grpc_connectivity_state_check (grpc_connectivity_state_tracker * tracker) +{ + if (grpc_connectivity_state_trace) + { + gpr_log (GPR_DEBUG, "CONWATCH: %s: get %s", tracker->name, grpc_connectivity_state_name (tracker->current_state)); + } return tracker->current_state; } -int grpc_connectivity_state_notify_on_state_change( - grpc_connectivity_state_tracker *tracker, grpc_connectivity_state *current, - grpc_closure *notify, grpc_closure_list *closure_list) { - if (grpc_connectivity_state_trace) { - gpr_log(GPR_DEBUG, "CONWATCH: %s: from %s [cur=%s] notify=%p", - tracker->name, grpc_connectivity_state_name(*current), - grpc_connectivity_state_name(tracker->current_state), notify); - } - if (tracker->current_state != *current) { - *current = tracker->current_state; - grpc_closure_list_add(closure_list, notify, 1); - } else { - grpc_connectivity_state_watcher *w = gpr_malloc(sizeof(*w)); - w->current = current; - w->notify = notify; - w->next = tracker->watchers; - tracker->watchers = w; - } +int +grpc_connectivity_state_notify_on_state_change (grpc_connectivity_state_tracker * tracker, grpc_connectivity_state * current, grpc_closure * notify, grpc_closure_list * closure_list) +{ + if (grpc_connectivity_state_trace) + { + gpr_log (GPR_DEBUG, "CONWATCH: %s: from %s [cur=%s] notify=%p", tracker->name, grpc_connectivity_state_name (*current), grpc_connectivity_state_name (tracker->current_state), notify); + } + if (tracker->current_state != *current) + { + *current = tracker->current_state; + grpc_closure_list_add (closure_list, notify, 1); + } + else + { + grpc_connectivity_state_watcher *w = gpr_malloc (sizeof (*w)); + w->current = current; + w->notify = notify; + w->next = tracker->watchers; + tracker->watchers = w; + } return tracker->current_state == GRPC_CHANNEL_IDLE; } -void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, - grpc_connectivity_state state, - const char *reason, - grpc_closure_list *closure_list) { +void +grpc_connectivity_state_set (grpc_connectivity_state_tracker * tracker, grpc_connectivity_state state, const char *reason, grpc_closure_list * closure_list) +{ grpc_connectivity_state_watcher *w; - if (grpc_connectivity_state_trace) { - gpr_log(GPR_DEBUG, "SET: %s: %s --> %s [%s]", tracker->name, - grpc_connectivity_state_name(tracker->current_state), - grpc_connectivity_state_name(state), reason); - } - if (tracker->current_state == state) { - return; - } - GPR_ASSERT(tracker->current_state != GRPC_CHANNEL_FATAL_FAILURE); + if (grpc_connectivity_state_trace) + { + gpr_log (GPR_DEBUG, "SET: %s: %s --> %s [%s]", tracker->name, grpc_connectivity_state_name (tracker->current_state), grpc_connectivity_state_name (state), reason); + } + if (tracker->current_state == state) + { + return; + } + GPR_ASSERT (tracker->current_state != GRPC_CHANNEL_FATAL_FAILURE); tracker->current_state = state; - while ((w = tracker->watchers) != NULL) { - *w->current = tracker->current_state; - tracker->watchers = w->next; - grpc_closure_list_add(closure_list, w->notify, 1); - gpr_free(w); - } + while ((w = tracker->watchers) != NULL) + { + *w->current = tracker->current_state; + tracker->watchers = w->next; + grpc_closure_list_add (closure_list, w->notify, 1); + gpr_free (w); + } } diff --git a/src/core/transport/connectivity_state.h b/src/core/transport/connectivity_state.h index 9b4d8da882e..81fc8e7e120 100644 --- a/src/core/transport/connectivity_state.h +++ b/src/core/transport/connectivity_state.h @@ -37,7 +37,8 @@ #include #include "src/core/iomgr/exec_ctx.h" -typedef struct grpc_connectivity_state_watcher { +typedef struct grpc_connectivity_state_watcher +{ /** we keep watchers in a linked list */ struct grpc_connectivity_state_watcher *next; /** closure to notify on change */ @@ -46,7 +47,8 @@ typedef struct grpc_connectivity_state_watcher { grpc_connectivity_state *current; } grpc_connectivity_state_watcher; -typedef struct { +typedef struct +{ /** current connectivity state */ grpc_connectivity_state current_state; /** all our watchers */ @@ -57,25 +59,16 @@ typedef struct { extern int grpc_connectivity_state_trace; -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, - grpc_closure_list *closure_list); +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, grpc_closure_list * closure_list); /** Set connectivity state; not thread safe; access must be serialized with an * external lock */ -void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, - grpc_connectivity_state state, - const char *reason, - grpc_closure_list *closure_list); +void grpc_connectivity_state_set (grpc_connectivity_state_tracker * tracker, grpc_connectivity_state state, const char *reason, grpc_closure_list * closure_list); -grpc_connectivity_state grpc_connectivity_state_check( - grpc_connectivity_state_tracker *tracker); +grpc_connectivity_state grpc_connectivity_state_check (grpc_connectivity_state_tracker * tracker); /** Return 1 if the channel should start connecting, 0 otherwise */ -int grpc_connectivity_state_notify_on_state_change( - grpc_connectivity_state_tracker *tracker, grpc_connectivity_state *current, - grpc_closure *notify, grpc_closure_list *closure_list); +int grpc_connectivity_state_notify_on_state_change (grpc_connectivity_state_tracker * tracker, grpc_connectivity_state * current, grpc_closure * notify, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CONNECTIVITY_STATE_H */ diff --git a/src/core/transport/metadata.c b/src/core/transport/metadata.c index 9d135f43560..0ce18712c30 100644 --- a/src/core/transport/metadata.c +++ b/src/core/transport/metadata.c @@ -62,7 +62,8 @@ #define REF_MD_LOCKED(s) ref_md_locked((s)) #endif -typedef struct internal_string { +typedef struct internal_string +{ /* must be byte compatible with grpc_mdstr */ gpr_slice slice; gpr_uint32 hash; @@ -79,7 +80,8 @@ typedef struct internal_string { struct internal_string *bucket_next; } internal_string; -typedef struct internal_metadata { +typedef struct internal_metadata +{ /* must be byte compatible with grpc_mdelem */ internal_string *key; internal_string *value; @@ -89,13 +91,14 @@ typedef struct internal_metadata { /* private only data */ gpr_mu mu_user_data; void *user_data; - void (*destroy_user_data)(void *user_data); + void (*destroy_user_data) (void *user_data); grpc_mdctx *context; struct internal_metadata *bucket_next; } internal_metadata; -struct grpc_mdctx { +struct grpc_mdctx +{ gpr_uint32 hash_seed; int refs; @@ -111,15 +114,21 @@ struct grpc_mdctx { size_t mdtab_capacity; }; -static void internal_string_ref(internal_string *s DEBUG_ARGS); -static void internal_string_unref(internal_string *s DEBUG_ARGS); -static void discard_metadata(grpc_mdctx *ctx); -static void gc_mdtab(grpc_mdctx *ctx); -static void metadata_context_destroy_locked(grpc_mdctx *ctx); +static void internal_string_ref (internal_string * s DEBUG_ARGS); +static void internal_string_unref (internal_string * s DEBUG_ARGS); +static void discard_metadata (grpc_mdctx * ctx); +static void gc_mdtab (grpc_mdctx * ctx); +static void metadata_context_destroy_locked (grpc_mdctx * ctx); -static void lock(grpc_mdctx *ctx) { gpr_mu_lock(&ctx->mu); } +static void +lock (grpc_mdctx * ctx) +{ + gpr_mu_lock (&ctx->mu); +} -static void unlock(grpc_mdctx *ctx) { +static void +unlock (grpc_mdctx * ctx) +{ /* If the context has been orphaned we'd like to delete it soon. We check conditions in unlock as it signals the end of mutations on a context. @@ -132,49 +141,52 @@ static void unlock(grpc_mdctx *ctx) { mdelems on every unlock (instead of the usual 'I'm too loaded' trigger case), since otherwise we can be stuck waiting for a garbage collection that will never happen. */ - if (ctx->refs == 0) { + if (ctx->refs == 0) + { /* uncomment if you're having trouble diagnosing an mdelem leak to make things clearer (slows down destruction a lot, however) */ #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gc_mdtab(ctx); + gc_mdtab (ctx); #endif - if (ctx->mdtab_count && ctx->mdtab_count == ctx->mdtab_free) { - discard_metadata(ctx); - } - if (ctx->strtab_count == 0) { - metadata_context_destroy_locked(ctx); - return; + if (ctx->mdtab_count && ctx->mdtab_count == ctx->mdtab_free) + { + discard_metadata (ctx); + } + if (ctx->strtab_count == 0) + { + metadata_context_destroy_locked (ctx); + return; + } } - } - gpr_mu_unlock(&ctx->mu); + gpr_mu_unlock (&ctx->mu); } -static void ref_md_locked(internal_metadata *md DEBUG_ARGS) { +static void +ref_md_locked (internal_metadata * md DEBUG_ARGS) +{ #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "ELM REF:%p:%d->%d: '%s' = '%s'", md, - gpr_atm_no_barrier_load(&md->refcnt), - gpr_atm_no_barrier_load(&md->refcnt) + 1, - grpc_mdstr_as_c_string((grpc_mdstr *)md->key), - grpc_mdstr_as_c_string((grpc_mdstr *)md->value)); + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "ELM REF:%p:%d->%d: '%s' = '%s'", md, gpr_atm_no_barrier_load (&md->refcnt), gpr_atm_no_barrier_load (&md->refcnt) + 1, grpc_mdstr_as_c_string ((grpc_mdstr *) md->key), grpc_mdstr_as_c_string ((grpc_mdstr *) md->value)); #endif - if (0 == gpr_atm_no_barrier_fetch_add(&md->refcnt, 1)) { - md->context->mdtab_free--; - } + if (0 == gpr_atm_no_barrier_fetch_add (&md->refcnt, 1)) + { + md->context->mdtab_free--; + } } -grpc_mdctx *grpc_mdctx_create_with_seed(gpr_uint32 seed) { - grpc_mdctx *ctx = gpr_malloc(sizeof(grpc_mdctx)); +grpc_mdctx * +grpc_mdctx_create_with_seed (gpr_uint32 seed) +{ + grpc_mdctx *ctx = gpr_malloc (sizeof (grpc_mdctx)); ctx->refs = 1; ctx->hash_seed = seed; - gpr_mu_init(&ctx->mu); - ctx->strtab = gpr_malloc(sizeof(internal_string *) * INITIAL_STRTAB_CAPACITY); - memset(ctx->strtab, 0, sizeof(grpc_mdstr *) * INITIAL_STRTAB_CAPACITY); + gpr_mu_init (&ctx->mu); + ctx->strtab = gpr_malloc (sizeof (internal_string *) * INITIAL_STRTAB_CAPACITY); + memset (ctx->strtab, 0, sizeof (grpc_mdstr *) * INITIAL_STRTAB_CAPACITY); ctx->strtab_count = 0; ctx->strtab_capacity = INITIAL_STRTAB_CAPACITY; - ctx->mdtab = gpr_malloc(sizeof(internal_metadata *) * INITIAL_MDTAB_CAPACITY); - memset(ctx->mdtab, 0, sizeof(grpc_mdelem *) * INITIAL_MDTAB_CAPACITY); + ctx->mdtab = gpr_malloc (sizeof (internal_metadata *) * INITIAL_MDTAB_CAPACITY); + memset (ctx->mdtab, 0, sizeof (grpc_mdelem *) * INITIAL_MDTAB_CAPACITY); ctx->mdtab_count = 0; ctx->mdtab_capacity = INITIAL_MDTAB_CAPACITY; ctx->mdtab_free = 0; @@ -182,218 +194,258 @@ grpc_mdctx *grpc_mdctx_create_with_seed(gpr_uint32 seed) { return ctx; } -grpc_mdctx *grpc_mdctx_create(void) { +grpc_mdctx * +grpc_mdctx_create (void) +{ /* This seed is used to prevent remote connections from controlling hash table * collisions. It needs to be somewhat unpredictable to a remote connection. */ - return grpc_mdctx_create_with_seed( - (gpr_uint32)gpr_now(GPR_CLOCK_REALTIME).tv_nsec); + return grpc_mdctx_create_with_seed ((gpr_uint32) gpr_now (GPR_CLOCK_REALTIME).tv_nsec); } -static void discard_metadata(grpc_mdctx *ctx) { +static void +discard_metadata (grpc_mdctx * ctx) +{ size_t i; internal_metadata *next, *cur; - for (i = 0; i < ctx->mdtab_capacity; i++) { - cur = ctx->mdtab[i]; - while (cur) { - GPR_ASSERT(gpr_atm_acq_load(&cur->refcnt) == 0); - next = cur->bucket_next; - INTERNAL_STRING_UNREF(cur->key); - INTERNAL_STRING_UNREF(cur->value); - if (cur->user_data) { - cur->destroy_user_data(cur->user_data); - } - gpr_mu_destroy(&cur->mu_user_data); - gpr_free(cur); - cur = next; - ctx->mdtab_free--; - ctx->mdtab_count--; + for (i = 0; i < ctx->mdtab_capacity; i++) + { + cur = ctx->mdtab[i]; + while (cur) + { + GPR_ASSERT (gpr_atm_acq_load (&cur->refcnt) == 0); + next = cur->bucket_next; + INTERNAL_STRING_UNREF (cur->key); + INTERNAL_STRING_UNREF (cur->value); + if (cur->user_data) + { + cur->destroy_user_data (cur->user_data); + } + gpr_mu_destroy (&cur->mu_user_data); + gpr_free (cur); + cur = next; + ctx->mdtab_free--; + ctx->mdtab_count--; + } + ctx->mdtab[i] = NULL; } - ctx->mdtab[i] = NULL; - } -} - -static void metadata_context_destroy_locked(grpc_mdctx *ctx) { - GPR_ASSERT(ctx->strtab_count == 0); - GPR_ASSERT(ctx->mdtab_count == 0); - GPR_ASSERT(ctx->mdtab_free == 0); - gpr_free(ctx->strtab); - gpr_free(ctx->mdtab); - gpr_mu_unlock(&ctx->mu); - gpr_mu_destroy(&ctx->mu); - gpr_free(ctx); } -void grpc_mdctx_ref(grpc_mdctx *ctx) { - lock(ctx); - GPR_ASSERT(ctx->refs > 0); +static void +metadata_context_destroy_locked (grpc_mdctx * ctx) +{ + GPR_ASSERT (ctx->strtab_count == 0); + GPR_ASSERT (ctx->mdtab_count == 0); + GPR_ASSERT (ctx->mdtab_free == 0); + gpr_free (ctx->strtab); + gpr_free (ctx->mdtab); + gpr_mu_unlock (&ctx->mu); + gpr_mu_destroy (&ctx->mu); + gpr_free (ctx); +} + +void +grpc_mdctx_ref (grpc_mdctx * ctx) +{ + lock (ctx); + GPR_ASSERT (ctx->refs > 0); ctx->refs++; - unlock(ctx); + unlock (ctx); } -void grpc_mdctx_unref(grpc_mdctx *ctx) { - lock(ctx); - GPR_ASSERT(ctx->refs > 0); +void +grpc_mdctx_unref (grpc_mdctx * ctx) +{ + lock (ctx); + GPR_ASSERT (ctx->refs > 0); ctx->refs--; - unlock(ctx); + unlock (ctx); } -static void grow_strtab(grpc_mdctx *ctx) { +static void +grow_strtab (grpc_mdctx * ctx) +{ size_t capacity = ctx->strtab_capacity * 2; size_t i; - internal_string **strtab = gpr_malloc(sizeof(internal_string *) * capacity); + internal_string **strtab = gpr_malloc (sizeof (internal_string *) * capacity); internal_string *s, *next; - memset(strtab, 0, sizeof(internal_string *) * capacity); - - for (i = 0; i < ctx->strtab_capacity; i++) { - for (s = ctx->strtab[i]; s; s = next) { - next = s->bucket_next; - s->bucket_next = strtab[s->hash % capacity]; - strtab[s->hash % capacity] = s; + memset (strtab, 0, sizeof (internal_string *) * capacity); + + for (i = 0; i < ctx->strtab_capacity; i++) + { + for (s = ctx->strtab[i]; s; s = next) + { + next = s->bucket_next; + s->bucket_next = strtab[s->hash % capacity]; + strtab[s->hash % capacity] = s; + } } - } - gpr_free(ctx->strtab); + gpr_free (ctx->strtab); ctx->strtab = strtab; ctx->strtab_capacity = capacity; } -static void internal_destroy_string(internal_string *is) { +static void +internal_destroy_string (internal_string * is) +{ internal_string **prev_next; internal_string *cur; grpc_mdctx *ctx = is->context; - if (is->has_base64_and_huffman_encoded) { - gpr_slice_unref(is->base64_and_huffman); - } - for (prev_next = &ctx->strtab[is->hash % ctx->strtab_capacity], - cur = *prev_next; - cur != is; prev_next = &cur->bucket_next, cur = cur->bucket_next) + if (is->has_base64_and_huffman_encoded) + { + gpr_slice_unref (is->base64_and_huffman); + } + for (prev_next = &ctx->strtab[is->hash % ctx->strtab_capacity], cur = *prev_next; cur != is; prev_next = &cur->bucket_next, cur = cur->bucket_next) ; *prev_next = cur->bucket_next; ctx->strtab_count--; - gpr_free(is); + gpr_free (is); } -static void internal_string_ref(internal_string *s DEBUG_ARGS) { +static void +internal_string_ref (internal_string * s DEBUG_ARGS) +{ #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "STR REF:%p:%d->%d: '%s'", s, - s->refs, s->refs + 1, grpc_mdstr_as_c_string((grpc_mdstr *)s)); + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "STR REF:%p:%d->%d: '%s'", s, s->refs, s->refs + 1, grpc_mdstr_as_c_string ((grpc_mdstr *) s)); #endif ++s->refs; } -static void internal_string_unref(internal_string *s DEBUG_ARGS) { +static void +internal_string_unref (internal_string * s DEBUG_ARGS) +{ #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "STR UNREF:%p:%d->%d: '%s'", s, - s->refs, s->refs - 1, grpc_mdstr_as_c_string((grpc_mdstr *)s)); + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "STR UNREF:%p:%d->%d: '%s'", s, s->refs, s->refs - 1, grpc_mdstr_as_c_string ((grpc_mdstr *) s)); #endif - GPR_ASSERT(s->refs > 0); - if (0 == --s->refs) { - internal_destroy_string(s); - } + GPR_ASSERT (s->refs > 0); + if (0 == --s->refs) + { + internal_destroy_string (s); + } } -static void slice_ref(void *p) { - internal_string *is = - (internal_string *)((char *)p - offsetof(internal_string, refcount)); +static void +slice_ref (void *p) +{ + internal_string *is = (internal_string *) ((char *) p - offsetof (internal_string, refcount)); grpc_mdctx *ctx = is->context; - lock(ctx); - INTERNAL_STRING_REF(is); - unlock(ctx); + lock (ctx); + INTERNAL_STRING_REF (is); + unlock (ctx); } -static void slice_unref(void *p) { - internal_string *is = - (internal_string *)((char *)p - offsetof(internal_string, refcount)); +static void +slice_unref (void *p) +{ + internal_string *is = (internal_string *) ((char *) p - offsetof (internal_string, refcount)); grpc_mdctx *ctx = is->context; - lock(ctx); - INTERNAL_STRING_UNREF(is); - unlock(ctx); -} - -grpc_mdstr *grpc_mdstr_from_string(grpc_mdctx *ctx, const char *str, - int canonicalize_key) { - if (canonicalize_key) { - size_t len; - size_t i; - int canonical = 1; - - for (i = 0; str[i]; i++) { - if (str[i] >= 'A' && str[i] <= 'Z') { - canonical = 0; - /* Keep going in loop just to get string length */ - } + lock (ctx); + INTERNAL_STRING_UNREF (is); + unlock (ctx); +} + +grpc_mdstr * +grpc_mdstr_from_string (grpc_mdctx * ctx, const char *str, int canonicalize_key) +{ + if (canonicalize_key) + { + size_t len; + size_t i; + int canonical = 1; + + for (i = 0; str[i]; i++) + { + if (str[i] >= 'A' && str[i] <= 'Z') + { + canonical = 0; + /* Keep going in loop just to get string length */ + } + } + len = i; + + if (canonical) + { + return grpc_mdstr_from_buffer (ctx, (const gpr_uint8 *) str, len); + } + else + { + char *copy = gpr_malloc (len); + grpc_mdstr *ret; + for (i = 0; i < len; i++) + { + if (str[i] >= 'A' && str[i] <= 'Z') + { + copy[i] = (char) (str[i] - 'A' + 'a'); + } + else + { + copy[i] = str[i]; + } + } + ret = grpc_mdstr_from_buffer (ctx, (const gpr_uint8 *) copy, len); + gpr_free (copy); + return ret; + } } - len = i; - - if (canonical) { - return grpc_mdstr_from_buffer(ctx, (const gpr_uint8 *)str, len); - } else { - char *copy = gpr_malloc(len); - grpc_mdstr *ret; - for (i = 0; i < len; i++) { - if (str[i] >= 'A' && str[i] <= 'Z') { - copy[i] = (char)(str[i] - 'A' + 'a'); - } else { - copy[i] = str[i]; - } - } - ret = grpc_mdstr_from_buffer(ctx, (const gpr_uint8 *)copy, len); - gpr_free(copy); - return ret; - } - } - return grpc_mdstr_from_buffer(ctx, (const gpr_uint8 *)str, strlen(str)); + return grpc_mdstr_from_buffer (ctx, (const gpr_uint8 *) str, strlen (str)); } -grpc_mdstr *grpc_mdstr_from_slice(grpc_mdctx *ctx, gpr_slice slice) { - grpc_mdstr *result = grpc_mdstr_from_buffer(ctx, GPR_SLICE_START_PTR(slice), - GPR_SLICE_LENGTH(slice)); - gpr_slice_unref(slice); +grpc_mdstr * +grpc_mdstr_from_slice (grpc_mdctx * ctx, gpr_slice slice) +{ + grpc_mdstr *result = grpc_mdstr_from_buffer (ctx, GPR_SLICE_START_PTR (slice), + GPR_SLICE_LENGTH (slice)); + gpr_slice_unref (slice); return result; } -grpc_mdstr *grpc_mdstr_from_buffer(grpc_mdctx *ctx, const gpr_uint8 *buf, - size_t length) { - gpr_uint32 hash = gpr_murmur_hash3(buf, length, ctx->hash_seed); +grpc_mdstr * +grpc_mdstr_from_buffer (grpc_mdctx * ctx, const gpr_uint8 * buf, size_t length) +{ + gpr_uint32 hash = gpr_murmur_hash3 (buf, length, ctx->hash_seed); internal_string *s; - lock(ctx); + lock (ctx); /* search for an existing string */ - for (s = ctx->strtab[hash % ctx->strtab_capacity]; s; s = s->bucket_next) { - if (s->hash == hash && GPR_SLICE_LENGTH(s->slice) == length && - 0 == memcmp(buf, GPR_SLICE_START_PTR(s->slice), length)) { - INTERNAL_STRING_REF(s); - unlock(ctx); - return (grpc_mdstr *)s; + for (s = ctx->strtab[hash % ctx->strtab_capacity]; s; s = s->bucket_next) + { + if (s->hash == hash && GPR_SLICE_LENGTH (s->slice) == length && 0 == memcmp (buf, GPR_SLICE_START_PTR (s->slice), length)) + { + INTERNAL_STRING_REF (s); + unlock (ctx); + return (grpc_mdstr *) s; + } } - } /* not found: create a new string */ - if (length + 1 < GPR_SLICE_INLINED_SIZE) { - /* string data goes directly into the slice */ - s = gpr_malloc(sizeof(internal_string)); - s->refs = 1; - s->slice.refcount = NULL; - memcpy(s->slice.data.inlined.bytes, buf, length); - s->slice.data.inlined.bytes[length] = 0; - s->slice.data.inlined.length = (gpr_uint8)length; - } else { - /* string data goes after the internal_string header, and we +1 for null - terminator */ - s = gpr_malloc(sizeof(internal_string) + length + 1); - s->refs = 1; - s->refcount.ref = slice_ref; - s->refcount.unref = slice_unref; - s->slice.refcount = &s->refcount; - s->slice.data.refcounted.bytes = (gpr_uint8 *)(s + 1); - s->slice.data.refcounted.length = length; - memcpy(s->slice.data.refcounted.bytes, buf, length); - /* add a null terminator for cheap c string conversion when desired */ - s->slice.data.refcounted.bytes[length] = 0; - } + if (length + 1 < GPR_SLICE_INLINED_SIZE) + { + /* string data goes directly into the slice */ + s = gpr_malloc (sizeof (internal_string)); + s->refs = 1; + s->slice.refcount = NULL; + memcpy (s->slice.data.inlined.bytes, buf, length); + s->slice.data.inlined.bytes[length] = 0; + s->slice.data.inlined.length = (gpr_uint8) length; + } + else + { + /* string data goes after the internal_string header, and we +1 for null + terminator */ + s = gpr_malloc (sizeof (internal_string) + length + 1); + s->refs = 1; + s->refcount.ref = slice_ref; + s->refcount.unref = slice_unref; + s->slice.refcount = &s->refcount; + s->slice.data.refcounted.bytes = (gpr_uint8 *) (s + 1); + s->slice.data.refcounted.length = length; + memcpy (s->slice.data.refcounted.bytes, buf, length); + /* add a null terminator for cheap c string conversion when desired */ + s->slice.data.refcounted.bytes[length] = 0; + } s->has_base64_and_huffman_encoded = 0; s->hash = hash; s->context = ctx; @@ -402,316 +454,357 @@ grpc_mdstr *grpc_mdstr_from_buffer(grpc_mdctx *ctx, const gpr_uint8 *buf, ctx->strtab_count++; - if (ctx->strtab_count > ctx->strtab_capacity * 2) { - grow_strtab(ctx); - } + if (ctx->strtab_count > ctx->strtab_capacity * 2) + { + grow_strtab (ctx); + } - unlock(ctx); + unlock (ctx); - return (grpc_mdstr *)s; + return (grpc_mdstr *) s; } -static void gc_mdtab(grpc_mdctx *ctx) { +static void +gc_mdtab (grpc_mdctx * ctx) +{ size_t i; internal_metadata **prev_next; internal_metadata *md, *next; - for (i = 0; i < ctx->mdtab_capacity; i++) { - prev_next = &ctx->mdtab[i]; - for (md = ctx->mdtab[i]; md; md = next) { - next = md->bucket_next; - if (gpr_atm_acq_load(&md->refcnt) == 0) { - INTERNAL_STRING_UNREF(md->key); - INTERNAL_STRING_UNREF(md->value); - if (md->user_data) { - md->destroy_user_data(md->user_data); - } - gpr_free(md); - *prev_next = next; - ctx->mdtab_free--; - ctx->mdtab_count--; - } else { - prev_next = &md->bucket_next; - } + for (i = 0; i < ctx->mdtab_capacity; i++) + { + prev_next = &ctx->mdtab[i]; + for (md = ctx->mdtab[i]; md; md = next) + { + next = md->bucket_next; + if (gpr_atm_acq_load (&md->refcnt) == 0) + { + INTERNAL_STRING_UNREF (md->key); + INTERNAL_STRING_UNREF (md->value); + if (md->user_data) + { + md->destroy_user_data (md->user_data); + } + gpr_free (md); + *prev_next = next; + ctx->mdtab_free--; + ctx->mdtab_count--; + } + else + { + prev_next = &md->bucket_next; + } + } } - } - GPR_ASSERT(ctx->mdtab_free == 0); + GPR_ASSERT (ctx->mdtab_free == 0); } -static void grow_mdtab(grpc_mdctx *ctx) { +static void +grow_mdtab (grpc_mdctx * ctx) +{ size_t capacity = ctx->mdtab_capacity * 2; size_t i; - internal_metadata **mdtab = - gpr_malloc(sizeof(internal_metadata *) * capacity); + internal_metadata **mdtab = gpr_malloc (sizeof (internal_metadata *) * capacity); internal_metadata *md, *next; gpr_uint32 hash; - memset(mdtab, 0, sizeof(internal_metadata *) * capacity); - - for (i = 0; i < ctx->mdtab_capacity; i++) { - for (md = ctx->mdtab[i]; md; md = next) { - hash = GRPC_MDSTR_KV_HASH(md->key->hash, md->value->hash); - next = md->bucket_next; - md->bucket_next = mdtab[hash % capacity]; - mdtab[hash % capacity] = md; + memset (mdtab, 0, sizeof (internal_metadata *) * capacity); + + for (i = 0; i < ctx->mdtab_capacity; i++) + { + for (md = ctx->mdtab[i]; md; md = next) + { + hash = GRPC_MDSTR_KV_HASH (md->key->hash, md->value->hash); + next = md->bucket_next; + md->bucket_next = mdtab[hash % capacity]; + mdtab[hash % capacity] = md; + } } - } - gpr_free(ctx->mdtab); + gpr_free (ctx->mdtab); ctx->mdtab = mdtab; ctx->mdtab_capacity = capacity; } -static void rehash_mdtab(grpc_mdctx *ctx) { - if (ctx->mdtab_free > ctx->mdtab_capacity / 4) { - gc_mdtab(ctx); - } else { - grow_mdtab(ctx); - } +static void +rehash_mdtab (grpc_mdctx * ctx) +{ + if (ctx->mdtab_free > ctx->mdtab_capacity / 4) + { + gc_mdtab (ctx); + } + else + { + grow_mdtab (ctx); + } } -grpc_mdelem *grpc_mdelem_from_metadata_strings(grpc_mdctx *ctx, - grpc_mdstr *mkey, - grpc_mdstr *mvalue) { - internal_string *key = (internal_string *)mkey; - internal_string *value = (internal_string *)mvalue; - gpr_uint32 hash = GRPC_MDSTR_KV_HASH(mkey->hash, mvalue->hash); +grpc_mdelem * +grpc_mdelem_from_metadata_strings (grpc_mdctx * ctx, grpc_mdstr * mkey, grpc_mdstr * mvalue) +{ + internal_string *key = (internal_string *) mkey; + internal_string *value = (internal_string *) mvalue; + gpr_uint32 hash = GRPC_MDSTR_KV_HASH (mkey->hash, mvalue->hash); internal_metadata *md; - GPR_ASSERT(key->context == ctx); - GPR_ASSERT(value->context == ctx); + GPR_ASSERT (key->context == ctx); + GPR_ASSERT (value->context == ctx); - lock(ctx); + lock (ctx); /* search for an existing pair */ - for (md = ctx->mdtab[hash % ctx->mdtab_capacity]; md; md = md->bucket_next) { - if (md->key == key && md->value == value) { - REF_MD_LOCKED(md); - INTERNAL_STRING_UNREF(key); - INTERNAL_STRING_UNREF(value); - unlock(ctx); - return (grpc_mdelem *)md; + for (md = ctx->mdtab[hash % ctx->mdtab_capacity]; md; md = md->bucket_next) + { + if (md->key == key && md->value == value) + { + REF_MD_LOCKED (md); + INTERNAL_STRING_UNREF (key); + INTERNAL_STRING_UNREF (value); + unlock (ctx); + return (grpc_mdelem *) md; + } } - } /* not found: create a new pair */ - md = gpr_malloc(sizeof(internal_metadata)); - gpr_atm_rel_store(&md->refcnt, 1); + md = gpr_malloc (sizeof (internal_metadata)); + gpr_atm_rel_store (&md->refcnt, 1); md->context = ctx; md->key = key; md->value = value; md->user_data = NULL; md->destroy_user_data = NULL; md->bucket_next = ctx->mdtab[hash % ctx->mdtab_capacity]; - gpr_mu_init(&md->mu_user_data); + gpr_mu_init (&md->mu_user_data); #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gpr_log(GPR_DEBUG, "ELM NEW:%p:%d: '%s' = '%s'", md, - gpr_atm_no_barrier_load(&md->refcnt), - grpc_mdstr_as_c_string((grpc_mdstr *)md->key), - grpc_mdstr_as_c_string((grpc_mdstr *)md->value)); + gpr_log (GPR_DEBUG, "ELM NEW:%p:%d: '%s' = '%s'", md, gpr_atm_no_barrier_load (&md->refcnt), grpc_mdstr_as_c_string ((grpc_mdstr *) md->key), grpc_mdstr_as_c_string ((grpc_mdstr *) md->value)); #endif ctx->mdtab[hash % ctx->mdtab_capacity] = md; ctx->mdtab_count++; - if (ctx->mdtab_count > ctx->mdtab_capacity * 2) { - rehash_mdtab(ctx); - } + if (ctx->mdtab_count > ctx->mdtab_capacity * 2) + { + rehash_mdtab (ctx); + } - unlock(ctx); + unlock (ctx); - return (grpc_mdelem *)md; + return (grpc_mdelem *) md; } -grpc_mdelem *grpc_mdelem_from_strings(grpc_mdctx *ctx, const char *key, - const char *value) { - return grpc_mdelem_from_metadata_strings( - ctx, grpc_mdstr_from_string(ctx, key, 0), - grpc_mdstr_from_string(ctx, value, 0)); +grpc_mdelem * +grpc_mdelem_from_strings (grpc_mdctx * ctx, const char *key, const char *value) +{ + return grpc_mdelem_from_metadata_strings (ctx, grpc_mdstr_from_string (ctx, key, 0), grpc_mdstr_from_string (ctx, value, 0)); } -grpc_mdelem *grpc_mdelem_from_slices(grpc_mdctx *ctx, gpr_slice key, - gpr_slice value) { - return grpc_mdelem_from_metadata_strings(ctx, grpc_mdstr_from_slice(ctx, key), - grpc_mdstr_from_slice(ctx, value)); +grpc_mdelem * +grpc_mdelem_from_slices (grpc_mdctx * ctx, gpr_slice key, gpr_slice value) +{ + return grpc_mdelem_from_metadata_strings (ctx, grpc_mdstr_from_slice (ctx, key), grpc_mdstr_from_slice (ctx, value)); } -grpc_mdelem *grpc_mdelem_from_string_and_buffer(grpc_mdctx *ctx, - const char *key, - const gpr_uint8 *value, - size_t value_length, - int canonicalize_key) { - return grpc_mdelem_from_metadata_strings( - ctx, grpc_mdstr_from_string(ctx, key, canonicalize_key), - grpc_mdstr_from_buffer(ctx, value, value_length)); +grpc_mdelem * +grpc_mdelem_from_string_and_buffer (grpc_mdctx * ctx, const char *key, const gpr_uint8 * value, size_t value_length, int canonicalize_key) +{ + return grpc_mdelem_from_metadata_strings (ctx, grpc_mdstr_from_string (ctx, key, canonicalize_key), grpc_mdstr_from_buffer (ctx, value, value_length)); } -grpc_mdelem *grpc_mdelem_ref(grpc_mdelem *gmd DEBUG_ARGS) { - internal_metadata *md = (internal_metadata *)gmd; +grpc_mdelem * +grpc_mdelem_ref (grpc_mdelem * gmd DEBUG_ARGS) +{ + internal_metadata *md = (internal_metadata *) gmd; #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "ELM REF:%p:%d->%d: '%s' = '%s'", md, - gpr_atm_no_barrier_load(&md->refcnt), - gpr_atm_no_barrier_load(&md->refcnt) + 1, - grpc_mdstr_as_c_string((grpc_mdstr *)md->key), - grpc_mdstr_as_c_string((grpc_mdstr *)md->value)); + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "ELM REF:%p:%d->%d: '%s' = '%s'", md, gpr_atm_no_barrier_load (&md->refcnt), gpr_atm_no_barrier_load (&md->refcnt) + 1, grpc_mdstr_as_c_string ((grpc_mdstr *) md->key), grpc_mdstr_as_c_string ((grpc_mdstr *) md->value)); #endif /* we can assume the ref count is >= 1 as the application is calling this function - meaning that no adjustment to mdtab_free is necessary, simplifying the logic here to be just an atomic increment */ /* use C assert to have this removed in opt builds */ - assert(gpr_atm_no_barrier_load(&md->refcnt) >= 1); - gpr_atm_no_barrier_fetch_add(&md->refcnt, 1); + assert (gpr_atm_no_barrier_load (&md->refcnt) >= 1); + gpr_atm_no_barrier_fetch_add (&md->refcnt, 1); return gmd; } -void grpc_mdelem_unref(grpc_mdelem *gmd DEBUG_ARGS) { - internal_metadata *md = (internal_metadata *)gmd; +void +grpc_mdelem_unref (grpc_mdelem * gmd DEBUG_ARGS) +{ + internal_metadata *md = (internal_metadata *) gmd; grpc_mdctx *ctx = md->context; - lock(ctx); + lock (ctx); #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "ELM UNREF:%p:%d->%d: '%s' = '%s'", md, - gpr_atm_no_barrier_load(&md->refcnt), - gpr_atm_no_barrier_load(&md->refcnt) - 1, - grpc_mdstr_as_c_string((grpc_mdstr *)md->key), - grpc_mdstr_as_c_string((grpc_mdstr *)md->value)); + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "ELM UNREF:%p:%d->%d: '%s' = '%s'", md, gpr_atm_no_barrier_load (&md->refcnt), gpr_atm_no_barrier_load (&md->refcnt) - 1, grpc_mdstr_as_c_string ((grpc_mdstr *) md->key), grpc_mdstr_as_c_string ((grpc_mdstr *) md->value)); #endif - assert(gpr_atm_no_barrier_load(&md->refcnt) >= 1); - if (1 == gpr_atm_full_fetch_add(&md->refcnt, -1)) { - ctx->mdtab_free++; - } - unlock(ctx); + assert (gpr_atm_no_barrier_load (&md->refcnt) >= 1); + if (1 == gpr_atm_full_fetch_add (&md->refcnt, -1)) + { + ctx->mdtab_free++; + } + unlock (ctx); } -const char *grpc_mdstr_as_c_string(grpc_mdstr *s) { - return (const char *)GPR_SLICE_START_PTR(s->slice); +const char * +grpc_mdstr_as_c_string (grpc_mdstr * s) +{ + return (const char *) GPR_SLICE_START_PTR (s->slice); } -grpc_mdstr *grpc_mdstr_ref(grpc_mdstr *gs DEBUG_ARGS) { - internal_string *s = (internal_string *)gs; +grpc_mdstr * +grpc_mdstr_ref (grpc_mdstr * gs DEBUG_ARGS) +{ + internal_string *s = (internal_string *) gs; grpc_mdctx *ctx = s->context; - lock(ctx); - internal_string_ref(s FWD_DEBUG_ARGS); - unlock(ctx); + lock (ctx); + internal_string_ref (s FWD_DEBUG_ARGS); + unlock (ctx); return gs; } -void grpc_mdstr_unref(grpc_mdstr *gs DEBUG_ARGS) { - internal_string *s = (internal_string *)gs; +void +grpc_mdstr_unref (grpc_mdstr * gs DEBUG_ARGS) +{ + internal_string *s = (internal_string *) gs; grpc_mdctx *ctx = s->context; - lock(ctx); - internal_string_unref(s FWD_DEBUG_ARGS); - unlock(ctx); + lock (ctx); + internal_string_unref (s FWD_DEBUG_ARGS); + unlock (ctx); } -size_t grpc_mdctx_get_mdtab_capacity_test_only(grpc_mdctx *ctx) { +size_t +grpc_mdctx_get_mdtab_capacity_test_only (grpc_mdctx * ctx) +{ return ctx->mdtab_capacity; } -size_t grpc_mdctx_get_mdtab_count_test_only(grpc_mdctx *ctx) { +size_t +grpc_mdctx_get_mdtab_count_test_only (grpc_mdctx * ctx) +{ return ctx->mdtab_count; } -size_t grpc_mdctx_get_mdtab_free_test_only(grpc_mdctx *ctx) { +size_t +grpc_mdctx_get_mdtab_free_test_only (grpc_mdctx * ctx) +{ return ctx->mdtab_free; } -void *grpc_mdelem_get_user_data(grpc_mdelem *md, - void (*if_destroy_func)(void *)) { - internal_metadata *im = (internal_metadata *)md; +void * +grpc_mdelem_get_user_data (grpc_mdelem * md, void (*if_destroy_func) (void *)) +{ + internal_metadata *im = (internal_metadata *) md; void *result; - gpr_mu_lock(&im->mu_user_data); + gpr_mu_lock (&im->mu_user_data); result = im->destroy_user_data == if_destroy_func ? im->user_data : NULL; - gpr_mu_unlock(&im->mu_user_data); + gpr_mu_unlock (&im->mu_user_data); return result; } -void grpc_mdelem_set_user_data(grpc_mdelem *md, void (*destroy_func)(void *), - void *user_data) { - internal_metadata *im = (internal_metadata *)md; - GPR_ASSERT((user_data == NULL) == (destroy_func == NULL)); - gpr_mu_lock(&im->mu_user_data); - if (im->destroy_user_data) { - /* user data can only be set once */ - gpr_mu_unlock(&im->mu_user_data); - if (destroy_func != NULL) { - destroy_func(user_data); +void +grpc_mdelem_set_user_data (grpc_mdelem * md, void (*destroy_func) (void *), void *user_data) +{ + internal_metadata *im = (internal_metadata *) md; + GPR_ASSERT ((user_data == NULL) == (destroy_func == NULL)); + gpr_mu_lock (&im->mu_user_data); + if (im->destroy_user_data) + { + /* user data can only be set once */ + gpr_mu_unlock (&im->mu_user_data); + if (destroy_func != NULL) + { + destroy_func (user_data); + } + return; } - return; - } im->destroy_user_data = destroy_func; im->user_data = user_data; - gpr_mu_unlock(&im->mu_user_data); + gpr_mu_unlock (&im->mu_user_data); } -gpr_slice grpc_mdstr_as_base64_encoded_and_huffman_compressed(grpc_mdstr *gs) { - internal_string *s = (internal_string *)gs; +gpr_slice +grpc_mdstr_as_base64_encoded_and_huffman_compressed (grpc_mdstr * gs) +{ + internal_string *s = (internal_string *) gs; gpr_slice slice; grpc_mdctx *ctx = s->context; - lock(ctx); - if (!s->has_base64_and_huffman_encoded) { - s->base64_and_huffman = - grpc_chttp2_base64_encode_and_huffman_compress(s->slice); - s->has_base64_and_huffman_encoded = 1; - } + lock (ctx); + if (!s->has_base64_and_huffman_encoded) + { + s->base64_and_huffman = grpc_chttp2_base64_encode_and_huffman_compress (s->slice); + s->has_base64_and_huffman_encoded = 1; + } slice = s->base64_and_huffman; - unlock(ctx); + unlock (ctx); return slice; } -void grpc_mdctx_lock(grpc_mdctx *ctx) { lock(ctx); } +void +grpc_mdctx_lock (grpc_mdctx * ctx) +{ + lock (ctx); +} -void grpc_mdctx_locked_mdelem_unref(grpc_mdctx *ctx, - grpc_mdelem *gmd DEBUG_ARGS) { - internal_metadata *md = (internal_metadata *)gmd; +void +grpc_mdctx_locked_mdelem_unref (grpc_mdctx * ctx, grpc_mdelem * gmd DEBUG_ARGS) +{ + internal_metadata *md = (internal_metadata *) gmd; grpc_mdctx *elem_ctx = md->context; - GPR_ASSERT(ctx == elem_ctx); + GPR_ASSERT (ctx == elem_ctx); #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "ELM UNREF:%p:%d->%d: '%s' = '%s'", md, - gpr_atm_no_barrier_load(&md->refcnt), - gpr_atm_no_barrier_load(&md->refcnt) - 1, - grpc_mdstr_as_c_string((grpc_mdstr *)md->key), - grpc_mdstr_as_c_string((grpc_mdstr *)md->value)); + gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "ELM UNREF:%p:%d->%d: '%s' = '%s'", md, gpr_atm_no_barrier_load (&md->refcnt), gpr_atm_no_barrier_load (&md->refcnt) - 1, grpc_mdstr_as_c_string ((grpc_mdstr *) md->key), grpc_mdstr_as_c_string ((grpc_mdstr *) md->value)); #endif - assert(gpr_atm_no_barrier_load(&md->refcnt) >= 1); - if (1 == gpr_atm_full_fetch_add(&md->refcnt, -1)) { - ctx->mdtab_free++; - } -} - -void grpc_mdctx_unlock(grpc_mdctx *ctx) { unlock(ctx); } - -static int conforms_to(grpc_mdstr *s, const gpr_uint8 *legal_bits) { - const gpr_uint8 *p = GPR_SLICE_START_PTR(s->slice); - const gpr_uint8 *e = GPR_SLICE_END_PTR(s->slice); - for (; p != e; p++) { - int idx = *p; - int byte = idx / 8; - int bit = idx % 8; - if ((legal_bits[byte] & (1 << bit)) == 0) return 0; - } + assert (gpr_atm_no_barrier_load (&md->refcnt) >= 1); + if (1 == gpr_atm_full_fetch_add (&md->refcnt, -1)) + { + ctx->mdtab_free++; + } +} + +void +grpc_mdctx_unlock (grpc_mdctx * ctx) +{ + unlock (ctx); +} + +static int +conforms_to (grpc_mdstr * s, const gpr_uint8 * legal_bits) +{ + const gpr_uint8 *p = GPR_SLICE_START_PTR (s->slice); + const gpr_uint8 *e = GPR_SLICE_END_PTR (s->slice); + for (; p != e; p++) + { + int idx = *p; + int byte = idx / 8; + int bit = idx % 8; + if ((legal_bits[byte] & (1 << bit)) == 0) + return 0; + } return 1; } -int grpc_mdstr_is_legal_header(grpc_mdstr *s) { +int +grpc_mdstr_is_legal_header (grpc_mdstr * s) +{ static const gpr_uint8 legal_header_bits[256 / 8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xff, 0x03, 0x00, 0x00, 0x00, - 0x80, 0xfe, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - return conforms_to(s, legal_header_bits); + 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xff, 0x03, 0x00, 0x00, 0x00, + 0x80, 0xfe, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; + return conforms_to (s, legal_header_bits); } -int grpc_mdstr_is_legal_nonbin_header(grpc_mdstr *s) { +int +grpc_mdstr_is_legal_nonbin_header (grpc_mdstr * s) +{ static const gpr_uint8 legal_header_bits[256 / 8] = { - 0x00, 0x00, 0x00, 0x00, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - return conforms_to(s, legal_header_bits); + 0x00, 0x00, 0x00, 0x00, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; + return conforms_to (s, legal_header_bits); } -int grpc_mdstr_is_bin_suffixed(grpc_mdstr *s) { +int +grpc_mdstr_is_bin_suffixed (grpc_mdstr * s) +{ /* TODO(ctiller): consider caching this */ - return grpc_is_binary_header((const char *)GPR_SLICE_START_PTR(s->slice), - GPR_SLICE_LENGTH(s->slice)); + return grpc_is_binary_header ((const char *) GPR_SLICE_START_PTR (s->slice), GPR_SLICE_LENGTH (s->slice)); } diff --git a/src/core/transport/metadata.h b/src/core/transport/metadata.h index eb17747be74..75d456eeb67 100644 --- a/src/core/transport/metadata.h +++ b/src/core/transport/metadata.h @@ -67,7 +67,8 @@ typedef struct grpc_mdstr grpc_mdstr; typedef struct grpc_mdelem grpc_mdelem; /* if changing this, make identical changes in internal_string in metadata.c */ -struct grpc_mdstr { +struct grpc_mdstr +{ const gpr_slice slice; const gpr_uint32 hash; /* there is a private part to this in metadata.c */ @@ -75,58 +76,48 @@ struct grpc_mdstr { /* if changing this, make identical changes in internal_metadata in metadata.c */ -struct grpc_mdelem { +struct grpc_mdelem +{ grpc_mdstr *const key; grpc_mdstr *const value; /* there is a private part to this in metadata.c */ }; /* Create/orphan a metadata context */ -grpc_mdctx *grpc_mdctx_create(void); -grpc_mdctx *grpc_mdctx_create_with_seed(gpr_uint32 seed); -void grpc_mdctx_ref(grpc_mdctx *mdctx); -void grpc_mdctx_unref(grpc_mdctx *mdctx); +grpc_mdctx *grpc_mdctx_create (void); +grpc_mdctx *grpc_mdctx_create_with_seed (gpr_uint32 seed); +void grpc_mdctx_ref (grpc_mdctx * mdctx); +void grpc_mdctx_unref (grpc_mdctx * mdctx); /* Test only accessors to internal state - only for testing this code - do not rely on it outside of metadata_test.c */ -size_t grpc_mdctx_get_mdtab_capacity_test_only(grpc_mdctx *mdctx); -size_t grpc_mdctx_get_mdtab_count_test_only(grpc_mdctx *mdctx); -size_t grpc_mdctx_get_mdtab_free_test_only(grpc_mdctx *mdctx); +size_t grpc_mdctx_get_mdtab_capacity_test_only (grpc_mdctx * mdctx); +size_t grpc_mdctx_get_mdtab_count_test_only (grpc_mdctx * mdctx); +size_t grpc_mdctx_get_mdtab_free_test_only (grpc_mdctx * mdctx); /* Constructors for grpc_mdstr instances; take a variety of data types that clients may have handy */ -grpc_mdstr *grpc_mdstr_from_string(grpc_mdctx *ctx, const char *str, - int perform_key_canonicalization); +grpc_mdstr *grpc_mdstr_from_string (grpc_mdctx * ctx, const char *str, int perform_key_canonicalization); /* Unrefs the slice. */ -grpc_mdstr *grpc_mdstr_from_slice(grpc_mdctx *ctx, gpr_slice slice); -grpc_mdstr *grpc_mdstr_from_buffer(grpc_mdctx *ctx, const gpr_uint8 *str, - size_t length); +grpc_mdstr *grpc_mdstr_from_slice (grpc_mdctx * ctx, gpr_slice slice); +grpc_mdstr *grpc_mdstr_from_buffer (grpc_mdctx * ctx, const gpr_uint8 * str, size_t length); /* Returns a borrowed slice from the mdstr with its contents base64 encoded and huffman compressed */ -gpr_slice grpc_mdstr_as_base64_encoded_and_huffman_compressed(grpc_mdstr *str); +gpr_slice grpc_mdstr_as_base64_encoded_and_huffman_compressed (grpc_mdstr * str); /* Constructors for grpc_mdelem instances; take a variety of data types that clients may have handy */ -grpc_mdelem *grpc_mdelem_from_metadata_strings(grpc_mdctx *ctx, grpc_mdstr *key, - grpc_mdstr *value); -grpc_mdelem *grpc_mdelem_from_strings(grpc_mdctx *ctx, const char *key, - const char *value); +grpc_mdelem *grpc_mdelem_from_metadata_strings (grpc_mdctx * ctx, grpc_mdstr * key, grpc_mdstr * value); +grpc_mdelem *grpc_mdelem_from_strings (grpc_mdctx * ctx, const char *key, const char *value); /* Unrefs the slices. */ -grpc_mdelem *grpc_mdelem_from_slices(grpc_mdctx *ctx, gpr_slice key, - gpr_slice value); -grpc_mdelem *grpc_mdelem_from_string_and_buffer(grpc_mdctx *ctx, - const char *key, - const gpr_uint8 *value, - size_t value_length, - int canonicalize_key); +grpc_mdelem *grpc_mdelem_from_slices (grpc_mdctx * ctx, gpr_slice key, gpr_slice value); +grpc_mdelem *grpc_mdelem_from_string_and_buffer (grpc_mdctx * ctx, const char *key, const gpr_uint8 * value, size_t value_length, int canonicalize_key); /* Mutator and accessor for grpc_mdelem user data. The destructor function is used as a type tag and is checked during user_data fetch. */ -void *grpc_mdelem_get_user_data(grpc_mdelem *md, - void (*if_destroy_func)(void *)); -void grpc_mdelem_set_user_data(grpc_mdelem *md, void (*destroy_func)(void *), - void *user_data); +void *grpc_mdelem_get_user_data (grpc_mdelem * md, void (*if_destroy_func) (void *)); +void grpc_mdelem_set_user_data (grpc_mdelem * md, void (*destroy_func) (void *), void *user_data); /* Reference counting */ #ifdef GRPC_METADATA_REFCOUNT_DEBUG @@ -134,28 +125,28 @@ void grpc_mdelem_set_user_data(grpc_mdelem *md, void (*destroy_func)(void *), #define GRPC_MDSTR_UNREF(s) grpc_mdstr_unref((s), __FILE__, __LINE__) #define GRPC_MDELEM_REF(s) grpc_mdelem_ref((s), __FILE__, __LINE__) #define GRPC_MDELEM_UNREF(s) grpc_mdelem_unref((s), __FILE__, __LINE__) -grpc_mdstr *grpc_mdstr_ref(grpc_mdstr *s, const char *file, int line); -void grpc_mdstr_unref(grpc_mdstr *s, const char *file, int 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); +grpc_mdstr *grpc_mdstr_ref (grpc_mdstr * s, const char *file, int line); +void grpc_mdstr_unref (grpc_mdstr * s, const char *file, int 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); #else #define GRPC_MDSTR_REF(s) grpc_mdstr_ref((s)) #define GRPC_MDSTR_UNREF(s) grpc_mdstr_unref((s)) #define GRPC_MDELEM_REF(s) grpc_mdelem_ref((s)) #define GRPC_MDELEM_UNREF(s) grpc_mdelem_unref((s)) -grpc_mdstr *grpc_mdstr_ref(grpc_mdstr *s); -void grpc_mdstr_unref(grpc_mdstr *s); -grpc_mdelem *grpc_mdelem_ref(grpc_mdelem *md); -void grpc_mdelem_unref(grpc_mdelem *md); +grpc_mdstr *grpc_mdstr_ref (grpc_mdstr * s); +void grpc_mdstr_unref (grpc_mdstr * s); +grpc_mdelem *grpc_mdelem_ref (grpc_mdelem * md); +void grpc_mdelem_unref (grpc_mdelem * md); #endif /* Recover a char* from a grpc_mdstr. The returned string is null terminated. Does not promise that the returned string has no embedded nulls however. */ -const char *grpc_mdstr_as_c_string(grpc_mdstr *s); +const char *grpc_mdstr_as_c_string (grpc_mdstr * s); -int grpc_mdstr_is_legal_header(grpc_mdstr *s); -int grpc_mdstr_is_legal_nonbin_header(grpc_mdstr *s); -int grpc_mdstr_is_bin_suffixed(grpc_mdstr *s); +int grpc_mdstr_is_legal_header (grpc_mdstr * s); +int grpc_mdstr_is_legal_nonbin_header (grpc_mdstr * s); +int grpc_mdstr_is_bin_suffixed (grpc_mdstr * s); /* Batch mode metadata functions. These API's have equivalents above, but allow taking the mdctx just once, @@ -163,21 +154,20 @@ int grpc_mdstr_is_bin_suffixed(grpc_mdstr *s); /* Lock the metadata context: it's only safe to call _locked_ functions against this context from the calling thread until grpc_mdctx_unlock is called */ -void grpc_mdctx_lock(grpc_mdctx *ctx); +void grpc_mdctx_lock (grpc_mdctx * ctx); #ifdef GRPC_METADATA_REFCOUNT_DEBUG #define GRPC_MDCTX_LOCKED_MDELEM_UNREF(ctx, elem) \ grpc_mdctx_locked_mdelem_unref((ctx), (elem), __FILE__, __LINE__) /* Unref a metadata element */ -void grpc_mdctx_locked_mdelem_unref(grpc_mdctx *ctx, grpc_mdelem *elem, - const char *file, int line); +void grpc_mdctx_locked_mdelem_unref (grpc_mdctx * ctx, grpc_mdelem * elem, const char *file, int line); #else #define GRPC_MDCTX_LOCKED_MDELEM_UNREF(ctx, elem) \ grpc_mdctx_locked_mdelem_unref((ctx), (elem)) /* Unref a metadata element */ -void grpc_mdctx_locked_mdelem_unref(grpc_mdctx *ctx, grpc_mdelem *elem); +void grpc_mdctx_locked_mdelem_unref (grpc_mdctx * ctx, grpc_mdelem * elem); #endif /* Unlock the metadata context */ -void grpc_mdctx_unlock(grpc_mdctx *ctx); +void grpc_mdctx_unlock (grpc_mdctx * ctx); #define GRPC_MDSTR_KV_HASH(k_hash, v_hash) (GPR_ROTL((k_hash), 2) ^ (v_hash)) diff --git a/src/core/transport/stream_op.c b/src/core/transport/stream_op.c index 038586d48e2..f188c7d1ae6 100644 --- a/src/core/transport/stream_op.c +++ b/src/core/transport/stream_op.c @@ -42,290 +42,367 @@ Currently we grow by 1.5 times upon reallocation. */ #define GROW(x) (3 * (x) / 2) -void grpc_sopb_init(grpc_stream_op_buffer *sopb) { +void +grpc_sopb_init (grpc_stream_op_buffer * sopb) +{ sopb->ops = sopb->inlined_ops; sopb->nops = 0; sopb->capacity = GRPC_SOPB_INLINE_ELEMENTS; } -void grpc_sopb_destroy(grpc_stream_op_buffer *sopb) { - grpc_stream_ops_unref_owned_objects(sopb->ops, sopb->nops); - if (sopb->ops != sopb->inlined_ops) gpr_free(sopb->ops); +void +grpc_sopb_destroy (grpc_stream_op_buffer * sopb) +{ + grpc_stream_ops_unref_owned_objects (sopb->ops, sopb->nops); + if (sopb->ops != sopb->inlined_ops) + gpr_free (sopb->ops); } -void grpc_sopb_reset(grpc_stream_op_buffer *sopb) { - grpc_stream_ops_unref_owned_objects(sopb->ops, sopb->nops); +void +grpc_sopb_reset (grpc_stream_op_buffer * sopb) +{ + grpc_stream_ops_unref_owned_objects (sopb->ops, sopb->nops); sopb->nops = 0; } -void grpc_sopb_swap(grpc_stream_op_buffer *a, grpc_stream_op_buffer *b) { - GPR_SWAP(size_t, a->nops, b->nops); - GPR_SWAP(size_t, a->capacity, b->capacity); - - if (a->ops == a->inlined_ops) { - if (b->ops == b->inlined_ops) { - /* swap contents of inlined buffer */ - grpc_stream_op temp[GRPC_SOPB_INLINE_ELEMENTS]; - memcpy(temp, a->ops, b->nops * sizeof(grpc_stream_op)); - memcpy(a->ops, b->ops, a->nops * sizeof(grpc_stream_op)); - memcpy(b->ops, temp, b->nops * sizeof(grpc_stream_op)); - } else { - /* a is inlined, b is not - copy a inlined into b, fix pointers */ - a->ops = b->ops; - b->ops = b->inlined_ops; - memcpy(b->ops, a->inlined_ops, b->nops * sizeof(grpc_stream_op)); +void +grpc_sopb_swap (grpc_stream_op_buffer * a, grpc_stream_op_buffer * b) +{ + GPR_SWAP (size_t, a->nops, b->nops); + GPR_SWAP (size_t, a->capacity, b->capacity); + + if (a->ops == a->inlined_ops) + { + if (b->ops == b->inlined_ops) + { + /* swap contents of inlined buffer */ + grpc_stream_op temp[GRPC_SOPB_INLINE_ELEMENTS]; + memcpy (temp, a->ops, b->nops * sizeof (grpc_stream_op)); + memcpy (a->ops, b->ops, a->nops * sizeof (grpc_stream_op)); + memcpy (b->ops, temp, b->nops * sizeof (grpc_stream_op)); + } + else + { + /* a is inlined, b is not - copy a inlined into b, fix pointers */ + a->ops = b->ops; + b->ops = b->inlined_ops; + memcpy (b->ops, a->inlined_ops, b->nops * sizeof (grpc_stream_op)); + } + } + else if (b->ops == b->inlined_ops) + { + /* b is inlined, a is not - copy b inlined int a, fix pointers */ + b->ops = a->ops; + a->ops = a->inlined_ops; + memcpy (a->ops, b->inlined_ops, a->nops * sizeof (grpc_stream_op)); + } + else + { + /* no inlining: easy swap */ + GPR_SWAP (grpc_stream_op *, a->ops, b->ops); } - } else if (b->ops == b->inlined_ops) { - /* b is inlined, a is not - copy b inlined int a, fix pointers */ - b->ops = a->ops; - a->ops = a->inlined_ops; - memcpy(a->ops, b->inlined_ops, a->nops * sizeof(grpc_stream_op)); - } else { - /* no inlining: easy swap */ - GPR_SWAP(grpc_stream_op *, a->ops, b->ops); - } } -void grpc_stream_ops_unref_owned_objects(grpc_stream_op *ops, size_t nops) { +void +grpc_stream_ops_unref_owned_objects (grpc_stream_op * ops, size_t nops) +{ size_t i; - for (i = 0; i < nops; i++) { - switch (ops[i].type) { - case GRPC_OP_SLICE: - gpr_slice_unref(ops[i].data.slice); - break; - case GRPC_OP_METADATA: - grpc_metadata_batch_destroy(&ops[i].data.metadata); - break; - case GRPC_NO_OP: - case GRPC_OP_BEGIN_MESSAGE: - break; + for (i = 0; i < nops; i++) + { + switch (ops[i].type) + { + case GRPC_OP_SLICE: + gpr_slice_unref (ops[i].data.slice); + break; + case GRPC_OP_METADATA: + grpc_metadata_batch_destroy (&ops[i].data.metadata); + break; + case GRPC_NO_OP: + case GRPC_OP_BEGIN_MESSAGE: + break; + } } - } } -static void expandto(grpc_stream_op_buffer *sopb, size_t new_capacity) { +static void +expandto (grpc_stream_op_buffer * sopb, size_t new_capacity) +{ sopb->capacity = new_capacity; - if (sopb->ops == sopb->inlined_ops) { - sopb->ops = gpr_malloc(sizeof(grpc_stream_op) * new_capacity); - memcpy(sopb->ops, sopb->inlined_ops, sopb->nops * sizeof(grpc_stream_op)); - } else { - sopb->ops = gpr_realloc(sopb->ops, sizeof(grpc_stream_op) * new_capacity); - } + if (sopb->ops == sopb->inlined_ops) + { + sopb->ops = gpr_malloc (sizeof (grpc_stream_op) * new_capacity); + memcpy (sopb->ops, sopb->inlined_ops, sopb->nops * sizeof (grpc_stream_op)); + } + else + { + sopb->ops = gpr_realloc (sopb->ops, sizeof (grpc_stream_op) * new_capacity); + } } -static grpc_stream_op *add(grpc_stream_op_buffer *sopb) { +static grpc_stream_op * +add (grpc_stream_op_buffer * sopb) +{ grpc_stream_op *out; - GPR_ASSERT(sopb->nops <= sopb->capacity); - if (sopb->nops == sopb->capacity) { - expandto(sopb, GROW(sopb->capacity)); - } + GPR_ASSERT (sopb->nops <= sopb->capacity); + if (sopb->nops == sopb->capacity) + { + expandto (sopb, GROW (sopb->capacity)); + } out = sopb->ops + sopb->nops; sopb->nops++; return out; } -void grpc_sopb_add_no_op(grpc_stream_op_buffer *sopb) { - add(sopb)->type = GRPC_NO_OP; +void +grpc_sopb_add_no_op (grpc_stream_op_buffer * sopb) +{ + add (sopb)->type = GRPC_NO_OP; } -void grpc_sopb_add_begin_message(grpc_stream_op_buffer *sopb, gpr_uint32 length, - gpr_uint32 flags) { - grpc_stream_op *op = add(sopb); +void +grpc_sopb_add_begin_message (grpc_stream_op_buffer * sopb, gpr_uint32 length, gpr_uint32 flags) +{ + grpc_stream_op *op = add (sopb); op->type = GRPC_OP_BEGIN_MESSAGE; op->data.begin_message.length = length; op->data.begin_message.flags = flags; } -void grpc_sopb_add_metadata(grpc_stream_op_buffer *sopb, - grpc_metadata_batch b) { - grpc_stream_op *op = add(sopb); +void +grpc_sopb_add_metadata (grpc_stream_op_buffer * sopb, grpc_metadata_batch b) +{ + grpc_stream_op *op = add (sopb); op->type = GRPC_OP_METADATA; op->data.metadata = b; } -void grpc_sopb_add_slice(grpc_stream_op_buffer *sopb, gpr_slice slice) { - grpc_stream_op *op = add(sopb); +void +grpc_sopb_add_slice (grpc_stream_op_buffer * sopb, gpr_slice slice) +{ + grpc_stream_op *op = add (sopb); op->type = GRPC_OP_SLICE; op->data.slice = slice; } -void grpc_sopb_append(grpc_stream_op_buffer *sopb, grpc_stream_op *ops, - size_t nops) { +void +grpc_sopb_append (grpc_stream_op_buffer * sopb, grpc_stream_op * ops, size_t nops) +{ size_t orig_nops = sopb->nops; size_t new_nops = orig_nops + nops; - if (new_nops > sopb->capacity) { - expandto(sopb, GPR_MAX(GROW(sopb->capacity), new_nops)); - } + if (new_nops > sopb->capacity) + { + expandto (sopb, GPR_MAX (GROW (sopb->capacity), new_nops)); + } - memcpy(sopb->ops + orig_nops, ops, sizeof(grpc_stream_op) * nops); + memcpy (sopb->ops + orig_nops, ops, sizeof (grpc_stream_op) * nops); sopb->nops = new_nops; } -void grpc_sopb_move_to(grpc_stream_op_buffer *src, grpc_stream_op_buffer *dst) { - if (src->nops == 0) { - return; - } - if (dst->nops == 0) { - grpc_sopb_swap(src, dst); - return; - } - grpc_sopb_append(dst, src->ops, src->nops); +void +grpc_sopb_move_to (grpc_stream_op_buffer * src, grpc_stream_op_buffer * dst) +{ + if (src->nops == 0) + { + return; + } + if (dst->nops == 0) + { + grpc_sopb_swap (src, dst); + return; + } + grpc_sopb_append (dst, src->ops, src->nops); src->nops = 0; } -static void assert_valid_list(grpc_mdelem_list *list) { +static void +assert_valid_list (grpc_mdelem_list * list) +{ #ifndef NDEBUG grpc_linked_mdelem *l; - GPR_ASSERT((list->head == NULL) == (list->tail == NULL)); - if (!list->head) return; - GPR_ASSERT(list->head->prev == NULL); - GPR_ASSERT(list->tail->next == NULL); - GPR_ASSERT((list->head == list->tail) == (list->head->next == NULL)); - - for (l = list->head; l; l = l->next) { - GPR_ASSERT(l->md); - GPR_ASSERT((l->prev == NULL) == (l == list->head)); - GPR_ASSERT((l->next == NULL) == (l == list->tail)); - if (l->next) GPR_ASSERT(l->next->prev == l); - if (l->prev) GPR_ASSERT(l->prev->next == l); - } + GPR_ASSERT ((list->head == NULL) == (list->tail == NULL)); + if (!list->head) + return; + GPR_ASSERT (list->head->prev == NULL); + GPR_ASSERT (list->tail->next == NULL); + GPR_ASSERT ((list->head == list->tail) == (list->head->next == NULL)); + + for (l = list->head; l; l = l->next) + { + GPR_ASSERT (l->md); + GPR_ASSERT ((l->prev == NULL) == (l == list->head)); + GPR_ASSERT ((l->next == NULL) == (l == list->tail)); + if (l->next) + GPR_ASSERT (l->next->prev == l); + if (l->prev) + GPR_ASSERT (l->prev->next == l); + } #endif /* NDEBUG */ } #ifndef NDEBUG -void grpc_metadata_batch_assert_ok(grpc_metadata_batch *batch) { - assert_valid_list(&batch->list); - assert_valid_list(&batch->garbage); +void +grpc_metadata_batch_assert_ok (grpc_metadata_batch * batch) +{ + assert_valid_list (&batch->list); + assert_valid_list (&batch->garbage); } #endif /* NDEBUG */ -void grpc_metadata_batch_init(grpc_metadata_batch *batch) { - batch->list.head = batch->list.tail = batch->garbage.head = - batch->garbage.tail = NULL; - batch->deadline = gpr_inf_future(GPR_CLOCK_REALTIME); +void +grpc_metadata_batch_init (grpc_metadata_batch * batch) +{ + batch->list.head = batch->list.tail = batch->garbage.head = batch->garbage.tail = NULL; + batch->deadline = gpr_inf_future (GPR_CLOCK_REALTIME); } -void grpc_metadata_batch_destroy(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(l->md); - } - for (l = batch->garbage.head; l; l = l->next) { - GRPC_MDELEM_UNREF(l->md); - } + for (l = batch->list.head; l; l = l->next) + { + GRPC_MDELEM_UNREF (l->md); + } + for (l = batch->garbage.head; l; l = l->next) + { + GRPC_MDELEM_UNREF (l->md); + } } -void grpc_metadata_batch_add_head(grpc_metadata_batch *batch, - grpc_linked_mdelem *storage, - grpc_mdelem *elem_to_add) { - GPR_ASSERT(elem_to_add); +void +grpc_metadata_batch_add_head (grpc_metadata_batch * batch, grpc_linked_mdelem * storage, grpc_mdelem * elem_to_add) +{ + GPR_ASSERT (elem_to_add); storage->md = elem_to_add; - grpc_metadata_batch_link_head(batch, storage); + grpc_metadata_batch_link_head (batch, storage); } -static void link_head(grpc_mdelem_list *list, grpc_linked_mdelem *storage) { - assert_valid_list(list); - GPR_ASSERT(storage->md); +static void +link_head (grpc_mdelem_list * list, grpc_linked_mdelem * storage) +{ + assert_valid_list (list); + GPR_ASSERT (storage->md); storage->prev = NULL; storage->next = list->head; - if (list->head != NULL) { - list->head->prev = storage; - } else { - list->tail = storage; - } + if (list->head != NULL) + { + list->head->prev = storage; + } + else + { + list->tail = storage; + } list->head = storage; - assert_valid_list(list); + assert_valid_list (list); } -void grpc_metadata_batch_link_head(grpc_metadata_batch *batch, - grpc_linked_mdelem *storage) { - link_head(&batch->list, storage); +void +grpc_metadata_batch_link_head (grpc_metadata_batch * batch, grpc_linked_mdelem * storage) +{ + link_head (&batch->list, storage); } -void grpc_metadata_batch_add_tail(grpc_metadata_batch *batch, - grpc_linked_mdelem *storage, - grpc_mdelem *elem_to_add) { - GPR_ASSERT(elem_to_add); +void +grpc_metadata_batch_add_tail (grpc_metadata_batch * batch, grpc_linked_mdelem * storage, grpc_mdelem * elem_to_add) +{ + GPR_ASSERT (elem_to_add); storage->md = elem_to_add; - grpc_metadata_batch_link_tail(batch, storage); + grpc_metadata_batch_link_tail (batch, storage); } -static void link_tail(grpc_mdelem_list *list, grpc_linked_mdelem *storage) { - assert_valid_list(list); - GPR_ASSERT(storage->md); +static void +link_tail (grpc_mdelem_list * list, grpc_linked_mdelem * storage) +{ + assert_valid_list (list); + GPR_ASSERT (storage->md); storage->prev = list->tail; storage->next = NULL; storage->reserved = NULL; - if (list->tail != NULL) { - list->tail->next = storage; - } else { - list->head = storage; - } + if (list->tail != NULL) + { + list->tail->next = storage; + } + else + { + list->head = storage; + } list->tail = storage; - assert_valid_list(list); + assert_valid_list (list); } -void grpc_metadata_batch_link_tail(grpc_metadata_batch *batch, - grpc_linked_mdelem *storage) { - link_tail(&batch->list, storage); +void +grpc_metadata_batch_link_tail (grpc_metadata_batch * batch, grpc_linked_mdelem * storage) +{ + link_tail (&batch->list, storage); } -void grpc_metadata_batch_merge(grpc_metadata_batch *target, - grpc_metadata_batch *add) { +void +grpc_metadata_batch_merge (grpc_metadata_batch * target, grpc_metadata_batch * add) +{ grpc_linked_mdelem *l; grpc_linked_mdelem *next; - for (l = add->list.head; l; l = next) { - next = l->next; - link_tail(&target->list, l); - } - for (l = add->garbage.head; l; l = next) { - next = l->next; - link_tail(&target->garbage, l); - } + for (l = add->list.head; l; l = next) + { + next = l->next; + link_tail (&target->list, l); + } + for (l = add->garbage.head; l; l = next) + { + next = l->next; + link_tail (&target->garbage, l); + } } -void grpc_metadata_batch_move(grpc_metadata_batch *dst, - grpc_metadata_batch *src) { +void +grpc_metadata_batch_move (grpc_metadata_batch * dst, grpc_metadata_batch * src) +{ *dst = *src; - memset(src, 0, sizeof(grpc_metadata_batch)); + memset (src, 0, sizeof (grpc_metadata_batch)); } -void grpc_metadata_batch_filter(grpc_metadata_batch *batch, - grpc_mdelem *(*filter)(void *user_data, - grpc_mdelem *elem), - void *user_data) { +void +grpc_metadata_batch_filter (grpc_metadata_batch * batch, grpc_mdelem * (*filter) (void *user_data, grpc_mdelem * elem), void *user_data) +{ grpc_linked_mdelem *l; grpc_linked_mdelem *next; - assert_valid_list(&batch->list); - assert_valid_list(&batch->garbage); - for (l = batch->list.head; l; l = next) { - grpc_mdelem *orig = l->md; - grpc_mdelem *filt = filter(user_data, orig); - next = l->next; - if (filt == NULL) { - if (l->prev) { - l->prev->next = l->next; - } - if (l->next) { - l->next->prev = l->prev; - } - if (batch->list.head == l) { - batch->list.head = l->next; - } - if (batch->list.tail == l) { - batch->list.tail = l->prev; - } - assert_valid_list(&batch->list); - link_head(&batch->garbage, l); - } else if (filt != orig) { - GRPC_MDELEM_UNREF(orig); - l->md = filt; + assert_valid_list (&batch->list); + assert_valid_list (&batch->garbage); + for (l = batch->list.head; l; l = next) + { + grpc_mdelem *orig = l->md; + grpc_mdelem *filt = filter (user_data, orig); + next = l->next; + if (filt == NULL) + { + if (l->prev) + { + l->prev->next = l->next; + } + if (l->next) + { + l->next->prev = l->prev; + } + if (batch->list.head == l) + { + batch->list.head = l->next; + } + if (batch->list.tail == l) + { + batch->list.tail = l->prev; + } + assert_valid_list (&batch->list); + link_head (&batch->garbage, l); + } + else if (filt != orig) + { + GRPC_MDELEM_UNREF (orig); + l->md = filt; + } } - } - assert_valid_list(&batch->list); - assert_valid_list(&batch->garbage); + assert_valid_list (&batch->list); + assert_valid_list (&batch->garbage); } diff --git a/src/core/transport/stream_op.h b/src/core/transport/stream_op.h index 37f18b02d91..e37ab09f71b 100644 --- a/src/core/transport/stream_op.h +++ b/src/core/transport/stream_op.h @@ -45,7 +45,8 @@ /* Operations that can be performed on a stream. Used by grpc_stream_op. */ -typedef enum grpc_stream_op_code { +typedef enum grpc_stream_op_code +{ /* Do nothing code. Useful if rewriting a batch to exclude some operations. Must be ignored by receivers */ GRPC_NO_OP, @@ -65,7 +66,8 @@ typedef enum grpc_stream_op_code { #define GRPC_WRITE_INTERNAL_USED_MASK (GRPC_WRITE_INTERNAL_COMPRESS) /* Arguments for GRPC_OP_BEGIN_MESSAGE */ -typedef struct grpc_begin_message { +typedef struct grpc_begin_message +{ /* How many bytes of data will this message contain */ gpr_uint32 length; /* Write flags for the message: see grpc.h GRPC_WRITE_* for the public bits, @@ -73,19 +75,22 @@ typedef struct grpc_begin_message { gpr_uint32 flags; } grpc_begin_message; -typedef struct grpc_linked_mdelem { +typedef struct grpc_linked_mdelem +{ grpc_mdelem *md; struct grpc_linked_mdelem *next; struct grpc_linked_mdelem *prev; void *reserved; } grpc_linked_mdelem; -typedef struct grpc_mdelem_list { +typedef struct grpc_mdelem_list +{ grpc_linked_mdelem *head; grpc_linked_mdelem *tail; } grpc_mdelem_list; -typedef struct grpc_metadata_batch { +typedef struct grpc_metadata_batch +{ /** Metadata elements in this batch */ grpc_mdelem_list list; /** Elements that have been removed from the batch, but have @@ -98,30 +103,26 @@ typedef struct grpc_metadata_batch { gpr_timespec deadline; } 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_merge(grpc_metadata_batch *target, - grpc_metadata_batch *add); +void grpc_metadata_batch_init (grpc_metadata_batch * batch); +void grpc_metadata_batch_destroy (grpc_metadata_batch * batch); +void grpc_metadata_batch_merge (grpc_metadata_batch * target, grpc_metadata_batch * add); /** Moves the metadata information from \a src to \a dst. Upon return, \a src is * zeroed. */ -void grpc_metadata_batch_move(grpc_metadata_batch *dst, - grpc_metadata_batch *src); +void grpc_metadata_batch_move (grpc_metadata_batch * dst, grpc_metadata_batch * src); /** Add \a storage to the beginning 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. */ -void grpc_metadata_batch_link_head(grpc_metadata_batch *batch, - grpc_linked_mdelem *storage); +void grpc_metadata_batch_link_head (grpc_metadata_batch * batch, grpc_linked_mdelem * storage); /** 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. */ -void grpc_metadata_batch_link_tail(grpc_metadata_batch *batch, - grpc_linked_mdelem *storage); +void grpc_metadata_batch_link_tail (grpc_metadata_batch * batch, grpc_linked_mdelem * storage); /** Add \a elem_to_add as the first element in \a batch, using \a storage as backing storage for the linked list element. @@ -129,30 +130,23 @@ void grpc_metadata_batch_link_tail(grpc_metadata_batch *batch, lifetime of batch. This usually means it should be around for the lifetime of the call. Takes ownership of \a elem_to_add */ -void grpc_metadata_batch_add_head(grpc_metadata_batch *batch, - grpc_linked_mdelem *storage, - grpc_mdelem *elem_to_add); +void grpc_metadata_batch_add_head (grpc_metadata_batch * batch, grpc_linked_mdelem * storage, grpc_mdelem * elem_to_add); /** 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 lifetime of batch. This usually means it should be around for the lifetime of the call. Takes ownership of \a elem_to_add */ -void grpc_metadata_batch_add_tail(grpc_metadata_batch *batch, - grpc_linked_mdelem *storage, - grpc_mdelem *elem_to_add); +void grpc_metadata_batch_add_tail (grpc_metadata_batch * batch, grpc_linked_mdelem * storage, grpc_mdelem * elem_to_add); /** For each element in \a batch, execute \a filter. The return value from \a filter will be substituted for the grpc_mdelem passed to \a filter. If \a filter returns NULL, the element will be moved to the garbage list. */ -void grpc_metadata_batch_filter(grpc_metadata_batch *batch, - grpc_mdelem *(*filter)(void *user_data, - grpc_mdelem *elem), - void *user_data); +void grpc_metadata_batch_filter (grpc_metadata_batch * batch, grpc_mdelem * (*filter) (void *user_data, grpc_mdelem * elem), void *user_data); #ifndef NDEBUG -void grpc_metadata_batch_assert_ok(grpc_metadata_batch *comd); +void grpc_metadata_batch_assert_ok (grpc_metadata_batch * comd); #else #define grpc_metadata_batch_assert_ok(comd) \ do { \ @@ -160,12 +154,14 @@ void grpc_metadata_batch_assert_ok(grpc_metadata_batch *comd); #endif /* Represents a single operation performed on a stream/transport */ -typedef struct grpc_stream_op { +typedef struct grpc_stream_op +{ /* the operation to be applied */ enum grpc_stream_op_code type; /* the arguments to this operation. union fields are named according to the associated op-code */ - union { + union + { grpc_begin_message begin_message; grpc_metadata_batch metadata; gpr_slice slice; @@ -174,7 +170,8 @@ typedef struct grpc_stream_op { /** A stream op buffer is a wrapper around stream operations that is * dynamically extendable. */ -typedef struct grpc_stream_op_buffer { +typedef struct grpc_stream_op_buffer +{ grpc_stream_op *ops; size_t nops; size_t capacity; @@ -182,31 +179,28 @@ typedef struct grpc_stream_op_buffer { } grpc_stream_op_buffer; /* Initialize a stream op buffer */ -void grpc_sopb_init(grpc_stream_op_buffer *sopb); +void grpc_sopb_init (grpc_stream_op_buffer * sopb); /* Destroy a stream op buffer */ -void grpc_sopb_destroy(grpc_stream_op_buffer *sopb); +void grpc_sopb_destroy (grpc_stream_op_buffer * sopb); /* Reset a sopb to no elements */ -void grpc_sopb_reset(grpc_stream_op_buffer *sopb); +void grpc_sopb_reset (grpc_stream_op_buffer * sopb); /* Swap two sopbs */ -void grpc_sopb_swap(grpc_stream_op_buffer *a, grpc_stream_op_buffer *b); +void grpc_sopb_swap (grpc_stream_op_buffer * a, grpc_stream_op_buffer * b); -void grpc_stream_ops_unref_owned_objects(grpc_stream_op *ops, size_t nops); +void grpc_stream_ops_unref_owned_objects (grpc_stream_op * ops, size_t nops); /* Append a GRPC_NO_OP to a buffer */ -void grpc_sopb_add_no_op(grpc_stream_op_buffer *sopb); +void grpc_sopb_add_no_op (grpc_stream_op_buffer * sopb); /* Append a GRPC_OP_BEGIN to a buffer */ -void grpc_sopb_add_begin_message(grpc_stream_op_buffer *sopb, gpr_uint32 length, - gpr_uint32 flags); -void grpc_sopb_add_metadata(grpc_stream_op_buffer *sopb, - grpc_metadata_batch metadata); +void grpc_sopb_add_begin_message (grpc_stream_op_buffer * sopb, gpr_uint32 length, gpr_uint32 flags); +void grpc_sopb_add_metadata (grpc_stream_op_buffer * sopb, grpc_metadata_batch metadata); /* Append a GRPC_SLICE to a buffer - does not ref/unref the slice */ -void grpc_sopb_add_slice(grpc_stream_op_buffer *sopb, gpr_slice slice); +void grpc_sopb_add_slice (grpc_stream_op_buffer * sopb, gpr_slice slice); /* Append a buffer to a buffer - does not ref/unref any internal objects */ -void grpc_sopb_append(grpc_stream_op_buffer *sopb, grpc_stream_op *ops, - size_t nops); +void grpc_sopb_append (grpc_stream_op_buffer * sopb, grpc_stream_op * ops, size_t nops); -void grpc_sopb_move_to(grpc_stream_op_buffer *src, grpc_stream_op_buffer *dst); +void grpc_sopb_move_to (grpc_stream_op_buffer * src, grpc_stream_op_buffer * dst); -char *grpc_sopb_string(grpc_stream_op_buffer *sopb); +char *grpc_sopb_string (grpc_stream_op_buffer * sopb); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_STREAM_OP_H */ diff --git a/src/core/transport/transport.c b/src/core/transport/transport.c index 24d549a29b7..1288d6d04db 100644 --- a/src/core/transport/transport.c +++ b/src/core/transport/transport.c @@ -36,103 +36,115 @@ #include #include "src/core/transport/transport_impl.h" -size_t grpc_transport_stream_size(grpc_transport *transport) { +size_t +grpc_transport_stream_size (grpc_transport * transport) +{ return transport->vtable->sizeof_stream; } -void grpc_transport_destroy(grpc_transport *transport, - grpc_closure_list *closure_list) { - transport->vtable->destroy(transport, closure_list); +void +grpc_transport_destroy (grpc_transport * transport, grpc_closure_list * closure_list) +{ + transport->vtable->destroy (transport, closure_list); } -int grpc_transport_init_stream(grpc_transport *transport, grpc_stream *stream, - const void *server_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list) { - return transport->vtable->init_stream(transport, stream, server_data, - initial_op, closure_list); +int +grpc_transport_init_stream (grpc_transport * transport, grpc_stream * stream, const void *server_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ + return transport->vtable->init_stream (transport, stream, server_data, initial_op, closure_list); } -void grpc_transport_perform_stream_op(grpc_transport *transport, - grpc_stream *stream, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { - transport->vtable->perform_stream_op(transport, stream, op, closure_list); +void +grpc_transport_perform_stream_op (grpc_transport * transport, grpc_stream * stream, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + transport->vtable->perform_stream_op (transport, stream, op, closure_list); } -void grpc_transport_perform_op(grpc_transport *transport, grpc_transport_op *op, - grpc_closure_list *closure_list) { - transport->vtable->perform_op(transport, op, closure_list); +void +grpc_transport_perform_op (grpc_transport * transport, grpc_transport_op * op, grpc_closure_list * closure_list) +{ + transport->vtable->perform_op (transport, op, closure_list); } -void grpc_transport_destroy_stream(grpc_transport *transport, - grpc_stream *stream, - grpc_closure_list *closure_list) { - transport->vtable->destroy_stream(transport, stream, closure_list); +void +grpc_transport_destroy_stream (grpc_transport * transport, grpc_stream * stream, grpc_closure_list * closure_list) +{ + transport->vtable->destroy_stream (transport, stream, closure_list); } -char *grpc_transport_get_peer(grpc_transport *transport, - grpc_closure_list *closure_list) { - return transport->vtable->get_peer(transport, closure_list); +char * +grpc_transport_get_peer (grpc_transport * transport, grpc_closure_list * closure_list) +{ + return transport->vtable->get_peer (transport, closure_list); } -void grpc_transport_stream_op_finish_with_failure( - grpc_transport_stream_op *op, grpc_closure_list *closure_list) { - grpc_closure_list_add(closure_list, op->on_done_recv, 0); - grpc_closure_list_add(closure_list, op->on_done_send, 0); - grpc_closure_list_add(closure_list, op->on_consumed, 0); +void +grpc_transport_stream_op_finish_with_failure (grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + grpc_closure_list_add (closure_list, op->on_done_recv, 0); + grpc_closure_list_add (closure_list, op->on_done_send, 0); + grpc_closure_list_add (closure_list, op->on_consumed, 0); } -void grpc_transport_stream_op_add_cancellation(grpc_transport_stream_op *op, - grpc_status_code status) { - GPR_ASSERT(status != GRPC_STATUS_OK); - if (op->cancel_with_status == GRPC_STATUS_OK) { - op->cancel_with_status = status; - } - if (op->close_with_status != GRPC_STATUS_OK) { - op->close_with_status = GRPC_STATUS_OK; - if (op->optional_close_message != NULL) { - gpr_slice_unref(*op->optional_close_message); - op->optional_close_message = NULL; +void +grpc_transport_stream_op_add_cancellation (grpc_transport_stream_op * op, grpc_status_code status) +{ + GPR_ASSERT (status != GRPC_STATUS_OK); + if (op->cancel_with_status == GRPC_STATUS_OK) + { + op->cancel_with_status = status; + } + if (op->close_with_status != GRPC_STATUS_OK) + { + op->close_with_status = GRPC_STATUS_OK; + if (op->optional_close_message != NULL) + { + gpr_slice_unref (*op->optional_close_message); + op->optional_close_message = NULL; + } } - } } -typedef struct { +typedef struct +{ gpr_slice message; grpc_closure *then_call; grpc_closure closure; } close_message_data; -static void free_message(void *p, int iomgr_success, - grpc_closure_list *closure_list) { +static void +free_message (void *p, int iomgr_success, grpc_closure_list * closure_list) +{ close_message_data *cmd = p; - gpr_slice_unref(cmd->message); - if (cmd->then_call != NULL) { - cmd->then_call->cb(cmd->then_call->cb_arg, iomgr_success, closure_list); - } - gpr_free(cmd); + gpr_slice_unref (cmd->message); + if (cmd->then_call != NULL) + { + cmd->then_call->cb (cmd->then_call->cb_arg, iomgr_success, closure_list); + } + gpr_free (cmd); } -void grpc_transport_stream_op_add_close(grpc_transport_stream_op *op, - grpc_status_code status, - gpr_slice *optional_message) { +void +grpc_transport_stream_op_add_close (grpc_transport_stream_op * op, grpc_status_code status, gpr_slice * optional_message) +{ close_message_data *cmd; - GPR_ASSERT(status != GRPC_STATUS_OK); - if (op->cancel_with_status != GRPC_STATUS_OK || - op->close_with_status != GRPC_STATUS_OK) { - if (optional_message) { - gpr_slice_unref(*optional_message); + GPR_ASSERT (status != GRPC_STATUS_OK); + if (op->cancel_with_status != GRPC_STATUS_OK || op->close_with_status != GRPC_STATUS_OK) + { + if (optional_message) + { + gpr_slice_unref (*optional_message); + } + return; + } + if (optional_message) + { + cmd = gpr_malloc (sizeof (*cmd)); + cmd->message = *optional_message; + cmd->then_call = op->on_consumed; + grpc_closure_init (&cmd->closure, free_message, cmd); + op->on_consumed = &cmd->closure; + op->optional_close_message = &cmd->message; } - return; - } - if (optional_message) { - cmd = gpr_malloc(sizeof(*cmd)); - cmd->message = *optional_message; - cmd->then_call = op->on_consumed; - grpc_closure_init(&cmd->closure, free_message, cmd); - op->on_consumed = &cmd->closure; - op->optional_close_message = &cmd->message; - } op->close_with_status = status; } diff --git a/src/core/transport/transport.h b/src/core/transport/transport.h index 1d6dd1e735a..c28dc0c2a67 100644 --- a/src/core/transport/transport.h +++ b/src/core/transport/transport.h @@ -50,7 +50,8 @@ typedef struct grpc_transport grpc_transport; typedef struct grpc_stream grpc_stream; /* Represents the send/recv closed state of a stream. */ -typedef enum grpc_stream_state { +typedef enum grpc_stream_state +{ /* the stream is open for sends and receives */ GRPC_STREAM_OPEN, /* the stream is closed for sends, but may still receive data */ @@ -63,7 +64,8 @@ typedef enum grpc_stream_state { /* Transport stream op: a set of operations to perform on a transport against a single stream */ -typedef struct grpc_transport_stream_op { +typedef struct grpc_transport_stream_op +{ grpc_closure *on_consumed; grpc_stream_op_buffer *send_ops; @@ -93,7 +95,8 @@ typedef struct grpc_transport_stream_op { } grpc_transport_stream_op; /** Transport op: a set of operations to perform on a transport as a whole */ -typedef struct grpc_transport_op { +typedef struct grpc_transport_op +{ /** called when processing of this op is done */ grpc_closure *on_consumed; /** connectivity monitoring */ @@ -110,8 +113,7 @@ typedef struct grpc_transport_op { gpr_slice *goaway_message; /** set the callback for accepting new streams; this is a permanent callback, unlike the other one-shot closures */ - void (*set_accept_stream)(void *user_data, grpc_transport *transport, - const void *server_data); + void (*set_accept_stream) (void *user_data, grpc_transport * transport, const void *server_data); void *set_accept_stream_user_data; /** add this transport to a pollset */ grpc_pollset *bind_pollset; @@ -123,7 +125,7 @@ typedef struct grpc_transport_op { /* Returns the amount of memory required to store a grpc_stream for this transport */ -size_t grpc_transport_stream_size(grpc_transport *transport); +size_t grpc_transport_stream_size (grpc_transport * transport); /* Initialize transport data for a stream. @@ -134,10 +136,7 @@ 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, - const void *server_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list); +int grpc_transport_init_stream (grpc_transport * transport, grpc_stream * stream, const void *server_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list); /* Destroy transport data for a stream. @@ -149,21 +148,15 @@ int grpc_transport_init_stream(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, - grpc_stream *stream, - grpc_closure_list *closure_list); +void grpc_transport_destroy_stream (grpc_transport * transport, grpc_stream * stream, grpc_closure_list * closure_list); -void grpc_transport_stream_op_finish_with_failure( - grpc_transport_stream_op *op, grpc_closure_list *closure_list); +void grpc_transport_stream_op_finish_with_failure (grpc_transport_stream_op * op, grpc_closure_list * closure_list); -void grpc_transport_stream_op_add_cancellation(grpc_transport_stream_op *op, - grpc_status_code status); +void grpc_transport_stream_op_add_cancellation (grpc_transport_stream_op * op, grpc_status_code status); -void grpc_transport_stream_op_add_close(grpc_transport_stream_op *op, - grpc_status_code status, - gpr_slice *optional_message); +void grpc_transport_stream_op_add_close (grpc_transport_stream_op * op, grpc_status_code status, gpr_slice * optional_message); -char *grpc_transport_stream_op_string(grpc_transport_stream_op *op); +char *grpc_transport_stream_op_string (grpc_transport_stream_op * op); /* Send a batch of operations on a transport @@ -174,32 +167,25 @@ char *grpc_transport_stream_op_string(grpc_transport_stream_op *op); stream - the stream on which to send the operations. This must be non-NULL and previously initialized by the same transport. op - a grpc_transport_stream_op specifying the op to perform */ -void grpc_transport_perform_stream_op(grpc_transport *transport, - grpc_stream *stream, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list); +void grpc_transport_perform_stream_op (grpc_transport * transport, grpc_stream * stream, grpc_transport_stream_op * op, grpc_closure_list * closure_list); -void grpc_transport_perform_op(grpc_transport *transport, grpc_transport_op *op, - grpc_closure_list *closure_list); +void grpc_transport_perform_op (grpc_transport * transport, grpc_transport_op * op, grpc_closure_list * closure_list); /* Send a ping on a transport Calls cb with user data when a response is received. */ -void grpc_transport_ping(grpc_transport *transport, grpc_closure *cb); +void grpc_transport_ping (grpc_transport * transport, grpc_closure * cb); /* Advise peer of pending connection termination. */ -void grpc_transport_goaway(grpc_transport *transport, grpc_status_code status, - gpr_slice debug_data); +void grpc_transport_goaway (grpc_transport * transport, grpc_status_code status, gpr_slice debug_data); /* Close a transport. Aborts all open streams. */ -void grpc_transport_close(grpc_transport *transport); +void grpc_transport_close (grpc_transport * transport); /* Destroy the transport */ -void grpc_transport_destroy(grpc_transport *transport, - grpc_closure_list *closure_list); +void grpc_transport_destroy (grpc_transport * transport, grpc_closure_list * closure_list); /* Get the transports peer */ -char *grpc_transport_get_peer(grpc_transport *transport, - grpc_closure_list *closure_list); +char *grpc_transport_get_peer (grpc_transport * transport, grpc_closure_list * closure_list); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_TRANSPORT_H */ diff --git a/src/core/transport/transport_impl.h b/src/core/transport/transport_impl.h index c7eebc9bb20..97f4c4c8c72 100644 --- a/src/core/transport/transport_impl.h +++ b/src/core/transport/transport_impl.h @@ -36,39 +36,34 @@ #include "src/core/transport/transport.h" -typedef struct grpc_transport_vtable { +typedef struct grpc_transport_vtable +{ /* Memory required for a single stream element - this is allocated by upper layers and initialized by the transport */ - size_t sizeof_stream; /* = sizeof(transport stream) */ + size_t sizeof_stream; /* = sizeof(transport stream) */ /* implementation of grpc_transport_init_stream */ - int (*init_stream)(grpc_transport *self, grpc_stream *stream, - const void *server_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list); + int (*init_stream) (grpc_transport * self, grpc_stream * stream, const void *server_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list); /* implementation of grpc_transport_perform_stream_op */ - void (*perform_stream_op)(grpc_transport *self, grpc_stream *stream, - grpc_transport_stream_op *op, - grpc_closure_list *closure_list); + void (*perform_stream_op) (grpc_transport * self, grpc_stream * stream, grpc_transport_stream_op * op, grpc_closure_list * closure_list); /* implementation of grpc_transport_perform_op */ - void (*perform_op)(grpc_transport *self, grpc_transport_op *op, - grpc_closure_list *closure_list); + void (*perform_op) (grpc_transport * self, grpc_transport_op * op, grpc_closure_list * closure_list); /* implementation of grpc_transport_destroy_stream */ - void (*destroy_stream)(grpc_transport *self, grpc_stream *stream, - grpc_closure_list *closure_list); + void (*destroy_stream) (grpc_transport * self, grpc_stream * stream, grpc_closure_list * closure_list); /* implementation of grpc_transport_destroy */ - void (*destroy)(grpc_transport *self, grpc_closure_list *closure_list); + void (*destroy) (grpc_transport * self, grpc_closure_list * closure_list); /* implementation of grpc_transport_get_peer */ - char *(*get_peer)(grpc_transport *self, grpc_closure_list *closure_list); + char *(*get_peer) (grpc_transport * self, grpc_closure_list * closure_list); } grpc_transport_vtable; /* an instance of a grpc transport */ -struct grpc_transport { +struct grpc_transport +{ /* pointer to a vtable defining operations on this transport */ const grpc_transport_vtable *vtable; }; diff --git a/src/core/transport/transport_op_string.c b/src/core/transport/transport_op_string.c index f62c340e97f..f9634133104 100644 --- a/src/core/transport/transport_op_string.c +++ b/src/core/transport/transport_op_string.c @@ -45,122 +45,142 @@ /* These routines are here to facilitate debugging - they produce string representations of various transport data structures */ -static void put_metadata(gpr_strvec *b, grpc_mdelem *md) { - gpr_strvec_add(b, gpr_strdup("key=")); - gpr_strvec_add(b, - gpr_dump_slice(md->key->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII)); - - gpr_strvec_add(b, gpr_strdup(" value=")); - gpr_strvec_add( - b, gpr_dump_slice(md->value->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII)); +static void +put_metadata (gpr_strvec * b, grpc_mdelem * md) +{ + gpr_strvec_add (b, gpr_strdup ("key=")); + gpr_strvec_add (b, gpr_dump_slice (md->key->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII)); + + gpr_strvec_add (b, gpr_strdup (" value=")); + gpr_strvec_add (b, gpr_dump_slice (md->value->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII)); } -static void put_metadata_list(gpr_strvec *b, grpc_metadata_batch md) { +static void +put_metadata_list (gpr_strvec * b, grpc_metadata_batch md) +{ grpc_linked_mdelem *m; - for (m = md.list.head; m != NULL; m = m->next) { - if (m != md.list.head) gpr_strvec_add(b, gpr_strdup(", ")); - put_metadata(b, m->md); - } - if (gpr_time_cmp(md.deadline, gpr_inf_future(md.deadline.clock_type)) != 0) { - char *tmp; - gpr_asprintf(&tmp, " deadline=%d.%09d", md.deadline.tv_sec, - md.deadline.tv_nsec); - gpr_strvec_add(b, tmp); - } + for (m = md.list.head; m != NULL; m = m->next) + { + if (m != md.list.head) + gpr_strvec_add (b, gpr_strdup (", ")); + put_metadata (b, m->md); + } + if (gpr_time_cmp (md.deadline, gpr_inf_future (md.deadline.clock_type)) != 0) + { + char *tmp; + gpr_asprintf (&tmp, " deadline=%d.%09d", md.deadline.tv_sec, md.deadline.tv_nsec); + gpr_strvec_add (b, tmp); + } } -char *grpc_sopb_string(grpc_stream_op_buffer *sopb) { +char * +grpc_sopb_string (grpc_stream_op_buffer * sopb) +{ char *out; char *tmp; size_t i; gpr_strvec b; - gpr_strvec_init(&b); - - for (i = 0; i < sopb->nops; i++) { - grpc_stream_op *op = &sopb->ops[i]; - if (i > 0) gpr_strvec_add(&b, gpr_strdup(", ")); - switch (op->type) { - case GRPC_NO_OP: - gpr_strvec_add(&b, gpr_strdup("NO_OP")); - break; - case GRPC_OP_BEGIN_MESSAGE: - gpr_asprintf(&tmp, "BEGIN_MESSAGE:%d", op->data.begin_message.length); - gpr_strvec_add(&b, tmp); - break; - case GRPC_OP_SLICE: - gpr_asprintf(&tmp, "SLICE:%d", GPR_SLICE_LENGTH(op->data.slice)); - gpr_strvec_add(&b, tmp); - break; - case GRPC_OP_METADATA: - gpr_strvec_add(&b, gpr_strdup("METADATA{")); - put_metadata_list(&b, op->data.metadata); - gpr_strvec_add(&b, gpr_strdup("}")); - break; + gpr_strvec_init (&b); + + for (i = 0; i < sopb->nops; i++) + { + grpc_stream_op *op = &sopb->ops[i]; + if (i > 0) + gpr_strvec_add (&b, gpr_strdup (", ")); + switch (op->type) + { + case GRPC_NO_OP: + gpr_strvec_add (&b, gpr_strdup ("NO_OP")); + break; + case GRPC_OP_BEGIN_MESSAGE: + gpr_asprintf (&tmp, "BEGIN_MESSAGE:%d", op->data.begin_message.length); + gpr_strvec_add (&b, tmp); + break; + case GRPC_OP_SLICE: + gpr_asprintf (&tmp, "SLICE:%d", GPR_SLICE_LENGTH (op->data.slice)); + gpr_strvec_add (&b, tmp); + break; + case GRPC_OP_METADATA: + gpr_strvec_add (&b, gpr_strdup ("METADATA{")); + put_metadata_list (&b, op->data.metadata); + gpr_strvec_add (&b, gpr_strdup ("}")); + break; + } } - } - out = gpr_strvec_flatten(&b, NULL); - gpr_strvec_destroy(&b); + out = gpr_strvec_flatten (&b, NULL); + gpr_strvec_destroy (&b); return out; } -char *grpc_transport_stream_op_string(grpc_transport_stream_op *op) { +char * +grpc_transport_stream_op_string (grpc_transport_stream_op * op) +{ char *tmp; char *out; int first = 1; gpr_strvec b; - gpr_strvec_init(&b); - - if (op->send_ops) { - if (!first) gpr_strvec_add(&b, gpr_strdup(" ")); - first = 0; - gpr_asprintf(&tmp, "SEND%s:%p", op->is_last_send ? "_LAST" : "", - op->on_done_send); - gpr_strvec_add(&b, tmp); - gpr_strvec_add(&b, gpr_strdup("[")); - gpr_strvec_add(&b, grpc_sopb_string(op->send_ops)); - gpr_strvec_add(&b, gpr_strdup("]")); - } - - if (op->recv_ops) { - if (!first) gpr_strvec_add(&b, gpr_strdup(" ")); - first = 0; - gpr_asprintf(&tmp, "RECV:%p:max_recv_bytes=%d", op->on_done_recv, - op->max_recv_bytes); - gpr_strvec_add(&b, tmp); - } - - if (op->bind_pollset) { - if (!first) gpr_strvec_add(&b, gpr_strdup(" ")); - first = 0; - gpr_strvec_add(&b, gpr_strdup("BIND")); - } - - if (op->cancel_with_status != GRPC_STATUS_OK) { - if (!first) gpr_strvec_add(&b, gpr_strdup(" ")); - first = 0; - gpr_asprintf(&tmp, "CANCEL:%d", op->cancel_with_status); - gpr_strvec_add(&b, tmp); - } - - if (op->on_consumed != NULL) { - if (!first) gpr_strvec_add(&b, gpr_strdup(" ")); - first = 0; - gpr_asprintf(&tmp, "ON_CONSUMED:%p", op->on_consumed); - gpr_strvec_add(&b, tmp); - } - - out = gpr_strvec_flatten(&b, NULL); - gpr_strvec_destroy(&b); + gpr_strvec_init (&b); + + if (op->send_ops) + { + if (!first) + gpr_strvec_add (&b, gpr_strdup (" ")); + first = 0; + gpr_asprintf (&tmp, "SEND%s:%p", op->is_last_send ? "_LAST" : "", op->on_done_send); + gpr_strvec_add (&b, tmp); + gpr_strvec_add (&b, gpr_strdup ("[")); + gpr_strvec_add (&b, grpc_sopb_string (op->send_ops)); + gpr_strvec_add (&b, gpr_strdup ("]")); + } + + if (op->recv_ops) + { + if (!first) + gpr_strvec_add (&b, gpr_strdup (" ")); + first = 0; + gpr_asprintf (&tmp, "RECV:%p:max_recv_bytes=%d", op->on_done_recv, op->max_recv_bytes); + gpr_strvec_add (&b, tmp); + } + + if (op->bind_pollset) + { + if (!first) + gpr_strvec_add (&b, gpr_strdup (" ")); + first = 0; + gpr_strvec_add (&b, gpr_strdup ("BIND")); + } + + if (op->cancel_with_status != GRPC_STATUS_OK) + { + if (!first) + gpr_strvec_add (&b, gpr_strdup (" ")); + first = 0; + gpr_asprintf (&tmp, "CANCEL:%d", op->cancel_with_status); + gpr_strvec_add (&b, tmp); + } + + if (op->on_consumed != NULL) + { + if (!first) + gpr_strvec_add (&b, gpr_strdup (" ")); + first = 0; + gpr_asprintf (&tmp, "ON_CONSUMED:%p", op->on_consumed); + gpr_strvec_add (&b, tmp); + } + + out = gpr_strvec_flatten (&b, NULL); + gpr_strvec_destroy (&b); return out; } -void grpc_call_log_op(char *file, int line, gpr_log_severity severity, - grpc_call_element *elem, grpc_transport_stream_op *op) { - char *str = grpc_transport_stream_op_string(op); - gpr_log(file, line, severity, "OP[%s:%p]: %s", elem->filter->name, elem, str); - gpr_free(str); +void +grpc_call_log_op (char *file, int line, gpr_log_severity severity, grpc_call_element * elem, grpc_transport_stream_op * op) +{ + char *str = grpc_transport_stream_op_string (op); + gpr_log (file, line, severity, "OP[%s:%p]: %s", elem->filter->name, elem, str); + gpr_free (str); } diff --git a/src/core/tsi/fake_transport_security.c b/src/core/tsi/fake_transport_security.c index b1a975155a7..3a8383d4b02 100644 --- a/src/core/tsi/fake_transport_security.c +++ b/src/core/tsi/fake_transport_security.c @@ -52,15 +52,17 @@ | size | data | where the size field value is the size of the size field plus the size of the data encoded in little endian on 4 bytes. */ -typedef struct { - unsigned char* data; +typedef struct +{ + unsigned char *data; size_t size; size_t allocated_size; size_t offset; int needs_draining; } tsi_fake_frame; -typedef enum { +typedef enum +{ TSI_FAKE_CLIENT_INIT = 0, TSI_FAKE_SERVER_INIT = 1, TSI_FAKE_CLIENT_FINISHED = 2, @@ -68,7 +70,8 @@ typedef enum { TSI_FAKE_HANDSHAKE_MESSAGE_MAX = 4 } tsi_fake_handshake_message; -typedef struct { +typedef struct +{ tsi_handshaker base; int is_client; tsi_fake_handshake_message next_message_to_send; @@ -78,7 +81,8 @@ typedef struct { tsi_result result; } tsi_fake_handshaker; -typedef struct { +typedef struct +{ tsi_frame_protector base; tsi_fake_frame protect_frame; tsi_fake_frame unprotect_frame; @@ -87,441 +91,509 @@ typedef struct { /* --- Utils. ---*/ -static const char* tsi_fake_handshake_message_strings[] = { - "CLIENT_INIT", "SERVER_INIT", "CLIENT_FINISHED", "SERVER_FINISHED"}; +static const char *tsi_fake_handshake_message_strings[] = { + "CLIENT_INIT", "SERVER_INIT", "CLIENT_FINISHED", "SERVER_FINISHED" +}; -static const char* tsi_fake_handshake_message_to_string(int msg) { - if (msg < 0 || msg >= TSI_FAKE_HANDSHAKE_MESSAGE_MAX) { - gpr_log(GPR_ERROR, "Invalid message %d", msg); - return "UNKNOWN"; - } +static const char * +tsi_fake_handshake_message_to_string (int msg) +{ + if (msg < 0 || msg >= TSI_FAKE_HANDSHAKE_MESSAGE_MAX) + { + gpr_log (GPR_ERROR, "Invalid message %d", msg); + return "UNKNOWN"; + } return tsi_fake_handshake_message_strings[msg]; } -static tsi_result tsi_fake_handshake_message_from_string( - const char* msg_string, tsi_fake_handshake_message* msg) { +static tsi_result +tsi_fake_handshake_message_from_string (const char *msg_string, tsi_fake_handshake_message * msg) +{ tsi_fake_handshake_message i; - for (i = 0; i < TSI_FAKE_HANDSHAKE_MESSAGE_MAX; i++) { - if (strncmp(msg_string, tsi_fake_handshake_message_strings[i], - strlen(tsi_fake_handshake_message_strings[i])) == 0) { - *msg = i; - return TSI_OK; + for (i = 0; i < TSI_FAKE_HANDSHAKE_MESSAGE_MAX; i++) + { + if (strncmp (msg_string, tsi_fake_handshake_message_strings[i], strlen (tsi_fake_handshake_message_strings[i])) == 0) + { + *msg = i; + return TSI_OK; + } } - } - gpr_log(GPR_ERROR, "Invalid handshake message."); + gpr_log (GPR_ERROR, "Invalid handshake message."); return TSI_DATA_CORRUPTED; } -static gpr_uint32 load32_little_endian(const unsigned char* buf) { - return ((gpr_uint32)(buf[0]) | (gpr_uint32)(buf[1] << 8) | - (gpr_uint32)(buf[2] << 16) | (gpr_uint32)(buf[3] << 24)); +static gpr_uint32 +load32_little_endian (const unsigned char *buf) +{ + return ((gpr_uint32) (buf[0]) | (gpr_uint32) (buf[1] << 8) | (gpr_uint32) (buf[2] << 16) | (gpr_uint32) (buf[3] << 24)); } -static void store32_little_endian(gpr_uint32 value, unsigned char* buf) { - buf[3] = (unsigned char)(value >> 24) & 0xFF; - buf[2] = (unsigned char)(value >> 16) & 0xFF; - buf[1] = (unsigned char)(value >> 8) & 0xFF; - buf[0] = (unsigned char)(value)&0xFF; +static void +store32_little_endian (gpr_uint32 value, unsigned char *buf) +{ + buf[3] = (unsigned char) (value >> 24) & 0xFF; + buf[2] = (unsigned char) (value >> 16) & 0xFF; + buf[1] = (unsigned char) (value >> 8) & 0xFF; + buf[0] = (unsigned char) (value) & 0xFF; } -static void tsi_fake_frame_reset(tsi_fake_frame* frame, int needs_draining) { +static void +tsi_fake_frame_reset (tsi_fake_frame * frame, int needs_draining) +{ frame->offset = 0; frame->needs_draining = needs_draining; - if (!needs_draining) frame->size = 0; + if (!needs_draining) + frame->size = 0; } /* Returns 1 if successful, 0 otherwise. */ -static int tsi_fake_frame_ensure_size(tsi_fake_frame* frame) { - if (frame->data == NULL) { - frame->allocated_size = frame->size; - frame->data = malloc(frame->allocated_size); - if (frame->data == NULL) return 0; - } else if (frame->size > frame->allocated_size) { - unsigned char* new_data = realloc(frame->data, frame->size); - if (new_data == NULL) { - free(frame->data); - frame->data = NULL; - return 0; +static int +tsi_fake_frame_ensure_size (tsi_fake_frame * frame) +{ + if (frame->data == NULL) + { + frame->allocated_size = frame->size; + frame->data = malloc (frame->allocated_size); + if (frame->data == NULL) + return 0; + } + else if (frame->size > frame->allocated_size) + { + unsigned char *new_data = realloc (frame->data, frame->size); + if (new_data == NULL) + { + free (frame->data); + frame->data = NULL; + return 0; + } + frame->data = new_data; + frame->allocated_size = frame->size; } - frame->data = new_data; - frame->allocated_size = frame->size; - } return 1; } /* This method should not be called if frame->needs_framing is not 0. */ -static tsi_result fill_frame_from_bytes(const unsigned char* incoming_bytes, - size_t* incoming_bytes_size, - tsi_fake_frame* frame) { +static tsi_result +fill_frame_from_bytes (const unsigned char *incoming_bytes, size_t * incoming_bytes_size, tsi_fake_frame * frame) +{ size_t available_size = *incoming_bytes_size; size_t to_read_size = 0; - const unsigned char* bytes_cursor = incoming_bytes; - - if (frame->needs_draining) return TSI_INTERNAL_ERROR; - if (frame->data == NULL) { - frame->allocated_size = TSI_FAKE_FRAME_INITIAL_ALLOCATED_SIZE; - frame->data = malloc(frame->allocated_size); - if (frame->data == NULL) return TSI_OUT_OF_RESOURCES; - } - - if (frame->offset < TSI_FAKE_FRAME_HEADER_SIZE) { - to_read_size = TSI_FAKE_FRAME_HEADER_SIZE - frame->offset; - if (to_read_size > available_size) { - /* Just fill what we can and exit. */ - memcpy(frame->data + frame->offset, bytes_cursor, available_size); - bytes_cursor += available_size; - frame->offset += available_size; - *incoming_bytes_size = (size_t)(bytes_cursor - incoming_bytes); - return TSI_INCOMPLETE_DATA; + const unsigned char *bytes_cursor = incoming_bytes; + + if (frame->needs_draining) + return TSI_INTERNAL_ERROR; + if (frame->data == NULL) + { + frame->allocated_size = TSI_FAKE_FRAME_INITIAL_ALLOCATED_SIZE; + frame->data = malloc (frame->allocated_size); + if (frame->data == NULL) + return TSI_OUT_OF_RESOURCES; + } + + if (frame->offset < TSI_FAKE_FRAME_HEADER_SIZE) + { + to_read_size = TSI_FAKE_FRAME_HEADER_SIZE - frame->offset; + if (to_read_size > available_size) + { + /* Just fill what we can and exit. */ + memcpy (frame->data + frame->offset, bytes_cursor, available_size); + bytes_cursor += available_size; + frame->offset += available_size; + *incoming_bytes_size = (size_t) (bytes_cursor - incoming_bytes); + return TSI_INCOMPLETE_DATA; + } + memcpy (frame->data + frame->offset, bytes_cursor, to_read_size); + bytes_cursor += to_read_size; + frame->offset += to_read_size; + available_size -= to_read_size; + frame->size = load32_little_endian (frame->data); + if (!tsi_fake_frame_ensure_size (frame)) + return TSI_OUT_OF_RESOURCES; } - memcpy(frame->data + frame->offset, bytes_cursor, to_read_size); - bytes_cursor += to_read_size; - frame->offset += to_read_size; - available_size -= to_read_size; - frame->size = load32_little_endian(frame->data); - if (!tsi_fake_frame_ensure_size(frame)) return TSI_OUT_OF_RESOURCES; - } to_read_size = frame->size - frame->offset; - if (to_read_size > available_size) { - memcpy(frame->data + frame->offset, bytes_cursor, available_size); - frame->offset += available_size; - bytes_cursor += available_size; - *incoming_bytes_size = (size_t)(bytes_cursor - incoming_bytes); - return TSI_INCOMPLETE_DATA; - } - memcpy(frame->data + frame->offset, bytes_cursor, to_read_size); + if (to_read_size > available_size) + { + memcpy (frame->data + frame->offset, bytes_cursor, available_size); + frame->offset += available_size; + bytes_cursor += available_size; + *incoming_bytes_size = (size_t) (bytes_cursor - incoming_bytes); + return TSI_INCOMPLETE_DATA; + } + memcpy (frame->data + frame->offset, bytes_cursor, to_read_size); bytes_cursor += to_read_size; - *incoming_bytes_size = (size_t)(bytes_cursor - incoming_bytes); - tsi_fake_frame_reset(frame, 1 /* needs_draining */); + *incoming_bytes_size = (size_t) (bytes_cursor - incoming_bytes); + tsi_fake_frame_reset (frame, 1 /* needs_draining */ ); return TSI_OK; } /* This method should not be called if frame->needs_framing is 0. */ -static tsi_result drain_frame_to_bytes(unsigned char* outgoing_bytes, - size_t* outgoing_bytes_size, - tsi_fake_frame* frame) { +static tsi_result +drain_frame_to_bytes (unsigned char *outgoing_bytes, size_t * outgoing_bytes_size, tsi_fake_frame * frame) +{ size_t to_write_size = frame->size - frame->offset; - if (!frame->needs_draining) return TSI_INTERNAL_ERROR; - if (*outgoing_bytes_size < to_write_size) { - memcpy(outgoing_bytes, frame->data + frame->offset, *outgoing_bytes_size); - frame->offset += *outgoing_bytes_size; - return TSI_INCOMPLETE_DATA; - } - memcpy(outgoing_bytes, frame->data + frame->offset, to_write_size); + if (!frame->needs_draining) + return TSI_INTERNAL_ERROR; + if (*outgoing_bytes_size < to_write_size) + { + memcpy (outgoing_bytes, frame->data + frame->offset, *outgoing_bytes_size); + frame->offset += *outgoing_bytes_size; + return TSI_INCOMPLETE_DATA; + } + memcpy (outgoing_bytes, frame->data + frame->offset, to_write_size); *outgoing_bytes_size = to_write_size; - tsi_fake_frame_reset(frame, 0 /* needs_draining */); + tsi_fake_frame_reset (frame, 0 /* needs_draining */ ); return TSI_OK; } -static tsi_result bytes_to_frame(unsigned char* bytes, size_t bytes_size, - tsi_fake_frame* frame) { +static tsi_result +bytes_to_frame (unsigned char *bytes, size_t bytes_size, tsi_fake_frame * frame) +{ frame->offset = 0; frame->size = bytes_size + TSI_FAKE_FRAME_HEADER_SIZE; - if (!tsi_fake_frame_ensure_size(frame)) return TSI_OUT_OF_RESOURCES; - store32_little_endian((gpr_uint32)frame->size, frame->data); - memcpy(frame->data + TSI_FAKE_FRAME_HEADER_SIZE, bytes, bytes_size); - tsi_fake_frame_reset(frame, 1 /* needs draining */); + if (!tsi_fake_frame_ensure_size (frame)) + return TSI_OUT_OF_RESOURCES; + store32_little_endian ((gpr_uint32) frame->size, frame->data); + memcpy (frame->data + TSI_FAKE_FRAME_HEADER_SIZE, bytes, bytes_size); + tsi_fake_frame_reset (frame, 1 /* needs draining */ ); return TSI_OK; } -static void tsi_fake_frame_destruct(tsi_fake_frame* frame) { - if (frame->data != NULL) free(frame->data); +static void +tsi_fake_frame_destruct (tsi_fake_frame * frame) +{ + if (frame->data != NULL) + free (frame->data); } /* --- tsi_frame_protector methods implementation. ---*/ -static tsi_result fake_protector_protect(tsi_frame_protector* self, - const unsigned char* unprotected_bytes, - size_t* unprotected_bytes_size, - unsigned char* protected_output_frames, - size_t* protected_output_frames_size) { +static tsi_result +fake_protector_protect (tsi_frame_protector * self, const unsigned char *unprotected_bytes, size_t * unprotected_bytes_size, unsigned char *protected_output_frames, size_t * protected_output_frames_size) +{ tsi_result result = TSI_OK; - tsi_fake_frame_protector* impl = (tsi_fake_frame_protector*)self; + tsi_fake_frame_protector *impl = (tsi_fake_frame_protector *) self; unsigned char frame_header[TSI_FAKE_FRAME_HEADER_SIZE]; - tsi_fake_frame* frame = &impl->protect_frame; + tsi_fake_frame *frame = &impl->protect_frame; size_t saved_output_size = *protected_output_frames_size; size_t drained_size = 0; - size_t* num_bytes_written = protected_output_frames_size; + size_t *num_bytes_written = protected_output_frames_size; *num_bytes_written = 0; /* Try to drain first. */ - if (frame->needs_draining) { - drained_size = saved_output_size - *num_bytes_written; - result = - drain_frame_to_bytes(protected_output_frames, &drained_size, frame); - *num_bytes_written += drained_size; - protected_output_frames += drained_size; - if (result != TSI_OK) { - if (result == TSI_INCOMPLETE_DATA) { - *unprotected_bytes_size = 0; - result = TSI_OK; - } - return result; + if (frame->needs_draining) + { + drained_size = saved_output_size - *num_bytes_written; + result = drain_frame_to_bytes (protected_output_frames, &drained_size, frame); + *num_bytes_written += drained_size; + protected_output_frames += drained_size; + if (result != TSI_OK) + { + if (result == TSI_INCOMPLETE_DATA) + { + *unprotected_bytes_size = 0; + result = TSI_OK; + } + return result; + } } - } /* Now process the unprotected_bytes. */ - if (frame->needs_draining) return TSI_INTERNAL_ERROR; - if (frame->size == 0) { - /* New frame, create a header. */ - size_t written_in_frame_size = 0; - store32_little_endian((gpr_uint32)impl->max_frame_size, frame_header); - written_in_frame_size = TSI_FAKE_FRAME_HEADER_SIZE; - result = fill_frame_from_bytes(frame_header, &written_in_frame_size, frame); - if (result != TSI_INCOMPLETE_DATA) { - gpr_log(GPR_ERROR, "fill_frame_from_bytes returned %s", - tsi_result_to_string(result)); + if (frame->needs_draining) + return TSI_INTERNAL_ERROR; + if (frame->size == 0) + { + /* New frame, create a header. */ + size_t written_in_frame_size = 0; + store32_little_endian ((gpr_uint32) impl->max_frame_size, frame_header); + written_in_frame_size = TSI_FAKE_FRAME_HEADER_SIZE; + result = fill_frame_from_bytes (frame_header, &written_in_frame_size, frame); + if (result != TSI_INCOMPLETE_DATA) + { + gpr_log (GPR_ERROR, "fill_frame_from_bytes returned %s", tsi_result_to_string (result)); + return result; + } + } + result = fill_frame_from_bytes (unprotected_bytes, unprotected_bytes_size, frame); + if (result != TSI_OK) + { + if (result == TSI_INCOMPLETE_DATA) + result = TSI_OK; return result; } - } - result = - fill_frame_from_bytes(unprotected_bytes, unprotected_bytes_size, frame); - if (result != TSI_OK) { - if (result == TSI_INCOMPLETE_DATA) result = TSI_OK; - return result; - } /* Try to drain again. */ - if (!frame->needs_draining) return TSI_INTERNAL_ERROR; - if (frame->offset != 0) return TSI_INTERNAL_ERROR; + if (!frame->needs_draining) + return TSI_INTERNAL_ERROR; + if (frame->offset != 0) + return TSI_INTERNAL_ERROR; drained_size = saved_output_size - *num_bytes_written; - result = drain_frame_to_bytes(protected_output_frames, &drained_size, frame); + result = drain_frame_to_bytes (protected_output_frames, &drained_size, frame); *num_bytes_written += drained_size; - if (result == TSI_INCOMPLETE_DATA) result = TSI_OK; + if (result == TSI_INCOMPLETE_DATA) + result = TSI_OK; return result; } -static tsi_result fake_protector_protect_flush( - tsi_frame_protector* self, unsigned char* protected_output_frames, - size_t* protected_output_frames_size, size_t* still_pending_size) { +static tsi_result +fake_protector_protect_flush (tsi_frame_protector * self, unsigned char *protected_output_frames, size_t * protected_output_frames_size, size_t * still_pending_size) +{ tsi_result result = TSI_OK; - tsi_fake_frame_protector* impl = (tsi_fake_frame_protector*)self; - tsi_fake_frame* frame = &impl->protect_frame; - if (!frame->needs_draining) { - /* Create a short frame. */ - frame->size = frame->offset; - frame->offset = 0; - frame->needs_draining = 1; - store32_little_endian((gpr_uint32)frame->size, - frame->data); /* Overwrite header. */ - } - result = drain_frame_to_bytes(protected_output_frames, - protected_output_frames_size, frame); - if (result == TSI_INCOMPLETE_DATA) result = TSI_OK; + tsi_fake_frame_protector *impl = (tsi_fake_frame_protector *) self; + tsi_fake_frame *frame = &impl->protect_frame; + if (!frame->needs_draining) + { + /* Create a short frame. */ + frame->size = frame->offset; + frame->offset = 0; + frame->needs_draining = 1; + store32_little_endian ((gpr_uint32) frame->size, frame->data); /* Overwrite header. */ + } + result = drain_frame_to_bytes (protected_output_frames, protected_output_frames_size, frame); + if (result == TSI_INCOMPLETE_DATA) + result = TSI_OK; *still_pending_size = frame->size - frame->offset; return result; } -static tsi_result fake_protector_unprotect( - tsi_frame_protector* self, const unsigned char* protected_frames_bytes, - size_t* protected_frames_bytes_size, unsigned char* unprotected_bytes, - size_t* unprotected_bytes_size) { +static tsi_result +fake_protector_unprotect (tsi_frame_protector * self, const unsigned char *protected_frames_bytes, size_t * protected_frames_bytes_size, unsigned char *unprotected_bytes, size_t * unprotected_bytes_size) +{ tsi_result result = TSI_OK; - tsi_fake_frame_protector* impl = (tsi_fake_frame_protector*)self; - tsi_fake_frame* frame = &impl->unprotect_frame; + tsi_fake_frame_protector *impl = (tsi_fake_frame_protector *) self; + tsi_fake_frame *frame = &impl->unprotect_frame; size_t saved_output_size = *unprotected_bytes_size; size_t drained_size = 0; - size_t* num_bytes_written = unprotected_bytes_size; + size_t *num_bytes_written = unprotected_bytes_size; *num_bytes_written = 0; /* Try to drain first. */ - if (frame->needs_draining) { - /* Go past the header if needed. */ - if (frame->offset == 0) frame->offset = TSI_FAKE_FRAME_HEADER_SIZE; - drained_size = saved_output_size - *num_bytes_written; - result = drain_frame_to_bytes(unprotected_bytes, &drained_size, frame); - unprotected_bytes += drained_size; - *num_bytes_written += drained_size; - if (result != TSI_OK) { - if (result == TSI_INCOMPLETE_DATA) { - *protected_frames_bytes_size = 0; - result = TSI_OK; - } - return result; + if (frame->needs_draining) + { + /* Go past the header if needed. */ + if (frame->offset == 0) + frame->offset = TSI_FAKE_FRAME_HEADER_SIZE; + drained_size = saved_output_size - *num_bytes_written; + result = drain_frame_to_bytes (unprotected_bytes, &drained_size, frame); + unprotected_bytes += drained_size; + *num_bytes_written += drained_size; + if (result != TSI_OK) + { + if (result == TSI_INCOMPLETE_DATA) + { + *protected_frames_bytes_size = 0; + result = TSI_OK; + } + return result; + } } - } /* Now process the protected_bytes. */ - if (frame->needs_draining) return TSI_INTERNAL_ERROR; - result = fill_frame_from_bytes(protected_frames_bytes, - protected_frames_bytes_size, frame); - if (result != TSI_OK) { - if (result == TSI_INCOMPLETE_DATA) result = TSI_OK; - return result; - } + if (frame->needs_draining) + return TSI_INTERNAL_ERROR; + result = fill_frame_from_bytes (protected_frames_bytes, protected_frames_bytes_size, frame); + if (result != TSI_OK) + { + if (result == TSI_INCOMPLETE_DATA) + result = TSI_OK; + return result; + } /* Try to drain again. */ - if (!frame->needs_draining) return TSI_INTERNAL_ERROR; - if (frame->offset != 0) return TSI_INTERNAL_ERROR; - frame->offset = TSI_FAKE_FRAME_HEADER_SIZE; /* Go past the header. */ + if (!frame->needs_draining) + return TSI_INTERNAL_ERROR; + if (frame->offset != 0) + return TSI_INTERNAL_ERROR; + frame->offset = TSI_FAKE_FRAME_HEADER_SIZE; /* Go past the header. */ drained_size = saved_output_size - *num_bytes_written; - result = drain_frame_to_bytes(unprotected_bytes, &drained_size, frame); + result = drain_frame_to_bytes (unprotected_bytes, &drained_size, frame); *num_bytes_written += drained_size; - if (result == TSI_INCOMPLETE_DATA) result = TSI_OK; + if (result == TSI_INCOMPLETE_DATA) + result = TSI_OK; return result; } -static void fake_protector_destroy(tsi_frame_protector* self) { - tsi_fake_frame_protector* impl = (tsi_fake_frame_protector*)self; - tsi_fake_frame_destruct(&impl->protect_frame); - tsi_fake_frame_destruct(&impl->unprotect_frame); - free(self); +static void +fake_protector_destroy (tsi_frame_protector * self) +{ + tsi_fake_frame_protector *impl = (tsi_fake_frame_protector *) self; + tsi_fake_frame_destruct (&impl->protect_frame); + tsi_fake_frame_destruct (&impl->unprotect_frame); + free (self); } static const tsi_frame_protector_vtable frame_protector_vtable = { - fake_protector_protect, fake_protector_protect_flush, - fake_protector_unprotect, fake_protector_destroy, + fake_protector_protect, fake_protector_protect_flush, + fake_protector_unprotect, fake_protector_destroy, }; /* --- tsi_handshaker methods implementation. ---*/ -static tsi_result fake_handshaker_get_bytes_to_send_to_peer( - tsi_handshaker* self, unsigned char* bytes, size_t* bytes_size) { - tsi_fake_handshaker* impl = (tsi_fake_handshaker*)self; +static tsi_result +fake_handshaker_get_bytes_to_send_to_peer (tsi_handshaker * self, unsigned char *bytes, size_t * bytes_size) +{ + tsi_fake_handshaker *impl = (tsi_fake_handshaker *) self; tsi_result result = TSI_OK; - if (impl->needs_incoming_message || impl->result == TSI_OK) { - *bytes_size = 0; - return TSI_OK; - } - if (!impl->outgoing.needs_draining) { - tsi_fake_handshake_message next_message_to_send = - impl->next_message_to_send + 2; - const char* msg_string = - tsi_fake_handshake_message_to_string(impl->next_message_to_send); - result = bytes_to_frame((unsigned char*)msg_string, strlen(msg_string), - &impl->outgoing); - if (result != TSI_OK) return result; - if (next_message_to_send > TSI_FAKE_HANDSHAKE_MESSAGE_MAX) { - next_message_to_send = TSI_FAKE_HANDSHAKE_MESSAGE_MAX; + if (impl->needs_incoming_message || impl->result == TSI_OK) + { + *bytes_size = 0; + return TSI_OK; } - if (tsi_tracing_enabled) { - gpr_log(GPR_INFO, "%s prepared %s.", - impl->is_client ? "Client" : "Server", - tsi_fake_handshake_message_to_string(impl->next_message_to_send)); + if (!impl->outgoing.needs_draining) + { + tsi_fake_handshake_message next_message_to_send = impl->next_message_to_send + 2; + const char *msg_string = tsi_fake_handshake_message_to_string (impl->next_message_to_send); + result = bytes_to_frame ((unsigned char *) msg_string, strlen (msg_string), &impl->outgoing); + if (result != TSI_OK) + return result; + if (next_message_to_send > TSI_FAKE_HANDSHAKE_MESSAGE_MAX) + { + next_message_to_send = TSI_FAKE_HANDSHAKE_MESSAGE_MAX; + } + if (tsi_tracing_enabled) + { + gpr_log (GPR_INFO, "%s prepared %s.", impl->is_client ? "Client" : "Server", tsi_fake_handshake_message_to_string (impl->next_message_to_send)); + } + impl->next_message_to_send = next_message_to_send; } - impl->next_message_to_send = next_message_to_send; - } - result = drain_frame_to_bytes(bytes, bytes_size, &impl->outgoing); - if (result != TSI_OK) return result; - if (!impl->is_client && - impl->next_message_to_send == TSI_FAKE_HANDSHAKE_MESSAGE_MAX) { - /* We're done. */ - if (tsi_tracing_enabled) { - gpr_log(GPR_INFO, "Server is done."); + result = drain_frame_to_bytes (bytes, bytes_size, &impl->outgoing); + if (result != TSI_OK) + return result; + if (!impl->is_client && impl->next_message_to_send == TSI_FAKE_HANDSHAKE_MESSAGE_MAX) + { + /* We're done. */ + if (tsi_tracing_enabled) + { + gpr_log (GPR_INFO, "Server is done."); + } + impl->result = TSI_OK; + } + else + { + impl->needs_incoming_message = 1; } - impl->result = TSI_OK; - } else { - impl->needs_incoming_message = 1; - } return TSI_OK; } -static tsi_result fake_handshaker_process_bytes_from_peer( - tsi_handshaker* self, const unsigned char* bytes, size_t* bytes_size) { +static tsi_result +fake_handshaker_process_bytes_from_peer (tsi_handshaker * self, const unsigned char *bytes, size_t * bytes_size) +{ tsi_result result = TSI_OK; - tsi_fake_handshaker* impl = (tsi_fake_handshaker*)self; + tsi_fake_handshaker *impl = (tsi_fake_handshaker *) self; tsi_fake_handshake_message expected_msg = impl->next_message_to_send - 1; tsi_fake_handshake_message received_msg; - if (!impl->needs_incoming_message || impl->result == TSI_OK) { - *bytes_size = 0; - return TSI_OK; - } - result = fill_frame_from_bytes(bytes, bytes_size, &impl->incoming); - if (result != TSI_OK) return result; + if (!impl->needs_incoming_message || impl->result == TSI_OK) + { + *bytes_size = 0; + return TSI_OK; + } + result = fill_frame_from_bytes (bytes, bytes_size, &impl->incoming); + if (result != TSI_OK) + return result; /* We now have a complete frame. */ - result = tsi_fake_handshake_message_from_string( - (const char*)impl->incoming.data + TSI_FAKE_FRAME_HEADER_SIZE, - &received_msg); - if (result != TSI_OK) { - impl->result = result; - return result; - } - if (received_msg != expected_msg) { - gpr_log(GPR_ERROR, "Invalid received message (%s instead of %s)", - tsi_fake_handshake_message_to_string(received_msg), - tsi_fake_handshake_message_to_string(expected_msg)); - } - if (tsi_tracing_enabled) { - gpr_log(GPR_INFO, "%s received %s.", impl->is_client ? "Client" : "Server", - tsi_fake_handshake_message_to_string(received_msg)); - } - tsi_fake_frame_reset(&impl->incoming, 0 /* needs_draining */); + result = tsi_fake_handshake_message_from_string ((const char *) impl->incoming.data + TSI_FAKE_FRAME_HEADER_SIZE, &received_msg); + if (result != TSI_OK) + { + impl->result = result; + return result; + } + if (received_msg != expected_msg) + { + gpr_log (GPR_ERROR, "Invalid received message (%s instead of %s)", tsi_fake_handshake_message_to_string (received_msg), tsi_fake_handshake_message_to_string (expected_msg)); + } + if (tsi_tracing_enabled) + { + gpr_log (GPR_INFO, "%s received %s.", impl->is_client ? "Client" : "Server", tsi_fake_handshake_message_to_string (received_msg)); + } + tsi_fake_frame_reset (&impl->incoming, 0 /* needs_draining */ ); impl->needs_incoming_message = 0; - if (impl->next_message_to_send == TSI_FAKE_HANDSHAKE_MESSAGE_MAX) { - /* We're done. */ - if (tsi_tracing_enabled) { - gpr_log(GPR_INFO, "%s is done.", impl->is_client ? "Client" : "Server"); + if (impl->next_message_to_send == TSI_FAKE_HANDSHAKE_MESSAGE_MAX) + { + /* We're done. */ + if (tsi_tracing_enabled) + { + gpr_log (GPR_INFO, "%s is done.", impl->is_client ? "Client" : "Server"); + } + impl->result = TSI_OK; } - impl->result = TSI_OK; - } return TSI_OK; } -static tsi_result fake_handshaker_get_result(tsi_handshaker* self) { - tsi_fake_handshaker* impl = (tsi_fake_handshaker*)self; +static tsi_result +fake_handshaker_get_result (tsi_handshaker * self) +{ + tsi_fake_handshaker *impl = (tsi_fake_handshaker *) self; return impl->result; } -static tsi_result fake_handshaker_extract_peer(tsi_handshaker* self, - tsi_peer* peer) { - tsi_result result = tsi_construct_peer(1, peer); - if (result != TSI_OK) return result; - result = tsi_construct_string_peer_property_from_cstring( - TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_FAKE_CERTIFICATE_TYPE, - &peer->properties[0]); - if (result != TSI_OK) tsi_peer_destruct(peer); +static tsi_result +fake_handshaker_extract_peer (tsi_handshaker * self, tsi_peer * peer) +{ + tsi_result result = tsi_construct_peer (1, peer); + if (result != TSI_OK) + return result; + result = tsi_construct_string_peer_property_from_cstring (TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_FAKE_CERTIFICATE_TYPE, &peer->properties[0]); + if (result != TSI_OK) + tsi_peer_destruct (peer); return result; } -static tsi_result fake_handshaker_create_frame_protector( - tsi_handshaker* self, size_t* max_protected_frame_size, - tsi_frame_protector** protector) { - *protector = tsi_create_fake_protector(max_protected_frame_size); - if (*protector == NULL) return TSI_OUT_OF_RESOURCES; +static tsi_result +fake_handshaker_create_frame_protector (tsi_handshaker * self, size_t * max_protected_frame_size, tsi_frame_protector ** protector) +{ + *protector = tsi_create_fake_protector (max_protected_frame_size); + if (*protector == NULL) + return TSI_OUT_OF_RESOURCES; return TSI_OK; } -static void fake_handshaker_destroy(tsi_handshaker* self) { - tsi_fake_handshaker* impl = (tsi_fake_handshaker*)self; - tsi_fake_frame_destruct(&impl->incoming); - tsi_fake_frame_destruct(&impl->outgoing); - free(self); +static void +fake_handshaker_destroy (tsi_handshaker * self) +{ + tsi_fake_handshaker *impl = (tsi_fake_handshaker *) self; + tsi_fake_frame_destruct (&impl->incoming); + tsi_fake_frame_destruct (&impl->outgoing); + free (self); } static const tsi_handshaker_vtable handshaker_vtable = { - fake_handshaker_get_bytes_to_send_to_peer, - fake_handshaker_process_bytes_from_peer, - fake_handshaker_get_result, - fake_handshaker_extract_peer, - fake_handshaker_create_frame_protector, - fake_handshaker_destroy, + fake_handshaker_get_bytes_to_send_to_peer, + fake_handshaker_process_bytes_from_peer, + fake_handshaker_get_result, + fake_handshaker_extract_peer, + fake_handshaker_create_frame_protector, + fake_handshaker_destroy, }; -tsi_handshaker* tsi_create_fake_handshaker(int is_client) { - tsi_fake_handshaker* impl = calloc(1, sizeof(tsi_fake_handshaker)); +tsi_handshaker * +tsi_create_fake_handshaker (int is_client) +{ + tsi_fake_handshaker *impl = calloc (1, sizeof (tsi_fake_handshaker)); impl->base.vtable = &handshaker_vtable; impl->is_client = is_client; impl->result = TSI_HANDSHAKE_IN_PROGRESS; - if (is_client) { - impl->needs_incoming_message = 0; - impl->next_message_to_send = TSI_FAKE_CLIENT_INIT; - } else { - impl->needs_incoming_message = 1; - impl->next_message_to_send = TSI_FAKE_SERVER_INIT; - } + if (is_client) + { + impl->needs_incoming_message = 0; + impl->next_message_to_send = TSI_FAKE_CLIENT_INIT; + } + else + { + impl->needs_incoming_message = 1; + impl->next_message_to_send = TSI_FAKE_SERVER_INIT; + } return &impl->base; } -tsi_frame_protector* tsi_create_fake_protector( - size_t* max_protected_frame_size) { - tsi_fake_frame_protector* impl = calloc(1, sizeof(tsi_fake_frame_protector)); - if (impl == NULL) return NULL; - impl->max_frame_size = (max_protected_frame_size == NULL) - ? TSI_FAKE_DEFAULT_FRAME_SIZE - : *max_protected_frame_size; +tsi_frame_protector * +tsi_create_fake_protector (size_t * max_protected_frame_size) +{ + tsi_fake_frame_protector *impl = calloc (1, sizeof (tsi_fake_frame_protector)); + if (impl == NULL) + return NULL; + impl->max_frame_size = (max_protected_frame_size == NULL) ? TSI_FAKE_DEFAULT_FRAME_SIZE : *max_protected_frame_size; impl->base.vtable = &frame_protector_vtable; return &impl->base; } diff --git a/src/core/tsi/fake_transport_security.h b/src/core/tsi/fake_transport_security.h index 1fa11349fb3..27b4008c94f 100644 --- a/src/core/tsi/fake_transport_security.h +++ b/src/core/tsi/fake_transport_security.h @@ -37,7 +37,8 @@ #include "src/core/tsi/transport_security_interface.h" #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif /* Value for the TSI_CERTIFICATE_TYPE_PEER_PROPERTY property for FAKE certs. */ @@ -48,14 +49,13 @@ extern "C" { No cryptography is performed in these objects. They just simulate handshake messages going back and forth for the handshaker and do some framing on cleartext data for the protector. */ -tsi_handshaker* tsi_create_fake_handshaker(int is_client); + tsi_handshaker *tsi_create_fake_handshaker (int is_client); /* Creates a protector directly without going through the handshake phase. */ -tsi_frame_protector* tsi_create_fake_protector( - size_t* max_protected_frame_size); + tsi_frame_protector *tsi_create_fake_protector (size_t * max_protected_frame_size); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_TSI_FAKE_TRANSPORT_SECURITY_H */ +#endif /* GRPC_INTERNAL_CORE_TSI_FAKE_TRANSPORT_SECURITY_H */ diff --git a/src/core/tsi/ssl_transport_security.c b/src/core/tsi/ssl_transport_security.c index 99ce7ecadf6..a4e3503a963 100644 --- a/src/core/tsi/ssl_transport_security.c +++ b/src/core/tsi/ssl_transport_security.c @@ -43,7 +43,7 @@ #include "src/core/tsi/transport_security.h" #include -#include /* For OPENSSL_free */ +#include /* For OPENSSL_free */ #include #include #include @@ -67,47 +67,50 @@ /* --- Structure definitions. ---*/ -struct tsi_ssl_handshaker_factory { - tsi_result (*create_handshaker)(tsi_ssl_handshaker_factory* self, - const char* server_name_indication, - tsi_handshaker** handshaker); - void (*destroy)(tsi_ssl_handshaker_factory* self); +struct tsi_ssl_handshaker_factory +{ + tsi_result (*create_handshaker) (tsi_ssl_handshaker_factory * self, const char *server_name_indication, tsi_handshaker ** handshaker); + void (*destroy) (tsi_ssl_handshaker_factory * self); }; -typedef struct { +typedef struct +{ tsi_ssl_handshaker_factory base; - SSL_CTX* ssl_context; - unsigned char* alpn_protocol_list; + SSL_CTX *ssl_context; + unsigned char *alpn_protocol_list; size_t alpn_protocol_list_length; } tsi_ssl_client_handshaker_factory; -typedef struct { +typedef struct +{ tsi_ssl_handshaker_factory base; /* Several contexts to support SNI. The tsi_peer array contains the subject names of the server certificates associated with the contexts at the same index. */ - SSL_CTX** ssl_contexts; - tsi_peer* ssl_context_x509_subject_names; + SSL_CTX **ssl_contexts; + tsi_peer *ssl_context_x509_subject_names; size_t ssl_context_count; - unsigned char* alpn_protocol_list; + unsigned char *alpn_protocol_list; size_t alpn_protocol_list_length; } tsi_ssl_server_handshaker_factory; -typedef struct { +typedef struct +{ tsi_handshaker base; - SSL* ssl; - BIO* into_ssl; - BIO* from_ssl; + SSL *ssl; + BIO *into_ssl; + BIO *from_ssl; tsi_result result; } tsi_ssl_handshaker; -typedef struct { +typedef struct +{ tsi_frame_protector base; - SSL* ssl; - BIO* into_ssl; - BIO* from_ssl; - unsigned char* buffer; + SSL *ssl; + BIO *into_ssl; + BIO *from_ssl; + unsigned char *buffer; size_t buffer_size; size_t buffer_offset; } tsi_ssl_frame_protector; @@ -115,41 +118,54 @@ typedef struct { /* --- Library Initialization. ---*/ static gpr_once init_openssl_once = GPR_ONCE_INIT; -static gpr_mu* openssl_mutexes = NULL; - -static void openssl_locking_cb(int mode, int type, const char* file, int line) { - if (mode & CRYPTO_LOCK) { - gpr_mu_lock(&openssl_mutexes[type]); - } else { - gpr_mu_unlock(&openssl_mutexes[type]); - } +static gpr_mu *openssl_mutexes = NULL; + +static void +openssl_locking_cb (int mode, int type, const char *file, int line) +{ + if (mode & CRYPTO_LOCK) + { + gpr_mu_lock (&openssl_mutexes[type]); + } + else + { + gpr_mu_unlock (&openssl_mutexes[type]); + } } -static unsigned long openssl_thread_id_cb(void) { - return (unsigned long)gpr_thd_currentid(); +static unsigned long +openssl_thread_id_cb (void) +{ + return (unsigned long) gpr_thd_currentid (); } -static void init_openssl(void) { +static void +init_openssl (void) +{ int i; int num_locks; - SSL_library_init(); - SSL_load_error_strings(); - OpenSSL_add_all_algorithms(); - num_locks = CRYPTO_num_locks(); - GPR_ASSERT(num_locks > 0); - openssl_mutexes = malloc((size_t)num_locks * sizeof(gpr_mu)); - GPR_ASSERT(openssl_mutexes != NULL); - for (i = 0; i < CRYPTO_num_locks(); i++) { - gpr_mu_init(&openssl_mutexes[i]); - } - CRYPTO_set_locking_callback(openssl_locking_cb); - CRYPTO_set_id_callback(openssl_thread_id_cb); + SSL_library_init (); + SSL_load_error_strings (); + OpenSSL_add_all_algorithms (); + num_locks = CRYPTO_num_locks (); + GPR_ASSERT (num_locks > 0); + openssl_mutexes = malloc ((size_t) num_locks * sizeof (gpr_mu)); + GPR_ASSERT (openssl_mutexes != NULL); + for (i = 0; i < CRYPTO_num_locks (); i++) + { + gpr_mu_init (&openssl_mutexes[i]); + } + CRYPTO_set_locking_callback (openssl_locking_cb); + CRYPTO_set_id_callback (openssl_thread_id_cb); } /* --- Ssl utils. ---*/ -static const char* ssl_error_string(int error) { - switch (error) { +static const char * +ssl_error_string (int error) +{ + switch (error) + { case SSL_ERROR_NONE: return "SSL_ERROR_NONE"; case SSL_ERROR_ZERO_RETURN: @@ -170,791 +186,885 @@ static const char* ssl_error_string(int error) { return "SSL_ERROR_SSL"; default: return "Unknown error"; - } + } } /* TODO(jboeuf): Remove when we are past the debugging phase with this code. */ -static void ssl_log_where_info(const SSL* ssl, int where, int flag, - const char* msg) { - if ((where & flag) && tsi_tracing_enabled) { - gpr_log(GPR_INFO, "%20.20s - %30.30s - %5.10s", msg, - SSL_state_string_long(ssl), SSL_state_string(ssl)); - } +static void +ssl_log_where_info (const SSL * ssl, int where, int flag, const char *msg) +{ + if ((where & flag) && tsi_tracing_enabled) + { + gpr_log (GPR_INFO, "%20.20s - %30.30s - %5.10s", msg, SSL_state_string_long (ssl), SSL_state_string (ssl)); + } } /* Used for debugging. TODO(jboeuf): Remove when code is mature enough. */ -static void ssl_info_callback(const SSL* ssl, int where, int ret) { - if (ret == 0) { - gpr_log(GPR_ERROR, "ssl_info_callback: error occured.\n"); - return; - } +static void +ssl_info_callback (const SSL * ssl, int where, int ret) +{ + if (ret == 0) + { + gpr_log (GPR_ERROR, "ssl_info_callback: error occured.\n"); + return; + } - ssl_log_where_info(ssl, where, SSL_CB_LOOP, "LOOP"); - ssl_log_where_info(ssl, where, SSL_CB_HANDSHAKE_START, "HANDSHAKE START"); - ssl_log_where_info(ssl, where, SSL_CB_HANDSHAKE_DONE, "HANDSHAKE DONE"); + ssl_log_where_info (ssl, where, SSL_CB_LOOP, "LOOP"); + ssl_log_where_info (ssl, where, SSL_CB_HANDSHAKE_START, "HANDSHAKE START"); + ssl_log_where_info (ssl, where, SSL_CB_HANDSHAKE_DONE, "HANDSHAKE DONE"); } /* Returns 1 if name looks like an IP address, 0 otherwise. This is a very rough heuristic as it does not handle IPV6 or things like: 0300.0250.00.01, 0xC0.0Xa8.0x0.0x1, 000030052000001, 0xc0.052000001 */ -static int looks_like_ip_address(const char* name) { +static int +looks_like_ip_address (const char *name) +{ size_t i; size_t dot_count = 0; size_t num_size = 0; - for (i = 0; i < strlen(name); i++) { - if (name[i] >= '0' && name[i] <= '9') { - if (num_size > 3) return 0; - num_size++; - } else if (name[i] == '.') { - if (dot_count > 3 || num_size == 0) return 0; - dot_count++; - num_size = 0; - } else { - return 0; + for (i = 0; i < strlen (name); i++) + { + if (name[i] >= '0' && name[i] <= '9') + { + if (num_size > 3) + return 0; + num_size++; + } + else if (name[i] == '.') + { + if (dot_count > 3 || num_size == 0) + return 0; + dot_count++; + num_size = 0; + } + else + { + return 0; + } } - } - if (dot_count < 3 || num_size == 0) return 0; + if (dot_count < 3 || num_size == 0) + return 0; return 1; } /* Gets the subject CN from an X509 cert. */ -static tsi_result ssl_get_x509_common_name(X509* cert, unsigned char** utf8, - size_t* utf8_size) { +static tsi_result +ssl_get_x509_common_name (X509 * cert, unsigned char **utf8, size_t * utf8_size) +{ int common_name_index = -1; - X509_NAME_ENTRY* common_name_entry = NULL; - ASN1_STRING* common_name_asn1 = NULL; - X509_NAME* subject_name = X509_get_subject_name(cert); + X509_NAME_ENTRY *common_name_entry = NULL; + ASN1_STRING *common_name_asn1 = NULL; + X509_NAME *subject_name = X509_get_subject_name (cert); int utf8_returned_size = 0; - if (subject_name == NULL) { - gpr_log(GPR_ERROR, "Could not get subject name from certificate."); - return TSI_NOT_FOUND; - } - common_name_index = - X509_NAME_get_index_by_NID(subject_name, NID_commonName, -1); - if (common_name_index == -1) { - gpr_log(GPR_ERROR, - "Could not get common name of subject from certificate."); - return TSI_NOT_FOUND; - } - common_name_entry = X509_NAME_get_entry(subject_name, common_name_index); - if (common_name_entry == NULL) { - gpr_log(GPR_ERROR, "Could not get common name entry from certificate."); - return TSI_INTERNAL_ERROR; - } - common_name_asn1 = X509_NAME_ENTRY_get_data(common_name_entry); - if (common_name_asn1 == NULL) { - gpr_log(GPR_ERROR, - "Could not get common name entry asn1 from certificate."); - return TSI_INTERNAL_ERROR; - } - utf8_returned_size = ASN1_STRING_to_UTF8(utf8, common_name_asn1); - if (utf8_returned_size < 0) { - gpr_log(GPR_ERROR, "Could not extract utf8 from asn1 string."); - return TSI_OUT_OF_RESOURCES; - } - *utf8_size = (size_t)utf8_returned_size; + if (subject_name == NULL) + { + gpr_log (GPR_ERROR, "Could not get subject name from certificate."); + return TSI_NOT_FOUND; + } + common_name_index = X509_NAME_get_index_by_NID (subject_name, NID_commonName, -1); + if (common_name_index == -1) + { + gpr_log (GPR_ERROR, "Could not get common name of subject from certificate."); + return TSI_NOT_FOUND; + } + common_name_entry = X509_NAME_get_entry (subject_name, common_name_index); + if (common_name_entry == NULL) + { + gpr_log (GPR_ERROR, "Could not get common name entry from certificate."); + return TSI_INTERNAL_ERROR; + } + common_name_asn1 = X509_NAME_ENTRY_get_data (common_name_entry); + if (common_name_asn1 == NULL) + { + gpr_log (GPR_ERROR, "Could not get common name entry asn1 from certificate."); + return TSI_INTERNAL_ERROR; + } + utf8_returned_size = ASN1_STRING_to_UTF8 (utf8, common_name_asn1); + if (utf8_returned_size < 0) + { + gpr_log (GPR_ERROR, "Could not extract utf8 from asn1 string."); + return TSI_OUT_OF_RESOURCES; + } + *utf8_size = (size_t) utf8_returned_size; return TSI_OK; } /* Gets the subject CN of an X509 cert as a tsi_peer_property. */ -static tsi_result peer_property_from_x509_common_name( - X509* cert, tsi_peer_property* property) { - unsigned char* common_name; +static tsi_result +peer_property_from_x509_common_name (X509 * cert, tsi_peer_property * property) +{ + unsigned char *common_name; size_t common_name_size; - tsi_result result = - ssl_get_x509_common_name(cert, &common_name, &common_name_size); - if (result != TSI_OK) { - if (result == TSI_NOT_FOUND) { - common_name = NULL; - common_name_size = 0; - } else { - return result; + tsi_result result = ssl_get_x509_common_name (cert, &common_name, &common_name_size); + if (result != TSI_OK) + { + if (result == TSI_NOT_FOUND) + { + common_name = NULL; + common_name_size = 0; + } + else + { + return result; + } } - } - result = tsi_construct_string_peer_property( - TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, - common_name == NULL ? "" : (const char*)common_name, common_name_size, - property); - OPENSSL_free(common_name); + result = tsi_construct_string_peer_property (TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, common_name == NULL ? "" : (const char *) common_name, common_name_size, property); + OPENSSL_free (common_name); return result; } /* Gets the subject SANs from an X509 cert as a tsi_peer_property. */ -static tsi_result add_subject_alt_names_properties_to_peer( - tsi_peer* peer, GENERAL_NAMES* subject_alt_names, - size_t subject_alt_name_count) { +static tsi_result +add_subject_alt_names_properties_to_peer (tsi_peer * peer, GENERAL_NAMES * subject_alt_names, size_t subject_alt_name_count) +{ size_t i; tsi_result result = TSI_OK; /* Reset for DNS entries filtering. */ peer->property_count -= subject_alt_name_count; - for (i = 0; i < subject_alt_name_count; i++) { - GENERAL_NAME* subject_alt_name = - sk_GENERAL_NAME_value(subject_alt_names, (int)i); - /* Filter out the non-dns entries names. */ - if (subject_alt_name->type == GEN_DNS) { - unsigned char* dns_name = NULL; - int dns_name_size = - ASN1_STRING_to_UTF8(&dns_name, subject_alt_name->d.dNSName); - if (dns_name_size < 0) { - gpr_log(GPR_ERROR, "Could not get utf8 from asn1 string."); - result = TSI_INTERNAL_ERROR; - break; - } - result = tsi_construct_string_peer_property( - TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, - (const char*)dns_name, (size_t)dns_name_size, - &peer->properties[peer->property_count++]); - OPENSSL_free(dns_name); - if (result != TSI_OK) break; + for (i = 0; i < subject_alt_name_count; i++) + { + GENERAL_NAME *subject_alt_name = sk_GENERAL_NAME_value (subject_alt_names, (int) i); + /* Filter out the non-dns entries names. */ + if (subject_alt_name->type == GEN_DNS) + { + unsigned char *dns_name = NULL; + int dns_name_size = ASN1_STRING_to_UTF8 (&dns_name, subject_alt_name->d.dNSName); + if (dns_name_size < 0) + { + gpr_log (GPR_ERROR, "Could not get utf8 from asn1 string."); + result = TSI_INTERNAL_ERROR; + break; + } + result = tsi_construct_string_peer_property (TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, (const char *) dns_name, (size_t) dns_name_size, &peer->properties[peer->property_count++]); + OPENSSL_free (dns_name); + if (result != TSI_OK) + break; + } } - } return result; } /* Gets information about the peer's X509 cert as a tsi_peer object. */ -static tsi_result peer_from_x509(X509* cert, int include_certificate_type, - tsi_peer* peer) { +static tsi_result +peer_from_x509 (X509 * cert, int include_certificate_type, tsi_peer * peer) +{ /* TODO(jboeuf): Maybe add more properties. */ - GENERAL_NAMES* subject_alt_names = - X509_get_ext_d2i(cert, NID_subject_alt_name, 0, 0); - int subject_alt_name_count = - (subject_alt_names != NULL) ? sk_GENERAL_NAME_num(subject_alt_names) : 0; + GENERAL_NAMES *subject_alt_names = X509_get_ext_d2i (cert, NID_subject_alt_name, 0, 0); + int subject_alt_name_count = (subject_alt_names != NULL) ? sk_GENERAL_NAME_num (subject_alt_names) : 0; size_t property_count; tsi_result result; - GPR_ASSERT(subject_alt_name_count >= 0); - property_count = (include_certificate_type ? (size_t)1 : 0) + - 1 /* common name */ + (size_t)subject_alt_name_count; - result = tsi_construct_peer(property_count, peer); - if (result != TSI_OK) return result; - do { - if (include_certificate_type) { - result = tsi_construct_string_peer_property_from_cstring( - TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, - &peer->properties[0]); - if (result != TSI_OK) break; - } - result = peer_property_from_x509_common_name( - cert, &peer->properties[include_certificate_type ? 1 : 0]); - if (result != TSI_OK) break; - - if (subject_alt_name_count != 0) { - result = add_subject_alt_names_properties_to_peer( - peer, subject_alt_names, (size_t)subject_alt_name_count); - if (result != TSI_OK) break; - } - } while (0); - - if (subject_alt_names != NULL) { - sk_GENERAL_NAME_pop_free(subject_alt_names, GENERAL_NAME_free); - } - if (result != TSI_OK) tsi_peer_destruct(peer); + GPR_ASSERT (subject_alt_name_count >= 0); + property_count = (include_certificate_type ? (size_t) 1 : 0) + 1 /* common name */ + (size_t) subject_alt_name_count; + result = tsi_construct_peer (property_count, peer); + if (result != TSI_OK) + return result; + do + { + if (include_certificate_type) + { + result = tsi_construct_string_peer_property_from_cstring (TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, &peer->properties[0]); + if (result != TSI_OK) + break; + } + result = peer_property_from_x509_common_name (cert, &peer->properties[include_certificate_type ? 1 : 0]); + if (result != TSI_OK) + break; + + if (subject_alt_name_count != 0) + { + result = add_subject_alt_names_properties_to_peer (peer, subject_alt_names, (size_t) subject_alt_name_count); + if (result != TSI_OK) + break; + } + } + while (0); + + if (subject_alt_names != NULL) + { + sk_GENERAL_NAME_pop_free (subject_alt_names, GENERAL_NAME_free); + } + if (result != TSI_OK) + tsi_peer_destruct (peer); return result; } /* Logs the SSL error stack. */ -static void log_ssl_error_stack(void) { +static void +log_ssl_error_stack (void) +{ unsigned long err; - while ((err = ERR_get_error()) != 0) { - char details[256]; - ERR_error_string_n(err, details, sizeof(details)); - gpr_log(GPR_ERROR, "%s", details); - } + while ((err = ERR_get_error ()) != 0) + { + char details[256]; + ERR_error_string_n (err, details, sizeof (details)); + gpr_log (GPR_ERROR, "%s", details); + } } /* Performs an SSL_read and handle errors. */ -static tsi_result do_ssl_read(SSL* ssl, unsigned char* unprotected_bytes, - size_t* unprotected_bytes_size) { +static tsi_result +do_ssl_read (SSL * ssl, unsigned char *unprotected_bytes, size_t * unprotected_bytes_size) +{ int read_from_ssl; - GPR_ASSERT(*unprotected_bytes_size <= INT_MAX); - read_from_ssl = - SSL_read(ssl, unprotected_bytes, (int)*unprotected_bytes_size); - if (read_from_ssl == 0) { - gpr_log(GPR_ERROR, "SSL_read returned 0 unexpectedly."); - return TSI_INTERNAL_ERROR; - } - if (read_from_ssl < 0) { - read_from_ssl = SSL_get_error(ssl, read_from_ssl); - switch (read_from_ssl) { - case SSL_ERROR_WANT_READ: - /* We need more data to finish the frame. */ - *unprotected_bytes_size = 0; - return TSI_OK; - case SSL_ERROR_WANT_WRITE: - gpr_log( - GPR_ERROR, - "Peer tried to renegotiate SSL connection. This is unsupported."); - return TSI_UNIMPLEMENTED; - case SSL_ERROR_SSL: - gpr_log(GPR_ERROR, "Corruption detected."); - log_ssl_error_stack(); - return TSI_DATA_CORRUPTED; - default: - gpr_log(GPR_ERROR, "SSL_read failed with error %s.", - ssl_error_string(read_from_ssl)); - return TSI_PROTOCOL_FAILURE; + GPR_ASSERT (*unprotected_bytes_size <= INT_MAX); + read_from_ssl = SSL_read (ssl, unprotected_bytes, (int) *unprotected_bytes_size); + if (read_from_ssl == 0) + { + gpr_log (GPR_ERROR, "SSL_read returned 0 unexpectedly."); + return TSI_INTERNAL_ERROR; } - } - *unprotected_bytes_size = (size_t)read_from_ssl; + if (read_from_ssl < 0) + { + read_from_ssl = SSL_get_error (ssl, read_from_ssl); + switch (read_from_ssl) + { + case SSL_ERROR_WANT_READ: + /* We need more data to finish the frame. */ + *unprotected_bytes_size = 0; + return TSI_OK; + case SSL_ERROR_WANT_WRITE: + gpr_log (GPR_ERROR, "Peer tried to renegotiate SSL connection. This is unsupported."); + return TSI_UNIMPLEMENTED; + case SSL_ERROR_SSL: + gpr_log (GPR_ERROR, "Corruption detected."); + log_ssl_error_stack (); + return TSI_DATA_CORRUPTED; + default: + gpr_log (GPR_ERROR, "SSL_read failed with error %s.", ssl_error_string (read_from_ssl)); + return TSI_PROTOCOL_FAILURE; + } + } + *unprotected_bytes_size = (size_t) read_from_ssl; return TSI_OK; } /* Performs an SSL_write and handle errors. */ -static tsi_result do_ssl_write(SSL* ssl, unsigned char* unprotected_bytes, - size_t unprotected_bytes_size) { +static tsi_result +do_ssl_write (SSL * ssl, unsigned char *unprotected_bytes, size_t unprotected_bytes_size) +{ int ssl_write_result; - GPR_ASSERT(unprotected_bytes_size <= INT_MAX); - ssl_write_result = - SSL_write(ssl, unprotected_bytes, (int)unprotected_bytes_size); - if (ssl_write_result < 0) { - ssl_write_result = SSL_get_error(ssl, ssl_write_result); - if (ssl_write_result == SSL_ERROR_WANT_READ) { - gpr_log(GPR_ERROR, - "Peer tried to renegotiate SSL connection. This is unsupported."); - return TSI_UNIMPLEMENTED; - } else { - gpr_log(GPR_ERROR, "SSL_write failed with error %s.", - ssl_error_string(ssl_write_result)); - return TSI_INTERNAL_ERROR; + GPR_ASSERT (unprotected_bytes_size <= INT_MAX); + ssl_write_result = SSL_write (ssl, unprotected_bytes, (int) unprotected_bytes_size); + if (ssl_write_result < 0) + { + ssl_write_result = SSL_get_error (ssl, ssl_write_result); + if (ssl_write_result == SSL_ERROR_WANT_READ) + { + gpr_log (GPR_ERROR, "Peer tried to renegotiate SSL connection. This is unsupported."); + return TSI_UNIMPLEMENTED; + } + else + { + gpr_log (GPR_ERROR, "SSL_write failed with error %s.", ssl_error_string (ssl_write_result)); + return TSI_INTERNAL_ERROR; + } } - } return TSI_OK; } /* Loads an in-memory PEM certificate chain into the SSL context. */ -static tsi_result ssl_ctx_use_certificate_chain( - SSL_CTX* context, const unsigned char* pem_cert_chain, - size_t pem_cert_chain_size) { +static tsi_result +ssl_ctx_use_certificate_chain (SSL_CTX * context, const unsigned char *pem_cert_chain, size_t pem_cert_chain_size) +{ tsi_result result = TSI_OK; - X509* certificate = NULL; - BIO* pem; - GPR_ASSERT(pem_cert_chain_size <= INT_MAX); - pem = BIO_new_mem_buf((void*)pem_cert_chain, (int)pem_cert_chain_size); - if (pem == NULL) return TSI_OUT_OF_RESOURCES; - - do { - certificate = PEM_read_bio_X509_AUX(pem, NULL, NULL, ""); - if (certificate == NULL) { - result = TSI_INVALID_ARGUMENT; - break; - } - if (!SSL_CTX_use_certificate(context, certificate)) { - result = TSI_INVALID_ARGUMENT; - break; - } - while (1) { - X509* certificate_authority = PEM_read_bio_X509(pem, NULL, NULL, ""); - if (certificate_authority == NULL) { - ERR_clear_error(); - break; /* Done reading. */ - } - if (!SSL_CTX_add_extra_chain_cert(context, certificate_authority)) { - X509_free(certificate_authority); - result = TSI_INVALID_ARGUMENT; - break; - } - /* We don't need to free certificate_authority as its ownership has been - transfered to the context. That is not the case for certificate though. - */ + X509 *certificate = NULL; + BIO *pem; + GPR_ASSERT (pem_cert_chain_size <= INT_MAX); + pem = BIO_new_mem_buf ((void *) pem_cert_chain, (int) pem_cert_chain_size); + if (pem == NULL) + return TSI_OUT_OF_RESOURCES; + + do + { + certificate = PEM_read_bio_X509_AUX (pem, NULL, NULL, ""); + if (certificate == NULL) + { + result = TSI_INVALID_ARGUMENT; + break; + } + if (!SSL_CTX_use_certificate (context, certificate)) + { + result = TSI_INVALID_ARGUMENT; + break; + } + while (1) + { + X509 *certificate_authority = PEM_read_bio_X509 (pem, NULL, NULL, ""); + if (certificate_authority == NULL) + { + ERR_clear_error (); + break; /* Done reading. */ + } + if (!SSL_CTX_add_extra_chain_cert (context, certificate_authority)) + { + X509_free (certificate_authority); + result = TSI_INVALID_ARGUMENT; + break; + } + /* We don't need to free certificate_authority as its ownership has been + transfered to the context. That is not the case for certificate though. + */ + } } - } while (0); + while (0); - if (certificate != NULL) X509_free(certificate); - BIO_free(pem); + if (certificate != NULL) + X509_free (certificate); + BIO_free (pem); return result; } /* Loads an in-memory PEM private key into the SSL context. */ -static tsi_result ssl_ctx_use_private_key(SSL_CTX* context, - const unsigned char* pem_key, - size_t pem_key_size) { +static tsi_result +ssl_ctx_use_private_key (SSL_CTX * context, const unsigned char *pem_key, size_t pem_key_size) +{ tsi_result result = TSI_OK; - EVP_PKEY* private_key = NULL; - BIO* pem; - GPR_ASSERT(pem_key_size <= INT_MAX); - pem = BIO_new_mem_buf((void*)pem_key, (int)pem_key_size); - if (pem == NULL) return TSI_OUT_OF_RESOURCES; - do { - private_key = PEM_read_bio_PrivateKey(pem, NULL, NULL, ""); - if (private_key == NULL) { - result = TSI_INVALID_ARGUMENT; - break; - } - if (!SSL_CTX_use_PrivateKey(context, private_key)) { - result = TSI_INVALID_ARGUMENT; - break; + EVP_PKEY *private_key = NULL; + BIO *pem; + GPR_ASSERT (pem_key_size <= INT_MAX); + pem = BIO_new_mem_buf ((void *) pem_key, (int) pem_key_size); + if (pem == NULL) + return TSI_OUT_OF_RESOURCES; + do + { + private_key = PEM_read_bio_PrivateKey (pem, NULL, NULL, ""); + if (private_key == NULL) + { + result = TSI_INVALID_ARGUMENT; + break; + } + if (!SSL_CTX_use_PrivateKey (context, private_key)) + { + result = TSI_INVALID_ARGUMENT; + break; + } } - } while (0); - if (private_key != NULL) EVP_PKEY_free(private_key); - BIO_free(pem); + while (0); + if (private_key != NULL) + EVP_PKEY_free (private_key); + BIO_free (pem); return result; } /* Loads in-memory PEM verification certs into the SSL context and optionally returns the verification cert names (root_names can be NULL). */ -static tsi_result ssl_ctx_load_verification_certs( - SSL_CTX* context, const unsigned char* pem_roots, size_t pem_roots_size, - STACK_OF(X509_NAME) * *root_names) { +static tsi_result +ssl_ctx_load_verification_certs (SSL_CTX * context, const unsigned char *pem_roots, size_t pem_roots_size, STACK_OF (X509_NAME) * *root_names) +{ tsi_result result = TSI_OK; size_t num_roots = 0; - X509* root = NULL; - X509_NAME* root_name = NULL; - BIO* pem; - X509_STORE* root_store; - GPR_ASSERT(pem_roots_size <= INT_MAX); - pem = BIO_new_mem_buf((void*)pem_roots, (int)pem_roots_size); - root_store = SSL_CTX_get_cert_store(context); - if (root_store == NULL) return TSI_INVALID_ARGUMENT; - if (pem == NULL) return TSI_OUT_OF_RESOURCES; - if (root_names != NULL) { - *root_names = sk_X509_NAME_new_null(); - if (*root_names == NULL) return TSI_OUT_OF_RESOURCES; - } - - while (1) { - root = PEM_read_bio_X509_AUX(pem, NULL, NULL, ""); - if (root == NULL) { - ERR_clear_error(); - break; /* We're at the end of stream. */ - } - if (root_names != NULL) { - root_name = X509_get_subject_name(root); - if (root_name == NULL) { - gpr_log(GPR_ERROR, "Could not get name from root certificate."); - result = TSI_INVALID_ARGUMENT; - break; - } - root_name = X509_NAME_dup(root_name); - if (root_name == NULL) { - result = TSI_OUT_OF_RESOURCES; - break; - } - sk_X509_NAME_push(*root_names, root_name); - root_name = NULL; + X509 *root = NULL; + X509_NAME *root_name = NULL; + BIO *pem; + X509_STORE *root_store; + GPR_ASSERT (pem_roots_size <= INT_MAX); + pem = BIO_new_mem_buf ((void *) pem_roots, (int) pem_roots_size); + root_store = SSL_CTX_get_cert_store (context); + if (root_store == NULL) + return TSI_INVALID_ARGUMENT; + if (pem == NULL) + return TSI_OUT_OF_RESOURCES; + if (root_names != NULL) + { + *root_names = sk_X509_NAME_new_null (); + if (*root_names == NULL) + return TSI_OUT_OF_RESOURCES; } - if (!X509_STORE_add_cert(root_store, root)) { - gpr_log(GPR_ERROR, "Could not add root certificate to ssl context."); - result = TSI_INTERNAL_ERROR; - break; + + while (1) + { + root = PEM_read_bio_X509_AUX (pem, NULL, NULL, ""); + if (root == NULL) + { + ERR_clear_error (); + break; /* We're at the end of stream. */ + } + if (root_names != NULL) + { + root_name = X509_get_subject_name (root); + if (root_name == NULL) + { + gpr_log (GPR_ERROR, "Could not get name from root certificate."); + result = TSI_INVALID_ARGUMENT; + break; + } + root_name = X509_NAME_dup (root_name); + if (root_name == NULL) + { + result = TSI_OUT_OF_RESOURCES; + break; + } + sk_X509_NAME_push (*root_names, root_name); + root_name = NULL; + } + if (!X509_STORE_add_cert (root_store, root)) + { + gpr_log (GPR_ERROR, "Could not add root certificate to ssl context."); + result = TSI_INTERNAL_ERROR; + break; + } + X509_free (root); + num_roots++; } - X509_free(root); - num_roots++; - } - if (num_roots == 0) { - gpr_log(GPR_ERROR, "Could not load any root certificate."); - result = TSI_INVALID_ARGUMENT; - } + if (num_roots == 0) + { + gpr_log (GPR_ERROR, "Could not load any root certificate."); + result = TSI_INVALID_ARGUMENT; + } - if (result != TSI_OK) { - if (root != NULL) X509_free(root); - if (root_names != NULL) { - sk_X509_NAME_pop_free(*root_names, X509_NAME_free); - *root_names = NULL; - if (root_name != NULL) X509_NAME_free(root_name); + if (result != TSI_OK) + { + if (root != NULL) + X509_free (root); + if (root_names != NULL) + { + sk_X509_NAME_pop_free (*root_names, X509_NAME_free); + *root_names = NULL; + if (root_name != NULL) + X509_NAME_free (root_name); + } } - } - BIO_free(pem); + BIO_free (pem); return result; } /* Populates the SSL context with a private key and a cert chain, and sets the cipher list and the ephemeral ECDH key. */ -static tsi_result populate_ssl_context( - SSL_CTX* context, const unsigned char* pem_private_key, - size_t pem_private_key_size, const unsigned char* pem_certificate_chain, - size_t pem_certificate_chain_size, const char* cipher_list) { +static tsi_result +populate_ssl_context (SSL_CTX * context, const unsigned char *pem_private_key, size_t pem_private_key_size, const unsigned char *pem_certificate_chain, size_t pem_certificate_chain_size, const char *cipher_list) +{ tsi_result result = TSI_OK; - if (pem_certificate_chain != NULL) { - result = ssl_ctx_use_certificate_chain(context, pem_certificate_chain, - pem_certificate_chain_size); - if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Invalid cert chain file."); - return result; + if (pem_certificate_chain != NULL) + { + result = ssl_ctx_use_certificate_chain (context, pem_certificate_chain, pem_certificate_chain_size); + if (result != TSI_OK) + { + gpr_log (GPR_ERROR, "Invalid cert chain file."); + return result; + } } - } - if (pem_private_key != NULL) { - result = - ssl_ctx_use_private_key(context, pem_private_key, pem_private_key_size); - if (result != TSI_OK || !SSL_CTX_check_private_key(context)) { - gpr_log(GPR_ERROR, "Invalid private key."); - return result != TSI_OK ? result : TSI_INVALID_ARGUMENT; + if (pem_private_key != NULL) + { + result = ssl_ctx_use_private_key (context, pem_private_key, pem_private_key_size); + if (result != TSI_OK || !SSL_CTX_check_private_key (context)) + { + gpr_log (GPR_ERROR, "Invalid private key."); + return result != TSI_OK ? result : TSI_INVALID_ARGUMENT; + } } - } - if ((cipher_list != NULL) && !SSL_CTX_set_cipher_list(context, cipher_list)) { - gpr_log(GPR_ERROR, "Invalid cipher list: %s.", cipher_list); - return TSI_INVALID_ARGUMENT; - } - { - EC_KEY* ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); - if (!SSL_CTX_set_tmp_ecdh(context, ecdh)) { - gpr_log(GPR_ERROR, "Could not set ephemeral ECDH key."); - EC_KEY_free(ecdh); - return TSI_INTERNAL_ERROR; + if ((cipher_list != NULL) && !SSL_CTX_set_cipher_list (context, cipher_list)) + { + gpr_log (GPR_ERROR, "Invalid cipher list: %s.", cipher_list); + return TSI_INVALID_ARGUMENT; } - SSL_CTX_set_options(context, SSL_OP_SINGLE_ECDH_USE); - EC_KEY_free(ecdh); + { + EC_KEY *ecdh = EC_KEY_new_by_curve_name (NID_X9_62_prime256v1); + if (!SSL_CTX_set_tmp_ecdh (context, ecdh)) + { + gpr_log (GPR_ERROR, "Could not set ephemeral ECDH key."); + EC_KEY_free (ecdh); + return TSI_INTERNAL_ERROR; + } + SSL_CTX_set_options (context, SSL_OP_SINGLE_ECDH_USE); + EC_KEY_free (ecdh); } return TSI_OK; } /* Extracts the CN and the SANs from an X509 cert as a peer object. */ -static tsi_result extract_x509_subject_names_from_pem_cert( - const unsigned char* pem_cert, size_t pem_cert_size, tsi_peer* peer) { +static tsi_result +extract_x509_subject_names_from_pem_cert (const unsigned char *pem_cert, size_t pem_cert_size, tsi_peer * peer) +{ tsi_result result = TSI_OK; - X509* cert = NULL; - BIO* pem; - GPR_ASSERT(pem_cert_size <= INT_MAX); - pem = BIO_new_mem_buf((void*)pem_cert, (int)pem_cert_size); - if (pem == NULL) return TSI_OUT_OF_RESOURCES; - - cert = PEM_read_bio_X509(pem, NULL, NULL, ""); - if (cert == NULL) { - gpr_log(GPR_ERROR, "Invalid certificate"); - result = TSI_INVALID_ARGUMENT; - } else { - result = peer_from_x509(cert, 0, peer); - } - if (cert != NULL) X509_free(cert); - BIO_free(pem); + X509 *cert = NULL; + BIO *pem; + GPR_ASSERT (pem_cert_size <= INT_MAX); + pem = BIO_new_mem_buf ((void *) pem_cert, (int) pem_cert_size); + if (pem == NULL) + return TSI_OUT_OF_RESOURCES; + + cert = PEM_read_bio_X509 (pem, NULL, NULL, ""); + if (cert == NULL) + { + gpr_log (GPR_ERROR, "Invalid certificate"); + result = TSI_INVALID_ARGUMENT; + } + else + { + result = peer_from_x509 (cert, 0, peer); + } + if (cert != NULL) + X509_free (cert); + BIO_free (pem); return result; } /* Builds the alpn protocol name list according to rfc 7301. */ -static tsi_result build_alpn_protocol_name_list( - const unsigned char** alpn_protocols, - const unsigned char* alpn_protocols_lengths, uint16_t num_alpn_protocols, - unsigned char** protocol_name_list, size_t* protocol_name_list_length) { +static tsi_result +build_alpn_protocol_name_list (const unsigned char **alpn_protocols, const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, unsigned char **protocol_name_list, size_t * protocol_name_list_length) +{ uint16_t i; - unsigned char* current; + unsigned char *current; *protocol_name_list = NULL; *protocol_name_list_length = 0; - if (num_alpn_protocols == 0) return TSI_INVALID_ARGUMENT; - for (i = 0; i < num_alpn_protocols; i++) { - if (alpn_protocols_lengths[i] == 0) { - gpr_log(GPR_ERROR, "Invalid 0-length protocol name."); - return TSI_INVALID_ARGUMENT; + if (num_alpn_protocols == 0) + return TSI_INVALID_ARGUMENT; + for (i = 0; i < num_alpn_protocols; i++) + { + if (alpn_protocols_lengths[i] == 0) + { + gpr_log (GPR_ERROR, "Invalid 0-length protocol name."); + return TSI_INVALID_ARGUMENT; + } + *protocol_name_list_length += (size_t) alpn_protocols_lengths[i] + 1; } - *protocol_name_list_length += (size_t)alpn_protocols_lengths[i] + 1; - } - *protocol_name_list = malloc(*protocol_name_list_length); - if (*protocol_name_list == NULL) return TSI_OUT_OF_RESOURCES; + *protocol_name_list = malloc (*protocol_name_list_length); + if (*protocol_name_list == NULL) + return TSI_OUT_OF_RESOURCES; current = *protocol_name_list; - for (i = 0; i < num_alpn_protocols; i++) { - *(current++) = alpn_protocols_lengths[i]; - memcpy(current, alpn_protocols[i], alpn_protocols_lengths[i]); - current += alpn_protocols_lengths[i]; - } + for (i = 0; i < num_alpn_protocols; i++) + { + *(current++) = alpn_protocols_lengths[i]; + memcpy (current, alpn_protocols[i], alpn_protocols_lengths[i]); + current += alpn_protocols_lengths[i]; + } /* Safety check. */ - if ((current < *protocol_name_list) || - ((gpr_uintptr)(current - *protocol_name_list) != - *protocol_name_list_length)) { - return TSI_INTERNAL_ERROR; - } + if ((current < *protocol_name_list) || ((gpr_uintptr) (current - *protocol_name_list) != *protocol_name_list_length)) + { + return TSI_INTERNAL_ERROR; + } return TSI_OK; } /* --- tsi_frame_protector methods implementation. ---*/ -static tsi_result ssl_protector_protect(tsi_frame_protector* self, - const unsigned char* unprotected_bytes, - size_t* unprotected_bytes_size, - unsigned char* protected_output_frames, - size_t* protected_output_frames_size) { - tsi_ssl_frame_protector* impl = (tsi_ssl_frame_protector*)self; +static tsi_result +ssl_protector_protect (tsi_frame_protector * self, const unsigned char *unprotected_bytes, size_t * unprotected_bytes_size, unsigned char *protected_output_frames, size_t * protected_output_frames_size) +{ + tsi_ssl_frame_protector *impl = (tsi_ssl_frame_protector *) self; int read_from_ssl; size_t available; tsi_result result = TSI_OK; /* First see if we have some pending data in the SSL BIO. */ - int pending_in_ssl = BIO_pending(impl->from_ssl); - if (pending_in_ssl > 0) { - *unprotected_bytes_size = 0; - GPR_ASSERT(*protected_output_frames_size <= INT_MAX); - read_from_ssl = BIO_read(impl->from_ssl, protected_output_frames, - (int)*protected_output_frames_size); - if (read_from_ssl < 0) { - gpr_log(GPR_ERROR, - "Could not read from BIO even though some data is pending"); - return TSI_INTERNAL_ERROR; + int pending_in_ssl = BIO_pending (impl->from_ssl); + if (pending_in_ssl > 0) + { + *unprotected_bytes_size = 0; + GPR_ASSERT (*protected_output_frames_size <= INT_MAX); + read_from_ssl = BIO_read (impl->from_ssl, protected_output_frames, (int) *protected_output_frames_size); + if (read_from_ssl < 0) + { + gpr_log (GPR_ERROR, "Could not read from BIO even though some data is pending"); + return TSI_INTERNAL_ERROR; + } + *protected_output_frames_size = (size_t) read_from_ssl; + return TSI_OK; } - *protected_output_frames_size = (size_t)read_from_ssl; - return TSI_OK; - } /* Now see if we can send a complete frame. */ available = impl->buffer_size - impl->buffer_offset; - if (available > *unprotected_bytes_size) { - /* If we cannot, just copy the data in our internal buffer. */ - memcpy(impl->buffer + impl->buffer_offset, unprotected_bytes, - *unprotected_bytes_size); - impl->buffer_offset += *unprotected_bytes_size; - *protected_output_frames_size = 0; - return TSI_OK; - } + if (available > *unprotected_bytes_size) + { + /* If we cannot, just copy the data in our internal buffer. */ + memcpy (impl->buffer + impl->buffer_offset, unprotected_bytes, *unprotected_bytes_size); + impl->buffer_offset += *unprotected_bytes_size; + *protected_output_frames_size = 0; + return TSI_OK; + } /* If we can, prepare the buffer, send it to SSL_write and read. */ - memcpy(impl->buffer + impl->buffer_offset, unprotected_bytes, available); - result = do_ssl_write(impl->ssl, impl->buffer, impl->buffer_size); - if (result != TSI_OK) return result; - - GPR_ASSERT(*protected_output_frames_size <= INT_MAX); - read_from_ssl = BIO_read(impl->from_ssl, protected_output_frames, - (int)*protected_output_frames_size); - if (read_from_ssl < 0) { - gpr_log(GPR_ERROR, "Could not read from BIO after SSL_write."); - return TSI_INTERNAL_ERROR; - } - *protected_output_frames_size = (size_t)read_from_ssl; + memcpy (impl->buffer + impl->buffer_offset, unprotected_bytes, available); + result = do_ssl_write (impl->ssl, impl->buffer, impl->buffer_size); + if (result != TSI_OK) + return result; + + GPR_ASSERT (*protected_output_frames_size <= INT_MAX); + read_from_ssl = BIO_read (impl->from_ssl, protected_output_frames, (int) *protected_output_frames_size); + if (read_from_ssl < 0) + { + gpr_log (GPR_ERROR, "Could not read from BIO after SSL_write."); + return TSI_INTERNAL_ERROR; + } + *protected_output_frames_size = (size_t) read_from_ssl; *unprotected_bytes_size = available; impl->buffer_offset = 0; return TSI_OK; } -static tsi_result ssl_protector_protect_flush( - tsi_frame_protector* self, unsigned char* protected_output_frames, - size_t* protected_output_frames_size, size_t* still_pending_size) { +static tsi_result +ssl_protector_protect_flush (tsi_frame_protector * self, unsigned char *protected_output_frames, size_t * protected_output_frames_size, size_t * still_pending_size) +{ tsi_result result = TSI_OK; - tsi_ssl_frame_protector* impl = (tsi_ssl_frame_protector*)self; + tsi_ssl_frame_protector *impl = (tsi_ssl_frame_protector *) self; int read_from_ssl = 0; int pending; - if (impl->buffer_offset != 0) { - result = do_ssl_write(impl->ssl, impl->buffer, impl->buffer_offset); - if (result != TSI_OK) return result; - impl->buffer_offset = 0; - } + if (impl->buffer_offset != 0) + { + result = do_ssl_write (impl->ssl, impl->buffer, impl->buffer_offset); + if (result != TSI_OK) + return result; + impl->buffer_offset = 0; + } - pending = BIO_pending(impl->from_ssl); - GPR_ASSERT(pending >= 0); - *still_pending_size = (size_t)pending; - if (*still_pending_size == 0) return TSI_OK; - - GPR_ASSERT(*protected_output_frames_size <= INT_MAX); - read_from_ssl = BIO_read(impl->from_ssl, protected_output_frames, - (int)*protected_output_frames_size); - if (read_from_ssl <= 0) { - gpr_log(GPR_ERROR, "Could not read from BIO after SSL_write."); - return TSI_INTERNAL_ERROR; - } - *protected_output_frames_size = (size_t)read_from_ssl; - pending = BIO_pending(impl->from_ssl); - GPR_ASSERT(pending >= 0); - *still_pending_size = (size_t)pending; + pending = BIO_pending (impl->from_ssl); + GPR_ASSERT (pending >= 0); + *still_pending_size = (size_t) pending; + if (*still_pending_size == 0) + return TSI_OK; + + GPR_ASSERT (*protected_output_frames_size <= INT_MAX); + read_from_ssl = BIO_read (impl->from_ssl, protected_output_frames, (int) *protected_output_frames_size); + if (read_from_ssl <= 0) + { + gpr_log (GPR_ERROR, "Could not read from BIO after SSL_write."); + return TSI_INTERNAL_ERROR; + } + *protected_output_frames_size = (size_t) read_from_ssl; + pending = BIO_pending (impl->from_ssl); + GPR_ASSERT (pending >= 0); + *still_pending_size = (size_t) pending; return TSI_OK; } -static tsi_result ssl_protector_unprotect( - tsi_frame_protector* self, const unsigned char* protected_frames_bytes, - size_t* protected_frames_bytes_size, unsigned char* unprotected_bytes, - size_t* unprotected_bytes_size) { +static tsi_result +ssl_protector_unprotect (tsi_frame_protector * self, const unsigned char *protected_frames_bytes, size_t * protected_frames_bytes_size, unsigned char *unprotected_bytes, size_t * unprotected_bytes_size) +{ tsi_result result = TSI_OK; int written_into_ssl = 0; size_t output_bytes_size = *unprotected_bytes_size; size_t output_bytes_offset = 0; - tsi_ssl_frame_protector* impl = (tsi_ssl_frame_protector*)self; + tsi_ssl_frame_protector *impl = (tsi_ssl_frame_protector *) self; /* First, try to read remaining data from ssl. */ - result = do_ssl_read(impl->ssl, unprotected_bytes, unprotected_bytes_size); - if (result != TSI_OK) return result; - if (*unprotected_bytes_size == output_bytes_size) { - /* We have read everything we could and cannot process any more input. */ - *protected_frames_bytes_size = 0; - return TSI_OK; - } + result = do_ssl_read (impl->ssl, unprotected_bytes, unprotected_bytes_size); + if (result != TSI_OK) + return result; + if (*unprotected_bytes_size == output_bytes_size) + { + /* We have read everything we could and cannot process any more input. */ + *protected_frames_bytes_size = 0; + return TSI_OK; + } output_bytes_offset = *unprotected_bytes_size; unprotected_bytes += output_bytes_offset; *unprotected_bytes_size = output_bytes_size - output_bytes_offset; /* Then, try to write some data to ssl. */ - GPR_ASSERT(*protected_frames_bytes_size <= INT_MAX); - written_into_ssl = BIO_write(impl->into_ssl, protected_frames_bytes, - (int)*protected_frames_bytes_size); - if (written_into_ssl < 0) { - gpr_log(GPR_ERROR, "Sending protected frame to ssl failed with %d", - written_into_ssl); - return TSI_INTERNAL_ERROR; - } - *protected_frames_bytes_size = (size_t)written_into_ssl; + GPR_ASSERT (*protected_frames_bytes_size <= INT_MAX); + written_into_ssl = BIO_write (impl->into_ssl, protected_frames_bytes, (int) *protected_frames_bytes_size); + if (written_into_ssl < 0) + { + gpr_log (GPR_ERROR, "Sending protected frame to ssl failed with %d", written_into_ssl); + return TSI_INTERNAL_ERROR; + } + *protected_frames_bytes_size = (size_t) written_into_ssl; /* Now try to read some data again. */ - result = do_ssl_read(impl->ssl, unprotected_bytes, unprotected_bytes_size); - if (result == TSI_OK) { - /* Don't forget to output the total number of bytes read. */ - *unprotected_bytes_size += output_bytes_offset; - } + result = do_ssl_read (impl->ssl, unprotected_bytes, unprotected_bytes_size); + if (result == TSI_OK) + { + /* Don't forget to output the total number of bytes read. */ + *unprotected_bytes_size += output_bytes_offset; + } return result; } -static void ssl_protector_destroy(tsi_frame_protector* self) { - tsi_ssl_frame_protector* impl = (tsi_ssl_frame_protector*)self; - if (impl->buffer != NULL) free(impl->buffer); - if (impl->ssl != NULL) SSL_free(impl->ssl); - free(self); +static void +ssl_protector_destroy (tsi_frame_protector * self) +{ + tsi_ssl_frame_protector *impl = (tsi_ssl_frame_protector *) self; + if (impl->buffer != NULL) + free (impl->buffer); + if (impl->ssl != NULL) + SSL_free (impl->ssl); + free (self); } static const tsi_frame_protector_vtable frame_protector_vtable = { - ssl_protector_protect, ssl_protector_protect_flush, ssl_protector_unprotect, - ssl_protector_destroy, + ssl_protector_protect, ssl_protector_protect_flush, ssl_protector_unprotect, + ssl_protector_destroy, }; /* --- tsi_handshaker methods implementation. ---*/ -static tsi_result ssl_handshaker_get_bytes_to_send_to_peer(tsi_handshaker* self, - unsigned char* bytes, - size_t* bytes_size) { - tsi_ssl_handshaker* impl = (tsi_ssl_handshaker*)self; +static tsi_result +ssl_handshaker_get_bytes_to_send_to_peer (tsi_handshaker * self, unsigned char *bytes, size_t * bytes_size) +{ + tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *) self; int bytes_read_from_ssl = 0; - if (bytes == NULL || bytes_size == NULL || *bytes_size == 0 || - *bytes_size > INT_MAX) { - return TSI_INVALID_ARGUMENT; - } - GPR_ASSERT(*bytes_size <= INT_MAX); - bytes_read_from_ssl = BIO_read(impl->from_ssl, bytes, (int)*bytes_size); - if (bytes_read_from_ssl < 0) { - *bytes_size = 0; - if (!BIO_should_retry(impl->from_ssl)) { - impl->result = TSI_INTERNAL_ERROR; - return impl->result; - } else { - return TSI_OK; + if (bytes == NULL || bytes_size == NULL || *bytes_size == 0 || *bytes_size > INT_MAX) + { + return TSI_INVALID_ARGUMENT; } - } - *bytes_size = (size_t)bytes_read_from_ssl; - return BIO_pending(impl->from_ssl) == 0 ? TSI_OK : TSI_INCOMPLETE_DATA; + GPR_ASSERT (*bytes_size <= INT_MAX); + bytes_read_from_ssl = BIO_read (impl->from_ssl, bytes, (int) *bytes_size); + if (bytes_read_from_ssl < 0) + { + *bytes_size = 0; + if (!BIO_should_retry (impl->from_ssl)) + { + impl->result = TSI_INTERNAL_ERROR; + return impl->result; + } + else + { + return TSI_OK; + } + } + *bytes_size = (size_t) bytes_read_from_ssl; + return BIO_pending (impl->from_ssl) == 0 ? TSI_OK : TSI_INCOMPLETE_DATA; } -static tsi_result ssl_handshaker_get_result(tsi_handshaker* self) { - tsi_ssl_handshaker* impl = (tsi_ssl_handshaker*)self; - if ((impl->result == TSI_HANDSHAKE_IN_PROGRESS) && - SSL_is_init_finished(impl->ssl)) { - impl->result = TSI_OK; - } +static tsi_result +ssl_handshaker_get_result (tsi_handshaker * self) +{ + tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *) self; + if ((impl->result == TSI_HANDSHAKE_IN_PROGRESS) && SSL_is_init_finished (impl->ssl)) + { + impl->result = TSI_OK; + } return impl->result; } -static tsi_result ssl_handshaker_process_bytes_from_peer( - tsi_handshaker* self, const unsigned char* bytes, size_t* bytes_size) { - tsi_ssl_handshaker* impl = (tsi_ssl_handshaker*)self; +static tsi_result +ssl_handshaker_process_bytes_from_peer (tsi_handshaker * self, const unsigned char *bytes, size_t * bytes_size) +{ + tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *) self; int bytes_written_into_ssl_size = 0; - if (bytes == NULL || bytes_size == 0 || *bytes_size > INT_MAX) { - return TSI_INVALID_ARGUMENT; - } - GPR_ASSERT(*bytes_size <= INT_MAX); - bytes_written_into_ssl_size = - BIO_write(impl->into_ssl, bytes, (int)*bytes_size); - if (bytes_written_into_ssl_size < 0) { - gpr_log(GPR_ERROR, "Could not write to memory BIO."); - impl->result = TSI_INTERNAL_ERROR; - return impl->result; - } - *bytes_size = (size_t)bytes_written_into_ssl_size; - - if (!tsi_handshaker_is_in_progress(self)) { - impl->result = TSI_OK; - return impl->result; - } else { - /* Get ready to get some bytes from SSL. */ - int ssl_result = SSL_do_handshake(impl->ssl); - ssl_result = SSL_get_error(impl->ssl, ssl_result); - switch (ssl_result) { - case SSL_ERROR_WANT_READ: - if (BIO_pending(impl->from_ssl) == 0) { - /* We need more data. */ - return TSI_INCOMPLETE_DATA; - } else { - return TSI_OK; - } - case SSL_ERROR_NONE: - return TSI_OK; - default: { - char err_str[256]; - ERR_error_string_n(ERR_get_error(), err_str, sizeof(err_str)); - gpr_log(GPR_ERROR, "Handshake failed with fatal error %s: %s.", - ssl_error_string(ssl_result), err_str); - impl->result = TSI_PROTOCOL_FAILURE; - return impl->result; - } + if (bytes == NULL || bytes_size == 0 || *bytes_size > INT_MAX) + { + return TSI_INVALID_ARGUMENT; + } + GPR_ASSERT (*bytes_size <= INT_MAX); + bytes_written_into_ssl_size = BIO_write (impl->into_ssl, bytes, (int) *bytes_size); + if (bytes_written_into_ssl_size < 0) + { + gpr_log (GPR_ERROR, "Could not write to memory BIO."); + impl->result = TSI_INTERNAL_ERROR; + return impl->result; + } + *bytes_size = (size_t) bytes_written_into_ssl_size; + + if (!tsi_handshaker_is_in_progress (self)) + { + impl->result = TSI_OK; + return impl->result; + } + else + { + /* Get ready to get some bytes from SSL. */ + int ssl_result = SSL_do_handshake (impl->ssl); + ssl_result = SSL_get_error (impl->ssl, ssl_result); + switch (ssl_result) + { + case SSL_ERROR_WANT_READ: + if (BIO_pending (impl->from_ssl) == 0) + { + /* We need more data. */ + return TSI_INCOMPLETE_DATA; + } + else + { + return TSI_OK; + } + case SSL_ERROR_NONE: + return TSI_OK; + default: + { + char err_str[256]; + ERR_error_string_n (ERR_get_error (), err_str, sizeof (err_str)); + gpr_log (GPR_ERROR, "Handshake failed with fatal error %s: %s.", ssl_error_string (ssl_result), err_str); + impl->result = TSI_PROTOCOL_FAILURE; + return impl->result; + } + } } - } } -static tsi_result ssl_handshaker_extract_peer(tsi_handshaker* self, - tsi_peer* peer) { +static tsi_result +ssl_handshaker_extract_peer (tsi_handshaker * self, tsi_peer * peer) +{ tsi_result result = TSI_OK; - const unsigned char* alpn_selected = NULL; + const unsigned char *alpn_selected = NULL; unsigned int alpn_selected_len; - tsi_ssl_handshaker* impl = (tsi_ssl_handshaker*)self; - X509* peer_cert = SSL_get_peer_certificate(impl->ssl); - if (peer_cert != NULL) { - result = peer_from_x509(peer_cert, 1, peer); - X509_free(peer_cert); - if (result != TSI_OK) return result; - } + tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *) self; + X509 *peer_cert = SSL_get_peer_certificate (impl->ssl); + if (peer_cert != NULL) + { + result = peer_from_x509 (peer_cert, 1, peer); + X509_free (peer_cert); + if (result != TSI_OK) + return result; + } #if TSI_OPENSSL_ALPN_SUPPORT - SSL_get0_alpn_selected(impl->ssl, &alpn_selected, &alpn_selected_len); + SSL_get0_alpn_selected (impl->ssl, &alpn_selected, &alpn_selected_len); #endif /* TSI_OPENSSL_ALPN_SUPPORT */ - if (alpn_selected == NULL) { - /* Try npn. */ - SSL_get0_next_proto_negotiated(impl->ssl, &alpn_selected, - &alpn_selected_len); - } - if (alpn_selected != NULL) { - size_t i; - tsi_peer_property* new_properties = - calloc(1, sizeof(tsi_peer_property) * (peer->property_count + 1)); - if (new_properties == NULL) return TSI_OUT_OF_RESOURCES; - for (i = 0; i < peer->property_count; i++) { - new_properties[i] = peer->properties[i]; - } - result = tsi_construct_string_peer_property( - TSI_SSL_ALPN_SELECTED_PROTOCOL, (const char*)alpn_selected, - alpn_selected_len, &new_properties[peer->property_count]); - if (result != TSI_OK) { - free(new_properties); - return result; + if (alpn_selected == NULL) + { + /* Try npn. */ + SSL_get0_next_proto_negotiated (impl->ssl, &alpn_selected, &alpn_selected_len); + } + if (alpn_selected != NULL) + { + size_t i; + tsi_peer_property *new_properties = calloc (1, sizeof (tsi_peer_property) * (peer->property_count + 1)); + if (new_properties == NULL) + return TSI_OUT_OF_RESOURCES; + for (i = 0; i < peer->property_count; i++) + { + new_properties[i] = peer->properties[i]; + } + result = tsi_construct_string_peer_property (TSI_SSL_ALPN_SELECTED_PROTOCOL, (const char *) alpn_selected, alpn_selected_len, &new_properties[peer->property_count]); + if (result != TSI_OK) + { + free (new_properties); + return result; + } + if (peer->properties != NULL) + free (peer->properties); + peer->property_count++; + peer->properties = new_properties; } - if (peer->properties != NULL) free(peer->properties); - peer->property_count++; - peer->properties = new_properties; - } return result; } -static tsi_result ssl_handshaker_create_frame_protector( - tsi_handshaker* self, size_t* max_output_protected_frame_size, - tsi_frame_protector** protector) { - size_t actual_max_output_protected_frame_size = - TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND; - tsi_ssl_handshaker* impl = (tsi_ssl_handshaker*)self; - tsi_ssl_frame_protector* protector_impl = - calloc(1, sizeof(tsi_ssl_frame_protector)); - if (protector_impl == NULL) { - return TSI_OUT_OF_RESOURCES; - } +static tsi_result +ssl_handshaker_create_frame_protector (tsi_handshaker * self, size_t * max_output_protected_frame_size, tsi_frame_protector ** protector) +{ + size_t actual_max_output_protected_frame_size = TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND; + tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *) self; + tsi_ssl_frame_protector *protector_impl = calloc (1, sizeof (tsi_ssl_frame_protector)); + if (protector_impl == NULL) + { + return TSI_OUT_OF_RESOURCES; + } - if (max_output_protected_frame_size != NULL) { - if (*max_output_protected_frame_size > - TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND) { - *max_output_protected_frame_size = - TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND; - } else if (*max_output_protected_frame_size < - TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND) { - *max_output_protected_frame_size = - TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND; - } - actual_max_output_protected_frame_size = *max_output_protected_frame_size; - } - protector_impl->buffer_size = - actual_max_output_protected_frame_size - TSI_SSL_MAX_PROTECTION_OVERHEAD; - protector_impl->buffer = malloc(protector_impl->buffer_size); - if (protector_impl->buffer == NULL) { - gpr_log(GPR_ERROR, - "Could not allocated buffer for tsi_ssl_frame_protector."); - free(protector_impl); - return TSI_INTERNAL_ERROR; - } + if (max_output_protected_frame_size != NULL) + { + if (*max_output_protected_frame_size > TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND) + { + *max_output_protected_frame_size = TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND; + } + else if (*max_output_protected_frame_size < TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND) + { + *max_output_protected_frame_size = TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND; + } + actual_max_output_protected_frame_size = *max_output_protected_frame_size; + } + protector_impl->buffer_size = actual_max_output_protected_frame_size - TSI_SSL_MAX_PROTECTION_OVERHEAD; + protector_impl->buffer = malloc (protector_impl->buffer_size); + if (protector_impl->buffer == NULL) + { + gpr_log (GPR_ERROR, "Could not allocated buffer for tsi_ssl_frame_protector."); + free (protector_impl); + return TSI_INTERNAL_ERROR; + } /* Transfer ownership of ssl to the frame protector. It is OK as the caller * cannot call anything else but destroy on the handshaker after this call. */ @@ -968,91 +1078,106 @@ static tsi_result ssl_handshaker_create_frame_protector( return TSI_OK; } -static void ssl_handshaker_destroy(tsi_handshaker* self) { - tsi_ssl_handshaker* impl = (tsi_ssl_handshaker*)self; - SSL_free(impl->ssl); /* The BIO objects are owned by ssl */ - free(impl); +static void +ssl_handshaker_destroy (tsi_handshaker * self) +{ + tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *) self; + SSL_free (impl->ssl); /* The BIO objects are owned by ssl */ + free (impl); } static const tsi_handshaker_vtable handshaker_vtable = { - ssl_handshaker_get_bytes_to_send_to_peer, - ssl_handshaker_process_bytes_from_peer, - ssl_handshaker_get_result, - ssl_handshaker_extract_peer, - ssl_handshaker_create_frame_protector, - ssl_handshaker_destroy, + ssl_handshaker_get_bytes_to_send_to_peer, + ssl_handshaker_process_bytes_from_peer, + ssl_handshaker_get_result, + ssl_handshaker_extract_peer, + ssl_handshaker_create_frame_protector, + ssl_handshaker_destroy, }; /* --- tsi_ssl_handshaker_factory common methods. --- */ -tsi_result tsi_ssl_handshaker_factory_create_handshaker( - tsi_ssl_handshaker_factory* self, const char* server_name_indication, - tsi_handshaker** handshaker) { - if (self == NULL || handshaker == NULL) return TSI_INVALID_ARGUMENT; - return self->create_handshaker(self, server_name_indication, handshaker); +tsi_result +tsi_ssl_handshaker_factory_create_handshaker (tsi_ssl_handshaker_factory * self, const char *server_name_indication, tsi_handshaker ** handshaker) +{ + if (self == NULL || handshaker == NULL) + return TSI_INVALID_ARGUMENT; + return self->create_handshaker (self, server_name_indication, handshaker); } -void tsi_ssl_handshaker_factory_destroy(tsi_ssl_handshaker_factory* self) { - if (self == NULL) return; - self->destroy(self); +void +tsi_ssl_handshaker_factory_destroy (tsi_ssl_handshaker_factory * self) +{ + if (self == NULL) + return; + self->destroy (self); } -static tsi_result create_tsi_ssl_handshaker(SSL_CTX* ctx, int is_client, - const char* server_name_indication, - tsi_handshaker** handshaker) { - SSL* ssl = SSL_new(ctx); - BIO* into_ssl = NULL; - BIO* from_ssl = NULL; - tsi_ssl_handshaker* impl = NULL; +static tsi_result +create_tsi_ssl_handshaker (SSL_CTX * ctx, int is_client, const char *server_name_indication, tsi_handshaker ** handshaker) +{ + SSL *ssl = SSL_new (ctx); + BIO *into_ssl = NULL; + BIO *from_ssl = NULL; + tsi_ssl_handshaker *impl = NULL; *handshaker = NULL; - if (ctx == NULL) { - gpr_log(GPR_ERROR, "SSL Context is null. Should never happen."); - return TSI_INTERNAL_ERROR; - } - if (ssl == NULL) { - return TSI_OUT_OF_RESOURCES; - } - SSL_set_info_callback(ssl, ssl_info_callback); - - into_ssl = BIO_new(BIO_s_mem()); - from_ssl = BIO_new(BIO_s_mem()); - if (into_ssl == NULL || from_ssl == NULL) { - gpr_log(GPR_ERROR, "BIO_new failed."); - SSL_free(ssl); - if (into_ssl != NULL) BIO_free(into_ssl); - if (from_ssl != NULL) BIO_free(into_ssl); - return TSI_OUT_OF_RESOURCES; - } - SSL_set_bio(ssl, into_ssl, from_ssl); - if (is_client) { - int ssl_result; - SSL_set_connect_state(ssl); - if (server_name_indication != NULL) { - if (!SSL_set_tlsext_host_name(ssl, server_name_indication)) { - gpr_log(GPR_ERROR, "Invalid server name indication %s.", - server_name_indication); - SSL_free(ssl); - return TSI_INTERNAL_ERROR; - } - } - ssl_result = SSL_do_handshake(ssl); - ssl_result = SSL_get_error(ssl, ssl_result); - if (ssl_result != SSL_ERROR_WANT_READ) { - gpr_log(GPR_ERROR, - "Unexpected error received from first SSL_do_handshake call: %s", - ssl_error_string(ssl_result)); - SSL_free(ssl); + if (ctx == NULL) + { + gpr_log (GPR_ERROR, "SSL Context is null. Should never happen."); return TSI_INTERNAL_ERROR; } - } else { - SSL_set_accept_state(ssl); - } + if (ssl == NULL) + { + return TSI_OUT_OF_RESOURCES; + } + SSL_set_info_callback (ssl, ssl_info_callback); + + into_ssl = BIO_new (BIO_s_mem ()); + from_ssl = BIO_new (BIO_s_mem ()); + if (into_ssl == NULL || from_ssl == NULL) + { + gpr_log (GPR_ERROR, "BIO_new failed."); + SSL_free (ssl); + if (into_ssl != NULL) + BIO_free (into_ssl); + if (from_ssl != NULL) + BIO_free (into_ssl); + return TSI_OUT_OF_RESOURCES; + } + SSL_set_bio (ssl, into_ssl, from_ssl); + if (is_client) + { + int ssl_result; + SSL_set_connect_state (ssl); + if (server_name_indication != NULL) + { + if (!SSL_set_tlsext_host_name (ssl, server_name_indication)) + { + gpr_log (GPR_ERROR, "Invalid server name indication %s.", server_name_indication); + SSL_free (ssl); + return TSI_INTERNAL_ERROR; + } + } + ssl_result = SSL_do_handshake (ssl); + ssl_result = SSL_get_error (ssl, ssl_result); + if (ssl_result != SSL_ERROR_WANT_READ) + { + gpr_log (GPR_ERROR, "Unexpected error received from first SSL_do_handshake call: %s", ssl_error_string (ssl_result)); + SSL_free (ssl); + return TSI_INTERNAL_ERROR; + } + } + else + { + SSL_set_accept_state (ssl); + } - impl = calloc(1, sizeof(tsi_ssl_handshaker)); - if (impl == NULL) { - SSL_free(ssl); - return TSI_OUT_OF_RESOURCES; - } + impl = calloc (1, sizeof (tsi_ssl_handshaker)); + if (impl == NULL) + { + SSL_free (ssl); + return TSI_OUT_OF_RESOURCES; + } impl->ssl = ssl; impl->into_ssl = into_ssl; impl->from_ssl = from_ssl; @@ -1062,407 +1187,412 @@ static tsi_result create_tsi_ssl_handshaker(SSL_CTX* ctx, int is_client, return TSI_OK; } -static int select_protocol_list(const unsigned char** out, - unsigned char* outlen, - const unsigned char* client_list, - size_t client_list_len, - const unsigned char* server_list, - size_t server_list_len) { - const unsigned char* client_current = client_list; - while ((unsigned int)(client_current - client_list) < client_list_len) { - unsigned char client_current_len = *(client_current++); - const unsigned char* server_current = server_list; - while ((server_current >= server_list) && - (gpr_uintptr)(server_current - server_list) < server_list_len) { - unsigned char server_current_len = *(server_current++); - if ((client_current_len == server_current_len) && - !memcmp(client_current, server_current, server_current_len)) { - *out = server_current; - *outlen = server_current_len; - return SSL_TLSEXT_ERR_OK; - } - server_current += server_current_len; +static int +select_protocol_list (const unsigned char **out, unsigned char *outlen, const unsigned char *client_list, size_t client_list_len, const unsigned char *server_list, size_t server_list_len) +{ + const unsigned char *client_current = client_list; + while ((unsigned int) (client_current - client_list) < client_list_len) + { + unsigned char client_current_len = *(client_current++); + const unsigned char *server_current = server_list; + while ((server_current >= server_list) && (gpr_uintptr) (server_current - server_list) < server_list_len) + { + unsigned char server_current_len = *(server_current++); + if ((client_current_len == server_current_len) && !memcmp (client_current, server_current, server_current_len)) + { + *out = server_current; + *outlen = server_current_len; + return SSL_TLSEXT_ERR_OK; + } + server_current += server_current_len; + } + client_current += client_current_len; } - client_current += client_current_len; - } return SSL_TLSEXT_ERR_NOACK; } /* --- tsi_ssl__client_handshaker_factory methods implementation. --- */ -static tsi_result ssl_client_handshaker_factory_create_handshaker( - tsi_ssl_handshaker_factory* self, const char* server_name_indication, - tsi_handshaker** handshaker) { - tsi_ssl_client_handshaker_factory* impl = - (tsi_ssl_client_handshaker_factory*)self; - return create_tsi_ssl_handshaker(impl->ssl_context, 1, server_name_indication, - handshaker); +static tsi_result +ssl_client_handshaker_factory_create_handshaker (tsi_ssl_handshaker_factory * self, const char *server_name_indication, tsi_handshaker ** handshaker) +{ + tsi_ssl_client_handshaker_factory *impl = (tsi_ssl_client_handshaker_factory *) self; + return create_tsi_ssl_handshaker (impl->ssl_context, 1, server_name_indication, handshaker); } -static void ssl_client_handshaker_factory_destroy( - tsi_ssl_handshaker_factory* self) { - tsi_ssl_client_handshaker_factory* impl = - (tsi_ssl_client_handshaker_factory*)self; - if (impl->ssl_context != NULL) SSL_CTX_free(impl->ssl_context); - if (impl->alpn_protocol_list != NULL) free(impl->alpn_protocol_list); - free(impl); +static void +ssl_client_handshaker_factory_destroy (tsi_ssl_handshaker_factory * self) +{ + tsi_ssl_client_handshaker_factory *impl = (tsi_ssl_client_handshaker_factory *) self; + if (impl->ssl_context != NULL) + SSL_CTX_free (impl->ssl_context); + if (impl->alpn_protocol_list != NULL) + free (impl->alpn_protocol_list); + free (impl); } -static int client_handshaker_factory_npn_callback(SSL* ssl, unsigned char** out, - unsigned char* outlen, - const unsigned char* in, - unsigned int inlen, - void* arg) { - tsi_ssl_client_handshaker_factory* factory = - (tsi_ssl_client_handshaker_factory*)arg; - return select_protocol_list((const unsigned char**)out, outlen, - factory->alpn_protocol_list, - factory->alpn_protocol_list_length, in, inlen); +static int +client_handshaker_factory_npn_callback (SSL * ssl, unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg) +{ + tsi_ssl_client_handshaker_factory *factory = (tsi_ssl_client_handshaker_factory *) arg; + return select_protocol_list ((const unsigned char **) out, outlen, factory->alpn_protocol_list, factory->alpn_protocol_list_length, in, inlen); } /* --- tsi_ssl_server_handshaker_factory methods implementation. --- */ -static tsi_result ssl_server_handshaker_factory_create_handshaker( - tsi_ssl_handshaker_factory* self, const char* server_name_indication, - tsi_handshaker** handshaker) { - tsi_ssl_server_handshaker_factory* impl = - (tsi_ssl_server_handshaker_factory*)self; - if (impl->ssl_context_count == 0 || server_name_indication != NULL) { - return TSI_INVALID_ARGUMENT; - } +static tsi_result +ssl_server_handshaker_factory_create_handshaker (tsi_ssl_handshaker_factory * self, const char *server_name_indication, tsi_handshaker ** handshaker) +{ + tsi_ssl_server_handshaker_factory *impl = (tsi_ssl_server_handshaker_factory *) self; + if (impl->ssl_context_count == 0 || server_name_indication != NULL) + { + return TSI_INVALID_ARGUMENT; + } /* Create the handshaker with the first context. We will switch if needed because of SNI in ssl_server_handshaker_factory_servername_callback. */ - return create_tsi_ssl_handshaker(impl->ssl_contexts[0], 0, NULL, handshaker); + return create_tsi_ssl_handshaker (impl->ssl_contexts[0], 0, NULL, handshaker); } -static void ssl_server_handshaker_factory_destroy( - tsi_ssl_handshaker_factory* self) { - tsi_ssl_server_handshaker_factory* impl = - (tsi_ssl_server_handshaker_factory*)self; +static void +ssl_server_handshaker_factory_destroy (tsi_ssl_handshaker_factory * self) +{ + tsi_ssl_server_handshaker_factory *impl = (tsi_ssl_server_handshaker_factory *) self; size_t i; - for (i = 0; i < impl->ssl_context_count; i++) { - if (impl->ssl_contexts[i] != NULL) { - SSL_CTX_free(impl->ssl_contexts[i]); - tsi_peer_destruct(&impl->ssl_context_x509_subject_names[i]); + for (i = 0; i < impl->ssl_context_count; i++) + { + if (impl->ssl_contexts[i] != NULL) + { + SSL_CTX_free (impl->ssl_contexts[i]); + tsi_peer_destruct (&impl->ssl_context_x509_subject_names[i]); + } } - } - if (impl->ssl_contexts != NULL) free(impl->ssl_contexts); - if (impl->ssl_context_x509_subject_names != NULL) { - free(impl->ssl_context_x509_subject_names); - } - if (impl->alpn_protocol_list != NULL) free(impl->alpn_protocol_list); - free(impl); + if (impl->ssl_contexts != NULL) + free (impl->ssl_contexts); + if (impl->ssl_context_x509_subject_names != NULL) + { + free (impl->ssl_context_x509_subject_names); + } + if (impl->alpn_protocol_list != NULL) + free (impl->alpn_protocol_list); + free (impl); } -static int does_entry_match_name(const char* entry, size_t entry_length, - const char* name) { - const char* dot; - const char* name_subdomain = NULL; - size_t name_length = strlen(name); +static int +does_entry_match_name (const char *entry, size_t entry_length, const char *name) +{ + const char *dot; + const char *name_subdomain = NULL; + size_t name_length = strlen (name); size_t name_subdomain_length; - if (entry_length == 0) return 0; + if (entry_length == 0) + return 0; /* Take care of '.' terminations. */ - if (name[name_length - 1] == '.') { - name_length--; - } - if (entry[entry_length - 1] == '.') { - entry_length--; - if (entry_length == 0) return 0; - } + if (name[name_length - 1] == '.') + { + name_length--; + } + if (entry[entry_length - 1] == '.') + { + entry_length--; + if (entry_length == 0) + return 0; + } - if ((name_length == entry_length) && - strncmp(name, entry, entry_length) == 0) { - return 1; /* Perfect match. */ - } - if (entry[0] != '*') return 0; + if ((name_length == entry_length) && strncmp (name, entry, entry_length) == 0) + { + return 1; /* Perfect match. */ + } + if (entry[0] != '*') + return 0; /* Wildchar subdomain matching. */ - if (entry_length < 3 || entry[1] != '.') { /* At least *.x */ - gpr_log(GPR_ERROR, "Invalid wildchar entry."); + if (entry_length < 3 || entry[1] != '.') + { /* At least *.x */ + gpr_log (GPR_ERROR, "Invalid wildchar entry."); + return 0; + } + name_subdomain = strchr (name, '.'); + if (name_subdomain == NULL) return 0; - } - name_subdomain = strchr(name, '.'); - if (name_subdomain == NULL) return 0; - name_subdomain_length = strlen(name_subdomain); - if (name_subdomain_length < 2) return 0; - name_subdomain++; /* Starts after the dot. */ + name_subdomain_length = strlen (name_subdomain); + if (name_subdomain_length < 2) + return 0; + name_subdomain++; /* Starts after the dot. */ name_subdomain_length--; - entry += 2; /* Remove *. */ + entry += 2; /* Remove *. */ entry_length -= 2; - dot = strchr(name_subdomain, '.'); - if ((dot == NULL) || (dot == &name_subdomain[name_subdomain_length - 1])) { - gpr_log(GPR_ERROR, "Invalid toplevel subdomain: %s", name_subdomain); - return 0; - } - if (name_subdomain[name_subdomain_length - 1] == '.') { - name_subdomain_length--; - } - return ((entry_length > 0) && (name_subdomain_length == entry_length) && - strncmp(entry, name_subdomain, entry_length) == 0); + dot = strchr (name_subdomain, '.'); + if ((dot == NULL) || (dot == &name_subdomain[name_subdomain_length - 1])) + { + gpr_log (GPR_ERROR, "Invalid toplevel subdomain: %s", name_subdomain); + return 0; + } + if (name_subdomain[name_subdomain_length - 1] == '.') + { + name_subdomain_length--; + } + return ((entry_length > 0) && (name_subdomain_length == entry_length) && strncmp (entry, name_subdomain, entry_length) == 0); } -static int ssl_server_handshaker_factory_servername_callback(SSL* ssl, int* ap, - void* arg) { - tsi_ssl_server_handshaker_factory* impl = - (tsi_ssl_server_handshaker_factory*)arg; +static int +ssl_server_handshaker_factory_servername_callback (SSL * ssl, int *ap, void *arg) +{ + tsi_ssl_server_handshaker_factory *impl = (tsi_ssl_server_handshaker_factory *) arg; size_t i = 0; - const char* servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name); - if (servername == NULL || strlen(servername) == 0) { - return SSL_TLSEXT_ERR_NOACK; - } + const char *servername = SSL_get_servername (ssl, TLSEXT_NAMETYPE_host_name); + if (servername == NULL || strlen (servername) == 0) + { + return SSL_TLSEXT_ERR_NOACK; + } - for (i = 0; i < impl->ssl_context_count; i++) { - if (tsi_ssl_peer_matches_name(&impl->ssl_context_x509_subject_names[i], - servername)) { - SSL_set_SSL_CTX(ssl, impl->ssl_contexts[i]); - return SSL_TLSEXT_ERR_OK; + for (i = 0; i < impl->ssl_context_count; i++) + { + if (tsi_ssl_peer_matches_name (&impl->ssl_context_x509_subject_names[i], servername)) + { + SSL_set_SSL_CTX (ssl, impl->ssl_contexts[i]); + return SSL_TLSEXT_ERR_OK; + } } - } - gpr_log(GPR_ERROR, "No match found for server name: %s.", servername); + gpr_log (GPR_ERROR, "No match found for server name: %s.", servername); return SSL_TLSEXT_ERR_ALERT_WARNING; } #if TSI_OPENSSL_ALPN_SUPPORT -static int server_handshaker_factory_alpn_callback( - SSL* ssl, const unsigned char** out, unsigned char* outlen, - const unsigned char* in, unsigned int inlen, void* arg) { - tsi_ssl_server_handshaker_factory* factory = - (tsi_ssl_server_handshaker_factory*)arg; - return select_protocol_list(out, outlen, in, inlen, - factory->alpn_protocol_list, - factory->alpn_protocol_list_length); +static int +server_handshaker_factory_alpn_callback (SSL * ssl, const unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg) +{ + tsi_ssl_server_handshaker_factory *factory = (tsi_ssl_server_handshaker_factory *) arg; + return select_protocol_list (out, outlen, in, inlen, factory->alpn_protocol_list, factory->alpn_protocol_list_length); } #endif /* TSI_OPENSSL_ALPN_SUPPORT */ -static int server_handshaker_factory_npn_advertised_callback( - SSL* ssl, const unsigned char** out, unsigned int* outlen, void* arg) { - tsi_ssl_server_handshaker_factory* factory = - (tsi_ssl_server_handshaker_factory*)arg; +static int +server_handshaker_factory_npn_advertised_callback (SSL * ssl, const unsigned char **out, unsigned int *outlen, void *arg) +{ + tsi_ssl_server_handshaker_factory *factory = (tsi_ssl_server_handshaker_factory *) arg; *out = factory->alpn_protocol_list; - GPR_ASSERT(factory->alpn_protocol_list_length <= UINT_MAX); - *outlen = (unsigned int)factory->alpn_protocol_list_length; + GPR_ASSERT (factory->alpn_protocol_list_length <= UINT_MAX); + *outlen = (unsigned int) factory->alpn_protocol_list_length; return SSL_TLSEXT_ERR_OK; } /* --- tsi_ssl_handshaker_factory constructors. --- */ -tsi_result tsi_create_ssl_client_handshaker_factory( - const unsigned char* pem_private_key, size_t pem_private_key_size, - const unsigned char* pem_cert_chain, size_t pem_cert_chain_size, - const unsigned char* pem_root_certs, size_t pem_root_certs_size, - const char* cipher_list, const unsigned char** alpn_protocols, - const unsigned char* alpn_protocols_lengths, uint16_t num_alpn_protocols, - tsi_ssl_handshaker_factory** factory) { - SSL_CTX* ssl_context = NULL; - tsi_ssl_client_handshaker_factory* impl = NULL; +tsi_result +tsi_create_ssl_client_handshaker_factory (const unsigned char *pem_private_key, size_t pem_private_key_size, const unsigned char *pem_cert_chain, size_t pem_cert_chain_size, const unsigned char *pem_root_certs, size_t pem_root_certs_size, const char *cipher_list, const unsigned char **alpn_protocols, const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, tsi_ssl_handshaker_factory ** factory) +{ + SSL_CTX *ssl_context = NULL; + tsi_ssl_client_handshaker_factory *impl = NULL; tsi_result result = TSI_OK; - gpr_once_init(&init_openssl_once, init_openssl); + gpr_once_init (&init_openssl_once, init_openssl); - if (factory == NULL) return TSI_INVALID_ARGUMENT; + if (factory == NULL) + return TSI_INVALID_ARGUMENT; *factory = NULL; - if (pem_root_certs == NULL) return TSI_INVALID_ARGUMENT; - - ssl_context = SSL_CTX_new(TLSv1_2_method()); - if (ssl_context == NULL) { - gpr_log(GPR_ERROR, "Could not create ssl context."); + if (pem_root_certs == NULL) return TSI_INVALID_ARGUMENT; - } - impl = calloc(1, sizeof(tsi_ssl_client_handshaker_factory)); - if (impl == NULL) { - SSL_CTX_free(ssl_context); - return TSI_OUT_OF_RESOURCES; - } + ssl_context = SSL_CTX_new (TLSv1_2_method ()); + if (ssl_context == NULL) + { + gpr_log (GPR_ERROR, "Could not create ssl context."); + return TSI_INVALID_ARGUMENT; + } + + impl = calloc (1, sizeof (tsi_ssl_client_handshaker_factory)); + if (impl == NULL) + { + SSL_CTX_free (ssl_context); + return TSI_OUT_OF_RESOURCES; + } impl->ssl_context = ssl_context; - do { - result = - populate_ssl_context(ssl_context, pem_private_key, pem_private_key_size, - pem_cert_chain, pem_cert_chain_size, cipher_list); - if (result != TSI_OK) break; - result = ssl_ctx_load_verification_certs(ssl_context, pem_root_certs, - pem_root_certs_size, NULL); - if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Cannot load server root certificates."); - break; - } - - if (num_alpn_protocols != 0) { - result = build_alpn_protocol_name_list( - alpn_protocols, alpn_protocols_lengths, num_alpn_protocols, - &impl->alpn_protocol_list, &impl->alpn_protocol_list_length); - if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Building alpn list failed with error %s.", - tsi_result_to_string(result)); - break; - } + do + { + result = populate_ssl_context (ssl_context, pem_private_key, pem_private_key_size, pem_cert_chain, pem_cert_chain_size, cipher_list); + if (result != TSI_OK) + break; + result = ssl_ctx_load_verification_certs (ssl_context, pem_root_certs, pem_root_certs_size, NULL); + if (result != TSI_OK) + { + gpr_log (GPR_ERROR, "Cannot load server root certificates."); + break; + } + + if (num_alpn_protocols != 0) + { + result = build_alpn_protocol_name_list (alpn_protocols, alpn_protocols_lengths, num_alpn_protocols, &impl->alpn_protocol_list, &impl->alpn_protocol_list_length); + if (result != TSI_OK) + { + gpr_log (GPR_ERROR, "Building alpn list failed with error %s.", tsi_result_to_string (result)); + break; + } #if TSI_OPENSSL_ALPN_SUPPORT - GPR_ASSERT(impl->alpn_protocol_list_length < UINT_MAX); - if (SSL_CTX_set_alpn_protos( - ssl_context, impl->alpn_protocol_list, - (unsigned int)impl->alpn_protocol_list_length)) { - gpr_log(GPR_ERROR, "Could not set alpn protocol list to context."); - result = TSI_INVALID_ARGUMENT; - break; - } + GPR_ASSERT (impl->alpn_protocol_list_length < UINT_MAX); + if (SSL_CTX_set_alpn_protos (ssl_context, impl->alpn_protocol_list, (unsigned int) impl->alpn_protocol_list_length)) + { + gpr_log (GPR_ERROR, "Could not set alpn protocol list to context."); + result = TSI_INVALID_ARGUMENT; + break; + } #endif /* TSI_OPENSSL_ALPN_SUPPORT */ - SSL_CTX_set_next_proto_select_cb( - ssl_context, client_handshaker_factory_npn_callback, impl); + SSL_CTX_set_next_proto_select_cb (ssl_context, client_handshaker_factory_npn_callback, impl); + } } - } while (0); - if (result != TSI_OK) { - ssl_client_handshaker_factory_destroy(&impl->base); - return result; - } - SSL_CTX_set_verify(ssl_context, SSL_VERIFY_PEER, NULL); + while (0); + if (result != TSI_OK) + { + ssl_client_handshaker_factory_destroy (&impl->base); + return result; + } + SSL_CTX_set_verify (ssl_context, SSL_VERIFY_PEER, NULL); /* TODO(jboeuf): Add revocation verification. */ - impl->base.create_handshaker = - ssl_client_handshaker_factory_create_handshaker; + impl->base.create_handshaker = ssl_client_handshaker_factory_create_handshaker; impl->base.destroy = ssl_client_handshaker_factory_destroy; *factory = &impl->base; return TSI_OK; } -tsi_result tsi_create_ssl_server_handshaker_factory( - const unsigned char** pem_private_keys, - const size_t* pem_private_keys_sizes, const unsigned char** pem_cert_chains, - const size_t* pem_cert_chains_sizes, size_t key_cert_pair_count, - const unsigned char* pem_client_root_certs, - size_t pem_client_root_certs_size, int force_client_auth, - const char* cipher_list, const unsigned char** alpn_protocols, - const unsigned char* alpn_protocols_lengths, uint16_t num_alpn_protocols, - tsi_ssl_handshaker_factory** factory) { - tsi_ssl_server_handshaker_factory* impl = NULL; +tsi_result +tsi_create_ssl_server_handshaker_factory (const unsigned char **pem_private_keys, const size_t * pem_private_keys_sizes, const unsigned char **pem_cert_chains, const size_t * pem_cert_chains_sizes, size_t key_cert_pair_count, const unsigned char *pem_client_root_certs, size_t pem_client_root_certs_size, int force_client_auth, const char *cipher_list, const unsigned char **alpn_protocols, const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, tsi_ssl_handshaker_factory ** factory) +{ + tsi_ssl_server_handshaker_factory *impl = NULL; tsi_result result = TSI_OK; size_t i = 0; - gpr_once_init(&init_openssl_once, init_openssl); + gpr_once_init (&init_openssl_once, init_openssl); - if (factory == NULL) return TSI_INVALID_ARGUMENT; - *factory = NULL; - if (key_cert_pair_count == 0 || pem_private_keys == NULL || - pem_cert_chains == NULL) { + if (factory == NULL) return TSI_INVALID_ARGUMENT; - } + *factory = NULL; + if (key_cert_pair_count == 0 || pem_private_keys == NULL || pem_cert_chains == NULL) + { + return TSI_INVALID_ARGUMENT; + } - impl = calloc(1, sizeof(tsi_ssl_server_handshaker_factory)); - if (impl == NULL) return TSI_OUT_OF_RESOURCES; - impl->base.create_handshaker = - ssl_server_handshaker_factory_create_handshaker; - impl->base.destroy = ssl_server_handshaker_factory_destroy; - impl->ssl_contexts = calloc(key_cert_pair_count, sizeof(SSL_CTX*)); - impl->ssl_context_x509_subject_names = - calloc(key_cert_pair_count, sizeof(tsi_peer)); - if (impl->ssl_contexts == NULL || - impl->ssl_context_x509_subject_names == NULL) { - tsi_ssl_handshaker_factory_destroy(&impl->base); + impl = calloc (1, sizeof (tsi_ssl_server_handshaker_factory)); + if (impl == NULL) return TSI_OUT_OF_RESOURCES; - } + impl->base.create_handshaker = ssl_server_handshaker_factory_create_handshaker; + impl->base.destroy = ssl_server_handshaker_factory_destroy; + impl->ssl_contexts = calloc (key_cert_pair_count, sizeof (SSL_CTX *)); + impl->ssl_context_x509_subject_names = calloc (key_cert_pair_count, sizeof (tsi_peer)); + if (impl->ssl_contexts == NULL || impl->ssl_context_x509_subject_names == NULL) + { + tsi_ssl_handshaker_factory_destroy (&impl->base); + return TSI_OUT_OF_RESOURCES; + } impl->ssl_context_count = key_cert_pair_count; - if (num_alpn_protocols > 0) { - result = build_alpn_protocol_name_list( - alpn_protocols, alpn_protocols_lengths, num_alpn_protocols, - &impl->alpn_protocol_list, &impl->alpn_protocol_list_length); - if (result != TSI_OK) { - tsi_ssl_handshaker_factory_destroy(&impl->base); - return result; + if (num_alpn_protocols > 0) + { + result = build_alpn_protocol_name_list (alpn_protocols, alpn_protocols_lengths, num_alpn_protocols, &impl->alpn_protocol_list, &impl->alpn_protocol_list_length); + if (result != TSI_OK) + { + tsi_ssl_handshaker_factory_destroy (&impl->base); + return result; + } } - } - - for (i = 0; i < key_cert_pair_count; i++) { - do { - impl->ssl_contexts[i] = SSL_CTX_new(TLSv1_2_method()); - if (impl->ssl_contexts[i] == NULL) { - gpr_log(GPR_ERROR, "Could not create ssl context."); - result = TSI_OUT_OF_RESOURCES; - break; - } - result = populate_ssl_context( - impl->ssl_contexts[i], pem_private_keys[i], pem_private_keys_sizes[i], - pem_cert_chains[i], pem_cert_chains_sizes[i], cipher_list); - if (result != TSI_OK) break; - - if (pem_client_root_certs != NULL) { - int flags = SSL_VERIFY_PEER; - STACK_OF(X509_NAME)* root_names = NULL; - result = ssl_ctx_load_verification_certs( - impl->ssl_contexts[i], pem_client_root_certs, - pem_client_root_certs_size, &root_names); - if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Invalid verification certs."); - break; - } - SSL_CTX_set_client_CA_list(impl->ssl_contexts[i], root_names); - if (force_client_auth) flags |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT; - SSL_CTX_set_verify(impl->ssl_contexts[i], flags, NULL); - /* TODO(jboeuf): Add revocation verification. */ - } - - result = extract_x509_subject_names_from_pem_cert( - pem_cert_chains[i], pem_cert_chains_sizes[i], - &impl->ssl_context_x509_subject_names[i]); - if (result != TSI_OK) break; - SSL_CTX_set_tlsext_servername_callback( - impl->ssl_contexts[i], - ssl_server_handshaker_factory_servername_callback); - SSL_CTX_set_tlsext_servername_arg(impl->ssl_contexts[i], impl); + for (i = 0; i < key_cert_pair_count; i++) + { + do + { + impl->ssl_contexts[i] = SSL_CTX_new (TLSv1_2_method ()); + if (impl->ssl_contexts[i] == NULL) + { + gpr_log (GPR_ERROR, "Could not create ssl context."); + result = TSI_OUT_OF_RESOURCES; + break; + } + result = populate_ssl_context (impl->ssl_contexts[i], pem_private_keys[i], pem_private_keys_sizes[i], pem_cert_chains[i], pem_cert_chains_sizes[i], cipher_list); + if (result != TSI_OK) + break; + + if (pem_client_root_certs != NULL) + { + int flags = SSL_VERIFY_PEER; + STACK_OF (X509_NAME) * root_names = NULL; + result = ssl_ctx_load_verification_certs (impl->ssl_contexts[i], pem_client_root_certs, pem_client_root_certs_size, &root_names); + if (result != TSI_OK) + { + gpr_log (GPR_ERROR, "Invalid verification certs."); + break; + } + SSL_CTX_set_client_CA_list (impl->ssl_contexts[i], root_names); + if (force_client_auth) + flags |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT; + SSL_CTX_set_verify (impl->ssl_contexts[i], flags, NULL); + /* TODO(jboeuf): Add revocation verification. */ + } + + result = extract_x509_subject_names_from_pem_cert (pem_cert_chains[i], pem_cert_chains_sizes[i], &impl->ssl_context_x509_subject_names[i]); + if (result != TSI_OK) + break; + + SSL_CTX_set_tlsext_servername_callback (impl->ssl_contexts[i], ssl_server_handshaker_factory_servername_callback); + SSL_CTX_set_tlsext_servername_arg (impl->ssl_contexts[i], impl); #if TSI_OPENSSL_ALPN_SUPPORT - SSL_CTX_set_alpn_select_cb(impl->ssl_contexts[i], - server_handshaker_factory_alpn_callback, impl); + SSL_CTX_set_alpn_select_cb (impl->ssl_contexts[i], server_handshaker_factory_alpn_callback, impl); #endif /* TSI_OPENSSL_ALPN_SUPPORT */ - SSL_CTX_set_next_protos_advertised_cb( - impl->ssl_contexts[i], - server_handshaker_factory_npn_advertised_callback, impl); - } while (0); - - if (result != TSI_OK) { - tsi_ssl_handshaker_factory_destroy(&impl->base); - return result; + SSL_CTX_set_next_protos_advertised_cb (impl->ssl_contexts[i], server_handshaker_factory_npn_advertised_callback, impl); + } + while (0); + + if (result != TSI_OK) + { + tsi_ssl_handshaker_factory_destroy (&impl->base); + return result; + } } - } *factory = &impl->base; return TSI_OK; } /* --- tsi_ssl utils. --- */ -int tsi_ssl_peer_matches_name(const tsi_peer* peer, const char* name) { +int +tsi_ssl_peer_matches_name (const tsi_peer * peer, const char *name) +{ size_t i = 0; size_t san_count = 0; - const tsi_peer_property* cn_property = NULL; + const tsi_peer_property *cn_property = NULL; /* For now reject what looks like an IP address. */ - if (looks_like_ip_address(name)) return 0; + if (looks_like_ip_address (name)) + return 0; /* Check the SAN first. */ - for (i = 0; i < peer->property_count; i++) { - const tsi_peer_property* property = &peer->properties[i]; - if (property->name == NULL) continue; - if (strcmp(property->name, - TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY) == 0) { - san_count++; - if (does_entry_match_name(property->value.data, property->value.length, - name)) { - return 1; - } - } else if (strcmp(property->name, - TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY) == 0) { - cn_property = property; + for (i = 0; i < peer->property_count; i++) + { + const tsi_peer_property *property = &peer->properties[i]; + if (property->name == NULL) + continue; + if (strcmp (property->name, TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY) == 0) + { + san_count++; + if (does_entry_match_name (property->value.data, property->value.length, name)) + { + return 1; + } + } + else if (strcmp (property->name, TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY) == 0) + { + cn_property = property; + } } - } /* If there's no SAN, try the CN. */ - if (san_count == 0 && cn_property != NULL) { - if (does_entry_match_name(cn_property->value.data, - cn_property->value.length, name)) { - return 1; + if (san_count == 0 && cn_property != NULL) + { + if (does_entry_match_name (cn_property->value.data, cn_property->value.length, name)) + { + return 1; + } } - } - return 0; /* Not found. */ + return 0; /* Not found. */ } diff --git a/src/core/tsi/ssl_transport_security.h b/src/core/tsi/ssl_transport_security.h index cdf4f294be3..c3c4c2f9736 100644 --- a/src/core/tsi/ssl_transport_security.h +++ b/src/core/tsi/ssl_transport_security.h @@ -37,7 +37,8 @@ #include "src/core/tsi/transport_security_interface.h" #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif /* Value for the TSI_CERTIFICATE_TYPE_PEER_PROPERTY property for X509 certs. */ @@ -55,7 +56,7 @@ extern "C" { This object creates tsi_handshaker objects implemented in terms of the TLS 1.2 specificiation. */ -typedef struct tsi_ssl_handshaker_factory tsi_ssl_handshaker_factory; + typedef struct tsi_ssl_handshaker_factory tsi_ssl_handshaker_factory; /* Creates a client handshaker factory. - pem_private_key is the buffer containing the PEM encoding of the client's @@ -84,13 +85,7 @@ typedef struct tsi_ssl_handshaker_factory tsi_ssl_handshaker_factory; - This method returns TSI_OK on success or TSI_INVALID_PARAMETER in the case where a parameter is invalid. */ -tsi_result tsi_create_ssl_client_handshaker_factory( - const unsigned char* pem_private_key, size_t pem_private_key_size, - const unsigned char* pem_cert_chain, size_t pem_cert_chain_size, - const unsigned char* pem_root_certs, size_t pem_root_certs_size, - const char* cipher_suites, const unsigned char** alpn_protocols, - const unsigned char* alpn_protocols_lengths, uint16_t num_alpn_protocols, - tsi_ssl_handshaker_factory** factory); + tsi_result tsi_create_ssl_client_handshaker_factory (const unsigned char *pem_private_key, size_t pem_private_key_size, const unsigned char *pem_cert_chain, size_t pem_cert_chain_size, const unsigned char *pem_root_certs, size_t pem_root_certs_size, const char *cipher_suites, const unsigned char **alpn_protocols, const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, tsi_ssl_handshaker_factory ** factory); /* Creates a server handshaker factory. - version indicates which version of the specification to use. @@ -130,15 +125,7 @@ tsi_result tsi_create_ssl_client_handshaker_factory( - This method returns TSI_OK on success or TSI_INVALID_PARAMETER in the case where a parameter is invalid. */ -tsi_result tsi_create_ssl_server_handshaker_factory( - const unsigned char** pem_private_keys, - const size_t* pem_private_keys_sizes, const unsigned char** pem_cert_chains, - const size_t* pem_cert_chains_sizes, size_t key_cert_pair_count, - const unsigned char* pem_client_root_certs, - size_t pem_client_root_certs_size, int force_client_auth, - const char* cipher_suites, const unsigned char** alpn_protocols, - const unsigned char* alpn_protocols_lengths, uint16_t num_alpn_protocols, - tsi_ssl_handshaker_factory** factory); + tsi_result tsi_create_ssl_server_handshaker_factory (const unsigned char **pem_private_keys, const size_t * pem_private_keys_sizes, const unsigned char **pem_cert_chains, const size_t * pem_cert_chains_sizes, size_t key_cert_pair_count, const unsigned char *pem_client_root_certs, size_t pem_client_root_certs_size, int force_client_auth, const char *cipher_suites, const unsigned char **alpn_protocols, const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, tsi_ssl_handshaker_factory ** factory); /* Creates a handshaker. - self is the factory from which the handshaker will be created. @@ -150,13 +137,11 @@ tsi_result tsi_create_ssl_server_handshaker_factory( - This method returns TSI_OK on success or TSI_INVALID_PARAMETER in the case where a parameter is invalid. */ -tsi_result tsi_ssl_handshaker_factory_create_handshaker( - tsi_ssl_handshaker_factory* self, const char* server_name_indication, - tsi_handshaker** handshaker); + tsi_result tsi_ssl_handshaker_factory_create_handshaker (tsi_ssl_handshaker_factory * self, const char *server_name_indication, tsi_handshaker ** handshaker); /* Destroys the handshaker factory. WARNING: it is unsafe to destroy a factory while handshakers created with this factory are still in use. */ -void tsi_ssl_handshaker_factory_destroy(tsi_ssl_handshaker_factory* self); + void tsi_ssl_handshaker_factory_destroy (tsi_ssl_handshaker_factory * self); /* Util that checks that an ssl peer matches a specific name. Still TODO(jboeuf): @@ -164,10 +149,10 @@ void tsi_ssl_handshaker_factory_destroy(tsi_ssl_handshaker_factory* self); - handle %encoded chars. - handle public suffix wildchar more strictly (e.g. *.co.uk) - handle IP addresses in SAN. */ -int tsi_ssl_peer_matches_name(const tsi_peer* peer, const char* name); + int tsi_ssl_peer_matches_name (const tsi_peer * peer, const char *name); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_TSI_SSL_TRANSPORT_SECURITY_H */ +#endif /* GRPC_INTERNAL_CORE_TSI_SSL_TRANSPORT_SECURITY_H */ diff --git a/src/core/tsi/transport_security.c b/src/core/tsi/transport_security.c index ec02a478ba4..c26ee40c4cd 100644 --- a/src/core/tsi/transport_security.c +++ b/src/core/tsi/transport_security.c @@ -42,21 +42,28 @@ int tsi_tracing_enabled = 0; /* --- Utils. --- */ -char* tsi_strdup(const char* src) { - char* dst; +char * +tsi_strdup (const char *src) +{ + char *dst; size_t len; - if (!src) return NULL; - len = strlen(src) + 1; - dst = malloc(len); - if (!dst) return NULL; - memcpy(dst, src, len); + if (!src) + return NULL; + len = strlen (src) + 1; + dst = malloc (len); + if (!dst) + return NULL; + memcpy (dst, src, len); return dst; } /* --- tsi_result common implementation. --- */ -const char* tsi_result_to_string(tsi_result result) { - switch (result) { +const char * +tsi_result_to_string (tsi_result result) +{ + switch (result) + { case TSI_OK: return "TSI_OK"; case TSI_UNKNOWN_ERROR: @@ -85,196 +92,228 @@ const char* tsi_result_to_string(tsi_result result) { return "TSI_OUT_OF_RESOURCES"; default: return "UNKNOWN"; - } + } } /* --- tsi_frame_protector common implementation. --- Calls specific implementation after state/input validation. */ -tsi_result tsi_frame_protector_protect(tsi_frame_protector* self, - const unsigned char* unprotected_bytes, - size_t* unprotected_bytes_size, - unsigned char* protected_output_frames, - size_t* protected_output_frames_size) { - if (self == NULL || unprotected_bytes == NULL || - unprotected_bytes_size == NULL || protected_output_frames == NULL || - protected_output_frames_size == NULL) { - return TSI_INVALID_ARGUMENT; - } - return self->vtable->protect(self, unprotected_bytes, unprotected_bytes_size, - protected_output_frames, - protected_output_frames_size); +tsi_result +tsi_frame_protector_protect (tsi_frame_protector * self, const unsigned char *unprotected_bytes, size_t * unprotected_bytes_size, unsigned char *protected_output_frames, size_t * protected_output_frames_size) +{ + if (self == NULL || unprotected_bytes == NULL || unprotected_bytes_size == NULL || protected_output_frames == NULL || protected_output_frames_size == NULL) + { + return TSI_INVALID_ARGUMENT; + } + return self->vtable->protect (self, unprotected_bytes, unprotected_bytes_size, protected_output_frames, protected_output_frames_size); } -tsi_result tsi_frame_protector_protect_flush( - tsi_frame_protector* self, unsigned char* protected_output_frames, - size_t* protected_output_frames_size, size_t* still_pending_size) { - if (self == NULL || protected_output_frames == NULL || - protected_output_frames == NULL || still_pending_size == NULL) { - return TSI_INVALID_ARGUMENT; - } - return self->vtable->protect_flush(self, protected_output_frames, - protected_output_frames_size, - still_pending_size); +tsi_result +tsi_frame_protector_protect_flush (tsi_frame_protector * self, unsigned char *protected_output_frames, size_t * protected_output_frames_size, size_t * still_pending_size) +{ + if (self == NULL || protected_output_frames == NULL || protected_output_frames == NULL || still_pending_size == NULL) + { + return TSI_INVALID_ARGUMENT; + } + return self->vtable->protect_flush (self, protected_output_frames, protected_output_frames_size, still_pending_size); } -tsi_result tsi_frame_protector_unprotect( - tsi_frame_protector* self, const unsigned char* protected_frames_bytes, - size_t* protected_frames_bytes_size, unsigned char* unprotected_bytes, - size_t* unprotected_bytes_size) { - if (self == NULL || protected_frames_bytes == NULL || - protected_frames_bytes_size == NULL || unprotected_bytes == NULL || - unprotected_bytes_size == NULL) { - return TSI_INVALID_ARGUMENT; - } - return self->vtable->unprotect(self, protected_frames_bytes, - protected_frames_bytes_size, unprotected_bytes, - unprotected_bytes_size); +tsi_result +tsi_frame_protector_unprotect (tsi_frame_protector * self, const unsigned char *protected_frames_bytes, size_t * protected_frames_bytes_size, unsigned char *unprotected_bytes, size_t * unprotected_bytes_size) +{ + if (self == NULL || protected_frames_bytes == NULL || protected_frames_bytes_size == NULL || unprotected_bytes == NULL || unprotected_bytes_size == NULL) + { + return TSI_INVALID_ARGUMENT; + } + return self->vtable->unprotect (self, protected_frames_bytes, protected_frames_bytes_size, unprotected_bytes, unprotected_bytes_size); } -void tsi_frame_protector_destroy(tsi_frame_protector* self) { - if (self == NULL) return; - self->vtable->destroy(self); +void +tsi_frame_protector_destroy (tsi_frame_protector * self) +{ + if (self == NULL) + return; + self->vtable->destroy (self); } /* --- tsi_handshaker common implementation. --- Calls specific implementation after state/input validation. */ -tsi_result tsi_handshaker_get_bytes_to_send_to_peer(tsi_handshaker* self, - unsigned char* bytes, - size_t* bytes_size) { - if (self == NULL) return TSI_INVALID_ARGUMENT; - if (self->frame_protector_created) return TSI_FAILED_PRECONDITION; - return self->vtable->get_bytes_to_send_to_peer(self, bytes, bytes_size); +tsi_result +tsi_handshaker_get_bytes_to_send_to_peer (tsi_handshaker * self, unsigned char *bytes, size_t * bytes_size) +{ + if (self == NULL) + return TSI_INVALID_ARGUMENT; + if (self->frame_protector_created) + return TSI_FAILED_PRECONDITION; + return self->vtable->get_bytes_to_send_to_peer (self, bytes, bytes_size); } -tsi_result tsi_handshaker_process_bytes_from_peer(tsi_handshaker* self, - const unsigned char* bytes, - size_t* bytes_size) { - if (self == NULL) return TSI_INVALID_ARGUMENT; - if (self->frame_protector_created) return TSI_FAILED_PRECONDITION; - return self->vtable->process_bytes_from_peer(self, bytes, bytes_size); +tsi_result +tsi_handshaker_process_bytes_from_peer (tsi_handshaker * self, const unsigned char *bytes, size_t * bytes_size) +{ + if (self == NULL) + return TSI_INVALID_ARGUMENT; + if (self->frame_protector_created) + return TSI_FAILED_PRECONDITION; + return self->vtable->process_bytes_from_peer (self, bytes, bytes_size); } -tsi_result tsi_handshaker_get_result(tsi_handshaker* self) { - if (self == NULL) return TSI_INVALID_ARGUMENT; - if (self->frame_protector_created) return TSI_FAILED_PRECONDITION; - return self->vtable->get_result(self); +tsi_result +tsi_handshaker_get_result (tsi_handshaker * self) +{ + if (self == NULL) + return TSI_INVALID_ARGUMENT; + if (self->frame_protector_created) + return TSI_FAILED_PRECONDITION; + return self->vtable->get_result (self); } -tsi_result tsi_handshaker_extract_peer(tsi_handshaker* self, tsi_peer* peer) { - if (self == NULL || peer == NULL) return TSI_INVALID_ARGUMENT; - memset(peer, 0, sizeof(tsi_peer)); - if (self->frame_protector_created) return TSI_FAILED_PRECONDITION; - if (tsi_handshaker_get_result(self) != TSI_OK) { +tsi_result +tsi_handshaker_extract_peer (tsi_handshaker * self, tsi_peer * peer) +{ + if (self == NULL || peer == NULL) + return TSI_INVALID_ARGUMENT; + memset (peer, 0, sizeof (tsi_peer)); + if (self->frame_protector_created) return TSI_FAILED_PRECONDITION; - } - return self->vtable->extract_peer(self, peer); + if (tsi_handshaker_get_result (self) != TSI_OK) + { + return TSI_FAILED_PRECONDITION; + } + return self->vtable->extract_peer (self, peer); } -tsi_result tsi_handshaker_create_frame_protector( - tsi_handshaker* self, size_t* max_protected_frame_size, - tsi_frame_protector** protector) { +tsi_result +tsi_handshaker_create_frame_protector (tsi_handshaker * self, size_t * max_protected_frame_size, tsi_frame_protector ** protector) +{ tsi_result result; - if (self == NULL || protector == NULL) return TSI_INVALID_ARGUMENT; - if (self->frame_protector_created) return TSI_FAILED_PRECONDITION; - if (tsi_handshaker_get_result(self) != TSI_OK) { + if (self == NULL || protector == NULL) + return TSI_INVALID_ARGUMENT; + if (self->frame_protector_created) return TSI_FAILED_PRECONDITION; - } - result = self->vtable->create_frame_protector(self, max_protected_frame_size, - protector); - if (result == TSI_OK) { - self->frame_protector_created = 1; - } + if (tsi_handshaker_get_result (self) != TSI_OK) + { + return TSI_FAILED_PRECONDITION; + } + result = self->vtable->create_frame_protector (self, max_protected_frame_size, protector); + if (result == TSI_OK) + { + self->frame_protector_created = 1; + } return result; } -void tsi_handshaker_destroy(tsi_handshaker* self) { - if (self == NULL) return; - self->vtable->destroy(self); +void +tsi_handshaker_destroy (tsi_handshaker * self) +{ + if (self == NULL) + return; + self->vtable->destroy (self); } /* --- tsi_peer implementation. --- */ -tsi_peer_property tsi_init_peer_property(void) { +tsi_peer_property +tsi_init_peer_property (void) +{ tsi_peer_property property; - memset(&property, 0, sizeof(tsi_peer_property)); + memset (&property, 0, sizeof (tsi_peer_property)); return property; } -static void tsi_peer_destroy_list_property(tsi_peer_property* children, - size_t child_count) { +static void +tsi_peer_destroy_list_property (tsi_peer_property * children, size_t child_count) +{ size_t i; - for (i = 0; i < child_count; i++) { - tsi_peer_property_destruct(&children[i]); - } - free(children); + for (i = 0; i < child_count; i++) + { + tsi_peer_property_destruct (&children[i]); + } + free (children); } -void tsi_peer_property_destruct(tsi_peer_property* property) { - if (property->name != NULL) { - free(property->name); - } - if (property->value.data != NULL) { - free(property->value.data); - } - *property = tsi_init_peer_property(); /* Reset everything to 0. */ +void +tsi_peer_property_destruct (tsi_peer_property * property) +{ + if (property->name != NULL) + { + free (property->name); + } + if (property->value.data != NULL) + { + free (property->value.data); + } + *property = tsi_init_peer_property (); /* Reset everything to 0. */ } -void tsi_peer_destruct(tsi_peer* self) { - if (self == NULL) return; - if (self->properties != NULL) { - tsi_peer_destroy_list_property(self->properties, self->property_count); - self->properties = NULL; - } +void +tsi_peer_destruct (tsi_peer * self) +{ + if (self == NULL) + return; + if (self->properties != NULL) + { + tsi_peer_destroy_list_property (self->properties, self->property_count); + self->properties = NULL; + } self->property_count = 0; } -tsi_result tsi_construct_allocated_string_peer_property( - const char* name, size_t value_length, tsi_peer_property* property) { - *property = tsi_init_peer_property(); - if (name != NULL) { - property->name = tsi_strdup(name); - if (property->name == NULL) return TSI_OUT_OF_RESOURCES; - } - if (value_length > 0) { - property->value.data = calloc(1, value_length); - if (property->value.data == NULL) { - tsi_peer_property_destruct(property); - return TSI_OUT_OF_RESOURCES; +tsi_result +tsi_construct_allocated_string_peer_property (const char *name, size_t value_length, tsi_peer_property * property) +{ + *property = tsi_init_peer_property (); + if (name != NULL) + { + property->name = tsi_strdup (name); + if (property->name == NULL) + return TSI_OUT_OF_RESOURCES; + } + if (value_length > 0) + { + property->value.data = calloc (1, value_length); + if (property->value.data == NULL) + { + tsi_peer_property_destruct (property); + return TSI_OUT_OF_RESOURCES; + } + property->value.length = value_length; } - property->value.length = value_length; - } return TSI_OK; } -tsi_result tsi_construct_string_peer_property_from_cstring( - const char* name, const char* value, tsi_peer_property* property) { - return tsi_construct_string_peer_property(name, value, strlen(value), - property); +tsi_result +tsi_construct_string_peer_property_from_cstring (const char *name, const char *value, tsi_peer_property * property) +{ + return tsi_construct_string_peer_property (name, value, strlen (value), property); } -tsi_result tsi_construct_string_peer_property(const char* name, - const char* value, - size_t value_length, - tsi_peer_property* property) { - tsi_result result = tsi_construct_allocated_string_peer_property( - name, value_length, property); - if (result != TSI_OK) return result; - if (value_length > 0) { - memcpy(property->value.data, value, value_length); - } +tsi_result +tsi_construct_string_peer_property (const char *name, const char *value, size_t value_length, tsi_peer_property * property) +{ + tsi_result result = tsi_construct_allocated_string_peer_property (name, value_length, property); + if (result != TSI_OK) + return result; + if (value_length > 0) + { + memcpy (property->value.data, value, value_length); + } return TSI_OK; } -tsi_result tsi_construct_peer(size_t property_count, tsi_peer* peer) { - memset(peer, 0, sizeof(tsi_peer)); - if (property_count > 0) { - peer->properties = calloc(property_count, sizeof(tsi_peer_property)); - if (peer->properties == NULL) return TSI_OUT_OF_RESOURCES; - peer->property_count = property_count; - } +tsi_result +tsi_construct_peer (size_t property_count, tsi_peer * peer) +{ + memset (peer, 0, sizeof (tsi_peer)); + if (property_count > 0) + { + peer->properties = calloc (property_count, sizeof (tsi_peer_property)); + if (peer->properties == NULL) + return TSI_OUT_OF_RESOURCES; + peer->property_count = property_count; + } return TSI_OK; } diff --git a/src/core/tsi/transport_security.h b/src/core/tsi/transport_security.h index 34283f2f9c7..3ae82a31cc8 100644 --- a/src/core/tsi/transport_security.h +++ b/src/core/tsi/transport_security.h @@ -37,75 +37,58 @@ #include "src/core/tsi/transport_security_interface.h" #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif -extern int tsi_tracing_enabled; + extern int tsi_tracing_enabled; /* Base for tsi_frame_protector implementations. See transport_security_interface.h for documentation. */ -typedef struct { - tsi_result (*protect)(tsi_frame_protector* self, - const unsigned char* unprotected_bytes, - size_t* unprotected_bytes_size, - unsigned char* protected_output_frames, - size_t* protected_output_frames_size); - tsi_result (*protect_flush)(tsi_frame_protector* self, - unsigned char* protected_output_frames, - size_t* protected_output_frames_size, - size_t* still_pending_size); - tsi_result (*unprotect)(tsi_frame_protector* self, - const unsigned char* protected_frames_bytes, - size_t* protected_frames_bytes_size, - unsigned char* unprotected_bytes, - size_t* unprotected_bytes_size); - void (*destroy)(tsi_frame_protector* self); -} tsi_frame_protector_vtable; + typedef struct + { + tsi_result (*protect) (tsi_frame_protector * self, const unsigned char *unprotected_bytes, size_t * unprotected_bytes_size, unsigned char *protected_output_frames, size_t * protected_output_frames_size); + tsi_result (*protect_flush) (tsi_frame_protector * self, unsigned char *protected_output_frames, size_t * protected_output_frames_size, size_t * still_pending_size); + tsi_result (*unprotect) (tsi_frame_protector * self, const unsigned char *protected_frames_bytes, size_t * protected_frames_bytes_size, unsigned char *unprotected_bytes, size_t * unprotected_bytes_size); + void (*destroy) (tsi_frame_protector * self); + } tsi_frame_protector_vtable; -struct tsi_frame_protector { - const tsi_frame_protector_vtable* vtable; -}; + struct tsi_frame_protector + { + const tsi_frame_protector_vtable *vtable; + }; /* Base for tsi_handshaker implementations. See transport_security_interface.h for documentation. */ -typedef struct { - tsi_result (*get_bytes_to_send_to_peer)(tsi_handshaker* self, - unsigned char* bytes, - size_t* bytes_size); - tsi_result (*process_bytes_from_peer)(tsi_handshaker* self, - const unsigned char* bytes, - size_t* bytes_size); - tsi_result (*get_result)(tsi_handshaker* self); - tsi_result (*extract_peer)(tsi_handshaker* self, tsi_peer* peer); - tsi_result (*create_frame_protector)(tsi_handshaker* self, - size_t* max_protected_frame_size, - tsi_frame_protector** protector); - void (*destroy)(tsi_handshaker* self); -} tsi_handshaker_vtable; + typedef struct + { + tsi_result (*get_bytes_to_send_to_peer) (tsi_handshaker * self, unsigned char *bytes, size_t * bytes_size); + tsi_result (*process_bytes_from_peer) (tsi_handshaker * self, const unsigned char *bytes, size_t * bytes_size); + tsi_result (*get_result) (tsi_handshaker * self); + tsi_result (*extract_peer) (tsi_handshaker * self, tsi_peer * peer); + tsi_result (*create_frame_protector) (tsi_handshaker * self, size_t * max_protected_frame_size, tsi_frame_protector ** protector); + void (*destroy) (tsi_handshaker * self); + } tsi_handshaker_vtable; -struct tsi_handshaker { - const tsi_handshaker_vtable* vtable; - int frame_protector_created; -}; + struct tsi_handshaker + { + const tsi_handshaker_vtable *vtable; + int frame_protector_created; + }; /* Peer and property construction/destruction functions. */ -tsi_result tsi_construct_peer(size_t property_count, tsi_peer* peer); -tsi_peer_property tsi_init_peer_property(void); -void tsi_peer_property_destruct(tsi_peer_property* property); -tsi_result tsi_construct_string_peer_property(const char* name, - const char* value, - size_t value_length, - tsi_peer_property* property); -tsi_result tsi_construct_allocated_string_peer_property( - const char* name, size_t value_length, tsi_peer_property* property); -tsi_result tsi_construct_string_peer_property_from_cstring( - const char* name, const char* value, tsi_peer_property* property); + tsi_result tsi_construct_peer (size_t property_count, tsi_peer * peer); + tsi_peer_property tsi_init_peer_property (void); + void tsi_peer_property_destruct (tsi_peer_property * property); + tsi_result tsi_construct_string_peer_property (const char *name, const char *value, size_t value_length, tsi_peer_property * property); + tsi_result tsi_construct_allocated_string_peer_property (const char *name, size_t value_length, tsi_peer_property * property); + tsi_result tsi_construct_string_peer_property_from_cstring (const char *name, const char *value, tsi_peer_property * property); /* Utils. */ -char* tsi_strdup(const char* src); /* Sadly, no strdup in C89. */ + char *tsi_strdup (const char *src); /* Sadly, no strdup in C89. */ #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_TSI_TRANSPORT_SECURITY_H */ +#endif /* GRPC_INTERNAL_CORE_TSI_TRANSPORT_SECURITY_H */ diff --git a/src/core/tsi/transport_security_interface.h b/src/core/tsi/transport_security_interface.h index 03a51683a28..e43b31fd067 100644 --- a/src/core/tsi/transport_security_interface.h +++ b/src/core/tsi/transport_security_interface.h @@ -38,40 +38,42 @@ #include #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif /* --- tsi result --- */ -typedef enum { - TSI_OK = 0, - TSI_UNKNOWN_ERROR = 1, - TSI_INVALID_ARGUMENT = 2, - TSI_PERMISSION_DENIED = 3, - TSI_INCOMPLETE_DATA = 4, - TSI_FAILED_PRECONDITION = 5, - TSI_UNIMPLEMENTED = 6, - TSI_INTERNAL_ERROR = 7, - TSI_DATA_CORRUPTED = 8, - TSI_NOT_FOUND = 9, - TSI_PROTOCOL_FAILURE = 10, - TSI_HANDSHAKE_IN_PROGRESS = 11, - TSI_OUT_OF_RESOURCES = 12 -} tsi_result; - -const char* tsi_result_to_string(tsi_result result); + typedef enum + { + TSI_OK = 0, + TSI_UNKNOWN_ERROR = 1, + TSI_INVALID_ARGUMENT = 2, + TSI_PERMISSION_DENIED = 3, + TSI_INCOMPLETE_DATA = 4, + TSI_FAILED_PRECONDITION = 5, + TSI_UNIMPLEMENTED = 6, + TSI_INTERNAL_ERROR = 7, + TSI_DATA_CORRUPTED = 8, + TSI_NOT_FOUND = 9, + TSI_PROTOCOL_FAILURE = 10, + TSI_HANDSHAKE_IN_PROGRESS = 11, + TSI_OUT_OF_RESOURCES = 12 + } tsi_result; + + const char *tsi_result_to_string (tsi_result result); /* --- tsi tracing --- */ /* Set this early to avoid races */ -extern int tsi_tracing_enabled; + extern int tsi_tracing_enabled; /* --- tsi_frame_protector object --- This object protects and unprotects buffers once the handshake is done. Implementations of this object must be thread compatible. */ -typedef struct tsi_frame_protector tsi_frame_protector; + typedef struct tsi_frame_protector tsi_frame_protector; /* Outputs protected frames. - unprotected_bytes is an input only parameter and points to the data @@ -126,11 +128,7 @@ typedef struct tsi_frame_protector tsi_frame_protector; if (result != TSI_OK) HandleError(result); ------------------------------------------------------------------------ */ -tsi_result tsi_frame_protector_protect(tsi_frame_protector* self, - const unsigned char* unprotected_bytes, - size_t* unprotected_bytes_size, - unsigned char* protected_output_frames, - size_t* protected_output_frames_size); + tsi_result tsi_frame_protector_protect (tsi_frame_protector * self, const unsigned char *unprotected_bytes, size_t * unprotected_bytes_size, unsigned char *protected_output_frames, size_t * protected_output_frames_size); /* Indicates that we need to flush the bytes buffered in the protector and get the resulting frame. @@ -140,9 +138,7 @@ tsi_result tsi_frame_protector_protect(tsi_frame_protector* self, caller to specify how many bytes are available in protected_output_frames. - still_pending_bytes is an output parameter indicating the number of bytes that still need to be flushed from the protector.*/ -tsi_result tsi_frame_protector_protect_flush( - tsi_frame_protector* self, unsigned char* protected_output_frames, - size_t* protected_output_frames_size, size_t* still_pending_size); + tsi_result tsi_frame_protector_protect_flush (tsi_frame_protector * self, unsigned char *protected_output_frames, size_t * protected_output_frames_size, size_t * still_pending_size); /* Outputs unprotected bytes. - protected_frames_bytes is an input only parameter and points to the @@ -166,13 +162,10 @@ tsi_result tsi_frame_protector_protect_flush( unprotected_bytes_size will be set to 0 and cases where the internal buffer needs to be read before new protected data can be processed in which case protected_frames_size will be set to 0. */ -tsi_result tsi_frame_protector_unprotect( - tsi_frame_protector* self, const unsigned char* protected_frames_bytes, - size_t* protected_frames_bytes_size, unsigned char* unprotected_bytes, - size_t* unprotected_bytes_size); + tsi_result tsi_frame_protector_unprotect (tsi_frame_protector * self, const unsigned char *protected_frames_bytes, size_t * protected_frames_bytes_size, unsigned char *unprotected_bytes, size_t * unprotected_bytes_size); /* Destroys the tsi_frame_protector object. */ -void tsi_frame_protector_destroy(tsi_frame_protector* self); + void tsi_frame_protector_destroy (tsi_frame_protector * self); /* --- tsi_peer objects --- @@ -183,21 +176,24 @@ void tsi_frame_protector_destroy(tsi_frame_protector* self); /* Property values may contain NULL characters just like C++ strings. The length field gives the length of the string. */ -typedef struct tsi_peer_property { - char* name; - struct { - char* data; - size_t length; - } value; -} tsi_peer_property; - -typedef struct { - tsi_peer_property* properties; - size_t property_count; -} tsi_peer; + typedef struct tsi_peer_property + { + char *name; + struct + { + char *data; + size_t length; + } value; + } tsi_peer_property; + + typedef struct + { + tsi_peer_property *properties; + size_t property_count; + } tsi_peer; /* Destructs the tsi_peer object. */ -void tsi_peer_destruct(tsi_peer* self); + void tsi_peer_destruct (tsi_peer * self); /* --- tsi_handshaker objects ---- @@ -266,7 +262,7 @@ void tsi_peer_destruct(tsi_peer* self); } ... ------------------------------------------------------------------------ */ -typedef struct tsi_handshaker tsi_handshaker; + typedef struct tsi_handshaker tsi_handshaker; /* Gets bytes that need to be sent to the peer. - bytes is the buffer that will be written with the data to be sent to the @@ -279,9 +275,7 @@ typedef struct tsi_handshaker tsi_handshaker; needs to be called again to get all the bytes to send to the peer (there was more data to write than the specified bytes_size). In case of a fatal error in the handshake, another specific error code is returned. */ -tsi_result tsi_handshaker_get_bytes_to_send_to_peer(tsi_handshaker* self, - unsigned char* bytes, - size_t* bytes_size); + tsi_result tsi_handshaker_get_bytes_to_send_to_peer (tsi_handshaker * self, unsigned char *bytes, size_t * bytes_size); /* Processes bytes received from the peer. - bytes is the buffer containing the data. @@ -292,16 +286,14 @@ tsi_result tsi_handshaker_get_bytes_to_send_to_peer(tsi_handshaker* self, needs to be called again to complete the data needed for processing. In case of a fatal error in the handshake, another specific error code is returned. */ -tsi_result tsi_handshaker_process_bytes_from_peer(tsi_handshaker* self, - const unsigned char* bytes, - size_t* bytes_size); + tsi_result tsi_handshaker_process_bytes_from_peer (tsi_handshaker * self, const unsigned char *bytes, size_t * bytes_size); /* Gets the result of the handshaker. Returns TSI_OK if the hanshake completed successfully and there has been no errors. Returns TSI_HANDSHAKE_IN_PROGRESS if the handshaker is not done yet but no error has been encountered so far. Otherwise the handshaker failed with the returned error. */ -tsi_result tsi_handshaker_get_result(tsi_handshaker* self); + tsi_result tsi_handshaker_get_result (tsi_handshaker * self); /* Returns 1 if the handshake is in progress, 0 otherwise. */ #define tsi_handshaker_is_in_progress(h) \ @@ -311,7 +303,7 @@ tsi_result tsi_handshaker_get_result(tsi_handshaker* self); tsi_handshaker_is_in_progress returns 1, it returns TSI_OK otherwise assuming the handshaker is not in a fatal error state. The caller is responsible for destructing the peer. */ -tsi_result tsi_handshaker_extract_peer(tsi_handshaker* self, tsi_peer* peer); + tsi_result tsi_handshaker_extract_peer (tsi_handshaker * self, tsi_peer * peer); /* This method creates a tsi_frame_protector object after the handshake phase is done. After this method has been called successfully, the only method @@ -329,16 +321,14 @@ tsi_result tsi_handshaker_extract_peer(tsi_handshaker* self, tsi_peer* peer); tsi_handshaker_is_in_progress returns 1, it returns TSI_OK otherwise assuming the handshaker is not in a fatal error state. The caller is responsible for destroying the protector. */ -tsi_result tsi_handshaker_create_frame_protector( - tsi_handshaker* self, size_t* max_output_protected_frame_size, - tsi_frame_protector** protector); + tsi_result tsi_handshaker_create_frame_protector (tsi_handshaker * self, size_t * max_output_protected_frame_size, tsi_frame_protector ** protector); /* This method releases the tsi_handshaker object. After this method is called, no other method can be called on the object. */ -void tsi_handshaker_destroy(tsi_handshaker* self); + void tsi_handshaker_destroy (tsi_handshaker * self); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H */ +#endif /* GRPC_INTERNAL_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H */ diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index 76059044114..7661aec6569 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -45,7 +45,8 @@ #include #include -typedef struct { +typedef struct +{ grpc_server *server; grpc_completion_queue *cq; grpc_bad_client_server_side_validator validator; @@ -53,121 +54,117 @@ typedef struct { gpr_event done_write; } thd_args; -static void thd_func(void *arg) { +static void +thd_func (void *arg) +{ thd_args *a = arg; - a->validator(a->server, a->cq); - gpr_event_set(&a->done_thd, (void *)1); + a->validator (a->server, a->cq); + gpr_event_set (&a->done_thd, (void *) 1); } -static void done_write(void *arg, int success, - grpc_closure_list *closure_list) { +static void +done_write (void *arg, int success, grpc_closure_list * closure_list) +{ thd_args *a = arg; - gpr_event_set(&a->done_write, (void *)1); + gpr_event_set (&a->done_write, (void *) 1); } -static void server_setup_transport(void *ts, grpc_transport *transport, - grpc_mdctx *mdctx) { +static void +server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx) +{ thd_args *a = ts; static grpc_channel_filter const *extra_filters[] = { - &grpc_http_server_filter}; + &grpc_http_server_filter + }; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_server_setup_transport( - a->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - grpc_server_get_channel_args(a->server), &closure_list); - grpc_closure_list_run(&closure_list); + grpc_server_setup_transport (a->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (a->server), &closure_list); + grpc_closure_list_run (&closure_list); } -void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, - const char *client_payload, - size_t client_payload_length, gpr_uint32 flags) { +void +grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const char *client_payload, size_t client_payload_length, gpr_uint32 flags) +{ grpc_endpoint_pair sfd; thd_args a; gpr_thd_id id; char *hex; grpc_transport *transport; - grpc_mdctx *mdctx = grpc_mdctx_create(); - gpr_slice slice = - gpr_slice_from_copied_buffer(client_payload, client_payload_length); + grpc_mdctx *mdctx = grpc_mdctx_create (); + gpr_slice slice = gpr_slice_from_copied_buffer (client_payload, client_payload_length); gpr_slice_buffer outgoing; grpc_closure done_write_closure; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - hex = gpr_dump(client_payload, client_payload_length, - GPR_DUMP_HEX | GPR_DUMP_ASCII); + hex = gpr_dump (client_payload, client_payload_length, GPR_DUMP_HEX | GPR_DUMP_ASCII); /* Add a debug log */ - gpr_log(GPR_INFO, "TEST: %s", hex); + gpr_log (GPR_INFO, "TEST: %s", hex); - gpr_free(hex); + gpr_free (hex); /* Init grpc */ - grpc_init(); + grpc_init (); /* Create endpoints */ - sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536); + sfd = grpc_iomgr_create_endpoint_pair ("fixture", 65536); /* Create server, completion events */ - a.server = grpc_server_create_from_filters(NULL, 0, NULL); - a.cq = grpc_completion_queue_create(NULL); - gpr_event_init(&a.done_thd); - gpr_event_init(&a.done_write); + a.server = grpc_server_create_from_filters (NULL, 0, NULL); + a.cq = grpc_completion_queue_create (NULL); + gpr_event_init (&a.done_thd); + gpr_event_init (&a.done_write); a.validator = validator; - grpc_server_register_completion_queue(a.server, a.cq, NULL); - grpc_server_start(a.server); - transport = - grpc_create_chttp2_transport(NULL, sfd.server, mdctx, 0, &closure_list); - server_setup_transport(&a, transport, mdctx); - grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_server_register_completion_queue (a.server, a.cq, NULL); + grpc_server_start (a.server); + transport = grpc_create_chttp2_transport (NULL, sfd.server, mdctx, 0, &closure_list); + server_setup_transport (&a, transport, mdctx); + grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); + grpc_closure_list_run (&closure_list); /* Bind everything into the same pollset */ - grpc_endpoint_add_to_pollset(sfd.client, grpc_cq_pollset(a.cq), - &closure_list); - grpc_endpoint_add_to_pollset(sfd.server, grpc_cq_pollset(a.cq), - &closure_list); + grpc_endpoint_add_to_pollset (sfd.client, grpc_cq_pollset (a.cq), &closure_list); + grpc_endpoint_add_to_pollset (sfd.server, grpc_cq_pollset (a.cq), &closure_list); /* Check a ground truth */ - GPR_ASSERT(grpc_server_has_open_connections(a.server)); + GPR_ASSERT (grpc_server_has_open_connections (a.server)); /* Start validator */ - gpr_thd_new(&id, thd_func, &a, NULL); + gpr_thd_new (&id, thd_func, &a, NULL); - gpr_slice_buffer_init(&outgoing); - gpr_slice_buffer_add(&outgoing, slice); - grpc_closure_init(&done_write_closure, done_write, &a); + gpr_slice_buffer_init (&outgoing); + gpr_slice_buffer_add (&outgoing, slice); + grpc_closure_init (&done_write_closure, done_write, &a); /* Write data */ - grpc_endpoint_write(sfd.client, &outgoing, &done_write_closure, - &closure_list); - grpc_closure_list_run(&closure_list); + grpc_endpoint_write (sfd.client, &outgoing, &done_write_closure, &closure_list); + grpc_closure_list_run (&closure_list); /* Await completion */ - GPR_ASSERT( - gpr_event_wait(&a.done_write, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5))); + GPR_ASSERT (gpr_event_wait (&a.done_write, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5))); - if (flags & GRPC_BAD_CLIENT_DISCONNECT) { - grpc_endpoint_shutdown(sfd.client, &closure_list); - grpc_endpoint_destroy(sfd.client, &closure_list); - grpc_closure_list_run(&closure_list); - sfd.client = NULL; - } + if (flags & GRPC_BAD_CLIENT_DISCONNECT) + { + grpc_endpoint_shutdown (sfd.client, &closure_list); + grpc_endpoint_destroy (sfd.client, &closure_list); + grpc_closure_list_run (&closure_list); + sfd.client = NULL; + } - GPR_ASSERT(gpr_event_wait(&a.done_thd, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5))); + GPR_ASSERT (gpr_event_wait (&a.done_thd, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5))); /* Shutdown */ - if (sfd.client) { - grpc_endpoint_shutdown(sfd.client, &closure_list); - grpc_endpoint_destroy(sfd.client, &closure_list); - grpc_closure_list_run(&closure_list); - } - grpc_server_shutdown_and_notify(a.server, a.cq, NULL); - GPR_ASSERT(grpc_completion_queue_pluck( - a.cq, NULL, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(a.server); - grpc_completion_queue_destroy(a.cq); - gpr_slice_buffer_destroy(&outgoing); - - grpc_closure_list_run(&closure_list); - grpc_shutdown(); + if (sfd.client) + { + grpc_endpoint_shutdown (sfd.client, &closure_list); + grpc_endpoint_destroy (sfd.client, &closure_list); + grpc_closure_list_run (&closure_list); + } + grpc_server_shutdown_and_notify (a.server, a.cq, NULL); + GPR_ASSERT (grpc_completion_queue_pluck (a.cq, NULL, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (a.server); + grpc_completion_queue_destroy (a.cq); + gpr_slice_buffer_destroy (&outgoing); + + grpc_closure_list_run (&closure_list); + grpc_shutdown (); } diff --git a/test/core/bad_client/bad_client.h b/test/core/bad_client/bad_client.h index 01beda60ee5..437e884f6a9 100644 --- a/test/core/bad_client/bad_client.h +++ b/test/core/bad_client/bad_client.h @@ -37,8 +37,7 @@ #include #include "test/core/util/test_config.h" -typedef void (*grpc_bad_client_server_side_validator)( - grpc_server *server, grpc_completion_queue *cq); +typedef void (*grpc_bad_client_server_side_validator) (grpc_server * server, grpc_completion_queue * cq); #define GRPC_BAD_CLIENT_DISCONNECT 1 @@ -47,9 +46,7 @@ typedef void (*grpc_bad_client_server_side_validator)( Create a server, and send client_payload to it as bytes from a client. Execute validator in a separate thread to assert that the bytes are handled as expected. */ -void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, - const char *client_payload, - size_t client_payload_length, gpr_uint32 flags); +void grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const char *client_payload, size_t client_payload_length, gpr_uint32 flags); #define GRPC_RUN_BAD_CLIENT_TEST(validator, payload, flags) \ grpc_run_bad_client_test(validator, payload, sizeof(payload) - 1, flags) diff --git a/test/core/bad_client/tests/connection_prefix.c b/test/core/bad_client/tests/connection_prefix.c index ec852116055..0e51e9a267b 100644 --- a/test/core/bad_client/tests/connection_prefix.c +++ b/test/core/bad_client/tests/connection_prefix.c @@ -34,40 +34,43 @@ #include "test/core/bad_client/bad_client.h" #include "src/core/surface/server.h" -static void verifier(grpc_server *server, grpc_completion_queue *cq) { - while (grpc_server_has_open_connections(server)) { - GPR_ASSERT(grpc_completion_queue_next( - cq, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(20), NULL) - .type == GRPC_QUEUE_TIMEOUT); - } +static void +verifier (grpc_server * server, grpc_completion_queue * cq) +{ + while (grpc_server_has_open_connections (server)) + { + GPR_ASSERT (grpc_completion_queue_next (cq, GRPC_TIMEOUT_MILLIS_TO_DEADLINE (20), NULL).type == GRPC_QUEUE_TIMEOUT); + } } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "X", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRIX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI X", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI *X", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * X", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTPX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/X", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2X", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.X", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0X", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\rX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\nX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\n\rX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\n\r\nX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\n\r\nSX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\n\r\nSMX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\n\r\nSM\rX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\n\r\nSM\r\nX", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\n\r\nSM\r\n\rX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "X", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRIX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI X", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI *X", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * X", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTPX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/X", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2X", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.X", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0X", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\rX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\nX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\n\rX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\n\r\nX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\n\r\nSX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\n\r\nSMX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\n\r\nSM\rX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\n\r\nSM\r\nX", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\n\r\nSM\r\n\rX", 0); return 0; } diff --git a/test/core/bad_client/tests/initial_settings_frame.c b/test/core/bad_client/tests/initial_settings_frame.c index 261fecdaf2f..3db6d833692 100644 --- a/test/core/bad_client/tests/initial_settings_frame.c +++ b/test/core/bad_client/tests/initial_settings_frame.c @@ -36,60 +36,43 @@ #define PFX_STR "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" -static void verifier(grpc_server *server, grpc_completion_queue *cq) { - while (grpc_server_has_open_connections(server)) { - GPR_ASSERT(grpc_completion_queue_next( - cq, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(20), NULL) - .type == GRPC_QUEUE_TIMEOUT); - } +static void +verifier (grpc_server * server, grpc_completion_queue * cq) +{ + while (grpc_server_has_open_connections (server)) + { + GPR_ASSERT (grpc_completion_queue_next (cq, GRPC_TIMEOUT_MILLIS_TO_DEADLINE (20), NULL).type == GRPC_QUEUE_TIMEOUT); + } } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); /* various partial prefixes */ - GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00", - GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00", - GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00", - GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x06", - GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x06", - GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x06", - GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00\x04", - GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00\x04\x00", - GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00\x04\x01", - GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00\x04\xff", - GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00\x04\x00\x00", - GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00\x04\x00\x00\x00", - GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00\x04\x00\x00\x00\x00", - GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00", GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00", GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00", GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x06", GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x06", GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x06", GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04", GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\x00", GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\x01", GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\xff", GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\x00\x00", GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\x00\x00\x00", GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\x00\x00\x00\x00", GRPC_BAD_CLIENT_DISCONNECT); /* must not send frames with stream id != 0 */ - GRPC_RUN_BAD_CLIENT_TEST(verifier, - PFX_STR "\x00\x00\x00\x04\x00\x00\x00\x00\x01", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, - PFX_STR "\x00\x00\x00\x04\x00\x40\x00\x00\x00", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\x00\x00\x00\x00\x01", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\x00\x40\x00\x00\x00", 0); /* settings frame must be a multiple of six bytes long */ - GRPC_RUN_BAD_CLIENT_TEST(verifier, - PFX_STR "\x00\x00\x01\x04\x00\x00\x00\x00\x00", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, - PFX_STR "\x00\x00\x02\x04\x00\x00\x00\x00\x00", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, - PFX_STR "\x00\x00\x03\x04\x00\x00\x00\x00\x00", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, - PFX_STR "\x00\x00\x04\x04\x00\x00\x00\x00\x00", 0); - GRPC_RUN_BAD_CLIENT_TEST(verifier, - PFX_STR "\x00\x00\x05\x04\x00\x00\x00\x00\x00", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x01\x04\x00\x00\x00\x00\x00", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x02\x04\x00\x00\x00\x00\x00", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x03\x04\x00\x00\x00\x00\x00", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x04\x04\x00\x00\x00\x00\x00", 0); + GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x05\x04\x00\x00\x00\x00\x00", 0); return 0; } diff --git a/test/core/channel/channel_args_test.c b/test/core/channel/channel_args_test.c index 0b74dee41ea..207196ebdb1 100644 --- a/test/core/channel/channel_args_test.c +++ b/test/core/channel/channel_args_test.c @@ -40,7 +40,9 @@ #include "test/core/util/test_config.h" -static void test_create(void) { +static void +test_create (void) +{ grpc_arg arg_int; grpc_arg arg_string; grpc_arg to_add[2]; @@ -56,87 +58,94 @@ static void test_create(void) { to_add[0] = arg_int; to_add[1] = arg_string; - ch_args = grpc_channel_args_copy_and_add(NULL, to_add, 2); + ch_args = grpc_channel_args_copy_and_add (NULL, to_add, 2); - GPR_ASSERT(ch_args->num_args == 2); - GPR_ASSERT(strcmp(ch_args->args[0].key, arg_int.key) == 0); - GPR_ASSERT(ch_args->args[0].type == arg_int.type); - GPR_ASSERT(ch_args->args[0].value.integer == arg_int.value.integer); + GPR_ASSERT (ch_args->num_args == 2); + GPR_ASSERT (strcmp (ch_args->args[0].key, arg_int.key) == 0); + GPR_ASSERT (ch_args->args[0].type == arg_int.type); + GPR_ASSERT (ch_args->args[0].value.integer == arg_int.value.integer); - GPR_ASSERT(strcmp(ch_args->args[1].key, arg_string.key) == 0); - GPR_ASSERT(ch_args->args[1].type == arg_string.type); - GPR_ASSERT(strcmp(ch_args->args[1].value.string, arg_string.value.string) == - 0); + GPR_ASSERT (strcmp (ch_args->args[1].key, arg_string.key) == 0); + GPR_ASSERT (ch_args->args[1].type == arg_string.type); + GPR_ASSERT (strcmp (ch_args->args[1].value.string, arg_string.value.string) == 0); - grpc_channel_args_destroy(ch_args); + grpc_channel_args_destroy (ch_args); } -static void test_set_compression_algorithm(void) { +static void +test_set_compression_algorithm (void) +{ grpc_channel_args *ch_args; - ch_args = - grpc_channel_args_set_compression_algorithm(NULL, GRPC_COMPRESS_GZIP); - GPR_ASSERT(ch_args->num_args == 1); - GPR_ASSERT(strcmp(ch_args->args[0].key, GRPC_COMPRESSION_ALGORITHM_ARG) == 0); - GPR_ASSERT(ch_args->args[0].type == GRPC_ARG_INTEGER); + ch_args = grpc_channel_args_set_compression_algorithm (NULL, GRPC_COMPRESS_GZIP); + GPR_ASSERT (ch_args->num_args == 1); + GPR_ASSERT (strcmp (ch_args->args[0].key, GRPC_COMPRESSION_ALGORITHM_ARG) == 0); + GPR_ASSERT (ch_args->args[0].type == GRPC_ARG_INTEGER); - grpc_channel_args_destroy(ch_args); + grpc_channel_args_destroy (ch_args); } -static void test_compression_algorithm_states(void) { +static void +test_compression_algorithm_states (void) +{ grpc_channel_args *ch_args, *ch_args_wo_gzip, *ch_args_wo_gzip_deflate; unsigned states_bitset; size_t i; - ch_args = grpc_channel_args_copy_and_add(NULL, NULL, 0); + ch_args = grpc_channel_args_copy_and_add (NULL, NULL, 0); /* by default, all enabled */ - states_bitset = - (unsigned)grpc_channel_args_compression_algorithm_get_states(ch_args); + states_bitset = (unsigned) grpc_channel_args_compression_algorithm_get_states (ch_args); - for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { - GPR_ASSERT(GPR_BITGET(states_bitset, i)); - } + for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) + { + GPR_ASSERT (GPR_BITGET (states_bitset, i)); + } /* disable gzip and deflate */ - ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state( - &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); - GPR_ASSERT(ch_args_wo_gzip == ch_args_wo_gzip_deflate); - - states_bitset = (unsigned)grpc_channel_args_compression_algorithm_get_states( - ch_args_wo_gzip_deflate); - for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { - if (i == GRPC_COMPRESS_GZIP || i == GRPC_COMPRESS_DEFLATE) { - GPR_ASSERT(GPR_BITGET(states_bitset, i) == 0); - } else { - GPR_ASSERT(GPR_BITGET(states_bitset, i) != 0); + ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state (&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); + GPR_ASSERT (ch_args_wo_gzip == ch_args_wo_gzip_deflate); + + states_bitset = (unsigned) grpc_channel_args_compression_algorithm_get_states (ch_args_wo_gzip_deflate); + for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) + { + if (i == GRPC_COMPRESS_GZIP || i == GRPC_COMPRESS_DEFLATE) + { + GPR_ASSERT (GPR_BITGET (states_bitset, i) == 0); + } + else + { + GPR_ASSERT (GPR_BITGET (states_bitset, i) != 0); + } } - } /* re-enabled gzip only */ - ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state( - &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( - ch_args_wo_gzip); - for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { - if (i == GRPC_COMPRESS_DEFLATE) { - GPR_ASSERT(GPR_BITGET(states_bitset, i) == 0); - } else { - GPR_ASSERT(GPR_BITGET(states_bitset, i) != 0); + ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state (&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 (ch_args_wo_gzip); + for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) + { + if (i == GRPC_COMPRESS_DEFLATE) + { + GPR_ASSERT (GPR_BITGET (states_bitset, i) == 0); + } + else + { + GPR_ASSERT (GPR_BITGET (states_bitset, i) != 0); + } } - } - grpc_channel_args_destroy(ch_args); + grpc_channel_args_destroy (ch_args); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_create(); - test_set_compression_algorithm(); - test_compression_algorithm_states(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_create (); + test_set_compression_algorithm (); + test_compression_algorithm_states (); return 0; } diff --git a/test/core/channel/channel_stack_test.c b/test/core/channel/channel_stack_test.c index 72b48e208d3..af5c705810a 100644 --- a/test/core/channel/channel_stack_test.c +++ b/test/core/channel/channel_stack_test.c @@ -41,56 +41,63 @@ #include "test/core/util/test_config.h" -static void channel_init_func(grpc_channel_element *elem, grpc_channel *master, - const grpc_channel_args *args, - grpc_mdctx *metadata_context, int is_first, - int is_last, grpc_closure_list *closure_list) { - GPR_ASSERT(args->num_args == 1); - GPR_ASSERT(args->args[0].type == GRPC_ARG_INTEGER); - GPR_ASSERT(0 == strcmp(args->args[0].key, "test_key")); - GPR_ASSERT(args->args[0].value.integer == 42); - GPR_ASSERT(is_first); - GPR_ASSERT(is_last); - *(int *)(elem->channel_data) = 0; +static void +channel_init_func (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last, grpc_closure_list * closure_list) +{ + GPR_ASSERT (args->num_args == 1); + GPR_ASSERT (args->args[0].type == GRPC_ARG_INTEGER); + GPR_ASSERT (0 == strcmp (args->args[0].key, "test_key")); + GPR_ASSERT (args->args[0].value.integer == 42); + GPR_ASSERT (is_first); + GPR_ASSERT (is_last); + *(int *) (elem->channel_data) = 0; } -static void call_init_func(grpc_call_element *elem, - const void *server_transport_data, - grpc_transport_stream_op *initial_op, - grpc_closure_list *closure_list) { - ++*(int *)(elem->channel_data); - *(int *)(elem->call_data) = 0; +static void +call_init_func (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +{ + ++*(int *) (elem->channel_data); + *(int *) (elem->call_data) = 0; } -static void channel_destroy_func(grpc_channel_element *elem, - grpc_closure_list *closure_list) {} +static void +channel_destroy_func (grpc_channel_element * elem, grpc_closure_list * closure_list) +{ +} -static void call_destroy_func(grpc_call_element *elem, - grpc_closure_list *closure_list) { - ++*(int *)(elem->channel_data); +static void +call_destroy_func (grpc_call_element * elem, grpc_closure_list * closure_list) +{ + ++*(int *) (elem->channel_data); } -static void call_func(grpc_call_element *elem, grpc_transport_stream_op *op, - grpc_closure_list *closure_list) { - ++*(int *)(elem->call_data); +static void +call_func (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +{ + ++*(int *) (elem->call_data); } -static void channel_func(grpc_channel_element *elem, grpc_transport_op *op, - grpc_closure_list *closure_list) { - ++*(int *)(elem->channel_data); +static void +channel_func (grpc_channel_element * elem, grpc_transport_op * op, grpc_closure_list * closure_list) +{ + ++*(int *) (elem->channel_data); } -static char *get_peer(grpc_call_element *elem, - grpc_closure_list *closure_list) { - return gpr_strdup("peer"); +static char * +get_peer (grpc_call_element * elem, grpc_closure_list * closure_list) +{ + return gpr_strdup ("peer"); } -static void test_create_channel_stack(void) { - const grpc_channel_filter filter = {call_func, channel_func, - sizeof(int), call_init_func, - call_destroy_func, sizeof(int), - channel_init_func, channel_destroy_func, - get_peer, "some_test_filter"}; +static void +test_create_channel_stack (void) +{ + const grpc_channel_filter filter = { call_func, channel_func, + sizeof (int), call_init_func, + call_destroy_func, sizeof (int), + channel_init_func, channel_destroy_func, + get_peer, "some_test_filter" + }; const grpc_channel_filter *filters = &filter; grpc_channel_stack *channel_stack; grpc_call_stack *call_stack; @@ -103,7 +110,7 @@ static void test_create_channel_stack(void) { int *call_data; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - metadata_context = grpc_mdctx_create(); + metadata_context = grpc_mdctx_create (); arg.type = GRPC_ARG_INTEGER; arg.key = "test_key"; @@ -112,38 +119,39 @@ static void test_create_channel_stack(void) { chan_args.num_args = 1; chan_args.args = &arg; - channel_stack = gpr_malloc(grpc_channel_stack_size(&filters, 1)); - grpc_channel_stack_init(&filters, 1, NULL, &chan_args, metadata_context, - channel_stack, &closure_list); - GPR_ASSERT(channel_stack->count == 1); - channel_elem = grpc_channel_stack_element(channel_stack, 0); - channel_data = (int *)channel_elem->channel_data; - GPR_ASSERT(*channel_data == 0); - - call_stack = gpr_malloc(channel_stack->call_stack_size); - grpc_call_stack_init(channel_stack, NULL, NULL, call_stack, &closure_list); - GPR_ASSERT(call_stack->count == 1); - call_elem = grpc_call_stack_element(call_stack, 0); - GPR_ASSERT(call_elem->filter == channel_elem->filter); - GPR_ASSERT(call_elem->channel_data == channel_elem->channel_data); - call_data = (int *)call_elem->call_data; - GPR_ASSERT(*call_data == 0); - GPR_ASSERT(*channel_data == 1); - - grpc_call_stack_destroy(call_stack, &closure_list); - gpr_free(call_stack); - GPR_ASSERT(*channel_data == 2); - - grpc_channel_stack_destroy(channel_stack, &closure_list); - gpr_free(channel_stack); - - grpc_mdctx_unref(metadata_context); - - GPR_ASSERT(grpc_closure_list_empty(closure_list)); + channel_stack = gpr_malloc (grpc_channel_stack_size (&filters, 1)); + grpc_channel_stack_init (&filters, 1, NULL, &chan_args, metadata_context, channel_stack, &closure_list); + GPR_ASSERT (channel_stack->count == 1); + channel_elem = grpc_channel_stack_element (channel_stack, 0); + channel_data = (int *) channel_elem->channel_data; + GPR_ASSERT (*channel_data == 0); + + call_stack = gpr_malloc (channel_stack->call_stack_size); + grpc_call_stack_init (channel_stack, NULL, NULL, call_stack, &closure_list); + GPR_ASSERT (call_stack->count == 1); + call_elem = grpc_call_stack_element (call_stack, 0); + GPR_ASSERT (call_elem->filter == channel_elem->filter); + GPR_ASSERT (call_elem->channel_data == channel_elem->channel_data); + call_data = (int *) call_elem->call_data; + GPR_ASSERT (*call_data == 0); + GPR_ASSERT (*channel_data == 1); + + grpc_call_stack_destroy (call_stack, &closure_list); + gpr_free (call_stack); + GPR_ASSERT (*channel_data == 2); + + grpc_channel_stack_destroy (channel_stack, &closure_list); + gpr_free (channel_stack); + + grpc_mdctx_unref (metadata_context); + + GPR_ASSERT (grpc_closure_list_empty (closure_list)); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_create_channel_stack(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_create_channel_stack (); return 0; } diff --git a/test/core/client_config/lb_policies_test.c b/test/core/client_config/lb_policies_test.c index 411e96598ab..931bdef0176 100644 --- a/test/core/client_config/lb_policies_test.c +++ b/test/core/client_config/lb_policies_test.c @@ -50,7 +50,8 @@ #include "test/core/util/port.h" #include "test/core/end2end/cq_verifier.h" -typedef struct servers_fixture { +typedef struct servers_fixture +{ size_t num_servers; grpc_server **servers; grpc_call **server_calls; @@ -59,10 +60,10 @@ typedef struct servers_fixture { grpc_metadata_array *request_metadata_recv; } servers_fixture; -typedef void (*verifier_fn)(const servers_fixture *, grpc_channel *, - const int *, const size_t); +typedef void (*verifier_fn) (const servers_fixture *, grpc_channel *, const int *, const size_t); -typedef struct test_spec { +typedef struct test_spec +{ size_t num_iters; size_t num_servers; @@ -75,145 +76,170 @@ typedef struct test_spec { } test_spec; -static void test_spec_reset(test_spec *spec) { +static void +test_spec_reset (test_spec * spec) +{ size_t i, j; - for (i = 0; i < spec->num_iters; i++) { - for (j = 0; j < spec->num_servers; j++) { - spec->kill_at[i][j] = 0; - spec->revive_at[i][j] = 0; + for (i = 0; i < spec->num_iters; i++) + { + for (j = 0; j < spec->num_servers; j++) + { + spec->kill_at[i][j] = 0; + spec->revive_at[i][j] = 0; + } } - } } -static test_spec *test_spec_create(size_t num_iters, size_t num_servers) { +static test_spec * +test_spec_create (size_t num_iters, size_t num_servers) +{ test_spec *spec; size_t i; - spec = gpr_malloc(sizeof(test_spec)); + spec = gpr_malloc (sizeof (test_spec)); spec->num_iters = num_iters; spec->num_servers = num_servers; - spec->kill_at = gpr_malloc(sizeof(int *) * num_iters); - spec->revive_at = gpr_malloc(sizeof(int *) * num_iters); - for (i = 0; i < num_iters; i++) { - spec->kill_at[i] = gpr_malloc(sizeof(int) * num_servers); - spec->revive_at[i] = gpr_malloc(sizeof(int) * num_servers); - } - - test_spec_reset(spec); + spec->kill_at = gpr_malloc (sizeof (int *) * num_iters); + spec->revive_at = gpr_malloc (sizeof (int *) * num_iters); + for (i = 0; i < num_iters; i++) + { + spec->kill_at[i] = gpr_malloc (sizeof (int) * num_servers); + spec->revive_at[i] = gpr_malloc (sizeof (int) * num_servers); + } + + test_spec_reset (spec); return spec; } -static void test_spec_destroy(test_spec *spec) { +static void +test_spec_destroy (test_spec * spec) +{ size_t i; - for (i = 0; i < spec->num_iters; i++) { - gpr_free(spec->kill_at[i]); - gpr_free(spec->revive_at[i]); - } + for (i = 0; i < spec->num_iters; i++) + { + gpr_free (spec->kill_at[i]); + gpr_free (spec->revive_at[i]); + } - gpr_free(spec->kill_at); - gpr_free(spec->revive_at); + gpr_free (spec->kill_at); + gpr_free (spec->revive_at); - gpr_free(spec); + gpr_free (spec); } -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, n_seconds_time(5), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, n_seconds_time (5), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void kill_server(const servers_fixture *f, size_t i) { - gpr_log(GPR_INFO, "KILLING SERVER %d", i); - GPR_ASSERT(f->servers[i] != NULL); - grpc_server_shutdown_and_notify(f->servers[i], f->cq, tag(10000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(10000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->servers[i]); +static void +kill_server (const servers_fixture * f, size_t i) +{ + gpr_log (GPR_INFO, "KILLING SERVER %d", i); + GPR_ASSERT (f->servers[i] != NULL); + grpc_server_shutdown_and_notify (f->servers[i], f->cq, tag (10000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (10000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->servers[i]); f->servers[i] = NULL; } -static void revive_server(const servers_fixture *f, size_t i) { +static void +revive_server (const servers_fixture * f, size_t i) +{ int got_port; - gpr_log(GPR_INFO, "RAISE AGAIN SERVER %d", i); - GPR_ASSERT(f->servers[i] == NULL); - f->servers[i] = grpc_server_create(NULL, NULL); - grpc_server_register_completion_queue(f->servers[i], f->cq, NULL); - GPR_ASSERT((got_port = grpc_server_add_insecure_http2_port( - f->servers[i], f->servers_hostports[i])) > 0); - grpc_server_start(f->servers[i]); + gpr_log (GPR_INFO, "RAISE AGAIN SERVER %d", i); + GPR_ASSERT (f->servers[i] == NULL); + f->servers[i] = grpc_server_create (NULL, NULL); + grpc_server_register_completion_queue (f->servers[i], f->cq, NULL); + GPR_ASSERT ((got_port = grpc_server_add_insecure_http2_port (f->servers[i], f->servers_hostports[i])) > 0); + grpc_server_start (f->servers[i]); } -static servers_fixture *setup_servers(const char *server_host, - const size_t num_servers) { - servers_fixture *f = gpr_malloc(sizeof(servers_fixture)); +static servers_fixture * +setup_servers (const char *server_host, const size_t num_servers) +{ + servers_fixture *f = gpr_malloc (sizeof (servers_fixture)); int *ports; int got_port; size_t i; f->num_servers = num_servers; - f->server_calls = gpr_malloc(sizeof(grpc_call *) * num_servers); - f->request_metadata_recv = - gpr_malloc(sizeof(grpc_metadata_array) * num_servers); + f->server_calls = gpr_malloc (sizeof (grpc_call *) * num_servers); + f->request_metadata_recv = gpr_malloc (sizeof (grpc_metadata_array) * num_servers); /* Create servers. */ - ports = gpr_malloc(sizeof(int *) * num_servers); - f->servers = gpr_malloc(sizeof(grpc_server *) * num_servers); - f->servers_hostports = gpr_malloc(sizeof(char *) * num_servers); - f->cq = grpc_completion_queue_create(NULL); - for (i = 0; i < num_servers; i++) { - ports[i] = grpc_pick_unused_port_or_die(); - - gpr_join_host_port(&f->servers_hostports[i], server_host, ports[i]); - - f->servers[i] = grpc_server_create(NULL, NULL); - grpc_server_register_completion_queue(f->servers[i], f->cq, NULL); - GPR_ASSERT((got_port = grpc_server_add_insecure_http2_port( - f->servers[i], f->servers_hostports[i])) > 0); - GPR_ASSERT(ports[i] == got_port); - grpc_server_start(f->servers[i]); - } - gpr_free(ports); + ports = gpr_malloc (sizeof (int *) * num_servers); + f->servers = gpr_malloc (sizeof (grpc_server *) * num_servers); + f->servers_hostports = gpr_malloc (sizeof (char *) * num_servers); + f->cq = grpc_completion_queue_create (NULL); + for (i = 0; i < num_servers; i++) + { + ports[i] = grpc_pick_unused_port_or_die (); + + gpr_join_host_port (&f->servers_hostports[i], server_host, ports[i]); + + f->servers[i] = grpc_server_create (NULL, NULL); + grpc_server_register_completion_queue (f->servers[i], f->cq, NULL); + GPR_ASSERT ((got_port = grpc_server_add_insecure_http2_port (f->servers[i], f->servers_hostports[i])) > 0); + GPR_ASSERT (ports[i] == got_port); + grpc_server_start (f->servers[i]); + } + gpr_free (ports); return f; } -static void teardown_servers(servers_fixture *f) { +static void +teardown_servers (servers_fixture * f) +{ size_t i; /* Destroy server. */ - for (i = 0; i < f->num_servers; i++) { - if (f->servers[i] == NULL) continue; - grpc_server_shutdown_and_notify(f->servers[i], f->cq, tag(10000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(10000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->servers[i]); - } - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); - - gpr_free(f->servers); - - for (i = 0; i < f->num_servers; i++) { - gpr_free(f->servers_hostports[i]); - } - - gpr_free(f->servers_hostports); - gpr_free(f->request_metadata_recv); - gpr_free(f->server_calls); - gpr_free(f); + for (i = 0; i < f->num_servers; i++) + { + if (f->servers[i] == NULL) + continue; + grpc_server_shutdown_and_notify (f->servers[i], f->cq, tag (10000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (10000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->servers[i]); + } + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); + + gpr_free (f->servers); + + for (i = 0; i < f->num_servers; i++) + { + gpr_free (f->servers_hostports[i]); + } + + gpr_free (f->servers_hostports); + gpr_free (f->request_metadata_recv); + gpr_free (f->server_calls); + gpr_free (f); } /** Returns connection sequence (server indices), which must be freed */ -int *perform_request(servers_fixture *f, grpc_channel *client, - const test_spec *spec) { +int * +perform_request (servers_fixture * f, grpc_channel * client, const test_spec * spec) +{ grpc_call *c; int s_idx; int *s_valid; @@ -232,157 +258,160 @@ int *perform_request(servers_fixture *f, grpc_channel *client, grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; - s_valid = gpr_malloc(sizeof(int) * f->num_servers); - call_details = gpr_malloc(sizeof(grpc_call_details) * f->num_servers); - connection_sequence = gpr_malloc(sizeof(int) * spec->num_iters); + s_valid = gpr_malloc (sizeof (int) * f->num_servers); + call_details = gpr_malloc (sizeof (grpc_call_details) * f->num_servers); + connection_sequence = gpr_malloc (sizeof (int) * spec->num_iters); /* Send a trivial request. */ - deadline = n_seconds_time(60); - - for (iter_num = 0; iter_num < spec->num_iters; iter_num++) { - cq_verifier *cqv = cq_verifier_create(f->cq); - details = NULL; - details_capacity = 0; - was_cancelled = 2; - - for (i = 0; i < f->num_servers; i++) { - if (spec->kill_at[iter_num][i] != 0) { - kill_server(f, i); - } else if (spec->revive_at[iter_num][i] != 0) { - /* killing takes precedence */ - revive_server(f, i); - } - } - - connection_sequence[iter_num] = -1; - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); + deadline = n_seconds_time (60); + + for (iter_num = 0; iter_num < spec->num_iters; iter_num++) + { + cq_verifier *cqv = cq_verifier_create (f->cq); + details = NULL; + details_capacity = 0; + was_cancelled = 2; + + for (i = 0; i < f->num_servers; i++) + { + if (spec->kill_at[iter_num][i] != 0) + { + kill_server (f, i); + } + else if (spec->revive_at[iter_num][i] != 0) + { + /* killing takes precedence */ + revive_server (f, i); + } + } + + connection_sequence[iter_num] = -1; + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + + for (i = 0; i < f->num_servers; i++) + { + grpc_call_details_init (&call_details[i]); + } + memset (s_valid, 0, f->num_servers * sizeof (int)); + + c = grpc_channel_create_call (client, NULL, GRPC_PROPAGATE_DEFAULTS, f->cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - for (i = 0; i < f->num_servers; i++) { - grpc_call_details_init(&call_details[i]); - } - memset(s_valid, 0, f->num_servers * sizeof(int)); - - c = grpc_channel_create_call(client, NULL, GRPC_PROPAGATE_DEFAULTS, f->cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); - - op = ops; - op->op = GRPC_OP_SEND_INITIAL_METADATA; - op->data.send_initial_metadata.count = 0; - op->flags = 0; - op->reserved = NULL; - op++; - op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; - op->flags = 0; - op->reserved = NULL; - op++; - op->op = GRPC_OP_RECV_INITIAL_METADATA; - op->data.recv_initial_metadata = &initial_metadata_recv; - op->flags = 0; - op->reserved = NULL; - 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->data.recv_status_on_client.status_details_capacity = &details_capacity; - op->flags = 0; - op->reserved = NULL; - op++; - GPR_ASSERT(GRPC_CALL_OK == - grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL)); - - /* "listen" on all servers */ - for (i = 0; i < f->num_servers; i++) { - grpc_metadata_array_init(&f->request_metadata_recv[i]); - if (f->servers[i] != NULL) { - GPR_ASSERT(GRPC_CALL_OK == - grpc_server_request_call(f->servers[i], &f->server_calls[i], - &call_details[i], - &f->request_metadata_recv[i], f->cq, - f->cq, tag(1000 + (int)i))); - } - } - - s_idx = -1; - while ((ev = grpc_completion_queue_next( - f->cq, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1), NULL)) - .type != GRPC_QUEUE_TIMEOUT) { - read_tag = ((int)(gpr_intptr)ev.tag); - gpr_log(GPR_DEBUG, "EVENT: success:%d, type:%d, tag:%d iter:%d", - ev.success, ev.type, read_tag, iter_num); - if (ev.success && read_tag >= 1000) { - GPR_ASSERT(s_idx == -1); /* only one server must reply */ - /* only server notifications for non-shutdown events */ - s_idx = read_tag - 1000; - s_valid[s_idx] = 1; - connection_sequence[iter_num] = s_idx; - } - } - - if (s_idx >= 0) { op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; op->data.send_initial_metadata.count = 0; op->flags = 0; op->reserved = NULL; op++; - op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; - op->data.send_status_from_server.trailing_metadata_count = 0; - op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED; - op->data.send_status_from_server.status_details = "xyz"; + op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; op->flags = 0; op->reserved = NULL; op++; - op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; - op->data.recv_close_on_server.cancelled = &was_cancelled; + op->op = GRPC_OP_RECV_INITIAL_METADATA; + op->data.recv_initial_metadata = &initial_metadata_recv; op->flags = 0; op->reserved = NULL; op++; - GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(f->server_calls[s_idx], - ops, (size_t)(op - ops), - tag(102), NULL)); - - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); - - GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details[s_idx].method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details[s_idx].host, "foo.test.google.fr")); - GPR_ASSERT(was_cancelled == 1); - } - - for (i = 0; i < f->num_servers; i++) { - if (s_valid[i] != 0) { - grpc_call_destroy(f->server_calls[i]); - } - grpc_metadata_array_destroy(&f->request_metadata_recv[i]); - } - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - - cq_verifier_destroy(cqv); - - grpc_call_destroy(c); - - for (i = 0; i < f->num_servers; i++) { - grpc_call_details_destroy(&call_details[i]); + 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->data.recv_status_on_client.status_details_capacity = &details_capacity; + op->flags = 0; + op->reserved = NULL; + op++; + GPR_ASSERT (GRPC_CALL_OK == grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL)); + + /* "listen" on all servers */ + for (i = 0; i < f->num_servers; i++) + { + grpc_metadata_array_init (&f->request_metadata_recv[i]); + if (f->servers[i] != NULL) + { + GPR_ASSERT (GRPC_CALL_OK == grpc_server_request_call (f->servers[i], &f->server_calls[i], &call_details[i], &f->request_metadata_recv[i], f->cq, f->cq, tag (1000 + (int) i))); + } + } + + s_idx = -1; + while ((ev = grpc_completion_queue_next (f->cq, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1), NULL)).type != GRPC_QUEUE_TIMEOUT) + { + read_tag = ((int) (gpr_intptr) ev.tag); + gpr_log (GPR_DEBUG, "EVENT: success:%d, type:%d, tag:%d iter:%d", ev.success, ev.type, read_tag, iter_num); + if (ev.success && read_tag >= 1000) + { + GPR_ASSERT (s_idx == -1); /* only one server must reply */ + /* only server notifications for non-shutdown events */ + s_idx = read_tag - 1000; + s_valid[s_idx] = 1; + connection_sequence[iter_num] = s_idx; + } + } + + if (s_idx >= 0) + { + op = ops; + op->op = GRPC_OP_SEND_INITIAL_METADATA; + op->data.send_initial_metadata.count = 0; + op->flags = 0; + op->reserved = NULL; + op++; + op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; + op->data.send_status_from_server.trailing_metadata_count = 0; + op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED; + op->data.send_status_from_server.status_details = "xyz"; + op->flags = 0; + op->reserved = NULL; + op++; + op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; + op->data.recv_close_on_server.cancelled = &was_cancelled; + op->flags = 0; + op->reserved = NULL; + op++; + GPR_ASSERT (GRPC_CALL_OK == grpc_call_start_batch (f->server_calls[s_idx], ops, (size_t) (op - ops), tag (102), NULL)); + + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); + + GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details[s_idx].method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details[s_idx].host, "foo.test.google.fr")); + GPR_ASSERT (was_cancelled == 1); + } + + for (i = 0; i < f->num_servers; i++) + { + if (s_valid[i] != 0) + { + grpc_call_destroy (f->server_calls[i]); + } + grpc_metadata_array_destroy (&f->request_metadata_recv[i]); + } + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + + cq_verifier_destroy (cqv); + + grpc_call_destroy (c); + + for (i = 0; i < f->num_servers; i++) + { + grpc_call_details_destroy (&call_details[i]); + } + gpr_free (details); } - gpr_free(details); - } - gpr_free(call_details); - gpr_free(s_valid); + gpr_free (call_details); + gpr_free (s_valid); return connection_sequence; } -static void assert_channel_connectivity( - grpc_channel *ch, size_t num_accepted_conn_states, - grpc_connectivity_state accepted_conn_state, ...) { +static void +assert_channel_connectivity (grpc_channel * ch, size_t num_accepted_conn_states, grpc_connectivity_state accepted_conn_state, ...) +{ size_t i; grpc_channel_stack *client_stack; grpc_channel_element *client_channel_filter; @@ -390,316 +419,306 @@ static void assert_channel_connectivity( grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; va_list ap; - client_stack = grpc_channel_get_channel_stack(ch); - client_channel_filter = grpc_channel_stack_last_element(client_stack); - - actual_conn_state = grpc_client_channel_check_connectivity_state( - client_channel_filter, 0 /* don't try to connect */, &closure_list); - grpc_closure_list_run(&closure_list); - va_start(ap, accepted_conn_state); - for (i = 0; i < num_accepted_conn_states; i++) { - if (actual_conn_state == accepted_conn_state) { - break; - } - accepted_conn_state = va_arg(ap, grpc_connectivity_state); - } - va_end(ap); - if (i == num_accepted_conn_states) { - char **accepted_strs = - gpr_malloc(sizeof(char *) * num_accepted_conn_states); - char *accepted_str_joined; - va_start(ap, accepted_conn_state); - for (i = 0; i < num_accepted_conn_states; i++) { - GPR_ASSERT(gpr_asprintf(&accepted_strs[i], "%d", accepted_conn_state) > - 0); - accepted_conn_state = va_arg(ap, grpc_connectivity_state); + client_stack = grpc_channel_get_channel_stack (ch); + client_channel_filter = grpc_channel_stack_last_element (client_stack); + + actual_conn_state = grpc_client_channel_check_connectivity_state (client_channel_filter, 0 /* don't try to connect */ , &closure_list); + grpc_closure_list_run (&closure_list); + va_start (ap, accepted_conn_state); + for (i = 0; i < num_accepted_conn_states; i++) + { + if (actual_conn_state == accepted_conn_state) + { + break; + } + accepted_conn_state = va_arg (ap, grpc_connectivity_state); } - va_end(ap); - accepted_str_joined = gpr_strjoin_sep((const char **)accepted_strs, - num_accepted_conn_states, ", ", NULL); - gpr_log( - GPR_ERROR, - "Channel connectivity assertion failed: expected , got %d", - accepted_str_joined, actual_conn_state); - - for (i = 0; i < num_accepted_conn_states; i++) { - gpr_free(accepted_strs[i]); + va_end (ap); + if (i == num_accepted_conn_states) + { + char **accepted_strs = gpr_malloc (sizeof (char *) * num_accepted_conn_states); + char *accepted_str_joined; + va_start (ap, accepted_conn_state); + for (i = 0; i < num_accepted_conn_states; i++) + { + GPR_ASSERT (gpr_asprintf (&accepted_strs[i], "%d", accepted_conn_state) > 0); + accepted_conn_state = va_arg (ap, grpc_connectivity_state); + } + va_end (ap); + accepted_str_joined = gpr_strjoin_sep ((const char **) accepted_strs, num_accepted_conn_states, ", ", NULL); + gpr_log (GPR_ERROR, "Channel connectivity assertion failed: expected , got %d", accepted_str_joined, actual_conn_state); + + for (i = 0; i < num_accepted_conn_states; i++) + { + gpr_free (accepted_strs[i]); + } + gpr_free (accepted_strs); + gpr_free (accepted_str_joined); + abort (); } - gpr_free(accepted_strs); - gpr_free(accepted_str_joined); - abort(); - } } -void run_spec(const test_spec *spec) { +void +run_spec (const test_spec * spec) +{ grpc_channel *client; char *client_hostport; char *servers_hostports_str; int *actual_connection_sequence; - servers_fixture *f = setup_servers("127.0.0.1", spec->num_servers); + servers_fixture *f = setup_servers ("127.0.0.1", spec->num_servers); /* Create client. */ - servers_hostports_str = gpr_strjoin_sep((const char **)f->servers_hostports, - f->num_servers, ",", NULL); - gpr_asprintf(&client_hostport, "ipv4:%s?lb_policy=round_robin", - servers_hostports_str); - client = grpc_insecure_channel_create(client_hostport, NULL, NULL); + servers_hostports_str = gpr_strjoin_sep ((const char **) f->servers_hostports, f->num_servers, ",", NULL); + gpr_asprintf (&client_hostport, "ipv4:%s?lb_policy=round_robin", servers_hostports_str); + client = grpc_insecure_channel_create (client_hostport, NULL, NULL); - gpr_log(GPR_INFO, "Testing '%s' with servers=%s client=%s", spec->description, - servers_hostports_str, client_hostport); + gpr_log (GPR_INFO, "Testing '%s' with servers=%s client=%s", spec->description, servers_hostports_str, client_hostport); - actual_connection_sequence = perform_request(f, client, spec); + actual_connection_sequence = perform_request (f, client, spec); - spec->verifier(f, client, actual_connection_sequence, spec->num_iters); + spec->verifier (f, client, actual_connection_sequence, spec->num_iters); - gpr_free(client_hostport); - gpr_free(servers_hostports_str); - gpr_free(actual_connection_sequence); + gpr_free (client_hostport); + gpr_free (servers_hostports_str); + gpr_free (actual_connection_sequence); - grpc_channel_destroy(client); - teardown_servers(f); + grpc_channel_destroy (client); + teardown_servers (f); } -static void print_failed_expectations(const int *expected_connection_sequence, - const int *actual_connection_sequence, - const size_t expected_seq_length, - const size_t num_iters) { +static void +print_failed_expectations (const int *expected_connection_sequence, const int *actual_connection_sequence, const size_t expected_seq_length, const size_t num_iters) +{ size_t i; - for (i = 0; i < num_iters; i++) { - gpr_log(GPR_ERROR, "FAILURE: Iter, expected, actual:%d (%d, %d)", i, - expected_connection_sequence[i % expected_seq_length], - actual_connection_sequence[i]); - } + for (i = 0; i < num_iters; i++) + { + gpr_log (GPR_ERROR, "FAILURE: Iter, expected, actual:%d (%d, %d)", i, expected_connection_sequence[i % expected_seq_length], actual_connection_sequence[i]); + } } -static void verify_vanilla_round_robin(const servers_fixture *f, - grpc_channel *client, - const int *actual_connection_sequence, - const size_t num_iters) { +static void +verify_vanilla_round_robin (const servers_fixture * f, grpc_channel * client, const int *actual_connection_sequence, const size_t num_iters) +{ int *expected_connection_sequence; size_t i; const size_t expected_seq_length = f->num_servers; /* verify conn. seq. expectation */ /* get the first sequence of "num_servers" elements */ - expected_connection_sequence = gpr_malloc(sizeof(int) * expected_seq_length); - memcpy(expected_connection_sequence, actual_connection_sequence, - sizeof(int) * expected_seq_length); - - for (i = 0; i < num_iters; i++) { - const int actual = actual_connection_sequence[i]; - const int expected = expected_connection_sequence[i % expected_seq_length]; - if (actual != expected) { - gpr_log(GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, - actual, i); - print_failed_expectations(expected_connection_sequence, - actual_connection_sequence, expected_seq_length, - num_iters); - abort(); + expected_connection_sequence = gpr_malloc (sizeof (int) * expected_seq_length); + memcpy (expected_connection_sequence, actual_connection_sequence, sizeof (int) * expected_seq_length); + + for (i = 0; i < num_iters; i++) + { + const int actual = actual_connection_sequence[i]; + const int expected = expected_connection_sequence[i % expected_seq_length]; + if (actual != expected) + { + gpr_log (GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, actual, i); + print_failed_expectations (expected_connection_sequence, actual_connection_sequence, expected_seq_length, num_iters); + abort (); + } } - } - assert_channel_connectivity(client, 1, GRPC_CHANNEL_READY); + assert_channel_connectivity (client, 1, GRPC_CHANNEL_READY); - gpr_free(expected_connection_sequence); + gpr_free (expected_connection_sequence); } /* At the start of the second iteration, all but the first and last servers (as * given in "f") are killed */ -static void verify_vanishing_floor_round_robin( - const servers_fixture *f, grpc_channel *client, - const int *actual_connection_sequence, const size_t num_iters) { +static void +verify_vanishing_floor_round_robin (const servers_fixture * f, grpc_channel * client, const int *actual_connection_sequence, const size_t num_iters) +{ int *expected_connection_sequence; const size_t expected_seq_length = 2; size_t i; /* verify conn. seq. expectation */ /* copy the first full sequence (without -1s) */ - expected_connection_sequence = gpr_malloc(sizeof(int) * expected_seq_length); - memcpy(expected_connection_sequence, actual_connection_sequence + 2, - expected_seq_length * sizeof(int)); + expected_connection_sequence = gpr_malloc (sizeof (int) * expected_seq_length); + memcpy (expected_connection_sequence, actual_connection_sequence + 2, expected_seq_length * sizeof (int)); /* first three elements of the sequence should be [<1st>, -1] */ - if (actual_connection_sequence[0] != expected_connection_sequence[0]) { - gpr_log(GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", - expected_connection_sequence[0], actual_connection_sequence[0], 0); - print_failed_expectations(expected_connection_sequence, - actual_connection_sequence, expected_seq_length, - 1u); - abort(); - } - - GPR_ASSERT(actual_connection_sequence[1] == -1); - - for (i = 2; i < num_iters; i++) { - const int actual = actual_connection_sequence[i]; - const int expected = expected_connection_sequence[i % expected_seq_length]; - if (actual != expected) { - gpr_log(GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, - actual, i); - print_failed_expectations(expected_connection_sequence, - actual_connection_sequence, expected_seq_length, - num_iters); - abort(); + if (actual_connection_sequence[0] != expected_connection_sequence[0]) + { + gpr_log (GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected_connection_sequence[0], actual_connection_sequence[0], 0); + print_failed_expectations (expected_connection_sequence, actual_connection_sequence, expected_seq_length, 1u); + abort (); + } + + GPR_ASSERT (actual_connection_sequence[1] == -1); + + for (i = 2; i < num_iters; i++) + { + const int actual = actual_connection_sequence[i]; + const int expected = expected_connection_sequence[i % expected_seq_length]; + if (actual != expected) + { + gpr_log (GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, actual, i); + print_failed_expectations (expected_connection_sequence, actual_connection_sequence, expected_seq_length, num_iters); + abort (); + } } - } - gpr_free(expected_connection_sequence); + gpr_free (expected_connection_sequence); } -static void verify_total_carnage_round_robin( - const servers_fixture *f, grpc_channel *client, - const int *actual_connection_sequence, const size_t num_iters) { +static void +verify_total_carnage_round_robin (const servers_fixture * f, grpc_channel * client, const int *actual_connection_sequence, const size_t num_iters) +{ size_t i; - for (i = 0; i < num_iters; i++) { - const int actual = actual_connection_sequence[i]; - const int expected = -1; - if (actual != expected) { - gpr_log(GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, - actual, i); - abort(); + for (i = 0; i < num_iters; i++) + { + const int actual = actual_connection_sequence[i]; + const int expected = -1; + if (actual != expected) + { + gpr_log (GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, actual, i); + abort (); + } } - } /* even though we know all the servers are dead, the client is still trying * retrying, believing it's in a transient failure situation */ - assert_channel_connectivity(client, 2, GRPC_CHANNEL_TRANSIENT_FAILURE, - GRPC_CHANNEL_CONNECTING); + assert_channel_connectivity (client, 2, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_CHANNEL_CONNECTING); } -static void verify_partial_carnage_round_robin( - const servers_fixture *f, grpc_channel *client, - const int *actual_connection_sequence, const size_t num_iters) { +static void +verify_partial_carnage_round_robin (const servers_fixture * f, grpc_channel * client, const int *actual_connection_sequence, const size_t num_iters) +{ int *expected_connection_sequence; size_t i; const size_t expected_seq_length = f->num_servers; /* verify conn. seq. expectation */ /* get the first sequence of "num_servers" elements */ - expected_connection_sequence = gpr_malloc(sizeof(int) * expected_seq_length); - memcpy(expected_connection_sequence, actual_connection_sequence, - sizeof(int) * expected_seq_length); - - for (i = 0; i < num_iters / 2; i++) { - const int actual = actual_connection_sequence[i]; - const int expected = expected_connection_sequence[i % expected_seq_length]; - if (actual != expected) { - gpr_log(GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, - actual, i); - print_failed_expectations(expected_connection_sequence, - actual_connection_sequence, expected_seq_length, - num_iters); - abort(); + expected_connection_sequence = gpr_malloc (sizeof (int) * expected_seq_length); + memcpy (expected_connection_sequence, actual_connection_sequence, sizeof (int) * expected_seq_length); + + for (i = 0; i < num_iters / 2; i++) + { + const int actual = actual_connection_sequence[i]; + const int expected = expected_connection_sequence[i % expected_seq_length]; + if (actual != expected) + { + gpr_log (GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, actual, i); + print_failed_expectations (expected_connection_sequence, actual_connection_sequence, expected_seq_length, num_iters); + abort (); + } } - } /* second half of the iterations go without response */ - for (; i < num_iters; i++) { - GPR_ASSERT(actual_connection_sequence[i] == -1); - } + for (; i < num_iters; i++) + { + GPR_ASSERT (actual_connection_sequence[i] == -1); + } /* even though we know all the servers are dead, the client is still trying * retrying, believing it's in a transient failure situation */ - assert_channel_connectivity(client, 2, GRPC_CHANNEL_TRANSIENT_FAILURE, - GRPC_CHANNEL_CONNECTING); - gpr_free(expected_connection_sequence); + assert_channel_connectivity (client, 2, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_CHANNEL_CONNECTING); + gpr_free (expected_connection_sequence); } -static void verify_rebirth_round_robin(const servers_fixture *f, - grpc_channel *client, - const int *actual_connection_sequence, - const size_t num_iters) { +static void +verify_rebirth_round_robin (const servers_fixture * f, grpc_channel * client, const int *actual_connection_sequence, const size_t num_iters) +{ int *expected_connection_sequence; size_t i; const size_t expected_seq_length = f->num_servers; /* verify conn. seq. expectation */ /* get the first sequence of "num_servers" elements */ - expected_connection_sequence = gpr_malloc(sizeof(int) * expected_seq_length); - memcpy(expected_connection_sequence, actual_connection_sequence + 4, - sizeof(int) * expected_seq_length); + expected_connection_sequence = gpr_malloc (sizeof (int) * expected_seq_length); + memcpy (expected_connection_sequence, actual_connection_sequence + 4, sizeof (int) * expected_seq_length); /* first iteration succeeds */ - GPR_ASSERT(actual_connection_sequence[0] != -1); + GPR_ASSERT (actual_connection_sequence[0] != -1); /* back up on the third (or maybe fourth) iteration */ i = 3; - if (actual_connection_sequence[i] == -1) { - i = 4; - } - for (; i < num_iters; i++) { - const int actual = actual_connection_sequence[i]; - const int expected = expected_connection_sequence[i % expected_seq_length]; - if (actual != expected) { - gpr_log(GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, - actual, i); - print_failed_expectations(expected_connection_sequence, - actual_connection_sequence, expected_seq_length, - num_iters); - abort(); + if (actual_connection_sequence[i] == -1) + { + i = 4; + } + for (; i < num_iters; i++) + { + const int actual = actual_connection_sequence[i]; + const int expected = expected_connection_sequence[i % expected_seq_length]; + if (actual != expected) + { + gpr_log (GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, actual, i); + print_failed_expectations (expected_connection_sequence, actual_connection_sequence, expected_seq_length, num_iters); + abort (); + } } - } /* things are fine once the servers are brought back up */ - assert_channel_connectivity(client, 1, GRPC_CHANNEL_READY); - gpr_free(expected_connection_sequence); + assert_channel_connectivity (client, 1, GRPC_CHANNEL_READY); + gpr_free (expected_connection_sequence); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ test_spec *spec; size_t i; const size_t NUM_ITERS = 10; const size_t NUM_SERVERS = 4; - grpc_test_init(argc, argv); - grpc_init(); + grpc_test_init (argc, argv); + grpc_init (); /* everything is fine, all servers stay up the whole time and life's peachy */ - spec = test_spec_create(NUM_ITERS, NUM_SERVERS); + spec = test_spec_create (NUM_ITERS, NUM_SERVERS); spec->verifier = verify_vanilla_round_robin; spec->description = "test_all_server_up"; - run_spec(spec); + run_spec (spec); /* Kill all servers first thing in the morning */ - test_spec_reset(spec); + test_spec_reset (spec); spec->verifier = verify_total_carnage_round_robin; spec->description = "test_kill_all_server"; - for (i = 0; i < NUM_SERVERS; i++) { - spec->kill_at[0][i] = 1; - } - run_spec(spec); + for (i = 0; i < NUM_SERVERS; i++) + { + spec->kill_at[0][i] = 1; + } + run_spec (spec); /* at the start of the 2nd iteration, kill all but the first and last servers. * This should knock down the server bound to be selected next */ - test_spec_reset(spec); + test_spec_reset (spec); spec->verifier = verify_vanishing_floor_round_robin; spec->description = "test_kill_all_server_at_2nd_iteration"; - for (i = 1; i < NUM_SERVERS - 1; i++) { - spec->kill_at[1][i] = 1; - } - run_spec(spec); + for (i = 1; i < NUM_SERVERS - 1; i++) + { + spec->kill_at[1][i] = 1; + } + run_spec (spec); /* Midway, kill all servers. */ - test_spec_reset(spec); + test_spec_reset (spec); spec->verifier = verify_partial_carnage_round_robin; spec->description = "test_kill_all_server_midway"; - for (i = 0; i < NUM_SERVERS; i++) { - spec->kill_at[spec->num_iters / 2][i] = 1; - } - run_spec(spec); + for (i = 0; i < NUM_SERVERS; i++) + { + spec->kill_at[spec->num_iters / 2][i] = 1; + } + run_spec (spec); /* After first iteration, kill all servers. On the third one, bring them all * back up. */ - test_spec_reset(spec); + test_spec_reset (spec); spec->verifier = verify_rebirth_round_robin; spec->description = "test_kill_all_server_after_1st_resurrect_at_3rd"; - for (i = 0; i < NUM_SERVERS; i++) { - spec->kill_at[1][i] = 1; - spec->revive_at[3][i] = 1; - } - run_spec(spec); + for (i = 0; i < NUM_SERVERS; i++) + { + spec->kill_at[1][i] = 1; + spec->revive_at[3][i] = 1; + } + run_spec (spec); - test_spec_destroy(spec); + test_spec_destroy (spec); - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/client_config/uri_parser_test.c b/test/core/client_config/uri_parser_test.c index df12d6b4cb7..3f91a3242e2 100644 --- a/test/core/client_config/uri_parser_test.c +++ b/test/core/client_config/uri_parser_test.c @@ -39,48 +39,48 @@ #include "test/core/util/test_config.h" -static void test_succeeds(const char *uri_text, const char *scheme, - const char *authority, const char *path, - const char *query, const char *fragment) { - 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_uri_destroy(uri); +static void +test_succeeds (const char *uri_text, const char *scheme, const char *authority, const char *path, const char *query, const char *fragment) +{ + 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_uri_destroy (uri); } -static void test_fails(const char *uri_text) { - GPR_ASSERT(NULL == grpc_uri_parse(uri_text, 0)); +static void +test_fails (const char *uri_text) +{ + GPR_ASSERT (NULL == grpc_uri_parse (uri_text, 0)); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - 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", "", "", - ""); - test_succeeds("a192.4-df:foo.coom", "a192.4-df", "", "foo.coom", "", ""); - test_succeeds("a+b:foo.coom", "a+b", "", "foo.coom", "", ""); - test_succeeds("zookeeper://127.0.0.1:2181/foo/bar", "zookeeper", - "127.0.0.1:2181", "/foo/bar", "", ""); - test_succeeds("http://www.google.com?yay-i'm-using-queries", "http", - "www.google.com", "", "yay-i'm-using-queries", ""); - test_succeeds("dns:foo.com#fragment-all-the-things", "dns", "", "foo.com", "", - "fragment-all-the-things"); - test_succeeds("http:?legit", "http", "", "", "legit", ""); - test_succeeds("unix:#this-is-ok-too", "unix", "", "", "", "this-is-ok-too"); - test_succeeds("http:?legit#twice", "http", "", "", "legit", "twice"); - test_succeeds("http://foo?bar#lol?", "http", "foo", "", "bar", "lol?"); - test_succeeds("http://foo?bar#lol?/", "http", "foo", "", "bar", "lol?/"); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + 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", "", "", ""); + test_succeeds ("a192.4-df:foo.coom", "a192.4-df", "", "foo.coom", "", ""); + test_succeeds ("a+b:foo.coom", "a+b", "", "foo.coom", "", ""); + test_succeeds ("zookeeper://127.0.0.1:2181/foo/bar", "zookeeper", "127.0.0.1:2181", "/foo/bar", "", ""); + test_succeeds ("http://www.google.com?yay-i'm-using-queries", "http", "www.google.com", "", "yay-i'm-using-queries", ""); + test_succeeds ("dns:foo.com#fragment-all-the-things", "dns", "", "foo.com", "", "fragment-all-the-things"); + test_succeeds ("http:?legit", "http", "", "", "legit", ""); + test_succeeds ("unix:#this-is-ok-too", "unix", "", "", "", "this-is-ok-too"); + test_succeeds ("http:?legit#twice", "http", "", "", "legit", "twice"); + test_succeeds ("http://foo?bar#lol?", "http", "foo", "", "bar", "lol?"); + test_succeeds ("http://foo?bar#lol?/", "http", "foo", "", "bar", "lol?/"); - test_fails("xyz"); - test_fails("http:?dangling-pct-%0"); - test_fails("http://foo?[bar]"); - test_fails("http://foo?x[bar]"); - test_fails("http://foo?bar#lol#"); + test_fails ("xyz"); + test_fails ("http:?dangling-pct-%0"); + test_fails ("http://foo?[bar]"); + test_fails ("http://foo?x[bar]"); + test_fails ("http://foo?bar#lol#"); return 0; } diff --git a/test/core/compression/compression_test.c b/test/core/compression/compression_test.c index 4df0acae37f..40b115efb62 100644 --- a/test/core/compression/compression_test.c +++ b/test/core/compression/compression_test.c @@ -40,38 +40,43 @@ #include "test/core/util/test_config.h" -static void test_compression_algorithm_parse(void) { +static void +test_compression_algorithm_parse (void) +{ size_t i; - const char* valid_names[] = {"identity", "gzip", "deflate"}; + const char *valid_names[] = { "identity", "gzip", "deflate" }; const grpc_compression_algorithm valid_algorithms[] = { - GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, GRPC_COMPRESS_DEFLATE}; - const char* invalid_names[] = {"gzip2", "foo", "", "2gzip"}; + GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, GRPC_COMPRESS_DEFLATE + }; + const char *invalid_names[] = { "gzip2", "foo", "", "2gzip" }; - gpr_log(GPR_DEBUG, "test_compression_algorithm_parse"); + gpr_log (GPR_DEBUG, "test_compression_algorithm_parse"); - for (i = 0; i < GPR_ARRAY_SIZE(valid_names); i++) { - const char* valid_name = valid_names[i]; - grpc_compression_algorithm algorithm; - int success; - success = grpc_compression_algorithm_parse(valid_name, strlen(valid_name), - &algorithm); - GPR_ASSERT(success != 0); - GPR_ASSERT(algorithm == valid_algorithms[i]); - } + for (i = 0; i < GPR_ARRAY_SIZE (valid_names); i++) + { + const char *valid_name = valid_names[i]; + grpc_compression_algorithm algorithm; + int success; + success = grpc_compression_algorithm_parse (valid_name, strlen (valid_name), &algorithm); + GPR_ASSERT (success != 0); + GPR_ASSERT (algorithm == valid_algorithms[i]); + } - for (i = 0; i < GPR_ARRAY_SIZE(invalid_names); i++) { - const char* invalid_name = invalid_names[i]; - grpc_compression_algorithm algorithm; - int success; - success = grpc_compression_algorithm_parse( - invalid_name, strlen(invalid_name), &algorithm); - GPR_ASSERT(success == 0); - /* the value of "algorithm" is undefined upon failure */ - } + for (i = 0; i < GPR_ARRAY_SIZE (invalid_names); i++) + { + const char *invalid_name = invalid_names[i]; + grpc_compression_algorithm algorithm; + int success; + success = grpc_compression_algorithm_parse (invalid_name, strlen (invalid_name), &algorithm); + GPR_ASSERT (success == 0); + /* the value of "algorithm" is undefined upon failure */ + } } -int main(int argc, char** argv) { - test_compression_algorithm_parse(); +int +main (int argc, char **argv) +{ + test_compression_algorithm_parse (); return 0; } diff --git a/test/core/compression/message_compress_test.c b/test/core/compression/message_compress_test.c index 98da6a1eaab..43978b97f41 100644 --- a/test/core/compression/message_compress_test.c +++ b/test/core/compression/message_compress_test.c @@ -42,19 +42,19 @@ #include #include "test/core/util/slice_splitter.h" -typedef enum { ONE_A = 0, ONE_KB_A, ONE_MB_A, TEST_VALUE_COUNT } test_value; +typedef enum +{ ONE_A = 0, ONE_KB_A, ONE_MB_A, TEST_VALUE_COUNT } test_value; -typedef enum { +typedef enum +{ SHOULD_NOT_COMPRESS, SHOULD_COMPRESS, MAYBE_COMPRESSES } compressability; -static void assert_passthrough(gpr_slice value, - grpc_compression_algorithm algorithm, - grpc_slice_split_mode uncompressed_split_mode, - grpc_slice_split_mode compressed_split_mode, - compressability compress_result_check) { +static void +assert_passthrough (gpr_slice value, grpc_compression_algorithm algorithm, grpc_slice_split_mode uncompressed_split_mode, grpc_slice_split_mode compressed_split_mode, compressability compress_result_check) +{ gpr_slice_buffer input; gpr_slice_buffer compressed_raw; gpr_slice_buffer compressed; @@ -63,132 +63,145 @@ static void assert_passthrough(gpr_slice value, int was_compressed; char *algorithm_name; - GPR_ASSERT(grpc_compression_algorithm_name(algorithm, &algorithm_name) != 0); - gpr_log(GPR_INFO, - "assert_passthrough: value_length=%d value_hash=0x%08x " - "algorithm='%s' uncompressed_split='%s' compressed_split='%s'", - GPR_SLICE_LENGTH(value), gpr_murmur_hash3(GPR_SLICE_START_PTR(value), - GPR_SLICE_LENGTH(value), 0), - algorithm_name, grpc_slice_split_mode_name(uncompressed_split_mode), - grpc_slice_split_mode_name(compressed_split_mode)); + GPR_ASSERT (grpc_compression_algorithm_name (algorithm, &algorithm_name) != 0); + gpr_log (GPR_INFO, "assert_passthrough: value_length=%d value_hash=0x%08x " "algorithm='%s' uncompressed_split='%s' compressed_split='%s'", GPR_SLICE_LENGTH (value), gpr_murmur_hash3 (GPR_SLICE_START_PTR (value), GPR_SLICE_LENGTH (value), 0), algorithm_name, grpc_slice_split_mode_name (uncompressed_split_mode), grpc_slice_split_mode_name (compressed_split_mode)); - gpr_slice_buffer_init(&input); - gpr_slice_buffer_init(&compressed_raw); - gpr_slice_buffer_init(&compressed); - gpr_slice_buffer_init(&output); + gpr_slice_buffer_init (&input); + gpr_slice_buffer_init (&compressed_raw); + gpr_slice_buffer_init (&compressed); + gpr_slice_buffer_init (&output); - grpc_split_slices_to_buffer(uncompressed_split_mode, &value, 1, &input); + grpc_split_slices_to_buffer (uncompressed_split_mode, &value, 1, &input); - was_compressed = grpc_msg_compress(algorithm, &input, &compressed_raw); - GPR_ASSERT(input.count > 0); + was_compressed = grpc_msg_compress (algorithm, &input, &compressed_raw); + GPR_ASSERT (input.count > 0); - switch (compress_result_check) { + switch (compress_result_check) + { case SHOULD_NOT_COMPRESS: - GPR_ASSERT(was_compressed == 0); + GPR_ASSERT (was_compressed == 0); break; case SHOULD_COMPRESS: - GPR_ASSERT(was_compressed == 1); + GPR_ASSERT (was_compressed == 1); break; case MAYBE_COMPRESSES: /* no check */ break; - } + } - grpc_split_slice_buffer(compressed_split_mode, &compressed_raw, &compressed); + grpc_split_slice_buffer (compressed_split_mode, &compressed_raw, &compressed); - GPR_ASSERT(grpc_msg_decompress( - was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, &output)); + GPR_ASSERT (grpc_msg_decompress (was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, &output)); - final = grpc_slice_merge(output.slices, output.count); - GPR_ASSERT(0 == gpr_slice_cmp(value, final)); + final = grpc_slice_merge (output.slices, output.count); + GPR_ASSERT (0 == gpr_slice_cmp (value, final)); - gpr_slice_buffer_destroy(&input); - gpr_slice_buffer_destroy(&compressed); - gpr_slice_buffer_destroy(&compressed_raw); - gpr_slice_buffer_destroy(&output); - gpr_slice_unref(final); + gpr_slice_buffer_destroy (&input); + gpr_slice_buffer_destroy (&compressed); + gpr_slice_buffer_destroy (&compressed_raw); + gpr_slice_buffer_destroy (&output); + gpr_slice_unref (final); } -static gpr_slice repeated(char c, size_t length) { - gpr_slice out = gpr_slice_malloc(length); - memset(GPR_SLICE_START_PTR(out), c, length); +static gpr_slice +repeated (char c, size_t length) +{ + gpr_slice out = gpr_slice_malloc (length); + memset (GPR_SLICE_START_PTR (out), c, length); return out; } -static compressability get_compressability( - test_value id, grpc_compression_algorithm algorithm) { - if (algorithm == GRPC_COMPRESS_NONE) return SHOULD_NOT_COMPRESS; - switch (id) { +static compressability +get_compressability (test_value id, grpc_compression_algorithm algorithm) +{ + if (algorithm == GRPC_COMPRESS_NONE) + return SHOULD_NOT_COMPRESS; + switch (id) + { case ONE_A: return SHOULD_NOT_COMPRESS; case ONE_KB_A: case ONE_MB_A: return SHOULD_COMPRESS; case TEST_VALUE_COUNT: - abort(); + abort (); break; - } + } return MAYBE_COMPRESSES; } -static gpr_slice create_test_value(test_value id) { - switch (id) { +static gpr_slice +create_test_value (test_value id) +{ + switch (id) + { case ONE_A: - return gpr_slice_from_copied_string("a"); + return gpr_slice_from_copied_string ("a"); case ONE_KB_A: - return repeated('a', 1024); + return repeated ('a', 1024); case ONE_MB_A: - return repeated('a', 1024 * 1024); + return repeated ('a', 1024 * 1024); case TEST_VALUE_COUNT: - abort(); + abort (); break; - } - return gpr_slice_from_copied_string("bad value"); + } + return gpr_slice_from_copied_string ("bad value"); } -static void test_bad_data(void) { +static void +test_bad_data (void) +{ gpr_slice_buffer input; gpr_slice_buffer output; grpc_compression_algorithm i; - gpr_slice_buffer_init(&input); - gpr_slice_buffer_init(&output); - gpr_slice_buffer_add(&input, gpr_slice_from_copied_string( - "this is not valid compressed input")); + gpr_slice_buffer_init (&input); + gpr_slice_buffer_init (&output); + gpr_slice_buffer_add (&input, gpr_slice_from_copied_string ("this is not valid compressed input")); - for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { - if (i == GRPC_COMPRESS_NONE) continue; - GPR_ASSERT(0 == grpc_msg_decompress(i, &input, &output)); - GPR_ASSERT(0 == output.count); - } + for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) + { + if (i == GRPC_COMPRESS_NONE) + continue; + GPR_ASSERT (0 == grpc_msg_decompress (i, &input, &output)); + GPR_ASSERT (0 == output.count); + } - gpr_slice_buffer_destroy(&input); - gpr_slice_buffer_destroy(&output); + gpr_slice_buffer_destroy (&input); + gpr_slice_buffer_destroy (&output); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ unsigned i, j, k, m; grpc_slice_split_mode uncompressed_split_modes[] = { - GRPC_SLICE_SPLIT_IDENTITY, GRPC_SLICE_SPLIT_ONE_BYTE}; - grpc_slice_split_mode compressed_split_modes[] = {GRPC_SLICE_SPLIT_MERGE_ALL, - GRPC_SLICE_SPLIT_IDENTITY, - GRPC_SLICE_SPLIT_ONE_BYTE}; - - grpc_test_init(argc, argv); - - for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { - for (j = 0; j < GPR_ARRAY_SIZE(uncompressed_split_modes); j++) { - for (k = 0; k < GPR_ARRAY_SIZE(compressed_split_modes); k++) { - for (m = 0; m < TEST_VALUE_COUNT; m++) { - gpr_slice slice = create_test_value(m); - assert_passthrough(slice, i, j, k, get_compressability(m, i)); - gpr_slice_unref(slice); - } - } + GRPC_SLICE_SPLIT_IDENTITY, GRPC_SLICE_SPLIT_ONE_BYTE + }; + grpc_slice_split_mode compressed_split_modes[] = { GRPC_SLICE_SPLIT_MERGE_ALL, + GRPC_SLICE_SPLIT_IDENTITY, + GRPC_SLICE_SPLIT_ONE_BYTE + }; + + grpc_test_init (argc, argv); + + for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) + { + for (j = 0; j < GPR_ARRAY_SIZE (uncompressed_split_modes); j++) + { + for (k = 0; k < GPR_ARRAY_SIZE (compressed_split_modes); k++) + { + for (m = 0; m < TEST_VALUE_COUNT; m++) + { + gpr_slice slice = create_test_value (m); + assert_passthrough (slice, i, j, k, get_compressability (m, i)); + gpr_slice_unref (slice); + } + } + } } - } - test_bad_data(); + test_bad_data (); return 0; } diff --git a/test/core/end2end/cq_verifier.c b/test/core/end2end/cq_verifier.c index 922de268f41..3feb3977b31 100644 --- a/test/core/end2end/cq_verifier.c +++ b/test/core/end2end/cq_verifier.c @@ -50,7 +50,8 @@ #define ROOT_EXPECTATION 1000 /* a set of metadata we expect to find on an event */ -typedef struct metadata { +typedef struct metadata +{ size_t count; size_t cap; char **keys; @@ -59,7 +60,8 @@ typedef struct metadata { /* details what we expect to find on a single event - and forms a linked list to detail other expectations */ -typedef struct expectation { +typedef struct expectation +{ struct expectation *next; struct expectation *prev; grpc_completion_type type; @@ -68,15 +70,18 @@ typedef struct expectation { } expectation; /* the verifier itself */ -struct cq_verifier { +struct cq_verifier +{ /* bound completion queue */ grpc_completion_queue *cq; /* the root/sentinal expectation */ expectation expect; }; -cq_verifier *cq_verifier_create(grpc_completion_queue *cq) { - cq_verifier *v = gpr_malloc(sizeof(cq_verifier)); +cq_verifier * +cq_verifier_create (grpc_completion_queue * cq) +{ + cq_verifier *v = gpr_malloc (sizeof (cq_verifier)); v->expect.type = ROOT_EXPECTATION; v->expect.tag = NULL; v->expect.next = &v->expect; @@ -85,197 +90,231 @@ cq_verifier *cq_verifier_create(grpc_completion_queue *cq) { return v; } -void cq_verifier_destroy(cq_verifier *v) { - cq_verify(v); - gpr_free(v); +void +cq_verifier_destroy (cq_verifier * v) +{ + cq_verify (v); + gpr_free (v); } -static int has_metadata(const grpc_metadata *md, size_t count, const char *key, - const char *value) { +static int +has_metadata (const grpc_metadata * md, size_t count, const char *key, const char *value) +{ size_t i; - for (i = 0; i < count; i++) { - if (0 == strcmp(key, md[i].key) && strlen(value) == md[i].value_length && - 0 == memcmp(md[i].value, value, md[i].value_length)) { - return 1; + for (i = 0; i < count; i++) + { + if (0 == strcmp (key, md[i].key) && strlen (value) == md[i].value_length && 0 == memcmp (md[i].value, value, md[i].value_length)) + { + return 1; + } } - } return 0; } -int contains_metadata(grpc_metadata_array *array, const char *key, - const char *value) { - return has_metadata(array->metadata, array->count, key, value); +int +contains_metadata (grpc_metadata_array * array, const char *key, const char *value) +{ + return has_metadata (array->metadata, array->count, key, value); } -static gpr_slice merge_slices(gpr_slice *slices, size_t nslices) { +static gpr_slice +merge_slices (gpr_slice * slices, size_t nslices) +{ size_t i; size_t len = 0; gpr_uint8 *cursor; gpr_slice out; - for (i = 0; i < nslices; i++) { - len += GPR_SLICE_LENGTH(slices[i]); - } + for (i = 0; i < nslices; i++) + { + len += GPR_SLICE_LENGTH (slices[i]); + } - out = gpr_slice_malloc(len); - cursor = GPR_SLICE_START_PTR(out); + out = gpr_slice_malloc (len); + cursor = GPR_SLICE_START_PTR (out); - for (i = 0; i < nslices; i++) { - memcpy(cursor, GPR_SLICE_START_PTR(slices[i]), GPR_SLICE_LENGTH(slices[i])); - cursor += GPR_SLICE_LENGTH(slices[i]); - } + for (i = 0; i < nslices; i++) + { + memcpy (cursor, GPR_SLICE_START_PTR (slices[i]), GPR_SLICE_LENGTH (slices[i])); + cursor += GPR_SLICE_LENGTH (slices[i]); + } return out; } -static int byte_buffer_eq_slice(grpc_byte_buffer *bb, gpr_slice b) { +static int +byte_buffer_eq_slice (grpc_byte_buffer * bb, gpr_slice b) +{ gpr_slice a; int ok; - if (!bb) return 0; + if (!bb) + return 0; - a = merge_slices(bb->data.raw.slice_buffer.slices, - bb->data.raw.slice_buffer.count); - ok = GPR_SLICE_LENGTH(a) == GPR_SLICE_LENGTH(b) && - 0 == memcmp(GPR_SLICE_START_PTR(a), GPR_SLICE_START_PTR(b), - GPR_SLICE_LENGTH(a)); - gpr_slice_unref(a); - gpr_slice_unref(b); + a = merge_slices (bb->data.raw.slice_buffer.slices, bb->data.raw.slice_buffer.count); + ok = GPR_SLICE_LENGTH (a) == GPR_SLICE_LENGTH (b) && 0 == memcmp (GPR_SLICE_START_PTR (a), GPR_SLICE_START_PTR (b), GPR_SLICE_LENGTH (a)); + gpr_slice_unref (a); + gpr_slice_unref (b); return ok; } -int byte_buffer_eq_string(grpc_byte_buffer *bb, const char *str) { +int +byte_buffer_eq_string (grpc_byte_buffer * bb, const char *str) +{ grpc_byte_buffer_reader reader; grpc_byte_buffer *rbb; int res; - grpc_byte_buffer_reader_init(&reader, bb); - rbb = grpc_raw_byte_buffer_from_reader(&reader); - res = byte_buffer_eq_slice(rbb, gpr_slice_from_copied_string(str)); - grpc_byte_buffer_reader_destroy(&reader); - grpc_byte_buffer_destroy(rbb); + grpc_byte_buffer_reader_init (&reader, bb); + rbb = grpc_raw_byte_buffer_from_reader (&reader); + res = byte_buffer_eq_slice (rbb, gpr_slice_from_copied_string (str)); + grpc_byte_buffer_reader_destroy (&reader); + grpc_byte_buffer_destroy (rbb); return res; } -static void verify_matches(expectation *e, grpc_event *ev) { - GPR_ASSERT(e->type == ev->type); - switch (e->type) { +static void +verify_matches (expectation * e, grpc_event * ev) +{ + GPR_ASSERT (e->type == ev->type); + switch (e->type) + { case GRPC_QUEUE_SHUTDOWN: - gpr_log(GPR_ERROR, "premature queue shutdown"); - abort(); + gpr_log (GPR_ERROR, "premature queue shutdown"); + abort (); break; case GRPC_OP_COMPLETE: - GPR_ASSERT(e->success == ev->success); + GPR_ASSERT (e->success == ev->success); break; case GRPC_QUEUE_TIMEOUT: - gpr_log(GPR_ERROR, "not implemented"); - abort(); + gpr_log (GPR_ERROR, "not implemented"); + abort (); break; - } + } } -static void expectation_to_strvec(gpr_strvec *buf, expectation *e) { +static void +expectation_to_strvec (gpr_strvec * buf, expectation * e) +{ char *tmp; - gpr_asprintf(&tmp, "%p ", e->tag); - gpr_strvec_add(buf, tmp); + gpr_asprintf (&tmp, "%p ", e->tag); + gpr_strvec_add (buf, tmp); - switch (e->type) { + switch (e->type) + { case GRPC_OP_COMPLETE: - gpr_asprintf(&tmp, "GRPC_OP_COMPLETE result=%d", e->success); - gpr_strvec_add(buf, tmp); + gpr_asprintf (&tmp, "GRPC_OP_COMPLETE result=%d", e->success); + gpr_strvec_add (buf, tmp); break; case GRPC_QUEUE_TIMEOUT: case GRPC_QUEUE_SHUTDOWN: - gpr_log(GPR_ERROR, "not implemented"); - abort(); + gpr_log (GPR_ERROR, "not implemented"); + abort (); break; - } + } } -static void expectations_to_strvec(gpr_strvec *buf, cq_verifier *v) { +static void +expectations_to_strvec (gpr_strvec * buf, cq_verifier * v) +{ expectation *e; - for (e = v->expect.next; e != &v->expect; e = e->next) { - expectation_to_strvec(buf, e); - gpr_strvec_add(buf, gpr_strdup("\n")); - } + for (e = v->expect.next; e != &v->expect; e = e->next) + { + expectation_to_strvec (buf, e); + gpr_strvec_add (buf, gpr_strdup ("\n")); + } } -static void fail_no_event_received(cq_verifier *v) { +static void +fail_no_event_received (cq_verifier * v) +{ gpr_strvec buf; char *msg; - gpr_strvec_init(&buf); - gpr_strvec_add(&buf, gpr_strdup("no event received, but expected:\n")); - expectations_to_strvec(&buf, v); - msg = gpr_strvec_flatten(&buf, NULL); - gpr_log(GPR_ERROR, "%s", msg); - gpr_strvec_destroy(&buf); - gpr_free(msg); - abort(); + gpr_strvec_init (&buf); + gpr_strvec_add (&buf, gpr_strdup ("no event received, but expected:\n")); + expectations_to_strvec (&buf, v); + msg = gpr_strvec_flatten (&buf, NULL); + gpr_log (GPR_ERROR, "%s", msg); + gpr_strvec_destroy (&buf); + gpr_free (msg); + abort (); } -void cq_verify(cq_verifier *v) { - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10); +void +cq_verify (cq_verifier * v) +{ + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10); grpc_event ev; expectation *e; char *s; gpr_strvec have_tags; - gpr_strvec_init(&have_tags); - - while (v->expect.next != &v->expect) { - ev = grpc_completion_queue_next(v->cq, deadline, NULL); - if (ev.type == GRPC_QUEUE_TIMEOUT) { - fail_no_event_received(v); - break; + gpr_strvec_init (&have_tags); + + while (v->expect.next != &v->expect) + { + ev = grpc_completion_queue_next (v->cq, deadline, NULL); + if (ev.type == GRPC_QUEUE_TIMEOUT) + { + fail_no_event_received (v); + break; + } + + for (e = v->expect.next; e != &v->expect; e = e->next) + { + gpr_asprintf (&s, " %p", e->tag); + gpr_strvec_add (&have_tags, s); + if (e->tag == ev.tag) + { + verify_matches (e, &ev); + e->next->prev = e->prev; + e->prev->next = e->next; + gpr_free (e); + break; + } + } + if (e == &v->expect) + { + s = grpc_event_string (&ev); + gpr_log (GPR_ERROR, "event not found: %s", s); + gpr_free (s); + s = gpr_strvec_flatten (&have_tags, NULL); + gpr_log (GPR_ERROR, "have tags:%s", s); + gpr_free (s); + gpr_strvec_destroy (&have_tags); + abort (); + } } - for (e = v->expect.next; e != &v->expect; e = e->next) { - gpr_asprintf(&s, " %p", e->tag); - gpr_strvec_add(&have_tags, s); - if (e->tag == ev.tag) { - verify_matches(e, &ev); - e->next->prev = e->prev; - e->prev->next = e->next; - gpr_free(e); - break; - } - } - if (e == &v->expect) { - s = grpc_event_string(&ev); - gpr_log(GPR_ERROR, "event not found: %s", s); - gpr_free(s); - s = gpr_strvec_flatten(&have_tags, NULL); - gpr_log(GPR_ERROR, "have tags:%s", s); - gpr_free(s); - gpr_strvec_destroy(&have_tags); - abort(); - } - } - - gpr_strvec_destroy(&have_tags); + gpr_strvec_destroy (&have_tags); } -void cq_verify_empty(cq_verifier *v) { - gpr_timespec deadline = gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), - gpr_time_from_seconds(1, GPR_TIMESPAN)); +void +cq_verify_empty (cq_verifier * v) +{ + gpr_timespec deadline = gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), + gpr_time_from_seconds (1, GPR_TIMESPAN)); grpc_event ev; - GPR_ASSERT(v->expect.next == &v->expect && "expectation queue must be empty"); + GPR_ASSERT (v->expect.next == &v->expect && "expectation queue must be empty"); - ev = grpc_completion_queue_next(v->cq, deadline, NULL); - if (ev.type != GRPC_QUEUE_TIMEOUT) { - char *s = grpc_event_string(&ev); - gpr_log(GPR_ERROR, "unexpected event (expected nothing): %s", s); - gpr_free(s); - abort(); - } + ev = grpc_completion_queue_next (v->cq, deadline, NULL); + if (ev.type != GRPC_QUEUE_TIMEOUT) + { + char *s = grpc_event_string (&ev); + gpr_log (GPR_ERROR, "unexpected event (expected nothing): %s", s); + gpr_free (s); + abort (); + } } -static expectation *add(cq_verifier *v, grpc_completion_type type, void *tag) { - expectation *e = gpr_malloc(sizeof(expectation)); +static expectation * +add (cq_verifier * v, grpc_completion_type type, void *tag) +{ + expectation *e = gpr_malloc (sizeof (expectation)); e->type = type; e->tag = tag; e->next = &v->expect; @@ -284,6 +323,8 @@ static expectation *add(cq_verifier *v, grpc_completion_type type, void *tag) { return e; } -void cq_expect_completion(cq_verifier *v, void *tag, int success) { - add(v, GRPC_OP_COMPLETE, tag)->success = success; +void +cq_expect_completion (cq_verifier * v, void *tag, int success) +{ + add (v, GRPC_OP_COMPLETE, tag)->success = success; } diff --git a/test/core/end2end/cq_verifier.h b/test/core/end2end/cq_verifier.h index b3e07c45a58..4447acb3ee1 100644 --- a/test/core/end2end/cq_verifier.h +++ b/test/core/end2end/cq_verifier.h @@ -43,24 +43,23 @@ typedef struct cq_verifier cq_verifier; /* construct/destroy a cq_verifier */ -cq_verifier *cq_verifier_create(grpc_completion_queue *cq); -void cq_verifier_destroy(cq_verifier *v); +cq_verifier *cq_verifier_create (grpc_completion_queue * cq); +void cq_verifier_destroy (cq_verifier * v); /* ensure all expected events (and only those events) are present on the bound completion queue */ -void cq_verify(cq_verifier *v); +void cq_verify (cq_verifier * v); /* ensure that the completion queue is empty */ -void cq_verify_empty(cq_verifier *v); +void cq_verify_empty (cq_verifier * v); /* Various expectation matchers Any functions taking ... expect a NULL terminated list of key/value pairs (each pair using two parameter slots) of metadata that MUST be present in the event. */ -void cq_expect_completion(cq_verifier *v, void *tag, int success); +void cq_expect_completion (cq_verifier * v, void *tag, int success); -int byte_buffer_eq_string(grpc_byte_buffer *byte_buffer, const char *string); -int contains_metadata(grpc_metadata_array *array, const char *key, - const char *value); +int byte_buffer_eq_string (grpc_byte_buffer * byte_buffer, const char *string); +int contains_metadata (grpc_metadata_array * array, const char *key, const char *value); #endif /* GRPC_TEST_CORE_END2END_CQ_VERIFIER_H */ diff --git a/test/core/end2end/data/server1_cert.c b/test/core/end2end/data/server1_cert.c index d31f2e2d0ed..a303b272825 100644 --- a/test/core/end2end/data/server1_cert.c +++ b/test/core/end2end/data/server1_cert.c @@ -32,84 +32,85 @@ */ const char test_server1_cert[] = { - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, - 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x6d, 0x7a, 0x43, 0x43, - 0x41, 0x67, 0x53, 0x67, 0x41, 0x77, 0x49, 0x42, 0x41, 0x67, 0x49, 0x42, - 0x41, 0x7a, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47, - 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x55, 0x46, 0x41, 0x44, 0x42, 0x57, - 0x4d, 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, - 0x45, 0x77, 0x4a, 0x42, 0x56, 0x54, 0x45, 0x54, 0x0a, 0x4d, 0x42, 0x45, - 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x41, 0x77, 0x4b, 0x55, 0x32, 0x39, - 0x74, 0x5a, 0x53, 0x31, 0x54, 0x64, 0x47, 0x46, 0x30, 0x5a, 0x54, 0x45, - 0x68, 0x4d, 0x42, 0x38, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x67, 0x77, - 0x59, 0x53, 0x57, 0x35, 0x30, 0x5a, 0x58, 0x4a, 0x75, 0x5a, 0x58, 0x51, - 0x67, 0x56, 0x32, 0x6c, 0x6b, 0x5a, 0x32, 0x6c, 0x30, 0x63, 0x79, 0x42, - 0x51, 0x0a, 0x64, 0x48, 0x6b, 0x67, 0x54, 0x48, 0x52, 0x6b, 0x4d, 0x51, - 0x38, 0x77, 0x44, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x44, 0x41, - 0x5a, 0x30, 0x5a, 0x58, 0x4e, 0x30, 0x59, 0x32, 0x45, 0x77, 0x48, 0x68, - 0x63, 0x4e, 0x4d, 0x54, 0x51, 0x77, 0x4e, 0x7a, 0x49, 0x79, 0x4d, 0x44, - 0x59, 0x77, 0x4d, 0x44, 0x55, 0x33, 0x57, 0x68, 0x63, 0x4e, 0x4d, 0x6a, - 0x51, 0x77, 0x4e, 0x7a, 0x45, 0x35, 0x0a, 0x4d, 0x44, 0x59, 0x77, 0x4d, - 0x44, 0x55, 0x33, 0x57, 0x6a, 0x42, 0x6b, 0x4d, 0x51, 0x73, 0x77, 0x43, - 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, 0x45, 0x77, 0x4a, 0x56, 0x55, - 0x7a, 0x45, 0x52, 0x4d, 0x41, 0x38, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, - 0x42, 0x4d, 0x49, 0x53, 0x57, 0x78, 0x73, 0x61, 0x57, 0x35, 0x76, 0x61, - 0x58, 0x4d, 0x78, 0x45, 0x44, 0x41, 0x4f, 0x42, 0x67, 0x4e, 0x56, 0x0a, - 0x42, 0x41, 0x63, 0x54, 0x42, 0x30, 0x4e, 0x6f, 0x61, 0x57, 0x4e, 0x68, - 0x5a, 0x32, 0x38, 0x78, 0x46, 0x44, 0x41, 0x53, 0x42, 0x67, 0x4e, 0x56, - 0x42, 0x41, 0x6f, 0x54, 0x43, 0x30, 0x64, 0x76, 0x62, 0x32, 0x64, 0x73, - 0x5a, 0x53, 0x42, 0x4a, 0x62, 0x6d, 0x4d, 0x75, 0x4d, 0x52, 0x6f, 0x77, - 0x47, 0x41, 0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x46, 0x42, 0x45, 0x71, - 0x4c, 0x6e, 0x52, 0x6c, 0x0a, 0x63, 0x33, 0x51, 0x75, 0x5a, 0x32, 0x39, - 0x76, 0x5a, 0x32, 0x78, 0x6c, 0x4c, 0x6d, 0x4e, 0x76, 0x62, 0x54, 0x43, - 0x42, 0x6e, 0x7a, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, - 0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x45, 0x46, 0x41, 0x41, 0x4f, - 0x42, 0x6a, 0x51, 0x41, 0x77, 0x67, 0x59, 0x6b, 0x43, 0x67, 0x59, 0x45, - 0x41, 0x34, 0x63, 0x4d, 0x56, 0x4a, 0x79, 0x67, 0x73, 0x0a, 0x4a, 0x55, - 0x6d, 0x6c, 0x67, 0x4d, 0x4d, 0x7a, 0x67, 0x64, 0x69, 0x30, 0x68, 0x31, - 0x58, 0x6f, 0x43, 0x52, 0x37, 0x2b, 0x77, 0x77, 0x31, 0x70, 0x6f, 0x70, - 0x30, 0x34, 0x4f, 0x4d, 0x4d, 0x79, 0x79, 0x37, 0x48, 0x2f, 0x69, 0x30, - 0x50, 0x4a, 0x32, 0x57, 0x36, 0x59, 0x33, 0x35, 0x2b, 0x62, 0x34, 0x43, - 0x4d, 0x38, 0x51, 0x72, 0x6b, 0x59, 0x65, 0x45, 0x61, 0x66, 0x55, 0x47, - 0x44, 0x4f, 0x0a, 0x52, 0x59, 0x58, 0x36, 0x79, 0x56, 0x2f, 0x63, 0x48, - 0x47, 0x47, 0x73, 0x44, 0x2f, 0x78, 0x30, 0x32, 0x79, 0x65, 0x36, 0x65, - 0x79, 0x31, 0x55, 0x44, 0x74, 0x6b, 0x47, 0x41, 0x44, 0x2f, 0x6d, 0x70, - 0x44, 0x45, 0x78, 0x38, 0x59, 0x43, 0x72, 0x6a, 0x41, 0x63, 0x31, 0x56, - 0x66, 0x76, 0x74, 0x38, 0x46, 0x6b, 0x36, 0x43, 0x6e, 0x31, 0x57, 0x56, - 0x49, 0x78, 0x56, 0x2f, 0x4a, 0x33, 0x30, 0x0a, 0x33, 0x78, 0x6a, 0x42, - 0x73, 0x46, 0x67, 0x42, 0x79, 0x51, 0x35, 0x35, 0x52, 0x42, 0x70, 0x31, - 0x4f, 0x4c, 0x5a, 0x66, 0x56, 0x4c, 0x6f, 0x36, 0x41, 0x6c, 0x65, 0x42, - 0x44, 0x53, 0x62, 0x63, 0x78, 0x61, 0x45, 0x43, 0x41, 0x77, 0x45, 0x41, - 0x41, 0x61, 0x4e, 0x72, 0x4d, 0x47, 0x6b, 0x77, 0x43, 0x51, 0x59, 0x44, - 0x56, 0x52, 0x30, 0x54, 0x42, 0x41, 0x49, 0x77, 0x41, 0x44, 0x41, 0x4c, - 0x0a, 0x42, 0x67, 0x4e, 0x56, 0x48, 0x51, 0x38, 0x45, 0x42, 0x41, 0x4d, - 0x43, 0x42, 0x65, 0x41, 0x77, 0x54, 0x77, 0x59, 0x44, 0x56, 0x52, 0x30, - 0x52, 0x42, 0x45, 0x67, 0x77, 0x52, 0x6f, 0x49, 0x51, 0x4b, 0x69, 0x35, - 0x30, 0x5a, 0x58, 0x4e, 0x30, 0x4c, 0x6d, 0x64, 0x76, 0x62, 0x32, 0x64, - 0x73, 0x5a, 0x53, 0x35, 0x6d, 0x63, 0x6f, 0x49, 0x59, 0x64, 0x32, 0x46, - 0x30, 0x5a, 0x58, 0x4a, 0x36, 0x0a, 0x62, 0x32, 0x39, 0x70, 0x4c, 0x6e, - 0x52, 0x6c, 0x63, 0x33, 0x51, 0x75, 0x5a, 0x32, 0x39, 0x76, 0x5a, 0x32, - 0x78, 0x6c, 0x4c, 0x6d, 0x4a, 0x6c, 0x67, 0x68, 0x49, 0x71, 0x4c, 0x6e, - 0x52, 0x6c, 0x63, 0x33, 0x51, 0x75, 0x65, 0x57, 0x39, 0x31, 0x64, 0x48, - 0x56, 0x69, 0x5a, 0x53, 0x35, 0x6a, 0x62, 0x32, 0x32, 0x48, 0x42, 0x4d, - 0x43, 0x6f, 0x41, 0x51, 0x4d, 0x77, 0x44, 0x51, 0x59, 0x4a, 0x0a, 0x4b, - 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, 0x41, 0x51, 0x45, 0x46, 0x42, - 0x51, 0x41, 0x44, 0x67, 0x59, 0x45, 0x41, 0x4d, 0x32, 0x49, 0x69, 0x30, - 0x4c, 0x67, 0x54, 0x47, 0x62, 0x4a, 0x31, 0x6a, 0x34, 0x6f, 0x71, 0x58, - 0x39, 0x62, 0x78, 0x56, 0x63, 0x78, 0x6d, 0x2b, 0x2f, 0x52, 0x35, 0x59, - 0x66, 0x38, 0x6f, 0x69, 0x30, 0x61, 0x5a, 0x71, 0x54, 0x4a, 0x6c, 0x6e, - 0x4c, 0x59, 0x53, 0x0a, 0x77, 0x58, 0x63, 0x42, 0x79, 0x6b, 0x78, 0x54, - 0x78, 0x31, 0x38, 0x31, 0x73, 0x37, 0x57, 0x79, 0x66, 0x4a, 0x34, 0x39, - 0x57, 0x77, 0x72, 0x59, 0x58, 0x6f, 0x37, 0x38, 0x7a, 0x54, 0x44, 0x41, - 0x6e, 0x66, 0x31, 0x6d, 0x61, 0x30, 0x66, 0x50, 0x71, 0x33, 0x65, 0x34, - 0x6d, 0x70, 0x73, 0x70, 0x76, 0x79, 0x6e, 0x64, 0x4c, 0x68, 0x31, 0x61, - 0x2b, 0x4f, 0x61, 0x72, 0x48, 0x61, 0x31, 0x65, 0x0a, 0x61, 0x54, 0x30, - 0x44, 0x49, 0x49, 0x59, 0x6b, 0x37, 0x71, 0x65, 0x45, 0x61, 0x31, 0x59, - 0x63, 0x56, 0x6c, 0x6a, 0x78, 0x32, 0x4b, 0x79, 0x4c, 0x64, 0x30, 0x72, - 0x31, 0x42, 0x42, 0x41, 0x66, 0x72, 0x77, 0x79, 0x47, 0x61, 0x45, 0x50, - 0x56, 0x65, 0x4a, 0x51, 0x56, 0x59, 0x57, 0x61, 0x4f, 0x4a, 0x52, 0x55, - 0x32, 0x77, 0x65, 0x2f, 0x4b, 0x44, 0x34, 0x6f, 0x6a, 0x66, 0x39, 0x73, - 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x43, - 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x0a, 0x00}; + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, + 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x6d, 0x7a, 0x43, 0x43, + 0x41, 0x67, 0x53, 0x67, 0x41, 0x77, 0x49, 0x42, 0x41, 0x67, 0x49, 0x42, + 0x41, 0x7a, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47, + 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x55, 0x46, 0x41, 0x44, 0x42, 0x57, + 0x4d, 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, + 0x45, 0x77, 0x4a, 0x42, 0x56, 0x54, 0x45, 0x54, 0x0a, 0x4d, 0x42, 0x45, + 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x41, 0x77, 0x4b, 0x55, 0x32, 0x39, + 0x74, 0x5a, 0x53, 0x31, 0x54, 0x64, 0x47, 0x46, 0x30, 0x5a, 0x54, 0x45, + 0x68, 0x4d, 0x42, 0x38, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x67, 0x77, + 0x59, 0x53, 0x57, 0x35, 0x30, 0x5a, 0x58, 0x4a, 0x75, 0x5a, 0x58, 0x51, + 0x67, 0x56, 0x32, 0x6c, 0x6b, 0x5a, 0x32, 0x6c, 0x30, 0x63, 0x79, 0x42, + 0x51, 0x0a, 0x64, 0x48, 0x6b, 0x67, 0x54, 0x48, 0x52, 0x6b, 0x4d, 0x51, + 0x38, 0x77, 0x44, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x44, 0x41, + 0x5a, 0x30, 0x5a, 0x58, 0x4e, 0x30, 0x59, 0x32, 0x45, 0x77, 0x48, 0x68, + 0x63, 0x4e, 0x4d, 0x54, 0x51, 0x77, 0x4e, 0x7a, 0x49, 0x79, 0x4d, 0x44, + 0x59, 0x77, 0x4d, 0x44, 0x55, 0x33, 0x57, 0x68, 0x63, 0x4e, 0x4d, 0x6a, + 0x51, 0x77, 0x4e, 0x7a, 0x45, 0x35, 0x0a, 0x4d, 0x44, 0x59, 0x77, 0x4d, + 0x44, 0x55, 0x33, 0x57, 0x6a, 0x42, 0x6b, 0x4d, 0x51, 0x73, 0x77, 0x43, + 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, 0x45, 0x77, 0x4a, 0x56, 0x55, + 0x7a, 0x45, 0x52, 0x4d, 0x41, 0x38, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, + 0x42, 0x4d, 0x49, 0x53, 0x57, 0x78, 0x73, 0x61, 0x57, 0x35, 0x76, 0x61, + 0x58, 0x4d, 0x78, 0x45, 0x44, 0x41, 0x4f, 0x42, 0x67, 0x4e, 0x56, 0x0a, + 0x42, 0x41, 0x63, 0x54, 0x42, 0x30, 0x4e, 0x6f, 0x61, 0x57, 0x4e, 0x68, + 0x5a, 0x32, 0x38, 0x78, 0x46, 0x44, 0x41, 0x53, 0x42, 0x67, 0x4e, 0x56, + 0x42, 0x41, 0x6f, 0x54, 0x43, 0x30, 0x64, 0x76, 0x62, 0x32, 0x64, 0x73, + 0x5a, 0x53, 0x42, 0x4a, 0x62, 0x6d, 0x4d, 0x75, 0x4d, 0x52, 0x6f, 0x77, + 0x47, 0x41, 0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x46, 0x42, 0x45, 0x71, + 0x4c, 0x6e, 0x52, 0x6c, 0x0a, 0x63, 0x33, 0x51, 0x75, 0x5a, 0x32, 0x39, + 0x76, 0x5a, 0x32, 0x78, 0x6c, 0x4c, 0x6d, 0x4e, 0x76, 0x62, 0x54, 0x43, + 0x42, 0x6e, 0x7a, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, + 0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x45, 0x46, 0x41, 0x41, 0x4f, + 0x42, 0x6a, 0x51, 0x41, 0x77, 0x67, 0x59, 0x6b, 0x43, 0x67, 0x59, 0x45, + 0x41, 0x34, 0x63, 0x4d, 0x56, 0x4a, 0x79, 0x67, 0x73, 0x0a, 0x4a, 0x55, + 0x6d, 0x6c, 0x67, 0x4d, 0x4d, 0x7a, 0x67, 0x64, 0x69, 0x30, 0x68, 0x31, + 0x58, 0x6f, 0x43, 0x52, 0x37, 0x2b, 0x77, 0x77, 0x31, 0x70, 0x6f, 0x70, + 0x30, 0x34, 0x4f, 0x4d, 0x4d, 0x79, 0x79, 0x37, 0x48, 0x2f, 0x69, 0x30, + 0x50, 0x4a, 0x32, 0x57, 0x36, 0x59, 0x33, 0x35, 0x2b, 0x62, 0x34, 0x43, + 0x4d, 0x38, 0x51, 0x72, 0x6b, 0x59, 0x65, 0x45, 0x61, 0x66, 0x55, 0x47, + 0x44, 0x4f, 0x0a, 0x52, 0x59, 0x58, 0x36, 0x79, 0x56, 0x2f, 0x63, 0x48, + 0x47, 0x47, 0x73, 0x44, 0x2f, 0x78, 0x30, 0x32, 0x79, 0x65, 0x36, 0x65, + 0x79, 0x31, 0x55, 0x44, 0x74, 0x6b, 0x47, 0x41, 0x44, 0x2f, 0x6d, 0x70, + 0x44, 0x45, 0x78, 0x38, 0x59, 0x43, 0x72, 0x6a, 0x41, 0x63, 0x31, 0x56, + 0x66, 0x76, 0x74, 0x38, 0x46, 0x6b, 0x36, 0x43, 0x6e, 0x31, 0x57, 0x56, + 0x49, 0x78, 0x56, 0x2f, 0x4a, 0x33, 0x30, 0x0a, 0x33, 0x78, 0x6a, 0x42, + 0x73, 0x46, 0x67, 0x42, 0x79, 0x51, 0x35, 0x35, 0x52, 0x42, 0x70, 0x31, + 0x4f, 0x4c, 0x5a, 0x66, 0x56, 0x4c, 0x6f, 0x36, 0x41, 0x6c, 0x65, 0x42, + 0x44, 0x53, 0x62, 0x63, 0x78, 0x61, 0x45, 0x43, 0x41, 0x77, 0x45, 0x41, + 0x41, 0x61, 0x4e, 0x72, 0x4d, 0x47, 0x6b, 0x77, 0x43, 0x51, 0x59, 0x44, + 0x56, 0x52, 0x30, 0x54, 0x42, 0x41, 0x49, 0x77, 0x41, 0x44, 0x41, 0x4c, + 0x0a, 0x42, 0x67, 0x4e, 0x56, 0x48, 0x51, 0x38, 0x45, 0x42, 0x41, 0x4d, + 0x43, 0x42, 0x65, 0x41, 0x77, 0x54, 0x77, 0x59, 0x44, 0x56, 0x52, 0x30, + 0x52, 0x42, 0x45, 0x67, 0x77, 0x52, 0x6f, 0x49, 0x51, 0x4b, 0x69, 0x35, + 0x30, 0x5a, 0x58, 0x4e, 0x30, 0x4c, 0x6d, 0x64, 0x76, 0x62, 0x32, 0x64, + 0x73, 0x5a, 0x53, 0x35, 0x6d, 0x63, 0x6f, 0x49, 0x59, 0x64, 0x32, 0x46, + 0x30, 0x5a, 0x58, 0x4a, 0x36, 0x0a, 0x62, 0x32, 0x39, 0x70, 0x4c, 0x6e, + 0x52, 0x6c, 0x63, 0x33, 0x51, 0x75, 0x5a, 0x32, 0x39, 0x76, 0x5a, 0x32, + 0x78, 0x6c, 0x4c, 0x6d, 0x4a, 0x6c, 0x67, 0x68, 0x49, 0x71, 0x4c, 0x6e, + 0x52, 0x6c, 0x63, 0x33, 0x51, 0x75, 0x65, 0x57, 0x39, 0x31, 0x64, 0x48, + 0x56, 0x69, 0x5a, 0x53, 0x35, 0x6a, 0x62, 0x32, 0x32, 0x48, 0x42, 0x4d, + 0x43, 0x6f, 0x41, 0x51, 0x4d, 0x77, 0x44, 0x51, 0x59, 0x4a, 0x0a, 0x4b, + 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, 0x41, 0x51, 0x45, 0x46, 0x42, + 0x51, 0x41, 0x44, 0x67, 0x59, 0x45, 0x41, 0x4d, 0x32, 0x49, 0x69, 0x30, + 0x4c, 0x67, 0x54, 0x47, 0x62, 0x4a, 0x31, 0x6a, 0x34, 0x6f, 0x71, 0x58, + 0x39, 0x62, 0x78, 0x56, 0x63, 0x78, 0x6d, 0x2b, 0x2f, 0x52, 0x35, 0x59, + 0x66, 0x38, 0x6f, 0x69, 0x30, 0x61, 0x5a, 0x71, 0x54, 0x4a, 0x6c, 0x6e, + 0x4c, 0x59, 0x53, 0x0a, 0x77, 0x58, 0x63, 0x42, 0x79, 0x6b, 0x78, 0x54, + 0x78, 0x31, 0x38, 0x31, 0x73, 0x37, 0x57, 0x79, 0x66, 0x4a, 0x34, 0x39, + 0x57, 0x77, 0x72, 0x59, 0x58, 0x6f, 0x37, 0x38, 0x7a, 0x54, 0x44, 0x41, + 0x6e, 0x66, 0x31, 0x6d, 0x61, 0x30, 0x66, 0x50, 0x71, 0x33, 0x65, 0x34, + 0x6d, 0x70, 0x73, 0x70, 0x76, 0x79, 0x6e, 0x64, 0x4c, 0x68, 0x31, 0x61, + 0x2b, 0x4f, 0x61, 0x72, 0x48, 0x61, 0x31, 0x65, 0x0a, 0x61, 0x54, 0x30, + 0x44, 0x49, 0x49, 0x59, 0x6b, 0x37, 0x71, 0x65, 0x45, 0x61, 0x31, 0x59, + 0x63, 0x56, 0x6c, 0x6a, 0x78, 0x32, 0x4b, 0x79, 0x4c, 0x64, 0x30, 0x72, + 0x31, 0x42, 0x42, 0x41, 0x66, 0x72, 0x77, 0x79, 0x47, 0x61, 0x45, 0x50, + 0x56, 0x65, 0x4a, 0x51, 0x56, 0x59, 0x57, 0x61, 0x4f, 0x4a, 0x52, 0x55, + 0x32, 0x77, 0x65, 0x2f, 0x4b, 0x44, 0x34, 0x6f, 0x6a, 0x66, 0x39, 0x73, + 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x43, + 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x0a, 0x00 +}; diff --git a/test/core/end2end/data/server1_key.c b/test/core/end2end/data/server1_key.c index d089660bfd2..78353eed6d6 100644 --- a/test/core/end2end/data/server1_key.c +++ b/test/core/end2end/data/server1_key.c @@ -32,77 +32,78 @@ */ const char test_server1_key[] = { - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x52, - 0x53, 0x41, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b, - 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, - 0x57, 0x77, 0x49, 0x42, 0x41, 0x41, 0x4b, 0x42, 0x67, 0x51, 0x44, 0x68, - 0x77, 0x78, 0x55, 0x6e, 0x4b, 0x43, 0x77, 0x6c, 0x53, 0x61, 0x57, 0x41, - 0x77, 0x7a, 0x4f, 0x42, 0x32, 0x4c, 0x53, 0x48, 0x56, 0x65, 0x67, 0x4a, - 0x48, 0x76, 0x37, 0x44, 0x44, 0x57, 0x6d, 0x69, 0x6e, 0x54, 0x67, 0x34, - 0x77, 0x7a, 0x4c, 0x4c, 0x73, 0x66, 0x2b, 0x4c, 0x51, 0x38, 0x6e, 0x5a, - 0x0a, 0x62, 0x70, 0x6a, 0x66, 0x6e, 0x35, 0x76, 0x67, 0x49, 0x7a, 0x78, - 0x43, 0x75, 0x52, 0x68, 0x34, 0x52, 0x70, 0x39, 0x51, 0x59, 0x4d, 0x35, - 0x46, 0x68, 0x66, 0x72, 0x4a, 0x58, 0x39, 0x77, 0x63, 0x59, 0x61, 0x77, - 0x50, 0x2f, 0x48, 0x54, 0x62, 0x4a, 0x37, 0x70, 0x37, 0x4c, 0x56, 0x51, - 0x4f, 0x32, 0x51, 0x59, 0x41, 0x50, 0x2b, 0x61, 0x6b, 0x4d, 0x54, 0x48, - 0x78, 0x67, 0x4b, 0x75, 0x4d, 0x0a, 0x42, 0x7a, 0x56, 0x56, 0x2b, 0x2b, - 0x33, 0x77, 0x57, 0x54, 0x6f, 0x4b, 0x66, 0x56, 0x5a, 0x55, 0x6a, 0x46, - 0x58, 0x38, 0x6e, 0x66, 0x54, 0x66, 0x47, 0x4d, 0x47, 0x77, 0x57, 0x41, - 0x48, 0x4a, 0x44, 0x6e, 0x6c, 0x45, 0x47, 0x6e, 0x55, 0x34, 0x74, 0x6c, - 0x39, 0x55, 0x75, 0x6a, 0x6f, 0x43, 0x56, 0x34, 0x45, 0x4e, 0x4a, 0x74, - 0x7a, 0x46, 0x6f, 0x51, 0x49, 0x44, 0x41, 0x51, 0x41, 0x42, 0x0a, 0x41, - 0x6f, 0x47, 0x41, 0x4a, 0x2b, 0x36, 0x68, 0x70, 0x7a, 0x4e, 0x72, 0x32, - 0x34, 0x79, 0x54, 0x51, 0x5a, 0x74, 0x46, 0x57, 0x51, 0x70, 0x44, 0x70, - 0x45, 0x79, 0x46, 0x70, 0x6c, 0x64, 0x64, 0x4b, 0x4a, 0x4d, 0x4f, 0x78, - 0x44, 0x79, 0x61, 0x33, 0x53, 0x39, 0x70, 0x70, 0x4b, 0x33, 0x76, 0x54, - 0x57, 0x72, 0x49, 0x49, 0x54, 0x56, 0x32, 0x78, 0x4e, 0x63, 0x75, 0x63, - 0x77, 0x37, 0x49, 0x0a, 0x63, 0x65, 0x54, 0x62, 0x64, 0x79, 0x72, 0x47, - 0x73, 0x79, 0x6a, 0x73, 0x55, 0x30, 0x2f, 0x48, 0x64, 0x43, 0x63, 0x49, - 0x66, 0x39, 0x79, 0x6d, 0x32, 0x6a, 0x66, 0x6d, 0x47, 0x4c, 0x55, 0x77, - 0x6d, 0x79, 0x68, 0x6c, 0x74, 0x4b, 0x56, 0x77, 0x30, 0x51, 0x59, 0x63, - 0x46, 0x42, 0x30, 0x58, 0x4c, 0x6b, 0x63, 0x30, 0x6e, 0x49, 0x35, 0x59, - 0x76, 0x45, 0x59, 0x6f, 0x65, 0x56, 0x44, 0x67, 0x0a, 0x6f, 0x6d, 0x5a, - 0x49, 0x58, 0x6e, 0x31, 0x45, 0x33, 0x45, 0x57, 0x2b, 0x73, 0x53, 0x49, - 0x57, 0x53, 0x62, 0x6b, 0x4d, 0x75, 0x39, 0x62, 0x59, 0x32, 0x6b, 0x73, - 0x74, 0x4b, 0x58, 0x52, 0x32, 0x55, 0x5a, 0x6d, 0x4d, 0x67, 0x57, 0x44, - 0x74, 0x6d, 0x42, 0x45, 0x50, 0x4d, 0x61, 0x45, 0x43, 0x51, 0x51, 0x44, - 0x36, 0x79, 0x54, 0x34, 0x54, 0x41, 0x5a, 0x4d, 0x35, 0x68, 0x47, 0x42, - 0x62, 0x0a, 0x63, 0x69, 0x42, 0x4b, 0x67, 0x4d, 0x55, 0x50, 0x36, 0x50, - 0x77, 0x4f, 0x68, 0x50, 0x68, 0x4f, 0x4d, 0x50, 0x49, 0x76, 0x69, 0x6a, - 0x4f, 0x35, 0x30, 0x41, 0x69, 0x75, 0x36, 0x69, 0x75, 0x43, 0x56, 0x38, - 0x38, 0x6c, 0x31, 0x51, 0x49, 0x79, 0x33, 0x38, 0x67, 0x57, 0x56, 0x68, - 0x78, 0x6a, 0x4e, 0x72, 0x71, 0x36, 0x50, 0x33, 0x34, 0x36, 0x6a, 0x34, - 0x49, 0x42, 0x67, 0x2b, 0x6b, 0x42, 0x0a, 0x39, 0x61, 0x6c, 0x77, 0x70, - 0x43, 0x4f, 0x44, 0x41, 0x6b, 0x45, 0x41, 0x35, 0x6e, 0x53, 0x6e, 0x6d, - 0x39, 0x6b, 0x36, 0x79, 0x6b, 0x59, 0x65, 0x51, 0x57, 0x4e, 0x53, 0x30, - 0x66, 0x4e, 0x57, 0x69, 0x52, 0x69, 0x6e, 0x43, 0x64, 0x6c, 0x32, 0x33, - 0x41, 0x37, 0x75, 0x73, 0x44, 0x47, 0x53, 0x75, 0x4b, 0x4b, 0x6c, 0x6d, - 0x30, 0x31, 0x39, 0x69, 0x6f, 0x6d, 0x4a, 0x2f, 0x52, 0x67, 0x64, 0x0a, - 0x4d, 0x4b, 0x44, 0x4f, 0x70, 0x30, 0x71, 0x2f, 0x32, 0x4f, 0x6f, 0x73, - 0x74, 0x62, 0x74, 0x65, 0x4f, 0x57, 0x4d, 0x32, 0x4d, 0x52, 0x46, 0x66, - 0x34, 0x6a, 0x4d, 0x48, 0x33, 0x77, 0x79, 0x56, 0x43, 0x77, 0x4a, 0x41, - 0x66, 0x41, 0x64, 0x6a, 0x4a, 0x38, 0x73, 0x7a, 0x6f, 0x4e, 0x4b, 0x54, - 0x52, 0x53, 0x61, 0x67, 0x53, 0x62, 0x68, 0x39, 0x76, 0x57, 0x79, 0x67, - 0x6e, 0x42, 0x32, 0x76, 0x0a, 0x49, 0x42, 0x79, 0x63, 0x36, 0x6c, 0x34, - 0x54, 0x54, 0x75, 0x5a, 0x51, 0x4a, 0x52, 0x47, 0x7a, 0x43, 0x76, 0x65, - 0x61, 0x66, 0x7a, 0x39, 0x6c, 0x6f, 0x76, 0x75, 0x42, 0x33, 0x57, 0x6f, - 0x68, 0x43, 0x41, 0x42, 0x64, 0x51, 0x52, 0x64, 0x39, 0x75, 0x6b, 0x43, - 0x58, 0x4c, 0x32, 0x43, 0x70, 0x73, 0x45, 0x70, 0x71, 0x7a, 0x6b, 0x61, - 0x66, 0x4f, 0x51, 0x4a, 0x41, 0x4a, 0x55, 0x6a, 0x63, 0x0a, 0x55, 0x53, - 0x65, 0x64, 0x44, 0x6c, 0x71, 0x33, 0x7a, 0x47, 0x5a, 0x77, 0x59, 0x4d, - 0x31, 0x59, 0x77, 0x38, 0x64, 0x38, 0x52, 0x75, 0x69, 0x72, 0x42, 0x55, - 0x46, 0x5a, 0x4e, 0x71, 0x4a, 0x65, 0x6c, 0x59, 0x61, 0x69, 0x2b, 0x6e, - 0x52, 0x59, 0x43, 0x6c, 0x44, 0x6b, 0x52, 0x56, 0x46, 0x67, 0x62, 0x35, - 0x79, 0x6b, 0x73, 0x6f, 0x59, 0x79, 0x63, 0x62, 0x71, 0x35, 0x54, 0x78, - 0x47, 0x6f, 0x0a, 0x56, 0x65, 0x71, 0x4b, 0x4f, 0x76, 0x67, 0x50, 0x70, - 0x6a, 0x34, 0x52, 0x57, 0x50, 0x48, 0x6c, 0x4c, 0x77, 0x4a, 0x41, 0x47, - 0x55, 0x4d, 0x6b, 0x33, 0x62, 0x71, 0x54, 0x39, 0x31, 0x78, 0x42, 0x55, - 0x43, 0x6e, 0x4c, 0x52, 0x73, 0x2f, 0x76, 0x66, 0x6f, 0x43, 0x70, 0x48, - 0x70, 0x67, 0x36, 0x65, 0x79, 0x77, 0x51, 0x54, 0x42, 0x44, 0x41, 0x56, - 0x36, 0x78, 0x6b, 0x79, 0x7a, 0x34, 0x61, 0x0a, 0x52, 0x48, 0x33, 0x49, - 0x37, 0x2f, 0x2b, 0x79, 0x6a, 0x33, 0x5a, 0x78, 0x52, 0x32, 0x4a, 0x6f, - 0x57, 0x48, 0x67, 0x55, 0x77, 0x5a, 0x37, 0x6c, 0x5a, 0x6b, 0x31, 0x56, - 0x6e, 0x68, 0x66, 0x66, 0x46, 0x79, 0x65, 0x37, 0x53, 0x42, 0x58, 0x79, - 0x61, 0x67, 0x3d, 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, - 0x44, 0x20, 0x52, 0x53, 0x41, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, - 0x45, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x00}; + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x52, + 0x53, 0x41, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b, + 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, + 0x57, 0x77, 0x49, 0x42, 0x41, 0x41, 0x4b, 0x42, 0x67, 0x51, 0x44, 0x68, + 0x77, 0x78, 0x55, 0x6e, 0x4b, 0x43, 0x77, 0x6c, 0x53, 0x61, 0x57, 0x41, + 0x77, 0x7a, 0x4f, 0x42, 0x32, 0x4c, 0x53, 0x48, 0x56, 0x65, 0x67, 0x4a, + 0x48, 0x76, 0x37, 0x44, 0x44, 0x57, 0x6d, 0x69, 0x6e, 0x54, 0x67, 0x34, + 0x77, 0x7a, 0x4c, 0x4c, 0x73, 0x66, 0x2b, 0x4c, 0x51, 0x38, 0x6e, 0x5a, + 0x0a, 0x62, 0x70, 0x6a, 0x66, 0x6e, 0x35, 0x76, 0x67, 0x49, 0x7a, 0x78, + 0x43, 0x75, 0x52, 0x68, 0x34, 0x52, 0x70, 0x39, 0x51, 0x59, 0x4d, 0x35, + 0x46, 0x68, 0x66, 0x72, 0x4a, 0x58, 0x39, 0x77, 0x63, 0x59, 0x61, 0x77, + 0x50, 0x2f, 0x48, 0x54, 0x62, 0x4a, 0x37, 0x70, 0x37, 0x4c, 0x56, 0x51, + 0x4f, 0x32, 0x51, 0x59, 0x41, 0x50, 0x2b, 0x61, 0x6b, 0x4d, 0x54, 0x48, + 0x78, 0x67, 0x4b, 0x75, 0x4d, 0x0a, 0x42, 0x7a, 0x56, 0x56, 0x2b, 0x2b, + 0x33, 0x77, 0x57, 0x54, 0x6f, 0x4b, 0x66, 0x56, 0x5a, 0x55, 0x6a, 0x46, + 0x58, 0x38, 0x6e, 0x66, 0x54, 0x66, 0x47, 0x4d, 0x47, 0x77, 0x57, 0x41, + 0x48, 0x4a, 0x44, 0x6e, 0x6c, 0x45, 0x47, 0x6e, 0x55, 0x34, 0x74, 0x6c, + 0x39, 0x55, 0x75, 0x6a, 0x6f, 0x43, 0x56, 0x34, 0x45, 0x4e, 0x4a, 0x74, + 0x7a, 0x46, 0x6f, 0x51, 0x49, 0x44, 0x41, 0x51, 0x41, 0x42, 0x0a, 0x41, + 0x6f, 0x47, 0x41, 0x4a, 0x2b, 0x36, 0x68, 0x70, 0x7a, 0x4e, 0x72, 0x32, + 0x34, 0x79, 0x54, 0x51, 0x5a, 0x74, 0x46, 0x57, 0x51, 0x70, 0x44, 0x70, + 0x45, 0x79, 0x46, 0x70, 0x6c, 0x64, 0x64, 0x4b, 0x4a, 0x4d, 0x4f, 0x78, + 0x44, 0x79, 0x61, 0x33, 0x53, 0x39, 0x70, 0x70, 0x4b, 0x33, 0x76, 0x54, + 0x57, 0x72, 0x49, 0x49, 0x54, 0x56, 0x32, 0x78, 0x4e, 0x63, 0x75, 0x63, + 0x77, 0x37, 0x49, 0x0a, 0x63, 0x65, 0x54, 0x62, 0x64, 0x79, 0x72, 0x47, + 0x73, 0x79, 0x6a, 0x73, 0x55, 0x30, 0x2f, 0x48, 0x64, 0x43, 0x63, 0x49, + 0x66, 0x39, 0x79, 0x6d, 0x32, 0x6a, 0x66, 0x6d, 0x47, 0x4c, 0x55, 0x77, + 0x6d, 0x79, 0x68, 0x6c, 0x74, 0x4b, 0x56, 0x77, 0x30, 0x51, 0x59, 0x63, + 0x46, 0x42, 0x30, 0x58, 0x4c, 0x6b, 0x63, 0x30, 0x6e, 0x49, 0x35, 0x59, + 0x76, 0x45, 0x59, 0x6f, 0x65, 0x56, 0x44, 0x67, 0x0a, 0x6f, 0x6d, 0x5a, + 0x49, 0x58, 0x6e, 0x31, 0x45, 0x33, 0x45, 0x57, 0x2b, 0x73, 0x53, 0x49, + 0x57, 0x53, 0x62, 0x6b, 0x4d, 0x75, 0x39, 0x62, 0x59, 0x32, 0x6b, 0x73, + 0x74, 0x4b, 0x58, 0x52, 0x32, 0x55, 0x5a, 0x6d, 0x4d, 0x67, 0x57, 0x44, + 0x74, 0x6d, 0x42, 0x45, 0x50, 0x4d, 0x61, 0x45, 0x43, 0x51, 0x51, 0x44, + 0x36, 0x79, 0x54, 0x34, 0x54, 0x41, 0x5a, 0x4d, 0x35, 0x68, 0x47, 0x42, + 0x62, 0x0a, 0x63, 0x69, 0x42, 0x4b, 0x67, 0x4d, 0x55, 0x50, 0x36, 0x50, + 0x77, 0x4f, 0x68, 0x50, 0x68, 0x4f, 0x4d, 0x50, 0x49, 0x76, 0x69, 0x6a, + 0x4f, 0x35, 0x30, 0x41, 0x69, 0x75, 0x36, 0x69, 0x75, 0x43, 0x56, 0x38, + 0x38, 0x6c, 0x31, 0x51, 0x49, 0x79, 0x33, 0x38, 0x67, 0x57, 0x56, 0x68, + 0x78, 0x6a, 0x4e, 0x72, 0x71, 0x36, 0x50, 0x33, 0x34, 0x36, 0x6a, 0x34, + 0x49, 0x42, 0x67, 0x2b, 0x6b, 0x42, 0x0a, 0x39, 0x61, 0x6c, 0x77, 0x70, + 0x43, 0x4f, 0x44, 0x41, 0x6b, 0x45, 0x41, 0x35, 0x6e, 0x53, 0x6e, 0x6d, + 0x39, 0x6b, 0x36, 0x79, 0x6b, 0x59, 0x65, 0x51, 0x57, 0x4e, 0x53, 0x30, + 0x66, 0x4e, 0x57, 0x69, 0x52, 0x69, 0x6e, 0x43, 0x64, 0x6c, 0x32, 0x33, + 0x41, 0x37, 0x75, 0x73, 0x44, 0x47, 0x53, 0x75, 0x4b, 0x4b, 0x6c, 0x6d, + 0x30, 0x31, 0x39, 0x69, 0x6f, 0x6d, 0x4a, 0x2f, 0x52, 0x67, 0x64, 0x0a, + 0x4d, 0x4b, 0x44, 0x4f, 0x70, 0x30, 0x71, 0x2f, 0x32, 0x4f, 0x6f, 0x73, + 0x74, 0x62, 0x74, 0x65, 0x4f, 0x57, 0x4d, 0x32, 0x4d, 0x52, 0x46, 0x66, + 0x34, 0x6a, 0x4d, 0x48, 0x33, 0x77, 0x79, 0x56, 0x43, 0x77, 0x4a, 0x41, + 0x66, 0x41, 0x64, 0x6a, 0x4a, 0x38, 0x73, 0x7a, 0x6f, 0x4e, 0x4b, 0x54, + 0x52, 0x53, 0x61, 0x67, 0x53, 0x62, 0x68, 0x39, 0x76, 0x57, 0x79, 0x67, + 0x6e, 0x42, 0x32, 0x76, 0x0a, 0x49, 0x42, 0x79, 0x63, 0x36, 0x6c, 0x34, + 0x54, 0x54, 0x75, 0x5a, 0x51, 0x4a, 0x52, 0x47, 0x7a, 0x43, 0x76, 0x65, + 0x61, 0x66, 0x7a, 0x39, 0x6c, 0x6f, 0x76, 0x75, 0x42, 0x33, 0x57, 0x6f, + 0x68, 0x43, 0x41, 0x42, 0x64, 0x51, 0x52, 0x64, 0x39, 0x75, 0x6b, 0x43, + 0x58, 0x4c, 0x32, 0x43, 0x70, 0x73, 0x45, 0x70, 0x71, 0x7a, 0x6b, 0x61, + 0x66, 0x4f, 0x51, 0x4a, 0x41, 0x4a, 0x55, 0x6a, 0x63, 0x0a, 0x55, 0x53, + 0x65, 0x64, 0x44, 0x6c, 0x71, 0x33, 0x7a, 0x47, 0x5a, 0x77, 0x59, 0x4d, + 0x31, 0x59, 0x77, 0x38, 0x64, 0x38, 0x52, 0x75, 0x69, 0x72, 0x42, 0x55, + 0x46, 0x5a, 0x4e, 0x71, 0x4a, 0x65, 0x6c, 0x59, 0x61, 0x69, 0x2b, 0x6e, + 0x52, 0x59, 0x43, 0x6c, 0x44, 0x6b, 0x52, 0x56, 0x46, 0x67, 0x62, 0x35, + 0x79, 0x6b, 0x73, 0x6f, 0x59, 0x79, 0x63, 0x62, 0x71, 0x35, 0x54, 0x78, + 0x47, 0x6f, 0x0a, 0x56, 0x65, 0x71, 0x4b, 0x4f, 0x76, 0x67, 0x50, 0x70, + 0x6a, 0x34, 0x52, 0x57, 0x50, 0x48, 0x6c, 0x4c, 0x77, 0x4a, 0x41, 0x47, + 0x55, 0x4d, 0x6b, 0x33, 0x62, 0x71, 0x54, 0x39, 0x31, 0x78, 0x42, 0x55, + 0x43, 0x6e, 0x4c, 0x52, 0x73, 0x2f, 0x76, 0x66, 0x6f, 0x43, 0x70, 0x48, + 0x70, 0x67, 0x36, 0x65, 0x79, 0x77, 0x51, 0x54, 0x42, 0x44, 0x41, 0x56, + 0x36, 0x78, 0x6b, 0x79, 0x7a, 0x34, 0x61, 0x0a, 0x52, 0x48, 0x33, 0x49, + 0x37, 0x2f, 0x2b, 0x79, 0x6a, 0x33, 0x5a, 0x78, 0x52, 0x32, 0x4a, 0x6f, + 0x57, 0x48, 0x67, 0x55, 0x77, 0x5a, 0x37, 0x6c, 0x5a, 0x6b, 0x31, 0x56, + 0x6e, 0x68, 0x66, 0x66, 0x46, 0x79, 0x65, 0x37, 0x53, 0x42, 0x58, 0x79, + 0x61, 0x67, 0x3d, 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, + 0x44, 0x20, 0x52, 0x53, 0x41, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, + 0x45, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x00 +}; diff --git a/test/core/end2end/data/test_root_cert.c b/test/core/end2end/data/test_root_cert.c index 58d98050175..f8e69e61b2f 100644 --- a/test/core/end2end/data/test_root_cert.c +++ b/test/core/end2end/data/test_root_cert.c @@ -32,70 +32,71 @@ */ const char test_root_cert[] = { - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, - 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x49, 0x7a, 0x43, 0x43, - 0x41, 0x59, 0x77, 0x43, 0x43, 0x51, 0x43, 0x46, 0x54, 0x62, 0x46, 0x37, - 0x58, 0x4e, 0x53, 0x76, 0x76, 0x6a, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, - 0x68, 0x6b, 0x69, 0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x55, 0x46, - 0x41, 0x44, 0x42, 0x57, 0x4d, 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44, - 0x56, 0x51, 0x51, 0x47, 0x45, 0x77, 0x4a, 0x42, 0x0a, 0x56, 0x54, 0x45, - 0x54, 0x4d, 0x42, 0x45, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x41, 0x77, - 0x4b, 0x55, 0x32, 0x39, 0x74, 0x5a, 0x53, 0x31, 0x54, 0x64, 0x47, 0x46, - 0x30, 0x5a, 0x54, 0x45, 0x68, 0x4d, 0x42, 0x38, 0x47, 0x41, 0x31, 0x55, - 0x45, 0x43, 0x67, 0x77, 0x59, 0x53, 0x57, 0x35, 0x30, 0x5a, 0x58, 0x4a, - 0x75, 0x5a, 0x58, 0x51, 0x67, 0x56, 0x32, 0x6c, 0x6b, 0x5a, 0x32, 0x6c, - 0x30, 0x0a, 0x63, 0x79, 0x42, 0x51, 0x64, 0x48, 0x6b, 0x67, 0x54, 0x48, - 0x52, 0x6b, 0x4d, 0x51, 0x38, 0x77, 0x44, 0x51, 0x59, 0x44, 0x56, 0x51, - 0x51, 0x44, 0x44, 0x41, 0x5a, 0x30, 0x5a, 0x58, 0x4e, 0x30, 0x59, 0x32, - 0x45, 0x77, 0x48, 0x68, 0x63, 0x4e, 0x4d, 0x54, 0x51, 0x77, 0x4e, 0x7a, - 0x45, 0x33, 0x4d, 0x6a, 0x4d, 0x78, 0x4e, 0x7a, 0x55, 0x78, 0x57, 0x68, - 0x63, 0x4e, 0x4d, 0x6a, 0x51, 0x77, 0x0a, 0x4e, 0x7a, 0x45, 0x30, 0x4d, - 0x6a, 0x4d, 0x78, 0x4e, 0x7a, 0x55, 0x78, 0x57, 0x6a, 0x42, 0x57, 0x4d, - 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, 0x45, - 0x77, 0x4a, 0x42, 0x56, 0x54, 0x45, 0x54, 0x4d, 0x42, 0x45, 0x47, 0x41, - 0x31, 0x55, 0x45, 0x43, 0x41, 0x77, 0x4b, 0x55, 0x32, 0x39, 0x74, 0x5a, - 0x53, 0x31, 0x54, 0x64, 0x47, 0x46, 0x30, 0x5a, 0x54, 0x45, 0x68, 0x0a, - 0x4d, 0x42, 0x38, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x67, 0x77, 0x59, - 0x53, 0x57, 0x35, 0x30, 0x5a, 0x58, 0x4a, 0x75, 0x5a, 0x58, 0x51, 0x67, - 0x56, 0x32, 0x6c, 0x6b, 0x5a, 0x32, 0x6c, 0x30, 0x63, 0x79, 0x42, 0x51, - 0x64, 0x48, 0x6b, 0x67, 0x54, 0x48, 0x52, 0x6b, 0x4d, 0x51, 0x38, 0x77, - 0x44, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x44, 0x41, 0x5a, 0x30, - 0x5a, 0x58, 0x4e, 0x30, 0x0a, 0x59, 0x32, 0x45, 0x77, 0x67, 0x5a, 0x38, - 0x77, 0x44, 0x51, 0x59, 0x4a, 0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, - 0x4e, 0x41, 0x51, 0x45, 0x42, 0x42, 0x51, 0x41, 0x44, 0x67, 0x59, 0x30, - 0x41, 0x4d, 0x49, 0x47, 0x4a, 0x41, 0x6f, 0x47, 0x42, 0x41, 0x4d, 0x42, - 0x41, 0x33, 0x77, 0x56, 0x65, 0x54, 0x47, 0x48, 0x5a, 0x52, 0x31, 0x52, - 0x79, 0x65, 0x2f, 0x69, 0x2b, 0x4a, 0x38, 0x61, 0x32, 0x0a, 0x63, 0x75, - 0x35, 0x67, 0x58, 0x77, 0x46, 0x56, 0x36, 0x54, 0x6e, 0x4f, 0x62, 0x7a, - 0x47, 0x4d, 0x37, 0x62, 0x4c, 0x46, 0x43, 0x4f, 0x35, 0x69, 0x39, 0x76, - 0x34, 0x6d, 0x4c, 0x6f, 0x34, 0x69, 0x46, 0x7a, 0x50, 0x73, 0x48, 0x6d, - 0x57, 0x44, 0x55, 0x78, 0x4b, 0x53, 0x33, 0x59, 0x38, 0x69, 0x58, 0x62, - 0x75, 0x30, 0x65, 0x59, 0x42, 0x6c, 0x4c, 0x6f, 0x4e, 0x59, 0x30, 0x6c, - 0x53, 0x76, 0x0a, 0x78, 0x44, 0x78, 0x33, 0x33, 0x4f, 0x2b, 0x44, 0x75, - 0x77, 0x4d, 0x6d, 0x56, 0x4e, 0x2b, 0x44, 0x7a, 0x53, 0x44, 0x2b, 0x45, - 0x6f, 0x64, 0x39, 0x7a, 0x66, 0x76, 0x77, 0x4f, 0x57, 0x48, 0x73, 0x61, - 0x7a, 0x59, 0x43, 0x5a, 0x54, 0x32, 0x50, 0x68, 0x4e, 0x78, 0x6e, 0x56, - 0x57, 0x49, 0x75, 0x4a, 0x58, 0x56, 0x69, 0x59, 0x34, 0x4a, 0x41, 0x48, - 0x55, 0x47, 0x6f, 0x64, 0x6a, 0x78, 0x2b, 0x0a, 0x51, 0x41, 0x69, 0x36, - 0x79, 0x43, 0x41, 0x75, 0x72, 0x55, 0x5a, 0x47, 0x76, 0x59, 0x58, 0x47, - 0x67, 0x5a, 0x53, 0x42, 0x41, 0x67, 0x4d, 0x42, 0x41, 0x41, 0x45, 0x77, - 0x44, 0x51, 0x59, 0x4a, 0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, - 0x41, 0x51, 0x45, 0x46, 0x42, 0x51, 0x41, 0x44, 0x67, 0x59, 0x45, 0x41, - 0x51, 0x6f, 0x51, 0x56, 0x44, 0x38, 0x62, 0x77, 0x64, 0x74, 0x57, 0x4a, - 0x0a, 0x41, 0x6e, 0x69, 0x47, 0x42, 0x77, 0x63, 0x43, 0x66, 0x71, 0x59, - 0x79, 0x48, 0x2b, 0x2f, 0x4b, 0x70, 0x41, 0x31, 0x30, 0x41, 0x63, 0x65, - 0x62, 0x4a, 0x56, 0x56, 0x54, 0x79, 0x59, 0x62, 0x59, 0x76, 0x49, 0x39, - 0x51, 0x38, 0x64, 0x36, 0x52, 0x53, 0x56, 0x75, 0x34, 0x50, 0x5a, 0x79, - 0x39, 0x4f, 0x41, 0x4c, 0x48, 0x52, 0x2f, 0x51, 0x72, 0x57, 0x42, 0x64, - 0x59, 0x54, 0x41, 0x79, 0x7a, 0x0a, 0x66, 0x4e, 0x41, 0x6d, 0x63, 0x32, - 0x63, 0x6d, 0x64, 0x6b, 0x53, 0x52, 0x4a, 0x7a, 0x6a, 0x68, 0x49, 0x61, - 0x4f, 0x73, 0x74, 0x6e, 0x51, 0x79, 0x31, 0x4a, 0x2b, 0x46, 0x6b, 0x30, - 0x54, 0x39, 0x58, 0x79, 0x76, 0x51, 0x74, 0x71, 0x34, 0x39, 0x39, 0x79, - 0x46, 0x62, 0x71, 0x39, 0x78, 0x6f, 0x67, 0x55, 0x56, 0x6c, 0x45, 0x47, - 0x48, 0x36, 0x32, 0x78, 0x50, 0x36, 0x76, 0x48, 0x30, 0x59, 0x0a, 0x35, - 0x75, 0x6b, 0x4b, 0x2f, 0x2f, 0x64, 0x43, 0x50, 0x41, 0x7a, 0x41, 0x31, - 0x31, 0x59, 0x75, 0x58, 0x32, 0x72, 0x6e, 0x65, 0x78, 0x30, 0x4a, 0x68, - 0x75, 0x54, 0x51, 0x66, 0x63, 0x49, 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x43, 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, - 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x00}; + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, + 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x49, 0x7a, 0x43, 0x43, + 0x41, 0x59, 0x77, 0x43, 0x43, 0x51, 0x43, 0x46, 0x54, 0x62, 0x46, 0x37, + 0x58, 0x4e, 0x53, 0x76, 0x76, 0x6a, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, + 0x68, 0x6b, 0x69, 0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x55, 0x46, + 0x41, 0x44, 0x42, 0x57, 0x4d, 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44, + 0x56, 0x51, 0x51, 0x47, 0x45, 0x77, 0x4a, 0x42, 0x0a, 0x56, 0x54, 0x45, + 0x54, 0x4d, 0x42, 0x45, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x41, 0x77, + 0x4b, 0x55, 0x32, 0x39, 0x74, 0x5a, 0x53, 0x31, 0x54, 0x64, 0x47, 0x46, + 0x30, 0x5a, 0x54, 0x45, 0x68, 0x4d, 0x42, 0x38, 0x47, 0x41, 0x31, 0x55, + 0x45, 0x43, 0x67, 0x77, 0x59, 0x53, 0x57, 0x35, 0x30, 0x5a, 0x58, 0x4a, + 0x75, 0x5a, 0x58, 0x51, 0x67, 0x56, 0x32, 0x6c, 0x6b, 0x5a, 0x32, 0x6c, + 0x30, 0x0a, 0x63, 0x79, 0x42, 0x51, 0x64, 0x48, 0x6b, 0x67, 0x54, 0x48, + 0x52, 0x6b, 0x4d, 0x51, 0x38, 0x77, 0x44, 0x51, 0x59, 0x44, 0x56, 0x51, + 0x51, 0x44, 0x44, 0x41, 0x5a, 0x30, 0x5a, 0x58, 0x4e, 0x30, 0x59, 0x32, + 0x45, 0x77, 0x48, 0x68, 0x63, 0x4e, 0x4d, 0x54, 0x51, 0x77, 0x4e, 0x7a, + 0x45, 0x33, 0x4d, 0x6a, 0x4d, 0x78, 0x4e, 0x7a, 0x55, 0x78, 0x57, 0x68, + 0x63, 0x4e, 0x4d, 0x6a, 0x51, 0x77, 0x0a, 0x4e, 0x7a, 0x45, 0x30, 0x4d, + 0x6a, 0x4d, 0x78, 0x4e, 0x7a, 0x55, 0x78, 0x57, 0x6a, 0x42, 0x57, 0x4d, + 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, 0x45, + 0x77, 0x4a, 0x42, 0x56, 0x54, 0x45, 0x54, 0x4d, 0x42, 0x45, 0x47, 0x41, + 0x31, 0x55, 0x45, 0x43, 0x41, 0x77, 0x4b, 0x55, 0x32, 0x39, 0x74, 0x5a, + 0x53, 0x31, 0x54, 0x64, 0x47, 0x46, 0x30, 0x5a, 0x54, 0x45, 0x68, 0x0a, + 0x4d, 0x42, 0x38, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x67, 0x77, 0x59, + 0x53, 0x57, 0x35, 0x30, 0x5a, 0x58, 0x4a, 0x75, 0x5a, 0x58, 0x51, 0x67, + 0x56, 0x32, 0x6c, 0x6b, 0x5a, 0x32, 0x6c, 0x30, 0x63, 0x79, 0x42, 0x51, + 0x64, 0x48, 0x6b, 0x67, 0x54, 0x48, 0x52, 0x6b, 0x4d, 0x51, 0x38, 0x77, + 0x44, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x44, 0x41, 0x5a, 0x30, + 0x5a, 0x58, 0x4e, 0x30, 0x0a, 0x59, 0x32, 0x45, 0x77, 0x67, 0x5a, 0x38, + 0x77, 0x44, 0x51, 0x59, 0x4a, 0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, + 0x4e, 0x41, 0x51, 0x45, 0x42, 0x42, 0x51, 0x41, 0x44, 0x67, 0x59, 0x30, + 0x41, 0x4d, 0x49, 0x47, 0x4a, 0x41, 0x6f, 0x47, 0x42, 0x41, 0x4d, 0x42, + 0x41, 0x33, 0x77, 0x56, 0x65, 0x54, 0x47, 0x48, 0x5a, 0x52, 0x31, 0x52, + 0x79, 0x65, 0x2f, 0x69, 0x2b, 0x4a, 0x38, 0x61, 0x32, 0x0a, 0x63, 0x75, + 0x35, 0x67, 0x58, 0x77, 0x46, 0x56, 0x36, 0x54, 0x6e, 0x4f, 0x62, 0x7a, + 0x47, 0x4d, 0x37, 0x62, 0x4c, 0x46, 0x43, 0x4f, 0x35, 0x69, 0x39, 0x76, + 0x34, 0x6d, 0x4c, 0x6f, 0x34, 0x69, 0x46, 0x7a, 0x50, 0x73, 0x48, 0x6d, + 0x57, 0x44, 0x55, 0x78, 0x4b, 0x53, 0x33, 0x59, 0x38, 0x69, 0x58, 0x62, + 0x75, 0x30, 0x65, 0x59, 0x42, 0x6c, 0x4c, 0x6f, 0x4e, 0x59, 0x30, 0x6c, + 0x53, 0x76, 0x0a, 0x78, 0x44, 0x78, 0x33, 0x33, 0x4f, 0x2b, 0x44, 0x75, + 0x77, 0x4d, 0x6d, 0x56, 0x4e, 0x2b, 0x44, 0x7a, 0x53, 0x44, 0x2b, 0x45, + 0x6f, 0x64, 0x39, 0x7a, 0x66, 0x76, 0x77, 0x4f, 0x57, 0x48, 0x73, 0x61, + 0x7a, 0x59, 0x43, 0x5a, 0x54, 0x32, 0x50, 0x68, 0x4e, 0x78, 0x6e, 0x56, + 0x57, 0x49, 0x75, 0x4a, 0x58, 0x56, 0x69, 0x59, 0x34, 0x4a, 0x41, 0x48, + 0x55, 0x47, 0x6f, 0x64, 0x6a, 0x78, 0x2b, 0x0a, 0x51, 0x41, 0x69, 0x36, + 0x79, 0x43, 0x41, 0x75, 0x72, 0x55, 0x5a, 0x47, 0x76, 0x59, 0x58, 0x47, + 0x67, 0x5a, 0x53, 0x42, 0x41, 0x67, 0x4d, 0x42, 0x41, 0x41, 0x45, 0x77, + 0x44, 0x51, 0x59, 0x4a, 0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, + 0x41, 0x51, 0x45, 0x46, 0x42, 0x51, 0x41, 0x44, 0x67, 0x59, 0x45, 0x41, + 0x51, 0x6f, 0x51, 0x56, 0x44, 0x38, 0x62, 0x77, 0x64, 0x74, 0x57, 0x4a, + 0x0a, 0x41, 0x6e, 0x69, 0x47, 0x42, 0x77, 0x63, 0x43, 0x66, 0x71, 0x59, + 0x79, 0x48, 0x2b, 0x2f, 0x4b, 0x70, 0x41, 0x31, 0x30, 0x41, 0x63, 0x65, + 0x62, 0x4a, 0x56, 0x56, 0x54, 0x79, 0x59, 0x62, 0x59, 0x76, 0x49, 0x39, + 0x51, 0x38, 0x64, 0x36, 0x52, 0x53, 0x56, 0x75, 0x34, 0x50, 0x5a, 0x79, + 0x39, 0x4f, 0x41, 0x4c, 0x48, 0x52, 0x2f, 0x51, 0x72, 0x57, 0x42, 0x64, + 0x59, 0x54, 0x41, 0x79, 0x7a, 0x0a, 0x66, 0x4e, 0x41, 0x6d, 0x63, 0x32, + 0x63, 0x6d, 0x64, 0x6b, 0x53, 0x52, 0x4a, 0x7a, 0x6a, 0x68, 0x49, 0x61, + 0x4f, 0x73, 0x74, 0x6e, 0x51, 0x79, 0x31, 0x4a, 0x2b, 0x46, 0x6b, 0x30, + 0x54, 0x39, 0x58, 0x79, 0x76, 0x51, 0x74, 0x71, 0x34, 0x39, 0x39, 0x79, + 0x46, 0x62, 0x71, 0x39, 0x78, 0x6f, 0x67, 0x55, 0x56, 0x6c, 0x45, 0x47, + 0x48, 0x36, 0x32, 0x78, 0x50, 0x36, 0x76, 0x48, 0x30, 0x59, 0x0a, 0x35, + 0x75, 0x6b, 0x4b, 0x2f, 0x2f, 0x64, 0x43, 0x50, 0x41, 0x7a, 0x41, 0x31, + 0x31, 0x59, 0x75, 0x58, 0x32, 0x72, 0x6e, 0x65, 0x78, 0x30, 0x4a, 0x68, + 0x75, 0x54, 0x51, 0x66, 0x63, 0x49, 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x43, 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, + 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x00 +}; diff --git a/test/core/end2end/dualstack_socket_test.c b/test/core/end2end/dualstack_socket_test.c index ec98cf39b4a..5da851bbcd2 100644 --- a/test/core/end2end/dualstack_socket_test.c +++ b/test/core/end2end/dualstack_socket_test.c @@ -49,22 +49,37 @@ /* This test exercises IPv4, IPv6, and dualstack sockets in various ways. */ -static void *tag(gpr_intptr i) { return (void *)i; } +static void * +tag (gpr_intptr i) +{ + return (void *) i; +} -static gpr_timespec ms_from_now(int ms) { - return GRPC_TIMEOUT_MILLIS_TO_DEADLINE(ms); +static gpr_timespec +ms_from_now (int ms) +{ + return GRPC_TIMEOUT_MILLIS_TO_DEADLINE (ms); } -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, ms_from_now(5000), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, ms_from_now (5000), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); +} + +static void +do_nothing (void *ignored) +{ } -static void do_nothing(void *ignored) {} -void test_connect(const char *server_host, const char *client_host, int port, - int expect_ok) { +void +test_connect (const char *server_host, const char *client_host, int port, int expect_ok) +{ char *client_hostport; char *server_hostport; grpc_channel *client; @@ -88,81 +103,88 @@ void test_connect(const char *server_host, const char *client_host, int port, grpc_call_details call_details; char *peer; - if (port == 0) { - port = grpc_pick_unused_port_or_die(); - } + if (port == 0) + { + port = grpc_pick_unused_port_or_die (); + } - gpr_join_host_port(&server_hostport, server_host, port); + gpr_join_host_port (&server_hostport, server_host, port); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); /* Create server. */ - cq = grpc_completion_queue_create(NULL); - server = grpc_server_create(NULL, NULL); - grpc_server_register_completion_queue(server, cq, NULL); - GPR_ASSERT((got_port = grpc_server_add_insecure_http2_port( - server, server_hostport)) > 0); - if (port == 0) { - port = got_port; - } else { - GPR_ASSERT(port == got_port); - } - grpc_server_start(server); - cqv = cq_verifier_create(cq); + cq = grpc_completion_queue_create (NULL); + server = grpc_server_create (NULL, NULL); + grpc_server_register_completion_queue (server, cq, NULL); + GPR_ASSERT ((got_port = grpc_server_add_insecure_http2_port (server, server_hostport)) > 0); + if (port == 0) + { + port = got_port; + } + else + { + GPR_ASSERT (port == got_port); + } + grpc_server_start (server); + cqv = cq_verifier_create (cq); /* Create client. */ - if (client_host[0] == 'i') { - /* for ipv4:/ipv6: addresses, concatenate the port to each of the parts */ - size_t i; - gpr_slice uri_slice; - gpr_slice_buffer uri_parts; - char **hosts_with_port; - - uri_slice = - gpr_slice_new((char *)client_host, strlen(client_host), do_nothing); - gpr_slice_buffer_init(&uri_parts); - gpr_slice_split(uri_slice, ",", &uri_parts); - hosts_with_port = gpr_malloc(sizeof(char *) * uri_parts.count); - for (i = 0; i < uri_parts.count; i++) { - char *uri_part_str = gpr_dump_slice(uri_parts.slices[i], GPR_DUMP_ASCII); - gpr_asprintf(&hosts_with_port[i], "%s:%d", uri_part_str, port); - gpr_free(uri_part_str); + if (client_host[0] == 'i') + { + /* for ipv4:/ipv6: addresses, concatenate the port to each of the parts */ + size_t i; + gpr_slice uri_slice; + gpr_slice_buffer uri_parts; + char **hosts_with_port; + + uri_slice = gpr_slice_new ((char *) client_host, strlen (client_host), do_nothing); + gpr_slice_buffer_init (&uri_parts); + gpr_slice_split (uri_slice, ",", &uri_parts); + hosts_with_port = gpr_malloc (sizeof (char *) * uri_parts.count); + for (i = 0; i < uri_parts.count; i++) + { + char *uri_part_str = gpr_dump_slice (uri_parts.slices[i], GPR_DUMP_ASCII); + gpr_asprintf (&hosts_with_port[i], "%s:%d", uri_part_str, port); + gpr_free (uri_part_str); + } + client_hostport = gpr_strjoin_sep ((const char **) hosts_with_port, uri_parts.count, ",", NULL); + for (i = 0; i < uri_parts.count; i++) + { + gpr_free (hosts_with_port[i]); + } + gpr_free (hosts_with_port); + gpr_slice_buffer_destroy (&uri_parts); + gpr_slice_unref (uri_slice); + } + else + { + gpr_join_host_port (&client_hostport, client_host, port); + } + client = grpc_insecure_channel_create (client_hostport, NULL, NULL); + + gpr_log (GPR_INFO, "Testing with server=%s client=%s (expecting %s)", server_hostport, client_hostport, expect_ok ? "success" : "failure"); + + gpr_free (client_hostport); + gpr_free (server_hostport); + + if (expect_ok) + { + /* Normal deadline, shouldn't be reached. */ + deadline = ms_from_now (60000); } - client_hostport = gpr_strjoin_sep((const char **)hosts_with_port, - uri_parts.count, ",", NULL); - for (i = 0; i < uri_parts.count; i++) { - gpr_free(hosts_with_port[i]); + else + { + /* Give up faster when failure is expected. + BUG: Setting this to 1000 reveals a memory leak (b/18608927). */ + deadline = ms_from_now (1500); } - gpr_free(hosts_with_port); - gpr_slice_buffer_destroy(&uri_parts); - gpr_slice_unref(uri_slice); - } else { - gpr_join_host_port(&client_hostport, client_host, port); - } - client = grpc_insecure_channel_create(client_hostport, NULL, NULL); - - gpr_log(GPR_INFO, "Testing with server=%s client=%s (expecting %s)", - server_hostport, client_hostport, expect_ok ? "success" : "failure"); - - gpr_free(client_hostport); - gpr_free(server_hostport); - - if (expect_ok) { - /* Normal deadline, shouldn't be reached. */ - deadline = ms_from_now(60000); - } else { - /* Give up faster when failure is expected. - BUG: Setting this to 1000 reveals a memory leak (b/18608927). */ - deadline = ms_from_now(1500); - } /* Send a trivial request. */ - c = grpc_channel_create_call(client, NULL, GRPC_PROPAGATE_DEFAULTS, cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (client, NULL, GRPC_PROPAGATE_DEFAULTS, cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -187,159 +209,164 @@ void test_connect(const char *server_host, const char *client_host, int port, op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - - if (expect_ok) { - /* Check for a successful request. */ - error = grpc_server_request_call(server, &s, &call_details, - &request_metadata_recv, cq, cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); - - op = ops; - op->op = GRPC_OP_SEND_INITIAL_METADATA; - op->data.send_initial_metadata.count = 0; - op->flags = 0; - op++; - op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; - op->data.send_status_from_server.trailing_metadata_count = 0; - op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED; - op->data.send_status_from_server.status_details = "xyz"; - op->flags = 0; - op++; - op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; - op->data.recv_close_on_server.cancelled = &was_cancelled; - op->flags = 0; - op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); - - peer = grpc_call_get_peer(c); - gpr_log(GPR_DEBUG, "got peer: '%s'", peer); - gpr_free(peer); - - GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); - GPR_ASSERT(was_cancelled == 1); - - grpc_call_destroy(s); - } else { - /* Check for a failed connection. */ - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); - - GPR_ASSERT(status == GRPC_STATUS_DEADLINE_EXCEEDED); - } - - grpc_call_destroy(c); - - cq_verifier_destroy(cqv); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + + if (expect_ok) + { + /* Check for a successful request. */ + error = grpc_server_request_call (server, &s, &call_details, &request_metadata_recv, cq, cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); + + op = ops; + op->op = GRPC_OP_SEND_INITIAL_METADATA; + op->data.send_initial_metadata.count = 0; + op->flags = 0; + op++; + op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; + op->data.send_status_from_server.trailing_metadata_count = 0; + op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED; + op->data.send_status_from_server.status_details = "xyz"; + op->flags = 0; + op++; + op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; + op->data.recv_close_on_server.cancelled = &was_cancelled; + op->flags = 0; + op++; + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); + + peer = grpc_call_get_peer (c); + gpr_log (GPR_DEBUG, "got peer: '%s'", peer); + gpr_free (peer); + + GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); + GPR_ASSERT (was_cancelled == 1); + + grpc_call_destroy (s); + } + else + { + /* Check for a failed connection. */ + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); + + GPR_ASSERT (status == GRPC_STATUS_DEADLINE_EXCEEDED); + } + + grpc_call_destroy (c); + + cq_verifier_destroy (cqv); /* Destroy client. */ - grpc_channel_destroy(client); + grpc_channel_destroy (client); /* Destroy server. */ - grpc_server_shutdown_and_notify(server, cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(server); - grpc_completion_queue_shutdown(cq); - drain_cq(cq); - grpc_completion_queue_destroy(cq); - - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - - grpc_call_details_destroy(&call_details); - gpr_free(details); + grpc_server_shutdown_and_notify (server, cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (server); + grpc_completion_queue_shutdown (cq); + drain_cq (cq); + grpc_completion_queue_destroy (cq); + + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + + grpc_call_details_destroy (&call_details); + gpr_free (details); } -int external_dns_works(const char *host) { - grpc_resolved_addresses *res = grpc_blocking_resolve_address(host, "80"); - if (res != NULL) { - grpc_resolved_addresses_destroy(res); - return 1; - } +int +external_dns_works (const char *host) +{ + grpc_resolved_addresses *res = grpc_blocking_resolve_address (host, "80"); + if (res != NULL) + { + grpc_resolved_addresses_destroy (res); + return 1; + } return 0; } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ int do_ipv6 = 1; - grpc_test_init(argc, argv); - grpc_init(); + grpc_test_init (argc, argv); + grpc_init (); - if (!grpc_ipv6_loopback_available()) { - gpr_log(GPR_INFO, "Can't bind to ::1. Skipping IPv6 tests."); - do_ipv6 = 0; - } - - /* For coverage, test with and without dualstack sockets. */ - for (grpc_forbid_dualstack_sockets_for_testing = 0; - grpc_forbid_dualstack_sockets_for_testing <= 1; - grpc_forbid_dualstack_sockets_for_testing++) { - /* :: and 0.0.0.0 are handled identically. */ - test_connect("::", "127.0.0.1", 0, 1); - test_connect("::", "::ffff:127.0.0.1", 0, 1); - test_connect("::", "ipv4:127.0.0.1", 0, 1); - test_connect("::", "ipv6:[::ffff:127.0.0.1]", 0, 1); - test_connect("::", "localhost", 0, 1); - test_connect("0.0.0.0", "127.0.0.1", 0, 1); - test_connect("0.0.0.0", "::ffff:127.0.0.1", 0, 1); - test_connect("0.0.0.0", "ipv4:127.0.0.1", 0, 1); - test_connect("0.0.0.0", "ipv4:127.0.0.1,127.0.0.2,127.0.0.3", 0, 1); - test_connect("0.0.0.0", "ipv6:[::ffff:127.0.0.1],[::ffff:127.0.0.2]", 0, 1); - test_connect("0.0.0.0", "localhost", 0, 1); - if (do_ipv6) { - test_connect("::", "::1", 0, 1); - test_connect("0.0.0.0", "::1", 0, 1); - test_connect("::", "ipv6:[::1]", 0, 1); - test_connect("0.0.0.0", "ipv6:[::1]", 0, 1); + if (!grpc_ipv6_loopback_available ()) + { + gpr_log (GPR_INFO, "Can't bind to ::1. Skipping IPv6 tests."); + do_ipv6 = 0; } - /* These only work when the families agree. */ - test_connect("127.0.0.1", "127.0.0.1", 0, 1); - test_connect("127.0.0.1", "ipv4:127.0.0.1", 0, 1); - if (do_ipv6) { - test_connect("::1", "::1", 0, 1); - test_connect("::1", "127.0.0.1", 0, 0); - test_connect("127.0.0.1", "::1", 0, 0); - test_connect("::1", "ipv6:[::1]", 0, 1); - test_connect("::1", "ipv4:127.0.0.1", 0, 0); - test_connect("127.0.0.1", "ipv6:[::1]", 0, 0); - } - - if (!external_dns_works("loopback46.unittest.grpc.io")) { - gpr_log(GPR_INFO, "Skipping tests that depend on *.unittest.grpc.io."); - } else { - test_connect("loopback46.unittest.grpc.io", "loopback4.unittest.grpc.io", - 0, 1); - test_connect("loopback4.unittest.grpc.io", "loopback46.unittest.grpc.io", - 0, 1); - if (do_ipv6) { - test_connect("loopback46.unittest.grpc.io", - "loopback6.unittest.grpc.io", 0, 1); - test_connect("loopback6.unittest.grpc.io", - "loopback46.unittest.grpc.io", 0, 1); - test_connect("loopback4.unittest.grpc.io", "loopback6.unittest.grpc.io", - 0, 0); - test_connect("loopback6.unittest.grpc.io", "loopback4.unittest.grpc.io", - 0, 0); - } + /* For coverage, test with and without dualstack sockets. */ + for (grpc_forbid_dualstack_sockets_for_testing = 0; grpc_forbid_dualstack_sockets_for_testing <= 1; grpc_forbid_dualstack_sockets_for_testing++) + { + /* :: and 0.0.0.0 are handled identically. */ + test_connect ("::", "127.0.0.1", 0, 1); + test_connect ("::", "::ffff:127.0.0.1", 0, 1); + test_connect ("::", "ipv4:127.0.0.1", 0, 1); + test_connect ("::", "ipv6:[::ffff:127.0.0.1]", 0, 1); + test_connect ("::", "localhost", 0, 1); + test_connect ("0.0.0.0", "127.0.0.1", 0, 1); + test_connect ("0.0.0.0", "::ffff:127.0.0.1", 0, 1); + test_connect ("0.0.0.0", "ipv4:127.0.0.1", 0, 1); + test_connect ("0.0.0.0", "ipv4:127.0.0.1,127.0.0.2,127.0.0.3", 0, 1); + test_connect ("0.0.0.0", "ipv6:[::ffff:127.0.0.1],[::ffff:127.0.0.2]", 0, 1); + test_connect ("0.0.0.0", "localhost", 0, 1); + if (do_ipv6) + { + test_connect ("::", "::1", 0, 1); + test_connect ("0.0.0.0", "::1", 0, 1); + test_connect ("::", "ipv6:[::1]", 0, 1); + test_connect ("0.0.0.0", "ipv6:[::1]", 0, 1); + } + + /* These only work when the families agree. */ + test_connect ("127.0.0.1", "127.0.0.1", 0, 1); + test_connect ("127.0.0.1", "ipv4:127.0.0.1", 0, 1); + if (do_ipv6) + { + test_connect ("::1", "::1", 0, 1); + test_connect ("::1", "127.0.0.1", 0, 0); + test_connect ("127.0.0.1", "::1", 0, 0); + test_connect ("::1", "ipv6:[::1]", 0, 1); + test_connect ("::1", "ipv4:127.0.0.1", 0, 0); + test_connect ("127.0.0.1", "ipv6:[::1]", 0, 0); + } + + if (!external_dns_works ("loopback46.unittest.grpc.io")) + { + gpr_log (GPR_INFO, "Skipping tests that depend on *.unittest.grpc.io."); + } + else + { + test_connect ("loopback46.unittest.grpc.io", "loopback4.unittest.grpc.io", 0, 1); + test_connect ("loopback4.unittest.grpc.io", "loopback46.unittest.grpc.io", 0, 1); + if (do_ipv6) + { + test_connect ("loopback46.unittest.grpc.io", "loopback6.unittest.grpc.io", 0, 1); + test_connect ("loopback6.unittest.grpc.io", "loopback46.unittest.grpc.io", 0, 1); + test_connect ("loopback4.unittest.grpc.io", "loopback6.unittest.grpc.io", 0, 0); + test_connect ("loopback6.unittest.grpc.io", "loopback4.unittest.grpc.io", 0, 0); + } + } } - } - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h index 3f1665613c6..4f653ec8685 100644 --- a/test/core/end2end/end2end_tests.h +++ b/test/core/end2end/end2end_tests.h @@ -45,25 +45,24 @@ typedef struct grpc_end2end_test_config grpc_end2end_test_config; #define FAIL_AUTH_CHECK_SERVER_ARG_NAME "fail_auth_check" -struct grpc_end2end_test_fixture { +struct grpc_end2end_test_fixture +{ grpc_completion_queue *cq; grpc_server *server; grpc_channel *client; void *fixture_data; }; -struct grpc_end2end_test_config { +struct grpc_end2end_test_config +{ const char *name; gpr_uint32 feature_mask; - grpc_end2end_test_fixture (*create_fixture)(grpc_channel_args *client_args, - grpc_channel_args *server_args); - void (*init_client)(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args); - void (*init_server)(grpc_end2end_test_fixture *f, - grpc_channel_args *server_args); - void (*tear_down_data)(grpc_end2end_test_fixture *f); + grpc_end2end_test_fixture (*create_fixture) (grpc_channel_args * client_args, grpc_channel_args * server_args); + void (*init_client) (grpc_end2end_test_fixture * f, grpc_channel_args * client_args); + void (*init_server) (grpc_end2end_test_fixture * f, grpc_channel_args * server_args); + void (*tear_down_data) (grpc_end2end_test_fixture * f); }; -void grpc_end2end_tests(grpc_end2end_test_config config); +void grpc_end2end_tests (grpc_end2end_test_config config); #endif /* GRPC_TEST_CORE_END2END_END2END_TESTS_H */ diff --git a/test/core/end2end/fixtures/h2_compress.c b/test/core/end2end/fixtures/h2_compress.c index 6e7a1faf55a..7117777bfaa 100644 --- a/test/core/end2end/fixtures/h2_compress.c +++ b/test/core/end2end/fixtures/h2_compress.c @@ -51,86 +51,94 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -typedef struct fullstack_compression_fixture_data { +typedef struct fullstack_compression_fixture_data +{ char *localaddr; grpc_channel_args *client_args_compression; grpc_channel_args *server_args_compression; } fullstack_compression_fixture_data; -static grpc_end2end_test_fixture chttp2_create_fixture_fullstack_compression( - grpc_channel_args *client_args, grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +chttp2_create_fixture_fullstack_compression (grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - int port = grpc_pick_unused_port_or_die(); - fullstack_compression_fixture_data *ffd = - gpr_malloc(sizeof(fullstack_compression_fixture_data)); - memset(ffd, 0, sizeof(fullstack_compression_fixture_data)); + int port = grpc_pick_unused_port_or_die (); + fullstack_compression_fixture_data *ffd = gpr_malloc (sizeof (fullstack_compression_fixture_data)); + memset (ffd, 0, sizeof (fullstack_compression_fixture_data)); - gpr_join_host_port(&ffd->localaddr, "localhost", port); + gpr_join_host_port (&ffd->localaddr, "localhost", port); - memset(&f, 0, sizeof(f)); + memset (&f, 0, sizeof (f)); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create(NULL); + f.cq = grpc_completion_queue_create (NULL); return f; } -void chttp2_init_client_fullstack_compression(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args) { +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_channel_args_destroy(ffd->client_args_compression); - } - ffd->client_args_compression = grpc_channel_args_set_compression_algorithm( - client_args, GRPC_COMPRESS_GZIP); - f->client = grpc_insecure_channel_create(ffd->localaddr, - ffd->client_args_compression, NULL); + if (ffd->client_args_compression != NULL) + { + grpc_channel_args_destroy (ffd->client_args_compression); + } + ffd->client_args_compression = grpc_channel_args_set_compression_algorithm (client_args, GRPC_COMPRESS_GZIP); + f->client = grpc_insecure_channel_create (ffd->localaddr, ffd->client_args_compression, NULL); } -void chttp2_init_server_fullstack_compression(grpc_end2end_test_fixture *f, - grpc_channel_args *server_args) { +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_channel_args_destroy(ffd->server_args_compression); - } - ffd->server_args_compression = grpc_channel_args_set_compression_algorithm( - server_args, GRPC_COMPRESS_GZIP); - if (f->server) { - grpc_server_destroy(f->server); - } - f->server = grpc_server_create(ffd->server_args_compression, NULL); - 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); + if (ffd->server_args_compression != NULL) + { + grpc_channel_args_destroy (ffd->server_args_compression); + } + ffd->server_args_compression = grpc_channel_args_set_compression_algorithm (server_args, GRPC_COMPRESS_GZIP); + if (f->server) + { + grpc_server_destroy (f->server); + } + f->server = grpc_server_create (ffd->server_args_compression, NULL); + 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); } -void chttp2_tear_down_fullstack_compression(grpc_end2end_test_fixture *f) { +void +chttp2_tear_down_fullstack_compression (grpc_end2end_test_fixture * f) +{ fullstack_compression_fixture_data *ffd = f->fixture_data; - grpc_channel_args_destroy(ffd->client_args_compression); - grpc_channel_args_destroy(ffd->server_args_compression); - gpr_free(ffd->localaddr); - gpr_free(ffd); + grpc_channel_args_destroy (ffd->client_args_compression); + grpc_channel_args_destroy (ffd->server_args_compression); + gpr_free (ffd->localaddr); + gpr_free (ffd); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/fullstack_compression", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, - chttp2_create_fixture_fullstack_compression, - chttp2_init_client_fullstack_compression, - chttp2_init_server_fullstack_compression, - chttp2_tear_down_fullstack_compression}, + {"chttp2/fullstack_compression", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, + chttp2_create_fixture_fullstack_compression, + chttp2_init_client_fullstack_compression, + chttp2_init_server_fullstack_compression, + chttp2_tear_down_fullstack_compression}, }; -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; - grpc_test_init(argc, argv); - grpc_init(); + grpc_test_init (argc, argv); + grpc_init (); - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(configs[i]); - } + for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) + { + grpc_end2end_tests (configs[i]); + } - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/end2end/fixtures/h2_fakesec.c b/test/core/end2end/fixtures/h2_fakesec.c index 3e64cc08e88..c663f40ede8 100644 --- a/test/core/end2end/fixtures/h2_fakesec.c +++ b/test/core/end2end/fixtures/h2_fakesec.c @@ -45,119 +45,126 @@ #include "test/core/util/port.h" #include "test/core/end2end/data/ssl_test_data.h" -typedef struct fullstack_secure_fixture_data { +typedef struct fullstack_secure_fixture_data +{ char *localaddr; } fullstack_secure_fixture_data; -static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( - grpc_channel_args *client_args, grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - int port = grpc_pick_unused_port_or_die(); - fullstack_secure_fixture_data *ffd = - gpr_malloc(sizeof(fullstack_secure_fixture_data)); + int port = grpc_pick_unused_port_or_die (); + fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data)); - memset(&f, 0, sizeof(f)); - gpr_join_host_port(&ffd->localaddr, "localhost", port); + memset (&f, 0, sizeof (f)); + gpr_join_host_port (&ffd->localaddr, "localhost", port); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create(NULL); + f.cq = grpc_completion_queue_create (NULL); return f; } -static void process_auth_failure(void *state, grpc_auth_context *ctx, - const grpc_metadata *md, size_t md_count, - grpc_process_auth_metadata_done_cb cb, - void *user_data) { - GPR_ASSERT(state == NULL); - cb(user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); +static void +process_auth_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data) +{ + GPR_ASSERT (state == NULL); + cb (user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); } -static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args, - grpc_credentials *creds) { +static void +chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - f->client = - grpc_secure_channel_create(creds, ffd->localaddr, client_args, NULL); - GPR_ASSERT(f->client != NULL); - grpc_credentials_release(creds); + f->client = grpc_secure_channel_create (creds, ffd->localaddr, client_args, NULL); + GPR_ASSERT (f->client != NULL); + grpc_credentials_release (creds); } -static void chttp2_init_server_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *server_args, - grpc_server_credentials *server_creds) { +static void +chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - if (f->server) { - grpc_server_destroy(f->server); - } - f->server = grpc_server_create(server_args, NULL); - grpc_server_register_completion_queue(f->server, f->cq, NULL); - GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr, - server_creds)); - grpc_server_credentials_release(server_creds); - grpc_server_start(f->server); + if (f->server) + { + grpc_server_destroy (f->server); + } + f->server = grpc_server_create (server_args, NULL); + grpc_server_register_completion_queue (f->server, f->cq, NULL); + GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, ffd->localaddr, server_creds)); + grpc_server_credentials_release (server_creds); + grpc_server_start (f->server); } -void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { +void +chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - gpr_free(ffd->localaddr); - gpr_free(ffd); + gpr_free (ffd->localaddr); + gpr_free (ffd); } -static void chttp2_init_client_fake_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_credentials *fake_ts_creds = - grpc_fake_transport_security_credentials_create(); - chttp2_init_client_secure_fullstack(f, client_args, fake_ts_creds); +static void +chttp2_init_client_fake_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) +{ + grpc_credentials *fake_ts_creds = grpc_fake_transport_security_credentials_create (); + chttp2_init_client_secure_fullstack (f, client_args, fake_ts_creds); } -static int fail_server_auth_check(grpc_channel_args *server_args) { +static int +fail_server_auth_check (grpc_channel_args * server_args) +{ size_t i; - if (server_args == NULL) return 0; - for (i = 0; i < server_args->num_args; i++) { - if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == - 0) { - return 1; + if (server_args == NULL) + return 0; + for (i = 0; i < server_args->num_args; i++) + { + if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0) + { + return 1; + } } - } return 0; } -static void chttp2_init_server_fake_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_server_credentials *fake_ts_creds = - grpc_fake_transport_security_server_credentials_create(); - if (fail_server_auth_check(server_args)) { - grpc_auth_metadata_processor processor = {process_auth_failure, NULL, NULL}; - grpc_server_credentials_set_auth_metadata_processor(fake_ts_creds, - processor); - } - chttp2_init_server_secure_fullstack(f, server_args, fake_ts_creds); +static void +chttp2_init_server_fake_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) +{ + grpc_server_credentials *fake_ts_creds = grpc_fake_transport_security_server_credentials_create (); + if (fail_server_auth_check (server_args)) + { + grpc_auth_metadata_processor processor = { process_auth_failure, NULL, NULL }; + grpc_server_credentials_set_auth_metadata_processor (fake_ts_creds, processor); + } + chttp2_init_server_secure_fullstack (f, server_args, fake_ts_creds); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/fake_secure_fullstack", - FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | - FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, - chttp2_create_fixture_secure_fullstack, - chttp2_init_client_fake_secure_fullstack, - chttp2_init_server_fake_secure_fullstack, - chttp2_tear_down_secure_fullstack}, + {"chttp2/fake_secure_fullstack", + FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, + chttp2_create_fixture_secure_fullstack, + chttp2_init_client_fake_secure_fullstack, + chttp2_init_server_fake_secure_fullstack, + chttp2_tear_down_secure_fullstack}, }; -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; - grpc_test_init(argc, argv); + grpc_test_init (argc, argv); - grpc_init(); + grpc_init (); - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(configs[i]); - } + for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) + { + grpc_end2end_tests (configs[i]); + } - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/end2end/fixtures/h2_full+poll.c b/test/core/end2end/fixtures/h2_full+poll.c index 48feefc9312..92f49c0bc68 100644 --- a/test/core/end2end/fixtures/h2_full+poll.c +++ b/test/core/end2end/fixtures/h2_full+poll.c @@ -50,69 +50,79 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -typedef struct fullstack_fixture_data { +typedef struct fullstack_fixture_data +{ char *localaddr; } fullstack_fixture_data; -static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( - grpc_channel_args *client_args, grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - int port = grpc_pick_unused_port_or_die(); - fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data)); - memset(&f, 0, sizeof(f)); + int port = grpc_pick_unused_port_or_die (); + fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data)); + memset (&f, 0, sizeof (f)); - gpr_join_host_port(&ffd->localaddr, "localhost", port); + gpr_join_host_port (&ffd->localaddr, "localhost", port); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create(NULL); + f.cq = grpc_completion_queue_create (NULL); return f; } -void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args) { +void +chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) +{ fullstack_fixture_data *ffd = f->fixture_data; - f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL); + f->client = grpc_insecure_channel_create (ffd->localaddr, client_args, NULL); } -void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *server_args) { +void +chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) +{ fullstack_fixture_data *ffd = f->fixture_data; - if (f->server) { - grpc_server_destroy(f->server); - } - f->server = grpc_server_create(server_args, NULL); - 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); + if (f->server) + { + grpc_server_destroy (f->server); + } + f->server = grpc_server_create (server_args, NULL); + 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); } -void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) { +void +chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f) +{ fullstack_fixture_data *ffd = f->fixture_data; - gpr_free(ffd->localaddr); - gpr_free(ffd); + gpr_free (ffd->localaddr); + gpr_free (ffd); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, - chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, - chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, + {"chttp2/fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, + chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, + chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, }; -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; grpc_platform_become_multipoller = grpc_poll_become_multipoller; - grpc_test_init(argc, argv); - grpc_init(); + grpc_test_init (argc, argv); + grpc_init (); - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(configs[i]); - } + for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) + { + grpc_end2end_tests (configs[i]); + } - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/end2end/fixtures/h2_full.c b/test/core/end2end/fixtures/h2_full.c index 0170dcf0e5a..16e93595007 100644 --- a/test/core/end2end/fixtures/h2_full.c +++ b/test/core/end2end/fixtures/h2_full.c @@ -50,68 +50,78 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -typedef struct fullstack_fixture_data { +typedef struct fullstack_fixture_data +{ char *localaddr; } fullstack_fixture_data; -static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( - grpc_channel_args *client_args, grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - int port = grpc_pick_unused_port_or_die(); - fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data)); - memset(&f, 0, sizeof(f)); + int port = grpc_pick_unused_port_or_die (); + fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data)); + memset (&f, 0, sizeof (f)); - gpr_join_host_port(&ffd->localaddr, "localhost", port); + gpr_join_host_port (&ffd->localaddr, "localhost", port); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create(NULL); + f.cq = grpc_completion_queue_create (NULL); return f; } -void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args) { +void +chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) +{ fullstack_fixture_data *ffd = f->fixture_data; - f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL); - GPR_ASSERT(f->client); + f->client = grpc_insecure_channel_create (ffd->localaddr, client_args, NULL); + GPR_ASSERT (f->client); } -void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *server_args) { +void +chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) +{ fullstack_fixture_data *ffd = f->fixture_data; - if (f->server) { - grpc_server_destroy(f->server); - } - f->server = grpc_server_create(server_args, NULL); - 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); + if (f->server) + { + grpc_server_destroy (f->server); + } + f->server = grpc_server_create (server_args, NULL); + 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); } -void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) { +void +chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f) +{ fullstack_fixture_data *ffd = f->fixture_data; - gpr_free(ffd->localaddr); - gpr_free(ffd); + gpr_free (ffd->localaddr); + gpr_free (ffd); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, - chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, - chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, + {"chttp2/fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, + chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, + chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, }; -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; - grpc_test_init(argc, argv); - grpc_init(); + grpc_test_init (argc, argv); + grpc_init (); - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(configs[i]); - } + for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) + { + grpc_end2end_tests (configs[i]); + } - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/end2end/fixtures/h2_oauth2.c b/test/core/end2end/fixtures/h2_oauth2.c index b4b2e026844..a328eb1ed5b 100644 --- a/test/core/end2end/fixtures/h2_oauth2.c +++ b/test/core/end2end/fixtures/h2_oauth2.c @@ -50,191 +50,201 @@ static const char oauth2_md[] = "Bearer aaslkfjs424535asdf"; static const char *client_identity_property_name = "smurf_name"; static const char *client_identity = "Brainy Smurf"; -typedef struct fullstack_secure_fixture_data { +typedef struct fullstack_secure_fixture_data +{ char *localaddr; } fullstack_secure_fixture_data; -static const grpc_metadata *find_metadata(const grpc_metadata *md, - size_t md_count, const char *key, - const char *value) { +static const grpc_metadata * +find_metadata (const grpc_metadata * md, size_t md_count, const char *key, const char *value) +{ size_t i; - for (i = 0; i < md_count; i++) { - if (strcmp(key, md[i].key) == 0 && strlen(value) == md[i].value_length && - memcmp(md[i].value, value, md[i].value_length) == 0) { - return &md[i]; + for (i = 0; i < md_count; i++) + { + if (strcmp (key, md[i].key) == 0 && strlen (value) == md[i].value_length && memcmp (md[i].value, value, md[i].value_length) == 0) + { + return &md[i]; + } } - } return NULL; } -typedef struct { size_t pseudo_refcount; } test_processor_state; +typedef struct +{ + size_t pseudo_refcount; +} test_processor_state; -static void process_oauth2_success(void *state, grpc_auth_context *ctx, - const grpc_metadata *md, size_t md_count, - grpc_process_auth_metadata_done_cb cb, - void *user_data) { - const grpc_metadata *oauth2 = - find_metadata(md, md_count, "Authorization", oauth2_md); +static void +process_oauth2_success (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data) +{ + const grpc_metadata *oauth2 = find_metadata (md, md_count, "Authorization", oauth2_md); test_processor_state *s; - GPR_ASSERT(state != NULL); - s = (test_processor_state *)state; - GPR_ASSERT(s->pseudo_refcount == 1); - GPR_ASSERT(oauth2 != NULL); - grpc_auth_context_add_cstring_property(ctx, client_identity_property_name, - client_identity); - GPR_ASSERT(grpc_auth_context_set_peer_identity_property_name( - ctx, client_identity_property_name) == 1); - cb(user_data, oauth2, 1, NULL, 0, GRPC_STATUS_OK, NULL); + GPR_ASSERT (state != NULL); + s = (test_processor_state *) state; + GPR_ASSERT (s->pseudo_refcount == 1); + GPR_ASSERT (oauth2 != NULL); + grpc_auth_context_add_cstring_property (ctx, client_identity_property_name, client_identity); + GPR_ASSERT (grpc_auth_context_set_peer_identity_property_name (ctx, client_identity_property_name) == 1); + cb (user_data, oauth2, 1, NULL, 0, GRPC_STATUS_OK, NULL); } -static void process_oauth2_failure(void *state, grpc_auth_context *ctx, - const grpc_metadata *md, size_t md_count, - grpc_process_auth_metadata_done_cb cb, - void *user_data) { - const grpc_metadata *oauth2 = - find_metadata(md, md_count, "Authorization", oauth2_md); +static void +process_oauth2_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data) +{ + const grpc_metadata *oauth2 = find_metadata (md, md_count, "Authorization", oauth2_md); test_processor_state *s; - GPR_ASSERT(state != NULL); - s = (test_processor_state *)state; - GPR_ASSERT(s->pseudo_refcount == 1); - GPR_ASSERT(oauth2 != NULL); - cb(user_data, oauth2, 1, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); + GPR_ASSERT (state != NULL); + s = (test_processor_state *) state; + GPR_ASSERT (s->pseudo_refcount == 1); + GPR_ASSERT (oauth2 != NULL); + cb (user_data, oauth2, 1, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); } -static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( - grpc_channel_args *client_args, grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - int port = grpc_pick_unused_port_or_die(); - fullstack_secure_fixture_data *ffd = - gpr_malloc(sizeof(fullstack_secure_fixture_data)); - memset(&f, 0, sizeof(f)); + int port = grpc_pick_unused_port_or_die (); + fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data)); + memset (&f, 0, sizeof (f)); - gpr_join_host_port(&ffd->localaddr, "localhost", port); + gpr_join_host_port (&ffd->localaddr, "localhost", port); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create(NULL); + f.cq = grpc_completion_queue_create (NULL); return f; } -static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args, - grpc_credentials *creds) { +static void +chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - f->client = - grpc_secure_channel_create(creds, ffd->localaddr, client_args, NULL); - GPR_ASSERT(f->client != NULL); - grpc_credentials_release(creds); + f->client = grpc_secure_channel_create (creds, ffd->localaddr, client_args, NULL); + GPR_ASSERT (f->client != NULL); + grpc_credentials_release (creds); } -static void chttp2_init_server_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *server_args, - grpc_server_credentials *server_creds) { +static void +chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - if (f->server) { - grpc_server_destroy(f->server); - } - f->server = grpc_server_create(server_args, NULL); - grpc_server_register_completion_queue(f->server, f->cq, NULL); - GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr, - server_creds)); - grpc_server_credentials_release(server_creds); - grpc_server_start(f->server); + if (f->server) + { + grpc_server_destroy (f->server); + } + f->server = grpc_server_create (server_args, NULL); + grpc_server_register_completion_queue (f->server, f->cq, NULL); + GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, ffd->localaddr, server_creds)); + grpc_server_credentials_release (server_creds); + grpc_server_start (f->server); } -void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { +void +chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - gpr_free(ffd->localaddr); - gpr_free(ffd); + gpr_free (ffd->localaddr); + gpr_free (ffd); } -static void chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_credentials *ssl_creds = - grpc_ssl_credentials_create(test_root_cert, NULL, NULL); - grpc_credentials *oauth2_creds = - grpc_md_only_test_credentials_create("Authorization", oauth2_md, 1); - grpc_credentials *ssl_oauth2_creds = - grpc_composite_credentials_create(ssl_creds, oauth2_creds, NULL); - grpc_arg ssl_name_override = {GRPC_ARG_STRING, - GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, - {"foo.test.google.fr"}}; - 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_credentials_release(ssl_creds); - grpc_credentials_release(oauth2_creds); +static void +chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) +{ + grpc_credentials *ssl_creds = grpc_ssl_credentials_create (test_root_cert, NULL, NULL); + grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create ("Authorization", oauth2_md, 1); + grpc_credentials *ssl_oauth2_creds = grpc_composite_credentials_create (ssl_creds, oauth2_creds, NULL); + grpc_arg ssl_name_override = { GRPC_ARG_STRING, + GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, + {"foo.test.google.fr"} + }; + 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_credentials_release (ssl_creds); + grpc_credentials_release (oauth2_creds); } -static int fail_server_auth_check(grpc_channel_args *server_args) { +static int +fail_server_auth_check (grpc_channel_args * server_args) +{ size_t i; - if (server_args == NULL) return 0; - for (i = 0; i < server_args->num_args; i++) { - if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == - 0) { - return 1; + if (server_args == NULL) + return 0; + for (i = 0; i < server_args->num_args; i++) + { + if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0) + { + return 1; + } } - } return 0; } -static void processor_destroy(void *state) { - test_processor_state *s = (test_processor_state *)state; - GPR_ASSERT((s->pseudo_refcount--) == 1); - gpr_free(s); +static void +processor_destroy (void *state) +{ + test_processor_state *s = (test_processor_state *) state; + GPR_ASSERT ((s->pseudo_refcount--) == 1); + gpr_free (s); } -static grpc_auth_metadata_processor test_processor_create(int failing) { - test_processor_state *s = gpr_malloc(sizeof(*s)); +static grpc_auth_metadata_processor +test_processor_create (int failing) +{ + test_processor_state *s = gpr_malloc (sizeof (*s)); grpc_auth_metadata_processor result; s->pseudo_refcount = 1; result.state = s; result.destroy = processor_destroy; - if (failing) { - result.process = process_oauth2_failure; - } else { - result.process = process_oauth2_success; - } + if (failing) + { + result.process = process_oauth2_failure; + } + else + { + result.process = process_oauth2_success; + } return result; } -static void chttp2_init_server_simple_ssl_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_ssl_pem_key_cert_pair pem_key_cert_pair = {test_server1_key, - test_server1_cert}; - grpc_server_credentials *ssl_creds = - grpc_ssl_server_credentials_create(NULL, &pem_key_cert_pair, 1, 0, NULL); - grpc_server_credentials_set_auth_metadata_processor( - ssl_creds, test_processor_create(fail_server_auth_check(server_args))); - chttp2_init_server_secure_fullstack(f, server_args, ssl_creds); +static void +chttp2_init_server_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) +{ + grpc_ssl_pem_key_cert_pair pem_key_cert_pair = { test_server1_key, + test_server1_cert + }; + grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_key_cert_pair, 1, 0, NULL); + grpc_server_credentials_set_auth_metadata_processor (ssl_creds, test_processor_create (fail_server_auth_check (server_args))); + chttp2_init_server_secure_fullstack (f, server_args, ssl_creds); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/simple_ssl_with_oauth2_fullstack", - FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | - FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | - FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, - chttp2_create_fixture_secure_fullstack, - chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack, - chttp2_init_server_simple_ssl_secure_fullstack, - chttp2_tear_down_secure_fullstack}, + {"chttp2/simple_ssl_with_oauth2_fullstack", + FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, + chttp2_create_fixture_secure_fullstack, + chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack, + chttp2_init_server_simple_ssl_secure_fullstack, + chttp2_tear_down_secure_fullstack}, }; -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; - grpc_test_init(argc, argv); + grpc_test_init (argc, argv); - grpc_init(); + grpc_init (); - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(configs[i]); - } + for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) + { + grpc_end2end_tests (configs[i]); + } - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/end2end/fixtures/h2_proxy.c b/test/core/end2end/fixtures/h2_proxy.c index 44083e26762..479db966cac 100644 --- a/test/core/end2end/fixtures/h2_proxy.c +++ b/test/core/end2end/fixtures/h2_proxy.c @@ -51,82 +51,95 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -typedef struct fullstack_fixture_data { +typedef struct fullstack_fixture_data +{ grpc_end2end_proxy *proxy; } fullstack_fixture_data; -static grpc_server *create_proxy_server(const char *port) { - grpc_server *s = grpc_server_create(NULL, NULL); - GPR_ASSERT(grpc_server_add_insecure_http2_port(s, port)); +static grpc_server * +create_proxy_server (const char *port) +{ + grpc_server *s = grpc_server_create (NULL, NULL); + GPR_ASSERT (grpc_server_add_insecure_http2_port (s, port)); return s; } -static grpc_channel *create_proxy_client(const char *target) { - return grpc_insecure_channel_create(target, NULL, NULL); +static grpc_channel * +create_proxy_client (const char *target) +{ + return grpc_insecure_channel_create (target, NULL, NULL); } -static const grpc_end2end_proxy_def proxy_def = {create_proxy_server, - create_proxy_client}; +static const grpc_end2end_proxy_def proxy_def = { create_proxy_server, + create_proxy_client +}; -static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( - grpc_channel_args *client_args, grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data)); - memset(&f, 0, sizeof(f)); + fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data)); + memset (&f, 0, sizeof (f)); - ffd->proxy = grpc_end2end_proxy_create(&proxy_def); + ffd->proxy = grpc_end2end_proxy_create (&proxy_def); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create(NULL); + f.cq = grpc_completion_queue_create (NULL); return f; } -void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args) { +void +chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) +{ fullstack_fixture_data *ffd = f->fixture_data; - f->client = grpc_insecure_channel_create( - grpc_end2end_proxy_get_client_target(ffd->proxy), client_args, NULL); - GPR_ASSERT(f->client); + f->client = grpc_insecure_channel_create (grpc_end2end_proxy_get_client_target (ffd->proxy), client_args, NULL); + GPR_ASSERT (f->client); } -void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *server_args) { +void +chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) +{ fullstack_fixture_data *ffd = f->fixture_data; - if (f->server) { - grpc_server_destroy(f->server); - } - f->server = grpc_server_create(server_args, NULL); - grpc_server_register_completion_queue(f->server, f->cq, NULL); - GPR_ASSERT(grpc_server_add_insecure_http2_port( - f->server, grpc_end2end_proxy_get_server_port(ffd->proxy))); - grpc_server_start(f->server); + if (f->server) + { + grpc_server_destroy (f->server); + } + f->server = grpc_server_create (server_args, NULL); + grpc_server_register_completion_queue (f->server, f->cq, NULL); + GPR_ASSERT (grpc_server_add_insecure_http2_port (f->server, grpc_end2end_proxy_get_server_port (ffd->proxy))); + grpc_server_start (f->server); } -void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) { +void +chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f) +{ fullstack_fixture_data *ffd = f->fixture_data; - grpc_end2end_proxy_destroy(ffd->proxy); - gpr_free(ffd); + grpc_end2end_proxy_destroy (ffd->proxy); + gpr_free (ffd); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/fullstack+proxy", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, - chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, - chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, + {"chttp2/fullstack+proxy", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, + chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, + chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, }; -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; - grpc_test_init(argc, argv); - grpc_init(); + grpc_test_init (argc, argv); + grpc_init (); - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(configs[i]); - } + for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) + { + grpc_end2end_tests (configs[i]); + } - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index b79c483703e..85fa111ad47 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -57,127 +57,133 @@ /* chttp2 transport that is immediately available (used for testing connected_channel without a client_channel */ -static void server_setup_transport(void *ts, grpc_transport *transport, - grpc_mdctx *mdctx) { +static void +server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx) +{ grpc_end2end_test_fixture *f = ts; static grpc_channel_filter const *extra_filters[] = { - &grpc_http_server_filter}; + &grpc_http_server_filter + }; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_server_setup_transport( - f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - grpc_server_get_channel_args(f->server), &closure_list); - grpc_closure_list_run(&closure_list); + grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); + grpc_closure_list_run (&closure_list); } -typedef struct { +typedef struct +{ grpc_end2end_test_fixture *f; grpc_channel_args *client_args; } sp_client_setup; -static void client_setup_transport(void *ts, grpc_transport *transport, - grpc_mdctx *mdctx, - grpc_closure_list *closure_list) { +static void +client_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx, grpc_closure_list * closure_list) +{ sp_client_setup *cs = ts; - const grpc_channel_filter *filters[] = {&grpc_http_client_filter, - &grpc_compress_filter, - &grpc_connected_channel_filter}; - size_t nfilters = sizeof(filters) / sizeof(*filters); - grpc_channel *channel = - grpc_channel_create_from_filters("socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1, closure_list); + const grpc_channel_filter *filters[] = { &grpc_http_client_filter, + &grpc_compress_filter, + &grpc_connected_channel_filter + }; + size_t nfilters = sizeof (filters) / sizeof (*filters); + grpc_channel *channel = grpc_channel_create_from_filters ("socketpair-target", filters, nfilters, + cs->client_args, mdctx, 1, closure_list); cs->f->client = channel; - grpc_connected_channel_bind_transport(grpc_channel_get_channel_stack(channel), - transport); + grpc_connected_channel_bind_transport (grpc_channel_get_channel_stack (channel), transport); } -static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( - grpc_channel_args *client_args, grpc_channel_args *server_args) { - grpc_endpoint_pair *sfd = gpr_malloc(sizeof(grpc_endpoint_pair)); +static grpc_end2end_test_fixture +chttp2_create_fixture_socketpair (grpc_channel_args * client_args, grpc_channel_args * server_args) +{ + grpc_endpoint_pair *sfd = gpr_malloc (sizeof (grpc_endpoint_pair)); grpc_end2end_test_fixture f; - memset(&f, 0, sizeof(f)); + memset (&f, 0, sizeof (f)); f.fixture_data = sfd; - f.cq = grpc_completion_queue_create(NULL); + f.cq = grpc_completion_queue_create (NULL); - *sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536); + *sfd = grpc_iomgr_create_endpoint_pair ("fixture", 65536); return f; } -static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args) { +static void +chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; - grpc_mdctx *mdctx = grpc_mdctx_create(); + grpc_mdctx *mdctx = grpc_mdctx_create (); sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1, - &closure_list); - client_setup_transport(&cs, transport, mdctx, &closure_list); - GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); - grpc_closure_list_run(&closure_list); + transport = grpc_create_chttp2_transport (client_args, sfd->client, mdctx, 1, &closure_list); + client_setup_transport (&cs, transport, mdctx, &closure_list); + GPR_ASSERT (f->client); + grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); + grpc_closure_list_run (&closure_list); } -static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, - grpc_channel_args *server_args) { +static void +chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; - grpc_mdctx *mdctx = grpc_mdctx_create(); + grpc_mdctx *mdctx = grpc_mdctx_create (); grpc_transport *transport; - GPR_ASSERT(!f->server); - f->server = grpc_server_create_from_filters(NULL, 0, server_args); - grpc_server_register_completion_queue(f->server, f->cq, NULL); - grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0, - &closure_list); - server_setup_transport(f, transport, mdctx); - grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); - grpc_closure_list_run(&closure_list); + GPR_ASSERT (!f->server); + f->server = grpc_server_create_from_filters (NULL, 0, server_args); + grpc_server_register_completion_queue (f->server, f->cq, NULL); + grpc_server_start (f->server); + transport = grpc_create_chttp2_transport (server_args, sfd->server, mdctx, 0, &closure_list); + server_setup_transport (f, transport, mdctx); + grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); + grpc_closure_list_run (&closure_list); } -static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { - gpr_free(f->fixture_data); +static void +chttp2_tear_down_socketpair (grpc_end2end_test_fixture * f) +{ + gpr_free (f->fixture_data); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/socketpair", 0, chttp2_create_fixture_socketpair, - chttp2_init_client_socketpair, chttp2_init_server_socketpair, - chttp2_tear_down_socketpair}, + {"chttp2/socketpair", 0, chttp2_create_fixture_socketpair, + chttp2_init_client_socketpair, chttp2_init_server_socketpair, + chttp2_tear_down_socketpair}, }; -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; /* force tracing on, with a value to force many code paths in trace.c to be taken */ - gpr_setenv("GRPC_TRACE", "doesnt-exist,http,all"); + gpr_setenv ("GRPC_TRACE", "doesnt-exist,http,all"); #ifdef GPR_POSIX_SOCKET - g_fixture_slowdown_factor = isatty(STDOUT_FILENO) ? 10.0 : 1.0; + g_fixture_slowdown_factor = isatty (STDOUT_FILENO) ? 10.0 : 1.0; #else g_fixture_slowdown_factor = 10.0; #endif - grpc_test_init(argc, argv); - grpc_init(); - grpc_closure_list_run(&closure_list); + grpc_test_init (argc, argv); + grpc_init (); + grpc_closure_list_run (&closure_list); - GPR_ASSERT(0 == grpc_tracer_set_enabled("also-doesnt-exist", 0)); - GPR_ASSERT(1 == grpc_tracer_set_enabled("http", 1)); - GPR_ASSERT(1 == grpc_tracer_set_enabled("all", 1)); + GPR_ASSERT (0 == grpc_tracer_set_enabled ("also-doesnt-exist", 0)); + GPR_ASSERT (1 == grpc_tracer_set_enabled ("http", 1)); + GPR_ASSERT (1 == grpc_tracer_set_enabled ("all", 1)); - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(configs[i]); - } + for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) + { + grpc_end2end_tests (configs[i]); + } - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index e927a0e0d80..48faad97d3f 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -56,112 +56,118 @@ /* chttp2 transport that is immediately available (used for testing connected_channel without a client_channel */ -static void server_setup_transport(void *ts, grpc_transport *transport, - grpc_mdctx *mdctx) { +static void +server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx) +{ grpc_end2end_test_fixture *f = ts; static grpc_channel_filter const *extra_filters[] = { - &grpc_http_server_filter}; + &grpc_http_server_filter + }; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_server_setup_transport( - f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - grpc_server_get_channel_args(f->server), &closure_list); - grpc_closure_list_run(&closure_list); + grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); + grpc_closure_list_run (&closure_list); } -typedef struct { +typedef struct +{ grpc_end2end_test_fixture *f; grpc_channel_args *client_args; } sp_client_setup; -static void client_setup_transport(void *ts, grpc_transport *transport, - grpc_mdctx *mdctx, - grpc_closure_list *closure_list) { +static void +client_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx, grpc_closure_list * closure_list) +{ sp_client_setup *cs = ts; - const grpc_channel_filter *filters[] = {&grpc_http_client_filter, - &grpc_compress_filter, - &grpc_connected_channel_filter}; - size_t nfilters = sizeof(filters) / sizeof(*filters); - grpc_channel *channel = - grpc_channel_create_from_filters("socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1, closure_list); + const grpc_channel_filter *filters[] = { &grpc_http_client_filter, + &grpc_compress_filter, + &grpc_connected_channel_filter + }; + size_t nfilters = sizeof (filters) / sizeof (*filters); + grpc_channel *channel = grpc_channel_create_from_filters ("socketpair-target", filters, nfilters, + cs->client_args, mdctx, 1, closure_list); cs->f->client = channel; - grpc_connected_channel_bind_transport(grpc_channel_get_channel_stack(channel), - transport); + grpc_connected_channel_bind_transport (grpc_channel_get_channel_stack (channel), transport); } -static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( - grpc_channel_args *client_args, grpc_channel_args *server_args) { - grpc_endpoint_pair *sfd = gpr_malloc(sizeof(grpc_endpoint_pair)); +static grpc_end2end_test_fixture +chttp2_create_fixture_socketpair (grpc_channel_args * client_args, grpc_channel_args * server_args) +{ + grpc_endpoint_pair *sfd = gpr_malloc (sizeof (grpc_endpoint_pair)); grpc_end2end_test_fixture f; - memset(&f, 0, sizeof(f)); + memset (&f, 0, sizeof (f)); f.fixture_data = sfd; - f.cq = grpc_completion_queue_create(NULL); + f.cq = grpc_completion_queue_create (NULL); - *sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536); + *sfd = grpc_iomgr_create_endpoint_pair ("fixture", 65536); return f; } -static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args) { +static void +chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; - grpc_mdctx *mdctx = grpc_mdctx_create(); + grpc_mdctx *mdctx = grpc_mdctx_create (); sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1, - &closure_list); - client_setup_transport(&cs, transport, mdctx, &closure_list); - GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); - grpc_closure_list_run(&closure_list); + transport = grpc_create_chttp2_transport (client_args, sfd->client, mdctx, 1, &closure_list); + client_setup_transport (&cs, transport, mdctx, &closure_list); + GPR_ASSERT (f->client); + grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); + grpc_closure_list_run (&closure_list); } -static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, - grpc_channel_args *server_args) { +static void +chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; - grpc_mdctx *mdctx = grpc_mdctx_create(); + grpc_mdctx *mdctx = grpc_mdctx_create (); grpc_transport *transport; - GPR_ASSERT(!f->server); - f->server = grpc_server_create_from_filters(NULL, 0, server_args); - grpc_server_register_completion_queue(f->server, f->cq, NULL); - grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0, - &closure_list); - server_setup_transport(f, transport, mdctx); - grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); - grpc_closure_list_run(&closure_list); + GPR_ASSERT (!f->server); + f->server = grpc_server_create_from_filters (NULL, 0, server_args); + grpc_server_register_completion_queue (f->server, f->cq, NULL); + grpc_server_start (f->server); + transport = grpc_create_chttp2_transport (server_args, sfd->server, mdctx, 0, &closure_list); + server_setup_transport (f, transport, mdctx); + grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); + grpc_closure_list_run (&closure_list); } -static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { - gpr_free(f->fixture_data); +static void +chttp2_tear_down_socketpair (grpc_end2end_test_fixture * f) +{ + gpr_free (f->fixture_data); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/socketpair", 0, chttp2_create_fixture_socketpair, - chttp2_init_client_socketpair, chttp2_init_server_socketpair, - chttp2_tear_down_socketpair}, + {"chttp2/socketpair", 0, chttp2_create_fixture_socketpair, + chttp2_init_client_socketpair, chttp2_init_server_socketpair, + chttp2_tear_down_socketpair}, }; -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; - grpc_test_init(argc, argv); - grpc_init(); + grpc_test_init (argc, argv); + grpc_init (); - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(configs[i]); - } + for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) + { + grpc_end2end_tests (configs[i]); + } - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 8a9196d3b60..0e11a944aff 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -56,112 +56,118 @@ /* chttp2 transport that is immediately available (used for testing connected_channel without a client_channel */ -static void server_setup_transport(void *ts, grpc_transport *transport, - grpc_mdctx *mdctx) { +static void +server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx) +{ grpc_end2end_test_fixture *f = ts; static grpc_channel_filter const *extra_filters[] = { - &grpc_http_server_filter}; + &grpc_http_server_filter + }; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_server_setup_transport( - f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - grpc_server_get_channel_args(f->server), &closure_list); - grpc_closure_list_run(&closure_list); + grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); + grpc_closure_list_run (&closure_list); } -typedef struct { +typedef struct +{ grpc_end2end_test_fixture *f; grpc_channel_args *client_args; } sp_client_setup; -static void client_setup_transport(void *ts, grpc_transport *transport, - grpc_mdctx *mdctx, - grpc_closure_list *closure_list) { +static void +client_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx, grpc_closure_list * closure_list) +{ sp_client_setup *cs = ts; - const grpc_channel_filter *filters[] = {&grpc_http_client_filter, - &grpc_compress_filter, - &grpc_connected_channel_filter}; - size_t nfilters = sizeof(filters) / sizeof(*filters); - grpc_channel *channel = - grpc_channel_create_from_filters("socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1, closure_list); + const grpc_channel_filter *filters[] = { &grpc_http_client_filter, + &grpc_compress_filter, + &grpc_connected_channel_filter + }; + size_t nfilters = sizeof (filters) / sizeof (*filters); + grpc_channel *channel = grpc_channel_create_from_filters ("socketpair-target", filters, nfilters, + cs->client_args, mdctx, 1, closure_list); cs->f->client = channel; - grpc_connected_channel_bind_transport(grpc_channel_get_channel_stack(channel), - transport); + grpc_connected_channel_bind_transport (grpc_channel_get_channel_stack (channel), transport); } -static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( - grpc_channel_args *client_args, grpc_channel_args *server_args) { - grpc_endpoint_pair *sfd = gpr_malloc(sizeof(grpc_endpoint_pair)); +static grpc_end2end_test_fixture +chttp2_create_fixture_socketpair (grpc_channel_args * client_args, grpc_channel_args * server_args) +{ + grpc_endpoint_pair *sfd = gpr_malloc (sizeof (grpc_endpoint_pair)); grpc_end2end_test_fixture f; - memset(&f, 0, sizeof(f)); + memset (&f, 0, sizeof (f)); f.fixture_data = sfd; - f.cq = grpc_completion_queue_create(NULL); + f.cq = grpc_completion_queue_create (NULL); - *sfd = grpc_iomgr_create_endpoint_pair("fixture", 1); + *sfd = grpc_iomgr_create_endpoint_pair ("fixture", 1); return f; } -static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args) { +static void +chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; - grpc_mdctx *mdctx = grpc_mdctx_create(); + grpc_mdctx *mdctx = grpc_mdctx_create (); sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1, - &closure_list); - client_setup_transport(&cs, transport, mdctx, &closure_list); - GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); - grpc_closure_list_run(&closure_list); + transport = grpc_create_chttp2_transport (client_args, sfd->client, mdctx, 1, &closure_list); + client_setup_transport (&cs, transport, mdctx, &closure_list); + GPR_ASSERT (f->client); + grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); + grpc_closure_list_run (&closure_list); } -static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, - grpc_channel_args *server_args) { +static void +chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; - grpc_mdctx *mdctx = grpc_mdctx_create(); + grpc_mdctx *mdctx = grpc_mdctx_create (); grpc_transport *transport; - GPR_ASSERT(!f->server); - f->server = grpc_server_create_from_filters(NULL, 0, server_args); - grpc_server_register_completion_queue(f->server, f->cq, NULL); - grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0, - &closure_list); - server_setup_transport(f, transport, mdctx); - grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); - grpc_closure_list_run(&closure_list); + GPR_ASSERT (!f->server); + f->server = grpc_server_create_from_filters (NULL, 0, server_args); + grpc_server_register_completion_queue (f->server, f->cq, NULL); + grpc_server_start (f->server); + transport = grpc_create_chttp2_transport (server_args, sfd->server, mdctx, 0, &closure_list); + server_setup_transport (f, transport, mdctx); + grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); + grpc_closure_list_run (&closure_list); } -static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { - gpr_free(f->fixture_data); +static void +chttp2_tear_down_socketpair (grpc_end2end_test_fixture * f) +{ + gpr_free (f->fixture_data); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/socketpair_one_byte_at_a_time", 0, - chttp2_create_fixture_socketpair, chttp2_init_client_socketpair, - chttp2_init_server_socketpair, chttp2_tear_down_socketpair}, + {"chttp2/socketpair_one_byte_at_a_time", 0, + chttp2_create_fixture_socketpair, chttp2_init_client_socketpair, + chttp2_init_server_socketpair, chttp2_tear_down_socketpair}, }; -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; - grpc_test_init(argc, argv); - grpc_init(); + grpc_test_init (argc, argv); + grpc_init (); - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(configs[i]); - } + for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) + { + grpc_end2end_tests (configs[i]); + } - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/end2end/fixtures/h2_ssl+poll.c b/test/core/end2end/fixtures/h2_ssl+poll.c index 2c605d1471c..55c12a37ca2 100644 --- a/test/core/end2end/fixtures/h2_ssl+poll.c +++ b/test/core/end2end/fixtures/h2_ssl+poll.c @@ -48,145 +48,153 @@ #include "test/core/util/port.h" #include "test/core/end2end/data/ssl_test_data.h" -typedef struct fullstack_secure_fixture_data { +typedef struct fullstack_secure_fixture_data +{ char *localaddr; } fullstack_secure_fixture_data; -static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( - grpc_channel_args *client_args, grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - int port = grpc_pick_unused_port_or_die(); - fullstack_secure_fixture_data *ffd = - gpr_malloc(sizeof(fullstack_secure_fixture_data)); - memset(&f, 0, sizeof(f)); + int port = grpc_pick_unused_port_or_die (); + fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data)); + memset (&f, 0, sizeof (f)); - gpr_join_host_port(&ffd->localaddr, "localhost", port); + gpr_join_host_port (&ffd->localaddr, "localhost", port); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create(NULL); + f.cq = grpc_completion_queue_create (NULL); return f; } -static void process_auth_failure(void *state, grpc_auth_context *ctx, - const grpc_metadata *md, size_t md_count, - grpc_process_auth_metadata_done_cb cb, - void *user_data) { - GPR_ASSERT(state == NULL); - cb(user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); +static void +process_auth_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data) +{ + GPR_ASSERT (state == NULL); + cb (user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); } -static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args, - grpc_credentials *creds) { +static void +chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - f->client = - grpc_secure_channel_create(creds, ffd->localaddr, client_args, NULL); - GPR_ASSERT(f->client != NULL); - grpc_credentials_release(creds); + f->client = grpc_secure_channel_create (creds, ffd->localaddr, client_args, NULL); + GPR_ASSERT (f->client != NULL); + grpc_credentials_release (creds); } -static void chttp2_init_server_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *server_args, - grpc_server_credentials *server_creds) { +static void +chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - if (f->server) { - grpc_server_destroy(f->server); - } - f->server = grpc_server_create(server_args, NULL); - grpc_server_register_completion_queue(f->server, f->cq, NULL); - GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr, - server_creds)); - grpc_server_credentials_release(server_creds); - grpc_server_start(f->server); + if (f->server) + { + grpc_server_destroy (f->server); + } + f->server = grpc_server_create (server_args, NULL); + grpc_server_register_completion_queue (f->server, f->cq, NULL); + GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, ffd->localaddr, server_creds)); + grpc_server_credentials_release (server_creds); + grpc_server_start (f->server); } -void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { +void +chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - gpr_free(ffd->localaddr); - gpr_free(ffd); + gpr_free (ffd->localaddr); + gpr_free (ffd); } -static void chttp2_init_client_simple_ssl_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL); - grpc_arg ssl_name_override = {GRPC_ARG_STRING, - GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, - {"foo.test.google.fr"}}; - 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_creds); - grpc_channel_args_destroy(new_client_args); +static void +chttp2_init_client_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) +{ + grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL); + grpc_arg ssl_name_override = { GRPC_ARG_STRING, + GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, + {"foo.test.google.fr"} + }; + 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_creds); + grpc_channel_args_destroy (new_client_args); } -static int fail_server_auth_check(grpc_channel_args *server_args) { +static int +fail_server_auth_check (grpc_channel_args * server_args) +{ size_t i; - if (server_args == NULL) return 0; - for (i = 0; i < server_args->num_args; i++) { - if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == - 0) { - return 1; + if (server_args == NULL) + return 0; + for (i = 0; i < server_args->num_args; i++) + { + if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0) + { + return 1; + } } - } return 0; } -static void chttp2_init_server_simple_ssl_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_ssl_pem_key_cert_pair pem_cert_key_pair = {test_server1_key, - test_server1_cert}; - grpc_server_credentials *ssl_creds = - grpc_ssl_server_credentials_create(NULL, &pem_cert_key_pair, 1, 0, NULL); - if (fail_server_auth_check(server_args)) { - grpc_auth_metadata_processor processor = {process_auth_failure, NULL, NULL}; - grpc_server_credentials_set_auth_metadata_processor(ssl_creds, processor); - } - chttp2_init_server_secure_fullstack(f, server_args, ssl_creds); +static void +chttp2_init_server_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) +{ + grpc_ssl_pem_key_cert_pair pem_cert_key_pair = { test_server1_key, + test_server1_cert + }; + grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_cert_key_pair, 1, 0, NULL); + if (fail_server_auth_check (server_args)) + { + grpc_auth_metadata_processor processor = { process_auth_failure, NULL, NULL }; + grpc_server_credentials_set_auth_metadata_processor (ssl_creds, processor); + } + chttp2_init_server_secure_fullstack (f, server_args, ssl_creds); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/simple_ssl_fullstack", - FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | - FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | - FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, - chttp2_create_fixture_secure_fullstack, - chttp2_init_client_simple_ssl_secure_fullstack, - chttp2_init_server_simple_ssl_secure_fullstack, - chttp2_tear_down_secure_fullstack}, + {"chttp2/simple_ssl_fullstack", + FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, + chttp2_create_fixture_secure_fullstack, + chttp2_init_client_simple_ssl_secure_fullstack, + chttp2_init_server_simple_ssl_secure_fullstack, + chttp2_tear_down_secure_fullstack}, }; -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; FILE *roots_file; - size_t roots_size = strlen(test_root_cert); + size_t roots_size = strlen (test_root_cert); char *roots_filename; grpc_platform_become_multipoller = grpc_poll_become_multipoller; - grpc_test_init(argc, argv); + grpc_test_init (argc, argv); /* Set the SSL roots env var. */ - roots_file = gpr_tmpfile("chttp2_simple_ssl_with_poll_fullstack_test", - &roots_filename); - GPR_ASSERT(roots_filename != NULL); - GPR_ASSERT(roots_file != NULL); - GPR_ASSERT(fwrite(test_root_cert, 1, roots_size, roots_file) == roots_size); - fclose(roots_file); - gpr_setenv(GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename); - - grpc_init(); - - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(configs[i]); - } + roots_file = gpr_tmpfile ("chttp2_simple_ssl_with_poll_fullstack_test", &roots_filename); + GPR_ASSERT (roots_filename != NULL); + GPR_ASSERT (roots_file != NULL); + GPR_ASSERT (fwrite (test_root_cert, 1, roots_size, roots_file) == roots_size); + fclose (roots_file); + gpr_setenv (GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename); + + grpc_init (); + + for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) + { + grpc_end2end_tests (configs[i]); + } - grpc_shutdown(); + grpc_shutdown (); /* Cleanup. */ - remove(roots_filename); - gpr_free(roots_filename); + remove (roots_filename); + gpr_free (roots_filename); return 0; } diff --git a/test/core/end2end/fixtures/h2_ssl.c b/test/core/end2end/fixtures/h2_ssl.c index 9193a09b178..7752ff2703a 100644 --- a/test/core/end2end/fixtures/h2_ssl.c +++ b/test/core/end2end/fixtures/h2_ssl.c @@ -48,142 +48,151 @@ #include "test/core/util/port.h" #include "test/core/end2end/data/ssl_test_data.h" -typedef struct fullstack_secure_fixture_data { +typedef struct fullstack_secure_fixture_data +{ char *localaddr; } fullstack_secure_fixture_data; -static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( - grpc_channel_args *client_args, grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - int port = grpc_pick_unused_port_or_die(); - fullstack_secure_fixture_data *ffd = - gpr_malloc(sizeof(fullstack_secure_fixture_data)); - memset(&f, 0, sizeof(f)); + int port = grpc_pick_unused_port_or_die (); + fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data)); + memset (&f, 0, sizeof (f)); - gpr_join_host_port(&ffd->localaddr, "localhost", port); + gpr_join_host_port (&ffd->localaddr, "localhost", port); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create(NULL); + f.cq = grpc_completion_queue_create (NULL); return f; } -static void process_auth_failure(void *state, grpc_auth_context *ctx, - const grpc_metadata *md, size_t md_count, - grpc_process_auth_metadata_done_cb cb, - void *user_data) { - GPR_ASSERT(state == NULL); - cb(user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); +static void +process_auth_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data) +{ + GPR_ASSERT (state == NULL); + cb (user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); } -static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args, - grpc_credentials *creds) { +static void +chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - f->client = - grpc_secure_channel_create(creds, ffd->localaddr, client_args, NULL); - GPR_ASSERT(f->client != NULL); - grpc_credentials_release(creds); + f->client = grpc_secure_channel_create (creds, ffd->localaddr, client_args, NULL); + GPR_ASSERT (f->client != NULL); + grpc_credentials_release (creds); } -static void chttp2_init_server_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *server_args, - grpc_server_credentials *server_creds) { +static void +chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - if (f->server) { - grpc_server_destroy(f->server); - } - f->server = grpc_server_create(server_args, NULL); - grpc_server_register_completion_queue(f->server, f->cq, NULL); - GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr, - server_creds)); - grpc_server_credentials_release(server_creds); - grpc_server_start(f->server); + if (f->server) + { + grpc_server_destroy (f->server); + } + f->server = grpc_server_create (server_args, NULL); + grpc_server_register_completion_queue (f->server, f->cq, NULL); + GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, ffd->localaddr, server_creds)); + grpc_server_credentials_release (server_creds); + grpc_server_start (f->server); } -void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { +void +chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - gpr_free(ffd->localaddr); - gpr_free(ffd); + gpr_free (ffd->localaddr); + gpr_free (ffd); } -static void chttp2_init_client_simple_ssl_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL); - grpc_arg ssl_name_override = {GRPC_ARG_STRING, - GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, - {"foo.test.google.fr"}}; - 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_creds); - grpc_channel_args_destroy(new_client_args); +static void +chttp2_init_client_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) +{ + grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL); + grpc_arg ssl_name_override = { GRPC_ARG_STRING, + GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, + {"foo.test.google.fr"} + }; + 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_creds); + grpc_channel_args_destroy (new_client_args); } -static int fail_server_auth_check(grpc_channel_args *server_args) { +static int +fail_server_auth_check (grpc_channel_args * server_args) +{ size_t i; - if (server_args == NULL) return 0; - for (i = 0; i < server_args->num_args; i++) { - if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == - 0) { - return 1; + if (server_args == NULL) + return 0; + for (i = 0; i < server_args->num_args; i++) + { + if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0) + { + return 1; + } } - } return 0; } -static void chttp2_init_server_simple_ssl_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_ssl_pem_key_cert_pair pem_cert_key_pair = {test_server1_key, - test_server1_cert}; - grpc_server_credentials *ssl_creds = - grpc_ssl_server_credentials_create(NULL, &pem_cert_key_pair, 1, 0, NULL); - if (fail_server_auth_check(server_args)) { - grpc_auth_metadata_processor processor = {process_auth_failure, NULL, NULL}; - grpc_server_credentials_set_auth_metadata_processor(ssl_creds, processor); - } - chttp2_init_server_secure_fullstack(f, server_args, ssl_creds); +static void +chttp2_init_server_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) +{ + grpc_ssl_pem_key_cert_pair pem_cert_key_pair = { test_server1_key, + test_server1_cert + }; + grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_cert_key_pair, 1, 0, NULL); + if (fail_server_auth_check (server_args)) + { + grpc_auth_metadata_processor processor = { process_auth_failure, NULL, NULL }; + grpc_server_credentials_set_auth_metadata_processor (ssl_creds, processor); + } + chttp2_init_server_secure_fullstack (f, server_args, ssl_creds); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/simple_ssl_fullstack", - FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | - FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | - FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, - chttp2_create_fixture_secure_fullstack, - chttp2_init_client_simple_ssl_secure_fullstack, - chttp2_init_server_simple_ssl_secure_fullstack, - chttp2_tear_down_secure_fullstack}, + {"chttp2/simple_ssl_fullstack", + FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, + chttp2_create_fixture_secure_fullstack, + chttp2_init_client_simple_ssl_secure_fullstack, + chttp2_init_server_simple_ssl_secure_fullstack, + chttp2_tear_down_secure_fullstack}, }; -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; FILE *roots_file; - size_t roots_size = strlen(test_root_cert); + size_t roots_size = strlen (test_root_cert); char *roots_filename; - grpc_test_init(argc, argv); + grpc_test_init (argc, argv); /* Set the SSL roots env var. */ - roots_file = gpr_tmpfile("chttp2_simple_ssl_fullstack_test", &roots_filename); - GPR_ASSERT(roots_filename != NULL); - GPR_ASSERT(roots_file != NULL); - GPR_ASSERT(fwrite(test_root_cert, 1, roots_size, roots_file) == roots_size); - fclose(roots_file); - gpr_setenv(GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename); - - grpc_init(); - - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(configs[i]); - } + roots_file = gpr_tmpfile ("chttp2_simple_ssl_fullstack_test", &roots_filename); + GPR_ASSERT (roots_filename != NULL); + GPR_ASSERT (roots_file != NULL); + GPR_ASSERT (fwrite (test_root_cert, 1, roots_size, roots_file) == roots_size); + fclose (roots_file); + gpr_setenv (GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename); + + grpc_init (); + + for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) + { + grpc_end2end_tests (configs[i]); + } - grpc_shutdown(); + grpc_shutdown (); /* Cleanup. */ - remove(roots_filename); - gpr_free(roots_filename); + remove (roots_filename); + gpr_free (roots_filename); return 0; } diff --git a/test/core/end2end/fixtures/h2_ssl_proxy.c b/test/core/end2end/fixtures/h2_ssl_proxy.c index 8133a69a0cd..ff82a0f2918 100644 --- a/test/core/end2end/fixtures/h2_ssl_proxy.c +++ b/test/core/end2end/fixtures/h2_ssl_proxy.c @@ -49,170 +49,184 @@ #include "test/core/util/test_config.h" #include "test/core/util/port.h" -typedef struct fullstack_secure_fixture_data { +typedef struct fullstack_secure_fixture_data +{ grpc_end2end_proxy *proxy; } fullstack_secure_fixture_data; -static grpc_server *create_proxy_server(const char *port) { - grpc_server *s = grpc_server_create(NULL, NULL); - grpc_ssl_pem_key_cert_pair pem_cert_key_pair = {test_server1_key, - test_server1_cert}; - grpc_server_credentials *ssl_creds = - grpc_ssl_server_credentials_create(NULL, &pem_cert_key_pair, 1, 0, NULL); - GPR_ASSERT(grpc_server_add_secure_http2_port(s, port, ssl_creds)); - grpc_server_credentials_release(ssl_creds); +static grpc_server * +create_proxy_server (const char *port) +{ + grpc_server *s = grpc_server_create (NULL, NULL); + grpc_ssl_pem_key_cert_pair pem_cert_key_pair = { test_server1_key, + test_server1_cert + }; + grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_cert_key_pair, 1, 0, NULL); + GPR_ASSERT (grpc_server_add_secure_http2_port (s, port, ssl_creds)); + grpc_server_credentials_release (ssl_creds); return s; } -static grpc_channel *create_proxy_client(const char *target) { +static grpc_channel * +create_proxy_client (const char *target) +{ grpc_channel *channel; - grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL); - grpc_arg ssl_name_override = {GRPC_ARG_STRING, - GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, - {"foo.test.google.fr"}}; + grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL); + grpc_arg ssl_name_override = { GRPC_ARG_STRING, + GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, + {"foo.test.google.fr"} + }; grpc_channel_args client_args; client_args.num_args = 1; client_args.args = &ssl_name_override; - channel = grpc_secure_channel_create(ssl_creds, target, &client_args, NULL); - grpc_credentials_release(ssl_creds); + channel = grpc_secure_channel_create (ssl_creds, target, &client_args, NULL); + grpc_credentials_release (ssl_creds); return channel; } -static const grpc_end2end_proxy_def proxy_def = {create_proxy_server, - create_proxy_client}; +static const grpc_end2end_proxy_def proxy_def = { create_proxy_server, + create_proxy_client +}; -static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( - grpc_channel_args *client_args, grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - fullstack_secure_fixture_data *ffd = - gpr_malloc(sizeof(fullstack_secure_fixture_data)); - memset(&f, 0, sizeof(f)); + fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data)); + memset (&f, 0, sizeof (f)); - ffd->proxy = grpc_end2end_proxy_create(&proxy_def); + ffd->proxy = grpc_end2end_proxy_create (&proxy_def); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create(NULL); + f.cq = grpc_completion_queue_create (NULL); return f; } -static void process_auth_failure(void *state, grpc_auth_context *ctx, - const grpc_metadata *md, size_t md_count, - grpc_process_auth_metadata_done_cb cb, - void *user_data) { - GPR_ASSERT(state == NULL); - cb(user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); +static void +process_auth_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data) +{ + GPR_ASSERT (state == NULL); + cb (user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); } -static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args, - grpc_credentials *creds) { +static void +chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - f->client = grpc_secure_channel_create( - creds, grpc_end2end_proxy_get_client_target(ffd->proxy), client_args, - NULL); - GPR_ASSERT(f->client != NULL); - grpc_credentials_release(creds); + f->client = grpc_secure_channel_create (creds, grpc_end2end_proxy_get_client_target (ffd->proxy), client_args, NULL); + GPR_ASSERT (f->client != NULL); + grpc_credentials_release (creds); } -static void chttp2_init_server_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *server_args, - grpc_server_credentials *server_creds) { +static void +chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - if (f->server) { - grpc_server_destroy(f->server); - } - f->server = grpc_server_create(server_args, NULL); - grpc_server_register_completion_queue(f->server, f->cq, NULL); - GPR_ASSERT(grpc_server_add_secure_http2_port( - f->server, grpc_end2end_proxy_get_server_port(ffd->proxy), server_creds)); - grpc_server_credentials_release(server_creds); - grpc_server_start(f->server); + if (f->server) + { + grpc_server_destroy (f->server); + } + f->server = grpc_server_create (server_args, NULL); + grpc_server_register_completion_queue (f->server, f->cq, NULL); + GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, grpc_end2end_proxy_get_server_port (ffd->proxy), server_creds)); + grpc_server_credentials_release (server_creds); + grpc_server_start (f->server); } -void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { +void +chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f) +{ fullstack_secure_fixture_data *ffd = f->fixture_data; - grpc_end2end_proxy_destroy(ffd->proxy); - gpr_free(ffd); + grpc_end2end_proxy_destroy (ffd->proxy); + gpr_free (ffd); } -static void chttp2_init_client_simple_ssl_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL); - grpc_arg ssl_name_override = {GRPC_ARG_STRING, - GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, - {"foo.test.google.fr"}}; - 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_creds); - grpc_channel_args_destroy(new_client_args); +static void +chttp2_init_client_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) +{ + grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL); + grpc_arg ssl_name_override = { GRPC_ARG_STRING, + GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, + {"foo.test.google.fr"} + }; + 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_creds); + grpc_channel_args_destroy (new_client_args); } -static int fail_server_auth_check(grpc_channel_args *server_args) { +static int +fail_server_auth_check (grpc_channel_args * server_args) +{ size_t i; - if (server_args == NULL) return 0; - for (i = 0; i < server_args->num_args; i++) { - if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == - 0) { - return 1; + if (server_args == NULL) + return 0; + for (i = 0; i < server_args->num_args; i++) + { + if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0) + { + return 1; + } } - } return 0; } -static void chttp2_init_server_simple_ssl_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_ssl_pem_key_cert_pair pem_cert_key_pair = {test_server1_key, - test_server1_cert}; - grpc_server_credentials *ssl_creds = - grpc_ssl_server_credentials_create(NULL, &pem_cert_key_pair, 1, 0, NULL); - if (fail_server_auth_check(server_args)) { - grpc_auth_metadata_processor processor = {process_auth_failure, NULL, NULL}; - grpc_server_credentials_set_auth_metadata_processor(ssl_creds, processor); - } - chttp2_init_server_secure_fullstack(f, server_args, ssl_creds); +static void +chttp2_init_server_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) +{ + grpc_ssl_pem_key_cert_pair pem_cert_key_pair = { test_server1_key, + test_server1_cert + }; + grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_cert_key_pair, 1, 0, NULL); + if (fail_server_auth_check (server_args)) + { + grpc_auth_metadata_processor processor = { process_auth_failure, NULL, NULL }; + grpc_server_credentials_set_auth_metadata_processor (ssl_creds, processor); + } + chttp2_init_server_secure_fullstack (f, server_args, ssl_creds); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/simple_ssl_fullstack", - FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | - FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | - FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, - chttp2_create_fixture_secure_fullstack, - chttp2_init_client_simple_ssl_secure_fullstack, - chttp2_init_server_simple_ssl_secure_fullstack, - chttp2_tear_down_secure_fullstack}, + {"chttp2/simple_ssl_fullstack", + FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, + chttp2_create_fixture_secure_fullstack, + chttp2_init_client_simple_ssl_secure_fullstack, + chttp2_init_server_simple_ssl_secure_fullstack, + chttp2_tear_down_secure_fullstack}, }; -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; FILE *roots_file; - size_t roots_size = strlen(test_root_cert); + size_t roots_size = strlen (test_root_cert); char *roots_filename; - grpc_test_init(argc, argv); + grpc_test_init (argc, argv); /* Set the SSL roots env var. */ - roots_file = gpr_tmpfile("chttp2_simple_ssl_fullstack_test", &roots_filename); - GPR_ASSERT(roots_filename != NULL); - GPR_ASSERT(roots_file != NULL); - GPR_ASSERT(fwrite(test_root_cert, 1, roots_size, roots_file) == roots_size); - fclose(roots_file); - gpr_setenv(GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename); - - grpc_init(); - - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(configs[i]); - } + roots_file = gpr_tmpfile ("chttp2_simple_ssl_fullstack_test", &roots_filename); + GPR_ASSERT (roots_filename != NULL); + GPR_ASSERT (roots_file != NULL); + GPR_ASSERT (fwrite (test_root_cert, 1, roots_size, roots_file) == roots_size); + fclose (roots_file); + gpr_setenv (GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename); + + grpc_init (); + + for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) + { + grpc_end2end_tests (configs[i]); + } - grpc_shutdown(); + grpc_shutdown (); /* Cleanup. */ - remove(roots_filename); - gpr_free(roots_filename); + remove (roots_filename); + gpr_free (roots_filename); return 0; } diff --git a/test/core/end2end/fixtures/h2_uds+poll.c b/test/core/end2end/fixtures/h2_uds+poll.c index 05b9ea09493..b2981fe0bcc 100644 --- a/test/core/end2end/fixtures/h2_uds+poll.c +++ b/test/core/end2end/fixtures/h2_uds+poll.c @@ -54,71 +54,80 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -typedef struct fullstack_fixture_data { +typedef struct fullstack_fixture_data +{ char *localaddr; } fullstack_fixture_data; static int unique = 1; -static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( - grpc_channel_args *client_args, grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data)); - memset(&f, 0, sizeof(f)); + fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data)); + memset (&f, 0, sizeof (f)); - gpr_asprintf(&ffd->localaddr, "unix:/tmp/grpc_fullstack_test.%d.%d", getpid(), - unique++); + gpr_asprintf (&ffd->localaddr, "unix:/tmp/grpc_fullstack_test.%d.%d", getpid (), unique++); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create(NULL); + f.cq = grpc_completion_queue_create (NULL); return f; } -void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args) { +void +chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) +{ fullstack_fixture_data *ffd = f->fixture_data; - f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL); + f->client = grpc_insecure_channel_create (ffd->localaddr, client_args, NULL); } -void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *server_args) { +void +chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) +{ fullstack_fixture_data *ffd = f->fixture_data; - if (f->server) { - grpc_server_destroy(f->server); - } - f->server = grpc_server_create(server_args, NULL); - 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); + if (f->server) + { + grpc_server_destroy (f->server); + } + f->server = grpc_server_create (server_args, NULL); + 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); } -void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) { +void +chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f) +{ fullstack_fixture_data *ffd = f->fixture_data; - gpr_free(ffd->localaddr); - gpr_free(ffd); + gpr_free (ffd->localaddr); + gpr_free (ffd); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/fullstack_uds", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, - chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, - chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, + {"chttp2/fullstack_uds", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, + chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, + chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, }; -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; grpc_platform_become_multipoller = grpc_poll_become_multipoller; - grpc_test_init(argc, argv); - grpc_init(); + grpc_test_init (argc, argv); + grpc_init (); - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(configs[i]); - } + for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) + { + grpc_end2end_tests (configs[i]); + } - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/end2end/fixtures/h2_uds.c b/test/core/end2end/fixtures/h2_uds.c index 59d39bbb0fd..6b664d3aeca 100644 --- a/test/core/end2end/fixtures/h2_uds.c +++ b/test/core/end2end/fixtures/h2_uds.c @@ -54,69 +54,78 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -typedef struct fullstack_fixture_data { +typedef struct fullstack_fixture_data +{ char *localaddr; } fullstack_fixture_data; static int unique = 1; -static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( - grpc_channel_args *client_args, grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data)); - memset(&f, 0, sizeof(f)); + fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data)); + memset (&f, 0, sizeof (f)); - gpr_asprintf(&ffd->localaddr, "unix:/tmp/grpc_fullstack_test.%d.%d", getpid(), - unique++); + gpr_asprintf (&ffd->localaddr, "unix:/tmp/grpc_fullstack_test.%d.%d", getpid (), unique++); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create(NULL); + f.cq = grpc_completion_queue_create (NULL); return f; } -void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args) { +void +chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) +{ fullstack_fixture_data *ffd = f->fixture_data; - f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL); + f->client = grpc_insecure_channel_create (ffd->localaddr, client_args, NULL); } -void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *server_args) { +void +chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) +{ fullstack_fixture_data *ffd = f->fixture_data; - if (f->server) { - grpc_server_destroy(f->server); - } - f->server = grpc_server_create(server_args, NULL); - 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); + if (f->server) + { + grpc_server_destroy (f->server); + } + f->server = grpc_server_create (server_args, NULL); + 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); } -void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) { +void +chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f) +{ fullstack_fixture_data *ffd = f->fixture_data; - gpr_free(ffd->localaddr); - gpr_free(ffd); + gpr_free (ffd->localaddr); + gpr_free (ffd); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/fullstack_uds", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, - chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, - chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, + {"chttp2/fullstack_uds", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, + chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, + chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, }; -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; - grpc_test_init(argc, argv); - grpc_init(); + grpc_test_init (argc, argv); + grpc_init (); - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(configs[i]); - } + for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) + { + grpc_end2end_tests (configs[i]); + } - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/end2end/fixtures/proxy.c b/test/core/end2end/fixtures/proxy.c index 434e75dd15e..14a55fb8529 100644 --- a/test/core/end2end/fixtures/proxy.c +++ b/test/core/end2end/fixtures/proxy.c @@ -44,7 +44,8 @@ #include "test/core/util/port.h" -struct grpc_end2end_proxy { +struct grpc_end2end_proxy +{ gpr_thd_id thd; char *proxy_port; char *server_port; @@ -60,12 +61,14 @@ struct grpc_end2end_proxy { grpc_metadata_array new_call_metadata; }; -typedef struct { - void (*func)(void *arg, int success); +typedef struct +{ + void (*func) (void *arg, int success); void *arg; } closure; -typedef struct { +typedef struct +{ gpr_refcount refs; grpc_end2end_proxy *proxy; @@ -86,351 +89,383 @@ typedef struct { int c2p_server_cancelled; } proxy_call; -static void thread_main(void *arg); -static void request_call(grpc_end2end_proxy *proxy); +static void thread_main (void *arg); +static void request_call (grpc_end2end_proxy * proxy); -grpc_end2end_proxy *grpc_end2end_proxy_create( - const grpc_end2end_proxy_def *def) { - gpr_thd_options opt = gpr_thd_options_default(); - int proxy_port = grpc_pick_unused_port_or_die(); - int server_port = grpc_pick_unused_port_or_die(); +grpc_end2end_proxy * +grpc_end2end_proxy_create (const grpc_end2end_proxy_def * def) +{ + gpr_thd_options opt = gpr_thd_options_default (); + int proxy_port = grpc_pick_unused_port_or_die (); + int server_port = grpc_pick_unused_port_or_die (); - grpc_end2end_proxy *proxy = gpr_malloc(sizeof(*proxy)); - memset(proxy, 0, sizeof(*proxy)); + grpc_end2end_proxy *proxy = gpr_malloc (sizeof (*proxy)); + memset (proxy, 0, sizeof (*proxy)); - gpr_join_host_port(&proxy->proxy_port, "localhost", proxy_port); - gpr_join_host_port(&proxy->server_port, "localhost", server_port); + gpr_join_host_port (&proxy->proxy_port, "localhost", proxy_port); + gpr_join_host_port (&proxy->server_port, "localhost", server_port); - gpr_log(GPR_DEBUG, "PROXY ADDR:%s BACKEND:%s", proxy->proxy_port, - proxy->server_port); + gpr_log (GPR_DEBUG, "PROXY ADDR:%s BACKEND:%s", proxy->proxy_port, proxy->server_port); - proxy->cq = grpc_completion_queue_create(NULL); - proxy->server = def->create_server(proxy->proxy_port); - proxy->client = def->create_client(proxy->server_port); + proxy->cq = grpc_completion_queue_create (NULL); + proxy->server = def->create_server (proxy->proxy_port); + proxy->client = def->create_client (proxy->server_port); - grpc_server_register_completion_queue(proxy->server, proxy->cq, NULL); - grpc_server_start(proxy->server); + grpc_server_register_completion_queue (proxy->server, proxy->cq, NULL); + grpc_server_start (proxy->server); - gpr_thd_options_set_joinable(&opt); - GPR_ASSERT(gpr_thd_new(&proxy->thd, thread_main, proxy, &opt)); + gpr_thd_options_set_joinable (&opt); + GPR_ASSERT (gpr_thd_new (&proxy->thd, thread_main, proxy, &opt)); - request_call(proxy); + request_call (proxy); return proxy; } -static closure *new_closure(void (*func)(void *arg, int success), void *arg) { - closure *cl = gpr_malloc(sizeof(*cl)); +static closure * +new_closure (void (*func) (void *arg, int success), void *arg) +{ + closure *cl = gpr_malloc (sizeof (*cl)); cl->func = func; cl->arg = arg; return cl; } -static void shutdown_complete(void *arg, int success) { +static void +shutdown_complete (void *arg, int success) +{ grpc_end2end_proxy *proxy = arg; proxy->shutdown = 1; - grpc_completion_queue_shutdown(proxy->cq); + grpc_completion_queue_shutdown (proxy->cq); } -void grpc_end2end_proxy_destroy(grpc_end2end_proxy *proxy) { - grpc_server_shutdown_and_notify(proxy->server, proxy->cq, - new_closure(shutdown_complete, proxy)); - gpr_thd_join(proxy->thd); - gpr_free(proxy->proxy_port); - gpr_free(proxy->server_port); - grpc_server_destroy(proxy->server); - grpc_channel_destroy(proxy->client); - grpc_completion_queue_destroy(proxy->cq); - grpc_call_details_destroy(&proxy->new_call_details); - gpr_free(proxy); +void +grpc_end2end_proxy_destroy (grpc_end2end_proxy * proxy) +{ + grpc_server_shutdown_and_notify (proxy->server, proxy->cq, new_closure (shutdown_complete, proxy)); + gpr_thd_join (proxy->thd); + gpr_free (proxy->proxy_port); + gpr_free (proxy->server_port); + grpc_server_destroy (proxy->server); + grpc_channel_destroy (proxy->client); + grpc_completion_queue_destroy (proxy->cq); + grpc_call_details_destroy (&proxy->new_call_details); + gpr_free (proxy); } -static void unrefpc(proxy_call *pc, const char *reason) { - if (gpr_unref(&pc->refs)) { - grpc_call_destroy(pc->c2p); - grpc_call_destroy(pc->p2s); - grpc_metadata_array_destroy(&pc->c2p_initial_metadata); - grpc_metadata_array_destroy(&pc->p2s_initial_metadata); - grpc_metadata_array_destroy(&pc->p2s_trailing_metadata); - gpr_free(pc->p2s_status_details); - gpr_free(pc); - } +static void +unrefpc (proxy_call * pc, const char *reason) +{ + if (gpr_unref (&pc->refs)) + { + grpc_call_destroy (pc->c2p); + grpc_call_destroy (pc->p2s); + grpc_metadata_array_destroy (&pc->c2p_initial_metadata); + grpc_metadata_array_destroy (&pc->p2s_initial_metadata); + grpc_metadata_array_destroy (&pc->p2s_trailing_metadata); + gpr_free (pc->p2s_status_details); + gpr_free (pc); + } } -static void refpc(proxy_call *pc, const char *reason) { gpr_ref(&pc->refs); } +static void +refpc (proxy_call * pc, const char *reason) +{ + gpr_ref (&pc->refs); +} -static void on_c2p_sent_initial_metadata(void *arg, int success) { +static void +on_c2p_sent_initial_metadata (void *arg, int success) +{ proxy_call *pc = arg; - unrefpc(pc, "on_c2p_sent_initial_metadata"); + unrefpc (pc, "on_c2p_sent_initial_metadata"); } -static void on_p2s_recv_initial_metadata(void *arg, int success) { +static void +on_p2s_recv_initial_metadata (void *arg, int success) +{ proxy_call *pc = arg; grpc_op op; grpc_call_error err; - if (!pc->proxy->shutdown) { - op.op = GRPC_OP_SEND_INITIAL_METADATA; - op.flags = 0; - op.reserved = NULL; - op.data.send_initial_metadata.count = pc->p2s_initial_metadata.count; - op.data.send_initial_metadata.metadata = pc->p2s_initial_metadata.metadata; - refpc(pc, "on_c2p_sent_initial_metadata"); - err = grpc_call_start_batch( - pc->c2p, &op, 1, new_closure(on_c2p_sent_initial_metadata, pc), NULL); - GPR_ASSERT(err == GRPC_CALL_OK); - } - - unrefpc(pc, "on_p2s_recv_initial_metadata"); + if (!pc->proxy->shutdown) + { + op.op = GRPC_OP_SEND_INITIAL_METADATA; + op.flags = 0; + op.reserved = NULL; + op.data.send_initial_metadata.count = pc->p2s_initial_metadata.count; + op.data.send_initial_metadata.metadata = pc->p2s_initial_metadata.metadata; + refpc (pc, "on_c2p_sent_initial_metadata"); + err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_sent_initial_metadata, pc), NULL); + GPR_ASSERT (err == GRPC_CALL_OK); + } + + unrefpc (pc, "on_p2s_recv_initial_metadata"); } -static void on_p2s_sent_initial_metadata(void *arg, int success) { +static void +on_p2s_sent_initial_metadata (void *arg, int success) +{ proxy_call *pc = arg; - unrefpc(pc, "on_p2s_sent_initial_metadata"); + unrefpc (pc, "on_p2s_sent_initial_metadata"); } -static void on_c2p_recv_msg(void *arg, int success); +static void on_c2p_recv_msg (void *arg, int success); -static void on_p2s_sent_message(void *arg, int success) { +static void +on_p2s_sent_message (void *arg, int success) +{ proxy_call *pc = arg; grpc_op op; grpc_call_error err; - grpc_byte_buffer_destroy(pc->c2p_msg); - if (!pc->proxy->shutdown && success) { - op.op = GRPC_OP_RECV_MESSAGE; - op.flags = 0; - op.reserved = NULL; - op.data.recv_message = &pc->c2p_msg; - refpc(pc, "on_c2p_recv_msg"); - err = grpc_call_start_batch(pc->c2p, &op, 1, - new_closure(on_c2p_recv_msg, pc), NULL); - GPR_ASSERT(err == GRPC_CALL_OK); - } - - unrefpc(pc, "on_p2s_sent_message"); + grpc_byte_buffer_destroy (pc->c2p_msg); + if (!pc->proxy->shutdown && success) + { + op.op = GRPC_OP_RECV_MESSAGE; + op.flags = 0; + op.reserved = NULL; + op.data.recv_message = &pc->c2p_msg; + refpc (pc, "on_c2p_recv_msg"); + err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_recv_msg, pc), NULL); + GPR_ASSERT (err == GRPC_CALL_OK); + } + + unrefpc (pc, "on_p2s_sent_message"); } -static void on_p2s_sent_close(void *arg, int success) { +static void +on_p2s_sent_close (void *arg, int success) +{ proxy_call *pc = arg; - unrefpc(pc, "on_p2s_sent_close"); + unrefpc (pc, "on_p2s_sent_close"); } -static void on_c2p_recv_msg(void *arg, int success) { +static void +on_c2p_recv_msg (void *arg, int success) +{ proxy_call *pc = arg; grpc_op op; grpc_call_error err; - if (!pc->proxy->shutdown && success) { - if (pc->c2p_msg != NULL) { - op.op = GRPC_OP_SEND_MESSAGE; - op.flags = 0; - op.reserved = NULL; - op.data.send_message = pc->c2p_msg; - refpc(pc, "on_p2s_sent_message"); - err = grpc_call_start_batch(pc->p2s, &op, 1, - new_closure(on_p2s_sent_message, pc), NULL); - GPR_ASSERT(err == GRPC_CALL_OK); - } else { - op.op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; - op.flags = 0; - op.reserved = NULL; - refpc(pc, "on_p2s_sent_close"); - err = grpc_call_start_batch(pc->p2s, &op, 1, - new_closure(on_p2s_sent_close, pc), NULL); - GPR_ASSERT(err == GRPC_CALL_OK); + if (!pc->proxy->shutdown && success) + { + if (pc->c2p_msg != NULL) + { + op.op = GRPC_OP_SEND_MESSAGE; + op.flags = 0; + op.reserved = NULL; + op.data.send_message = pc->c2p_msg; + refpc (pc, "on_p2s_sent_message"); + err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_sent_message, pc), NULL); + GPR_ASSERT (err == GRPC_CALL_OK); + } + else + { + op.op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; + op.flags = 0; + op.reserved = NULL; + refpc (pc, "on_p2s_sent_close"); + err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_sent_close, pc), NULL); + GPR_ASSERT (err == GRPC_CALL_OK); + } } - } - unrefpc(pc, "on_c2p_recv_msg"); + unrefpc (pc, "on_c2p_recv_msg"); } -static void on_p2s_recv_msg(void *arg, int success); +static void on_p2s_recv_msg (void *arg, int success); -static void on_c2p_sent_message(void *arg, int success) { +static void +on_c2p_sent_message (void *arg, int success) +{ proxy_call *pc = arg; grpc_op op; grpc_call_error err; - grpc_byte_buffer_destroy(pc->p2s_msg); - if (!pc->proxy->shutdown && success) { - op.op = GRPC_OP_RECV_MESSAGE; - op.flags = 0; - op.reserved = NULL; - op.data.recv_message = &pc->p2s_msg; - refpc(pc, "on_p2s_recv_msg"); - err = grpc_call_start_batch(pc->p2s, &op, 1, - new_closure(on_p2s_recv_msg, pc), NULL); - GPR_ASSERT(err == GRPC_CALL_OK); - } - - unrefpc(pc, "on_c2p_sent_message"); + grpc_byte_buffer_destroy (pc->p2s_msg); + if (!pc->proxy->shutdown && success) + { + op.op = GRPC_OP_RECV_MESSAGE; + op.flags = 0; + op.reserved = NULL; + op.data.recv_message = &pc->p2s_msg; + refpc (pc, "on_p2s_recv_msg"); + err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_recv_msg, pc), NULL); + GPR_ASSERT (err == GRPC_CALL_OK); + } + + unrefpc (pc, "on_c2p_sent_message"); } -static void on_p2s_recv_msg(void *arg, int success) { +static void +on_p2s_recv_msg (void *arg, int success) +{ proxy_call *pc = arg; grpc_op op; grpc_call_error err; - if (!pc->proxy->shutdown && success && pc->p2s_msg) { - op.op = GRPC_OP_SEND_MESSAGE; - op.flags = 0; - op.reserved = NULL; - op.data.send_message = pc->p2s_msg; - refpc(pc, "on_c2p_sent_message"); - err = grpc_call_start_batch(pc->c2p, &op, 1, - new_closure(on_c2p_sent_message, pc), NULL); - GPR_ASSERT(err == GRPC_CALL_OK); - } - unrefpc(pc, "on_p2s_recv_msg"); + if (!pc->proxy->shutdown && success && pc->p2s_msg) + { + op.op = GRPC_OP_SEND_MESSAGE; + op.flags = 0; + op.reserved = NULL; + op.data.send_message = pc->p2s_msg; + refpc (pc, "on_c2p_sent_message"); + err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_sent_message, pc), NULL); + GPR_ASSERT (err == GRPC_CALL_OK); + } + unrefpc (pc, "on_p2s_recv_msg"); } -static void on_c2p_sent_status(void *arg, int success) { +static void +on_c2p_sent_status (void *arg, int success) +{ proxy_call *pc = arg; - unrefpc(pc, "on_c2p_sent_status"); + unrefpc (pc, "on_c2p_sent_status"); } -static void on_p2s_status(void *arg, int success) { +static void +on_p2s_status (void *arg, int success) +{ proxy_call *pc = arg; grpc_op op; grpc_call_error err; - if (!pc->proxy->shutdown) { - GPR_ASSERT(success); - op.op = GRPC_OP_SEND_STATUS_FROM_SERVER; - op.flags = 0; - op.reserved = NULL; - op.data.send_status_from_server.trailing_metadata_count = - pc->p2s_trailing_metadata.count; - op.data.send_status_from_server.trailing_metadata = - pc->p2s_trailing_metadata.metadata; - op.data.send_status_from_server.status = pc->p2s_status; - op.data.send_status_from_server.status_details = pc->p2s_status_details; - refpc(pc, "on_c2p_sent_status"); - err = grpc_call_start_batch(pc->c2p, &op, 1, - new_closure(on_c2p_sent_status, pc), NULL); - GPR_ASSERT(err == GRPC_CALL_OK); - } - - unrefpc(pc, "on_p2s_status"); + if (!pc->proxy->shutdown) + { + GPR_ASSERT (success); + op.op = GRPC_OP_SEND_STATUS_FROM_SERVER; + op.flags = 0; + op.reserved = NULL; + op.data.send_status_from_server.trailing_metadata_count = pc->p2s_trailing_metadata.count; + op.data.send_status_from_server.trailing_metadata = pc->p2s_trailing_metadata.metadata; + op.data.send_status_from_server.status = pc->p2s_status; + op.data.send_status_from_server.status_details = pc->p2s_status_details; + refpc (pc, "on_c2p_sent_status"); + err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_sent_status, pc), NULL); + GPR_ASSERT (err == GRPC_CALL_OK); + } + + unrefpc (pc, "on_p2s_status"); } -static void on_c2p_closed(void *arg, int success) { +static void +on_c2p_closed (void *arg, int success) +{ proxy_call *pc = arg; - unrefpc(pc, "on_c2p_closed"); + unrefpc (pc, "on_c2p_closed"); } -static void on_new_call(void *arg, int success) { +static void +on_new_call (void *arg, int success) +{ grpc_end2end_proxy *proxy = arg; grpc_call_error err; - if (success) { - grpc_op op; - proxy_call *pc = gpr_malloc(sizeof(*pc)); - memset(pc, 0, sizeof(*pc)); - pc->proxy = proxy; - GPR_SWAP(grpc_metadata_array, pc->c2p_initial_metadata, - proxy->new_call_metadata); - pc->c2p = proxy->new_call; - pc->p2s = grpc_channel_create_call( - proxy->client, pc->c2p, GRPC_PROPAGATE_DEFAULTS, proxy->cq, - proxy->new_call_details.method, proxy->new_call_details.host, - proxy->new_call_details.deadline, NULL); - gpr_ref_init(&pc->refs, 1); - - op.flags = 0; - op.reserved = NULL; - - op.op = GRPC_OP_RECV_INITIAL_METADATA; - op.data.recv_initial_metadata = &pc->p2s_initial_metadata; - refpc(pc, "on_p2s_recv_initial_metadata"); - err = grpc_call_start_batch( - pc->p2s, &op, 1, new_closure(on_p2s_recv_initial_metadata, pc), NULL); - GPR_ASSERT(err == GRPC_CALL_OK); - - op.op = GRPC_OP_SEND_INITIAL_METADATA; - op.data.send_initial_metadata.count = pc->c2p_initial_metadata.count; - op.data.send_initial_metadata.metadata = pc->c2p_initial_metadata.metadata; - refpc(pc, "on_p2s_sent_initial_metadata"); - err = grpc_call_start_batch( - pc->p2s, &op, 1, new_closure(on_p2s_sent_initial_metadata, pc), NULL); - GPR_ASSERT(err == GRPC_CALL_OK); - - op.op = GRPC_OP_RECV_MESSAGE; - op.data.recv_message = &pc->c2p_msg; - refpc(pc, "on_c2p_recv_msg"); - err = grpc_call_start_batch(pc->c2p, &op, 1, - new_closure(on_c2p_recv_msg, pc), NULL); - GPR_ASSERT(err == GRPC_CALL_OK); - - op.op = GRPC_OP_RECV_MESSAGE; - op.data.recv_message = &pc->p2s_msg; - refpc(pc, "on_p2s_recv_msg"); - err = grpc_call_start_batch(pc->p2s, &op, 1, - new_closure(on_p2s_recv_msg, pc), NULL); - GPR_ASSERT(err == GRPC_CALL_OK); - - op.op = GRPC_OP_RECV_STATUS_ON_CLIENT; - op.data.recv_status_on_client.trailing_metadata = - &pc->p2s_trailing_metadata; - op.data.recv_status_on_client.status = &pc->p2s_status; - op.data.recv_status_on_client.status_details = &pc->p2s_status_details; - op.data.recv_status_on_client.status_details_capacity = - &pc->p2s_status_details_capacity; - refpc(pc, "on_p2s_status"); - err = grpc_call_start_batch(pc->p2s, &op, 1, new_closure(on_p2s_status, pc), - NULL); - GPR_ASSERT(err == GRPC_CALL_OK); - - op.op = GRPC_OP_RECV_CLOSE_ON_SERVER; - op.data.recv_close_on_server.cancelled = &pc->c2p_server_cancelled; - refpc(pc, "on_c2p_closed"); - err = grpc_call_start_batch(pc->c2p, &op, 1, new_closure(on_c2p_closed, pc), - NULL); - GPR_ASSERT(err == GRPC_CALL_OK); - - request_call(proxy); - - unrefpc(pc, "init"); - } else { - GPR_ASSERT(proxy->new_call == NULL); - } + if (success) + { + grpc_op op; + proxy_call *pc = gpr_malloc (sizeof (*pc)); + memset (pc, 0, sizeof (*pc)); + pc->proxy = proxy; + GPR_SWAP (grpc_metadata_array, pc->c2p_initial_metadata, proxy->new_call_metadata); + pc->c2p = proxy->new_call; + pc->p2s = grpc_channel_create_call (proxy->client, pc->c2p, GRPC_PROPAGATE_DEFAULTS, proxy->cq, proxy->new_call_details.method, proxy->new_call_details.host, proxy->new_call_details.deadline, NULL); + gpr_ref_init (&pc->refs, 1); + + op.flags = 0; + op.reserved = NULL; + + op.op = GRPC_OP_RECV_INITIAL_METADATA; + op.data.recv_initial_metadata = &pc->p2s_initial_metadata; + refpc (pc, "on_p2s_recv_initial_metadata"); + err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_recv_initial_metadata, pc), NULL); + GPR_ASSERT (err == GRPC_CALL_OK); + + op.op = GRPC_OP_SEND_INITIAL_METADATA; + op.data.send_initial_metadata.count = pc->c2p_initial_metadata.count; + op.data.send_initial_metadata.metadata = pc->c2p_initial_metadata.metadata; + refpc (pc, "on_p2s_sent_initial_metadata"); + err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_sent_initial_metadata, pc), NULL); + GPR_ASSERT (err == GRPC_CALL_OK); + + op.op = GRPC_OP_RECV_MESSAGE; + op.data.recv_message = &pc->c2p_msg; + refpc (pc, "on_c2p_recv_msg"); + err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_recv_msg, pc), NULL); + GPR_ASSERT (err == GRPC_CALL_OK); + + op.op = GRPC_OP_RECV_MESSAGE; + op.data.recv_message = &pc->p2s_msg; + refpc (pc, "on_p2s_recv_msg"); + err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_recv_msg, pc), NULL); + GPR_ASSERT (err == GRPC_CALL_OK); + + op.op = GRPC_OP_RECV_STATUS_ON_CLIENT; + op.data.recv_status_on_client.trailing_metadata = &pc->p2s_trailing_metadata; + op.data.recv_status_on_client.status = &pc->p2s_status; + op.data.recv_status_on_client.status_details = &pc->p2s_status_details; + op.data.recv_status_on_client.status_details_capacity = &pc->p2s_status_details_capacity; + refpc (pc, "on_p2s_status"); + err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_status, pc), NULL); + GPR_ASSERT (err == GRPC_CALL_OK); + + op.op = GRPC_OP_RECV_CLOSE_ON_SERVER; + op.data.recv_close_on_server.cancelled = &pc->c2p_server_cancelled; + refpc (pc, "on_c2p_closed"); + err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_closed, pc), NULL); + GPR_ASSERT (err == GRPC_CALL_OK); + + request_call (proxy); + + unrefpc (pc, "init"); + } + else + { + GPR_ASSERT (proxy->new_call == NULL); + } } -static void request_call(grpc_end2end_proxy *proxy) { +static void +request_call (grpc_end2end_proxy * proxy) +{ proxy->new_call = NULL; - GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call( - proxy->server, &proxy->new_call, - &proxy->new_call_details, - &proxy->new_call_metadata, proxy->cq, - proxy->cq, new_closure(on_new_call, proxy))); + GPR_ASSERT (GRPC_CALL_OK == grpc_server_request_call (proxy->server, &proxy->new_call, &proxy->new_call_details, &proxy->new_call_metadata, proxy->cq, proxy->cq, new_closure (on_new_call, proxy))); } -static void thread_main(void *arg) { +static void +thread_main (void *arg) +{ grpc_end2end_proxy *proxy = arg; closure *cl; - for (;;) { - grpc_event ev = grpc_completion_queue_next( - proxy->cq, gpr_inf_future(GPR_CLOCK_MONOTONIC), NULL); - switch (ev.type) { - case GRPC_QUEUE_TIMEOUT: - gpr_log(GPR_ERROR, "Should never reach here"); - abort(); - case GRPC_QUEUE_SHUTDOWN: - return; - case GRPC_OP_COMPLETE: - cl = ev.tag; - cl->func(cl->arg, ev.success); - gpr_free(cl); - break; + for (;;) + { + grpc_event ev = grpc_completion_queue_next (proxy->cq, gpr_inf_future (GPR_CLOCK_MONOTONIC), NULL); + switch (ev.type) + { + case GRPC_QUEUE_TIMEOUT: + gpr_log (GPR_ERROR, "Should never reach here"); + abort (); + case GRPC_QUEUE_SHUTDOWN: + return; + case GRPC_OP_COMPLETE: + cl = ev.tag; + cl->func (cl->arg, ev.success); + gpr_free (cl); + break; + } } - } } -const char *grpc_end2end_proxy_get_client_target(grpc_end2end_proxy *proxy) { +const char * +grpc_end2end_proxy_get_client_target (grpc_end2end_proxy * proxy) +{ return proxy->proxy_port; } -const char *grpc_end2end_proxy_get_server_port(grpc_end2end_proxy *proxy) { +const char * +grpc_end2end_proxy_get_server_port (grpc_end2end_proxy * proxy) +{ return proxy->server_port; } diff --git a/test/core/end2end/fixtures/proxy.h b/test/core/end2end/fixtures/proxy.h index c1cf01d39a4..616fa1e10ee 100644 --- a/test/core/end2end/fixtures/proxy.h +++ b/test/core/end2end/fixtures/proxy.h @@ -40,16 +40,16 @@ typedef struct grpc_end2end_proxy grpc_end2end_proxy; -typedef struct grpc_end2end_proxy_def { - grpc_server *(*create_server)(const char *port); - grpc_channel *(*create_client)(const char *target); +typedef struct grpc_end2end_proxy_def +{ + grpc_server *(*create_server) (const char *port); + grpc_channel *(*create_client) (const char *target); } grpc_end2end_proxy_def; -grpc_end2end_proxy *grpc_end2end_proxy_create( - const grpc_end2end_proxy_def *def); -void grpc_end2end_proxy_destroy(grpc_end2end_proxy *proxy); +grpc_end2end_proxy *grpc_end2end_proxy_create (const grpc_end2end_proxy_def * def); +void grpc_end2end_proxy_destroy (grpc_end2end_proxy * proxy); -const char *grpc_end2end_proxy_get_client_target(grpc_end2end_proxy *proxy); -const char *grpc_end2end_proxy_get_server_port(grpc_end2end_proxy *proxy); +const char *grpc_end2end_proxy_get_client_target (grpc_end2end_proxy * proxy); +const char *grpc_end2end_proxy_get_server_port (grpc_end2end_proxy * proxy); #endif /* GRPC_TEST_CORE_END2END_FIXTURES_PROXY_H */ diff --git a/test/core/end2end/multiple_server_queues_test.c b/test/core/end2end/multiple_server_queues_test.c index 5e2eaf4ae94..4d68a2d40df 100644 --- a/test/core/end2end/multiple_server_queues_test.c +++ b/test/core/end2end/multiple_server_queues_test.c @@ -34,30 +34,31 @@ #include #include "test/core/util/test_config.h" -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ grpc_completion_queue *cq1; grpc_completion_queue *cq2; grpc_server *server; - grpc_test_init(argc, argv); - grpc_init(); - cq1 = grpc_completion_queue_create(NULL); - cq2 = grpc_completion_queue_create(NULL); - server = grpc_server_create(NULL, NULL); - grpc_server_register_completion_queue(server, cq1, NULL); - grpc_server_add_insecure_http2_port(server, "[::]:0"); - grpc_server_register_completion_queue(server, cq2, NULL); - grpc_server_start(server); - grpc_server_shutdown_and_notify(server, cq2, NULL); - grpc_completion_queue_next(cq2, gpr_inf_future(GPR_CLOCK_REALTIME), - NULL); /* cue queue hang */ - grpc_completion_queue_shutdown(cq1); - grpc_completion_queue_shutdown(cq2); - grpc_completion_queue_next(cq1, gpr_inf_future(GPR_CLOCK_REALTIME), NULL); - grpc_completion_queue_next(cq2, gpr_inf_future(GPR_CLOCK_REALTIME), NULL); - grpc_server_destroy(server); - grpc_completion_queue_destroy(cq1); - grpc_completion_queue_destroy(cq2); - grpc_shutdown(); + grpc_test_init (argc, argv); + grpc_init (); + cq1 = grpc_completion_queue_create (NULL); + cq2 = grpc_completion_queue_create (NULL); + server = grpc_server_create (NULL, NULL); + grpc_server_register_completion_queue (server, cq1, NULL); + grpc_server_add_insecure_http2_port (server, "[::]:0"); + grpc_server_register_completion_queue (server, cq2, NULL); + grpc_server_start (server); + grpc_server_shutdown_and_notify (server, cq2, NULL); + grpc_completion_queue_next (cq2, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); /* cue queue hang */ + grpc_completion_queue_shutdown (cq1); + grpc_completion_queue_shutdown (cq2); + grpc_completion_queue_next (cq1, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); + grpc_completion_queue_next (cq2, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); + grpc_server_destroy (server); + grpc_completion_queue_destroy (cq1); + grpc_completion_queue_destroy (cq2); + grpc_shutdown (); return 0; } diff --git a/test/core/end2end/no_server_test.c b/test/core/end2end/no_server_test.c index c391003141b..45642dca2b3 100644 --- a/test/core/end2end/no_server_test.c +++ b/test/core/end2end/no_server_test.c @@ -37,12 +37,18 @@ #include "test/core/end2end/cq_verifier.h" #include "test/core/util/test_config.h" -static void *tag(gpr_intptr i) { return (void *)i; } +static void * +tag (gpr_intptr i) +{ + return (void *) i; +} -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ grpc_channel *chan; grpc_call *call; - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(2); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (2); grpc_completion_queue *cq; cq_verifier *cqv; grpc_op ops[6]; @@ -52,18 +58,17 @@ int main(int argc, char **argv) { char *details = NULL; size_t details_capacity = 0; - grpc_test_init(argc, argv); - grpc_init(); + grpc_test_init (argc, argv); + grpc_init (); - grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); - cq = grpc_completion_queue_create(NULL); - cqv = cq_verifier_create(cq); + cq = grpc_completion_queue_create (NULL); + cqv = cq_verifier_create (cq); /* create a call, channel to a non existant server */ - chan = grpc_insecure_channel_create("nonexistant:54321", NULL, NULL); - call = grpc_channel_create_call(chan, NULL, GRPC_PROPAGATE_DEFAULTS, cq, - "/Foo", "nonexistant", deadline, NULL); + chan = grpc_insecure_channel_create ("nonexistant:54321", NULL, NULL); + call = grpc_channel_create_call (chan, NULL, GRPC_PROPAGATE_DEFAULTS, cq, "/Foo", "nonexistant", deadline, NULL); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -79,28 +84,25 @@ int main(int argc, char **argv) { op->flags = 0; op->reserved = NULL; op++; - GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch( - call, ops, (size_t)(op - ops), tag(1), NULL)); + GPR_ASSERT (GRPC_CALL_OK == grpc_call_start_batch (call, ops, (size_t) (op - ops), tag (1), NULL)); /* verify that all tags get completed */ - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_DEADLINE_EXCEEDED); + GPR_ASSERT (status == GRPC_STATUS_DEADLINE_EXCEEDED); - grpc_completion_queue_shutdown(cq); - while ( - grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), NULL) - .type != GRPC_QUEUE_SHUTDOWN) + grpc_completion_queue_shutdown (cq); + while (grpc_completion_queue_next (cq, gpr_inf_future (GPR_CLOCK_REALTIME), NULL).type != GRPC_QUEUE_SHUTDOWN) ; - grpc_completion_queue_destroy(cq); - grpc_call_destroy(call); - grpc_channel_destroy(chan); - cq_verifier_destroy(cqv); + grpc_completion_queue_destroy (cq); + grpc_call_destroy (call); + grpc_channel_destroy (chan); + cq_verifier_destroy (cqv); - gpr_free(details); - grpc_metadata_array_destroy(&trailing_metadata_recv); + gpr_free (details); + grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/end2end/tests/bad_hostname.c b/test/core/end2end/tests/bad_hostname.c index 93e2df1e43b..901b4b2210b 100644 --- a/test/core/end2end/tests/bad_hostname.c +++ b/test/core/end2end/tests/bad_hostname.c @@ -45,64 +45,86 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void simple_request_body(grpc_end2end_test_fixture f) { +static void +simple_request_body (grpc_end2end_test_fixture f) +{ grpc_call *c; - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f.cq); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -114,14 +136,13 @@ static void simple_request_body(grpc_end2end_test_fixture f) { char *details = NULL; size_t details_capacity = 0; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "slartibartfast.local", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "slartibartfast.local", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -146,36 +167,41 @@ static void simple_request_body(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_INVALID_ARGUMENT); + GPR_ASSERT (status == GRPC_STATUS_INVALID_ARGUMENT); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); + grpc_call_destroy (c); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); } -static void test_invoke_simple_request(grpc_end2end_test_config config) { +static void +test_invoke_simple_request (grpc_end2end_test_config config) +{ grpc_end2end_test_fixture f; - f = begin_test(config, "test_invoke_simple_request", NULL, NULL); - simple_request_body(f); - end_test(&f); - config.tear_down_data(&f); + f = begin_test (config, "test_invoke_simple_request", NULL, NULL); + simple_request_body (f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - if (config.feature_mask & FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION) { - test_invoke_simple_request(config); - } +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + if (config.feature_mask & FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION) + { + test_invoke_simple_request (config); + } } diff --git a/test/core/end2end/tests/binary_metadata.c b/test/core/end2end/tests/binary_metadata.c index 21e0bbcc49c..2b32077847a 100644 --- a/test/core/end2end/tests/binary_metadata.c +++ b/test/core/end2end/tests/binary_metadata.c @@ -43,97 +43,117 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } /* Request/response with metadata and payload.*/ -static void test_request_response_with_metadata_and_payload( - grpc_end2end_test_config config) { +static void +test_request_response_with_metadata_and_payload (grpc_end2end_test_config config) +{ grpc_call *c; grpc_call *s; - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); - grpc_byte_buffer *response_payload = - grpc_raw_byte_buffer_create(&response_payload_slice, 1); - gpr_timespec deadline = five_seconds_time(); + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); + gpr_timespec deadline = five_seconds_time (); grpc_metadata meta_c[2] = { - {"key1-bin", - "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc", - 13, - 0, - {{NULL, NULL, NULL, NULL}}}, - {"key2-bin", - "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d", - 14, - 0, - {{NULL, NULL, NULL, NULL}}}}; + {"key1-bin", + "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc", + 13, + 0, + {{NULL, NULL, NULL, NULL}}}, + {"key2-bin", + "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d", + 14, + 0, + {{NULL, NULL, NULL, NULL}}} + }; grpc_metadata meta_s[2] = { - {"key3-bin", - "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee", - 15, - 0, - {{NULL, NULL, NULL, NULL}}}, - {"key4-bin", - "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", - 16, - 0, - {{NULL, NULL, NULL, NULL}}}}; - grpc_end2end_test_fixture f = begin_test( - config, "test_request_response_with_metadata_and_payload", NULL, NULL); - cq_verifier *cqv = cq_verifier_create(f.cq); + {"key3-bin", + "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee", + 15, + 0, + {{NULL, NULL, NULL, NULL}}}, + {"key4-bin", + "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", + 16, + 0, + {{NULL, NULL, NULL, NULL}}} + }; + grpc_end2end_test_fixture f = begin_test (config, "test_request_response_with_metadata_and_payload", NULL, NULL); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -148,14 +168,13 @@ static void test_request_response_with_metadata_and_payload( size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -191,15 +210,13 @@ static void test_request_response_with_metadata_and_payload( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -213,11 +230,11 @@ static void test_request_response_with_metadata_and_payload( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -237,53 +254,47 @@ static void test_request_response_with_metadata_and_payload( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(103), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (103), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_OK); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); - GPR_ASSERT(was_cancelled == 0); - GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); - GPR_ASSERT(byte_buffer_eq_string(response_payload_recv, "hello you")); - GPR_ASSERT(contains_metadata( - &request_metadata_recv, "key1-bin", - "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc")); - GPR_ASSERT(contains_metadata( - &request_metadata_recv, "key2-bin", - "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d")); - GPR_ASSERT(contains_metadata( - &initial_metadata_recv, "key3-bin", - "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee")); - GPR_ASSERT(contains_metadata( - &initial_metadata_recv, "key4-bin", - "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff")); + GPR_ASSERT (status == GRPC_STATUS_OK); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); + GPR_ASSERT (was_cancelled == 0); + GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, "hello world")); + GPR_ASSERT (byte_buffer_eq_string (response_payload_recv, "hello you")); + GPR_ASSERT (contains_metadata (&request_metadata_recv, "key1-bin", "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc")); + GPR_ASSERT (contains_metadata (&request_metadata_recv, "key2-bin", "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d")); + GPR_ASSERT (contains_metadata (&initial_metadata_recv, "key3-bin", "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee")); + GPR_ASSERT (contains_metadata (&initial_metadata_recv, "key4-bin", "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff")); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(response_payload); - grpc_byte_buffer_destroy(request_payload_recv); - grpc_byte_buffer_destroy(response_payload_recv); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (response_payload); + grpc_byte_buffer_destroy (request_payload_recv); + grpc_byte_buffer_destroy (response_payload_recv); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_request_response_with_metadata_and_payload(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_request_response_with_metadata_and_payload (config); } diff --git a/test/core/end2end/tests/call_creds.c b/test/core/end2end/tests/call_creds.c index 4e905aafc7a..a8ec505ffb8 100644 --- a/test/core/end2end/tests/call_creds.c +++ b/test/core/end2end/tests/call_creds.c @@ -51,120 +51,147 @@ static const char iam_selector[] = "selector"; static const char overridden_iam_token[] = "overridden_token"; static const char overridden_iam_selector[] = "overridden_selector"; -typedef enum { NONE, OVERRIDE, DESTROY } override_mode; +typedef enum +{ NONE, OVERRIDE, DESTROY } override_mode; -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - int fail_server_auth_check) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, int fail_server_auth_check) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(NULL, NULL); - config.init_client(&f, NULL); - if (fail_server_auth_check) { - grpc_arg fail_auth_arg = { - GRPC_ARG_STRING, FAIL_AUTH_CHECK_SERVER_ARG_NAME, {NULL}}; - grpc_channel_args args; - args.num_args = 1; - args.args = &fail_auth_arg; - config.init_server(&f, &args); - } else { - config.init_server(&f, NULL); - } + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (NULL, NULL); + config.init_client (&f, NULL); + if (fail_server_auth_check) + { + grpc_arg fail_auth_arg = { + GRPC_ARG_STRING, FAIL_AUTH_CHECK_SERVER_ARG_NAME, {NULL} + }; + grpc_channel_args args; + args.num_args = 1; + args.args = &fail_auth_arg; + config.init_server (&f, &args); + } + else + { + config.init_server (&f, NULL); + } return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void print_auth_context(int is_client, const grpc_auth_context *ctx) { +static void +print_auth_context (int is_client, const grpc_auth_context * ctx) +{ const grpc_auth_property *p; grpc_auth_property_iterator it; - gpr_log(GPR_INFO, "%s peer:", is_client ? "client" : "server"); - gpr_log(GPR_INFO, "\tauthenticated: %s", - grpc_auth_context_peer_is_authenticated(ctx) ? "YES" : "NO"); - it = grpc_auth_context_peer_identity(ctx); - while ((p = grpc_auth_property_iterator_next(&it)) != NULL) { - gpr_log(GPR_INFO, "\t\t%s: %s", p->name, p->value); - } - gpr_log(GPR_INFO, "\tall properties:"); - it = grpc_auth_context_property_iterator(ctx); - while ((p = grpc_auth_property_iterator_next(&it)) != NULL) { - gpr_log(GPR_INFO, "\t\t%s: %s", p->name, p->value); - } + gpr_log (GPR_INFO, "%s peer:", is_client ? "client" : "server"); + gpr_log (GPR_INFO, "\tauthenticated: %s", grpc_auth_context_peer_is_authenticated (ctx) ? "YES" : "NO"); + it = grpc_auth_context_peer_identity (ctx); + while ((p = grpc_auth_property_iterator_next (&it)) != NULL) + { + gpr_log (GPR_INFO, "\t\t%s: %s", p->name, p->value); + } + gpr_log (GPR_INFO, "\tall properties:"); + it = grpc_auth_context_property_iterator (ctx); + while ((p = grpc_auth_property_iterator_next (&it)) != NULL) + { + gpr_log (GPR_INFO, "\t\t%s: %s", p->name, p->value); + } } -static void test_call_creds_failure(grpc_end2end_test_config config) { +static void +test_call_creds_failure (grpc_end2end_test_config config) +{ grpc_call *c; grpc_credentials *creds = NULL; - grpc_end2end_test_fixture f = - begin_test(config, "test_call_creds_failure", 0); - gpr_timespec deadline = five_seconds_time(); - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + grpc_end2end_test_fixture f = begin_test (config, "test_call_creds_failure", 0); + gpr_timespec deadline = five_seconds_time (); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); /* Try with credentials unfit to be set on a call (channel creds). */ - creds = grpc_fake_transport_security_credentials_create(); - GPR_ASSERT(grpc_call_set_credentials(c, creds) != GRPC_CALL_OK); - grpc_credentials_release(creds); + creds = grpc_fake_transport_security_credentials_create (); + GPR_ASSERT (grpc_call_set_credentials (c, creds) != GRPC_CALL_OK); + grpc_credentials_release (creds); - grpc_call_destroy(c); + grpc_call_destroy (c); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -static void request_response_with_payload_and_call_creds( - const char *test_name, grpc_end2end_test_config config, - override_mode mode) { +static void +request_response_with_payload_and_call_creds (const char *test_name, grpc_end2end_test_config config, override_mode mode) +{ grpc_call *c; grpc_call *s; - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); - grpc_byte_buffer *response_payload = - grpc_raw_byte_buffer_create(&response_payload_slice, 1); - gpr_timespec deadline = five_seconds_time(); + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); + gpr_timespec deadline = five_seconds_time (); grpc_end2end_test_fixture f; cq_verifier *cqv; grpc_op ops[6]; @@ -184,35 +211,34 @@ static void request_response_with_payload_and_call_creds( grpc_auth_context *s_auth_context = NULL; grpc_auth_context *c_auth_context = NULL; - f = begin_test(config, test_name, 0); - cqv = cq_verifier_create(f.cq); + f = begin_test (config, test_name, 0); + cqv = cq_verifier_create (f.cq); - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); - creds = grpc_google_iam_credentials_create(iam_token, iam_selector, NULL); - GPR_ASSERT(creds != NULL); - GPR_ASSERT(grpc_call_set_credentials(c, creds) == GRPC_CALL_OK); - switch (mode) { + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); + creds = grpc_google_iam_credentials_create (iam_token, iam_selector, NULL); + GPR_ASSERT (creds != NULL); + GPR_ASSERT (grpc_call_set_credentials (c, creds) == GRPC_CALL_OK); + switch (mode) + { case NONE: break; case OVERRIDE: - grpc_credentials_release(creds); - creds = grpc_google_iam_credentials_create(overridden_iam_token, - overridden_iam_selector, NULL); - GPR_ASSERT(creds != NULL); - GPR_ASSERT(grpc_call_set_credentials(c, creds) == GRPC_CALL_OK); + grpc_credentials_release (creds); + creds = grpc_google_iam_credentials_create (overridden_iam_token, overridden_iam_selector, NULL); + GPR_ASSERT (creds != NULL); + GPR_ASSERT (grpc_call_set_credentials (c, creds) == GRPC_CALL_OK); break; case DESTROY: - GPR_ASSERT(grpc_call_set_credentials(c, NULL) == GRPC_CALL_OK); + GPR_ASSERT (grpc_call_set_credentials (c, NULL) == GRPC_CALL_OK); break; - } - grpc_credentials_release(creds); + } + grpc_credentials_release (creds); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -247,27 +273,25 @@ static void request_response_with_payload_and_call_creds( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); - s_auth_context = grpc_call_auth_context(s); - GPR_ASSERT(s_auth_context != NULL); - print_auth_context(0, s_auth_context); - grpc_auth_context_release(s_auth_context); - - c_auth_context = grpc_call_auth_context(c); - GPR_ASSERT(c_auth_context != NULL); - print_auth_context(1, c_auth_context); - grpc_auth_context_release(c_auth_context); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); + s_auth_context = grpc_call_auth_context (s); + GPR_ASSERT (s_auth_context != NULL); + print_auth_context (0, s_auth_context); + grpc_auth_context_release (s_auth_context); + + c_auth_context = grpc_call_auth_context (c); + GPR_ASSERT (c_auth_context != NULL); + print_auth_context (1, c_auth_context); + grpc_auth_context_release (c_auth_context); /* Cannot set creds on the server call object. */ - GPR_ASSERT(grpc_call_set_credentials(s, NULL) != GRPC_CALL_OK); + GPR_ASSERT (grpc_call_set_credentials (s, NULL) != GRPC_CALL_OK); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -280,11 +304,11 @@ static void request_response_with_payload_and_call_creds( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -304,101 +328,85 @@ static void request_response_with_payload_and_call_creds( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - - cq_expect_completion(cqv, tag(103), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); - - GPR_ASSERT(status == GRPC_STATUS_OK); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); - GPR_ASSERT(was_cancelled == 0); - GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); - GPR_ASSERT(byte_buffer_eq_string(response_payload_recv, "hello you")); - - switch (mode) { + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + + cq_expect_completion (cqv, tag (103), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); + + GPR_ASSERT (status == GRPC_STATUS_OK); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); + GPR_ASSERT (was_cancelled == 0); + GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, "hello world")); + GPR_ASSERT (byte_buffer_eq_string (response_payload_recv, "hello you")); + + switch (mode) + { case NONE: - GPR_ASSERT(contains_metadata(&request_metadata_recv, - GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, - iam_token)); - GPR_ASSERT(contains_metadata(&request_metadata_recv, - GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, - iam_selector)); + GPR_ASSERT (contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, iam_token)); + GPR_ASSERT (contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, iam_selector)); break; case OVERRIDE: - GPR_ASSERT(contains_metadata(&request_metadata_recv, - GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, - overridden_iam_token)); - GPR_ASSERT(contains_metadata(&request_metadata_recv, - GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, - overridden_iam_selector)); + GPR_ASSERT (contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, overridden_iam_token)); + GPR_ASSERT (contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, overridden_iam_selector)); break; case DESTROY: - GPR_ASSERT(!contains_metadata(&request_metadata_recv, - GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, - iam_token)); - GPR_ASSERT(!contains_metadata(&request_metadata_recv, - GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, - iam_selector)); - GPR_ASSERT(!contains_metadata(&request_metadata_recv, - GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, - overridden_iam_token)); - GPR_ASSERT(!contains_metadata(&request_metadata_recv, - GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, - overridden_iam_selector)); + GPR_ASSERT (!contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, iam_token)); + GPR_ASSERT (!contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, iam_selector)); + GPR_ASSERT (!contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, overridden_iam_token)); + GPR_ASSERT (!contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, overridden_iam_selector)); break; - } + } - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(response_payload); - grpc_byte_buffer_destroy(request_payload_recv); - grpc_byte_buffer_destroy(response_payload_recv); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (response_payload); + grpc_byte_buffer_destroy (request_payload_recv); + grpc_byte_buffer_destroy (response_payload_recv); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -static void test_request_response_with_payload_and_call_creds( - grpc_end2end_test_config config) { - request_response_with_payload_and_call_creds( - "test_request_response_with_payload_and_call_creds", config, NONE); +static void +test_request_response_with_payload_and_call_creds (grpc_end2end_test_config config) +{ + request_response_with_payload_and_call_creds ("test_request_response_with_payload_and_call_creds", config, NONE); } -static void test_request_response_with_payload_and_overridden_call_creds( - grpc_end2end_test_config config) { - request_response_with_payload_and_call_creds( - "test_request_response_with_payload_and_overridden_call_creds", config, - OVERRIDE); +static void +test_request_response_with_payload_and_overridden_call_creds (grpc_end2end_test_config config) +{ + request_response_with_payload_and_call_creds ("test_request_response_with_payload_and_overridden_call_creds", config, OVERRIDE); } -static void test_request_response_with_payload_and_deleted_call_creds( - grpc_end2end_test_config config) { - request_response_with_payload_and_call_creds( - "test_request_response_with_payload_and_deleted_call_creds", config, - DESTROY); +static void +test_request_response_with_payload_and_deleted_call_creds (grpc_end2end_test_config config) +{ + request_response_with_payload_and_call_creds ("test_request_response_with_payload_and_deleted_call_creds", config, DESTROY); } -static void test_request_with_server_rejecting_client_creds( - grpc_end2end_test_config config) { +static void +test_request_with_server_rejecting_client_creds (grpc_end2end_test_config config) +{ grpc_op ops[6]; grpc_op *op; grpc_call *c; grpc_end2end_test_fixture f; - gpr_timespec deadline = five_seconds_time(); + gpr_timespec deadline = five_seconds_time (); cq_verifier *cqv; grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; @@ -409,27 +417,25 @@ static void test_request_with_server_rejecting_client_creds( char *details = NULL; size_t details_capacity = 0; grpc_byte_buffer *response_payload_recv = NULL; - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); grpc_credentials *creds; - f = begin_test(config, "test_request_with_server_rejecting_client_creds", 1); - cqv = cq_verifier_create(f.cq); + f = begin_test (config, "test_request_with_server_rejecting_client_creds", 1); + cqv = cq_verifier_create (f.cq); - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - creds = grpc_google_iam_credentials_create(iam_token, iam_selector, NULL); - GPR_ASSERT(creds != NULL); - GPR_ASSERT(grpc_call_set_credentials(c, creds) == GRPC_CALL_OK); - grpc_credentials_release(creds); + creds = grpc_google_iam_credentials_create (iam_token, iam_selector, NULL); + GPR_ASSERT (creds != NULL); + GPR_ASSERT (grpc_call_set_credentials (c, creds) == GRPC_CALL_OK); + grpc_credentials_release (creds); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; @@ -464,36 +470,39 @@ static void test_request_with_server_rejecting_client_creds( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(error == GRPC_CALL_OK); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (error == GRPC_CALL_OK); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_UNAUTHENTICATED); + GPR_ASSERT (status == GRPC_STATUS_UNAUTHENTICATED); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(response_payload_recv); - gpr_free(details); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (response_payload_recv); + gpr_free (details); - grpc_call_destroy(c); + grpc_call_destroy (c); - cq_verifier_destroy(cqv); - end_test(&f); - config.tear_down_data(&f); + cq_verifier_destroy (cqv); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - if (config.feature_mask & FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS) { - test_call_creds_failure(config); - test_request_response_with_payload_and_call_creds(config); - test_request_response_with_payload_and_overridden_call_creds(config); - test_request_response_with_payload_and_deleted_call_creds(config); - test_request_with_server_rejecting_client_creds(config); - } +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + if (config.feature_mask & FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS) + { + test_call_creds_failure (config); + test_request_response_with_payload_and_call_creds (config); + test_request_response_with_payload_and_overridden_call_creds (config); + test_request_response_with_payload_and_deleted_call_creds (config); + test_request_with_server_rejecting_client_creds (config); + } } diff --git a/test/core/end2end/tests/cancel_after_accept.c b/test/core/end2end/tests/cancel_after_accept.c index 10e62275ab0..bbef223229f 100644 --- a/test/core/end2end/tests/cancel_after_accept.c +++ b/test/core/end2end/tests/cancel_after_accept.c @@ -44,71 +44,91 @@ #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/tests/cancel_test_helpers.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } /* Cancel after accept, no payload */ -static void test_cancel_after_accept(grpc_end2end_test_config config, - cancellation_mode mode) { +static void +test_cancel_after_accept (grpc_end2end_test_config config, cancellation_mode mode) +{ grpc_op ops[6]; grpc_op *op; grpc_call *c; grpc_call *s; - grpc_end2end_test_fixture f = - begin_test(config, "cancel_after_accept", NULL, NULL); - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f.cq); + grpc_end2end_test_fixture f = begin_test (config, "cancel_after_accept", NULL, NULL); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; grpc_metadata_array request_metadata_recv; @@ -119,22 +139,19 @@ static void test_cancel_after_accept(grpc_end2end_test_config config, size_t details_capacity = 0; grpc_byte_buffer *request_payload_recv = NULL; grpc_byte_buffer *response_payload_recv = NULL; - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); - grpc_byte_buffer *response_payload = - grpc_raw_byte_buffer_create(&response_payload_slice, 1); + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); int was_cancelled = 2; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; @@ -165,14 +182,13 @@ static void test_cancel_after_accept(grpc_end2end_test_config config, op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(2)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(2), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (2)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (2), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_RECV_MESSAGE; @@ -195,41 +211,44 @@ static void test_cancel_after_accept(grpc_end2end_test_config config, op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(3), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (3), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c, NULL)); + GPR_ASSERT (GRPC_CALL_OK == mode.initiate_cancel (c, NULL)); - cq_expect_completion(cqv, tag(3), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (3), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == mode.expect_status || status == GRPC_STATUS_INTERNAL); - GPR_ASSERT(was_cancelled == 1); + GPR_ASSERT (status == mode.expect_status || status == GRPC_STATUS_INTERNAL); + GPR_ASSERT (was_cancelled == 1); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(response_payload); - grpc_byte_buffer_destroy(request_payload_recv); - grpc_byte_buffer_destroy(response_payload_recv); - gpr_free(details); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (response_payload); + grpc_byte_buffer_destroy (request_payload_recv); + grpc_byte_buffer_destroy (response_payload_recv); + gpr_free (details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); - end_test(&f); - config.tear_down_data(&f); + cq_verifier_destroy (cqv); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ unsigned i; - for (i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); i++) { - test_cancel_after_accept(config, cancellation_modes[i]); - } + for (i = 0; i < GPR_ARRAY_SIZE (cancellation_modes); i++) + { + test_cancel_after_accept (config, cancellation_modes[i]); + } } diff --git a/test/core/end2end/tests/cancel_after_client_done.c b/test/core/end2end/tests/cancel_after_client_done.c index 4fed5be5f79..b02d40c250c 100644 --- a/test/core/end2end/tests/cancel_after_client_done.c +++ b/test/core/end2end/tests/cancel_after_client_done.c @@ -44,71 +44,91 @@ #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/tests/cancel_test_helpers.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } /* Cancel after accept with a writes closed, no payload */ -static void test_cancel_after_accept_and_writes_closed( - grpc_end2end_test_config config, cancellation_mode mode) { +static void +test_cancel_after_accept_and_writes_closed (grpc_end2end_test_config config, cancellation_mode mode) +{ grpc_op ops[6]; grpc_op *op; grpc_call *c; grpc_call *s; - grpc_end2end_test_fixture f = begin_test( - config, "test_cancel_after_accept_and_writes_closed", NULL, NULL); - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f.cq); + grpc_end2end_test_fixture f = begin_test (config, "test_cancel_after_accept_and_writes_closed", NULL, NULL); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; grpc_metadata_array request_metadata_recv; @@ -119,22 +139,19 @@ static void test_cancel_after_accept_and_writes_closed( size_t details_capacity = 0; grpc_byte_buffer *request_payload_recv = NULL; grpc_byte_buffer *response_payload_recv = NULL; - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); - grpc_byte_buffer *response_payload = - grpc_raw_byte_buffer_create(&response_payload_slice, 1); + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); int was_cancelled = 2; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; @@ -169,14 +186,13 @@ static void test_cancel_after_accept_and_writes_closed( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(2)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(2), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (2)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (2), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_RECV_MESSAGE; @@ -199,41 +215,44 @@ static void test_cancel_after_accept_and_writes_closed( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(3), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (3), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c, NULL)); + GPR_ASSERT (GRPC_CALL_OK == mode.initiate_cancel (c, NULL)); - cq_expect_completion(cqv, tag(3), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (3), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == mode.expect_status || status == GRPC_STATUS_INTERNAL); - GPR_ASSERT(was_cancelled == 1); + GPR_ASSERT (status == mode.expect_status || status == GRPC_STATUS_INTERNAL); + GPR_ASSERT (was_cancelled == 1); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(response_payload); - grpc_byte_buffer_destroy(request_payload_recv); - grpc_byte_buffer_destroy(response_payload_recv); - gpr_free(details); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (response_payload); + grpc_byte_buffer_destroy (request_payload_recv); + grpc_byte_buffer_destroy (response_payload_recv); + gpr_free (details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); - end_test(&f); - config.tear_down_data(&f); + cq_verifier_destroy (cqv); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ unsigned i; - for (i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); i++) { - test_cancel_after_accept_and_writes_closed(config, cancellation_modes[i]); - } + for (i = 0; i < GPR_ARRAY_SIZE (cancellation_modes); i++) + { + test_cancel_after_accept_and_writes_closed (config, cancellation_modes[i]); + } } diff --git a/test/core/end2end/tests/cancel_after_invoke.c b/test/core/end2end/tests/cancel_after_invoke.c index 40595e4c7b9..4f83a3ea7ca 100644 --- a/test/core/end2end/tests/cancel_after_invoke.c +++ b/test/core/end2end/tests/cancel_after_invoke.c @@ -44,71 +44,90 @@ #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/tests/cancel_test_helpers.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - cancellation_mode mode, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, cancellation_mode mode, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s/%s", test_name, config.name, mode.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s/%s", test_name, config.name, mode.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } /* Cancel after invoke, no payload */ -static void test_cancel_after_invoke(grpc_end2end_test_config config, - cancellation_mode mode, size_t test_ops) { +static void +test_cancel_after_invoke (grpc_end2end_test_config config, cancellation_mode mode, size_t test_ops) +{ grpc_op ops[6]; grpc_op *op; grpc_call *c; - grpc_end2end_test_fixture f = - begin_test(config, "test_cancel_after_invoke", mode, NULL, NULL); - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f.cq); + grpc_end2end_test_fixture f = begin_test (config, "test_cancel_after_invoke", mode, NULL, NULL); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; grpc_metadata_array request_metadata_recv; @@ -118,18 +137,16 @@ static void test_cancel_after_invoke(grpc_end2end_test_config config, char *details = NULL; size_t details_capacity = 0; grpc_byte_buffer *response_payload_recv = NULL; - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; @@ -164,38 +181,42 @@ static void test_cancel_after_invoke(grpc_end2end_test_config config, op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, test_ops, tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, test_ops, tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c, NULL)); + GPR_ASSERT (GRPC_CALL_OK == mode.initiate_cancel (c, NULL)); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == mode.expect_status || status == GRPC_STATUS_INTERNAL); + GPR_ASSERT (status == mode.expect_status || status == GRPC_STATUS_INTERNAL); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(response_payload_recv); - gpr_free(details); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (response_payload_recv); + gpr_free (details); - grpc_call_destroy(c); + grpc_call_destroy (c); - cq_verifier_destroy(cqv); - end_test(&f); - config.tear_down_data(&f); + cq_verifier_destroy (cqv); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ unsigned i, j; - for (j = 2; j < 6; j++) { - for (i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); i++) { - test_cancel_after_invoke(config, cancellation_modes[i], j); + for (j = 2; j < 6; j++) + { + for (i = 0; i < GPR_ARRAY_SIZE (cancellation_modes); i++) + { + test_cancel_after_invoke (config, cancellation_modes[i], j); + } } - } } diff --git a/test/core/end2end/tests/cancel_before_invoke.c b/test/core/end2end/tests/cancel_before_invoke.c index c049e0c2d63..065ed43ebd7 100644 --- a/test/core/end2end/tests/cancel_before_invoke.c +++ b/test/core/end2end/tests/cancel_before_invoke.c @@ -43,70 +43,90 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } /* Cancel before invoke */ -static void test_cancel_before_invoke(grpc_end2end_test_config config, - size_t test_ops) { +static void +test_cancel_before_invoke (grpc_end2end_test_config config, size_t test_ops) +{ grpc_op ops[6]; grpc_op *op; grpc_call *c; - grpc_end2end_test_fixture f = - begin_test(config, "cancel_before_invoke", NULL, NULL); - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f.cq); + grpc_end2end_test_fixture f = begin_test (config, "cancel_before_invoke", NULL, NULL); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; grpc_metadata_array request_metadata_recv; @@ -116,20 +136,18 @@ static void test_cancel_before_invoke(grpc_end2end_test_config config, char *details = NULL; size_t details_capacity = 0; grpc_byte_buffer *response_payload_recv = NULL; - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - GPR_ASSERT(GRPC_CALL_OK == grpc_call_cancel(c, NULL)); + GPR_ASSERT (GRPC_CALL_OK == grpc_call_cancel (c, NULL)); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; @@ -164,33 +182,36 @@ static void test_cancel_before_invoke(grpc_end2end_test_config config, op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, test_ops, tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, test_ops, tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_CANCELLED); + GPR_ASSERT (status == GRPC_STATUS_CANCELLED); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(response_payload_recv); - gpr_free(details); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (response_payload_recv); + gpr_free (details); - grpc_call_destroy(c); + grpc_call_destroy (c); - cq_verifier_destroy(cqv); - end_test(&f); - config.tear_down_data(&f); + cq_verifier_destroy (cqv); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ size_t i; - for (i = 1; i <= 6; i++) { - test_cancel_before_invoke(config, i); - } + for (i = 1; i <= 6; i++) + { + test_cancel_before_invoke (config, i); + } } diff --git a/test/core/end2end/tests/cancel_in_a_vacuum.c b/test/core/end2end/tests/cancel_in_a_vacuum.c index 6c63d7c0ad9..512bceb6e57 100644 --- a/test/core/end2end/tests/cancel_in_a_vacuum.c +++ b/test/core/end2end/tests/cancel_in_a_vacuum.c @@ -44,86 +44,108 @@ #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/tests/cancel_test_helpers.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } /* Cancel and do nothing */ -static void test_cancel_in_a_vacuum(grpc_end2end_test_config config, - cancellation_mode mode) { +static void +test_cancel_in_a_vacuum (grpc_end2end_test_config config, cancellation_mode mode) +{ grpc_call *c; - grpc_end2end_test_fixture f = - begin_test(config, "test_cancel_in_a_vacuum", NULL, NULL); - gpr_timespec deadline = five_seconds_time(); - cq_verifier *v_client = cq_verifier_create(f.cq); + grpc_end2end_test_fixture f = begin_test (config, "test_cancel_in_a_vacuum", NULL, NULL); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *v_client = cq_verifier_create (f.cq); - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c, NULL)); + GPR_ASSERT (GRPC_CALL_OK == mode.initiate_cancel (c, NULL)); - grpc_call_destroy(c); + grpc_call_destroy (c); - cq_verifier_destroy(v_client); - end_test(&f); - config.tear_down_data(&f); + cq_verifier_destroy (v_client); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ unsigned i; - for (i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); i++) { - test_cancel_in_a_vacuum(config, cancellation_modes[i]); - } + for (i = 0; i < GPR_ARRAY_SIZE (cancellation_modes); i++) + { + test_cancel_in_a_vacuum (config, cancellation_modes[i]); + } } diff --git a/test/core/end2end/tests/cancel_test_helpers.h b/test/core/end2end/tests/cancel_test_helpers.h index f8fafae597c..20bcfc86aa3 100644 --- a/test/core/end2end/tests/cancel_test_helpers.h +++ b/test/core/end2end/tests/cancel_test_helpers.h @@ -34,22 +34,25 @@ #ifndef GRPC_TEST_CORE_END2END_TESTS_CANCEL_TEST_HELPERS_H #define GRPC_TEST_CORE_END2END_TESTS_CANCEL_TEST_HELPERS_H -typedef struct { +typedef struct +{ const char *name; - grpc_call_error (*initiate_cancel)(grpc_call *call, void *reserved); + grpc_call_error (*initiate_cancel) (grpc_call * call, void *reserved); grpc_status_code expect_status; const char *expect_details; } cancellation_mode; -static grpc_call_error wait_for_deadline(grpc_call *call, void *reserved) { - (void)reserved; +static grpc_call_error +wait_for_deadline (grpc_call * call, void *reserved) +{ + (void) reserved; return GRPC_CALL_OK; } static const cancellation_mode cancellation_modes[] = { - {"cancel", grpc_call_cancel, GRPC_STATUS_CANCELLED, "Cancelled"}, - {"deadline", wait_for_deadline, GRPC_STATUS_DEADLINE_EXCEEDED, - "Deadline Exceeded"}, + {"cancel", grpc_call_cancel, GRPC_STATUS_CANCELLED, "Cancelled"}, + {"deadline", wait_for_deadline, GRPC_STATUS_DEADLINE_EXCEEDED, + "Deadline Exceeded"}, }; #endif /* GRPC_TEST_CORE_END2END_TESTS_CANCEL_TEST_HELPERS_H */ diff --git a/test/core/end2end/tests/census_simple_request.c b/test/core/end2end/tests/census_simple_request.c index adf855ca60b..71fd9e0e491 100644 --- a/test/core/end2end/tests/census_simple_request.c +++ b/test/core/end2end/tests/census_simple_request.c @@ -45,61 +45,78 @@ #include #include "test/core/end2end/cq_verifier.h" -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, n_seconds_time(5), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, n_seconds_time (5), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void test_body(grpc_end2end_test_fixture f) { +static void +test_body (grpc_end2end_test_fixture f) +{ grpc_call *c; grpc_call *s; - gpr_timespec deadline = n_seconds_time(5); - cq_verifier *cqv = cq_verifier_create(f.cq); + gpr_timespec deadline = n_seconds_time (5); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -112,15 +129,13 @@ static void test_body(grpc_end2end_test_fixture f) { size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr:1234", deadline, - NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr:1234", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -145,15 +160,13 @@ static void test_body(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -173,34 +186,34 @@ static void test_body(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT(was_cancelled == 1); + GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT (was_cancelled == 1); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); } -static void test_invoke_request_with_census( - grpc_end2end_test_config config, const char *name, - void (*body)(grpc_end2end_test_fixture f)) { +static void +test_invoke_request_with_census (grpc_end2end_test_config config, const char *name, void (*body) (grpc_end2end_test_fixture f)) +{ char *fullname; grpc_end2end_test_fixture f; grpc_arg client_arg, server_arg; @@ -219,14 +232,16 @@ static void test_invoke_request_with_census( server_args.num_args = 1; server_args.args = &server_arg; - gpr_asprintf(&fullname, "%s/%s", "test_invoke_request_with_census", name); - f = begin_test(config, fullname, &client_args, &server_args); - body(f); - end_test(&f); - config.tear_down_data(&f); - gpr_free(fullname); + gpr_asprintf (&fullname, "%s/%s", "test_invoke_request_with_census", name); + f = begin_test (config, fullname, &client_args, &server_args); + body (f); + end_test (&f); + config.tear_down_data (&f); + gpr_free (fullname); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_invoke_request_with_census(config, "census_simple_request", test_body); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_invoke_request_with_census (config, "census_simple_request", test_body); } diff --git a/test/core/end2end/tests/channel_connectivity.c b/test/core/end2end/tests/channel_connectivity.c index 0b7a8a664b1..54e719e545f 100644 --- a/test/core/end2end/tests/channel_connectivity.c +++ b/test/core/end2end/tests/channel_connectivity.c @@ -38,101 +38,95 @@ #include "test/core/end2end/cq_verifier.h" -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static void test_connectivity(grpc_end2end_test_config config) { - grpc_end2end_test_fixture f = config.create_fixture(NULL, NULL); +static void +test_connectivity (grpc_end2end_test_config config) +{ + grpc_end2end_test_fixture f = config.create_fixture (NULL, NULL); grpc_connectivity_state state; - cq_verifier *cqv = cq_verifier_create(f.cq); + cq_verifier *cqv = cq_verifier_create (f.cq); - config.init_client(&f, NULL); + config.init_client (&f, NULL); /* channels should start life in IDLE, and stay there */ - GPR_ASSERT(grpc_channel_check_connectivity_state(f.client, 0) == - GRPC_CHANNEL_IDLE); - gpr_sleep_until(GRPC_TIMEOUT_MILLIS_TO_DEADLINE(100)); - GPR_ASSERT(grpc_channel_check_connectivity_state(f.client, 0) == - GRPC_CHANNEL_IDLE); + GPR_ASSERT (grpc_channel_check_connectivity_state (f.client, 0) == GRPC_CHANNEL_IDLE); + gpr_sleep_until (GRPC_TIMEOUT_MILLIS_TO_DEADLINE (100)); + GPR_ASSERT (grpc_channel_check_connectivity_state (f.client, 0) == GRPC_CHANNEL_IDLE); /* start watching for a change */ - grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_IDLE, - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), - f.cq, tag(1)); + grpc_channel_watch_connectivity_state (f.client, GRPC_CHANNEL_IDLE, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (3), f.cq, tag (1)); /* nothing should happen */ - cq_verify_empty(cqv); + cq_verify_empty (cqv); /* check that we're still in idle, and start connecting */ - GPR_ASSERT(grpc_channel_check_connectivity_state(f.client, 1) == - GRPC_CHANNEL_IDLE); + GPR_ASSERT (grpc_channel_check_connectivity_state (f.client, 1) == GRPC_CHANNEL_IDLE); /* and now the watch should trigger */ - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); - state = grpc_channel_check_connectivity_state(f.client, 0); - GPR_ASSERT(state == GRPC_CHANNEL_TRANSIENT_FAILURE || - state == GRPC_CHANNEL_CONNECTING); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); + state = grpc_channel_check_connectivity_state (f.client, 0); + GPR_ASSERT (state == GRPC_CHANNEL_TRANSIENT_FAILURE || state == GRPC_CHANNEL_CONNECTING); /* quickly followed by a transition to TRANSIENT_FAILURE */ - grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_CONNECTING, - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), - f.cq, tag(2)); - cq_expect_completion(cqv, tag(2), 1); - cq_verify(cqv); - state = grpc_channel_check_connectivity_state(f.client, 0); - GPR_ASSERT(state == GRPC_CHANNEL_TRANSIENT_FAILURE || - state == GRPC_CHANNEL_CONNECTING); + grpc_channel_watch_connectivity_state (f.client, GRPC_CHANNEL_CONNECTING, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (3), f.cq, tag (2)); + cq_expect_completion (cqv, tag (2), 1); + cq_verify (cqv); + state = grpc_channel_check_connectivity_state (f.client, 0); + GPR_ASSERT (state == GRPC_CHANNEL_TRANSIENT_FAILURE || state == GRPC_CHANNEL_CONNECTING); - gpr_log(GPR_DEBUG, "*** STARTING SERVER ***"); + gpr_log (GPR_DEBUG, "*** STARTING SERVER ***"); /* now let's bring up a server to connect to */ - config.init_server(&f, NULL); + config.init_server (&f, NULL); - gpr_log(GPR_DEBUG, "*** STARTED SERVER ***"); + gpr_log (GPR_DEBUG, "*** STARTED SERVER ***"); /* we'll go through some set of transitions (some might be missed), until READY is reached */ - while (state != GRPC_CHANNEL_READY) { - grpc_channel_watch_connectivity_state( - f.client, state, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), f.cq, tag(3)); - cq_expect_completion(cqv, tag(3), 1); - cq_verify(cqv); - state = grpc_channel_check_connectivity_state(f.client, 0); - GPR_ASSERT(state == GRPC_CHANNEL_READY || - state == GRPC_CHANNEL_CONNECTING || - state == GRPC_CHANNEL_TRANSIENT_FAILURE); - } + while (state != GRPC_CHANNEL_READY) + { + grpc_channel_watch_connectivity_state (f.client, state, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (3), f.cq, tag (3)); + cq_expect_completion (cqv, tag (3), 1); + cq_verify (cqv); + state = grpc_channel_check_connectivity_state (f.client, 0); + GPR_ASSERT (state == GRPC_CHANNEL_READY || state == GRPC_CHANNEL_CONNECTING || state == GRPC_CHANNEL_TRANSIENT_FAILURE); + } /* bring down the server again */ /* we should go immediately to TRANSIENT_FAILURE */ - gpr_log(GPR_DEBUG, "*** SHUTTING DOWN SERVER ***"); + gpr_log (GPR_DEBUG, "*** SHUTTING DOWN SERVER ***"); - grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_READY, - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), - f.cq, tag(4)); + grpc_channel_watch_connectivity_state (f.client, GRPC_CHANNEL_READY, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (3), f.cq, tag (4)); - grpc_server_shutdown_and_notify(f.server, f.cq, tag(0xdead)); + grpc_server_shutdown_and_notify (f.server, f.cq, tag (0xdead)); - cq_expect_completion(cqv, tag(4), 1); - cq_expect_completion(cqv, tag(0xdead), 1); - cq_verify(cqv); - state = grpc_channel_check_connectivity_state(f.client, 0); - GPR_ASSERT(state == GRPC_CHANNEL_TRANSIENT_FAILURE || - state == GRPC_CHANNEL_CONNECTING); + cq_expect_completion (cqv, tag (4), 1); + cq_expect_completion (cqv, tag (0xdead), 1); + cq_verify (cqv); + state = grpc_channel_check_connectivity_state (f.client, 0); + GPR_ASSERT (state == GRPC_CHANNEL_TRANSIENT_FAILURE || state == GRPC_CHANNEL_CONNECTING); /* cleanup server */ - grpc_server_destroy(f.server); + grpc_server_destroy (f.server); - gpr_log(GPR_DEBUG, "*** SHUTDOWN SERVER ***"); + gpr_log (GPR_DEBUG, "*** SHUTDOWN SERVER ***"); - grpc_channel_destroy(f.client); - grpc_completion_queue_shutdown(f.cq); - grpc_completion_queue_destroy(f.cq); - config.tear_down_data(&f); + grpc_channel_destroy (f.client); + grpc_completion_queue_shutdown (f.cq); + grpc_completion_queue_destroy (f.cq); + config.tear_down_data (&f); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - GPR_ASSERT(config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION); - test_connectivity(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + GPR_ASSERT (config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION); + test_connectivity (config); } diff --git a/test/core/end2end/tests/compressed_payload.c b/test/core/end2end/tests/compressed_payload.c index c50eaba8b24..e7c0768d225 100644 --- a/test/core/end2end/tests/compressed_payload.c +++ b/test/core/end2end/tests/compressed_payload.c @@ -48,71 +48,88 @@ #include "src/core/channel/compress_filter.h" #include "src/core/surface/call.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void request_with_payload_template( - grpc_end2end_test_config config, const char *test_name, - gpr_uint32 send_flags_bitmask, - grpc_compression_algorithm requested_compression_algorithm, - grpc_compression_algorithm expected_compression_algorithm, - grpc_metadata *client_metadata) { +static void +request_with_payload_template (grpc_end2end_test_config config, const char *test_name, gpr_uint32 send_flags_bitmask, grpc_compression_algorithm requested_compression_algorithm, grpc_compression_algorithm expected_compression_algorithm, grpc_metadata * client_metadata) +{ grpc_call *c; grpc_call *s; gpr_slice request_payload_slice; grpc_byte_buffer *request_payload; - gpr_timespec deadline = five_seconds_time(); + gpr_timespec deadline = five_seconds_time (); grpc_channel_args *client_args; grpc_channel_args *server_args; grpc_end2end_test_fixture f; @@ -131,36 +148,36 @@ static void request_with_payload_template( cq_verifier *cqv; char str[1024]; - memset(str, 'x', 1023); + memset (str, 'x', 1023); str[1023] = '\0'; - request_payload_slice = gpr_slice_from_copied_string(str); - request_payload = grpc_raw_byte_buffer_create(&request_payload_slice, 1); + request_payload_slice = gpr_slice_from_copied_string (str); + request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - client_args = grpc_channel_args_set_compression_algorithm( - NULL, requested_compression_algorithm); - server_args = grpc_channel_args_set_compression_algorithm( - NULL, requested_compression_algorithm); + client_args = grpc_channel_args_set_compression_algorithm (NULL, requested_compression_algorithm); + server_args = grpc_channel_args_set_compression_algorithm (NULL, requested_compression_algorithm); - f = begin_test(config, test_name, client_args, server_args); - cqv = cq_verifier_create(f.cq); + f = begin_test (config, test_name, client_args, server_args); + cqv = cq_verifier_create (f.cq); - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; - if (client_metadata != NULL) { - op->data.send_initial_metadata.count = 1; - op->data.send_initial_metadata.metadata = client_metadata; - } else { - op->data.send_initial_metadata.count = 0; - } + if (client_metadata != NULL) + { + op->data.send_initial_metadata.count = 1; + op->data.send_initial_metadata.metadata = client_metadata; + } + else + { + op->data.send_initial_metadata.count = 0; + } op->flags = 0; op->reserved = NULL; op++; @@ -186,23 +203,18 @@ static void request_with_payload_template( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); - - GPR_ASSERT(GPR_BITCOUNT(grpc_call_get_encodings_accepted_by_peer(s)) == 3); - GPR_ASSERT(GPR_BITGET(grpc_call_get_encodings_accepted_by_peer(s), - GRPC_COMPRESS_NONE) != 0); - GPR_ASSERT(GPR_BITGET(grpc_call_get_encodings_accepted_by_peer(s), - GRPC_COMPRESS_DEFLATE) != 0); - GPR_ASSERT(GPR_BITGET(grpc_call_get_encodings_accepted_by_peer(s), - GRPC_COMPRESS_GZIP) != 0); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); + + GPR_ASSERT (GPR_BITCOUNT (grpc_call_get_encodings_accepted_by_peer (s)) == 3); + GPR_ASSERT (GPR_BITGET (grpc_call_get_encodings_accepted_by_peer (s), GRPC_COMPRESS_NONE) != 0); + GPR_ASSERT (GPR_BITGET (grpc_call_get_encodings_accepted_by_peer (s), GRPC_COMPRESS_DEFLATE) != 0); + GPR_ASSERT (GPR_BITGET (grpc_call_get_encodings_accepted_by_peer (s), GRPC_COMPRESS_GZIP) != 0); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -215,11 +227,11 @@ static void request_with_payload_template( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -234,104 +246,95 @@ static void request_with_payload_template( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(103), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (103), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_OK); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); - GPR_ASSERT(was_cancelled == 0); + GPR_ASSERT (status == GRPC_STATUS_OK); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); + GPR_ASSERT (was_cancelled == 0); - GPR_ASSERT(request_payload_recv->type == GRPC_BB_RAW); - GPR_ASSERT(request_payload_recv->data.raw.compression == - expected_compression_algorithm); + GPR_ASSERT (request_payload_recv->type == GRPC_BB_RAW); + GPR_ASSERT (request_payload_recv->data.raw.compression == expected_compression_algorithm); - GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, str)); + GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, str)); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - gpr_slice_unref(request_payload_slice); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(request_payload_recv); + gpr_slice_unref (request_payload_slice); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (request_payload_recv); - grpc_channel_args_destroy(client_args); - grpc_channel_args_destroy(server_args); + grpc_channel_args_destroy (client_args); + grpc_channel_args_destroy (server_args); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -static void test_invoke_request_with_exceptionally_uncompressed_payload( - grpc_end2end_test_config config) { - request_with_payload_template( - config, "test_invoke_request_with_exceptionally_uncompressed_payload", - GRPC_WRITE_NO_COMPRESS, GRPC_COMPRESS_GZIP, GRPC_COMPRESS_NONE, NULL); +static void +test_invoke_request_with_exceptionally_uncompressed_payload (grpc_end2end_test_config config) +{ + request_with_payload_template (config, "test_invoke_request_with_exceptionally_uncompressed_payload", GRPC_WRITE_NO_COMPRESS, GRPC_COMPRESS_GZIP, GRPC_COMPRESS_NONE, NULL); } -static void test_invoke_request_with_uncompressed_payload( - grpc_end2end_test_config config) { - request_with_payload_template( - config, "test_invoke_request_with_uncompressed_payload", 0, - GRPC_COMPRESS_NONE, GRPC_COMPRESS_NONE, NULL); +static void +test_invoke_request_with_uncompressed_payload (grpc_end2end_test_config config) +{ + request_with_payload_template (config, "test_invoke_request_with_uncompressed_payload", 0, GRPC_COMPRESS_NONE, GRPC_COMPRESS_NONE, NULL); } -static void test_invoke_request_with_compressed_payload( - grpc_end2end_test_config config) { - request_with_payload_template( - config, "test_invoke_request_with_compressed_payload", 0, - GRPC_COMPRESS_GZIP, GRPC_COMPRESS_GZIP, NULL); +static void +test_invoke_request_with_compressed_payload (grpc_end2end_test_config config) +{ + request_with_payload_template (config, "test_invoke_request_with_compressed_payload", 0, GRPC_COMPRESS_GZIP, GRPC_COMPRESS_GZIP, NULL); } -static void test_invoke_request_with_compressed_payload_md_override( - grpc_end2end_test_config config) { +static void +test_invoke_request_with_compressed_payload_md_override (grpc_end2end_test_config config) +{ grpc_metadata gzip_compression_override; grpc_metadata none_compression_override; gzip_compression_override.key = GRPC_COMPRESS_REQUEST_ALGORITHM_KEY; gzip_compression_override.value = "gzip"; gzip_compression_override.value_length = 4; - memset(&gzip_compression_override.internal_data, 0, - sizeof(gzip_compression_override.internal_data)); + memset (&gzip_compression_override.internal_data, 0, sizeof (gzip_compression_override.internal_data)); none_compression_override.key = GRPC_COMPRESS_REQUEST_ALGORITHM_KEY; none_compression_override.value = "identity"; none_compression_override.value_length = 4; - memset(&none_compression_override.internal_data, 0, - sizeof(none_compression_override.internal_data)); + memset (&none_compression_override.internal_data, 0, sizeof (none_compression_override.internal_data)); /* Channel default NONE (aka IDENTITY), call override to GZIP */ - request_with_payload_template( - config, "test_invoke_request_with_compressed_payload_md_override_1", 0, - GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, &gzip_compression_override); + request_with_payload_template (config, "test_invoke_request_with_compressed_payload_md_override_1", 0, GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, &gzip_compression_override); /* Channel default DEFLATE, call override to GZIP */ - request_with_payload_template( - config, "test_invoke_request_with_compressed_payload_md_override_2", 0, - GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_GZIP, &gzip_compression_override); + request_with_payload_template (config, "test_invoke_request_with_compressed_payload_md_override_2", 0, GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_GZIP, &gzip_compression_override); /* Channel default DEFLATE, call override to NONE (aka IDENTITY) */ - request_with_payload_template( - config, "test_invoke_request_with_compressed_payload_md_override_3", 0, - GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_NONE, &none_compression_override); + request_with_payload_template (config, "test_invoke_request_with_compressed_payload_md_override_3", 0, GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_NONE, &none_compression_override); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_invoke_request_with_exceptionally_uncompressed_payload(config); - test_invoke_request_with_uncompressed_payload(config); - test_invoke_request_with_compressed_payload(config); - test_invoke_request_with_compressed_payload_md_override(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_invoke_request_with_exceptionally_uncompressed_payload (config); + test_invoke_request_with_uncompressed_payload (config); + test_invoke_request_with_compressed_payload (config); + test_invoke_request_with_compressed_payload_md_override (config); } diff --git a/test/core/end2end/tests/default_host.c b/test/core/end2end/tests/default_host.c index 7b62505a9a0..2bffa8d692e 100644 --- a/test/core/end2end/tests/default_host.c +++ b/test/core/end2end/tests/default_host.c @@ -45,65 +45,87 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void simple_request_body(grpc_end2end_test_fixture f) { +static void +simple_request_body (grpc_end2end_test_fixture f) +{ grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f.cq); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -117,19 +139,18 @@ static void simple_request_body(grpc_end2end_test_fixture f) { int was_cancelled = 2; char *peer; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", NULL, deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", NULL, deadline, NULL); + GPR_ASSERT (c); - peer = grpc_call_get_peer(c); - GPR_ASSERT(peer != NULL); - gpr_log(GPR_DEBUG, "client_peer_before_call=%s", peer); - gpr_free(peer); + peer = grpc_call_get_peer (c); + GPR_ASSERT (peer != NULL); + gpr_log (GPR_DEBUG, "client_peer_before_call=%s", peer); + gpr_free (peer); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -154,24 +175,22 @@ static void simple_request_body(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(error == GRPC_CALL_OK); - - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(error == GRPC_CALL_OK); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); - - peer = grpc_call_get_peer(s); - GPR_ASSERT(peer != NULL); - gpr_log(GPR_DEBUG, "server_peer=%s", peer); - gpr_free(peer); - peer = grpc_call_get_peer(c); - GPR_ASSERT(peer != NULL); - gpr_log(GPR_DEBUG, "client_peer=%s", peer); - gpr_free(peer); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (error == GRPC_CALL_OK); + + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (error == GRPC_CALL_OK); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); + + peer = grpc_call_get_peer (s); + GPR_ASSERT (peer != NULL); + gpr_log (GPR_DEBUG, "server_peer=%s", peer); + gpr_free (peer); + peer = grpc_call_get_peer (c); + GPR_ASSERT (peer != NULL); + gpr_log (GPR_DEBUG, "client_peer=%s", peer); + gpr_free (peer); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -191,44 +210,48 @@ static void simple_request_body(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(error == GRPC_CALL_OK); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (error == GRPC_CALL_OK); - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strncmp(call_details.host, "localhost", 9)); - GPR_ASSERT(was_cancelled == 1); + GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strncmp (call_details.host, "localhost", 9)); + GPR_ASSERT (was_cancelled == 1); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); } -static void test_invoke_simple_request(grpc_end2end_test_config config) { +static void +test_invoke_simple_request (grpc_end2end_test_config config) +{ grpc_end2end_test_fixture f; - f = begin_test(config, "test_invoke_simple_request", NULL, NULL); - simple_request_body(f); - end_test(&f); - config.tear_down_data(&f); + f = begin_test (config, "test_invoke_simple_request", NULL, NULL); + simple_request_body (f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ if ((config.feature_mask & FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION) != 0) return; if ((config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION) == 0) return; - test_invoke_simple_request(config); + test_invoke_simple_request (config); } diff --git a/test/core/end2end/tests/disappearing_server.c b/test/core/end2end/tests/disappearing_server.c index de3ea16f667..e1758706bcf 100644 --- a/test/core/end2end/tests/disappearing_server.c +++ b/test/core/end2end/tests/disappearing_server.c @@ -43,49 +43,73 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void do_request_and_shutdown_server(grpc_end2end_test_fixture *f, - cq_verifier *cqv) { +static void +do_request_and_shutdown_server (grpc_end2end_test_fixture * f, cq_verifier * cqv) +{ grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time(); + gpr_timespec deadline = five_seconds_time (); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -98,15 +122,13 @@ static void do_request_and_shutdown_server(grpc_end2end_test_fixture *f, size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call(f->client, NULL, GRPC_PROPAGATE_DEFAULTS, f->cq, - "/foo", "foo.test.google.fr:1234", deadline, - NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f->client, NULL, GRPC_PROPAGATE_DEFAULTS, f->cq, "/foo", "foo.test.google.fr:1234", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -131,19 +153,17 @@ static void do_request_and_shutdown_server(grpc_end2end_test_fixture *f, op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f->server, &s, &call_details, - &request_metadata_recv, f->cq, f->cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f->server, &s, &call_details, &request_metadata_recv, f->cq, f->cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); /* should be able to shut down the server early - and still complete the request */ - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -163,53 +183,57 @@ static void do_request_and_shutdown_server(grpc_end2end_test_fixture *f, op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_expect_completion(cqv, tag(1000), 1); - cq_verify(cqv); - - GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT(was_cancelled == 1); - - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); - - grpc_call_destroy(c); - grpc_call_destroy(s); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_expect_completion (cqv, tag (1000), 1); + cq_verify (cqv); + + GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT (was_cancelled == 1); + + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); + + grpc_call_destroy (c); + grpc_call_destroy (s); } -static void disappearing_server_test(grpc_end2end_test_config config) { - grpc_end2end_test_fixture f = config.create_fixture(NULL, NULL); - cq_verifier *cqv = cq_verifier_create(f.cq); +static void +disappearing_server_test (grpc_end2end_test_config config) +{ + grpc_end2end_test_fixture f = config.create_fixture (NULL, NULL); + cq_verifier *cqv = cq_verifier_create (f.cq); - gpr_log(GPR_INFO, "%s/%s", "disappearing_server_test", config.name); + gpr_log (GPR_INFO, "%s/%s", "disappearing_server_test", config.name); - config.init_client(&f, NULL); - config.init_server(&f, NULL); + config.init_client (&f, NULL); + config.init_server (&f, NULL); - do_request_and_shutdown_server(&f, cqv); + do_request_and_shutdown_server (&f, cqv); /* now destroy and recreate the server */ - config.init_server(&f, NULL); + config.init_server (&f, NULL); - do_request_and_shutdown_server(&f, cqv); + do_request_and_shutdown_server (&f, cqv); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - GPR_ASSERT(config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION); - disappearing_server_test(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + GPR_ASSERT (config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION); + disappearing_server_test (config); } diff --git a/test/core/end2end/tests/empty_batch.c b/test/core/end2end/tests/empty_batch.c index c93d236a6a7..a73bdc7b3f6 100644 --- a/test/core/end2end/tests/empty_batch.c +++ b/test/core/end2end/tests/empty_batch.c @@ -45,90 +45,115 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void empty_batch_body(grpc_end2end_test_fixture f) { +static void +empty_batch_body (grpc_end2end_test_fixture f) +{ grpc_call *c; - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f.cq); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_call_error error; grpc_op *op = NULL; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - error = grpc_call_start_batch(c, op, 0, tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + error = grpc_call_start_batch (c, op, 0, tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - grpc_call_destroy(c); + grpc_call_destroy (c); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); } -static void test_invoke_empty_body(grpc_end2end_test_config config) { +static void +test_invoke_empty_body (grpc_end2end_test_config config) +{ grpc_end2end_test_fixture f; - f = begin_test(config, "test_invoke_empty_body", NULL, NULL); - empty_batch_body(f); - end_test(&f); - config.tear_down_data(&f); + f = begin_test (config, "test_invoke_empty_body", NULL, NULL); + empty_batch_body (f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_invoke_empty_body(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_invoke_empty_body (config); } diff --git a/test/core/end2end/tests/graceful_server_shutdown.c b/test/core/end2end/tests/graceful_server_shutdown.c index df420a9846d..b3e30964aea 100644 --- a/test/core/end2end/tests/graceful_server_shutdown.c +++ b/test/core/end2end/tests/graceful_server_shutdown.c @@ -43,64 +43,86 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void test_early_server_shutdown_finishes_inflight_calls( - grpc_end2end_test_config config) { +static void +test_early_server_shutdown_finishes_inflight_calls (grpc_end2end_test_config config) +{ grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time(); - grpc_end2end_test_fixture f = begin_test( - config, "test_early_server_shutdown_finishes_inflight_calls", NULL, NULL); - cq_verifier *cqv = cq_verifier_create(f.cq); + gpr_timespec deadline = five_seconds_time (); + grpc_end2end_test_fixture f = begin_test (config, "test_early_server_shutdown_finishes_inflight_calls", NULL, NULL); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -113,14 +135,13 @@ static void test_early_server_shutdown_finishes_inflight_calls( size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -146,19 +167,17 @@ static void test_early_server_shutdown_finishes_inflight_calls( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); /* shutdown and destroy the server */ - grpc_server_shutdown_and_notify(f.server, f.cq, tag(0xdead)); - cq_verify_empty(cqv); + grpc_server_shutdown_and_notify (f.server, f.cq, tag (0xdead)); + cq_verify_empty (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -178,35 +197,37 @@ static void test_early_server_shutdown_finishes_inflight_calls( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(0xdead), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (0xdead), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - grpc_call_destroy(s); + grpc_call_destroy (s); - GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); - GPR_ASSERT(was_cancelled == 1); + GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); + GPR_ASSERT (was_cancelled == 1); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); + grpc_call_destroy (c); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_early_server_shutdown_finishes_inflight_calls(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_early_server_shutdown_finishes_inflight_calls (config); } diff --git a/test/core/end2end/tests/high_initial_seqno.c b/test/core/end2end/tests/high_initial_seqno.c index 44d6a60c104..4d9d09cd809 100644 --- a/test/core/end2end/tests/high_initial_seqno.c +++ b/test/core/end2end/tests/high_initial_seqno.c @@ -45,65 +45,87 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void simple_request_body(grpc_end2end_test_fixture f) { +static void +simple_request_body (grpc_end2end_test_fixture f) +{ grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f.cq); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -116,15 +138,13 @@ static void simple_request_body(grpc_end2end_test_fixture f) { size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr:1234", deadline, - NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr:1234", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -149,15 +169,13 @@ static void simple_request_body(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -177,33 +195,34 @@ static void simple_request_body(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT(was_cancelled == 1); + GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT (was_cancelled == 1); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); } -static void test_invoke_10_simple_requests(grpc_end2end_test_config config, - int initial_sequence_number) { +static void +test_invoke_10_simple_requests (grpc_end2end_test_config config, int initial_sequence_number) +{ int i; grpc_end2end_test_fixture f; grpc_arg client_arg; @@ -216,18 +235,22 @@ static void test_invoke_10_simple_requests(grpc_end2end_test_config config, client_args.num_args = 1; client_args.args = &client_arg; - f = begin_test(config, "test_invoke_10_simple_requests", &client_args, NULL); - for (i = 0; i < 10; i++) { - simple_request_body(f); - gpr_log(GPR_INFO, "Passed simple request %d", i); - } - end_test(&f); - config.tear_down_data(&f); + f = begin_test (config, "test_invoke_10_simple_requests", &client_args, NULL); + for (i = 0; i < 10; i++) + { + simple_request_body (f); + gpr_log (GPR_INFO, "Passed simple request %d", i); + } + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_invoke_10_simple_requests(config, 16777213); - if (config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION) { - test_invoke_10_simple_requests(config, 2147483645); - } +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_invoke_10_simple_requests (config, 16777213); + if (config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION) + { + test_invoke_10_simple_requests (config, 2147483645); + } } diff --git a/test/core/end2end/tests/invoke_large_request.c b/test/core/end2end/tests/invoke_large_request.c index f79d146da10..da19222c537 100644 --- a/test/core/end2end/tests/invoke_large_request.c +++ b/test/core/end2end/tests/invoke_large_request.c @@ -43,78 +43,95 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, n_seconds_time(5), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, n_seconds_time (5), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static gpr_slice large_slice(void) { - gpr_slice slice = gpr_slice_malloc(1000000); - memset(GPR_SLICE_START_PTR(slice), 'x', GPR_SLICE_LENGTH(slice)); +static gpr_slice +large_slice (void) +{ + gpr_slice slice = gpr_slice_malloc (1000000); + memset (GPR_SLICE_START_PTR (slice), 'x', GPR_SLICE_LENGTH (slice)); return slice; } -static void test_invoke_large_request(grpc_end2end_test_config config) { - grpc_end2end_test_fixture f = - begin_test(config, "test_invoke_large_request", NULL, NULL); +static void +test_invoke_large_request (grpc_end2end_test_config config) +{ + grpc_end2end_test_fixture f = begin_test (config, "test_invoke_large_request", NULL, NULL); - gpr_slice request_payload_slice = large_slice(); - gpr_slice response_payload_slice = large_slice(); + gpr_slice request_payload_slice = large_slice (); + gpr_slice response_payload_slice = large_slice (); grpc_call *c; grpc_call *s; - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); - grpc_byte_buffer *response_payload = - grpc_raw_byte_buffer_create(&response_payload_slice, 1); - gpr_timespec deadline = n_seconds_time(30); - cq_verifier *cqv = cq_verifier_create(f.cq); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); + gpr_timespec deadline = n_seconds_time (30); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -129,14 +146,13 @@ static void test_invoke_large_request(grpc_end2end_test_config config) { size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -171,15 +187,13 @@ static void test_invoke_large_request(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -192,11 +206,11 @@ static void test_invoke_large_request(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -216,41 +230,43 @@ static void test_invoke_large_request(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(103), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (103), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); - GPR_ASSERT(was_cancelled == 1); + GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); + GPR_ASSERT (was_cancelled == 1); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(response_payload); - grpc_byte_buffer_destroy(request_payload_recv); - grpc_byte_buffer_destroy(response_payload_recv); - gpr_slice_unref(request_payload_slice); - gpr_slice_unref(response_payload_slice); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (response_payload); + grpc_byte_buffer_destroy (request_payload_recv); + grpc_byte_buffer_destroy (response_payload_recv); + gpr_slice_unref (request_payload_slice); + gpr_slice_unref (response_payload_slice); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_invoke_large_request(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_invoke_large_request (config); } diff --git a/test/core/end2end/tests/large_metadata.c b/test/core/end2end/tests/large_metadata.c index 87529639a76..ff7605ebe99 100644 --- a/test/core/end2end/tests/large_metadata.c +++ b/test/core/end2end/tests/large_metadata.c @@ -43,72 +43,92 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } /* Request with a large amount of metadata.*/ -static void test_request_with_large_metadata(grpc_end2end_test_config config) { +static void +test_request_with_large_metadata (grpc_end2end_test_config config) +{ grpc_call *c; grpc_call *s; - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); - gpr_timespec deadline = five_seconds_time(); + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + gpr_timespec deadline = five_seconds_time (); grpc_metadata meta; - grpc_end2end_test_fixture f = - begin_test(config, "test_request_with_large_metadata", NULL, NULL); - cq_verifier *cqv = cq_verifier_create(f.cq); + grpc_end2end_test_fixture f = begin_test (config, "test_request_with_large_metadata", NULL, NULL); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -123,20 +143,19 @@ static void test_request_with_large_metadata(grpc_end2end_test_config config) { int was_cancelled = 2; const size_t large_size = 64 * 1024; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); meta.key = "key"; - meta.value = gpr_malloc(large_size + 1); - memset((char *)meta.value, 'a', large_size); - ((char *)meta.value)[large_size] = 0; + meta.value = gpr_malloc (large_size + 1); + memset ((char *) meta.value, 'a', large_size); + ((char *) meta.value)[large_size] = 0; meta.value_length = large_size; - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -167,15 +186,13 @@ static void test_request_with_large_metadata(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -188,11 +205,11 @@ static void test_request_with_large_metadata(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -207,41 +224,43 @@ static void test_request_with_large_metadata(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(103), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (103), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_OK); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); - GPR_ASSERT(was_cancelled == 0); - GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); - GPR_ASSERT(contains_metadata(&request_metadata_recv, "key", meta.value)); + GPR_ASSERT (status == GRPC_STATUS_OK); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); + GPR_ASSERT (was_cancelled == 0); + GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, "hello world")); + GPR_ASSERT (contains_metadata (&request_metadata_recv, "key", meta.value)); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(request_payload_recv); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (request_payload_recv); - gpr_free((char *)meta.value); + gpr_free ((char *) meta.value); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_request_with_large_metadata(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_request_with_large_metadata (config); } diff --git a/test/core/end2end/tests/max_concurrent_streams.c b/test/core/end2end/tests/max_concurrent_streams.c index 87eb4dd451e..1d4ba32ee08 100644 --- a/test/core/end2end/tests/max_concurrent_streams.c +++ b/test/core/end2end/tests/max_concurrent_streams.c @@ -43,65 +43,87 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void simple_request_body(grpc_end2end_test_fixture f) { +static void +simple_request_body (grpc_end2end_test_fixture f) +{ grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f.cq); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -114,15 +136,13 @@ static void simple_request_body(grpc_end2end_test_fixture f) { size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr:1234", deadline, - NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr:1234", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -147,15 +167,13 @@ static void simple_request_body(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -175,32 +193,34 @@ static void simple_request_body(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT(was_cancelled == 1); + GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT (was_cancelled == 1); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); } -static void test_max_concurrent_streams(grpc_end2end_test_config config) { +static void +test_max_concurrent_streams (grpc_end2end_test_config config) +{ grpc_end2end_test_fixture f; grpc_arg server_arg; grpc_channel_args server_args; @@ -238,37 +258,31 @@ static void test_max_concurrent_streams(grpc_end2end_test_config config) { server_args.num_args = 1; server_args.args = &server_arg; - f = begin_test(config, "test_max_concurrent_streams", NULL, &server_args); - cqv = cq_verifier_create(f.cq); + f = begin_test (config, "test_max_concurrent_streams", NULL, &server_args); + cqv = cq_verifier_create (f.cq); - grpc_metadata_array_init(&request_metadata_recv); - grpc_metadata_array_init(&initial_metadata_recv1); - grpc_metadata_array_init(&trailing_metadata_recv1); - grpc_metadata_array_init(&initial_metadata_recv2); - grpc_metadata_array_init(&trailing_metadata_recv2); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&request_metadata_recv); + grpc_metadata_array_init (&initial_metadata_recv1); + grpc_metadata_array_init (&trailing_metadata_recv1); + grpc_metadata_array_init (&initial_metadata_recv2); + grpc_metadata_array_init (&trailing_metadata_recv2); + grpc_call_details_init (&call_details); /* perform a ping-pong to ensure that settings have had a chance to round trip */ - simple_request_body(f); + simple_request_body (f); /* perform another one to make sure that the one stream case still works */ - simple_request_body(f); + simple_request_body (f); /* start two requests - ensuring that the second is not accepted until the first completes */ - deadline = n_seconds_time(1000); - c1 = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/alpha", "foo.test.google.fr:1234", deadline, - NULL); - GPR_ASSERT(c1); - c2 = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/beta", "foo.test.google.fr:1234", deadline, - NULL); - GPR_ASSERT(c2); - - GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call( - f.server, &s1, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101))); + deadline = n_seconds_time (1000); + c1 = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/alpha", "foo.test.google.fr:1234", deadline, NULL); + GPR_ASSERT (c1); + c2 = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/beta", "foo.test.google.fr:1234", deadline, NULL); + GPR_ASSERT (c2); + + GPR_ASSERT (GRPC_CALL_OK == grpc_server_request_call (f.server, &s1, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101))); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -280,8 +294,8 @@ static void test_max_concurrent_streams(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c1, ops, (size_t)(op - ops), tag(301), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c1, ops, (size_t) (op - ops), tag (301), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); op = ops; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; @@ -297,8 +311,8 @@ static void test_max_concurrent_streams(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c1, ops, (size_t)(op - ops), tag(302), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c1, ops, (size_t) (op - ops), tag (302), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -310,8 +324,8 @@ static void test_max_concurrent_streams(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c2, ops, (size_t)(op - ops), tag(401), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c2, ops, (size_t) (op - ops), tag (401), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); op = ops; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; @@ -327,32 +341,35 @@ static void test_max_concurrent_streams(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c2, ops, (size_t)(op - ops), tag(402), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c2, ops, (size_t) (op - ops), tag (402), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); got_client_start = 0; got_server_start = 0; live_call = -1; - while (!got_client_start || !got_server_start) { - ev = grpc_completion_queue_next(f.cq, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), - NULL); - GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); - GPR_ASSERT(ev.success); - if (ev.tag == tag(101)) { - GPR_ASSERT(!got_server_start); - got_server_start = 1; - } else { - GPR_ASSERT(!got_client_start); - GPR_ASSERT(ev.tag == tag(301) || ev.tag == tag(401)); - /* The /alpha or /beta calls started above could be invoked (but NOT - * both); - * check this here */ - /* We'll get tag 303 or 403, we want 300, 400 */ - live_call = ((int)(gpr_intptr)ev.tag) - 1; - got_client_start = 1; + while (!got_client_start || !got_server_start) + { + ev = grpc_completion_queue_next (f.cq, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (3), NULL); + GPR_ASSERT (ev.type == GRPC_OP_COMPLETE); + GPR_ASSERT (ev.success); + if (ev.tag == tag (101)) + { + GPR_ASSERT (!got_server_start); + got_server_start = 1; + } + else + { + GPR_ASSERT (!got_client_start); + GPR_ASSERT (ev.tag == tag (301) || ev.tag == tag (401)); + /* The /alpha or /beta calls started above could be invoked (but NOT + * both); + * check this here */ + /* We'll get tag 303 or 403, we want 300, 400 */ + live_call = ((int) (gpr_intptr) ev.tag) - 1; + got_client_start = 1; + } } - } - GPR_ASSERT(live_call == 300 || live_call == 400); + GPR_ASSERT (live_call == 300 || live_call == 400); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -372,21 +389,19 @@ static void test_max_concurrent_streams(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s1, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s1, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(live_call + 2), 1); + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (live_call + 2), 1); /* first request is finished, we should be able to start the second */ live_call = (live_call == 300) ? 400 : 300; - cq_expect_completion(cqv, tag(live_call + 1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (live_call + 1), 1); + cq_verify (cqv); - GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call( - f.server, &s2, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(201))); - cq_expect_completion(cqv, tag(201), 1); - cq_verify(cqv); + GPR_ASSERT (GRPC_CALL_OK == grpc_server_request_call (f.server, &s2, &call_details, &request_metadata_recv, f.cq, f.cq, tag (201))); + cq_expect_completion (cqv, tag (201), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -406,33 +421,35 @@ static void test_max_concurrent_streams(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s2, ops, (size_t)(op - ops), tag(202), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - - cq_expect_completion(cqv, tag(live_call + 2), 1); - cq_expect_completion(cqv, tag(202), 1); - cq_verify(cqv); - - cq_verifier_destroy(cqv); - - grpc_call_destroy(c1); - grpc_call_destroy(s1); - grpc_call_destroy(c2); - grpc_call_destroy(s2); - - gpr_free(details1); - gpr_free(details2); - grpc_metadata_array_destroy(&initial_metadata_recv1); - grpc_metadata_array_destroy(&trailing_metadata_recv1); - grpc_metadata_array_destroy(&initial_metadata_recv2); - grpc_metadata_array_destroy(&trailing_metadata_recv2); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); - - end_test(&f); - config.tear_down_data(&f); + error = grpc_call_start_batch (s2, ops, (size_t) (op - ops), tag (202), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + + cq_expect_completion (cqv, tag (live_call + 2), 1); + cq_expect_completion (cqv, tag (202), 1); + cq_verify (cqv); + + cq_verifier_destroy (cqv); + + grpc_call_destroy (c1); + grpc_call_destroy (s1); + grpc_call_destroy (c2); + grpc_call_destroy (s2); + + gpr_free (details1); + gpr_free (details2); + grpc_metadata_array_destroy (&initial_metadata_recv1); + grpc_metadata_array_destroy (&trailing_metadata_recv1); + grpc_metadata_array_destroy (&initial_metadata_recv2); + grpc_metadata_array_destroy (&trailing_metadata_recv2); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); + + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_max_concurrent_streams(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_max_concurrent_streams (config); } diff --git a/test/core/end2end/tests/max_message_length.c b/test/core/end2end/tests/max_message_length.c index 782b9d0f264..e1949692cad 100644 --- a/test/core/end2end/tests/max_message_length.c +++ b/test/core/end2end/tests/max_message_length.c @@ -43,61 +43,83 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void test_max_message_length(grpc_end2end_test_config config) { +static void +test_max_message_length (grpc_end2end_test_config config) +{ grpc_end2end_test_fixture f; grpc_arg server_arg; grpc_channel_args server_args; @@ -106,9 +128,8 @@ static void test_max_message_length(grpc_end2end_test_config config) { cq_verifier *cqv; grpc_op ops[6]; grpc_op *op; - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; grpc_metadata_array request_metadata_recv; @@ -126,18 +147,16 @@ static void test_max_message_length(grpc_end2end_test_config config) { server_args.num_args = 1; server_args.args = &server_arg; - f = begin_test(config, "test_max_message_length", NULL, &server_args); - cqv = cq_verifier_create(f.cq); + f = begin_test (config, "test_max_message_length", NULL, &server_args); + cqv = cq_verifier_create (f.cq); - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr:1234", - gpr_inf_future(GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr:1234", gpr_inf_future (GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -167,15 +186,13 @@ static void test_max_message_length(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -183,34 +200,36 @@ static void test_max_message_length(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status != GRPC_STATUS_OK); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT(was_cancelled == 1); + GPR_ASSERT (status != GRPC_STATUS_OK); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT (was_cancelled == 1); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); - grpc_byte_buffer_destroy(request_payload); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); + grpc_byte_buffer_destroy (request_payload); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_max_message_length(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_max_message_length (config); } diff --git a/test/core/end2end/tests/metadata.c b/test/core/end2end/tests/metadata.c index d0604cc6b6f..b1aefa77c6a 100644 --- a/test/core/end2end/tests/metadata.c +++ b/test/core/end2end/tests/metadata.c @@ -43,81 +43,101 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } /* Request/response with metadata and payload.*/ -static void test_request_response_with_metadata_and_payload( - grpc_end2end_test_config config) { +static void +test_request_response_with_metadata_and_payload (grpc_end2end_test_config config) +{ grpc_call *c; grpc_call *s; - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); - grpc_byte_buffer *response_payload = - grpc_raw_byte_buffer_create(&response_payload_slice, 1); - gpr_timespec deadline = five_seconds_time(); + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); + gpr_timespec deadline = five_seconds_time (); grpc_metadata meta_c[2] = { - {"key1", "val1", 4, 0, {{NULL, NULL, NULL, NULL}}}, - {"key2", "val2", 4, 0, {{NULL, NULL, NULL, NULL}}}}; + {"key1", "val1", 4, 0, {{NULL, NULL, NULL, NULL}}}, + {"key2", "val2", 4, 0, {{NULL, NULL, NULL, NULL}}} + }; grpc_metadata meta_s[2] = { - {"KeY3", "val3", 4, 0, {{NULL, NULL, NULL, NULL}}}, - {"KeY4", "val4", 4, 0, {{NULL, NULL, NULL, NULL}}}}; - grpc_end2end_test_fixture f = begin_test( - config, "test_request_response_with_metadata_and_payload", NULL, NULL); - cq_verifier *cqv = cq_verifier_create(f.cq); + {"KeY3", "val3", 4, 0, {{NULL, NULL, NULL, NULL}}}, + {"KeY4", "val4", 4, 0, {{NULL, NULL, NULL, NULL}}} + }; + grpc_end2end_test_fixture f = begin_test (config, "test_request_response_with_metadata_and_payload", NULL, NULL); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -132,14 +152,13 @@ static void test_request_response_with_metadata_and_payload( size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -175,15 +194,13 @@ static void test_request_response_with_metadata_and_payload( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -197,11 +214,11 @@ static void test_request_response_with_metadata_and_payload( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -221,45 +238,47 @@ static void test_request_response_with_metadata_and_payload( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(103), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (103), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_OK); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); - GPR_ASSERT(was_cancelled == 0); - GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); - GPR_ASSERT(byte_buffer_eq_string(response_payload_recv, "hello you")); - GPR_ASSERT(contains_metadata(&request_metadata_recv, "key1", "val1")); - GPR_ASSERT(contains_metadata(&request_metadata_recv, "key2", "val2")); - GPR_ASSERT(contains_metadata(&initial_metadata_recv, "key3", "val3")); - GPR_ASSERT(contains_metadata(&initial_metadata_recv, "key4", "val4")); + GPR_ASSERT (status == GRPC_STATUS_OK); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); + GPR_ASSERT (was_cancelled == 0); + GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, "hello world")); + GPR_ASSERT (byte_buffer_eq_string (response_payload_recv, "hello you")); + GPR_ASSERT (contains_metadata (&request_metadata_recv, "key1", "val1")); + GPR_ASSERT (contains_metadata (&request_metadata_recv, "key2", "val2")); + GPR_ASSERT (contains_metadata (&initial_metadata_recv, "key3", "val3")); + GPR_ASSERT (contains_metadata (&initial_metadata_recv, "key4", "val4")); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(response_payload); - grpc_byte_buffer_destroy(request_payload_recv); - grpc_byte_buffer_destroy(response_payload_recv); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (response_payload); + grpc_byte_buffer_destroy (request_payload_recv); + grpc_byte_buffer_destroy (response_payload_recv); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_request_response_with_metadata_and_payload(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_request_response_with_metadata_and_payload (config); } diff --git a/test/core/end2end/tests/no_op.c b/test/core/end2end/tests/no_op.c index 157d0d53490..0f15963a4a3 100644 --- a/test/core/end2end/tests/no_op.c +++ b/test/core/end2end/tests/no_op.c @@ -43,64 +43,90 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void test_no_op(grpc_end2end_test_config config) { - grpc_end2end_test_fixture f = begin_test(config, "no-op", NULL, NULL); - end_test(&f); - config.tear_down_data(&f); +static void +test_no_op (grpc_end2end_test_config config) +{ + grpc_end2end_test_fixture f = begin_test (config, "no-op", NULL, NULL); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { test_no_op(config); } +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_no_op (config); +} diff --git a/test/core/end2end/tests/payload.c b/test/core/end2end/tests/payload.c index 0b303268fc6..16749741356 100644 --- a/test/core/end2end/tests/payload.c +++ b/test/core/end2end/tests/payload.c @@ -43,71 +43,91 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void request_response_with_payload(grpc_end2end_test_fixture f) { - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); +static void +request_response_with_payload (grpc_end2end_test_fixture f) +{ + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); grpc_call *c; grpc_call *s; - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); - grpc_byte_buffer *response_payload = - grpc_raw_byte_buffer_create(&response_payload_slice, 1); - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f.cq); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -122,14 +142,13 @@ static void request_response_with_payload(grpc_end2end_test_fixture f) { size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -164,15 +183,13 @@ static void request_response_with_payload(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -185,11 +202,11 @@ static void request_response_with_payload(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -209,62 +226,65 @@ static void request_response_with_payload(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(103), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (103), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_OK); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); - GPR_ASSERT(was_cancelled == 0); - GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); - GPR_ASSERT(byte_buffer_eq_string(response_payload_recv, "hello you")); + GPR_ASSERT (status == GRPC_STATUS_OK); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); + GPR_ASSERT (was_cancelled == 0); + GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, "hello world")); + GPR_ASSERT (byte_buffer_eq_string (response_payload_recv, "hello you")); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(response_payload); - grpc_byte_buffer_destroy(request_payload_recv); - grpc_byte_buffer_destroy(response_payload_recv); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (response_payload); + grpc_byte_buffer_destroy (request_payload_recv); + grpc_byte_buffer_destroy (response_payload_recv); } /* Client sends a request with payload, server reads then returns a response payload and status. */ -static void test_invoke_request_response_with_payload( - grpc_end2end_test_config config) { - grpc_end2end_test_fixture f = begin_test( - config, "test_invoke_request_response_with_payload", NULL, NULL); - request_response_with_payload(f); - end_test(&f); - config.tear_down_data(&f); +static void +test_invoke_request_response_with_payload (grpc_end2end_test_config config) +{ + grpc_end2end_test_fixture f = begin_test (config, "test_invoke_request_response_with_payload", NULL, NULL); + request_response_with_payload (f); + end_test (&f); + config.tear_down_data (&f); } -static void test_invoke_10_request_response_with_payload( - grpc_end2end_test_config config) { +static void +test_invoke_10_request_response_with_payload (grpc_end2end_test_config config) +{ int i; - grpc_end2end_test_fixture f = begin_test( - config, "test_invoke_10_request_response_with_payload", NULL, NULL); - for (i = 0; i < 10; i++) { - request_response_with_payload(f); - } - end_test(&f); - config.tear_down_data(&f); + grpc_end2end_test_fixture f = begin_test (config, "test_invoke_10_request_response_with_payload", NULL, NULL); + for (i = 0; i < 10; i++) + { + request_response_with_payload (f); + } + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_invoke_request_response_with_payload(config); - test_invoke_10_request_response_with_payload(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_invoke_request_response_with_payload (config); + test_invoke_10_request_response_with_payload (config); } diff --git a/test/core/end2end/tests/ping_pong_streaming.c b/test/core/end2end/tests/ping_pong_streaming.c index 39682d8bc50..c3431dd03d3 100644 --- a/test/core/end2end/tests/ping_pong_streaming.c +++ b/test/core/end2end/tests/ping_pong_streaming.c @@ -43,69 +43,89 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } /* Client pings and server pongs. Repeat messages rounds before finishing. */ -static void test_pingpong_streaming(grpc_end2end_test_config config, - int messages) { - grpc_end2end_test_fixture f = - begin_test(config, "test_pingpong_streaming", NULL, NULL); +static void +test_pingpong_streaming (grpc_end2end_test_config config, int messages) +{ + grpc_end2end_test_fixture f = begin_test (config, "test_pingpong_streaming", NULL, NULL); grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f.cq); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -122,18 +142,16 @@ static void test_pingpong_streaming(grpc_end2end_test_config config, grpc_byte_buffer *response_payload; grpc_byte_buffer *response_payload_recv; int i; - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr:1234", deadline, - NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr:1234", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -154,15 +172,13 @@ static void test_pingpong_streaming(grpc_end2end_test_config config, op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(100)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(100), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (100)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (100), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -175,66 +191,67 @@ static void test_pingpong_streaming(grpc_end2end_test_config config, op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(101), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - - for (i = 0; i < messages; i++) { - request_payload = grpc_raw_byte_buffer_create(&request_payload_slice, 1); - response_payload = grpc_raw_byte_buffer_create(&response_payload_slice, 1); - - op = ops; - op->op = GRPC_OP_SEND_MESSAGE; - op->data.send_message = request_payload; - op->flags = 0; - op->reserved = NULL; - op++; - op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message = &response_payload_recv; - op->flags = 0; - op->reserved = NULL; - op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(2), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - - op = ops; - op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message = &request_payload_recv; - op->flags = 0; - op->reserved = NULL; - op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_verify(cqv); - - op = ops; - op->op = GRPC_OP_SEND_MESSAGE; - op->data.send_message = response_payload; - op->flags = 0; - op->reserved = NULL; - op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(103), 1); - cq_expect_completion(cqv, tag(2), 1); - cq_verify(cqv); - - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(response_payload); - grpc_byte_buffer_destroy(request_payload_recv); - grpc_byte_buffer_destroy(response_payload_recv); - } - - gpr_slice_unref(request_payload_slice); - gpr_slice_unref(response_payload_slice); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (101), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + + for (i = 0; i < messages; i++) + { + request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); + + op = ops; + op->op = GRPC_OP_SEND_MESSAGE; + op->data.send_message = request_payload; + op->flags = 0; + op->reserved = NULL; + op++; + op->op = GRPC_OP_RECV_MESSAGE; + op->data.recv_message = &response_payload_recv; + op->flags = 0; + op->reserved = NULL; + op++; + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (2), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + + op = ops; + op->op = GRPC_OP_RECV_MESSAGE; + op->data.recv_message = &request_payload_recv; + op->flags = 0; + op->reserved = NULL; + op++; + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (102), 1); + cq_verify (cqv); + + op = ops; + op->op = GRPC_OP_SEND_MESSAGE; + op->data.send_message = response_payload; + op->flags = 0; + op->reserved = NULL; + op++; + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (103), 1); + cq_expect_completion (cqv, tag (2), 1); + cq_verify (cqv); + + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (response_payload); + grpc_byte_buffer_destroy (request_payload_recv); + grpc_byte_buffer_destroy (response_payload_recv); + } + + gpr_slice_unref (request_payload_slice); + gpr_slice_unref (response_payload_slice); op = ops; op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(3), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (3), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); op = ops; op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; @@ -244,34 +261,37 @@ static void test_pingpong_streaming(grpc_end2end_test_config config, op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(104), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (104), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(1), 1); - cq_expect_completion(cqv, tag(3), 1); - cq_expect_completion(cqv, tag(101), 1); - cq_expect_completion(cqv, tag(104), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (1), 1); + cq_expect_completion (cqv, tag (3), 1); + cq_expect_completion (cqv, tag (101), 1); + cq_expect_completion (cqv, tag (104), 1); + cq_verify (cqv); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); - gpr_free(details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); + gpr_free (details); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ int i; - for (i = 1; i < 10; i++) { - test_pingpong_streaming(config, i); - } + for (i = 1; i < 10; i++) + { + test_pingpong_streaming (config, i); + } } diff --git a/test/core/end2end/tests/registered_call.c b/test/core/end2end/tests/registered_call.c index b3156e0248a..b30498a9900 100644 --- a/test/core/end2end/tests/registered_call.c +++ b/test/core/end2end/tests/registered_call.c @@ -45,65 +45,87 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void simple_request_body(grpc_end2end_test_fixture f, void *rc) { +static void +simple_request_body (grpc_end2end_test_fixture f, void *rc) +{ grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f.cq); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -116,14 +138,13 @@ static void simple_request_body(grpc_end2end_test_fixture f, void *rc) { size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_registered_call( - f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, rc, deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_registered_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, rc, deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -148,15 +169,13 @@ static void simple_request_body(grpc_end2end_test_fixture f, void *rc) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -176,58 +195,63 @@ static void simple_request_body(grpc_end2end_test_fixture f, void *rc) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT(was_cancelled == 1); + GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT (was_cancelled == 1); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); } -static void test_invoke_simple_request(grpc_end2end_test_config config) { - grpc_end2end_test_fixture f = - begin_test(config, "test_invoke_simple_request", NULL, NULL); - void *rc = grpc_channel_register_call(f.client, "/foo", - "foo.test.google.fr:1234", NULL); +static void +test_invoke_simple_request (grpc_end2end_test_config config) +{ + grpc_end2end_test_fixture f = begin_test (config, "test_invoke_simple_request", NULL, NULL); + void *rc = grpc_channel_register_call (f.client, "/foo", + "foo.test.google.fr:1234", NULL); - simple_request_body(f, rc); - end_test(&f); - config.tear_down_data(&f); + simple_request_body (f, rc); + end_test (&f); + config.tear_down_data (&f); } -static void test_invoke_10_simple_requests(grpc_end2end_test_config config) { +static void +test_invoke_10_simple_requests (grpc_end2end_test_config config) +{ int i; - grpc_end2end_test_fixture f = - begin_test(config, "test_invoke_10_simple_requests", NULL, NULL); - void *rc = grpc_channel_register_call(f.client, "/foo", - "foo.test.google.fr:1234", NULL); - - for (i = 0; i < 10; i++) { - simple_request_body(f, rc); - gpr_log(GPR_INFO, "Passed simple request %d", i); - } - end_test(&f); - config.tear_down_data(&f); + grpc_end2end_test_fixture f = begin_test (config, "test_invoke_10_simple_requests", NULL, NULL); + void *rc = grpc_channel_register_call (f.client, "/foo", + "foo.test.google.fr:1234", NULL); + + for (i = 0; i < 10; i++) + { + simple_request_body (f, rc); + gpr_log (GPR_INFO, "Passed simple request %d", i); + } + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_invoke_simple_request(config); - test_invoke_10_simple_requests(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_invoke_simple_request (config); + test_invoke_10_simple_requests (config); } diff --git a/test/core/end2end/tests/request_with_flags.c b/test/core/end2end/tests/request_with_flags.c index b9cdf5168ce..49474bb14fc 100644 --- a/test/core/end2end/tests/request_with_flags.c +++ b/test/core/end2end/tests/request_with_flags.c @@ -44,71 +44,89 @@ #include "src/core/transport/stream_op.h" #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void test_invoke_request_with_flags( - grpc_end2end_test_config config, gpr_uint32 *flags_for_op, - grpc_call_error call_start_batch_expected_result) { +static void +test_invoke_request_with_flags (grpc_end2end_test_config config, gpr_uint32 * flags_for_op, grpc_call_error call_start_batch_expected_result) +{ grpc_call *c; - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); - gpr_timespec deadline = GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10); - grpc_end2end_test_fixture f = - begin_test(config, "test_invoke_request_with_flags", NULL, NULL); - cq_verifier *cqv = cq_verifier_create(f.cq); + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + gpr_timespec deadline = GRPC_TIMEOUT_MILLIS_TO_DEADLINE (10); + grpc_end2end_test_fixture f = begin_test (config, "test_invoke_request_with_flags", NULL, NULL); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -122,14 +140,13 @@ static void test_invoke_request_with_flags( size_t details_capacity = 0; grpc_call_error expectation; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -160,57 +177,63 @@ static void test_invoke_request_with_flags( op->reserved = NULL; op++; expectation = call_start_batch_expected_result; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(expectation == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (expectation == error); - if (expectation == GRPC_CALL_OK) { - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); - } + if (expectation == GRPC_CALL_OK) + { + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); + } - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); + grpc_call_destroy (c); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(request_payload_recv); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (request_payload_recv); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ size_t i; gpr_uint32 flags_for_op[GRPC_OP_RECV_CLOSE_ON_SERVER + 1]; { /* check that all grpc_op_types fail when their flag value is set to an * invalid value */ - int indices[] = {GRPC_OP_SEND_INITIAL_METADATA, GRPC_OP_SEND_MESSAGE, - GRPC_OP_SEND_CLOSE_FROM_CLIENT, - GRPC_OP_RECV_INITIAL_METADATA, - GRPC_OP_RECV_STATUS_ON_CLIENT}; - for (i = 0; i < GPR_ARRAY_SIZE(indices); ++i) { - memset(flags_for_op, 0, sizeof(flags_for_op)); - flags_for_op[indices[i]] = 0xDEADBEEF; - test_invoke_request_with_flags(config, flags_for_op, - GRPC_CALL_ERROR_INVALID_FLAGS); - } + int indices[] = { GRPC_OP_SEND_INITIAL_METADATA, GRPC_OP_SEND_MESSAGE, + GRPC_OP_SEND_CLOSE_FROM_CLIENT, + GRPC_OP_RECV_INITIAL_METADATA, + GRPC_OP_RECV_STATUS_ON_CLIENT + }; + for (i = 0; i < GPR_ARRAY_SIZE (indices); ++i) + { + memset (flags_for_op, 0, sizeof (flags_for_op)); + flags_for_op[indices[i]] = 0xDEADBEEF; + test_invoke_request_with_flags (config, flags_for_op, GRPC_CALL_ERROR_INVALID_FLAGS); + } } { /* check valid operation with allowed flags for GRPC_OP_SEND_BUFFER */ - gpr_uint32 flags[] = {GRPC_WRITE_BUFFER_HINT, GRPC_WRITE_NO_COMPRESS, - GRPC_WRITE_INTERNAL_COMPRESS}; - for (i = 0; i < GPR_ARRAY_SIZE(flags); ++i) { - memset(flags_for_op, 0, sizeof(flags_for_op)); - flags_for_op[GRPC_OP_SEND_MESSAGE] = flags[i]; - test_invoke_request_with_flags(config, flags_for_op, GRPC_CALL_OK); - } + gpr_uint32 flags[] = { GRPC_WRITE_BUFFER_HINT, GRPC_WRITE_NO_COMPRESS, + GRPC_WRITE_INTERNAL_COMPRESS + }; + for (i = 0; i < GPR_ARRAY_SIZE (flags); ++i) + { + memset (flags_for_op, 0, sizeof (flags_for_op)); + flags_for_op[GRPC_OP_SEND_MESSAGE] = flags[i]; + test_invoke_request_with_flags (config, flags_for_op, GRPC_CALL_OK); + } } } diff --git a/test/core/end2end/tests/request_with_payload.c b/test/core/end2end/tests/request_with_payload.c index a323b43ab08..bbfbae8140e 100644 --- a/test/core/end2end/tests/request_with_payload.c +++ b/test/core/end2end/tests/request_with_payload.c @@ -43,71 +43,91 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } /* Client sends a request with payload, server reads then returns status. */ -static void test_invoke_request_with_payload(grpc_end2end_test_config config) { +static void +test_invoke_request_with_payload (grpc_end2end_test_config config) +{ grpc_call *c; grpc_call *s; - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); - gpr_timespec deadline = five_seconds_time(); - grpc_end2end_test_fixture f = - begin_test(config, "test_invoke_request_with_payload", NULL, NULL); - cq_verifier *cqv = cq_verifier_create(f.cq); + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + gpr_timespec deadline = five_seconds_time (); + grpc_end2end_test_fixture f = begin_test (config, "test_invoke_request_with_payload", NULL, NULL); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -121,14 +141,13 @@ static void test_invoke_request_with_payload(grpc_end2end_test_config config) { size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -158,14 +177,12 @@ static void test_invoke_request_with_payload(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call( - f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101))); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + GPR_ASSERT (GRPC_CALL_OK == grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101))); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -178,11 +195,11 @@ static void test_invoke_request_with_payload(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -197,38 +214,40 @@ static void test_invoke_request_with_payload(grpc_end2end_test_config config) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(103), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (103), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_OK); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); - GPR_ASSERT(was_cancelled == 0); - GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); + GPR_ASSERT (status == GRPC_STATUS_OK); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); + GPR_ASSERT (was_cancelled == 0); + GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, "hello world")); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(request_payload_recv); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (request_payload_recv); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_invoke_request_with_payload(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_invoke_request_with_payload (config); } diff --git a/test/core/end2end/tests/server_finishes_request.c b/test/core/end2end/tests/server_finishes_request.c index bdc18a5e381..14830735a23 100644 --- a/test/core/end2end/tests/server_finishes_request.c +++ b/test/core/end2end/tests/server_finishes_request.c @@ -45,65 +45,87 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void simple_request_body(grpc_end2end_test_fixture f) { +static void +simple_request_body (grpc_end2end_test_fixture f) +{ grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f.cq); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -116,15 +138,13 @@ static void simple_request_body(grpc_end2end_test_fixture f) { size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr:1234", deadline, - NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr:1234", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -145,15 +165,13 @@ static void simple_request_body(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -173,40 +191,44 @@ static void simple_request_body(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT(was_cancelled == 1); + GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT (was_cancelled == 1); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); } -static void test_invoke_simple_request(grpc_end2end_test_config config) { +static void +test_invoke_simple_request (grpc_end2end_test_config config) +{ grpc_end2end_test_fixture f; - f = begin_test(config, "test_invoke_simple_request", NULL, NULL); - simple_request_body(f); - end_test(&f); - config.tear_down_data(&f); + f = begin_test (config, "test_invoke_simple_request", NULL, NULL); + simple_request_body (f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_invoke_simple_request(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_invoke_simple_request (config); } diff --git a/test/core/end2end/tests/shutdown_finishes_calls.c b/test/core/end2end/tests/shutdown_finishes_calls.c index ad7def09a94..a9d8535e314 100644 --- a/test/core/end2end/tests/shutdown_finishes_calls.c +++ b/test/core/end2end/tests/shutdown_finishes_calls.c @@ -43,57 +43,76 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void test_early_server_shutdown_finishes_inflight_calls( - grpc_end2end_test_config config) { +static void +test_early_server_shutdown_finishes_inflight_calls (grpc_end2end_test_config config) +{ grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time(); - grpc_end2end_test_fixture f = begin_test( - config, "test_early_server_shutdown_finishes_inflight_calls", NULL, NULL); - cq_verifier *cqv = cq_verifier_create(f.cq); + gpr_timespec deadline = five_seconds_time (); + grpc_end2end_test_fixture f = begin_test (config, "test_early_server_shutdown_finishes_inflight_calls", NULL, NULL); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -106,14 +125,13 @@ static void test_early_server_shutdown_finishes_inflight_calls( size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -139,15 +157,13 @@ static void test_early_server_shutdown_finishes_inflight_calls( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -155,40 +171,42 @@ static void test_early_server_shutdown_finishes_inflight_calls( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); /* shutdown and destroy the server */ - grpc_server_shutdown_and_notify(f.server, f.cq, tag(1000)); - grpc_server_cancel_all_calls(f.server); + grpc_server_shutdown_and_notify (f.server, f.cq, tag (1000)); + grpc_server_cancel_all_calls (f.server); - cq_expect_completion(cqv, tag(1000), 1); - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (1000), 1); + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - grpc_server_destroy(f.server); + grpc_server_destroy (f.server); - GPR_ASSERT(status == GRPC_STATUS_UNAVAILABLE); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); - GPR_ASSERT(was_cancelled == 1); + GPR_ASSERT (status == GRPC_STATUS_UNAVAILABLE); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); + GPR_ASSERT (was_cancelled == 1); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_early_server_shutdown_finishes_inflight_calls(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_early_server_shutdown_finishes_inflight_calls (config); } diff --git a/test/core/end2end/tests/shutdown_finishes_tags.c b/test/core/end2end/tests/shutdown_finishes_tags.c index 9b678a17541..9569d42424d 100644 --- a/test/core/end2end/tests/shutdown_finishes_tags.c +++ b/test/core/end2end/tests/shutdown_finishes_tags.c @@ -43,79 +43,98 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void test_early_server_shutdown_finishes_tags( - grpc_end2end_test_config config) { - grpc_end2end_test_fixture f = begin_test( - config, "test_early_server_shutdown_finishes_tags", NULL, NULL); - cq_verifier *cqv = cq_verifier_create(f.cq); - grpc_call *s = (void *)1; +static void +test_early_server_shutdown_finishes_tags (grpc_end2end_test_config config) +{ + grpc_end2end_test_fixture f = begin_test (config, "test_early_server_shutdown_finishes_tags", NULL, NULL); + cq_verifier *cqv = cq_verifier_create (f.cq); + grpc_call *s = (void *) 1; grpc_call_details call_details; grpc_metadata_array request_metadata_recv; - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); /* upon shutdown, the server should finish all requested calls indicating no new call */ - GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call( - f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101))); - grpc_server_shutdown_and_notify(f.server, f.cq, tag(1000)); - cq_expect_completion(cqv, tag(101), 0); - cq_expect_completion(cqv, tag(1000), 1); - cq_verify(cqv); - GPR_ASSERT(s == NULL); - - grpc_server_destroy(f.server); - - end_test(&f); - config.tear_down_data(&f); - cq_verifier_destroy(cqv); + GPR_ASSERT (GRPC_CALL_OK == grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101))); + grpc_server_shutdown_and_notify (f.server, f.cq, tag (1000)); + cq_expect_completion (cqv, tag (101), 0); + cq_expect_completion (cqv, tag (1000), 1); + cq_verify (cqv); + GPR_ASSERT (s == NULL); + + grpc_server_destroy (f.server); + + end_test (&f); + config.tear_down_data (&f); + cq_verifier_destroy (cqv); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_early_server_shutdown_finishes_tags(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_early_server_shutdown_finishes_tags (config); } diff --git a/test/core/end2end/tests/simple_delayed_request.c b/test/core/end2end/tests/simple_delayed_request.c index 14e0ac8f665..ea21827b3ea 100644 --- a/test/core/end2end/tests/simple_delayed_request.c +++ b/test/core/end2end/tests/simple_delayed_request.c @@ -43,57 +43,76 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void simple_delayed_request_body(grpc_end2end_test_config config, - grpc_end2end_test_fixture *f, - grpc_channel_args *client_args, - grpc_channel_args *server_args, - long delay_us) { +static void +simple_delayed_request_body (grpc_end2end_test_config config, grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_channel_args * server_args, long delay_us) +{ grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f->cq); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f->cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -106,16 +125,15 @@ static void simple_delayed_request_body(grpc_end2end_test_config config, size_t details_capacity = 0; int was_cancelled = 2; - config.init_client(f, client_args); + config.init_client (f, client_args); - c = grpc_channel_create_call(f->client, NULL, GRPC_PROPAGATE_DEFAULTS, f->cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f->client, NULL, GRPC_PROPAGATE_DEFAULTS, f->cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -140,17 +158,15 @@ static void simple_delayed_request_body(grpc_end2end_test_config config, op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - config.init_server(f, server_args); + config.init_server (f, server_args); - error = - grpc_server_request_call(f->server, &s, &call_details, - &request_metadata_recv, f->cq, f->cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f->server, &s, &call_details, &request_metadata_recv, f->cq, f->cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -170,54 +186,60 @@ static void simple_delayed_request_body(grpc_end2end_test_config config, op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); - GPR_ASSERT(was_cancelled == 1); + GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); + GPR_ASSERT (was_cancelled == 1); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); } -static void test_simple_delayed_request_short(grpc_end2end_test_config config) { +static void +test_simple_delayed_request_short (grpc_end2end_test_config config) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", "test_simple_delayed_request_short", config.name); - f = config.create_fixture(NULL, NULL); - simple_delayed_request_body(config, &f, NULL, NULL, 100000); - end_test(&f); - config.tear_down_data(&f); + gpr_log (GPR_INFO, "%s/%s", "test_simple_delayed_request_short", config.name); + f = config.create_fixture (NULL, NULL); + simple_delayed_request_body (config, &f, NULL, NULL, 100000); + end_test (&f); + config.tear_down_data (&f); } -static void test_simple_delayed_request_long(grpc_end2end_test_config config) { +static void +test_simple_delayed_request_long (grpc_end2end_test_config config) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", "test_simple_delayed_request_long", config.name); - f = config.create_fixture(NULL, NULL); + gpr_log (GPR_INFO, "%s/%s", "test_simple_delayed_request_long", config.name); + f = config.create_fixture (NULL, NULL); /* This timeout should be longer than a single retry */ - simple_delayed_request_body(config, &f, NULL, NULL, 1500000); - end_test(&f); - config.tear_down_data(&f); + simple_delayed_request_body (config, &f, NULL, NULL, 1500000); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - GPR_ASSERT(config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION); - test_simple_delayed_request_short(config); - test_simple_delayed_request_long(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + GPR_ASSERT (config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION); + test_simple_delayed_request_short (config); + test_simple_delayed_request_long (config); } diff --git a/test/core/end2end/tests/simple_request.c b/test/core/end2end/tests/simple_request.c index a8746408372..76f00912984 100644 --- a/test/core/end2end/tests/simple_request.c +++ b/test/core/end2end/tests/simple_request.c @@ -45,65 +45,87 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } -static void simple_request_body(grpc_end2end_test_fixture f) { +static void +simple_request_body (grpc_end2end_test_fixture f) +{ grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time(); - cq_verifier *cqv = cq_verifier_create(f.cq); + gpr_timespec deadline = five_seconds_time (); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -117,20 +139,18 @@ static void simple_request_body(grpc_end2end_test_fixture f) { int was_cancelled = 2; char *peer; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr:1234", deadline, - NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr:1234", deadline, NULL); + GPR_ASSERT (c); - peer = grpc_call_get_peer(c); - GPR_ASSERT(peer != NULL); - gpr_log(GPR_DEBUG, "client_peer_before_call=%s", peer); - gpr_free(peer); + peer = grpc_call_get_peer (c); + GPR_ASSERT (peer != NULL); + gpr_log (GPR_DEBUG, "client_peer_before_call=%s", peer); + gpr_free (peer); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -155,24 +175,22 @@ static void simple_request_body(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); - - peer = grpc_call_get_peer(s); - GPR_ASSERT(peer != NULL); - gpr_log(GPR_DEBUG, "server_peer=%s", peer); - gpr_free(peer); - peer = grpc_call_get_peer(c); - GPR_ASSERT(peer != NULL); - gpr_log(GPR_DEBUG, "client_peer=%s", peer); - gpr_free(peer); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); + + peer = grpc_call_get_peer (s); + GPR_ASSERT (peer != NULL); + gpr_log (GPR_DEBUG, "server_peer=%s", peer); + gpr_free (peer); + peer = grpc_call_get_peer (c); + GPR_ASSERT (peer != NULL); + gpr_log (GPR_DEBUG, "client_peer=%s", peer); + gpr_free (peer); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -192,56 +210,63 @@ static void simple_request_body(grpc_end2end_test_fixture f) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT(was_cancelled == 1); + GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT (was_cancelled == 1); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); } -static void test_invoke_simple_request(grpc_end2end_test_config config) { +static void +test_invoke_simple_request (grpc_end2end_test_config config) +{ grpc_end2end_test_fixture f; - f = begin_test(config, "test_invoke_simple_request", NULL, NULL); - simple_request_body(f); - end_test(&f); - config.tear_down_data(&f); + f = begin_test (config, "test_invoke_simple_request", NULL, NULL); + simple_request_body (f); + end_test (&f); + config.tear_down_data (&f); } -static void test_invoke_10_simple_requests(grpc_end2end_test_config config) { +static void +test_invoke_10_simple_requests (grpc_end2end_test_config config) +{ int i; - grpc_end2end_test_fixture f = - begin_test(config, "test_invoke_10_simple_requests", NULL, NULL); - for (i = 0; i < 10; i++) { - simple_request_body(f); - gpr_log(GPR_INFO, "Passed simple request %d", i); - } - end_test(&f); - config.tear_down_data(&f); + grpc_end2end_test_fixture f = begin_test (config, "test_invoke_10_simple_requests", NULL, NULL); + for (i = 0; i < 10; i++) + { + simple_request_body (f); + gpr_log (GPR_INFO, "Passed simple request %d", i); + } + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ int i; - for (i = 0; i < 10; i++) { - test_invoke_simple_request(config); - } - test_invoke_10_simple_requests(config); + for (i = 0; i < 10; i++) + { + test_invoke_simple_request (config); + } + test_invoke_10_simple_requests (config); } diff --git a/test/core/end2end/tests/trailing_metadata.c b/test/core/end2end/tests/trailing_metadata.c index c040b9fac14..28bcfadc8a8 100644 --- a/test/core/end2end/tests/trailing_metadata.c +++ b/test/core/end2end/tests/trailing_metadata.c @@ -43,84 +43,105 @@ #include #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; +enum +{ TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, - const char *test_name, - grpc_channel_args *client_args, - grpc_channel_args *server_args) { +static grpc_end2end_test_fixture +begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) +{ grpc_end2end_test_fixture f; - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture(client_args, server_args); - config.init_client(&f, client_args); - config.init_server(&f, server_args); + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture (client_args, server_args); + config.init_client (&f, client_args); + config.init_server (&f, server_args); return f; } -static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); +static gpr_timespec +n_seconds_time (int n) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec +five_seconds_time (void) +{ + return n_seconds_time (5); +} -static void drain_cq(grpc_completion_queue *cq) { +static void +drain_cq (grpc_completion_queue * cq) +{ grpc_event ev; - do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); - } while (ev.type != GRPC_QUEUE_SHUTDOWN); + do + { + ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); + } + while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void shutdown_server(grpc_end2end_test_fixture *f) { - if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_server_destroy(f->server); +static void +shutdown_server (grpc_end2end_test_fixture * f) +{ + if (!f->server) + return; + grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_server_destroy (f->server); f->server = NULL; } -static void shutdown_client(grpc_end2end_test_fixture *f) { - if (!f->client) return; - grpc_channel_destroy(f->client); +static void +shutdown_client (grpc_end2end_test_fixture * f) +{ + if (!f->client) + return; + grpc_channel_destroy (f->client); f->client = NULL; } -static void end_test(grpc_end2end_test_fixture *f) { - shutdown_server(f); - shutdown_client(f); +static void +end_test (grpc_end2end_test_fixture * f) +{ + shutdown_server (f); + shutdown_client (f); - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); - grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_shutdown (f->cq); + drain_cq (f->cq); + grpc_completion_queue_destroy (f->cq); } /* Request/response with metadata and payload.*/ -static void test_request_response_with_metadata_and_payload( - grpc_end2end_test_config config) { +static void +test_request_response_with_metadata_and_payload (grpc_end2end_test_config config) +{ grpc_call *c; grpc_call *s; - gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); - grpc_byte_buffer *request_payload = - grpc_raw_byte_buffer_create(&request_payload_slice, 1); - grpc_byte_buffer *response_payload = - grpc_raw_byte_buffer_create(&response_payload_slice, 1); - gpr_timespec deadline = five_seconds_time(); + gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); + grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); + gpr_timespec deadline = five_seconds_time (); grpc_metadata meta_c[2] = { - {"key1", "val1", 4, 0, {{NULL, NULL, NULL, NULL}}}, - {"key2", "val2", 4, 0, {{NULL, NULL, NULL, NULL}}}}; + {"key1", "val1", 4, 0, {{NULL, NULL, NULL, NULL}}}, + {"key2", "val2", 4, 0, {{NULL, NULL, NULL, NULL}}} + }; grpc_metadata meta_s[2] = { - {"key3", "val3", 4, 0, {{NULL, NULL, NULL, NULL}}}, - {"key4", "val4", 4, 0, {{NULL, NULL, NULL, NULL}}}}; + {"key3", "val3", 4, 0, {{NULL, NULL, NULL, NULL}}}, + {"key4", "val4", 4, 0, {{NULL, NULL, NULL, NULL}}} + }; grpc_metadata meta_t[2] = { - {"key5", "val5", 4, 0, {{NULL, NULL, NULL, NULL}}}, - {"key6", "val6", 4, 0, {{NULL, NULL, NULL, NULL}}}}; - grpc_end2end_test_fixture f = begin_test( - config, "test_request_response_with_metadata_and_payload", NULL, NULL); - cq_verifier *cqv = cq_verifier_create(f.cq); + {"key5", "val5", 4, 0, {{NULL, NULL, NULL, NULL}}}, + {"key6", "val6", 4, 0, {{NULL, NULL, NULL, NULL}}} + }; + grpc_end2end_test_fixture f = begin_test (config, "test_request_response_with_metadata_and_payload", NULL, NULL); + cq_verifier *cqv = cq_verifier_create (f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -135,14 +156,13 @@ static void test_request_response_with_metadata_and_payload( size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT(c); + c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT (c); - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_metadata_array_init(&request_metadata_recv); - grpc_call_details_init(&call_details); + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init (&request_metadata_recv); + grpc_call_details_init (&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -178,15 +198,13 @@ static void test_request_response_with_metadata_and_payload( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - error = - grpc_server_request_call(f.server, &s, &call_details, - &request_metadata_recv, f.cq, f.cq, tag(101)); - GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); - cq_verify(cqv); + error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); + GPR_ASSERT (GRPC_CALL_OK == error); + cq_expect_completion (cqv, tag (101), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -200,11 +218,11 @@ static void test_request_response_with_metadata_and_payload( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (102), 1); + cq_verify (cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -225,46 +243,48 @@ static void test_request_response_with_metadata_and_payload( op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(103), 1); - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (103), 1); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - GPR_ASSERT(status == GRPC_STATUS_OK); - GPR_ASSERT(0 == strcmp(details, "xyz")); - GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); - GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); - GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); - GPR_ASSERT(byte_buffer_eq_string(response_payload_recv, "hello you")); - GPR_ASSERT(contains_metadata(&request_metadata_recv, "key1", "val1")); - GPR_ASSERT(contains_metadata(&request_metadata_recv, "key2", "val2")); - GPR_ASSERT(contains_metadata(&initial_metadata_recv, "key3", "val3")); - GPR_ASSERT(contains_metadata(&initial_metadata_recv, "key4", "val4")); - GPR_ASSERT(contains_metadata(&trailing_metadata_recv, "key5", "val5")); - GPR_ASSERT(contains_metadata(&trailing_metadata_recv, "key6", "val6")); + GPR_ASSERT (status == GRPC_STATUS_OK); + GPR_ASSERT (0 == strcmp (details, "xyz")); + GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); + GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); + GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, "hello world")); + GPR_ASSERT (byte_buffer_eq_string (response_payload_recv, "hello you")); + GPR_ASSERT (contains_metadata (&request_metadata_recv, "key1", "val1")); + GPR_ASSERT (contains_metadata (&request_metadata_recv, "key2", "val2")); + GPR_ASSERT (contains_metadata (&initial_metadata_recv, "key3", "val3")); + GPR_ASSERT (contains_metadata (&initial_metadata_recv, "key4", "val4")); + GPR_ASSERT (contains_metadata (&trailing_metadata_recv, "key5", "val5")); + GPR_ASSERT (contains_metadata (&trailing_metadata_recv, "key6", "val6")); - gpr_free(details); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_metadata_array_destroy(&request_metadata_recv); - grpc_call_details_destroy(&call_details); + gpr_free (details); + grpc_metadata_array_destroy (&initial_metadata_recv); + grpc_metadata_array_destroy (&trailing_metadata_recv); + grpc_metadata_array_destroy (&request_metadata_recv); + grpc_call_details_destroy (&call_details); - grpc_call_destroy(c); - grpc_call_destroy(s); + grpc_call_destroy (c); + grpc_call_destroy (s); - cq_verifier_destroy(cqv); + cq_verifier_destroy (cqv); - grpc_byte_buffer_destroy(request_payload); - grpc_byte_buffer_destroy(response_payload); - grpc_byte_buffer_destroy(request_payload_recv); - grpc_byte_buffer_destroy(response_payload_recv); + grpc_byte_buffer_destroy (request_payload); + grpc_byte_buffer_destroy (response_payload); + grpc_byte_buffer_destroy (request_payload_recv); + grpc_byte_buffer_destroy (response_payload_recv); - end_test(&f); - config.tear_down_data(&f); + end_test (&f); + config.tear_down_data (&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { - test_request_response_with_metadata_and_payload(config); +void +grpc_end2end_tests (grpc_end2end_test_config config) +{ + test_request_response_with_metadata_and_payload (config); } diff --git a/test/core/fling/client.c b/test/core/fling/client.c index a53411c2f56..29d81530061 100644 --- a/test/core/fling/client.c +++ b/test/core/fling/client.c @@ -60,9 +60,11 @@ static char *details = NULL; static size_t details_capacity = 0; static grpc_op *op; -static void init_ping_pong_request(void) { - grpc_metadata_array_init(&initial_metadata_recv); - grpc_metadata_array_init(&trailing_metadata_recv); +static void +init_ping_pong_request (void) +{ + grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); op = ops; @@ -88,31 +90,29 @@ static void init_ping_pong_request(void) { op++; } -static void step_ping_pong_request(void) { - call = grpc_channel_create_call(channel, NULL, GRPC_PROPAGATE_DEFAULTS, cq, - "/Reflector/reflectUnary", "localhost", - gpr_inf_future(GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(call, ops, - (size_t)(op - ops), - (void *)1, NULL)); - grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), NULL); - grpc_call_destroy(call); - grpc_byte_buffer_destroy(response_payload_recv); +static void +step_ping_pong_request (void) +{ + call = grpc_channel_create_call (channel, NULL, GRPC_PROPAGATE_DEFAULTS, cq, "/Reflector/reflectUnary", "localhost", gpr_inf_future (GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT (GRPC_CALL_OK == grpc_call_start_batch (call, ops, (size_t) (op - ops), (void *) 1, NULL)); + grpc_completion_queue_next (cq, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); + grpc_call_destroy (call); + grpc_byte_buffer_destroy (response_payload_recv); call = NULL; } -static void init_ping_pong_stream(void) { +static void +init_ping_pong_stream (void) +{ grpc_call_error error; - call = grpc_channel_create_call(channel, NULL, GRPC_PROPAGATE_DEFAULTS, cq, - "/Reflector/reflectStream", "localhost", - gpr_inf_future(GPR_CLOCK_REALTIME), NULL); + call = grpc_channel_create_call (channel, NULL, GRPC_PROPAGATE_DEFAULTS, cq, "/Reflector/reflectStream", "localhost", gpr_inf_future (GPR_CLOCK_REALTIME), NULL); stream_init_op.op = GRPC_OP_SEND_INITIAL_METADATA; stream_init_op.data.send_initial_metadata.count = 0; - error = grpc_call_start_batch(call, &stream_init_op, 1, (void *)1, NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), NULL); + error = grpc_call_start_batch (call, &stream_init_op, 1, (void *) 1, NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + grpc_completion_queue_next (cq, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); - grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init (&initial_metadata_recv); stream_step_ops[0].op = GRPC_OP_SEND_MESSAGE; stream_step_ops[0].data.send_message = the_buffer; @@ -120,32 +120,39 @@ static void init_ping_pong_stream(void) { stream_step_ops[1].data.recv_message = &response_payload_recv; } -static void step_ping_pong_stream(void) { +static void +step_ping_pong_stream (void) +{ grpc_call_error error; - error = grpc_call_start_batch(call, stream_step_ops, 2, (void *)1, NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), NULL); - grpc_byte_buffer_destroy(response_payload_recv); + error = grpc_call_start_batch (call, stream_step_ops, 2, (void *) 1, NULL); + GPR_ASSERT (GRPC_CALL_OK == error); + grpc_completion_queue_next (cq, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); + grpc_byte_buffer_destroy (response_payload_recv); } -static double now(void) { - gpr_timespec tv = gpr_now(GPR_CLOCK_REALTIME); - return 1e9 * (double)tv.tv_sec + tv.tv_nsec; +static double +now (void) +{ + gpr_timespec tv = gpr_now (GPR_CLOCK_REALTIME); + return 1e9 * (double) tv.tv_sec + tv.tv_nsec; } -typedef struct { +typedef struct +{ const char *name; - void (*init)(); - void (*do_one_step)(); + void (*init) (); + void (*do_one_step) (); } scenario; static const scenario scenarios[] = { - {"ping-pong-request", init_ping_pong_request, step_ping_pong_request}, - {"ping-pong-stream", init_ping_pong_stream, step_ping_pong_stream}, + {"ping-pong-request", init_ping_pong_request, step_ping_pong_request}, + {"ping-pong-stream", init_ping_pong_stream, step_ping_pong_stream}, }; -int main(int argc, char **argv) { - gpr_slice slice = gpr_slice_from_copied_string("x"); +int +main (int argc, char **argv) +{ + gpr_slice slice = gpr_slice_from_copied_string ("x"); double start, stop; unsigned i; @@ -157,79 +164,82 @@ int main(int argc, char **argv) { gpr_cmdline *cl; grpc_event event; char *scenario_name = "ping-pong-request"; - scenario sc = {NULL, NULL, NULL}; + scenario sc = { NULL, NULL, NULL }; - GPR_ASSERT(argc >= 1); + GPR_ASSERT (argc >= 1); fake_argv[0] = argv[0]; - grpc_test_init(1, fake_argv); - - grpc_init(); - - cl = gpr_cmdline_create("fling client"); - gpr_cmdline_add_int(cl, "payload_size", "Size of the payload to send", - &payload_size); - gpr_cmdline_add_string(cl, "target", "Target host:port", &target); - gpr_cmdline_add_flag(cl, "secure", "Run with security?", &secure); - gpr_cmdline_add_string(cl, "scenario", "Scenario", &scenario_name); - gpr_cmdline_parse(cl, argc, argv); - gpr_cmdline_destroy(cl); - - for (i = 0; i < GPR_ARRAY_SIZE(scenarios); i++) { - if (0 == strcmp(scenarios[i].name, scenario_name)) { - sc = scenarios[i]; + grpc_test_init (1, fake_argv); + + grpc_init (); + + cl = gpr_cmdline_create ("fling client"); + gpr_cmdline_add_int (cl, "payload_size", "Size of the payload to send", &payload_size); + gpr_cmdline_add_string (cl, "target", "Target host:port", &target); + gpr_cmdline_add_flag (cl, "secure", "Run with security?", &secure); + gpr_cmdline_add_string (cl, "scenario", "Scenario", &scenario_name); + gpr_cmdline_parse (cl, argc, argv); + gpr_cmdline_destroy (cl); + + for (i = 0; i < GPR_ARRAY_SIZE (scenarios); i++) + { + if (0 == strcmp (scenarios[i].name, scenario_name)) + { + sc = scenarios[i]; + } } - } - if (!sc.name) { - fprintf(stderr, "unsupported scenario '%s'. Valid are:", scenario_name); - for (i = 0; i < GPR_ARRAY_SIZE(scenarios); i++) { - fprintf(stderr, " %s", scenarios[i].name); + if (!sc.name) + { + fprintf (stderr, "unsupported scenario '%s'. Valid are:", scenario_name); + for (i = 0; i < GPR_ARRAY_SIZE (scenarios); i++) + { + fprintf (stderr, " %s", scenarios[i].name); + } + return 1; } - return 1; - } - - channel = grpc_insecure_channel_create(target, NULL, NULL); - cq = grpc_completion_queue_create(NULL); - the_buffer = grpc_raw_byte_buffer_create(&slice, (size_t)payload_size); - histogram = gpr_histogram_create(0.01, 60e9); - - sc.init(); - - for (i = 0; i < 1000; i++) { - sc.do_one_step(); - } - - gpr_log(GPR_INFO, "start profiling"); - grpc_profiler_start("client.prof"); - for (i = 0; i < 100000; i++) { - start = now(); - sc.do_one_step(); - stop = now(); - gpr_histogram_add(histogram, stop - start); - } - grpc_profiler_stop(); - - if (call) { - grpc_call_destroy(call); - } - - grpc_channel_destroy(channel); - grpc_completion_queue_shutdown(cq); - do { - event = grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), - NULL); - } while (event.type != GRPC_QUEUE_SHUTDOWN); - grpc_completion_queue_destroy(cq); - grpc_byte_buffer_destroy(the_buffer); - gpr_slice_unref(slice); - - gpr_log(GPR_INFO, "latency (50/95/99/99.9): %f/%f/%f/%f", - gpr_histogram_percentile(histogram, 50), - gpr_histogram_percentile(histogram, 95), - gpr_histogram_percentile(histogram, 99), - gpr_histogram_percentile(histogram, 99.9)); - gpr_histogram_destroy(histogram); - - grpc_shutdown(); + + channel = grpc_insecure_channel_create (target, NULL, NULL); + cq = grpc_completion_queue_create (NULL); + the_buffer = grpc_raw_byte_buffer_create (&slice, (size_t) payload_size); + histogram = gpr_histogram_create (0.01, 60e9); + + sc.init (); + + for (i = 0; i < 1000; i++) + { + sc.do_one_step (); + } + + gpr_log (GPR_INFO, "start profiling"); + grpc_profiler_start ("client.prof"); + for (i = 0; i < 100000; i++) + { + start = now (); + sc.do_one_step (); + stop = now (); + gpr_histogram_add (histogram, stop - start); + } + grpc_profiler_stop (); + + if (call) + { + grpc_call_destroy (call); + } + + grpc_channel_destroy (channel); + grpc_completion_queue_shutdown (cq); + do + { + event = grpc_completion_queue_next (cq, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); + } + while (event.type != GRPC_QUEUE_SHUTDOWN); + grpc_completion_queue_destroy (cq); + grpc_byte_buffer_destroy (the_buffer); + gpr_slice_unref (slice); + + gpr_log (GPR_INFO, "latency (50/95/99/99.9): %f/%f/%f/%f", gpr_histogram_percentile (histogram, 50), gpr_histogram_percentile (histogram, 95), gpr_histogram_percentile (histogram, 99), gpr_histogram_percentile (histogram, 99.9)); + gpr_histogram_destroy (histogram); + + grpc_shutdown (); return 0; } diff --git a/test/core/fling/fling_stream_test.c b/test/core/fling/fling_stream_test.c index 78a73372aa8..0bda19f5e23 100644 --- a/test/core/fling/fling_stream_test.c +++ b/test/core/fling/fling_stream_test.c @@ -50,64 +50,77 @@ #include #include "test/core/util/port.h" -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ char *me = argv[0]; - char *lslash = strrchr(me, '/'); + char *lslash = strrchr (me, '/'); char root[1024]; - int port = grpc_pick_unused_port_or_die(); + int port = grpc_pick_unused_port_or_die (); char *args[10]; int status; pid_t svr, cli; /* seed rng with pid, so we don't end up with the same random numbers as a concurrently running test binary */ - srand((unsigned)getpid()); + srand ((unsigned) getpid ()); /* figure out where we are */ - if (lslash) { - memcpy(root, me, (size_t)(lslash - me)); - root[lslash - me] = 0; - } else { - strcpy(root, "."); - } + if (lslash) + { + memcpy (root, me, (size_t) (lslash - me)); + root[lslash - me] = 0; + } + else + { + strcpy (root, "."); + } /* start the server */ - svr = fork(); - if (svr == 0) { - gpr_asprintf(&args[0], "%s/fling_server", root); - args[1] = "--bind"; - gpr_join_host_port(&args[2], "::", port); - args[3] = "--no-secure"; - args[4] = 0; - execv(args[0], args); + svr = fork (); + if (svr == 0) + { + gpr_asprintf (&args[0], "%s/fling_server", root); + args[1] = "--bind"; + gpr_join_host_port (&args[2], "::", port); + args[3] = "--no-secure"; + args[4] = 0; + execv (args[0], args); - gpr_free(args[0]); - gpr_free(args[2]); - return 1; - } + gpr_free (args[0]); + gpr_free (args[2]); + return 1; + } /* wait a little */ - sleep(2); + sleep (2); /* start the client */ - cli = fork(); - if (cli == 0) { - gpr_asprintf(&args[0], "%s/fling_client", root); - args[1] = "--target"; - gpr_join_host_port(&args[2], "127.0.0.1", port); - args[3] = "--scenario=ping-pong-stream"; - args[4] = "--no-secure"; - args[5] = 0; - execv(args[0], args); + cli = fork (); + if (cli == 0) + { + gpr_asprintf (&args[0], "%s/fling_client", root); + args[1] = "--target"; + gpr_join_host_port (&args[2], "127.0.0.1", port); + args[3] = "--scenario=ping-pong-stream"; + args[4] = "--no-secure"; + args[5] = 0; + execv (args[0], args); - gpr_free(args[0]); - gpr_free(args[2]); - return 1; - } + gpr_free (args[0]); + gpr_free (args[2]); + return 1; + } /* wait for completion */ - printf("waiting for client\n"); - if (waitpid(cli, &status, 0) == -1) return 2; - if (!WIFEXITED(status)) return 4; - if (WEXITSTATUS(status)) return WEXITSTATUS(status); - printf("waiting for server\n"); - kill(svr, SIGINT); - if (waitpid(svr, &status, 0) == -1) return 2; - if (!WIFEXITED(status)) return 4; - if (WEXITSTATUS(status)) return WEXITSTATUS(status); + printf ("waiting for client\n"); + if (waitpid (cli, &status, 0) == -1) + return 2; + if (!WIFEXITED (status)) + return 4; + if (WEXITSTATUS (status)) + return WEXITSTATUS (status); + printf ("waiting for server\n"); + kill (svr, SIGINT); + if (waitpid (svr, &status, 0) == -1) + return 2; + if (!WIFEXITED (status)) + return 4; + if (WEXITSTATUS (status)) + return WEXITSTATUS (status); return 0; } diff --git a/test/core/fling/fling_test.c b/test/core/fling/fling_test.c index cf43ecfd2de..a4b789f6ca6 100644 --- a/test/core/fling/fling_test.c +++ b/test/core/fling/fling_test.c @@ -41,54 +41,58 @@ #include "src/core/support/string.h" #include "test/core/util/port.h" -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ char *me = argv[0]; - char *lslash = strrchr(me, '/'); + char *lslash = strrchr (me, '/'); char root[1024]; - int port = grpc_pick_unused_port_or_die(); + int port = grpc_pick_unused_port_or_die (); char *args[10]; int status; gpr_subprocess *svr, *cli; /* figure out where we are */ - if (lslash) { - memcpy(root, me, (size_t)(lslash - me)); - root[lslash - me] = 0; - } else { - strcpy(root, "."); - } + if (lslash) + { + memcpy (root, me, (size_t) (lslash - me)); + root[lslash - me] = 0; + } + else + { + strcpy (root, "."); + } /* start the server */ - gpr_asprintf(&args[0], "%s/fling_server%s", root, - gpr_subprocess_binary_extension()); + gpr_asprintf (&args[0], "%s/fling_server%s", root, gpr_subprocess_binary_extension ()); args[1] = "--bind"; - gpr_join_host_port(&args[2], "::", port); + gpr_join_host_port (&args[2], "::", port); args[3] = "--no-secure"; - svr = gpr_subprocess_create(4, (const char **)args); - gpr_free(args[0]); - gpr_free(args[2]); + svr = gpr_subprocess_create (4, (const char **) args); + gpr_free (args[0]); + gpr_free (args[2]); /* start the client */ - gpr_asprintf(&args[0], "%s/fling_client%s", root, - gpr_subprocess_binary_extension()); + gpr_asprintf (&args[0], "%s/fling_client%s", root, gpr_subprocess_binary_extension ()); args[1] = "--target"; - gpr_join_host_port(&args[2], "127.0.0.1", port); + gpr_join_host_port (&args[2], "127.0.0.1", port); args[3] = "--scenario=ping-pong-request"; args[4] = "--no-secure"; args[5] = 0; - cli = gpr_subprocess_create(6, (const char **)args); - gpr_free(args[0]); - gpr_free(args[2]); + cli = gpr_subprocess_create (6, (const char **) args); + gpr_free (args[0]); + gpr_free (args[2]); /* wait for completion */ - printf("waiting for client\n"); - if ((status = gpr_subprocess_join(cli))) { - gpr_subprocess_destroy(cli); - gpr_subprocess_destroy(svr); - return status; - } - gpr_subprocess_destroy(cli); + printf ("waiting for client\n"); + if ((status = gpr_subprocess_join (cli))) + { + gpr_subprocess_destroy (cli); + gpr_subprocess_destroy (svr); + return status; + } + gpr_subprocess_destroy (cli); - gpr_subprocess_interrupt(svr); - status = gpr_subprocess_join(svr); - gpr_subprocess_destroy(svr); + gpr_subprocess_interrupt (svr); + status = gpr_subprocess_join (svr); + gpr_subprocess_destroy (svr); return status; } diff --git a/test/core/fling/server.c b/test/core/fling/server.c index 5aace03520b..75c0edbd5ab 100644 --- a/test/core/fling/server.c +++ b/test/core/fling/server.c @@ -72,9 +72,14 @@ static int was_cancelled = 2; static grpc_op unary_ops[6]; static int got_sigint = 0; -static void *tag(gpr_intptr t) { return (void *)t; } +static void * +tag (gpr_intptr t) +{ + return (void *) t; +} -typedef enum { +typedef enum +{ FLING_SERVER_NEW_REQUEST = 1, FLING_SERVER_READ_FOR_UNARY, FLING_SERVER_BATCH_OPS_FOR_UNARY, @@ -84,22 +89,26 @@ typedef enum { FLING_SERVER_SEND_STATUS_FOR_STREAMING } fling_server_tags; -typedef struct { +typedef struct +{ gpr_refcount pending_ops; gpr_uint32 flags; } call_state; -static void request_call(void) { - grpc_metadata_array_init(&request_metadata_recv); - grpc_server_request_call(server, &call, &call_details, &request_metadata_recv, - cq, cq, tag(FLING_SERVER_NEW_REQUEST)); +static void +request_call (void) +{ + grpc_metadata_array_init (&request_metadata_recv); + grpc_server_request_call (server, &call, &call_details, &request_metadata_recv, cq, cq, tag (FLING_SERVER_NEW_REQUEST)); } -static void handle_unary_method(void) { +static void +handle_unary_method (void) +{ grpc_op *op; grpc_call_error error; - grpc_metadata_array_init(&initial_metadata_send); + grpc_metadata_array_init (&initial_metadata_send); op = unary_ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -109,9 +118,10 @@ static void handle_unary_method(void) { op->data.recv_message = &terminal_buffer; op++; op->op = GRPC_OP_SEND_MESSAGE; - if (payload_buffer == NULL) { - gpr_log(GPR_INFO, "NULL payload buffer !!!"); - } + if (payload_buffer == NULL) + { + gpr_log (GPR_INFO, "NULL payload buffer !!!"); + } op->data.send_message = payload_buffer; op++; op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; @@ -123,47 +133,55 @@ static void handle_unary_method(void) { op->data.recv_close_on_server.cancelled = &was_cancelled; op++; - error = grpc_call_start_batch(call, unary_ops, (size_t)(op - unary_ops), - tag(FLING_SERVER_BATCH_OPS_FOR_UNARY), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (call, unary_ops, (size_t) (op - unary_ops), tag (FLING_SERVER_BATCH_OPS_FOR_UNARY), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); } -static void send_initial_metadata(void) { +static void +send_initial_metadata (void) +{ grpc_call_error error; - void *tagarg = tag(FLING_SERVER_SEND_INIT_METADATA_FOR_STREAMING); - grpc_metadata_array_init(&initial_metadata_send); + void *tagarg = tag (FLING_SERVER_SEND_INIT_METADATA_FOR_STREAMING); + grpc_metadata_array_init (&initial_metadata_send); metadata_send_op.op = GRPC_OP_SEND_INITIAL_METADATA; metadata_send_op.data.send_initial_metadata.count = 0; - error = grpc_call_start_batch(call, &metadata_send_op, 1, tagarg, NULL); + error = grpc_call_start_batch (call, &metadata_send_op, 1, tagarg, NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + GPR_ASSERT (GRPC_CALL_OK == error); } -static void start_read_op(int t) { +static void +start_read_op (int t) +{ grpc_call_error error; /* Starting read at server */ read_op.op = GRPC_OP_RECV_MESSAGE; read_op.data.recv_message = &payload_buffer; - error = grpc_call_start_batch(call, &read_op, 1, tag(t), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (call, &read_op, 1, tag (t), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); } -static void start_write_op(void) { +static void +start_write_op (void) +{ grpc_call_error error; - void *tagarg = tag(FLING_SERVER_WRITE_FOR_STREAMING); + void *tagarg = tag (FLING_SERVER_WRITE_FOR_STREAMING); /* Starting write at server */ write_op.op = GRPC_OP_SEND_MESSAGE; - if (payload_buffer == NULL) { - gpr_log(GPR_INFO, "NULL payload buffer !!!"); - } + if (payload_buffer == NULL) + { + gpr_log (GPR_INFO, "NULL payload buffer !!!"); + } write_op.data.send_message = payload_buffer; - error = grpc_call_start_batch(call, &write_op, 1, tagarg, NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (call, &write_op, 1, tagarg, NULL); + GPR_ASSERT (GRPC_CALL_OK == error); } -static void start_send_status(void) { +static void +start_send_status (void) +{ grpc_call_error error; - void *tagarg = tag(FLING_SERVER_SEND_STATUS_FOR_STREAMING); + void *tagarg = tag (FLING_SERVER_SEND_STATUS_FOR_STREAMING); status_op[0].op = GRPC_OP_SEND_STATUS_FROM_SERVER; status_op[0].data.send_status_from_server.status = GRPC_STATUS_OK; status_op[0].data.send_status_from_server.trailing_metadata_count = 0; @@ -171,15 +189,21 @@ static void start_send_status(void) { status_op[1].op = GRPC_OP_RECV_CLOSE_ON_SERVER; status_op[1].data.recv_close_on_server.cancelled = &was_cancelled; - error = grpc_call_start_batch(call, status_op, 2, tagarg, NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (call, status_op, 2, tagarg, NULL); + GPR_ASSERT (GRPC_CALL_OK == error); } /* We have some sort of deadlock, so let's not exit gracefully for now. When that is resolved, please remove the #include above. */ -static void sigint_handler(int x) { _exit(0); } +static void +sigint_handler (int x) +{ + _exit (0); +} -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ grpc_event ev; call_state *s; char *addr_buf = NULL; @@ -192,136 +216,149 @@ int main(int argc, char **argv) { char *fake_argv[1]; - GPR_ASSERT(argc >= 1); + GPR_ASSERT (argc >= 1); fake_argv[0] = argv[0]; - grpc_test_init(1, fake_argv); - - grpc_init(); - srand((unsigned)clock()); - - cl = gpr_cmdline_create("fling server"); - gpr_cmdline_add_string(cl, "bind", "Bind host:port", &addr); - gpr_cmdline_add_flag(cl, "secure", "Run with security?", &secure); - gpr_cmdline_parse(cl, argc, argv); - gpr_cmdline_destroy(cl); - - if (addr == NULL) { - gpr_join_host_port(&addr_buf, "::", grpc_pick_unused_port_or_die()); - addr = addr_buf; - } - gpr_log(GPR_INFO, "creating server on: %s", addr); - - cq = grpc_completion_queue_create(NULL); - if (secure) { - grpc_ssl_pem_key_cert_pair pem_key_cert_pair = {test_server1_key, - test_server1_cert}; - grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create( - NULL, &pem_key_cert_pair, 1, 0, NULL); - server = grpc_server_create(NULL, NULL); - GPR_ASSERT(grpc_server_add_secure_http2_port(server, addr, ssl_creds)); - grpc_server_credentials_release(ssl_creds); - } else { - server = grpc_server_create(NULL, NULL); - GPR_ASSERT(grpc_server_add_insecure_http2_port(server, addr)); - } - grpc_server_register_completion_queue(server, cq, NULL); - grpc_server_start(server); - - gpr_free(addr_buf); - addr = addr_buf = NULL; + grpc_test_init (1, fake_argv); + + grpc_init (); + srand ((unsigned) clock ()); - grpc_call_details_init(&call_details); - - request_call(); - - grpc_profiler_start("server.prof"); - signal(SIGINT, sigint_handler); - while (!shutdown_finished) { - if (got_sigint && !shutdown_started) { - gpr_log(GPR_INFO, "Shutting down due to SIGINT"); - grpc_server_shutdown_and_notify(server, cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) - .type == GRPC_OP_COMPLETE); - grpc_completion_queue_shutdown(cq); - shutdown_started = 1; + cl = gpr_cmdline_create ("fling server"); + gpr_cmdline_add_string (cl, "bind", "Bind host:port", &addr); + gpr_cmdline_add_flag (cl, "secure", "Run with security?", &secure); + gpr_cmdline_parse (cl, argc, argv); + gpr_cmdline_destroy (cl); + + if (addr == NULL) + { + gpr_join_host_port (&addr_buf, "::", grpc_pick_unused_port_or_die ()); + addr = addr_buf; + } + gpr_log (GPR_INFO, "creating server on: %s", addr); + + cq = grpc_completion_queue_create (NULL); + if (secure) + { + grpc_ssl_pem_key_cert_pair pem_key_cert_pair = { test_server1_key, + test_server1_cert + }; + grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_key_cert_pair, 1, 0, NULL); + server = grpc_server_create (NULL, NULL); + GPR_ASSERT (grpc_server_add_secure_http2_port (server, addr, ssl_creds)); + grpc_server_credentials_release (ssl_creds); + } + else + { + server = grpc_server_create (NULL, NULL); + GPR_ASSERT (grpc_server_add_insecure_http2_port (server, addr)); } - ev = grpc_completion_queue_next( - cq, gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), - gpr_time_from_micros(1000000, GPR_TIMESPAN)), - NULL); - s = ev.tag; - switch (ev.type) { - case GRPC_OP_COMPLETE: - switch ((gpr_intptr)s) { - case FLING_SERVER_NEW_REQUEST: - if (call != NULL) { - if (0 == - strcmp(call_details.method, "/Reflector/reflectStream")) { - /* Received streaming call. Send metadata here. */ - start_read_op(FLING_SERVER_READ_FOR_STREAMING); - send_initial_metadata(); - } else { - /* Received unary call. Can do all ops in one batch. */ - start_read_op(FLING_SERVER_READ_FOR_UNARY); - } - } else { - GPR_ASSERT(shutdown_started); - } - /* request_call(); - */ - break; - case FLING_SERVER_READ_FOR_STREAMING: - if (payload_buffer != NULL) { - /* Received payload from client. */ - start_write_op(); - } else { - /* Received end of stream from client. */ - start_send_status(); - } - break; - case FLING_SERVER_WRITE_FOR_STREAMING: - /* Write completed at server */ - grpc_byte_buffer_destroy(payload_buffer); - payload_buffer = NULL; - start_read_op(FLING_SERVER_READ_FOR_STREAMING); - break; - case FLING_SERVER_SEND_INIT_METADATA_FOR_STREAMING: - /* Metadata send completed at server */ - break; - case FLING_SERVER_SEND_STATUS_FOR_STREAMING: - /* Send status and close completed at server */ - grpc_call_destroy(call); - if (!shutdown_started) request_call(); - break; - case FLING_SERVER_READ_FOR_UNARY: - /* Finished payload read for unary. Start all reamaining - * unary ops in a batch. - */ - handle_unary_method(); - break; - case FLING_SERVER_BATCH_OPS_FOR_UNARY: - /* Finished unary call. */ - grpc_byte_buffer_destroy(payload_buffer); - payload_buffer = NULL; - grpc_call_destroy(call); - if (!shutdown_started) request_call(); - break; - } - break; - case GRPC_QUEUE_SHUTDOWN: - GPR_ASSERT(shutdown_started); - shutdown_finished = 1; - break; - case GRPC_QUEUE_TIMEOUT: - break; + grpc_server_register_completion_queue (server, cq, NULL); + grpc_server_start (server); + + gpr_free (addr_buf); + addr = addr_buf = NULL; + + grpc_call_details_init (&call_details); + + request_call (); + + grpc_profiler_start ("server.prof"); + signal (SIGINT, sigint_handler); + while (!shutdown_finished) + { + if (got_sigint && !shutdown_started) + { + gpr_log (GPR_INFO, "Shutting down due to SIGINT"); + grpc_server_shutdown_and_notify (server, cq, tag (1000)); + GPR_ASSERT (grpc_completion_queue_pluck (cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); + grpc_completion_queue_shutdown (cq); + shutdown_started = 1; + } + ev = grpc_completion_queue_next (cq, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), gpr_time_from_micros (1000000, GPR_TIMESPAN)), NULL); + s = ev.tag; + switch (ev.type) + { + case GRPC_OP_COMPLETE: + switch ((gpr_intptr) s) + { + case FLING_SERVER_NEW_REQUEST: + if (call != NULL) + { + if (0 == strcmp (call_details.method, "/Reflector/reflectStream")) + { + /* Received streaming call. Send metadata here. */ + start_read_op (FLING_SERVER_READ_FOR_STREAMING); + send_initial_metadata (); + } + else + { + /* Received unary call. Can do all ops in one batch. */ + start_read_op (FLING_SERVER_READ_FOR_UNARY); + } + } + else + { + GPR_ASSERT (shutdown_started); + } + /* request_call(); + */ + break; + case FLING_SERVER_READ_FOR_STREAMING: + if (payload_buffer != NULL) + { + /* Received payload from client. */ + start_write_op (); + } + else + { + /* Received end of stream from client. */ + start_send_status (); + } + break; + case FLING_SERVER_WRITE_FOR_STREAMING: + /* Write completed at server */ + grpc_byte_buffer_destroy (payload_buffer); + payload_buffer = NULL; + start_read_op (FLING_SERVER_READ_FOR_STREAMING); + break; + case FLING_SERVER_SEND_INIT_METADATA_FOR_STREAMING: + /* Metadata send completed at server */ + break; + case FLING_SERVER_SEND_STATUS_FOR_STREAMING: + /* Send status and close completed at server */ + grpc_call_destroy (call); + if (!shutdown_started) + request_call (); + break; + case FLING_SERVER_READ_FOR_UNARY: + /* Finished payload read for unary. Start all reamaining + * unary ops in a batch. + */ + handle_unary_method (); + break; + case FLING_SERVER_BATCH_OPS_FOR_UNARY: + /* Finished unary call. */ + grpc_byte_buffer_destroy (payload_buffer); + payload_buffer = NULL; + grpc_call_destroy (call); + if (!shutdown_started) + request_call (); + break; + } + break; + case GRPC_QUEUE_SHUTDOWN: + GPR_ASSERT (shutdown_started); + shutdown_finished = 1; + break; + case GRPC_QUEUE_TIMEOUT: + break; + } } - } - grpc_profiler_stop(); - grpc_call_details_destroy(&call_details); + grpc_profiler_stop (); + grpc_call_details_destroy (&call_details); - grpc_server_destroy(server); - grpc_completion_queue_destroy(cq); - grpc_shutdown(); + grpc_server_destroy (server); + grpc_completion_queue_destroy (cq); + grpc_shutdown (); return 0; } diff --git a/test/core/httpcli/format_request_test.c b/test/core/httpcli/format_request_test.c index 82b2ccb122c..7aa7624f207 100644 --- a/test/core/httpcli/format_request_test.c +++ b/test/core/httpcli/format_request_test.c @@ -38,87 +38,71 @@ #include #include "test/core/util/test_config.h" -static void test_format_get_request(void) { - grpc_httpcli_header hdr = {"x-yz", "abc"}; +static void +test_format_get_request (void) +{ + grpc_httpcli_header hdr = { "x-yz", "abc" }; grpc_httpcli_request req; gpr_slice slice; - memset(&req, 0, sizeof(req)); + memset (&req, 0, sizeof (req)); req.host = "example.com"; req.path = "/index.html"; req.hdr_count = 1; req.hdrs = &hdr; - slice = grpc_httpcli_format_get_request(&req); + slice = grpc_httpcli_format_get_request (&req); - GPR_ASSERT(0 == gpr_slice_str_cmp(slice, - "GET /index.html HTTP/1.0\r\n" - "Host: example.com\r\n" - "Connection: close\r\n" - "User-Agent: " GRPC_HTTPCLI_USER_AGENT - "\r\n" - "x-yz: abc\r\n" - "\r\n")); + GPR_ASSERT (0 == gpr_slice_str_cmp (slice, "GET /index.html HTTP/1.0\r\n" "Host: example.com\r\n" "Connection: close\r\n" "User-Agent: " GRPC_HTTPCLI_USER_AGENT "\r\n" "x-yz: abc\r\n" "\r\n")); - gpr_slice_unref(slice); + gpr_slice_unref (slice); } -static void test_format_post_request(void) { - grpc_httpcli_header hdr = {"x-yz", "abc"}; +static void +test_format_post_request (void) +{ + grpc_httpcli_header hdr = { "x-yz", "abc" }; grpc_httpcli_request req; gpr_slice slice; char body_bytes[] = "fake body"; size_t body_len = 9; - memset(&req, 0, sizeof(req)); + memset (&req, 0, sizeof (req)); req.host = "example.com"; req.path = "/index.html"; req.hdr_count = 1; req.hdrs = &hdr; - slice = grpc_httpcli_format_post_request(&req, body_bytes, body_len); - - GPR_ASSERT(0 == gpr_slice_str_cmp(slice, - "POST /index.html HTTP/1.0\r\n" - "Host: example.com\r\n" - "Connection: close\r\n" - "User-Agent: " GRPC_HTTPCLI_USER_AGENT - "\r\n" - "x-yz: abc\r\n" - "Content-Type: text/plain\r\n" - "Content-Length: 9\r\n" - "\r\n" - "fake body")); - - gpr_slice_unref(slice); + slice = grpc_httpcli_format_post_request (&req, body_bytes, body_len); + + GPR_ASSERT (0 == gpr_slice_str_cmp (slice, "POST /index.html HTTP/1.0\r\n" "Host: example.com\r\n" "Connection: close\r\n" "User-Agent: " GRPC_HTTPCLI_USER_AGENT "\r\n" "x-yz: abc\r\n" "Content-Type: text/plain\r\n" "Content-Length: 9\r\n" "\r\n" "fake body")); + + gpr_slice_unref (slice); } -static void test_format_post_request_no_body(void) { - grpc_httpcli_header hdr = {"x-yz", "abc"}; +static void +test_format_post_request_no_body (void) +{ + grpc_httpcli_header hdr = { "x-yz", "abc" }; grpc_httpcli_request req; gpr_slice slice; - memset(&req, 0, sizeof(req)); + memset (&req, 0, sizeof (req)); req.host = "example.com"; req.path = "/index.html"; req.hdr_count = 1; req.hdrs = &hdr; - slice = grpc_httpcli_format_post_request(&req, NULL, 0); + slice = grpc_httpcli_format_post_request (&req, NULL, 0); - GPR_ASSERT(0 == gpr_slice_str_cmp(slice, - "POST /index.html HTTP/1.0\r\n" - "Host: example.com\r\n" - "Connection: close\r\n" - "User-Agent: " GRPC_HTTPCLI_USER_AGENT - "\r\n" - "x-yz: abc\r\n" - "\r\n")); + GPR_ASSERT (0 == gpr_slice_str_cmp (slice, "POST /index.html HTTP/1.0\r\n" "Host: example.com\r\n" "Connection: close\r\n" "User-Agent: " GRPC_HTTPCLI_USER_AGENT "\r\n" "x-yz: abc\r\n" "\r\n")); - gpr_slice_unref(slice); + gpr_slice_unref (slice); } -static void test_format_post_request_content_type_override(void) { +static void +test_format_post_request_content_type_override (void) +{ grpc_httpcli_header hdrs[2]; grpc_httpcli_request req; gpr_slice slice; @@ -129,36 +113,28 @@ static void test_format_post_request_content_type_override(void) { hdrs[0].value = "abc"; hdrs[1].key = "Content-Type"; hdrs[1].value = "application/x-www-form-urlencoded"; - memset(&req, 0, sizeof(req)); + memset (&req, 0, sizeof (req)); req.host = "example.com"; req.path = "/index.html"; req.hdr_count = 2; req.hdrs = hdrs; - slice = grpc_httpcli_format_post_request(&req, body_bytes, body_len); - - GPR_ASSERT(0 == gpr_slice_str_cmp( - slice, - "POST /index.html HTTP/1.0\r\n" - "Host: example.com\r\n" - "Connection: close\r\n" - "User-Agent: " GRPC_HTTPCLI_USER_AGENT "\r\n" - "x-yz: abc\r\n" - "Content-Type: application/x-www-form-urlencoded\r\n" - "Content-Length: 11\r\n" - "\r\n" - "fake%20body")); - - gpr_slice_unref(slice); + slice = grpc_httpcli_format_post_request (&req, body_bytes, body_len); + + GPR_ASSERT (0 == gpr_slice_str_cmp (slice, "POST /index.html HTTP/1.0\r\n" "Host: example.com\r\n" "Connection: close\r\n" "User-Agent: " GRPC_HTTPCLI_USER_AGENT "\r\n" "x-yz: abc\r\n" "Content-Type: application/x-www-form-urlencoded\r\n" "Content-Length: 11\r\n" "\r\n" "fake%20body")); + + gpr_slice_unref (slice); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); - test_format_get_request(); - test_format_post_request(); - test_format_post_request_no_body(); - test_format_post_request_content_type_override(); + test_format_get_request (); + test_format_post_request (); + test_format_post_request_no_body (); + test_format_post_request_content_type_override (); return 0; } diff --git a/test/core/httpcli/httpcli_test.c b/test/core/httpcli/httpcli_test.c index 063565ecfc8..1982b00cd10 100644 --- a/test/core/httpcli/httpcli_test.c +++ b/test/core/httpcli/httpcli_test.c @@ -49,138 +49,146 @@ static int g_done = 0; static grpc_httpcli_context g_context; static grpc_pollset g_pollset; -static gpr_timespec n_seconds_time(int seconds) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(seconds); +static gpr_timespec +n_seconds_time (int seconds) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (seconds); } -static void on_finish(void *arg, const grpc_httpcli_response *response, - grpc_closure_list *closure_list) { - const char *expect = - "Hello world!" - "

This is a test

"; - GPR_ASSERT(arg == (void *)42); - GPR_ASSERT(response); - GPR_ASSERT(response->status == 200); - GPR_ASSERT(response->body_length == strlen(expect)); - GPR_ASSERT(0 == memcmp(expect, response->body, response->body_length)); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); +static void +on_finish (void *arg, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +{ + const char *expect = "Hello world!" "

This is a test

"; + GPR_ASSERT (arg == (void *) 42); + GPR_ASSERT (response); + GPR_ASSERT (response->status == 200); + GPR_ASSERT (response->body_length == strlen (expect)); + GPR_ASSERT (0 == memcmp (expect, response->body, response->body_length)); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); g_done = 1; - grpc_pollset_kick(&g_pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_pollset_kick (&g_pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } -static void test_get(int use_ssl, int port) { +static void +test_get (int use_ssl, int port) +{ grpc_httpcli_request req; char *host; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; g_done = 0; - gpr_log(GPR_INFO, "running %s with use_ssl=%d.", "test_get", use_ssl); + gpr_log (GPR_INFO, "running %s with use_ssl=%d.", "test_get", use_ssl); - gpr_asprintf(&host, "localhost:%d", port); - gpr_log(GPR_INFO, "requesting from %s", host); + gpr_asprintf (&host, "localhost:%d", port); + gpr_log (GPR_INFO, "requesting from %s", host); - memset(&req, 0, sizeof(req)); + memset (&req, 0, sizeof (req)); req.host = host; req.path = "/get"; req.handshaker = use_ssl ? &grpc_httpcli_ssl : &grpc_httpcli_plaintext; - grpc_httpcli_get(&g_context, &g_pollset, &req, n_seconds_time(15), on_finish, - (void *)42, &closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - while (!g_done) { - grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - n_seconds_time(20), &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - } - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - gpr_free(host); + grpc_httpcli_get (&g_context, &g_pollset, &req, n_seconds_time (15), on_finish, (void *) 42, &closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + while (!g_done) + { + grpc_pollset_worker worker; + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), n_seconds_time (20), &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + } + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + gpr_free (host); } -static void test_post(int use_ssl, int port) { +static void +test_post (int use_ssl, int port) +{ grpc_httpcli_request req; char *host; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; g_done = 0; - gpr_log(GPR_INFO, "running %s with use_ssl=%d.", "test_post", (int)use_ssl); + gpr_log (GPR_INFO, "running %s with use_ssl=%d.", "test_post", (int) use_ssl); - gpr_asprintf(&host, "localhost:%d", port); - gpr_log(GPR_INFO, "posting to %s", host); + gpr_asprintf (&host, "localhost:%d", port); + gpr_log (GPR_INFO, "posting to %s", host); - memset(&req, 0, sizeof(req)); + memset (&req, 0, sizeof (req)); req.host = host; req.path = "/post"; req.handshaker = use_ssl ? &grpc_httpcli_ssl : &grpc_httpcli_plaintext; - grpc_httpcli_post(&g_context, &g_pollset, &req, "hello", 5, - n_seconds_time(15), on_finish, (void *)42, &closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - while (!g_done) { - grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - n_seconds_time(20), &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - } - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - gpr_free(host); + grpc_httpcli_post (&g_context, &g_pollset, &req, "hello", 5, n_seconds_time (15), on_finish, (void *) 42, &closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + while (!g_done) + { + grpc_pollset_worker worker; + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), n_seconds_time (20), &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + } + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + gpr_free (host); } -static void destroy_pollset(void *p, int success, - grpc_closure_list *closure_list) { - grpc_pollset_destroy(p); +static void +destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +{ + grpc_pollset_destroy (p); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ grpc_closure destroyed; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; gpr_subprocess *server; char *me = argv[0]; - char *lslash = strrchr(me, '/'); + char *lslash = strrchr (me, '/'); char *args[4]; char root[1024]; - int port = grpc_pick_unused_port_or_die(); + int port = grpc_pick_unused_port_or_die (); /* figure out where we are */ - if (lslash) { - memcpy(root, me, (size_t)(lslash - me)); - root[lslash - me] = 0; - } else { - strcpy(root, "."); - } + if (lslash) + { + memcpy (root, me, (size_t) (lslash - me)); + root[lslash - me] = 0; + } + else + { + strcpy (root, "."); + } /* start the server */ - gpr_asprintf(&args[0], "%s/../../test/core/httpcli/test_server.py", root); + gpr_asprintf (&args[0], "%s/../../test/core/httpcli/test_server.py", root); args[1] = "--port"; - gpr_asprintf(&args[2], "%d", port); - server = gpr_subprocess_create(3, (const char **)args); - GPR_ASSERT(server); - gpr_free(args[0]); - gpr_free(args[2]); - - 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_init(&g_pollset); - - test_get(0, port); - test_post(0, port); - - grpc_httpcli_context_destroy(&g_context); - grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run(&closure_list); - grpc_shutdown(); - - gpr_subprocess_destroy(server); + gpr_asprintf (&args[2], "%d", port); + server = gpr_subprocess_create (3, (const char **) args); + GPR_ASSERT (server); + gpr_free (args[0]); + gpr_free (args[2]); + + 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_init (&g_pollset); + + test_get (0, port); + test_post (0, port); + + grpc_httpcli_context_destroy (&g_context); + grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run (&closure_list); + grpc_shutdown (); + + gpr_subprocess_destroy (server); return 0; } diff --git a/test/core/httpcli/parser_test.c b/test/core/httpcli/parser_test.c index dacec0f72f7..227cbbf4ece 100644 --- a/test/core/httpcli/parser_test.c +++ b/test/core/httpcli/parser_test.c @@ -42,114 +42,117 @@ #include "test/core/util/slice_splitter.h" #include "test/core/util/test_config.h" -static void test_succeeds(grpc_slice_split_mode split_mode, char *response, - int expect_status, char *expect_body, ...) { +static void +test_succeeds (grpc_slice_split_mode split_mode, char *response, int expect_status, char *expect_body, ...) +{ grpc_httpcli_parser parser; - gpr_slice input_slice = gpr_slice_from_copied_string(response); + gpr_slice input_slice = gpr_slice_from_copied_string (response); size_t num_slices; size_t i; gpr_slice *slices; va_list args; - grpc_split_slices(split_mode, &input_slice, 1, &slices, &num_slices); - gpr_slice_unref(input_slice); + grpc_split_slices (split_mode, &input_slice, 1, &slices, &num_slices); + gpr_slice_unref (input_slice); - grpc_httpcli_parser_init(&parser); + grpc_httpcli_parser_init (&parser); - for (i = 0; i < num_slices; i++) { - GPR_ASSERT(grpc_httpcli_parser_parse(&parser, slices[i])); - gpr_slice_unref(slices[i]); - } - GPR_ASSERT(grpc_httpcli_parser_eof(&parser)); + for (i = 0; i < num_slices; i++) + { + GPR_ASSERT (grpc_httpcli_parser_parse (&parser, slices[i])); + gpr_slice_unref (slices[i]); + } + GPR_ASSERT (grpc_httpcli_parser_eof (&parser)); - GPR_ASSERT(expect_status == parser.r.status); - if (expect_body != NULL) { - GPR_ASSERT(strlen(expect_body) == parser.r.body_length); - GPR_ASSERT(0 == memcmp(expect_body, parser.r.body, parser.r.body_length)); - } else { - GPR_ASSERT(parser.r.body_length == 0); - } + GPR_ASSERT (expect_status == parser.r.status); + if (expect_body != NULL) + { + GPR_ASSERT (strlen (expect_body) == parser.r.body_length); + GPR_ASSERT (0 == memcmp (expect_body, parser.r.body, parser.r.body_length)); + } + else + { + GPR_ASSERT (parser.r.body_length == 0); + } - va_start(args, expect_body); + va_start (args, expect_body); i = 0; - for (;;) { - char *expect_key; - char *expect_value; - expect_key = va_arg(args, char *); - if (!expect_key) break; - GPR_ASSERT(i < parser.r.hdr_count); - expect_value = va_arg(args, char *); - GPR_ASSERT(expect_value); - GPR_ASSERT(0 == strcmp(expect_key, parser.r.hdrs[i].key)); - GPR_ASSERT(0 == strcmp(expect_value, parser.r.hdrs[i].value)); - i++; - } - va_end(args); - GPR_ASSERT(i == parser.r.hdr_count); - - grpc_httpcli_parser_destroy(&parser); - gpr_free(slices); + for (;;) + { + char *expect_key; + char *expect_value; + expect_key = va_arg (args, char *); + if (!expect_key) + break; + GPR_ASSERT (i < parser.r.hdr_count); + expect_value = va_arg (args, char *); + GPR_ASSERT (expect_value); + GPR_ASSERT (0 == strcmp (expect_key, parser.r.hdrs[i].key)); + GPR_ASSERT (0 == strcmp (expect_value, parser.r.hdrs[i].value)); + i++; + } + va_end (args); + GPR_ASSERT (i == parser.r.hdr_count); + + grpc_httpcli_parser_destroy (&parser); + gpr_free (slices); } -static void test_fails(grpc_slice_split_mode split_mode, char *response) { +static void +test_fails (grpc_slice_split_mode split_mode, char *response) +{ grpc_httpcli_parser parser; - gpr_slice input_slice = gpr_slice_from_copied_string(response); + gpr_slice input_slice = gpr_slice_from_copied_string (response); size_t num_slices; size_t i; gpr_slice *slices; int done = 0; - grpc_split_slices(split_mode, &input_slice, 1, &slices, &num_slices); - gpr_slice_unref(input_slice); + grpc_split_slices (split_mode, &input_slice, 1, &slices, &num_slices); + gpr_slice_unref (input_slice); - grpc_httpcli_parser_init(&parser); + grpc_httpcli_parser_init (&parser); - for (i = 0; i < num_slices; i++) { - if (!done && !grpc_httpcli_parser_parse(&parser, slices[i])) { + for (i = 0; i < num_slices; i++) + { + if (!done && !grpc_httpcli_parser_parse (&parser, slices[i])) + { + done = 1; + } + gpr_slice_unref (slices[i]); + } + if (!done && !grpc_httpcli_parser_eof (&parser)) + { done = 1; } - gpr_slice_unref(slices[i]); - } - if (!done && !grpc_httpcli_parser_eof(&parser)) { - done = 1; - } - GPR_ASSERT(done); - - grpc_httpcli_parser_destroy(&parser); - gpr_free(slices); + GPR_ASSERT (done); + + grpc_httpcli_parser_destroy (&parser); + gpr_free (slices); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; - const grpc_slice_split_mode split_modes[] = {GRPC_SLICE_SPLIT_IDENTITY, - GRPC_SLICE_SPLIT_ONE_BYTE}; - - grpc_test_init(argc, argv); - - for (i = 0; i < GPR_ARRAY_SIZE(split_modes); i++) { - test_succeeds(split_modes[i], - "HTTP/1.0 200 OK\r\n" - "xyz: abc\r\n" - "\r\n" - "hello world!", - 200, "hello world!", "xyz", "abc", NULL); - test_succeeds(split_modes[i], - "HTTP/1.0 404 Not Found\r\n" - "\r\n", - 404, NULL, NULL); - test_succeeds(split_modes[i], - "HTTP/1.1 200 OK\r\n" - "xyz: abc\r\n" - "\r\n" - "hello world!", - 200, "hello world!", "xyz", "abc", NULL); - test_fails(split_modes[i], "HTTP/1.0\r\n"); - test_fails(split_modes[i], "HTTP/1.2\r\n"); - test_fails(split_modes[i], "HTTP/1.0 000 XYX\r\n"); - test_fails(split_modes[i], "HTTP/1.0 200 OK\n"); - test_fails(split_modes[i], "HTTP/1.0 200 OK\r\n"); - test_fails(split_modes[i], "HTTP/1.0 200 OK\r\nFoo x\r\n"); - } + const grpc_slice_split_mode split_modes[] = { GRPC_SLICE_SPLIT_IDENTITY, + GRPC_SLICE_SPLIT_ONE_BYTE + }; + + grpc_test_init (argc, argv); + + for (i = 0; i < GPR_ARRAY_SIZE (split_modes); i++) + { + test_succeeds (split_modes[i], "HTTP/1.0 200 OK\r\n" "xyz: abc\r\n" "\r\n" "hello world!", 200, "hello world!", "xyz", "abc", NULL); + test_succeeds (split_modes[i], "HTTP/1.0 404 Not Found\r\n" "\r\n", 404, NULL, NULL); + test_succeeds (split_modes[i], "HTTP/1.1 200 OK\r\n" "xyz: abc\r\n" "\r\n" "hello world!", 200, "hello world!", "xyz", "abc", NULL); + test_fails (split_modes[i], "HTTP/1.0\r\n"); + test_fails (split_modes[i], "HTTP/1.2\r\n"); + test_fails (split_modes[i], "HTTP/1.0 000 XYX\r\n"); + test_fails (split_modes[i], "HTTP/1.0 200 OK\n"); + test_fails (split_modes[i], "HTTP/1.0 200 OK\r\n"); + test_fails (split_modes[i], "HTTP/1.0 200 OK\r\nFoo x\r\n"); + } return 0; } diff --git a/test/core/iomgr/alarm_heap_test.c b/test/core/iomgr/alarm_heap_test.c index 13bf7e43f64..b179e62de42 100644 --- a/test/core/iomgr/alarm_heap_test.c +++ b/test/core/iomgr/alarm_heap_test.c @@ -40,242 +40,280 @@ #include #include "test/core/util/test_config.h" -static gpr_timespec random_deadline(void) { +static gpr_timespec +random_deadline (void) +{ gpr_timespec ts; - ts.tv_sec = rand(); - ts.tv_nsec = rand(); + ts.tv_sec = rand (); + ts.tv_nsec = rand (); ts.clock_type = GPR_CLOCK_REALTIME; return ts; } -static grpc_alarm *create_test_elements(size_t num_elements) { - grpc_alarm *elems = gpr_malloc(num_elements * sizeof(grpc_alarm)); +static grpc_alarm * +create_test_elements (size_t num_elements) +{ + grpc_alarm *elems = gpr_malloc (num_elements * sizeof (grpc_alarm)); size_t i; - for (i = 0; i < num_elements; i++) { - elems[i].deadline = random_deadline(); - } + for (i = 0; i < num_elements; i++) + { + elems[i].deadline = random_deadline (); + } return elems; } -static int cmp_elem(const void *a, const void *b) { - int i = *(const int *)a; - int j = *(const int *)b; +static int +cmp_elem (const void *a, const void *b) +{ + int i = *(const int *) a; + int j = *(const int *) b; return i - j; } -static size_t *all_top(grpc_alarm_heap *pq, size_t *n) { +static size_t * +all_top (grpc_alarm_heap * pq, size_t * n) +{ size_t *vec = NULL; size_t *need_to_check_children; size_t num_need_to_check_children = 0; *n = 0; - if (pq->alarm_count == 0) return vec; - need_to_check_children = - gpr_malloc(pq->alarm_count * sizeof(*need_to_check_children)); + if (pq->alarm_count == 0) + return vec; + need_to_check_children = gpr_malloc (pq->alarm_count * sizeof (*need_to_check_children)); need_to_check_children[num_need_to_check_children++] = 0; - vec = gpr_malloc(pq->alarm_count * sizeof(*vec)); - while (num_need_to_check_children > 0) { - size_t ind = need_to_check_children[0]; - size_t leftchild, rightchild; - num_need_to_check_children--; - memmove(need_to_check_children, need_to_check_children + 1, - num_need_to_check_children * sizeof(*need_to_check_children)); - vec[(*n)++] = ind; - leftchild = 1u + 2u * ind; - if (leftchild < pq->alarm_count) { - if (gpr_time_cmp(pq->alarms[leftchild]->deadline, - pq->alarms[ind]->deadline) >= 0) { - need_to_check_children[num_need_to_check_children++] = leftchild; - } - rightchild = leftchild + 1; - if (rightchild < pq->alarm_count && - gpr_time_cmp(pq->alarms[rightchild]->deadline, - pq->alarms[ind]->deadline) >= 0) { - need_to_check_children[num_need_to_check_children++] = rightchild; - } + vec = gpr_malloc (pq->alarm_count * sizeof (*vec)); + while (num_need_to_check_children > 0) + { + size_t ind = need_to_check_children[0]; + size_t leftchild, rightchild; + num_need_to_check_children--; + memmove (need_to_check_children, need_to_check_children + 1, num_need_to_check_children * sizeof (*need_to_check_children)); + vec[(*n)++] = ind; + leftchild = 1u + 2u * ind; + if (leftchild < pq->alarm_count) + { + if (gpr_time_cmp (pq->alarms[leftchild]->deadline, pq->alarms[ind]->deadline) >= 0) + { + need_to_check_children[num_need_to_check_children++] = leftchild; + } + rightchild = leftchild + 1; + if (rightchild < pq->alarm_count && gpr_time_cmp (pq->alarms[rightchild]->deadline, pq->alarms[ind]->deadline) >= 0) + { + need_to_check_children[num_need_to_check_children++] = rightchild; + } + } } - } - gpr_free(need_to_check_children); + gpr_free (need_to_check_children); return vec; } -static void check_pq_top(grpc_alarm *elements, grpc_alarm_heap *pq, - gpr_uint8 *inpq, size_t num_elements) { - gpr_timespec max_deadline = gpr_inf_past(GPR_CLOCK_REALTIME); - size_t *max_deadline_indices = - gpr_malloc(num_elements * sizeof(*max_deadline_indices)); +static void +check_pq_top (grpc_alarm * elements, grpc_alarm_heap * pq, gpr_uint8 * inpq, size_t num_elements) +{ + gpr_timespec max_deadline = gpr_inf_past (GPR_CLOCK_REALTIME); + size_t *max_deadline_indices = gpr_malloc (num_elements * sizeof (*max_deadline_indices)); size_t *top_elements; size_t num_max_deadline_indices = 0; size_t num_top_elements; size_t i; - for (i = 0; i < num_elements; ++i) { - if (inpq[i] && gpr_time_cmp(elements[i].deadline, max_deadline) >= 0) { - if (gpr_time_cmp(elements[i].deadline, max_deadline) > 0) { - num_max_deadline_indices = 0; - max_deadline = elements[i].deadline; - } - max_deadline_indices[num_max_deadline_indices++] = elements[i].heap_index; + for (i = 0; i < num_elements; ++i) + { + if (inpq[i] && gpr_time_cmp (elements[i].deadline, max_deadline) >= 0) + { + if (gpr_time_cmp (elements[i].deadline, max_deadline) > 0) + { + num_max_deadline_indices = 0; + max_deadline = elements[i].deadline; + } + max_deadline_indices[num_max_deadline_indices++] = elements[i].heap_index; + } + } + qsort (max_deadline_indices, num_max_deadline_indices, sizeof (*max_deadline_indices), cmp_elem); + top_elements = all_top (pq, &num_top_elements); + GPR_ASSERT (num_top_elements == num_max_deadline_indices); + for (i = 0; i < num_top_elements; i++) + { + GPR_ASSERT (max_deadline_indices[i] == top_elements[i]); } - } - qsort(max_deadline_indices, num_max_deadline_indices, - sizeof(*max_deadline_indices), cmp_elem); - top_elements = all_top(pq, &num_top_elements); - GPR_ASSERT(num_top_elements == num_max_deadline_indices); - for (i = 0; i < num_top_elements; i++) { - GPR_ASSERT(max_deadline_indices[i] == top_elements[i]); - } - gpr_free(max_deadline_indices); - gpr_free(top_elements); + gpr_free (max_deadline_indices); + gpr_free (top_elements); } -static int contains(grpc_alarm_heap *pq, grpc_alarm *el) { +static int +contains (grpc_alarm_heap * pq, grpc_alarm * el) +{ size_t i; - for (i = 0; i < pq->alarm_count; i++) { - if (pq->alarms[i] == el) return 1; - } + for (i = 0; i < pq->alarm_count; i++) + { + if (pq->alarms[i] == el) + return 1; + } return 0; } -static void check_valid(grpc_alarm_heap *pq) { +static void +check_valid (grpc_alarm_heap * pq) +{ size_t i; - for (i = 0; i < pq->alarm_count; ++i) { - size_t left_child = 1u + 2u * i; - size_t right_child = left_child + 1u; - if (left_child < pq->alarm_count) { - GPR_ASSERT(gpr_time_cmp(pq->alarms[i]->deadline, - pq->alarms[left_child]->deadline) >= 0); + for (i = 0; i < pq->alarm_count; ++i) + { + size_t left_child = 1u + 2u * i; + size_t right_child = left_child + 1u; + if (left_child < pq->alarm_count) + { + GPR_ASSERT (gpr_time_cmp (pq->alarms[i]->deadline, pq->alarms[left_child]->deadline) >= 0); + } + if (right_child < pq->alarm_count) + { + GPR_ASSERT (gpr_time_cmp (pq->alarms[i]->deadline, pq->alarms[right_child]->deadline) >= 0); + } } - if (right_child < pq->alarm_count) { - GPR_ASSERT(gpr_time_cmp(pq->alarms[i]->deadline, - pq->alarms[right_child]->deadline) >= 0); - } - } } -static void test1(void) { +static void +test1 (void) +{ grpc_alarm_heap pq; const size_t num_test_elements = 200; const size_t num_test_operations = 10000; size_t i; - grpc_alarm *test_elements = create_test_elements(num_test_elements); - gpr_uint8 *inpq = gpr_malloc(num_test_elements); - - grpc_alarm_heap_init(&pq); - memset(inpq, 0, num_test_elements); - GPR_ASSERT(grpc_alarm_heap_is_empty(&pq)); - check_valid(&pq); - for (i = 0; i < num_test_elements; ++i) { - GPR_ASSERT(!contains(&pq, &test_elements[i])); - grpc_alarm_heap_add(&pq, &test_elements[i]); - check_valid(&pq); - GPR_ASSERT(contains(&pq, &test_elements[i])); - inpq[i] = 1; - check_pq_top(test_elements, &pq, inpq, num_test_elements); - } - for (i = 0; i < num_test_elements; ++i) { - /* Test that check still succeeds even for element that wasn't just - inserted. */ - GPR_ASSERT(contains(&pq, &test_elements[i])); - } - - GPR_ASSERT(pq.alarm_count == num_test_elements); - - check_pq_top(test_elements, &pq, inpq, num_test_elements); - - for (i = 0; i < num_test_operations; ++i) { - size_t elem_num = (size_t)rand() % num_test_elements; - grpc_alarm *el = &test_elements[elem_num]; - if (!inpq[elem_num]) { /* not in pq */ - GPR_ASSERT(!contains(&pq, el)); - el->deadline = random_deadline(); - grpc_alarm_heap_add(&pq, el); - GPR_ASSERT(contains(&pq, el)); - inpq[elem_num] = 1; - check_pq_top(test_elements, &pq, inpq, num_test_elements); - check_valid(&pq); - } else { - GPR_ASSERT(contains(&pq, el)); - grpc_alarm_heap_remove(&pq, el); - GPR_ASSERT(!contains(&pq, el)); - inpq[elem_num] = 0; - check_pq_top(test_elements, &pq, inpq, num_test_elements); - check_valid(&pq); + grpc_alarm *test_elements = create_test_elements (num_test_elements); + gpr_uint8 *inpq = gpr_malloc (num_test_elements); + + grpc_alarm_heap_init (&pq); + memset (inpq, 0, num_test_elements); + GPR_ASSERT (grpc_alarm_heap_is_empty (&pq)); + check_valid (&pq); + for (i = 0; i < num_test_elements; ++i) + { + GPR_ASSERT (!contains (&pq, &test_elements[i])); + grpc_alarm_heap_add (&pq, &test_elements[i]); + check_valid (&pq); + GPR_ASSERT (contains (&pq, &test_elements[i])); + inpq[i] = 1; + check_pq_top (test_elements, &pq, inpq, num_test_elements); + } + for (i = 0; i < num_test_elements; ++i) + { + /* Test that check still succeeds even for element that wasn't just + inserted. */ + GPR_ASSERT (contains (&pq, &test_elements[i])); } - } - grpc_alarm_heap_destroy(&pq); - gpr_free(test_elements); - gpr_free(inpq); + GPR_ASSERT (pq.alarm_count == num_test_elements); + + check_pq_top (test_elements, &pq, inpq, num_test_elements); + + for (i = 0; i < num_test_operations; ++i) + { + size_t elem_num = (size_t) rand () % num_test_elements; + grpc_alarm *el = &test_elements[elem_num]; + if (!inpq[elem_num]) + { /* not in pq */ + GPR_ASSERT (!contains (&pq, el)); + el->deadline = random_deadline (); + grpc_alarm_heap_add (&pq, el); + GPR_ASSERT (contains (&pq, el)); + inpq[elem_num] = 1; + check_pq_top (test_elements, &pq, inpq, num_test_elements); + check_valid (&pq); + } + else + { + GPR_ASSERT (contains (&pq, el)); + grpc_alarm_heap_remove (&pq, el); + GPR_ASSERT (!contains (&pq, el)); + inpq[elem_num] = 0; + check_pq_top (test_elements, &pq, inpq, num_test_elements); + check_valid (&pq); + } + } + + grpc_alarm_heap_destroy (&pq); + gpr_free (test_elements); + gpr_free (inpq); } -static void shrink_test(void) { +static void +shrink_test (void) +{ grpc_alarm_heap pq; size_t i; size_t expected_size; /* A large random number to allow for multiple shrinkages, at least 512. */ - const size_t num_elements = (size_t)rand() % 2000 + 512; + const size_t num_elements = (size_t) rand () % 2000 + 512; - grpc_alarm_heap_init(&pq); + grpc_alarm_heap_init (&pq); /* Create a priority queue with many elements. Make sure the Size() is correct. */ - for (i = 0; i < num_elements; ++i) { - GPR_ASSERT(i == pq.alarm_count); - grpc_alarm_heap_add(&pq, create_test_elements(1)); - } - GPR_ASSERT(num_elements == pq.alarm_count); + for (i = 0; i < num_elements; ++i) + { + GPR_ASSERT (i == pq.alarm_count); + grpc_alarm_heap_add (&pq, create_test_elements (1)); + } + GPR_ASSERT (num_elements == pq.alarm_count); /* Remove elements until the Size is 1/4 the original size. */ - while (pq.alarm_count > num_elements / 4) { - grpc_alarm *const te = pq.alarms[pq.alarm_count - 1]; - grpc_alarm_heap_remove(&pq, te); - gpr_free(te); - } - GPR_ASSERT(num_elements / 4 == pq.alarm_count); + while (pq.alarm_count > num_elements / 4) + { + grpc_alarm *const te = pq.alarms[pq.alarm_count - 1]; + grpc_alarm_heap_remove (&pq, te); + gpr_free (te); + } + GPR_ASSERT (num_elements / 4 == pq.alarm_count); /* Expect that Capacity is in the right range: Size * 2 <= Capacity <= Size * 4 */ - GPR_ASSERT(pq.alarm_count * 2 <= pq.alarm_capacity); - GPR_ASSERT(pq.alarm_capacity <= pq.alarm_count * 4); - check_valid(&pq); + GPR_ASSERT (pq.alarm_count * 2 <= pq.alarm_capacity); + GPR_ASSERT (pq.alarm_capacity <= pq.alarm_count * 4); + check_valid (&pq); /* Remove the rest of the elements. Check that the Capacity is not more than 4 times the Size and not less than 2 times, but never goes below 16. */ expected_size = pq.alarm_count; - while (pq.alarm_count > 0) { - const size_t which = (size_t)rand() % pq.alarm_count; - grpc_alarm *te = pq.alarms[which]; - grpc_alarm_heap_remove(&pq, te); - gpr_free(te); - expected_size--; - GPR_ASSERT(expected_size == pq.alarm_count); - GPR_ASSERT(pq.alarm_count * 2 <= pq.alarm_capacity); - if (pq.alarm_count >= 8) { - GPR_ASSERT(pq.alarm_capacity <= pq.alarm_count * 4); - } else { - GPR_ASSERT(16 <= pq.alarm_capacity); + while (pq.alarm_count > 0) + { + const size_t which = (size_t) rand () % pq.alarm_count; + grpc_alarm *te = pq.alarms[which]; + grpc_alarm_heap_remove (&pq, te); + gpr_free (te); + expected_size--; + GPR_ASSERT (expected_size == pq.alarm_count); + GPR_ASSERT (pq.alarm_count * 2 <= pq.alarm_capacity); + if (pq.alarm_count >= 8) + { + GPR_ASSERT (pq.alarm_capacity <= pq.alarm_count * 4); + } + else + { + GPR_ASSERT (16 <= pq.alarm_capacity); + } + check_valid (&pq); } - check_valid(&pq); - } - GPR_ASSERT(0 == pq.alarm_count); - GPR_ASSERT(pq.alarm_capacity >= 16 && pq.alarm_capacity < 32); + GPR_ASSERT (0 == pq.alarm_count); + GPR_ASSERT (pq.alarm_capacity >= 16 && pq.alarm_capacity < 32); - grpc_alarm_heap_destroy(&pq); + grpc_alarm_heap_destroy (&pq); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ int i; - grpc_test_init(argc, argv); + grpc_test_init (argc, argv); - for (i = 0; i < 5; i++) { - test1(); - shrink_test(); - } + for (i = 0; i < 5; i++) + { + test1 (); + shrink_test (); + } return 0; } diff --git a/test/core/iomgr/alarm_list_test.c b/test/core/iomgr/alarm_list_test.c index 90ff49cb8f5..d81dd49c35c 100644 --- a/test/core/iomgr/alarm_list_test.c +++ b/test/core/iomgr/alarm_list_test.c @@ -43,117 +43,115 @@ static int cb_called[MAX_CB][2]; -static void cb(void *arg, int success, grpc_closure_list *closure_list) { - cb_called[(gpr_intptr)arg][success]++; +static void +cb (void *arg, int success, grpc_closure_list * closure_list) +{ + cb_called[(gpr_intptr) arg][success]++; } -static void add_test(void) { - gpr_timespec start = gpr_now(GPR_CLOCK_REALTIME); +static void +add_test (void) +{ + gpr_timespec start = gpr_now (GPR_CLOCK_REALTIME); int i; grpc_alarm alarms[20]; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_alarm_list_init(start); - memset(cb_called, 0, sizeof(cb_called)); + grpc_alarm_list_init (start); + memset (cb_called, 0, sizeof (cb_called)); /* 10 ms alarms. will expire in the current epoch */ - for (i = 0; i < 10; i++) { - grpc_alarm_init(&alarms[i], - gpr_time_add(start, gpr_time_from_millis(10, GPR_TIMESPAN)), - cb, (void *)(gpr_intptr)i, start, &closure_list); - } + for (i = 0; i < 10; i++) + { + grpc_alarm_init (&alarms[i], gpr_time_add (start, gpr_time_from_millis (10, GPR_TIMESPAN)), cb, (void *) (gpr_intptr) i, start, &closure_list); + } /* 1010 ms alarms. will expire in the next epoch */ - for (i = 10; i < 20; i++) { - grpc_alarm_init(&alarms[i], gpr_time_add(start, gpr_time_from_millis( - 1010, GPR_TIMESPAN)), - cb, (void *)(gpr_intptr)i, start, &closure_list); - } + for (i = 10; i < 20; i++) + { + grpc_alarm_init (&alarms[i], gpr_time_add (start, gpr_time_from_millis (1010, GPR_TIMESPAN)), cb, (void *) (gpr_intptr) i, start, &closure_list); + } /* collect alarms. Only the first batch should be ready. */ - GPR_ASSERT(10 == grpc_alarm_check(gpr_time_add(start, gpr_time_from_millis( - 500, GPR_TIMESPAN)), - NULL, &closure_list)); - grpc_closure_list_run(&closure_list); - for (i = 0; i < 20; i++) { - GPR_ASSERT(cb_called[i][1] == (i < 10)); - GPR_ASSERT(cb_called[i][0] == 0); - } - - GPR_ASSERT(0 == grpc_alarm_check(gpr_time_add(start, gpr_time_from_millis( - 600, GPR_TIMESPAN)), - NULL, &closure_list)); - grpc_closure_list_run(&closure_list); - for (i = 0; i < 30; i++) { - GPR_ASSERT(cb_called[i][1] == (i < 10)); - GPR_ASSERT(cb_called[i][0] == 0); - } + GPR_ASSERT (10 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (500, GPR_TIMESPAN)), NULL, &closure_list)); + grpc_closure_list_run (&closure_list); + for (i = 0; i < 20; i++) + { + GPR_ASSERT (cb_called[i][1] == (i < 10)); + GPR_ASSERT (cb_called[i][0] == 0); + } + + GPR_ASSERT (0 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (600, GPR_TIMESPAN)), NULL, &closure_list)); + grpc_closure_list_run (&closure_list); + 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 alarms */ - GPR_ASSERT(10 == - grpc_alarm_check( - gpr_time_add(start, gpr_time_from_millis(1500, GPR_TIMESPAN)), - NULL, &closure_list)); - grpc_closure_list_run(&closure_list); - for (i = 0; i < 30; i++) { - GPR_ASSERT(cb_called[i][1] == (i < 20)); - GPR_ASSERT(cb_called[i][0] == 0); - } - - GPR_ASSERT(0 == grpc_alarm_check(gpr_time_add(start, gpr_time_from_millis( - 1600, GPR_TIMESPAN)), - NULL, &closure_list)); - for (i = 0; i < 30; i++) { - GPR_ASSERT(cb_called[i][1] == (i < 20)); - GPR_ASSERT(cb_called[i][0] == 0); - } - - grpc_alarm_list_shutdown(&closure_list); - grpc_closure_list_run(&closure_list); + GPR_ASSERT (10 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (1500, GPR_TIMESPAN)), NULL, &closure_list)); + grpc_closure_list_run (&closure_list); + for (i = 0; i < 30; i++) + { + GPR_ASSERT (cb_called[i][1] == (i < 20)); + GPR_ASSERT (cb_called[i][0] == 0); + } + + GPR_ASSERT (0 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (1600, GPR_TIMESPAN)), NULL, &closure_list)); + for (i = 0; i < 30; i++) + { + GPR_ASSERT (cb_called[i][1] == (i < 20)); + GPR_ASSERT (cb_called[i][0] == 0); + } + + grpc_alarm_list_shutdown (&closure_list); + grpc_closure_list_run (&closure_list); } -static gpr_timespec tfm(int m) { - gpr_timespec t = gpr_time_from_millis(m, GPR_TIMESPAN); +static gpr_timespec +tfm (int m) +{ + gpr_timespec t = gpr_time_from_millis (m, GPR_TIMESPAN); t.clock_type = GPR_CLOCK_REALTIME; return t; } /* Cleaning up a list with pending alarms. */ -void destruction_test(void) { +void +destruction_test (void) +{ grpc_alarm alarms[5]; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_alarm_list_init(gpr_time_0(GPR_CLOCK_REALTIME)); - memset(cb_called, 0, sizeof(cb_called)); - - grpc_alarm_init(&alarms[0], tfm(100), cb, (void *)(gpr_intptr)0, - gpr_time_0(GPR_CLOCK_REALTIME), &closure_list); - grpc_alarm_init(&alarms[1], tfm(3), cb, (void *)(gpr_intptr)1, - gpr_time_0(GPR_CLOCK_REALTIME), &closure_list); - grpc_alarm_init(&alarms[2], tfm(100), cb, (void *)(gpr_intptr)2, - gpr_time_0(GPR_CLOCK_REALTIME), &closure_list); - grpc_alarm_init(&alarms[3], tfm(3), cb, (void *)(gpr_intptr)3, - gpr_time_0(GPR_CLOCK_REALTIME), &closure_list); - grpc_alarm_init(&alarms[4], tfm(1), cb, (void *)(gpr_intptr)4, - gpr_time_0(GPR_CLOCK_REALTIME), &closure_list); - GPR_ASSERT(1 == grpc_alarm_check(tfm(2), NULL, &closure_list)); - grpc_closure_list_run(&closure_list); - GPR_ASSERT(1 == cb_called[4][1]); - grpc_alarm_cancel(&alarms[0], &closure_list); - grpc_alarm_cancel(&alarms[3], &closure_list); - grpc_closure_list_run(&closure_list); - GPR_ASSERT(1 == cb_called[0][0]); - GPR_ASSERT(1 == cb_called[3][0]); - - grpc_alarm_list_shutdown(&closure_list); - grpc_closure_list_run(&closure_list); - GPR_ASSERT(1 == cb_called[1][0]); - GPR_ASSERT(1 == cb_called[2][0]); + grpc_alarm_list_init (gpr_time_0 (GPR_CLOCK_REALTIME)); + memset (cb_called, 0, sizeof (cb_called)); + + grpc_alarm_init (&alarms[0], tfm (100), cb, (void *) (gpr_intptr) 0, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list); + grpc_alarm_init (&alarms[1], tfm (3), cb, (void *) (gpr_intptr) 1, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list); + grpc_alarm_init (&alarms[2], tfm (100), cb, (void *) (gpr_intptr) 2, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list); + grpc_alarm_init (&alarms[3], tfm (3), cb, (void *) (gpr_intptr) 3, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list); + grpc_alarm_init (&alarms[4], tfm (1), cb, (void *) (gpr_intptr) 4, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list); + GPR_ASSERT (1 == grpc_alarm_check (tfm (2), NULL, &closure_list)); + grpc_closure_list_run (&closure_list); + GPR_ASSERT (1 == cb_called[4][1]); + grpc_alarm_cancel (&alarms[0], &closure_list); + grpc_alarm_cancel (&alarms[3], &closure_list); + grpc_closure_list_run (&closure_list); + GPR_ASSERT (1 == cb_called[0][0]); + GPR_ASSERT (1 == cb_called[3][0]); + + grpc_alarm_list_shutdown (&closure_list); + grpc_closure_list_run (&closure_list); + 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); - add_test(); - destruction_test(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + add_test (); + destruction_test (); return 0; } diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c index 32c715c4286..4e7079ef14d 100644 --- a/test/core/iomgr/endpoint_pair_test.c +++ b/test/core/iomgr/endpoint_pair_test.c @@ -44,43 +44,50 @@ static grpc_pollset g_pollset; -static void clean_up(void) {} +static void +clean_up (void) +{ +} -static grpc_endpoint_test_fixture create_fixture_endpoint_pair( - size_t slice_size) { +static grpc_endpoint_test_fixture +create_fixture_endpoint_pair (size_t slice_size) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_test_fixture f; - grpc_endpoint_pair p = grpc_iomgr_create_endpoint_pair("test", slice_size); + grpc_endpoint_pair p = grpc_iomgr_create_endpoint_pair ("test", slice_size); f.client_ep = p.client; f.server_ep = p.server; - grpc_endpoint_add_to_pollset(f.client_ep, &g_pollset, &closure_list); - grpc_endpoint_add_to_pollset(f.server_ep, &g_pollset, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_endpoint_add_to_pollset (f.client_ep, &g_pollset, &closure_list); + grpc_endpoint_add_to_pollset (f.server_ep, &g_pollset, &closure_list); + grpc_closure_list_run (&closure_list); return f; } static grpc_endpoint_test_config configs[] = { - {"tcp/tcp_socketpair", create_fixture_endpoint_pair, clean_up}, + {"tcp/tcp_socketpair", create_fixture_endpoint_pair, clean_up}, }; -static void destroy_pollset(void *p, int success, - grpc_closure_list *closure_list) { - grpc_pollset_destroy(p); +static void +destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +{ + grpc_pollset_destroy (p); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ grpc_closure destroyed; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_test_init(argc, argv); - grpc_init(); - grpc_pollset_init(&g_pollset); - grpc_endpoint_tests(configs[0], &g_pollset); - grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run(&closure_list); - grpc_shutdown(); + grpc_test_init (argc, argv); + grpc_init (); + grpc_pollset_init (&g_pollset); + grpc_endpoint_tests (configs[0], &g_pollset); + grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run (&closure_list); + grpc_shutdown (); return 0; } diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index e106881d91b..4a720432832 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -60,56 +60,67 @@ static grpc_pollset *g_pollset; -size_t count_slices(gpr_slice *slices, size_t nslices, int *current_data) { +size_t +count_slices (gpr_slice * slices, size_t nslices, int *current_data) +{ size_t num_bytes = 0; size_t i; size_t j; unsigned char *buf; - for (i = 0; i < nslices; ++i) { - buf = GPR_SLICE_START_PTR(slices[i]); - for (j = 0; j < GPR_SLICE_LENGTH(slices[i]); ++j) { - GPR_ASSERT(buf[j] == *current_data); - *current_data = (*current_data + 1) % 256; + for (i = 0; i < nslices; ++i) + { + buf = GPR_SLICE_START_PTR (slices[i]); + for (j = 0; j < GPR_SLICE_LENGTH (slices[i]); ++j) + { + GPR_ASSERT (buf[j] == *current_data); + *current_data = (*current_data + 1) % 256; + } + num_bytes += GPR_SLICE_LENGTH (slices[i]); } - num_bytes += GPR_SLICE_LENGTH(slices[i]); - } return num_bytes; } -static grpc_endpoint_test_fixture begin_test(grpc_endpoint_test_config config, - const char *test_name, - size_t slice_size) { - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); - return config.create_fixture(slice_size); +static grpc_endpoint_test_fixture +begin_test (grpc_endpoint_test_config config, const char *test_name, size_t slice_size) +{ + gpr_log (GPR_INFO, "%s/%s", test_name, config.name); + return config.create_fixture (slice_size); } -static void end_test(grpc_endpoint_test_config config) { config.clean_up(); } +static void +end_test (grpc_endpoint_test_config config) +{ + config.clean_up (); +} -static gpr_slice *allocate_blocks(size_t num_bytes, size_t slice_size, - size_t *num_blocks, gpr_uint8 *current_data) { +static gpr_slice * +allocate_blocks (size_t num_bytes, size_t slice_size, size_t * num_blocks, gpr_uint8 * current_data) +{ size_t nslices = num_bytes / slice_size + (num_bytes % slice_size ? 1 : 0); - gpr_slice *slices = malloc(sizeof(gpr_slice) * nslices); + gpr_slice *slices = malloc (sizeof (gpr_slice) * nslices); size_t num_bytes_left = num_bytes; size_t i; size_t j; unsigned char *buf; *num_blocks = nslices; - for (i = 0; i < nslices; ++i) { - slices[i] = gpr_slice_malloc(slice_size > num_bytes_left ? num_bytes_left - : slice_size); - num_bytes_left -= GPR_SLICE_LENGTH(slices[i]); - buf = GPR_SLICE_START_PTR(slices[i]); - for (j = 0; j < GPR_SLICE_LENGTH(slices[i]); ++j) { - buf[j] = *current_data; - (*current_data)++; + for (i = 0; i < nslices; ++i) + { + slices[i] = gpr_slice_malloc (slice_size > num_bytes_left ? num_bytes_left : slice_size); + num_bytes_left -= GPR_SLICE_LENGTH (slices[i]); + buf = GPR_SLICE_START_PTR (slices[i]); + for (j = 0; j < GPR_SLICE_LENGTH (slices[i]); ++j) + { + buf[j] = *current_data; + (*current_data)++; + } } - } - GPR_ASSERT(num_bytes_left == 0); + GPR_ASSERT (num_bytes_left == 0); return slices; } -struct read_and_write_test_state { +struct read_and_write_test_state +{ grpc_endpoint *read_ep; grpc_endpoint *write_ep; size_t target_bytes; @@ -126,76 +137,79 @@ struct read_and_write_test_state { grpc_closure done_write; }; -static void read_and_write_test_read_handler(void *data, int success, - grpc_closure_list *closure_list) { +static void +read_and_write_test_read_handler (void *data, int success, grpc_closure_list * closure_list) +{ struct read_and_write_test_state *state = data; - state->bytes_read += count_slices( - state->incoming.slices, state->incoming.count, &state->current_read_data); - if (state->bytes_read == state->target_bytes || !success) { - gpr_log(GPR_INFO, "Read handler done"); - gpr_mu_lock(GRPC_POLLSET_MU(g_pollset)); - state->read_done = 1 + success; - grpc_pollset_kick(g_pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(g_pollset)); - } else if (success) { - grpc_endpoint_read(state->read_ep, &state->incoming, &state->done_read, - closure_list); - } + state->bytes_read += count_slices (state->incoming.slices, state->incoming.count, &state->current_read_data); + if (state->bytes_read == state->target_bytes || !success) + { + gpr_log (GPR_INFO, "Read handler done"); + gpr_mu_lock (GRPC_POLLSET_MU (g_pollset)); + state->read_done = 1 + success; + grpc_pollset_kick (g_pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (g_pollset)); + } + else if (success) + { + grpc_endpoint_read (state->read_ep, &state->incoming, &state->done_read, closure_list); + } } -static void read_and_write_test_write_handler(void *data, int success, - grpc_closure_list *closure_list) { +static void +read_and_write_test_write_handler (void *data, int success, grpc_closure_list * closure_list) +{ struct read_and_write_test_state *state = data; gpr_slice *slices = NULL; size_t nslices; - if (success) { - state->bytes_written += state->current_write_size; - if (state->target_bytes - state->bytes_written < - state->current_write_size) { - state->current_write_size = state->target_bytes - state->bytes_written; + if (success) + { + state->bytes_written += state->current_write_size; + if (state->target_bytes - state->bytes_written < state->current_write_size) + { + state->current_write_size = state->target_bytes - state->bytes_written; + } + if (state->current_write_size != 0) + { + slices = allocate_blocks (state->current_write_size, 8192, &nslices, &state->current_write_data); + gpr_slice_buffer_reset_and_unref (&state->outgoing); + gpr_slice_buffer_addn (&state->outgoing, slices, nslices); + grpc_endpoint_write (state->write_ep, &state->outgoing, &state->done_write, closure_list); + free (slices); + return; + } } - if (state->current_write_size != 0) { - slices = allocate_blocks(state->current_write_size, 8192, &nslices, - &state->current_write_data); - gpr_slice_buffer_reset_and_unref(&state->outgoing); - gpr_slice_buffer_addn(&state->outgoing, slices, nslices); - grpc_endpoint_write(state->write_ep, &state->outgoing, &state->done_write, - closure_list); - free(slices); - return; - } - } - gpr_log(GPR_INFO, "Write handler done"); - gpr_mu_lock(GRPC_POLLSET_MU(g_pollset)); + gpr_log (GPR_INFO, "Write handler done"); + gpr_mu_lock (GRPC_POLLSET_MU (g_pollset)); state->write_done = 1 + success; - grpc_pollset_kick(g_pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(g_pollset)); + grpc_pollset_kick (g_pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (g_pollset)); } /* Do both reading and writing using the grpc_endpoint API. This also includes a test of the shutdown behavior. */ -static void read_and_write_test(grpc_endpoint_test_config config, - size_t num_bytes, size_t write_size, - size_t slice_size, int shutdown) { +static void +read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t write_size, size_t slice_size, int shutdown) +{ struct read_and_write_test_state state; - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); - grpc_endpoint_test_fixture f = - begin_test(config, "read_and_write_test", slice_size); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (20); + grpc_endpoint_test_fixture f = begin_test (config, "read_and_write_test", slice_size); grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - gpr_log(GPR_DEBUG, "num_bytes=%d write_size=%d slice_size=%d shutdown=%d", - num_bytes, write_size, slice_size, shutdown); + gpr_log (GPR_DEBUG, "num_bytes=%d write_size=%d slice_size=%d shutdown=%d", num_bytes, write_size, slice_size, shutdown); - if (shutdown) { - gpr_log(GPR_INFO, "Start read and write shutdown test"); - } else { - gpr_log(GPR_INFO, "Start read and write test with %d bytes, slice size %d", - num_bytes, slice_size); - } + if (shutdown) + { + gpr_log (GPR_INFO, "Start read and write shutdown test"); + } + else + { + gpr_log (GPR_INFO, "Start read and write test with %d bytes, slice size %d", num_bytes, slice_size); + } state.read_ep = f.client_ep; state.write_ep = f.server_ep; @@ -207,58 +221,59 @@ static void read_and_write_test(grpc_endpoint_test_config config, state.write_done = 0; state.current_read_data = 0; state.current_write_data = 0; - grpc_closure_init(&state.done_read, read_and_write_test_read_handler, &state); - grpc_closure_init(&state.done_write, read_and_write_test_write_handler, - &state); - gpr_slice_buffer_init(&state.outgoing); - gpr_slice_buffer_init(&state.incoming); + grpc_closure_init (&state.done_read, read_and_write_test_read_handler, &state); + grpc_closure_init (&state.done_write, read_and_write_test_write_handler, &state); + gpr_slice_buffer_init (&state.outgoing); + gpr_slice_buffer_init (&state.incoming); /* Get started by pretending an initial write completed */ /* NOTE: Sets up initial conditions so we can have the same write handler 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, 1, &closure_list); - grpc_closure_list_run(&closure_list); + read_and_write_test_write_handler (&state, 1, &closure_list); + grpc_closure_list_run (&closure_list); - grpc_endpoint_read(state.read_ep, &state.incoming, &state.done_read, - &closure_list); + grpc_endpoint_read (state.read_ep, &state.incoming, &state.done_read, &closure_list); - if (shutdown) { - gpr_log(GPR_DEBUG, "shutdown read"); - grpc_endpoint_shutdown(state.read_ep, &closure_list); - gpr_log(GPR_DEBUG, "shutdown write"); - grpc_endpoint_shutdown(state.write_ep, &closure_list); - } - grpc_closure_list_run(&closure_list); + if (shutdown) + { + gpr_log (GPR_DEBUG, "shutdown read"); + grpc_endpoint_shutdown (state.read_ep, &closure_list); + gpr_log (GPR_DEBUG, "shutdown write"); + grpc_endpoint_shutdown (state.write_ep, &closure_list); + } + grpc_closure_list_run (&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(g_pollset)); - while (!state.read_done || !state.write_done) { - grpc_pollset_worker worker; - GPR_ASSERT(gpr_time_cmp(gpr_now(GPR_CLOCK_MONOTONIC), deadline) < 0); - grpc_pollset_work(g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline, &closure_list); - } - gpr_mu_unlock(GRPC_POLLSET_MU(g_pollset)); - grpc_closure_list_run(&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (g_pollset)); + while (!state.read_done || !state.write_done) + { + grpc_pollset_worker worker; + GPR_ASSERT (gpr_time_cmp (gpr_now (GPR_CLOCK_MONOTONIC), deadline) < 0); + grpc_pollset_work (g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); + } + gpr_mu_unlock (GRPC_POLLSET_MU (g_pollset)); + grpc_closure_list_run (&closure_list); - end_test(config); - gpr_slice_buffer_destroy(&state.outgoing); - gpr_slice_buffer_destroy(&state.incoming); - grpc_endpoint_destroy(state.read_ep, &closure_list); - grpc_endpoint_destroy(state.write_ep, &closure_list); - grpc_closure_list_run(&closure_list); + end_test (config); + gpr_slice_buffer_destroy (&state.outgoing); + gpr_slice_buffer_destroy (&state.incoming); + grpc_endpoint_destroy (state.read_ep, &closure_list); + grpc_endpoint_destroy (state.write_ep, &closure_list); + grpc_closure_list_run (&closure_list); } -void grpc_endpoint_tests(grpc_endpoint_test_config config, - grpc_pollset *pollset) { +void +grpc_endpoint_tests (grpc_endpoint_test_config config, grpc_pollset * pollset) +{ size_t i; g_pollset = pollset; - read_and_write_test(config, 10000000, 100000, 8192, 0); - read_and_write_test(config, 1000000, 100000, 1, 0); - read_and_write_test(config, 100000000, 100000, 1, 1); - for (i = 1; i < 1000; i = GPR_MAX(i + 1, i * 5 / 4)) { - read_and_write_test(config, 40320, i, i, 0); - } + read_and_write_test (config, 10000000, 100000, 8192, 0); + read_and_write_test (config, 1000000, 100000, 1, 0); + read_and_write_test (config, 100000000, 100000, 1, 1); + for (i = 1; i < 1000; i = GPR_MAX (i + 1, i * 5 / 4)) + { + read_and_write_test (config, 40320, i, i, 0); + } g_pollset = NULL; } diff --git a/test/core/iomgr/endpoint_tests.h b/test/core/iomgr/endpoint_tests.h index 700f854891e..2e6335c22ec 100644 --- a/test/core/iomgr/endpoint_tests.h +++ b/test/core/iomgr/endpoint_tests.h @@ -41,18 +41,19 @@ typedef struct grpc_endpoint_test_config grpc_endpoint_test_config; typedef struct grpc_endpoint_test_fixture grpc_endpoint_test_fixture; -struct grpc_endpoint_test_fixture { +struct grpc_endpoint_test_fixture +{ grpc_endpoint *client_ep; grpc_endpoint *server_ep; }; -struct grpc_endpoint_test_config { +struct grpc_endpoint_test_config +{ const char *name; - grpc_endpoint_test_fixture (*create_fixture)(size_t slice_size); - void (*clean_up)(); + grpc_endpoint_test_fixture (*create_fixture) (size_t slice_size); + void (*clean_up) (); }; -void grpc_endpoint_tests(grpc_endpoint_test_config config, - grpc_pollset *pollset); +void grpc_endpoint_tests (grpc_endpoint_test_config config, grpc_pollset * pollset); #endif /* GRPC_TEST_CORE_IOMGR_ENDPOINT_TESTS_H */ diff --git a/test/core/iomgr/fd_conservation_posix_test.c b/test/core/iomgr/fd_conservation_posix_test.c index 1ffb5808b72..703edc660ef 100644 --- a/test/core/iomgr/fd_conservation_posix_test.c +++ b/test/core/iomgr/fd_conservation_posix_test.c @@ -39,28 +39,31 @@ #include "src/core/iomgr/endpoint_pair.h" #include "src/core/iomgr/iomgr.h" -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ int i; struct rlimit rlim; grpc_endpoint_pair p; - grpc_test_init(argc, argv); - grpc_iomgr_init(); + grpc_test_init (argc, argv); + grpc_iomgr_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)); + GPR_ASSERT (0 == setrlimit (RLIMIT_NOFILE, &rlim)); - for (i = 0; i < 100; i++) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - p = grpc_iomgr_create_endpoint_pair("test", 1); - grpc_endpoint_destroy(p.client, &closure_list); - grpc_endpoint_destroy(p.server, &closure_list); - grpc_closure_list_run(&closure_list); - } + for (i = 0; i < 100; i++) + { + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + p = grpc_iomgr_create_endpoint_pair ("test", 1); + grpc_endpoint_destroy (p.client, &closure_list); + grpc_endpoint_destroy (p.server, &closure_list); + grpc_closure_list_run (&closure_list); + } - grpc_iomgr_shutdown(); + grpc_iomgr_shutdown (); return 0; } diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index 0a8d40419b1..5449c387682 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -60,162 +60,186 @@ static grpc_pollset g_pollset; /* Create a test socket with the right properties for testing. port is the TCP port to listen or connect to. Return a socket FD and sockaddr_in. */ -static void create_test_socket(int port, int *socket_fd, - struct sockaddr_in *sin) { +static void +create_test_socket (int port, int *socket_fd, struct sockaddr_in *sin) +{ int fd; int one = 1; int buf_size = BUF_SIZE; int flags; - fd = socket(AF_INET, SOCK_STREAM, 0); - setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)); + fd = socket (AF_INET, SOCK_STREAM, 0); + setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof (one)); /* Reset the size of socket send buffer to the minimal value to facilitate buffer filling up and triggering notify_on_write */ - GPR_ASSERT( - setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &buf_size, sizeof(buf_size)) != -1); - GPR_ASSERT( - setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &buf_size, sizeof(buf_size)) != -1); + GPR_ASSERT (setsockopt (fd, SOL_SOCKET, SO_SNDBUF, &buf_size, sizeof (buf_size)) != -1); + GPR_ASSERT (setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &buf_size, sizeof (buf_size)) != -1); /* Make fd non-blocking */ - flags = fcntl(fd, F_GETFL, 0); - GPR_ASSERT(fcntl(fd, F_SETFL, flags | O_NONBLOCK) == 0); + flags = fcntl (fd, F_GETFL, 0); + GPR_ASSERT (fcntl (fd, F_SETFL, flags | O_NONBLOCK) == 0); *socket_fd = fd; /* Use local address for test */ sin->sin_family = AF_INET; - sin->sin_addr.s_addr = htonl(0x7f000001); - GPR_ASSERT(port >= 0 && port < 65536); - sin->sin_port = htons((gpr_uint16)port); + sin->sin_addr.s_addr = htonl (0x7f000001); + GPR_ASSERT (port >= 0 && port < 65536); + sin->sin_port = htons ((gpr_uint16) port); } /* Dummy gRPC callback */ -void no_op_cb(void *arg, int success) {} +void +no_op_cb (void *arg, int success) +{ +} /* =======An upload server to test notify_on_read=========== The server simply reads and counts a stream of bytes. */ /* An upload server. */ -typedef struct { - grpc_fd *em_fd; /* listening fd */ - ssize_t read_bytes_total; /* total number of received bytes */ - int done; /* set to 1 when a server finishes serving */ +typedef struct +{ + grpc_fd *em_fd; /* listening fd */ + ssize_t read_bytes_total; /* total number of received bytes */ + int done; /* set to 1 when a server finishes serving */ grpc_closure listen_closure; } server; -static void server_init(server *sv) { +static void +server_init (server * sv) +{ sv->read_bytes_total = 0; sv->done = 0; } /* An upload session. Created when a new upload request arrives in the server. */ -typedef struct { - server *sv; /* not owned by a single session */ - grpc_fd *em_fd; /* fd to read upload bytes */ - char read_buf[BUF_SIZE]; /* buffer to store upload bytes */ +typedef struct +{ + server *sv; /* not owned by a single session */ + grpc_fd *em_fd; /* fd to read upload bytes */ + char read_buf[BUF_SIZE]; /* buffer to store upload bytes */ grpc_closure session_read_closure; } session; /* 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*/ - int success, grpc_closure_list *closure_list) { +static void +session_shutdown_cb (void *arg, /*session */ + int success, grpc_closure_list * closure_list) +{ session *se = arg; server *sv = se->sv; - grpc_fd_orphan(se->em_fd, NULL, "a", closure_list); - gpr_free(se); + grpc_fd_orphan (se->em_fd, NULL, "a", closure_list); + gpr_free (se); /* Start to shutdown listen fd. */ - grpc_fd_shutdown(sv->em_fd, closure_list); + grpc_fd_shutdown (sv->em_fd, closure_list); } /* Called when data become readable in a session. */ -static void session_read_cb(void *arg, /*session*/ - int success, grpc_closure_list *closure_list) { +static void +session_read_cb (void *arg, /*session */ + int success, grpc_closure_list * closure_list) +{ session *se = arg; int fd = se->em_fd->fd; ssize_t read_once = 0; ssize_t read_total = 0; - if (!success) { - session_shutdown_cb(arg, 1, closure_list); - return; - } + if (!success) + { + session_shutdown_cb (arg, 1, closure_list); + return; + } - do { - read_once = read(fd, se->read_buf, BUF_SIZE); - if (read_once > 0) read_total += read_once; - } while (read_once > 0); + do + { + read_once = read (fd, se->read_buf, BUF_SIZE); + if (read_once > 0) + read_total += read_once; + } + while (read_once > 0); se->sv->read_bytes_total += read_total; /* read() returns 0 to indicate the TCP connection was closed by the client. read(fd, read_buf, 0) also returns 0 which should never be called as such. 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, closure_list); - } else if (read_once == -1) { - if (errno == EAGAIN) { - /* An edge triggered event is cached in the kernel until next poll. - In the current single thread implementation, session_read_cb is called - in the polling thread, such that polling only happens after this - callback, and will catch read edge event if data is available again - before notify_on_read. - 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, - closure_list); - } else { - gpr_log(GPR_ERROR, "Unhandled read error %s", strerror(errno)); - abort(); + if (read_once == 0) + { + session_shutdown_cb (arg, 1, closure_list); + } + else if (read_once == -1) + { + if (errno == EAGAIN) + { + /* An edge triggered event is cached in the kernel until next poll. + In the current single thread implementation, session_read_cb is called + in the polling thread, such that polling only happens after this + callback, and will catch read edge event if data is available again + before notify_on_read. + 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, closure_list); + } + else + { + gpr_log (GPR_ERROR, "Unhandled read error %s", strerror (errno)); + abort (); + } } - } } /* 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, - grpc_closure_list *closure_list) { +static void +listen_shutdown_cb (void *arg /*server */ , int success, + grpc_closure_list * closure_list) +{ server *sv = arg; - grpc_fd_orphan(sv->em_fd, NULL, "b", closure_list); + grpc_fd_orphan (sv->em_fd, NULL, "b", closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); sv->done = 1; - grpc_pollset_kick(&g_pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_pollset_kick (&g_pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } /* Called when a new TCP connection request arrives in the listening port. */ -static void listen_cb(void *arg, /*=sv_arg*/ - int success, grpc_closure_list *closure_list) { +static void +listen_cb (void *arg, /*=sv_arg*/ + int success, grpc_closure_list * closure_list) +{ server *sv = arg; int fd; int flags; session *se; struct sockaddr_storage ss; - socklen_t slen = sizeof(ss); + socklen_t slen = sizeof (ss); grpc_fd *listen_em_fd = sv->em_fd; - if (!success) { - listen_shutdown_cb(arg, 1, closure_list); - return; - } - - fd = accept(listen_em_fd->fd, (struct sockaddr *)&ss, &slen); - GPR_ASSERT(fd >= 0); - GPR_ASSERT(fd < FD_SETSIZE); - flags = fcntl(fd, F_GETFL, 0); - fcntl(fd, F_SETFL, flags | O_NONBLOCK); - se = gpr_malloc(sizeof(*se)); + if (!success) + { + listen_shutdown_cb (arg, 1, closure_list); + return; + } + + fd = accept (listen_em_fd->fd, (struct sockaddr *) &ss, &slen); + GPR_ASSERT (fd >= 0); + GPR_ASSERT (fd < FD_SETSIZE); + flags = fcntl (fd, F_GETFL, 0); + fcntl (fd, F_SETFL, flags | O_NONBLOCK); + se = gpr_malloc (sizeof (*se)); se->sv = sv; - se->em_fd = grpc_fd_create(fd, "listener"); - grpc_pollset_add_fd(&g_pollset, se->em_fd, closure_list); + se->em_fd = grpc_fd_create (fd, "listener"); + grpc_pollset_add_fd (&g_pollset, se->em_fd, closure_list); se->session_read_closure.cb = session_read_cb; se->session_read_closure.cb_arg = se; - grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure, closure_list); + grpc_fd_notify_on_read (se->em_fd, &se->session_read_closure, closure_list); - grpc_fd_notify_on_read(listen_em_fd, &sv->listen_closure, closure_list); + grpc_fd_notify_on_read (listen_em_fd, &sv->listen_closure, closure_list); } /* Max number of connections pending to be accepted by listen(). */ @@ -225,42 +249,46 @@ 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, grpc_closure_list *closure_list) { +static int +server_start (server * sv, grpc_closure_list * closure_list) +{ int port = 0; int fd; struct sockaddr_in sin; socklen_t addr_len; - create_test_socket(port, &fd, &sin); - addr_len = sizeof(sin); - GPR_ASSERT(bind(fd, (struct sockaddr *)&sin, addr_len) == 0); - GPR_ASSERT(getsockname(fd, (struct sockaddr *)&sin, &addr_len) == 0); - port = ntohs(sin.sin_port); - GPR_ASSERT(listen(fd, MAX_NUM_FD) == 0); + create_test_socket (port, &fd, &sin); + addr_len = sizeof (sin); + GPR_ASSERT (bind (fd, (struct sockaddr *) &sin, addr_len) == 0); + GPR_ASSERT (getsockname (fd, (struct sockaddr *) &sin, &addr_len) == 0); + port = ntohs (sin.sin_port); + 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, closure_list); + sv->em_fd = grpc_fd_create (fd, "server"); + grpc_pollset_add_fd (&g_pollset, sv->em_fd, closure_list); /* Register to be interested in reading from listen_fd. */ sv->listen_closure.cb = listen_cb; sv->listen_closure.cb_arg = sv; - grpc_fd_notify_on_read(sv->em_fd, &sv->listen_closure, closure_list); + grpc_fd_notify_on_read (sv->em_fd, &sv->listen_closure, closure_list); return port; } /* Wait and shutdown a sever. */ -static void server_wait_and_shutdown(server *sv) { - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - while (!sv->done) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - } - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); +static void +server_wait_and_shutdown (server * sv) +{ + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + while (!sv->done) + { + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_pollset_worker worker; + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + } + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } /* ===An upload client to test notify_on_write=== */ @@ -271,7 +299,8 @@ static void server_wait_and_shutdown(server *sv) { #define CLIENT_TOTAL_WRITE_CNT 3 /* An upload client. */ -typedef struct { +typedef struct +{ grpc_fd *em_fd; char write_buf[CLIENT_WRITE_BUF_SIZE]; ssize_t write_bytes_total; @@ -279,158 +308,198 @@ typedef struct { notify_on_write to schedule another write. */ int client_write_cnt; - int done; /* set to 1 when a client finishes sending */ + int done; /* set to 1 when a client finishes sending */ grpc_closure write_closure; } client; -static void client_init(client *cl) { - memset(cl->write_buf, 0, sizeof(cl->write_buf)); +static void +client_init (client * cl) +{ + memset (cl->write_buf, 0, sizeof (cl->write_buf)); cl->write_bytes_total = 0; cl->client_write_cnt = 0; cl->done = 0; } /* Called when a client upload session is ready to shutdown. */ -static void client_session_shutdown_cb(void *arg /*client*/, int success, - grpc_closure_list *closure_list) { +static void +client_session_shutdown_cb (void *arg /*client */ , int success, + grpc_closure_list * closure_list) +{ client *cl = arg; - grpc_fd_orphan(cl->em_fd, NULL, "c", closure_list); + grpc_fd_orphan (cl->em_fd, NULL, "c", closure_list); cl->done = 1; - grpc_pollset_kick(&g_pollset, NULL); + grpc_pollset_kick (&g_pollset, NULL); } /* Write as much as possible, then register notify_on_write. */ -static void client_session_write(void *arg, /*client*/ - int success, grpc_closure_list *closure_list) { +static void +client_session_write (void *arg, /*client */ + int success, grpc_closure_list * closure_list) +{ client *cl = arg; int fd = cl->em_fd->fd; ssize_t write_once = 0; - if (!success) { - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - client_session_shutdown_cb(arg, 1, closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - return; - } - - do { - write_once = write(fd, cl->write_buf, CLIENT_WRITE_BUF_SIZE); - if (write_once > 0) cl->write_bytes_total += write_once; - } while (write_once > 0); - - if (errno == EAGAIN) { - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - if (cl->client_write_cnt < CLIENT_TOTAL_WRITE_CNT) { - cl->write_closure.cb = client_session_write; - cl->write_closure.cb_arg = cl; - grpc_fd_notify_on_write(cl->em_fd, &cl->write_closure, closure_list); - cl->client_write_cnt++; - } else { - client_session_shutdown_cb(arg, 1, closure_list); + if (!success) + { + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + client_session_shutdown_cb (arg, 1, closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + return; + } + + do + { + write_once = write (fd, cl->write_buf, CLIENT_WRITE_BUF_SIZE); + if (write_once > 0) + cl->write_bytes_total += write_once; + } + while (write_once > 0); + + if (errno == EAGAIN) + { + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + if (cl->client_write_cnt < CLIENT_TOTAL_WRITE_CNT) + { + cl->write_closure.cb = client_session_write; + cl->write_closure.cb_arg = cl; + grpc_fd_notify_on_write (cl->em_fd, &cl->write_closure, closure_list); + cl->client_write_cnt++; + } + else + { + client_session_shutdown_cb (arg, 1, closure_list); + } + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + } + else + { + gpr_log (GPR_ERROR, "unknown errno %s", strerror (errno)); + abort (); } - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - } else { - gpr_log(GPR_ERROR, "unknown errno %s", strerror(errno)); - abort(); - } } /* Start a client to send a stream of bytes. */ -static void client_start(client *cl, int port, - grpc_closure_list *closure_list) { +static void +client_start (client * cl, int port, grpc_closure_list * closure_list) +{ int fd; struct sockaddr_in sin; - create_test_socket(port, &fd, &sin); - if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) { - if (errno == EINPROGRESS) { - struct pollfd pfd; - pfd.fd = fd; - pfd.events = POLLOUT; - pfd.revents = 0; - if (poll(&pfd, 1, -1) == -1) { - gpr_log(GPR_ERROR, "poll() failed during connect; errno=%d", errno); - abort(); - } - } else { - gpr_log(GPR_ERROR, "Failed to connect to the server (errno=%d)", errno); - abort(); + create_test_socket (port, &fd, &sin); + if (connect (fd, (struct sockaddr *) &sin, sizeof (sin)) == -1) + { + if (errno == EINPROGRESS) + { + struct pollfd pfd; + pfd.fd = fd; + pfd.events = POLLOUT; + pfd.revents = 0; + if (poll (&pfd, 1, -1) == -1) + { + gpr_log (GPR_ERROR, "poll() failed during connect; errno=%d", errno); + abort (); + } + } + else + { + gpr_log (GPR_ERROR, "Failed to connect to the server (errno=%d)", errno); + abort (); + } } - } - cl->em_fd = grpc_fd_create(fd, "client"); - grpc_pollset_add_fd(&g_pollset, cl->em_fd, closure_list); + cl->em_fd = grpc_fd_create (fd, "client"); + grpc_pollset_add_fd (&g_pollset, cl->em_fd, closure_list); - client_session_write(cl, 1, closure_list); + client_session_write (cl, 1, closure_list); } /* Wait for the signal to shutdown a client. */ -static void client_wait_and_shutdown(client *cl) { - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - while (!cl->done) { - grpc_pollset_worker worker; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - } - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); +static void +client_wait_and_shutdown (client * cl) +{ + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + while (!cl->done) + { + grpc_pollset_worker worker; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + } + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } /* Test grpc_fd. Start an upload server and client, upload a stream of bytes from the client to the server, and verify that the total number of sent bytes is equal to the total number of received bytes. */ -static void test_grpc_fd(void) { +static void +test_grpc_fd (void) +{ server sv; client cl; int port; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - server_init(&sv); - port = server_start(&sv, &closure_list); - client_init(&cl); - client_start(&cl, port, &closure_list); - grpc_closure_list_run(&closure_list); - client_wait_and_shutdown(&cl); - server_wait_and_shutdown(&sv); - GPR_ASSERT(sv.read_bytes_total == cl.write_bytes_total); - gpr_log(GPR_INFO, "Total read bytes %d", sv.read_bytes_total); + server_init (&sv); + port = server_start (&sv, &closure_list); + client_init (&cl); + client_start (&cl, port, &closure_list); + grpc_closure_list_run (&closure_list); + client_wait_and_shutdown (&cl); + server_wait_and_shutdown (&sv); + GPR_ASSERT (sv.read_bytes_total == cl.write_bytes_total); + gpr_log (GPR_INFO, "Total read bytes %d", sv.read_bytes_total); } -typedef struct fd_change_data { - void (*cb_that_ran)(void *, int success, grpc_closure_list *closure_list); +typedef struct fd_change_data +{ + void (*cb_that_ran) (void *, int success, grpc_closure_list * closure_list); } fd_change_data; -void init_change_data(fd_change_data *fdc) { fdc->cb_that_ran = NULL; } +void +init_change_data (fd_change_data * fdc) +{ + fdc->cb_that_ran = NULL; +} -void destroy_change_data(fd_change_data *fdc) {} +void +destroy_change_data (fd_change_data * fdc) +{ +} -static void first_read_callback(void *arg /* fd_change_data */, int success, - grpc_closure_list *closure_list) { +static void +first_read_callback (void *arg /* fd_change_data */ , int success, + grpc_closure_list * closure_list) +{ fd_change_data *fdc = arg; - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); fdc->cb_that_ran = first_read_callback; - grpc_pollset_kick(&g_pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_pollset_kick (&g_pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } -static void second_read_callback(void *arg /* fd_change_data */, int success, - grpc_closure_list *closure_list) { +static void +second_read_callback (void *arg /* fd_change_data */ , int success, + grpc_closure_list * closure_list) +{ fd_change_data *fdc = arg; - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); fdc->cb_that_ran = second_read_callback; - grpc_pollset_kick(&g_pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_pollset_kick (&g_pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } /* Test that changing the callback we use for notify_on_read actually works. Note that we have two different but almost identical callbacks above -- the point is to have two different function pointers and two different data pointers and make sure that changing both really works. */ -static void test_grpc_fd_change(void) { +static void +test_grpc_fd_change (void) +{ grpc_fd *em_fd; fd_change_data a, b; int flags; @@ -446,84 +515,87 @@ static void test_grpc_fd_change(void) { second_closure.cb = second_read_callback; second_closure.cb_arg = &b; - init_change_data(&a); - init_change_data(&b); + init_change_data (&a); + init_change_data (&b); - GPR_ASSERT(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); - flags = fcntl(sv[0], F_GETFL, 0); - GPR_ASSERT(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK) == 0); - flags = fcntl(sv[1], F_GETFL, 0); - GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0); + GPR_ASSERT (socketpair (AF_UNIX, SOCK_STREAM, 0, sv) == 0); + flags = fcntl (sv[0], F_GETFL, 0); + GPR_ASSERT (fcntl (sv[0], F_SETFL, flags | O_NONBLOCK) == 0); + flags = fcntl (sv[1], F_GETFL, 0); + 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, &closure_list); + em_fd = grpc_fd_create (sv[0], "test_grpc_fd_change"); + grpc_pollset_add_fd (&g_pollset, em_fd, &closure_list); /* Register the first callback, then make its FD readable */ - grpc_fd_notify_on_read(em_fd, &first_closure, &closure_list); + grpc_fd_notify_on_read (em_fd, &first_closure, &closure_list); data = 0; - result = write(sv[1], &data, 1); - GPR_ASSERT(result == 1); + result = write (sv[1], &data, 1); + GPR_ASSERT (result == 1); /* And now wait for it to run. */ - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - while (a.cb_that_ran == NULL) { - grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - } - GPR_ASSERT(a.cb_that_ran == first_read_callback); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + while (a.cb_that_ran == NULL) + { + grpc_pollset_worker worker; + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + } + GPR_ASSERT (a.cb_that_ran == first_read_callback); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); /* And drain the socket so we can generate a new read edge */ - result = read(sv[0], &data, 1); - GPR_ASSERT(result == 1); + result = read (sv[0], &data, 1); + GPR_ASSERT (result == 1); /* Now register a second callback with distinct change data, and do the same thing again. */ - grpc_fd_notify_on_read(em_fd, &second_closure, &closure_list); + grpc_fd_notify_on_read (em_fd, &second_closure, &closure_list); data = 0; - result = write(sv[1], &data, 1); - GPR_ASSERT(result == 1); - - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - while (b.cb_that_ran == NULL) { - grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - } + result = write (sv[1], &data, 1); + GPR_ASSERT (result == 1); + + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + while (b.cb_that_ran == NULL) + { + grpc_pollset_worker worker; + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + } /* Except now we verify that second_read_callback ran instead */ - GPR_ASSERT(b.cb_that_ran == second_read_callback); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - - grpc_fd_orphan(em_fd, NULL, "d", &closure_list); - grpc_closure_list_run(&closure_list); - destroy_change_data(&a); - destroy_change_data(&b); - close(sv[1]); + GPR_ASSERT (b.cb_that_ran == second_read_callback); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + + grpc_fd_orphan (em_fd, NULL, "d", &closure_list); + grpc_closure_list_run (&closure_list); + destroy_change_data (&a); + destroy_change_data (&b); + close (sv[1]); } -static void destroy_pollset(void *p, int success, - grpc_closure_list *closure_list) { - grpc_pollset_destroy(p); +static void +destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +{ + grpc_pollset_destroy (p); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ grpc_closure destroyed; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_test_init(argc, argv); - grpc_iomgr_init(); - grpc_pollset_init(&g_pollset); - test_grpc_fd(); - test_grpc_fd_change(); - grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run(&closure_list); - grpc_iomgr_shutdown(); + grpc_test_init (argc, argv); + grpc_iomgr_init (); + grpc_pollset_init (&g_pollset); + test_grpc_fd (); + test_grpc_fd_change (); + grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run (&closure_list); + grpc_iomgr_shutdown (); return 0; } diff --git a/test/core/iomgr/resolve_address_test.c b/test/core/iomgr/resolve_address_test.c index 4d41020768a..a1ce7efaf00 100644 --- a/test/core/iomgr/resolve_address_test.c +++ b/test/core/iomgr/resolve_address_test.c @@ -38,101 +38,124 @@ #include #include "test/core/util/test_config.h" -static gpr_timespec test_deadline(void) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(100); +static gpr_timespec +test_deadline (void) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (100); } -static void must_succeed(void* evp, grpc_resolved_addresses* p, - grpc_closure_list* closure_list) { - GPR_ASSERT(p); - GPR_ASSERT(p->naddrs >= 1); - grpc_resolved_addresses_destroy(p); - gpr_event_set(evp, (void*)1); +static void +must_succeed (void *evp, grpc_resolved_addresses * p, grpc_closure_list * closure_list) +{ + GPR_ASSERT (p); + GPR_ASSERT (p->naddrs >= 1); + grpc_resolved_addresses_destroy (p); + gpr_event_set (evp, (void *) 1); } -static void must_fail(void* evp, grpc_resolved_addresses* p, - grpc_closure_list* closure_list) { - GPR_ASSERT(!p); - gpr_event_set(evp, (void*)1); +static void +must_fail (void *evp, grpc_resolved_addresses * p, grpc_closure_list * closure_list) +{ + GPR_ASSERT (!p); + gpr_event_set (evp, (void *) 1); } -static void test_localhost(void) { +static void +test_localhost (void) +{ gpr_event ev; - gpr_event_init(&ev); - grpc_resolve_address("localhost:1", NULL, must_succeed, &ev); - GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); + gpr_event_init (&ev); + grpc_resolve_address ("localhost:1", NULL, must_succeed, &ev); + GPR_ASSERT (gpr_event_wait (&ev, test_deadline ())); } -static void test_default_port(void) { +static void +test_default_port (void) +{ gpr_event ev; - gpr_event_init(&ev); - grpc_resolve_address("localhost", "1", must_succeed, &ev); - GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); + gpr_event_init (&ev); + grpc_resolve_address ("localhost", "1", must_succeed, &ev); + GPR_ASSERT (gpr_event_wait (&ev, test_deadline ())); } -static void test_missing_default_port(void) { +static void +test_missing_default_port (void) +{ gpr_event ev; - gpr_event_init(&ev); - grpc_resolve_address("localhost", NULL, must_fail, &ev); - GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); + gpr_event_init (&ev); + grpc_resolve_address ("localhost", NULL, must_fail, &ev); + GPR_ASSERT (gpr_event_wait (&ev, test_deadline ())); } -static void test_ipv6_with_port(void) { +static void +test_ipv6_with_port (void) +{ gpr_event ev; - gpr_event_init(&ev); - grpc_resolve_address("[2001:db8::1]:1", NULL, must_succeed, &ev); - GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); + gpr_event_init (&ev); + grpc_resolve_address ("[2001:db8::1]:1", NULL, must_succeed, &ev); + GPR_ASSERT (gpr_event_wait (&ev, test_deadline ())); } -static void test_ipv6_without_port(void) { - const char* const kCases[] = { - "2001:db8::1", "2001:db8::1.2.3.4", "[2001:db8::1]", +static void +test_ipv6_without_port (void) +{ + const char *const kCases[] = { + "2001:db8::1", "2001:db8::1.2.3.4", "[2001:db8::1]", }; unsigned i; - for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - gpr_event ev; - gpr_event_init(&ev); - grpc_resolve_address(kCases[i], "80", must_succeed, &ev); - GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); - } + for (i = 0; i < sizeof (kCases) / sizeof (*kCases); i++) + { + gpr_event ev; + gpr_event_init (&ev); + grpc_resolve_address (kCases[i], "80", must_succeed, &ev); + GPR_ASSERT (gpr_event_wait (&ev, test_deadline ())); + } } -static void test_invalid_ip_addresses(void) { - const char* const kCases[] = { - "293.283.1238.3:1", "[2001:db8::11111]:1", +static void +test_invalid_ip_addresses (void) +{ + const char *const kCases[] = { + "293.283.1238.3:1", "[2001:db8::11111]:1", }; unsigned i; - for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - gpr_event ev; - gpr_event_init(&ev); - grpc_resolve_address(kCases[i], NULL, must_fail, &ev); - GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); - } + for (i = 0; i < sizeof (kCases) / sizeof (*kCases); i++) + { + gpr_event ev; + gpr_event_init (&ev); + grpc_resolve_address (kCases[i], NULL, must_fail, &ev); + GPR_ASSERT (gpr_event_wait (&ev, test_deadline ())); + } } -static void test_unparseable_hostports(void) { - const char* const kCases[] = { - "[", "[::1", "[::1]bad", "[1.2.3.4]", "[localhost]", "[localhost]:1", +static void +test_unparseable_hostports (void) +{ + const char *const kCases[] = { + "[", "[::1", "[::1]bad", "[1.2.3.4]", "[localhost]", "[localhost]:1", }; unsigned i; - for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - gpr_event ev; - gpr_event_init(&ev); - grpc_resolve_address(kCases[i], "1", must_fail, &ev); - GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); - } + for (i = 0; i < sizeof (kCases) / sizeof (*kCases); i++) + { + gpr_event ev; + gpr_event_init (&ev); + grpc_resolve_address (kCases[i], "1", must_fail, &ev); + GPR_ASSERT (gpr_event_wait (&ev, test_deadline ())); + } } -int main(int argc, char** argv) { - grpc_test_init(argc, argv); - grpc_iomgr_init(); - test_localhost(); - test_default_port(); - test_missing_default_port(); - test_ipv6_with_port(); - test_ipv6_without_port(); - test_invalid_ip_addresses(); - test_unparseable_hostports(); - grpc_iomgr_shutdown(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + grpc_iomgr_init (); + test_localhost (); + test_default_port (); + test_missing_default_port (); + test_ipv6_with_port (); + test_ipv6_without_port (); + test_invalid_ip_addresses (); + test_unparseable_hostports (); + grpc_iomgr_shutdown (); return 0; } diff --git a/test/core/iomgr/sockaddr_utils_test.c b/test/core/iomgr/sockaddr_utils_test.c index 72a0f718358..2f061cfa466 100644 --- a/test/core/iomgr/sockaddr_utils_test.c +++ b/test/core/iomgr/sockaddr_utils_test.c @@ -41,206 +41,216 @@ #include #include "test/core/util/test_config.h" -static struct sockaddr_in make_addr4(const gpr_uint8 *data, size_t data_len) { +static struct sockaddr_in +make_addr4 (const gpr_uint8 * data, size_t data_len) +{ struct sockaddr_in addr4; - memset(&addr4, 0, sizeof(addr4)); + memset (&addr4, 0, sizeof (addr4)); addr4.sin_family = AF_INET; - GPR_ASSERT(data_len == sizeof(addr4.sin_addr.s_addr)); - memcpy(&addr4.sin_addr.s_addr, data, data_len); - addr4.sin_port = htons(12345); + GPR_ASSERT (data_len == sizeof (addr4.sin_addr.s_addr)); + memcpy (&addr4.sin_addr.s_addr, data, data_len); + addr4.sin_port = htons (12345); return addr4; } -static struct sockaddr_in6 make_addr6(const gpr_uint8 *data, size_t data_len) { +static struct sockaddr_in6 +make_addr6 (const gpr_uint8 * data, size_t data_len) +{ struct sockaddr_in6 addr6; - memset(&addr6, 0, sizeof(addr6)); + memset (&addr6, 0, sizeof (addr6)); addr6.sin6_family = AF_INET6; - GPR_ASSERT(data_len == sizeof(addr6.sin6_addr.s6_addr)); - memcpy(&addr6.sin6_addr.s6_addr, data, data_len); - addr6.sin6_port = htons(12345); + GPR_ASSERT (data_len == sizeof (addr6.sin6_addr.s6_addr)); + memcpy (&addr6.sin6_addr.s6_addr, data, data_len); + addr6.sin6_port = htons (12345); return addr6; } -static const gpr_uint8 kMapped[] = {0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0xff, 0xff, 192, 0, 2, 1}; -static const gpr_uint8 kNotQuiteMapped[] = {0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0xff, 0xfe, 192, 0, 2, 99}; -static const gpr_uint8 kIPv4[] = {192, 0, 2, 1}; -static const gpr_uint8 kIPv6[] = {0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1}; +static const gpr_uint8 kMapped[] = { 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0xff, 0xff, 192, 0, 2, 1 +}; -static void test_sockaddr_is_v4mapped(void) { +static const gpr_uint8 kNotQuiteMapped[] = { 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0xff, 0xfe, 192, 0, 2, 99 +}; +static const gpr_uint8 kIPv4[] = { 192, 0, 2, 1 }; + +static const gpr_uint8 kIPv6[] = { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1 +}; + +static void +test_sockaddr_is_v4mapped (void) +{ struct sockaddr_in input4; struct sockaddr_in6 input6; struct sockaddr_in output4; struct sockaddr_in expect4; - gpr_log(GPR_INFO, "%s", "test_sockaddr_is_v4mapped"); + gpr_log (GPR_INFO, "%s", "test_sockaddr_is_v4mapped"); /* v4mapped input should succeed. */ - input6 = make_addr6(kMapped, sizeof(kMapped)); - GPR_ASSERT(grpc_sockaddr_is_v4mapped((const struct sockaddr *)&input6, NULL)); - GPR_ASSERT( - grpc_sockaddr_is_v4mapped((const struct sockaddr *)&input6, &output4)); - expect4 = make_addr4(kIPv4, sizeof(kIPv4)); - GPR_ASSERT(memcmp(&expect4, &output4, sizeof(expect4)) == 0); + input6 = make_addr6 (kMapped, sizeof (kMapped)); + GPR_ASSERT (grpc_sockaddr_is_v4mapped ((const struct sockaddr *) &input6, NULL)); + GPR_ASSERT (grpc_sockaddr_is_v4mapped ((const struct sockaddr *) &input6, &output4)); + expect4 = make_addr4 (kIPv4, sizeof (kIPv4)); + GPR_ASSERT (memcmp (&expect4, &output4, sizeof (expect4)) == 0); /* Non-v4mapped input should fail. */ - input6 = make_addr6(kNotQuiteMapped, sizeof(kNotQuiteMapped)); - GPR_ASSERT( - !grpc_sockaddr_is_v4mapped((const struct sockaddr *)&input6, NULL)); - GPR_ASSERT( - !grpc_sockaddr_is_v4mapped((const struct sockaddr *)&input6, &output4)); + input6 = make_addr6 (kNotQuiteMapped, sizeof (kNotQuiteMapped)); + GPR_ASSERT (!grpc_sockaddr_is_v4mapped ((const struct sockaddr *) &input6, NULL)); + GPR_ASSERT (!grpc_sockaddr_is_v4mapped ((const struct sockaddr *) &input6, &output4)); /* Output is unchanged. */ - GPR_ASSERT(memcmp(&expect4, &output4, sizeof(expect4)) == 0); + GPR_ASSERT (memcmp (&expect4, &output4, sizeof (expect4)) == 0); /* Plain IPv4 input should also fail. */ - input4 = make_addr4(kIPv4, sizeof(kIPv4)); - GPR_ASSERT( - !grpc_sockaddr_is_v4mapped((const struct sockaddr *)&input4, NULL)); + input4 = make_addr4 (kIPv4, sizeof (kIPv4)); + GPR_ASSERT (!grpc_sockaddr_is_v4mapped ((const struct sockaddr *) &input4, NULL)); } -static void test_sockaddr_to_v4mapped(void) { +static void +test_sockaddr_to_v4mapped (void) +{ struct sockaddr_in input4; struct sockaddr_in6 input6; struct sockaddr_in6 output6; struct sockaddr_in6 expect6; - gpr_log(GPR_INFO, "%s", "test_sockaddr_to_v4mapped"); + gpr_log (GPR_INFO, "%s", "test_sockaddr_to_v4mapped"); /* IPv4 input should succeed. */ - input4 = make_addr4(kIPv4, sizeof(kIPv4)); - GPR_ASSERT( - grpc_sockaddr_to_v4mapped((const struct sockaddr *)&input4, &output6)); - expect6 = make_addr6(kMapped, sizeof(kMapped)); - GPR_ASSERT(memcmp(&expect6, &output6, sizeof(output6)) == 0); + input4 = make_addr4 (kIPv4, sizeof (kIPv4)); + GPR_ASSERT (grpc_sockaddr_to_v4mapped ((const struct sockaddr *) &input4, &output6)); + expect6 = make_addr6 (kMapped, sizeof (kMapped)); + GPR_ASSERT (memcmp (&expect6, &output6, sizeof (output6)) == 0); /* IPv6 input should fail. */ - input6 = make_addr6(kIPv6, sizeof(kIPv6)); - GPR_ASSERT( - !grpc_sockaddr_to_v4mapped((const struct sockaddr *)&input6, &output6)); + input6 = make_addr6 (kIPv6, sizeof (kIPv6)); + GPR_ASSERT (!grpc_sockaddr_to_v4mapped ((const struct sockaddr *) &input6, &output6)); /* Output is unchanged. */ - GPR_ASSERT(memcmp(&expect6, &output6, sizeof(output6)) == 0); + GPR_ASSERT (memcmp (&expect6, &output6, sizeof (output6)) == 0); /* Already-v4mapped input should also fail. */ - input6 = make_addr6(kMapped, sizeof(kMapped)); - GPR_ASSERT( - !grpc_sockaddr_to_v4mapped((const struct sockaddr *)&input6, &output6)); + input6 = make_addr6 (kMapped, sizeof (kMapped)); + GPR_ASSERT (!grpc_sockaddr_to_v4mapped ((const struct sockaddr *) &input6, &output6)); } -static void test_sockaddr_is_wildcard(void) { +static void +test_sockaddr_is_wildcard (void) +{ struct sockaddr_in wild4; struct sockaddr_in6 wild6; struct sockaddr_in6 wild_mapped; struct sockaddr dummy; int port; - gpr_log(GPR_INFO, "%s", "test_sockaddr_is_wildcard"); + gpr_log (GPR_INFO, "%s", "test_sockaddr_is_wildcard"); /* Generate wildcards. */ - grpc_sockaddr_make_wildcards(555, &wild4, &wild6); - GPR_ASSERT( - grpc_sockaddr_to_v4mapped((const struct sockaddr *)&wild4, &wild_mapped)); + grpc_sockaddr_make_wildcards (555, &wild4, &wild6); + GPR_ASSERT (grpc_sockaddr_to_v4mapped ((const struct sockaddr *) &wild4, &wild_mapped)); /* Test 0.0.0.0:555 */ port = -1; - GPR_ASSERT(grpc_sockaddr_is_wildcard((const struct sockaddr *)&wild4, &port)); - GPR_ASSERT(port == 555); - memset(&wild4.sin_addr.s_addr, 0xbd, 1); - GPR_ASSERT( - !grpc_sockaddr_is_wildcard((const struct sockaddr *)&wild4, &port)); + GPR_ASSERT (grpc_sockaddr_is_wildcard ((const struct sockaddr *) &wild4, &port)); + GPR_ASSERT (port == 555); + memset (&wild4.sin_addr.s_addr, 0xbd, 1); + GPR_ASSERT (!grpc_sockaddr_is_wildcard ((const struct sockaddr *) &wild4, &port)); /* Test [::]:555 */ port = -1; - GPR_ASSERT(grpc_sockaddr_is_wildcard((const struct sockaddr *)&wild6, &port)); - GPR_ASSERT(port == 555); - memset(&wild6.sin6_addr.s6_addr, 0xbd, 1); - GPR_ASSERT( - !grpc_sockaddr_is_wildcard((const struct sockaddr *)&wild6, &port)); + GPR_ASSERT (grpc_sockaddr_is_wildcard ((const struct sockaddr *) &wild6, &port)); + GPR_ASSERT (port == 555); + memset (&wild6.sin6_addr.s6_addr, 0xbd, 1); + GPR_ASSERT (!grpc_sockaddr_is_wildcard ((const struct sockaddr *) &wild6, &port)); /* Test [::ffff:0.0.0.0]:555 */ port = -1; - GPR_ASSERT( - grpc_sockaddr_is_wildcard((const struct sockaddr *)&wild_mapped, &port)); - GPR_ASSERT(port == 555); - memset(&wild_mapped.sin6_addr.s6_addr, 0xbd, 1); - GPR_ASSERT( - !grpc_sockaddr_is_wildcard((const struct sockaddr *)&wild_mapped, &port)); + GPR_ASSERT (grpc_sockaddr_is_wildcard ((const struct sockaddr *) &wild_mapped, &port)); + GPR_ASSERT (port == 555); + memset (&wild_mapped.sin6_addr.s6_addr, 0xbd, 1); + GPR_ASSERT (!grpc_sockaddr_is_wildcard ((const struct sockaddr *) &wild_mapped, &port)); /* Test AF_UNSPEC. */ port = -1; - memset(&dummy, 0, sizeof(dummy)); - GPR_ASSERT(!grpc_sockaddr_is_wildcard(&dummy, &port)); - GPR_ASSERT(port == -1); + memset (&dummy, 0, sizeof (dummy)); + GPR_ASSERT (!grpc_sockaddr_is_wildcard (&dummy, &port)); + GPR_ASSERT (port == -1); } -static void expect_sockaddr_str(const char *expected, void *addr, - int normalize) { +static void +expect_sockaddr_str (const char *expected, void *addr, int normalize) +{ int result; char *str; - gpr_log(GPR_INFO, " expect_sockaddr_str(%s)", expected); - result = grpc_sockaddr_to_string(&str, (struct sockaddr *)addr, normalize); - GPR_ASSERT(str != NULL); - GPR_ASSERT(result >= 0); - GPR_ASSERT((size_t)result == strlen(str)); - GPR_ASSERT(strcmp(expected, str) == 0); - gpr_free(str); + gpr_log (GPR_INFO, " expect_sockaddr_str(%s)", expected); + result = grpc_sockaddr_to_string (&str, (struct sockaddr *) addr, normalize); + GPR_ASSERT (str != NULL); + GPR_ASSERT (result >= 0); + GPR_ASSERT ((size_t) result == strlen (str)); + GPR_ASSERT (strcmp (expected, str) == 0); + gpr_free (str); } -static void expect_sockaddr_uri(const char *expected, void *addr) { +static void +expect_sockaddr_uri (const char *expected, void *addr) +{ char *str; - gpr_log(GPR_INFO, " expect_sockaddr_uri(%s)", expected); - str = grpc_sockaddr_to_uri((struct sockaddr *)addr); - GPR_ASSERT(str != NULL); - GPR_ASSERT(strcmp(expected, str) == 0); - gpr_free(str); + gpr_log (GPR_INFO, " expect_sockaddr_uri(%s)", expected); + str = grpc_sockaddr_to_uri ((struct sockaddr *) addr); + GPR_ASSERT (str != NULL); + GPR_ASSERT (strcmp (expected, str) == 0); + gpr_free (str); } -static void test_sockaddr_to_string(void) { +static void +test_sockaddr_to_string (void) +{ struct sockaddr_in input4; struct sockaddr_in6 input6; struct sockaddr dummy; - gpr_log(GPR_INFO, "%s", "test_sockaddr_to_string"); + gpr_log (GPR_INFO, "%s", "test_sockaddr_to_string"); errno = 0x7EADBEEF; - input4 = make_addr4(kIPv4, sizeof(kIPv4)); - expect_sockaddr_str("192.0.2.1:12345", &input4, 0); - expect_sockaddr_str("192.0.2.1:12345", &input4, 1); - expect_sockaddr_uri("ipv4:192.0.2.1:12345", &input4); + input4 = make_addr4 (kIPv4, sizeof (kIPv4)); + expect_sockaddr_str ("192.0.2.1:12345", &input4, 0); + expect_sockaddr_str ("192.0.2.1:12345", &input4, 1); + expect_sockaddr_uri ("ipv4:192.0.2.1:12345", &input4); - input6 = make_addr6(kIPv6, sizeof(kIPv6)); - expect_sockaddr_str("[2001:db8::1]:12345", &input6, 0); - expect_sockaddr_str("[2001:db8::1]:12345", &input6, 1); - expect_sockaddr_uri("ipv6:[2001:db8::1]:12345", &input6); + input6 = make_addr6 (kIPv6, sizeof (kIPv6)); + expect_sockaddr_str ("[2001:db8::1]:12345", &input6, 0); + expect_sockaddr_str ("[2001:db8::1]:12345", &input6, 1); + expect_sockaddr_uri ("ipv6:[2001:db8::1]:12345", &input6); - input6 = make_addr6(kMapped, sizeof(kMapped)); - expect_sockaddr_str("[::ffff:192.0.2.1]:12345", &input6, 0); - expect_sockaddr_str("192.0.2.1:12345", &input6, 1); - expect_sockaddr_uri("ipv4:192.0.2.1:12345", &input6); + input6 = make_addr6 (kMapped, sizeof (kMapped)); + expect_sockaddr_str ("[::ffff:192.0.2.1]:12345", &input6, 0); + expect_sockaddr_str ("192.0.2.1:12345", &input6, 1); + expect_sockaddr_uri ("ipv4:192.0.2.1:12345", &input6); - input6 = make_addr6(kNotQuiteMapped, sizeof(kNotQuiteMapped)); - expect_sockaddr_str("[::fffe:c000:263]:12345", &input6, 0); - expect_sockaddr_str("[::fffe:c000:263]:12345", &input6, 1); - expect_sockaddr_uri("ipv6:[::fffe:c000:263]:12345", &input6); + input6 = make_addr6 (kNotQuiteMapped, sizeof (kNotQuiteMapped)); + expect_sockaddr_str ("[::fffe:c000:263]:12345", &input6, 0); + expect_sockaddr_str ("[::fffe:c000:263]:12345", &input6, 1); + expect_sockaddr_uri ("ipv6:[::fffe:c000:263]:12345", &input6); - memset(&dummy, 0, sizeof(dummy)); + memset (&dummy, 0, sizeof (dummy)); dummy.sa_family = 123; - expect_sockaddr_str("(sockaddr family=123)", &dummy, 0); - expect_sockaddr_str("(sockaddr family=123)", &dummy, 1); - GPR_ASSERT(grpc_sockaddr_to_uri(&dummy) == NULL); + expect_sockaddr_str ("(sockaddr family=123)", &dummy, 0); + expect_sockaddr_str ("(sockaddr family=123)", &dummy, 1); + GPR_ASSERT (grpc_sockaddr_to_uri (&dummy) == NULL); - GPR_ASSERT(errno == 0x7EADBEEF); + GPR_ASSERT (errno == 0x7EADBEEF); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); - test_sockaddr_is_v4mapped(); - test_sockaddr_to_v4mapped(); - test_sockaddr_is_wildcard(); - test_sockaddr_to_string(); + test_sockaddr_is_v4mapped (); + test_sockaddr_to_v4mapped (); + test_sockaddr_is_wildcard (); + test_sockaddr_to_string (); return 0; } diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index 250b071fc1b..af9b96db147 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -52,126 +52,137 @@ static grpc_pollset g_pollset; static int g_connections_complete = 0; static grpc_endpoint *g_connecting = NULL; -static gpr_timespec test_deadline(void) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10); +static gpr_timespec +test_deadline (void) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10); } -static void finish_connection() { - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); +static void +finish_connection () +{ + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); g_connections_complete++; - grpc_pollset_kick(&g_pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_pollset_kick (&g_pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } -static void must_succeed(void *arg, int success, - grpc_closure_list *closure_list) { - GPR_ASSERT(g_connecting != NULL); - GPR_ASSERT(success); - grpc_endpoint_shutdown(g_connecting, closure_list); - grpc_endpoint_destroy(g_connecting, closure_list); +static void +must_succeed (void *arg, int success, grpc_closure_list * closure_list) +{ + GPR_ASSERT (g_connecting != NULL); + GPR_ASSERT (success); + grpc_endpoint_shutdown (g_connecting, closure_list); + grpc_endpoint_destroy (g_connecting, closure_list); g_connecting = NULL; - finish_connection(); + finish_connection (); } -static void must_fail(void *arg, int success, grpc_closure_list *closure_list) { - GPR_ASSERT(g_connecting == NULL); - GPR_ASSERT(!success); - finish_connection(); +static void +must_fail (void *arg, int success, grpc_closure_list * closure_list) +{ + GPR_ASSERT (g_connecting == NULL); + GPR_ASSERT (!success); + finish_connection (); } -void test_succeeds(void) { +void +test_succeeds (void) +{ struct sockaddr_in addr; - socklen_t addr_len = sizeof(addr); + socklen_t addr_len = sizeof (addr); int svr_fd; int r; int connections_complete_before; grpc_closure done; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - gpr_log(GPR_DEBUG, "test_succeeds"); + gpr_log (GPR_DEBUG, "test_succeeds"); - memset(&addr, 0, sizeof(addr)); + memset (&addr, 0, sizeof (addr)); addr.sin_family = AF_INET; /* create a dummy server */ - svr_fd = socket(AF_INET, SOCK_STREAM, 0); - GPR_ASSERT(svr_fd >= 0); - GPR_ASSERT(0 == bind(svr_fd, (struct sockaddr *)&addr, addr_len)); - GPR_ASSERT(0 == listen(svr_fd, 1)); + svr_fd = socket (AF_INET, SOCK_STREAM, 0); + GPR_ASSERT (svr_fd >= 0); + GPR_ASSERT (0 == bind (svr_fd, (struct sockaddr *) &addr, addr_len)); + GPR_ASSERT (0 == listen (svr_fd, 1)); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); connections_complete_before = g_connections_complete; - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); /* connect to it */ - GPR_ASSERT(getsockname(svr_fd, (struct sockaddr *)&addr, &addr_len) == 0); - grpc_closure_init(&done, must_succeed, NULL); - grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, - (struct sockaddr *)&addr, addr_len, - gpr_inf_future(GPR_CLOCK_REALTIME), &closure_list); + GPR_ASSERT (getsockname (svr_fd, (struct sockaddr *) &addr, &addr_len) == 0); + grpc_closure_init (&done, must_succeed, NULL); + grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, gpr_inf_future (GPR_CLOCK_REALTIME), &closure_list); /* await the connection */ - do { - addr_len = sizeof(addr); - r = accept(svr_fd, (struct sockaddr *)&addr, &addr_len); - } while (r == -1 && errno == EINTR); - GPR_ASSERT(r >= 0); - close(r); - - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - - while (g_connections_complete == connections_complete_before) { - grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - } - - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + do + { + addr_len = sizeof (addr); + r = accept (svr_fd, (struct sockaddr *) &addr, &addr_len); + } + while (r == -1 && errno == EINTR); + GPR_ASSERT (r >= 0); + close (r); + + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + + while (g_connections_complete == connections_complete_before) + { + grpc_pollset_worker worker; + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + } + + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } -void test_fails(void) { +void +test_fails (void) +{ struct sockaddr_in addr; - socklen_t addr_len = sizeof(addr); + socklen_t addr_len = sizeof (addr); int connections_complete_before; grpc_closure done; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - gpr_log(GPR_DEBUG, "test_fails"); + gpr_log (GPR_DEBUG, "test_fails"); - memset(&addr, 0, sizeof(addr)); + memset (&addr, 0, sizeof (addr)); addr.sin_family = AF_INET; - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); connections_complete_before = g_connections_complete; - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); /* connect to a broken address */ - grpc_closure_init(&done, must_fail, NULL); - grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, - (struct sockaddr *)&addr, addr_len, - gpr_inf_future(GPR_CLOCK_REALTIME), &closure_list); + grpc_closure_init (&done, must_fail, NULL); + grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, gpr_inf_future (GPR_CLOCK_REALTIME), &closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); /* wait for the connection callback to finish */ - while (g_connections_complete == connections_complete_before) { - grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - test_deadline(), &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - } - - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + while (g_connections_complete == connections_complete_before) + { + grpc_pollset_worker worker; + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), test_deadline (), &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + } + + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } -void test_times_out(void) { +void +test_times_out (void) +{ struct sockaddr_in addr; - socklen_t addr_len = sizeof(addr); + socklen_t addr_len = sizeof (addr); int svr_fd; #define NUM_CLIENT_CONNECTS 100 int client_fd[NUM_CLIENT_CONNECTS]; @@ -182,103 +193,107 @@ void test_times_out(void) { grpc_closure done; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - gpr_log(GPR_DEBUG, "test_times_out"); + gpr_log (GPR_DEBUG, "test_times_out"); - memset(&addr, 0, sizeof(addr)); + memset (&addr, 0, sizeof (addr)); addr.sin_family = AF_INET; /* create a dummy server */ - svr_fd = socket(AF_INET, SOCK_STREAM, 0); - GPR_ASSERT(svr_fd >= 0); - GPR_ASSERT(0 == bind(svr_fd, (struct sockaddr *)&addr, addr_len)); - GPR_ASSERT(0 == listen(svr_fd, 1)); + svr_fd = socket (AF_INET, SOCK_STREAM, 0); + GPR_ASSERT (svr_fd >= 0); + GPR_ASSERT (0 == bind (svr_fd, (struct sockaddr *) &addr, addr_len)); + GPR_ASSERT (0 == listen (svr_fd, 1)); /* Get its address */ - GPR_ASSERT(getsockname(svr_fd, (struct sockaddr *)&addr, &addr_len) == 0); + GPR_ASSERT (getsockname (svr_fd, (struct sockaddr *) &addr, &addr_len) == 0); /* tie up the listen buffer, which is somewhat arbitrarily sized. */ - for (i = 0; i < NUM_CLIENT_CONNECTS; ++i) { - client_fd[i] = socket(AF_INET, SOCK_STREAM, 0); - grpc_set_socket_nonblocking(client_fd[i], 1); - do { - r = connect(client_fd[i], (struct sockaddr *)&addr, addr_len); - } while (r == -1 && errno == EINTR); - GPR_ASSERT(r < 0); - GPR_ASSERT(errno == EWOULDBLOCK || errno == EINPROGRESS); - } + for (i = 0; i < NUM_CLIENT_CONNECTS; ++i) + { + client_fd[i] = socket (AF_INET, SOCK_STREAM, 0); + grpc_set_socket_nonblocking (client_fd[i], 1); + do + { + r = connect (client_fd[i], (struct sockaddr *) &addr, addr_len); + } + while (r == -1 && errno == EINTR); + GPR_ASSERT (r < 0); + GPR_ASSERT (errno == EWOULDBLOCK || errno == EINPROGRESS); + } /* connect to dummy server address */ - connect_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1); + connect_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); connections_complete_before = g_connections_complete; - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_init(&done, must_fail, NULL); - grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, - (struct sockaddr *)&addr, addr_len, connect_deadline, - &closure_list); + grpc_closure_init (&done, must_fail, NULL); + grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, connect_deadline, &closure_list); /* Make sure the event doesn't trigger early */ - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - for (;;) { - grpc_pollset_worker worker; - gpr_timespec now = gpr_now(connect_deadline.clock_type); - gpr_timespec continue_verifying_time = - gpr_time_from_seconds(5, GPR_TIMESPAN); - gpr_timespec grace_time = gpr_time_from_seconds(3, GPR_TIMESPAN); - gpr_timespec finish_time = - gpr_time_add(connect_deadline, continue_verifying_time); - gpr_timespec restart_verifying_time = - gpr_time_add(connect_deadline, grace_time); - int is_after_deadline = gpr_time_cmp(now, connect_deadline) > 0; - if (gpr_time_cmp(now, finish_time) > 0) { - break; + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + for (;;) + { + grpc_pollset_worker worker; + gpr_timespec now = gpr_now (connect_deadline.clock_type); + gpr_timespec continue_verifying_time = gpr_time_from_seconds (5, GPR_TIMESPAN); + gpr_timespec grace_time = gpr_time_from_seconds (3, GPR_TIMESPAN); + gpr_timespec finish_time = gpr_time_add (connect_deadline, continue_verifying_time); + gpr_timespec restart_verifying_time = gpr_time_add (connect_deadline, grace_time); + int is_after_deadline = gpr_time_cmp (now, connect_deadline) > 0; + if (gpr_time_cmp (now, finish_time) > 0) + { + break; + } + gpr_log (GPR_DEBUG, "now=%d.%09d connect_deadline=%d.%09d", now.tv_sec, now.tv_nsec, connect_deadline.tv_sec, connect_deadline.tv_nsec); + if (is_after_deadline && gpr_time_cmp (now, restart_verifying_time) <= 0) + { + /* allow some slack before insisting that things be done */ + } + else + { + GPR_ASSERT (g_connections_complete == connections_complete_before + is_after_deadline); + } + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_MILLIS_TO_DEADLINE (10), &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } - gpr_log(GPR_DEBUG, "now=%d.%09d connect_deadline=%d.%09d", now.tv_sec, - now.tv_nsec, connect_deadline.tv_sec, connect_deadline.tv_nsec); - if (is_after_deadline && gpr_time_cmp(now, restart_verifying_time) <= 0) { - /* allow some slack before insisting that things be done */ - } else { - GPR_ASSERT(g_connections_complete == - connections_complete_before + is_after_deadline); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + + close (svr_fd); + for (i = 0; i < NUM_CLIENT_CONNECTS; ++i) + { + close (client_fd[i]); } - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10), &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - } - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - - close(svr_fd); - for (i = 0; i < NUM_CLIENT_CONNECTS; ++i) { - close(client_fd[i]); - } } -static void destroy_pollset(void *p, int success, - grpc_closure_list *closure_list) { - grpc_pollset_destroy(p); +static void +destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +{ + grpc_pollset_destroy (p); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ grpc_closure destroyed; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_test_init(argc, argv); - grpc_init(); - grpc_pollset_set_init(&g_pollset_set); - grpc_pollset_init(&g_pollset); - grpc_pollset_set_add_pollset(&g_pollset_set, &g_pollset, &closure_list); - grpc_closure_list_run(&closure_list); - test_succeeds(); - gpr_log(GPR_ERROR, "End of first test"); - test_fails(); - test_times_out(); - grpc_pollset_set_destroy(&g_pollset_set); - grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run(&closure_list); - grpc_shutdown(); + grpc_test_init (argc, argv); + grpc_init (); + grpc_pollset_set_init (&g_pollset_set); + grpc_pollset_init (&g_pollset); + grpc_pollset_set_add_pollset (&g_pollset_set, &g_pollset, &closure_list); + grpc_closure_list_run (&closure_list); + test_succeeds (); + gpr_log (GPR_ERROR, "End of first test"); + test_fails (); + test_times_out (); + grpc_pollset_set_destroy (&g_pollset_set); + grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run (&closure_list); + grpc_shutdown (); return 0; } diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index 9edfe76e046..5683e7cf533 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -66,55 +66,70 @@ static grpc_pollset g_pollset; */ -static void create_sockets(int sv[2]) { +static void +create_sockets (int sv[2]) +{ int flags; - GPR_ASSERT(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); - flags = fcntl(sv[0], F_GETFL, 0); - GPR_ASSERT(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK) == 0); - flags = fcntl(sv[1], F_GETFL, 0); - GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0); + GPR_ASSERT (socketpair (AF_UNIX, SOCK_STREAM, 0, sv) == 0); + flags = fcntl (sv[0], F_GETFL, 0); + GPR_ASSERT (fcntl (sv[0], F_SETFL, flags | O_NONBLOCK) == 0); + flags = fcntl (sv[1], F_GETFL, 0); + GPR_ASSERT (fcntl (sv[1], F_SETFL, flags | O_NONBLOCK) == 0); } -static ssize_t fill_socket(int fd) { +static ssize_t +fill_socket (int fd) +{ ssize_t write_bytes; ssize_t total_bytes = 0; int i; unsigned char buf[256]; - for (i = 0; i < 256; ++i) { - buf[i] = (gpr_uint8)i; - } - do { - write_bytes = write(fd, buf, 256); - if (write_bytes > 0) { - total_bytes += write_bytes; + for (i = 0; i < 256; ++i) + { + buf[i] = (gpr_uint8) i; } - } while (write_bytes >= 0 || errno == EINTR); - GPR_ASSERT(errno == EAGAIN); + do + { + write_bytes = write (fd, buf, 256); + if (write_bytes > 0) + { + total_bytes += write_bytes; + } + } + while (write_bytes >= 0 || errno == EINTR); + GPR_ASSERT (errno == EAGAIN); return total_bytes; } -static size_t fill_socket_partial(int fd, size_t bytes) { +static size_t +fill_socket_partial (int fd, size_t bytes) +{ ssize_t write_bytes; size_t total_bytes = 0; - unsigned char *buf = malloc(bytes); + unsigned char *buf = malloc (bytes); unsigned i; - for (i = 0; i < bytes; ++i) { - buf[i] = (gpr_uint8)(i % 256); - } - - do { - write_bytes = write(fd, buf, bytes - total_bytes); - if (write_bytes > 0) { - total_bytes += (size_t)write_bytes; + for (i = 0; i < bytes; ++i) + { + buf[i] = (gpr_uint8) (i % 256); + } + + do + { + write_bytes = write (fd, buf, bytes - total_bytes); + if (write_bytes > 0) + { + total_bytes += (size_t) write_bytes; + } } - } while ((write_bytes >= 0 || errno == EINTR) && bytes > total_bytes); + while ((write_bytes >= 0 || errno == EINTR) && bytes > total_bytes); - gpr_free(buf); + gpr_free (buf); return total_bytes; } -struct read_socket_state { +struct read_socket_state +{ grpc_endpoint *ep; size_t read_bytes; size_t target_read_bytes; @@ -122,178 +137,191 @@ struct read_socket_state { grpc_closure read_cb; }; -static size_t count_slices(gpr_slice *slices, size_t nslices, - int *current_data) { +static size_t +count_slices (gpr_slice * slices, size_t nslices, int *current_data) +{ size_t num_bytes = 0; unsigned i, j; unsigned char *buf; - for (i = 0; i < nslices; ++i) { - buf = GPR_SLICE_START_PTR(slices[i]); - for (j = 0; j < GPR_SLICE_LENGTH(slices[i]); ++j) { - GPR_ASSERT(buf[j] == *current_data); - *current_data = (*current_data + 1) % 256; + for (i = 0; i < nslices; ++i) + { + buf = GPR_SLICE_START_PTR (slices[i]); + for (j = 0; j < GPR_SLICE_LENGTH (slices[i]); ++j) + { + GPR_ASSERT (buf[j] == *current_data); + *current_data = (*current_data + 1) % 256; + } + num_bytes += GPR_SLICE_LENGTH (slices[i]); } - num_bytes += GPR_SLICE_LENGTH(slices[i]); - } return num_bytes; } -static void read_cb(void *user_data, int success, - grpc_closure_list *closure_list) { - struct read_socket_state *state = (struct read_socket_state *)user_data; +static void +read_cb (void *user_data, int success, grpc_closure_list * closure_list) +{ + struct read_socket_state *state = (struct read_socket_state *) user_data; size_t read_bytes; int current_data; - GPR_ASSERT(success); + GPR_ASSERT (success); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); current_data = state->read_bytes % 256; - read_bytes = count_slices(state->incoming.slices, state->incoming.count, - ¤t_data); + read_bytes = count_slices (state->incoming.slices, state->incoming.count, ¤t_data); state->read_bytes += read_bytes; - gpr_log(GPR_INFO, "Read %d bytes of %d", read_bytes, - state->target_read_bytes); - if (state->read_bytes >= state->target_read_bytes) { - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - } else { - grpc_endpoint_read(state->ep, &state->incoming, &state->read_cb, - closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - } + gpr_log (GPR_INFO, "Read %d bytes of %d", read_bytes, state->target_read_bytes); + if (state->read_bytes >= state->target_read_bytes) + { + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + } + else + { + grpc_endpoint_read (state->ep, &state->incoming, &state->read_cb, closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + } } /* Write to a socket, then read from it using the grpc_tcp API. */ -static void read_test(size_t num_bytes, size_t slice_size) { +static void +read_test (size_t num_bytes, size_t slice_size) +{ int sv[2]; grpc_endpoint *ep; struct read_socket_state state; size_t written_bytes; - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (20); grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - gpr_log(GPR_INFO, "Read test of size %d, slice size %d", num_bytes, - slice_size); + gpr_log (GPR_INFO, "Read test of size %d, slice size %d", num_bytes, slice_size); - create_sockets(sv); + create_sockets (sv); - ep = grpc_tcp_create(grpc_fd_create(sv[1], "read_test"), slice_size, "test"); - grpc_endpoint_add_to_pollset(ep, &g_pollset, &closure_list); + ep = grpc_tcp_create (grpc_fd_create (sv[1], "read_test"), slice_size, "test"); + grpc_endpoint_add_to_pollset (ep, &g_pollset, &closure_list); - written_bytes = fill_socket_partial(sv[0], num_bytes); - gpr_log(GPR_INFO, "Wrote %d bytes", written_bytes); + written_bytes = fill_socket_partial (sv[0], num_bytes); + gpr_log (GPR_INFO, "Wrote %d bytes", written_bytes); state.ep = ep; state.read_bytes = 0; state.target_read_bytes = written_bytes; - gpr_slice_buffer_init(&state.incoming); - grpc_closure_init(&state.read_cb, read_cb, &state); - - grpc_endpoint_read(ep, &state.incoming, &state.read_cb, &closure_list); - - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - while (state.read_bytes < state.target_read_bytes) { - grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline, &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - } - GPR_ASSERT(state.read_bytes == state.target_read_bytes); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - - gpr_slice_buffer_destroy(&state.incoming); - grpc_endpoint_destroy(ep, &closure_list); - grpc_closure_list_run(&closure_list); + gpr_slice_buffer_init (&state.incoming); + grpc_closure_init (&state.read_cb, read_cb, &state); + + grpc_endpoint_read (ep, &state.incoming, &state.read_cb, &closure_list); + + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + while (state.read_bytes < state.target_read_bytes) + { + grpc_pollset_worker worker; + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + } + GPR_ASSERT (state.read_bytes == state.target_read_bytes); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + + gpr_slice_buffer_destroy (&state.incoming); + grpc_endpoint_destroy (ep, &closure_list); + grpc_closure_list_run (&closure_list); } /* Write to a socket until it fills up, then read from it using the grpc_tcp API. */ -static void large_read_test(size_t slice_size) { +static void +large_read_test (size_t slice_size) +{ int sv[2]; grpc_endpoint *ep; struct read_socket_state state; ssize_t written_bytes; - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (20); grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - gpr_log(GPR_INFO, "Start large read test, slice size %d", slice_size); + gpr_log (GPR_INFO, "Start large read test, slice size %d", slice_size); - create_sockets(sv); + create_sockets (sv); - ep = grpc_tcp_create(grpc_fd_create(sv[1], "large_read_test"), slice_size, - "test"); - grpc_endpoint_add_to_pollset(ep, &g_pollset, &closure_list); + ep = grpc_tcp_create (grpc_fd_create (sv[1], "large_read_test"), slice_size, "test"); + grpc_endpoint_add_to_pollset (ep, &g_pollset, &closure_list); - written_bytes = fill_socket(sv[0]); - gpr_log(GPR_INFO, "Wrote %d bytes", written_bytes); + written_bytes = fill_socket (sv[0]); + gpr_log (GPR_INFO, "Wrote %d bytes", written_bytes); state.ep = ep; state.read_bytes = 0; - state.target_read_bytes = (size_t)written_bytes; - gpr_slice_buffer_init(&state.incoming); - grpc_closure_init(&state.read_cb, read_cb, &state); - - grpc_endpoint_read(ep, &state.incoming, &state.read_cb, &closure_list); - - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - while (state.read_bytes < state.target_read_bytes) { - grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline, &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - } - GPR_ASSERT(state.read_bytes == state.target_read_bytes); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - - gpr_slice_buffer_destroy(&state.incoming); - grpc_endpoint_destroy(ep, &closure_list); - grpc_closure_list_run(&closure_list); + state.target_read_bytes = (size_t) written_bytes; + gpr_slice_buffer_init (&state.incoming); + grpc_closure_init (&state.read_cb, read_cb, &state); + + grpc_endpoint_read (ep, &state.incoming, &state.read_cb, &closure_list); + + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + while (state.read_bytes < state.target_read_bytes) + { + grpc_pollset_worker worker; + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + } + GPR_ASSERT (state.read_bytes == state.target_read_bytes); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + + gpr_slice_buffer_destroy (&state.incoming); + grpc_endpoint_destroy (ep, &closure_list); + grpc_closure_list_run (&closure_list); } -struct write_socket_state { +struct write_socket_state +{ grpc_endpoint *ep; int write_done; }; -static gpr_slice *allocate_blocks(size_t num_bytes, size_t slice_size, - size_t *num_blocks, gpr_uint8 *current_data) { +static gpr_slice * +allocate_blocks (size_t num_bytes, size_t slice_size, size_t * num_blocks, gpr_uint8 * current_data) +{ size_t nslices = num_bytes / slice_size + (num_bytes % slice_size ? 1u : 0u); - gpr_slice *slices = gpr_malloc(sizeof(gpr_slice) * nslices); + gpr_slice *slices = gpr_malloc (sizeof (gpr_slice) * nslices); size_t num_bytes_left = num_bytes; unsigned i, j; unsigned char *buf; *num_blocks = nslices; - for (i = 0; i < nslices; ++i) { - slices[i] = gpr_slice_malloc(slice_size > num_bytes_left ? num_bytes_left - : slice_size); - num_bytes_left -= GPR_SLICE_LENGTH(slices[i]); - buf = GPR_SLICE_START_PTR(slices[i]); - for (j = 0; j < GPR_SLICE_LENGTH(slices[i]); ++j) { - buf[j] = *current_data; - (*current_data)++; + for (i = 0; i < nslices; ++i) + { + slices[i] = gpr_slice_malloc (slice_size > num_bytes_left ? num_bytes_left : slice_size); + num_bytes_left -= GPR_SLICE_LENGTH (slices[i]); + buf = GPR_SLICE_START_PTR (slices[i]); + for (j = 0; j < GPR_SLICE_LENGTH (slices[i]); ++j) + { + buf[j] = *current_data; + (*current_data)++; + } } - } - GPR_ASSERT(num_bytes_left == 0); + GPR_ASSERT (num_bytes_left == 0); return slices; } -static void write_done(void *user_data /* write_socket_state */, int success, - grpc_closure_list *closure_list) { - struct write_socket_state *state = (struct write_socket_state *)user_data; - gpr_log(GPR_INFO, "Write done callback called"); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - gpr_log(GPR_INFO, "Signalling write done"); +static void +write_done (void *user_data /* write_socket_state */ , int success, + grpc_closure_list * closure_list) +{ + struct write_socket_state *state = (struct write_socket_state *) user_data; + gpr_log (GPR_INFO, "Write done callback called"); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + gpr_log (GPR_INFO, "Signalling write done"); state->write_done = 1; - grpc_pollset_kick(&g_pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_pollset_kick (&g_pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } -void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { - unsigned char *buf = malloc(read_size); +void +drain_socket_blocking (int fd, size_t num_bytes, size_t read_size) +{ + unsigned char *buf = malloc (read_size); ssize_t bytes_read; size_t bytes_left = num_bytes; int flags; @@ -301,38 +329,43 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { int i; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - flags = fcntl(fd, F_GETFL, 0); - GPR_ASSERT(fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) == 0); - - for (;;) { - grpc_pollset_worker worker; - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10), &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - do { - bytes_read = - read(fd, buf, bytes_left > read_size ? read_size : bytes_left); - } while (bytes_read < 0 && errno == EINTR); - GPR_ASSERT(bytes_read >= 0); - for (i = 0; i < bytes_read; ++i) { - GPR_ASSERT(buf[i] == current); - current = (current + 1) % 256; + flags = fcntl (fd, F_GETFL, 0); + GPR_ASSERT (fcntl (fd, F_SETFL, flags & ~O_NONBLOCK) == 0); + + for (;;) + { + grpc_pollset_worker worker; + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_MILLIS_TO_DEADLINE (10), &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + do + { + bytes_read = read (fd, buf, bytes_left > read_size ? read_size : bytes_left); + } + while (bytes_read < 0 && errno == EINTR); + GPR_ASSERT (bytes_read >= 0); + for (i = 0; i < bytes_read; ++i) + { + GPR_ASSERT (buf[i] == current); + current = (current + 1) % 256; + } + bytes_left -= (size_t) bytes_read; + if (bytes_left == 0) + break; } - bytes_left -= (size_t)bytes_read; - if (bytes_left == 0) break; - } - flags = fcntl(fd, F_GETFL, 0); - GPR_ASSERT(fcntl(fd, F_SETFL, flags | O_NONBLOCK) == 0); + flags = fcntl (fd, F_GETFL, 0); + GPR_ASSERT (fcntl (fd, F_SETFL, flags | O_NONBLOCK) == 0); - gpr_free(buf); + gpr_free (buf); } /* Write to a socket using the grpc_tcp API, then drain it directly. Note that if the write does not complete immediately we need to drain the socket in parallel with the read. */ -static void write_test(size_t num_bytes, size_t slice_size) { +static void +write_test (size_t num_bytes, size_t slice_size) +{ int sv[2]; grpc_endpoint *ep; struct write_socket_state state; @@ -341,112 +374,119 @@ static void write_test(size_t num_bytes, size_t slice_size) { gpr_uint8 current_data = 0; gpr_slice_buffer outgoing; grpc_closure write_done_closure; - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (20); grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - gpr_log(GPR_INFO, "Start write test with %d bytes, slice size %d", num_bytes, - slice_size); + gpr_log (GPR_INFO, "Start write test with %d bytes, slice size %d", num_bytes, slice_size); - create_sockets(sv); + create_sockets (sv); - ep = grpc_tcp_create(grpc_fd_create(sv[1], "write_test"), - GRPC_TCP_DEFAULT_READ_SLICE_SIZE, "test"); - grpc_endpoint_add_to_pollset(ep, &g_pollset, &closure_list); + ep = grpc_tcp_create (grpc_fd_create (sv[1], "write_test"), GRPC_TCP_DEFAULT_READ_SLICE_SIZE, "test"); + grpc_endpoint_add_to_pollset (ep, &g_pollset, &closure_list); state.ep = ep; state.write_done = 0; - slices = allocate_blocks(num_bytes, slice_size, &num_blocks, ¤t_data); - - gpr_slice_buffer_init(&outgoing); - gpr_slice_buffer_addn(&outgoing, slices, num_blocks); - grpc_closure_init(&write_done_closure, write_done, &state); - - grpc_endpoint_write(ep, &outgoing, &write_done_closure, &closure_list); - drain_socket_blocking(sv[0], num_bytes, num_bytes); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - for (;;) { - grpc_pollset_worker worker; - if (state.write_done) { - break; + slices = allocate_blocks (num_bytes, slice_size, &num_blocks, ¤t_data); + + gpr_slice_buffer_init (&outgoing); + gpr_slice_buffer_addn (&outgoing, slices, num_blocks); + grpc_closure_init (&write_done_closure, write_done, &state); + + grpc_endpoint_write (ep, &outgoing, &write_done_closure, &closure_list); + drain_socket_blocking (sv[0], num_bytes, num_bytes); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + for (;;) + { + grpc_pollset_worker worker; + if (state.write_done) + { + break; + } + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline, &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - } - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - - gpr_slice_buffer_destroy(&outgoing); - grpc_endpoint_destroy(ep, &closure_list); - gpr_free(slices); - grpc_closure_list_run(&closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + + gpr_slice_buffer_destroy (&outgoing); + grpc_endpoint_destroy (ep, &closure_list); + gpr_free (slices); + grpc_closure_list_run (&closure_list); } -void run_tests(void) { +void +run_tests (void) +{ size_t i = 0; - read_test(100, 8192); - read_test(10000, 8192); - read_test(10000, 137); - read_test(10000, 1); - large_read_test(8192); - large_read_test(1); - - write_test(100, 8192); - write_test(100, 1); - write_test(100000, 8192); - write_test(100000, 1); - write_test(100000, 137); - - for (i = 1; i < 1000; i = GPR_MAX(i + 1, i * 5 / 4)) { - write_test(40320, i); - } + read_test (100, 8192); + read_test (10000, 8192); + read_test (10000, 137); + read_test (10000, 1); + large_read_test (8192); + large_read_test (1); + + write_test (100, 8192); + write_test (100, 1); + write_test (100000, 8192); + write_test (100000, 1); + write_test (100000, 137); + + for (i = 1; i < 1000; i = GPR_MAX (i + 1, i * 5 / 4)) + { + write_test (40320, i); + } } -static void clean_up(void) {} +static void +clean_up (void) +{ +} -static grpc_endpoint_test_fixture create_fixture_tcp_socketpair( - size_t slice_size) { +static grpc_endpoint_test_fixture +create_fixture_tcp_socketpair (size_t slice_size) +{ int sv[2]; grpc_endpoint_test_fixture f; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - create_sockets(sv); - f.client_ep = grpc_tcp_create(grpc_fd_create(sv[0], "fixture:client"), - slice_size, "test"); - f.server_ep = grpc_tcp_create(grpc_fd_create(sv[1], "fixture:server"), - slice_size, "test"); - grpc_endpoint_add_to_pollset(f.client_ep, &g_pollset, &closure_list); - grpc_endpoint_add_to_pollset(f.server_ep, &g_pollset, &closure_list); + create_sockets (sv); + f.client_ep = grpc_tcp_create (grpc_fd_create (sv[0], "fixture:client"), slice_size, "test"); + f.server_ep = grpc_tcp_create (grpc_fd_create (sv[1], "fixture:server"), slice_size, "test"); + grpc_endpoint_add_to_pollset (f.client_ep, &g_pollset, &closure_list); + grpc_endpoint_add_to_pollset (f.server_ep, &g_pollset, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_closure_list_run (&closure_list); return f; } static grpc_endpoint_test_config configs[] = { - {"tcp/tcp_socketpair", create_fixture_tcp_socketpair, clean_up}, + {"tcp/tcp_socketpair", create_fixture_tcp_socketpair, clean_up}, }; -static void destroy_pollset(void *p, int success, - grpc_closure_list *closure_list) { - grpc_pollset_destroy(p); +static void +destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +{ + grpc_pollset_destroy (p); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ grpc_closure destroyed; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_test_init(argc, argv); - grpc_init(); - grpc_pollset_init(&g_pollset); - run_tests(); - grpc_endpoint_tests(configs[0], &g_pollset); - grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run(&closure_list); - grpc_shutdown(); + grpc_test_init (argc, argv); + grpc_init (); + grpc_pollset_init (&g_pollset); + run_tests (); + grpc_endpoint_tests (configs[0], &g_pollset); + grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run (&closure_list); + grpc_shutdown (); return 0; } diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index 4a3b51efc69..92edfdd8504 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -48,143 +48,155 @@ static grpc_pollset g_pollset; static int g_nconnects = 0; -static void on_connect(void *arg, grpc_endpoint *tcp, - grpc_closure_list *closure_list) { - grpc_endpoint_shutdown(tcp, closure_list); - grpc_endpoint_destroy(tcp, closure_list); +static void +on_connect (void *arg, grpc_endpoint * tcp, grpc_closure_list * closure_list) +{ + grpc_endpoint_shutdown (tcp, closure_list); + grpc_endpoint_destroy (tcp, closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); g_nconnects++; - grpc_pollset_kick(&g_pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_pollset_kick (&g_pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } -static void test_no_op(void) { - grpc_tcp_server *s = grpc_tcp_server_create(); - grpc_tcp_server_destroy(s, NULL, NULL); +static void +test_no_op (void) +{ + grpc_tcp_server *s = grpc_tcp_server_create (); + grpc_tcp_server_destroy (s, NULL, NULL); } -static void test_no_op_with_start(void) { +static void +test_no_op_with_start (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_tcp_server *s = grpc_tcp_server_create(); - LOG_TEST("test_no_op_with_start"); - grpc_tcp_server_start(s, NULL, 0, on_connect, NULL, &closure_list); - grpc_tcp_server_destroy(s, NULL, NULL); - grpc_closure_list_run(&closure_list); + grpc_tcp_server *s = grpc_tcp_server_create (); + LOG_TEST ("test_no_op_with_start"); + grpc_tcp_server_start (s, NULL, 0, on_connect, NULL, &closure_list); + grpc_tcp_server_destroy (s, NULL, NULL); + grpc_closure_list_run (&closure_list); } -static void test_no_op_with_port(void) { +static void +test_no_op_with_port (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; struct sockaddr_in addr; - grpc_tcp_server *s = grpc_tcp_server_create(); - LOG_TEST("test_no_op_with_port"); + grpc_tcp_server *s = grpc_tcp_server_create (); + LOG_TEST ("test_no_op_with_port"); - memset(&addr, 0, sizeof(addr)); + memset (&addr, 0, sizeof (addr)); addr.sin_family = AF_INET; - GPR_ASSERT( - grpc_tcp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr))); + GPR_ASSERT (grpc_tcp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr))); - grpc_tcp_server_destroy(s, NULL, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_tcp_server_destroy (s, NULL, &closure_list); + grpc_closure_list_run (&closure_list); } -static void test_no_op_with_port_and_start(void) { +static void +test_no_op_with_port_and_start (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; struct sockaddr_in addr; - grpc_tcp_server *s = grpc_tcp_server_create(); - LOG_TEST("test_no_op_with_port_and_start"); + grpc_tcp_server *s = grpc_tcp_server_create (); + LOG_TEST ("test_no_op_with_port_and_start"); - memset(&addr, 0, sizeof(addr)); + memset (&addr, 0, sizeof (addr)); addr.sin_family = AF_INET; - GPR_ASSERT( - grpc_tcp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr))); + GPR_ASSERT (grpc_tcp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr))); - grpc_tcp_server_start(s, NULL, 0, on_connect, NULL, &closure_list); + grpc_tcp_server_start (s, NULL, 0, on_connect, NULL, &closure_list); - grpc_tcp_server_destroy(s, NULL, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_tcp_server_destroy (s, NULL, &closure_list); + grpc_closure_list_run (&closure_list); } -static void test_connect(int n) { +static void +test_connect (int n) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; struct sockaddr_storage addr; - socklen_t addr_len = sizeof(addr); + socklen_t addr_len = sizeof (addr); int svrfd, clifd; - grpc_tcp_server *s = grpc_tcp_server_create(); + grpc_tcp_server *s = grpc_tcp_server_create (); int nconnects_before; gpr_timespec deadline; grpc_pollset *pollsets[1]; int i; - LOG_TEST("test_connect"); - gpr_log(GPR_INFO, "clients=%d", n); + LOG_TEST ("test_connect"); + gpr_log (GPR_INFO, "clients=%d", n); - memset(&addr, 0, sizeof(addr)); + memset (&addr, 0, sizeof (addr)); addr.ss_family = AF_INET; - GPR_ASSERT(grpc_tcp_server_add_port(s, (struct sockaddr *)&addr, addr_len)); + GPR_ASSERT (grpc_tcp_server_add_port (s, (struct sockaddr *) &addr, addr_len)); - svrfd = grpc_tcp_server_get_fd(s, 0); - GPR_ASSERT(svrfd >= 0); - GPR_ASSERT(getsockname(svrfd, (struct sockaddr *)&addr, &addr_len) == 0); - GPR_ASSERT(addr_len <= sizeof(addr)); + svrfd = grpc_tcp_server_get_fd (s, 0); + GPR_ASSERT (svrfd >= 0); + GPR_ASSERT (getsockname (svrfd, (struct sockaddr *) &addr, &addr_len) == 0); + GPR_ASSERT (addr_len <= sizeof (addr)); pollsets[0] = &g_pollset; - grpc_tcp_server_start(s, pollsets, 1, on_connect, NULL, &closure_list); - - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - - for (i = 0; i < n; i++) { - deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10); - - nconnects_before = g_nconnects; - clifd = socket(addr.ss_family, SOCK_STREAM, 0); - GPR_ASSERT(clifd >= 0); - gpr_log(GPR_DEBUG, "start connect"); - GPR_ASSERT(connect(clifd, (struct sockaddr *)&addr, addr_len) == 0); - - gpr_log(GPR_DEBUG, "wait"); - while (g_nconnects == nconnects_before && - gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0) { - grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline, &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + grpc_tcp_server_start (s, pollsets, 1, on_connect, NULL, &closure_list); + + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + + for (i = 0; i < n; i++) + { + deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10); + + nconnects_before = g_nconnects; + clifd = socket (addr.ss_family, SOCK_STREAM, 0); + GPR_ASSERT (clifd >= 0); + gpr_log (GPR_DEBUG, "start connect"); + GPR_ASSERT (connect (clifd, (struct sockaddr *) &addr, addr_len) == 0); + + gpr_log (GPR_DEBUG, "wait"); + while (g_nconnects == nconnects_before && gpr_time_cmp (deadline, gpr_now (deadline.clock_type)) > 0) + { + grpc_pollset_worker worker; + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + } + gpr_log (GPR_DEBUG, "wait done"); + + GPR_ASSERT (g_nconnects == nconnects_before + 1); + close (clifd); } - gpr_log(GPR_DEBUG, "wait done"); - GPR_ASSERT(g_nconnects == nconnects_before + 1); - close(clifd); - } + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - - grpc_tcp_server_destroy(s, NULL, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_tcp_server_destroy (s, NULL, &closure_list); + grpc_closure_list_run (&closure_list); } -static void destroy_pollset(void *p, int success, - grpc_closure_list *closure_list) { - grpc_pollset_destroy(p); +static void +destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +{ + grpc_pollset_destroy (p); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ grpc_closure destroyed; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_test_init(argc, argv); - grpc_iomgr_init(); - grpc_pollset_init(&g_pollset); - - test_no_op(); - test_no_op_with_start(); - test_no_op_with_port(); - test_no_op_with_port_and_start(); - test_connect(1); - test_connect(10); - - grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run(&closure_list); - grpc_iomgr_shutdown(); + grpc_test_init (argc, argv); + grpc_iomgr_init (); + grpc_pollset_init (&g_pollset); + + test_no_op (); + test_no_op_with_start (); + test_no_op_with_port (); + test_no_op_with_port_and_start (); + test_connect (1); + test_connect (10); + + grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run (&closure_list); + grpc_iomgr_shutdown (); return 0; } diff --git a/test/core/iomgr/time_averaged_stats_test.c b/test/core/iomgr/time_averaged_stats_test.c index 4206a1c58f3..9bef4e0526b 100644 --- a/test/core/iomgr/time_averaged_stats_test.c +++ b/test/core/iomgr/time_averaged_stats_test.c @@ -41,168 +41,186 @@ #define EXPECT_EQ(a, b) GPR_ASSERT((a) == (b)) #define EXPECT_DOUBLE_EQ(a, b) GPR_ASSERT(fabs((a) - (b)) < 1e-9) -static void no_regress_no_persist_test_1(void) { +static void +no_regress_no_persist_test_1 (void) +{ grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 0, 0.0); - EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(0, tas.aggregate_total_weight); + grpc_time_averaged_stats_init (&tas, 1000, 0, 0.0); + EXPECT_DOUBLE_EQ (1000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (0, tas.aggregate_total_weight); /* Should have no effect */ - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(0, tas.aggregate_total_weight); + grpc_time_averaged_stats_update_average (&tas); + EXPECT_DOUBLE_EQ (1000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (0, tas.aggregate_total_weight); /* Should replace old average */ - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(2000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample (&tas, 2000); + grpc_time_averaged_stats_update_average (&tas); + EXPECT_DOUBLE_EQ (2000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (1, tas.aggregate_total_weight); } -static void no_regress_no_persist_test_2(void) { +static void +no_regress_no_persist_test_2 (void) +{ grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 0, 0.0); - EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); + grpc_time_averaged_stats_init (&tas, 1000, 0, 0.0); + EXPECT_DOUBLE_EQ (1000, tas.aggregate_weighted_avg); /* Should replace init value */ - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(2000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample(&tas, 3000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(3000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample (&tas, 2000); + grpc_time_averaged_stats_update_average (&tas); + EXPECT_DOUBLE_EQ (2000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (1, tas.aggregate_total_weight); + + grpc_time_averaged_stats_add_sample (&tas, 3000); + grpc_time_averaged_stats_update_average (&tas); + EXPECT_DOUBLE_EQ (3000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (1, tas.aggregate_total_weight); } -static void no_regress_no_persist_test_3(void) { +static void +no_regress_no_persist_test_3 (void) +{ grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 0, 0.0); - EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); + grpc_time_averaged_stats_init (&tas, 1000, 0, 0.0); + EXPECT_DOUBLE_EQ (1000, tas.aggregate_weighted_avg); /* Should replace init value */ - grpc_time_averaged_stats_add_sample(&tas, 2500); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(2500, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample(&tas, 3500); - grpc_time_averaged_stats_add_sample(&tas, 4500); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(4000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample (&tas, 2500); + grpc_time_averaged_stats_update_average (&tas); + EXPECT_DOUBLE_EQ (2500, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (1, tas.aggregate_total_weight); + + grpc_time_averaged_stats_add_sample (&tas, 3500); + grpc_time_averaged_stats_add_sample (&tas, 4500); + grpc_time_averaged_stats_update_average (&tas); + EXPECT_DOUBLE_EQ (4000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (2, tas.aggregate_total_weight); } -static void some_regress_no_persist_test(void) { +static void +some_regress_no_persist_test (void) +{ grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 0.5, 0.0); - EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(0, tas.aggregate_total_weight); - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); + grpc_time_averaged_stats_init (&tas, 1000, 0.5, 0.0); + EXPECT_DOUBLE_EQ (1000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (0, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample (&tas, 2000); + grpc_time_averaged_stats_add_sample (&tas, 2000); + grpc_time_averaged_stats_update_average (&tas); /* (2 * 2000 + 0.5 * 1000) / 2.5 */ - EXPECT_DOUBLE_EQ(1800, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2.5, tas.aggregate_total_weight); + EXPECT_DOUBLE_EQ (1800, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (2.5, tas.aggregate_total_weight); } -static void some_decay_test(void) { +static void +some_decay_test (void) +{ grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 1, 0.0); - EXPECT_EQ(1000, tas.aggregate_weighted_avg); + grpc_time_averaged_stats_init (&tas, 1000, 1, 0.0); + EXPECT_EQ (1000, tas.aggregate_weighted_avg); /* Should avg with init value */ - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(1500, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(1500, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(1500, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample (&tas, 2000); + grpc_time_averaged_stats_update_average (&tas); + EXPECT_DOUBLE_EQ (1500, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (2, tas.aggregate_total_weight); + + grpc_time_averaged_stats_add_sample (&tas, 2000); + grpc_time_averaged_stats_update_average (&tas); + EXPECT_DOUBLE_EQ (1500, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (2, tas.aggregate_total_weight); + + grpc_time_averaged_stats_add_sample (&tas, 2000); + grpc_time_averaged_stats_update_average (&tas); + EXPECT_DOUBLE_EQ (1500, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (2, tas.aggregate_total_weight); } -static void no_regress_full_persist_test(void) { +static void +no_regress_full_persist_test (void) +{ grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 0, 1.0); - EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(0, tas.aggregate_total_weight); + grpc_time_averaged_stats_init (&tas, 1000, 0, 1.0); + EXPECT_DOUBLE_EQ (1000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (0, tas.aggregate_total_weight); /* Should replace init value */ - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_EQ(2000, tas.aggregate_weighted_avg); - EXPECT_EQ(1, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample (&tas, 2000); + grpc_time_averaged_stats_update_average (&tas); + EXPECT_EQ (2000, tas.aggregate_weighted_avg); + EXPECT_EQ (1, tas.aggregate_total_weight); /* Will result in average of the 3 samples. */ - grpc_time_averaged_stats_add_sample(&tas, 2300); - grpc_time_averaged_stats_add_sample(&tas, 2300); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(2200, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(3, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample (&tas, 2300); + grpc_time_averaged_stats_add_sample (&tas, 2300); + grpc_time_averaged_stats_update_average (&tas); + EXPECT_DOUBLE_EQ (2200, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (3, tas.aggregate_total_weight); } -static void no_regress_some_persist_test(void) { +static void +no_regress_some_persist_test (void) +{ grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 0, 0.5); + grpc_time_averaged_stats_init (&tas, 1000, 0, 0.5); /* Should replace init value */ - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(2000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample(&tas, 2500); - grpc_time_averaged_stats_add_sample(&tas, 4000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(3000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2.5, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample (&tas, 2000); + grpc_time_averaged_stats_update_average (&tas); + EXPECT_DOUBLE_EQ (2000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (1, tas.aggregate_total_weight); + + grpc_time_averaged_stats_add_sample (&tas, 2500); + grpc_time_averaged_stats_add_sample (&tas, 4000); + grpc_time_averaged_stats_update_average (&tas); + EXPECT_DOUBLE_EQ (3000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (2.5, tas.aggregate_total_weight); } -static void some_regress_some_persist_test(void) { +static void +some_regress_some_persist_test (void) +{ grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 0.4, 0.6); + grpc_time_averaged_stats_init (&tas, 1000, 0.4, 0.6); /* Sample weight = 0 */ - EXPECT_EQ(1000, tas.aggregate_weighted_avg); - EXPECT_EQ(0, tas.aggregate_total_weight); + EXPECT_EQ (1000, tas.aggregate_weighted_avg); + EXPECT_EQ (0, tas.aggregate_total_weight); - grpc_time_averaged_stats_update_average(&tas); + grpc_time_averaged_stats_update_average (&tas); /* (0.6 * 0 * 1000 + 0.4 * 1000 / 0.4) */ - EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(0.4, tas.aggregate_total_weight); + EXPECT_DOUBLE_EQ (1000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (0.4, tas.aggregate_total_weight); - grpc_time_averaged_stats_add_sample(&tas, 2640); - grpc_time_averaged_stats_update_average(&tas); + grpc_time_averaged_stats_add_sample (&tas, 2640); + grpc_time_averaged_stats_update_average (&tas); /* (1 * 2640 + 0.6 * 0.4 * 1000 + 0.4 * 1000 / (1 + 0.6 * 0.4 + 0.4) */ - EXPECT_DOUBLE_EQ(2000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(1.64, tas.aggregate_total_weight); + EXPECT_DOUBLE_EQ (2000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (1.64, tas.aggregate_total_weight); - grpc_time_averaged_stats_add_sample(&tas, 2876.8); - grpc_time_averaged_stats_update_average(&tas); + grpc_time_averaged_stats_add_sample (&tas, 2876.8); + grpc_time_averaged_stats_update_average (&tas); /* (1 * 2876.8 + 0.6 * 1.64 * 2000 + 0.4 * 1000 / (1 + 0.6 * 1.64 + 0.4) */ - EXPECT_DOUBLE_EQ(2200, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2.384, tas.aggregate_total_weight); + EXPECT_DOUBLE_EQ (2200, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (2.384, tas.aggregate_total_weight); - grpc_time_averaged_stats_add_sample(&tas, 4944.32); - grpc_time_averaged_stats_update_average(&tas); + grpc_time_averaged_stats_add_sample (&tas, 4944.32); + grpc_time_averaged_stats_update_average (&tas); /* (1 * 4944.32 + 0.6 * 2.384 * 2200 + 0.4 * 1000) / - (1 + 0.6 * 2.384 + 0.4) */ - EXPECT_DOUBLE_EQ(3000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2.8304, tas.aggregate_total_weight); + (1 + 0.6 * 2.384 + 0.4) */ + EXPECT_DOUBLE_EQ (3000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ (2.8304, tas.aggregate_total_weight); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - no_regress_no_persist_test_1(); - no_regress_no_persist_test_2(); - no_regress_no_persist_test_3(); - some_regress_no_persist_test(); - some_decay_test(); - no_regress_full_persist_test(); - no_regress_some_persist_test(); - some_regress_some_persist_test(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + no_regress_no_persist_test_1 (); + no_regress_no_persist_test_2 (); + no_regress_no_persist_test_3 (); + some_regress_no_persist_test (); + some_decay_test (); + no_regress_full_persist_test (); + no_regress_some_persist_test (); + some_regress_some_persist_test (); return 0; } diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c index 067838777a0..b9cf289ed6a 100644 --- a/test/core/iomgr/udp_server_test.c +++ b/test/core/iomgr/udp_server_test.c @@ -49,144 +49,156 @@ static grpc_pollset g_pollset; static int g_number_of_reads = 0; static int g_number_of_bytes_read = 0; -static void on_read(int fd) { +static void +on_read (int fd) +{ char read_buffer[512]; ssize_t byte_count; - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - byte_count = recv(fd, read_buffer, sizeof(read_buffer), 0); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + byte_count = recv (fd, read_buffer, sizeof (read_buffer), 0); g_number_of_reads++; - g_number_of_bytes_read += (int)byte_count; + g_number_of_bytes_read += (int) byte_count; - grpc_pollset_kick(&g_pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_pollset_kick (&g_pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } -static void test_no_op(void) { - grpc_udp_server *s = grpc_udp_server_create(); - grpc_udp_server_destroy(s, NULL, NULL); +static void +test_no_op (void) +{ + grpc_udp_server *s = grpc_udp_server_create (); + grpc_udp_server_destroy (s, NULL, NULL); } -static void test_no_op_with_start(void) { +static void +test_no_op_with_start (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_udp_server *s = grpc_udp_server_create(); - LOG_TEST("test_no_op_with_start"); - grpc_udp_server_start(s, NULL, 0, &closure_list); - grpc_udp_server_destroy(s, NULL, NULL); - grpc_closure_list_run(&closure_list); + grpc_udp_server *s = grpc_udp_server_create (); + LOG_TEST ("test_no_op_with_start"); + grpc_udp_server_start (s, NULL, 0, &closure_list); + grpc_udp_server_destroy (s, NULL, NULL); + grpc_closure_list_run (&closure_list); } -static void test_no_op_with_port(void) { +static void +test_no_op_with_port (void) +{ struct sockaddr_in addr; - grpc_udp_server *s = grpc_udp_server_create(); - LOG_TEST("test_no_op_with_port"); + grpc_udp_server *s = grpc_udp_server_create (); + LOG_TEST ("test_no_op_with_port"); - memset(&addr, 0, sizeof(addr)); + memset (&addr, 0, sizeof (addr)); addr.sin_family = AF_INET; - GPR_ASSERT(grpc_udp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr), - on_read)); + GPR_ASSERT (grpc_udp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr), on_read)); - grpc_udp_server_destroy(s, NULL, NULL); + grpc_udp_server_destroy (s, NULL, NULL); } -static void test_no_op_with_port_and_start(void) { +static void +test_no_op_with_port_and_start (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; struct sockaddr_in addr; - grpc_udp_server *s = grpc_udp_server_create(); - LOG_TEST("test_no_op_with_port_and_start"); + grpc_udp_server *s = grpc_udp_server_create (); + LOG_TEST ("test_no_op_with_port_and_start"); - memset(&addr, 0, sizeof(addr)); + memset (&addr, 0, sizeof (addr)); addr.sin_family = AF_INET; - GPR_ASSERT(grpc_udp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr), - on_read)); + GPR_ASSERT (grpc_udp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr), on_read)); - grpc_udp_server_start(s, NULL, 0, &closure_list); + grpc_udp_server_start (s, NULL, 0, &closure_list); - grpc_udp_server_destroy(s, NULL, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_udp_server_destroy (s, NULL, &closure_list); + grpc_closure_list_run (&closure_list); } -static void test_receive(int number_of_clients) { +static void +test_receive (int number_of_clients) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; struct sockaddr_storage addr; - socklen_t addr_len = sizeof(addr); + socklen_t addr_len = sizeof (addr); int clifd, svrfd; - grpc_udp_server *s = grpc_udp_server_create(); + grpc_udp_server *s = grpc_udp_server_create (); int i; int number_of_reads_before; gpr_timespec deadline; grpc_pollset *pollsets[1]; - LOG_TEST("test_receive"); - gpr_log(GPR_INFO, "clients=%d", number_of_clients); + LOG_TEST ("test_receive"); + gpr_log (GPR_INFO, "clients=%d", number_of_clients); g_number_of_bytes_read = 0; - memset(&addr, 0, sizeof(addr)); + memset (&addr, 0, sizeof (addr)); addr.ss_family = AF_INET; - GPR_ASSERT( - grpc_udp_server_add_port(s, (struct sockaddr *)&addr, addr_len, on_read)); + GPR_ASSERT (grpc_udp_server_add_port (s, (struct sockaddr *) &addr, addr_len, on_read)); - svrfd = grpc_udp_server_get_fd(s, 0); - GPR_ASSERT(svrfd >= 0); - GPR_ASSERT(getsockname(svrfd, (struct sockaddr *)&addr, &addr_len) == 0); - GPR_ASSERT(addr_len <= sizeof(addr)); + svrfd = grpc_udp_server_get_fd (s, 0); + GPR_ASSERT (svrfd >= 0); + GPR_ASSERT (getsockname (svrfd, (struct sockaddr *) &addr, &addr_len) == 0); + GPR_ASSERT (addr_len <= sizeof (addr)); pollsets[0] = &g_pollset; - grpc_udp_server_start(s, pollsets, 1, &closure_list); - - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - - for (i = 0; i < number_of_clients; i++) { - deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10); - - number_of_reads_before = g_number_of_reads; - /* Create a socket, send a packet to the UDP server. */ - clifd = socket(addr.ss_family, SOCK_DGRAM, 0); - GPR_ASSERT(clifd >= 0); - GPR_ASSERT(connect(clifd, (struct sockaddr *)&addr, addr_len) == 0); - GPR_ASSERT(5 == write(clifd, "hello", 5)); - while (g_number_of_reads == number_of_reads_before && - gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0) { - grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline, &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + grpc_udp_server_start (s, pollsets, 1, &closure_list); + + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + + for (i = 0; i < number_of_clients; i++) + { + deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10); + + number_of_reads_before = g_number_of_reads; + /* Create a socket, send a packet to the UDP server. */ + clifd = socket (addr.ss_family, SOCK_DGRAM, 0); + GPR_ASSERT (clifd >= 0); + GPR_ASSERT (connect (clifd, (struct sockaddr *) &addr, addr_len) == 0); + GPR_ASSERT (5 == write (clifd, "hello", 5)); + while (g_number_of_reads == number_of_reads_before && gpr_time_cmp (deadline, gpr_now (deadline.clock_type)) > 0) + { + grpc_pollset_worker worker; + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + } + GPR_ASSERT (g_number_of_reads == number_of_reads_before + 1); + close (clifd); } - GPR_ASSERT(g_number_of_reads == number_of_reads_before + 1); - close(clifd); - } - GPR_ASSERT(g_number_of_bytes_read == 5 * number_of_clients); + GPR_ASSERT (g_number_of_bytes_read == 5 * number_of_clients); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_udp_server_destroy(s, NULL, NULL); + grpc_udp_server_destroy (s, NULL, NULL); } -static void destroy_pollset(void *p, int success, - grpc_closure_list *closure_list) { - grpc_pollset_destroy(p); +static void +destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +{ + grpc_pollset_destroy (p); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ grpc_closure destroyed; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_test_init(argc, argv); - grpc_iomgr_init(); - grpc_pollset_init(&g_pollset); - - test_no_op(); - test_no_op_with_start(); - test_no_op_with_port(); - test_no_op_with_port_and_start(); - test_receive(1); - test_receive(10); - - grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run(&closure_list); - grpc_iomgr_shutdown(); + grpc_test_init (argc, argv); + grpc_iomgr_init (); + grpc_pollset_init (&g_pollset); + + test_no_op (); + test_no_op_with_start (); + test_no_op_with_port (); + test_no_op_with_port_and_start (); + test_receive (1); + test_receive (10); + + grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run (&closure_list); + grpc_iomgr_shutdown (); return 0; } diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c index e4f172d32e2..43eebc3fbf1 100644 --- a/test/core/iomgr/workqueue_test.c +++ b/test/core/iomgr/workqueue_test.c @@ -40,56 +40,61 @@ static grpc_pollset g_pollset; -static void must_succeed(void *p, int success, - grpc_closure_list *closure_list) { - GPR_ASSERT(success == 1); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - *(int *)p = 1; - grpc_pollset_kick(&g_pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); +static void +must_succeed (void *p, int success, grpc_closure_list * closure_list) +{ + GPR_ASSERT (success == 1); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + *(int *) p = 1; + grpc_pollset_kick (&g_pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } -static void test_add_closure(void) { +static void +test_add_closure (void) +{ grpc_closure c; int done = 0; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_workqueue *wq = grpc_workqueue_create(&closure_list); - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5); + grpc_workqueue *wq = grpc_workqueue_create (&closure_list); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5); grpc_pollset_worker worker; - grpc_closure_init(&c, must_succeed, &done); + grpc_closure_init (&c, must_succeed, &done); - grpc_workqueue_push(wq, &c, 1); - grpc_workqueue_add_to_pollset(wq, &g_pollset, &closure_list); + grpc_workqueue_push (wq, &c, 1); + grpc_workqueue_add_to_pollset (wq, &g_pollset, &closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - GPR_ASSERT(!done); - grpc_pollset_work(&g_pollset, &worker, gpr_now(deadline.clock_type), deadline, - &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_list_run(&closure_list); - GPR_ASSERT(done); + gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + GPR_ASSERT (!done); + grpc_pollset_work (&g_pollset, &worker, gpr_now (deadline.clock_type), deadline, &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_closure_list_run (&closure_list); + GPR_ASSERT (done); - GRPC_WORKQUEUE_UNREF(wq, "destroy", &closure_list); - grpc_closure_list_run(&closure_list); + GRPC_WORKQUEUE_UNREF (wq, "destroy", &closure_list); + grpc_closure_list_run (&closure_list); } -static void destroy_pollset(void *p, int success, - grpc_closure_list *closure_list) { - grpc_pollset_destroy(p); +static void +destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +{ + grpc_pollset_destroy (p); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ grpc_closure destroyed; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_test_init(argc, argv); - grpc_init(); - grpc_pollset_init(&g_pollset); + grpc_test_init (argc, argv); + grpc_init (); + grpc_pollset_init (&g_pollset); - test_add_closure(); + test_add_closure (); - grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run(&closure_list); - grpc_shutdown(); + grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run (&closure_list); + grpc_shutdown (); return 0; } diff --git a/test/core/json/json_rewrite.c b/test/core/json/json_rewrite.c index 82cc4090f3e..920c03164a0 100644 --- a/test/core/json/json_rewrite.c +++ b/test/core/json/json_rewrite.c @@ -41,173 +41,221 @@ #include "src/core/json/json_reader.h" #include "src/core/json/json_writer.h" -typedef struct json_writer_userdata { FILE* out; } json_writer_userdata; +typedef struct json_writer_userdata +{ + FILE *out; +} json_writer_userdata; -typedef struct stacked_container { +typedef struct stacked_container +{ grpc_json_type type; - struct stacked_container* next; + struct stacked_container *next; } stacked_container; -typedef struct json_reader_userdata { - FILE* in; - grpc_json_writer* writer; - char* scratchpad; - char* ptr; +typedef struct json_reader_userdata +{ + FILE *in; + grpc_json_writer *writer; + char *scratchpad; + char *ptr; size_t free_space; size_t allocated; size_t string_len; - stacked_container* top; + stacked_container *top; } json_reader_userdata; -static void json_writer_output_char(void* userdata, char c) { - json_writer_userdata* state = userdata; - fputc(c, state->out); +static void +json_writer_output_char (void *userdata, char c) +{ + json_writer_userdata *state = userdata; + fputc (c, state->out); } -static void json_writer_output_string(void* userdata, const char* str) { - json_writer_userdata* state = userdata; - fputs(str, state->out); +static void +json_writer_output_string (void *userdata, const char *str) +{ + json_writer_userdata *state = userdata; + fputs (str, state->out); } -static void json_writer_output_string_with_len(void* userdata, const char* str, - size_t len) { - json_writer_userdata* state = userdata; - fwrite(str, len, 1, state->out); +static void +json_writer_output_string_with_len (void *userdata, const char *str, size_t len) +{ + json_writer_userdata *state = userdata; + fwrite (str, len, 1, state->out); } -grpc_json_writer_vtable writer_vtable = {json_writer_output_char, - json_writer_output_string, - json_writer_output_string_with_len}; +grpc_json_writer_vtable writer_vtable = { json_writer_output_char, + json_writer_output_string, + json_writer_output_string_with_len +}; -static void check_string(json_reader_userdata* state, size_t needed) { - if (state->free_space >= needed) return; +static void +check_string (json_reader_userdata * state, size_t needed) +{ + if (state->free_space >= needed) + return; needed -= state->free_space; needed = (needed + 0xffu) & ~0xffu; - state->scratchpad = gpr_realloc(state->scratchpad, state->allocated + needed); + state->scratchpad = gpr_realloc (state->scratchpad, state->allocated + needed); state->free_space += needed; state->allocated += needed; } -static void json_reader_string_clear(void* userdata) { - json_reader_userdata* state = userdata; +static void +json_reader_string_clear (void *userdata) +{ + json_reader_userdata *state = userdata; state->free_space = state->allocated; state->string_len = 0; } -static void json_reader_string_add_char(void* userdata, gpr_uint32 c) { - json_reader_userdata* state = userdata; - check_string(state, 1); - GPR_ASSERT(c < 256); - state->scratchpad[state->string_len++] = (char)c; -} - -static void json_reader_string_add_utf32(void* userdata, gpr_uint32 c) { - if (c <= 0x7f) { - json_reader_string_add_char(userdata, c); - } else if (c <= 0x7ff) { - gpr_uint32 b1 = 0xc0u | ((c >> 6u) & 0x1fu); - gpr_uint32 b2 = 0x80u | (c & 0x3fu); - json_reader_string_add_char(userdata, b1); - json_reader_string_add_char(userdata, b2); - } else if (c <= 0xffffu) { - gpr_uint32 b1 = 0xe0u | ((c >> 12u) & 0x0fu); - gpr_uint32 b2 = 0x80u | ((c >> 6u) & 0x3fu); - gpr_uint32 b3 = 0x80u | (c & 0x3fu); - json_reader_string_add_char(userdata, b1); - json_reader_string_add_char(userdata, b2); - json_reader_string_add_char(userdata, b3); - } else if (c <= 0x1fffffu) { - gpr_uint32 b1 = 0xf0u | ((c >> 18u) & 0x07u); - gpr_uint32 b2 = 0x80u | ((c >> 12u) & 0x3fu); - gpr_uint32 b3 = 0x80u | ((c >> 6u) & 0x3fu); - gpr_uint32 b4 = 0x80u | (c & 0x3fu); - json_reader_string_add_char(userdata, b1); - json_reader_string_add_char(userdata, b2); - json_reader_string_add_char(userdata, b3); - json_reader_string_add_char(userdata, b4); - } -} - -static gpr_uint32 json_reader_read_char(void* userdata) { +static void +json_reader_string_add_char (void *userdata, gpr_uint32 c) +{ + json_reader_userdata *state = userdata; + check_string (state, 1); + GPR_ASSERT (c < 256); + state->scratchpad[state->string_len++] = (char) c; +} + +static void +json_reader_string_add_utf32 (void *userdata, gpr_uint32 c) +{ + if (c <= 0x7f) + { + json_reader_string_add_char (userdata, c); + } + else if (c <= 0x7ff) + { + gpr_uint32 b1 = 0xc0u | ((c >> 6u) & 0x1fu); + gpr_uint32 b2 = 0x80u | (c & 0x3fu); + json_reader_string_add_char (userdata, b1); + json_reader_string_add_char (userdata, b2); + } + else if (c <= 0xffffu) + { + gpr_uint32 b1 = 0xe0u | ((c >> 12u) & 0x0fu); + gpr_uint32 b2 = 0x80u | ((c >> 6u) & 0x3fu); + gpr_uint32 b3 = 0x80u | (c & 0x3fu); + json_reader_string_add_char (userdata, b1); + json_reader_string_add_char (userdata, b2); + json_reader_string_add_char (userdata, b3); + } + else if (c <= 0x1fffffu) + { + gpr_uint32 b1 = 0xf0u | ((c >> 18u) & 0x07u); + gpr_uint32 b2 = 0x80u | ((c >> 12u) & 0x3fu); + gpr_uint32 b3 = 0x80u | ((c >> 6u) & 0x3fu); + gpr_uint32 b4 = 0x80u | (c & 0x3fu); + json_reader_string_add_char (userdata, b1); + json_reader_string_add_char (userdata, b2); + json_reader_string_add_char (userdata, b3); + json_reader_string_add_char (userdata, b4); + } +} + +static gpr_uint32 +json_reader_read_char (void *userdata) +{ int r; - json_reader_userdata* state = userdata; + json_reader_userdata *state = userdata; - r = fgetc(state->in); - if (r == EOF) r = GRPC_JSON_READ_CHAR_EOF; - return (gpr_uint32)r; + r = fgetc (state->in); + if (r == EOF) + r = GRPC_JSON_READ_CHAR_EOF; + return (gpr_uint32) r; } -static void json_reader_container_begins(void* userdata, grpc_json_type type) { - json_reader_userdata* state = userdata; - stacked_container* container = gpr_malloc(sizeof(stacked_container)); +static void +json_reader_container_begins (void *userdata, grpc_json_type type) +{ + json_reader_userdata *state = userdata; + stacked_container *container = gpr_malloc (sizeof (stacked_container)); container->type = type; container->next = state->top; state->top = container; - grpc_json_writer_container_begins(state->writer, type); + grpc_json_writer_container_begins (state->writer, type); } -static grpc_json_type json_reader_container_ends(void* userdata) { - json_reader_userdata* state = userdata; - stacked_container* container = state->top; +static grpc_json_type +json_reader_container_ends (void *userdata) +{ + json_reader_userdata *state = userdata; + stacked_container *container = state->top; - grpc_json_writer_container_ends(state->writer, container->type); + grpc_json_writer_container_ends (state->writer, container->type); state->top = container->next; - gpr_free(container); + gpr_free (container); return state->top ? state->top->type : GRPC_JSON_TOP_LEVEL; } -static void json_reader_set_key(void* userdata) { - json_reader_userdata* state = userdata; - json_reader_string_add_char(userdata, 0); +static void +json_reader_set_key (void *userdata) +{ + json_reader_userdata *state = userdata; + json_reader_string_add_char (userdata, 0); - grpc_json_writer_object_key(state->writer, state->scratchpad); + grpc_json_writer_object_key (state->writer, state->scratchpad); } -static void json_reader_set_string(void* userdata) { - json_reader_userdata* state = userdata; - json_reader_string_add_char(userdata, 0); +static void +json_reader_set_string (void *userdata) +{ + json_reader_userdata *state = userdata; + json_reader_string_add_char (userdata, 0); - grpc_json_writer_value_string(state->writer, state->scratchpad); + grpc_json_writer_value_string (state->writer, state->scratchpad); } -static int json_reader_set_number(void* userdata) { - json_reader_userdata* state = userdata; +static int +json_reader_set_number (void *userdata) +{ + json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len(state->writer, state->scratchpad, - state->string_len); + grpc_json_writer_value_raw_with_len (state->writer, state->scratchpad, state->string_len); return 1; } -static void json_reader_set_true(void* userdata) { - json_reader_userdata* state = userdata; +static void +json_reader_set_true (void *userdata) +{ + json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len(state->writer, "true", 4); + grpc_json_writer_value_raw_with_len (state->writer, "true", 4); } -static void json_reader_set_false(void* userdata) { - json_reader_userdata* state = userdata; +static void +json_reader_set_false (void *userdata) +{ + json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len(state->writer, "false", 5); + grpc_json_writer_value_raw_with_len (state->writer, "false", 5); } -static void json_reader_set_null(void* userdata) { - json_reader_userdata* state = userdata; +static void +json_reader_set_null (void *userdata) +{ + json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len(state->writer, "null", 4); + grpc_json_writer_value_raw_with_len (state->writer, "null", 4); } static grpc_json_reader_vtable reader_vtable = { - json_reader_string_clear, json_reader_string_add_char, - json_reader_string_add_utf32, json_reader_read_char, - json_reader_container_begins, json_reader_container_ends, - json_reader_set_key, json_reader_set_string, - json_reader_set_number, json_reader_set_true, - json_reader_set_false, json_reader_set_null}; - -int rewrite(FILE* in, FILE* out, int indent) { + json_reader_string_clear, json_reader_string_add_char, + json_reader_string_add_utf32, json_reader_read_char, + json_reader_container_begins, json_reader_container_ends, + json_reader_set_key, json_reader_set_string, + json_reader_set_number, json_reader_set_true, + json_reader_set_false, json_reader_set_null +}; + +int +rewrite (FILE * in, FILE * out, int indent) +{ grpc_json_writer writer; grpc_json_reader reader; grpc_json_reader_status status; @@ -224,29 +272,32 @@ int rewrite(FILE* in, FILE* out, int indent) { writer_user.out = out; - grpc_json_writer_init(&writer, indent, &writer_vtable, &writer_user); - grpc_json_reader_init(&reader, &reader_vtable, &reader_user); + grpc_json_writer_init (&writer, indent, &writer_vtable, &writer_user); + grpc_json_reader_init (&reader, &reader_vtable, &reader_user); - status = grpc_json_reader_run(&reader); + status = grpc_json_reader_run (&reader); - free(reader_user.scratchpad); - while (reader_user.top) { - stacked_container* container = reader_user.top; - reader_user.top = container->next; - free(container); - } + free (reader_user.scratchpad); + while (reader_user.top) + { + stacked_container *container = reader_user.top; + reader_user.top = container->next; + free (container); + } return status == GRPC_JSON_DONE; } -int main(int argc, char** argv) { +int +main (int argc, char **argv) +{ int indent = 2; - gpr_cmdline* cl; + gpr_cmdline *cl; - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_int(cl, "indent", NULL, &indent); - gpr_cmdline_parse(cl, argc, argv); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_int (cl, "indent", NULL, &indent); + gpr_cmdline_parse (cl, argc, argv); + gpr_cmdline_destroy (cl); - return rewrite(stdin, stdout, indent) ? 0 : 1; + return rewrite (stdin, stdout, indent) ? 0 : 1; } diff --git a/test/core/json/json_rewrite_test.c b/test/core/json/json_rewrite_test.c index d26ef53b2d7..470c0218c57 100644 --- a/test/core/json/json_rewrite_test.c +++ b/test/core/json/json_rewrite_test.c @@ -42,198 +42,250 @@ #include "src/core/json/json_reader.h" #include "src/core/json/json_writer.h" -typedef struct json_writer_userdata { FILE* cmp; } json_writer_userdata; +typedef struct json_writer_userdata +{ + FILE *cmp; +} json_writer_userdata; -typedef struct stacked_container { +typedef struct stacked_container +{ grpc_json_type type; - struct stacked_container* next; + struct stacked_container *next; } stacked_container; -typedef struct json_reader_userdata { - FILE* in; - grpc_json_writer* writer; - char* scratchpad; - char* ptr; +typedef struct json_reader_userdata +{ + FILE *in; + grpc_json_writer *writer; + char *scratchpad; + char *ptr; size_t free_space; size_t allocated; size_t string_len; - stacked_container* top; + stacked_container *top; int did_eagain; } json_reader_userdata; -static void json_writer_output_char(void* userdata, char c) { - json_writer_userdata* state = userdata; - int cmp = fgetc(state->cmp); +static void +json_writer_output_char (void *userdata, char c) +{ + json_writer_userdata *state = userdata; + int cmp = fgetc (state->cmp); /* treat CRLF as LF */ - if (cmp == '\r' && c == '\n') { - cmp = fgetc(state->cmp); - } - GPR_ASSERT(cmp == c); + if (cmp == '\r' && c == '\n') + { + cmp = fgetc (state->cmp); + } + GPR_ASSERT (cmp == c); } -static void json_writer_output_string(void* userdata, const char* str) { - while (*str) { - json_writer_output_char(userdata, *str++); - } +static void +json_writer_output_string (void *userdata, const char *str) +{ + while (*str) + { + json_writer_output_char (userdata, *str++); + } } -static void json_writer_output_string_with_len(void* userdata, const char* str, - size_t len) { +static void +json_writer_output_string_with_len (void *userdata, const char *str, size_t len) +{ size_t i; - for (i = 0; i < len; i++) { - json_writer_output_char(userdata, str[i]); - } + for (i = 0; i < len; i++) + { + json_writer_output_char (userdata, str[i]); + } } -grpc_json_writer_vtable writer_vtable = {json_writer_output_char, - json_writer_output_string, - json_writer_output_string_with_len}; +grpc_json_writer_vtable writer_vtable = { json_writer_output_char, + json_writer_output_string, + json_writer_output_string_with_len +}; -static void check_string(json_reader_userdata* state, size_t needed) { - if (state->free_space >= needed) return; +static void +check_string (json_reader_userdata * state, size_t needed) +{ + if (state->free_space >= needed) + return; needed -= state->free_space; needed = (needed + 0xffu) & ~0xffu; - state->scratchpad = gpr_realloc(state->scratchpad, state->allocated + needed); + state->scratchpad = gpr_realloc (state->scratchpad, state->allocated + needed); state->free_space += needed; state->allocated += needed; } -static void json_reader_string_clear(void* userdata) { - json_reader_userdata* state = userdata; +static void +json_reader_string_clear (void *userdata) +{ + json_reader_userdata *state = userdata; state->free_space = state->allocated; state->string_len = 0; } -static void json_reader_string_add_char(void* userdata, gpr_uint32 c) { - json_reader_userdata* state = userdata; - check_string(state, 1); - GPR_ASSERT(c <= 256); - state->scratchpad[state->string_len++] = (char)c; +static void +json_reader_string_add_char (void *userdata, gpr_uint32 c) +{ + json_reader_userdata *state = userdata; + check_string (state, 1); + GPR_ASSERT (c <= 256); + state->scratchpad[state->string_len++] = (char) c; } -static void json_reader_string_add_utf32(void* userdata, gpr_uint32 c) { - if (c <= 0x7f) { - json_reader_string_add_char(userdata, c); - } else if (c <= 0x7ffu) { - gpr_uint32 b1 = 0xc0u | ((c >> 6u) & 0x1fu); - gpr_uint32 b2 = 0x80u | (c & 0x3fu); - json_reader_string_add_char(userdata, b1); - json_reader_string_add_char(userdata, b2); - } else if (c <= 0xffffu) { - gpr_uint32 b1 = 0xe0u | ((c >> 12u) & 0x0fu); - gpr_uint32 b2 = 0x80u | ((c >> 6u) & 0x3fu); - gpr_uint32 b3 = 0x80u | (c & 0x3fu); - json_reader_string_add_char(userdata, b1); - json_reader_string_add_char(userdata, b2); - json_reader_string_add_char(userdata, b3); - } else if (c <= 0x1fffffu) { - gpr_uint32 b1 = 0xf0u | ((c >> 18u) & 0x07u); - gpr_uint32 b2 = 0x80u | ((c >> 12u) & 0x3fu); - gpr_uint32 b3 = 0x80u | ((c >> 6u) & 0x3fu); - gpr_uint32 b4 = 0x80u | (c & 0x3fu); - json_reader_string_add_char(userdata, b1); - json_reader_string_add_char(userdata, b2); - json_reader_string_add_char(userdata, b3); - json_reader_string_add_char(userdata, b4); - } +static void +json_reader_string_add_utf32 (void *userdata, gpr_uint32 c) +{ + if (c <= 0x7f) + { + json_reader_string_add_char (userdata, c); + } + else if (c <= 0x7ffu) + { + gpr_uint32 b1 = 0xc0u | ((c >> 6u) & 0x1fu); + gpr_uint32 b2 = 0x80u | (c & 0x3fu); + json_reader_string_add_char (userdata, b1); + json_reader_string_add_char (userdata, b2); + } + else if (c <= 0xffffu) + { + gpr_uint32 b1 = 0xe0u | ((c >> 12u) & 0x0fu); + gpr_uint32 b2 = 0x80u | ((c >> 6u) & 0x3fu); + gpr_uint32 b3 = 0x80u | (c & 0x3fu); + json_reader_string_add_char (userdata, b1); + json_reader_string_add_char (userdata, b2); + json_reader_string_add_char (userdata, b3); + } + else if (c <= 0x1fffffu) + { + gpr_uint32 b1 = 0xf0u | ((c >> 18u) & 0x07u); + gpr_uint32 b2 = 0x80u | ((c >> 12u) & 0x3fu); + gpr_uint32 b3 = 0x80u | ((c >> 6u) & 0x3fu); + gpr_uint32 b4 = 0x80u | (c & 0x3fu); + json_reader_string_add_char (userdata, b1); + json_reader_string_add_char (userdata, b2); + json_reader_string_add_char (userdata, b3); + json_reader_string_add_char (userdata, b4); + } } -static gpr_uint32 json_reader_read_char(void* userdata) { +static gpr_uint32 +json_reader_read_char (void *userdata) +{ int r; - json_reader_userdata* state = userdata; + json_reader_userdata *state = userdata; - if (!state->did_eagain) { - state->did_eagain = 1; - return GRPC_JSON_READ_CHAR_EAGAIN; - } + if (!state->did_eagain) + { + state->did_eagain = 1; + return GRPC_JSON_READ_CHAR_EAGAIN; + } state->did_eagain = 0; - r = fgetc(state->in); - if (r == EOF) r = GRPC_JSON_READ_CHAR_EOF; - return (gpr_uint32)r; + r = fgetc (state->in); + if (r == EOF) + r = GRPC_JSON_READ_CHAR_EOF; + return (gpr_uint32) r; } -static void json_reader_container_begins(void* userdata, grpc_json_type type) { - json_reader_userdata* state = userdata; - stacked_container* container = gpr_malloc(sizeof(stacked_container)); +static void +json_reader_container_begins (void *userdata, grpc_json_type type) +{ + json_reader_userdata *state = userdata; + stacked_container *container = gpr_malloc (sizeof (stacked_container)); container->type = type; container->next = state->top; state->top = container; - grpc_json_writer_container_begins(state->writer, type); + grpc_json_writer_container_begins (state->writer, type); } -static grpc_json_type json_reader_container_ends(void* userdata) { - json_reader_userdata* state = userdata; - stacked_container* container = state->top; +static grpc_json_type +json_reader_container_ends (void *userdata) +{ + json_reader_userdata *state = userdata; + stacked_container *container = state->top; - grpc_json_writer_container_ends(state->writer, container->type); + grpc_json_writer_container_ends (state->writer, container->type); state->top = container->next; - gpr_free(container); + gpr_free (container); return state->top ? state->top->type : GRPC_JSON_TOP_LEVEL; } -static void json_reader_set_key(void* userdata) { - json_reader_userdata* state = userdata; - json_reader_string_add_char(userdata, 0); +static void +json_reader_set_key (void *userdata) +{ + json_reader_userdata *state = userdata; + json_reader_string_add_char (userdata, 0); - grpc_json_writer_object_key(state->writer, state->scratchpad); + grpc_json_writer_object_key (state->writer, state->scratchpad); } -static void json_reader_set_string(void* userdata) { - json_reader_userdata* state = userdata; - json_reader_string_add_char(userdata, 0); +static void +json_reader_set_string (void *userdata) +{ + json_reader_userdata *state = userdata; + json_reader_string_add_char (userdata, 0); - grpc_json_writer_value_string(state->writer, state->scratchpad); + grpc_json_writer_value_string (state->writer, state->scratchpad); } -static int json_reader_set_number(void* userdata) { - json_reader_userdata* state = userdata; +static int +json_reader_set_number (void *userdata) +{ + json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len(state->writer, state->scratchpad, - state->string_len); + grpc_json_writer_value_raw_with_len (state->writer, state->scratchpad, state->string_len); return 1; } -static void json_reader_set_true(void* userdata) { - json_reader_userdata* state = userdata; +static void +json_reader_set_true (void *userdata) +{ + json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len(state->writer, "true", 4); + grpc_json_writer_value_raw_with_len (state->writer, "true", 4); } -static void json_reader_set_false(void* userdata) { - json_reader_userdata* state = userdata; +static void +json_reader_set_false (void *userdata) +{ + json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len(state->writer, "false", 5); + grpc_json_writer_value_raw_with_len (state->writer, "false", 5); } -static void json_reader_set_null(void* userdata) { - json_reader_userdata* state = userdata; +static void +json_reader_set_null (void *userdata) +{ + json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len(state->writer, "null", 4); + grpc_json_writer_value_raw_with_len (state->writer, "null", 4); } static grpc_json_reader_vtable reader_vtable = { - json_reader_string_clear, json_reader_string_add_char, - json_reader_string_add_utf32, json_reader_read_char, - json_reader_container_begins, json_reader_container_ends, - json_reader_set_key, json_reader_set_string, - json_reader_set_number, json_reader_set_true, - json_reader_set_false, json_reader_set_null}; - -int rewrite_and_compare(FILE* in, FILE* cmp, int indent) { + json_reader_string_clear, json_reader_string_add_char, + json_reader_string_add_utf32, json_reader_read_char, + json_reader_container_begins, json_reader_container_ends, + json_reader_set_key, json_reader_set_string, + json_reader_set_number, json_reader_set_true, + json_reader_set_false, json_reader_set_null +}; + +int +rewrite_and_compare (FILE * in, FILE * cmp, int indent) +{ grpc_json_writer writer; grpc_json_reader reader; grpc_json_reader_status status; json_writer_userdata writer_user; json_reader_userdata reader_user; - GPR_ASSERT(in); - GPR_ASSERT(cmp); + GPR_ASSERT (in); + GPR_ASSERT (cmp); reader_user.writer = &writer; reader_user.in = in; @@ -246,60 +298,68 @@ int rewrite_and_compare(FILE* in, FILE* cmp, int indent) { writer_user.cmp = cmp; - grpc_json_writer_init(&writer, indent, &writer_vtable, &writer_user); - grpc_json_reader_init(&reader, &reader_vtable, &reader_user); + grpc_json_writer_init (&writer, indent, &writer_vtable, &writer_user); + grpc_json_reader_init (&reader, &reader_vtable, &reader_user); - do { - status = grpc_json_reader_run(&reader); - } while (status == GRPC_JSON_EAGAIN); + do + { + status = grpc_json_reader_run (&reader); + } + while (status == GRPC_JSON_EAGAIN); - free(reader_user.scratchpad); - while (reader_user.top) { - stacked_container* container = reader_user.top; - reader_user.top = container->next; - free(container); - } + free (reader_user.scratchpad); + while (reader_user.top) + { + stacked_container *container = reader_user.top; + reader_user.top = container->next; + free (container); + } return status == GRPC_JSON_DONE; } -typedef struct test_file { - const char* input; - const char* cmp; +typedef struct test_file +{ + const char *input; + const char *cmp; int indent; } test_file; static test_file test_files[] = { - {"test/core/json/rewrite_test_input.json", - "test/core/json/rewrite_test_output_condensed.json", 0}, - {"test/core/json/rewrite_test_input.json", - "test/core/json/rewrite_test_output_indented.json", 2}, - {"test/core/json/rewrite_test_output_indented.json", - "test/core/json/rewrite_test_output_condensed.json", 0}, - {"test/core/json/rewrite_test_output_condensed.json", - "test/core/json/rewrite_test_output_indented.json", 2}, + {"test/core/json/rewrite_test_input.json", + "test/core/json/rewrite_test_output_condensed.json", 0}, + {"test/core/json/rewrite_test_input.json", + "test/core/json/rewrite_test_output_indented.json", 2}, + {"test/core/json/rewrite_test_output_indented.json", + "test/core/json/rewrite_test_output_condensed.json", 0}, + {"test/core/json/rewrite_test_output_condensed.json", + "test/core/json/rewrite_test_output_indented.json", 2}, }; -void test_rewrites() { +void +test_rewrites () +{ unsigned i; - for (i = 0; i < GPR_ARRAY_SIZE(test_files); i++) { - test_file* test = test_files + i; - FILE* input = fopen(test->input, "rb"); - FILE* cmp = fopen(test->cmp, "rb"); - int status; - gpr_log(GPR_INFO, "Testing file %s against %s using indent=%i", test->input, - test->cmp, test->indent); - status = rewrite_and_compare(input, cmp, test->indent); - GPR_ASSERT(status); - fclose(input); - fclose(cmp); - } + for (i = 0; i < GPR_ARRAY_SIZE (test_files); i++) + { + test_file *test = test_files + i; + FILE *input = fopen (test->input, "rb"); + FILE *cmp = fopen (test->cmp, "rb"); + int status; + gpr_log (GPR_INFO, "Testing file %s against %s using indent=%i", test->input, test->cmp, test->indent); + status = rewrite_and_compare (input, cmp, test->indent); + GPR_ASSERT (status); + fclose (input); + fclose (cmp); + } } -int main(int argc, char** argv) { - grpc_test_init(argc, argv); - test_rewrites(); - gpr_log(GPR_INFO, "json_rewrite_test success"); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_rewrites (); + gpr_log (GPR_INFO, "json_rewrite_test success"); return 0; } diff --git a/test/core/json/json_test.c b/test/core/json/json_test.c index a500effceab..2f4e2921eb9 100644 --- a/test/core/json/json_test.c +++ b/test/core/json/json_test.c @@ -42,141 +42,151 @@ #include "test/core/util/test_config.h" -typedef struct testing_pair { - const char* input; - const char* output; +typedef struct testing_pair +{ + const char *input; + const char *output; } testing_pair; static testing_pair testing_pairs[] = { - /* Testing valid parsing. */ - - /* Testing trivial parses, with de-indentation. */ - {" 0 ", "0"}, - {" 1 ", "1"}, - {" \"a\" ", "\"a\""}, - {" true ", "true"}, - /* Testing the parser's ability to decode trivial UTF-16. */ - {"\"\\u0020\\\\\\u0010\\u000a\\u000D\"", "\" \\\\\\u0010\\n\\r\""}, - /* Testing various UTF-8 sequences. */ - {"\"ßâñć௵⇒\"", "\"\\u00df\\u00e2\\u00f1\\u0107\\u0bf5\\u21d2\""}, - {"\"\\u00df\\u00e2\\u00f1\\u0107\\u0bf5\\u21d2\"", - "\"\\u00df\\u00e2\\u00f1\\u0107\\u0bf5\\u21d2\""}, - /* Testing UTF-8 character "𝄞", U+11D1E. */ - {"\"\xf0\x9d\x84\x9e\"", "\"\\ud834\\udd1e\""}, - {"\"\\ud834\\udd1e\"", "\"\\ud834\\udd1e\""}, - /* Testing nested empty containers. */ - { - " [ [ ] , { } , [ ] ] ", "[[],{},[]]", - }, - /* Testing escapes and control chars in key strings. */ - {" { \"\x7f\\n\\\\a , b\": 1, \"\": 0 } ", - "{\"\\u007f\\n\\\\a , b\":1,\"\":0}"}, - /* Testing the writer's ability to cut off invalid UTF-8 sequences. */ - {"\"abc\xf0\x9d\x24\"", "\"abc\""}, - {"\"\xff\"", "\"\""}, - /* Testing valid number parsing. */ - {"[0, 42 , 0.0123, 123.456]", "[0,42,0.0123,123.456]"}, - {"[1e4,-53.235e-31, 0.3e+3]", "[1e4,-53.235e-31,0.3e+3]"}, - /* Testing keywords parsing. */ - {"[true, false, null]", "[true,false,null]"}, - - /* Testing invalid parsing. */ - - /* Testing plain invalid things, exercising the state machine. */ - {"\\", NULL}, - {"nu ll", NULL}, - {"fals", NULL}, - /* Testing unterminated string. */ - {"\"\\x", NULL}, - /* Testing invalid UTF-16 number. */ - {"\"\\u123x", NULL}, - /* Testing imbalanced surrogate pairs. */ - {"\"\\ud834f", NULL}, - {"\"\\ud834\\n", NULL}, - {"\"\\udd1ef", NULL}, - {"\"\\ud834\\ud834\"", NULL}, - {"\"\\ud834\\u1234\"", NULL}, - /* Testing embedded invalid whitechars. */ - {"\"\n\"", NULL}, - {"\"\t\"", NULL}, - /* Testing empty json data. */ - {"", NULL}, - /* Testing extra characters after end of parsing. */ - {"{},", NULL}, - /* Testing imbalanced containers. */ - {"{}}", NULL}, - {"[]]", NULL}, - {"{{}", NULL}, - {"[[]", NULL}, - {"[}", NULL}, - {"{]", NULL}, - /*Testing trailing comma. */ - {"{,}", NULL}, - {"[1,2,3,4,]", NULL}, - /* Testing having a key syntax in an array. */ - {"[\"x\":0]", NULL}, - /* Testing invalid numbers. */ - {"1.", NULL}, - {"1e", NULL}, - {".12", NULL}, - {"1.x", NULL}, - {"1.12x", NULL}, - {"1ex", NULL}, - {"1e12x", NULL}, - {".12x", NULL}, - {"000", NULL}, + /* Testing valid parsing. */ + + /* Testing trivial parses, with de-indentation. */ + {" 0 ", "0"}, + {" 1 ", "1"}, + {" \"a\" ", "\"a\""}, + {" true ", "true"}, + /* Testing the parser's ability to decode trivial UTF-16. */ + {"\"\\u0020\\\\\\u0010\\u000a\\u000D\"", "\" \\\\\\u0010\\n\\r\""}, + /* Testing various UTF-8 sequences. */ + {"\"ßâñć௵⇒\"", "\"\\u00df\\u00e2\\u00f1\\u0107\\u0bf5\\u21d2\""}, + {"\"\\u00df\\u00e2\\u00f1\\u0107\\u0bf5\\u21d2\"", + "\"\\u00df\\u00e2\\u00f1\\u0107\\u0bf5\\u21d2\""}, + /* Testing UTF-8 character "𝄞", U+11D1E. */ + {"\"\xf0\x9d\x84\x9e\"", "\"\\ud834\\udd1e\""}, + {"\"\\ud834\\udd1e\"", "\"\\ud834\\udd1e\""}, + /* Testing nested empty containers. */ + { + " [ [ ] , { } , [ ] ] ", "[[],{},[]]", + }, + /* Testing escapes and control chars in key strings. */ + {" { \"\x7f\\n\\\\a , b\": 1, \"\": 0 } ", + "{\"\\u007f\\n\\\\a , b\":1,\"\":0}"}, + /* Testing the writer's ability to cut off invalid UTF-8 sequences. */ + {"\"abc\xf0\x9d\x24\"", "\"abc\""}, + {"\"\xff\"", "\"\""}, + /* Testing valid number parsing. */ + {"[0, 42 , 0.0123, 123.456]", "[0,42,0.0123,123.456]"}, + {"[1e4,-53.235e-31, 0.3e+3]", "[1e4,-53.235e-31,0.3e+3]"}, + /* Testing keywords parsing. */ + {"[true, false, null]", "[true,false,null]"}, + + /* Testing invalid parsing. */ + + /* Testing plain invalid things, exercising the state machine. */ + {"\\", NULL}, + {"nu ll", NULL}, + {"fals", NULL}, + /* Testing unterminated string. */ + {"\"\\x", NULL}, + /* Testing invalid UTF-16 number. */ + {"\"\\u123x", NULL}, + /* Testing imbalanced surrogate pairs. */ + {"\"\\ud834f", NULL}, + {"\"\\ud834\\n", NULL}, + {"\"\\udd1ef", NULL}, + {"\"\\ud834\\ud834\"", NULL}, + {"\"\\ud834\\u1234\"", NULL}, + /* Testing embedded invalid whitechars. */ + {"\"\n\"", NULL}, + {"\"\t\"", NULL}, + /* Testing empty json data. */ + {"", NULL}, + /* Testing extra characters after end of parsing. */ + {"{},", NULL}, + /* Testing imbalanced containers. */ + {"{}}", NULL}, + {"[]]", NULL}, + {"{{}", NULL}, + {"[[]", NULL}, + {"[}", NULL}, + {"{]", NULL}, + /*Testing trailing comma. */ + {"{,}", NULL}, + {"[1,2,3,4,]", NULL}, + /* Testing having a key syntax in an array. */ + {"[\"x\":0]", NULL}, + /* Testing invalid numbers. */ + {"1.", NULL}, + {"1e", NULL}, + {".12", NULL}, + {"1.x", NULL}, + {"1.12x", NULL}, + {"1ex", NULL}, + {"1e12x", NULL}, + {".12x", NULL}, + {"000", NULL}, }; -static void test_pairs() { +static void +test_pairs () +{ unsigned i; - for (i = 0; i < GPR_ARRAY_SIZE(testing_pairs); i++) { - testing_pair* pair = testing_pairs + i; - char* scratchpad = gpr_strdup(pair->input); - grpc_json* json; - - gpr_log(GPR_INFO, "parsing string %i - should %s", i, - pair->output ? "succeed" : "fail"); - json = grpc_json_parse_string(scratchpad); - - if (pair->output) { - char* output; - - GPR_ASSERT(json); - output = grpc_json_dump_to_string(json, 0); - GPR_ASSERT(output); - gpr_log(GPR_INFO, "succeeded with output = %s", output); - GPR_ASSERT(strcmp(output, pair->output) == 0); - - grpc_json_destroy(json); - gpr_free(output); - } else { - gpr_log(GPR_INFO, "failed"); - GPR_ASSERT(!json); + for (i = 0; i < GPR_ARRAY_SIZE (testing_pairs); i++) + { + testing_pair *pair = testing_pairs + i; + char *scratchpad = gpr_strdup (pair->input); + grpc_json *json; + + gpr_log (GPR_INFO, "parsing string %i - should %s", i, pair->output ? "succeed" : "fail"); + json = grpc_json_parse_string (scratchpad); + + if (pair->output) + { + char *output; + + GPR_ASSERT (json); + output = grpc_json_dump_to_string (json, 0); + GPR_ASSERT (output); + gpr_log (GPR_INFO, "succeeded with output = %s", output); + GPR_ASSERT (strcmp (output, pair->output) == 0); + + grpc_json_destroy (json); + gpr_free (output); + } + else + { + gpr_log (GPR_INFO, "failed"); + GPR_ASSERT (!json); + } + + gpr_free (scratchpad); } - - gpr_free(scratchpad); - } } -static void test_atypical() { - char* scratchpad = gpr_strdup("[[],[]]"); - grpc_json* json = grpc_json_parse_string(scratchpad); - grpc_json* brother; +static void +test_atypical () +{ + char *scratchpad = gpr_strdup ("[[],[]]"); + grpc_json *json = grpc_json_parse_string (scratchpad); + grpc_json *brother; - GPR_ASSERT(json); - GPR_ASSERT(json->child); + GPR_ASSERT (json); + GPR_ASSERT (json->child); brother = json->child->next; - grpc_json_destroy(json->child); + grpc_json_destroy (json->child); json->child = brother; - grpc_json_destroy(json); - gpr_free(scratchpad); + grpc_json_destroy (json); + gpr_free (scratchpad); } -int main(int argc, char** argv) { - grpc_test_init(argc, argv); - test_pairs(); - test_atypical(); - gpr_log(GPR_INFO, "json_test success"); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_pairs (); + test_atypical (); + gpr_log (GPR_INFO, "json_test success"); return 0; } diff --git a/test/core/network_benchmarks/low_level_ping_pong.c b/test/core/network_benchmarks/low_level_ping_pong.c index 0ce4bd4b250..35c892f2c80 100644 --- a/test/core/network_benchmarks/low_level_ping_pong.c +++ b/test/core/network_benchmarks/low_level_ping_pong.c @@ -57,17 +57,19 @@ #include #include -typedef struct fd_pair { +typedef struct fd_pair +{ int read_fd; int write_fd; } fd_pair; -typedef struct thread_args { +typedef struct thread_args +{ fd_pair fds; size_t msg_size; - int (*read_bytes)(struct thread_args *args, char *buf); - int (*write_bytes)(struct thread_args *args, char *buf); - int (*setup)(struct thread_args *args); + int (*read_bytes) (struct thread_args * args, char *buf); + int (*write_bytes) (struct thread_args * args, char *buf); + int (*setup) (struct thread_args * args); int epoll_fd; char *strategy_name; } thread_args; @@ -80,116 +82,163 @@ typedef struct thread_args { */ /* Basic call to read() */ -static int read_bytes(int fd, char *buf, size_t read_size, int spin) { +static int +read_bytes (int fd, char *buf, size_t read_size, int spin) +{ size_t bytes_read = 0; int err; - do { - err = read(fd, buf + bytes_read, read_size - bytes_read); - if (err < 0) { - if (errno == EINTR) { - continue; - } else { - if (errno == EAGAIN && spin == 1) { - continue; - } - gpr_log(GPR_ERROR, "Read failed: %s", strerror(errno)); - return -1; - } - } else { - bytes_read += err; + do + { + err = read (fd, buf + bytes_read, read_size - bytes_read); + if (err < 0) + { + if (errno == EINTR) + { + continue; + } + else + { + if (errno == EAGAIN && spin == 1) + { + continue; + } + gpr_log (GPR_ERROR, "Read failed: %s", strerror (errno)); + return -1; + } + } + else + { + bytes_read += err; + } } - } while (bytes_read < read_size); + while (bytes_read < read_size); return 0; } -static int blocking_read_bytes(thread_args *args, char *buf) { - return read_bytes(args->fds.read_fd, buf, args->msg_size, 0); +static int +blocking_read_bytes (thread_args * args, char *buf) +{ + return read_bytes (args->fds.read_fd, buf, args->msg_size, 0); } -static int spin_read_bytes(thread_args *args, char *buf) { - return read_bytes(args->fds.read_fd, buf, args->msg_size, 1); +static int +spin_read_bytes (thread_args * args, char *buf) +{ + return read_bytes (args->fds.read_fd, buf, args->msg_size, 1); } /* Call poll() to monitor a non-blocking fd */ -static int poll_read_bytes(int fd, char *buf, size_t read_size, int spin) { +static int +poll_read_bytes (int fd, char *buf, size_t read_size, int spin) +{ struct pollfd pfd; size_t bytes_read = 0; int err; pfd.fd = fd; pfd.events = POLLIN; - do { - err = poll(&pfd, 1, spin ? 0 : -1); - if (err < 0) { - if (errno == EINTR) { - continue; - } else { - gpr_log(GPR_ERROR, "Poll failed: %s", strerror(errno)); - return -1; - } - } - if (err == 0 && spin) continue; - GPR_ASSERT(err == 1); - GPR_ASSERT(pfd.revents == POLLIN); - do { - err = read(fd, buf + bytes_read, read_size - bytes_read); - } while (err < 0 && errno == EINTR); - if (err < 0 && errno != EAGAIN) { - gpr_log(GPR_ERROR, "Read failed: %s", strerror(errno)); - return -1; + do + { + err = poll (&pfd, 1, spin ? 0 : -1); + if (err < 0) + { + if (errno == EINTR) + { + continue; + } + else + { + gpr_log (GPR_ERROR, "Poll failed: %s", strerror (errno)); + return -1; + } + } + if (err == 0 && spin) + continue; + GPR_ASSERT (err == 1); + GPR_ASSERT (pfd.revents == POLLIN); + do + { + err = read (fd, buf + bytes_read, read_size - bytes_read); + } + while (err < 0 && errno == EINTR); + if (err < 0 && errno != EAGAIN) + { + gpr_log (GPR_ERROR, "Read failed: %s", strerror (errno)); + return -1; + } + bytes_read += err; } - bytes_read += err; - } while (bytes_read < read_size); + while (bytes_read < read_size); return 0; } -static int poll_read_bytes_blocking(struct thread_args *args, char *buf) { - return poll_read_bytes(args->fds.read_fd, buf, args->msg_size, 0); +static int +poll_read_bytes_blocking (struct thread_args *args, char *buf) +{ + return poll_read_bytes (args->fds.read_fd, buf, args->msg_size, 0); } -static int poll_read_bytes_spin(struct thread_args *args, char *buf) { - return poll_read_bytes(args->fds.read_fd, buf, args->msg_size, 1); +static int +poll_read_bytes_spin (struct thread_args *args, char *buf) +{ + return poll_read_bytes (args->fds.read_fd, buf, args->msg_size, 1); } #ifdef __linux__ /* Call epoll_wait() to monitor a non-blocking fd */ -static int epoll_read_bytes(struct thread_args *args, char *buf, int spin) { +static int +epoll_read_bytes (struct thread_args *args, char *buf, int spin) +{ struct epoll_event ev; size_t bytes_read = 0; int err; size_t read_size = args->msg_size; - do { - err = epoll_wait(args->epoll_fd, &ev, 1, spin ? 0 : -1); - if (err < 0) { - if (errno == EINTR) continue; - gpr_log(GPR_ERROR, "epoll_wait failed: %s", strerror(errno)); - return -1; + do + { + err = epoll_wait (args->epoll_fd, &ev, 1, spin ? 0 : -1); + if (err < 0) + { + if (errno == EINTR) + continue; + gpr_log (GPR_ERROR, "epoll_wait failed: %s", strerror (errno)); + return -1; + } + if (err == 0 && spin) + continue; + GPR_ASSERT (err == 1); + GPR_ASSERT (ev.events & EPOLLIN); + GPR_ASSERT (ev.data.fd == args->fds.read_fd); + do + { + do + { + err = read (args->fds.read_fd, buf + bytes_read, read_size - bytes_read); + } + while (err < 0 && errno == EINTR); + if (errno == EAGAIN) + break; + bytes_read += err; + /* TODO(klempner): This should really be doing an extra call after we are + done to ensure we see an EAGAIN */ + } + while (bytes_read < read_size); } - if (err == 0 && spin) continue; - GPR_ASSERT(err == 1); - GPR_ASSERT(ev.events & EPOLLIN); - GPR_ASSERT(ev.data.fd == args->fds.read_fd); - do { - do { - err = read(args->fds.read_fd, buf + bytes_read, read_size - bytes_read); - } while (err < 0 && errno == EINTR); - if (errno == EAGAIN) break; - bytes_read += err; - /* TODO(klempner): This should really be doing an extra call after we are - done to ensure we see an EAGAIN */ - } while (bytes_read < read_size); - } while (bytes_read < read_size); - GPR_ASSERT(bytes_read == read_size); + while (bytes_read < read_size); + GPR_ASSERT (bytes_read == read_size); return 0; } -static int epoll_read_bytes_blocking(struct thread_args *args, char *buf) { - return epoll_read_bytes(args, buf, 0); +static int +epoll_read_bytes_blocking (struct thread_args *args, char *buf) +{ + return epoll_read_bytes (args, buf, 0); } -static int epoll_read_bytes_spin(struct thread_args *args, char *buf) { - return epoll_read_bytes(args, buf, 1); +static int +epoll_read_bytes_spin (struct thread_args *args, char *buf) +{ + return epoll_read_bytes (args, buf, 1); } #endif /* __linux__ */ @@ -197,24 +246,33 @@ static int epoll_read_bytes_spin(struct thread_args *args, char *buf) { At this point we only have one strategy, since in the common case these writes go directly out to the kernel. */ -static int blocking_write_bytes(struct thread_args *args, char *buf) { +static int +blocking_write_bytes (struct thread_args *args, char *buf) +{ size_t bytes_written = 0; int err; size_t write_size = args->msg_size; - do { - err = write(args->fds.write_fd, buf + bytes_written, - write_size - bytes_written); - if (err < 0) { - if (errno == EINTR) { - continue; - } else { - gpr_log(GPR_ERROR, "Read failed: %s", strerror(errno)); - return -1; - } - } else { - bytes_written += err; - } - } while (bytes_written < write_size); + do + { + err = write (args->fds.write_fd, buf + bytes_written, write_size - bytes_written); + if (err < 0) + { + if (errno == EINTR) + { + continue; + } + else + { + gpr_log (GPR_ERROR, "Read failed: %s", strerror (errno)); + return -1; + } + } + else + { + bytes_written += err; + } + } + while (bytes_written < write_size); return 0; } @@ -224,250 +282,305 @@ static int blocking_write_bytes(struct thread_args *args, char *buf) { These are called at the beginning of the client and server thread, depending on the scenario we're using. */ -static int set_socket_nonblocking(thread_args *args) { - if (!grpc_set_socket_nonblocking(args->fds.read_fd, 1)) { - gpr_log(GPR_ERROR, "Unable to set socket nonblocking: %s", strerror(errno)); - return -1; - } - if (!grpc_set_socket_nonblocking(args->fds.write_fd, 1)) { - gpr_log(GPR_ERROR, "Unable to set socket nonblocking: %s", strerror(errno)); - return -1; - } +static int +set_socket_nonblocking (thread_args * args) +{ + if (!grpc_set_socket_nonblocking (args->fds.read_fd, 1)) + { + gpr_log (GPR_ERROR, "Unable to set socket nonblocking: %s", strerror (errno)); + return -1; + } + if (!grpc_set_socket_nonblocking (args->fds.write_fd, 1)) + { + gpr_log (GPR_ERROR, "Unable to set socket nonblocking: %s", strerror (errno)); + return -1; + } return 0; } -static int do_nothing(thread_args *args) { return 0; } +static int +do_nothing (thread_args * args) +{ + return 0; +} #ifdef __linux__ /* Special case for epoll, where we need to create the fd ahead of time. */ -static int epoll_setup(thread_args *args) { +static int +epoll_setup (thread_args * args) +{ int epoll_fd; struct epoll_event ev; - set_socket_nonblocking(args); - epoll_fd = epoll_create(1); - if (epoll_fd < 0) { - gpr_log(GPR_ERROR, "epoll_create: %s", strerror(errno)); - return -1; - } + set_socket_nonblocking (args); + epoll_fd = epoll_create (1); + if (epoll_fd < 0) + { + gpr_log (GPR_ERROR, "epoll_create: %s", strerror (errno)); + return -1; + } args->epoll_fd = epoll_fd; ev.events = EPOLLIN | EPOLLET; ev.data.fd = args->fds.read_fd; - if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, args->fds.read_fd, &ev) < 0) { - gpr_log(GPR_ERROR, "epoll_ctl: %s", strerror(errno)); - } + if (epoll_ctl (epoll_fd, EPOLL_CTL_ADD, args->fds.read_fd, &ev) < 0) + { + gpr_log (GPR_ERROR, "epoll_ctl: %s", strerror (errno)); + } return 0; } #endif -static void server_thread(thread_args *args) { - char *buf = malloc(args->msg_size); - if (args->setup(args) < 0) { - gpr_log(GPR_ERROR, "Setup failed"); - } - for (;;) { - if (args->read_bytes(args, buf) < 0) { - gpr_log(GPR_ERROR, "Server read failed"); - free(buf); - return; - } - if (args->write_bytes(args, buf) < 0) { - gpr_log(GPR_ERROR, "Server write failed"); - free(buf); - return; - } - } +static void +server_thread (thread_args * args) +{ + char *buf = malloc (args->msg_size); + if (args->setup (args) < 0) + { + gpr_log (GPR_ERROR, "Setup failed"); + } + for (;;) + { + if (args->read_bytes (args, buf) < 0) + { + gpr_log (GPR_ERROR, "Server read failed"); + free (buf); + return; + } + if (args->write_bytes (args, buf) < 0) + { + gpr_log (GPR_ERROR, "Server write failed"); + free (buf); + return; + } + } } -static void server_thread_wrap(void *arg) { +static void +server_thread_wrap (void *arg) +{ thread_args *args = arg; - server_thread(args); + server_thread (args); } -static void print_histogram(gpr_histogram *histogram) { +static void +print_histogram (gpr_histogram * histogram) +{ /* TODO(klempner): Print more detailed information, such as detailed histogram buckets */ - gpr_log(GPR_INFO, "latency (50/95/99/99.9): %f/%f/%f/%f", - gpr_histogram_percentile(histogram, 50), - gpr_histogram_percentile(histogram, 95), - gpr_histogram_percentile(histogram, 99), - gpr_histogram_percentile(histogram, 99.9)); + gpr_log (GPR_INFO, "latency (50/95/99/99.9): %f/%f/%f/%f", gpr_histogram_percentile (histogram, 50), gpr_histogram_percentile (histogram, 95), gpr_histogram_percentile (histogram, 99), gpr_histogram_percentile (histogram, 99.9)); } -static double now(void) { - gpr_timespec tv = gpr_now(GPR_CLOCK_REALTIME); +static double +now (void) +{ + gpr_timespec tv = gpr_now (GPR_CLOCK_REALTIME); return 1e9 * tv.tv_sec + tv.tv_nsec; } -static void client_thread(thread_args *args) { - char *buf = calloc(args->msg_size, sizeof(char)); - gpr_histogram *histogram = gpr_histogram_create(0.01, 60e9); +static void +client_thread (thread_args * args) +{ + char *buf = calloc (args->msg_size, sizeof (char)); + gpr_histogram *histogram = gpr_histogram_create (0.01, 60e9); double start_time; double end_time; double interval; const int kNumIters = 100000; int i; - if (args->setup(args) < 0) { - gpr_log(GPR_ERROR, "Setup failed"); - } - for (i = 0; i < kNumIters; ++i) { - start_time = now(); - if (args->write_bytes(args, buf) < 0) { - gpr_log(GPR_ERROR, "Client write failed"); - goto error; + if (args->setup (args) < 0) + { + gpr_log (GPR_ERROR, "Setup failed"); } - if (args->read_bytes(args, buf) < 0) { - gpr_log(GPR_ERROR, "Client read failed"); - goto error; + for (i = 0; i < kNumIters; ++i) + { + start_time = now (); + if (args->write_bytes (args, buf) < 0) + { + gpr_log (GPR_ERROR, "Client write failed"); + goto error; + } + if (args->read_bytes (args, buf) < 0) + { + gpr_log (GPR_ERROR, "Client read failed"); + goto error; + } + end_time = now (); + if (i > kNumIters / 2) + { + interval = end_time - start_time; + gpr_histogram_add (histogram, interval); + } } - end_time = now(); - if (i > kNumIters / 2) { - interval = end_time - start_time; - gpr_histogram_add(histogram, interval); - } - } - print_histogram(histogram); + print_histogram (histogram); error: - free(buf); - gpr_histogram_destroy(histogram); + free (buf); + gpr_histogram_destroy (histogram); } /* This roughly matches tcp_server's create_listening_socket */ -static int create_listening_socket(struct sockaddr *port, socklen_t len) { - int fd = socket(port->sa_family, SOCK_STREAM, 0); - if (fd < 0) { - gpr_log(GPR_ERROR, "Unable to create socket: %s", strerror(errno)); - goto error; - } - - if (!grpc_set_socket_cloexec(fd, 1) || !grpc_set_socket_low_latency(fd, 1) || - !grpc_set_socket_reuse_addr(fd, 1)) { - gpr_log(GPR_ERROR, "Unable to configure socket %d: %s", fd, - strerror(errno)); - goto error; - } - - if (bind(fd, port, len) < 0) { - gpr_log(GPR_ERROR, "bind: %s", strerror(errno)); - goto error; - } - - if (listen(fd, 1) < 0) { - gpr_log(GPR_ERROR, "listen: %s", strerror(errno)); - goto error; - } - - if (getsockname(fd, port, &len) < 0) { - gpr_log(GPR_ERROR, "getsockname: %s", strerror(errno)); - goto error; - } +static int +create_listening_socket (struct sockaddr *port, socklen_t len) +{ + int fd = socket (port->sa_family, SOCK_STREAM, 0); + if (fd < 0) + { + gpr_log (GPR_ERROR, "Unable to create socket: %s", strerror (errno)); + goto error; + } + + if (!grpc_set_socket_cloexec (fd, 1) || !grpc_set_socket_low_latency (fd, 1) || !grpc_set_socket_reuse_addr (fd, 1)) + { + gpr_log (GPR_ERROR, "Unable to configure socket %d: %s", fd, strerror (errno)); + goto error; + } + + if (bind (fd, port, len) < 0) + { + gpr_log (GPR_ERROR, "bind: %s", strerror (errno)); + goto error; + } + + if (listen (fd, 1) < 0) + { + gpr_log (GPR_ERROR, "listen: %s", strerror (errno)); + goto error; + } + + if (getsockname (fd, port, &len) < 0) + { + gpr_log (GPR_ERROR, "getsockname: %s", strerror (errno)); + goto error; + } return fd; error: - if (fd >= 0) { - close(fd); - } + if (fd >= 0) + { + close (fd); + } return -1; } -static int connect_client(struct sockaddr *addr, int len) { - int fd = socket(addr->sa_family, SOCK_STREAM, 0); +static int +connect_client (struct sockaddr *addr, int len) +{ + int fd = socket (addr->sa_family, SOCK_STREAM, 0); int err; - if (fd < 0) { - gpr_log(GPR_ERROR, "Unable to create socket: %s", strerror(errno)); - goto error; - } - - if (!grpc_set_socket_cloexec(fd, 1) || !grpc_set_socket_low_latency(fd, 1)) { - gpr_log(GPR_ERROR, "Failed to configure socket"); - goto error; - } - - do { - err = connect(fd, addr, len); - } while (err < 0 && errno == EINTR); - - if (err < 0) { - gpr_log(GPR_ERROR, "connect error: %s", strerror(errno)); - goto error; - } + if (fd < 0) + { + gpr_log (GPR_ERROR, "Unable to create socket: %s", strerror (errno)); + goto error; + } + + if (!grpc_set_socket_cloexec (fd, 1) || !grpc_set_socket_low_latency (fd, 1)) + { + gpr_log (GPR_ERROR, "Failed to configure socket"); + goto error; + } + + do + { + err = connect (fd, addr, len); + } + while (err < 0 && errno == EINTR); + + if (err < 0) + { + gpr_log (GPR_ERROR, "connect error: %s", strerror (errno)); + goto error; + } return fd; error: - if (fd >= 0) { - close(fd); - } + if (fd >= 0) + { + close (fd); + } return -1; } -static int accept_server(int listen_fd) { - int fd = accept(listen_fd, NULL, NULL); - if (fd < 0) { - gpr_log(GPR_ERROR, "Accept failed: %s", strerror(errno)); - return -1; - } +static int +accept_server (int listen_fd) +{ + int fd = accept (listen_fd, NULL, NULL); + if (fd < 0) + { + gpr_log (GPR_ERROR, "Accept failed: %s", strerror (errno)); + return -1; + } return fd; } -static int create_sockets_tcp(fd_pair *client_fds, fd_pair *server_fds) { +static int +create_sockets_tcp (fd_pair * client_fds, fd_pair * server_fds) +{ int listen_fd = -1; int client_fd = -1; int server_fd = -1; struct sockaddr_in port; - struct sockaddr *sa_port = (struct sockaddr *)&port; + struct sockaddr *sa_port = (struct sockaddr *) &port; port.sin_family = AF_INET; port.sin_port = 0; port.sin_addr.s_addr = INADDR_ANY; - listen_fd = create_listening_socket(sa_port, sizeof(port)); - if (listen_fd == -1) { - gpr_log(GPR_ERROR, "Listen failed"); - goto error; - } + listen_fd = create_listening_socket (sa_port, sizeof (port)); + if (listen_fd == -1) + { + gpr_log (GPR_ERROR, "Listen failed"); + goto error; + } - client_fd = connect_client(sa_port, sizeof(port)); - if (client_fd == -1) { - gpr_log(GPR_ERROR, "Connect failed"); - goto error; - } + client_fd = connect_client (sa_port, sizeof (port)); + if (client_fd == -1) + { + gpr_log (GPR_ERROR, "Connect failed"); + goto error; + } - server_fd = accept_server(listen_fd); - if (server_fd == -1) { - gpr_log(GPR_ERROR, "Accept failed"); - goto error; - } + server_fd = accept_server (listen_fd); + if (server_fd == -1) + { + gpr_log (GPR_ERROR, "Accept failed"); + goto error; + } client_fds->read_fd = client_fd; client_fds->write_fd = client_fd; server_fds->read_fd = server_fd; server_fds->write_fd = server_fd; - close(listen_fd); + close (listen_fd); return 0; error: - if (listen_fd != -1) { - close(listen_fd); - } - if (client_fd != -1) { - close(client_fd); - } - if (server_fd != -1) { - close(server_fd); - } + if (listen_fd != -1) + { + close (listen_fd); + } + if (client_fd != -1) + { + close (client_fd); + } + if (server_fd != -1) + { + close (server_fd); + } return -1; } -static int create_sockets_socketpair(fd_pair *client_fds, fd_pair *server_fds) { +static int +create_sockets_socketpair (fd_pair * client_fds, fd_pair * server_fds) +{ int fds[2]; - if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) < 0) { - gpr_log(GPR_ERROR, "socketpair: %s", strerror(errno)); - return -1; - } + if (socketpair (AF_UNIX, SOCK_STREAM, 0, fds) < 0) + { + gpr_log (GPR_ERROR, "socketpair: %s", strerror (errno)); + return -1; + } client_fds->read_fd = fds[0]; client_fds->write_fd = fds[0]; @@ -476,18 +589,22 @@ static int create_sockets_socketpair(fd_pair *client_fds, fd_pair *server_fds) { return 0; } -static int create_sockets_pipe(fd_pair *client_fds, fd_pair *server_fds) { +static int +create_sockets_pipe (fd_pair * client_fds, fd_pair * server_fds) +{ int cfds[2]; int sfds[2]; - if (pipe(cfds) < 0) { - gpr_log(GPR_ERROR, "pipe: %s", strerror(errno)); - return -1; - } + if (pipe (cfds) < 0) + { + gpr_log (GPR_ERROR, "pipe: %s", strerror (errno)); + return -1; + } - if (pipe(sfds) < 0) { - gpr_log(GPR_ERROR, "pipe: %s", strerror(errno)); - return -1; - } + if (pipe (sfds) < 0) + { + gpr_log (GPR_ERROR, "pipe: %s", strerror (errno)); + return -1; + } client_fds->read_fd = cfds[0]; client_fds->write_fd = cfds[1]; @@ -496,129 +613,142 @@ static int create_sockets_pipe(fd_pair *client_fds, fd_pair *server_fds) { return 0; } -static const char *read_strategy_usage = - "Strategy for doing reads, which is one of:\n" - " blocking: blocking read calls\n" - " same_thread_poll: poll() call on same thread \n" +static const char *read_strategy_usage = "Strategy for doing reads, which is one of:\n" " blocking: blocking read calls\n" " same_thread_poll: poll() call on same thread \n" #ifdef __linux__ - " same_thread_epoll: epoll_wait() on same thread \n" + " same_thread_epoll: epoll_wait() on same thread \n" #endif - " spin_read: spinning non-blocking read() calls \n" - " spin_poll: spinning 0 timeout poll() calls \n" + " spin_read: spinning non-blocking read() calls \n" " spin_poll: spinning 0 timeout poll() calls \n" #ifdef __linux__ - " spin_epoll: spinning 0 timeout epoll_wait() calls \n" + " spin_epoll: spinning 0 timeout epoll_wait() calls \n" #endif - ""; - -static const char *socket_type_usage = - "Type of socket used, one of:\n" - " tcp: fds are endpoints of a TCP connection\n" - " socketpair: fds come from socketpair()\n" - " pipe: fds come from pipe()\n"; - -void print_usage(char *argv0) { - fprintf(stderr, "%s usage:\n\n", argv0); - fprintf(stderr, "%s read_strategy socket_type msg_size\n\n", argv0); - fprintf(stderr, "where read_strategy is one of:\n"); - fprintf(stderr, " blocking: blocking read calls\n"); - fprintf(stderr, " same_thread_poll: poll() call on same thread \n"); + ""; + +static const char *socket_type_usage = "Type of socket used, one of:\n" " tcp: fds are endpoints of a TCP connection\n" " socketpair: fds come from socketpair()\n" " pipe: fds come from pipe()\n"; + +void +print_usage (char *argv0) +{ + fprintf (stderr, "%s usage:\n\n", argv0); + fprintf (stderr, "%s read_strategy socket_type msg_size\n\n", argv0); + fprintf (stderr, "where read_strategy is one of:\n"); + fprintf (stderr, " blocking: blocking read calls\n"); + fprintf (stderr, " same_thread_poll: poll() call on same thread \n"); #ifdef __linux__ - fprintf(stderr, " same_thread_epoll: epoll_wait() on same thread \n"); + fprintf (stderr, " same_thread_epoll: epoll_wait() on same thread \n"); #endif - fprintf(stderr, " spin_read: spinning non-blocking read() calls \n"); - fprintf(stderr, " spin_poll: spinning 0 timeout poll() calls \n"); + fprintf (stderr, " spin_read: spinning non-blocking read() calls \n"); + fprintf (stderr, " spin_poll: spinning 0 timeout poll() calls \n"); #ifdef __linux__ - fprintf(stderr, " spin_epoll: spinning 0 timeout epoll_wait() calls \n"); + fprintf (stderr, " spin_epoll: spinning 0 timeout epoll_wait() calls \n"); #endif - fprintf(stderr, "and socket_type is one of:\n"); - fprintf(stderr, " tcp: fds are endpoints of a TCP connection\n"); - fprintf(stderr, " socketpair: fds come from socketpair()\n"); - fprintf(stderr, " pipe: fds come from pipe()\n"); + fprintf (stderr, "and socket_type is one of:\n"); + fprintf (stderr, " tcp: fds are endpoints of a TCP connection\n"); + fprintf (stderr, " socketpair: fds come from socketpair()\n"); + fprintf (stderr, " pipe: fds come from pipe()\n"); } -typedef struct test_strategy { +typedef struct test_strategy +{ char *name; - int (*read_strategy)(struct thread_args *args, char *buf); - int (*setup)(struct thread_args *args); + int (*read_strategy) (struct thread_args * args, char *buf); + int (*setup) (struct thread_args * args); } test_strategy; static test_strategy test_strategies[] = { - {"blocking", blocking_read_bytes, do_nothing}, - {"same_thread_poll", poll_read_bytes_blocking, set_socket_nonblocking}, + {"blocking", blocking_read_bytes, do_nothing}, + {"same_thread_poll", poll_read_bytes_blocking, set_socket_nonblocking}, #ifdef __linux__ - {"same_thread_epoll", epoll_read_bytes_blocking, epoll_setup}, - {"spin_epoll", epoll_read_bytes_spin, epoll_setup}, + {"same_thread_epoll", epoll_read_bytes_blocking, epoll_setup}, + {"spin_epoll", epoll_read_bytes_spin, epoll_setup}, #endif /* __linux__ */ - {"spin_read", spin_read_bytes, set_socket_nonblocking}, - {"spin_poll", poll_read_bytes_spin, set_socket_nonblocking}}; - -static char *socket_types[] = {"tcp", "socketpair", "pipe"}; - -int create_socket(char *socket_type, fd_pair *client_fds, fd_pair *server_fds) { - if (strcmp(socket_type, "tcp") == 0) { - create_sockets_tcp(client_fds, server_fds); - } else if (strcmp(socket_type, "socketpair") == 0) { - create_sockets_socketpair(client_fds, server_fds); - } else if (strcmp(socket_type, "pipe") == 0) { - create_sockets_pipe(client_fds, server_fds); - } else { - fprintf(stderr, "Invalid socket type %s\n", socket_type); - return -1; - } + {"spin_read", spin_read_bytes, set_socket_nonblocking}, + {"spin_poll", poll_read_bytes_spin, set_socket_nonblocking} +}; + +static char *socket_types[] = { "tcp", "socketpair", "pipe" }; + +int +create_socket (char *socket_type, fd_pair * client_fds, fd_pair * server_fds) +{ + if (strcmp (socket_type, "tcp") == 0) + { + create_sockets_tcp (client_fds, server_fds); + } + else if (strcmp (socket_type, "socketpair") == 0) + { + create_sockets_socketpair (client_fds, server_fds); + } + else if (strcmp (socket_type, "pipe") == 0) + { + create_sockets_pipe (client_fds, server_fds); + } + else + { + fprintf (stderr, "Invalid socket type %s\n", socket_type); + return -1; + } return 0; } -static int run_benchmark(char *socket_type, thread_args *client_args, - thread_args *server_args) { +static int +run_benchmark (char *socket_type, thread_args * client_args, thread_args * server_args) +{ gpr_thd_id tid; int rv = 0; - rv = create_socket(socket_type, &client_args->fds, &server_args->fds); - if (rv < 0) { - return rv; - } + rv = create_socket (socket_type, &client_args->fds, &server_args->fds); + if (rv < 0) + { + return rv; + } - gpr_log(GPR_INFO, "Starting test %s %s %d", client_args->strategy_name, - socket_type, client_args->msg_size); + gpr_log (GPR_INFO, "Starting test %s %s %d", client_args->strategy_name, socket_type, client_args->msg_size); - gpr_thd_new(&tid, server_thread_wrap, server_args, NULL); - client_thread(client_args); + gpr_thd_new (&tid, server_thread_wrap, server_args, NULL); + client_thread (client_args); return 0; } -static int run_all_benchmarks(int msg_size) { +static int +run_all_benchmarks (int msg_size) +{ int error = 0; size_t i; - for (i = 0; i < GPR_ARRAY_SIZE(test_strategies); ++i) { - test_strategy *test_strategy = &test_strategies[i]; - size_t j; - for (j = 0; j < GPR_ARRAY_SIZE(socket_types); ++j) { - thread_args *client_args = malloc(sizeof(thread_args)); - thread_args *server_args = malloc(sizeof(thread_args)); - char *socket_type = socket_types[j]; - - client_args->read_bytes = test_strategy->read_strategy; - client_args->write_bytes = blocking_write_bytes; - client_args->setup = test_strategy->setup; - client_args->msg_size = msg_size; - client_args->strategy_name = test_strategy->name; - server_args->read_bytes = test_strategy->read_strategy; - server_args->write_bytes = blocking_write_bytes; - server_args->setup = test_strategy->setup; - server_args->msg_size = msg_size; - server_args->strategy_name = test_strategy->name; - error = run_benchmark(socket_type, client_args, server_args); - if (error < 0) { - return error; - } - } - } + for (i = 0; i < GPR_ARRAY_SIZE (test_strategies); ++i) + { + test_strategy *test_strategy = &test_strategies[i]; + size_t j; + for (j = 0; j < GPR_ARRAY_SIZE (socket_types); ++j) + { + thread_args *client_args = malloc (sizeof (thread_args)); + thread_args *server_args = malloc (sizeof (thread_args)); + char *socket_type = socket_types[j]; + + client_args->read_bytes = test_strategy->read_strategy; + client_args->write_bytes = blocking_write_bytes; + client_args->setup = test_strategy->setup; + client_args->msg_size = msg_size; + client_args->strategy_name = test_strategy->name; + server_args->read_bytes = test_strategy->read_strategy; + server_args->write_bytes = blocking_write_bytes; + server_args->setup = test_strategy->setup; + server_args->msg_size = msg_size; + server_args->strategy_name = test_strategy->name; + error = run_benchmark (socket_type, client_args, server_args); + if (error < 0) + { + return error; + } + } + } return error; } -int main(int argc, char **argv) { - thread_args *client_args = malloc(sizeof(thread_args)); - thread_args *server_args = malloc(sizeof(thread_args)); +int +main (int argc, char **argv) +{ + thread_args *client_args = malloc (sizeof (thread_args)); + thread_args *server_args = malloc (sizeof (thread_args)); int msg_size = -1; char *read_strategy = NULL; char *socket_type = NULL; @@ -626,44 +756,48 @@ int main(int argc, char **argv) { const test_strategy *test_strategy = NULL; int error = 0; - gpr_cmdline *cmdline = - gpr_cmdline_create("low_level_ping_pong network benchmarking tool"); - - gpr_cmdline_add_int(cmdline, "msg_size", "Size of sent messages", &msg_size); - gpr_cmdline_add_string(cmdline, "read_strategy", read_strategy_usage, - &read_strategy); - gpr_cmdline_add_string(cmdline, "socket_type", socket_type_usage, - &socket_type); - - gpr_cmdline_parse(cmdline, argc, argv); - - if (msg_size == -1) { - msg_size = 50; - } - - if (read_strategy == NULL) { - gpr_log(GPR_INFO, "No strategy specified, running all benchmarks"); - return run_all_benchmarks(msg_size); - } - - if (socket_type == NULL) { - socket_type = "tcp"; - } - if (msg_size <= 0) { - fprintf(stderr, "msg_size must be > 0\n"); - print_usage(argv[0]); - return -1; - } - - for (i = 0; i < GPR_ARRAY_SIZE(test_strategies); ++i) { - if (strcmp(test_strategies[i].name, read_strategy) == 0) { - test_strategy = &test_strategies[i]; - } - } - if (test_strategy == NULL) { - fprintf(stderr, "Invalid read strategy %s\n", read_strategy); - return -1; - } + gpr_cmdline *cmdline = gpr_cmdline_create ("low_level_ping_pong network benchmarking tool"); + + gpr_cmdline_add_int (cmdline, "msg_size", "Size of sent messages", &msg_size); + gpr_cmdline_add_string (cmdline, "read_strategy", read_strategy_usage, &read_strategy); + gpr_cmdline_add_string (cmdline, "socket_type", socket_type_usage, &socket_type); + + gpr_cmdline_parse (cmdline, argc, argv); + + if (msg_size == -1) + { + msg_size = 50; + } + + if (read_strategy == NULL) + { + gpr_log (GPR_INFO, "No strategy specified, running all benchmarks"); + return run_all_benchmarks (msg_size); + } + + if (socket_type == NULL) + { + socket_type = "tcp"; + } + if (msg_size <= 0) + { + fprintf (stderr, "msg_size must be > 0\n"); + print_usage (argv[0]); + return -1; + } + + for (i = 0; i < GPR_ARRAY_SIZE (test_strategies); ++i) + { + if (strcmp (test_strategies[i].name, read_strategy) == 0) + { + test_strategy = &test_strategies[i]; + } + } + if (test_strategy == NULL) + { + fprintf (stderr, "Invalid read strategy %s\n", read_strategy); + return -1; + } client_args->read_bytes = test_strategy->read_strategy; client_args->write_bytes = blocking_write_bytes; @@ -676,8 +810,8 @@ int main(int argc, char **argv) { server_args->msg_size = msg_size; server_args->strategy_name = read_strategy; - error = run_benchmark(socket_type, client_args, server_args); + error = run_benchmark (socket_type, client_args, server_args); - gpr_cmdline_destroy(cmdline); + gpr_cmdline_destroy (cmdline); return error; } diff --git a/test/core/profiling/timers_test.c b/test/core/profiling/timers_test.c index b79cde64bdb..6017f130ddc 100644 --- a/test/core/profiling/timers_test.c +++ b/test/core/profiling/timers_test.c @@ -35,49 +35,58 @@ #include #include "test/core/util/test_config.h" -void test_log_events(size_t num_seqs) { +void +test_log_events (size_t num_seqs) +{ size_t start = 0; size_t *state; - state = calloc(num_seqs, sizeof(state[0])); - while (start < num_seqs) { - size_t i; - size_t row; - if (state[start] == 3) { /* Already done with this posn */ - start++; - continue; - } + state = calloc (num_seqs, sizeof (state[0])); + while (start < num_seqs) + { + size_t i; + size_t row; + if (state[start] == 3) + { /* Already done with this posn */ + start++; + continue; + } - row = (size_t)rand() % 10; /* how many in a row */ - for (i = start; (i < start + row) && (i < num_seqs); i++) { - size_t j; - size_t advance = 1 + (size_t)rand() % 3; /* how many to advance by */ - for (j = 0; j < advance; j++) { - switch (state[i]) { - case 0: - GRPC_TIMER_MARK(STATE_0, i); - state[i]++; - break; - case 1: - GRPC_TIMER_MARK(STATE_1, i); - state[i]++; - break; - case 2: - GRPC_TIMER_MARK(STATE_2, i); - state[i]++; - break; - case 3: - break; - } - } + row = (size_t) rand () % 10; /* how many in a row */ + for (i = start; (i < start + row) && (i < num_seqs); i++) + { + size_t j; + size_t advance = 1 + (size_t) rand () % 3; /* how many to advance by */ + for (j = 0; j < advance; j++) + { + switch (state[i]) + { + case 0: + GRPC_TIMER_MARK (STATE_0, i); + state[i]++; + break; + case 1: + GRPC_TIMER_MARK (STATE_1, i); + state[i]++; + break; + case 2: + GRPC_TIMER_MARK (STATE_2, i); + state[i]++; + break; + case 3: + break; + } + } + } } - } - free(state); + free (state); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - grpc_timers_global_init(); - test_log_events(1000000); - grpc_timers_global_destroy(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + grpc_timers_global_init (); + test_log_events (1000000); + grpc_timers_global_destroy (); return 0; } diff --git a/test/core/security/auth_context_test.c b/test/core/security/auth_context_test.c index d091c7e7e63..9b58b3533ad 100644 --- a/test/core/security/auth_context_test.c +++ b/test/core/security/auth_context_test.c @@ -39,115 +39,113 @@ #include -static void test_empty_context(void) { - grpc_auth_context *ctx = grpc_auth_context_create(NULL); +static void +test_empty_context (void) +{ + grpc_auth_context *ctx = grpc_auth_context_create (NULL); grpc_auth_property_iterator it; - gpr_log(GPR_INFO, "test_empty_context"); - GPR_ASSERT(ctx != NULL); - GPR_ASSERT(grpc_auth_context_peer_identity_property_name(ctx) == NULL); - it = grpc_auth_context_peer_identity(ctx); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); - it = grpc_auth_context_property_iterator(ctx); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); - it = grpc_auth_context_find_properties_by_name(ctx, "foo"); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); - GPR_ASSERT(grpc_auth_context_set_peer_identity_property_name(ctx, "bar") == - 0); - GPR_ASSERT(grpc_auth_context_peer_identity_property_name(ctx) == NULL); - GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); + gpr_log (GPR_INFO, "test_empty_context"); + GPR_ASSERT (ctx != NULL); + GPR_ASSERT (grpc_auth_context_peer_identity_property_name (ctx) == NULL); + it = grpc_auth_context_peer_identity (ctx); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); + it = grpc_auth_context_property_iterator (ctx); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); + it = grpc_auth_context_find_properties_by_name (ctx, "foo"); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); + GPR_ASSERT (grpc_auth_context_set_peer_identity_property_name (ctx, "bar") == 0); + GPR_ASSERT (grpc_auth_context_peer_identity_property_name (ctx) == NULL); + GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); } -static void test_simple_context(void) { - grpc_auth_context *ctx = grpc_auth_context_create(NULL); +static void +test_simple_context (void) +{ + grpc_auth_context *ctx = grpc_auth_context_create (NULL); grpc_auth_property_iterator it; size_t i; - gpr_log(GPR_INFO, "test_simple_context"); - GPR_ASSERT(ctx != NULL); - grpc_auth_context_add_cstring_property(ctx, "name", "chapi"); - grpc_auth_context_add_cstring_property(ctx, "name", "chapo"); - grpc_auth_context_add_cstring_property(ctx, "foo", "bar"); - GPR_ASSERT(ctx->properties.count == 3); - GPR_ASSERT(grpc_auth_context_set_peer_identity_property_name(ctx, "name") == - 1); - - GPR_ASSERT( - strcmp(grpc_auth_context_peer_identity_property_name(ctx), "name") == 0); - it = grpc_auth_context_property_iterator(ctx); - for (i = 0; i < ctx->properties.count; i++) { - const grpc_auth_property *p = grpc_auth_property_iterator_next(&it); - GPR_ASSERT(p == &ctx->properties.array[i]); - } - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); - - it = grpc_auth_context_find_properties_by_name(ctx, "foo"); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == - &ctx->properties.array[2]); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); - - it = grpc_auth_context_peer_identity(ctx); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == - &ctx->properties.array[0]); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == - &ctx->properties.array[1]); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); - - GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); + gpr_log (GPR_INFO, "test_simple_context"); + GPR_ASSERT (ctx != NULL); + grpc_auth_context_add_cstring_property (ctx, "name", "chapi"); + grpc_auth_context_add_cstring_property (ctx, "name", "chapo"); + grpc_auth_context_add_cstring_property (ctx, "foo", "bar"); + GPR_ASSERT (ctx->properties.count == 3); + GPR_ASSERT (grpc_auth_context_set_peer_identity_property_name (ctx, "name") == 1); + + GPR_ASSERT (strcmp (grpc_auth_context_peer_identity_property_name (ctx), "name") == 0); + it = grpc_auth_context_property_iterator (ctx); + for (i = 0; i < ctx->properties.count; i++) + { + const grpc_auth_property *p = grpc_auth_property_iterator_next (&it); + GPR_ASSERT (p == &ctx->properties.array[i]); + } + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); + + it = grpc_auth_context_find_properties_by_name (ctx, "foo"); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &ctx->properties.array[2]); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); + + it = grpc_auth_context_peer_identity (ctx); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &ctx->properties.array[0]); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &ctx->properties.array[1]); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); + + GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); } -static void test_chained_context(void) { - grpc_auth_context *chained = grpc_auth_context_create(NULL); - grpc_auth_context *ctx = grpc_auth_context_create(chained); +static void +test_chained_context (void) +{ + grpc_auth_context *chained = grpc_auth_context_create (NULL); + grpc_auth_context *ctx = grpc_auth_context_create (chained); grpc_auth_property_iterator it; size_t i; - gpr_log(GPR_INFO, "test_chained_context"); - GRPC_AUTH_CONTEXT_UNREF(chained, "chained"); - grpc_auth_context_add_cstring_property(chained, "name", "padapo"); - grpc_auth_context_add_cstring_property(chained, "foo", "baz"); - grpc_auth_context_add_cstring_property(ctx, "name", "chapi"); - grpc_auth_context_add_cstring_property(ctx, "name", "chap0"); - grpc_auth_context_add_cstring_property(ctx, "foo", "bar"); - GPR_ASSERT(grpc_auth_context_set_peer_identity_property_name(ctx, "name") == - 1); - - GPR_ASSERT( - strcmp(grpc_auth_context_peer_identity_property_name(ctx), "name") == 0); - it = grpc_auth_context_property_iterator(ctx); - for (i = 0; i < ctx->properties.count; i++) { - const grpc_auth_property *p = grpc_auth_property_iterator_next(&it); - GPR_ASSERT(p == &ctx->properties.array[i]); - } - for (i = 0; i < chained->properties.count; i++) { - const grpc_auth_property *p = grpc_auth_property_iterator_next(&it); - GPR_ASSERT(p == &chained->properties.array[i]); - } - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); - - it = grpc_auth_context_find_properties_by_name(ctx, "foo"); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == - &ctx->properties.array[2]); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == - &chained->properties.array[1]); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); - - it = grpc_auth_context_peer_identity(ctx); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == - &ctx->properties.array[0]); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == - &ctx->properties.array[1]); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == - &chained->properties.array[0]); - GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); - - GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); + gpr_log (GPR_INFO, "test_chained_context"); + GRPC_AUTH_CONTEXT_UNREF (chained, "chained"); + grpc_auth_context_add_cstring_property (chained, "name", "padapo"); + grpc_auth_context_add_cstring_property (chained, "foo", "baz"); + grpc_auth_context_add_cstring_property (ctx, "name", "chapi"); + grpc_auth_context_add_cstring_property (ctx, "name", "chap0"); + grpc_auth_context_add_cstring_property (ctx, "foo", "bar"); + GPR_ASSERT (grpc_auth_context_set_peer_identity_property_name (ctx, "name") == 1); + + GPR_ASSERT (strcmp (grpc_auth_context_peer_identity_property_name (ctx), "name") == 0); + it = grpc_auth_context_property_iterator (ctx); + for (i = 0; i < ctx->properties.count; i++) + { + const grpc_auth_property *p = grpc_auth_property_iterator_next (&it); + GPR_ASSERT (p == &ctx->properties.array[i]); + } + for (i = 0; i < chained->properties.count; i++) + { + const grpc_auth_property *p = grpc_auth_property_iterator_next (&it); + GPR_ASSERT (p == &chained->properties.array[i]); + } + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); + + it = grpc_auth_context_find_properties_by_name (ctx, "foo"); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &ctx->properties.array[2]); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &chained->properties.array[1]); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); + + it = grpc_auth_context_peer_identity (ctx); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &ctx->properties.array[0]); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &ctx->properties.array[1]); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &chained->properties.array[0]); + GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); + + GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_empty_context(); - test_simple_context(); - test_chained_context(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_empty_context (); + test_simple_context (); + test_chained_context (); return 0; } diff --git a/test/core/security/base64_test.c b/test/core/security/base64_test.c index 6d49b6d1a1f..a8471c69e31 100644 --- a/test/core/security/base64_test.c +++ b/test/core/security/base64_test.c @@ -40,184 +40,215 @@ #include #include "test/core/util/test_config.h" -static int buffers_are_equal(const unsigned char *buf1, - const unsigned char *buf2, size_t size) { +static int +buffers_are_equal (const unsigned char *buf1, const unsigned char *buf2, size_t size) +{ size_t i; - for (i = 0; i < size; i++) { - if (buf1[i] != buf2[i]) { - gpr_log(GPR_ERROR, "buf1 and buf2 differ: buf1[%d] = %x vs buf2[%d] = %x", - (int)i, buf1[i], (int)i, buf2[i]); - return 0; + for (i = 0; i < size; i++) + { + if (buf1[i] != buf2[i]) + { + gpr_log (GPR_ERROR, "buf1 and buf2 differ: buf1[%d] = %x vs buf2[%d] = %x", (int) i, buf1[i], (int) i, buf2[i]); + return 0; + } } - } return 1; } -static void test_simple_encode_decode_b64(int url_safe, int multiline) { + +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); - gpr_slice hello_slice = grpc_base64_decode(hello_b64, url_safe); - GPR_ASSERT(GPR_SLICE_LENGTH(hello_slice) == strlen(hello)); - GPR_ASSERT(strncmp((const char *)GPR_SLICE_START_PTR(hello_slice), hello, - GPR_SLICE_LENGTH(hello_slice)) == 0); - - gpr_slice_unref(hello_slice); - gpr_free(hello_b64); + char *hello_b64 = grpc_base64_encode (hello, strlen (hello), url_safe, multiline); + gpr_slice hello_slice = grpc_base64_decode (hello_b64, url_safe); + GPR_ASSERT (GPR_SLICE_LENGTH (hello_slice) == strlen (hello)); + GPR_ASSERT (strncmp ((const char *) GPR_SLICE_START_PTR (hello_slice), hello, GPR_SLICE_LENGTH (hello_slice)) == 0); + + gpr_slice_unref (hello_slice); + gpr_free (hello_b64); } -static void test_full_range_encode_decode_b64(int url_safe, int multiline) { +static void +test_full_range_encode_decode_b64 (int url_safe, int multiline) +{ unsigned char orig[256]; size_t i; char *b64; gpr_slice orig_decoded; - for (i = 0; i < sizeof(orig); i++) orig[i] = (gpr_uint8)i; + for (i = 0; i < sizeof (orig); i++) + orig[i] = (gpr_uint8) i; /* Try all the different paddings. */ - for (i = 0; i < 3; i++) { - b64 = grpc_base64_encode(orig, sizeof(orig) - i, url_safe, multiline); - orig_decoded = grpc_base64_decode(b64, url_safe); - GPR_ASSERT(GPR_SLICE_LENGTH(orig_decoded) == (sizeof(orig) - i)); - GPR_ASSERT(buffers_are_equal(orig, GPR_SLICE_START_PTR(orig_decoded), - sizeof(orig) - i)); - gpr_slice_unref(orig_decoded); - gpr_free(b64); - } + for (i = 0; i < 3; i++) + { + b64 = grpc_base64_encode (orig, sizeof (orig) - i, url_safe, multiline); + orig_decoded = grpc_base64_decode (b64, url_safe); + GPR_ASSERT (GPR_SLICE_LENGTH (orig_decoded) == (sizeof (orig) - i)); + GPR_ASSERT (buffers_are_equal (orig, GPR_SLICE_START_PTR (orig_decoded), sizeof (orig) - i)); + gpr_slice_unref (orig_decoded); + gpr_free (b64); + } } -static void test_simple_encode_decode_b64_no_multiline(void) { - test_simple_encode_decode_b64(0, 0); +static void +test_simple_encode_decode_b64_no_multiline (void) +{ + test_simple_encode_decode_b64 (0, 0); } -static void test_simple_encode_decode_b64_multiline(void) { - test_simple_encode_decode_b64(0, 1); +static void +test_simple_encode_decode_b64_multiline (void) +{ + test_simple_encode_decode_b64 (0, 1); } -static void test_simple_encode_decode_b64_urlsafe_no_multiline(void) { - test_simple_encode_decode_b64(1, 0); +static void +test_simple_encode_decode_b64_urlsafe_no_multiline (void) +{ + test_simple_encode_decode_b64 (1, 0); } -static void test_simple_encode_decode_b64_urlsafe_multiline(void) { - test_simple_encode_decode_b64(1, 1); +static void +test_simple_encode_decode_b64_urlsafe_multiline (void) +{ + test_simple_encode_decode_b64 (1, 1); } -static void test_full_range_encode_decode_b64_no_multiline(void) { - test_full_range_encode_decode_b64(0, 0); +static void +test_full_range_encode_decode_b64_no_multiline (void) +{ + test_full_range_encode_decode_b64 (0, 0); } -static void test_full_range_encode_decode_b64_multiline(void) { - test_full_range_encode_decode_b64(0, 1); +static void +test_full_range_encode_decode_b64_multiline (void) +{ + test_full_range_encode_decode_b64 (0, 1); } -static void test_full_range_encode_decode_b64_urlsafe_no_multiline(void) { - test_full_range_encode_decode_b64(1, 0); +static void +test_full_range_encode_decode_b64_urlsafe_no_multiline (void) +{ + test_full_range_encode_decode_b64 (1, 0); } -static void test_full_range_encode_decode_b64_urlsafe_multiline(void) { - test_full_range_encode_decode_b64(1, 1); +static void +test_full_range_encode_decode_b64_urlsafe_multiline (void) +{ + test_full_range_encode_decode_b64 (1, 1); } -static void test_url_safe_unsafe_mismtach_failure(void) { +static void +test_url_safe_unsafe_mismtach_failure (void) +{ unsigned char orig[256]; size_t i; char *b64; gpr_slice orig_decoded; int url_safe = 1; - for (i = 0; i < sizeof(orig); i++) orig[i] = (gpr_uint8)i; - - b64 = grpc_base64_encode(orig, sizeof(orig), url_safe, 0); - orig_decoded = grpc_base64_decode(b64, !url_safe); - GPR_ASSERT(GPR_SLICE_IS_EMPTY(orig_decoded)); - gpr_free(b64); - gpr_slice_unref(orig_decoded); - - b64 = grpc_base64_encode(orig, sizeof(orig), !url_safe, 0); - orig_decoded = grpc_base64_decode(b64, url_safe); - GPR_ASSERT(GPR_SLICE_IS_EMPTY(orig_decoded)); - gpr_free(b64); - gpr_slice_unref(orig_decoded); + for (i = 0; i < sizeof (orig); i++) + orig[i] = (gpr_uint8) i; + + b64 = grpc_base64_encode (orig, sizeof (orig), url_safe, 0); + orig_decoded = grpc_base64_decode (b64, !url_safe); + GPR_ASSERT (GPR_SLICE_IS_EMPTY (orig_decoded)); + gpr_free (b64); + gpr_slice_unref (orig_decoded); + + b64 = grpc_base64_encode (orig, sizeof (orig), !url_safe, 0); + orig_decoded = grpc_base64_decode (b64, url_safe); + GPR_ASSERT (GPR_SLICE_IS_EMPTY (orig_decoded)); + gpr_free (b64); + gpr_slice_unref (orig_decoded); } -static void test_rfc4648_test_vectors(void) { +static void +test_rfc4648_test_vectors (void) +{ char *b64; - b64 = grpc_base64_encode("", 0, 0, 0); - GPR_ASSERT(strcmp("", b64) == 0); - gpr_free(b64); + b64 = grpc_base64_encode ("", 0, 0, 0); + GPR_ASSERT (strcmp ("", b64) == 0); + gpr_free (b64); - b64 = grpc_base64_encode("f", 1, 0, 0); - GPR_ASSERT(strcmp("Zg==", b64) == 0); - gpr_free(b64); + b64 = grpc_base64_encode ("f", 1, 0, 0); + GPR_ASSERT (strcmp ("Zg==", b64) == 0); + gpr_free (b64); - b64 = grpc_base64_encode("fo", 2, 0, 0); - GPR_ASSERT(strcmp("Zm8=", b64) == 0); - gpr_free(b64); + b64 = grpc_base64_encode ("fo", 2, 0, 0); + GPR_ASSERT (strcmp ("Zm8=", b64) == 0); + gpr_free (b64); - b64 = grpc_base64_encode("foo", 3, 0, 0); - GPR_ASSERT(strcmp("Zm9v", b64) == 0); - gpr_free(b64); + b64 = grpc_base64_encode ("foo", 3, 0, 0); + GPR_ASSERT (strcmp ("Zm9v", b64) == 0); + gpr_free (b64); - b64 = grpc_base64_encode("foob", 4, 0, 0); - GPR_ASSERT(strcmp("Zm9vYg==", b64) == 0); - gpr_free(b64); + b64 = grpc_base64_encode ("foob", 4, 0, 0); + GPR_ASSERT (strcmp ("Zm9vYg==", b64) == 0); + gpr_free (b64); - b64 = grpc_base64_encode("fooba", 5, 0, 0); - GPR_ASSERT(strcmp("Zm9vYmE=", b64) == 0); - gpr_free(b64); + b64 = grpc_base64_encode ("fooba", 5, 0, 0); + GPR_ASSERT (strcmp ("Zm9vYmE=", b64) == 0); + gpr_free (b64); - b64 = grpc_base64_encode("foobar", 6, 0, 0); - GPR_ASSERT(strcmp("Zm9vYmFy", b64) == 0); - gpr_free(b64); + b64 = grpc_base64_encode ("foobar", 6, 0, 0); + GPR_ASSERT (strcmp ("Zm9vYmFy", b64) == 0); + gpr_free (b64); } -static void test_unpadded_decode(void) { +static void +test_unpadded_decode (void) +{ gpr_slice decoded; - decoded = grpc_base64_decode("Zm9vYmFy", 0); - GPR_ASSERT(!GPR_SLICE_IS_EMPTY(decoded)); - GPR_ASSERT(gpr_slice_str_cmp(decoded, "foobar") == 0); - gpr_slice_unref(decoded); - - decoded = grpc_base64_decode("Zm9vYmE", 0); - GPR_ASSERT(!GPR_SLICE_IS_EMPTY(decoded)); - GPR_ASSERT(gpr_slice_str_cmp(decoded, "fooba") == 0); - gpr_slice_unref(decoded); - - decoded = grpc_base64_decode("Zm9vYg", 0); - GPR_ASSERT(!GPR_SLICE_IS_EMPTY(decoded)); - GPR_ASSERT(gpr_slice_str_cmp(decoded, "foob") == 0); - gpr_slice_unref(decoded); - - decoded = grpc_base64_decode("Zm9v", 0); - GPR_ASSERT(!GPR_SLICE_IS_EMPTY(decoded)); - GPR_ASSERT(gpr_slice_str_cmp(decoded, "foo") == 0); - gpr_slice_unref(decoded); - - decoded = grpc_base64_decode("Zm8", 0); - GPR_ASSERT(!GPR_SLICE_IS_EMPTY(decoded)); - GPR_ASSERT(gpr_slice_str_cmp(decoded, "fo") == 0); - gpr_slice_unref(decoded); - - decoded = grpc_base64_decode("Zg", 0); - GPR_ASSERT(!GPR_SLICE_IS_EMPTY(decoded)); - GPR_ASSERT(gpr_slice_str_cmp(decoded, "f") == 0); - gpr_slice_unref(decoded); - - decoded = grpc_base64_decode("", 0); - GPR_ASSERT(GPR_SLICE_IS_EMPTY(decoded)); + decoded = grpc_base64_decode ("Zm9vYmFy", 0); + GPR_ASSERT (!GPR_SLICE_IS_EMPTY (decoded)); + GPR_ASSERT (gpr_slice_str_cmp (decoded, "foobar") == 0); + gpr_slice_unref (decoded); + + decoded = grpc_base64_decode ("Zm9vYmE", 0); + GPR_ASSERT (!GPR_SLICE_IS_EMPTY (decoded)); + GPR_ASSERT (gpr_slice_str_cmp (decoded, "fooba") == 0); + gpr_slice_unref (decoded); + + decoded = grpc_base64_decode ("Zm9vYg", 0); + GPR_ASSERT (!GPR_SLICE_IS_EMPTY (decoded)); + GPR_ASSERT (gpr_slice_str_cmp (decoded, "foob") == 0); + gpr_slice_unref (decoded); + + decoded = grpc_base64_decode ("Zm9v", 0); + GPR_ASSERT (!GPR_SLICE_IS_EMPTY (decoded)); + GPR_ASSERT (gpr_slice_str_cmp (decoded, "foo") == 0); + gpr_slice_unref (decoded); + + decoded = grpc_base64_decode ("Zm8", 0); + GPR_ASSERT (!GPR_SLICE_IS_EMPTY (decoded)); + GPR_ASSERT (gpr_slice_str_cmp (decoded, "fo") == 0); + gpr_slice_unref (decoded); + + decoded = grpc_base64_decode ("Zg", 0); + GPR_ASSERT (!GPR_SLICE_IS_EMPTY (decoded)); + GPR_ASSERT (gpr_slice_str_cmp (decoded, "f") == 0); + gpr_slice_unref (decoded); + + decoded = grpc_base64_decode ("", 0); + GPR_ASSERT (GPR_SLICE_IS_EMPTY (decoded)); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_simple_encode_decode_b64_no_multiline(); - test_simple_encode_decode_b64_multiline(); - test_simple_encode_decode_b64_urlsafe_no_multiline(); - test_simple_encode_decode_b64_urlsafe_multiline(); - test_full_range_encode_decode_b64_no_multiline(); - test_full_range_encode_decode_b64_multiline(); - test_full_range_encode_decode_b64_urlsafe_no_multiline(); - test_full_range_encode_decode_b64_urlsafe_multiline(); - test_url_safe_unsafe_mismtach_failure(); - test_rfc4648_test_vectors(); - test_unpadded_decode(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_simple_encode_decode_b64_no_multiline (); + test_simple_encode_decode_b64_multiline (); + test_simple_encode_decode_b64_urlsafe_no_multiline (); + test_simple_encode_decode_b64_urlsafe_multiline (); + test_full_range_encode_decode_b64_no_multiline (); + test_full_range_encode_decode_b64_multiline (); + test_full_range_encode_decode_b64_urlsafe_no_multiline (); + test_full_range_encode_decode_b64_urlsafe_multiline (); + test_url_safe_unsafe_mismtach_failure (); + test_rfc4648_test_vectors (); + test_unpadded_decode (); return 0; } diff --git a/test/core/security/create_jwt.c b/test/core/security/create_jwt.c index b02469fb351..47cc26cefa0 100644 --- a/test/core/security/create_jwt.c +++ b/test/core/security/create_jwt.c @@ -43,68 +43,69 @@ #include #include -void create_jwt(const char *json_key_file_path, const char *service_url, - const char *scope) { +void +create_jwt (const char *json_key_file_path, const char *service_url, const char *scope) +{ grpc_auth_json_key key; int ok = 0; char *jwt; - gpr_slice json_key_data = gpr_load_file(json_key_file_path, 1, &ok); - if (!ok) { - fprintf(stderr, "Could not read %s.\n", json_key_file_path); - exit(1); - } - key = grpc_auth_json_key_create_from_string( - (const char *)GPR_SLICE_START_PTR(json_key_data)); - gpr_slice_unref(json_key_data); - if (!grpc_auth_json_key_is_valid(&key)) { - fprintf(stderr, "Could not parse json key.\n"); - exit(1); - } - jwt = grpc_jwt_encode_and_sign( - &key, service_url == NULL ? GRPC_JWT_OAUTH2_AUDIENCE : service_url, - grpc_max_auth_token_lifetime, scope); - grpc_auth_json_key_destruct(&key); - if (jwt == NULL) { - fprintf(stderr, "Could not create JWT.\n"); - exit(1); - } - fprintf(stdout, "%s\n", jwt); - gpr_free(jwt); + gpr_slice json_key_data = gpr_load_file (json_key_file_path, 1, &ok); + if (!ok) + { + fprintf (stderr, "Could not read %s.\n", json_key_file_path); + exit (1); + } + key = grpc_auth_json_key_create_from_string ((const char *) GPR_SLICE_START_PTR (json_key_data)); + gpr_slice_unref (json_key_data); + if (!grpc_auth_json_key_is_valid (&key)) + { + fprintf (stderr, "Could not parse json key.\n"); + exit (1); + } + jwt = grpc_jwt_encode_and_sign (&key, service_url == NULL ? GRPC_JWT_OAUTH2_AUDIENCE : service_url, grpc_max_auth_token_lifetime, scope); + grpc_auth_json_key_destruct (&key); + if (jwt == NULL) + { + fprintf (stderr, "Could not create JWT.\n"); + exit (1); + } + fprintf (stdout, "%s\n", jwt); + gpr_free (jwt); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ char *scope = NULL; char *json_key_file_path = NULL; char *service_url = NULL; - gpr_cmdline *cl = gpr_cmdline_create("create_jwt"); - gpr_cmdline_add_string(cl, "json_key", "File path of the json key.", - &json_key_file_path); - gpr_cmdline_add_string(cl, "scope", - "OPTIONAL Space delimited permissions. Mutually " - "exclusive with service_url", - &scope); - gpr_cmdline_add_string(cl, "service_url", - "OPTIONAL service URL. Mutually exclusive with scope.", - &service_url); - gpr_cmdline_parse(cl, argc, argv); + gpr_cmdline *cl = gpr_cmdline_create ("create_jwt"); + gpr_cmdline_add_string (cl, "json_key", "File path of the json key.", &json_key_file_path); + gpr_cmdline_add_string (cl, "scope", "OPTIONAL Space delimited permissions. Mutually " "exclusive with service_url", &scope); + gpr_cmdline_add_string (cl, "service_url", "OPTIONAL service URL. Mutually exclusive with scope.", &service_url); + gpr_cmdline_parse (cl, argc, argv); - if (json_key_file_path == NULL) { - fprintf(stderr, "Missing --json_key option.\n"); - exit(1); - } - if (scope != NULL) { - if (service_url != NULL) { - fprintf(stderr, - "Options --scope and --service_url are mutually exclusive.\n"); - exit(1); + if (json_key_file_path == NULL) + { + fprintf (stderr, "Missing --json_key option.\n"); + exit (1); + } + if (scope != NULL) + { + if (service_url != NULL) + { + fprintf (stderr, "Options --scope and --service_url are mutually exclusive.\n"); + exit (1); + } + } + else if (service_url == NULL) + { + fprintf (stderr, "Need one of --service_url or --scope options.\n"); + exit (1); } - } else if (service_url == NULL) { - fprintf(stderr, "Need one of --service_url or --scope options.\n"); - exit(1); - } - create_jwt(json_key_file_path, service_url, scope); + create_jwt (json_key_file_path, service_url, scope); - gpr_cmdline_destroy(cl); + gpr_cmdline_destroy (cl); return 0; } diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index e48aab95fa4..6769de1a60c 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -52,897 +52,797 @@ static const char test_google_iam_authorization_token[] = "blahblahblhahb"; static const char test_google_iam_authority_selector[] = "respectmyauthoritah"; -static const char test_oauth2_bearer_token[] = - "Bearer blaaslkdjfaslkdfasdsfasf"; +static const char test_oauth2_bearer_token[] = "Bearer blaaslkdjfaslkdfasdsfasf"; static const char test_root_cert[] = "I am the root!"; /* This JSON key was generated with the GCE console and revoked immediately. The identifiers have been changed as well. Maximum size for a string literal is 509 chars in C89, yay! */ -static const char test_json_key_str_part1[] = - "{ \"private_key\": \"-----BEGIN PRIVATE KEY-----" - "\\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOEvJsnoHnyHkXcp\\n7mJE" - "qg" - "WGjiw71NfXByguekSKho65FxaGbsnSM9SMQAqVk7Q2rG+I0OpsT0LrWQtZ\\nyjSeg/" - "rWBQvS4hle4LfijkP3J5BG+" - "IXDMP8RfziNRQsenAXDNPkY4kJCvKux2xdD\\nOnVF6N7dL3nTYZg+" - "uQrNsMTz9UxVAgMBAAECgYEAzbLewe1xe9vy+2GoSsfib+28\\nDZgSE6Bu/" - "zuFoPrRc6qL9p2SsnV7txrunTyJkkOnPLND9ABAXybRTlcVKP/sGgza\\n/" - "8HpCqFYM9V8f34SBWfD4fRFT+n/" - "73cfRUtGXdXpseva2lh8RilIQfPhNZAncenU\\ngqXjDvpkypEusgXAykECQQD+"; -static const char test_json_key_str_part2[] = - "53XxNVnxBHsYb+AYEfklR96yVi8HywjVHP34+OQZ\\nCslxoHQM8s+" - "dBnjfScLu22JqkPv04xyxmt0QAKm9+vTdAkEA4ib7YvEAn2jXzcCI\\nEkoy2L/" - "XydR1GCHoacdfdAwiL2npOdnbvi4ZmdYRPY1LSTO058tQHKVXV7NLeCa3\\nAARh2QJBAMKeDA" - "G" - "W303SQv2cZTdbeaLKJbB5drz3eo3j7dDKjrTD9JupixFbzcGw\\n8FZi5c8idxiwC36kbAL6Hz" - "A" - "ZoX+ofI0CQE6KCzPJTtYNqyShgKAZdJ8hwOcvCZtf\\n6z8RJm0+" - "6YBd38lfh5j8mZd7aHFf6I17j5AQY7oPEc47TjJj/" - "5nZ68ECQQDvYuI3\\nLyK5fS8g0SYbmPOL9TlcHDOqwG0mrX9qpg5DC2fniXNSrrZ64GTDKdzZ" - "Y" - "Ap6LI9W\\nIqv4vr6y38N79TTC\\n-----END PRIVATE KEY-----\\n\", "; -static const char test_json_key_str_part3[] = - "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " - "\"client_email\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." - "com\", \"client_id\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." - "com\", \"type\": \"service_account\" }"; +static const char test_json_key_str_part1[] = "{ \"private_key\": \"-----BEGIN PRIVATE KEY-----" "\\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOEvJsnoHnyHkXcp\\n7mJE" "qg" "WGjiw71NfXByguekSKho65FxaGbsnSM9SMQAqVk7Q2rG+I0OpsT0LrWQtZ\\nyjSeg/" "rWBQvS4hle4LfijkP3J5BG+" "IXDMP8RfziNRQsenAXDNPkY4kJCvKux2xdD\\nOnVF6N7dL3nTYZg+" "uQrNsMTz9UxVAgMBAAECgYEAzbLewe1xe9vy+2GoSsfib+28\\nDZgSE6Bu/" "zuFoPrRc6qL9p2SsnV7txrunTyJkkOnPLND9ABAXybRTlcVKP/sGgza\\n/" "8HpCqFYM9V8f34SBWfD4fRFT+n/" "73cfRUtGXdXpseva2lh8RilIQfPhNZAncenU\\ngqXjDvpkypEusgXAykECQQD+"; +static const char test_json_key_str_part2[] = "53XxNVnxBHsYb+AYEfklR96yVi8HywjVHP34+OQZ\\nCslxoHQM8s+" "dBnjfScLu22JqkPv04xyxmt0QAKm9+vTdAkEA4ib7YvEAn2jXzcCI\\nEkoy2L/" "XydR1GCHoacdfdAwiL2npOdnbvi4ZmdYRPY1LSTO058tQHKVXV7NLeCa3\\nAARh2QJBAMKeDA" "G" "W303SQv2cZTdbeaLKJbB5drz3eo3j7dDKjrTD9JupixFbzcGw\\n8FZi5c8idxiwC36kbAL6Hz" "A" "ZoX+ofI0CQE6KCzPJTtYNqyShgKAZdJ8hwOcvCZtf\\n6z8RJm0+" "6YBd38lfh5j8mZd7aHFf6I17j5AQY7oPEc47TjJj/" "5nZ68ECQQDvYuI3\\nLyK5fS8g0SYbmPOL9TlcHDOqwG0mrX9qpg5DC2fniXNSrrZ64GTDKdzZ" "Y" "Ap6LI9W\\nIqv4vr6y38N79TTC\\n-----END PRIVATE KEY-----\\n\", "; +static const char test_json_key_str_part3[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; /* Test refresh token. */ -static const char test_refresh_token_str[] = - "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," - " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," - " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," - " \"type\": \"authorized_user\"}"; +static const char test_refresh_token_str[] = "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," " \"type\": \"authorized_user\"}"; -static const char valid_oauth2_json_response[] = - "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," - " \"expires_in\":3599, " - " \"token_type\":\"Bearer\"}"; +static const char valid_oauth2_json_response[] = "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," " \"expires_in\":3599, " " \"token_type\":\"Bearer\"}"; static const char test_user_data[] = "user data"; static const char test_scope[] = "perm1 perm2"; -static const char test_signed_jwt[] = - "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6ImY0OTRkN2M1YWU2MGRmOTcyNmM4YW" - "U0MDcyZTViYTdmZDkwODg2YzcifQ"; +static const char test_signed_jwt[] = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6ImY0OTRkN2M1YWU2MGRmOTcyNmM4YW" "U0MDcyZTViYTdmZDkwODg2YzcifQ"; static const char test_service_url[] = "https://foo.com/foo.v1"; static const char other_test_service_url[] = "https://bar.com/bar.v1"; -static char *test_json_key_str(void) { - size_t result_len = strlen(test_json_key_str_part1) + - strlen(test_json_key_str_part2) + - strlen(test_json_key_str_part3); - char *result = gpr_malloc(result_len + 1); +static char * +test_json_key_str (void) +{ + size_t result_len = strlen (test_json_key_str_part1) + strlen (test_json_key_str_part2) + strlen (test_json_key_str_part3); + char *result = gpr_malloc (result_len + 1); char *current = result; - strcpy(result, test_json_key_str_part1); - current += strlen(test_json_key_str_part1); - strcpy(current, test_json_key_str_part2); - current += strlen(test_json_key_str_part2); - strcpy(current, test_json_key_str_part3); + strcpy (result, test_json_key_str_part1); + current += strlen (test_json_key_str_part1); + strcpy (current, test_json_key_str_part2); + current += strlen (test_json_key_str_part2); + strcpy (current, test_json_key_str_part3); return result; } -typedef struct { +typedef struct +{ const char *key; const char *value; } expected_md; -static grpc_httpcli_response http_response(int status, const char *body) { +static grpc_httpcli_response +http_response (int status, const char *body) +{ grpc_httpcli_response response; - memset(&response, 0, sizeof(grpc_httpcli_response)); + memset (&response, 0, sizeof (grpc_httpcli_response)); response.status = status; - response.body = (char *)body; - response.body_length = strlen(body); + response.body = (char *) body; + response.body_length = strlen (body); return response; } -static void test_empty_md_store(void) { - grpc_credentials_md_store *store = grpc_credentials_md_store_create(0); - GPR_ASSERT(store->num_entries == 0); - GPR_ASSERT(store->allocated == 0); - grpc_credentials_md_store_unref(store); -} - -static void test_ref_unref_empty_md_store(void) { - grpc_credentials_md_store *store = grpc_credentials_md_store_create(0); - grpc_credentials_md_store_ref(store); - grpc_credentials_md_store_ref(store); - GPR_ASSERT(store->num_entries == 0); - GPR_ASSERT(store->allocated == 0); - grpc_credentials_md_store_unref(store); - grpc_credentials_md_store_unref(store); - grpc_credentials_md_store_unref(store); -} - -static void test_add_to_empty_md_store(void) { - grpc_credentials_md_store *store = grpc_credentials_md_store_create(0); +static void +test_empty_md_store (void) +{ + grpc_credentials_md_store *store = grpc_credentials_md_store_create (0); + GPR_ASSERT (store->num_entries == 0); + GPR_ASSERT (store->allocated == 0); + grpc_credentials_md_store_unref (store); +} + +static void +test_ref_unref_empty_md_store (void) +{ + grpc_credentials_md_store *store = grpc_credentials_md_store_create (0); + grpc_credentials_md_store_ref (store); + grpc_credentials_md_store_ref (store); + GPR_ASSERT (store->num_entries == 0); + GPR_ASSERT (store->allocated == 0); + grpc_credentials_md_store_unref (store); + grpc_credentials_md_store_unref (store); + grpc_credentials_md_store_unref (store); +} + +static void +test_add_to_empty_md_store (void) +{ + grpc_credentials_md_store *store = grpc_credentials_md_store_create (0); const char *key_str = "hello"; const char *value_str = "there blah blah blah blah blah blah blah"; - gpr_slice key = gpr_slice_from_copied_string(key_str); - gpr_slice value = gpr_slice_from_copied_string(value_str); - grpc_credentials_md_store_add(store, key, value); - GPR_ASSERT(store->num_entries == 1); - GPR_ASSERT(gpr_slice_cmp(key, store->entries[0].key) == 0); - GPR_ASSERT(gpr_slice_cmp(value, store->entries[0].value) == 0); - gpr_slice_unref(key); - gpr_slice_unref(value); - grpc_credentials_md_store_unref(store); -} - -static void test_add_cstrings_to_empty_md_store(void) { - grpc_credentials_md_store *store = grpc_credentials_md_store_create(0); + gpr_slice key = gpr_slice_from_copied_string (key_str); + gpr_slice value = gpr_slice_from_copied_string (value_str); + grpc_credentials_md_store_add (store, key, value); + GPR_ASSERT (store->num_entries == 1); + GPR_ASSERT (gpr_slice_cmp (key, store->entries[0].key) == 0); + GPR_ASSERT (gpr_slice_cmp (value, store->entries[0].value) == 0); + gpr_slice_unref (key); + gpr_slice_unref (value); + grpc_credentials_md_store_unref (store); +} + +static void +test_add_cstrings_to_empty_md_store (void) +{ + grpc_credentials_md_store *store = grpc_credentials_md_store_create (0); const char *key_str = "hello"; const char *value_str = "there blah blah blah blah blah blah blah"; - grpc_credentials_md_store_add_cstrings(store, key_str, value_str); - GPR_ASSERT(store->num_entries == 1); - GPR_ASSERT(gpr_slice_str_cmp(store->entries[0].key, key_str) == 0); - GPR_ASSERT(gpr_slice_str_cmp(store->entries[0].value, value_str) == 0); - grpc_credentials_md_store_unref(store); -} - -static void test_empty_preallocated_md_store(void) { - grpc_credentials_md_store *store = grpc_credentials_md_store_create(4); - GPR_ASSERT(store->num_entries == 0); - GPR_ASSERT(store->allocated == 4); - GPR_ASSERT(store->entries != NULL); - grpc_credentials_md_store_unref(store); -} - -static void test_add_abunch_to_md_store(void) { - grpc_credentials_md_store *store = grpc_credentials_md_store_create(4); + grpc_credentials_md_store_add_cstrings (store, key_str, value_str); + GPR_ASSERT (store->num_entries == 1); + GPR_ASSERT (gpr_slice_str_cmp (store->entries[0].key, key_str) == 0); + GPR_ASSERT (gpr_slice_str_cmp (store->entries[0].value, value_str) == 0); + grpc_credentials_md_store_unref (store); +} + +static void +test_empty_preallocated_md_store (void) +{ + grpc_credentials_md_store *store = grpc_credentials_md_store_create (4); + GPR_ASSERT (store->num_entries == 0); + GPR_ASSERT (store->allocated == 4); + GPR_ASSERT (store->entries != NULL); + grpc_credentials_md_store_unref (store); +} + +static void +test_add_abunch_to_md_store (void) +{ + grpc_credentials_md_store *store = grpc_credentials_md_store_create (4); size_t num_entries = 1000; const char *key_str = "hello"; const char *value_str = "there blah blah blah blah blah blah blah"; size_t i; - for (i = 0; i < num_entries; i++) { - grpc_credentials_md_store_add_cstrings(store, key_str, value_str); - } - for (i = 0; i < num_entries; i++) { - GPR_ASSERT(gpr_slice_str_cmp(store->entries[i].key, key_str) == 0); - GPR_ASSERT(gpr_slice_str_cmp(store->entries[i].value, value_str) == 0); - } - grpc_credentials_md_store_unref(store); + for (i = 0; i < num_entries; i++) + { + grpc_credentials_md_store_add_cstrings (store, key_str, value_str); + } + for (i = 0; i < num_entries; i++) + { + GPR_ASSERT (gpr_slice_str_cmp (store->entries[i].key, key_str) == 0); + GPR_ASSERT (gpr_slice_str_cmp (store->entries[i].value, value_str) == 0); + } + grpc_credentials_md_store_unref (store); } -static void test_oauth2_token_fetcher_creds_parsing_ok(void) { +static void +test_oauth2_token_fetcher_creds_parsing_ok (void) +{ grpc_credentials_md_store *token_md = NULL; gpr_timespec 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); - GPR_ASSERT(token_lifetime.tv_sec == 3599); - GPR_ASSERT(token_lifetime.tv_nsec == 0); - GPR_ASSERT(token_md->num_entries == 1); - GPR_ASSERT(gpr_slice_str_cmp(token_md->entries[0].key, "Authorization") == 0); - GPR_ASSERT(gpr_slice_str_cmp(token_md->entries[0].value, - "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_") == - 0); - grpc_credentials_md_store_unref(token_md); -} - -static void test_oauth2_token_fetcher_creds_parsing_bad_http_status(void) { + 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); + GPR_ASSERT (token_lifetime.tv_sec == 3599); + GPR_ASSERT (token_lifetime.tv_nsec == 0); + GPR_ASSERT (token_md->num_entries == 1); + GPR_ASSERT (gpr_slice_str_cmp (token_md->entries[0].key, "Authorization") == 0); + GPR_ASSERT (gpr_slice_str_cmp (token_md->entries[0].value, "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_") == 0); + grpc_credentials_md_store_unref (token_md); +} + +static void +test_oauth2_token_fetcher_creds_parsing_bad_http_status (void) +{ grpc_credentials_md_store *token_md = NULL; gpr_timespec 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) == - GRPC_CREDENTIALS_ERROR); + 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) == GRPC_CREDENTIALS_ERROR); } -static void test_oauth2_token_fetcher_creds_parsing_empty_http_body(void) { +static void +test_oauth2_token_fetcher_creds_parsing_empty_http_body (void) +{ grpc_credentials_md_store *token_md = NULL; gpr_timespec token_lifetime; - grpc_httpcli_response response = http_response(200, ""); - GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &response, &token_md, &token_lifetime) == - GRPC_CREDENTIALS_ERROR); + grpc_httpcli_response response = http_response (200, ""); + GPR_ASSERT (grpc_oauth2_token_fetcher_credentials_parse_server_response (&response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); } -static void test_oauth2_token_fetcher_creds_parsing_invalid_json(void) { +static void +test_oauth2_token_fetcher_creds_parsing_invalid_json (void) +{ grpc_credentials_md_store *token_md = NULL; gpr_timespec token_lifetime; - grpc_httpcli_response response = - http_response(200, - "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," - " \"expires_in\":3599, " - " \"token_type\":\"Bearer\""); - GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &response, &token_md, &token_lifetime) == - GRPC_CREDENTIALS_ERROR); + grpc_httpcli_response response = http_response (200, + "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," " \"expires_in\":3599, " " \"token_type\":\"Bearer\""); + GPR_ASSERT (grpc_oauth2_token_fetcher_credentials_parse_server_response (&response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); } -static void test_oauth2_token_fetcher_creds_parsing_missing_token(void) { +static void +test_oauth2_token_fetcher_creds_parsing_missing_token (void) +{ grpc_credentials_md_store *token_md = NULL; gpr_timespec token_lifetime; - grpc_httpcli_response response = http_response(200, - "{" - " \"expires_in\":3599, " - " \"token_type\":\"Bearer\"}"); - GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &response, &token_md, &token_lifetime) == - GRPC_CREDENTIALS_ERROR); + grpc_httpcli_response response = http_response (200, + "{" " \"expires_in\":3599, " " \"token_type\":\"Bearer\"}"); + GPR_ASSERT (grpc_oauth2_token_fetcher_credentials_parse_server_response (&response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); } -static void test_oauth2_token_fetcher_creds_parsing_missing_token_type(void) { +static void +test_oauth2_token_fetcher_creds_parsing_missing_token_type (void) +{ grpc_credentials_md_store *token_md = NULL; gpr_timespec token_lifetime; - grpc_httpcli_response response = - http_response(200, - "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," - " \"expires_in\":3599, " - "}"); - GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &response, &token_md, &token_lifetime) == - GRPC_CREDENTIALS_ERROR); -} - -static void test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime( - void) { + grpc_httpcli_response response = http_response (200, + "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," " \"expires_in\":3599, " "}"); + GPR_ASSERT (grpc_oauth2_token_fetcher_credentials_parse_server_response (&response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); +} + +static void +test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime (void) +{ grpc_credentials_md_store *token_md = NULL; gpr_timespec token_lifetime; - grpc_httpcli_response response = - http_response(200, - "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," - " \"token_type\":\"Bearer\"}"); - GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &response, &token_md, &token_lifetime) == - GRPC_CREDENTIALS_ERROR); + grpc_httpcli_response response = http_response (200, + "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," " \"token_type\":\"Bearer\"}"); + GPR_ASSERT (grpc_oauth2_token_fetcher_credentials_parse_server_response (&response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); } -static void check_metadata(expected_md *expected, grpc_credentials_md *md_elems, - size_t num_md) { +static void +check_metadata (expected_md * expected, grpc_credentials_md * md_elems, size_t num_md) +{ size_t i; - for (i = 0; i < num_md; i++) { - size_t j; - for (j = 0; j < num_md; j++) { - if (0 == gpr_slice_str_cmp(md_elems[j].key, expected[i].key)) { - GPR_ASSERT(gpr_slice_str_cmp(md_elems[j].value, expected[i].value) == - 0); - break; - } - } - if (j == num_md) { - gpr_log(GPR_ERROR, "key %s not found", expected[i].key); - GPR_ASSERT(0); + for (i = 0; i < num_md; i++) + { + size_t j; + for (j = 0; j < num_md; j++) + { + if (0 == gpr_slice_str_cmp (md_elems[j].key, expected[i].key)) + { + GPR_ASSERT (gpr_slice_str_cmp (md_elems[j].value, expected[i].value) == 0); + break; + } + } + if (j == num_md) + { + gpr_log (GPR_ERROR, "key %s not found", expected[i].key); + GPR_ASSERT (0); + } } - } -} - -static void check_google_iam_metadata(void *user_data, - grpc_credentials_md *md_elems, - size_t num_md, - grpc_credentials_status status, - grpc_closure_list *closure_list) { - grpc_credentials *c = (grpc_credentials *)user_data; - expected_md emd[] = {{GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, - test_google_iam_authorization_token}, - {GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, - test_google_iam_authority_selector}}; - GPR_ASSERT(status == GRPC_CREDENTIALS_OK); - GPR_ASSERT(num_md == 2); - check_metadata(emd, md_elems, num_md); - grpc_credentials_unref(c); -} - -static void test_google_iam_creds(void) { +} + +static void +check_google_iam_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +{ + grpc_credentials *c = (grpc_credentials *) user_data; + expected_md emd[] = { {GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, + test_google_iam_authorization_token}, + {GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, + test_google_iam_authority_selector} + }; + GPR_ASSERT (status == GRPC_CREDENTIALS_OK); + GPR_ASSERT (num_md == 2); + check_metadata (emd, md_elems, num_md); + grpc_credentials_unref (c); +} + +static void +test_google_iam_creds (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_credentials *creds = grpc_google_iam_credentials_create( - test_google_iam_authorization_token, test_google_iam_authority_selector, - NULL); - GPR_ASSERT(grpc_credentials_has_request_metadata(creds)); - GPR_ASSERT(grpc_credentials_has_request_metadata_only(creds)); - grpc_credentials_get_request_metadata(creds, NULL, test_service_url, - check_google_iam_metadata, creds, - &closure_list); - grpc_closure_list_run(&closure_list); -} - -static void check_access_token_metadata(void *user_data, - grpc_credentials_md *md_elems, - size_t num_md, - grpc_credentials_status status, - grpc_closure_list *closure_list) { - grpc_credentials *c = (grpc_credentials *)user_data; - expected_md emd[] = {{GRPC_AUTHORIZATION_METADATA_KEY, "Bearer blah"}}; - GPR_ASSERT(status == GRPC_CREDENTIALS_OK); - GPR_ASSERT(num_md == 1); - check_metadata(emd, md_elems, num_md); - grpc_credentials_unref(c); -} - -static void test_access_token_creds(void) { + grpc_credentials *creds = grpc_google_iam_credentials_create (test_google_iam_authorization_token, test_google_iam_authority_selector, + NULL); + GPR_ASSERT (grpc_credentials_has_request_metadata (creds)); + GPR_ASSERT (grpc_credentials_has_request_metadata_only (creds)); + grpc_credentials_get_request_metadata (creds, NULL, test_service_url, check_google_iam_metadata, creds, &closure_list); + grpc_closure_list_run (&closure_list); +} + +static void +check_access_token_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +{ + grpc_credentials *c = (grpc_credentials *) user_data; + expected_md emd[] = { {GRPC_AUTHORIZATION_METADATA_KEY, "Bearer blah"} }; + GPR_ASSERT (status == GRPC_CREDENTIALS_OK); + GPR_ASSERT (num_md == 1); + check_metadata (emd, md_elems, num_md); + grpc_credentials_unref (c); +} + +static void +test_access_token_creds (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_credentials *creds = grpc_access_token_credentials_create("blah", NULL); - GPR_ASSERT(grpc_credentials_has_request_metadata(creds)); - GPR_ASSERT(grpc_credentials_has_request_metadata_only(creds)); - GPR_ASSERT(strcmp(creds->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); - grpc_credentials_get_request_metadata(creds, NULL, test_service_url, - check_access_token_metadata, creds, - &closure_list); - grpc_closure_list_run(&closure_list); -} - -static void check_ssl_oauth2_composite_metadata( - void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status, grpc_closure_list *closure_list) { - grpc_credentials *c = (grpc_credentials *)user_data; + grpc_credentials *creds = grpc_access_token_credentials_create ("blah", NULL); + GPR_ASSERT (grpc_credentials_has_request_metadata (creds)); + GPR_ASSERT (grpc_credentials_has_request_metadata_only (creds)); + GPR_ASSERT (strcmp (creds->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); + grpc_credentials_get_request_metadata (creds, NULL, test_service_url, check_access_token_metadata, creds, &closure_list); + grpc_closure_list_run (&closure_list); +} + +static void +check_ssl_oauth2_composite_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +{ + grpc_credentials *c = (grpc_credentials *) user_data; expected_md emd[] = { - {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}}; - GPR_ASSERT(status == GRPC_CREDENTIALS_OK); - GPR_ASSERT(num_md == 1); - check_metadata(emd, md_elems, num_md); - grpc_credentials_unref(c); + {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token} + }; + GPR_ASSERT (status == GRPC_CREDENTIALS_OK); + GPR_ASSERT (num_md == 1); + check_metadata (emd, md_elems, num_md); + grpc_credentials_unref (c); } -static void test_ssl_oauth2_composite_creds(void) { +static void +test_ssl_oauth2_composite_creds (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_credentials *ssl_creds = - grpc_ssl_credentials_create(test_root_cert, NULL, NULL); + grpc_credentials *ssl_creds = grpc_ssl_credentials_create (test_root_cert, NULL, NULL); const grpc_credentials_array *creds_array; - grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create( - "Authorization", test_oauth2_bearer_token, 0); - grpc_credentials *composite_creds = - grpc_composite_credentials_create(ssl_creds, oauth2_creds, NULL); - grpc_credentials_unref(ssl_creds); - grpc_credentials_unref(oauth2_creds); - GPR_ASSERT(strcmp(composite_creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == - 0); - GPR_ASSERT(grpc_credentials_has_request_metadata(composite_creds)); - GPR_ASSERT(!grpc_credentials_has_request_metadata_only(composite_creds)); - creds_array = grpc_composite_credentials_get_credentials(composite_creds); - GPR_ASSERT(creds_array->num_creds == 2); - GPR_ASSERT(strcmp(creds_array->creds_array[0]->type, - GRPC_CREDENTIALS_TYPE_SSL) == 0); - GPR_ASSERT(strcmp(creds_array->creds_array[1]->type, - GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); - grpc_credentials_get_request_metadata(composite_creds, NULL, test_service_url, - check_ssl_oauth2_composite_metadata, - composite_creds, &closure_list); - grpc_closure_list_run(&closure_list); -} - -void test_ssl_fake_transport_security_composite_creds_failure(void) { - grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL); - grpc_credentials *fake_transport_security_creds = - grpc_fake_transport_security_credentials_create(); + grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create ("Authorization", test_oauth2_bearer_token, 0); + grpc_credentials *composite_creds = grpc_composite_credentials_create (ssl_creds, oauth2_creds, NULL); + grpc_credentials_unref (ssl_creds); + grpc_credentials_unref (oauth2_creds); + GPR_ASSERT (strcmp (composite_creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0); + GPR_ASSERT (grpc_credentials_has_request_metadata (composite_creds)); + GPR_ASSERT (!grpc_credentials_has_request_metadata_only (composite_creds)); + creds_array = grpc_composite_credentials_get_credentials (composite_creds); + GPR_ASSERT (creds_array->num_creds == 2); + GPR_ASSERT (strcmp (creds_array->creds_array[0]->type, GRPC_CREDENTIALS_TYPE_SSL) == 0); + GPR_ASSERT (strcmp (creds_array->creds_array[1]->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); + grpc_credentials_get_request_metadata (composite_creds, NULL, test_service_url, check_ssl_oauth2_composite_metadata, composite_creds, &closure_list); + grpc_closure_list_run (&closure_list); +} + +void +test_ssl_fake_transport_security_composite_creds_failure (void) +{ + grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL); + grpc_credentials *fake_transport_security_creds = grpc_fake_transport_security_credentials_create (); /* 2 connector credentials: should not work. */ - GPR_ASSERT(grpc_composite_credentials_create( - ssl_creds, fake_transport_security_creds, NULL) == NULL); - grpc_credentials_unref(ssl_creds); - grpc_credentials_unref(fake_transport_security_creds); + GPR_ASSERT (grpc_composite_credentials_create (ssl_creds, fake_transport_security_creds, NULL) == NULL); + grpc_credentials_unref (ssl_creds); + grpc_credentials_unref (fake_transport_security_creds); } -static void check_ssl_oauth2_google_iam_composite_metadata( - void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status, grpc_closure_list *closure_list) { - grpc_credentials *c = (grpc_credentials *)user_data; +static void +check_ssl_oauth2_google_iam_composite_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +{ + grpc_credentials *c = (grpc_credentials *) user_data; expected_md emd[] = { - {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}, - {GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, - test_google_iam_authorization_token}, - {GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, - test_google_iam_authority_selector}}; - GPR_ASSERT(status == GRPC_CREDENTIALS_OK); - GPR_ASSERT(num_md == 3); - check_metadata(emd, md_elems, num_md); - grpc_credentials_unref(c); -} - -static void test_ssl_oauth2_google_iam_composite_creds(void) { + {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}, + {GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, + test_google_iam_authorization_token}, + {GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, + test_google_iam_authority_selector} + }; + GPR_ASSERT (status == GRPC_CREDENTIALS_OK); + GPR_ASSERT (num_md == 3); + check_metadata (emd, md_elems, num_md); + grpc_credentials_unref (c); +} + +static void +test_ssl_oauth2_google_iam_composite_creds (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_credentials *ssl_creds = - grpc_ssl_credentials_create(test_root_cert, NULL, NULL); + grpc_credentials *ssl_creds = grpc_ssl_credentials_create (test_root_cert, NULL, NULL); const grpc_credentials_array *creds_array; - grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create( - "Authorization", test_oauth2_bearer_token, 0); - grpc_credentials *aux_creds = - grpc_composite_credentials_create(ssl_creds, oauth2_creds, NULL); - grpc_credentials *google_iam_creds = grpc_google_iam_credentials_create( - test_google_iam_authorization_token, test_google_iam_authority_selector, - NULL); - grpc_credentials *composite_creds = - grpc_composite_credentials_create(aux_creds, google_iam_creds, NULL); - grpc_credentials_unref(ssl_creds); - grpc_credentials_unref(oauth2_creds); - grpc_credentials_unref(aux_creds); - grpc_credentials_unref(google_iam_creds); - GPR_ASSERT(strcmp(composite_creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == - 0); - GPR_ASSERT(grpc_credentials_has_request_metadata(composite_creds)); - GPR_ASSERT(!grpc_credentials_has_request_metadata_only(composite_creds)); - creds_array = grpc_composite_credentials_get_credentials(composite_creds); - GPR_ASSERT(creds_array->num_creds == 3); - GPR_ASSERT(strcmp(creds_array->creds_array[0]->type, - GRPC_CREDENTIALS_TYPE_SSL) == 0); - GPR_ASSERT(strcmp(creds_array->creds_array[1]->type, - GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); - GPR_ASSERT(strcmp(creds_array->creds_array[2]->type, - GRPC_CREDENTIALS_TYPE_IAM) == 0); - grpc_credentials_get_request_metadata( - composite_creds, NULL, test_service_url, - check_ssl_oauth2_google_iam_composite_metadata, composite_creds, - &closure_list); - grpc_closure_list_run(&closure_list); -} - -static void on_oauth2_creds_get_metadata_success( - void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status, grpc_closure_list *closure_list) { - GPR_ASSERT(status == GRPC_CREDENTIALS_OK); - GPR_ASSERT(num_md == 1); - GPR_ASSERT(gpr_slice_str_cmp(md_elems[0].key, "Authorization") == 0); - GPR_ASSERT(gpr_slice_str_cmp(md_elems[0].value, - "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_") == - 0); - GPR_ASSERT(user_data != NULL); - GPR_ASSERT(strcmp((const char *)user_data, test_user_data) == 0); -} - -static void on_oauth2_creds_get_metadata_failure( - void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status, grpc_closure_list *closure_list) { - GPR_ASSERT(status == GRPC_CREDENTIALS_ERROR); - GPR_ASSERT(num_md == 0); - GPR_ASSERT(user_data != NULL); - GPR_ASSERT(strcmp((const char *)user_data, test_user_data) == 0); -} - -static void validate_compute_engine_http_request( - const grpc_httpcli_request *request) { - GPR_ASSERT(request->handshaker != &grpc_httpcli_ssl); - GPR_ASSERT(strcmp(request->host, "metadata") == 0); - GPR_ASSERT( - strcmp(request->path, - "/computeMetadata/v1/instance/service-accounts/default/token") == - 0); - GPR_ASSERT(request->hdr_count == 1); - GPR_ASSERT(strcmp(request->hdrs[0].key, "Metadata-Flavor") == 0); - GPR_ASSERT(strcmp(request->hdrs[0].value, "Google") == 0); -} - -static int compute_engine_httpcli_get_success_override( - const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data, - grpc_closure_list *closure_list) { - grpc_httpcli_response response = - http_response(200, valid_oauth2_json_response); - validate_compute_engine_http_request(request); - on_response(user_data, &response, closure_list); + grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create ("Authorization", test_oauth2_bearer_token, 0); + grpc_credentials *aux_creds = grpc_composite_credentials_create (ssl_creds, oauth2_creds, NULL); + grpc_credentials *google_iam_creds = grpc_google_iam_credentials_create (test_google_iam_authorization_token, test_google_iam_authority_selector, + NULL); + grpc_credentials *composite_creds = grpc_composite_credentials_create (aux_creds, google_iam_creds, NULL); + grpc_credentials_unref (ssl_creds); + grpc_credentials_unref (oauth2_creds); + grpc_credentials_unref (aux_creds); + grpc_credentials_unref (google_iam_creds); + GPR_ASSERT (strcmp (composite_creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0); + GPR_ASSERT (grpc_credentials_has_request_metadata (composite_creds)); + GPR_ASSERT (!grpc_credentials_has_request_metadata_only (composite_creds)); + creds_array = grpc_composite_credentials_get_credentials (composite_creds); + GPR_ASSERT (creds_array->num_creds == 3); + GPR_ASSERT (strcmp (creds_array->creds_array[0]->type, GRPC_CREDENTIALS_TYPE_SSL) == 0); + GPR_ASSERT (strcmp (creds_array->creds_array[1]->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); + GPR_ASSERT (strcmp (creds_array->creds_array[2]->type, GRPC_CREDENTIALS_TYPE_IAM) == 0); + grpc_credentials_get_request_metadata (composite_creds, NULL, test_service_url, check_ssl_oauth2_google_iam_composite_metadata, composite_creds, &closure_list); + grpc_closure_list_run (&closure_list); +} + +static void +on_oauth2_creds_get_metadata_success (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +{ + GPR_ASSERT (status == GRPC_CREDENTIALS_OK); + GPR_ASSERT (num_md == 1); + GPR_ASSERT (gpr_slice_str_cmp (md_elems[0].key, "Authorization") == 0); + GPR_ASSERT (gpr_slice_str_cmp (md_elems[0].value, "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_") == 0); + GPR_ASSERT (user_data != NULL); + GPR_ASSERT (strcmp ((const char *) user_data, test_user_data) == 0); +} + +static void +on_oauth2_creds_get_metadata_failure (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +{ + GPR_ASSERT (status == GRPC_CREDENTIALS_ERROR); + GPR_ASSERT (num_md == 0); + GPR_ASSERT (user_data != NULL); + GPR_ASSERT (strcmp ((const char *) user_data, test_user_data) == 0); +} + +static void +validate_compute_engine_http_request (const grpc_httpcli_request * request) +{ + GPR_ASSERT (request->handshaker != &grpc_httpcli_ssl); + GPR_ASSERT (strcmp (request->host, "metadata") == 0); + GPR_ASSERT (strcmp (request->path, "/computeMetadata/v1/instance/service-accounts/default/token") == 0); + GPR_ASSERT (request->hdr_count == 1); + GPR_ASSERT (strcmp (request->hdrs[0].key, "Metadata-Flavor") == 0); + GPR_ASSERT (strcmp (request->hdrs[0].value, "Google") == 0); +} + +static int +compute_engine_httpcli_get_success_override (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ + grpc_httpcli_response response = http_response (200, valid_oauth2_json_response); + validate_compute_engine_http_request (request); + on_response (user_data, &response, closure_list); return 1; } -static int compute_engine_httpcli_get_failure_override( - const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data, - grpc_closure_list *closure_list) { - grpc_httpcli_response response = http_response(403, "Not Authorized."); - validate_compute_engine_http_request(request); - on_response(user_data, &response, closure_list); +static int +compute_engine_httpcli_get_failure_override (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ + grpc_httpcli_response response = http_response (403, "Not Authorized."); + validate_compute_engine_http_request (request); + on_response (user_data, &response, closure_list); return 1; } -static int httpcli_post_should_not_be_called( - const grpc_httpcli_request *request, const char *body_bytes, - size_t body_size, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data, - grpc_closure_list *closure_list) { - GPR_ASSERT("HTTP POST should not be called" == NULL); +static int +httpcli_post_should_not_be_called (const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ + GPR_ASSERT ("HTTP POST should not be called" == NULL); return 1; } -static int httpcli_get_should_not_be_called( - const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data, - grpc_closure_list *closure_list) { - GPR_ASSERT("HTTP GET should not be called" == NULL); +static int +httpcli_get_should_not_be_called (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ + GPR_ASSERT ("HTTP GET should not be called" == NULL); return 1; } -static void test_compute_engine_creds_success(void) { +static void +test_compute_engine_creds_success (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_credentials *compute_engine_creds = - grpc_google_compute_engine_credentials_create(NULL); - GPR_ASSERT(grpc_credentials_has_request_metadata(compute_engine_creds)); - GPR_ASSERT(grpc_credentials_has_request_metadata_only(compute_engine_creds)); + grpc_credentials *compute_engine_creds = grpc_google_compute_engine_credentials_create (NULL); + GPR_ASSERT (grpc_credentials_has_request_metadata (compute_engine_creds)); + GPR_ASSERT (grpc_credentials_has_request_metadata_only (compute_engine_creds)); /* First request: http get should be called. */ - grpc_httpcli_set_override(compute_engine_httpcli_get_success_override, - httpcli_post_should_not_be_called); - grpc_credentials_get_request_metadata(compute_engine_creds, NULL, - test_service_url, - on_oauth2_creds_get_metadata_success, - (void *)test_user_data, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_httpcli_set_override (compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); + grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); + grpc_closure_list_run (&closure_list); /* Second request: the cached token should be served directly. */ - grpc_httpcli_set_override(httpcli_get_should_not_be_called, - httpcli_post_should_not_be_called); - grpc_credentials_get_request_metadata(compute_engine_creds, NULL, - test_service_url, - on_oauth2_creds_get_metadata_success, - (void *)test_user_data, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_httpcli_set_override (httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); + grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); + grpc_closure_list_run (&closure_list); - grpc_credentials_unref(compute_engine_creds); - grpc_httpcli_set_override(NULL, NULL); + grpc_credentials_unref (compute_engine_creds); + grpc_httpcli_set_override (NULL, NULL); } -static void test_compute_engine_creds_failure(void) { +static void +test_compute_engine_creds_failure (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_credentials *compute_engine_creds = - grpc_google_compute_engine_credentials_create(NULL); - grpc_httpcli_set_override(compute_engine_httpcli_get_failure_override, - httpcli_post_should_not_be_called); - GPR_ASSERT(grpc_credentials_has_request_metadata(compute_engine_creds)); - GPR_ASSERT(grpc_credentials_has_request_metadata_only(compute_engine_creds)); - grpc_credentials_get_request_metadata(compute_engine_creds, NULL, - test_service_url, - on_oauth2_creds_get_metadata_failure, - (void *)test_user_data, &closure_list); - grpc_credentials_unref(compute_engine_creds); - grpc_httpcli_set_override(NULL, NULL); - grpc_closure_list_run(&closure_list); -} - -static void validate_refresh_token_http_request( - const grpc_httpcli_request *request, const char *body, size_t body_size) { + grpc_credentials *compute_engine_creds = grpc_google_compute_engine_credentials_create (NULL); + grpc_httpcli_set_override (compute_engine_httpcli_get_failure_override, httpcli_post_should_not_be_called); + GPR_ASSERT (grpc_credentials_has_request_metadata (compute_engine_creds)); + GPR_ASSERT (grpc_credentials_has_request_metadata_only (compute_engine_creds)); + grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (void *) test_user_data, &closure_list); + grpc_credentials_unref (compute_engine_creds); + grpc_httpcli_set_override (NULL, NULL); + grpc_closure_list_run (&closure_list); +} + +static void +validate_refresh_token_http_request (const grpc_httpcli_request * request, const char *body, size_t body_size) +{ /* The content of the assertion is tested extensively in json_token_test. */ char *expected_body = NULL; - GPR_ASSERT(body != NULL); - GPR_ASSERT(body_size != 0); - gpr_asprintf(&expected_body, GRPC_REFRESH_TOKEN_POST_BODY_FORMAT_STRING, - "32555999999.apps.googleusercontent.com", - "EmssLNjJy1332hD4KFsecret", - "1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42"); - GPR_ASSERT(strlen(expected_body) == body_size); - GPR_ASSERT(memcmp(expected_body, body, body_size) == 0); - gpr_free(expected_body); - GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); - GPR_ASSERT(strcmp(request->host, GRPC_GOOGLE_OAUTH2_SERVICE_HOST) == 0); - GPR_ASSERT(strcmp(request->path, GRPC_GOOGLE_OAUTH2_SERVICE_TOKEN_PATH) == 0); - GPR_ASSERT(request->hdr_count == 1); - GPR_ASSERT(strcmp(request->hdrs[0].key, "Content-Type") == 0); - GPR_ASSERT( - strcmp(request->hdrs[0].value, "application/x-www-form-urlencoded") == 0); -} - -static int refresh_token_httpcli_post_success( - const grpc_httpcli_request *request, const char *body, size_t body_size, - gpr_timespec deadline, grpc_httpcli_response_cb on_response, - void *user_data, grpc_closure_list *closure_list) { - grpc_httpcli_response response = - http_response(200, valid_oauth2_json_response); - validate_refresh_token_http_request(request, body, body_size); - on_response(user_data, &response, closure_list); + GPR_ASSERT (body != NULL); + GPR_ASSERT (body_size != 0); + gpr_asprintf (&expected_body, GRPC_REFRESH_TOKEN_POST_BODY_FORMAT_STRING, "32555999999.apps.googleusercontent.com", "EmssLNjJy1332hD4KFsecret", "1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42"); + GPR_ASSERT (strlen (expected_body) == body_size); + GPR_ASSERT (memcmp (expected_body, body, body_size) == 0); + gpr_free (expected_body); + GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); + GPR_ASSERT (strcmp (request->host, GRPC_GOOGLE_OAUTH2_SERVICE_HOST) == 0); + GPR_ASSERT (strcmp (request->path, GRPC_GOOGLE_OAUTH2_SERVICE_TOKEN_PATH) == 0); + GPR_ASSERT (request->hdr_count == 1); + GPR_ASSERT (strcmp (request->hdrs[0].key, "Content-Type") == 0); + GPR_ASSERT (strcmp (request->hdrs[0].value, "application/x-www-form-urlencoded") == 0); +} + +static int +refresh_token_httpcli_post_success (const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ + grpc_httpcli_response response = http_response (200, valid_oauth2_json_response); + validate_refresh_token_http_request (request, body, body_size); + on_response (user_data, &response, closure_list); return 1; } -static int refresh_token_httpcli_post_failure( - const grpc_httpcli_request *request, const char *body, size_t body_size, - gpr_timespec deadline, grpc_httpcli_response_cb on_response, - void *user_data, grpc_closure_list *closure_list) { - grpc_httpcli_response response = http_response(403, "Not Authorized."); - validate_refresh_token_http_request(request, body, body_size); - on_response(user_data, &response, closure_list); +static int +refresh_token_httpcli_post_failure (const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ + grpc_httpcli_response response = http_response (403, "Not Authorized."); + validate_refresh_token_http_request (request, body, body_size); + on_response (user_data, &response, closure_list); return 1; } -static void test_refresh_token_creds_success(void) { +static void +test_refresh_token_creds_success (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_credentials *refresh_token_creds = - grpc_google_refresh_token_credentials_create(test_refresh_token_str, - NULL); - GPR_ASSERT(grpc_credentials_has_request_metadata(refresh_token_creds)); - GPR_ASSERT(grpc_credentials_has_request_metadata_only(refresh_token_creds)); + grpc_credentials *refresh_token_creds = grpc_google_refresh_token_credentials_create (test_refresh_token_str, + NULL); + GPR_ASSERT (grpc_credentials_has_request_metadata (refresh_token_creds)); + GPR_ASSERT (grpc_credentials_has_request_metadata_only (refresh_token_creds)); /* First request: http get should be called. */ - grpc_httpcli_set_override(httpcli_get_should_not_be_called, - refresh_token_httpcli_post_success); - grpc_credentials_get_request_metadata(refresh_token_creds, NULL, - test_service_url, - on_oauth2_creds_get_metadata_success, - (void *)test_user_data, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_httpcli_set_override (httpcli_get_should_not_be_called, refresh_token_httpcli_post_success); + grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); + grpc_closure_list_run (&closure_list); /* Second request: the cached token should be served directly. */ - grpc_httpcli_set_override(httpcli_get_should_not_be_called, - httpcli_post_should_not_be_called); - grpc_credentials_get_request_metadata(refresh_token_creds, NULL, - test_service_url, - on_oauth2_creds_get_metadata_success, - (void *)test_user_data, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_httpcli_set_override (httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); + grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); + grpc_closure_list_run (&closure_list); - grpc_credentials_unref(refresh_token_creds); - grpc_httpcli_set_override(NULL, NULL); - grpc_closure_list_run(&closure_list); + grpc_credentials_unref (refresh_token_creds); + grpc_httpcli_set_override (NULL, NULL); + grpc_closure_list_run (&closure_list); } -static void test_refresh_token_creds_failure(void) { +static void +test_refresh_token_creds_failure (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_credentials *refresh_token_creds = - grpc_google_refresh_token_credentials_create(test_refresh_token_str, - NULL); - grpc_httpcli_set_override(httpcli_get_should_not_be_called, - refresh_token_httpcli_post_failure); - GPR_ASSERT(grpc_credentials_has_request_metadata(refresh_token_creds)); - GPR_ASSERT(grpc_credentials_has_request_metadata_only(refresh_token_creds)); - grpc_credentials_get_request_metadata(refresh_token_creds, NULL, - test_service_url, - on_oauth2_creds_get_metadata_failure, - (void *)test_user_data, &closure_list); - grpc_credentials_unref(refresh_token_creds); - grpc_httpcli_set_override(NULL, NULL); - grpc_closure_list_run(&closure_list); -} - -static void validate_jwt_encode_and_sign_params( - const grpc_auth_json_key *json_key, const char *scope, - gpr_timespec token_lifetime) { - GPR_ASSERT(grpc_auth_json_key_is_valid(json_key)); - GPR_ASSERT(json_key->private_key != NULL); - GPR_ASSERT(RSA_check_key(json_key->private_key)); - GPR_ASSERT(json_key->type != NULL && - strcmp(json_key->type, "service_account") == 0); - GPR_ASSERT(json_key->private_key_id != NULL && - strcmp(json_key->private_key_id, - "e6b5137873db8d2ef81e06a47289e6434ec8a165") == 0); - GPR_ASSERT(json_key->client_id != NULL && - strcmp(json_key->client_id, - "777-abaslkan11hlb6nmim3bpspl31ud.apps." - "googleusercontent.com") == 0); - GPR_ASSERT(json_key->client_email != NULL && - strcmp(json_key->client_email, - "777-abaslkan11hlb6nmim3bpspl31ud@developer." - "gserviceaccount.com") == 0); - if (scope != NULL) GPR_ASSERT(strcmp(scope, test_scope) == 0); - GPR_ASSERT(!gpr_time_cmp(token_lifetime, grpc_max_auth_token_lifetime)); -} - -static char *encode_and_sign_jwt_success(const grpc_auth_json_key *json_key, - const char *audience, - gpr_timespec token_lifetime, - const char *scope) { - validate_jwt_encode_and_sign_params(json_key, scope, token_lifetime); - return gpr_strdup(test_signed_jwt); -} - -static char *encode_and_sign_jwt_failure(const grpc_auth_json_key *json_key, - const char *audience, - gpr_timespec token_lifetime, - const char *scope) { - validate_jwt_encode_and_sign_params(json_key, scope, token_lifetime); + grpc_credentials *refresh_token_creds = grpc_google_refresh_token_credentials_create (test_refresh_token_str, + NULL); + grpc_httpcli_set_override (httpcli_get_should_not_be_called, refresh_token_httpcli_post_failure); + GPR_ASSERT (grpc_credentials_has_request_metadata (refresh_token_creds)); + GPR_ASSERT (grpc_credentials_has_request_metadata_only (refresh_token_creds)); + grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (void *) test_user_data, &closure_list); + grpc_credentials_unref (refresh_token_creds); + grpc_httpcli_set_override (NULL, NULL); + grpc_closure_list_run (&closure_list); +} + +static void +validate_jwt_encode_and_sign_params (const grpc_auth_json_key * json_key, const char *scope, gpr_timespec token_lifetime) +{ + GPR_ASSERT (grpc_auth_json_key_is_valid (json_key)); + GPR_ASSERT (json_key->private_key != NULL); + GPR_ASSERT (RSA_check_key (json_key->private_key)); + GPR_ASSERT (json_key->type != NULL && strcmp (json_key->type, "service_account") == 0); + GPR_ASSERT (json_key->private_key_id != NULL && strcmp (json_key->private_key_id, "e6b5137873db8d2ef81e06a47289e6434ec8a165") == 0); + GPR_ASSERT (json_key->client_id != NULL && strcmp (json_key->client_id, "777-abaslkan11hlb6nmim3bpspl31ud.apps." "googleusercontent.com") == 0); + GPR_ASSERT (json_key->client_email != NULL && strcmp (json_key->client_email, "777-abaslkan11hlb6nmim3bpspl31ud@developer." "gserviceaccount.com") == 0); + if (scope != NULL) + GPR_ASSERT (strcmp (scope, test_scope) == 0); + GPR_ASSERT (!gpr_time_cmp (token_lifetime, grpc_max_auth_token_lifetime)); +} + +static char * +encode_and_sign_jwt_success (const grpc_auth_json_key * json_key, const char *audience, gpr_timespec token_lifetime, const char *scope) +{ + validate_jwt_encode_and_sign_params (json_key, scope, token_lifetime); + return gpr_strdup (test_signed_jwt); +} + +static char * +encode_and_sign_jwt_failure (const grpc_auth_json_key * json_key, const char *audience, gpr_timespec token_lifetime, const char *scope) +{ + validate_jwt_encode_and_sign_params (json_key, scope, token_lifetime); return NULL; } -static char *encode_and_sign_jwt_should_not_be_called( - const grpc_auth_json_key *json_key, const char *audience, - gpr_timespec token_lifetime, const char *scope) { - GPR_ASSERT("grpc_jwt_encode_and_sign should not be called" == NULL); +static char * +encode_and_sign_jwt_should_not_be_called (const grpc_auth_json_key * json_key, const char *audience, gpr_timespec token_lifetime, const char *scope) +{ + GPR_ASSERT ("grpc_jwt_encode_and_sign should not be called" == NULL); } -static void on_jwt_creds_get_metadata_success(void *user_data, - grpc_credentials_md *md_elems, - size_t num_md, - grpc_credentials_status status, - grpc_closure_list *closure_list) { +static void +on_jwt_creds_get_metadata_success (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +{ char *expected_md_value; - gpr_asprintf(&expected_md_value, "Bearer %s", test_signed_jwt); - GPR_ASSERT(status == GRPC_CREDENTIALS_OK); - GPR_ASSERT(num_md == 1); - GPR_ASSERT(gpr_slice_str_cmp(md_elems[0].key, "Authorization") == 0); - GPR_ASSERT(gpr_slice_str_cmp(md_elems[0].value, expected_md_value) == 0); - GPR_ASSERT(user_data != NULL); - GPR_ASSERT(strcmp((const char *)user_data, test_user_data) == 0); - gpr_free(expected_md_value); -} - -static void on_jwt_creds_get_metadata_failure(void *user_data, - grpc_credentials_md *md_elems, - size_t num_md, - grpc_credentials_status status, - grpc_closure_list *closure_list) { - GPR_ASSERT(status == GRPC_CREDENTIALS_ERROR); - GPR_ASSERT(num_md == 0); - GPR_ASSERT(user_data != NULL); - GPR_ASSERT(strcmp((const char *)user_data, test_user_data) == 0); -} - -static void test_jwt_creds_success(void) { - char *json_key_string = test_json_key_str(); + gpr_asprintf (&expected_md_value, "Bearer %s", test_signed_jwt); + GPR_ASSERT (status == GRPC_CREDENTIALS_OK); + GPR_ASSERT (num_md == 1); + GPR_ASSERT (gpr_slice_str_cmp (md_elems[0].key, "Authorization") == 0); + GPR_ASSERT (gpr_slice_str_cmp (md_elems[0].value, expected_md_value) == 0); + GPR_ASSERT (user_data != NULL); + GPR_ASSERT (strcmp ((const char *) user_data, test_user_data) == 0); + gpr_free (expected_md_value); +} + +static void +on_jwt_creds_get_metadata_failure (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +{ + GPR_ASSERT (status == GRPC_CREDENTIALS_ERROR); + GPR_ASSERT (num_md == 0); + GPR_ASSERT (user_data != NULL); + GPR_ASSERT (strcmp ((const char *) user_data, test_user_data) == 0); +} + +static void +test_jwt_creds_success (void) +{ + char *json_key_string = test_json_key_str (); grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_credentials *jwt_creds = - grpc_service_account_jwt_access_credentials_create( - json_key_string, grpc_max_auth_token_lifetime, NULL); - GPR_ASSERT(grpc_credentials_has_request_metadata(jwt_creds)); - GPR_ASSERT(grpc_credentials_has_request_metadata_only(jwt_creds)); + grpc_credentials *jwt_creds = grpc_service_account_jwt_access_credentials_create (json_key_string, grpc_max_auth_token_lifetime, NULL); + GPR_ASSERT (grpc_credentials_has_request_metadata (jwt_creds)); + GPR_ASSERT (grpc_credentials_has_request_metadata_only (jwt_creds)); /* First request: jwt_encode_and_sign should be called. */ - grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); - grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, - on_jwt_creds_get_metadata_success, - (void *)test_user_data, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_success); + grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list); + grpc_closure_list_run (&closure_list); /* Second request: the cached token should be served directly. */ - grpc_jwt_encode_and_sign_set_override( - encode_and_sign_jwt_should_not_be_called); - grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, - on_jwt_creds_get_metadata_success, - (void *)test_user_data, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_should_not_be_called); + grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list); + grpc_closure_list_run (&closure_list); /* Third request: Different service url so jwt_encode_and_sign should be called again (no caching). */ - grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); - grpc_credentials_get_request_metadata(jwt_creds, NULL, other_test_service_url, - on_jwt_creds_get_metadata_success, - (void *)test_user_data, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_success); + grpc_credentials_get_request_metadata (jwt_creds, NULL, other_test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list); + grpc_closure_list_run (&closure_list); - gpr_free(json_key_string); - grpc_credentials_unref(jwt_creds); - grpc_jwt_encode_and_sign_set_override(NULL); + gpr_free (json_key_string); + grpc_credentials_unref (jwt_creds); + grpc_jwt_encode_and_sign_set_override (NULL); } -static void test_jwt_creds_signing_failure(void) { - char *json_key_string = test_json_key_str(); +static void +test_jwt_creds_signing_failure (void) +{ + char *json_key_string = test_json_key_str (); grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_credentials *jwt_creds = - grpc_service_account_jwt_access_credentials_create( - json_key_string, grpc_max_auth_token_lifetime, NULL); - GPR_ASSERT(grpc_credentials_has_request_metadata(jwt_creds)); - GPR_ASSERT(grpc_credentials_has_request_metadata_only(jwt_creds)); - - grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_failure); - grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, - on_jwt_creds_get_metadata_failure, - (void *)test_user_data, &closure_list); - - gpr_free(json_key_string); - grpc_credentials_unref(jwt_creds); - grpc_jwt_encode_and_sign_set_override(NULL); - grpc_closure_list_run(&closure_list); -} - -static void set_google_default_creds_env_var_with_file_contents( - const char *file_prefix, const char *contents) { - size_t contents_len = strlen(contents); - char *creds_file_name; - FILE *creds_file = gpr_tmpfile(file_prefix, &creds_file_name); - GPR_ASSERT(creds_file_name != NULL); - GPR_ASSERT(creds_file != NULL); - GPR_ASSERT(fwrite(contents, 1, contents_len, creds_file) == contents_len); - fclose(creds_file); - gpr_setenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR, creds_file_name); - gpr_free(creds_file_name); + grpc_credentials *jwt_creds = grpc_service_account_jwt_access_credentials_create (json_key_string, grpc_max_auth_token_lifetime, NULL); + GPR_ASSERT (grpc_credentials_has_request_metadata (jwt_creds)); + GPR_ASSERT (grpc_credentials_has_request_metadata_only (jwt_creds)); + + grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_failure); + grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_failure, (void *) test_user_data, &closure_list); + + gpr_free (json_key_string); + grpc_credentials_unref (jwt_creds); + grpc_jwt_encode_and_sign_set_override (NULL); + grpc_closure_list_run (&closure_list); } -static grpc_credentials *composite_inner_creds(grpc_credentials *creds, - const char *inner_creds_type) { +static void +set_google_default_creds_env_var_with_file_contents (const char *file_prefix, const char *contents) +{ + size_t contents_len = strlen (contents); + char *creds_file_name; + FILE *creds_file = gpr_tmpfile (file_prefix, &creds_file_name); + GPR_ASSERT (creds_file_name != NULL); + GPR_ASSERT (creds_file != NULL); + GPR_ASSERT (fwrite (contents, 1, contents_len, creds_file) == contents_len); + fclose (creds_file); + gpr_setenv (GRPC_GOOGLE_CREDENTIALS_ENV_VAR, creds_file_name); + gpr_free (creds_file_name); +} + +static grpc_credentials * +composite_inner_creds (grpc_credentials * creds, const char *inner_creds_type) +{ size_t i; grpc_composite_credentials *composite; - GPR_ASSERT(strcmp(creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0); - composite = (grpc_composite_credentials *)creds; - for (i = 0; i < composite->inner.num_creds; i++) { - grpc_credentials *c = composite->inner.creds_array[i]; - if (strcmp(c->type, inner_creds_type) == 0) return c; - } - GPR_ASSERT(0); /* Not found. */ + GPR_ASSERT (strcmp (creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0); + composite = (grpc_composite_credentials *) creds; + for (i = 0; i < composite->inner.num_creds; i++) + { + grpc_credentials *c = composite->inner.creds_array[i]; + if (strcmp (c->type, inner_creds_type) == 0) + return c; + } + GPR_ASSERT (0); /* Not found. */ } -static void test_google_default_creds_auth_key(void) { +static void +test_google_default_creds_auth_key (void) +{ grpc_service_account_jwt_access_credentials *jwt; grpc_credentials *creds; - char *json_key = test_json_key_str(); - grpc_flush_cached_google_default_credentials(); - set_google_default_creds_env_var_with_file_contents( - "json_key_google_default_creds", json_key); - gpr_free(json_key); - creds = grpc_google_default_credentials_create(); - GPR_ASSERT(creds != NULL); - jwt = (grpc_service_account_jwt_access_credentials *)composite_inner_creds( - creds, GRPC_CREDENTIALS_TYPE_JWT); - GPR_ASSERT( - strcmp(jwt->key.client_id, - "777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent.com") == - 0); - grpc_credentials_unref(creds); - gpr_setenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ -} - -static void test_google_default_creds_access_token(void) { + char *json_key = test_json_key_str (); + grpc_flush_cached_google_default_credentials (); + set_google_default_creds_env_var_with_file_contents ("json_key_google_default_creds", json_key); + gpr_free (json_key); + creds = grpc_google_default_credentials_create (); + GPR_ASSERT (creds != NULL); + jwt = (grpc_service_account_jwt_access_credentials *) composite_inner_creds (creds, GRPC_CREDENTIALS_TYPE_JWT); + GPR_ASSERT (strcmp (jwt->key.client_id, "777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent.com") == 0); + grpc_credentials_unref (creds); + gpr_setenv (GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ +} + +static void +test_google_default_creds_access_token (void) +{ grpc_google_refresh_token_credentials *refresh; grpc_credentials *creds; - grpc_flush_cached_google_default_credentials(); - set_google_default_creds_env_var_with_file_contents( - "refresh_token_google_default_creds", test_refresh_token_str); - creds = grpc_google_default_credentials_create(); - GPR_ASSERT(creds != NULL); - refresh = (grpc_google_refresh_token_credentials *)composite_inner_creds( - creds, GRPC_CREDENTIALS_TYPE_OAUTH2); - GPR_ASSERT(strcmp(refresh->refresh_token.client_id, - "32555999999.apps.googleusercontent.com") == 0); - grpc_credentials_unref(creds); - gpr_setenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ -} - -typedef enum { + grpc_flush_cached_google_default_credentials (); + set_google_default_creds_env_var_with_file_contents ("refresh_token_google_default_creds", test_refresh_token_str); + creds = grpc_google_default_credentials_create (); + GPR_ASSERT (creds != NULL); + refresh = (grpc_google_refresh_token_credentials *) composite_inner_creds (creds, GRPC_CREDENTIALS_TYPE_OAUTH2); + GPR_ASSERT (strcmp (refresh->refresh_token.client_id, "32555999999.apps.googleusercontent.com") == 0); + grpc_credentials_unref (creds); + gpr_setenv (GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ +} + +typedef enum +{ PLUGIN_INITIAL_STATE, PLUGIN_GET_METADATA_CALLED_STATE, PLUGIN_DESTROY_CALLED_STATE } plugin_state; -typedef struct { +typedef struct +{ const char *key; const char *value; } plugin_metadata; -static const plugin_metadata plugin_md[] = {{"foo", "bar"}, {"hi", "there"}}; +static const plugin_metadata plugin_md[] = { {"foo", "bar"}, {"hi", "there"} }; -static void plugin_get_metadata_success(void *state, const char *service_url, - grpc_credentials_plugin_metadata_cb cb, - void *user_data) { +static void +plugin_get_metadata_success (void *state, const char *service_url, grpc_credentials_plugin_metadata_cb cb, void *user_data) +{ size_t i; - grpc_metadata md[GPR_ARRAY_SIZE(plugin_md)]; - plugin_state *s = (plugin_state *)state; - GPR_ASSERT(strcmp(service_url, test_service_url) == 0); + grpc_metadata md[GPR_ARRAY_SIZE (plugin_md)]; + plugin_state *s = (plugin_state *) state; + GPR_ASSERT (strcmp (service_url, test_service_url) == 0); *s = PLUGIN_GET_METADATA_CALLED_STATE; - for (i = 0; i < GPR_ARRAY_SIZE(plugin_md); i++) { - memset(&md[i], 0, sizeof(grpc_metadata)); - md[i].key = plugin_md[i].key; - md[i].value = plugin_md[i].value; - md[i].value_length = strlen(plugin_md[i].value); - } - cb(user_data, md, GPR_ARRAY_SIZE(md), GRPC_STATUS_OK, NULL); -} - -static void plugin_get_metadata_failure(void *state, const char *service_url, - grpc_credentials_plugin_metadata_cb cb, - void *user_data) { - plugin_state *s = (plugin_state *)state; - GPR_ASSERT(strcmp(service_url, test_service_url) == 0); + for (i = 0; i < GPR_ARRAY_SIZE (plugin_md); i++) + { + memset (&md[i], 0, sizeof (grpc_metadata)); + md[i].key = plugin_md[i].key; + md[i].value = plugin_md[i].value; + md[i].value_length = strlen (plugin_md[i].value); + } + cb (user_data, md, GPR_ARRAY_SIZE (md), GRPC_STATUS_OK, NULL); +} + +static void +plugin_get_metadata_failure (void *state, const char *service_url, grpc_credentials_plugin_metadata_cb cb, void *user_data) +{ + plugin_state *s = (plugin_state *) state; + GPR_ASSERT (strcmp (service_url, test_service_url) == 0); *s = PLUGIN_GET_METADATA_CALLED_STATE; - cb(user_data, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, - "Could not get metadata for plugin."); + cb (user_data, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, "Could not get metadata for plugin."); } -static void on_plugin_metadata_received_success( - void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status, grpc_closure_list *closure_list) { +static void +on_plugin_metadata_received_success (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +{ size_t i = 0; - GPR_ASSERT(user_data == NULL); - GPR_ASSERT(md_elems != NULL); - GPR_ASSERT(num_md == GPR_ARRAY_SIZE(plugin_md)); - for (i = 0; i < num_md; i++) { - GPR_ASSERT(gpr_slice_str_cmp(md_elems[i].key, plugin_md[i].key) == 0); - GPR_ASSERT(gpr_slice_str_cmp(md_elems[i].value, plugin_md[i].value) == 0); - } -} - -static void on_plugin_metadata_received_failure( - void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status, grpc_closure_list *closure_list) { - GPR_ASSERT(user_data == NULL); - GPR_ASSERT(md_elems == NULL); - GPR_ASSERT(num_md == 0); - GPR_ASSERT(status == GRPC_CREDENTIALS_ERROR); -} - -static void plugin_destroy(void *state) { - plugin_state *s = (plugin_state *)state; + GPR_ASSERT (user_data == NULL); + GPR_ASSERT (md_elems != NULL); + GPR_ASSERT (num_md == GPR_ARRAY_SIZE (plugin_md)); + for (i = 0; i < num_md; i++) + { + GPR_ASSERT (gpr_slice_str_cmp (md_elems[i].key, plugin_md[i].key) == 0); + GPR_ASSERT (gpr_slice_str_cmp (md_elems[i].value, plugin_md[i].value) == 0); + } +} + +static void +on_plugin_metadata_received_failure (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +{ + GPR_ASSERT (user_data == NULL); + GPR_ASSERT (md_elems == NULL); + GPR_ASSERT (num_md == 0); + GPR_ASSERT (status == GRPC_CREDENTIALS_ERROR); +} + +static void +plugin_destroy (void *state) +{ + plugin_state *s = (plugin_state *) state; *s = PLUGIN_DESTROY_CALLED_STATE; } -static void test_metadata_plugin_success(void) { +static void +test_metadata_plugin_success (void) +{ grpc_credentials *creds; plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; @@ -952,18 +852,18 @@ static void test_metadata_plugin_success(void) { plugin.get_metadata = plugin_get_metadata_success; plugin.destroy = plugin_destroy; - creds = grpc_metadata_credentials_create_from_plugin(plugin, NULL); - GPR_ASSERT(state == PLUGIN_INITIAL_STATE); - grpc_credentials_get_request_metadata(creds, NULL, test_service_url, - on_plugin_metadata_received_success, - NULL, &closure_list); - GPR_ASSERT(state == PLUGIN_GET_METADATA_CALLED_STATE); - grpc_credentials_release(creds); - GPR_ASSERT(state == PLUGIN_DESTROY_CALLED_STATE); - grpc_closure_list_run(&closure_list); + creds = grpc_metadata_credentials_create_from_plugin (plugin, NULL); + GPR_ASSERT (state == PLUGIN_INITIAL_STATE); + grpc_credentials_get_request_metadata (creds, NULL, test_service_url, on_plugin_metadata_received_success, NULL, &closure_list); + GPR_ASSERT (state == PLUGIN_GET_METADATA_CALLED_STATE); + grpc_credentials_release (creds); + GPR_ASSERT (state == PLUGIN_DESTROY_CALLED_STATE); + grpc_closure_list_run (&closure_list); } -static void test_metadata_plugin_failure(void) { +static void +test_metadata_plugin_failure (void) +{ grpc_credentials *creds; plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; @@ -973,45 +873,45 @@ static void test_metadata_plugin_failure(void) { plugin.get_metadata = plugin_get_metadata_failure; plugin.destroy = plugin_destroy; - creds = grpc_metadata_credentials_create_from_plugin(plugin, NULL); - GPR_ASSERT(state == PLUGIN_INITIAL_STATE); - grpc_credentials_get_request_metadata(creds, NULL, test_service_url, - on_plugin_metadata_received_failure, - NULL, &closure_list); - GPR_ASSERT(state == PLUGIN_GET_METADATA_CALLED_STATE); - grpc_credentials_release(creds); - GPR_ASSERT(state == PLUGIN_DESTROY_CALLED_STATE); - grpc_closure_list_run(&closure_list); -} - -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_empty_md_store(); - test_ref_unref_empty_md_store(); - test_add_to_empty_md_store(); - test_add_cstrings_to_empty_md_store(); - test_empty_preallocated_md_store(); - test_add_abunch_to_md_store(); - test_oauth2_token_fetcher_creds_parsing_ok(); - test_oauth2_token_fetcher_creds_parsing_bad_http_status(); - test_oauth2_token_fetcher_creds_parsing_empty_http_body(); - test_oauth2_token_fetcher_creds_parsing_invalid_json(); - test_oauth2_token_fetcher_creds_parsing_missing_token(); - test_oauth2_token_fetcher_creds_parsing_missing_token_type(); - test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime(); - test_google_iam_creds(); - test_access_token_creds(); - test_ssl_oauth2_composite_creds(); - test_ssl_oauth2_google_iam_composite_creds(); - test_compute_engine_creds_success(); - test_compute_engine_creds_failure(); - test_refresh_token_creds_success(); - test_refresh_token_creds_failure(); - test_jwt_creds_success(); - test_jwt_creds_signing_failure(); - test_google_default_creds_auth_key(); - test_google_default_creds_access_token(); - test_metadata_plugin_success(); - test_metadata_plugin_failure(); + creds = grpc_metadata_credentials_create_from_plugin (plugin, NULL); + GPR_ASSERT (state == PLUGIN_INITIAL_STATE); + grpc_credentials_get_request_metadata (creds, NULL, test_service_url, on_plugin_metadata_received_failure, NULL, &closure_list); + GPR_ASSERT (state == PLUGIN_GET_METADATA_CALLED_STATE); + grpc_credentials_release (creds); + GPR_ASSERT (state == PLUGIN_DESTROY_CALLED_STATE); + grpc_closure_list_run (&closure_list); +} + +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_empty_md_store (); + test_ref_unref_empty_md_store (); + test_add_to_empty_md_store (); + test_add_cstrings_to_empty_md_store (); + test_empty_preallocated_md_store (); + test_add_abunch_to_md_store (); + test_oauth2_token_fetcher_creds_parsing_ok (); + test_oauth2_token_fetcher_creds_parsing_bad_http_status (); + test_oauth2_token_fetcher_creds_parsing_empty_http_body (); + test_oauth2_token_fetcher_creds_parsing_invalid_json (); + test_oauth2_token_fetcher_creds_parsing_missing_token (); + test_oauth2_token_fetcher_creds_parsing_missing_token_type (); + test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime (); + test_google_iam_creds (); + test_access_token_creds (); + test_ssl_oauth2_composite_creds (); + test_ssl_oauth2_google_iam_composite_creds (); + test_compute_engine_creds_success (); + test_compute_engine_creds_failure (); + test_refresh_token_creds_success (); + test_refresh_token_creds_failure (); + test_jwt_creds_success (); + test_jwt_creds_signing_failure (); + test_google_default_creds_auth_key (); + test_google_default_creds_access_token (); + test_metadata_plugin_success (); + test_metadata_plugin_failure (); return 0; } diff --git a/test/core/security/fetch_oauth2.c b/test/core/security/fetch_oauth2.c index 764d8da9b60..529d455b859 100644 --- a/test/core/security/fetch_oauth2.c +++ b/test/core/security/fetch_oauth2.c @@ -46,77 +46,78 @@ #include "src/core/support/file.h" #include "test/core/security/oauth2_utils.h" -static grpc_credentials *create_refresh_token_creds( - const char *json_refresh_token_file_path) { +static grpc_credentials * +create_refresh_token_creds (const char *json_refresh_token_file_path) +{ int success; - gpr_slice refresh_token = - gpr_load_file(json_refresh_token_file_path, 1, &success); - if (!success) { - gpr_log(GPR_ERROR, "Could not read file %s.", json_refresh_token_file_path); - exit(1); - } - return grpc_google_refresh_token_credentials_create( - (const char *)GPR_SLICE_START_PTR(refresh_token), NULL); + gpr_slice refresh_token = gpr_load_file (json_refresh_token_file_path, 1, &success); + if (!success) + { + gpr_log (GPR_ERROR, "Could not read file %s.", json_refresh_token_file_path); + exit (1); + } + return grpc_google_refresh_token_credentials_create ((const char *) GPR_SLICE_START_PTR (refresh_token), NULL); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ grpc_credentials *creds = NULL; char *json_key_file_path = NULL; char *json_refresh_token_file_path = NULL; char *token = NULL; int use_gce = 0; char *scope = NULL; - gpr_cmdline *cl = gpr_cmdline_create("fetch_oauth2"); - gpr_cmdline_add_string(cl, "json_refresh_token", - "File path of the json refresh token.", - &json_refresh_token_file_path); - gpr_cmdline_add_flag( - cl, "gce", - "Get a token from the GCE metadata server (only works in GCE).", - &use_gce); - gpr_cmdline_parse(cl, argc, argv); + gpr_cmdline *cl = gpr_cmdline_create ("fetch_oauth2"); + gpr_cmdline_add_string (cl, "json_refresh_token", "File path of the json refresh token.", &json_refresh_token_file_path); + gpr_cmdline_add_flag (cl, "gce", "Get a token from the GCE metadata server (only works in GCE).", &use_gce); + gpr_cmdline_parse (cl, argc, argv); - grpc_init(); + grpc_init (); - if (json_key_file_path != NULL && json_refresh_token_file_path != NULL) { - gpr_log(GPR_ERROR, - "--json_key and --json_refresh_token are mutually exclusive."); - exit(1); - } + if (json_key_file_path != NULL && json_refresh_token_file_path != NULL) + { + gpr_log (GPR_ERROR, "--json_key and --json_refresh_token are mutually exclusive."); + exit (1); + } - if (use_gce) { - if (json_key_file_path != NULL || scope != NULL) { - gpr_log(GPR_INFO, - "Ignoring json key and scope to get a token from the GCE " - "metadata server."); + if (use_gce) + { + if (json_key_file_path != NULL || scope != NULL) + { + gpr_log (GPR_INFO, "Ignoring json key and scope to get a token from the GCE " "metadata server."); + } + creds = grpc_google_compute_engine_credentials_create (NULL); + if (creds == NULL) + { + gpr_log (GPR_ERROR, "Could not create gce credentials."); + exit (1); + } } - creds = grpc_google_compute_engine_credentials_create(NULL); - if (creds == NULL) { - gpr_log(GPR_ERROR, "Could not create gce credentials."); - exit(1); + else if (json_refresh_token_file_path != NULL) + { + creds = create_refresh_token_creds (json_refresh_token_file_path); + if (creds == NULL) + { + gpr_log (GPR_ERROR, "Could not create refresh token creds. %s does probably not " "contain a valid json refresh token.", json_refresh_token_file_path); + exit (1); + } } - } else if (json_refresh_token_file_path != NULL) { - creds = create_refresh_token_creds(json_refresh_token_file_path); - if (creds == NULL) { - gpr_log(GPR_ERROR, - "Could not create refresh token creds. %s does probably not " - "contain a valid json refresh token.", - json_refresh_token_file_path); - exit(1); + else + { + gpr_log (GPR_ERROR, "Missing --gce or --json_refresh_token option."); + exit (1); } - } else { - gpr_log(GPR_ERROR, "Missing --gce or --json_refresh_token option."); - exit(1); - } - GPR_ASSERT(creds != NULL); + GPR_ASSERT (creds != NULL); - token = grpc_test_fetch_oauth2_token_with_credentials(creds); - if (token != NULL) { - printf("Got token: %s.\n", token); - gpr_free(token); - } - grpc_credentials_release(creds); - gpr_cmdline_destroy(cl); - grpc_shutdown(); + token = grpc_test_fetch_oauth2_token_with_credentials (creds); + if (token != NULL) + { + printf ("Got token: %s.\n", token); + gpr_free (token); + } + grpc_credentials_release (creds); + gpr_cmdline_destroy (cl); + grpc_shutdown (); return 0; } diff --git a/test/core/security/json_token_test.c b/test/core/security/json_token_test.c index 740fd018b61..d57340f107a 100644 --- a/test/core/security/json_token_test.c +++ b/test/core/security/json_token_test.c @@ -47,230 +47,174 @@ /* This JSON key was generated with the GCE console and revoked immediately. The identifiers have been changed as well. Maximum size for a string literal is 509 chars in C89, yay! */ -static const char test_json_key_str_part1[] = - "{ \"private_key\": \"-----BEGIN PRIVATE KEY-----" - "\\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOEvJsnoHnyHkXcp\\n7mJE" - "qg" - "WGjiw71NfXByguekSKho65FxaGbsnSM9SMQAqVk7Q2rG+I0OpsT0LrWQtZ\\nyjSeg/" - "rWBQvS4hle4LfijkP3J5BG+" - "IXDMP8RfziNRQsenAXDNPkY4kJCvKux2xdD\\nOnVF6N7dL3nTYZg+" - "uQrNsMTz9UxVAgMBAAECgYEAzbLewe1xe9vy+2GoSsfib+28\\nDZgSE6Bu/" - "zuFoPrRc6qL9p2SsnV7txrunTyJkkOnPLND9ABAXybRTlcVKP/sGgza\\n/" - "8HpCqFYM9V8f34SBWfD4fRFT+n/" - "73cfRUtGXdXpseva2lh8RilIQfPhNZAncenU\\ngqXjDvpkypEusgXAykECQQD+"; -static const char test_json_key_str_part2[] = - "53XxNVnxBHsYb+AYEfklR96yVi8HywjVHP34+OQZ\\nCslxoHQM8s+" - "dBnjfScLu22JqkPv04xyxmt0QAKm9+vTdAkEA4ib7YvEAn2jXzcCI\\nEkoy2L/" - "XydR1GCHoacdfdAwiL2npOdnbvi4ZmdYRPY1LSTO058tQHKVXV7NLeCa3\\nAARh2QJBAMKeDA" - "G" - "W303SQv2cZTdbeaLKJbB5drz3eo3j7dDKjrTD9JupixFbzcGw\\n8FZi5c8idxiwC36kbAL6Hz" - "A" - "ZoX+ofI0CQE6KCzPJTtYNqyShgKAZdJ8hwOcvCZtf\\n6z8RJm0+" - "6YBd38lfh5j8mZd7aHFf6I17j5AQY7oPEc47TjJj/" - "5nZ68ECQQDvYuI3\\nLyK5fS8g0SYbmPOL9TlcHDOqwG0mrX9qpg5DC2fniXNSrrZ64GTDKdzZ" - "Y" - "Ap6LI9W\\nIqv4vr6y38N79TTC\\n-----END PRIVATE KEY-----\\n\", "; -static const char test_json_key_str_part3[] = - "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " - "\"client_email\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." - "com\", \"client_id\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." - "com\", \"type\": \"service_account\" }"; +static const char test_json_key_str_part1[] = "{ \"private_key\": \"-----BEGIN PRIVATE KEY-----" "\\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOEvJsnoHnyHkXcp\\n7mJE" "qg" "WGjiw71NfXByguekSKho65FxaGbsnSM9SMQAqVk7Q2rG+I0OpsT0LrWQtZ\\nyjSeg/" "rWBQvS4hle4LfijkP3J5BG+" "IXDMP8RfziNRQsenAXDNPkY4kJCvKux2xdD\\nOnVF6N7dL3nTYZg+" "uQrNsMTz9UxVAgMBAAECgYEAzbLewe1xe9vy+2GoSsfib+28\\nDZgSE6Bu/" "zuFoPrRc6qL9p2SsnV7txrunTyJkkOnPLND9ABAXybRTlcVKP/sGgza\\n/" "8HpCqFYM9V8f34SBWfD4fRFT+n/" "73cfRUtGXdXpseva2lh8RilIQfPhNZAncenU\\ngqXjDvpkypEusgXAykECQQD+"; +static const char test_json_key_str_part2[] = "53XxNVnxBHsYb+AYEfklR96yVi8HywjVHP34+OQZ\\nCslxoHQM8s+" "dBnjfScLu22JqkPv04xyxmt0QAKm9+vTdAkEA4ib7YvEAn2jXzcCI\\nEkoy2L/" "XydR1GCHoacdfdAwiL2npOdnbvi4ZmdYRPY1LSTO058tQHKVXV7NLeCa3\\nAARh2QJBAMKeDA" "G" "W303SQv2cZTdbeaLKJbB5drz3eo3j7dDKjrTD9JupixFbzcGw\\n8FZi5c8idxiwC36kbAL6Hz" "A" "ZoX+ofI0CQE6KCzPJTtYNqyShgKAZdJ8hwOcvCZtf\\n6z8RJm0+" "6YBd38lfh5j8mZd7aHFf6I17j5AQY7oPEc47TjJj/" "5nZ68ECQQDvYuI3\\nLyK5fS8g0SYbmPOL9TlcHDOqwG0mrX9qpg5DC2fniXNSrrZ64GTDKdzZ" "Y" "Ap6LI9W\\nIqv4vr6y38N79TTC\\n-----END PRIVATE KEY-----\\n\", "; +static const char test_json_key_str_part3[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; /* Test refresh token. */ -static const char test_refresh_token_str[] = - "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," - " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," - " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," - " \"type\": \"authorized_user\"}"; +static const char test_refresh_token_str[] = "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," " \"type\": \"authorized_user\"}"; static const char test_scope[] = "myperm1 myperm2"; static const char test_service_url[] = "https://foo.com/foo.v1"; -static char *test_json_key_str(const char *bad_part3) { +static char * +test_json_key_str (const char *bad_part3) +{ const char *part3 = bad_part3 != NULL ? bad_part3 : test_json_key_str_part3; - size_t result_len = strlen(test_json_key_str_part1) + - strlen(test_json_key_str_part2) + strlen(part3); - char *result = gpr_malloc(result_len + 1); + size_t result_len = strlen (test_json_key_str_part1) + strlen (test_json_key_str_part2) + strlen (part3); + char *result = gpr_malloc (result_len + 1); char *current = result; - strcpy(result, test_json_key_str_part1); - current += strlen(test_json_key_str_part1); - strcpy(current, test_json_key_str_part2); - current += strlen(test_json_key_str_part2); - strcpy(current, part3); + strcpy (result, test_json_key_str_part1); + current += strlen (test_json_key_str_part1); + strcpy (current, test_json_key_str_part2); + current += strlen (test_json_key_str_part2); + strcpy (current, part3); return result; } -static void test_parse_json_key_success(void) { - char *json_string = test_json_key_str(NULL); - grpc_auth_json_key json_key = - grpc_auth_json_key_create_from_string(json_string); - GPR_ASSERT(grpc_auth_json_key_is_valid(&json_key)); - GPR_ASSERT(json_key.type != NULL && - strcmp(json_key.type, "service_account") == 0); - GPR_ASSERT(json_key.private_key_id != NULL && - strcmp(json_key.private_key_id, - "e6b5137873db8d2ef81e06a47289e6434ec8a165") == 0); - GPR_ASSERT(json_key.client_id != NULL && - strcmp(json_key.client_id, - "777-abaslkan11hlb6nmim3bpspl31ud.apps." - "googleusercontent.com") == 0); - GPR_ASSERT(json_key.client_email != NULL && - strcmp(json_key.client_email, - "777-abaslkan11hlb6nmim3bpspl31ud@developer." - "gserviceaccount.com") == 0); - GPR_ASSERT(json_key.private_key != NULL); - gpr_free(json_string); - grpc_auth_json_key_destruct(&json_key); +static void +test_parse_json_key_success (void) +{ + char *json_string = test_json_key_str (NULL); + grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (json_string); + GPR_ASSERT (grpc_auth_json_key_is_valid (&json_key)); + GPR_ASSERT (json_key.type != NULL && strcmp (json_key.type, "service_account") == 0); + GPR_ASSERT (json_key.private_key_id != NULL && strcmp (json_key.private_key_id, "e6b5137873db8d2ef81e06a47289e6434ec8a165") == 0); + GPR_ASSERT (json_key.client_id != NULL && strcmp (json_key.client_id, "777-abaslkan11hlb6nmim3bpspl31ud.apps." "googleusercontent.com") == 0); + GPR_ASSERT (json_key.client_email != NULL && strcmp (json_key.client_email, "777-abaslkan11hlb6nmim3bpspl31ud@developer." "gserviceaccount.com") == 0); + GPR_ASSERT (json_key.private_key != NULL); + gpr_free (json_string); + grpc_auth_json_key_destruct (&json_key); } -static void test_parse_json_key_failure_bad_json(void) { - const char non_closing_part3[] = - "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " - "\"client_email\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." - "com\", \"client_id\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." - "com\", \"type\": \"service_account\" "; - char *json_string = test_json_key_str(non_closing_part3); - grpc_auth_json_key json_key = - grpc_auth_json_key_create_from_string(json_string); - GPR_ASSERT(!grpc_auth_json_key_is_valid(&json_key)); - gpr_free(json_string); - grpc_auth_json_key_destruct(&json_key); +static void +test_parse_json_key_failure_bad_json (void) +{ + const char non_closing_part3[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" "; + char *json_string = test_json_key_str (non_closing_part3); + grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (json_string); + GPR_ASSERT (!grpc_auth_json_key_is_valid (&json_key)); + gpr_free (json_string); + grpc_auth_json_key_destruct (&json_key); } -static void test_parse_json_key_failure_no_type(void) { - const char no_type_part3[] = - "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " - "\"client_email\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." - "com\", \"client_id\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." - "com\" }"; - char *json_string = test_json_key_str(no_type_part3); - grpc_auth_json_key json_key = - grpc_auth_json_key_create_from_string(json_string); - GPR_ASSERT(!grpc_auth_json_key_is_valid(&json_key)); - gpr_free(json_string); - grpc_auth_json_key_destruct(&json_key); +static void +test_parse_json_key_failure_no_type (void) +{ + const char no_type_part3[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\" }"; + char *json_string = test_json_key_str (no_type_part3); + grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (json_string); + GPR_ASSERT (!grpc_auth_json_key_is_valid (&json_key)); + gpr_free (json_string); + grpc_auth_json_key_destruct (&json_key); } -static void test_parse_json_key_failure_no_client_id(void) { - const char no_client_id_part3[] = - "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " - "\"client_email\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." - "com\", " - "\"type\": \"service_account\" }"; - char *json_string = test_json_key_str(no_client_id_part3); - grpc_auth_json_key json_key = - grpc_auth_json_key_create_from_string(json_string); - GPR_ASSERT(!grpc_auth_json_key_is_valid(&json_key)); - gpr_free(json_string); - grpc_auth_json_key_destruct(&json_key); +static void +test_parse_json_key_failure_no_client_id (void) +{ + const char no_client_id_part3[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", " "\"type\": \"service_account\" }"; + char *json_string = test_json_key_str (no_client_id_part3); + grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (json_string); + GPR_ASSERT (!grpc_auth_json_key_is_valid (&json_key)); + gpr_free (json_string); + grpc_auth_json_key_destruct (&json_key); } -static void test_parse_json_key_failure_no_client_email(void) { - const char no_client_email_part3[] = - "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " - "\"client_id\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." - "com\", \"type\": \"service_account\" }"; - char *json_string = test_json_key_str(no_client_email_part3); - grpc_auth_json_key json_key = - grpc_auth_json_key_create_from_string(json_string); - GPR_ASSERT(!grpc_auth_json_key_is_valid(&json_key)); - gpr_free(json_string); - grpc_auth_json_key_destruct(&json_key); +static void +test_parse_json_key_failure_no_client_email (void) +{ + const char no_client_email_part3[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; + char *json_string = test_json_key_str (no_client_email_part3); + grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (json_string); + GPR_ASSERT (!grpc_auth_json_key_is_valid (&json_key)); + gpr_free (json_string); + grpc_auth_json_key_destruct (&json_key); } -static void test_parse_json_key_failure_no_private_key_id(void) { - const char no_private_key_id_part3[] = - "\"client_email\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." - "com\", \"client_id\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." - "com\", \"type\": \"service_account\" }"; - char *json_string = test_json_key_str(no_private_key_id_part3); - grpc_auth_json_key json_key = - grpc_auth_json_key_create_from_string(json_string); - GPR_ASSERT(!grpc_auth_json_key_is_valid(&json_key)); - gpr_free(json_string); - grpc_auth_json_key_destruct(&json_key); +static void +test_parse_json_key_failure_no_private_key_id (void) +{ + const char no_private_key_id_part3[] = "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; + char *json_string = test_json_key_str (no_private_key_id_part3); + grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (json_string); + GPR_ASSERT (!grpc_auth_json_key_is_valid (&json_key)); + gpr_free (json_string); + grpc_auth_json_key_destruct (&json_key); } -static void test_parse_json_key_failure_no_private_key(void) { - const char no_private_key_json_string[] = - "{ \"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " - "\"client_email\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." - "com\", \"client_id\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." - "com\", \"type\": \"service_account\" }"; - grpc_auth_json_key json_key = - grpc_auth_json_key_create_from_string(no_private_key_json_string); - GPR_ASSERT(!grpc_auth_json_key_is_valid(&json_key)); - grpc_auth_json_key_destruct(&json_key); +static void +test_parse_json_key_failure_no_private_key (void) +{ + const char no_private_key_json_string[] = "{ \"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; + grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (no_private_key_json_string); + GPR_ASSERT (!grpc_auth_json_key_is_valid (&json_key)); + grpc_auth_json_key_destruct (&json_key); } -static grpc_json *parse_json_part_from_jwt(const char *str, size_t len, - char **scratchpad) { +static grpc_json * +parse_json_part_from_jwt (const char *str, size_t len, char **scratchpad) +{ char *b64; char *decoded; grpc_json *json; gpr_slice slice; - b64 = gpr_malloc(len + 1); - strncpy(b64, str, len); + b64 = gpr_malloc (len + 1); + strncpy (b64, str, len); b64[len] = '\0'; - slice = grpc_base64_decode(b64, 1); - GPR_ASSERT(!GPR_SLICE_IS_EMPTY(slice)); - decoded = gpr_malloc(GPR_SLICE_LENGTH(slice) + 1); - strncpy(decoded, (const char *)GPR_SLICE_START_PTR(slice), - GPR_SLICE_LENGTH(slice)); - decoded[GPR_SLICE_LENGTH(slice)] = '\0'; - json = grpc_json_parse_string(decoded); - gpr_free(b64); + slice = grpc_base64_decode (b64, 1); + GPR_ASSERT (!GPR_SLICE_IS_EMPTY (slice)); + decoded = gpr_malloc (GPR_SLICE_LENGTH (slice) + 1); + strncpy (decoded, (const char *) GPR_SLICE_START_PTR (slice), GPR_SLICE_LENGTH (slice)); + decoded[GPR_SLICE_LENGTH (slice)] = '\0'; + json = grpc_json_parse_string (decoded); + gpr_free (b64); *scratchpad = decoded; - gpr_slice_unref(slice); + gpr_slice_unref (slice); return json; } -static void check_jwt_header(grpc_json *header) { +static void +check_jwt_header (grpc_json * header) +{ grpc_json *ptr; grpc_json *alg = NULL; grpc_json *typ = NULL; grpc_json *kid = NULL; - for (ptr = header->child; ptr; ptr = ptr->next) { - if (strcmp(ptr->key, "alg") == 0) { - alg = ptr; - } else if (strcmp(ptr->key, "typ") == 0) { - typ = ptr; - } else if (strcmp(ptr->key, "kid") == 0) { - kid = ptr; + for (ptr = header->child; ptr; ptr = ptr->next) + { + if (strcmp (ptr->key, "alg") == 0) + { + alg = ptr; + } + else if (strcmp (ptr->key, "typ") == 0) + { + typ = ptr; + } + else if (strcmp (ptr->key, "kid") == 0) + { + kid = ptr; + } } - } - GPR_ASSERT(alg != NULL); - GPR_ASSERT(alg->type == GRPC_JSON_STRING); - GPR_ASSERT(strcmp(alg->value, "RS256") == 0); - - GPR_ASSERT(typ != NULL); - GPR_ASSERT(typ->type == GRPC_JSON_STRING); - GPR_ASSERT(strcmp(typ->value, "JWT") == 0); - - GPR_ASSERT(kid != NULL); - GPR_ASSERT(kid->type == GRPC_JSON_STRING); - GPR_ASSERT(strcmp(kid->value, "e6b5137873db8d2ef81e06a47289e6434ec8a165") == - 0); + GPR_ASSERT (alg != NULL); + GPR_ASSERT (alg->type == GRPC_JSON_STRING); + GPR_ASSERT (strcmp (alg->value, "RS256") == 0); + + GPR_ASSERT (typ != NULL); + GPR_ASSERT (typ->type == GRPC_JSON_STRING); + GPR_ASSERT (strcmp (typ->value, "JWT") == 0); + + GPR_ASSERT (kid != NULL); + GPR_ASSERT (kid->type == GRPC_JSON_STRING); + GPR_ASSERT (strcmp (kid->value, "e6b5137873db8d2ef81e06a47289e6434ec8a165") == 0); } -static void check_jwt_claim(grpc_json *claim, const char *expected_audience, - const char *expected_scope) { - gpr_timespec expiration = gpr_time_0(GPR_CLOCK_REALTIME); - gpr_timespec issue_time = gpr_time_0(GPR_CLOCK_REALTIME); +static void +check_jwt_claim (grpc_json * claim, const char *expected_audience, const char *expected_scope) +{ + gpr_timespec expiration = gpr_time_0 (GPR_CLOCK_REALTIME); + gpr_timespec issue_time = gpr_time_0 (GPR_CLOCK_REALTIME); gpr_timespec parsed_lifetime; grpc_json *iss = NULL; grpc_json *scope = NULL; @@ -280,228 +224,231 @@ static void check_jwt_claim(grpc_json *claim, const char *expected_audience, grpc_json *sub = NULL; grpc_json *ptr; - for (ptr = claim->child; ptr; ptr = ptr->next) { - if (strcmp(ptr->key, "iss") == 0) { - iss = ptr; - } else if (strcmp(ptr->key, "sub") == 0) { - sub = ptr; - } else if (strcmp(ptr->key, "scope") == 0) { - scope = ptr; - } else if (strcmp(ptr->key, "aud") == 0) { - aud = ptr; - } else if (strcmp(ptr->key, "exp") == 0) { - exp = ptr; - } else if (strcmp(ptr->key, "iat") == 0) { - iat = ptr; + for (ptr = claim->child; ptr; ptr = ptr->next) + { + if (strcmp (ptr->key, "iss") == 0) + { + iss = ptr; + } + else if (strcmp (ptr->key, "sub") == 0) + { + sub = ptr; + } + else if (strcmp (ptr->key, "scope") == 0) + { + scope = ptr; + } + else if (strcmp (ptr->key, "aud") == 0) + { + aud = ptr; + } + else if (strcmp (ptr->key, "exp") == 0) + { + exp = ptr; + } + else if (strcmp (ptr->key, "iat") == 0) + { + iat = ptr; + } + } + + GPR_ASSERT (iss != NULL); + GPR_ASSERT (iss->type == GRPC_JSON_STRING); + GPR_ASSERT (strcmp (iss->value, "777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount.com") == 0); + + if (expected_scope != NULL) + { + GPR_ASSERT (scope != NULL); + GPR_ASSERT (sub == NULL); + GPR_ASSERT (scope->type == GRPC_JSON_STRING); + GPR_ASSERT (strcmp (scope->value, expected_scope) == 0); } - } - - GPR_ASSERT(iss != NULL); - GPR_ASSERT(iss->type == GRPC_JSON_STRING); - GPR_ASSERT( - strcmp( - iss->value, - "777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount.com") == - 0); - - if (expected_scope != NULL) { - GPR_ASSERT(scope != NULL); - GPR_ASSERT(sub == NULL); - GPR_ASSERT(scope->type == GRPC_JSON_STRING); - GPR_ASSERT(strcmp(scope->value, expected_scope) == 0); - } else { - /* Claims without scope must have a sub. */ - GPR_ASSERT(scope == NULL); - GPR_ASSERT(sub != NULL); - GPR_ASSERT(sub->type == GRPC_JSON_STRING); - GPR_ASSERT(strcmp(iss->value, sub->value) == 0); - } - - GPR_ASSERT(aud != NULL); - GPR_ASSERT(aud->type == GRPC_JSON_STRING); - GPR_ASSERT(strcmp(aud->value, expected_audience) == 0); - - GPR_ASSERT(exp != NULL); - GPR_ASSERT(exp->type == GRPC_JSON_NUMBER); - expiration.tv_sec = strtol(exp->value, NULL, 10); - - GPR_ASSERT(iat != NULL); - GPR_ASSERT(iat->type == GRPC_JSON_NUMBER); - issue_time.tv_sec = strtol(iat->value, NULL, 10); - - parsed_lifetime = gpr_time_sub(expiration, issue_time); - GPR_ASSERT(parsed_lifetime.tv_sec == grpc_max_auth_token_lifetime.tv_sec); + else + { + /* Claims without scope must have a sub. */ + GPR_ASSERT (scope == NULL); + GPR_ASSERT (sub != NULL); + GPR_ASSERT (sub->type == GRPC_JSON_STRING); + GPR_ASSERT (strcmp (iss->value, sub->value) == 0); + } + + GPR_ASSERT (aud != NULL); + GPR_ASSERT (aud->type == GRPC_JSON_STRING); + GPR_ASSERT (strcmp (aud->value, expected_audience) == 0); + + GPR_ASSERT (exp != NULL); + GPR_ASSERT (exp->type == GRPC_JSON_NUMBER); + expiration.tv_sec = strtol (exp->value, NULL, 10); + + GPR_ASSERT (iat != NULL); + GPR_ASSERT (iat->type == GRPC_JSON_NUMBER); + issue_time.tv_sec = strtol (iat->value, NULL, 10); + + parsed_lifetime = gpr_time_sub (expiration, issue_time); + GPR_ASSERT (parsed_lifetime.tv_sec == grpc_max_auth_token_lifetime.tv_sec); } -static void check_jwt_signature(const char *b64_signature, RSA *rsa_key, - const char *signed_data, - size_t signed_data_size) { - EVP_MD_CTX *md_ctx = EVP_MD_CTX_create(); - EVP_PKEY *key = EVP_PKEY_new(); - - gpr_slice sig = grpc_base64_decode(b64_signature, 1); - GPR_ASSERT(!GPR_SLICE_IS_EMPTY(sig)); - GPR_ASSERT(GPR_SLICE_LENGTH(sig) == 128); - - GPR_ASSERT(md_ctx != NULL); - GPR_ASSERT(key != NULL); - EVP_PKEY_set1_RSA(key, rsa_key); - - GPR_ASSERT(EVP_DigestVerifyInit(md_ctx, NULL, EVP_sha256(), NULL, key) == 1); - GPR_ASSERT(EVP_DigestVerifyUpdate(md_ctx, signed_data, signed_data_size) == - 1); - GPR_ASSERT(EVP_DigestVerifyFinal(md_ctx, GPR_SLICE_START_PTR(sig), - GPR_SLICE_LENGTH(sig)) == 1); - - gpr_slice_unref(sig); - if (key != NULL) EVP_PKEY_free(key); - if (md_ctx != NULL) EVP_MD_CTX_destroy(md_ctx); +static void +check_jwt_signature (const char *b64_signature, RSA * rsa_key, const char *signed_data, size_t signed_data_size) +{ + EVP_MD_CTX *md_ctx = EVP_MD_CTX_create (); + EVP_PKEY *key = EVP_PKEY_new (); + + gpr_slice sig = grpc_base64_decode (b64_signature, 1); + GPR_ASSERT (!GPR_SLICE_IS_EMPTY (sig)); + GPR_ASSERT (GPR_SLICE_LENGTH (sig) == 128); + + GPR_ASSERT (md_ctx != NULL); + GPR_ASSERT (key != NULL); + EVP_PKEY_set1_RSA (key, rsa_key); + + GPR_ASSERT (EVP_DigestVerifyInit (md_ctx, NULL, EVP_sha256 (), NULL, key) == 1); + GPR_ASSERT (EVP_DigestVerifyUpdate (md_ctx, signed_data, signed_data_size) == 1); + GPR_ASSERT (EVP_DigestVerifyFinal (md_ctx, GPR_SLICE_START_PTR (sig), GPR_SLICE_LENGTH (sig)) == 1); + + gpr_slice_unref (sig); + if (key != NULL) + EVP_PKEY_free (key); + if (md_ctx != NULL) + EVP_MD_CTX_destroy (md_ctx); } -static char *service_account_creds_jwt_encode_and_sign( - const grpc_auth_json_key *key) { - return grpc_jwt_encode_and_sign(key, GRPC_JWT_OAUTH2_AUDIENCE, - grpc_max_auth_token_lifetime, test_scope); +static char * +service_account_creds_jwt_encode_and_sign (const grpc_auth_json_key * key) +{ + return grpc_jwt_encode_and_sign (key, GRPC_JWT_OAUTH2_AUDIENCE, grpc_max_auth_token_lifetime, test_scope); } -static char *jwt_creds_jwt_encode_and_sign(const grpc_auth_json_key *key) { - return grpc_jwt_encode_and_sign(key, test_service_url, - grpc_max_auth_token_lifetime, NULL); +static char * +jwt_creds_jwt_encode_and_sign (const grpc_auth_json_key * key) +{ + return grpc_jwt_encode_and_sign (key, test_service_url, grpc_max_auth_token_lifetime, NULL); } -static void service_account_creds_check_jwt_claim(grpc_json *claim) { - check_jwt_claim(claim, GRPC_JWT_OAUTH2_AUDIENCE, test_scope); +static void +service_account_creds_check_jwt_claim (grpc_json * claim) +{ + check_jwt_claim (claim, GRPC_JWT_OAUTH2_AUDIENCE, test_scope); } -static void jwt_creds_check_jwt_claim(grpc_json *claim) { - check_jwt_claim(claim, test_service_url, NULL); +static void +jwt_creds_check_jwt_claim (grpc_json * claim) +{ + check_jwt_claim (claim, test_service_url, NULL); } -static void test_jwt_encode_and_sign( - char *(*jwt_encode_and_sign_func)(const grpc_auth_json_key *), - void (*check_jwt_claim_func)(grpc_json *)) { - char *json_string = test_json_key_str(NULL); +static void +test_jwt_encode_and_sign (char *(*jwt_encode_and_sign_func) (const grpc_auth_json_key *), void (*check_jwt_claim_func) (grpc_json *)) +{ + char *json_string = test_json_key_str (NULL); grpc_json *parsed_header = NULL; grpc_json *parsed_claim = NULL; char *scratchpad; - grpc_auth_json_key json_key = - grpc_auth_json_key_create_from_string(json_string); + grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (json_string); const char *b64_signature; size_t offset = 0; - char *jwt = jwt_encode_and_sign_func(&json_key); - const char *dot = strchr(jwt, '.'); - GPR_ASSERT(dot != NULL); - parsed_header = - parse_json_part_from_jwt(jwt, (size_t)(dot - jwt), &scratchpad); - GPR_ASSERT(parsed_header != NULL); - check_jwt_header(parsed_header); - offset = (size_t)(dot - jwt) + 1; - grpc_json_destroy(parsed_header); - gpr_free(scratchpad); - - dot = strchr(jwt + offset, '.'); - GPR_ASSERT(dot != NULL); - parsed_claim = parse_json_part_from_jwt( - jwt + offset, (size_t)(dot - (jwt + offset)), &scratchpad); - GPR_ASSERT(parsed_claim != NULL); - check_jwt_claim_func(parsed_claim); - offset = (size_t)(dot - jwt) + 1; - grpc_json_destroy(parsed_claim); - gpr_free(scratchpad); - - dot = strchr(jwt + offset, '.'); - GPR_ASSERT(dot == NULL); /* no more part. */ + char *jwt = jwt_encode_and_sign_func (&json_key); + const char *dot = strchr (jwt, '.'); + GPR_ASSERT (dot != NULL); + parsed_header = parse_json_part_from_jwt (jwt, (size_t) (dot - jwt), &scratchpad); + GPR_ASSERT (parsed_header != NULL); + check_jwt_header (parsed_header); + offset = (size_t) (dot - jwt) + 1; + grpc_json_destroy (parsed_header); + gpr_free (scratchpad); + + dot = strchr (jwt + offset, '.'); + GPR_ASSERT (dot != NULL); + parsed_claim = parse_json_part_from_jwt (jwt + offset, (size_t) (dot - (jwt + offset)), &scratchpad); + GPR_ASSERT (parsed_claim != NULL); + check_jwt_claim_func (parsed_claim); + offset = (size_t) (dot - jwt) + 1; + grpc_json_destroy (parsed_claim); + gpr_free (scratchpad); + + dot = strchr (jwt + offset, '.'); + GPR_ASSERT (dot == NULL); /* no more part. */ b64_signature = jwt + offset; - check_jwt_signature(b64_signature, json_key.private_key, jwt, offset - 1); + check_jwt_signature (b64_signature, json_key.private_key, jwt, offset - 1); - gpr_free(json_string); - grpc_auth_json_key_destruct(&json_key); - gpr_free(jwt); + gpr_free (json_string); + grpc_auth_json_key_destruct (&json_key); + gpr_free (jwt); } -static void test_service_account_creds_jwt_encode_and_sign(void) { - test_jwt_encode_and_sign(service_account_creds_jwt_encode_and_sign, - service_account_creds_check_jwt_claim); +static void +test_service_account_creds_jwt_encode_and_sign (void) +{ + test_jwt_encode_and_sign (service_account_creds_jwt_encode_and_sign, service_account_creds_check_jwt_claim); } -static void test_jwt_creds_jwt_encode_and_sign(void) { - test_jwt_encode_and_sign(jwt_creds_jwt_encode_and_sign, - jwt_creds_check_jwt_claim); +static void +test_jwt_creds_jwt_encode_and_sign (void) +{ + test_jwt_encode_and_sign (jwt_creds_jwt_encode_and_sign, jwt_creds_check_jwt_claim); } -static void test_parse_refresh_token_success(void) { - grpc_auth_refresh_token refresh_token = - grpc_auth_refresh_token_create_from_string(test_refresh_token_str); - GPR_ASSERT(grpc_auth_refresh_token_is_valid(&refresh_token)); - GPR_ASSERT(refresh_token.type != NULL && - (strcmp(refresh_token.type, "authorized_user") == 0)); - GPR_ASSERT(refresh_token.client_id != NULL && - (strcmp(refresh_token.client_id, - "32555999999.apps.googleusercontent.com") == 0)); - GPR_ASSERT( - refresh_token.client_secret != NULL && - (strcmp(refresh_token.client_secret, "EmssLNjJy1332hD4KFsecret") == 0)); - GPR_ASSERT(refresh_token.refresh_token != NULL && - (strcmp(refresh_token.refresh_token, - "1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42") == 0)); - grpc_auth_refresh_token_destruct(&refresh_token); +static void +test_parse_refresh_token_success (void) +{ + grpc_auth_refresh_token refresh_token = grpc_auth_refresh_token_create_from_string (test_refresh_token_str); + GPR_ASSERT (grpc_auth_refresh_token_is_valid (&refresh_token)); + GPR_ASSERT (refresh_token.type != NULL && (strcmp (refresh_token.type, "authorized_user") == 0)); + GPR_ASSERT (refresh_token.client_id != NULL && (strcmp (refresh_token.client_id, "32555999999.apps.googleusercontent.com") == 0)); + GPR_ASSERT (refresh_token.client_secret != NULL && (strcmp (refresh_token.client_secret, "EmssLNjJy1332hD4KFsecret") == 0)); + GPR_ASSERT (refresh_token.refresh_token != NULL && (strcmp (refresh_token.refresh_token, "1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42") == 0)); + grpc_auth_refresh_token_destruct (&refresh_token); } -static void test_parse_refresh_token_failure_no_type(void) { - const char refresh_token_str[] = - "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," - " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," - " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"}"; - grpc_auth_refresh_token refresh_token = - grpc_auth_refresh_token_create_from_string(refresh_token_str); - GPR_ASSERT(!grpc_auth_refresh_token_is_valid(&refresh_token)); +static void +test_parse_refresh_token_failure_no_type (void) +{ + const char refresh_token_str[] = "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"}"; + grpc_auth_refresh_token refresh_token = grpc_auth_refresh_token_create_from_string (refresh_token_str); + GPR_ASSERT (!grpc_auth_refresh_token_is_valid (&refresh_token)); } -static void test_parse_refresh_token_failure_no_client_id(void) { - const char refresh_token_str[] = - "{ \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," - " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," - " \"type\": \"authorized_user\"}"; - grpc_auth_refresh_token refresh_token = - grpc_auth_refresh_token_create_from_string(refresh_token_str); - GPR_ASSERT(!grpc_auth_refresh_token_is_valid(&refresh_token)); +static void +test_parse_refresh_token_failure_no_client_id (void) +{ + const char refresh_token_str[] = "{ \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," " \"type\": \"authorized_user\"}"; + grpc_auth_refresh_token refresh_token = grpc_auth_refresh_token_create_from_string (refresh_token_str); + GPR_ASSERT (!grpc_auth_refresh_token_is_valid (&refresh_token)); } -static void test_parse_refresh_token_failure_no_client_secret(void) { - const char refresh_token_str[] = - "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," - " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," - " \"type\": \"authorized_user\"}"; - grpc_auth_refresh_token refresh_token = - grpc_auth_refresh_token_create_from_string(refresh_token_str); - GPR_ASSERT(!grpc_auth_refresh_token_is_valid(&refresh_token)); +static void +test_parse_refresh_token_failure_no_client_secret (void) +{ + const char refresh_token_str[] = "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," " \"type\": \"authorized_user\"}"; + grpc_auth_refresh_token refresh_token = grpc_auth_refresh_token_create_from_string (refresh_token_str); + GPR_ASSERT (!grpc_auth_refresh_token_is_valid (&refresh_token)); } -static void test_parse_refresh_token_failure_no_refresh_token(void) { - const char refresh_token_str[] = - "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," - " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," - " \"type\": \"authorized_user\"}"; - grpc_auth_refresh_token refresh_token = - grpc_auth_refresh_token_create_from_string(refresh_token_str); - GPR_ASSERT(!grpc_auth_refresh_token_is_valid(&refresh_token)); +static void +test_parse_refresh_token_failure_no_refresh_token (void) +{ + const char refresh_token_str[] = "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," " \"type\": \"authorized_user\"}"; + grpc_auth_refresh_token refresh_token = grpc_auth_refresh_token_create_from_string (refresh_token_str); + GPR_ASSERT (!grpc_auth_refresh_token_is_valid (&refresh_token)); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_parse_json_key_success(); - test_parse_json_key_failure_bad_json(); - test_parse_json_key_failure_no_type(); - test_parse_json_key_failure_no_client_id(); - test_parse_json_key_failure_no_client_email(); - test_parse_json_key_failure_no_private_key_id(); - test_parse_json_key_failure_no_private_key(); - test_service_account_creds_jwt_encode_and_sign(); - test_jwt_creds_jwt_encode_and_sign(); - test_parse_refresh_token_success(); - test_parse_refresh_token_failure_no_type(); - test_parse_refresh_token_failure_no_client_id(); - test_parse_refresh_token_failure_no_client_secret(); - test_parse_refresh_token_failure_no_refresh_token(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_parse_json_key_success (); + test_parse_json_key_failure_bad_json (); + test_parse_json_key_failure_no_type (); + test_parse_json_key_failure_no_client_id (); + test_parse_json_key_failure_no_client_email (); + test_parse_json_key_failure_no_private_key_id (); + test_parse_json_key_failure_no_private_key (); + test_service_account_creds_jwt_encode_and_sign (); + test_jwt_creds_jwt_encode_and_sign (); + test_parse_refresh_token_success (); + test_parse_refresh_token_failure_no_type (); + test_parse_refresh_token_failure_no_client_id (); + test_parse_refresh_token_failure_no_client_secret (); + test_parse_refresh_token_failure_no_refresh_token (); return 0; } diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c index f2215e18227..15c19e2533e 100644 --- a/test/core/security/jwt_verifier_test.c +++ b/test/core/security/jwt_verifier_test.c @@ -48,540 +48,429 @@ /* This JSON key was generated with the GCE console and revoked immediately. The identifiers have been changed as well. Maximum size for a string literal is 509 chars in C89, yay! */ -static const char json_key_str_part1[] = - "{ \"private_key\": \"-----BEGIN PRIVATE KEY-----" - "\\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOEvJsnoHnyHkXcp\\n7mJE" - "qg" - "WGjiw71NfXByguekSKho65FxaGbsnSM9SMQAqVk7Q2rG+I0OpsT0LrWQtZ\\nyjSeg/" - "rWBQvS4hle4LfijkP3J5BG+" - "IXDMP8RfziNRQsenAXDNPkY4kJCvKux2xdD\\nOnVF6N7dL3nTYZg+" - "uQrNsMTz9UxVAgMBAAECgYEAzbLewe1xe9vy+2GoSsfib+28\\nDZgSE6Bu/" - "zuFoPrRc6qL9p2SsnV7txrunTyJkkOnPLND9ABAXybRTlcVKP/sGgza\\n/" - "8HpCqFYM9V8f34SBWfD4fRFT+n/" - "73cfRUtGXdXpseva2lh8RilIQfPhNZAncenU\\ngqXjDvpkypEusgXAykECQQD+"; -static const char json_key_str_part2[] = - "53XxNVnxBHsYb+AYEfklR96yVi8HywjVHP34+OQZ\\nCslxoHQM8s+" - "dBnjfScLu22JqkPv04xyxmt0QAKm9+vTdAkEA4ib7YvEAn2jXzcCI\\nEkoy2L/" - "XydR1GCHoacdfdAwiL2npOdnbvi4ZmdYRPY1LSTO058tQHKVXV7NLeCa3\\nAARh2QJBAMKeDA" - "G" - "W303SQv2cZTdbeaLKJbB5drz3eo3j7dDKjrTD9JupixFbzcGw\\n8FZi5c8idxiwC36kbAL6Hz" - "A" - "ZoX+ofI0CQE6KCzPJTtYNqyShgKAZdJ8hwOcvCZtf\\n6z8RJm0+" - "6YBd38lfh5j8mZd7aHFf6I17j5AQY7oPEc47TjJj/" - "5nZ68ECQQDvYuI3\\nLyK5fS8g0SYbmPOL9TlcHDOqwG0mrX9qpg5DC2fniXNSrrZ64GTDKdzZ" - "Y" - "Ap6LI9W\\nIqv4vr6y38N79TTC\\n-----END PRIVATE KEY-----\\n\", "; -static const char json_key_str_part3_for_google_email_issuer[] = - "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " - "\"client_email\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." - "com\", \"client_id\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." - "com\", \"type\": \"service_account\" }"; +static const char json_key_str_part1[] = "{ \"private_key\": \"-----BEGIN PRIVATE KEY-----" "\\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOEvJsnoHnyHkXcp\\n7mJE" "qg" "WGjiw71NfXByguekSKho65FxaGbsnSM9SMQAqVk7Q2rG+I0OpsT0LrWQtZ\\nyjSeg/" "rWBQvS4hle4LfijkP3J5BG+" "IXDMP8RfziNRQsenAXDNPkY4kJCvKux2xdD\\nOnVF6N7dL3nTYZg+" "uQrNsMTz9UxVAgMBAAECgYEAzbLewe1xe9vy+2GoSsfib+28\\nDZgSE6Bu/" "zuFoPrRc6qL9p2SsnV7txrunTyJkkOnPLND9ABAXybRTlcVKP/sGgza\\n/" "8HpCqFYM9V8f34SBWfD4fRFT+n/" "73cfRUtGXdXpseva2lh8RilIQfPhNZAncenU\\ngqXjDvpkypEusgXAykECQQD+"; +static const char json_key_str_part2[] = "53XxNVnxBHsYb+AYEfklR96yVi8HywjVHP34+OQZ\\nCslxoHQM8s+" "dBnjfScLu22JqkPv04xyxmt0QAKm9+vTdAkEA4ib7YvEAn2jXzcCI\\nEkoy2L/" "XydR1GCHoacdfdAwiL2npOdnbvi4ZmdYRPY1LSTO058tQHKVXV7NLeCa3\\nAARh2QJBAMKeDA" "G" "W303SQv2cZTdbeaLKJbB5drz3eo3j7dDKjrTD9JupixFbzcGw\\n8FZi5c8idxiwC36kbAL6Hz" "A" "ZoX+ofI0CQE6KCzPJTtYNqyShgKAZdJ8hwOcvCZtf\\n6z8RJm0+" "6YBd38lfh5j8mZd7aHFf6I17j5AQY7oPEc47TjJj/" "5nZ68ECQQDvYuI3\\nLyK5fS8g0SYbmPOL9TlcHDOqwG0mrX9qpg5DC2fniXNSrrZ64GTDKdzZ" "Y" "Ap6LI9W\\nIqv4vr6y38N79TTC\\n-----END PRIVATE KEY-----\\n\", "; +static const char json_key_str_part3_for_google_email_issuer[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; /* Trick our JWT library into issuing a JWT with iss=accounts.google.com. */ -static const char json_key_str_part3_for_url_issuer[] = - "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " - "\"client_email\": \"accounts.google.com\", " - "\"client_id\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." - "com\", \"type\": \"service_account\" }"; -static const char json_key_str_part3_for_custom_email_issuer[] = - "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " - "\"client_email\": " - "\"foo@bar.com\", \"client_id\": " - "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." - "com\", \"type\": \"service_account\" }"; +static const char json_key_str_part3_for_url_issuer[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": \"accounts.google.com\", " "\"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; +static const char json_key_str_part3_for_custom_email_issuer[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"foo@bar.com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; static grpc_jwt_verifier_email_domain_key_url_mapping custom_mapping = { - "bar.com", "keys.bar.com/jwk"}; + "bar.com", "keys.bar.com/jwk" +}; static const char expected_user_data[] = "user data"; -static const char good_jwk_set[] = - "{" - " \"keys\": [" - " {" - " \"kty\": \"RSA\"," - " \"alg\": \"RS256\"," - " \"use\": \"sig\"," - " \"kid\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\"," - " \"n\": " - "\"4S8myegefIeRdynuYkSqBYaOLDvU19cHKC56RIqGjrkXFoZuydIz1IxACpWTtDasb4jQ6mxP" - "QutZC1nKNJ6D-tYFC9LiGV7gt-KOQ_cnkEb4hcMw_xF_OI1FCx6cBcM0-" - "RjiQkK8q7HbF0M6dUXo3t0vedNhmD65Cs2wxPP1TFU=\"," - " \"e\": \"AQAB\"" - " }" - " ]" - "}"; - -static gpr_timespec expected_lifetime = {3600, 0, GPR_TIMESPAN}; - -static const char good_google_email_keys_part1[] = - "{\"e6b5137873db8d2ef81e06a47289e6434ec8a165\": \"-----BEGIN " - "CERTIFICATE-----" - "\\nMIICATCCAWoCCQDEywLhxvHjnDANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJB\\nVTET" - "MBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0\\ncyBQdHkgTHR" - "kMB4XDTE1MDYyOTA4Mzk1MFoXDTI1MDYyNjA4Mzk1MFowRTELMAkG\\nA1UEBhMCQVUxEzARBg" - "NVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0\\nIFdpZGdpdHMgUHR5IEx0ZDCBn" - "zANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4S8m\\nyegefIeRdynuYkSqBYaOLDvU19cHKC56" - "RIqGjrkXFoZuydIz1IxACpWTtDasb4jQ\\n6mxPQutZC1nKNJ6D+tYFC9LiGV7gt+KOQ/"; - -static const char good_google_email_keys_part2[] = - "cnkEb4hcMw/xF/OI1FCx6cBcM0+" - "Rji\\nQkK8q7HbF0M6dUXo3t0vedNhmD65Cs2wxPP1TFUCAwEAATANBgkqhkiG9w0BAQsF\\nA" - "AOBgQBfu69FkPmBknbKNFgurPz78kbs3VNN+k/" - "PUgO5DHKskJmgK2TbtvX2VMpx\\nkftmHGzgzMzUlOtigCaGMgHWjfqjpP9uuDbahXrZBJzB8c" - "Oq7MrQF8r17qVvo3Ue\\nPjTKQMAsU8uxTEMmeuz9L6yExs0rfd6bPOrQkAoVfFfiYB3/" - "pA==\\n-----END CERTIFICATE-----\\n\"}"; +static const char good_jwk_set[] = "{" " \"keys\": [" " {" " \"kty\": \"RSA\"," " \"alg\": \"RS256\"," " \"use\": \"sig\"," " \"kid\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\"," " \"n\": " "\"4S8myegefIeRdynuYkSqBYaOLDvU19cHKC56RIqGjrkXFoZuydIz1IxACpWTtDasb4jQ6mxP" "QutZC1nKNJ6D-tYFC9LiGV7gt-KOQ_cnkEb4hcMw_xF_OI1FCx6cBcM0-" "RjiQkK8q7HbF0M6dUXo3t0vedNhmD65Cs2wxPP1TFU=\"," " \"e\": \"AQAB\"" " }" " ]" "}"; + +static gpr_timespec expected_lifetime = { 3600, 0, GPR_TIMESPAN }; + +static const char good_google_email_keys_part1[] = "{\"e6b5137873db8d2ef81e06a47289e6434ec8a165\": \"-----BEGIN " "CERTIFICATE-----" "\\nMIICATCCAWoCCQDEywLhxvHjnDANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJB\\nVTET" "MBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0\\ncyBQdHkgTHR" "kMB4XDTE1MDYyOTA4Mzk1MFoXDTI1MDYyNjA4Mzk1MFowRTELMAkG\\nA1UEBhMCQVUxEzARBg" "NVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0\\nIFdpZGdpdHMgUHR5IEx0ZDCBn" "zANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4S8m\\nyegefIeRdynuYkSqBYaOLDvU19cHKC56" "RIqGjrkXFoZuydIz1IxACpWTtDasb4jQ\\n6mxPQutZC1nKNJ6D+tYFC9LiGV7gt+KOQ/"; + +static const char good_google_email_keys_part2[] = "cnkEb4hcMw/xF/OI1FCx6cBcM0+" "Rji\\nQkK8q7HbF0M6dUXo3t0vedNhmD65Cs2wxPP1TFUCAwEAATANBgkqhkiG9w0BAQsF\\nA" "AOBgQBfu69FkPmBknbKNFgurPz78kbs3VNN+k/" "PUgO5DHKskJmgK2TbtvX2VMpx\\nkftmHGzgzMzUlOtigCaGMgHWjfqjpP9uuDbahXrZBJzB8c" "Oq7MrQF8r17qVvo3Ue\\nPjTKQMAsU8uxTEMmeuz9L6yExs0rfd6bPOrQkAoVfFfiYB3/" "pA==\\n-----END CERTIFICATE-----\\n\"}"; static const char expected_audience[] = "https://foo.com"; -static const char good_openid_config[] = - "{" - " \"issuer\": \"https://accounts.google.com\"," - " \"authorization_endpoint\": " - "\"https://accounts.google.com/o/oauth2/v2/auth\"," - " \"token_endpoint\": \"https://www.googleapis.com/oauth2/v4/token\"," - " \"userinfo_endpoint\": \"https://www.googleapis.com/oauth2/v3/userinfo\"," - " \"revocation_endpoint\": \"https://accounts.google.com/o/oauth2/revoke\"," - " \"jwks_uri\": \"https://www.googleapis.com/oauth2/v3/certs\"" - "}"; - -static const char expired_claims[] = - "{ \"aud\": \"https://foo.com\"," - " \"iss\": \"blah.foo.com\"," - " \"sub\": \"juju@blah.foo.com\"," - " \"jti\": \"jwtuniqueid\"," - " \"iat\": 100," /* Way back in the past... */ - " \"exp\": 120," - " \"nbf\": 60," - " \"foo\": \"bar\"}"; - -static const char claims_without_time_constraint[] = - "{ \"aud\": \"https://foo.com\"," - " \"iss\": \"blah.foo.com\"," - " \"sub\": \"juju@blah.foo.com\"," - " \"jti\": \"jwtuniqueid\"," - " \"foo\": \"bar\"}"; - -static const char invalid_claims[] = - "{ \"aud\": \"https://foo.com\"," - " \"iss\": 46," /* Issuer cannot be a number. */ - " \"sub\": \"juju@blah.foo.com\"," - " \"jti\": \"jwtuniqueid\"," - " \"foo\": \"bar\"}"; - -typedef struct { +static const char good_openid_config[] = "{" " \"issuer\": \"https://accounts.google.com\"," " \"authorization_endpoint\": " "\"https://accounts.google.com/o/oauth2/v2/auth\"," " \"token_endpoint\": \"https://www.googleapis.com/oauth2/v4/token\"," " \"userinfo_endpoint\": \"https://www.googleapis.com/oauth2/v3/userinfo\"," " \"revocation_endpoint\": \"https://accounts.google.com/o/oauth2/revoke\"," " \"jwks_uri\": \"https://www.googleapis.com/oauth2/v3/certs\"" "}"; + +static const char expired_claims[] = "{ \"aud\": \"https://foo.com\"," " \"iss\": \"blah.foo.com\"," " \"sub\": \"juju@blah.foo.com\"," " \"jti\": \"jwtuniqueid\"," " \"iat\": 100," /* Way back in the past... */ + " \"exp\": 120," " \"nbf\": 60," " \"foo\": \"bar\"}"; + +static const char claims_without_time_constraint[] = "{ \"aud\": \"https://foo.com\"," " \"iss\": \"blah.foo.com\"," " \"sub\": \"juju@blah.foo.com\"," " \"jti\": \"jwtuniqueid\"," " \"foo\": \"bar\"}"; + +static const char invalid_claims[] = "{ \"aud\": \"https://foo.com\"," " \"iss\": 46," /* Issuer cannot be a number. */ + " \"sub\": \"juju@blah.foo.com\"," " \"jti\": \"jwtuniqueid\"," " \"foo\": \"bar\"}"; + +typedef struct +{ grpc_jwt_verifier_status expected_status; const char *expected_issuer; const char *expected_subject; } verifier_test_config; -static void test_claims_success(void) { +static void +test_claims_success (void) +{ grpc_jwt_claims *claims; - gpr_slice s = gpr_slice_from_copied_string(claims_without_time_constraint); - grpc_json *json = grpc_json_parse_string_with_len( - (char *)GPR_SLICE_START_PTR(s), GPR_SLICE_LENGTH(s)); - GPR_ASSERT(json != NULL); - 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); - GPR_ASSERT(strcmp(grpc_jwt_claims_issuer(claims), "blah.foo.com") == 0); - GPR_ASSERT(strcmp(grpc_jwt_claims_subject(claims), "juju@blah.foo.com") == 0); - 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); + gpr_slice s = gpr_slice_from_copied_string (claims_without_time_constraint); + grpc_json *json = grpc_json_parse_string_with_len ((char *) GPR_SLICE_START_PTR (s), GPR_SLICE_LENGTH (s)); + GPR_ASSERT (json != NULL); + 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); + GPR_ASSERT (strcmp (grpc_jwt_claims_issuer (claims), "blah.foo.com") == 0); + GPR_ASSERT (strcmp (grpc_jwt_claims_subject (claims), "juju@blah.foo.com") == 0); + 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); } -static void test_expired_claims_failure(void) { +static void +test_expired_claims_failure (void) +{ grpc_jwt_claims *claims; - gpr_slice s = gpr_slice_from_copied_string(expired_claims); - grpc_json *json = grpc_json_parse_string_with_len( - (char *)GPR_SLICE_START_PTR(s), GPR_SLICE_LENGTH(s)); - gpr_timespec exp_iat = {100, 0, GPR_CLOCK_REALTIME}; - gpr_timespec exp_exp = {120, 0, GPR_CLOCK_REALTIME}; - gpr_timespec exp_nbf = {60, 0, GPR_CLOCK_REALTIME}; - GPR_ASSERT(json != NULL); - 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); - GPR_ASSERT(strcmp(grpc_jwt_claims_issuer(claims), "blah.foo.com") == 0); - GPR_ASSERT(strcmp(grpc_jwt_claims_subject(claims), "juju@blah.foo.com") == 0); - GPR_ASSERT(strcmp(grpc_jwt_claims_id(claims), "jwtuniqueid") == 0); - GPR_ASSERT(gpr_time_cmp(grpc_jwt_claims_issued_at(claims), exp_iat) == 0); - GPR_ASSERT(gpr_time_cmp(grpc_jwt_claims_expires_at(claims), exp_exp) == 0); - GPR_ASSERT(gpr_time_cmp(grpc_jwt_claims_not_before(claims), exp_nbf) == 0); - - GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == - GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE); - grpc_jwt_claims_destroy(claims); + gpr_slice s = gpr_slice_from_copied_string (expired_claims); + grpc_json *json = grpc_json_parse_string_with_len ((char *) GPR_SLICE_START_PTR (s), GPR_SLICE_LENGTH (s)); + gpr_timespec exp_iat = { 100, 0, GPR_CLOCK_REALTIME }; + gpr_timespec exp_exp = { 120, 0, GPR_CLOCK_REALTIME }; + gpr_timespec exp_nbf = { 60, 0, GPR_CLOCK_REALTIME }; + GPR_ASSERT (json != NULL); + 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); + GPR_ASSERT (strcmp (grpc_jwt_claims_issuer (claims), "blah.foo.com") == 0); + GPR_ASSERT (strcmp (grpc_jwt_claims_subject (claims), "juju@blah.foo.com") == 0); + GPR_ASSERT (strcmp (grpc_jwt_claims_id (claims), "jwtuniqueid") == 0); + GPR_ASSERT (gpr_time_cmp (grpc_jwt_claims_issued_at (claims), exp_iat) == 0); + GPR_ASSERT (gpr_time_cmp (grpc_jwt_claims_expires_at (claims), exp_exp) == 0); + GPR_ASSERT (gpr_time_cmp (grpc_jwt_claims_not_before (claims), exp_nbf) == 0); + + GPR_ASSERT (grpc_jwt_claims_check (claims, "https://foo.com") == GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE); + grpc_jwt_claims_destroy (claims); } -static void test_invalid_claims_failure(void) { - gpr_slice s = gpr_slice_from_copied_string(invalid_claims); - grpc_json *json = grpc_json_parse_string_with_len( - (char *)GPR_SLICE_START_PTR(s), GPR_SLICE_LENGTH(s)); - GPR_ASSERT(grpc_jwt_claims_from_json(json, s) == NULL); +static void +test_invalid_claims_failure (void) +{ + gpr_slice s = gpr_slice_from_copied_string (invalid_claims); + grpc_json *json = grpc_json_parse_string_with_len ((char *) GPR_SLICE_START_PTR (s), GPR_SLICE_LENGTH (s)); + GPR_ASSERT (grpc_jwt_claims_from_json (json, s) == NULL); } -static void test_bad_audience_claims_failure(void) { +static void +test_bad_audience_claims_failure (void) +{ grpc_jwt_claims *claims; - gpr_slice s = gpr_slice_from_copied_string(claims_without_time_constraint); - grpc_json *json = grpc_json_parse_string_with_len( - (char *)GPR_SLICE_START_PTR(s), GPR_SLICE_LENGTH(s)); - GPR_ASSERT(json != NULL); - 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(claims); + gpr_slice s = gpr_slice_from_copied_string (claims_without_time_constraint); + grpc_json *json = grpc_json_parse_string_with_len ((char *) GPR_SLICE_START_PTR (s), GPR_SLICE_LENGTH (s)); + GPR_ASSERT (json != NULL); + 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 (claims); } -static char *json_key_str(const char *last_part) { - size_t result_len = strlen(json_key_str_part1) + strlen(json_key_str_part2) + - strlen(last_part); - char *result = gpr_malloc(result_len + 1); +static char * +json_key_str (const char *last_part) +{ + size_t result_len = strlen (json_key_str_part1) + strlen (json_key_str_part2) + strlen (last_part); + char *result = gpr_malloc (result_len + 1); char *current = result; - strcpy(result, json_key_str_part1); - current += strlen(json_key_str_part1); - strcpy(current, json_key_str_part2); - current += strlen(json_key_str_part2); - strcpy(current, last_part); + strcpy (result, json_key_str_part1); + current += strlen (json_key_str_part1); + strcpy (current, json_key_str_part2); + current += strlen (json_key_str_part2); + strcpy (current, last_part); return result; } -static char *good_google_email_keys(void) { - size_t result_len = strlen(good_google_email_keys_part1) + - strlen(good_google_email_keys_part2); - char *result = gpr_malloc(result_len + 1); +static char * +good_google_email_keys (void) +{ + size_t result_len = strlen (good_google_email_keys_part1) + strlen (good_google_email_keys_part2); + char *result = gpr_malloc (result_len + 1); char *current = result; - strcpy(result, good_google_email_keys_part1); - current += strlen(good_google_email_keys_part1); - strcpy(current, good_google_email_keys_part2); + strcpy (result, good_google_email_keys_part1); + current += strlen (good_google_email_keys_part1); + strcpy (current, good_google_email_keys_part2); return result; } -static grpc_httpcli_response http_response(int status, char *body) { +static grpc_httpcli_response +http_response (int status, char *body) +{ grpc_httpcli_response response; - memset(&response, 0, sizeof(grpc_httpcli_response)); + memset (&response, 0, sizeof (grpc_httpcli_response)); response.status = status; response.body = body; - response.body_length = strlen(body); + response.body_length = strlen (body); return response; } -static int httpcli_post_should_not_be_called( - const grpc_httpcli_request *request, const char *body_bytes, - size_t body_size, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data, - grpc_closure_list *closure_list) { - GPR_ASSERT("HTTP POST should not be called" == NULL); +static int +httpcli_post_should_not_be_called (const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ + GPR_ASSERT ("HTTP POST should not be called" == NULL); return 1; } -static int httpcli_get_google_keys_for_email( - const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data, - grpc_closure_list *closure_list) { - grpc_httpcli_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); - GPR_ASSERT(strcmp(request->path, - "/robot/v1/metadata/x509/" - "777-abaslkan11hlb6nmim3bpspl31ud@developer." - "gserviceaccount.com") == 0); - on_response(user_data, &response, closure_list); - gpr_free(response.body); +static int +httpcli_get_google_keys_for_email (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ + grpc_httpcli_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); + GPR_ASSERT (strcmp (request->path, "/robot/v1/metadata/x509/" "777-abaslkan11hlb6nmim3bpspl31ud@developer." "gserviceaccount.com") == 0); + on_response (user_data, &response, closure_list); + gpr_free (response.body); return 1; } -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(claims); +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 (claims); } -static void test_jwt_verifier_google_email_issuer_success(void) { +static void +test_jwt_verifier_google_email_issuer_success (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_jwt_verifier *verifier = grpc_jwt_verifier_create(NULL, 0); + 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); - grpc_auth_json_key key = grpc_auth_json_key_create_from_string(key_str); - gpr_free(key_str); - GPR_ASSERT(grpc_auth_json_key_is_valid(&key)); - grpc_httpcli_set_override(httpcli_get_google_keys_for_email, - httpcli_post_should_not_be_called); - jwt = grpc_jwt_encode_and_sign(&key, expected_audience, expected_lifetime, - NULL); - grpc_auth_json_key_destruct(&key); - GPR_ASSERT(jwt != NULL); - grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, - on_verification_success, (void *)expected_user_data, - &closure_list); - gpr_free(jwt); - grpc_jwt_verifier_destroy(verifier); - grpc_httpcli_set_override(NULL, NULL); - grpc_closure_list_run(&closure_list); + char *key_str = json_key_str (json_key_str_part3_for_google_email_issuer); + grpc_auth_json_key key = grpc_auth_json_key_create_from_string (key_str); + gpr_free (key_str); + GPR_ASSERT (grpc_auth_json_key_is_valid (&key)); + grpc_httpcli_set_override (httpcli_get_google_keys_for_email, httpcli_post_should_not_be_called); + jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); + grpc_auth_json_key_destruct (&key); + GPR_ASSERT (jwt != NULL); + grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (void *) expected_user_data, &closure_list); + gpr_free (jwt); + grpc_jwt_verifier_destroy (verifier); + grpc_httpcli_set_override (NULL, NULL); + grpc_closure_list_run (&closure_list); } -static int httpcli_get_custom_keys_for_email( - const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data, - grpc_closure_list *closure_list) { - grpc_httpcli_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->path, "/jwk/foo@bar.com") == 0); - on_response(user_data, &response, closure_list); - gpr_free(response.body); +static int +httpcli_get_custom_keys_for_email (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ + grpc_httpcli_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->path, "/jwk/foo@bar.com") == 0); + on_response (user_data, &response, closure_list); + gpr_free (response.body); return 1; } -static void test_jwt_verifier_custom_email_issuer_success(void) { +static void +test_jwt_verifier_custom_email_issuer_success (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_jwt_verifier *verifier = grpc_jwt_verifier_create(&custom_mapping, 1); + 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); - grpc_auth_json_key key = grpc_auth_json_key_create_from_string(key_str); - gpr_free(key_str); - GPR_ASSERT(grpc_auth_json_key_is_valid(&key)); - grpc_httpcli_set_override(httpcli_get_custom_keys_for_email, - httpcli_post_should_not_be_called); - jwt = grpc_jwt_encode_and_sign(&key, expected_audience, expected_lifetime, - NULL); - grpc_auth_json_key_destruct(&key); - GPR_ASSERT(jwt != NULL); - grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, - on_verification_success, (void *)expected_user_data, - &closure_list); - gpr_free(jwt); - grpc_jwt_verifier_destroy(verifier); - grpc_httpcli_set_override(NULL, NULL); - grpc_closure_list_run(&closure_list); + char *key_str = json_key_str (json_key_str_part3_for_custom_email_issuer); + grpc_auth_json_key key = grpc_auth_json_key_create_from_string (key_str); + gpr_free (key_str); + GPR_ASSERT (grpc_auth_json_key_is_valid (&key)); + grpc_httpcli_set_override (httpcli_get_custom_keys_for_email, httpcli_post_should_not_be_called); + jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); + grpc_auth_json_key_destruct (&key); + GPR_ASSERT (jwt != NULL); + grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (void *) expected_user_data, &closure_list); + gpr_free (jwt); + grpc_jwt_verifier_destroy (verifier); + grpc_httpcli_set_override (NULL, NULL); + grpc_closure_list_run (&closure_list); } -static int httpcli_get_jwk_set(const grpc_httpcli_request *request, - gpr_timespec deadline, - grpc_httpcli_response_cb on_response, - void *user_data, - grpc_closure_list *closure_list) { - grpc_httpcli_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->path, "/oauth2/v3/certs") == 0); - on_response(user_data, &response, closure_list); - gpr_free(response.body); +static int +httpcli_get_jwk_set (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ + grpc_httpcli_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->path, "/oauth2/v3/certs") == 0); + on_response (user_data, &response, closure_list); + gpr_free (response.body); return 1; } -static int httpcli_get_openid_config(const grpc_httpcli_request *request, - gpr_timespec deadline, - grpc_httpcli_response_cb on_response, - void *user_data, - grpc_closure_list *closure_list) { - grpc_httpcli_response response = - http_response(200, gpr_strdup(good_openid_config)); - GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); - GPR_ASSERT(strcmp(request->host, "accounts.google.com") == 0); - GPR_ASSERT(strcmp(request->path, GRPC_OPENID_CONFIG_URL_SUFFIX) == 0); - grpc_httpcli_set_override(httpcli_get_jwk_set, - httpcli_post_should_not_be_called); - on_response(user_data, &response, closure_list); - gpr_free(response.body); +static int +httpcli_get_openid_config (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ + grpc_httpcli_response response = http_response (200, gpr_strdup (good_openid_config)); + GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); + GPR_ASSERT (strcmp (request->host, "accounts.google.com") == 0); + GPR_ASSERT (strcmp (request->path, GRPC_OPENID_CONFIG_URL_SUFFIX) == 0); + grpc_httpcli_set_override (httpcli_get_jwk_set, httpcli_post_should_not_be_called); + on_response (user_data, &response, closure_list); + gpr_free (response.body); return 1; } -static void test_jwt_verifier_url_issuer_success(void) { +static void +test_jwt_verifier_url_issuer_success (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_jwt_verifier *verifier = grpc_jwt_verifier_create(NULL, 0); + 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); - grpc_auth_json_key key = grpc_auth_json_key_create_from_string(key_str); - gpr_free(key_str); - GPR_ASSERT(grpc_auth_json_key_is_valid(&key)); - grpc_httpcli_set_override(httpcli_get_openid_config, - httpcli_post_should_not_be_called); - jwt = grpc_jwt_encode_and_sign(&key, expected_audience, expected_lifetime, - NULL); - grpc_auth_json_key_destruct(&key); - GPR_ASSERT(jwt != NULL); - grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, - on_verification_success, (void *)expected_user_data, - &closure_list); - gpr_free(jwt); - grpc_jwt_verifier_destroy(verifier); - grpc_httpcli_set_override(NULL, NULL); - grpc_closure_list_run(&closure_list); + char *key_str = json_key_str (json_key_str_part3_for_url_issuer); + grpc_auth_json_key key = grpc_auth_json_key_create_from_string (key_str); + gpr_free (key_str); + GPR_ASSERT (grpc_auth_json_key_is_valid (&key)); + grpc_httpcli_set_override (httpcli_get_openid_config, httpcli_post_should_not_be_called); + jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); + grpc_auth_json_key_destruct (&key); + GPR_ASSERT (jwt != NULL); + grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (void *) expected_user_data, &closure_list); + gpr_free (jwt); + grpc_jwt_verifier_destroy (verifier); + grpc_httpcli_set_override (NULL, NULL); + grpc_closure_list_run (&closure_list); } -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); - GPR_ASSERT(claims == NULL); - GPR_ASSERT(user_data == (void *)expected_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); + GPR_ASSERT (claims == NULL); + GPR_ASSERT (user_data == (void *) expected_user_data); } -static int httpcli_get_bad_json(const grpc_httpcli_request *request, - gpr_timespec deadline, - grpc_httpcli_response_cb on_response, - void *user_data, - grpc_closure_list *closure_list) { - grpc_httpcli_response response = - http_response(200, gpr_strdup("{\"bad\": \"stuff\"}")); - GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); - on_response(user_data, &response, closure_list); - gpr_free(response.body); +static int +httpcli_get_bad_json (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ + grpc_httpcli_response response = http_response (200, gpr_strdup ("{\"bad\": \"stuff\"}")); + GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); + on_response (user_data, &response, closure_list); + gpr_free (response.body); return 1; } -static void test_jwt_verifier_url_issuer_bad_config(void) { +static void +test_jwt_verifier_url_issuer_bad_config (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_jwt_verifier *verifier = grpc_jwt_verifier_create(NULL, 0); + 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); - grpc_auth_json_key key = grpc_auth_json_key_create_from_string(key_str); - gpr_free(key_str); - GPR_ASSERT(grpc_auth_json_key_is_valid(&key)); - grpc_httpcli_set_override(httpcli_get_bad_json, - httpcli_post_should_not_be_called); - jwt = grpc_jwt_encode_and_sign(&key, expected_audience, expected_lifetime, - NULL); - grpc_auth_json_key_destruct(&key); - GPR_ASSERT(jwt != NULL); - grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, - on_verification_key_retrieval_error, - (void *)expected_user_data, &closure_list); - gpr_free(jwt); - grpc_jwt_verifier_destroy(verifier); - grpc_httpcli_set_override(NULL, NULL); - grpc_closure_list_run(&closure_list); + char *key_str = json_key_str (json_key_str_part3_for_url_issuer); + grpc_auth_json_key key = grpc_auth_json_key_create_from_string (key_str); + gpr_free (key_str); + GPR_ASSERT (grpc_auth_json_key_is_valid (&key)); + grpc_httpcli_set_override (httpcli_get_bad_json, httpcli_post_should_not_be_called); + jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); + grpc_auth_json_key_destruct (&key); + GPR_ASSERT (jwt != NULL); + grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, (void *) expected_user_data, &closure_list); + gpr_free (jwt); + grpc_jwt_verifier_destroy (verifier); + grpc_httpcli_set_override (NULL, NULL); + grpc_closure_list_run (&closure_list); } -static void test_jwt_verifier_bad_json_key(void) { +static void +test_jwt_verifier_bad_json_key (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_jwt_verifier *verifier = grpc_jwt_verifier_create(NULL, 0); + 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); - grpc_auth_json_key key = grpc_auth_json_key_create_from_string(key_str); - gpr_free(key_str); - GPR_ASSERT(grpc_auth_json_key_is_valid(&key)); - grpc_httpcli_set_override(httpcli_get_bad_json, - httpcli_post_should_not_be_called); - jwt = grpc_jwt_encode_and_sign(&key, expected_audience, expected_lifetime, - NULL); - grpc_auth_json_key_destruct(&key); - GPR_ASSERT(jwt != NULL); - grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, - on_verification_key_retrieval_error, - (void *)expected_user_data, &closure_list); - gpr_free(jwt); - grpc_jwt_verifier_destroy(verifier); - grpc_httpcli_set_override(NULL, NULL); - grpc_closure_list_run(&closure_list); + char *key_str = json_key_str (json_key_str_part3_for_google_email_issuer); + grpc_auth_json_key key = grpc_auth_json_key_create_from_string (key_str); + gpr_free (key_str); + GPR_ASSERT (grpc_auth_json_key_is_valid (&key)); + grpc_httpcli_set_override (httpcli_get_bad_json, httpcli_post_should_not_be_called); + jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); + grpc_auth_json_key_destruct (&key); + GPR_ASSERT (jwt != NULL); + grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, (void *) expected_user_data, &closure_list); + gpr_free (jwt); + grpc_jwt_verifier_destroy (verifier); + grpc_httpcli_set_override (NULL, NULL); + grpc_closure_list_run (&closure_list); } -static void corrupt_jwt_sig(char *jwt) { +static void +corrupt_jwt_sig (char *jwt) +{ gpr_slice sig; char *bad_b64_sig; gpr_uint8 *sig_bytes; - char *last_dot = strrchr(jwt, '.'); - GPR_ASSERT(last_dot != NULL); - sig = grpc_base64_decode(last_dot + 1, 1); - GPR_ASSERT(!GPR_SLICE_IS_EMPTY(sig)); - sig_bytes = GPR_SLICE_START_PTR(sig); - (*sig_bytes)++; /* Corrupt first byte. */ - bad_b64_sig = - grpc_base64_encode(GPR_SLICE_START_PTR(sig), GPR_SLICE_LENGTH(sig), 1, 0); - memcpy(last_dot + 1, bad_b64_sig, strlen(bad_b64_sig)); - gpr_free(bad_b64_sig); - gpr_slice_unref(sig); + char *last_dot = strrchr (jwt, '.'); + GPR_ASSERT (last_dot != NULL); + sig = grpc_base64_decode (last_dot + 1, 1); + GPR_ASSERT (!GPR_SLICE_IS_EMPTY (sig)); + sig_bytes = GPR_SLICE_START_PTR (sig); + (*sig_bytes)++; /* Corrupt first byte. */ + bad_b64_sig = grpc_base64_encode (GPR_SLICE_START_PTR (sig), GPR_SLICE_LENGTH (sig), 1, 0); + memcpy (last_dot + 1, bad_b64_sig, strlen (bad_b64_sig)); + gpr_free (bad_b64_sig); + gpr_slice_unref (sig); } -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); - GPR_ASSERT(claims == NULL); - GPR_ASSERT(user_data == (void *)expected_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); + GPR_ASSERT (claims == NULL); + GPR_ASSERT (user_data == (void *) expected_user_data); } -static void test_jwt_verifier_bad_signature(void) { +static void +test_jwt_verifier_bad_signature (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_jwt_verifier *verifier = grpc_jwt_verifier_create(NULL, 0); + 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); - grpc_auth_json_key key = grpc_auth_json_key_create_from_string(key_str); - gpr_free(key_str); - GPR_ASSERT(grpc_auth_json_key_is_valid(&key)); - grpc_httpcli_set_override(httpcli_get_openid_config, - httpcli_post_should_not_be_called); - jwt = grpc_jwt_encode_and_sign(&key, expected_audience, expected_lifetime, - NULL); - grpc_auth_json_key_destruct(&key); - corrupt_jwt_sig(jwt); - GPR_ASSERT(jwt != NULL); - grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, - on_verification_bad_signature, - (void *)expected_user_data, &closure_list); - gpr_free(jwt); - grpc_jwt_verifier_destroy(verifier); - grpc_httpcli_set_override(NULL, NULL); - grpc_closure_list_run(&closure_list); + char *key_str = json_key_str (json_key_str_part3_for_url_issuer); + grpc_auth_json_key key = grpc_auth_json_key_create_from_string (key_str); + gpr_free (key_str); + GPR_ASSERT (grpc_auth_json_key_is_valid (&key)); + grpc_httpcli_set_override (httpcli_get_openid_config, httpcli_post_should_not_be_called); + jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); + grpc_auth_json_key_destruct (&key); + corrupt_jwt_sig (jwt); + GPR_ASSERT (jwt != NULL); + grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_bad_signature, (void *) expected_user_data, &closure_list); + gpr_free (jwt); + grpc_jwt_verifier_destroy (verifier); + grpc_httpcli_set_override (NULL, NULL); + grpc_closure_list_run (&closure_list); } -static int httpcli_get_should_not_be_called( - const grpc_httpcli_request *request, gpr_timespec deadline, - grpc_httpcli_response_cb on_response, void *user_data, - grpc_closure_list *closure_list) { - GPR_ASSERT(0); +static int +httpcli_get_should_not_be_called (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +{ + GPR_ASSERT (0); return 1; } -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); - GPR_ASSERT(claims == NULL); - GPR_ASSERT(user_data == (void *)expected_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); + GPR_ASSERT (claims == NULL); + GPR_ASSERT (user_data == (void *) expected_user_data); } -static void test_jwt_verifier_bad_format(void) { +static void +test_jwt_verifier_bad_format (void) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_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(verifier, NULL, "bad jwt", expected_audience, - on_verification_bad_format, - (void *)expected_user_data, &closure_list); - grpc_jwt_verifier_destroy(verifier); - grpc_httpcli_set_override(NULL, NULL); - grpc_closure_list_run(&closure_list); + 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 (verifier, NULL, "bad jwt", expected_audience, on_verification_bad_format, (void *) expected_user_data, &closure_list); + grpc_jwt_verifier_destroy (verifier); + grpc_httpcli_set_override (NULL, NULL); + grpc_closure_list_run (&closure_list); } /* find verification key: bad jks, cannot find key in jks */ /* bad signature custom provided email*/ /* bad key */ -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_claims_success(); - test_expired_claims_failure(); - test_invalid_claims_failure(); - test_bad_audience_claims_failure(); - test_jwt_verifier_google_email_issuer_success(); - test_jwt_verifier_custom_email_issuer_success(); - test_jwt_verifier_url_issuer_success(); - test_jwt_verifier_url_issuer_bad_config(); - test_jwt_verifier_bad_json_key(); - test_jwt_verifier_bad_signature(); - test_jwt_verifier_bad_format(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_claims_success (); + test_expired_claims_failure (); + test_invalid_claims_failure (); + test_bad_audience_claims_failure (); + test_jwt_verifier_google_email_issuer_success (); + test_jwt_verifier_custom_email_issuer_success (); + test_jwt_verifier_url_issuer_success (); + test_jwt_verifier_url_issuer_bad_config (); + test_jwt_verifier_bad_json_key (); + test_jwt_verifier_bad_signature (); + test_jwt_verifier_bad_format (); return 0; } diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index 30ad00cfbc9..a490ba46686 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -44,62 +44,68 @@ #include "src/core/security/credentials.h" -typedef struct { +typedef struct +{ grpc_pollset pollset; int is_done; char *token; } oauth2_request; -static void on_oauth2_response(void *user_data, grpc_credentials_md *md_elems, - size_t num_md, grpc_credentials_status status, - grpc_closure_list *closure_list) { +static void +on_oauth2_response (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +{ oauth2_request *request = user_data; char *token = NULL; gpr_slice token_slice; - if (status == GRPC_CREDENTIALS_ERROR) { - gpr_log(GPR_ERROR, "Fetching token failed."); - } else { - GPR_ASSERT(num_md == 1); - token_slice = md_elems[0].value; - token = gpr_malloc(GPR_SLICE_LENGTH(token_slice) + 1); - memcpy(token, GPR_SLICE_START_PTR(token_slice), - GPR_SLICE_LENGTH(token_slice)); - token[GPR_SLICE_LENGTH(token_slice)] = '\0'; - } - gpr_mu_lock(GRPC_POLLSET_MU(&request->pollset)); + if (status == GRPC_CREDENTIALS_ERROR) + { + gpr_log (GPR_ERROR, "Fetching token failed."); + } + else + { + GPR_ASSERT (num_md == 1); + token_slice = md_elems[0].value; + token = gpr_malloc (GPR_SLICE_LENGTH (token_slice) + 1); + memcpy (token, GPR_SLICE_START_PTR (token_slice), GPR_SLICE_LENGTH (token_slice)); + token[GPR_SLICE_LENGTH (token_slice)] = '\0'; + } + gpr_mu_lock (GRPC_POLLSET_MU (&request->pollset)); request->is_done = 1; request->token = token; - grpc_pollset_kick(&request->pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&request->pollset)); + grpc_pollset_kick (&request->pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&request->pollset)); } -static void do_nothing(void *unused, int success, - grpc_closure_list *closure_list) {} +static void +do_nothing (void *unused, int success, grpc_closure_list * closure_list) +{ +} -char *grpc_test_fetch_oauth2_token_with_credentials(grpc_credentials *creds) { +char * +grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds) +{ oauth2_request request; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_closure do_nothing_closure; - grpc_pollset_init(&request.pollset); + grpc_pollset_init (&request.pollset); request.is_done = 0; - grpc_closure_init(&do_nothing_closure, do_nothing, NULL); + grpc_closure_init (&do_nothing_closure, do_nothing, NULL); - grpc_credentials_get_request_metadata( - creds, &request.pollset, "", on_oauth2_response, &request, &closure_list); + grpc_credentials_get_request_metadata (creds, &request.pollset, "", on_oauth2_response, &request, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_closure_list_run (&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&request.pollset)); - while (!request.is_done) { - grpc_pollset_worker worker; - grpc_pollset_work(&request.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); - } - gpr_mu_unlock(GRPC_POLLSET_MU(&request.pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&request.pollset)); + while (!request.is_done) + { + grpc_pollset_worker worker; + grpc_pollset_work (&request.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + } + gpr_mu_unlock (GRPC_POLLSET_MU (&request.pollset)); - grpc_pollset_shutdown(&request.pollset, &do_nothing_closure, &closure_list); - grpc_closure_list_run(&closure_list); - grpc_pollset_destroy(&request.pollset); + grpc_pollset_shutdown (&request.pollset, &do_nothing_closure, &closure_list); + grpc_closure_list_run (&closure_list); + grpc_pollset_destroy (&request.pollset); return request.token; } diff --git a/test/core/security/oauth2_utils.h b/test/core/security/oauth2_utils.h index 8082351b8a0..a2eb06834d9 100644 --- a/test/core/security/oauth2_utils.h +++ b/test/core/security/oauth2_utils.h @@ -37,15 +37,16 @@ #include "src/core/security/credentials.h" #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif /* Fetch oauth2 access token with a credentials object. Does not take ownership. Returns NULL on a failure. The caller should call gpr_free on the token. */ -char *grpc_test_fetch_oauth2_token_with_credentials(grpc_credentials *creds); + char *grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds); #ifdef __cplusplus } #endif -#endif /* GRPC_TEST_CORE_SECURITY_OAUTH2_UTILS_H */ +#endif /* GRPC_TEST_CORE_SECURITY_OAUTH2_UTILS_H */ diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c index 646109c0a1f..faac2c7846a 100644 --- a/test/core/security/print_google_default_creds_token.c +++ b/test/core/security/print_google_default_creds_token.c @@ -44,72 +44,76 @@ #include #include -typedef struct { +typedef struct +{ grpc_pollset pollset; int is_done; } synchronizer; -static void on_metadata_response(void *user_data, grpc_credentials_md *md_elems, - size_t num_md, grpc_credentials_status status, - grpc_closure_list *closure_list) { +static void +on_metadata_response (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +{ synchronizer *sync = user_data; - if (status == GRPC_CREDENTIALS_ERROR) { - fprintf(stderr, "Fetching token failed.\n"); - } else { - char *token; - GPR_ASSERT(num_md == 1); - token = gpr_dump_slice(md_elems[0].value, GPR_DUMP_ASCII); - printf("\nGot token: %s\n\n", token); - gpr_free(token); - } - gpr_mu_lock(GRPC_POLLSET_MU(&sync->pollset)); + if (status == GRPC_CREDENTIALS_ERROR) + { + fprintf (stderr, "Fetching token failed.\n"); + } + else + { + char *token; + GPR_ASSERT (num_md == 1); + token = gpr_dump_slice (md_elems[0].value, GPR_DUMP_ASCII); + printf ("\nGot token: %s\n\n", token); + gpr_free (token); + } + gpr_mu_lock (GRPC_POLLSET_MU (&sync->pollset)); sync->is_done = 1; - grpc_pollset_kick(&sync->pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&sync->pollset)); + grpc_pollset_kick (&sync->pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&sync->pollset)); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ int result = 0; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; synchronizer sync; grpc_credentials *creds = NULL; char *service_url = "https://test.foo.google.com/Foo"; - gpr_cmdline *cl = gpr_cmdline_create("print_google_default_creds_token"); - gpr_cmdline_add_string(cl, "service_url", - "Service URL for the token request.", &service_url); - gpr_cmdline_parse(cl, argc, argv); + gpr_cmdline *cl = gpr_cmdline_create ("print_google_default_creds_token"); + gpr_cmdline_add_string (cl, "service_url", "Service URL for the token request.", &service_url); + gpr_cmdline_parse (cl, argc, argv); - grpc_init(); + grpc_init (); - creds = grpc_google_default_credentials_create(); - if (creds == NULL) { - fprintf(stderr, "\nCould not find default credentials.\n\n"); - result = 1; - goto end; - } + creds = grpc_google_default_credentials_create (); + if (creds == NULL) + { + fprintf (stderr, "\nCould not find default credentials.\n\n"); + result = 1; + goto end; + } - grpc_pollset_init(&sync.pollset); + grpc_pollset_init (&sync.pollset); sync.is_done = 0; - grpc_credentials_get_request_metadata(creds, &sync.pollset, service_url, - on_metadata_response, &sync, - &closure_list); + grpc_credentials_get_request_metadata (creds, &sync.pollset, service_url, on_metadata_response, &sync, &closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); - while (!sync.is_done) { - grpc_pollset_worker worker; - grpc_pollset_work(&sync.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); - } - gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); + while (!sync.is_done) + { + grpc_pollset_worker worker; + grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); + } + gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); - grpc_credentials_release(creds); + grpc_credentials_release (creds); end: - gpr_cmdline_destroy(cl); - grpc_shutdown(); + gpr_cmdline_destroy (cl); + grpc_shutdown (); return result; } diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index f68fde4c0ac..32db8194e4e 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -47,149 +47,158 @@ static grpc_pollset g_pollset; -static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( - size_t slice_size, gpr_slice *leftover_slices, size_t leftover_nslices) { +static grpc_endpoint_test_fixture +secure_endpoint_create_fixture_tcp_socketpair (size_t slice_size, gpr_slice * leftover_slices, size_t leftover_nslices) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - tsi_frame_protector *fake_read_protector = tsi_create_fake_protector(NULL); - tsi_frame_protector *fake_write_protector = tsi_create_fake_protector(NULL); + tsi_frame_protector *fake_read_protector = tsi_create_fake_protector (NULL); + tsi_frame_protector *fake_write_protector = tsi_create_fake_protector (NULL); grpc_endpoint_test_fixture f; grpc_endpoint_pair tcp; - tcp = grpc_iomgr_create_endpoint_pair("fixture", slice_size); - grpc_endpoint_add_to_pollset(tcp.client, &g_pollset, &closure_list); - grpc_endpoint_add_to_pollset(tcp.server, &g_pollset, &closure_list); - - if (leftover_nslices == 0) { - f.client_ep = - grpc_secure_endpoint_create(fake_read_protector, tcp.client, NULL, 0); - } else { - unsigned i; - tsi_result result; - size_t still_pending_size; - size_t total_buffer_size = 8192; - size_t buffer_size = total_buffer_size; - gpr_uint8 *encrypted_buffer = gpr_malloc(buffer_size); - gpr_uint8 *cur = encrypted_buffer; - gpr_slice encrypted_leftover; - for (i = 0; i < leftover_nslices; i++) { - gpr_slice plain = leftover_slices[i]; - gpr_uint8 *message_bytes = GPR_SLICE_START_PTR(plain); - size_t message_size = GPR_SLICE_LENGTH(plain); - while (message_size > 0) { - size_t protected_buffer_size_to_send = buffer_size; - size_t processed_message_size = message_size; - result = tsi_frame_protector_protect( - fake_write_protector, message_bytes, &processed_message_size, cur, - &protected_buffer_size_to_send); - GPR_ASSERT(result == TSI_OK); - message_bytes += processed_message_size; - message_size -= processed_message_size; - cur += protected_buffer_size_to_send; - GPR_ASSERT(buffer_size >= protected_buffer_size_to_send); - buffer_size -= protected_buffer_size_to_send; - } - gpr_slice_unref(plain); + tcp = grpc_iomgr_create_endpoint_pair ("fixture", slice_size); + grpc_endpoint_add_to_pollset (tcp.client, &g_pollset, &closure_list); + grpc_endpoint_add_to_pollset (tcp.server, &g_pollset, &closure_list); + + if (leftover_nslices == 0) + { + f.client_ep = grpc_secure_endpoint_create (fake_read_protector, tcp.client, NULL, 0); + } + else + { + unsigned i; + tsi_result result; + size_t still_pending_size; + size_t total_buffer_size = 8192; + size_t buffer_size = total_buffer_size; + gpr_uint8 *encrypted_buffer = gpr_malloc (buffer_size); + gpr_uint8 *cur = encrypted_buffer; + gpr_slice encrypted_leftover; + for (i = 0; i < leftover_nslices; i++) + { + gpr_slice plain = leftover_slices[i]; + gpr_uint8 *message_bytes = GPR_SLICE_START_PTR (plain); + size_t message_size = GPR_SLICE_LENGTH (plain); + while (message_size > 0) + { + size_t protected_buffer_size_to_send = buffer_size; + size_t processed_message_size = message_size; + result = tsi_frame_protector_protect (fake_write_protector, message_bytes, &processed_message_size, cur, &protected_buffer_size_to_send); + GPR_ASSERT (result == TSI_OK); + message_bytes += processed_message_size; + message_size -= processed_message_size; + cur += protected_buffer_size_to_send; + GPR_ASSERT (buffer_size >= protected_buffer_size_to_send); + buffer_size -= protected_buffer_size_to_send; + } + gpr_slice_unref (plain); + } + do + { + size_t protected_buffer_size_to_send = buffer_size; + result = tsi_frame_protector_protect_flush (fake_write_protector, cur, &protected_buffer_size_to_send, &still_pending_size); + GPR_ASSERT (result == TSI_OK); + cur += protected_buffer_size_to_send; + GPR_ASSERT (buffer_size >= protected_buffer_size_to_send); + buffer_size -= protected_buffer_size_to_send; + } + while (still_pending_size > 0); + encrypted_leftover = gpr_slice_from_copied_buffer ((const char *) encrypted_buffer, total_buffer_size - buffer_size); + f.client_ep = grpc_secure_endpoint_create (fake_read_protector, tcp.client, &encrypted_leftover, 1); + gpr_slice_unref (encrypted_leftover); + gpr_free (encrypted_buffer); } - do { - size_t protected_buffer_size_to_send = buffer_size; - result = tsi_frame_protector_protect_flush(fake_write_protector, cur, - &protected_buffer_size_to_send, - &still_pending_size); - GPR_ASSERT(result == TSI_OK); - cur += protected_buffer_size_to_send; - GPR_ASSERT(buffer_size >= protected_buffer_size_to_send); - buffer_size -= protected_buffer_size_to_send; - } while (still_pending_size > 0); - encrypted_leftover = gpr_slice_from_copied_buffer( - (const char *)encrypted_buffer, total_buffer_size - buffer_size); - f.client_ep = grpc_secure_endpoint_create(fake_read_protector, tcp.client, - &encrypted_leftover, 1); - gpr_slice_unref(encrypted_leftover); - gpr_free(encrypted_buffer); - } - - f.server_ep = - grpc_secure_endpoint_create(fake_write_protector, tcp.server, NULL, 0); - grpc_closure_list_run(&closure_list); + + f.server_ep = grpc_secure_endpoint_create (fake_write_protector, tcp.server, NULL, 0); + grpc_closure_list_run (&closure_list); return f; } static grpc_endpoint_test_fixture -secure_endpoint_create_fixture_tcp_socketpair_noleftover(size_t slice_size) { - return secure_endpoint_create_fixture_tcp_socketpair(slice_size, NULL, 0); +secure_endpoint_create_fixture_tcp_socketpair_noleftover (size_t slice_size) +{ + return secure_endpoint_create_fixture_tcp_socketpair (slice_size, NULL, 0); } static grpc_endpoint_test_fixture -secure_endpoint_create_fixture_tcp_socketpair_leftover(size_t slice_size) { - gpr_slice s = - gpr_slice_from_copied_string("hello world 12345678900987654321"); +secure_endpoint_create_fixture_tcp_socketpair_leftover (size_t slice_size) +{ + gpr_slice s = gpr_slice_from_copied_string ("hello world 12345678900987654321"); grpc_endpoint_test_fixture f; - f = secure_endpoint_create_fixture_tcp_socketpair(slice_size, &s, 1); + f = secure_endpoint_create_fixture_tcp_socketpair (slice_size, &s, 1); return f; } -static void clean_up(void) {} +static void +clean_up (void) +{ +} static grpc_endpoint_test_config configs[] = { - {"secure_ep/tcp_socketpair", - secure_endpoint_create_fixture_tcp_socketpair_noleftover, clean_up}, - {"secure_ep/tcp_socketpair_leftover", - secure_endpoint_create_fixture_tcp_socketpair_leftover, clean_up}, + {"secure_ep/tcp_socketpair", + secure_endpoint_create_fixture_tcp_socketpair_noleftover, clean_up}, + {"secure_ep/tcp_socketpair_leftover", + secure_endpoint_create_fixture_tcp_socketpair_leftover, clean_up}, }; -static void inc_call_ctr(void *arg, int success, - grpc_closure_list *closure_list) { - ++*(int *)arg; +static void +inc_call_ctr (void *arg, int success, grpc_closure_list * closure_list) +{ + ++*(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); +static void +test_leftover (grpc_endpoint_test_config config, size_t slice_size) +{ + grpc_endpoint_test_fixture f = config.create_fixture (slice_size); gpr_slice_buffer incoming; - gpr_slice s = - gpr_slice_from_copied_string("hello world 12345678900987654321"); + gpr_slice s = gpr_slice_from_copied_string ("hello world 12345678900987654321"); grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; int n = 0; grpc_closure done_closure; - gpr_log(GPR_INFO, "Start test left over"); - - gpr_slice_buffer_init(&incoming); - grpc_closure_init(&done_closure, inc_call_ctr, &n); - grpc_endpoint_read(f.client_ep, &incoming, &done_closure, &closure_list); - grpc_closure_list_run(&closure_list); - GPR_ASSERT(n == 1); - GPR_ASSERT(incoming.count == 1); - GPR_ASSERT(0 == gpr_slice_cmp(s, incoming.slices[0])); - - grpc_endpoint_shutdown(f.client_ep, &closure_list); - grpc_endpoint_shutdown(f.server_ep, &closure_list); - grpc_endpoint_destroy(f.client_ep, &closure_list); - grpc_endpoint_destroy(f.server_ep, &closure_list); - grpc_closure_list_run(&closure_list); - gpr_slice_unref(s); - gpr_slice_buffer_destroy(&incoming); - - clean_up(); + gpr_log (GPR_INFO, "Start test left over"); + + gpr_slice_buffer_init (&incoming); + grpc_closure_init (&done_closure, inc_call_ctr, &n); + grpc_endpoint_read (f.client_ep, &incoming, &done_closure, &closure_list); + grpc_closure_list_run (&closure_list); + GPR_ASSERT (n == 1); + GPR_ASSERT (incoming.count == 1); + GPR_ASSERT (0 == gpr_slice_cmp (s, incoming.slices[0])); + + grpc_endpoint_shutdown (f.client_ep, &closure_list); + grpc_endpoint_shutdown (f.server_ep, &closure_list); + grpc_endpoint_destroy (f.client_ep, &closure_list); + grpc_endpoint_destroy (f.server_ep, &closure_list); + grpc_closure_list_run (&closure_list); + gpr_slice_unref (s); + gpr_slice_buffer_destroy (&incoming); + + clean_up (); } -static void destroy_pollset(void *p, int success, - grpc_closure_list *closure_list) { - grpc_pollset_destroy(p); +static void +destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +{ + grpc_pollset_destroy (p); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ grpc_closure destroyed; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - grpc_test_init(argc, argv); - - grpc_init(); - grpc_pollset_init(&g_pollset); - grpc_endpoint_tests(configs[0], &g_pollset); - test_leftover(configs[1], 1); - grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run(&closure_list); - grpc_shutdown(); + grpc_test_init (argc, argv); + + grpc_init (); + grpc_pollset_init (&g_pollset); + grpc_endpoint_tests (configs[0], &g_pollset); + test_leftover (configs[1], 1); + grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run (&closure_list); + grpc_shutdown (); return 0; } diff --git a/test/core/security/security_connector_test.c b/test/core/security/security_connector_test.c index 3f6c592b0bd..691c68685b4 100644 --- a/test/core/security/security_connector_test.c +++ b/test/core/security/security_connector_test.c @@ -46,212 +46,200 @@ #include #include -static int check_transport_security_type(const grpc_auth_context *ctx) { - grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name( - ctx, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME); - const grpc_auth_property *prop = grpc_auth_property_iterator_next(&it); - if (prop == NULL) return 0; - if (strncmp(prop->value, GRPC_SSL_TRANSPORT_SECURITY_TYPE, - prop->value_length) != 0) { +static int +check_transport_security_type (const grpc_auth_context * ctx) +{ + grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name (ctx, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME); + const grpc_auth_property *prop = grpc_auth_property_iterator_next (&it); + if (prop == NULL) return 0; - } + if (strncmp (prop->value, GRPC_SSL_TRANSPORT_SECURITY_TYPE, prop->value_length) != 0) + { + return 0; + } /* Check that we have only one property with this name. */ - if (grpc_auth_property_iterator_next(&it) != NULL) return 0; + if (grpc_auth_property_iterator_next (&it) != NULL) + return 0; return 1; } -static void test_unauthenticated_ssl_peer(void) { +static void +test_unauthenticated_ssl_peer (void) +{ tsi_peer peer; grpc_auth_context *ctx; - GPR_ASSERT(tsi_construct_peer(1, &peer) == TSI_OK); - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, - &peer.properties[0]) == TSI_OK); - ctx = tsi_ssl_peer_to_auth_context(&peer); - GPR_ASSERT(ctx != NULL); - GPR_ASSERT(!grpc_auth_context_peer_is_authenticated(ctx)); - GPR_ASSERT(check_transport_security_type(ctx)); - - tsi_peer_destruct(&peer); - GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); + GPR_ASSERT (tsi_construct_peer (1, &peer) == TSI_OK); + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, &peer.properties[0]) == TSI_OK); + ctx = tsi_ssl_peer_to_auth_context (&peer); + GPR_ASSERT (ctx != NULL); + GPR_ASSERT (!grpc_auth_context_peer_is_authenticated (ctx)); + GPR_ASSERT (check_transport_security_type (ctx)); + + tsi_peer_destruct (&peer); + GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); } -static int check_identity(const grpc_auth_context *ctx, - const char *expected_property_name, - const char **expected_identities, - size_t num_identities) { +static int +check_identity (const grpc_auth_context * ctx, const char *expected_property_name, const char **expected_identities, size_t num_identities) +{ grpc_auth_property_iterator it; const grpc_auth_property *prop; size_t i; - GPR_ASSERT(grpc_auth_context_peer_is_authenticated(ctx)); - it = grpc_auth_context_peer_identity(ctx); - for (i = 0; i < num_identities; i++) { - prop = grpc_auth_property_iterator_next(&it); - if (prop == NULL) { - gpr_log(GPR_ERROR, "Expected identity value %s not found.", - expected_identities[i]); + GPR_ASSERT (grpc_auth_context_peer_is_authenticated (ctx)); + it = grpc_auth_context_peer_identity (ctx); + for (i = 0; i < num_identities; i++) + { + prop = grpc_auth_property_iterator_next (&it); + if (prop == NULL) + { + gpr_log (GPR_ERROR, "Expected identity value %s not found.", expected_identities[i]); + return 0; + } + if (strcmp (prop->name, expected_property_name) != 0) + { + gpr_log (GPR_ERROR, "Expected peer identity property name %s and got %s.", expected_property_name, prop->name); + return 0; + } + if (strncmp (prop->value, expected_identities[i], prop->value_length) != 0) + { + gpr_log (GPR_ERROR, "Expected peer identity %s and got %s.", expected_identities[i], prop->value); + return 0; + } + } + return 1; +} + +static int +check_x509_cn (const grpc_auth_context * ctx, const char *expected_cn) +{ + grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name (ctx, GRPC_X509_CN_PROPERTY_NAME); + const grpc_auth_property *prop = grpc_auth_property_iterator_next (&it); + if (prop == NULL) + { + gpr_log (GPR_ERROR, "CN property not found."); return 0; } - if (strcmp(prop->name, expected_property_name) != 0) { - gpr_log(GPR_ERROR, "Expected peer identity property name %s and got %s.", - expected_property_name, prop->name); + if (strncmp (prop->value, expected_cn, prop->value_length) != 0) + { + gpr_log (GPR_ERROR, "Expected CN %s and got %s", expected_cn, prop->value); return 0; } - if (strncmp(prop->value, expected_identities[i], prop->value_length) != 0) { - gpr_log(GPR_ERROR, "Expected peer identity %s and got %s.", - expected_identities[i], prop->value); + if (grpc_auth_property_iterator_next (&it) != NULL) + { + gpr_log (GPR_ERROR, "Expected only one property for CN."); return 0; } - } - return 1; -} - -static int check_x509_cn(const grpc_auth_context *ctx, - const char *expected_cn) { - grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name( - ctx, GRPC_X509_CN_PROPERTY_NAME); - const grpc_auth_property *prop = grpc_auth_property_iterator_next(&it); - if (prop == NULL) { - gpr_log(GPR_ERROR, "CN property not found."); - return 0; - } - if (strncmp(prop->value, expected_cn, prop->value_length) != 0) { - gpr_log(GPR_ERROR, "Expected CN %s and got %s", expected_cn, prop->value); - return 0; - } - if (grpc_auth_property_iterator_next(&it) != NULL) { - gpr_log(GPR_ERROR, "Expected only one property for CN."); - return 0; - } return 1; } -static void test_cn_only_ssl_peer_to_auth_context(void) { +static void +test_cn_only_ssl_peer_to_auth_context (void) +{ tsi_peer peer; grpc_auth_context *ctx; const char *expected_cn = "cn1"; - GPR_ASSERT(tsi_construct_peer(2, &peer) == TSI_OK); - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, - &peer.properties[0]) == TSI_OK); - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, - &peer.properties[1]) == TSI_OK); - ctx = tsi_ssl_peer_to_auth_context(&peer); - GPR_ASSERT(ctx != NULL); - GPR_ASSERT(grpc_auth_context_peer_is_authenticated(ctx)); - GPR_ASSERT(check_identity(ctx, GRPC_X509_CN_PROPERTY_NAME, &expected_cn, 1)); - GPR_ASSERT(check_transport_security_type(ctx)); - GPR_ASSERT(check_x509_cn(ctx, expected_cn)); - - tsi_peer_destruct(&peer); - GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); + GPR_ASSERT (tsi_construct_peer (2, &peer) == TSI_OK); + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, &peer.properties[0]) == TSI_OK); + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, &peer.properties[1]) == TSI_OK); + ctx = tsi_ssl_peer_to_auth_context (&peer); + GPR_ASSERT (ctx != NULL); + GPR_ASSERT (grpc_auth_context_peer_is_authenticated (ctx)); + GPR_ASSERT (check_identity (ctx, GRPC_X509_CN_PROPERTY_NAME, &expected_cn, 1)); + GPR_ASSERT (check_transport_security_type (ctx)); + GPR_ASSERT (check_x509_cn (ctx, expected_cn)); + + tsi_peer_destruct (&peer); + GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); } -static void test_cn_and_one_san_ssl_peer_to_auth_context(void) { +static void +test_cn_and_one_san_ssl_peer_to_auth_context (void) +{ tsi_peer peer; grpc_auth_context *ctx; const char *expected_cn = "cn1"; const char *expected_san = "san1"; - GPR_ASSERT(tsi_construct_peer(3, &peer) == TSI_OK); - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, - &peer.properties[0]) == TSI_OK); - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, - &peer.properties[1]) == TSI_OK); - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, expected_san, - &peer.properties[2]) == TSI_OK); - ctx = tsi_ssl_peer_to_auth_context(&peer); - GPR_ASSERT(ctx != NULL); - GPR_ASSERT(grpc_auth_context_peer_is_authenticated(ctx)); - GPR_ASSERT( - check_identity(ctx, GRPC_X509_SAN_PROPERTY_NAME, &expected_san, 1)); - GPR_ASSERT(check_transport_security_type(ctx)); - GPR_ASSERT(check_x509_cn(ctx, expected_cn)); - - tsi_peer_destruct(&peer); - GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); + GPR_ASSERT (tsi_construct_peer (3, &peer) == TSI_OK); + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, &peer.properties[0]) == TSI_OK); + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, &peer.properties[1]) == TSI_OK); + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, expected_san, &peer.properties[2]) == TSI_OK); + ctx = tsi_ssl_peer_to_auth_context (&peer); + GPR_ASSERT (ctx != NULL); + GPR_ASSERT (grpc_auth_context_peer_is_authenticated (ctx)); + GPR_ASSERT (check_identity (ctx, GRPC_X509_SAN_PROPERTY_NAME, &expected_san, 1)); + GPR_ASSERT (check_transport_security_type (ctx)); + GPR_ASSERT (check_x509_cn (ctx, expected_cn)); + + tsi_peer_destruct (&peer); + GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); } -static void test_cn_and_multiple_sans_ssl_peer_to_auth_context(void) { +static void +test_cn_and_multiple_sans_ssl_peer_to_auth_context (void) +{ tsi_peer peer; grpc_auth_context *ctx; const char *expected_cn = "cn1"; - const char *expected_sans[] = {"san1", "san2", "san3"}; + const char *expected_sans[] = { "san1", "san2", "san3" }; size_t i; - GPR_ASSERT(tsi_construct_peer(2 + GPR_ARRAY_SIZE(expected_sans), &peer) == - TSI_OK); - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, - &peer.properties[0]) == TSI_OK); - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, - &peer.properties[1]) == TSI_OK); - for (i = 0; i < GPR_ARRAY_SIZE(expected_sans); i++) { - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, - expected_sans[i], &peer.properties[2 + i]) == TSI_OK); - } - ctx = tsi_ssl_peer_to_auth_context(&peer); - GPR_ASSERT(ctx != NULL); - GPR_ASSERT(grpc_auth_context_peer_is_authenticated(ctx)); - GPR_ASSERT(check_identity(ctx, GRPC_X509_SAN_PROPERTY_NAME, expected_sans, - GPR_ARRAY_SIZE(expected_sans))); - GPR_ASSERT(check_transport_security_type(ctx)); - GPR_ASSERT(check_x509_cn(ctx, expected_cn)); - - tsi_peer_destruct(&peer); - GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); + GPR_ASSERT (tsi_construct_peer (2 + GPR_ARRAY_SIZE (expected_sans), &peer) == TSI_OK); + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, &peer.properties[0]) == TSI_OK); + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, &peer.properties[1]) == TSI_OK); + for (i = 0; i < GPR_ARRAY_SIZE (expected_sans); i++) + { + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, expected_sans[i], &peer.properties[2 + i]) == TSI_OK); + } + ctx = tsi_ssl_peer_to_auth_context (&peer); + GPR_ASSERT (ctx != NULL); + GPR_ASSERT (grpc_auth_context_peer_is_authenticated (ctx)); + GPR_ASSERT (check_identity (ctx, GRPC_X509_SAN_PROPERTY_NAME, expected_sans, GPR_ARRAY_SIZE (expected_sans))); + GPR_ASSERT (check_transport_security_type (ctx)); + GPR_ASSERT (check_x509_cn (ctx, expected_cn)); + + tsi_peer_destruct (&peer); + GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); } -static void test_cn_and_multiple_sans_and_others_ssl_peer_to_auth_context( - void) { +static void +test_cn_and_multiple_sans_and_others_ssl_peer_to_auth_context (void) +{ tsi_peer peer; grpc_auth_context *ctx; const char *expected_cn = "cn1"; - const char *expected_sans[] = {"san1", "san2", "san3"}; + const char *expected_sans[] = { "san1", "san2", "san3" }; size_t i; - GPR_ASSERT(tsi_construct_peer(4 + GPR_ARRAY_SIZE(expected_sans), &peer) == - TSI_OK); - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, - &peer.properties[0]) == TSI_OK); - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - "foo", "bar", &peer.properties[1]) == TSI_OK); - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, - &peer.properties[2]) == TSI_OK); - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - "chapi", "chapo", &peer.properties[3]) == TSI_OK); - for (i = 0; i < GPR_ARRAY_SIZE(expected_sans); i++) { - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, - expected_sans[i], &peer.properties[4 + i]) == TSI_OK); - } - ctx = tsi_ssl_peer_to_auth_context(&peer); - GPR_ASSERT(ctx != NULL); - GPR_ASSERT(grpc_auth_context_peer_is_authenticated(ctx)); - GPR_ASSERT(check_identity(ctx, GRPC_X509_SAN_PROPERTY_NAME, expected_sans, - GPR_ARRAY_SIZE(expected_sans))); - GPR_ASSERT(check_transport_security_type(ctx)); - GPR_ASSERT(check_x509_cn(ctx, expected_cn)); - - tsi_peer_destruct(&peer); - GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); + GPR_ASSERT (tsi_construct_peer (4 + GPR_ARRAY_SIZE (expected_sans), &peer) == TSI_OK); + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, &peer.properties[0]) == TSI_OK); + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring ("foo", "bar", &peer.properties[1]) == TSI_OK); + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, &peer.properties[2]) == TSI_OK); + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring ("chapi", "chapo", &peer.properties[3]) == TSI_OK); + for (i = 0; i < GPR_ARRAY_SIZE (expected_sans); i++) + { + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, expected_sans[i], &peer.properties[4 + i]) == TSI_OK); + } + ctx = tsi_ssl_peer_to_auth_context (&peer); + GPR_ASSERT (ctx != NULL); + GPR_ASSERT (grpc_auth_context_peer_is_authenticated (ctx)); + GPR_ASSERT (check_identity (ctx, GRPC_X509_SAN_PROPERTY_NAME, expected_sans, GPR_ARRAY_SIZE (expected_sans))); + GPR_ASSERT (check_transport_security_type (ctx)); + GPR_ASSERT (check_x509_cn (ctx, expected_cn)); + + tsi_peer_destruct (&peer); + GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - grpc_init(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + grpc_init (); - test_unauthenticated_ssl_peer(); - test_cn_only_ssl_peer_to_auth_context(); - test_cn_and_one_san_ssl_peer_to_auth_context(); - test_cn_and_multiple_sans_ssl_peer_to_auth_context(); - test_cn_and_multiple_sans_and_others_ssl_peer_to_auth_context(); + test_unauthenticated_ssl_peer (); + test_cn_only_ssl_peer_to_auth_context (); + test_cn_and_one_san_ssl_peer_to_auth_context (); + test_cn_and_multiple_sans_ssl_peer_to_auth_context (); + test_cn_and_multiple_sans_and_others_ssl_peer_to_auth_context (); - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/security/verify_jwt.c b/test/core/security/verify_jwt.c index 9be6ee6e336..fd8aaeb4843 100644 --- a/test/core/security/verify_jwt.c +++ b/test/core/security/verify_jwt.c @@ -43,47 +43,53 @@ #include #include -typedef struct { +typedef struct +{ grpc_pollset pollset; int is_done; int success; } synchronizer; -static void print_usage_and_exit(gpr_cmdline *cl, const char *argv0) { - char *usage = gpr_cmdline_usage_string(cl, argv0); - fprintf(stderr, "%s", usage); - gpr_free(usage); - gpr_cmdline_destroy(cl); - exit(1); +static void +print_usage_and_exit (gpr_cmdline * cl, const char *argv0) +{ + char *usage = gpr_cmdline_usage_string (cl, argv0); + fprintf (stderr, "%s", usage); + gpr_free (usage); + gpr_cmdline_destroy (cl); + exit (1); } -static void on_jwt_verification_done(void *user_data, - grpc_jwt_verifier_status status, - grpc_jwt_claims *claims) { +static void +on_jwt_verification_done (void *user_data, grpc_jwt_verifier_status status, grpc_jwt_claims * claims) +{ synchronizer *sync = user_data; sync->success = (status == GRPC_JWT_VERIFIER_OK); - if (sync->success) { - char *claims_str; - GPR_ASSERT(claims != NULL); - claims_str = - 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); - } else { - GPR_ASSERT(claims == NULL); - fprintf(stderr, "Verification failed with error %s\n", - grpc_jwt_verifier_status_to_string(status)); - } + if (sync->success) + { + char *claims_str; + GPR_ASSERT (claims != NULL); + claims_str = 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); + } + else + { + GPR_ASSERT (claims == NULL); + fprintf (stderr, "Verification failed with error %s\n", grpc_jwt_verifier_status_to_string (status)); + } - gpr_mu_lock(GRPC_POLLSET_MU(&sync->pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&sync->pollset)); sync->is_done = 1; - grpc_pollset_kick(&sync->pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&sync->pollset)); + grpc_pollset_kick (&sync->pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&sync->pollset)); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ synchronizer sync; grpc_jwt_verifier *verifier; gpr_cmdline *cl; @@ -91,36 +97,36 @@ int main(int argc, char **argv) { char *aud = NULL; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - cl = gpr_cmdline_create("JWT verifier tool"); - gpr_cmdline_add_string(cl, "jwt", "JSON web token to verify", &jwt); - gpr_cmdline_add_string(cl, "aud", "Audience for the JWT", &aud); - gpr_cmdline_parse(cl, argc, argv); - if (jwt == NULL || aud == NULL) { - print_usage_and_exit(cl, argv[0]); - } + cl = gpr_cmdline_create ("JWT verifier tool"); + gpr_cmdline_add_string (cl, "jwt", "JSON web token to verify", &jwt); + gpr_cmdline_add_string (cl, "aud", "Audience for the JWT", &aud); + gpr_cmdline_parse (cl, argc, argv); + if (jwt == NULL || aud == NULL) + { + print_usage_and_exit (cl, argv[0]); + } - verifier = grpc_jwt_verifier_create(NULL, 0); + verifier = grpc_jwt_verifier_create (NULL, 0); - grpc_init(); + grpc_init (); - grpc_pollset_init(&sync.pollset); + grpc_pollset_init (&sync.pollset); sync.is_done = 0; - grpc_jwt_verifier_verify(verifier, &sync.pollset, jwt, aud, - on_jwt_verification_done, &sync, &closure_list); + grpc_jwt_verifier_verify (verifier, &sync.pollset, jwt, aud, on_jwt_verification_done, &sync, &closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); - while (!sync.is_done) { - grpc_pollset_worker worker; - grpc_pollset_work(&sync.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(GPR_CLOCK_MONOTONIC), &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); - } - gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); + while (!sync.is_done) + { + grpc_pollset_worker worker; + grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); + } + gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); - grpc_jwt_verifier_destroy(verifier); - gpr_cmdline_destroy(cl); + grpc_jwt_verifier_destroy (verifier); + gpr_cmdline_destroy (cl); return !sync.success; } diff --git a/test/core/statistics/census_log_tests.c b/test/core/statistics/census_log_tests.c index 3292f8a64d2..3622713e85d 100644 --- a/test/core/statistics/census_log_tests.c +++ b/test/core/statistics/census_log_tests.c @@ -46,93 +46,104 @@ /* Fills in 'record' of size 'size'. Each byte in record is filled in with the same value. The value is extracted from 'record' pointer. */ -static void write_record(char* record, size_t size) { - char data = (gpr_uintptr)record % 255; - memset(record, data, size); +static void +write_record (char *record, size_t size) +{ + char data = (gpr_uintptr) record % 255; + memset (record, data, size); } /* Reads fixed size records. Returns the number of records read in 'num_records'. */ -static void read_records(size_t record_size, const char* buffer, - size_t buffer_size, gpr_int32* num_records) { +static void +read_records (size_t record_size, const char *buffer, size_t buffer_size, gpr_int32 * num_records) +{ gpr_int32 ix; - GPR_ASSERT(buffer_size >= record_size); - GPR_ASSERT(buffer_size % record_size == 0); + GPR_ASSERT (buffer_size >= record_size); + GPR_ASSERT (buffer_size % record_size == 0); *num_records = buffer_size / record_size; - for (ix = 0; ix < *num_records; ++ix) { - size_t jx; - const char* record = buffer + (record_size * ix); - char data = (gpr_uintptr)record % 255; - for (jx = 0; jx < record_size; ++jx) { - GPR_ASSERT(data == record[jx]); + for (ix = 0; ix < *num_records; ++ix) + { + size_t jx; + const char *record = buffer + (record_size * ix); + char data = (gpr_uintptr) record % 255; + for (jx = 0; jx < record_size; ++jx) + { + GPR_ASSERT (data == record[jx]); + } } - } } /* Tries to write the specified number of records. Stops when the log gets full. Returns the number of records written. Spins for random number of times, up to 'max_spin_count', between writes. */ -static size_t write_records_to_log(int writer_id, gpr_int32 record_size, - gpr_int32 num_records, - gpr_int32 max_spin_count) { +static size_t +write_records_to_log (int writer_id, gpr_int32 record_size, gpr_int32 num_records, gpr_int32 max_spin_count) +{ gpr_int32 ix; int counter = 0; - for (ix = 0; ix < num_records; ++ix) { - gpr_int32 jx; - gpr_int32 spin_count = max_spin_count ? rand() % max_spin_count : 0; - char* record; - if (counter++ == num_records / 10) { - printf(" Writer %d: %d out of %d written\n", writer_id, ix, - num_records); - counter = 0; + for (ix = 0; ix < num_records; ++ix) + { + gpr_int32 jx; + gpr_int32 spin_count = max_spin_count ? rand () % max_spin_count : 0; + char *record; + if (counter++ == num_records / 10) + { + printf (" Writer %d: %d out of %d written\n", writer_id, ix, num_records); + counter = 0; + } + record = (char *) (census_log_start_write (record_size)); + if (record == NULL) + { + return ix; + } + write_record (record, record_size); + census_log_end_write (record, record_size); + for (jx = 0; jx < spin_count; ++jx) + { + GPR_ASSERT (jx >= 0); + } } - record = (char*)(census_log_start_write(record_size)); - if (record == NULL) { - return ix; - } - write_record(record, record_size); - census_log_end_write(record, record_size); - for (jx = 0; jx < spin_count; ++jx) { - GPR_ASSERT(jx >= 0); - } - } return num_records; } /* Performs a single read iteration. Returns the number of records read. */ -static size_t perform_read_iteration(size_t record_size) { - const void* read_buffer = NULL; +static size_t +perform_read_iteration (size_t record_size) +{ + const void *read_buffer = NULL; size_t bytes_available; size_t records_read = 0; - census_log_init_reader(); - while ((read_buffer = census_log_read_next(&bytes_available))) { - gpr_int32 num_records = 0; - read_records(record_size, (const char*)read_buffer, bytes_available, - &num_records); - records_read += num_records; - } + census_log_init_reader (); + while ((read_buffer = census_log_read_next (&bytes_available))) + { + gpr_int32 num_records = 0; + read_records (record_size, (const char *) read_buffer, bytes_available, &num_records); + records_read += num_records; + } return records_read; } /* Asserts that the log is empty. */ -static void assert_log_empty(void) { +static void +assert_log_empty (void) +{ size_t bytes_available; - census_log_init_reader(); - GPR_ASSERT(census_log_read_next(&bytes_available) == NULL); + census_log_init_reader (); + GPR_ASSERT (census_log_read_next (&bytes_available) == NULL); } /* Given log size and record size, computes the minimum usable space. */ -static gpr_int32 min_usable_space(size_t log_size, size_t record_size) { +static gpr_int32 +min_usable_space (size_t log_size, size_t record_size) +{ gpr_int32 usable_space; - gpr_int32 num_blocks = - GPR_MAX(log_size / CENSUS_LOG_MAX_RECORD_SIZE, gpr_cpu_num_cores()); + gpr_int32 num_blocks = GPR_MAX (log_size / CENSUS_LOG_MAX_RECORD_SIZE, gpr_cpu_num_cores ()); gpr_int32 waste_per_block = CENSUS_LOG_MAX_RECORD_SIZE % record_size; /* In the worst case, all except one core-local block is full. */ gpr_int32 num_full_blocks = num_blocks - 1; - usable_space = (gpr_int32)log_size - - (num_full_blocks * CENSUS_LOG_MAX_RECORD_SIZE) - - ((num_blocks - num_full_blocks) * waste_per_block); - GPR_ASSERT(usable_space > 0); + usable_space = (gpr_int32) log_size - (num_full_blocks * CENSUS_LOG_MAX_RECORD_SIZE) - ((num_blocks - num_full_blocks) * waste_per_block); + GPR_ASSERT (usable_space > 0); return usable_space; } @@ -140,36 +151,44 @@ static gpr_int32 min_usable_space(size_t log_size, size_t record_size) { are sized such that CENSUS_LOG_2_MAX_RECORD_SIZE is a multiple of record size. If not a circular log, verifies that the number of records written match the number of records read. */ -static void fill_log(size_t log_size, int no_fragmentation, int circular_log) { +static void +fill_log (size_t log_size, int no_fragmentation, int circular_log) +{ int size; gpr_int32 records_written; gpr_int32 usable_space; gpr_int32 records_read; - if (no_fragmentation) { - int log2size = rand() % (CENSUS_LOG_2_MAX_RECORD_SIZE + 1); - size = (1 << log2size); - } else { - while (1) { - size = 1 + (rand() % CENSUS_LOG_MAX_RECORD_SIZE); - if (CENSUS_LOG_MAX_RECORD_SIZE % size) { - break; - } + if (no_fragmentation) + { + int log2size = rand () % (CENSUS_LOG_2_MAX_RECORD_SIZE + 1); + size = (1 << log2size); } - } - printf(" Fill record size: %d\n", size); - records_written = write_records_to_log( - 0 /* writer id */, size, (log_size / size) * 2, 0 /* spin count */); - usable_space = min_usable_space(log_size, size); - GPR_ASSERT(records_written * size >= usable_space); - records_read = perform_read_iteration(size); - if (!circular_log) { - GPR_ASSERT(records_written == records_read); - } - assert_log_empty(); + else + { + while (1) + { + size = 1 + (rand () % CENSUS_LOG_MAX_RECORD_SIZE); + if (CENSUS_LOG_MAX_RECORD_SIZE % size) + { + break; + } + } + } + printf (" Fill record size: %d\n", size); + records_written = write_records_to_log (0 /* writer id */ , size, (log_size / size) * 2, 0 /* spin count */ ); + usable_space = min_usable_space (log_size, size); + GPR_ASSERT (records_written * size >= usable_space); + records_read = perform_read_iteration (size); + if (!circular_log) + { + GPR_ASSERT (records_written == records_read); + } + assert_log_empty (); } /* Structure to pass args to writer_thread */ -typedef struct writer_thread_args { +typedef struct writer_thread_args +{ /* Index of this thread in the writers vector. */ int index; /* Record size. */ @@ -177,41 +196,43 @@ typedef struct writer_thread_args { /* Number of records to write. */ gpr_int32 num_records; /* Used to signal when writer is complete */ - gpr_cv* done; - gpr_mu* mu; - int* count; + gpr_cv *done; + gpr_mu *mu; + int *count; } writer_thread_args; /* Writes the given number of records of random size (up to kMaxRecordSize) and random data to the specified log. */ -static void writer_thread(void* arg) { - writer_thread_args* args = (writer_thread_args*)arg; +static void +writer_thread (void *arg) +{ + writer_thread_args *args = (writer_thread_args *) arg; /* Maximum number of times to spin between writes. */ static const gpr_int32 MAX_SPIN_COUNT = 50; int records_written = 0; - printf(" Writer: %d\n", args->index); - while (records_written < args->num_records) { - records_written += write_records_to_log(args->index, args->record_size, - args->num_records - records_written, - MAX_SPIN_COUNT); - if (records_written < args->num_records) { - /* Ran out of log space. Sleep for a bit and let the reader catch up. - This should never happen for circular logs. */ - printf(" Writer stalled due to out-of-space: %d out of %d written\n", - records_written, args->num_records); - gpr_sleep_until(GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10)); + printf (" Writer: %d\n", args->index); + while (records_written < args->num_records) + { + records_written += write_records_to_log (args->index, args->record_size, args->num_records - records_written, MAX_SPIN_COUNT); + if (records_written < args->num_records) + { + /* Ran out of log space. Sleep for a bit and let the reader catch up. + This should never happen for circular logs. */ + printf (" Writer stalled due to out-of-space: %d out of %d written\n", records_written, args->num_records); + gpr_sleep_until (GRPC_TIMEOUT_MILLIS_TO_DEADLINE (10)); + } } - } /* Done. Decrement count and signal. */ - gpr_mu_lock(args->mu); + gpr_mu_lock (args->mu); (*args->count)--; - gpr_cv_broadcast(args->done); - printf(" Writer done: %d\n", args->index); - gpr_mu_unlock(args->mu); + gpr_cv_broadcast (args->done); + printf (" Writer done: %d\n", args->index); + gpr_mu_unlock (args->mu); } /* struct to pass args to reader_thread */ -typedef struct reader_thread_args { +typedef struct reader_thread_args +{ /* Record size. */ size_t record_size; /* Interval between read iterations. */ @@ -222,43 +243,45 @@ typedef struct reader_thread_args { gpr_cv stop; int stop_flag; /* Used to signal when reader has finished */ - gpr_cv* done; - gpr_mu* mu; + gpr_cv *done; + gpr_mu *mu; int running; } reader_thread_args; /* Reads and verifies the specified number of records. Reader can also be stopped via gpr_cv_signal(&args->stop). Sleeps for 'read_interval_in_msec' between read iterations. */ -static void reader_thread(void* arg) { +static void +reader_thread (void *arg) +{ gpr_int32 records_read = 0; - reader_thread_args* args = (reader_thread_args*)arg; + reader_thread_args *args = (reader_thread_args *) arg; gpr_int32 num_iterations = 0; gpr_timespec interval; int counter = 0; - printf(" Reader starting\n"); - interval = gpr_time_from_micros(args->read_iteration_interval_in_msec * 1000, - GPR_TIMESPAN); - gpr_mu_lock(args->mu); - while (!args->stop_flag && records_read < args->total_records) { - gpr_cv_wait(&args->stop, args->mu, interval); - if (!args->stop_flag) { - records_read += perform_read_iteration(args->record_size); - GPR_ASSERT(records_read <= args->total_records); - if (counter++ == 100000) { - printf(" Reader: %d out of %d read\n", records_read, - args->total_records); - counter = 0; - } - ++num_iterations; + printf (" Reader starting\n"); + interval = gpr_time_from_micros (args->read_iteration_interval_in_msec * 1000, GPR_TIMESPAN); + gpr_mu_lock (args->mu); + while (!args->stop_flag && records_read < args->total_records) + { + gpr_cv_wait (&args->stop, args->mu, interval); + if (!args->stop_flag) + { + records_read += perform_read_iteration (args->record_size); + GPR_ASSERT (records_read <= args->total_records); + if (counter++ == 100000) + { + printf (" Reader: %d out of %d read\n", records_read, args->total_records); + counter = 0; + } + ++num_iterations; + } } - } /* Done */ args->running = 0; - gpr_cv_broadcast(args->done); - printf(" Reader: records: %d, iterations: %d\n", records_read, - num_iterations); - gpr_mu_unlock(args->mu); + gpr_cv_broadcast (args->done); + printf (" Reader: records: %d, iterations: %d\n", records_read, num_iterations); + gpr_mu_unlock (args->mu); } /* Creates NUM_WRITERS writers where each writer writes NUM_RECORDS_PER_WRITER @@ -266,7 +289,9 @@ static void reader_thread(void* arg) { READ_ITERATION_INTERVAL_IN_MSEC. */ /* Number of writers. */ #define NUM_WRITERS 5 -static void multiple_writers_single_reader(int circular_log) { +static void +multiple_writers_single_reader (int circular_log) +{ /* Sleep interval between read iterations. */ static const gpr_int32 READ_ITERATION_INTERVAL_IN_MSEC = 10; /* Number of records written by each writer. */ @@ -277,315 +302,347 @@ static void multiple_writers_single_reader(int circular_log) { gpr_thd_id id; gpr_cv writers_done; int writers_count = NUM_WRITERS; - gpr_mu writers_mu; /* protects writers_done and writers_count */ + gpr_mu writers_mu; /* protects writers_done and writers_count */ writer_thread_args writers[NUM_WRITERS]; gpr_cv reader_done; - gpr_mu reader_mu; /* protects reader_done and reader.running */ + gpr_mu reader_mu; /* protects reader_done and reader.running */ reader_thread_args reader; - gpr_int32 record_size = 1 + rand() % MAX_RECORD_SIZE; - printf(" Record size: %d\n", record_size); + gpr_int32 record_size = 1 + rand () % MAX_RECORD_SIZE; + printf (" Record size: %d\n", record_size); /* Create and start writers. */ - gpr_cv_init(&writers_done); - gpr_mu_init(&writers_mu); - for (ix = 0; ix < NUM_WRITERS; ++ix) { - writers[ix].index = ix; - writers[ix].record_size = record_size; - writers[ix].num_records = NUM_RECORDS_PER_WRITER; - writers[ix].done = &writers_done; - writers[ix].count = &writers_count; - writers[ix].mu = &writers_mu; - gpr_thd_new(&id, &writer_thread, &writers[ix], NULL); - } + gpr_cv_init (&writers_done); + gpr_mu_init (&writers_mu); + for (ix = 0; ix < NUM_WRITERS; ++ix) + { + writers[ix].index = ix; + writers[ix].record_size = record_size; + writers[ix].num_records = NUM_RECORDS_PER_WRITER; + writers[ix].done = &writers_done; + writers[ix].count = &writers_count; + writers[ix].mu = &writers_mu; + gpr_thd_new (&id, &writer_thread, &writers[ix], NULL); + } /* Start reader. */ reader.record_size = record_size; reader.read_iteration_interval_in_msec = READ_ITERATION_INTERVAL_IN_MSEC; reader.total_records = NUM_WRITERS * NUM_RECORDS_PER_WRITER; reader.stop_flag = 0; - gpr_cv_init(&reader.stop); - gpr_cv_init(&reader_done); + gpr_cv_init (&reader.stop); + gpr_cv_init (&reader_done); reader.done = &reader_done; - gpr_mu_init(&reader_mu); + gpr_mu_init (&reader_mu); reader.mu = &reader_mu; reader.running = 1; - gpr_thd_new(&id, &reader_thread, &reader, NULL); + gpr_thd_new (&id, &reader_thread, &reader, NULL); /* Wait for writers to finish. */ - gpr_mu_lock(&writers_mu); - while (writers_count != 0) { - gpr_cv_wait(&writers_done, &writers_mu, gpr_inf_future(GPR_CLOCK_REALTIME)); - } - gpr_mu_unlock(&writers_mu); - gpr_mu_destroy(&writers_mu); - gpr_cv_destroy(&writers_done); - gpr_mu_lock(&reader_mu); - if (circular_log) { - /* Stop reader. */ - reader.stop_flag = 1; - gpr_cv_signal(&reader.stop); - } + gpr_mu_lock (&writers_mu); + while (writers_count != 0) + { + gpr_cv_wait (&writers_done, &writers_mu, gpr_inf_future (GPR_CLOCK_REALTIME)); + } + gpr_mu_unlock (&writers_mu); + gpr_mu_destroy (&writers_mu); + gpr_cv_destroy (&writers_done); + gpr_mu_lock (&reader_mu); + if (circular_log) + { + /* Stop reader. */ + reader.stop_flag = 1; + gpr_cv_signal (&reader.stop); + } /* wait for reader to finish */ - while (reader.running) { - gpr_cv_wait(&reader_done, &reader_mu, gpr_inf_future(GPR_CLOCK_REALTIME)); - } - if (circular_log) { - /* Assert that there were no out-of-space errors. */ - GPR_ASSERT(0 == census_log_out_of_space_count()); - } - gpr_mu_unlock(&reader_mu); - gpr_mu_destroy(&reader_mu); - gpr_cv_destroy(&reader_done); - printf(" Reader: finished\n"); + while (reader.running) + { + gpr_cv_wait (&reader_done, &reader_mu, gpr_inf_future (GPR_CLOCK_REALTIME)); + } + if (circular_log) + { + /* Assert that there were no out-of-space errors. */ + GPR_ASSERT (0 == census_log_out_of_space_count ()); + } + gpr_mu_unlock (&reader_mu); + gpr_mu_destroy (&reader_mu); + gpr_cv_destroy (&reader_done); + printf (" Reader: finished\n"); } /* Log sizes to use for all tests. */ #define LOG_SIZE_IN_MB 1 #define LOG_SIZE_IN_BYTES (LOG_SIZE_IN_MB << 20) -static void setup_test(int circular_log) { - census_log_initialize(LOG_SIZE_IN_MB, circular_log); - GPR_ASSERT(census_log_remaining_space() == LOG_SIZE_IN_BYTES); +static void +setup_test (int circular_log) +{ + census_log_initialize (LOG_SIZE_IN_MB, circular_log); + GPR_ASSERT (census_log_remaining_space () == LOG_SIZE_IN_BYTES); } /* Attempts to create a record of invalid size (size > CENSUS_LOG_MAX_RECORD_SIZE). */ -void test_invalid_record_size(void) { +void +test_invalid_record_size (void) +{ static const size_t INVALID_SIZE = CENSUS_LOG_MAX_RECORD_SIZE + 1; static const size_t VALID_SIZE = 1; - void* record; - printf("Starting test: invalid record size\n"); - setup_test(0); - record = census_log_start_write(INVALID_SIZE); - GPR_ASSERT(record == NULL); + void *record; + printf ("Starting test: invalid record size\n"); + setup_test (0); + record = census_log_start_write (INVALID_SIZE); + GPR_ASSERT (record == NULL); /* Now try writing a valid record. */ - record = census_log_start_write(VALID_SIZE); - GPR_ASSERT(record != NULL); - census_log_end_write(record, VALID_SIZE); + record = census_log_start_write (VALID_SIZE); + GPR_ASSERT (record != NULL); + census_log_end_write (record, VALID_SIZE); /* Verifies that available space went down by one block. In theory, this check can fail if the thread is context switched to a new CPU during the start_write execution (multiple blocks get allocated), but this has not been observed in practice. */ - GPR_ASSERT(LOG_SIZE_IN_BYTES - CENSUS_LOG_MAX_RECORD_SIZE == - census_log_remaining_space()); - census_log_shutdown(); + GPR_ASSERT (LOG_SIZE_IN_BYTES - CENSUS_LOG_MAX_RECORD_SIZE == census_log_remaining_space ()); + census_log_shutdown (); } /* Tests end_write() with a different size than what was specified in start_write(). */ -void test_end_write_with_different_size(void) { +void +test_end_write_with_different_size (void) +{ static const size_t START_WRITE_SIZE = 10; static const size_t END_WRITE_SIZE = 7; - void* record_written; - const void* record_read; + void *record_written; + const void *record_read; size_t bytes_available; - printf("Starting test: end write with different size\n"); - setup_test(0); - record_written = census_log_start_write(START_WRITE_SIZE); - GPR_ASSERT(record_written != NULL); - census_log_end_write(record_written, END_WRITE_SIZE); - census_log_init_reader(); - record_read = census_log_read_next(&bytes_available); - GPR_ASSERT(record_written == record_read); - GPR_ASSERT(END_WRITE_SIZE == bytes_available); - assert_log_empty(); - census_log_shutdown(); + printf ("Starting test: end write with different size\n"); + setup_test (0); + record_written = census_log_start_write (START_WRITE_SIZE); + GPR_ASSERT (record_written != NULL); + census_log_end_write (record_written, END_WRITE_SIZE); + census_log_init_reader (); + record_read = census_log_read_next (&bytes_available); + GPR_ASSERT (record_written == record_read); + GPR_ASSERT (END_WRITE_SIZE == bytes_available); + assert_log_empty (); + census_log_shutdown (); } /* Verifies that pending records are not available via read_next(). */ -void test_read_pending_record(void) { +void +test_read_pending_record (void) +{ static const size_t PR_RECORD_SIZE = 1024; size_t bytes_available; - const void* record_read; - void* record_written; - printf("Starting test: read pending record\n"); - setup_test(0); + const void *record_read; + void *record_written; + printf ("Starting test: read pending record\n"); + setup_test (0); /* Start a write. */ - record_written = census_log_start_write(PR_RECORD_SIZE); - GPR_ASSERT(record_written != NULL); + record_written = census_log_start_write (PR_RECORD_SIZE); + GPR_ASSERT (record_written != NULL); /* As write is pending, read should fail. */ - census_log_init_reader(); - record_read = census_log_read_next(&bytes_available); - GPR_ASSERT(record_read == NULL); + census_log_init_reader (); + record_read = census_log_read_next (&bytes_available); + GPR_ASSERT (record_read == NULL); /* A read followed by end_write() should succeed. */ - census_log_end_write(record_written, PR_RECORD_SIZE); - census_log_init_reader(); - record_read = census_log_read_next(&bytes_available); - GPR_ASSERT(record_written == record_read); - GPR_ASSERT(PR_RECORD_SIZE == bytes_available); - assert_log_empty(); - census_log_shutdown(); + census_log_end_write (record_written, PR_RECORD_SIZE); + census_log_init_reader (); + record_read = census_log_read_next (&bytes_available); + GPR_ASSERT (record_written == record_read); + GPR_ASSERT (PR_RECORD_SIZE == bytes_available); + assert_log_empty (); + census_log_shutdown (); } /* Tries reading beyond pending write. */ -void test_read_beyond_pending_record(void) { +void +test_read_beyond_pending_record (void) +{ /* Start a write. */ gpr_uint32 incomplete_record_size = 10; gpr_uint32 complete_record_size = 20; size_t bytes_available; - void* complete_record; - const void* record_read; - void* incomplete_record; - printf("Starting test: read beyond pending record\n"); - setup_test(0); - incomplete_record = census_log_start_write(incomplete_record_size); - GPR_ASSERT(incomplete_record != NULL); - complete_record = census_log_start_write(complete_record_size); - GPR_ASSERT(complete_record != NULL); - GPR_ASSERT(complete_record != incomplete_record); - census_log_end_write(complete_record, complete_record_size); + void *complete_record; + const void *record_read; + void *incomplete_record; + printf ("Starting test: read beyond pending record\n"); + setup_test (0); + incomplete_record = census_log_start_write (incomplete_record_size); + GPR_ASSERT (incomplete_record != NULL); + complete_record = census_log_start_write (complete_record_size); + GPR_ASSERT (complete_record != NULL); + GPR_ASSERT (complete_record != incomplete_record); + census_log_end_write (complete_record, complete_record_size); /* Now iterate over blocks to read completed records. */ - census_log_init_reader(); - record_read = census_log_read_next(&bytes_available); - GPR_ASSERT(complete_record == record_read); - GPR_ASSERT(complete_record_size == bytes_available); + census_log_init_reader (); + record_read = census_log_read_next (&bytes_available); + GPR_ASSERT (complete_record == record_read); + GPR_ASSERT (complete_record_size == bytes_available); /* Complete first record. */ - census_log_end_write(incomplete_record, incomplete_record_size); + census_log_end_write (incomplete_record, incomplete_record_size); /* Have read past the incomplete record, so read_next() should return NULL. */ /* NB: this test also assumes our thread did not get switched to a different CPU between the two start_write calls */ - record_read = census_log_read_next(&bytes_available); - GPR_ASSERT(record_read == NULL); + record_read = census_log_read_next (&bytes_available); + GPR_ASSERT (record_read == NULL); /* Reset reader to get the newly completed record. */ - census_log_init_reader(); - record_read = census_log_read_next(&bytes_available); - GPR_ASSERT(incomplete_record == record_read); - GPR_ASSERT(incomplete_record_size == bytes_available); - assert_log_empty(); - census_log_shutdown(); + census_log_init_reader (); + record_read = census_log_read_next (&bytes_available); + GPR_ASSERT (incomplete_record == record_read); + GPR_ASSERT (incomplete_record_size == bytes_available); + assert_log_empty (); + census_log_shutdown (); } /* Tests scenario where block being read is detached from a core and put on the dirty list. */ -void test_detached_while_reading(void) { +void +test_detached_while_reading (void) +{ static const size_t DWR_RECORD_SIZE = 10; size_t bytes_available; - const void* record_read; - void* record_written; + const void *record_read; + void *record_written; gpr_uint32 block_read = 0; - printf("Starting test: detached while reading\n"); - setup_test(0); + printf ("Starting test: detached while reading\n"); + setup_test (0); /* Start a write. */ - record_written = census_log_start_write(DWR_RECORD_SIZE); - GPR_ASSERT(record_written != NULL); - census_log_end_write(record_written, DWR_RECORD_SIZE); + record_written = census_log_start_write (DWR_RECORD_SIZE); + GPR_ASSERT (record_written != NULL); + census_log_end_write (record_written, DWR_RECORD_SIZE); /* Read this record. */ - census_log_init_reader(); - record_read = census_log_read_next(&bytes_available); - GPR_ASSERT(record_read != NULL); - GPR_ASSERT(DWR_RECORD_SIZE == bytes_available); + census_log_init_reader (); + record_read = census_log_read_next (&bytes_available); + GPR_ASSERT (record_read != NULL); + GPR_ASSERT (DWR_RECORD_SIZE == bytes_available); /* Now fill the log. This will move the block being read from core-local array to the dirty list. */ - while ((record_written = census_log_start_write(DWR_RECORD_SIZE))) { - census_log_end_write(record_written, DWR_RECORD_SIZE); - } + while ((record_written = census_log_start_write (DWR_RECORD_SIZE))) + { + census_log_end_write (record_written, DWR_RECORD_SIZE); + } /* In this iteration, read_next() should only traverse blocks in the core-local array. Therefore, we expect at most gpr_cpu_num_cores() more blocks. As log is full, if read_next() is traversing the dirty list, we will get more than gpr_cpu_num_cores() blocks. */ - while ((record_read = census_log_read_next(&bytes_available))) { - ++block_read; - GPR_ASSERT(block_read <= gpr_cpu_num_cores()); - } - census_log_shutdown(); + while ((record_read = census_log_read_next (&bytes_available))) + { + ++block_read; + GPR_ASSERT (block_read <= gpr_cpu_num_cores ()); + } + census_log_shutdown (); } /* Fills non-circular log with records sized such that size is a multiple of CENSUS_LOG_MAX_RECORD_SIZE (no per-block fragmentation). */ -void test_fill_log_no_fragmentation(void) { +void +test_fill_log_no_fragmentation (void) +{ const int circular = 0; - printf("Starting test: fill log no fragmentation\n"); - setup_test(circular); - fill_log(LOG_SIZE_IN_BYTES, 1 /* no fragmentation */, circular); - census_log_shutdown(); + printf ("Starting test: fill log no fragmentation\n"); + setup_test (circular); + fill_log (LOG_SIZE_IN_BYTES, 1 /* no fragmentation */ , circular); + census_log_shutdown (); } /* Fills circular log with records sized such that size is a multiple of CENSUS_LOG_MAX_RECORD_SIZE (no per-block fragmentation). */ -void test_fill_circular_log_no_fragmentation(void) { +void +test_fill_circular_log_no_fragmentation (void) +{ const int circular = 1; - printf("Starting test: fill circular log no fragmentation\n"); - setup_test(circular); - fill_log(LOG_SIZE_IN_BYTES, 1 /* no fragmentation */, circular); - census_log_shutdown(); + printf ("Starting test: fill circular log no fragmentation\n"); + setup_test (circular); + fill_log (LOG_SIZE_IN_BYTES, 1 /* no fragmentation */ , circular); + census_log_shutdown (); } /* Fills non-circular log with records that may straddle end of a block. */ -void test_fill_log_with_straddling_records(void) { +void +test_fill_log_with_straddling_records (void) +{ const int circular = 0; - printf("Starting test: fill log with straddling records\n"); - setup_test(circular); - fill_log(LOG_SIZE_IN_BYTES, 0 /* block straddling records */, circular); - census_log_shutdown(); + printf ("Starting test: fill log with straddling records\n"); + setup_test (circular); + fill_log (LOG_SIZE_IN_BYTES, 0 /* block straddling records */ , circular); + census_log_shutdown (); } /* Fills circular log with records that may straddle end of a block. */ -void test_fill_circular_log_with_straddling_records(void) { +void +test_fill_circular_log_with_straddling_records (void) +{ const int circular = 1; - printf("Starting test: fill circular log with straddling records\n"); - setup_test(circular); - fill_log(LOG_SIZE_IN_BYTES, 0 /* block straddling records */, circular); - census_log_shutdown(); + printf ("Starting test: fill circular log with straddling records\n"); + setup_test (circular); + fill_log (LOG_SIZE_IN_BYTES, 0 /* block straddling records */ , circular); + census_log_shutdown (); } /* Tests scenario where multiple writers and a single reader are using a log that is configured to discard old records. */ -void test_multiple_writers_circular_log(void) { +void +test_multiple_writers_circular_log (void) +{ const int circular = 1; - printf("Starting test: multiple writers circular log\n"); - setup_test(circular); - multiple_writers_single_reader(circular); - census_log_shutdown(); + printf ("Starting test: multiple writers circular log\n"); + setup_test (circular); + multiple_writers_single_reader (circular); + census_log_shutdown (); } /* Tests scenario where multiple writers and a single reader are using a log that is configured to discard old records. */ -void test_multiple_writers(void) { +void +test_multiple_writers (void) +{ const int circular = 0; - printf("Starting test: multiple writers\n"); - setup_test(circular); - multiple_writers_single_reader(circular); - census_log_shutdown(); + printf ("Starting test: multiple writers\n"); + setup_test (circular); + multiple_writers_single_reader (circular); + census_log_shutdown (); } /* Repeat the straddling records and multiple writers tests with a small log. */ -void test_small_log(void) { +void +test_small_log (void) +{ size_t log_size; const int circular = 0; - printf("Starting test: small log\n"); - census_log_initialize(0, circular); - log_size = census_log_remaining_space(); - GPR_ASSERT(log_size > 0); - fill_log(log_size, 0, circular); - census_log_shutdown(); - census_log_initialize(0, circular); - multiple_writers_single_reader(circular); - census_log_shutdown(); + printf ("Starting test: small log\n"); + census_log_initialize (0, circular); + log_size = census_log_remaining_space (); + GPR_ASSERT (log_size > 0); + fill_log (log_size, 0, circular); + census_log_shutdown (); + census_log_initialize (0, circular); + multiple_writers_single_reader (circular); + census_log_shutdown (); } -void test_performance(void) { +void +test_performance (void) +{ int write_size = 1; - for (; write_size < CENSUS_LOG_MAX_RECORD_SIZE; write_size *= 2) { - gpr_timespec write_time; - gpr_timespec start_time; - double write_time_micro = 0.0; - int nrecords = 0; - setup_test(0); - start_time = gpr_now(GPR_CLOCK_REALTIME); - while (1) { - void* record = census_log_start_write(write_size); - if (record == NULL) { - break; - } - census_log_end_write(record, write_size); - nrecords++; + for (; write_size < CENSUS_LOG_MAX_RECORD_SIZE; write_size *= 2) + { + gpr_timespec write_time; + gpr_timespec start_time; + double write_time_micro = 0.0; + int nrecords = 0; + setup_test (0); + start_time = gpr_now (GPR_CLOCK_REALTIME); + while (1) + { + void *record = census_log_start_write (write_size); + if (record == NULL) + { + break; + } + census_log_end_write (record, write_size); + nrecords++; + } + write_time = gpr_time_sub (gpr_now (GPR_CLOCK_REALTIME), start_time); + write_time_micro = write_time.tv_sec * 1000000 + write_time.tv_nsec / 1000; + census_log_shutdown (); + printf ("Wrote %d %d byte records in %.3g microseconds: %g records/us " "(%g ns/record), %g gigabytes/s\n", nrecords, write_size, write_time_micro, nrecords / write_time_micro, 1000 * write_time_micro / nrecords, (write_size * nrecords) / write_time_micro / 1000); } - write_time = gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), start_time); - write_time_micro = write_time.tv_sec * 1000000 + write_time.tv_nsec / 1000; - census_log_shutdown(); - printf( - "Wrote %d %d byte records in %.3g microseconds: %g records/us " - "(%g ns/record), %g gigabytes/s\n", - nrecords, write_size, write_time_micro, nrecords / write_time_micro, - 1000 * write_time_micro / nrecords, - (write_size * nrecords) / write_time_micro / 1000); - } } diff --git a/test/core/statistics/census_log_tests.h b/test/core/statistics/census_log_tests.h index ec3241b4f97..684b014cebb 100644 --- a/test/core/statistics/census_log_tests.h +++ b/test/core/statistics/census_log_tests.h @@ -34,18 +34,18 @@ #ifndef GRPC_TEST_CORE_STATISTICS_CENSUS_LOG_TESTS_H #define GRPC_TEST_CORE_STATISTICS_CENSUS_LOG_TESTS_H -void test_invalid_record_size(); -void test_end_write_with_different_size(); -void test_read_pending_record(); -void test_read_beyond_pending_record(); -void test_detached_while_reading(); -void test_fill_log_no_fragmentation(); -void test_fill_circular_log_no_fragmentation(); -void test_fill_log_with_straddling_records(); -void test_fill_circular_log_with_straddling_records(); -void test_multiple_writers_circular_log(); -void test_multiple_writers(); -void test_performance(); -void test_small_log(); +void test_invalid_record_size (); +void test_end_write_with_different_size (); +void test_read_pending_record (); +void test_read_beyond_pending_record (); +void test_detached_while_reading (); +void test_fill_log_no_fragmentation (); +void test_fill_circular_log_no_fragmentation (); +void test_fill_log_with_straddling_records (); +void test_fill_circular_log_with_straddling_records (); +void test_multiple_writers_circular_log (); +void test_multiple_writers (); +void test_performance (); +void test_small_log (); #endif /* GRPC_TEST_CORE_STATISTICS_CENSUS_LOG_TESTS_H */ diff --git a/test/core/statistics/census_stub_test.c b/test/core/statistics/census_stub_test.c index 26a45ae58a9..ed4da9463ba 100644 --- a/test/core/statistics/census_stub_test.c +++ b/test/core/statistics/census_stub_test.c @@ -41,37 +41,41 @@ #include "test/core/util/test_config.h" /* Tests census noop stubs in a simulated rpc flow */ -void test_census_stubs(void) { +void +test_census_stubs (void) +{ census_op_id op_id; - census_rpc_stats* stats = census_rpc_stats_create_empty(); - census_aggregated_rpc_stats data_map = {0, NULL}; + census_rpc_stats *stats = census_rpc_stats_create_empty (); + census_aggregated_rpc_stats data_map = { 0, NULL }; /* Initializes census library at server start up time. */ - census_init(); + census_init (); /* Starts tracing at the beginning of a rpc. */ - op_id = census_tracing_start_op(); + op_id = census_tracing_start_op (); /* Appends custom annotations on a trace object. */ - census_tracing_print(op_id, "annotation foo"); - census_tracing_print(op_id, "annotation bar"); + census_tracing_print (op_id, "annotation foo"); + census_tracing_print (op_id, "annotation bar"); /* Appends method tag on the trace object. */ - census_add_method_tag(op_id, "service_foo/method.bar"); + census_add_method_tag (op_id, "service_foo/method.bar"); /* Either record client side stats or server side stats associated with the op_id. Here for testing purpose, we record both. */ - census_record_rpc_client_stats(op_id, stats); - census_record_rpc_server_stats(op_id, stats); + census_record_rpc_client_stats (op_id, stats); + census_record_rpc_server_stats (op_id, stats); /* Ends a tracing. */ - census_tracing_end_op(op_id); + census_tracing_end_op (op_id); /* In process stats queries. */ - census_get_server_stats(&data_map); - census_aggregated_rpc_stats_set_empty(&data_map); - census_get_client_stats(&data_map); - census_aggregated_rpc_stats_set_empty(&data_map); - gpr_free(stats); - census_shutdown(); + census_get_server_stats (&data_map); + census_aggregated_rpc_stats_set_empty (&data_map); + census_get_client_stats (&data_map); + census_aggregated_rpc_stats_set_empty (&data_map); + gpr_free (stats); + census_shutdown (); } -int main(int argc, char** argv) { - grpc_test_init(argc, argv); - test_census_stubs(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_census_stubs (); return 0; } diff --git a/test/core/statistics/hash_table_test.c b/test/core/statistics/hash_table_test.c index 2568e96cba1..bcf3fb7b87d 100644 --- a/test/core/statistics/hash_table_test.c +++ b/test/core/statistics/hash_table_test.c @@ -44,258 +44,296 @@ #include #include "test/core/util/test_config.h" -static gpr_uint64 hash64(const void* k) { - size_t len = strlen(k); - gpr_uint64 higher = gpr_murmur_hash3((const char*)k, len / 2, 0); - return higher << 32 | - gpr_murmur_hash3((const char*)(k) + len / 2, len - len / 2, 0); +static gpr_uint64 +hash64 (const void *k) +{ + size_t len = strlen (k); + gpr_uint64 higher = gpr_murmur_hash3 ((const char *) k, len / 2, 0); + return higher << 32 | gpr_murmur_hash3 ((const char *) (k) + len / 2, len - len / 2, 0); } -static int cmp_str_keys(const void* k1, const void* k2) { - return strcmp((const char*)k1, (const char*)k2); +static int +cmp_str_keys (const void *k1, const void *k2) +{ + return strcmp ((const char *) k1, (const char *) k2); } -static gpr_uint64 force_collision(const void* k) { - return (1997 + hash64(k) % 3); +static gpr_uint64 +force_collision (const void *k) +{ + return (1997 + hash64 (k) % 3); } -static void free_data(void* data) { gpr_free(data); } +static void +free_data (void *data) +{ + gpr_free (data); +} /* Basic tests that empty hash table can be created and destroyed. */ -static void test_create_table(void) { +static void +test_create_table (void) +{ /* Create table with uint64 key type */ - census_ht* ht = NULL; + census_ht *ht = NULL; census_ht_option ht_options = { - CENSUS_HT_UINT64, 1999, NULL, NULL, NULL, NULL}; - ht = census_ht_create(&ht_options); - GPR_ASSERT(ht != NULL); - GPR_ASSERT(census_ht_get_size(ht) == 0); - census_ht_destroy(ht); + CENSUS_HT_UINT64, 1999, NULL, NULL, NULL, NULL + }; + ht = census_ht_create (&ht_options); + GPR_ASSERT (ht != NULL); + GPR_ASSERT (census_ht_get_size (ht) == 0); + census_ht_destroy (ht); /* Create table with pointer key type */ ht = NULL; ht_options.key_type = CENSUS_HT_POINTER; ht_options.hash = &hash64; ht_options.compare_keys = &cmp_str_keys; - ht = census_ht_create(&ht_options); - GPR_ASSERT(ht != NULL); - GPR_ASSERT(census_ht_get_size(ht) == 0); - census_ht_destroy(ht); + ht = census_ht_create (&ht_options); + GPR_ASSERT (ht != NULL); + GPR_ASSERT (census_ht_get_size (ht) == 0); + census_ht_destroy (ht); } -static void test_table_with_int_key(void) { - census_ht_option opt = {CENSUS_HT_UINT64, 7, NULL, NULL, NULL, NULL}; - census_ht* ht = census_ht_create(&opt); +static void +test_table_with_int_key (void) +{ + census_ht_option opt = { CENSUS_HT_UINT64, 7, NULL, NULL, NULL, NULL }; + census_ht *ht = census_ht_create (&opt); gpr_uint64 i = 0; gpr_uint64 sum_of_keys = 0; size_t num_elements; - census_ht_kv* elements = NULL; - GPR_ASSERT(ht != NULL); - GPR_ASSERT(census_ht_get_size(ht) == 0); - elements = census_ht_get_all_elements(ht, &num_elements); - GPR_ASSERT(num_elements == 0); - GPR_ASSERT(elements == NULL); - for (i = 0; i < 20; ++i) { - census_ht_key key; - key.val = i; - census_ht_insert(ht, key, (void*)(gpr_intptr)i); - GPR_ASSERT(census_ht_get_size(ht) == i + 1); - } - for (i = 0; i < 20; i++) { - gpr_uint64* val = NULL; - census_ht_key key; - key.val = i; - val = census_ht_find(ht, key); - GPR_ASSERT(val == (void*)(gpr_intptr)i); - } - elements = census_ht_get_all_elements(ht, &num_elements); - GPR_ASSERT(elements != NULL); - GPR_ASSERT(num_elements == 20); - for (i = 0; i < num_elements; i++) { - sum_of_keys += elements[i].k.val; - } - GPR_ASSERT(sum_of_keys == 190); - gpr_free(elements); - census_ht_destroy(ht); + census_ht_kv *elements = NULL; + GPR_ASSERT (ht != NULL); + GPR_ASSERT (census_ht_get_size (ht) == 0); + elements = census_ht_get_all_elements (ht, &num_elements); + GPR_ASSERT (num_elements == 0); + GPR_ASSERT (elements == NULL); + for (i = 0; i < 20; ++i) + { + census_ht_key key; + key.val = i; + census_ht_insert (ht, key, (void *) (gpr_intptr) i); + GPR_ASSERT (census_ht_get_size (ht) == i + 1); + } + for (i = 0; i < 20; i++) + { + gpr_uint64 *val = NULL; + census_ht_key key; + key.val = i; + val = census_ht_find (ht, key); + GPR_ASSERT (val == (void *) (gpr_intptr) i); + } + elements = census_ht_get_all_elements (ht, &num_elements); + GPR_ASSERT (elements != NULL); + GPR_ASSERT (num_elements == 20); + for (i = 0; i < num_elements; i++) + { + sum_of_keys += elements[i].k.val; + } + GPR_ASSERT (sum_of_keys == 190); + gpr_free (elements); + census_ht_destroy (ht); } /* Test that there is no memory leak when keys and values are owned by table. */ -static void test_value_and_key_deleter(void) { - census_ht_option opt = {CENSUS_HT_POINTER, 7, &hash64, - &cmp_str_keys, &free_data, &free_data}; - census_ht* ht = census_ht_create(&opt); +static void +test_value_and_key_deleter (void) +{ + census_ht_option opt = { CENSUS_HT_POINTER, 7, &hash64, + &cmp_str_keys, &free_data, &free_data + }; + census_ht *ht = census_ht_create (&opt); census_ht_key key; - char* val = NULL; - char* val2 = NULL; - key.ptr = gpr_malloc(100); - val = gpr_malloc(10); - strcpy(val, "value"); - strcpy(key.ptr, "some string as a key"); - GPR_ASSERT(ht != NULL); - GPR_ASSERT(census_ht_get_size(ht) == 0); - census_ht_insert(ht, key, val); - GPR_ASSERT(census_ht_get_size(ht) == 1); - val = census_ht_find(ht, key); - GPR_ASSERT(val != NULL); - GPR_ASSERT(strcmp(val, "value") == 0); + char *val = NULL; + char *val2 = NULL; + key.ptr = gpr_malloc (100); + val = gpr_malloc (10); + strcpy (val, "value"); + strcpy (key.ptr, "some string as a key"); + GPR_ASSERT (ht != NULL); + GPR_ASSERT (census_ht_get_size (ht) == 0); + census_ht_insert (ht, key, val); + GPR_ASSERT (census_ht_get_size (ht) == 1); + val = census_ht_find (ht, key); + GPR_ASSERT (val != NULL); + GPR_ASSERT (strcmp (val, "value") == 0); /* Insert same key different value, old value is overwritten. */ - val2 = gpr_malloc(10); - strcpy(val2, "v2"); - census_ht_insert(ht, key, val2); - GPR_ASSERT(census_ht_get_size(ht) == 1); - val2 = census_ht_find(ht, key); - GPR_ASSERT(val2 != NULL); - GPR_ASSERT(strcmp(val2, "v2") == 0); - census_ht_destroy(ht); + val2 = gpr_malloc (10); + strcpy (val2, "v2"); + census_ht_insert (ht, key, val2); + GPR_ASSERT (census_ht_get_size (ht) == 1); + val2 = census_ht_find (ht, key); + GPR_ASSERT (val2 != NULL); + GPR_ASSERT (strcmp (val2, "v2") == 0); + census_ht_destroy (ht); } /* Test simple insert and erase operations. */ -static void test_simple_add_and_erase(void) { - census_ht_option opt = {CENSUS_HT_UINT64, 7, NULL, NULL, NULL, NULL}; - census_ht* ht = census_ht_create(&opt); - GPR_ASSERT(ht != NULL); - GPR_ASSERT(census_ht_get_size(ht) == 0); +static void +test_simple_add_and_erase (void) +{ + census_ht_option opt = { CENSUS_HT_UINT64, 7, NULL, NULL, NULL, NULL }; + census_ht *ht = census_ht_create (&opt); + GPR_ASSERT (ht != NULL); + GPR_ASSERT (census_ht_get_size (ht) == 0); { census_ht_key key; int val = 3; key.val = 2; - census_ht_insert(ht, key, (void*)&val); - GPR_ASSERT(census_ht_get_size(ht) == 1); - census_ht_erase(ht, key); - GPR_ASSERT(census_ht_get_size(ht) == 0); + census_ht_insert (ht, key, (void *) &val); + GPR_ASSERT (census_ht_get_size (ht) == 1); + census_ht_erase (ht, key); + GPR_ASSERT (census_ht_get_size (ht) == 0); /* Erasing a key from an empty table should be noop. */ - census_ht_erase(ht, key); - GPR_ASSERT(census_ht_get_size(ht) == 0); + census_ht_erase (ht, key); + GPR_ASSERT (census_ht_get_size (ht) == 0); /* Erasing a non-existant key from a table should be noop. */ - census_ht_insert(ht, key, (void*)&val); + census_ht_insert (ht, key, (void *) &val); key.val = 3; - census_ht_insert(ht, key, (void*)&val); + census_ht_insert (ht, key, (void *) &val); key.val = 9; - census_ht_insert(ht, key, (void*)&val); - GPR_ASSERT(census_ht_get_size(ht) == 3); + census_ht_insert (ht, key, (void *) &val); + GPR_ASSERT (census_ht_get_size (ht) == 3); key.val = 1; - census_ht_erase(ht, key); + census_ht_erase (ht, key); /* size unchanged after deleting non-existant key. */ - GPR_ASSERT(census_ht_get_size(ht) == 3); + GPR_ASSERT (census_ht_get_size (ht) == 3); /* size decrease by 1 after deleting an existant key. */ key.val = 2; - census_ht_erase(ht, key); - GPR_ASSERT(census_ht_get_size(ht) == 2); + census_ht_erase (ht, key); + GPR_ASSERT (census_ht_get_size (ht) == 2); } - census_ht_destroy(ht); + census_ht_destroy (ht); } -static void test_insertion_and_deletion_with_high_collision_rate(void) { - census_ht_option opt = {CENSUS_HT_POINTER, 13, &force_collision, - &cmp_str_keys, NULL, NULL}; - census_ht* ht = census_ht_create(&opt); +static void +test_insertion_and_deletion_with_high_collision_rate (void) +{ + census_ht_option opt = { CENSUS_HT_POINTER, 13, &force_collision, + &cmp_str_keys, NULL, NULL + }; + census_ht *ht = census_ht_create (&opt); char key_str[1000][GPR_LTOA_MIN_BUFSIZE]; gpr_uint64 val = 0; unsigned i = 0; - for (i = 0; i < 1000; i++) { - census_ht_key key; - key.ptr = key_str[i]; - gpr_ltoa(i, key_str[i]); - census_ht_insert(ht, key, (void*)(&val)); - gpr_log(GPR_INFO, "%d\n", i); - GPR_ASSERT(census_ht_get_size(ht) == (i + 1)); - } - for (i = 0; i < 1000; i++) { - census_ht_key key; - key.ptr = key_str[i]; - census_ht_erase(ht, key); - GPR_ASSERT(census_ht_get_size(ht) == (999 - i)); - } - census_ht_destroy(ht); + for (i = 0; i < 1000; i++) + { + census_ht_key key; + key.ptr = key_str[i]; + gpr_ltoa (i, key_str[i]); + census_ht_insert (ht, key, (void *) (&val)); + gpr_log (GPR_INFO, "%d\n", i); + GPR_ASSERT (census_ht_get_size (ht) == (i + 1)); + } + for (i = 0; i < 1000; i++) + { + census_ht_key key; + key.ptr = key_str[i]; + census_ht_erase (ht, key); + GPR_ASSERT (census_ht_get_size (ht) == (999 - i)); + } + census_ht_destroy (ht); } -static void test_table_with_string_key(void) { - census_ht_option opt = {CENSUS_HT_POINTER, 7, &hash64, - &cmp_str_keys, NULL, NULL}; - census_ht* ht = census_ht_create(&opt); - const char* keys[] = { - "k1", "a", "000", "apple", "banana_a_long_long_long_banana", - "%$", "111", "foo", "b"}; - const int vals[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; +static void +test_table_with_string_key (void) +{ + census_ht_option opt = { CENSUS_HT_POINTER, 7, &hash64, + &cmp_str_keys, NULL, NULL + }; + census_ht *ht = census_ht_create (&opt); + const char *keys[] = { + "k1", "a", "000", "apple", "banana_a_long_long_long_banana", + "%$", "111", "foo", "b" + }; + const int vals[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; int i = 0; - GPR_ASSERT(ht != NULL); - GPR_ASSERT(census_ht_get_size(ht) == 0); - for (i = 0; i < 9; i++) { - census_ht_key key; - key.ptr = (void*)(keys[i]); - census_ht_insert(ht, key, (void*)(vals + i)); - } - GPR_ASSERT(census_ht_get_size(ht) == 9); - for (i = 0; i < 9; i++) { - census_ht_key key; - int* val_ptr; - key.ptr = (void*)(keys[i]); - val_ptr = census_ht_find(ht, key); - GPR_ASSERT(*val_ptr == vals[i]); - } + GPR_ASSERT (ht != NULL); + GPR_ASSERT (census_ht_get_size (ht) == 0); + for (i = 0; i < 9; i++) + { + census_ht_key key; + key.ptr = (void *) (keys[i]); + census_ht_insert (ht, key, (void *) (vals + i)); + } + GPR_ASSERT (census_ht_get_size (ht) == 9); + for (i = 0; i < 9; i++) + { + census_ht_key key; + int *val_ptr; + key.ptr = (void *) (keys[i]); + val_ptr = census_ht_find (ht, key); + GPR_ASSERT (*val_ptr == vals[i]); + } { /* inserts duplicate keys */ census_ht_key key; - int* val_ptr = NULL; - key.ptr = (void*)(keys[2]); - census_ht_insert(ht, key, (void*)(vals + 8)); + int *val_ptr = NULL; + key.ptr = (void *) (keys[2]); + census_ht_insert (ht, key, (void *) (vals + 8)); /* expect value to be over written by new insertion */ - GPR_ASSERT(census_ht_get_size(ht) == 9); - val_ptr = census_ht_find(ht, key); - GPR_ASSERT(*val_ptr == vals[8]); - } - for (i = 0; i < 9; i++) { - census_ht_key key; - int* val_ptr; - gpr_uint32 expected_tbl_sz = 9 - i; - GPR_ASSERT(census_ht_get_size(ht) == expected_tbl_sz); - key.ptr = (void*)(keys[i]); - val_ptr = census_ht_find(ht, key); - GPR_ASSERT(val_ptr != NULL); - census_ht_erase(ht, key); - GPR_ASSERT(census_ht_get_size(ht) == expected_tbl_sz - 1); - val_ptr = census_ht_find(ht, key); - GPR_ASSERT(val_ptr == NULL); + GPR_ASSERT (census_ht_get_size (ht) == 9); + val_ptr = census_ht_find (ht, key); + GPR_ASSERT (*val_ptr == vals[8]); } - census_ht_destroy(ht); + for (i = 0; i < 9; i++) + { + census_ht_key key; + int *val_ptr; + gpr_uint32 expected_tbl_sz = 9 - i; + GPR_ASSERT (census_ht_get_size (ht) == expected_tbl_sz); + key.ptr = (void *) (keys[i]); + val_ptr = census_ht_find (ht, key); + GPR_ASSERT (val_ptr != NULL); + census_ht_erase (ht, key); + GPR_ASSERT (census_ht_get_size (ht) == expected_tbl_sz - 1); + val_ptr = census_ht_find (ht, key); + GPR_ASSERT (val_ptr == NULL); + } + census_ht_destroy (ht); } -static void test_insertion_with_same_key(void) { - census_ht_option opt = {CENSUS_HT_UINT64, 11, NULL, NULL, NULL, NULL}; - census_ht* ht = census_ht_create(&opt); +static void +test_insertion_with_same_key (void) +{ + census_ht_option opt = { CENSUS_HT_UINT64, 11, NULL, NULL, NULL, NULL }; + census_ht *ht = census_ht_create (&opt); census_ht_key key; - const char vals[] = {'a', 'b', 'c'}; - char* val_ptr; + const char vals[] = { 'a', 'b', 'c' }; + char *val_ptr; key.val = 3; - census_ht_insert(ht, key, (void*)&(vals[0])); - GPR_ASSERT(census_ht_get_size(ht) == 1); - val_ptr = (char*)census_ht_find(ht, key); - GPR_ASSERT(val_ptr != NULL); - GPR_ASSERT(*val_ptr == 'a'); + census_ht_insert (ht, key, (void *) &(vals[0])); + GPR_ASSERT (census_ht_get_size (ht) == 1); + val_ptr = (char *) census_ht_find (ht, key); + GPR_ASSERT (val_ptr != NULL); + GPR_ASSERT (*val_ptr == 'a'); key.val = 4; - val_ptr = (char*)census_ht_find(ht, key); - GPR_ASSERT(val_ptr == NULL); + val_ptr = (char *) census_ht_find (ht, key); + GPR_ASSERT (val_ptr == NULL); key.val = 3; - census_ht_insert(ht, key, (void*)&(vals[1])); - GPR_ASSERT(census_ht_get_size(ht) == 1); - val_ptr = (char*)census_ht_find(ht, key); - GPR_ASSERT(val_ptr != NULL); - GPR_ASSERT(*val_ptr == 'b'); - census_ht_insert(ht, key, (void*)&(vals[2])); - GPR_ASSERT(census_ht_get_size(ht) == 1); - val_ptr = (char*)census_ht_find(ht, key); - GPR_ASSERT(val_ptr != NULL); - GPR_ASSERT(*val_ptr == 'c'); - census_ht_destroy(ht); + census_ht_insert (ht, key, (void *) &(vals[1])); + GPR_ASSERT (census_ht_get_size (ht) == 1); + val_ptr = (char *) census_ht_find (ht, key); + GPR_ASSERT (val_ptr != NULL); + GPR_ASSERT (*val_ptr == 'b'); + census_ht_insert (ht, key, (void *) &(vals[2])); + GPR_ASSERT (census_ht_get_size (ht) == 1); + val_ptr = (char *) census_ht_find (ht, key); + GPR_ASSERT (val_ptr != NULL); + GPR_ASSERT (*val_ptr == 'c'); + census_ht_destroy (ht); } -int main(int argc, char** argv) { - grpc_test_init(argc, argv); - test_create_table(); - test_simple_add_and_erase(); - test_table_with_int_key(); - test_table_with_string_key(); - test_value_and_key_deleter(); - test_insertion_with_same_key(); - test_insertion_and_deletion_with_high_collision_rate(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_create_table (); + test_simple_add_and_erase (); + test_table_with_int_key (); + test_table_with_string_key (); + test_value_and_key_deleter (); + test_insertion_with_same_key (); + test_insertion_and_deletion_with_high_collision_rate (); return 0; } diff --git a/test/core/statistics/multiple_writers_circular_buffer_test.c b/test/core/statistics/multiple_writers_circular_buffer_test.c index 56ada893efd..c42c8633da6 100644 --- a/test/core/statistics/multiple_writers_circular_buffer_test.c +++ b/test/core/statistics/multiple_writers_circular_buffer_test.c @@ -38,9 +38,11 @@ #include #include "test/core/util/test_config.h" -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - srand(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); - test_multiple_writers_circular_log(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + srand (gpr_now (GPR_CLOCK_REALTIME).tv_nsec); + test_multiple_writers_circular_log (); return 0; } diff --git a/test/core/statistics/multiple_writers_test.c b/test/core/statistics/multiple_writers_test.c index e524927da62..aed57a972b2 100644 --- a/test/core/statistics/multiple_writers_test.c +++ b/test/core/statistics/multiple_writers_test.c @@ -38,9 +38,11 @@ #include #include "test/core/util/test_config.h" -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - srand(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); - test_multiple_writers(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + srand (gpr_now (GPR_CLOCK_REALTIME).tv_nsec); + test_multiple_writers (); return 0; } diff --git a/test/core/statistics/performance_test.c b/test/core/statistics/performance_test.c index 3f0e0800933..44f4a30cfba 100644 --- a/test/core/statistics/performance_test.c +++ b/test/core/statistics/performance_test.c @@ -38,9 +38,11 @@ #include #include "test/core/util/test_config.h" -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - srand(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); - test_performance(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + srand (gpr_now (GPR_CLOCK_REALTIME).tv_nsec); + test_performance (); return 0; } diff --git a/test/core/statistics/quick_test.c b/test/core/statistics/quick_test.c index c72ae77b98e..91b484fd312 100644 --- a/test/core/statistics/quick_test.c +++ b/test/core/statistics/quick_test.c @@ -38,17 +38,19 @@ #include #include "test/core/util/test_config.h" -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - srand(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); - test_invalid_record_size(); - test_end_write_with_different_size(); - test_read_pending_record(); - test_read_beyond_pending_record(); - test_detached_while_reading(); - test_fill_log_no_fragmentation(); - test_fill_circular_log_no_fragmentation(); - test_fill_log_with_straddling_records(); - test_fill_circular_log_with_straddling_records(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + srand (gpr_now (GPR_CLOCK_REALTIME).tv_nsec); + test_invalid_record_size (); + test_end_write_with_different_size (); + test_read_pending_record (); + test_read_beyond_pending_record (); + test_detached_while_reading (); + test_fill_log_no_fragmentation (); + test_fill_circular_log_no_fragmentation (); + test_fill_log_with_straddling_records (); + test_fill_circular_log_with_straddling_records (); return 0; } diff --git a/test/core/statistics/rpc_stats_test.c b/test/core/statistics/rpc_stats_test.c index df076b9c1e4..134c478d818 100644 --- a/test/core/statistics/rpc_stats_test.c +++ b/test/core/statistics/rpc_stats_test.c @@ -45,153 +45,153 @@ #include "test/core/util/test_config.h" /* Ensure all possible state transitions are called without causing problem */ -static void test_init_shutdown(void) { - census_stats_store_init(); - census_stats_store_init(); - census_stats_store_shutdown(); - census_stats_store_shutdown(); - census_stats_store_init(); +static void +test_init_shutdown (void) +{ + census_stats_store_init (); + census_stats_store_init (); + census_stats_store_shutdown (); + census_stats_store_shutdown (); + census_stats_store_init (); } -static void test_create_and_destroy(void) { - census_rpc_stats* stats = NULL; - census_aggregated_rpc_stats agg_stats = {0, NULL}; +static void +test_create_and_destroy (void) +{ + census_rpc_stats *stats = NULL; + census_aggregated_rpc_stats agg_stats = { 0, NULL }; - stats = census_rpc_stats_create_empty(); - GPR_ASSERT(stats != NULL); - GPR_ASSERT(stats->cnt == 0 && stats->rpc_error_cnt == 0 && - stats->app_error_cnt == 0 && stats->elapsed_time_ms == 0.0 && - stats->api_request_bytes == 0 && stats->wire_request_bytes == 0 && - stats->api_response_bytes == 0 && stats->wire_response_bytes == 0); - gpr_free(stats); + stats = census_rpc_stats_create_empty (); + GPR_ASSERT (stats != NULL); + GPR_ASSERT (stats->cnt == 0 && stats->rpc_error_cnt == 0 && stats->app_error_cnt == 0 && stats->elapsed_time_ms == 0.0 && stats->api_request_bytes == 0 && stats->wire_request_bytes == 0 && stats->api_response_bytes == 0 && stats->wire_response_bytes == 0); + gpr_free (stats); - census_aggregated_rpc_stats_set_empty(&agg_stats); - GPR_ASSERT(agg_stats.num_entries == 0); - GPR_ASSERT(agg_stats.stats == NULL); + census_aggregated_rpc_stats_set_empty (&agg_stats); + GPR_ASSERT (agg_stats.num_entries == 0); + GPR_ASSERT (agg_stats.stats == NULL); agg_stats.num_entries = 1; - agg_stats.stats = (census_per_method_rpc_stats*)gpr_malloc( - sizeof(census_per_method_rpc_stats)); - agg_stats.stats[0].method = gpr_strdup("foo"); - census_aggregated_rpc_stats_set_empty(&agg_stats); - GPR_ASSERT(agg_stats.num_entries == 0); - GPR_ASSERT(agg_stats.stats == NULL); + agg_stats.stats = (census_per_method_rpc_stats *) gpr_malloc (sizeof (census_per_method_rpc_stats)); + agg_stats.stats[0].method = gpr_strdup ("foo"); + census_aggregated_rpc_stats_set_empty (&agg_stats); + GPR_ASSERT (agg_stats.num_entries == 0); + GPR_ASSERT (agg_stats.stats == NULL); } #define ASSERT_NEAR(a, b) \ GPR_ASSERT((a - b) * (a - b) < 1e-24 * (a + b) * (a + b)) -static void test_record_and_get_stats(void) { - census_rpc_stats stats = {1, 2, 3, 4, 5.1, 6.2, 7.3, 8.4}; +static void +test_record_and_get_stats (void) +{ + census_rpc_stats stats = { 1, 2, 3, 4, 5.1, 6.2, 7.3, 8.4 }; census_op_id id; - census_aggregated_rpc_stats agg_stats = {0, NULL}; + census_aggregated_rpc_stats agg_stats = { 0, NULL }; /* Record client stats twice with the same op_id. */ - census_init(); - id = census_tracing_start_op(); - census_add_method_tag(id, "m1"); - census_record_rpc_client_stats(id, &stats); - census_record_rpc_client_stats(id, &stats); - census_tracing_end_op(id); + census_init (); + id = census_tracing_start_op (); + census_add_method_tag (id, "m1"); + census_record_rpc_client_stats (id, &stats); + census_record_rpc_client_stats (id, &stats); + census_tracing_end_op (id); /* Server stats expect to be empty */ - census_get_server_stats(&agg_stats); - GPR_ASSERT(agg_stats.num_entries == 0); - GPR_ASSERT(agg_stats.stats == NULL); + census_get_server_stats (&agg_stats); + GPR_ASSERT (agg_stats.num_entries == 0); + GPR_ASSERT (agg_stats.stats == NULL); /* Client stats expect to have one entry */ - census_get_client_stats(&agg_stats); - GPR_ASSERT(agg_stats.num_entries == 1); - GPR_ASSERT(agg_stats.stats != NULL); - GPR_ASSERT(strcmp(agg_stats.stats[0].method, "m1") == 0); - GPR_ASSERT(agg_stats.stats[0].minute_stats.cnt == 2 && - agg_stats.stats[0].hour_stats.cnt == 2 && - agg_stats.stats[0].total_stats.cnt == 2); - ASSERT_NEAR(agg_stats.stats[0].minute_stats.wire_response_bytes, 16.8); - ASSERT_NEAR(agg_stats.stats[0].hour_stats.wire_response_bytes, 16.8); - ASSERT_NEAR(agg_stats.stats[0].total_stats.wire_response_bytes, 16.8); + census_get_client_stats (&agg_stats); + GPR_ASSERT (agg_stats.num_entries == 1); + GPR_ASSERT (agg_stats.stats != NULL); + GPR_ASSERT (strcmp (agg_stats.stats[0].method, "m1") == 0); + GPR_ASSERT (agg_stats.stats[0].minute_stats.cnt == 2 && agg_stats.stats[0].hour_stats.cnt == 2 && agg_stats.stats[0].total_stats.cnt == 2); + ASSERT_NEAR (agg_stats.stats[0].minute_stats.wire_response_bytes, 16.8); + ASSERT_NEAR (agg_stats.stats[0].hour_stats.wire_response_bytes, 16.8); + ASSERT_NEAR (agg_stats.stats[0].total_stats.wire_response_bytes, 16.8); /* Get stats again, results should be the same. */ - census_get_client_stats(&agg_stats); - GPR_ASSERT(agg_stats.num_entries == 1); - census_aggregated_rpc_stats_set_empty(&agg_stats); - census_shutdown(); + census_get_client_stats (&agg_stats); + GPR_ASSERT (agg_stats.num_entries == 1); + census_aggregated_rpc_stats_set_empty (&agg_stats); + census_shutdown (); - /* Record both server (once) and client (twice) stats with different op_ids.*/ - census_init(); - id = census_tracing_start_op(); - census_add_method_tag(id, "m2"); - census_record_rpc_client_stats(id, &stats); - census_tracing_end_op(id); - id = census_tracing_start_op(); - census_add_method_tag(id, "m3"); - census_record_rpc_server_stats(id, &stats); - census_tracing_end_op(id); - id = census_tracing_start_op(); - census_add_method_tag(id, "m4"); - census_record_rpc_client_stats(id, &stats); - census_tracing_end_op(id); + /* Record both server (once) and client (twice) stats with different op_ids. */ + census_init (); + id = census_tracing_start_op (); + census_add_method_tag (id, "m2"); + census_record_rpc_client_stats (id, &stats); + census_tracing_end_op (id); + id = census_tracing_start_op (); + census_add_method_tag (id, "m3"); + census_record_rpc_server_stats (id, &stats); + census_tracing_end_op (id); + id = census_tracing_start_op (); + census_add_method_tag (id, "m4"); + census_record_rpc_client_stats (id, &stats); + census_tracing_end_op (id); /* Check server stats */ - census_get_server_stats(&agg_stats); - GPR_ASSERT(agg_stats.num_entries == 1); - GPR_ASSERT(strcmp(agg_stats.stats[0].method, "m3") == 0); - GPR_ASSERT(agg_stats.stats[0].minute_stats.app_error_cnt == 3 && - agg_stats.stats[0].hour_stats.app_error_cnt == 3 && - agg_stats.stats[0].total_stats.app_error_cnt == 3); - census_aggregated_rpc_stats_set_empty(&agg_stats); + census_get_server_stats (&agg_stats); + GPR_ASSERT (agg_stats.num_entries == 1); + GPR_ASSERT (strcmp (agg_stats.stats[0].method, "m3") == 0); + GPR_ASSERT (agg_stats.stats[0].minute_stats.app_error_cnt == 3 && agg_stats.stats[0].hour_stats.app_error_cnt == 3 && agg_stats.stats[0].total_stats.app_error_cnt == 3); + census_aggregated_rpc_stats_set_empty (&agg_stats); /* Check client stats */ - census_get_client_stats(&agg_stats); - GPR_ASSERT(agg_stats.num_entries == 2); - GPR_ASSERT(agg_stats.stats != NULL); - GPR_ASSERT((strcmp(agg_stats.stats[0].method, "m2") == 0 && - strcmp(agg_stats.stats[1].method, "m4") == 0) || - (strcmp(agg_stats.stats[0].method, "m4") == 0 && - strcmp(agg_stats.stats[1].method, "m2") == 0)); - GPR_ASSERT(agg_stats.stats[0].minute_stats.cnt == 1 && - agg_stats.stats[1].minute_stats.cnt == 1); - census_aggregated_rpc_stats_set_empty(&agg_stats); - census_shutdown(); + census_get_client_stats (&agg_stats); + GPR_ASSERT (agg_stats.num_entries == 2); + GPR_ASSERT (agg_stats.stats != NULL); + GPR_ASSERT ((strcmp (agg_stats.stats[0].method, "m2") == 0 && strcmp (agg_stats.stats[1].method, "m4") == 0) || (strcmp (agg_stats.stats[0].method, "m4") == 0 && strcmp (agg_stats.stats[1].method, "m2") == 0)); + GPR_ASSERT (agg_stats.stats[0].minute_stats.cnt == 1 && agg_stats.stats[1].minute_stats.cnt == 1); + census_aggregated_rpc_stats_set_empty (&agg_stats); + census_shutdown (); } -static void test_record_stats_on_unknown_op_id(void) { - census_op_id unknown_id = {0xDEAD, 0xBEEF}; - census_rpc_stats stats = {1, 2, 3, 4, 5.1, 6.2, 7.3, 8.4}; - census_aggregated_rpc_stats agg_stats = {0, NULL}; +static void +test_record_stats_on_unknown_op_id (void) +{ + census_op_id unknown_id = { 0xDEAD, 0xBEEF }; + census_rpc_stats stats = { 1, 2, 3, 4, 5.1, 6.2, 7.3, 8.4 }; + census_aggregated_rpc_stats agg_stats = { 0, NULL }; - census_init(); + census_init (); /* Tests that recording stats against unknown id is noop. */ - census_record_rpc_client_stats(unknown_id, &stats); - census_record_rpc_server_stats(unknown_id, &stats); - census_get_server_stats(&agg_stats); - GPR_ASSERT(agg_stats.num_entries == 0); - GPR_ASSERT(agg_stats.stats == NULL); - census_get_client_stats(&agg_stats); - GPR_ASSERT(agg_stats.num_entries == 0); - GPR_ASSERT(agg_stats.stats == NULL); - census_aggregated_rpc_stats_set_empty(&agg_stats); - census_shutdown(); + census_record_rpc_client_stats (unknown_id, &stats); + census_record_rpc_server_stats (unknown_id, &stats); + census_get_server_stats (&agg_stats); + GPR_ASSERT (agg_stats.num_entries == 0); + GPR_ASSERT (agg_stats.stats == NULL); + census_get_client_stats (&agg_stats); + GPR_ASSERT (agg_stats.num_entries == 0); + GPR_ASSERT (agg_stats.stats == NULL); + census_aggregated_rpc_stats_set_empty (&agg_stats); + census_shutdown (); } /* Test that record stats is noop when trace store is uninitialized. */ -static void test_record_stats_with_trace_store_uninitialized(void) { - census_rpc_stats stats = {1, 2, 3, 4, 5.1, 6.2, 7.3, 8.4}; - census_op_id id = {0, 0}; - census_aggregated_rpc_stats agg_stats = {0, NULL}; +static void +test_record_stats_with_trace_store_uninitialized (void) +{ + census_rpc_stats stats = { 1, 2, 3, 4, 5.1, 6.2, 7.3, 8.4 }; + census_op_id id = { 0, 0 }; + census_aggregated_rpc_stats agg_stats = { 0, NULL }; - census_init(); - id = census_tracing_start_op(); - census_add_method_tag(id, "m"); - census_tracing_end_op(id); + census_init (); + id = census_tracing_start_op (); + census_add_method_tag (id, "m"); + census_tracing_end_op (id); /* shuts down trace store only. */ - census_tracing_shutdown(); - census_record_rpc_client_stats(id, &stats); - census_get_client_stats(&agg_stats); - GPR_ASSERT(agg_stats.num_entries == 0); - census_stats_store_shutdown(); + census_tracing_shutdown (); + census_record_rpc_client_stats (id, &stats); + census_get_client_stats (&agg_stats); + GPR_ASSERT (agg_stats.num_entries == 0); + census_stats_store_shutdown (); } -int main(int argc, char** argv) { - grpc_test_init(argc, argv); - test_init_shutdown(); - test_create_and_destroy(); - test_record_and_get_stats(); - test_record_stats_on_unknown_op_id(); - test_record_stats_with_trace_store_uninitialized(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_init_shutdown (); + test_create_and_destroy (); + test_record_and_get_stats (); + test_record_stats_on_unknown_op_id (); + test_record_stats_with_trace_store_uninitialized (); return 0; } diff --git a/test/core/statistics/small_log_test.c b/test/core/statistics/small_log_test.c index b26b95f639c..4f1f80f2294 100644 --- a/test/core/statistics/small_log_test.c +++ b/test/core/statistics/small_log_test.c @@ -38,9 +38,11 @@ #include #include "test/core/util/test_config.h" -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - srand(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); - test_small_log(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + srand (gpr_now (GPR_CLOCK_REALTIME).tv_nsec); + test_small_log (); return 0; } diff --git a/test/core/statistics/trace_test.c b/test/core/statistics/trace_test.c index 187884d90fd..ac2e0d824d0 100644 --- a/test/core/statistics/trace_test.c +++ b/test/core/statistics/trace_test.c @@ -47,209 +47,237 @@ #include "test/core/util/test_config.h" /* Ensure all possible state transitions are called without causing problem */ -static void test_init_shutdown(void) { - census_tracing_init(); - census_tracing_init(); - census_tracing_shutdown(); - census_tracing_shutdown(); - census_tracing_init(); +static void +test_init_shutdown (void) +{ + census_tracing_init (); + census_tracing_init (); + census_tracing_shutdown (); + census_tracing_shutdown (); + census_tracing_init (); } -static void test_start_op_generates_locally_unique_ids(void) { +static void +test_start_op_generates_locally_unique_ids (void) +{ /* Check that ids generated within window size of 1000 are unique. TODO(hongyu): Replace O(n^2) duplicate detection algorithm with O(nlogn) algorithm. Enhance the test to larger window size (>10^6) */ #define WINDOW_SIZE 1000 census_op_id ids[WINDOW_SIZE]; int i; - census_init(); - for (i = 0; i < WINDOW_SIZE; i++) { - ids[i] = census_tracing_start_op(); - census_tracing_end_op(ids[i]); - } - for (i = 0; i < WINDOW_SIZE - 1; i++) { - int j; - for (j = i + 1; j < WINDOW_SIZE; j++) { - GPR_ASSERT(ids[i].upper != ids[j].upper || ids[i].lower != ids[j].lower); + census_init (); + for (i = 0; i < WINDOW_SIZE; i++) + { + ids[i] = census_tracing_start_op (); + census_tracing_end_op (ids[i]); + } + for (i = 0; i < WINDOW_SIZE - 1; i++) + { + int j; + for (j = i + 1; j < WINDOW_SIZE; j++) + { + GPR_ASSERT (ids[i].upper != ids[j].upper || ids[i].lower != ids[j].lower); + } } - } #undef WINDOW_SIZE - census_shutdown(); + census_shutdown (); } -static void test_get_trace_method_name(void) { +static void +test_get_trace_method_name (void) +{ census_op_id id; const char write_name[] = "service/method"; - census_tracing_init(); - id = census_tracing_start_op(); - census_add_method_tag(id, write_name); - census_internal_lock_trace_store(); + census_tracing_init (); + id = census_tracing_start_op (); + census_add_method_tag (id, write_name); + census_internal_lock_trace_store (); { - const char* read_name = - census_get_trace_method_name(census_get_trace_obj_locked(id)); - GPR_ASSERT(strcmp(read_name, write_name) == 0); + const char *read_name = census_get_trace_method_name (census_get_trace_obj_locked (id)); + GPR_ASSERT (strcmp (read_name, write_name) == 0); } - census_internal_unlock_trace_store(); - census_tracing_shutdown(); + census_internal_unlock_trace_store (); + census_tracing_shutdown (); } -typedef struct thd_arg { +typedef struct thd_arg +{ int num_done; gpr_cv done; gpr_mu mu; } thd_arg; -static void mimic_trace_op_sequences(void* arg) { +static void +mimic_trace_op_sequences (void *arg) +{ census_op_id id; - const char* method_name = "service_foo/method_bar"; + const char *method_name = "service_foo/method_bar"; int i = 0; const int num_iter = 200; - thd_arg* args = (thd_arg*)arg; - GPR_ASSERT(args != NULL); - gpr_log(GPR_INFO, "Start trace op sequence thread."); - for (i = 0; i < num_iter; i++) { - id = census_tracing_start_op(); - census_add_method_tag(id, method_name); - /* pretend doing 1us work. */ - gpr_sleep_until(GRPC_TIMEOUT_MICROS_TO_DEADLINE(1)); - census_tracing_end_op(id); - } - gpr_log(GPR_INFO, "End trace op sequence thread."); - gpr_mu_lock(&args->mu); + thd_arg *args = (thd_arg *) arg; + GPR_ASSERT (args != NULL); + gpr_log (GPR_INFO, "Start trace op sequence thread."); + for (i = 0; i < num_iter; i++) + { + id = census_tracing_start_op (); + census_add_method_tag (id, method_name); + /* pretend doing 1us work. */ + gpr_sleep_until (GRPC_TIMEOUT_MICROS_TO_DEADLINE (1)); + census_tracing_end_op (id); + } + gpr_log (GPR_INFO, "End trace op sequence thread."); + gpr_mu_lock (&args->mu); args->num_done += 1; - gpr_cv_broadcast(&args->done); - gpr_mu_unlock(&args->mu); + gpr_cv_broadcast (&args->done); + gpr_mu_unlock (&args->mu); } -static void test_concurrency(void) { +static void +test_concurrency (void) +{ #define NUM_THREADS 1000 gpr_thd_id tid[NUM_THREADS]; int i = 0; thd_arg arg; arg.num_done = 0; - gpr_mu_init(&arg.mu); - gpr_cv_init(&arg.done); - census_tracing_init(); - for (i = 0; i < NUM_THREADS; ++i) { - gpr_thd_new(tid + i, mimic_trace_op_sequences, &arg, NULL); - } - gpr_mu_lock(&arg.mu); - while (arg.num_done < NUM_THREADS) { - gpr_log(GPR_INFO, "num done %d", arg.num_done); - gpr_cv_wait(&arg.done, &arg.mu, gpr_inf_future(GPR_CLOCK_REALTIME)); - } - gpr_mu_unlock(&arg.mu); - census_tracing_shutdown(); + gpr_mu_init (&arg.mu); + gpr_cv_init (&arg.done); + census_tracing_init (); + for (i = 0; i < NUM_THREADS; ++i) + { + gpr_thd_new (tid + i, mimic_trace_op_sequences, &arg, NULL); + } + gpr_mu_lock (&arg.mu); + while (arg.num_done < NUM_THREADS) + { + gpr_log (GPR_INFO, "num done %d", arg.num_done); + gpr_cv_wait (&arg.done, &arg.mu, gpr_inf_future (GPR_CLOCK_REALTIME)); + } + gpr_mu_unlock (&arg.mu); + census_tracing_shutdown (); #undef NUM_THREADS } -static void test_add_method_tag_to_unknown_op_id(void) { - census_op_id unknown_id = {0xDEAD, 0xBEEF}; +static void +test_add_method_tag_to_unknown_op_id (void) +{ + census_op_id unknown_id = { 0xDEAD, 0xBEEF }; int ret = 0; - census_tracing_init(); - ret = census_add_method_tag(unknown_id, "foo"); - GPR_ASSERT(ret != 0); - census_tracing_shutdown(); + census_tracing_init (); + ret = census_add_method_tag (unknown_id, "foo"); + GPR_ASSERT (ret != 0); + census_tracing_shutdown (); } -static void test_trace_print(void) { +static void +test_trace_print (void) +{ census_op_id id; int i; - const char* annotation_txt[4] = {"abc", "", "$%^ *()_"}; + const char *annotation_txt[4] = { "abc", "", "$%^ *()_" }; char long_txt[CENSUS_MAX_ANNOTATION_LENGTH + 10]; - memset(long_txt, 'a', GPR_ARRAY_SIZE(long_txt)); + memset (long_txt, 'a', GPR_ARRAY_SIZE (long_txt)); long_txt[CENSUS_MAX_ANNOTATION_LENGTH + 9] = '\0'; annotation_txt[3] = long_txt; - census_tracing_init(); - id = census_tracing_start_op(); + census_tracing_init (); + id = census_tracing_start_op (); /* Adds large number of annotations to each trace */ - for (i = 0; i < 1000; i++) { - census_tracing_print(id, - annotation_txt[i % GPR_ARRAY_SIZE(annotation_txt)]); - } - census_tracing_end_op(id); + for (i = 0; i < 1000; i++) + { + census_tracing_print (id, annotation_txt[i % GPR_ARRAY_SIZE (annotation_txt)]); + } + census_tracing_end_op (id); - census_tracing_shutdown(); + census_tracing_shutdown (); } /* Returns 1 if two ids are equal, otherwise returns 0. */ -static int ids_equal(census_op_id id1, census_op_id id2) { +static int +ids_equal (census_op_id id1, census_op_id id2) +{ return (id1.upper == id2.upper) && (id1.lower == id2.lower); } -static void test_get_active_ops(void) { +static void +test_get_active_ops (void) +{ census_op_id id_1, id_2, id_3; - census_trace_obj** active_ops; - const char* annotation_txt[] = {"annotation 1", "a2"}; + census_trace_obj **active_ops; + const char *annotation_txt[] = { "annotation 1", "a2" }; int i = 0; int n = 0; - gpr_log(GPR_INFO, "test_get_active_ops"); - census_tracing_init(); + gpr_log (GPR_INFO, "test_get_active_ops"); + census_tracing_init (); /* No active ops before calling start_op(). */ - active_ops = census_get_active_ops(&n); - GPR_ASSERT(active_ops == NULL); - GPR_ASSERT(n == 0); + active_ops = census_get_active_ops (&n); + GPR_ASSERT (active_ops == NULL); + GPR_ASSERT (n == 0); /* Starts one op */ - id_1 = census_tracing_start_op(); - census_add_method_tag(id_1, "foo_1"); - active_ops = census_get_active_ops(&n); - GPR_ASSERT(active_ops != NULL); - GPR_ASSERT(n == 1); - GPR_ASSERT(ids_equal(active_ops[0]->id, id_1)); - census_trace_obj_destroy(active_ops[0]); - gpr_free(active_ops); + id_1 = census_tracing_start_op (); + census_add_method_tag (id_1, "foo_1"); + active_ops = census_get_active_ops (&n); + GPR_ASSERT (active_ops != NULL); + GPR_ASSERT (n == 1); + GPR_ASSERT (ids_equal (active_ops[0]->id, id_1)); + census_trace_obj_destroy (active_ops[0]); + gpr_free (active_ops); active_ops = NULL; /* Start the second and the third ops */ - id_2 = census_tracing_start_op(); - census_add_method_tag(id_2, "foo_2"); - id_3 = census_tracing_start_op(); - census_add_method_tag(id_3, "foo_3"); - - active_ops = census_get_active_ops(&n); - GPR_ASSERT(n == 3); - for (i = 0; i < 3; i++) { - census_trace_obj_destroy(active_ops[i]); - } - gpr_free(active_ops); + id_2 = census_tracing_start_op (); + census_add_method_tag (id_2, "foo_2"); + id_3 = census_tracing_start_op (); + census_add_method_tag (id_3, "foo_3"); + + active_ops = census_get_active_ops (&n); + GPR_ASSERT (n == 3); + for (i = 0; i < 3; i++) + { + census_trace_obj_destroy (active_ops[i]); + } + gpr_free (active_ops); active_ops = NULL; - /* End the second op and add annotations to the third ops*/ - census_tracing_end_op(id_2); - census_tracing_print(id_3, annotation_txt[0]); - census_tracing_print(id_3, annotation_txt[1]); + /* End the second op and add annotations to the third ops */ + census_tracing_end_op (id_2); + census_tracing_print (id_3, annotation_txt[0]); + census_tracing_print (id_3, annotation_txt[1]); - active_ops = census_get_active_ops(&n); - GPR_ASSERT(active_ops != NULL); - GPR_ASSERT(n == 2); - for (i = 0; i < 2; i++) { - census_trace_obj_destroy(active_ops[i]); - } - gpr_free(active_ops); + active_ops = census_get_active_ops (&n); + GPR_ASSERT (active_ops != NULL); + GPR_ASSERT (n == 2); + for (i = 0; i < 2; i++) + { + census_trace_obj_destroy (active_ops[i]); + } + gpr_free (active_ops); active_ops = NULL; /* End all ops. */ - census_tracing_end_op(id_1); - census_tracing_end_op(id_3); - active_ops = census_get_active_ops(&n); - GPR_ASSERT(active_ops == NULL); - GPR_ASSERT(n == 0); + census_tracing_end_op (id_1); + census_tracing_end_op (id_3); + active_ops = census_get_active_ops (&n); + GPR_ASSERT (active_ops == NULL); + GPR_ASSERT (n == 0); - census_tracing_shutdown(); + census_tracing_shutdown (); } -int main(int argc, char** argv) { - grpc_test_init(argc, argv); - test_init_shutdown(); - test_start_op_generates_locally_unique_ids(); - test_get_trace_method_name(); - test_concurrency(); - test_add_method_tag_to_unknown_op_id(); - test_trace_print(); - test_get_active_ops(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_init_shutdown (); + test_start_op_generates_locally_unique_ids (); + test_get_trace_method_name (); + test_concurrency (); + test_add_method_tag_to_unknown_op_id (); + test_trace_print (); + test_get_active_ops (); return 0; } diff --git a/test/core/statistics/window_stats_test.c b/test/core/statistics/window_stats_test.c index 9e637ccce9b..54999d02be3 100644 --- a/test/core/statistics/window_stats_test.c +++ b/test/core/statistics/window_stats_test.c @@ -37,281 +37,276 @@ #include #include "test/core/util/test_config.h" -typedef struct test_stat { +typedef struct test_stat +{ double value1; int value2; } test_stat; -void add_test_stat(void* base, const void* addme) { - test_stat* b = (test_stat*)base; - const test_stat* a = (const test_stat*)addme; +void +add_test_stat (void *base, const void *addme) +{ + test_stat *b = (test_stat *) base; + const test_stat *a = (const test_stat *) addme; b->value1 += a->value1; b->value2 += a->value2; } -void add_proportion_test_stat(double p, void* base, const void* addme) { - test_stat* b = (test_stat*)base; - const test_stat* a = (const test_stat*)addme; +void +add_proportion_test_stat (double p, void *base, const void *addme) +{ + test_stat *b = (test_stat *) base; + const test_stat *a = (const test_stat *) addme; b->value1 += p * a->value1; - b->value2 += p * a->value2 + 0.5; /* +0.5 is poor mans (no c99) round() */ + b->value2 += p * a->value2 + 0.5; /* +0.5 is poor mans (no c99) round() */ } const struct census_window_stats_stat_info kMyStatInfo = { - sizeof(test_stat), NULL, add_test_stat, add_proportion_test_stat}; + sizeof (test_stat), NULL, add_test_stat, add_proportion_test_stat +}; -const gpr_timespec kMilliSecInterval = {0, 1000000}; -const gpr_timespec kSecInterval = {1, 0}; -const gpr_timespec kMinInterval = {60, 0}; -const gpr_timespec kHourInterval = {3600, 0}; -const gpr_timespec kPrimeInterval = {0, 101}; +const gpr_timespec kMilliSecInterval = { 0, 1000000 }; +const gpr_timespec kSecInterval = { 1, 0 }; +const gpr_timespec kMinInterval = { 60, 0 }; +const gpr_timespec kHourInterval = { 3600, 0 }; +const gpr_timespec kPrimeInterval = { 0, 101 }; -static int compare_double(double a, double b, double epsilon) { - if (a >= b) { - return (a > b + epsilon) ? 1 : 0; - } else { - return (b > a + epsilon) ? -1 : 0; - } +static int +compare_double (double a, double b, double epsilon) +{ + if (a >= b) + { + return (a > b + epsilon) ? 1 : 0; + } + else + { + return (b > a + epsilon) ? -1 : 0; + } } -void empty_test(void) { +void +empty_test (void) +{ census_window_stats_sums result; - const gpr_timespec zero = {0, 0}; + const gpr_timespec zero = { 0, 0 }; test_stat sum; - struct census_window_stats* stats = - census_window_stats_create(1, &kMinInterval, 5, &kMyStatInfo); - GPR_ASSERT(stats != NULL); + struct census_window_stats *stats = census_window_stats_create (1, &kMinInterval, 5, &kMyStatInfo); + GPR_ASSERT (stats != NULL); result.statistic = ∑ - census_window_stats_get_sums(stats, zero, &result); - GPR_ASSERT(result.count == 0 && sum.value1 == 0 && sum.value2 == 0); - census_window_stats_get_sums(stats, gpr_now(GPR_CLOCK_REALTIME), &result); - GPR_ASSERT(result.count == 0 && sum.value1 == 0 && sum.value2 == 0); - census_window_stats_destroy(stats); + census_window_stats_get_sums (stats, zero, &result); + GPR_ASSERT (result.count == 0 && sum.value1 == 0 && sum.value2 == 0); + census_window_stats_get_sums (stats, gpr_now (GPR_CLOCK_REALTIME), &result); + GPR_ASSERT (result.count == 0 && sum.value1 == 0 && sum.value2 == 0); + census_window_stats_destroy (stats); } -void one_interval_test(void) { - const test_stat value = {0.1, 4}; +void +one_interval_test (void) +{ + const test_stat value = { 0.1, 4 }; const double epsilon = 1e10 - 11; - gpr_timespec when = {0, 0}; + gpr_timespec when = { 0, 0 }; census_window_stats_sums result; test_stat sum; /* granularity == 5 so width of internal windows should be 12s */ - struct census_window_stats* stats = - census_window_stats_create(1, &kMinInterval, 5, &kMyStatInfo); - GPR_ASSERT(stats != NULL); + struct census_window_stats *stats = census_window_stats_create (1, &kMinInterval, 5, &kMyStatInfo); + GPR_ASSERT (stats != NULL); /* phase 1: insert a single value at t=0s, and check that various measurement times result in expected output values */ - census_window_stats_add(stats, when, &value); + census_window_stats_add (stats, when, &value); result.statistic = ∑ /* when = 0s, values extracted should be everything */ - census_window_stats_get_sums(stats, when, &result); - GPR_ASSERT(compare_double(result.count, 1, epsilon) == 0 && - compare_double(sum.value1, value.value1, epsilon) == 0 && - sum.value2 == value.value2); + census_window_stats_get_sums (stats, when, &result); + GPR_ASSERT (compare_double (result.count, 1, epsilon) == 0 && compare_double (sum.value1, value.value1, epsilon) == 0 && sum.value2 == value.value2); /* when = 6,30,60s, should be all of the data */ when.tv_sec = 6; - census_window_stats_get_sums(stats, when, &result); - GPR_ASSERT(compare_double(result.count, 1.0, epsilon) == 0 && - compare_double(sum.value1, value.value1, epsilon) == 0 && - sum.value2 == value.value2); + census_window_stats_get_sums (stats, when, &result); + GPR_ASSERT (compare_double (result.count, 1.0, epsilon) == 0 && compare_double (sum.value1, value.value1, epsilon) == 0 && sum.value2 == value.value2); /* when == 30s,60s, should be all of the data */ when.tv_sec = 30; - census_window_stats_get_sums(stats, when, &result); - GPR_ASSERT(compare_double(result.count, 1.0, epsilon) == 0 && - compare_double(sum.value1, value.value1, epsilon) == 0 && - sum.value2 == value.value2); + census_window_stats_get_sums (stats, when, &result); + GPR_ASSERT (compare_double (result.count, 1.0, epsilon) == 0 && compare_double (sum.value1, value.value1, epsilon) == 0 && sum.value2 == value.value2); when.tv_sec = 60; - census_window_stats_get_sums(stats, when, &result); - GPR_ASSERT(compare_double(result.count, 1.0, epsilon) == 0 && - compare_double(sum.value1, value.value1, epsilon) == 0 && - sum.value2 == value.value2); + census_window_stats_get_sums (stats, when, &result); + GPR_ASSERT (compare_double (result.count, 1.0, epsilon) == 0 && compare_double (sum.value1, value.value1, epsilon) == 0 && sum.value2 == value.value2); /* when = 66s, should be half (only take half of bottom bucket) */ when.tv_sec = 66; - census_window_stats_get_sums(stats, when, &result); - GPR_ASSERT(compare_double(result.count, 0.5, epsilon) == 0 && - compare_double(sum.value1, value.value1 / 2, epsilon) == 0 && - sum.value2 == value.value2 / 2); + census_window_stats_get_sums (stats, when, &result); + GPR_ASSERT (compare_double (result.count, 0.5, epsilon) == 0 && compare_double (sum.value1, value.value1 / 2, epsilon) == 0 && sum.value2 == value.value2 / 2); /* when = 72s, should be completely out of window */ when.tv_sec = 72; - census_window_stats_get_sums(stats, when, &result); - GPR_ASSERT(compare_double(result.count, 0, epsilon) == 0 && - compare_double(sum.value1, 0, epsilon) == 0 && sum.value2 == 0); + census_window_stats_get_sums (stats, when, &result); + GPR_ASSERT (compare_double (result.count, 0, epsilon) == 0 && compare_double (sum.value1, 0, epsilon) == 0 && sum.value2 == 0); /* phase 2: tear down and do as before, but inserting two values */ - census_window_stats_destroy(stats); - stats = census_window_stats_create(1, &kMinInterval, 5, &kMyStatInfo); - GPR_ASSERT(stats != NULL); + census_window_stats_destroy (stats); + stats = census_window_stats_create (1, &kMinInterval, 5, &kMyStatInfo); + GPR_ASSERT (stats != NULL); when.tv_sec = 0; when.tv_nsec = 17; - census_window_stats_add(stats, when, &value); + census_window_stats_add (stats, when, &value); when.tv_sec = 1; - census_window_stats_add(stats, when, &value); + census_window_stats_add (stats, when, &value); when.tv_sec = 0; - census_window_stats_get_sums(stats, when, &result); - GPR_ASSERT(compare_double(result.count, 0, epsilon) == 0 && - compare_double(sum.value1, 0, epsilon) == 0 && sum.value2 == 0); + census_window_stats_get_sums (stats, when, &result); + GPR_ASSERT (compare_double (result.count, 0, epsilon) == 0 && compare_double (sum.value1, 0, epsilon) == 0 && sum.value2 == 0); /* time = 3s, 30s, should get all data */ when.tv_sec = 3; - census_window_stats_get_sums(stats, when, &result); - GPR_ASSERT(compare_double(result.count, 2, epsilon) == 0 && - compare_double(sum.value1, 2 * value.value1, epsilon) == 0 && - sum.value2 == 2 * value.value2); + census_window_stats_get_sums (stats, when, &result); + GPR_ASSERT (compare_double (result.count, 2, epsilon) == 0 && compare_double (sum.value1, 2 * value.value1, epsilon) == 0 && sum.value2 == 2 * value.value2); when.tv_sec = 30; - census_window_stats_get_sums(stats, when, &result); - GPR_ASSERT(compare_double(result.count, 2, epsilon) == 0 && - compare_double(sum.value1, 2 * value.value1, epsilon) == 0 && - sum.value2 == 2 * value.value2); + census_window_stats_get_sums (stats, when, &result); + GPR_ASSERT (compare_double (result.count, 2, epsilon) == 0 && compare_double (sum.value1, 2 * value.value1, epsilon) == 0 && sum.value2 == 2 * value.value2); /* phase 3: insert into "middle" bucket, and force a shift, pushing out the two values in bottom bucket */ when.tv_sec = 30; - census_window_stats_add(stats, when, &value); + census_window_stats_add (stats, when, &value); when.tv_sec = 76; - census_window_stats_add(stats, when, &value); + census_window_stats_add (stats, when, &value); when.tv_sec = 0; - census_window_stats_get_sums(stats, when, &result); - GPR_ASSERT(result.count == 0 && sum.value1 == 0 && sum.value2 == 0); + census_window_stats_get_sums (stats, when, &result); + GPR_ASSERT (result.count == 0 && sum.value1 == 0 && sum.value2 == 0); when.tv_sec = 30; - census_window_stats_get_sums(stats, when, &result); + census_window_stats_get_sums (stats, when, &result); /* half of the single value in the 30 second bucket */ - GPR_ASSERT(compare_double(result.count, 0.5, epsilon) == 0 && - compare_double(sum.value1, value.value1 / 2, epsilon) == 0 && - sum.value2 == value.value2 / 2); + GPR_ASSERT (compare_double (result.count, 0.5, epsilon) == 0 && compare_double (sum.value1, value.value1 / 2, epsilon) == 0 && sum.value2 == value.value2 / 2); when.tv_sec = 74; - census_window_stats_get_sums(stats, when, &result); + census_window_stats_get_sums (stats, when, &result); /* half of the 76 second bucket, all of the 30 second bucket */ - GPR_ASSERT(compare_double(result.count, 1.5, epsilon) == 0 && - compare_double(sum.value1, value.value1 * 1.5, epsilon) == 0 && - sum.value2 == value.value2 / 2 * 3); + GPR_ASSERT (compare_double (result.count, 1.5, epsilon) == 0 && compare_double (sum.value1, value.value1 * 1.5, epsilon) == 0 && sum.value2 == value.value2 / 2 * 3); when.tv_sec = 76; - census_window_stats_get_sums(stats, when, &result); + census_window_stats_get_sums (stats, when, &result); /* >=76s, get all of the 76 second bucket, all of the 30 second bucket */ - GPR_ASSERT(compare_double(result.count, 2, epsilon) == 0 && - compare_double(sum.value1, value.value1 * 2, epsilon) == 0 && - sum.value2 == value.value2 * 2); + GPR_ASSERT (compare_double (result.count, 2, epsilon) == 0 && compare_double (sum.value1, value.value1 * 2, epsilon) == 0 && sum.value2 == value.value2 * 2); when.tv_sec = 78; - census_window_stats_get_sums(stats, when, &result); + census_window_stats_get_sums (stats, when, &result); /* half of the 76 second bucket, all of the 30 second bucket */ - GPR_ASSERT(compare_double(result.count, 2, epsilon) == 0 && - compare_double(sum.value1, value.value1 * 2, epsilon) == 0 && - sum.value2 == value.value2 * 2); - census_window_stats_destroy(stats); + GPR_ASSERT (compare_double (result.count, 2, epsilon) == 0 && compare_double (sum.value1, value.value1 * 2, epsilon) == 0 && sum.value2 == value.value2 * 2); + census_window_stats_destroy (stats); } -void many_interval_test(void) { +void +many_interval_test (void) +{ gpr_timespec intervals[4]; - const test_stat value = {123.45, 8}; + const test_stat value = { 123.45, 8 }; const double epsilon = 1e10 - 11; - gpr_timespec when = {3600, 0}; /* one hour */ + gpr_timespec when = { 3600, 0 }; /* one hour */ census_window_stats_sums result[4]; test_stat sums[4]; int i; - struct census_window_stats* stats; + struct census_window_stats *stats; intervals[0] = kMilliSecInterval; intervals[1] = kSecInterval; intervals[2] = kMinInterval; intervals[3] = kHourInterval; - for (i = 0; i < 4; i++) { - result[i].statistic = &sums[i]; - } - stats = census_window_stats_create(4, intervals, 100, &kMyStatInfo); - GPR_ASSERT(stats != NULL); + for (i = 0; i < 4; i++) + { + result[i].statistic = &sums[i]; + } + stats = census_window_stats_create (4, intervals, 100, &kMyStatInfo); + GPR_ASSERT (stats != NULL); /* add 10 stats within half of each time range */ - for (i = 0; i < 10; i++) { - when.tv_sec += 180; /* covers 30 min of one hour range */ - census_window_stats_add(stats, when, &value); - } + for (i = 0; i < 10; i++) + { + when.tv_sec += 180; /* covers 30 min of one hour range */ + census_window_stats_add (stats, when, &value); + } when.tv_sec += 120; - for (i = 0; i < 10; i++) { - when.tv_sec += 3; /* covers 30 sec of one minute range */ - census_window_stats_add(stats, when, &value); - } + for (i = 0; i < 10; i++) + { + when.tv_sec += 3; /* covers 30 sec of one minute range */ + census_window_stats_add (stats, when, &value); + } when.tv_sec += 2; - for (i = 0; i < 10; i++) { - when.tv_nsec += 50000000; /* covers 0.5s of 1s range */ - census_window_stats_add(stats, when, &value); - } + for (i = 0; i < 10; i++) + { + when.tv_nsec += 50000000; /* covers 0.5s of 1s range */ + census_window_stats_add (stats, when, &value); + } when.tv_nsec += 2000000; - for (i = 0; i < 10; i++) { - when.tv_nsec += 50000; /* covers 0.5 ms of 1 ms range */ - census_window_stats_add(stats, when, &value); - } + for (i = 0; i < 10; i++) + { + when.tv_nsec += 50000; /* covers 0.5 ms of 1 ms range */ + census_window_stats_add (stats, when, &value); + } when.tv_nsec += 20000; - census_window_stats_get_sums(stats, when, result); - GPR_ASSERT(compare_double(result[0].count, 10, epsilon) == 0 && - compare_double(sums[0].value1, value.value1 * 10, epsilon) == 0 && - sums[0].value2 == value.value2 * 10); + census_window_stats_get_sums (stats, when, result); + GPR_ASSERT (compare_double (result[0].count, 10, epsilon) == 0 && compare_double (sums[0].value1, value.value1 * 10, epsilon) == 0 && sums[0].value2 == value.value2 * 10); when.tv_nsec += 20000000; - census_window_stats_get_sums(stats, when, result); - GPR_ASSERT(compare_double(result[1].count, 20, epsilon) == 0 && - compare_double(sums[1].value1, value.value1 * 20, epsilon) == 0 && - sums[1].value2 == value.value2 * 20); + census_window_stats_get_sums (stats, when, result); + GPR_ASSERT (compare_double (result[1].count, 20, epsilon) == 0 && compare_double (sums[1].value1, value.value1 * 20, epsilon) == 0 && sums[1].value2 == value.value2 * 20); when.tv_sec += 2; - census_window_stats_get_sums(stats, when, result); - GPR_ASSERT(compare_double(result[2].count, 30, epsilon) == 0 && - compare_double(sums[2].value1, value.value1 * 30, epsilon) == 0 && - sums[2].value2 == value.value2 * 30); + census_window_stats_get_sums (stats, when, result); + GPR_ASSERT (compare_double (result[2].count, 30, epsilon) == 0 && compare_double (sums[2].value1, value.value1 * 30, epsilon) == 0 && sums[2].value2 == value.value2 * 30); when.tv_sec += 72; - census_window_stats_get_sums(stats, when, result); - GPR_ASSERT(compare_double(result[3].count, 40, epsilon) == 0 && - compare_double(sums[3].value1, value.value1 * 40, epsilon) == 0 && - sums[3].value2 == value.value2 * 40); - census_window_stats_destroy(stats); + census_window_stats_get_sums (stats, when, result); + GPR_ASSERT (compare_double (result[3].count, 40, epsilon) == 0 && compare_double (sums[3].value1, value.value1 * 40, epsilon) == 0 && sums[3].value2 == value.value2 * 40); + census_window_stats_destroy (stats); } -void rolling_time_test(void) { - const test_stat value = {0.1, 4}; - gpr_timespec when = {0, 0}; +void +rolling_time_test (void) +{ + const test_stat value = { 0.1, 4 }; + gpr_timespec when = { 0, 0 }; census_window_stats_sums result; test_stat sum; int i; - gpr_timespec increment = {0, 0}; - struct census_window_stats* stats = - census_window_stats_create(1, &kMinInterval, 7, &kMyStatInfo); - GPR_ASSERT(stats != NULL); - srand(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); - for (i = 0; i < 100000; i++) { - increment.tv_nsec = rand() % 100000000; /* up to 1/10th second */ - when = gpr_time_add(when, increment); - census_window_stats_add(stats, when, &value); - } + gpr_timespec increment = { 0, 0 }; + struct census_window_stats *stats = census_window_stats_create (1, &kMinInterval, 7, &kMyStatInfo); + GPR_ASSERT (stats != NULL); + srand (gpr_now (GPR_CLOCK_REALTIME).tv_nsec); + for (i = 0; i < 100000; i++) + { + increment.tv_nsec = rand () % 100000000; /* up to 1/10th second */ + when = gpr_time_add (when, increment); + census_window_stats_add (stats, when, &value); + } result.statistic = ∑ - census_window_stats_get_sums(stats, when, &result); + census_window_stats_get_sums (stats, when, &result); /* With 1/20th second average between samples, we expect 20*60 = 1200 samples on average. Make sure we are within 100 of that. */ - GPR_ASSERT(compare_double(result.count, 1200, 100) == 0); - census_window_stats_destroy(stats); + GPR_ASSERT (compare_double (result.count, 1200, 100) == 0); + census_window_stats_destroy (stats); } + #include -void infinite_interval_test(void) { - const test_stat value = {0.1, 4}; - gpr_timespec when = {0, 0}; +void +infinite_interval_test (void) +{ + const test_stat value = { 0.1, 4 }; + gpr_timespec when = { 0, 0 }; census_window_stats_sums result; test_stat sum; int i; const int count = 100000; - gpr_timespec increment = {0, 0}; - struct census_window_stats* stats = census_window_stats_create( - 1, &gpr_inf_future(GPR_CLOCK_REALTIME), 10, &kMyStatInfo); - srand(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); - for (i = 0; i < count; i++) { - increment.tv_sec = rand() % 21600; /* 6 hours */ - when = gpr_time_add(when, increment); - census_window_stats_add(stats, when, &value); - } + gpr_timespec increment = { 0, 0 }; + struct census_window_stats *stats = census_window_stats_create (1, &gpr_inf_future (GPR_CLOCK_REALTIME), 10, &kMyStatInfo); + srand (gpr_now (GPR_CLOCK_REALTIME).tv_nsec); + for (i = 0; i < count; i++) + { + increment.tv_sec = rand () % 21600; /* 6 hours */ + when = gpr_time_add (when, increment); + census_window_stats_add (stats, when, &value); + } result.statistic = ∑ - census_window_stats_get_sums(stats, when, &result); + census_window_stats_get_sums (stats, when, &result); /* The only thing it makes sense to compare for "infinite" periods is the total counts */ - GPR_ASSERT(result.count == count); - census_window_stats_destroy(stats); + GPR_ASSERT (result.count == count); + census_window_stats_destroy (stats); } -int main(int argc, char* argv[]) { - grpc_test_init(argc, argv); - empty_test(); - one_interval_test(); - many_interval_test(); - rolling_time_test(); - infinite_interval_test(); +int +main (int argc, char *argv[]) +{ + grpc_test_init (argc, argv); + empty_test (); + one_interval_test (); + many_interval_test (); + rolling_time_test (); + infinite_interval_test (); return 0; } diff --git a/test/core/support/cmdline_test.c b/test/core/support/cmdline_test.c index 1c77c152334..5102beb5195 100644 --- a/test/core/support/cmdline_test.c +++ b/test/core/support/cmdline_test.c @@ -42,238 +42,270 @@ #define LOG_TEST() gpr_log(GPR_INFO, "%s", __FILE__) -static void test_simple_int(void) { +static void +test_simple_int (void) +{ int x = 1; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "-foo", "3"}; + char *args[] = { (char *) __FILE__, "-foo", "3" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_int(cl, "foo", NULL, &x); - GPR_ASSERT(x == 1); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(x == 3); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_int (cl, "foo", NULL, &x); + GPR_ASSERT (x == 1); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (x == 3); + gpr_cmdline_destroy (cl); } -static void test_eq_int(void) { +static void +test_eq_int (void) +{ int x = 1; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "-foo=3"}; + char *args[] = { (char *) __FILE__, "-foo=3" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_int(cl, "foo", NULL, &x); - GPR_ASSERT(x == 1); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(x == 3); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_int (cl, "foo", NULL, &x); + GPR_ASSERT (x == 1); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (x == 3); + gpr_cmdline_destroy (cl); } -static void test_2dash_int(void) { +static void +test_2dash_int (void) +{ int x = 1; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "--foo", "3"}; + char *args[] = { (char *) __FILE__, "--foo", "3" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_int(cl, "foo", NULL, &x); - GPR_ASSERT(x == 1); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(x == 3); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_int (cl, "foo", NULL, &x); + GPR_ASSERT (x == 1); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (x == 3); + gpr_cmdline_destroy (cl); } -static void test_2dash_eq_int(void) { +static void +test_2dash_eq_int (void) +{ int x = 1; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "--foo=3"}; + char *args[] = { (char *) __FILE__, "--foo=3" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_int(cl, "foo", NULL, &x); - GPR_ASSERT(x == 1); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(x == 3); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_int (cl, "foo", NULL, &x); + GPR_ASSERT (x == 1); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (x == 3); + gpr_cmdline_destroy (cl); } -static void test_simple_string(void) { +static void +test_simple_string (void) +{ char *x = NULL; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "-foo", "3"}; + char *args[] = { (char *) __FILE__, "-foo", "3" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_string(cl, "foo", NULL, &x); - GPR_ASSERT(x == NULL); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(0 == strcmp(x, "3")); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_string (cl, "foo", NULL, &x); + GPR_ASSERT (x == NULL); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (0 == strcmp (x, "3")); + gpr_cmdline_destroy (cl); } -static void test_eq_string(void) { +static void +test_eq_string (void) +{ char *x = NULL; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "-foo=3"}; + char *args[] = { (char *) __FILE__, "-foo=3" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_string(cl, "foo", NULL, &x); - GPR_ASSERT(x == NULL); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(0 == strcmp(x, "3")); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_string (cl, "foo", NULL, &x); + GPR_ASSERT (x == NULL); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (0 == strcmp (x, "3")); + gpr_cmdline_destroy (cl); } -static void test_2dash_string(void) { +static void +test_2dash_string (void) +{ char *x = NULL; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "--foo", "3"}; + char *args[] = { (char *) __FILE__, "--foo", "3" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_string(cl, "foo", NULL, &x); - GPR_ASSERT(x == NULL); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(0 == strcmp(x, "3")); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_string (cl, "foo", NULL, &x); + GPR_ASSERT (x == NULL); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (0 == strcmp (x, "3")); + gpr_cmdline_destroy (cl); } -static void test_2dash_eq_string(void) { +static void +test_2dash_eq_string (void) +{ char *x = NULL; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "--foo=3"}; + char *args[] = { (char *) __FILE__, "--foo=3" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_string(cl, "foo", NULL, &x); - GPR_ASSERT(x == NULL); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(0 == strcmp(x, "3")); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_string (cl, "foo", NULL, &x); + GPR_ASSERT (x == NULL); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (0 == strcmp (x, "3")); + gpr_cmdline_destroy (cl); } -static void test_flag_on(void) { +static void +test_flag_on (void) +{ int x = 2; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "--foo"}; + char *args[] = { (char *) __FILE__, "--foo" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_flag(cl, "foo", NULL, &x); - GPR_ASSERT(x == 2); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(x == 1); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_flag (cl, "foo", NULL, &x); + GPR_ASSERT (x == 2); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (x == 1); + gpr_cmdline_destroy (cl); } -static void test_flag_no(void) { +static void +test_flag_no (void) +{ int x = 2; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "--no-foo"}; + char *args[] = { (char *) __FILE__, "--no-foo" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_flag(cl, "foo", NULL, &x); - GPR_ASSERT(x == 2); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(x == 0); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_flag (cl, "foo", NULL, &x); + GPR_ASSERT (x == 2); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (x == 0); + gpr_cmdline_destroy (cl); } -static void test_flag_val_1(void) { +static void +test_flag_val_1 (void) +{ int x = 2; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "--foo=1"}; + char *args[] = { (char *) __FILE__, "--foo=1" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_flag(cl, "foo", NULL, &x); - GPR_ASSERT(x == 2); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(x == 1); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_flag (cl, "foo", NULL, &x); + GPR_ASSERT (x == 2); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (x == 1); + gpr_cmdline_destroy (cl); } -static void test_flag_val_0(void) { +static void +test_flag_val_0 (void) +{ int x = 2; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "--foo=0"}; + char *args[] = { (char *) __FILE__, "--foo=0" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_flag(cl, "foo", NULL, &x); - GPR_ASSERT(x == 2); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(x == 0); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_flag (cl, "foo", NULL, &x); + GPR_ASSERT (x == 2); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (x == 0); + gpr_cmdline_destroy (cl); } -static void test_flag_val_true(void) { +static void +test_flag_val_true (void) +{ int x = 2; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "--foo=true"}; + char *args[] = { (char *) __FILE__, "--foo=true" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_flag(cl, "foo", NULL, &x); - GPR_ASSERT(x == 2); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(x == 1); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_flag (cl, "foo", NULL, &x); + GPR_ASSERT (x == 2); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (x == 1); + gpr_cmdline_destroy (cl); } -static void test_flag_val_false(void) { +static void +test_flag_val_false (void) +{ int x = 2; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "--foo=false"}; + char *args[] = { (char *) __FILE__, "--foo=false" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_flag(cl, "foo", NULL, &x); - GPR_ASSERT(x == 2); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(x == 0); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_flag (cl, "foo", NULL, &x); + GPR_ASSERT (x == 2); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (x == 0); + gpr_cmdline_destroy (cl); } -static void test_many(void) { +static void +test_many (void) +{ char *str = NULL; int x = 0; int flag = 2; gpr_cmdline *cl; - char *args[] = {(char *)__FILE__, "--str", "hello", "-x=4", "-no-flag"}; + char *args[] = { (char *) __FILE__, "--str", "hello", "-x=4", "-no-flag" }; - LOG_TEST(); + LOG_TEST (); - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_string(cl, "str", NULL, &str); - gpr_cmdline_add_int(cl, "x", NULL, &x); - gpr_cmdline_add_flag(cl, "flag", NULL, &flag); - gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); - GPR_ASSERT(x == 4); - GPR_ASSERT(0 == strcmp(str, "hello")); - GPR_ASSERT(flag == 0); - gpr_cmdline_destroy(cl); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_string (cl, "str", NULL, &str); + gpr_cmdline_add_int (cl, "x", NULL, &x); + gpr_cmdline_add_flag (cl, "flag", NULL, &flag); + gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); + GPR_ASSERT (x == 4); + GPR_ASSERT (0 == strcmp (str, "hello")); + GPR_ASSERT (flag == 0); + gpr_cmdline_destroy (cl); } -static void test_usage(void) { +static void +test_usage (void) +{ gpr_cmdline *cl; char *usage; @@ -281,37 +313,37 @@ static void test_usage(void) { int x = 0; int flag = 2; - cl = gpr_cmdline_create(NULL); - gpr_cmdline_add_string(cl, "str", NULL, &str); - gpr_cmdline_add_int(cl, "x", NULL, &x); - gpr_cmdline_add_flag(cl, "flag", NULL, &flag); + cl = gpr_cmdline_create (NULL); + gpr_cmdline_add_string (cl, "str", NULL, &str); + gpr_cmdline_add_int (cl, "x", NULL, &x); + gpr_cmdline_add_flag (cl, "flag", NULL, &flag); - usage = gpr_cmdline_usage_string(cl, "test"); - GPR_ASSERT( - 0 == strcmp(usage, - "Usage: test [--str=string] [--x=int] [--flag|--no-flag]\n")); - gpr_free(usage); + usage = gpr_cmdline_usage_string (cl, "test"); + GPR_ASSERT (0 == strcmp (usage, "Usage: test [--str=string] [--x=int] [--flag|--no-flag]\n")); + gpr_free (usage); - gpr_cmdline_destroy(cl); + gpr_cmdline_destroy (cl); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_simple_int(); - test_eq_int(); - test_2dash_int(); - test_2dash_eq_int(); - test_simple_string(); - test_eq_string(); - test_2dash_string(); - test_2dash_eq_string(); - test_flag_on(); - test_flag_no(); - test_flag_val_1(); - test_flag_val_0(); - test_flag_val_true(); - test_flag_val_false(); - test_many(); - test_usage(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_simple_int (); + test_eq_int (); + test_2dash_int (); + test_2dash_eq_int (); + test_simple_string (); + test_eq_string (); + test_2dash_string (); + test_2dash_eq_string (); + test_flag_on (); + test_flag_no (); + test_flag_val_1 (); + test_flag_val_0 (); + test_flag_val_true (); + test_flag_val_false (); + test_many (); + test_usage (); return 0; } diff --git a/test/core/support/env_test.c b/test/core/support/env_test.c index 69aebcc918c..f208253540d 100644 --- a/test/core/support/env_test.c +++ b/test/core/support/env_test.c @@ -43,22 +43,26 @@ #define LOG_TEST_NAME(x) gpr_log(GPR_INFO, "%s", x) -static void test_setenv_getenv(void) { +static void +test_setenv_getenv (void) +{ const char *name = "FOO"; const char *value = "BAR"; char *retrieved_value; - LOG_TEST_NAME("test_setenv_getenv"); + LOG_TEST_NAME ("test_setenv_getenv"); - gpr_setenv(name, value); - retrieved_value = gpr_getenv(name); - GPR_ASSERT(retrieved_value != NULL); - GPR_ASSERT(strcmp(value, retrieved_value) == 0); - gpr_free(retrieved_value); + gpr_setenv (name, value); + retrieved_value = gpr_getenv (name); + GPR_ASSERT (retrieved_value != NULL); + GPR_ASSERT (strcmp (value, retrieved_value) == 0); + gpr_free (retrieved_value); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_setenv_getenv(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_setenv_getenv (); return 0; } diff --git a/test/core/support/file_test.c b/test/core/support/file_test.c index 330b2173ef9..600448d778e 100644 --- a/test/core/support/file_test.c +++ b/test/core/support/file_test.c @@ -46,57 +46,63 @@ static const char prefix[] = "file_test"; -static void test_load_empty_file(void) { +static void +test_load_empty_file (void) +{ FILE *tmp = NULL; gpr_slice slice; gpr_slice slice_with_null_term; int success; char *tmp_name; - LOG_TEST_NAME("test_load_empty_file"); + LOG_TEST_NAME ("test_load_empty_file"); - tmp = gpr_tmpfile(prefix, &tmp_name); - GPR_ASSERT(tmp_name != NULL); - GPR_ASSERT(tmp != NULL); - fclose(tmp); + tmp = gpr_tmpfile (prefix, &tmp_name); + GPR_ASSERT (tmp_name != NULL); + GPR_ASSERT (tmp != NULL); + fclose (tmp); - slice = gpr_load_file(tmp_name, 0, &success); - GPR_ASSERT(success == 1); - GPR_ASSERT(GPR_SLICE_LENGTH(slice) == 0); + slice = gpr_load_file (tmp_name, 0, &success); + GPR_ASSERT (success == 1); + GPR_ASSERT (GPR_SLICE_LENGTH (slice) == 0); - slice_with_null_term = gpr_load_file(tmp_name, 1, &success); - GPR_ASSERT(success == 1); - GPR_ASSERT(GPR_SLICE_LENGTH(slice_with_null_term) == 1); - GPR_ASSERT(GPR_SLICE_START_PTR(slice_with_null_term)[0] == 0); + slice_with_null_term = gpr_load_file (tmp_name, 1, &success); + GPR_ASSERT (success == 1); + GPR_ASSERT (GPR_SLICE_LENGTH (slice_with_null_term) == 1); + GPR_ASSERT (GPR_SLICE_START_PTR (slice_with_null_term)[0] == 0); - remove(tmp_name); - gpr_free(tmp_name); - gpr_slice_unref(slice); - gpr_slice_unref(slice_with_null_term); + remove (tmp_name); + gpr_free (tmp_name); + gpr_slice_unref (slice); + gpr_slice_unref (slice_with_null_term); } -static void test_load_failure(void) { +static void +test_load_failure (void) +{ FILE *tmp = NULL; gpr_slice slice; int success; char *tmp_name; - LOG_TEST_NAME("test_load_failure"); + LOG_TEST_NAME ("test_load_failure"); - tmp = gpr_tmpfile(prefix, &tmp_name); - GPR_ASSERT(tmp_name != NULL); - GPR_ASSERT(tmp != NULL); - fclose(tmp); - remove(tmp_name); + tmp = gpr_tmpfile (prefix, &tmp_name); + GPR_ASSERT (tmp_name != NULL); + GPR_ASSERT (tmp != NULL); + fclose (tmp); + remove (tmp_name); - slice = gpr_load_file(tmp_name, 0, &success); - GPR_ASSERT(success == 0); - GPR_ASSERT(GPR_SLICE_LENGTH(slice) == 0); - gpr_free(tmp_name); - gpr_slice_unref(slice); + slice = gpr_load_file (tmp_name, 0, &success); + GPR_ASSERT (success == 0); + GPR_ASSERT (GPR_SLICE_LENGTH (slice) == 0); + gpr_free (tmp_name); + gpr_slice_unref (slice); } -static void test_load_small_file(void) { +static void +test_load_small_file (void) +{ FILE *tmp = NULL; gpr_slice slice; gpr_slice slice_with_null_term; @@ -104,32 +110,33 @@ static void test_load_small_file(void) { char *tmp_name; const char *blah = "blah"; - LOG_TEST_NAME("test_load_small_file"); - - tmp = gpr_tmpfile(prefix, &tmp_name); - GPR_ASSERT(tmp_name != NULL); - GPR_ASSERT(tmp != NULL); - GPR_ASSERT(fwrite(blah, 1, strlen(blah), tmp) == strlen(blah)); - fclose(tmp); - - slice = gpr_load_file(tmp_name, 0, &success); - GPR_ASSERT(success == 1); - GPR_ASSERT(GPR_SLICE_LENGTH(slice) == strlen(blah)); - GPR_ASSERT(!memcmp(GPR_SLICE_START_PTR(slice), blah, strlen(blah))); - - slice_with_null_term = gpr_load_file(tmp_name, 1, &success); - GPR_ASSERT(success == 1); - GPR_ASSERT(GPR_SLICE_LENGTH(slice_with_null_term) == (strlen(blah) + 1)); - GPR_ASSERT(strcmp((const char *)GPR_SLICE_START_PTR(slice_with_null_term), - blah) == 0); - - remove(tmp_name); - gpr_free(tmp_name); - gpr_slice_unref(slice); - gpr_slice_unref(slice_with_null_term); + LOG_TEST_NAME ("test_load_small_file"); + + tmp = gpr_tmpfile (prefix, &tmp_name); + GPR_ASSERT (tmp_name != NULL); + GPR_ASSERT (tmp != NULL); + GPR_ASSERT (fwrite (blah, 1, strlen (blah), tmp) == strlen (blah)); + fclose (tmp); + + slice = gpr_load_file (tmp_name, 0, &success); + GPR_ASSERT (success == 1); + GPR_ASSERT (GPR_SLICE_LENGTH (slice) == strlen (blah)); + GPR_ASSERT (!memcmp (GPR_SLICE_START_PTR (slice), blah, strlen (blah))); + + slice_with_null_term = gpr_load_file (tmp_name, 1, &success); + GPR_ASSERT (success == 1); + GPR_ASSERT (GPR_SLICE_LENGTH (slice_with_null_term) == (strlen (blah) + 1)); + GPR_ASSERT (strcmp ((const char *) GPR_SLICE_START_PTR (slice_with_null_term), blah) == 0); + + remove (tmp_name); + gpr_free (tmp_name); + gpr_slice_unref (slice); + gpr_slice_unref (slice_with_null_term); } -static void test_load_big_file(void) { +static void +test_load_big_file (void) +{ FILE *tmp = NULL; gpr_slice slice; int success; @@ -138,36 +145,40 @@ static void test_load_big_file(void) { unsigned char *current; size_t i; - LOG_TEST_NAME("test_load_big_file"); - - for (i = 0; i < sizeof(buffer); i++) { - buffer[i] = 42; - } - - tmp = gpr_tmpfile(prefix, &tmp_name); - GPR_ASSERT(tmp != NULL); - GPR_ASSERT(tmp_name != NULL); - GPR_ASSERT(fwrite(buffer, 1, sizeof(buffer), tmp) == sizeof(buffer)); - fclose(tmp); - - slice = gpr_load_file(tmp_name, 0, &success); - GPR_ASSERT(success == 1); - GPR_ASSERT(GPR_SLICE_LENGTH(slice) == sizeof(buffer)); - current = GPR_SLICE_START_PTR(slice); - for (i = 0; i < sizeof(buffer); i++) { - GPR_ASSERT(current[i] == 42); - } - - remove(tmp_name); - gpr_free(tmp_name); - gpr_slice_unref(slice); + LOG_TEST_NAME ("test_load_big_file"); + + for (i = 0; i < sizeof (buffer); i++) + { + buffer[i] = 42; + } + + tmp = gpr_tmpfile (prefix, &tmp_name); + GPR_ASSERT (tmp != NULL); + GPR_ASSERT (tmp_name != NULL); + GPR_ASSERT (fwrite (buffer, 1, sizeof (buffer), tmp) == sizeof (buffer)); + fclose (tmp); + + slice = gpr_load_file (tmp_name, 0, &success); + GPR_ASSERT (success == 1); + GPR_ASSERT (GPR_SLICE_LENGTH (slice) == sizeof (buffer)); + current = GPR_SLICE_START_PTR (slice); + for (i = 0; i < sizeof (buffer); i++) + { + GPR_ASSERT (current[i] == 42); + } + + remove (tmp_name); + gpr_free (tmp_name); + gpr_slice_unref (slice); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_load_empty_file(); - test_load_failure(); - test_load_small_file(); - test_load_big_file(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_load_empty_file (); + test_load_failure (); + test_load_small_file (); + test_load_big_file (); return 0; } diff --git a/test/core/support/histogram_test.c b/test/core/support/histogram_test.c index be935ede093..d13aeb651d9 100644 --- a/test/core/support/histogram_test.c +++ b/test/core/support/histogram_test.c @@ -36,143 +36,155 @@ #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x); -static void test_no_op(void) { - gpr_histogram_destroy(gpr_histogram_create(0.01, 60e9)); +static void +test_no_op (void) +{ + gpr_histogram_destroy (gpr_histogram_create (0.01, 60e9)); } -static void expect_percentile(gpr_histogram *h, double percentile, - double min_expect, double max_expect) { - double got = gpr_histogram_percentile(h, percentile); - gpr_log(GPR_INFO, "@%f%%, expect %f <= %f <= %f", percentile, min_expect, got, - max_expect); - GPR_ASSERT(min_expect <= got); - GPR_ASSERT(got <= max_expect); +static void +expect_percentile (gpr_histogram * h, double percentile, double min_expect, double max_expect) +{ + double got = gpr_histogram_percentile (h, percentile); + gpr_log (GPR_INFO, "@%f%%, expect %f <= %f <= %f", percentile, min_expect, got, max_expect); + GPR_ASSERT (min_expect <= got); + GPR_ASSERT (got <= max_expect); } -static void test_simple(void) { +static void +test_simple (void) +{ gpr_histogram *h; - LOG_TEST("test_simple"); + LOG_TEST ("test_simple"); - h = gpr_histogram_create(0.01, 60e9); - gpr_histogram_add(h, 10000); - gpr_histogram_add(h, 10000); - gpr_histogram_add(h, 11000); - gpr_histogram_add(h, 11000); + h = gpr_histogram_create (0.01, 60e9); + gpr_histogram_add (h, 10000); + gpr_histogram_add (h, 10000); + gpr_histogram_add (h, 11000); + gpr_histogram_add (h, 11000); - expect_percentile(h, 50, 10001, 10999); - GPR_ASSERT(gpr_histogram_mean(h) == 10500); + expect_percentile (h, 50, 10001, 10999); + GPR_ASSERT (gpr_histogram_mean (h) == 10500); - gpr_histogram_destroy(h); + gpr_histogram_destroy (h); } -static void test_percentile(void) { +static void +test_percentile (void) +{ gpr_histogram *h; double last; double i; double cur; - LOG_TEST("test_percentile"); - - h = gpr_histogram_create(0.05, 1e9); - gpr_histogram_add(h, 2.5); - gpr_histogram_add(h, 2.5); - gpr_histogram_add(h, 8); - gpr_histogram_add(h, 4); - - GPR_ASSERT(gpr_histogram_count(h) == 4); - GPR_ASSERT(gpr_histogram_minimum(h) == 2.5); - GPR_ASSERT(gpr_histogram_maximum(h) == 8); - GPR_ASSERT(gpr_histogram_sum(h) == 17); - GPR_ASSERT(gpr_histogram_sum_of_squares(h) == 92.5); - GPR_ASSERT(gpr_histogram_mean(h) == 4.25); - GPR_ASSERT(gpr_histogram_variance(h) == 5.0625); - GPR_ASSERT(gpr_histogram_stddev(h) == 2.25); - - expect_percentile(h, -10, 2.5, 2.5); - expect_percentile(h, 0, 2.5, 2.5); - expect_percentile(h, 12.5, 2.5, 2.5); - expect_percentile(h, 25, 2.5, 2.5); - expect_percentile(h, 37.5, 2.5, 2.8); - expect_percentile(h, 50, 3.0, 3.5); - expect_percentile(h, 62.5, 3.5, 4.5); - expect_percentile(h, 75, 5, 7.9); - expect_percentile(h, 100, 8, 8); - expect_percentile(h, 110, 8, 8); + LOG_TEST ("test_percentile"); + + h = gpr_histogram_create (0.05, 1e9); + gpr_histogram_add (h, 2.5); + gpr_histogram_add (h, 2.5); + gpr_histogram_add (h, 8); + gpr_histogram_add (h, 4); + + GPR_ASSERT (gpr_histogram_count (h) == 4); + GPR_ASSERT (gpr_histogram_minimum (h) == 2.5); + GPR_ASSERT (gpr_histogram_maximum (h) == 8); + GPR_ASSERT (gpr_histogram_sum (h) == 17); + GPR_ASSERT (gpr_histogram_sum_of_squares (h) == 92.5); + GPR_ASSERT (gpr_histogram_mean (h) == 4.25); + GPR_ASSERT (gpr_histogram_variance (h) == 5.0625); + GPR_ASSERT (gpr_histogram_stddev (h) == 2.25); + + expect_percentile (h, -10, 2.5, 2.5); + expect_percentile (h, 0, 2.5, 2.5); + expect_percentile (h, 12.5, 2.5, 2.5); + expect_percentile (h, 25, 2.5, 2.5); + expect_percentile (h, 37.5, 2.5, 2.8); + expect_percentile (h, 50, 3.0, 3.5); + expect_percentile (h, 62.5, 3.5, 4.5); + expect_percentile (h, 75, 5, 7.9); + expect_percentile (h, 100, 8, 8); + expect_percentile (h, 110, 8, 8); /* test monotonicity */ last = 0.0; - for (i = 0; i < 100.0; i += 0.01) { - cur = gpr_histogram_percentile(h, i); - GPR_ASSERT(cur >= last); - last = cur; - } - - gpr_histogram_destroy(h); + for (i = 0; i < 100.0; i += 0.01) + { + cur = gpr_histogram_percentile (h, i); + GPR_ASSERT (cur >= last); + last = cur; + } + + gpr_histogram_destroy (h); } -static void test_merge(void) { +static void +test_merge (void) +{ gpr_histogram *h1, *h2; double last; double i; double cur; - LOG_TEST("test_merge"); - - h1 = gpr_histogram_create(0.05, 1e9); - gpr_histogram_add(h1, 2.5); - gpr_histogram_add(h1, 2.5); - gpr_histogram_add(h1, 8); - gpr_histogram_add(h1, 4); - - h2 = gpr_histogram_create(0.01, 1e9); - GPR_ASSERT(gpr_histogram_merge(h1, h2) == 0); - gpr_histogram_destroy(h2); - - h2 = gpr_histogram_create(0.05, 1e10); - GPR_ASSERT(gpr_histogram_merge(h1, h2) == 0); - gpr_histogram_destroy(h2); - - h2 = gpr_histogram_create(0.05, 1e9); - GPR_ASSERT(gpr_histogram_merge(h1, h2) == 1); - GPR_ASSERT(gpr_histogram_count(h1) == 4); - GPR_ASSERT(gpr_histogram_minimum(h1) == 2.5); - GPR_ASSERT(gpr_histogram_maximum(h1) == 8); - GPR_ASSERT(gpr_histogram_sum(h1) == 17); - GPR_ASSERT(gpr_histogram_sum_of_squares(h1) == 92.5); - GPR_ASSERT(gpr_histogram_mean(h1) == 4.25); - GPR_ASSERT(gpr_histogram_variance(h1) == 5.0625); - GPR_ASSERT(gpr_histogram_stddev(h1) == 2.25); - gpr_histogram_destroy(h2); - - h2 = gpr_histogram_create(0.05, 1e9); - gpr_histogram_add(h2, 7.0); - gpr_histogram_add(h2, 17.0); - gpr_histogram_add(h2, 1.0); - GPR_ASSERT(gpr_histogram_merge(h1, h2) == 1); - GPR_ASSERT(gpr_histogram_count(h1) == 7); - GPR_ASSERT(gpr_histogram_minimum(h1) == 1.0); - GPR_ASSERT(gpr_histogram_maximum(h1) == 17.0); - GPR_ASSERT(gpr_histogram_sum(h1) == 42.0); - GPR_ASSERT(gpr_histogram_sum_of_squares(h1) == 431.5); - GPR_ASSERT(gpr_histogram_mean(h1) == 6.0); + LOG_TEST ("test_merge"); + + h1 = gpr_histogram_create (0.05, 1e9); + gpr_histogram_add (h1, 2.5); + gpr_histogram_add (h1, 2.5); + gpr_histogram_add (h1, 8); + gpr_histogram_add (h1, 4); + + h2 = gpr_histogram_create (0.01, 1e9); + GPR_ASSERT (gpr_histogram_merge (h1, h2) == 0); + gpr_histogram_destroy (h2); + + h2 = gpr_histogram_create (0.05, 1e10); + GPR_ASSERT (gpr_histogram_merge (h1, h2) == 0); + gpr_histogram_destroy (h2); + + h2 = gpr_histogram_create (0.05, 1e9); + GPR_ASSERT (gpr_histogram_merge (h1, h2) == 1); + GPR_ASSERT (gpr_histogram_count (h1) == 4); + GPR_ASSERT (gpr_histogram_minimum (h1) == 2.5); + GPR_ASSERT (gpr_histogram_maximum (h1) == 8); + GPR_ASSERT (gpr_histogram_sum (h1) == 17); + GPR_ASSERT (gpr_histogram_sum_of_squares (h1) == 92.5); + GPR_ASSERT (gpr_histogram_mean (h1) == 4.25); + GPR_ASSERT (gpr_histogram_variance (h1) == 5.0625); + GPR_ASSERT (gpr_histogram_stddev (h1) == 2.25); + gpr_histogram_destroy (h2); + + h2 = gpr_histogram_create (0.05, 1e9); + gpr_histogram_add (h2, 7.0); + gpr_histogram_add (h2, 17.0); + gpr_histogram_add (h2, 1.0); + GPR_ASSERT (gpr_histogram_merge (h1, h2) == 1); + GPR_ASSERT (gpr_histogram_count (h1) == 7); + GPR_ASSERT (gpr_histogram_minimum (h1) == 1.0); + GPR_ASSERT (gpr_histogram_maximum (h1) == 17.0); + GPR_ASSERT (gpr_histogram_sum (h1) == 42.0); + GPR_ASSERT (gpr_histogram_sum_of_squares (h1) == 431.5); + GPR_ASSERT (gpr_histogram_mean (h1) == 6.0); /* test monotonicity */ last = 0.0; - for (i = 0; i < 100.0; i += 0.01) { - cur = gpr_histogram_percentile(h1, i); - GPR_ASSERT(cur >= last); - last = cur; - } - - gpr_histogram_destroy(h1); - gpr_histogram_destroy(h2); + for (i = 0; i < 100.0; i += 0.01) + { + cur = gpr_histogram_percentile (h1, i); + GPR_ASSERT (cur >= last); + last = cur; + } + + gpr_histogram_destroy (h1); + gpr_histogram_destroy (h2); } -int main(void) { - test_no_op(); - test_simple(); - test_percentile(); - test_merge(); +int +main (void) +{ + test_no_op (); + test_simple (); + test_percentile (); + test_merge (); return 0; } diff --git a/test/core/support/host_port_test.c b/test/core/support/host_port_test.c index eccc39a2db1..71a774191b1 100644 --- a/test/core/support/host_port_test.c +++ b/test/core/support/host_port_test.c @@ -38,36 +38,43 @@ #include #include "test/core/util/test_config.h" -static void join_host_port_expect(const char *host, int port, - const char *expected) { +static void +join_host_port_expect (const char *host, int port, const char *expected) +{ char *buf; int len; - len = gpr_join_host_port(&buf, host, port); - GPR_ASSERT(len >= 0); - GPR_ASSERT(strlen(expected) == (size_t)len); - GPR_ASSERT(strcmp(expected, buf) == 0); - gpr_free(buf); + len = gpr_join_host_port (&buf, host, port); + GPR_ASSERT (len >= 0); + GPR_ASSERT (strlen (expected) == (size_t) len); + GPR_ASSERT (strcmp (expected, buf) == 0); + gpr_free (buf); } -static void test_join_host_port(void) { - join_host_port_expect("foo", 101, "foo:101"); - join_host_port_expect("", 102, ":102"); - join_host_port_expect("1::2", 103, "[1::2]:103"); - join_host_port_expect("[::1]", 104, "[::1]:104"); +static void +test_join_host_port (void) +{ + join_host_port_expect ("foo", 101, "foo:101"); + join_host_port_expect ("", 102, ":102"); + join_host_port_expect ("1::2", 103, "[1::2]:103"); + join_host_port_expect ("[::1]", 104, "[::1]:104"); } /* Garbage in, garbage out. */ -static void test_join_host_port_garbage(void) { - join_host_port_expect("[foo]", 105, "[foo]:105"); - join_host_port_expect("[::", 106, "[:::106"); - join_host_port_expect("::]", 107, "[::]]:107"); +static void +test_join_host_port_garbage (void) +{ + join_host_port_expect ("[foo]", 105, "[foo]:105"); + join_host_port_expect ("[::", 106, "[:::106"); + join_host_port_expect ("::]", 107, "[::]]:107"); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); - test_join_host_port(); - test_join_host_port_garbage(); + test_join_host_port (); + test_join_host_port_garbage (); return 0; } diff --git a/test/core/support/log_test.c b/test/core/support/log_test.c index b39b0699134..c30ce6958f1 100644 --- a/test/core/support/log_test.c +++ b/test/core/support/log_test.c @@ -37,23 +37,27 @@ #include "test/core/util/test_config.h" -static void test_callback(gpr_log_func_args *args) { - GPR_ASSERT(0 == strcmp(__FILE__, args->file)); - GPR_ASSERT(args->severity == GPR_LOG_SEVERITY_INFO); - GPR_ASSERT(0 == strcmp(args->message, "hello 1 2 3")); +static void +test_callback (gpr_log_func_args * args) +{ + GPR_ASSERT (0 == strcmp (__FILE__, args->file)); + GPR_ASSERT (args->severity == GPR_LOG_SEVERITY_INFO); + GPR_ASSERT (0 == strcmp (args->message, "hello 1 2 3")); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); /* test logging at various verbosity levels */ - gpr_log(GPR_DEBUG, "%s", "hello world"); - gpr_log(GPR_INFO, "%s", "hello world"); - gpr_log(GPR_ERROR, "%s", "hello world"); + gpr_log (GPR_DEBUG, "%s", "hello world"); + gpr_log (GPR_INFO, "%s", "hello world"); + gpr_log (GPR_ERROR, "%s", "hello world"); /* should succeed */ - GPR_ASSERT(1); - gpr_set_log_function(test_callback); - gpr_log_message(GPR_INFO, "hello 1 2 3"); - gpr_log(GPR_INFO, "hello %d %d %d", 1, 2, 3); + GPR_ASSERT (1); + gpr_set_log_function (test_callback); + gpr_log_message (GPR_INFO, "hello 1 2 3"); + gpr_log (GPR_INFO, "hello %d %d %d", 1, 2, 3); /* TODO(ctiller): should we add a GPR_ASSERT failure test here */ return 0; } diff --git a/test/core/support/murmur_hash_test.c b/test/core/support/murmur_hash_test.c index 1762486776f..946a800c606 100644 --- a/test/core/support/murmur_hash_test.c +++ b/test/core/support/murmur_hash_test.c @@ -38,51 +38,58 @@ #include -typedef gpr_uint32 (*hash_func)(const void *key, size_t len, gpr_uint32 seed); +typedef gpr_uint32 (*hash_func) (const void *key, size_t len, gpr_uint32 seed); /* From smhasher: This should hopefully be a thorough and uambiguous test of whether a hash is correctly implemented on a given platform */ -static void verification_test(hash_func hash, gpr_uint32 expected) { +static void +verification_test (hash_func hash, gpr_uint32 expected) +{ gpr_uint8 key[256]; gpr_uint32 hashes[256]; gpr_uint32 final = 0; size_t i; - memset(key, 0, sizeof(key)); - memset(hashes, 0, sizeof(hashes)); + memset (key, 0, sizeof (key)); + memset (hashes, 0, sizeof (hashes)); /* Hash keys of the form {0}, {0,1}, {0,1,2}... up to N=255,using 256-N as the seed */ - for (i = 0; i < 256; i++) { - key[i] = (gpr_uint8)i; - hashes[i] = hash(key, i, (gpr_uint32)(256u - i)); - } + for (i = 0; i < 256; i++) + { + key[i] = (gpr_uint8) i; + hashes[i] = hash (key, i, (gpr_uint32) (256u - i)); + } /* Then hash the result array */ - final = hash(hashes, sizeof(hashes), 0); + final = hash (hashes, sizeof (hashes), 0); /* The first four bytes of that hash, interpreted as a little-endian integer, is our verification value */ - if (expected != final) { - gpr_log(GPR_INFO, "Verification value 0x%08X : Failed! (Expected 0x%08x)", - final, expected); - abort(); - } else { - gpr_log(GPR_INFO, "Verification value 0x%08X : Passed!", final); - } + if (expected != final) + { + gpr_log (GPR_INFO, "Verification value 0x%08X : Failed! (Expected 0x%08x)", final, expected); + abort (); + } + else + { + gpr_log (GPR_INFO, "Verification value 0x%08X : Passed!", final); + } } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); /* basic tests to verify that things don't crash */ - gpr_murmur_hash3("", 0, 0); - gpr_murmur_hash3("xyz", 3, 0); - verification_test(gpr_murmur_hash3, 0xB0F57EE3); + gpr_murmur_hash3 ("", 0, 0); + gpr_murmur_hash3 ("xyz", 3, 0); + verification_test (gpr_murmur_hash3, 0xB0F57EE3); return 0; } diff --git a/test/core/support/slice_buffer_test.c b/test/core/support/slice_buffer_test.c index a48278434f1..9254f709e39 100644 --- a/test/core/support/slice_buffer_test.c +++ b/test/core/support/slice_buffer_test.c @@ -35,41 +35,46 @@ #include #include "test/core/util/test_config.h" -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ gpr_slice_buffer buf; - gpr_slice aaa = gpr_slice_from_copied_string("aaa"); - gpr_slice bb = gpr_slice_from_copied_string("bb"); + gpr_slice aaa = gpr_slice_from_copied_string ("aaa"); + gpr_slice bb = gpr_slice_from_copied_string ("bb"); size_t i; - grpc_test_init(argc, argv); - gpr_slice_buffer_init(&buf); - for (i = 0; i < 10; i++) { - gpr_slice_ref(aaa); - gpr_slice_ref(bb); - gpr_slice_buffer_add(&buf, aaa); - gpr_slice_buffer_add(&buf, bb); - } - GPR_ASSERT(buf.count > 0); - GPR_ASSERT(buf.length == 50); - gpr_slice_buffer_reset_and_unref(&buf); - GPR_ASSERT(buf.count == 0); - GPR_ASSERT(buf.length == 0); - for (i = 0; i < 10; i++) { - gpr_slice_ref(aaa); - gpr_slice_ref(bb); - gpr_slice_buffer_add(&buf, aaa); - gpr_slice_buffer_add(&buf, bb); - } - GPR_ASSERT(buf.count > 0); - GPR_ASSERT(buf.length == 50); - for (i = 0; i < 10; i++) { - gpr_slice_buffer_pop(&buf); - gpr_slice_unref(aaa); - gpr_slice_unref(bb); - } - GPR_ASSERT(buf.count == 0); - GPR_ASSERT(buf.length == 0); - gpr_slice_buffer_destroy(&buf); + grpc_test_init (argc, argv); + gpr_slice_buffer_init (&buf); + for (i = 0; i < 10; i++) + { + gpr_slice_ref (aaa); + gpr_slice_ref (bb); + gpr_slice_buffer_add (&buf, aaa); + gpr_slice_buffer_add (&buf, bb); + } + GPR_ASSERT (buf.count > 0); + GPR_ASSERT (buf.length == 50); + gpr_slice_buffer_reset_and_unref (&buf); + GPR_ASSERT (buf.count == 0); + GPR_ASSERT (buf.length == 0); + for (i = 0; i < 10; i++) + { + gpr_slice_ref (aaa); + gpr_slice_ref (bb); + gpr_slice_buffer_add (&buf, aaa); + gpr_slice_buffer_add (&buf, bb); + } + GPR_ASSERT (buf.count > 0); + GPR_ASSERT (buf.length == 50); + for (i = 0; i < 10; i++) + { + gpr_slice_buffer_pop (&buf); + gpr_slice_unref (aaa); + gpr_slice_unref (bb); + } + GPR_ASSERT (buf.count == 0); + GPR_ASSERT (buf.length == 0); + gpr_slice_buffer_destroy (&buf); return 0; } diff --git a/test/core/support/slice_test.c b/test/core/support/slice_test.c index 1d202f06186..e041532c8b2 100644 --- a/test/core/support/slice_test.c +++ b/test/core/support/slice_test.c @@ -41,188 +41,220 @@ #define LOG_TEST_NAME(x) gpr_log(GPR_INFO, "%s", x); -static void test_slice_malloc_returns_something_sensible(void) { +static void +test_slice_malloc_returns_something_sensible (void) +{ /* Calls gpr_slice_create for various lengths and verifies the internals for consistency. */ size_t length; size_t i; gpr_slice slice; - LOG_TEST_NAME("test_slice_malloc_returns_something_sensible"); - - for (length = 0; length <= 1024; length++) { - slice = gpr_slice_malloc(length); - /* If there is a length, slice.data must be non-NULL. If length is zero - we don't care. */ - if (length) { - GPR_ASSERT(GPR_SLICE_START_PTR(slice)); - } - /* Returned slice length must be what was requested. */ - GPR_ASSERT(GPR_SLICE_LENGTH(slice) == length); - /* If the slice has a refcount, it must be destroyable. */ - if (slice.refcount) { - GPR_ASSERT(slice.refcount->ref != NULL); - GPR_ASSERT(slice.refcount->unref != NULL); - } - /* We must be able to write to every byte of the data */ - for (i = 0; i < length; i++) { - GPR_SLICE_START_PTR(slice)[i] = (gpr_uint8)i; + LOG_TEST_NAME ("test_slice_malloc_returns_something_sensible"); + + for (length = 0; length <= 1024; length++) + { + slice = gpr_slice_malloc (length); + /* If there is a length, slice.data must be non-NULL. If length is zero + we don't care. */ + if (length) + { + GPR_ASSERT (GPR_SLICE_START_PTR (slice)); + } + /* Returned slice length must be what was requested. */ + GPR_ASSERT (GPR_SLICE_LENGTH (slice) == length); + /* If the slice has a refcount, it must be destroyable. */ + if (slice.refcount) + { + GPR_ASSERT (slice.refcount->ref != NULL); + GPR_ASSERT (slice.refcount->unref != NULL); + } + /* We must be able to write to every byte of the data */ + for (i = 0; i < length; i++) + { + GPR_SLICE_START_PTR (slice)[i] = (gpr_uint8) i; + } + /* And finally we must succeed in destroying the slice */ + gpr_slice_unref (slice); } - /* And finally we must succeed in destroying the slice */ - gpr_slice_unref(slice); - } } -static void do_nothing(void *ignored) {} +static void +do_nothing (void *ignored) +{ +} -static void test_slice_new_returns_something_sensible(void) { +static void +test_slice_new_returns_something_sensible (void) +{ gpr_uint8 x; - gpr_slice slice = gpr_slice_new(&x, 1, do_nothing); - GPR_ASSERT(slice.refcount); - GPR_ASSERT(slice.data.refcounted.bytes == &x); - GPR_ASSERT(slice.data.refcounted.length == 1); - gpr_slice_unref(slice); + gpr_slice slice = gpr_slice_new (&x, 1, do_nothing); + GPR_ASSERT (slice.refcount); + GPR_ASSERT (slice.data.refcounted.bytes == &x); + GPR_ASSERT (slice.data.refcounted.length == 1); + gpr_slice_unref (slice); } static int do_nothing_with_len_1_calls = 0; -static void do_nothing_with_len_1(void *ignored, size_t len) { - GPR_ASSERT(len == 1); +static void +do_nothing_with_len_1 (void *ignored, size_t len) +{ + GPR_ASSERT (len == 1); do_nothing_with_len_1_calls++; } -static void test_slice_new_with_len_returns_something_sensible(void) { +static void +test_slice_new_with_len_returns_something_sensible (void) +{ gpr_uint8 x; - gpr_slice slice = gpr_slice_new_with_len(&x, 1, do_nothing_with_len_1); - GPR_ASSERT(slice.refcount); - GPR_ASSERT(slice.data.refcounted.bytes == &x); - GPR_ASSERT(slice.data.refcounted.length == 1); - GPR_ASSERT(do_nothing_with_len_1_calls == 0); - gpr_slice_unref(slice); - GPR_ASSERT(do_nothing_with_len_1_calls == 1); + gpr_slice slice = gpr_slice_new_with_len (&x, 1, do_nothing_with_len_1); + GPR_ASSERT (slice.refcount); + GPR_ASSERT (slice.data.refcounted.bytes == &x); + GPR_ASSERT (slice.data.refcounted.length == 1); + GPR_ASSERT (do_nothing_with_len_1_calls == 0); + gpr_slice_unref (slice); + GPR_ASSERT (do_nothing_with_len_1_calls == 1); } -static void test_slice_sub_works(unsigned length) { +static void +test_slice_sub_works (unsigned length) +{ gpr_slice slice; gpr_slice sub; unsigned i, j, k; - LOG_TEST_NAME("test_slice_sub_works"); - gpr_log(GPR_INFO, "length=%d", length); + LOG_TEST_NAME ("test_slice_sub_works"); + gpr_log (GPR_INFO, "length=%d", length); /* Create a slice in which each byte is equal to the distance from it to the beginning of the slice. */ - slice = gpr_slice_malloc(length); - for (i = 0; i < length; i++) { - GPR_SLICE_START_PTR(slice)[i] = (gpr_uint8)i; - } + slice = gpr_slice_malloc (length); + for (i = 0; i < length; i++) + { + GPR_SLICE_START_PTR (slice)[i] = (gpr_uint8) i; + } /* Ensure that for all subsets length is correct and that we start on the correct byte. Additionally check that no copies were made. */ - for (i = 0; i < length; i++) { - for (j = i; j < length; j++) { - sub = gpr_slice_sub(slice, i, j); - GPR_ASSERT(GPR_SLICE_LENGTH(sub) == j - i); - for (k = 0; k < j - i; k++) { - GPR_ASSERT(GPR_SLICE_START_PTR(sub)[k] == (gpr_uint8)(i + k)); - } - gpr_slice_unref(sub); + for (i = 0; i < length; i++) + { + for (j = i; j < length; j++) + { + sub = gpr_slice_sub (slice, i, j); + GPR_ASSERT (GPR_SLICE_LENGTH (sub) == j - i); + for (k = 0; k < j - i; k++) + { + GPR_ASSERT (GPR_SLICE_START_PTR (sub)[k] == (gpr_uint8) (i + k)); + } + gpr_slice_unref (sub); + } } - } - gpr_slice_unref(slice); + gpr_slice_unref (slice); } -static void check_head_tail(gpr_slice slice, gpr_slice head, gpr_slice tail) { - GPR_ASSERT(GPR_SLICE_LENGTH(slice) == - GPR_SLICE_LENGTH(head) + GPR_SLICE_LENGTH(tail)); - GPR_ASSERT(0 == memcmp(GPR_SLICE_START_PTR(slice), GPR_SLICE_START_PTR(head), - GPR_SLICE_LENGTH(head))); - GPR_ASSERT(0 == memcmp(GPR_SLICE_START_PTR(slice) + GPR_SLICE_LENGTH(head), - GPR_SLICE_START_PTR(tail), GPR_SLICE_LENGTH(tail))); +static void +check_head_tail (gpr_slice slice, gpr_slice head, gpr_slice tail) +{ + GPR_ASSERT (GPR_SLICE_LENGTH (slice) == GPR_SLICE_LENGTH (head) + GPR_SLICE_LENGTH (tail)); + GPR_ASSERT (0 == memcmp (GPR_SLICE_START_PTR (slice), GPR_SLICE_START_PTR (head), GPR_SLICE_LENGTH (head))); + GPR_ASSERT (0 == memcmp (GPR_SLICE_START_PTR (slice) + GPR_SLICE_LENGTH (head), GPR_SLICE_START_PTR (tail), GPR_SLICE_LENGTH (tail))); } -static void test_slice_split_head_works(size_t length) { +static void +test_slice_split_head_works (size_t length) +{ gpr_slice slice; gpr_slice head, tail; size_t i; - LOG_TEST_NAME("test_slice_split_head_works"); - gpr_log(GPR_INFO, "length=%d", length); + LOG_TEST_NAME ("test_slice_split_head_works"); + gpr_log (GPR_INFO, "length=%d", length); /* Create a slice in which each byte is equal to the distance from it to the beginning of the slice. */ - slice = gpr_slice_malloc(length); - for (i = 0; i < length; i++) { - GPR_SLICE_START_PTR(slice)[i] = (gpr_uint8)i; - } + slice = gpr_slice_malloc (length); + for (i = 0; i < length; i++) + { + GPR_SLICE_START_PTR (slice)[i] = (gpr_uint8) i; + } /* Ensure that for all subsets length is correct and that we start on the correct byte. Additionally check that no copies were made. */ - for (i = 0; i < length; i++) { - tail = gpr_slice_ref(slice); - head = gpr_slice_split_head(&tail, i); - check_head_tail(slice, head, tail); - gpr_slice_unref(tail); - gpr_slice_unref(head); - } - - gpr_slice_unref(slice); + for (i = 0; i < length; i++) + { + tail = gpr_slice_ref (slice); + head = gpr_slice_split_head (&tail, i); + check_head_tail (slice, head, tail); + gpr_slice_unref (tail); + gpr_slice_unref (head); + } + + gpr_slice_unref (slice); } -static void test_slice_split_tail_works(size_t length) { +static void +test_slice_split_tail_works (size_t length) +{ gpr_slice slice; gpr_slice head, tail; size_t i; - LOG_TEST_NAME("test_slice_split_tail_works"); - gpr_log(GPR_INFO, "length=%d", length); + LOG_TEST_NAME ("test_slice_split_tail_works"); + gpr_log (GPR_INFO, "length=%d", length); /* Create a slice in which each byte is equal to the distance from it to the beginning of the slice. */ - slice = gpr_slice_malloc(length); - for (i = 0; i < length; i++) { - GPR_SLICE_START_PTR(slice)[i] = (gpr_uint8)i; - } + slice = gpr_slice_malloc (length); + for (i = 0; i < length; i++) + { + GPR_SLICE_START_PTR (slice)[i] = (gpr_uint8) i; + } /* Ensure that for all subsets length is correct and that we start on the correct byte. Additionally check that no copies were made. */ - for (i = 0; i < length; i++) { - head = gpr_slice_ref(slice); - tail = gpr_slice_split_tail(&head, i); - check_head_tail(slice, head, tail); - gpr_slice_unref(tail); - gpr_slice_unref(head); - } - - gpr_slice_unref(slice); + for (i = 0; i < length; i++) + { + head = gpr_slice_ref (slice); + tail = gpr_slice_split_tail (&head, i); + check_head_tail (slice, head, tail); + gpr_slice_unref (tail); + gpr_slice_unref (head); + } + + gpr_slice_unref (slice); } -static void test_slice_from_copied_string_works(void) { +static void +test_slice_from_copied_string_works (void) +{ static const char *text = "HELLO WORLD!"; gpr_slice slice; - LOG_TEST_NAME("test_slice_from_copied_string_works"); + LOG_TEST_NAME ("test_slice_from_copied_string_works"); - slice = gpr_slice_from_copied_string(text); - GPR_ASSERT(strlen(text) == GPR_SLICE_LENGTH(slice)); - GPR_ASSERT(0 == - memcmp(text, GPR_SLICE_START_PTR(slice), GPR_SLICE_LENGTH(slice))); - gpr_slice_unref(slice); + slice = gpr_slice_from_copied_string (text); + GPR_ASSERT (strlen (text) == GPR_SLICE_LENGTH (slice)); + GPR_ASSERT (0 == memcmp (text, GPR_SLICE_START_PTR (slice), GPR_SLICE_LENGTH (slice))); + gpr_slice_unref (slice); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ unsigned length; - grpc_test_init(argc, argv); - test_slice_malloc_returns_something_sensible(); - test_slice_new_returns_something_sensible(); - test_slice_new_with_len_returns_something_sensible(); - for (length = 0; length < 128; length++) { - test_slice_sub_works(length); - test_slice_split_head_works(length); - test_slice_split_tail_works(length); - } - test_slice_from_copied_string_works(); + grpc_test_init (argc, argv); + test_slice_malloc_returns_something_sensible (); + test_slice_new_returns_something_sensible (); + test_slice_new_with_len_returns_something_sensible (); + for (length = 0; length < 128; length++) + { + test_slice_sub_works (length); + test_slice_split_head_works (length); + test_slice_split_tail_works (length); + } + test_slice_from_copied_string_works (); return 0; } diff --git a/test/core/support/stack_lockfree_test.c b/test/core/support/stack_lockfree_test.c index 0f49e6fa52a..8ad4ad26dfd 100644 --- a/test/core/support/stack_lockfree_test.c +++ b/test/core/support/stack_lockfree_test.c @@ -46,42 +46,51 @@ #define MAX_THREADS 32 -static void test_serial_sized(size_t size) { - gpr_stack_lockfree *stack = gpr_stack_lockfree_create(size); +static void +test_serial_sized (size_t size) +{ + gpr_stack_lockfree *stack = gpr_stack_lockfree_create (size); size_t i; size_t j; /* First try popping empty */ - GPR_ASSERT(gpr_stack_lockfree_pop(stack) == -1); + GPR_ASSERT (gpr_stack_lockfree_pop (stack) == -1); /* Now add one item and check it */ - gpr_stack_lockfree_push(stack, 3); - GPR_ASSERT(gpr_stack_lockfree_pop(stack) == 3); - GPR_ASSERT(gpr_stack_lockfree_pop(stack) == -1); + gpr_stack_lockfree_push (stack, 3); + GPR_ASSERT (gpr_stack_lockfree_pop (stack) == 3); + GPR_ASSERT (gpr_stack_lockfree_pop (stack) == -1); /* Now add repeatedly more items and check them */ - for (i = 1; i < size; i *= 2) { - for (j = 0; j <= i; j++) { - GPR_ASSERT(gpr_stack_lockfree_push(stack, (int)j) == (j == 0)); + for (i = 1; i < size; i *= 2) + { + for (j = 0; j <= i; j++) + { + GPR_ASSERT (gpr_stack_lockfree_push (stack, (int) j) == (j == 0)); + } + for (j = 0; j <= i; j++) + { + GPR_ASSERT (gpr_stack_lockfree_pop (stack) == (int) (i - j)); + } + GPR_ASSERT (gpr_stack_lockfree_pop (stack) == -1); } - for (j = 0; j <= i; j++) { - GPR_ASSERT(gpr_stack_lockfree_pop(stack) == (int)(i - j)); - } - GPR_ASSERT(gpr_stack_lockfree_pop(stack) == -1); - } - gpr_stack_lockfree_destroy(stack); + gpr_stack_lockfree_destroy (stack); } -static void test_serial() { +static void +test_serial () +{ size_t i; - for (i = 128; i < MAX_STACK_SIZE; i *= 2) { - test_serial_sized(i); - } - test_serial_sized(MAX_STACK_SIZE); + for (i = 128; i < MAX_STACK_SIZE; i *= 2) + { + test_serial_sized (i); + } + test_serial_sized (MAX_STACK_SIZE); } -struct test_arg { +struct test_arg +{ gpr_stack_lockfree *stack; int stack_size; int nthreads; @@ -89,67 +98,83 @@ struct test_arg { int sum; }; -static void test_mt_body(void *v) { - struct test_arg *arg = (struct test_arg *)v; +static void +test_mt_body (void *v) +{ + struct test_arg *arg = (struct test_arg *) v; int lo, hi; int i; int res; lo = arg->rank * arg->stack_size / arg->nthreads; hi = (arg->rank + 1) * arg->stack_size / arg->nthreads; - for (i = lo; i < hi; i++) { - gpr_stack_lockfree_push(arg->stack, i); - if ((res = gpr_stack_lockfree_pop(arg->stack)) != -1) { + for (i = lo; i < hi; i++) + { + gpr_stack_lockfree_push (arg->stack, i); + if ((res = gpr_stack_lockfree_pop (arg->stack)) != -1) + { + arg->sum += res; + } + } + while ((res = gpr_stack_lockfree_pop (arg->stack)) != -1) + { arg->sum += res; } - } - while ((res = gpr_stack_lockfree_pop(arg->stack)) != -1) { - arg->sum += res; - } } -static void test_mt_sized(size_t size, int nth) { +static void +test_mt_sized (size_t size, int nth) +{ gpr_stack_lockfree *stack; struct test_arg args[MAX_THREADS]; gpr_thd_id thds[MAX_THREADS]; int sum; int i; - gpr_thd_options options = gpr_thd_options_default(); - - stack = gpr_stack_lockfree_create(size); - for (i = 0; i < nth; i++) { - args[i].stack = stack; - args[i].stack_size = (int)size; - args[i].nthreads = nth; - args[i].rank = i; - args[i].sum = 0; - } - gpr_thd_options_set_joinable(&options); - for (i = 0; i < nth; i++) { - GPR_ASSERT(gpr_thd_new(&thds[i], test_mt_body, &args[i], &options)); - } + gpr_thd_options options = gpr_thd_options_default (); + + stack = gpr_stack_lockfree_create (size); + for (i = 0; i < nth; i++) + { + args[i].stack = stack; + args[i].stack_size = (int) size; + args[i].nthreads = nth; + args[i].rank = i; + args[i].sum = 0; + } + gpr_thd_options_set_joinable (&options); + for (i = 0; i < nth; i++) + { + GPR_ASSERT (gpr_thd_new (&thds[i], test_mt_body, &args[i], &options)); + } sum = 0; - for (i = 0; i < nth; i++) { - gpr_thd_join(thds[i]); - sum = sum + args[i].sum; - } - GPR_ASSERT((unsigned)sum == ((unsigned)size * (size - 1)) / 2); - gpr_stack_lockfree_destroy(stack); + for (i = 0; i < nth; i++) + { + gpr_thd_join (thds[i]); + sum = sum + args[i].sum; + } + GPR_ASSERT ((unsigned) sum == ((unsigned) size * (size - 1)) / 2); + gpr_stack_lockfree_destroy (stack); } -static void test_mt() { +static void +test_mt () +{ size_t size; int nth; - for (nth = 1; nth < MAX_THREADS; nth++) { - for (size = 128; size < MAX_STACK_SIZE; size *= 2) { - test_mt_sized(size, nth); + for (nth = 1; nth < MAX_THREADS; nth++) + { + for (size = 128; size < MAX_STACK_SIZE; size *= 2) + { + test_mt_sized (size, nth); + } + test_mt_sized (MAX_STACK_SIZE, nth); } - test_mt_sized(MAX_STACK_SIZE, nth); - } } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_serial(); - test_mt(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_serial (); + test_mt (); return 0; } diff --git a/test/core/support/string_test.c b/test/core/support/string_test.c index f62cbe34358..faf4d01a110 100644 --- a/test/core/support/string_test.c +++ b/test/core/support/string_test.c @@ -45,256 +45,273 @@ #define LOG_TEST_NAME(x) gpr_log(GPR_INFO, "%s", x) -static void test_strdup(void) { +static void +test_strdup (void) +{ static const char *src1 = "hello world"; char *dst1; - LOG_TEST_NAME("test_strdup"); + LOG_TEST_NAME ("test_strdup"); - dst1 = gpr_strdup(src1); - GPR_ASSERT(0 == strcmp(src1, dst1)); - gpr_free(dst1); + dst1 = gpr_strdup (src1); + GPR_ASSERT (0 == strcmp (src1, dst1)); + gpr_free (dst1); - GPR_ASSERT(NULL == gpr_strdup(NULL)); + GPR_ASSERT (NULL == gpr_strdup (NULL)); } -static void expect_dump(const char *buf, size_t len, gpr_uint32 flags, - const char *result) { - char *got = gpr_dump(buf, len, flags); - GPR_ASSERT(0 == strcmp(got, result)); - gpr_free(got); +static void +expect_dump (const char *buf, size_t len, gpr_uint32 flags, const char *result) +{ + char *got = gpr_dump (buf, len, flags); + GPR_ASSERT (0 == strcmp (got, result)); + gpr_free (got); } -static void test_dump(void) { - LOG_TEST_NAME("test_dump"); - expect_dump("\x01", 1, GPR_DUMP_HEX, "01"); - expect_dump("\x01", 1, GPR_DUMP_HEX | GPR_DUMP_ASCII, "01 '.'"); - expect_dump("\x01\x02", 2, GPR_DUMP_HEX, "01 02"); - expect_dump("\x01\x23\x45\x67\x89\xab\xcd\xef", 8, GPR_DUMP_HEX, - "01 23 45 67 89 ab cd ef"); - expect_dump("ab", 2, GPR_DUMP_HEX | GPR_DUMP_ASCII, "61 62 'ab'"); +static void +test_dump (void) +{ + LOG_TEST_NAME ("test_dump"); + expect_dump ("\x01", 1, GPR_DUMP_HEX, "01"); + expect_dump ("\x01", 1, GPR_DUMP_HEX | GPR_DUMP_ASCII, "01 '.'"); + expect_dump ("\x01\x02", 2, GPR_DUMP_HEX, "01 02"); + expect_dump ("\x01\x23\x45\x67\x89\xab\xcd\xef", 8, GPR_DUMP_HEX, "01 23 45 67 89 ab cd ef"); + expect_dump ("ab", 2, GPR_DUMP_HEX | GPR_DUMP_ASCII, "61 62 'ab'"); } -static void expect_slice_dump(gpr_slice slice, gpr_uint32 flags, - const char *result) { - char *got = gpr_dump_slice(slice, flags); - GPR_ASSERT(0 == strcmp(got, result)); - gpr_free(got); - gpr_slice_unref(slice); +static void +expect_slice_dump (gpr_slice slice, gpr_uint32 flags, const char *result) +{ + char *got = gpr_dump_slice (slice, flags); + GPR_ASSERT (0 == strcmp (got, result)); + gpr_free (got); + gpr_slice_unref (slice); } -static void test_dump_slice(void) { +static void +test_dump_slice (void) +{ static const char *text = "HELLO WORLD!"; - static const char *long_text = - "It was a bright cold day in April, and the clocks were striking " - "thirteen. Winston Smith, his chin nuzzled into his breast in an effort " - "to escape the vile wind, slipped quickly through the glass doors of " - "Victory Mansions, though not quickly enough to prevent a swirl of " - "gritty dust from entering along with him."; - - LOG_TEST_NAME("test_dump_slice"); - - expect_slice_dump(gpr_slice_from_copied_string(text), GPR_DUMP_ASCII, text); - expect_slice_dump(gpr_slice_from_copied_string(long_text), GPR_DUMP_ASCII, - long_text); - expect_slice_dump(gpr_slice_from_copied_buffer("\x01", 1), GPR_DUMP_HEX, - "01"); - expect_slice_dump(gpr_slice_from_copied_buffer("\x01", 1), - GPR_DUMP_HEX | GPR_DUMP_ASCII, "01 '.'"); + static const char *long_text = "It was a bright cold day in April, and the clocks were striking " "thirteen. Winston Smith, his chin nuzzled into his breast in an effort " "to escape the vile wind, slipped quickly through the glass doors of " "Victory Mansions, though not quickly enough to prevent a swirl of " "gritty dust from entering along with him."; + + LOG_TEST_NAME ("test_dump_slice"); + + expect_slice_dump (gpr_slice_from_copied_string (text), GPR_DUMP_ASCII, text); + expect_slice_dump (gpr_slice_from_copied_string (long_text), GPR_DUMP_ASCII, long_text); + expect_slice_dump (gpr_slice_from_copied_buffer ("\x01", 1), GPR_DUMP_HEX, "01"); + expect_slice_dump (gpr_slice_from_copied_buffer ("\x01", 1), GPR_DUMP_HEX | GPR_DUMP_ASCII, "01 '.'"); } -static void test_pu32_fail(const char *s) { +static void +test_pu32_fail (const char *s) +{ gpr_uint32 out; - GPR_ASSERT(!gpr_parse_bytes_to_uint32(s, strlen(s), &out)); + GPR_ASSERT (!gpr_parse_bytes_to_uint32 (s, strlen (s), &out)); } -static void test_pu32_succeed(const char *s, gpr_uint32 want) { +static void +test_pu32_succeed (const char *s, gpr_uint32 want) +{ gpr_uint32 out; - GPR_ASSERT(gpr_parse_bytes_to_uint32(s, strlen(s), &out)); - GPR_ASSERT(out == want); + GPR_ASSERT (gpr_parse_bytes_to_uint32 (s, strlen (s), &out)); + GPR_ASSERT (out == want); } -static void test_parse_uint32(void) { - LOG_TEST_NAME("test_parse_uint32"); - - test_pu32_fail("-1"); - test_pu32_fail("a"); - test_pu32_fail(""); - test_pu32_succeed("0", 0); - test_pu32_succeed("1", 1); - test_pu32_succeed("2", 2); - test_pu32_succeed("3", 3); - test_pu32_succeed("4", 4); - test_pu32_succeed("5", 5); - test_pu32_succeed("6", 6); - test_pu32_succeed("7", 7); - test_pu32_succeed("8", 8); - test_pu32_succeed("9", 9); - test_pu32_succeed("10", 10); - test_pu32_succeed("11", 11); - test_pu32_succeed("12", 12); - test_pu32_succeed("13", 13); - test_pu32_succeed("14", 14); - test_pu32_succeed("15", 15); - test_pu32_succeed("16", 16); - test_pu32_succeed("17", 17); - test_pu32_succeed("18", 18); - test_pu32_succeed("19", 19); - test_pu32_succeed("1234567890", 1234567890); - test_pu32_succeed("4294967295", 4294967295u); - test_pu32_fail("4294967296"); - test_pu32_fail("4294967297"); - test_pu32_fail("4294967298"); - test_pu32_fail("4294967299"); +static void +test_parse_uint32 (void) +{ + LOG_TEST_NAME ("test_parse_uint32"); + + test_pu32_fail ("-1"); + test_pu32_fail ("a"); + test_pu32_fail (""); + test_pu32_succeed ("0", 0); + test_pu32_succeed ("1", 1); + test_pu32_succeed ("2", 2); + test_pu32_succeed ("3", 3); + test_pu32_succeed ("4", 4); + test_pu32_succeed ("5", 5); + test_pu32_succeed ("6", 6); + test_pu32_succeed ("7", 7); + test_pu32_succeed ("8", 8); + test_pu32_succeed ("9", 9); + test_pu32_succeed ("10", 10); + test_pu32_succeed ("11", 11); + test_pu32_succeed ("12", 12); + test_pu32_succeed ("13", 13); + test_pu32_succeed ("14", 14); + test_pu32_succeed ("15", 15); + test_pu32_succeed ("16", 16); + test_pu32_succeed ("17", 17); + test_pu32_succeed ("18", 18); + test_pu32_succeed ("19", 19); + test_pu32_succeed ("1234567890", 1234567890); + test_pu32_succeed ("4294967295", 4294967295u); + test_pu32_fail ("4294967296"); + test_pu32_fail ("4294967297"); + test_pu32_fail ("4294967298"); + test_pu32_fail ("4294967299"); } -static void test_asprintf(void) { +static void +test_asprintf (void) +{ char *buf; int i, j; - LOG_TEST_NAME("test_asprintf"); + LOG_TEST_NAME ("test_asprintf"); /* Print an empty string. */ - GPR_ASSERT(gpr_asprintf(&buf, "") == 0); - GPR_ASSERT(buf[0] == '\0'); - gpr_free(buf); + GPR_ASSERT (gpr_asprintf (&buf, "") == 0); + GPR_ASSERT (buf[0] == '\0'); + gpr_free (buf); /* Print strings of various lengths. */ - for (i = 1; i < 100; i++) { - GPR_ASSERT(gpr_asprintf(&buf, "%0*d", i, 1) == i); - - /* The buffer should resemble "000001\0". */ - for (j = 0; j < i - 2; j++) { - GPR_ASSERT(buf[j] == '0'); + for (i = 1; i < 100; i++) + { + GPR_ASSERT (gpr_asprintf (&buf, "%0*d", i, 1) == i); + + /* The buffer should resemble "000001\0". */ + for (j = 0; j < i - 2; j++) + { + GPR_ASSERT (buf[j] == '0'); + } + GPR_ASSERT (buf[i - 1] == '1'); + GPR_ASSERT (buf[i] == '\0'); + gpr_free (buf); } - GPR_ASSERT(buf[i - 1] == '1'); - GPR_ASSERT(buf[i] == '\0'); - gpr_free(buf); - } } -static void test_strjoin(void) { - const char *parts[4] = {"one", "two", "three", "four"}; +static void +test_strjoin (void) +{ + const char *parts[4] = { "one", "two", "three", "four" }; size_t joined_len; char *joined; - LOG_TEST_NAME("test_strjoin"); + LOG_TEST_NAME ("test_strjoin"); - joined = gpr_strjoin(parts, 4, &joined_len); - GPR_ASSERT(0 == strcmp("onetwothreefour", joined)); - gpr_free(joined); + joined = gpr_strjoin (parts, 4, &joined_len); + GPR_ASSERT (0 == strcmp ("onetwothreefour", joined)); + gpr_free (joined); - joined = gpr_strjoin(parts, 0, &joined_len); - GPR_ASSERT(0 == strcmp("", joined)); - gpr_free(joined); + joined = gpr_strjoin (parts, 0, &joined_len); + GPR_ASSERT (0 == strcmp ("", joined)); + gpr_free (joined); - joined = gpr_strjoin(parts, 1, &joined_len); - GPR_ASSERT(0 == strcmp("one", joined)); - gpr_free(joined); + joined = gpr_strjoin (parts, 1, &joined_len); + GPR_ASSERT (0 == strcmp ("one", joined)); + gpr_free (joined); } -static void test_strjoin_sep(void) { - const char *parts[4] = {"one", "two", "three", "four"}; +static void +test_strjoin_sep (void) +{ + const char *parts[4] = { "one", "two", "three", "four" }; size_t joined_len; char *joined; - LOG_TEST_NAME("test_strjoin_sep"); + LOG_TEST_NAME ("test_strjoin_sep"); - joined = gpr_strjoin_sep(parts, 4, ", ", &joined_len); - GPR_ASSERT(0 == strcmp("one, two, three, four", joined)); - gpr_free(joined); + joined = gpr_strjoin_sep (parts, 4, ", ", &joined_len); + GPR_ASSERT (0 == strcmp ("one, two, three, four", joined)); + gpr_free (joined); /* empty separator */ - joined = gpr_strjoin_sep(parts, 4, "", &joined_len); - GPR_ASSERT(0 == strcmp("onetwothreefour", joined)); - gpr_free(joined); + joined = gpr_strjoin_sep (parts, 4, "", &joined_len); + GPR_ASSERT (0 == strcmp ("onetwothreefour", joined)); + gpr_free (joined); /* degenerated case specifying zero input parts */ - joined = gpr_strjoin_sep(parts, 0, ", ", &joined_len); - GPR_ASSERT(0 == strcmp("", joined)); - gpr_free(joined); + joined = gpr_strjoin_sep (parts, 0, ", ", &joined_len); + GPR_ASSERT (0 == strcmp ("", joined)); + gpr_free (joined); /* single part should have no separator */ - joined = gpr_strjoin_sep(parts, 1, ", ", &joined_len); - GPR_ASSERT(0 == strcmp("one", joined)); - gpr_free(joined); + joined = gpr_strjoin_sep (parts, 1, ", ", &joined_len); + GPR_ASSERT (0 == strcmp ("one", joined)); + gpr_free (joined); } -static void test_strsplit(void) { +static void +test_strsplit (void) +{ gpr_slice_buffer *parts; gpr_slice str; - LOG_TEST_NAME("test_strsplit"); + LOG_TEST_NAME ("test_strsplit"); - parts = gpr_malloc(sizeof(gpr_slice_buffer)); - gpr_slice_buffer_init(parts); + parts = gpr_malloc (sizeof (gpr_slice_buffer)); + gpr_slice_buffer_init (parts); - str = gpr_slice_from_copied_string("one, two, three, four"); - gpr_slice_split(str, ", ", parts); - GPR_ASSERT(4 == parts->count); - GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[0], "one")); - GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[1], "two")); - GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[2], "three")); - GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[3], "four")); - gpr_slice_buffer_reset_and_unref(parts); - gpr_slice_unref(str); + str = gpr_slice_from_copied_string ("one, two, three, four"); + gpr_slice_split (str, ", ", parts); + GPR_ASSERT (4 == parts->count); + GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[0], "one")); + GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[1], "two")); + GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[2], "three")); + GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[3], "four")); + gpr_slice_buffer_reset_and_unref (parts); + gpr_slice_unref (str); /* separator not present in string */ - str = gpr_slice_from_copied_string("one two three four"); - gpr_slice_split(str, ", ", parts); - GPR_ASSERT(1 == parts->count); - GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[0], "one two three four")); - gpr_slice_buffer_reset_and_unref(parts); - gpr_slice_unref(str); + str = gpr_slice_from_copied_string ("one two three four"); + gpr_slice_split (str, ", ", parts); + GPR_ASSERT (1 == parts->count); + GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[0], "one two three four")); + gpr_slice_buffer_reset_and_unref (parts); + gpr_slice_unref (str); /* separator at the end */ - str = gpr_slice_from_copied_string("foo,"); - gpr_slice_split(str, ",", parts); - GPR_ASSERT(2 == parts->count); - GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[0], "foo")); - GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[1], "")); - gpr_slice_buffer_reset_and_unref(parts); - gpr_slice_unref(str); + str = gpr_slice_from_copied_string ("foo,"); + gpr_slice_split (str, ",", parts); + GPR_ASSERT (2 == parts->count); + GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[0], "foo")); + GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[1], "")); + gpr_slice_buffer_reset_and_unref (parts); + gpr_slice_unref (str); /* separator at the beginning */ - str = gpr_slice_from_copied_string(",foo"); - gpr_slice_split(str, ",", parts); - GPR_ASSERT(2 == parts->count); - GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[0], "")); - GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[1], "foo")); - gpr_slice_buffer_reset_and_unref(parts); - gpr_slice_unref(str); + str = gpr_slice_from_copied_string (",foo"); + gpr_slice_split (str, ",", parts); + GPR_ASSERT (2 == parts->count); + GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[0], "")); + GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[1], "foo")); + gpr_slice_buffer_reset_and_unref (parts); + gpr_slice_unref (str); /* standalone separator */ - str = gpr_slice_from_copied_string(","); - gpr_slice_split(str, ",", parts); - GPR_ASSERT(2 == parts->count); - GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[0], "")); - GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[1], "")); - gpr_slice_buffer_reset_and_unref(parts); - gpr_slice_unref(str); + str = gpr_slice_from_copied_string (","); + gpr_slice_split (str, ",", parts); + GPR_ASSERT (2 == parts->count); + GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[0], "")); + GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[1], "")); + gpr_slice_buffer_reset_and_unref (parts); + gpr_slice_unref (str); /* empty input */ - str = gpr_slice_from_copied_string(""); - gpr_slice_split(str, ", ", parts); - GPR_ASSERT(1 == parts->count); - GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[0], "")); - gpr_slice_buffer_reset_and_unref(parts); - gpr_slice_unref(str); - - gpr_slice_buffer_destroy(parts); - gpr_free(parts); + str = gpr_slice_from_copied_string (""); + gpr_slice_split (str, ", ", parts); + GPR_ASSERT (1 == parts->count); + GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[0], "")); + gpr_slice_buffer_reset_and_unref (parts); + gpr_slice_unref (str); + + gpr_slice_buffer_destroy (parts); + gpr_free (parts); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_strdup(); - test_dump(); - test_dump_slice(); - test_parse_uint32(); - test_asprintf(); - test_strjoin(); - test_strjoin_sep(); - test_strsplit(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_strdup (); + test_dump (); + test_dump_slice (); + test_parse_uint32 (); + test_asprintf (); + test_strjoin (); + test_strjoin_sep (); + test_strsplit (); return 0; } diff --git a/test/core/support/sync_test.c b/test/core/support/sync_test.c index f729eb0b924..72788a75bac 100644 --- a/test/core/support/sync_test.c +++ b/test/core/support/sync_test.c @@ -49,37 +49,44 @@ #define N 4 -typedef struct queue { - gpr_cv non_empty; /* Signalled when length becomes non-zero. */ - gpr_cv non_full; /* Signalled when length becomes non-N. */ - gpr_mu mu; /* Protects all fields below. - (That is, except during initialization or - destruction, the fields below should be accessed - only by a thread that holds mu.) */ - int head; /* Index of head of queue 0..N-1. */ - int length; /* Number of valid elements in queue 0..N. */ - int elem[N]; /* elem[head .. head+length-1] are queue elements. */ +typedef struct queue +{ + gpr_cv non_empty; /* Signalled when length becomes non-zero. */ + gpr_cv non_full; /* Signalled when length becomes non-N. */ + gpr_mu mu; /* Protects all fields below. + (That is, except during initialization or + destruction, the fields below should be accessed + only by a thread that holds mu.) */ + int head; /* Index of head of queue 0..N-1. */ + int length; /* Number of valid elements in queue 0..N. */ + int elem[N]; /* elem[head .. head+length-1] are queue elements. */ } queue; /* Initialize *q. */ -void queue_init(queue *q) { - gpr_mu_init(&q->mu); - gpr_cv_init(&q->non_empty); - gpr_cv_init(&q->non_full); +void +queue_init (queue * q) +{ + gpr_mu_init (&q->mu); + gpr_cv_init (&q->non_empty); + gpr_cv_init (&q->non_full); q->head = 0; q->length = 0; } /* Free storage associated with *q. */ -void queue_destroy(queue *q) { - gpr_mu_destroy(&q->mu); - gpr_cv_destroy(&q->non_empty); - gpr_cv_destroy(&q->non_full); +void +queue_destroy (queue * q) +{ + gpr_mu_destroy (&q->mu); + gpr_cv_destroy (&q->non_empty); + gpr_cv_destroy (&q->non_full); } /* Wait until there is room in *q, then append x to *q. */ -void queue_append(queue *q, int x) { - gpr_mu_lock(&q->mu); +void +queue_append (queue * q, int x) +{ + gpr_mu_lock (&q->mu); /* To wait for a predicate without a deadline, loop on the negation of the predicate, and use gpr_cv_wait(..., gpr_inf_future(GPR_CLOCK_REALTIME)) inside the loop @@ -87,78 +94,91 @@ void queue_append(queue *q, int x) { makes the condition true should use gpr_cv_broadcast() on the 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)); - } - if (q->length == 0) { /* Wake threads blocked in queue_remove(). */ - /* It's normal to use gpr_cv_broadcast() or gpr_signal() while - holding the lock. */ - gpr_cv_broadcast(&q->non_empty); - } + while (q->length == N) + { + gpr_cv_wait (&q->non_full, &q->mu, gpr_inf_future (GPR_CLOCK_REALTIME)); + } + if (q->length == 0) + { /* Wake threads blocked in queue_remove(). */ + /* It's normal to use gpr_cv_broadcast() or gpr_signal() while + holding the lock. */ + gpr_cv_broadcast (&q->non_empty); + } q->elem[(q->head + q->length) % N] = x; q->length++; - gpr_mu_unlock(&q->mu); + gpr_mu_unlock (&q->mu); } /* If it can be done without blocking, append x to *q and return non-zero. Otherwise return 0. */ -int queue_try_append(queue *q, int x) { +int +queue_try_append (queue * q, int x) +{ int result = 0; - if (gpr_mu_trylock(&q->mu)) { - if (q->length != N) { - if (q->length == 0) { /* Wake threads blocked in queue_remove(). */ - gpr_cv_broadcast(&q->non_empty); - } - q->elem[(q->head + q->length) % N] = x; - q->length++; - result = 1; + if (gpr_mu_trylock (&q->mu)) + { + if (q->length != N) + { + if (q->length == 0) + { /* Wake threads blocked in queue_remove(). */ + gpr_cv_broadcast (&q->non_empty); + } + q->elem[(q->head + q->length) % N] = x; + q->length++; + result = 1; + } + gpr_mu_unlock (&q->mu); } - gpr_mu_unlock(&q->mu); - } return result; } /* Wait until the *q is non-empty or deadline abs_deadline passes. If the queue is non-empty, remove its head entry, place it in *head, and return non-zero. Otherwise return 0. */ -int queue_remove(queue *q, int *head, gpr_timespec abs_deadline) { +int +queue_remove (queue * q, int *head, gpr_timespec abs_deadline) +{ int result = 0; - gpr_mu_lock(&q->mu); + gpr_mu_lock (&q->mu); /* To wait for a predicate with a deadline, loop on the negation of the predicate or until gpr_cv_wait() returns true. Code that makes the condition true should use gpr_cv_broadcast() on the corresponding condition variable. The predicate must be on state protected by the lock. */ - while (q->length == 0 && !gpr_cv_wait(&q->non_empty, &q->mu, abs_deadline)) { - } - if (q->length != 0) { /* Queue is non-empty. */ - result = 1; - if (q->length == N) { /* Wake threads blocked in queue_append(). */ - gpr_cv_broadcast(&q->non_full); + while (q->length == 0 && !gpr_cv_wait (&q->non_empty, &q->mu, abs_deadline)) + { } - *head = q->elem[q->head]; - q->head = (q->head + 1) % N; - q->length--; - } /* else deadline exceeded */ - gpr_mu_unlock(&q->mu); + if (q->length != 0) + { /* Queue is non-empty. */ + result = 1; + if (q->length == N) + { /* Wake threads blocked in queue_append(). */ + gpr_cv_broadcast (&q->non_full); + } + *head = q->elem[q->head]; + q->head = (q->head + 1) % N; + q->length--; + } /* else deadline exceeded */ + gpr_mu_unlock (&q->mu); return result; } /* ------------------------------------------------- */ /* Tests for gpr_mu and gpr_cv, and the queue example. */ -struct test { - int threads; /* number of threads */ +struct test +{ + int threads; /* number of threads */ - gpr_int64 iterations; /* number of iterations per thread */ + gpr_int64 iterations; /* number of iterations per thread */ gpr_int64 counter; - int thread_count; /* used to allocate thread ids */ - int done; /* threads not yet completed */ + int thread_count; /* used to allocate thread ids */ + int done; /* threads not yet completed */ - gpr_mu mu; /* protects iterations, counter, thread_count, done */ + gpr_mu mu; /* protects iterations, counter, thread_count, done */ - gpr_cv cv; /* signalling depends on test */ + gpr_cv cv; /* signalling depends on test */ - gpr_cv done_cv; /* signalled when done == 0 */ + gpr_cv done_cv; /* signalled when done == 0 */ queue q; @@ -170,287 +190,338 @@ struct test { }; /* Return pointer to a new struct test. */ -static struct test *test_new(int threads, gpr_int64 iterations) { - struct test *m = gpr_malloc(sizeof(*m)); +static struct test * +test_new (int threads, gpr_int64 iterations) +{ + struct test *m = gpr_malloc (sizeof (*m)); m->threads = threads; m->iterations = iterations; m->counter = 0; m->thread_count = 0; m->done = threads; - gpr_mu_init(&m->mu); - gpr_cv_init(&m->cv); - gpr_cv_init(&m->done_cv); - queue_init(&m->q); - gpr_stats_init(&m->stats_counter, 0); - gpr_ref_init(&m->refcount, 0); - gpr_ref_init(&m->thread_refcount, threads); - gpr_event_init(&m->event); + gpr_mu_init (&m->mu); + gpr_cv_init (&m->cv); + gpr_cv_init (&m->done_cv); + queue_init (&m->q); + gpr_stats_init (&m->stats_counter, 0); + gpr_ref_init (&m->refcount, 0); + gpr_ref_init (&m->thread_refcount, threads); + gpr_event_init (&m->event); return m; } /* Return pointer to a new struct test. */ -static void test_destroy(struct test *m) { - gpr_mu_destroy(&m->mu); - gpr_cv_destroy(&m->cv); - gpr_cv_destroy(&m->done_cv); - queue_destroy(&m->q); - gpr_free(m); +static void +test_destroy (struct test *m) +{ + gpr_mu_destroy (&m->mu); + gpr_cv_destroy (&m->cv); + gpr_cv_destroy (&m->done_cv); + queue_destroy (&m->q); + gpr_free (m); } /* Create m->threads threads, each running (*body)(m) */ -static void test_create_threads(struct test *m, void (*body)(void *arg)) { +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, NULL)); - } + for (i = 0; i != m->threads; i++) + { + GPR_ASSERT (gpr_thd_new (&id, body, m, NULL)); + } } /* Wait until all threads report done. */ -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_mu_unlock(&m->mu); +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_mu_unlock (&m->mu); } /* Get an integer thread id in the raneg 0..threads-1 */ -static int thread_id(struct test *m) { +static int +thread_id (struct test *m) +{ int id; - gpr_mu_lock(&m->mu); + gpr_mu_lock (&m->mu); id = m->thread_count++; - gpr_mu_unlock(&m->mu); + gpr_mu_unlock (&m->mu); return id; } /* Indicate that a thread is done, by decrementing m->done and signalling done_cv if m->done==0. */ -static void mark_thread_done(struct test *m) { - gpr_mu_lock(&m->mu); - GPR_ASSERT(m->done != 0); +static void +mark_thread_done (struct test *m) +{ + gpr_mu_lock (&m->mu); + GPR_ASSERT (m->done != 0); m->done--; - if (m->done == 0) { - gpr_cv_signal(&m->done_cv); - } - gpr_mu_unlock(&m->mu); + if (m->done == 0) + { + gpr_cv_signal (&m->done_cv); + } + gpr_mu_unlock (&m->mu); } /* Test several threads running (*body)(struct test *m) for increasing settings of m->iterations, until about timeout_s to 2*timeout_s seconds have elapsed. If extra!=NULL, run (*extra)(m) in an additional thread. */ -static void test(const char *name, void (*body)(void *m), - void (*extra)(void *m), int timeout_s) { +static void +test (const char *name, void (*body) (void *m), void (*extra) (void *m), int timeout_s) +{ gpr_int64 iterations = 1024; struct test *m; - gpr_timespec start = gpr_now(GPR_CLOCK_REALTIME); + gpr_timespec start = gpr_now (GPR_CLOCK_REALTIME); gpr_timespec time_taken; - gpr_timespec deadline = gpr_time_add( - start, gpr_time_from_micros(timeout_s * 1000000, GPR_TIMESPAN)); - fprintf(stderr, "%s:", name); - while (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), deadline) < 0) { - iterations <<= 1; - fprintf(stderr, " %ld", (long)iterations); - m = test_new(10, iterations); - if (extra != NULL) { - gpr_thd_id id; - GPR_ASSERT(gpr_thd_new(&id, extra, m, NULL)); - m->done++; /* one more thread to wait for */ - } - test_create_threads(m, body); - test_wait(m); - if (m->counter != m->threads * m->iterations) { - fprintf(stderr, "counter %ld threads %d iterations %ld\n", - (long)m->counter, m->threads, (long)m->iterations); - GPR_ASSERT(0); + gpr_timespec deadline = gpr_time_add (start, gpr_time_from_micros (timeout_s * 1000000, GPR_TIMESPAN)); + fprintf (stderr, "%s:", name); + while (gpr_time_cmp (gpr_now (GPR_CLOCK_REALTIME), deadline) < 0) + { + iterations <<= 1; + fprintf (stderr, " %ld", (long) iterations); + m = test_new (10, iterations); + if (extra != NULL) + { + gpr_thd_id id; + GPR_ASSERT (gpr_thd_new (&id, extra, m, NULL)); + m->done++; /* one more thread to wait for */ + } + test_create_threads (m, body); + test_wait (m); + if (m->counter != m->threads * m->iterations) + { + fprintf (stderr, "counter %ld threads %d iterations %ld\n", (long) m->counter, m->threads, (long) m->iterations); + GPR_ASSERT (0); + } + test_destroy (m); } - test_destroy(m); - } - time_taken = gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), start); - fprintf(stderr, " done %ld.%09d s\n", (long)time_taken.tv_sec, - (int)time_taken.tv_nsec); + time_taken = gpr_time_sub (gpr_now (GPR_CLOCK_REALTIME), start); + fprintf (stderr, " done %ld.%09d s\n", (long) time_taken.tv_sec, (int) time_taken.tv_nsec); } /* Increment m->counter on each iteration; then mark thread as done. */ -static void inc(void *v /*=m*/) { +static void +inc (void *v /*=m*/ ) +{ struct test *m = v; gpr_int64 i; - for (i = 0; i != m->iterations; i++) { - gpr_mu_lock(&m->mu); - m->counter++; - gpr_mu_unlock(&m->mu); - } - mark_thread_done(m); + for (i = 0; i != m->iterations; i++) + { + gpr_mu_lock (&m->mu); + m->counter++; + gpr_mu_unlock (&m->mu); + } + mark_thread_done (m); } /* Increment m->counter under lock acquired with trylock, m->iterations times; then mark thread as done. */ -static void inctry(void *v /*=m*/) { +static void +inctry (void *v /*=m*/ ) +{ struct test *m = v; gpr_int64 i; - for (i = 0; i != m->iterations;) { - if (gpr_mu_trylock(&m->mu)) { - m->counter++; - gpr_mu_unlock(&m->mu); - i++; + for (i = 0; i != m->iterations;) + { + if (gpr_mu_trylock (&m->mu)) + { + m->counter++; + gpr_mu_unlock (&m->mu); + i++; + } } - } - mark_thread_done(m); + mark_thread_done (m); } /* Increment counter only when (m->counter%m->threads)==m->thread_id; then mark thread as done. */ -static void inc_by_turns(void *v /*=m*/) { +static void +inc_by_turns (void *v /*=m*/ ) +{ struct test *m = v; gpr_int64 i; - int id = thread_id(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)); + int id = thread_id (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)); + } + m->counter++; + gpr_cv_broadcast (&m->cv); + gpr_mu_unlock (&m->mu); } - m->counter++; - gpr_cv_broadcast(&m->cv); - gpr_mu_unlock(&m->mu); - } - mark_thread_done(m); + mark_thread_done (m); } /* Wait a millisecond and increment counter on each iteration; then mark thread as done. */ -static void inc_with_1ms_delay(void *v /*=m*/) { +static void +inc_with_1ms_delay (void *v /*=m*/ ) +{ struct test *m = v; gpr_int64 i; - for (i = 0; i != m->iterations; i++) { - gpr_timespec deadline; - gpr_mu_lock(&m->mu); - deadline = gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), - gpr_time_from_micros(1000, GPR_TIMESPAN)); - while (!gpr_cv_wait(&m->cv, &m->mu, deadline)) { + for (i = 0; i != m->iterations; i++) + { + gpr_timespec deadline; + gpr_mu_lock (&m->mu); + deadline = gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), gpr_time_from_micros (1000, GPR_TIMESPAN)); + while (!gpr_cv_wait (&m->cv, &m->mu, deadline)) + { + } + m->counter++; + gpr_mu_unlock (&m->mu); } - m->counter++; - gpr_mu_unlock(&m->mu); - } - mark_thread_done(m); + mark_thread_done (m); } /* Wait a millisecond and increment counter on each iteration, using an event for timing; then mark thread as done. */ -static void inc_with_1ms_delay_event(void *v /*=m*/) { +static void +inc_with_1ms_delay_event (void *v /*=m*/ ) +{ struct test *m = v; gpr_int64 i; - for (i = 0; i != m->iterations; i++) { - gpr_timespec deadline; - deadline = gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), - gpr_time_from_micros(1000, GPR_TIMESPAN)); - GPR_ASSERT(gpr_event_wait(&m->event, deadline) == NULL); - gpr_mu_lock(&m->mu); - m->counter++; - gpr_mu_unlock(&m->mu); - } - mark_thread_done(m); + for (i = 0; i != m->iterations; i++) + { + gpr_timespec deadline; + deadline = gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), gpr_time_from_micros (1000, GPR_TIMESPAN)); + GPR_ASSERT (gpr_event_wait (&m->event, deadline) == NULL); + gpr_mu_lock (&m->mu); + m->counter++; + gpr_mu_unlock (&m->mu); + } + mark_thread_done (m); } /* Produce m->iterations elements on queue m->q, then mark thread as done. Even threads use queue_append(), and odd threads use queue_try_append() until it succeeds. */ -static void many_producers(void *v /*=m*/) { +static void +many_producers (void *v /*=m*/ ) +{ struct test *m = v; gpr_int64 i; - int x = thread_id(m); - if ((x & 1) == 0) { - for (i = 0; i != m->iterations; i++) { - queue_append(&m->q, 1); + int x = thread_id (m); + if ((x & 1) == 0) + { + for (i = 0; i != m->iterations; i++) + { + queue_append (&m->q, 1); + } } - } else { - for (i = 0; i != m->iterations; i++) { - while (!queue_try_append(&m->q, 1)) { - } + else + { + for (i = 0; i != m->iterations; i++) + { + while (!queue_try_append (&m->q, 1)) + { + } + } } - } - mark_thread_done(m); + mark_thread_done (m); } /* Consume elements from m->q until m->threads*m->iterations are seen, wait an extra second to confirm that no more elements are arriving, then mark thread as done. */ -static void consumer(void *v /*=m*/) { +static void +consumer (void *v /*=m*/ ) +{ struct test *m = v; gpr_int64 n = m->iterations * m->threads; gpr_int64 i; int value; - for (i = 0; i != n; i++) { - queue_remove(&m->q, &value, gpr_inf_future(GPR_CLOCK_REALTIME)); - } - gpr_mu_lock(&m->mu); + for (i = 0; i != n; i++) + { + queue_remove (&m->q, &value, gpr_inf_future (GPR_CLOCK_REALTIME)); + } + 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_from_micros(1000000, GPR_TIMESPAN)))); - mark_thread_done(m); + gpr_mu_unlock (&m->mu); + GPR_ASSERT (!queue_remove (&m->q, &value, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), gpr_time_from_micros (1000000, GPR_TIMESPAN)))); + mark_thread_done (m); } /* Increment m->stats_counter m->iterations times, transfer counter value to m->counter, then mark thread as done. */ -static void statsinc(void *v /*=m*/) { +static void +statsinc (void *v /*=m*/ ) +{ struct test *m = v; gpr_int64 i; - for (i = 0; i != m->iterations; i++) { - gpr_stats_inc(&m->stats_counter, 1); - } - gpr_mu_lock(&m->mu); - m->counter = gpr_stats_read(&m->stats_counter); - gpr_mu_unlock(&m->mu); - mark_thread_done(m); + for (i = 0; i != m->iterations; i++) + { + gpr_stats_inc (&m->stats_counter, 1); + } + gpr_mu_lock (&m->mu); + m->counter = gpr_stats_read (&m->stats_counter); + gpr_mu_unlock (&m->mu); + mark_thread_done (m); } /* Increment m->refcount m->iterations times, decrement m->thread_refcount once, and if it reaches zero, set m->event to (void*)1; then mark thread as done. */ -static void refinc(void *v /*=m*/) { +static void +refinc (void *v /*=m*/ ) +{ struct test *m = v; gpr_int64 i; - for (i = 0; i != m->iterations; i++) { - gpr_ref(&m->refcount); - } - if (gpr_unref(&m->thread_refcount)) { - gpr_event_set(&m->event, (void *)1); - } - mark_thread_done(m); + for (i = 0; i != m->iterations; i++) + { + gpr_ref (&m->refcount); + } + if (gpr_unref (&m->thread_refcount)) + { + gpr_event_set (&m->event, (void *) 1); + } + mark_thread_done (m); } /* Wait until m->event is set to (void *)1, then decrement m->refcount m->stats_counter m->iterations times, and ensure that the last decrement caused the counter to reach zero, then mark thread as done. */ -static void refcheck(void *v /*=m*/) { +static void +refcheck (void *v /*=m*/ ) +{ struct test *m = v; gpr_int64 n = m->iterations * m->threads; gpr_int64 i; - GPR_ASSERT(gpr_event_wait(&m->event, gpr_inf_future(GPR_CLOCK_REALTIME)) == - (void *)1); - GPR_ASSERT(gpr_event_get(&m->event) == (void *)1); - for (i = 1; i != n; i++) { - GPR_ASSERT(!gpr_unref(&m->refcount)); - m->counter++; - } - GPR_ASSERT(gpr_unref(&m->refcount)); + GPR_ASSERT (gpr_event_wait (&m->event, gpr_inf_future (GPR_CLOCK_REALTIME)) == (void *) 1); + GPR_ASSERT (gpr_event_get (&m->event) == (void *) 1); + for (i = 1; i != n; i++) + { + GPR_ASSERT (!gpr_unref (&m->refcount)); + m->counter++; + } + GPR_ASSERT (gpr_unref (&m->refcount)); m->counter++; - mark_thread_done(m); + mark_thread_done (m); } /* ------------------------------------------------- */ -int main(int argc, char *argv[]) { - grpc_test_init(argc, argv); - test("mutex", &inc, NULL, 1); - test("mutex try", &inctry, NULL, 1); - test("cv", &inc_by_turns, NULL, 1); - test("timedcv", &inc_with_1ms_delay, NULL, 1); - test("queue", &many_producers, &consumer, 10); - test("stats_counter", &statsinc, NULL, 1); - test("refcount", &refinc, &refcheck, 1); - test("timedevent", &inc_with_1ms_delay_event, NULL, 1); +int +main (int argc, char *argv[]) +{ + grpc_test_init (argc, argv); + test ("mutex", &inc, NULL, 1); + test ("mutex try", &inctry, NULL, 1); + test ("cv", &inc_by_turns, NULL, 1); + test ("timedcv", &inc_with_1ms_delay, NULL, 1); + test ("queue", &many_producers, &consumer, 10); + test ("stats_counter", &statsinc, NULL, 1); + test ("refcount", &refinc, &refcheck, 1); + test ("timedevent", &inc_with_1ms_delay_event, NULL, 1); return 0; } diff --git a/test/core/support/thd_test.c b/test/core/support/thd_test.c index faba33c5e8c..09303c1958a 100644 --- a/test/core/support/thd_test.c +++ b/test/core/support/thd_test.c @@ -41,7 +41,8 @@ #include #include "test/core/util/test_config.h" -struct test { +struct test +{ gpr_mu mu; int n; int is_done; @@ -49,53 +50,67 @@ struct test { }; /* A Thread body. Decrement t->n, and if is becomes zero, set t->done. */ -static void thd_body(void *v) { +static void +thd_body (void *v) +{ struct test *t = v; - gpr_mu_lock(&t->mu); + gpr_mu_lock (&t->mu); t->n--; - if (t->n == 0) { - t->is_done = 1; - gpr_cv_signal(&t->done_cv); - } - gpr_mu_unlock(&t->mu); + if (t->n == 0) + { + t->is_done = 1; + gpr_cv_signal (&t->done_cv); + } + gpr_mu_unlock (&t->mu); } -static void thd_body_joinable(void *v) {} +static void +thd_body_joinable (void *v) +{ +} /* Test that we can create a number of threads and wait for them. */ -static void test(void) { +static void +test (void) +{ int i; gpr_thd_id thd; gpr_thd_id thds[1000]; struct test t; int n = 1000; - gpr_thd_options options = gpr_thd_options_default(); - gpr_mu_init(&t.mu); - gpr_cv_init(&t.done_cv); + gpr_thd_options options = gpr_thd_options_default (); + gpr_mu_init (&t.mu); + gpr_cv_init (&t.done_cv); t.n = n; t.is_done = 0; - for (i = 0; i != n; i++) { - GPR_ASSERT(gpr_thd_new(&thd, &thd_body, &t, NULL)); - } - gpr_mu_lock(&t.mu); - while (!t.is_done) { - gpr_cv_wait(&t.done_cv, &t.mu, gpr_inf_future(GPR_CLOCK_REALTIME)); - } - gpr_mu_unlock(&t.mu); - GPR_ASSERT(t.n == 0); - gpr_thd_options_set_joinable(&options); - for (i = 0; i < n; i++) { - GPR_ASSERT(gpr_thd_new(&thds[i], &thd_body_joinable, NULL, &options)); - } - for (i = 0; i < n; i++) { - gpr_thd_join(thds[i]); - } + for (i = 0; i != n; i++) + { + GPR_ASSERT (gpr_thd_new (&thd, &thd_body, &t, NULL)); + } + gpr_mu_lock (&t.mu); + while (!t.is_done) + { + gpr_cv_wait (&t.done_cv, &t.mu, gpr_inf_future (GPR_CLOCK_REALTIME)); + } + gpr_mu_unlock (&t.mu); + GPR_ASSERT (t.n == 0); + gpr_thd_options_set_joinable (&options); + for (i = 0; i < n; i++) + { + GPR_ASSERT (gpr_thd_new (&thds[i], &thd_body_joinable, NULL, &options)); + } + for (i = 0; i < n; i++) + { + gpr_thd_join (thds[i]); + } } /* ------------------------------------------------- */ -int main(int argc, char *argv[]) { - grpc_test_init(argc, argv); - test(); +int +main (int argc, char *argv[]) +{ + grpc_test_init (argc, argv); + test (); return 0; } diff --git a/test/core/support/time_test.c b/test/core/support/time_test.c index ce35edd83cc..df65b45ddd9 100644 --- a/test/core/support/time_test.c +++ b/test/core/support/time_test.c @@ -43,225 +43,236 @@ #include #include "test/core/util/test_config.h" -static void to_fp(void *arg, const char *buf, size_t len) { - fwrite(buf, 1, len, (FILE *)arg); +static void +to_fp (void *arg, const char *buf, size_t len) +{ + fwrite (buf, 1, len, (FILE *) arg); } /* Convert gpr_uintmax x to ascii base b (2..16), and write with (*writer)(arg, ...), zero padding to "chars" digits). */ -static void u_to_s(gpr_uintmax x, unsigned base, int chars, - void (*writer)(void *arg, const char *buf, size_t len), - void *arg) { +static void +u_to_s (gpr_uintmax x, unsigned base, int chars, void (*writer) (void *arg, const char *buf, size_t len), void *arg) +{ char buf[64]; - char *p = buf + sizeof(buf); - do { - *--p = "0123456789abcdef"[x % base]; - x /= base; - chars--; - } while (x != 0 || chars > 0); - (*writer)(arg, p, (size_t)(buf + sizeof(buf) - p)); + char *p = buf + sizeof (buf); + do + { + *--p = "0123456789abcdef"[x % base]; + x /= base; + chars--; + } + while (x != 0 || chars > 0); + (*writer) (arg, p, (size_t) (buf + sizeof (buf) - p)); } /* Convert gpr_intmax x to ascii base b (2..16), and write with (*writer)(arg, ...), zero padding to "chars" digits). */ -static void i_to_s(gpr_intmax x, unsigned base, int chars, - void (*writer)(void *arg, const char *buf, size_t len), - void *arg) { - if (x < 0) { - (*writer)(arg, "-", 1); - u_to_s((gpr_uintmax)-x, base, chars - 1, writer, arg); - } else { - u_to_s((gpr_uintmax)x, base, chars, writer, arg); - } +static void +i_to_s (gpr_intmax x, unsigned base, int chars, void (*writer) (void *arg, const char *buf, size_t len), void *arg) +{ + if (x < 0) + { + (*writer) (arg, "-", 1); + u_to_s ((gpr_uintmax) - x, base, chars - 1, writer, arg); + } + else + { + u_to_s ((gpr_uintmax) x, base, chars, writer, arg); + } } /* Convert ts to ascii, and write with (*writer)(arg, ...). */ -static void ts_to_s(gpr_timespec t, - void (*writer)(void *arg, const char *buf, size_t len), - void *arg) { - if (t.tv_sec < 0 && t.tv_nsec != 0) { - t.tv_sec++; - t.tv_nsec = GPR_NS_PER_SEC - t.tv_nsec; - } - i_to_s(t.tv_sec, 10, 0, writer, arg); - (*writer)(arg, ".", 1); - i_to_s(t.tv_nsec, 10, 9, writer, arg); +static void +ts_to_s (gpr_timespec t, void (*writer) (void *arg, const char *buf, size_t len), void *arg) +{ + if (t.tv_sec < 0 && t.tv_nsec != 0) + { + t.tv_sec++; + t.tv_nsec = GPR_NS_PER_SEC - t.tv_nsec; + } + i_to_s (t.tv_sec, 10, 0, writer, arg); + (*writer) (arg, ".", 1); + i_to_s (t.tv_nsec, 10, 9, writer, arg); } -static void test_values(void) { +static void +test_values (void) +{ int i; - gpr_timespec x = gpr_time_0(GPR_CLOCK_REALTIME); - GPR_ASSERT(x.tv_sec == 0 && x.tv_nsec == 0); + gpr_timespec x = gpr_time_0 (GPR_CLOCK_REALTIME); + GPR_ASSERT (x.tv_sec == 0 && x.tv_nsec == 0); - x = gpr_inf_future(GPR_CLOCK_REALTIME); - fprintf(stderr, "far future "); - i_to_s(x.tv_sec, 16, 16, &to_fp, stderr); - fprintf(stderr, "\n"); - GPR_ASSERT(x.tv_sec >= INT_MAX); - fprintf(stderr, "far future "); - ts_to_s(x, &to_fp, stderr); - fprintf(stderr, "\n"); + x = gpr_inf_future (GPR_CLOCK_REALTIME); + fprintf (stderr, "far future "); + i_to_s (x.tv_sec, 16, 16, &to_fp, stderr); + fprintf (stderr, "\n"); + GPR_ASSERT (x.tv_sec >= INT_MAX); + fprintf (stderr, "far future "); + ts_to_s (x, &to_fp, stderr); + fprintf (stderr, "\n"); - x = gpr_inf_past(GPR_CLOCK_REALTIME); - fprintf(stderr, "far past "); - i_to_s(x.tv_sec, 16, 16, &to_fp, stderr); - fprintf(stderr, "\n"); - GPR_ASSERT(x.tv_sec <= INT_MIN); - fprintf(stderr, "far past "); - ts_to_s(x, &to_fp, stderr); - fprintf(stderr, "\n"); + x = gpr_inf_past (GPR_CLOCK_REALTIME); + fprintf (stderr, "far past "); + i_to_s (x.tv_sec, 16, 16, &to_fp, stderr); + fprintf (stderr, "\n"); + GPR_ASSERT (x.tv_sec <= INT_MIN); + fprintf (stderr, "far past "); + ts_to_s (x, &to_fp, stderr); + fprintf (stderr, "\n"); - for (i = 1; i != 1000 * 1000 * 1000; i *= 10) { - x = gpr_time_from_micros(i, GPR_TIMESPAN); - GPR_ASSERT(x.tv_sec == i / GPR_US_PER_SEC && - x.tv_nsec == (i % GPR_US_PER_SEC) * GPR_NS_PER_US); - x = gpr_time_from_nanos(i, GPR_TIMESPAN); - GPR_ASSERT(x.tv_sec == i / GPR_NS_PER_SEC && - x.tv_nsec == (i % GPR_NS_PER_SEC)); - x = gpr_time_from_millis(i, GPR_TIMESPAN); - GPR_ASSERT(x.tv_sec == i / GPR_MS_PER_SEC && - x.tv_nsec == (i % GPR_MS_PER_SEC) * GPR_NS_PER_MS); - } + for (i = 1; i != 1000 * 1000 * 1000; i *= 10) + { + x = gpr_time_from_micros (i, GPR_TIMESPAN); + GPR_ASSERT (x.tv_sec == i / GPR_US_PER_SEC && x.tv_nsec == (i % GPR_US_PER_SEC) * GPR_NS_PER_US); + x = gpr_time_from_nanos (i, GPR_TIMESPAN); + GPR_ASSERT (x.tv_sec == i / GPR_NS_PER_SEC && x.tv_nsec == (i % GPR_NS_PER_SEC)); + x = gpr_time_from_millis (i, GPR_TIMESPAN); + GPR_ASSERT (x.tv_sec == i / GPR_MS_PER_SEC && x.tv_nsec == (i % GPR_MS_PER_SEC) * GPR_NS_PER_MS); + } /* Test possible overflow in conversion of -ve values. */ - x = gpr_time_from_micros(-(LONG_MAX - 999997), GPR_TIMESPAN); - GPR_ASSERT(x.tv_sec < 0); - GPR_ASSERT(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); + x = gpr_time_from_micros (-(LONG_MAX - 999997), GPR_TIMESPAN); + GPR_ASSERT (x.tv_sec < 0); + GPR_ASSERT (x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); - x = gpr_time_from_nanos(-(LONG_MAX - 999999997), GPR_TIMESPAN); - GPR_ASSERT(x.tv_sec < 0); - GPR_ASSERT(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); + x = gpr_time_from_nanos (-(LONG_MAX - 999999997), GPR_TIMESPAN); + GPR_ASSERT (x.tv_sec < 0); + GPR_ASSERT (x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); - x = gpr_time_from_millis(-(LONG_MAX - 997), GPR_TIMESPAN); - GPR_ASSERT(x.tv_sec < 0); - GPR_ASSERT(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); + x = gpr_time_from_millis (-(LONG_MAX - 997), GPR_TIMESPAN); + GPR_ASSERT (x.tv_sec < 0); + GPR_ASSERT (x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); /* Test general -ve values. */ - for (i = -1; i > -1000 * 1000 * 1000; i *= 7) { - x = gpr_time_from_micros(i, GPR_TIMESPAN); - GPR_ASSERT(x.tv_sec * GPR_US_PER_SEC + x.tv_nsec / GPR_NS_PER_US == i); - x = gpr_time_from_nanos(i, GPR_TIMESPAN); - GPR_ASSERT(x.tv_sec * GPR_NS_PER_SEC + x.tv_nsec == i); - x = gpr_time_from_millis(i, GPR_TIMESPAN); - GPR_ASSERT(x.tv_sec * GPR_MS_PER_SEC + x.tv_nsec / GPR_NS_PER_MS == i); - } + for (i = -1; i > -1000 * 1000 * 1000; i *= 7) + { + x = gpr_time_from_micros (i, GPR_TIMESPAN); + GPR_ASSERT (x.tv_sec * GPR_US_PER_SEC + x.tv_nsec / GPR_NS_PER_US == i); + x = gpr_time_from_nanos (i, GPR_TIMESPAN); + GPR_ASSERT (x.tv_sec * GPR_NS_PER_SEC + x.tv_nsec == i); + x = gpr_time_from_millis (i, GPR_TIMESPAN); + GPR_ASSERT (x.tv_sec * GPR_MS_PER_SEC + x.tv_nsec / GPR_NS_PER_MS == i); + } } -static void test_add_sub(void) { +static void +test_add_sub (void) +{ int i; int j; int k; /* Basic addition and subtraction. */ - for (i = -100; i <= 100; i++) { - for (j = -100; j <= 100; j++) { - for (k = 1; k <= 10000000; k *= 10) { - int sum = i + j; - int diff = i - j; - gpr_timespec it = gpr_time_from_micros(i * k, GPR_TIMESPAN); - gpr_timespec jt = gpr_time_from_micros(j * k, GPR_TIMESPAN); - gpr_timespec sumt = gpr_time_add(it, jt); - gpr_timespec difft = gpr_time_sub(it, jt); - if (gpr_time_cmp(gpr_time_from_micros(sum * k, GPR_TIMESPAN), sumt) != - 0) { - fprintf(stderr, "i %d j %d sum %d sumt ", i, j, sum); - ts_to_s(sumt, &to_fp, stderr); - fprintf(stderr, "\n"); - GPR_ASSERT(0); - } - if (gpr_time_cmp(gpr_time_from_micros(diff * k, GPR_TIMESPAN), difft) != - 0) { - fprintf(stderr, "i %d j %d diff %d diff ", i, j, diff); - ts_to_s(sumt, &to_fp, stderr); - fprintf(stderr, "\n"); - GPR_ASSERT(0); - } - } + for (i = -100; i <= 100; i++) + { + for (j = -100; j <= 100; j++) + { + for (k = 1; k <= 10000000; k *= 10) + { + int sum = i + j; + int diff = i - j; + gpr_timespec it = gpr_time_from_micros (i * k, GPR_TIMESPAN); + gpr_timespec jt = gpr_time_from_micros (j * k, GPR_TIMESPAN); + gpr_timespec sumt = gpr_time_add (it, jt); + gpr_timespec difft = gpr_time_sub (it, jt); + if (gpr_time_cmp (gpr_time_from_micros (sum * k, GPR_TIMESPAN), sumt) != 0) + { + fprintf (stderr, "i %d j %d sum %d sumt ", i, j, sum); + ts_to_s (sumt, &to_fp, stderr); + fprintf (stderr, "\n"); + GPR_ASSERT (0); + } + if (gpr_time_cmp (gpr_time_from_micros (diff * k, GPR_TIMESPAN), difft) != 0) + { + fprintf (stderr, "i %d j %d diff %d diff ", i, j, diff); + ts_to_s (sumt, &to_fp, stderr); + fprintf (stderr, "\n"); + GPR_ASSERT (0); + } + } + } } - } } -static void test_overflow(void) { +static void +test_overflow (void) +{ /* overflow */ - gpr_timespec x = gpr_time_from_micros(1, GPR_TIMESPAN); - do { - x = gpr_time_add(x, x); - } while (gpr_time_cmp(x, gpr_inf_future(GPR_TIMESPAN)) < 0); - GPR_ASSERT(gpr_time_cmp(x, gpr_inf_future(GPR_TIMESPAN)) == 0); - x = gpr_time_from_micros(-1, GPR_TIMESPAN); - do { - x = gpr_time_add(x, x); - } while (gpr_time_cmp(x, gpr_inf_past(GPR_TIMESPAN)) > 0); - GPR_ASSERT(gpr_time_cmp(x, gpr_inf_past(GPR_TIMESPAN)) == 0); + gpr_timespec x = gpr_time_from_micros (1, GPR_TIMESPAN); + do + { + x = gpr_time_add (x, x); + } + while (gpr_time_cmp (x, gpr_inf_future (GPR_TIMESPAN)) < 0); + GPR_ASSERT (gpr_time_cmp (x, gpr_inf_future (GPR_TIMESPAN)) == 0); + x = gpr_time_from_micros (-1, GPR_TIMESPAN); + do + { + x = gpr_time_add (x, x); + } + while (gpr_time_cmp (x, gpr_inf_past (GPR_TIMESPAN)) > 0); + GPR_ASSERT (gpr_time_cmp (x, gpr_inf_past (GPR_TIMESPAN)) == 0); } -static void test_sticky_infinities(void) { +static void +test_sticky_infinities (void) +{ int i; int j; int k; gpr_timespec infinity[2]; gpr_timespec addend[3]; - infinity[0] = gpr_inf_future(GPR_TIMESPAN); - infinity[1] = gpr_inf_past(GPR_TIMESPAN); - addend[0] = gpr_inf_future(GPR_TIMESPAN); - addend[1] = gpr_inf_past(GPR_TIMESPAN); - addend[2] = gpr_time_0(GPR_TIMESPAN); + infinity[0] = gpr_inf_future (GPR_TIMESPAN); + infinity[1] = gpr_inf_past (GPR_TIMESPAN); + addend[0] = gpr_inf_future (GPR_TIMESPAN); + addend[1] = gpr_inf_past (GPR_TIMESPAN); + addend[2] = gpr_time_0 (GPR_TIMESPAN); /* Infinities are sticky */ - for (i = 0; i != sizeof(infinity) / sizeof(infinity[0]); i++) { - for (j = 0; j != sizeof(addend) / sizeof(addend[0]); j++) { - gpr_timespec x = gpr_time_add(infinity[i], addend[j]); - GPR_ASSERT(gpr_time_cmp(x, infinity[i]) == 0); - x = gpr_time_sub(infinity[i], addend[j]); - GPR_ASSERT(gpr_time_cmp(x, infinity[i]) == 0); - } - for (k = -200; k <= 200; k++) { - gpr_timespec y = gpr_time_from_micros(k * 100000, GPR_TIMESPAN); - gpr_timespec x = gpr_time_add(infinity[i], y); - GPR_ASSERT(gpr_time_cmp(x, infinity[i]) == 0); - x = gpr_time_sub(infinity[i], y); - GPR_ASSERT(gpr_time_cmp(x, infinity[i]) == 0); + for (i = 0; i != sizeof (infinity) / sizeof (infinity[0]); i++) + { + for (j = 0; j != sizeof (addend) / sizeof (addend[0]); j++) + { + gpr_timespec x = gpr_time_add (infinity[i], addend[j]); + GPR_ASSERT (gpr_time_cmp (x, infinity[i]) == 0); + x = gpr_time_sub (infinity[i], addend[j]); + GPR_ASSERT (gpr_time_cmp (x, infinity[i]) == 0); + } + for (k = -200; k <= 200; k++) + { + gpr_timespec y = gpr_time_from_micros (k * 100000, GPR_TIMESPAN); + gpr_timespec x = gpr_time_add (infinity[i], y); + GPR_ASSERT (gpr_time_cmp (x, infinity[i]) == 0); + x = gpr_time_sub (infinity[i], y); + GPR_ASSERT (gpr_time_cmp (x, infinity[i]) == 0); + } } - } } -static void test_similar(void) { - GPR_ASSERT(1 == gpr_time_similar(gpr_inf_future(GPR_TIMESPAN), - gpr_inf_future(GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - GPR_ASSERT(1 == gpr_time_similar(gpr_inf_past(GPR_TIMESPAN), - gpr_inf_past(GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - GPR_ASSERT(0 == gpr_time_similar(gpr_inf_past(GPR_TIMESPAN), - gpr_inf_future(GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - GPR_ASSERT(0 == gpr_time_similar(gpr_inf_future(GPR_TIMESPAN), - gpr_inf_past(GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - GPR_ASSERT(1 == gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - GPR_ASSERT(1 == gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(15, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN))); - GPR_ASSERT(1 == gpr_time_similar(gpr_time_from_micros(15, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN))); - GPR_ASSERT(0 == gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(25, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN))); - GPR_ASSERT(0 == gpr_time_similar(gpr_time_from_micros(25, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN))); +static void +test_similar (void) +{ + GPR_ASSERT (1 == gpr_time_similar (gpr_inf_future (GPR_TIMESPAN), gpr_inf_future (GPR_TIMESPAN), gpr_time_0 (GPR_TIMESPAN))); + GPR_ASSERT (1 == gpr_time_similar (gpr_inf_past (GPR_TIMESPAN), gpr_inf_past (GPR_TIMESPAN), gpr_time_0 (GPR_TIMESPAN))); + GPR_ASSERT (0 == gpr_time_similar (gpr_inf_past (GPR_TIMESPAN), gpr_inf_future (GPR_TIMESPAN), gpr_time_0 (GPR_TIMESPAN))); + GPR_ASSERT (0 == gpr_time_similar (gpr_inf_future (GPR_TIMESPAN), gpr_inf_past (GPR_TIMESPAN), gpr_time_0 (GPR_TIMESPAN))); + GPR_ASSERT (1 == gpr_time_similar (gpr_time_from_micros (10, GPR_TIMESPAN), gpr_time_from_micros (10, GPR_TIMESPAN), gpr_time_0 (GPR_TIMESPAN))); + GPR_ASSERT (1 == gpr_time_similar (gpr_time_from_micros (10, GPR_TIMESPAN), gpr_time_from_micros (15, GPR_TIMESPAN), gpr_time_from_micros (10, GPR_TIMESPAN))); + GPR_ASSERT (1 == gpr_time_similar (gpr_time_from_micros (15, GPR_TIMESPAN), gpr_time_from_micros (10, GPR_TIMESPAN), gpr_time_from_micros (10, GPR_TIMESPAN))); + GPR_ASSERT (0 == gpr_time_similar (gpr_time_from_micros (10, GPR_TIMESPAN), gpr_time_from_micros (25, GPR_TIMESPAN), gpr_time_from_micros (10, GPR_TIMESPAN))); + GPR_ASSERT (0 == gpr_time_similar (gpr_time_from_micros (25, GPR_TIMESPAN), gpr_time_from_micros (10, GPR_TIMESPAN), gpr_time_from_micros (10, GPR_TIMESPAN))); } -int main(int argc, char *argv[]) { - grpc_test_init(argc, argv); +int +main (int argc, char *argv[]) +{ + grpc_test_init (argc, argv); - test_values(); - test_add_sub(); - test_overflow(); - test_sticky_infinities(); - test_similar(); + test_values (); + test_add_sub (); + test_overflow (); + test_sticky_infinities (); + test_similar (); return 0; } diff --git a/test/core/support/tls_test.c b/test/core/support/tls_test.c index 0a3c28417f6..9c5cd54d63f 100644 --- a/test/core/support/tls_test.c +++ b/test/core/support/tls_test.c @@ -43,41 +43,48 @@ #define NUM_THREADS 100 -GPR_TLS_DECL(test_var); +GPR_TLS_DECL (test_var); -static void thd_body(void *arg) { +static void +thd_body (void *arg) +{ gpr_intptr i; - GPR_ASSERT(gpr_tls_get(&test_var) == 0); + GPR_ASSERT (gpr_tls_get (&test_var) == 0); - for (i = 0; i < 10000000; i++) { - gpr_tls_set(&test_var, i); - GPR_ASSERT(gpr_tls_get(&test_var) == i); - } - gpr_tls_set(&test_var, 0); + for (i = 0; i < 10000000; i++) + { + gpr_tls_set (&test_var, i); + GPR_ASSERT (gpr_tls_get (&test_var) == i); + } + gpr_tls_set (&test_var, 0); } /* ------------------------------------------------- */ -int main(int argc, char *argv[]) { - gpr_thd_options opt = gpr_thd_options_default(); +int +main (int argc, char *argv[]) +{ + gpr_thd_options opt = gpr_thd_options_default (); int i; gpr_thd_id threads[NUM_THREADS]; - grpc_test_init(argc, argv); + grpc_test_init (argc, argv); - gpr_tls_init(&test_var); + gpr_tls_init (&test_var); - gpr_thd_options_set_joinable(&opt); + gpr_thd_options_set_joinable (&opt); - for (i = 0; i < NUM_THREADS; i++) { - gpr_thd_new(&threads[i], thd_body, NULL, &opt); - } - for (i = 0; i < NUM_THREADS; i++) { - gpr_thd_join(threads[i]); - } + for (i = 0; i < NUM_THREADS; i++) + { + gpr_thd_new (&threads[i], thd_body, NULL, &opt); + } + for (i = 0; i < NUM_THREADS; i++) + { + gpr_thd_join (threads[i]); + } - gpr_tls_destroy(&test_var); + gpr_tls_destroy (&test_var); return 0; } diff --git a/test/core/support/useful_test.c b/test/core/support/useful_test.c index cbf4f02e267..49a1bd353e8 100644 --- a/test/core/support/useful_test.c +++ b/test/core/support/useful_test.c @@ -36,38 +36,40 @@ #include #include "test/core/util/test_config.h" -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ int four[4]; int five[5]; gpr_uint32 bitset = 0; - grpc_test_init(argc, argv); + grpc_test_init (argc, argv); - GPR_ASSERT(GPR_MIN(1, 2) == 1); - GPR_ASSERT(GPR_MAX(1, 2) == 2); - GPR_ASSERT(GPR_MIN(2, 1) == 1); - GPR_ASSERT(GPR_MAX(2, 1) == 2); - GPR_ASSERT(GPR_CLAMP(1, 0, 2) == 1); - GPR_ASSERT(GPR_CLAMP(0, 0, 2) == 0); - GPR_ASSERT(GPR_CLAMP(2, 0, 2) == 2); - GPR_ASSERT(GPR_CLAMP(-1, 0, 2) == 0); - GPR_ASSERT(GPR_CLAMP(3, 0, 2) == 2); - GPR_ASSERT(GPR_ROTL((gpr_uint32)0x80000001, 1) == 3); - GPR_ASSERT(GPR_ROTR((gpr_uint32)0x80000001, 1) == 0xc0000000); - GPR_ASSERT(GPR_ARRAY_SIZE(four) == 4); - GPR_ASSERT(GPR_ARRAY_SIZE(five) == 5); + GPR_ASSERT (GPR_MIN (1, 2) == 1); + GPR_ASSERT (GPR_MAX (1, 2) == 2); + GPR_ASSERT (GPR_MIN (2, 1) == 1); + GPR_ASSERT (GPR_MAX (2, 1) == 2); + GPR_ASSERT (GPR_CLAMP (1, 0, 2) == 1); + GPR_ASSERT (GPR_CLAMP (0, 0, 2) == 0); + GPR_ASSERT (GPR_CLAMP (2, 0, 2) == 2); + GPR_ASSERT (GPR_CLAMP (-1, 0, 2) == 0); + GPR_ASSERT (GPR_CLAMP (3, 0, 2) == 2); + GPR_ASSERT (GPR_ROTL ((gpr_uint32) 0x80000001, 1) == 3); + GPR_ASSERT (GPR_ROTR ((gpr_uint32) 0x80000001, 1) == 0xc0000000); + GPR_ASSERT (GPR_ARRAY_SIZE (four) == 4); + GPR_ASSERT (GPR_ARRAY_SIZE (five) == 5); - GPR_ASSERT(GPR_BITCOUNT((1u << 31) - 1) == 31); - GPR_ASSERT(GPR_BITCOUNT(1u << 3) == 1); - GPR_ASSERT(GPR_BITCOUNT(0) == 0); + GPR_ASSERT (GPR_BITCOUNT ((1u << 31) - 1) == 31); + GPR_ASSERT (GPR_BITCOUNT (1u << 3) == 1); + GPR_ASSERT (GPR_BITCOUNT (0) == 0); - GPR_ASSERT(GPR_BITSET(&bitset, 3) == 8); - GPR_ASSERT(GPR_BITCOUNT(bitset) == 1); - GPR_ASSERT(GPR_BITGET(bitset, 3) == 1); - GPR_ASSERT(GPR_BITSET(&bitset, 1) == 10); - GPR_ASSERT(GPR_BITCOUNT(bitset) == 2); - GPR_ASSERT(GPR_BITCLEAR(&bitset, 3) == 2); - GPR_ASSERT(GPR_BITCOUNT(bitset) == 1); - GPR_ASSERT(GPR_BITGET(bitset, 3) == 0); + GPR_ASSERT (GPR_BITSET (&bitset, 3) == 8); + GPR_ASSERT (GPR_BITCOUNT (bitset) == 1); + GPR_ASSERT (GPR_BITGET (bitset, 3) == 1); + GPR_ASSERT (GPR_BITSET (&bitset, 1) == 10); + GPR_ASSERT (GPR_BITCOUNT (bitset) == 2); + GPR_ASSERT (GPR_BITCLEAR (&bitset, 3) == 2); + GPR_ASSERT (GPR_BITCOUNT (bitset) == 1); + GPR_ASSERT (GPR_BITGET (bitset, 3) == 0); return 0; } diff --git a/test/core/surface/byte_buffer_reader_test.c b/test/core/surface/byte_buffer_reader_test.c index 560e0ac7b23..dd56ba86e48 100644 --- a/test/core/surface/byte_buffer_reader_test.c +++ b/test/core/surface/byte_buffer_reader_test.c @@ -48,72 +48,79 @@ #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) -static void test_read_one_slice(void) { +static void +test_read_one_slice (void) +{ gpr_slice slice; grpc_byte_buffer *buffer; grpc_byte_buffer_reader reader; gpr_slice first_slice, second_slice; int first_code, second_code; - LOG_TEST("test_read_one_slice"); - slice = gpr_slice_from_copied_string("test"); - buffer = grpc_raw_byte_buffer_create(&slice, 1); - gpr_slice_unref(slice); - grpc_byte_buffer_reader_init(&reader, buffer); - first_code = grpc_byte_buffer_reader_next(&reader, &first_slice); - GPR_ASSERT(first_code != 0); - GPR_ASSERT(memcmp(GPR_SLICE_START_PTR(first_slice), "test", 4) == 0); - gpr_slice_unref(first_slice); - second_code = grpc_byte_buffer_reader_next(&reader, &second_slice); - GPR_ASSERT(second_code == 0); - grpc_byte_buffer_destroy(buffer); + LOG_TEST ("test_read_one_slice"); + slice = gpr_slice_from_copied_string ("test"); + buffer = grpc_raw_byte_buffer_create (&slice, 1); + gpr_slice_unref (slice); + grpc_byte_buffer_reader_init (&reader, buffer); + first_code = grpc_byte_buffer_reader_next (&reader, &first_slice); + GPR_ASSERT (first_code != 0); + GPR_ASSERT (memcmp (GPR_SLICE_START_PTR (first_slice), "test", 4) == 0); + gpr_slice_unref (first_slice); + second_code = grpc_byte_buffer_reader_next (&reader, &second_slice); + GPR_ASSERT (second_code == 0); + grpc_byte_buffer_destroy (buffer); } -static void test_read_one_slice_malloc(void) { +static void +test_read_one_slice_malloc (void) +{ gpr_slice slice; grpc_byte_buffer *buffer; grpc_byte_buffer_reader reader; gpr_slice first_slice, second_slice; int first_code, second_code; - LOG_TEST("test_read_one_slice_malloc"); - slice = gpr_slice_malloc(4); - memcpy(GPR_SLICE_START_PTR(slice), "test", 4); - buffer = grpc_raw_byte_buffer_create(&slice, 1); - gpr_slice_unref(slice); - grpc_byte_buffer_reader_init(&reader, buffer); - first_code = grpc_byte_buffer_reader_next(&reader, &first_slice); - GPR_ASSERT(first_code != 0); - GPR_ASSERT(memcmp(GPR_SLICE_START_PTR(first_slice), "test", 4) == 0); - gpr_slice_unref(first_slice); - second_code = grpc_byte_buffer_reader_next(&reader, &second_slice); - GPR_ASSERT(second_code == 0); - grpc_byte_buffer_destroy(buffer); + LOG_TEST ("test_read_one_slice_malloc"); + slice = gpr_slice_malloc (4); + memcpy (GPR_SLICE_START_PTR (slice), "test", 4); + buffer = grpc_raw_byte_buffer_create (&slice, 1); + gpr_slice_unref (slice); + grpc_byte_buffer_reader_init (&reader, buffer); + first_code = grpc_byte_buffer_reader_next (&reader, &first_slice); + GPR_ASSERT (first_code != 0); + GPR_ASSERT (memcmp (GPR_SLICE_START_PTR (first_slice), "test", 4) == 0); + gpr_slice_unref (first_slice); + second_code = grpc_byte_buffer_reader_next (&reader, &second_slice); + GPR_ASSERT (second_code == 0); + grpc_byte_buffer_destroy (buffer); } -static void test_read_none_compressed_slice(void) { +static void +test_read_none_compressed_slice (void) +{ gpr_slice slice; grpc_byte_buffer *buffer; grpc_byte_buffer_reader reader; gpr_slice first_slice, second_slice; int first_code, second_code; - LOG_TEST("test_read_none_compressed_slice"); - slice = gpr_slice_from_copied_string("test"); - buffer = grpc_raw_byte_buffer_create(&slice, 1); - gpr_slice_unref(slice); - grpc_byte_buffer_reader_init(&reader, buffer); - first_code = grpc_byte_buffer_reader_next(&reader, &first_slice); - GPR_ASSERT(first_code != 0); - GPR_ASSERT(memcmp(GPR_SLICE_START_PTR(first_slice), "test", 4) == 0); - gpr_slice_unref(first_slice); - second_code = grpc_byte_buffer_reader_next(&reader, &second_slice); - GPR_ASSERT(second_code == 0); - grpc_byte_buffer_destroy(buffer); + LOG_TEST ("test_read_none_compressed_slice"); + slice = gpr_slice_from_copied_string ("test"); + buffer = grpc_raw_byte_buffer_create (&slice, 1); + gpr_slice_unref (slice); + grpc_byte_buffer_reader_init (&reader, buffer); + first_code = grpc_byte_buffer_reader_next (&reader, &first_slice); + GPR_ASSERT (first_code != 0); + GPR_ASSERT (memcmp (GPR_SLICE_START_PTR (first_slice), "test", 4) == 0); + gpr_slice_unref (first_slice); + second_code = grpc_byte_buffer_reader_next (&reader, &second_slice); + GPR_ASSERT (second_code == 0); + grpc_byte_buffer_destroy (buffer); } -static void read_compressed_slice(grpc_compression_algorithm algorithm, - size_t input_size) { +static void +read_compressed_slice (grpc_compression_algorithm algorithm, size_t input_size) +{ gpr_slice input_slice; gpr_slice_buffer sliceb_in; gpr_slice_buffer sliceb_out; @@ -122,76 +129,80 @@ static void read_compressed_slice(grpc_compression_algorithm algorithm, gpr_slice read_slice; size_t read_count = 0; - gpr_slice_buffer_init(&sliceb_in); - gpr_slice_buffer_init(&sliceb_out); - - input_slice = gpr_slice_malloc(input_size); - memset(GPR_SLICE_START_PTR(input_slice), 'a', input_size); - gpr_slice_buffer_add(&sliceb_in, input_slice); /* takes ownership */ - GPR_ASSERT(grpc_msg_compress(algorithm, &sliceb_in, &sliceb_out)); - - buffer = grpc_raw_compressed_byte_buffer_create(sliceb_out.slices, - sliceb_out.count, algorithm); - grpc_byte_buffer_reader_init(&reader, buffer); - - while (grpc_byte_buffer_reader_next(&reader, &read_slice)) { - GPR_ASSERT(memcmp(GPR_SLICE_START_PTR(read_slice), - GPR_SLICE_START_PTR(input_slice) + read_count, - GPR_SLICE_LENGTH(read_slice)) == 0); - read_count += GPR_SLICE_LENGTH(read_slice); - gpr_slice_unref(read_slice); - } - GPR_ASSERT(read_count == input_size); - grpc_byte_buffer_reader_destroy(&reader); - grpc_byte_buffer_destroy(buffer); - gpr_slice_buffer_destroy(&sliceb_out); - gpr_slice_buffer_destroy(&sliceb_in); + gpr_slice_buffer_init (&sliceb_in); + gpr_slice_buffer_init (&sliceb_out); + + input_slice = gpr_slice_malloc (input_size); + memset (GPR_SLICE_START_PTR (input_slice), 'a', input_size); + gpr_slice_buffer_add (&sliceb_in, input_slice); /* takes ownership */ + GPR_ASSERT (grpc_msg_compress (algorithm, &sliceb_in, &sliceb_out)); + + buffer = grpc_raw_compressed_byte_buffer_create (sliceb_out.slices, sliceb_out.count, algorithm); + grpc_byte_buffer_reader_init (&reader, buffer); + + while (grpc_byte_buffer_reader_next (&reader, &read_slice)) + { + GPR_ASSERT (memcmp (GPR_SLICE_START_PTR (read_slice), GPR_SLICE_START_PTR (input_slice) + read_count, GPR_SLICE_LENGTH (read_slice)) == 0); + read_count += GPR_SLICE_LENGTH (read_slice); + gpr_slice_unref (read_slice); + } + GPR_ASSERT (read_count == input_size); + grpc_byte_buffer_reader_destroy (&reader); + grpc_byte_buffer_destroy (buffer); + gpr_slice_buffer_destroy (&sliceb_out); + gpr_slice_buffer_destroy (&sliceb_in); } -static void test_read_gzip_compressed_slice(void) { +static void +test_read_gzip_compressed_slice (void) +{ const size_t INPUT_SIZE = 2048; - LOG_TEST("test_read_gzip_compressed_slice"); - read_compressed_slice(GRPC_COMPRESS_GZIP, INPUT_SIZE); + LOG_TEST ("test_read_gzip_compressed_slice"); + read_compressed_slice (GRPC_COMPRESS_GZIP, INPUT_SIZE); } -static void test_read_deflate_compressed_slice(void) { +static void +test_read_deflate_compressed_slice (void) +{ const size_t INPUT_SIZE = 2048; - LOG_TEST("test_read_deflate_compressed_slice"); - read_compressed_slice(GRPC_COMPRESS_DEFLATE, INPUT_SIZE); + LOG_TEST ("test_read_deflate_compressed_slice"); + read_compressed_slice (GRPC_COMPRESS_DEFLATE, INPUT_SIZE); } -static void test_byte_buffer_from_reader(void) { +static void +test_byte_buffer_from_reader (void) +{ gpr_slice slice; grpc_byte_buffer *buffer, *buffer_from_reader; grpc_byte_buffer_reader reader; - LOG_TEST("test_byte_buffer_from_reader"); - slice = gpr_slice_malloc(4); - memcpy(GPR_SLICE_START_PTR(slice), "test", 4); - buffer = grpc_raw_byte_buffer_create(&slice, 1); - gpr_slice_unref(slice); - grpc_byte_buffer_reader_init(&reader, buffer); - - buffer_from_reader = grpc_raw_byte_buffer_from_reader(&reader); - GPR_ASSERT(buffer->type == buffer_from_reader->type); - GPR_ASSERT(buffer_from_reader->data.raw.compression == GRPC_COMPRESS_NONE); - GPR_ASSERT(buffer_from_reader->data.raw.slice_buffer.count == 1); - GPR_ASSERT(memcmp(GPR_SLICE_START_PTR( - buffer_from_reader->data.raw.slice_buffer.slices[0]), - "test", 4) == 0); - - grpc_byte_buffer_destroy(buffer); - grpc_byte_buffer_destroy(buffer_from_reader); + LOG_TEST ("test_byte_buffer_from_reader"); + slice = gpr_slice_malloc (4); + memcpy (GPR_SLICE_START_PTR (slice), "test", 4); + buffer = grpc_raw_byte_buffer_create (&slice, 1); + gpr_slice_unref (slice); + grpc_byte_buffer_reader_init (&reader, buffer); + + buffer_from_reader = grpc_raw_byte_buffer_from_reader (&reader); + GPR_ASSERT (buffer->type == buffer_from_reader->type); + GPR_ASSERT (buffer_from_reader->data.raw.compression == GRPC_COMPRESS_NONE); + GPR_ASSERT (buffer_from_reader->data.raw.slice_buffer.count == 1); + GPR_ASSERT (memcmp (GPR_SLICE_START_PTR (buffer_from_reader->data.raw.slice_buffer.slices[0]), "test", 4) == 0); + + grpc_byte_buffer_destroy (buffer); + grpc_byte_buffer_destroy (buffer_from_reader); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_read_one_slice(); - test_read_one_slice_malloc(); - test_read_none_compressed_slice(); - test_read_gzip_compressed_slice(); - test_read_deflate_compressed_slice(); - test_byte_buffer_from_reader(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_read_one_slice (); + test_read_one_slice_malloc (); + test_read_none_compressed_slice (); + test_read_gzip_compressed_slice (); + test_read_deflate_compressed_slice (); + test_byte_buffer_from_reader (); return 0; } diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index 3dee8f23afc..cd0bce8fc2a 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -43,141 +43,159 @@ #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) -static void *create_test_tag(void) { +static void * +create_test_tag (void) +{ static gpr_intptr i = 0; - return (void *)(++i); + return (void *) (++i); } /* helper for tests to shutdown correctly and tersely */ -static void shutdown_and_destroy(grpc_completion_queue *cc) { +static void +shutdown_and_destroy (grpc_completion_queue * cc) +{ grpc_event ev; - grpc_completion_queue_shutdown(cc); - ev = grpc_completion_queue_next(cc, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); - grpc_completion_queue_destroy(cc); + grpc_completion_queue_shutdown (cc); + ev = grpc_completion_queue_next (cc, gpr_inf_past (GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT (ev.type == GRPC_QUEUE_SHUTDOWN); + grpc_completion_queue_destroy (cc); } /* ensure we can create and destroy a completion channel */ -static void test_no_op(void) { - LOG_TEST("test_no_op"); - shutdown_and_destroy(grpc_completion_queue_create(NULL)); +static void +test_no_op (void) +{ + LOG_TEST ("test_no_op"); + shutdown_and_destroy (grpc_completion_queue_create (NULL)); } -static void test_wait_empty(void) { +static void +test_wait_empty (void) +{ grpc_completion_queue *cc; grpc_event event; - LOG_TEST("test_wait_empty"); + LOG_TEST ("test_wait_empty"); - cc = grpc_completion_queue_create(NULL); - event = grpc_completion_queue_next(cc, gpr_now(GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT(event.type == GRPC_QUEUE_TIMEOUT); - shutdown_and_destroy(cc); + cc = grpc_completion_queue_create (NULL); + event = grpc_completion_queue_next (cc, gpr_now (GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT (event.type == GRPC_QUEUE_TIMEOUT); + shutdown_and_destroy (cc); } -static void do_nothing_end_completion(void *arg, grpc_cq_completion *c, - grpc_closure_list *closure_list) {} +static void +do_nothing_end_completion (void *arg, grpc_cq_completion * c, grpc_closure_list * closure_list) +{ +} -static void test_cq_end_op(void) { +static void +test_cq_end_op (void) +{ grpc_event ev; grpc_completion_queue *cc; grpc_cq_completion completion; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - void *tag = create_test_tag(); + void *tag = create_test_tag (); - LOG_TEST("test_cq_end_op"); + LOG_TEST ("test_cq_end_op"); - cc = grpc_completion_queue_create(NULL); + cc = grpc_completion_queue_create (NULL); - grpc_cq_begin_op(cc); - grpc_cq_end_op(cc, tag, 1, do_nothing_end_completion, NULL, &completion, - &closure_list); + grpc_cq_begin_op (cc); + grpc_cq_end_op (cc, tag, 1, do_nothing_end_completion, NULL, &completion, &closure_list); - ev = grpc_completion_queue_next(cc, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); - GPR_ASSERT(ev.tag == tag); - GPR_ASSERT(ev.success); + ev = grpc_completion_queue_next (cc, gpr_inf_past (GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT (ev.type == GRPC_OP_COMPLETE); + GPR_ASSERT (ev.tag == tag); + GPR_ASSERT (ev.success); - shutdown_and_destroy(cc); - GPR_ASSERT(grpc_closure_list_empty(closure_list)); + shutdown_and_destroy (cc); + GPR_ASSERT (grpc_closure_list_empty (closure_list)); } -static void test_shutdown_then_next_polling(void) { +static void +test_shutdown_then_next_polling (void) +{ grpc_completion_queue *cc; grpc_event event; - LOG_TEST("test_shutdown_then_next_polling"); - - cc = grpc_completion_queue_create(NULL); - grpc_completion_queue_shutdown(cc); - event = - grpc_completion_queue_next(cc, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT(event.type == GRPC_QUEUE_SHUTDOWN); - grpc_completion_queue_destroy(cc); + LOG_TEST ("test_shutdown_then_next_polling"); + + cc = grpc_completion_queue_create (NULL); + grpc_completion_queue_shutdown (cc); + event = grpc_completion_queue_next (cc, gpr_inf_past (GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT (event.type == GRPC_QUEUE_SHUTDOWN); + grpc_completion_queue_destroy (cc); } -static void test_shutdown_then_next_with_timeout(void) { +static void +test_shutdown_then_next_with_timeout (void) +{ grpc_completion_queue *cc; grpc_event event; - LOG_TEST("test_shutdown_then_next_with_timeout"); - - cc = grpc_completion_queue_create(NULL); - grpc_completion_queue_shutdown(cc); - event = - grpc_completion_queue_next(cc, gpr_inf_future(GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT(event.type == GRPC_QUEUE_SHUTDOWN); - grpc_completion_queue_destroy(cc); + LOG_TEST ("test_shutdown_then_next_with_timeout"); + + cc = grpc_completion_queue_create (NULL); + grpc_completion_queue_shutdown (cc); + event = grpc_completion_queue_next (cc, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT (event.type == GRPC_QUEUE_SHUTDOWN); + grpc_completion_queue_destroy (cc); } -static void test_pluck(void) { +static void +test_pluck (void) +{ grpc_event ev; grpc_completion_queue *cc; void *tags[128]; - grpc_cq_completion completions[GPR_ARRAY_SIZE(tags)]; + grpc_cq_completion completions[GPR_ARRAY_SIZE (tags)]; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; unsigned i, j; - LOG_TEST("test_pluck"); + LOG_TEST ("test_pluck"); + + for (i = 0; i < GPR_ARRAY_SIZE (tags); i++) + { + tags[i] = create_test_tag (); + for (j = 0; j < i; j++) + { + GPR_ASSERT (tags[i] != tags[j]); + } + } + + cc = grpc_completion_queue_create (NULL); + + for (i = 0; i < GPR_ARRAY_SIZE (tags); i++) + { + grpc_cq_begin_op (cc); + grpc_cq_end_op (cc, tags[i], 1, do_nothing_end_completion, NULL, &completions[i], &closure_list); + } + + for (i = 0; i < GPR_ARRAY_SIZE (tags); i++) + { + ev = grpc_completion_queue_pluck (cc, tags[i], gpr_inf_past (GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT (ev.tag == tags[i]); + } + + for (i = 0; i < GPR_ARRAY_SIZE (tags); i++) + { + grpc_cq_begin_op (cc); + grpc_cq_end_op (cc, tags[i], 1, do_nothing_end_completion, NULL, &completions[i], &closure_list); + } - for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { - tags[i] = create_test_tag(); - for (j = 0; j < i; j++) { - GPR_ASSERT(tags[i] != tags[j]); + for (i = 0; i < GPR_ARRAY_SIZE (tags); i++) + { + ev = grpc_completion_queue_pluck (cc, tags[GPR_ARRAY_SIZE (tags) - i - 1], gpr_inf_past (GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT (ev.tag == tags[GPR_ARRAY_SIZE (tags) - i - 1]); } - } - - cc = grpc_completion_queue_create(NULL); - - for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { - grpc_cq_begin_op(cc); - grpc_cq_end_op(cc, tags[i], 1, do_nothing_end_completion, NULL, - &completions[i], &closure_list); - } - - for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { - ev = grpc_completion_queue_pluck(cc, tags[i], - gpr_inf_past(GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT(ev.tag == tags[i]); - } - - for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { - grpc_cq_begin_op(cc); - grpc_cq_end_op(cc, tags[i], 1, do_nothing_end_completion, NULL, - &completions[i], &closure_list); - } - - for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { - ev = grpc_completion_queue_pluck(cc, tags[GPR_ARRAY_SIZE(tags) - i - 1], - gpr_inf_past(GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT(ev.tag == tags[GPR_ARRAY_SIZE(tags) - i - 1]); - } - - shutdown_and_destroy(cc); - GPR_ASSERT(grpc_closure_list_empty(closure_list)); + + shutdown_and_destroy (cc); + GPR_ASSERT (grpc_closure_list_empty (closure_list)); } #define TEST_THREAD_EVENTS 10000 -typedef struct test_thread_options { +typedef struct test_thread_options +{ gpr_event on_started; gpr_event *phase1; gpr_event on_phase1_done; @@ -188,164 +206,181 @@ typedef struct test_thread_options { grpc_completion_queue *cc; } test_thread_options; -gpr_timespec ten_seconds_time(void) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10); +gpr_timespec +ten_seconds_time (void) +{ + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10); } -static void free_completion(void *arg, grpc_cq_completion *completion, - grpc_closure_list *closure_list) { - gpr_free(completion); +static void +free_completion (void *arg, grpc_cq_completion * completion, grpc_closure_list * closure_list) +{ + gpr_free (completion); } -static void producer_thread(void *arg) { +static void +producer_thread (void *arg) +{ test_thread_options *opt = arg; int i; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - gpr_log(GPR_INFO, "producer %d started", opt->id); - gpr_event_set(&opt->on_started, (void *)(gpr_intptr)1); - GPR_ASSERT(gpr_event_wait(opt->phase1, ten_seconds_time())); - - gpr_log(GPR_INFO, "producer %d phase 1", opt->id); - for (i = 0; i < TEST_THREAD_EVENTS; i++) { - grpc_cq_begin_op(opt->cc); - } - - gpr_log(GPR_INFO, "producer %d phase 1 done", opt->id); - gpr_event_set(&opt->on_phase1_done, (void *)(gpr_intptr)1); - GPR_ASSERT(gpr_event_wait(opt->phase2, ten_seconds_time())); - - gpr_log(GPR_INFO, "producer %d phase 2", opt->id); - for (i = 0; i < TEST_THREAD_EVENTS; i++) { - grpc_cq_end_op(opt->cc, (void *)(gpr_intptr)1, 1, free_completion, NULL, - gpr_malloc(sizeof(grpc_cq_completion)), &closure_list); - opt->events_triggered++; - grpc_closure_list_run(&closure_list); - } - - gpr_log(GPR_INFO, "producer %d phase 2 done", opt->id); - gpr_event_set(&opt->on_finished, (void *)(gpr_intptr)1); - GPR_ASSERT(grpc_closure_list_empty(closure_list)); + gpr_log (GPR_INFO, "producer %d started", opt->id); + gpr_event_set (&opt->on_started, (void *) (gpr_intptr) 1); + GPR_ASSERT (gpr_event_wait (opt->phase1, ten_seconds_time ())); + + gpr_log (GPR_INFO, "producer %d phase 1", opt->id); + for (i = 0; i < TEST_THREAD_EVENTS; i++) + { + grpc_cq_begin_op (opt->cc); + } + + gpr_log (GPR_INFO, "producer %d phase 1 done", opt->id); + gpr_event_set (&opt->on_phase1_done, (void *) (gpr_intptr) 1); + GPR_ASSERT (gpr_event_wait (opt->phase2, ten_seconds_time ())); + + gpr_log (GPR_INFO, "producer %d phase 2", opt->id); + for (i = 0; i < TEST_THREAD_EVENTS; i++) + { + grpc_cq_end_op (opt->cc, (void *) (gpr_intptr) 1, 1, free_completion, NULL, gpr_malloc (sizeof (grpc_cq_completion)), &closure_list); + opt->events_triggered++; + grpc_closure_list_run (&closure_list); + } + + gpr_log (GPR_INFO, "producer %d phase 2 done", opt->id); + gpr_event_set (&opt->on_finished, (void *) (gpr_intptr) 1); + GPR_ASSERT (grpc_closure_list_empty (closure_list)); } -static void consumer_thread(void *arg) { +static void +consumer_thread (void *arg) +{ test_thread_options *opt = arg; grpc_event ev; - gpr_log(GPR_INFO, "consumer %d started", opt->id); - gpr_event_set(&opt->on_started, (void *)(gpr_intptr)1); - GPR_ASSERT(gpr_event_wait(opt->phase1, ten_seconds_time())); - - gpr_log(GPR_INFO, "consumer %d phase 1", opt->id); - - gpr_log(GPR_INFO, "consumer %d phase 1 done", opt->id); - gpr_event_set(&opt->on_phase1_done, (void *)(gpr_intptr)1); - GPR_ASSERT(gpr_event_wait(opt->phase2, ten_seconds_time())); - - gpr_log(GPR_INFO, "consumer %d phase 2", opt->id); - for (;;) { - ev = grpc_completion_queue_next(opt->cc, ten_seconds_time(), NULL); - switch (ev.type) { - case GRPC_OP_COMPLETE: - GPR_ASSERT(ev.success); - opt->events_triggered++; - break; - case GRPC_QUEUE_SHUTDOWN: - gpr_log(GPR_INFO, "consumer %d phase 2 done", opt->id); - gpr_event_set(&opt->on_finished, (void *)(gpr_intptr)1); - return; - case GRPC_QUEUE_TIMEOUT: - gpr_log(GPR_ERROR, "Invalid timeout received"); - abort(); + gpr_log (GPR_INFO, "consumer %d started", opt->id); + gpr_event_set (&opt->on_started, (void *) (gpr_intptr) 1); + GPR_ASSERT (gpr_event_wait (opt->phase1, ten_seconds_time ())); + + gpr_log (GPR_INFO, "consumer %d phase 1", opt->id); + + gpr_log (GPR_INFO, "consumer %d phase 1 done", opt->id); + gpr_event_set (&opt->on_phase1_done, (void *) (gpr_intptr) 1); + GPR_ASSERT (gpr_event_wait (opt->phase2, ten_seconds_time ())); + + gpr_log (GPR_INFO, "consumer %d phase 2", opt->id); + for (;;) + { + ev = grpc_completion_queue_next (opt->cc, ten_seconds_time (), NULL); + switch (ev.type) + { + case GRPC_OP_COMPLETE: + GPR_ASSERT (ev.success); + opt->events_triggered++; + break; + case GRPC_QUEUE_SHUTDOWN: + gpr_log (GPR_INFO, "consumer %d phase 2 done", opt->id); + gpr_event_set (&opt->on_finished, (void *) (gpr_intptr) 1); + return; + case GRPC_QUEUE_TIMEOUT: + gpr_log (GPR_ERROR, "Invalid timeout received"); + abort (); + } } - } } -static void test_threading(size_t producers, size_t consumers) { - test_thread_options *options = - gpr_malloc((producers + consumers) * sizeof(test_thread_options)); +static void +test_threading (size_t producers, size_t consumers) +{ + test_thread_options *options = gpr_malloc ((producers + consumers) * sizeof (test_thread_options)); gpr_event phase1 = GPR_EVENT_INIT; gpr_event phase2 = GPR_EVENT_INIT; - grpc_completion_queue *cc = grpc_completion_queue_create(NULL); + grpc_completion_queue *cc = grpc_completion_queue_create (NULL); size_t i; size_t total_consumed = 0; static int optid = 101; - gpr_log(GPR_INFO, "%s: %d producers, %d consumers", "test_threading", - producers, consumers); + gpr_log (GPR_INFO, "%s: %d producers, %d consumers", "test_threading", producers, consumers); /* start all threads: they will wait for phase1 */ - for (i = 0; i < producers + consumers; i++) { - gpr_thd_id id; - gpr_event_init(&options[i].on_started); - gpr_event_init(&options[i].on_phase1_done); - gpr_event_init(&options[i].on_finished); - options[i].phase1 = &phase1; - options[i].phase2 = &phase2; - options[i].events_triggered = 0; - options[i].cc = cc; - options[i].id = optid++; - GPR_ASSERT(gpr_thd_new(&id, - i < producers ? producer_thread : consumer_thread, - options + i, NULL)); - gpr_event_wait(&options[i].on_started, ten_seconds_time()); - } + for (i = 0; i < producers + consumers; i++) + { + gpr_thd_id id; + gpr_event_init (&options[i].on_started); + gpr_event_init (&options[i].on_phase1_done); + gpr_event_init (&options[i].on_finished); + options[i].phase1 = &phase1; + options[i].phase2 = &phase2; + options[i].events_triggered = 0; + options[i].cc = cc; + options[i].id = optid++; + GPR_ASSERT (gpr_thd_new (&id, i < producers ? producer_thread : consumer_thread, options + i, NULL)); + gpr_event_wait (&options[i].on_started, ten_seconds_time ()); + } /* start phase1: producers will pre-declare all operations they will complete */ - gpr_log(GPR_INFO, "start phase 1"); - gpr_event_set(&phase1, (void *)(gpr_intptr)1); + gpr_log (GPR_INFO, "start phase 1"); + gpr_event_set (&phase1, (void *) (gpr_intptr) 1); - gpr_log(GPR_INFO, "wait phase 1"); - for (i = 0; i < producers + consumers; i++) { - GPR_ASSERT(gpr_event_wait(&options[i].on_phase1_done, ten_seconds_time())); - } - gpr_log(GPR_INFO, "done phase 1"); + gpr_log (GPR_INFO, "wait phase 1"); + for (i = 0; i < producers + consumers; i++) + { + GPR_ASSERT (gpr_event_wait (&options[i].on_phase1_done, ten_seconds_time ())); + } + gpr_log (GPR_INFO, "done phase 1"); /* start phase2: operations will complete, and consumers will consume them */ - gpr_log(GPR_INFO, "start phase 2"); - gpr_event_set(&phase2, (void *)(gpr_intptr)1); + gpr_log (GPR_INFO, "start phase 2"); + gpr_event_set (&phase2, (void *) (gpr_intptr) 1); /* in parallel, we shutdown the completion channel - all events should still be consumed */ - grpc_completion_queue_shutdown(cc); + grpc_completion_queue_shutdown (cc); /* join all threads */ - gpr_log(GPR_INFO, "wait phase 2"); - for (i = 0; i < producers + consumers; i++) { - GPR_ASSERT(gpr_event_wait(&options[i].on_finished, ten_seconds_time())); - } - gpr_log(GPR_INFO, "done phase 2"); + gpr_log (GPR_INFO, "wait phase 2"); + for (i = 0; i < producers + consumers; i++) + { + GPR_ASSERT (gpr_event_wait (&options[i].on_finished, ten_seconds_time ())); + } + gpr_log (GPR_INFO, "done phase 2"); /* destroy the completion channel */ - grpc_completion_queue_destroy(cc); + grpc_completion_queue_destroy (cc); /* verify that everything was produced and consumed */ - for (i = 0; i < producers + consumers; i++) { - if (i < producers) { - GPR_ASSERT(options[i].events_triggered == TEST_THREAD_EVENTS); - } else { - total_consumed += options[i].events_triggered; + for (i = 0; i < producers + consumers; i++) + { + if (i < producers) + { + GPR_ASSERT (options[i].events_triggered == TEST_THREAD_EVENTS); + } + else + { + total_consumed += options[i].events_triggered; + } } - } - GPR_ASSERT(total_consumed == producers * TEST_THREAD_EVENTS); + GPR_ASSERT (total_consumed == producers * TEST_THREAD_EVENTS); - gpr_free(options); + gpr_free (options); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - grpc_init(); - test_no_op(); - test_wait_empty(); - test_shutdown_then_next_polling(); - test_shutdown_then_next_with_timeout(); - test_cq_end_op(); - test_pluck(); - test_threading(1, 1); - test_threading(1, 10); - test_threading(10, 1); - test_threading(10, 10); - grpc_shutdown(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + grpc_init (); + test_no_op (); + test_wait_empty (); + test_shutdown_then_next_polling (); + test_shutdown_then_next_with_timeout (); + test_cq_end_op (); + test_pluck (); + test_threading (1, 1); + test_threading (1, 10); + test_threading (10, 1); + test_threading (10, 10); + grpc_shutdown (); return 0; } diff --git a/test/core/surface/lame_client_test.c b/test/core/surface/lame_client_test.c index 0d29bea5559..434779b2733 100644 --- a/test/core/surface/lame_client_test.c +++ b/test/core/surface/lame_client_test.c @@ -38,9 +38,15 @@ #include #include -static void *tag(gpr_intptr x) { return (void *)x; } +static void * +tag (gpr_intptr x) +{ + return (void *) x; +} -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ grpc_channel *chan; grpc_call *call; grpc_completion_queue *cq; @@ -53,20 +59,17 @@ int main(int argc, char **argv) { char *details = NULL; size_t details_capacity = 0; - grpc_test_init(argc, argv); - grpc_init(); + grpc_test_init (argc, argv); + grpc_init (); - grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init (&trailing_metadata_recv); - chan = grpc_lame_client_channel_create( - "lampoon:national", GRPC_STATUS_UNKNOWN, "Rpc sent on a lame channel."); - GPR_ASSERT(chan); - cq = grpc_completion_queue_create(NULL); - call = grpc_channel_create_call(chan, NULL, GRPC_PROPAGATE_DEFAULTS, cq, - "/Foo", "anywhere", - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(100), NULL); - GPR_ASSERT(call); - cqv = cq_verifier_create(cq); + chan = grpc_lame_client_channel_create ("lampoon:national", GRPC_STATUS_UNKNOWN, "Rpc sent on a lame channel."); + GPR_ASSERT (chan); + cq = grpc_completion_queue_create (NULL); + call = grpc_channel_create_call (chan, NULL, GRPC_PROPAGATE_DEFAULTS, cq, "/Foo", "anywhere", GRPC_TIMEOUT_SECONDS_TO_DEADLINE (100), NULL); + GPR_ASSERT (call); + cqv = cq_verifier_create (cq); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -82,22 +85,22 @@ int main(int argc, char **argv) { op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch(call, ops, (size_t)(op - ops), tag(1), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); + error = grpc_call_start_batch (call, ops, (size_t) (op - ops), tag (1), NULL); + GPR_ASSERT (GRPC_CALL_OK == error); /* the call should immediately fail */ - cq_expect_completion(cqv, tag(1), 1); - cq_verify(cqv); + cq_expect_completion (cqv, tag (1), 1); + cq_verify (cqv); - grpc_call_destroy(call); - grpc_channel_destroy(chan); - cq_verifier_destroy(cqv); - grpc_completion_queue_destroy(cq); + grpc_call_destroy (call); + grpc_channel_destroy (chan); + cq_verifier_destroy (cqv); + grpc_completion_queue_destroy (cq); - grpc_metadata_array_destroy(&trailing_metadata_recv); - gpr_free(details); + grpc_metadata_array_destroy (&trailing_metadata_recv); + gpr_free (details); - grpc_shutdown(); + grpc_shutdown (); return 0; } diff --git a/test/core/surface/multi_init_test.c b/test/core/surface/multi_init_test.c index 99b7a52ff98..fafaae5902d 100644 --- a/test/core/surface/multi_init_test.c +++ b/test/core/surface/multi_init_test.c @@ -34,30 +34,38 @@ #include #include "test/core/util/test_config.h" -static void test(int rounds) { +static void +test (int rounds) +{ int i; - for (i = 0; i < rounds; i++) { - grpc_init(); - } - for (i = 0; i < rounds; i++) { - grpc_shutdown(); - } + for (i = 0; i < rounds; i++) + { + grpc_init (); + } + for (i = 0; i < rounds; i++) + { + grpc_shutdown (); + } } -static void test_mixed() { - grpc_init(); - grpc_init(); - grpc_shutdown(); - grpc_init(); - grpc_shutdown(); - grpc_shutdown(); +static void +test_mixed () +{ + grpc_init (); + grpc_init (); + grpc_shutdown (); + grpc_init (); + grpc_shutdown (); + grpc_shutdown (); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test(1); - test(2); - test(3); - test_mixed(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test (1); + test (2); + test (3); + test_mixed (); return 0; } diff --git a/test/core/transport/chttp2/alpn_test.c b/test/core/transport/chttp2/alpn_test.c index 9a7d5ef0c37..0a9b67e5fd5 100644 --- a/test/core/transport/chttp2/alpn_test.c +++ b/test/core/transport/chttp2/alpn_test.c @@ -36,18 +36,24 @@ #include #include "test/core/util/test_config.h" -static void test_alpn_success(void) { - GPR_ASSERT(grpc_chttp2_is_alpn_version_supported("h2", 2)); +static void +test_alpn_success (void) +{ + GPR_ASSERT (grpc_chttp2_is_alpn_version_supported ("h2", 2)); } -static void test_alpn_failure(void) { - GPR_ASSERT(!grpc_chttp2_is_alpn_version_supported("h2-155", 6)); - GPR_ASSERT(!grpc_chttp2_is_alpn_version_supported("h1-15", 5)); +static void +test_alpn_failure (void) +{ + GPR_ASSERT (!grpc_chttp2_is_alpn_version_supported ("h2-155", 6)); + GPR_ASSERT (!grpc_chttp2_is_alpn_version_supported ("h1-15", 5)); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_alpn_success(); - test_alpn_failure(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_alpn_success (); + test_alpn_failure (); return 0; } diff --git a/test/core/transport/chttp2/bin_encoder_test.c b/test/core/transport/chttp2/bin_encoder_test.c index 1ffd8ed3cbf..7d3ba224975 100644 --- a/test/core/transport/chttp2/bin_encoder_test.c +++ b/test/core/transport/chttp2/bin_encoder_test.c @@ -41,32 +41,37 @@ static int all_ok = 1; -static void expect_slice_eq(gpr_slice expected, gpr_slice slice, char *debug, - int line) { - if (0 != gpr_slice_cmp(slice, expected)) { - char *hs = gpr_dump_slice(slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); - char *he = gpr_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; - } - gpr_slice_unref(expected); - gpr_slice_unref(slice); +static void +expect_slice_eq (gpr_slice expected, gpr_slice slice, char *debug, int line) +{ + if (0 != gpr_slice_cmp (slice, expected)) + { + char *hs = gpr_dump_slice (slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); + char *he = gpr_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; + } + gpr_slice_unref (expected); + gpr_slice_unref (slice); } -static gpr_slice B64(const char *s) { - gpr_slice ss = gpr_slice_from_copied_string(s); - gpr_slice out = grpc_chttp2_base64_encode(ss); - gpr_slice_unref(ss); +static gpr_slice +B64 (const char *s) +{ + gpr_slice ss = gpr_slice_from_copied_string (s); + gpr_slice out = grpc_chttp2_base64_encode (ss); + gpr_slice_unref (ss); return out; } -static gpr_slice HUFF(const char *s) { - gpr_slice ss = gpr_slice_from_copied_string(s); - gpr_slice out = grpc_chttp2_huffman_compress(ss); - gpr_slice_unref(ss); +static gpr_slice +HUFF (const char *s) +{ + gpr_slice ss = gpr_slice_from_copied_string (s); + gpr_slice out = grpc_chttp2_huffman_compress (ss); + gpr_slice_unref (ss); return out; } @@ -75,108 +80,93 @@ static gpr_slice HUFF(const char *s) { gpr_slice_from_copied_buffer(expected, sizeof(expected) - 1), slice, \ #slice, __LINE__); -static void expect_combined_equiv(const char *s, size_t len, int line) { - gpr_slice input = gpr_slice_from_copied_buffer(s, len); - gpr_slice base64 = grpc_chttp2_base64_encode(input); - gpr_slice expect = grpc_chttp2_huffman_compress(base64); - gpr_slice got = grpc_chttp2_base64_encode_and_huffman_compress(input); - if (0 != gpr_slice_cmp(expect, got)) { - char *t = gpr_dump_slice(input, GPR_DUMP_HEX | GPR_DUMP_ASCII); - char *e = gpr_dump_slice(expect, GPR_DUMP_HEX | GPR_DUMP_ASCII); - char *g = gpr_dump_slice(got, GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_ERROR, "FAILED:%d:\ntest: %s\ngot: %s\nwant: %s", t, g, e); - gpr_free(t); - gpr_free(e); - gpr_free(g); - all_ok = 0; - } - gpr_slice_unref(input); - gpr_slice_unref(base64); - gpr_slice_unref(expect); - gpr_slice_unref(got); +static void +expect_combined_equiv (const char *s, size_t len, int line) +{ + gpr_slice input = gpr_slice_from_copied_buffer (s, len); + gpr_slice base64 = grpc_chttp2_base64_encode (input); + gpr_slice expect = grpc_chttp2_huffman_compress (base64); + gpr_slice got = grpc_chttp2_base64_encode_and_huffman_compress (input); + if (0 != gpr_slice_cmp (expect, got)) + { + char *t = gpr_dump_slice (input, GPR_DUMP_HEX | GPR_DUMP_ASCII); + char *e = gpr_dump_slice (expect, GPR_DUMP_HEX | GPR_DUMP_ASCII); + char *g = gpr_dump_slice (got, GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log (GPR_ERROR, "FAILED:%d:\ntest: %s\ngot: %s\nwant: %s", t, g, e); + gpr_free (t); + gpr_free (e); + gpr_free (g); + all_ok = 0; + } + gpr_slice_unref (input); + gpr_slice_unref (base64); + gpr_slice_unref (expect); + gpr_slice_unref (got); } #define EXPECT_COMBINED_EQUIV(x) \ expect_combined_equiv(x, sizeof(x) - 1, __LINE__) -static void expect_binary_header(const char *hdr, int binary) { - if (grpc_is_binary_header(hdr, strlen(hdr)) != binary) { - gpr_log(GPR_ERROR, "FAILED: expected header '%s' to be %s", hdr, - binary ? "binary" : "not binary"); - all_ok = 0; - } +static void +expect_binary_header (const char *hdr, int binary) +{ + if (grpc_is_binary_header (hdr, strlen (hdr)) != binary) + { + gpr_log (GPR_ERROR, "FAILED: expected header '%s' to be %s", hdr, binary ? "binary" : "not binary"); + all_ok = 0; + } } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ /* Base64 test vectors from RFC 4648, with padding removed */ /* BASE64("") = "" */ - EXPECT_SLICE_EQ("", B64("")); + EXPECT_SLICE_EQ ("", B64 ("")); /* BASE64("f") = "Zg" */ - EXPECT_SLICE_EQ("Zg", B64("f")); + EXPECT_SLICE_EQ ("Zg", B64 ("f")); /* BASE64("fo") = "Zm8" */ - EXPECT_SLICE_EQ("Zm8", B64("fo")); + EXPECT_SLICE_EQ ("Zm8", B64 ("fo")); /* BASE64("foo") = "Zm9v" */ - EXPECT_SLICE_EQ("Zm9v", B64("foo")); + EXPECT_SLICE_EQ ("Zm9v", B64 ("foo")); /* BASE64("foob") = "Zm9vYg" */ - EXPECT_SLICE_EQ("Zm9vYg", B64("foob")); + EXPECT_SLICE_EQ ("Zm9vYg", B64 ("foob")); /* BASE64("fooba") = "Zm9vYmE" */ - EXPECT_SLICE_EQ("Zm9vYmE", B64("fooba")); + EXPECT_SLICE_EQ ("Zm9vYmE", B64 ("fooba")); /* BASE64("foobar") = "Zm9vYmFy" */ - EXPECT_SLICE_EQ("Zm9vYmFy", B64("foobar")); + EXPECT_SLICE_EQ ("Zm9vYmFy", B64 ("foobar")); - EXPECT_SLICE_EQ("wMHCw8TF", B64("\xc0\xc1\xc2\xc3\xc4\xc5")); + EXPECT_SLICE_EQ ("wMHCw8TF", B64 ("\xc0\xc1\xc2\xc3\xc4\xc5")); /* Huffman encoding tests */ - EXPECT_SLICE_EQ("\xf1\xe3\xc2\xe5\xf2\x3a\x6b\xa0\xab\x90\xf4\xff", - HUFF("www.example.com")); - EXPECT_SLICE_EQ("\xa8\xeb\x10\x64\x9c\xbf", HUFF("no-cache")); - EXPECT_SLICE_EQ("\x25\xa8\x49\xe9\x5b\xa9\x7d\x7f", HUFF("custom-key")); - EXPECT_SLICE_EQ("\x25\xa8\x49\xe9\x5b\xb8\xe8\xb4\xbf", HUFF("custom-value")); - EXPECT_SLICE_EQ("\xae\xc3\x77\x1a\x4b", HUFF("private")); - EXPECT_SLICE_EQ( - "\xd0\x7a\xbe\x94\x10\x54\xd4\x44\xa8\x20\x05\x95\x04\x0b\x81\x66\xe0\x82" - "\xa6\x2d\x1b\xff", - HUFF("Mon, 21 Oct 2013 20:13:21 GMT")); - EXPECT_SLICE_EQ( - "\x9d\x29\xad\x17\x18\x63\xc7\x8f\x0b\x97\xc8\xe9\xae\x82\xae\x43\xd3", - HUFF("https://www.example.com")); + EXPECT_SLICE_EQ ("\xf1\xe3\xc2\xe5\xf2\x3a\x6b\xa0\xab\x90\xf4\xff", HUFF ("www.example.com")); + EXPECT_SLICE_EQ ("\xa8\xeb\x10\x64\x9c\xbf", HUFF ("no-cache")); + EXPECT_SLICE_EQ ("\x25\xa8\x49\xe9\x5b\xa9\x7d\x7f", HUFF ("custom-key")); + EXPECT_SLICE_EQ ("\x25\xa8\x49\xe9\x5b\xb8\xe8\xb4\xbf", HUFF ("custom-value")); + EXPECT_SLICE_EQ ("\xae\xc3\x77\x1a\x4b", HUFF ("private")); + EXPECT_SLICE_EQ ("\xd0\x7a\xbe\x94\x10\x54\xd4\x44\xa8\x20\x05\x95\x04\x0b\x81\x66\xe0\x82" "\xa6\x2d\x1b\xff", HUFF ("Mon, 21 Oct 2013 20:13:21 GMT")); + EXPECT_SLICE_EQ ("\x9d\x29\xad\x17\x18\x63\xc7\x8f\x0b\x97\xc8\xe9\xae\x82\xae\x43\xd3", HUFF ("https://www.example.com")); /* Various test vectors for combined encoding */ - EXPECT_COMBINED_EQUIV(""); - EXPECT_COMBINED_EQUIV("f"); - EXPECT_COMBINED_EQUIV("fo"); - EXPECT_COMBINED_EQUIV("foo"); - EXPECT_COMBINED_EQUIV("foob"); - EXPECT_COMBINED_EQUIV("fooba"); - EXPECT_COMBINED_EQUIV("foobar"); - EXPECT_COMBINED_EQUIV("www.example.com"); - EXPECT_COMBINED_EQUIV("no-cache"); - EXPECT_COMBINED_EQUIV("custom-key"); - EXPECT_COMBINED_EQUIV("custom-value"); - EXPECT_COMBINED_EQUIV("private"); - EXPECT_COMBINED_EQUIV("Mon, 21 Oct 2013 20:13:21 GMT"); - EXPECT_COMBINED_EQUIV("https://www.example.com"); - EXPECT_COMBINED_EQUIV( - "\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\x19\x1a\x1b\x1c\x1d\x1e\x1f" - "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f" - "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f" - "\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f" - "\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f" - "\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f" - "\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f" - "\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f" - "\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f" - "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf" - "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf" - "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf" - "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf" - "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef" - "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"); - - expect_binary_header("foo-bin", 1); - expect_binary_header("foo-bar", 0); - expect_binary_header("-bin", 0); + EXPECT_COMBINED_EQUIV (""); + EXPECT_COMBINED_EQUIV ("f"); + EXPECT_COMBINED_EQUIV ("fo"); + EXPECT_COMBINED_EQUIV ("foo"); + EXPECT_COMBINED_EQUIV ("foob"); + EXPECT_COMBINED_EQUIV ("fooba"); + EXPECT_COMBINED_EQUIV ("foobar"); + EXPECT_COMBINED_EQUIV ("www.example.com"); + EXPECT_COMBINED_EQUIV ("no-cache"); + EXPECT_COMBINED_EQUIV ("custom-key"); + EXPECT_COMBINED_EQUIV ("custom-value"); + EXPECT_COMBINED_EQUIV ("private"); + EXPECT_COMBINED_EQUIV ("Mon, 21 Oct 2013 20:13:21 GMT"); + EXPECT_COMBINED_EQUIV ("https://www.example.com"); + EXPECT_COMBINED_EQUIV ("\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\x19\x1a\x1b\x1c\x1d\x1e\x1f" "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f" "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f" "\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f" "\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f" "\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f" "\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f" "\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f" "\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f" "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf" "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf" "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf" "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf" "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef" "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"); + + expect_binary_header ("foo-bin", 1); + expect_binary_header ("foo-bar", 0); + expect_binary_header ("-bin", 0); return all_ok ? 0 : 1; } diff --git a/test/core/transport/chttp2/hpack_parser_test.c b/test/core/transport/chttp2/hpack_parser_test.c index 3a313375a49..2d8ac2e09ac 100644 --- a/test/core/transport/chttp2/hpack_parser_test.c +++ b/test/core/transport/chttp2/hpack_parser_test.c @@ -42,182 +42,120 @@ #include "test/core/util/slice_splitter.h" #include "test/core/util/test_config.h" -typedef struct { va_list args; } test_checker; - -static void onhdr(void *ud, grpc_mdelem *md) { +typedef struct +{ + va_list args; +} test_checker; + +static void +onhdr (void *ud, grpc_mdelem * md) +{ const char *ekey, *evalue; test_checker *chk = ud; - ekey = va_arg(chk->args, char *); - GPR_ASSERT(ekey); - evalue = va_arg(chk->args, char *); - GPR_ASSERT(evalue); - GPR_ASSERT(gpr_slice_str_cmp(md->key->slice, ekey) == 0); - GPR_ASSERT(gpr_slice_str_cmp(md->value->slice, evalue) == 0); - GRPC_MDELEM_UNREF(md); + ekey = va_arg (chk->args, char *); + GPR_ASSERT (ekey); + evalue = va_arg (chk->args, char *); + GPR_ASSERT (evalue); + GPR_ASSERT (gpr_slice_str_cmp (md->key->slice, ekey) == 0); + GPR_ASSERT (gpr_slice_str_cmp (md->value->slice, evalue) == 0); + GRPC_MDELEM_UNREF (md); } -static void test_vector(grpc_chttp2_hpack_parser *parser, - grpc_slice_split_mode mode, const char *hexstring, - ... /* char *key, char *value */) { - gpr_slice input = parse_hexstring(hexstring); +static void +test_vector (grpc_chttp2_hpack_parser * parser, grpc_slice_split_mode mode, const char *hexstring, ... /* char *key, char *value */ ) +{ + gpr_slice input = parse_hexstring (hexstring); gpr_slice *slices; size_t nslices; size_t i; test_checker chk; - va_start(chk.args, hexstring); + va_start (chk.args, hexstring); parser->on_header = onhdr; parser->on_header_user_data = &chk; - grpc_split_slices(mode, &input, 1, &slices, &nslices); - gpr_slice_unref(input); + grpc_split_slices (mode, &input, 1, &slices, &nslices); + gpr_slice_unref (input); - for (i = 0; i < nslices; i++) { - GPR_ASSERT(grpc_chttp2_hpack_parser_parse( - parser, GPR_SLICE_START_PTR(slices[i]), GPR_SLICE_END_PTR(slices[i]))); - } + for (i = 0; i < nslices; i++) + { + GPR_ASSERT (grpc_chttp2_hpack_parser_parse (parser, GPR_SLICE_START_PTR (slices[i]), GPR_SLICE_END_PTR (slices[i]))); + } - for (i = 0; i < nslices; i++) { - gpr_slice_unref(slices[i]); - } - gpr_free(slices); + for (i = 0; i < nslices; i++) + { + gpr_slice_unref (slices[i]); + } + gpr_free (slices); - GPR_ASSERT(NULL == va_arg(chk.args, char *)); + GPR_ASSERT (NULL == va_arg (chk.args, char *)); - va_end(chk.args); + va_end (chk.args); } -static void test_vectors(grpc_slice_split_mode mode) { +static void +test_vectors (grpc_slice_split_mode mode) +{ grpc_chttp2_hpack_parser parser; - grpc_mdctx *mdctx = grpc_mdctx_create(); + grpc_mdctx *mdctx = grpc_mdctx_create (); - grpc_chttp2_hpack_parser_init(&parser, mdctx); + grpc_chttp2_hpack_parser_init (&parser, mdctx); /* D.2.1 */ - test_vector(&parser, mode, - "400a 6375 7374 6f6d 2d6b 6579 0d63 7573" - "746f 6d2d 6865 6164 6572", - "custom-key", "custom-header", NULL); + test_vector (&parser, mode, "400a 6375 7374 6f6d 2d6b 6579 0d63 7573" "746f 6d2d 6865 6164 6572", "custom-key", "custom-header", NULL); /* D.2.2 */ - test_vector(&parser, mode, "040c 2f73 616d 706c 652f 7061 7468", ":path", - "/sample/path", NULL); + test_vector (&parser, mode, "040c 2f73 616d 706c 652f 7061 7468", ":path", "/sample/path", NULL); /* D.2.3 */ - test_vector(&parser, mode, - "1008 7061 7373 776f 7264 0673 6563 7265" - "74", - "password", "secret", NULL); + test_vector (&parser, mode, "1008 7061 7373 776f 7264 0673 6563 7265" "74", "password", "secret", NULL); /* D.2.4 */ - test_vector(&parser, mode, "82", ":method", "GET", NULL); - grpc_chttp2_hpack_parser_destroy(&parser); + test_vector (&parser, mode, "82", ":method", "GET", NULL); + grpc_chttp2_hpack_parser_destroy (&parser); - grpc_chttp2_hpack_parser_init(&parser, mdctx); + grpc_chttp2_hpack_parser_init (&parser, mdctx); /* D.3.1 */ - test_vector(&parser, mode, - "8286 8441 0f77 7777 2e65 7861 6d70 6c65" - "2e63 6f6d", - ":method", "GET", ":scheme", "http", ":path", "/", ":authority", - "www.example.com", NULL); + test_vector (&parser, mode, "8286 8441 0f77 7777 2e65 7861 6d70 6c65" "2e63 6f6d", ":method", "GET", ":scheme", "http", ":path", "/", ":authority", "www.example.com", NULL); /* D.3.2 */ - test_vector(&parser, mode, "8286 84be 5808 6e6f 2d63 6163 6865", ":method", - "GET", ":scheme", "http", ":path", "/", ":authority", - "www.example.com", "cache-control", "no-cache", NULL); + test_vector (&parser, mode, "8286 84be 5808 6e6f 2d63 6163 6865", ":method", "GET", ":scheme", "http", ":path", "/", ":authority", "www.example.com", "cache-control", "no-cache", NULL); /* D.3.3 */ - test_vector(&parser, mode, - "8287 85bf 400a 6375 7374 6f6d 2d6b 6579" - "0c63 7573 746f 6d2d 7661 6c75 65", - ":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_init(&parser, mdctx); + test_vector (&parser, mode, "8287 85bf 400a 6375 7374 6f6d 2d6b 6579" "0c63 7573 746f 6d2d 7661 6c75 65", ":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_init (&parser, mdctx); /* D.4.1 */ - test_vector(&parser, mode, - "8286 8441 8cf1 e3c2 e5f2 3a6b a0ab 90f4" - "ff", - ":method", "GET", ":scheme", "http", ":path", "/", ":authority", - "www.example.com", NULL); + test_vector (&parser, mode, "8286 8441 8cf1 e3c2 e5f2 3a6b a0ab 90f4" "ff", ":method", "GET", ":scheme", "http", ":path", "/", ":authority", "www.example.com", NULL); /* D.4.2 */ - test_vector(&parser, mode, "8286 84be 5886 a8eb 1064 9cbf", ":method", "GET", - ":scheme", "http", ":path", "/", ":authority", "www.example.com", - "cache-control", "no-cache", NULL); + test_vector (&parser, mode, "8286 84be 5886 a8eb 1064 9cbf", ":method", "GET", ":scheme", "http", ":path", "/", ":authority", "www.example.com", "cache-control", "no-cache", NULL); /* D.4.3 */ - test_vector(&parser, mode, - "8287 85bf 4088 25a8 49e9 5ba9 7d7f 8925" - "a849 e95b b8e8 b4bf", - ":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_init(&parser, mdctx); + test_vector (&parser, mode, "8287 85bf 4088 25a8 49e9 5ba9 7d7f 8925" "a849 e95b b8e8 b4bf", ":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_init (&parser, mdctx); parser.table.max_bytes = 256; /* D.5.1 */ - test_vector(&parser, mode, - "4803 3330 3258 0770 7269 7661 7465 611d" - "4d6f 6e2c 2032 3120 4f63 7420 3230 3133" - "2032 303a 3133 3a32 3120 474d 546e 1768" - "7474 7073 3a2f 2f77 7777 2e65 7861 6d70" - "6c65 2e63 6f6d", - ":status", "302", "cache-control", "private", "date", - "Mon, 21 Oct 2013 20:13:21 GMT", "location", - "https://www.example.com", NULL); + test_vector (&parser, mode, "4803 3330 3258 0770 7269 7661 7465 611d" "4d6f 6e2c 2032 3120 4f63 7420 3230 3133" "2032 303a 3133 3a32 3120 474d 546e 1768" "7474 7073 3a2f 2f77 7777 2e65 7861 6d70" "6c65 2e63 6f6d", ":status", "302", "cache-control", "private", "date", "Mon, 21 Oct 2013 20:13:21 GMT", "location", "https://www.example.com", NULL); /* D.5.2 */ - test_vector(&parser, mode, "4803 3330 37c1 c0bf", ":status", "307", - "cache-control", "private", "date", - "Mon, 21 Oct 2013 20:13:21 GMT", "location", - "https://www.example.com", NULL); + test_vector (&parser, mode, "4803 3330 37c1 c0bf", ":status", "307", "cache-control", "private", "date", "Mon, 21 Oct 2013 20:13:21 GMT", "location", "https://www.example.com", NULL); /* D.5.3 */ - test_vector(&parser, mode, - "88c1 611d 4d6f 6e2c 2032 3120 4f63 7420" - "3230 3133 2032 303a 3133 3a32 3220 474d" - "54c0 5a04 677a 6970 7738 666f 6f3d 4153" - "444a 4b48 514b 425a 584f 5157 454f 5049" - "5541 5851 5745 4f49 553b 206d 6178 2d61" - "6765 3d33 3630 303b 2076 6572 7369 6f6e" - "3d31", - ":status", "200", "cache-control", "private", "date", - "Mon, 21 Oct 2013 20:13:22 GMT", "location", - "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_init(&parser, mdctx); + test_vector (&parser, mode, "88c1 611d 4d6f 6e2c 2032 3120 4f63 7420" "3230 3133 2032 303a 3133 3a32 3220 474d" "54c0 5a04 677a 6970 7738 666f 6f3d 4153" "444a 4b48 514b 425a 584f 5157 454f 5049" "5541 5851 5745 4f49 553b 206d 6178 2d61" "6765 3d33 3630 303b 2076 6572 7369 6f6e" "3d31", ":status", "200", "cache-control", "private", "date", "Mon, 21 Oct 2013 20:13:22 GMT", "location", "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_init (&parser, mdctx); parser.table.max_bytes = 256; /* D.6.1 */ - test_vector(&parser, mode, - "4882 6402 5885 aec3 771a 4b61 96d0 7abe" - "9410 54d4 44a8 2005 9504 0b81 66e0 82a6" - "2d1b ff6e 919d 29ad 1718 63c7 8f0b 97c8" - "e9ae 82ae 43d3", - ":status", "302", "cache-control", "private", "date", - "Mon, 21 Oct 2013 20:13:21 GMT", "location", - "https://www.example.com", NULL); + test_vector (&parser, mode, "4882 6402 5885 aec3 771a 4b61 96d0 7abe" "9410 54d4 44a8 2005 9504 0b81 66e0 82a6" "2d1b ff6e 919d 29ad 1718 63c7 8f0b 97c8" "e9ae 82ae 43d3", ":status", "302", "cache-control", "private", "date", "Mon, 21 Oct 2013 20:13:21 GMT", "location", "https://www.example.com", NULL); /* D.6.2 */ - test_vector(&parser, mode, "4883 640e ffc1 c0bf", ":status", "307", - "cache-control", "private", "date", - "Mon, 21 Oct 2013 20:13:21 GMT", "location", - "https://www.example.com", NULL); + test_vector (&parser, mode, "4883 640e ffc1 c0bf", ":status", "307", "cache-control", "private", "date", "Mon, 21 Oct 2013 20:13:21 GMT", "location", "https://www.example.com", NULL); /* D.6.3 */ - test_vector(&parser, mode, - "88c1 6196 d07a be94 1054 d444 a820 0595" - "040b 8166 e084 a62d 1bff c05a 839b d9ab" - "77ad 94e7 821d d7f2 e6c7 b335 dfdf cd5b" - "3960 d5af 2708 7f36 72c1 ab27 0fb5 291f" - "9587 3160 65c0 03ed 4ee5 b106 3d50 07", - ":status", "200", "cache-control", "private", "date", - "Mon, 21 Oct 2013 20:13:22 GMT", "location", - "https://www.example.com", "content-encoding", "gzip", - "set-cookie", - "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1", NULL); - grpc_chttp2_hpack_parser_destroy(&parser); - grpc_mdctx_unref(mdctx); + test_vector (&parser, mode, "88c1 6196 d07a be94 1054 d444 a820 0595" "040b 8166 e084 a62d 1bff c05a 839b d9ab" "77ad 94e7 821d d7f2 e6c7 b335 dfdf cd5b" "3960 d5af 2708 7f36 72c1 ab27 0fb5 291f" "9587 3160 65c0 03ed 4ee5 b106 3d50 07", ":status", "200", "cache-control", "private", "date", "Mon, 21 Oct 2013 20:13:22 GMT", "location", "https://www.example.com", "content-encoding", "gzip", "set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1", NULL); + grpc_chttp2_hpack_parser_destroy (&parser); + grpc_mdctx_unref (mdctx); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_vectors(GRPC_SLICE_SPLIT_MERGE_ALL); - test_vectors(GRPC_SLICE_SPLIT_ONE_BYTE); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_vectors (GRPC_SLICE_SPLIT_MERGE_ALL); + test_vectors (GRPC_SLICE_SPLIT_ONE_BYTE); return 0; } diff --git a/test/core/transport/chttp2/hpack_table_test.c b/test/core/transport/chttp2/hpack_table_test.c index aa3e273a6c9..cf64105a94a 100644 --- a/test/core/transport/chttp2/hpack_table_test.c +++ b/test/core/transport/chttp2/hpack_table_test.c @@ -44,232 +44,245 @@ #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) -static void assert_str(const grpc_chttp2_hptbl *tbl, grpc_mdstr *mdstr, - const char *str) { - GPR_ASSERT(gpr_slice_str_cmp(mdstr->slice, str) == 0); +static void +assert_str (const grpc_chttp2_hptbl * tbl, grpc_mdstr * mdstr, const char *str) +{ + GPR_ASSERT (gpr_slice_str_cmp (mdstr->slice, str) == 0); } -static void assert_index(const grpc_chttp2_hptbl *tbl, gpr_uint32 idx, - const char *key, const char *value) { - grpc_mdelem *md = grpc_chttp2_hptbl_lookup(tbl, idx); - assert_str(tbl, md->key, key); - assert_str(tbl, md->value, value); +static void +assert_index (const grpc_chttp2_hptbl * tbl, gpr_uint32 idx, const char *key, const char *value) +{ + grpc_mdelem *md = grpc_chttp2_hptbl_lookup (tbl, idx); + assert_str (tbl, md->key, key); + assert_str (tbl, md->value, value); } -static void test_static_lookup(void) { +static void +test_static_lookup (void) +{ grpc_chttp2_hptbl tbl; grpc_mdctx *mdctx; - mdctx = grpc_mdctx_create(); - grpc_chttp2_hptbl_init(&tbl, mdctx); - - LOG_TEST("test_static_lookup"); - assert_index(&tbl, 1, ":authority", ""); - assert_index(&tbl, 2, ":method", "GET"); - assert_index(&tbl, 3, ":method", "POST"); - assert_index(&tbl, 4, ":path", "/"); - assert_index(&tbl, 5, ":path", "/index.html"); - assert_index(&tbl, 6, ":scheme", "http"); - assert_index(&tbl, 7, ":scheme", "https"); - assert_index(&tbl, 8, ":status", "200"); - assert_index(&tbl, 9, ":status", "204"); - assert_index(&tbl, 10, ":status", "206"); - assert_index(&tbl, 11, ":status", "304"); - assert_index(&tbl, 12, ":status", "400"); - assert_index(&tbl, 13, ":status", "404"); - assert_index(&tbl, 14, ":status", "500"); - assert_index(&tbl, 15, "accept-charset", ""); - assert_index(&tbl, 16, "accept-encoding", "gzip, deflate"); - assert_index(&tbl, 17, "accept-language", ""); - assert_index(&tbl, 18, "accept-ranges", ""); - assert_index(&tbl, 19, "accept", ""); - assert_index(&tbl, 20, "access-control-allow-origin", ""); - assert_index(&tbl, 21, "age", ""); - assert_index(&tbl, 22, "allow", ""); - assert_index(&tbl, 23, "authorization", ""); - assert_index(&tbl, 24, "cache-control", ""); - assert_index(&tbl, 25, "content-disposition", ""); - assert_index(&tbl, 26, "content-encoding", ""); - assert_index(&tbl, 27, "content-language", ""); - assert_index(&tbl, 28, "content-length", ""); - assert_index(&tbl, 29, "content-location", ""); - assert_index(&tbl, 30, "content-range", ""); - assert_index(&tbl, 31, "content-type", ""); - assert_index(&tbl, 32, "cookie", ""); - assert_index(&tbl, 33, "date", ""); - assert_index(&tbl, 34, "etag", ""); - assert_index(&tbl, 35, "expect", ""); - assert_index(&tbl, 36, "expires", ""); - assert_index(&tbl, 37, "from", ""); - assert_index(&tbl, 38, "host", ""); - assert_index(&tbl, 39, "if-match", ""); - assert_index(&tbl, 40, "if-modified-since", ""); - assert_index(&tbl, 41, "if-none-match", ""); - assert_index(&tbl, 42, "if-range", ""); - assert_index(&tbl, 43, "if-unmodified-since", ""); - assert_index(&tbl, 44, "last-modified", ""); - assert_index(&tbl, 45, "link", ""); - assert_index(&tbl, 46, "location", ""); - assert_index(&tbl, 47, "max-forwards", ""); - assert_index(&tbl, 48, "proxy-authenticate", ""); - assert_index(&tbl, 49, "proxy-authorization", ""); - assert_index(&tbl, 50, "range", ""); - assert_index(&tbl, 51, "referer", ""); - assert_index(&tbl, 52, "refresh", ""); - assert_index(&tbl, 53, "retry-after", ""); - assert_index(&tbl, 54, "server", ""); - assert_index(&tbl, 55, "set-cookie", ""); - assert_index(&tbl, 56, "strict-transport-security", ""); - assert_index(&tbl, 57, "transfer-encoding", ""); - assert_index(&tbl, 58, "user-agent", ""); - assert_index(&tbl, 59, "vary", ""); - assert_index(&tbl, 60, "via", ""); - assert_index(&tbl, 61, "www-authenticate", ""); - - grpc_chttp2_hptbl_destroy(&tbl); - grpc_mdctx_unref(mdctx); + mdctx = grpc_mdctx_create (); + grpc_chttp2_hptbl_init (&tbl, mdctx); + + LOG_TEST ("test_static_lookup"); + assert_index (&tbl, 1, ":authority", ""); + assert_index (&tbl, 2, ":method", "GET"); + assert_index (&tbl, 3, ":method", "POST"); + assert_index (&tbl, 4, ":path", "/"); + assert_index (&tbl, 5, ":path", "/index.html"); + assert_index (&tbl, 6, ":scheme", "http"); + assert_index (&tbl, 7, ":scheme", "https"); + assert_index (&tbl, 8, ":status", "200"); + assert_index (&tbl, 9, ":status", "204"); + assert_index (&tbl, 10, ":status", "206"); + assert_index (&tbl, 11, ":status", "304"); + assert_index (&tbl, 12, ":status", "400"); + assert_index (&tbl, 13, ":status", "404"); + assert_index (&tbl, 14, ":status", "500"); + assert_index (&tbl, 15, "accept-charset", ""); + assert_index (&tbl, 16, "accept-encoding", "gzip, deflate"); + assert_index (&tbl, 17, "accept-language", ""); + assert_index (&tbl, 18, "accept-ranges", ""); + assert_index (&tbl, 19, "accept", ""); + assert_index (&tbl, 20, "access-control-allow-origin", ""); + assert_index (&tbl, 21, "age", ""); + assert_index (&tbl, 22, "allow", ""); + assert_index (&tbl, 23, "authorization", ""); + assert_index (&tbl, 24, "cache-control", ""); + assert_index (&tbl, 25, "content-disposition", ""); + assert_index (&tbl, 26, "content-encoding", ""); + assert_index (&tbl, 27, "content-language", ""); + assert_index (&tbl, 28, "content-length", ""); + assert_index (&tbl, 29, "content-location", ""); + assert_index (&tbl, 30, "content-range", ""); + assert_index (&tbl, 31, "content-type", ""); + assert_index (&tbl, 32, "cookie", ""); + assert_index (&tbl, 33, "date", ""); + assert_index (&tbl, 34, "etag", ""); + assert_index (&tbl, 35, "expect", ""); + assert_index (&tbl, 36, "expires", ""); + assert_index (&tbl, 37, "from", ""); + assert_index (&tbl, 38, "host", ""); + assert_index (&tbl, 39, "if-match", ""); + assert_index (&tbl, 40, "if-modified-since", ""); + assert_index (&tbl, 41, "if-none-match", ""); + assert_index (&tbl, 42, "if-range", ""); + assert_index (&tbl, 43, "if-unmodified-since", ""); + assert_index (&tbl, 44, "last-modified", ""); + assert_index (&tbl, 45, "link", ""); + assert_index (&tbl, 46, "location", ""); + assert_index (&tbl, 47, "max-forwards", ""); + assert_index (&tbl, 48, "proxy-authenticate", ""); + assert_index (&tbl, 49, "proxy-authorization", ""); + assert_index (&tbl, 50, "range", ""); + assert_index (&tbl, 51, "referer", ""); + assert_index (&tbl, 52, "refresh", ""); + assert_index (&tbl, 53, "retry-after", ""); + assert_index (&tbl, 54, "server", ""); + assert_index (&tbl, 55, "set-cookie", ""); + assert_index (&tbl, 56, "strict-transport-security", ""); + assert_index (&tbl, 57, "transfer-encoding", ""); + assert_index (&tbl, 58, "user-agent", ""); + assert_index (&tbl, 59, "vary", ""); + assert_index (&tbl, 60, "via", ""); + assert_index (&tbl, 61, "www-authenticate", ""); + + grpc_chttp2_hptbl_destroy (&tbl); + grpc_mdctx_unref (mdctx); } -static void test_many_additions(void) { +static void +test_many_additions (void) +{ grpc_chttp2_hptbl tbl; int i; char *key; char *value; grpc_mdctx *mdctx; - LOG_TEST("test_many_additions"); - - mdctx = grpc_mdctx_create(); - grpc_chttp2_hptbl_init(&tbl, mdctx); - - for (i = 0; i < 1000000; i++) { - gpr_asprintf(&key, "K:%d", i); - gpr_asprintf(&value, "VALUE:%d", i); - grpc_chttp2_hptbl_add(&tbl, grpc_mdelem_from_strings(mdctx, key, value)); - assert_index(&tbl, 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY, key, value); - gpr_free(key); - gpr_free(value); - if (i) { - gpr_asprintf(&key, "K:%d", i - 1); - gpr_asprintf(&value, "VALUE:%d", i - 1); - assert_index(&tbl, 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY, key, value); - gpr_free(key); - gpr_free(value); + LOG_TEST ("test_many_additions"); + + mdctx = grpc_mdctx_create (); + grpc_chttp2_hptbl_init (&tbl, mdctx); + + for (i = 0; i < 1000000; i++) + { + gpr_asprintf (&key, "K:%d", i); + gpr_asprintf (&value, "VALUE:%d", i); + grpc_chttp2_hptbl_add (&tbl, grpc_mdelem_from_strings (mdctx, key, value)); + assert_index (&tbl, 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY, key, value); + gpr_free (key); + gpr_free (value); + if (i) + { + gpr_asprintf (&key, "K:%d", i - 1); + gpr_asprintf (&value, "VALUE:%d", i - 1); + assert_index (&tbl, 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY, key, value); + gpr_free (key); + gpr_free (value); + } } - } - grpc_chttp2_hptbl_destroy(&tbl); - grpc_mdctx_unref(mdctx); + grpc_chttp2_hptbl_destroy (&tbl); + grpc_mdctx_unref (mdctx); } -static grpc_chttp2_hptbl_find_result find_simple(grpc_chttp2_hptbl *tbl, - const char *key, - const char *value) { - grpc_mdelem *md = grpc_mdelem_from_strings(tbl->mdctx, key, value); - grpc_chttp2_hptbl_find_result r = grpc_chttp2_hptbl_find(tbl, md); - GRPC_MDELEM_UNREF(md); +static grpc_chttp2_hptbl_find_result +find_simple (grpc_chttp2_hptbl * tbl, const char *key, const char *value) +{ + grpc_mdelem *md = grpc_mdelem_from_strings (tbl->mdctx, key, value); + grpc_chttp2_hptbl_find_result r = grpc_chttp2_hptbl_find (tbl, md); + GRPC_MDELEM_UNREF (md); return r; } -static void test_find(void) { +static void +test_find (void) +{ grpc_chttp2_hptbl tbl; int i; char buffer[32]; grpc_mdctx *mdctx; grpc_chttp2_hptbl_find_result r; - LOG_TEST("test_find"); + LOG_TEST ("test_find"); - mdctx = grpc_mdctx_create(); - grpc_chttp2_hptbl_init(&tbl, mdctx); - grpc_chttp2_hptbl_add(&tbl, grpc_mdelem_from_strings(mdctx, "abc", "xyz")); - grpc_chttp2_hptbl_add(&tbl, grpc_mdelem_from_strings(mdctx, "abc", "123")); - grpc_chttp2_hptbl_add(&tbl, grpc_mdelem_from_strings(mdctx, "x", "1")); + mdctx = grpc_mdctx_create (); + grpc_chttp2_hptbl_init (&tbl, mdctx); + grpc_chttp2_hptbl_add (&tbl, grpc_mdelem_from_strings (mdctx, "abc", "xyz")); + grpc_chttp2_hptbl_add (&tbl, grpc_mdelem_from_strings (mdctx, "abc", "123")); + grpc_chttp2_hptbl_add (&tbl, grpc_mdelem_from_strings (mdctx, "x", "1")); - r = find_simple(&tbl, "abc", "123"); - GPR_ASSERT(r.index == 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY); - GPR_ASSERT(r.has_value == 1); + r = find_simple (&tbl, "abc", "123"); + GPR_ASSERT (r.index == 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY); + GPR_ASSERT (r.has_value == 1); - r = find_simple(&tbl, "abc", "xyz"); - GPR_ASSERT(r.index == 3 + GRPC_CHTTP2_LAST_STATIC_ENTRY); - GPR_ASSERT(r.has_value == 1); + r = find_simple (&tbl, "abc", "xyz"); + GPR_ASSERT (r.index == 3 + GRPC_CHTTP2_LAST_STATIC_ENTRY); + GPR_ASSERT (r.has_value == 1); - r = find_simple(&tbl, "x", "1"); - GPR_ASSERT(r.index == 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); - GPR_ASSERT(r.has_value == 1); + r = find_simple (&tbl, "x", "1"); + GPR_ASSERT (r.index == 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); + GPR_ASSERT (r.has_value == 1); - r = find_simple(&tbl, "x", "2"); - GPR_ASSERT(r.index == 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); - GPR_ASSERT(r.has_value == 0); + r = find_simple (&tbl, "x", "2"); + GPR_ASSERT (r.index == 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); + GPR_ASSERT (r.has_value == 0); - r = find_simple(&tbl, "vary", "some-vary-arg"); - GPR_ASSERT(r.index == 59); - GPR_ASSERT(r.has_value == 0); + r = find_simple (&tbl, "vary", "some-vary-arg"); + GPR_ASSERT (r.index == 59); + GPR_ASSERT (r.has_value == 0); - r = find_simple(&tbl, "accept-encoding", "gzip, deflate"); - GPR_ASSERT(r.index == 16); - GPR_ASSERT(r.has_value == 1); + r = find_simple (&tbl, "accept-encoding", "gzip, deflate"); + GPR_ASSERT (r.index == 16); + GPR_ASSERT (r.has_value == 1); - r = find_simple(&tbl, "accept-encoding", "gzip"); - GPR_ASSERT(r.index == 16); - GPR_ASSERT(r.has_value == 0); + r = find_simple (&tbl, "accept-encoding", "gzip"); + GPR_ASSERT (r.index == 16); + GPR_ASSERT (r.has_value == 0); - r = find_simple(&tbl, ":method", "GET"); - GPR_ASSERT(r.index == 2); - GPR_ASSERT(r.has_value == 1); + r = find_simple (&tbl, ":method", "GET"); + GPR_ASSERT (r.index == 2); + GPR_ASSERT (r.has_value == 1); - r = find_simple(&tbl, ":method", "POST"); - GPR_ASSERT(r.index == 3); - GPR_ASSERT(r.has_value == 1); + r = find_simple (&tbl, ":method", "POST"); + GPR_ASSERT (r.index == 3); + GPR_ASSERT (r.has_value == 1); - r = find_simple(&tbl, ":method", "PUT"); - GPR_ASSERT(r.index == 2 || r.index == 3); - GPR_ASSERT(r.has_value == 0); + r = find_simple (&tbl, ":method", "PUT"); + GPR_ASSERT (r.index == 2 || r.index == 3); + GPR_ASSERT (r.has_value == 0); - r = find_simple(&tbl, "this-does-not-exist", ""); - GPR_ASSERT(r.index == 0); - GPR_ASSERT(r.has_value == 0); + r = find_simple (&tbl, "this-does-not-exist", ""); + GPR_ASSERT (r.index == 0); + GPR_ASSERT (r.has_value == 0); /* overflow the string buffer, check find still works */ - for (i = 0; i < 10000; i++) { - gpr_ltoa(i, buffer); - grpc_chttp2_hptbl_add(&tbl, - grpc_mdelem_from_strings(mdctx, "test", buffer)); - } - - r = find_simple(&tbl, "abc", "123"); - GPR_ASSERT(r.index == 0); - GPR_ASSERT(r.has_value == 0); - - r = find_simple(&tbl, "test", "9999"); - GPR_ASSERT(r.index == 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); - GPR_ASSERT(r.has_value == 1); - - r = find_simple(&tbl, "test", "9998"); - GPR_ASSERT(r.index == 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY); - GPR_ASSERT(r.has_value == 1); - - for (i = 0; i < tbl.num_ents; i++) { - int expect = 9999 - i; - gpr_ltoa(expect, buffer); - - r = find_simple(&tbl, "test", buffer); - GPR_ASSERT(r.index == i + 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); - GPR_ASSERT(r.has_value == 1); - } - - r = find_simple(&tbl, "test", "10000"); - GPR_ASSERT(r.index != 0); - GPR_ASSERT(r.has_value == 0); - - grpc_chttp2_hptbl_destroy(&tbl); - grpc_mdctx_unref(mdctx); + for (i = 0; i < 10000; i++) + { + gpr_ltoa (i, buffer); + grpc_chttp2_hptbl_add (&tbl, grpc_mdelem_from_strings (mdctx, "test", buffer)); + } + + r = find_simple (&tbl, "abc", "123"); + GPR_ASSERT (r.index == 0); + GPR_ASSERT (r.has_value == 0); + + r = find_simple (&tbl, "test", "9999"); + GPR_ASSERT (r.index == 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); + GPR_ASSERT (r.has_value == 1); + + r = find_simple (&tbl, "test", "9998"); + GPR_ASSERT (r.index == 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY); + GPR_ASSERT (r.has_value == 1); + + for (i = 0; i < tbl.num_ents; i++) + { + int expect = 9999 - i; + gpr_ltoa (expect, buffer); + + r = find_simple (&tbl, "test", buffer); + GPR_ASSERT (r.index == i + 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); + GPR_ASSERT (r.has_value == 1); + } + + r = find_simple (&tbl, "test", "10000"); + GPR_ASSERT (r.index != 0); + GPR_ASSERT (r.has_value == 0); + + grpc_chttp2_hptbl_destroy (&tbl); + grpc_mdctx_unref (mdctx); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_static_lookup(); - test_many_additions(); - test_find(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_static_lookup (); + test_many_additions (); + test_find (); return 0; } diff --git a/test/core/transport/chttp2/status_conversion_test.c b/test/core/transport/chttp2/status_conversion_test.c index e2729a0a198..9b8fb28c12c 100644 --- a/test/core/transport/chttp2/status_conversion_test.c +++ b/test/core/transport/chttp2/status_conversion_test.c @@ -44,95 +44,81 @@ #define HTTP2_STATUS_TO_GRPC_STATUS(a, b) \ GPR_ASSERT(grpc_chttp2_http2_status_to_grpc_status(a) == (b)) -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ int i; - grpc_test_init(argc, argv); + grpc_test_init (argc, argv); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_OK, GRPC_CHTTP2_NO_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_CANCELLED, GRPC_CHTTP2_CANCEL); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_UNKNOWN, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_INVALID_ARGUMENT, - GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_DEADLINE_EXCEEDED, - GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_NOT_FOUND, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_ALREADY_EXISTS, - GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_PERMISSION_DENIED, - GRPC_CHTTP2_INADEQUATE_SECURITY); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_UNAUTHENTICATED, - GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_RESOURCE_EXHAUSTED, - GRPC_CHTTP2_ENHANCE_YOUR_CALM); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_FAILED_PRECONDITION, - GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_ABORTED, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_OUT_OF_RANGE, - GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_UNIMPLEMENTED, - GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_INTERNAL, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_UNAVAILABLE, - GRPC_CHTTP2_REFUSED_STREAM); - GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_DATA_LOSS, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_OK, GRPC_CHTTP2_NO_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_CANCELLED, GRPC_CHTTP2_CANCEL); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_UNKNOWN, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_INVALID_ARGUMENT, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_DEADLINE_EXCEEDED, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_NOT_FOUND, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_ALREADY_EXISTS, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_PERMISSION_DENIED, GRPC_CHTTP2_INADEQUATE_SECURITY); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_UNAUTHENTICATED, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_RESOURCE_EXHAUSTED, GRPC_CHTTP2_ENHANCE_YOUR_CALM); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_FAILED_PRECONDITION, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_ABORTED, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_OUT_OF_RANGE, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_UNIMPLEMENTED, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_INTERNAL, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_UNAVAILABLE, GRPC_CHTTP2_REFUSED_STREAM); + GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_DATA_LOSS, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_OK, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_CANCELLED, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_UNKNOWN, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_INVALID_ARGUMENT, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_DEADLINE_EXCEEDED, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_NOT_FOUND, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_ALREADY_EXISTS, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_PERMISSION_DENIED, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_UNAUTHENTICATED, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_RESOURCE_EXHAUSTED, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_FAILED_PRECONDITION, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_ABORTED, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_OUT_OF_RANGE, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_UNIMPLEMENTED, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_INTERNAL, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_UNAVAILABLE, 200); - GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_DATA_LOSS, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_OK, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_CANCELLED, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_UNKNOWN, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_INVALID_ARGUMENT, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_DEADLINE_EXCEEDED, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_NOT_FOUND, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_ALREADY_EXISTS, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_PERMISSION_DENIED, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_UNAUTHENTICATED, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_RESOURCE_EXHAUSTED, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_FAILED_PRECONDITION, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_ABORTED, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_OUT_OF_RANGE, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_UNIMPLEMENTED, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_INTERNAL, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_UNAVAILABLE, 200); + GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_DATA_LOSS, 200); - HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_NO_ERROR, GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_PROTOCOL_ERROR, GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_INTERNAL_ERROR, GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_FLOW_CONTROL_ERROR, - GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_SETTINGS_TIMEOUT, - GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_STREAM_CLOSED, GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_FRAME_SIZE_ERROR, - GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_REFUSED_STREAM, - GRPC_STATUS_UNAVAILABLE); - HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_CANCEL, GRPC_STATUS_CANCELLED); - HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_COMPRESSION_ERROR, - GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_CONNECT_ERROR, GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_ENHANCE_YOUR_CALM, - GRPC_STATUS_RESOURCE_EXHAUSTED); - HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_INADEQUATE_SECURITY, - GRPC_STATUS_PERMISSION_DENIED); + HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_NO_ERROR, GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_PROTOCOL_ERROR, GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_INTERNAL_ERROR, GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_FLOW_CONTROL_ERROR, GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_SETTINGS_TIMEOUT, GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_STREAM_CLOSED, GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_FRAME_SIZE_ERROR, GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_REFUSED_STREAM, GRPC_STATUS_UNAVAILABLE); + HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_CANCEL, GRPC_STATUS_CANCELLED); + HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_COMPRESSION_ERROR, GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_CONNECT_ERROR, GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_ENHANCE_YOUR_CALM, GRPC_STATUS_RESOURCE_EXHAUSTED); + HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_INADEQUATE_SECURITY, GRPC_STATUS_PERMISSION_DENIED); - HTTP2_STATUS_TO_GRPC_STATUS(200, GRPC_STATUS_OK); - HTTP2_STATUS_TO_GRPC_STATUS(400, GRPC_STATUS_INVALID_ARGUMENT); - HTTP2_STATUS_TO_GRPC_STATUS(401, GRPC_STATUS_UNAUTHENTICATED); - HTTP2_STATUS_TO_GRPC_STATUS(403, GRPC_STATUS_PERMISSION_DENIED); - HTTP2_STATUS_TO_GRPC_STATUS(404, GRPC_STATUS_NOT_FOUND); - HTTP2_STATUS_TO_GRPC_STATUS(409, GRPC_STATUS_ABORTED); - HTTP2_STATUS_TO_GRPC_STATUS(412, GRPC_STATUS_FAILED_PRECONDITION); - HTTP2_STATUS_TO_GRPC_STATUS(429, GRPC_STATUS_RESOURCE_EXHAUSTED); - HTTP2_STATUS_TO_GRPC_STATUS(499, GRPC_STATUS_CANCELLED); - HTTP2_STATUS_TO_GRPC_STATUS(500, GRPC_STATUS_UNKNOWN); - HTTP2_STATUS_TO_GRPC_STATUS(503, GRPC_STATUS_UNAVAILABLE); - HTTP2_STATUS_TO_GRPC_STATUS(504, GRPC_STATUS_DEADLINE_EXCEEDED); + HTTP2_STATUS_TO_GRPC_STATUS (200, GRPC_STATUS_OK); + HTTP2_STATUS_TO_GRPC_STATUS (400, GRPC_STATUS_INVALID_ARGUMENT); + HTTP2_STATUS_TO_GRPC_STATUS (401, GRPC_STATUS_UNAUTHENTICATED); + HTTP2_STATUS_TO_GRPC_STATUS (403, GRPC_STATUS_PERMISSION_DENIED); + HTTP2_STATUS_TO_GRPC_STATUS (404, GRPC_STATUS_NOT_FOUND); + HTTP2_STATUS_TO_GRPC_STATUS (409, GRPC_STATUS_ABORTED); + HTTP2_STATUS_TO_GRPC_STATUS (412, GRPC_STATUS_FAILED_PRECONDITION); + HTTP2_STATUS_TO_GRPC_STATUS (429, GRPC_STATUS_RESOURCE_EXHAUSTED); + HTTP2_STATUS_TO_GRPC_STATUS (499, GRPC_STATUS_CANCELLED); + HTTP2_STATUS_TO_GRPC_STATUS (500, GRPC_STATUS_UNKNOWN); + HTTP2_STATUS_TO_GRPC_STATUS (503, GRPC_STATUS_UNAVAILABLE); + HTTP2_STATUS_TO_GRPC_STATUS (504, GRPC_STATUS_DEADLINE_EXCEEDED); /* check all status values can be converted */ - for (i = 0; i <= 999; i++) { - grpc_chttp2_http2_status_to_grpc_status(i); - } + for (i = 0; i <= 999; i++) + { + grpc_chttp2_http2_status_to_grpc_status (i); + } return 0; } diff --git a/test/core/transport/chttp2/stream_encoder_test.c b/test/core/transport/chttp2/stream_encoder_test.c index 71db98c69e2..452b1184a54 100644 --- a/test/core/transport/chttp2/stream_encoder_test.c +++ b/test/core/transport/chttp2/stream_encoder_test.c @@ -55,217 +55,241 @@ void **to_delete = NULL; size_t num_to_delete = 0; size_t cap_to_delete = 0; -static gpr_slice create_test_slice(size_t length) { - gpr_slice slice = gpr_slice_malloc(length); +static gpr_slice +create_test_slice (size_t length) +{ + gpr_slice slice = gpr_slice_malloc (length); size_t i; - for (i = 0; i < length; i++) { - GPR_SLICE_START_PTR(slice)[i] = (gpr_uint8)i; - } + for (i = 0; i < length; i++) + { + GPR_SLICE_START_PTR (slice)[i] = (gpr_uint8) i; + } return slice; } /* verify that the output generated by encoding the stream matches the hexstring passed in */ -static void verify_sopb(size_t window_available, int eof, - size_t expect_window_used, const char *expected) { +static void +verify_sopb (size_t window_available, int eof, size_t expect_window_used, const char *expected) +{ gpr_slice_buffer output; grpc_stream_op_buffer encops; gpr_slice merged; - gpr_slice expect = parse_hexstring(expected); - gpr_slice_buffer_init(&output); - grpc_sopb_init(&encops); - GPR_ASSERT(expect_window_used == - grpc_chttp2_preencode(g_sopb.ops, &g_sopb.nops, - (gpr_uint32)window_available, &encops)); - grpc_chttp2_encode(encops.ops, encops.nops, eof, 0xdeadbeef, &g_compressor, - &output); + gpr_slice expect = parse_hexstring (expected); + gpr_slice_buffer_init (&output); + grpc_sopb_init (&encops); + GPR_ASSERT (expect_window_used == grpc_chttp2_preencode (g_sopb.ops, &g_sopb.nops, (gpr_uint32) window_available, &encops)); + grpc_chttp2_encode (encops.ops, encops.nops, eof, 0xdeadbeef, &g_compressor, &output); encops.nops = 0; - merged = grpc_slice_merge(output.slices, output.count); - gpr_slice_buffer_destroy(&output); - grpc_sopb_destroy(&encops); - - if (0 != gpr_slice_cmp(merged, expect)) { - char *expect_str = gpr_dump_slice(expect, GPR_DUMP_HEX | GPR_DUMP_ASCII); - char *got_str = gpr_dump_slice(merged, GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_ERROR, "mismatched output for %s", expected); - gpr_log(GPR_ERROR, "EXPECT: %s", expect_str); - gpr_log(GPR_ERROR, "GOT: %s", got_str); - gpr_free(expect_str); - gpr_free(got_str); - g_failure = 1; - } - - gpr_slice_unref(merged); - gpr_slice_unref(expect); + merged = grpc_slice_merge (output.slices, output.count); + gpr_slice_buffer_destroy (&output); + grpc_sopb_destroy (&encops); + + if (0 != gpr_slice_cmp (merged, expect)) + { + char *expect_str = gpr_dump_slice (expect, GPR_DUMP_HEX | GPR_DUMP_ASCII); + char *got_str = gpr_dump_slice (merged, GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log (GPR_ERROR, "mismatched output for %s", expected); + gpr_log (GPR_ERROR, "EXPECT: %s", expect_str); + gpr_log (GPR_ERROR, "GOT: %s", got_str); + gpr_free (expect_str); + gpr_free (got_str); + g_failure = 1; + } + + gpr_slice_unref (merged); + gpr_slice_unref (expect); } -static void test_small_data_framing(void) { - grpc_sopb_add_no_op(&g_sopb); - verify_sopb(10, 0, 0, ""); +static void +test_small_data_framing (void) +{ + grpc_sopb_add_no_op (&g_sopb); + verify_sopb (10, 0, 0, ""); - grpc_sopb_add_slice(&g_sopb, create_test_slice(3)); - verify_sopb(10, 0, 3, "000003 0000 deadbeef 000102"); + grpc_sopb_add_slice (&g_sopb, create_test_slice (3)); + verify_sopb (10, 0, 3, "000003 0000 deadbeef 000102"); - grpc_sopb_add_slice(&g_sopb, create_test_slice(4)); - verify_sopb(10, 0, 4, "000004 0000 deadbeef 00010203"); + grpc_sopb_add_slice (&g_sopb, create_test_slice (4)); + verify_sopb (10, 0, 4, "000004 0000 deadbeef 00010203"); - grpc_sopb_add_slice(&g_sopb, create_test_slice(3)); - grpc_sopb_add_slice(&g_sopb, create_test_slice(4)); - verify_sopb(10, 0, 7, "000007 0000 deadbeef 000102 00010203"); + grpc_sopb_add_slice (&g_sopb, create_test_slice (3)); + grpc_sopb_add_slice (&g_sopb, create_test_slice (4)); + verify_sopb (10, 0, 7, "000007 0000 deadbeef 000102 00010203"); - grpc_sopb_add_slice(&g_sopb, create_test_slice(0)); - grpc_sopb_add_slice(&g_sopb, create_test_slice(0)); - grpc_sopb_add_slice(&g_sopb, create_test_slice(0)); - grpc_sopb_add_slice(&g_sopb, create_test_slice(0)); - grpc_sopb_add_slice(&g_sopb, create_test_slice(3)); - verify_sopb(10, 0, 3, "000003 0000 deadbeef 000102"); + grpc_sopb_add_slice (&g_sopb, create_test_slice (0)); + grpc_sopb_add_slice (&g_sopb, create_test_slice (0)); + grpc_sopb_add_slice (&g_sopb, create_test_slice (0)); + grpc_sopb_add_slice (&g_sopb, create_test_slice (0)); + grpc_sopb_add_slice (&g_sopb, create_test_slice (3)); + verify_sopb (10, 0, 3, "000003 0000 deadbeef 000102"); - verify_sopb(10, 1, 0, "000000 0001 deadbeef"); + verify_sopb (10, 1, 0, "000000 0001 deadbeef"); - grpc_sopb_add_begin_message(&g_sopb, 255, 0); - verify_sopb(10, 0, 5, "000005 0000 deadbeef 00000000ff"); + grpc_sopb_add_begin_message (&g_sopb, 255, 0); + verify_sopb (10, 0, 5, "000005 0000 deadbeef 00000000ff"); } -static void add_sopb_headers(size_t n, ...) { +static void +add_sopb_headers (size_t n, ...) +{ size_t i; grpc_metadata_batch b; va_list l; - grpc_linked_mdelem *e = gpr_malloc(sizeof(*e) * n); - - grpc_metadata_batch_init(&b); - - va_start(l, n); - for (i = 0; i < n; i++) { - char *key = va_arg(l, char *); - char *value = va_arg(l, char *); - if (i) { - e[i - 1].next = &e[i]; - e[i].prev = &e[i - 1]; + grpc_linked_mdelem *e = gpr_malloc (sizeof (*e) * n); + + grpc_metadata_batch_init (&b); + + va_start (l, n); + for (i = 0; i < n; i++) + { + char *key = va_arg (l, char *); + char *value = va_arg (l, char *); + if (i) + { + e[i - 1].next = &e[i]; + e[i].prev = &e[i - 1]; + } + e[i].md = grpc_mdelem_from_strings (g_mdctx, key, value); } - e[i].md = grpc_mdelem_from_strings(g_mdctx, key, value); - } e[0].prev = NULL; e[n - 1].next = NULL; - va_end(l); + va_end (l); b.list.head = &e[0]; b.list.tail = &e[n - 1]; - if (cap_to_delete == num_to_delete) { - cap_to_delete = GPR_MAX(2 * cap_to_delete, 1000); - to_delete = gpr_realloc(to_delete, sizeof(*to_delete) * cap_to_delete); - } + if (cap_to_delete == num_to_delete) + { + cap_to_delete = GPR_MAX (2 * cap_to_delete, 1000); + to_delete = gpr_realloc (to_delete, sizeof (*to_delete) * cap_to_delete); + } to_delete[num_to_delete++] = e; - grpc_sopb_add_metadata(&g_sopb, b); + grpc_sopb_add_metadata (&g_sopb, b); } -static void test_basic_headers(void) { +static void +test_basic_headers (void) +{ int i; - add_sopb_headers(1, "a", "a"); - verify_sopb(0, 0, 0, "000005 0104 deadbeef 40 0161 0161"); + add_sopb_headers (1, "a", "a"); + verify_sopb (0, 0, 0, "000005 0104 deadbeef 40 0161 0161"); - add_sopb_headers(1, "a", "a"); - verify_sopb(0, 0, 0, "000001 0104 deadbeef be"); + add_sopb_headers (1, "a", "a"); + verify_sopb (0, 0, 0, "000001 0104 deadbeef be"); - add_sopb_headers(1, "a", "a"); - verify_sopb(0, 0, 0, "000001 0104 deadbeef be"); + add_sopb_headers (1, "a", "a"); + verify_sopb (0, 0, 0, "000001 0104 deadbeef be"); - add_sopb_headers(2, "a", "a", "b", "c"); - verify_sopb(0, 0, 0, "000006 0104 deadbeef be 40 0162 0163"); + add_sopb_headers (2, "a", "a", "b", "c"); + verify_sopb (0, 0, 0, "000006 0104 deadbeef be 40 0162 0163"); - add_sopb_headers(2, "a", "a", "b", "c"); - verify_sopb(0, 0, 0, "000002 0104 deadbeef bf be"); + add_sopb_headers (2, "a", "a", "b", "c"); + verify_sopb (0, 0, 0, "000002 0104 deadbeef bf be"); - add_sopb_headers(1, "a", "d"); - verify_sopb(0, 0, 0, "000004 0104 deadbeef 7f 00 0164"); + add_sopb_headers (1, "a", "d"); + verify_sopb (0, 0, 0, "000004 0104 deadbeef 7f 00 0164"); /* flush out what's there to make a few values look very popular */ - for (i = 0; i < 350; i++) { - add_sopb_headers(3, "a", "a", "b", "c", "a", "d"); - verify_sopb(0, 0, 0, "000003 0104 deadbeef c0 bf be"); - } + for (i = 0; i < 350; i++) + { + add_sopb_headers (3, "a", "a", "b", "c", "a", "d"); + verify_sopb (0, 0, 0, "000003 0104 deadbeef c0 bf be"); + } - add_sopb_headers(2, "a", "a", "k", "v"); - verify_sopb(0, 0, 0, "000006 0104 deadbeef c0 00 016b 0176"); + add_sopb_headers (2, "a", "a", "k", "v"); + verify_sopb (0, 0, 0, "000006 0104 deadbeef c0 00 016b 0176"); - add_sopb_headers(1, "a", "v"); + add_sopb_headers (1, "a", "v"); /* this could be 000004 0104 deadbeef 0f 30 0176 also */ - verify_sopb(0, 0, 0, "000004 0104 deadbeef 0f 2f 0176"); + verify_sopb (0, 0, 0, "000004 0104 deadbeef 0f 2f 0176"); } -static void encode_int_to_str(int i, char *p) { - p[0] = (char)('a' + i % 26); +static void +encode_int_to_str (int i, char *p) +{ + p[0] = (char) ('a' + i % 26); i /= 26; - GPR_ASSERT(i < 26); - p[1] = (char)('a' + i); + GPR_ASSERT (i < 26); + p[1] = (char) ('a' + i); p[2] = 0; } -static void test_decode_table_overflow(void) { +static void +test_decode_table_overflow (void) +{ int i; char key[3], value[3]; char *expect; - for (i = 0; i < 114; i++) { - if (i > 0) { - add_sopb_headers(1, "aa", "ba"); + for (i = 0; i < 114; i++) + { + if (i > 0) + { + add_sopb_headers (1, "aa", "ba"); + } + + encode_int_to_str (i, key); + encode_int_to_str (i + 1, value); + + if (i + 61 >= 127) + { + gpr_asprintf (&expect, "000002 0104 deadbeef ff%02x 000007 0104 deadbeef 40 " "02%02x%02x 02%02x%02x", i + 61 - 127, key[0], key[1], value[0], value[1]); + } + else if (i > 0) + { + gpr_asprintf (&expect, "000001 0104 deadbeef %02x 000007 0104 deadbeef 40 " "02%02x%02x 02%02x%02x", 0x80 + 61 + i, key[0], key[1], value[0], value[1]); + } + else + { + gpr_asprintf (&expect, "000007 0104 deadbeef 40 02%02x%02x 02%02x%02x", key[0], key[1], value[0], value[1]); + } + + add_sopb_headers (1, key, value); + verify_sopb (0, 0, 0, expect); + gpr_free (expect); } - encode_int_to_str(i, key); - encode_int_to_str(i + 1, value); - - if (i + 61 >= 127) { - gpr_asprintf(&expect, - "000002 0104 deadbeef ff%02x 000007 0104 deadbeef 40 " - "02%02x%02x 02%02x%02x", - i + 61 - 127, key[0], key[1], value[0], value[1]); - } else if (i > 0) { - gpr_asprintf(&expect, - "000001 0104 deadbeef %02x 000007 0104 deadbeef 40 " - "02%02x%02x 02%02x%02x", - 0x80 + 61 + i, key[0], key[1], value[0], value[1]); - } else { - gpr_asprintf(&expect, "000007 0104 deadbeef 40 02%02x%02x 02%02x%02x", - key[0], key[1], value[0], value[1]); - } - - add_sopb_headers(1, key, value); - verify_sopb(0, 0, 0, expect); - 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 */ - add_sopb_headers(1, "aa", "ba"); - verify_sopb(0, 0, 0, "000007 0104 deadbeef 40 026161 026261"); + add_sopb_headers (1, "aa", "ba"); + verify_sopb (0, 0, 0, "000007 0104 deadbeef 40 026161 026261"); } -static void randstr(char *p, int bufsz) { +static void +randstr (char *p, int bufsz) +{ int i; - int len = 1 + rand() % bufsz; - for (i = 0; i < len; i++) { - p[i] = (char)('a' + rand() % 26); - } + int len = 1 + rand () % bufsz; + for (i = 0; i < len; i++) + { + p[i] = (char) ('a' + rand () % 26); + } p[len] = 0; } -typedef struct { +typedef struct +{ char key[300]; char value[300]; int got_hdr; } test_decode_random_header_state; -static void chk_hdr(void *p, grpc_mdelem *el) { +static void +chk_hdr (void *p, grpc_mdelem * el) +{ test_decode_random_header_state *st = p; - GPR_ASSERT(0 == gpr_slice_str_cmp(el->key->slice, st->key)); - GPR_ASSERT(0 == gpr_slice_str_cmp(el->value->slice, st->value)); + GPR_ASSERT (0 == gpr_slice_str_cmp (el->key->slice, st->key)); + GPR_ASSERT (0 == gpr_slice_str_cmp (el->value->slice, st->value)); st->got_hdr = 1; - GRPC_MDELEM_UNREF(el); + GRPC_MDELEM_UNREF (el); } -static void test_decode_random_headers_inner(int max_len) { +static void +test_decode_random_headers_inner (int max_len) +{ int i; test_decode_random_header_state st; gpr_slice_buffer output; @@ -273,37 +297,35 @@ static void test_decode_random_headers_inner(int max_len) { grpc_stream_op_buffer encops; grpc_chttp2_hpack_parser parser; - grpc_chttp2_hpack_parser_init(&parser, g_mdctx); - grpc_sopb_init(&encops); - - gpr_log(GPR_INFO, "max_len = %d", max_len); - - for (i = 0; i < 10000; i++) { - randstr(st.key, max_len); - randstr(st.value, max_len); - - add_sopb_headers(1, st.key, st.value); - gpr_slice_buffer_init(&output); - GPR_ASSERT(0 == - grpc_chttp2_preencode(g_sopb.ops, &g_sopb.nops, 0, &encops)); - grpc_chttp2_encode(encops.ops, encops.nops, 0, 0xdeadbeef, &g_compressor, - &output); - encops.nops = 0; - merged = grpc_slice_merge(output.slices, output.count); - gpr_slice_buffer_destroy(&output); - - st.got_hdr = 0; - parser.on_header = chk_hdr; - parser.on_header_user_data = &st; - grpc_chttp2_hpack_parser_parse(&parser, GPR_SLICE_START_PTR(merged) + 9, - GPR_SLICE_END_PTR(merged)); - GPR_ASSERT(st.got_hdr); - - gpr_slice_unref(merged); - } - - grpc_chttp2_hpack_parser_destroy(&parser); - grpc_sopb_destroy(&encops); + grpc_chttp2_hpack_parser_init (&parser, g_mdctx); + grpc_sopb_init (&encops); + + gpr_log (GPR_INFO, "max_len = %d", max_len); + + for (i = 0; i < 10000; i++) + { + randstr (st.key, max_len); + randstr (st.value, max_len); + + add_sopb_headers (1, st.key, st.value); + gpr_slice_buffer_init (&output); + GPR_ASSERT (0 == grpc_chttp2_preencode (g_sopb.ops, &g_sopb.nops, 0, &encops)); + grpc_chttp2_encode (encops.ops, encops.nops, 0, 0xdeadbeef, &g_compressor, &output); + encops.nops = 0; + merged = grpc_slice_merge (output.slices, output.count); + gpr_slice_buffer_destroy (&output); + + st.got_hdr = 0; + parser.on_header = chk_hdr; + parser.on_header_user_data = &st; + grpc_chttp2_hpack_parser_parse (&parser, GPR_SLICE_START_PTR (merged) + 9, GPR_SLICE_END_PTR (merged)); + GPR_ASSERT (st.got_hdr); + + gpr_slice_unref (merged); + } + + grpc_chttp2_hpack_parser_destroy (&parser); + grpc_sopb_destroy (&encops); } #define DECL_TEST_DECODE_RANDOM_HEADERS(n) \ @@ -312,48 +334,53 @@ static void test_decode_random_headers_inner(int max_len) { } \ int keeps_formatting_correct_##n -DECL_TEST_DECODE_RANDOM_HEADERS(1); -DECL_TEST_DECODE_RANDOM_HEADERS(2); -DECL_TEST_DECODE_RANDOM_HEADERS(3); -DECL_TEST_DECODE_RANDOM_HEADERS(5); -DECL_TEST_DECODE_RANDOM_HEADERS(8); -DECL_TEST_DECODE_RANDOM_HEADERS(13); -DECL_TEST_DECODE_RANDOM_HEADERS(21); -DECL_TEST_DECODE_RANDOM_HEADERS(34); -DECL_TEST_DECODE_RANDOM_HEADERS(55); -DECL_TEST_DECODE_RANDOM_HEADERS(89); -DECL_TEST_DECODE_RANDOM_HEADERS(144); - -static void run_test(void (*test)(), const char *name) { - gpr_log(GPR_INFO, "RUN TEST: %s", name); - g_mdctx = grpc_mdctx_create_with_seed(0); - grpc_chttp2_hpack_compressor_init(&g_compressor, g_mdctx); - grpc_sopb_init(&g_sopb); - test(); - grpc_chttp2_hpack_compressor_destroy(&g_compressor); - grpc_mdctx_unref(g_mdctx); - grpc_sopb_destroy(&g_sopb); +DECL_TEST_DECODE_RANDOM_HEADERS (1); +DECL_TEST_DECODE_RANDOM_HEADERS (2); +DECL_TEST_DECODE_RANDOM_HEADERS (3); +DECL_TEST_DECODE_RANDOM_HEADERS (5); +DECL_TEST_DECODE_RANDOM_HEADERS (8); +DECL_TEST_DECODE_RANDOM_HEADERS (13); +DECL_TEST_DECODE_RANDOM_HEADERS (21); +DECL_TEST_DECODE_RANDOM_HEADERS (34); +DECL_TEST_DECODE_RANDOM_HEADERS (55); +DECL_TEST_DECODE_RANDOM_HEADERS (89); +DECL_TEST_DECODE_RANDOM_HEADERS (144); + +static void +run_test (void (*test) (), const char *name) +{ + gpr_log (GPR_INFO, "RUN TEST: %s", name); + g_mdctx = grpc_mdctx_create_with_seed (0); + grpc_chttp2_hpack_compressor_init (&g_compressor, g_mdctx); + grpc_sopb_init (&g_sopb); + test (); + grpc_chttp2_hpack_compressor_destroy (&g_compressor); + grpc_mdctx_unref (g_mdctx); + grpc_sopb_destroy (&g_sopb); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ size_t i; - grpc_test_init(argc, argv); - TEST(test_small_data_framing); - TEST(test_basic_headers); - TEST(test_decode_table_overflow); - TEST(test_decode_random_headers_1); - TEST(test_decode_random_headers_2); - TEST(test_decode_random_headers_3); - TEST(test_decode_random_headers_5); - TEST(test_decode_random_headers_8); - TEST(test_decode_random_headers_13); - TEST(test_decode_random_headers_21); - TEST(test_decode_random_headers_34); - TEST(test_decode_random_headers_55); - TEST(test_decode_random_headers_89); - TEST(test_decode_random_headers_144); - for (i = 0; i < num_to_delete; i++) { - gpr_free(to_delete[i]); - } + grpc_test_init (argc, argv); + TEST (test_small_data_framing); + TEST (test_basic_headers); + TEST (test_decode_table_overflow); + TEST (test_decode_random_headers_1); + TEST (test_decode_random_headers_2); + TEST (test_decode_random_headers_3); + TEST (test_decode_random_headers_5); + TEST (test_decode_random_headers_8); + TEST (test_decode_random_headers_13); + TEST (test_decode_random_headers_21); + TEST (test_decode_random_headers_34); + TEST (test_decode_random_headers_55); + TEST (test_decode_random_headers_89); + TEST (test_decode_random_headers_144); + for (i = 0; i < num_to_delete; i++) + { + gpr_free (to_delete[i]); + } return g_failure; } diff --git a/test/core/transport/chttp2/stream_map_test.c b/test/core/transport/chttp2/stream_map_test.c index 81fb80f84f1..87efab5fa54 100644 --- a/test/core/transport/chttp2/stream_map_test.c +++ b/test/core/transport/chttp2/stream_map_test.c @@ -38,193 +38,228 @@ #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) /* test creation & destruction */ -static void test_no_op(void) { +static void +test_no_op (void) +{ grpc_chttp2_stream_map map; - LOG_TEST("test_no_op"); + LOG_TEST ("test_no_op"); - grpc_chttp2_stream_map_init(&map, 8); - grpc_chttp2_stream_map_destroy(&map); + grpc_chttp2_stream_map_init (&map, 8); + grpc_chttp2_stream_map_destroy (&map); } /* test lookup on an empty map */ -static void test_empty_find(void) { +static void +test_empty_find (void) +{ grpc_chttp2_stream_map map; - LOG_TEST("test_empty_find"); + LOG_TEST ("test_empty_find"); - grpc_chttp2_stream_map_init(&map, 8); - GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(&map, 39128)); - grpc_chttp2_stream_map_destroy(&map); + grpc_chttp2_stream_map_init (&map, 8); + GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (&map, 39128)); + grpc_chttp2_stream_map_destroy (&map); } /* test it's safe to delete twice */ -static void test_double_deletion(void) { +static void +test_double_deletion (void) +{ grpc_chttp2_stream_map map; - LOG_TEST("test_double_deletion"); - - grpc_chttp2_stream_map_init(&map, 8); - GPR_ASSERT(0 == grpc_chttp2_stream_map_size(&map)); - grpc_chttp2_stream_map_add(&map, 1, (void *)1); - GPR_ASSERT((void *)1 == grpc_chttp2_stream_map_find(&map, 1)); - GPR_ASSERT(1 == grpc_chttp2_stream_map_size(&map)); - GPR_ASSERT((void *)1 == grpc_chttp2_stream_map_delete(&map, 1)); - GPR_ASSERT(0 == grpc_chttp2_stream_map_size(&map)); - GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(&map, 1)); - GPR_ASSERT(NULL == grpc_chttp2_stream_map_delete(&map, 1)); - GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(&map, 1)); - GPR_ASSERT(NULL == grpc_chttp2_stream_map_delete(&map, 1)); - GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(&map, 1)); - GPR_ASSERT(NULL == grpc_chttp2_stream_map_delete(&map, 1)); - GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(&map, 1)); - grpc_chttp2_stream_map_destroy(&map); + LOG_TEST ("test_double_deletion"); + + grpc_chttp2_stream_map_init (&map, 8); + GPR_ASSERT (0 == grpc_chttp2_stream_map_size (&map)); + grpc_chttp2_stream_map_add (&map, 1, (void *) 1); + GPR_ASSERT ((void *) 1 == grpc_chttp2_stream_map_find (&map, 1)); + GPR_ASSERT (1 == grpc_chttp2_stream_map_size (&map)); + GPR_ASSERT ((void *) 1 == grpc_chttp2_stream_map_delete (&map, 1)); + GPR_ASSERT (0 == grpc_chttp2_stream_map_size (&map)); + GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (&map, 1)); + GPR_ASSERT (NULL == grpc_chttp2_stream_map_delete (&map, 1)); + GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (&map, 1)); + GPR_ASSERT (NULL == grpc_chttp2_stream_map_delete (&map, 1)); + GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (&map, 1)); + GPR_ASSERT (NULL == grpc_chttp2_stream_map_delete (&map, 1)); + GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (&map, 1)); + grpc_chttp2_stream_map_destroy (&map); } /* test add & lookup */ -static void test_basic_add_find(gpr_uint32 n) { +static void +test_basic_add_find (gpr_uint32 n) +{ grpc_chttp2_stream_map map; gpr_uint32 i; size_t got; - LOG_TEST("test_basic_add_find"); - gpr_log(GPR_INFO, "n = %d", n); - - grpc_chttp2_stream_map_init(&map, 8); - GPR_ASSERT(0 == grpc_chttp2_stream_map_size(&map)); - for (i = 1; i <= n; i++) { - grpc_chttp2_stream_map_add(&map, i, (void *)(gpr_uintptr)i); - } - GPR_ASSERT(n == grpc_chttp2_stream_map_size(&map)); - GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(&map, 0)); - GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(&map, n + 1)); - for (i = 1; i <= n; i++) { - got = (gpr_uintptr)grpc_chttp2_stream_map_find(&map, i); - GPR_ASSERT(i == got); - } - grpc_chttp2_stream_map_destroy(&map); + LOG_TEST ("test_basic_add_find"); + gpr_log (GPR_INFO, "n = %d", n); + + grpc_chttp2_stream_map_init (&map, 8); + GPR_ASSERT (0 == grpc_chttp2_stream_map_size (&map)); + for (i = 1; i <= n; i++) + { + grpc_chttp2_stream_map_add (&map, i, (void *) (gpr_uintptr) i); + } + GPR_ASSERT (n == grpc_chttp2_stream_map_size (&map)); + GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (&map, 0)); + GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (&map, n + 1)); + for (i = 1; i <= n; i++) + { + got = (gpr_uintptr) grpc_chttp2_stream_map_find (&map, i); + GPR_ASSERT (i == got); + } + grpc_chttp2_stream_map_destroy (&map); } /* verify that for_each gets the right values during test_delete_evens_XXX */ -static void verify_for_each(void *user_data, gpr_uint32 stream_id, void *ptr) { +static void +verify_for_each (void *user_data, gpr_uint32 stream_id, void *ptr) +{ gpr_uint32 *for_each_check = user_data; - GPR_ASSERT(ptr); - GPR_ASSERT(*for_each_check == stream_id); + GPR_ASSERT (ptr); + GPR_ASSERT (*for_each_check == stream_id); *for_each_check += 2; } -static void check_delete_evens(grpc_chttp2_stream_map *map, gpr_uint32 n) { +static void +check_delete_evens (grpc_chttp2_stream_map * map, gpr_uint32 n) +{ gpr_uint32 for_each_check = 1; gpr_uint32 i; size_t got; - GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(map, 0)); - GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(map, n + 1)); - for (i = 1; i <= n; i++) { - if (i & 1) { - got = (gpr_uintptr)grpc_chttp2_stream_map_find(map, i); - GPR_ASSERT(i == got); - } else { - GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(map, i)); + GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (map, 0)); + GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (map, n + 1)); + for (i = 1; i <= n; i++) + { + if (i & 1) + { + got = (gpr_uintptr) grpc_chttp2_stream_map_find (map, i); + GPR_ASSERT (i == got); + } + else + { + GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (map, i)); + } + } + + grpc_chttp2_stream_map_for_each (map, verify_for_each, &for_each_check); + if (n & 1) + { + GPR_ASSERT (for_each_check == n + 2); + } + else + { + GPR_ASSERT (for_each_check == n + 1); } - } - - grpc_chttp2_stream_map_for_each(map, verify_for_each, &for_each_check); - if (n & 1) { - GPR_ASSERT(for_each_check == n + 2); - } else { - GPR_ASSERT(for_each_check == n + 1); - } } /* add a bunch of keys, delete the even ones, and make sure the map is consistent */ -static void test_delete_evens_sweep(gpr_uint32 n) { +static void +test_delete_evens_sweep (gpr_uint32 n) +{ grpc_chttp2_stream_map map; gpr_uint32 i; - LOG_TEST("test_delete_evens_sweep"); - gpr_log(GPR_INFO, "n = %d", n); - - grpc_chttp2_stream_map_init(&map, 8); - for (i = 1; i <= n; i++) { - grpc_chttp2_stream_map_add(&map, i, (void *)(gpr_uintptr)i); - } - for (i = 1; i <= n; i++) { - if ((i & 1) == 0) { - GPR_ASSERT((void *)(gpr_uintptr)i == - grpc_chttp2_stream_map_delete(&map, i)); + LOG_TEST ("test_delete_evens_sweep"); + gpr_log (GPR_INFO, "n = %d", n); + + grpc_chttp2_stream_map_init (&map, 8); + for (i = 1; i <= n; i++) + { + grpc_chttp2_stream_map_add (&map, i, (void *) (gpr_uintptr) i); + } + for (i = 1; i <= n; i++) + { + if ((i & 1) == 0) + { + GPR_ASSERT ((void *) (gpr_uintptr) i == grpc_chttp2_stream_map_delete (&map, i)); + } } - } - check_delete_evens(&map, n); - grpc_chttp2_stream_map_destroy(&map); + check_delete_evens (&map, n); + grpc_chttp2_stream_map_destroy (&map); } /* add a bunch of keys, delete the even ones immediately, and make sure the map is consistent */ -static void test_delete_evens_incremental(gpr_uint32 n) { +static void +test_delete_evens_incremental (gpr_uint32 n) +{ grpc_chttp2_stream_map map; gpr_uint32 i; - LOG_TEST("test_delete_evens_incremental"); - gpr_log(GPR_INFO, "n = %d", n); - - grpc_chttp2_stream_map_init(&map, 8); - for (i = 1; i <= n; i++) { - grpc_chttp2_stream_map_add(&map, i, (void *)(gpr_uintptr)i); - if ((i & 1) == 0) { - grpc_chttp2_stream_map_delete(&map, i); + LOG_TEST ("test_delete_evens_incremental"); + gpr_log (GPR_INFO, "n = %d", n); + + grpc_chttp2_stream_map_init (&map, 8); + for (i = 1; i <= n; i++) + { + grpc_chttp2_stream_map_add (&map, i, (void *) (gpr_uintptr) i); + if ((i & 1) == 0) + { + grpc_chttp2_stream_map_delete (&map, i); + } } - } - check_delete_evens(&map, n); - grpc_chttp2_stream_map_destroy(&map); + check_delete_evens (&map, n); + grpc_chttp2_stream_map_destroy (&map); } /* add a bunch of keys, delete old ones after some time, ensure the backing array does not grow */ -static void test_periodic_compaction(gpr_uint32 n) { +static void +test_periodic_compaction (gpr_uint32 n) +{ grpc_chttp2_stream_map map; gpr_uint32 i; gpr_uint32 del; - LOG_TEST("test_periodic_compaction"); - gpr_log(GPR_INFO, "n = %d", n); - - grpc_chttp2_stream_map_init(&map, 16); - GPR_ASSERT(map.capacity == 16); - for (i = 1; i <= n; i++) { - grpc_chttp2_stream_map_add(&map, i, (void *)(gpr_uintptr)i); - if (i > 8) { - del = i - 8; - GPR_ASSERT((void *)(gpr_uintptr)del == - grpc_chttp2_stream_map_delete(&map, del)); + LOG_TEST ("test_periodic_compaction"); + gpr_log (GPR_INFO, "n = %d", n); + + grpc_chttp2_stream_map_init (&map, 16); + GPR_ASSERT (map.capacity == 16); + for (i = 1; i <= n; i++) + { + grpc_chttp2_stream_map_add (&map, i, (void *) (gpr_uintptr) i); + if (i > 8) + { + del = i - 8; + GPR_ASSERT ((void *) (gpr_uintptr) del == grpc_chttp2_stream_map_delete (&map, del)); + } } - } - GPR_ASSERT(map.capacity == 16); - grpc_chttp2_stream_map_destroy(&map); + GPR_ASSERT (map.capacity == 16); + grpc_chttp2_stream_map_destroy (&map); } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ gpr_uint32 n = 1; gpr_uint32 prev = 1; gpr_uint32 tmp; - grpc_test_init(argc, argv); + grpc_test_init (argc, argv); - test_no_op(); - test_empty_find(); - test_double_deletion(); + test_no_op (); + test_empty_find (); + test_double_deletion (); - while (n < 100000) { - test_basic_add_find(n); - test_delete_evens_sweep(n); - test_delete_evens_incremental(n); - test_periodic_compaction(n); + while (n < 100000) + { + test_basic_add_find (n); + test_delete_evens_sweep (n); + test_delete_evens_incremental (n); + test_periodic_compaction (n); - tmp = n; - n += prev; - prev = tmp; - } + tmp = n; + n += prev; + prev = tmp; + } return 0; } diff --git a/test/core/transport/chttp2/timeout_encoding_test.c b/test/core/transport/chttp2/timeout_encoding_test.c index ba6c3191f1e..949bd3fae64 100644 --- a/test/core/transport/chttp2/timeout_encoding_test.c +++ b/test/core/transport/chttp2/timeout_encoding_test.c @@ -45,109 +45,122 @@ #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) -static void assert_encodes_as(gpr_timespec ts, const char *s) { +static void +assert_encodes_as (gpr_timespec ts, const char *s) +{ char buffer[GRPC_CHTTP2_TIMEOUT_ENCODE_MIN_BUFSIZE]; - grpc_chttp2_encode_timeout(ts, buffer); - gpr_log(GPR_INFO, "check '%s' == '%s'", buffer, s); - GPR_ASSERT(0 == strcmp(buffer, s)); + grpc_chttp2_encode_timeout (ts, buffer); + gpr_log (GPR_INFO, "check '%s' == '%s'", buffer, s); + GPR_ASSERT (0 == strcmp (buffer, s)); } -void test_encoding(void) { - LOG_TEST("test_encoding"); - assert_encodes_as(gpr_time_from_micros(-1, GPR_TIMESPAN), "1n"); - assert_encodes_as(gpr_time_from_seconds(-10, GPR_TIMESPAN), "1n"); - assert_encodes_as(gpr_time_from_nanos(10, GPR_TIMESPAN), "10n"); - assert_encodes_as(gpr_time_from_nanos(999999999, GPR_TIMESPAN), "1S"); - assert_encodes_as(gpr_time_from_micros(1, GPR_TIMESPAN), "1u"); - assert_encodes_as(gpr_time_from_micros(10, GPR_TIMESPAN), "10u"); - assert_encodes_as(gpr_time_from_micros(100, GPR_TIMESPAN), "100u"); - assert_encodes_as(gpr_time_from_micros(890, GPR_TIMESPAN), "890u"); - assert_encodes_as(gpr_time_from_micros(900, GPR_TIMESPAN), "900u"); - assert_encodes_as(gpr_time_from_micros(901, GPR_TIMESPAN), "901u"); - assert_encodes_as(gpr_time_from_millis(1, GPR_TIMESPAN), "1m"); - assert_encodes_as(gpr_time_from_millis(2, GPR_TIMESPAN), "2m"); - assert_encodes_as(gpr_time_from_micros(10001, GPR_TIMESPAN), "10100u"); - assert_encodes_as(gpr_time_from_micros(999999, GPR_TIMESPAN), "1S"); - assert_encodes_as(gpr_time_from_millis(1000, GPR_TIMESPAN), "1S"); - assert_encodes_as(gpr_time_from_millis(2000, GPR_TIMESPAN), "2S"); - assert_encodes_as(gpr_time_from_millis(2500, GPR_TIMESPAN), "2500m"); - assert_encodes_as(gpr_time_from_millis(59900, GPR_TIMESPAN), "59900m"); - assert_encodes_as(gpr_time_from_seconds(50, GPR_TIMESPAN), "50S"); - assert_encodes_as(gpr_time_from_seconds(59, GPR_TIMESPAN), "59S"); - assert_encodes_as(gpr_time_from_seconds(60, GPR_TIMESPAN), "1M"); - assert_encodes_as(gpr_time_from_seconds(80, GPR_TIMESPAN), "80S"); - assert_encodes_as(gpr_time_from_seconds(90, GPR_TIMESPAN), "90S"); - assert_encodes_as(gpr_time_from_minutes(2, GPR_TIMESPAN), "2M"); - assert_encodes_as(gpr_time_from_minutes(20, GPR_TIMESPAN), "20M"); - assert_encodes_as(gpr_time_from_hours(1, GPR_TIMESPAN), "1H"); - assert_encodes_as(gpr_time_from_hours(10, GPR_TIMESPAN), "10H"); - assert_encodes_as(gpr_time_from_seconds(1000000000, GPR_TIMESPAN), - "1000000000S"); +void +test_encoding (void) +{ + LOG_TEST ("test_encoding"); + assert_encodes_as (gpr_time_from_micros (-1, GPR_TIMESPAN), "1n"); + assert_encodes_as (gpr_time_from_seconds (-10, GPR_TIMESPAN), "1n"); + assert_encodes_as (gpr_time_from_nanos (10, GPR_TIMESPAN), "10n"); + assert_encodes_as (gpr_time_from_nanos (999999999, GPR_TIMESPAN), "1S"); + assert_encodes_as (gpr_time_from_micros (1, GPR_TIMESPAN), "1u"); + assert_encodes_as (gpr_time_from_micros (10, GPR_TIMESPAN), "10u"); + assert_encodes_as (gpr_time_from_micros (100, GPR_TIMESPAN), "100u"); + assert_encodes_as (gpr_time_from_micros (890, GPR_TIMESPAN), "890u"); + assert_encodes_as (gpr_time_from_micros (900, GPR_TIMESPAN), "900u"); + assert_encodes_as (gpr_time_from_micros (901, GPR_TIMESPAN), "901u"); + assert_encodes_as (gpr_time_from_millis (1, GPR_TIMESPAN), "1m"); + assert_encodes_as (gpr_time_from_millis (2, GPR_TIMESPAN), "2m"); + assert_encodes_as (gpr_time_from_micros (10001, GPR_TIMESPAN), "10100u"); + assert_encodes_as (gpr_time_from_micros (999999, GPR_TIMESPAN), "1S"); + assert_encodes_as (gpr_time_from_millis (1000, GPR_TIMESPAN), "1S"); + assert_encodes_as (gpr_time_from_millis (2000, GPR_TIMESPAN), "2S"); + assert_encodes_as (gpr_time_from_millis (2500, GPR_TIMESPAN), "2500m"); + assert_encodes_as (gpr_time_from_millis (59900, GPR_TIMESPAN), "59900m"); + assert_encodes_as (gpr_time_from_seconds (50, GPR_TIMESPAN), "50S"); + assert_encodes_as (gpr_time_from_seconds (59, GPR_TIMESPAN), "59S"); + assert_encodes_as (gpr_time_from_seconds (60, GPR_TIMESPAN), "1M"); + assert_encodes_as (gpr_time_from_seconds (80, GPR_TIMESPAN), "80S"); + assert_encodes_as (gpr_time_from_seconds (90, GPR_TIMESPAN), "90S"); + assert_encodes_as (gpr_time_from_minutes (2, GPR_TIMESPAN), "2M"); + assert_encodes_as (gpr_time_from_minutes (20, GPR_TIMESPAN), "20M"); + assert_encodes_as (gpr_time_from_hours (1, GPR_TIMESPAN), "1H"); + assert_encodes_as (gpr_time_from_hours (10, GPR_TIMESPAN), "10H"); + assert_encodes_as (gpr_time_from_seconds (1000000000, GPR_TIMESPAN), "1000000000S"); } -static void assert_decodes_as(const char *buffer, gpr_timespec expected) { +static void +assert_decodes_as (const char *buffer, gpr_timespec expected) +{ gpr_timespec got; - gpr_log(GPR_INFO, "check decoding '%s'", buffer); - GPR_ASSERT(1 == grpc_chttp2_decode_timeout(buffer, &got)); - GPR_ASSERT(0 == gpr_time_cmp(got, expected)); + gpr_log (GPR_INFO, "check decoding '%s'", buffer); + GPR_ASSERT (1 == grpc_chttp2_decode_timeout (buffer, &got)); + GPR_ASSERT (0 == gpr_time_cmp (got, expected)); } -void decode_suite(char ext, - gpr_timespec (*answer)(long x, gpr_clock_type clock)) { - long test_vals[] = {1, 12, 123, 1234, 12345, 123456, - 1234567, 12345678, 123456789, 98765432, 9876543, 987654, - 98765, 9876, 987, 98, 9}; +void +decode_suite (char ext, gpr_timespec (*answer) (long x, gpr_clock_type clock)) +{ + long test_vals[] = { 1, 12, 123, 1234, 12345, 123456, + 1234567, 12345678, 123456789, 98765432, 9876543, 987654, + 98765, 9876, 987, 98, 9 + }; unsigned i; char *input; - for (i = 0; i < GPR_ARRAY_SIZE(test_vals); i++) { - gpr_asprintf(&input, "%ld%c", test_vals[i], ext); - assert_decodes_as(input, answer(test_vals[i], GPR_TIMESPAN)); - gpr_free(input); + for (i = 0; i < GPR_ARRAY_SIZE (test_vals); i++) + { + gpr_asprintf (&input, "%ld%c", test_vals[i], ext); + assert_decodes_as (input, answer (test_vals[i], GPR_TIMESPAN)); + gpr_free (input); - gpr_asprintf(&input, " %ld%c", test_vals[i], ext); - assert_decodes_as(input, answer(test_vals[i], GPR_TIMESPAN)); - gpr_free(input); + gpr_asprintf (&input, " %ld%c", test_vals[i], ext); + assert_decodes_as (input, answer (test_vals[i], GPR_TIMESPAN)); + gpr_free (input); - gpr_asprintf(&input, "%ld %c", test_vals[i], ext); - assert_decodes_as(input, answer(test_vals[i], GPR_TIMESPAN)); - gpr_free(input); + gpr_asprintf (&input, "%ld %c", test_vals[i], ext); + assert_decodes_as (input, answer (test_vals[i], GPR_TIMESPAN)); + gpr_free (input); - gpr_asprintf(&input, "%ld %c ", test_vals[i], ext); - assert_decodes_as(input, answer(test_vals[i], GPR_TIMESPAN)); - gpr_free(input); - } + gpr_asprintf (&input, "%ld %c ", test_vals[i], ext); + assert_decodes_as (input, answer (test_vals[i], GPR_TIMESPAN)); + gpr_free (input); + } } -void test_decoding(void) { - LOG_TEST("test_decoding"); - decode_suite('n', gpr_time_from_nanos); - decode_suite('u', gpr_time_from_micros); - decode_suite('m', gpr_time_from_millis); - decode_suite('S', gpr_time_from_seconds); - decode_suite('M', gpr_time_from_minutes); - decode_suite('H', gpr_time_from_hours); - assert_decodes_as("1000000000000000000000u", - gpr_inf_future(GPR_CLOCK_REALTIME)); +void +test_decoding (void) +{ + LOG_TEST ("test_decoding"); + decode_suite ('n', gpr_time_from_nanos); + decode_suite ('u', gpr_time_from_micros); + decode_suite ('m', gpr_time_from_millis); + decode_suite ('S', gpr_time_from_seconds); + decode_suite ('M', gpr_time_from_minutes); + decode_suite ('H', gpr_time_from_hours); + assert_decodes_as ("1000000000000000000000u", gpr_inf_future (GPR_CLOCK_REALTIME)); } -void test_decoding_fails(void) { +void +test_decoding_fails (void) +{ gpr_timespec x; - LOG_TEST("test_decoding_fails"); - GPR_ASSERT(0 == grpc_chttp2_decode_timeout("", &x)); - GPR_ASSERT(0 == grpc_chttp2_decode_timeout(" ", &x)); - GPR_ASSERT(0 == grpc_chttp2_decode_timeout("x", &x)); - GPR_ASSERT(0 == grpc_chttp2_decode_timeout("1", &x)); - GPR_ASSERT(0 == grpc_chttp2_decode_timeout("1x", &x)); - GPR_ASSERT(0 == grpc_chttp2_decode_timeout("1ux", &x)); - GPR_ASSERT(0 == grpc_chttp2_decode_timeout("!", &x)); - GPR_ASSERT(0 == grpc_chttp2_decode_timeout("n1", &x)); - GPR_ASSERT(0 == grpc_chttp2_decode_timeout("-1u", &x)); + LOG_TEST ("test_decoding_fails"); + GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("", &x)); + GPR_ASSERT (0 == grpc_chttp2_decode_timeout (" ", &x)); + GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("x", &x)); + GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("1", &x)); + GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("1x", &x)); + GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("1ux", &x)); + GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("!", &x)); + GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("n1", &x)); + GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("-1u", &x)); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_encoding(); - test_decoding(); - test_decoding_fails(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_encoding (); + test_decoding (); + test_decoding_fails (); return 0; } diff --git a/test/core/transport/metadata_test.c b/test/core/transport/metadata_test.c index 1861442bb1d..33c2ddf091d 100644 --- a/test/core/transport/metadata_test.c +++ b/test/core/transport/metadata_test.c @@ -47,237 +47,263 @@ /* a large number */ #define MANY 10000 -static void test_no_op(void) { +static void +test_no_op (void) +{ grpc_mdctx *ctx; - LOG_TEST("test_no_op"); + LOG_TEST ("test_no_op"); - ctx = grpc_mdctx_create(); - grpc_mdctx_unref(ctx); + ctx = grpc_mdctx_create (); + grpc_mdctx_unref (ctx); } -static void test_create_string(void) { +static void +test_create_string (void) +{ grpc_mdctx *ctx; grpc_mdstr *s1, *s2, *s3; - LOG_TEST("test_create_string"); - - ctx = grpc_mdctx_create(); - s1 = grpc_mdstr_from_string(ctx, "hello", 0); - s2 = grpc_mdstr_from_string(ctx, "hello", 0); - s3 = grpc_mdstr_from_string(ctx, "very much not hello", 0); - GPR_ASSERT(s1 == s2); - GPR_ASSERT(s3 != s1); - GPR_ASSERT(gpr_slice_str_cmp(s1->slice, "hello") == 0); - GPR_ASSERT(gpr_slice_str_cmp(s3->slice, "very much not hello") == 0); - GRPC_MDSTR_UNREF(s1); - GRPC_MDSTR_UNREF(s2); - grpc_mdctx_unref(ctx); - GRPC_MDSTR_UNREF(s3); + LOG_TEST ("test_create_string"); + + ctx = grpc_mdctx_create (); + s1 = grpc_mdstr_from_string (ctx, "hello", 0); + s2 = grpc_mdstr_from_string (ctx, "hello", 0); + s3 = grpc_mdstr_from_string (ctx, "very much not hello", 0); + GPR_ASSERT (s1 == s2); + GPR_ASSERT (s3 != s1); + GPR_ASSERT (gpr_slice_str_cmp (s1->slice, "hello") == 0); + GPR_ASSERT (gpr_slice_str_cmp (s3->slice, "very much not hello") == 0); + GRPC_MDSTR_UNREF (s1); + GRPC_MDSTR_UNREF (s2); + grpc_mdctx_unref (ctx); + GRPC_MDSTR_UNREF (s3); } -static void test_create_metadata(void) { +static void +test_create_metadata (void) +{ grpc_mdctx *ctx; grpc_mdelem *m1, *m2, *m3; - LOG_TEST("test_create_metadata"); - - ctx = grpc_mdctx_create(); - m1 = grpc_mdelem_from_strings(ctx, "a", "b"); - m2 = grpc_mdelem_from_strings(ctx, "a", "b"); - m3 = grpc_mdelem_from_strings(ctx, "a", "c"); - GPR_ASSERT(m1 == m2); - GPR_ASSERT(m3 != m1); - GPR_ASSERT(m3->key == m1->key); - GPR_ASSERT(m3->value != m1->value); - GPR_ASSERT(gpr_slice_str_cmp(m1->key->slice, "a") == 0); - GPR_ASSERT(gpr_slice_str_cmp(m1->value->slice, "b") == 0); - GPR_ASSERT(gpr_slice_str_cmp(m3->value->slice, "c") == 0); - GRPC_MDELEM_UNREF(m1); - GRPC_MDELEM_UNREF(m2); - GRPC_MDELEM_UNREF(m3); - grpc_mdctx_unref(ctx); + LOG_TEST ("test_create_metadata"); + + ctx = grpc_mdctx_create (); + m1 = grpc_mdelem_from_strings (ctx, "a", "b"); + m2 = grpc_mdelem_from_strings (ctx, "a", "b"); + m3 = grpc_mdelem_from_strings (ctx, "a", "c"); + GPR_ASSERT (m1 == m2); + GPR_ASSERT (m3 != m1); + GPR_ASSERT (m3->key == m1->key); + GPR_ASSERT (m3->value != m1->value); + GPR_ASSERT (gpr_slice_str_cmp (m1->key->slice, "a") == 0); + GPR_ASSERT (gpr_slice_str_cmp (m1->value->slice, "b") == 0); + GPR_ASSERT (gpr_slice_str_cmp (m3->value->slice, "c") == 0); + GRPC_MDELEM_UNREF (m1); + GRPC_MDELEM_UNREF (m2); + GRPC_MDELEM_UNREF (m3); + grpc_mdctx_unref (ctx); } -static void test_create_many_ephemeral_metadata(void) { +static void +test_create_many_ephemeral_metadata (void) +{ grpc_mdctx *ctx; char buffer[GPR_LTOA_MIN_BUFSIZE]; long i; size_t mdtab_capacity_before; - LOG_TEST("test_create_many_ephemeral_metadata"); + LOG_TEST ("test_create_many_ephemeral_metadata"); - ctx = grpc_mdctx_create(); - mdtab_capacity_before = grpc_mdctx_get_mdtab_capacity_test_only(ctx); + ctx = grpc_mdctx_create (); + mdtab_capacity_before = grpc_mdctx_get_mdtab_capacity_test_only (ctx); /* 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_strings(ctx, "a", buffer)); - } + for (i = 0; i < MANY; i++) + { + gpr_ltoa (i, buffer); + GRPC_MDELEM_UNREF (grpc_mdelem_from_strings (ctx, "a", buffer)); + } /* capacity should not grow */ - GPR_ASSERT(mdtab_capacity_before == - grpc_mdctx_get_mdtab_capacity_test_only(ctx)); - grpc_mdctx_unref(ctx); + GPR_ASSERT (mdtab_capacity_before == grpc_mdctx_get_mdtab_capacity_test_only (ctx)); + grpc_mdctx_unref (ctx); } -static void test_create_many_persistant_metadata(void) { +static void +test_create_many_persistant_metadata (void) +{ grpc_mdctx *ctx; char buffer[GPR_LTOA_MIN_BUFSIZE]; long i; - grpc_mdelem **created = gpr_malloc(sizeof(grpc_mdelem *) * MANY); + grpc_mdelem **created = gpr_malloc (sizeof (grpc_mdelem *) * MANY); grpc_mdelem *md; - LOG_TEST("test_create_many_persistant_metadata"); + LOG_TEST ("test_create_many_persistant_metadata"); - ctx = grpc_mdctx_create(); + ctx = grpc_mdctx_create (); /* add phase */ - for (i = 0; i < MANY; i++) { - gpr_ltoa(i, buffer); - created[i] = grpc_mdelem_from_strings(ctx, "a", buffer); - } + for (i = 0; i < MANY; i++) + { + gpr_ltoa (i, buffer); + created[i] = grpc_mdelem_from_strings (ctx, "a", buffer); + } /* verify phase */ - for (i = 0; i < MANY; i++) { - gpr_ltoa(i, buffer); - md = grpc_mdelem_from_strings(ctx, "a", buffer); - GPR_ASSERT(md == created[i]); - GRPC_MDELEM_UNREF(md); - } + for (i = 0; i < MANY; i++) + { + gpr_ltoa (i, buffer); + md = grpc_mdelem_from_strings (ctx, "a", buffer); + GPR_ASSERT (md == created[i]); + GRPC_MDELEM_UNREF (md); + } /* cleanup phase */ - for (i = 0; i < MANY; i++) { - GRPC_MDELEM_UNREF(created[i]); - } - grpc_mdctx_unref(ctx); + for (i = 0; i < MANY; i++) + { + GRPC_MDELEM_UNREF (created[i]); + } + grpc_mdctx_unref (ctx); - gpr_free(created); + gpr_free (created); } -static void test_spin_creating_the_same_thing(void) { +static void +test_spin_creating_the_same_thing (void) +{ grpc_mdctx *ctx; - LOG_TEST("test_spin_creating_the_same_thing"); + LOG_TEST ("test_spin_creating_the_same_thing"); - ctx = grpc_mdctx_create(); - GPR_ASSERT(grpc_mdctx_get_mdtab_count_test_only(ctx) == 0); - GPR_ASSERT(grpc_mdctx_get_mdtab_free_test_only(ctx) == 0); + ctx = grpc_mdctx_create (); + GPR_ASSERT (grpc_mdctx_get_mdtab_count_test_only (ctx) == 0); + GPR_ASSERT (grpc_mdctx_get_mdtab_free_test_only (ctx) == 0); - GRPC_MDELEM_UNREF(grpc_mdelem_from_strings(ctx, "a", "b")); - GPR_ASSERT(grpc_mdctx_get_mdtab_count_test_only(ctx) == 1); - GPR_ASSERT(grpc_mdctx_get_mdtab_free_test_only(ctx) == 1); + GRPC_MDELEM_UNREF (grpc_mdelem_from_strings (ctx, "a", "b")); + GPR_ASSERT (grpc_mdctx_get_mdtab_count_test_only (ctx) == 1); + GPR_ASSERT (grpc_mdctx_get_mdtab_free_test_only (ctx) == 1); - GRPC_MDELEM_UNREF(grpc_mdelem_from_strings(ctx, "a", "b")); - GPR_ASSERT(grpc_mdctx_get_mdtab_count_test_only(ctx) == 1); - GPR_ASSERT(grpc_mdctx_get_mdtab_free_test_only(ctx) == 1); + GRPC_MDELEM_UNREF (grpc_mdelem_from_strings (ctx, "a", "b")); + GPR_ASSERT (grpc_mdctx_get_mdtab_count_test_only (ctx) == 1); + GPR_ASSERT (grpc_mdctx_get_mdtab_free_test_only (ctx) == 1); - GRPC_MDELEM_UNREF(grpc_mdelem_from_strings(ctx, "a", "b")); - GPR_ASSERT(grpc_mdctx_get_mdtab_count_test_only(ctx) == 1); - GPR_ASSERT(grpc_mdctx_get_mdtab_free_test_only(ctx) == 1); + GRPC_MDELEM_UNREF (grpc_mdelem_from_strings (ctx, "a", "b")); + GPR_ASSERT (grpc_mdctx_get_mdtab_count_test_only (ctx) == 1); + GPR_ASSERT (grpc_mdctx_get_mdtab_free_test_only (ctx) == 1); - grpc_mdctx_unref(ctx); + grpc_mdctx_unref (ctx); } -static void test_things_stick_around(void) { +static void +test_things_stick_around (void) +{ grpc_mdctx *ctx; size_t i, j; char *buffer; size_t nstrs = 1000; - grpc_mdstr **strs = gpr_malloc(sizeof(grpc_mdstr *) * nstrs); - size_t *shuf = gpr_malloc(sizeof(size_t) * nstrs); + grpc_mdstr **strs = gpr_malloc (sizeof (grpc_mdstr *) * nstrs); + size_t *shuf = gpr_malloc (sizeof (size_t) * nstrs); grpc_mdstr *test; - LOG_TEST("test_things_stick_around"); - - ctx = grpc_mdctx_create(); - - for (i = 0; i < nstrs; i++) { - gpr_asprintf(&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%dx", i); - strs[i] = grpc_mdstr_from_string(ctx, buffer, 0); - shuf[i] = i; - gpr_free(buffer); - } - - for (i = 0; i < nstrs; i++) { - GRPC_MDSTR_REF(strs[i]); - GRPC_MDSTR_UNREF(strs[i]); - } - - for (i = 0; i < nstrs; i++) { - size_t p = (size_t)rand() % nstrs; - size_t q = (size_t)rand() % nstrs; - size_t temp = shuf[p]; - shuf[p] = shuf[q]; - shuf[q] = temp; - } - - for (i = 0; i < nstrs; i++) { - GRPC_MDSTR_UNREF(strs[shuf[i]]); - for (j = i + 1; j < nstrs; j++) { - gpr_asprintf(&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%dx", shuf[j]); - test = grpc_mdstr_from_string(ctx, buffer, 0); - GPR_ASSERT(test == strs[shuf[j]]); - GRPC_MDSTR_UNREF(test); - gpr_free(buffer); + LOG_TEST ("test_things_stick_around"); + + ctx = grpc_mdctx_create (); + + for (i = 0; i < nstrs; i++) + { + gpr_asprintf (&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%dx", i); + strs[i] = grpc_mdstr_from_string (ctx, buffer, 0); + shuf[i] = i; + gpr_free (buffer); + } + + for (i = 0; i < nstrs; i++) + { + GRPC_MDSTR_REF (strs[i]); + GRPC_MDSTR_UNREF (strs[i]); + } + + for (i = 0; i < nstrs; i++) + { + size_t p = (size_t) rand () % nstrs; + size_t q = (size_t) rand () % nstrs; + size_t temp = shuf[p]; + shuf[p] = shuf[q]; + shuf[q] = temp; + } + + for (i = 0; i < nstrs; i++) + { + GRPC_MDSTR_UNREF (strs[shuf[i]]); + for (j = i + 1; j < nstrs; j++) + { + gpr_asprintf (&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%dx", shuf[j]); + test = grpc_mdstr_from_string (ctx, buffer, 0); + GPR_ASSERT (test == strs[shuf[j]]); + GRPC_MDSTR_UNREF (test); + gpr_free (buffer); + } } - } - grpc_mdctx_unref(ctx); - gpr_free(strs); - gpr_free(shuf); + grpc_mdctx_unref (ctx); + gpr_free (strs); + gpr_free (shuf); } -static void test_slices_work(void) { +static void +test_slices_work (void) +{ /* ensure no memory leaks when switching representation from mdstr to slice */ grpc_mdctx *ctx; grpc_mdstr *str; gpr_slice slice; - LOG_TEST("test_slices_work"); + LOG_TEST ("test_slices_work"); - ctx = grpc_mdctx_create(); + ctx = grpc_mdctx_create (); - str = grpc_mdstr_from_string( - ctx, "123456789012345678901234567890123456789012345678901234567890", 0); - slice = gpr_slice_ref(str->slice); - GRPC_MDSTR_UNREF(str); - gpr_slice_unref(slice); + str = grpc_mdstr_from_string (ctx, "123456789012345678901234567890123456789012345678901234567890", 0); + slice = gpr_slice_ref (str->slice); + GRPC_MDSTR_UNREF (str); + gpr_slice_unref (slice); - str = grpc_mdstr_from_string( - ctx, "123456789012345678901234567890123456789012345678901234567890", 0); - slice = gpr_slice_ref(str->slice); - gpr_slice_unref(slice); - GRPC_MDSTR_UNREF(str); + str = grpc_mdstr_from_string (ctx, "123456789012345678901234567890123456789012345678901234567890", 0); + slice = gpr_slice_ref (str->slice); + gpr_slice_unref (slice); + GRPC_MDSTR_UNREF (str); - grpc_mdctx_unref(ctx); + grpc_mdctx_unref (ctx); } -static void test_base64_and_huffman_works(void) { +static void +test_base64_and_huffman_works (void) +{ grpc_mdctx *ctx; grpc_mdstr *str; gpr_slice slice1; gpr_slice slice2; - LOG_TEST("test_base64_and_huffman_works"); + LOG_TEST ("test_base64_and_huffman_works"); - ctx = grpc_mdctx_create(); - str = grpc_mdstr_from_string(ctx, "abcdefg", 0); - slice1 = grpc_mdstr_as_base64_encoded_and_huffman_compressed(str); - slice2 = grpc_chttp2_base64_encode_and_huffman_compress(str->slice); - GPR_ASSERT(0 == gpr_slice_cmp(slice1, slice2)); + ctx = grpc_mdctx_create (); + str = grpc_mdstr_from_string (ctx, "abcdefg", 0); + slice1 = grpc_mdstr_as_base64_encoded_and_huffman_compressed (str); + slice2 = grpc_chttp2_base64_encode_and_huffman_compress (str->slice); + GPR_ASSERT (0 == gpr_slice_cmp (slice1, slice2)); - gpr_slice_unref(slice2); - GRPC_MDSTR_UNREF(str); - grpc_mdctx_unref(ctx); + gpr_slice_unref (slice2); + GRPC_MDSTR_UNREF (str); + grpc_mdctx_unref (ctx); } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_no_op(); - test_create_string(); - test_create_metadata(); - test_create_many_ephemeral_metadata(); - test_create_many_persistant_metadata(); - test_spin_creating_the_same_thing(); - test_things_stick_around(); - test_slices_work(); - test_base64_and_huffman_works(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_no_op (); + test_create_string (); + test_create_metadata (); + test_create_many_ephemeral_metadata (); + test_create_many_persistant_metadata (); + test_spin_creating_the_same_thing (); + test_things_stick_around (); + test_slices_work (); + test_base64_and_huffman_works (); return 0; } diff --git a/test/core/transport/stream_op_test.c b/test/core/transport/stream_op_test.c index 546080deb90..74d70a92863 100644 --- a/test/core/transport/stream_op_test.c +++ b/test/core/transport/stream_op_test.c @@ -38,79 +38,86 @@ #include #include "test/core/util/test_config.h" -static void assert_slices_equal(gpr_slice a, gpr_slice b) { - GPR_ASSERT(a.refcount == b.refcount); - if (a.refcount) { - GPR_ASSERT(a.data.refcounted.bytes == b.data.refcounted.bytes); - GPR_ASSERT(a.data.refcounted.length == b.data.refcounted.length); - } else { - GPR_ASSERT(a.data.inlined.length == b.data.inlined.length); - GPR_ASSERT(0 == memcmp(a.data.inlined.bytes, b.data.inlined.bytes, - a.data.inlined.length)); - } +static void +assert_slices_equal (gpr_slice a, gpr_slice b) +{ + GPR_ASSERT (a.refcount == b.refcount); + if (a.refcount) + { + GPR_ASSERT (a.data.refcounted.bytes == b.data.refcounted.bytes); + GPR_ASSERT (a.data.refcounted.length == b.data.refcounted.length); + } + else + { + GPR_ASSERT (a.data.inlined.length == b.data.inlined.length); + GPR_ASSERT (0 == memcmp (a.data.inlined.bytes, b.data.inlined.bytes, a.data.inlined.length)); + } } -int main(int argc, char **argv) { +int +main (int argc, char **argv) +{ /* some basic test data */ - gpr_slice test_slice_1 = gpr_slice_malloc(1); - gpr_slice test_slice_2 = gpr_slice_malloc(2); - gpr_slice test_slice_3 = gpr_slice_malloc(3); - gpr_slice test_slice_4 = gpr_slice_malloc(4); + gpr_slice test_slice_1 = gpr_slice_malloc (1); + gpr_slice test_slice_2 = gpr_slice_malloc (2); + gpr_slice test_slice_3 = gpr_slice_malloc (3); + gpr_slice test_slice_4 = gpr_slice_malloc (4); unsigned i; grpc_stream_op_buffer buf; grpc_stream_op_buffer buf2; - grpc_test_init(argc, argv); + grpc_test_init (argc, argv); /* initialize one of our buffers */ - grpc_sopb_init(&buf); + grpc_sopb_init (&buf); /* it should start out empty */ - GPR_ASSERT(buf.nops == 0); + GPR_ASSERT (buf.nops == 0); /* add some data to the buffer */ - grpc_sopb_add_begin_message(&buf, 1, 2); - grpc_sopb_add_slice(&buf, test_slice_1); - grpc_sopb_add_slice(&buf, test_slice_2); - grpc_sopb_add_slice(&buf, test_slice_3); - grpc_sopb_add_slice(&buf, test_slice_4); - grpc_sopb_add_no_op(&buf); + grpc_sopb_add_begin_message (&buf, 1, 2); + grpc_sopb_add_slice (&buf, test_slice_1); + grpc_sopb_add_slice (&buf, test_slice_2); + grpc_sopb_add_slice (&buf, test_slice_3); + grpc_sopb_add_slice (&buf, test_slice_4); + grpc_sopb_add_no_op (&buf); /* verify that the data went in ok */ - GPR_ASSERT(buf.nops == 6); - GPR_ASSERT(buf.ops[0].type == GRPC_OP_BEGIN_MESSAGE); - GPR_ASSERT(buf.ops[0].data.begin_message.length == 1); - GPR_ASSERT(buf.ops[0].data.begin_message.flags == 2); - GPR_ASSERT(buf.ops[1].type == GRPC_OP_SLICE); - assert_slices_equal(buf.ops[1].data.slice, test_slice_1); - GPR_ASSERT(buf.ops[2].type == GRPC_OP_SLICE); - assert_slices_equal(buf.ops[2].data.slice, test_slice_2); - GPR_ASSERT(buf.ops[3].type == GRPC_OP_SLICE); - assert_slices_equal(buf.ops[3].data.slice, test_slice_3); - GPR_ASSERT(buf.ops[4].type == GRPC_OP_SLICE); - assert_slices_equal(buf.ops[4].data.slice, test_slice_4); - GPR_ASSERT(buf.ops[5].type == GRPC_NO_OP); + GPR_ASSERT (buf.nops == 6); + GPR_ASSERT (buf.ops[0].type == GRPC_OP_BEGIN_MESSAGE); + GPR_ASSERT (buf.ops[0].data.begin_message.length == 1); + GPR_ASSERT (buf.ops[0].data.begin_message.flags == 2); + GPR_ASSERT (buf.ops[1].type == GRPC_OP_SLICE); + assert_slices_equal (buf.ops[1].data.slice, test_slice_1); + GPR_ASSERT (buf.ops[2].type == GRPC_OP_SLICE); + assert_slices_equal (buf.ops[2].data.slice, test_slice_2); + GPR_ASSERT (buf.ops[3].type == GRPC_OP_SLICE); + assert_slices_equal (buf.ops[3].data.slice, test_slice_3); + GPR_ASSERT (buf.ops[4].type == GRPC_OP_SLICE); + assert_slices_equal (buf.ops[4].data.slice, test_slice_4); + GPR_ASSERT (buf.ops[5].type == GRPC_NO_OP); /* initialize the second buffer */ - grpc_sopb_init(&buf2); + grpc_sopb_init (&buf2); /* add a no-op, and then the original buffer */ - grpc_sopb_add_no_op(&buf2); - grpc_sopb_append(&buf2, buf.ops, buf.nops); + grpc_sopb_add_no_op (&buf2); + grpc_sopb_append (&buf2, buf.ops, buf.nops); /* should be one element bigger than the original */ - GPR_ASSERT(buf2.nops == buf.nops + 1); - GPR_ASSERT(buf2.ops[0].type == GRPC_NO_OP); + GPR_ASSERT (buf2.nops == buf.nops + 1); + GPR_ASSERT (buf2.ops[0].type == GRPC_NO_OP); /* and the tail should be the same */ - for (i = 0; i < buf.nops; i++) { - GPR_ASSERT(buf2.ops[i + 1].type == buf.ops[i].type); - } + for (i = 0; i < buf.nops; i++) + { + GPR_ASSERT (buf2.ops[i + 1].type == buf.ops[i].type); + } /* destroy the buffers */ - grpc_sopb_destroy(&buf); - grpc_sopb_destroy(&buf2); + grpc_sopb_destroy (&buf); + grpc_sopb_destroy (&buf2); - gpr_slice_unref(test_slice_1); - gpr_slice_unref(test_slice_2); - gpr_slice_unref(test_slice_3); - gpr_slice_unref(test_slice_4); + gpr_slice_unref (test_slice_1); + gpr_slice_unref (test_slice_2); + gpr_slice_unref (test_slice_3); + gpr_slice_unref (test_slice_4); return 0; } diff --git a/test/core/tsi/transport_security_test.c b/test/core/tsi/transport_security_test.c index bec3866166f..4852a44bb18 100644 --- a/test/core/tsi/transport_security_test.c +++ b/test/core/tsi/transport_security_test.c @@ -46,7 +46,8 @@ #include "src/core/tsi/ssl_transport_security.h" #include "test/core/util/test_config.h" -typedef struct { +typedef struct +{ /* 1 if success, 0 if failure. */ int expected; @@ -66,238 +67,255 @@ typedef struct { chromium/src/net/cert/x509_certificate_unittest.cc. TODO(jboeuf) uncomment test cases as we fix tsi_ssl_peer_matches_name. */ const cert_name_test_entry cert_name_test_entries[] = { - {1, "foo.com", "foo.com", NULL}, - {1, "f", "f", NULL}, - {0, "h", "i", NULL}, - {1, "bar.foo.com", "*.foo.com", NULL}, - {1, "www.test.fr", "common.name", - "*.test.com,*.test.co.uk,*.test.de,*.test.fr"}, - /* - {1, "wwW.tESt.fr", "common.name", ",*.*,*.test.de,*.test.FR,www"}, - */ - {0, "f.uk", ".uk", NULL}, - {0, "w.bar.foo.com", "?.bar.foo.com", NULL}, - {0, "www.foo.com", "(www|ftp).foo.com", NULL}, - {0, "www.foo.com", "www.foo.com#", NULL}, /* # = null char. */ - {0, "www.foo.com", "", "www.foo.com#*.foo.com,#,#"}, - {0, "www.house.example", "ww.house.example", NULL}, - {0, "test.org", "", "www.test.org,*.test.org,*.org"}, - {0, "w.bar.foo.com", "w*.bar.foo.com", NULL}, - {0, "www.bar.foo.com", "ww*ww.bar.foo.com", NULL}, - {0, "wwww.bar.foo.com", "ww*ww.bar.foo.com", NULL}, - {0, "wwww.bar.foo.com", "w*w.bar.foo.com", NULL}, - {0, "wwww.bar.foo.com", "w*w.bar.foo.c0m", NULL}, - {0, "WALLY.bar.foo.com", "wa*.bar.foo.com", NULL}, - {0, "wally.bar.foo.com", "*Ly.bar.foo.com", NULL}, - /* - {1, "ww%57.foo.com", "", "www.foo.com"}, - {1, "www&.foo.com", "www%26.foo.com", NULL}, - */ - - /* Common name must not be used if subject alternative name was provided. */ - {0, "www.test.co.jp", "www.test.co.jp", - "*.test.de,*.jp,www.test.co.uk,www.*.co.jp"}, - {0, "www.bar.foo.com", "www.bar.foo.com", - "*.foo.com,*.*.foo.com,*.*.bar.foo.com,*..bar.foo.com,"}, - - /* IDN tests */ - {1, "xn--poema-9qae5a.com.br", "xn--poema-9qae5a.com.br", NULL}, - {1, "www.xn--poema-9qae5a.com.br", "*.xn--poema-9qae5a.com.br", NULL}, - {0, "xn--poema-9qae5a.com.br", "", - "*.xn--poema-9qae5a.com.br," - "xn--poema-*.com.br," - "xn--*-9qae5a.com.br," - "*--poema-9qae5a.com.br"}, - - /* The following are adapted from the examples quoted from - http://tools.ietf.org/html/rfc6125#section-6.4.3 - (e.g., *.example.com would match foo.example.com but - not bar.foo.example.com or example.com). */ - {1, "foo.example.com", "*.example.com", NULL}, - {0, "bar.foo.example.com", "*.example.com", NULL}, - {0, "example.com", "*.example.com", NULL}, - - /* Partial wildcards are disallowed, though RFC 2818 rules allow them. - That is, forms such as baz*.example.net, *baz.example.net, and - b*z.example.net should NOT match domains. Instead, the wildcard must - always be the left-most label, and only a single label. */ - {0, "baz1.example.net", "baz*.example.net", NULL}, - {0, "foobaz.example.net", "*baz.example.net", NULL}, - {0, "buzz.example.net", "b*z.example.net", NULL}, - {0, "www.test.example.net", "www.*.example.net", NULL}, - - /* Wildcards should not be valid for public registry controlled domains, - and unknown/unrecognized domains, at least three domain components must - be present. */ - {1, "www.test.example", "*.test.example", NULL}, - {1, "test.example.co.uk", "*.example.co.uk", NULL}, - {0, "test.example", "*.example", NULL}, - /* - {0, "example.co.uk", "*.co.uk", NULL}, - */ - {0, "foo.com", "*.com", NULL}, - {0, "foo.us", "*.us", NULL}, - {0, "foo", "*", NULL}, - - /* IDN variants of wildcards and registry controlled domains. */ - {1, "www.xn--poema-9qae5a.com.br", "*.xn--poema-9qae5a.com.br", NULL}, - {1, "test.example.xn--mgbaam7a8h", "*.example.xn--mgbaam7a8h", NULL}, - /* - {0, "xn--poema-9qae5a.com.br", "*.com.br", NULL}, - */ - {0, "example.xn--mgbaam7a8h", "*.xn--mgbaam7a8h", NULL}, - - /* Wildcards should be permissible for 'private' registry controlled - domains. */ - {1, "www.appspot.com", "*.appspot.com", NULL}, - {1, "foo.s3.amazonaws.com", "*.s3.amazonaws.com", NULL}, - - /* Multiple wildcards are not valid. */ - {0, "foo.example.com", "*.*.com", NULL}, - {0, "foo.bar.example.com", "*.bar.*.com", NULL}, - - /* Absolute vs relative DNS name tests. Although not explicitly specified - in RFC 6125, absolute reference names (those ending in a .) should - match either absolute or relative presented names. */ - {1, "foo.com", "foo.com.", NULL}, - {1, "foo.com.", "foo.com", NULL}, - {1, "foo.com.", "foo.com.", NULL}, - {1, "f", "f.", NULL}, - {1, "f.", "f", NULL}, - {1, "f.", "f.", NULL}, - {1, "www-3.bar.foo.com", "*.bar.foo.com.", NULL}, - {1, "www-3.bar.foo.com.", "*.bar.foo.com", NULL}, - {1, "www-3.bar.foo.com.", "*.bar.foo.com.", NULL}, - {0, ".", ".", NULL}, - {0, "example.com", "*.com.", NULL}, - {0, "example.com.", "*.com", NULL}, - {0, "example.com.", "*.com.", NULL}, - {0, "foo.", "*.", NULL}, - {0, "foo", "*.", NULL}, - /* - {0, "foo.co.uk", "*.co.uk.", NULL}, - {0, "foo.co.uk.", "*.co.uk.", NULL}, - */ - - /* An empty CN is OK. */ - {1, "test.foo.com", "", "test.foo.com"}, - - /* An IP should not be used for the CN. */ - {0, "173.194.195.139", "173.194.195.139", NULL}, + {1, "foo.com", "foo.com", NULL}, + {1, "f", "f", NULL}, + {0, "h", "i", NULL}, + {1, "bar.foo.com", "*.foo.com", NULL}, + {1, "www.test.fr", "common.name", + "*.test.com,*.test.co.uk,*.test.de,*.test.fr"}, + /* + {1, "wwW.tESt.fr", "common.name", ",*.*,*.test.de,*.test.FR,www"}, + */ + {0, "f.uk", ".uk", NULL}, + {0, "w.bar.foo.com", "?.bar.foo.com", NULL}, + {0, "www.foo.com", "(www|ftp).foo.com", NULL}, + {0, "www.foo.com", "www.foo.com#", NULL}, /* # = null char. */ + {0, "www.foo.com", "", "www.foo.com#*.foo.com,#,#"}, + {0, "www.house.example", "ww.house.example", NULL}, + {0, "test.org", "", "www.test.org,*.test.org,*.org"}, + {0, "w.bar.foo.com", "w*.bar.foo.com", NULL}, + {0, "www.bar.foo.com", "ww*ww.bar.foo.com", NULL}, + {0, "wwww.bar.foo.com", "ww*ww.bar.foo.com", NULL}, + {0, "wwww.bar.foo.com", "w*w.bar.foo.com", NULL}, + {0, "wwww.bar.foo.com", "w*w.bar.foo.c0m", NULL}, + {0, "WALLY.bar.foo.com", "wa*.bar.foo.com", NULL}, + {0, "wally.bar.foo.com", "*Ly.bar.foo.com", NULL}, + /* + {1, "ww%57.foo.com", "", "www.foo.com"}, + {1, "www&.foo.com", "www%26.foo.com", NULL}, + */ + + /* Common name must not be used if subject alternative name was provided. */ + {0, "www.test.co.jp", "www.test.co.jp", + "*.test.de,*.jp,www.test.co.uk,www.*.co.jp"}, + {0, "www.bar.foo.com", "www.bar.foo.com", + "*.foo.com,*.*.foo.com,*.*.bar.foo.com,*..bar.foo.com,"}, + + /* IDN tests */ + {1, "xn--poema-9qae5a.com.br", "xn--poema-9qae5a.com.br", NULL}, + {1, "www.xn--poema-9qae5a.com.br", "*.xn--poema-9qae5a.com.br", NULL}, + {0, "xn--poema-9qae5a.com.br", "", + "*.xn--poema-9qae5a.com.br," "xn--poema-*.com.br," "xn--*-9qae5a.com.br," "*--poema-9qae5a.com.br"}, + + /* The following are adapted from the examples quoted from + http://tools.ietf.org/html/rfc6125#section-6.4.3 + (e.g., *.example.com would match foo.example.com but + not bar.foo.example.com or example.com). */ + {1, "foo.example.com", "*.example.com", NULL}, + {0, "bar.foo.example.com", "*.example.com", NULL}, + {0, "example.com", "*.example.com", NULL}, + + /* Partial wildcards are disallowed, though RFC 2818 rules allow them. + That is, forms such as baz*.example.net, *baz.example.net, and + b*z.example.net should NOT match domains. Instead, the wildcard must + always be the left-most label, and only a single label. */ + {0, "baz1.example.net", "baz*.example.net", NULL}, + {0, "foobaz.example.net", "*baz.example.net", NULL}, + {0, "buzz.example.net", "b*z.example.net", NULL}, + {0, "www.test.example.net", "www.*.example.net", NULL}, + + /* Wildcards should not be valid for public registry controlled domains, + and unknown/unrecognized domains, at least three domain components must + be present. */ + {1, "www.test.example", "*.test.example", NULL}, + {1, "test.example.co.uk", "*.example.co.uk", NULL}, + {0, "test.example", "*.example", NULL}, + /* + {0, "example.co.uk", "*.co.uk", NULL}, + */ + {0, "foo.com", "*.com", NULL}, + {0, "foo.us", "*.us", NULL}, + {0, "foo", "*", NULL}, + + /* IDN variants of wildcards and registry controlled domains. */ + {1, "www.xn--poema-9qae5a.com.br", "*.xn--poema-9qae5a.com.br", NULL}, + {1, "test.example.xn--mgbaam7a8h", "*.example.xn--mgbaam7a8h", NULL}, + /* + {0, "xn--poema-9qae5a.com.br", "*.com.br", NULL}, + */ + {0, "example.xn--mgbaam7a8h", "*.xn--mgbaam7a8h", NULL}, + + /* Wildcards should be permissible for 'private' registry controlled + domains. */ + {1, "www.appspot.com", "*.appspot.com", NULL}, + {1, "foo.s3.amazonaws.com", "*.s3.amazonaws.com", NULL}, + + /* Multiple wildcards are not valid. */ + {0, "foo.example.com", "*.*.com", NULL}, + {0, "foo.bar.example.com", "*.bar.*.com", NULL}, + + /* Absolute vs relative DNS name tests. Although not explicitly specified + in RFC 6125, absolute reference names (those ending in a .) should + match either absolute or relative presented names. */ + {1, "foo.com", "foo.com.", NULL}, + {1, "foo.com.", "foo.com", NULL}, + {1, "foo.com.", "foo.com.", NULL}, + {1, "f", "f.", NULL}, + {1, "f.", "f", NULL}, + {1, "f.", "f.", NULL}, + {1, "www-3.bar.foo.com", "*.bar.foo.com.", NULL}, + {1, "www-3.bar.foo.com.", "*.bar.foo.com", NULL}, + {1, "www-3.bar.foo.com.", "*.bar.foo.com.", NULL}, + {0, ".", ".", NULL}, + {0, "example.com", "*.com.", NULL}, + {0, "example.com.", "*.com", NULL}, + {0, "example.com.", "*.com.", NULL}, + {0, "foo.", "*.", NULL}, + {0, "foo", "*.", NULL}, + /* + {0, "foo.co.uk", "*.co.uk.", NULL}, + {0, "foo.co.uk.", "*.co.uk.", NULL}, + */ + + /* An empty CN is OK. */ + {1, "test.foo.com", "", "test.foo.com"}, + + /* An IP should not be used for the CN. */ + {0, "173.194.195.139", "173.194.195.139", NULL}, }; -typedef struct name_list { +typedef struct name_list +{ const char *name; struct name_list *next; } name_list; -typedef struct { +typedef struct +{ size_t name_count; char *buffer; name_list *names; } parsed_dns_names; -name_list *name_list_add(const char *n) { - name_list *result = gpr_malloc(sizeof(name_list)); +name_list * +name_list_add (const char *n) +{ + name_list *result = gpr_malloc (sizeof (name_list)); result->name = n; result->next = NULL; return result; } -static parsed_dns_names parse_dns_names(const char *dns_names_str) { +static parsed_dns_names +parse_dns_names (const char *dns_names_str) +{ parsed_dns_names result; name_list *current_nl; size_t i; - memset(&result, 0, sizeof(parsed_dns_names)); - if (dns_names_str == 0) return result; + memset (&result, 0, sizeof (parsed_dns_names)); + if (dns_names_str == 0) + return result; result.name_count = 1; - result.buffer = gpr_strdup(dns_names_str); - result.names = name_list_add(result.buffer); + result.buffer = gpr_strdup (dns_names_str); + result.names = name_list_add (result.buffer); current_nl = result.names; - for (i = 0; i < strlen(dns_names_str); i++) { - if (dns_names_str[i] == ',') { - result.buffer[i] = '\0'; - result.name_count++; - i++; - current_nl->next = name_list_add(result.buffer + i); - current_nl = current_nl->next; + for (i = 0; i < strlen (dns_names_str); i++) + { + if (dns_names_str[i] == ',') + { + result.buffer[i] = '\0'; + result.name_count++; + i++; + current_nl->next = name_list_add (result.buffer + i); + current_nl = current_nl->next; + } } - } return result; } -static void destruct_parsed_dns_names(parsed_dns_names *pdn) { +static void +destruct_parsed_dns_names (parsed_dns_names * pdn) +{ name_list *nl = pdn->names; - if (pdn->buffer != NULL) gpr_free(pdn->buffer); - while (nl != NULL) { - name_list *to_be_free = nl; - nl = nl->next; - gpr_free(to_be_free); - } + if (pdn->buffer != NULL) + gpr_free (pdn->buffer); + while (nl != NULL) + { + name_list *to_be_free = nl; + nl = nl->next; + gpr_free (to_be_free); + } } -static char *processed_dns_name(const char *dns_name) { - char *result = gpr_strdup(dns_name); +static char * +processed_dns_name (const char *dns_name) +{ + char *result = gpr_strdup (dns_name); size_t i; - for (i = 0; i < strlen(result); i++) { - if (result[i] == '#') { - result[i] = '\0'; + for (i = 0; i < strlen (result); i++) + { + if (result[i] == '#') + { + result[i] = '\0'; + } } - } return result; } -static tsi_peer peer_from_cert_name_test_entry( - const cert_name_test_entry *entry) { +static tsi_peer +peer_from_cert_name_test_entry (const cert_name_test_entry * entry) +{ size_t i; tsi_peer peer; name_list *nl; - parsed_dns_names dns_entries = parse_dns_names(entry->dns_names); + parsed_dns_names dns_entries = parse_dns_names (entry->dns_names); nl = dns_entries.names; - GPR_ASSERT(tsi_construct_peer(1 + dns_entries.name_count, &peer) == TSI_OK); - GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( - TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, entry->common_name, - &peer.properties[0]) == TSI_OK); + GPR_ASSERT (tsi_construct_peer (1 + dns_entries.name_count, &peer) == TSI_OK); + GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, entry->common_name, &peer.properties[0]) == TSI_OK); i = 1; - while (nl != NULL) { - char *processed = processed_dns_name(nl->name); - GPR_ASSERT(tsi_construct_string_peer_property( - TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, processed, - strlen(nl->name), &peer.properties[i++]) == TSI_OK); - nl = nl->next; - gpr_free(processed); - } - destruct_parsed_dns_names(&dns_entries); + while (nl != NULL) + { + char *processed = processed_dns_name (nl->name); + GPR_ASSERT (tsi_construct_string_peer_property (TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, processed, strlen (nl->name), &peer.properties[i++]) == TSI_OK); + nl = nl->next; + gpr_free (processed); + } + destruct_parsed_dns_names (&dns_entries); return peer; } -char *cert_name_test_entry_to_string(const cert_name_test_entry *entry) { +char * +cert_name_test_entry_to_string (const cert_name_test_entry * entry) +{ char *s; - gpr_asprintf( - &s, "{ success = %s, host_name = %s, common_name = %s, dns_names = %s}", - entry->expected ? "true" : "false", entry->host_name, entry->common_name, - entry->dns_names != NULL ? entry->dns_names : ""); + gpr_asprintf (&s, "{ success = %s, host_name = %s, common_name = %s, dns_names = %s}", entry->expected ? "true" : "false", entry->host_name, entry->common_name, entry->dns_names != NULL ? entry->dns_names : ""); return s; } -static void test_peer_matches_name(void) { +static void +test_peer_matches_name (void) +{ size_t i = 0; - for (i = 0; i < GPR_ARRAY_SIZE(cert_name_test_entries); i++) { - const cert_name_test_entry *entry = &cert_name_test_entries[i]; - tsi_peer peer = peer_from_cert_name_test_entry(entry); - int result = tsi_ssl_peer_matches_name(&peer, entry->host_name); - if (result != entry->expected) { - char *entry_str = cert_name_test_entry_to_string(entry); - gpr_log(GPR_ERROR, "%s", entry_str); - gpr_free(entry_str); - GPR_ASSERT(0); /* Unexpected result. */ + for (i = 0; i < GPR_ARRAY_SIZE (cert_name_test_entries); i++) + { + const cert_name_test_entry *entry = &cert_name_test_entries[i]; + tsi_peer peer = peer_from_cert_name_test_entry (entry); + int result = tsi_ssl_peer_matches_name (&peer, entry->host_name); + if (result != entry->expected) + { + char *entry_str = cert_name_test_entry_to_string (entry); + gpr_log (GPR_ERROR, "%s", entry_str); + gpr_free (entry_str); + GPR_ASSERT (0); /* Unexpected result. */ + } + tsi_peer_destruct (&peer); } - tsi_peer_destruct(&peer); - } } -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - test_peer_matches_name(); +int +main (int argc, char **argv) +{ + grpc_test_init (argc, argv); + test_peer_matches_name (); return 0; } diff --git a/test/core/util/grpc_profiler.c b/test/core/util/grpc_profiler.c index c2c0c9cf53b..0df6c13e5d6 100644 --- a/test/core/util/grpc_profiler.c +++ b/test/core/util/grpc_profiler.c @@ -36,25 +36,34 @@ #if GRPC_HAVE_PERFTOOLS #include -void grpc_profiler_start(const char *filename) { ProfilerStart(filename); } +void +grpc_profiler_start (const char *filename) +{ + ProfilerStart (filename); +} -void grpc_profiler_stop() { ProfilerStop(); } +void +grpc_profiler_stop () +{ + ProfilerStop (); +} #else #include -void grpc_profiler_start(const char *filename) { +void +grpc_profiler_start (const char *filename) +{ static int printed_warning = 0; - if (!printed_warning) { - gpr_log(GPR_DEBUG, - "You do not have google-perftools installed, profiling is disabled " - "[for %s]", - filename); - gpr_log(GPR_DEBUG, - "To install on ubuntu: sudo apt-get install google-perftools " - "libgoogle-perftools-dev"); - printed_warning = 1; - } + if (!printed_warning) + { + gpr_log (GPR_DEBUG, "You do not have google-perftools installed, profiling is disabled " "[for %s]", filename); + gpr_log (GPR_DEBUG, "To install on ubuntu: sudo apt-get install google-perftools " "libgoogle-perftools-dev"); + printed_warning = 1; + } } -void grpc_profiler_stop(void) {} +void +grpc_profiler_stop (void) +{ +} #endif diff --git a/test/core/util/grpc_profiler.h b/test/core/util/grpc_profiler.h index 88ec6bcb0e9..423c73b3316 100644 --- a/test/core/util/grpc_profiler.h +++ b/test/core/util/grpc_profiler.h @@ -35,14 +35,15 @@ #define GRPC_TEST_CORE_UTIL_GRPC_PROFILER_H #ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +extern "C" +{ +#endif /* __cplusplus */ -void grpc_profiler_start(const char *filename); -void grpc_profiler_stop(); + void grpc_profiler_start (const char *filename); + void grpc_profiler_stop (); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif /* __cplusplus */ -#endif /* GRPC_TEST_CORE_UTIL_GRPC_PROFILER_H */ +#endif /* GRPC_TEST_CORE_UTIL_GRPC_PROFILER_H */ diff --git a/test/core/util/parse_hexstring.c b/test/core/util/parse_hexstring.c index eced3173d16..3d01dfc9a70 100644 --- a/test/core/util/parse_hexstring.c +++ b/test/core/util/parse_hexstring.c @@ -34,37 +34,45 @@ #include "test/core/util/parse_hexstring.h" #include -gpr_slice parse_hexstring(const char *hexstring) { +gpr_slice +parse_hexstring (const char *hexstring) +{ size_t nibbles = 0; const char *p = 0; gpr_uint8 *out; gpr_uint8 temp; gpr_slice slice; - for (p = hexstring; *p; p++) { - nibbles += (*p >= '0' && *p <= '9') || (*p >= 'a' && *p <= 'f'); - } + for (p = hexstring; *p; p++) + { + nibbles += (*p >= '0' && *p <= '9') || (*p >= 'a' && *p <= 'f'); + } - GPR_ASSERT((nibbles & 1) == 0); + GPR_ASSERT ((nibbles & 1) == 0); - slice = gpr_slice_malloc(nibbles / 2); - out = GPR_SLICE_START_PTR(slice); + slice = gpr_slice_malloc (nibbles / 2); + out = GPR_SLICE_START_PTR (slice); nibbles = 0; temp = 0; - for (p = hexstring; *p; p++) { - if (*p >= '0' && *p <= '9') { - temp = (gpr_uint8)(temp << 4) | (gpr_uint8)(*p - '0'); - nibbles++; - } else if (*p >= 'a' && *p <= 'f') { - temp = (gpr_uint8)(temp << 4) | (gpr_uint8)(*p - 'a' + 10); - nibbles++; - } - if (nibbles == 2) { - *out++ = temp; - nibbles = 0; + for (p = hexstring; *p; p++) + { + if (*p >= '0' && *p <= '9') + { + temp = (gpr_uint8) (temp << 4) | (gpr_uint8) (*p - '0'); + nibbles++; + } + else if (*p >= 'a' && *p <= 'f') + { + temp = (gpr_uint8) (temp << 4) | (gpr_uint8) (*p - 'a' + 10); + nibbles++; + } + if (nibbles == 2) + { + *out++ = temp; + nibbles = 0; + } } - } return slice; } diff --git a/test/core/util/parse_hexstring.h b/test/core/util/parse_hexstring.h index ddbfe541c69..d2c47703304 100644 --- a/test/core/util/parse_hexstring.h +++ b/test/core/util/parse_hexstring.h @@ -36,6 +36,6 @@ #include -gpr_slice parse_hexstring(const char *hexstring); +gpr_slice parse_hexstring (const char *hexstring); #endif /* GRPC_TEST_CORE_UTIL_PARSE_HEXSTRING_H */ diff --git a/test/core/util/port.h b/test/core/util/port.h index 93788bcab24..ededcbe854f 100644 --- a/test/core/util/port.h +++ b/test/core/util/port.h @@ -35,18 +35,19 @@ #define GRPC_TEST_CORE_UTIL_PORT_H #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif /* pick a port number that is currently unused by either tcp or udp. return 0 on failure. */ -int grpc_pick_unused_port(); + int grpc_pick_unused_port (); /* pick a port number that is currently unused by either tcp or udp. abort on failure. */ -int grpc_pick_unused_port_or_die(); + int grpc_pick_unused_port_or_die (); #ifdef __cplusplus } #endif -#endif /* GRPC_TEST_CORE_UTIL_PORT_H */ +#endif /* GRPC_TEST_CORE_UTIL_PORT_H */ diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index 602af23c157..2bb545a3762 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -57,38 +57,46 @@ static int *chosen_ports = NULL; static size_t num_chosen_ports = 0; -static int has_port_been_chosen(int port) { +static int +has_port_been_chosen (int port) +{ size_t i; - for (i = 0; i < num_chosen_ports; i++) { - if (chosen_ports[i] == port) { - return 1; + for (i = 0; i < num_chosen_ports; i++) + { + if (chosen_ports[i] == port) + { + return 1; + } } - } return 0; } -typedef struct freereq { +typedef struct freereq +{ grpc_pollset pollset; int done; } freereq; -static void destroy_pollset_and_shutdown(void *p, int success, - grpc_closure_list *closure_list) { - grpc_pollset_destroy(p); - grpc_shutdown(); +static void +destroy_pollset_and_shutdown (void *p, int success, grpc_closure_list * closure_list) +{ + grpc_pollset_destroy (p); + grpc_shutdown (); } -static void freed_port_from_server(void *arg, - const grpc_httpcli_response *response, - grpc_closure_list *closure_list) { +static void +freed_port_from_server (void *arg, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +{ freereq *pr = arg; - gpr_mu_lock(GRPC_POLLSET_MU(&pr->pollset)); + gpr_mu_lock (GRPC_POLLSET_MU (&pr->pollset)); pr->done = 1; - grpc_pollset_kick(&pr->pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&pr->pollset)); + grpc_pollset_kick (&pr->pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&pr->pollset)); } -static void free_port_using_server(char *server, int port) { +static void +free_port_using_server (char *server, int port) +{ grpc_httpcli_context context; grpc_httpcli_request req; freereq pr; @@ -96,111 +104,125 @@ static void free_port_using_server(char *server, int port) { grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_closure shutdown_closure; - grpc_init(); + grpc_init (); - memset(&pr, 0, sizeof(pr)); - memset(&req, 0, sizeof(req)); - grpc_pollset_init(&pr.pollset); - grpc_closure_init(&shutdown_closure, destroy_pollset_and_shutdown, - &pr.pollset); + memset (&pr, 0, sizeof (pr)); + memset (&req, 0, sizeof (req)); + grpc_pollset_init (&pr.pollset); + grpc_closure_init (&shutdown_closure, destroy_pollset_and_shutdown, &pr.pollset); req.host = server; - gpr_asprintf(&path, "/drop/%d", port); + gpr_asprintf (&path, "/drop/%d", port); req.path = path; - grpc_httpcli_context_init(&context); - grpc_httpcli_get(&context, &pr.pollset, &req, - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), freed_port_from_server, - &pr, &closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); - while (!pr.done) { - grpc_pollset_worker worker; - grpc_pollset_work(&pr.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1), &closure_list); - } - gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); - - grpc_httpcli_context_destroy(&context); - grpc_closure_list_run(&closure_list); - grpc_pollset_shutdown(&pr.pollset, &shutdown_closure, &closure_list); - grpc_closure_list_run(&closure_list); - gpr_free(path); + grpc_httpcli_context_init (&context); + grpc_httpcli_get (&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), freed_port_from_server, &pr, &closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&pr.pollset)); + while (!pr.done) + { + grpc_pollset_worker worker; + grpc_pollset_work (&pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1), &closure_list); + } + gpr_mu_unlock (GRPC_POLLSET_MU (&pr.pollset)); + + grpc_httpcli_context_destroy (&context); + grpc_closure_list_run (&closure_list); + grpc_pollset_shutdown (&pr.pollset, &shutdown_closure, &closure_list); + grpc_closure_list_run (&closure_list); + gpr_free (path); } -static void free_chosen_ports() { - char *env = gpr_getenv("GRPC_TEST_PORT_SERVER"); - if (env != NULL) { - size_t i; - for (i = 0; i < num_chosen_ports; i++) { - free_port_using_server(env, chosen_ports[i]); +static void +free_chosen_ports () +{ + char *env = gpr_getenv ("GRPC_TEST_PORT_SERVER"); + if (env != NULL) + { + size_t i; + for (i = 0; i < num_chosen_ports; i++) + { + free_port_using_server (env, chosen_ports[i]); + } + gpr_free (env); } - gpr_free(env); - } - gpr_free(chosen_ports); + gpr_free (chosen_ports); } -static void chose_port(int port) { - if (chosen_ports == NULL) { - atexit(free_chosen_ports); - } +static void +chose_port (int port) +{ + if (chosen_ports == NULL) + { + atexit (free_chosen_ports); + } num_chosen_ports++; - chosen_ports = gpr_realloc(chosen_ports, sizeof(int) * num_chosen_ports); + chosen_ports = gpr_realloc (chosen_ports, sizeof (int) * num_chosen_ports); chosen_ports[num_chosen_ports - 1] = port; } -static int is_port_available(int *port, int is_tcp) { +static int +is_port_available (int *port, int is_tcp) +{ const int proto = is_tcp ? IPPROTO_TCP : 0; - const int fd = socket(AF_INET, is_tcp ? SOCK_STREAM : SOCK_DGRAM, proto); + const int fd = socket (AF_INET, is_tcp ? SOCK_STREAM : SOCK_DGRAM, proto); int one = 1; struct sockaddr_in addr; - socklen_t alen = sizeof(addr); + socklen_t alen = sizeof (addr); int actual_port; - GPR_ASSERT(*port >= 0); - GPR_ASSERT(*port <= 65535); - if (fd < 0) { - gpr_log(GPR_ERROR, "socket() failed: %s", strerror(errno)); - return 0; - } + GPR_ASSERT (*port >= 0); + GPR_ASSERT (*port <= 65535); + if (fd < 0) + { + gpr_log (GPR_ERROR, "socket() failed: %s", strerror (errno)); + return 0; + } /* Reuseaddr lets us start up a server immediately after it exits */ - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0) { - gpr_log(GPR_ERROR, "setsockopt() failed: %s", strerror(errno)); - close(fd); - return 0; - } + if (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof (one)) < 0) + { + gpr_log (GPR_ERROR, "setsockopt() failed: %s", strerror (errno)); + close (fd); + return 0; + } /* Try binding to port */ addr.sin_family = AF_INET; addr.sin_addr.s_addr = INADDR_ANY; - addr.sin_port = htons((gpr_uint16)*port); - if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - gpr_log(GPR_DEBUG, "bind(port=%d) failed: %s", *port, strerror(errno)); - close(fd); - return 0; - } + addr.sin_port = htons ((gpr_uint16) * port); + if (bind (fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) + { + gpr_log (GPR_DEBUG, "bind(port=%d) failed: %s", *port, strerror (errno)); + close (fd); + return 0; + } /* Get the bound port number */ - if (getsockname(fd, (struct sockaddr *)&addr, &alen) < 0) { - gpr_log(GPR_ERROR, "getsockname() failed: %s", strerror(errno)); - close(fd); - return 0; - } - GPR_ASSERT(alen <= sizeof(addr)); - actual_port = ntohs(addr.sin_port); - GPR_ASSERT(actual_port > 0); - if (*port == 0) { - *port = actual_port; - } else { - GPR_ASSERT(*port == actual_port); - } - - close(fd); + if (getsockname (fd, (struct sockaddr *) &addr, &alen) < 0) + { + gpr_log (GPR_ERROR, "getsockname() failed: %s", strerror (errno)); + close (fd); + return 0; + } + GPR_ASSERT (alen <= sizeof (addr)); + actual_port = ntohs (addr.sin_port); + GPR_ASSERT (actual_port > 0); + if (*port == 0) + { + *port = actual_port; + } + else + { + GPR_ASSERT (*port == actual_port); + } + + close (fd); return 1; } -typedef struct portreq { +typedef struct portreq +{ grpc_pollset pollset; int port; int retries; @@ -208,54 +230,55 @@ typedef struct portreq { grpc_httpcli_context *ctx; } portreq; -static void got_port_from_server(void *arg, - const grpc_httpcli_response *response, - grpc_closure_list *closure_list) { +static void +got_port_from_server (void *arg, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +{ size_t i; int port = 0; portreq *pr = arg; - if (!response || response->status != 200) { - grpc_httpcli_request req; - memset(&req, 0, sizeof(req)); - GPR_ASSERT(pr->retries < 10); - pr->retries++; - req.host = pr->server; - req.path = "/get"; - gpr_log(GPR_DEBUG, "failed port pick from server: retrying"); - sleep(1); - grpc_httpcli_get(pr->ctx, &pr->pollset, &req, - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), got_port_from_server, - pr, closure_list); - return; - } - GPR_ASSERT(response); - GPR_ASSERT(response->status == 200); - for (i = 0; i < response->body_length; i++) { - GPR_ASSERT(response->body[i] >= '0' && response->body[i] <= '9'); - port = port * 10 + response->body[i] - '0'; - } - GPR_ASSERT(port > 1024); - gpr_mu_lock(GRPC_POLLSET_MU(&pr->pollset)); + if (!response || response->status != 200) + { + grpc_httpcli_request req; + memset (&req, 0, sizeof (req)); + GPR_ASSERT (pr->retries < 10); + pr->retries++; + req.host = pr->server; + req.path = "/get"; + gpr_log (GPR_DEBUG, "failed port pick from server: retrying"); + sleep (1); + grpc_httpcli_get (pr->ctx, &pr->pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, pr, closure_list); + return; + } + GPR_ASSERT (response); + GPR_ASSERT (response->status == 200); + for (i = 0; i < response->body_length; i++) + { + GPR_ASSERT (response->body[i] >= '0' && response->body[i] <= '9'); + port = port * 10 + response->body[i] - '0'; + } + GPR_ASSERT (port > 1024); + gpr_mu_lock (GRPC_POLLSET_MU (&pr->pollset)); pr->port = port; - grpc_pollset_kick(&pr->pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&pr->pollset)); + grpc_pollset_kick (&pr->pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&pr->pollset)); } -static int pick_port_using_server(char *server) { +static int +pick_port_using_server (char *server) +{ grpc_httpcli_context context; grpc_httpcli_request req; portreq pr; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_closure shutdown_closure; - grpc_init(); + grpc_init (); - memset(&pr, 0, sizeof(pr)); - memset(&req, 0, sizeof(req)); - grpc_pollset_init(&pr.pollset); - grpc_closure_init(&shutdown_closure, destroy_pollset_and_shutdown, - &pr.pollset); + memset (&pr, 0, sizeof (pr)); + memset (&req, 0, sizeof (req)); + grpc_pollset_init (&pr.pollset); + grpc_closure_init (&shutdown_closure, destroy_pollset_and_shutdown, &pr.pollset); pr.port = -1; pr.server = server; pr.ctx = &context; @@ -263,27 +286,27 @@ static int pick_port_using_server(char *server) { req.host = server; req.path = "/get"; - grpc_httpcli_context_init(&context); - grpc_httpcli_get(&context, &pr.pollset, &req, - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), got_port_from_server, - &pr, &closure_list); - grpc_closure_list_run(&closure_list); - gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); - while (pr.port == -1) { - grpc_pollset_worker worker; - grpc_pollset_work(&pr.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1), &closure_list); - } - gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); - - grpc_httpcli_context_destroy(&context); - grpc_pollset_shutdown(&pr.pollset, &shutdown_closure, &closure_list); - grpc_closure_list_run(&closure_list); + grpc_httpcli_context_init (&context); + grpc_httpcli_get (&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, &pr, &closure_list); + grpc_closure_list_run (&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&pr.pollset)); + while (pr.port == -1) + { + grpc_pollset_worker worker; + grpc_pollset_work (&pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1), &closure_list); + } + gpr_mu_unlock (GRPC_POLLSET_MU (&pr.pollset)); + + grpc_httpcli_context_destroy (&context); + grpc_pollset_shutdown (&pr.pollset, &shutdown_closure, &closure_list); + grpc_closure_list_run (&closure_list); return pr.port; } -int grpc_pick_unused_port(void) { +int +grpc_pick_unused_port (void) +{ /* We repeatedly pick a port and then see whether or not it is available for use both as a TCP socket and a UDP socket. First, we pick a random large port number. For subsequent @@ -300,55 +323,68 @@ int grpc_pick_unused_port(void) { int is_tcp = 1; int trial = 0; - char *env = gpr_getenv("GRPC_TEST_PORT_SERVER"); - if (env) { - int port = pick_port_using_server(env); - gpr_free(env); - if (port != 0) { - chose_port(port); - } - return port; - } - - for (;;) { - int port; - trial++; - if (trial == 1) { - port = getpid() % (65536 - 30000) + 30000; - } else if (trial <= NUM_RANDOM_PORTS_TO_PICK) { - port = rand() % (65536 - 30000) + 30000; - } else { - port = 0; - } - - if (has_port_been_chosen(port)) { - continue; + char *env = gpr_getenv ("GRPC_TEST_PORT_SERVER"); + if (env) + { + int port = pick_port_using_server (env); + gpr_free (env); + if (port != 0) + { + chose_port (port); + } + return port; } - if (!is_port_available(&port, is_tcp)) { - continue; + for (;;) + { + int port; + trial++; + if (trial == 1) + { + port = getpid () % (65536 - 30000) + 30000; + } + else if (trial <= NUM_RANDOM_PORTS_TO_PICK) + { + port = rand () % (65536 - 30000) + 30000; + } + else + { + port = 0; + } + + if (has_port_been_chosen (port)) + { + continue; + } + + if (!is_port_available (&port, is_tcp)) + { + continue; + } + + GPR_ASSERT (port > 0); + /* Check that the port # is free for the other type of socket also */ + if (!is_port_available (&port, !is_tcp)) + { + /* In the next iteration trial to bind to the other type first + because perhaps it is more rare. */ + is_tcp = !is_tcp; + continue; + } + + chose_port (port); + return port; } - GPR_ASSERT(port > 0); - /* Check that the port # is free for the other type of socket also */ - if (!is_port_available(&port, !is_tcp)) { - /* In the next iteration trial to bind to the other type first - because perhaps it is more rare. */ - is_tcp = !is_tcp; - continue; - } - - chose_port(port); - return port; - } - /* The port iterator reached the end without finding a suitable port. */ return 0; } -int grpc_pick_unused_port_or_die(void) { - int port = grpc_pick_unused_port(); - GPR_ASSERT(port > 0); +int +grpc_pick_unused_port_or_die (void) +{ + int port = grpc_pick_unused_port (); + GPR_ASSERT (port > 0); return port; } diff --git a/test/core/util/port_windows.c b/test/core/util/port_windows.c index a57fe692e13..fefe33e9ba5 100644 --- a/test/core/util/port_windows.c +++ b/test/core/util/port_windows.c @@ -55,141 +55,167 @@ static int *chosen_ports = NULL; static size_t num_chosen_ports = 0; -static int has_port_been_chosen(int port) { +static int +has_port_been_chosen (int port) +{ size_t i; - for (i = 0; i < num_chosen_ports; i++) { - if (chosen_ports[i] == port) { - return 1; + for (i = 0; i < num_chosen_ports; i++) + { + if (chosen_ports[i] == port) + { + return 1; + } } - } return 0; } -static void free_chosen_ports() { gpr_free(chosen_ports); } +static void +free_chosen_ports () +{ + gpr_free (chosen_ports); +} -static void chose_port(int port) { - if (chosen_ports == NULL) { - atexit(free_chosen_ports); - } +static void +chose_port (int port) +{ + if (chosen_ports == NULL) + { + atexit (free_chosen_ports); + } num_chosen_ports++; - chosen_ports = gpr_realloc(chosen_ports, sizeof(int) * num_chosen_ports); + chosen_ports = gpr_realloc (chosen_ports, sizeof (int) * num_chosen_ports); chosen_ports[num_chosen_ports - 1] = port; } -static int is_port_available(int *port, int is_tcp) { +static int +is_port_available (int *port, int is_tcp) +{ const int proto = is_tcp ? IPPROTO_TCP : 0; - const SOCKET fd = socket(AF_INET, is_tcp ? SOCK_STREAM : SOCK_DGRAM, proto); + const SOCKET fd = socket (AF_INET, is_tcp ? SOCK_STREAM : SOCK_DGRAM, proto); int one = 1; struct sockaddr_in addr; - socklen_t alen = sizeof(addr); + socklen_t alen = sizeof (addr); int actual_port; - GPR_ASSERT(*port >= 0); - GPR_ASSERT(*port <= 65535); - if (INVALID_SOCKET == fd) { - gpr_log(GPR_ERROR, "socket() failed: %s", strerror(errno)); - return 0; - } + GPR_ASSERT (*port >= 0); + GPR_ASSERT (*port <= 65535); + if (INVALID_SOCKET == fd) + { + gpr_log (GPR_ERROR, "socket() failed: %s", strerror (errno)); + return 0; + } /* Reuseaddr lets us start up a server immediately after it exits */ - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const char *)&one, - sizeof(one)) < 0) { - gpr_log(GPR_ERROR, "setsockopt() failed: %s", strerror(errno)); - closesocket(fd); - return 0; - } + if (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (const char *) &one, sizeof (one)) < 0) + { + gpr_log (GPR_ERROR, "setsockopt() failed: %s", strerror (errno)); + closesocket (fd); + return 0; + } /* Try binding to port */ addr.sin_family = AF_INET; addr.sin_addr.s_addr = INADDR_ANY; - addr.sin_port = htons(*port); - if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - gpr_log(GPR_DEBUG, "bind(port=%d) failed: %s", *port, strerror(errno)); - closesocket(fd); - return 0; - } + addr.sin_port = htons (*port); + if (bind (fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) + { + gpr_log (GPR_DEBUG, "bind(port=%d) failed: %s", *port, strerror (errno)); + closesocket (fd); + return 0; + } /* Get the bound port number */ - if (getsockname(fd, (struct sockaddr *)&addr, &alen) < 0) { - gpr_log(GPR_ERROR, "getsockname() failed: %s", strerror(errno)); - closesocket(fd); - return 0; - } - GPR_ASSERT(alen <= sizeof(addr)); - actual_port = ntohs(addr.sin_port); - GPR_ASSERT(actual_port > 0); - if (*port == 0) { - *port = actual_port; - } else { - GPR_ASSERT(*port == actual_port); - } - - closesocket(fd); + if (getsockname (fd, (struct sockaddr *) &addr, &alen) < 0) + { + gpr_log (GPR_ERROR, "getsockname() failed: %s", strerror (errno)); + closesocket (fd); + return 0; + } + GPR_ASSERT (alen <= sizeof (addr)); + actual_port = ntohs (addr.sin_port); + GPR_ASSERT (actual_port > 0); + if (*port == 0) + { + *port = actual_port; + } + else + { + GPR_ASSERT (*port == actual_port); + } + + closesocket (fd); return 1; } -typedef struct portreq { +typedef struct portreq +{ grpc_pollset pollset; int port; } portreq; -static void got_port_from_server(void *arg, - const grpc_httpcli_response *response) { +static void +got_port_from_server (void *arg, const grpc_httpcli_response * response) +{ size_t i; int port = 0; portreq *pr = arg; - GPR_ASSERT(response); - GPR_ASSERT(response->status == 200); - for (i = 0; i < response->body_length; i++) { - GPR_ASSERT(response->body[i] >= '0' && response->body[i] <= '9'); - port = port * 10 + response->body[i] - '0'; - } - GPR_ASSERT(port > 1024); - gpr_mu_lock(GRPC_POLLSET_MU(&pr->pollset)); + GPR_ASSERT (response); + GPR_ASSERT (response->status == 200); + for (i = 0; i < response->body_length; i++) + { + GPR_ASSERT (response->body[i] >= '0' && response->body[i] <= '9'); + port = port * 10 + response->body[i] - '0'; + } + GPR_ASSERT (port > 1024); + gpr_mu_lock (GRPC_POLLSET_MU (&pr->pollset)); pr->port = port; - grpc_pollset_kick(&pr->pollset, NULL); - gpr_mu_unlock(GRPC_POLLSET_MU(&pr->pollset)); + grpc_pollset_kick (&pr->pollset, NULL); + gpr_mu_unlock (GRPC_POLLSET_MU (&pr->pollset)); } -static void destroy_pollset_and_shutdown(void *p) { - grpc_pollset_destroy(p); - grpc_shutdown(); +static void +destroy_pollset_and_shutdown (void *p) +{ + grpc_pollset_destroy (p); + grpc_shutdown (); } -static int pick_port_using_server(char *server) { +static int +pick_port_using_server (char *server) +{ grpc_httpcli_context context; grpc_httpcli_request req; portreq pr; - grpc_init(); + grpc_init (); - memset(&pr, 0, sizeof(pr)); - memset(&req, 0, sizeof(req)); - grpc_pollset_init(&pr.pollset); + memset (&pr, 0, sizeof (pr)); + memset (&req, 0, sizeof (req)); + grpc_pollset_init (&pr.pollset); pr.port = -1; req.host = server; req.path = "/get"; - grpc_httpcli_context_init(&context); - grpc_httpcli_get(&context, &pr.pollset, &req, - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), got_port_from_server, - &pr); - gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); - while (pr.port == -1) { - grpc_pollset_worker worker; - grpc_pollset_work(&pr.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1)); - } - gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); - - grpc_httpcli_context_destroy(&context); - grpc_pollset_shutdown(&pr.pollset, destroy_pollset_and_shutdown, &pr.pollset); + grpc_httpcli_context_init (&context); + grpc_httpcli_get (&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, &pr); + gpr_mu_lock (GRPC_POLLSET_MU (&pr.pollset)); + while (pr.port == -1) + { + grpc_pollset_worker worker; + grpc_pollset_work (&pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1)); + } + gpr_mu_unlock (GRPC_POLLSET_MU (&pr.pollset)); + + grpc_httpcli_context_destroy (&context); + grpc_pollset_shutdown (&pr.pollset, destroy_pollset_and_shutdown, &pr.pollset); return pr.port; } -int grpc_pick_unused_port(void) { +int +grpc_pick_unused_port (void) +{ /* We repeatedly pick a port and then see whether or not it is available for use both as a TCP socket and a UDP socket. First, we pick a random large port number. For subsequent @@ -206,57 +232,70 @@ int grpc_pick_unused_port(void) { int is_tcp = 1; int trial = 0; - char *env = gpr_getenv("GRPC_TEST_PORT_SERVER"); - if (env) { - int port = pick_port_using_server(env); - gpr_free(env); - if (port != 0) { - return port; - } - } - - for (;;) { - int port; - trial++; - if (trial == 1) { - port = _getpid() % (65536 - 30000) + 30000; - } else if (trial <= NUM_RANDOM_PORTS_TO_PICK) { - port = rand() % (65536 - 30000) + 30000; - } else { - port = 0; - } - - if (has_port_been_chosen(port)) { - continue; + char *env = gpr_getenv ("GRPC_TEST_PORT_SERVER"); + if (env) + { + int port = pick_port_using_server (env); + gpr_free (env); + if (port != 0) + { + return port; + } } - if (!is_port_available(&port, is_tcp)) { - continue; - } - - GPR_ASSERT(port > 0); - /* Check that the port # is free for the other type of socket also */ - if (!is_port_available(&port, !is_tcp)) { - /* In the next iteration trial to bind to the other type first - because perhaps it is more rare. */ - is_tcp = !is_tcp; - continue; + for (;;) + { + int port; + trial++; + if (trial == 1) + { + port = _getpid () % (65536 - 30000) + 30000; + } + else if (trial <= NUM_RANDOM_PORTS_TO_PICK) + { + port = rand () % (65536 - 30000) + 30000; + } + else + { + port = 0; + } + + if (has_port_been_chosen (port)) + { + continue; + } + + if (!is_port_available (&port, is_tcp)) + { + continue; + } + + GPR_ASSERT (port > 0); + /* Check that the port # is free for the other type of socket also */ + if (!is_port_available (&port, !is_tcp)) + { + /* In the next iteration trial to bind to the other type first + because perhaps it is more rare. */ + is_tcp = !is_tcp; + continue; + } + + /* TODO(ctiller): consider caching this port in some structure, to avoid + handing it out again */ + + chose_port (port); + return port; } - /* TODO(ctiller): consider caching this port in some structure, to avoid - handing it out again */ - - chose_port(port); - return port; - } - /* The port iterator reached the end without finding a suitable port. */ return 0; } -int grpc_pick_unused_port_or_die(void) { - int port = grpc_pick_unused_port(); - GPR_ASSERT(port > 0); +int +grpc_pick_unused_port_or_die (void) +{ + int port = grpc_pick_unused_port (); + GPR_ASSERT (port > 0); return port; } diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index 8092cbc73a0..f7303030047 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -45,133 +45,151 @@ #include "src/core/iomgr/tcp_server.h" #include "test/core/util/port.h" -static void pretty_print_backoffs(reconnect_server *server) { +static void +pretty_print_backoffs (reconnect_server * server) +{ gpr_timespec diff; int i = 1; double expected_backoff = 1000.0, backoff; timestamp_list *head = server->head; - gpr_log(GPR_INFO, "reconnect server: new connection"); - for (head = server->head; head && head->next; head = head->next, i++) { - diff = gpr_time_sub(head->next->timestamp, head->timestamp); - backoff = gpr_time_to_millis(diff); - gpr_log(GPR_INFO, - "retry %2d:backoff %6.2fs,expected backoff %6.2fs, jitter %4.2f%%", - i, backoff / 1000.0, expected_backoff / 1000.0, - (backoff - expected_backoff) * 100.0 / expected_backoff); - expected_backoff *= 1.6; - if (expected_backoff > 120 * 1000) { - expected_backoff = 120 * 1000; + gpr_log (GPR_INFO, "reconnect server: new connection"); + for (head = server->head; head && head->next; head = head->next, i++) + { + diff = gpr_time_sub (head->next->timestamp, head->timestamp); + backoff = gpr_time_to_millis (diff); + gpr_log (GPR_INFO, "retry %2d:backoff %6.2fs,expected backoff %6.2fs, jitter %4.2f%%", i, backoff / 1000.0, expected_backoff / 1000.0, (backoff - expected_backoff) * 100.0 / expected_backoff); + expected_backoff *= 1.6; + if (expected_backoff > 120 * 1000) + { + expected_backoff = 120 * 1000; + } } - } } -static void on_connect(void *arg, grpc_endpoint *tcp, - grpc_closure_list *closure_list) { +static void +on_connect (void *arg, grpc_endpoint * tcp, grpc_closure_list * closure_list) +{ char *peer; char *last_colon; - reconnect_server *server = (reconnect_server *)arg; - gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + reconnect_server *server = (reconnect_server *) arg; + gpr_timespec now = gpr_now (GPR_CLOCK_REALTIME); timestamp_list *new_tail; - peer = grpc_endpoint_get_peer(tcp); - grpc_endpoint_shutdown(tcp, closure_list); - grpc_endpoint_destroy(tcp, closure_list); - if (peer) { - last_colon = strrchr(peer, ':'); - if (server->peer == NULL) { - server->peer = peer; - } else { - if (last_colon == NULL) { - gpr_log(GPR_ERROR, "peer does not contain a ':'"); - } else if (strncmp(server->peer, peer, (size_t)(last_colon - peer)) != - 0) { - gpr_log(GPR_ERROR, "mismatched peer! %s vs %s", server->peer, peer); - } - gpr_free(peer); + peer = grpc_endpoint_get_peer (tcp); + grpc_endpoint_shutdown (tcp, closure_list); + grpc_endpoint_destroy (tcp, closure_list); + if (peer) + { + last_colon = strrchr (peer, ':'); + if (server->peer == NULL) + { + server->peer = peer; + } + else + { + if (last_colon == NULL) + { + gpr_log (GPR_ERROR, "peer does not contain a ':'"); + } + else if (strncmp (server->peer, peer, (size_t) (last_colon - peer)) != 0) + { + gpr_log (GPR_ERROR, "mismatched peer! %s vs %s", server->peer, peer); + } + gpr_free (peer); + } } - } - new_tail = gpr_malloc(sizeof(timestamp_list)); + new_tail = gpr_malloc (sizeof (timestamp_list)); new_tail->timestamp = now; new_tail->next = NULL; - if (server->tail == NULL) { - server->head = new_tail; - server->tail = new_tail; - } else { - server->tail->next = new_tail; - server->tail = new_tail; - } - pretty_print_backoffs(server); + if (server->tail == NULL) + { + server->head = new_tail; + server->tail = new_tail; + } + else + { + server->tail->next = new_tail; + server->tail = new_tail; + } + pretty_print_backoffs (server); } -void reconnect_server_init(reconnect_server *server) { - grpc_init(); +void +reconnect_server_init (reconnect_server * server) +{ + grpc_init (); server->tcp_server = NULL; - grpc_pollset_init(&server->pollset); + grpc_pollset_init (&server->pollset); server->pollsets[0] = &server->pollset; server->head = NULL; server->tail = NULL; server->peer = NULL; } -void reconnect_server_start(reconnect_server *server, int port) { +void +reconnect_server_start (reconnect_server * server, int port) +{ struct sockaddr_in addr; int port_added; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; addr.sin_family = AF_INET; - addr.sin_port = htons((gpr_uint16)port); - memset(&addr.sin_addr, 0, sizeof(addr.sin_addr)); + addr.sin_port = htons ((gpr_uint16) port); + memset (&addr.sin_addr, 0, sizeof (addr.sin_addr)); - server->tcp_server = grpc_tcp_server_create(); - port_added = - grpc_tcp_server_add_port(server->tcp_server, &addr, sizeof(addr)); - GPR_ASSERT(port_added == port); + server->tcp_server = grpc_tcp_server_create (); + port_added = grpc_tcp_server_add_port (server->tcp_server, &addr, sizeof (addr)); + GPR_ASSERT (port_added == port); - grpc_tcp_server_start(server->tcp_server, server->pollsets, 1, on_connect, - server, &closure_list); - gpr_log(GPR_INFO, "reconnect tcp server listening on 0.0.0.0:%d", port); + grpc_tcp_server_start (server->tcp_server, server->pollsets, 1, on_connect, server, &closure_list); + gpr_log (GPR_INFO, "reconnect tcp server listening on 0.0.0.0:%d", port); - grpc_closure_list_run(&closure_list); + grpc_closure_list_run (&closure_list); } -void reconnect_server_poll(reconnect_server *server, int seconds) { +void +reconnect_server_poll (reconnect_server * server, int seconds) +{ grpc_pollset_worker worker; - gpr_timespec deadline = - gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), - gpr_time_from_seconds(seconds, GPR_TIMESPAN)); + gpr_timespec deadline = gpr_time_add (gpr_now (GPR_CLOCK_MONOTONIC), + gpr_time_from_seconds (seconds, GPR_TIMESPAN)); grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; - gpr_mu_lock(GRPC_POLLSET_MU(&server->pollset)); - grpc_pollset_work(&server->pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - deadline, &closure_list); - gpr_mu_unlock(GRPC_POLLSET_MU(&server->pollset)); - grpc_closure_list_run(&closure_list); + gpr_mu_lock (GRPC_POLLSET_MU (&server->pollset)); + grpc_pollset_work (&server->pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); + gpr_mu_unlock (GRPC_POLLSET_MU (&server->pollset)); + grpc_closure_list_run (&closure_list); } -void reconnect_server_clear_timestamps(reconnect_server *server) { +void +reconnect_server_clear_timestamps (reconnect_server * server) +{ timestamp_list *new_head = server->head; - while (server->head) { - new_head = server->head->next; - gpr_free(server->head); - server->head = new_head; - } + while (server->head) + { + new_head = server->head->next; + gpr_free (server->head); + server->head = new_head; + } server->tail = NULL; - gpr_free(server->peer); + gpr_free (server->peer); server->peer = NULL; } -static void do_nothing(void *ignored, int success, - grpc_closure_list *closure_list) {} +static void +do_nothing (void *ignored, int success, grpc_closure_list * closure_list) +{ +} -void reconnect_server_destroy(reconnect_server *server) { +void +reconnect_server_destroy (reconnect_server * server) +{ grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_closure do_nothing_closure[2]; - grpc_closure_init(&do_nothing_closure[0], do_nothing, NULL); - grpc_closure_init(&do_nothing_closure[1], do_nothing, NULL); - grpc_tcp_server_destroy(server->tcp_server, &do_nothing_closure[0], - &closure_list); - reconnect_server_clear_timestamps(server); - grpc_pollset_shutdown(&server->pollset, &do_nothing_closure[1], - &closure_list); - grpc_closure_list_run(&closure_list); - grpc_pollset_destroy(&server->pollset); - grpc_shutdown(); + grpc_closure_init (&do_nothing_closure[0], do_nothing, NULL); + grpc_closure_init (&do_nothing_closure[1], do_nothing, NULL); + grpc_tcp_server_destroy (server->tcp_server, &do_nothing_closure[0], &closure_list); + reconnect_server_clear_timestamps (server); + grpc_pollset_shutdown (&server->pollset, &do_nothing_closure[1], &closure_list); + grpc_closure_list_run (&closure_list); + grpc_pollset_destroy (&server->pollset); + grpc_shutdown (); } diff --git a/test/core/util/reconnect_server.h b/test/core/util/reconnect_server.h index 8a278e0c7a7..aaf277390cf 100644 --- a/test/core/util/reconnect_server.h +++ b/test/core/util/reconnect_server.h @@ -39,31 +39,34 @@ #include "src/core/iomgr/tcp_server.h" #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif -typedef struct timestamp_list { - gpr_timespec timestamp; - struct timestamp_list *next; -} timestamp_list; + typedef struct timestamp_list + { + gpr_timespec timestamp; + struct timestamp_list *next; + } timestamp_list; -typedef struct reconnect_server { - grpc_tcp_server *tcp_server; - grpc_pollset pollset; - grpc_pollset *pollsets[1]; - timestamp_list *head; - timestamp_list *tail; - char *peer; -} reconnect_server; + typedef struct reconnect_server + { + grpc_tcp_server *tcp_server; + grpc_pollset pollset; + grpc_pollset *pollsets[1]; + timestamp_list *head; + timestamp_list *tail; + char *peer; + } reconnect_server; -void reconnect_server_init(reconnect_server *server); -void reconnect_server_start(reconnect_server *server, int port); -void reconnect_server_poll(reconnect_server *server, int seconds); -void reconnect_server_destroy(reconnect_server *server); -void reconnect_server_clear_timestamps(reconnect_server *server); + void reconnect_server_init (reconnect_server * server); + void reconnect_server_start (reconnect_server * server, int port); + void reconnect_server_poll (reconnect_server * server, int seconds); + void reconnect_server_destroy (reconnect_server * server); + void reconnect_server_clear_timestamps (reconnect_server * server); #ifdef __cplusplus } #endif -#endif /* GRPC_TEST_CORE_UTIL_RECONNECT_SERVER_H */ +#endif /* GRPC_TEST_CORE_UTIL_RECONNECT_SERVER_H */ diff --git a/test/core/util/slice_splitter.c b/test/core/util/slice_splitter.c index 0f05072e505..f0282c0aaa0 100644 --- a/test/core/util/slice_splitter.c +++ b/test/core/util/slice_splitter.c @@ -38,101 +38,114 @@ #include #include -const char *grpc_slice_split_mode_name(grpc_slice_split_mode mode) { - switch (mode) { +const char * +grpc_slice_split_mode_name (grpc_slice_split_mode mode) +{ + switch (mode) + { case GRPC_SLICE_SPLIT_IDENTITY: return "identity"; case GRPC_SLICE_SPLIT_MERGE_ALL: return "merge_all"; case GRPC_SLICE_SPLIT_ONE_BYTE: return "one_byte"; - } + } return "error"; } -void grpc_split_slices(grpc_slice_split_mode mode, gpr_slice *src_slices, - size_t src_slice_count, gpr_slice **dst_slices, - size_t *dst_slice_count) { +void +grpc_split_slices (grpc_slice_split_mode mode, gpr_slice * src_slices, size_t src_slice_count, gpr_slice ** dst_slices, size_t * dst_slice_count) +{ size_t i, j; size_t length; - switch (mode) { + switch (mode) + { case GRPC_SLICE_SPLIT_IDENTITY: *dst_slice_count = src_slice_count; - *dst_slices = gpr_malloc(sizeof(gpr_slice) * src_slice_count); - for (i = 0; i < src_slice_count; i++) { - (*dst_slices)[i] = src_slices[i]; - gpr_slice_ref((*dst_slices)[i]); - } + *dst_slices = gpr_malloc (sizeof (gpr_slice) * src_slice_count); + for (i = 0; i < src_slice_count; i++) + { + (*dst_slices)[i] = src_slices[i]; + gpr_slice_ref ((*dst_slices)[i]); + } break; case GRPC_SLICE_SPLIT_MERGE_ALL: *dst_slice_count = 1; length = 0; - for (i = 0; i < src_slice_count; i++) { - length += GPR_SLICE_LENGTH(src_slices[i]); - } - *dst_slices = gpr_malloc(sizeof(gpr_slice)); - **dst_slices = gpr_slice_malloc(length); + for (i = 0; i < src_slice_count; i++) + { + length += GPR_SLICE_LENGTH (src_slices[i]); + } + *dst_slices = gpr_malloc (sizeof (gpr_slice)); + **dst_slices = gpr_slice_malloc (length); length = 0; - for (i = 0; i < src_slice_count; i++) { - memcpy(GPR_SLICE_START_PTR(**dst_slices) + length, - GPR_SLICE_START_PTR(src_slices[i]), - GPR_SLICE_LENGTH(src_slices[i])); - length += GPR_SLICE_LENGTH(src_slices[i]); - } + for (i = 0; i < src_slice_count; i++) + { + memcpy (GPR_SLICE_START_PTR (**dst_slices) + length, GPR_SLICE_START_PTR (src_slices[i]), GPR_SLICE_LENGTH (src_slices[i])); + length += GPR_SLICE_LENGTH (src_slices[i]); + } break; case GRPC_SLICE_SPLIT_ONE_BYTE: length = 0; - for (i = 0; i < src_slice_count; i++) { - length += GPR_SLICE_LENGTH(src_slices[i]); - } + for (i = 0; i < src_slice_count; i++) + { + length += GPR_SLICE_LENGTH (src_slices[i]); + } *dst_slice_count = length; - *dst_slices = gpr_malloc(sizeof(gpr_slice) * length); + *dst_slices = gpr_malloc (sizeof (gpr_slice) * length); length = 0; - for (i = 0; i < src_slice_count; i++) { - for (j = 0; j < GPR_SLICE_LENGTH(src_slices[i]); j++) { - (*dst_slices)[length] = gpr_slice_sub(src_slices[i], j, j + 1); - length++; - } - } + for (i = 0; i < src_slice_count; i++) + { + for (j = 0; j < GPR_SLICE_LENGTH (src_slices[i]); j++) + { + (*dst_slices)[length] = gpr_slice_sub (src_slices[i], j, j + 1); + length++; + } + } break; - } + } } -void grpc_split_slices_to_buffer(grpc_slice_split_mode mode, - gpr_slice *src_slices, size_t src_slice_count, - gpr_slice_buffer *dst) { +void +grpc_split_slices_to_buffer (grpc_slice_split_mode mode, gpr_slice * src_slices, size_t src_slice_count, gpr_slice_buffer * dst) +{ gpr_slice *slices; size_t nslices; size_t i; - grpc_split_slices(mode, src_slices, src_slice_count, &slices, &nslices); - for (i = 0; i < nslices; i++) { - /* add indexed to avoid re-merging split slices */ - gpr_slice_buffer_add_indexed(dst, slices[i]); - } - gpr_free(slices); + grpc_split_slices (mode, src_slices, src_slice_count, &slices, &nslices); + for (i = 0; i < nslices; i++) + { + /* add indexed to avoid re-merging split slices */ + gpr_slice_buffer_add_indexed (dst, slices[i]); + } + gpr_free (slices); } -void grpc_split_slice_buffer(grpc_slice_split_mode mode, gpr_slice_buffer *src, - gpr_slice_buffer *dst) { - grpc_split_slices_to_buffer(mode, src->slices, src->count, dst); +void +grpc_split_slice_buffer (grpc_slice_split_mode mode, gpr_slice_buffer * src, gpr_slice_buffer * dst) +{ + grpc_split_slices_to_buffer (mode, src->slices, src->count, dst); } -gpr_slice grpc_slice_merge(gpr_slice *slices, size_t nslices) { +gpr_slice +grpc_slice_merge (gpr_slice * slices, size_t nslices) +{ gpr_uint8 *out = NULL; size_t length = 0; size_t capacity = 0; size_t i; - for (i = 0; i < nslices; i++) { - if (GPR_SLICE_LENGTH(slices[i]) + length > capacity) { - capacity = GPR_MAX(capacity * 2, GPR_SLICE_LENGTH(slices[i]) + length); - out = gpr_realloc(out, capacity); + for (i = 0; i < nslices; i++) + { + if (GPR_SLICE_LENGTH (slices[i]) + length > capacity) + { + capacity = GPR_MAX (capacity * 2, GPR_SLICE_LENGTH (slices[i]) + length); + out = gpr_realloc (out, capacity); + } + memcpy (out + length, GPR_SLICE_START_PTR (slices[i]), GPR_SLICE_LENGTH (slices[i])); + length += GPR_SLICE_LENGTH (slices[i]); } - memcpy(out + length, GPR_SLICE_START_PTR(slices[i]), - GPR_SLICE_LENGTH(slices[i])); - length += GPR_SLICE_LENGTH(slices[i]); - } - return gpr_slice_new(out, length, gpr_free); + return gpr_slice_new (out, length, gpr_free); } diff --git a/test/core/util/slice_splitter.h b/test/core/util/slice_splitter.h index d030c2cb555..992001730cd 100644 --- a/test/core/util/slice_splitter.h +++ b/test/core/util/slice_splitter.h @@ -40,7 +40,8 @@ #include #include -typedef enum { +typedef enum +{ /* merge all input slices into a single slice */ GRPC_SLICE_SPLIT_MERGE_ALL, /* leave slices as is */ @@ -51,18 +52,13 @@ typedef enum { /* allocates *dst_slices; caller must unref all slices in dst_slices then free it */ -void grpc_split_slices(grpc_slice_split_mode mode, gpr_slice *src_slices, - size_t src_slice_count, gpr_slice **dst_slices, - size_t *dst_slice_count); +void grpc_split_slices (grpc_slice_split_mode mode, gpr_slice * src_slices, size_t src_slice_count, gpr_slice ** dst_slices, size_t * dst_slice_count); -void grpc_split_slices_to_buffer(grpc_slice_split_mode mode, - gpr_slice *src_slices, size_t src_slice_count, - gpr_slice_buffer *dst); -void grpc_split_slice_buffer(grpc_slice_split_mode mode, gpr_slice_buffer *src, - gpr_slice_buffer *dst); +void grpc_split_slices_to_buffer (grpc_slice_split_mode mode, gpr_slice * src_slices, size_t src_slice_count, gpr_slice_buffer * dst); +void grpc_split_slice_buffer (grpc_slice_split_mode mode, gpr_slice_buffer * src, gpr_slice_buffer * dst); -gpr_slice grpc_slice_merge(gpr_slice *slices, size_t nslices); +gpr_slice grpc_slice_merge (gpr_slice * slices, size_t nslices); -const char *grpc_slice_split_mode_name(grpc_slice_split_mode mode); +const char *grpc_slice_split_mode_name (grpc_slice_split_mode mode); #endif /* GRPC_TEST_CORE_UTIL_SLICE_SPLITTER_H */ diff --git a/test/core/util/test_config.c b/test/core/util/test_config.c index f5d5cdb57c5..eb2ff22c8bd 100644 --- a/test/core/util/test_config.c +++ b/test/core/util/test_config.c @@ -42,58 +42,81 @@ double g_fixture_slowdown_factor = 1.0; #if GPR_GETPID_IN_UNISTD_H #include -static unsigned seed(void) { return (unsigned)getpid(); } +static unsigned +seed (void) +{ + return (unsigned) getpid (); +} #endif #if GPR_GETPID_IN_PROCESS_H #include -static unsigned seed(void) { return _getpid(); } +static unsigned +seed (void) +{ + return _getpid (); +} #endif #if GPR_WINDOWS_CRASH_HANDLER -LONG crash_handler(struct _EXCEPTION_POINTERS* ex_info) { - gpr_log(GPR_DEBUG, "Exception handler called, dumping information"); - while (ex_info->ExceptionRecord) { - DWORD code = ex_info->ExceptionRecord->ExceptionCode; - DWORD flgs = ex_info->ExceptionRecord->ExceptionFlags; - PVOID addr = ex_info->ExceptionRecord->ExceptionAddress; - gpr_log("code: %x - flags: %d - address: %p", code, flgs, addr); - ex_info->ExceptionRecord = ex_info->ExceptionRecord->ExceptionRecord; - } - if (IsDebuggerPresent()) { - __debugbreak(); - } else { - _exit(1); - } +LONG +crash_handler (struct _EXCEPTION_POINTERS * ex_info) +{ + gpr_log (GPR_DEBUG, "Exception handler called, dumping information"); + while (ex_info->ExceptionRecord) + { + DWORD code = ex_info->ExceptionRecord->ExceptionCode; + DWORD flgs = ex_info->ExceptionRecord->ExceptionFlags; + PVOID addr = ex_info->ExceptionRecord->ExceptionAddress; + gpr_log ("code: %x - flags: %d - address: %p", code, flgs, addr); + ex_info->ExceptionRecord = ex_info->ExceptionRecord->ExceptionRecord; + } + if (IsDebuggerPresent ()) + { + __debugbreak (); + } + else + { + _exit (1); + } return EXCEPTION_EXECUTE_HANDLER; } -void abort_handler(int sig) { - gpr_log(GPR_DEBUG, "Abort handler called."); - if (IsDebuggerPresent()) { - __debugbreak(); - } else { - _exit(1); - } +void +abort_handler (int sig) +{ + gpr_log (GPR_DEBUG, "Abort handler called."); + if (IsDebuggerPresent ()) + { + __debugbreak (); + } + else + { + _exit (1); + } } -static void install_crash_handler() { - SetUnhandledExceptionFilter((LPTOP_LEVEL_EXCEPTION_FILTER)crash_handler); - _set_abort_behavior(0, _WRITE_ABORT_MSG); - _set_abort_behavior(0, _CALL_REPORTFAULT); - signal(SIGABRT, abort_handler); +static void +install_crash_handler () +{ + SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) crash_handler); + _set_abort_behavior (0, _WRITE_ABORT_MSG); + _set_abort_behavior (0, _CALL_REPORTFAULT); + signal (SIGABRT, abort_handler); } #else -static void install_crash_handler() {} +static void +install_crash_handler () +{ +} #endif -void grpc_test_init(int argc, char** argv) { - install_crash_handler(); - gpr_log(GPR_DEBUG, "test slowdown: machine=%f build=%f total=%f", - (double)GRPC_TEST_SLOWDOWN_MACHINE_FACTOR, - (double)GRPC_TEST_SLOWDOWN_BUILD_FACTOR, - (double)GRPC_TEST_SLOWDOWN_FACTOR); +void +grpc_test_init (int argc, char **argv) +{ + install_crash_handler (); + gpr_log (GPR_DEBUG, "test slowdown: machine=%f build=%f total=%f", (double) GRPC_TEST_SLOWDOWN_MACHINE_FACTOR, (double) GRPC_TEST_SLOWDOWN_BUILD_FACTOR, (double) GRPC_TEST_SLOWDOWN_FACTOR); /* seed rng with pid, so we don't end up with the same random numbers as a concurrently running test binary */ - srand(seed()); + srand (seed ()); } diff --git a/test/core/util/test_config.h b/test/core/util/test_config.h index 15b71747fb5..05057b9893e 100644 --- a/test/core/util/test_config.h +++ b/test/core/util/test_config.h @@ -37,8 +37,9 @@ #include #ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +extern "C" +{ +#endif /* __cplusplus */ #ifndef GRPC_TEST_SLOWDOWN_BUILD_FACTOR #define GRPC_TEST_SLOWDOWN_BUILD_FACTOR 1.0 @@ -48,7 +49,7 @@ extern "C" { #define GRPC_TEST_SLOWDOWN_MACHINE_FACTOR 1.0 #endif -extern double g_fixture_slowdown_factor; + extern double g_fixture_slowdown_factor; #define GRPC_TEST_SLOWDOWN_FACTOR \ (GRPC_TEST_SLOWDOWN_BUILD_FACTOR * GRPC_TEST_SLOWDOWN_MACHINE_FACTOR * \ @@ -70,10 +71,10 @@ extern double g_fixture_slowdown_factor; #define GRPC_TEST_PICK_PORT #endif -void grpc_test_init(int argc, char **argv); + void grpc_test_init (int argc, char **argv); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif /* __cplusplus */ -#endif /* GRPC_TEST_CORE_UTIL_TEST_CONFIG_H */ +#endif /* GRPC_TEST_CORE_UTIL_TEST_CONFIG_H */ From 1be70ccdb84ec41975cc018f6b2a2a89cf5072ee Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 10:45:28 -0700 Subject: [PATCH 27/56] Move arguments to the start of lists --- src/core/census/grpc_filter.c | 18 ++--- src/core/channel/channel_stack.c | 16 ++-- src/core/channel/channel_stack.h | 30 +++---- src/core/channel/client_channel.c | 42 +++++----- src/core/channel/client_channel.h | 10 +-- src/core/channel/compress_filter.c | 10 +-- src/core/channel/connected_channel.c | 14 ++-- src/core/channel/http_client_filter.c | 12 +-- src/core/channel/http_server_filter.c | 12 +-- src/core/channel/noop_filter.c | 10 +-- src/core/client_config/client_config.c | 2 +- src/core/client_config/client_config.h | 2 +- src/core/client_config/connector.c | 6 +- src/core/client_config/connector.h | 12 +-- .../client_config/lb_policies/pick_first.c | 22 +++--- .../client_config/lb_policies/round_robin.c | 20 ++--- src/core/client_config/lb_policy.c | 14 ++-- src/core/client_config/lb_policy.h | 28 +++---- src/core/client_config/resolver.c | 8 +- src/core/client_config/resolver.h | 16 ++-- .../client_config/resolvers/dns_resolver.c | 22 +++--- .../resolvers/sockaddr_resolver.c | 20 ++--- src/core/client_config/subchannel.c | 44 +++++------ src/core/client_config/subchannel.h | 14 ++-- src/core/client_config/subchannel_factory.c | 4 +- src/core/client_config/subchannel_factory.h | 8 +- .../merge_channel_args.c | 4 +- src/core/httpcli/httpcli.c | 32 ++++---- src/core/httpcli/httpcli.h | 12 +-- src/core/httpcli/httpcli_security_connector.c | 8 +- src/core/iomgr/alarm.c | 12 +-- src/core/iomgr/alarm.h | 4 +- src/core/iomgr/alarm_internal.h | 2 +- src/core/iomgr/closure.h | 2 +- src/core/iomgr/endpoint.c | 12 +-- src/core/iomgr/endpoint.h | 24 +++--- src/core/iomgr/fd_posix.c | 20 ++--- src/core/iomgr/fd_posix.h | 14 ++-- src/core/iomgr/pollset.h | 4 +- .../iomgr/pollset_multipoller_with_epoll.c | 12 +-- .../pollset_multipoller_with_poll_posix.c | 8 +- src/core/iomgr/pollset_posix.c | 18 ++--- src/core/iomgr/pollset_posix.h | 14 ++-- src/core/iomgr/pollset_set.h | 4 +- src/core/iomgr/pollset_set_posix.c | 8 +- src/core/iomgr/pollset_set_posix.h | 4 +- src/core/iomgr/resolve_address.h | 2 +- src/core/iomgr/tcp_client.h | 2 +- src/core/iomgr/tcp_client_posix.c | 6 +- src/core/iomgr/tcp_posix.c | 20 ++--- src/core/iomgr/tcp_server.h | 6 +- src/core/iomgr/tcp_server_posix.c | 12 +-- src/core/iomgr/udp_server.c | 12 +-- src/core/iomgr/udp_server.h | 4 +- src/core/iomgr/workqueue.h | 6 +- src/core/iomgr/workqueue_posix.c | 12 +-- src/core/security/client_auth_filter.c | 18 ++--- src/core/security/credentials.c | 24 +++--- src/core/security/credentials.h | 8 +- .../security/google_default_credentials.c | 4 +- src/core/security/handshake.c | 18 ++--- src/core/security/handshake.h | 2 +- src/core/security/jwt_verifier.c | 8 +- src/core/security/jwt_verifier.h | 2 +- src/core/security/secure_endpoint.c | 20 ++--- src/core/security/security_connector.c | 16 ++-- src/core/security/security_connector.h | 12 +-- src/core/security/server_auth_filter.c | 12 +-- src/core/security/server_secure_chttp2.c | 12 +-- src/core/surface/call.c | 48 ++++++------ src/core/surface/call.h | 10 +-- src/core/surface/channel.c | 8 +- src/core/surface/channel.h | 6 +- src/core/surface/channel_connectivity.c | 10 +-- src/core/surface/channel_create.c | 12 +-- src/core/surface/completion_queue.c | 6 +- src/core/surface/completion_queue.h | 4 +- src/core/surface/lame_client.c | 14 ++-- src/core/surface/secure_channel_create.c | 14 ++-- src/core/surface/server.c | 76 +++++++++--------- src/core/surface/server.h | 4 +- src/core/surface/server_chttp2.c | 8 +- src/core/transport/chttp2/frame_data.c | 2 +- src/core/transport/chttp2/frame_data.h | 2 +- src/core/transport/chttp2/frame_goaway.c | 2 +- src/core/transport/chttp2/frame_goaway.h | 2 +- src/core/transport/chttp2/frame_ping.c | 2 +- src/core/transport/chttp2/frame_ping.h | 2 +- src/core/transport/chttp2/frame_rst_stream.c | 2 +- src/core/transport/chttp2/frame_rst_stream.h | 2 +- src/core/transport/chttp2/frame_settings.c | 2 +- src/core/transport/chttp2/frame_settings.h | 2 +- .../transport/chttp2/frame_window_update.c | 2 +- .../transport/chttp2/frame_window_update.h | 2 +- src/core/transport/chttp2/hpack_parser.c | 2 +- src/core/transport/chttp2/hpack_parser.h | 2 +- src/core/transport/chttp2/internal.h | 14 ++-- src/core/transport/chttp2/parsing.c | 10 +-- src/core/transport/chttp2/writing.c | 4 +- src/core/transport/chttp2_transport.c | 78 +++++++++---------- src/core/transport/chttp2_transport.h | 4 +- src/core/transport/connectivity_state.c | 6 +- src/core/transport/connectivity_state.h | 6 +- src/core/transport/transport.c | 16 ++-- src/core/transport/transport.h | 14 ++-- src/core/transport/transport_impl.h | 12 +-- test/core/bad_client/bad_client.c | 2 +- test/core/channel/channel_stack_test.c | 14 ++-- .../core/end2end/fixtures/h2_sockpair+trace.c | 2 +- test/core/end2end/fixtures/h2_sockpair.c | 2 +- .../core/end2end/fixtures/h2_sockpair_1byte.c | 2 +- test/core/httpcli/httpcli_test.c | 4 +- test/core/iomgr/alarm_list_test.c | 2 +- test/core/iomgr/endpoint_pair_test.c | 2 +- test/core/iomgr/endpoint_tests.c | 4 +- test/core/iomgr/fd_posix_test.c | 8 +- test/core/iomgr/resolve_address_test.c | 4 +- test/core/iomgr/tcp_client_posix_test.c | 6 +- test/core/iomgr/tcp_posix_test.c | 4 +- test/core/iomgr/tcp_server_posix_test.c | 4 +- test/core/iomgr/udp_server_test.c | 2 +- test/core/iomgr/workqueue_test.c | 4 +- test/core/security/credentials_test.c | 32 ++++---- test/core/security/jwt_verifier_test.c | 14 ++-- test/core/security/oauth2_utils.c | 4 +- .../print_google_default_creds_token.c | 2 +- test/core/security/secure_endpoint_test.c | 4 +- test/core/surface/completion_queue_test.c | 4 +- test/core/util/port_posix.c | 6 +- test/core/util/reconnect_server.c | 4 +- 130 files changed, 710 insertions(+), 710 deletions(-) diff --git a/src/core/census/grpc_filter.c b/src/core/census/grpc_filter.c index 5e9822dd73c..eed9523d726 100644 --- a/src/core/census/grpc_filter.c +++ b/src/core/census/grpc_filter.c @@ -96,14 +96,14 @@ client_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) } static void -client_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +client_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { client_mutate_op (elem, op); grpc_call_next_op (elem, op, closure_list); } static void -server_on_done_recv (void *ptr, int success, grpc_closure_list * closure_list) +server_on_done_recv (grpc_exec_ctx * exec_ctx, void *ptr, int success) { grpc_call_element *elem = ptr; call_data *calld = elem->call_data; @@ -129,7 +129,7 @@ server_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) } static void -server_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +server_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { call_data *calld = elem->call_data; GPR_ASSERT ((calld->op_id.upper != 0) || (calld->op_id.lower != 0)); @@ -138,7 +138,7 @@ server_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * } static void -client_init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +client_init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) { call_data *d = elem->call_data; GPR_ASSERT (d != NULL); @@ -148,7 +148,7 @@ client_init_call_elem (grpc_call_element * elem, const void *server_transport_da } static void -client_destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +client_destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { call_data *d = elem->call_data; GPR_ASSERT (d != NULL); @@ -156,7 +156,7 @@ client_destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_ } static void -server_init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +server_init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) { call_data *d = elem->call_data; GPR_ASSERT (d != NULL); @@ -168,7 +168,7 @@ server_init_call_elem (grpc_call_element * elem, const void *server_transport_da } static void -server_destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +server_destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { call_data *d = elem->call_data; GPR_ASSERT (d != NULL); @@ -176,7 +176,7 @@ server_destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_ } static void -init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last) { channel_data *chand = elem->channel_data; GPR_ASSERT (chand != NULL); @@ -184,7 +184,7 @@ init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grp } static void -destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) { channel_data *chand = elem->channel_data; GPR_ASSERT (chand != NULL); diff --git a/src/core/channel/channel_stack.c b/src/core/channel/channel_stack.c index aafc0ede9c8..07b118f74a5 100644 --- a/src/core/channel/channel_stack.c +++ b/src/core/channel/channel_stack.c @@ -104,7 +104,7 @@ grpc_call_stack_element (grpc_call_stack * call_stack, size_t index) } void -grpc_channel_stack_init (const grpc_channel_filter ** filters, size_t filter_count, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, grpc_channel_stack * stack, grpc_closure_list * closure_list) +grpc_channel_stack_init (grpc_exec_ctx * exec_ctx, const grpc_channel_filter ** filters, size_t filter_count, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, grpc_channel_stack * stack) { size_t call_size = ROUND_UP_TO_ALIGNMENT_SIZE (sizeof (grpc_call_stack)) + ROUND_UP_TO_ALIGNMENT_SIZE (filter_count * sizeof (grpc_call_element)); grpc_channel_element *elems; @@ -132,7 +132,7 @@ grpc_channel_stack_init (const grpc_channel_filter ** filters, size_t filter_cou } void -grpc_channel_stack_destroy (grpc_channel_stack * stack, grpc_closure_list * closure_list) +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; @@ -146,7 +146,7 @@ grpc_channel_stack_destroy (grpc_channel_stack * stack, grpc_closure_list * clos } void -grpc_call_stack_init (grpc_channel_stack * channel_stack, const void *transport_server_data, grpc_transport_stream_op * initial_op, grpc_call_stack * call_stack, grpc_closure_list * closure_list) +grpc_call_stack_init (grpc_exec_ctx * exec_ctx, grpc_channel_stack * channel_stack, const void *transport_server_data, grpc_transport_stream_op * initial_op, grpc_call_stack * call_stack) { grpc_channel_element *channel_elems = CHANNEL_ELEMS_FROM_STACK (channel_stack); size_t count = channel_stack->count; @@ -170,7 +170,7 @@ grpc_call_stack_init (grpc_channel_stack * channel_stack, const void *transport_ } void -grpc_call_stack_destroy (grpc_call_stack * stack, grpc_closure_list * closure_list) +grpc_call_stack_destroy (grpc_exec_ctx * exec_ctx, grpc_call_stack * stack) { grpc_call_element *elems = CALL_ELEMS_FROM_STACK (stack); size_t count = stack->count; @@ -184,21 +184,21 @@ grpc_call_stack_destroy (grpc_call_stack * stack, grpc_closure_list * closure_li } void -grpc_call_next_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +grpc_call_next_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { grpc_call_element *next_elem = elem + 1; next_elem->filter->start_transport_stream_op (next_elem, op, closure_list); } char * -grpc_call_next_get_peer (grpc_call_element * elem, grpc_closure_list * closure_list) +grpc_call_next_get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { grpc_call_element *next_elem = elem + 1; return next_elem->filter->get_peer (next_elem, closure_list); } void -grpc_channel_next_op (grpc_channel_element * elem, grpc_transport_op * op, grpc_closure_list * closure_list) +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, closure_list); @@ -217,7 +217,7 @@ grpc_call_stack_from_top_element (grpc_call_element * elem) } void -grpc_call_element_send_cancel (grpc_call_element * cur_elem, grpc_closure_list * closure_list) +grpc_call_element_send_cancel (grpc_exec_ctx * exec_ctx, grpc_call_element * cur_elem) { grpc_transport_stream_op op; memset (&op, 0, sizeof (op)); diff --git a/src/core/channel/channel_stack.h b/src/core/channel/channel_stack.h index 937bb04edaf..0bfe3269760 100644 --- a/src/core/channel/channel_stack.h +++ b/src/core/channel/channel_stack.h @@ -65,11 +65,11 @@ 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) (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list); + void (*start_transport_stream_op) (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * 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, grpc_closure_list * closure_list); + 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; @@ -81,10 +81,10 @@ typedef struct on a client; if it is non-NULL, then it points to memory owned by the transport and is on the server. Most filters want to ignore this argument. */ - void (*init_call_elem) (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list); + void (*init_call_elem) (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op); /* Destroy per call data. The filter does not need to do any chaining */ - void (*destroy_call_elem) (grpc_call_element * elem, grpc_closure_list * closure_list); + void (*destroy_call_elem) (grpc_exec_ctx * exec_ctx, grpc_call_element * elem); /* sizeof(per channel data) */ size_t sizeof_channel_data; @@ -94,13 +94,13 @@ typedef struct is_first, is_last designate this elements position in the stack, and are useful for asserting correct configuration by upper layer code. The filter does not need to do any chaining */ - void (*init_channel_elem) (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last, grpc_closure_list * closure_list); + void (*init_channel_elem) (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last); /* Destroy per channel data. The filter does not need to do any chaining */ - void (*destroy_channel_elem) (grpc_channel_element * elem, grpc_closure_list * closure_list); + void (*destroy_channel_elem) (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem); /* Implement grpc_call_get_peer() */ - char *(*get_peer) (grpc_call_element * elem, grpc_closure_list * closure_list); + char *(*get_peer) (grpc_exec_ctx * exec_ctx, grpc_call_element * elem); /* The name of this filter */ const char *name; @@ -151,24 +151,24 @@ grpc_call_element *grpc_call_stack_element (grpc_call_stack * stack, size_t i); /* Determine memory required for a channel stack containing a set of filters */ size_t grpc_channel_stack_size (const grpc_channel_filter ** filters, size_t filter_count); /* Initialize a channel stack given some filters */ -void grpc_channel_stack_init (const grpc_channel_filter ** filters, size_t filter_count, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, grpc_channel_stack * stack, grpc_closure_list * closure_list); +void grpc_channel_stack_init (grpc_exec_ctx * exec_ctx, const grpc_channel_filter ** filters, size_t filter_count, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, grpc_channel_stack * stack); /* Destroy a channel stack */ -void grpc_channel_stack_destroy (grpc_channel_stack * stack, grpc_closure_list * closure_list); +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. */ -void grpc_call_stack_init (grpc_channel_stack * channel_stack, const void *transport_server_data, grpc_transport_stream_op * initial_op, grpc_call_stack * call_stack, grpc_closure_list * closure_list); +void grpc_call_stack_init (grpc_exec_ctx * exec_ctx, grpc_channel_stack * channel_stack, const void *transport_server_data, grpc_transport_stream_op * initial_op, grpc_call_stack * call_stack); /* Destroy a call stack */ -void grpc_call_stack_destroy (grpc_call_stack * stack, grpc_closure_list * closure_list); +void grpc_call_stack_destroy (grpc_exec_ctx * exec_ctx, grpc_call_stack * stack); /* Call the next operation in a call stack */ -void grpc_call_next_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list); +void grpc_call_next_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * 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, grpc_closure_list * closure_list); +void grpc_channel_next_op (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_transport_op * op); /* Pass through a request to get_peer to the next child element */ -char *grpc_call_next_get_peer (grpc_call_element * elem, grpc_closure_list * closure_list); +char *grpc_call_next_get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem); /* Given the top element of a channel stack, get the channel stack itself */ grpc_channel_stack *grpc_channel_stack_from_top_element (grpc_channel_element * elem); @@ -177,7 +177,7 @@ grpc_call_stack *grpc_call_stack_from_top_element (grpc_call_element * elem); void grpc_call_log_op (char *file, int line, gpr_log_severity severity, grpc_call_element * elem, grpc_transport_stream_op * op); -void grpc_call_element_send_cancel (grpc_call_element * cur_elem, grpc_closure_list * closure_list); +void grpc_call_element_send_cancel (grpc_exec_ctx * exec_ctx, grpc_call_element * cur_elem); extern int grpc_trace_channel; diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 40b428cf3e3..d0be3ca7b64 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -131,7 +131,7 @@ static grpc_closure * merge_into_waiting_op (grpc_call_element * elem, grpc_transport_stream_op * new_op) GRPC_MUST_USE_RESULT; - static void handle_op_after_cancellation (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) + static void handle_op_after_cancellation (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -170,10 +170,10 @@ typedef struct grpc_call_element *elem; } waiting_call; -static void perform_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, int continuation, grpc_closure_list * closure_list); +static void perform_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op, int continuation); static void -continue_with_pick (void *arg, int iomgr_success, grpc_closure_list * closure_list) +continue_with_pick (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { waiting_call *wc = arg; call_data *calld = wc->elem->call_data; @@ -205,7 +205,7 @@ is_empty (void *p, int len) } static void -started_call (void *arg, int iomgr_success, grpc_closure_list * closure_list) +started_call (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { call_data *calld = arg; grpc_transport_stream_op op; @@ -249,7 +249,7 @@ started_call (void *arg, int iomgr_success, grpc_closure_list * closure_list) } static void -picked_target (void *arg, int iomgr_success, grpc_closure_list * closure_list) +picked_target (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { call_data *calld = arg; grpc_pollset *pollset; @@ -316,7 +316,7 @@ merge_into_waiting_op (grpc_call_element * elem, grpc_transport_stream_op * new_ } static char * -cc_get_peer (grpc_call_element * elem, grpc_closure_list * closure_list) +cc_get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -341,7 +341,7 @@ cc_get_peer (grpc_call_element * elem, grpc_closure_list * closure_list) } static void -perform_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, int continuation, grpc_closure_list * closure_list) +perform_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op, int continuation) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -477,7 +477,7 @@ perform_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op } static void -cc_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +cc_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { perform_transport_stream_op (elem, op, 0, closure_list); } @@ -499,7 +499,7 @@ on_lb_policy_state_changed_locked (lb_policy_connectivity_watcher * w, grpc_clos } static void -on_lb_policy_state_changed (void *arg, int iomgr_success, grpc_closure_list * closure_list) +on_lb_policy_state_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { lb_policy_connectivity_watcher *w = arg; @@ -512,7 +512,7 @@ on_lb_policy_state_changed (void *arg, int iomgr_success, grpc_closure_list * cl } static void -watch_lb_policy (channel_data * chand, grpc_lb_policy * lb_policy, grpc_connectivity_state current_state, grpc_closure_list * closure_list) +watch_lb_policy (grpc_exec_ctx * exec_ctx, channel_data * chand, grpc_lb_policy * lb_policy, grpc_connectivity_state current_state) { lb_policy_connectivity_watcher *w = gpr_malloc (sizeof (*w)); GRPC_CHANNEL_INTERNAL_REF (chand->master, "watch_lb_policy"); @@ -525,7 +525,7 @@ watch_lb_policy (channel_data * chand, grpc_lb_policy * lb_policy, grpc_connecti } static void -cc_on_config_changed (void *arg, int iomgr_success, grpc_closure_list * closure_list) +cc_on_config_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { channel_data *chand = arg; grpc_lb_policy *lb_policy = NULL; @@ -611,7 +611,7 @@ cc_on_config_changed (void *arg, int iomgr_success, grpc_closure_list * closure_ } static void -cc_start_transport_op (grpc_channel_element * elem, grpc_transport_op * op, grpc_closure_list * closure_list) +cc_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_transport_op * op) { grpc_lb_policy *lb_policy = NULL; channel_data *chand = elem->channel_data; @@ -668,7 +668,7 @@ cc_start_transport_op (grpc_channel_element * elem, grpc_transport_op * op, grpc /* Constructor for call_data */ static void -init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) { call_data *calld = elem->call_data; @@ -685,7 +685,7 @@ init_call_elem (grpc_call_element * elem, const void *server_transport_data, grp /* Destructor for call_data */ static void -destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { call_data *calld = elem->call_data; grpc_subchannel_call *subchannel_call; @@ -717,7 +717,7 @@ destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) /* Constructor for channel_data */ static void -init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last, grpc_closure_list * closure_list) +init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last) { channel_data *chand = elem->channel_data; @@ -737,7 +737,7 @@ init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grp /* Destructor for channel_data */ static void -destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) { channel_data *chand = elem->channel_data; @@ -769,7 +769,7 @@ const grpc_channel_filter grpc_client_channel_filter = { }; void -grpc_client_channel_set_resolver (grpc_channel_stack * channel_stack, grpc_resolver * resolver, grpc_closure_list * closure_list) +grpc_client_channel_set_resolver (grpc_exec_ctx * exec_ctx, grpc_channel_stack * channel_stack, grpc_resolver * resolver) { /* post construction initialization: set the transport setup pointer */ grpc_channel_element *elem = grpc_channel_stack_last_element (channel_stack); @@ -788,7 +788,7 @@ grpc_client_channel_set_resolver (grpc_channel_stack * channel_stack, grpc_resol } grpc_connectivity_state -grpc_client_channel_check_connectivity_state (grpc_channel_element * elem, int try_to_connect, grpc_closure_list * closure_list) +grpc_client_channel_check_connectivity_state (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, int try_to_connect) { channel_data *chand = elem->channel_data; grpc_connectivity_state out; @@ -816,7 +816,7 @@ grpc_client_channel_check_connectivity_state (grpc_channel_element * elem, int t } void -grpc_client_channel_watch_connectivity_state (grpc_channel_element * elem, grpc_connectivity_state * state, grpc_closure * on_complete, grpc_closure_list * closure_list) +grpc_client_channel_watch_connectivity_state (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_connectivity_state * state, grpc_closure * on_complete) { channel_data *chand = elem->channel_data; gpr_mu_lock (&chand->mu_config); @@ -832,14 +832,14 @@ grpc_client_channel_get_connecting_pollset_set (grpc_channel_element * elem) } void -grpc_client_channel_add_interested_party (grpc_channel_element * elem, grpc_pollset * pollset, grpc_closure_list * closure_list) +grpc_client_channel_add_interested_party (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_pollset * pollset) { channel_data *chand = elem->channel_data; grpc_pollset_set_add_pollset (&chand->pollset_set, pollset, closure_list); } void -grpc_client_channel_del_interested_party (grpc_channel_element * elem, grpc_pollset * pollset, grpc_closure_list * closure_list) +grpc_client_channel_del_interested_party (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_pollset * pollset) { channel_data *chand = elem->channel_data; grpc_pollset_set_del_pollset (&chand->pollset_set, pollset, closure_list); diff --git a/src/core/channel/client_channel.h b/src/core/channel/client_channel.h index 468cf5ef3ea..5af97947270 100644 --- a/src/core/channel/client_channel.h +++ b/src/core/channel/client_channel.h @@ -49,15 +49,15 @@ extern const grpc_channel_filter grpc_client_channel_filter; /* post-construction initializer to let the client channel know which transport setup it should cancel upon destruction, or initiate when it needs a connection */ -void grpc_client_channel_set_resolver (grpc_channel_stack * channel_stack, grpc_resolver * resolver, grpc_closure_list * closure_list); +void grpc_client_channel_set_resolver (grpc_exec_ctx * exec_ctx, grpc_channel_stack * channel_stack, grpc_resolver * resolver); -grpc_connectivity_state grpc_client_channel_check_connectivity_state (grpc_channel_element * elem, int try_to_connect, grpc_closure_list * closure_list); +grpc_connectivity_state grpc_client_channel_check_connectivity_state (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, int try_to_connect); -void grpc_client_channel_watch_connectivity_state (grpc_channel_element * elem, grpc_connectivity_state * state, grpc_closure * on_complete, grpc_closure_list * closure_list); +void grpc_client_channel_watch_connectivity_state (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_connectivity_state * state, grpc_closure * on_complete); grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set (grpc_channel_element * elem); -void grpc_client_channel_add_interested_party (grpc_channel_element * channel, grpc_pollset * pollset, grpc_closure_list * closure_list); -void grpc_client_channel_del_interested_party (grpc_channel_element * channel, grpc_pollset * pollset, grpc_closure_list * closure_list); +void grpc_client_channel_add_interested_party (grpc_exec_ctx * exec_ctx, grpc_channel_element * channel, grpc_pollset * pollset); +void grpc_client_channel_del_interested_party (grpc_exec_ctx * exec_ctx, grpc_channel_element * channel, grpc_pollset * pollset); #endif /* GRPC_INTERNAL_CORE_CHANNEL_CLIENT_CHANNEL_H */ diff --git a/src/core/channel/compress_filter.c b/src/core/channel/compress_filter.c index a1c03dc9d91..bf3c5a94571 100644 --- a/src/core/channel/compress_filter.c +++ b/src/core/channel/compress_filter.c @@ -275,7 +275,7 @@ process_send_ops (grpc_call_element * elem, grpc_stream_op_buffer * send_ops) op contains type and call direction information, in addition to the data that is being sent or received. */ static void -compress_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +compress_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { if (op->send_ops && op->send_ops->nops > 0) { @@ -288,7 +288,7 @@ compress_start_transport_stream_op (grpc_call_element * elem, grpc_transport_str /* Constructor for call_data */ static void -init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; @@ -309,7 +309,7 @@ init_call_elem (grpc_call_element * elem, const void *server_transport_data, grp /* Destructor for call_data */ static void -destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; @@ -318,7 +318,7 @@ destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) /* Constructor for channel_data */ static void -init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last) { channel_data *channeld = elem->channel_data; grpc_compression_algorithm algo_idx; @@ -369,7 +369,7 @@ init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grp /* Destructor for channel data */ static void -destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) { channel_data *channeld = elem->channel_data; grpc_compression_algorithm algo_idx; diff --git a/src/core/channel/connected_channel.c b/src/core/channel/connected_channel.c index 7ba412fe5cf..2fd80d2207d 100644 --- a/src/core/channel/connected_channel.c +++ b/src/core/channel/connected_channel.c @@ -66,7 +66,7 @@ typedef struct connected_channel_call_data /* Intercept a call operation and either push it directly up or translate it into transport stream operations */ static void -con_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +con_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -77,7 +77,7 @@ con_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_o } static void -con_start_transport_op (grpc_channel_element * elem, grpc_transport_op * op, grpc_closure_list * closure_list) +con_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_transport_op * op) { channel_data *chand = elem->channel_data; grpc_transport_perform_op (chand->transport, op, closure_list); @@ -85,7 +85,7 @@ con_start_transport_op (grpc_channel_element * elem, grpc_transport_op * op, grp /* Constructor for call_data */ static void -init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -98,7 +98,7 @@ init_call_elem (grpc_call_element * elem, const void *server_transport_data, grp /* Destructor for call_data */ static void -destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -108,7 +108,7 @@ destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) /* Constructor for channel_data */ static void -init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last) { channel_data *cd = (channel_data *) elem->channel_data; GPR_ASSERT (is_last); @@ -118,7 +118,7 @@ init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grp /* Destructor for channel_data */ static void -destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) { channel_data *cd = (channel_data *) elem->channel_data; GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); @@ -126,7 +126,7 @@ destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_l } static char * -con_get_peer (grpc_call_element * elem, grpc_closure_list * closure_list) +con_get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { channel_data *chand = elem->channel_data; return grpc_transport_get_peer (chand->transport, closure_list); diff --git a/src/core/channel/http_client_filter.c b/src/core/channel/http_client_filter.c index 1a166833e77..b2cc69bb4a3 100644 --- a/src/core/channel/http_client_filter.c +++ b/src/core/channel/http_client_filter.c @@ -98,7 +98,7 @@ client_recv_filter (void *user_data, grpc_mdelem * md) } static void -hc_on_recv (void *user_data, int success, grpc_closure_list * closure_list) +hc_on_recv (grpc_exec_ctx * exec_ctx, void *user_data, int success) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; @@ -177,7 +177,7 @@ hc_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) } static void -hc_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +hc_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { GRPC_CALL_LOG_OP (GPR_INFO, elem, op); hc_mutate_op (elem, op); @@ -186,7 +186,7 @@ hc_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op, /* Constructor for call_data */ static void -init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) { call_data *calld = elem->call_data; calld->sent_initial_metadata = 0; @@ -199,7 +199,7 @@ init_call_elem (grpc_call_element * elem, const void *server_transport_data, grp /* Destructor for call_data */ static void -destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { } @@ -281,7 +281,7 @@ user_agent_from_args (grpc_mdctx * mdctx, const grpc_channel_args * args) /* Constructor for channel_data */ static void -init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * channel_args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * channel_args, grpc_mdctx * mdctx, int is_first, int is_last) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; @@ -302,7 +302,7 @@ init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grp /* Destructor for channel data */ static void -destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; diff --git a/src/core/channel/http_server_filter.c b/src/core/channel/http_server_filter.c index 949868b4036..62be4167f72 100644 --- a/src/core/channel/http_server_filter.c +++ b/src/core/channel/http_server_filter.c @@ -169,7 +169,7 @@ server_filter (void *user_data, grpc_mdelem * md) } static void -hs_on_recv (void *user_data, int success, grpc_closure_list * closure_list) +hs_on_recv (grpc_exec_ctx * exec_ctx, void *user_data, int success) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; @@ -260,7 +260,7 @@ hs_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) } static void -hs_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +hs_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { GRPC_CALL_LOG_OP (GPR_INFO, elem, op); hs_mutate_op (elem, op); @@ -269,7 +269,7 @@ hs_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op, /* Constructor for call_data */ static void -init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; @@ -282,13 +282,13 @@ init_call_elem (grpc_call_element * elem, const void *server_transport_data, grp /* Destructor for call_data */ static void -destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { } /* Constructor for channel_data */ static void -init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; @@ -317,7 +317,7 @@ init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grp /* Destructor for channel data */ static void -destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; diff --git a/src/core/channel/noop_filter.c b/src/core/channel/noop_filter.c index a93497c5092..3a3f1254bd5 100644 --- a/src/core/channel/noop_filter.c +++ b/src/core/channel/noop_filter.c @@ -69,7 +69,7 @@ noop_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) op contains type and call direction information, in addition to the data that is being sent or received. */ static void -noop_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +noop_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { noop_mutate_op (elem, op); @@ -79,7 +79,7 @@ noop_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_ /* Constructor for call_data */ static void -init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; @@ -94,13 +94,13 @@ init_call_elem (grpc_call_element * elem, const void *server_transport_data, grp /* Destructor for call_data */ static void -destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { } /* Constructor for channel_data */ static void -init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; @@ -117,7 +117,7 @@ init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grp /* Destructor for channel data */ static void -destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; diff --git a/src/core/client_config/client_config.c b/src/core/client_config/client_config.c index 69d52be70ba..ceb52e93e5d 100644 --- a/src/core/client_config/client_config.c +++ b/src/core/client_config/client_config.c @@ -59,7 +59,7 @@ grpc_client_config_ref (grpc_client_config * c) } void -grpc_client_config_unref (grpc_client_config * c, grpc_closure_list * closure_list) +grpc_client_config_unref (grpc_exec_ctx * exec_ctx, grpc_client_config * c) { if (gpr_unref (&c->refs)) { diff --git a/src/core/client_config/client_config.h b/src/core/client_config/client_config.h index 49585a1c62b..c6afafe023d 100644 --- a/src/core/client_config/client_config.h +++ b/src/core/client_config/client_config.h @@ -42,7 +42,7 @@ typedef struct grpc_client_config grpc_client_config; grpc_client_config *grpc_client_config_create (); void grpc_client_config_ref (grpc_client_config * client_config); -void grpc_client_config_unref (grpc_client_config * client_config, grpc_closure_list * closure_list); +void grpc_client_config_unref (grpc_exec_ctx * exec_ctx, grpc_client_config * client_config); void grpc_client_config_set_lb_policy (grpc_client_config * client_config, grpc_lb_policy * lb_policy); grpc_lb_policy *grpc_client_config_get_lb_policy (grpc_client_config * client_config); diff --git a/src/core/client_config/connector.c b/src/core/client_config/connector.c index 2f50ce36fef..823b82af5c7 100644 --- a/src/core/client_config/connector.c +++ b/src/core/client_config/connector.c @@ -40,19 +40,19 @@ grpc_connector_ref (grpc_connector * connector) } void -grpc_connector_unref (grpc_connector * connector, grpc_closure_list * closure_list) +grpc_connector_unref (grpc_exec_ctx * exec_ctx, grpc_connector * connector) { connector->vtable->unref (connector, closure_list); } void -grpc_connector_connect (grpc_connector * connector, const grpc_connect_in_args * in_args, grpc_connect_out_args * out_args, grpc_closure * notify, grpc_closure_list * closure_list) +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, closure_list); } void -grpc_connector_shutdown (grpc_connector * connector, grpc_closure_list * closure_list) +grpc_connector_shutdown (grpc_exec_ctx * exec_ctx, grpc_connector * connector) { connector->vtable->shutdown (connector, closure_list); } diff --git a/src/core/client_config/connector.h b/src/core/client_config/connector.h index 12df36c08ea..3abee64008a 100644 --- a/src/core/client_config/connector.h +++ b/src/core/client_config/connector.h @@ -71,18 +71,18 @@ typedef struct struct grpc_connector_vtable { void (*ref) (grpc_connector * connector); - void (*unref) (grpc_connector * connector, grpc_closure_list * closure_list); + void (*unref) (grpc_exec_ctx * exec_ctx, grpc_connector * connector); /** Implementation of grpc_connector_shutdown */ - void (*shutdown) (grpc_connector * connector, grpc_closure_list * closure_list); + void (*shutdown) (grpc_exec_ctx * exec_ctx, grpc_connector * connector); /** Implementation of grpc_connector_connect */ - void (*connect) (grpc_connector * connector, const grpc_connect_in_args * in_args, grpc_connect_out_args * out_args, grpc_closure * notify, grpc_closure_list * closure_list); + 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); }; void grpc_connector_ref (grpc_connector * connector); -void grpc_connector_unref (grpc_connector * connector, grpc_closure_list * closure_list); +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, const grpc_connect_in_args * in_args, grpc_connect_out_args * out_args, grpc_closure * notify, grpc_closure_list * closure_list); +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_closure_list * closure_list); +void grpc_connector_shutdown (grpc_exec_ctx * exec_ctx, grpc_connector * connector); #endif diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index b8991dfaa7f..02aaac1dc3b 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -79,7 +79,7 @@ typedef struct } pick_first_lb_policy; static void -del_interested_parties_locked (pick_first_lb_policy * p, grpc_closure_list * closure_list) +del_interested_parties_locked (grpc_exec_ctx * exec_ctx, pick_first_lb_policy * p) { pending_pick *pp; for (pp = p->pending_picks; pp; pp = pp->next) @@ -89,7 +89,7 @@ del_interested_parties_locked (pick_first_lb_policy * p, grpc_closure_list * clo } static void -add_interested_parties_locked (pick_first_lb_policy * p, grpc_closure_list * closure_list) +add_interested_parties_locked (grpc_exec_ctx * exec_ctx, pick_first_lb_policy * p) { pending_pick *pp; for (pp = p->pending_picks; pp; pp = pp->next) @@ -99,7 +99,7 @@ add_interested_parties_locked (pick_first_lb_policy * p, grpc_closure_list * clo } void -pf_destroy (grpc_lb_policy * pol, grpc_closure_list * closure_list) +pf_destroy (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) { pick_first_lb_policy *p = (pick_first_lb_policy *) pol; size_t i; @@ -115,7 +115,7 @@ pf_destroy (grpc_lb_policy * pol, grpc_closure_list * closure_list) } void -pf_shutdown (grpc_lb_policy * pol, grpc_closure_list * closure_list) +pf_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) { pick_first_lb_policy *p = (pick_first_lb_policy *) pol; pending_pick *pp; @@ -137,7 +137,7 @@ pf_shutdown (grpc_lb_policy * pol, grpc_closure_list * closure_list) } static void -start_picking (pick_first_lb_policy * p, grpc_closure_list * closure_list) +start_picking (grpc_exec_ctx * exec_ctx, pick_first_lb_policy * p) { p->started_picking = 1; p->checking_subchannel = 0; @@ -147,7 +147,7 @@ start_picking (pick_first_lb_policy * p, grpc_closure_list * closure_list) } void -pf_exit_idle (grpc_lb_policy * pol, grpc_closure_list * closure_list) +pf_exit_idle (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) { pick_first_lb_policy *p = (pick_first_lb_policy *) pol; gpr_mu_lock (&p->mu); @@ -159,7 +159,7 @@ pf_exit_idle (grpc_lb_policy * pol, grpc_closure_list * closure_list) } void -pf_pick (grpc_lb_policy * pol, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete, grpc_closure_list * closure_list) +pf_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete) { pick_first_lb_policy *p = (pick_first_lb_policy *) pol; pending_pick *pp; @@ -188,7 +188,7 @@ pf_pick (grpc_lb_policy * pol, grpc_pollset * pollset, grpc_metadata_batch * ini } static void -pf_connectivity_changed (void *arg, int iomgr_success, grpc_closure_list * closure_list) +pf_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { pick_first_lb_policy *p = arg; pending_pick *pp; @@ -283,7 +283,7 @@ pf_connectivity_changed (void *arg, int iomgr_success, grpc_closure_list * closu } static void -pf_broadcast (grpc_lb_policy * pol, grpc_transport_op * op, grpc_closure_list * closure_list) +pf_broadcast (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_transport_op * op) { pick_first_lb_policy *p = (pick_first_lb_policy *) pol; size_t i; @@ -309,7 +309,7 @@ pf_broadcast (grpc_lb_policy * pol, grpc_transport_op * op, grpc_closure_list * } static grpc_connectivity_state -pf_check_connectivity (grpc_lb_policy * pol, grpc_closure_list * closure_list) +pf_check_connectivity (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) { pick_first_lb_policy *p = (pick_first_lb_policy *) pol; grpc_connectivity_state st; @@ -320,7 +320,7 @@ pf_check_connectivity (grpc_lb_policy * pol, grpc_closure_list * closure_list) } void -pf_notify_on_state_change (grpc_lb_policy * pol, grpc_connectivity_state * current, grpc_closure * notify, grpc_closure_list * closure_list) +pf_notify_on_state_change (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; gpr_mu_lock (&p->mu); diff --git a/src/core/client_config/lb_policies/round_robin.c b/src/core/client_config/lb_policies/round_robin.c index 2e64da9e103..959d9e1c320 100644 --- a/src/core/client_config/lb_policies/round_robin.c +++ b/src/core/client_config/lb_policies/round_robin.c @@ -228,7 +228,7 @@ remove_disconnected_sc_locked (round_robin_lb_policy * p, ready_list * node) } static void -del_interested_parties_locked (round_robin_lb_policy * p, const size_t subchannel_idx, grpc_closure_list * closure_list) +del_interested_parties_locked (grpc_exec_ctx * exec_ctx, round_robin_lb_policy * p, const size_t subchannel_idx) { pending_pick *pp; for (pp = p->pending_picks; pp; pp = pp->next) @@ -238,7 +238,7 @@ del_interested_parties_locked (round_robin_lb_policy * p, const size_t subchanne } void -rr_destroy (grpc_lb_policy * pol, grpc_closure_list * closure_list) +rr_destroy (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) { round_robin_lb_policy *p = (round_robin_lb_policy *) pol; size_t i; @@ -275,7 +275,7 @@ rr_destroy (grpc_lb_policy * pol, grpc_closure_list * closure_list) } void -rr_shutdown (grpc_lb_policy * pol, grpc_closure_list * closure_list) +rr_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) { size_t i; round_robin_lb_policy *p = (round_robin_lb_policy *) pol; @@ -300,7 +300,7 @@ rr_shutdown (grpc_lb_policy * pol, grpc_closure_list * closure_list) } static void -start_picking (round_robin_lb_policy * p, grpc_closure_list * closure_list) +start_picking (grpc_exec_ctx * exec_ctx, round_robin_lb_policy * p) { size_t i; p->started_picking = 1; @@ -314,7 +314,7 @@ start_picking (round_robin_lb_policy * p, grpc_closure_list * closure_list) } void -rr_exit_idle (grpc_lb_policy * pol, grpc_closure_list * closure_list) +rr_exit_idle (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) { round_robin_lb_policy *p = (round_robin_lb_policy *) pol; gpr_mu_lock (&p->mu); @@ -326,7 +326,7 @@ rr_exit_idle (grpc_lb_policy * pol, grpc_closure_list * closure_list) } void -rr_pick (grpc_lb_policy * pol, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete, grpc_closure_list * closure_list) +rr_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete) { size_t i; round_robin_lb_policy *p = (round_robin_lb_policy *) pol; @@ -366,7 +366,7 @@ rr_pick (grpc_lb_policy * pol, grpc_pollset * pollset, grpc_metadata_batch * ini } static void -rr_connectivity_changed (void *arg, int iomgr_success, grpc_closure_list * closure_list) +rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { connectivity_changed_cb_arg *cb_arg = arg; round_robin_lb_policy *p = cb_arg->p; @@ -479,7 +479,7 @@ rr_connectivity_changed (void *arg, int iomgr_success, grpc_closure_list * closu } static void -rr_broadcast (grpc_lb_policy * pol, grpc_transport_op * op, grpc_closure_list * closure_list) +rr_broadcast (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_transport_op * op) { round_robin_lb_policy *p = (round_robin_lb_policy *) pol; size_t i; @@ -505,7 +505,7 @@ rr_broadcast (grpc_lb_policy * pol, grpc_transport_op * op, grpc_closure_list * } static grpc_connectivity_state -rr_check_connectivity (grpc_lb_policy * pol, grpc_closure_list * closure_list) +rr_check_connectivity (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) { round_robin_lb_policy *p = (round_robin_lb_policy *) pol; grpc_connectivity_state st; @@ -516,7 +516,7 @@ rr_check_connectivity (grpc_lb_policy * pol, grpc_closure_list * closure_list) } static void -rr_notify_on_state_change (grpc_lb_policy * pol, grpc_connectivity_state * current, grpc_closure * notify, grpc_closure_list * closure_list) +rr_notify_on_state_change (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; gpr_mu_lock (&p->mu); diff --git a/src/core/client_config/lb_policy.c b/src/core/client_config/lb_policy.c index 40d9079f342..06ac41ff568 100644 --- a/src/core/client_config/lb_policy.c +++ b/src/core/client_config/lb_policy.c @@ -60,7 +60,7 @@ grpc_lb_policy_unref (grpc_lb_policy * policy, grpc_closure_list * closure_list, gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "LB_POLICY:%p unref %d -> %d %s", policy, (int) policy->refs.count, (int) policy->refs.count - 1, reason); #else void -grpc_lb_policy_unref (grpc_lb_policy * policy, grpc_closure_list * closure_list) +grpc_lb_policy_unref (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) { #endif if (gpr_unref (&policy->refs)) @@ -70,37 +70,37 @@ grpc_lb_policy_unref (grpc_lb_policy * policy, grpc_closure_list * closure_list) } void -grpc_lb_policy_shutdown (grpc_lb_policy * policy, grpc_closure_list * closure_list) +grpc_lb_policy_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) { policy->vtable->shutdown (policy, closure_list); } void -grpc_lb_policy_pick (grpc_lb_policy * policy, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete, grpc_closure_list * closure_list) +grpc_lb_policy_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete) { policy->vtable->pick (policy, pollset, initial_metadata, target, on_complete, closure_list); } void -grpc_lb_policy_broadcast (grpc_lb_policy * policy, grpc_transport_op * op, grpc_closure_list * closure_list) +grpc_lb_policy_broadcast (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_transport_op * op) { policy->vtable->broadcast (policy, op, closure_list); } void -grpc_lb_policy_exit_idle (grpc_lb_policy * policy, grpc_closure_list * closure_list) +grpc_lb_policy_exit_idle (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) { policy->vtable->exit_idle (policy, closure_list); } void -grpc_lb_policy_notify_on_state_change (grpc_lb_policy * policy, grpc_connectivity_state * state, grpc_closure * closure, grpc_closure_list * closure_list) +grpc_lb_policy_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_connectivity_state * state, grpc_closure * closure) { policy->vtable->notify_on_state_change (policy, state, closure, closure_list); } grpc_connectivity_state -grpc_lb_policy_check_connectivity (grpc_lb_policy * policy, grpc_closure_list * closure_list) +grpc_lb_policy_check_connectivity (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) { return policy->vtable->check_connectivity (policy, closure_list); } diff --git a/src/core/client_config/lb_policy.h b/src/core/client_config/lb_policy.h index d530e5b7e1c..5e6b2a5a6e1 100644 --- a/src/core/client_config/lb_policy.h +++ b/src/core/client_config/lb_policy.h @@ -52,25 +52,25 @@ struct grpc_lb_policy struct grpc_lb_policy_vtable { - void (*destroy) (grpc_lb_policy * policy, grpc_closure_list * closure_list); + void (*destroy) (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); - void (*shutdown) (grpc_lb_policy * policy, grpc_closure_list * closure_list); + void (*shutdown) (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); /** implement grpc_lb_policy_pick */ - void (*pick) (grpc_lb_policy * policy, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete, grpc_closure_list * closure_list); + void (*pick) (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete); /** try to enter a READY connectivity state */ - void (*exit_idle) (grpc_lb_policy * policy, grpc_closure_list * closure_list); + void (*exit_idle) (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); /** broadcast a transport op to all subchannels */ - void (*broadcast) (grpc_lb_policy * policy, grpc_transport_op * op, grpc_closure_list * closure_list); + void (*broadcast) (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_transport_op * op); /** check the current connectivity of the lb_policy */ - grpc_connectivity_state (*check_connectivity) (grpc_lb_policy * policy, grpc_closure_list * closure_list); + grpc_connectivity_state (*check_connectivity) (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); /** call notify when the connectivity state of a channel changes from *state. Updates *state with the new state of the policy */ - void (*notify_on_state_change) (grpc_lb_policy * policy, grpc_connectivity_state * state, grpc_closure * closure, grpc_closure_list * closure_list); + void (*notify_on_state_change) (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_connectivity_state * state, grpc_closure * closure); }; #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG @@ -84,27 +84,27 @@ void grpc_lb_policy_unref (grpc_lb_policy * policy, grpc_closure_list * closure_ #define GRPC_LB_POLICY_REF(p, r) grpc_lb_policy_ref((p)) #define GRPC_LB_POLICY_UNREF(p, r, cl) grpc_lb_policy_unref((p), (cl)) void grpc_lb_policy_ref (grpc_lb_policy * policy); -void grpc_lb_policy_unref (grpc_lb_policy * policy, grpc_closure_list * closure_list); +void grpc_lb_policy_unref (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); #endif /** called by concrete implementations to initialize the base struct */ void grpc_lb_policy_init (grpc_lb_policy * policy, const grpc_lb_policy_vtable * vtable); /** Start shutting down (fail any pending picks) */ -void grpc_lb_policy_shutdown (grpc_lb_policy * policy, grpc_closure_list * closure_list); +void grpc_lb_policy_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); /** Given initial metadata in \a initial_metadata, find an appropriate target for this rpc, and 'return' it by calling \a on_complete after setting \a target. Picking can be asynchronous. Any IO should be done under \a pollset. */ -void grpc_lb_policy_pick (grpc_lb_policy * policy, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete, grpc_closure_list * closure_list); +void grpc_lb_policy_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete); -void grpc_lb_policy_broadcast (grpc_lb_policy * policy, grpc_transport_op * op, grpc_closure_list * closure_list); +void grpc_lb_policy_broadcast (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_transport_op * op); -void grpc_lb_policy_exit_idle (grpc_lb_policy * policy, grpc_closure_list * closure_list); +void grpc_lb_policy_exit_idle (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); -void grpc_lb_policy_notify_on_state_change (grpc_lb_policy * policy, grpc_connectivity_state * state, grpc_closure * closure, grpc_closure_list * closure_list); +void grpc_lb_policy_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_connectivity_state * state, grpc_closure * closure); -grpc_connectivity_state grpc_lb_policy_check_connectivity (grpc_lb_policy * policy, grpc_closure_list * closure_list); +grpc_connectivity_state grpc_lb_policy_check_connectivity (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); #endif /* GRPC_INTERNAL_CORE_CONFIG_LB_POLICY_H */ diff --git a/src/core/client_config/resolver.c b/src/core/client_config/resolver.c index 089ce6cd18c..cb5a6a53331 100644 --- a/src/core/client_config/resolver.c +++ b/src/core/client_config/resolver.c @@ -60,7 +60,7 @@ grpc_resolver_unref (grpc_resolver * resolver, grpc_closure_list * closure_list, gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "RESOLVER:%p unref %d -> %d %s", resolver, (int) resolver->refs.count, (int) resolver->refs.count - 1, reason); #else void -grpc_resolver_unref (grpc_resolver * resolver, grpc_closure_list * closure_list) +grpc_resolver_unref (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver) { #endif if (gpr_unref (&resolver->refs)) @@ -70,19 +70,19 @@ grpc_resolver_unref (grpc_resolver * resolver, grpc_closure_list * closure_list) } void -grpc_resolver_shutdown (grpc_resolver * resolver, grpc_closure_list * closure_list) +grpc_resolver_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver) { resolver->vtable->shutdown (resolver, closure_list); } void -grpc_resolver_channel_saw_error (grpc_resolver * resolver, struct sockaddr *failing_address, int failing_address_len, grpc_closure_list * closure_list) +grpc_resolver_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, struct sockaddr *failing_address, int failing_address_len) { resolver->vtable->channel_saw_error (resolver, failing_address, failing_address_len, closure_list); } void -grpc_resolver_next (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list) +grpc_resolver_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete) { resolver->vtable->next (resolver, target_config, on_complete, closure_list); } diff --git a/src/core/client_config/resolver.h b/src/core/client_config/resolver.h index b51ef89bd51..2497873c016 100644 --- a/src/core/client_config/resolver.h +++ b/src/core/client_config/resolver.h @@ -51,10 +51,10 @@ struct grpc_resolver struct grpc_resolver_vtable { - void (*destroy) (grpc_resolver * resolver, grpc_closure_list * closure_list); - void (*shutdown) (grpc_resolver * resolver, grpc_closure_list * closure_list); - void (*channel_saw_error) (grpc_resolver * resolver, struct sockaddr * failing_address, int failing_address_len, grpc_closure_list * closure_list); - void (*next) (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list); + void (*destroy) (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver); + void (*shutdown) (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver); + void (*channel_saw_error) (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, struct sockaddr * failing_address, int failing_address_len); + void (*next) (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete); }; #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG @@ -67,16 +67,16 @@ void grpc_resolver_unref (grpc_resolver * policy, grpc_closure_list * closure_li #define GRPC_RESOLVER_REF(p, r) grpc_resolver_ref((p)) #define GRPC_RESOLVER_UNREF(p, r, cl) grpc_resolver_unref((p), (cl)) void grpc_resolver_ref (grpc_resolver * policy); -void grpc_resolver_unref (grpc_resolver * policy, grpc_closure_list * closure_list); +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); -void grpc_resolver_shutdown (grpc_resolver * resolver, grpc_closure_list * closure_list); +void grpc_resolver_shutdown (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. */ -void grpc_resolver_channel_saw_error (grpc_resolver * resolver, struct sockaddr *failing_address, int failing_address_len, grpc_closure_list * closure_list); +void grpc_resolver_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, struct sockaddr *failing_address, int failing_address_len); /** Get the next client config. Called by the channel to fetch a new configuration. Expected to set *target_config with a new configuration, @@ -84,6 +84,6 @@ void grpc_resolver_channel_saw_error (grpc_resolver * resolver, struct sockaddr If resolution is fatally broken, set *target_config to NULL and schedule on_complete. */ -void grpc_resolver_next (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list); +void grpc_resolver_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete); #endif /* GRPC_INTERNAL_CORE_CONFIG_RESOLVER_H */ diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index 10d6cfa13eb..66430c43cbd 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -75,21 +75,21 @@ typedef struct grpc_client_config *resolved_config; } dns_resolver; -static void dns_destroy (grpc_resolver * r, grpc_closure_list * closure_list); +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, grpc_closure_list * closure_list); +static void dns_maybe_finish_next_locked (grpc_exec_ctx * exec_ctx, dns_resolver * r); -static void dns_shutdown (grpc_resolver * r, grpc_closure_list * closure_list); -static void dns_channel_saw_error (grpc_resolver * r, struct sockaddr *failing_address, int failing_address_len, grpc_closure_list * closure_list); -static void dns_next (grpc_resolver * r, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list); +static void dns_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * r); +static void dns_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * r, struct sockaddr *failing_address, int failing_address_len); +static void dns_next (grpc_exec_ctx * exec_ctx, grpc_resolver * r, grpc_client_config ** target_config, grpc_closure * on_complete); static const grpc_resolver_vtable dns_resolver_vtable = { dns_destroy, dns_shutdown, dns_channel_saw_error, dns_next }; static void -dns_shutdown (grpc_resolver * resolver, grpc_closure_list * closure_list) +dns_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver) { dns_resolver *r = (dns_resolver *) resolver; gpr_mu_lock (&r->mu); @@ -103,7 +103,7 @@ dns_shutdown (grpc_resolver * resolver, grpc_closure_list * closure_list) } static void -dns_channel_saw_error (grpc_resolver * resolver, struct sockaddr *sa, int len, grpc_closure_list * closure_list) +dns_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, struct sockaddr *sa, int len) { dns_resolver *r = (dns_resolver *) resolver; gpr_mu_lock (&r->mu); @@ -115,7 +115,7 @@ dns_channel_saw_error (grpc_resolver * resolver, struct sockaddr *sa, int len, g } static void -dns_next (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list) +dns_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete) { dns_resolver *r = (dns_resolver *) resolver; gpr_mu_lock (&r->mu); @@ -134,7 +134,7 @@ dns_next (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_cl } static void -dns_on_resolved (void *arg, grpc_resolved_addresses * addresses, grpc_closure_list * closure_list) +dns_on_resolved (grpc_exec_ctx * exec_ctx, void *arg, grpc_resolved_addresses * addresses) { dns_resolver *r = arg; grpc_client_config *config = NULL; @@ -188,7 +188,7 @@ dns_start_resolving_locked (dns_resolver * r) } static void -dns_maybe_finish_next_locked (dns_resolver * r, grpc_closure_list * closure_list) +dns_maybe_finish_next_locked (grpc_exec_ctx * exec_ctx, dns_resolver * r) { if (r->next_completion != NULL && r->resolved_version != r->published_version) { @@ -204,7 +204,7 @@ dns_maybe_finish_next_locked (dns_resolver * r, grpc_closure_list * closure_list } static void -dns_destroy (grpc_resolver * gr, grpc_closure_list * closure_list) +dns_destroy (grpc_exec_ctx * exec_ctx, grpc_resolver * gr) { dns_resolver *r = (dns_resolver *) gr; gpr_mu_destroy (&r->mu); diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index 5358caf3bdc..2887cffcd4f 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -77,13 +77,13 @@ typedef struct grpc_client_config **target_config; } sockaddr_resolver; -static void sockaddr_destroy (grpc_resolver * r, grpc_closure_list * closure_list); +static void sockaddr_destroy (grpc_exec_ctx * exec_ctx, grpc_resolver * r); -static void sockaddr_maybe_finish_next_locked (sockaddr_resolver * r, grpc_closure_list * closure_list); +static void sockaddr_maybe_finish_next_locked (grpc_exec_ctx * exec_ctx, sockaddr_resolver * r); -static void sockaddr_shutdown (grpc_resolver * r, grpc_closure_list * closure_list); -static void sockaddr_channel_saw_error (grpc_resolver * r, struct sockaddr *failing_address, int failing_address_len, grpc_closure_list * closure_list); -static void sockaddr_next (grpc_resolver * r, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list); +static void sockaddr_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * r); +static void sockaddr_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * r, struct sockaddr *failing_address, int failing_address_len); +static void sockaddr_next (grpc_exec_ctx * exec_ctx, grpc_resolver * r, grpc_client_config ** target_config, grpc_closure * on_complete); static const grpc_resolver_vtable sockaddr_resolver_vtable = { sockaddr_destroy, sockaddr_shutdown, sockaddr_channel_saw_error, @@ -91,7 +91,7 @@ static const grpc_resolver_vtable sockaddr_resolver_vtable = { }; static void -sockaddr_shutdown (grpc_resolver * resolver, grpc_closure_list * closure_list) +sockaddr_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver) { sockaddr_resolver *r = (sockaddr_resolver *) resolver; gpr_mu_lock (&r->mu); @@ -105,12 +105,12 @@ sockaddr_shutdown (grpc_resolver * resolver, grpc_closure_list * closure_list) } static void -sockaddr_channel_saw_error (grpc_resolver * resolver, struct sockaddr *sa, int len, grpc_closure_list * closure_list) +sockaddr_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, struct sockaddr *sa, int len) { } static void -sockaddr_next (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list) +sockaddr_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete) { sockaddr_resolver *r = (sockaddr_resolver *) resolver; gpr_mu_lock (&r->mu); @@ -122,7 +122,7 @@ sockaddr_next (grpc_resolver * resolver, grpc_client_config ** target_config, gr } static void -sockaddr_maybe_finish_next_locked (sockaddr_resolver * r, grpc_closure_list * closure_list) +sockaddr_maybe_finish_next_locked (grpc_exec_ctx * exec_ctx, sockaddr_resolver * r) { grpc_client_config *cfg; grpc_lb_policy *lb_policy; @@ -157,7 +157,7 @@ sockaddr_maybe_finish_next_locked (sockaddr_resolver * r, grpc_closure_list * cl } static void -sockaddr_destroy (grpc_resolver * gr, grpc_closure_list * closure_list) +sockaddr_destroy (grpc_exec_ctx * exec_ctx, grpc_resolver * gr) { sockaddr_resolver *r = (sockaddr_resolver *) gr; gpr_mu_destroy (&r->mu); diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index 778d1e8b500..1ab348da831 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -148,11 +148,11 @@ struct grpc_subchannel_call #define SUBCHANNEL_CALL_TO_CALL_STACK(call) ((grpc_call_stack *)((call) + 1)) #define CHANNEL_STACK_FROM_CONNECTION(con) ((grpc_channel_stack *)((con) + 1)) -static grpc_subchannel_call *create_call (connection * con, grpc_closure_list * closure_list); -static void connectivity_state_changed_locked (grpc_subchannel * c, const char *reason, grpc_closure_list * closure_list); +static grpc_subchannel_call *create_call (grpc_exec_ctx * exec_ctx, connection * con); +static void connectivity_state_changed_locked (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, const char *reason); static grpc_connectivity_state compute_connectivity_locked (grpc_subchannel * c); static gpr_timespec compute_connect_deadline (grpc_subchannel * c); -static void subchannel_connected (void *subchannel, int iomgr_success, grpc_closure_list * closure_list); +static void subchannel_connected (grpc_exec_ctx * exec_ctx, void *subchannel, int iomgr_success); static void subchannel_ref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); static int @@ -160,7 +160,7 @@ subchannel_unref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; static void connection_ref_locked (connection * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); static grpc_subchannel *connection_unref_locked (connection * c, grpc_closure_list * closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; - static void subchannel_destroy (grpc_subchannel * c, grpc_closure_list * closure_list); + static void subchannel_destroy (grpc_exec_ctx * exec_ctx, grpc_subchannel * c); #ifdef GRPC_SUBCHANNEL_REFCOUNT_DEBUG #define SUBCHANNEL_REF_LOCKED(p, r) \ @@ -196,7 +196,7 @@ subchannel_unref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) * connection implementation */ - static void connection_destroy (connection * c, grpc_closure_list * closure_list) + static void connection_destroy (grpc_exec_ctx * exec_ctx, connection * c) { GPR_ASSERT (c->refs == 0); grpc_channel_stack_destroy (CHANNEL_STACK_FROM_CONNECTION (c), closure_list); @@ -265,7 +265,7 @@ grpc_subchannel_unref (grpc_subchannel * c, grpc_closure_list * closure_list GRP } static void -subchannel_destroy (grpc_subchannel * c, grpc_closure_list * closure_list) +subchannel_destroy (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) { if (c->active != NULL) { @@ -281,13 +281,13 @@ subchannel_destroy (grpc_subchannel * c, grpc_closure_list * closure_list) } void -grpc_subchannel_add_interested_party (grpc_subchannel * c, grpc_pollset * pollset, grpc_closure_list * closure_list) +grpc_subchannel_add_interested_party (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc_pollset * pollset) { grpc_pollset_set_add_pollset (c->pollset_set, pollset, closure_list); } void -grpc_subchannel_del_interested_party (grpc_subchannel * c, grpc_pollset * pollset, grpc_closure_list * closure_list) +grpc_subchannel_del_interested_party (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc_pollset * pollset) { grpc_pollset_set_del_pollset (c->pollset_set, pollset, closure_list); } @@ -326,7 +326,7 @@ grpc_subchannel_create (grpc_connector * connector, grpc_subchannel_args * args) } static void -continue_connect (grpc_subchannel * c, grpc_closure_list * closure_list) +continue_connect (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) { grpc_connect_in_args args; @@ -340,7 +340,7 @@ continue_connect (grpc_subchannel * c, grpc_closure_list * closure_list) } static void -start_connect (grpc_subchannel * c, grpc_closure_list * closure_list) +start_connect (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) { c->backoff_delta = gpr_time_from_seconds (GRPC_SUBCHANNEL_INITIAL_CONNECT_BACKOFF_SECONDS, GPR_TIMESPAN); c->next_attempt = gpr_time_add (gpr_now (GPR_CLOCK_MONOTONIC), c->backoff_delta); @@ -348,7 +348,7 @@ start_connect (grpc_subchannel * c, grpc_closure_list * closure_list) } static void -continue_creating_call (void *arg, int iomgr_success, grpc_closure_list * closure_list) +continue_creating_call (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { waiting_for_connect *w4c = arg; grpc_subchannel_del_interested_party (w4c->subchannel, w4c->pollset, closure_list); @@ -358,7 +358,7 @@ continue_creating_call (void *arg, int iomgr_success, grpc_closure_list * closur } void -grpc_subchannel_create_call (grpc_subchannel * c, grpc_pollset * pollset, grpc_subchannel_call ** target, grpc_closure * notify, grpc_closure_list * closure_list) +grpc_subchannel_create_call (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc_pollset * pollset, grpc_subchannel_call ** target, grpc_closure * notify) { connection *con; gpr_mu_lock (&c->mu); @@ -413,7 +413,7 @@ grpc_subchannel_check_connectivity (grpc_subchannel * c) } void -grpc_subchannel_notify_on_state_change (grpc_subchannel * c, grpc_connectivity_state * state, grpc_closure * notify, grpc_closure_list * closure_list) +grpc_subchannel_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc_connectivity_state * state, grpc_closure * notify) { int do_connect = 0; gpr_mu_lock (&c->mu); @@ -435,7 +435,7 @@ grpc_subchannel_notify_on_state_change (grpc_subchannel * c, grpc_connectivity_s } void -grpc_subchannel_process_transport_op (grpc_subchannel * c, grpc_transport_op * op, grpc_closure_list * closure_list) +grpc_subchannel_process_transport_op (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc_transport_op * op) { connection *con = NULL; grpc_subchannel *destroy; @@ -484,7 +484,7 @@ grpc_subchannel_process_transport_op (grpc_subchannel * c, grpc_transport_op * o } static void -on_state_changed (void *p, int iomgr_success, grpc_closure_list * closure_list) +on_state_changed (grpc_exec_ctx * exec_ctx, void *p, int iomgr_success) { state_watcher *sw = p; grpc_subchannel *c = sw->subchannel; @@ -545,7 +545,7 @@ done: } static void -publish_transport (grpc_subchannel * c, grpc_closure_list * closure_list) +publish_transport (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) { size_t channel_stack_size; connection *con; @@ -668,7 +668,7 @@ update_reconnect_parameters (grpc_subchannel * c) } static void -on_alarm (void *arg, int iomgr_success, grpc_closure_list * closure_list) +on_alarm (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { grpc_subchannel *c = arg; gpr_mu_lock (&c->mu); @@ -692,7 +692,7 @@ on_alarm (void *arg, int iomgr_success, grpc_closure_list * closure_list) } static void -subchannel_connected (void *arg, int iomgr_success, grpc_closure_list * closure_list) +subchannel_connected (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { grpc_subchannel *c = arg; if (c->connecting_result.transport != NULL) @@ -744,7 +744,7 @@ compute_connectivity_locked (grpc_subchannel * c) } static void -connectivity_state_changed_locked (grpc_subchannel * c, const char *reason, grpc_closure_list * closure_list) +connectivity_state_changed_locked (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, const char *reason) { grpc_connectivity_state current = compute_connectivity_locked (c); grpc_connectivity_state_set (&c->state_tracker, current, reason, closure_list); @@ -780,7 +780,7 @@ grpc_subchannel_call_unref (grpc_subchannel_call * c, grpc_closure_list * closur } char * -grpc_subchannel_call_get_peer (grpc_subchannel_call * call, grpc_closure_list * closure_list) +grpc_subchannel_call_get_peer (grpc_exec_ctx * exec_ctx, grpc_subchannel_call * call) { grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK (call); grpc_call_element *top_elem = grpc_call_stack_element (call_stack, 0); @@ -788,7 +788,7 @@ grpc_subchannel_call_get_peer (grpc_subchannel_call * call, grpc_closure_list * } void -grpc_subchannel_call_process_op (grpc_subchannel_call * call, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +grpc_subchannel_call_process_op (grpc_exec_ctx * exec_ctx, grpc_subchannel_call * call, grpc_transport_stream_op * op) { grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK (call); grpc_call_element *top_elem = grpc_call_stack_element (call_stack, 0); @@ -796,7 +796,7 @@ grpc_subchannel_call_process_op (grpc_subchannel_call * call, grpc_transport_str } static grpc_subchannel_call * -create_call (connection * con, grpc_closure_list * closure_list) +create_call (grpc_exec_ctx * exec_ctx, connection * con) { grpc_channel_stack *chanstk = CHANNEL_STACK_FROM_CONNECTION (con); grpc_subchannel_call *call = gpr_malloc (sizeof (grpc_subchannel_call) + chanstk->call_stack_size); diff --git a/src/core/client_config/subchannel.h b/src/core/client_config/subchannel.h index 69cf07f6264..2d6328db863 100644 --- a/src/core/client_config/subchannel.h +++ b/src/core/client_config/subchannel.h @@ -70,28 +70,28 @@ void grpc_subchannel_call_ref (grpc_subchannel_call * call GRPC_SUBCHANNEL_REF_E void grpc_subchannel_call_unref (grpc_subchannel_call * call, grpc_closure_list * closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS); /** construct a call (possibly asynchronously) */ -void grpc_subchannel_create_call (grpc_subchannel * subchannel, grpc_pollset * pollset, grpc_subchannel_call ** target, grpc_closure * notify, grpc_closure_list * closure_list); +void grpc_subchannel_create_call (grpc_exec_ctx * exec_ctx, grpc_subchannel * subchannel, grpc_pollset * pollset, grpc_subchannel_call ** target, grpc_closure * notify); /** process a transport level op */ -void grpc_subchannel_process_transport_op (grpc_subchannel * subchannel, grpc_transport_op * op, grpc_closure_list * closure_list); +void grpc_subchannel_process_transport_op (grpc_exec_ctx * exec_ctx, grpc_subchannel * subchannel, grpc_transport_op * op); /** poll the current connectivity state of a channel */ grpc_connectivity_state grpc_subchannel_check_connectivity (grpc_subchannel * channel); /** 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_subchannel * channel, grpc_connectivity_state * state, grpc_closure * notify, grpc_closure_list * closure_list); +void grpc_subchannel_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_subchannel * channel, grpc_connectivity_state * state, grpc_closure * notify); /** express interest in \a channel's activities through \a pollset. */ -void grpc_subchannel_add_interested_party (grpc_subchannel * channel, grpc_pollset * pollset, grpc_closure_list * closure_list); +void grpc_subchannel_add_interested_party (grpc_exec_ctx * exec_ctx, grpc_subchannel * channel, grpc_pollset * pollset); /** stop following \a channel's activity through \a pollset. */ -void grpc_subchannel_del_interested_party (grpc_subchannel * channel, grpc_pollset * pollset, grpc_closure_list * closure_list); +void grpc_subchannel_del_interested_party (grpc_exec_ctx * exec_ctx, grpc_subchannel * channel, grpc_pollset * pollset); /** continue processing a transport op */ -void grpc_subchannel_call_process_op (grpc_subchannel_call * subchannel_call, grpc_transport_stream_op * op, grpc_closure_list * closure_list); +void grpc_subchannel_call_process_op (grpc_exec_ctx * exec_ctx, grpc_subchannel_call * subchannel_call, grpc_transport_stream_op * op); /** continue querying for peer */ -char *grpc_subchannel_call_get_peer (grpc_subchannel_call * subchannel_call, grpc_closure_list * closure_list); +char *grpc_subchannel_call_get_peer (grpc_exec_ctx * exec_ctx, grpc_subchannel_call * subchannel_call); struct grpc_subchannel_args { diff --git a/src/core/client_config/subchannel_factory.c b/src/core/client_config/subchannel_factory.c index 29e854e2ede..82b851c2f7d 100644 --- a/src/core/client_config/subchannel_factory.c +++ b/src/core/client_config/subchannel_factory.c @@ -40,13 +40,13 @@ grpc_subchannel_factory_ref (grpc_subchannel_factory * factory) } void -grpc_subchannel_factory_unref (grpc_subchannel_factory * factory, grpc_closure_list * closure_list) +grpc_subchannel_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory) { factory->vtable->unref (factory, closure_list); } grpc_subchannel * -grpc_subchannel_factory_create_subchannel (grpc_subchannel_factory * factory, grpc_subchannel_args * args, grpc_closure_list * closure_list) +grpc_subchannel_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory, grpc_subchannel_args * args) { return factory->vtable->create_subchannel (factory, args, closure_list); } diff --git a/src/core/client_config/subchannel_factory.h b/src/core/client_config/subchannel_factory.h index 771638e0fb3..7586a74754e 100644 --- a/src/core/client_config/subchannel_factory.h +++ b/src/core/client_config/subchannel_factory.h @@ -50,14 +50,14 @@ struct grpc_subchannel_factory struct grpc_subchannel_factory_vtable { void (*ref) (grpc_subchannel_factory * factory); - void (*unref) (grpc_subchannel_factory * factory, grpc_closure_list * closure_list); - grpc_subchannel *(*create_subchannel) (grpc_subchannel_factory * factory, grpc_subchannel_args * args, grpc_closure_list * closure_list); + void (*unref) (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory); + grpc_subchannel *(*create_subchannel) (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory, grpc_subchannel_args * args); }; void grpc_subchannel_factory_ref (grpc_subchannel_factory * factory); -void grpc_subchannel_factory_unref (grpc_subchannel_factory * factory, grpc_closure_list * closure_list); +void grpc_subchannel_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory); /** Create a new grpc_subchannel */ -grpc_subchannel *grpc_subchannel_factory_create_subchannel (grpc_subchannel_factory * factory, grpc_subchannel_args * args, grpc_closure_list * closure_list); +grpc_subchannel *grpc_subchannel_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory, grpc_subchannel_args * args); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_SUBCHANNEL_FACTORY_H */ diff --git a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c index 993b95296b8..59af175da14 100644 --- a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c +++ b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c @@ -51,7 +51,7 @@ merge_args_factory_ref (grpc_subchannel_factory * scf) } static void -merge_args_factory_unref (grpc_subchannel_factory * scf, grpc_closure_list * closure_list) +merge_args_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * scf) { merge_args_factory *f = (merge_args_factory *) scf; if (gpr_unref (&f->refs)) @@ -63,7 +63,7 @@ merge_args_factory_unref (grpc_subchannel_factory * scf, grpc_closure_list * clo } static grpc_subchannel * -merge_args_factory_create_subchannel (grpc_subchannel_factory * scf, grpc_subchannel_args * args, grpc_closure_list * closure_list) +merge_args_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * scf, grpc_subchannel_args * args) { merge_args_factory *f = (merge_args_factory *) scf; grpc_channel_args *final_args = grpc_channel_args_merge (args->args, f->merge_args); diff --git a/src/core/httpcli/httpcli.c b/src/core/httpcli/httpcli.c index 1196f237a02..fac80a44a1d 100644 --- a/src/core/httpcli/httpcli.c +++ b/src/core/httpcli/httpcli.c @@ -73,7 +73,7 @@ static grpc_httpcli_get_override g_get_override = NULL; static grpc_httpcli_post_override g_post_override = NULL; static void -plaintext_handshake (void *arg, grpc_endpoint * endpoint, const char *host, void (*on_done) (void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list), grpc_closure_list * closure_list) +plaintext_handshake (void *arg, grpc_endpoint * endpoint, const char *host, void (*on_done) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list)) { on_done (arg, endpoint, closure_list); } @@ -94,10 +94,10 @@ grpc_httpcli_context_destroy (grpc_httpcli_context * context) grpc_pollset_set_destroy (&context->pollset_set); } -static void next_address (internal_request * req, grpc_closure_list * closure_list); +static void next_address (grpc_exec_ctx * exec_ctx, internal_request * req); static void -finish (internal_request * req, int success, grpc_closure_list * closure_list) +finish (grpc_exec_ctx * exec_ctx, internal_request * req, int success) { grpc_pollset_set_del_pollset (&req->context->pollset_set, req->pollset, closure_list); req->on_response (req->user_data, success ? &req->parser.r : NULL, closure_list); @@ -118,16 +118,16 @@ finish (internal_request * req, int success, grpc_closure_list * closure_list) gpr_free (req); } -static void on_read (void *user_data, int success, grpc_closure_list * closure_list); +static void on_read (grpc_exec_ctx * exec_ctx, void *user_data, int success); static void -do_read (internal_request * req, grpc_closure_list * closure_list) +do_read (grpc_exec_ctx * exec_ctx, internal_request * req) { grpc_endpoint_read (req->ep, &req->incoming, &req->on_read, closure_list); } static void -on_read (void *user_data, int success, grpc_closure_list * closure_list) +on_read (grpc_exec_ctx * exec_ctx, void *user_data, int success) { internal_request *req = user_data; size_t i; @@ -160,13 +160,13 @@ on_read (void *user_data, int success, grpc_closure_list * closure_list) } static void -on_written (internal_request * req, grpc_closure_list * closure_list) +on_written (grpc_exec_ctx * exec_ctx, internal_request * req) { do_read (req, closure_list); } static void -done_write (void *arg, int success, grpc_closure_list * closure_list) +done_write (grpc_exec_ctx * exec_ctx, void *arg, int success) { internal_request *req = arg; if (success) @@ -180,7 +180,7 @@ done_write (void *arg, int success, grpc_closure_list * closure_list) } static void -start_write (internal_request * req, grpc_closure_list * closure_list) +start_write (grpc_exec_ctx * exec_ctx, internal_request * req) { gpr_slice_ref (req->request_text); gpr_slice_buffer_add (&req->outgoing, req->request_text); @@ -188,7 +188,7 @@ start_write (internal_request * req, grpc_closure_list * closure_list) } static void -on_handshake_done (void *arg, grpc_endpoint * ep, grpc_closure_list * closure_list) +on_handshake_done (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * ep) { internal_request *req = arg; @@ -203,7 +203,7 @@ on_handshake_done (void *arg, grpc_endpoint * ep, grpc_closure_list * closure_li } static void -on_connected (void *arg, int success, grpc_closure_list * closure_list) +on_connected (grpc_exec_ctx * exec_ctx, void *arg, int success) { internal_request *req = arg; @@ -216,7 +216,7 @@ on_connected (void *arg, int success, grpc_closure_list * closure_list) } static void -next_address (internal_request * req, grpc_closure_list * closure_list) +next_address (grpc_exec_ctx * exec_ctx, internal_request * req) { grpc_resolved_address *addr; if (req->next_address == req->addresses->naddrs) @@ -230,7 +230,7 @@ next_address (internal_request * req, grpc_closure_list * closure_list) } static void -on_resolved (void *arg, grpc_resolved_addresses * addresses, grpc_closure_list * closure_list) +on_resolved (grpc_exec_ctx * exec_ctx, void *arg, grpc_resolved_addresses * addresses) { internal_request *req = arg; if (!addresses) @@ -244,7 +244,7 @@ on_resolved (void *arg, grpc_resolved_addresses * addresses, grpc_closure_list * } static void -internal_request_begin (grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, const char *name, gpr_slice request_text, grpc_closure_list * closure_list) +internal_request_begin (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, const char *name, gpr_slice request_text) { internal_request *req = gpr_malloc (sizeof (internal_request)); memset (req, 0, sizeof (*req)); @@ -268,7 +268,7 @@ internal_request_begin (grpc_httpcli_context * context, grpc_pollset * pollset, } void -grpc_httpcli_get (grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +grpc_httpcli_get (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { char *name; if (g_get_override && g_get_override (request, deadline, on_response, user_data, closure_list)) @@ -281,7 +281,7 @@ grpc_httpcli_get (grpc_httpcli_context * context, grpc_pollset * pollset, const } void -grpc_httpcli_post (grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +grpc_httpcli_post (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { char *name; if (g_post_override && g_post_override (request, body_bytes, body_size, deadline, on_response, user_data, closure_list)) diff --git a/src/core/httpcli/httpcli.h b/src/core/httpcli/httpcli.h index cfe7e4b2aff..021d619900f 100644 --- a/src/core/httpcli/httpcli.h +++ b/src/core/httpcli/httpcli.h @@ -64,7 +64,7 @@ typedef struct grpc_httpcli_context typedef struct { const char *default_port; - void (*handshake) (void *arg, grpc_endpoint * endpoint, const char *host, void (*on_done) (void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list), grpc_closure_list * closure_list); + void (*handshake) (void *arg, grpc_endpoint * endpoint, const char *host, void (*on_done) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list)); } grpc_httpcli_handshaker; extern const grpc_httpcli_handshaker grpc_httpcli_plaintext; @@ -100,7 +100,7 @@ typedef struct grpc_httpcli_response } grpc_httpcli_response; /* Callback for grpc_httpcli_get and grpc_httpcli_post. */ -typedef void (*grpc_httpcli_response_cb) (void *user_data, const grpc_httpcli_response * response, grpc_closure_list * closure_list); +typedef void (*grpc_httpcli_response_cb) (grpc_exec_ctx * exec_ctx, void *user_data, const grpc_httpcli_response * response); void grpc_httpcli_context_init (grpc_httpcli_context * context); void grpc_httpcli_context_destroy (grpc_httpcli_context * context); @@ -115,7 +115,7 @@ void grpc_httpcli_context_destroy (grpc_httpcli_context * context); 'deadline' contains a deadline for the request (or gpr_inf_future) 'on_response' is a callback to report results to (and 'user_data' is a user supplied pointer to pass to said call) */ -void grpc_httpcli_get (grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list); +void grpc_httpcli_get (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data); /* Asynchronously perform a HTTP POST. 'context' specifies the http context under which to do the post @@ -132,11 +132,11 @@ void grpc_httpcli_get (grpc_httpcli_context * context, grpc_pollset * pollset, c 'on_response' is a callback to report results to (and 'user_data' is a user supplied pointer to pass to said call) Does not support ?var1=val1&var2=val2 in the path. */ -void grpc_httpcli_post (grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list); +void grpc_httpcli_post (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data); /* override functions return 1 if they handled the request, 0 otherwise */ -typedef int (*grpc_httpcli_get_override) (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list); -typedef int (*grpc_httpcli_post_override) (const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list); +typedef int (*grpc_httpcli_get_override) (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data); +typedef int (*grpc_httpcli_post_override) (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data); void grpc_httpcli_set_override (grpc_httpcli_get_override get, grpc_httpcli_post_override post); diff --git a/src/core/httpcli/httpcli_security_connector.c b/src/core/httpcli/httpcli_security_connector.c index 00fb1fa4587..5760f27f093 100644 --- a/src/core/httpcli/httpcli_security_connector.c +++ b/src/core/httpcli/httpcli_security_connector.c @@ -63,7 +63,7 @@ httpcli_ssl_destroy (grpc_security_connector * sc) } static void -httpcli_ssl_do_handshake (grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list) +httpcli_ssl_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) { grpc_httpcli_ssl_channel_security_connector *c = (grpc_httpcli_ssl_channel_security_connector *) sc; tsi_result result = TSI_OK; @@ -143,12 +143,12 @@ httpcli_ssl_channel_security_connector_create (const unsigned char *pem_root_cer typedef struct { - void (*func) (void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list); + void (*func) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint); void *arg; } on_done_closure; static void -on_secure_transport_setup_done (void *rp, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint, grpc_closure_list * closure_list) +on_secure_transport_setup_done (grpc_exec_ctx * exec_ctx, void *rp, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint) { on_done_closure *c = rp; if (status != GRPC_SECURITY_OK) @@ -164,7 +164,7 @@ on_secure_transport_setup_done (void *rp, grpc_security_status status, grpc_endp } static void -ssl_handshake (void *arg, grpc_endpoint * tcp, const char *host, void (*on_done) (void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list), grpc_closure_list * closure_list) +ssl_handshake (void *arg, grpc_endpoint * tcp, const char *host, void (*on_done) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list)) { grpc_channel_security_connector *sc = NULL; const unsigned char *pem_root_certs = NULL; diff --git a/src/core/iomgr/alarm.c b/src/core/iomgr/alarm.c index 68455372e7b..b10335c6134 100644 --- a/src/core/iomgr/alarm.c +++ b/src/core/iomgr/alarm.c @@ -73,7 +73,7 @@ static shard_type g_shards[NUM_SHARDS]; /* Protected by g_mu */ static shard_type *g_shard_queue[NUM_SHARDS]; -static int run_some_expired_alarms (gpr_timespec now, gpr_timespec * next, int success, grpc_closure_list * closure_list); +static int run_some_expired_alarms (grpc_exec_ctx * exec_ctx, gpr_timespec now, gpr_timespec * next, int success); static gpr_timespec compute_min_deadline (shard_type * shard) @@ -183,7 +183,7 @@ note_deadline_change (shard_type * shard) } void -grpc_alarm_init (grpc_alarm * alarm, gpr_timespec deadline, grpc_iomgr_cb_func alarm_cb, void *alarm_cb_arg, gpr_timespec now, grpc_closure_list * closure_list) +grpc_alarm_init (grpc_exec_ctx * exec_ctx, grpc_alarm * alarm, gpr_timespec deadline, grpc_iomgr_cb_func alarm_cb, void *alarm_cb_arg, gpr_timespec now) { int is_first_alarm = 0; shard_type *shard = &g_shards[shard_idx (alarm)]; @@ -237,7 +237,7 @@ grpc_alarm_init (grpc_alarm * alarm, gpr_timespec deadline, grpc_iomgr_cb_func a } void -grpc_alarm_cancel (grpc_alarm * alarm, grpc_closure_list * closure_list) +grpc_alarm_cancel (grpc_exec_ctx * exec_ctx, grpc_alarm * alarm) { shard_type *shard = &g_shards[shard_idx (alarm)]; gpr_mu_lock (&shard->mu); @@ -313,7 +313,7 @@ pop_one (shard_type * shard, gpr_timespec now) /* REQUIRES: shard->mu unlocked */ static size_t -pop_alarms (shard_type * shard, gpr_timespec now, gpr_timespec * new_min_deadline, int success, grpc_closure_list * closure_list) +pop_alarms (grpc_exec_ctx * exec_ctx, shard_type * shard, gpr_timespec now, gpr_timespec * new_min_deadline, int success) { size_t n = 0; grpc_alarm *alarm; @@ -329,7 +329,7 @@ pop_alarms (shard_type * shard, gpr_timespec now, gpr_timespec * new_min_deadlin } static int -run_some_expired_alarms (gpr_timespec now, gpr_timespec * next, int success, grpc_closure_list * closure_list) +run_some_expired_alarms (grpc_exec_ctx * exec_ctx, gpr_timespec now, gpr_timespec * next, int success) { size_t n = 0; @@ -370,7 +370,7 @@ run_some_expired_alarms (gpr_timespec now, gpr_timespec * next, int success, grp } int -grpc_alarm_check (gpr_timespec now, gpr_timespec * next, grpc_closure_list * closure_list) +grpc_alarm_check (grpc_exec_ctx * exec_ctx, gpr_timespec now, gpr_timespec * next) { GPR_ASSERT (now.clock_type == g_clock_type); return run_some_expired_alarms (now, next, gpr_time_cmp (now, gpr_inf_future (now.clock_type)) != 0, closure_list); diff --git a/src/core/iomgr/alarm.h b/src/core/iomgr/alarm.h index 30cffa94a58..dc4ce29b466 100644 --- a/src/core/iomgr/alarm.h +++ b/src/core/iomgr/alarm.h @@ -55,7 +55,7 @@ typedef struct grpc_alarm and application code should check the status 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_alarm_init (grpc_alarm * alarm, gpr_timespec deadline, grpc_iomgr_cb_func alarm_cb, void *alarm_cb_arg, gpr_timespec now, grpc_closure_list * closure_list); +void grpc_alarm_init (grpc_exec_ctx * exec_ctx, grpc_alarm * alarm, gpr_timespec deadline, grpc_iomgr_cb_func alarm_cb, void *alarm_cb_arg, gpr_timespec now); /* Note that there is no alarm destroy function. This is because the alarm is a one-time occurrence with a guarantee that the callback will @@ -83,6 +83,6 @@ void grpc_alarm_init (grpc_alarm * alarm, gpr_timespec deadline, grpc_iomgr_cb_f matches this aim. Requires: cancel() must happen after add() on a given alarm */ -void grpc_alarm_cancel (grpc_alarm * alarm, grpc_closure_list * closure_list); +void grpc_alarm_cancel (grpc_exec_ctx * exec_ctx, grpc_alarm * alarm); #endif /* GRPC_INTERNAL_CORE_IOMGR_ALARM_H */ diff --git a/src/core/iomgr/alarm_internal.h b/src/core/iomgr/alarm_internal.h index 5bcfee11cdb..18ab48746fd 100644 --- a/src/core/iomgr/alarm_internal.h +++ b/src/core/iomgr/alarm_internal.h @@ -49,7 +49,7 @@ with high probability at least one thread in the system will see an update at any time slice. */ -int grpc_alarm_check (gpr_timespec now, gpr_timespec * next, grpc_closure_list * closure_list); +int grpc_alarm_check (grpc_exec_ctx * exec_ctx, gpr_timespec now, gpr_timespec * next); void grpc_alarm_list_init (gpr_timespec now); void grpc_alarm_list_shutdown (grpc_closure_list * closure_list); diff --git a/src/core/iomgr/closure.h b/src/core/iomgr/closure.h index 3566f0b9851..90d9e328a10 100644 --- a/src/core/iomgr/closure.h +++ b/src/core/iomgr/closure.h @@ -50,7 +50,7 @@ typedef struct grpc_closure_list * \param arg Arbitrary input. * \param success An indication on the state of the iomgr. On false, cleanup * actions should be taken (eg, shutdown). */ -typedef void (*grpc_iomgr_cb_func) (void *arg, int success, grpc_closure_list * closure_list); +typedef void (*grpc_iomgr_cb_func) (grpc_exec_ctx * exec_ctx, void *arg, int success); /** A closure over a grpc_iomgr_cb_func. */ struct grpc_closure diff --git a/src/core/iomgr/endpoint.c b/src/core/iomgr/endpoint.c index cc71177723b..20ad7fee13a 100644 --- a/src/core/iomgr/endpoint.c +++ b/src/core/iomgr/endpoint.c @@ -34,37 +34,37 @@ #include "src/core/iomgr/endpoint.h" void -grpc_endpoint_read (grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list) +grpc_endpoint_read (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb) { ep->vtable->read (ep, slices, cb, closure_list); } void -grpc_endpoint_write (grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list) +grpc_endpoint_write (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb) { ep->vtable->write (ep, slices, cb, closure_list); } void -grpc_endpoint_add_to_pollset (grpc_endpoint * ep, grpc_pollset * pollset, grpc_closure_list * closure_list) +grpc_endpoint_add_to_pollset (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, grpc_pollset * pollset) { ep->vtable->add_to_pollset (ep, pollset, closure_list); } void -grpc_endpoint_add_to_pollset_set (grpc_endpoint * ep, grpc_pollset_set * pollset_set, grpc_closure_list * closure_list) +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, closure_list); } void -grpc_endpoint_shutdown (grpc_endpoint * ep, grpc_closure_list * closure_list) +grpc_endpoint_shutdown (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep) { ep->vtable->shutdown (ep, closure_list); } void -grpc_endpoint_destroy (grpc_endpoint * ep, grpc_closure_list * closure_list) +grpc_endpoint_destroy (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep) { ep->vtable->destroy (ep, closure_list); } diff --git a/src/core/iomgr/endpoint.h b/src/core/iomgr/endpoint.h index 99d7f46e559..1a88b852e6b 100644 --- a/src/core/iomgr/endpoint.h +++ b/src/core/iomgr/endpoint.h @@ -48,12 +48,12 @@ typedef struct grpc_endpoint_vtable grpc_endpoint_vtable; struct grpc_endpoint_vtable { - void (*read) (grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list); - void (*write) (grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list); - void (*add_to_pollset) (grpc_endpoint * ep, grpc_pollset * pollset, grpc_closure_list * closure_list); - void (*add_to_pollset_set) (grpc_endpoint * ep, grpc_pollset_set * pollset, grpc_closure_list * closure_list); - void (*shutdown) (grpc_endpoint * ep, grpc_closure_list * closure_list); - void (*destroy) (grpc_endpoint * ep, grpc_closure_list * closure_list); + void (*read) (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb); + void (*write) (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_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); + void (*destroy) (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep); char *(*get_peer) (grpc_endpoint * ep); }; @@ -61,7 +61,7 @@ struct grpc_endpoint_vtable Callback success indicates that the endpoint can accept more reads, failure indicates the endpoint is closed. Valid slices may be placed into \a slices even on callback success == 0. */ -void grpc_endpoint_read (grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list); +void grpc_endpoint_read (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb); char *grpc_endpoint_get_peer (grpc_endpoint * ep); @@ -75,17 +75,17 @@ char *grpc_endpoint_get_peer (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, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list); +void grpc_endpoint_write (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb); /* Causes any pending read/write callbacks to run immediately with success==0 */ -void grpc_endpoint_shutdown (grpc_endpoint * ep, grpc_closure_list * closure_list); -void grpc_endpoint_destroy (grpc_endpoint * ep, grpc_closure_list * closure_list); +void grpc_endpoint_shutdown (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep); +void grpc_endpoint_destroy (grpc_exec_ctx * exec_ctx, 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_endpoint * ep, grpc_pollset * pollset, grpc_closure_list * closure_list); -void grpc_endpoint_add_to_pollset_set (grpc_endpoint * ep, grpc_pollset_set * pollset_set, grpc_closure_list * closure_list); +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); struct grpc_endpoint { diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index 279ed280018..8ae63e2a89a 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -252,7 +252,7 @@ has_watchers (grpc_fd * fd) } void -grpc_fd_orphan (grpc_fd * fd, grpc_closure * on_done, const char *reason, grpc_closure_list * closure_list) +grpc_fd_orphan (grpc_exec_ctx * exec_ctx, grpc_fd * fd, grpc_closure * on_done, const char *reason) { fd->on_done_closure = on_done; shutdown (fd->fd, SHUT_RDWR); @@ -300,7 +300,7 @@ grpc_fd_unref (grpc_fd * fd) #endif static void -notify_on (grpc_fd * fd, gpr_atm * st, grpc_closure * closure, grpc_closure_list * closure_list) +notify_on (grpc_exec_ctx * exec_ctx, grpc_fd * fd, gpr_atm * st, grpc_closure * closure) { switch (gpr_atm_acq_load (st)) { @@ -337,7 +337,7 @@ notify_on (grpc_fd * fd, gpr_atm * st, grpc_closure * closure, grpc_closure_list } static void -set_ready_locked (grpc_fd * fd, gpr_atm * st, grpc_closure_list * closure_list) +set_ready_locked (grpc_exec_ctx * exec_ctx, grpc_fd * fd, gpr_atm * st) { gpr_intptr state = gpr_atm_acq_load (st); @@ -365,7 +365,7 @@ set_ready_locked (grpc_fd * fd, gpr_atm * st, grpc_closure_list * closure_list) } static void -set_ready (grpc_fd * fd, gpr_atm * st, grpc_closure_list * closure_list) +set_ready (grpc_exec_ctx * exec_ctx, grpc_fd * fd, gpr_atm * st) { /* only one set_ready can be active at once (but there may be a racing notify_on) */ @@ -375,7 +375,7 @@ set_ready (grpc_fd * fd, gpr_atm * st, grpc_closure_list * closure_list) } void -grpc_fd_shutdown (grpc_fd * fd, grpc_closure_list * closure_list) +grpc_fd_shutdown (grpc_exec_ctx * exec_ctx, grpc_fd * fd) { gpr_mu_lock (&fd->set_state_mu); GPR_ASSERT (!gpr_atm_no_barrier_load (&fd->shutdown)); @@ -386,13 +386,13 @@ grpc_fd_shutdown (grpc_fd * fd, grpc_closure_list * closure_list) } void -grpc_fd_notify_on_read (grpc_fd * fd, grpc_closure * closure, grpc_closure_list * closure_list) +grpc_fd_notify_on_read (grpc_exec_ctx * exec_ctx, grpc_fd * fd, grpc_closure * closure) { notify_on (fd, &fd->readst, closure, closure_list); } void -grpc_fd_notify_on_write (grpc_fd * fd, grpc_closure * closure, grpc_closure_list * closure_list) +grpc_fd_notify_on_write (grpc_exec_ctx * exec_ctx, grpc_fd * fd, grpc_closure * closure) { notify_on (fd, &fd->writest, closure, closure_list); } @@ -443,7 +443,7 @@ grpc_fd_begin_poll (grpc_fd * fd, grpc_pollset * pollset, gpr_uint32 read_mask, } void -grpc_fd_end_poll (grpc_fd_watcher * watcher, int got_read, int got_write, grpc_closure_list * closure_list) +grpc_fd_end_poll (grpc_exec_ctx * exec_ctx, grpc_fd_watcher * watcher, int got_read, int got_write) { int was_polling = 0; int kick = 0; @@ -491,13 +491,13 @@ grpc_fd_end_poll (grpc_fd_watcher * watcher, int got_read, int got_write, grpc_c } void -grpc_fd_become_readable (grpc_fd * fd, grpc_closure_list * closure_list) +grpc_fd_become_readable (grpc_exec_ctx * exec_ctx, grpc_fd * fd) { set_ready (fd, &fd->readst, closure_list); } void -grpc_fd_become_writable (grpc_fd * fd, grpc_closure_list * closure_list) +grpc_fd_become_writable (grpc_exec_ctx * exec_ctx, grpc_fd * fd) { set_ready (fd, &fd->writest, closure_list); } diff --git a/src/core/iomgr/fd_posix.h b/src/core/iomgr/fd_posix.h index 53850f44177..550de3753ef 100644 --- a/src/core/iomgr/fd_posix.h +++ b/src/core/iomgr/fd_posix.h @@ -113,7 +113,7 @@ grpc_fd *grpc_fd_create (int fd, const char *name); 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, const char *reason, grpc_closure_list * closure_list); +void grpc_fd_orphan (grpc_exec_ctx * exec_ctx, grpc_fd * fd, grpc_closure * on_done, const char *reason); /* Begin polling on an fd. Registers that the given pollset is interested in this fd - so that if read @@ -129,13 +129,13 @@ void grpc_fd_orphan (grpc_fd * fd, grpc_closure * on_done, const char *reason, g gpr_uint32 grpc_fd_begin_poll (grpc_fd * fd, grpc_pollset * pollset, gpr_uint32 read_mask, gpr_uint32 write_mask, grpc_fd_watcher * rec); /* Complete polling previously started with grpc_fd_begin_poll MUST NOT be called with a pollset lock taken */ -void grpc_fd_end_poll (grpc_fd_watcher * rec, int got_read, int got_write, grpc_closure_list * closure_list); +void grpc_fd_end_poll (grpc_exec_ctx * exec_ctx, grpc_fd_watcher * rec, int got_read, int got_write); /* Return 1 if this fd is orphaned, 0 otherwise */ int grpc_fd_is_orphaned (grpc_fd * fd); /* Cause any current callbacks to error out with GRPC_CALLBACK_CANCELLED. */ -void grpc_fd_shutdown (grpc_fd * fd, grpc_closure_list * closure_list); +void grpc_fd_shutdown (grpc_exec_ctx * exec_ctx, grpc_fd * fd); /* Register read interest, causing read_cb to be called once when fd becomes readable, on deadline specified by deadline, or on shutdown triggered by @@ -150,17 +150,17 @@ void grpc_fd_shutdown (grpc_fd * fd, grpc_closure_list * closure_list); 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, grpc_closure_list * closure_list); +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, grpc_closure_list * closure_list); +void grpc_fd_notify_on_write (grpc_exec_ctx * exec_ctx, grpc_fd * fd, grpc_closure * closure); /* Notification from the poller to an fd that it has become readable or writable. If allow_synchronous_callback is 1, allow running the fd callback inline in this callstack, otherwise register an asynchronous callback and return */ -void grpc_fd_become_readable (grpc_fd * fd, grpc_closure_list * closure_list); -void grpc_fd_become_writable (grpc_fd * fd, grpc_closure_list * closure_list); +void grpc_fd_become_readable (grpc_exec_ctx * exec_ctx, grpc_fd * fd); +void grpc_fd_become_writable (grpc_exec_ctx * exec_ctx, grpc_fd * fd); /* Reference counting for fds */ #ifdef GRPC_FD_REF_COUNT_DEBUG diff --git a/src/core/iomgr/pollset.h b/src/core/iomgr/pollset.h index f17a85d8a84..11f0c592e6c 100644 --- a/src/core/iomgr/pollset.h +++ b/src/core/iomgr/pollset.h @@ -55,7 +55,7 @@ #endif void grpc_pollset_init (grpc_pollset * pollset); -void grpc_pollset_shutdown (grpc_pollset * pollset, grpc_closure * closure, grpc_closure_list * closure_list); +void grpc_pollset_shutdown (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_closure * closure); void grpc_pollset_destroy (grpc_pollset * pollset); /* Do some work on a pollset. @@ -76,7 +76,7 @@ void grpc_pollset_destroy (grpc_pollset * pollset); May call grpc_closure_list_run on grpc_closure_list, without holding the pollset lock */ -void grpc_pollset_work (grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec now, gpr_timespec deadline, grpc_closure_list * closure_list); +void grpc_pollset_work (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec now, gpr_timespec deadline); /* Break one polling thread out of polling work for this pollset. If specific_worker is GRPC_POLLSET_KICK_BROADCAST, kick ALL the workers. diff --git a/src/core/iomgr/pollset_multipoller_with_epoll.c b/src/core/iomgr/pollset_multipoller_with_epoll.c index 2f824882a6d..e5f0d99e542 100644 --- a/src/core/iomgr/pollset_multipoller_with_epoll.c +++ b/src/core/iomgr/pollset_multipoller_with_epoll.c @@ -65,7 +65,7 @@ typedef struct } pollset_hdr; static void -finally_add_fd (grpc_pollset * pollset, grpc_fd * fd, grpc_closure_list * closure_list) +finally_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd) { pollset_hdr *h = pollset->data.ptr; struct epoll_event ev; @@ -94,7 +94,7 @@ finally_add_fd (grpc_pollset * pollset, grpc_fd * fd, grpc_closure_list * closur } static void -perform_delayed_add (void *arg, int iomgr_status, grpc_closure_list * closure_list) +perform_delayed_add (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_status) { delayed_add *da = arg; @@ -122,7 +122,7 @@ perform_delayed_add (void *arg, int iomgr_status, grpc_closure_list * closure_li } static void -multipoll_with_epoll_pollset_add_fd (grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list) +multipoll_with_epoll_pollset_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset) { if (and_unlock_pollset) { @@ -142,7 +142,7 @@ multipoll_with_epoll_pollset_add_fd (grpc_pollset * pollset, grpc_fd * fd, int a } static void -multipoll_with_epoll_pollset_del_fd (grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list) +multipoll_with_epoll_pollset_del_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset) { pollset_hdr *h = pollset->data.ptr; int err; @@ -165,7 +165,7 @@ multipoll_with_epoll_pollset_del_fd (grpc_pollset * pollset, grpc_fd * fd, int a #define GRPC_EPOLL_MAX_EVENTS 1000 static void -multipoll_with_epoll_pollset_maybe_work_and_unlock (grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now, grpc_closure_list * closure_list) +multipoll_with_epoll_pollset_maybe_work_and_unlock (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now) { struct epoll_event ep_ev[GRPC_EPOLL_MAX_EVENTS]; int ep_rv; @@ -270,7 +270,7 @@ static const grpc_pollset_vtable multipoll_with_epoll_pollset = { }; static void -epoll_become_multipoller (grpc_pollset * pollset, grpc_fd ** fds, size_t nfds, grpc_closure_list * closure_list) +epoll_become_multipoller (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd ** fds, size_t nfds) { size_t i; pollset_hdr *h = gpr_malloc (sizeof (pollset_hdr)); diff --git a/src/core/iomgr/pollset_multipoller_with_poll_posix.c b/src/core/iomgr/pollset_multipoller_with_poll_posix.c index 9e3f6d2a0e7..8417b7491a0 100644 --- a/src/core/iomgr/pollset_multipoller_with_poll_posix.c +++ b/src/core/iomgr/pollset_multipoller_with_poll_posix.c @@ -61,7 +61,7 @@ typedef struct } pollset_hdr; static void -multipoll_with_poll_pollset_add_fd (grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list) +multipoll_with_poll_pollset_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset) { size_t i; pollset_hdr *h = pollset->data.ptr; @@ -86,7 +86,7 @@ exit: } static void -multipoll_with_poll_pollset_del_fd (grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list) +multipoll_with_poll_pollset_del_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset) { /* will get removed next poll cycle */ pollset_hdr *h = pollset->data.ptr; @@ -104,7 +104,7 @@ multipoll_with_poll_pollset_del_fd (grpc_pollset * pollset, grpc_fd * fd, int an } static void -multipoll_with_poll_pollset_maybe_work_and_unlock (grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now, grpc_closure_list * closure_list) +multipoll_with_poll_pollset_maybe_work_and_unlock (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now) { int timeout; int r; @@ -239,7 +239,7 @@ static const grpc_pollset_vtable multipoll_with_poll_pollset = { }; void -grpc_poll_become_multipoller (grpc_pollset * pollset, grpc_fd ** fds, size_t nfds, grpc_closure_list * closure_list) +grpc_poll_become_multipoller (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd ** fds, size_t nfds) { size_t i; pollset_hdr *h = gpr_malloc (sizeof (pollset_hdr)); diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 93ab7faa302..ad5c42aac38 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -169,7 +169,7 @@ grpc_pollset_init (grpc_pollset * pollset) } void -grpc_pollset_add_fd (grpc_pollset * pollset, grpc_fd * fd, grpc_closure_list * closure_list) +grpc_pollset_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd) { gpr_mu_lock (&pollset->mu); pollset->vtable->add_fd (pollset, fd, 1, closure_list); @@ -184,7 +184,7 @@ grpc_pollset_add_fd (grpc_pollset * pollset, grpc_fd * fd, grpc_closure_list * c } void -grpc_pollset_del_fd (grpc_pollset * pollset, grpc_fd * fd, grpc_closure_list * closure_list) +grpc_pollset_del_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd) { gpr_mu_lock (&pollset->mu); pollset->vtable->del_fd (pollset, fd, 1, closure_list); @@ -199,14 +199,14 @@ grpc_pollset_del_fd (grpc_pollset * pollset, grpc_fd * fd, grpc_closure_list * c } static void -finish_shutdown (grpc_pollset * pollset, grpc_closure_list * closure_list) +finish_shutdown (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset) { pollset->vtable->finish_shutdown (pollset); grpc_closure_list_add (closure_list, pollset->shutdown_done, 1); } void -grpc_pollset_work (grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec now, gpr_timespec deadline, grpc_closure_list * closure_list) +grpc_pollset_work (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec now, gpr_timespec deadline) { /* pollset->mu already held */ int added_worker = 0; @@ -282,7 +282,7 @@ done: } void -grpc_pollset_shutdown (grpc_pollset * pollset, grpc_closure * closure, grpc_closure_list * closure_list) +grpc_pollset_shutdown (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_closure * closure) { int call_shutdown = 0; gpr_mu_lock (&pollset->mu); @@ -344,7 +344,7 @@ typedef struct grpc_unary_promote_args } grpc_unary_promote_args; static void -basic_do_promote (void *args, int success, grpc_closure_list * closure_list) +basic_do_promote (grpc_exec_ctx * exec_ctx, void *args, int success) { grpc_unary_promote_args *up_args = args; const grpc_pollset_vtable *original_vtable = up_args->original_vtable; @@ -422,7 +422,7 @@ basic_do_promote (void *args, int success, grpc_closure_list * closure_list) } static void -basic_pollset_add_fd (grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list) +basic_pollset_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset) { grpc_unary_promote_args *up_args; GPR_ASSERT (fd); @@ -481,7 +481,7 @@ exit: } static void -basic_pollset_del_fd (grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list) +basic_pollset_del_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset) { GPR_ASSERT (fd); if (fd == pollset->data.ptr) @@ -497,7 +497,7 @@ basic_pollset_del_fd (grpc_pollset * pollset, grpc_fd * fd, int and_unlock_polls } static void -basic_pollset_maybe_work_and_unlock (grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now, grpc_closure_list * closure_list) +basic_pollset_maybe_work_and_unlock (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now) { struct pollfd pfd[2]; grpc_fd *fd; diff --git a/src/core/iomgr/pollset_posix.h b/src/core/iomgr/pollset_posix.h index 6bcc4f6a616..91cf93580fc 100644 --- a/src/core/iomgr/pollset_posix.h +++ b/src/core/iomgr/pollset_posix.h @@ -79,9 +79,9 @@ typedef struct grpc_pollset struct grpc_pollset_vtable { - void (*add_fd) (grpc_pollset * pollset, struct grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list); - void (*del_fd) (grpc_pollset * pollset, struct grpc_fd * fd, int and_unlock_pollset, grpc_closure_list * closure_list); - void (*maybe_work_and_unlock) (grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now, grpc_closure_list * closure_list); + void (*add_fd) (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, struct grpc_fd * fd, int and_unlock_pollset); + void (*del_fd) (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, struct grpc_fd * fd, int and_unlock_pollset); + void (*maybe_work_and_unlock) (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now); void (*finish_shutdown) (grpc_pollset * pollset); void (*destroy) (grpc_pollset * pollset); }; @@ -89,10 +89,10 @@ struct grpc_pollset_vtable #define GRPC_POLLSET_MU(pollset) (&(pollset)->mu) /* Add an fd to a pollset */ -void grpc_pollset_add_fd (grpc_pollset * pollset, struct grpc_fd *fd, grpc_closure_list * closure_list); +void grpc_pollset_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, struct grpc_fd *fd); /* Force remove an fd from a pollset (normally they are removed on the next poll after an fd is orphaned) */ -void grpc_pollset_del_fd (grpc_pollset * pollset, struct grpc_fd *fd, grpc_closure_list * closure_list); +void grpc_pollset_del_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, struct grpc_fd *fd); /* Returns the fd to listen on for kicks */ int grpc_kick_read_fd (grpc_pollset * p); @@ -109,10 +109,10 @@ void grpc_kick_drain (grpc_pollset * p); int grpc_poll_deadline_to_millis_timeout (gpr_timespec deadline, gpr_timespec now); /* turn a pollset into a multipoller: platform specific */ -typedef void (*grpc_platform_become_multipoller_type) (grpc_pollset * pollset, struct grpc_fd ** fds, size_t fd_count, grpc_closure_list * closure_list); +typedef void (*grpc_platform_become_multipoller_type) (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, struct grpc_fd ** fds, size_t fd_count); extern grpc_platform_become_multipoller_type grpc_platform_become_multipoller; -void grpc_poll_become_multipoller (grpc_pollset * pollset, struct grpc_fd **fds, size_t fd_count, grpc_closure_list * closure_list); +void grpc_poll_become_multipoller (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, struct grpc_fd **fds, size_t fd_count); /* Return 1 if the pollset has active threads in grpc_pollset_work (pollset must * be locked) */ diff --git a/src/core/iomgr/pollset_set.h b/src/core/iomgr/pollset_set.h index 3e5cd8d7e6a..a777c6ca23c 100644 --- a/src/core/iomgr/pollset_set.h +++ b/src/core/iomgr/pollset_set.h @@ -51,7 +51,7 @@ void grpc_pollset_set_init (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, grpc_closure_list * closure_list); -void grpc_pollset_set_del_pollset (grpc_pollset_set * pollset_set, grpc_pollset * pollset, grpc_closure_list * closure_list); +void grpc_pollset_set_add_pollset (grpc_exec_ctx * exec_ctx, grpc_pollset_set * pollset_set, grpc_pollset * pollset); +void grpc_pollset_set_del_pollset (grpc_exec_ctx * exec_ctx, grpc_pollset_set * pollset_set, grpc_pollset * pollset); #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_H */ diff --git a/src/core/iomgr/pollset_set_posix.c b/src/core/iomgr/pollset_set_posix.c index 285f4eb24a8..83be0b91c9f 100644 --- a/src/core/iomgr/pollset_set_posix.c +++ b/src/core/iomgr/pollset_set_posix.c @@ -64,7 +64,7 @@ grpc_pollset_set_destroy (grpc_pollset_set * pollset_set) } void -grpc_pollset_set_add_pollset (grpc_pollset_set * pollset_set, grpc_pollset * pollset, grpc_closure_list * closure_list) +grpc_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_set->mu); @@ -91,7 +91,7 @@ grpc_pollset_set_add_pollset (grpc_pollset_set * pollset_set, grpc_pollset * pol } void -grpc_pollset_set_del_pollset (grpc_pollset_set * pollset_set, grpc_pollset * pollset, grpc_closure_list * closure_list) +grpc_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); @@ -108,7 +108,7 @@ grpc_pollset_set_del_pollset (grpc_pollset_set * pollset_set, grpc_pollset * pol } void -grpc_pollset_set_add_fd (grpc_pollset_set * pollset_set, grpc_fd * fd, grpc_closure_list * closure_list) +grpc_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); @@ -127,7 +127,7 @@ grpc_pollset_set_add_fd (grpc_pollset_set * pollset_set, grpc_fd * fd, grpc_clos } void -grpc_pollset_set_del_fd (grpc_pollset_set * pollset_set, grpc_fd * fd, grpc_closure_list * closure_list) +grpc_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); diff --git a/src/core/iomgr/pollset_set_posix.h b/src/core/iomgr/pollset_set_posix.h index 2a4a0457000..6075ae8f866 100644 --- a/src/core/iomgr/pollset_set_posix.h +++ b/src/core/iomgr/pollset_set_posix.h @@ -50,7 +50,7 @@ typedef struct grpc_pollset_set grpc_fd **fds; } grpc_pollset_set; -void grpc_pollset_set_add_fd (grpc_pollset_set * pollset_set, grpc_fd * fd, grpc_closure_list * closure_list); -void grpc_pollset_set_del_fd (grpc_pollset_set * pollset_set, grpc_fd * fd, grpc_closure_list * closure_list); +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); #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_WINDOWS_H */ diff --git a/src/core/iomgr/resolve_address.h b/src/core/iomgr/resolve_address.h index 44db1a7cc74..aeee82584a7 100644 --- a/src/core/iomgr/resolve_address.h +++ b/src/core/iomgr/resolve_address.h @@ -56,7 +56,7 @@ typedef struct On success: addresses is the result, and the callee must call grpc_resolved_addresses_destroy when it's done with them On failure: addresses is NULL */ -typedef void (*grpc_resolve_cb) (void *arg, grpc_resolved_addresses * addresses, grpc_closure_list * closure_list); +typedef void (*grpc_resolve_cb) (grpc_exec_ctx * exec_ctx, void *arg, grpc_resolved_addresses * addresses); /* 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 */ diff --git a/src/core/iomgr/tcp_client.h b/src/core/iomgr/tcp_client.h index a97ca351284..2e140740062 100644 --- a/src/core/iomgr/tcp_client.h +++ b/src/core/iomgr/tcp_client.h @@ -44,6 +44,6 @@ 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, grpc_pollset_set * interested_parties, const struct sockaddr *addr, size_t addr_len, gpr_timespec deadline, grpc_closure_list * closure_list); +void grpc_tcp_client_connect (grpc_exec_ctx * exec_ctx, grpc_closure * on_connect, grpc_endpoint ** endpoint, grpc_pollset_set * interested_parties, const struct sockaddr *addr, size_t addr_len, gpr_timespec deadline); #endif /* GRPC_INTERNAL_CORE_IOMGR_TCP_CLIENT_H */ diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c index 14255bda074..cca626228ad 100644 --- a/src/core/iomgr/tcp_client_posix.c +++ b/src/core/iomgr/tcp_client_posix.c @@ -95,7 +95,7 @@ error: } static void -tc_on_alarm (void *acp, int success, grpc_closure_list * closure_list) +tc_on_alarm (grpc_exec_ctx * exec_ctx, void *acp, int success) { int done; async_connect *ac = acp; @@ -119,7 +119,7 @@ tc_on_alarm (void *acp, int success, grpc_closure_list * closure_list) } static void -on_writable (void *acp, int success, grpc_closure_list * closure_list) +on_writable (grpc_exec_ctx * exec_ctx, void *acp, int success) { async_connect *ac = acp; int so_error = 0; @@ -229,7 +229,7 @@ finish: } void -grpc_tcp_client_connect (grpc_closure * closure, grpc_endpoint ** ep, grpc_pollset_set * interested_parties, const struct sockaddr *addr, size_t addr_len, gpr_timespec deadline, grpc_closure_list * closure_list) +grpc_tcp_client_connect (grpc_exec_ctx * exec_ctx, grpc_closure * closure, grpc_endpoint ** ep, grpc_pollset_set * interested_parties, const struct sockaddr *addr, size_t addr_len, gpr_timespec deadline) { int fd; grpc_dualstack_mode dsmode; diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c index da65a90eb46..bc9f566c6a5 100644 --- a/src/core/iomgr/tcp_posix.c +++ b/src/core/iomgr/tcp_posix.c @@ -101,14 +101,14 @@ static void tcp_handle_write (void *arg /* grpc_tcp */ , int success, grpc_closure_list * closure_list); static void -tcp_shutdown (grpc_endpoint * ep, grpc_closure_list * closure_list) +tcp_shutdown (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep) { grpc_tcp *tcp = (grpc_tcp *) ep; grpc_fd_shutdown (tcp->em_fd, closure_list); } static void -tcp_free (grpc_tcp * tcp, grpc_closure_list * closure_list) +tcp_free (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) { grpc_fd_orphan (tcp->em_fd, NULL, "tcp_unref_orphan", closure_list); gpr_free (tcp->peer_string); @@ -140,7 +140,7 @@ tcp_ref (grpc_tcp * tcp, const char *reason, const char *file, int line) #define TCP_UNREF(tcp, reason, cl) tcp_unref((tcp), (cl)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) static void -tcp_unref (grpc_tcp * tcp, grpc_closure_list * closure_list) +tcp_unref (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) { if (gpr_unref (&tcp->refcount)) { @@ -156,14 +156,14 @@ tcp_ref (grpc_tcp * tcp) #endif static void -tcp_destroy (grpc_endpoint * ep, grpc_closure_list * closure_list) +tcp_destroy (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep) { grpc_tcp *tcp = (grpc_tcp *) ep; TCP_UNREF (tcp, "destroy", closure_list); } static void -call_read_cb (grpc_tcp * tcp, int success, grpc_closure_list * closure_list) +call_read_cb (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp, int success) { grpc_closure *cb = tcp->read_cb; @@ -187,7 +187,7 @@ call_read_cb (grpc_tcp * tcp, int success, grpc_closure_list * closure_list) #define MAX_READ_IOVEC 4 static void -tcp_continue_read (grpc_tcp * tcp, grpc_closure_list * closure_list) +tcp_continue_read (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) { struct msghdr msg; struct iovec iov[MAX_READ_IOVEC]; @@ -292,7 +292,7 @@ tcp_handle_read (void *arg /* grpc_tcp */ , int success, } static void -tcp_read (grpc_endpoint * ep, gpr_slice_buffer * incoming_buffer, grpc_closure * cb, grpc_closure_list * closure_list) +tcp_read (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * incoming_buffer, grpc_closure * cb) { grpc_tcp *tcp = (grpc_tcp *) ep; GPR_ASSERT (tcp->read_cb == NULL); @@ -434,7 +434,7 @@ tcp_handle_write (void *arg /* grpc_tcp */ , int success, } static void -tcp_write (grpc_endpoint * ep, gpr_slice_buffer * buf, grpc_closure * cb, grpc_closure_list * closure_list) +tcp_write (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * buf, grpc_closure * cb) { grpc_tcp *tcp = (grpc_tcp *) ep; flush_result status; @@ -480,14 +480,14 @@ tcp_write (grpc_endpoint * ep, gpr_slice_buffer * buf, grpc_closure * cb, grpc_c } static void -tcp_add_to_pollset (grpc_endpoint * ep, grpc_pollset * pollset, grpc_closure_list * closure_list) +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, closure_list); } static void -tcp_add_to_pollset_set (grpc_endpoint * ep, grpc_pollset_set * pollset_set, grpc_closure_list * closure_list) +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, closure_list); diff --git a/src/core/iomgr/tcp_server.h b/src/core/iomgr/tcp_server.h index bb1d50576c9..ee373a76bf3 100644 --- a/src/core/iomgr/tcp_server.h +++ b/src/core/iomgr/tcp_server.h @@ -40,13 +40,13 @@ typedef struct grpc_tcp_server grpc_tcp_server; /* Called for newly connected TCP connections. */ -typedef void (*grpc_tcp_server_cb) (void *arg, grpc_endpoint * ep, grpc_closure_list * closure_list); +typedef void (*grpc_tcp_server_cb) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * ep); /* Create a server, initially not bound to any ports */ grpc_tcp_server *grpc_tcp_server_create (void); /* Start listening to bound ports */ -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_closure_list * closure_list); +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 port number on success, or negative on failure. @@ -68,6 +68,6 @@ int grpc_tcp_server_add_port (grpc_tcp_server * s, const void *addr, size_t addr up when grpc_tcp_server_destroy is called. */ int grpc_tcp_server_get_fd (grpc_tcp_server * s, unsigned index); -void grpc_tcp_server_destroy (grpc_tcp_server * server, grpc_closure * closure, grpc_closure_list * closure_list); +void grpc_tcp_server_destroy (grpc_exec_ctx * exec_ctx, grpc_tcp_server * server, grpc_closure * closure); #endif /* GRPC_INTERNAL_CORE_IOMGR_TCP_SERVER_H */ diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c index 7b9cfe09cb7..ee462aabd41 100644 --- a/src/core/iomgr/tcp_server_posix.c +++ b/src/core/iomgr/tcp_server_posix.c @@ -149,7 +149,7 @@ grpc_tcp_server_create (void) } static void -finish_shutdown (grpc_tcp_server * s, grpc_closure_list * closure_list) +finish_shutdown (grpc_exec_ctx * exec_ctx, grpc_tcp_server * s) { grpc_closure_list_add (closure_list, s->shutdown_complete, 1); @@ -160,7 +160,7 @@ finish_shutdown (grpc_tcp_server * s, grpc_closure_list * closure_list) } static void -destroyed_port (void *server, int success, grpc_closure_list * closure_list) +destroyed_port (grpc_exec_ctx * exec_ctx, void *server, int success) { grpc_tcp_server *s = server; gpr_mu_lock (&s->mu); @@ -181,7 +181,7 @@ destroyed_port (void *server, int success, grpc_closure_list * closure_list) events will be received on them - at this point it's safe to destroy things */ static void -deactivated_all_ports (grpc_tcp_server * s, grpc_closure_list * closure_list) +deactivated_all_ports (grpc_exec_ctx * exec_ctx, grpc_tcp_server * s) { size_t i; @@ -217,7 +217,7 @@ deactivated_all_ports (grpc_tcp_server * s, grpc_closure_list * closure_list) } void -grpc_tcp_server_destroy (grpc_tcp_server * s, grpc_closure * closure, grpc_closure_list * closure_list) +grpc_tcp_server_destroy (grpc_exec_ctx * exec_ctx, grpc_tcp_server * s, grpc_closure * closure) { size_t i; gpr_mu_lock (&s->mu); @@ -333,7 +333,7 @@ error: /* event manager callback when reads are ready */ static void -on_read (void *arg, int success, grpc_closure_list * closure_list) +on_read (grpc_exec_ctx * exec_ctx, void *arg, int success) { server_port *sp = arg; grpc_fd *fdobj; @@ -542,7 +542,7 @@ grpc_tcp_server_get_fd (grpc_tcp_server * s, unsigned index) } 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, grpc_closure_list * closure_list) +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, j; GPR_ASSERT (on_accept_cb); diff --git a/src/core/iomgr/udp_server.c b/src/core/iomgr/udp_server.c index 490b3de205a..2f45011a89a 100644 --- a/src/core/iomgr/udp_server.c +++ b/src/core/iomgr/udp_server.c @@ -142,7 +142,7 @@ grpc_udp_server_create (void) } static void -finish_shutdown (grpc_udp_server * s, grpc_closure_list * closure_list) +finish_shutdown (grpc_exec_ctx * exec_ctx, grpc_udp_server * s) { grpc_closure_list_add (closure_list, s->shutdown_complete, 1); @@ -154,7 +154,7 @@ finish_shutdown (grpc_udp_server * s, grpc_closure_list * closure_list) } static void -destroyed_port (void *server, int success, grpc_closure_list * closure_list) +destroyed_port (grpc_exec_ctx * exec_ctx, void *server, int success) { grpc_udp_server *s = server; gpr_mu_lock (&s->mu); @@ -174,7 +174,7 @@ destroyed_port (void *server, int success, grpc_closure_list * closure_list) events will be received on them - at this point it's safe to destroy things */ static void -deactivated_all_ports (grpc_udp_server * s, grpc_closure_list * closure_list) +deactivated_all_ports (grpc_exec_ctx * exec_ctx, grpc_udp_server * s) { size_t i; @@ -210,7 +210,7 @@ deactivated_all_ports (grpc_udp_server * s, grpc_closure_list * closure_list) } void -grpc_udp_server_destroy (grpc_udp_server * s, grpc_closure * on_done, grpc_closure_list * closure_list) +grpc_udp_server_destroy (grpc_exec_ctx * exec_ctx, grpc_udp_server * s, grpc_closure * on_done) { size_t i; gpr_mu_lock (&s->mu); @@ -292,7 +292,7 @@ error: /* event manager callback when reads are ready */ static void -on_read (void *arg, int success, grpc_closure_list * closure_list) +on_read (grpc_exec_ctx * exec_ctx, void *arg, int success) { server_port *sp = arg; @@ -451,7 +451,7 @@ grpc_udp_server_get_fd (grpc_udp_server * s, unsigned index) } void -grpc_udp_server_start (grpc_udp_server * s, grpc_pollset ** pollsets, size_t pollset_count, grpc_closure_list * closure_list) +grpc_udp_server_start (grpc_exec_ctx * exec_ctx, grpc_udp_server * s, grpc_pollset ** pollsets, size_t pollset_count) { size_t i, j; gpr_mu_lock (&s->mu); diff --git a/src/core/iomgr/udp_server.h b/src/core/iomgr/udp_server.h index 458773a1212..e37d0485c13 100644 --- a/src/core/iomgr/udp_server.h +++ b/src/core/iomgr/udp_server.h @@ -46,7 +46,7 @@ typedef void (*grpc_udp_server_read_cb) (int fd); grpc_udp_server *grpc_udp_server_create (void); /* Start listening to bound ports */ -void grpc_udp_server_start (grpc_udp_server * udp_server, grpc_pollset ** pollsets, size_t pollset_count, grpc_closure_list * closure_list); +void grpc_udp_server_start (grpc_exec_ctx * exec_ctx, grpc_udp_server * udp_server, grpc_pollset ** pollsets, size_t pollset_count); int grpc_udp_server_get_fd (grpc_udp_server * s, unsigned index); @@ -62,7 +62,7 @@ int grpc_udp_server_get_fd (grpc_udp_server * s, unsigned index); all of the multiple socket port matching logic in one place */ int grpc_udp_server_add_port (grpc_udp_server * s, const void *addr, size_t addr_len, grpc_udp_server_read_cb read_cb); -void grpc_udp_server_destroy (grpc_udp_server * server, grpc_closure * on_done, grpc_closure_list * closure_list); +void grpc_udp_server_destroy (grpc_exec_ctx * exec_ctx, grpc_udp_server * server, grpc_closure * on_done); /* Write the contents of buffer to the underlying UDP socket. */ /* diff --git a/src/core/iomgr/workqueue.h b/src/core/iomgr/workqueue.h index 8a825ba8e39..c5d7c64e835 100644 --- a/src/core/iomgr/workqueue.h +++ b/src/core/iomgr/workqueue.h @@ -53,7 +53,7 @@ typedef struct grpc_workqueue grpc_workqueue; /** Create a work queue */ grpc_workqueue *grpc_workqueue_create (grpc_closure_list * closure_list); -void grpc_workqueue_flush (grpc_workqueue * workqueue, grpc_closure_list * closure_list); +void grpc_workqueue_flush (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue); #define GRPC_WORKQUEUE_REFCOUNT_DEBUG #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG @@ -67,11 +67,11 @@ void grpc_workqueue_unref (grpc_workqueue * workqueue, grpc_closure_list * closu #define GRPC_WORKQUEUE_REF(p, r) grpc_workqueue_ref((p)) #define GRPC_WORKQUEUE_UNREF(p, r, cl) grpc_workqueue_unref((p), (cl)) void grpc_workqueue_ref (grpc_workqueue * workqueue); -void grpc_workqueue_unref (grpc_workqueue * workqueue, grpc_closure_list * closure_list); +void grpc_workqueue_unref (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue); #endif /** Bind this workqueue to a pollset */ -void grpc_workqueue_add_to_pollset (grpc_workqueue * workqueue, grpc_pollset * pollset, grpc_closure_list * closure_list); +void grpc_workqueue_add_to_pollset (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue, grpc_pollset * pollset); /** Add a work item to a workqueue */ void grpc_workqueue_push (grpc_workqueue * workqueue, grpc_closure * closure, int success); diff --git a/src/core/iomgr/workqueue_posix.c b/src/core/iomgr/workqueue_posix.c index e13404b2618..1aadaa4028b 100644 --- a/src/core/iomgr/workqueue_posix.c +++ b/src/core/iomgr/workqueue_posix.c @@ -45,7 +45,7 @@ #include "src/core/iomgr/fd_posix.h" -static void on_readable (void *arg, int success, grpc_closure_list * closure_list); +static void on_readable (grpc_exec_ctx * exec_ctx, void *arg, int success); grpc_workqueue * grpc_workqueue_create (grpc_closure_list * closure_list) @@ -64,7 +64,7 @@ grpc_workqueue_create (grpc_closure_list * closure_list) } static void -workqueue_destroy (grpc_workqueue * workqueue, grpc_closure_list * closure_list) +workqueue_destroy (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue) { GPR_ASSERT (grpc_closure_list_empty (workqueue->closure_list)); grpc_fd_shutdown (workqueue->wakeup_read_fd, closure_list); @@ -90,7 +90,7 @@ grpc_workqueue_unref (grpc_workqueue * workqueue, grpc_closure_list * closure_li gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p unref %d -> %d %s", workqueue, (int) workqueue->refs.count, (int) workqueue->refs.count - 1, reason); #else void -grpc_workqueue_unref (grpc_workqueue * workqueue, grpc_closure_list * closure_list) +grpc_workqueue_unref (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue) { #endif if (gpr_unref (&workqueue->refs)) @@ -100,13 +100,13 @@ grpc_workqueue_unref (grpc_workqueue * workqueue, grpc_closure_list * closure_li } void -grpc_workqueue_add_to_pollset (grpc_workqueue * workqueue, grpc_pollset * pollset, grpc_closure_list * closure_list) +grpc_workqueue_add_to_pollset (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue, grpc_pollset * pollset) { grpc_pollset_add_fd (pollset, workqueue->wakeup_read_fd, closure_list); } void -grpc_workqueue_flush (grpc_workqueue * workqueue, grpc_closure_list * closure_list) +grpc_workqueue_flush (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue) { gpr_mu_lock (&workqueue->mu); grpc_closure_list_move (&workqueue->closure_list, closure_list); @@ -114,7 +114,7 @@ grpc_workqueue_flush (grpc_workqueue * workqueue, grpc_closure_list * closure_li } static void -on_readable (void *arg, int success, grpc_closure_list * closure_list) +on_readable (grpc_exec_ctx * exec_ctx, void *arg, int success) { grpc_workqueue *workqueue = arg; diff --git a/src/core/security/client_auth_filter.c b/src/core/security/client_auth_filter.c index 660ef713fab..89ac3f464fc 100644 --- a/src/core/security/client_auth_filter.c +++ b/src/core/security/client_auth_filter.c @@ -89,7 +89,7 @@ reset_service_url (call_data * calld) } static void -bubble_up_error (grpc_call_element * elem, grpc_status_code status, const char *error_msg, grpc_closure_list * closure_list) +bubble_up_error (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_status_code status, const char *error_msg) { call_data *calld = elem->call_data; gpr_log (GPR_ERROR, "Client side authentication failure: %s", error_msg); @@ -98,7 +98,7 @@ bubble_up_error (grpc_call_element * elem, grpc_status_code status, const char * } static void -on_credentials_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_credentials_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { grpc_call_element *elem = (grpc_call_element *) user_data; call_data *calld = elem->call_data; @@ -149,7 +149,7 @@ build_service_url (const char *url_scheme, call_data * calld) } static void -send_security_metadata (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +send_security_metadata (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -186,7 +186,7 @@ send_security_metadata (grpc_call_element * elem, grpc_transport_stream_op * op, } static void -on_host_checked (void *user_data, grpc_security_status status, grpc_closure_list * closure_list) +on_host_checked (grpc_exec_ctx * exec_ctx, void *user_data, grpc_security_status status) { grpc_call_element *elem = (grpc_call_element *) user_data; call_data *calld = elem->call_data; @@ -210,7 +210,7 @@ on_host_checked (void *user_data, grpc_security_status status, grpc_closure_list op contains type and call direction information, in addition to the data that is being sent or received. */ static void -auth_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +auth_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; @@ -296,7 +296,7 @@ auth_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op /* Constructor for call_data */ static void -init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) { call_data *calld = elem->call_data; memset (calld, 0, sizeof (*calld)); @@ -305,7 +305,7 @@ init_call_elem (grpc_call_element * elem, const void *server_transport_data, grp /* Destructor for call_data */ static void -destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { call_data *calld = elem->call_data; grpc_credentials_unref (calld->creds); @@ -322,7 +322,7 @@ destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) /* Constructor for channel_data */ static void -init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last, grpc_closure_list * closure_list) +init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last) { grpc_security_connector *sc = grpc_find_security_connector_in_args (args); /* grab pointers to our data from the channel element */ @@ -346,7 +346,7 @@ init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grp /* Destructor for channel data */ static void -destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) { /* grab pointers to our data from the channel element */ channel_data *chand = elem->channel_data; diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index ade70dddbcd..caf3d6f8852 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -120,7 +120,7 @@ grpc_credentials_has_request_metadata_only (grpc_credentials * creds) } void -grpc_credentials_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +grpc_credentials_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { if (creds == NULL || !grpc_credentials_has_request_metadata (creds) || creds->vtable->get_request_metadata == NULL) { @@ -420,7 +420,7 @@ jwt_has_request_metadata_only (const grpc_credentials * creds) } static void -jwt_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +jwt_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { grpc_service_account_jwt_access_credentials *c = (grpc_service_account_jwt_access_credentials *) creds; gpr_timespec refresh_threshold = gpr_time_from_seconds (GRPC_SECURE_TOKEN_REFRESH_THRESHOLD_SECS, GPR_TIMESPAN); @@ -632,7 +632,7 @@ end: } static void -on_oauth2_token_fetcher_http_response (void *user_data, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +on_oauth2_token_fetcher_http_response (grpc_exec_ctx * exec_ctx, void *user_data, const grpc_httpcli_response * response) { grpc_credentials_metadata_request *r = (grpc_credentials_metadata_request *) user_data; grpc_oauth2_token_fetcher_credentials *c = (grpc_oauth2_token_fetcher_credentials *) r->creds; @@ -656,7 +656,7 @@ on_oauth2_token_fetcher_http_response (void *user_data, const grpc_httpcli_respo } static void -oauth2_token_fetcher_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +oauth2_token_fetcher_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { grpc_oauth2_token_fetcher_credentials *c = (grpc_oauth2_token_fetcher_credentials *) creds; gpr_timespec refresh_threshold = gpr_time_from_seconds (GRPC_SECURE_TOKEN_REFRESH_THRESHOLD_SECS, GPR_TIMESPAN); @@ -701,7 +701,7 @@ static grpc_credentials_vtable compute_engine_vtable = { }; static void -compute_engine_fetch_oauth2 (grpc_credentials_metadata_request * metadata_req, grpc_httpcli_context * httpcli_context, grpc_pollset * pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline, grpc_closure_list * closure_list) +compute_engine_fetch_oauth2 (grpc_exec_ctx * exec_ctx, grpc_credentials_metadata_request * metadata_req, grpc_httpcli_context * httpcli_context, grpc_pollset * pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline) { grpc_httpcli_header header = { "Metadata-Flavor", "Google" }; grpc_httpcli_request request; @@ -740,7 +740,7 @@ static grpc_credentials_vtable refresh_token_vtable = { }; static void -refresh_token_fetch_oauth2 (grpc_credentials_metadata_request * metadata_req, grpc_httpcli_context * httpcli_context, grpc_pollset * pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline, grpc_closure_list * closure_list) +refresh_token_fetch_oauth2 (grpc_exec_ctx * exec_ctx, grpc_credentials_metadata_request * metadata_req, grpc_httpcli_context * httpcli_context, grpc_pollset * pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline) { grpc_google_refresh_token_credentials *c = (grpc_google_refresh_token_credentials *) metadata_req->creds; grpc_httpcli_header header = { "Content-Type", @@ -816,7 +816,7 @@ on_simulated_token_fetch_done (void *user_data) } static void -md_only_test_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +md_only_test_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *) creds; @@ -874,7 +874,7 @@ access_token_has_request_metadata_only (const grpc_credentials * creds) } static void -access_token_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +access_token_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { grpc_access_token_credentials *c = (grpc_access_token_credentials *) creds; cb (user_data, c->access_token_md->entries, 1, GRPC_CREDENTIALS_OK, closure_list); @@ -1042,7 +1042,7 @@ composite_md_context_destroy (grpc_composite_credentials_metadata_context * ctx) } static void -composite_metadata_cb (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +composite_metadata_cb (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { grpc_composite_credentials_metadata_context *ctx = (grpc_composite_credentials_metadata_context *) user_data; if (status != GRPC_CREDENTIALS_OK) @@ -1079,7 +1079,7 @@ composite_metadata_cb (void *user_data, grpc_credentials_md * md_elems, size_t n } static void -composite_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +composite_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { grpc_composite_credentials *c = (grpc_composite_credentials *) creds; grpc_composite_credentials_metadata_context *ctx; @@ -1259,7 +1259,7 @@ iam_has_request_metadata_only (const grpc_credentials * creds) } static void -iam_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +iam_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { grpc_google_iam_credentials *c = (grpc_google_iam_credentials *) creds; cb (user_data, c->iam_md->entries, c->iam_md->num_entries, GRPC_CREDENTIALS_OK, closure_list); @@ -1360,7 +1360,7 @@ plugin_md_request_metadata_ready (void *request, const grpc_metadata * md, size_ } static void -plugin_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list) +plugin_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { grpc_plugin_credentials *c = (grpc_plugin_credentials *) creds; if (c->plugin.get_metadata != NULL) diff --git a/src/core/security/credentials.h b/src/core/security/credentials.h index 2de67e40c8b..c10c9db6263 100644 --- a/src/core/security/credentials.h +++ b/src/core/security/credentials.h @@ -122,14 +122,14 @@ grpc_server_credentials *grpc_fake_transport_security_server_credentials_create /* It is the caller's responsibility to gpr_free the result if not NULL. */ char *grpc_get_well_known_google_credentials_file_path (void); -typedef void (*grpc_credentials_metadata_cb) (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list); +typedef void (*grpc_credentials_metadata_cb) (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status); typedef struct { void (*destruct) (grpc_credentials * c); int (*has_request_metadata) (const grpc_credentials * c); int (*has_request_metadata_only) (const grpc_credentials * c); - void (*get_request_metadata) (grpc_credentials * c, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list); + void (*get_request_metadata) (grpc_exec_ctx * exec_ctx, grpc_credentials * c, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data); grpc_security_status (*create_security_connector) (grpc_credentials * c, const char *target, const grpc_channel_args * args, grpc_credentials * request_metadata_creds, grpc_channel_security_connector ** sc, grpc_channel_args ** new_args); } grpc_credentials_vtable; @@ -144,7 +144,7 @@ grpc_credentials *grpc_credentials_ref (grpc_credentials * creds); void grpc_credentials_unref (grpc_credentials * creds); int grpc_credentials_has_request_metadata (grpc_credentials * creds); int grpc_credentials_has_request_metadata_only (grpc_credentials * creds); -void grpc_credentials_get_request_metadata (grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data, grpc_closure_list * closure_list); +void grpc_credentials_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data); /* 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 @@ -246,7 +246,7 @@ typedef struct typedef struct grpc_credentials_metadata_request grpc_credentials_metadata_request; -typedef void (*grpc_fetch_oauth2_func) (grpc_credentials_metadata_request * req, grpc_httpcli_context * http_context, grpc_pollset * pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline, grpc_closure_list * closure_list); +typedef void (*grpc_fetch_oauth2_func) (grpc_exec_ctx * exec_ctx, grpc_credentials_metadata_request * req, grpc_httpcli_context * http_context, grpc_pollset * pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline); typedef struct { diff --git a/src/core/security/google_default_credentials.c b/src/core/security/google_default_credentials.c index 308f9a39f64..527f7ea999b 100644 --- a/src/core/security/google_default_credentials.c +++ b/src/core/security/google_default_credentials.c @@ -68,7 +68,7 @@ typedef struct } compute_engine_detector; static void -on_compute_engine_detection_http_response (void *user_data, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +on_compute_engine_detection_http_response (grpc_exec_ctx * exec_ctx, void *user_data, const grpc_httpcli_response * response) { compute_engine_detector *detector = (compute_engine_detector *) user_data; if (response != NULL && response->status == 200 && response->hdr_count > 0) @@ -93,7 +93,7 @@ on_compute_engine_detection_http_response (void *user_data, const grpc_httpcli_r } static void -destroy_pollset (void *p, int s, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int s) { grpc_pollset_destroy (p); } diff --git a/src/core/security/handshake.c b/src/core/security/handshake.c index 85f84ac963e..7951f34943b 100644 --- a/src/core/security/handshake.c +++ b/src/core/security/handshake.c @@ -59,12 +59,12 @@ typedef struct grpc_closure on_handshake_data_received_from_peer; } grpc_security_handshake; -static void on_handshake_data_received_from_peer (void *setup, int success, grpc_closure_list * closure_list); +static void on_handshake_data_received_from_peer (grpc_exec_ctx * exec_ctx, void *setup, int success); -static void on_handshake_data_sent_to_peer (void *setup, int success, grpc_closure_list * closure_list); +static void on_handshake_data_sent_to_peer (grpc_exec_ctx * exec_ctx, void *setup, int success); static void -security_handshake_done (grpc_security_handshake * h, int is_success, grpc_closure_list * closure_list) +security_handshake_done (grpc_exec_ctx * exec_ctx, grpc_security_handshake * h, int is_success) { if (is_success) { @@ -95,7 +95,7 @@ security_handshake_done (grpc_security_handshake * h, int is_success, grpc_closu } static void -on_peer_checked (void *user_data, grpc_security_status status, grpc_closure_list * closure_list) +on_peer_checked (grpc_exec_ctx * exec_ctx, void *user_data, grpc_security_status status) { grpc_security_handshake *h = user_data; tsi_frame_protector *protector; @@ -121,7 +121,7 @@ on_peer_checked (void *user_data, grpc_security_status status, grpc_closure_list } static void -check_peer (grpc_security_handshake * h, grpc_closure_list * closure_list) +check_peer (grpc_exec_ctx * exec_ctx, grpc_security_handshake * h) { grpc_security_status peer_status; tsi_peer peer; @@ -147,7 +147,7 @@ check_peer (grpc_security_handshake * h, grpc_closure_list * closure_list) } static void -send_handshake_bytes_to_peer (grpc_security_handshake * h, grpc_closure_list * closure_list) +send_handshake_bytes_to_peer (grpc_exec_ctx * exec_ctx, grpc_security_handshake * h) { size_t offset = 0; tsi_result result = TSI_OK; @@ -182,7 +182,7 @@ send_handshake_bytes_to_peer (grpc_security_handshake * h, grpc_closure_list * c } static void -on_handshake_data_received_from_peer (void *handshake, int success, grpc_closure_list * closure_list) +on_handshake_data_received_from_peer (grpc_exec_ctx * exec_ctx, void *handshake, int success) { grpc_security_handshake *h = handshake; size_t consumed_slice_size = 0; @@ -249,7 +249,7 @@ on_handshake_data_received_from_peer (void *handshake, int success, grpc_closure /* If handshake is NULL, the handshake is done. */ static void -on_handshake_data_sent_to_peer (void *handshake, int success, grpc_closure_list * closure_list) +on_handshake_data_sent_to_peer (grpc_exec_ctx * exec_ctx, void *handshake, int success) { grpc_security_handshake *h = handshake; @@ -276,7 +276,7 @@ on_handshake_data_sent_to_peer (void *handshake, int success, grpc_closure_list } void -grpc_do_security_handshake (tsi_handshaker * handshaker, grpc_security_connector * connector, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list) +grpc_do_security_handshake (grpc_exec_ctx * exec_ctx, tsi_handshaker * handshaker, grpc_security_connector * connector, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) { grpc_security_handshake *h = gpr_malloc (sizeof (grpc_security_handshake)); memset (h, 0, sizeof (grpc_security_handshake)); diff --git a/src/core/security/handshake.h b/src/core/security/handshake.h index 4d518e7edf1..84798e96ecc 100644 --- a/src/core/security/handshake.h +++ b/src/core/security/handshake.h @@ -38,6 +38,6 @@ #include "src/core/security/security_connector.h" /* Calls the callback upon completion. Takes owership of handshaker. */ -void grpc_do_security_handshake (tsi_handshaker * handshaker, grpc_security_connector * connector, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list); +void grpc_do_security_handshake (grpc_exec_ctx * exec_ctx, tsi_handshaker * handshaker, grpc_security_connector * connector, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data); #endif /* GRPC_INTERNAL_CORE_SECURITY_HANDSHAKE_H */ diff --git a/src/core/security/jwt_verifier.c b/src/core/security/jwt_verifier.c index f7c9c7f4d1f..dcc751f143a 100644 --- a/src/core/security/jwt_verifier.c +++ b/src/core/security/jwt_verifier.c @@ -692,7 +692,7 @@ end: } static void -on_keys_retrieved (void *user_data, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +on_keys_retrieved (grpc_exec_ctx * exec_ctx, void *user_data, const grpc_httpcli_response * response) { grpc_json *json = json_from_http (response); verifier_cb_ctx *ctx = (verifier_cb_ctx *) user_data; @@ -737,7 +737,7 @@ end: } static void -on_openid_config_retrieved (void *user_data, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +on_openid_config_retrieved (grpc_exec_ctx * exec_ctx, void *user_data, const grpc_httpcli_response * response) { const grpc_json *cur; grpc_json *json = json_from_http (response); @@ -821,7 +821,7 @@ verifier_put_mapping (grpc_jwt_verifier * v, const char *email_domain, const cha /* Takes ownership of ctx. */ static void -retrieve_key_and_verify (verifier_cb_ctx * ctx, grpc_closure_list * closure_list) +retrieve_key_and_verify (grpc_exec_ctx * exec_ctx, verifier_cb_ctx * ctx) { const char *at_sign; grpc_httpcli_response_cb http_cb; @@ -904,7 +904,7 @@ error: } void -grpc_jwt_verifier_verify (grpc_jwt_verifier * verifier, grpc_pollset * pollset, const char *jwt, const char *audience, grpc_jwt_verification_done_cb cb, void *user_data, grpc_closure_list * closure_list) +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, void *user_data) { const char *dot = NULL; grpc_json *json; diff --git a/src/core/security/jwt_verifier.h b/src/core/security/jwt_verifier.h index 4a1748898eb..5fc99aafe09 100644 --- a/src/core/security/jwt_verifier.h +++ b/src/core/security/jwt_verifier.h @@ -118,7 +118,7 @@ void grpc_jwt_verifier_destroy (grpc_jwt_verifier * verifier); 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_jwt_verifier * verifier, grpc_pollset * pollset, const char *jwt, const char *audience, grpc_jwt_verification_done_cb cb, void *user_data, grpc_closure_list * closure_list); +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, void *user_data); /* --- TESTING ONLY exposed functions. --- */ diff --git a/src/core/security/secure_endpoint.c b/src/core/security/secure_endpoint.c index 64c501860ff..966dfbb6664 100644 --- a/src/core/security/secure_endpoint.c +++ b/src/core/security/secure_endpoint.c @@ -69,7 +69,7 @@ typedef struct int grpc_trace_secure_endpoint = 0; static void -destroy (secure_endpoint * secure_ep, grpc_closure_list * closure_list) +destroy (grpc_exec_ctx * exec_ctx, secure_endpoint * secure_ep) { secure_endpoint *ep = secure_ep; grpc_endpoint_destroy (ep->wrapped_ep, closure_list); @@ -109,7 +109,7 @@ secure_endpoint_ref (secure_endpoint * ep, const char *reason, const char *file, #define SECURE_ENDPOINT_UNREF(ep, reason, cl) secure_endpoint_unref((ep), (cl)) #define SECURE_ENDPOINT_REF(ep, reason) secure_endpoint_ref((ep)) static void -secure_endpoint_unref (secure_endpoint * ep, grpc_closure_list * closure_list) +secure_endpoint_unref (grpc_exec_ctx * exec_ctx, secure_endpoint * ep) { if (gpr_unref (&ep->ref)) { @@ -134,7 +134,7 @@ flush_read_staging_buffer (secure_endpoint * ep, gpr_uint8 ** cur, gpr_uint8 ** } static void -call_read_cb (secure_endpoint * ep, int success, grpc_closure_list * closure_list) +call_read_cb (grpc_exec_ctx * exec_ctx, secure_endpoint * ep, int success) { if (grpc_trace_secure_endpoint) { @@ -153,7 +153,7 @@ call_read_cb (secure_endpoint * ep, int success, grpc_closure_list * closure_lis } static void -on_read (void *user_data, int success, grpc_closure_list * closure_list) +on_read (grpc_exec_ctx * exec_ctx, void *user_data, int success) { unsigned i; gpr_uint8 keep_looping = 0; @@ -234,7 +234,7 @@ on_read (void *user_data, int success, grpc_closure_list * closure_list) } static void -endpoint_read (grpc_endpoint * secure_ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list) +endpoint_read (grpc_exec_ctx * exec_ctx, grpc_endpoint * secure_ep, gpr_slice_buffer * slices, grpc_closure * cb) { secure_endpoint *ep = (secure_endpoint *) secure_ep; ep->read_cb = cb; @@ -263,7 +263,7 @@ flush_write_staging_buffer (secure_endpoint * ep, gpr_uint8 ** cur, gpr_uint8 ** } static void -endpoint_write (grpc_endpoint * secure_ep, gpr_slice_buffer * slices, grpc_closure * cb, grpc_closure_list * closure_list) +endpoint_write (grpc_exec_ctx * exec_ctx, grpc_endpoint * secure_ep, gpr_slice_buffer * slices, grpc_closure * cb) { unsigned i; tsi_result result = TSI_OK; @@ -348,28 +348,28 @@ endpoint_write (grpc_endpoint * secure_ep, gpr_slice_buffer * slices, grpc_closu } static void -endpoint_shutdown (grpc_endpoint * secure_ep, grpc_closure_list * closure_list) +endpoint_shutdown (grpc_exec_ctx * exec_ctx, grpc_endpoint * secure_ep) { secure_endpoint *ep = (secure_endpoint *) secure_ep; grpc_endpoint_shutdown (ep->wrapped_ep, closure_list); } static void -endpoint_destroy (grpc_endpoint * secure_ep, grpc_closure_list * closure_list) +endpoint_destroy (grpc_exec_ctx * exec_ctx, grpc_endpoint * secure_ep) { secure_endpoint *ep = (secure_endpoint *) secure_ep; SECURE_ENDPOINT_UNREF (ep, "destroy", closure_list); } static void -endpoint_add_to_pollset (grpc_endpoint * secure_ep, grpc_pollset * pollset, grpc_closure_list * closure_list) +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, closure_list); } static void -endpoint_add_to_pollset_set (grpc_endpoint * secure_ep, grpc_pollset_set * pollset_set, grpc_closure_list * closure_list) +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, closure_list); diff --git a/src/core/security/security_connector.c b/src/core/security/security_connector.c index 694004e4e0a..91462c52cdf 100644 --- a/src/core/security/security_connector.c +++ b/src/core/security/security_connector.c @@ -110,7 +110,7 @@ tsi_peer_get_property_by_name (const tsi_peer * peer, const char *name) } void -grpc_security_connector_do_handshake (grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list) +grpc_security_connector_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) { if (sc == NULL || nonsecure_endpoint == NULL) { @@ -134,7 +134,7 @@ grpc_security_connector_check_peer (grpc_security_connector * sc, tsi_peer peer, } grpc_security_status -grpc_channel_security_connector_check_call_host (grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data, grpc_closure_list * closure_list) +grpc_channel_security_connector_check_call_host (grpc_exec_ctx * exec_ctx, grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data) { if (sc == NULL || sc->check_call_host == NULL) return GRPC_SECURITY_ERROR; @@ -298,7 +298,7 @@ end: } static grpc_security_status -fake_channel_check_call_host (grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data, grpc_closure_list * closure_list) +fake_channel_check_call_host (grpc_exec_ctx * exec_ctx, grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data) { grpc_fake_channel_security_connector *c = (grpc_fake_channel_security_connector *) sc; if (c->call_host_check_is_async) @@ -313,13 +313,13 @@ fake_channel_check_call_host (grpc_channel_security_connector * sc, const char * } static void -fake_channel_do_handshake (grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list) +fake_channel_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) { grpc_do_security_handshake (tsi_create_fake_handshaker (1), sc, nonsecure_endpoint, cb, user_data, closure_list); } static void -fake_server_do_handshake (grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list) +fake_server_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) { grpc_do_security_handshake (tsi_create_fake_handshaker (0), sc, nonsecure_endpoint, cb, user_data, closure_list); } @@ -423,7 +423,7 @@ ssl_create_handshaker (tsi_ssl_handshaker_factory * handshaker_factory, int is_c } static void -ssl_channel_do_handshake (grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list) +ssl_channel_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) { grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *) sc; tsi_handshaker *handshaker; @@ -441,7 +441,7 @@ ssl_channel_do_handshake (grpc_security_connector * sc, grpc_endpoint * nonsecur } static void -ssl_server_do_handshake (grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list) +ssl_server_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) { grpc_ssl_server_security_connector *c = (grpc_ssl_server_security_connector *) sc; tsi_handshaker *handshaker; @@ -564,7 +564,7 @@ ssl_server_check_peer (grpc_security_connector * sc, tsi_peer peer, grpc_securit } static grpc_security_status -ssl_channel_check_call_host (grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data, grpc_closure_list * closure_list) +ssl_channel_check_call_host (grpc_exec_ctx * exec_ctx, grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data) { grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *) sc; diff --git a/src/core/security/security_connector.h b/src/core/security/security_connector.h index 913e01978df..3af7f6f83ab 100644 --- a/src/core/security/security_connector.h +++ b/src/core/security/security_connector.h @@ -61,15 +61,15 @@ typedef struct grpc_security_connector grpc_security_connector; #define GRPC_SECURITY_CONNECTOR_ARG "grpc.security_connector" -typedef void (*grpc_security_check_cb) (void *user_data, grpc_security_status status, grpc_closure_list * closure_list); +typedef void (*grpc_security_check_cb) (grpc_exec_ctx * exec_ctx, void *user_data, grpc_security_status status); /* Ownership of the secure_endpoint is transfered. */ -typedef void (*grpc_security_handshake_done_cb) (void *user_data, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint, grpc_closure_list * closure_list); +typedef void (*grpc_security_handshake_done_cb) (grpc_exec_ctx * exec_ctx, void *user_data, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint); typedef struct { void (*destroy) (grpc_security_connector * sc); - void (*do_handshake) (grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list); + void (*do_handshake) (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data); grpc_security_status (*check_peer) (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data); } grpc_security_connector_vtable; @@ -98,7 +98,7 @@ void grpc_security_connector_unref (grpc_security_connector * policy); #endif /* Handshake. */ -void grpc_security_connector_do_handshake (grpc_security_connector * connector, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data, grpc_closure_list * closure_list); +void grpc_security_connector_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * connector, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data); /* Check the peer. Implementations can choose to check the peer either synchronously or @@ -129,7 +129,7 @@ struct grpc_channel_security_connector { grpc_security_connector base; /* requires is_client_side to be non 0. */ grpc_credentials *request_metadata_creds; - grpc_security_status (*check_call_host) (grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data, grpc_closure_list * closure_list); + grpc_security_status (*check_call_host) (grpc_exec_ctx * exec_ctx, grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data); }; /* Checks that the host that will be set for a call is acceptable. @@ -137,7 +137,7 @@ struct grpc_channel_security_connector asynchronously. In the first case, a successful call will return GRPC_SECURITY_OK. In the asynchronous case, the call will return GRPC_SECURITY_PENDING unless an error is detected early on. */ -grpc_security_status grpc_channel_security_connector_check_call_host (grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data, grpc_closure_list * closure_list); +grpc_security_status grpc_channel_security_connector_check_call_host (grpc_exec_ctx * exec_ctx, grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data); /* --- Creation security connectors. --- */ diff --git a/src/core/security/server_auth_filter.c b/src/core/security/server_auth_filter.c index 66316f788ef..86a5f9cb3e3 100644 --- a/src/core/security/server_auth_filter.c +++ b/src/core/security/server_auth_filter.c @@ -151,7 +151,7 @@ on_md_processing_done (void *user_data, const grpc_metadata * consumed_md, size_ } static void -auth_on_recv (void *user_data, int success, grpc_closure_list * closure_list) +auth_on_recv (grpc_exec_ctx * exec_ctx, void *user_data, int success) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; @@ -199,7 +199,7 @@ set_recv_ops_md_callbacks (grpc_call_element * elem, grpc_transport_stream_op * op contains type and call direction information, in addition to the data that is being sent or received. */ static void -auth_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +auth_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { set_recv_ops_md_callbacks (elem, op); grpc_call_next_op (elem, op, closure_list); @@ -207,7 +207,7 @@ auth_start_transport_op (grpc_call_element * elem, grpc_transport_stream_op * op /* Constructor for call_data */ static void -init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; @@ -239,13 +239,13 @@ init_call_elem (grpc_call_element * elem, const void *server_transport_data, grp /* Destructor for call_data */ static void -destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { } /* Constructor for channel_data */ static void -init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last) { grpc_security_connector *sc = grpc_find_security_connector_in_args (args); grpc_auth_metadata_processor *processor = grpc_find_auth_metadata_processor_in_args (args); @@ -269,7 +269,7 @@ init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grp /* Destructor for channel data */ static void -destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) { /* grab pointers to our data from the channel element */ channel_data *chand = elem->channel_data; diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index 42c4b63868c..b11cf1079a8 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -93,7 +93,7 @@ state_unref (grpc_server_secure_state * state) } static void -setup_transport (void *statep, grpc_transport * transport, grpc_mdctx * mdctx, grpc_closure_list * closure_list) +setup_transport (grpc_exec_ctx * exec_ctx, void *statep, grpc_transport * transport, grpc_mdctx * mdctx) { static grpc_channel_filter const *extra_filters[] = { &grpc_server_auth_filter, &grpc_http_server_filter @@ -134,7 +134,7 @@ remove_tcp_from_list_locked (grpc_server_secure_state * state, grpc_endpoint * t } static void -on_secure_handshake_done (void *statep, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint, grpc_closure_list * closure_list) +on_secure_handshake_done (grpc_exec_ctx * exec_ctx, void *statep, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint) { grpc_server_secure_state *state = statep; grpc_transport *transport; @@ -169,7 +169,7 @@ on_secure_handshake_done (void *statep, grpc_security_status status, grpc_endpoi } static void -on_accept (void *statep, grpc_endpoint * tcp, grpc_closure_list * closure_list) +on_accept (grpc_exec_ctx * exec_ctx, void *statep, grpc_endpoint * tcp) { grpc_server_secure_state *state = statep; tcp_endpoint_list *node; @@ -185,14 +185,14 @@ on_accept (void *statep, grpc_endpoint * tcp, grpc_closure_list * closure_list) /* Server callback: start listening on our ports */ static void -start (grpc_server * server, void *statep, grpc_pollset ** pollsets, size_t pollset_count, grpc_closure_list * closure_list) +start (grpc_exec_ctx * exec_ctx, grpc_server * server, void *statep, grpc_pollset ** pollsets, size_t pollset_count) { grpc_server_secure_state *state = statep; grpc_tcp_server_start (state->tcp, pollsets, pollset_count, on_accept, state, closure_list); } static void -destroy_done (void *statep, int success, grpc_closure_list * closure_list) +destroy_done (grpc_exec_ctx * exec_ctx, void *statep, int success) { grpc_server_secure_state *state = statep; state->destroy_callback->cb (state->destroy_callback->cb_arg, success, closure_list); @@ -209,7 +209,7 @@ destroy_done (void *statep, int success, grpc_closure_list * closure_list) /* Server callback: destroy the tcp listener (so we don't generate further callbacks) */ static void -destroy (grpc_server * server, void *statep, grpc_closure * callback, grpc_closure_list * closure_list) +destroy (grpc_exec_ctx * exec_ctx, grpc_server * server, void *statep, grpc_closure * callback) { grpc_server_secure_state *state = statep; grpc_tcp_server *tcp; diff --git a/src/core/surface/call.c b/src/core/surface/call.c index 5a76245a655..5360abdfa93 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -283,18 +283,18 @@ struct grpc_call #define CALL_FROM_TOP_ELEM(top_elem) \ CALL_FROM_CALL_STACK(grpc_call_stack_from_top_element(top_elem)) -static void set_deadline_alarm (grpc_call * call, gpr_timespec deadline, grpc_closure_list * closure_list); -static void call_on_done_recv (void *call, int success, grpc_closure_list * closure_list); -static void call_on_done_send (void *call, int success, grpc_closure_list * closure_list); +static void set_deadline_alarm (grpc_exec_ctx * exec_ctx, grpc_call * call, gpr_timespec deadline); +static void call_on_done_recv (grpc_exec_ctx * exec_ctx, void *call, int success); +static void call_on_done_send (grpc_exec_ctx * exec_ctx, void *call, int success); static int fill_send_ops (grpc_call * call, grpc_transport_stream_op * op); -static void execute_op (grpc_call * call, grpc_transport_stream_op * op, grpc_closure_list * closure_list); -static void recv_metadata (grpc_call * call, grpc_metadata_batch * metadata, grpc_closure_list * closure_list); +static void execute_op (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_transport_stream_op * op); +static void recv_metadata (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_metadata_batch * metadata); static void finish_read_ops (grpc_call * call); static grpc_call_error cancel_with_status (grpc_call * c, grpc_status_code status, const char *description); -static void finished_loose_op (void *call, int success, grpc_closure_list * closure_list); +static void finished_loose_op (grpc_exec_ctx * exec_ctx, void *call, int success); static void lock (grpc_call * call); -static void unlock (grpc_call * call, grpc_closure_list * closure_list); +static void unlock (grpc_exec_ctx * exec_ctx, grpc_call * call); grpc_call * grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 propagation_mask, grpc_completion_queue * cq, const void *server_transport_data, grpc_mdelem ** add_initial_metadata, size_t add_initial_metadata_count, gpr_timespec send_deadline) @@ -409,7 +409,7 @@ grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 pr } void -grpc_call_set_completion_queue (grpc_call * call, grpc_completion_queue * cq, grpc_closure_list * closure_list) +grpc_call_set_completion_queue (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_completion_queue * cq) { lock (call); call->cq = cq; @@ -446,7 +446,7 @@ allocate_completion (grpc_call * call) } static void -done_completion (void *call, grpc_cq_completion * completion, grpc_closure_list * closure_list) +done_completion (grpc_exec_ctx * exec_ctx, void *call, grpc_cq_completion * completion) { grpc_call *c = call; gpr_mu_lock (&c->completion_mu); @@ -469,7 +469,7 @@ grpc_call_internal_ref (grpc_call * c) } static void -destroy_call (grpc_call * call, grpc_closure_list * closure_list) +destroy_call (grpc_exec_ctx * exec_ctx, grpc_call * call) { size_t i; grpc_call *c = call; @@ -517,12 +517,12 @@ destroy_call (grpc_call * call, grpc_closure_list * closure_list) #ifdef GRPC_CALL_REF_COUNT_DEBUG void -grpc_call_internal_unref (grpc_call * c, const char *reason, grpc_closure_list * closure_list) +grpc_call_internal_unref (grpc_exec_ctx * exec_ctx, grpc_call * c, const char *reason) { gpr_log (GPR_DEBUG, "CALL: unref %p %d -> %d [%s]", c, c->internal_refcount.count, c->internal_refcount.count - 1, reason); #else void -grpc_call_internal_unref (grpc_call * c, grpc_closure_list * closure_list) +grpc_call_internal_unref (grpc_exec_ctx * exec_ctx, grpc_call * c) { #endif if (gpr_unref (&c->internal_refcount)) @@ -638,7 +638,7 @@ need_more_data (grpc_call * call) } static void -unlock (grpc_call * call, grpc_closure_list * closure_list) +unlock (grpc_exec_ctx * exec_ctx, grpc_call * call) { grpc_transport_stream_op op; completed_request completed_requests[GRPC_IOREQ_OP_COUNT]; @@ -889,7 +889,7 @@ early_out_write_ops (grpc_call * call) } static void -call_on_done_send (void *pc, int success, grpc_closure_list * closure_list) +call_on_done_send (grpc_exec_ctx * exec_ctx, void *pc, int success) { grpc_call *call = pc; lock (call); @@ -1036,7 +1036,7 @@ add_slice_to_message (grpc_call * call, gpr_slice slice) } static void -call_on_done_recv (void *pc, int success, grpc_closure_list * closure_list) +call_on_done_recv (grpc_exec_ctx * exec_ctx, void *pc, int success) { grpc_call *call = pc; grpc_call *child_call; @@ -1381,7 +1381,7 @@ start_ioreq (grpc_call * call, const grpc_ioreq * reqs, size_t nreqs, grpc_ioreq } grpc_call_error -grpc_call_start_ioreq_and_call_back (grpc_call * call, const grpc_ioreq * reqs, size_t nreqs, grpc_ioreq_completion_func on_complete, void *user_data, grpc_closure_list * closure_list) +grpc_call_start_ioreq_and_call_back (grpc_exec_ctx * exec_ctx, grpc_call * call, const grpc_ioreq * reqs, size_t nreqs, grpc_ioreq_completion_func on_complete, void *user_data) { grpc_call_error err; lock (call); @@ -1465,7 +1465,7 @@ cancel_with_status (grpc_call * c, grpc_status_code status, const char *descript } static void -finished_loose_op (void *call, int success_ignored, grpc_closure_list * closure_list) +finished_loose_op (grpc_exec_ctx * exec_ctx, void *call, int success_ignored) { GRPC_CALL_INTERNAL_UNREF (call, "loose-op", closure_list); } @@ -1477,7 +1477,7 @@ typedef struct } finished_loose_op_allocated_args; static void -finished_loose_op_allocated (void *alloc, int success, grpc_closure_list * closure_list) +finished_loose_op_allocated (grpc_exec_ctx * exec_ctx, void *alloc, int success) { finished_loose_op_allocated_args *args = alloc; finished_loose_op (args->call, success, closure_list); @@ -1485,7 +1485,7 @@ finished_loose_op_allocated (void *alloc, int success, grpc_closure_list * closu } static void -execute_op (grpc_call * call, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +execute_op (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_transport_stream_op * op) { grpc_call_element *elem; @@ -1528,7 +1528,7 @@ grpc_call_from_top_element (grpc_call_element * elem) } static void -call_alarm (void *arg, int success, grpc_closure_list * closure_list) +call_alarm (grpc_exec_ctx * exec_ctx, void *arg, int success) { grpc_call *call = arg; lock (call); @@ -1543,7 +1543,7 @@ call_alarm (void *arg, int success, grpc_closure_list * closure_list) } static void -set_deadline_alarm (grpc_call * call, gpr_timespec deadline, grpc_closure_list * closure_list) +set_deadline_alarm (grpc_exec_ctx * exec_ctx, grpc_call * call, gpr_timespec deadline) { if (call->have_alarm) { @@ -1617,7 +1617,7 @@ decode_compression (grpc_mdelem * md) } static void -recv_metadata (grpc_call * call, grpc_metadata_batch * md, grpc_closure_list * closure_list) +recv_metadata (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_metadata_batch * md) { grpc_linked_mdelem *l; grpc_metadata_array *dest; @@ -1712,13 +1712,13 @@ set_cancelled_value (grpc_status_code status, void *dest) } static void -finish_batch (grpc_call * call, int success, void *tag, grpc_closure_list * closure_list) +finish_batch (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *tag) { grpc_cq_end_op (call->cq, tag, success, done_completion, call, allocate_completion (call), closure_list); } static void -finish_batch_with_close (grpc_call * call, int success, void *tag, grpc_closure_list * closure_list) +finish_batch_with_close (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *tag) { grpc_cq_end_op (call->cq, tag, 1, done_completion, call, allocate_completion (call), closure_list); } diff --git a/src/core/surface/call.h b/src/core/surface/call.h index a859fbf2182..29a3e113547 100644 --- a/src/core/surface/call.h +++ b/src/core/surface/call.h @@ -95,29 +95,29 @@ extern "C" grpc_ioreq_data data; } grpc_ioreq; - typedef void (*grpc_ioreq_completion_func) (grpc_call * call, int success, void *user_data, grpc_closure_list * closure_list); + typedef void (*grpc_ioreq_completion_func) (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *user_data); grpc_call *grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 propagation_mask, grpc_completion_queue * cq, const void *server_transport_data, grpc_mdelem ** add_initial_metadata, size_t add_initial_metadata_count, gpr_timespec send_deadline); - void grpc_call_set_completion_queue (grpc_call * call, grpc_completion_queue * cq, grpc_closure_list * closure_list); + void grpc_call_set_completion_queue (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_completion_queue * cq); grpc_completion_queue *grpc_call_get_completion_queue (grpc_call * call); #ifdef GRPC_CALL_REF_COUNT_DEBUG void grpc_call_internal_ref (grpc_call * call, const char *reason); - void grpc_call_internal_unref (grpc_call * call, const char *reason, grpc_closure_list * closure_list); + 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, closure_list) \ grpc_call_internal_unref(call, reason, closure_list) #else void grpc_call_internal_ref (grpc_call * call); - void grpc_call_internal_unref (grpc_call * call, grpc_closure_list * closure_list); + 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, closure_list) \ grpc_call_internal_unref(call, closure_list) #endif - grpc_call_error grpc_call_start_ioreq_and_call_back (grpc_call * call, const grpc_ioreq * reqs, size_t nreqs, grpc_ioreq_completion_func on_complete, void *user_data, grpc_closure_list * closure_list); + grpc_call_error grpc_call_start_ioreq_and_call_back (grpc_exec_ctx * exec_ctx, grpc_call * call, const grpc_ioreq * reqs, size_t nreqs, grpc_ioreq_completion_func on_complete, void *user_data); grpc_call_stack *grpc_call_get_call_stack (grpc_call * call); diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index 440b6494f1e..82a463dd751 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -92,7 +92,7 @@ struct grpc_channel #define DEFAULT_MAX_MESSAGE_LENGTH (100 * 1024 * 1024) grpc_channel * -grpc_channel_create_from_filters (const char *target, const grpc_channel_filter ** filters, size_t num_filters, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_client, grpc_closure_list * closure_list) +grpc_channel_create_from_filters (grpc_exec_ctx * exec_ctx, const char *target, const grpc_channel_filter ** filters, size_t num_filters, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_client) { size_t i; size_t size = sizeof (grpc_channel) + grpc_channel_stack_size (filters, num_filters); @@ -262,7 +262,7 @@ grpc_channel_internal_ref (grpc_channel * c) } static void -destroy_channel (grpc_channel * channel, grpc_closure_list * closure_list) +destroy_channel (grpc_exec_ctx * exec_ctx, grpc_channel * channel) { size_t i; grpc_channel_stack_destroy (CHANNEL_STACK_FROM_CHANNEL (channel), closure_list); @@ -299,12 +299,12 @@ destroy_channel (grpc_channel * channel, grpc_closure_list * closure_list) #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG void -grpc_channel_internal_unref (grpc_channel * channel, const char *reason, grpc_closure_list * closure_list) +grpc_channel_internal_unref (grpc_exec_ctx * exec_ctx, grpc_channel * channel, const char *reason) { gpr_log (GPR_DEBUG, "CHANNEL: unref %p %d -> %d [%s]", channel, channel->refs.count, channel->refs.count - 1, reason); #else void -grpc_channel_internal_unref (grpc_channel * channel, grpc_closure_list * closure_list) +grpc_channel_internal_unref (grpc_exec_ctx * exec_ctx, grpc_channel * channel) { #endif if (gpr_unref (&channel->refs)) diff --git a/src/core/surface/channel.h b/src/core/surface/channel.h index 91a038892ef..982986e9662 100644 --- a/src/core/surface/channel.h +++ b/src/core/surface/channel.h @@ -37,7 +37,7 @@ #include "src/core/channel/channel_stack.h" #include "src/core/client_config/subchannel_factory.h" -grpc_channel *grpc_channel_create_from_filters (const char *target, const grpc_channel_filter ** filters, size_t count, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_client, grpc_closure_list * closure_list); +grpc_channel *grpc_channel_create_from_filters (grpc_exec_ctx * exec_ctx, const char *target, const grpc_channel_filter ** filters, size_t count, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_client); /** Get a (borrowed) pointer to this channels underlying channel stack */ grpc_channel_stack *grpc_channel_get_channel_stack (grpc_channel * channel); @@ -58,14 +58,14 @@ gpr_uint32 grpc_channel_get_max_message_length (grpc_channel * channel); #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG void grpc_channel_internal_ref (grpc_channel * channel, const char *reason); -void grpc_channel_internal_unref (grpc_channel * channel, const char *reason, grpc_closure_list * closure_list); +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, closure_list) \ grpc_channel_internal_unref(channel, reason, closure_list) #else void grpc_channel_internal_ref (grpc_channel * channel); -void grpc_channel_internal_unref (grpc_channel * channel, grpc_closure_list * closure_list); +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, closure_list) \ diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index 0a7e8e38373..7c174aa47f7 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -81,7 +81,7 @@ typedef struct } state_watcher; static void -delete_state_watcher (state_watcher * w, grpc_closure_list * closure_list) +delete_state_watcher (grpc_exec_ctx * exec_ctx, state_watcher * w) { GRPC_CHANNEL_INTERNAL_UNREF (w->channel, "watch_connectivity", closure_list); gpr_mu_destroy (&w->mu); @@ -89,7 +89,7 @@ delete_state_watcher (state_watcher * w, grpc_closure_list * closure_list) } static void -finished_completion (void *pw, grpc_cq_completion * ignored, grpc_closure_list * closure_list) +finished_completion (grpc_exec_ctx * exec_ctx, void *pw, grpc_cq_completion * ignored) { int delete = 0; state_watcher *w = pw; @@ -117,7 +117,7 @@ finished_completion (void *pw, grpc_cq_completion * ignored, grpc_closure_list * } static void -partly_done (state_watcher * w, int due_to_completion, grpc_closure_list * closure_list) +partly_done (grpc_exec_ctx * exec_ctx, state_watcher * w, int due_to_completion) { int delete = 0; grpc_channel_element *client_channel_elem = NULL; @@ -165,13 +165,13 @@ partly_done (state_watcher * w, int due_to_completion, grpc_closure_list * closu } static void -watch_complete (void *pw, int success, grpc_closure_list * closure_list) +watch_complete (grpc_exec_ctx * exec_ctx, void *pw, int success) { partly_done (pw, 1, closure_list); } static void -timeout_complete (void *pw, int success, grpc_closure_list * closure_list) +timeout_complete (grpc_exec_ctx * exec_ctx, void *pw, int success) { partly_done (pw, 0, closure_list); } diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index c45ebf324ff..a8c9f1749fc 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -72,7 +72,7 @@ connector_ref (grpc_connector * con) } static void -connector_unref (grpc_connector * con, grpc_closure_list * closure_list) +connector_unref (grpc_exec_ctx * exec_ctx, grpc_connector * con) { connector *c = (connector *) con; if (gpr_unref (&c->refs)) @@ -83,7 +83,7 @@ connector_unref (grpc_connector * con, grpc_closure_list * closure_list) } static void -connected (void *arg, int success, grpc_closure_list * closure_list) +connected (grpc_exec_ctx * exec_ctx, void *arg, int success) { connector *c = arg; grpc_closure *notify; @@ -107,12 +107,12 @@ connected (void *arg, int success, grpc_closure_list * closure_list) } static void -connector_shutdown (grpc_connector * con, grpc_closure_list * closure_list) +connector_shutdown (grpc_exec_ctx * exec_ctx, grpc_connector * con) { } static void -connector_connect (grpc_connector * con, const grpc_connect_in_args * args, grpc_connect_out_args * result, grpc_closure * notify, grpc_closure_list * closure_list) +connector_connect (grpc_exec_ctx * exec_ctx, grpc_connector * con, const grpc_connect_in_args * args, grpc_connect_out_args * result, grpc_closure * notify) { connector *c = (connector *) con; GPR_ASSERT (c->notify == NULL); @@ -146,7 +146,7 @@ subchannel_factory_ref (grpc_subchannel_factory * scf) } static void -subchannel_factory_unref (grpc_subchannel_factory * scf, grpc_closure_list * closure_list) +subchannel_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * scf) { subchannel_factory *f = (subchannel_factory *) scf; if (gpr_unref (&f->refs)) @@ -159,7 +159,7 @@ subchannel_factory_unref (grpc_subchannel_factory * scf, grpc_closure_list * clo } static grpc_subchannel * -subchannel_factory_create_subchannel (grpc_subchannel_factory * scf, grpc_subchannel_args * args, grpc_closure_list * closure_list) +subchannel_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * scf, grpc_subchannel_args * args) { subchannel_factory *f = (subchannel_factory *) scf; connector *c = gpr_malloc (sizeof (*c)); diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index ab9a323c7a6..2410ad6fb5a 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -72,7 +72,7 @@ struct grpc_completion_queue grpc_closure pollset_destroy_done; }; -static void on_pollset_destroy_done (void *cc, int success, grpc_closure_list * closure_list); +static void on_pollset_destroy_done (grpc_exec_ctx * exec_ctx, void *cc, int success); grpc_completion_queue * grpc_completion_queue_create (void *reserved) @@ -105,7 +105,7 @@ grpc_cq_internal_ref (grpc_completion_queue * cc) } static void -on_pollset_destroy_done (void *arg, int success, grpc_closure_list * closure_list) +on_pollset_destroy_done (grpc_exec_ctx * exec_ctx, void *arg, int success) { grpc_completion_queue *cc = arg; GRPC_CQ_INTERNAL_UNREF (cc, "pollset_destroy"); @@ -144,7 +144,7 @@ grpc_cq_begin_op (grpc_completion_queue * cc) event, then enter shutdown mode */ /* Queue a GRPC_OP_COMPLETED operation */ void -grpc_cq_end_op (grpc_completion_queue * cc, void *tag, int success, void (*done) (void *done_arg, grpc_cq_completion * storage, grpc_closure_list * closure_list), void *done_arg, grpc_cq_completion * storage, grpc_closure_list * closure_list) +grpc_cq_end_op (grpc_completion_queue * cc, void *tag, int success, void (*done) (grpc_exec_ctx * exec_ctx, void *done_arg, grpc_cq_completion * storage, grpc_closure_list * closure_list), void *done_arg, grpc_cq_completion * storage) { int shutdown; int i; diff --git a/src/core/surface/completion_queue.h b/src/core/surface/completion_queue.h index 7ef4ed7c490..1f3f0d197b0 100644 --- a/src/core/surface/completion_queue.h +++ b/src/core/surface/completion_queue.h @@ -45,7 +45,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) (void *done_arg, struct grpc_cq_completion * c, grpc_closure_list * closure_list); + 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 */ gpr_uintptr next; @@ -70,7 +70,7 @@ void grpc_cq_internal_unref (grpc_completion_queue * cc); void grpc_cq_begin_op (grpc_completion_queue * cc); /* Queue a GRPC_OP_COMPLETED operation */ -void grpc_cq_end_op (grpc_completion_queue * cc, void *tag, int success, void (*done) (void *done_arg, grpc_cq_completion * storage, grpc_closure_list * closure_list), void *done_arg, grpc_cq_completion * storage, grpc_closure_list * closure_list); +void grpc_cq_end_op (grpc_completion_queue * cc, void *tag, int success, void (*done) (grpc_exec_ctx * exec_ctx, void *done_arg, grpc_cq_completion * storage, grpc_closure_list * closure_list), void *done_arg, grpc_cq_completion * storage); grpc_pollset *grpc_cq_pollset (grpc_completion_queue * cc); diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c index d8cf7db601c..be3a308f0fb 100644 --- a/src/core/surface/lame_client.c +++ b/src/core/surface/lame_client.c @@ -57,7 +57,7 @@ typedef struct } channel_data; static void -lame_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +lame_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -92,14 +92,14 @@ lame_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_ } static char * -lame_get_peer (grpc_call_element * elem, grpc_closure_list * closure_list) +lame_get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { channel_data *chand = elem->channel_data; return grpc_channel_get_target (chand->master); } static void -lame_start_transport_op (grpc_channel_element * elem, grpc_transport_op * op, grpc_closure_list * closure_list) +lame_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_transport_op * op) { if (op->on_connectivity_state_change) { @@ -114,7 +114,7 @@ lame_start_transport_op (grpc_channel_element * elem, grpc_transport_op * op, gr } static void -init_call_elem (grpc_call_element * elem, const void *transport_server_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *transport_server_data, grpc_transport_stream_op * initial_op) { if (initial_op) { @@ -123,12 +123,12 @@ init_call_elem (grpc_call_element * elem, const void *transport_server_data, grp } static void -destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { } static void -init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last, grpc_closure_list * closure_list) +init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last) { channel_data *chand = elem->channel_data; GPR_ASSERT (is_first); @@ -138,7 +138,7 @@ init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grp } static void -destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) { } diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 64a2d14a493..b65b03a002b 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -79,7 +79,7 @@ connector_ref (grpc_connector * con) } static void -connector_unref (grpc_connector * con, grpc_closure_list * closure_list) +connector_unref (grpc_exec_ctx * exec_ctx, grpc_connector * con) { connector *c = (connector *) con; if (gpr_unref (&c->refs)) @@ -90,7 +90,7 @@ connector_unref (grpc_connector * con, grpc_closure_list * closure_list) } static void -on_secure_handshake_done (void *arg, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint, grpc_closure_list * closure_list) +on_secure_handshake_done (grpc_exec_ctx * exec_ctx, void *arg, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint) { connector *c = arg; grpc_closure *notify; @@ -126,7 +126,7 @@ on_secure_handshake_done (void *arg, grpc_security_status status, grpc_endpoint } static void -connected (void *arg, int success, grpc_closure_list * closure_list) +connected (grpc_exec_ctx * exec_ctx, void *arg, int success) { connector *c = arg; grpc_closure *notify; @@ -149,7 +149,7 @@ connected (void *arg, int success, grpc_closure_list * closure_list) } static void -connector_shutdown (grpc_connector * con, grpc_closure_list * closure_list) +connector_shutdown (grpc_exec_ctx * exec_ctx, grpc_connector * con) { connector *c = (connector *) con; grpc_endpoint *ep; @@ -164,7 +164,7 @@ connector_shutdown (grpc_connector * con, grpc_closure_list * closure_list) } static void -connector_connect (grpc_connector * con, const grpc_connect_in_args * args, grpc_connect_out_args * result, grpc_closure * notify, grpc_closure_list * closure_list) +connector_connect (grpc_exec_ctx * exec_ctx, grpc_connector * con, const grpc_connect_in_args * args, grpc_connect_out_args * result, grpc_closure * notify) { connector *c = (connector *) con; GPR_ASSERT (c->notify == NULL); @@ -201,7 +201,7 @@ subchannel_factory_ref (grpc_subchannel_factory * scf) } static void -subchannel_factory_unref (grpc_subchannel_factory * scf, grpc_closure_list * closure_list) +subchannel_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * scf) { subchannel_factory *f = (subchannel_factory *) scf; if (gpr_unref (&f->refs)) @@ -215,7 +215,7 @@ subchannel_factory_unref (grpc_subchannel_factory * scf, grpc_closure_list * clo } static grpc_subchannel * -subchannel_factory_create_subchannel (grpc_subchannel_factory * scf, grpc_subchannel_args * args, grpc_closure_list * closure_list) +subchannel_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * scf, grpc_subchannel_args * args) { subchannel_factory *f = (subchannel_factory *) scf; connector *c = gpr_malloc (sizeof (*c)); diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 8df578d1923..793d485dfb6 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -57,8 +57,8 @@ typedef struct listener { void *arg; - void (*start) (grpc_server * server, void *arg, grpc_pollset ** pollsets, size_t pollset_count, grpc_closure_list * closure_list); - void (*destroy) (grpc_server * server, void *arg, grpc_closure * closure, grpc_closure_list * closure_list); + 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; @@ -240,11 +240,11 @@ struct grpc_server #define SERVER_FROM_CALL_ELEM(elem) \ (((channel_data *)(elem)->channel_data)->server) -static void begin_call (grpc_server * server, call_data * calld, requested_call * rc, grpc_closure_list * closure_list); -static void fail_call (grpc_server * server, requested_call * rc, grpc_closure_list * closure_list); +static void begin_call (grpc_exec_ctx * exec_ctx, grpc_server * server, call_data * calld, requested_call * rc); +static void fail_call (grpc_exec_ctx * exec_ctx, grpc_server * server, requested_call * rc); /* Before calling maybe_finish_shutdown, we must hold mu_global and not hold mu_call */ -static void maybe_finish_shutdown (grpc_server * server, grpc_closure_list * closure_list); +static void maybe_finish_shutdown (grpc_exec_ctx * exec_ctx, grpc_server * server); /* * channel broadcaster @@ -277,7 +277,7 @@ struct shutdown_cleanup_args }; static void -shutdown_cleanup (void *arg, int iomgr_status_ignored, grpc_closure_list * closure_list) +shutdown_cleanup (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_status_ignored) { struct shutdown_cleanup_args *a = arg; gpr_slice_unref (a->slice); @@ -285,7 +285,7 @@ shutdown_cleanup (void *arg, int iomgr_status_ignored, grpc_closure_list * closu } static void -send_shutdown (grpc_channel * channel, int send_goaway, int send_disconnect, grpc_closure_list * closure_list) +send_shutdown (grpc_exec_ctx * exec_ctx, grpc_channel * channel, int send_goaway, int send_disconnect) { grpc_transport_op op; struct shutdown_cleanup_args *sc; @@ -306,7 +306,7 @@ send_shutdown (grpc_channel * channel, int send_goaway, int send_disconnect, grp } static void -channel_broadcaster_shutdown (channel_broadcaster * cb, int send_goaway, int force_disconnect, grpc_closure_list * closure_list) +channel_broadcaster_shutdown (grpc_exec_ctx * exec_ctx, channel_broadcaster * cb, int send_goaway, int force_disconnect) { size_t i; @@ -337,13 +337,13 @@ request_matcher_destroy (request_matcher * request_matcher) } static void -kill_zombie (void *elem, int success, grpc_closure_list * closure_list) +kill_zombie (grpc_exec_ctx * exec_ctx, void *elem, int success) { grpc_call_destroy (grpc_call_from_top_element (elem)); } static void -request_matcher_zombify_all_pending_calls (request_matcher * request_matcher, grpc_closure_list * closure_list) +request_matcher_zombify_all_pending_calls (grpc_exec_ctx * exec_ctx, request_matcher * request_matcher) { while (request_matcher->pending_head) { @@ -358,7 +358,7 @@ request_matcher_zombify_all_pending_calls (request_matcher * request_matcher, gr } static void -request_matcher_kill_requests (grpc_server * server, request_matcher * rm, grpc_closure_list * closure_list) +request_matcher_kill_requests (grpc_exec_ctx * exec_ctx, grpc_server * server, request_matcher * rm) { int request_id; while ((request_id = gpr_stack_lockfree_pop (rm->requests)) != -1) @@ -378,7 +378,7 @@ server_ref (grpc_server * server) } static void -server_delete (grpc_server * server, grpc_closure_list * closure_list) +server_delete (grpc_exec_ctx * exec_ctx, grpc_server * server) { registered_method *rm; size_t i; @@ -408,7 +408,7 @@ server_delete (grpc_server * server, grpc_closure_list * closure_list) } static void -server_unref (grpc_server * server, grpc_closure_list * closure_list) +server_unref (grpc_exec_ctx * exec_ctx, grpc_server * server) { if (gpr_unref (&server->internal_refcount)) { @@ -431,7 +431,7 @@ orphan_channel (channel_data * chand) } static void -finish_destroy_channel (void *cd, int success, grpc_closure_list * closure_list) +finish_destroy_channel (grpc_exec_ctx * exec_ctx, void *cd, int success) { channel_data *chand = cd; grpc_server *server = chand->server; @@ -441,7 +441,7 @@ finish_destroy_channel (void *cd, int success, grpc_closure_list * closure_list) } static void -destroy_channel (channel_data * chand, grpc_closure_list * closure_list) +destroy_channel (grpc_exec_ctx * exec_ctx, channel_data * chand) { if (is_channel_orphaned (chand)) return; @@ -455,7 +455,7 @@ destroy_channel (channel_data * chand, grpc_closure_list * closure_list) } static void -finish_start_new_rpc (grpc_server * server, grpc_call_element * elem, request_matcher * request_matcher, grpc_closure_list * closure_list) +finish_start_new_rpc (grpc_exec_ctx * exec_ctx, grpc_server * server, grpc_call_element * elem, request_matcher * request_matcher) { call_data *calld = elem->call_data; int request_id; @@ -499,7 +499,7 @@ finish_start_new_rpc (grpc_server * server, grpc_call_element * elem, request_ma } static void -start_new_rpc (grpc_call_element * elem, grpc_closure_list * closure_list) +start_new_rpc (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { channel_data *chand = elem->channel_data; call_data *calld = elem->call_data; @@ -556,7 +556,7 @@ num_listeners (grpc_server * server) } static void -done_shutdown_event (void *server, grpc_cq_completion * completion, grpc_closure_list * closure_list) +done_shutdown_event (grpc_exec_ctx * exec_ctx, void *server, grpc_cq_completion * completion) { server_unref (server, closure_list); } @@ -574,7 +574,7 @@ num_channels (grpc_server * server) } static void -kill_pending_work_locked (grpc_server * server, grpc_closure_list * closure_list) +kill_pending_work_locked (grpc_exec_ctx * exec_ctx, grpc_server * server) { registered_method *rm; request_matcher_kill_requests (server, &server->unregistered_request_matcher, closure_list); @@ -587,7 +587,7 @@ kill_pending_work_locked (grpc_server * server, grpc_closure_list * closure_list } static void -maybe_finish_shutdown (grpc_server * server, grpc_closure_list * closure_list) +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) @@ -634,7 +634,7 @@ server_filter (void *user_data, grpc_mdelem * md) } static void -server_on_recv (void *ptr, int success, grpc_closure_list * closure_list) +server_on_recv (grpc_exec_ctx * exec_ctx, void *ptr, int success) { grpc_call_element *elem = ptr; call_data *calld = elem->call_data; @@ -727,7 +727,7 @@ server_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) } static void -server_start_transport_stream_op (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +server_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { GRPC_CALL_LOG_OP (GPR_INFO, elem, op); server_mutate_op (elem, op); @@ -743,7 +743,7 @@ accept_stream (void *cd, grpc_transport * transport, const void *transport_serve } static void -channel_connectivity_changed (void *cd, int iomgr_status_ignored, grpc_closure_list * closure_list) +channel_connectivity_changed (grpc_exec_ctx * exec_ctx, void *cd, int iomgr_status_ignored) { channel_data *chand = cd; grpc_server *server = chand->server; @@ -764,7 +764,7 @@ channel_connectivity_changed (void *cd, int iomgr_status_ignored, grpc_closure_l } static void -init_call_elem (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -782,7 +782,7 @@ init_call_elem (grpc_call_element * elem, const void *server_transport_data, grp } static void -destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) +destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { channel_data *chand = elem->channel_data; call_data *calld = elem->call_data; @@ -804,7 +804,7 @@ destroy_call_elem (grpc_call_element * elem, grpc_closure_list * closure_list) } static void -init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last, grpc_closure_list * closure_list) +init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last) { channel_data *chand = elem->channel_data; GPR_ASSERT (is_first); @@ -820,7 +820,7 @@ init_channel_elem (grpc_channel_element * elem, grpc_channel * master, const grp } static void -destroy_channel_elem (grpc_channel_element * elem, grpc_closure_list * closure_list) +destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) { size_t i; channel_data *chand = elem->channel_data; @@ -998,7 +998,7 @@ grpc_server_start (grpc_server * server) } void -grpc_server_setup_transport (grpc_server * s, grpc_transport * transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx * mdctx, const grpc_channel_args * args, grpc_closure_list * closure_list) +grpc_server_setup_transport (grpc_exec_ctx * exec_ctx, grpc_server * s, grpc_transport * transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx * mdctx, const grpc_channel_args * args) { size_t num_filters = s->channel_filter_count + num_extra_filters + 1; grpc_channel_filter const **filters = gpr_malloc (sizeof (grpc_channel_filter *) * num_filters); @@ -1093,14 +1093,14 @@ grpc_server_setup_transport (grpc_server * s, grpc_transport * transport, grpc_c } void -done_published_shutdown (void *done_arg, grpc_cq_completion * storage, grpc_closure_list * closure_list) +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, int success, grpc_closure_list * closure_list) +listener_destroy_done (grpc_exec_ctx * exec_ctx, void *s, int success) { grpc_server *server = s; gpr_mu_lock (&server->mu_global); @@ -1202,7 +1202,7 @@ grpc_server_destroy (grpc_server * server) } void -grpc_server_add_listener (grpc_server * server, void *arg, void (*start) (grpc_server * server, void *arg, grpc_pollset ** pollsets, size_t pollset_count, grpc_closure_list * closure_list), void (*destroy) (grpc_server * server, void *arg, grpc_closure * on_done, grpc_closure_list * closure_list), grpc_closure_list * closure_list) +grpc_server_add_listener (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, grpc_closure_list * closure_list)) { listener *l = gpr_malloc (sizeof (listener)); l->arg = arg; @@ -1213,7 +1213,7 @@ grpc_server_add_listener (grpc_server * server, void *arg, void (*start) (grpc_s } static grpc_call_error -queue_call_request (grpc_server * server, requested_call * rc, grpc_closure_list * closure_list) +queue_call_request (grpc_exec_ctx * exec_ctx, grpc_server * server, requested_call * rc) { call_data *calld = NULL; request_matcher *request_matcher = NULL; @@ -1333,9 +1333,9 @@ done: return error; } -static void publish_registered_or_batch (grpc_call * call, int success, void *tag, grpc_closure_list * closure_list); +static void publish_registered_or_batch (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *tag); static void -publish_was_not_set (grpc_call * call, int success, void *tag, grpc_closure_list * closure_list) +publish_was_not_set (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *tag) { abort (); } @@ -1355,7 +1355,7 @@ cpstr (char **dest, size_t * capacity, grpc_mdstr * value) } static void -begin_call (grpc_server * server, call_data * calld, requested_call * rc, grpc_closure_list * closure_list) +begin_call (grpc_exec_ctx * exec_ctx, grpc_server * server, call_data * calld, requested_call * rc) { grpc_ioreq_completion_func publish = publish_was_not_set; grpc_ioreq req[2]; @@ -1406,7 +1406,7 @@ begin_call (grpc_server * server, call_data * calld, requested_call * rc, grpc_c } static void -done_request_event (void *req, grpc_cq_completion * c, grpc_closure_list * closure_list) +done_request_event (grpc_exec_ctx * exec_ctx, void *req, grpc_cq_completion * c) { requested_call *rc = req; grpc_server *server = rc->server; @@ -1425,7 +1425,7 @@ done_request_event (void *req, grpc_cq_completion * c, grpc_closure_list * closu } static void -fail_call (grpc_server * server, requested_call * rc, grpc_closure_list * closure_list) +fail_call (grpc_exec_ctx * exec_ctx, grpc_server * server, requested_call * rc) { *rc->call = NULL; switch (rc->type) @@ -1442,7 +1442,7 @@ fail_call (grpc_server * server, requested_call * rc, grpc_closure_list * closur } static void -publish_registered_or_batch (grpc_call * call, int success, void *prc, grpc_closure_list * closure_list) +publish_registered_or_batch (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *prc) { grpc_call_element *elem = grpc_call_stack_element (grpc_call_get_call_stack (call), 0); requested_call *rc = prc; diff --git a/src/core/surface/server.h b/src/core/surface/server.h index 081377167a2..8adaafd5e39 100644 --- a/src/core/surface/server.h +++ b/src/core/surface/server.h @@ -43,11 +43,11 @@ grpc_server *grpc_server_create_from_filters (const grpc_channel_filter ** filte /* 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, grpc_closure_list * closure_list), void (*destroy) (grpc_server * server, void *arg, grpc_closure * on_done, grpc_closure_list * closure_list), grpc_closure_list * closure_list); +void grpc_server_add_listener (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, grpc_closure_list * closure_list)); /* Setup a transport - creates a channel stack, binds the transport to the server */ -void grpc_server_setup_transport (grpc_server * server, grpc_transport * transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx * mdctx, const grpc_channel_args * args, grpc_closure_list * closure_list); +void grpc_server_setup_transport (grpc_exec_ctx * exec_ctx, grpc_server * server, grpc_transport * transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx * mdctx, const grpc_channel_args * args); const grpc_channel_args *grpc_server_get_channel_args (grpc_server * server); diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c index 47b96f8f1eb..aa4eb9b05b1 100644 --- a/src/core/surface/server_chttp2.c +++ b/src/core/surface/server_chttp2.c @@ -43,7 +43,7 @@ #include static void -setup_transport (void *server, grpc_transport * transport, grpc_mdctx * mdctx, grpc_closure_list * closure_list) +setup_transport (grpc_exec_ctx * exec_ctx, void *server, grpc_transport * transport, grpc_mdctx * mdctx) { static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter @@ -52,7 +52,7 @@ setup_transport (void *server, grpc_transport * transport, grpc_mdctx * mdctx, g } static void -new_transport (void *server, grpc_endpoint * tcp, grpc_closure_list * closure_list) +new_transport (grpc_exec_ctx * exec_ctx, void *server, grpc_endpoint * tcp) { /* * Beware that the call to grpc_create_chttp2_transport() has to happen before @@ -69,7 +69,7 @@ new_transport (void *server, grpc_endpoint * tcp, grpc_closure_list * closure_li /* Server callback: start listening on our ports */ static void -start (grpc_server * server, void *tcpp, grpc_pollset ** pollsets, size_t pollset_count, grpc_closure_list * closure_list) +start (grpc_exec_ctx * exec_ctx, grpc_server * server, void *tcpp, grpc_pollset ** pollsets, size_t pollset_count) { grpc_tcp_server *tcp = tcpp; grpc_tcp_server_start (tcp, pollsets, pollset_count, new_transport, server, closure_list); @@ -78,7 +78,7 @@ start (grpc_server * server, void *tcpp, grpc_pollset ** pollsets, size_t pollse /* Server callback: destroy the tcp listener (so we don't generate further callbacks) */ static void -destroy (grpc_server * server, void *tcpp, grpc_closure * destroy_done, grpc_closure_list * closure_list) +destroy (grpc_exec_ctx * exec_ctx, grpc_server * server, void *tcpp, grpc_closure * destroy_done) { grpc_tcp_server *tcp = tcpp; grpc_tcp_server_destroy (tcp, destroy_done, closure_list); diff --git a/src/core/transport/chttp2/frame_data.c b/src/core/transport/chttp2/frame_data.c index 461a1e26f85..a806e357a88 100644 --- a/src/core/transport/chttp2/frame_data.c +++ b/src/core/transport/chttp2/frame_data.c @@ -78,7 +78,7 @@ grpc_chttp2_data_parser_begin_frame (grpc_chttp2_data_parser * parser, gpr_uint8 } grpc_chttp2_parse_error -grpc_chttp2_data_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +grpc_chttp2_data_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) { gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); diff --git a/src/core/transport/chttp2/frame_data.h b/src/core/transport/chttp2/frame_data.h index 6284433b191..18c7e00cd12 100644 --- a/src/core/transport/chttp2/frame_data.h +++ b/src/core/transport/chttp2/frame_data.h @@ -73,7 +73,7 @@ grpc_chttp2_parse_error grpc_chttp2_data_parser_begin_frame (grpc_chttp2_data_pa /* handle a slice of a data frame - is_last indicates the last slice of a frame */ -grpc_chttp2_parse_error grpc_chttp2_data_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); +grpc_chttp2_parse_error grpc_chttp2_data_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); /* create a slice with an empty data frame and is_last set */ gpr_slice grpc_chttp2_data_frame_create_empty_close (gpr_uint32 id); diff --git a/src/core/transport/chttp2/frame_goaway.c b/src/core/transport/chttp2/frame_goaway.c index f990e86465b..891e77e3333 100644 --- a/src/core/transport/chttp2/frame_goaway.c +++ b/src/core/transport/chttp2/frame_goaway.c @@ -69,7 +69,7 @@ grpc_chttp2_goaway_parser_begin_frame (grpc_chttp2_goaway_parser * p, gpr_uint32 } grpc_chttp2_parse_error -grpc_chttp2_goaway_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +grpc_chttp2_goaway_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) { gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); diff --git a/src/core/transport/chttp2/frame_goaway.h b/src/core/transport/chttp2/frame_goaway.h index 7cacec5f94f..f1eada9881f 100644 --- a/src/core/transport/chttp2/frame_goaway.h +++ b/src/core/transport/chttp2/frame_goaway.h @@ -66,7 +66,7 @@ typedef struct void grpc_chttp2_goaway_parser_init (grpc_chttp2_goaway_parser * p); void grpc_chttp2_goaway_parser_destroy (grpc_chttp2_goaway_parser * p); grpc_chttp2_parse_error grpc_chttp2_goaway_parser_begin_frame (grpc_chttp2_goaway_parser * parser, gpr_uint32 length, gpr_uint8 flags); -grpc_chttp2_parse_error grpc_chttp2_goaway_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); +grpc_chttp2_parse_error grpc_chttp2_goaway_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); void grpc_chttp2_goaway_append (gpr_uint32 last_stream_id, gpr_uint32 error_code, gpr_slice debug_data, gpr_slice_buffer * slice_buffer); diff --git a/src/core/transport/chttp2/frame_ping.c b/src/core/transport/chttp2/frame_ping.c index 6cd1fae1a61..2038a4eb273 100644 --- a/src/core/transport/chttp2/frame_ping.c +++ b/src/core/transport/chttp2/frame_ping.c @@ -73,7 +73,7 @@ grpc_chttp2_ping_parser_begin_frame (grpc_chttp2_ping_parser * parser, gpr_uint3 } grpc_chttp2_parse_error -grpc_chttp2_ping_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +grpc_chttp2_ping_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) { gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); diff --git a/src/core/transport/chttp2/frame_ping.h b/src/core/transport/chttp2/frame_ping.h index 65a666bc18b..066573940a5 100644 --- a/src/core/transport/chttp2/frame_ping.h +++ b/src/core/transport/chttp2/frame_ping.h @@ -48,6 +48,6 @@ typedef struct gpr_slice grpc_chttp2_ping_create (gpr_uint8 ack, gpr_uint8 * opaque_8bytes); grpc_chttp2_parse_error grpc_chttp2_ping_parser_begin_frame (grpc_chttp2_ping_parser * parser, gpr_uint32 length, gpr_uint8 flags); -grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); +grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_PING_H */ diff --git a/src/core/transport/chttp2/frame_rst_stream.c b/src/core/transport/chttp2/frame_rst_stream.c index c4bca3e680c..545d1b42b90 100644 --- a/src/core/transport/chttp2/frame_rst_stream.c +++ b/src/core/transport/chttp2/frame_rst_stream.c @@ -74,7 +74,7 @@ grpc_chttp2_rst_stream_parser_begin_frame (grpc_chttp2_rst_stream_parser * parse } grpc_chttp2_parse_error -grpc_chttp2_rst_stream_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +grpc_chttp2_rst_stream_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) { gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); diff --git a/src/core/transport/chttp2/frame_rst_stream.h b/src/core/transport/chttp2/frame_rst_stream.h index 781f4e5743e..b222e70861d 100644 --- a/src/core/transport/chttp2/frame_rst_stream.h +++ b/src/core/transport/chttp2/frame_rst_stream.h @@ -47,6 +47,6 @@ typedef struct gpr_slice grpc_chttp2_rst_stream_create (gpr_uint32 stream_id, gpr_uint32 code); grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_begin_frame (grpc_chttp2_rst_stream_parser * parser, gpr_uint32 length, gpr_uint8 flags); -grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); +grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_RST_STREAM_H */ diff --git a/src/core/transport/chttp2/frame_settings.c b/src/core/transport/chttp2/frame_settings.c index 7f2d5ba3fe0..4b6204e6ea4 100644 --- a/src/core/transport/chttp2/frame_settings.c +++ b/src/core/transport/chttp2/frame_settings.c @@ -151,7 +151,7 @@ grpc_chttp2_settings_parser_begin_frame (grpc_chttp2_settings_parser * parser, g } grpc_chttp2_parse_error -grpc_chttp2_settings_parser_parse (void *p, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +grpc_chttp2_settings_parser_parse (grpc_exec_ctx * exec_ctx, void *p, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) { grpc_chttp2_settings_parser *parser = p; const gpr_uint8 *cur = GPR_SLICE_START_PTR (slice); diff --git a/src/core/transport/chttp2/frame_settings.h b/src/core/transport/chttp2/frame_settings.h index 36c2c1d6d46..3c57e3ae899 100644 --- a/src/core/transport/chttp2/frame_settings.h +++ b/src/core/transport/chttp2/frame_settings.h @@ -95,6 +95,6 @@ gpr_slice grpc_chttp2_settings_create (gpr_uint32 * old, const gpr_uint32 * new, gpr_slice grpc_chttp2_settings_ack_create (void); grpc_chttp2_parse_error grpc_chttp2_settings_parser_begin_frame (grpc_chttp2_settings_parser * parser, gpr_uint32 length, gpr_uint8 flags, gpr_uint32 * settings); -grpc_chttp2_parse_error grpc_chttp2_settings_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); +grpc_chttp2_parse_error grpc_chttp2_settings_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_SETTINGS_H */ diff --git a/src/core/transport/chttp2/frame_window_update.c b/src/core/transport/chttp2/frame_window_update.c index e18fc1f694c..81f2ce2b52e 100644 --- a/src/core/transport/chttp2/frame_window_update.c +++ b/src/core/transport/chttp2/frame_window_update.c @@ -75,7 +75,7 @@ grpc_chttp2_window_update_parser_begin_frame (grpc_chttp2_window_update_parser * } grpc_chttp2_parse_error -grpc_chttp2_window_update_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +grpc_chttp2_window_update_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) { gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); diff --git a/src/core/transport/chttp2/frame_window_update.h b/src/core/transport/chttp2/frame_window_update.h index 57d77b41cfe..b6b61e89871 100644 --- a/src/core/transport/chttp2/frame_window_update.h +++ b/src/core/transport/chttp2/frame_window_update.h @@ -48,6 +48,6 @@ typedef struct gpr_slice grpc_chttp2_window_update_create (gpr_uint32 id, gpr_uint32 window_delta); grpc_chttp2_parse_error grpc_chttp2_window_update_parser_begin_frame (grpc_chttp2_window_update_parser * parser, gpr_uint32 length, gpr_uint8 flags); -grpc_chttp2_parse_error grpc_chttp2_window_update_parser_parse (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); +grpc_chttp2_parse_error grpc_chttp2_window_update_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_WINDOW_UPDATE_H */ diff --git a/src/core/transport/chttp2/hpack_parser.c b/src/core/transport/chttp2/hpack_parser.c index f3af6d91d25..0d19a577cc7 100644 --- a/src/core/transport/chttp2/hpack_parser.c +++ b/src/core/transport/chttp2/hpack_parser.c @@ -1458,7 +1458,7 @@ grpc_chttp2_hpack_parser_parse (grpc_chttp2_hpack_parser * p, const gpr_uint8 * } grpc_chttp2_parse_error -grpc_chttp2_header_parser_parse (void *hpack_parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +grpc_chttp2_header_parser_parse (grpc_exec_ctx * exec_ctx, void *hpack_parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) { grpc_chttp2_hpack_parser *parser = hpack_parser; if (!grpc_chttp2_hpack_parser_parse (parser, GPR_SLICE_START_PTR (slice), GPR_SLICE_END_PTR (slice))) diff --git a/src/core/transport/chttp2/hpack_parser.h b/src/core/transport/chttp2/hpack_parser.h index 6d21202d4d6..209bb6b9c16 100644 --- a/src/core/transport/chttp2/hpack_parser.h +++ b/src/core/transport/chttp2/hpack_parser.h @@ -106,6 +106,6 @@ int grpc_chttp2_hpack_parser_parse (grpc_chttp2_hpack_parser * p, const gpr_uint /* wraps grpc_chttp2_hpack_parser_parse to provide a frame level parser for the transport */ -grpc_chttp2_parse_error grpc_chttp2_header_parser_parse (void *hpack_parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); +grpc_chttp2_parse_error grpc_chttp2_header_parser_parse (grpc_exec_ctx * exec_ctx, void *hpack_parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_HPACK_PARSER_H */ diff --git a/src/core/transport/chttp2/internal.h b/src/core/transport/chttp2/internal.h index 1ef9c1af872..aaf090cd44e 100644 --- a/src/core/transport/chttp2/internal.h +++ b/src/core/transport/chttp2/internal.h @@ -277,7 +277,7 @@ struct grpc_chttp2_transport_parsing /* active parser */ void *parser_data; grpc_chttp2_stream_parsing *incoming_stream; - grpc_chttp2_parse_error (*parser) (void *parser_user_data, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); + grpc_chttp2_parse_error (*parser) (grpc_exec_ctx * exec_ctx, void *parser_user_data, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); /* received settings */ gpr_uint32 settings[GRPC_CHTTP2_NUM_SETTINGS]; @@ -480,15 +480,15 @@ struct grpc_chttp2_stream /** Someone is unlocking the transport mutex: check to see if writes are required, and schedule them if so */ int grpc_chttp2_unlocking_check_writes (grpc_chttp2_transport_global * global, grpc_chttp2_transport_writing * writing); -void grpc_chttp2_perform_writes (grpc_chttp2_transport_writing * transport_writing, grpc_endpoint * endpoint, grpc_closure_list * closure_list); -void grpc_chttp2_terminate_writing (void *transport_writing, int success, grpc_closure_list * closure_list); -void grpc_chttp2_cleanup_writing (grpc_chttp2_transport_global * global, grpc_chttp2_transport_writing * writing, grpc_closure_list * closure_list); +void grpc_chttp2_perform_writes (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_writing * transport_writing, grpc_endpoint * endpoint); +void grpc_chttp2_terminate_writing (grpc_exec_ctx * exec_ctx, void *transport_writing, int success); +void grpc_chttp2_cleanup_writing (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * global, grpc_chttp2_transport_writing * writing); void grpc_chttp2_prepare_to_read (grpc_chttp2_transport_global * global, grpc_chttp2_transport_parsing * parsing); /** 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 */ -int grpc_chttp2_perform_read (grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice, grpc_closure_list * closure_list); -void grpc_chttp2_publish_reads (grpc_chttp2_transport_global * global, grpc_chttp2_transport_parsing * parsing, grpc_closure_list * closure_list); +int grpc_chttp2_perform_read (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice); +void grpc_chttp2_publish_reads (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * global, grpc_chttp2_transport_parsing * parsing); /** Get a writable stream returns non-zero if there was a stream available */ @@ -526,7 +526,7 @@ int grpc_chttp2_list_pop_read_write_state_changed (grpc_chttp2_transport_global grpc_chttp2_stream_parsing *grpc_chttp2_parsing_lookup_stream (grpc_chttp2_transport_parsing * transport_parsing, gpr_uint32 id); grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream (grpc_chttp2_transport_parsing * transport_parsing, gpr_uint32 id); -void grpc_chttp2_add_incoming_goaway (grpc_chttp2_transport_global * transport_global, gpr_uint32 goaway_error, gpr_slice goaway_text, grpc_closure_list * closure_list); +void grpc_chttp2_add_incoming_goaway (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, gpr_uint32 goaway_error, gpr_slice goaway_text); void grpc_chttp2_register_stream (grpc_chttp2_transport * t, grpc_chttp2_stream * s); /* returns 1 if this is the last stream, 0 otherwise */ diff --git a/src/core/transport/chttp2/parsing.c b/src/core/transport/chttp2/parsing.c index 944066eab39..8e1dfc9d369 100644 --- a/src/core/transport/chttp2/parsing.c +++ b/src/core/transport/chttp2/parsing.c @@ -52,7 +52,7 @@ static int init_ping_parser (grpc_chttp2_transport_parsing * transport_parsing); static int init_goaway_parser (grpc_chttp2_transport_parsing * transport_parsing); static int init_skip_frame_parser (grpc_chttp2_transport_parsing * transport_parsing, int is_header); -static int parse_frame_slice (grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list); +static int parse_frame_slice (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice, int is_last); void grpc_chttp2_prepare_to_read (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing) @@ -80,7 +80,7 @@ grpc_chttp2_prepare_to_read (grpc_chttp2_transport_global * transport_global, gr } void -grpc_chttp2_publish_reads (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing, grpc_closure_list * closure_list) +grpc_chttp2_publish_reads (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing) { grpc_chttp2_stream_global *stream_global; grpc_chttp2_stream_parsing *stream_parsing; @@ -202,7 +202,7 @@ grpc_chttp2_publish_reads (grpc_chttp2_transport_global * transport_global, grpc } int -grpc_chttp2_perform_read (grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice, grpc_closure_list * closure_list) +grpc_chttp2_perform_read (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice) { gpr_uint8 *beg = GPR_SLICE_START_PTR (slice); gpr_uint8 *end = GPR_SLICE_END_PTR (slice); @@ -441,7 +441,7 @@ init_frame_parser (grpc_chttp2_transport_parsing * transport_parsing) } static grpc_chttp2_parse_error -skip_parser (void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +skip_parser (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) { return GRPC_CHTTP2_PARSE_OK; } @@ -754,7 +754,7 @@ static int is_window_update_legal(gpr_int64 window_update, gpr_int64 window) { */ static int -parse_frame_slice (grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice, int is_last, grpc_closure_list * closure_list) +parse_frame_slice (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice, int is_last) { grpc_chttp2_stream_parsing *stream_parsing = transport_parsing->incoming_stream; switch (transport_parsing->parser (transport_parsing->parser_data, transport_parsing, stream_parsing, slice, is_last, closure_list)) diff --git a/src/core/transport/chttp2/writing.c b/src/core/transport/chttp2/writing.c index edf40f54fb4..6c4f0102f73 100644 --- a/src/core/transport/chttp2/writing.c +++ b/src/core/transport/chttp2/writing.c @@ -141,7 +141,7 @@ grpc_chttp2_unlocking_check_writes (grpc_chttp2_transport_global * transport_glo } void -grpc_chttp2_perform_writes (grpc_chttp2_transport_writing * transport_writing, grpc_endpoint * endpoint, grpc_closure_list * closure_list) +grpc_chttp2_perform_writes (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_writing * transport_writing, grpc_endpoint * endpoint) { GPR_ASSERT (transport_writing->outbuf.count > 0 || grpc_chttp2_list_have_writing_streams (transport_writing)); @@ -180,7 +180,7 @@ finalize_outbuf (grpc_chttp2_transport_writing * transport_writing) } void -grpc_chttp2_cleanup_writing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_writing * transport_writing, grpc_closure_list * closure_list) +grpc_chttp2_cleanup_writing (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_writing * transport_writing) { grpc_chttp2_stream_writing *stream_writing; grpc_chttp2_stream_global *stream_global; diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index f99fa52dcc6..bef7d03300c 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -78,24 +78,24 @@ int grpc_flowctl_trace = 0; static const grpc_transport_vtable vtable; static void lock (grpc_chttp2_transport * t); -static void unlock (grpc_chttp2_transport * t, grpc_closure_list * closure_list); +static void unlock (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t); -static void unlock_check_read_write_state (grpc_chttp2_transport * t, grpc_closure_list * closure_list); +static void unlock_check_read_write_state (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t); /* forward declarations of various callbacks that we'll build closures around */ -static void writing_action (void *t, int iomgr_success_ignored, grpc_closure_list * closure_list); +static void writing_action (grpc_exec_ctx * exec_ctx, void *t, int iomgr_success_ignored); /** Set a transport level setting, and push it to our peer */ static void push_setting (grpc_chttp2_transport * t, grpc_chttp2_setting_id id, gpr_uint32 value); /** Endpoint callback to process incoming data */ -static void recv_data (void *tp, int success, grpc_closure_list * closure_list); +static void recv_data (grpc_exec_ctx * exec_ctx, void *tp, int success); /** Start disconnection chain */ -static void drop_connection (grpc_chttp2_transport * t, grpc_closure_list * closure_list); +static void drop_connection (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t); /** Perform a transport_op */ -static void perform_stream_op_locked (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_transport_stream_op * op, grpc_closure_list * closure_list); +static void perform_stream_op_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_transport_stream_op * op); /** Cancel a stream: coming from the transport API */ static void cancel_from_api (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_status_code status); @@ -103,20 +103,20 @@ static void cancel_from_api (grpc_chttp2_transport_global * transport_global, gr static void close_from_api (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_status_code status, gpr_slice * optional_message); /** Add endpoint from this transport to pollset */ -static void add_to_pollset_locked (grpc_chttp2_transport * t, grpc_pollset * pollset, grpc_closure_list * closure_list); -static void add_to_pollset_set_locked (grpc_chttp2_transport * t, grpc_pollset_set * pollset_set, grpc_closure_list * closure_list); +static void add_to_pollset_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, grpc_pollset * pollset); +static void add_to_pollset_set_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, grpc_pollset_set * pollset_set); /** Start new streams that have been created if we can */ -static void maybe_start_some_streams (grpc_chttp2_transport_global * transport_global, grpc_closure_list * closure_list); +static void maybe_start_some_streams (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global); -static void connectivity_state_set (grpc_chttp2_transport_global * transport_global, grpc_connectivity_state state, const char *reason, grpc_closure_list * closure_list); +static void connectivity_state_set (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, grpc_connectivity_state state, const char *reason); /* * CONSTRUCTION/DESTRUCTION/REFCOUNTING */ static void -destruct_transport (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +destruct_transport (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { size_t i; @@ -191,7 +191,7 @@ ref_transport (grpc_chttp2_transport * t, const char *reason, const char *file, #define REF_TRANSPORT(t, r) ref_transport(t) #define UNREF_TRANSPORT(t, r, cl) unref_transport(t, cl) static void -unref_transport (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +unref_transport (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { if (!gpr_unref (&t->refs)) return; @@ -206,7 +206,7 @@ ref_transport (grpc_chttp2_transport * t) #endif static void -init_transport (grpc_chttp2_transport * t, const grpc_channel_args * channel_args, grpc_endpoint * ep, grpc_mdctx * mdctx, gpr_uint8 is_client, grpc_closure_list * closure_list) +init_transport (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, const grpc_channel_args * channel_args, grpc_endpoint * ep, grpc_mdctx * mdctx, gpr_uint8 is_client) { size_t i; int j; @@ -327,7 +327,7 @@ init_transport (grpc_chttp2_transport * t, const grpc_channel_args * channel_arg } static void -destroy_transport (grpc_transport * gt, grpc_closure_list * closure_list) +destroy_transport (grpc_exec_ctx * exec_ctx, grpc_transport * gt) { grpc_chttp2_transport *t = (grpc_chttp2_transport *) gt; @@ -349,7 +349,7 @@ prevent_endpoint_shutdown (grpc_chttp2_transport * t) } static void -allow_endpoint_shutdown_locked (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +allow_endpoint_shutdown_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { if (gpr_unref (&t->shutdown_ep_refs)) { @@ -361,7 +361,7 @@ allow_endpoint_shutdown_locked (grpc_chttp2_transport * t, grpc_closure_list * c } static void -allow_endpoint_shutdown_unlocked (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +allow_endpoint_shutdown_unlocked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { if (gpr_unref (&t->shutdown_ep_refs)) { @@ -375,7 +375,7 @@ allow_endpoint_shutdown_unlocked (grpc_chttp2_transport * t, grpc_closure_list * } static void -destroy_endpoint (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +destroy_endpoint (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { grpc_endpoint_destroy (t->ep, closure_list); t->ep = NULL; @@ -384,7 +384,7 @@ destroy_endpoint (grpc_chttp2_transport * t, grpc_closure_list * closure_list) } static void -close_transport_locked (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +close_transport_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { if (!t->closed) { @@ -398,7 +398,7 @@ close_transport_locked (grpc_chttp2_transport * t, grpc_closure_list * closure_l } static int -init_stream (grpc_transport * gt, grpc_stream * gs, const void *server_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +init_stream (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_stream * gs, const void *server_data, grpc_transport_stream_op * initial_op) { grpc_chttp2_transport *t = (grpc_chttp2_transport *) gt; grpc_chttp2_stream *s = (grpc_chttp2_stream *) gs; @@ -434,7 +434,7 @@ init_stream (grpc_transport * gt, grpc_stream * gs, const void *server_data, grp } static void -destroy_stream (grpc_transport * gt, grpc_stream * gs, grpc_closure_list * closure_list) +destroy_stream (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_stream * gs) { grpc_chttp2_transport *t = (grpc_chttp2_transport *) gt; grpc_chttp2_stream *s = (grpc_chttp2_stream *) gs; @@ -516,7 +516,7 @@ lock (grpc_chttp2_transport * t) } static void -unlock (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +unlock (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { unlock_check_read_write_state (t, closure_list); if (!t->writing_active && !t->closed && grpc_chttp2_unlocking_check_writes (&t->global, &t->writing)) @@ -551,7 +551,7 @@ push_setting (grpc_chttp2_transport * t, grpc_chttp2_setting_id id, gpr_uint32 v } void -grpc_chttp2_terminate_writing (void *transport_writing_ptr, int success, grpc_closure_list * closure_list) +grpc_chttp2_terminate_writing (grpc_exec_ctx * exec_ctx, void *transport_writing_ptr, int success) { grpc_chttp2_transport_writing *transport_writing = transport_writing_ptr; grpc_chttp2_transport *t = TRANSPORT_FROM_WRITING (transport_writing); @@ -582,14 +582,14 @@ grpc_chttp2_terminate_writing (void *transport_writing_ptr, int success, grpc_cl } static void -writing_action (void *gt, int iomgr_success_ignored, grpc_closure_list * closure_list) +writing_action (grpc_exec_ctx * exec_ctx, void *gt, int iomgr_success_ignored) { grpc_chttp2_transport *t = gt; grpc_chttp2_perform_writes (&t->writing, t->ep, closure_list); } void -grpc_chttp2_add_incoming_goaway (grpc_chttp2_transport_global * transport_global, gpr_uint32 goaway_error, gpr_slice goaway_text, grpc_closure_list * closure_list) +grpc_chttp2_add_incoming_goaway (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, gpr_uint32 goaway_error, gpr_slice goaway_text) { char *msg = gpr_dump_slice (goaway_text, GPR_DUMP_HEX | GPR_DUMP_ASCII); gpr_log (GPR_DEBUG, "got goaway [%d]: %s", goaway_error, msg); @@ -600,7 +600,7 @@ grpc_chttp2_add_incoming_goaway (grpc_chttp2_transport_global * transport_global } static void -maybe_start_some_streams (grpc_chttp2_transport_global * transport_global, grpc_closure_list * closure_list) +maybe_start_some_streams (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global) { grpc_chttp2_stream_global *stream_global; /* start streams where we have free grpc_chttp2_stream ids and free @@ -635,7 +635,7 @@ maybe_start_some_streams (grpc_chttp2_transport_global * transport_global, grpc_ } static void -perform_stream_op_locked (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +perform_stream_op_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_transport_stream_op * op) { if (op->cancel_with_status != GRPC_STATUS_OK) { @@ -711,7 +711,7 @@ perform_stream_op_locked (grpc_chttp2_transport_global * transport_global, grpc_ } static void -perform_stream_op (grpc_transport * gt, grpc_stream * gs, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +perform_stream_op (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_stream * gs, grpc_transport_stream_op * op) { grpc_chttp2_transport *t = (grpc_chttp2_transport *) gt; grpc_chttp2_stream *s = (grpc_chttp2_stream *) gs; @@ -741,7 +741,7 @@ send_ping_locked (grpc_chttp2_transport * t, grpc_closure * on_recv) } static void -perform_transport_op (grpc_transport * gt, grpc_transport_op * op, grpc_closure_list * closure_list) +perform_transport_op (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_transport_op * op) { grpc_chttp2_transport *t = (grpc_chttp2_transport *) gt; int close_transport = 0; @@ -815,7 +815,7 @@ compute_state (gpr_uint8 write_closed, gpr_uint8 read_closed) } static void -remove_stream (grpc_chttp2_transport * t, gpr_uint32 id, grpc_closure_list * closure_list) +remove_stream (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, gpr_uint32 id) { size_t new_stream_count; grpc_chttp2_stream *s = grpc_chttp2_stream_map_delete (&t->parsing_stream_map, id); @@ -846,7 +846,7 @@ remove_stream (grpc_chttp2_transport * t, gpr_uint32 id, grpc_closure_list * clo } static void -unlock_check_read_write_state (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +unlock_check_read_write_state (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { grpc_chttp2_transport_global *transport_global = &t->global; grpc_chttp2_stream_global *stream_global; @@ -1070,7 +1070,7 @@ end_all_the_calls (grpc_chttp2_transport * t) } static void -drop_connection (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +drop_connection (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { close_transport_locked (t, closure_list); end_all_the_calls (t); @@ -1099,7 +1099,7 @@ update_global_window (void *args, gpr_uint32 id, void *stream) } static void -read_error_locked (grpc_chttp2_transport * t, grpc_closure_list * closure_list) +read_error_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { t->endpoint_reading = 0; if (!t->writing_active && t->ep) @@ -1110,7 +1110,7 @@ read_error_locked (grpc_chttp2_transport * t, grpc_closure_list * closure_list) /* tcp read callback */ static void -recv_data (void *tp, int success, grpc_closure_list * closure_list) +recv_data (grpc_exec_ctx * exec_ctx, void *tp, int success) { size_t i; int keep_reading = 0; @@ -1176,7 +1176,7 @@ recv_data (void *tp, int success, grpc_closure_list * closure_list) */ static void -connectivity_state_set (grpc_chttp2_transport_global * transport_global, grpc_connectivity_state state, const char *reason, grpc_closure_list * closure_list) +connectivity_state_set (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, grpc_connectivity_state state, const char *reason) { GRPC_CHTTP2_IF_TRACING (gpr_log (GPR_DEBUG, "set connectivity_state=%d", state)); grpc_connectivity_state_set (&TRANSPORT_FROM_GLOBAL (transport_global)->channel_callback.state_tracker, state, reason, closure_list); @@ -1187,7 +1187,7 @@ connectivity_state_set (grpc_chttp2_transport_global * transport_global, grpc_co */ static void -add_to_pollset_locked (grpc_chttp2_transport * t, grpc_pollset * pollset, grpc_closure_list * closure_list) +add_to_pollset_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, grpc_pollset * pollset) { if (t->ep) { @@ -1196,7 +1196,7 @@ add_to_pollset_locked (grpc_chttp2_transport * t, grpc_pollset * pollset, grpc_c } static void -add_to_pollset_set_locked (grpc_chttp2_transport * t, grpc_pollset_set * pollset_set, grpc_closure_list * closure_list) +add_to_pollset_set_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, grpc_pollset_set * pollset_set) { if (t->ep) { @@ -1238,7 +1238,7 @@ grpc_chttp2_flowctl_trace (const char *file, int line, const char *reason, const */ static char * -chttp2_get_peer (grpc_transport * t, grpc_closure_list * closure_list) +chttp2_get_peer (grpc_exec_ctx * exec_ctx, grpc_transport * t) { return gpr_strdup (((grpc_chttp2_transport *) t)->peer_string); } @@ -1253,7 +1253,7 @@ static const grpc_transport_vtable vtable = { sizeof (grpc_chttp2_stream), }; grpc_transport * -grpc_create_chttp2_transport (const grpc_channel_args * channel_args, grpc_endpoint * ep, grpc_mdctx * mdctx, int is_client, grpc_closure_list * closure_list) +grpc_create_chttp2_transport (grpc_exec_ctx * exec_ctx, const grpc_channel_args * channel_args, grpc_endpoint * ep, grpc_mdctx * mdctx, int is_client) { grpc_chttp2_transport *t = gpr_malloc (sizeof (grpc_chttp2_transport)); init_transport (t, channel_args, ep, mdctx, is_client != 0, closure_list); @@ -1261,7 +1261,7 @@ grpc_create_chttp2_transport (const grpc_channel_args * channel_args, grpc_endpo } void -grpc_chttp2_transport_start_reading (grpc_transport * transport, gpr_slice * slices, size_t nslices, grpc_closure_list * closure_list) +grpc_chttp2_transport_start_reading (grpc_exec_ctx * exec_ctx, grpc_transport * transport, gpr_slice * slices, size_t nslices) { grpc_chttp2_transport *t = (grpc_chttp2_transport *) transport; REF_TRANSPORT (t, "recv_data"); /* matches unref inside recv_data */ diff --git a/src/core/transport/chttp2_transport.h b/src/core/transport/chttp2_transport.h index 69f98d34896..fe2f78a5eae 100644 --- a/src/core/transport/chttp2_transport.h +++ b/src/core/transport/chttp2_transport.h @@ -40,8 +40,8 @@ extern int grpc_http_trace; extern int grpc_flowctl_trace; -grpc_transport *grpc_create_chttp2_transport (const grpc_channel_args * channel_args, grpc_endpoint * ep, grpc_mdctx * metadata_context, int is_client, grpc_closure_list * closure_list); +grpc_transport *grpc_create_chttp2_transport (grpc_exec_ctx * exec_ctx, const grpc_channel_args * channel_args, grpc_endpoint * ep, grpc_mdctx * metadata_context, int is_client); -void grpc_chttp2_transport_start_reading (grpc_transport * transport, gpr_slice * slices, size_t nslices, grpc_closure_list * closure_list); +void grpc_chttp2_transport_start_reading (grpc_exec_ctx * exec_ctx, grpc_transport * transport, gpr_slice * slices, size_t nslices); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_TRANSPORT_H */ diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c index 08ecfb9fd57..76a69d1dab4 100644 --- a/src/core/transport/connectivity_state.c +++ b/src/core/transport/connectivity_state.c @@ -70,7 +70,7 @@ grpc_connectivity_state_init (grpc_connectivity_state_tracker * tracker, grpc_co } void -grpc_connectivity_state_destroy (grpc_connectivity_state_tracker * tracker, grpc_closure_list * closure_list) +grpc_connectivity_state_destroy (grpc_exec_ctx * exec_ctx, grpc_connectivity_state_tracker * tracker) { int success; grpc_connectivity_state_watcher *w; @@ -104,7 +104,7 @@ grpc_connectivity_state_check (grpc_connectivity_state_tracker * tracker) } int -grpc_connectivity_state_notify_on_state_change (grpc_connectivity_state_tracker * tracker, grpc_connectivity_state * current, grpc_closure * notify, grpc_closure_list * closure_list) +grpc_connectivity_state_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_connectivity_state_tracker * tracker, grpc_connectivity_state * current, grpc_closure * notify) { if (grpc_connectivity_state_trace) { @@ -127,7 +127,7 @@ grpc_connectivity_state_notify_on_state_change (grpc_connectivity_state_tracker } void -grpc_connectivity_state_set (grpc_connectivity_state_tracker * tracker, grpc_connectivity_state state, const char *reason, grpc_closure_list * closure_list) +grpc_connectivity_state_set (grpc_exec_ctx * exec_ctx, grpc_connectivity_state_tracker * tracker, grpc_connectivity_state state, const char *reason) { grpc_connectivity_state_watcher *w; if (grpc_connectivity_state_trace) diff --git a/src/core/transport/connectivity_state.h b/src/core/transport/connectivity_state.h index 81fc8e7e120..38742834fbe 100644 --- a/src/core/transport/connectivity_state.h +++ b/src/core/transport/connectivity_state.h @@ -60,15 +60,15 @@ typedef struct extern int grpc_connectivity_state_trace; 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, grpc_closure_list * closure_list); +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, grpc_connectivity_state state, const char *reason, grpc_closure_list * closure_list); +void grpc_connectivity_state_set (grpc_exec_ctx * exec_ctx, grpc_connectivity_state_tracker * tracker, grpc_connectivity_state state, const char *reason); grpc_connectivity_state grpc_connectivity_state_check (grpc_connectivity_state_tracker * tracker); /** Return 1 if the channel should start connecting, 0 otherwise */ -int grpc_connectivity_state_notify_on_state_change (grpc_connectivity_state_tracker * tracker, grpc_connectivity_state * current, grpc_closure * notify, grpc_closure_list * closure_list); +int grpc_connectivity_state_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_connectivity_state_tracker * tracker, grpc_connectivity_state * current, grpc_closure * notify); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CONNECTIVITY_STATE_H */ diff --git a/src/core/transport/transport.c b/src/core/transport/transport.c index 1288d6d04db..ca04d34b3f4 100644 --- a/src/core/transport/transport.c +++ b/src/core/transport/transport.c @@ -43,43 +43,43 @@ grpc_transport_stream_size (grpc_transport * transport) } void -grpc_transport_destroy (grpc_transport * transport, grpc_closure_list * closure_list) +grpc_transport_destroy (grpc_exec_ctx * exec_ctx, grpc_transport * transport) { transport->vtable->destroy (transport, closure_list); } int -grpc_transport_init_stream (grpc_transport * transport, grpc_stream * stream, const void *server_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +grpc_transport_init_stream (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_stream * stream, const void *server_data, grpc_transport_stream_op * initial_op) { return transport->vtable->init_stream (transport, stream, server_data, initial_op, closure_list); } void -grpc_transport_perform_stream_op (grpc_transport * transport, grpc_stream * stream, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +grpc_transport_perform_stream_op (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_stream * stream, grpc_transport_stream_op * op) { transport->vtable->perform_stream_op (transport, stream, op, closure_list); } void -grpc_transport_perform_op (grpc_transport * transport, grpc_transport_op * op, grpc_closure_list * closure_list) +grpc_transport_perform_op (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_transport_op * op) { transport->vtable->perform_op (transport, op, closure_list); } void -grpc_transport_destroy_stream (grpc_transport * transport, grpc_stream * stream, grpc_closure_list * closure_list) +grpc_transport_destroy_stream (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_stream * stream) { transport->vtable->destroy_stream (transport, stream, closure_list); } char * -grpc_transport_get_peer (grpc_transport * transport, grpc_closure_list * closure_list) +grpc_transport_get_peer (grpc_exec_ctx * exec_ctx, grpc_transport * transport) { return transport->vtable->get_peer (transport, closure_list); } void -grpc_transport_stream_op_finish_with_failure (grpc_transport_stream_op * op, grpc_closure_list * closure_list) +grpc_transport_stream_op_finish_with_failure (grpc_exec_ctx * exec_ctx, grpc_transport_stream_op * op) { grpc_closure_list_add (closure_list, op->on_done_recv, 0); grpc_closure_list_add (closure_list, op->on_done_send, 0); @@ -113,7 +113,7 @@ typedef struct } close_message_data; static void -free_message (void *p, int iomgr_success, grpc_closure_list * closure_list) +free_message (grpc_exec_ctx * exec_ctx, void *p, int iomgr_success) { close_message_data *cmd = p; gpr_slice_unref (cmd->message); diff --git a/src/core/transport/transport.h b/src/core/transport/transport.h index c28dc0c2a67..80d842b4be0 100644 --- a/src/core/transport/transport.h +++ b/src/core/transport/transport.h @@ -136,7 +136,7 @@ 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, const void *server_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list); +int grpc_transport_init_stream (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_stream * stream, const void *server_data, grpc_transport_stream_op * initial_op); /* Destroy transport data for a stream. @@ -148,9 +148,9 @@ int grpc_transport_init_stream (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, grpc_stream * stream, grpc_closure_list * closure_list); +void grpc_transport_destroy_stream (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_stream * stream); -void grpc_transport_stream_op_finish_with_failure (grpc_transport_stream_op * op, grpc_closure_list * closure_list); +void grpc_transport_stream_op_finish_with_failure (grpc_exec_ctx * exec_ctx, grpc_transport_stream_op * op); void grpc_transport_stream_op_add_cancellation (grpc_transport_stream_op * op, grpc_status_code status); @@ -167,9 +167,9 @@ char *grpc_transport_stream_op_string (grpc_transport_stream_op * op); stream - the stream on which to send the operations. This must be non-NULL and previously initialized by the same transport. op - a grpc_transport_stream_op specifying the op to perform */ -void grpc_transport_perform_stream_op (grpc_transport * transport, grpc_stream * stream, grpc_transport_stream_op * op, grpc_closure_list * closure_list); +void grpc_transport_perform_stream_op (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_stream * stream, grpc_transport_stream_op * op); -void grpc_transport_perform_op (grpc_transport * transport, grpc_transport_op * op, grpc_closure_list * closure_list); +void grpc_transport_perform_op (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_transport_op * op); /* Send a ping on a transport @@ -183,9 +183,9 @@ 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_transport * transport, grpc_closure_list * closure_list); +void grpc_transport_destroy (grpc_exec_ctx * exec_ctx, grpc_transport * transport); /* Get the transports peer */ -char *grpc_transport_get_peer (grpc_transport * transport, grpc_closure_list * closure_list); +char *grpc_transport_get_peer (grpc_exec_ctx * exec_ctx, grpc_transport * transport); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_TRANSPORT_H */ diff --git a/src/core/transport/transport_impl.h b/src/core/transport/transport_impl.h index 97f4c4c8c72..54ebc24ff32 100644 --- a/src/core/transport/transport_impl.h +++ b/src/core/transport/transport_impl.h @@ -43,22 +43,22 @@ typedef struct grpc_transport_vtable size_t sizeof_stream; /* = sizeof(transport stream) */ /* implementation of grpc_transport_init_stream */ - int (*init_stream) (grpc_transport * self, grpc_stream * stream, const void *server_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list); + int (*init_stream) (grpc_exec_ctx * exec_ctx, grpc_transport * self, grpc_stream * stream, const void *server_data, grpc_transport_stream_op * initial_op); /* implementation of grpc_transport_perform_stream_op */ - void (*perform_stream_op) (grpc_transport * self, grpc_stream * stream, grpc_transport_stream_op * op, grpc_closure_list * closure_list); + void (*perform_stream_op) (grpc_exec_ctx * exec_ctx, grpc_transport * self, grpc_stream * stream, grpc_transport_stream_op * op); /* implementation of grpc_transport_perform_op */ - void (*perform_op) (grpc_transport * self, grpc_transport_op * op, grpc_closure_list * closure_list); + 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, grpc_closure_list * closure_list); + void (*destroy_stream) (grpc_exec_ctx * exec_ctx, grpc_transport * self, grpc_stream * stream); /* implementation of grpc_transport_destroy */ - void (*destroy) (grpc_transport * self, grpc_closure_list * closure_list); + void (*destroy) (grpc_exec_ctx * exec_ctx, grpc_transport * self); /* implementation of grpc_transport_get_peer */ - char *(*get_peer) (grpc_transport * self, grpc_closure_list * closure_list); + char *(*get_peer) (grpc_exec_ctx * exec_ctx, grpc_transport * self); } grpc_transport_vtable; /* an instance of a grpc transport */ diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index 7661aec6569..0b59aa3185f 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -63,7 +63,7 @@ thd_func (void *arg) } static void -done_write (void *arg, int success, grpc_closure_list * closure_list) +done_write (grpc_exec_ctx * exec_ctx, void *arg, int success) { thd_args *a = arg; gpr_event_set (&a->done_write, (void *) 1); diff --git a/test/core/channel/channel_stack_test.c b/test/core/channel/channel_stack_test.c index af5c705810a..1cdd2259b02 100644 --- a/test/core/channel/channel_stack_test.c +++ b/test/core/channel/channel_stack_test.c @@ -42,7 +42,7 @@ #include "test/core/util/test_config.h" static void -channel_init_func (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last, grpc_closure_list * closure_list) +channel_init_func (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last) { GPR_ASSERT (args->num_args == 1); GPR_ASSERT (args->args[0].type == GRPC_ARG_INTEGER); @@ -54,37 +54,37 @@ channel_init_func (grpc_channel_element * elem, grpc_channel * master, const grp } static void -call_init_func (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +call_init_func (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) { ++*(int *) (elem->channel_data); *(int *) (elem->call_data) = 0; } static void -channel_destroy_func (grpc_channel_element * elem, grpc_closure_list * closure_list) +channel_destroy_func (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) { } static void -call_destroy_func (grpc_call_element * elem, grpc_closure_list * closure_list) +call_destroy_func (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { ++*(int *) (elem->channel_data); } static void -call_func (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +call_func (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { ++*(int *) (elem->call_data); } static void -channel_func (grpc_channel_element * elem, grpc_transport_op * op, grpc_closure_list * closure_list) +channel_func (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_transport_op * op) { ++*(int *) (elem->channel_data); } static char * -get_peer (grpc_call_element * elem, grpc_closure_list * closure_list) +get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { return gpr_strdup ("peer"); } diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 85fa111ad47..276436ba12e 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -76,7 +76,7 @@ typedef struct } sp_client_setup; static void -client_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx, grpc_closure_list * closure_list) +client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * transport, grpc_mdctx * mdctx) { sp_client_setup *cs = ts; diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index 48faad97d3f..5cdc6cacafb 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -75,7 +75,7 @@ typedef struct } sp_client_setup; static void -client_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx, grpc_closure_list * closure_list) +client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * transport, grpc_mdctx * mdctx) { sp_client_setup *cs = ts; diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 0e11a944aff..2685b57e7aa 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -75,7 +75,7 @@ typedef struct } sp_client_setup; static void -client_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx, grpc_closure_list * closure_list) +client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * transport, grpc_mdctx * mdctx) { sp_client_setup *cs = ts; diff --git a/test/core/httpcli/httpcli_test.c b/test/core/httpcli/httpcli_test.c index 1982b00cd10..0287009fae2 100644 --- a/test/core/httpcli/httpcli_test.c +++ b/test/core/httpcli/httpcli_test.c @@ -56,7 +56,7 @@ n_seconds_time (int seconds) } static void -on_finish (void *arg, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +on_finish (grpc_exec_ctx * exec_ctx, void *arg, const grpc_httpcli_response * response) { const char *expect = "Hello world!" "

This is a test

"; GPR_ASSERT (arg == (void *) 42); @@ -135,7 +135,7 @@ test_post (int use_ssl, int port) } static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/iomgr/alarm_list_test.c b/test/core/iomgr/alarm_list_test.c index d81dd49c35c..8867545b336 100644 --- a/test/core/iomgr/alarm_list_test.c +++ b/test/core/iomgr/alarm_list_test.c @@ -44,7 +44,7 @@ static int cb_called[MAX_CB][2]; static void -cb (void *arg, int success, grpc_closure_list * closure_list) +cb (grpc_exec_ctx * exec_ctx, void *arg, int success) { cb_called[(gpr_intptr) arg][success]++; } diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c index 4e7079ef14d..2bc79301ea4 100644 --- a/test/core/iomgr/endpoint_pair_test.c +++ b/test/core/iomgr/endpoint_pair_test.c @@ -70,7 +70,7 @@ static grpc_endpoint_test_config configs[] = { }; static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index 4a720432832..bea03710531 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -138,7 +138,7 @@ struct read_and_write_test_state }; static void -read_and_write_test_read_handler (void *data, int success, grpc_closure_list * closure_list) +read_and_write_test_read_handler (grpc_exec_ctx * exec_ctx, void *data, int success) { struct read_and_write_test_state *state = data; @@ -158,7 +158,7 @@ read_and_write_test_read_handler (void *data, int success, grpc_closure_list * c } static void -read_and_write_test_write_handler (void *data, int success, grpc_closure_list * closure_list) +read_and_write_test_write_handler (grpc_exec_ctx * exec_ctx, void *data, int success) { struct read_and_write_test_state *state = data; gpr_slice *slices = NULL; diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index 5449c387682..d8b4032162b 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -250,7 +250,7 @@ listen_cb (void *arg, /*=sv_arg*/ When connection request arrives, listen_cb() is called to accept the connection request. */ static int -server_start (server * sv, grpc_closure_list * closure_list) +server_start (grpc_exec_ctx * exec_ctx, server * sv) { int port = 0; int fd; @@ -382,7 +382,7 @@ client_session_write (void *arg, /*client */ /* Start a client to send a stream of bytes. */ static void -client_start (client * cl, int port, grpc_closure_list * closure_list) +client_start (grpc_exec_ctx * exec_ctx, client * cl, int port) { int fd; struct sockaddr_in sin; @@ -455,7 +455,7 @@ test_grpc_fd (void) typedef struct fd_change_data { - void (*cb_that_ran) (void *, int success, grpc_closure_list * closure_list); + void (*cb_that_ran) (grpc_exec_ctx * exec_ctx, void *, int success); } fd_change_data; void @@ -578,7 +578,7 @@ test_grpc_fd_change (void) } static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/iomgr/resolve_address_test.c b/test/core/iomgr/resolve_address_test.c index a1ce7efaf00..814cb9e150c 100644 --- a/test/core/iomgr/resolve_address_test.c +++ b/test/core/iomgr/resolve_address_test.c @@ -45,7 +45,7 @@ test_deadline (void) } static void -must_succeed (void *evp, grpc_resolved_addresses * p, grpc_closure_list * closure_list) +must_succeed (grpc_exec_ctx * exec_ctx, void *evp, grpc_resolved_addresses * p) { GPR_ASSERT (p); GPR_ASSERT (p->naddrs >= 1); @@ -54,7 +54,7 @@ must_succeed (void *evp, grpc_resolved_addresses * p, grpc_closure_list * closur } static void -must_fail (void *evp, grpc_resolved_addresses * p, grpc_closure_list * closure_list) +must_fail (grpc_exec_ctx * exec_ctx, void *evp, grpc_resolved_addresses * p) { GPR_ASSERT (!p); gpr_event_set (evp, (void *) 1); diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index af9b96db147..b93b9a5725e 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -68,7 +68,7 @@ finish_connection () } static void -must_succeed (void *arg, int success, grpc_closure_list * closure_list) +must_succeed (grpc_exec_ctx * exec_ctx, void *arg, int success) { GPR_ASSERT (g_connecting != NULL); GPR_ASSERT (success); @@ -79,7 +79,7 @@ must_succeed (void *arg, int success, grpc_closure_list * closure_list) } static void -must_fail (void *arg, int success, grpc_closure_list * closure_list) +must_fail (grpc_exec_ctx * exec_ctx, void *arg, int success) { GPR_ASSERT (g_connecting == NULL); GPR_ASSERT (!success); @@ -270,7 +270,7 @@ test_times_out (void) } static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index 5683e7cf533..af338249c5b 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -157,7 +157,7 @@ count_slices (gpr_slice * slices, size_t nslices, int *current_data) } static void -read_cb (void *user_data, int success, grpc_closure_list * closure_list) +read_cb (grpc_exec_ctx * exec_ctx, void *user_data, int success) { struct read_socket_state *state = (struct read_socket_state *) user_data; size_t read_bytes; @@ -468,7 +468,7 @@ static grpc_endpoint_test_config configs[] = { }; static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index 92edfdd8504..8467e937ee0 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -49,7 +49,7 @@ static grpc_pollset g_pollset; static int g_nconnects = 0; static void -on_connect (void *arg, grpc_endpoint * tcp, grpc_closure_list * closure_list) +on_connect (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * tcp) { grpc_endpoint_shutdown (tcp, closure_list); grpc_endpoint_destroy (tcp, closure_list); @@ -173,7 +173,7 @@ test_connect (int n) } static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c index b9cf289ed6a..86e84adb55d 100644 --- a/test/core/iomgr/udp_server_test.c +++ b/test/core/iomgr/udp_server_test.c @@ -175,7 +175,7 @@ test_receive (int number_of_clients) } static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c index 43eebc3fbf1..7e0f336a0dc 100644 --- a/test/core/iomgr/workqueue_test.c +++ b/test/core/iomgr/workqueue_test.c @@ -41,7 +41,7 @@ static grpc_pollset g_pollset; static void -must_succeed (void *p, int success, grpc_closure_list * closure_list) +must_succeed (grpc_exec_ctx * exec_ctx, void *p, int success) { GPR_ASSERT (success == 1); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -76,7 +76,7 @@ test_add_closure (void) } static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index 6769de1a60c..281f14f3b71 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -286,7 +286,7 @@ check_metadata (expected_md * expected, grpc_credentials_md * md_elems, size_t n } static void -check_google_iam_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +check_google_iam_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { grpc_credentials *c = (grpc_credentials *) user_data; expected_md emd[] = { {GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, @@ -313,7 +313,7 @@ test_google_iam_creds (void) } static void -check_access_token_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +check_access_token_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { grpc_credentials *c = (grpc_credentials *) user_data; expected_md emd[] = { {GRPC_AUTHORIZATION_METADATA_KEY, "Bearer blah"} }; @@ -336,7 +336,7 @@ test_access_token_creds (void) } static void -check_ssl_oauth2_composite_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +check_ssl_oauth2_composite_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { grpc_credentials *c = (grpc_credentials *) user_data; expected_md emd[] = { @@ -382,7 +382,7 @@ test_ssl_fake_transport_security_composite_creds_failure (void) } static void -check_ssl_oauth2_google_iam_composite_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +check_ssl_oauth2_google_iam_composite_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { grpc_credentials *c = (grpc_credentials *) user_data; expected_md emd[] = { @@ -426,7 +426,7 @@ test_ssl_oauth2_google_iam_composite_creds (void) } static void -on_oauth2_creds_get_metadata_success (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_oauth2_creds_get_metadata_success (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { GPR_ASSERT (status == GRPC_CREDENTIALS_OK); GPR_ASSERT (num_md == 1); @@ -437,7 +437,7 @@ on_oauth2_creds_get_metadata_success (void *user_data, grpc_credentials_md * md_ } static void -on_oauth2_creds_get_metadata_failure (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_oauth2_creds_get_metadata_failure (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { GPR_ASSERT (status == GRPC_CREDENTIALS_ERROR); GPR_ASSERT (num_md == 0); @@ -457,7 +457,7 @@ validate_compute_engine_http_request (const grpc_httpcli_request * request) } static int -compute_engine_httpcli_get_success_override (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +compute_engine_httpcli_get_success_override (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (200, valid_oauth2_json_response); validate_compute_engine_http_request (request); @@ -466,7 +466,7 @@ compute_engine_httpcli_get_success_override (const grpc_httpcli_request * reques } static int -compute_engine_httpcli_get_failure_override (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +compute_engine_httpcli_get_failure_override (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (403, "Not Authorized."); validate_compute_engine_http_request (request); @@ -475,14 +475,14 @@ compute_engine_httpcli_get_failure_override (const grpc_httpcli_request * reques } static int -httpcli_post_should_not_be_called (const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_post_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { GPR_ASSERT ("HTTP POST should not be called" == NULL); return 1; } static int -httpcli_get_should_not_be_called (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_get_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { GPR_ASSERT ("HTTP GET should not be called" == NULL); return 1; @@ -544,7 +544,7 @@ validate_refresh_token_http_request (const grpc_httpcli_request * request, const } static int -refresh_token_httpcli_post_success (const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +refresh_token_httpcli_post_success (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (200, valid_oauth2_json_response); validate_refresh_token_http_request (request, body, body_size); @@ -553,7 +553,7 @@ refresh_token_httpcli_post_success (const grpc_httpcli_request * request, const } static int -refresh_token_httpcli_post_failure (const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +refresh_token_httpcli_post_failure (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (403, "Not Authorized."); validate_refresh_token_http_request (request, body, body_size); @@ -636,7 +636,7 @@ encode_and_sign_jwt_should_not_be_called (const grpc_auth_json_key * json_key, c } static void -on_jwt_creds_get_metadata_success (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_jwt_creds_get_metadata_success (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { char *expected_md_value; gpr_asprintf (&expected_md_value, "Bearer %s", test_signed_jwt); @@ -650,7 +650,7 @@ on_jwt_creds_get_metadata_success (void *user_data, grpc_credentials_md * md_ele } static void -on_jwt_creds_get_metadata_failure (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_jwt_creds_get_metadata_failure (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { GPR_ASSERT (status == GRPC_CREDENTIALS_ERROR); GPR_ASSERT (num_md == 0); @@ -811,7 +811,7 @@ plugin_get_metadata_failure (void *state, const char *service_url, grpc_credenti } static void -on_plugin_metadata_received_success (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_plugin_metadata_received_success (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { size_t i = 0; GPR_ASSERT (user_data == NULL); @@ -825,7 +825,7 @@ on_plugin_metadata_received_success (void *user_data, grpc_credentials_md * md_e } static void -on_plugin_metadata_received_failure (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_plugin_metadata_received_failure (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { GPR_ASSERT (user_data == NULL); GPR_ASSERT (md_elems == NULL); diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c index 15c19e2533e..506918d27c6 100644 --- a/test/core/security/jwt_verifier_test.c +++ b/test/core/security/jwt_verifier_test.c @@ -190,14 +190,14 @@ 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, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_post_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { GPR_ASSERT ("HTTP POST should not be called" == NULL); return 1; } static int -httpcli_get_google_keys_for_email (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_get_google_keys_for_email (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (200, good_google_email_keys ()); GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); @@ -240,7 +240,7 @@ test_jwt_verifier_google_email_issuer_success (void) } static int -httpcli_get_custom_keys_for_email (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_get_custom_keys_for_email (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (200, gpr_strdup (good_jwk_set)); GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); @@ -273,7 +273,7 @@ test_jwt_verifier_custom_email_issuer_success (void) } static int -httpcli_get_jwk_set (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_get_jwk_set (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (200, gpr_strdup (good_jwk_set)); GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); @@ -285,7 +285,7 @@ httpcli_get_jwk_set (const grpc_httpcli_request * request, gpr_timespec deadline } static int -httpcli_get_openid_config (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_get_openid_config (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (200, gpr_strdup (good_openid_config)); GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); @@ -327,7 +327,7 @@ on_verification_key_retrieval_error (void *user_data, grpc_jwt_verifier_status s } static int -httpcli_get_bad_json (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_get_bad_json (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (200, gpr_strdup ("{\"bad\": \"stuff\"}")); GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); @@ -427,7 +427,7 @@ test_jwt_verifier_bad_signature (void) } static int -httpcli_get_should_not_be_called (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_get_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { GPR_ASSERT (0); return 1; diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index a490ba46686..9035557a416 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -52,7 +52,7 @@ typedef struct } oauth2_request; static void -on_oauth2_response (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_oauth2_response (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { oauth2_request *request = user_data; char *token = NULL; @@ -77,7 +77,7 @@ on_oauth2_response (void *user_data, grpc_credentials_md * md_elems, size_t num_ } static void -do_nothing (void *unused, int success, grpc_closure_list * closure_list) +do_nothing (grpc_exec_ctx * exec_ctx, void *unused, int success) { } diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c index faac2c7846a..3f6720b6ea7 100644 --- a/test/core/security/print_google_default_creds_token.c +++ b/test/core/security/print_google_default_creds_token.c @@ -51,7 +51,7 @@ typedef struct } synchronizer; static void -on_metadata_response (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_metadata_response (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { synchronizer *sync = user_data; if (status == GRPC_CREDENTIALS_ERROR) diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index 32db8194e4e..595e84c8b12 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -143,7 +143,7 @@ static grpc_endpoint_test_config configs[] = { }; static void -inc_call_ctr (void *arg, int success, grpc_closure_list * closure_list) +inc_call_ctr (grpc_exec_ctx * exec_ctx, void *arg, int success) { ++*(int *) arg; } @@ -179,7 +179,7 @@ test_leftover (grpc_endpoint_test_config config, size_t slice_size) } static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index cd0bce8fc2a..48f1122242f 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -84,7 +84,7 @@ test_wait_empty (void) } static void -do_nothing_end_completion (void *arg, grpc_cq_completion * c, grpc_closure_list * closure_list) +do_nothing_end_completion (grpc_exec_ctx * exec_ctx, void *arg, grpc_cq_completion * c) { } @@ -213,7 +213,7 @@ ten_seconds_time (void) } static void -free_completion (void *arg, grpc_cq_completion * completion, grpc_closure_list * closure_list) +free_completion (grpc_exec_ctx * exec_ctx, void *arg, grpc_cq_completion * completion) { gpr_free (completion); } diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index 2bb545a3762..670b19e28c1 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -78,14 +78,14 @@ typedef struct freereq } freereq; static void -destroy_pollset_and_shutdown (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset_and_shutdown (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); grpc_shutdown (); } static void -freed_port_from_server (void *arg, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +freed_port_from_server (grpc_exec_ctx * exec_ctx, void *arg, const grpc_httpcli_response * response) { freereq *pr = arg; gpr_mu_lock (GRPC_POLLSET_MU (&pr->pollset)); @@ -231,7 +231,7 @@ typedef struct portreq } portreq; static void -got_port_from_server (void *arg, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +got_port_from_server (grpc_exec_ctx * exec_ctx, void *arg, const grpc_httpcli_response * response) { size_t i; int port = 0; diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index f7303030047..4d1ef62e170 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -67,7 +67,7 @@ pretty_print_backoffs (reconnect_server * server) } static void -on_connect (void *arg, grpc_endpoint * tcp, grpc_closure_list * closure_list) +on_connect (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * tcp) { char *peer; char *last_colon; @@ -175,7 +175,7 @@ reconnect_server_clear_timestamps (reconnect_server * server) } static void -do_nothing (void *ignored, int success, grpc_closure_list * closure_list) +do_nothing (grpc_exec_ctx * exec_ctx, void *ignored, int success) { } From 9f7dc3a4e5c3eeb6524472c6dc694f0600d03688 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 10:47:08 -0700 Subject: [PATCH 28/56] Move argument passing to start of list --- src/core/census/grpc_filter.c | 6 +- src/core/channel/channel_stack.c | 16 +-- src/core/channel/client_channel.c | 120 +++++++++--------- src/core/channel/compress_filter.c | 2 +- src/core/channel/connected_channel.c | 12 +- src/core/channel/http_client_filter.c | 4 +- src/core/channel/http_server_filter.c | 6 +- src/core/channel/noop_filter.c | 2 +- src/core/client_config/client_config.c | 2 +- src/core/client_config/connector.c | 6 +- .../client_config/lb_policies/pick_first.c | 64 +++++----- .../client_config/lb_policies/round_robin.c | 54 ++++---- src/core/client_config/lb_policy.c | 14 +- src/core/client_config/resolver.c | 8 +- .../client_config/resolvers/dns_resolver.c | 16 +-- .../resolvers/sockaddr_resolver.c | 8 +- src/core/client_config/subchannel.c | 108 ++++++++-------- src/core/client_config/subchannel_factory.c | 4 +- .../merge_channel_args.c | 4 +- src/core/httpcli/httpcli.c | 52 ++++---- src/core/httpcli/httpcli_security_connector.c | 14 +- src/core/iomgr/alarm.c | 6 +- src/core/iomgr/closure.c | 2 +- src/core/iomgr/endpoint.c | 12 +- src/core/iomgr/fd_posix.c | 14 +- .../iomgr/pollset_multipoller_with_epoll.c | 12 +- .../pollset_multipoller_with_poll_posix.c | 6 +- src/core/iomgr/pollset_posix.c | 26 ++-- src/core/iomgr/pollset_set_posix.c | 4 +- src/core/iomgr/tcp_client_posix.c | 20 +-- src/core/iomgr/tcp_posix.c | 50 ++++---- src/core/iomgr/tcp_server_posix.c | 22 ++-- src/core/iomgr/udp_server.c | 18 +-- src/core/iomgr/workqueue_posix.c | 16 +-- src/core/security/client_auth_filter.c | 24 ++-- src/core/security/credentials.c | 38 +++--- src/core/security/handshake.c | 46 +++---- src/core/security/jwt_verifier.c | 6 +- src/core/security/secure_endpoint.c | 28 ++-- src/core/security/security_connector.c | 20 +-- src/core/security/server_auth_filter.c | 4 +- src/core/security/server_secure_chttp2.c | 20 +-- src/core/surface/call.c | 54 ++++---- src/core/surface/call.h | 8 +- src/core/surface/channel.c | 6 +- src/core/surface/channel.h | 8 +- src/core/surface/channel_connectivity.c | 16 +-- src/core/surface/channel_create.c | 12 +- src/core/surface/completion_queue.c | 2 +- src/core/surface/lame_client.c | 12 +- src/core/surface/secure_channel_create.c | 18 +-- src/core/surface/server.c | 82 ++++++------ src/core/surface/server_chttp2.c | 12 +- src/core/transport/chttp2/parsing.c | 12 +- src/core/transport/chttp2/writing.c | 2 +- src/core/transport/chttp2_transport.c | 116 ++++++++--------- src/core/transport/transport.c | 14 +- test/core/iomgr/endpoint_tests.c | 4 +- test/core/iomgr/fd_posix_test.c | 36 +++--- test/core/iomgr/tcp_client_posix_test.c | 4 +- test/core/iomgr/tcp_posix_test.c | 2 +- test/core/iomgr/tcp_server_posix_test.c | 4 +- test/core/security/credentials_test.c | 8 +- test/core/security/jwt_verifier_test.c | 10 +- test/core/util/port_posix.c | 2 +- test/core/util/reconnect_server.c | 4 +- 66 files changed, 682 insertions(+), 682 deletions(-) diff --git a/src/core/census/grpc_filter.c b/src/core/census/grpc_filter.c index eed9523d726..485987a2954 100644 --- a/src/core/census/grpc_filter.c +++ b/src/core/census/grpc_filter.c @@ -99,7 +99,7 @@ static void client_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { client_mutate_op (elem, op); - grpc_call_next_op (elem, op, closure_list); + grpc_call_next_op (exec_ctx, elem, op); } static void @@ -112,7 +112,7 @@ server_on_done_recv (grpc_exec_ctx * exec_ctx, void *ptr, int success) { extract_and_annotate_method_tag (calld->recv_ops, calld, chand); } - calld->on_done_recv->cb (calld->on_done_recv->cb_arg, success, closure_list); + calld->on_done_recv->cb (exec_ctx, calld->on_done_recv->cb_arg, success); } static void @@ -134,7 +134,7 @@ server_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, g 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 (elem, op, closure_list); + grpc_call_next_op (exec_ctx, elem, op); } static void diff --git a/src/core/channel/channel_stack.c b/src/core/channel/channel_stack.c index 07b118f74a5..199862dddde 100644 --- a/src/core/channel/channel_stack.c +++ b/src/core/channel/channel_stack.c @@ -120,7 +120,7 @@ grpc_channel_stack_init (grpc_exec_ctx * exec_ctx, const grpc_channel_filter ** { elems[i].filter = filters[i]; elems[i].channel_data = user_data; - elems[i].filter->init_channel_elem (&elems[i], master, args, metadata_context, i == 0, i == (filter_count - 1), closure_list); + elems[i].filter->init_channel_elem (&elems[i], master, args, metadata_context, i == 0, i == (exec_ctx, filter_count - 1)); user_data += ROUND_UP_TO_ALIGNMENT_SIZE (filters[i]->sizeof_channel_data); call_size += ROUND_UP_TO_ALIGNMENT_SIZE (filters[i]->sizeof_call_data); } @@ -141,7 +141,7 @@ grpc_channel_stack_destroy (grpc_exec_ctx * exec_ctx, grpc_channel_stack * stack /* destroy per-filter data */ for (i = 0; i < count; i++) { - channel_elems[i].filter->destroy_channel_elem (&channel_elems[i], closure_list); + channel_elems[i].filter->destroy_channel_elem (exec_ctx, &channel_elems[i]); } } @@ -164,7 +164,7 @@ grpc_call_stack_init (grpc_exec_ctx * exec_ctx, grpc_channel_stack * channel_sta 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; - call_elems[i].filter->init_call_elem (&call_elems[i], transport_server_data, initial_op, closure_list); + call_elems[i].filter->init_call_elem (exec_ctx, &call_elems[i], transport_server_data, initial_op); user_data += ROUND_UP_TO_ALIGNMENT_SIZE (call_elems[i].filter->sizeof_call_data); } } @@ -179,7 +179,7 @@ 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 (&elems[i], closure_list); + elems[i].filter->destroy_call_elem (exec_ctx, &elems[i]); } } @@ -187,21 +187,21 @@ void grpc_call_next_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { grpc_call_element *next_elem = elem + 1; - next_elem->filter->start_transport_stream_op (next_elem, op, closure_list); + next_elem->filter->start_transport_stream_op (exec_ctx, next_elem, op); } char * grpc_call_next_get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { grpc_call_element *next_elem = elem + 1; - return next_elem->filter->get_peer (next_elem, closure_list); + return next_elem->filter->get_peer (exec_ctx, next_elem); } 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, closure_list); + next_elem->filter->start_transport_op (exec_ctx, next_elem, op); } grpc_channel_stack * @@ -222,5 +222,5 @@ grpc_call_element_send_cancel (grpc_exec_ctx * exec_ctx, grpc_call_element * cur grpc_transport_stream_op op; memset (&op, 0, sizeof (op)); op.cancel_with_status = GRPC_STATUS_CANCELLED; - grpc_call_next_op (cur_elem, &op, closure_list); + grpc_call_next_op (exec_ctx, cur_elem, &op); } diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index d0be3ca7b64..9a7c1c77ca1 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -138,7 +138,7 @@ merge_into_waiting_op (grpc_call_element * elem, grpc_transport_stream_op * new_ if (op->send_ops) { grpc_stream_ops_unref_owned_objects (op->send_ops->ops, op->send_ops->nops); - op->on_done_send->cb (op->on_done_send->cb_arg, 0, closure_list); + op->on_done_send->cb (exec_ctx, op->on_done_send->cb_arg, 0); } if (op->recv_ops) { @@ -156,11 +156,11 @@ merge_into_waiting_op (grpc_call_element * elem, grpc_transport_stream_op * new_ mdb.deadline = gpr_inf_future (GPR_CLOCK_REALTIME); grpc_sopb_add_metadata (op->recv_ops, mdb); *op->recv_state = GRPC_STREAM_CLOSED; - op->on_done_recv->cb (op->on_done_recv->cb_arg, 1, closure_list); + op->on_done_recv->cb (exec_ctx, op->on_done_recv->cb_arg, 1); } if (op->on_consumed) { - op->on_consumed->cb (op->on_consumed->cb_arg, 0, closure_list); + op->on_consumed->cb (exec_ctx, op->on_consumed->cb_arg, 0); } } @@ -177,7 +177,7 @@ continue_with_pick (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { waiting_call *wc = arg; call_data *calld = wc->elem->call_data; - perform_transport_stream_op (wc->elem, &calld->waiting_op, 1, closure_list); + perform_transport_stream_op (exec_ctx, wc->elem, &calld->waiting_op, 1); gpr_free (wc); } @@ -217,7 +217,7 @@ started_call (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) memset (&op, 0, sizeof (op)); op.cancel_with_status = GRPC_STATUS_CANCELLED; gpr_mu_unlock (&calld->mu_state); - grpc_subchannel_call_process_op (calld->subchannel_call, &op, closure_list); + grpc_subchannel_call_process_op (exec_ctx, calld->subchannel_call, &op); } else if (calld->state == CALL_WAITING_FOR_CALL) { @@ -228,7 +228,7 @@ started_call (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) gpr_mu_unlock (&calld->mu_state); if (have_waiting) { - grpc_subchannel_call_process_op (calld->subchannel_call, &calld->waiting_op, closure_list); + grpc_subchannel_call_process_op (exec_ctx, calld->subchannel_call, &calld->waiting_op); } } else @@ -237,7 +237,7 @@ started_call (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) gpr_mu_unlock (&calld->mu_state); if (have_waiting) { - handle_op_after_cancellation (calld->elem, &calld->waiting_op, closure_list); + handle_op_after_cancellation (exec_ctx, calld->elem, &calld->waiting_op); } } } @@ -258,7 +258,7 @@ picked_target (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { /* treat this like a cancellation */ calld->waiting_op.cancel_with_status = GRPC_STATUS_UNAVAILABLE; - perform_transport_stream_op (calld->elem, &calld->waiting_op, 1, closure_list); + perform_transport_stream_op (exec_ctx, calld->elem, &calld->waiting_op, 1); } else { @@ -266,7 +266,7 @@ picked_target (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) if (calld->state == CALL_CANCELLED) { gpr_mu_unlock (&calld->mu_state); - handle_op_after_cancellation (calld->elem, &calld->waiting_op, closure_list); + handle_op_after_cancellation (exec_ctx, calld->elem, &calld->waiting_op); } else { @@ -275,7 +275,7 @@ picked_target (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) pollset = calld->waiting_op.bind_pollset; gpr_mu_unlock (&calld->mu_state); grpc_closure_init (&calld->async_setup_task, started_call, calld); - grpc_subchannel_create_call (calld->picked_channel, pollset, &calld->subchannel_call, &calld->async_setup_task, closure_list); + grpc_subchannel_create_call (exec_ctx, calld->picked_channel, pollset, &calld->subchannel_call, &calld->async_setup_task); } } } @@ -329,8 +329,8 @@ cc_get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) subchannel_call = calld->subchannel_call; GRPC_SUBCHANNEL_CALL_REF (subchannel_call, "get_peer"); gpr_mu_unlock (&calld->mu_state); - result = grpc_subchannel_call_get_peer (subchannel_call, closure_list); - GRPC_SUBCHANNEL_CALL_UNREF (subchannel_call, "get_peer", closure_list); + result = grpc_subchannel_call_get_peer (exec_ctx, subchannel_call); + GRPC_SUBCHANNEL_CALL_UNREF (exec_ctx, subchannel_call, "get_peer"); return result; } else @@ -358,11 +358,11 @@ perform_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, GPR_ASSERT (!continuation); subchannel_call = calld->subchannel_call; gpr_mu_unlock (&calld->mu_state); - grpc_subchannel_call_process_op (subchannel_call, op, closure_list); + grpc_subchannel_call_process_op (exec_ctx, subchannel_call, op); break; case CALL_CANCELLED: gpr_mu_unlock (&calld->mu_state); - handle_op_after_cancellation (elem, op, closure_list); + handle_op_after_cancellation (exec_ctx, elem, op); break; case CALL_WAITING_FOR_SEND: GPR_ASSERT (!continuation); @@ -397,8 +397,8 @@ perform_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, op2.on_consumed = NULL; } gpr_mu_unlock (&calld->mu_state); - handle_op_after_cancellation (elem, op, closure_list); - handle_op_after_cancellation (elem, &op2, closure_list); + handle_op_after_cancellation (exec_ctx, elem, op); + handle_op_after_cancellation (exec_ctx, elem, &op2); } else { @@ -413,7 +413,7 @@ perform_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, { calld->state = CALL_CANCELLED; gpr_mu_unlock (&calld->mu_state); - handle_op_after_cancellation (elem, op, closure_list); + handle_op_after_cancellation (exec_ctx, elem, op); } else { @@ -446,9 +446,9 @@ perform_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, gpr_mu_unlock (&calld->mu_state); grpc_closure_init (&calld->async_setup_task, picked_target, calld); - grpc_lb_policy_pick (lb_policy, bind_pollset, initial_metadata, &calld->picked_channel, &calld->async_setup_task, closure_list); + grpc_lb_policy_pick (exec_ctx, lb_policy, bind_pollset, initial_metadata, &calld->picked_channel, &calld->async_setup_task); - GRPC_LB_POLICY_UNREF (lb_policy, "pick", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "pick"); } else if (chand->resolver != NULL) { @@ -458,7 +458,7 @@ perform_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, { GRPC_CHANNEL_INTERNAL_REF (chand->master, "resolver"); chand->started_resolving = 1; - grpc_resolver_next (chand->resolver, &chand->incoming_configuration, &chand->on_config_changed, closure_list); + grpc_resolver_next (exec_ctx, chand->resolver, &chand->incoming_configuration, &chand->on_config_changed); } gpr_mu_unlock (&chand->mu_config); gpr_mu_unlock (&calld->mu_state); @@ -468,7 +468,7 @@ perform_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, calld->state = CALL_CANCELLED; gpr_mu_unlock (&chand->mu_config); gpr_mu_unlock (&calld->mu_state); - handle_op_after_cancellation (elem, op, closure_list); + handle_op_after_cancellation (exec_ctx, elem, op); } } } @@ -479,7 +479,7 @@ perform_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, static void cc_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { - perform_transport_stream_op (elem, op, 0, closure_list); + perform_transport_stream_op (exec_ctx, elem, op, 0); } static void watch_lb_policy (channel_data * chand, grpc_lb_policy * lb_policy, grpc_connectivity_state current_state, grpc_closure_list * cl); @@ -504,10 +504,10 @@ on_lb_policy_state_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_succe lb_policy_connectivity_watcher *w = arg; gpr_mu_lock (&w->chand->mu_config); - on_lb_policy_state_changed_locked (w, closure_list); + on_lb_policy_state_changed_locked (exec_ctx, w); gpr_mu_unlock (&w->chand->mu_config); - GRPC_CHANNEL_INTERNAL_UNREF (w->chand->master, "watch_lb_policy", closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, w->chand->master, "watch_lb_policy"); gpr_free (w); } @@ -521,7 +521,7 @@ watch_lb_policy (grpc_exec_ctx * exec_ctx, channel_data * chand, grpc_lb_policy grpc_closure_init (&w->on_changed, on_lb_policy_state_changed, w); w->state = current_state; w->lb_policy = lb_policy; - grpc_lb_policy_notify_on_state_change (lb_policy, &w->state, &w->on_changed, closure_list); + grpc_lb_policy_notify_on_state_change (exec_ctx, lb_policy, &w->state, &w->on_changed); } static void @@ -541,10 +541,10 @@ cc_on_config_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { GRPC_LB_POLICY_REF (lb_policy, "channel"); GRPC_LB_POLICY_REF (lb_policy, "config_change"); - state = grpc_lb_policy_check_connectivity (lb_policy, closure_list); + state = grpc_lb_policy_check_connectivity (exec_ctx, lb_policy); } - grpc_client_config_unref (chand->incoming_configuration, closure_list); + grpc_client_config_unref (exec_ctx, chand->incoming_configuration); } chand->incoming_configuration = NULL; @@ -554,7 +554,7 @@ cc_on_config_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) chand->lb_policy = lb_policy; if (lb_policy != NULL || chand->resolver == NULL /* disconnected */ ) { - grpc_closure_list_move (&chand->waiting_for_config_closures, closure_list); + grpc_closure_list_move (exec_ctx, &chand->waiting_for_config_closures); } if (lb_policy != NULL && chand->exit_idle_when_lb_policy_arrives) { @@ -567,47 +567,47 @@ cc_on_config_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { grpc_resolver *resolver = chand->resolver; GRPC_RESOLVER_REF (resolver, "channel-next"); - grpc_connectivity_state_set (&chand->state_tracker, state, "new_lb+resolver", closure_list); + grpc_connectivity_state_set (exec_ctx, &chand->state_tracker, state, "new_lb+resolver"); if (lb_policy != NULL) { - watch_lb_policy (chand, lb_policy, state, closure_list); + watch_lb_policy (exec_ctx, chand, lb_policy, state); } gpr_mu_unlock (&chand->mu_config); GRPC_CHANNEL_INTERNAL_REF (chand->master, "resolver"); - grpc_resolver_next (resolver, &chand->incoming_configuration, &chand->on_config_changed, closure_list); - GRPC_RESOLVER_UNREF (resolver, "channel-next", closure_list); + grpc_resolver_next (exec_ctx, resolver, &chand->incoming_configuration, &chand->on_config_changed); + GRPC_RESOLVER_UNREF (exec_ctx, resolver, "channel-next"); } else { old_resolver = chand->resolver; chand->resolver = NULL; - grpc_connectivity_state_set (&chand->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "resolver_gone", closure_list); + grpc_connectivity_state_set (exec_ctx, &chand->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "resolver_gone"); gpr_mu_unlock (&chand->mu_config); if (old_resolver != NULL) { - grpc_resolver_shutdown (old_resolver, closure_list); - GRPC_RESOLVER_UNREF (old_resolver, "channel", closure_list); + grpc_resolver_shutdown (exec_ctx, old_resolver); + GRPC_RESOLVER_UNREF (exec_ctx, old_resolver, "channel"); } } if (exit_idle) { - grpc_lb_policy_exit_idle (lb_policy, closure_list); - GRPC_LB_POLICY_UNREF (lb_policy, "exit_idle", closure_list); + grpc_lb_policy_exit_idle (exec_ctx, lb_policy); + GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "exit_idle"); } if (old_lb_policy != NULL) { - grpc_lb_policy_shutdown (old_lb_policy, closure_list); - GRPC_LB_POLICY_UNREF (old_lb_policy, "channel", closure_list); + grpc_lb_policy_shutdown (exec_ctx, old_lb_policy); + GRPC_LB_POLICY_UNREF (exec_ctx, old_lb_policy, "channel"); } if (lb_policy != NULL) { - GRPC_LB_POLICY_UNREF (lb_policy, "config_change", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "config_change"); } - GRPC_CHANNEL_INTERNAL_UNREF (chand->master, "resolver", closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, chand->master, "resolver"); } static void @@ -625,7 +625,7 @@ cc_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, gr gpr_mu_lock (&chand->mu_config); if (op->on_connectivity_state_change != NULL) { - grpc_connectivity_state_notify_on_state_change (&chand->state_tracker, op->connectivity_state, op->on_connectivity_state_change, closure_list); + grpc_connectivity_state_notify_on_state_change (exec_ctx, &chand->state_tracker, op->connectivity_state, op->on_connectivity_state_change); op->on_connectivity_state_change = NULL; op->connectivity_state = NULL; } @@ -641,13 +641,13 @@ cc_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, gr if (op->disconnect && chand->resolver != NULL) { - grpc_connectivity_state_set (&chand->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "disconnect", closure_list); + grpc_connectivity_state_set (exec_ctx, &chand->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "disconnect"); destroy_resolver = chand->resolver; chand->resolver = NULL; if (chand->lb_policy != NULL) { - grpc_lb_policy_shutdown (chand->lb_policy, closure_list); - GRPC_LB_POLICY_UNREF (chand->lb_policy, "channel", closure_list); + grpc_lb_policy_shutdown (exec_ctx, chand->lb_policy); + GRPC_LB_POLICY_UNREF (exec_ctx, chand->lb_policy, "channel"); chand->lb_policy = NULL; } } @@ -655,14 +655,14 @@ cc_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, gr if (destroy_resolver) { - grpc_resolver_shutdown (destroy_resolver, closure_list); - GRPC_RESOLVER_UNREF (destroy_resolver, "channel", closure_list); + grpc_resolver_shutdown (exec_ctx, destroy_resolver); + GRPC_RESOLVER_UNREF (exec_ctx, destroy_resolver, "channel"); } if (lb_policy) { - grpc_lb_policy_broadcast (lb_policy, op, closure_list); - GRPC_LB_POLICY_UNREF (lb_policy, "broadcast", closure_list); + grpc_lb_policy_broadcast (exec_ctx, lb_policy, op); + GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "broadcast"); } } @@ -699,7 +699,7 @@ destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) case CALL_ACTIVE: subchannel_call = calld->subchannel_call; gpr_mu_unlock (&calld->mu_state); - GRPC_SUBCHANNEL_CALL_UNREF (subchannel_call, "client_channel", closure_list); + GRPC_SUBCHANNEL_CALL_UNREF (exec_ctx, subchannel_call, "client_channel"); break; case CALL_CREATED: case CALL_CANCELLED: @@ -743,14 +743,14 @@ destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) if (chand->resolver != NULL) { - grpc_resolver_shutdown (chand->resolver, closure_list); - GRPC_RESOLVER_UNREF (chand->resolver, "channel", closure_list); + grpc_resolver_shutdown (exec_ctx, chand->resolver); + GRPC_RESOLVER_UNREF (exec_ctx, chand->resolver, "channel"); } if (chand->lb_policy != NULL) { - GRPC_LB_POLICY_UNREF (chand->lb_policy, "channel", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, chand->lb_policy, "channel"); } - grpc_connectivity_state_destroy (&chand->state_tracker, closure_list); + grpc_connectivity_state_destroy (exec_ctx, &chand->state_tracker); grpc_pollset_set_destroy (&chand->pollset_set); gpr_mu_destroy (&chand->mu_config); } @@ -782,7 +782,7 @@ grpc_client_channel_set_resolver (grpc_exec_ctx * exec_ctx, grpc_channel_stack * { chand->started_resolving = 1; GRPC_CHANNEL_INTERNAL_REF (chand->master, "resolver"); - grpc_resolver_next (resolver, &chand->incoming_configuration, &chand->on_config_changed, closure_list); + grpc_resolver_next (exec_ctx, resolver, &chand->incoming_configuration, &chand->on_config_changed); } gpr_mu_unlock (&chand->mu_config); } @@ -798,7 +798,7 @@ grpc_client_channel_check_connectivity_state (grpc_exec_ctx * exec_ctx, grpc_cha { if (chand->lb_policy != NULL) { - grpc_lb_policy_exit_idle (chand->lb_policy, closure_list); + grpc_lb_policy_exit_idle (exec_ctx, chand->lb_policy); } else { @@ -807,7 +807,7 @@ grpc_client_channel_check_connectivity_state (grpc_exec_ctx * exec_ctx, grpc_cha { GRPC_CHANNEL_INTERNAL_REF (chand->master, "resolver"); chand->started_resolving = 1; - grpc_resolver_next (chand->resolver, &chand->incoming_configuration, &chand->on_config_changed, closure_list); + grpc_resolver_next (exec_ctx, chand->resolver, &chand->incoming_configuration, &chand->on_config_changed); } } } @@ -820,7 +820,7 @@ grpc_client_channel_watch_connectivity_state (grpc_exec_ctx * exec_ctx, grpc_cha { channel_data *chand = elem->channel_data; gpr_mu_lock (&chand->mu_config); - grpc_connectivity_state_notify_on_state_change (&chand->state_tracker, state, on_complete, closure_list); + grpc_connectivity_state_notify_on_state_change (exec_ctx, &chand->state_tracker, state, on_complete); gpr_mu_unlock (&chand->mu_config); } @@ -835,12 +835,12 @@ void grpc_client_channel_add_interested_party (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_pollset * pollset) { channel_data *chand = elem->channel_data; - grpc_pollset_set_add_pollset (&chand->pollset_set, pollset, closure_list); + grpc_pollset_set_add_pollset (exec_ctx, &chand->pollset_set, pollset); } void grpc_client_channel_del_interested_party (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_pollset * pollset) { channel_data *chand = elem->channel_data; - grpc_pollset_set_del_pollset (&chand->pollset_set, pollset, closure_list); + grpc_pollset_set_del_pollset (exec_ctx, &chand->pollset_set, pollset); } diff --git a/src/core/channel/compress_filter.c b/src/core/channel/compress_filter.c index bf3c5a94571..6acdc720759 100644 --- a/src/core/channel/compress_filter.c +++ b/src/core/channel/compress_filter.c @@ -283,7 +283,7 @@ compress_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element } /* pass control down the stack */ - grpc_call_next_op (elem, op, closure_list); + grpc_call_next_op (exec_ctx, elem, op); } /* Constructor for call_data */ diff --git a/src/core/channel/connected_channel.c b/src/core/channel/connected_channel.c index 2fd80d2207d..71d18849f2f 100644 --- a/src/core/channel/connected_channel.c +++ b/src/core/channel/connected_channel.c @@ -73,14 +73,14 @@ con_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * ele GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); GRPC_CALL_LOG_OP (GPR_INFO, elem, op); - grpc_transport_perform_stream_op (chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (calld), op, closure_list); + grpc_transport_perform_stream_op (chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (exec_ctx, calld), op); } static void con_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_transport_op * op) { channel_data *chand = elem->channel_data; - grpc_transport_perform_op (chand->transport, op, closure_list); + grpc_transport_perform_op (exec_ctx, chand->transport, op); } /* Constructor for call_data */ @@ -92,7 +92,7 @@ init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void * int r; GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); - r = grpc_transport_init_stream (chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (calld), server_transport_data, initial_op, closure_list); + r = grpc_transport_init_stream (chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (exec_ctx, calld), server_transport_data, initial_op); GPR_ASSERT (r == 0); } @@ -103,7 +103,7 @@ destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); - grpc_transport_destroy_stream (chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (calld), closure_list); + grpc_transport_destroy_stream (chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (exec_ctx, calld)); } /* Constructor for channel_data */ @@ -122,14 +122,14 @@ destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) { channel_data *cd = (channel_data *) elem->channel_data; GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); - grpc_transport_destroy (cd->transport, closure_list); + grpc_transport_destroy (exec_ctx, cd->transport); } static char * con_get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { channel_data *chand = elem->channel_data; - return grpc_transport_get_peer (chand->transport, closure_list); + return grpc_transport_get_peer (exec_ctx, chand->transport); } const grpc_channel_filter grpc_connected_channel_filter = { diff --git a/src/core/channel/http_client_filter.c b/src/core/channel/http_client_filter.c index b2cc69bb4a3..7c8d7c02405 100644 --- a/src/core/channel/http_client_filter.c +++ b/src/core/channel/http_client_filter.c @@ -116,7 +116,7 @@ hc_on_recv (grpc_exec_ctx * exec_ctx, void *user_data, int success) a.closure_list = closure_list; grpc_metadata_batch_filter (&op->data.metadata, client_recv_filter, &a); } - calld->on_done_recv->cb (calld->on_done_recv->cb_arg, success, closure_list); + calld->on_done_recv->cb (exec_ctx, calld->on_done_recv->cb_arg, success); } static grpc_mdelem * @@ -181,7 +181,7 @@ hc_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_ { GRPC_CALL_LOG_OP (GPR_INFO, elem, op); hc_mutate_op (elem, op); - grpc_call_next_op (elem, op, closure_list); + grpc_call_next_op (exec_ctx, elem, op); } /* Constructor for call_data */ diff --git a/src/core/channel/http_server_filter.c b/src/core/channel/http_server_filter.c index 62be4167f72..6c5902e426f 100644 --- a/src/core/channel/http_server_filter.c +++ b/src/core/channel/http_server_filter.c @@ -219,11 +219,11 @@ hs_on_recv (grpc_exec_ctx * exec_ctx, void *user_data, int success) } /* Error this call out */ success = 0; - grpc_call_element_send_cancel (elem, closure_list); + grpc_call_element_send_cancel (exec_ctx, elem); } } } - calld->on_done_recv->cb (calld->on_done_recv->cb_arg, success, closure_list); + calld->on_done_recv->cb (exec_ctx, calld->on_done_recv->cb_arg, success); } static void @@ -264,7 +264,7 @@ hs_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_ { GRPC_CALL_LOG_OP (GPR_INFO, elem, op); hs_mutate_op (elem, op); - grpc_call_next_op (elem, op, closure_list); + grpc_call_next_op (exec_ctx, elem, op); } /* Constructor for call_data */ diff --git a/src/core/channel/noop_filter.c b/src/core/channel/noop_filter.c index 3a3f1254bd5..7e566642f93 100644 --- a/src/core/channel/noop_filter.c +++ b/src/core/channel/noop_filter.c @@ -74,7 +74,7 @@ noop_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * el noop_mutate_op (elem, op); /* pass control down the stack */ - grpc_call_next_op (elem, op, closure_list); + grpc_call_next_op (exec_ctx, elem, op); } /* Constructor for call_data */ diff --git a/src/core/client_config/client_config.c b/src/core/client_config/client_config.c index ceb52e93e5d..fc6448201f3 100644 --- a/src/core/client_config/client_config.c +++ b/src/core/client_config/client_config.c @@ -63,7 +63,7 @@ grpc_client_config_unref (grpc_exec_ctx * exec_ctx, grpc_client_config * c) { if (gpr_unref (&c->refs)) { - GRPC_LB_POLICY_UNREF (c->lb_policy, "client_config", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, c->lb_policy, "client_config"); gpr_free (c); } } diff --git a/src/core/client_config/connector.c b/src/core/client_config/connector.c index 823b82af5c7..209c3f1767c 100644 --- a/src/core/client_config/connector.c +++ b/src/core/client_config/connector.c @@ -42,17 +42,17 @@ grpc_connector_ref (grpc_connector * connector) void grpc_connector_unref (grpc_exec_ctx * exec_ctx, grpc_connector * connector) { - connector->vtable->unref (connector, closure_list); + connector->vtable->unref (exec_ctx, 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, closure_list); + connector->vtable->connect (exec_ctx, connector, in_args, out_args, notify); } void grpc_connector_shutdown (grpc_exec_ctx * exec_ctx, grpc_connector * connector) { - connector->vtable->shutdown (connector, closure_list); + connector->vtable->shutdown (exec_ctx, connector); } diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index 02aaac1dc3b..c07cc81b272 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -84,7 +84,7 @@ del_interested_parties_locked (grpc_exec_ctx * exec_ctx, pick_first_lb_policy * pending_pick *pp; for (pp = p->pending_picks; pp; pp = pp->next) { - grpc_subchannel_del_interested_party (p->subchannels[p->checking_subchannel], pp->pollset, closure_list); + grpc_subchannel_del_interested_party (exec_ctx, p->subchannels[p->checking_subchannel], pp->pollset); } } @@ -94,7 +94,7 @@ add_interested_parties_locked (grpc_exec_ctx * exec_ctx, pick_first_lb_policy * pending_pick *pp; for (pp = p->pending_picks; pp; pp = pp->next) { - grpc_subchannel_add_interested_party (p->subchannels[p->checking_subchannel], pp->pollset, closure_list); + grpc_subchannel_add_interested_party (exec_ctx, p->subchannels[p->checking_subchannel], pp->pollset); } } @@ -106,9 +106,9 @@ pf_destroy (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) GPR_ASSERT (p->pending_picks == NULL); for (i = 0; i < p->num_subchannels; i++) { - GRPC_SUBCHANNEL_UNREF (p->subchannels[i], "pick_first", closure_list); + GRPC_SUBCHANNEL_UNREF (exec_ctx, p->subchannels[i], "pick_first"); } - grpc_connectivity_state_destroy (&p->state_tracker, closure_list); + grpc_connectivity_state_destroy (exec_ctx, &p->state_tracker); gpr_free (p->subchannels); gpr_mu_destroy (&p->mu); gpr_free (p); @@ -120,11 +120,11 @@ pf_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) pick_first_lb_policy *p = (pick_first_lb_policy *) pol; pending_pick *pp; gpr_mu_lock (&p->mu); - del_interested_parties_locked (p, closure_list); + del_interested_parties_locked (exec_ctx, p); p->shutdown = 1; pp = p->pending_picks; p->pending_picks = NULL; - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "shutdown", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "shutdown"); gpr_mu_unlock (&p->mu); while (pp != NULL) { @@ -143,7 +143,7 @@ start_picking (grpc_exec_ctx * exec_ctx, pick_first_lb_policy * p) p->checking_subchannel = 0; p->checking_connectivity = GRPC_CHANNEL_IDLE; GRPC_LB_POLICY_REF (&p->base, "pick_first_connectivity"); - grpc_subchannel_notify_on_state_change (p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed, closure_list); + grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed); } void @@ -153,7 +153,7 @@ pf_exit_idle (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) gpr_mu_lock (&p->mu); if (!p->started_picking) { - start_picking (p, closure_list); + start_picking (exec_ctx, p); } gpr_mu_unlock (&p->mu); } @@ -174,9 +174,9 @@ pf_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_pollset * pollset, { if (!p->started_picking) { - start_picking (p, closure_list); + start_picking (exec_ctx, p); } - grpc_subchannel_add_interested_party (p->subchannels[p->checking_subchannel], pollset, closure_list); + grpc_subchannel_add_interested_party (exec_ctx, p->subchannels[p->checking_subchannel], pollset); pp = gpr_malloc (sizeof (*pp)); pp->next = p->pending_picks; pp->pollset = pollset; @@ -198,19 +198,19 @@ pf_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) if (p->shutdown) { gpr_mu_unlock (&p->mu); - GRPC_LB_POLICY_UNREF (&p->base, "pick_first_connectivity", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, &p->base, "pick_first_connectivity"); return; } else if (p->selected != NULL) { - grpc_connectivity_state_set (&p->state_tracker, p->checking_connectivity, "selected_changed", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, p->checking_connectivity, "selected_changed"); if (p->checking_connectivity != GRPC_CHANNEL_FATAL_FAILURE) { - grpc_subchannel_notify_on_state_change (p->selected, &p->checking_connectivity, &p->connectivity_changed, closure_list); + grpc_subchannel_notify_on_state_change (exec_ctx, p->selected, &p->checking_connectivity, &p->connectivity_changed); } else { - GRPC_LB_POLICY_UNREF (&p->base, "pick_first_connectivity", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, &p->base, "pick_first_connectivity"); } } else @@ -219,27 +219,27 @@ pf_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) switch (p->checking_connectivity) { case GRPC_CHANNEL_READY: - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_READY, "connecting_ready", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_READY, "connecting_ready"); p->selected = p->subchannels[p->checking_subchannel]; while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = p->selected; - grpc_subchannel_del_interested_party (p->selected, pp->pollset, closure_list); + grpc_subchannel_del_interested_party (exec_ctx, p->selected, pp->pollset); grpc_closure_list_add (closure_list, pp->on_complete, 1); gpr_free (pp); } - grpc_subchannel_notify_on_state_change (p->selected, &p->checking_connectivity, &p->connectivity_changed, closure_list); + grpc_subchannel_notify_on_state_change (exec_ctx, p->selected, &p->checking_connectivity, &p->connectivity_changed); break; case GRPC_CHANNEL_TRANSIENT_FAILURE: - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "connecting_transient_failure", closure_list); - del_interested_parties_locked (p, closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "connecting_transient_failure"); + del_interested_parties_locked (exec_ctx, p); p->checking_subchannel = (p->checking_subchannel + 1) % p->num_subchannels; p->checking_connectivity = grpc_subchannel_check_connectivity (p->subchannels[p->checking_subchannel]); - add_interested_parties_locked (p, closure_list); + add_interested_parties_locked (exec_ctx, p); if (p->checking_connectivity == GRPC_CHANNEL_TRANSIENT_FAILURE) { - grpc_subchannel_notify_on_state_change (p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed, closure_list); + grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed); } else { @@ -248,17 +248,17 @@ pf_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) break; case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_IDLE: - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_CONNECTING, "connecting_changed", closure_list); - grpc_subchannel_notify_on_state_change (p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed, closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_CONNECTING, "connecting_changed"); + grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed); break; case GRPC_CHANNEL_FATAL_FAILURE: - del_interested_parties_locked (p, closure_list); + del_interested_parties_locked (exec_ctx, p); GPR_SWAP (grpc_subchannel *, p->subchannels[p->checking_subchannel], p->subchannels[p->num_subchannels - 1]); p->num_subchannels--; - GRPC_SUBCHANNEL_UNREF (p->subchannels[p->num_subchannels], "pick_first", closure_list); + GRPC_SUBCHANNEL_UNREF (exec_ctx, p->subchannels[p->num_subchannels], "pick_first"); if (p->num_subchannels == 0) { - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "no_more_channels", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "no_more_channels"); while ((pp = p->pending_picks)) { p->pending_picks = pp->next; @@ -266,14 +266,14 @@ pf_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) grpc_closure_list_add (closure_list, pp->on_complete, 1); gpr_free (pp); } - GRPC_LB_POLICY_UNREF (&p->base, "pick_first_connectivity", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, &p->base, "pick_first_connectivity"); } else { - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "subchannel_failed", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "subchannel_failed"); p->checking_subchannel %= p->num_subchannels; p->checking_connectivity = grpc_subchannel_check_connectivity (p->subchannels[p->checking_subchannel]); - add_interested_parties_locked (p, closure_list); + add_interested_parties_locked (exec_ctx, p); goto loop; } } @@ -302,8 +302,8 @@ pf_broadcast (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_transport_op for (i = 0; i < n; i++) { - grpc_subchannel_process_transport_op (subchannels[i], op, closure_list); - GRPC_SUBCHANNEL_UNREF (subchannels[i], "pf_broadcast", closure_list); + grpc_subchannel_process_transport_op (exec_ctx, subchannels[i], op); + GRPC_SUBCHANNEL_UNREF (exec_ctx, subchannels[i], "pf_broadcast"); } gpr_free (subchannels); } @@ -324,7 +324,7 @@ pf_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_ { pick_first_lb_policy *p = (pick_first_lb_policy *) pol; gpr_mu_lock (&p->mu); - grpc_connectivity_state_notify_on_state_change (&p->state_tracker, current, notify, closure_list); + grpc_connectivity_state_notify_on_state_change (exec_ctx, &p->state_tracker, current, notify); gpr_mu_unlock (&p->mu); } diff --git a/src/core/client_config/lb_policies/round_robin.c b/src/core/client_config/lb_policies/round_robin.c index 959d9e1c320..b745628bbc9 100644 --- a/src/core/client_config/lb_policies/round_robin.c +++ b/src/core/client_config/lb_policies/round_robin.c @@ -233,7 +233,7 @@ del_interested_parties_locked (grpc_exec_ctx * exec_ctx, round_robin_lb_policy * pending_pick *pp; for (pp = p->pending_picks; pp; pp = pp->next) { - grpc_subchannel_del_interested_party (p->subchannels[subchannel_idx], pp->pollset, closure_list); + grpc_subchannel_del_interested_party (exec_ctx, p->subchannels[subchannel_idx], pp->pollset); } } @@ -245,16 +245,16 @@ rr_destroy (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) ready_list *elem; for (i = 0; i < p->num_subchannels; i++) { - del_interested_parties_locked (p, i, closure_list); + del_interested_parties_locked (exec_ctx, p, i); } for (i = 0; i < p->num_subchannels; i++) { - GRPC_SUBCHANNEL_UNREF (p->subchannels[i], "round_robin", closure_list); + GRPC_SUBCHANNEL_UNREF (exec_ctx, p->subchannels[i], "round_robin"); } gpr_free (p->connectivity_changed_cbs); gpr_free (p->subchannel_connectivity); - grpc_connectivity_state_destroy (&p->state_tracker, closure_list); + grpc_connectivity_state_destroy (exec_ctx, &p->state_tracker); gpr_free (p->subchannels); gpr_mu_destroy (&p->mu); @@ -284,7 +284,7 @@ rr_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) for (i = 0; i < p->num_subchannels; i++) { - del_interested_parties_locked (p, i, closure_list); + del_interested_parties_locked (exec_ctx, p, i); } p->shutdown = 1; @@ -295,7 +295,7 @@ rr_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) grpc_closure_list_add (closure_list, pp->on_complete, 0); gpr_free (pp); } - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "shutdown", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "shutdown"); gpr_mu_unlock (&p->mu); } @@ -308,7 +308,7 @@ start_picking (grpc_exec_ctx * exec_ctx, round_robin_lb_policy * p) for (i = 0; i < p->num_subchannels; i++) { p->subchannel_connectivity[i] = GRPC_CHANNEL_IDLE; - grpc_subchannel_notify_on_state_change (p->subchannels[i], &p->subchannel_connectivity[i], &p->connectivity_changed_cbs[i], closure_list); + grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[i], &p->subchannel_connectivity[i], &p->connectivity_changed_cbs[i]); GRPC_LB_POLICY_REF (&p->base, "round_robin_connectivity"); } } @@ -320,7 +320,7 @@ rr_exit_idle (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) gpr_mu_lock (&p->mu); if (!p->started_picking) { - start_picking (p, closure_list); + start_picking (exec_ctx, p); } gpr_mu_unlock (&p->mu); } @@ -343,17 +343,17 @@ rr_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_pollset * pollset, } /* only advance the last picked pointer if the selection was used */ advance_last_picked_locked (p); - on_complete->cb (on_complete->cb_arg, 1, closure_list); + on_complete->cb (exec_ctx, on_complete->cb_arg, 1); } else { if (!p->started_picking) { - start_picking (p, closure_list); + start_picking (exec_ctx, p); } for (i = 0; i < p->num_subchannels; i++) { - grpc_subchannel_add_interested_party (p->subchannels[i], pollset, closure_list); + grpc_subchannel_add_interested_party (exec_ctx, p->subchannels[i], pollset); } pp = gpr_malloc (sizeof (*pp)); pp->next = p->pending_picks; @@ -393,7 +393,7 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) switch (*this_connectivity) { case GRPC_CHANNEL_READY: - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_READY, "connecting_ready", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_READY, "connecting_ready"); /* add the newly connected subchannel to the list of connected ones. * Note that it goes to the "end of the line". */ p->subchannel_index_to_readylist_node[this_idx] = add_connected_sc_locked (p, p->subchannels[this_idx]); @@ -415,21 +415,21 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { gpr_log (GPR_DEBUG, "[RR CONN CHANGED] TARGET <-- SUBCHANNEL %p (NODE %p)", selected->subchannel, selected); } - grpc_subchannel_del_interested_party (selected->subchannel, pp->pollset, closure_list); + grpc_subchannel_del_interested_party (exec_ctx, selected->subchannel, pp->pollset); grpc_closure_list_add (closure_list, pp->on_complete, 1); gpr_free (pp); } - grpc_subchannel_notify_on_state_change (p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx], closure_list); + grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx]); break; case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_IDLE: - grpc_connectivity_state_set (&p->state_tracker, *this_connectivity, "connecting_changed", closure_list); - grpc_subchannel_notify_on_state_change (p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx], closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, *this_connectivity, "connecting_changed"); + grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx]); break; case GRPC_CHANNEL_TRANSIENT_FAILURE: - del_interested_parties_locked (p, this_idx, closure_list); + del_interested_parties_locked (exec_ctx, p, this_idx); /* renew state notification */ - grpc_subchannel_notify_on_state_change (p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx], closure_list); + grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx]); /* remove from ready list if still present */ if (p->subchannel_index_to_readylist_node[this_idx] != NULL) @@ -437,10 +437,10 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) remove_disconnected_sc_locked (p, p->subchannel_index_to_readylist_node[this_idx]); p->subchannel_index_to_readylist_node[this_idx] = NULL; } - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "connecting_transient_failure", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "connecting_transient_failure"); break; case GRPC_CHANNEL_FATAL_FAILURE: - del_interested_parties_locked (p, this_idx, closure_list); + del_interested_parties_locked (exec_ctx, p, this_idx); if (p->subchannel_index_to_readylist_node[this_idx] != NULL) { remove_disconnected_sc_locked (p, p->subchannel_index_to_readylist_node[this_idx]); @@ -449,11 +449,11 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) GPR_SWAP (grpc_subchannel *, p->subchannels[this_idx], p->subchannels[p->num_subchannels - 1]); p->num_subchannels--; - GRPC_SUBCHANNEL_UNREF (p->subchannels[p->num_subchannels], "round_robin", closure_list); + GRPC_SUBCHANNEL_UNREF (exec_ctx, p->subchannels[p->num_subchannels], "round_robin"); if (p->num_subchannels == 0) { - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "no_more_channels", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "no_more_channels"); while ((pp = p->pending_picks)) { p->pending_picks = pp->next; @@ -465,7 +465,7 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) } else { - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "subchannel_failed", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "subchannel_failed"); } } /* switch */ } /* !unref */ @@ -474,7 +474,7 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) if (unref) { - GRPC_LB_POLICY_UNREF (&p->base, "round_robin_connectivity", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, &p->base, "round_robin_connectivity"); } } @@ -498,8 +498,8 @@ rr_broadcast (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_transport_op for (i = 0; i < n; i++) { - grpc_subchannel_process_transport_op (subchannels[i], op, closure_list); - GRPC_SUBCHANNEL_UNREF (subchannels[i], "rr_broadcast", closure_list); + grpc_subchannel_process_transport_op (exec_ctx, subchannels[i], op); + GRPC_SUBCHANNEL_UNREF (exec_ctx, subchannels[i], "rr_broadcast"); } gpr_free (subchannels); } @@ -520,7 +520,7 @@ rr_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_ { round_robin_lb_policy *p = (round_robin_lb_policy *) pol; gpr_mu_lock (&p->mu); - grpc_connectivity_state_notify_on_state_change (&p->state_tracker, current, notify, closure_list); + grpc_connectivity_state_notify_on_state_change (exec_ctx, &p->state_tracker, current, notify); gpr_mu_unlock (&p->mu); } diff --git a/src/core/client_config/lb_policy.c b/src/core/client_config/lb_policy.c index 06ac41ff568..6a9cf668876 100644 --- a/src/core/client_config/lb_policy.c +++ b/src/core/client_config/lb_policy.c @@ -65,42 +65,42 @@ grpc_lb_policy_unref (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) #endif if (gpr_unref (&policy->refs)) { - policy->vtable->destroy (policy, closure_list); + policy->vtable->destroy (exec_ctx, policy); } } void grpc_lb_policy_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) { - policy->vtable->shutdown (policy, closure_list); + policy->vtable->shutdown (exec_ctx, policy); } void grpc_lb_policy_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete) { - policy->vtable->pick (policy, pollset, initial_metadata, target, on_complete, closure_list); + policy->vtable->pick (exec_ctx, policy, pollset, initial_metadata, target, on_complete); } void grpc_lb_policy_broadcast (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_transport_op * op) { - policy->vtable->broadcast (policy, op, closure_list); + policy->vtable->broadcast (exec_ctx, policy, op); } void grpc_lb_policy_exit_idle (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) { - policy->vtable->exit_idle (policy, closure_list); + policy->vtable->exit_idle (exec_ctx, policy); } void grpc_lb_policy_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_connectivity_state * state, grpc_closure * closure) { - policy->vtable->notify_on_state_change (policy, state, closure, closure_list); + policy->vtable->notify_on_state_change (exec_ctx, policy, state, closure); } grpc_connectivity_state grpc_lb_policy_check_connectivity (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) { - return policy->vtable->check_connectivity (policy, closure_list); + return policy->vtable->check_connectivity (exec_ctx, policy); } diff --git a/src/core/client_config/resolver.c b/src/core/client_config/resolver.c index cb5a6a53331..a55daad5a24 100644 --- a/src/core/client_config/resolver.c +++ b/src/core/client_config/resolver.c @@ -65,24 +65,24 @@ grpc_resolver_unref (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver) #endif if (gpr_unref (&resolver->refs)) { - resolver->vtable->destroy (resolver, closure_list); + resolver->vtable->destroy (exec_ctx, resolver); } } void grpc_resolver_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver) { - resolver->vtable->shutdown (resolver, closure_list); + resolver->vtable->shutdown (exec_ctx, resolver); } void grpc_resolver_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, struct sockaddr *failing_address, int failing_address_len) { - resolver->vtable->channel_saw_error (resolver, failing_address, failing_address_len, closure_list); + resolver->vtable->channel_saw_error (exec_ctx, resolver, failing_address, failing_address_len); } void grpc_resolver_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete) { - resolver->vtable->next (resolver, target_config, on_complete, closure_list); + resolver->vtable->next (exec_ctx, resolver, target_config, on_complete); } diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index 66430c43cbd..781f1a9e231 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -128,7 +128,7 @@ dns_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config } else { - dns_maybe_finish_next_locked (r, closure_list); + dns_maybe_finish_next_locked (exec_ctx, r); } gpr_mu_unlock (&r->mu); } @@ -152,14 +152,14 @@ dns_on_resolved (grpc_exec_ctx * exec_ctx, void *arg, grpc_resolved_addresses * memset (&args, 0, sizeof (args)); args.addr = (struct sockaddr *) (addresses->addrs[i].addr); args.addr_len = (size_t) addresses->addrs[i].len; - subchannels[i] = grpc_subchannel_factory_create_subchannel (r->subchannel_factory, &args, closure_list); + subchannels[i] = grpc_subchannel_factory_create_subchannel (exec_ctx, r->subchannel_factory, &args); } memset (&lb_policy_args, 0, sizeof (lb_policy_args)); lb_policy_args.subchannels = subchannels; lb_policy_args.num_subchannels = addresses->naddrs; lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args); grpc_client_config_set_lb_policy (config, lb_policy); - GRPC_LB_POLICY_UNREF (lb_policy, "construction", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "construction"); grpc_resolved_addresses_destroy (addresses); gpr_free (subchannels); } @@ -168,14 +168,14 @@ dns_on_resolved (grpc_exec_ctx * exec_ctx, void *arg, grpc_resolved_addresses * r->resolving = 0; if (r->resolved_config) { - grpc_client_config_unref (r->resolved_config, closure_list); + grpc_client_config_unref (exec_ctx, r->resolved_config); } r->resolved_config = config; r->resolved_version++; - dns_maybe_finish_next_locked (r, closure_list); + dns_maybe_finish_next_locked (exec_ctx, r); gpr_mu_unlock (&r->mu); - GRPC_RESOLVER_UNREF (&r->base, "dns-resolving", closure_list); + GRPC_RESOLVER_UNREF (exec_ctx, &r->base, "dns-resolving"); } static void @@ -210,9 +210,9 @@ dns_destroy (grpc_exec_ctx * exec_ctx, grpc_resolver * gr) gpr_mu_destroy (&r->mu); if (r->resolved_config) { - grpc_client_config_unref (r->resolved_config, closure_list); + grpc_client_config_unref (exec_ctx, r->resolved_config); } - grpc_subchannel_factory_unref (r->subchannel_factory, closure_list); + grpc_subchannel_factory_unref (exec_ctx, r->subchannel_factory); gpr_free (r->name); gpr_free (r->default_port); gpr_free (r->lb_policy_name); diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index 2887cffcd4f..1b2eac997d5 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -117,7 +117,7 @@ sockaddr_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_c GPR_ASSERT (!r->next_completion); r->next_completion = on_complete; r->target_config = target_config; - sockaddr_maybe_finish_next_locked (r, closure_list); + sockaddr_maybe_finish_next_locked (exec_ctx, r); gpr_mu_unlock (&r->mu); } @@ -140,7 +140,7 @@ sockaddr_maybe_finish_next_locked (grpc_exec_ctx * exec_ctx, sockaddr_resolver * memset (&args, 0, sizeof (args)); args.addr = (struct sockaddr *) &r->addrs[i]; args.addr_len = r->addrs_len[i]; - subchannels[i] = grpc_subchannel_factory_create_subchannel (r->subchannel_factory, &args, closure_list); + subchannels[i] = grpc_subchannel_factory_create_subchannel (exec_ctx, r->subchannel_factory, &args); } memset (&lb_policy_args, 0, sizeof (lb_policy_args)); lb_policy_args.subchannels = subchannels; @@ -148,7 +148,7 @@ sockaddr_maybe_finish_next_locked (grpc_exec_ctx * exec_ctx, sockaddr_resolver * lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args); gpr_free (subchannels); grpc_client_config_set_lb_policy (cfg, lb_policy); - GRPC_LB_POLICY_UNREF (lb_policy, "sockaddr", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "sockaddr"); r->published = 1; *r->target_config = cfg; grpc_closure_list_add (closure_list, r->next_completion, 1); @@ -161,7 +161,7 @@ sockaddr_destroy (grpc_exec_ctx * exec_ctx, grpc_resolver * gr) { sockaddr_resolver *r = (sockaddr_resolver *) gr; gpr_mu_destroy (&r->mu); - grpc_subchannel_factory_unref (r->subchannel_factory, closure_list); + grpc_subchannel_factory_unref (exec_ctx, r->subchannel_factory); gpr_free (r->addrs); gpr_free (r->addrs_len); gpr_free (r->lb_policy_name); diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index 1ab348da831..3db2fae5934 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -199,7 +199,7 @@ subchannel_unref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) static void connection_destroy (grpc_exec_ctx * exec_ctx, connection * c) { GPR_ASSERT (c->refs == 0); - grpc_channel_stack_destroy (CHANNEL_STACK_FROM_CONNECTION (c), closure_list); + grpc_channel_stack_destroy (CHANNEL_STACK_FROM_CONNECTION (exec_ctx, c)); gpr_free (c); } @@ -222,7 +222,7 @@ connection_unref_locked (connection * c, grpc_closure_list * closure_list GRPC_S } if (--c->refs == 0 && c->subchannel->active != c) { - connection_destroy (c, closure_list); + connection_destroy (exec_ctx, c); } return destroy; } @@ -261,7 +261,7 @@ grpc_subchannel_unref (grpc_subchannel * c, grpc_closure_list * closure_list GRP destroy = subchannel_unref_locked (c REF_PASS_ARGS); gpr_mu_unlock (&c->mu); if (destroy) - subchannel_destroy (c, closure_list); + subchannel_destroy (exec_ctx, c); } static void @@ -269,27 +269,27 @@ subchannel_destroy (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) { if (c->active != NULL) { - connection_destroy (c->active, closure_list); + connection_destroy (exec_ctx, c->active); } gpr_free (c->filters); grpc_channel_args_destroy (c->args); gpr_free (c->addr); grpc_mdctx_unref (c->mdctx); - grpc_connectivity_state_destroy (&c->state_tracker, closure_list); - grpc_connector_unref (c->connector, closure_list); + grpc_connectivity_state_destroy (exec_ctx, &c->state_tracker); + grpc_connector_unref (exec_ctx, c->connector); gpr_free (c); } void grpc_subchannel_add_interested_party (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc_pollset * pollset) { - grpc_pollset_set_add_pollset (c->pollset_set, pollset, closure_list); + grpc_pollset_set_add_pollset (exec_ctx, c->pollset_set, pollset); } void grpc_subchannel_del_interested_party (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc_pollset * pollset) { - grpc_pollset_set_del_pollset (c->pollset_set, pollset, closure_list); + grpc_pollset_set_del_pollset (exec_ctx, c->pollset_set, pollset); } static gpr_uint32 @@ -336,7 +336,7 @@ continue_connect (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) args.deadline = compute_connect_deadline (c); args.channel_args = c->args; - grpc_connector_connect (c->connector, &args, &c->connecting_result, &c->connected, closure_list); + grpc_connector_connect (exec_ctx, c->connector, &args, &c->connecting_result, &c->connected); } static void @@ -344,16 +344,16 @@ start_connect (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) { c->backoff_delta = gpr_time_from_seconds (GRPC_SUBCHANNEL_INITIAL_CONNECT_BACKOFF_SECONDS, GPR_TIMESPAN); c->next_attempt = gpr_time_add (gpr_now (GPR_CLOCK_MONOTONIC), c->backoff_delta); - continue_connect (c, closure_list); + continue_connect (exec_ctx, c); } static void continue_creating_call (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { waiting_for_connect *w4c = arg; - grpc_subchannel_del_interested_party (w4c->subchannel, w4c->pollset, closure_list); - grpc_subchannel_create_call (w4c->subchannel, w4c->pollset, w4c->target, w4c->notify, closure_list); - GRPC_SUBCHANNEL_UNREF (w4c->subchannel, "waiting_for_connect", closure_list); + grpc_subchannel_del_interested_party (exec_ctx, w4c->subchannel, w4c->pollset); + grpc_subchannel_create_call (exec_ctx, w4c->subchannel, w4c->pollset, w4c->target, w4c->notify); + GRPC_SUBCHANNEL_UNREF (exec_ctx, w4c->subchannel, "waiting_for_connect"); gpr_free (w4c); } @@ -368,8 +368,8 @@ grpc_subchannel_create_call (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc CONNECTION_REF_LOCKED (con, "call"); gpr_mu_unlock (&c->mu); - *target = create_call (con, closure_list); - notify->cb (notify->cb_arg, 1, closure_list); + *target = create_call (exec_ctx, con); + notify->cb (exec_ctx, notify->cb_arg, 1); } else { @@ -383,17 +383,17 @@ grpc_subchannel_create_call (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc SUBCHANNEL_REF_LOCKED (c, "waiting_for_connect"); grpc_closure_init (&w4c->continuation, continue_creating_call, w4c); c->waiting = w4c; - grpc_subchannel_add_interested_party (c, pollset, closure_list); + grpc_subchannel_add_interested_party (exec_ctx, c, pollset); if (!c->connecting) { c->connecting = 1; - connectivity_state_changed_locked (c, "create_call", closure_list); + connectivity_state_changed_locked (exec_ctx, c, "create_call"); /* released by connection */ SUBCHANNEL_REF_LOCKED (c, "connecting"); GRPC_CHANNEL_INTERNAL_REF (c->master, "connecting"); gpr_mu_unlock (&c->mu); - start_connect (c, closure_list); + start_connect (exec_ctx, c); } else { @@ -417,20 +417,20 @@ grpc_subchannel_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_subchanne { int do_connect = 0; gpr_mu_lock (&c->mu); - if (grpc_connectivity_state_notify_on_state_change (&c->state_tracker, state, notify, closure_list)) + if (grpc_connectivity_state_notify_on_state_change (exec_ctx, &c->state_tracker, state, notify)) { do_connect = 1; c->connecting = 1; /* released by connection */ SUBCHANNEL_REF_LOCKED (c, "connecting"); GRPC_CHANNEL_INTERNAL_REF (c->master, "connecting"); - connectivity_state_changed_locked (c, "state_change", closure_list); + connectivity_state_changed_locked (exec_ctx, c, "state_change"); } gpr_mu_unlock (&c->mu); if (do_connect) { - start_connect (c, closure_list); + start_connect (exec_ctx, c); } } @@ -449,7 +449,7 @@ grpc_subchannel_process_transport_op (grpc_exec_ctx * exec_ctx, grpc_subchannel if (op->disconnect) { c->disconnected = 1; - connectivity_state_changed_locked (c, "disconnect", closure_list); + connectivity_state_changed_locked (exec_ctx, c, "disconnect"); if (c->have_alarm) { cancel_alarm = 1; @@ -461,25 +461,25 @@ grpc_subchannel_process_transport_op (grpc_exec_ctx * exec_ctx, grpc_subchannel { 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, closure_list); + top_elem->filter->start_transport_op (exec_ctx, top_elem, op); gpr_mu_lock (&c->mu); - destroy = CONNECTION_UNREF_LOCKED (con, "transport-op", closure_list); + destroy = CONNECTION_UNREF_LOCKED (exec_ctx, con, "transport-op"); gpr_mu_unlock (&c->mu); if (destroy) { - subchannel_destroy (destroy, closure_list); + subchannel_destroy (exec_ctx, destroy); } } if (cancel_alarm) { - grpc_alarm_cancel (&c->alarm, closure_list); + grpc_alarm_cancel (exec_ctx, &c->alarm); } if (op->disconnect) { - grpc_connector_shutdown (c->connector, closure_list); + grpc_connector_shutdown (exec_ctx, c->connector); } } @@ -513,7 +513,7 @@ on_state_changed (grpc_exec_ctx * exec_ctx, void *p, int iomgr_success) op.connectivity_state = &sw->connectivity_state; op.on_connectivity_state_change = &sw->closure; elem = grpc_channel_stack_element (CHANNEL_STACK_FROM_CONNECTION (c->active), 0); - elem->filter->start_transport_op (elem, &op, closure_list); + elem->filter->start_transport_op (exec_ctx, elem, &op); /* early out */ gpr_mu_unlock (mu); return; @@ -525,22 +525,22 @@ on_state_changed (grpc_exec_ctx * exec_ctx, void *p, int iomgr_success) destroy_connection = sw->subchannel->active; } sw->subchannel->active = NULL; - grpc_connectivity_state_set (&c->state_tracker, c->disconnected ? GRPC_CHANNEL_FATAL_FAILURE : GRPC_CHANNEL_TRANSIENT_FAILURE, "connection_failed", closure_list); + grpc_connectivity_state_set (exec_ctx, &c->state_tracker, c->disconnected ? GRPC_CHANNEL_FATAL_FAILURE : GRPC_CHANNEL_TRANSIENT_FAILURE, "connection_failed"); break; } done: - connectivity_state_changed_locked (c, "transport_state_changed", closure_list); + connectivity_state_changed_locked (exec_ctx, c, "transport_state_changed"); destroy = SUBCHANNEL_UNREF_LOCKED (c, "state_watcher"); gpr_free (sw); gpr_mu_unlock (mu); if (destroy) { - subchannel_destroy (c, closure_list); + subchannel_destroy (exec_ctx, c); } if (destroy_connection != NULL) { - connection_destroy (destroy_connection, closure_list); + connection_destroy (exec_ctx, destroy_connection); } } @@ -571,7 +571,7 @@ publish_transport (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) stk = (grpc_channel_stack *) (con + 1); con->refs = 0; con->subchannel = c; - grpc_channel_stack_init (filters, num_filters, c->master, c->args, c->mdctx, stk, closure_list); + grpc_channel_stack_init (exec_ctx, filters, num_filters, c->master, c->args, c->mdctx, stk); grpc_connected_channel_bind_transport (stk, c->connecting_result.transport); gpr_free (c->connecting_result.filters); memset (&c->connecting_result, 0, sizeof (c->connecting_result)); @@ -589,9 +589,9 @@ publish_transport (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) gpr_mu_unlock (&c->mu); gpr_free (sw); gpr_free (filters); - grpc_channel_stack_destroy (stk, closure_list); - GRPC_CHANNEL_INTERNAL_UNREF (c->master, "connecting", closure_list); - GRPC_SUBCHANNEL_UNREF (c, "connecting", closure_list); + grpc_channel_stack_destroy (exec_ctx, stk); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, c->master, "connecting"); + GRPC_SUBCHANNEL_UNREF (exec_ctx, c, "connecting"); return; } @@ -612,13 +612,13 @@ publish_transport (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) op.on_connectivity_state_change = &sw->closure; op.bind_pollset_set = c->pollset_set; SUBCHANNEL_REF_LOCKED (c, "state_watcher"); - GRPC_CHANNEL_INTERNAL_UNREF (c->master, "connecting", closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, c->master, "connecting"); GPR_ASSERT (!SUBCHANNEL_UNREF_LOCKED (c, "connecting")); elem = grpc_channel_stack_element (CHANNEL_STACK_FROM_CONNECTION (c->active), 0); - elem->filter->start_transport_op (elem, &op, closure_list); + elem->filter->start_transport_op (exec_ctx, elem, &op); /* signal completion */ - connectivity_state_changed_locked (c, "connected", closure_list); + connectivity_state_changed_locked (exec_ctx, c, "connected"); w4c = c->waiting; c->waiting = NULL; @@ -635,7 +635,7 @@ publish_transport (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) if (destroy_connection != NULL) { - connection_destroy (destroy_connection, closure_list); + connection_destroy (exec_ctx, destroy_connection); } } @@ -677,17 +677,17 @@ on_alarm (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { iomgr_success = 0; } - connectivity_state_changed_locked (c, "alarm", closure_list); + connectivity_state_changed_locked (exec_ctx, c, "alarm"); gpr_mu_unlock (&c->mu); if (iomgr_success) { update_reconnect_parameters (c); - continue_connect (c, closure_list); + continue_connect (exec_ctx, c); } else { - GRPC_CHANNEL_INTERNAL_UNREF (c->master, "connecting", closure_list); - GRPC_SUBCHANNEL_UNREF (c, "connecting", closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, c->master, "connecting"); + GRPC_SUBCHANNEL_UNREF (exec_ctx, c, "connecting"); } } @@ -697,7 +697,7 @@ subchannel_connected (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) grpc_subchannel *c = arg; if (c->connecting_result.transport != NULL) { - publish_transport (c, closure_list); + publish_transport (exec_ctx, c); } else { @@ -705,8 +705,8 @@ subchannel_connected (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) gpr_mu_lock (&c->mu); GPR_ASSERT (!c->have_alarm); c->have_alarm = 1; - connectivity_state_changed_locked (c, "connect_failed", closure_list); - grpc_alarm_init (&c->alarm, c->next_attempt, on_alarm, c, now, closure_list); + connectivity_state_changed_locked (exec_ctx, c, "connect_failed"); + grpc_alarm_init (exec_ctx, &c->alarm, c->next_attempt, on_alarm, c, now); gpr_mu_unlock (&c->mu); } } @@ -747,7 +747,7 @@ static void connectivity_state_changed_locked (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, const char *reason) { grpc_connectivity_state current = compute_connectivity_locked (c); - grpc_connectivity_state_set (&c->state_tracker, current, reason, closure_list); + grpc_connectivity_state_set (exec_ctx, &c->state_tracker, current, reason); } /* @@ -767,14 +767,14 @@ grpc_subchannel_call_unref (grpc_subchannel_call * c, grpc_closure_list * closur { gpr_mu *mu = &c->connection->subchannel->mu; grpc_subchannel *destroy; - grpc_call_stack_destroy (SUBCHANNEL_CALL_TO_CALL_STACK (c), closure_list); + grpc_call_stack_destroy (SUBCHANNEL_CALL_TO_CALL_STACK (exec_ctx, c)); gpr_mu_lock (mu); - destroy = CONNECTION_UNREF_LOCKED (c->connection, "call", closure_list); + destroy = CONNECTION_UNREF_LOCKED (exec_ctx, c->connection, "call"); gpr_mu_unlock (mu); gpr_free (c); if (destroy != NULL) { - subchannel_destroy (destroy, closure_list); + subchannel_destroy (exec_ctx, destroy); } } } @@ -784,7 +784,7 @@ grpc_subchannel_call_get_peer (grpc_exec_ctx * exec_ctx, grpc_subchannel_call * { grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK (call); grpc_call_element *top_elem = grpc_call_stack_element (call_stack, 0); - return top_elem->filter->get_peer (top_elem, closure_list); + return top_elem->filter->get_peer (exec_ctx, top_elem); } void @@ -792,7 +792,7 @@ grpc_subchannel_call_process_op (grpc_exec_ctx * exec_ctx, grpc_subchannel_call { grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK (call); grpc_call_element *top_elem = grpc_call_stack_element (call_stack, 0); - top_elem->filter->start_transport_stream_op (top_elem, op, closure_list); + top_elem->filter->start_transport_stream_op (exec_ctx, top_elem, op); } static grpc_subchannel_call * @@ -803,6 +803,6 @@ create_call (grpc_exec_ctx * exec_ctx, connection * con) grpc_call_stack *callstk = SUBCHANNEL_CALL_TO_CALL_STACK (call); call->connection = con; gpr_ref_init (&call->refs, 1); - grpc_call_stack_init (chanstk, NULL, NULL, callstk, closure_list); + grpc_call_stack_init (exec_ctx, chanstk, NULL, NULL, callstk); return call; } diff --git a/src/core/client_config/subchannel_factory.c b/src/core/client_config/subchannel_factory.c index 82b851c2f7d..f60cd02421a 100644 --- a/src/core/client_config/subchannel_factory.c +++ b/src/core/client_config/subchannel_factory.c @@ -42,11 +42,11 @@ grpc_subchannel_factory_ref (grpc_subchannel_factory * factory) void grpc_subchannel_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory) { - factory->vtable->unref (factory, closure_list); + factory->vtable->unref (exec_ctx, factory); } grpc_subchannel * grpc_subchannel_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory, grpc_subchannel_args * args) { - return factory->vtable->create_subchannel (factory, args, closure_list); + return factory->vtable->create_subchannel (exec_ctx, factory, args); } diff --git a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c index 59af175da14..442862a4b80 100644 --- a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c +++ b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c @@ -56,7 +56,7 @@ merge_args_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * sc merge_args_factory *f = (merge_args_factory *) scf; if (gpr_unref (&f->refs)) { - grpc_subchannel_factory_unref (f->wrapped, closure_list); + grpc_subchannel_factory_unref (exec_ctx, f->wrapped); grpc_channel_args_destroy (f->merge_args); gpr_free (f); } @@ -69,7 +69,7 @@ merge_args_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_ grpc_channel_args *final_args = grpc_channel_args_merge (args->args, f->merge_args); grpc_subchannel *s; args->args = final_args; - s = grpc_subchannel_factory_create_subchannel (f->wrapped, args, closure_list); + s = grpc_subchannel_factory_create_subchannel (exec_ctx, f->wrapped, args); grpc_channel_args_destroy (final_args); return s; } diff --git a/src/core/httpcli/httpcli.c b/src/core/httpcli/httpcli.c index fac80a44a1d..b9dc350df9c 100644 --- a/src/core/httpcli/httpcli.c +++ b/src/core/httpcli/httpcli.c @@ -75,7 +75,7 @@ static grpc_httpcli_post_override g_post_override = NULL; static void plaintext_handshake (void *arg, grpc_endpoint * endpoint, const char *host, void (*on_done) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list)) { - on_done (arg, endpoint, closure_list); + on_done (exec_ctx, arg, endpoint); } const grpc_httpcli_handshaker grpc_httpcli_plaintext = { "http", @@ -99,8 +99,8 @@ static void next_address (grpc_exec_ctx * exec_ctx, internal_request * req); static void finish (grpc_exec_ctx * exec_ctx, internal_request * req, int success) { - grpc_pollset_set_del_pollset (&req->context->pollset_set, req->pollset, closure_list); - req->on_response (req->user_data, success ? &req->parser.r : NULL, closure_list); + grpc_pollset_set_del_pollset (exec_ctx, &req->context->pollset_set, req->pollset); + req->on_response (exec_ctx, req->user_data, success ? &req->parser.r : NULL); grpc_httpcli_parser_destroy (&req->parser); if (req->addresses != NULL) { @@ -108,7 +108,7 @@ finish (grpc_exec_ctx * exec_ctx, internal_request * req, int success) } if (req->ep != NULL) { - grpc_endpoint_destroy (req->ep, closure_list); + grpc_endpoint_destroy (exec_ctx, req->ep); } gpr_slice_unref (req->request_text); gpr_free (req->host); @@ -123,7 +123,7 @@ static void on_read (grpc_exec_ctx * exec_ctx, void *user_data, int success); static void do_read (grpc_exec_ctx * exec_ctx, internal_request * req) { - grpc_endpoint_read (req->ep, &req->incoming, &req->on_read, closure_list); + grpc_endpoint_read (exec_ctx, req->ep, &req->incoming, &req->on_read); } static void @@ -139,7 +139,7 @@ on_read (grpc_exec_ctx * exec_ctx, void *user_data, int success) req->have_read_byte = 1; if (!grpc_httpcli_parser_parse (&req->parser, req->incoming.slices[i])) { - finish (req, 0, closure_list); + finish (exec_ctx, req, 0); return; } } @@ -147,22 +147,22 @@ on_read (grpc_exec_ctx * exec_ctx, void *user_data, int success) if (success) { - do_read (req, closure_list); + do_read (exec_ctx, req); } else if (!req->have_read_byte) { - next_address (req, closure_list); + next_address (exec_ctx, req); } else { - finish (req, grpc_httpcli_parser_eof (&req->parser), closure_list); + finish (req, grpc_httpcli_parser_eof (exec_ctx, &req->parser)); } } static void on_written (grpc_exec_ctx * exec_ctx, internal_request * req) { - do_read (req, closure_list); + do_read (exec_ctx, req); } static void @@ -171,11 +171,11 @@ done_write (grpc_exec_ctx * exec_ctx, void *arg, int success) internal_request *req = arg; if (success) { - on_written (req, closure_list); + on_written (exec_ctx, req); } else { - next_address (req, closure_list); + next_address (exec_ctx, req); } } @@ -184,7 +184,7 @@ start_write (grpc_exec_ctx * exec_ctx, internal_request * req) { gpr_slice_ref (req->request_text); gpr_slice_buffer_add (&req->outgoing, req->request_text); - grpc_endpoint_write (req->ep, &req->outgoing, &req->done_write, closure_list); + grpc_endpoint_write (exec_ctx, req->ep, &req->outgoing, &req->done_write); } static void @@ -194,12 +194,12 @@ on_handshake_done (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * ep) if (!ep) { - next_address (req, closure_list); + next_address (exec_ctx, req); return; } req->ep = ep; - start_write (req, closure_list); + start_write (exec_ctx, req); } static void @@ -209,10 +209,10 @@ on_connected (grpc_exec_ctx * exec_ctx, void *arg, int success) if (!req->ep) { - next_address (req, closure_list); + next_address (exec_ctx, req); return; } - req->handshaker->handshake (req, req->ep, req->host, on_handshake_done, closure_list); + req->handshaker->handshake (exec_ctx, req, req->ep, req->host, on_handshake_done); } static void @@ -221,12 +221,12 @@ next_address (grpc_exec_ctx * exec_ctx, internal_request * req) grpc_resolved_address *addr; if (req->next_address == req->addresses->naddrs) { - finish (req, 0, closure_list); + finish (exec_ctx, req, 0); return; } addr = &req->addresses->addrs[req->next_address++]; grpc_closure_init (&req->connected, on_connected, req); - grpc_tcp_client_connect (&req->connected, &req->ep, &req->context->pollset_set, (struct sockaddr *) &addr->addr, addr->len, req->deadline, closure_list); + grpc_tcp_client_connect (&req->connected, &req->ep, &req->context->pollset_set, (exec_ctx, struct sockaddr *) &addr->addr, addr->len, req->deadline); } static void @@ -235,12 +235,12 @@ on_resolved (grpc_exec_ctx * exec_ctx, void *arg, grpc_resolved_addresses * addr internal_request *req = arg; if (!addresses) { - finish (req, 0, closure_list); + finish (exec_ctx, req, 0); return; } req->addresses = addresses; req->next_address = 0; - next_address (req, closure_list); + next_address (exec_ctx, req); } static void @@ -263,7 +263,7 @@ internal_request_begin (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context grpc_iomgr_register_object (&req->iomgr_obj, name); req->host = gpr_strdup (request->host); - grpc_pollset_set_add_pollset (&req->context->pollset_set, req->pollset, closure_list); + grpc_pollset_set_add_pollset (exec_ctx, &req->context->pollset_set, req->pollset); grpc_resolve_address (request->host, req->handshaker->default_port, on_resolved, req); } @@ -271,12 +271,12 @@ void grpc_httpcli_get (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { char *name; - if (g_get_override && g_get_override (request, deadline, on_response, user_data, closure_list)) + if (g_get_override && g_get_override (exec_ctx, request, deadline, on_response, user_data)) { return; } gpr_asprintf (&name, "HTTP:GET:%s:%s", request->host, request->path); - internal_request_begin (context, pollset, request, deadline, on_response, user_data, name, grpc_httpcli_format_get_request (request), closure_list); + internal_request_begin (context, pollset, request, deadline, on_response, user_data, name, grpc_httpcli_format_get_request (exec_ctx, request)); gpr_free (name); } @@ -284,12 +284,12 @@ void grpc_httpcli_post (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { char *name; - if (g_post_override && g_post_override (request, body_bytes, body_size, deadline, on_response, user_data, closure_list)) + if (g_post_override && g_post_override (exec_ctx, request, body_bytes, body_size, deadline, on_response, user_data)) { return; } gpr_asprintf (&name, "HTTP:POST:%s:%s", request->host, request->path); - internal_request_begin (context, pollset, request, deadline, on_response, user_data, name, grpc_httpcli_format_post_request (request, body_bytes, body_size), closure_list); + internal_request_begin (context, pollset, request, deadline, on_response, user_data, name, grpc_httpcli_format_post_request (exec_ctx, request, body_bytes, body_size)); gpr_free (name); } diff --git a/src/core/httpcli/httpcli_security_connector.c b/src/core/httpcli/httpcli_security_connector.c index 5760f27f093..a6ecfa993b3 100644 --- a/src/core/httpcli/httpcli_security_connector.c +++ b/src/core/httpcli/httpcli_security_connector.c @@ -70,18 +70,18 @@ httpcli_ssl_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc tsi_handshaker *handshaker; if (c->handshaker_factory == NULL) { - cb (user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, closure_list); + cb (exec_ctx, user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL); return; } result = tsi_ssl_handshaker_factory_create_handshaker (c->handshaker_factory, c->secure_peer_name, &handshaker); if (result != TSI_OK) { gpr_log (GPR_ERROR, "Handshaker creation failed with error %s.", tsi_result_to_string (result)); - cb (user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, closure_list); + cb (exec_ctx, user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL); } else { - grpc_do_security_handshake (handshaker, sc, nonsecure_endpoint, cb, user_data, closure_list); + grpc_do_security_handshake (exec_ctx, handshaker, sc, nonsecure_endpoint, cb, user_data); } } @@ -154,11 +154,11 @@ on_secure_transport_setup_done (grpc_exec_ctx * exec_ctx, void *rp, grpc_securit if (status != GRPC_SECURITY_OK) { gpr_log (GPR_ERROR, "Secure transport setup failed with error %d.", status); - c->func (c->arg, NULL, closure_list); + c->func (exec_ctx, c->arg, NULL); } else { - c->func (c->arg, secure_endpoint, closure_list); + c->func (exec_ctx, c->arg, secure_endpoint); } gpr_free (c); } @@ -173,14 +173,14 @@ ssl_handshake (void *arg, grpc_endpoint * tcp, const char *host, void (*on_done) if (pem_root_certs == NULL || pem_root_certs_size == 0) { gpr_log (GPR_ERROR, "Could not get default pem root certs."); - on_done (arg, NULL, closure_list); + on_done (exec_ctx, arg, NULL); gpr_free (c); return; } c->func = on_done; c->arg = arg; GPR_ASSERT (httpcli_ssl_channel_security_connector_create (pem_root_certs, pem_root_certs_size, host, &sc) == GRPC_SECURITY_OK); - grpc_security_connector_do_handshake (&sc->base, tcp, on_secure_transport_setup_done, c, closure_list); + grpc_security_connector_do_handshake (exec_ctx, &sc->base, tcp, on_secure_transport_setup_done, c); GRPC_SECURITY_CONNECTOR_UNREF (&sc->base, "httpcli"); } diff --git a/src/core/iomgr/alarm.c b/src/core/iomgr/alarm.c index b10335c6134..3110bd3cdfe 100644 --- a/src/core/iomgr/alarm.c +++ b/src/core/iomgr/alarm.c @@ -108,7 +108,7 @@ void grpc_alarm_list_shutdown (grpc_closure_list * closure_list) { int i; - run_some_expired_alarms (gpr_inf_future (g_clock_type), NULL, 0, closure_list); + run_some_expired_alarms (gpr_inf_future (exec_ctx, g_clock_type), NULL, 0); for (i = 0; i < NUM_SHARDS; i++) { shard_type *shard = &g_shards[i]; @@ -346,7 +346,7 @@ run_some_expired_alarms (grpc_exec_ctx * exec_ctx, gpr_timespec now, gpr_timespe /* For efficiency, we pop as many available alarms as we can from the shard. This may violate perfect alarm deadline ordering, but that shouldn't be a big deal because we don't make ordering guarantees. */ - n += pop_alarms (g_shard_queue[0], now, &new_min_deadline, success, closure_list); + n += pop_alarms (exec_ctx, g_shard_queue[0], now, &new_min_deadline, success); /* An grpc_alarm_init() on the shard could intervene here, adding a new alarm that is earlier than new_min_deadline. However, @@ -373,7 +373,7 @@ int grpc_alarm_check (grpc_exec_ctx * exec_ctx, gpr_timespec now, gpr_timespec * next) { GPR_ASSERT (now.clock_type == g_clock_type); - return run_some_expired_alarms (now, next, gpr_time_cmp (now, gpr_inf_future (now.clock_type)) != 0, closure_list); + return run_some_expired_alarms (now, next, gpr_time_cmp (now, gpr_inf_future (exec_ctx, now.clock_type)) != 0); } gpr_timespec diff --git a/src/core/iomgr/closure.c b/src/core/iomgr/closure.c index ae4350e8a92..cd02aac75e6 100644 --- a/src/core/iomgr/closure.c +++ b/src/core/iomgr/closure.c @@ -69,7 +69,7 @@ grpc_closure_list_run (grpc_closure_list * closure_list) while (c != NULL) { grpc_closure *next = c->next; - c->cb (c->cb_arg, c->success, closure_list); + c->cb (exec_ctx, c->cb_arg, c->success); c = next; } } diff --git a/src/core/iomgr/endpoint.c b/src/core/iomgr/endpoint.c index 20ad7fee13a..d0f272a00bf 100644 --- a/src/core/iomgr/endpoint.c +++ b/src/core/iomgr/endpoint.c @@ -36,37 +36,37 @@ void grpc_endpoint_read (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb) { - ep->vtable->read (ep, slices, cb, closure_list); + ep->vtable->read (exec_ctx, ep, slices, cb); } void grpc_endpoint_write (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb) { - ep->vtable->write (ep, slices, cb, closure_list); + ep->vtable->write (exec_ctx, 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 (ep, pollset, closure_list); + ep->vtable->add_to_pollset (exec_ctx, ep, pollset); } 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, closure_list); + ep->vtable->add_to_pollset_set (exec_ctx, ep, pollset_set); } void grpc_endpoint_shutdown (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep) { - ep->vtable->shutdown (ep, closure_list); + ep->vtable->shutdown (exec_ctx, ep); } void grpc_endpoint_destroy (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep) { - ep->vtable->destroy (ep, closure_list); + ep->vtable->destroy (exec_ctx, ep); } char * diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index 8ae63e2a89a..fb4e99605dc 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -370,7 +370,7 @@ set_ready (grpc_exec_ctx * exec_ctx, grpc_fd * fd, gpr_atm * st) /* only one set_ready can be active at once (but there may be a racing notify_on) */ gpr_mu_lock (&fd->set_state_mu); - set_ready_locked (fd, st, closure_list); + set_ready_locked (exec_ctx, fd, st); gpr_mu_unlock (&fd->set_state_mu); } @@ -380,21 +380,21 @@ grpc_fd_shutdown (grpc_exec_ctx * exec_ctx, grpc_fd * fd) gpr_mu_lock (&fd->set_state_mu); GPR_ASSERT (!gpr_atm_no_barrier_load (&fd->shutdown)); gpr_atm_rel_store (&fd->shutdown, 1); - set_ready_locked (fd, &fd->readst, closure_list); - set_ready_locked (fd, &fd->writest, closure_list); + set_ready_locked (exec_ctx, fd, &fd->readst); + set_ready_locked (exec_ctx, fd, &fd->writest); gpr_mu_unlock (&fd->set_state_mu); } void grpc_fd_notify_on_read (grpc_exec_ctx * exec_ctx, grpc_fd * fd, grpc_closure * closure) { - notify_on (fd, &fd->readst, closure, closure_list); + notify_on (exec_ctx, fd, &fd->readst, closure); } void grpc_fd_notify_on_write (grpc_exec_ctx * exec_ctx, grpc_fd * fd, grpc_closure * closure) { - notify_on (fd, &fd->writest, closure, closure_list); + notify_on (exec_ctx, fd, &fd->writest, closure); } gpr_uint32 @@ -493,13 +493,13 @@ grpc_fd_end_poll (grpc_exec_ctx * exec_ctx, grpc_fd_watcher * watcher, int got_r void grpc_fd_become_readable (grpc_exec_ctx * exec_ctx, grpc_fd * fd) { - set_ready (fd, &fd->readst, closure_list); + set_ready (exec_ctx, fd, &fd->readst); } void grpc_fd_become_writable (grpc_exec_ctx * exec_ctx, grpc_fd * fd) { - set_ready (fd, &fd->writest, closure_list); + set_ready (exec_ctx, fd, &fd->writest); } #endif diff --git a/src/core/iomgr/pollset_multipoller_with_epoll.c b/src/core/iomgr/pollset_multipoller_with_epoll.c index e5f0d99e542..a9ee5a45742 100644 --- a/src/core/iomgr/pollset_multipoller_with_epoll.c +++ b/src/core/iomgr/pollset_multipoller_with_epoll.c @@ -90,7 +90,7 @@ finally_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd) } } } - grpc_fd_end_poll (&watcher, 0, 0, closure_list); + grpc_fd_end_poll (exec_ctx, &watcher, 0, 0); } static void @@ -100,7 +100,7 @@ perform_delayed_add (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_status) if (!grpc_fd_is_orphaned (da->fd)) { - finally_add_fd (da->pollset, da->fd, closure_list); + finally_add_fd (exec_ctx, da->pollset, da->fd); } gpr_mu_lock (&da->pollset->mu); @@ -127,7 +127,7 @@ multipoll_with_epoll_pollset_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * po if (and_unlock_pollset) { gpr_mu_unlock (&pollset->mu); - finally_add_fd (pollset, fd, closure_list); + finally_add_fd (exec_ctx, pollset, fd); } else { @@ -235,11 +235,11 @@ multipoll_with_epoll_pollset_maybe_work_and_unlock (grpc_exec_ctx * exec_ctx, gr int write = ep_ev[i].events & EPOLLOUT; if (read || cancel) { - grpc_fd_become_readable (fd, closure_list); + grpc_fd_become_readable (exec_ctx, fd); } if (write || cancel) { - grpc_fd_become_writable (fd, closure_list); + grpc_fd_become_writable (exec_ctx, fd); } } } @@ -286,7 +286,7 @@ epoll_become_multipoller (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc } for (i = 0; i < nfds; i++) { - multipoll_with_epoll_pollset_add_fd (pollset, fds[i], 0, closure_list); + multipoll_with_epoll_pollset_add_fd (exec_ctx, pollset, fds[i], 0); } } diff --git a/src/core/iomgr/pollset_multipoller_with_poll_posix.c b/src/core/iomgr/pollset_multipoller_with_poll_posix.c index 8417b7491a0..b7eb6c0ab03 100644 --- a/src/core/iomgr/pollset_multipoller_with_poll_posix.c +++ b/src/core/iomgr/pollset_multipoller_with_poll_posix.c @@ -163,7 +163,7 @@ multipoll_with_poll_pollset_maybe_work_and_unlock (grpc_exec_ctx * exec_ctx, grp for (i = 1; i < pfd_count; i++) { - grpc_fd_end_poll (&watchers[i], pfds[i].revents & POLLIN, pfds[i].revents & POLLOUT, closure_list); + grpc_fd_end_poll (exec_ctx, &watchers[i], pfds[i].revents & POLLIN, pfds[i].revents & POLLOUT); } if (r < 0) @@ -191,11 +191,11 @@ multipoll_with_poll_pollset_maybe_work_and_unlock (grpc_exec_ctx * exec_ctx, grp } if (pfds[i].revents & (POLLIN | POLLHUP | POLLERR)) { - grpc_fd_become_readable (watchers[i].fd, closure_list); + grpc_fd_become_readable (exec_ctx, watchers[i].fd); } if (pfds[i].revents & (POLLOUT | POLLHUP | POLLERR)) { - grpc_fd_become_writable (watchers[i].fd, closure_list); + grpc_fd_become_writable (exec_ctx, watchers[i].fd); } } } diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index ad5c42aac38..c15b1f1908f 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -172,7 +172,7 @@ void grpc_pollset_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd) { gpr_mu_lock (&pollset->mu); - pollset->vtable->add_fd (pollset, fd, 1, closure_list); + pollset->vtable->add_fd (exec_ctx, pollset, fd, 1); /* the following (enabled only in debug) will reacquire and then release our lock - meaning that if the unlocking flag passed to del_fd above is not respected, the code will deadlock (in a way that we have a chance of @@ -187,7 +187,7 @@ void grpc_pollset_del_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd) { gpr_mu_lock (&pollset->mu); - pollset->vtable->del_fd (pollset, fd, 1, closure_list); + pollset->vtable->del_fd (exec_ctx, pollset, fd, 1); /* the following (enabled only in debug) will reacquire and then release our lock - meaning that if the unlocking flag passed to del_fd above is not respected, the code will deadlock (in a way that we have a chance of @@ -217,10 +217,10 @@ grpc_pollset_work (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollse grpc_wakeup_fd_init (&worker->wakeup_fd); if (!grpc_pollset_has_workers (pollset) && !grpc_closure_list_empty (pollset->idle_jobs)) { - grpc_closure_list_move (&pollset->idle_jobs, closure_list); + grpc_closure_list_move (exec_ctx, &pollset->idle_jobs); goto done; } - if (grpc_alarm_check (now, &deadline, closure_list)) + if (grpc_alarm_check (exec_ctx, now, &deadline)) { goto done; } @@ -240,7 +240,7 @@ grpc_pollset_work (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollse push_front_worker (pollset, worker); added_worker = 1; gpr_tls_set (&g_current_thread_poller, (gpr_intptr) pollset); - pollset->vtable->maybe_work_and_unlock (pollset, worker, deadline, now, closure_list); + pollset->vtable->maybe_work_and_unlock (exec_ctx, pollset, worker, deadline, now); locked = 0; gpr_tls_set (&g_current_thread_poller, 0); } @@ -270,7 +270,7 @@ done: { pollset->called_shutdown = 1; gpr_mu_unlock (&pollset->mu); - finish_shutdown (pollset, closure_list); + finish_shutdown (exec_ctx, pollset); grpc_closure_list_run (closure_list); /* Continuing to access pollset here is safe -- it is the caller's * responsibility to not destroy when it has outstanding calls to @@ -299,7 +299,7 @@ grpc_pollset_shutdown (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_cl if (call_shutdown) { - finish_shutdown (pollset, closure_list); + finish_shutdown (exec_ctx, pollset); } } @@ -387,7 +387,7 @@ basic_do_promote (grpc_exec_ctx * exec_ctx, void *args, int success) } else if (pollset->vtable != original_vtable) { - pollset->vtable->add_fd (pollset, fd, 0, closure_list); + pollset->vtable->add_fd (exec_ctx, pollset, fd, 0); } else if (fd != pollset->data.ptr) { @@ -397,7 +397,7 @@ basic_do_promote (grpc_exec_ctx * exec_ctx, void *args, int success) if (fds[0] && !grpc_fd_is_orphaned (fds[0])) { - grpc_platform_become_multipoller (pollset, fds, GPR_ARRAY_SIZE (fds), closure_list); + grpc_platform_become_multipoller (pollset, fds, GPR_ARRAY_SIZE (exec_ctx, fds)); GRPC_FD_UNREF (fds[0], "basicpoll"); } else @@ -445,7 +445,7 @@ basic_pollset_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd } else if (!grpc_fd_is_orphaned (fds[0])) { - grpc_platform_become_multipoller (pollset, fds, GPR_ARRAY_SIZE (fds), closure_list); + grpc_platform_become_multipoller (pollset, fds, GPR_ARRAY_SIZE (exec_ctx, fds)); GRPC_FD_UNREF (fds[0], "basicpoll"); } else @@ -540,7 +540,7 @@ basic_pollset_maybe_work_and_unlock (grpc_exec_ctx * exec_ctx, grpc_pollset * po if (fd) { - grpc_fd_end_poll (&fd_watcher, pfd[1].revents & POLLIN, pfd[1].revents & POLLOUT, closure_list); + grpc_fd_end_poll (exec_ctx, &fd_watcher, pfd[1].revents & POLLIN, pfd[1].revents & POLLOUT); } if (r < 0) @@ -564,11 +564,11 @@ basic_pollset_maybe_work_and_unlock (grpc_exec_ctx * exec_ctx, grpc_pollset * po { if (pfd[1].revents & (POLLIN | POLLHUP | POLLERR)) { - grpc_fd_become_readable (fd, closure_list); + grpc_fd_become_readable (exec_ctx, fd); } if (pfd[1].revents & (POLLOUT | POLLHUP | POLLERR)) { - grpc_fd_become_writable (fd, closure_list); + grpc_fd_become_writable (exec_ctx, fd); } } } diff --git a/src/core/iomgr/pollset_set_posix.c b/src/core/iomgr/pollset_set_posix.c index 83be0b91c9f..cb2e6aede3c 100644 --- a/src/core/iomgr/pollset_set_posix.c +++ b/src/core/iomgr/pollset_set_posix.c @@ -82,7 +82,7 @@ grpc_pollset_set_add_pollset (grpc_exec_ctx * exec_ctx, grpc_pollset_set * polls } else { - grpc_pollset_add_fd (pollset, pollset_set->fds[i], closure_list); + grpc_pollset_add_fd (exec_ctx, pollset, pollset_set->fds[i]); pollset_set->fds[j++] = pollset_set->fds[i]; } } @@ -121,7 +121,7 @@ grpc_pollset_set_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset_set * pollset_se pollset_set->fds[pollset_set->fd_count++] = fd; for (i = 0; i < pollset_set->pollset_count; i++) { - grpc_pollset_add_fd (pollset_set->pollsets[i], fd, closure_list); + grpc_pollset_add_fd (exec_ctx, pollset_set->pollsets[i], fd); } gpr_mu_unlock (&pollset_set->mu); } diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c index cca626228ad..69384ef4847 100644 --- a/src/core/iomgr/tcp_client_posix.c +++ b/src/core/iomgr/tcp_client_posix.c @@ -106,7 +106,7 @@ tc_on_alarm (grpc_exec_ctx * exec_ctx, void *acp, int success) gpr_mu_lock (&ac->mu); if (ac->fd != NULL) { - grpc_fd_shutdown (ac->fd, closure_list); + grpc_fd_shutdown (exec_ctx, ac->fd); } done = (--ac->refs == 0); gpr_mu_unlock (&ac->mu); @@ -141,7 +141,7 @@ on_writable (grpc_exec_ctx * exec_ctx, void *acp, int success) ac->fd = NULL; gpr_mu_unlock (&ac->mu); - grpc_alarm_cancel (&ac->alarm, closure_list); + grpc_alarm_cancel (exec_ctx, &ac->alarm); gpr_mu_lock (&ac->mu); if (success) @@ -177,7 +177,7 @@ on_writable (grpc_exec_ctx * exec_ctx, void *acp, int success) 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, closure_list); + grpc_fd_notify_on_write (exec_ctx, fd, &ac->write_closure); return; } else @@ -196,7 +196,7 @@ on_writable (grpc_exec_ctx * exec_ctx, void *acp, int success) } else { - grpc_pollset_set_del_fd (ac->interested_parties, fd, closure_list); + grpc_pollset_set_del_fd (exec_ctx, ac->interested_parties, fd); *ep = grpc_tcp_create (fd, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, ac->addr_str); fd = NULL; goto finish; @@ -213,8 +213,8 @@ on_writable (grpc_exec_ctx * exec_ctx, void *acp, int success) finish: if (fd != NULL) { - grpc_pollset_set_del_fd (ac->interested_parties, fd, closure_list); - grpc_fd_orphan (fd, NULL, "tcp_client_orphan", closure_list); + grpc_pollset_set_del_fd (exec_ctx, ac->interested_parties, fd); + grpc_fd_orphan (exec_ctx, fd, NULL, "tcp_client_orphan"); fd = NULL; } done = (--ac->refs == 0); @@ -290,12 +290,12 @@ grpc_tcp_client_connect (grpc_exec_ctx * exec_ctx, grpc_closure * closure, grpc_ if (errno != EWOULDBLOCK && errno != EINPROGRESS) { gpr_log (GPR_ERROR, "connect error to '%s': %s", addr_str, strerror (errno)); - grpc_fd_orphan (fdobj, NULL, "tcp_client_connect_error", closure_list); + grpc_fd_orphan (exec_ctx, fdobj, NULL, "tcp_client_connect_error"); grpc_closure_list_add (closure_list, closure, 0); goto done; } - grpc_pollset_set_add_fd (interested_parties, fdobj, closure_list); + grpc_pollset_set_add_fd (exec_ctx, interested_parties, fdobj); ac = gpr_malloc (sizeof (async_connect)); ac->closure = closure; @@ -315,8 +315,8 @@ grpc_tcp_client_connect (grpc_exec_ctx * exec_ctx, grpc_closure * closure, grpc_ } gpr_mu_lock (&ac->mu); - grpc_alarm_init (&ac->alarm, gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC), tc_on_alarm, ac, gpr_now (GPR_CLOCK_MONOTONIC), closure_list); - grpc_fd_notify_on_write (ac->fd, &ac->write_closure, closure_list); + grpc_alarm_init (&ac->alarm, gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC), tc_on_alarm, ac, gpr_now (exec_ctx, GPR_CLOCK_MONOTONIC)); + grpc_fd_notify_on_write (exec_ctx, ac->fd, &ac->write_closure); gpr_mu_unlock (&ac->mu); done: diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c index bc9f566c6a5..66895f3744f 100644 --- a/src/core/iomgr/tcp_posix.c +++ b/src/core/iomgr/tcp_posix.c @@ -104,13 +104,13 @@ static void tcp_shutdown (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep) { grpc_tcp *tcp = (grpc_tcp *) ep; - grpc_fd_shutdown (tcp->em_fd, closure_list); + grpc_fd_shutdown (exec_ctx, tcp->em_fd); } static void tcp_free (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) { - grpc_fd_orphan (tcp->em_fd, NULL, "tcp_unref_orphan", closure_list); + grpc_fd_orphan (exec_ctx, tcp->em_fd, NULL, "tcp_unref_orphan"); gpr_free (tcp->peer_string); gpr_free (tcp); } @@ -126,7 +126,7 @@ tcp_unref (grpc_tcp * tcp, grpc_closure_list * closure_list, const char *reason, gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "TCP unref %p : %s %d -> %d", tcp, reason, tcp->refcount.count, tcp->refcount.count - 1); if (gpr_unref (&tcp->refcount)) { - tcp_free (tcp, closure_list); + tcp_free (exec_ctx, tcp); } } @@ -144,7 +144,7 @@ tcp_unref (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) { if (gpr_unref (&tcp->refcount)) { - tcp_free (tcp, closure_list); + tcp_free (exec_ctx, tcp); } } @@ -159,7 +159,7 @@ static void tcp_destroy (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep) { grpc_tcp *tcp = (grpc_tcp *) ep; - TCP_UNREF (tcp, "destroy", closure_list); + TCP_UNREF (exec_ctx, tcp, "destroy"); } static void @@ -182,7 +182,7 @@ call_read_cb (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp, int success) tcp->read_cb = NULL; tcp->incoming_buffer = NULL; - cb->cb (cb->cb_arg, success, closure_list); + cb->cb (exec_ctx, cb->cb_arg, success); } #define MAX_READ_IOVEC 4 @@ -236,22 +236,22 @@ tcp_continue_read (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) tcp->iov_size /= 2; } /* We've consumed the edge, request a new one */ - grpc_fd_notify_on_read (tcp->em_fd, &tcp->read_closure, closure_list); + grpc_fd_notify_on_read (exec_ctx, tcp->em_fd, &tcp->read_closure); } else { /* TODO(klempner): Log interesting errors */ gpr_slice_buffer_reset_and_unref (tcp->incoming_buffer); - call_read_cb (tcp, 0, closure_list); - TCP_UNREF (tcp, "read", closure_list); + call_read_cb (exec_ctx, tcp, 0); + TCP_UNREF (exec_ctx, tcp, "read"); } } else if (read_bytes == 0) { /* 0 read size ==> end of stream */ gpr_slice_buffer_reset_and_unref (tcp->incoming_buffer); - call_read_cb (tcp, 0, closure_list); - TCP_UNREF (tcp, "read", closure_list); + call_read_cb (exec_ctx, tcp, 0); + TCP_UNREF (exec_ctx, tcp, "read"); } else { @@ -265,8 +265,8 @@ tcp_continue_read (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) ++tcp->iov_size; } GPR_ASSERT ((size_t) read_bytes == tcp->incoming_buffer->length); - call_read_cb (tcp, 1, closure_list); - TCP_UNREF (tcp, "read", closure_list); + call_read_cb (exec_ctx, tcp, 1); + TCP_UNREF (exec_ctx, tcp, "read"); } GRPC_TIMER_END (GRPC_PTAG_HANDLE_READ, 0); @@ -282,12 +282,12 @@ tcp_handle_read (void *arg /* grpc_tcp */ , int success, if (!success) { gpr_slice_buffer_reset_and_unref (tcp->incoming_buffer); - call_read_cb (tcp, 0, closure_list); - TCP_UNREF (tcp, "read", closure_list); + call_read_cb (exec_ctx, tcp, 0); + TCP_UNREF (exec_ctx, tcp, "read"); } else { - tcp_continue_read (tcp, closure_list); + tcp_continue_read (exec_ctx, tcp); } } @@ -303,7 +303,7 @@ tcp_read (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * incom if (tcp->finished_edge) { tcp->finished_edge = 0; - grpc_fd_notify_on_read (tcp->em_fd, &tcp->read_closure, closure_list); + grpc_fd_notify_on_read (exec_ctx, tcp->em_fd, &tcp->read_closure); } else { @@ -412,8 +412,8 @@ tcp_handle_write (void *arg /* grpc_tcp */ , int success, { cb = tcp->write_cb; tcp->write_cb = NULL; - cb->cb (cb->cb_arg, 0, closure_list); - TCP_UNREF (tcp, "write", closure_list); + cb->cb (exec_ctx, cb->cb_arg, 0); + TCP_UNREF (exec_ctx, tcp, "write"); return; } @@ -421,14 +421,14 @@ tcp_handle_write (void *arg /* grpc_tcp */ , int success, status = tcp_flush (tcp); if (status == FLUSH_PENDING) { - grpc_fd_notify_on_write (tcp->em_fd, &tcp->write_closure, closure_list); + grpc_fd_notify_on_write (exec_ctx, tcp->em_fd, &tcp->write_closure); } else { cb = tcp->write_cb; tcp->write_cb = NULL; - cb->cb (cb->cb_arg, status == FLUSH_DONE, closure_list); - TCP_UNREF (tcp, "write", closure_list); + cb->cb (exec_ctx, cb->cb_arg, status == FLUSH_DONE); + TCP_UNREF (exec_ctx, tcp, "write"); } GRPC_TIMER_END (GRPC_PTAG_TCP_CB_WRITE, 0); } @@ -469,7 +469,7 @@ tcp_write (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * buf, { TCP_REF (tcp, "write"); tcp->write_cb = cb; - grpc_fd_notify_on_write (tcp->em_fd, &tcp->write_closure, closure_list); + grpc_fd_notify_on_write (exec_ctx, tcp->em_fd, &tcp->write_closure); } else { @@ -483,14 +483,14 @@ 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, closure_list); + grpc_pollset_add_fd (exec_ctx, pollset, tcp->em_fd); } 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, closure_list); + grpc_pollset_set_add_fd (exec_ctx, pollset_set, tcp->em_fd); } static char * diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c index ee462aabd41..2d42e03ce05 100644 --- a/src/core/iomgr/tcp_server_posix.c +++ b/src/core/iomgr/tcp_server_posix.c @@ -168,7 +168,7 @@ destroyed_port (grpc_exec_ctx * exec_ctx, void *server, int success) if (s->destroyed_ports == s->nports) { gpr_mu_unlock (&s->mu); - finish_shutdown (s, closure_list); + finish_shutdown (exec_ctx, s); } else { @@ -205,14 +205,14 @@ deactivated_all_ports (grpc_exec_ctx * exec_ctx, grpc_tcp_server * s) } sp->destroyed_closure.cb = destroyed_port; sp->destroyed_closure.cb_arg = s; - grpc_fd_orphan (sp->emfd, &sp->destroyed_closure, "tcp_listener_shutdown", closure_list); + grpc_fd_orphan (exec_ctx, sp->emfd, &sp->destroyed_closure, "tcp_listener_shutdown"); } gpr_mu_unlock (&s->mu); } else { gpr_mu_unlock (&s->mu); - finish_shutdown (s, closure_list); + finish_shutdown (exec_ctx, s); } } @@ -232,14 +232,14 @@ grpc_tcp_server_destroy (grpc_exec_ctx * exec_ctx, grpc_tcp_server * s, grpc_clo { for (i = 0; i < s->nports; i++) { - grpc_fd_shutdown (s->ports[i].emfd, closure_list); + grpc_fd_shutdown (exec_ctx, s->ports[i].emfd); } gpr_mu_unlock (&s->mu); } else { gpr_mu_unlock (&s->mu); - deactivated_all_ports (s, closure_list); + deactivated_all_ports (exec_ctx, s); } } @@ -361,7 +361,7 @@ on_read (grpc_exec_ctx * exec_ctx, void *arg, int success) case EINTR: continue; case EAGAIN: - grpc_fd_notify_on_read (sp->emfd, &sp->read_closure, closure_list); + grpc_fd_notify_on_read (exec_ctx, sp->emfd, &sp->read_closure); return; default: gpr_log (GPR_ERROR, "Failed accept4: %s", strerror (errno)); @@ -385,9 +385,9 @@ on_read (grpc_exec_ctx * exec_ctx, void *arg, int success) incoming channel to every pollset owned by the server */ for (i = 0; i < sp->server->pollset_count; i++) { - grpc_pollset_add_fd (sp->server->pollsets[i], fdobj, closure_list); + grpc_pollset_add_fd (exec_ctx, sp->server->pollsets[i], fdobj); } - sp->server->on_accept_cb (sp->server->on_accept_cb_arg, grpc_tcp_create (fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str), closure_list); + sp->server->on_accept_cb (sp->server->on_accept_cb_arg, grpc_tcp_create (exec_ctx, fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str)); gpr_free (name); gpr_free (addr_str); @@ -400,7 +400,7 @@ error: if (0 == --sp->server->active_ports) { gpr_mu_unlock (&sp->server->mu); - deactivated_all_ports (sp->server, closure_list); + deactivated_all_ports (exec_ctx, sp->server); } else { @@ -557,11 +557,11 @@ grpc_tcp_server_start (grpc_exec_ctx * exec_ctx, grpc_tcp_server * s, grpc_polls { for (j = 0; j < pollset_count; j++) { - grpc_pollset_add_fd (pollsets[j], s->ports[i].emfd, closure_list); + grpc_pollset_add_fd (exec_ctx, pollsets[j], s->ports[i].emfd); } s->ports[i].read_closure.cb = on_read; s->ports[i].read_closure.cb_arg = &s->ports[i]; - grpc_fd_notify_on_read (s->ports[i].emfd, &s->ports[i].read_closure, closure_list); + grpc_fd_notify_on_read (exec_ctx, s->ports[i].emfd, &s->ports[i].read_closure); s->active_ports++; } gpr_mu_unlock (&s->mu); diff --git a/src/core/iomgr/udp_server.c b/src/core/iomgr/udp_server.c index 2f45011a89a..80b8748ea5b 100644 --- a/src/core/iomgr/udp_server.c +++ b/src/core/iomgr/udp_server.c @@ -162,7 +162,7 @@ destroyed_port (grpc_exec_ctx * exec_ctx, void *server, int success) if (s->destroyed_ports == s->nports) { gpr_mu_unlock (&s->mu); - finish_shutdown (s, closure_list); + finish_shutdown (exec_ctx, s); } else { @@ -198,14 +198,14 @@ deactivated_all_ports (grpc_exec_ctx * exec_ctx, grpc_udp_server * s) } sp->destroyed_closure.cb = destroyed_port; sp->destroyed_closure.cb_arg = s; - grpc_fd_orphan (sp->emfd, &sp->destroyed_closure, "udp_listener_shutdown", closure_list); + grpc_fd_orphan (exec_ctx, sp->emfd, &sp->destroyed_closure, "udp_listener_shutdown"); } gpr_mu_unlock (&s->mu); } else { gpr_mu_unlock (&s->mu); - finish_shutdown (s, closure_list); + finish_shutdown (exec_ctx, s); } } @@ -225,14 +225,14 @@ grpc_udp_server_destroy (grpc_exec_ctx * exec_ctx, grpc_udp_server * s, grpc_clo { for (i = 0; i < s->nports; i++) { - grpc_fd_shutdown (s->ports[i].emfd, closure_list); + grpc_fd_shutdown (exec_ctx, s->ports[i].emfd); } gpr_mu_unlock (&s->mu); } else { gpr_mu_unlock (&s->mu); - deactivated_all_ports (s, closure_list); + deactivated_all_ports (exec_ctx, s); } } @@ -302,7 +302,7 @@ on_read (grpc_exec_ctx * exec_ctx, void *arg, int success) if (0 == --sp->server->active_ports) { gpr_mu_unlock (&sp->server->mu); - deactivated_all_ports (sp->server, closure_list); + deactivated_all_ports (exec_ctx, sp->server); } else { @@ -316,7 +316,7 @@ on_read (grpc_exec_ctx * exec_ctx, void *arg, int success) sp->read_cb (sp->fd); /* Re-arm the notification event so we get another chance to read. */ - grpc_fd_notify_on_read (sp->emfd, &sp->read_closure, closure_list); + grpc_fd_notify_on_read (exec_ctx, sp->emfd, &sp->read_closure); } static int @@ -461,11 +461,11 @@ grpc_udp_server_start (grpc_exec_ctx * exec_ctx, grpc_udp_server * s, grpc_polls { for (j = 0; j < pollset_count; j++) { - grpc_pollset_add_fd (pollsets[j], s->ports[i].emfd, closure_list); + grpc_pollset_add_fd (exec_ctx, pollsets[j], s->ports[i].emfd); } s->ports[i].read_closure.cb = on_read; s->ports[i].read_closure.cb_arg = &s->ports[i]; - grpc_fd_notify_on_read (s->ports[i].emfd, &s->ports[i].read_closure, closure_list); + grpc_fd_notify_on_read (exec_ctx, s->ports[i].emfd, &s->ports[i].read_closure); s->active_ports++; } gpr_mu_unlock (&s->mu); diff --git a/src/core/iomgr/workqueue_posix.c b/src/core/iomgr/workqueue_posix.c index 1aadaa4028b..a407fb61a46 100644 --- a/src/core/iomgr/workqueue_posix.c +++ b/src/core/iomgr/workqueue_posix.c @@ -59,7 +59,7 @@ grpc_workqueue_create (grpc_closure_list * closure_list) sprintf (name, "workqueue:%p", (void *) workqueue); workqueue->wakeup_read_fd = grpc_fd_create (GRPC_WAKEUP_FD_GET_READ_FD (&workqueue->wakeup_fd), name); grpc_closure_init (&workqueue->read_closure, on_readable, workqueue); - grpc_fd_notify_on_read (workqueue->wakeup_read_fd, &workqueue->read_closure, closure_list); + grpc_fd_notify_on_read (exec_ctx, workqueue->wakeup_read_fd, &workqueue->read_closure); return workqueue; } @@ -67,7 +67,7 @@ static void workqueue_destroy (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue) { GPR_ASSERT (grpc_closure_list_empty (workqueue->closure_list)); - grpc_fd_shutdown (workqueue->wakeup_read_fd, closure_list); + grpc_fd_shutdown (exec_ctx, workqueue->wakeup_read_fd); } #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG @@ -95,21 +95,21 @@ grpc_workqueue_unref (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue) #endif if (gpr_unref (&workqueue->refs)) { - workqueue_destroy (workqueue, closure_list); + workqueue_destroy (exec_ctx, workqueue); } } void grpc_workqueue_add_to_pollset (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue, grpc_pollset * pollset) { - grpc_pollset_add_fd (pollset, workqueue->wakeup_read_fd, closure_list); + grpc_pollset_add_fd (exec_ctx, pollset, workqueue->wakeup_read_fd); } void grpc_workqueue_flush (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue) { gpr_mu_lock (&workqueue->mu); - grpc_closure_list_move (&workqueue->closure_list, closure_list); + grpc_closure_list_move (exec_ctx, &workqueue->closure_list); gpr_mu_unlock (&workqueue->mu); } @@ -124,16 +124,16 @@ on_readable (grpc_exec_ctx * exec_ctx, void *arg, int success) /* HACK: let wakeup_fd code know that we stole the fd */ workqueue->wakeup_fd.read_fd = 0; grpc_wakeup_fd_destroy (&workqueue->wakeup_fd); - grpc_fd_orphan (workqueue->wakeup_read_fd, NULL, "destroy", closure_list); + grpc_fd_orphan (exec_ctx, workqueue->wakeup_read_fd, NULL, "destroy"); gpr_free (workqueue); } else { gpr_mu_lock (&workqueue->mu); - grpc_closure_list_move (&workqueue->closure_list, closure_list); + grpc_closure_list_move (exec_ctx, &workqueue->closure_list); grpc_wakeup_fd_consume_wakeup (&workqueue->wakeup_fd); gpr_mu_unlock (&workqueue->mu); - grpc_fd_notify_on_read (workqueue->wakeup_read_fd, &workqueue->read_closure, closure_list); + grpc_fd_notify_on_read (exec_ctx, workqueue->wakeup_read_fd, &workqueue->read_closure); } } diff --git a/src/core/security/client_auth_filter.c b/src/core/security/client_auth_filter.c index 89ac3f464fc..33f2e8093a5 100644 --- a/src/core/security/client_auth_filter.c +++ b/src/core/security/client_auth_filter.c @@ -94,7 +94,7 @@ bubble_up_error (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_status call_data *calld = elem->call_data; gpr_log (GPR_ERROR, "Client side authentication failure: %s", error_msg); grpc_transport_stream_op_add_cancellation (&calld->op, status); - grpc_call_next_op (elem, &calld->op, closure_list); + grpc_call_next_op (exec_ctx, elem, &calld->op); } static void @@ -109,7 +109,7 @@ on_credentials_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credent reset_service_url (calld); if (status != GRPC_CREDENTIALS_OK) { - bubble_up_error (elem, GRPC_STATUS_UNAUTHENTICATED, "Credentials failed to get metadata.", closure_list); + bubble_up_error (exec_ctx, elem, GRPC_STATUS_UNAUTHENTICATED, "Credentials failed to get metadata."); return; } GPR_ASSERT (num_md <= MAX_CREDENTIALS_METADATA_COUNT); @@ -119,7 +119,7 @@ on_credentials_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credent { grpc_metadata_batch_add_tail (mdb, &calld->md_links[i], grpc_mdelem_from_slices (chand->md_ctx, gpr_slice_ref (md_elems[i].key), gpr_slice_ref (md_elems[i].value))); } - grpc_call_next_op (elem, op, closure_list); + grpc_call_next_op (exec_ctx, elem, op); } void @@ -161,7 +161,7 @@ send_security_metadata (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc if (!channel_creds_has_md && !call_creds_has_md) { /* Skip sending metadata altogether. */ - grpc_call_next_op (elem, op, closure_list); + grpc_call_next_op (exec_ctx, elem, op); return; } @@ -170,7 +170,7 @@ send_security_metadata (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc calld->creds = grpc_composite_credentials_create (channel_creds, ctx->creds, NULL); if (calld->creds == NULL) { - bubble_up_error (elem, GRPC_STATUS_INVALID_ARGUMENT, "Incompatible credentials set on channel and call.", closure_list); + bubble_up_error (exec_ctx, elem, GRPC_STATUS_INVALID_ARGUMENT, "Incompatible credentials set on channel and call."); return; } } @@ -182,7 +182,7 @@ send_security_metadata (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc build_service_url (chand->security_connector->base.url_scheme, calld); calld->op = *op; /* Copy op (originates from the caller's stack). */ GPR_ASSERT (calld->pollset); - grpc_credentials_get_request_metadata (calld->creds, calld->pollset, calld->service_url, on_credentials_metadata, elem, closure_list); + grpc_credentials_get_request_metadata (exec_ctx, calld->creds, calld->pollset, calld->service_url, on_credentials_metadata, elem); } static void @@ -193,13 +193,13 @@ on_host_checked (grpc_exec_ctx * exec_ctx, void *user_data, grpc_security_status if (status == GRPC_SECURITY_OK) { - send_security_metadata (elem, &calld->op, closure_list); + send_security_metadata (exec_ctx, elem, &calld->op); } else { char *error_msg; gpr_asprintf (&error_msg, "Invalid host %s set in :authority metadata.", grpc_mdstr_as_c_string (calld->host)); - bubble_up_error (elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg, closure_list); + bubble_up_error (exec_ctx, elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg); gpr_free (error_msg); } } @@ -272,26 +272,26 @@ auth_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grp grpc_security_status status; const char *call_host = grpc_mdstr_as_c_string (calld->host); calld->op = *op; /* Copy op (originates from the caller's stack). */ - status = grpc_channel_security_connector_check_call_host (chand->security_connector, call_host, on_host_checked, elem, closure_list); + status = grpc_channel_security_connector_check_call_host (exec_ctx, chand->security_connector, call_host, on_host_checked, elem); if (status != GRPC_SECURITY_OK) { if (status == GRPC_SECURITY_ERROR) { char *error_msg; gpr_asprintf (&error_msg, "Invalid host %s set in :authority metadata.", call_host); - bubble_up_error (elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg, closure_list); + bubble_up_error (exec_ctx, elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg); gpr_free (error_msg); } return; /* early exit */ } } - send_security_metadata (elem, op, closure_list); + send_security_metadata (exec_ctx, elem, op); return; /* early exit */ } } /* pass control down the stack */ - grpc_call_next_op (elem, op, closure_list); + grpc_call_next_op (exec_ctx, elem, op); } /* Constructor for call_data */ diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index caf3d6f8852..7c444f6ac90 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -126,11 +126,11 @@ grpc_credentials_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credential { if (cb != NULL) { - cb (user_data, NULL, 0, GRPC_CREDENTIALS_OK, closure_list); + cb (exec_ctx, user_data, NULL, 0, GRPC_CREDENTIALS_OK); } return; } - creds->vtable->get_request_metadata (creds, pollset, service_url, cb, user_data, closure_list); + creds->vtable->get_request_metadata (exec_ctx, creds, pollset, service_url, cb, user_data); } grpc_security_status @@ -460,12 +460,12 @@ jwt_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, gr if (jwt_md != NULL) { - cb (user_data, jwt_md->entries, jwt_md->num_entries, GRPC_CREDENTIALS_OK, closure_list); + cb (exec_ctx, user_data, jwt_md->entries, jwt_md->num_entries, GRPC_CREDENTIALS_OK); grpc_credentials_md_store_unref (jwt_md); } else { - cb (user_data, NULL, 0, GRPC_CREDENTIALS_ERROR, closure_list); + cb (exec_ctx, user_data, NULL, 0, GRPC_CREDENTIALS_ERROR); } } @@ -644,12 +644,12 @@ on_oauth2_token_fetcher_http_response (grpc_exec_ctx * exec_ctx, void *user_data if (status == GRPC_CREDENTIALS_OK) { c->token_expiration = gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), token_lifetime); - r->cb (r->user_data, c->access_token_md->entries, c->access_token_md->num_entries, status, closure_list); + r->cb (exec_ctx, r->user_data, c->access_token_md->entries, c->access_token_md->num_entries, status); } else { c->token_expiration = gpr_inf_past (GPR_CLOCK_REALTIME); - r->cb (r->user_data, NULL, 0, status, closure_list); + r->cb (exec_ctx, r->user_data, NULL, 0, status); } gpr_mu_unlock (&c->mu); grpc_credentials_metadata_request_destroy (r); @@ -671,12 +671,12 @@ oauth2_token_fetcher_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_creden } if (cached_access_token_md != NULL) { - cb (user_data, cached_access_token_md->entries, cached_access_token_md->num_entries, GRPC_CREDENTIALS_OK, closure_list); + cb (exec_ctx, user_data, cached_access_token_md->entries, cached_access_token_md->num_entries, GRPC_CREDENTIALS_OK); grpc_credentials_md_store_unref (cached_access_token_md); } else { - c->fetch_func (grpc_credentials_metadata_request_create (creds, cb, user_data), &c->httpcli_context, pollset, on_oauth2_token_fetcher_http_response, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), refresh_threshold), closure_list); + c->fetch_func (grpc_credentials_metadata_request_create (creds, cb, user_data), &c->httpcli_context, pollset, on_oauth2_token_fetcher_http_response, gpr_time_add (gpr_now (exec_ctx, GPR_CLOCK_REALTIME), refresh_threshold)); } } @@ -710,7 +710,7 @@ compute_engine_fetch_oauth2 (grpc_exec_ctx * exec_ctx, grpc_credentials_metadata request.path = GRPC_COMPUTE_ENGINE_METADATA_TOKEN_PATH; request.hdr_count = 1; request.hdrs = &header; - grpc_httpcli_get (httpcli_context, pollset, &request, deadline, response_cb, metadata_req, closure_list); + grpc_httpcli_get (exec_ctx, httpcli_context, pollset, &request, deadline, response_cb, metadata_req); } grpc_credentials * @@ -755,7 +755,7 @@ refresh_token_fetch_oauth2 (grpc_exec_ctx * exec_ctx, grpc_credentials_metadata_ request.hdr_count = 1; request.hdrs = &header; request.handshaker = &grpc_httpcli_ssl; - grpc_httpcli_post (httpcli_context, pollset, &request, body, strlen (body), deadline, response_cb, metadata_req, closure_list); + grpc_httpcli_post (httpcli_context, pollset, &request, body, strlen (exec_ctx, body), deadline, response_cb, metadata_req); gpr_free (body); } @@ -828,7 +828,7 @@ md_only_test_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * } else { - cb (user_data, c->md_store->entries, 1, GRPC_CREDENTIALS_OK, closure_list); + cb (exec_ctx, user_data, c->md_store->entries, 1, GRPC_CREDENTIALS_OK); } } @@ -877,7 +877,7 @@ static void access_token_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { grpc_access_token_credentials *c = (grpc_access_token_credentials *) creds; - cb (user_data, c->access_token_md->entries, 1, GRPC_CREDENTIALS_OK, closure_list); + cb (exec_ctx, user_data, c->access_token_md->entries, 1, GRPC_CREDENTIALS_OK); } static grpc_credentials_vtable access_token_vtable = { @@ -1047,7 +1047,7 @@ composite_metadata_cb (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentia grpc_composite_credentials_metadata_context *ctx = (grpc_composite_credentials_metadata_context *) user_data; if (status != GRPC_CREDENTIALS_OK) { - ctx->cb (ctx->user_data, NULL, 0, status, closure_list); + ctx->cb (exec_ctx, ctx->user_data, NULL, 0, status); return; } @@ -1067,13 +1067,13 @@ composite_metadata_cb (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentia grpc_credentials *inner_creds = ctx->composite_creds->inner.creds_array[ctx->creds_index++]; if (grpc_credentials_has_request_metadata (inner_creds)) { - grpc_credentials_get_request_metadata (inner_creds, ctx->pollset, ctx->service_url, composite_metadata_cb, ctx, closure_list); + grpc_credentials_get_request_metadata (exec_ctx, inner_creds, ctx->pollset, ctx->service_url, composite_metadata_cb, ctx); return; } } /* We're done!. */ - ctx->cb (ctx->user_data, ctx->md_elems->entries, ctx->md_elems->num_entries, GRPC_CREDENTIALS_OK, closure_list); + ctx->cb (exec_ctx, ctx->user_data, ctx->md_elems->entries, ctx->md_elems->num_entries, GRPC_CREDENTIALS_OK); composite_md_context_destroy (ctx); grpc_closure_list_run (closure_list); } @@ -1085,7 +1085,7 @@ composite_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * cre grpc_composite_credentials_metadata_context *ctx; if (!grpc_credentials_has_request_metadata (creds)) { - cb (user_data, NULL, 0, GRPC_CREDENTIALS_OK, closure_list); + cb (exec_ctx, user_data, NULL, 0, GRPC_CREDENTIALS_OK); return; } ctx = gpr_malloc (sizeof (grpc_composite_credentials_metadata_context)); @@ -1101,7 +1101,7 @@ composite_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * cre grpc_credentials *inner_creds = c->inner.creds_array[ctx->creds_index++]; if (grpc_credentials_has_request_metadata (inner_creds)) { - grpc_credentials_get_request_metadata (inner_creds, pollset, service_url, composite_metadata_cb, ctx, closure_list); + grpc_credentials_get_request_metadata (exec_ctx, inner_creds, pollset, service_url, composite_metadata_cb, ctx); return; } } @@ -1262,7 +1262,7 @@ static void iam_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { grpc_google_iam_credentials *c = (grpc_google_iam_credentials *) creds; - cb (user_data, c->iam_md->entries, c->iam_md->num_entries, GRPC_CREDENTIALS_OK, closure_list); + cb (exec_ctx, user_data, c->iam_md->entries, c->iam_md->num_entries, GRPC_CREDENTIALS_OK); } static grpc_credentials_vtable iam_vtable = { @@ -1373,7 +1373,7 @@ plugin_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, } else { - cb (user_data, NULL, 0, GRPC_CREDENTIALS_OK, closure_list); + cb (exec_ctx, user_data, NULL, 0, GRPC_CREDENTIALS_OK); } } diff --git a/src/core/security/handshake.c b/src/core/security/handshake.c index 7951f34943b..687cc575a7c 100644 --- a/src/core/security/handshake.c +++ b/src/core/security/handshake.c @@ -68,20 +68,20 @@ security_handshake_done (grpc_exec_ctx * exec_ctx, grpc_security_handshake * h, { if (is_success) { - h->cb (h->user_data, GRPC_SECURITY_OK, h->wrapped_endpoint, h->secure_endpoint, closure_list); + h->cb (exec_ctx, h->user_data, GRPC_SECURITY_OK, h->wrapped_endpoint, h->secure_endpoint); } else { if (h->secure_endpoint != NULL) { - grpc_endpoint_shutdown (h->secure_endpoint, closure_list); - grpc_endpoint_destroy (h->secure_endpoint, closure_list); + grpc_endpoint_shutdown (exec_ctx, h->secure_endpoint); + grpc_endpoint_destroy (exec_ctx, h->secure_endpoint); } else { - grpc_endpoint_destroy (h->wrapped_endpoint, closure_list); + grpc_endpoint_destroy (exec_ctx, h->wrapped_endpoint); } - h->cb (h->user_data, GRPC_SECURITY_ERROR, h->wrapped_endpoint, NULL, closure_list); + h->cb (exec_ctx, h->user_data, GRPC_SECURITY_ERROR, h->wrapped_endpoint, NULL); } if (h->handshaker != NULL) tsi_handshaker_destroy (h->handshaker); @@ -103,20 +103,20 @@ on_peer_checked (grpc_exec_ctx * exec_ctx, void *user_data, grpc_security_status if (status != GRPC_SECURITY_OK) { gpr_log (GPR_ERROR, "Error checking peer."); - security_handshake_done (h, 0, closure_list); + security_handshake_done (exec_ctx, h, 0); return; } result = tsi_handshaker_create_frame_protector (h->handshaker, NULL, &protector); if (result != TSI_OK) { gpr_log (GPR_ERROR, "Frame protector creation failed with error %s.", tsi_result_to_string (result)); - security_handshake_done (h, 0, closure_list); + security_handshake_done (exec_ctx, h, 0); return; } h->secure_endpoint = grpc_secure_endpoint_create (protector, h->wrapped_endpoint, h->left_overs.slices, h->left_overs.count); h->left_overs.count = 0; h->left_overs.length = 0; - security_handshake_done (h, 1, closure_list); + security_handshake_done (exec_ctx, h, 1); return; } @@ -130,19 +130,19 @@ check_peer (grpc_exec_ctx * exec_ctx, grpc_security_handshake * h) if (result != TSI_OK) { gpr_log (GPR_ERROR, "Peer extraction failed with error %s", tsi_result_to_string (result)); - security_handshake_done (h, 0, closure_list); + security_handshake_done (exec_ctx, h, 0); return; } peer_status = grpc_security_connector_check_peer (h->connector, peer, on_peer_checked, h); if (peer_status == GRPC_SECURITY_ERROR) { gpr_log (GPR_ERROR, "Peer check failed."); - security_handshake_done (h, 0, closure_list); + security_handshake_done (exec_ctx, h, 0); return; } else if (peer_status == GRPC_SECURITY_OK) { - on_peer_checked (h, peer_status, closure_list); + on_peer_checked (exec_ctx, h, peer_status); } } @@ -169,7 +169,7 @@ send_handshake_bytes_to_peer (grpc_exec_ctx * exec_ctx, grpc_security_handshake if (result != TSI_OK) { gpr_log (GPR_ERROR, "Handshake failed with error %s", tsi_result_to_string (result)); - security_handshake_done (h, 0, closure_list); + security_handshake_done (exec_ctx, h, 0); return; } @@ -178,7 +178,7 @@ send_handshake_bytes_to_peer (grpc_exec_ctx * exec_ctx, grpc_security_handshake gpr_slice_buffer_add (&h->outgoing, to_send); /* TODO(klempner,jboeuf): This should probably use the client setup deadline */ - grpc_endpoint_write (h->wrapped_endpoint, &h->outgoing, &h->on_handshake_data_sent_to_peer, closure_list); + grpc_endpoint_write (exec_ctx, h->wrapped_endpoint, &h->outgoing, &h->on_handshake_data_sent_to_peer); } static void @@ -194,7 +194,7 @@ on_handshake_data_received_from_peer (grpc_exec_ctx * exec_ctx, void *handshake, if (!success) { gpr_log (GPR_ERROR, "Read failed."); - security_handshake_done (h, 0, closure_list); + security_handshake_done (exec_ctx, h, 0); return; } @@ -211,12 +211,12 @@ on_handshake_data_received_from_peer (grpc_exec_ctx * exec_ctx, void *handshake, /* We may need more data. */ if (result == TSI_INCOMPLETE_DATA) { - grpc_endpoint_read (h->wrapped_endpoint, &h->incoming, &h->on_handshake_data_received_from_peer, closure_list); + grpc_endpoint_read (exec_ctx, h->wrapped_endpoint, &h->incoming, &h->on_handshake_data_received_from_peer); return; } else { - send_handshake_bytes_to_peer (h, closure_list); + send_handshake_bytes_to_peer (exec_ctx, h); return; } } @@ -224,7 +224,7 @@ on_handshake_data_received_from_peer (grpc_exec_ctx * exec_ctx, void *handshake, if (result != TSI_OK) { gpr_log (GPR_ERROR, "Handshake failed with error %s", tsi_result_to_string (result)); - security_handshake_done (h, 0, closure_list); + security_handshake_done (exec_ctx, h, 0); return; } @@ -233,7 +233,7 @@ on_handshake_data_received_from_peer (grpc_exec_ctx * exec_ctx, void *handshake, num_left_overs = (has_left_overs_in_current_slice ? 1 : 0) + h->incoming.count - i - 1; if (num_left_overs == 0) { - check_peer (h, closure_list); + check_peer (exec_ctx, h); return; } @@ -244,7 +244,7 @@ on_handshake_data_received_from_peer (grpc_exec_ctx * exec_ctx, void *handshake, gpr_slice_unref (h->incoming.slices[i]); /* split_tail above increments refcount. */ } gpr_slice_buffer_addn (&h->left_overs, &h->incoming.slices[i + 1], num_left_overs - (size_t) has_left_overs_in_current_slice); - check_peer (h, closure_list); + check_peer (exec_ctx, h); } /* If handshake is NULL, the handshake is done. */ @@ -258,7 +258,7 @@ on_handshake_data_sent_to_peer (grpc_exec_ctx * exec_ctx, void *handshake, int s { gpr_log (GPR_ERROR, "Write failed."); if (handshake != NULL) - security_handshake_done (h, 0, closure_list); + security_handshake_done (exec_ctx, h, 0); return; } @@ -267,11 +267,11 @@ on_handshake_data_sent_to_peer (grpc_exec_ctx * exec_ctx, void *handshake, int s { /* TODO(klempner,jboeuf): This should probably use the client setup deadline */ - grpc_endpoint_read (h->wrapped_endpoint, &h->incoming, &h->on_handshake_data_received_from_peer, closure_list); + grpc_endpoint_read (exec_ctx, h->wrapped_endpoint, &h->incoming, &h->on_handshake_data_received_from_peer); } else { - check_peer (h, closure_list); + check_peer (exec_ctx, h); } } @@ -292,5 +292,5 @@ grpc_do_security_handshake (grpc_exec_ctx * exec_ctx, tsi_handshaker * handshake gpr_slice_buffer_init (&h->left_overs); gpr_slice_buffer_init (&h->outgoing); gpr_slice_buffer_init (&h->incoming); - send_handshake_bytes_to_peer (h, closure_list); + send_handshake_bytes_to_peer (exec_ctx, h); } diff --git a/src/core/security/jwt_verifier.c b/src/core/security/jwt_verifier.c index dcc751f143a..7a45ff9343e 100644 --- a/src/core/security/jwt_verifier.c +++ b/src/core/security/jwt_verifier.c @@ -774,7 +774,7 @@ on_openid_config_retrieved (grpc_exec_ctx * exec_ctx, void *user_data, const grp { *(req.host + (req.path - jwks_uri)) = '\0'; } - grpc_httpcli_get (&ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), on_keys_retrieved, ctx, closure_list); + grpc_httpcli_get (&ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add (gpr_now (exec_ctx, GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), on_keys_retrieved, ctx); grpc_json_destroy (json); gpr_free (req.host); return; @@ -893,7 +893,7 @@ retrieve_key_and_verify (grpc_exec_ctx * exec_ctx, verifier_cb_ctx * ctx) http_cb = on_openid_config_retrieved; } - grpc_httpcli_get (&ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), http_cb, ctx, closure_list); + grpc_httpcli_get (&ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add (gpr_now (exec_ctx, GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), http_cb, ctx); gpr_free (req.host); gpr_free (req.path); return; @@ -943,7 +943,7 @@ grpc_jwt_verifier_verify (grpc_exec_ctx * exec_ctx, grpc_jwt_verifier * verifier signature = grpc_base64_decode (cur, 1); if (GPR_SLICE_IS_EMPTY (signature)) goto error; - retrieve_key_and_verify (verifier_cb_ctx_create (verifier, pollset, header, claims, audience, signature, jwt, signed_jwt_len, user_data, cb), closure_list); + retrieve_key_and_verify (verifier_cb_ctx_create (exec_ctx, verifier, pollset, header, claims, audience, signature, jwt, signed_jwt_len, user_data, cb)); return; error: diff --git a/src/core/security/secure_endpoint.c b/src/core/security/secure_endpoint.c index 966dfbb6664..7dee1c1edb8 100644 --- a/src/core/security/secure_endpoint.c +++ b/src/core/security/secure_endpoint.c @@ -72,7 +72,7 @@ static void destroy (grpc_exec_ctx * exec_ctx, secure_endpoint * secure_ep) { secure_endpoint *ep = secure_ep; - grpc_endpoint_destroy (ep->wrapped_ep, closure_list); + grpc_endpoint_destroy (exec_ctx, ep->wrapped_ep); tsi_frame_protector_destroy (ep->protector); gpr_slice_buffer_destroy (&ep->leftover_bytes); gpr_slice_unref (ep->read_staging_buffer); @@ -95,7 +95,7 @@ secure_endpoint_unref (secure_endpoint * ep, grpc_closure_list * closure_list, c gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "SECENDP unref %p : %s %d -> %d", ep, reason, ep->ref.count, ep->ref.count - 1); if (gpr_unref (&ep->ref)) { - destroy (ep, closure_list); + destroy (exec_ctx, ep); } } @@ -113,7 +113,7 @@ secure_endpoint_unref (grpc_exec_ctx * exec_ctx, secure_endpoint * ep) { if (gpr_unref (&ep->ref)) { - destroy (ep, closure_list); + destroy (exec_ctx, ep); } } @@ -149,7 +149,7 @@ call_read_cb (grpc_exec_ctx * exec_ctx, secure_endpoint * ep, int success) } ep->read_buffer = NULL; grpc_closure_list_add (closure_list, ep->read_cb, success); - SECURE_ENDPOINT_UNREF (ep, "read", closure_list); + SECURE_ENDPOINT_UNREF (exec_ctx, ep, "read"); } static void @@ -165,7 +165,7 @@ on_read (grpc_exec_ctx * exec_ctx, void *user_data, int success) if (!success) { gpr_slice_buffer_reset_and_unref (ep->read_buffer); - call_read_cb (ep, 0, closure_list); + call_read_cb (exec_ctx, ep, 0); return; } @@ -226,11 +226,11 @@ on_read (grpc_exec_ctx * exec_ctx, void *user_data, int success) if (result != TSI_OK) { gpr_slice_buffer_reset_and_unref (ep->read_buffer); - call_read_cb (ep, 0, closure_list); + call_read_cb (exec_ctx, ep, 0); return; } - call_read_cb (ep, 1, closure_list); + call_read_cb (exec_ctx, ep, 1); } static void @@ -246,11 +246,11 @@ endpoint_read (grpc_exec_ctx * exec_ctx, grpc_endpoint * secure_ep, gpr_slice_bu { gpr_slice_buffer_swap (&ep->leftover_bytes, &ep->source_buffer); GPR_ASSERT (ep->leftover_bytes.count == 0); - on_read (ep, 1, closure_list); + on_read (exec_ctx, ep, 1); return; } - grpc_endpoint_read (ep->wrapped_ep, &ep->source_buffer, &ep->on_read, closure_list); + grpc_endpoint_read (exec_ctx, ep->wrapped_ep, &ep->source_buffer, &ep->on_read); } static void @@ -344,35 +344,35 @@ endpoint_write (grpc_exec_ctx * exec_ctx, grpc_endpoint * secure_ep, gpr_slice_b return; } - grpc_endpoint_write (ep->wrapped_ep, &ep->output_buffer, cb, closure_list); + grpc_endpoint_write (exec_ctx, ep->wrapped_ep, &ep->output_buffer, cb); } static void endpoint_shutdown (grpc_exec_ctx * exec_ctx, grpc_endpoint * secure_ep) { secure_endpoint *ep = (secure_endpoint *) secure_ep; - grpc_endpoint_shutdown (ep->wrapped_ep, closure_list); + grpc_endpoint_shutdown (exec_ctx, ep->wrapped_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", closure_list); + SECURE_ENDPOINT_UNREF (exec_ctx, ep, "destroy"); } 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, closure_list); + grpc_endpoint_add_to_pollset (exec_ctx, ep->wrapped_ep, pollset); } 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, closure_list); + grpc_endpoint_add_to_pollset_set (exec_ctx, ep->wrapped_ep, pollset_set); } static char * diff --git a/src/core/security/security_connector.c b/src/core/security/security_connector.c index 91462c52cdf..729de29d492 100644 --- a/src/core/security/security_connector.c +++ b/src/core/security/security_connector.c @@ -114,11 +114,11 @@ grpc_security_connector_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_co { if (sc == NULL || nonsecure_endpoint == NULL) { - cb (user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL, closure_list); + cb (exec_ctx, user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL); } else { - sc->vtable->do_handshake (sc, nonsecure_endpoint, cb, user_data, closure_list); + sc->vtable->do_handshake (exec_ctx, sc, nonsecure_endpoint, cb, user_data); } } @@ -138,7 +138,7 @@ grpc_channel_security_connector_check_call_host (grpc_exec_ctx * exec_ctx, grpc_ { if (sc == NULL || sc->check_call_host == NULL) return GRPC_SECURITY_ERROR; - return sc->check_call_host (sc, host, cb, user_data, closure_list); + return sc->check_call_host (exec_ctx, sc, host, cb, user_data); } #ifdef GRPC_SECURITY_CONNECTOR_REFCOUNT_DEBUG @@ -303,7 +303,7 @@ fake_channel_check_call_host (grpc_exec_ctx * exec_ctx, grpc_channel_security_co grpc_fake_channel_security_connector *c = (grpc_fake_channel_security_connector *) sc; if (c->call_host_check_is_async) { - cb (user_data, GRPC_SECURITY_OK, closure_list); + cb (exec_ctx, user_data, GRPC_SECURITY_OK); return GRPC_SECURITY_PENDING; } else @@ -315,13 +315,13 @@ fake_channel_check_call_host (grpc_exec_ctx * exec_ctx, grpc_channel_security_co static void fake_channel_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) { - grpc_do_security_handshake (tsi_create_fake_handshaker (1), sc, nonsecure_endpoint, cb, user_data, closure_list); + grpc_do_security_handshake (tsi_create_fake_handshaker (exec_ctx, 1), sc, nonsecure_endpoint, cb, user_data); } static void fake_server_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) { - grpc_do_security_handshake (tsi_create_fake_handshaker (0), sc, nonsecure_endpoint, cb, user_data, closure_list); + grpc_do_security_handshake (tsi_create_fake_handshaker (exec_ctx, 0), sc, nonsecure_endpoint, cb, user_data); } static grpc_security_connector_vtable fake_channel_vtable = { @@ -432,11 +432,11 @@ ssl_channel_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc &handshaker); if (status != GRPC_SECURITY_OK) { - cb (user_data, status, nonsecure_endpoint, NULL, closure_list); + cb (exec_ctx, user_data, status, nonsecure_endpoint, NULL); } else { - grpc_do_security_handshake (handshaker, sc, nonsecure_endpoint, cb, user_data, closure_list); + grpc_do_security_handshake (exec_ctx, handshaker, sc, nonsecure_endpoint, cb, user_data); } } @@ -448,11 +448,11 @@ ssl_server_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_security_status status = ssl_create_handshaker (c->handshaker_factory, 0, NULL, &handshaker); if (status != GRPC_SECURITY_OK) { - cb (user_data, status, nonsecure_endpoint, NULL, closure_list); + cb (exec_ctx, user_data, status, nonsecure_endpoint, NULL); } else { - grpc_do_security_handshake (handshaker, sc, nonsecure_endpoint, cb, user_data, closure_list); + grpc_do_security_handshake (exec_ctx, handshaker, sc, nonsecure_endpoint, cb, user_data); } } diff --git a/src/core/security/server_auth_filter.c b/src/core/security/server_auth_filter.c index 86a5f9cb3e3..77239e782e9 100644 --- a/src/core/security/server_auth_filter.c +++ b/src/core/security/server_auth_filter.c @@ -175,7 +175,7 @@ auth_on_recv (grpc_exec_ctx * exec_ctx, void *user_data, int success) return; } } - calld->on_done_recv->cb (calld->on_done_recv->cb_arg, success, closure_list); + calld->on_done_recv->cb (exec_ctx, calld->on_done_recv->cb_arg, success); } static void @@ -202,7 +202,7 @@ static void auth_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { set_recv_ops_md_callbacks (elem, op); - grpc_call_next_op (elem, op, closure_list); + grpc_call_next_op (exec_ctx, elem, op); } /* Constructor for call_data */ diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index b11cf1079a8..5b67f51b7d3 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -104,7 +104,7 @@ setup_transport (grpc_exec_ctx * exec_ctx, void *statep, grpc_transport * transp args_to_add[0] = grpc_security_connector_to_arg (state->sc); args_to_add[1] = grpc_auth_metadata_processor_to_arg (&state->creds->processor); args_copy = grpc_channel_args_copy_and_add (grpc_server_get_channel_args (state->server), args_to_add, GPR_ARRAY_SIZE (args_to_add)); - grpc_server_setup_transport (state->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, args_copy, closure_list); + grpc_server_setup_transport (state->server, transport, extra_filters, GPR_ARRAY_SIZE (exec_ctx, extra_filters), mdctx, args_copy); grpc_channel_args_destroy (args_copy); } @@ -146,15 +146,15 @@ on_secure_handshake_done (grpc_exec_ctx * exec_ctx, void *statep, grpc_security_ if (!state->is_shutdown) { mdctx = grpc_mdctx_create (); - transport = grpc_create_chttp2_transport (grpc_server_get_channel_args (state->server), secure_endpoint, mdctx, 0, closure_list); - setup_transport (state, transport, mdctx, closure_list); - grpc_chttp2_transport_start_reading (transport, NULL, 0, closure_list); + transport = grpc_create_chttp2_transport (grpc_server_get_channel_args (exec_ctx, state->server), secure_endpoint, mdctx, 0); + setup_transport (exec_ctx, state, transport, mdctx); + grpc_chttp2_transport_start_reading (exec_ctx, transport, NULL, 0); } else { /* We need to consume this here, because the server may already have gone * away. */ - grpc_endpoint_destroy (secure_endpoint, closure_list); + grpc_endpoint_destroy (exec_ctx, secure_endpoint); } gpr_mu_unlock (&state->mu); } @@ -180,7 +180,7 @@ on_accept (grpc_exec_ctx * exec_ctx, void *statep, grpc_endpoint * tcp) node->next = state->handshaking_tcp_endpoints; state->handshaking_tcp_endpoints = node; gpr_mu_unlock (&state->mu); - grpc_security_connector_do_handshake (state->sc, tcp, on_secure_handshake_done, state, closure_list); + grpc_security_connector_do_handshake (exec_ctx, state->sc, tcp, on_secure_handshake_done, state); } /* Server callback: start listening on our ports */ @@ -188,18 +188,18 @@ static void start (grpc_exec_ctx * exec_ctx, grpc_server * server, void *statep, grpc_pollset ** pollsets, size_t pollset_count) { grpc_server_secure_state *state = statep; - grpc_tcp_server_start (state->tcp, pollsets, pollset_count, on_accept, state, closure_list); + grpc_tcp_server_start (exec_ctx, state->tcp, pollsets, pollset_count, on_accept, state); } static void destroy_done (grpc_exec_ctx * exec_ctx, void *statep, int success) { grpc_server_secure_state *state = statep; - state->destroy_callback->cb (state->destroy_callback->cb_arg, success, closure_list); + state->destroy_callback->cb (exec_ctx, state->destroy_callback->cb_arg, success); gpr_mu_lock (&state->mu); while (state->handshaking_tcp_endpoints != NULL) { - grpc_endpoint_shutdown (state->handshaking_tcp_endpoints->tcp_endpoint, closure_list); + grpc_endpoint_shutdown (exec_ctx, state->handshaking_tcp_endpoints->tcp_endpoint); remove_tcp_from_list_locked (state, state->handshaking_tcp_endpoints->tcp_endpoint); } gpr_mu_unlock (&state->mu); @@ -219,7 +219,7 @@ destroy (grpc_exec_ctx * exec_ctx, grpc_server * server, void *statep, grpc_clos tcp = state->tcp; gpr_mu_unlock (&state->mu); grpc_closure_init (&state->destroy_closure, destroy_done, state); - grpc_tcp_server_destroy (tcp, &state->destroy_closure, closure_list); + grpc_tcp_server_destroy (exec_ctx, tcp, &state->destroy_closure); } int diff --git a/src/core/surface/call.c b/src/core/surface/call.c index 5360abdfa93..de47bc38084 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -417,7 +417,7 @@ grpc_call_set_completion_queue (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc { GRPC_CQ_INTERNAL_REF (cq, "bind"); } - unlock (call, closure_list); + unlock (exec_ctx, call); } grpc_completion_queue * @@ -452,7 +452,7 @@ done_completion (grpc_exec_ctx * exec_ctx, void *call, grpc_cq_completion * comp gpr_mu_lock (&c->completion_mu); c->allocated_completions &= (gpr_uint8) ~ (1u << (completion - c->completions)); gpr_mu_unlock (&c->completion_mu); - GRPC_CALL_INTERNAL_UNREF (c, "completion", closure_list); + GRPC_CALL_INTERNAL_UNREF (exec_ctx, c, "completion"); } #ifdef GRPC_CALL_REF_COUNT_DEBUG @@ -473,8 +473,8 @@ destroy_call (grpc_exec_ctx * exec_ctx, grpc_call * call) { size_t i; grpc_call *c = call; - grpc_call_stack_destroy (CALL_STACK_FROM_CALL (c), closure_list); - GRPC_CHANNEL_INTERNAL_UNREF (c->channel, "call", closure_list); + grpc_call_stack_destroy (CALL_STACK_FROM_CALL (exec_ctx, c)); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, c->channel, "call"); gpr_mu_destroy (&c->mu); gpr_mu_destroy (&c->completion_mu); for (i = 0; i < STATUS_SOURCE_COUNT; i++) @@ -527,7 +527,7 @@ grpc_call_internal_unref (grpc_exec_ctx * exec_ctx, grpc_call * c) #endif if (gpr_unref (&c->internal_refcount)) { - destroy_call (c, closure_list); + destroy_call (exec_ctx, c); } } @@ -715,19 +715,19 @@ unlock (grpc_exec_ctx * exec_ctx, grpc_call * call) if (start_op) { - execute_op (call, &op, closure_list); + execute_op (exec_ctx, call, &op); } if (completing_requests > 0) { for (i = 0; i < completing_requests; i++) { - completed_requests[i].on_complete (call, completed_requests[i].success, completed_requests[i].user_data, closure_list); + completed_requests[i].on_complete (exec_ctx, call, completed_requests[i].success, completed_requests[i].user_data); } lock (call); call->completing = 0; - unlock (call, closure_list); - GRPC_CALL_INTERNAL_UNREF (call, "completing", closure_list); + unlock (exec_ctx, call); + GRPC_CALL_INTERNAL_UNREF (exec_ctx, call, "completing"); } } @@ -917,8 +917,8 @@ call_on_done_send (grpc_exec_ctx * exec_ctx, void *pc, int success) call->send_ops.nops = 0; call->last_send_contains = 0; call->sending = 0; - unlock (call, closure_list); - GRPC_CALL_INTERNAL_UNREF (call, "sending", closure_list); + unlock (exec_ctx, call); + GRPC_CALL_INTERNAL_UNREF (exec_ctx, call, "sending"); } static void @@ -1055,7 +1055,7 @@ call_on_done_recv (grpc_exec_ctx * exec_ctx, void *pc, int success) case GRPC_NO_OP: break; case GRPC_OP_METADATA: - recv_metadata (call, &op->data.metadata, closure_list); + recv_metadata (exec_ctx, call, &op->data.metadata); break; case GRPC_OP_BEGIN_MESSAGE: success = begin_message (call, op->data.begin_message); @@ -1080,7 +1080,7 @@ call_on_done_recv (grpc_exec_ctx * exec_ctx, void *pc, int success) call->read_state = READ_STATE_STREAM_CLOSED; if (call->have_alarm) { - grpc_alarm_cancel (&call->alarm, closure_list); + grpc_alarm_cancel (exec_ctx, &call->alarm); } /* propagate cancellation to any interested children */ child_call = call->first_child; @@ -1093,13 +1093,13 @@ call_on_done_recv (grpc_exec_ctx * exec_ctx, void *pc, int success) { GRPC_CALL_INTERNAL_REF (child_call, "propagate_cancel"); grpc_call_cancel (child_call, NULL); - GRPC_CALL_INTERNAL_UNREF (child_call, "propagate_cancel", closure_list); + GRPC_CALL_INTERNAL_UNREF (exec_ctx, child_call, "propagate_cancel"); } child_call = next_child_call; } while (child_call != call->first_child); } - GRPC_CALL_INTERNAL_UNREF (call, "closed", closure_list); + GRPC_CALL_INTERNAL_UNREF (exec_ctx, call, "closed"); } finish_read_ops (call); } @@ -1113,9 +1113,9 @@ call_on_done_recv (grpc_exec_ctx * exec_ctx, void *pc, int success) finish_ioreq_op (call, GRPC_IOREQ_RECV_STATUS_DETAILS, 0); } call->recv_ops.nops = 0; - unlock (call, closure_list); + unlock (exec_ctx, call); - GRPC_CALL_INTERNAL_UNREF (call, "receiving", closure_list); + GRPC_CALL_INTERNAL_UNREF (exec_ctx, call, "receiving"); GRPC_TIMER_END (GRPC_PTAG_CALL_ON_DONE_RECV, 0); } @@ -1386,7 +1386,7 @@ grpc_call_start_ioreq_and_call_back (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_call_error err; lock (call); err = start_ioreq (call, reqs, nreqs, on_complete, user_data); - unlock (call, closure_list); + unlock (exec_ctx, call); return err; } @@ -1467,7 +1467,7 @@ cancel_with_status (grpc_call * c, grpc_status_code status, const char *descript static void finished_loose_op (grpc_exec_ctx * exec_ctx, void *call, int success_ignored) { - GRPC_CALL_INTERNAL_UNREF (call, "loose-op", closure_list); + GRPC_CALL_INTERNAL_UNREF (exec_ctx, call, "loose-op"); } typedef struct @@ -1480,7 +1480,7 @@ static void finished_loose_op_allocated (grpc_exec_ctx * exec_ctx, void *alloc, int success) { finished_loose_op_allocated_args *args = alloc; - finished_loose_op (args->call, success, closure_list); + finished_loose_op (exec_ctx, args->call, success); gpr_free (args); } @@ -1508,7 +1508,7 @@ execute_op (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_transport_stream_op elem = CALL_ELEM_FROM_CALL (call, 0); op->context = call->context; - elem->filter->start_transport_stream_op (elem, op, closure_list); + elem->filter->start_transport_stream_op (exec_ctx, elem, op); } char * @@ -1538,8 +1538,8 @@ call_alarm (grpc_exec_ctx * exec_ctx, void *arg, int success) cancel_with_status (call, GRPC_STATUS_DEADLINE_EXCEEDED, "Deadline Exceeded"); } finish_read_ops (call); - unlock (call, closure_list); - GRPC_CALL_INTERNAL_UNREF (call, "alarm", closure_list); + unlock (exec_ctx, call); + GRPC_CALL_INTERNAL_UNREF (exec_ctx, call, "alarm"); } static void @@ -1554,7 +1554,7 @@ set_deadline_alarm (grpc_exec_ctx * exec_ctx, grpc_call * call, gpr_timespec dea GRPC_CALL_INTERNAL_REF (call, "alarm"); call->have_alarm = 1; call->send_deadline = gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC); - grpc_alarm_init (&call->alarm, call->send_deadline, call_alarm, call, gpr_now (GPR_CLOCK_MONOTONIC), closure_list); + grpc_alarm_init (&call->alarm, call->send_deadline, call_alarm, call, gpr_now (exec_ctx, GPR_CLOCK_MONOTONIC)); } /* we offset status by a small amount when storing it into transport metadata @@ -1669,7 +1669,7 @@ recv_metadata (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_metadata_batch * } if (gpr_time_cmp (md->deadline, gpr_inf_future (md->deadline.clock_type)) != 0 && !call->is_client) { - set_deadline_alarm (call, md->deadline, closure_list); + set_deadline_alarm (exec_ctx, call, md->deadline); } if (!is_trailing) { @@ -1714,13 +1714,13 @@ set_cancelled_value (grpc_status_code status, void *dest) static void finish_batch (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *tag) { - grpc_cq_end_op (call->cq, tag, success, done_completion, call, allocate_completion (call), closure_list); + grpc_cq_end_op (call->cq, tag, success, done_completion, call, allocate_completion (exec_ctx, call)); } static void finish_batch_with_close (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *tag) { - grpc_cq_end_op (call->cq, tag, 1, done_completion, call, allocate_completion (call), closure_list); + grpc_cq_end_op (call->cq, tag, 1, done_completion, call, allocate_completion (exec_ctx, call)); } static int diff --git a/src/core/surface/call.h b/src/core/surface/call.h index 29a3e113547..b1f3be85217 100644 --- a/src/core/surface/call.h +++ b/src/core/surface/call.h @@ -107,14 +107,14 @@ extern "C" 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, closure_list) \ - grpc_call_internal_unref(call, reason, closure_list) +#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_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, closure_list) \ - grpc_call_internal_unref(call, closure_list) +#define GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, reason) \ + grpc_call_internal_unref(exec_ctx, call) #endif grpc_call_error grpc_call_start_ioreq_and_call_back (grpc_exec_ctx * exec_ctx, grpc_call * call, const grpc_ioreq * reqs, size_t nreqs, grpc_ioreq_completion_func on_complete, void *user_data); diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index 82a463dd751..2d120cf807e 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -187,7 +187,7 @@ grpc_channel_create_from_filters (grpc_exec_ctx * exec_ctx, const char *target, gpr_free (default_authority); } - grpc_channel_stack_init (filters, num_filters, channel, args, channel->metadata_context, CHANNEL_STACK_FROM_CHANNEL (channel), closure_list); + grpc_channel_stack_init (filters, num_filters, channel, args, channel->metadata_context, CHANNEL_STACK_FROM_CHANNEL (exec_ctx, channel)); return channel; } @@ -265,7 +265,7 @@ static void destroy_channel (grpc_exec_ctx * exec_ctx, grpc_channel * channel) { size_t i; - grpc_channel_stack_destroy (CHANNEL_STACK_FROM_CHANNEL (channel), closure_list); + grpc_channel_stack_destroy (CHANNEL_STACK_FROM_CHANNEL (exec_ctx, channel)); for (i = 0; i < NUM_CACHED_STATUS_ELEMS; i++) { GRPC_MDELEM_UNREF (channel->grpc_status_elem[i]); @@ -309,7 +309,7 @@ grpc_channel_internal_unref (grpc_exec_ctx * exec_ctx, grpc_channel * channel) #endif if (gpr_unref (&channel->refs)) { - destroy_channel (channel, closure_list); + destroy_channel (exec_ctx, channel); } } diff --git a/src/core/surface/channel.h b/src/core/surface/channel.h index 982986e9662..678aa5ba567 100644 --- a/src/core/surface/channel.h +++ b/src/core/surface/channel.h @@ -61,15 +61,15 @@ 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); #define GRPC_CHANNEL_INTERNAL_REF(channel, reason) \ grpc_channel_internal_ref(channel, reason) -#define GRPC_CHANNEL_INTERNAL_UNREF(channel, reason, closure_list) \ - grpc_channel_internal_unref(channel, reason, closure_list) +#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_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, closure_list) \ - grpc_channel_internal_unref(channel, closure_list) +#define GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel, reason) \ + grpc_channel_internal_unref(exec_ctx, channel) #endif #endif /* GRPC_INTERNAL_CORE_SURFACE_CHANNEL_H */ diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index 7c174aa47f7..b72be303d13 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -83,7 +83,7 @@ typedef struct static void delete_state_watcher (grpc_exec_ctx * exec_ctx, state_watcher * w) { - GRPC_CHANNEL_INTERNAL_UNREF (w->channel, "watch_connectivity", closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, w->channel, "watch_connectivity"); gpr_mu_destroy (&w->mu); gpr_free (w); } @@ -112,7 +112,7 @@ finished_completion (grpc_exec_ctx * exec_ctx, void *pw, grpc_cq_completion * ig if (delete) { - delete_state_watcher (w, closure_list); + delete_state_watcher (exec_ctx, w); } } @@ -127,7 +127,7 @@ partly_done (grpc_exec_ctx * exec_ctx, state_watcher * w, int due_to_completion) { w->removed = 1; client_channel_elem = grpc_channel_stack_last_element (grpc_channel_get_channel_stack (w->channel)); - grpc_client_channel_del_interested_party (client_channel_elem, grpc_cq_pollset (w->cq), closure_list); + grpc_client_channel_del_interested_party (client_channel_elem, grpc_cq_pollset (exec_ctx, w->cq)); } gpr_mu_unlock (&w->mu); if (due_to_completion) @@ -135,7 +135,7 @@ partly_done (grpc_exec_ctx * exec_ctx, state_watcher * w, int due_to_completion) gpr_mu_lock (&w->mu); w->success = 1; gpr_mu_unlock (&w->mu); - grpc_alarm_cancel (&w->alarm, closure_list); + grpc_alarm_cancel (exec_ctx, &w->alarm); } gpr_mu_lock (&w->mu); @@ -143,7 +143,7 @@ partly_done (grpc_exec_ctx * exec_ctx, state_watcher * w, int due_to_completion) { case WAITING: w->phase = CALLING_BACK; - grpc_cq_end_op (w->cq, w->tag, w->success, finished_completion, w, &w->completion_storage, closure_list); + grpc_cq_end_op (exec_ctx, w->cq, w->tag, w->success, finished_completion, w, &w->completion_storage); break; case CALLING_BACK: w->phase = CALLING_BACK_AND_FINISHED; @@ -160,20 +160,20 @@ partly_done (grpc_exec_ctx * exec_ctx, state_watcher * w, int due_to_completion) if (delete) { - delete_state_watcher (w, closure_list); + delete_state_watcher (exec_ctx, w); } } static void watch_complete (grpc_exec_ctx * exec_ctx, void *pw, int success) { - partly_done (pw, 1, closure_list); + partly_done (exec_ctx, pw, 1); } static void timeout_complete (grpc_exec_ctx * exec_ctx, void *pw, int success) { - partly_done (pw, 0, closure_list); + partly_done (exec_ctx, pw, 0); } void diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index a8c9f1749fc..2f597563ab7 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -90,8 +90,8 @@ connected (grpc_exec_ctx * exec_ctx, void *arg, int success) grpc_endpoint *tcp = c->tcp; if (tcp != NULL) { - c->result->transport = grpc_create_chttp2_transport (c->args.channel_args, tcp, c->mdctx, 1, closure_list); - grpc_chttp2_transport_start_reading (c->result->transport, NULL, 0, closure_list); + c->result->transport = grpc_create_chttp2_transport (exec_ctx, c->args.channel_args, tcp, c->mdctx, 1); + grpc_chttp2_transport_start_reading (exec_ctx, c->result->transport, NULL, 0); GPR_ASSERT (c->result->transport); c->result->filters = gpr_malloc (sizeof (grpc_channel_filter *)); c->result->filters[0] = &grpc_http_client_filter; @@ -103,7 +103,7 @@ connected (grpc_exec_ctx * exec_ctx, void *arg, int success) } notify = c->notify; c->notify = NULL; - notify->cb (notify->cb_arg, 1, closure_list); + notify->cb (exec_ctx, notify->cb_arg, 1); } static void @@ -122,7 +122,7 @@ connector_connect (grpc_exec_ctx * exec_ctx, grpc_connector * con, const grpc_co c->result = result; c->tcp = NULL; grpc_closure_init (&c->connected, connected, c); - grpc_tcp_client_connect (&c->connected, &c->tcp, args->interested_parties, args->addr, args->addr_len, args->deadline, closure_list); + grpc_tcp_client_connect (exec_ctx, &c->connected, &c->tcp, args->interested_parties, args->addr, args->addr_len, args->deadline); } static const grpc_connector_vtable connector_vtable = { @@ -151,7 +151,7 @@ subchannel_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * sc subchannel_factory *f = (subchannel_factory *) scf; if (gpr_unref (&f->refs)) { - GRPC_CHANNEL_INTERNAL_UNREF (f->master, "subchannel_factory", closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, f->master, "subchannel_factory"); grpc_channel_args_destroy (f->merge_args); grpc_mdctx_unref (f->mdctx); gpr_free (f); @@ -174,7 +174,7 @@ subchannel_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_ args->args = final_args; args->master = f->master; s = grpc_subchannel_create (&c->base, args); - grpc_connector_unref (&c->base, closure_list); + grpc_connector_unref (exec_ctx, &c->base); grpc_channel_args_destroy (final_args); return s; } diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index 2410ad6fb5a..5cc07261bf2 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -181,7 +181,7 @@ grpc_cq_end_op (grpc_completion_queue * cc, void *tag, int success, void (*done) GPR_ASSERT (cc->shutdown_called); cc->shutdown = 1; gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); - grpc_pollset_shutdown (&cc->pollset, &cc->pollset_destroy_done, closure_list); + grpc_pollset_shutdown (exec_ctx, &cc->pollset, &cc->pollset_destroy_done); } } diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c index be3a308f0fb..e2a8e191ad8 100644 --- a/src/core/surface/lame_client.c +++ b/src/core/surface/lame_client.c @@ -65,7 +65,7 @@ lame_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * el if (op->send_ops != NULL) { grpc_stream_ops_unref_owned_objects (op->send_ops->ops, op->send_ops->nops); - op->on_done_send->cb (op->on_done_send->cb_arg, 0, closure_list); + op->on_done_send->cb (exec_ctx, op->on_done_send->cb_arg, 0); } if (op->recv_ops != NULL) { @@ -83,11 +83,11 @@ lame_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * el mdb.deadline = gpr_inf_future (GPR_CLOCK_REALTIME); grpc_sopb_add_metadata (op->recv_ops, mdb); *op->recv_state = GRPC_STREAM_CLOSED; - op->on_done_recv->cb (op->on_done_recv->cb_arg, 1, closure_list); + op->on_done_recv->cb (exec_ctx, op->on_done_recv->cb_arg, 1); } if (op->on_consumed != NULL) { - op->on_consumed->cb (op->on_consumed->cb_arg, 0, closure_list); + op->on_consumed->cb (exec_ctx, op->on_consumed->cb_arg, 0); } } @@ -105,11 +105,11 @@ lame_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, { GPR_ASSERT (*op->connectivity_state != GRPC_CHANNEL_FATAL_FAILURE); *op->connectivity_state = GRPC_CHANNEL_FATAL_FAILURE; - op->on_connectivity_state_change->cb (op->on_connectivity_state_change->cb_arg, 1, closure_list); + op->on_connectivity_state_change->cb (exec_ctx, op->on_connectivity_state_change->cb_arg, 1); } if (op->on_consumed != NULL) { - op->on_consumed->cb (op->on_consumed->cb_arg, 1, closure_list); + op->on_consumed->cb (exec_ctx, op->on_consumed->cb_arg, 1); } } @@ -118,7 +118,7 @@ init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void * { if (initial_op) { - grpc_transport_stream_op_finish_with_failure (initial_op, closure_list); + grpc_transport_stream_op_finish_with_failure (exec_ctx, initial_op); } } diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index b65b03a002b..1290308992e 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -113,8 +113,8 @@ on_secure_handshake_done (grpc_exec_ctx * exec_ctx, void *arg, grpc_security_sta GPR_ASSERT (c->connecting_endpoint == wrapped_endpoint); c->connecting_endpoint = NULL; gpr_mu_unlock (&c->mu); - c->result->transport = grpc_create_chttp2_transport (c->args.channel_args, secure_endpoint, c->mdctx, 1, closure_list); - grpc_chttp2_transport_start_reading (c->result->transport, NULL, 0, closure_list); + c->result->transport = grpc_create_chttp2_transport (exec_ctx, c->args.channel_args, secure_endpoint, c->mdctx, 1); + grpc_chttp2_transport_start_reading (exec_ctx, c->result->transport, NULL, 0); c->result->filters = gpr_malloc (sizeof (grpc_channel_filter *) * 2); c->result->filters[0] = &grpc_http_client_filter; c->result->filters[1] = &grpc_client_auth_filter; @@ -122,7 +122,7 @@ on_secure_handshake_done (grpc_exec_ctx * exec_ctx, void *arg, grpc_security_sta } notify = c->notify; c->notify = NULL; - notify->cb (notify->cb_arg, 1, closure_list); + notify->cb (exec_ctx, notify->cb_arg, 1); } static void @@ -137,14 +137,14 @@ connected (grpc_exec_ctx * exec_ctx, void *arg, int success) GPR_ASSERT (c->connecting_endpoint == NULL); c->connecting_endpoint = tcp; gpr_mu_unlock (&c->mu); - grpc_security_connector_do_handshake (&c->security_connector->base, tcp, on_secure_handshake_done, c, closure_list); + grpc_security_connector_do_handshake (exec_ctx, &c->security_connector->base, tcp, on_secure_handshake_done, c); } else { memset (c->result, 0, sizeof (*c->result)); notify = c->notify; c->notify = NULL; - notify->cb (notify->cb_arg, 1, closure_list); + notify->cb (exec_ctx, notify->cb_arg, 1); } } @@ -159,7 +159,7 @@ connector_shutdown (grpc_exec_ctx * exec_ctx, grpc_connector * con) gpr_mu_unlock (&c->mu); if (ep) { - grpc_endpoint_shutdown (ep, closure_list); + grpc_endpoint_shutdown (exec_ctx, ep); } } @@ -176,7 +176,7 @@ connector_connect (grpc_exec_ctx * exec_ctx, grpc_connector * con, const grpc_co GPR_ASSERT (c->connecting_endpoint == NULL); gpr_mu_unlock (&c->mu); grpc_closure_init (&c->connected_closure, connected, c); - grpc_tcp_client_connect (&c->connected_closure, &c->newly_connecting_endpoint, args->interested_parties, args->addr, args->addr_len, args->deadline, closure_list); + grpc_tcp_client_connect (exec_ctx, &c->connected_closure, &c->newly_connecting_endpoint, args->interested_parties, args->addr, args->addr_len, args->deadline); } static const grpc_connector_vtable connector_vtable = { @@ -207,7 +207,7 @@ subchannel_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * sc if (gpr_unref (&f->refs)) { GRPC_SECURITY_CONNECTOR_UNREF (&f->security_connector->base, "subchannel_factory"); - GRPC_CHANNEL_INTERNAL_UNREF (f->master, "subchannel_factory", closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, f->master, "subchannel_factory"); grpc_channel_args_destroy (f->merge_args); grpc_mdctx_unref (f->mdctx); gpr_free (f); @@ -231,7 +231,7 @@ subchannel_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_ args->master = f->master; args->mdctx = f->mdctx; s = grpc_subchannel_create (&c->base, args); - grpc_connector_unref (&c->base, closure_list); + grpc_connector_unref (exec_ctx, &c->base); grpc_channel_args_destroy (final_args); return s; } diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 793d485dfb6..fac93beaa4e 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -302,7 +302,7 @@ send_shutdown (grpc_exec_ctx * exec_ctx, grpc_channel * channel, int send_goaway op.on_consumed = &sc->closure; elem = grpc_channel_stack_element (grpc_channel_get_channel_stack (channel), 0); - elem->filter->start_transport_op (elem, &op, closure_list); + elem->filter->start_transport_op (exec_ctx, elem, &op); } static void @@ -312,8 +312,8 @@ channel_broadcaster_shutdown (grpc_exec_ctx * exec_ctx, channel_broadcaster * cb for (i = 0; i < cb->num_channels; i++) { - send_shutdown (cb->channels[i], send_goaway, force_disconnect, closure_list); - GRPC_CHANNEL_INTERNAL_UNREF (cb->channels[i], "broadcast", closure_list); + send_shutdown (exec_ctx, cb->channels[i], send_goaway, force_disconnect); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, cb->channels[i], "broadcast"); } gpr_free (cb->channels); } @@ -363,7 +363,7 @@ request_matcher_kill_requests (grpc_exec_ctx * exec_ctx, grpc_server * server, r int request_id; while ((request_id = gpr_stack_lockfree_pop (rm->requests)) != -1) { - fail_call (server, &server->requested_calls[request_id], closure_list); + fail_call (exec_ctx, server, &server->requested_calls[request_id]); } } @@ -412,7 +412,7 @@ server_unref (grpc_exec_ctx * exec_ctx, grpc_server * server) { if (gpr_unref (&server->internal_refcount)) { - server_delete (server, closure_list); + server_delete (exec_ctx, server); } } @@ -436,8 +436,8 @@ finish_destroy_channel (grpc_exec_ctx * exec_ctx, void *cd, int success) channel_data *chand = cd; grpc_server *server = chand->server; gpr_log (GPR_DEBUG, "finish_destroy_channel: %p", chand->channel); - GRPC_CHANNEL_INTERNAL_UNREF (chand->channel, "server", closure_list); - server_unref (server, closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, chand->channel, "server"); + server_unref (exec_ctx, server); } static void @@ -448,7 +448,7 @@ destroy_channel (grpc_exec_ctx * exec_ctx, channel_data * chand) GPR_ASSERT (chand->server != NULL); orphan_channel (chand); server_ref (chand->server); - maybe_finish_shutdown (chand->server, closure_list); + maybe_finish_shutdown (exec_ctx, chand->server); chand->finish_destroy_channel_closure.cb = finish_destroy_channel; chand->finish_destroy_channel_closure.cb_arg = chand; grpc_closure_list_add (closure_list, &chand->finish_destroy_channel_closure, 1); @@ -494,7 +494,7 @@ finish_start_new_rpc (grpc_exec_ctx * exec_ctx, grpc_server * server, grpc_call_ gpr_mu_lock (&calld->mu_state); calld->state = ACTIVATED; gpr_mu_unlock (&calld->mu_state); - begin_call (server, calld, &server->requested_calls[request_id], closure_list); + begin_call (exec_ctx, server, calld, &server->requested_calls[request_id]); } } @@ -522,7 +522,7 @@ start_new_rpc (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) continue; if (rm->method != calld->path) continue; - finish_start_new_rpc (server, elem, &rm->server_registered_method->request_matcher, closure_list); + finish_start_new_rpc (exec_ctx, server, elem, &rm->server_registered_method->request_matcher); return; } /* check for a wildcard method definition (no host set) */ @@ -536,11 +536,11 @@ start_new_rpc (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) continue; if (rm->method != calld->path) continue; - finish_start_new_rpc (server, elem, &rm->server_registered_method->request_matcher, closure_list); + finish_start_new_rpc (exec_ctx, server, elem, &rm->server_registered_method->request_matcher); return; } } - finish_start_new_rpc (server, elem, &server->unregistered_request_matcher, closure_list); + finish_start_new_rpc (exec_ctx, server, elem, &server->unregistered_request_matcher); } static int @@ -558,7 +558,7 @@ num_listeners (grpc_server * server) static void done_shutdown_event (grpc_exec_ctx * exec_ctx, void *server, grpc_cq_completion * completion) { - server_unref (server, closure_list); + server_unref (exec_ctx, server); } static int @@ -577,12 +577,12 @@ static void kill_pending_work_locked (grpc_exec_ctx * exec_ctx, grpc_server * server) { registered_method *rm; - request_matcher_kill_requests (server, &server->unregistered_request_matcher, closure_list); - request_matcher_zombify_all_pending_calls (&server->unregistered_request_matcher, closure_list); + request_matcher_kill_requests (exec_ctx, server, &server->unregistered_request_matcher); + request_matcher_zombify_all_pending_calls (exec_ctx, &server->unregistered_request_matcher); for (rm = server->registered_methods; rm; rm = rm->next) { - request_matcher_kill_requests (server, &rm->request_matcher, closure_list); - request_matcher_zombify_all_pending_calls (&rm->request_matcher, closure_list); + request_matcher_kill_requests (exec_ctx, server, &rm->request_matcher); + request_matcher_zombify_all_pending_calls (exec_ctx, &rm->request_matcher); } } @@ -595,7 +595,7 @@ maybe_finish_shutdown (grpc_exec_ctx * exec_ctx, grpc_server * server) return; } - kill_pending_work_locked (server, closure_list); + kill_pending_work_locked (exec_ctx, server); if (server->root_channel_data.next != &server->root_channel_data || server->listeners_destroyed < num_listeners (server)) { @@ -610,7 +610,7 @@ maybe_finish_shutdown (grpc_exec_ctx * exec_ctx, grpc_server * server) 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, 1, done_shutdown_event, server, &server->shutdown_tags[i].completion, closure_list); + grpc_cq_end_op (exec_ctx, server->shutdown_tags[i].cq, server->shutdown_tags[i].tag, 1, done_shutdown_event, server, &server->shutdown_tags[i].completion); } } @@ -659,7 +659,7 @@ server_on_recv (grpc_exec_ctx * exec_ctx, void *ptr, int success) if (calld->host && calld->path) { calld->got_initial_metadata = 1; - start_new_rpc (elem, closure_list); + start_new_rpc (exec_ctx, elem); } break; } @@ -708,7 +708,7 @@ server_on_recv (grpc_exec_ctx * exec_ctx, void *ptr, int success) break; } - calld->on_done_recv->cb (calld->on_done_recv->cb_arg, success, closure_list); + calld->on_done_recv->cb (exec_ctx, calld->on_done_recv->cb_arg, success); } static void @@ -731,7 +731,7 @@ server_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * { GRPC_CALL_LOG_OP (GPR_INFO, elem, op); server_mutate_op (elem, op); - grpc_call_next_op (elem, op, closure_list); + grpc_call_next_op (exec_ctx, elem, op); } static void @@ -752,14 +752,14 @@ channel_connectivity_changed (grpc_exec_ctx * exec_ctx, void *cd, int iomgr_stat grpc_transport_op op; memset (&op, 0, sizeof (op)); 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_get_channel_stack (chand->channel), 0), &op, closure_list); + grpc_channel_next_op (grpc_channel_stack_element (grpc_channel_get_channel_stack (exec_ctx, chand->channel), 0), &op); } else { gpr_mu_lock (&server->mu_global); - destroy_channel (chand, closure_list); + destroy_channel (exec_ctx, chand); gpr_mu_unlock (&server->mu_global); - GRPC_CHANNEL_INTERNAL_UNREF (chand->channel, "connectivity", closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, chand->channel, "connectivity"); } } @@ -800,7 +800,7 @@ destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) gpr_mu_destroy (&calld->mu_state); - server_unref (chand->server, closure_list); + server_unref (exec_ctx, chand->server); } static void @@ -845,11 +845,11 @@ destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) chand->next->prev = chand->prev; chand->prev->next = chand->next; chand->next = chand->prev = chand; - maybe_finish_shutdown (chand->server, closure_list); + maybe_finish_shutdown (exec_ctx, chand->server); gpr_mu_unlock (&chand->server->mu_global); GRPC_MDSTR_UNREF (chand->path_key); GRPC_MDSTR_UNREF (chand->authority_key); - server_unref (chand->server, closure_list); + server_unref (exec_ctx, chand->server); } } @@ -1031,10 +1031,10 @@ grpc_server_setup_transport (grpc_exec_ctx * exec_ctx, grpc_server * s, grpc_tra { memset (&op, 0, sizeof (op)); op.bind_pollset = grpc_cq_pollset (s->cqs[i]); - grpc_transport_perform_op (transport, &op, closure_list); + grpc_transport_perform_op (exec_ctx, transport, &op); } - channel = grpc_channel_create_from_filters (NULL, filters, num_filters, args, mdctx, 0, closure_list); + channel = grpc_channel_create_from_filters (exec_ctx, NULL, filters, num_filters, args, mdctx, 0); chand = (channel_data *) grpc_channel_stack_element (grpc_channel_get_channel_stack (channel), 0)->channel_data; chand->server = s; server_ref (s); @@ -1089,7 +1089,7 @@ grpc_server_setup_transport (grpc_exec_ctx * exec_ctx, grpc_server * s, grpc_tra op.on_connectivity_state_change = &chand->channel_connectivity_changed; op.connectivity_state = &chand->connectivity_state; op.disconnect = gpr_atm_acq_load (&s->shutdown_flag) != 0; - grpc_transport_perform_op (transport, &op, closure_list); + grpc_transport_perform_op (exec_ctx, transport, &op); } void @@ -1105,7 +1105,7 @@ listener_destroy_done (grpc_exec_ctx * exec_ctx, void *s, int success) grpc_server *server = s; gpr_mu_lock (&server->mu_global); server->listeners_destroyed++; - maybe_finish_shutdown (server, closure_list); + maybe_finish_shutdown (exec_ctx, server); gpr_mu_unlock (&server->mu_global); } @@ -1220,14 +1220,14 @@ queue_call_request (grpc_exec_ctx * exec_ctx, grpc_server * server, requested_ca int request_id; if (gpr_atm_acq_load (&server->shutdown_flag)) { - fail_call (server, rc, closure_list); + fail_call (exec_ctx, server, rc); return GRPC_CALL_OK; } request_id = gpr_stack_lockfree_pop (server->request_freelist); if (request_id == -1) { /* out of request ids: just fail this one */ - fail_call (server, rc, closure_list); + fail_call (exec_ctx, server, rc); return GRPC_CALL_OK; } switch (rc->type) @@ -1265,7 +1265,7 @@ queue_call_request (grpc_exec_ctx * exec_ctx, grpc_server * server, requested_ca GPR_ASSERT (calld->state == PENDING); calld->state = ACTIVATED; gpr_mu_unlock (&calld->mu_state); - begin_call (server, calld, &server->requested_calls[request_id], closure_list); + begin_call (exec_ctx, server, calld, &server->requested_calls[request_id]); } gpr_mu_lock (&server->mu_call); } @@ -1367,7 +1367,7 @@ begin_call (grpc_exec_ctx * exec_ctx, grpc_server * server, call_data * calld, r fill in the metadata array passed by the client, we need to perform an ioreq op, that should complete immediately. */ - grpc_call_set_completion_queue (calld->call, rc->cq_bound_to_call, closure_list); + grpc_call_set_completion_queue (exec_ctx, calld->call, rc->cq_bound_to_call); *rc->call = calld->call; calld->cq_new = rc->cq_for_notification; switch (rc->type) @@ -1402,7 +1402,7 @@ begin_call (grpc_exec_ctx * exec_ctx, grpc_server * server, call_data * calld, r } GRPC_CALL_INTERNAL_REF (calld->call, "server"); - grpc_call_start_ioreq_and_call_back (calld->call, req, (size_t) (r - req), publish, rc, closure_list); + grpc_call_start_ioreq_and_call_back (calld->call, req, (size_t) (exec_ctx, r - req), publish, rc); } static void @@ -1421,7 +1421,7 @@ done_request_event (grpc_exec_ctx * exec_ctx, void *req, grpc_cq_completion * c) gpr_free (req); } - server_unref (server, closure_list); + server_unref (exec_ctx, server); } static void @@ -1438,7 +1438,7 @@ fail_call (grpc_exec_ctx * exec_ctx, grpc_server * server, requested_call * rc) break; } server_ref (server); - grpc_cq_end_op (rc->cq_for_notification, rc->tag, 0, done_request_event, rc, &rc->completion, closure_list); + grpc_cq_end_op (exec_ctx, rc->cq_for_notification, rc->tag, 0, done_request_event, rc, &rc->completion); } static void @@ -1449,8 +1449,8 @@ publish_registered_or_batch (grpc_exec_ctx * exec_ctx, grpc_call * call, int suc call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; server_ref (chand->server); - grpc_cq_end_op (calld->cq_new, rc->tag, success, done_request_event, rc, &rc->completion, closure_list); - GRPC_CALL_INTERNAL_UNREF (call, "server", closure_list); + grpc_cq_end_op (exec_ctx, calld->cq_new, rc->tag, success, done_request_event, rc, &rc->completion); + GRPC_CALL_INTERNAL_UNREF (exec_ctx, call, "server"); } const grpc_channel_args * diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c index aa4eb9b05b1..438ac385b4e 100644 --- a/src/core/surface/server_chttp2.c +++ b/src/core/surface/server_chttp2.c @@ -48,7 +48,7 @@ setup_transport (grpc_exec_ctx * exec_ctx, void *server, grpc_transport * transp static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter }; - grpc_server_setup_transport (server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (server), closure_list); + grpc_server_setup_transport (server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (exec_ctx, server)); } static void @@ -62,9 +62,9 @@ new_transport (grpc_exec_ctx * exec_ctx, void *server, grpc_endpoint * tcp) * case. */ grpc_mdctx *mdctx = grpc_mdctx_create (); - grpc_transport *transport = grpc_create_chttp2_transport (grpc_server_get_channel_args (server), tcp, mdctx, 0, closure_list); - setup_transport (server, transport, mdctx, closure_list); - grpc_chttp2_transport_start_reading (transport, NULL, 0, closure_list); + grpc_transport *transport = grpc_create_chttp2_transport (grpc_server_get_channel_args (exec_ctx, server), tcp, mdctx, 0); + setup_transport (exec_ctx, server, transport, mdctx); + grpc_chttp2_transport_start_reading (exec_ctx, transport, NULL, 0); } /* Server callback: start listening on our ports */ @@ -72,7 +72,7 @@ static void start (grpc_exec_ctx * exec_ctx, grpc_server * server, void *tcpp, grpc_pollset ** pollsets, size_t pollset_count) { grpc_tcp_server *tcp = tcpp; - grpc_tcp_server_start (tcp, pollsets, pollset_count, new_transport, server, closure_list); + grpc_tcp_server_start (exec_ctx, tcp, pollsets, pollset_count, new_transport, server); } /* Server callback: destroy the tcp listener (so we don't generate further @@ -81,7 +81,7 @@ static void destroy (grpc_exec_ctx * exec_ctx, grpc_server * server, void *tcpp, grpc_closure * destroy_done) { grpc_tcp_server *tcp = tcpp; - grpc_tcp_server_destroy (tcp, destroy_done, closure_list); + grpc_tcp_server_destroy (exec_ctx, tcp, destroy_done); } int diff --git a/src/core/transport/chttp2/parsing.c b/src/core/transport/chttp2/parsing.c index 8e1dfc9d369..5b55147677f 100644 --- a/src/core/transport/chttp2/parsing.c +++ b/src/core/transport/chttp2/parsing.c @@ -119,7 +119,7 @@ grpc_chttp2_publish_reads (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_globa published later */ if (transport_parsing->goaway_received) { - grpc_chttp2_add_incoming_goaway (transport_global, (gpr_uint32) transport_parsing->goaway_error, transport_parsing->goaway_text, closure_list); + grpc_chttp2_add_incoming_goaway (transport_global, (exec_ctx, gpr_uint32) transport_parsing->goaway_error, transport_parsing->goaway_text); transport_parsing->goaway_text = gpr_empty_slice (); transport_parsing->goaway_received = 0; } @@ -339,7 +339,7 @@ grpc_chttp2_perform_read (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsin } if (transport_parsing->incoming_frame_size == 0) { - if (!parse_frame_slice (transport_parsing, gpr_empty_slice (), 1, closure_list)) + if (!parse_frame_slice (transport_parsing, gpr_empty_slice (exec_ctx, ), 1)) { return 0; } @@ -360,7 +360,7 @@ grpc_chttp2_perform_read (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsin GPR_ASSERT (cur < end); if ((gpr_uint32) (end - cur) == transport_parsing->incoming_frame_size) { - if (!parse_frame_slice (transport_parsing, gpr_slice_sub_no_ref (slice, (size_t) (cur - beg), (size_t) (end - beg)), 1, closure_list)) + if (!parse_frame_slice (transport_parsing, gpr_slice_sub_no_ref (slice, (size_t) (cur - beg), (size_t) (exec_ctx, end - beg)), 1)) { return 0; } @@ -371,7 +371,7 @@ grpc_chttp2_perform_read (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsin else if ((gpr_uint32) (end - cur) > transport_parsing->incoming_frame_size) { size_t cur_offset = (size_t) (cur - beg); - if (!parse_frame_slice (transport_parsing, gpr_slice_sub_no_ref (slice, cur_offset, cur_offset + transport_parsing->incoming_frame_size), 1, closure_list)) + if (!parse_frame_slice (transport_parsing, gpr_slice_sub_no_ref (exec_ctx, slice, cur_offset, cur_offset + transport_parsing->incoming_frame_size), 1)) { return 0; } @@ -381,7 +381,7 @@ grpc_chttp2_perform_read (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsin } else { - if (!parse_frame_slice (transport_parsing, gpr_slice_sub_no_ref (slice, (size_t) (cur - beg), (size_t) (end - beg)), 0, closure_list)) + if (!parse_frame_slice (transport_parsing, gpr_slice_sub_no_ref (slice, (size_t) (cur - beg), (size_t) (exec_ctx, end - beg)), 0)) { return 0; } @@ -757,7 +757,7 @@ static int parse_frame_slice (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice, int is_last) { grpc_chttp2_stream_parsing *stream_parsing = transport_parsing->incoming_stream; - switch (transport_parsing->parser (transport_parsing->parser_data, transport_parsing, stream_parsing, slice, is_last, closure_list)) + switch (transport_parsing->parser (exec_ctx, transport_parsing->parser_data, transport_parsing, stream_parsing, slice, is_last)) { case GRPC_CHTTP2_PARSE_OK: if (stream_parsing) diff --git a/src/core/transport/chttp2/writing.c b/src/core/transport/chttp2/writing.c index 6c4f0102f73..6c051f5b473 100644 --- a/src/core/transport/chttp2/writing.c +++ b/src/core/transport/chttp2/writing.c @@ -150,7 +150,7 @@ grpc_chttp2_perform_writes (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_writ GPR_ASSERT (transport_writing->outbuf.count > 0); GPR_ASSERT (endpoint); - grpc_endpoint_write (endpoint, &transport_writing->outbuf, &transport_writing->done_cb, closure_list); + grpc_endpoint_write (exec_ctx, endpoint, &transport_writing->outbuf, &transport_writing->done_cb); } static void diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index bef7d03300c..d880a1b9dbd 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -147,7 +147,7 @@ destruct_transport (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) grpc_chttp2_stream_map_destroy (&t->parsing_stream_map); grpc_chttp2_stream_map_destroy (&t->new_stream_map); - grpc_connectivity_state_destroy (&t->channel_callback.state_tracker, closure_list); + grpc_connectivity_state_destroy (exec_ctx, &t->channel_callback.state_tracker); gpr_mu_unlock (&t->mu); gpr_mu_destroy (&t->mu); @@ -178,7 +178,7 @@ unref_transport (grpc_chttp2_transport * t, grpc_closure_list * closure_list, co gpr_log (GPR_DEBUG, "chttp2:unref:%p %d->%d %s [%s:%d]", t, t->refs.count, t->refs.count - 1, reason, file, line); if (!gpr_unref (&t->refs)) return; - destruct_transport (t, closure_list); + destruct_transport (exec_ctx, t); } static void @@ -195,7 +195,7 @@ unref_transport (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { if (!gpr_unref (&t->refs)) return; - destruct_transport (t, closure_list); + destruct_transport (exec_ctx, t); } static void @@ -333,10 +333,10 @@ destroy_transport (grpc_exec_ctx * exec_ctx, grpc_transport * gt) lock (t); t->destroying = 1; - drop_connection (t, closure_list); - unlock (t, closure_list); + drop_connection (exec_ctx, t); + unlock (exec_ctx, t); - UNREF_TRANSPORT (t, "destroy", closure_list); + UNREF_TRANSPORT (exec_ctx, t, "destroy"); } /** block grpc_endpoint_shutdown being called until a paired @@ -355,7 +355,7 @@ allow_endpoint_shutdown_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport { if (t->ep) { - grpc_endpoint_shutdown (t->ep, closure_list); + grpc_endpoint_shutdown (exec_ctx, t->ep); } } } @@ -368,7 +368,7 @@ allow_endpoint_shutdown_unlocked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transpor gpr_mu_lock (&t->mu); if (t->ep) { - grpc_endpoint_shutdown (t->ep, closure_list); + grpc_endpoint_shutdown (exec_ctx, t->ep); } gpr_mu_unlock (&t->mu); } @@ -377,10 +377,10 @@ allow_endpoint_shutdown_unlocked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transpor static void destroy_endpoint (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { - grpc_endpoint_destroy (t->ep, closure_list); + grpc_endpoint_destroy (exec_ctx, t->ep); t->ep = NULL; /* safe because we'll still have the ref for write */ - UNREF_TRANSPORT (t, "disconnect", closure_list); + UNREF_TRANSPORT (exec_ctx, t, "disconnect"); } static void @@ -389,10 +389,10 @@ close_transport_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) if (!t->closed) { t->closed = 1; - connectivity_state_set (&t->global, GRPC_CHANNEL_FATAL_FAILURE, "close_transport", closure_list); + connectivity_state_set (exec_ctx, &t->global, GRPC_CHANNEL_FATAL_FAILURE, "close_transport"); if (t->ep) { - allow_endpoint_shutdown_locked (t, closure_list); + allow_endpoint_shutdown_locked (exec_ctx, t); } } } @@ -427,8 +427,8 @@ init_stream (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_stream * gs, co } if (initial_op) - perform_stream_op_locked (&t->global, &s->global, initial_op, closure_list); - unlock (t, closure_list); + perform_stream_op_locked (exec_ctx, &t->global, &s->global, initial_op); + unlock (exec_ctx, t); return 0; } @@ -446,7 +446,7 @@ destroy_stream (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_stream * gs) GPR_ASSERT (!s->global.in_stream_map); if (grpc_chttp2_unregister_stream (t, s) && t->global.sent_goaway) { - close_transport_locked (t, closure_list); + close_transport_locked (exec_ctx, t); } if (!t->parsing_active && s->global.id) { @@ -476,7 +476,7 @@ destroy_stream (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_stream * gs) grpc_chttp2_incoming_metadata_buffer_destroy (&s->global.incoming_metadata); grpc_chttp2_incoming_metadata_live_op_buffer_end (&s->global.outstanding_metadata); - UNREF_TRANSPORT (t, "stream", closure_list); + UNREF_TRANSPORT (exec_ctx, t, "stream"); } grpc_chttp2_stream_parsing * @@ -518,7 +518,7 @@ lock (grpc_chttp2_transport * t) static void unlock (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { - unlock_check_read_write_state (t, closure_list); + unlock_check_read_write_state (exec_ctx, t); if (!t->writing_active && !t->closed && grpc_chttp2_unlocking_check_writes (&t->global, &t->writing)) { t->writing_active = 1; @@ -558,34 +558,34 @@ grpc_chttp2_terminate_writing (grpc_exec_ctx * exec_ctx, void *transport_writing lock (t); - allow_endpoint_shutdown_locked (t, closure_list); + allow_endpoint_shutdown_locked (exec_ctx, t); if (!success) { - drop_connection (t, closure_list); + drop_connection (exec_ctx, t); } /* cleanup writing related jazz */ - grpc_chttp2_cleanup_writing (&t->global, &t->writing, closure_list); + grpc_chttp2_cleanup_writing (exec_ctx, &t->global, &t->writing); /* leave the writing flag up on shutdown to prevent further writes in unlock() from starting */ t->writing_active = 0; if (t->ep && !t->endpoint_reading) { - destroy_endpoint (t, closure_list); + destroy_endpoint (exec_ctx, t); } - unlock (t, closure_list); + unlock (exec_ctx, t); - UNREF_TRANSPORT (t, "writing", closure_list); + UNREF_TRANSPORT (exec_ctx, t, "writing"); } static void writing_action (grpc_exec_ctx * exec_ctx, void *gt, int iomgr_success_ignored) { grpc_chttp2_transport *t = gt; - grpc_chttp2_perform_writes (&t->writing, t->ep, closure_list); + grpc_chttp2_perform_writes (exec_ctx, &t->writing, t->ep); } void @@ -596,7 +596,7 @@ grpc_chttp2_add_incoming_goaway (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport gpr_free (msg); gpr_slice_unref (goaway_text); transport_global->seen_goaway = 1; - connectivity_state_set (transport_global, GRPC_CHANNEL_FATAL_FAILURE, "got_goaway", closure_list); + connectivity_state_set (exec_ctx, transport_global, GRPC_CHANNEL_FATAL_FAILURE, "got_goaway"); } static void @@ -615,7 +615,7 @@ maybe_start_some_streams (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global if (transport_global->next_stream_id >= MAX_CLIENT_STREAM_ID) { - connectivity_state_set (transport_global, GRPC_CHANNEL_TRANSIENT_FAILURE, "no_more_stream_ids", closure_list); + connectivity_state_set (exec_ctx, transport_global, GRPC_CHANNEL_TRANSIENT_FAILURE, "no_more_stream_ids"); } stream_global->outgoing_window = transport_global->settings[GRPC_PEER_SETTINGS][GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; @@ -663,7 +663,7 @@ perform_stream_op_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global { GRPC_CHTTP2_IF_TRACING (gpr_log (GPR_DEBUG, "HTTP:%s: New grpc_chttp2_stream %p waiting for concurrency", transport_global->is_client ? "CLI" : "SVR", stream_global)); grpc_chttp2_list_add_waiting_for_concurrency (transport_global, stream_global); - maybe_start_some_streams (transport_global, closure_list); + maybe_start_some_streams (exec_ctx, transport_global); } else if (stream_global->outgoing_window > 0) { @@ -704,7 +704,7 @@ perform_stream_op_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global if (op->bind_pollset) { - add_to_pollset_locked (TRANSPORT_FROM_GLOBAL (transport_global), op->bind_pollset, closure_list); + add_to_pollset_locked (TRANSPORT_FROM_GLOBAL (exec_ctx, transport_global), op->bind_pollset); } grpc_closure_list_add (closure_list, op->on_consumed, 1); @@ -717,8 +717,8 @@ perform_stream_op (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_stream * grpc_chttp2_stream *s = (grpc_chttp2_stream *) gs; lock (t); - perform_stream_op_locked (&t->global, &s->global, op, closure_list); - unlock (t, closure_list); + perform_stream_op_locked (exec_ctx, &t->global, &s->global, op); + unlock (exec_ctx, t); } static void @@ -752,7 +752,7 @@ perform_transport_op (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_transp if (op->on_connectivity_state_change) { - grpc_connectivity_state_notify_on_state_change (&t->channel_callback.state_tracker, op->connectivity_state, op->on_connectivity_state_change, closure_list); + grpc_connectivity_state_notify_on_state_change (exec_ctx, &t->channel_callback.state_tracker, op->connectivity_state, op->on_connectivity_state_change); } if (op->send_goaway) @@ -770,12 +770,12 @@ perform_transport_op (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_transp if (op->bind_pollset) { - add_to_pollset_locked (t, op->bind_pollset, closure_list); + add_to_pollset_locked (exec_ctx, t, op->bind_pollset); } if (op->bind_pollset_set) { - add_to_pollset_set_locked (t, op->bind_pollset_set, closure_list); + add_to_pollset_set_locked (exec_ctx, t, op->bind_pollset_set); } if (op->send_ping) @@ -785,16 +785,16 @@ perform_transport_op (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_transp if (op->disconnect) { - close_transport_locked (t, closure_list); + close_transport_locked (exec_ctx, t); } - unlock (t, closure_list); + unlock (exec_ctx, t); if (close_transport) { lock (t); - close_transport_locked (t, closure_list); - unlock (t, closure_list); + close_transport_locked (exec_ctx, t); + unlock (exec_ctx, t); } } @@ -833,7 +833,7 @@ remove_stream (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, gpr_uint32 i } if (grpc_chttp2_unregister_stream (t, s) && t->global.sent_goaway) { - close_transport_locked (t, closure_list); + close_transport_locked (exec_ctx, t); } new_stream_count = grpc_chttp2_stream_map_size (&t->parsing_stream_map) + grpc_chttp2_stream_map_size (&t->new_stream_map); @@ -841,7 +841,7 @@ remove_stream (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, gpr_uint32 i if (new_stream_count != t->global.concurrent_stream_count) { t->global.concurrent_stream_count = (gpr_uint32) new_stream_count; - maybe_start_some_streams (&t->global, closure_list); + maybe_start_some_streams (exec_ctx, &t->global); } } @@ -862,7 +862,7 @@ unlock_check_read_write_state (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * GPR_ASSERT (stream_global->in_stream_map); GPR_ASSERT (stream_global->write_state != GRPC_WRITE_STATE_OPEN); GPR_ASSERT (stream_global->read_closed); - remove_stream (t, stream_global->id, closure_list); + remove_stream (exec_ctx, t, stream_global->id); grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); } } @@ -911,7 +911,7 @@ unlock_check_read_write_state (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * } else { - remove_stream (t, stream_global->id, closure_list); + remove_stream (exec_ctx, t, stream_global->id); } } if (!stream_global->publish_sopb) @@ -1072,7 +1072,7 @@ end_all_the_calls (grpc_chttp2_transport * t) static void drop_connection (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { - close_transport_locked (t, closure_list); + close_transport_locked (exec_ctx, t); end_all_the_calls (t); } @@ -1104,7 +1104,7 @@ read_error_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) t->endpoint_reading = 0; if (!t->writing_active && t->ep) { - destroy_endpoint (t, closure_list); + destroy_endpoint (exec_ctx, t); } } @@ -1126,12 +1126,12 @@ recv_data (grpc_exec_ctx * exec_ctx, void *tp, int success) grpc_chttp2_stream_map_move_into (&t->new_stream_map, &t->parsing_stream_map); grpc_chttp2_prepare_to_read (&t->global, &t->parsing); gpr_mu_unlock (&t->mu); - for (; i < t->read_buffer.count && grpc_chttp2_perform_read (&t->parsing, t->read_buffer.slices[i], closure_list); i++) + for (; i < t->read_buffer.count && grpc_chttp2_perform_read (exec_ctx, &t->parsing, t->read_buffer.slices[i]); i++) ; gpr_mu_lock (&t->mu); if (i != t->read_buffer.count) { - drop_connection (t, closure_list); + drop_connection (exec_ctx, t); } /* merge stream lists */ grpc_chttp2_stream_map_move_into (&t->new_stream_map, &t->parsing_stream_map); @@ -1142,13 +1142,13 @@ recv_data (grpc_exec_ctx * exec_ctx, void *tp, int success) t->parsing.initial_window_update = 0; } /* handle higher level things */ - grpc_chttp2_publish_reads (&t->global, &t->parsing, closure_list); + grpc_chttp2_publish_reads (exec_ctx, &t->global, &t->parsing); t->parsing_active = 0; } if (!success || i != t->read_buffer.count) { - drop_connection (t, closure_list); - read_error_locked (t, closure_list); + drop_connection (exec_ctx, t); + read_error_locked (exec_ctx, t); } else if (!t->closed) { @@ -1157,17 +1157,17 @@ recv_data (grpc_exec_ctx * exec_ctx, void *tp, int success) prevent_endpoint_shutdown (t); } gpr_slice_buffer_reset_and_unref (&t->read_buffer); - unlock (t, closure_list); + unlock (exec_ctx, t); if (keep_reading) { - grpc_endpoint_read (t->ep, &t->read_buffer, &t->recv_data, closure_list); - allow_endpoint_shutdown_unlocked (t, closure_list); - UNREF_TRANSPORT (t, "keep_reading", closure_list); + grpc_endpoint_read (exec_ctx, t->ep, &t->read_buffer, &t->recv_data); + allow_endpoint_shutdown_unlocked (exec_ctx, t); + UNREF_TRANSPORT (exec_ctx, t, "keep_reading"); } else { - UNREF_TRANSPORT (t, "recv_data", closure_list); + UNREF_TRANSPORT (exec_ctx, t, "recv_data"); } } @@ -1179,7 +1179,7 @@ static void connectivity_state_set (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, grpc_connectivity_state state, const char *reason) { GRPC_CHTTP2_IF_TRACING (gpr_log (GPR_DEBUG, "set connectivity_state=%d", state)); - grpc_connectivity_state_set (&TRANSPORT_FROM_GLOBAL (transport_global)->channel_callback.state_tracker, state, reason, closure_list); + grpc_connectivity_state_set (&TRANSPORT_FROM_GLOBAL (exec_ctx, transport_global)->channel_callback.state_tracker, state, reason); } /* @@ -1191,7 +1191,7 @@ add_to_pollset_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, grpc { if (t->ep) { - grpc_endpoint_add_to_pollset (t->ep, pollset, closure_list); + grpc_endpoint_add_to_pollset (exec_ctx, t->ep, pollset); } } @@ -1200,7 +1200,7 @@ add_to_pollset_set_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, { if (t->ep) { - grpc_endpoint_add_to_pollset_set (t->ep, pollset_set, closure_list); + grpc_endpoint_add_to_pollset_set (exec_ctx, t->ep, pollset_set); } } @@ -1256,7 +1256,7 @@ grpc_transport * grpc_create_chttp2_transport (grpc_exec_ctx * exec_ctx, const grpc_channel_args * channel_args, grpc_endpoint * ep, grpc_mdctx * mdctx, int is_client) { grpc_chttp2_transport *t = gpr_malloc (sizeof (grpc_chttp2_transport)); - init_transport (t, channel_args, ep, mdctx, is_client != 0, closure_list); + init_transport (exec_ctx, t, channel_args, ep, mdctx, is_client != 0); return &t->base; } @@ -1266,5 +1266,5 @@ grpc_chttp2_transport_start_reading (grpc_exec_ctx * exec_ctx, grpc_transport * grpc_chttp2_transport *t = (grpc_chttp2_transport *) transport; REF_TRANSPORT (t, "recv_data"); /* matches unref inside recv_data */ gpr_slice_buffer_addn (&t->read_buffer, slices, nslices); - recv_data (t, 1, closure_list); + recv_data (exec_ctx, t, 1); } diff --git a/src/core/transport/transport.c b/src/core/transport/transport.c index ca04d34b3f4..e41481aa64e 100644 --- a/src/core/transport/transport.c +++ b/src/core/transport/transport.c @@ -45,37 +45,37 @@ grpc_transport_stream_size (grpc_transport * transport) void grpc_transport_destroy (grpc_exec_ctx * exec_ctx, grpc_transport * transport) { - transport->vtable->destroy (transport, closure_list); + transport->vtable->destroy (exec_ctx, transport); } int grpc_transport_init_stream (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_stream * stream, const void *server_data, grpc_transport_stream_op * initial_op) { - return transport->vtable->init_stream (transport, stream, server_data, initial_op, closure_list); + return transport->vtable->init_stream (exec_ctx, transport, stream, server_data, initial_op); } void grpc_transport_perform_stream_op (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_stream * stream, grpc_transport_stream_op * op) { - transport->vtable->perform_stream_op (transport, stream, op, closure_list); + transport->vtable->perform_stream_op (exec_ctx, transport, stream, op); } void grpc_transport_perform_op (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_transport_op * op) { - transport->vtable->perform_op (transport, op, closure_list); + transport->vtable->perform_op (exec_ctx, transport, op); } void grpc_transport_destroy_stream (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_stream * stream) { - transport->vtable->destroy_stream (transport, stream, closure_list); + transport->vtable->destroy_stream (exec_ctx, transport, stream); } char * grpc_transport_get_peer (grpc_exec_ctx * exec_ctx, grpc_transport * transport) { - return transport->vtable->get_peer (transport, closure_list); + return transport->vtable->get_peer (exec_ctx, transport); } void @@ -119,7 +119,7 @@ free_message (grpc_exec_ctx * exec_ctx, void *p, int iomgr_success) gpr_slice_unref (cmd->message); if (cmd->then_call != NULL) { - cmd->then_call->cb (cmd->then_call->cb_arg, iomgr_success, closure_list); + cmd->then_call->cb (exec_ctx, cmd->then_call->cb_arg, iomgr_success); } gpr_free (cmd); } diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index bea03710531..32d08a7c6a7 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -153,7 +153,7 @@ read_and_write_test_read_handler (grpc_exec_ctx * exec_ctx, void *data, int succ } else if (success) { - grpc_endpoint_read (state->read_ep, &state->incoming, &state->done_read, closure_list); + grpc_endpoint_read (exec_ctx, state->read_ep, &state->incoming, &state->done_read); } } @@ -176,7 +176,7 @@ read_and_write_test_write_handler (grpc_exec_ctx * exec_ctx, void *data, int suc slices = allocate_blocks (state->current_write_size, 8192, &nslices, &state->current_write_data); gpr_slice_buffer_reset_and_unref (&state->outgoing); gpr_slice_buffer_addn (&state->outgoing, slices, nslices); - grpc_endpoint_write (state->write_ep, &state->outgoing, &state->done_write, closure_list); + grpc_endpoint_write (exec_ctx, state->write_ep, &state->outgoing, &state->done_write); free (slices); return; } diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index d8b4032162b..82d6206c86d 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -129,10 +129,10 @@ session_shutdown_cb (void *arg, /*session */ { session *se = arg; server *sv = se->sv; - grpc_fd_orphan (se->em_fd, NULL, "a", closure_list); + grpc_fd_orphan (exec_ctx, se->em_fd, NULL, "a"); gpr_free (se); /* Start to shutdown listen fd. */ - grpc_fd_shutdown (sv->em_fd, closure_list); + grpc_fd_shutdown (exec_ctx, sv->em_fd); } /* Called when data become readable in a session. */ @@ -148,7 +148,7 @@ session_read_cb (void *arg, /*session */ if (!success) { - session_shutdown_cb (arg, 1, closure_list); + session_shutdown_cb (exec_ctx, arg, 1); return; } @@ -167,7 +167,7 @@ session_read_cb (void *arg, /*session */ been drained, In such a case, read() returns -1 and set errno to EAGAIN. */ if (read_once == 0) { - session_shutdown_cb (arg, 1, closure_list); + session_shutdown_cb (exec_ctx, arg, 1); } else if (read_once == -1) { @@ -181,7 +181,7 @@ 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, closure_list); + grpc_fd_notify_on_read (exec_ctx, se->em_fd, &se->session_read_closure); } else { @@ -199,7 +199,7 @@ listen_shutdown_cb (void *arg /*server */ , int success, { server *sv = arg; - grpc_fd_orphan (sv->em_fd, NULL, "b", closure_list); + grpc_fd_orphan (exec_ctx, sv->em_fd, NULL, "b"); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); sv->done = 1; @@ -222,7 +222,7 @@ listen_cb (void *arg, /*=sv_arg*/ if (!success) { - listen_shutdown_cb (arg, 1, closure_list); + listen_shutdown_cb (exec_ctx, arg, 1); return; } @@ -234,12 +234,12 @@ listen_cb (void *arg, /*=sv_arg*/ se = gpr_malloc (sizeof (*se)); se->sv = sv; se->em_fd = grpc_fd_create (fd, "listener"); - grpc_pollset_add_fd (&g_pollset, se->em_fd, closure_list); + grpc_pollset_add_fd (exec_ctx, &g_pollset, se->em_fd); se->session_read_closure.cb = session_read_cb; se->session_read_closure.cb_arg = se; - grpc_fd_notify_on_read (se->em_fd, &se->session_read_closure, closure_list); + 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, closure_list); + grpc_fd_notify_on_read (exec_ctx, listen_em_fd, &sv->listen_closure); } /* Max number of connections pending to be accepted by listen(). */ @@ -265,11 +265,11 @@ 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 (&g_pollset, sv->em_fd, closure_list); + grpc_pollset_add_fd (exec_ctx, &g_pollset, sv->em_fd); /* Register to be interested in reading from listen_fd. */ sv->listen_closure.cb = listen_cb; sv->listen_closure.cb_arg = sv; - grpc_fd_notify_on_read (sv->em_fd, &sv->listen_closure, closure_list); + grpc_fd_notify_on_read (exec_ctx, sv->em_fd, &sv->listen_closure); return port; } @@ -327,7 +327,7 @@ client_session_shutdown_cb (void *arg /*client */ , int success, grpc_closure_list * closure_list) { client *cl = arg; - grpc_fd_orphan (cl->em_fd, NULL, "c", closure_list); + grpc_fd_orphan (exec_ctx, cl->em_fd, NULL, "c"); cl->done = 1; grpc_pollset_kick (&g_pollset, NULL); } @@ -344,7 +344,7 @@ client_session_write (void *arg, /*client */ if (!success) { gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - client_session_shutdown_cb (arg, 1, closure_list); + client_session_shutdown_cb (exec_ctx, arg, 1); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); return; } @@ -364,12 +364,12 @@ client_session_write (void *arg, /*client */ { cl->write_closure.cb = client_session_write; cl->write_closure.cb_arg = cl; - grpc_fd_notify_on_write (cl->em_fd, &cl->write_closure, closure_list); + grpc_fd_notify_on_write (exec_ctx, cl->em_fd, &cl->write_closure); cl->client_write_cnt++; } else { - client_session_shutdown_cb (arg, 1, closure_list); + client_session_shutdown_cb (exec_ctx, arg, 1); } gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } @@ -409,9 +409,9 @@ client_start (grpc_exec_ctx * exec_ctx, client * cl, int port) } cl->em_fd = grpc_fd_create (fd, "client"); - grpc_pollset_add_fd (&g_pollset, cl->em_fd, closure_list); + grpc_pollset_add_fd (exec_ctx, &g_pollset, cl->em_fd); - client_session_write (cl, 1, closure_list); + client_session_write (exec_ctx, cl, 1); } /* Wait for the signal to shutdown a client. */ diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index b93b9a5725e..6dcdf9ee25f 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -72,8 +72,8 @@ must_succeed (grpc_exec_ctx * exec_ctx, void *arg, int success) { GPR_ASSERT (g_connecting != NULL); GPR_ASSERT (success); - grpc_endpoint_shutdown (g_connecting, closure_list); - grpc_endpoint_destroy (g_connecting, closure_list); + grpc_endpoint_shutdown (exec_ctx, g_connecting); + grpc_endpoint_destroy (exec_ctx, g_connecting); g_connecting = NULL; finish_connection (); } diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index af338249c5b..168fc87d162 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -176,7 +176,7 @@ read_cb (grpc_exec_ctx * exec_ctx, void *user_data, int success) } else { - grpc_endpoint_read (state->ep, &state->incoming, &state->read_cb, closure_list); + grpc_endpoint_read (exec_ctx, state->ep, &state->incoming, &state->read_cb); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); } } diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index 8467e937ee0..e59e45a8b24 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -51,8 +51,8 @@ static int g_nconnects = 0; static void on_connect (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * tcp) { - grpc_endpoint_shutdown (tcp, closure_list); - grpc_endpoint_destroy (tcp, closure_list); + grpc_endpoint_shutdown (exec_ctx, tcp); + grpc_endpoint_destroy (exec_ctx, tcp); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); g_nconnects++; diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index 281f14f3b71..3facb9556fe 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -461,7 +461,7 @@ compute_engine_httpcli_get_success_override (grpc_exec_ctx * exec_ctx, const grp { grpc_httpcli_response response = http_response (200, valid_oauth2_json_response); validate_compute_engine_http_request (request); - on_response (user_data, &response, closure_list); + on_response (exec_ctx, user_data, &response); return 1; } @@ -470,7 +470,7 @@ compute_engine_httpcli_get_failure_override (grpc_exec_ctx * exec_ctx, const grp { grpc_httpcli_response response = http_response (403, "Not Authorized."); validate_compute_engine_http_request (request); - on_response (user_data, &response, closure_list); + on_response (exec_ctx, user_data, &response); return 1; } @@ -548,7 +548,7 @@ refresh_token_httpcli_post_success (grpc_exec_ctx * exec_ctx, const grpc_httpcli { grpc_httpcli_response response = http_response (200, valid_oauth2_json_response); validate_refresh_token_http_request (request, body, body_size); - on_response (user_data, &response, closure_list); + on_response (exec_ctx, user_data, &response); return 1; } @@ -557,7 +557,7 @@ refresh_token_httpcli_post_failure (grpc_exec_ctx * exec_ctx, const grpc_httpcli { grpc_httpcli_response response = http_response (403, "Not Authorized."); validate_refresh_token_http_request (request, body, body_size); - on_response (user_data, &response, closure_list); + on_response (exec_ctx, user_data, &response); return 1; } diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c index 506918d27c6..8832dca817c 100644 --- a/test/core/security/jwt_verifier_test.c +++ b/test/core/security/jwt_verifier_test.c @@ -203,7 +203,7 @@ httpcli_get_google_keys_for_email (grpc_exec_ctx * exec_ctx, const grpc_httpcli_ GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); GPR_ASSERT (strcmp (request->host, "www.googleapis.com") == 0); GPR_ASSERT (strcmp (request->path, "/robot/v1/metadata/x509/" "777-abaslkan11hlb6nmim3bpspl31ud@developer." "gserviceaccount.com") == 0); - on_response (user_data, &response, closure_list); + on_response (exec_ctx, user_data, &response); gpr_free (response.body); return 1; } @@ -246,7 +246,7 @@ httpcli_get_custom_keys_for_email (grpc_exec_ctx * exec_ctx, const grpc_httpcli_ GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); GPR_ASSERT (strcmp (request->host, "keys.bar.com") == 0); GPR_ASSERT (strcmp (request->path, "/jwk/foo@bar.com") == 0); - on_response (user_data, &response, closure_list); + on_response (exec_ctx, user_data, &response); gpr_free (response.body); return 1; } @@ -279,7 +279,7 @@ httpcli_get_jwk_set (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * requ GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); GPR_ASSERT (strcmp (request->host, "www.googleapis.com") == 0); GPR_ASSERT (strcmp (request->path, "/oauth2/v3/certs") == 0); - on_response (user_data, &response, closure_list); + on_response (exec_ctx, user_data, &response); gpr_free (response.body); return 1; } @@ -292,7 +292,7 @@ httpcli_get_openid_config (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request GPR_ASSERT (strcmp (request->host, "accounts.google.com") == 0); GPR_ASSERT (strcmp (request->path, GRPC_OPENID_CONFIG_URL_SUFFIX) == 0); grpc_httpcli_set_override (httpcli_get_jwk_set, httpcli_post_should_not_be_called); - on_response (user_data, &response, closure_list); + on_response (exec_ctx, user_data, &response); gpr_free (response.body); return 1; } @@ -331,7 +331,7 @@ httpcli_get_bad_json (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * req { grpc_httpcli_response response = http_response (200, gpr_strdup ("{\"bad\": \"stuff\"}")); GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); - on_response (user_data, &response, closure_list); + on_response (exec_ctx, user_data, &response); gpr_free (response.body); return 1; } diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index 670b19e28c1..a1893375eca 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -247,7 +247,7 @@ got_port_from_server (grpc_exec_ctx * exec_ctx, void *arg, const grpc_httpcli_re req.path = "/get"; gpr_log (GPR_DEBUG, "failed port pick from server: retrying"); sleep (1); - grpc_httpcli_get (pr->ctx, &pr->pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, pr, closure_list); + grpc_httpcli_get (pr->ctx, &pr->pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (exec_ctx, 10), got_port_from_server, pr); return; } GPR_ASSERT (response); diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index 4d1ef62e170..f3a7df1f693 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -75,8 +75,8 @@ 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 (tcp, closure_list); - grpc_endpoint_destroy (tcp, closure_list); + grpc_endpoint_shutdown (exec_ctx, tcp); + grpc_endpoint_destroy (exec_ctx, tcp); if (peer) { last_colon = strrchr (peer, ':'); From 8ad03754ec6775fa4055644d43f06b748cc03d98 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 10:48:23 -0700 Subject: [PATCH 29/56] Change runs to enqueue --- src/core/channel/client_channel.c | 6 +++--- src/core/client_config/lb_policies/pick_first.c | 8 ++++---- src/core/client_config/lb_policies/round_robin.c | 6 +++--- src/core/client_config/resolvers/dns_resolver.c | 4 ++-- .../client_config/resolvers/sockaddr_resolver.c | 4 ++-- src/core/client_config/subchannel.c | 2 +- src/core/iomgr/alarm.c | 4 ++-- src/core/iomgr/fd_posix.c | 8 ++++---- src/core/iomgr/pollset_multipoller_with_epoll.c | 4 ++-- src/core/iomgr/pollset_posix.c | 4 ++-- src/core/iomgr/tcp_client_posix.c | 8 ++++---- src/core/iomgr/tcp_posix.c | 6 +++--- src/core/iomgr/tcp_server_posix.c | 2 +- src/core/iomgr/udp_server.c | 2 +- src/core/security/secure_endpoint.c | 4 ++-- src/core/surface/server.c | 12 ++++++------ src/core/transport/chttp2/frame_ping.c | 2 +- src/core/transport/chttp2/writing.c | 2 +- src/core/transport/chttp2_transport.c | 14 +++++++------- src/core/transport/connectivity_state.c | 6 +++--- src/core/transport/transport.c | 6 +++--- 21 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 9a7c1c77ca1..ecb6c219ac6 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -366,7 +366,7 @@ perform_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, break; case CALL_WAITING_FOR_SEND: GPR_ASSERT (!continuation); - grpc_closure_list_add (closure_list, merge_into_waiting_op (elem, op), 1); + grpc_exec_ctx_enqueue (exec_ctx, merge_into_waiting_op (elem, op), 1); if (!calld->waiting_op.send_ops && calld->waiting_op.cancel_with_status == GRPC_STATUS_OK) { gpr_mu_unlock (&calld->mu_state); @@ -402,7 +402,7 @@ perform_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, } else { - grpc_closure_list_add (closure_list, merge_into_waiting_op (elem, op), 1); + grpc_exec_ctx_enqueue (exec_ctx, merge_into_waiting_op (elem, op), 1); gpr_mu_unlock (&calld->mu_state); } break; @@ -617,7 +617,7 @@ cc_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, gr channel_data *chand = elem->channel_data; grpc_resolver *destroy_resolver = NULL; - grpc_closure_list_add (closure_list, op->on_consumed, 1); + grpc_exec_ctx_enqueue (exec_ctx, op->on_consumed, 1); GPR_ASSERT (op->set_accept_stream == NULL); GPR_ASSERT (op->bind_pollset == NULL); diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index c07cc81b272..75e6c01839d 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -130,7 +130,7 @@ pf_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) { pending_pick *next = pp->next; *pp->target = NULL; - grpc_closure_list_add (closure_list, pp->on_complete, 1); + grpc_exec_ctx_enqueue (exec_ctx, pp->on_complete, 1); gpr_free (pp); pp = next; } @@ -168,7 +168,7 @@ pf_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_pollset * pollset, { gpr_mu_unlock (&p->mu); *target = p->selected; - grpc_closure_list_add (closure_list, on_complete, 1); + grpc_exec_ctx_enqueue (exec_ctx, on_complete, 1); } else { @@ -226,7 +226,7 @@ pf_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) p->pending_picks = pp->next; *pp->target = p->selected; grpc_subchannel_del_interested_party (exec_ctx, p->selected, pp->pollset); - grpc_closure_list_add (closure_list, pp->on_complete, 1); + grpc_exec_ctx_enqueue (exec_ctx, pp->on_complete, 1); gpr_free (pp); } grpc_subchannel_notify_on_state_change (exec_ctx, p->selected, &p->checking_connectivity, &p->connectivity_changed); @@ -263,7 +263,7 @@ pf_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { p->pending_picks = pp->next; *pp->target = NULL; - grpc_closure_list_add (closure_list, pp->on_complete, 1); + grpc_exec_ctx_enqueue (exec_ctx, pp->on_complete, 1); gpr_free (pp); } GRPC_LB_POLICY_UNREF (exec_ctx, &p->base, "pick_first_connectivity"); diff --git a/src/core/client_config/lb_policies/round_robin.c b/src/core/client_config/lb_policies/round_robin.c index b745628bbc9..5f8976396bf 100644 --- a/src/core/client_config/lb_policies/round_robin.c +++ b/src/core/client_config/lb_policies/round_robin.c @@ -292,7 +292,7 @@ rr_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) { p->pending_picks = pp->next; *pp->target = NULL; - grpc_closure_list_add (closure_list, pp->on_complete, 0); + grpc_exec_ctx_enqueue (exec_ctx, pp->on_complete, 0); gpr_free (pp); } grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "shutdown"); @@ -416,7 +416,7 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) gpr_log (GPR_DEBUG, "[RR CONN CHANGED] TARGET <-- SUBCHANNEL %p (NODE %p)", selected->subchannel, selected); } grpc_subchannel_del_interested_party (exec_ctx, selected->subchannel, pp->pollset); - grpc_closure_list_add (closure_list, pp->on_complete, 1); + grpc_exec_ctx_enqueue (exec_ctx, pp->on_complete, 1); gpr_free (pp); } grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx]); @@ -458,7 +458,7 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { p->pending_picks = pp->next; *pp->target = NULL; - grpc_closure_list_add (closure_list, pp->on_complete, 1); + grpc_exec_ctx_enqueue (exec_ctx, pp->on_complete, 1); gpr_free (pp); } unref = 1; diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index 781f1a9e231..dc8151311a6 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -96,7 +96,7 @@ dns_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver) if (r->next_completion != NULL) { *r->target_config = NULL; - grpc_closure_list_add (closure_list, r->next_completion, 1); + grpc_exec_ctx_enqueue (exec_ctx, r->next_completion, 1); r->next_completion = NULL; } gpr_mu_unlock (&r->mu); @@ -197,7 +197,7 @@ dns_maybe_finish_next_locked (grpc_exec_ctx * exec_ctx, dns_resolver * r) { grpc_client_config_ref (r->resolved_config); } - grpc_closure_list_add (closure_list, r->next_completion, 1); + grpc_exec_ctx_enqueue (exec_ctx, r->next_completion, 1); r->next_completion = NULL; r->published_version = r->resolved_version; } diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index 1b2eac997d5..f4c958c4248 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -98,7 +98,7 @@ sockaddr_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver) if (r->next_completion != NULL) { *r->target_config = NULL; - grpc_closure_list_add (closure_list, r->next_completion, 1); + grpc_exec_ctx_enqueue (exec_ctx, r->next_completion, 1); r->next_completion = NULL; } gpr_mu_unlock (&r->mu); @@ -151,7 +151,7 @@ sockaddr_maybe_finish_next_locked (grpc_exec_ctx * exec_ctx, sockaddr_resolver * GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "sockaddr"); r->published = 1; *r->target_config = cfg; - grpc_closure_list_add (closure_list, r->next_completion, 1); + grpc_exec_ctx_enqueue (exec_ctx, r->next_completion, 1); r->next_completion = NULL; } } diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index 3db2fae5934..b0d71112d00 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -627,7 +627,7 @@ publish_transport (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) while (w4c != NULL) { waiting_for_connect *next = w4c->next; - grpc_closure_list_add (closure_list, &w4c->continuation, 1); + grpc_exec_ctx_enqueue (exec_ctx, &w4c->continuation, 1); w4c = next; } diff --git a/src/core/iomgr/alarm.c b/src/core/iomgr/alarm.c index 3110bd3cdfe..6e56ccacf5e 100644 --- a/src/core/iomgr/alarm.c +++ b/src/core/iomgr/alarm.c @@ -243,7 +243,7 @@ grpc_alarm_cancel (grpc_exec_ctx * exec_ctx, grpc_alarm * alarm) gpr_mu_lock (&shard->mu); if (!alarm->triggered) { - grpc_closure_list_add (closure_list, &alarm->closure, 0); + grpc_exec_ctx_enqueue (exec_ctx, &alarm->closure, 0); alarm->triggered = 1; if (alarm->heap_index == INVALID_HEAP_INDEX) { @@ -320,7 +320,7 @@ pop_alarms (grpc_exec_ctx * exec_ctx, shard_type * shard, gpr_timespec now, gpr_ gpr_mu_lock (&shard->mu); while ((alarm = pop_one (shard, now))) { - grpc_closure_list_add (closure_list, &alarm->closure, success); + grpc_exec_ctx_enqueue (exec_ctx, &alarm->closure, success); n++; } *new_min_deadline = compute_min_deadline (shard); diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index fb4e99605dc..27936455c61 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -262,7 +262,7 @@ grpc_fd_orphan (grpc_exec_ctx * exec_ctx, grpc_fd * fd, grpc_closure * on_done, { fd->closed = 1; close (fd->fd); - grpc_closure_list_add (closure_list, fd->on_done_closure, 1); + grpc_exec_ctx_enqueue (exec_ctx, fd->on_done_closure, 1); } else { @@ -325,7 +325,7 @@ notify_on (grpc_exec_ctx * exec_ctx, grpc_fd * fd, gpr_atm * st, grpc_closure * case READY: GPR_ASSERT (gpr_atm_no_barrier_load (st) == READY); gpr_atm_rel_store (st, NOT_READY); - grpc_closure_list_add (closure_list, closure, !gpr_atm_acq_load (&fd->shutdown)); + grpc_exec_ctx_enqueue (exec_ctx, closure, !gpr_atm_acq_load (&fd->shutdown)); return; default: /* WAITING */ /* upcallptr was set to a different closure. This is an error! */ @@ -358,7 +358,7 @@ set_ready_locked (grpc_exec_ctx * exec_ctx, grpc_fd * fd, gpr_atm * st) state = gpr_atm_acq_load (st); default: /* waiting */ GPR_ASSERT (gpr_atm_no_barrier_load (st) != READY && gpr_atm_no_barrier_load (st) != NOT_READY); - grpc_closure_list_add (closure_list, (grpc_closure *) state, !gpr_atm_acq_load (&fd->shutdown)); + grpc_exec_ctx_enqueue (exec_ctx, (grpc_closure *) state, !gpr_atm_acq_load (&fd->shutdown)); gpr_atm_rel_store (st, NOT_READY); return; } @@ -483,7 +483,7 @@ grpc_fd_end_poll (grpc_exec_ctx * exec_ctx, grpc_fd_watcher * watcher, int got_r { fd->closed = 1; close (fd->fd); - grpc_closure_list_add (closure_list, fd->on_done_closure, 1); + grpc_exec_ctx_enqueue (exec_ctx, fd->on_done_closure, 1); } gpr_mu_unlock (&fd->watcher_mu); diff --git a/src/core/iomgr/pollset_multipoller_with_epoll.c b/src/core/iomgr/pollset_multipoller_with_epoll.c index a9ee5a45742..c62a786cf65 100644 --- a/src/core/iomgr/pollset_multipoller_with_epoll.c +++ b/src/core/iomgr/pollset_multipoller_with_epoll.c @@ -111,7 +111,7 @@ perform_delayed_add (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_status) if (da->pollset->in_flight_cbs == 0 && !da->pollset->called_shutdown) { da->pollset->called_shutdown = 1; - grpc_closure_list_add (closure_list, da->pollset->shutdown_done, 1); + grpc_exec_ctx_enqueue (exec_ctx, da->pollset->shutdown_done, 1); } } gpr_mu_unlock (&da->pollset->mu); @@ -137,7 +137,7 @@ multipoll_with_epoll_pollset_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * po GRPC_FD_REF (fd, "delayed_add"); grpc_closure_init (&da->closure, perform_delayed_add, da); pollset->in_flight_cbs++; - grpc_closure_list_add (closure_list, &da->closure, 1); + grpc_exec_ctx_enqueue (exec_ctx, &da->closure, 1); } } diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index c15b1f1908f..2f08dd0f70f 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -202,7 +202,7 @@ static void finish_shutdown (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset) { pollset->vtable->finish_shutdown (pollset); - grpc_closure_list_add (closure_list, pollset->shutdown_done, 1); + grpc_exec_ctx_enqueue (exec_ctx, pollset->shutdown_done, 1); } void @@ -378,7 +378,7 @@ basic_do_promote (grpc_exec_ctx * exec_ctx, void *args, int success) { GPR_ASSERT (!grpc_pollset_has_workers (pollset)); pollset->called_shutdown = 1; - grpc_closure_list_add (closure_list, pollset->shutdown_done, 1); + grpc_exec_ctx_enqueue (exec_ctx, pollset->shutdown_done, 1); } } else if (grpc_fd_is_orphaned (fd)) diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c index 69384ef4847..e3cecd3a361 100644 --- a/src/core/iomgr/tcp_client_posix.c +++ b/src/core/iomgr/tcp_client_posix.c @@ -225,7 +225,7 @@ finish: gpr_free (ac->addr_str); gpr_free (ac); } - grpc_closure_list_add (closure_list, closure, *ep != NULL); + grpc_exec_ctx_enqueue (exec_ctx, closure, *ep != NULL); } void @@ -264,7 +264,7 @@ grpc_tcp_client_connect (grpc_exec_ctx * exec_ctx, grpc_closure * closure, grpc_ } if (!prepare_socket (addr, fd)) { - grpc_closure_list_add (closure_list, closure, 0); + grpc_exec_ctx_enqueue (exec_ctx, closure, 0); return; } @@ -283,7 +283,7 @@ grpc_tcp_client_connect (grpc_exec_ctx * exec_ctx, grpc_closure * closure, grpc_ if (err >= 0) { *ep = grpc_tcp_create (fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str); - grpc_closure_list_add (closure_list, closure, 1); + grpc_exec_ctx_enqueue (exec_ctx, closure, 1); goto done; } @@ -291,7 +291,7 @@ grpc_tcp_client_connect (grpc_exec_ctx * exec_ctx, grpc_closure * closure, grpc_ { gpr_log (GPR_ERROR, "connect error to '%s': %s", addr_str, strerror (errno)); grpc_fd_orphan (exec_ctx, fdobj, NULL, "tcp_client_connect_error"); - grpc_closure_list_add (closure_list, closure, 0); + grpc_exec_ctx_enqueue (exec_ctx, closure, 0); goto done; } diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c index 66895f3744f..b24bc2e11e4 100644 --- a/src/core/iomgr/tcp_posix.c +++ b/src/core/iomgr/tcp_posix.c @@ -307,7 +307,7 @@ tcp_read (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * incom } else { - grpc_closure_list_add (closure_list, &tcp->read_closure, 1); + grpc_exec_ctx_enqueue (exec_ctx, &tcp->read_closure, 1); } } @@ -457,7 +457,7 @@ tcp_write (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * buf, if (buf->length == 0) { GRPC_TIMER_END (GRPC_PTAG_TCP_WRITE, 0); - grpc_closure_list_add (closure_list, cb, 1); + grpc_exec_ctx_enqueue (exec_ctx, cb, 1); return; } tcp->outgoing_buffer = buf; @@ -473,7 +473,7 @@ tcp_write (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * buf, } else { - grpc_closure_list_add (closure_list, cb, status == FLUSH_DONE); + grpc_exec_ctx_enqueue (exec_ctx, cb, status == FLUSH_DONE); } GRPC_TIMER_END (GRPC_PTAG_TCP_WRITE, 0); diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c index 2d42e03ce05..5e83b8b3fd4 100644 --- a/src/core/iomgr/tcp_server_posix.c +++ b/src/core/iomgr/tcp_server_posix.c @@ -151,7 +151,7 @@ grpc_tcp_server_create (void) static void finish_shutdown (grpc_exec_ctx * exec_ctx, grpc_tcp_server * s) { - grpc_closure_list_add (closure_list, s->shutdown_complete, 1); + grpc_exec_ctx_enqueue (exec_ctx, s->shutdown_complete, 1); gpr_mu_destroy (&s->mu); diff --git a/src/core/iomgr/udp_server.c b/src/core/iomgr/udp_server.c index 80b8748ea5b..a1b6f75ede6 100644 --- a/src/core/iomgr/udp_server.c +++ b/src/core/iomgr/udp_server.c @@ -144,7 +144,7 @@ grpc_udp_server_create (void) static void finish_shutdown (grpc_exec_ctx * exec_ctx, grpc_udp_server * s) { - grpc_closure_list_add (closure_list, s->shutdown_complete, 1); + grpc_exec_ctx_enqueue (exec_ctx, s->shutdown_complete, 1); gpr_mu_destroy (&s->mu); gpr_cv_destroy (&s->cv); diff --git a/src/core/security/secure_endpoint.c b/src/core/security/secure_endpoint.c index 7dee1c1edb8..97d1d2a1415 100644 --- a/src/core/security/secure_endpoint.c +++ b/src/core/security/secure_endpoint.c @@ -148,7 +148,7 @@ call_read_cb (grpc_exec_ctx * exec_ctx, secure_endpoint * ep, int success) } } ep->read_buffer = NULL; - grpc_closure_list_add (closure_list, ep->read_cb, success); + grpc_exec_ctx_enqueue (exec_ctx, ep->read_cb, success); SECURE_ENDPOINT_UNREF (exec_ctx, ep, "read"); } @@ -340,7 +340,7 @@ endpoint_write (grpc_exec_ctx * exec_ctx, grpc_endpoint * secure_ep, gpr_slice_b { /* TODO(yangg) do different things according to the error type? */ gpr_slice_buffer_reset_and_unref (&ep->output_buffer); - grpc_closure_list_add (closure_list, cb, 0); + grpc_exec_ctx_enqueue (exec_ctx, cb, 0); return; } diff --git a/src/core/surface/server.c b/src/core/surface/server.c index fac93beaa4e..0b05720fa7d 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -353,7 +353,7 @@ request_matcher_zombify_all_pending_calls (grpc_exec_ctx * exec_ctx, request_mat calld->state = ZOMBIED; gpr_mu_unlock (&calld->mu_state); grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element (grpc_call_get_call_stack (calld->call), 0)); - grpc_closure_list_add (closure_list, &calld->kill_zombie_closure, 1); + grpc_exec_ctx_enqueue (exec_ctx, &calld->kill_zombie_closure, 1); } } @@ -451,7 +451,7 @@ destroy_channel (grpc_exec_ctx * exec_ctx, channel_data * chand) maybe_finish_shutdown (exec_ctx, chand->server); chand->finish_destroy_channel_closure.cb = finish_destroy_channel; chand->finish_destroy_channel_closure.cb_arg = chand; - grpc_closure_list_add (closure_list, &chand->finish_destroy_channel_closure, 1); + grpc_exec_ctx_enqueue (exec_ctx, &chand->finish_destroy_channel_closure, 1); } static void @@ -466,7 +466,7 @@ finish_start_new_rpc (grpc_exec_ctx * exec_ctx, grpc_server * server, grpc_call_ calld->state = ZOMBIED; gpr_mu_unlock (&calld->mu_state); grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, elem); - grpc_closure_list_add (closure_list, &calld->kill_zombie_closure, 1); + grpc_exec_ctx_enqueue (exec_ctx, &calld->kill_zombie_closure, 1); return; } @@ -678,7 +678,7 @@ server_on_recv (grpc_exec_ctx * exec_ctx, void *ptr, int success) calld->state = ZOMBIED; gpr_mu_unlock (&calld->mu_state); grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, elem); - grpc_closure_list_add (closure_list, &calld->kill_zombie_closure, 1); + grpc_exec_ctx_enqueue (exec_ctx, &calld->kill_zombie_closure, 1); } else { @@ -692,7 +692,7 @@ server_on_recv (grpc_exec_ctx * exec_ctx, void *ptr, int success) calld->state = ZOMBIED; gpr_mu_unlock (&calld->mu_state); grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, elem); - grpc_closure_list_add (closure_list, &calld->kill_zombie_closure, 1); + grpc_exec_ctx_enqueue (exec_ctx, &calld->kill_zombie_closure, 1); } else if (calld->state == PENDING) { @@ -1258,7 +1258,7 @@ queue_call_request (grpc_exec_ctx * exec_ctx, grpc_server * server, requested_ca { gpr_mu_unlock (&calld->mu_state); grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element (grpc_call_get_call_stack (calld->call), 0)); - grpc_closure_list_add (closure_list, &calld->kill_zombie_closure, 1); + grpc_exec_ctx_enqueue (exec_ctx, &calld->kill_zombie_closure, 1); } else { diff --git a/src/core/transport/chttp2/frame_ping.c b/src/core/transport/chttp2/frame_ping.c index 2038a4eb273..eaa086bd2b6 100644 --- a/src/core/transport/chttp2/frame_ping.c +++ b/src/core/transport/chttp2/frame_ping.c @@ -97,7 +97,7 @@ grpc_chttp2_ping_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chtt { if (0 == memcmp (p->opaque_8bytes, ping->id, 8)) { - grpc_closure_list_add (closure_list, ping->on_recv, 1); + grpc_exec_ctx_enqueue (exec_ctx, ping->on_recv, 1); } ping->next->prev = ping->prev; ping->prev->next = ping->next; diff --git a/src/core/transport/chttp2/writing.c b/src/core/transport/chttp2/writing.c index 6c051f5b473..ebc170fb431 100644 --- a/src/core/transport/chttp2/writing.c +++ b/src/core/transport/chttp2/writing.c @@ -202,7 +202,7 @@ grpc_chttp2_cleanup_writing (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_glo { GPR_ASSERT (stream_global->write_state != GRPC_WRITE_STATE_QUEUED_CLOSE); stream_global->outgoing_sopb = NULL; - grpc_closure_list_add (closure_list, stream_global->send_done_closure, 1); + grpc_exec_ctx_enqueue (exec_ctx, stream_global->send_done_closure, 1); } } stream_global->writing_now = 0; diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index d880a1b9dbd..573cc34d88b 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -157,7 +157,7 @@ destruct_transport (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) while (t->global.pings.next != &t->global.pings) { grpc_chttp2_outstanding_ping *ping = t->global.pings.next; - grpc_closure_list_add (closure_list, ping->on_recv, 0); + grpc_exec_ctx_enqueue (exec_ctx, ping->on_recv, 0); ping->next->prev = ping->prev; ping->prev->next = ping->next; gpr_free (ping); @@ -523,7 +523,7 @@ unlock (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { t->writing_active = 1; REF_TRANSPORT (t, "writing"); - grpc_closure_list_add (closure_list, &t->writing_action, 1); + grpc_exec_ctx_enqueue (exec_ctx, &t->writing_action, 1); prevent_endpoint_shutdown (t); } @@ -673,7 +673,7 @@ perform_stream_op_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global else { grpc_sopb_reset (op->send_ops); - grpc_closure_list_add (closure_list, stream_global->send_done_closure, 0); + grpc_exec_ctx_enqueue (exec_ctx, stream_global->send_done_closure, 0); } } @@ -707,7 +707,7 @@ perform_stream_op_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global add_to_pollset_locked (TRANSPORT_FROM_GLOBAL (exec_ctx, transport_global), op->bind_pollset); } - grpc_closure_list_add (closure_list, op->on_consumed, 1); + grpc_exec_ctx_enqueue (exec_ctx, op->on_consumed, 1); } static void @@ -748,7 +748,7 @@ perform_transport_op (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_transp lock (t); - grpc_closure_list_add (closure_list, op->on_consumed, 1); + grpc_exec_ctx_enqueue (exec_ctx, op->on_consumed, 1); if (op->on_connectivity_state_change) { @@ -890,7 +890,7 @@ unlock_check_read_write_state (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * { grpc_sopb_reset (stream_global->outgoing_sopb); stream_global->outgoing_sopb = NULL; - grpc_closure_list_add (closure_list, stream_global->send_done_closure, 1); + grpc_exec_ctx_enqueue (exec_ctx, stream_global->send_done_closure, 1); } stream_global->read_closed = 1; if (!stream_global->published_cancelled) @@ -936,7 +936,7 @@ unlock_check_read_write_state (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op (&stream_global->incoming_metadata, &stream_global->incoming_sopb, &stream_global->outstanding_metadata); grpc_sopb_swap (stream_global->publish_sopb, &stream_global->incoming_sopb); stream_global->published_state = *stream_global->publish_state = state; - grpc_closure_list_add (closure_list, stream_global->recv_done_closure, 1); + grpc_exec_ctx_enqueue (exec_ctx, stream_global->recv_done_closure, 1); stream_global->recv_done_closure = NULL; stream_global->publish_sopb = NULL; stream_global->publish_state = NULL; diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c index 76a69d1dab4..fc39515f91a 100644 --- a/src/core/transport/connectivity_state.c +++ b/src/core/transport/connectivity_state.c @@ -87,7 +87,7 @@ grpc_connectivity_state_destroy (grpc_exec_ctx * exec_ctx, grpc_connectivity_sta { success = 0; } - grpc_closure_list_add (closure_list, w->notify, success); + grpc_exec_ctx_enqueue (exec_ctx, w->notify, success); gpr_free (w); } gpr_free (tracker->name); @@ -113,7 +113,7 @@ grpc_connectivity_state_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_c if (tracker->current_state != *current) { *current = tracker->current_state; - grpc_closure_list_add (closure_list, notify, 1); + grpc_exec_ctx_enqueue (exec_ctx, notify, 1); } else { @@ -144,7 +144,7 @@ grpc_connectivity_state_set (grpc_exec_ctx * exec_ctx, grpc_connectivity_state_t { *w->current = tracker->current_state; tracker->watchers = w->next; - grpc_closure_list_add (closure_list, w->notify, 1); + grpc_exec_ctx_enqueue (exec_ctx, w->notify, 1); gpr_free (w); } } diff --git a/src/core/transport/transport.c b/src/core/transport/transport.c index e41481aa64e..35ba0ba067d 100644 --- a/src/core/transport/transport.c +++ b/src/core/transport/transport.c @@ -81,9 +81,9 @@ grpc_transport_get_peer (grpc_exec_ctx * exec_ctx, grpc_transport * transport) void grpc_transport_stream_op_finish_with_failure (grpc_exec_ctx * exec_ctx, grpc_transport_stream_op * op) { - grpc_closure_list_add (closure_list, op->on_done_recv, 0); - grpc_closure_list_add (closure_list, op->on_done_send, 0); - grpc_closure_list_add (closure_list, op->on_consumed, 0); + grpc_exec_ctx_enqueue (exec_ctx, op->on_done_recv, 0); + grpc_exec_ctx_enqueue (exec_ctx, op->on_done_send, 0); + grpc_exec_ctx_enqueue (exec_ctx, op->on_consumed, 0); } void From 9fa914e554826f3d11663263498df829e0b1b94e Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 10:50:52 -0700 Subject: [PATCH 30/56] Fixup naming --- src/core/channel/client_channel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index ecb6c219ac6..3868db1b878 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -482,10 +482,10 @@ cc_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem perform_transport_stream_op (exec_ctx, elem, op, 0); } -static void watch_lb_policy (channel_data * chand, grpc_lb_policy * lb_policy, grpc_connectivity_state current_state, grpc_closure_list * cl); +static void watch_lb_policy (grpc_exec_ctx * exec_ctx, channel_data * chand, grpc_lb_policy * lb_policy, grpc_connectivity_state current_state); static void -on_lb_policy_state_changed_locked (lb_policy_connectivity_watcher * w, grpc_closure_list * cl) +on_lb_policy_state_changed_locked (grpc_exec_ctx * exec_ctx, lb_policy_connectivity_watcher * w) { /* check if the notification is for a stale policy */ if (w->lb_policy != w->chand->lb_policy) From 098047b53abfb3142b0dc9eca83564cd565902b7 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 10:53:14 -0700 Subject: [PATCH 31/56] Rename run --- src/core/iomgr/iomgr.c | 4 +-- src/core/iomgr/resolve_address_posix.c | 2 +- src/core/security/credentials.c | 2 +- .../security/google_default_credentials.c | 4 +-- src/core/security/server_auth_filter.c | 2 +- src/core/security/server_secure_chttp2.c | 4 +-- src/core/surface/call.c | 10 +++--- src/core/surface/channel.c | 2 +- src/core/surface/channel_connectivity.c | 4 +-- src/core/surface/channel_create.c | 2 +- src/core/surface/completion_queue.c | 6 ++-- src/core/surface/lame_client.c | 2 +- src/core/surface/secure_channel_create.c | 2 +- src/core/surface/server.c | 12 +++---- src/core/surface/server_chttp2.c | 2 +- test/core/bad_client/bad_client.c | 12 +++---- test/core/client_config/lb_policies_test.c | 2 +- .../core/end2end/fixtures/h2_sockpair+trace.c | 8 ++--- test/core/end2end/fixtures/h2_sockpair.c | 6 ++-- .../core/end2end/fixtures/h2_sockpair_1byte.c | 6 ++-- test/core/httpcli/httpcli_test.c | 6 ++-- test/core/iomgr/alarm_list_test.c | 14 ++++---- test/core/iomgr/endpoint_pair_test.c | 4 +-- test/core/iomgr/endpoint_tests.c | 8 ++--- test/core/iomgr/fd_conservation_posix_test.c | 2 +- test/core/iomgr/fd_posix_test.c | 14 ++++---- test/core/iomgr/tcp_client_posix_test.c | 10 +++--- test/core/iomgr/tcp_posix_test.c | 18 +++++----- test/core/iomgr/tcp_server_posix_test.c | 12 +++---- test/core/iomgr/udp_server_test.c | 8 ++--- test/core/iomgr/workqueue_test.c | 6 ++-- test/core/security/credentials_test.c | 34 +++++++++---------- test/core/security/jwt_verifier_test.c | 14 ++++---- test/core/security/oauth2_utils.c | 4 +-- .../print_google_default_creds_token.c | 2 +- test/core/security/secure_endpoint_test.c | 8 ++--- test/core/security/verify_jwt.c | 2 +- test/core/surface/completion_queue_test.c | 2 +- test/core/util/port_posix.c | 8 ++--- test/core/util/reconnect_server.c | 6 ++-- 40 files changed, 138 insertions(+), 138 deletions(-) diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index 20b01ed4be3..dac906e6e97 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -116,7 +116,7 @@ grpc_iomgr_shutdown (void) if (grpc_alarm_check (gpr_inf_future (GPR_CLOCK_MONOTONIC), NULL, &closure_list)) { gpr_mu_unlock (&g_mu); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (&g_mu); continue; } @@ -143,7 +143,7 @@ grpc_iomgr_shutdown (void) gpr_mu_unlock (&g_mu); grpc_alarm_list_shutdown (&closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); /* ensure all threads have left g_mu */ gpr_mu_lock (&g_mu); diff --git a/src/core/iomgr/resolve_address_posix.c b/src/core/iomgr/resolve_address_posix.c index d3bc77ff8e5..9f22047bb65 100644 --- a/src/core/iomgr/resolve_address_posix.c +++ b/src/core/iomgr/resolve_address_posix.c @@ -169,7 +169,7 @@ do_request_thread (void *rp) cb (arg, resolved, &closure_list); grpc_iomgr_unregister_object (&r->iomgr_object); gpr_free (r); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index 7c444f6ac90..0abcfeff059 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -812,7 +812,7 @@ on_simulated_token_fetch_done (void *user_data) grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; r->cb (r->user_data, c->md_store->entries, c->md_store->num_entries, GRPC_CREDENTIALS_OK, &closure_list); grpc_credentials_metadata_request_destroy (r); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void diff --git a/src/core/security/google_default_credentials.c b/src/core/security/google_default_credentials.c index 527f7ea999b..e420d1d889e 100644 --- a/src/core/security/google_default_credentials.c +++ b/src/core/security/google_default_credentials.c @@ -123,7 +123,7 @@ is_stack_running_on_compute_engine (void) grpc_httpcli_get (&context, &detector.pollset, &request, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), max_detection_delay), on_compute_engine_detection_http_response, &detector, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&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. */ @@ -138,7 +138,7 @@ is_stack_running_on_compute_engine (void) grpc_httpcli_context_destroy (&context); grpc_closure_init (&destroy_closure, destroy_pollset, &detector.pollset); grpc_pollset_shutdown (&detector.pollset, &destroy_closure, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return detector.success; } diff --git a/src/core/security/server_auth_filter.c b/src/core/security/server_auth_filter.c index 77239e782e9..090c326b8f1 100644 --- a/src/core/security/server_auth_filter.c +++ b/src/core/security/server_auth_filter.c @@ -147,7 +147,7 @@ on_md_processing_done (void *user_data, const grpc_metadata * consumed_md, size_ grpc_call_next_op (elem, &calld->transport_op, &closure_list); } - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index 5b67f51b7d3..c605fc52eb5 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -302,7 +302,7 @@ grpc_server_add_secure_http2_port (grpc_server * server, const char *addr, grpc_ /* Register with the server only upon success */ grpc_server_add_listener (server, state, start, destroy, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return port_num; /* Error path: cleanup and return */ @@ -323,6 +323,6 @@ error: { gpr_free (state); } - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return 0; } diff --git a/src/core/surface/call.c b/src/core/surface/call.c index de47bc38084..e7fbab7b5b4 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -404,7 +404,7 @@ grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 pr { set_deadline_alarm (call, send_deadline, &closure_list); } - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return call; } @@ -1426,7 +1426,7 @@ grpc_call_destroy (grpc_call * c) if (cancel) grpc_call_cancel (c, NULL); GRPC_CALL_INTERNAL_UNREF (c, "destroy", &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } grpc_call_error @@ -1445,7 +1445,7 @@ grpc_call_cancel_with_status (grpc_call * c, grpc_status_code status, const char lock (c); r = cancel_with_status (c, status, description); unlock (c, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return r; } @@ -1517,7 +1517,7 @@ grpc_call_get_peer (grpc_call * call) grpc_call_element *elem = CALL_ELEM_FROM_CALL (call, 0); grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; char *result = elem->filter->get_peer (elem, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return result; } @@ -1994,7 +1994,7 @@ grpc_call_start_batch (grpc_call * call, const grpc_op * ops, size_t nops, void error = grpc_call_start_ioreq_and_call_back (call, reqs, out, finish_func, tag, &closure_list); done: - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return error; } diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index 2d120cf807e..376c4adfad0 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -326,7 +326,7 @@ grpc_channel_destroy (grpc_channel * channel) GRPC_CHANNEL_INTERNAL_UNREF (channel, "channel", &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } grpc_channel_stack * diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index b72be303d13..c021ea3db01 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -53,7 +53,7 @@ grpc_channel_check_connectivity_state (grpc_channel * channel, int try_to_connec return GRPC_CHANNEL_FATAL_FAILURE; } state = grpc_client_channel_check_connectivity_state (client_channel_elem, try_to_connect, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return state; } @@ -209,5 +209,5 @@ grpc_channel_watch_connectivity_state (grpc_channel * channel, grpc_connectivity grpc_client_channel_watch_connectivity_state (client_channel_elem, &w->state, &w->on_complete, &closure_list); } - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index 2f597563ab7..2fc2b39f5fc 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -228,7 +228,7 @@ grpc_insecure_channel_create (const char *target, const grpc_channel_args * args GRPC_RESOLVER_UNREF (resolver, "create", &closure_list); grpc_subchannel_factory_unref (&f->base, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return channel; } diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index 5cc07261bf2..2740691d184 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -237,7 +237,7 @@ grpc_completion_queue_next (grpc_completion_queue * cc, gpr_timespec deadline, v } GRPC_SURFACE_TRACE_RETURNED_EVENT (cc, &ret); GRPC_CQ_INTERNAL_UNREF (cc, "next"); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return ret; } @@ -341,7 +341,7 @@ grpc_completion_queue_pluck (grpc_completion_queue * cc, void *tag, gpr_timespec done: GRPC_SURFACE_TRACE_RETURNED_EVENT (cc, &ret); GRPC_CQ_INTERNAL_UNREF (cc, "pluck"); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return ret; } @@ -368,7 +368,7 @@ grpc_completion_queue_shutdown (grpc_completion_queue * cc) gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); grpc_pollset_shutdown (&cc->pollset, &cc->pollset_destroy_done, &closure_list); } - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c index e2a8e191ad8..e1d4657ebf3 100644 --- a/src/core/surface/lame_client.c +++ b/src/core/surface/lame_client.c @@ -171,6 +171,6 @@ grpc_lame_client_channel_create (const char *target, grpc_status_code error_code chand = (channel_data *) elem->channel_data; chand->error_code = error_code; chand->error_message = error_message; - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return channel; } diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 1290308992e..7187bbf1987 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -313,7 +313,7 @@ grpc_secure_channel_create (grpc_credentials * creds, const char *target, const grpc_channel_args_destroy (new_args_from_connector); } - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return channel; } diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 0b05720fa7d..940050e9d91 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -994,7 +994,7 @@ grpc_server_start (grpc_server * server) l->start (server, l->arg, server->pollsets, server->cq_count, &closure_list); } - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void @@ -1161,7 +1161,7 @@ grpc_server_shutdown_and_notify (grpc_server * server, grpc_completion_queue * c channel_broadcaster_shutdown (&broadcaster, 1, 0, &closure_list); done: - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void @@ -1175,7 +1175,7 @@ grpc_server_cancel_all_calls (grpc_server * server) gpr_mu_unlock (&server->mu_global); channel_broadcaster_shutdown (&broadcaster, 0, 1, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void @@ -1198,7 +1198,7 @@ grpc_server_destroy (grpc_server * server) gpr_mu_unlock (&server->mu_global); server_unref (server, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void @@ -1299,7 +1299,7 @@ grpc_server_request_call (grpc_server * server, grpc_call ** call, grpc_call_det rc->data.batch.initial_metadata = initial_metadata; error = queue_call_request (server, rc, &closure_list); done: - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return error; } @@ -1329,7 +1329,7 @@ grpc_server_request_registered_call (grpc_server * server, void *rm, grpc_call * rc->data.registered.optional_payload = optional_payload; error = queue_call_request (server, rc, &closure_list); done: - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return error; } diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c index 438ac385b4e..c7e7849ed28 100644 --- a/src/core/surface/server_chttp2.c +++ b/src/core/surface/server_chttp2.c @@ -151,6 +151,6 @@ error: port_num = 0; done: - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return port_num; } diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index 0b59aa3185f..d03c6579d2f 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -78,7 +78,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx }; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_server_setup_transport (a->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (a->server), &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void @@ -119,7 +119,7 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const transport = grpc_create_chttp2_transport (NULL, sfd.server, mdctx, 0, &closure_list); server_setup_transport (&a, transport, mdctx); grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); /* Bind everything into the same pollset */ grpc_endpoint_add_to_pollset (sfd.client, grpc_cq_pollset (a.cq), &closure_list); @@ -137,7 +137,7 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const /* Write data */ grpc_endpoint_write (sfd.client, &outgoing, &done_write_closure, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); /* Await completion */ GPR_ASSERT (gpr_event_wait (&a.done_write, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5))); @@ -146,7 +146,7 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const { grpc_endpoint_shutdown (sfd.client, &closure_list); grpc_endpoint_destroy (sfd.client, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); sfd.client = NULL; } @@ -157,7 +157,7 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const { grpc_endpoint_shutdown (sfd.client, &closure_list); grpc_endpoint_destroy (sfd.client, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } grpc_server_shutdown_and_notify (a.server, a.cq, NULL); GPR_ASSERT (grpc_completion_queue_pluck (a.cq, NULL, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1), NULL).type == GRPC_OP_COMPLETE); @@ -165,6 +165,6 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const grpc_completion_queue_destroy (a.cq); gpr_slice_buffer_destroy (&outgoing); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); } diff --git a/test/core/client_config/lb_policies_test.c b/test/core/client_config/lb_policies_test.c index 931bdef0176..3405db8fc39 100644 --- a/test/core/client_config/lb_policies_test.c +++ b/test/core/client_config/lb_policies_test.c @@ -423,7 +423,7 @@ assert_channel_connectivity (grpc_channel * ch, size_t num_accepted_conn_states, client_channel_filter = grpc_channel_stack_last_element (client_stack); actual_conn_state = grpc_client_channel_check_connectivity_state (client_channel_filter, 0 /* don't try to connect */ , &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); va_start (ap, accepted_conn_state); for (i = 0; i < num_accepted_conn_states; i++) { diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 276436ba12e..75dc0a593e3 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -66,7 +66,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx }; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } typedef struct @@ -122,7 +122,7 @@ chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args client_setup_transport (&cs, transport, mdctx, &closure_list); GPR_ASSERT (f->client); grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -139,7 +139,7 @@ chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args transport = grpc_create_chttp2_transport (server_args, sfd->server, mdctx, 0, &closure_list); server_setup_transport (f, transport, mdctx); grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -172,7 +172,7 @@ main (int argc, char **argv) grpc_test_init (argc, argv); grpc_init (); - grpc_closure_list_run (&closure_list); + 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.c b/test/core/end2end/fixtures/h2_sockpair.c index 5cdc6cacafb..ba6d7436d6b 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -65,7 +65,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx }; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } typedef struct @@ -121,7 +121,7 @@ chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args client_setup_transport (&cs, transport, mdctx, &closure_list); GPR_ASSERT (f->client); grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -138,7 +138,7 @@ chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args transport = grpc_create_chttp2_transport (server_args, sfd->server, mdctx, 0, &closure_list); server_setup_transport (f, transport, mdctx); grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 2685b57e7aa..7e3c44070e3 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -65,7 +65,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx }; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } typedef struct @@ -121,7 +121,7 @@ chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args client_setup_transport (&cs, transport, mdctx, &closure_list); GPR_ASSERT (f->client); grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -138,7 +138,7 @@ chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args transport = grpc_create_chttp2_transport (server_args, sfd->server, mdctx, 0, &closure_list); server_setup_transport (f, transport, mdctx); grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void diff --git a/test/core/httpcli/httpcli_test.c b/test/core/httpcli/httpcli_test.c index 0287009fae2..1b6be7c5261 100644 --- a/test/core/httpcli/httpcli_test.c +++ b/test/core/httpcli/httpcli_test.c @@ -95,7 +95,7 @@ test_get (int use_ssl, int port) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), n_seconds_time (20), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); @@ -127,7 +127,7 @@ test_post (int use_ssl, int port) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), n_seconds_time (20), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); @@ -185,7 +185,7 @@ main (int argc, char **argv) grpc_httpcli_context_destroy (&g_context); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); gpr_subprocess_destroy (server); diff --git a/test/core/iomgr/alarm_list_test.c b/test/core/iomgr/alarm_list_test.c index 8867545b336..272524da63e 100644 --- a/test/core/iomgr/alarm_list_test.c +++ b/test/core/iomgr/alarm_list_test.c @@ -74,7 +74,7 @@ add_test (void) /* collect alarms. Only the first batch should be ready. */ GPR_ASSERT (10 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (500, GPR_TIMESPAN)), NULL, &closure_list)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); for (i = 0; i < 20; i++) { GPR_ASSERT (cb_called[i][1] == (i < 10)); @@ -82,7 +82,7 @@ add_test (void) } GPR_ASSERT (0 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (600, GPR_TIMESPAN)), NULL, &closure_list)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); for (i = 0; i < 30; i++) { GPR_ASSERT (cb_called[i][1] == (i < 10)); @@ -91,7 +91,7 @@ add_test (void) /* collect the rest of the alarms */ GPR_ASSERT (10 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (1500, GPR_TIMESPAN)), NULL, &closure_list)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); for (i = 0; i < 30; i++) { GPR_ASSERT (cb_called[i][1] == (i < 20)); @@ -106,7 +106,7 @@ add_test (void) } grpc_alarm_list_shutdown (&closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static gpr_timespec @@ -133,16 +133,16 @@ destruction_test (void) grpc_alarm_init (&alarms[3], tfm (3), cb, (void *) (gpr_intptr) 3, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list); grpc_alarm_init (&alarms[4], tfm (1), cb, (void *) (gpr_intptr) 4, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list); GPR_ASSERT (1 == grpc_alarm_check (tfm (2), NULL, &closure_list)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (1 == cb_called[4][1]); grpc_alarm_cancel (&alarms[0], &closure_list); grpc_alarm_cancel (&alarms[3], &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (1 == cb_called[0][0]); GPR_ASSERT (1 == cb_called[3][0]); grpc_alarm_list_shutdown (&closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (1 == cb_called[1][0]); GPR_ASSERT (1 == cb_called[2][0]); } diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c index 2bc79301ea4..9270f0772a4 100644 --- a/test/core/iomgr/endpoint_pair_test.c +++ b/test/core/iomgr/endpoint_pair_test.c @@ -60,7 +60,7 @@ create_fixture_endpoint_pair (size_t slice_size) f.server_ep = p.server; grpc_endpoint_add_to_pollset (f.client_ep, &g_pollset, &closure_list); grpc_endpoint_add_to_pollset (f.server_ep, &g_pollset, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return f; } @@ -86,7 +86,7 @@ main (int argc, char **argv) grpc_endpoint_tests (configs[0], &g_pollset); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); return 0; diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index 32d08a7c6a7..b1b5f71cb46 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -232,7 +232,7 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t even when bytes_written is unsigned. */ state.bytes_written -= state.current_write_size; read_and_write_test_write_handler (&state, 1, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_endpoint_read (state.read_ep, &state.incoming, &state.done_read, &closure_list); @@ -243,7 +243,7 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t gpr_log (GPR_DEBUG, "shutdown write"); grpc_endpoint_shutdown (state.write_ep, &closure_list); } - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (g_pollset)); while (!state.read_done || !state.write_done) @@ -253,14 +253,14 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t grpc_pollset_work (g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); } gpr_mu_unlock (GRPC_POLLSET_MU (g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); end_test (config); gpr_slice_buffer_destroy (&state.outgoing); gpr_slice_buffer_destroy (&state.incoming); grpc_endpoint_destroy (state.read_ep, &closure_list); grpc_endpoint_destroy (state.write_ep, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void diff --git a/test/core/iomgr/fd_conservation_posix_test.c b/test/core/iomgr/fd_conservation_posix_test.c index 703edc660ef..d742917dc1f 100644 --- a/test/core/iomgr/fd_conservation_posix_test.c +++ b/test/core/iomgr/fd_conservation_posix_test.c @@ -61,7 +61,7 @@ main (int argc, char **argv) p = grpc_iomgr_create_endpoint_pair ("test", 1); grpc_endpoint_destroy (p.client, &closure_list); grpc_endpoint_destroy (p.server, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } grpc_iomgr_shutdown (); diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index 82d6206c86d..fac2ad4e3b8 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -285,7 +285,7 @@ server_wait_and_shutdown (server * sv) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); @@ -425,7 +425,7 @@ client_wait_and_shutdown (client * cl) grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); @@ -446,7 +446,7 @@ test_grpc_fd (void) port = server_start (&sv, &closure_list); client_init (&cl); client_start (&cl, port, &closure_list); - grpc_closure_list_run (&closure_list); + 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); @@ -540,7 +540,7 @@ test_grpc_fd_change (void) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } GPR_ASSERT (a.cb_that_ran == first_read_callback); @@ -563,7 +563,7 @@ test_grpc_fd_change (void) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } /* Except now we verify that second_read_callback ran instead */ @@ -571,7 +571,7 @@ test_grpc_fd_change (void) gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_fd_orphan (em_fd, NULL, "d", &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); destroy_change_data (&a); destroy_change_data (&b); close (sv[1]); @@ -595,7 +595,7 @@ main (int argc, char **argv) test_grpc_fd_change (); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_iomgr_shutdown (); return 0; } diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index 6dcdf9ee25f..519f8ceb954 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -134,7 +134,7 @@ test_succeeds (void) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } @@ -171,7 +171,7 @@ test_fails (void) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), test_deadline (), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } @@ -257,7 +257,7 @@ test_times_out (void) } grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_MILLIS_TO_DEADLINE (10), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); @@ -285,7 +285,7 @@ main (int argc, char **argv) grpc_pollset_set_init (&g_pollset_set); grpc_pollset_init (&g_pollset); grpc_pollset_set_add_pollset (&g_pollset_set, &g_pollset, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); test_succeeds (); gpr_log (GPR_ERROR, "End of first test"); test_fails (); @@ -293,7 +293,7 @@ main (int argc, char **argv) grpc_pollset_set_destroy (&g_pollset_set); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); return 0; } diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index 168fc87d162..f1c4d4a353c 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -216,7 +216,7 @@ read_test (size_t num_bytes, size_t slice_size) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } GPR_ASSERT (state.read_bytes == state.target_read_bytes); @@ -224,7 +224,7 @@ read_test (size_t num_bytes, size_t slice_size) gpr_slice_buffer_destroy (&state.incoming); grpc_endpoint_destroy (ep, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } /* Write to a socket until it fills up, then read from it using the grpc_tcp @@ -263,7 +263,7 @@ large_read_test (size_t slice_size) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } GPR_ASSERT (state.read_bytes == state.target_read_bytes); @@ -271,7 +271,7 @@ large_read_test (size_t slice_size) gpr_slice_buffer_destroy (&state.incoming); grpc_endpoint_destroy (ep, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } struct write_socket_state @@ -338,7 +338,7 @@ drain_socket_blocking (int fd, size_t num_bytes, size_t read_size) gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_MILLIS_TO_DEADLINE (10), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); do { bytes_read = read (fd, buf, bytes_left > read_size ? read_size : bytes_left); @@ -405,7 +405,7 @@ write_test (size_t num_bytes, size_t slice_size) } grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); @@ -413,7 +413,7 @@ write_test (size_t num_bytes, size_t slice_size) gpr_slice_buffer_destroy (&outgoing); grpc_endpoint_destroy (ep, &closure_list); gpr_free (slices); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void @@ -458,7 +458,7 @@ create_fixture_tcp_socketpair (size_t slice_size) grpc_endpoint_add_to_pollset (f.client_ep, &g_pollset, &closure_list); grpc_endpoint_add_to_pollset (f.server_ep, &g_pollset, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return f; } @@ -485,7 +485,7 @@ main (int argc, char **argv) grpc_endpoint_tests (configs[0], &g_pollset); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); return 0; diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index e59e45a8b24..4dbb7c9063a 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -75,7 +75,7 @@ test_no_op_with_start (void) LOG_TEST ("test_no_op_with_start"); grpc_tcp_server_start (s, NULL, 0, on_connect, NULL, &closure_list); grpc_tcp_server_destroy (s, NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -91,7 +91,7 @@ test_no_op_with_port (void) GPR_ASSERT (grpc_tcp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr))); grpc_tcp_server_destroy (s, NULL, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -109,7 +109,7 @@ test_no_op_with_port_and_start (void) grpc_tcp_server_start (s, NULL, 0, on_connect, NULL, &closure_list); grpc_tcp_server_destroy (s, NULL, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -157,7 +157,7 @@ test_connect (int n) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } gpr_log (GPR_DEBUG, "wait done"); @@ -169,7 +169,7 @@ test_connect (int n) gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_tcp_server_destroy (s, NULL, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -196,7 +196,7 @@ main (int argc, char **argv) grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_iomgr_shutdown (); return 0; } diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c index 86e84adb55d..ac5c4f0d804 100644 --- a/test/core/iomgr/udp_server_test.c +++ b/test/core/iomgr/udp_server_test.c @@ -80,7 +80,7 @@ test_no_op_with_start (void) LOG_TEST ("test_no_op_with_start"); grpc_udp_server_start (s, NULL, 0, &closure_list); grpc_udp_server_destroy (s, NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -112,7 +112,7 @@ test_no_op_with_port_and_start (void) grpc_udp_server_start (s, NULL, 0, &closure_list); grpc_udp_server_destroy (s, NULL, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -161,7 +161,7 @@ test_receive (int number_of_clients) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } GPR_ASSERT (g_number_of_reads == number_of_reads_before + 1); @@ -198,7 +198,7 @@ main (int argc, char **argv) grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_iomgr_shutdown (); return 0; } diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c index 7e0f336a0dc..8497f09a527 100644 --- a/test/core/iomgr/workqueue_test.c +++ b/test/core/iomgr/workqueue_test.c @@ -68,11 +68,11 @@ test_add_closure (void) GPR_ASSERT (!done); grpc_pollset_work (&g_pollset, &worker, gpr_now (deadline.clock_type), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (done); GRPC_WORKQUEUE_UNREF (wq, "destroy", &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -94,7 +94,7 @@ main (int argc, char **argv) grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); return 0; } diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index 3facb9556fe..5e5b69f16cf 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -309,7 +309,7 @@ test_google_iam_creds (void) GPR_ASSERT (grpc_credentials_has_request_metadata (creds)); GPR_ASSERT (grpc_credentials_has_request_metadata_only (creds)); grpc_credentials_get_request_metadata (creds, NULL, test_service_url, check_google_iam_metadata, creds, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -332,7 +332,7 @@ test_access_token_creds (void) GPR_ASSERT (grpc_credentials_has_request_metadata_only (creds)); GPR_ASSERT (strcmp (creds->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); grpc_credentials_get_request_metadata (creds, NULL, test_service_url, check_access_token_metadata, creds, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -366,7 +366,7 @@ test_ssl_oauth2_composite_creds (void) GPR_ASSERT (strcmp (creds_array->creds_array[0]->type, GRPC_CREDENTIALS_TYPE_SSL) == 0); GPR_ASSERT (strcmp (creds_array->creds_array[1]->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); grpc_credentials_get_request_metadata (composite_creds, NULL, test_service_url, check_ssl_oauth2_composite_metadata, composite_creds, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void @@ -422,7 +422,7 @@ test_ssl_oauth2_google_iam_composite_creds (void) GPR_ASSERT (strcmp (creds_array->creds_array[1]->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); GPR_ASSERT (strcmp (creds_array->creds_array[2]->type, GRPC_CREDENTIALS_TYPE_IAM) == 0); grpc_credentials_get_request_metadata (composite_creds, NULL, test_service_url, check_ssl_oauth2_google_iam_composite_metadata, composite_creds, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -499,12 +499,12 @@ test_compute_engine_creds_success (void) /* First request: http get should be called. */ grpc_httpcli_set_override (compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); /* Second request: the cached token should be served directly. */ grpc_httpcli_set_override (httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_credentials_unref (compute_engine_creds); grpc_httpcli_set_override (NULL, NULL); @@ -521,7 +521,7 @@ test_compute_engine_creds_failure (void) grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (void *) test_user_data, &closure_list); grpc_credentials_unref (compute_engine_creds); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -573,16 +573,16 @@ test_refresh_token_creds_success (void) /* First request: http get should be called. */ grpc_httpcli_set_override (httpcli_get_should_not_be_called, refresh_token_httpcli_post_success); grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); /* Second request: the cached token should be served directly. */ grpc_httpcli_set_override (httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_credentials_unref (refresh_token_creds); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -597,7 +597,7 @@ test_refresh_token_creds_failure (void) grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (void *) test_user_data, &closure_list); grpc_credentials_unref (refresh_token_creds); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -670,18 +670,18 @@ test_jwt_creds_success (void) /* First request: jwt_encode_and_sign should be called. */ grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_success); grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); /* Second request: the cached token should be served directly. */ grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_should_not_be_called); grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); /* Third request: Different service url so jwt_encode_and_sign should be called again (no caching). */ grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_success); grpc_credentials_get_request_metadata (jwt_creds, NULL, other_test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_free (json_key_string); grpc_credentials_unref (jwt_creds); @@ -703,7 +703,7 @@ test_jwt_creds_signing_failure (void) gpr_free (json_key_string); grpc_credentials_unref (jwt_creds); grpc_jwt_encode_and_sign_set_override (NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -858,7 +858,7 @@ test_metadata_plugin_success (void) GPR_ASSERT (state == PLUGIN_GET_METADATA_CALLED_STATE); grpc_credentials_release (creds); GPR_ASSERT (state == PLUGIN_DESTROY_CALLED_STATE); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -879,7 +879,7 @@ test_metadata_plugin_failure (void) GPR_ASSERT (state == PLUGIN_GET_METADATA_CALLED_STATE); grpc_credentials_release (creds); GPR_ASSERT (state == PLUGIN_DESTROY_CALLED_STATE); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } int diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c index 8832dca817c..2883cf858b1 100644 --- a/test/core/security/jwt_verifier_test.c +++ b/test/core/security/jwt_verifier_test.c @@ -236,7 +236,7 @@ test_jwt_verifier_google_email_issuer_success (void) gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static int @@ -269,7 +269,7 @@ test_jwt_verifier_custom_email_issuer_success (void) gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static int @@ -315,7 +315,7 @@ test_jwt_verifier_url_issuer_success (void) gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -354,7 +354,7 @@ test_jwt_verifier_url_issuer_bad_config (void) gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -375,7 +375,7 @@ test_jwt_verifier_bad_json_key (void) gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -423,7 +423,7 @@ test_jwt_verifier_bad_signature (void) gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static int @@ -450,7 +450,7 @@ test_jwt_verifier_bad_format (void) grpc_jwt_verifier_verify (verifier, NULL, "bad jwt", expected_audience, on_verification_bad_format, (void *) expected_user_data, &closure_list); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } /* find verification key: bad jks, cannot find key in jks */ diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index 9035557a416..f096fa9ca8c 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -94,7 +94,7 @@ grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds) grpc_credentials_get_request_metadata (creds, &request.pollset, "", on_oauth2_response, &request, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&request.pollset)); while (!request.is_done) @@ -105,7 +105,7 @@ grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds) gpr_mu_unlock (GRPC_POLLSET_MU (&request.pollset)); grpc_pollset_shutdown (&request.pollset, &do_nothing_closure, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_pollset_destroy (&request.pollset); 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 3f6720b6ea7..51a0968a205 100644 --- a/test/core/security/print_google_default_creds_token.c +++ b/test/core/security/print_google_default_creds_token.c @@ -105,7 +105,7 @@ main (int argc, char **argv) grpc_pollset_worker worker; grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index 595e84c8b12..bd760320cc5 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -110,7 +110,7 @@ secure_endpoint_create_fixture_tcp_socketpair (size_t slice_size, gpr_slice * le } f.server_ep = grpc_secure_endpoint_create (fake_write_protector, tcp.server, NULL, 0); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return f; } @@ -162,7 +162,7 @@ test_leftover (grpc_endpoint_test_config config, size_t slice_size) gpr_slice_buffer_init (&incoming); grpc_closure_init (&done_closure, inc_call_ctr, &n); grpc_endpoint_read (f.client_ep, &incoming, &done_closure, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (n == 1); GPR_ASSERT (incoming.count == 1); GPR_ASSERT (0 == gpr_slice_cmp (s, incoming.slices[0])); @@ -171,7 +171,7 @@ test_leftover (grpc_endpoint_test_config config, size_t slice_size) grpc_endpoint_shutdown (f.server_ep, &closure_list); grpc_endpoint_destroy (f.client_ep, &closure_list); grpc_endpoint_destroy (f.server_ep, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_slice_unref (s); gpr_slice_buffer_destroy (&incoming); @@ -197,7 +197,7 @@ main (int argc, char **argv) test_leftover (configs[1], 1); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); return 0; diff --git a/test/core/security/verify_jwt.c b/test/core/security/verify_jwt.c index fd8aaeb4843..d7d261299e9 100644 --- a/test/core/security/verify_jwt.c +++ b/test/core/security/verify_jwt.c @@ -121,7 +121,7 @@ main (int argc, char **argv) grpc_pollset_worker worker; grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index 48f1122242f..fa959402f00 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -244,7 +244,7 @@ producer_thread (void *arg) { grpc_cq_end_op (opt->cc, (void *) (gpr_intptr) 1, 1, free_completion, NULL, gpr_malloc (sizeof (grpc_cq_completion)), &closure_list); opt->events_triggered++; - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } gpr_log (GPR_INFO, "producer %d phase 2 done", opt->id); diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index a1893375eca..8403d4a1317 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -126,9 +126,9 @@ free_port_using_server (char *server, int port) gpr_mu_unlock (GRPC_POLLSET_MU (&pr.pollset)); grpc_httpcli_context_destroy (&context); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_pollset_shutdown (&pr.pollset, &shutdown_closure, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_free (path); } @@ -288,7 +288,7 @@ pick_port_using_server (char *server) grpc_httpcli_context_init (&context); grpc_httpcli_get (&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, &pr, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&pr.pollset)); while (pr.port == -1) { @@ -299,7 +299,7 @@ pick_port_using_server (char *server) grpc_httpcli_context_destroy (&context); grpc_pollset_shutdown (&pr.pollset, &shutdown_closure, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return pr.port; } diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index f3a7df1f693..d5ebb8dac39 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -143,7 +143,7 @@ reconnect_server_start (reconnect_server * server, int port) grpc_tcp_server_start (server->tcp_server, server->pollsets, 1, on_connect, server, &closure_list); gpr_log (GPR_INFO, "reconnect tcp server listening on 0.0.0.0:%d", port); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void @@ -156,7 +156,7 @@ reconnect_server_poll (reconnect_server * server, int seconds) gpr_mu_lock (GRPC_POLLSET_MU (&server->pollset)); grpc_pollset_work (&server->pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&server->pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void @@ -189,7 +189,7 @@ reconnect_server_destroy (reconnect_server * server) grpc_tcp_server_destroy (server->tcp_server, &do_nothing_closure[0], &closure_list); reconnect_server_clear_timestamps (server); grpc_pollset_shutdown (&server->pollset, &do_nothing_closure[1], &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_pollset_destroy (&server->pollset); grpc_shutdown (); } From f5768a6765cae20477f36b346ce18bfb44fe2e25 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 10:54:34 -0700 Subject: [PATCH 32/56] Rename init --- src/core/iomgr/iomgr.c | 2 +- src/core/iomgr/resolve_address_posix.c | 2 +- src/core/security/credentials.c | 4 ++-- .../security/google_default_credentials.c | 2 +- src/core/security/server_auth_filter.c | 2 +- src/core/security/server_secure_chttp2.c | 2 +- src/core/surface/call.c | 10 ++++---- src/core/surface/channel.c | 2 +- src/core/surface/channel_connectivity.c | 4 ++-- src/core/surface/channel_create.c | 2 +- src/core/surface/completion_queue.c | 6 ++--- src/core/surface/lame_client.c | 2 +- src/core/surface/secure_channel_create.c | 2 +- src/core/surface/server.c | 12 +++++----- src/core/surface/server_chttp2.c | 2 +- test/core/bad_client/bad_client.c | 4 ++-- test/core/channel/channel_stack_test.c | 2 +- test/core/client_config/lb_policies_test.c | 2 +- .../core/end2end/fixtures/h2_sockpair+trace.c | 8 +++---- test/core/end2end/fixtures/h2_sockpair.c | 6 ++--- .../core/end2end/fixtures/h2_sockpair_1byte.c | 6 ++--- test/core/httpcli/httpcli_test.c | 6 ++--- test/core/iomgr/alarm_list_test.c | 4 ++-- test/core/iomgr/endpoint_pair_test.c | 4 ++-- test/core/iomgr/endpoint_tests.c | 2 +- test/core/iomgr/fd_conservation_posix_test.c | 2 +- test/core/iomgr/fd_posix_test.c | 10 ++++---- test/core/iomgr/tcp_client_posix_test.c | 8 +++---- test/core/iomgr/tcp_posix_test.c | 12 +++++----- test/core/iomgr/tcp_server_posix_test.c | 10 ++++---- test/core/iomgr/udp_server_test.c | 8 +++---- test/core/iomgr/workqueue_test.c | 4 ++-- test/core/security/credentials_test.c | 24 +++++++++---------- test/core/security/jwt_verifier_test.c | 14 +++++------ test/core/security/oauth2_utils.c | 2 +- .../print_google_default_creds_token.c | 2 +- test/core/security/secure_endpoint_test.c | 6 ++--- test/core/security/verify_jwt.c | 2 +- test/core/surface/completion_queue_test.c | 6 ++--- test/core/util/port_posix.c | 4 ++-- test/core/util/reconnect_server.c | 6 ++--- 41 files changed, 110 insertions(+), 110 deletions(-) diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index dac906e6e97..06413eed686 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -99,7 +99,7 @@ grpc_iomgr_shutdown (void) { 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_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock (&g_mu); g_shutdown = 1; diff --git a/src/core/iomgr/resolve_address_posix.c b/src/core/iomgr/resolve_address_posix.c index 9f22047bb65..9d269d364a6 100644 --- a/src/core/iomgr/resolve_address_posix.c +++ b/src/core/iomgr/resolve_address_posix.c @@ -160,7 +160,7 @@ static void do_request_thread (void *rp) { request *r = rp; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_addresses *resolved = grpc_blocking_resolve_address (r->name, r->default_port); void *arg = r->arg; grpc_resolve_cb cb = r->cb; diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index 0abcfeff059..0b76ba563a6 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -809,7 +809,7 @@ on_simulated_token_fetch_done (void *user_data) { grpc_credentials_metadata_request *r = (grpc_credentials_metadata_request *) user_data; grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *) r->creds; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; r->cb (r->user_data, c->md_store->entries, c->md_store->num_entries, GRPC_CREDENTIALS_OK, &closure_list); grpc_credentials_metadata_request_destroy (r); grpc_exec_ctx_finish (&exec_ctx); @@ -1322,7 +1322,7 @@ static void plugin_md_request_metadata_ready (void *request, const grpc_metadata * md, size_t num_md, grpc_status_code status, const char *error_details) { /* called from application code */ - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_metadata_plugin_request *r = (grpc_metadata_plugin_request *) request; if (status != GRPC_STATUS_OK) { diff --git a/src/core/security/google_default_credentials.c b/src/core/security/google_default_credentials.c index e420d1d889e..afa4b9971ce 100644 --- a/src/core/security/google_default_credentials.c +++ b/src/core/security/google_default_credentials.c @@ -104,7 +104,7 @@ is_stack_running_on_compute_engine (void) compute_engine_detector detector; grpc_httpcli_request request; grpc_httpcli_context context; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure destroy_closure; /* The http call is local. If it takes more than one sec, it is for sure not diff --git a/src/core/security/server_auth_filter.c b/src/core/security/server_auth_filter.c index 090c326b8f1..a1516abb418 100644 --- a/src/core/security/server_auth_filter.c +++ b/src/core/security/server_auth_filter.c @@ -120,7 +120,7 @@ on_md_processing_done (void *user_data, const grpc_metadata * consumed_md, size_ { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; /* TODO(jboeuf): Implement support for response_md. */ if (response_md != NULL && num_response_md > 0) diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index c605fc52eb5..7ca7beaf52b 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -234,7 +234,7 @@ grpc_server_add_secure_http2_port (grpc_server * server, const char *addr, grpc_ int port_temp; grpc_security_status status = GRPC_SECURITY_ERROR; grpc_security_connector *sc = NULL; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; /* create security context */ if (creds == NULL) diff --git a/src/core/surface/call.c b/src/core/surface/call.c index e7fbab7b5b4..38bcc750b9c 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -303,7 +303,7 @@ grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 pr grpc_transport_stream_op initial_op; grpc_transport_stream_op *initial_op_ptr = NULL; grpc_channel_stack *channel_stack = grpc_channel_get_channel_stack (channel); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_call *call = gpr_malloc (sizeof (grpc_call) + channel_stack->call_stack_size); memset (call, 0, sizeof (grpc_call)); gpr_mu_init (&call->mu); @@ -1395,7 +1395,7 @@ grpc_call_destroy (grpc_call * c) { int cancel; grpc_call *parent = c->parent; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; if (parent) { @@ -1440,7 +1440,7 @@ grpc_call_error grpc_call_cancel_with_status (grpc_call * c, grpc_status_code status, const char *description, void *reserved) { grpc_call_error r; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT (reserved == NULL); lock (c); r = cancel_with_status (c, status, description); @@ -1515,7 +1515,7 @@ char * grpc_call_get_peer (grpc_call * call) { grpc_call_element *elem = CALL_ELEM_FROM_CALL (call, 0); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; char *result = elem->filter->get_peer (elem, &closure_list); grpc_exec_ctx_finish (&exec_ctx); return result; @@ -1742,7 +1742,7 @@ grpc_call_start_batch (grpc_call * call, const grpc_op * ops, size_t nops, void grpc_ioreq *req; void (*finish_func) (grpc_call *, int, void *, grpc_closure_list *) = finish_batch; grpc_call_error error; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; if (reserved != NULL) { diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index 376c4adfad0..1896555eba1 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -318,7 +318,7 @@ grpc_channel_destroy (grpc_channel * channel) { grpc_transport_op op; grpc_channel_element *elem; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; memset (&op, 0, sizeof (op)); op.disconnect = 1; elem = grpc_channel_stack_element (CHANNEL_STACK_FROM_CHANNEL (channel), 0); diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index c021ea3db01..30017b3b9f8 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -45,7 +45,7 @@ grpc_channel_check_connectivity_state (grpc_channel * channel, int try_to_connec { /* 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_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_connectivity_state state; if (client_channel_elem->filter != &grpc_client_channel_filter) { @@ -180,7 +180,7 @@ void grpc_channel_watch_connectivity_state (grpc_channel * channel, grpc_connectivity_state last_observed_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_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; state_watcher *w = gpr_malloc (sizeof (*w)); grpc_cq_begin_op (cq); diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index 2fc2b39f5fc..10c57ae9ad7 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -197,7 +197,7 @@ grpc_insecure_channel_create (const char *target, const grpc_channel_args * args grpc_resolver *resolver; subchannel_factory *f; grpc_mdctx *mdctx = grpc_mdctx_create (); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; size_t n = 0; GPR_ASSERT (!reserved); if (grpc_channel_args_is_census_enabled (args)) diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index 2740691d184..ff1c20e9f08 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -192,7 +192,7 @@ grpc_completion_queue_next (grpc_completion_queue * cc, gpr_timespec deadline, v grpc_pollset_worker worker; int first_loop = 1; gpr_timespec now; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT (!reserved); @@ -280,7 +280,7 @@ grpc_completion_queue_pluck (grpc_completion_queue * cc, void *tag, gpr_timespec grpc_pollset_worker worker; gpr_timespec now; int first_loop = 1; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT (!reserved); @@ -350,7 +350,7 @@ done: void grpc_completion_queue_shutdown (grpc_completion_queue * cc) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock (GRPC_POLLSET_MU (&cc->pollset)); if (cc->shutdown_called) { diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c index e1d4657ebf3..26c53410f3f 100644 --- a/src/core/surface/lame_client.c +++ b/src/core/surface/lame_client.c @@ -163,7 +163,7 @@ grpc_lame_client_channel_create (const char *target, grpc_status_code error_code grpc_channel *channel; grpc_channel_element *elem; channel_data *chand; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; static const grpc_channel_filter *filters[] = { &lame_filter }; channel = grpc_channel_create_from_filters (target, filters, 1, NULL, grpc_mdctx_create (), 1, &closure_list); elem = grpc_channel_stack_element (grpc_channel_get_channel_stack (channel), 0); diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 7187bbf1987..96ddfd80356 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -258,7 +258,7 @@ grpc_secure_channel_create (grpc_credentials * creds, const char *target, const subchannel_factory *f; #define MAX_FILTERS 3 const grpc_channel_filter *filters[MAX_FILTERS]; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; size_t n = 0; GPR_ASSERT (reserved == NULL); diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 940050e9d91..83fe3a7686d 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -981,7 +981,7 @@ grpc_server_start (grpc_server * server) { listener *l; size_t i; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; server->pollsets = gpr_malloc (sizeof (grpc_pollset *) * server->cq_count); for (i = 0; i < server->cq_count; i++) @@ -1115,7 +1115,7 @@ grpc_server_shutdown_and_notify (grpc_server * server, grpc_completion_queue * c listener *l; shutdown_tag *sdt; channel_broadcaster broadcaster; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_SERVER_LOG_SHUTDOWN (GPR_INFO, server, cq, tag); @@ -1168,7 +1168,7 @@ void grpc_server_cancel_all_calls (grpc_server * server) { channel_broadcaster broadcaster; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock (&server->mu_global); channel_broadcaster_init (server, &broadcaster); @@ -1182,7 +1182,7 @@ void grpc_server_destroy (grpc_server * server) { listener *l; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock (&server->mu_global); GPR_ASSERT (gpr_atm_acq_load (&server->shutdown_flag) || !server->listeners); @@ -1278,7 +1278,7 @@ grpc_call_error grpc_server_request_call (grpc_server * server, grpc_call ** call, grpc_call_details * details, grpc_metadata_array * initial_metadata, grpc_completion_queue * cq_bound_to_call, grpc_completion_queue * cq_for_notification, void *tag) { grpc_call_error error; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; requested_call *rc = gpr_malloc (sizeof (*rc)); GRPC_SERVER_LOG_REQUEST_CALL (GPR_INFO, server, call, details, initial_metadata, cq_bound_to_call, cq_for_notification, tag); if (!grpc_cq_is_server_cq (cq_for_notification)) @@ -1307,7 +1307,7 @@ grpc_call_error grpc_server_request_registered_call (grpc_server * server, void *rm, grpc_call ** call, gpr_timespec * deadline, grpc_metadata_array * initial_metadata, grpc_byte_buffer ** optional_payload, grpc_completion_queue * cq_bound_to_call, grpc_completion_queue * cq_for_notification, void *tag) { grpc_call_error error; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; requested_call *rc = gpr_malloc (sizeof (*rc)); registered_method *registered_method = rm; if (!grpc_cq_is_server_cq (cq_for_notification)) diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c index c7e7849ed28..23b36b5f37d 100644 --- a/src/core/surface/server_chttp2.c +++ b/src/core/surface/server_chttp2.c @@ -93,7 +93,7 @@ grpc_server_add_insecure_http2_port (grpc_server * server, const char *addr) unsigned count = 0; int port_num = -1; int port_temp; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; resolved = grpc_blocking_resolve_address (addr, "http"); if (!resolved) diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index d03c6579d2f..08e6939a576 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -76,7 +76,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter }; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_server_setup_transport (a->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (a->server), &closure_list); grpc_exec_ctx_finish (&exec_ctx); } @@ -93,7 +93,7 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const gpr_slice slice = gpr_slice_from_copied_buffer (client_payload, client_payload_length); gpr_slice_buffer outgoing; grpc_closure done_write_closure; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; hex = gpr_dump (client_payload, client_payload_length, GPR_DUMP_HEX | GPR_DUMP_ASCII); diff --git a/test/core/channel/channel_stack_test.c b/test/core/channel/channel_stack_test.c index 1cdd2259b02..2bdb456d123 100644 --- a/test/core/channel/channel_stack_test.c +++ b/test/core/channel/channel_stack_test.c @@ -108,7 +108,7 @@ test_create_channel_stack (void) grpc_mdctx *metadata_context; int *channel_data; int *call_data; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; metadata_context = grpc_mdctx_create (); diff --git a/test/core/client_config/lb_policies_test.c b/test/core/client_config/lb_policies_test.c index 3405db8fc39..826e5576cce 100644 --- a/test/core/client_config/lb_policies_test.c +++ b/test/core/client_config/lb_policies_test.c @@ -416,7 +416,7 @@ assert_channel_connectivity (grpc_channel * ch, size_t num_accepted_conn_states, grpc_channel_stack *client_stack; grpc_channel_element *client_channel_filter; grpc_connectivity_state actual_conn_state; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; va_list ap; client_stack = grpc_channel_get_channel_stack (ch); diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 75dc0a593e3..be189a65400 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -64,7 +64,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter }; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); grpc_exec_ctx_finish (&exec_ctx); } @@ -111,7 +111,7 @@ chttp2_create_fixture_socketpair (grpc_channel_args * client_args, grpc_channel_ static void chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; grpc_mdctx *mdctx = grpc_mdctx_create (); @@ -128,7 +128,7 @@ chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args static void chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_mdctx *mdctx = grpc_mdctx_create (); grpc_transport *transport; @@ -159,7 +159,7 @@ int main (int argc, char **argv) { size_t i; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + 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 */ diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index ba6d7436d6b..d11cdef9c3e 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -63,7 +63,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter }; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); grpc_exec_ctx_finish (&exec_ctx); } @@ -110,7 +110,7 @@ chttp2_create_fixture_socketpair (grpc_channel_args * client_args, grpc_channel_ static void chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; grpc_mdctx *mdctx = grpc_mdctx_create (); @@ -127,7 +127,7 @@ chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args static void chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_mdctx *mdctx = grpc_mdctx_create (); grpc_transport *transport; diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 7e3c44070e3..c54fabc0119 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -63,7 +63,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter }; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); grpc_exec_ctx_finish (&exec_ctx); } @@ -110,7 +110,7 @@ chttp2_create_fixture_socketpair (grpc_channel_args * client_args, grpc_channel_ static void chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; grpc_mdctx *mdctx = grpc_mdctx_create (); @@ -127,7 +127,7 @@ chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args static void chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_mdctx *mdctx = grpc_mdctx_create (); grpc_transport *transport; diff --git a/test/core/httpcli/httpcli_test.c b/test/core/httpcli/httpcli_test.c index 1b6be7c5261..f28a25464bf 100644 --- a/test/core/httpcli/httpcli_test.c +++ b/test/core/httpcli/httpcli_test.c @@ -75,7 +75,7 @@ test_get (int use_ssl, int port) { grpc_httpcli_request req; char *host; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; gpr_log (GPR_INFO, "running %s with use_ssl=%d.", "test_get", use_ssl); @@ -107,7 +107,7 @@ test_post (int use_ssl, int port) { grpc_httpcli_request req; char *host; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; gpr_log (GPR_INFO, "running %s with use_ssl=%d.", "test_post", (int) use_ssl); @@ -144,7 +144,7 @@ int main (int argc, char **argv) { grpc_closure destroyed; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_subprocess *server; char *me = argv[0]; char *lslash = strrchr (me, '/'); diff --git a/test/core/iomgr/alarm_list_test.c b/test/core/iomgr/alarm_list_test.c index 272524da63e..cfb079920c1 100644 --- a/test/core/iomgr/alarm_list_test.c +++ b/test/core/iomgr/alarm_list_test.c @@ -55,7 +55,7 @@ add_test (void) gpr_timespec start = gpr_now (GPR_CLOCK_REALTIME); int i; grpc_alarm alarms[20]; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_alarm_list_init (start); memset (cb_called, 0, sizeof (cb_called)); @@ -122,7 +122,7 @@ void destruction_test (void) { grpc_alarm alarms[5]; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_alarm_list_init (gpr_time_0 (GPR_CLOCK_REALTIME)); memset (cb_called, 0, sizeof (cb_called)); diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c index 9270f0772a4..fe15b47f73d 100644 --- a/test/core/iomgr/endpoint_pair_test.c +++ b/test/core/iomgr/endpoint_pair_test.c @@ -52,7 +52,7 @@ clean_up (void) static grpc_endpoint_test_fixture create_fixture_endpoint_pair (size_t slice_size) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_test_fixture f; grpc_endpoint_pair p = grpc_iomgr_create_endpoint_pair ("test", slice_size); @@ -79,7 +79,7 @@ int main (int argc, char **argv) { grpc_closure destroyed; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init (argc, argv); grpc_init (); grpc_pollset_init (&g_pollset); diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index b1b5f71cb46..8cc27a885b3 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -199,7 +199,7 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t struct read_and_write_test_state state; gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (20); grpc_endpoint_test_fixture f = begin_test (config, "read_and_write_test", slice_size); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log (GPR_DEBUG, "num_bytes=%d write_size=%d slice_size=%d shutdown=%d", num_bytes, write_size, slice_size, shutdown); if (shutdown) diff --git a/test/core/iomgr/fd_conservation_posix_test.c b/test/core/iomgr/fd_conservation_posix_test.c index d742917dc1f..4f6b290e4d0 100644 --- a/test/core/iomgr/fd_conservation_posix_test.c +++ b/test/core/iomgr/fd_conservation_posix_test.c @@ -57,7 +57,7 @@ main (int argc, char **argv) for (i = 0; i < 100; i++) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; p = grpc_iomgr_create_endpoint_pair ("test", 1); grpc_endpoint_destroy (p.client, &closure_list); grpc_endpoint_destroy (p.server, &closure_list); diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index fac2ad4e3b8..a0b060aa253 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -281,7 +281,7 @@ server_wait_and_shutdown (server * sv) gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); while (!sv->done) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); @@ -422,7 +422,7 @@ client_wait_and_shutdown (client * cl) while (!cl->done) { grpc_pollset_worker worker; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); @@ -440,7 +440,7 @@ test_grpc_fd (void) server sv; client cl; int port; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; server_init (&sv); port = server_start (&sv, &closure_list); @@ -508,7 +508,7 @@ test_grpc_fd_change (void) ssize_t result; grpc_closure first_closure; grpc_closure second_closure; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; first_closure.cb = first_read_callback; first_closure.cb_arg = &a; @@ -587,7 +587,7 @@ int main (int argc, char **argv) { grpc_closure destroyed; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init (argc, argv); grpc_iomgr_init (); grpc_pollset_init (&g_pollset); diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index 519f8ceb954..3ddae66b706 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -95,7 +95,7 @@ test_succeeds (void) int r; int connections_complete_before; grpc_closure done; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log (GPR_DEBUG, "test_succeeds"); @@ -148,7 +148,7 @@ test_fails (void) socklen_t addr_len = sizeof (addr); int connections_complete_before; grpc_closure done; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log (GPR_DEBUG, "test_fails"); @@ -191,7 +191,7 @@ test_times_out (void) int connections_complete_before; gpr_timespec connect_deadline; grpc_closure done; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log (GPR_DEBUG, "test_times_out"); @@ -279,7 +279,7 @@ int main (int argc, char **argv) { grpc_closure destroyed; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init (argc, argv); grpc_init (); grpc_pollset_set_init (&g_pollset_set); diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index f1c4d4a353c..aa8669312b3 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -190,7 +190,7 @@ read_test (size_t num_bytes, size_t slice_size) struct read_socket_state state; size_t written_bytes; gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (20); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log (GPR_INFO, "Read test of size %d, slice size %d", num_bytes, slice_size); @@ -237,7 +237,7 @@ large_read_test (size_t slice_size) struct read_socket_state state; ssize_t written_bytes; gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (20); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log (GPR_INFO, "Start large read test, slice size %d", slice_size); @@ -327,7 +327,7 @@ drain_socket_blocking (int fd, size_t num_bytes, size_t read_size) int flags; int current = 0; int i; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + 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); @@ -375,7 +375,7 @@ write_test (size_t num_bytes, size_t slice_size) gpr_slice_buffer outgoing; grpc_closure write_done_closure; gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (20); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log (GPR_INFO, "Start write test with %d bytes, slice size %d", num_bytes, slice_size); @@ -450,7 +450,7 @@ create_fixture_tcp_socketpair (size_t slice_size) { int sv[2]; grpc_endpoint_test_fixture f; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; create_sockets (sv); f.client_ep = grpc_tcp_create (grpc_fd_create (sv[0], "fixture:client"), slice_size, "test"); @@ -477,7 +477,7 @@ int main (int argc, char **argv) { grpc_closure destroyed; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init (argc, argv); grpc_init (); grpc_pollset_init (&g_pollset); diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index 4dbb7c9063a..755158bcdf4 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -70,7 +70,7 @@ test_no_op (void) static void test_no_op_with_start (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_tcp_server *s = grpc_tcp_server_create (); LOG_TEST ("test_no_op_with_start"); grpc_tcp_server_start (s, NULL, 0, on_connect, NULL, &closure_list); @@ -81,7 +81,7 @@ test_no_op_with_start (void) static void test_no_op_with_port (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; struct sockaddr_in addr; grpc_tcp_server *s = grpc_tcp_server_create (); LOG_TEST ("test_no_op_with_port"); @@ -97,7 +97,7 @@ test_no_op_with_port (void) static void test_no_op_with_port_and_start (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; struct sockaddr_in addr; grpc_tcp_server *s = grpc_tcp_server_create (); LOG_TEST ("test_no_op_with_port_and_start"); @@ -115,7 +115,7 @@ test_no_op_with_port_and_start (void) static void test_connect (int n) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; struct sockaddr_storage addr; socklen_t addr_len = sizeof (addr); int svrfd, clifd; @@ -182,7 +182,7 @@ int main (int argc, char **argv) { grpc_closure destroyed; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init (argc, argv); grpc_iomgr_init (); grpc_pollset_init (&g_pollset); diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c index ac5c4f0d804..672c9cf55fd 100644 --- a/test/core/iomgr/udp_server_test.c +++ b/test/core/iomgr/udp_server_test.c @@ -75,7 +75,7 @@ test_no_op (void) static void test_no_op_with_start (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_udp_server *s = grpc_udp_server_create (); LOG_TEST ("test_no_op_with_start"); grpc_udp_server_start (s, NULL, 0, &closure_list); @@ -100,7 +100,7 @@ test_no_op_with_port (void) static void test_no_op_with_port_and_start (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; struct sockaddr_in addr; grpc_udp_server *s = grpc_udp_server_create (); LOG_TEST ("test_no_op_with_port_and_start"); @@ -118,7 +118,7 @@ test_no_op_with_port_and_start (void) static void test_receive (int number_of_clients) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; struct sockaddr_storage addr; socklen_t addr_len = sizeof (addr); int clifd, svrfd; @@ -184,7 +184,7 @@ int main (int argc, char **argv) { grpc_closure destroyed; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init (argc, argv); grpc_iomgr_init (); grpc_pollset_init (&g_pollset); diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c index 8497f09a527..e785ccefdf0 100644 --- a/test/core/iomgr/workqueue_test.c +++ b/test/core/iomgr/workqueue_test.c @@ -55,7 +55,7 @@ test_add_closure (void) { grpc_closure c; int done = 0; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_workqueue *wq = grpc_workqueue_create (&closure_list); gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5); grpc_pollset_worker worker; @@ -85,7 +85,7 @@ int main (int argc, char **argv) { grpc_closure destroyed; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init (argc, argv); grpc_init (); grpc_pollset_init (&g_pollset); diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index 5e5b69f16cf..2a50935c97a 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -303,7 +303,7 @@ check_google_iam_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_crede static void test_google_iam_creds (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials *creds = grpc_google_iam_credentials_create (test_google_iam_authorization_token, test_google_iam_authority_selector, NULL); GPR_ASSERT (grpc_credentials_has_request_metadata (creds)); @@ -326,7 +326,7 @@ check_access_token_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_cre static void test_access_token_creds (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials *creds = grpc_access_token_credentials_create ("blah", NULL); GPR_ASSERT (grpc_credentials_has_request_metadata (creds)); GPR_ASSERT (grpc_credentials_has_request_metadata_only (creds)); @@ -351,7 +351,7 @@ check_ssl_oauth2_composite_metadata (grpc_exec_ctx * exec_ctx, void *user_data, static void test_ssl_oauth2_composite_creds (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials *ssl_creds = grpc_ssl_credentials_create (test_root_cert, NULL, NULL); const grpc_credentials_array *creds_array; grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create ("Authorization", test_oauth2_bearer_token, 0); @@ -401,7 +401,7 @@ check_ssl_oauth2_google_iam_composite_metadata (grpc_exec_ctx * exec_ctx, void * static void test_ssl_oauth2_google_iam_composite_creds (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials *ssl_creds = grpc_ssl_credentials_create (test_root_cert, NULL, NULL); const grpc_credentials_array *creds_array; grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create ("Authorization", test_oauth2_bearer_token, 0); @@ -491,7 +491,7 @@ httpcli_get_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_r static void test_compute_engine_creds_success (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials *compute_engine_creds = grpc_google_compute_engine_credentials_create (NULL); GPR_ASSERT (grpc_credentials_has_request_metadata (compute_engine_creds)); GPR_ASSERT (grpc_credentials_has_request_metadata_only (compute_engine_creds)); @@ -513,7 +513,7 @@ test_compute_engine_creds_success (void) static void test_compute_engine_creds_failure (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials *compute_engine_creds = grpc_google_compute_engine_credentials_create (NULL); grpc_httpcli_set_override (compute_engine_httpcli_get_failure_override, httpcli_post_should_not_be_called); GPR_ASSERT (grpc_credentials_has_request_metadata (compute_engine_creds)); @@ -564,7 +564,7 @@ refresh_token_httpcli_post_failure (grpc_exec_ctx * exec_ctx, const grpc_httpcli static void test_refresh_token_creds_success (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials *refresh_token_creds = grpc_google_refresh_token_credentials_create (test_refresh_token_str, NULL); GPR_ASSERT (grpc_credentials_has_request_metadata (refresh_token_creds)); @@ -588,7 +588,7 @@ test_refresh_token_creds_success (void) static void test_refresh_token_creds_failure (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials *refresh_token_creds = grpc_google_refresh_token_credentials_create (test_refresh_token_str, NULL); grpc_httpcli_set_override (httpcli_get_should_not_be_called, refresh_token_httpcli_post_failure); @@ -662,7 +662,7 @@ static void test_jwt_creds_success (void) { char *json_key_string = test_json_key_str (); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials *jwt_creds = grpc_service_account_jwt_access_credentials_create (json_key_string, grpc_max_auth_token_lifetime, NULL); GPR_ASSERT (grpc_credentials_has_request_metadata (jwt_creds)); GPR_ASSERT (grpc_credentials_has_request_metadata_only (jwt_creds)); @@ -692,7 +692,7 @@ static void test_jwt_creds_signing_failure (void) { char *json_key_string = test_json_key_str (); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials *jwt_creds = grpc_service_account_jwt_access_credentials_create (json_key_string, grpc_max_auth_token_lifetime, NULL); GPR_ASSERT (grpc_credentials_has_request_metadata (jwt_creds)); GPR_ASSERT (grpc_credentials_has_request_metadata_only (jwt_creds)); @@ -846,7 +846,7 @@ test_metadata_plugin_success (void) grpc_credentials *creds; plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; plugin.state = &state; plugin.get_metadata = plugin_get_metadata_success; @@ -867,7 +867,7 @@ test_metadata_plugin_failure (void) grpc_credentials *creds; plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; plugin.state = &state; plugin.get_metadata = plugin_get_metadata_failure; diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c index 2883cf858b1..94fa78d2b3b 100644 --- a/test/core/security/jwt_verifier_test.c +++ b/test/core/security/jwt_verifier_test.c @@ -221,7 +221,7 @@ on_verification_success (void *user_data, grpc_jwt_verifier_status status, grpc_ static void test_jwt_verifier_google_email_issuer_success (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx 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); @@ -254,7 +254,7 @@ httpcli_get_custom_keys_for_email (grpc_exec_ctx * exec_ctx, const grpc_httpcli_ static void test_jwt_verifier_custom_email_issuer_success (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx 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); @@ -300,7 +300,7 @@ httpcli_get_openid_config (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request static void test_jwt_verifier_url_issuer_success (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx 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); @@ -339,7 +339,7 @@ httpcli_get_bad_json (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * req static void test_jwt_verifier_url_issuer_bad_config (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx 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); @@ -360,7 +360,7 @@ test_jwt_verifier_url_issuer_bad_config (void) static void test_jwt_verifier_bad_json_key (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx 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); @@ -407,7 +407,7 @@ on_verification_bad_signature (void *user_data, grpc_jwt_verifier_status status, static void test_jwt_verifier_bad_signature (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx 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); @@ -444,7 +444,7 @@ on_verification_bad_format (void *user_data, grpc_jwt_verifier_status status, gr static void test_jwt_verifier_bad_format (void) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx 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 (verifier, NULL, "bad jwt", expected_audience, on_verification_bad_format, (void *) expected_user_data, &closure_list); diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index f096fa9ca8c..3b8f3a2b85f 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -85,7 +85,7 @@ char * grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds) { oauth2_request request; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure do_nothing_closure; grpc_pollset_init (&request.pollset); request.is_done = 0; diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c index 51a0968a205..143359fea4a 100644 --- a/test/core/security/print_google_default_creds_token.c +++ b/test/core/security/print_google_default_creds_token.c @@ -76,7 +76,7 @@ int main (int argc, char **argv) { int result = 0; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; synchronizer sync; grpc_credentials *creds = NULL; char *service_url = "https://test.foo.google.com/Foo"; diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index bd760320cc5..581f671ee94 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -50,7 +50,7 @@ static grpc_pollset g_pollset; static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair (size_t slice_size, gpr_slice * leftover_slices, size_t leftover_nslices) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; tsi_frame_protector *fake_read_protector = tsi_create_fake_protector (NULL); tsi_frame_protector *fake_write_protector = tsi_create_fake_protector (NULL); grpc_endpoint_test_fixture f; @@ -154,7 +154,7 @@ test_leftover (grpc_endpoint_test_config config, size_t slice_size) grpc_endpoint_test_fixture f = config.create_fixture (slice_size); gpr_slice_buffer incoming; gpr_slice s = gpr_slice_from_copied_string ("hello world 12345678900987654321"); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; int n = 0; grpc_closure done_closure; gpr_log (GPR_INFO, "Start test left over"); @@ -188,7 +188,7 @@ int main (int argc, char **argv) { grpc_closure destroyed; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init (argc, argv); grpc_init (); diff --git a/test/core/security/verify_jwt.c b/test/core/security/verify_jwt.c index d7d261299e9..8b35c712cc4 100644 --- a/test/core/security/verify_jwt.c +++ b/test/core/security/verify_jwt.c @@ -95,7 +95,7 @@ main (int argc, char **argv) gpr_cmdline *cl; char *jwt = NULL; char *aud = NULL; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; cl = gpr_cmdline_create ("JWT verifier tool"); gpr_cmdline_add_string (cl, "jwt", "JSON web token to verify", &jwt); diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index fa959402f00..d044abb4673 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -94,7 +94,7 @@ test_cq_end_op (void) grpc_event ev; grpc_completion_queue *cc; grpc_cq_completion completion; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; void *tag = create_test_tag (); LOG_TEST ("test_cq_end_op"); @@ -148,7 +148,7 @@ test_pluck (void) grpc_completion_queue *cc; void *tags[128]; grpc_cq_completion completions[GPR_ARRAY_SIZE (tags)]; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; unsigned i, j; LOG_TEST ("test_pluck"); @@ -223,7 +223,7 @@ producer_thread (void *arg) { test_thread_options *opt = arg; int i; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + 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 *) (gpr_intptr) 1); diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index 8403d4a1317..a598ea818b1 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -101,7 +101,7 @@ free_port_using_server (char *server, int port) grpc_httpcli_request req; freereq pr; char *path; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure shutdown_closure; grpc_init (); @@ -270,7 +270,7 @@ pick_port_using_server (char *server) grpc_httpcli_context context; grpc_httpcli_request req; portreq pr; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure shutdown_closure; grpc_init (); diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index d5ebb8dac39..4a1f589b827 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -130,7 +130,7 @@ reconnect_server_start (reconnect_server * server, int port) { struct sockaddr_in addr; int port_added; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; addr.sin_family = AF_INET; addr.sin_port = htons ((gpr_uint16) port); @@ -152,7 +152,7 @@ reconnect_server_poll (reconnect_server * server, int seconds) grpc_pollset_worker worker; gpr_timespec deadline = gpr_time_add (gpr_now (GPR_CLOCK_MONOTONIC), gpr_time_from_seconds (seconds, GPR_TIMESPAN)); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock (GRPC_POLLSET_MU (&server->pollset)); grpc_pollset_work (&server->pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&server->pollset)); @@ -182,7 +182,7 @@ do_nothing (grpc_exec_ctx * exec_ctx, void *ignored, int success) void reconnect_server_destroy (reconnect_server * server) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure do_nothing_closure[2]; grpc_closure_init (&do_nothing_closure[0], do_nothing, NULL); grpc_closure_init (&do_nothing_closure[1], do_nothing, NULL); From e7db29f8c74da29d88c1f373ae52a27982eb2c87 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 10:55:42 -0700 Subject: [PATCH 33/56] Move argument passing to start of list --- src/core/iomgr/iomgr.c | 2 +- src/core/iomgr/resolve_address_posix.c | 2 +- src/core/security/credentials.c | 6 ++-- .../security/google_default_credentials.c | 6 ++-- src/core/security/server_auth_filter.c | 4 +-- src/core/security/server_secure_chttp2.c | 4 +-- src/core/surface/call.c | 20 ++++++------ src/core/surface/channel.c | 4 +-- src/core/surface/channel_connectivity.c | 8 ++--- src/core/surface/channel_create.c | 8 ++--- src/core/surface/completion_queue.c | 10 +++--- src/core/surface/lame_client.c | 2 +- src/core/surface/secure_channel_create.c | 8 ++--- src/core/surface/server.c | 20 ++++++------ src/core/surface/server_chttp2.c | 2 +- test/core/bad_client/bad_client.c | 20 ++++++------ test/core/channel/channel_stack_test.c | 8 ++--- test/core/client_config/lb_policies_test.c | 2 +- .../core/end2end/fixtures/h2_sockpair+trace.c | 12 +++---- test/core/end2end/fixtures/h2_sockpair.c | 12 +++---- .../core/end2end/fixtures/h2_sockpair_1byte.c | 12 +++---- test/core/httpcli/httpcli_test.c | 10 +++--- test/core/iomgr/alarm_list_test.c | 28 ++++++++-------- test/core/iomgr/endpoint_pair_test.c | 6 ++-- test/core/iomgr/endpoint_tests.c | 14 ++++---- test/core/iomgr/fd_conservation_posix_test.c | 4 +-- test/core/iomgr/fd_posix_test.c | 22 ++++++------- test/core/iomgr/tcp_client_posix_test.c | 16 +++++----- test/core/iomgr/tcp_posix_test.c | 32 +++++++++---------- test/core/iomgr/tcp_server_posix_test.c | 16 +++++----- test/core/iomgr/udp_server_test.c | 12 +++---- test/core/iomgr/workqueue_test.c | 8 ++--- test/core/security/credentials_test.c | 32 +++++++++---------- test/core/security/jwt_verifier_test.c | 14 ++++---- test/core/security/oauth2_utils.c | 6 ++-- .../print_google_default_creds_token.c | 4 +-- test/core/security/secure_endpoint_test.c | 16 +++++----- test/core/security/verify_jwt.c | 4 +-- test/core/surface/completion_queue_test.c | 8 ++--- test/core/util/port_posix.c | 12 +++---- test/core/util/reconnect_server.c | 8 ++--- 41 files changed, 222 insertions(+), 222 deletions(-) diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index 06413eed686..6a0f6c49378 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -113,7 +113,7 @@ grpc_iomgr_shutdown (void) } last_warning_time = gpr_now (GPR_CLOCK_REALTIME); } - if (grpc_alarm_check (gpr_inf_future (GPR_CLOCK_MONOTONIC), NULL, &closure_list)) + if (grpc_alarm_check (gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC), NULL)) { gpr_mu_unlock (&g_mu); grpc_exec_ctx_finish (&exec_ctx); diff --git a/src/core/iomgr/resolve_address_posix.c b/src/core/iomgr/resolve_address_posix.c index 9d269d364a6..1017a788ff3 100644 --- a/src/core/iomgr/resolve_address_posix.c +++ b/src/core/iomgr/resolve_address_posix.c @@ -166,7 +166,7 @@ do_request_thread (void *rp) grpc_resolve_cb cb = r->cb; gpr_free (r->name); gpr_free (r->default_port); - cb (arg, resolved, &closure_list); + cb (&exec_ctx, arg, resolved); grpc_iomgr_unregister_object (&r->iomgr_object); gpr_free (r); grpc_exec_ctx_finish (&exec_ctx); diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index 0b76ba563a6..47dfcf29c89 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -810,7 +810,7 @@ on_simulated_token_fetch_done (void *user_data) grpc_credentials_metadata_request *r = (grpc_credentials_metadata_request *) user_data; grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *) r->creds; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - r->cb (r->user_data, c->md_store->entries, c->md_store->num_entries, GRPC_CREDENTIALS_OK, &closure_list); + r->cb (&exec_ctx, r->user_data, c->md_store->entries, c->md_store->num_entries, GRPC_CREDENTIALS_OK); grpc_credentials_metadata_request_destroy (r); grpc_exec_ctx_finish (&exec_ctx); } @@ -1330,7 +1330,7 @@ plugin_md_request_metadata_ready (void *request, const grpc_metadata * md, size_ { gpr_log (GPR_ERROR, "Getting metadata from plugin failed with error: %s", error_details); } - r->cb (r->user_data, NULL, 0, GRPC_CREDENTIALS_ERROR, &closure_list); + r->cb (&exec_ctx, r->user_data, NULL, 0, GRPC_CREDENTIALS_ERROR); } else { @@ -1345,7 +1345,7 @@ plugin_md_request_metadata_ready (void *request, const grpc_metadata * md, size_ md_array[i].value = gpr_slice_from_copied_buffer (md[i].value, md[i].value_length); } } - r->cb (r->user_data, md_array, num_md, GRPC_CREDENTIALS_OK, &closure_list); + r->cb (&exec_ctx, r->user_data, md_array, num_md, GRPC_CREDENTIALS_OK); if (md_array != NULL) { for (i = 0; i < num_md; i++) diff --git a/src/core/security/google_default_credentials.c b/src/core/security/google_default_credentials.c index afa4b9971ce..eb88a4bfc1b 100644 --- a/src/core/security/google_default_credentials.c +++ b/src/core/security/google_default_credentials.c @@ -121,7 +121,7 @@ is_stack_running_on_compute_engine (void) grpc_httpcli_context_init (&context); - grpc_httpcli_get (&context, &detector.pollset, &request, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), max_detection_delay), on_compute_engine_detection_http_response, &detector, &closure_list); + grpc_httpcli_get (&context, &detector.pollset, &request, gpr_time_add (gpr_now (&exec_ctx, GPR_CLOCK_REALTIME), max_detection_delay), on_compute_engine_detection_http_response, &detector); grpc_exec_ctx_finish (&exec_ctx); @@ -131,13 +131,13 @@ is_stack_running_on_compute_engine (void) while (!detector.is_done) { grpc_pollset_worker worker; - grpc_pollset_work (&detector.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + grpc_pollset_work (&detector.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); } gpr_mu_unlock (GRPC_POLLSET_MU (&detector.pollset)); grpc_httpcli_context_destroy (&context); grpc_closure_init (&destroy_closure, destroy_pollset, &detector.pollset); - grpc_pollset_shutdown (&detector.pollset, &destroy_closure, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &detector.pollset, &destroy_closure); grpc_exec_ctx_finish (&exec_ctx); return detector.success; diff --git a/src/core/security/server_auth_filter.c b/src/core/security/server_auth_filter.c index a1516abb418..68f64c4d7ed 100644 --- a/src/core/security/server_auth_filter.c +++ b/src/core/security/server_auth_filter.c @@ -134,7 +134,7 @@ on_md_processing_done (void *user_data, const grpc_metadata * consumed_md, size_ calld->num_consumed_md = num_consumed_md; grpc_metadata_batch_filter (&calld->md_op->data.metadata, remove_consumed_md, elem); grpc_metadata_array_destroy (&calld->md); - calld->on_done_recv->cb (calld->on_done_recv->cb_arg, 1, &closure_list); + calld->on_done_recv->cb (&exec_ctx, calld->on_done_recv->cb_arg, 1); } else { @@ -144,7 +144,7 @@ on_md_processing_done (void *user_data, const grpc_metadata * consumed_md, size_ message = gpr_slice_from_copied_string (error_details); grpc_sopb_reset (calld->recv_ops); grpc_transport_stream_op_add_close (&calld->transport_op, status, &message); - grpc_call_next_op (elem, &calld->transport_op, &closure_list); + grpc_call_next_op (&exec_ctx, elem, &calld->transport_op); } grpc_exec_ctx_finish (&exec_ctx); diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index 7ca7beaf52b..98d9e2a8760 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -300,7 +300,7 @@ grpc_server_add_secure_http2_port (grpc_server * server, const char *addr, grpc_ gpr_ref_init (&state->refcount, 1); /* Register with the server only upon success */ - grpc_server_add_listener (server, state, start, destroy, &closure_list); + grpc_server_add_listener (&exec_ctx, server, state, start, destroy); grpc_exec_ctx_finish (&exec_ctx); return port_num; @@ -317,7 +317,7 @@ error: } if (tcp) { - grpc_tcp_server_destroy (tcp, NULL, &closure_list); + grpc_tcp_server_destroy (&exec_ctx, tcp, NULL); } if (state) { diff --git a/src/core/surface/call.c b/src/core/surface/call.c index 38bcc750b9c..6da5272ddcd 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -355,7 +355,7 @@ grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 pr GRPC_CALL_INTERNAL_REF (call, "receiving"); initial_op_ptr = &initial_op; } - grpc_call_stack_init (channel_stack, server_transport_data, initial_op_ptr, CALL_STACK_FROM_CALL (call), &closure_list); + grpc_call_stack_init (channel_stack, server_transport_data, initial_op_ptr, CALL_STACK_FROM_CALL (&exec_ctx, call)); if (parent_call != NULL) { GRPC_CALL_INTERNAL_REF (parent_call, "child"); @@ -402,7 +402,7 @@ grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 pr } if (gpr_time_cmp (send_deadline, gpr_inf_future (send_deadline.clock_type)) != 0) { - set_deadline_alarm (call, send_deadline, &closure_list); + set_deadline_alarm (&exec_ctx, call, send_deadline); } grpc_exec_ctx_finish (&exec_ctx); return call; @@ -1411,7 +1411,7 @@ grpc_call_destroy (grpc_call * c) c->sibling_next->sibling_prev = c->sibling_prev; } gpr_mu_unlock (&parent->mu); - GRPC_CALL_INTERNAL_UNREF (parent, "child", &closure_list); + GRPC_CALL_INTERNAL_UNREF (&exec_ctx, parent, "child"); } lock (c); @@ -1419,13 +1419,13 @@ grpc_call_destroy (grpc_call * c) c->destroy_called = 1; if (c->have_alarm) { - grpc_alarm_cancel (&c->alarm, &closure_list); + grpc_alarm_cancel (&exec_ctx, &c->alarm); } cancel = c->read_state != READ_STATE_STREAM_CLOSED; - unlock (c, &closure_list); + unlock (&exec_ctx, c); if (cancel) grpc_call_cancel (c, NULL); - GRPC_CALL_INTERNAL_UNREF (c, "destroy", &closure_list); + GRPC_CALL_INTERNAL_UNREF (&exec_ctx, c, "destroy"); grpc_exec_ctx_finish (&exec_ctx); } @@ -1444,7 +1444,7 @@ grpc_call_cancel_with_status (grpc_call * c, grpc_status_code status, const char GPR_ASSERT (reserved == NULL); lock (c); r = cancel_with_status (c, status, description); - unlock (c, &closure_list); + unlock (&exec_ctx, c); grpc_exec_ctx_finish (&exec_ctx); return r; } @@ -1516,7 +1516,7 @@ grpc_call_get_peer (grpc_call * call) { grpc_call_element *elem = CALL_ELEM_FROM_CALL (call, 0); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - char *result = elem->filter->get_peer (elem, &closure_list); + char *result = elem->filter->get_peer (&exec_ctx, elem); grpc_exec_ctx_finish (&exec_ctx); return result; } @@ -1756,7 +1756,7 @@ grpc_call_start_batch (grpc_call * call, const grpc_op * ops, size_t nops, void { grpc_cq_begin_op (call->cq); GRPC_CALL_INTERNAL_REF (call, "completion"); - grpc_cq_end_op (call->cq, tag, 1, done_completion, call, allocate_completion (call), &closure_list); + grpc_cq_end_op (call->cq, tag, 1, done_completion, call, allocate_completion (&exec_ctx, call)); error = GRPC_CALL_OK; goto done; } @@ -1992,7 +1992,7 @@ grpc_call_start_batch (grpc_call * call, const grpc_op * ops, size_t nops, void GRPC_CALL_INTERNAL_REF (call, "completion"); grpc_cq_begin_op (call->cq); - error = grpc_call_start_ioreq_and_call_back (call, reqs, out, finish_func, tag, &closure_list); + error = grpc_call_start_ioreq_and_call_back (&exec_ctx, call, reqs, out, finish_func, tag); done: grpc_exec_ctx_finish (&exec_ctx); return error; diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index 1896555eba1..a6478c39791 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -322,9 +322,9 @@ grpc_channel_destroy (grpc_channel * channel) memset (&op, 0, sizeof (op)); op.disconnect = 1; elem = grpc_channel_stack_element (CHANNEL_STACK_FROM_CHANNEL (channel), 0); - elem->filter->start_transport_op (elem, &op, &closure_list); + elem->filter->start_transport_op (&exec_ctx, elem, &op); - GRPC_CHANNEL_INTERNAL_UNREF (channel, "channel", &closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (&exec_ctx, channel, "channel"); grpc_exec_ctx_finish (&exec_ctx); } diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index 30017b3b9f8..f9195a4ccb6 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -52,7 +52,7 @@ grpc_channel_check_connectivity_state (grpc_channel * channel, int try_to_connec 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); return GRPC_CHANNEL_FATAL_FAILURE; } - state = grpc_client_channel_check_connectivity_state (client_channel_elem, try_to_connect, &closure_list); + state = grpc_client_channel_check_connectivity_state (&exec_ctx, client_channel_elem, try_to_connect); grpc_exec_ctx_finish (&exec_ctx); return state; } @@ -195,7 +195,7 @@ grpc_channel_watch_connectivity_state (grpc_channel * channel, grpc_connectivity w->tag = tag; w->channel = channel; - grpc_alarm_init (&w->alarm, gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC), timeout_complete, w, gpr_now (GPR_CLOCK_MONOTONIC), &closure_list); + grpc_alarm_init (&w->alarm, gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC), timeout_complete, w, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC)); if (client_channel_elem->filter != &grpc_client_channel_filter) { @@ -205,8 +205,8 @@ grpc_channel_watch_connectivity_state (grpc_channel * channel, grpc_connectivity else { GRPC_CHANNEL_INTERNAL_REF (channel, "watch_connectivity"); - grpc_client_channel_add_interested_party (client_channel_elem, grpc_cq_pollset (cq), &closure_list); - grpc_client_channel_watch_connectivity_state (client_channel_elem, &w->state, &w->on_complete, &closure_list); + grpc_client_channel_add_interested_party (client_channel_elem, grpc_cq_pollset (&exec_ctx, cq)); + grpc_client_channel_watch_connectivity_state (&exec_ctx, client_channel_elem, &w->state, &w->on_complete); } grpc_exec_ctx_finish (&exec_ctx); diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index 10c57ae9ad7..afd5c4d0840 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -208,7 +208,7 @@ grpc_insecure_channel_create (const char *target, const grpc_channel_args * args filters[n++] = &grpc_client_channel_filter; GPR_ASSERT (n <= MAX_FILTERS); - channel = grpc_channel_create_from_filters (target, filters, n, args, mdctx, 1, &closure_list); + channel = grpc_channel_create_from_filters (&exec_ctx, target, filters, n, args, mdctx, 1); f = gpr_malloc (sizeof (*f)); f->base.vtable = &subchannel_factory_vtable; @@ -224,9 +224,9 @@ grpc_insecure_channel_create (const char *target, const grpc_channel_args * args return NULL; } - grpc_client_channel_set_resolver (grpc_channel_get_channel_stack (channel), resolver, &closure_list); - GRPC_RESOLVER_UNREF (resolver, "create", &closure_list); - grpc_subchannel_factory_unref (&f->base, &closure_list); + grpc_client_channel_set_resolver (grpc_channel_get_channel_stack (&exec_ctx, channel), resolver); + GRPC_RESOLVER_UNREF (&exec_ctx, resolver, "create"); + grpc_subchannel_factory_unref (&exec_ctx, &f->base); grpc_exec_ctx_finish (&exec_ctx); diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index ff1c20e9f08..8867a2deb5a 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -214,7 +214,7 @@ grpc_completion_queue_next (grpc_completion_queue * cc, gpr_timespec deadline, v ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done (c->done_arg, c, &closure_list); + c->done (&exec_ctx, c->done_arg, c); break; } if (cc->shutdown) @@ -233,7 +233,7 @@ grpc_completion_queue_next (grpc_completion_queue * cc, gpr_timespec deadline, v break; } first_loop = 0; - grpc_pollset_work (&cc->pollset, &worker, now, deadline, &closure_list); + grpc_pollset_work (&exec_ctx, &cc->pollset, &worker, now, deadline); } GRPC_SURFACE_TRACE_RETURNED_EVENT (cc, &ret); GRPC_CQ_INTERNAL_UNREF (cc, "next"); @@ -304,7 +304,7 @@ grpc_completion_queue_pluck (grpc_completion_queue * cc, void *tag, gpr_timespec ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done (c->done_arg, c, &closure_list); + c->done (&exec_ctx, c->done_arg, c); goto done; } prev = c; @@ -335,7 +335,7 @@ grpc_completion_queue_pluck (grpc_completion_queue * cc, void *tag, gpr_timespec break; } first_loop = 0; - grpc_pollset_work (&cc->pollset, &worker, now, deadline, &closure_list); + grpc_pollset_work (&exec_ctx, &cc->pollset, &worker, now, deadline); del_plucker (cc, tag, &worker); } done: @@ -366,7 +366,7 @@ grpc_completion_queue_shutdown (grpc_completion_queue * cc) GPR_ASSERT (!cc->shutdown); cc->shutdown = 1; gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); - grpc_pollset_shutdown (&cc->pollset, &cc->pollset_destroy_done, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &cc->pollset, &cc->pollset_destroy_done); } grpc_exec_ctx_finish (&exec_ctx); } diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c index 26c53410f3f..40a4e078918 100644 --- a/src/core/surface/lame_client.c +++ b/src/core/surface/lame_client.c @@ -165,7 +165,7 @@ grpc_lame_client_channel_create (const char *target, grpc_status_code error_code channel_data *chand; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; static const grpc_channel_filter *filters[] = { &lame_filter }; - channel = grpc_channel_create_from_filters (target, filters, 1, NULL, grpc_mdctx_create (), 1, &closure_list); + channel = grpc_channel_create_from_filters (target, filters, 1, NULL, grpc_mdctx_create (&exec_ctx, ), 1); elem = grpc_channel_stack_element (grpc_channel_get_channel_stack (channel), 0); GPR_ASSERT (elem->filter == &lame_filter); chand = (channel_data *) elem->channel_data; diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 96ddfd80356..d793e32e0de 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -284,7 +284,7 @@ grpc_secure_channel_create (grpc_credentials * creds, const char *target, const filters[n++] = &grpc_client_channel_filter; GPR_ASSERT (n <= MAX_FILTERS); - channel = grpc_channel_create_from_filters (target, filters, n, args_copy, mdctx, 1, &closure_list); + channel = grpc_channel_create_from_filters (&exec_ctx, target, filters, n, args_copy, mdctx, 1); f = gpr_malloc (sizeof (*f)); f->base.vtable = &subchannel_factory_vtable; @@ -302,9 +302,9 @@ grpc_secure_channel_create (grpc_credentials * creds, const char *target, const return NULL; } - grpc_client_channel_set_resolver (grpc_channel_get_channel_stack (channel), resolver, &closure_list); - GRPC_RESOLVER_UNREF (resolver, "create", &closure_list); - grpc_subchannel_factory_unref (&f->base, &closure_list); + grpc_client_channel_set_resolver (grpc_channel_get_channel_stack (&exec_ctx, channel), resolver); + GRPC_RESOLVER_UNREF (&exec_ctx, resolver, "create"); + grpc_subchannel_factory_unref (&exec_ctx, &f->base); GRPC_SECURITY_CONNECTOR_UNREF (&connector->base, "channel_create"); grpc_channel_args_destroy (args_copy); diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 83fe3a7686d..98bfe71c157 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -991,7 +991,7 @@ grpc_server_start (grpc_server * server) for (l = server->listeners; l; l = l->next) { - l->start (server, l->arg, server->pollsets, server->cq_count, &closure_list); + l->start (&exec_ctx, server, l->arg, server->pollsets, server->cq_count); } grpc_exec_ctx_finish (&exec_ctx); @@ -1124,7 +1124,7 @@ grpc_server_shutdown_and_notify (grpc_server * server, grpc_completion_queue * c grpc_cq_begin_op (cq); if (server->shutdown_published) { - grpc_cq_end_op (cq, tag, 1, done_published_shutdown, NULL, gpr_malloc (sizeof (grpc_cq_completion)), &closure_list); + grpc_cq_end_op (cq, tag, 1, done_published_shutdown, NULL, gpr_malloc (sizeof (&exec_ctx, grpc_cq_completion))); gpr_mu_unlock (&server->mu_global); goto done; } @@ -1144,21 +1144,21 @@ grpc_server_shutdown_and_notify (grpc_server * server, grpc_completion_queue * c /* collect all unregistered then registered calls */ gpr_mu_lock (&server->mu_call); - kill_pending_work_locked (server, &closure_list); + kill_pending_work_locked (&exec_ctx, server); gpr_mu_unlock (&server->mu_call); gpr_atm_rel_store (&server->shutdown_flag, 1); - maybe_finish_shutdown (server, &closure_list); + 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); - l->destroy (server, l->arg, &l->destroy_done, &closure_list); + l->destroy (&exec_ctx, server, l->arg, &l->destroy_done); } - channel_broadcaster_shutdown (&broadcaster, 1, 0, &closure_list); + channel_broadcaster_shutdown (&exec_ctx, &broadcaster, 1, 0); done: grpc_exec_ctx_finish (&exec_ctx); @@ -1174,7 +1174,7 @@ grpc_server_cancel_all_calls (grpc_server * server) channel_broadcaster_init (server, &broadcaster); gpr_mu_unlock (&server->mu_global); - channel_broadcaster_shutdown (&broadcaster, 0, 1, &closure_list); + channel_broadcaster_shutdown (&exec_ctx, &broadcaster, 0, 1); grpc_exec_ctx_finish (&exec_ctx); } @@ -1197,7 +1197,7 @@ grpc_server_destroy (grpc_server * server) gpr_mu_unlock (&server->mu_global); - server_unref (server, &closure_list); + server_unref (&exec_ctx, server); grpc_exec_ctx_finish (&exec_ctx); } @@ -1297,7 +1297,7 @@ grpc_server_request_call (grpc_server * server, grpc_call ** call, grpc_call_det rc->call = call; rc->data.batch.details = details; rc->data.batch.initial_metadata = initial_metadata; - error = queue_call_request (server, rc, &closure_list); + error = queue_call_request (&exec_ctx, server, rc); done: grpc_exec_ctx_finish (&exec_ctx); return error; @@ -1327,7 +1327,7 @@ grpc_server_request_registered_call (grpc_server * server, void *rm, grpc_call * rc->data.registered.deadline = deadline; rc->data.registered.initial_metadata = initial_metadata; rc->data.registered.optional_payload = optional_payload; - error = queue_call_request (server, rc, &closure_list); + error = queue_call_request (&exec_ctx, server, rc); done: grpc_exec_ctx_finish (&exec_ctx); return error; diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c index 23b36b5f37d..1f000f450a4 100644 --- a/src/core/surface/server_chttp2.c +++ b/src/core/surface/server_chttp2.c @@ -135,7 +135,7 @@ grpc_server_add_insecure_http2_port (grpc_server * server, const char *addr) grpc_resolved_addresses_destroy (resolved); /* Register with the server only upon success */ - grpc_server_add_listener (server, tcp, start, destroy, &closure_list); + grpc_server_add_listener (&exec_ctx, server, tcp, start, destroy); goto done; /* Error path: cleanup and return */ diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index 08e6939a576..b1a3fe5c944 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -77,7 +77,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx &grpc_http_server_filter }; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport (a->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (a->server), &closure_list); + grpc_server_setup_transport (a->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (&exec_ctx, a->server)); grpc_exec_ctx_finish (&exec_ctx); } @@ -116,14 +116,14 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const a.validator = validator; grpc_server_register_completion_queue (a.server, a.cq, NULL); grpc_server_start (a.server); - transport = grpc_create_chttp2_transport (NULL, sfd.server, mdctx, 0, &closure_list); + transport = grpc_create_chttp2_transport (&exec_ctx, NULL, sfd.server, mdctx, 0); server_setup_transport (&a, transport, mdctx); - grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); + grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0); grpc_exec_ctx_finish (&exec_ctx); /* Bind everything into the same pollset */ - grpc_endpoint_add_to_pollset (sfd.client, grpc_cq_pollset (a.cq), &closure_list); - grpc_endpoint_add_to_pollset (sfd.server, grpc_cq_pollset (a.cq), &closure_list); + grpc_endpoint_add_to_pollset (sfd.client, grpc_cq_pollset (&exec_ctx, a.cq)); + grpc_endpoint_add_to_pollset (sfd.server, grpc_cq_pollset (&exec_ctx, a.cq)); /* Check a ground truth */ GPR_ASSERT (grpc_server_has_open_connections (a.server)); @@ -136,7 +136,7 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const grpc_closure_init (&done_write_closure, done_write, &a); /* Write data */ - grpc_endpoint_write (sfd.client, &outgoing, &done_write_closure, &closure_list); + grpc_endpoint_write (&exec_ctx, sfd.client, &outgoing, &done_write_closure); grpc_exec_ctx_finish (&exec_ctx); /* Await completion */ @@ -144,8 +144,8 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const if (flags & GRPC_BAD_CLIENT_DISCONNECT) { - grpc_endpoint_shutdown (sfd.client, &closure_list); - grpc_endpoint_destroy (sfd.client, &closure_list); + grpc_endpoint_shutdown (&exec_ctx, sfd.client); + grpc_endpoint_destroy (&exec_ctx, sfd.client); grpc_exec_ctx_finish (&exec_ctx); sfd.client = NULL; } @@ -155,8 +155,8 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const /* Shutdown */ if (sfd.client) { - grpc_endpoint_shutdown (sfd.client, &closure_list); - grpc_endpoint_destroy (sfd.client, &closure_list); + grpc_endpoint_shutdown (&exec_ctx, sfd.client); + grpc_endpoint_destroy (&exec_ctx, sfd.client); grpc_exec_ctx_finish (&exec_ctx); } grpc_server_shutdown_and_notify (a.server, a.cq, NULL); diff --git a/test/core/channel/channel_stack_test.c b/test/core/channel/channel_stack_test.c index 2bdb456d123..24d5093b604 100644 --- a/test/core/channel/channel_stack_test.c +++ b/test/core/channel/channel_stack_test.c @@ -120,14 +120,14 @@ test_create_channel_stack (void) chan_args.args = &arg; channel_stack = gpr_malloc (grpc_channel_stack_size (&filters, 1)); - grpc_channel_stack_init (&filters, 1, NULL, &chan_args, metadata_context, channel_stack, &closure_list); + grpc_channel_stack_init (&exec_ctx, &filters, 1, NULL, &chan_args, metadata_context, channel_stack); GPR_ASSERT (channel_stack->count == 1); channel_elem = grpc_channel_stack_element (channel_stack, 0); channel_data = (int *) channel_elem->channel_data; GPR_ASSERT (*channel_data == 0); call_stack = gpr_malloc (channel_stack->call_stack_size); - grpc_call_stack_init (channel_stack, NULL, NULL, call_stack, &closure_list); + grpc_call_stack_init (&exec_ctx, channel_stack, NULL, NULL, call_stack); GPR_ASSERT (call_stack->count == 1); call_elem = grpc_call_stack_element (call_stack, 0); GPR_ASSERT (call_elem->filter == channel_elem->filter); @@ -136,11 +136,11 @@ test_create_channel_stack (void) GPR_ASSERT (*call_data == 0); GPR_ASSERT (*channel_data == 1); - grpc_call_stack_destroy (call_stack, &closure_list); + grpc_call_stack_destroy (&exec_ctx, call_stack); gpr_free (call_stack); GPR_ASSERT (*channel_data == 2); - grpc_channel_stack_destroy (channel_stack, &closure_list); + grpc_channel_stack_destroy (&exec_ctx, channel_stack); gpr_free (channel_stack); grpc_mdctx_unref (metadata_context); diff --git a/test/core/client_config/lb_policies_test.c b/test/core/client_config/lb_policies_test.c index 826e5576cce..f5e9626d95f 100644 --- a/test/core/client_config/lb_policies_test.c +++ b/test/core/client_config/lb_policies_test.c @@ -422,7 +422,7 @@ assert_channel_connectivity (grpc_channel * ch, size_t num_accepted_conn_states, client_stack = grpc_channel_get_channel_stack (ch); client_channel_filter = grpc_channel_stack_last_element (client_stack); - actual_conn_state = grpc_client_channel_check_connectivity_state (client_channel_filter, 0 /* don't try to connect */ , &closure_list); + actual_conn_state = grpc_client_channel_check_connectivity_state (&exec_ctx, client_channel_filter, 0 /* don't try to connect */ ); grpc_exec_ctx_finish (&exec_ctx); va_start (ap, accepted_conn_state); for (i = 0; i < num_accepted_conn_states; i++) diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index be189a65400..59eb025957a 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -65,7 +65,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx &grpc_http_server_filter }; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); + grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (&exec_ctx, f->server)); grpc_exec_ctx_finish (&exec_ctx); } @@ -118,10 +118,10 @@ chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport (client_args, sfd->client, mdctx, 1, &closure_list); - client_setup_transport (&cs, transport, mdctx, &closure_list); + transport = grpc_create_chttp2_transport (&exec_ctx, client_args, sfd->client, mdctx, 1); + client_setup_transport (&exec_ctx, &cs, transport, mdctx); GPR_ASSERT (f->client); - grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); + grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0); grpc_exec_ctx_finish (&exec_ctx); } @@ -136,9 +136,9 @@ chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args f->server = grpc_server_create_from_filters (NULL, 0, server_args); grpc_server_register_completion_queue (f->server, f->cq, NULL); grpc_server_start (f->server); - transport = grpc_create_chttp2_transport (server_args, sfd->server, mdctx, 0, &closure_list); + transport = grpc_create_chttp2_transport (&exec_ctx, server_args, sfd->server, mdctx, 0); server_setup_transport (f, transport, mdctx); - grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); + grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0); grpc_exec_ctx_finish (&exec_ctx); } diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index d11cdef9c3e..613772f27b3 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -64,7 +64,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx &grpc_http_server_filter }; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); + grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (&exec_ctx, f->server)); grpc_exec_ctx_finish (&exec_ctx); } @@ -117,10 +117,10 @@ chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport (client_args, sfd->client, mdctx, 1, &closure_list); - client_setup_transport (&cs, transport, mdctx, &closure_list); + transport = grpc_create_chttp2_transport (&exec_ctx, client_args, sfd->client, mdctx, 1); + client_setup_transport (&exec_ctx, &cs, transport, mdctx); GPR_ASSERT (f->client); - grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); + grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0); grpc_exec_ctx_finish (&exec_ctx); } @@ -135,9 +135,9 @@ chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args f->server = grpc_server_create_from_filters (NULL, 0, server_args); grpc_server_register_completion_queue (f->server, f->cq, NULL); grpc_server_start (f->server); - transport = grpc_create_chttp2_transport (server_args, sfd->server, mdctx, 0, &closure_list); + transport = grpc_create_chttp2_transport (&exec_ctx, server_args, sfd->server, mdctx, 0); server_setup_transport (f, transport, mdctx); - grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); + grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0); grpc_exec_ctx_finish (&exec_ctx); } diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index c54fabc0119..9ad36ed79c1 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -64,7 +64,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx &grpc_http_server_filter }; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); + grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (&exec_ctx, f->server)); grpc_exec_ctx_finish (&exec_ctx); } @@ -117,10 +117,10 @@ chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport (client_args, sfd->client, mdctx, 1, &closure_list); - client_setup_transport (&cs, transport, mdctx, &closure_list); + transport = grpc_create_chttp2_transport (&exec_ctx, client_args, sfd->client, mdctx, 1); + client_setup_transport (&exec_ctx, &cs, transport, mdctx); GPR_ASSERT (f->client); - grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); + grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0); grpc_exec_ctx_finish (&exec_ctx); } @@ -135,9 +135,9 @@ chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args f->server = grpc_server_create_from_filters (NULL, 0, server_args); grpc_server_register_completion_queue (f->server, f->cq, NULL); grpc_server_start (f->server); - transport = grpc_create_chttp2_transport (server_args, sfd->server, mdctx, 0, &closure_list); + transport = grpc_create_chttp2_transport (&exec_ctx, server_args, sfd->server, mdctx, 0); server_setup_transport (f, transport, mdctx); - grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); + grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0); grpc_exec_ctx_finish (&exec_ctx); } diff --git a/test/core/httpcli/httpcli_test.c b/test/core/httpcli/httpcli_test.c index f28a25464bf..504423c9da5 100644 --- a/test/core/httpcli/httpcli_test.c +++ b/test/core/httpcli/httpcli_test.c @@ -88,12 +88,12 @@ test_get (int use_ssl, int port) req.path = "/get"; req.handshaker = use_ssl ? &grpc_httpcli_ssl : &grpc_httpcli_plaintext; - grpc_httpcli_get (&g_context, &g_pollset, &req, n_seconds_time (15), on_finish, (void *) 42, &closure_list); + grpc_httpcli_get (&g_context, &g_pollset, &req, n_seconds_time (15), on_finish, (&exec_ctx, void *) 42); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); while (!g_done) { grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), n_seconds_time (20), &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), n_seconds_time (&exec_ctx, 20)); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -120,12 +120,12 @@ test_post (int use_ssl, int port) req.path = "/post"; req.handshaker = use_ssl ? &grpc_httpcli_ssl : &grpc_httpcli_plaintext; - grpc_httpcli_post (&g_context, &g_pollset, &req, "hello", 5, n_seconds_time (15), on_finish, (void *) 42, &closure_list); + grpc_httpcli_post (&g_context, &g_pollset, &req, "hello", 5, n_seconds_time (15), on_finish, (&exec_ctx, void *) 42); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); while (!g_done) { grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), n_seconds_time (20), &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), n_seconds_time (&exec_ctx, 20)); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -184,7 +184,7 @@ main (int argc, char **argv) grpc_httpcli_context_destroy (&g_context); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); diff --git a/test/core/iomgr/alarm_list_test.c b/test/core/iomgr/alarm_list_test.c index cfb079920c1..0696359f4fb 100644 --- a/test/core/iomgr/alarm_list_test.c +++ b/test/core/iomgr/alarm_list_test.c @@ -63,17 +63,17 @@ add_test (void) /* 10 ms alarms. will expire in the current epoch */ for (i = 0; i < 10; i++) { - grpc_alarm_init (&alarms[i], gpr_time_add (start, gpr_time_from_millis (10, GPR_TIMESPAN)), cb, (void *) (gpr_intptr) i, start, &closure_list); + grpc_alarm_init (&alarms[i], gpr_time_add (start, gpr_time_from_millis (10, GPR_TIMESPAN)), cb, (void *) (&exec_ctx, gpr_intptr) i, start); } /* 1010 ms alarms. will expire in the next epoch */ for (i = 10; i < 20; i++) { - grpc_alarm_init (&alarms[i], gpr_time_add (start, gpr_time_from_millis (1010, GPR_TIMESPAN)), cb, (void *) (gpr_intptr) i, start, &closure_list); + grpc_alarm_init (&alarms[i], gpr_time_add (start, gpr_time_from_millis (1010, GPR_TIMESPAN)), cb, (void *) (&exec_ctx, gpr_intptr) i, start); } /* collect alarms. Only the first batch should be ready. */ - GPR_ASSERT (10 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (500, GPR_TIMESPAN)), NULL, &closure_list)); + GPR_ASSERT (10 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (&exec_ctx, 500, GPR_TIMESPAN)), NULL)); grpc_exec_ctx_finish (&exec_ctx); for (i = 0; i < 20; i++) { @@ -81,7 +81,7 @@ add_test (void) GPR_ASSERT (cb_called[i][0] == 0); } - GPR_ASSERT (0 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (600, GPR_TIMESPAN)), NULL, &closure_list)); + GPR_ASSERT (0 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (&exec_ctx, 600, GPR_TIMESPAN)), NULL)); grpc_exec_ctx_finish (&exec_ctx); for (i = 0; i < 30; i++) { @@ -90,7 +90,7 @@ add_test (void) } /* collect the rest of the alarms */ - GPR_ASSERT (10 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (1500, GPR_TIMESPAN)), NULL, &closure_list)); + GPR_ASSERT (10 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (&exec_ctx, 1500, GPR_TIMESPAN)), NULL)); grpc_exec_ctx_finish (&exec_ctx); for (i = 0; i < 30; i++) { @@ -98,7 +98,7 @@ add_test (void) GPR_ASSERT (cb_called[i][0] == 0); } - GPR_ASSERT (0 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (1600, GPR_TIMESPAN)), NULL, &closure_list)); + GPR_ASSERT (0 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (&exec_ctx, 1600, GPR_TIMESPAN)), NULL)); for (i = 0; i < 30; i++) { GPR_ASSERT (cb_called[i][1] == (i < 20)); @@ -127,16 +127,16 @@ destruction_test (void) grpc_alarm_list_init (gpr_time_0 (GPR_CLOCK_REALTIME)); memset (cb_called, 0, sizeof (cb_called)); - grpc_alarm_init (&alarms[0], tfm (100), cb, (void *) (gpr_intptr) 0, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list); - grpc_alarm_init (&alarms[1], tfm (3), cb, (void *) (gpr_intptr) 1, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list); - grpc_alarm_init (&alarms[2], tfm (100), cb, (void *) (gpr_intptr) 2, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list); - grpc_alarm_init (&alarms[3], tfm (3), cb, (void *) (gpr_intptr) 3, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list); - grpc_alarm_init (&alarms[4], tfm (1), cb, (void *) (gpr_intptr) 4, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list); - GPR_ASSERT (1 == grpc_alarm_check (tfm (2), NULL, &closure_list)); + grpc_alarm_init (&alarms[0], tfm (100), cb, (void *) (gpr_intptr) 0, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME)); + grpc_alarm_init (&alarms[1], tfm (3), cb, (void *) (gpr_intptr) 1, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME)); + grpc_alarm_init (&alarms[2], tfm (100), cb, (void *) (gpr_intptr) 2, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME)); + grpc_alarm_init (&alarms[3], tfm (3), cb, (void *) (gpr_intptr) 3, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME)); + grpc_alarm_init (&alarms[4], tfm (1), cb, (void *) (gpr_intptr) 4, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME)); + GPR_ASSERT (1 == grpc_alarm_check (tfm (&exec_ctx, 2), NULL)); grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (1 == cb_called[4][1]); - grpc_alarm_cancel (&alarms[0], &closure_list); - grpc_alarm_cancel (&alarms[3], &closure_list); + grpc_alarm_cancel (&exec_ctx, &alarms[0]); + grpc_alarm_cancel (&exec_ctx, &alarms[3]); grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (1 == cb_called[0][0]); GPR_ASSERT (1 == cb_called[3][0]); diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c index fe15b47f73d..5f1e3600dd8 100644 --- a/test/core/iomgr/endpoint_pair_test.c +++ b/test/core/iomgr/endpoint_pair_test.c @@ -58,8 +58,8 @@ create_fixture_endpoint_pair (size_t slice_size) f.client_ep = p.client; f.server_ep = p.server; - grpc_endpoint_add_to_pollset (f.client_ep, &g_pollset, &closure_list); - grpc_endpoint_add_to_pollset (f.server_ep, &g_pollset, &closure_list); + 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; @@ -85,7 +85,7 @@ main (int argc, char **argv) grpc_pollset_init (&g_pollset); grpc_endpoint_tests (configs[0], &g_pollset); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index 8cc27a885b3..49b6d79271d 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -231,17 +231,17 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t 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, 1, &closure_list); + read_and_write_test_write_handler (&exec_ctx, &state, 1); grpc_exec_ctx_finish (&exec_ctx); - grpc_endpoint_read (state.read_ep, &state.incoming, &state.done_read, &closure_list); + 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, &closure_list); + grpc_endpoint_shutdown (&exec_ctx, state.read_ep); gpr_log (GPR_DEBUG, "shutdown write"); - grpc_endpoint_shutdown (state.write_ep, &closure_list); + grpc_endpoint_shutdown (&exec_ctx, state.write_ep); } grpc_exec_ctx_finish (&exec_ctx); @@ -250,7 +250,7 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t { grpc_pollset_worker worker; GPR_ASSERT (gpr_time_cmp (gpr_now (GPR_CLOCK_MONOTONIC), deadline) < 0); - grpc_pollset_work (g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); + grpc_pollset_work (g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); } gpr_mu_unlock (GRPC_POLLSET_MU (g_pollset)); grpc_exec_ctx_finish (&exec_ctx); @@ -258,8 +258,8 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t end_test (config); gpr_slice_buffer_destroy (&state.outgoing); gpr_slice_buffer_destroy (&state.incoming); - grpc_endpoint_destroy (state.read_ep, &closure_list); - grpc_endpoint_destroy (state.write_ep, &closure_list); + grpc_endpoint_destroy (&exec_ctx, state.read_ep); + grpc_endpoint_destroy (&exec_ctx, state.write_ep); grpc_exec_ctx_finish (&exec_ctx); } diff --git a/test/core/iomgr/fd_conservation_posix_test.c b/test/core/iomgr/fd_conservation_posix_test.c index 4f6b290e4d0..b0fbd78ca03 100644 --- a/test/core/iomgr/fd_conservation_posix_test.c +++ b/test/core/iomgr/fd_conservation_posix_test.c @@ -59,8 +59,8 @@ main (int argc, char **argv) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; p = grpc_iomgr_create_endpoint_pair ("test", 1); - grpc_endpoint_destroy (p.client, &closure_list); - grpc_endpoint_destroy (p.server, &closure_list); + grpc_endpoint_destroy (&exec_ctx, p.client); + grpc_endpoint_destroy (&exec_ctx, p.server); grpc_exec_ctx_finish (&exec_ctx); } diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index a0b060aa253..8b76e0dc6de 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -283,7 +283,7 @@ server_wait_and_shutdown (server * sv) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -423,7 +423,7 @@ client_wait_and_shutdown (client * cl) { grpc_pollset_worker worker; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -443,9 +443,9 @@ test_grpc_fd (void) grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; server_init (&sv); - port = server_start (&sv, &closure_list); + port = server_start (&exec_ctx, &sv); client_init (&cl); - client_start (&cl, port, &closure_list); + client_start (&exec_ctx, &cl, port); grpc_exec_ctx_finish (&exec_ctx); client_wait_and_shutdown (&cl); server_wait_and_shutdown (&sv); @@ -525,10 +525,10 @@ 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, &closure_list); + 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, &closure_list); + grpc_fd_notify_on_read (&exec_ctx, em_fd, &first_closure); data = 0; result = write (sv[1], &data, 1); GPR_ASSERT (result == 1); @@ -538,7 +538,7 @@ test_grpc_fd_change (void) while (a.cb_that_ran == NULL) { grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -552,7 +552,7 @@ 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, &closure_list); + grpc_fd_notify_on_read (&exec_ctx, em_fd, &second_closure); data = 0; result = write (sv[1], &data, 1); GPR_ASSERT (result == 1); @@ -561,7 +561,7 @@ test_grpc_fd_change (void) while (b.cb_that_ran == NULL) { grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -570,7 +570,7 @@ test_grpc_fd_change (void) GPR_ASSERT (b.cb_that_ran == second_read_callback); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_fd_orphan (em_fd, NULL, "d", &closure_list); + grpc_fd_orphan (&exec_ctx, em_fd, NULL, "d"); grpc_exec_ctx_finish (&exec_ctx); destroy_change_data (&a); destroy_change_data (&b); @@ -594,7 +594,7 @@ main (int argc, char **argv) test_grpc_fd (); test_grpc_fd_change (); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); grpc_exec_ctx_finish (&exec_ctx); grpc_iomgr_shutdown (); return 0; diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index 3ddae66b706..7ce85b7403e 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -115,7 +115,7 @@ test_succeeds (void) /* connect to it */ GPR_ASSERT (getsockname (svr_fd, (struct sockaddr *) &addr, &addr_len) == 0); grpc_closure_init (&done, must_succeed, NULL); - grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, gpr_inf_future (GPR_CLOCK_REALTIME), &closure_list); + grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, gpr_inf_future (&exec_ctx, GPR_CLOCK_REALTIME)); /* await the connection */ do @@ -132,7 +132,7 @@ test_succeeds (void) while (g_connections_complete == connections_complete_before) { grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 5)); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -161,7 +161,7 @@ test_fails (void) /* connect to a broken address */ grpc_closure_init (&done, must_fail, NULL); - grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, gpr_inf_future (GPR_CLOCK_REALTIME), &closure_list); + grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, gpr_inf_future (&exec_ctx, GPR_CLOCK_REALTIME)); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -169,7 +169,7 @@ test_fails (void) while (g_connections_complete == connections_complete_before) { grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), test_deadline (), &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), test_deadline (&exec_ctx, )); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -229,7 +229,7 @@ test_times_out (void) gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_closure_init (&done, must_fail, NULL); - grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, connect_deadline, &closure_list); + grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (&exec_ctx, struct sockaddr *) &addr, addr_len, connect_deadline); /* Make sure the event doesn't trigger early */ gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -255,7 +255,7 @@ test_times_out (void) { GPR_ASSERT (g_connections_complete == connections_complete_before + is_after_deadline); } - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_MILLIS_TO_DEADLINE (10), &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_MILLIS_TO_DEADLINE (&exec_ctx, 10)); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -284,7 +284,7 @@ main (int argc, char **argv) grpc_init (); grpc_pollset_set_init (&g_pollset_set); grpc_pollset_init (&g_pollset); - grpc_pollset_set_add_pollset (&g_pollset_set, &g_pollset, &closure_list); + 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"); @@ -292,7 +292,7 @@ main (int argc, char **argv) test_times_out (); grpc_pollset_set_destroy (&g_pollset_set); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); return 0; diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index aa8669312b3..2ed6157479e 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -197,7 +197,7 @@ read_test (size_t num_bytes, size_t slice_size) create_sockets (sv); ep = grpc_tcp_create (grpc_fd_create (sv[1], "read_test"), slice_size, "test"); - grpc_endpoint_add_to_pollset (ep, &g_pollset, &closure_list); + grpc_endpoint_add_to_pollset (&exec_ctx, ep, &g_pollset); written_bytes = fill_socket_partial (sv[0], num_bytes); gpr_log (GPR_INFO, "Wrote %d bytes", written_bytes); @@ -208,13 +208,13 @@ read_test (size_t num_bytes, size_t slice_size) gpr_slice_buffer_init (&state.incoming); grpc_closure_init (&state.read_cb, read_cb, &state); - grpc_endpoint_read (ep, &state.incoming, &state.read_cb, &closure_list); + grpc_endpoint_read (&exec_ctx, ep, &state.incoming, &state.read_cb); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -223,7 +223,7 @@ read_test (size_t num_bytes, size_t slice_size) gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); gpr_slice_buffer_destroy (&state.incoming); - grpc_endpoint_destroy (ep, &closure_list); + grpc_endpoint_destroy (&exec_ctx, ep); grpc_exec_ctx_finish (&exec_ctx); } @@ -244,7 +244,7 @@ large_read_test (size_t slice_size) create_sockets (sv); ep = grpc_tcp_create (grpc_fd_create (sv[1], "large_read_test"), slice_size, "test"); - grpc_endpoint_add_to_pollset (ep, &g_pollset, &closure_list); + grpc_endpoint_add_to_pollset (&exec_ctx, ep, &g_pollset); written_bytes = fill_socket (sv[0]); gpr_log (GPR_INFO, "Wrote %d bytes", written_bytes); @@ -255,13 +255,13 @@ large_read_test (size_t slice_size) gpr_slice_buffer_init (&state.incoming); grpc_closure_init (&state.read_cb, read_cb, &state); - grpc_endpoint_read (ep, &state.incoming, &state.read_cb, &closure_list); + grpc_endpoint_read (&exec_ctx, ep, &state.incoming, &state.read_cb); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -270,7 +270,7 @@ large_read_test (size_t slice_size) gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); gpr_slice_buffer_destroy (&state.incoming); - grpc_endpoint_destroy (ep, &closure_list); + grpc_endpoint_destroy (&exec_ctx, ep); grpc_exec_ctx_finish (&exec_ctx); } @@ -336,7 +336,7 @@ drain_socket_blocking (int fd, size_t num_bytes, size_t read_size) { grpc_pollset_worker worker; gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_MILLIS_TO_DEADLINE (10), &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_MILLIS_TO_DEADLINE (&exec_ctx, 10)); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); do @@ -382,7 +382,7 @@ write_test (size_t num_bytes, size_t slice_size) create_sockets (sv); ep = grpc_tcp_create (grpc_fd_create (sv[1], "write_test"), GRPC_TCP_DEFAULT_READ_SLICE_SIZE, "test"); - grpc_endpoint_add_to_pollset (ep, &g_pollset, &closure_list); + grpc_endpoint_add_to_pollset (&exec_ctx, ep, &g_pollset); state.ep = ep; state.write_done = 0; @@ -393,7 +393,7 @@ write_test (size_t num_bytes, size_t slice_size) gpr_slice_buffer_addn (&outgoing, slices, num_blocks); grpc_closure_init (&write_done_closure, write_done, &state); - grpc_endpoint_write (ep, &outgoing, &write_done_closure, &closure_list); + grpc_endpoint_write (&exec_ctx, ep, &outgoing, &write_done_closure); drain_socket_blocking (sv[0], num_bytes, num_bytes); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); for (;;) @@ -403,7 +403,7 @@ write_test (size_t num_bytes, size_t slice_size) { break; } - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -411,7 +411,7 @@ write_test (size_t num_bytes, size_t slice_size) gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); gpr_slice_buffer_destroy (&outgoing); - grpc_endpoint_destroy (ep, &closure_list); + grpc_endpoint_destroy (&exec_ctx, ep); gpr_free (slices); grpc_exec_ctx_finish (&exec_ctx); } @@ -455,8 +455,8 @@ create_fixture_tcp_socketpair (size_t slice_size) create_sockets (sv); f.client_ep = grpc_tcp_create (grpc_fd_create (sv[0], "fixture:client"), slice_size, "test"); f.server_ep = grpc_tcp_create (grpc_fd_create (sv[1], "fixture:server"), slice_size, "test"); - grpc_endpoint_add_to_pollset (f.client_ep, &g_pollset, &closure_list); - grpc_endpoint_add_to_pollset (f.server_ep, &g_pollset, &closure_list); + 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); @@ -484,7 +484,7 @@ main (int argc, char **argv) run_tests (); grpc_endpoint_tests (configs[0], &g_pollset); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index 755158bcdf4..1ccc31faf7f 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -73,7 +73,7 @@ test_no_op_with_start (void) grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_tcp_server *s = grpc_tcp_server_create (); LOG_TEST ("test_no_op_with_start"); - grpc_tcp_server_start (s, NULL, 0, on_connect, NULL, &closure_list); + grpc_tcp_server_start (&exec_ctx, s, NULL, 0, on_connect, NULL); grpc_tcp_server_destroy (s, NULL, NULL); grpc_exec_ctx_finish (&exec_ctx); } @@ -90,7 +90,7 @@ test_no_op_with_port (void) addr.sin_family = AF_INET; GPR_ASSERT (grpc_tcp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr))); - grpc_tcp_server_destroy (s, NULL, &closure_list); + grpc_tcp_server_destroy (&exec_ctx, s, NULL); grpc_exec_ctx_finish (&exec_ctx); } @@ -106,9 +106,9 @@ test_no_op_with_port_and_start (void) addr.sin_family = AF_INET; GPR_ASSERT (grpc_tcp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr))); - grpc_tcp_server_start (s, NULL, 0, on_connect, NULL, &closure_list); + grpc_tcp_server_start (&exec_ctx, s, NULL, 0, on_connect, NULL); - grpc_tcp_server_destroy (s, NULL, &closure_list); + grpc_tcp_server_destroy (&exec_ctx, s, NULL); grpc_exec_ctx_finish (&exec_ctx); } @@ -137,7 +137,7 @@ test_connect (int n) GPR_ASSERT (addr_len <= sizeof (addr)); pollsets[0] = &g_pollset; - grpc_tcp_server_start (s, pollsets, 1, on_connect, NULL, &closure_list); + grpc_tcp_server_start (&exec_ctx, s, pollsets, 1, on_connect, NULL); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -155,7 +155,7 @@ test_connect (int n) while (g_nconnects == nconnects_before && gpr_time_cmp (deadline, gpr_now (deadline.clock_type)) > 0) { grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -168,7 +168,7 @@ test_connect (int n) gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_tcp_server_destroy (s, NULL, &closure_list); + grpc_tcp_server_destroy (&exec_ctx, s, NULL); grpc_exec_ctx_finish (&exec_ctx); } @@ -195,7 +195,7 @@ main (int argc, char **argv) test_connect (10); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); grpc_exec_ctx_finish (&exec_ctx); grpc_iomgr_shutdown (); return 0; diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c index 672c9cf55fd..c2729c759d8 100644 --- a/test/core/iomgr/udp_server_test.c +++ b/test/core/iomgr/udp_server_test.c @@ -78,7 +78,7 @@ test_no_op_with_start (void) grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_udp_server *s = grpc_udp_server_create (); LOG_TEST ("test_no_op_with_start"); - grpc_udp_server_start (s, NULL, 0, &closure_list); + grpc_udp_server_start (&exec_ctx, s, NULL, 0); grpc_udp_server_destroy (s, NULL, NULL); grpc_exec_ctx_finish (&exec_ctx); } @@ -109,9 +109,9 @@ test_no_op_with_port_and_start (void) addr.sin_family = AF_INET; GPR_ASSERT (grpc_udp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr), on_read)); - grpc_udp_server_start (s, NULL, 0, &closure_list); + grpc_udp_server_start (&exec_ctx, s, NULL, 0); - grpc_udp_server_destroy (s, NULL, &closure_list); + grpc_udp_server_destroy (&exec_ctx, s, NULL); grpc_exec_ctx_finish (&exec_ctx); } @@ -142,7 +142,7 @@ test_receive (int number_of_clients) GPR_ASSERT (addr_len <= sizeof (addr)); pollsets[0] = &g_pollset; - grpc_udp_server_start (s, pollsets, 1, &closure_list); + grpc_udp_server_start (&exec_ctx, s, pollsets, 1); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -159,7 +159,7 @@ test_receive (int number_of_clients) while (g_number_of_reads == number_of_reads_before && gpr_time_cmp (deadline, gpr_now (deadline.clock_type)) > 0) { grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -197,7 +197,7 @@ main (int argc, char **argv) test_receive (10); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); grpc_exec_ctx_finish (&exec_ctx); grpc_iomgr_shutdown (); return 0; diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c index e785ccefdf0..eadb080a410 100644 --- a/test/core/iomgr/workqueue_test.c +++ b/test/core/iomgr/workqueue_test.c @@ -62,16 +62,16 @@ test_add_closure (void) grpc_closure_init (&c, must_succeed, &done); grpc_workqueue_push (wq, &c, 1); - grpc_workqueue_add_to_pollset (wq, &g_pollset, &closure_list); + grpc_workqueue_add_to_pollset (&exec_ctx, wq, &g_pollset); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); GPR_ASSERT (!done); - grpc_pollset_work (&g_pollset, &worker, gpr_now (deadline.clock_type), deadline, &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, deadline.clock_type), deadline); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (done); - GRPC_WORKQUEUE_UNREF (wq, "destroy", &closure_list); + GRPC_WORKQUEUE_UNREF (&exec_ctx, wq, "destroy"); grpc_exec_ctx_finish (&exec_ctx); } @@ -93,7 +93,7 @@ main (int argc, char **argv) test_add_closure (); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); return 0; diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index 2a50935c97a..b34feabfe53 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -308,7 +308,7 @@ test_google_iam_creds (void) NULL); GPR_ASSERT (grpc_credentials_has_request_metadata (creds)); GPR_ASSERT (grpc_credentials_has_request_metadata_only (creds)); - grpc_credentials_get_request_metadata (creds, NULL, test_service_url, check_google_iam_metadata, creds, &closure_list); + grpc_credentials_get_request_metadata (&exec_ctx, creds, NULL, test_service_url, check_google_iam_metadata, creds); grpc_exec_ctx_finish (&exec_ctx); } @@ -331,7 +331,7 @@ test_access_token_creds (void) GPR_ASSERT (grpc_credentials_has_request_metadata (creds)); GPR_ASSERT (grpc_credentials_has_request_metadata_only (creds)); GPR_ASSERT (strcmp (creds->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); - grpc_credentials_get_request_metadata (creds, NULL, test_service_url, check_access_token_metadata, creds, &closure_list); + grpc_credentials_get_request_metadata (&exec_ctx, creds, NULL, test_service_url, check_access_token_metadata, creds); grpc_exec_ctx_finish (&exec_ctx); } @@ -365,7 +365,7 @@ test_ssl_oauth2_composite_creds (void) GPR_ASSERT (creds_array->num_creds == 2); GPR_ASSERT (strcmp (creds_array->creds_array[0]->type, GRPC_CREDENTIALS_TYPE_SSL) == 0); GPR_ASSERT (strcmp (creds_array->creds_array[1]->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); - grpc_credentials_get_request_metadata (composite_creds, NULL, test_service_url, check_ssl_oauth2_composite_metadata, composite_creds, &closure_list); + grpc_credentials_get_request_metadata (&exec_ctx, composite_creds, NULL, test_service_url, check_ssl_oauth2_composite_metadata, composite_creds); grpc_exec_ctx_finish (&exec_ctx); } @@ -421,7 +421,7 @@ test_ssl_oauth2_google_iam_composite_creds (void) GPR_ASSERT (strcmp (creds_array->creds_array[0]->type, GRPC_CREDENTIALS_TYPE_SSL) == 0); GPR_ASSERT (strcmp (creds_array->creds_array[1]->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); GPR_ASSERT (strcmp (creds_array->creds_array[2]->type, GRPC_CREDENTIALS_TYPE_IAM) == 0); - grpc_credentials_get_request_metadata (composite_creds, NULL, test_service_url, check_ssl_oauth2_google_iam_composite_metadata, composite_creds, &closure_list); + grpc_credentials_get_request_metadata (&exec_ctx, composite_creds, NULL, test_service_url, check_ssl_oauth2_google_iam_composite_metadata, composite_creds); grpc_exec_ctx_finish (&exec_ctx); } @@ -498,12 +498,12 @@ test_compute_engine_creds_success (void) /* First request: http get should be called. */ grpc_httpcli_set_override (compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); - grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); + grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (&exec_ctx, void *) test_user_data); grpc_exec_ctx_finish (&exec_ctx); /* Second request: the cached token should be served directly. */ grpc_httpcli_set_override (httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); + grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (&exec_ctx, void *) test_user_data); grpc_exec_ctx_finish (&exec_ctx); grpc_credentials_unref (compute_engine_creds); @@ -518,7 +518,7 @@ test_compute_engine_creds_failure (void) grpc_httpcli_set_override (compute_engine_httpcli_get_failure_override, httpcli_post_should_not_be_called); GPR_ASSERT (grpc_credentials_has_request_metadata (compute_engine_creds)); GPR_ASSERT (grpc_credentials_has_request_metadata_only (compute_engine_creds)); - grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (void *) test_user_data, &closure_list); + grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (&exec_ctx, void *) test_user_data); grpc_credentials_unref (compute_engine_creds); grpc_httpcli_set_override (NULL, NULL); grpc_exec_ctx_finish (&exec_ctx); @@ -572,12 +572,12 @@ test_refresh_token_creds_success (void) /* First request: http get should be called. */ grpc_httpcli_set_override (httpcli_get_should_not_be_called, refresh_token_httpcli_post_success); - grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); + grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (&exec_ctx, void *) test_user_data); grpc_exec_ctx_finish (&exec_ctx); /* Second request: the cached token should be served directly. */ grpc_httpcli_set_override (httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); + grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (&exec_ctx, void *) test_user_data); grpc_exec_ctx_finish (&exec_ctx); grpc_credentials_unref (refresh_token_creds); @@ -594,7 +594,7 @@ test_refresh_token_creds_failure (void) grpc_httpcli_set_override (httpcli_get_should_not_be_called, refresh_token_httpcli_post_failure); GPR_ASSERT (grpc_credentials_has_request_metadata (refresh_token_creds)); GPR_ASSERT (grpc_credentials_has_request_metadata_only (refresh_token_creds)); - grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (void *) test_user_data, &closure_list); + grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (&exec_ctx, void *) test_user_data); grpc_credentials_unref (refresh_token_creds); grpc_httpcli_set_override (NULL, NULL); grpc_exec_ctx_finish (&exec_ctx); @@ -669,18 +669,18 @@ test_jwt_creds_success (void) /* First request: jwt_encode_and_sign should be called. */ grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_success); - grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list); + grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (&exec_ctx, void *) test_user_data); grpc_exec_ctx_finish (&exec_ctx); /* Second request: the cached token should be served directly. */ grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_should_not_be_called); - grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list); + grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (&exec_ctx, void *) test_user_data); grpc_exec_ctx_finish (&exec_ctx); /* Third request: Different service url so jwt_encode_and_sign should be called again (no caching). */ grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_success); - grpc_credentials_get_request_metadata (jwt_creds, NULL, other_test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list); + grpc_credentials_get_request_metadata (jwt_creds, NULL, other_test_service_url, on_jwt_creds_get_metadata_success, (&exec_ctx, void *) test_user_data); grpc_exec_ctx_finish (&exec_ctx); gpr_free (json_key_string); @@ -698,7 +698,7 @@ test_jwt_creds_signing_failure (void) GPR_ASSERT (grpc_credentials_has_request_metadata_only (jwt_creds)); grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_failure); - grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_failure, (void *) test_user_data, &closure_list); + grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_failure, (&exec_ctx, void *) test_user_data); gpr_free (json_key_string); grpc_credentials_unref (jwt_creds); @@ -854,7 +854,7 @@ test_metadata_plugin_success (void) creds = grpc_metadata_credentials_create_from_plugin (plugin, NULL); GPR_ASSERT (state == PLUGIN_INITIAL_STATE); - grpc_credentials_get_request_metadata (creds, NULL, test_service_url, on_plugin_metadata_received_success, NULL, &closure_list); + grpc_credentials_get_request_metadata (&exec_ctx, creds, NULL, test_service_url, on_plugin_metadata_received_success, NULL); GPR_ASSERT (state == PLUGIN_GET_METADATA_CALLED_STATE); grpc_credentials_release (creds); GPR_ASSERT (state == PLUGIN_DESTROY_CALLED_STATE); @@ -875,7 +875,7 @@ test_metadata_plugin_failure (void) creds = grpc_metadata_credentials_create_from_plugin (plugin, NULL); GPR_ASSERT (state == PLUGIN_INITIAL_STATE); - grpc_credentials_get_request_metadata (creds, NULL, test_service_url, on_plugin_metadata_received_failure, NULL, &closure_list); + grpc_credentials_get_request_metadata (&exec_ctx, creds, NULL, test_service_url, on_plugin_metadata_received_failure, NULL); GPR_ASSERT (state == PLUGIN_GET_METADATA_CALLED_STATE); grpc_credentials_release (creds); GPR_ASSERT (state == PLUGIN_DESTROY_CALLED_STATE); diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c index 94fa78d2b3b..44257468e47 100644 --- a/test/core/security/jwt_verifier_test.c +++ b/test/core/security/jwt_verifier_test.c @@ -232,7 +232,7 @@ test_jwt_verifier_google_email_issuer_success (void) jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); grpc_auth_json_key_destruct (&key); GPR_ASSERT (jwt != NULL); - grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (void *) expected_user_data, &closure_list); + grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (&exec_ctx, void *) expected_user_data); gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); @@ -265,7 +265,7 @@ test_jwt_verifier_custom_email_issuer_success (void) jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); grpc_auth_json_key_destruct (&key); GPR_ASSERT (jwt != NULL); - grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (void *) expected_user_data, &closure_list); + grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (&exec_ctx, void *) expected_user_data); gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); @@ -311,7 +311,7 @@ test_jwt_verifier_url_issuer_success (void) jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); grpc_auth_json_key_destruct (&key); GPR_ASSERT (jwt != NULL); - grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (void *) expected_user_data, &closure_list); + grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (&exec_ctx, void *) expected_user_data); gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); @@ -350,7 +350,7 @@ test_jwt_verifier_url_issuer_bad_config (void) jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); grpc_auth_json_key_destruct (&key); GPR_ASSERT (jwt != NULL); - grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, (void *) expected_user_data, &closure_list); + grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, (&exec_ctx, void *) expected_user_data); gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); @@ -371,7 +371,7 @@ test_jwt_verifier_bad_json_key (void) jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); grpc_auth_json_key_destruct (&key); GPR_ASSERT (jwt != NULL); - grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, (void *) expected_user_data, &closure_list); + grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, (&exec_ctx, void *) expected_user_data); gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); @@ -419,7 +419,7 @@ test_jwt_verifier_bad_signature (void) grpc_auth_json_key_destruct (&key); corrupt_jwt_sig (jwt); GPR_ASSERT (jwt != NULL); - grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_bad_signature, (void *) expected_user_data, &closure_list); + grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_bad_signature, (&exec_ctx, void *) expected_user_data); gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); @@ -447,7 +447,7 @@ test_jwt_verifier_bad_format (void) grpc_exec_ctx 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 (verifier, NULL, "bad jwt", expected_audience, on_verification_bad_format, (void *) expected_user_data, &closure_list); + grpc_jwt_verifier_verify (verifier, NULL, "bad jwt", expected_audience, on_verification_bad_format, (&exec_ctx, void *) expected_user_data); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); grpc_exec_ctx_finish (&exec_ctx); diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index 3b8f3a2b85f..d6c17b32c5d 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -92,7 +92,7 @@ grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds) grpc_closure_init (&do_nothing_closure, do_nothing, NULL); - grpc_credentials_get_request_metadata (creds, &request.pollset, "", on_oauth2_response, &request, &closure_list); + grpc_credentials_get_request_metadata (&exec_ctx, creds, &request.pollset, "", on_oauth2_response, &request); grpc_exec_ctx_finish (&exec_ctx); @@ -100,11 +100,11 @@ grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds) while (!request.is_done) { grpc_pollset_worker worker; - grpc_pollset_work (&request.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + grpc_pollset_work (&request.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); } gpr_mu_unlock (GRPC_POLLSET_MU (&request.pollset)); - grpc_pollset_shutdown (&request.pollset, &do_nothing_closure, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &request.pollset, &do_nothing_closure); grpc_exec_ctx_finish (&exec_ctx); grpc_pollset_destroy (&request.pollset); 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 143359fea4a..e2bc11bf772 100644 --- a/test/core/security/print_google_default_creds_token.c +++ b/test/core/security/print_google_default_creds_token.c @@ -97,13 +97,13 @@ main (int argc, char **argv) grpc_pollset_init (&sync.pollset); sync.is_done = 0; - grpc_credentials_get_request_metadata (creds, &sync.pollset, service_url, on_metadata_response, &sync, &closure_list); + grpc_credentials_get_request_metadata (&exec_ctx, creds, &sync.pollset, service_url, on_metadata_response, &sync); gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); while (!sync.is_done) { grpc_pollset_worker worker; - grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index 581f671ee94..cd4ecb3d4c8 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -57,8 +57,8 @@ secure_endpoint_create_fixture_tcp_socketpair (size_t slice_size, gpr_slice * le grpc_endpoint_pair tcp; tcp = grpc_iomgr_create_endpoint_pair ("fixture", slice_size); - grpc_endpoint_add_to_pollset (tcp.client, &g_pollset, &closure_list); - grpc_endpoint_add_to_pollset (tcp.server, &g_pollset, &closure_list); + 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) { @@ -161,16 +161,16 @@ test_leftover (grpc_endpoint_test_config config, size_t slice_size) gpr_slice_buffer_init (&incoming); grpc_closure_init (&done_closure, inc_call_ctr, &n); - grpc_endpoint_read (f.client_ep, &incoming, &done_closure, &closure_list); + 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 (0 == gpr_slice_cmp (s, incoming.slices[0])); - grpc_endpoint_shutdown (f.client_ep, &closure_list); - grpc_endpoint_shutdown (f.server_ep, &closure_list); - grpc_endpoint_destroy (f.client_ep, &closure_list); - grpc_endpoint_destroy (f.server_ep, &closure_list); + grpc_endpoint_shutdown (&exec_ctx, f.client_ep); + grpc_endpoint_shutdown (&exec_ctx, 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); gpr_slice_unref (s); gpr_slice_buffer_destroy (&incoming); @@ -196,7 +196,7 @@ main (int argc, char **argv) grpc_endpoint_tests (configs[0], &g_pollset); test_leftover (configs[1], 1); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); diff --git a/test/core/security/verify_jwt.c b/test/core/security/verify_jwt.c index 8b35c712cc4..cbeda507db5 100644 --- a/test/core/security/verify_jwt.c +++ b/test/core/security/verify_jwt.c @@ -113,13 +113,13 @@ main (int argc, char **argv) grpc_pollset_init (&sync.pollset); sync.is_done = 0; - grpc_jwt_verifier_verify (verifier, &sync.pollset, jwt, aud, on_jwt_verification_done, &sync, &closure_list); + grpc_jwt_verifier_verify (&exec_ctx, verifier, &sync.pollset, jwt, aud, on_jwt_verification_done, &sync); gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); while (!sync.is_done) { grpc_pollset_worker worker; - grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); + grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index d044abb4673..de7f3b615c1 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -102,7 +102,7 @@ test_cq_end_op (void) cc = grpc_completion_queue_create (NULL); grpc_cq_begin_op (cc); - grpc_cq_end_op (cc, tag, 1, do_nothing_end_completion, NULL, &completion, &closure_list); + grpc_cq_end_op (&exec_ctx, cc, tag, 1, 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); @@ -167,7 +167,7 @@ test_pluck (void) for (i = 0; i < GPR_ARRAY_SIZE (tags); i++) { grpc_cq_begin_op (cc); - grpc_cq_end_op (cc, tags[i], 1, do_nothing_end_completion, NULL, &completions[i], &closure_list); + grpc_cq_end_op (&exec_ctx, cc, tags[i], 1, do_nothing_end_completion, NULL, &completions[i]); } for (i = 0; i < GPR_ARRAY_SIZE (tags); i++) @@ -179,7 +179,7 @@ test_pluck (void) for (i = 0; i < GPR_ARRAY_SIZE (tags); i++) { grpc_cq_begin_op (cc); - grpc_cq_end_op (cc, tags[i], 1, do_nothing_end_completion, NULL, &completions[i], &closure_list); + grpc_cq_end_op (&exec_ctx, cc, tags[i], 1, do_nothing_end_completion, NULL, &completions[i]); } for (i = 0; i < GPR_ARRAY_SIZE (tags); i++) @@ -242,7 +242,7 @@ 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 (opt->cc, (void *) (gpr_intptr) 1, 1, free_completion, NULL, gpr_malloc (sizeof (grpc_cq_completion)), &closure_list); + grpc_cq_end_op (opt->cc, (void *) (gpr_intptr) 1, 1, free_completion, NULL, gpr_malloc (sizeof (&exec_ctx, grpc_cq_completion))); opt->events_triggered++; grpc_exec_ctx_finish (&exec_ctx); } diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index a598ea818b1..bce72f4a0c2 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -116,18 +116,18 @@ free_port_using_server (char *server, int port) req.path = path; grpc_httpcli_context_init (&context); - grpc_httpcli_get (&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), freed_port_from_server, &pr, &closure_list); + grpc_httpcli_get (&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 10), freed_port_from_server, &pr); gpr_mu_lock (GRPC_POLLSET_MU (&pr.pollset)); while (!pr.done) { grpc_pollset_worker worker; - grpc_pollset_work (&pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1), &closure_list); + grpc_pollset_work (&pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 1)); } gpr_mu_unlock (GRPC_POLLSET_MU (&pr.pollset)); grpc_httpcli_context_destroy (&context); grpc_exec_ctx_finish (&exec_ctx); - grpc_pollset_shutdown (&pr.pollset, &shutdown_closure, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &pr.pollset, &shutdown_closure); grpc_exec_ctx_finish (&exec_ctx); gpr_free (path); } @@ -287,18 +287,18 @@ pick_port_using_server (char *server) req.path = "/get"; grpc_httpcli_context_init (&context); - grpc_httpcli_get (&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, &pr, &closure_list); + grpc_httpcli_get (&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 10), got_port_from_server, &pr); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&pr.pollset)); while (pr.port == -1) { grpc_pollset_worker worker; - grpc_pollset_work (&pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1), &closure_list); + grpc_pollset_work (&pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 1)); } gpr_mu_unlock (GRPC_POLLSET_MU (&pr.pollset)); grpc_httpcli_context_destroy (&context); - grpc_pollset_shutdown (&pr.pollset, &shutdown_closure, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &pr.pollset, &shutdown_closure); grpc_exec_ctx_finish (&exec_ctx); return pr.port; diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index 4a1f589b827..761ef233ac0 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -140,7 +140,7 @@ reconnect_server_start (reconnect_server * server, int port) port_added = grpc_tcp_server_add_port (server->tcp_server, &addr, sizeof (addr)); GPR_ASSERT (port_added == port); - grpc_tcp_server_start (server->tcp_server, server->pollsets, 1, on_connect, server, &closure_list); + grpc_tcp_server_start (&exec_ctx, server->tcp_server, server->pollsets, 1, on_connect, server); gpr_log (GPR_INFO, "reconnect tcp server listening on 0.0.0.0:%d", port); grpc_exec_ctx_finish (&exec_ctx); @@ -154,7 +154,7 @@ reconnect_server_poll (reconnect_server * server, int seconds) gpr_time_from_seconds (seconds, GPR_TIMESPAN)); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock (GRPC_POLLSET_MU (&server->pollset)); - grpc_pollset_work (&server->pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); + grpc_pollset_work (&server->pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); gpr_mu_unlock (GRPC_POLLSET_MU (&server->pollset)); grpc_exec_ctx_finish (&exec_ctx); } @@ -186,9 +186,9 @@ reconnect_server_destroy (reconnect_server * server) grpc_closure do_nothing_closure[2]; grpc_closure_init (&do_nothing_closure[0], do_nothing, NULL); grpc_closure_init (&do_nothing_closure[1], do_nothing, NULL); - grpc_tcp_server_destroy (server->tcp_server, &do_nothing_closure[0], &closure_list); + grpc_tcp_server_destroy (&exec_ctx, server->tcp_server, &do_nothing_closure[0]); reconnect_server_clear_timestamps (server); - grpc_pollset_shutdown (&server->pollset, &do_nothing_closure[1], &closure_list); + grpc_pollset_shutdown (&exec_ctx, &server->pollset, &do_nothing_closure[1]); grpc_exec_ctx_finish (&exec_ctx); grpc_pollset_destroy (&server->pollset); grpc_shutdown (); From 8af4c337181322cc4fb396199c90f574cfb4163f Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 12:32:31 -0700 Subject: [PATCH 34/56] Final patches for rename --- BUILD | 3 + Makefile | 2 + build.yaml | 11 ++-- gRPC.podspec | 1 + src/core/channel/channel_stack.c | 2 +- src/core/channel/client_channel.c | 6 +- src/core/channel/connected_channel.c | 6 +- src/core/channel/http_client_filter.c | 6 +- src/core/channel/http_server_filter.c | 6 +- src/core/client_config/lb_policy.h | 8 +-- src/core/client_config/resolver.h | 6 +- src/core/client_config/subchannel.c | 18 +++--- src/core/client_config/subchannel.h | 18 +++--- src/core/httpcli/httpcli.c | 10 +-- src/core/httpcli/httpcli.h | 2 +- src/core/httpcli/httpcli_security_connector.c | 2 +- src/core/iomgr/alarm.c | 6 +- src/core/iomgr/alarm_internal.h | 2 +- src/core/iomgr/closure.c | 16 ----- src/core/iomgr/closure.h | 5 +- src/core/iomgr/exec_ctx.c | 62 +++++++++++++++++++ src/core/iomgr/exec_ctx.h | 11 ++++ src/core/iomgr/iomgr.c | 4 +- src/core/iomgr/pollset_posix.c | 12 ++-- src/core/iomgr/tcp_client_posix.c | 2 +- src/core/iomgr/tcp_posix.c | 20 +++--- src/core/iomgr/tcp_server_posix.c | 2 +- src/core/iomgr/workqueue.h | 11 ++-- src/core/iomgr/workqueue_posix.c | 8 +-- src/core/security/credentials.c | 5 +- .../security/google_default_credentials.c | 4 +- src/core/security/jwt_verifier.c | 6 +- src/core/security/secure_endpoint.c | 6 +- src/core/security/security_connector.c | 4 +- src/core/security/server_secure_chttp2.c | 4 +- src/core/surface/call.c | 14 ++--- src/core/surface/channel.c | 4 +- src/core/surface/channel_connectivity.c | 8 +-- src/core/surface/channel_create.c | 2 +- src/core/surface/completion_queue.c | 2 +- src/core/surface/completion_queue.h | 2 +- src/core/surface/lame_client.c | 2 +- src/core/surface/secure_channel_create.c | 2 +- src/core/surface/server.c | 8 +-- src/core/surface/server.h | 2 +- src/core/surface/server_chttp2.c | 6 +- src/core/surface/version.c | 6 +- src/core/transport/chttp2/parsing.c | 10 +-- src/core/transport/chttp2_transport.c | 10 +-- test/core/bad_client/bad_client.c | 6 +- .../core/end2end/fixtures/h2_sockpair+trace.c | 6 +- test/core/end2end/fixtures/h2_sockpair.c | 6 +- .../core/end2end/fixtures/h2_sockpair_1byte.c | 6 +- test/core/iomgr/alarm_list_test.c | 28 ++++----- test/core/iomgr/endpoint_tests.c | 2 +- test/core/security/oauth2_utils.c | 2 +- test/core/util/port_posix.c | 10 +-- test/core/util/reconnect_server.c | 2 +- tools/doxygen/Doxyfile.core.internal | 1 + tools/run_tests/sources_and_headers.json | 2 + vsprojects/vcxproj/grpc/grpc.vcxproj | 2 + vsprojects/vcxproj/grpc/grpc.vcxproj.filters | 3 + .../grpc_unsecure/grpc_unsecure.vcxproj | 2 + .../grpc_unsecure.vcxproj.filters | 3 + 64 files changed, 264 insertions(+), 192 deletions(-) create mode 100644 src/core/iomgr/exec_ctx.c diff --git a/BUILD b/BUILD index 6574e6f537d..f0abe43bc05 100644 --- a/BUILD +++ b/BUILD @@ -316,6 +316,7 @@ cc_library( "src/core/iomgr/endpoint.c", "src/core/iomgr/endpoint_pair_posix.c", "src/core/iomgr/endpoint_pair_windows.c", + "src/core/iomgr/exec_ctx.c", "src/core/iomgr/fd_posix.c", "src/core/iomgr/iocp_windows.c", "src/core/iomgr/iomgr.c", @@ -580,6 +581,7 @@ cc_library( "src/core/iomgr/endpoint.c", "src/core/iomgr/endpoint_pair_posix.c", "src/core/iomgr/endpoint_pair_windows.c", + "src/core/iomgr/exec_ctx.c", "src/core/iomgr/fd_posix.c", "src/core/iomgr/iocp_windows.c", "src/core/iomgr/iomgr.c", @@ -1102,6 +1104,7 @@ objc_library( "src/core/iomgr/endpoint.c", "src/core/iomgr/endpoint_pair_posix.c", "src/core/iomgr/endpoint_pair_windows.c", + "src/core/iomgr/exec_ctx.c", "src/core/iomgr/fd_posix.c", "src/core/iomgr/iocp_windows.c", "src/core/iomgr/iomgr.c", diff --git a/Makefile b/Makefile index 05aa6ee4126..5a8ae1d1ac5 100644 --- a/Makefile +++ b/Makefile @@ -4079,6 +4079,7 @@ LIBGRPC_SRC = \ src/core/iomgr/endpoint.c \ src/core/iomgr/endpoint_pair_posix.c \ src/core/iomgr/endpoint_pair_windows.c \ + src/core/iomgr/exec_ctx.c \ src/core/iomgr/fd_posix.c \ src/core/iomgr/iocp_windows.c \ src/core/iomgr/iomgr.c \ @@ -4360,6 +4361,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/iomgr/endpoint.c \ src/core/iomgr/endpoint_pair_posix.c \ src/core/iomgr/endpoint_pair_windows.c \ + src/core/iomgr/exec_ctx.c \ src/core/iomgr/fd_posix.c \ src/core/iomgr/iocp_windows.c \ src/core/iomgr/iomgr.c \ diff --git a/build.yaml b/build.yaml index 8e87d18bbe4..01754dd40ea 100644 --- a/build.yaml +++ b/build.yaml @@ -99,11 +99,12 @@ filegroups: src/core/debug/trace.c, src/core/httpcli/format_request.c, src/core/httpcli/httpcli.c, src/core/httpcli/parser.c, src/core/iomgr/alarm.c, src/core/iomgr/alarm_heap.c, src/core/iomgr/closure.c, src/core/iomgr/endpoint.c, src/core/iomgr/endpoint_pair_posix.c, - src/core/iomgr/endpoint_pair_windows.c, src/core/iomgr/fd_posix.c, src/core/iomgr/iocp_windows.c, - src/core/iomgr/iomgr.c, src/core/iomgr/iomgr_posix.c, src/core/iomgr/iomgr_windows.c, - src/core/iomgr/pollset_multipoller_with_epoll.c, src/core/iomgr/pollset_multipoller_with_poll_posix.c, - src/core/iomgr/pollset_posix.c, src/core/iomgr/pollset_set_posix.c, src/core/iomgr/pollset_set_windows.c, - src/core/iomgr/pollset_windows.c, src/core/iomgr/resolve_address_posix.c, src/core/iomgr/resolve_address_windows.c, + src/core/iomgr/endpoint_pair_windows.c, src/core/iomgr/exec_ctx.c, src/core/iomgr/fd_posix.c, + src/core/iomgr/iocp_windows.c, src/core/iomgr/iomgr.c, src/core/iomgr/iomgr_posix.c, + src/core/iomgr/iomgr_windows.c, src/core/iomgr/pollset_multipoller_with_epoll.c, + src/core/iomgr/pollset_multipoller_with_poll_posix.c, src/core/iomgr/pollset_posix.c, + src/core/iomgr/pollset_set_posix.c, src/core/iomgr/pollset_set_windows.c, src/core/iomgr/pollset_windows.c, + src/core/iomgr/resolve_address_posix.c, src/core/iomgr/resolve_address_windows.c, src/core/iomgr/sockaddr_utils.c, src/core/iomgr/socket_utils_common_posix.c, src/core/iomgr/socket_utils_linux.c, src/core/iomgr/socket_utils_posix.c, src/core/iomgr/socket_windows.c, src/core/iomgr/tcp_client_posix.c, src/core/iomgr/tcp_client_windows.c, src/core/iomgr/tcp_posix.c, src/core/iomgr/tcp_server_posix.c, diff --git a/gRPC.podspec b/gRPC.podspec index 9a6b89f26fd..9467fa013fc 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -325,6 +325,7 @@ Pod::Spec.new do |s| 'src/core/iomgr/endpoint.c', 'src/core/iomgr/endpoint_pair_posix.c', 'src/core/iomgr/endpoint_pair_windows.c', + 'src/core/iomgr/exec_ctx.c', 'src/core/iomgr/fd_posix.c', 'src/core/iomgr/iocp_windows.c', 'src/core/iomgr/iomgr.c', diff --git a/src/core/channel/channel_stack.c b/src/core/channel/channel_stack.c index 199862dddde..67ab2c535fc 100644 --- a/src/core/channel/channel_stack.c +++ b/src/core/channel/channel_stack.c @@ -120,7 +120,7 @@ grpc_channel_stack_init (grpc_exec_ctx * exec_ctx, const grpc_channel_filter ** { elems[i].filter = filters[i]; elems[i].channel_data = user_data; - elems[i].filter->init_channel_elem (&elems[i], master, args, metadata_context, i == 0, i == (exec_ctx, filter_count - 1)); + elems[i].filter->init_channel_elem (exec_ctx, &elems[i], master, args, metadata_context, i == 0, i == (filter_count - 1)); user_data += ROUND_UP_TO_ALIGNMENT_SIZE (filters[i]->sizeof_channel_data); call_size += ROUND_UP_TO_ALIGNMENT_SIZE (filters[i]->sizeof_call_data); } diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 3868db1b878..97f097d301e 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -491,10 +491,10 @@ on_lb_policy_state_changed_locked (grpc_exec_ctx * exec_ctx, lb_policy_connectiv if (w->lb_policy != w->chand->lb_policy) return; - grpc_connectivity_state_set (&w->chand->state_tracker, w->state, "lb_changed", cl); + grpc_connectivity_state_set (exec_ctx, &w->chand->state_tracker, w->state, "lb_changed"); if (w->state != GRPC_CHANNEL_FATAL_FAILURE) { - watch_lb_policy (w->chand, w->lb_policy, w->state, cl); + watch_lb_policy (exec_ctx, w->chand, w->lb_policy, w->state); } } @@ -554,7 +554,7 @@ cc_on_config_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) chand->lb_policy = lb_policy; if (lb_policy != NULL || chand->resolver == NULL /* disconnected */ ) { - grpc_closure_list_move (exec_ctx, &chand->waiting_for_config_closures); + grpc_exec_ctx_enqueue_list (exec_ctx, &chand->waiting_for_config_closures); } if (lb_policy != NULL && chand->exit_idle_when_lb_policy_arrives) { diff --git a/src/core/channel/connected_channel.c b/src/core/channel/connected_channel.c index 71d18849f2f..bdb75474fff 100644 --- a/src/core/channel/connected_channel.c +++ b/src/core/channel/connected_channel.c @@ -73,7 +73,7 @@ con_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * ele GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); GRPC_CALL_LOG_OP (GPR_INFO, elem, op); - grpc_transport_perform_stream_op (chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (exec_ctx, calld), op); + grpc_transport_perform_stream_op (exec_ctx, chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (calld), op); } static void @@ -92,7 +92,7 @@ init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void * int r; GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); - r = grpc_transport_init_stream (chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (exec_ctx, calld), server_transport_data, initial_op); + r = grpc_transport_init_stream (exec_ctx, chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (calld), server_transport_data, initial_op); GPR_ASSERT (r == 0); } @@ -103,7 +103,7 @@ destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); - grpc_transport_destroy_stream (chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (exec_ctx, calld)); + grpc_transport_destroy_stream (exec_ctx, chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (calld)); } /* Constructor for channel_data */ diff --git a/src/core/channel/http_client_filter.c b/src/core/channel/http_client_filter.c index 7c8d7c02405..3421bdb7b10 100644 --- a/src/core/channel/http_client_filter.c +++ b/src/core/channel/http_client_filter.c @@ -72,7 +72,7 @@ typedef struct channel_data typedef struct { grpc_call_element *elem; - grpc_closure_list *closure_list; + grpc_exec_ctx *exec_ctx; } client_recv_filter_args; static grpc_mdelem * @@ -87,7 +87,7 @@ client_recv_filter (void *user_data, grpc_mdelem * md) } else if (md->key == channeld->status->key) { - grpc_call_element_send_cancel (elem, a->closure_list); + grpc_call_element_send_cancel (a->exec_ctx, elem); return NULL; } else if (md->key == channeld->content_type->key) @@ -113,7 +113,7 @@ hc_on_recv (grpc_exec_ctx * exec_ctx, void *user_data, int success) continue; calld->got_initial_metadata = 1; a.elem = elem; - a.closure_list = closure_list; + a.exec_ctx = exec_ctx; grpc_metadata_batch_filter (&op->data.metadata, client_recv_filter, &a); } calld->on_done_recv->cb (exec_ctx, calld->on_done_recv->cb_arg, success); diff --git a/src/core/channel/http_server_filter.c b/src/core/channel/http_server_filter.c index 6c5902e426f..6f776b84315 100644 --- a/src/core/channel/http_server_filter.c +++ b/src/core/channel/http_server_filter.c @@ -79,7 +79,7 @@ typedef struct channel_data typedef struct { grpc_call_element *elem; - grpc_closure_list *closure_list; + grpc_exec_ctx *exec_ctx; } server_filter_args; static grpc_mdelem * @@ -134,7 +134,7 @@ server_filter (void *user_data, grpc_mdelem * md) /* swallow it and error everything out. */ /* TODO(klempner): We ought to generate more descriptive error messages on the wire here. */ - grpc_call_element_send_cancel (elem, a->closure_list); + grpc_call_element_send_cancel (a->exec_ctx, elem); return NULL; } else if (md->key == channeld->path_key) @@ -186,7 +186,7 @@ hs_on_recv (grpc_exec_ctx * exec_ctx, void *user_data, int success) continue; calld->got_initial_metadata = 1; a.elem = elem; - a.closure_list = closure_list; + a.exec_ctx = exec_ctx; grpc_metadata_batch_filter (&op->data.metadata, server_filter, &a); /* Have we seen the required http2 transport headers? (:method, :scheme, content-type, with :path and :authority covered diff --git a/src/core/client_config/lb_policy.h b/src/core/client_config/lb_policy.h index 5e6b2a5a6e1..e66dac15b0a 100644 --- a/src/core/client_config/lb_policy.h +++ b/src/core/client_config/lb_policy.h @@ -76,13 +76,13 @@ struct grpc_lb_policy_vtable #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG #define GRPC_LB_POLICY_REF(p, r) \ grpc_lb_policy_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_LB_POLICY_UNREF(p, r, cl) \ - grpc_lb_policy_unref((p), (cl), __FILE__, __LINE__, (r)) +#define GRPC_LB_POLICY_UNREF(exec_ctx, p, r) \ + grpc_lb_policy_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, grpc_closure_list * closure_list, 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); #else #define GRPC_LB_POLICY_REF(p, r) grpc_lb_policy_ref((p)) -#define GRPC_LB_POLICY_UNREF(p, r, cl) grpc_lb_policy_unref((p), (cl)) +#define GRPC_LB_POLICY_UNREF(cl, p, r) grpc_lb_policy_unref((cl), (p)) void grpc_lb_policy_ref (grpc_lb_policy * policy); void grpc_lb_policy_unref (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); #endif diff --git a/src/core/client_config/resolver.h b/src/core/client_config/resolver.h index 2497873c016..b7de00a143d 100644 --- a/src/core/client_config/resolver.h +++ b/src/core/client_config/resolver.h @@ -59,13 +59,13 @@ struct grpc_resolver_vtable #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG #define GRPC_RESOLVER_REF(p, r) grpc_resolver_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_RESOLVER_UNREF(p, r, cl) \ - grpc_resolver_unref((p), (cl), __FILE__, __LINE__, (r)) +#define GRPC_RESOLVER_UNREF(cl, p, r) \ + grpc_resolver_unref((cl), (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, grpc_closure_list * closure_list, 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, cl) grpc_resolver_unref((p), (cl)) +#define GRPC_RESOLVER_UNREF(cl, p, r) grpc_resolver_unref((cl), (p)) void grpc_resolver_ref (grpc_resolver * policy); void grpc_resolver_unref (grpc_exec_ctx * exec_ctx, grpc_resolver * policy); #endif diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index b0d71112d00..8058c9508b4 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -159,7 +159,7 @@ static int subchannel_unref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; static void connection_ref_locked (connection * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); - static grpc_subchannel *connection_unref_locked (connection * c, grpc_closure_list * closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; + static grpc_subchannel *connection_unref_locked (grpc_exec_ctx *exec_ctx, connection * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; static void subchannel_destroy (grpc_exec_ctx * exec_ctx, grpc_subchannel * c); #ifdef GRPC_SUBCHANNEL_REFCOUNT_DEBUG @@ -169,8 +169,8 @@ subchannel_unref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) subchannel_unref_locked((p), __FILE__, __LINE__, (r)) #define CONNECTION_REF_LOCKED(p, r) \ connection_ref_locked((p), __FILE__, __LINE__, (r)) -#define CONNECTION_UNREF_LOCKED(p, r, cl) \ - connection_unref_locked((p), (cl), __FILE__, __LINE__, (r)) +#define CONNECTION_UNREF_LOCKED(cl, p, r) \ + connection_unref_locked((cl), (p), __FILE__, __LINE__, (r)) #define REF_PASS_ARGS , file, line, reason #define REF_LOG(name, p) \ gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "%s: %p ref %d -> %d %s", \ @@ -182,7 +182,7 @@ subchannel_unref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) #define SUBCHANNEL_REF_LOCKED(p, r) subchannel_ref_locked((p)) #define SUBCHANNEL_UNREF_LOCKED(p, r) subchannel_unref_locked((p)) #define CONNECTION_REF_LOCKED(p, r) connection_ref_locked((p)) -#define CONNECTION_UNREF_LOCKED(p, r, cl) connection_unref_locked((p), (cl)) +#define CONNECTION_UNREF_LOCKED(cl, p, r) connection_unref_locked((cl), (p)) #define REF_PASS_ARGS #define REF_LOG(name, p) \ do { \ @@ -199,7 +199,7 @@ subchannel_unref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) static void connection_destroy (grpc_exec_ctx * exec_ctx, connection * c) { GPR_ASSERT (c->refs == 0); - grpc_channel_stack_destroy (CHANNEL_STACK_FROM_CONNECTION (exec_ctx, c)); + grpc_channel_stack_destroy (exec_ctx, CHANNEL_STACK_FROM_CONNECTION (c)); gpr_free (c); } @@ -212,7 +212,7 @@ connection_ref_locked (connection * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) } static grpc_subchannel * -connection_unref_locked (connection * c, grpc_closure_list * closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) +connection_unref_locked (grpc_exec_ctx *exec_ctx, connection * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { grpc_subchannel *destroy = NULL; UNREF_LOG ("CONNECTION", c); @@ -254,7 +254,7 @@ grpc_subchannel_ref (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) } void -grpc_subchannel_unref (grpc_subchannel * c, grpc_closure_list * closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) +grpc_subchannel_unref (grpc_exec_ctx *exec_ctx, grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { int destroy; gpr_mu_lock (&c->mu); @@ -761,13 +761,13 @@ grpc_subchannel_call_ref (grpc_subchannel_call * c GRPC_SUBCHANNEL_REF_EXTRA_ARG } void -grpc_subchannel_call_unref (grpc_subchannel_call * c, grpc_closure_list * closure_list GRPC_SUBCHANNEL_REF_EXTRA_ARGS) +grpc_subchannel_call_unref (grpc_exec_ctx *exec_ctx, grpc_subchannel_call * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { if (gpr_unref (&c->refs)) { gpr_mu *mu = &c->connection->subchannel->mu; grpc_subchannel *destroy; - grpc_call_stack_destroy (SUBCHANNEL_CALL_TO_CALL_STACK (exec_ctx, c)); + grpc_call_stack_destroy (exec_ctx, SUBCHANNEL_CALL_TO_CALL_STACK (c)); gpr_mu_lock (mu); destroy = CONNECTION_UNREF_LOCKED (exec_ctx, c->connection, "call"); gpr_mu_unlock (mu); diff --git a/src/core/client_config/subchannel.h b/src/core/client_config/subchannel.h index 2d6328db863..b87d6f55ff7 100644 --- a/src/core/client_config/subchannel.h +++ b/src/core/client_config/subchannel.h @@ -47,27 +47,27 @@ typedef struct grpc_subchannel_args grpc_subchannel_args; #ifdef GRPC_SUBCHANNEL_REFCOUNT_DEBUG #define GRPC_SUBCHANNEL_REF(p, r) \ grpc_subchannel_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_UNREF(p, r, cl) \ - grpc_subchannel_unref((p), (cl), __FILE__, __LINE__, (r)) +#define GRPC_SUBCHANNEL_UNREF(cl, p, r) \ + grpc_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, cl) \ - grpc_subchannel_call_unref((p), (cl), __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_UNREF(p, r, cl) grpc_subchannel_unref((p), (cl)) +#define GRPC_SUBCHANNEL_UNREF(cl, p, r) grpc_subchannel_unref((cl), (p)) #define GRPC_SUBCHANNEL_CALL_REF(p, r) grpc_subchannel_call_ref((p)) -#define GRPC_SUBCHANNEL_CALL_UNREF(p, r, cl) \ - grpc_subchannel_call_unref((p), (cl)) +#define GRPC_SUBCHANNEL_CALL_UNREF(cl, p, r) \ + grpc_subchannel_call_unref((cl), (p)) #define GRPC_SUBCHANNEL_REF_EXTRA_ARGS #endif void grpc_subchannel_ref (grpc_subchannel * channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void grpc_subchannel_unref (grpc_subchannel * channel, grpc_closure_list * closure_list 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_call_ref (grpc_subchannel_call * call GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void grpc_subchannel_call_unref (grpc_subchannel_call * call, grpc_closure_list * closure_list 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 call (possibly asynchronously) */ void grpc_subchannel_create_call (grpc_exec_ctx * exec_ctx, grpc_subchannel * subchannel, grpc_pollset * pollset, grpc_subchannel_call ** target, grpc_closure * notify); diff --git a/src/core/httpcli/httpcli.c b/src/core/httpcli/httpcli.c index b9dc350df9c..e2763e00447 100644 --- a/src/core/httpcli/httpcli.c +++ b/src/core/httpcli/httpcli.c @@ -73,7 +73,7 @@ static grpc_httpcli_get_override g_get_override = NULL; static grpc_httpcli_post_override g_post_override = NULL; static void -plaintext_handshake (void *arg, grpc_endpoint * endpoint, const char *host, void (*on_done) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list)) +plaintext_handshake (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint, const char *host, void (*on_done) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint)) { on_done (exec_ctx, arg, endpoint); } @@ -155,7 +155,7 @@ on_read (grpc_exec_ctx * exec_ctx, void *user_data, int success) } else { - finish (req, grpc_httpcli_parser_eof (exec_ctx, &req->parser)); + finish (exec_ctx, req, grpc_httpcli_parser_eof (&req->parser)); } } @@ -226,7 +226,7 @@ next_address (grpc_exec_ctx * exec_ctx, internal_request * req) } addr = &req->addresses->addrs[req->next_address++]; grpc_closure_init (&req->connected, on_connected, req); - grpc_tcp_client_connect (&req->connected, &req->ep, &req->context->pollset_set, (exec_ctx, struct sockaddr *) &addr->addr, addr->len, req->deadline); + grpc_tcp_client_connect (exec_ctx, &req->connected, &req->ep, &req->context->pollset_set, (struct sockaddr *) &addr->addr, addr->len, req->deadline); } static void @@ -276,7 +276,7 @@ grpc_httpcli_get (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, grpc return; } gpr_asprintf (&name, "HTTP:GET:%s:%s", request->host, request->path); - internal_request_begin (context, pollset, request, deadline, on_response, user_data, name, grpc_httpcli_format_get_request (exec_ctx, request)); + internal_request_begin (exec_ctx, context, pollset, request, deadline, on_response, user_data, name, grpc_httpcli_format_get_request (request)); gpr_free (name); } @@ -289,7 +289,7 @@ grpc_httpcli_post (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, grp return; } gpr_asprintf (&name, "HTTP:POST:%s:%s", request->host, request->path); - internal_request_begin (context, pollset, request, deadline, on_response, user_data, name, grpc_httpcli_format_post_request (exec_ctx, request, body_bytes, body_size)); + internal_request_begin (exec_ctx, context, pollset, request, deadline, on_response, user_data, name, grpc_httpcli_format_post_request (request, body_bytes, body_size)); gpr_free (name); } diff --git a/src/core/httpcli/httpcli.h b/src/core/httpcli/httpcli.h index 021d619900f..9c489721b6e 100644 --- a/src/core/httpcli/httpcli.h +++ b/src/core/httpcli/httpcli.h @@ -64,7 +64,7 @@ typedef struct grpc_httpcli_context typedef struct { const char *default_port; - void (*handshake) (void *arg, grpc_endpoint * endpoint, const char *host, void (*on_done) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list)); + void (*handshake) (grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint * endpoint, const char *host, void (*on_done) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint)); } grpc_httpcli_handshaker; extern const grpc_httpcli_handshaker grpc_httpcli_plaintext; diff --git a/src/core/httpcli/httpcli_security_connector.c b/src/core/httpcli/httpcli_security_connector.c index a6ecfa993b3..a9b9a5991e9 100644 --- a/src/core/httpcli/httpcli_security_connector.c +++ b/src/core/httpcli/httpcli_security_connector.c @@ -164,7 +164,7 @@ on_secure_transport_setup_done (grpc_exec_ctx * exec_ctx, void *rp, grpc_securit } static void -ssl_handshake (void *arg, grpc_endpoint * tcp, const char *host, void (*on_done) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint, grpc_closure_list * closure_list)) +ssl_handshake (grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint * tcp, const char *host, void (*on_done) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint)) { grpc_channel_security_connector *sc = NULL; const unsigned char *pem_root_certs = NULL; diff --git a/src/core/iomgr/alarm.c b/src/core/iomgr/alarm.c index 6e56ccacf5e..31de5511519 100644 --- a/src/core/iomgr/alarm.c +++ b/src/core/iomgr/alarm.c @@ -105,10 +105,10 @@ grpc_alarm_list_init (gpr_timespec now) } void -grpc_alarm_list_shutdown (grpc_closure_list * closure_list) +grpc_alarm_list_shutdown (grpc_exec_ctx *exec_ctx) { int i; - run_some_expired_alarms (gpr_inf_future (exec_ctx, g_clock_type), NULL, 0); + run_some_expired_alarms (exec_ctx, gpr_inf_future (g_clock_type), NULL, 0); for (i = 0; i < NUM_SHARDS; i++) { shard_type *shard = &g_shards[i]; @@ -373,7 +373,7 @@ int grpc_alarm_check (grpc_exec_ctx * exec_ctx, gpr_timespec now, gpr_timespec * next) { GPR_ASSERT (now.clock_type == g_clock_type); - return run_some_expired_alarms (now, next, gpr_time_cmp (now, gpr_inf_future (exec_ctx, now.clock_type)) != 0); + return run_some_expired_alarms (exec_ctx, now, next, gpr_time_cmp (now, gpr_inf_future (now.clock_type)) != 0); } gpr_timespec diff --git a/src/core/iomgr/alarm_internal.h b/src/core/iomgr/alarm_internal.h index 18ab48746fd..398124d83bc 100644 --- a/src/core/iomgr/alarm_internal.h +++ b/src/core/iomgr/alarm_internal.h @@ -51,7 +51,7 @@ int grpc_alarm_check (grpc_exec_ctx * exec_ctx, gpr_timespec now, gpr_timespec * next); void grpc_alarm_list_init (gpr_timespec now); -void grpc_alarm_list_shutdown (grpc_closure_list * closure_list); +void grpc_alarm_list_shutdown (grpc_exec_ctx * exec_ctx); gpr_timespec grpc_alarm_list_next_timeout (void); diff --git a/src/core/iomgr/closure.c b/src/core/iomgr/closure.c index cd02aac75e6..4c1a1233d6c 100644 --- a/src/core/iomgr/closure.c +++ b/src/core/iomgr/closure.c @@ -59,22 +59,6 @@ grpc_closure_list_add (grpc_closure_list * closure_list, grpc_closure * closure, closure_list->tail = closure; } -void -grpc_closure_list_run (grpc_closure_list * closure_list) -{ - while (!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; - c->cb (exec_ctx, c->cb_arg, c->success); - c = next; - } - } -} - int grpc_closure_list_empty (grpc_closure_list closure_list) { diff --git a/src/core/iomgr/closure.h b/src/core/iomgr/closure.h index 90d9e328a10..e76e157f6af 100644 --- a/src/core/iomgr/closure.h +++ b/src/core/iomgr/closure.h @@ -39,6 +39,10 @@ struct grpc_closure; typedef struct grpc_closure grpc_closure; +/* forward declaration for exec_ctx.h */ +struct grpc_exec_ctx; +typedef struct grpc_exec_ctx grpc_exec_ctx; + typedef struct grpc_closure_list { grpc_closure *head; @@ -77,7 +81,6 @@ void grpc_closure_init (grpc_closure * closure, grpc_iomgr_cb_func cb, void *cb_ { NULL, NULL } void grpc_closure_list_add (grpc_closure_list * list, grpc_closure * closure, int success); -void grpc_closure_list_run (grpc_closure_list * list); void grpc_closure_list_move (grpc_closure_list * src, grpc_closure_list * dst); int grpc_closure_list_empty (grpc_closure_list list); diff --git a/src/core/iomgr/exec_ctx.c b/src/core/iomgr/exec_ctx.c new file mode 100644 index 00000000000..d5a8cf44755 --- /dev/null +++ b/src/core/iomgr/exec_ctx.c @@ -0,0 +1,62 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include "src/core/iomgr/exec_ctx.h" + +void +grpc_exec_ctx_flush (grpc_exec_ctx *exec_ctx) +{ + while (!grpc_closure_list_empty (exec_ctx->closure_list)) + { + grpc_closure *c = closure_list->head; + closure_list->head = closure_list->tail = NULL; + while (c != NULL) + { + grpc_closure *next = c->next; + c->cb (exec_ctx, c->cb_arg, c->success); + c = next; + } + } +} + +void grpc_exec_ctx_finish(grpc_exec_ctx *exec_ctx) { + grpc_exec_ctx_flush(exec_ctx); +} + +void grpc_exec_ctx_enqueue(grpc_exec_ctx *exec_ctx, grpc_closure *closure, int success) { + grpc_closure_list_add(&exec_ctx->closure_list, closure, success); +} + +void grpc_exec_ctx_enqueue_list(grpc_exec_ctx *exec_ctx, grpc_closure_list *list) { + grpc_closure_list_move(list, &exec_ctx->closure_list); +} diff --git a/src/core/iomgr/exec_ctx.h b/src/core/iomgr/exec_ctx.h index 4d30feb26b7..ff084abeba6 100644 --- a/src/core/iomgr/exec_ctx.h +++ b/src/core/iomgr/exec_ctx.h @@ -36,4 +36,15 @@ #include "src/core/iomgr/closure.h" +struct grpc_exec_ctx { + grpc_closure_list closure_list; +}; + +#define GRPC_EXEC_CTX_INIT { GRPC_CLOSURE_LIST_INIT } + +void grpc_exec_ctx_finish(grpc_exec_ctx *exec_ctx); +void grpc_exec_ctx_flush(grpc_exec_ctx *exec_ctx); +void grpc_exec_ctx_enqueue(grpc_exec_ctx *exec_ctx, grpc_closure *closure, int success); +void grpc_exec_ctx_enqueue_list(grpc_exec_ctx *exec_ctx, grpc_closure_list *list); + #endif diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index 6a0f6c49378..30da17fdd8f 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -113,7 +113,7 @@ grpc_iomgr_shutdown (void) } last_warning_time = gpr_now (GPR_CLOCK_REALTIME); } - if (grpc_alarm_check (gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC), NULL)) + if (grpc_alarm_check (&exec_ctx, gpr_inf_future (GPR_CLOCK_MONOTONIC), NULL)) { gpr_mu_unlock (&g_mu); grpc_exec_ctx_finish (&exec_ctx); @@ -142,7 +142,7 @@ grpc_iomgr_shutdown (void) } gpr_mu_unlock (&g_mu); - grpc_alarm_list_shutdown (&closure_list); + grpc_alarm_list_shutdown (&exec_ctx); grpc_exec_ctx_finish (&exec_ctx); /* ensure all threads have left g_mu */ diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 2f08dd0f70f..fedc0d8aed6 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -217,7 +217,7 @@ grpc_pollset_work (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollse grpc_wakeup_fd_init (&worker->wakeup_fd); if (!grpc_pollset_has_workers (pollset) && !grpc_closure_list_empty (pollset->idle_jobs)) { - grpc_closure_list_move (exec_ctx, &pollset->idle_jobs); + grpc_exec_ctx_enqueue_list (exec_ctx, &pollset->idle_jobs); goto done; } if (grpc_alarm_check (exec_ctx, now, &deadline)) @@ -251,7 +251,7 @@ grpc_pollset_work (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollse done: if (!locked) { - grpc_closure_list_run (closure_list); + grpc_exec_ctx_flush (exec_ctx); gpr_mu_lock (&pollset->mu); locked = 1; } @@ -271,7 +271,7 @@ done: pollset->called_shutdown = 1; gpr_mu_unlock (&pollset->mu); finish_shutdown (exec_ctx, pollset); - grpc_closure_list_run (closure_list); + 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 * grpc_pollset_work. @@ -397,7 +397,7 @@ basic_do_promote (grpc_exec_ctx * exec_ctx, void *args, int success) if (fds[0] && !grpc_fd_is_orphaned (fds[0])) { - grpc_platform_become_multipoller (pollset, fds, GPR_ARRAY_SIZE (exec_ctx, fds)); + grpc_platform_become_multipoller (exec_ctx, pollset, fds, GPR_ARRAY_SIZE (fds)); GRPC_FD_UNREF (fds[0], "basicpoll"); } else @@ -417,8 +417,6 @@ basic_do_promote (grpc_exec_ctx * exec_ctx, void *args, int success) /* Matching ref in basic_pollset_add_fd */ GRPC_FD_UNREF (fd, "basicpoll_add"); - - grpc_closure_list_run (closure_list); } static void @@ -445,7 +443,7 @@ basic_pollset_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd } else if (!grpc_fd_is_orphaned (fds[0])) { - grpc_platform_become_multipoller (pollset, fds, GPR_ARRAY_SIZE (exec_ctx, fds)); + grpc_platform_become_multipoller (exec_ctx, pollset, fds, GPR_ARRAY_SIZE (fds)); GRPC_FD_UNREF (fds[0], "basicpoll"); } else diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c index e3cecd3a361..3949ce6f24e 100644 --- a/src/core/iomgr/tcp_client_posix.c +++ b/src/core/iomgr/tcp_client_posix.c @@ -315,7 +315,7 @@ grpc_tcp_client_connect (grpc_exec_ctx * exec_ctx, grpc_closure * closure, grpc_ } gpr_mu_lock (&ac->mu); - grpc_alarm_init (&ac->alarm, gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC), tc_on_alarm, ac, gpr_now (exec_ctx, GPR_CLOCK_MONOTONIC)); + grpc_alarm_init (exec_ctx, &ac->alarm, gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC), tc_on_alarm, ac, gpr_now (GPR_CLOCK_MONOTONIC)); grpc_fd_notify_on_write (exec_ctx, ac->fd, &ac->write_closure); gpr_mu_unlock (&ac->mu); diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c index b24bc2e11e4..cd0769a48bb 100644 --- a/src/core/iomgr/tcp_posix.c +++ b/src/core/iomgr/tcp_posix.c @@ -95,10 +95,8 @@ typedef struct char *peer_string; } grpc_tcp; -static void tcp_handle_read (void *arg /* grpc_tcp */ , int success, - grpc_closure_list * closure_list); -static void tcp_handle_write (void *arg /* grpc_tcp */ , int success, - grpc_closure_list * closure_list); +static void tcp_handle_read (grpc_exec_ctx * exec_ctx, void *arg /* grpc_tcp */ , int success); +static void tcp_handle_write (grpc_exec_ctx * exec_ctx, void *arg /* grpc_tcp */ , int success); static void tcp_shutdown (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep) @@ -117,11 +115,11 @@ tcp_free (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) /*#define GRPC_TCP_REFCOUNT_DEBUG*/ #ifdef GRPC_TCP_REFCOUNT_DEBUG -#define TCP_UNREF(tcp, reason, cl) \ - tcp_unref((tcp), (cl), (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, grpc_closure_list * closure_list, const char *reason, const char *file, int line) +tcp_unref (grpc_exec_ctx *exec_ctx, grpc_tcp * tcp, const char *reason, const char *file, int line) { gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "TCP unref %p : %s %d -> %d", tcp, reason, tcp->refcount.count, tcp->refcount.count - 1); if (gpr_unref (&tcp->refcount)) @@ -137,7 +135,7 @@ tcp_ref (grpc_tcp * tcp, const char *reason, const char *file, int line) gpr_ref (&tcp->refcount); } #else -#define TCP_UNREF(tcp, reason, cl) tcp_unref((tcp), (cl)) +#define TCP_UNREF(cl, tcp, reason) tcp_unref((cl), (tcp)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) static void tcp_unref (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) @@ -273,8 +271,7 @@ tcp_continue_read (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) } static void -tcp_handle_read (void *arg /* grpc_tcp */ , int success, - grpc_closure_list * closure_list) +tcp_handle_read (grpc_exec_ctx * exec_ctx, void *arg /* grpc_tcp */ , int success) { grpc_tcp *tcp = (grpc_tcp *) arg; GPR_ASSERT (!tcp->finished_edge); @@ -401,8 +398,7 @@ tcp_flush (grpc_tcp * tcp) } static void -tcp_handle_write (void *arg /* grpc_tcp */ , int success, - grpc_closure_list * closure_list) +tcp_handle_write (grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */ , int success) { grpc_tcp *tcp = (grpc_tcp *) arg; flush_result status; diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c index 5e83b8b3fd4..79e8039c799 100644 --- a/src/core/iomgr/tcp_server_posix.c +++ b/src/core/iomgr/tcp_server_posix.c @@ -387,7 +387,7 @@ on_read (grpc_exec_ctx * exec_ctx, void *arg, int success) { grpc_pollset_add_fd (exec_ctx, sp->server->pollsets[i], fdobj); } - sp->server->on_accept_cb (sp->server->on_accept_cb_arg, grpc_tcp_create (exec_ctx, fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str)); + sp->server->on_accept_cb (exec_ctx, sp->server->on_accept_cb_arg, grpc_tcp_create (fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str)); gpr_free (name); gpr_free (addr_str); diff --git a/src/core/iomgr/workqueue.h b/src/core/iomgr/workqueue.h index c5d7c64e835..0790fdb006b 100644 --- a/src/core/iomgr/workqueue.h +++ b/src/core/iomgr/workqueue.h @@ -37,6 +37,7 @@ #include "src/core/iomgr/iomgr.h" #include "src/core/iomgr/pollset.h" #include "src/core/iomgr/closure.h" +#include "src/core/iomgr/exec_ctx.h" #ifdef GPR_POSIX_SOCKET #include "src/core/iomgr/workqueue_posix.h" @@ -51,7 +52,7 @@ struct grpc_workqueue; typedef struct grpc_workqueue grpc_workqueue; /** Create a work queue */ -grpc_workqueue *grpc_workqueue_create (grpc_closure_list * closure_list); +grpc_workqueue *grpc_workqueue_create (grpc_exec_ctx *exec_ctx); void grpc_workqueue_flush (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue); @@ -59,13 +60,13 @@ void grpc_workqueue_flush (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue) #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG #define GRPC_WORKQUEUE_REF(p, r) \ grpc_workqueue_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_WORKQUEUE_UNREF(p, r, cl) \ - grpc_workqueue_unref((p), (cl), __FILE__, __LINE__, (r)) +#define GRPC_WORKQUEUE_UNREF(cl, p, r) \ + grpc_workqueue_unref((cl), (p), __FILE__, __LINE__, (r)) void grpc_workqueue_ref (grpc_workqueue * workqueue, const char *file, int line, const char *reason); -void grpc_workqueue_unref (grpc_workqueue * workqueue, grpc_closure_list * closure_list, const char *file, int line, const char *reason); +void grpc_workqueue_unref (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue, const char *file, int line, const char *reason); #else #define GRPC_WORKQUEUE_REF(p, r) grpc_workqueue_ref((p)) -#define GRPC_WORKQUEUE_UNREF(p, r, cl) grpc_workqueue_unref((p), (cl)) +#define GRPC_WORKQUEUE_UNREF(cl, p, r) grpc_workqueue_unref((cl), (p)) void grpc_workqueue_ref (grpc_workqueue * workqueue); void grpc_workqueue_unref (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue); #endif diff --git a/src/core/iomgr/workqueue_posix.c b/src/core/iomgr/workqueue_posix.c index a407fb61a46..91ac0f32e4c 100644 --- a/src/core/iomgr/workqueue_posix.c +++ b/src/core/iomgr/workqueue_posix.c @@ -48,7 +48,7 @@ static void on_readable (grpc_exec_ctx * exec_ctx, void *arg, int success); grpc_workqueue * -grpc_workqueue_create (grpc_closure_list * closure_list) +grpc_workqueue_create (grpc_exec_ctx *exec_ctx) { char name[32]; grpc_workqueue *workqueue = gpr_malloc (sizeof (grpc_workqueue)); @@ -85,7 +85,7 @@ grpc_workqueue_ref (grpc_workqueue * workqueue) #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG void -grpc_workqueue_unref (grpc_workqueue * workqueue, grpc_closure_list * closure_list, const char *file, int line, const char *reason) +grpc_workqueue_unref (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue, const char *file, int line, const char *reason) { gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p unref %d -> %d %s", workqueue, (int) workqueue->refs.count, (int) workqueue->refs.count - 1, reason); #else @@ -109,7 +109,7 @@ void grpc_workqueue_flush (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue) { gpr_mu_lock (&workqueue->mu); - grpc_closure_list_move (exec_ctx, &workqueue->closure_list); + grpc_closure_list_move (&exec_ctx->closure_list, &workqueue->closure_list); gpr_mu_unlock (&workqueue->mu); } @@ -130,7 +130,7 @@ on_readable (grpc_exec_ctx * exec_ctx, void *arg, int success) else { gpr_mu_lock (&workqueue->mu); - grpc_closure_list_move (exec_ctx, &workqueue->closure_list); + grpc_closure_list_move (&exec_ctx->closure_list, &workqueue->closure_list); grpc_wakeup_fd_consume_wakeup (&workqueue->wakeup_fd); gpr_mu_unlock (&workqueue->mu); grpc_fd_notify_on_read (exec_ctx, workqueue->wakeup_read_fd, &workqueue->read_closure); diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index 47dfcf29c89..71dfb258258 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -676,7 +676,7 @@ oauth2_token_fetcher_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_creden } else { - c->fetch_func (grpc_credentials_metadata_request_create (creds, cb, user_data), &c->httpcli_context, pollset, on_oauth2_token_fetcher_http_response, gpr_time_add (gpr_now (exec_ctx, GPR_CLOCK_REALTIME), refresh_threshold)); + c->fetch_func (exec_ctx, grpc_credentials_metadata_request_create (creds, cb, user_data), &c->httpcli_context, pollset, on_oauth2_token_fetcher_http_response, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), refresh_threshold)); } } @@ -755,7 +755,7 @@ refresh_token_fetch_oauth2 (grpc_exec_ctx * exec_ctx, grpc_credentials_metadata_ request.hdr_count = 1; request.hdrs = &header; request.handshaker = &grpc_httpcli_ssl; - grpc_httpcli_post (httpcli_context, pollset, &request, body, strlen (exec_ctx, body), deadline, response_cb, metadata_req); + grpc_httpcli_post (exec_ctx,httpcli_context, pollset, &request, body, strlen ( body), deadline, response_cb, metadata_req); gpr_free (body); } @@ -1075,7 +1075,6 @@ composite_metadata_cb (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentia /* We're done!. */ ctx->cb (exec_ctx, ctx->user_data, ctx->md_elems->entries, ctx->md_elems->num_entries, GRPC_CREDENTIALS_OK); composite_md_context_destroy (ctx); - grpc_closure_list_run (closure_list); } static void diff --git a/src/core/security/google_default_credentials.c b/src/core/security/google_default_credentials.c index eb88a4bfc1b..945cb42427c 100644 --- a/src/core/security/google_default_credentials.c +++ b/src/core/security/google_default_credentials.c @@ -121,7 +121,7 @@ is_stack_running_on_compute_engine (void) grpc_httpcli_context_init (&context); - grpc_httpcli_get (&context, &detector.pollset, &request, gpr_time_add (gpr_now (&exec_ctx, GPR_CLOCK_REALTIME), max_detection_delay), on_compute_engine_detection_http_response, &detector); + grpc_httpcli_get (&exec_ctx, &context, &detector.pollset, &request, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), max_detection_delay), on_compute_engine_detection_http_response, &detector); grpc_exec_ctx_finish (&exec_ctx); @@ -131,7 +131,7 @@ is_stack_running_on_compute_engine (void) while (!detector.is_done) { grpc_pollset_worker worker; - grpc_pollset_work (&detector.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); + grpc_pollset_work (&exec_ctx, &detector.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC)); } gpr_mu_unlock (GRPC_POLLSET_MU (&detector.pollset)); diff --git a/src/core/security/jwt_verifier.c b/src/core/security/jwt_verifier.c index 7a45ff9343e..bc1e3f3b547 100644 --- a/src/core/security/jwt_verifier.c +++ b/src/core/security/jwt_verifier.c @@ -774,7 +774,7 @@ on_openid_config_retrieved (grpc_exec_ctx * exec_ctx, void *user_data, const grp { *(req.host + (req.path - jwks_uri)) = '\0'; } - grpc_httpcli_get (&ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add (gpr_now (exec_ctx, GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), on_keys_retrieved, ctx); + grpc_httpcli_get (exec_ctx, &ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), on_keys_retrieved, ctx); grpc_json_destroy (json); gpr_free (req.host); return; @@ -893,7 +893,7 @@ retrieve_key_and_verify (grpc_exec_ctx * exec_ctx, verifier_cb_ctx * ctx) http_cb = on_openid_config_retrieved; } - grpc_httpcli_get (&ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add (gpr_now (exec_ctx, GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), http_cb, ctx); + grpc_httpcli_get (exec_ctx, &ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), http_cb, ctx); gpr_free (req.host); gpr_free (req.path); return; @@ -943,7 +943,7 @@ grpc_jwt_verifier_verify (grpc_exec_ctx * exec_ctx, grpc_jwt_verifier * verifier signature = grpc_base64_decode (cur, 1); if (GPR_SLICE_IS_EMPTY (signature)) goto error; - retrieve_key_and_verify (verifier_cb_ctx_create (exec_ctx, verifier, pollset, header, claims, audience, signature, jwt, signed_jwt_len, user_data, cb)); + 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: diff --git a/src/core/security/secure_endpoint.c b/src/core/security/secure_endpoint.c index 97d1d2a1415..642068c8c90 100644 --- a/src/core/security/secure_endpoint.c +++ b/src/core/security/secure_endpoint.c @@ -85,8 +85,8 @@ destroy (grpc_exec_ctx * exec_ctx, secure_endpoint * secure_ep) /*#define GRPC_SECURE_ENDPOINT_REFCOUNT_DEBUG*/ #ifdef GRPC_SECURE_ENDPOINT_REFCOUNT_DEBUG -#define SECURE_ENDPOINT_UNREF(ep, reason, cl) \ - secure_endpoint_unref((ep), (cl), (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 @@ -106,7 +106,7 @@ secure_endpoint_ref (secure_endpoint * ep, const char *reason, const char *file, gpr_ref (&ep->ref); } #else -#define SECURE_ENDPOINT_UNREF(ep, reason, cl) secure_endpoint_unref((ep), (cl)) +#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 (grpc_exec_ctx * exec_ctx, secure_endpoint * ep) diff --git a/src/core/security/security_connector.c b/src/core/security/security_connector.c index 729de29d492..f720f5d7284 100644 --- a/src/core/security/security_connector.c +++ b/src/core/security/security_connector.c @@ -315,13 +315,13 @@ fake_channel_check_call_host (grpc_exec_ctx * exec_ctx, grpc_channel_security_co static void fake_channel_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) { - grpc_do_security_handshake (tsi_create_fake_handshaker (exec_ctx, 1), sc, nonsecure_endpoint, cb, user_data); + grpc_do_security_handshake (exec_ctx, tsi_create_fake_handshaker (1), sc, nonsecure_endpoint, cb, user_data); } static void fake_server_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) { - grpc_do_security_handshake (tsi_create_fake_handshaker (exec_ctx, 0), sc, nonsecure_endpoint, cb, user_data); + grpc_do_security_handshake (exec_ctx, tsi_create_fake_handshaker (0), sc, nonsecure_endpoint, cb, user_data); } static grpc_security_connector_vtable fake_channel_vtable = { diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index 98d9e2a8760..336d59f624c 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -104,7 +104,7 @@ setup_transport (grpc_exec_ctx * exec_ctx, void *statep, grpc_transport * transp args_to_add[0] = grpc_security_connector_to_arg (state->sc); args_to_add[1] = grpc_auth_metadata_processor_to_arg (&state->creds->processor); args_copy = grpc_channel_args_copy_and_add (grpc_server_get_channel_args (state->server), args_to_add, GPR_ARRAY_SIZE (args_to_add)); - grpc_server_setup_transport (state->server, transport, extra_filters, GPR_ARRAY_SIZE (exec_ctx, extra_filters), mdctx, args_copy); + grpc_server_setup_transport (exec_ctx, state->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, args_copy); grpc_channel_args_destroy (args_copy); } @@ -146,7 +146,7 @@ on_secure_handshake_done (grpc_exec_ctx * exec_ctx, void *statep, grpc_security_ if (!state->is_shutdown) { mdctx = grpc_mdctx_create (); - transport = grpc_create_chttp2_transport (grpc_server_get_channel_args (exec_ctx, state->server), secure_endpoint, mdctx, 0); + transport = grpc_create_chttp2_transport (exec_ctx, grpc_server_get_channel_args (state->server), secure_endpoint, mdctx, 0); setup_transport (exec_ctx, state, transport, mdctx); grpc_chttp2_transport_start_reading (exec_ctx, transport, NULL, 0); } diff --git a/src/core/surface/call.c b/src/core/surface/call.c index 6da5272ddcd..418c75efd27 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -355,7 +355,7 @@ grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 pr GRPC_CALL_INTERNAL_REF (call, "receiving"); initial_op_ptr = &initial_op; } - grpc_call_stack_init (channel_stack, server_transport_data, initial_op_ptr, CALL_STACK_FROM_CALL (&exec_ctx, call)); + grpc_call_stack_init (&exec_ctx, channel_stack, server_transport_data, initial_op_ptr, CALL_STACK_FROM_CALL (call)); if (parent_call != NULL) { GRPC_CALL_INTERNAL_REF (parent_call, "child"); @@ -473,7 +473,7 @@ destroy_call (grpc_exec_ctx * exec_ctx, grpc_call * call) { size_t i; grpc_call *c = call; - grpc_call_stack_destroy (CALL_STACK_FROM_CALL (exec_ctx, c)); + grpc_call_stack_destroy (exec_ctx, CALL_STACK_FROM_CALL (c)); GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, c->channel, "call"); gpr_mu_destroy (&c->mu); gpr_mu_destroy (&c->completion_mu); @@ -1554,7 +1554,7 @@ set_deadline_alarm (grpc_exec_ctx * exec_ctx, grpc_call * call, gpr_timespec dea GRPC_CALL_INTERNAL_REF (call, "alarm"); call->have_alarm = 1; call->send_deadline = gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC); - grpc_alarm_init (&call->alarm, call->send_deadline, call_alarm, call, gpr_now (exec_ctx, GPR_CLOCK_MONOTONIC)); + grpc_alarm_init (exec_ctx, &call->alarm, call->send_deadline, call_alarm, call, gpr_now (GPR_CLOCK_MONOTONIC)); } /* we offset status by a small amount when storing it into transport metadata @@ -1714,13 +1714,13 @@ set_cancelled_value (grpc_status_code status, void *dest) static void finish_batch (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *tag) { - grpc_cq_end_op (call->cq, tag, success, done_completion, call, allocate_completion (exec_ctx, call)); + grpc_cq_end_op (exec_ctx,call->cq, tag, success, done_completion, call, allocate_completion ( call)); } static void finish_batch_with_close (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *tag) { - grpc_cq_end_op (call->cq, tag, 1, done_completion, call, allocate_completion (exec_ctx, call)); + grpc_cq_end_op (exec_ctx,call->cq, tag, 1, done_completion, call, allocate_completion ( call)); } static int @@ -1740,7 +1740,7 @@ grpc_call_start_batch (grpc_call * call, const grpc_op * ops, size_t nops, void size_t out; const grpc_op *op; grpc_ioreq *req; - void (*finish_func) (grpc_call *, int, void *, grpc_closure_list *) = finish_batch; + void (*finish_func) (grpc_exec_ctx *, grpc_call *, int, void *) = finish_batch; grpc_call_error error; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; @@ -1756,7 +1756,7 @@ grpc_call_start_batch (grpc_call * call, const grpc_op * ops, size_t nops, void { grpc_cq_begin_op (call->cq); GRPC_CALL_INTERNAL_REF (call, "completion"); - grpc_cq_end_op (call->cq, tag, 1, done_completion, call, allocate_completion (&exec_ctx, call)); + grpc_cq_end_op (&exec_ctx, call->cq, tag, 1, done_completion, call, allocate_completion (call)); error = GRPC_CALL_OK; goto done; } diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index a6478c39791..a5816c3fb39 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -187,7 +187,7 @@ grpc_channel_create_from_filters (grpc_exec_ctx * exec_ctx, const char *target, gpr_free (default_authority); } - grpc_channel_stack_init (filters, num_filters, channel, args, channel->metadata_context, CHANNEL_STACK_FROM_CHANNEL (exec_ctx, channel)); + grpc_channel_stack_init (exec_ctx, filters, num_filters, channel, args, channel->metadata_context, CHANNEL_STACK_FROM_CHANNEL (channel)); return channel; } @@ -265,7 +265,7 @@ static void destroy_channel (grpc_exec_ctx * exec_ctx, grpc_channel * channel) { size_t i; - grpc_channel_stack_destroy (CHANNEL_STACK_FROM_CHANNEL (exec_ctx, channel)); + grpc_channel_stack_destroy (exec_ctx,CHANNEL_STACK_FROM_CHANNEL ( channel)); for (i = 0; i < NUM_CACHED_STATUS_ELEMS; i++) { GRPC_MDELEM_UNREF (channel->grpc_status_elem[i]); diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index f9195a4ccb6..a9fc1cf59fa 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -127,7 +127,7 @@ partly_done (grpc_exec_ctx * exec_ctx, state_watcher * w, int due_to_completion) { w->removed = 1; client_channel_elem = grpc_channel_stack_last_element (grpc_channel_get_channel_stack (w->channel)); - grpc_client_channel_del_interested_party (client_channel_elem, grpc_cq_pollset (exec_ctx, w->cq)); + grpc_client_channel_del_interested_party (exec_ctx, client_channel_elem, grpc_cq_pollset (w->cq)); } gpr_mu_unlock (&w->mu); if (due_to_completion) @@ -195,17 +195,17 @@ grpc_channel_watch_connectivity_state (grpc_channel * channel, grpc_connectivity w->tag = tag; w->channel = channel; - grpc_alarm_init (&w->alarm, gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC), timeout_complete, w, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC)); + grpc_alarm_init (&exec_ctx, &w->alarm, gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC), timeout_complete, w, gpr_now (GPR_CLOCK_MONOTONIC)); if (client_channel_elem->filter != &grpc_client_channel_filter) { gpr_log (GPR_ERROR, "grpc_channel_watch_connectivity_state called on something that is " "not a client channel, but '%s'", client_channel_elem->filter->name); - grpc_closure_list_add (&closure_list, &w->on_complete, 1); + grpc_exec_ctx_enqueue(&exec_ctx, &w->on_complete ,1); } else { GRPC_CHANNEL_INTERNAL_REF (channel, "watch_connectivity"); - grpc_client_channel_add_interested_party (client_channel_elem, grpc_cq_pollset (&exec_ctx, cq)); + grpc_client_channel_add_interested_party (&exec_ctx, client_channel_elem, grpc_cq_pollset (cq)); grpc_client_channel_watch_connectivity_state (&exec_ctx, client_channel_elem, &w->state, &w->on_complete); } diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index afd5c4d0840..1fd1479a664 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -224,7 +224,7 @@ grpc_insecure_channel_create (const char *target, const grpc_channel_args * args return NULL; } - grpc_client_channel_set_resolver (grpc_channel_get_channel_stack (&exec_ctx, channel), resolver); + grpc_client_channel_set_resolver (&exec_ctx, grpc_channel_get_channel_stack (channel), resolver); GRPC_RESOLVER_UNREF (&exec_ctx, resolver, "create"); grpc_subchannel_factory_unref (&exec_ctx, &f->base); diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index 8867a2deb5a..56dceec30c1 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -144,7 +144,7 @@ grpc_cq_begin_op (grpc_completion_queue * cc) event, then enter shutdown mode */ /* Queue a GRPC_OP_COMPLETED operation */ void -grpc_cq_end_op (grpc_completion_queue * cc, void *tag, int success, void (*done) (grpc_exec_ctx * exec_ctx, void *done_arg, grpc_cq_completion * storage, grpc_closure_list * closure_list), void *done_arg, grpc_cq_completion * storage) +grpc_cq_end_op (grpc_exec_ctx * exec_ctx,grpc_completion_queue * cc, void *tag, int success, void (*done) (grpc_exec_ctx * exec_ctx, void *done_arg, grpc_cq_completion * storage), void *done_arg, grpc_cq_completion * storage) { int shutdown; int i; diff --git a/src/core/surface/completion_queue.h b/src/core/surface/completion_queue.h index 1f3f0d197b0..d9b06223a87 100644 --- a/src/core/surface/completion_queue.h +++ b/src/core/surface/completion_queue.h @@ -70,7 +70,7 @@ void grpc_cq_internal_unref (grpc_completion_queue * cc); void grpc_cq_begin_op (grpc_completion_queue * cc); /* Queue a GRPC_OP_COMPLETED operation */ -void grpc_cq_end_op (grpc_completion_queue * cc, void *tag, int success, void (*done) (grpc_exec_ctx * exec_ctx, void *done_arg, grpc_cq_completion * storage, grpc_closure_list * closure_list), void *done_arg, grpc_cq_completion * storage); +void grpc_cq_end_op (grpc_exec_ctx * exec_ctx, grpc_completion_queue * cc, void *tag, int success, 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/surface/lame_client.c b/src/core/surface/lame_client.c index 40a4e078918..2d786235903 100644 --- a/src/core/surface/lame_client.c +++ b/src/core/surface/lame_client.c @@ -165,7 +165,7 @@ grpc_lame_client_channel_create (const char *target, grpc_status_code error_code channel_data *chand; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; static const grpc_channel_filter *filters[] = { &lame_filter }; - channel = grpc_channel_create_from_filters (target, filters, 1, NULL, grpc_mdctx_create (&exec_ctx, ), 1); + channel = grpc_channel_create_from_filters (&exec_ctx, target, filters, 1, NULL, grpc_mdctx_create (), 1); elem = grpc_channel_stack_element (grpc_channel_get_channel_stack (channel), 0); GPR_ASSERT (elem->filter == &lame_filter); chand = (channel_data *) elem->channel_data; diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index d793e32e0de..dbbf6f51406 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -302,7 +302,7 @@ grpc_secure_channel_create (grpc_credentials * creds, const char *target, const return NULL; } - grpc_client_channel_set_resolver (grpc_channel_get_channel_stack (&exec_ctx, channel), resolver); + grpc_client_channel_set_resolver (&exec_ctx, grpc_channel_get_channel_stack (channel), resolver); GRPC_RESOLVER_UNREF (&exec_ctx, resolver, "create"); grpc_subchannel_factory_unref (&exec_ctx, &f->base); GRPC_SECURITY_CONNECTOR_UNREF (&connector->base, "channel_create"); diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 98bfe71c157..c11ea26da7e 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -752,7 +752,7 @@ channel_connectivity_changed (grpc_exec_ctx * exec_ctx, void *cd, int iomgr_stat grpc_transport_op op; memset (&op, 0, sizeof (op)); 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_get_channel_stack (exec_ctx, chand->channel), 0), &op); + grpc_channel_next_op (exec_ctx, grpc_channel_stack_element (grpc_channel_get_channel_stack (chand->channel), 0), &op); } else { @@ -1124,7 +1124,7 @@ grpc_server_shutdown_and_notify (grpc_server * server, grpc_completion_queue * c grpc_cq_begin_op (cq); if (server->shutdown_published) { - grpc_cq_end_op (cq, tag, 1, done_published_shutdown, NULL, gpr_malloc (sizeof (&exec_ctx, grpc_cq_completion))); + grpc_cq_end_op (&exec_ctx, cq, tag, 1, done_published_shutdown, NULL, gpr_malloc (sizeof (grpc_cq_completion))); gpr_mu_unlock (&server->mu_global); goto done; } @@ -1202,7 +1202,7 @@ grpc_server_destroy (grpc_server * server) } void -grpc_server_add_listener (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, grpc_closure_list * closure_list)) +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 = gpr_malloc (sizeof (listener)); l->arg = arg; @@ -1402,7 +1402,7 @@ begin_call (grpc_exec_ctx * exec_ctx, grpc_server * server, call_data * calld, r } GRPC_CALL_INTERNAL_REF (calld->call, "server"); - grpc_call_start_ioreq_and_call_back (calld->call, req, (size_t) (exec_ctx, r - req), publish, rc); + grpc_call_start_ioreq_and_call_back (exec_ctx, calld->call, req, (size_t) (r - req), publish, rc); } static void diff --git a/src/core/surface/server.h b/src/core/surface/server.h index 8adaafd5e39..96d47de3cb9 100644 --- a/src/core/surface/server.h +++ b/src/core/surface/server.h @@ -43,7 +43,7 @@ grpc_server *grpc_server_create_from_filters (const grpc_channel_filter ** filte /* 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_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, grpc_closure_list * closure_list)); +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 */ diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c index 1f000f450a4..8ea3f734e4c 100644 --- a/src/core/surface/server_chttp2.c +++ b/src/core/surface/server_chttp2.c @@ -48,7 +48,7 @@ setup_transport (grpc_exec_ctx * exec_ctx, void *server, grpc_transport * transp static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter }; - grpc_server_setup_transport (server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (exec_ctx, server)); + grpc_server_setup_transport (exec_ctx, server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (server)); } static void @@ -62,7 +62,7 @@ new_transport (grpc_exec_ctx * exec_ctx, void *server, grpc_endpoint * tcp) * case. */ grpc_mdctx *mdctx = grpc_mdctx_create (); - grpc_transport *transport = grpc_create_chttp2_transport (grpc_server_get_channel_args (exec_ctx, server), tcp, mdctx, 0); + grpc_transport *transport = grpc_create_chttp2_transport (exec_ctx, grpc_server_get_channel_args (server), tcp, mdctx, 0); setup_transport (exec_ctx, server, transport, mdctx); grpc_chttp2_transport_start_reading (exec_ctx, transport, NULL, 0); } @@ -146,7 +146,7 @@ error: } if (tcp) { - grpc_tcp_server_destroy (tcp, NULL, NULL); + grpc_tcp_server_destroy (&exec_ctx, tcp, NULL); } port_num = 0; diff --git a/src/core/surface/version.c b/src/core/surface/version.c index e4deaa68191..4b90e06a043 100644 --- a/src/core/surface/version.c +++ b/src/core/surface/version.c @@ -36,8 +36,6 @@ #include -const char * -grpc_version_string (void) -{ - return "0.11.0.0"; +const char *grpc_version_string(void) { + return "0.11.0.0"; } diff --git a/src/core/transport/chttp2/parsing.c b/src/core/transport/chttp2/parsing.c index 5b55147677f..9e19590e725 100644 --- a/src/core/transport/chttp2/parsing.c +++ b/src/core/transport/chttp2/parsing.c @@ -119,7 +119,7 @@ grpc_chttp2_publish_reads (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_globa published later */ if (transport_parsing->goaway_received) { - grpc_chttp2_add_incoming_goaway (transport_global, (exec_ctx, gpr_uint32) transport_parsing->goaway_error, transport_parsing->goaway_text); + grpc_chttp2_add_incoming_goaway (exec_ctx,transport_global, ( gpr_uint32) transport_parsing->goaway_error, transport_parsing->goaway_text); transport_parsing->goaway_text = gpr_empty_slice (); transport_parsing->goaway_received = 0; } @@ -339,7 +339,7 @@ grpc_chttp2_perform_read (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsin } if (transport_parsing->incoming_frame_size == 0) { - if (!parse_frame_slice (transport_parsing, gpr_empty_slice (exec_ctx, ), 1)) + if (!parse_frame_slice (exec_ctx, transport_parsing, gpr_empty_slice (), 1)) { return 0; } @@ -360,7 +360,7 @@ grpc_chttp2_perform_read (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsin GPR_ASSERT (cur < end); if ((gpr_uint32) (end - cur) == transport_parsing->incoming_frame_size) { - if (!parse_frame_slice (transport_parsing, gpr_slice_sub_no_ref (slice, (size_t) (cur - beg), (size_t) (exec_ctx, end - beg)), 1)) + if (!parse_frame_slice (exec_ctx, transport_parsing, gpr_slice_sub_no_ref (slice, (size_t) (cur - beg), (size_t) (end - beg)), 1)) { return 0; } @@ -371,7 +371,7 @@ grpc_chttp2_perform_read (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsin else if ((gpr_uint32) (end - cur) > transport_parsing->incoming_frame_size) { size_t cur_offset = (size_t) (cur - beg); - if (!parse_frame_slice (transport_parsing, gpr_slice_sub_no_ref (exec_ctx, slice, cur_offset, cur_offset + transport_parsing->incoming_frame_size), 1)) + if (!parse_frame_slice (exec_ctx, transport_parsing, gpr_slice_sub_no_ref (slice, cur_offset, cur_offset + transport_parsing->incoming_frame_size), 1)) { return 0; } @@ -381,7 +381,7 @@ grpc_chttp2_perform_read (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsin } else { - if (!parse_frame_slice (transport_parsing, gpr_slice_sub_no_ref (slice, (size_t) (cur - beg), (size_t) (exec_ctx, end - beg)), 0)) + if (!parse_frame_slice (exec_ctx, transport_parsing, gpr_slice_sub_no_ref (slice, (size_t) (cur - beg), (size_t) (end - beg)), 0)) { return 0; } diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index 573cc34d88b..bfcb62426cf 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -171,9 +171,9 @@ destruct_transport (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) #ifdef REFCOUNTING_DEBUG #define REF_TRANSPORT(t, r) ref_transport(t, r, __FILE__, __LINE__) -#define UNREF_TRANSPORT(t, r, cl) unref_transport(t, cl, r, __FILE__, __LINE__) +#define UNREF_TRANSPORT(cl, t, r) unref_transport(cl, t, r, __FILE__, __LINE__) static void -unref_transport (grpc_chttp2_transport * t, grpc_closure_list * closure_list, const char *reason, const char *file, int line) +unref_transport (grpc_exec_ctx *exec_ctx, grpc_chttp2_transport * t, const char *reason, const char *file, int line) { gpr_log (GPR_DEBUG, "chttp2:unref:%p %d->%d %s [%s:%d]", t, t->refs.count, t->refs.count - 1, reason, file, line); if (!gpr_unref (&t->refs)) @@ -189,7 +189,7 @@ ref_transport (grpc_chttp2_transport * t, const char *reason, const char *file, } #else #define REF_TRANSPORT(t, r) ref_transport(t) -#define UNREF_TRANSPORT(t, r, cl) unref_transport(t, cl) +#define UNREF_TRANSPORT(cl, t, r) unref_transport(cl, t) static void unref_transport (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) { @@ -704,7 +704,7 @@ perform_stream_op_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global if (op->bind_pollset) { - add_to_pollset_locked (TRANSPORT_FROM_GLOBAL (exec_ctx, transport_global), op->bind_pollset); + add_to_pollset_locked (exec_ctx,TRANSPORT_FROM_GLOBAL ( transport_global), op->bind_pollset); } grpc_exec_ctx_enqueue (exec_ctx, op->on_consumed, 1); @@ -1179,7 +1179,7 @@ static void connectivity_state_set (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, grpc_connectivity_state state, const char *reason) { GRPC_CHTTP2_IF_TRACING (gpr_log (GPR_DEBUG, "set connectivity_state=%d", state)); - grpc_connectivity_state_set (&TRANSPORT_FROM_GLOBAL (exec_ctx, transport_global)->channel_callback.state_tracker, state, reason); + grpc_connectivity_state_set (exec_ctx,&TRANSPORT_FROM_GLOBAL ( transport_global)->channel_callback.state_tracker, state, reason); } /* diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index b1a3fe5c944..0315d7d69bc 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -77,7 +77,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx &grpc_http_server_filter }; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport (a->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (&exec_ctx, a->server)); + grpc_server_setup_transport (&exec_ctx, a->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (a->server)); grpc_exec_ctx_finish (&exec_ctx); } @@ -122,8 +122,8 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const grpc_exec_ctx_finish (&exec_ctx); /* Bind everything into the same pollset */ - grpc_endpoint_add_to_pollset (sfd.client, grpc_cq_pollset (&exec_ctx, a.cq)); - grpc_endpoint_add_to_pollset (sfd.server, grpc_cq_pollset (&exec_ctx, 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)); diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 59eb025957a..2ba0c0793f2 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -65,7 +65,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx &grpc_http_server_filter }; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (&exec_ctx, f->server)); + grpc_server_setup_transport (&exec_ctx, f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server)); grpc_exec_ctx_finish (&exec_ctx); } @@ -85,8 +85,8 @@ client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * tra &grpc_connected_channel_filter }; size_t nfilters = sizeof (filters) / sizeof (*filters); - grpc_channel *channel = grpc_channel_create_from_filters ("socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1, closure_list); + grpc_channel *channel = grpc_channel_create_from_filters (exec_ctx, "socketpair-target", filters, nfilters, + cs->client_args, mdctx, 1); cs->f->client = channel; diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index 613772f27b3..c0296a1b09b 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -64,7 +64,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx &grpc_http_server_filter }; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (&exec_ctx, f->server)); + grpc_server_setup_transport (&exec_ctx, f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server)); grpc_exec_ctx_finish (&exec_ctx); } @@ -84,8 +84,8 @@ client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * tra &grpc_connected_channel_filter }; size_t nfilters = sizeof (filters) / sizeof (*filters); - grpc_channel *channel = grpc_channel_create_from_filters ("socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1, closure_list); + grpc_channel *channel = grpc_channel_create_from_filters (exec_ctx,"socketpair-target", filters, nfilters, + cs->client_args, mdctx, 1); cs->f->client = channel; diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 9ad36ed79c1..1f39499d09a 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -64,7 +64,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx &grpc_http_server_filter }; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (&exec_ctx, f->server)); + grpc_server_setup_transport (&exec_ctx, f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server)); grpc_exec_ctx_finish (&exec_ctx); } @@ -84,8 +84,8 @@ client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * tra &grpc_connected_channel_filter }; size_t nfilters = sizeof (filters) / sizeof (*filters); - grpc_channel *channel = grpc_channel_create_from_filters ("socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1, closure_list); + grpc_channel *channel = grpc_channel_create_from_filters (exec_ctx, "socketpair-target", filters, nfilters, + cs->client_args, mdctx, 1); cs->f->client = channel; diff --git a/test/core/iomgr/alarm_list_test.c b/test/core/iomgr/alarm_list_test.c index 0696359f4fb..da311edd2ae 100644 --- a/test/core/iomgr/alarm_list_test.c +++ b/test/core/iomgr/alarm_list_test.c @@ -63,17 +63,17 @@ add_test (void) /* 10 ms alarms. will expire in the current epoch */ for (i = 0; i < 10; i++) { - grpc_alarm_init (&alarms[i], gpr_time_add (start, gpr_time_from_millis (10, GPR_TIMESPAN)), cb, (void *) (&exec_ctx, gpr_intptr) i, start); + grpc_alarm_init (&exec_ctx, &alarms[i], gpr_time_add (start, gpr_time_from_millis (10, GPR_TIMESPAN)), cb, (void *) (gpr_intptr) i, start); } /* 1010 ms alarms. will expire in the next epoch */ for (i = 10; i < 20; i++) { - grpc_alarm_init (&alarms[i], gpr_time_add (start, gpr_time_from_millis (1010, GPR_TIMESPAN)), cb, (void *) (&exec_ctx, gpr_intptr) i, start); + grpc_alarm_init (&exec_ctx, &alarms[i], gpr_time_add (start, gpr_time_from_millis (1010, GPR_TIMESPAN)), cb, (void *) (gpr_intptr) i, start); } /* collect alarms. Only the first batch should be ready. */ - GPR_ASSERT (10 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (&exec_ctx, 500, GPR_TIMESPAN)), NULL)); + GPR_ASSERT (10 == grpc_alarm_check (&exec_ctx, gpr_time_add (start, gpr_time_from_millis (500, GPR_TIMESPAN)), NULL)); grpc_exec_ctx_finish (&exec_ctx); for (i = 0; i < 20; i++) { @@ -81,7 +81,7 @@ add_test (void) GPR_ASSERT (cb_called[i][0] == 0); } - GPR_ASSERT (0 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (&exec_ctx, 600, GPR_TIMESPAN)), NULL)); + GPR_ASSERT (0 == grpc_alarm_check (&exec_ctx, gpr_time_add (start, gpr_time_from_millis (600, GPR_TIMESPAN)), NULL)); grpc_exec_ctx_finish (&exec_ctx); for (i = 0; i < 30; i++) { @@ -90,7 +90,7 @@ add_test (void) } /* collect the rest of the alarms */ - GPR_ASSERT (10 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (&exec_ctx, 1500, GPR_TIMESPAN)), NULL)); + GPR_ASSERT (10 == grpc_alarm_check (&exec_ctx, gpr_time_add (start, gpr_time_from_millis (1500, GPR_TIMESPAN)), NULL)); grpc_exec_ctx_finish (&exec_ctx); for (i = 0; i < 30; i++) { @@ -98,14 +98,14 @@ add_test (void) GPR_ASSERT (cb_called[i][0] == 0); } - GPR_ASSERT (0 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (&exec_ctx, 1600, GPR_TIMESPAN)), NULL)); + GPR_ASSERT (0 == grpc_alarm_check (&exec_ctx, gpr_time_add (start, gpr_time_from_millis (1600, GPR_TIMESPAN)), NULL)); for (i = 0; i < 30; i++) { GPR_ASSERT (cb_called[i][1] == (i < 20)); GPR_ASSERT (cb_called[i][0] == 0); } - grpc_alarm_list_shutdown (&closure_list); + grpc_alarm_list_shutdown (&exec_ctx); grpc_exec_ctx_finish (&exec_ctx); } @@ -127,12 +127,12 @@ destruction_test (void) grpc_alarm_list_init (gpr_time_0 (GPR_CLOCK_REALTIME)); memset (cb_called, 0, sizeof (cb_called)); - grpc_alarm_init (&alarms[0], tfm (100), cb, (void *) (gpr_intptr) 0, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME)); - grpc_alarm_init (&alarms[1], tfm (3), cb, (void *) (gpr_intptr) 1, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME)); - grpc_alarm_init (&alarms[2], tfm (100), cb, (void *) (gpr_intptr) 2, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME)); - grpc_alarm_init (&alarms[3], tfm (3), cb, (void *) (gpr_intptr) 3, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME)); - grpc_alarm_init (&alarms[4], tfm (1), cb, (void *) (gpr_intptr) 4, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME)); - GPR_ASSERT (1 == grpc_alarm_check (tfm (&exec_ctx, 2), NULL)); + grpc_alarm_init (&exec_ctx, &alarms[0], tfm (100), cb, (void *) (gpr_intptr) 0, gpr_time_0 (GPR_CLOCK_REALTIME)); + grpc_alarm_init (&exec_ctx, &alarms[1], tfm (3), cb, (void *) (gpr_intptr) 1, gpr_time_0 (GPR_CLOCK_REALTIME)); + grpc_alarm_init (&exec_ctx, &alarms[2], tfm (100), cb, (void *) (gpr_intptr) 2, gpr_time_0 (GPR_CLOCK_REALTIME)); + grpc_alarm_init (&exec_ctx, &alarms[3], tfm (3), cb, (void *) (gpr_intptr) 3, gpr_time_0 (GPR_CLOCK_REALTIME)); + grpc_alarm_init (&exec_ctx, &alarms[4], tfm (1), cb, (void *) (gpr_intptr) 4, gpr_time_0 (GPR_CLOCK_REALTIME)); + GPR_ASSERT (1 == grpc_alarm_check (&exec_ctx,tfm ( 2), NULL)); grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (1 == cb_called[4][1]); grpc_alarm_cancel (&exec_ctx, &alarms[0]); @@ -141,7 +141,7 @@ destruction_test (void) GPR_ASSERT (1 == cb_called[0][0]); GPR_ASSERT (1 == cb_called[3][0]); - grpc_alarm_list_shutdown (&closure_list); + grpc_alarm_list_shutdown (&exec_ctx); grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (1 == cb_called[1][0]); GPR_ASSERT (1 == cb_called[2][0]); diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index 49b6d79271d..3f91485ac92 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -250,7 +250,7 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t { grpc_pollset_worker worker; GPR_ASSERT (gpr_time_cmp (gpr_now (GPR_CLOCK_MONOTONIC), deadline) < 0); - grpc_pollset_work (g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); + grpc_pollset_work (&exec_ctx, g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline); } gpr_mu_unlock (GRPC_POLLSET_MU (g_pollset)); grpc_exec_ctx_finish (&exec_ctx); diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index d6c17b32c5d..fad2ecd64b8 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -100,7 +100,7 @@ grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds) while (!request.is_done) { grpc_pollset_worker worker; - grpc_pollset_work (&request.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); + grpc_pollset_work (&exec_ctx, &request.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC)); } gpr_mu_unlock (GRPC_POLLSET_MU (&request.pollset)); diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index bce72f4a0c2..da2541ecc36 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -116,12 +116,12 @@ free_port_using_server (char *server, int port) req.path = path; grpc_httpcli_context_init (&context); - grpc_httpcli_get (&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 10), freed_port_from_server, &pr); + grpc_httpcli_get (&exec_ctx, &context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), freed_port_from_server, &pr); gpr_mu_lock (GRPC_POLLSET_MU (&pr.pollset)); while (!pr.done) { grpc_pollset_worker worker; - grpc_pollset_work (&pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 1)); + grpc_pollset_work (&exec_ctx, &pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1)); } gpr_mu_unlock (GRPC_POLLSET_MU (&pr.pollset)); @@ -247,7 +247,7 @@ got_port_from_server (grpc_exec_ctx * exec_ctx, void *arg, const grpc_httpcli_re req.path = "/get"; gpr_log (GPR_DEBUG, "failed port pick from server: retrying"); sleep (1); - grpc_httpcli_get (pr->ctx, &pr->pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (exec_ctx, 10), got_port_from_server, pr); + grpc_httpcli_get (exec_ctx, pr->ctx, &pr->pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, pr); return; } GPR_ASSERT (response); @@ -287,13 +287,13 @@ pick_port_using_server (char *server) req.path = "/get"; grpc_httpcli_context_init (&context); - grpc_httpcli_get (&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 10), got_port_from_server, &pr); + grpc_httpcli_get (&exec_ctx, &context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, &pr); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&pr.pollset)); while (pr.port == -1) { grpc_pollset_worker worker; - grpc_pollset_work (&pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 1)); + grpc_pollset_work (&exec_ctx, &pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1)); } gpr_mu_unlock (GRPC_POLLSET_MU (&pr.pollset)); diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index 761ef233ac0..6de06280caa 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -154,7 +154,7 @@ reconnect_server_poll (reconnect_server * server, int seconds) gpr_time_from_seconds (seconds, GPR_TIMESPAN)); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock (GRPC_POLLSET_MU (&server->pollset)); - grpc_pollset_work (&server->pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); + grpc_pollset_work (&exec_ctx, &server->pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline); gpr_mu_unlock (GRPC_POLLSET_MU (&server->pollset)); grpc_exec_ctx_finish (&exec_ctx); } diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 04729c3a4d6..75e6f5119fd 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -952,6 +952,7 @@ src/core/iomgr/closure.c \ src/core/iomgr/endpoint.c \ src/core/iomgr/endpoint_pair_posix.c \ src/core/iomgr/endpoint_pair_windows.c \ +src/core/iomgr/exec_ctx.c \ src/core/iomgr/fd_posix.c \ src/core/iomgr/iocp_windows.c \ src/core/iomgr/iomgr.c \ diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 27a41206c4b..071d7943e47 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -12494,6 +12494,7 @@ "src/core/iomgr/endpoint_pair.h", "src/core/iomgr/endpoint_pair_posix.c", "src/core/iomgr/endpoint_pair_windows.c", + "src/core/iomgr/exec_ctx.c", "src/core/iomgr/exec_ctx.h", "src/core/iomgr/fd_posix.c", "src/core/iomgr/fd_posix.h", @@ -12981,6 +12982,7 @@ "src/core/iomgr/endpoint_pair.h", "src/core/iomgr/endpoint_pair_posix.c", "src/core/iomgr/endpoint_pair_windows.c", + "src/core/iomgr/exec_ctx.c", "src/core/iomgr/exec_ctx.h", "src/core/iomgr/fd_posix.c", "src/core/iomgr/fd_posix.h", diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index d88e038cf7d..9c963e0d436 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -476,6 +476,8 @@ + + diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index a835e8bfaa2..a8f82370d91 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -181,6 +181,9 @@ src\core\iomgr + + src\core\iomgr + src\core\iomgr diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index d8e9c1de2b3..d9af6de0d2c 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -415,6 +415,8 @@ + + diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index b2f963611ce..21355d67f26 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -121,6 +121,9 @@ src\core\iomgr + + src\core\iomgr + src\core\iomgr From a82950e68318a6aab6fe894fa39f7fa616c4647b Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 12:33:20 -0700 Subject: [PATCH 35/56] clang-format all core files --- src/core/census/aggregation.h | 21 +- src/core/census/context.c | 5 +- src/core/census/context.h | 13 +- src/core/census/grpc_context.c | 24 +- src/core/census/grpc_filter.c | 194 +- src/core/census/initialize.c | 42 +- src/core/census/operation.c | 30 +- src/core/census/tracing.c | 15 +- src/core/channel/channel_args.c | 251 +- src/core/channel/channel_args.h | 25 +- src/core/channel/channel_stack.c | 187 +- src/core/channel/channel_stack.h | 88 +- src/core/channel/client_channel.c | 1031 +++---- src/core/channel/client_channel.h | 22 +- src/core/channel/compress_filter.c | 451 +-- src/core/channel/connected_channel.c | 118 +- src/core/channel/connected_channel.h | 3 +- src/core/channel/context.h | 8 +- src/core/channel/http_client_filter.c | 313 +- src/core/channel/http_server_filter.c | 382 ++- src/core/channel/noop_filter.c | 88 +- src/core/client_config/client_config.c | 50 +- src/core/client_config/client_config.h | 13 +- src/core/client_config/connector.c | 28 +- src/core/client_config/connector.h | 34 +- .../client_config/lb_policies/pick_first.c | 461 ++- .../client_config/lb_policies/pick_first.h | 2 +- .../client_config/lb_policies/round_robin.c | 726 +++-- .../client_config/lb_policies/round_robin.h | 2 +- src/core/client_config/lb_policy.c | 86 +- src/core/client_config/lb_policy.h | 63 +- src/core/client_config/lb_policy_factory.c | 22 +- src/core/client_config/lb_policy_factory.h | 23 +- src/core/client_config/lb_policy_registry.c | 58 +- src/core/client_config/lb_policy_registry.h | 9 +- src/core/client_config/resolver.c | 67 +- src/core/client_config/resolver.h | 41 +- src/core/client_config/resolver_factory.c | 32 +- src/core/client_config/resolver_factory.h | 28 +- src/core/client_config/resolver_registry.c | 126 +- src/core/client_config/resolver_registry.h | 11 +- .../client_config/resolvers/dns_resolver.c | 284 +- .../client_config/resolvers/dns_resolver.h | 2 +- .../resolvers/sockaddr_resolver.c | 422 ++- .../resolvers/sockaddr_resolver.h | 6 +- .../resolvers/zookeeper_resolver.c | 627 ++-- .../resolvers/zookeeper_resolver.h | 2 +- src/core/client_config/subchannel.c | 863 +++--- src/core/client_config/subchannel.h | 53 +- src/core/client_config/subchannel_factory.c | 21 +- src/core/client_config/subchannel_factory.h | 23 +- .../add_channel_arg.c | 9 +- .../add_channel_arg.h | 3 +- .../merge_channel_args.c | 62 +- .../merge_channel_args.h | 3 +- src/core/client_config/uri_parser.c | 316 +- src/core/client_config/uri_parser.h | 7 +- src/core/compression/algorithm.c | 103 +- src/core/compression/message_compress.c | 207 +- src/core/compression/message_compress.h | 6 +- src/core/debug/trace.c | 137 +- src/core/debug/trace.h | 6 +- src/core/httpcli/format_request.c | 112 +- src/core/httpcli/format_request.h | 6 +- src/core/httpcli/httpcli.c | 310 +- src/core/httpcli/httpcli.h | 57 +- src/core/httpcli/httpcli_security_connector.c | 199 +- src/core/httpcli/parser.c | 256 +- src/core/httpcli/parser.h | 14 +- src/core/iomgr/alarm.c | 390 ++- src/core/iomgr/alarm.h | 11 +- src/core/iomgr/alarm_heap.c | 152 +- src/core/iomgr/alarm_heap.h | 17 +- src/core/iomgr/alarm_internal.h | 11 +- src/core/iomgr/closure.c | 56 +- src/core/iomgr/closure.h | 19 +- src/core/iomgr/endpoint.c | 47 +- src/core/iomgr/endpoint.h | 43 +- src/core/iomgr/endpoint_pair.h | 6 +- src/core/iomgr/endpoint_pair_posix.c | 35 +- src/core/iomgr/endpoint_pair_windows.c | 54 +- src/core/iomgr/exec_ctx.c | 28 +- src/core/iomgr/exec_ctx.h | 9 +- src/core/iomgr/fd_posix.c | 557 ++-- src/core/iomgr/fd_posix.h | 44 +- src/core/iomgr/iocp_windows.c | 216 +- src/core/iomgr/iocp_windows.h | 14 +- src/core/iomgr/iomgr.c | 159 +- src/core/iomgr/iomgr.h | 4 +- src/core/iomgr/iomgr_internal.h | 11 +- src/core/iomgr/iomgr_posix.c | 18 +- src/core/iomgr/iomgr_posix.h | 4 +- src/core/iomgr/iomgr_windows.c | 32 +- src/core/iomgr/pollset.h | 14 +- .../iomgr/pollset_multipoller_with_epoll.c | 289 +- .../pollset_multipoller_with_poll_posix.c | 250 +- src/core/iomgr/pollset_posix.c | 685 ++--- src/core/iomgr/pollset_posix.h | 52 +- src/core/iomgr/pollset_set.h | 12 +- src/core/iomgr/pollset_set_posix.c | 144 +- src/core/iomgr/pollset_set_posix.h | 9 +- src/core/iomgr/pollset_set_windows.c | 28 +- src/core/iomgr/pollset_set_windows.h | 5 +- src/core/iomgr/pollset_windows.c | 160 +- src/core/iomgr/pollset_windows.h | 6 +- src/core/iomgr/resolve_address.h | 17 +- src/core/iomgr/resolve_address_posix.c | 177 +- src/core/iomgr/resolve_address_windows.c | 141 +- src/core/iomgr/sockaddr_utils.c | 271 +- src/core/iomgr/sockaddr_utils.h | 24 +- src/core/iomgr/sockaddr_win32.h | 2 +- src/core/iomgr/socket_utils_common_posix.c | 234 +- src/core/iomgr/socket_utils_linux.c | 7 +- src/core/iomgr/socket_utils_posix.c | 38 +- src/core/iomgr/socket_utils_posix.h | 21 +- src/core/iomgr/socket_windows.c | 56 +- src/core/iomgr/socket_windows.h | 14 +- src/core/iomgr/tcp_client.h | 6 +- src/core/iomgr/tcp_client_posix.c | 361 ++- src/core/iomgr/tcp_client_windows.c | 207 +- src/core/iomgr/tcp_posix.c | 576 ++-- src/core/iomgr/tcp_posix.h | 3 +- src/core/iomgr/tcp_server.h | 17 +- src/core/iomgr/tcp_server_posix.c | 595 ++-- src/core/iomgr/tcp_server_windows.c | 537 ++-- src/core/iomgr/tcp_windows.c | 428 ++- src/core/iomgr/tcp_windows.h | 4 +- src/core/iomgr/time_averaged_stats.c | 44 +- src/core/iomgr/time_averaged_stats.h | 12 +- src/core/iomgr/udp_server.c | 455 ++- src/core/iomgr/udp_server.h | 15 +- src/core/iomgr/wakeup_fd_eventfd.c | 48 +- src/core/iomgr/wakeup_fd_nospecial.c | 9 +- src/core/iomgr/wakeup_fd_pipe.c | 69 +- src/core/iomgr/wakeup_fd_posix.c | 51 +- src/core/iomgr/wakeup_fd_posix.h | 30 +- src/core/iomgr/workqueue.h | 21 +- src/core/iomgr/workqueue_posix.c | 140 +- src/core/iomgr/workqueue_posix.h | 3 +- src/core/json/json.c | 41 +- src/core/json/json.h | 13 +- src/core/json/json_common.h | 3 +- src/core/json/json_reader.c | 1257 ++++---- src/core/json/json_reader.h | 56 +- src/core/json/json_string.c | 355 +-- src/core/json/json_writer.c | 385 ++- src/core/json/json_writer.h | 31 +- src/core/profiling/basic_timers.c | 106 +- src/core/profiling/stap_timers.c | 28 +- src/core/profiling/timers.h | 94 +- src/core/security/base64.c | 311 +- src/core/security/base64.h | 8 +- src/core/security/client_auth_filter.c | 441 ++- src/core/security/credentials.c | 1761 ++++++----- src/core/security/credentials.h | 169 +- src/core/security/credentials_metadata.c | 105 +- src/core/security/credentials_posix.c | 21 +- src/core/security/credentials_win32.c | 21 +- .../security/google_default_credentials.c | 240 +- src/core/security/handshake.c | 346 ++- src/core/security/handshake.h | 7 +- src/core/security/json_token.c | 540 ++-- src/core/security/json_token.h | 37 +- src/core/security/jwt_verifier.c | 1171 ++++---- src/core/security/jwt_verifier.h | 48 +- src/core/security/secure_endpoint.c | 520 ++-- src/core/security/secure_endpoint.h | 4 +- src/core/security/security_connector.c | 919 +++--- src/core/security/security_connector.h | 103 +- src/core/security/security_context.c | 396 ++- src/core/security/security_context.h | 43 +- src/core/security/server_auth_filter.c | 281 +- src/core/security/server_secure_chttp2.c | 335 +-- src/core/statistics/census_init.c | 16 +- src/core/statistics/census_interface.h | 15 +- src/core/statistics/census_log.c | 591 ++-- src/core/statistics/census_log.h | 18 +- src/core/statistics/census_rpc_stats.c | 339 +-- src/core/statistics/census_rpc_stats.h | 70 +- src/core/statistics/census_tracing.c | 309 +- src/core/statistics/census_tracing.h | 47 +- src/core/statistics/hash_table.c | 376 +-- src/core/statistics/hash_table.h | 39 +- src/core/statistics/window_stats.c | 370 ++- src/core/statistics/window_stats.h | 25 +- src/core/support/alloc.c | 52 +- src/core/support/cmdline.c | 388 ++- src/core/support/cpu_iphone.c | 12 +- src/core/support/cpu_linux.c | 40 +- src/core/support/cpu_posix.c | 37 +- src/core/support/cpu_windows.c | 12 +- src/core/support/env.h | 9 +- src/core/support/env_linux.c | 16 +- src/core/support/env_posix.c | 16 +- src/core/support/env_win32.c | 21 +- src/core/support/file.c | 72 +- src/core/support/file.h | 10 +- src/core/support/file_posix.c | 52 +- src/core/support/file_win32.c | 33 +- src/core/support/histogram.c | 276 +- src/core/support/host_port.c | 121 +- src/core/support/log.c | 26 +- src/core/support/log_android.c | 36 +- src/core/support/log_linux.c | 58 +- src/core/support/log_posix.c | 73 +- src/core/support/log_win32.c | 95 +- src/core/support/murmur_hash.c | 44 +- src/core/support/murmur_hash.h | 2 +- src/core/support/slice.c | 429 ++- src/core/support/slice_buffer.c | 288 +- src/core/support/stack_lockfree.c | 114 +- src/core/support/stack_lockfree.h | 8 +- src/core/support/string.c | 350 +-- src/core/support/string.h | 42 +- src/core/support/string_posix.c | 54 +- src/core/support/string_win32.c | 81 +- src/core/support/string_win32.h | 4 +- src/core/support/subprocess_posix.c | 98 +- src/core/support/sync.c | 124 +- src/core/support/sync_posix.c | 90 +- src/core/support/sync_win32.c | 122 +- src/core/support/thd.c | 31 +- src/core/support/thd_posix.c | 66 +- src/core/support/thd_win32.c | 107 +- src/core/support/time.c | 457 ++- src/core/support/time_posix.c | 107 +- src/core/support/time_precise.h | 46 +- src/core/support/time_win32.c | 56 +- src/core/support/tls_pthread.c | 6 +- src/core/surface/byte_buffer.c | 87 +- src/core/surface/byte_buffer_queue.c | 91 +- src/core/surface/byte_buffer_queue.h | 18 +- src/core/surface/byte_buffer_reader.c | 95 +- src/core/surface/call.c | 2600 ++++++++--------- src/core/surface/call.h | 171 +- src/core/surface/call_details.c | 14 +- src/core/surface/call_log_batch.c | 124 +- src/core/surface/channel.c | 428 ++- src/core/surface/channel.h | 34 +- src/core/surface/channel_connectivity.c | 189 +- src/core/surface/channel_create.c | 199 +- src/core/surface/completion_queue.c | 437 ++- src/core/surface/completion_queue.h | 30 +- src/core/surface/event_string.c | 50 +- src/core/surface/event_string.h | 2 +- src/core/surface/init.c | 139 +- src/core/surface/init.h | 4 +- src/core/surface/init_secure.c | 8 +- src/core/surface/init_unsecure.c | 5 +- src/core/surface/lame_client.c | 173 +- src/core/surface/metadata_array.c | 12 +- src/core/surface/secure_channel_create.c | 327 +-- src/core/surface/server.c | 1560 +++++----- src/core/surface/server.h | 21 +- src/core/surface/server_chttp2.c | 128 +- src/core/surface/server_create.c | 11 +- src/core/surface/version.c | 4 +- src/core/transport/chttp2/alpn.c | 26 +- src/core/transport/chttp2/alpn.h | 6 +- src/core/transport/chttp2/bin_encoder.c | 214 +- src/core/transport/chttp2/bin_encoder.h | 8 +- src/core/transport/chttp2/frame.h | 3 +- src/core/transport/chttp2/frame_data.c | 215 +- src/core/transport/chttp2/frame_data.h | 21 +- src/core/transport/chttp2/frame_goaway.c | 218 +- src/core/transport/chttp2/frame_goaway.h | 22 +- src/core/transport/chttp2/frame_ping.c | 82 +- src/core/transport/chttp2/frame_ping.h | 13 +- src/core/transport/chttp2/frame_rst_stream.c | 78 +- src/core/transport/chttp2/frame_rst_stream.h | 13 +- src/core/transport/chttp2/frame_settings.c | 353 ++- src/core/transport/chttp2/frame_settings.h | 32 +- .../transport/chttp2/frame_window_update.c | 107 +- .../transport/chttp2/frame_window_update.h | 15 +- src/core/transport/chttp2/hpack_parser.c | 1994 ++++++------- src/core/transport/chttp2/hpack_parser.h | 30 +- src/core/transport/chttp2/hpack_table.c | 362 +-- src/core/transport/chttp2/hpack_table.h | 18 +- src/core/transport/chttp2/http2_errors.h | 3 +- src/core/transport/chttp2/huffsyms.c | 130 +- src/core/transport/chttp2/huffsyms.h | 3 +- src/core/transport/chttp2/incoming_metadata.c | 200 +- src/core/transport/chttp2/incoming_metadata.h | 35 +- src/core/transport/chttp2/internal.h | 247 +- src/core/transport/chttp2/parsing.c | 1155 ++++---- src/core/transport/chttp2/status_conversion.c | 36 +- src/core/transport/chttp2/status_conversion.h | 10 +- src/core/transport/chttp2/stream_encoder.c | 925 +++--- src/core/transport/chttp2/stream_encoder.h | 17 +- src/core/transport/chttp2/stream_lists.c | 488 ++-- src/core/transport/chttp2/stream_map.c | 215 +- src/core/transport/chttp2/stream_map.h | 26 +- src/core/transport/chttp2/timeout_encoding.c | 258 +- src/core/transport/chttp2/timeout_encoding.h | 4 +- src/core/transport/chttp2/varint.c | 56 +- src/core/transport/chttp2/varint.h | 6 +- src/core/transport/chttp2/writing.c | 309 +- src/core/transport/chttp2_transport.c | 1721 ++++++----- src/core/transport/chttp2_transport.h | 8 +- src/core/transport/connectivity_state.c | 139 +- src/core/transport/connectivity_state.h | 25 +- src/core/transport/metadata.c | 867 +++--- src/core/transport/metadata.h | 84 +- src/core/transport/stream_op.c | 451 ++- src/core/transport/stream_op.h | 82 +- src/core/transport/transport.c | 148 +- src/core/transport/transport.h | 56 +- src/core/transport/transport_impl.h | 25 +- src/core/transport/transport_op_string.c | 208 +- src/core/tsi/fake_transport_security.c | 670 ++--- src/core/tsi/fake_transport_security.h | 10 +- src/core/tsi/ssl_transport_security.c | 2096 +++++++------ src/core/tsi/ssl_transport_security.h | 33 +- src/core/tsi/transport_security.c | 323 +- src/core/tsi/transport_security.h | 89 +- src/core/tsi/transport_security_interface.h | 110 +- test/core/bad_client/bad_client.c | 139 +- test/core/bad_client/bad_client.h | 7 +- .../core/bad_client/tests/connection_prefix.c | 67 +- .../bad_client/tests/initial_settings_frame.c | 79 +- test/core/channel/channel_args_test.c | 125 +- test/core/channel/channel_stack_test.c | 145 +- test/core/client_config/lb_policies_test.c | 879 +++--- test/core/client_config/uri_parser_test.c | 74 +- test/core/compression/compression_test.c | 55 +- test/core/compression/message_compress_test.c | 181 +- test/core/end2end/cq_verifier.c | 287 +- test/core/end2end/cq_verifier.h | 15 +- test/core/end2end/data/server1_cert.c | 163 +- test/core/end2end/data/server1_key.c | 149 +- test/core/end2end/data/test_root_cert.c | 135 +- test/core/end2end/dualstack_socket_test.c | 450 ++- test/core/end2end/end2end_tests.h | 19 +- test/core/end2end/fixtures/h2_compress.c | 108 +- test/core/end2end/fixtures/h2_fakesec.c | 153 +- test/core/end2end/fixtures/h2_full+poll.c | 76 +- test/core/end2end/fixtures/h2_full.c | 78 +- test/core/end2end/fixtures/h2_oauth2.c | 260 +- test/core/end2end/fixtures/h2_proxy.c | 97 +- .../core/end2end/fixtures/h2_sockpair+trace.c | 136 +- test/core/end2end/fixtures/h2_sockpair.c | 124 +- .../core/end2end/fixtures/h2_sockpair_1byte.c | 124 +- test/core/end2end/fixtures/h2_ssl+poll.c | 192 +- test/core/end2end/fixtures/h2_ssl.c | 191 +- test/core/end2end/fixtures/h2_ssl_proxy.c | 230 +- test/core/end2end/fixtures/h2_uds+poll.c | 75 +- test/core/end2end/fixtures/h2_uds.c | 75 +- test/core/end2end/fixtures/proxy.c | 541 ++-- test/core/end2end/fixtures/proxy.h | 16 +- .../end2end/multiple_server_queues_test.c | 43 +- test/core/end2end/no_server_test.c | 56 +- test/core/end2end/tests/bad_hostname.c | 154 +- test/core/end2end/tests/binary_metadata.c | 259 +- test/core/end2end/tests/call_creds.c | 477 ++- test/core/end2end/tests/cancel_after_accept.c | 189 +- .../end2end/tests/cancel_after_client_done.c | 189 +- test/core/end2end/tests/cancel_after_invoke.c | 165 +- .../core/end2end/tests/cancel_before_invoke.c | 161 +- test/core/end2end/tests/cancel_in_a_vacuum.c | 124 +- test/core/end2end/tests/cancel_test_helpers.h | 17 +- .../end2end/tests/census_simple_request.c | 173 +- .../core/end2end/tests/channel_connectivity.c | 120 +- test/core/end2end/tests/compressed_payload.c | 297 +- test/core/end2end/tests/default_host.c | 203 +- test/core/end2end/tests/disappearing_server.c | 180 +- test/core/end2end/tests/empty_batch.c | 129 +- .../end2end/tests/graceful_server_shutdown.c | 169 +- test/core/end2end/tests/high_initial_seqno.c | 191 +- .../core/end2end/tests/invoke_large_request.c | 202 +- test/core/end2end/tests/large_metadata.c | 199 +- .../end2end/tests/max_concurrent_streams.c | 335 +-- test/core/end2end/tests/max_message_length.c | 173 +- test/core/end2end/tests/metadata.c | 219 +- test/core/end2end/tests/no_op.c | 102 +- test/core/end2end/tests/payload.c | 228 +- test/core/end2end/tests/ping_pong_streaming.c | 284 +- test/core/end2end/tests/registered_call.c | 208 +- test/core/end2end/tests/request_with_flags.c | 193 +- .../core/end2end/tests/request_with_payload.c | 187 +- .../end2end/tests/server_finishes_request.c | 176 +- .../end2end/tests/shutdown_finishes_calls.c | 160 +- .../end2end/tests/shutdown_finishes_tags.c | 117 +- .../end2end/tests/simple_delayed_request.c | 188 +- test/core/end2end/tests/simple_request.c | 231 +- test/core/end2end/tests/trailing_metadata.c | 226 +- test/core/fling/client.c | 220 +- test/core/fling/fling_stream_test.c | 103 +- test/core/fling/fling_test.c | 66 +- test/core/fling/server.c | 361 +-- test/core/httpcli/format_request_test.c | 110 +- test/core/httpcli/httpcli_test.c | 183 +- test/core/httpcli/parser_test.c | 167 +- test/core/iomgr/alarm_heap_test.c | 364 ++- test/core/iomgr/alarm_list_test.c | 174 +- test/core/iomgr/endpoint_pair_test.c | 46 +- test/core/iomgr/endpoint_tests.c | 249 +- test/core/iomgr/endpoint_tests.h | 13 +- test/core/iomgr/fd_conservation_posix_test.c | 27 +- test/core/iomgr/fd_posix_test.c | 577 ++-- test/core/iomgr/resolve_address_test.c | 149 +- test/core/iomgr/sockaddr_utils_test.c | 240 +- test/core/iomgr/tcp_client_posix_test.c | 311 +- test/core/iomgr/tcp_posix_test.c | 509 ++-- test/core/iomgr/tcp_server_posix_test.c | 196 +- test/core/iomgr/time_averaged_stats_test.c | 250 +- test/core/iomgr/udp_server_test.c | 189 +- test/core/iomgr/workqueue_test.c | 71 +- test/core/json/json_rewrite.c | 247 +- test/core/json/json_rewrite_test.c | 320 +- test/core/json/json_test.c | 246 +- .../network_benchmarks/low_level_ping_pong.c | 922 +++--- test/core/profiling/timers_test.c | 85 +- test/core/security/auth_context_test.c | 190 +- test/core/security/base64_test.c | 284 +- test/core/security/create_jwt.c | 103 +- test/core/security/credentials_test.c | 1439 ++++----- test/core/security/fetch_oauth2.c | 113 +- test/core/security/json_token_test.c | 683 +++-- test/core/security/jwt_verifier_test.c | 750 +++-- test/core/security/oauth2_utils.c | 76 +- test/core/security/oauth2_utils.h | 7 +- .../print_google_default_creds_token.c | 94 +- test/core/security/secure_endpoint_test.c | 227 +- test/core/security/security_connector_test.c | 310 +- test/core/security/verify_jwt.c | 108 +- test/core/statistics/census_log_tests.c | 669 ++--- test/core/statistics/census_log_tests.h | 26 +- test/core/statistics/census_stub_test.c | 44 +- test/core/statistics/hash_table_test.c | 406 ++- .../multiple_writers_circular_buffer_test.c | 10 +- test/core/statistics/multiple_writers_test.c | 10 +- test/core/statistics/performance_test.c | 10 +- test/core/statistics/quick_test.c | 26 +- test/core/statistics/rpc_stats_test.c | 235 +- test/core/statistics/small_log_test.c | 10 +- test/core/statistics/trace_test.c | 284 +- test/core/statistics/window_stats_test.c | 346 +-- test/core/support/cmdline_test.c | 366 ++- test/core/support/env_test.c | 24 +- test/core/support/file_test.c | 177 +- test/core/support/histogram_test.c | 226 +- test/core/support/host_port_test.c | 47 +- test/core/support/log_test.c | 30 +- test/core/support/murmur_hash_test.c | 49 +- test/core/support/slice_buffer_test.c | 69 +- test/core/support/slice_test.c | 260 +- test/core/support/stack_lockfree_test.c | 147 +- test/core/support/string_test.c | 377 ++- test/core/support/sync_test.c | 529 ++-- test/core/support/thd_test.c | 79 +- test/core/support/time_test.c | 351 ++- test/core/support/tls_test.c | 47 +- test/core/support/useful_test.c | 54 +- test/core/surface/byte_buffer_reader_test.c | 207 +- test/core/surface/completion_queue_test.c | 441 ++- test/core/surface/lame_client_test.c | 53 +- test/core/surface/multi_init_test.c | 48 +- test/core/transport/chttp2/alpn_test.c | 24 +- test/core/transport/chttp2/bin_encoder_test.c | 196 +- .../core/transport/chttp2/hpack_parser_test.c | 208 +- test/core/transport/chttp2/hpack_table_test.c | 379 ++- .../transport/chttp2/status_conversion_test.c | 148 +- .../transport/chttp2/stream_encoder_test.c | 441 ++- test/core/transport/chttp2/stream_map_test.c | 275 +- .../transport/chttp2/timeout_encoding_test.c | 181 +- test/core/transport/metadata_test.c | 338 +-- test/core/transport/stream_op_test.c | 109 +- test/core/tsi/transport_security_test.c | 388 ++- test/core/util/grpc_profiler.c | 37 +- test/core/util/grpc_profiler.h | 13 +- test/core/util/parse_hexstring.c | 46 +- test/core/util/parse_hexstring.h | 2 +- test/core/util/port.h | 9 +- test/core/util/port_posix.c | 402 ++- test/core/util/port_windows.c | 291 +- test/core/util/reconnect_server.c | 185 +- test/core/util/reconnect_server.h | 41 +- test/core/util/slice_splitter.c | 125 +- test/core/util/slice_splitter.h | 18 +- test/core/util/test_config.c | 95 +- test/core/util/test_config.h | 13 +- 481 files changed, 41169 insertions(+), 47584 deletions(-) diff --git a/src/core/census/aggregation.h b/src/core/census/aggregation.h index 779615f0c96..e9bc6ada960 100644 --- a/src/core/census/aggregation.h +++ b/src/core/census/aggregation.h @@ -37,31 +37,30 @@ #define GRPC_INTERNAL_CORE_CENSUS_AGGREGATION_H /** Structure used to describe an aggregation type. */ -struct census_aggregation_ops -{ +struct census_aggregation_ops { /* Create a new aggregation. The pointer returned can be used in future calls to clone(), free(), record(), data() and reset(). */ - void *(*create) (const void *create_arg); + void *(*create)(const void *create_arg); /* Make a copy of an aggregation created by create() */ - void *(*clone) (const void *aggregation); + void *(*clone)(const void *aggregation); /* Destroy an aggregation created by create() */ - void (*free) (void *aggregation); + void (*free)(void *aggregation); /* Record a new value against aggregation. */ - void (*record) (void *aggregation, double value); + void (*record)(void *aggregation, double value); /* Return current aggregation data. The caller must cast this object into the correct type for the aggregation result. The object returned can be freed by using free_data(). */ - void *(*data) (const void *aggregation); + void *(*data)(const void *aggregation); /* free data returned by data() */ - void (*free_data) (void *data); + void (*free_data)(void *data); /* Reset an aggregation to default (zero) values. */ - void (*reset) (void *aggregation); + void (*reset)(void *aggregation); /* Merge 'from' aggregation into 'to'. Both aggregations must be compatible */ - void (*merge) (void *to, const void *from); + void (*merge)(void *to, const void *from); /* Fill buffer with printable string version of aggregation contents. For debugging only. Returns the number of bytes added to buffer (a value == n implies the buffer was of insufficient size). */ - size_t (*print) (const void *aggregation, char *buffer, size_t n); + size_t (*print)(const void *aggregation, char *buffer, size_t n); }; #endif /* GRPC_INTERNAL_CORE_CENSUS_AGGREGATION_H */ diff --git a/src/core/census/context.c b/src/core/census/context.c index 0a9f129d56a..cab58b653cb 100644 --- a/src/core/census/context.c +++ b/src/core/census/context.c @@ -39,9 +39,8 @@ /* Placeholder implementation only. */ -size_t -census_context_serialize (const census_context * context, char *buffer, size_t buf_size) -{ +size_t census_context_serialize(const census_context *context, char *buffer, + size_t buf_size) { /* TODO(aveitch): implement serialization */ return 0; } diff --git a/src/core/census/context.h b/src/core/census/context.h index 4da979dc33c..d9907d4da75 100644 --- a/src/core/census/context.h +++ b/src/core/census/context.h @@ -38,13 +38,12 @@ /* census_context is the in-memory representation of information needed to * maintain tracing, RPC statistics and resource usage information. */ -struct census_context -{ - gpr_uint64 op_id; /* Operation identifier - unique per-context */ - gpr_uint64 trace_id; /* Globally unique trace identifier */ - /* TODO(aveitch) Add census tags: - const census_tag_set *tags; - */ +struct census_context { + gpr_uint64 op_id; /* Operation identifier - unique per-context */ + gpr_uint64 trace_id; /* Globally unique trace identifier */ + /* TODO(aveitch) Add census tags: + const census_tag_set *tags; + */ }; #endif /* GRPC_INTERNAL_CORE_CENSUS_CONTEXT_H */ diff --git a/src/core/census/grpc_context.c b/src/core/census/grpc_context.c index 4520c680102..429f3ec9db0 100644 --- a/src/core/census/grpc_context.c +++ b/src/core/census/grpc_context.c @@ -35,21 +35,15 @@ #include #include "src/core/surface/call.h" -void -grpc_census_call_set_context (grpc_call * call, census_context * context) -{ - if (census_enabled () == CENSUS_FEATURE_NONE) - { - return; - } - if (context != NULL) - { - grpc_call_context_set (call, GRPC_CONTEXT_TRACING, context, NULL); - } +void grpc_census_call_set_context(grpc_call *call, census_context *context) { + if (census_enabled() == CENSUS_FEATURE_NONE) { + return; + } + if (context != NULL) { + grpc_call_context_set(call, GRPC_CONTEXT_TRACING, context, NULL); + } } -census_context * -grpc_census_call_get_context (grpc_call * call) -{ - return (census_context *) grpc_call_context_get (call, GRPC_CONTEXT_TRACING); +census_context *grpc_census_call_get_context(grpc_call *call) { + return (census_context *)grpc_call_context_get(call, GRPC_CONTEXT_TRACING); } diff --git a/src/core/census/grpc_filter.c b/src/core/census/grpc_filter.c index 485987a2954..1830af3feba 100644 --- a/src/core/census/grpc_filter.c +++ b/src/core/census/grpc_filter.c @@ -46,8 +46,7 @@ #include #include -typedef struct call_data -{ +typedef struct call_data { census_op_id op_id; census_context *ctxt; gpr_timespec start_ts; @@ -58,154 +57,139 @@ typedef struct call_data grpc_closure *on_done_recv; } call_data; -typedef struct channel_data -{ - grpc_mdstr *path_str; /* pointer to meta data str with key == ":path" */ +typedef struct channel_data { + grpc_mdstr *path_str; /* pointer to meta data str with key == ":path" */ } channel_data; -static void -extract_and_annotate_method_tag (grpc_stream_op_buffer * sopb, call_data * calld, channel_data * chand) -{ +static void extract_and_annotate_method_tag(grpc_stream_op_buffer *sopb, + call_data *calld, + channel_data *chand) { grpc_linked_mdelem *m; size_t i; - for (i = 0; i < sopb->nops; i++) - { - grpc_stream_op *op = &sopb->ops[i]; - if (op->type != GRPC_OP_METADATA) - continue; - for (m = op->data.metadata.list.head; m != NULL; m = m->next) - { - if (m->md->key == chand->path_str) - { - gpr_log (GPR_DEBUG, "%s", (const char *) GPR_SLICE_START_PTR (m->md->value->slice)); - /* Add method tag here */ - } - } + for (i = 0; i < sopb->nops; i++) { + grpc_stream_op *op = &sopb->ops[i]; + if (op->type != GRPC_OP_METADATA) continue; + for (m = op->data.metadata.list.head; m != NULL; m = m->next) { + if (m->md->key == chand->path_str) { + gpr_log(GPR_DEBUG, "%s", + (const char *)GPR_SLICE_START_PTR(m->md->value->slice)); + /* Add method tag here */ + } } + } } -static void -client_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) -{ +static void client_mutate_op(grpc_call_element *elem, + grpc_transport_stream_op *op) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - if (op->send_ops) - { - extract_and_annotate_method_tag (op->send_ops, calld, chand); - } + if (op->send_ops) { + extract_and_annotate_method_tag(op->send_ops, calld, chand); + } } -static void -client_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ - client_mutate_op (elem, op); - grpc_call_next_op (exec_ctx, elem, op); +static void client_start_transport_op(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op) { + client_mutate_op(elem, op); + grpc_call_next_op(exec_ctx, elem, op); } -static void -server_on_done_recv (grpc_exec_ctx * exec_ctx, void *ptr, int success) -{ +static void server_on_done_recv(grpc_exec_ctx *exec_ctx, void *ptr, + int success) { grpc_call_element *elem = ptr; call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - if (success) - { - extract_and_annotate_method_tag (calld->recv_ops, calld, chand); - } - calld->on_done_recv->cb (exec_ctx, calld->on_done_recv->cb_arg, success); + if (success) { + extract_and_annotate_method_tag(calld->recv_ops, calld, chand); + } + calld->on_done_recv->cb(exec_ctx, calld->on_done_recv->cb_arg, success); } -static void -server_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) -{ +static void server_mutate_op(grpc_call_element *elem, + grpc_transport_stream_op *op) { call_data *calld = elem->call_data; - if (op->recv_ops) - { - /* substitute our callback for the op callback */ - calld->recv_ops = op->recv_ops; - calld->on_done_recv = op->on_done_recv; - op->on_done_recv = calld->on_done_recv; - } + if (op->recv_ops) { + /* substitute our callback for the op callback */ + calld->recv_ops = op->recv_ops; + calld->on_done_recv = op->on_done_recv; + op->on_done_recv = calld->on_done_recv; + } } -static void -server_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ +static void server_start_transport_op(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op) { 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); + 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); } -static void -client_init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) -{ +static void client_init_call_elem(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + const void *server_transport_data, + grpc_transport_stream_op *initial_op) { call_data *d = elem->call_data; - GPR_ASSERT (d != NULL); - d->start_ts = gpr_now (GPR_CLOCK_REALTIME); - if (initial_op) - client_mutate_op (elem, initial_op); + GPR_ASSERT(d != NULL); + d->start_ts = gpr_now(GPR_CLOCK_REALTIME); + if (initial_op) client_mutate_op(elem, initial_op); } -static void -client_destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ +static void client_destroy_call_elem(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem) { call_data *d = elem->call_data; - GPR_ASSERT (d != NULL); + GPR_ASSERT(d != NULL); /* TODO(hongyu): record rpc client stats and census_rpc_end_op here */ } -static void -server_init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) -{ +static void server_init_call_elem(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + const void *server_transport_data, + grpc_transport_stream_op *initial_op) { call_data *d = elem->call_data; - GPR_ASSERT (d != NULL); - d->start_ts = gpr_now (GPR_CLOCK_REALTIME); + GPR_ASSERT(d != NULL); + d->start_ts = gpr_now(GPR_CLOCK_REALTIME); /* TODO(hongyu): call census_tracing_start_op here. */ - grpc_closure_init (d->on_done_recv, server_on_done_recv, elem); - if (initial_op) - server_mutate_op (elem, initial_op); + grpc_closure_init(d->on_done_recv, server_on_done_recv, elem); + if (initial_op) server_mutate_op(elem, initial_op); } -static void -server_destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ +static void server_destroy_call_elem(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem) { call_data *d = elem->call_data; - GPR_ASSERT (d != NULL); + GPR_ASSERT(d != NULL); /* TODO(hongyu): record rpc server stats and census_tracing_end_op here */ } -static void -init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last) -{ +static void init_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, grpc_channel *master, + const grpc_channel_args *args, grpc_mdctx *mdctx, + int is_first, int is_last) { channel_data *chand = elem->channel_data; - GPR_ASSERT (chand != NULL); - chand->path_str = grpc_mdstr_from_string (mdctx, ":path", 0); + GPR_ASSERT(chand != NULL); + chand->path_str = grpc_mdstr_from_string(mdctx, ":path", 0); } -static void -destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) -{ +static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem) { channel_data *chand = elem->channel_data; - GPR_ASSERT (chand != NULL); - if (chand->path_str != NULL) - { - GRPC_MDSTR_UNREF (chand->path_str); - } + GPR_ASSERT(chand != NULL); + if (chand->path_str != NULL) { + GRPC_MDSTR_UNREF(chand->path_str); + } } const grpc_channel_filter grpc_client_census_filter = { - client_start_transport_op, grpc_channel_next_op, - sizeof (call_data), client_init_call_elem, - client_destroy_call_elem, sizeof (channel_data), - init_channel_elem, destroy_channel_elem, - grpc_call_next_get_peer, "census-client" -}; + client_start_transport_op, grpc_channel_next_op, + sizeof(call_data), client_init_call_elem, + client_destroy_call_elem, sizeof(channel_data), + init_channel_elem, destroy_channel_elem, + grpc_call_next_get_peer, "census-client"}; const grpc_channel_filter grpc_server_census_filter = { - server_start_transport_op, grpc_channel_next_op, - sizeof (call_data), server_init_call_elem, - server_destroy_call_elem, sizeof (channel_data), - init_channel_elem, destroy_channel_elem, - grpc_call_next_get_peer, "census-server" -}; + server_start_transport_op, grpc_channel_next_op, + sizeof(call_data), server_init_call_elem, + server_destroy_call_elem, sizeof(channel_data), + init_channel_elem, destroy_channel_elem, + grpc_call_next_get_peer, "census-server"}; diff --git a/src/core/census/initialize.c b/src/core/census/initialize.c index dab83541686..8d60f790eb7 100644 --- a/src/core/census/initialize.c +++ b/src/core/census/initialize.c @@ -35,39 +35,23 @@ static int features_enabled = CENSUS_FEATURE_NONE; -int -census_initialize (int features) -{ - if (features_enabled != CENSUS_FEATURE_NONE) - { - return 1; - } - if (features != CENSUS_FEATURE_NONE) - { - return 1; - } - else - { - features_enabled = features; - return 0; - } +int census_initialize(int features) { + if (features_enabled != CENSUS_FEATURE_NONE) { + return 1; + } + if (features != CENSUS_FEATURE_NONE) { + return 1; + } else { + features_enabled = features; + return 0; + } } -void -census_shutdown (void) -{ - features_enabled = CENSUS_FEATURE_NONE; -} +void census_shutdown(void) { features_enabled = CENSUS_FEATURE_NONE; } -int -census_supported (void) -{ +int census_supported(void) { /* TODO(aveitch): improve this as we implement features... */ return CENSUS_FEATURE_NONE; } -int -census_enabled (void) -{ - return features_enabled; -} +int census_enabled(void) { return features_enabled; } diff --git a/src/core/census/operation.c b/src/core/census/operation.c index b409c17d48e..118eb0a47ad 100644 --- a/src/core/census/operation.c +++ b/src/core/census/operation.c @@ -34,34 +34,30 @@ /* TODO(aveitch): These are all placeholder implementations. */ -census_timestamp -census_start_rpc_op_timestamp (void) -{ +census_timestamp census_start_rpc_op_timestamp(void) { census_timestamp ct; /* TODO(aveitch): assumes gpr_timespec implementation of census_timestamp. */ - ct.ts = gpr_now (GPR_CLOCK_MONOTONIC); + ct.ts = gpr_now(GPR_CLOCK_MONOTONIC); return ct; } -census_context * -census_start_client_rpc_op (const census_context * context, gpr_int64 rpc_name_id, const census_rpc_name_info * rpc_name_info, const char *peer, int trace_mask, const census_timestamp * start_time) -{ +census_context *census_start_client_rpc_op( + const census_context *context, gpr_int64 rpc_name_id, + const census_rpc_name_info *rpc_name_info, const char *peer, int trace_mask, + const census_timestamp *start_time) { return NULL; } -census_context * -census_start_server_rpc_op (const char *buffer, gpr_int64 rpc_name_id, const census_rpc_name_info * rpc_name_info, const char *peer, int trace_mask, census_timestamp * start_time) -{ +census_context *census_start_server_rpc_op( + const char *buffer, gpr_int64 rpc_name_id, + const census_rpc_name_info *rpc_name_info, const char *peer, int trace_mask, + census_timestamp *start_time) { return NULL; } -census_context * -census_start_op (census_context * context, const char *family, const char *name, int trace_mask) -{ +census_context *census_start_op(census_context *context, const char *family, + const char *name, int trace_mask) { return NULL; } -void -census_end_op (census_context * context, int status) -{ -} +void census_end_op(census_context *context, int status) {} diff --git a/src/core/census/tracing.c b/src/core/census/tracing.c index 272efd4ca03..ae38773c0a1 100644 --- a/src/core/census/tracing.c +++ b/src/core/census/tracing.c @@ -35,18 +35,11 @@ /* TODO(aveitch): These are all placeholder implementations. */ -int -census_trace_mask (const census_context * context) -{ +int census_trace_mask(const census_context *context) { return CENSUS_TRACE_MASK_NONE; } -void -census_set_trace_mask (int trace_mask) -{ -} +void census_set_trace_mask(int trace_mask) {} -void -census_trace_print (census_context * context, gpr_uint32 type, const char *buffer, size_t n) -{ -} +void census_trace_print(census_context *context, gpr_uint32 type, + const char *buffer, size_t n) {} diff --git a/src/core/channel/channel_args.c b/src/core/channel/channel_args.c index 4207a97114a..487db1119a5 100644 --- a/src/core/channel/channel_args.c +++ b/src/core/channel/channel_args.c @@ -41,206 +41,169 @@ #include -static grpc_arg -copy_arg (const grpc_arg * src) -{ +static grpc_arg copy_arg(const grpc_arg *src) { grpc_arg dst; dst.type = src->type; - dst.key = gpr_strdup (src->key); - switch (dst.type) - { + dst.key = gpr_strdup(src->key); + switch (dst.type) { case GRPC_ARG_STRING: - dst.value.string = gpr_strdup (src->value.string); + dst.value.string = gpr_strdup(src->value.string); break; case GRPC_ARG_INTEGER: dst.value.integer = src->value.integer; break; case GRPC_ARG_POINTER: dst.value.pointer = src->value.pointer; - dst.value.pointer.p = src->value.pointer.copy ? src->value.pointer.copy (src->value.pointer.p) : src->value.pointer.p; + dst.value.pointer.p = src->value.pointer.copy + ? src->value.pointer.copy(src->value.pointer.p) + : src->value.pointer.p; break; - } + } return dst; } -grpc_channel_args * -grpc_channel_args_copy_and_add (const grpc_channel_args * src, const grpc_arg * to_add, size_t num_to_add) -{ - grpc_channel_args *dst = gpr_malloc (sizeof (grpc_channel_args)); +grpc_channel_args *grpc_channel_args_copy_and_add(const grpc_channel_args *src, + const grpc_arg *to_add, + size_t num_to_add) { + grpc_channel_args *dst = gpr_malloc(sizeof(grpc_channel_args)); size_t i; size_t src_num_args = (src == NULL) ? 0 : src->num_args; - if (!src && !to_add) - { - dst->num_args = 0; - dst->args = NULL; - return dst; - } + if (!src && !to_add) { + dst->num_args = 0; + dst->args = NULL; + return dst; + } dst->num_args = src_num_args + num_to_add; - dst->args = gpr_malloc (sizeof (grpc_arg) * dst->num_args); - for (i = 0; i < src_num_args; i++) - { - dst->args[i] = copy_arg (&src->args[i]); - } - for (i = 0; i < num_to_add; i++) - { - dst->args[i + src_num_args] = copy_arg (&to_add[i]); - } + dst->args = gpr_malloc(sizeof(grpc_arg) * dst->num_args); + for (i = 0; i < src_num_args; i++) { + dst->args[i] = copy_arg(&src->args[i]); + } + for (i = 0; i < num_to_add; i++) { + dst->args[i + src_num_args] = copy_arg(&to_add[i]); + } return dst; } -grpc_channel_args * -grpc_channel_args_copy (const grpc_channel_args * src) -{ - return grpc_channel_args_copy_and_add (src, NULL, 0); +grpc_channel_args *grpc_channel_args_copy(const grpc_channel_args *src) { + return grpc_channel_args_copy_and_add(src, NULL, 0); } -grpc_channel_args * -grpc_channel_args_merge (const grpc_channel_args * a, const grpc_channel_args * b) -{ - return grpc_channel_args_copy_and_add (a, b->args, b->num_args); +grpc_channel_args *grpc_channel_args_merge(const grpc_channel_args *a, + const grpc_channel_args *b) { + return grpc_channel_args_copy_and_add(a, b->args, b->num_args); } -void -grpc_channel_args_destroy (grpc_channel_args * a) -{ +void grpc_channel_args_destroy(grpc_channel_args *a) { size_t i; - for (i = 0; i < a->num_args; i++) - { - switch (a->args[i].type) - { - case GRPC_ARG_STRING: - gpr_free (a->args[i].value.string); - break; - case GRPC_ARG_INTEGER: - break; - case GRPC_ARG_POINTER: - if (a->args[i].value.pointer.destroy) - { - a->args[i].value.pointer.destroy (a->args[i].value.pointer.p); - } - break; - } - gpr_free (a->args[i].key); + for (i = 0; i < a->num_args; i++) { + switch (a->args[i].type) { + case GRPC_ARG_STRING: + gpr_free(a->args[i].value.string); + break; + case GRPC_ARG_INTEGER: + break; + case GRPC_ARG_POINTER: + if (a->args[i].value.pointer.destroy) { + a->args[i].value.pointer.destroy(a->args[i].value.pointer.p); + } + break; } - gpr_free (a->args); - gpr_free (a); + gpr_free(a->args[i].key); + } + gpr_free(a->args); + gpr_free(a); } -int -grpc_channel_args_is_census_enabled (const grpc_channel_args * a) -{ +int grpc_channel_args_is_census_enabled(const grpc_channel_args *a) { size_t i; - if (a == NULL) - return 0; - for (i = 0; i < a->num_args; i++) - { - if (0 == strcmp (a->args[i].key, GRPC_ARG_ENABLE_CENSUS)) - { - return a->args[i].value.integer != 0; - } + if (a == NULL) return 0; + for (i = 0; i < a->num_args; i++) { + if (0 == strcmp(a->args[i].key, GRPC_ARG_ENABLE_CENSUS)) { + return a->args[i].value.integer != 0; } + } return 0; } -grpc_compression_algorithm -grpc_channel_args_get_compression_algorithm (const grpc_channel_args * a) -{ +grpc_compression_algorithm grpc_channel_args_get_compression_algorithm( + const grpc_channel_args *a) { size_t i; - if (a == NULL) - return 0; - for (i = 0; i < a->num_args; ++i) - { - if (a->args[i].type == GRPC_ARG_INTEGER && !strcmp (GRPC_COMPRESSION_ALGORITHM_ARG, a->args[i].key)) - { - return (grpc_compression_algorithm) a->args[i].value.integer; - break; - } + if (a == NULL) return 0; + for (i = 0; i < a->num_args; ++i) { + if (a->args[i].type == GRPC_ARG_INTEGER && + !strcmp(GRPC_COMPRESSION_ALGORITHM_ARG, a->args[i].key)) { + return (grpc_compression_algorithm)a->args[i].value.integer; + break; } + } return GRPC_COMPRESS_NONE; } -grpc_channel_args * -grpc_channel_args_set_compression_algorithm (grpc_channel_args * a, grpc_compression_algorithm algorithm) -{ +grpc_channel_args *grpc_channel_args_set_compression_algorithm( + grpc_channel_args *a, grpc_compression_algorithm algorithm) { grpc_arg tmp; tmp.type = GRPC_ARG_INTEGER; tmp.key = GRPC_COMPRESSION_ALGORITHM_ARG; tmp.value.integer = algorithm; - return grpc_channel_args_copy_and_add (a, &tmp, 1); + return grpc_channel_args_copy_and_add(a, &tmp, 1); } /** Returns 1 if the argument for compression algorithm's enabled states bitset * was found in \a a, returning the arg's value in \a states. Otherwise, returns * 0. */ -static int -find_compression_algorithm_states_bitset (const grpc_channel_args * a, int **states_arg) -{ - if (a != NULL) - { - size_t i; - for (i = 0; i < a->num_args; ++i) - { - if (a->args[i].type == GRPC_ARG_INTEGER && !strcmp (GRPC_COMPRESSION_ALGORITHM_STATE_ARG, a->args[i].key)) - { - *states_arg = &a->args[i].value.integer; - return 1; /* GPR_TRUE */ - } - } +static int find_compression_algorithm_states_bitset(const grpc_channel_args *a, + int **states_arg) { + if (a != NULL) { + size_t i; + for (i = 0; i < a->num_args; ++i) { + if (a->args[i].type == GRPC_ARG_INTEGER && + !strcmp(GRPC_COMPRESSION_ALGORITHM_STATE_ARG, a->args[i].key)) { + *states_arg = &a->args[i].value.integer; + return 1; /* GPR_TRUE */ + } } - return 0; /* GPR_FALSE */ + } + return 0; /* GPR_FALSE */ } -grpc_channel_args * -grpc_channel_args_compression_algorithm_set_state (grpc_channel_args ** a, grpc_compression_algorithm algorithm, int state) -{ +grpc_channel_args *grpc_channel_args_compression_algorithm_set_state( + grpc_channel_args **a, grpc_compression_algorithm algorithm, int state) { int *states_arg; grpc_channel_args *result = *a; - const int states_arg_found = find_compression_algorithm_states_bitset (*a, &states_arg); + const int states_arg_found = + find_compression_algorithm_states_bitset(*a, &states_arg); - if (states_arg_found) - { - if (state != 0) - { - GPR_BITSET ((unsigned *) states_arg, algorithm); - } - else - { - GPR_BITCLEAR ((unsigned *) states_arg, algorithm); - } + if (states_arg_found) { + if (state != 0) { + GPR_BITSET((unsigned *)states_arg, algorithm); + } else { + GPR_BITCLEAR((unsigned *)states_arg, algorithm); } - else - { - /* create a new arg */ - grpc_arg tmp; - tmp.type = GRPC_ARG_INTEGER; - tmp.key = GRPC_COMPRESSION_ALGORITHM_STATE_ARG; - /* all enabled by default */ - tmp.value.integer = (1u << GRPC_COMPRESS_ALGORITHMS_COUNT) - 1; - if (state != 0) - { - GPR_BITSET ((unsigned *) &tmp.value.integer, algorithm); - } - else - { - GPR_BITCLEAR ((unsigned *) &tmp.value.integer, algorithm); - } - result = grpc_channel_args_copy_and_add (*a, &tmp, 1); - grpc_channel_args_destroy (*a); - *a = result; + } else { + /* create a new arg */ + grpc_arg tmp; + tmp.type = GRPC_ARG_INTEGER; + tmp.key = GRPC_COMPRESSION_ALGORITHM_STATE_ARG; + /* all enabled by default */ + tmp.value.integer = (1u << GRPC_COMPRESS_ALGORITHMS_COUNT) - 1; + if (state != 0) { + GPR_BITSET((unsigned *)&tmp.value.integer, algorithm); + } else { + GPR_BITCLEAR((unsigned *)&tmp.value.integer, algorithm); } + result = grpc_channel_args_copy_and_add(*a, &tmp, 1); + grpc_channel_args_destroy(*a); + *a = result; + } return result; } -int -grpc_channel_args_compression_algorithm_get_states (const grpc_channel_args * a) -{ +int grpc_channel_args_compression_algorithm_get_states( + const grpc_channel_args *a) { int *states_arg; - if (find_compression_algorithm_states_bitset (a, &states_arg)) - { - return *states_arg; - } - else - { - return (1u << GRPC_COMPRESS_ALGORITHMS_COUNT) - 1; /* All algs. enabled */ - } + if (find_compression_algorithm_states_bitset(a, &states_arg)) { + return *states_arg; + } else { + return (1u << GRPC_COMPRESS_ALGORITHMS_COUNT) - 1; /* All algs. enabled */ + } } diff --git a/src/core/channel/channel_args.h b/src/core/channel/channel_args.h index bcfd8c46a0d..f9e7b058606 100644 --- a/src/core/channel/channel_args.h +++ b/src/core/channel/channel_args.h @@ -38,29 +38,34 @@ #include /* Copy some arguments */ -grpc_channel_args *grpc_channel_args_copy (const grpc_channel_args * src); +grpc_channel_args *grpc_channel_args_copy(const grpc_channel_args *src); /** Copy some arguments and add the to_add parameter in the end. If to_add is NULL, it is equivalent to call grpc_channel_args_copy. */ -grpc_channel_args *grpc_channel_args_copy_and_add (const grpc_channel_args * src, const grpc_arg * to_add, size_t num_to_add); +grpc_channel_args *grpc_channel_args_copy_and_add(const grpc_channel_args *src, + const grpc_arg *to_add, + size_t num_to_add); /** Copy args from a then args from b into a new channel args */ -grpc_channel_args *grpc_channel_args_merge (const grpc_channel_args * a, const grpc_channel_args * b); +grpc_channel_args *grpc_channel_args_merge(const grpc_channel_args *a, + const grpc_channel_args *b); /** Destroy arguments created by grpc_channel_args_copy */ -void grpc_channel_args_destroy (grpc_channel_args * a); +void grpc_channel_args_destroy(grpc_channel_args *a); /** Reads census_enabled settings from channel args. Returns 1 if census_enabled * is specified in channel args, otherwise returns 0. */ -int grpc_channel_args_is_census_enabled (const grpc_channel_args * a); +int grpc_channel_args_is_census_enabled(const grpc_channel_args *a); /** Returns the compression algorithm set in \a a. */ -grpc_compression_algorithm grpc_channel_args_get_compression_algorithm (const grpc_channel_args * a); +grpc_compression_algorithm grpc_channel_args_get_compression_algorithm( + const grpc_channel_args *a); /** Returns a channel arg instance with compression enabled. If \a a is * non-NULL, its args are copied. N.B. GRPC_COMPRESS_NONE disables compression * for the channel. */ -grpc_channel_args *grpc_channel_args_set_compression_algorithm (grpc_channel_args * a, grpc_compression_algorithm algorithm); +grpc_channel_args *grpc_channel_args_set_compression_algorithm( + grpc_channel_args *a, grpc_compression_algorithm algorithm); /** Sets the support for the given compression algorithm. By default, all * compression algorithms are enabled. It's an error to disable an algorithm set @@ -69,13 +74,15 @@ grpc_channel_args *grpc_channel_args_set_compression_algorithm (grpc_channel_arg * Returns an instance will the updated algorithm states. The \a a pointer is * 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_channel_args *grpc_channel_args_compression_algorithm_set_state( + grpc_channel_args **a, grpc_compression_algorithm algorithm, int enabled); /** Returns the bitset representing the support state (true for enabled, false * for disabled) for compression algorithms. * * The i-th bit of the returned bitset corresponds to the i-th entry in the * grpc_compression_algorithm enum. */ -int grpc_channel_args_compression_algorithm_get_states (const grpc_channel_args * a); +int grpc_channel_args_compression_algorithm_get_states( + const grpc_channel_args *a); #endif /* GRPC_INTERNAL_CORE_CHANNEL_CHANNEL_ARGS_H */ diff --git a/src/core/channel/channel_stack.c b/src/core/channel/channel_stack.c index 67ab2c535fc..abd7f719e7c 100644 --- a/src/core/channel/channel_stack.c +++ b/src/core/channel/channel_stack.c @@ -59,20 +59,21 @@ int grpc_trace_channel = 0; #define ROUND_UP_TO_ALIGNMENT_SIZE(x) \ (((x) + GPR_MAX_ALIGNMENT - 1u) & ~(GPR_MAX_ALIGNMENT - 1u)) -size_t -grpc_channel_stack_size (const grpc_channel_filter ** filters, size_t filter_count) -{ +size_t grpc_channel_stack_size(const grpc_channel_filter **filters, + size_t filter_count) { /* always need the header, and size for the channel elements */ - size_t size = ROUND_UP_TO_ALIGNMENT_SIZE (sizeof (grpc_channel_stack)) + ROUND_UP_TO_ALIGNMENT_SIZE (filter_count * sizeof (grpc_channel_element)); + size_t size = + ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(grpc_channel_stack)) + + ROUND_UP_TO_ALIGNMENT_SIZE(filter_count * sizeof(grpc_channel_element)); size_t i; - GPR_ASSERT ((GPR_MAX_ALIGNMENT & (GPR_MAX_ALIGNMENT - 1)) == 0 && "GPR_MAX_ALIGNMENT must be a power of two"); + GPR_ASSERT((GPR_MAX_ALIGNMENT & (GPR_MAX_ALIGNMENT - 1)) == 0 && + "GPR_MAX_ALIGNMENT must be a power of two"); /* add the size for each filter */ - for (i = 0; i < filter_count; i++) - { - size += ROUND_UP_TO_ALIGNMENT_SIZE (filters[i]->sizeof_channel_data); - } + for (i = 0; i < filter_count; i++) { + size += ROUND_UP_TO_ALIGNMENT_SIZE(filters[i]->sizeof_channel_data); + } return size; } @@ -85,142 +86,142 @@ grpc_channel_stack_size (const grpc_channel_filter ** filters, size_t filter_cou ((grpc_call_element *)((char *)(stk) + \ ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(grpc_call_stack)))) -grpc_channel_element * -grpc_channel_stack_element (grpc_channel_stack * channel_stack, size_t index) -{ - return CHANNEL_ELEMS_FROM_STACK (channel_stack) + index; +grpc_channel_element *grpc_channel_stack_element( + grpc_channel_stack *channel_stack, size_t index) { + return CHANNEL_ELEMS_FROM_STACK(channel_stack) + index; } -grpc_channel_element * -grpc_channel_stack_last_element (grpc_channel_stack * channel_stack) -{ - return grpc_channel_stack_element (channel_stack, channel_stack->count - 1); +grpc_channel_element *grpc_channel_stack_last_element( + grpc_channel_stack *channel_stack) { + return grpc_channel_stack_element(channel_stack, channel_stack->count - 1); } -grpc_call_element * -grpc_call_stack_element (grpc_call_stack * call_stack, size_t index) -{ - return CALL_ELEMS_FROM_STACK (call_stack) + index; +grpc_call_element *grpc_call_stack_element(grpc_call_stack *call_stack, + size_t index) { + return CALL_ELEMS_FROM_STACK(call_stack) + index; } -void -grpc_channel_stack_init (grpc_exec_ctx * exec_ctx, const grpc_channel_filter ** filters, size_t filter_count, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, grpc_channel_stack * stack) -{ - size_t call_size = ROUND_UP_TO_ALIGNMENT_SIZE (sizeof (grpc_call_stack)) + ROUND_UP_TO_ALIGNMENT_SIZE (filter_count * sizeof (grpc_call_element)); +void grpc_channel_stack_init(grpc_exec_ctx *exec_ctx, + const grpc_channel_filter **filters, + size_t filter_count, grpc_channel *master, + const grpc_channel_args *args, + grpc_mdctx *metadata_context, + grpc_channel_stack *stack) { + size_t call_size = + ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(grpc_call_stack)) + + ROUND_UP_TO_ALIGNMENT_SIZE(filter_count * sizeof(grpc_call_element)); grpc_channel_element *elems; char *user_data; size_t i; stack->count = filter_count; - elems = CHANNEL_ELEMS_FROM_STACK (stack); - user_data = ((char *) elems) + ROUND_UP_TO_ALIGNMENT_SIZE (filter_count * sizeof (grpc_channel_element)); + elems = CHANNEL_ELEMS_FROM_STACK(stack); + user_data = + ((char *)elems) + + ROUND_UP_TO_ALIGNMENT_SIZE(filter_count * sizeof(grpc_channel_element)); /* init per-filter data */ - for (i = 0; i < filter_count; i++) - { - elems[i].filter = filters[i]; - elems[i].channel_data = user_data; - elems[i].filter->init_channel_elem (exec_ctx, &elems[i], master, args, metadata_context, i == 0, i == (filter_count - 1)); - user_data += ROUND_UP_TO_ALIGNMENT_SIZE (filters[i]->sizeof_channel_data); - call_size += ROUND_UP_TO_ALIGNMENT_SIZE (filters[i]->sizeof_call_data); - } - - GPR_ASSERT (user_data > (char *) stack); - GPR_ASSERT ((gpr_uintptr) (user_data - (char *) stack) == grpc_channel_stack_size (filters, filter_count)); + for (i = 0; i < filter_count; i++) { + elems[i].filter = filters[i]; + elems[i].channel_data = user_data; + elems[i].filter->init_channel_elem(exec_ctx, &elems[i], master, args, + metadata_context, i == 0, + i == (filter_count - 1)); + user_data += ROUND_UP_TO_ALIGNMENT_SIZE(filters[i]->sizeof_channel_data); + call_size += ROUND_UP_TO_ALIGNMENT_SIZE(filters[i]->sizeof_call_data); + } + + GPR_ASSERT(user_data > (char *)stack); + GPR_ASSERT((gpr_uintptr)(user_data - (char *)stack) == + grpc_channel_stack_size(filters, filter_count)); stack->call_stack_size = call_size; } -void -grpc_channel_stack_destroy (grpc_exec_ctx * exec_ctx, grpc_channel_stack * stack) -{ - grpc_channel_element *channel_elems = CHANNEL_ELEMS_FROM_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 (exec_ctx, &channel_elems[i]); - } + for (i = 0; i < count; i++) { + channel_elems[i].filter->destroy_channel_elem(exec_ctx, &channel_elems[i]); + } } -void -grpc_call_stack_init (grpc_exec_ctx * exec_ctx, grpc_channel_stack * channel_stack, const void *transport_server_data, grpc_transport_stream_op * initial_op, grpc_call_stack * call_stack) -{ - grpc_channel_element *channel_elems = CHANNEL_ELEMS_FROM_STACK (channel_stack); +void grpc_call_stack_init(grpc_exec_ctx *exec_ctx, + grpc_channel_stack *channel_stack, + const void *transport_server_data, + grpc_transport_stream_op *initial_op, + grpc_call_stack *call_stack) { + grpc_channel_element *channel_elems = CHANNEL_ELEMS_FROM_STACK(channel_stack); size_t count = channel_stack->count; grpc_call_element *call_elems; char *user_data; size_t i; call_stack->count = count; - call_elems = CALL_ELEMS_FROM_STACK (call_stack); - user_data = ((char *) call_elems) + ROUND_UP_TO_ALIGNMENT_SIZE (count * sizeof (grpc_call_element)); + call_elems = CALL_ELEMS_FROM_STACK(call_stack); + user_data = ((char *)call_elems) + + ROUND_UP_TO_ALIGNMENT_SIZE(count * sizeof(grpc_call_element)); /* init per-filter data */ - for (i = 0; i < count; i++) - { - 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; - call_elems[i].filter->init_call_elem (exec_ctx, &call_elems[i], transport_server_data, initial_op); - user_data += ROUND_UP_TO_ALIGNMENT_SIZE (call_elems[i].filter->sizeof_call_data); - } + for (i = 0; i < count; i++) { + 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; + call_elems[i].filter->init_call_elem(exec_ctx, &call_elems[i], + transport_server_data, initial_op); + user_data += + ROUND_UP_TO_ALIGNMENT_SIZE(call_elems[i].filter->sizeof_call_data); + } } -void -grpc_call_stack_destroy (grpc_exec_ctx * exec_ctx, grpc_call_stack * stack) -{ - grpc_call_element *elems = CALL_ELEMS_FROM_STACK (stack); +void grpc_call_stack_destroy(grpc_exec_ctx *exec_ctx, grpc_call_stack *stack) { + grpc_call_element *elems = CALL_ELEMS_FROM_STACK(stack); size_t count = stack->count; size_t i; /* destroy per-filter data */ - for (i = 0; i < count; i++) - { - elems[i].filter->destroy_call_elem (exec_ctx, &elems[i]); - } + for (i = 0; i < count; i++) { + elems[i].filter->destroy_call_elem(exec_ctx, &elems[i]); + } } -void -grpc_call_next_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ +void grpc_call_next_op(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + grpc_transport_stream_op *op) { grpc_call_element *next_elem = elem + 1; - next_elem->filter->start_transport_stream_op (exec_ctx, next_elem, op); + next_elem->filter->start_transport_stream_op(exec_ctx, next_elem, op); } -char * -grpc_call_next_get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ +char *grpc_call_next_get_peer(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem) { grpc_call_element *next_elem = elem + 1; - return next_elem->filter->get_peer (exec_ctx, next_elem); + return next_elem->filter->get_peer(exec_ctx, next_elem); } -void -grpc_channel_next_op (grpc_exec_ctx * exec_ctx, 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 (exec_ctx, next_elem, op); + next_elem->filter->start_transport_op(exec_ctx, next_elem, op); } -grpc_channel_stack * -grpc_channel_stack_from_top_element (grpc_channel_element * elem) -{ - return (grpc_channel_stack *) ((char *) (elem) - ROUND_UP_TO_ALIGNMENT_SIZE (sizeof (grpc_channel_stack))); +grpc_channel_stack *grpc_channel_stack_from_top_element( + grpc_channel_element *elem) { + return (grpc_channel_stack *)((char *)(elem)-ROUND_UP_TO_ALIGNMENT_SIZE( + sizeof(grpc_channel_stack))); } -grpc_call_stack * -grpc_call_stack_from_top_element (grpc_call_element * elem) -{ - return (grpc_call_stack *) ((char *) (elem) - ROUND_UP_TO_ALIGNMENT_SIZE (sizeof (grpc_call_stack))); +grpc_call_stack *grpc_call_stack_from_top_element(grpc_call_element *elem) { + return (grpc_call_stack *)((char *)(elem)-ROUND_UP_TO_ALIGNMENT_SIZE( + sizeof(grpc_call_stack))); } -void -grpc_call_element_send_cancel (grpc_exec_ctx * exec_ctx, grpc_call_element * cur_elem) -{ +void grpc_call_element_send_cancel(grpc_exec_ctx *exec_ctx, + grpc_call_element *cur_elem) { grpc_transport_stream_op op; - memset (&op, 0, sizeof (op)); + memset(&op, 0, sizeof(op)); op.cancel_with_status = GRPC_STATUS_CANCELLED; - grpc_call_next_op (exec_ctx, cur_elem, &op); + grpc_call_next_op(exec_ctx, cur_elem, &op); } diff --git a/src/core/channel/channel_stack.h b/src/core/channel/channel_stack.h index 0bfe3269760..6732cc30186 100644 --- a/src/core/channel/channel_stack.h +++ b/src/core/channel/channel_stack.h @@ -61,15 +61,17 @@ typedef struct grpc_call_element grpc_call_element; 4. a name, which is useful when debugging Members are laid out in approximate frequency of use order. */ -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) (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op); + void (*start_transport_stream_op)(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *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_exec_ctx *exec_ctx, + grpc_channel_element *elem, grpc_transport_op *op); /* sizeof(per call data) */ size_t sizeof_call_data; @@ -81,10 +83,12 @@ typedef struct on a client; if it is non-NULL, then it points to memory owned by the transport and is on the server. Most filters want to ignore this argument. */ - void (*init_call_elem) (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op); + void (*init_call_elem)(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + const void *server_transport_data, + grpc_transport_stream_op *initial_op); /* Destroy per call data. The filter does not need to do any chaining */ - void (*destroy_call_elem) (grpc_exec_ctx * exec_ctx, grpc_call_element * elem); + void (*destroy_call_elem)(grpc_exec_ctx *exec_ctx, grpc_call_element *elem); /* sizeof(per channel data) */ size_t sizeof_channel_data; @@ -94,13 +98,17 @@ typedef struct is_first, is_last designate this elements position in the stack, and are useful for asserting correct configuration by upper layer code. The filter does not need to do any chaining */ - void (*init_channel_elem) (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last); + void (*init_channel_elem)(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, + grpc_channel *master, const grpc_channel_args *args, + grpc_mdctx *metadata_context, int is_first, + int is_last); /* 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_exec_ctx *exec_ctx, + grpc_channel_element *elem); /* Implement grpc_call_get_peer() */ - char *(*get_peer) (grpc_exec_ctx * exec_ctx, grpc_call_element * elem); + char *(*get_peer)(grpc_exec_ctx *exec_ctx, grpc_call_element *elem); /* The name of this filter */ const char *name; @@ -108,8 +116,7 @@ typedef struct /* A channel_element tracks its filter and the filter requested memory within a channel allocation */ -struct grpc_channel_element -{ +struct grpc_channel_element { const grpc_channel_filter *filter; void *channel_data; }; @@ -117,8 +124,7 @@ struct grpc_channel_element /* A call_element tracks its filter, the filter requested memory within a channel allocation, and the filter requested memory within a call allocation */ -struct grpc_call_element -{ +struct grpc_call_element { const grpc_channel_filter *filter; void *channel_data; void *call_data; @@ -126,8 +132,7 @@ struct grpc_call_element /* A channel stack tracks a set of related filters for one channel, and guarantees they live within a single malloc() allocation */ -typedef struct -{ +typedef struct { size_t count; /* Memory required for a call stack (computed at channel stack initialization) */ @@ -136,48 +141,63 @@ typedef struct /* A call stack tracks a set of related filters for one call, and guarantees they live within a single malloc() allocation */ -typedef struct -{ - size_t count; -} grpc_call_stack; +typedef struct { size_t count; } grpc_call_stack; /* Get a channel element given a channel stack and its index */ -grpc_channel_element *grpc_channel_stack_element (grpc_channel_stack * stack, size_t i); +grpc_channel_element *grpc_channel_stack_element(grpc_channel_stack *stack, + size_t i); /* Get the last channel element in a channel stack */ -grpc_channel_element *grpc_channel_stack_last_element (grpc_channel_stack * stack); +grpc_channel_element *grpc_channel_stack_last_element( + grpc_channel_stack *stack); /* Get a call stack element given a call stack and an index */ -grpc_call_element *grpc_call_stack_element (grpc_call_stack * stack, size_t i); +grpc_call_element *grpc_call_stack_element(grpc_call_stack *stack, size_t i); /* Determine memory required for a channel stack containing a set of filters */ -size_t grpc_channel_stack_size (const grpc_channel_filter ** filters, size_t filter_count); +size_t grpc_channel_stack_size(const grpc_channel_filter **filters, + size_t filter_count); /* Initialize a channel stack given some filters */ -void grpc_channel_stack_init (grpc_exec_ctx * exec_ctx, const grpc_channel_filter ** filters, size_t filter_count, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, grpc_channel_stack * stack); +void grpc_channel_stack_init(grpc_exec_ctx *exec_ctx, + const grpc_channel_filter **filters, + size_t filter_count, grpc_channel *master, + const grpc_channel_args *args, + grpc_mdctx *metadata_context, + 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_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. */ -void grpc_call_stack_init (grpc_exec_ctx * exec_ctx, grpc_channel_stack * channel_stack, const void *transport_server_data, grpc_transport_stream_op * initial_op, grpc_call_stack * call_stack); +void grpc_call_stack_init(grpc_exec_ctx *exec_ctx, + grpc_channel_stack *channel_stack, + const void *transport_server_data, + grpc_transport_stream_op *initial_op, + grpc_call_stack *call_stack); /* Destroy a call stack */ -void grpc_call_stack_destroy (grpc_exec_ctx * exec_ctx, grpc_call_stack * stack); +void grpc_call_stack_destroy(grpc_exec_ctx *exec_ctx, grpc_call_stack *stack); /* Call the next operation in a call stack */ -void grpc_call_next_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op); +void grpc_call_next_op(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + grpc_transport_stream_op *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_exec_ctx *exec_ctx, grpc_channel_element *elem, + grpc_transport_op *op); /* Pass through a request to get_peer to the next child element */ -char *grpc_call_next_get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem); +char *grpc_call_next_get_peer(grpc_exec_ctx *exec_ctx, grpc_call_element *elem); /* Given the top element of a channel stack, get the channel stack itself */ -grpc_channel_stack *grpc_channel_stack_from_top_element (grpc_channel_element * elem); +grpc_channel_stack *grpc_channel_stack_from_top_element( + grpc_channel_element *elem); /* Given the top element of a call stack, get the call stack itself */ -grpc_call_stack *grpc_call_stack_from_top_element (grpc_call_element * elem); +grpc_call_stack *grpc_call_stack_from_top_element(grpc_call_element *elem); -void grpc_call_log_op (char *file, int line, gpr_log_severity severity, grpc_call_element * elem, grpc_transport_stream_op * op); +void grpc_call_log_op(char *file, int line, gpr_log_severity severity, + grpc_call_element *elem, grpc_transport_stream_op *op); -void grpc_call_element_send_cancel (grpc_exec_ctx * exec_ctx, grpc_call_element * cur_elem); +void grpc_call_element_send_cancel(grpc_exec_ctx *exec_ctx, + grpc_call_element *cur_elem); extern int grpc_trace_channel; diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 97f097d301e..ce03ad5eb06 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -51,8 +51,7 @@ typedef struct call_data call_data; -typedef struct -{ +typedef struct { /** metadata context for this channel */ grpc_mdctx *mdctx; /** resolver for this channel */ @@ -90,16 +89,14 @@ typedef struct to watch for state changes from the lb_policy. When a state change is seen, we update the channel, and create a new watcher */ -typedef struct -{ +typedef struct { channel_data *chand; grpc_closure on_changed; grpc_connectivity_state state; grpc_lb_policy *lb_policy; } lb_policy_connectivity_watcher; -typedef enum -{ +typedef enum { CALL_CREATED, CALL_WAITING_FOR_SEND, CALL_WAITING_FOR_CONFIG, @@ -109,8 +106,7 @@ typedef enum CALL_CANCELLED } call_state; -struct call_data -{ +struct call_data { /* owning element */ grpc_call_element *elem; @@ -127,406 +123,361 @@ struct call_data grpc_linked_mdelem details; }; -static grpc_closure * -merge_into_waiting_op (grpc_call_element * elem, grpc_transport_stream_op * new_op) - GRPC_MUST_USE_RESULT; +static grpc_closure *merge_into_waiting_op(grpc_call_element *elem, + grpc_transport_stream_op *new_op) + GRPC_MUST_USE_RESULT; - static void handle_op_after_cancellation (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ +static void handle_op_after_cancellation(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - if (op->send_ops) - { - grpc_stream_ops_unref_owned_objects (op->send_ops->ops, op->send_ops->nops); - op->on_done_send->cb (exec_ctx, op->on_done_send->cb_arg, 0); - } - if (op->recv_ops) - { - char status[GPR_LTOA_MIN_BUFSIZE]; - grpc_metadata_batch mdb; - gpr_ltoa (GRPC_STATUS_CANCELLED, status); - calld->status.md = grpc_mdelem_from_strings (chand->mdctx, "grpc-status", status); - calld->details.md = grpc_mdelem_from_strings (chand->mdctx, "grpc-message", "Cancelled"); - calld->status.prev = calld->details.next = NULL; - calld->status.next = &calld->details; - calld->details.prev = &calld->status; - mdb.list.head = &calld->status; - mdb.list.tail = &calld->details; - mdb.garbage.head = mdb.garbage.tail = NULL; - mdb.deadline = gpr_inf_future (GPR_CLOCK_REALTIME); - grpc_sopb_add_metadata (op->recv_ops, mdb); - *op->recv_state = GRPC_STREAM_CLOSED; - op->on_done_recv->cb (exec_ctx, op->on_done_recv->cb_arg, 1); - } - if (op->on_consumed) - { - op->on_consumed->cb (exec_ctx, op->on_consumed->cb_arg, 0); - } + if (op->send_ops) { + grpc_stream_ops_unref_owned_objects(op->send_ops->ops, op->send_ops->nops); + op->on_done_send->cb(exec_ctx, op->on_done_send->cb_arg, 0); + } + if (op->recv_ops) { + char status[GPR_LTOA_MIN_BUFSIZE]; + grpc_metadata_batch mdb; + gpr_ltoa(GRPC_STATUS_CANCELLED, status); + calld->status.md = + grpc_mdelem_from_strings(chand->mdctx, "grpc-status", status); + calld->details.md = + grpc_mdelem_from_strings(chand->mdctx, "grpc-message", "Cancelled"); + calld->status.prev = calld->details.next = NULL; + calld->status.next = &calld->details; + calld->details.prev = &calld->status; + mdb.list.head = &calld->status; + mdb.list.tail = &calld->details; + mdb.garbage.head = mdb.garbage.tail = NULL; + mdb.deadline = gpr_inf_future(GPR_CLOCK_REALTIME); + grpc_sopb_add_metadata(op->recv_ops, mdb); + *op->recv_state = GRPC_STREAM_CLOSED; + op->on_done_recv->cb(exec_ctx, op->on_done_recv->cb_arg, 1); + } + if (op->on_consumed) { + op->on_consumed->cb(exec_ctx, op->on_consumed->cb_arg, 0); + } } -typedef struct -{ +typedef struct { grpc_closure closure; grpc_call_element *elem; } waiting_call; -static void perform_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op, int continuation); +static void perform_transport_stream_op(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op, + int continuation); -static void -continue_with_pick (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) -{ +static void continue_with_pick(grpc_exec_ctx *exec_ctx, void *arg, + int iomgr_success) { waiting_call *wc = arg; call_data *calld = wc->elem->call_data; - perform_transport_stream_op (exec_ctx, wc->elem, &calld->waiting_op, 1); - gpr_free (wc); + perform_transport_stream_op(exec_ctx, wc->elem, &calld->waiting_op, 1); + gpr_free(wc); } -static void -add_to_lb_policy_wait_queue_locked_state_config (grpc_call_element * elem) -{ +static void add_to_lb_policy_wait_queue_locked_state_config( + grpc_call_element *elem) { channel_data *chand = elem->channel_data; - waiting_call *wc = gpr_malloc (sizeof (*wc)); - grpc_closure_init (&wc->closure, continue_with_pick, wc); + waiting_call *wc = gpr_malloc(sizeof(*wc)); + grpc_closure_init(&wc->closure, continue_with_pick, wc); wc->elem = elem; - grpc_closure_list_add (&chand->waiting_for_config_closures, &wc->closure, 1); + grpc_closure_list_add(&chand->waiting_for_config_closures, &wc->closure, 1); } -static int -is_empty (void *p, int len) -{ +static int is_empty(void *p, int len) { char *ptr = p; int i; - for (i = 0; i < len; i++) - { - if (ptr[i] != 0) - return 0; - } + for (i = 0; i < len; i++) { + if (ptr[i] != 0) return 0; + } return 1; } -static void -started_call (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) -{ +static void started_call(grpc_exec_ctx *exec_ctx, void *arg, + int iomgr_success) { call_data *calld = arg; grpc_transport_stream_op op; int have_waiting; - gpr_mu_lock (&calld->mu_state); - if (calld->state == CALL_CANCELLED && calld->subchannel_call != NULL) - { - memset (&op, 0, sizeof (op)); - op.cancel_with_status = GRPC_STATUS_CANCELLED; - gpr_mu_unlock (&calld->mu_state); - grpc_subchannel_call_process_op (exec_ctx, calld->subchannel_call, &op); - } - else if (calld->state == CALL_WAITING_FOR_CALL) - { - have_waiting = !is_empty (&calld->waiting_op, sizeof (calld->waiting_op)); - if (calld->subchannel_call != NULL) - { - calld->state = CALL_ACTIVE; - gpr_mu_unlock (&calld->mu_state); - if (have_waiting) - { - grpc_subchannel_call_process_op (exec_ctx, calld->subchannel_call, &calld->waiting_op); - } - } - else - { - calld->state = CALL_CANCELLED; - gpr_mu_unlock (&calld->mu_state); - if (have_waiting) - { - handle_op_after_cancellation (exec_ctx, calld->elem, &calld->waiting_op); - } - } - } - else - { - GPR_ASSERT (calld->state == CALL_CANCELLED); - gpr_mu_unlock (&calld->mu_state); - } + gpr_mu_lock(&calld->mu_state); + if (calld->state == CALL_CANCELLED && calld->subchannel_call != NULL) { + memset(&op, 0, sizeof(op)); + op.cancel_with_status = GRPC_STATUS_CANCELLED; + gpr_mu_unlock(&calld->mu_state); + grpc_subchannel_call_process_op(exec_ctx, calld->subchannel_call, &op); + } else if (calld->state == CALL_WAITING_FOR_CALL) { + have_waiting = !is_empty(&calld->waiting_op, sizeof(calld->waiting_op)); + if (calld->subchannel_call != NULL) { + calld->state = CALL_ACTIVE; + gpr_mu_unlock(&calld->mu_state); + if (have_waiting) { + grpc_subchannel_call_process_op(exec_ctx, calld->subchannel_call, + &calld->waiting_op); + } + } else { + calld->state = CALL_CANCELLED; + gpr_mu_unlock(&calld->mu_state); + if (have_waiting) { + handle_op_after_cancellation(exec_ctx, calld->elem, &calld->waiting_op); + } + } + } else { + GPR_ASSERT(calld->state == CALL_CANCELLED); + gpr_mu_unlock(&calld->mu_state); + } } -static void -picked_target (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) -{ +static void picked_target(grpc_exec_ctx *exec_ctx, void *arg, + int iomgr_success) { call_data *calld = arg; grpc_pollset *pollset; - if (calld->picked_channel == NULL) - { - /* treat this like a cancellation */ - calld->waiting_op.cancel_with_status = GRPC_STATUS_UNAVAILABLE; - perform_transport_stream_op (exec_ctx, calld->elem, &calld->waiting_op, 1); - } - else - { - gpr_mu_lock (&calld->mu_state); - if (calld->state == CALL_CANCELLED) - { - gpr_mu_unlock (&calld->mu_state); - handle_op_after_cancellation (exec_ctx, calld->elem, &calld->waiting_op); - } - else - { - GPR_ASSERT (calld->state == CALL_WAITING_FOR_PICK); - calld->state = CALL_WAITING_FOR_CALL; - pollset = calld->waiting_op.bind_pollset; - gpr_mu_unlock (&calld->mu_state); - grpc_closure_init (&calld->async_setup_task, started_call, calld); - grpc_subchannel_create_call (exec_ctx, calld->picked_channel, pollset, &calld->subchannel_call, &calld->async_setup_task); - } - } + if (calld->picked_channel == NULL) { + /* treat this like a cancellation */ + calld->waiting_op.cancel_with_status = GRPC_STATUS_UNAVAILABLE; + perform_transport_stream_op(exec_ctx, calld->elem, &calld->waiting_op, 1); + } else { + gpr_mu_lock(&calld->mu_state); + if (calld->state == CALL_CANCELLED) { + gpr_mu_unlock(&calld->mu_state); + handle_op_after_cancellation(exec_ctx, calld->elem, &calld->waiting_op); + } else { + GPR_ASSERT(calld->state == CALL_WAITING_FOR_PICK); + calld->state = CALL_WAITING_FOR_CALL; + pollset = calld->waiting_op.bind_pollset; + gpr_mu_unlock(&calld->mu_state); + grpc_closure_init(&calld->async_setup_task, started_call, calld); + grpc_subchannel_create_call(exec_ctx, calld->picked_channel, pollset, + &calld->subchannel_call, + &calld->async_setup_task); + } + } } -static grpc_closure * -merge_into_waiting_op (grpc_call_element * elem, grpc_transport_stream_op * new_op) -{ +static grpc_closure *merge_into_waiting_op(grpc_call_element *elem, + grpc_transport_stream_op *new_op) { call_data *calld = elem->call_data; grpc_closure *consumed_op = NULL; grpc_transport_stream_op *waiting_op = &calld->waiting_op; - GPR_ASSERT ((waiting_op->send_ops != NULL) + (new_op->send_ops != NULL) <= 1); - GPR_ASSERT ((waiting_op->recv_ops != NULL) + (new_op->recv_ops != NULL) <= 1); - if (new_op->send_ops != NULL) - { - waiting_op->send_ops = new_op->send_ops; - waiting_op->is_last_send = new_op->is_last_send; - waiting_op->on_done_send = new_op->on_done_send; - } - if (new_op->recv_ops != NULL) - { - waiting_op->recv_ops = new_op->recv_ops; - waiting_op->recv_state = new_op->recv_state; - waiting_op->on_done_recv = new_op->on_done_recv; - } - if (new_op->on_consumed != NULL) - { - if (waiting_op->on_consumed != NULL) - { - consumed_op = waiting_op->on_consumed; - } - waiting_op->on_consumed = new_op->on_consumed; - } - if (new_op->cancel_with_status != GRPC_STATUS_OK) - { - waiting_op->cancel_with_status = new_op->cancel_with_status; - } + GPR_ASSERT((waiting_op->send_ops != NULL) + (new_op->send_ops != NULL) <= 1); + GPR_ASSERT((waiting_op->recv_ops != NULL) + (new_op->recv_ops != NULL) <= 1); + if (new_op->send_ops != NULL) { + waiting_op->send_ops = new_op->send_ops; + waiting_op->is_last_send = new_op->is_last_send; + waiting_op->on_done_send = new_op->on_done_send; + } + if (new_op->recv_ops != NULL) { + waiting_op->recv_ops = new_op->recv_ops; + waiting_op->recv_state = new_op->recv_state; + waiting_op->on_done_recv = new_op->on_done_recv; + } + if (new_op->on_consumed != NULL) { + if (waiting_op->on_consumed != NULL) { + consumed_op = waiting_op->on_consumed; + } + waiting_op->on_consumed = new_op->on_consumed; + } + if (new_op->cancel_with_status != GRPC_STATUS_OK) { + waiting_op->cancel_with_status = new_op->cancel_with_status; + } return consumed_op; } -static char * -cc_get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ +static char *cc_get_peer(grpc_exec_ctx *exec_ctx, grpc_call_element *elem) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_subchannel_call *subchannel_call; char *result; - gpr_mu_lock (&calld->mu_state); - if (calld->state == CALL_ACTIVE) - { - subchannel_call = calld->subchannel_call; - GRPC_SUBCHANNEL_CALL_REF (subchannel_call, "get_peer"); - gpr_mu_unlock (&calld->mu_state); - result = grpc_subchannel_call_get_peer (exec_ctx, subchannel_call); - GRPC_SUBCHANNEL_CALL_UNREF (exec_ctx, subchannel_call, "get_peer"); - return result; - } - else - { - gpr_mu_unlock (&calld->mu_state); - return grpc_channel_get_target (chand->master); - } + gpr_mu_lock(&calld->mu_state); + if (calld->state == CALL_ACTIVE) { + subchannel_call = calld->subchannel_call; + GRPC_SUBCHANNEL_CALL_REF(subchannel_call, "get_peer"); + gpr_mu_unlock(&calld->mu_state); + result = grpc_subchannel_call_get_peer(exec_ctx, subchannel_call); + GRPC_SUBCHANNEL_CALL_UNREF(exec_ctx, subchannel_call, "get_peer"); + return result; + } else { + gpr_mu_unlock(&calld->mu_state); + return grpc_channel_get_target(chand->master); + } } -static void -perform_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op, int continuation) -{ +static void perform_transport_stream_op(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op, + int continuation) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_subchannel_call *subchannel_call; grpc_lb_policy *lb_policy; grpc_transport_stream_op op2; - GPR_ASSERT (elem->filter == &grpc_client_channel_filter); - GRPC_CALL_LOG_OP (GPR_INFO, elem, op); + GPR_ASSERT(elem->filter == &grpc_client_channel_filter); + GRPC_CALL_LOG_OP(GPR_INFO, elem, op); - gpr_mu_lock (&calld->mu_state); - switch (calld->state) - { + gpr_mu_lock(&calld->mu_state); + switch (calld->state) { case CALL_ACTIVE: - GPR_ASSERT (!continuation); + GPR_ASSERT(!continuation); subchannel_call = calld->subchannel_call; - gpr_mu_unlock (&calld->mu_state); - grpc_subchannel_call_process_op (exec_ctx, subchannel_call, op); + gpr_mu_unlock(&calld->mu_state); + grpc_subchannel_call_process_op(exec_ctx, subchannel_call, op); break; case CALL_CANCELLED: - gpr_mu_unlock (&calld->mu_state); - handle_op_after_cancellation (exec_ctx, elem, op); + gpr_mu_unlock(&calld->mu_state); + handle_op_after_cancellation(exec_ctx, elem, op); break; case CALL_WAITING_FOR_SEND: - GPR_ASSERT (!continuation); - grpc_exec_ctx_enqueue (exec_ctx, merge_into_waiting_op (elem, op), 1); - if (!calld->waiting_op.send_ops && calld->waiting_op.cancel_with_status == GRPC_STATUS_OK) - { - gpr_mu_unlock (&calld->mu_state); - break; - } + GPR_ASSERT(!continuation); + grpc_exec_ctx_enqueue(exec_ctx, merge_into_waiting_op(elem, op), 1); + if (!calld->waiting_op.send_ops && + calld->waiting_op.cancel_with_status == GRPC_STATUS_OK) { + gpr_mu_unlock(&calld->mu_state); + break; + } *op = calld->waiting_op; - memset (&calld->waiting_op, 0, sizeof (calld->waiting_op)); + memset(&calld->waiting_op, 0, sizeof(calld->waiting_op)); continuation = 1; - /* fall through */ + /* fall through */ case CALL_WAITING_FOR_CONFIG: case CALL_WAITING_FOR_PICK: case CALL_WAITING_FOR_CALL: - if (!continuation) - { - if (op->cancel_with_status != GRPC_STATUS_OK) - { - calld->state = CALL_CANCELLED; - op2 = calld->waiting_op; - memset (&calld->waiting_op, 0, sizeof (calld->waiting_op)); - if (op->on_consumed) - { - calld->waiting_op.on_consumed = op->on_consumed; - op->on_consumed = NULL; - } - else if (op2.on_consumed) - { - calld->waiting_op.on_consumed = op2.on_consumed; - op2.on_consumed = NULL; - } - gpr_mu_unlock (&calld->mu_state); - handle_op_after_cancellation (exec_ctx, elem, op); - handle_op_after_cancellation (exec_ctx, elem, &op2); - } - else - { - grpc_exec_ctx_enqueue (exec_ctx, merge_into_waiting_op (elem, op), 1); - gpr_mu_unlock (&calld->mu_state); - } - break; - } - /* fall through */ + if (!continuation) { + if (op->cancel_with_status != GRPC_STATUS_OK) { + calld->state = CALL_CANCELLED; + op2 = calld->waiting_op; + memset(&calld->waiting_op, 0, sizeof(calld->waiting_op)); + if (op->on_consumed) { + calld->waiting_op.on_consumed = op->on_consumed; + op->on_consumed = NULL; + } else if (op2.on_consumed) { + calld->waiting_op.on_consumed = op2.on_consumed; + op2.on_consumed = NULL; + } + gpr_mu_unlock(&calld->mu_state); + handle_op_after_cancellation(exec_ctx, elem, op); + handle_op_after_cancellation(exec_ctx, elem, &op2); + } else { + grpc_exec_ctx_enqueue(exec_ctx, merge_into_waiting_op(elem, op), 1); + gpr_mu_unlock(&calld->mu_state); + } + break; + } + /* fall through */ case CALL_CREATED: - if (op->cancel_with_status != GRPC_STATUS_OK) - { - calld->state = CALL_CANCELLED; - gpr_mu_unlock (&calld->mu_state); - handle_op_after_cancellation (exec_ctx, elem, op); - } - else - { - calld->waiting_op = *op; - - if (op->send_ops == NULL) - { - /* need to have some send ops before we can select the - lb target */ - calld->state = CALL_WAITING_FOR_SEND; - gpr_mu_unlock (&calld->mu_state); - } - else - { - gpr_mu_lock (&chand->mu_config); - lb_policy = chand->lb_policy; - if (lb_policy) - { - grpc_transport_stream_op *op = &calld->waiting_op; - grpc_pollset *bind_pollset = op->bind_pollset; - grpc_metadata_batch *initial_metadata = &op->send_ops->ops[0].data.metadata; - GRPC_LB_POLICY_REF (lb_policy, "pick"); - gpr_mu_unlock (&chand->mu_config); - calld->state = CALL_WAITING_FOR_PICK; - - GPR_ASSERT (op->bind_pollset); - GPR_ASSERT (op->send_ops); - GPR_ASSERT (op->send_ops->nops >= 1); - GPR_ASSERT (op->send_ops->ops[0].type == GRPC_OP_METADATA); - gpr_mu_unlock (&calld->mu_state); - - grpc_closure_init (&calld->async_setup_task, picked_target, calld); - grpc_lb_policy_pick (exec_ctx, lb_policy, bind_pollset, initial_metadata, &calld->picked_channel, &calld->async_setup_task); - - GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "pick"); - } - else if (chand->resolver != NULL) - { - calld->state = CALL_WAITING_FOR_CONFIG; - add_to_lb_policy_wait_queue_locked_state_config (elem); - if (!chand->started_resolving && chand->resolver != NULL) - { - GRPC_CHANNEL_INTERNAL_REF (chand->master, "resolver"); - chand->started_resolving = 1; - grpc_resolver_next (exec_ctx, chand->resolver, &chand->incoming_configuration, &chand->on_config_changed); - } - gpr_mu_unlock (&chand->mu_config); - gpr_mu_unlock (&calld->mu_state); - } - else - { - calld->state = CALL_CANCELLED; - gpr_mu_unlock (&chand->mu_config); - gpr_mu_unlock (&calld->mu_state); - handle_op_after_cancellation (exec_ctx, elem, op); - } - } - } + if (op->cancel_with_status != GRPC_STATUS_OK) { + calld->state = CALL_CANCELLED; + gpr_mu_unlock(&calld->mu_state); + handle_op_after_cancellation(exec_ctx, elem, op); + } else { + calld->waiting_op = *op; + + if (op->send_ops == NULL) { + /* need to have some send ops before we can select the + lb target */ + calld->state = CALL_WAITING_FOR_SEND; + gpr_mu_unlock(&calld->mu_state); + } else { + gpr_mu_lock(&chand->mu_config); + lb_policy = chand->lb_policy; + if (lb_policy) { + grpc_transport_stream_op *op = &calld->waiting_op; + grpc_pollset *bind_pollset = op->bind_pollset; + grpc_metadata_batch *initial_metadata = + &op->send_ops->ops[0].data.metadata; + GRPC_LB_POLICY_REF(lb_policy, "pick"); + gpr_mu_unlock(&chand->mu_config); + calld->state = CALL_WAITING_FOR_PICK; + + GPR_ASSERT(op->bind_pollset); + GPR_ASSERT(op->send_ops); + GPR_ASSERT(op->send_ops->nops >= 1); + GPR_ASSERT(op->send_ops->ops[0].type == GRPC_OP_METADATA); + gpr_mu_unlock(&calld->mu_state); + + grpc_closure_init(&calld->async_setup_task, picked_target, calld); + grpc_lb_policy_pick(exec_ctx, lb_policy, bind_pollset, + initial_metadata, &calld->picked_channel, + &calld->async_setup_task); + + GRPC_LB_POLICY_UNREF(exec_ctx, lb_policy, "pick"); + } else if (chand->resolver != NULL) { + calld->state = CALL_WAITING_FOR_CONFIG; + add_to_lb_policy_wait_queue_locked_state_config(elem); + if (!chand->started_resolving && chand->resolver != NULL) { + GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); + chand->started_resolving = 1; + grpc_resolver_next(exec_ctx, chand->resolver, + &chand->incoming_configuration, + &chand->on_config_changed); + } + gpr_mu_unlock(&chand->mu_config); + gpr_mu_unlock(&calld->mu_state); + } else { + calld->state = CALL_CANCELLED; + gpr_mu_unlock(&chand->mu_config); + gpr_mu_unlock(&calld->mu_state); + handle_op_after_cancellation(exec_ctx, elem, op); + } + } + } break; - } + } } -static void -cc_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ - perform_transport_stream_op (exec_ctx, elem, op, 0); +static void cc_start_transport_stream_op(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op) { + perform_transport_stream_op(exec_ctx, elem, op, 0); } -static void watch_lb_policy (grpc_exec_ctx * exec_ctx, channel_data * chand, grpc_lb_policy * lb_policy, grpc_connectivity_state current_state); +static void watch_lb_policy(grpc_exec_ctx *exec_ctx, channel_data *chand, + grpc_lb_policy *lb_policy, + grpc_connectivity_state current_state); -static void -on_lb_policy_state_changed_locked (grpc_exec_ctx * exec_ctx, lb_policy_connectivity_watcher * w) -{ +static void on_lb_policy_state_changed_locked( + grpc_exec_ctx *exec_ctx, lb_policy_connectivity_watcher *w) { /* check if the notification is for a stale policy */ - if (w->lb_policy != w->chand->lb_policy) - return; + if (w->lb_policy != w->chand->lb_policy) return; - grpc_connectivity_state_set (exec_ctx, &w->chand->state_tracker, w->state, "lb_changed"); - if (w->state != GRPC_CHANNEL_FATAL_FAILURE) - { - watch_lb_policy (exec_ctx, w->chand, w->lb_policy, w->state); - } + grpc_connectivity_state_set(exec_ctx, &w->chand->state_tracker, w->state, + "lb_changed"); + if (w->state != GRPC_CHANNEL_FATAL_FAILURE) { + watch_lb_policy(exec_ctx, w->chand, w->lb_policy, w->state); + } } -static void -on_lb_policy_state_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) -{ +static void on_lb_policy_state_changed(grpc_exec_ctx *exec_ctx, void *arg, + int iomgr_success) { lb_policy_connectivity_watcher *w = arg; - gpr_mu_lock (&w->chand->mu_config); - on_lb_policy_state_changed_locked (exec_ctx, w); - gpr_mu_unlock (&w->chand->mu_config); + gpr_mu_lock(&w->chand->mu_config); + on_lb_policy_state_changed_locked(exec_ctx, w); + gpr_mu_unlock(&w->chand->mu_config); - GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, w->chand->master, "watch_lb_policy"); - gpr_free (w); + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, w->chand->master, "watch_lb_policy"); + gpr_free(w); } -static void -watch_lb_policy (grpc_exec_ctx * exec_ctx, channel_data * chand, grpc_lb_policy * lb_policy, grpc_connectivity_state current_state) -{ - lb_policy_connectivity_watcher *w = gpr_malloc (sizeof (*w)); - GRPC_CHANNEL_INTERNAL_REF (chand->master, "watch_lb_policy"); +static void watch_lb_policy(grpc_exec_ctx *exec_ctx, channel_data *chand, + grpc_lb_policy *lb_policy, + grpc_connectivity_state current_state) { + lb_policy_connectivity_watcher *w = gpr_malloc(sizeof(*w)); + GRPC_CHANNEL_INTERNAL_REF(chand->master, "watch_lb_policy"); w->chand = chand; - grpc_closure_init (&w->on_changed, on_lb_policy_state_changed, w); + grpc_closure_init(&w->on_changed, on_lb_policy_state_changed, w); w->state = current_state; w->lb_policy = lb_policy; - grpc_lb_policy_notify_on_state_change (exec_ctx, lb_policy, &w->state, &w->on_changed); + grpc_lb_policy_notify_on_state_change(exec_ctx, lb_policy, &w->state, + &w->on_changed); } -static void -cc_on_config_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) -{ +static void cc_on_config_changed(grpc_exec_ctx *exec_ctx, void *arg, + int iomgr_success) { channel_data *chand = arg; grpc_lb_policy *lb_policy = NULL; grpc_lb_policy *old_lb_policy; @@ -534,313 +485,295 @@ cc_on_config_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) grpc_connectivity_state state = GRPC_CHANNEL_TRANSIENT_FAILURE; int exit_idle = 0; - if (chand->incoming_configuration != NULL) - { - lb_policy = grpc_client_config_get_lb_policy (chand->incoming_configuration); - if (lb_policy != NULL) - { - GRPC_LB_POLICY_REF (lb_policy, "channel"); - GRPC_LB_POLICY_REF (lb_policy, "config_change"); - state = grpc_lb_policy_check_connectivity (exec_ctx, lb_policy); - } - - grpc_client_config_unref (exec_ctx, chand->incoming_configuration); + if (chand->incoming_configuration != NULL) { + lb_policy = grpc_client_config_get_lb_policy(chand->incoming_configuration); + if (lb_policy != NULL) { + GRPC_LB_POLICY_REF(lb_policy, "channel"); + GRPC_LB_POLICY_REF(lb_policy, "config_change"); + state = grpc_lb_policy_check_connectivity(exec_ctx, lb_policy); } + grpc_client_config_unref(exec_ctx, chand->incoming_configuration); + } + chand->incoming_configuration = NULL; - gpr_mu_lock (&chand->mu_config); + gpr_mu_lock(&chand->mu_config); old_lb_policy = chand->lb_policy; chand->lb_policy = lb_policy; - if (lb_policy != NULL || chand->resolver == NULL /* disconnected */ ) - { - grpc_exec_ctx_enqueue_list (exec_ctx, &chand->waiting_for_config_closures); - } - if (lb_policy != NULL && chand->exit_idle_when_lb_policy_arrives) - { - GRPC_LB_POLICY_REF (lb_policy, "exit_idle"); - exit_idle = 1; - chand->exit_idle_when_lb_policy_arrives = 0; - } - - if (iomgr_success && chand->resolver) - { - grpc_resolver *resolver = chand->resolver; - GRPC_RESOLVER_REF (resolver, "channel-next"); - grpc_connectivity_state_set (exec_ctx, &chand->state_tracker, state, "new_lb+resolver"); - if (lb_policy != NULL) - { - watch_lb_policy (exec_ctx, chand, lb_policy, state); - } - gpr_mu_unlock (&chand->mu_config); - GRPC_CHANNEL_INTERNAL_REF (chand->master, "resolver"); - grpc_resolver_next (exec_ctx, resolver, &chand->incoming_configuration, &chand->on_config_changed); - GRPC_RESOLVER_UNREF (exec_ctx, resolver, "channel-next"); - } - else - { - old_resolver = chand->resolver; - chand->resolver = NULL; - grpc_connectivity_state_set (exec_ctx, &chand->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "resolver_gone"); - gpr_mu_unlock (&chand->mu_config); - if (old_resolver != NULL) - { - grpc_resolver_shutdown (exec_ctx, old_resolver); - GRPC_RESOLVER_UNREF (exec_ctx, old_resolver, "channel"); - } - } - - if (exit_idle) - { - grpc_lb_policy_exit_idle (exec_ctx, lb_policy); - GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "exit_idle"); - } - - if (old_lb_policy != NULL) - { - grpc_lb_policy_shutdown (exec_ctx, old_lb_policy); - GRPC_LB_POLICY_UNREF (exec_ctx, old_lb_policy, "channel"); - } - - if (lb_policy != NULL) - { - GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "config_change"); - } - - GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, chand->master, "resolver"); + if (lb_policy != NULL || chand->resolver == NULL /* disconnected */) { + grpc_exec_ctx_enqueue_list(exec_ctx, &chand->waiting_for_config_closures); + } + if (lb_policy != NULL && chand->exit_idle_when_lb_policy_arrives) { + GRPC_LB_POLICY_REF(lb_policy, "exit_idle"); + exit_idle = 1; + chand->exit_idle_when_lb_policy_arrives = 0; + } + + if (iomgr_success && chand->resolver) { + grpc_resolver *resolver = chand->resolver; + GRPC_RESOLVER_REF(resolver, "channel-next"); + grpc_connectivity_state_set(exec_ctx, &chand->state_tracker, state, + "new_lb+resolver"); + if (lb_policy != NULL) { + watch_lb_policy(exec_ctx, chand, lb_policy, state); + } + gpr_mu_unlock(&chand->mu_config); + GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); + grpc_resolver_next(exec_ctx, resolver, &chand->incoming_configuration, + &chand->on_config_changed); + GRPC_RESOLVER_UNREF(exec_ctx, resolver, "channel-next"); + } else { + old_resolver = chand->resolver; + chand->resolver = NULL; + grpc_connectivity_state_set(exec_ctx, &chand->state_tracker, + GRPC_CHANNEL_FATAL_FAILURE, "resolver_gone"); + gpr_mu_unlock(&chand->mu_config); + if (old_resolver != NULL) { + grpc_resolver_shutdown(exec_ctx, old_resolver); + GRPC_RESOLVER_UNREF(exec_ctx, old_resolver, "channel"); + } + } + + if (exit_idle) { + grpc_lb_policy_exit_idle(exec_ctx, lb_policy); + GRPC_LB_POLICY_UNREF(exec_ctx, lb_policy, "exit_idle"); + } + + if (old_lb_policy != NULL) { + grpc_lb_policy_shutdown(exec_ctx, old_lb_policy); + GRPC_LB_POLICY_UNREF(exec_ctx, old_lb_policy, "channel"); + } + + if (lb_policy != NULL) { + GRPC_LB_POLICY_UNREF(exec_ctx, lb_policy, "config_change"); + } + + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, chand->master, "resolver"); } -static void -cc_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_transport_op * op) -{ +static void cc_start_transport_op(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, + grpc_transport_op *op) { grpc_lb_policy *lb_policy = NULL; channel_data *chand = elem->channel_data; grpc_resolver *destroy_resolver = NULL; - grpc_exec_ctx_enqueue (exec_ctx, op->on_consumed, 1); - - GPR_ASSERT (op->set_accept_stream == NULL); - GPR_ASSERT (op->bind_pollset == NULL); - - gpr_mu_lock (&chand->mu_config); - if (op->on_connectivity_state_change != NULL) - { - grpc_connectivity_state_notify_on_state_change (exec_ctx, &chand->state_tracker, op->connectivity_state, op->on_connectivity_state_change); - op->on_connectivity_state_change = NULL; - op->connectivity_state = NULL; - } - - if (!is_empty (op, sizeof (*op))) - { - lb_policy = chand->lb_policy; - if (lb_policy) - { - GRPC_LB_POLICY_REF (lb_policy, "broadcast"); - } - } - - if (op->disconnect && chand->resolver != NULL) - { - grpc_connectivity_state_set (exec_ctx, &chand->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "disconnect"); - destroy_resolver = chand->resolver; - chand->resolver = NULL; - if (chand->lb_policy != NULL) - { - grpc_lb_policy_shutdown (exec_ctx, chand->lb_policy); - GRPC_LB_POLICY_UNREF (exec_ctx, chand->lb_policy, "channel"); - chand->lb_policy = NULL; - } - } - gpr_mu_unlock (&chand->mu_config); - - if (destroy_resolver) - { - grpc_resolver_shutdown (exec_ctx, destroy_resolver); - GRPC_RESOLVER_UNREF (exec_ctx, destroy_resolver, "channel"); - } - - if (lb_policy) - { - grpc_lb_policy_broadcast (exec_ctx, lb_policy, op); - GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "broadcast"); - } + grpc_exec_ctx_enqueue(exec_ctx, op->on_consumed, 1); + + GPR_ASSERT(op->set_accept_stream == NULL); + GPR_ASSERT(op->bind_pollset == NULL); + + gpr_mu_lock(&chand->mu_config); + if (op->on_connectivity_state_change != NULL) { + grpc_connectivity_state_notify_on_state_change( + exec_ctx, &chand->state_tracker, op->connectivity_state, + op->on_connectivity_state_change); + op->on_connectivity_state_change = NULL; + op->connectivity_state = NULL; + } + + if (!is_empty(op, sizeof(*op))) { + lb_policy = chand->lb_policy; + if (lb_policy) { + GRPC_LB_POLICY_REF(lb_policy, "broadcast"); + } + } + + if (op->disconnect && chand->resolver != NULL) { + grpc_connectivity_state_set(exec_ctx, &chand->state_tracker, + GRPC_CHANNEL_FATAL_FAILURE, "disconnect"); + destroy_resolver = chand->resolver; + chand->resolver = NULL; + if (chand->lb_policy != NULL) { + grpc_lb_policy_shutdown(exec_ctx, chand->lb_policy); + GRPC_LB_POLICY_UNREF(exec_ctx, chand->lb_policy, "channel"); + chand->lb_policy = NULL; + } + } + gpr_mu_unlock(&chand->mu_config); + + if (destroy_resolver) { + grpc_resolver_shutdown(exec_ctx, destroy_resolver); + GRPC_RESOLVER_UNREF(exec_ctx, destroy_resolver, "channel"); + } + + if (lb_policy) { + grpc_lb_policy_broadcast(exec_ctx, lb_policy, op); + GRPC_LB_POLICY_UNREF(exec_ctx, lb_policy, "broadcast"); + } } /* Constructor for call_data */ -static void -init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) -{ +static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + const void *server_transport_data, + grpc_transport_stream_op *initial_op) { call_data *calld = elem->call_data; /* TODO(ctiller): is there something useful we can do here? */ - GPR_ASSERT (initial_op == NULL); + GPR_ASSERT(initial_op == NULL); - GPR_ASSERT (elem->filter == &grpc_client_channel_filter); - GPR_ASSERT (server_transport_data == NULL); - gpr_mu_init (&calld->mu_state); + GPR_ASSERT(elem->filter == &grpc_client_channel_filter); + GPR_ASSERT(server_transport_data == NULL); + gpr_mu_init(&calld->mu_state); calld->elem = elem; calld->state = CALL_CREATED; - calld->deadline = gpr_inf_future (GPR_CLOCK_REALTIME); + calld->deadline = gpr_inf_future(GPR_CLOCK_REALTIME); } /* Destructor for call_data */ -static void -destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ +static void destroy_call_elem(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem) { call_data *calld = elem->call_data; grpc_subchannel_call *subchannel_call; /* if the call got activated, we need to destroy the child stack also, and remove it from the in-flight requests tracked by the child_entry we picked */ - gpr_mu_lock (&calld->mu_state); - switch (calld->state) - { + gpr_mu_lock(&calld->mu_state); + switch (calld->state) { case CALL_ACTIVE: subchannel_call = calld->subchannel_call; - gpr_mu_unlock (&calld->mu_state); - GRPC_SUBCHANNEL_CALL_UNREF (exec_ctx, subchannel_call, "client_channel"); + gpr_mu_unlock(&calld->mu_state); + GRPC_SUBCHANNEL_CALL_UNREF(exec_ctx, subchannel_call, "client_channel"); break; case CALL_CREATED: case CALL_CANCELLED: - gpr_mu_unlock (&calld->mu_state); + gpr_mu_unlock(&calld->mu_state); break; case CALL_WAITING_FOR_PICK: case CALL_WAITING_FOR_CONFIG: case CALL_WAITING_FOR_CALL: case CALL_WAITING_FOR_SEND: - gpr_log (GPR_ERROR, "should never reach here"); - abort (); + gpr_log(GPR_ERROR, "should never reach here"); + abort(); break; - } + } } /* Constructor for channel_data */ -static void -init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last) -{ +static void init_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, grpc_channel *master, + const grpc_channel_args *args, + grpc_mdctx *metadata_context, int is_first, + int is_last) { channel_data *chand = elem->channel_data; - memset (chand, 0, sizeof (*chand)); + memset(chand, 0, sizeof(*chand)); - GPR_ASSERT (is_last); - GPR_ASSERT (elem->filter == &grpc_client_channel_filter); + GPR_ASSERT(is_last); + GPR_ASSERT(elem->filter == &grpc_client_channel_filter); - gpr_mu_init (&chand->mu_config); + gpr_mu_init(&chand->mu_config); chand->mdctx = metadata_context; chand->master = master; - grpc_pollset_set_init (&chand->pollset_set); - grpc_closure_init (&chand->on_config_changed, cc_on_config_changed, chand); + grpc_pollset_set_init(&chand->pollset_set); + grpc_closure_init(&chand->on_config_changed, cc_on_config_changed, chand); - grpc_connectivity_state_init (&chand->state_tracker, GRPC_CHANNEL_IDLE, "client_channel"); + grpc_connectivity_state_init(&chand->state_tracker, GRPC_CHANNEL_IDLE, + "client_channel"); } /* Destructor for channel_data */ -static void -destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) -{ +static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem) { channel_data *chand = elem->channel_data; - if (chand->resolver != NULL) - { - grpc_resolver_shutdown (exec_ctx, chand->resolver); - GRPC_RESOLVER_UNREF (exec_ctx, chand->resolver, "channel"); - } - if (chand->lb_policy != NULL) - { - GRPC_LB_POLICY_UNREF (exec_ctx, chand->lb_policy, "channel"); - } - grpc_connectivity_state_destroy (exec_ctx, &chand->state_tracker); - grpc_pollset_set_destroy (&chand->pollset_set); - gpr_mu_destroy (&chand->mu_config); + if (chand->resolver != NULL) { + grpc_resolver_shutdown(exec_ctx, chand->resolver); + GRPC_RESOLVER_UNREF(exec_ctx, chand->resolver, "channel"); + } + if (chand->lb_policy != NULL) { + GRPC_LB_POLICY_UNREF(exec_ctx, chand->lb_policy, "channel"); + } + grpc_connectivity_state_destroy(exec_ctx, &chand->state_tracker); + grpc_pollset_set_destroy(&chand->pollset_set); + gpr_mu_destroy(&chand->mu_config); } const grpc_channel_filter grpc_client_channel_filter = { - cc_start_transport_stream_op, - cc_start_transport_op, - sizeof (call_data), - init_call_elem, - destroy_call_elem, - sizeof (channel_data), - init_channel_elem, - destroy_channel_elem, - cc_get_peer, - "client-channel", + cc_start_transport_stream_op, + cc_start_transport_op, + sizeof(call_data), + init_call_elem, + destroy_call_elem, + sizeof(channel_data), + init_channel_elem, + destroy_channel_elem, + cc_get_peer, + "client-channel", }; -void -grpc_client_channel_set_resolver (grpc_exec_ctx * exec_ctx, grpc_channel_stack * channel_stack, grpc_resolver * resolver) -{ +void grpc_client_channel_set_resolver(grpc_exec_ctx *exec_ctx, + grpc_channel_stack *channel_stack, + grpc_resolver *resolver) { /* post construction initialization: set the transport setup pointer */ - grpc_channel_element *elem = grpc_channel_stack_last_element (channel_stack); + grpc_channel_element *elem = grpc_channel_stack_last_element(channel_stack); channel_data *chand = elem->channel_data; - gpr_mu_lock (&chand->mu_config); - GPR_ASSERT (!chand->resolver); + gpr_mu_lock(&chand->mu_config); + GPR_ASSERT(!chand->resolver); chand->resolver = resolver; - GRPC_RESOLVER_REF (resolver, "channel"); - if (!grpc_closure_list_empty (chand->waiting_for_config_closures) || chand->exit_idle_when_lb_policy_arrives) - { - chand->started_resolving = 1; - GRPC_CHANNEL_INTERNAL_REF (chand->master, "resolver"); - grpc_resolver_next (exec_ctx, resolver, &chand->incoming_configuration, &chand->on_config_changed); - } - gpr_mu_unlock (&chand->mu_config); + GRPC_RESOLVER_REF(resolver, "channel"); + if (!grpc_closure_list_empty(chand->waiting_for_config_closures) || + chand->exit_idle_when_lb_policy_arrives) { + chand->started_resolving = 1; + GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); + grpc_resolver_next(exec_ctx, resolver, &chand->incoming_configuration, + &chand->on_config_changed); + } + gpr_mu_unlock(&chand->mu_config); } -grpc_connectivity_state -grpc_client_channel_check_connectivity_state (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, int 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) { channel_data *chand = elem->channel_data; grpc_connectivity_state out; - gpr_mu_lock (&chand->mu_config); - out = grpc_connectivity_state_check (&chand->state_tracker); - if (out == GRPC_CHANNEL_IDLE && try_to_connect) - { - if (chand->lb_policy != NULL) - { - grpc_lb_policy_exit_idle (exec_ctx, chand->lb_policy); - } - else - { - chand->exit_idle_when_lb_policy_arrives = 1; - if (!chand->started_resolving && chand->resolver != NULL) - { - GRPC_CHANNEL_INTERNAL_REF (chand->master, "resolver"); - chand->started_resolving = 1; - grpc_resolver_next (exec_ctx, chand->resolver, &chand->incoming_configuration, &chand->on_config_changed); - } - } - } - gpr_mu_unlock (&chand->mu_config); + gpr_mu_lock(&chand->mu_config); + out = grpc_connectivity_state_check(&chand->state_tracker); + if (out == GRPC_CHANNEL_IDLE && try_to_connect) { + if (chand->lb_policy != NULL) { + grpc_lb_policy_exit_idle(exec_ctx, chand->lb_policy); + } else { + chand->exit_idle_when_lb_policy_arrives = 1; + if (!chand->started_resolving && chand->resolver != NULL) { + GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); + chand->started_resolving = 1; + grpc_resolver_next(exec_ctx, chand->resolver, + &chand->incoming_configuration, + &chand->on_config_changed); + } + } + } + gpr_mu_unlock(&chand->mu_config); return out; } -void -grpc_client_channel_watch_connectivity_state (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_connectivity_state * state, grpc_closure * on_complete) -{ +void grpc_client_channel_watch_connectivity_state( + grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, + grpc_connectivity_state *state, grpc_closure *on_complete) { channel_data *chand = elem->channel_data; - gpr_mu_lock (&chand->mu_config); - grpc_connectivity_state_notify_on_state_change (exec_ctx, &chand->state_tracker, state, on_complete); - gpr_mu_unlock (&chand->mu_config); + gpr_mu_lock(&chand->mu_config); + grpc_connectivity_state_notify_on_state_change( + exec_ctx, &chand->state_tracker, state, on_complete); + gpr_mu_unlock(&chand->mu_config); } -grpc_pollset_set * -grpc_client_channel_get_connecting_pollset_set (grpc_channel_element * elem) -{ +grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set( + grpc_channel_element *elem) { channel_data *chand = elem->channel_data; return &chand->pollset_set; } -void -grpc_client_channel_add_interested_party (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_pollset * pollset) -{ +void grpc_client_channel_add_interested_party(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, + grpc_pollset *pollset) { channel_data *chand = elem->channel_data; - grpc_pollset_set_add_pollset (exec_ctx, &chand->pollset_set, pollset); + grpc_pollset_set_add_pollset(exec_ctx, &chand->pollset_set, pollset); } -void -grpc_client_channel_del_interested_party (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_pollset * pollset) -{ +void grpc_client_channel_del_interested_party(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, + grpc_pollset *pollset) { channel_data *chand = elem->channel_data; - grpc_pollset_set_del_pollset (exec_ctx, &chand->pollset_set, pollset); + grpc_pollset_set_del_pollset(exec_ctx, &chand->pollset_set, pollset); } diff --git a/src/core/channel/client_channel.h b/src/core/channel/client_channel.h index 5af97947270..5103f07a436 100644 --- a/src/core/channel/client_channel.h +++ b/src/core/channel/client_channel.h @@ -49,15 +49,25 @@ extern const grpc_channel_filter grpc_client_channel_filter; /* post-construction initializer to let the client channel know which transport setup it should cancel upon destruction, or initiate when it needs a connection */ -void grpc_client_channel_set_resolver (grpc_exec_ctx * exec_ctx, grpc_channel_stack * channel_stack, grpc_resolver * resolver); +void grpc_client_channel_set_resolver(grpc_exec_ctx *exec_ctx, + grpc_channel_stack *channel_stack, + grpc_resolver *resolver); -grpc_connectivity_state grpc_client_channel_check_connectivity_state (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, int 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); -void grpc_client_channel_watch_connectivity_state (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_connectivity_state * state, grpc_closure * on_complete); +void grpc_client_channel_watch_connectivity_state( + grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, + grpc_connectivity_state *state, grpc_closure *on_complete); -grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set (grpc_channel_element * elem); +grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set( + grpc_channel_element *elem); -void grpc_client_channel_add_interested_party (grpc_exec_ctx * exec_ctx, grpc_channel_element * channel, grpc_pollset * pollset); -void grpc_client_channel_del_interested_party (grpc_exec_ctx * exec_ctx, grpc_channel_element * channel, grpc_pollset * pollset); +void grpc_client_channel_add_interested_party(grpc_exec_ctx *exec_ctx, + grpc_channel_element *channel, + grpc_pollset *pollset); +void grpc_client_channel_del_interested_party(grpc_exec_ctx *exec_ctx, + grpc_channel_element *channel, + grpc_pollset *pollset); #endif /* GRPC_INTERNAL_CORE_CHANNEL_CLIENT_CHANNEL_H */ diff --git a/src/core/channel/compress_filter.c b/src/core/channel/compress_filter.c index 6acdc720759..f8dbe8c8176 100644 --- a/src/core/channel/compress_filter.c +++ b/src/core/channel/compress_filter.c @@ -44,14 +44,13 @@ #include "src/core/compression/message_compress.h" #include "src/core/support/string.h" -typedef struct call_data -{ +typedef struct call_data { gpr_slice_buffer slices; /**< Buffers up input slices to be compressed */ grpc_linked_mdelem compression_algorithm_storage; grpc_linked_mdelem accept_encoding_storage; - gpr_uint32 remaining_slice_bytes; - /**< Input data to be read, as per BEGIN_MESSAGE */ - int written_initial_metadata; /**< Already processed initial md? */ + gpr_uint32 remaining_slice_bytes; + /**< Input data to be read, as per BEGIN_MESSAGE */ + int written_initial_metadata; /**< Already processed initial md? */ /** Compression algorithm we'll try to use. It may be given by incoming * metadata, or by the channel's default compression settings. */ grpc_compression_algorithm compression_algorithm; @@ -59,8 +58,7 @@ typedef struct call_data int has_compression_algorithm; } call_data; -typedef struct channel_data -{ +typedef struct channel_data { /** Metadata key for the incoming (requested) compression algorithm */ grpc_mdstr *mdstr_request_compression_algorithm_key; /** Metadata key for the outgoing (used) compression algorithm */ @@ -82,62 +80,59 @@ typedef struct channel_data * larger than the raw input). * * Returns 1 if the data was actually compress and 0 otherwise. */ -static int -compress_send_sb (grpc_compression_algorithm algorithm, gpr_slice_buffer * slices) -{ +static int compress_send_sb(grpc_compression_algorithm algorithm, + gpr_slice_buffer *slices) { int did_compress; gpr_slice_buffer tmp; - gpr_slice_buffer_init (&tmp); - did_compress = grpc_msg_compress (algorithm, slices, &tmp); - if (did_compress) - { - gpr_slice_buffer_swap (slices, &tmp); - } - gpr_slice_buffer_destroy (&tmp); + gpr_slice_buffer_init(&tmp); + did_compress = grpc_msg_compress(algorithm, slices, &tmp); + if (did_compress) { + gpr_slice_buffer_swap(slices, &tmp); + } + gpr_slice_buffer_destroy(&tmp); return did_compress; } /** For each \a md element from the incoming metadata, filter out the entry for * "grpc-encoding", using its value to populate the call data's * compression_algorithm field. */ -static grpc_mdelem * -compression_md_filter (void *user_data, grpc_mdelem * md) -{ +static grpc_mdelem *compression_md_filter(void *user_data, grpc_mdelem *md) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; - if (md->key == channeld->mdstr_request_compression_algorithm_key) - { - const char *md_c_str = grpc_mdstr_as_c_string (md->value); - if (!grpc_compression_algorithm_parse (md_c_str, strlen (md_c_str), &calld->compression_algorithm)) - { - gpr_log (GPR_ERROR, "Invalid compression algorithm: '%s' (unknown). Ignoring.", md_c_str); - calld->compression_algorithm = GRPC_COMPRESS_NONE; - } - if (grpc_compression_options_is_algorithm_enabled (&channeld->compression_options, calld->compression_algorithm) == 0) - { - gpr_log (GPR_ERROR, "Invalid compression algorithm: '%s' (previously disabled). " "Ignoring.", md_c_str); - calld->compression_algorithm = GRPC_COMPRESS_NONE; - } - calld->has_compression_algorithm = 1; - return NULL; + if (md->key == channeld->mdstr_request_compression_algorithm_key) { + const char *md_c_str = grpc_mdstr_as_c_string(md->value); + if (!grpc_compression_algorithm_parse(md_c_str, strlen(md_c_str), + &calld->compression_algorithm)) { + gpr_log(GPR_ERROR, + "Invalid compression algorithm: '%s' (unknown). Ignoring.", + md_c_str); + calld->compression_algorithm = GRPC_COMPRESS_NONE; + } + if (grpc_compression_options_is_algorithm_enabled( + &channeld->compression_options, calld->compression_algorithm) == + 0) { + gpr_log(GPR_ERROR, + "Invalid compression algorithm: '%s' (previously disabled). " + "Ignoring.", + md_c_str); + calld->compression_algorithm = GRPC_COMPRESS_NONE; } + calld->has_compression_algorithm = 1; + return NULL; + } return md; } -static int -skip_compression (channel_data * channeld, call_data * calld) -{ - if (calld->has_compression_algorithm) - { - if (calld->compression_algorithm == GRPC_COMPRESS_NONE) - { - return 1; - } - return 0; /* we have an actual call-specific algorithm */ +static int skip_compression(channel_data *channeld, call_data *calld) { + if (calld->has_compression_algorithm) { + if (calld->compression_algorithm == GRPC_COMPRESS_NONE) { + return 1; } + return 0; /* we have an actual call-specific algorithm */ + } /* no per-call compression override */ return channeld->default_compression_algorithm == GRPC_COMPRESS_NONE; } @@ -146,127 +141,126 @@ skip_compression (channel_data * channeld, call_data * calld) * the associated GRPC_OP_BEGIN_MESSAGE accordingly (new compressed length, * flags indicating compression is in effect) and replaces \a send_ops with it. * */ -static void -finish_compressed_sopb (grpc_stream_op_buffer * send_ops, grpc_call_element * elem) -{ +static void finish_compressed_sopb(grpc_stream_op_buffer *send_ops, + grpc_call_element *elem) { size_t i; call_data *calld = elem->call_data; - int new_slices_added = 0; /* GPR_FALSE */ + int new_slices_added = 0; /* GPR_FALSE */ grpc_metadata_batch metadata; grpc_stream_op_buffer new_send_ops; - grpc_sopb_init (&new_send_ops); - - for (i = 0; i < send_ops->nops; i++) - { - grpc_stream_op *sop = &send_ops->ops[i]; - switch (sop->type) - { - case GRPC_OP_BEGIN_MESSAGE: - GPR_ASSERT (calld->slices.length <= GPR_UINT32_MAX); - grpc_sopb_add_begin_message (&new_send_ops, (gpr_uint32) calld->slices.length, sop->data.begin_message.flags | GRPC_WRITE_INTERNAL_COMPRESS); - break; - case GRPC_OP_SLICE: - /* Once we reach the slices section of the original buffer, simply add - * all the new (compressed) slices. We obviously want to do this only - * once, hence the "new_slices_added" guard. */ - if (!new_slices_added) - { - size_t j; - for (j = 0; j < calld->slices.count; ++j) - { - grpc_sopb_add_slice (&new_send_ops, gpr_slice_ref (calld->slices.slices[j])); - } - new_slices_added = 1; /* GPR_TRUE */ - } - break; - case GRPC_OP_METADATA: - /* move the metadata to the new buffer. */ - grpc_metadata_batch_move (&metadata, &sop->data.metadata); - grpc_sopb_add_metadata (&new_send_ops, metadata); - break; - case GRPC_NO_OP: - break; - } + grpc_sopb_init(&new_send_ops); + + for (i = 0; i < send_ops->nops; i++) { + grpc_stream_op *sop = &send_ops->ops[i]; + switch (sop->type) { + case GRPC_OP_BEGIN_MESSAGE: + GPR_ASSERT(calld->slices.length <= GPR_UINT32_MAX); + grpc_sopb_add_begin_message( + &new_send_ops, (gpr_uint32)calld->slices.length, + sop->data.begin_message.flags | GRPC_WRITE_INTERNAL_COMPRESS); + break; + case GRPC_OP_SLICE: + /* Once we reach the slices section of the original buffer, simply add + * all the new (compressed) slices. We obviously want to do this only + * once, hence the "new_slices_added" guard. */ + if (!new_slices_added) { + size_t j; + for (j = 0; j < calld->slices.count; ++j) { + grpc_sopb_add_slice(&new_send_ops, + gpr_slice_ref(calld->slices.slices[j])); + } + new_slices_added = 1; /* GPR_TRUE */ + } + break; + case GRPC_OP_METADATA: + /* move the metadata to the new buffer. */ + grpc_metadata_batch_move(&metadata, &sop->data.metadata); + grpc_sopb_add_metadata(&new_send_ops, metadata); + break; + case GRPC_NO_OP: + break; } - grpc_sopb_swap (send_ops, &new_send_ops); - grpc_sopb_destroy (&new_send_ops); + } + grpc_sopb_swap(send_ops, &new_send_ops); + grpc_sopb_destroy(&new_send_ops); } /** Filter's "main" function, called for any incoming grpc_transport_stream_op * instance that holds a non-zero number of send operations, accesible to this * function in \a send_ops. */ -static void -process_send_ops (grpc_call_element * elem, grpc_stream_op_buffer * send_ops) -{ +static void process_send_ops(grpc_call_element *elem, + grpc_stream_op_buffer *send_ops) { call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; size_t i; int did_compress = 0; /* In streaming calls, we need to reset the previously accumulated slices */ - gpr_slice_buffer_reset_and_unref (&calld->slices); - for (i = 0; i < send_ops->nops; ++i) - { - grpc_stream_op *sop = &send_ops->ops[i]; - switch (sop->type) - { - case GRPC_OP_BEGIN_MESSAGE: - /* buffer up slices until we've processed all the expected ones (as - * given by GRPC_OP_BEGIN_MESSAGE) */ - calld->remaining_slice_bytes = sop->data.begin_message.length; - if (sop->data.begin_message.flags & GRPC_WRITE_NO_COMPRESS) - { - calld->has_compression_algorithm = 1; /* GPR_TRUE */ - calld->compression_algorithm = GRPC_COMPRESS_NONE; - } - break; - case GRPC_OP_METADATA: - if (!calld->written_initial_metadata) - { - /* Parse incoming request for compression. If any, it'll be available - * at calld->compression_algorithm */ - grpc_metadata_batch_filter (&(sop->data.metadata), compression_md_filter, elem); - if (!calld->has_compression_algorithm) - { - /* If no algorithm was found in the metadata and we aren't - * exceptionally skipping compression, fall back to the channel - * default */ - calld->compression_algorithm = channeld->default_compression_algorithm; - calld->has_compression_algorithm = 1; /* GPR_TRUE */ - } - /* hint compression algorithm */ - grpc_metadata_batch_add_tail (&(sop->data.metadata), &calld->compression_algorithm_storage, GRPC_MDELEM_REF (channeld->mdelem_compression_algorithms[calld->compression_algorithm])); - - /* convey supported compression algorithms */ - grpc_metadata_batch_add_tail (&(sop->data.metadata), &calld->accept_encoding_storage, GRPC_MDELEM_REF (channeld->mdelem_accept_encoding)); - - calld->written_initial_metadata = 1; /* GPR_TRUE */ - } - break; - case GRPC_OP_SLICE: - if (skip_compression (channeld, calld)) - continue; - GPR_ASSERT (calld->remaining_slice_bytes > 0); - /* Increase input ref count, gpr_slice_buffer_add takes ownership. */ - gpr_slice_buffer_add (&calld->slices, gpr_slice_ref (sop->data.slice)); - GPR_ASSERT (GPR_SLICE_LENGTH (sop->data.slice) >= calld->remaining_slice_bytes); - calld->remaining_slice_bytes -= (gpr_uint32) GPR_SLICE_LENGTH (sop->data.slice); - if (calld->remaining_slice_bytes == 0) - { - did_compress = compress_send_sb (calld->compression_algorithm, &calld->slices); - } - break; - case GRPC_NO_OP: - break; - } + gpr_slice_buffer_reset_and_unref(&calld->slices); + for (i = 0; i < send_ops->nops; ++i) { + grpc_stream_op *sop = &send_ops->ops[i]; + switch (sop->type) { + case GRPC_OP_BEGIN_MESSAGE: + /* buffer up slices until we've processed all the expected ones (as + * given by GRPC_OP_BEGIN_MESSAGE) */ + calld->remaining_slice_bytes = sop->data.begin_message.length; + if (sop->data.begin_message.flags & GRPC_WRITE_NO_COMPRESS) { + calld->has_compression_algorithm = 1; /* GPR_TRUE */ + calld->compression_algorithm = GRPC_COMPRESS_NONE; + } + break; + case GRPC_OP_METADATA: + if (!calld->written_initial_metadata) { + /* Parse incoming request for compression. If any, it'll be available + * at calld->compression_algorithm */ + grpc_metadata_batch_filter(&(sop->data.metadata), + compression_md_filter, elem); + if (!calld->has_compression_algorithm) { + /* If no algorithm was found in the metadata and we aren't + * exceptionally skipping compression, fall back to the channel + * default */ + calld->compression_algorithm = + channeld->default_compression_algorithm; + calld->has_compression_algorithm = 1; /* GPR_TRUE */ + } + /* hint compression algorithm */ + grpc_metadata_batch_add_tail( + &(sop->data.metadata), &calld->compression_algorithm_storage, + GRPC_MDELEM_REF(channeld->mdelem_compression_algorithms + [calld->compression_algorithm])); + + /* convey supported compression algorithms */ + grpc_metadata_batch_add_tail( + &(sop->data.metadata), &calld->accept_encoding_storage, + GRPC_MDELEM_REF(channeld->mdelem_accept_encoding)); + + calld->written_initial_metadata = 1; /* GPR_TRUE */ + } + break; + case GRPC_OP_SLICE: + if (skip_compression(channeld, calld)) continue; + GPR_ASSERT(calld->remaining_slice_bytes > 0); + /* Increase input ref count, gpr_slice_buffer_add takes ownership. */ + gpr_slice_buffer_add(&calld->slices, gpr_slice_ref(sop->data.slice)); + GPR_ASSERT(GPR_SLICE_LENGTH(sop->data.slice) >= + calld->remaining_slice_bytes); + calld->remaining_slice_bytes -= + (gpr_uint32)GPR_SLICE_LENGTH(sop->data.slice); + if (calld->remaining_slice_bytes == 0) { + did_compress = + compress_send_sb(calld->compression_algorithm, &calld->slices); + } + break; + case GRPC_NO_OP: + break; } + } /* Modify the send_ops stream_op_buffer depending on whether compression was * carried out */ - if (did_compress) - { - finish_compressed_sopb (send_ops, elem); - } + if (did_compress) { + finish_compressed_sopb(send_ops, elem); + } } /* Called either: @@ -274,52 +268,49 @@ process_send_ops (grpc_call_element * elem, grpc_stream_op_buffer * send_ops) - a network event (or similar) from below, to receive something op contains type and call direction information, in addition to the data that is being sent or received. */ -static void -compress_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ - if (op->send_ops && op->send_ops->nops > 0) - { - process_send_ops (elem, op->send_ops); - } +static void compress_start_transport_stream_op(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op) { + if (op->send_ops && op->send_ops->nops > 0) { + process_send_ops(elem, op->send_ops); + } /* pass control down the stack */ - grpc_call_next_op (exec_ctx, elem, op); + grpc_call_next_op(exec_ctx, elem, op); } /* Constructor for call_data */ -static void -init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) -{ +static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + const void *server_transport_data, + grpc_transport_stream_op *initial_op) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; /* initialize members */ - gpr_slice_buffer_init (&calld->slices); + gpr_slice_buffer_init(&calld->slices); calld->has_compression_algorithm = 0; - calld->written_initial_metadata = 0; /* GPR_FALSE */ - - if (initial_op) - { - if (initial_op->send_ops && initial_op->send_ops->nops > 0) - { - process_send_ops (elem, initial_op->send_ops); - } + calld->written_initial_metadata = 0; /* GPR_FALSE */ + + if (initial_op) { + if (initial_op->send_ops && initial_op->send_ops->nops > 0) { + process_send_ops(elem, initial_op->send_ops); } + } } /* Destructor for call_data */ -static void -destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ +static void destroy_call_elem(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; - gpr_slice_buffer_destroy (&calld->slices); + gpr_slice_buffer_destroy(&calld->slices); } /* Constructor for channel_data */ -static void -init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last) -{ +static void init_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, grpc_channel *master, + const grpc_channel_args *args, grpc_mdctx *mdctx, + int is_first, int is_last) { channel_data *channeld = elem->channel_data; grpc_compression_algorithm algo_idx; const char *supported_algorithms_names[GRPC_COMPRESS_ALGORITHMS_COUNT - 1]; @@ -327,72 +318,82 @@ init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_c char *accept_encoding_str; size_t accept_encoding_str_len; - grpc_compression_options_init (&channeld->compression_options); - channeld->compression_options.enabled_algorithms_bitset = (gpr_uint32) grpc_channel_args_compression_algorithm_get_states (args); + grpc_compression_options_init(&channeld->compression_options); + channeld->compression_options.enabled_algorithms_bitset = + (gpr_uint32)grpc_channel_args_compression_algorithm_get_states(args); - channeld->default_compression_algorithm = grpc_channel_args_get_compression_algorithm (args); + channeld->default_compression_algorithm = + grpc_channel_args_get_compression_algorithm(args); /* Make sure the default isn't disabled. */ - GPR_ASSERT (grpc_compression_options_is_algorithm_enabled (&channeld->compression_options, channeld->default_compression_algorithm)); - channeld->compression_options.default_compression_algorithm = channeld->default_compression_algorithm; - - channeld->mdstr_request_compression_algorithm_key = grpc_mdstr_from_string (mdctx, GRPC_COMPRESS_REQUEST_ALGORITHM_KEY, 0); - - channeld->mdstr_outgoing_compression_algorithm_key = grpc_mdstr_from_string (mdctx, "grpc-encoding", 0); - - channeld->mdstr_compression_capabilities_key = grpc_mdstr_from_string (mdctx, "grpc-accept-encoding", 0); - - for (algo_idx = 0; algo_idx < GRPC_COMPRESS_ALGORITHMS_COUNT; ++algo_idx) - { - char *algorithm_name; - /* skip disabled algorithms */ - if (grpc_compression_options_is_algorithm_enabled (&channeld->compression_options, algo_idx) == 0) - { - continue; - } - GPR_ASSERT (grpc_compression_algorithm_name (algo_idx, &algorithm_name) != 0); - channeld->mdelem_compression_algorithms[algo_idx] = grpc_mdelem_from_metadata_strings (mdctx, GRPC_MDSTR_REF (channeld->mdstr_outgoing_compression_algorithm_key), grpc_mdstr_from_string (mdctx, algorithm_name, 0)); - if (algo_idx > 0) - { - supported_algorithms_names[supported_algorithms_idx++] = algorithm_name; - } + GPR_ASSERT(grpc_compression_options_is_algorithm_enabled( + &channeld->compression_options, channeld->default_compression_algorithm)); + channeld->compression_options.default_compression_algorithm = + channeld->default_compression_algorithm; + + channeld->mdstr_request_compression_algorithm_key = + grpc_mdstr_from_string(mdctx, GRPC_COMPRESS_REQUEST_ALGORITHM_KEY, 0); + + channeld->mdstr_outgoing_compression_algorithm_key = + grpc_mdstr_from_string(mdctx, "grpc-encoding", 0); + + channeld->mdstr_compression_capabilities_key = + grpc_mdstr_from_string(mdctx, "grpc-accept-encoding", 0); + + for (algo_idx = 0; algo_idx < GRPC_COMPRESS_ALGORITHMS_COUNT; ++algo_idx) { + char *algorithm_name; + /* skip disabled algorithms */ + if (grpc_compression_options_is_algorithm_enabled( + &channeld->compression_options, algo_idx) == 0) { + continue; + } + GPR_ASSERT(grpc_compression_algorithm_name(algo_idx, &algorithm_name) != 0); + channeld->mdelem_compression_algorithms[algo_idx] = + grpc_mdelem_from_metadata_strings( + mdctx, + GRPC_MDSTR_REF(channeld->mdstr_outgoing_compression_algorithm_key), + grpc_mdstr_from_string(mdctx, algorithm_name, 0)); + if (algo_idx > 0) { + supported_algorithms_names[supported_algorithms_idx++] = algorithm_name; } + } /* TODO(dgq): gpr_strjoin_sep could be made to work with statically allocated * arrays, as to avoid the heap allocs */ - accept_encoding_str = gpr_strjoin_sep (supported_algorithms_names, supported_algorithms_idx, ",", &accept_encoding_str_len); + accept_encoding_str = + gpr_strjoin_sep(supported_algorithms_names, supported_algorithms_idx, ",", + &accept_encoding_str_len); - channeld->mdelem_accept_encoding = grpc_mdelem_from_metadata_strings (mdctx, GRPC_MDSTR_REF (channeld->mdstr_compression_capabilities_key), grpc_mdstr_from_string (mdctx, accept_encoding_str, 0)); - gpr_free (accept_encoding_str); + channeld->mdelem_accept_encoding = grpc_mdelem_from_metadata_strings( + mdctx, GRPC_MDSTR_REF(channeld->mdstr_compression_capabilities_key), + grpc_mdstr_from_string(mdctx, accept_encoding_str, 0)); + gpr_free(accept_encoding_str); - GPR_ASSERT (!is_last); + GPR_ASSERT(!is_last); } /* Destructor for channel data */ -static void -destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) -{ +static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem) { channel_data *channeld = elem->channel_data; grpc_compression_algorithm algo_idx; - GRPC_MDSTR_UNREF (channeld->mdstr_request_compression_algorithm_key); - GRPC_MDSTR_UNREF (channeld->mdstr_outgoing_compression_algorithm_key); - GRPC_MDSTR_UNREF (channeld->mdstr_compression_capabilities_key); - for (algo_idx = 0; algo_idx < GRPC_COMPRESS_ALGORITHMS_COUNT; ++algo_idx) - { - GRPC_MDELEM_UNREF (channeld->mdelem_compression_algorithms[algo_idx]); - } - GRPC_MDELEM_UNREF (channeld->mdelem_accept_encoding); + GRPC_MDSTR_UNREF(channeld->mdstr_request_compression_algorithm_key); + GRPC_MDSTR_UNREF(channeld->mdstr_outgoing_compression_algorithm_key); + GRPC_MDSTR_UNREF(channeld->mdstr_compression_capabilities_key); + for (algo_idx = 0; algo_idx < GRPC_COMPRESS_ALGORITHMS_COUNT; ++algo_idx) { + GRPC_MDELEM_UNREF(channeld->mdelem_compression_algorithms[algo_idx]); + } + GRPC_MDELEM_UNREF(channeld->mdelem_accept_encoding); } const grpc_channel_filter grpc_compress_filter = { - compress_start_transport_stream_op, - grpc_channel_next_op, - sizeof (call_data), - init_call_elem, - destroy_call_elem, - sizeof (channel_data), - init_channel_elem, - destroy_channel_elem, - grpc_call_next_get_peer, - "compress" -}; + compress_start_transport_stream_op, + grpc_channel_next_op, + sizeof(call_data), + init_call_elem, + destroy_call_elem, + sizeof(channel_data), + init_channel_elem, + destroy_channel_elem, + grpc_call_next_get_peer, + "compress"}; diff --git a/src/core/channel/connected_channel.c b/src/core/channel/connected_channel.c index bdb75474fff..ea701bc2846 100644 --- a/src/core/channel/connected_channel.c +++ b/src/core/channel/connected_channel.c @@ -46,15 +46,11 @@ #define MAX_BUFFER_LENGTH 8192 -typedef struct connected_channel_channel_data -{ +typedef struct connected_channel_channel_data { grpc_transport *transport; } channel_data; -typedef struct connected_channel_call_data -{ - void *unused; -} call_data; +typedef struct connected_channel_call_data { void *unused; } call_data; /* We perform a small hack to locate transport data alongside the connected channel data in call allocations, to allow everything to be pulled in minimal @@ -65,95 +61,95 @@ typedef struct connected_channel_call_data /* Intercept a call operation and either push it directly up or translate it into transport stream operations */ -static void -con_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ +static void con_start_transport_stream_op(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); - GRPC_CALL_LOG_OP (GPR_INFO, elem, op); + GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); + GRPC_CALL_LOG_OP(GPR_INFO, elem, op); - grpc_transport_perform_stream_op (exec_ctx, chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (calld), op); + grpc_transport_perform_stream_op(exec_ctx, chand->transport, + TRANSPORT_STREAM_FROM_CALL_DATA(calld), op); } -static void -con_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_transport_op * op) -{ +static void con_start_transport_op(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, + grpc_transport_op *op) { channel_data *chand = elem->channel_data; - grpc_transport_perform_op (exec_ctx, chand->transport, op); + grpc_transport_perform_op(exec_ctx, chand->transport, op); } /* Constructor for call_data */ -static void -init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) -{ +static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + const void *server_transport_data, + grpc_transport_stream_op *initial_op) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; int r; - GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); - r = grpc_transport_init_stream (exec_ctx, chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (calld), server_transport_data, initial_op); - GPR_ASSERT (r == 0); + GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); + r = grpc_transport_init_stream(exec_ctx, chand->transport, + TRANSPORT_STREAM_FROM_CALL_DATA(calld), + server_transport_data, initial_op); + GPR_ASSERT(r == 0); } /* Destructor for call_data */ -static void -destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ +static void destroy_call_elem(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); - grpc_transport_destroy_stream (exec_ctx, chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA (calld)); + GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); + grpc_transport_destroy_stream(exec_ctx, chand->transport, + TRANSPORT_STREAM_FROM_CALL_DATA(calld)); } /* Constructor for channel_data */ -static void -init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last) -{ - channel_data *cd = (channel_data *) elem->channel_data; - GPR_ASSERT (is_last); - GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); +static void init_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, grpc_channel *master, + const grpc_channel_args *args, grpc_mdctx *mdctx, + int is_first, int is_last) { + channel_data *cd = (channel_data *)elem->channel_data; + GPR_ASSERT(is_last); + GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); cd->transport = NULL; } /* Destructor for channel_data */ -static void -destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) -{ - channel_data *cd = (channel_data *) elem->channel_data; - GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); - grpc_transport_destroy (exec_ctx, cd->transport); +static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem) { + channel_data *cd = (channel_data *)elem->channel_data; + GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); + grpc_transport_destroy(exec_ctx, cd->transport); } -static char * -con_get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ +static char *con_get_peer(grpc_exec_ctx *exec_ctx, grpc_call_element *elem) { channel_data *chand = elem->channel_data; - return grpc_transport_get_peer (exec_ctx, chand->transport); + return grpc_transport_get_peer(exec_ctx, chand->transport); } const grpc_channel_filter grpc_connected_channel_filter = { - con_start_transport_stream_op, - con_start_transport_op, - sizeof (call_data), - init_call_elem, - destroy_call_elem, - sizeof (channel_data), - init_channel_elem, - destroy_channel_elem, - con_get_peer, - "connected", + con_start_transport_stream_op, + con_start_transport_op, + sizeof(call_data), + init_call_elem, + destroy_call_elem, + sizeof(channel_data), + init_channel_elem, + destroy_channel_elem, + con_get_peer, + "connected", }; -void -grpc_connected_channel_bind_transport (grpc_channel_stack * channel_stack, grpc_transport * transport) -{ +void grpc_connected_channel_bind_transport(grpc_channel_stack *channel_stack, + grpc_transport *transport) { /* Assumes that the connected channel filter is always the last filter in a channel stack */ - grpc_channel_element *elem = grpc_channel_stack_last_element (channel_stack); - channel_data *cd = (channel_data *) elem->channel_data; - GPR_ASSERT (elem->filter == &grpc_connected_channel_filter); - GPR_ASSERT (cd->transport == NULL); + grpc_channel_element *elem = grpc_channel_stack_last_element(channel_stack); + channel_data *cd = (channel_data *)elem->channel_data; + GPR_ASSERT(elem->filter == &grpc_connected_channel_filter); + GPR_ASSERT(cd->transport == NULL); cd->transport = transport; /* HACK(ctiller): increase call stack size for the channel to make space @@ -162,5 +158,5 @@ grpc_connected_channel_bind_transport (grpc_channel_stack * channel_stack, grpc_ This is only "safe" because call stacks place no additional data after the last call element, and the last call element MUST be the connected channel. */ - channel_stack->call_stack_size += grpc_transport_stream_size (transport); + channel_stack->call_stack_size += grpc_transport_stream_size(transport); } diff --git a/src/core/channel/connected_channel.h b/src/core/channel/connected_channel.h index 67bcd6c911c..eac6eb7ebe6 100644 --- a/src/core/channel/connected_channel.h +++ b/src/core/channel/connected_channel.h @@ -43,6 +43,7 @@ extern const grpc_channel_filter grpc_connected_channel_filter; /* Post construction fixup: set the transport in the connected channel. Must be called before any call stack using this filter is used. */ -void grpc_connected_channel_bind_transport (grpc_channel_stack * channel_stack, grpc_transport * transport); +void grpc_connected_channel_bind_transport(grpc_channel_stack* channel_stack, + grpc_transport* transport); #endif /* GRPC_INTERNAL_CORE_CHANNEL_CONNECTED_CHANNEL_H */ diff --git a/src/core/channel/context.h b/src/core/channel/context.h index 076dc7189b2..ac5796b9ef1 100644 --- a/src/core/channel/context.h +++ b/src/core/channel/context.h @@ -35,17 +35,15 @@ #define GRPC_INTERNAL_CORE_CHANNEL_CONTEXT_H /* Call object context pointers */ -typedef enum -{ +typedef enum { GRPC_CONTEXT_SECURITY = 0, GRPC_CONTEXT_TRACING, GRPC_CONTEXT_COUNT } grpc_context_index; -typedef struct -{ +typedef struct { void *value; - void (*destroy) (void *); + void (*destroy)(void *); } grpc_call_context_element; #endif /* GRPC_INTERNAL_CORE_CHANNEL_CONTEXT_H */ diff --git a/src/core/channel/http_client_filter.c b/src/core/channel/http_client_filter.c index 3421bdb7b10..721ed4da39a 100644 --- a/src/core/channel/http_client_filter.c +++ b/src/core/channel/http_client_filter.c @@ -37,8 +37,7 @@ #include #include "src/core/support/string.h" -typedef struct call_data -{ +typedef struct call_data { grpc_linked_mdelem method; grpc_linked_mdelem scheme; grpc_linked_mdelem authority; @@ -58,8 +57,7 @@ typedef struct call_data grpc_closure hc_on_recv; } call_data; -typedef struct channel_data -{ +typedef struct channel_data { grpc_mdelem *te_trailers; grpc_mdelem *method; grpc_mdelem *scheme; @@ -69,255 +67,222 @@ typedef struct channel_data grpc_mdelem *user_agent; } channel_data; -typedef struct -{ +typedef struct { grpc_call_element *elem; grpc_exec_ctx *exec_ctx; } client_recv_filter_args; -static grpc_mdelem * -client_recv_filter (void *user_data, grpc_mdelem * md) -{ +static grpc_mdelem *client_recv_filter(void *user_data, grpc_mdelem *md) { client_recv_filter_args *a = user_data; grpc_call_element *elem = a->elem; channel_data *channeld = elem->channel_data; - if (md == channeld->status) - { - return NULL; - } - else if (md->key == channeld->status->key) - { - grpc_call_element_send_cancel (a->exec_ctx, elem); - return NULL; - } - else if (md->key == channeld->content_type->key) - { - return NULL; - } + if (md == channeld->status) { + return NULL; + } else if (md->key == channeld->status->key) { + grpc_call_element_send_cancel(a->exec_ctx, elem); + return NULL; + } else if (md->key == channeld->content_type->key) { + return NULL; + } return md; } -static void -hc_on_recv (grpc_exec_ctx * exec_ctx, void *user_data, int success) -{ +static void hc_on_recv(grpc_exec_ctx *exec_ctx, void *user_data, int success) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; size_t i; size_t nops = calld->recv_ops->nops; grpc_stream_op *ops = calld->recv_ops->ops; - for (i = 0; i < nops; i++) - { - grpc_stream_op *op = &ops[i]; - client_recv_filter_args a; - if (op->type != GRPC_OP_METADATA) - continue; - calld->got_initial_metadata = 1; - a.elem = elem; - a.exec_ctx = exec_ctx; - grpc_metadata_batch_filter (&op->data.metadata, client_recv_filter, &a); - } - calld->on_done_recv->cb (exec_ctx, calld->on_done_recv->cb_arg, success); + for (i = 0; i < nops; i++) { + grpc_stream_op *op = &ops[i]; + client_recv_filter_args a; + if (op->type != GRPC_OP_METADATA) continue; + calld->got_initial_metadata = 1; + a.elem = elem; + a.exec_ctx = exec_ctx; + grpc_metadata_batch_filter(&op->data.metadata, client_recv_filter, &a); + } + calld->on_done_recv->cb(exec_ctx, calld->on_done_recv->cb_arg, success); } -static grpc_mdelem * -client_strip_filter (void *user_data, grpc_mdelem * md) -{ +static grpc_mdelem *client_strip_filter(void *user_data, grpc_mdelem *md) { grpc_call_element *elem = user_data; channel_data *channeld = elem->channel_data; /* eat the things we'd like to set ourselves */ - if (md->key == channeld->method->key) - return NULL; - if (md->key == channeld->scheme->key) - return NULL; - if (md->key == channeld->te_trailers->key) - return NULL; - if (md->key == channeld->content_type->key) - return NULL; - if (md->key == channeld->user_agent->key) - return NULL; + if (md->key == channeld->method->key) return NULL; + if (md->key == channeld->scheme->key) return NULL; + if (md->key == channeld->te_trailers->key) return NULL; + if (md->key == channeld->content_type->key) return NULL; + if (md->key == channeld->user_agent->key) return NULL; return md; } -static void -hc_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) -{ +static void hc_mutate_op(grpc_call_element *elem, + grpc_transport_stream_op *op) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; size_t i; - if (op->send_ops && !calld->sent_initial_metadata) - { - size_t nops = op->send_ops->nops; - grpc_stream_op *ops = op->send_ops->ops; - for (i = 0; i < nops; i++) - { - grpc_stream_op *op = &ops[i]; - if (op->type != GRPC_OP_METADATA) - continue; - calld->sent_initial_metadata = 1; - grpc_metadata_batch_filter (&op->data.metadata, client_strip_filter, elem); - /* Send : prefixed headers, which have to be before any application - layer headers. */ - grpc_metadata_batch_add_head (&op->data.metadata, &calld->method, GRPC_MDELEM_REF (channeld->method)); - grpc_metadata_batch_add_head (&op->data.metadata, &calld->scheme, GRPC_MDELEM_REF (channeld->scheme)); - grpc_metadata_batch_add_tail (&op->data.metadata, &calld->te_trailers, GRPC_MDELEM_REF (channeld->te_trailers)); - grpc_metadata_batch_add_tail (&op->data.metadata, &calld->content_type, GRPC_MDELEM_REF (channeld->content_type)); - grpc_metadata_batch_add_tail (&op->data.metadata, &calld->user_agent, GRPC_MDELEM_REF (channeld->user_agent)); - break; - } + if (op->send_ops && !calld->sent_initial_metadata) { + size_t nops = op->send_ops->nops; + grpc_stream_op *ops = op->send_ops->ops; + for (i = 0; i < nops; i++) { + grpc_stream_op *op = &ops[i]; + if (op->type != GRPC_OP_METADATA) continue; + calld->sent_initial_metadata = 1; + grpc_metadata_batch_filter(&op->data.metadata, client_strip_filter, elem); + /* Send : prefixed headers, which have to be before any application + layer headers. */ + grpc_metadata_batch_add_head(&op->data.metadata, &calld->method, + GRPC_MDELEM_REF(channeld->method)); + grpc_metadata_batch_add_head(&op->data.metadata, &calld->scheme, + GRPC_MDELEM_REF(channeld->scheme)); + grpc_metadata_batch_add_tail(&op->data.metadata, &calld->te_trailers, + GRPC_MDELEM_REF(channeld->te_trailers)); + grpc_metadata_batch_add_tail(&op->data.metadata, &calld->content_type, + GRPC_MDELEM_REF(channeld->content_type)); + grpc_metadata_batch_add_tail(&op->data.metadata, &calld->user_agent, + GRPC_MDELEM_REF(channeld->user_agent)); + break; } + } - if (op->recv_ops && !calld->got_initial_metadata) - { - /* substitute our callback for the higher callback */ - calld->recv_ops = op->recv_ops; - calld->on_done_recv = op->on_done_recv; - op->on_done_recv = &calld->hc_on_recv; - } + if (op->recv_ops && !calld->got_initial_metadata) { + /* substitute our callback for the higher callback */ + calld->recv_ops = op->recv_ops; + calld->on_done_recv = op->on_done_recv; + op->on_done_recv = &calld->hc_on_recv; + } } -static void -hc_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ - GRPC_CALL_LOG_OP (GPR_INFO, elem, op); - hc_mutate_op (elem, op); - grpc_call_next_op (exec_ctx, elem, op); +static void hc_start_transport_op(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op) { + GRPC_CALL_LOG_OP(GPR_INFO, elem, op); + hc_mutate_op(elem, op); + grpc_call_next_op(exec_ctx, elem, op); } /* Constructor for call_data */ -static void -init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) -{ +static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + const void *server_transport_data, + grpc_transport_stream_op *initial_op) { call_data *calld = elem->call_data; calld->sent_initial_metadata = 0; calld->got_initial_metadata = 0; calld->on_done_recv = NULL; - grpc_closure_init (&calld->hc_on_recv, hc_on_recv, elem); - if (initial_op) - hc_mutate_op (elem, initial_op); + grpc_closure_init(&calld->hc_on_recv, hc_on_recv, elem); + if (initial_op) hc_mutate_op(elem, initial_op); } /* Destructor for call_data */ -static void -destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ -} +static void destroy_call_elem(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem) {} -static const char * -scheme_from_args (const grpc_channel_args * args) -{ +static const char *scheme_from_args(const grpc_channel_args *args) { unsigned i; - if (args != NULL) - { - for (i = 0; i < args->num_args; ++i) - { - if (args->args[i].type == GRPC_ARG_STRING && strcmp (args->args[i].key, GRPC_ARG_HTTP2_SCHEME) == 0) - { - return args->args[i].value.string; - } - } + if (args != NULL) { + for (i = 0; i < args->num_args; ++i) { + if (args->args[i].type == GRPC_ARG_STRING && + strcmp(args->args[i].key, GRPC_ARG_HTTP2_SCHEME) == 0) { + return args->args[i].value.string; + } } + } return "http"; } -static grpc_mdstr * -user_agent_from_args (grpc_mdctx * mdctx, const grpc_channel_args * args) -{ +static grpc_mdstr *user_agent_from_args(grpc_mdctx *mdctx, + const grpc_channel_args *args) { gpr_strvec v; size_t i; int is_first = 1; char *tmp; grpc_mdstr *result; - gpr_strvec_init (&v); + gpr_strvec_init(&v); - for (i = 0; args && i < args->num_args; i++) - { - if (0 == strcmp (args->args[i].key, GRPC_ARG_PRIMARY_USER_AGENT_STRING)) - { - if (args->args[i].type != GRPC_ARG_STRING) - { - gpr_log (GPR_ERROR, "Channel argument '%s' should be a string", GRPC_ARG_PRIMARY_USER_AGENT_STRING); - } - else - { - if (!is_first) - gpr_strvec_add (&v, gpr_strdup (" ")); - is_first = 0; - gpr_strvec_add (&v, gpr_strdup (args->args[i].value.string)); - } - } + for (i = 0; args && i < args->num_args; i++) { + if (0 == strcmp(args->args[i].key, GRPC_ARG_PRIMARY_USER_AGENT_STRING)) { + if (args->args[i].type != GRPC_ARG_STRING) { + gpr_log(GPR_ERROR, "Channel argument '%s' should be a string", + GRPC_ARG_PRIMARY_USER_AGENT_STRING); + } else { + if (!is_first) gpr_strvec_add(&v, gpr_strdup(" ")); + is_first = 0; + gpr_strvec_add(&v, gpr_strdup(args->args[i].value.string)); + } } + } - gpr_asprintf (&tmp, "%sgrpc-c/%s (%s)", is_first ? "" : " ", grpc_version_string (), GPR_PLATFORM_STRING); + gpr_asprintf(&tmp, "%sgrpc-c/%s (%s)", is_first ? "" : " ", + grpc_version_string(), GPR_PLATFORM_STRING); is_first = 0; - gpr_strvec_add (&v, tmp); + gpr_strvec_add(&v, tmp); - for (i = 0; args && i < args->num_args; i++) - { - if (0 == strcmp (args->args[i].key, GRPC_ARG_SECONDARY_USER_AGENT_STRING)) - { - if (args->args[i].type != GRPC_ARG_STRING) - { - gpr_log (GPR_ERROR, "Channel argument '%s' should be a string", GRPC_ARG_SECONDARY_USER_AGENT_STRING); - } - else - { - if (!is_first) - gpr_strvec_add (&v, gpr_strdup (" ")); - is_first = 0; - gpr_strvec_add (&v, gpr_strdup (args->args[i].value.string)); - } - } + for (i = 0; args && i < args->num_args; i++) { + if (0 == strcmp(args->args[i].key, GRPC_ARG_SECONDARY_USER_AGENT_STRING)) { + if (args->args[i].type != GRPC_ARG_STRING) { + gpr_log(GPR_ERROR, "Channel argument '%s' should be a string", + GRPC_ARG_SECONDARY_USER_AGENT_STRING); + } else { + if (!is_first) gpr_strvec_add(&v, gpr_strdup(" ")); + is_first = 0; + gpr_strvec_add(&v, gpr_strdup(args->args[i].value.string)); + } } + } - tmp = gpr_strvec_flatten (&v, NULL); - gpr_strvec_destroy (&v); - result = grpc_mdstr_from_string (mdctx, tmp, 0); - gpr_free (tmp); + tmp = gpr_strvec_flatten(&v, NULL); + gpr_strvec_destroy(&v); + result = grpc_mdstr_from_string(mdctx, tmp, 0); + gpr_free(tmp); return result; } /* Constructor for channel_data */ -static void -init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * channel_args, grpc_mdctx * mdctx, int is_first, int is_last) -{ +static void init_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, grpc_channel *master, + const grpc_channel_args *channel_args, + grpc_mdctx *mdctx, int is_first, int is_last) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; /* The first and the last filters tend to be implemented differently to handle the case that there's no 'next' filter to call on the up or down path */ - GPR_ASSERT (!is_last); + GPR_ASSERT(!is_last); /* initialize members */ - channeld->te_trailers = grpc_mdelem_from_strings (mdctx, "te", "trailers"); - channeld->method = grpc_mdelem_from_strings (mdctx, ":method", "POST"); - channeld->scheme = grpc_mdelem_from_strings (mdctx, ":scheme", scheme_from_args (channel_args)); - channeld->content_type = grpc_mdelem_from_strings (mdctx, "content-type", "application/grpc"); - channeld->status = grpc_mdelem_from_strings (mdctx, ":status", "200"); - channeld->user_agent = grpc_mdelem_from_metadata_strings (mdctx, grpc_mdstr_from_string (mdctx, "user-agent", 0), user_agent_from_args (mdctx, channel_args)); + channeld->te_trailers = grpc_mdelem_from_strings(mdctx, "te", "trailers"); + channeld->method = grpc_mdelem_from_strings(mdctx, ":method", "POST"); + channeld->scheme = grpc_mdelem_from_strings(mdctx, ":scheme", + scheme_from_args(channel_args)); + channeld->content_type = + grpc_mdelem_from_strings(mdctx, "content-type", "application/grpc"); + channeld->status = grpc_mdelem_from_strings(mdctx, ":status", "200"); + channeld->user_agent = grpc_mdelem_from_metadata_strings( + mdctx, grpc_mdstr_from_string(mdctx, "user-agent", 0), + user_agent_from_args(mdctx, channel_args)); } /* Destructor for channel data */ -static void -destroy_channel_elem (grpc_exec_ctx * exec_ctx, 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 *channeld = elem->channel_data; - GRPC_MDELEM_UNREF (channeld->te_trailers); - GRPC_MDELEM_UNREF (channeld->method); - GRPC_MDELEM_UNREF (channeld->scheme); - GRPC_MDELEM_UNREF (channeld->content_type); - GRPC_MDELEM_UNREF (channeld->status); - GRPC_MDELEM_UNREF (channeld->user_agent); + GRPC_MDELEM_UNREF(channeld->te_trailers); + GRPC_MDELEM_UNREF(channeld->method); + GRPC_MDELEM_UNREF(channeld->scheme); + GRPC_MDELEM_UNREF(channeld->content_type); + GRPC_MDELEM_UNREF(channeld->status); + GRPC_MDELEM_UNREF(channeld->user_agent); } const grpc_channel_filter grpc_http_client_filter = { - hc_start_transport_op, grpc_channel_next_op, sizeof (call_data), - init_call_elem, destroy_call_elem, sizeof (channel_data), - init_channel_elem, destroy_channel_elem, grpc_call_next_get_peer, - "http-client" -}; + hc_start_transport_op, grpc_channel_next_op, sizeof(call_data), + init_call_elem, destroy_call_elem, sizeof(channel_data), + init_channel_elem, destroy_channel_elem, grpc_call_next_get_peer, + "http-client"}; diff --git a/src/core/channel/http_server_filter.c b/src/core/channel/http_server_filter.c index 6f776b84315..02a351d7b10 100644 --- a/src/core/channel/http_server_filter.c +++ b/src/core/channel/http_server_filter.c @@ -37,8 +37,7 @@ #include #include -typedef struct call_data -{ +typedef struct call_data { gpr_uint8 got_initial_metadata; gpr_uint8 seen_path; gpr_uint8 seen_post; @@ -58,8 +57,7 @@ typedef struct call_data grpc_closure hs_on_recv; } call_data; -typedef struct channel_data -{ +typedef struct channel_data { grpc_mdelem *te_trailers; grpc_mdelem *method_post; grpc_mdelem *http_scheme; @@ -76,268 +74,234 @@ typedef struct channel_data grpc_mdctx *mdctx; } channel_data; -typedef struct -{ +typedef struct { grpc_call_element *elem; grpc_exec_ctx *exec_ctx; } server_filter_args; -static grpc_mdelem * -server_filter (void *user_data, grpc_mdelem * md) -{ +static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { server_filter_args *a = user_data; grpc_call_element *elem = a->elem; channel_data *channeld = elem->channel_data; call_data *calld = elem->call_data; /* Check if it is one of the headers we care about. */ - if (md == channeld->te_trailers || md == channeld->method_post || md == channeld->http_scheme || md == channeld->https_scheme || md == channeld->grpc_scheme || md == channeld->content_type) - { - /* swallow it */ - if (md == channeld->method_post) - { - calld->seen_post = 1; - } - else if (md->key == channeld->http_scheme->key) - { - calld->seen_scheme = 1; - } - else if (md == channeld->te_trailers) - { - calld->seen_te_trailers = 1; - } - /* TODO(klempner): Track that we've seen all the headers we should - require */ - return NULL; + if (md == channeld->te_trailers || md == channeld->method_post || + md == channeld->http_scheme || md == channeld->https_scheme || + md == channeld->grpc_scheme || md == channeld->content_type) { + /* swallow it */ + if (md == channeld->method_post) { + calld->seen_post = 1; + } else if (md->key == channeld->http_scheme->key) { + calld->seen_scheme = 1; + } else if (md == channeld->te_trailers) { + calld->seen_te_trailers = 1; } - else if (md->key == channeld->content_type->key) - { - if (strncmp (grpc_mdstr_as_c_string (md->value), "application/grpc+", 17) == 0) - { - /* Although the C implementation doesn't (currently) generate them, - any custom +-suffix is explicitly valid. */ - /* TODO(klempner): We should consider preallocating common values such - as +proto or +json, or at least stashing them if we see them. */ - /* TODO(klempner): Should we be surfacing this to application code? */ - } - else - { - /* TODO(klempner): We're currently allowing this, but we shouldn't - see it without a proxy so log for now. */ - gpr_log (GPR_INFO, "Unexpected content-type %s", channeld->content_type->key); - } - return NULL; + /* TODO(klempner): Track that we've seen all the headers we should + require */ + return NULL; + } else if (md->key == channeld->content_type->key) { + if (strncmp(grpc_mdstr_as_c_string(md->value), "application/grpc+", 17) == + 0) { + /* Although the C implementation doesn't (currently) generate them, + any custom +-suffix is explicitly valid. */ + /* TODO(klempner): We should consider preallocating common values such + as +proto or +json, or at least stashing them if we see them. */ + /* TODO(klempner): Should we be surfacing this to application code? */ + } else { + /* TODO(klempner): We're currently allowing this, but we shouldn't + see it without a proxy so log for now. */ + gpr_log(GPR_INFO, "Unexpected content-type %s", + channeld->content_type->key); } - else if (md->key == channeld->te_trailers->key || md->key == channeld->method_post->key || md->key == channeld->http_scheme->key) - { - gpr_log (GPR_ERROR, "Invalid %s: header: '%s'", grpc_mdstr_as_c_string (md->key), grpc_mdstr_as_c_string (md->value)); - /* swallow it and error everything out. */ - /* TODO(klempner): We ought to generate more descriptive error messages - on the wire here. */ - grpc_call_element_send_cancel (a->exec_ctx, elem); + return NULL; + } else if (md->key == channeld->te_trailers->key || + md->key == channeld->method_post->key || + md->key == channeld->http_scheme->key) { + gpr_log(GPR_ERROR, "Invalid %s: header: '%s'", + grpc_mdstr_as_c_string(md->key), grpc_mdstr_as_c_string(md->value)); + /* swallow it and error everything out. */ + /* TODO(klempner): We ought to generate more descriptive error messages + on the wire here. */ + grpc_call_element_send_cancel(a->exec_ctx, elem); + return NULL; + } else if (md->key == channeld->path_key) { + if (calld->seen_path) { + gpr_log(GPR_ERROR, "Received :path twice"); return NULL; } - else if (md->key == channeld->path_key) - { - if (calld->seen_path) - { - gpr_log (GPR_ERROR, "Received :path twice"); - return NULL; - } - calld->seen_path = 1; - return md; - } - else if (md->key == channeld->authority_key) - { - calld->seen_authority = 1; - return md; - } - else if (md->key == channeld->host_key) - { - /* translate host to :authority since :authority may be - omitted */ - grpc_mdelem *authority = grpc_mdelem_from_metadata_strings (channeld->mdctx, GRPC_MDSTR_REF (channeld->authority_key), - GRPC_MDSTR_REF (md->value)); - GRPC_MDELEM_UNREF (md); - calld->seen_authority = 1; - return authority; - } - else - { - return md; - } + calld->seen_path = 1; + return md; + } else if (md->key == channeld->authority_key) { + calld->seen_authority = 1; + return md; + } else if (md->key == channeld->host_key) { + /* translate host to :authority since :authority may be + omitted */ + grpc_mdelem *authority = grpc_mdelem_from_metadata_strings( + channeld->mdctx, GRPC_MDSTR_REF(channeld->authority_key), + GRPC_MDSTR_REF(md->value)); + GRPC_MDELEM_UNREF(md); + calld->seen_authority = 1; + return authority; + } else { + return md; + } } -static void -hs_on_recv (grpc_exec_ctx * exec_ctx, void *user_data, int success) -{ +static void hs_on_recv(grpc_exec_ctx *exec_ctx, void *user_data, int success) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; - if (success) - { - size_t i; - size_t nops = calld->recv_ops->nops; - grpc_stream_op *ops = calld->recv_ops->ops; - for (i = 0; i < nops; i++) - { - grpc_stream_op *op = &ops[i]; - server_filter_args a; - if (op->type != GRPC_OP_METADATA) - continue; - calld->got_initial_metadata = 1; - a.elem = elem; - a.exec_ctx = exec_ctx; - grpc_metadata_batch_filter (&op->data.metadata, server_filter, &a); - /* Have we seen the required http2 transport headers? - (:method, :scheme, content-type, with :path and :authority covered - at the channel level right now) */ - if (calld->seen_post && calld->seen_scheme && calld->seen_te_trailers && calld->seen_path && calld->seen_authority) - { - /* do nothing */ - } - else - { - if (!calld->seen_path) - { - gpr_log (GPR_ERROR, "Missing :path header"); - } - if (!calld->seen_authority) - { - gpr_log (GPR_ERROR, "Missing :authority header"); - } - if (!calld->seen_post) - { - gpr_log (GPR_ERROR, "Missing :method header"); - } - if (!calld->seen_scheme) - { - gpr_log (GPR_ERROR, "Missing :scheme header"); - } - if (!calld->seen_te_trailers) - { - gpr_log (GPR_ERROR, "Missing te trailers header"); - } - /* Error this call out */ - success = 0; - grpc_call_element_send_cancel (exec_ctx, elem); - } - } + if (success) { + size_t i; + size_t nops = calld->recv_ops->nops; + grpc_stream_op *ops = calld->recv_ops->ops; + for (i = 0; i < nops; i++) { + grpc_stream_op *op = &ops[i]; + server_filter_args a; + if (op->type != GRPC_OP_METADATA) continue; + calld->got_initial_metadata = 1; + a.elem = elem; + a.exec_ctx = exec_ctx; + grpc_metadata_batch_filter(&op->data.metadata, server_filter, &a); + /* Have we seen the required http2 transport headers? + (:method, :scheme, content-type, with :path and :authority covered + at the channel level right now) */ + if (calld->seen_post && calld->seen_scheme && calld->seen_te_trailers && + calld->seen_path && calld->seen_authority) { + /* do nothing */ + } else { + if (!calld->seen_path) { + gpr_log(GPR_ERROR, "Missing :path header"); + } + if (!calld->seen_authority) { + gpr_log(GPR_ERROR, "Missing :authority header"); + } + if (!calld->seen_post) { + gpr_log(GPR_ERROR, "Missing :method header"); + } + if (!calld->seen_scheme) { + gpr_log(GPR_ERROR, "Missing :scheme header"); + } + if (!calld->seen_te_trailers) { + gpr_log(GPR_ERROR, "Missing te trailers header"); + } + /* Error this call out */ + success = 0; + grpc_call_element_send_cancel(exec_ctx, elem); + } } - calld->on_done_recv->cb (exec_ctx, calld->on_done_recv->cb_arg, success); + } + calld->on_done_recv->cb(exec_ctx, calld->on_done_recv->cb_arg, success); } -static void -hs_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) -{ +static void hs_mutate_op(grpc_call_element *elem, + grpc_transport_stream_op *op) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; size_t i; - if (op->send_ops && !calld->sent_status) - { - size_t nops = op->send_ops->nops; - grpc_stream_op *ops = op->send_ops->ops; - for (i = 0; i < nops; i++) - { - grpc_stream_op *op = &ops[i]; - if (op->type != GRPC_OP_METADATA) - continue; - calld->sent_status = 1; - grpc_metadata_batch_add_head (&op->data.metadata, &calld->status, GRPC_MDELEM_REF (channeld->status_ok)); - grpc_metadata_batch_add_tail (&op->data.metadata, &calld->content_type, GRPC_MDELEM_REF (channeld->content_type)); - break; - } + if (op->send_ops && !calld->sent_status) { + size_t nops = op->send_ops->nops; + grpc_stream_op *ops = op->send_ops->ops; + for (i = 0; i < nops; i++) { + grpc_stream_op *op = &ops[i]; + if (op->type != GRPC_OP_METADATA) continue; + calld->sent_status = 1; + grpc_metadata_batch_add_head(&op->data.metadata, &calld->status, + GRPC_MDELEM_REF(channeld->status_ok)); + grpc_metadata_batch_add_tail(&op->data.metadata, &calld->content_type, + GRPC_MDELEM_REF(channeld->content_type)); + break; } + } - if (op->recv_ops && !calld->got_initial_metadata) - { - /* substitute our callback for the higher callback */ - calld->recv_ops = op->recv_ops; - calld->on_done_recv = op->on_done_recv; - op->on_done_recv = &calld->hs_on_recv; - } + if (op->recv_ops && !calld->got_initial_metadata) { + /* substitute our callback for the higher callback */ + calld->recv_ops = op->recv_ops; + calld->on_done_recv = op->on_done_recv; + op->on_done_recv = &calld->hs_on_recv; + } } -static void -hs_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ - GRPC_CALL_LOG_OP (GPR_INFO, elem, op); - hs_mutate_op (elem, op); - grpc_call_next_op (exec_ctx, elem, op); +static void hs_start_transport_op(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op) { + GRPC_CALL_LOG_OP(GPR_INFO, elem, op); + hs_mutate_op(elem, op); + grpc_call_next_op(exec_ctx, elem, op); } /* Constructor for call_data */ -static void -init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) -{ +static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + const void *server_transport_data, + grpc_transport_stream_op *initial_op) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; /* initialize members */ - memset (calld, 0, sizeof (*calld)); - grpc_closure_init (&calld->hs_on_recv, hs_on_recv, elem); - if (initial_op) - hs_mutate_op (elem, initial_op); + memset(calld, 0, sizeof(*calld)); + grpc_closure_init(&calld->hs_on_recv, hs_on_recv, elem); + if (initial_op) hs_mutate_op(elem, initial_op); } /* Destructor for call_data */ -static void -destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ -} +static void destroy_call_elem(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem) {} /* Constructor for channel_data */ -static void -init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last) -{ +static void init_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, grpc_channel *master, + const grpc_channel_args *args, grpc_mdctx *mdctx, + int is_first, int is_last) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; /* The first and the last filters tend to be implemented differently to handle the case that there's no 'next' filter to call on the up or down path */ - GPR_ASSERT (!is_first); - GPR_ASSERT (!is_last); + GPR_ASSERT(!is_first); + GPR_ASSERT(!is_last); /* initialize members */ - channeld->te_trailers = grpc_mdelem_from_strings (mdctx, "te", "trailers"); - channeld->status_ok = grpc_mdelem_from_strings (mdctx, ":status", "200"); - channeld->status_not_found = grpc_mdelem_from_strings (mdctx, ":status", "404"); - channeld->method_post = grpc_mdelem_from_strings (mdctx, ":method", "POST"); - channeld->http_scheme = grpc_mdelem_from_strings (mdctx, ":scheme", "http"); - channeld->https_scheme = grpc_mdelem_from_strings (mdctx, ":scheme", "https"); - channeld->grpc_scheme = grpc_mdelem_from_strings (mdctx, ":scheme", "grpc"); - channeld->path_key = grpc_mdstr_from_string (mdctx, ":path", 0); - channeld->authority_key = grpc_mdstr_from_string (mdctx, ":authority", 0); - channeld->host_key = grpc_mdstr_from_string (mdctx, "host", 0); - channeld->content_type = grpc_mdelem_from_strings (mdctx, "content-type", "application/grpc"); + channeld->te_trailers = grpc_mdelem_from_strings(mdctx, "te", "trailers"); + channeld->status_ok = grpc_mdelem_from_strings(mdctx, ":status", "200"); + channeld->status_not_found = + grpc_mdelem_from_strings(mdctx, ":status", "404"); + channeld->method_post = grpc_mdelem_from_strings(mdctx, ":method", "POST"); + channeld->http_scheme = grpc_mdelem_from_strings(mdctx, ":scheme", "http"); + channeld->https_scheme = grpc_mdelem_from_strings(mdctx, ":scheme", "https"); + channeld->grpc_scheme = grpc_mdelem_from_strings(mdctx, ":scheme", "grpc"); + channeld->path_key = grpc_mdstr_from_string(mdctx, ":path", 0); + channeld->authority_key = grpc_mdstr_from_string(mdctx, ":authority", 0); + channeld->host_key = grpc_mdstr_from_string(mdctx, "host", 0); + channeld->content_type = + grpc_mdelem_from_strings(mdctx, "content-type", "application/grpc"); channeld->mdctx = mdctx; } /* Destructor for channel data */ -static void -destroy_channel_elem (grpc_exec_ctx * exec_ctx, 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 *channeld = elem->channel_data; - GRPC_MDELEM_UNREF (channeld->te_trailers); - GRPC_MDELEM_UNREF (channeld->status_ok); - GRPC_MDELEM_UNREF (channeld->status_not_found); - GRPC_MDELEM_UNREF (channeld->method_post); - GRPC_MDELEM_UNREF (channeld->http_scheme); - GRPC_MDELEM_UNREF (channeld->https_scheme); - GRPC_MDELEM_UNREF (channeld->grpc_scheme); - GRPC_MDELEM_UNREF (channeld->content_type); - GRPC_MDSTR_UNREF (channeld->path_key); - GRPC_MDSTR_UNREF (channeld->authority_key); - GRPC_MDSTR_UNREF (channeld->host_key); + GRPC_MDELEM_UNREF(channeld->te_trailers); + GRPC_MDELEM_UNREF(channeld->status_ok); + GRPC_MDELEM_UNREF(channeld->status_not_found); + GRPC_MDELEM_UNREF(channeld->method_post); + GRPC_MDELEM_UNREF(channeld->http_scheme); + GRPC_MDELEM_UNREF(channeld->https_scheme); + GRPC_MDELEM_UNREF(channeld->grpc_scheme); + GRPC_MDELEM_UNREF(channeld->content_type); + GRPC_MDSTR_UNREF(channeld->path_key); + GRPC_MDSTR_UNREF(channeld->authority_key); + GRPC_MDSTR_UNREF(channeld->host_key); } const grpc_channel_filter grpc_http_server_filter = { - hs_start_transport_op, grpc_channel_next_op, sizeof (call_data), - init_call_elem, destroy_call_elem, sizeof (channel_data), - init_channel_elem, destroy_channel_elem, grpc_call_next_get_peer, - "http-server" -}; + hs_start_transport_op, grpc_channel_next_op, sizeof(call_data), + init_call_elem, destroy_call_elem, sizeof(channel_data), + init_channel_elem, destroy_channel_elem, grpc_call_next_get_peer, + "http-server"}; diff --git a/src/core/channel/noop_filter.c b/src/core/channel/noop_filter.c index 7e566642f93..91b30d61cae 100644 --- a/src/core/channel/noop_filter.c +++ b/src/core/channel/noop_filter.c @@ -34,31 +34,25 @@ #include "src/core/channel/noop_filter.h" #include -typedef struct call_data -{ - int unused; /* C89 requires at least one struct element */ +typedef struct call_data { + int unused; /* C89 requires at least one struct element */ } call_data; -typedef struct channel_data -{ - int unused; /* C89 requires at least one struct element */ +typedef struct channel_data { + int unused; /* C89 requires at least one struct element */ } channel_data; /* used to silence 'variable not used' warnings */ -static void -ignore_unused (void *ignored) -{ -} +static void ignore_unused(void *ignored) {} -static void -noop_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) -{ +static void noop_mutate_op(grpc_call_element *elem, + grpc_transport_stream_op *op) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; - ignore_unused (calld); - ignore_unused (channeld); + ignore_unused(calld); + ignore_unused(channeld); /* do nothing */ } @@ -68,19 +62,19 @@ noop_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) - a network event (or similar) from below, to receive something op contains type and call direction information, in addition to the data that is being sent or received. */ -static void -noop_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ - noop_mutate_op (elem, op); +static void noop_start_transport_stream_op(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op) { + noop_mutate_op(elem, op); /* pass control down the stack */ - grpc_call_next_op (exec_ctx, elem, op); + grpc_call_next_op(exec_ctx, elem, op); } /* Constructor for call_data */ -static void -init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) -{ +static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + const void *server_transport_data, + grpc_transport_stream_op *initial_op) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; @@ -88,51 +82,47 @@ init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void * /* initialize members */ calld->unused = channeld->unused; - if (initial_op) - noop_mutate_op (elem, initial_op); + if (initial_op) noop_mutate_op(elem, initial_op); } /* Destructor for call_data */ -static void -destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ -} +static void destroy_call_elem(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem) {} /* Constructor for channel_data */ -static void -init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last) -{ +static void init_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, grpc_channel *master, + const grpc_channel_args *args, grpc_mdctx *mdctx, + int is_first, int is_last) { /* grab pointers to our data from the channel element */ channel_data *channeld = elem->channel_data; /* The first and the last filters tend to be implemented differently to handle the case that there's no 'next' filter to call on the up or down path */ - GPR_ASSERT (!is_first); - GPR_ASSERT (!is_last); + GPR_ASSERT(!is_first); + GPR_ASSERT(!is_last); /* initialize members */ channeld->unused = 0; } /* Destructor for channel data */ -static void -destroy_channel_elem (grpc_exec_ctx * exec_ctx, 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 *channeld = elem->channel_data; - ignore_unused (channeld); + ignore_unused(channeld); } -const grpc_channel_filter grpc_no_op_filter = { noop_start_transport_stream_op, - grpc_channel_next_op, - sizeof (call_data), - init_call_elem, - destroy_call_elem, - sizeof (channel_data), - init_channel_elem, - destroy_channel_elem, - grpc_call_next_get_peer, - "no-op" -}; +const grpc_channel_filter grpc_no_op_filter = {noop_start_transport_stream_op, + grpc_channel_next_op, + sizeof(call_data), + init_call_elem, + destroy_call_elem, + sizeof(channel_data), + init_channel_elem, + destroy_channel_elem, + grpc_call_next_get_peer, + "no-op"}; diff --git a/src/core/client_config/client_config.c b/src/core/client_config/client_config.c index fc6448201f3..6ecffb38541 100644 --- a/src/core/client_config/client_config.c +++ b/src/core/client_config/client_config.c @@ -37,50 +37,36 @@ #include -struct grpc_client_config -{ +struct grpc_client_config { gpr_refcount refs; grpc_lb_policy *lb_policy; }; -grpc_client_config * -grpc_client_config_create () -{ - grpc_client_config *c = gpr_malloc (sizeof (*c)); - memset (c, 0, sizeof (*c)); - gpr_ref_init (&c->refs, 1); +grpc_client_config *grpc_client_config_create() { + grpc_client_config *c = gpr_malloc(sizeof(*c)); + memset(c, 0, sizeof(*c)); + gpr_ref_init(&c->refs, 1); return c; } -void -grpc_client_config_ref (grpc_client_config * c) -{ - gpr_ref (&c->refs); -} +void grpc_client_config_ref(grpc_client_config *c) { gpr_ref(&c->refs); } -void -grpc_client_config_unref (grpc_exec_ctx * exec_ctx, grpc_client_config * c) -{ - if (gpr_unref (&c->refs)) - { - GRPC_LB_POLICY_UNREF (exec_ctx, c->lb_policy, "client_config"); - gpr_free (c); - } +void grpc_client_config_unref(grpc_exec_ctx *exec_ctx, grpc_client_config *c) { + if (gpr_unref(&c->refs)) { + GRPC_LB_POLICY_UNREF(exec_ctx, c->lb_policy, "client_config"); + gpr_free(c); + } } -void -grpc_client_config_set_lb_policy (grpc_client_config * c, grpc_lb_policy * lb_policy) -{ - GPR_ASSERT (c->lb_policy == NULL); - if (lb_policy) - { - GRPC_LB_POLICY_REF (lb_policy, "client_config"); - } +void grpc_client_config_set_lb_policy(grpc_client_config *c, + grpc_lb_policy *lb_policy) { + GPR_ASSERT(c->lb_policy == NULL); + if (lb_policy) { + GRPC_LB_POLICY_REF(lb_policy, "client_config"); + } c->lb_policy = lb_policy; } -grpc_lb_policy * -grpc_client_config_get_lb_policy (grpc_client_config * c) -{ +grpc_lb_policy *grpc_client_config_get_lb_policy(grpc_client_config *c) { return c->lb_policy; } diff --git a/src/core/client_config/client_config.h b/src/core/client_config/client_config.h index c6afafe023d..04bf036b00b 100644 --- a/src/core/client_config/client_config.h +++ b/src/core/client_config/client_config.h @@ -40,11 +40,14 @@ grpc_resolver */ typedef struct grpc_client_config grpc_client_config; -grpc_client_config *grpc_client_config_create (); -void grpc_client_config_ref (grpc_client_config * client_config); -void grpc_client_config_unref (grpc_exec_ctx * exec_ctx, grpc_client_config * client_config); +grpc_client_config *grpc_client_config_create(); +void grpc_client_config_ref(grpc_client_config *client_config); +void grpc_client_config_unref(grpc_exec_ctx *exec_ctx, + grpc_client_config *client_config); -void grpc_client_config_set_lb_policy (grpc_client_config * client_config, grpc_lb_policy * lb_policy); -grpc_lb_policy *grpc_client_config_get_lb_policy (grpc_client_config * client_config); +void grpc_client_config_set_lb_policy(grpc_client_config *client_config, + grpc_lb_policy *lb_policy); +grpc_lb_policy *grpc_client_config_get_lb_policy( + grpc_client_config *client_config); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_CLIENT_CONFIG_H */ diff --git a/src/core/client_config/connector.c b/src/core/client_config/connector.c index 209c3f1767c..1603ffb8be0 100644 --- a/src/core/client_config/connector.c +++ b/src/core/client_config/connector.c @@ -33,26 +33,22 @@ #include "src/core/client_config/connector.h" -void -grpc_connector_ref (grpc_connector * connector) -{ - connector->vtable->ref (connector); +void grpc_connector_ref(grpc_connector* connector) { + connector->vtable->ref(connector); } -void -grpc_connector_unref (grpc_exec_ctx * exec_ctx, grpc_connector * connector) -{ - connector->vtable->unref (exec_ctx, connector); +void grpc_connector_unref(grpc_exec_ctx* exec_ctx, grpc_connector* connector) { + connector->vtable->unref(exec_ctx, 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 (exec_ctx, connector, in_args, out_args, notify); +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(exec_ctx, connector, in_args, out_args, notify); } -void -grpc_connector_shutdown (grpc_exec_ctx * exec_ctx, grpc_connector * connector) -{ - connector->vtable->shutdown (exec_ctx, connector); +void grpc_connector_shutdown(grpc_exec_ctx* exec_ctx, + grpc_connector* connector) { + connector->vtable->shutdown(exec_ctx, connector); } diff --git a/src/core/client_config/connector.h b/src/core/client_config/connector.h index 3abee64008a..e9b8be4b530 100644 --- a/src/core/client_config/connector.h +++ b/src/core/client_config/connector.h @@ -41,13 +41,11 @@ typedef struct grpc_connector grpc_connector; typedef struct grpc_connector_vtable grpc_connector_vtable; -struct grpc_connector -{ +struct grpc_connector { const grpc_connector_vtable *vtable; }; -typedef struct -{ +typedef struct { /** set of pollsets interested in this connection */ grpc_pollset_set *interested_parties; /** address to connect to */ @@ -59,8 +57,7 @@ typedef struct const grpc_channel_args *channel_args; } grpc_connect_in_args; -typedef struct -{ +typedef struct { /** the connected transport */ grpc_transport *transport; /** any additional filters (owned by the caller of connect) */ @@ -68,21 +65,26 @@ typedef struct size_t num_filters; } grpc_connect_out_args; -struct grpc_connector_vtable -{ - void (*ref) (grpc_connector * connector); - void (*unref) (grpc_exec_ctx * exec_ctx, grpc_connector * connector); +struct grpc_connector_vtable { + void (*ref)(grpc_connector *connector); + void (*unref)(grpc_exec_ctx *exec_ctx, grpc_connector *connector); /** Implementation of grpc_connector_shutdown */ - void (*shutdown) (grpc_exec_ctx * exec_ctx, grpc_connector * connector); + void (*shutdown)(grpc_exec_ctx *exec_ctx, grpc_connector *connector); /** Implementation of grpc_connector_connect */ - 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); + 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); }; -void grpc_connector_ref (grpc_connector * connector); -void grpc_connector_unref (grpc_exec_ctx * exec_ctx, grpc_connector * connector); +void grpc_connector_ref(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_exec_ctx * exec_ctx, grpc_connector * connector, const grpc_connect_in_args * in_args, grpc_connect_out_args * out_args, grpc_closure * notify); +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_exec_ctx * exec_ctx, grpc_connector * connector); +void grpc_connector_shutdown(grpc_exec_ctx *exec_ctx, + grpc_connector *connector); #endif diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index 75e6c01839d..5fa1ee44180 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -39,16 +39,14 @@ #include #include "src/core/transport/connectivity_state.h" -typedef struct pending_pick -{ +typedef struct pending_pick { struct pending_pick *next; grpc_pollset *pollset; grpc_subchannel **target; grpc_closure *on_complete; } pending_pick; -typedef struct -{ +typedef struct { /** base policy: must be first */ grpc_lb_policy base; /** all our subchannels */ @@ -78,303 +76,284 @@ typedef struct grpc_connectivity_state_tracker state_tracker; } pick_first_lb_policy; -static void -del_interested_parties_locked (grpc_exec_ctx * exec_ctx, pick_first_lb_policy * p) -{ +static void del_interested_parties_locked(grpc_exec_ctx *exec_ctx, + pick_first_lb_policy *p) { pending_pick *pp; - for (pp = p->pending_picks; pp; pp = pp->next) - { - grpc_subchannel_del_interested_party (exec_ctx, p->subchannels[p->checking_subchannel], pp->pollset); - } + for (pp = p->pending_picks; pp; pp = pp->next) { + grpc_subchannel_del_interested_party( + exec_ctx, p->subchannels[p->checking_subchannel], pp->pollset); + } } -static void -add_interested_parties_locked (grpc_exec_ctx * exec_ctx, pick_first_lb_policy * p) -{ +static void add_interested_parties_locked(grpc_exec_ctx *exec_ctx, + pick_first_lb_policy *p) { pending_pick *pp; - for (pp = p->pending_picks; pp; pp = pp->next) - { - grpc_subchannel_add_interested_party (exec_ctx, p->subchannels[p->checking_subchannel], pp->pollset); - } + for (pp = p->pending_picks; pp; pp = pp->next) { + grpc_subchannel_add_interested_party( + exec_ctx, p->subchannels[p->checking_subchannel], pp->pollset); + } } -void -pf_destroy (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) -{ - pick_first_lb_policy *p = (pick_first_lb_policy *) pol; +void pf_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { + pick_first_lb_policy *p = (pick_first_lb_policy *)pol; size_t i; - GPR_ASSERT (p->pending_picks == NULL); - for (i = 0; i < p->num_subchannels; i++) - { - GRPC_SUBCHANNEL_UNREF (exec_ctx, p->subchannels[i], "pick_first"); - } - grpc_connectivity_state_destroy (exec_ctx, &p->state_tracker); - gpr_free (p->subchannels); - gpr_mu_destroy (&p->mu); - gpr_free (p); + GPR_ASSERT(p->pending_picks == NULL); + for (i = 0; i < p->num_subchannels; i++) { + GRPC_SUBCHANNEL_UNREF(exec_ctx, p->subchannels[i], "pick_first"); + } + grpc_connectivity_state_destroy(exec_ctx, &p->state_tracker); + gpr_free(p->subchannels); + gpr_mu_destroy(&p->mu); + gpr_free(p); } -void -pf_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) -{ - pick_first_lb_policy *p = (pick_first_lb_policy *) pol; +void pf_shutdown(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { + pick_first_lb_policy *p = (pick_first_lb_policy *)pol; pending_pick *pp; - gpr_mu_lock (&p->mu); - del_interested_parties_locked (exec_ctx, p); + gpr_mu_lock(&p->mu); + del_interested_parties_locked(exec_ctx, p); p->shutdown = 1; pp = p->pending_picks; p->pending_picks = NULL; - grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "shutdown"); - gpr_mu_unlock (&p->mu); - while (pp != NULL) - { - pending_pick *next = pp->next; - *pp->target = NULL; - grpc_exec_ctx_enqueue (exec_ctx, pp->on_complete, 1); - gpr_free (pp); - pp = next; - } + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_FATAL_FAILURE, "shutdown"); + gpr_mu_unlock(&p->mu); + while (pp != NULL) { + pending_pick *next = pp->next; + *pp->target = NULL; + grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, 1); + gpr_free(pp); + pp = next; + } } -static void -start_picking (grpc_exec_ctx * exec_ctx, pick_first_lb_policy * p) -{ +static void start_picking(grpc_exec_ctx *exec_ctx, pick_first_lb_policy *p) { p->started_picking = 1; p->checking_subchannel = 0; p->checking_connectivity = GRPC_CHANNEL_IDLE; - GRPC_LB_POLICY_REF (&p->base, "pick_first_connectivity"); - grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed); + GRPC_LB_POLICY_REF(&p->base, "pick_first_connectivity"); + grpc_subchannel_notify_on_state_change( + exec_ctx, p->subchannels[p->checking_subchannel], + &p->checking_connectivity, &p->connectivity_changed); } -void -pf_exit_idle (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) -{ - pick_first_lb_policy *p = (pick_first_lb_policy *) pol; - gpr_mu_lock (&p->mu); - if (!p->started_picking) - { - start_picking (exec_ctx, p); - } - gpr_mu_unlock (&p->mu); +void pf_exit_idle(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { + pick_first_lb_policy *p = (pick_first_lb_policy *)pol; + gpr_mu_lock(&p->mu); + if (!p->started_picking) { + start_picking(exec_ctx, p); + } + gpr_mu_unlock(&p->mu); } -void -pf_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete) -{ - pick_first_lb_policy *p = (pick_first_lb_policy *) pol; +void pf_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, + grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, + grpc_subchannel **target, grpc_closure *on_complete) { + pick_first_lb_policy *p = (pick_first_lb_policy *)pol; pending_pick *pp; - gpr_mu_lock (&p->mu); - if (p->selected) - { - gpr_mu_unlock (&p->mu); - *target = p->selected; - grpc_exec_ctx_enqueue (exec_ctx, on_complete, 1); - } - else - { - if (!p->started_picking) - { - start_picking (exec_ctx, p); - } - grpc_subchannel_add_interested_party (exec_ctx, p->subchannels[p->checking_subchannel], pollset); - pp = gpr_malloc (sizeof (*pp)); - pp->next = p->pending_picks; - pp->pollset = pollset; - pp->target = target; - pp->on_complete = on_complete; - p->pending_picks = pp; - gpr_mu_unlock (&p->mu); + gpr_mu_lock(&p->mu); + if (p->selected) { + gpr_mu_unlock(&p->mu); + *target = p->selected; + grpc_exec_ctx_enqueue(exec_ctx, on_complete, 1); + } else { + if (!p->started_picking) { + start_picking(exec_ctx, p); } + grpc_subchannel_add_interested_party( + exec_ctx, p->subchannels[p->checking_subchannel], pollset); + pp = gpr_malloc(sizeof(*pp)); + pp->next = p->pending_picks; + pp->pollset = pollset; + pp->target = target; + pp->on_complete = on_complete; + p->pending_picks = pp; + gpr_mu_unlock(&p->mu); + } } -static void -pf_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) -{ +static void pf_connectivity_changed(grpc_exec_ctx *exec_ctx, void *arg, + int iomgr_success) { pick_first_lb_policy *p = arg; pending_pick *pp; - gpr_mu_lock (&p->mu); + gpr_mu_lock(&p->mu); - if (p->shutdown) - { - gpr_mu_unlock (&p->mu); - GRPC_LB_POLICY_UNREF (exec_ctx, &p->base, "pick_first_connectivity"); - return; + if (p->shutdown) { + gpr_mu_unlock(&p->mu); + GRPC_LB_POLICY_UNREF(exec_ctx, &p->base, "pick_first_connectivity"); + return; + } else if (p->selected != NULL) { + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + p->checking_connectivity, "selected_changed"); + if (p->checking_connectivity != GRPC_CHANNEL_FATAL_FAILURE) { + grpc_subchannel_notify_on_state_change(exec_ctx, p->selected, + &p->checking_connectivity, + &p->connectivity_changed); + } else { + GRPC_LB_POLICY_UNREF(exec_ctx, &p->base, "pick_first_connectivity"); } - else if (p->selected != NULL) - { - grpc_connectivity_state_set (exec_ctx, &p->state_tracker, p->checking_connectivity, "selected_changed"); - if (p->checking_connectivity != GRPC_CHANNEL_FATAL_FAILURE) - { - grpc_subchannel_notify_on_state_change (exec_ctx, p->selected, &p->checking_connectivity, &p->connectivity_changed); - } - else - { - GRPC_LB_POLICY_UNREF (exec_ctx, &p->base, "pick_first_connectivity"); - } - } - else - { - loop: - switch (p->checking_connectivity) - { - case GRPC_CHANNEL_READY: - grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_READY, "connecting_ready"); - p->selected = p->subchannels[p->checking_subchannel]; - while ((pp = p->pending_picks)) - { - p->pending_picks = pp->next; - *pp->target = p->selected; - grpc_subchannel_del_interested_party (exec_ctx, p->selected, pp->pollset); - grpc_exec_ctx_enqueue (exec_ctx, pp->on_complete, 1); - gpr_free (pp); - } - grpc_subchannel_notify_on_state_change (exec_ctx, p->selected, &p->checking_connectivity, &p->connectivity_changed); - break; - case GRPC_CHANNEL_TRANSIENT_FAILURE: - grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "connecting_transient_failure"); - del_interested_parties_locked (exec_ctx, p); - p->checking_subchannel = (p->checking_subchannel + 1) % p->num_subchannels; - p->checking_connectivity = grpc_subchannel_check_connectivity (p->subchannels[p->checking_subchannel]); - add_interested_parties_locked (exec_ctx, p); - if (p->checking_connectivity == GRPC_CHANNEL_TRANSIENT_FAILURE) - { - grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed); - } - else - { - goto loop; - } - break; - case GRPC_CHANNEL_CONNECTING: - case GRPC_CHANNEL_IDLE: - grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_CONNECTING, "connecting_changed"); - grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed); - break; - case GRPC_CHANNEL_FATAL_FAILURE: - del_interested_parties_locked (exec_ctx, p); - GPR_SWAP (grpc_subchannel *, p->subchannels[p->checking_subchannel], p->subchannels[p->num_subchannels - 1]); - p->num_subchannels--; - GRPC_SUBCHANNEL_UNREF (exec_ctx, p->subchannels[p->num_subchannels], "pick_first"); - if (p->num_subchannels == 0) - { - grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "no_more_channels"); - while ((pp = p->pending_picks)) - { - p->pending_picks = pp->next; - *pp->target = NULL; - grpc_exec_ctx_enqueue (exec_ctx, pp->on_complete, 1); - gpr_free (pp); - } - GRPC_LB_POLICY_UNREF (exec_ctx, &p->base, "pick_first_connectivity"); - } - else - { - grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "subchannel_failed"); - p->checking_subchannel %= p->num_subchannels; - p->checking_connectivity = grpc_subchannel_check_connectivity (p->subchannels[p->checking_subchannel]); - add_interested_parties_locked (exec_ctx, p); - goto loop; - } - } + } else { + loop: + switch (p->checking_connectivity) { + case GRPC_CHANNEL_READY: + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_READY, "connecting_ready"); + p->selected = p->subchannels[p->checking_subchannel]; + while ((pp = p->pending_picks)) { + p->pending_picks = pp->next; + *pp->target = p->selected; + grpc_subchannel_del_interested_party(exec_ctx, p->selected, + pp->pollset); + grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, 1); + gpr_free(pp); + } + grpc_subchannel_notify_on_state_change(exec_ctx, p->selected, + &p->checking_connectivity, + &p->connectivity_changed); + break; + case GRPC_CHANNEL_TRANSIENT_FAILURE: + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_TRANSIENT_FAILURE, + "connecting_transient_failure"); + del_interested_parties_locked(exec_ctx, p); + p->checking_subchannel = + (p->checking_subchannel + 1) % p->num_subchannels; + p->checking_connectivity = grpc_subchannel_check_connectivity( + p->subchannels[p->checking_subchannel]); + add_interested_parties_locked(exec_ctx, p); + if (p->checking_connectivity == GRPC_CHANNEL_TRANSIENT_FAILURE) { + grpc_subchannel_notify_on_state_change( + exec_ctx, p->subchannels[p->checking_subchannel], + &p->checking_connectivity, &p->connectivity_changed); + } else { + goto loop; + } + break; + case GRPC_CHANNEL_CONNECTING: + case GRPC_CHANNEL_IDLE: + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_CONNECTING, + "connecting_changed"); + grpc_subchannel_notify_on_state_change( + exec_ctx, p->subchannels[p->checking_subchannel], + &p->checking_connectivity, &p->connectivity_changed); + break; + case GRPC_CHANNEL_FATAL_FAILURE: + del_interested_parties_locked(exec_ctx, p); + GPR_SWAP(grpc_subchannel *, p->subchannels[p->checking_subchannel], + p->subchannels[p->num_subchannels - 1]); + p->num_subchannels--; + GRPC_SUBCHANNEL_UNREF(exec_ctx, p->subchannels[p->num_subchannels], + "pick_first"); + if (p->num_subchannels == 0) { + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_FATAL_FAILURE, + "no_more_channels"); + while ((pp = p->pending_picks)) { + p->pending_picks = pp->next; + *pp->target = NULL; + grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, 1); + gpr_free(pp); + } + GRPC_LB_POLICY_UNREF(exec_ctx, &p->base, "pick_first_connectivity"); + } else { + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_TRANSIENT_FAILURE, + "subchannel_failed"); + p->checking_subchannel %= p->num_subchannels; + p->checking_connectivity = grpc_subchannel_check_connectivity( + p->subchannels[p->checking_subchannel]); + add_interested_parties_locked(exec_ctx, p); + goto loop; + } } + } - gpr_mu_unlock (&p->mu); + gpr_mu_unlock(&p->mu); } -static void -pf_broadcast (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_transport_op * op) -{ - pick_first_lb_policy *p = (pick_first_lb_policy *) pol; +static void pf_broadcast(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, + grpc_transport_op *op) { + pick_first_lb_policy *p = (pick_first_lb_policy *)pol; size_t i; size_t n; grpc_subchannel **subchannels; - gpr_mu_lock (&p->mu); + gpr_mu_lock(&p->mu); n = p->num_subchannels; - subchannels = gpr_malloc (n * sizeof (*subchannels)); - for (i = 0; i < n; i++) - { - subchannels[i] = p->subchannels[i]; - GRPC_SUBCHANNEL_REF (subchannels[i], "pf_broadcast"); - } - gpr_mu_unlock (&p->mu); + subchannels = gpr_malloc(n * sizeof(*subchannels)); + for (i = 0; i < n; i++) { + subchannels[i] = p->subchannels[i]; + GRPC_SUBCHANNEL_REF(subchannels[i], "pf_broadcast"); + } + gpr_mu_unlock(&p->mu); - for (i = 0; i < n; i++) - { - grpc_subchannel_process_transport_op (exec_ctx, subchannels[i], op); - GRPC_SUBCHANNEL_UNREF (exec_ctx, subchannels[i], "pf_broadcast"); - } - gpr_free (subchannels); + for (i = 0; i < n; i++) { + grpc_subchannel_process_transport_op(exec_ctx, subchannels[i], op); + GRPC_SUBCHANNEL_UNREF(exec_ctx, subchannels[i], "pf_broadcast"); + } + gpr_free(subchannels); } -static grpc_connectivity_state -pf_check_connectivity (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) -{ - pick_first_lb_policy *p = (pick_first_lb_policy *) pol; +static grpc_connectivity_state pf_check_connectivity(grpc_exec_ctx *exec_ctx, + grpc_lb_policy *pol) { + pick_first_lb_policy *p = (pick_first_lb_policy *)pol; grpc_connectivity_state st; - gpr_mu_lock (&p->mu); - st = grpc_connectivity_state_check (&p->state_tracker); - gpr_mu_unlock (&p->mu); + gpr_mu_lock(&p->mu); + st = grpc_connectivity_state_check(&p->state_tracker); + gpr_mu_unlock(&p->mu); return st; } -void -pf_notify_on_state_change (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; - gpr_mu_lock (&p->mu); - grpc_connectivity_state_notify_on_state_change (exec_ctx, &p->state_tracker, current, notify); - gpr_mu_unlock (&p->mu); +void pf_notify_on_state_change(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; + gpr_mu_lock(&p->mu); + grpc_connectivity_state_notify_on_state_change(exec_ctx, &p->state_tracker, + current, notify); + gpr_mu_unlock(&p->mu); } static const grpc_lb_policy_vtable pick_first_lb_policy_vtable = { - pf_destroy, - pf_shutdown, - pf_pick, - pf_exit_idle, - pf_broadcast, - pf_check_connectivity, - pf_notify_on_state_change -}; + pf_destroy, + pf_shutdown, + pf_pick, + pf_exit_idle, + pf_broadcast, + pf_check_connectivity, + pf_notify_on_state_change}; -static void -pick_first_factory_ref (grpc_lb_policy_factory * factory) -{ -} +static void pick_first_factory_ref(grpc_lb_policy_factory *factory) {} -static void -pick_first_factory_unref (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, grpc_lb_policy_args * args) -{ - pick_first_lb_policy *p = gpr_malloc (sizeof (*p)); - GPR_ASSERT (args->num_subchannels > 0); - memset (p, 0, sizeof (*p)); - grpc_lb_policy_init (&p->base, &pick_first_lb_policy_vtable); - p->subchannels = gpr_malloc (sizeof (grpc_subchannel *) * args->num_subchannels); +static grpc_lb_policy *create_pick_first(grpc_lb_policy_factory *factory, + grpc_lb_policy_args *args) { + pick_first_lb_policy *p = gpr_malloc(sizeof(*p)); + GPR_ASSERT(args->num_subchannels > 0); + memset(p, 0, sizeof(*p)); + grpc_lb_policy_init(&p->base, &pick_first_lb_policy_vtable); + p->subchannels = + gpr_malloc(sizeof(grpc_subchannel *) * args->num_subchannels); p->num_subchannels = args->num_subchannels; - grpc_connectivity_state_init (&p->state_tracker, GRPC_CHANNEL_IDLE, "pick_first"); - memcpy (p->subchannels, args->subchannels, sizeof (grpc_subchannel *) * args->num_subchannels); - grpc_closure_init (&p->connectivity_changed, pf_connectivity_changed, p); - gpr_mu_init (&p->mu); + grpc_connectivity_state_init(&p->state_tracker, GRPC_CHANNEL_IDLE, + "pick_first"); + memcpy(p->subchannels, args->subchannels, + sizeof(grpc_subchannel *) * args->num_subchannels); + grpc_closure_init(&p->connectivity_changed, pf_connectivity_changed, p); + gpr_mu_init(&p->mu); return &p->base; } static const grpc_lb_policy_factory_vtable pick_first_factory_vtable = { - pick_first_factory_ref, pick_first_factory_unref, create_pick_first, - "pick_first" -}; + pick_first_factory_ref, pick_first_factory_unref, create_pick_first, + "pick_first"}; static grpc_lb_policy_factory pick_first_lb_policy_factory = { - &pick_first_factory_vtable -}; + &pick_first_factory_vtable}; -grpc_lb_policy_factory * -grpc_pick_first_lb_factory_create () -{ +grpc_lb_policy_factory *grpc_pick_first_lb_factory_create() { return &pick_first_lb_policy_factory; } diff --git a/src/core/client_config/lb_policies/pick_first.h b/src/core/client_config/lb_policies/pick_first.h index 72a4e7c32c8..3ca53ad42af 100644 --- a/src/core/client_config/lb_policies/pick_first.h +++ b/src/core/client_config/lb_policies/pick_first.h @@ -38,6 +38,6 @@ /** Returns a load balancing factory for the pick first policy, which picks up * the first subchannel from \a subchannels to succesfully connect */ -grpc_lb_policy_factory *grpc_pick_first_lb_factory_create (); +grpc_lb_policy_factory *grpc_pick_first_lb_factory_create(); #endif diff --git a/src/core/client_config/lb_policies/round_robin.c b/src/core/client_config/lb_policies/round_robin.c index 5f8976396bf..479c376724d 100644 --- a/src/core/client_config/lb_policies/round_robin.c +++ b/src/core/client_config/lb_policies/round_robin.c @@ -43,8 +43,7 @@ int grpc_lb_round_robin_trace = 0; /** List of entities waiting for a pick. * * Once a pick is available, \a target is updated and \a on_complete called. */ -typedef struct pending_pick -{ +typedef struct pending_pick { struct pending_pick *next; grpc_pollset *pollset; grpc_subchannel **target; @@ -52,21 +51,18 @@ typedef struct pending_pick } pending_pick; /** List of subchannels in a connectivity READY state */ -typedef struct ready_list -{ +typedef struct ready_list { grpc_subchannel *subchannel; struct ready_list *next; struct ready_list *prev; } ready_list; -typedef struct -{ +typedef struct { size_t subchannel_idx; /**< Index over p->subchannels */ - void *p; /**< round_robin_lb_policy instance */ + void *p; /**< round_robin_lb_policy instance */ } connectivity_changed_cb_arg; -typedef struct -{ +typedef struct { /** base policy: must be first */ grpc_lb_policy base; @@ -110,264 +106,224 @@ typedef struct * * Note that this function does *not* advance p->ready_list_last_pick. Use \a * advance_last_picked_locked() for that. */ -static ready_list * -peek_next_connected_locked (const round_robin_lb_policy * p) -{ +static ready_list *peek_next_connected_locked(const round_robin_lb_policy *p) { ready_list *selected; selected = p->ready_list_last_pick->next; - while (selected != NULL) - { - if (selected == &p->ready_list) - { - GPR_ASSERT (selected->subchannel == NULL); - /* skip dummy root */ - selected = selected->next; - } - else - { - GPR_ASSERT (selected->subchannel != NULL); - return selected; - } + while (selected != NULL) { + if (selected == &p->ready_list) { + GPR_ASSERT(selected->subchannel == NULL); + /* skip dummy root */ + selected = selected->next; + } else { + GPR_ASSERT(selected->subchannel != NULL); + return selected; } + } return NULL; } /** Advance the \a ready_list picking head. */ -static void -advance_last_picked_locked (round_robin_lb_policy * p) -{ - if (p->ready_list_last_pick->next != NULL) - { /* non-empty list */ +static void advance_last_picked_locked(round_robin_lb_policy *p) { + if (p->ready_list_last_pick->next != NULL) { /* non-empty list */ + p->ready_list_last_pick = p->ready_list_last_pick->next; + if (p->ready_list_last_pick == &p->ready_list) { + /* skip dummy root */ p->ready_list_last_pick = p->ready_list_last_pick->next; - if (p->ready_list_last_pick == &p->ready_list) - { - /* skip dummy root */ - p->ready_list_last_pick = p->ready_list_last_pick->next; - } - } - else - { /* should be an empty list */ - GPR_ASSERT (p->ready_list_last_pick == &p->ready_list); - } - - if (grpc_lb_round_robin_trace) - { - gpr_log (GPR_DEBUG, "[READYLIST] ADVANCED LAST PICK. NOW AT NODE %p (SC %p)", p->ready_list_last_pick, p->ready_list_last_pick->subchannel); } + } else { /* should be an empty list */ + GPR_ASSERT(p->ready_list_last_pick == &p->ready_list); + } + + if (grpc_lb_round_robin_trace) { + gpr_log(GPR_DEBUG, "[READYLIST] ADVANCED LAST PICK. NOW AT NODE %p (SC %p)", + p->ready_list_last_pick, p->ready_list_last_pick->subchannel); + } } /** Prepends (relative to the root at p->ready_list) the connected subchannel \a * csc to the list of ready subchannels. */ -static ready_list * -add_connected_sc_locked (round_robin_lb_policy * p, grpc_subchannel * csc) -{ - ready_list *new_elem = gpr_malloc (sizeof (ready_list)); +static ready_list *add_connected_sc_locked(round_robin_lb_policy *p, + grpc_subchannel *csc) { + ready_list *new_elem = gpr_malloc(sizeof(ready_list)); new_elem->subchannel = csc; - if (p->ready_list.prev == NULL) - { - /* first element */ - new_elem->next = &p->ready_list; - new_elem->prev = &p->ready_list; - p->ready_list.next = new_elem; - p->ready_list.prev = new_elem; - } - else - { - new_elem->next = &p->ready_list; - new_elem->prev = p->ready_list.prev; - p->ready_list.prev->next = new_elem; - p->ready_list.prev = new_elem; - } - if (grpc_lb_round_robin_trace) - { - gpr_log (GPR_DEBUG, "[READYLIST] ADDING NODE %p (SC %p)", new_elem, csc); - } + if (p->ready_list.prev == NULL) { + /* first element */ + new_elem->next = &p->ready_list; + new_elem->prev = &p->ready_list; + p->ready_list.next = new_elem; + p->ready_list.prev = new_elem; + } else { + new_elem->next = &p->ready_list; + new_elem->prev = p->ready_list.prev; + p->ready_list.prev->next = new_elem; + p->ready_list.prev = new_elem; + } + if (grpc_lb_round_robin_trace) { + gpr_log(GPR_DEBUG, "[READYLIST] ADDING NODE %p (SC %p)", new_elem, csc); + } return new_elem; } /** Removes \a node from the list of connected subchannels */ -static void -remove_disconnected_sc_locked (round_robin_lb_policy * p, ready_list * node) -{ - if (node == NULL) - { - return; - } - if (node == p->ready_list_last_pick) - { - /* If removing the lastly picked node, reset the last pick pointer to the - * dummy root of the list */ - p->ready_list_last_pick = &p->ready_list; - } +static void remove_disconnected_sc_locked(round_robin_lb_policy *p, + ready_list *node) { + if (node == NULL) { + return; + } + if (node == p->ready_list_last_pick) { + /* If removing the lastly picked node, reset the last pick pointer to the + * dummy root of the list */ + p->ready_list_last_pick = &p->ready_list; + } /* removing last item */ - if (node->next == &p->ready_list && node->prev == &p->ready_list) - { - GPR_ASSERT (p->ready_list.next == node); - GPR_ASSERT (p->ready_list.prev == node); - p->ready_list.next = NULL; - p->ready_list.prev = NULL; - } - else - { - node->prev->next = node->next; - node->next->prev = node->prev; - } - - if (grpc_lb_round_robin_trace) - { - gpr_log (GPR_DEBUG, "[READYLIST] REMOVED NODE %p (SC %p)", node, node->subchannel); - } + if (node->next == &p->ready_list && node->prev == &p->ready_list) { + GPR_ASSERT(p->ready_list.next == node); + GPR_ASSERT(p->ready_list.prev == node); + p->ready_list.next = NULL; + p->ready_list.prev = NULL; + } else { + node->prev->next = node->next; + node->next->prev = node->prev; + } + + if (grpc_lb_round_robin_trace) { + gpr_log(GPR_DEBUG, "[READYLIST] REMOVED NODE %p (SC %p)", node, + node->subchannel); + } node->next = NULL; node->prev = NULL; node->subchannel = NULL; - gpr_free (node); + gpr_free(node); } -static void -del_interested_parties_locked (grpc_exec_ctx * exec_ctx, round_robin_lb_policy * p, const size_t subchannel_idx) -{ +static void del_interested_parties_locked(grpc_exec_ctx *exec_ctx, + round_robin_lb_policy *p, + const size_t subchannel_idx) { pending_pick *pp; - for (pp = p->pending_picks; pp; pp = pp->next) - { - grpc_subchannel_del_interested_party (exec_ctx, p->subchannels[subchannel_idx], pp->pollset); - } + for (pp = p->pending_picks; pp; pp = pp->next) { + grpc_subchannel_del_interested_party( + exec_ctx, p->subchannels[subchannel_idx], pp->pollset); + } } -void -rr_destroy (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) -{ - round_robin_lb_policy *p = (round_robin_lb_policy *) pol; +void rr_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { + round_robin_lb_policy *p = (round_robin_lb_policy *)pol; size_t i; ready_list *elem; - for (i = 0; i < p->num_subchannels; i++) - { - del_interested_parties_locked (exec_ctx, p, i); - } - for (i = 0; i < p->num_subchannels; i++) - { - GRPC_SUBCHANNEL_UNREF (exec_ctx, p->subchannels[i], "round_robin"); - } - gpr_free (p->connectivity_changed_cbs); - gpr_free (p->subchannel_connectivity); - - grpc_connectivity_state_destroy (exec_ctx, &p->state_tracker); - gpr_free (p->subchannels); - gpr_mu_destroy (&p->mu); + for (i = 0; i < p->num_subchannels; i++) { + del_interested_parties_locked(exec_ctx, p, i); + } + for (i = 0; i < p->num_subchannels; i++) { + GRPC_SUBCHANNEL_UNREF(exec_ctx, p->subchannels[i], "round_robin"); + } + gpr_free(p->connectivity_changed_cbs); + gpr_free(p->subchannel_connectivity); + + grpc_connectivity_state_destroy(exec_ctx, &p->state_tracker); + gpr_free(p->subchannels); + gpr_mu_destroy(&p->mu); elem = p->ready_list.next; - while (elem != NULL && elem != &p->ready_list) - { - ready_list *tmp; - tmp = elem->next; - elem->next = NULL; - elem->prev = NULL; - elem->subchannel = NULL; - gpr_free (elem); - elem = tmp; - } - gpr_free (p->subchannel_index_to_readylist_node); - gpr_free (p->cb_args); - gpr_free (p); + while (elem != NULL && elem != &p->ready_list) { + ready_list *tmp; + tmp = elem->next; + elem->next = NULL; + elem->prev = NULL; + elem->subchannel = NULL; + gpr_free(elem); + elem = tmp; + } + gpr_free(p->subchannel_index_to_readylist_node); + gpr_free(p->cb_args); + gpr_free(p); } -void -rr_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) -{ +void rr_shutdown(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { size_t i; - round_robin_lb_policy *p = (round_robin_lb_policy *) pol; + round_robin_lb_policy *p = (round_robin_lb_policy *)pol; pending_pick *pp; - gpr_mu_lock (&p->mu); + gpr_mu_lock(&p->mu); - for (i = 0; i < p->num_subchannels; i++) - { - del_interested_parties_locked (exec_ctx, p, i); - } + for (i = 0; i < p->num_subchannels; i++) { + del_interested_parties_locked(exec_ctx, p, i); + } p->shutdown = 1; - while ((pp = p->pending_picks)) - { - p->pending_picks = pp->next; - *pp->target = NULL; - grpc_exec_ctx_enqueue (exec_ctx, pp->on_complete, 0); - gpr_free (pp); - } - grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "shutdown"); - gpr_mu_unlock (&p->mu); + while ((pp = p->pending_picks)) { + p->pending_picks = pp->next; + *pp->target = NULL; + grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, 0); + gpr_free(pp); + } + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_FATAL_FAILURE, "shutdown"); + gpr_mu_unlock(&p->mu); } -static void -start_picking (grpc_exec_ctx * exec_ctx, round_robin_lb_policy * p) -{ +static void start_picking(grpc_exec_ctx *exec_ctx, round_robin_lb_policy *p) { size_t i; p->started_picking = 1; - for (i = 0; i < p->num_subchannels; i++) - { - p->subchannel_connectivity[i] = GRPC_CHANNEL_IDLE; - grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[i], &p->subchannel_connectivity[i], &p->connectivity_changed_cbs[i]); - GRPC_LB_POLICY_REF (&p->base, "round_robin_connectivity"); - } + for (i = 0; i < p->num_subchannels; i++) { + p->subchannel_connectivity[i] = GRPC_CHANNEL_IDLE; + grpc_subchannel_notify_on_state_change(exec_ctx, p->subchannels[i], + &p->subchannel_connectivity[i], + &p->connectivity_changed_cbs[i]); + GRPC_LB_POLICY_REF(&p->base, "round_robin_connectivity"); + } } -void -rr_exit_idle (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) -{ - round_robin_lb_policy *p = (round_robin_lb_policy *) pol; - gpr_mu_lock (&p->mu); - if (!p->started_picking) - { - start_picking (exec_ctx, p); - } - gpr_mu_unlock (&p->mu); +void rr_exit_idle(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { + round_robin_lb_policy *p = (round_robin_lb_policy *)pol; + gpr_mu_lock(&p->mu); + if (!p->started_picking) { + start_picking(exec_ctx, p); + } + gpr_mu_unlock(&p->mu); } -void -rr_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete) -{ +void rr_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, + grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, + grpc_subchannel **target, grpc_closure *on_complete) { size_t i; - round_robin_lb_policy *p = (round_robin_lb_policy *) pol; + round_robin_lb_policy *p = (round_robin_lb_policy *)pol; pending_pick *pp; ready_list *selected; - gpr_mu_lock (&p->mu); - if ((selected = peek_next_connected_locked (p))) - { - gpr_mu_unlock (&p->mu); - *target = selected->subchannel; - if (grpc_lb_round_robin_trace) - { - gpr_log (GPR_DEBUG, "[RR PICK] TARGET <-- SUBCHANNEL %p (NODE %p)", selected->subchannel, selected); - } - /* only advance the last picked pointer if the selection was used */ - advance_last_picked_locked (p); - on_complete->cb (exec_ctx, on_complete->cb_arg, 1); + gpr_mu_lock(&p->mu); + if ((selected = peek_next_connected_locked(p))) { + gpr_mu_unlock(&p->mu); + *target = selected->subchannel; + if (grpc_lb_round_robin_trace) { + gpr_log(GPR_DEBUG, "[RR PICK] TARGET <-- SUBCHANNEL %p (NODE %p)", + selected->subchannel, selected); + } + /* only advance the last picked pointer if the selection was used */ + advance_last_picked_locked(p); + on_complete->cb(exec_ctx, on_complete->cb_arg, 1); + } else { + if (!p->started_picking) { + start_picking(exec_ctx, p); } - else - { - if (!p->started_picking) - { - start_picking (exec_ctx, p); - } - for (i = 0; i < p->num_subchannels; i++) - { - grpc_subchannel_add_interested_party (exec_ctx, p->subchannels[i], pollset); - } - pp = gpr_malloc (sizeof (*pp)); - pp->next = p->pending_picks; - pp->pollset = pollset; - pp->target = target; - pp->on_complete = on_complete; - p->pending_picks = pp; - gpr_mu_unlock (&p->mu); + for (i = 0; i < p->num_subchannels; i++) { + grpc_subchannel_add_interested_party(exec_ctx, p->subchannels[i], + pollset); } + pp = gpr_malloc(sizeof(*pp)); + pp->next = p->pending_picks; + pp->pollset = pollset; + pp->target = target; + pp->on_complete = on_complete; + p->pending_picks = pp; + gpr_mu_unlock(&p->mu); + } } -static void -rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) -{ +static void rr_connectivity_changed(grpc_exec_ctx *exec_ctx, void *arg, + int iomgr_success) { connectivity_changed_cb_arg *cb_arg = arg; round_robin_lb_policy *p = cb_arg->p; /* index over p->subchannels of this cb's subchannel */ @@ -380,194 +336,198 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) /* connectivity state of this cb's subchannel */ grpc_connectivity_state *this_connectivity; - gpr_mu_lock (&p->mu); + gpr_mu_lock(&p->mu); this_connectivity = &p->subchannel_connectivity[this_idx]; - if (p->shutdown) - { - unref = 1; - } - else - { - switch (*this_connectivity) - { - case GRPC_CHANNEL_READY: - grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_READY, "connecting_ready"); - /* add the newly connected subchannel to the list of connected ones. - * Note that it goes to the "end of the line". */ - p->subchannel_index_to_readylist_node[this_idx] = add_connected_sc_locked (p, p->subchannels[this_idx]); - /* at this point we know there's at least one suitable subchannel. Go - * ahead and pick one and notify the pending suitors in - * p->pending_picks. This preemtively replicates rr_pick()'s actions. */ - selected = peek_next_connected_locked (p); - if (p->pending_picks != NULL) - { - /* if the selected subchannel is going to be used for the pending - * picks, update the last picked pointer */ - advance_last_picked_locked (p); - } - while ((pp = p->pending_picks)) - { - p->pending_picks = pp->next; - *pp->target = selected->subchannel; - if (grpc_lb_round_robin_trace) - { - gpr_log (GPR_DEBUG, "[RR CONN CHANGED] TARGET <-- SUBCHANNEL %p (NODE %p)", selected->subchannel, selected); - } - grpc_subchannel_del_interested_party (exec_ctx, selected->subchannel, pp->pollset); - grpc_exec_ctx_enqueue (exec_ctx, pp->on_complete, 1); - gpr_free (pp); - } - grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx]); - break; - case GRPC_CHANNEL_CONNECTING: - case GRPC_CHANNEL_IDLE: - grpc_connectivity_state_set (exec_ctx, &p->state_tracker, *this_connectivity, "connecting_changed"); - grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx]); - break; - case GRPC_CHANNEL_TRANSIENT_FAILURE: - del_interested_parties_locked (exec_ctx, p, this_idx); - /* renew state notification */ - grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx]); - - /* remove from ready list if still present */ - if (p->subchannel_index_to_readylist_node[this_idx] != NULL) - { - remove_disconnected_sc_locked (p, p->subchannel_index_to_readylist_node[this_idx]); - p->subchannel_index_to_readylist_node[this_idx] = NULL; - } - grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "connecting_transient_failure"); - break; - case GRPC_CHANNEL_FATAL_FAILURE: - del_interested_parties_locked (exec_ctx, p, this_idx); - if (p->subchannel_index_to_readylist_node[this_idx] != NULL) - { - remove_disconnected_sc_locked (p, p->subchannel_index_to_readylist_node[this_idx]); - p->subchannel_index_to_readylist_node[this_idx] = NULL; - } - - GPR_SWAP (grpc_subchannel *, p->subchannels[this_idx], p->subchannels[p->num_subchannels - 1]); - p->num_subchannels--; - GRPC_SUBCHANNEL_UNREF (exec_ctx, p->subchannels[p->num_subchannels], "round_robin"); - - if (p->num_subchannels == 0) - { - grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "no_more_channels"); - while ((pp = p->pending_picks)) - { - p->pending_picks = pp->next; - *pp->target = NULL; - grpc_exec_ctx_enqueue (exec_ctx, pp->on_complete, 1); - gpr_free (pp); - } - unref = 1; - } - else - { - grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "subchannel_failed"); - } - } /* switch */ - } /* !unref */ - - gpr_mu_unlock (&p->mu); - - if (unref) - { - GRPC_LB_POLICY_UNREF (exec_ctx, &p->base, "round_robin_connectivity"); - } + if (p->shutdown) { + unref = 1; + } else { + switch (*this_connectivity) { + case GRPC_CHANNEL_READY: + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_READY, "connecting_ready"); + /* add the newly connected subchannel to the list of connected ones. + * Note that it goes to the "end of the line". */ + p->subchannel_index_to_readylist_node[this_idx] = + add_connected_sc_locked(p, p->subchannels[this_idx]); + /* at this point we know there's at least one suitable subchannel. Go + * ahead and pick one and notify the pending suitors in + * p->pending_picks. This preemtively replicates rr_pick()'s actions. */ + selected = peek_next_connected_locked(p); + if (p->pending_picks != NULL) { + /* if the selected subchannel is going to be used for the pending + * picks, update the last picked pointer */ + advance_last_picked_locked(p); + } + while ((pp = p->pending_picks)) { + p->pending_picks = pp->next; + *pp->target = selected->subchannel; + if (grpc_lb_round_robin_trace) { + gpr_log(GPR_DEBUG, + "[RR CONN CHANGED] TARGET <-- SUBCHANNEL %p (NODE %p)", + selected->subchannel, selected); + } + grpc_subchannel_del_interested_party(exec_ctx, selected->subchannel, + pp->pollset); + grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, 1); + gpr_free(pp); + } + grpc_subchannel_notify_on_state_change( + exec_ctx, p->subchannels[this_idx], this_connectivity, + &p->connectivity_changed_cbs[this_idx]); + break; + case GRPC_CHANNEL_CONNECTING: + case GRPC_CHANNEL_IDLE: + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + *this_connectivity, "connecting_changed"); + grpc_subchannel_notify_on_state_change( + exec_ctx, p->subchannels[this_idx], this_connectivity, + &p->connectivity_changed_cbs[this_idx]); + break; + case GRPC_CHANNEL_TRANSIENT_FAILURE: + del_interested_parties_locked(exec_ctx, p, this_idx); + /* renew state notification */ + grpc_subchannel_notify_on_state_change( + exec_ctx, p->subchannels[this_idx], this_connectivity, + &p->connectivity_changed_cbs[this_idx]); + + /* remove from ready list if still present */ + if (p->subchannel_index_to_readylist_node[this_idx] != NULL) { + remove_disconnected_sc_locked( + p, p->subchannel_index_to_readylist_node[this_idx]); + p->subchannel_index_to_readylist_node[this_idx] = NULL; + } + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_TRANSIENT_FAILURE, + "connecting_transient_failure"); + break; + case GRPC_CHANNEL_FATAL_FAILURE: + del_interested_parties_locked(exec_ctx, p, this_idx); + if (p->subchannel_index_to_readylist_node[this_idx] != NULL) { + remove_disconnected_sc_locked( + p, p->subchannel_index_to_readylist_node[this_idx]); + p->subchannel_index_to_readylist_node[this_idx] = NULL; + } + + GPR_SWAP(grpc_subchannel *, p->subchannels[this_idx], + p->subchannels[p->num_subchannels - 1]); + p->num_subchannels--; + GRPC_SUBCHANNEL_UNREF(exec_ctx, p->subchannels[p->num_subchannels], + "round_robin"); + + if (p->num_subchannels == 0) { + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_FATAL_FAILURE, + "no_more_channels"); + while ((pp = p->pending_picks)) { + p->pending_picks = pp->next; + *pp->target = NULL; + grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, 1); + gpr_free(pp); + } + unref = 1; + } else { + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_TRANSIENT_FAILURE, + "subchannel_failed"); + } + } /* switch */ + } /* !unref */ + + gpr_mu_unlock(&p->mu); + + if (unref) { + GRPC_LB_POLICY_UNREF(exec_ctx, &p->base, "round_robin_connectivity"); + } } -static void -rr_broadcast (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_transport_op * op) -{ - round_robin_lb_policy *p = (round_robin_lb_policy *) pol; +static void rr_broadcast(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, + grpc_transport_op *op) { + round_robin_lb_policy *p = (round_robin_lb_policy *)pol; size_t i; size_t n; grpc_subchannel **subchannels; - gpr_mu_lock (&p->mu); + gpr_mu_lock(&p->mu); n = p->num_subchannels; - subchannels = gpr_malloc (n * sizeof (*subchannels)); - for (i = 0; i < n; i++) - { - subchannels[i] = p->subchannels[i]; - GRPC_SUBCHANNEL_REF (subchannels[i], "rr_broadcast"); - } - gpr_mu_unlock (&p->mu); - - for (i = 0; i < n; i++) - { - grpc_subchannel_process_transport_op (exec_ctx, subchannels[i], op); - GRPC_SUBCHANNEL_UNREF (exec_ctx, subchannels[i], "rr_broadcast"); - } - gpr_free (subchannels); + subchannels = gpr_malloc(n * sizeof(*subchannels)); + for (i = 0; i < n; i++) { + subchannels[i] = p->subchannels[i]; + GRPC_SUBCHANNEL_REF(subchannels[i], "rr_broadcast"); + } + gpr_mu_unlock(&p->mu); + + for (i = 0; i < n; i++) { + grpc_subchannel_process_transport_op(exec_ctx, subchannels[i], op); + GRPC_SUBCHANNEL_UNREF(exec_ctx, subchannels[i], "rr_broadcast"); + } + gpr_free(subchannels); } -static grpc_connectivity_state -rr_check_connectivity (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) -{ - round_robin_lb_policy *p = (round_robin_lb_policy *) pol; +static grpc_connectivity_state rr_check_connectivity(grpc_exec_ctx *exec_ctx, + grpc_lb_policy *pol) { + round_robin_lb_policy *p = (round_robin_lb_policy *)pol; grpc_connectivity_state st; - gpr_mu_lock (&p->mu); - st = grpc_connectivity_state_check (&p->state_tracker); - gpr_mu_unlock (&p->mu); + gpr_mu_lock(&p->mu); + st = grpc_connectivity_state_check(&p->state_tracker); + gpr_mu_unlock(&p->mu); return st; } -static void -rr_notify_on_state_change (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; - gpr_mu_lock (&p->mu); - grpc_connectivity_state_notify_on_state_change (exec_ctx, &p->state_tracker, current, notify); - gpr_mu_unlock (&p->mu); +static void rr_notify_on_state_change(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; + gpr_mu_lock(&p->mu); + grpc_connectivity_state_notify_on_state_change(exec_ctx, &p->state_tracker, + current, notify); + gpr_mu_unlock(&p->mu); } static const grpc_lb_policy_vtable round_robin_lb_policy_vtable = { - rr_destroy, - rr_shutdown, - rr_pick, - rr_exit_idle, - rr_broadcast, - rr_check_connectivity, - rr_notify_on_state_change -}; - -static void -round_robin_factory_ref (grpc_lb_policy_factory * factory) -{ -} + rr_destroy, + rr_shutdown, + rr_pick, + rr_exit_idle, + rr_broadcast, + rr_check_connectivity, + rr_notify_on_state_change}; -static void -round_robin_factory_unref (grpc_lb_policy_factory * factory) -{ -} +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 * -create_round_robin (grpc_lb_policy_factory * factory, grpc_lb_policy_args * args) -{ +static grpc_lb_policy *create_round_robin(grpc_lb_policy_factory *factory, + grpc_lb_policy_args *args) { size_t i; - round_robin_lb_policy *p = gpr_malloc (sizeof (*p)); - GPR_ASSERT (args->num_subchannels > 0); - memset (p, 0, sizeof (*p)); - grpc_lb_policy_init (&p->base, &round_robin_lb_policy_vtable); - p->subchannels = gpr_malloc (sizeof (grpc_subchannel *) * args->num_subchannels); + round_robin_lb_policy *p = gpr_malloc(sizeof(*p)); + GPR_ASSERT(args->num_subchannels > 0); + memset(p, 0, sizeof(*p)); + grpc_lb_policy_init(&p->base, &round_robin_lb_policy_vtable); + p->subchannels = + gpr_malloc(sizeof(grpc_subchannel *) * args->num_subchannels); p->num_subchannels = args->num_subchannels; - grpc_connectivity_state_init (&p->state_tracker, GRPC_CHANNEL_IDLE, "round_robin"); - memcpy (p->subchannels, args->subchannels, sizeof (grpc_subchannel *) * args->num_subchannels); - - gpr_mu_init (&p->mu); - p->connectivity_changed_cbs = gpr_malloc (sizeof (grpc_closure) * args->num_subchannels); - p->subchannel_connectivity = gpr_malloc (sizeof (grpc_connectivity_state) * args->num_subchannels); - - p->cb_args = gpr_malloc (sizeof (connectivity_changed_cb_arg) * args->num_subchannels); - for (i = 0; i < args->num_subchannels; i++) - { - p->cb_args[i].subchannel_idx = i; - p->cb_args[i].p = p; - grpc_closure_init (&p->connectivity_changed_cbs[i], rr_connectivity_changed, &p->cb_args[i]); - } + grpc_connectivity_state_init(&p->state_tracker, GRPC_CHANNEL_IDLE, + "round_robin"); + memcpy(p->subchannels, args->subchannels, + sizeof(grpc_subchannel *) * args->num_subchannels); + + gpr_mu_init(&p->mu); + p->connectivity_changed_cbs = + gpr_malloc(sizeof(grpc_closure) * args->num_subchannels); + p->subchannel_connectivity = + gpr_malloc(sizeof(grpc_connectivity_state) * args->num_subchannels); + + p->cb_args = + gpr_malloc(sizeof(connectivity_changed_cb_arg) * args->num_subchannels); + for (i = 0; i < args->num_subchannels; i++) { + p->cb_args[i].subchannel_idx = i; + p->cb_args[i].p = p; + grpc_closure_init(&p->connectivity_changed_cbs[i], rr_connectivity_changed, + &p->cb_args[i]); + } /* The (dummy node) root of the ready list */ p->ready_list.subchannel = NULL; @@ -575,22 +535,20 @@ create_round_robin (grpc_lb_policy_factory * factory, grpc_lb_policy_args * args p->ready_list.next = NULL; p->ready_list_last_pick = &p->ready_list; - p->subchannel_index_to_readylist_node = gpr_malloc (sizeof (grpc_subchannel *) * args->num_subchannels); - memset (p->subchannel_index_to_readylist_node, 0, sizeof (grpc_subchannel *) * args->num_subchannels); + p->subchannel_index_to_readylist_node = + gpr_malloc(sizeof(grpc_subchannel *) * args->num_subchannels); + memset(p->subchannel_index_to_readylist_node, 0, + sizeof(grpc_subchannel *) * args->num_subchannels); return &p->base; } static const grpc_lb_policy_factory_vtable round_robin_factory_vtable = { - round_robin_factory_ref, round_robin_factory_unref, create_round_robin, - "round_robin" -}; + round_robin_factory_ref, round_robin_factory_unref, create_round_robin, + "round_robin"}; static grpc_lb_policy_factory round_robin_lb_policy_factory = { - &round_robin_factory_vtable -}; + &round_robin_factory_vtable}; -grpc_lb_policy_factory * -grpc_round_robin_lb_factory_create () -{ +grpc_lb_policy_factory *grpc_round_robin_lb_factory_create() { return &round_robin_lb_policy_factory; } diff --git a/src/core/client_config/lb_policies/round_robin.h b/src/core/client_config/lb_policies/round_robin.h index 213995aa3fd..cf1f69c85f6 100644 --- a/src/core/client_config/lb_policies/round_robin.h +++ b/src/core/client_config/lb_policies/round_robin.h @@ -41,6 +41,6 @@ extern int grpc_lb_round_robin_trace; #include "src/core/client_config/lb_policy_factory.h" /** Returns a load balancing factory for the round robin policy */ -grpc_lb_policy_factory *grpc_round_robin_lb_factory_create (); +grpc_lb_policy_factory *grpc_round_robin_lb_factory_create(); #endif diff --git a/src/core/client_config/lb_policy.c b/src/core/client_config/lb_policy.c index 6a9cf668876..c955186f7f9 100644 --- a/src/core/client_config/lb_policy.c +++ b/src/core/client_config/lb_policy.c @@ -33,74 +33,66 @@ #include "src/core/client_config/lb_policy.h" -void -grpc_lb_policy_init (grpc_lb_policy * policy, const grpc_lb_policy_vtable * vtable) -{ +void grpc_lb_policy_init(grpc_lb_policy *policy, + const grpc_lb_policy_vtable *vtable) { policy->vtable = vtable; - gpr_ref_init (&policy->refs, 1); + gpr_ref_init(&policy->refs, 1); } #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG -void -grpc_lb_policy_ref (grpc_lb_policy * policy, const char *file, int line, const char *reason) -{ - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "LB_POLICY:%p ref %d -> %d %s", policy, (int) policy->refs.count, (int) policy->refs.count + 1, reason); +void grpc_lb_policy_ref(grpc_lb_policy *policy, const char *file, int line, + const char *reason) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "LB_POLICY:%p ref %d -> %d %s", + policy, (int)policy->refs.count, (int)policy->refs.count + 1, reason); #else -void -grpc_lb_policy_ref (grpc_lb_policy * policy) -{ +void grpc_lb_policy_ref(grpc_lb_policy *policy) { #endif - gpr_ref (&policy->refs); + gpr_ref(&policy->refs); } #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG -void -grpc_lb_policy_unref (grpc_lb_policy * policy, grpc_closure_list * closure_list, const char *file, int line, const char *reason) -{ - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "LB_POLICY:%p unref %d -> %d %s", policy, (int) policy->refs.count, (int) policy->refs.count - 1, reason); +void grpc_lb_policy_unref(grpc_lb_policy *policy, + grpc_closure_list *closure_list, const char *file, + int line, const char *reason) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "LB_POLICY:%p unref %d -> %d %s", + policy, (int)policy->refs.count, (int)policy->refs.count - 1, reason); #else -void -grpc_lb_policy_unref (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) -{ +void grpc_lb_policy_unref(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy) { #endif - if (gpr_unref (&policy->refs)) - { - policy->vtable->destroy (exec_ctx, policy); - } + if (gpr_unref(&policy->refs)) { + policy->vtable->destroy(exec_ctx, policy); + } } -void -grpc_lb_policy_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) -{ - policy->vtable->shutdown (exec_ctx, policy); +void grpc_lb_policy_shutdown(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy) { + policy->vtable->shutdown(exec_ctx, policy); } -void -grpc_lb_policy_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete) -{ - policy->vtable->pick (exec_ctx, policy, pollset, initial_metadata, target, on_complete); +void grpc_lb_policy_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, + grpc_pollset *pollset, + grpc_metadata_batch *initial_metadata, + grpc_subchannel **target, grpc_closure *on_complete) { + policy->vtable->pick(exec_ctx, policy, pollset, initial_metadata, target, + on_complete); } -void -grpc_lb_policy_broadcast (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_transport_op * op) -{ - policy->vtable->broadcast (exec_ctx, policy, op); +void grpc_lb_policy_broadcast(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, + grpc_transport_op *op) { + policy->vtable->broadcast(exec_ctx, policy, op); } -void -grpc_lb_policy_exit_idle (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) -{ - policy->vtable->exit_idle (exec_ctx, policy); +void grpc_lb_policy_exit_idle(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy) { + policy->vtable->exit_idle(exec_ctx, policy); } -void -grpc_lb_policy_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_connectivity_state * state, grpc_closure * closure) -{ - policy->vtable->notify_on_state_change (exec_ctx, policy, state, closure); +void grpc_lb_policy_notify_on_state_change(grpc_exec_ctx *exec_ctx, + grpc_lb_policy *policy, + grpc_connectivity_state *state, + grpc_closure *closure) { + policy->vtable->notify_on_state_change(exec_ctx, policy, state, closure); } -grpc_connectivity_state -grpc_lb_policy_check_connectivity (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) -{ - return policy->vtable->check_connectivity (exec_ctx, policy); +grpc_connectivity_state grpc_lb_policy_check_connectivity( + grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy) { + return policy->vtable->check_connectivity(exec_ctx, policy); } diff --git a/src/core/client_config/lb_policy.h b/src/core/client_config/lb_policy.h index e66dac15b0a..0eefe649915 100644 --- a/src/core/client_config/lb_policy.h +++ b/src/core/client_config/lb_policy.h @@ -42,35 +42,41 @@ typedef struct grpc_lb_policy grpc_lb_policy; typedef struct grpc_lb_policy_vtable grpc_lb_policy_vtable; -typedef void (*grpc_lb_completion) (void *cb_arg, grpc_subchannel * subchannel, grpc_status_code status, const char *errmsg); +typedef void (*grpc_lb_completion)(void *cb_arg, grpc_subchannel *subchannel, + grpc_status_code status, const char *errmsg); -struct grpc_lb_policy -{ +struct grpc_lb_policy { const grpc_lb_policy_vtable *vtable; gpr_refcount refs; }; -struct grpc_lb_policy_vtable -{ - void (*destroy) (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); +struct grpc_lb_policy_vtable { + void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy); - void (*shutdown) (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); + void (*shutdown)(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy); /** implement grpc_lb_policy_pick */ - void (*pick) (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete); + void (*pick)(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, + grpc_pollset *pollset, grpc_metadata_batch *initial_metadata, + grpc_subchannel **target, grpc_closure *on_complete); /** try to enter a READY connectivity state */ - void (*exit_idle) (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); + void (*exit_idle)(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy); /** broadcast a transport op to all subchannels */ - void (*broadcast) (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_transport_op * op); + void (*broadcast)(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, + grpc_transport_op *op); /** check the current connectivity of the lb_policy */ - grpc_connectivity_state (*check_connectivity) (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); + grpc_connectivity_state (*check_connectivity)(grpc_exec_ctx *exec_ctx, + grpc_lb_policy *policy); /** call notify when the connectivity state of a channel changes from *state. Updates *state with the new state of the policy */ - void (*notify_on_state_change) (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_connectivity_state * state, grpc_closure * closure); + void (*notify_on_state_change)(grpc_exec_ctx *exec_ctx, + grpc_lb_policy *policy, + grpc_connectivity_state *state, + grpc_closure *closure); }; #ifdef GRPC_LB_POLICY_REFCOUNT_DEBUG @@ -78,33 +84,44 @@ struct grpc_lb_policy_vtable 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)) -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_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); #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)) -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_ref(grpc_lb_policy *policy); +void grpc_lb_policy_unref(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy); #endif /** called by concrete implementations to initialize the base struct */ -void grpc_lb_policy_init (grpc_lb_policy * policy, const grpc_lb_policy_vtable * vtable); +void grpc_lb_policy_init(grpc_lb_policy *policy, + const grpc_lb_policy_vtable *vtable); /** Start shutting down (fail any pending picks) */ -void grpc_lb_policy_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); +void grpc_lb_policy_shutdown(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy); /** Given initial metadata in \a initial_metadata, find an appropriate target for this rpc, and 'return' it by calling \a on_complete after setting \a target. Picking can be asynchronous. Any IO should be done under \a pollset. */ -void grpc_lb_policy_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete); +void grpc_lb_policy_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, + grpc_pollset *pollset, + grpc_metadata_batch *initial_metadata, + grpc_subchannel **target, grpc_closure *on_complete); -void grpc_lb_policy_broadcast (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_transport_op * op); +void grpc_lb_policy_broadcast(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, + grpc_transport_op *op); -void grpc_lb_policy_exit_idle (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); +void grpc_lb_policy_exit_idle(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy); -void grpc_lb_policy_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_connectivity_state * state, grpc_closure * closure); +void grpc_lb_policy_notify_on_state_change(grpc_exec_ctx *exec_ctx, + grpc_lb_policy *policy, + grpc_connectivity_state *state, + grpc_closure *closure); -grpc_connectivity_state grpc_lb_policy_check_connectivity (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy); +grpc_connectivity_state grpc_lb_policy_check_connectivity( + grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy); #endif /* GRPC_INTERNAL_CORE_CONFIG_LB_POLICY_H */ diff --git a/src/core/client_config/lb_policy_factory.c b/src/core/client_config/lb_policy_factory.c index 9d202d0c363..e49de544e3a 100644 --- a/src/core/client_config/lb_policy_factory.c +++ b/src/core/client_config/lb_policy_factory.c @@ -33,22 +33,16 @@ #include "src/core/client_config/lb_policy_factory.h" -void -grpc_lb_policy_factory_ref (grpc_lb_policy_factory * factory) -{ - factory->vtable->ref (factory); +void grpc_lb_policy_factory_ref(grpc_lb_policy_factory* factory) { + factory->vtable->ref(factory); } -void -grpc_lb_policy_factory_unref (grpc_lb_policy_factory * factory) -{ - factory->vtable->unref (factory); +void grpc_lb_policy_factory_unref(grpc_lb_policy_factory* factory) { + factory->vtable->unref(factory); } -grpc_lb_policy * -grpc_lb_policy_factory_create_lb_policy (grpc_lb_policy_factory * factory, grpc_lb_policy_args * args) -{ - if (factory == NULL) - return NULL; - return factory->vtable->create_lb_policy (factory, args); +grpc_lb_policy* grpc_lb_policy_factory_create_lb_policy( + grpc_lb_policy_factory* factory, grpc_lb_policy_args* args) { + if (factory == NULL) return NULL; + return factory->vtable->create_lb_policy(factory, args); } diff --git a/src/core/client_config/lb_policy_factory.h b/src/core/client_config/lb_policy_factory.h index a00b5142dcf..04610316ee4 100644 --- a/src/core/client_config/lb_policy_factory.h +++ b/src/core/client_config/lb_policy_factory.h @@ -42,33 +42,32 @@ typedef struct grpc_lb_policy_factory_vtable grpc_lb_policy_factory_vtable; /** grpc_lb_policy provides grpc_client_config objects to grpc_channel objects */ -struct grpc_lb_policy_factory -{ +struct grpc_lb_policy_factory { const grpc_lb_policy_factory_vtable *vtable; }; -typedef struct grpc_lb_policy_args -{ +typedef struct grpc_lb_policy_args { grpc_subchannel **subchannels; size_t num_subchannels; } grpc_lb_policy_args; -struct grpc_lb_policy_factory_vtable -{ - void (*ref) (grpc_lb_policy_factory * factory); - void (*unref) (grpc_lb_policy_factory * factory); +struct grpc_lb_policy_factory_vtable { + void (*ref)(grpc_lb_policy_factory *factory); + 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_args * args); + grpc_lb_policy *(*create_lb_policy)(grpc_lb_policy_factory *factory, + grpc_lb_policy_args *args); /** Name for the LB policy this factory implements */ const char *name; }; -void grpc_lb_policy_factory_ref (grpc_lb_policy_factory * factory); -void grpc_lb_policy_factory_unref (grpc_lb_policy_factory * factory); +void grpc_lb_policy_factory_ref(grpc_lb_policy_factory *factory); +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_lb_policy *grpc_lb_policy_factory_create_lb_policy( + grpc_lb_policy_factory *factory, grpc_lb_policy_args *args); #endif /* GRPC_INTERNAL_CORE_CONFIG_LB_POLICY_FACTORY_H */ diff --git a/src/core/client_config/lb_policy_registry.c b/src/core/client_config/lb_policy_registry.c index 4d7cc7c128d..fc302e82d7e 100644 --- a/src/core/client_config/lb_policy_registry.c +++ b/src/core/client_config/lb_policy_registry.c @@ -42,59 +42,47 @@ static int g_number_of_lb_policies = 0; static grpc_lb_policy_factory *g_default_lb_policy_factory; -void -grpc_lb_policy_registry_init (grpc_lb_policy_factory * default_factory) -{ +void grpc_lb_policy_registry_init(grpc_lb_policy_factory *default_factory) { g_number_of_lb_policies = 0; g_default_lb_policy_factory = default_factory; } -void -grpc_lb_policy_registry_shutdown (void) -{ +void grpc_lb_policy_registry_shutdown(void) { int i; - for (i = 0; i < g_number_of_lb_policies; i++) - { - grpc_lb_policy_factory_unref (g_all_of_the_lb_policies[i]); - } + for (i = 0; i < g_number_of_lb_policies; i++) { + grpc_lb_policy_factory_unref(g_all_of_the_lb_policies[i]); + } } -void -grpc_register_lb_policy (grpc_lb_policy_factory * factory) -{ +void grpc_register_lb_policy(grpc_lb_policy_factory *factory) { int i; - for (i = 0; i < g_number_of_lb_policies; i++) - { - GPR_ASSERT (0 != strcmp (factory->vtable->name, g_all_of_the_lb_policies[i]->vtable->name)); - } - GPR_ASSERT (g_number_of_lb_policies != MAX_POLICIES); - grpc_lb_policy_factory_ref (factory); + for (i = 0; i < g_number_of_lb_policies; i++) { + GPR_ASSERT(0 != strcmp(factory->vtable->name, + g_all_of_the_lb_policies[i]->vtable->name)); + } + GPR_ASSERT(g_number_of_lb_policies != MAX_POLICIES); + grpc_lb_policy_factory_ref(factory); g_all_of_the_lb_policies[g_number_of_lb_policies++] = factory; } -static grpc_lb_policy_factory * -lookup_factory (const char *name) -{ +static grpc_lb_policy_factory *lookup_factory(const char *name) { int i; - if (name == NULL) - return NULL; + if (name == NULL) return NULL; - for (i = 0; i < g_number_of_lb_policies; i++) - { - if (0 == strcmp (name, g_all_of_the_lb_policies[i]->vtable->name)) - { - return g_all_of_the_lb_policies[i]; - } + for (i = 0; i < g_number_of_lb_policies; i++) { + if (0 == strcmp(name, g_all_of_the_lb_policies[i]->vtable->name)) { + return g_all_of_the_lb_policies[i]; } + } return NULL; } -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 (factory, args); +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(factory, args); return lb_policy; } diff --git a/src/core/client_config/lb_policy_registry.h b/src/core/client_config/lb_policy_registry.h index dea0cfc0fd1..96fc2a16285 100644 --- a/src/core/client_config/lb_policy_registry.h +++ b/src/core/client_config/lb_policy_registry.h @@ -38,16 +38,17 @@ /** Initialize the registry and set \a default_factory as the factory to be * returned when no name is provided in a lookup */ -void grpc_lb_policy_registry_init (grpc_lb_policy_factory * default_factory); -void grpc_lb_policy_registry_shutdown (void); +void grpc_lb_policy_registry_init(grpc_lb_policy_factory *default_factory); +void grpc_lb_policy_registry_shutdown(void); /** Register a LB policy factory. */ -void grpc_register_lb_policy (grpc_lb_policy_factory * factory); +void grpc_register_lb_policy(grpc_lb_policy_factory *factory); /** Create a \a grpc_lb_policy instance. * * 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_args * args); +grpc_lb_policy *grpc_lb_policy_create(const char *name, + grpc_lb_policy_args *args); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_LB_POLICY_REGISTRY_H */ diff --git a/src/core/client_config/resolver.c b/src/core/client_config/resolver.c index a55daad5a24..081097eb19a 100644 --- a/src/core/client_config/resolver.c +++ b/src/core/client_config/resolver.c @@ -33,56 +33,53 @@ #include "src/core/client_config/resolver.h" -void -grpc_resolver_init (grpc_resolver * resolver, const grpc_resolver_vtable * vtable) -{ +void grpc_resolver_init(grpc_resolver *resolver, + const grpc_resolver_vtable *vtable) { resolver->vtable = vtable; - gpr_ref_init (&resolver->refs, 1); + gpr_ref_init(&resolver->refs, 1); } #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG -void -grpc_resolver_ref (grpc_resolver * resolver, grpc_closure_list * closure_list, const char *file, int line, const char *reason) -{ - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "RESOLVER:%p ref %d -> %d %s", resolver, (int) resolver->refs.count, (int) resolver->refs.count + 1, reason); +void grpc_resolver_ref(grpc_resolver *resolver, grpc_closure_list *closure_list, + const char *file, int line, const char *reason) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "RESOLVER:%p ref %d -> %d %s", + resolver, (int)resolver->refs.count, (int)resolver->refs.count + 1, + reason); #else -void -grpc_resolver_ref (grpc_resolver * resolver) -{ +void grpc_resolver_ref(grpc_resolver *resolver) { #endif - gpr_ref (&resolver->refs); + gpr_ref(&resolver->refs); } #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG -void -grpc_resolver_unref (grpc_resolver * resolver, grpc_closure_list * closure_list, const char *file, int line, const char *reason) -{ - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "RESOLVER:%p unref %d -> %d %s", resolver, (int) resolver->refs.count, (int) resolver->refs.count - 1, reason); +void grpc_resolver_unref(grpc_resolver *resolver, + grpc_closure_list *closure_list, const char *file, + int line, const char *reason) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "RESOLVER:%p unref %d -> %d %s", + resolver, (int)resolver->refs.count, (int)resolver->refs.count - 1, + reason); #else -void -grpc_resolver_unref (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver) -{ +void grpc_resolver_unref(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver) { #endif - if (gpr_unref (&resolver->refs)) - { - resolver->vtable->destroy (exec_ctx, resolver); - } + if (gpr_unref(&resolver->refs)) { + resolver->vtable->destroy(exec_ctx, resolver); + } } -void -grpc_resolver_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver) -{ - resolver->vtable->shutdown (exec_ctx, resolver); +void grpc_resolver_shutdown(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver) { + resolver->vtable->shutdown(exec_ctx, resolver); } -void -grpc_resolver_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, struct sockaddr *failing_address, int failing_address_len) -{ - resolver->vtable->channel_saw_error (exec_ctx, resolver, failing_address, failing_address_len); +void grpc_resolver_channel_saw_error(grpc_exec_ctx *exec_ctx, + grpc_resolver *resolver, + struct sockaddr *failing_address, + int failing_address_len) { + resolver->vtable->channel_saw_error(exec_ctx, resolver, failing_address, + failing_address_len); } -void -grpc_resolver_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete) -{ - resolver->vtable->next (exec_ctx, resolver, target_config, on_complete); +void grpc_resolver_next(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver, + grpc_client_config **target_config, + grpc_closure *on_complete) { + resolver->vtable->next(exec_ctx, resolver, target_config, on_complete); } diff --git a/src/core/client_config/resolver.h b/src/core/client_config/resolver.h index b7de00a143d..7ba0cd5bd4f 100644 --- a/src/core/client_config/resolver.h +++ b/src/core/client_config/resolver.h @@ -43,40 +43,47 @@ typedef struct grpc_resolver_vtable grpc_resolver_vtable; /** grpc_resolver provides grpc_client_config objects to grpc_channel objects */ -struct grpc_resolver -{ +struct grpc_resolver { const grpc_resolver_vtable *vtable; gpr_refcount refs; }; -struct grpc_resolver_vtable -{ - void (*destroy) (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver); - void (*shutdown) (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver); - void (*channel_saw_error) (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, struct sockaddr * failing_address, int failing_address_len); - void (*next) (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete); +struct grpc_resolver_vtable { + void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver); + void (*shutdown)(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver); + void (*channel_saw_error)(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver, + struct sockaddr *failing_address, + int failing_address_len); + void (*next)(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver, + grpc_client_config **target_config, grpc_closure *on_complete); }; #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG #define GRPC_RESOLVER_REF(p, r) grpc_resolver_ref((p), __FILE__, __LINE__, (r)) #define GRPC_RESOLVER_UNREF(cl, p, r) \ grpc_resolver_unref((cl), (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, grpc_closure_list * closure_list, const char *file, int line, const char *reason); +void grpc_resolver_ref(grpc_resolver *policy, const char *file, int line, + const char *reason); +void grpc_resolver_unref(grpc_resolver *policy, grpc_closure_list *closure_list, + const char *file, int line, const char *reason); #else #define GRPC_RESOLVER_REF(p, r) grpc_resolver_ref((p)) #define GRPC_RESOLVER_UNREF(cl, p, r) grpc_resolver_unref((cl), (p)) -void grpc_resolver_ref (grpc_resolver * policy); -void grpc_resolver_unref (grpc_exec_ctx * exec_ctx, grpc_resolver * policy); +void grpc_resolver_ref(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); +void grpc_resolver_init(grpc_resolver *resolver, + const grpc_resolver_vtable *vtable); -void grpc_resolver_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver); +void grpc_resolver_shutdown(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. */ -void grpc_resolver_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, struct sockaddr *failing_address, int failing_address_len); +void grpc_resolver_channel_saw_error(grpc_exec_ctx *exec_ctx, + grpc_resolver *resolver, + struct sockaddr *failing_address, + int failing_address_len); /** Get the next client config. Called by the channel to fetch a new configuration. Expected to set *target_config with a new configuration, @@ -84,6 +91,8 @@ void grpc_resolver_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * If resolution is fatally broken, set *target_config to NULL and schedule on_complete. */ -void grpc_resolver_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete); +void grpc_resolver_next(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver, + grpc_client_config **target_config, + grpc_closure *on_complete); #endif /* GRPC_INTERNAL_CORE_CONFIG_RESOLVER_H */ diff --git a/src/core/client_config/resolver_factory.c b/src/core/client_config/resolver_factory.c index d4f8201918a..e7e9196ac4d 100644 --- a/src/core/client_config/resolver_factory.c +++ b/src/core/client_config/resolver_factory.c @@ -33,31 +33,23 @@ #include "src/core/client_config/resolver_factory.h" -void -grpc_resolver_factory_ref (grpc_resolver_factory * factory) -{ - factory->vtable->ref (factory); +void grpc_resolver_factory_ref(grpc_resolver_factory* factory) { + factory->vtable->ref(factory); } -void -grpc_resolver_factory_unref (grpc_resolver_factory * factory) -{ - factory->vtable->unref (factory); +void grpc_resolver_factory_unref(grpc_resolver_factory* factory) { + factory->vtable->unref(factory); } /** Create a resolver instance for a name */ -grpc_resolver * -grpc_resolver_factory_create_resolver (grpc_resolver_factory * factory, grpc_resolver_args * args) -{ - if (factory == NULL) - return NULL; - return factory->vtable->create_resolver (factory, args); +grpc_resolver* grpc_resolver_factory_create_resolver( + grpc_resolver_factory* factory, grpc_resolver_args* args) { + if (factory == NULL) return NULL; + return factory->vtable->create_resolver(factory, args); } -char * -grpc_resolver_factory_get_default_authority (grpc_resolver_factory * factory, grpc_uri * uri) -{ - if (factory == NULL) - return NULL; - return factory->vtable->get_default_authority (factory, uri); +char* grpc_resolver_factory_get_default_authority( + grpc_resolver_factory* factory, grpc_uri* uri) { + if (factory == NULL) return NULL; + return factory->vtable->get_default_authority(factory, uri); } diff --git a/src/core/client_config/resolver_factory.h b/src/core/client_config/resolver_factory.h index 920776886a2..4c4df353f7c 100644 --- a/src/core/client_config/resolver_factory.h +++ b/src/core/client_config/resolver_factory.h @@ -43,40 +43,40 @@ typedef struct grpc_resolver_factory_vtable grpc_resolver_factory_vtable; /** grpc_resolver provides grpc_client_config objects to grpc_channel objects */ -struct grpc_resolver_factory -{ +struct grpc_resolver_factory { const grpc_resolver_factory_vtable *vtable; }; -typedef struct grpc_resolver_args -{ +typedef struct grpc_resolver_args { grpc_uri *uri; grpc_subchannel_factory *subchannel_factory; } grpc_resolver_args; -struct grpc_resolver_factory_vtable -{ - void (*ref) (grpc_resolver_factory * factory); - void (*unref) (grpc_resolver_factory * factory); +struct grpc_resolver_factory_vtable { + void (*ref)(grpc_resolver_factory *factory); + void (*unref)(grpc_resolver_factory *factory); /** Implementation of grpc_resolver_factory_create_resolver */ - grpc_resolver *(*create_resolver) (grpc_resolver_factory * factory, grpc_resolver_args * args); + grpc_resolver *(*create_resolver)(grpc_resolver_factory *factory, + grpc_resolver_args *args); /** Implementation of grpc_resolver_factory_get_default_authority */ - char *(*get_default_authority) (grpc_resolver_factory * factory, grpc_uri * uri); + char *(*get_default_authority)(grpc_resolver_factory *factory, grpc_uri *uri); /** URI scheme that this factory implements */ const char *scheme; }; -void grpc_resolver_factory_ref (grpc_resolver_factory * resolver); -void grpc_resolver_factory_unref (grpc_resolver_factory * resolver); +void grpc_resolver_factory_ref(grpc_resolver_factory *resolver); +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_resolver *grpc_resolver_factory_create_resolver( + 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. */ -char *grpc_resolver_factory_get_default_authority (grpc_resolver_factory * factory, grpc_uri * uri); +char *grpc_resolver_factory_get_default_authority( + grpc_resolver_factory *factory, grpc_uri *uri); #endif /* GRPC_INTERNAL_CORE_CONFIG_RESOLVER_FACTORY_H */ diff --git a/src/core/client_config/resolver_registry.c b/src/core/client_config/resolver_registry.c index 1ebf43048ed..89a945c2d31 100644 --- a/src/core/client_config/resolver_registry.c +++ b/src/core/client_config/resolver_registry.c @@ -46,112 +46,92 @@ static int g_number_of_resolvers = 0; static char *g_default_resolver_prefix; -void -grpc_resolver_registry_init (const char *default_resolver_prefix) -{ +void grpc_resolver_registry_init(const char *default_resolver_prefix) { g_number_of_resolvers = 0; - g_default_resolver_prefix = gpr_strdup (default_resolver_prefix); + g_default_resolver_prefix = gpr_strdup(default_resolver_prefix); } -void -grpc_resolver_registry_shutdown (void) -{ +void grpc_resolver_registry_shutdown(void) { int i; - for (i = 0; i < g_number_of_resolvers; i++) - { - grpc_resolver_factory_unref (g_all_of_the_resolvers[i]); - } - gpr_free (g_default_resolver_prefix); + for (i = 0; i < g_number_of_resolvers; i++) { + grpc_resolver_factory_unref(g_all_of_the_resolvers[i]); + } + gpr_free(g_default_resolver_prefix); } -void -grpc_register_resolver_type (grpc_resolver_factory * factory) -{ +void grpc_register_resolver_type(grpc_resolver_factory *factory) { int i; - for (i = 0; i < g_number_of_resolvers; i++) - { - GPR_ASSERT (0 != strcmp (factory->vtable->scheme, g_all_of_the_resolvers[i]->vtable->scheme)); - } - GPR_ASSERT (g_number_of_resolvers != MAX_RESOLVERS); - grpc_resolver_factory_ref (factory); + for (i = 0; i < g_number_of_resolvers; i++) { + GPR_ASSERT(0 != strcmp(factory->vtable->scheme, + g_all_of_the_resolvers[i]->vtable->scheme)); + } + GPR_ASSERT(g_number_of_resolvers != MAX_RESOLVERS); + grpc_resolver_factory_ref(factory); g_all_of_the_resolvers[g_number_of_resolvers++] = factory; } -static grpc_resolver_factory * -lookup_factory (grpc_uri * uri) -{ +static grpc_resolver_factory *lookup_factory(grpc_uri *uri) { int i; /* handling NULL uri's here simplifies grpc_resolver_create */ - if (!uri) - return NULL; - - for (i = 0; i < g_number_of_resolvers; i++) - { - if (0 == strcmp (uri->scheme, g_all_of_the_resolvers[i]->vtable->scheme)) - { - return g_all_of_the_resolvers[i]; - } + if (!uri) return NULL; + + for (i = 0; i < g_number_of_resolvers; i++) { + if (0 == strcmp(uri->scheme, g_all_of_the_resolvers[i]->vtable->scheme)) { + return g_all_of_the_resolvers[i]; } + } return NULL; } -static grpc_resolver_factory * -resolve_factory (const char *target, grpc_uri ** uri) -{ +static grpc_resolver_factory *resolve_factory(const char *target, + grpc_uri **uri) { char *tmp; grpc_resolver_factory *factory = NULL; - GPR_ASSERT (uri != NULL); - *uri = grpc_uri_parse (target, 1); - factory = lookup_factory (*uri); - if (factory == NULL) - { - if (g_default_resolver_prefix != NULL) - { - grpc_uri_destroy (*uri); - gpr_asprintf (&tmp, "%s%s", g_default_resolver_prefix, target); - *uri = grpc_uri_parse (tmp, 1); - factory = lookup_factory (*uri); - if (factory == NULL) - { - grpc_uri_destroy (grpc_uri_parse (target, 0)); - grpc_uri_destroy (grpc_uri_parse (tmp, 0)); - gpr_log (GPR_ERROR, "don't know how to resolve '%s' or '%s'", target, tmp); - } - gpr_free (tmp); - } - else - { - grpc_uri_destroy (grpc_uri_parse (target, 0)); - gpr_log (GPR_ERROR, "don't know how to resolve '%s'", target); - } + GPR_ASSERT(uri != NULL); + *uri = grpc_uri_parse(target, 1); + factory = lookup_factory(*uri); + if (factory == NULL) { + if (g_default_resolver_prefix != NULL) { + grpc_uri_destroy(*uri); + gpr_asprintf(&tmp, "%s%s", g_default_resolver_prefix, target); + *uri = grpc_uri_parse(tmp, 1); + factory = lookup_factory(*uri); + if (factory == NULL) { + grpc_uri_destroy(grpc_uri_parse(target, 0)); + grpc_uri_destroy(grpc_uri_parse(tmp, 0)); + gpr_log(GPR_ERROR, "don't know how to resolve '%s' or '%s'", target, + tmp); + } + gpr_free(tmp); + } else { + grpc_uri_destroy(grpc_uri_parse(target, 0)); + gpr_log(GPR_ERROR, "don't know how to resolve '%s'", target); } + } return factory; } -grpc_resolver * -grpc_resolver_create (const char *target, grpc_subchannel_factory * subchannel_factory) -{ +grpc_resolver *grpc_resolver_create( + const char *target, grpc_subchannel_factory *subchannel_factory) { grpc_uri *uri = NULL; - grpc_resolver_factory *factory = resolve_factory (target, &uri); + grpc_resolver_factory *factory = resolve_factory(target, &uri); grpc_resolver *resolver; grpc_resolver_args args; - memset (&args, 0, sizeof (args)); + memset(&args, 0, sizeof(args)); args.uri = uri; args.subchannel_factory = subchannel_factory; - resolver = grpc_resolver_factory_create_resolver (factory, &args); - grpc_uri_destroy (uri); + resolver = grpc_resolver_factory_create_resolver(factory, &args); + grpc_uri_destroy(uri); return resolver; } -char * -grpc_get_default_authority (const char *target) -{ +char *grpc_get_default_authority(const char *target) { grpc_uri *uri = NULL; - grpc_resolver_factory *factory = resolve_factory (target, &uri); - char *authority = grpc_resolver_factory_get_default_authority (factory, uri); - grpc_uri_destroy (uri); + grpc_resolver_factory *factory = resolve_factory(target, &uri); + char *authority = grpc_resolver_factory_get_default_authority(factory, uri); + grpc_uri_destroy(uri); return authority; } diff --git a/src/core/client_config/resolver_registry.h b/src/core/client_config/resolver_registry.h index d52e50fd133..5a7193b7ae2 100644 --- a/src/core/client_config/resolver_registry.h +++ b/src/core/client_config/resolver_registry.h @@ -36,15 +36,15 @@ #include "src/core/client_config/resolver_factory.h" -void grpc_resolver_registry_init (const char *default_prefix); -void grpc_resolver_registry_shutdown (void); +void grpc_resolver_registry_init(const char *default_prefix); +void grpc_resolver_registry_shutdown(void); /** Register a resolver type. URI's of \a scheme will be resolved with the given resolver. If \a priority is greater than zero, then the resolver will be eligible to resolve names that are passed in with no scheme. Higher priority resolvers will be tried before lower priority schemes. */ -void grpc_register_resolver_type (grpc_resolver_factory * factory); +void grpc_register_resolver_type(grpc_resolver_factory *factory); /** Create a resolver given \a target. First tries to parse \a target as a URI. If this succeeds, tries @@ -55,10 +55,11 @@ void grpc_register_resolver_type (grpc_resolver_factory * factory); If a resolver factory was found, use it to instantiate a resolver and return it. If a resolver factory was not found, return NULL. */ -grpc_resolver *grpc_resolver_create (const char *target, grpc_subchannel_factory * subchannel_factory); +grpc_resolver *grpc_resolver_create( + const char *target, grpc_subchannel_factory *subchannel_factory); /** 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(const char *target); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_RESOLVER_REGISTRY_H */ diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index dc8151311a6..7f9dd2543f9 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -44,8 +44,7 @@ #include "src/core/iomgr/resolve_address.h" #include "src/core/support/string.h" -typedef struct -{ +typedef struct { /** base class: must be first */ grpc_resolver base; /** refcount */ @@ -75,175 +74,160 @@ typedef struct grpc_client_config *resolved_config; } dns_resolver; -static void dns_destroy (grpc_exec_ctx * exec_ctx, 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 (grpc_exec_ctx * exec_ctx, dns_resolver * r); +static void dns_start_resolving_locked(dns_resolver *r); +static void dns_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx, + dns_resolver *r); -static void dns_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * r); -static void dns_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * r, struct sockaddr *failing_address, int failing_address_len); -static void dns_next (grpc_exec_ctx * exec_ctx, grpc_resolver * r, grpc_client_config ** target_config, grpc_closure * on_complete); +static void dns_shutdown(grpc_exec_ctx *exec_ctx, grpc_resolver *r); +static void dns_channel_saw_error(grpc_exec_ctx *exec_ctx, grpc_resolver *r, + struct sockaddr *failing_address, + int failing_address_len); +static void dns_next(grpc_exec_ctx *exec_ctx, grpc_resolver *r, + grpc_client_config **target_config, + grpc_closure *on_complete); static const grpc_resolver_vtable dns_resolver_vtable = { - dns_destroy, dns_shutdown, dns_channel_saw_error, dns_next -}; + dns_destroy, dns_shutdown, dns_channel_saw_error, dns_next}; -static void -dns_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver) -{ - dns_resolver *r = (dns_resolver *) resolver; - gpr_mu_lock (&r->mu); - if (r->next_completion != NULL) - { - *r->target_config = NULL; - grpc_exec_ctx_enqueue (exec_ctx, r->next_completion, 1); - r->next_completion = NULL; - } - gpr_mu_unlock (&r->mu); +static void dns_shutdown(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver) { + dns_resolver *r = (dns_resolver *)resolver; + gpr_mu_lock(&r->mu); + if (r->next_completion != NULL) { + *r->target_config = NULL; + grpc_exec_ctx_enqueue(exec_ctx, r->next_completion, 1); + r->next_completion = NULL; + } + gpr_mu_unlock(&r->mu); } -static void -dns_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, struct sockaddr *sa, int len) -{ - dns_resolver *r = (dns_resolver *) resolver; - gpr_mu_lock (&r->mu); - if (!r->resolving) - { - dns_start_resolving_locked (r); - } - gpr_mu_unlock (&r->mu); +static void dns_channel_saw_error(grpc_exec_ctx *exec_ctx, + grpc_resolver *resolver, struct sockaddr *sa, + int len) { + dns_resolver *r = (dns_resolver *)resolver; + gpr_mu_lock(&r->mu); + if (!r->resolving) { + dns_start_resolving_locked(r); + } + gpr_mu_unlock(&r->mu); } -static void -dns_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete) -{ - dns_resolver *r = (dns_resolver *) resolver; - gpr_mu_lock (&r->mu); - GPR_ASSERT (!r->next_completion); +static void dns_next(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver, + grpc_client_config **target_config, + grpc_closure *on_complete) { + dns_resolver *r = (dns_resolver *)resolver; + gpr_mu_lock(&r->mu); + GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; r->target_config = target_config; - if (r->resolved_version == 0 && !r->resolving) - { - dns_start_resolving_locked (r); - } - else - { - dns_maybe_finish_next_locked (exec_ctx, r); - } - gpr_mu_unlock (&r->mu); + if (r->resolved_version == 0 && !r->resolving) { + dns_start_resolving_locked(r); + } else { + dns_maybe_finish_next_locked(exec_ctx, r); + } + gpr_mu_unlock(&r->mu); } -static void -dns_on_resolved (grpc_exec_ctx * exec_ctx, void *arg, grpc_resolved_addresses * addresses) -{ +static void dns_on_resolved(grpc_exec_ctx *exec_ctx, void *arg, + grpc_resolved_addresses *addresses) { dns_resolver *r = arg; grpc_client_config *config = NULL; grpc_subchannel **subchannels; grpc_subchannel_args args; grpc_lb_policy *lb_policy; size_t i; - if (addresses) - { - grpc_lb_policy_args lb_policy_args; - config = grpc_client_config_create (); - subchannels = gpr_malloc (sizeof (grpc_subchannel *) * addresses->naddrs); - for (i = 0; i < addresses->naddrs; i++) - { - memset (&args, 0, sizeof (args)); - args.addr = (struct sockaddr *) (addresses->addrs[i].addr); - args.addr_len = (size_t) addresses->addrs[i].len; - subchannels[i] = grpc_subchannel_factory_create_subchannel (exec_ctx, r->subchannel_factory, &args); - } - memset (&lb_policy_args, 0, sizeof (lb_policy_args)); - lb_policy_args.subchannels = subchannels; - lb_policy_args.num_subchannels = addresses->naddrs; - lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args); - grpc_client_config_set_lb_policy (config, lb_policy); - GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "construction"); - grpc_resolved_addresses_destroy (addresses); - gpr_free (subchannels); + if (addresses) { + grpc_lb_policy_args lb_policy_args; + config = grpc_client_config_create(); + subchannels = gpr_malloc(sizeof(grpc_subchannel *) * addresses->naddrs); + for (i = 0; i < addresses->naddrs; i++) { + memset(&args, 0, sizeof(args)); + args.addr = (struct sockaddr *)(addresses->addrs[i].addr); + args.addr_len = (size_t)addresses->addrs[i].len; + subchannels[i] = grpc_subchannel_factory_create_subchannel( + exec_ctx, r->subchannel_factory, &args); } - gpr_mu_lock (&r->mu); - GPR_ASSERT (r->resolving); + memset(&lb_policy_args, 0, sizeof(lb_policy_args)); + lb_policy_args.subchannels = subchannels; + lb_policy_args.num_subchannels = addresses->naddrs; + lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); + grpc_client_config_set_lb_policy(config, lb_policy); + GRPC_LB_POLICY_UNREF(exec_ctx, lb_policy, "construction"); + grpc_resolved_addresses_destroy(addresses); + gpr_free(subchannels); + } + gpr_mu_lock(&r->mu); + GPR_ASSERT(r->resolving); r->resolving = 0; - if (r->resolved_config) - { - grpc_client_config_unref (exec_ctx, r->resolved_config); - } + if (r->resolved_config) { + grpc_client_config_unref(exec_ctx, r->resolved_config); + } r->resolved_config = config; r->resolved_version++; - dns_maybe_finish_next_locked (exec_ctx, r); - gpr_mu_unlock (&r->mu); + dns_maybe_finish_next_locked(exec_ctx, r); + gpr_mu_unlock(&r->mu); - GRPC_RESOLVER_UNREF (exec_ctx, &r->base, "dns-resolving"); + GRPC_RESOLVER_UNREF(exec_ctx, &r->base, "dns-resolving"); } -static void -dns_start_resolving_locked (dns_resolver * r) -{ - GRPC_RESOLVER_REF (&r->base, "dns-resolving"); - GPR_ASSERT (!r->resolving); +static void dns_start_resolving_locked(dns_resolver *r) { + GRPC_RESOLVER_REF(&r->base, "dns-resolving"); + GPR_ASSERT(!r->resolving); r->resolving = 1; - grpc_resolve_address (r->name, r->default_port, dns_on_resolved, r); + grpc_resolve_address(r->name, r->default_port, dns_on_resolved, r); } -static void -dns_maybe_finish_next_locked (grpc_exec_ctx * exec_ctx, dns_resolver * r) -{ - if (r->next_completion != NULL && r->resolved_version != r->published_version) - { - *r->target_config = r->resolved_config; - if (r->resolved_config) - { - grpc_client_config_ref (r->resolved_config); - } - grpc_exec_ctx_enqueue (exec_ctx, r->next_completion, 1); - r->next_completion = NULL; - r->published_version = r->resolved_version; +static void dns_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx, + dns_resolver *r) { + if (r->next_completion != NULL && + r->resolved_version != r->published_version) { + *r->target_config = r->resolved_config; + if (r->resolved_config) { + grpc_client_config_ref(r->resolved_config); } + grpc_exec_ctx_enqueue(exec_ctx, r->next_completion, 1); + r->next_completion = NULL; + r->published_version = r->resolved_version; + } } -static void -dns_destroy (grpc_exec_ctx * exec_ctx, grpc_resolver * gr) -{ - dns_resolver *r = (dns_resolver *) gr; - gpr_mu_destroy (&r->mu); - if (r->resolved_config) - { - grpc_client_config_unref (exec_ctx, r->resolved_config); - } - grpc_subchannel_factory_unref (exec_ctx, r->subchannel_factory); - gpr_free (r->name); - gpr_free (r->default_port); - gpr_free (r->lb_policy_name); - gpr_free (r); +static void dns_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) { + dns_resolver *r = (dns_resolver *)gr; + gpr_mu_destroy(&r->mu); + if (r->resolved_config) { + grpc_client_config_unref(exec_ctx, r->resolved_config); + } + grpc_subchannel_factory_unref(exec_ctx, r->subchannel_factory); + gpr_free(r->name); + gpr_free(r->default_port); + gpr_free(r->lb_policy_name); + gpr_free(r); } -static grpc_resolver * -dns_create (grpc_resolver_args * args, const char *default_port, const char *lb_policy_name) -{ +static grpc_resolver *dns_create(grpc_resolver_args *args, + const char *default_port, + const char *lb_policy_name) { dns_resolver *r; const char *path = args->uri->path; - if (0 != strcmp (args->uri->authority, "")) - { - gpr_log (GPR_ERROR, "authority based dns uri's not supported"); - return NULL; - } + if (0 != strcmp(args->uri->authority, "")) { + gpr_log(GPR_ERROR, "authority based dns uri's not supported"); + return NULL; + } - if (path[0] == '/') - ++path; + if (path[0] == '/') ++path; - r = gpr_malloc (sizeof (dns_resolver)); - memset (r, 0, sizeof (*r)); - gpr_ref_init (&r->refs, 1); - gpr_mu_init (&r->mu); - grpc_resolver_init (&r->base, &dns_resolver_vtable); - r->name = gpr_strdup (path); - r->default_port = gpr_strdup (default_port); + r = gpr_malloc(sizeof(dns_resolver)); + memset(r, 0, sizeof(*r)); + gpr_ref_init(&r->refs, 1); + gpr_mu_init(&r->mu); + grpc_resolver_init(&r->base, &dns_resolver_vtable); + r->name = gpr_strdup(path); + r->default_port = gpr_strdup(default_port); r->subchannel_factory = args->subchannel_factory; - grpc_subchannel_factory_ref (r->subchannel_factory); - r->lb_policy_name = gpr_strdup (lb_policy_name); + grpc_subchannel_factory_ref(r->subchannel_factory); + r->lb_policy_name = gpr_strdup(lb_policy_name); return &r->base; } @@ -251,39 +235,27 @@ dns_create (grpc_resolver_args * args, const char *default_port, const char *lb_ * FACTORY */ -static void -dns_factory_ref (grpc_resolver_factory * factory) -{ -} +static void dns_factory_ref(grpc_resolver_factory *factory) {} -static void -dns_factory_unref (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", "pick_first"); +static grpc_resolver *dns_factory_create_resolver( + grpc_resolver_factory *factory, grpc_resolver_args *args) { + return dns_create(args, "https", "pick_first"); } -char * -dns_factory_get_default_host_name (grpc_resolver_factory * factory, grpc_uri * uri) -{ +char *dns_factory_get_default_host_name(grpc_resolver_factory *factory, + grpc_uri *uri) { const char *path = uri->path; - if (path[0] == '/') - ++path; - return gpr_strdup (path); + if (path[0] == '/') ++path; + return gpr_strdup(path); } static const grpc_resolver_factory_vtable dns_factory_vtable = { - dns_factory_ref, dns_factory_unref, dns_factory_create_resolver, - dns_factory_get_default_host_name, "dns" -}; -static grpc_resolver_factory dns_resolver_factory = { &dns_factory_vtable }; + dns_factory_ref, dns_factory_unref, dns_factory_create_resolver, + dns_factory_get_default_host_name, "dns"}; +static grpc_resolver_factory dns_resolver_factory = {&dns_factory_vtable}; -grpc_resolver_factory * -grpc_dns_resolver_factory_create () -{ +grpc_resolver_factory *grpc_dns_resolver_factory_create() { return &dns_resolver_factory; } diff --git a/src/core/client_config/resolvers/dns_resolver.h b/src/core/client_config/resolvers/dns_resolver.h index bb434991490..a3ef3161a63 100644 --- a/src/core/client_config/resolvers/dns_resolver.h +++ b/src/core/client_config/resolvers/dns_resolver.h @@ -37,6 +37,6 @@ #include "src/core/client_config/resolver_factory.h" /** Create a dns resolver factory */ -grpc_resolver_factory *grpc_dns_resolver_factory_create (void); +grpc_resolver_factory *grpc_dns_resolver_factory_create(void); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_RESOLVERS_DNS_RESOLVER_H */ diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index f4c958c4248..0b017f06c7f 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -49,8 +49,7 @@ #include "src/core/iomgr/resolve_address.h" #include "src/core/support/string.h" -typedef struct -{ +typedef struct { /** base class: must be first */ grpc_resolver base; /** refcount */ @@ -77,314 +76,283 @@ typedef struct grpc_client_config **target_config; } sockaddr_resolver; -static void sockaddr_destroy (grpc_exec_ctx * exec_ctx, grpc_resolver * r); +static void sockaddr_destroy(grpc_exec_ctx *exec_ctx, 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(grpc_exec_ctx *exec_ctx, + sockaddr_resolver *r); -static void sockaddr_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * r); -static void sockaddr_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * r, struct sockaddr *failing_address, int failing_address_len); -static void sockaddr_next (grpc_exec_ctx * exec_ctx, grpc_resolver * r, grpc_client_config ** target_config, grpc_closure * on_complete); +static void sockaddr_shutdown(grpc_exec_ctx *exec_ctx, grpc_resolver *r); +static void sockaddr_channel_saw_error(grpc_exec_ctx *exec_ctx, + grpc_resolver *r, + struct sockaddr *failing_address, + int failing_address_len); +static void sockaddr_next(grpc_exec_ctx *exec_ctx, grpc_resolver *r, + grpc_client_config **target_config, + grpc_closure *on_complete); static const grpc_resolver_vtable sockaddr_resolver_vtable = { - sockaddr_destroy, sockaddr_shutdown, sockaddr_channel_saw_error, - sockaddr_next -}; - -static void -sockaddr_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver) -{ - sockaddr_resolver *r = (sockaddr_resolver *) resolver; - gpr_mu_lock (&r->mu); - if (r->next_completion != NULL) - { - *r->target_config = NULL; - grpc_exec_ctx_enqueue (exec_ctx, r->next_completion, 1); - r->next_completion = NULL; - } - gpr_mu_unlock (&r->mu); + sockaddr_destroy, sockaddr_shutdown, sockaddr_channel_saw_error, + sockaddr_next}; + +static void sockaddr_shutdown(grpc_exec_ctx *exec_ctx, + grpc_resolver *resolver) { + sockaddr_resolver *r = (sockaddr_resolver *)resolver; + gpr_mu_lock(&r->mu); + if (r->next_completion != NULL) { + *r->target_config = NULL; + grpc_exec_ctx_enqueue(exec_ctx, r->next_completion, 1); + r->next_completion = NULL; + } + gpr_mu_unlock(&r->mu); } -static void -sockaddr_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, struct sockaddr *sa, int len) -{ -} +static void sockaddr_channel_saw_error(grpc_exec_ctx *exec_ctx, + grpc_resolver *resolver, + struct sockaddr *sa, int len) {} -static void -sockaddr_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete) -{ - sockaddr_resolver *r = (sockaddr_resolver *) resolver; - gpr_mu_lock (&r->mu); - GPR_ASSERT (!r->next_completion); +static void sockaddr_next(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver, + grpc_client_config **target_config, + grpc_closure *on_complete) { + sockaddr_resolver *r = (sockaddr_resolver *)resolver; + gpr_mu_lock(&r->mu); + GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; r->target_config = target_config; - sockaddr_maybe_finish_next_locked (exec_ctx, r); - gpr_mu_unlock (&r->mu); + sockaddr_maybe_finish_next_locked(exec_ctx, r); + gpr_mu_unlock(&r->mu); } -static void -sockaddr_maybe_finish_next_locked (grpc_exec_ctx * exec_ctx, sockaddr_resolver * r) -{ +static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx, + sockaddr_resolver *r) { grpc_client_config *cfg; grpc_lb_policy *lb_policy; grpc_lb_policy_args lb_policy_args; grpc_subchannel **subchannels; grpc_subchannel_args args; - if (r->next_completion != NULL && !r->published) - { - size_t i; - cfg = grpc_client_config_create (); - subchannels = gpr_malloc (sizeof (grpc_subchannel *) * r->num_addrs); - for (i = 0; i < r->num_addrs; i++) - { - memset (&args, 0, sizeof (args)); - args.addr = (struct sockaddr *) &r->addrs[i]; - args.addr_len = r->addrs_len[i]; - subchannels[i] = grpc_subchannel_factory_create_subchannel (exec_ctx, r->subchannel_factory, &args); - } - memset (&lb_policy_args, 0, sizeof (lb_policy_args)); - lb_policy_args.subchannels = subchannels; - lb_policy_args.num_subchannels = r->num_addrs; - lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args); - gpr_free (subchannels); - grpc_client_config_set_lb_policy (cfg, lb_policy); - GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "sockaddr"); - r->published = 1; - *r->target_config = cfg; - grpc_exec_ctx_enqueue (exec_ctx, r->next_completion, 1); - r->next_completion = NULL; + if (r->next_completion != NULL && !r->published) { + size_t i; + cfg = grpc_client_config_create(); + subchannels = gpr_malloc(sizeof(grpc_subchannel *) * r->num_addrs); + for (i = 0; i < r->num_addrs; i++) { + memset(&args, 0, sizeof(args)); + args.addr = (struct sockaddr *)&r->addrs[i]; + args.addr_len = r->addrs_len[i]; + subchannels[i] = grpc_subchannel_factory_create_subchannel( + exec_ctx, r->subchannel_factory, &args); } + memset(&lb_policy_args, 0, sizeof(lb_policy_args)); + lb_policy_args.subchannels = subchannels; + lb_policy_args.num_subchannels = r->num_addrs; + lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); + gpr_free(subchannels); + grpc_client_config_set_lb_policy(cfg, lb_policy); + GRPC_LB_POLICY_UNREF(exec_ctx, lb_policy, "sockaddr"); + r->published = 1; + *r->target_config = cfg; + grpc_exec_ctx_enqueue(exec_ctx, r->next_completion, 1); + r->next_completion = NULL; + } } -static void -sockaddr_destroy (grpc_exec_ctx * exec_ctx, grpc_resolver * gr) -{ - sockaddr_resolver *r = (sockaddr_resolver *) gr; - gpr_mu_destroy (&r->mu); - grpc_subchannel_factory_unref (exec_ctx, r->subchannel_factory); - gpr_free (r->addrs); - gpr_free (r->addrs_len); - gpr_free (r->lb_policy_name); - gpr_free (r); +static void sockaddr_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) { + sockaddr_resolver *r = (sockaddr_resolver *)gr; + gpr_mu_destroy(&r->mu); + grpc_subchannel_factory_unref(exec_ctx, r->subchannel_factory); + gpr_free(r->addrs); + gpr_free(r->addrs_len); + gpr_free(r->lb_policy_name); + gpr_free(r); } #ifdef GPR_POSIX_SOCKET -static int -parse_unix (grpc_uri * uri, struct sockaddr_storage *addr, size_t * len) -{ - struct sockaddr_un *un = (struct sockaddr_un *) addr; +static int parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, + size_t *len) { + struct sockaddr_un *un = (struct sockaddr_un *)addr; un->sun_family = AF_UNIX; - strcpy (un->sun_path, uri->path); - *len = strlen (un->sun_path) + sizeof (un->sun_family) + 1; + strcpy(un->sun_path, uri->path); + *len = strlen(un->sun_path) + sizeof(un->sun_family) + 1; return 1; } -static char * -unix_get_default_authority (grpc_resolver_factory * factory, grpc_uri * uri) -{ - return gpr_strdup ("localhost"); +static char *unix_get_default_authority(grpc_resolver_factory *factory, + grpc_uri *uri) { + return gpr_strdup("localhost"); } #endif -static char * -ip_get_default_authority (grpc_uri * uri) -{ +static char *ip_get_default_authority(grpc_uri *uri) { const char *path = uri->path; - if (path[0] == '/') - ++path; - return gpr_strdup (path); + if (path[0] == '/') ++path; + return gpr_strdup(path); } -static char * -ipv4_get_default_authority (grpc_resolver_factory * factory, grpc_uri * uri) -{ - return ip_get_default_authority (uri); +static char *ipv4_get_default_authority(grpc_resolver_factory *factory, + grpc_uri *uri) { + return ip_get_default_authority(uri); } -static char * -ipv6_get_default_authority (grpc_resolver_factory * factory, grpc_uri * uri) -{ - return ip_get_default_authority (uri); +static char *ipv6_get_default_authority(grpc_resolver_factory *factory, + grpc_uri *uri) { + return ip_get_default_authority(uri); } -static int -parse_ipv4 (grpc_uri * uri, struct sockaddr_storage *addr, size_t * len) -{ +static int parse_ipv4(grpc_uri *uri, struct sockaddr_storage *addr, + size_t *len) { const char *host_port = uri->path; char *host; char *port; int port_num; int result = 0; - struct sockaddr_in *in = (struct sockaddr_in *) addr; + struct sockaddr_in *in = (struct sockaddr_in *)addr; - if (*host_port == '/') - ++host_port; - if (!gpr_split_host_port (host_port, &host, &port)) - { - return 0; - } + if (*host_port == '/') ++host_port; + if (!gpr_split_host_port(host_port, &host, &port)) { + return 0; + } - memset (in, 0, sizeof (*in)); - *len = sizeof (*in); + memset(in, 0, sizeof(*in)); + *len = sizeof(*in); in->sin_family = AF_INET; - if (inet_pton (AF_INET, host, &in->sin_addr) == 0) - { - gpr_log (GPR_ERROR, "invalid ipv4 address: '%s'", host); - goto done; - } + if (inet_pton(AF_INET, host, &in->sin_addr) == 0) { + gpr_log(GPR_ERROR, "invalid ipv4 address: '%s'", host); + goto done; + } - if (port != NULL) - { - if (sscanf (port, "%d", &port_num) != 1 || port_num < 0 || port_num > 65535) - { - gpr_log (GPR_ERROR, "invalid ipv4 port: '%s'", port); - goto done; - } - in->sin_port = htons ((gpr_uint16) port_num); - } - else - { - gpr_log (GPR_ERROR, "no port given for ipv4 scheme"); + if (port != NULL) { + if (sscanf(port, "%d", &port_num) != 1 || port_num < 0 || + port_num > 65535) { + gpr_log(GPR_ERROR, "invalid ipv4 port: '%s'", port); goto done; } + in->sin_port = htons((gpr_uint16)port_num); + } else { + gpr_log(GPR_ERROR, "no port given for ipv4 scheme"); + goto done; + } result = 1; done: - gpr_free (host); - gpr_free (port); + gpr_free(host); + gpr_free(port); return result; } -static int -parse_ipv6 (grpc_uri * uri, struct sockaddr_storage *addr, size_t * len) -{ +static int parse_ipv6(grpc_uri *uri, struct sockaddr_storage *addr, + size_t *len) { const char *host_port = uri->path; char *host; char *port; int port_num; int result = 0; - struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) addr; + struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)addr; - if (*host_port == '/') - ++host_port; - if (!gpr_split_host_port (host_port, &host, &port)) - { - return 0; - } + if (*host_port == '/') ++host_port; + if (!gpr_split_host_port(host_port, &host, &port)) { + return 0; + } - memset (in6, 0, sizeof (*in6)); - *len = sizeof (*in6); + memset(in6, 0, sizeof(*in6)); + *len = sizeof(*in6); in6->sin6_family = AF_INET6; - if (inet_pton (AF_INET6, host, &in6->sin6_addr) == 0) - { - gpr_log (GPR_ERROR, "invalid ipv6 address: '%s'", host); - goto done; - } + if (inet_pton(AF_INET6, host, &in6->sin6_addr) == 0) { + gpr_log(GPR_ERROR, "invalid ipv6 address: '%s'", host); + goto done; + } - if (port != NULL) - { - if (sscanf (port, "%d", &port_num) != 1 || port_num < 0 || port_num > 65535) - { - gpr_log (GPR_ERROR, "invalid ipv6 port: '%s'", port); - goto done; - } - in6->sin6_port = htons ((gpr_uint16) port_num); - } - else - { - gpr_log (GPR_ERROR, "no port given for ipv6 scheme"); + if (port != NULL) { + if (sscanf(port, "%d", &port_num) != 1 || port_num < 0 || + port_num > 65535) { + gpr_log(GPR_ERROR, "invalid ipv6 port: '%s'", port); goto done; } + in6->sin6_port = htons((gpr_uint16)port_num); + } else { + gpr_log(GPR_ERROR, "no port given for ipv6 scheme"); + goto done; + } result = 1; done: - gpr_free (host); - gpr_free (port); + gpr_free(host); + gpr_free(port); return result; } -static void -do_nothing (void *ignored) -{ -} +static void do_nothing(void *ignored) {} -static grpc_resolver * -sockaddr_create (grpc_resolver_args * args, const char *default_lb_policy_name, int parse (grpc_uri * uri, struct sockaddr_storage *dst, size_t * len)) -{ +static grpc_resolver *sockaddr_create( + grpc_resolver_args *args, const char *default_lb_policy_name, + int parse(grpc_uri *uri, struct sockaddr_storage *dst, size_t *len)) { size_t i; - int errors_found = 0; /* GPR_FALSE */ + int errors_found = 0; /* GPR_FALSE */ sockaddr_resolver *r; gpr_slice path_slice; gpr_slice_buffer path_parts; - if (0 != strcmp (args->uri->authority, "")) - { - gpr_log (GPR_ERROR, "authority based uri's not supported by the %s scheme", args->uri->scheme); - return NULL; - } + if (0 != strcmp(args->uri->authority, "")) { + gpr_log(GPR_ERROR, "authority based uri's not supported by the %s scheme", + args->uri->scheme); + return NULL; + } - r = gpr_malloc (sizeof (sockaddr_resolver)); - memset (r, 0, sizeof (*r)); + r = gpr_malloc(sizeof(sockaddr_resolver)); + memset(r, 0, sizeof(*r)); r->lb_policy_name = NULL; - if (0 != strcmp (args->uri->query, "")) - { - gpr_slice query_slice; - gpr_slice_buffer query_parts; - - query_slice = gpr_slice_new (args->uri->query, strlen (args->uri->query), do_nothing); - gpr_slice_buffer_init (&query_parts); - gpr_slice_split (query_slice, "=", &query_parts); - GPR_ASSERT (query_parts.count == 2); - if (0 == gpr_slice_str_cmp (query_parts.slices[0], "lb_policy")) - { - r->lb_policy_name = gpr_dump_slice (query_parts.slices[1], GPR_DUMP_ASCII); - } - gpr_slice_buffer_destroy (&query_parts); - gpr_slice_unref (query_slice); - } - if (r->lb_policy_name == NULL) - { - r->lb_policy_name = gpr_strdup (default_lb_policy_name); + if (0 != strcmp(args->uri->query, "")) { + gpr_slice query_slice; + gpr_slice_buffer query_parts; + + query_slice = + gpr_slice_new(args->uri->query, strlen(args->uri->query), do_nothing); + gpr_slice_buffer_init(&query_parts); + gpr_slice_split(query_slice, "=", &query_parts); + GPR_ASSERT(query_parts.count == 2); + if (0 == gpr_slice_str_cmp(query_parts.slices[0], "lb_policy")) { + r->lb_policy_name = gpr_dump_slice(query_parts.slices[1], GPR_DUMP_ASCII); } + gpr_slice_buffer_destroy(&query_parts); + gpr_slice_unref(query_slice); + } + if (r->lb_policy_name == NULL) { + r->lb_policy_name = gpr_strdup(default_lb_policy_name); + } - path_slice = gpr_slice_new (args->uri->path, strlen (args->uri->path), do_nothing); - gpr_slice_buffer_init (&path_parts); + path_slice = + gpr_slice_new(args->uri->path, strlen(args->uri->path), do_nothing); + gpr_slice_buffer_init(&path_parts); - gpr_slice_split (path_slice, ",", &path_parts); + gpr_slice_split(path_slice, ",", &path_parts); r->num_addrs = path_parts.count; - r->addrs = gpr_malloc (sizeof (struct sockaddr_storage) * r->num_addrs); - r->addrs_len = gpr_malloc (sizeof (*r->addrs_len) * r->num_addrs); - - for (i = 0; i < r->num_addrs; i++) - { - grpc_uri ith_uri = *args->uri; - char *part_str = gpr_dump_slice (path_parts.slices[i], GPR_DUMP_ASCII); - ith_uri.path = part_str; - if (!parse (&ith_uri, &r->addrs[i], &r->addrs_len[i])) - { - errors_found = 1; /* GPR_TRUE */ - } - gpr_free (part_str); - if (errors_found) - break; + r->addrs = gpr_malloc(sizeof(struct sockaddr_storage) * r->num_addrs); + r->addrs_len = gpr_malloc(sizeof(*r->addrs_len) * r->num_addrs); + + for (i = 0; i < r->num_addrs; i++) { + grpc_uri ith_uri = *args->uri; + char *part_str = gpr_dump_slice(path_parts.slices[i], GPR_DUMP_ASCII); + ith_uri.path = part_str; + if (!parse(&ith_uri, &r->addrs[i], &r->addrs_len[i])) { + errors_found = 1; /* GPR_TRUE */ } + gpr_free(part_str); + if (errors_found) break; + } - gpr_slice_buffer_destroy (&path_parts); - gpr_slice_unref (path_slice); - if (errors_found) - { - gpr_free (r); - return NULL; - } + gpr_slice_buffer_destroy(&path_parts); + gpr_slice_unref(path_slice); + if (errors_found) { + gpr_free(r); + return NULL; + } - gpr_ref_init (&r->refs, 1); - gpr_mu_init (&r->mu); - grpc_resolver_init (&r->base, &sockaddr_resolver_vtable); + gpr_ref_init(&r->refs, 1); + gpr_mu_init(&r->mu); + grpc_resolver_init(&r->base, &sockaddr_resolver_vtable); r->subchannel_factory = args->subchannel_factory; - grpc_subchannel_factory_ref (r->subchannel_factory); + grpc_subchannel_factory_ref(r->subchannel_factory); return &r->base; } @@ -393,15 +361,9 @@ sockaddr_create (grpc_resolver_args * args, const char *default_lb_policy_name, * FACTORY */ -static void -sockaddr_factory_ref (grpc_resolver_factory * factory) -{ -} +static void sockaddr_factory_ref(grpc_resolver_factory *factory) {} -static void -sockaddr_factory_unref (grpc_resolver_factory * factory) -{ -} +static void sockaddr_factory_unref(grpc_resolver_factory *factory) {} #define DECL_FACTORY(name) \ static grpc_resolver *name##_factory_create_resolver( \ @@ -418,6 +380,6 @@ sockaddr_factory_unref (grpc_resolver_factory * factory) } #ifdef GPR_POSIX_SOCKET -DECL_FACTORY (unix) +DECL_FACTORY(unix) #endif - DECL_FACTORY (ipv4) DECL_FACTORY (ipv6) +DECL_FACTORY(ipv4) DECL_FACTORY(ipv6) diff --git a/src/core/client_config/resolvers/sockaddr_resolver.h b/src/core/client_config/resolvers/sockaddr_resolver.h index c778812e497..1b7a18f9c2a 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.h +++ b/src/core/client_config/resolvers/sockaddr_resolver.h @@ -38,13 +38,13 @@ #include "src/core/client_config/resolver_factory.h" -grpc_resolver_factory *grpc_ipv4_resolver_factory_create (void); +grpc_resolver_factory *grpc_ipv4_resolver_factory_create(void); -grpc_resolver_factory *grpc_ipv6_resolver_factory_create (void); +grpc_resolver_factory *grpc_ipv6_resolver_factory_create(void); #ifdef GPR_POSIX_SOCKET /** Create a unix resolver factory */ -grpc_resolver_factory *grpc_unix_resolver_factory_create (void); +grpc_resolver_factory *grpc_unix_resolver_factory_create(void); #endif #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_RESOLVERS_UNIX_RESOLVER_H */ diff --git a/src/core/client_config/resolvers/zookeeper_resolver.c b/src/core/client_config/resolvers/zookeeper_resolver.c index 3e2040c4127..213d5a172fc 100644 --- a/src/core/client_config/resolvers/zookeeper_resolver.c +++ b/src/core/client_config/resolvers/zookeeper_resolver.c @@ -50,8 +50,7 @@ /** Zookeeper session expiration time in milliseconds */ #define GRPC_ZOOKEEPER_SESSION_TIMEOUT 15000 -typedef struct -{ +typedef struct { /** base class: must be first */ grpc_resolver base; /** refcount */ @@ -88,119 +87,101 @@ typedef struct int resolved_num; } zookeeper_resolver; -static void zookeeper_destroy (grpc_resolver * r); +static void zookeeper_destroy(grpc_resolver *r); -static void zookeeper_start_resolving_locked (zookeeper_resolver * r); -static grpc_closure * -zookeeper_maybe_finish_next_locked (zookeeper_resolver * r) - GRPC_MUST_USE_RESULT; +static void zookeeper_start_resolving_locked(zookeeper_resolver *r); +static grpc_closure *zookeeper_maybe_finish_next_locked(zookeeper_resolver *r) + GRPC_MUST_USE_RESULT; - static void zookeeper_shutdown (grpc_resolver * r); - static void zookeeper_channel_saw_error (grpc_resolver * r, struct sockaddr *failing_address, int failing_address_len); - static void zookeeper_next (grpc_resolver * r, grpc_client_config ** target_config, grpc_closure * on_complete); +static void zookeeper_shutdown(grpc_resolver *r); +static void zookeeper_channel_saw_error(grpc_resolver *r, + struct sockaddr *failing_address, + int failing_address_len); +static void zookeeper_next(grpc_resolver *r, grpc_client_config **target_config, + grpc_closure *on_complete); - static const grpc_resolver_vtable zookeeper_resolver_vtable = { - zookeeper_destroy, zookeeper_shutdown, zookeeper_channel_saw_error, - zookeeper_next - }; +static const grpc_resolver_vtable zookeeper_resolver_vtable = { + zookeeper_destroy, zookeeper_shutdown, zookeeper_channel_saw_error, + zookeeper_next}; -static void -zookeeper_shutdown (grpc_resolver * resolver) -{ - zookeeper_resolver *r = (zookeeper_resolver *) resolver; +static void zookeeper_shutdown(grpc_resolver *resolver) { + zookeeper_resolver *r = (zookeeper_resolver *)resolver; grpc_closure *call = NULL; - gpr_mu_lock (&r->mu); - if (r->next_completion != NULL) - { - *r->target_config = NULL; - call = r->next_completion; - r->next_completion = NULL; - } - zookeeper_close (r->zookeeper_handle); - gpr_mu_unlock (&r->mu); - if (call != NULL) - { - call->cb (call->cb_arg, 1); - } + gpr_mu_lock(&r->mu); + if (r->next_completion != NULL) { + *r->target_config = NULL; + call = r->next_completion; + r->next_completion = NULL; + } + zookeeper_close(r->zookeeper_handle); + gpr_mu_unlock(&r->mu); + if (call != NULL) { + call->cb(call->cb_arg, 1); + } } -static void -zookeeper_channel_saw_error (grpc_resolver * resolver, struct sockaddr *sa, int len) -{ - zookeeper_resolver *r = (zookeeper_resolver *) resolver; - gpr_mu_lock (&r->mu); - if (r->resolving == 0) - { - zookeeper_start_resolving_locked (r); - } - gpr_mu_unlock (&r->mu); +static void zookeeper_channel_saw_error(grpc_resolver *resolver, + struct sockaddr *sa, int len) { + zookeeper_resolver *r = (zookeeper_resolver *)resolver; + gpr_mu_lock(&r->mu); + if (r->resolving == 0) { + zookeeper_start_resolving_locked(r); + } + gpr_mu_unlock(&r->mu); } -static void -zookeeper_next (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete) -{ - zookeeper_resolver *r = (zookeeper_resolver *) resolver; +static void zookeeper_next(grpc_resolver *resolver, + grpc_client_config **target_config, + grpc_closure *on_complete) { + zookeeper_resolver *r = (zookeeper_resolver *)resolver; grpc_closure *call; - gpr_mu_lock (&r->mu); - GPR_ASSERT (r->next_completion == NULL); + gpr_mu_lock(&r->mu); + GPR_ASSERT(r->next_completion == NULL); r->next_completion = on_complete; r->target_config = target_config; - if (r->resolved_version == 0 && r->resolving == 0) - { - zookeeper_start_resolving_locked (r); - } - else - { - call = zookeeper_maybe_finish_next_locked (r); - } - gpr_mu_unlock (&r->mu); - if (call) - call->cb (call->cb_arg, 1); + if (r->resolved_version == 0 && r->resolving == 0) { + zookeeper_start_resolving_locked(r); + } else { + call = zookeeper_maybe_finish_next_locked(r); + } + gpr_mu_unlock(&r->mu); + if (call) call->cb(call->cb_arg, 1); } /** Zookeeper global watcher for connection management TODO: better connection management besides logs */ -static void -zookeeper_global_watcher (zhandle_t * zookeeper_handle, int type, int state, const char *path, void *watcher_ctx) -{ - if (type == ZOO_SESSION_EVENT) - { - if (state == ZOO_EXPIRED_SESSION_STATE) - { - gpr_log (GPR_ERROR, "Zookeeper session expired"); - } - else if (state == ZOO_AUTH_FAILED_STATE) - { - gpr_log (GPR_ERROR, "Zookeeper authentication failed"); - } +static void zookeeper_global_watcher(zhandle_t *zookeeper_handle, int type, + int state, const char *path, + void *watcher_ctx) { + if (type == ZOO_SESSION_EVENT) { + if (state == ZOO_EXPIRED_SESSION_STATE) { + gpr_log(GPR_ERROR, "Zookeeper session expired"); + } else if (state == ZOO_AUTH_FAILED_STATE) { + gpr_log(GPR_ERROR, "Zookeeper authentication failed"); } + } } /** Zookeeper watcher triggered by changes to watched nodes Once triggered, it tries to resolve again to get updated addresses */ -static void -zookeeper_watcher (zhandle_t * zookeeper_handle, int type, int state, const char *path, void *watcher_ctx) -{ - if (watcher_ctx != NULL) - { - zookeeper_resolver *r = (zookeeper_resolver *) watcher_ctx; - if (state == ZOO_CONNECTED_STATE) - { - gpr_mu_lock (&r->mu); - if (r->resolving == 0) - { - zookeeper_start_resolving_locked (r); - } - gpr_mu_unlock (&r->mu); - } +static void zookeeper_watcher(zhandle_t *zookeeper_handle, int type, int state, + const char *path, void *watcher_ctx) { + if (watcher_ctx != NULL) { + zookeeper_resolver *r = (zookeeper_resolver *)watcher_ctx; + if (state == ZOO_CONNECTED_STATE) { + gpr_mu_lock(&r->mu); + if (r->resolving == 0) { + zookeeper_start_resolving_locked(r); + } + gpr_mu_unlock(&r->mu); } + } } /** Callback function after getting all resolved addresses Creates a subchannel for each address */ -static void -zookeeper_on_resolved (void *arg, grpc_resolved_addresses * addresses) -{ +static void zookeeper_on_resolved(void *arg, + grpc_resolved_addresses *addresses) { zookeeper_resolver *r = arg; grpc_client_config *config = NULL; grpc_subchannel **subchannels; @@ -208,77 +189,74 @@ zookeeper_on_resolved (void *arg, grpc_resolved_addresses * addresses) grpc_lb_policy *lb_policy; grpc_closure *call; size_t i; - if (addresses != NULL) - { - grpc_lb_policy_args lb_policy_args; - config = grpc_client_config_create (); - subchannels = gpr_malloc (sizeof (grpc_subchannel *) * addresses->naddrs); - for (i = 0; i < addresses->naddrs; i++) - { - memset (&args, 0, sizeof (args)); - args.addr = (struct sockaddr *) (addresses->addrs[i].addr); - args.addr_len = addresses->addrs[i].len; - subchannels[i] = grpc_subchannel_factory_create_subchannel (r->subchannel_factory, &args); - } - lb_policy_args.subchannels = subchannels; - lb_policy_args.num_subchannels = addresses->naddrs; - lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args); - grpc_client_config_set_lb_policy (config, lb_policy); - GRPC_LB_POLICY_UNREF (lb_policy, "construction"); - grpc_resolved_addresses_destroy (addresses); - gpr_free (subchannels); + if (addresses != NULL) { + grpc_lb_policy_args lb_policy_args; + config = grpc_client_config_create(); + subchannels = gpr_malloc(sizeof(grpc_subchannel *) * addresses->naddrs); + for (i = 0; i < addresses->naddrs; i++) { + memset(&args, 0, sizeof(args)); + args.addr = (struct sockaddr *)(addresses->addrs[i].addr); + args.addr_len = addresses->addrs[i].len; + subchannels[i] = grpc_subchannel_factory_create_subchannel( + r->subchannel_factory, &args); } - gpr_mu_lock (&r->mu); - GPR_ASSERT (r->resolving == 1); + lb_policy_args.subchannels = subchannels; + lb_policy_args.num_subchannels = addresses->naddrs; + lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); + grpc_client_config_set_lb_policy(config, lb_policy); + GRPC_LB_POLICY_UNREF(lb_policy, "construction"); + grpc_resolved_addresses_destroy(addresses); + gpr_free(subchannels); + } + gpr_mu_lock(&r->mu); + GPR_ASSERT(r->resolving == 1); r->resolving = 0; - if (r->resolved_config != NULL) - { - grpc_client_config_unref (r->resolved_config); - } + if (r->resolved_config != NULL) { + grpc_client_config_unref(r->resolved_config); + } r->resolved_config = config; r->resolved_version++; - call = zookeeper_maybe_finish_next_locked (r); - gpr_mu_unlock (&r->mu); + call = zookeeper_maybe_finish_next_locked(r); + gpr_mu_unlock(&r->mu); - if (call) - call->cb (call->cb_arg, 1); + if (call) call->cb(call->cb_arg, 1); - GRPC_RESOLVER_UNREF (&r->base, "zookeeper-resolving"); + GRPC_RESOLVER_UNREF(&r->base, "zookeeper-resolving"); } /** Callback function for each DNS resolved address */ -static void -zookeeper_dns_resolved (void *arg, grpc_resolved_addresses * addresses) -{ +static void zookeeper_dns_resolved(void *arg, + grpc_resolved_addresses *addresses) { size_t i; zookeeper_resolver *r = arg; int resolve_done = 0; - gpr_mu_lock (&r->mu); + gpr_mu_lock(&r->mu); r->resolved_num++; - r->resolved_addrs->addrs = gpr_realloc (r->resolved_addrs->addrs, sizeof (grpc_resolved_address) * (r->resolved_addrs->naddrs + addresses->naddrs)); - for (i = 0; i < addresses->naddrs; i++) - { - memcpy (r->resolved_addrs->addrs[i + r->resolved_addrs->naddrs].addr, addresses->addrs[i].addr, addresses->addrs[i].len); - r->resolved_addrs->addrs[i + r->resolved_addrs->naddrs].len = addresses->addrs[i].len; - } + r->resolved_addrs->addrs = + gpr_realloc(r->resolved_addrs->addrs, + sizeof(grpc_resolved_address) * + (r->resolved_addrs->naddrs + addresses->naddrs)); + for (i = 0; i < addresses->naddrs; i++) { + memcpy(r->resolved_addrs->addrs[i + r->resolved_addrs->naddrs].addr, + addresses->addrs[i].addr, addresses->addrs[i].len); + r->resolved_addrs->addrs[i + r->resolved_addrs->naddrs].len = + addresses->addrs[i].len; + } r->resolved_addrs->naddrs += addresses->naddrs; - grpc_resolved_addresses_destroy (addresses); + grpc_resolved_addresses_destroy(addresses); /** Wait for all addresses to be resolved */ resolve_done = (r->resolved_num == r->resolved_total); - gpr_mu_unlock (&r->mu); - if (resolve_done) - { - zookeeper_on_resolved (r, r->resolved_addrs); - } + gpr_mu_unlock(&r->mu); + if (resolve_done) { + zookeeper_on_resolved(r, r->resolved_addrs); + } } /** Parses JSON format address of a zookeeper node */ -static char * -zookeeper_parse_address (const char *value, size_t value_len) -{ +static char *zookeeper_parse_address(const char *value, size_t value_len) { grpc_json *json; grpc_json *cur; const char *host; @@ -286,301 +264,256 @@ zookeeper_parse_address (const char *value, size_t value_len) char *buffer; char *address = NULL; - buffer = gpr_malloc (value_len); - memcpy (buffer, value, value_len); - json = grpc_json_parse_string_with_len (buffer, value_len); - if (json != NULL) - { - host = NULL; - port = NULL; - for (cur = json->child; cur != NULL; cur = cur->next) - { - if (!strcmp (cur->key, "host")) - { - host = cur->value; - if (port != NULL) - { - break; - } - } - else if (!strcmp (cur->key, "port")) - { - port = cur->value; - if (host != NULL) - { - break; - } - } - } - if (host != NULL && port != NULL) - { - gpr_asprintf (&address, "%s:%s", host, port); - } - grpc_json_destroy (json); + buffer = gpr_malloc(value_len); + memcpy(buffer, value, value_len); + json = grpc_json_parse_string_with_len(buffer, value_len); + if (json != NULL) { + host = NULL; + port = NULL; + for (cur = json->child; cur != NULL; cur = cur->next) { + if (!strcmp(cur->key, "host")) { + host = cur->value; + if (port != NULL) { + break; + } + } else if (!strcmp(cur->key, "port")) { + port = cur->value; + if (host != NULL) { + break; + } + } + } + if (host != NULL && port != NULL) { + gpr_asprintf(&address, "%s:%s", host, port); } - gpr_free (buffer); + grpc_json_destroy(json); + } + gpr_free(buffer); return address; } -static void -zookeeper_get_children_node_completion (int rc, const char *value, int value_len, const struct Stat *stat, const void *arg) -{ +static void zookeeper_get_children_node_completion(int rc, const char *value, + int value_len, + const struct Stat *stat, + const void *arg) { char *address = NULL; - zookeeper_resolver *r = (zookeeper_resolver *) arg; + zookeeper_resolver *r = (zookeeper_resolver *)arg; int resolve_done = 0; - if (rc != 0) - { - gpr_log (GPR_ERROR, "Error in getting a child node of %s", r->name); - return; - } + if (rc != 0) { + gpr_log(GPR_ERROR, "Error in getting a child node of %s", r->name); + return; + } - address = zookeeper_parse_address (value, (size_t) value_len); - if (address != NULL) - { + address = zookeeper_parse_address(value, (size_t)value_len); + if (address != NULL) { /** Further resolves address by DNS */ - grpc_resolve_address (address, NULL, zookeeper_dns_resolved, r); - gpr_free (address); - } - else - { - gpr_log (GPR_ERROR, "Error in resolving a child node of %s", r->name); - gpr_mu_lock (&r->mu); - r->resolved_total--; - resolve_done = (r->resolved_num == r->resolved_total); - gpr_mu_unlock (&r->mu); - if (resolve_done) - { - zookeeper_on_resolved (r, r->resolved_addrs); - } + grpc_resolve_address(address, NULL, zookeeper_dns_resolved, r); + gpr_free(address); + } else { + gpr_log(GPR_ERROR, "Error in resolving a child node of %s", r->name); + gpr_mu_lock(&r->mu); + r->resolved_total--; + resolve_done = (r->resolved_num == r->resolved_total); + gpr_mu_unlock(&r->mu); + if (resolve_done) { + zookeeper_on_resolved(r, r->resolved_addrs); } + } } -static void -zookeeper_get_children_completion (int rc, const struct String_vector *children, const void *arg) -{ +static void zookeeper_get_children_completion( + int rc, const struct String_vector *children, const void *arg) { char *path; int status; int i; - zookeeper_resolver *r = (zookeeper_resolver *) arg; + zookeeper_resolver *r = (zookeeper_resolver *)arg; - if (rc != 0) - { - gpr_log (GPR_ERROR, "Error in getting zookeeper children of %s", r->name); - return; - } + if (rc != 0) { + gpr_log(GPR_ERROR, "Error in getting zookeeper children of %s", r->name); + return; + } - if (children->count == 0) - { - gpr_log (GPR_ERROR, "Error in resolving zookeeper address %s", r->name); - return; - } + if (children->count == 0) { + gpr_log(GPR_ERROR, "Error in resolving zookeeper address %s", r->name); + return; + } - r->resolved_addrs = gpr_malloc (sizeof (grpc_resolved_addresses)); + r->resolved_addrs = gpr_malloc(sizeof(grpc_resolved_addresses)); r->resolved_addrs->addrs = NULL; r->resolved_addrs->naddrs = 0; r->resolved_total = children->count; /** TODO: Replace expensive heap allocation with stack if we can get maximum length of zookeeper path */ - for (i = 0; i < children->count; i++) - { - gpr_asprintf (&path, "%s/%s", r->name, children->data[i]); - status = zoo_awget (r->zookeeper_handle, path, zookeeper_watcher, r, zookeeper_get_children_node_completion, r); - gpr_free (path); - if (status != 0) - { - gpr_log (GPR_ERROR, "Error in getting zookeeper node %s", path); - } + for (i = 0; i < children->count; i++) { + gpr_asprintf(&path, "%s/%s", r->name, children->data[i]); + status = zoo_awget(r->zookeeper_handle, path, zookeeper_watcher, r, + zookeeper_get_children_node_completion, r); + gpr_free(path); + if (status != 0) { + gpr_log(GPR_ERROR, "Error in getting zookeeper node %s", path); } + } } -static void -zookeeper_get_node_completion (int rc, const char *value, int value_len, const struct Stat *stat, const void *arg) -{ +static void zookeeper_get_node_completion(int rc, const char *value, + int value_len, + const struct Stat *stat, + const void *arg) { int status; char *address = NULL; - zookeeper_resolver *r = (zookeeper_resolver *) arg; + zookeeper_resolver *r = (zookeeper_resolver *)arg; r->resolved_addrs = NULL; r->resolved_total = 0; r->resolved_num = 0; - if (rc != 0) - { - gpr_log (GPR_ERROR, "Error in getting zookeeper node %s", r->name); - return; - } + if (rc != 0) { + gpr_log(GPR_ERROR, "Error in getting zookeeper node %s", r->name); + return; + } /** If zookeeper node of path r->name does not have address (i.e. service node), get its children */ - address = zookeeper_parse_address (value, (size_t) value_len); - if (address != NULL) - { - r->resolved_addrs = gpr_malloc (sizeof (grpc_resolved_addresses)); - r->resolved_addrs->addrs = NULL; - r->resolved_addrs->naddrs = 0; - r->resolved_total = 1; + address = zookeeper_parse_address(value, (size_t)value_len); + if (address != NULL) { + r->resolved_addrs = gpr_malloc(sizeof(grpc_resolved_addresses)); + r->resolved_addrs->addrs = NULL; + r->resolved_addrs->naddrs = 0; + r->resolved_total = 1; /** Further resolves address by DNS */ - grpc_resolve_address (address, NULL, zookeeper_dns_resolved, r); - gpr_free (address); - return; - } - - status = zoo_awget_children (r->zookeeper_handle, r->name, zookeeper_watcher, r, zookeeper_get_children_completion, r); - if (status != 0) - { - gpr_log (GPR_ERROR, "Error in getting zookeeper children of %s", r->name); - } + grpc_resolve_address(address, NULL, zookeeper_dns_resolved, r); + gpr_free(address); + return; + } + + status = zoo_awget_children(r->zookeeper_handle, r->name, zookeeper_watcher, + r, zookeeper_get_children_completion, r); + if (status != 0) { + gpr_log(GPR_ERROR, "Error in getting zookeeper children of %s", r->name); + } } -static void -zookeeper_resolve_address (zookeeper_resolver * r) -{ +static void zookeeper_resolve_address(zookeeper_resolver *r) { int status; - status = zoo_awget (r->zookeeper_handle, r->name, zookeeper_watcher, r, zookeeper_get_node_completion, r); - if (status != 0) - { - gpr_log (GPR_ERROR, "Error in getting zookeeper node %s", r->name); - } + status = zoo_awget(r->zookeeper_handle, r->name, zookeeper_watcher, r, + zookeeper_get_node_completion, r); + if (status != 0) { + gpr_log(GPR_ERROR, "Error in getting zookeeper node %s", r->name); + } } -static void -zookeeper_start_resolving_locked (zookeeper_resolver * r) -{ - GRPC_RESOLVER_REF (&r->base, "zookeeper-resolving"); - GPR_ASSERT (r->resolving == 0); +static void zookeeper_start_resolving_locked(zookeeper_resolver *r) { + GRPC_RESOLVER_REF(&r->base, "zookeeper-resolving"); + GPR_ASSERT(r->resolving == 0); r->resolving = 1; - zookeeper_resolve_address (r); + zookeeper_resolve_address(r); } -static grpc_closure * -zookeeper_maybe_finish_next_locked (zookeeper_resolver * r) -{ +static grpc_closure *zookeeper_maybe_finish_next_locked(zookeeper_resolver *r) { grpc_closure *call = NULL; - if (r->next_completion != NULL && r->resolved_version != r->published_version) - { - *r->target_config = r->resolved_config; - if (r->resolved_config != NULL) - { - grpc_client_config_ref (r->resolved_config); - } - call = r->next_completion; - r->next_completion = NULL; - r->published_version = r->resolved_version; + if (r->next_completion != NULL && + r->resolved_version != r->published_version) { + *r->target_config = r->resolved_config; + if (r->resolved_config != NULL) { + grpc_client_config_ref(r->resolved_config); } + call = r->next_completion; + r->next_completion = NULL; + r->published_version = r->resolved_version; + } return call; } -static void -zookeeper_destroy (grpc_resolver * gr) -{ - zookeeper_resolver *r = (zookeeper_resolver *) gr; - gpr_mu_destroy (&r->mu); - if (r->resolved_config != NULL) - { - grpc_client_config_unref (r->resolved_config); - } - grpc_subchannel_factory_unref (r->subchannel_factory); - gpr_free (r->name); - gpr_free (r->lb_policy_name); - gpr_free (r); +static void zookeeper_destroy(grpc_resolver *gr) { + zookeeper_resolver *r = (zookeeper_resolver *)gr; + gpr_mu_destroy(&r->mu); + if (r->resolved_config != NULL) { + grpc_client_config_unref(r->resolved_config); + } + grpc_subchannel_factory_unref(r->subchannel_factory); + gpr_free(r->name); + gpr_free(r->lb_policy_name); + gpr_free(r); } -static grpc_resolver * -zookeeper_create (grpc_resolver_args * args, const char *lb_policy_name) -{ +static grpc_resolver *zookeeper_create(grpc_resolver_args *args, + const char *lb_policy_name) { zookeeper_resolver *r; size_t length; char *path = args->uri->path; - if (0 == strcmp (args->uri->authority, "")) - { - gpr_log (GPR_ERROR, "No authority specified in zookeeper uri"); - return NULL; - } + if (0 == strcmp(args->uri->authority, "")) { + gpr_log(GPR_ERROR, "No authority specified in zookeeper uri"); + return NULL; + } /** Removes the trailing slash if exists */ - length = strlen (path); - if (length > 1 && path[length - 1] == '/') - { - path[length - 1] = 0; - } - - r = gpr_malloc (sizeof (zookeeper_resolver)); - memset (r, 0, sizeof (*r)); - gpr_ref_init (&r->refs, 1); - gpr_mu_init (&r->mu); - grpc_resolver_init (&r->base, &zookeeper_resolver_vtable); - r->name = gpr_strdup (path); + length = strlen(path); + if (length > 1 && path[length - 1] == '/') { + path[length - 1] = 0; + } + + r = gpr_malloc(sizeof(zookeeper_resolver)); + memset(r, 0, sizeof(*r)); + gpr_ref_init(&r->refs, 1); + gpr_mu_init(&r->mu); + grpc_resolver_init(&r->base, &zookeeper_resolver_vtable); + r->name = gpr_strdup(path); r->subchannel_factory = args->subchannel_factory; - grpc_subchannel_factory_ref (r->subchannel_factory); + grpc_subchannel_factory_ref(r->subchannel_factory); - r->lb_policy_name = gpr_strdup (lb_policy_name); + r->lb_policy_name = gpr_strdup(lb_policy_name); /** Initializes zookeeper client */ - zoo_set_debug_level (ZOO_LOG_LEVEL_WARN); - r->zookeeper_handle = zookeeper_init (args->uri->authority, zookeeper_global_watcher, GRPC_ZOOKEEPER_SESSION_TIMEOUT, 0, 0, 0); - if (r->zookeeper_handle == NULL) - { - gpr_log (GPR_ERROR, "Unable to connect to zookeeper server"); - return NULL; - } + zoo_set_debug_level(ZOO_LOG_LEVEL_WARN); + r->zookeeper_handle = + zookeeper_init(args->uri->authority, zookeeper_global_watcher, + GRPC_ZOOKEEPER_SESSION_TIMEOUT, 0, 0, 0); + if (r->zookeeper_handle == NULL) { + gpr_log(GPR_ERROR, "Unable to connect to zookeeper server"); + return NULL; + } return &r->base; } -static void -zookeeper_plugin_init () -{ - grpc_register_resolver_type (grpc_zookeeper_resolver_factory_create ()); +static void zookeeper_plugin_init() { + grpc_register_resolver_type(grpc_zookeeper_resolver_factory_create()); } -void -grpc_zookeeper_register () -{ - grpc_register_plugin (zookeeper_plugin_init, NULL); +void grpc_zookeeper_register() { + grpc_register_plugin(zookeeper_plugin_init, NULL); } /* * FACTORY */ -static void -zookeeper_factory_ref (grpc_resolver_factory * factory) -{ -} +static void zookeeper_factory_ref(grpc_resolver_factory *factory) {} -static void -zookeeper_factory_unref (grpc_resolver_factory * factory) -{ -} +static void zookeeper_factory_unref(grpc_resolver_factory *factory) {} -static char * -zookeeper_factory_get_default_hostname (grpc_resolver_factory * factory, grpc_uri * uri) -{ +static char *zookeeper_factory_get_default_hostname( + grpc_resolver_factory *factory, grpc_uri *uri) { return NULL; } -static grpc_resolver * -zookeeper_factory_create_resolver (grpc_resolver_factory * factory, grpc_resolver_args * args) -{ - return zookeeper_create (args, "pick_first"); +static grpc_resolver *zookeeper_factory_create_resolver( + grpc_resolver_factory *factory, grpc_resolver_args *args) { + return zookeeper_create(args, "pick_first"); } static const grpc_resolver_factory_vtable zookeeper_factory_vtable = { - zookeeper_factory_ref, zookeeper_factory_unref, - zookeeper_factory_create_resolver, zookeeper_factory_get_default_hostname, - "zookeeper" -}; + zookeeper_factory_ref, zookeeper_factory_unref, + zookeeper_factory_create_resolver, zookeeper_factory_get_default_hostname, + "zookeeper"}; static grpc_resolver_factory zookeeper_resolver_factory = { - &zookeeper_factory_vtable -}; + &zookeeper_factory_vtable}; -grpc_resolver_factory * -grpc_zookeeper_resolver_factory_create () -{ +grpc_resolver_factory *grpc_zookeeper_resolver_factory_create() { return &zookeeper_resolver_factory; } diff --git a/src/core/client_config/resolvers/zookeeper_resolver.h b/src/core/client_config/resolvers/zookeeper_resolver.h index 86b4480b15b..a6f002dd6d4 100644 --- a/src/core/client_config/resolvers/zookeeper_resolver.h +++ b/src/core/client_config/resolvers/zookeeper_resolver.h @@ -37,6 +37,6 @@ #include "src/core/client_config/resolver_factory.h" /** Create a zookeeper resolver factory */ -grpc_resolver_factory *grpc_zookeeper_resolver_factory_create (void); +grpc_resolver_factory *grpc_zookeeper_resolver_factory_create(void); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_RESOLVERS_ZOOKEEPER_RESOLVER_H */ diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index 8058c9508b4..c7dfba9a4b1 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -50,8 +50,7 @@ #define GRPC_SUBCHANNEL_RECONNECT_MAX_BACKOFF_SECONDS 120 #define GRPC_SUBCHANNEL_RECONNECT_JITTER 0.2 -typedef struct -{ +typedef struct { /* all fields protected by subchannel->mu */ /** refcount */ int refs; @@ -59,16 +58,14 @@ typedef struct grpc_subchannel *subchannel; } connection; -typedef struct -{ +typedef struct { grpc_closure closure; size_t version; grpc_subchannel *subchannel; grpc_connectivity_state connectivity_state; } state_watcher; -typedef struct waiting_for_connect -{ +typedef struct waiting_for_connect { struct waiting_for_connect *next; grpc_closure *notify; grpc_pollset *pollset; @@ -77,8 +74,7 @@ typedef struct waiting_for_connect grpc_closure continuation; } waiting_for_connect; -struct grpc_subchannel -{ +struct grpc_subchannel { grpc_connector *connector; /** non-transport related channel filters */ @@ -139,8 +135,7 @@ struct grpc_subchannel gpr_uint32 random; }; -struct grpc_subchannel_call -{ +struct grpc_subchannel_call { connection *connection; gpr_refcount refs; }; @@ -148,19 +143,25 @@ struct grpc_subchannel_call #define SUBCHANNEL_CALL_TO_CALL_STACK(call) ((grpc_call_stack *)((call) + 1)) #define CHANNEL_STACK_FROM_CONNECTION(con) ((grpc_channel_stack *)((con) + 1)) -static grpc_subchannel_call *create_call (grpc_exec_ctx * exec_ctx, connection * con); -static void connectivity_state_changed_locked (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, const char *reason); -static grpc_connectivity_state compute_connectivity_locked (grpc_subchannel * c); -static gpr_timespec compute_connect_deadline (grpc_subchannel * c); -static void subchannel_connected (grpc_exec_ctx * exec_ctx, void *subchannel, int iomgr_success); - -static void subchannel_ref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -static int -subchannel_unref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) - GRPC_MUST_USE_RESULT; - static void connection_ref_locked (connection * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); - static grpc_subchannel *connection_unref_locked (grpc_exec_ctx *exec_ctx, connection * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; - static void subchannel_destroy (grpc_exec_ctx * exec_ctx, grpc_subchannel * c); +static grpc_subchannel_call *create_call(grpc_exec_ctx *exec_ctx, + connection *con); +static void connectivity_state_changed_locked(grpc_exec_ctx *exec_ctx, + grpc_subchannel *c, + const char *reason); +static grpc_connectivity_state compute_connectivity_locked(grpc_subchannel *c); +static gpr_timespec compute_connect_deadline(grpc_subchannel *c); +static void subchannel_connected(grpc_exec_ctx *exec_ctx, void *subchannel, + int iomgr_success); + +static void subchannel_ref_locked( + grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +static int subchannel_unref_locked( + grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; +static void connection_ref_locked(connection *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +static grpc_subchannel *connection_unref_locked( + grpc_exec_ctx *exec_ctx, + connection *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) GRPC_MUST_USE_RESULT; +static void subchannel_destroy(grpc_exec_ctx *exec_ctx, grpc_subchannel *c); #ifdef GRPC_SUBCHANNEL_REFCOUNT_DEBUG #define SUBCHANNEL_REF_LOCKED(p, r) \ @@ -196,34 +197,29 @@ subchannel_unref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) * connection implementation */ - static void connection_destroy (grpc_exec_ctx * exec_ctx, connection * c) -{ - GPR_ASSERT (c->refs == 0); - grpc_channel_stack_destroy (exec_ctx, CHANNEL_STACK_FROM_CONNECTION (c)); - gpr_free (c); +static void connection_destroy(grpc_exec_ctx *exec_ctx, connection *c) { + GPR_ASSERT(c->refs == 0); + grpc_channel_stack_destroy(exec_ctx, CHANNEL_STACK_FROM_CONNECTION(c)); + gpr_free(c); } -static void -connection_ref_locked (connection * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) -{ - REF_LOG ("CONNECTION", c); - subchannel_ref_locked (c->subchannel REF_PASS_ARGS); +static void connection_ref_locked( + connection *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { + REF_LOG("CONNECTION", c); + subchannel_ref_locked(c->subchannel REF_PASS_ARGS); ++c->refs; } -static grpc_subchannel * -connection_unref_locked (grpc_exec_ctx *exec_ctx, connection * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) -{ +static grpc_subchannel *connection_unref_locked( + grpc_exec_ctx *exec_ctx, connection *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { grpc_subchannel *destroy = NULL; - UNREF_LOG ("CONNECTION", c); - if (subchannel_unref_locked (c->subchannel REF_PASS_ARGS)) - { - destroy = c->subchannel; - } - if (--c->refs == 0 && c->subchannel->active != c) - { - connection_destroy (exec_ctx, c); - } + UNREF_LOG("CONNECTION", c); + if (subchannel_unref_locked(c->subchannel REF_PASS_ARGS)) { + destroy = c->subchannel; + } + if (--c->refs == 0 && c->subchannel->active != c) { + connection_destroy(exec_ctx, c); + } return destroy; } @@ -231,261 +227,237 @@ connection_unref_locked (grpc_exec_ctx *exec_ctx, connection * c GRPC_SUBCHANNEL * grpc_subchannel implementation */ -static void -subchannel_ref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) -{ - REF_LOG ("SUBCHANNEL", c); +static void subchannel_ref_locked( + grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { + REF_LOG("SUBCHANNEL", c); ++c->refs; } -static int -subchannel_unref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) -{ - UNREF_LOG ("SUBCHANNEL", c); +static int subchannel_unref_locked( + grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { + UNREF_LOG("SUBCHANNEL", c); return --c->refs == 0; } -void -grpc_subchannel_ref (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) -{ - gpr_mu_lock (&c->mu); - subchannel_ref_locked (c REF_PASS_ARGS); - gpr_mu_unlock (&c->mu); +void grpc_subchannel_ref(grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { + gpr_mu_lock(&c->mu); + subchannel_ref_locked(c REF_PASS_ARGS); + 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_exec_ctx *exec_ctx, + grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { int destroy; - gpr_mu_lock (&c->mu); - destroy = subchannel_unref_locked (c REF_PASS_ARGS); - gpr_mu_unlock (&c->mu); - if (destroy) - subchannel_destroy (exec_ctx, c); -} - -static void -subchannel_destroy (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) -{ - if (c->active != NULL) - { - connection_destroy (exec_ctx, c->active); - } - gpr_free (c->filters); - grpc_channel_args_destroy (c->args); - gpr_free (c->addr); - grpc_mdctx_unref (c->mdctx); - grpc_connectivity_state_destroy (exec_ctx, &c->state_tracker); - grpc_connector_unref (exec_ctx, c->connector); - gpr_free (c); + gpr_mu_lock(&c->mu); + destroy = subchannel_unref_locked(c REF_PASS_ARGS); + gpr_mu_unlock(&c->mu); + if (destroy) subchannel_destroy(exec_ctx, c); +} + +static void subchannel_destroy(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { + if (c->active != NULL) { + connection_destroy(exec_ctx, c->active); + } + gpr_free(c->filters); + grpc_channel_args_destroy(c->args); + gpr_free(c->addr); + grpc_mdctx_unref(c->mdctx); + grpc_connectivity_state_destroy(exec_ctx, &c->state_tracker); + grpc_connector_unref(exec_ctx, c->connector); + gpr_free(c); } -void -grpc_subchannel_add_interested_party (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc_pollset * pollset) -{ - grpc_pollset_set_add_pollset (exec_ctx, c->pollset_set, pollset); +void grpc_subchannel_add_interested_party(grpc_exec_ctx *exec_ctx, + grpc_subchannel *c, + grpc_pollset *pollset) { + grpc_pollset_set_add_pollset(exec_ctx, c->pollset_set, pollset); } -void -grpc_subchannel_del_interested_party (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc_pollset * pollset) -{ - grpc_pollset_set_del_pollset (exec_ctx, c->pollset_set, pollset); +void grpc_subchannel_del_interested_party(grpc_exec_ctx *exec_ctx, + grpc_subchannel *c, + grpc_pollset *pollset) { + grpc_pollset_set_del_pollset(exec_ctx, c->pollset_set, pollset); } -static gpr_uint32 -random_seed () -{ - return (gpr_uint32) (gpr_time_to_millis (gpr_now (GPR_CLOCK_MONOTONIC))); +static gpr_uint32 random_seed() { + return (gpr_uint32)(gpr_time_to_millis(gpr_now(GPR_CLOCK_MONOTONIC))); } -grpc_subchannel * -grpc_subchannel_create (grpc_connector * connector, grpc_subchannel_args * args) -{ - grpc_subchannel *c = gpr_malloc (sizeof (*c)); - grpc_channel_element *parent_elem = grpc_channel_stack_last_element (grpc_channel_get_channel_stack (args->master)); - memset (c, 0, sizeof (*c)); +grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, + grpc_subchannel_args *args) { + grpc_subchannel *c = gpr_malloc(sizeof(*c)); + grpc_channel_element *parent_elem = grpc_channel_stack_last_element( + grpc_channel_get_channel_stack(args->master)); + memset(c, 0, sizeof(*c)); c->refs = 1; c->connector = connector; - grpc_connector_ref (c->connector); + grpc_connector_ref(c->connector); c->num_filters = args->filter_count; - c->filters = gpr_malloc (sizeof (grpc_channel_filter *) * c->num_filters); - memcpy (c->filters, args->filters, sizeof (grpc_channel_filter *) * c->num_filters); - c->addr = gpr_malloc (args->addr_len); - memcpy (c->addr, args->addr, args->addr_len); + c->filters = gpr_malloc(sizeof(grpc_channel_filter *) * c->num_filters); + memcpy(c->filters, args->filters, + sizeof(grpc_channel_filter *) * c->num_filters); + c->addr = gpr_malloc(args->addr_len); + memcpy(c->addr, args->addr, args->addr_len); c->addr_len = args->addr_len; - c->args = grpc_channel_args_copy (args->args); + c->args = grpc_channel_args_copy(args->args); c->mdctx = args->mdctx; c->master = args->master; - c->pollset_set = grpc_client_channel_get_connecting_pollset_set (parent_elem); - c->random = random_seed (); - grpc_mdctx_ref (c->mdctx); - grpc_closure_init (&c->connected, subchannel_connected, c); - grpc_connectivity_state_init (&c->state_tracker, GRPC_CHANNEL_IDLE, "subchannel"); - gpr_mu_init (&c->mu); + c->pollset_set = grpc_client_channel_get_connecting_pollset_set(parent_elem); + c->random = random_seed(); + grpc_mdctx_ref(c->mdctx); + grpc_closure_init(&c->connected, subchannel_connected, c); + grpc_connectivity_state_init(&c->state_tracker, GRPC_CHANNEL_IDLE, + "subchannel"); + gpr_mu_init(&c->mu); return c; } -static void -continue_connect (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) -{ +static void continue_connect(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { grpc_connect_in_args args; args.interested_parties = c->pollset_set; args.addr = c->addr; args.addr_len = c->addr_len; - args.deadline = compute_connect_deadline (c); + args.deadline = compute_connect_deadline(c); args.channel_args = c->args; - grpc_connector_connect (exec_ctx, c->connector, &args, &c->connecting_result, &c->connected); + grpc_connector_connect(exec_ctx, c->connector, &args, &c->connecting_result, + &c->connected); } -static void -start_connect (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) -{ - c->backoff_delta = gpr_time_from_seconds (GRPC_SUBCHANNEL_INITIAL_CONNECT_BACKOFF_SECONDS, GPR_TIMESPAN); - c->next_attempt = gpr_time_add (gpr_now (GPR_CLOCK_MONOTONIC), c->backoff_delta); - continue_connect (exec_ctx, c); +static void start_connect(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { + c->backoff_delta = gpr_time_from_seconds( + GRPC_SUBCHANNEL_INITIAL_CONNECT_BACKOFF_SECONDS, GPR_TIMESPAN); + c->next_attempt = + gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), c->backoff_delta); + continue_connect(exec_ctx, c); } -static void -continue_creating_call (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) -{ +static void continue_creating_call(grpc_exec_ctx *exec_ctx, void *arg, + int iomgr_success) { waiting_for_connect *w4c = arg; - grpc_subchannel_del_interested_party (exec_ctx, w4c->subchannel, w4c->pollset); - grpc_subchannel_create_call (exec_ctx, w4c->subchannel, w4c->pollset, w4c->target, w4c->notify); - GRPC_SUBCHANNEL_UNREF (exec_ctx, w4c->subchannel, "waiting_for_connect"); - gpr_free (w4c); + grpc_subchannel_del_interested_party(exec_ctx, w4c->subchannel, w4c->pollset); + grpc_subchannel_create_call(exec_ctx, w4c->subchannel, w4c->pollset, + w4c->target, w4c->notify); + GRPC_SUBCHANNEL_UNREF(exec_ctx, w4c->subchannel, "waiting_for_connect"); + gpr_free(w4c); } -void -grpc_subchannel_create_call (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc_pollset * pollset, grpc_subchannel_call ** target, grpc_closure * notify) -{ +void grpc_subchannel_create_call(grpc_exec_ctx *exec_ctx, grpc_subchannel *c, + grpc_pollset *pollset, + grpc_subchannel_call **target, + grpc_closure *notify) { connection *con; - gpr_mu_lock (&c->mu); - if (c->active != NULL) - { - con = c->active; - CONNECTION_REF_LOCKED (con, "call"); - gpr_mu_unlock (&c->mu); - - *target = create_call (exec_ctx, con); - notify->cb (exec_ctx, notify->cb_arg, 1); - } - else - { - waiting_for_connect *w4c = gpr_malloc (sizeof (*w4c)); - w4c->next = c->waiting; - w4c->notify = notify; - w4c->pollset = pollset; - w4c->target = target; - w4c->subchannel = c; - /* released when clearing w4c */ - SUBCHANNEL_REF_LOCKED (c, "waiting_for_connect"); - grpc_closure_init (&w4c->continuation, continue_creating_call, w4c); - c->waiting = w4c; - grpc_subchannel_add_interested_party (exec_ctx, c, pollset); - if (!c->connecting) - { - c->connecting = 1; - connectivity_state_changed_locked (exec_ctx, c, "create_call"); - /* released by connection */ - SUBCHANNEL_REF_LOCKED (c, "connecting"); - GRPC_CHANNEL_INTERNAL_REF (c->master, "connecting"); - gpr_mu_unlock (&c->mu); - - start_connect (exec_ctx, c); - } - else - { - gpr_mu_unlock (&c->mu); - } + gpr_mu_lock(&c->mu); + if (c->active != NULL) { + con = c->active; + CONNECTION_REF_LOCKED(con, "call"); + gpr_mu_unlock(&c->mu); + + *target = create_call(exec_ctx, con); + notify->cb(exec_ctx, notify->cb_arg, 1); + } else { + waiting_for_connect *w4c = gpr_malloc(sizeof(*w4c)); + w4c->next = c->waiting; + w4c->notify = notify; + w4c->pollset = pollset; + w4c->target = target; + w4c->subchannel = c; + /* released when clearing w4c */ + SUBCHANNEL_REF_LOCKED(c, "waiting_for_connect"); + grpc_closure_init(&w4c->continuation, continue_creating_call, w4c); + c->waiting = w4c; + grpc_subchannel_add_interested_party(exec_ctx, c, pollset); + if (!c->connecting) { + c->connecting = 1; + connectivity_state_changed_locked(exec_ctx, c, "create_call"); + /* released by connection */ + SUBCHANNEL_REF_LOCKED(c, "connecting"); + GRPC_CHANNEL_INTERNAL_REF(c->master, "connecting"); + gpr_mu_unlock(&c->mu); + + start_connect(exec_ctx, c); + } else { + gpr_mu_unlock(&c->mu); } + } } -grpc_connectivity_state -grpc_subchannel_check_connectivity (grpc_subchannel * c) -{ +grpc_connectivity_state grpc_subchannel_check_connectivity(grpc_subchannel *c) { grpc_connectivity_state state; - gpr_mu_lock (&c->mu); - state = grpc_connectivity_state_check (&c->state_tracker); - gpr_mu_unlock (&c->mu); + gpr_mu_lock(&c->mu); + state = grpc_connectivity_state_check(&c->state_tracker); + gpr_mu_unlock(&c->mu); return state; } -void -grpc_subchannel_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc_connectivity_state * state, grpc_closure * notify) -{ +void grpc_subchannel_notify_on_state_change(grpc_exec_ctx *exec_ctx, + grpc_subchannel *c, + grpc_connectivity_state *state, + grpc_closure *notify) { int do_connect = 0; - gpr_mu_lock (&c->mu); - if (grpc_connectivity_state_notify_on_state_change (exec_ctx, &c->state_tracker, state, notify)) - { - do_connect = 1; - c->connecting = 1; - /* released by connection */ - SUBCHANNEL_REF_LOCKED (c, "connecting"); - GRPC_CHANNEL_INTERNAL_REF (c->master, "connecting"); - connectivity_state_changed_locked (exec_ctx, c, "state_change"); - } - gpr_mu_unlock (&c->mu); - - if (do_connect) - { - start_connect (exec_ctx, c); - } -} - -void -grpc_subchannel_process_transport_op (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc_transport_op * op) -{ + gpr_mu_lock(&c->mu); + if (grpc_connectivity_state_notify_on_state_change( + exec_ctx, &c->state_tracker, state, notify)) { + do_connect = 1; + c->connecting = 1; + /* released by connection */ + SUBCHANNEL_REF_LOCKED(c, "connecting"); + GRPC_CHANNEL_INTERNAL_REF(c->master, "connecting"); + connectivity_state_changed_locked(exec_ctx, c, "state_change"); + } + gpr_mu_unlock(&c->mu); + + if (do_connect) { + start_connect(exec_ctx, c); + } +} + +void grpc_subchannel_process_transport_op(grpc_exec_ctx *exec_ctx, + grpc_subchannel *c, + grpc_transport_op *op) { connection *con = NULL; grpc_subchannel *destroy; int cancel_alarm = 0; - gpr_mu_lock (&c->mu); - if (c->active != NULL) - { - con = c->active; - CONNECTION_REF_LOCKED (con, "transport-op"); - } - if (op->disconnect) - { - c->disconnected = 1; - connectivity_state_changed_locked (exec_ctx, c, "disconnect"); - if (c->have_alarm) - { - cancel_alarm = 1; - } + gpr_mu_lock(&c->mu); + if (c->active != NULL) { + con = c->active; + CONNECTION_REF_LOCKED(con, "transport-op"); + } + if (op->disconnect) { + c->disconnected = 1; + connectivity_state_changed_locked(exec_ctx, c, "disconnect"); + if (c->have_alarm) { + cancel_alarm = 1; } - gpr_mu_unlock (&c->mu); - - if (con != NULL) - { - 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); - - gpr_mu_lock (&c->mu); - destroy = CONNECTION_UNREF_LOCKED (exec_ctx, con, "transport-op"); - gpr_mu_unlock (&c->mu); - if (destroy) - { - subchannel_destroy (exec_ctx, destroy); - } + } + gpr_mu_unlock(&c->mu); + + if (con != NULL) { + 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); + + gpr_mu_lock(&c->mu); + destroy = CONNECTION_UNREF_LOCKED(exec_ctx, con, "transport-op"); + gpr_mu_unlock(&c->mu); + if (destroy) { + subchannel_destroy(exec_ctx, destroy); } + } - if (cancel_alarm) - { - grpc_alarm_cancel (exec_ctx, &c->alarm); - } + if (cancel_alarm) { + grpc_alarm_cancel(exec_ctx, &c->alarm); + } - if (op->disconnect) - { - grpc_connector_shutdown (exec_ctx, c->connector); - } + if (op->disconnect) { + grpc_connector_shutdown(exec_ctx, c->connector); + } } -static void -on_state_changed (grpc_exec_ctx * exec_ctx, void *p, int iomgr_success) -{ +static void on_state_changed(grpc_exec_ctx *exec_ctx, void *p, + int iomgr_success) { state_watcher *sw = p; grpc_subchannel *c = sw->subchannel; gpr_mu *mu = &c->mu; @@ -494,59 +466,57 @@ on_state_changed (grpc_exec_ctx * exec_ctx, void *p, int iomgr_success) grpc_channel_element *elem; connection *destroy_connection = NULL; - gpr_mu_lock (mu); + gpr_mu_lock(mu); /* if we failed or there is a version number mismatch, just leave this closure */ - if (!iomgr_success || sw->subchannel->active_version != sw->version) - { - goto done; - } + if (!iomgr_success || sw->subchannel->active_version != sw->version) { + goto done; + } - switch (sw->connectivity_state) - { + switch (sw->connectivity_state) { case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_READY: case GRPC_CHANNEL_IDLE: /* all is still good: keep watching */ - memset (&op, 0, sizeof (op)); + memset(&op, 0, sizeof(op)); op.connectivity_state = &sw->connectivity_state; op.on_connectivity_state_change = &sw->closure; - elem = grpc_channel_stack_element (CHANNEL_STACK_FROM_CONNECTION (c->active), 0); - elem->filter->start_transport_op (exec_ctx, elem, &op); + elem = grpc_channel_stack_element( + CHANNEL_STACK_FROM_CONNECTION(c->active), 0); + elem->filter->start_transport_op(exec_ctx, elem, &op); /* early out */ - gpr_mu_unlock (mu); + gpr_mu_unlock(mu); return; case GRPC_CHANNEL_FATAL_FAILURE: case GRPC_CHANNEL_TRANSIENT_FAILURE: /* things have gone wrong, deactivate and enter idle */ - if (sw->subchannel->active->refs == 0) - { - destroy_connection = sw->subchannel->active; - } + if (sw->subchannel->active->refs == 0) { + destroy_connection = sw->subchannel->active; + } sw->subchannel->active = NULL; - grpc_connectivity_state_set (exec_ctx, &c->state_tracker, c->disconnected ? GRPC_CHANNEL_FATAL_FAILURE : GRPC_CHANNEL_TRANSIENT_FAILURE, "connection_failed"); + grpc_connectivity_state_set(exec_ctx, &c->state_tracker, + c->disconnected + ? GRPC_CHANNEL_FATAL_FAILURE + : GRPC_CHANNEL_TRANSIENT_FAILURE, + "connection_failed"); break; - } + } done: - connectivity_state_changed_locked (exec_ctx, c, "transport_state_changed"); - destroy = SUBCHANNEL_UNREF_LOCKED (c, "state_watcher"); - gpr_free (sw); - gpr_mu_unlock (mu); - if (destroy) - { - subchannel_destroy (exec_ctx, c); - } - if (destroy_connection != NULL) - { - connection_destroy (exec_ctx, destroy_connection); - } -} - -static void -publish_transport (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) -{ + connectivity_state_changed_locked(exec_ctx, c, "transport_state_changed"); + destroy = SUBCHANNEL_UNREF_LOCKED(c, "state_watcher"); + gpr_free(sw); + gpr_mu_unlock(mu); + if (destroy) { + subchannel_destroy(exec_ctx, c); + } + if (destroy_connection != NULL) { + connection_destroy(exec_ctx, destroy_connection); + } +} + +static void publish_transport(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { size_t channel_stack_size; connection *con; grpc_channel_stack *stk; @@ -560,46 +530,46 @@ publish_transport (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) /* build final filter list */ num_filters = c->num_filters + c->connecting_result.num_filters + 1; - filters = gpr_malloc (sizeof (*filters) * num_filters); - memcpy (filters, c->filters, sizeof (*filters) * c->num_filters); - memcpy (filters + c->num_filters, c->connecting_result.filters, sizeof (*filters) * c->connecting_result.num_filters); + filters = gpr_malloc(sizeof(*filters) * num_filters); + memcpy(filters, c->filters, sizeof(*filters) * c->num_filters); + memcpy(filters + c->num_filters, c->connecting_result.filters, + sizeof(*filters) * c->connecting_result.num_filters); filters[num_filters - 1] = &grpc_connected_channel_filter; /* construct channel stack */ - channel_stack_size = grpc_channel_stack_size (filters, num_filters); - con = gpr_malloc (sizeof (connection) + channel_stack_size); - stk = (grpc_channel_stack *) (con + 1); + channel_stack_size = grpc_channel_stack_size(filters, num_filters); + con = gpr_malloc(sizeof(connection) + channel_stack_size); + stk = (grpc_channel_stack *)(con + 1); con->refs = 0; con->subchannel = c; - grpc_channel_stack_init (exec_ctx, filters, num_filters, c->master, c->args, c->mdctx, stk); - grpc_connected_channel_bind_transport (stk, c->connecting_result.transport); - gpr_free (c->connecting_result.filters); - memset (&c->connecting_result, 0, sizeof (c->connecting_result)); + grpc_channel_stack_init(exec_ctx, filters, num_filters, c->master, c->args, + c->mdctx, stk); + grpc_connected_channel_bind_transport(stk, c->connecting_result.transport); + gpr_free(c->connecting_result.filters); + memset(&c->connecting_result, 0, sizeof(c->connecting_result)); /* initialize state watcher */ - sw = gpr_malloc (sizeof (*sw)); - grpc_closure_init (&sw->closure, on_state_changed, sw); + sw = gpr_malloc(sizeof(*sw)); + grpc_closure_init(&sw->closure, on_state_changed, sw); sw->subchannel = c; sw->connectivity_state = GRPC_CHANNEL_READY; - gpr_mu_lock (&c->mu); + gpr_mu_lock(&c->mu); - if (c->disconnected) - { - gpr_mu_unlock (&c->mu); - gpr_free (sw); - gpr_free (filters); - grpc_channel_stack_destroy (exec_ctx, stk); - GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, c->master, "connecting"); - GRPC_SUBCHANNEL_UNREF (exec_ctx, c, "connecting"); - return; - } + if (c->disconnected) { + gpr_mu_unlock(&c->mu); + gpr_free(sw); + gpr_free(filters); + grpc_channel_stack_destroy(exec_ctx, stk); + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, c->master, "connecting"); + GRPC_SUBCHANNEL_UNREF(exec_ctx, c, "connecting"); + return; + } /* publish */ - if (c->active != NULL && c->active->refs == 0) - { - destroy_connection = c->active; - } + if (c->active != NULL && c->active->refs == 0) { + destroy_connection = c->active; + } c->active = con; c->active_version++; sw->version = c->active_version; @@ -607,202 +577,183 @@ publish_transport (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) /* watch for changes; subchannel ref for connecting is donated to the state watcher */ - memset (&op, 0, sizeof (op)); + memset(&op, 0, sizeof(op)); op.connectivity_state = &sw->connectivity_state; op.on_connectivity_state_change = &sw->closure; op.bind_pollset_set = c->pollset_set; - SUBCHANNEL_REF_LOCKED (c, "state_watcher"); - GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, c->master, "connecting"); - GPR_ASSERT (!SUBCHANNEL_UNREF_LOCKED (c, "connecting")); - elem = grpc_channel_stack_element (CHANNEL_STACK_FROM_CONNECTION (c->active), 0); - elem->filter->start_transport_op (exec_ctx, elem, &op); + SUBCHANNEL_REF_LOCKED(c, "state_watcher"); + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, c->master, "connecting"); + GPR_ASSERT(!SUBCHANNEL_UNREF_LOCKED(c, "connecting")); + elem = + grpc_channel_stack_element(CHANNEL_STACK_FROM_CONNECTION(c->active), 0); + elem->filter->start_transport_op(exec_ctx, elem, &op); /* signal completion */ - connectivity_state_changed_locked (exec_ctx, c, "connected"); + connectivity_state_changed_locked(exec_ctx, c, "connected"); w4c = c->waiting; c->waiting = NULL; - gpr_mu_unlock (&c->mu); + gpr_mu_unlock(&c->mu); - while (w4c != NULL) - { - waiting_for_connect *next = w4c->next; - grpc_exec_ctx_enqueue (exec_ctx, &w4c->continuation, 1); - w4c = next; - } + while (w4c != NULL) { + waiting_for_connect *next = w4c->next; + grpc_exec_ctx_enqueue(exec_ctx, &w4c->continuation, 1); + w4c = next; + } - gpr_free (filters); + gpr_free(filters); - if (destroy_connection != NULL) - { - connection_destroy (exec_ctx, destroy_connection); - } + if (destroy_connection != NULL) { + connection_destroy(exec_ctx, destroy_connection); + } } /* Generate a random number between 0 and 1. */ -static double -generate_uniform_random_number (grpc_subchannel * c) -{ - c->random = (1103515245 * c->random + 12345) % ((gpr_uint32) 1 << 31); - return c->random / (double) ((gpr_uint32) 1 << 31); +static double generate_uniform_random_number(grpc_subchannel *c) { + c->random = (1103515245 * c->random + 12345) % ((gpr_uint32)1 << 31); + return c->random / (double)((gpr_uint32)1 << 31); } /* Update backoff_delta and next_attempt in subchannel */ -static void -update_reconnect_parameters (grpc_subchannel * c) -{ +static void update_reconnect_parameters(grpc_subchannel *c) { gpr_int32 backoff_delta_millis, jitter; - gpr_int32 max_backoff_millis = GRPC_SUBCHANNEL_RECONNECT_MAX_BACKOFF_SECONDS * 1000; + gpr_int32 max_backoff_millis = + GRPC_SUBCHANNEL_RECONNECT_MAX_BACKOFF_SECONDS * 1000; double jitter_range; - backoff_delta_millis = (gpr_int32) (gpr_time_to_millis (c->backoff_delta) * GRPC_SUBCHANNEL_RECONNECT_BACKOFF_MULTIPLIER); - if (backoff_delta_millis > max_backoff_millis) - { - backoff_delta_millis = max_backoff_millis; - } - c->backoff_delta = gpr_time_from_millis (backoff_delta_millis, GPR_TIMESPAN); - c->next_attempt = gpr_time_add (gpr_now (GPR_CLOCK_MONOTONIC), c->backoff_delta); + backoff_delta_millis = + (gpr_int32)(gpr_time_to_millis(c->backoff_delta) * + GRPC_SUBCHANNEL_RECONNECT_BACKOFF_MULTIPLIER); + if (backoff_delta_millis > max_backoff_millis) { + backoff_delta_millis = max_backoff_millis; + } + c->backoff_delta = gpr_time_from_millis(backoff_delta_millis, GPR_TIMESPAN); + c->next_attempt = + gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), c->backoff_delta); jitter_range = GRPC_SUBCHANNEL_RECONNECT_JITTER * backoff_delta_millis; - jitter = (gpr_int32) ((2 * generate_uniform_random_number (c) - 1) * jitter_range); - c->next_attempt = gpr_time_add (c->next_attempt, gpr_time_from_millis (jitter, GPR_TIMESPAN)); + jitter = + (gpr_int32)((2 * generate_uniform_random_number(c) - 1) * jitter_range); + c->next_attempt = + gpr_time_add(c->next_attempt, gpr_time_from_millis(jitter, GPR_TIMESPAN)); } -static void -on_alarm (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) -{ +static void on_alarm(grpc_exec_ctx *exec_ctx, void *arg, int iomgr_success) { grpc_subchannel *c = arg; - gpr_mu_lock (&c->mu); + gpr_mu_lock(&c->mu); c->have_alarm = 0; - if (c->disconnected) - { - iomgr_success = 0; - } - connectivity_state_changed_locked (exec_ctx, c, "alarm"); - gpr_mu_unlock (&c->mu); - if (iomgr_success) - { - update_reconnect_parameters (c); - continue_connect (exec_ctx, c); - } - else - { - GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, c->master, "connecting"); - GRPC_SUBCHANNEL_UNREF (exec_ctx, c, "connecting"); - } -} - -static void -subchannel_connected (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) -{ + if (c->disconnected) { + iomgr_success = 0; + } + connectivity_state_changed_locked(exec_ctx, c, "alarm"); + gpr_mu_unlock(&c->mu); + if (iomgr_success) { + update_reconnect_parameters(c); + continue_connect(exec_ctx, c); + } else { + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, c->master, "connecting"); + GRPC_SUBCHANNEL_UNREF(exec_ctx, c, "connecting"); + } +} + +static void subchannel_connected(grpc_exec_ctx *exec_ctx, void *arg, + int iomgr_success) { grpc_subchannel *c = arg; - if (c->connecting_result.transport != NULL) - { - publish_transport (exec_ctx, c); - } - else - { - gpr_timespec now = gpr_now (GPR_CLOCK_MONOTONIC); - gpr_mu_lock (&c->mu); - GPR_ASSERT (!c->have_alarm); - c->have_alarm = 1; - connectivity_state_changed_locked (exec_ctx, c, "connect_failed"); - grpc_alarm_init (exec_ctx, &c->alarm, c->next_attempt, on_alarm, c, now); - gpr_mu_unlock (&c->mu); - } -} - -static gpr_timespec -compute_connect_deadline (grpc_subchannel * c) -{ - gpr_timespec current_deadline = gpr_time_add (c->next_attempt, c->backoff_delta); - gpr_timespec min_deadline = gpr_time_add (gpr_now (GPR_CLOCK_MONOTONIC), - gpr_time_from_seconds (GRPC_SUBCHANNEL_MIN_CONNECT_TIMEOUT_SECONDS, - GPR_TIMESPAN)); - return gpr_time_cmp (current_deadline, min_deadline) > 0 ? current_deadline : min_deadline; -} - -static grpc_connectivity_state -compute_connectivity_locked (grpc_subchannel * c) -{ - if (c->disconnected) - { - return GRPC_CHANNEL_FATAL_FAILURE; - } - if (c->connecting) - { - if (c->have_alarm) - { - return GRPC_CHANNEL_TRANSIENT_FAILURE; - } - return GRPC_CHANNEL_CONNECTING; - } - if (c->active) - { - return GRPC_CHANNEL_READY; + if (c->connecting_result.transport != NULL) { + publish_transport(exec_ctx, c); + } else { + gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); + gpr_mu_lock(&c->mu); + GPR_ASSERT(!c->have_alarm); + c->have_alarm = 1; + connectivity_state_changed_locked(exec_ctx, c, "connect_failed"); + grpc_alarm_init(exec_ctx, &c->alarm, c->next_attempt, on_alarm, c, now); + gpr_mu_unlock(&c->mu); + } +} + +static gpr_timespec compute_connect_deadline(grpc_subchannel *c) { + gpr_timespec current_deadline = + gpr_time_add(c->next_attempt, c->backoff_delta); + gpr_timespec min_deadline = gpr_time_add( + gpr_now(GPR_CLOCK_MONOTONIC), + gpr_time_from_seconds(GRPC_SUBCHANNEL_MIN_CONNECT_TIMEOUT_SECONDS, + GPR_TIMESPAN)); + return gpr_time_cmp(current_deadline, min_deadline) > 0 ? current_deadline + : min_deadline; +} + +static grpc_connectivity_state compute_connectivity_locked(grpc_subchannel *c) { + if (c->disconnected) { + return GRPC_CHANNEL_FATAL_FAILURE; + } + if (c->connecting) { + if (c->have_alarm) { + return GRPC_CHANNEL_TRANSIENT_FAILURE; } + return GRPC_CHANNEL_CONNECTING; + } + if (c->active) { + return GRPC_CHANNEL_READY; + } return GRPC_CHANNEL_IDLE; } -static void -connectivity_state_changed_locked (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, const char *reason) -{ - grpc_connectivity_state current = compute_connectivity_locked (c); - grpc_connectivity_state_set (exec_ctx, &c->state_tracker, current, reason); +static void connectivity_state_changed_locked(grpc_exec_ctx *exec_ctx, + grpc_subchannel *c, + const char *reason) { + grpc_connectivity_state current = compute_connectivity_locked(c); + grpc_connectivity_state_set(exec_ctx, &c->state_tracker, current, reason); } /* * grpc_subchannel_call implementation */ -void -grpc_subchannel_call_ref (grpc_subchannel_call * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) -{ - gpr_ref (&c->refs); -} - -void -grpc_subchannel_call_unref (grpc_exec_ctx *exec_ctx, grpc_subchannel_call * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) -{ - if (gpr_unref (&c->refs)) - { - gpr_mu *mu = &c->connection->subchannel->mu; - grpc_subchannel *destroy; - grpc_call_stack_destroy (exec_ctx, SUBCHANNEL_CALL_TO_CALL_STACK (c)); - gpr_mu_lock (mu); - destroy = CONNECTION_UNREF_LOCKED (exec_ctx, c->connection, "call"); - gpr_mu_unlock (mu); - gpr_free (c); - if (destroy != NULL) - { - subchannel_destroy (exec_ctx, destroy); - } +void grpc_subchannel_call_ref( + grpc_subchannel_call *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { + gpr_ref(&c->refs); +} + +void grpc_subchannel_call_unref(grpc_exec_ctx *exec_ctx, + grpc_subchannel_call *c + GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { + if (gpr_unref(&c->refs)) { + gpr_mu *mu = &c->connection->subchannel->mu; + grpc_subchannel *destroy; + grpc_call_stack_destroy(exec_ctx, SUBCHANNEL_CALL_TO_CALL_STACK(c)); + gpr_mu_lock(mu); + destroy = CONNECTION_UNREF_LOCKED(exec_ctx, c->connection, "call"); + gpr_mu_unlock(mu); + gpr_free(c); + if (destroy != NULL) { + subchannel_destroy(exec_ctx, destroy); } + } } -char * -grpc_subchannel_call_get_peer (grpc_exec_ctx * exec_ctx, grpc_subchannel_call * call) -{ - grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK (call); - grpc_call_element *top_elem = grpc_call_stack_element (call_stack, 0); - return top_elem->filter->get_peer (exec_ctx, top_elem); +char *grpc_subchannel_call_get_peer(grpc_exec_ctx *exec_ctx, + grpc_subchannel_call *call) { + grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK(call); + grpc_call_element *top_elem = grpc_call_stack_element(call_stack, 0); + return top_elem->filter->get_peer(exec_ctx, top_elem); } -void -grpc_subchannel_call_process_op (grpc_exec_ctx * exec_ctx, grpc_subchannel_call * call, grpc_transport_stream_op * op) -{ - grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK (call); - grpc_call_element *top_elem = grpc_call_stack_element (call_stack, 0); - top_elem->filter->start_transport_stream_op (exec_ctx, top_elem, op); +void grpc_subchannel_call_process_op(grpc_exec_ctx *exec_ctx, + grpc_subchannel_call *call, + grpc_transport_stream_op *op) { + grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK(call); + grpc_call_element *top_elem = grpc_call_stack_element(call_stack, 0); + top_elem->filter->start_transport_stream_op(exec_ctx, top_elem, op); } -static grpc_subchannel_call * -create_call (grpc_exec_ctx * exec_ctx, connection * con) -{ - grpc_channel_stack *chanstk = CHANNEL_STACK_FROM_CONNECTION (con); - grpc_subchannel_call *call = gpr_malloc (sizeof (grpc_subchannel_call) + chanstk->call_stack_size); - grpc_call_stack *callstk = SUBCHANNEL_CALL_TO_CALL_STACK (call); +static grpc_subchannel_call *create_call(grpc_exec_ctx *exec_ctx, + connection *con) { + grpc_channel_stack *chanstk = CHANNEL_STACK_FROM_CONNECTION(con); + grpc_subchannel_call *call = + gpr_malloc(sizeof(grpc_subchannel_call) + chanstk->call_stack_size); + grpc_call_stack *callstk = SUBCHANNEL_CALL_TO_CALL_STACK(call); call->connection = con; - gpr_ref_init (&call->refs, 1); - grpc_call_stack_init (exec_ctx, chanstk, NULL, NULL, callstk); + gpr_ref_init(&call->refs, 1); + grpc_call_stack_init(exec_ctx, chanstk, NULL, NULL, callstk); return call; } diff --git a/src/core/client_config/subchannel.h b/src/core/client_config/subchannel.h index b87d6f55ff7..c9e5861d9c4 100644 --- a/src/core/client_config/subchannel.h +++ b/src/core/client_config/subchannel.h @@ -64,37 +64,59 @@ typedef struct grpc_subchannel_args grpc_subchannel_args; #define GRPC_SUBCHANNEL_REF_EXTRA_ARGS #endif -void grpc_subchannel_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_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_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_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); /** construct a call (possibly asynchronously) */ -void grpc_subchannel_create_call (grpc_exec_ctx * exec_ctx, grpc_subchannel * subchannel, grpc_pollset * pollset, grpc_subchannel_call ** target, grpc_closure * notify); +void grpc_subchannel_create_call(grpc_exec_ctx *exec_ctx, + grpc_subchannel *subchannel, + grpc_pollset *pollset, + grpc_subchannel_call **target, + grpc_closure *notify); /** process a transport level op */ -void grpc_subchannel_process_transport_op (grpc_exec_ctx * exec_ctx, grpc_subchannel * subchannel, grpc_transport_op * op); +void grpc_subchannel_process_transport_op(grpc_exec_ctx *exec_ctx, + grpc_subchannel *subchannel, + grpc_transport_op *op); /** poll the current connectivity state of a channel */ -grpc_connectivity_state grpc_subchannel_check_connectivity (grpc_subchannel * channel); +grpc_connectivity_state grpc_subchannel_check_connectivity( + grpc_subchannel *channel); /** 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_connectivity_state * state, grpc_closure * notify); +void grpc_subchannel_notify_on_state_change(grpc_exec_ctx *exec_ctx, + grpc_subchannel *channel, + grpc_connectivity_state *state, + grpc_closure *notify); /** express interest in \a channel's activities through \a pollset. */ -void grpc_subchannel_add_interested_party (grpc_exec_ctx * exec_ctx, grpc_subchannel * channel, grpc_pollset * pollset); +void grpc_subchannel_add_interested_party(grpc_exec_ctx *exec_ctx, + grpc_subchannel *channel, + grpc_pollset *pollset); /** stop following \a channel's activity through \a pollset. */ -void grpc_subchannel_del_interested_party (grpc_exec_ctx * exec_ctx, grpc_subchannel * channel, grpc_pollset * pollset); +void grpc_subchannel_del_interested_party(grpc_exec_ctx *exec_ctx, + grpc_subchannel *channel, + grpc_pollset *pollset); /** continue processing a transport op */ -void grpc_subchannel_call_process_op (grpc_exec_ctx * exec_ctx, grpc_subchannel_call * subchannel_call, grpc_transport_stream_op * op); +void grpc_subchannel_call_process_op(grpc_exec_ctx *exec_ctx, + grpc_subchannel_call *subchannel_call, + grpc_transport_stream_op *op); /** continue querying for peer */ -char *grpc_subchannel_call_get_peer (grpc_exec_ctx * exec_ctx, grpc_subchannel_call * subchannel_call); +char *grpc_subchannel_call_get_peer(grpc_exec_ctx *exec_ctx, + grpc_subchannel_call *subchannel_call); -struct grpc_subchannel_args -{ +struct grpc_subchannel_args { /** Channel filters for this channel - wrapped factories will likely want to mutate this */ const grpc_channel_filter **filters; @@ -112,6 +134,7 @@ struct grpc_subchannel_args }; /** create a subchannel given a connector */ -grpc_subchannel *grpc_subchannel_create (grpc_connector * connector, grpc_subchannel_args * args); +grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, + grpc_subchannel_args *args); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_SUBCHANNEL_H */ diff --git a/src/core/client_config/subchannel_factory.c b/src/core/client_config/subchannel_factory.c index f60cd02421a..2c64219e8b0 100644 --- a/src/core/client_config/subchannel_factory.c +++ b/src/core/client_config/subchannel_factory.c @@ -33,20 +33,17 @@ #include "src/core/client_config/subchannel_factory.h" -void -grpc_subchannel_factory_ref (grpc_subchannel_factory * factory) -{ - factory->vtable->ref (factory); +void grpc_subchannel_factory_ref(grpc_subchannel_factory* factory) { + factory->vtable->ref(factory); } -void -grpc_subchannel_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory) -{ - factory->vtable->unref (exec_ctx, factory); +void grpc_subchannel_factory_unref(grpc_exec_ctx* exec_ctx, + grpc_subchannel_factory* factory) { + factory->vtable->unref(exec_ctx, factory); } -grpc_subchannel * -grpc_subchannel_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory, grpc_subchannel_args * args) -{ - return factory->vtable->create_subchannel (exec_ctx, factory, args); +grpc_subchannel* grpc_subchannel_factory_create_subchannel( + grpc_exec_ctx* exec_ctx, grpc_subchannel_factory* factory, + grpc_subchannel_args* args) { + return factory->vtable->create_subchannel(exec_ctx, factory, args); } diff --git a/src/core/client_config/subchannel_factory.h b/src/core/client_config/subchannel_factory.h index 7586a74754e..c6d8cc90bed 100644 --- a/src/core/client_config/subchannel_factory.h +++ b/src/core/client_config/subchannel_factory.h @@ -42,22 +42,25 @@ typedef struct grpc_subchannel_factory_vtable grpc_subchannel_factory_vtable; /** Constructor for new configured channels. Creating decorators around this type is encouraged to adapt behavior. */ -struct grpc_subchannel_factory -{ +struct grpc_subchannel_factory { const grpc_subchannel_factory_vtable *vtable; }; -struct grpc_subchannel_factory_vtable -{ - void (*ref) (grpc_subchannel_factory * factory); - void (*unref) (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory); - grpc_subchannel *(*create_subchannel) (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory, grpc_subchannel_args * args); +struct grpc_subchannel_factory_vtable { + void (*ref)(grpc_subchannel_factory *factory); + void (*unref)(grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *factory); + grpc_subchannel *(*create_subchannel)(grpc_exec_ctx *exec_ctx, + grpc_subchannel_factory *factory, + grpc_subchannel_args *args); }; -void grpc_subchannel_factory_ref (grpc_subchannel_factory * factory); -void grpc_subchannel_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory); +void grpc_subchannel_factory_ref(grpc_subchannel_factory *factory); +void grpc_subchannel_factory_unref(grpc_exec_ctx *exec_ctx, + grpc_subchannel_factory *factory); /** Create a new grpc_subchannel */ -grpc_subchannel *grpc_subchannel_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory, grpc_subchannel_args * args); +grpc_subchannel *grpc_subchannel_factory_create_subchannel( + grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *factory, + grpc_subchannel_args *args); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_SUBCHANNEL_FACTORY_H */ diff --git a/src/core/client_config/subchannel_factory_decorators/add_channel_arg.c b/src/core/client_config/subchannel_factory_decorators/add_channel_arg.c index 220f00106b5..585e465fa49 100644 --- a/src/core/client_config/subchannel_factory_decorators/add_channel_arg.c +++ b/src/core/client_config/subchannel_factory_decorators/add_channel_arg.c @@ -34,11 +34,10 @@ #include "src/core/client_config/subchannel_factory_decorators/add_channel_arg.h" #include "src/core/client_config/subchannel_factory_decorators/merge_channel_args.h" -grpc_subchannel_factory * -grpc_subchannel_factory_add_channel_arg (grpc_subchannel_factory * input, const grpc_arg * arg) -{ +grpc_subchannel_factory *grpc_subchannel_factory_add_channel_arg( + grpc_subchannel_factory *input, const grpc_arg *arg) { grpc_channel_args args; args.num_args = 1; - args.args = (grpc_arg *) arg; - return grpc_subchannel_factory_merge_channel_args (input, &args); + args.args = (grpc_arg *)arg; + return grpc_subchannel_factory_merge_channel_args(input, &args); } diff --git a/src/core/client_config/subchannel_factory_decorators/add_channel_arg.h b/src/core/client_config/subchannel_factory_decorators/add_channel_arg.h index 38f9c48d7a5..76a535ebeda 100644 --- a/src/core/client_config/subchannel_factory_decorators/add_channel_arg.h +++ b/src/core/client_config/subchannel_factory_decorators/add_channel_arg.h @@ -39,7 +39,8 @@ /** Takes a subchannel factory, returns a new one that mutates incoming channel_args by adding a new argument; ownership of input, arg is retained by the caller. */ -grpc_subchannel_factory *grpc_subchannel_factory_add_channel_arg (grpc_subchannel_factory * input, const grpc_arg * arg); +grpc_subchannel_factory *grpc_subchannel_factory_add_channel_arg( + grpc_subchannel_factory *input, const grpc_arg *arg); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_SUBCHANNEL_FACTORY_DECORATORS_ADD_CHANNEL_ARG_H \ */ diff --git a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c index 442862a4b80..cd25fdcf0f1 100644 --- a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c +++ b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c @@ -35,58 +35,52 @@ #include #include "src/core/channel/channel_args.h" -typedef struct -{ +typedef struct { grpc_subchannel_factory base; gpr_refcount refs; grpc_subchannel_factory *wrapped; grpc_channel_args *merge_args; } merge_args_factory; -static void -merge_args_factory_ref (grpc_subchannel_factory * scf) -{ - merge_args_factory *f = (merge_args_factory *) scf; - gpr_ref (&f->refs); +static void merge_args_factory_ref(grpc_subchannel_factory *scf) { + merge_args_factory *f = (merge_args_factory *)scf; + gpr_ref(&f->refs); } -static void -merge_args_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * scf) -{ - merge_args_factory *f = (merge_args_factory *) scf; - if (gpr_unref (&f->refs)) - { - grpc_subchannel_factory_unref (exec_ctx, f->wrapped); - grpc_channel_args_destroy (f->merge_args); - gpr_free (f); - } +static void merge_args_factory_unref(grpc_exec_ctx *exec_ctx, + grpc_subchannel_factory *scf) { + merge_args_factory *f = (merge_args_factory *)scf; + if (gpr_unref(&f->refs)) { + grpc_subchannel_factory_unref(exec_ctx, f->wrapped); + grpc_channel_args_destroy(f->merge_args); + gpr_free(f); + } } -static grpc_subchannel * -merge_args_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * scf, grpc_subchannel_args * args) -{ - merge_args_factory *f = (merge_args_factory *) scf; - grpc_channel_args *final_args = grpc_channel_args_merge (args->args, f->merge_args); +static grpc_subchannel *merge_args_factory_create_subchannel( + grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *scf, + grpc_subchannel_args *args) { + merge_args_factory *f = (merge_args_factory *)scf; + grpc_channel_args *final_args = + grpc_channel_args_merge(args->args, f->merge_args); grpc_subchannel *s; args->args = final_args; - s = grpc_subchannel_factory_create_subchannel (exec_ctx, f->wrapped, args); - grpc_channel_args_destroy (final_args); + s = grpc_subchannel_factory_create_subchannel(exec_ctx, f->wrapped, args); + grpc_channel_args_destroy(final_args); return s; } static const grpc_subchannel_factory_vtable merge_args_factory_vtable = { - merge_args_factory_ref, merge_args_factory_unref, - merge_args_factory_create_subchannel -}; + merge_args_factory_ref, merge_args_factory_unref, + merge_args_factory_create_subchannel}; -grpc_subchannel_factory * -grpc_subchannel_factory_merge_channel_args (grpc_subchannel_factory * input, const grpc_channel_args * args) -{ - merge_args_factory *f = gpr_malloc (sizeof (*f)); +grpc_subchannel_factory *grpc_subchannel_factory_merge_channel_args( + grpc_subchannel_factory *input, const grpc_channel_args *args) { + merge_args_factory *f = gpr_malloc(sizeof(*f)); f->base.vtable = &merge_args_factory_vtable; - gpr_ref_init (&f->refs, 1); - grpc_subchannel_factory_ref (input); + gpr_ref_init(&f->refs, 1); + grpc_subchannel_factory_ref(input); f->wrapped = input; - f->merge_args = grpc_channel_args_copy (args); + f->merge_args = grpc_channel_args_copy(args); return &f->base; } diff --git a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.h b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.h index 5155509a479..a9e1691871f 100644 --- a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.h +++ b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.h @@ -39,7 +39,8 @@ /** Takes a subchannel factory, returns a new one that mutates incoming channel_args by adding a new argument; ownership of input, args is retained by the caller. */ -grpc_subchannel_factory *grpc_subchannel_factory_merge_channel_args (grpc_subchannel_factory * input, const grpc_channel_args * args); +grpc_subchannel_factory *grpc_subchannel_factory_merge_channel_args( + grpc_subchannel_factory *input, const grpc_channel_args *args); #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_SUBCHANNEL_FACTORY_DECORATORS_MERGE_CHANNEL_ARGS_H \ */ diff --git a/src/core/client_config/uri_parser.c b/src/core/client_config/uri_parser.c index 4f4cc5b9c4d..df9f32d403c 100644 --- a/src/core/client_config/uri_parser.c +++ b/src/core/client_config/uri_parser.c @@ -42,35 +42,31 @@ /** a size_t default value... maps to all 1's */ #define NOT_SET (~(size_t)0) -static grpc_uri * -bad_uri (const char *uri_text, size_t pos, const char *section, int suppress_errors) -{ +static grpc_uri *bad_uri(const char *uri_text, size_t pos, const char *section, + int suppress_errors) { char *line_prefix; size_t pfx_len; - if (!suppress_errors) - { - gpr_asprintf (&line_prefix, "bad uri.%s: '", section); - pfx_len = strlen (line_prefix) + pos; - gpr_log (GPR_ERROR, "%s%s'", line_prefix, uri_text); - gpr_free (line_prefix); + if (!suppress_errors) { + gpr_asprintf(&line_prefix, "bad uri.%s: '", section); + pfx_len = strlen(line_prefix) + pos; + gpr_log(GPR_ERROR, "%s%s'", line_prefix, uri_text); + gpr_free(line_prefix); - line_prefix = gpr_malloc (pfx_len + 1); - memset (line_prefix, ' ', pfx_len); - line_prefix[pfx_len] = 0; - gpr_log (GPR_ERROR, "%s^ here", line_prefix); - gpr_free (line_prefix); - } + line_prefix = gpr_malloc(pfx_len + 1); + memset(line_prefix, ' ', pfx_len); + line_prefix[pfx_len] = 0; + gpr_log(GPR_ERROR, "%s^ here", line_prefix); + gpr_free(line_prefix); + } return NULL; } /** Returns a copy of \a src[begin, end) */ -static char * -copy_component (const char *src, size_t begin, size_t end) -{ - char *out = gpr_malloc (end - begin + 1); - memcpy (out, src + begin, end - begin); +static char *copy_component(const char *src, size_t begin, size_t end) { + char *out = gpr_malloc(end - begin + 1); + memcpy(out, src + begin, end - begin); out[end - begin] = 0; return out; } @@ -78,77 +74,66 @@ copy_component (const char *src, size_t begin, size_t end) /** Returns how many chars to advance if \a uri_text[i] begins a valid \a pchar * production. If \a uri_text[i] introduces an invalid \a pchar (such as percent * sign not followed by two hex digits), NOT_SET is returned. */ -static size_t -parse_pchar (const char *uri_text, size_t i) -{ +static size_t parse_pchar(const char *uri_text, size_t i) { /* pchar = unreserved / pct-encoded / sub-delims / ":" / "@" * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" * pct-encoded = "%" HEXDIG HEXDIG * sub-delims = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "=" */ char c = uri_text[i]; - if (((c >= 'A') && (c <= 'Z')) || ((c >= 'a') && (c <= 'z')) || ((c >= '0') && (c <= '9')) || (c == '-' || c == '.' || c == '_' || c == '~') || /* unreserved */ - (c == '!' || c == '$' || c == '&' || c == '\'' || c == '$' || c == '&' || c == '(' || c == ')' || c == '*' || c == '+' || c == ',' || c == ';' || c == '=') /* sub-delims */ ) - { - return 1; + if (((c >= 'A') && (c <= 'Z')) || ((c >= 'a') && (c <= 'z')) || + ((c >= '0') && (c <= '9')) || + (c == '-' || c == '.' || c == '_' || c == '~') || /* unreserved */ + (c == '!' || c == '$' || c == '&' || c == '\'' || c == '$' || c == '&' || + c == '(' || c == ')' || c == '*' || c == '+' || c == ',' || c == ';' || + c == '=') /* sub-delims */) { + return 1; + } + if (c == '%') { /* pct-encoded */ + size_t j; + if (uri_text[i + 1] == 0 || uri_text[i + 2] == 0) { + return NOT_SET; } - if (c == '%') - { /* pct-encoded */ - size_t j; - if (uri_text[i + 1] == 0 || uri_text[i + 2] == 0) - { - return NOT_SET; - } - for (j = i + 1; j < 2; j++) - { - c = uri_text[j]; - if (!(((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) || ((c >= 'A') && (c <= 'F')))) - { - return NOT_SET; - } - } - return 2; + for (j = i + 1; j < 2; j++) { + c = uri_text[j]; + if (!(((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) || + ((c >= 'A') && (c <= 'F')))) { + return NOT_SET; + } } + return 2; + } return 0; } /* *( pchar / "?" / "/" ) */ -static int -parse_fragment_or_query (const char *uri_text, size_t * i) -{ +static int parse_fragment_or_query(const char *uri_text, size_t *i) { char c; - while ((c = uri_text[*i]) != 0) - { - const size_t advance = parse_pchar (uri_text, *i); /* pchar */ - switch (advance) - { - case 0: /* uri_text[i] isn't in pchar */ - /* maybe it's ? or / */ - if (uri_text[*i] == '?' || uri_text[*i] == '/') - { - (*i)++; - break; - } - else - { - return 1; - } - gpr_log (GPR_ERROR, "should never reach here"); - abort (); - default: - (*i) += advance; - break; - case NOT_SET: /* uri_text[i] introduces an invalid URI */ - return 0; - } + while ((c = uri_text[*i]) != 0) { + const size_t advance = parse_pchar(uri_text, *i); /* pchar */ + switch (advance) { + case 0: /* uri_text[i] isn't in pchar */ + /* maybe it's ? or / */ + if (uri_text[*i] == '?' || uri_text[*i] == '/') { + (*i)++; + break; + } else { + return 1; + } + gpr_log(GPR_ERROR, "should never reach here"); + abort(); + default: + (*i) += advance; + break; + case NOT_SET: /* uri_text[i] introduces an invalid URI */ + return 0; } + } /* *i is the first uri_text position past the \a query production, maybe \0 */ return 1; } -grpc_uri * -grpc_uri_parse (const char *uri_text, int suppress_errors) -{ +grpc_uri *grpc_uri_parse(const char *uri_text, int suppress_errors) { grpc_uri *uri; size_t scheme_begin = 0; size_t scheme_end = NOT_SET; @@ -162,127 +147,96 @@ grpc_uri_parse (const char *uri_text, int suppress_errors) size_t fragment_end = NOT_SET; size_t i; - for (i = scheme_begin; uri_text[i] != 0; i++) - { - if (uri_text[i] == ':') - { - scheme_end = i; - break; - } - if (uri_text[i] >= 'a' && uri_text[i] <= 'z') - continue; - if (uri_text[i] >= 'A' && uri_text[i] <= 'Z') - continue; - if (i != scheme_begin) - { - if (uri_text[i] >= '0' && uri_text[i] <= '9') - continue; - if (uri_text[i] == '+') - continue; - if (uri_text[i] == '-') - continue; - if (uri_text[i] == '.') - continue; - } + for (i = scheme_begin; uri_text[i] != 0; i++) { + if (uri_text[i] == ':') { + scheme_end = i; break; } - if (scheme_end == NOT_SET) - { - return bad_uri (uri_text, i, "scheme", suppress_errors); + if (uri_text[i] >= 'a' && uri_text[i] <= 'z') continue; + if (uri_text[i] >= 'A' && uri_text[i] <= 'Z') continue; + if (i != scheme_begin) { + if (uri_text[i] >= '0' && uri_text[i] <= '9') continue; + if (uri_text[i] == '+') continue; + if (uri_text[i] == '-') continue; + if (uri_text[i] == '.') continue; } - - if (uri_text[scheme_end + 1] == '/' && uri_text[scheme_end + 2] == '/') - { - authority_begin = scheme_end + 3; - for (i = authority_begin; uri_text[i] != 0 && authority_end == NOT_SET; i++) - { - if (uri_text[i] == '/' || uri_text[i] == '?' || uri_text[i] == '#') - { - authority_end = i; - } - } - if (authority_end == NOT_SET && uri_text[i] == 0) - { - authority_end = i; - } - if (authority_end == NOT_SET) - { - return bad_uri (uri_text, i, "authority", suppress_errors); - } - /* TODO(ctiller): parse the authority correctly */ - path_begin = authority_end; + break; + } + if (scheme_end == NOT_SET) { + return bad_uri(uri_text, i, "scheme", suppress_errors); + } + + if (uri_text[scheme_end + 1] == '/' && uri_text[scheme_end + 2] == '/') { + authority_begin = scheme_end + 3; + for (i = authority_begin; uri_text[i] != 0 && authority_end == NOT_SET; + i++) { + if (uri_text[i] == '/' || uri_text[i] == '?' || uri_text[i] == '#') { + authority_end = i; + } } - else - { - path_begin = scheme_end + 1; + if (authority_end == NOT_SET && uri_text[i] == 0) { + authority_end = i; } - - for (i = path_begin; uri_text[i] != 0; i++) - { - if (uri_text[i] == '?' || uri_text[i] == '#') - { - path_end = i; - break; - } + if (authority_end == NOT_SET) { + return bad_uri(uri_text, i, "authority", suppress_errors); } - if (path_end == NOT_SET && uri_text[i] == 0) - { + /* TODO(ctiller): parse the authority correctly */ + path_begin = authority_end; + } else { + path_begin = scheme_end + 1; + } + + for (i = path_begin; uri_text[i] != 0; i++) { + if (uri_text[i] == '?' || uri_text[i] == '#') { path_end = i; + break; } - if (path_end == NOT_SET) - { - return bad_uri (uri_text, i, "path", suppress_errors); - } - - if (uri_text[i] == '?') - { - query_begin = ++i; - if (!parse_fragment_or_query (uri_text, &i)) - { - return bad_uri (uri_text, i, "query", suppress_errors); - } - else if (uri_text[i] != 0 && uri_text[i] != '#') - { - /* We must be at the end or at the beginning of a fragment */ - return bad_uri (uri_text, i, "query", suppress_errors); - } - query_end = i; + } + if (path_end == NOT_SET && uri_text[i] == 0) { + path_end = i; + } + if (path_end == NOT_SET) { + return bad_uri(uri_text, i, "path", suppress_errors); + } + + if (uri_text[i] == '?') { + query_begin = ++i; + if (!parse_fragment_or_query(uri_text, &i)) { + return bad_uri(uri_text, i, "query", suppress_errors); + } else if (uri_text[i] != 0 && uri_text[i] != '#') { + /* We must be at the end or at the beginning of a fragment */ + return bad_uri(uri_text, i, "query", suppress_errors); } - if (uri_text[i] == '#') - { - fragment_begin = ++i; - if (!parse_fragment_or_query (uri_text, &i)) - { - return bad_uri (uri_text, i - fragment_end, "fragment", suppress_errors); - } - else if (uri_text[i] != 0) - { - /* We must be at the end */ - return bad_uri (uri_text, i, "fragment", suppress_errors); - } - fragment_end = i; + query_end = i; + } + if (uri_text[i] == '#') { + fragment_begin = ++i; + if (!parse_fragment_or_query(uri_text, &i)) { + return bad_uri(uri_text, i - fragment_end, "fragment", suppress_errors); + } else if (uri_text[i] != 0) { + /* We must be at the end */ + return bad_uri(uri_text, i, "fragment", suppress_errors); } + fragment_end = i; + } - uri = gpr_malloc (sizeof (*uri)); - memset (uri, 0, sizeof (*uri)); - uri->scheme = copy_component (uri_text, scheme_begin, scheme_end); - uri->authority = copy_component (uri_text, authority_begin, authority_end); - uri->path = copy_component (uri_text, path_begin, path_end); - uri->query = copy_component (uri_text, query_begin, query_end); - uri->fragment = copy_component (uri_text, fragment_begin, fragment_end); + uri = gpr_malloc(sizeof(*uri)); + memset(uri, 0, sizeof(*uri)); + uri->scheme = copy_component(uri_text, scheme_begin, scheme_end); + uri->authority = copy_component(uri_text, authority_begin, authority_end); + uri->path = copy_component(uri_text, path_begin, path_end); + uri->query = copy_component(uri_text, query_begin, query_end); + uri->fragment = copy_component(uri_text, fragment_begin, fragment_end); return uri; } -void -grpc_uri_destroy (grpc_uri * uri) -{ - if (!uri) - return; - gpr_free (uri->scheme); - gpr_free (uri->authority); - gpr_free (uri->path); - gpr_free (uri->query); - gpr_free (uri->fragment); - gpr_free (uri); +void grpc_uri_destroy(grpc_uri *uri) { + if (!uri) return; + gpr_free(uri->scheme); + gpr_free(uri->authority); + gpr_free(uri->path); + gpr_free(uri->query); + gpr_free(uri->fragment); + gpr_free(uri); } diff --git a/src/core/client_config/uri_parser.h b/src/core/client_config/uri_parser.h index 1eb26e7ca67..b8daa13bd4f 100644 --- a/src/core/client_config/uri_parser.h +++ b/src/core/client_config/uri_parser.h @@ -34,8 +34,7 @@ #ifndef GRPC_INTERNAL_CORE_CLIENT_CONFIG_URI_PARSER_H #define GRPC_INTERNAL_CORE_CLIENT_CONFIG_URI_PARSER_H -typedef struct -{ +typedef struct { char *scheme; char *authority; char *path; @@ -44,9 +43,9 @@ typedef struct } grpc_uri; /** parse a uri, return NULL on failure */ -grpc_uri *grpc_uri_parse (const char *uri_text, int suppress_errors); +grpc_uri *grpc_uri_parse(const char *uri_text, int suppress_errors); /** destroy a uri */ -void grpc_uri_destroy (grpc_uri * uri); +void grpc_uri_destroy(grpc_uri *uri); #endif diff --git a/src/core/compression/algorithm.c b/src/core/compression/algorithm.c index 2627761d900..8adde13b1ec 100644 --- a/src/core/compression/algorithm.c +++ b/src/core/compression/algorithm.c @@ -37,41 +37,30 @@ #include #include -int -grpc_compression_algorithm_parse (const char *name, size_t name_length, grpc_compression_algorithm * algorithm) -{ +int grpc_compression_algorithm_parse(const char *name, size_t name_length, + grpc_compression_algorithm *algorithm) { /* we use strncmp not only because it's safer (even though in this case it * doesn't matter, given that we are comparing against string literals, but * because this way we needn't have "name" nil-terminated (useful for slice * data, for example) */ - if (name_length == 0) - { - return 0; - } - if (strncmp (name, "identity", name_length) == 0) - { - *algorithm = GRPC_COMPRESS_NONE; - } - else if (strncmp (name, "gzip", name_length) == 0) - { - *algorithm = GRPC_COMPRESS_GZIP; - } - else if (strncmp (name, "deflate", name_length) == 0) - { - *algorithm = GRPC_COMPRESS_DEFLATE; - } - else - { - return 0; - } + if (name_length == 0) { + return 0; + } + if (strncmp(name, "identity", name_length) == 0) { + *algorithm = GRPC_COMPRESS_NONE; + } else if (strncmp(name, "gzip", name_length) == 0) { + *algorithm = GRPC_COMPRESS_GZIP; + } else if (strncmp(name, "deflate", name_length) == 0) { + *algorithm = GRPC_COMPRESS_DEFLATE; + } else { + return 0; + } return 1; } -int -grpc_compression_algorithm_name (grpc_compression_algorithm algorithm, char **name) -{ - switch (algorithm) - { +int grpc_compression_algorithm_name(grpc_compression_algorithm algorithm, + char **name) { + switch (algorithm) { case GRPC_COMPRESS_NONE: *name = "identity"; break; @@ -83,17 +72,15 @@ grpc_compression_algorithm_name (grpc_compression_algorithm algorithm, char **na break; default: return 0; - } + } return 1; } /* TODO(dgq): Add the ability to specify parameters to the individual * compression algorithms */ -grpc_compression_algorithm -grpc_compression_algorithm_for_level (grpc_compression_level level) -{ - switch (level) - { +grpc_compression_algorithm grpc_compression_algorithm_for_level( + grpc_compression_level level) { + switch (level) { case GRPC_COMPRESS_LEVEL_NONE: return GRPC_COMPRESS_NONE; case GRPC_COMPRESS_LEVEL_LOW: @@ -102,45 +89,39 @@ grpc_compression_algorithm_for_level (grpc_compression_level level) return GRPC_COMPRESS_DEFLATE; default: /* we shouldn't be making it here */ - abort (); - } + abort(); + } } -grpc_compression_level -grpc_compression_level_for_algorithm (grpc_compression_algorithm algorithm) -{ +grpc_compression_level grpc_compression_level_for_algorithm( + grpc_compression_algorithm algorithm) { grpc_compression_level clevel; - for (clevel = GRPC_COMPRESS_LEVEL_NONE; clevel < GRPC_COMPRESS_LEVEL_COUNT; ++clevel) - { - if (grpc_compression_algorithm_for_level (clevel) == algorithm) - { - return clevel; - } + for (clevel = GRPC_COMPRESS_LEVEL_NONE; clevel < GRPC_COMPRESS_LEVEL_COUNT; + ++clevel) { + if (grpc_compression_algorithm_for_level(clevel) == algorithm) { + return clevel; } - abort (); + } + abort(); } -void -grpc_compression_options_init (grpc_compression_options * opts) -{ +void grpc_compression_options_init(grpc_compression_options *opts) { opts->enabled_algorithms_bitset = (1u << GRPC_COMPRESS_ALGORITHMS_COUNT) - 1; opts->default_compression_algorithm = GRPC_COMPRESS_NONE; } -void -grpc_compression_options_enable_algorithm (grpc_compression_options * opts, grpc_compression_algorithm algorithm) -{ - GPR_BITSET (&opts->enabled_algorithms_bitset, algorithm); +void grpc_compression_options_enable_algorithm( + grpc_compression_options *opts, grpc_compression_algorithm algorithm) { + GPR_BITSET(&opts->enabled_algorithms_bitset, algorithm); } -void -grpc_compression_options_disable_algorithm (grpc_compression_options * opts, grpc_compression_algorithm algorithm) -{ - GPR_BITCLEAR (&opts->enabled_algorithms_bitset, algorithm); +void grpc_compression_options_disable_algorithm( + grpc_compression_options *opts, grpc_compression_algorithm algorithm) { + GPR_BITCLEAR(&opts->enabled_algorithms_bitset, algorithm); } -int -grpc_compression_options_is_algorithm_enabled (const grpc_compression_options * opts, grpc_compression_algorithm algorithm) -{ - return GPR_BITGET (opts->enabled_algorithms_bitset, algorithm); +int grpc_compression_options_is_algorithm_enabled( + const grpc_compression_options *opts, + grpc_compression_algorithm algorithm) { + return GPR_BITGET(opts->enabled_algorithms_bitset, algorithm); } diff --git a/src/core/compression/message_compress.c b/src/core/compression/message_compress.c index ac079f87242..209c1f0ff1f 100644 --- a/src/core/compression/message_compress.c +++ b/src/core/compression/message_compress.c @@ -42,176 +42,153 @@ #define OUTPUT_BLOCK_SIZE 1024 -static int -zlib_body (z_stream * zs, gpr_slice_buffer * input, gpr_slice_buffer * output, int (*flate) (z_stream * zs, int flush)) -{ +static int zlib_body(z_stream* zs, gpr_slice_buffer* input, + gpr_slice_buffer* output, + int (*flate)(z_stream* zs, int flush)) { int r; int flush; size_t i; - gpr_slice outbuf = gpr_slice_malloc (OUTPUT_BLOCK_SIZE); - const uInt uint_max = ~(uInt) 0; + gpr_slice outbuf = gpr_slice_malloc(OUTPUT_BLOCK_SIZE); + const uInt uint_max = ~(uInt)0; - GPR_ASSERT (GPR_SLICE_LENGTH (outbuf) <= uint_max); - zs->avail_out = (uInt) GPR_SLICE_LENGTH (outbuf); - zs->next_out = GPR_SLICE_START_PTR (outbuf); + GPR_ASSERT(GPR_SLICE_LENGTH(outbuf) <= uint_max); + zs->avail_out = (uInt)GPR_SLICE_LENGTH(outbuf); + zs->next_out = GPR_SLICE_START_PTR(outbuf); flush = Z_NO_FLUSH; - for (i = 0; i < input->count; i++) - { - if (i == input->count - 1) - flush = Z_FINISH; - GPR_ASSERT (GPR_SLICE_LENGTH (input->slices[i]) <= uint_max); - zs->avail_in = (uInt) GPR_SLICE_LENGTH (input->slices[i]); - zs->next_in = GPR_SLICE_START_PTR (input->slices[i]); - do - { - if (zs->avail_out == 0) - { - gpr_slice_buffer_add_indexed (output, outbuf); - outbuf = gpr_slice_malloc (OUTPUT_BLOCK_SIZE); - GPR_ASSERT (GPR_SLICE_LENGTH (outbuf) <= uint_max); - zs->avail_out = (uInt) GPR_SLICE_LENGTH (outbuf); - zs->next_out = GPR_SLICE_START_PTR (outbuf); - } - r = flate (zs, flush); - if (r == Z_STREAM_ERROR) - { - gpr_log (GPR_INFO, "zlib: stream error"); - goto error; - } - } - while (zs->avail_out == 0); - if (zs->avail_in) - { - gpr_log (GPR_INFO, "zlib: not all input consumed"); - goto error; - } + for (i = 0; i < input->count; i++) { + if (i == input->count - 1) flush = Z_FINISH; + GPR_ASSERT(GPR_SLICE_LENGTH(input->slices[i]) <= uint_max); + zs->avail_in = (uInt)GPR_SLICE_LENGTH(input->slices[i]); + zs->next_in = GPR_SLICE_START_PTR(input->slices[i]); + do { + if (zs->avail_out == 0) { + gpr_slice_buffer_add_indexed(output, outbuf); + outbuf = gpr_slice_malloc(OUTPUT_BLOCK_SIZE); + GPR_ASSERT(GPR_SLICE_LENGTH(outbuf) <= uint_max); + zs->avail_out = (uInt)GPR_SLICE_LENGTH(outbuf); + zs->next_out = GPR_SLICE_START_PTR(outbuf); + } + r = flate(zs, flush); + if (r == Z_STREAM_ERROR) { + gpr_log(GPR_INFO, "zlib: stream error"); + goto error; + } + } while (zs->avail_out == 0); + if (zs->avail_in) { + gpr_log(GPR_INFO, "zlib: not all input consumed"); + goto error; } + } - GPR_ASSERT (outbuf.refcount); + GPR_ASSERT(outbuf.refcount); outbuf.data.refcounted.length -= zs->avail_out; - gpr_slice_buffer_add_indexed (output, outbuf); + gpr_slice_buffer_add_indexed(output, outbuf); return 1; error: - gpr_slice_unref (outbuf); + gpr_slice_unref(outbuf); return 0; } -static int -zlib_compress (gpr_slice_buffer * input, gpr_slice_buffer * output, int gzip) -{ +static int zlib_compress(gpr_slice_buffer* input, gpr_slice_buffer* output, + int gzip) { z_stream zs; int r; size_t i; size_t count_before = output->count; size_t length_before = output->length; - memset (&zs, 0, sizeof (zs)); - r = deflateInit2 (&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 | (gzip ? 16 : 0), 8, Z_DEFAULT_STRATEGY); - if (r != Z_OK) - { - gpr_log (GPR_ERROR, "deflateInit2 returns %d", r); - return 0; - } - r = zlib_body (&zs, input, output, deflate) && output->length < input->length; - if (!r) - { - for (i = count_before; i < output->count; i++) - { - gpr_slice_unref (output->slices[i]); - } - output->count = count_before; - output->length = length_before; + memset(&zs, 0, sizeof(zs)); + r = deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 | (gzip ? 16 : 0), + 8, Z_DEFAULT_STRATEGY); + if (r != Z_OK) { + gpr_log(GPR_ERROR, "deflateInit2 returns %d", r); + return 0; + } + r = zlib_body(&zs, input, output, deflate) && output->length < input->length; + if (!r) { + for (i = count_before; i < output->count; i++) { + gpr_slice_unref(output->slices[i]); } - deflateEnd (&zs); + output->count = count_before; + output->length = length_before; + } + deflateEnd(&zs); return r; } -static int -zlib_decompress (gpr_slice_buffer * input, gpr_slice_buffer * output, int gzip) -{ +static int zlib_decompress(gpr_slice_buffer* input, gpr_slice_buffer* output, + int gzip) { z_stream zs; int r; size_t i; size_t count_before = output->count; size_t length_before = output->length; - memset (&zs, 0, sizeof (zs)); - r = inflateInit2 (&zs, 15 | (gzip ? 16 : 0)); - if (r != Z_OK) - { - gpr_log (GPR_ERROR, "inflateInit2 returns %d", r); - return 0; + memset(&zs, 0, sizeof(zs)); + r = inflateInit2(&zs, 15 | (gzip ? 16 : 0)); + if (r != Z_OK) { + gpr_log(GPR_ERROR, "inflateInit2 returns %d", r); + return 0; + } + r = zlib_body(&zs, input, output, inflate); + if (!r) { + for (i = count_before; i < output->count; i++) { + gpr_slice_unref(output->slices[i]); } - r = zlib_body (&zs, input, output, inflate); - if (!r) - { - for (i = count_before; i < output->count; i++) - { - gpr_slice_unref (output->slices[i]); - } - output->count = count_before; - output->length = length_before; - } - inflateEnd (&zs); + output->count = count_before; + output->length = length_before; + } + inflateEnd(&zs); return r; } -static int -copy (gpr_slice_buffer * input, gpr_slice_buffer * output) -{ +static int copy(gpr_slice_buffer* input, gpr_slice_buffer* output) { size_t i; - for (i = 0; i < input->count; i++) - { - gpr_slice_buffer_add (output, gpr_slice_ref (input->slices[i])); - } + for (i = 0; i < input->count; i++) { + gpr_slice_buffer_add(output, gpr_slice_ref(input->slices[i])); + } return 1; } -int -compress_inner (grpc_compression_algorithm algorithm, gpr_slice_buffer * input, gpr_slice_buffer * output) -{ - switch (algorithm) - { +int compress_inner(grpc_compression_algorithm algorithm, + gpr_slice_buffer* input, gpr_slice_buffer* output) { + switch (algorithm) { case GRPC_COMPRESS_NONE: /* the fallback path always needs to be send uncompressed: we simply rely on that here */ return 0; case GRPC_COMPRESS_DEFLATE: - return zlib_compress (input, output, 0); + return zlib_compress(input, output, 0); case GRPC_COMPRESS_GZIP: - return zlib_compress (input, output, 1); + return zlib_compress(input, output, 1); case GRPC_COMPRESS_ALGORITHMS_COUNT: break; - } - gpr_log (GPR_ERROR, "invalid compression algorithm %d", algorithm); + } + gpr_log(GPR_ERROR, "invalid compression algorithm %d", algorithm); return 0; } -int -grpc_msg_compress (grpc_compression_algorithm algorithm, gpr_slice_buffer * input, gpr_slice_buffer * output) -{ - if (!compress_inner (algorithm, input, output)) - { - copy (input, output); - return 0; - } +int grpc_msg_compress(grpc_compression_algorithm algorithm, + gpr_slice_buffer* input, gpr_slice_buffer* output) { + if (!compress_inner(algorithm, input, output)) { + copy(input, output); + return 0; + } return 1; } -int -grpc_msg_decompress (grpc_compression_algorithm algorithm, gpr_slice_buffer * input, gpr_slice_buffer * output) -{ - switch (algorithm) - { +int grpc_msg_decompress(grpc_compression_algorithm algorithm, + gpr_slice_buffer* input, gpr_slice_buffer* output) { + switch (algorithm) { case GRPC_COMPRESS_NONE: - return copy (input, output); + return copy(input, output); case GRPC_COMPRESS_DEFLATE: - return zlib_decompress (input, output, 0); + return zlib_decompress(input, output, 0); case GRPC_COMPRESS_GZIP: - return zlib_decompress (input, output, 1); + return zlib_decompress(input, output, 1); case GRPC_COMPRESS_ALGORITHMS_COUNT: break; - } - gpr_log (GPR_ERROR, "invalid compression algorithm %d", algorithm); + } + gpr_log(GPR_ERROR, "invalid compression algorithm %d", algorithm); return 0; } diff --git a/src/core/compression/message_compress.h b/src/core/compression/message_compress.h index c052adda941..14652004b86 100644 --- a/src/core/compression/message_compress.h +++ b/src/core/compression/message_compress.h @@ -40,11 +40,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_compression_algorithm algorithm, gpr_slice_buffer * input, gpr_slice_buffer * output); +int grpc_msg_compress(grpc_compression_algorithm algorithm, + gpr_slice_buffer* input, gpr_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, gpr_slice_buffer * input, gpr_slice_buffer * output); +int grpc_msg_decompress(grpc_compression_algorithm algorithm, + gpr_slice_buffer* input, gpr_slice_buffer* output); #endif /* GRPC_INTERNAL_CORE_COMPRESSION_MESSAGE_COMPRESS_H */ diff --git a/src/core/debug/trace.c b/src/core/debug/trace.c index d43d999762e..3b35d81cd84 100644 --- a/src/core/debug/trace.c +++ b/src/core/debug/trace.c @@ -40,18 +40,15 @@ #include #include "src/core/support/env.h" -typedef struct tracer -{ +typedef struct tracer { const char *name; int *flag; struct tracer *next; } tracer; static tracer *tracers; -void -grpc_register_tracer (const char *name, int *flag) -{ - tracer *t = gpr_malloc (sizeof (*t)); +void grpc_register_tracer(const char *name, int *flag) { + tracer *t = gpr_malloc(sizeof(*t)); t->name = name; t->flag = flag; t->next = tracers; @@ -59,107 +56,81 @@ grpc_register_tracer (const char *name, int *flag) tracers = t; } -static void -add (const char *beg, const char *end, char ***ss, size_t * ns) -{ +static void add(const char *beg, const char *end, char ***ss, size_t *ns) { size_t n = *ns; size_t np = n + 1; char *s; size_t len; - GPR_ASSERT (end >= beg); - len = (size_t) (end - beg); - s = gpr_malloc (len + 1); - memcpy (s, beg, len); + GPR_ASSERT(end >= beg); + len = (size_t)(end - beg); + s = gpr_malloc(len + 1); + memcpy(s, beg, len); s[len] = 0; - *ss = gpr_realloc (*ss, sizeof (char **) * np); + *ss = gpr_realloc(*ss, sizeof(char **) * np); (*ss)[n] = s; *ns = np; } -static void -split (const char *s, char ***ss, size_t * ns) -{ - const char *c = strchr (s, ','); - if (c == NULL) - { - add (s, s + strlen (s), ss, ns); - } - else - { - add (s, c, ss, ns); - split (c + 1, ss, ns); - } +static void split(const char *s, char ***ss, size_t *ns) { + const char *c = strchr(s, ','); + if (c == NULL) { + add(s, s + strlen(s), ss, ns); + } else { + add(s, c, ss, ns); + split(c + 1, ss, ns); + } } -static void -parse (const char *s) -{ +static void parse(const char *s) { char **strings = NULL; size_t nstrings = 0; size_t i; - split (s, &strings, &nstrings); + split(s, &strings, &nstrings); - for (i = 0; i < nstrings; i++) - { - grpc_tracer_set_enabled (strings[i], 1); - } + for (i = 0; i < nstrings; i++) { + grpc_tracer_set_enabled(strings[i], 1); + } - for (i = 0; i < nstrings; i++) - { - gpr_free (strings[i]); - } - gpr_free (strings); + for (i = 0; i < nstrings; i++) { + gpr_free(strings[i]); + } + gpr_free(strings); } -void -grpc_tracer_init (const char *env_var) -{ - char *e = gpr_getenv (env_var); - if (e != NULL) - { - parse (e); - gpr_free (e); - } +void grpc_tracer_init(const char *env_var) { + char *e = gpr_getenv(env_var); + if (e != NULL) { + parse(e); + gpr_free(e); + } } -void -grpc_tracer_shutdown (void) -{ - while (tracers) - { - tracer *t = tracers; - tracers = t->next; - gpr_free (t); - } +void grpc_tracer_shutdown(void) { + while (tracers) { + tracer *t = tracers; + tracers = t->next; + gpr_free(t); + } } -int -grpc_tracer_set_enabled (const char *name, int enabled) -{ +int grpc_tracer_set_enabled(const char *name, int enabled) { tracer *t; - if (0 == strcmp (name, "all")) - { - for (t = tracers; t; t = t->next) - { - *t->flag = 1; - } + if (0 == strcmp(name, "all")) { + for (t = tracers; t; t = t->next) { + *t->flag = 1; + } + } else { + int found = 0; + for (t = tracers; t; t = t->next) { + if (0 == strcmp(name, t->name)) { + *t->flag = enabled; + found = 1; + } } - else - { - int found = 0; - for (t = tracers; t; t = t->next) - { - if (0 == strcmp (name, t->name)) - { - *t->flag = enabled; - found = 1; - } - } - if (!found) - { - gpr_log (GPR_ERROR, "Unknown trace var: '%s'", name); - return 0; /* early return */ - } + if (!found) { + gpr_log(GPR_ERROR, "Unknown trace var: '%s'", name); + return 0; /* early return */ } + } return 1; } diff --git a/src/core/debug/trace.h b/src/core/debug/trace.h index d11074d7c66..dc5875976e2 100644 --- a/src/core/debug/trace.h +++ b/src/core/debug/trace.h @@ -36,8 +36,8 @@ #include -void grpc_register_tracer (const char *name, int *flag); -void grpc_tracer_init (const char *env_var_name); -void grpc_tracer_shutdown (void); +void grpc_register_tracer(const char *name, int *flag); +void grpc_tracer_init(const char *env_var_name); +void grpc_tracer_shutdown(void); #endif /* GRPC_INTERNAL_CORE_DEBUG_TRACE_H */ diff --git a/src/core/httpcli/format_request.c b/src/core/httpcli/format_request.c index 367fef9e32f..6189fce86b4 100644 --- a/src/core/httpcli/format_request.c +++ b/src/core/httpcli/format_request.c @@ -43,86 +43,78 @@ #include #include -static void -fill_common_header (const grpc_httpcli_request * request, gpr_strvec * buf) -{ +static void fill_common_header(const grpc_httpcli_request *request, + gpr_strvec *buf) { size_t i; - gpr_strvec_add (buf, gpr_strdup (request->path)); - gpr_strvec_add (buf, gpr_strdup (" HTTP/1.0\r\n")); + gpr_strvec_add(buf, gpr_strdup(request->path)); + gpr_strvec_add(buf, gpr_strdup(" HTTP/1.0\r\n")); /* just in case some crazy server really expects HTTP/1.1 */ - gpr_strvec_add (buf, gpr_strdup ("Host: ")); - gpr_strvec_add (buf, gpr_strdup (request->host)); - gpr_strvec_add (buf, gpr_strdup ("\r\n")); - gpr_strvec_add (buf, gpr_strdup ("Connection: close\r\n")); - gpr_strvec_add (buf, gpr_strdup ("User-Agent: " GRPC_HTTPCLI_USER_AGENT "\r\n")); + gpr_strvec_add(buf, gpr_strdup("Host: ")); + gpr_strvec_add(buf, gpr_strdup(request->host)); + gpr_strvec_add(buf, gpr_strdup("\r\n")); + gpr_strvec_add(buf, gpr_strdup("Connection: close\r\n")); + gpr_strvec_add(buf, + gpr_strdup("User-Agent: " GRPC_HTTPCLI_USER_AGENT "\r\n")); /* user supplied headers */ - for (i = 0; i < request->hdr_count; i++) - { - gpr_strvec_add (buf, gpr_strdup (request->hdrs[i].key)); - gpr_strvec_add (buf, gpr_strdup (": ")); - gpr_strvec_add (buf, gpr_strdup (request->hdrs[i].value)); - gpr_strvec_add (buf, gpr_strdup ("\r\n")); - } + for (i = 0; i < request->hdr_count; i++) { + gpr_strvec_add(buf, gpr_strdup(request->hdrs[i].key)); + gpr_strvec_add(buf, gpr_strdup(": ")); + gpr_strvec_add(buf, gpr_strdup(request->hdrs[i].value)); + gpr_strvec_add(buf, gpr_strdup("\r\n")); + } } -gpr_slice -grpc_httpcli_format_get_request (const grpc_httpcli_request * request) -{ +gpr_slice grpc_httpcli_format_get_request(const grpc_httpcli_request *request) { gpr_strvec out; char *flat; size_t flat_len; - gpr_strvec_init (&out); - gpr_strvec_add (&out, gpr_strdup ("GET ")); - fill_common_header (request, &out); - gpr_strvec_add (&out, gpr_strdup ("\r\n")); + gpr_strvec_init(&out); + gpr_strvec_add(&out, gpr_strdup("GET ")); + fill_common_header(request, &out); + gpr_strvec_add(&out, gpr_strdup("\r\n")); - flat = gpr_strvec_flatten (&out, &flat_len); - gpr_strvec_destroy (&out); + flat = gpr_strvec_flatten(&out, &flat_len); + gpr_strvec_destroy(&out); - return gpr_slice_new (flat, flat_len, gpr_free); + return gpr_slice_new(flat, flat_len, gpr_free); } -gpr_slice -grpc_httpcli_format_post_request (const grpc_httpcli_request * request, const char *body_bytes, size_t body_size) -{ +gpr_slice grpc_httpcli_format_post_request(const grpc_httpcli_request *request, + const char *body_bytes, + size_t body_size) { gpr_strvec out; char *tmp; size_t out_len; size_t i; - gpr_strvec_init (&out); + gpr_strvec_init(&out); - gpr_strvec_add (&out, gpr_strdup ("POST ")); - fill_common_header (request, &out); - if (body_bytes) - { - gpr_uint8 has_content_type = 0; - for (i = 0; i < request->hdr_count; i++) - { - if (strcmp (request->hdrs[i].key, "Content-Type") == 0) - { - has_content_type = 1; - break; - } - } - if (!has_content_type) - { - gpr_strvec_add (&out, gpr_strdup ("Content-Type: text/plain\r\n")); - } - gpr_asprintf (&tmp, "Content-Length: %lu\r\n", (unsigned long) body_size); - gpr_strvec_add (&out, tmp); + gpr_strvec_add(&out, gpr_strdup("POST ")); + fill_common_header(request, &out); + if (body_bytes) { + gpr_uint8 has_content_type = 0; + for (i = 0; i < request->hdr_count; i++) { + if (strcmp(request->hdrs[i].key, "Content-Type") == 0) { + has_content_type = 1; + break; + } } - gpr_strvec_add (&out, gpr_strdup ("\r\n")); - tmp = gpr_strvec_flatten (&out, &out_len); - gpr_strvec_destroy (&out); - - if (body_bytes) - { - tmp = gpr_realloc (tmp, out_len + body_size); - memcpy (tmp + out_len, body_bytes, body_size); - out_len += body_size; + if (!has_content_type) { + gpr_strvec_add(&out, gpr_strdup("Content-Type: text/plain\r\n")); } + gpr_asprintf(&tmp, "Content-Length: %lu\r\n", (unsigned long)body_size); + gpr_strvec_add(&out, tmp); + } + gpr_strvec_add(&out, gpr_strdup("\r\n")); + tmp = gpr_strvec_flatten(&out, &out_len); + gpr_strvec_destroy(&out); + + if (body_bytes) { + tmp = gpr_realloc(tmp, out_len + body_size); + memcpy(tmp + out_len, body_bytes, body_size); + out_len += body_size; + } - return gpr_slice_new (tmp, out_len, gpr_free); + return gpr_slice_new(tmp, out_len, gpr_free); } diff --git a/src/core/httpcli/format_request.h b/src/core/httpcli/format_request.h index 2238c0da502..c8dc8f7d4ee 100644 --- a/src/core/httpcli/format_request.h +++ b/src/core/httpcli/format_request.h @@ -37,7 +37,9 @@ #include "src/core/httpcli/httpcli.h" #include -gpr_slice grpc_httpcli_format_get_request (const grpc_httpcli_request * request); -gpr_slice grpc_httpcli_format_post_request (const grpc_httpcli_request * request, const char *body_bytes, size_t body_size); +gpr_slice grpc_httpcli_format_get_request(const grpc_httpcli_request *request); +gpr_slice grpc_httpcli_format_post_request(const grpc_httpcli_request *request, + const char *body_bytes, + size_t body_size); #endif /* GRPC_INTERNAL_CORE_HTTPCLI_FORMAT_REQUEST_H */ diff --git a/src/core/httpcli/httpcli.c b/src/core/httpcli/httpcli.c index e2763e00447..a87f1aa87bc 100644 --- a/src/core/httpcli/httpcli.c +++ b/src/core/httpcli/httpcli.c @@ -46,8 +46,7 @@ #include #include -typedef struct -{ +typedef struct { gpr_slice request_text; grpc_httpcli_parser parser; grpc_resolved_addresses *addresses; @@ -72,230 +71,211 @@ 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, void (*on_done) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint)) -{ - on_done (exec_ctx, arg, endpoint); +static void plaintext_handshake(grpc_exec_ctx *exec_ctx, void *arg, + grpc_endpoint *endpoint, const char *host, + void (*on_done)(grpc_exec_ctx *exec_ctx, + void *arg, + grpc_endpoint *endpoint)) { + on_done(exec_ctx, arg, endpoint); } -const grpc_httpcli_handshaker grpc_httpcli_plaintext = { "http", - plaintext_handshake -}; +const grpc_httpcli_handshaker grpc_httpcli_plaintext = {"http", + plaintext_handshake}; -void -grpc_httpcli_context_init (grpc_httpcli_context * context) -{ - grpc_pollset_set_init (&context->pollset_set); +void grpc_httpcli_context_init(grpc_httpcli_context *context) { + grpc_pollset_set_init(&context->pollset_set); } -void -grpc_httpcli_context_destroy (grpc_httpcli_context * context) -{ - grpc_pollset_set_destroy (&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); +static void next_address(grpc_exec_ctx *exec_ctx, internal_request *req); -static void -finish (grpc_exec_ctx * exec_ctx, internal_request * req, int success) -{ - grpc_pollset_set_del_pollset (exec_ctx, &req->context->pollset_set, req->pollset); - req->on_response (exec_ctx, req->user_data, success ? &req->parser.r : NULL); - grpc_httpcli_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); - } - gpr_slice_unref (req->request_text); - gpr_free (req->host); - grpc_iomgr_unregister_object (&req->iomgr_obj); - gpr_slice_buffer_destroy (&req->incoming); - gpr_slice_buffer_destroy (&req->outgoing); - gpr_free (req); +static void finish(grpc_exec_ctx *exec_ctx, internal_request *req, + int success) { + grpc_pollset_set_del_pollset(exec_ctx, &req->context->pollset_set, + req->pollset); + req->on_response(exec_ctx, req->user_data, success ? &req->parser.r : NULL); + grpc_httpcli_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); + } + gpr_slice_unref(req->request_text); + gpr_free(req->host); + grpc_iomgr_unregister_object(&req->iomgr_obj); + gpr_slice_buffer_destroy(&req->incoming); + gpr_slice_buffer_destroy(&req->outgoing); + gpr_free(req); } -static void on_read (grpc_exec_ctx * exec_ctx, void *user_data, int success); +static void on_read(grpc_exec_ctx *exec_ctx, void *user_data, int success); -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(grpc_exec_ctx *exec_ctx, internal_request *req) { + grpc_endpoint_read(exec_ctx, req->ep, &req->incoming, &req->on_read); } -static void -on_read (grpc_exec_ctx * exec_ctx, void *user_data, int success) -{ +static void on_read(grpc_exec_ctx *exec_ctx, void *user_data, int success) { internal_request *req = user_data; size_t i; - for (i = 0; i < req->incoming.count; i++) - { - if (GPR_SLICE_LENGTH (req->incoming.slices[i])) - { - req->have_read_byte = 1; - if (!grpc_httpcli_parser_parse (&req->parser, req->incoming.slices[i])) - { - finish (exec_ctx, req, 0); - return; - } - } + for (i = 0; i < req->incoming.count; i++) { + if (GPR_SLICE_LENGTH(req->incoming.slices[i])) { + req->have_read_byte = 1; + if (!grpc_httpcli_parser_parse(&req->parser, req->incoming.slices[i])) { + finish(exec_ctx, req, 0); + return; + } } + } - if (success) - { - do_read (exec_ctx, req); - } - else if (!req->have_read_byte) - { - next_address (exec_ctx, req); - } - else - { - finish (exec_ctx, req, grpc_httpcli_parser_eof (&req->parser)); - } + if (success) { + do_read(exec_ctx, req); + } else if (!req->have_read_byte) { + next_address(exec_ctx, req); + } else { + finish(exec_ctx, req, grpc_httpcli_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(grpc_exec_ctx *exec_ctx, internal_request *req) { + do_read(exec_ctx, req); } -static void -done_write (grpc_exec_ctx * exec_ctx, void *arg, int success) -{ +static void done_write(grpc_exec_ctx *exec_ctx, void *arg, int success) { internal_request *req = arg; - if (success) - { - on_written (exec_ctx, req); - } - else - { - next_address (exec_ctx, req); - } + if (success) { + on_written(exec_ctx, req); + } else { + next_address(exec_ctx, req); + } } -static void -start_write (grpc_exec_ctx * exec_ctx, internal_request * req) -{ - gpr_slice_ref (req->request_text); - gpr_slice_buffer_add (&req->outgoing, req->request_text); - grpc_endpoint_write (exec_ctx, req->ep, &req->outgoing, &req->done_write); +static void start_write(grpc_exec_ctx *exec_ctx, internal_request *req) { + gpr_slice_ref(req->request_text); + gpr_slice_buffer_add(&req->outgoing, req->request_text); + grpc_endpoint_write(exec_ctx, 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(grpc_exec_ctx *exec_ctx, void *arg, + grpc_endpoint *ep) { internal_request *req = arg; - if (!ep) - { - next_address (exec_ctx, req); - return; - } + if (!ep) { + next_address(exec_ctx, req); + return; + } req->ep = ep; - start_write (exec_ctx, req); + start_write(exec_ctx, req); } -static void -on_connected (grpc_exec_ctx * exec_ctx, void *arg, int success) -{ +static void on_connected(grpc_exec_ctx *exec_ctx, void *arg, int success) { internal_request *req = arg; - if (!req->ep) - { - next_address (exec_ctx, req); - return; - } - req->handshaker->handshake (exec_ctx, req, req->ep, req->host, on_handshake_done); + if (!req->ep) { + next_address(exec_ctx, req); + return; + } + req->handshaker->handshake(exec_ctx, req, req->ep, req->host, + on_handshake_done); } -static void -next_address (grpc_exec_ctx * exec_ctx, internal_request * req) -{ +static void next_address(grpc_exec_ctx *exec_ctx, internal_request *req) { grpc_resolved_address *addr; - if (req->next_address == req->addresses->naddrs) - { - finish (exec_ctx, req, 0); - return; - } + if (req->next_address == req->addresses->naddrs) { + finish(exec_ctx, req, 0); + return; + } addr = &req->addresses->addrs[req->next_address++]; - grpc_closure_init (&req->connected, on_connected, req); - grpc_tcp_client_connect (exec_ctx, &req->connected, &req->ep, &req->context->pollset_set, (struct sockaddr *) &addr->addr, addr->len, req->deadline); + grpc_closure_init(&req->connected, on_connected, req); + grpc_tcp_client_connect( + exec_ctx, &req->connected, &req->ep, &req->context->pollset_set, + (struct sockaddr *)&addr->addr, addr->len, req->deadline); } -static void -on_resolved (grpc_exec_ctx * exec_ctx, void *arg, grpc_resolved_addresses * addresses) -{ +static void on_resolved(grpc_exec_ctx *exec_ctx, void *arg, + grpc_resolved_addresses *addresses) { internal_request *req = arg; - if (!addresses) - { - finish (exec_ctx, req, 0); - return; - } + if (!addresses) { + finish(exec_ctx, req, 0); + return; + } req->addresses = addresses; req->next_address = 0; - next_address (exec_ctx, req); + next_address(exec_ctx, req); } -static void -internal_request_begin (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, const char *name, gpr_slice request_text) -{ - internal_request *req = gpr_malloc (sizeof (internal_request)); - memset (req, 0, sizeof (*req)); +static void internal_request_begin( + grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context, + grpc_pollset *pollset, const grpc_httpcli_request *request, + gpr_timespec deadline, grpc_httpcli_response_cb on_response, + void *user_data, const char *name, gpr_slice request_text) { + internal_request *req = gpr_malloc(sizeof(internal_request)); + memset(req, 0, sizeof(*req)); req->request_text = request_text; - grpc_httpcli_parser_init (&req->parser); + grpc_httpcli_parser_init(&req->parser); req->on_response = on_response; req->user_data = user_data; req->deadline = deadline; - req->handshaker = request->handshaker ? request->handshaker : &grpc_httpcli_plaintext; + req->handshaker = + request->handshaker ? request->handshaker : &grpc_httpcli_plaintext; req->context = context; req->pollset = pollset; - grpc_closure_init (&req->on_read, on_read, req); - grpc_closure_init (&req->done_write, done_write, req); - gpr_slice_buffer_init (&req->incoming); - gpr_slice_buffer_init (&req->outgoing); - grpc_iomgr_register_object (&req->iomgr_obj, name); - req->host = gpr_strdup (request->host); + grpc_closure_init(&req->on_read, on_read, req); + grpc_closure_init(&req->done_write, done_write, req); + gpr_slice_buffer_init(&req->incoming); + gpr_slice_buffer_init(&req->outgoing); + grpc_iomgr_register_object(&req->iomgr_obj, name); + req->host = gpr_strdup(request->host); - grpc_pollset_set_add_pollset (exec_ctx, &req->context->pollset_set, req->pollset); - grpc_resolve_address (request->host, req->handshaker->default_port, on_resolved, req); + grpc_pollset_set_add_pollset(exec_ctx, &req->context->pollset_set, + req->pollset); + grpc_resolve_address(request->host, req->handshaker->default_port, + on_resolved, req); } -void -grpc_httpcli_get (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ +void grpc_httpcli_get(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context, + grpc_pollset *pollset, + const grpc_httpcli_request *request, + gpr_timespec deadline, + grpc_httpcli_response_cb on_response, void *user_data) { char *name; - if (g_get_override && g_get_override (exec_ctx, request, deadline, on_response, user_data)) - { - return; - } - gpr_asprintf (&name, "HTTP:GET:%s:%s", request->host, request->path); - internal_request_begin (exec_ctx, context, pollset, request, deadline, on_response, user_data, name, grpc_httpcli_format_get_request (request)); - gpr_free (name); + if (g_get_override && + g_get_override(exec_ctx, request, deadline, on_response, user_data)) { + return; + } + gpr_asprintf(&name, "HTTP:GET:%s:%s", request->host, request->path); + internal_request_begin(exec_ctx, context, pollset, request, deadline, + on_response, user_data, name, + grpc_httpcli_format_get_request(request)); + gpr_free(name); } -void -grpc_httpcli_post (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ +void grpc_httpcli_post(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context, + grpc_pollset *pollset, + const grpc_httpcli_request *request, + const char *body_bytes, size_t body_size, + gpr_timespec deadline, + grpc_httpcli_response_cb on_response, void *user_data) { char *name; - if (g_post_override && g_post_override (exec_ctx, request, body_bytes, body_size, deadline, on_response, user_data)) - { - return; - } - gpr_asprintf (&name, "HTTP:POST:%s:%s", request->host, request->path); - internal_request_begin (exec_ctx, context, pollset, request, deadline, on_response, user_data, name, grpc_httpcli_format_post_request (request, body_bytes, body_size)); - gpr_free (name); + if (g_post_override && + g_post_override(exec_ctx, request, body_bytes, body_size, deadline, + on_response, user_data)) { + return; + } + gpr_asprintf(&name, "HTTP:POST:%s:%s", request->host, request->path); + internal_request_begin( + exec_ctx, context, pollset, request, deadline, on_response, user_data, + name, grpc_httpcli_format_post_request(request, body_bytes, body_size)); + gpr_free(name); } -void -grpc_httpcli_set_override (grpc_httpcli_get_override get, grpc_httpcli_post_override post) -{ +void grpc_httpcli_set_override(grpc_httpcli_get_override get, + grpc_httpcli_post_override post) { g_get_override = get; g_post_override = post; } diff --git a/src/core/httpcli/httpcli.h b/src/core/httpcli/httpcli.h index 9c489721b6e..6469c2f03e7 100644 --- a/src/core/httpcli/httpcli.h +++ b/src/core/httpcli/httpcli.h @@ -47,8 +47,7 @@ #define GRPC_HTTPCLI_MAX_HEADER_LENGTH 4096 /* A single header to be passed in a request */ -typedef struct grpc_httpcli_header -{ +typedef struct grpc_httpcli_header { char *key; char *value; } grpc_httpcli_header; @@ -56,23 +55,23 @@ typedef struct grpc_httpcli_header /* Tracks in-progress http requests TODO(ctiller): allow caching and capturing multiple requests for the same content and combining them */ -typedef struct grpc_httpcli_context -{ +typedef struct grpc_httpcli_context { grpc_pollset_set pollset_set; } grpc_httpcli_context; -typedef struct -{ +typedef struct { const char *default_port; - void (*handshake) (grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint * endpoint, const char *host, void (*on_done) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint)); + void (*handshake)(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *endpoint, + const char *host, + void (*on_done)(grpc_exec_ctx *exec_ctx, void *arg, + grpc_endpoint *endpoint)); } grpc_httpcli_handshaker; extern const grpc_httpcli_handshaker grpc_httpcli_plaintext; extern const grpc_httpcli_handshaker grpc_httpcli_ssl; /* A request */ -typedef struct grpc_httpcli_request -{ +typedef struct grpc_httpcli_request { /* The host name to connect to */ char *host; /* The path of the resource to fetch */ @@ -87,8 +86,7 @@ typedef struct grpc_httpcli_request } grpc_httpcli_request; /* A response */ -typedef struct grpc_httpcli_response -{ +typedef struct grpc_httpcli_response { /* HTTP status code */ int status; /* Headers: count and key/values */ @@ -100,10 +98,12 @@ typedef struct grpc_httpcli_response } grpc_httpcli_response; /* Callback for grpc_httpcli_get and grpc_httpcli_post. */ -typedef void (*grpc_httpcli_response_cb) (grpc_exec_ctx * exec_ctx, void *user_data, const grpc_httpcli_response * response); +typedef void (*grpc_httpcli_response_cb)(grpc_exec_ctx *exec_ctx, + void *user_data, + const grpc_httpcli_response *response); -void grpc_httpcli_context_init (grpc_httpcli_context * context); -void grpc_httpcli_context_destroy (grpc_httpcli_context * context); +void grpc_httpcli_context_init(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 @@ -115,7 +115,11 @@ void grpc_httpcli_context_destroy (grpc_httpcli_context * context); 'deadline' contains a deadline for the request (or gpr_inf_future) 'on_response' is a callback to report results to (and 'user_data' is a user supplied pointer to pass to said call) */ -void grpc_httpcli_get (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data); +void grpc_httpcli_get(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context, + grpc_pollset *pollset, + const grpc_httpcli_request *request, + gpr_timespec deadline, + grpc_httpcli_response_cb on_response, void *user_data); /* Asynchronously perform a HTTP POST. 'context' specifies the http context under which to do the post @@ -132,12 +136,25 @@ void grpc_httpcli_get (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, 'on_response' is a callback to report results to (and 'user_data' is a user supplied pointer to pass to said call) Does not support ?var1=val1&var2=val2 in the path. */ -void grpc_httpcli_post (grpc_exec_ctx * exec_ctx, grpc_httpcli_context * context, grpc_pollset * pollset, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data); +void grpc_httpcli_post(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context, + grpc_pollset *pollset, + const grpc_httpcli_request *request, + const char *body_bytes, size_t body_size, + gpr_timespec deadline, + grpc_httpcli_response_cb on_response, void *user_data); /* 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, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data); -typedef int (*grpc_httpcli_post_override) (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data); - -void grpc_httpcli_set_override (grpc_httpcli_get_override get, grpc_httpcli_post_override post); +typedef int (*grpc_httpcli_get_override)(grpc_exec_ctx *exec_ctx, + const grpc_httpcli_request *request, + gpr_timespec deadline, + grpc_httpcli_response_cb on_response, + void *user_data); +typedef int (*grpc_httpcli_post_override)( + grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, + const char *body_bytes, size_t body_size, gpr_timespec deadline, + grpc_httpcli_response_cb on_response, void *user_data); + +void grpc_httpcli_set_override(grpc_httpcli_get_override get, + grpc_httpcli_post_override post); #endif /* GRPC_INTERNAL_CORE_HTTPCLI_HTTPCLI_H */ diff --git a/src/core/httpcli/httpcli_security_connector.c b/src/core/httpcli/httpcli_security_connector.c index a9b9a5991e9..fc6699c9181 100644 --- a/src/core/httpcli/httpcli_security_connector.c +++ b/src/core/httpcli/httpcli_security_connector.c @@ -42,146 +42,147 @@ #include #include "src/core/tsi/ssl_transport_security.h" -typedef struct -{ +typedef struct { grpc_channel_security_connector base; tsi_ssl_handshaker_factory *handshaker_factory; char *secure_peer_name; } grpc_httpcli_ssl_channel_security_connector; -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) - { - tsi_ssl_handshaker_factory_destroy (c->handshaker_factory); - } - if (c->secure_peer_name != NULL) - gpr_free (c->secure_peer_name); - gpr_free (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) { + tsi_ssl_handshaker_factory_destroy(c->handshaker_factory); + } + if (c->secure_peer_name != NULL) gpr_free(c->secure_peer_name); + gpr_free(sc); } -static void -httpcli_ssl_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) -{ - grpc_httpcli_ssl_channel_security_connector *c = (grpc_httpcli_ssl_channel_security_connector *) sc; +static void httpcli_ssl_do_handshake(grpc_exec_ctx *exec_ctx, + grpc_security_connector *sc, + grpc_endpoint *nonsecure_endpoint, + grpc_security_handshake_done_cb cb, + void *user_data) { + grpc_httpcli_ssl_channel_security_connector *c = + (grpc_httpcli_ssl_channel_security_connector *)sc; tsi_result result = TSI_OK; tsi_handshaker *handshaker; - if (c->handshaker_factory == NULL) - { - cb (exec_ctx, user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL); - return; - } - result = tsi_ssl_handshaker_factory_create_handshaker (c->handshaker_factory, c->secure_peer_name, &handshaker); - if (result != TSI_OK) - { - gpr_log (GPR_ERROR, "Handshaker creation failed with error %s.", tsi_result_to_string (result)); - cb (exec_ctx, user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL); - } - else - { - grpc_do_security_handshake (exec_ctx, handshaker, sc, nonsecure_endpoint, cb, user_data); - } + if (c->handshaker_factory == NULL) { + cb(exec_ctx, user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL); + return; + } + result = tsi_ssl_handshaker_factory_create_handshaker( + c->handshaker_factory, c->secure_peer_name, &handshaker); + if (result != TSI_OK) { + gpr_log(GPR_ERROR, "Handshaker creation failed with error %s.", + tsi_result_to_string(result)); + cb(exec_ctx, user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL); + } else { + grpc_do_security_handshake(exec_ctx, handshaker, sc, nonsecure_endpoint, cb, + user_data); + } } -static grpc_security_status -httpcli_ssl_check_peer (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data) -{ - grpc_httpcli_ssl_channel_security_connector *c = (grpc_httpcli_ssl_channel_security_connector *) sc; +static grpc_security_status httpcli_ssl_check_peer(grpc_security_connector *sc, + tsi_peer peer, + grpc_security_check_cb cb, + void *user_data) { + grpc_httpcli_ssl_channel_security_connector *c = + (grpc_httpcli_ssl_channel_security_connector *)sc; grpc_security_status status = GRPC_SECURITY_OK; /* Check the peer name. */ - if (c->secure_peer_name != NULL && !tsi_ssl_peer_matches_name (&peer, c->secure_peer_name)) - { - gpr_log (GPR_ERROR, "Peer name %s is not in peer certificate", c->secure_peer_name); - status = GRPC_SECURITY_ERROR; - } - tsi_peer_destruct (&peer); + if (c->secure_peer_name != NULL && + !tsi_ssl_peer_matches_name(&peer, c->secure_peer_name)) { + gpr_log(GPR_ERROR, "Peer name %s is not in peer certificate", + c->secure_peer_name); + status = GRPC_SECURITY_ERROR; + } + tsi_peer_destruct(&peer); return status; } static grpc_security_connector_vtable httpcli_ssl_vtable = { - httpcli_ssl_destroy, httpcli_ssl_do_handshake, httpcli_ssl_check_peer -}; + httpcli_ssl_destroy, httpcli_ssl_do_handshake, httpcli_ssl_check_peer}; -static grpc_security_status -httpcli_ssl_channel_security_connector_create (const unsigned char *pem_root_certs, size_t pem_root_certs_size, const char *secure_peer_name, grpc_channel_security_connector ** sc) -{ +static grpc_security_status httpcli_ssl_channel_security_connector_create( + const unsigned char *pem_root_certs, size_t pem_root_certs_size, + const char *secure_peer_name, grpc_channel_security_connector **sc) { tsi_result result = TSI_OK; grpc_httpcli_ssl_channel_security_connector *c; - if (secure_peer_name != NULL && pem_root_certs == NULL) - { - gpr_log (GPR_ERROR, "Cannot assert a secure peer name without a trust root."); - return GRPC_SECURITY_ERROR; - } + if (secure_peer_name != NULL && pem_root_certs == NULL) { + gpr_log(GPR_ERROR, + "Cannot assert a secure peer name without a trust root."); + return GRPC_SECURITY_ERROR; + } - c = gpr_malloc (sizeof (grpc_httpcli_ssl_channel_security_connector)); - memset (c, 0, sizeof (grpc_httpcli_ssl_channel_security_connector)); + c = gpr_malloc(sizeof(grpc_httpcli_ssl_channel_security_connector)); + memset(c, 0, sizeof(grpc_httpcli_ssl_channel_security_connector)); - gpr_ref_init (&c->base.base.refcount, 1); + gpr_ref_init(&c->base.base.refcount, 1); c->base.base.is_client_side = 1; c->base.base.vtable = &httpcli_ssl_vtable; - if (secure_peer_name != NULL) - { - c->secure_peer_name = gpr_strdup (secure_peer_name); - } - result = tsi_create_ssl_client_handshaker_factory (NULL, 0, NULL, 0, pem_root_certs, pem_root_certs_size, NULL, NULL, NULL, 0, &c->handshaker_factory); - 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); - *sc = NULL; - return GRPC_SECURITY_ERROR; - } + if (secure_peer_name != NULL) { + c->secure_peer_name = gpr_strdup(secure_peer_name); + } + result = tsi_create_ssl_client_handshaker_factory( + NULL, 0, NULL, 0, pem_root_certs, pem_root_certs_size, NULL, NULL, NULL, + 0, &c->handshaker_factory); + 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); + *sc = NULL; + return GRPC_SECURITY_ERROR; + } *sc = &c->base; return GRPC_SECURITY_OK; } /* handshaker */ -typedef struct -{ - void (*func) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint); +typedef struct { + void (*func)(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *endpoint); void *arg; } on_done_closure; -static void -on_secure_transport_setup_done (grpc_exec_ctx * exec_ctx, void *rp, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint) -{ +static void on_secure_transport_setup_done(grpc_exec_ctx *exec_ctx, void *rp, + grpc_security_status status, + grpc_endpoint *wrapped_endpoint, + grpc_endpoint *secure_endpoint) { on_done_closure *c = rp; - if (status != GRPC_SECURITY_OK) - { - gpr_log (GPR_ERROR, "Secure transport setup failed with error %d.", status); - c->func (exec_ctx, c->arg, NULL); - } - else - { - c->func (exec_ctx, c->arg, secure_endpoint); - } - gpr_free (c); + if (status != GRPC_SECURITY_OK) { + gpr_log(GPR_ERROR, "Secure transport setup failed with error %d.", status); + c->func(exec_ctx, c->arg, NULL); + } else { + c->func(exec_ctx, c->arg, secure_endpoint); + } + gpr_free(c); } -static void -ssl_handshake (grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint * tcp, const char *host, void (*on_done) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * endpoint)) -{ +static void ssl_handshake(grpc_exec_ctx *exec_ctx, void *arg, + grpc_endpoint *tcp, const char *host, + void (*on_done)(grpc_exec_ctx *exec_ctx, void *arg, + grpc_endpoint *endpoint)) { grpc_channel_security_connector *sc = NULL; const unsigned char *pem_root_certs = NULL; - on_done_closure *c = gpr_malloc (sizeof (*c)); - size_t pem_root_certs_size = grpc_get_default_ssl_roots (&pem_root_certs); - if (pem_root_certs == NULL || pem_root_certs_size == 0) - { - gpr_log (GPR_ERROR, "Could not get default pem root certs."); - on_done (exec_ctx, arg, NULL); - gpr_free (c); - return; - } + on_done_closure *c = gpr_malloc(sizeof(*c)); + size_t pem_root_certs_size = grpc_get_default_ssl_roots(&pem_root_certs); + if (pem_root_certs == NULL || pem_root_certs_size == 0) { + gpr_log(GPR_ERROR, "Could not get default pem root certs."); + on_done(exec_ctx, arg, NULL); + gpr_free(c); + return; + } c->func = on_done; c->arg = arg; - GPR_ASSERT (httpcli_ssl_channel_security_connector_create (pem_root_certs, pem_root_certs_size, host, &sc) == GRPC_SECURITY_OK); - grpc_security_connector_do_handshake (exec_ctx, &sc->base, tcp, on_secure_transport_setup_done, c); - GRPC_SECURITY_CONNECTOR_UNREF (&sc->base, "httpcli"); + GPR_ASSERT(httpcli_ssl_channel_security_connector_create( + pem_root_certs, pem_root_certs_size, host, &sc) == + GRPC_SECURITY_OK); + grpc_security_connector_do_handshake(exec_ctx, &sc->base, tcp, + on_secure_transport_setup_done, c); + GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "httpcli"); } -const grpc_httpcli_handshaker grpc_httpcli_ssl = { "https", ssl_handshake }; +const grpc_httpcli_handshaker grpc_httpcli_ssl = {"https", ssl_handshake}; diff --git a/src/core/httpcli/parser.c b/src/core/httpcli/parser.c index 3c9211efba0..404906d5ae2 100644 --- a/src/core/httpcli/parser.c +++ b/src/core/httpcli/parser.c @@ -39,220 +39,178 @@ #include #include -static int -handle_response_line (grpc_httpcli_parser * parser) -{ +static int handle_response_line(grpc_httpcli_parser *parser) { gpr_uint8 *beg = parser->cur_line; gpr_uint8 *cur = beg; gpr_uint8 *end = beg + parser->cur_line_length; - if (cur == end || *cur++ != 'H') - goto error; - if (cur == end || *cur++ != 'T') - goto error; - if (cur == end || *cur++ != 'T') - goto error; - if (cur == end || *cur++ != 'P') - goto error; - if (cur == end || *cur++ != '/') - goto error; - if (cur == end || *cur++ != '1') - goto error; - if (cur == end || *cur++ != '.') - goto error; - if (cur == end || *cur < '0' || *cur++ > '1') - goto error; - if (cur == end || *cur++ != ' ') - goto error; - if (cur == end || *cur < '1' || *cur++ > '9') - goto error; - if (cur == end || *cur < '0' || *cur++ > '9') - goto error; - if (cur == end || *cur < '0' || *cur++ > '9') - goto error; - parser->r.status = (cur[-3] - '0') * 100 + (cur[-2] - '0') * 10 + (cur[-1] - '0'); - if (cur == end || *cur++ != ' ') - goto error; + if (cur == end || *cur++ != 'H') goto error; + if (cur == end || *cur++ != 'T') goto error; + if (cur == end || *cur++ != 'T') goto error; + if (cur == end || *cur++ != 'P') goto error; + if (cur == end || *cur++ != '/') goto error; + if (cur == end || *cur++ != '1') goto error; + if (cur == end || *cur++ != '.') goto error; + if (cur == end || *cur < '0' || *cur++ > '1') goto error; + if (cur == end || *cur++ != ' ') goto error; + if (cur == end || *cur < '1' || *cur++ > '9') goto error; + if (cur == end || *cur < '0' || *cur++ > '9') goto error; + if (cur == end || *cur < '0' || *cur++ > '9') goto error; + parser->r.status = + (cur[-3] - '0') * 100 + (cur[-2] - '0') * 10 + (cur[-1] - '0'); + if (cur == end || *cur++ != ' ') goto error; /* we don't really care about the status code message */ return 1; error: - gpr_log (GPR_ERROR, "Failed parsing response line"); + gpr_log(GPR_ERROR, "Failed parsing response line"); return 0; } -static char * -buf2str (void *buffer, size_t length) -{ - char *out = gpr_malloc (length + 1); - memcpy (out, buffer, length); +static char *buf2str(void *buffer, size_t length) { + char *out = gpr_malloc(length + 1); + memcpy(out, buffer, length); out[length] = 0; return out; } -static int -add_header (grpc_httpcli_parser * parser) -{ +static int add_header(grpc_httpcli_parser *parser) { gpr_uint8 *beg = parser->cur_line; gpr_uint8 *cur = beg; gpr_uint8 *end = beg + parser->cur_line_length; - grpc_httpcli_header hdr = { NULL, NULL }; + grpc_httpcli_header hdr = {NULL, NULL}; - GPR_ASSERT (cur != end); + GPR_ASSERT(cur != end); - if (*cur == ' ' || *cur == '\t') - { - gpr_log (GPR_ERROR, "Continued header lines not supported yet"); - goto error; - } - - while (cur != end && *cur != ':') - { - cur++; - } - if (cur == end) - { - gpr_log (GPR_ERROR, "Didn't find ':' in header string"); - goto error; - } - GPR_ASSERT (cur >= beg); - hdr.key = buf2str (beg, (size_t) (cur - beg)); - cur++; /* skip : */ - - while (cur != end && (*cur == ' ' || *cur == '\t')) - { - cur++; - } - GPR_ASSERT (end - cur >= 2); - hdr.value = buf2str (cur, (size_t) (end - cur) - 2); + if (*cur == ' ' || *cur == '\t') { + gpr_log(GPR_ERROR, "Continued header lines not supported yet"); + goto error; + } - if (parser->r.hdr_count == parser->hdr_capacity) - { - parser->hdr_capacity = GPR_MAX (parser->hdr_capacity + 1, parser->hdr_capacity * 3 / 2); - parser->r.hdrs = gpr_realloc (parser->r.hdrs, parser->hdr_capacity * sizeof (*parser->r.hdrs)); - } + while (cur != end && *cur != ':') { + cur++; + } + if (cur == end) { + gpr_log(GPR_ERROR, "Didn't find ':' in header string"); + goto error; + } + GPR_ASSERT(cur >= beg); + hdr.key = buf2str(beg, (size_t)(cur - beg)); + cur++; /* skip : */ + + while (cur != end && (*cur == ' ' || *cur == '\t')) { + cur++; + } + GPR_ASSERT(end - cur >= 2); + hdr.value = buf2str(cur, (size_t)(end - cur) - 2); + + if (parser->r.hdr_count == parser->hdr_capacity) { + parser->hdr_capacity = + GPR_MAX(parser->hdr_capacity + 1, parser->hdr_capacity * 3 / 2); + parser->r.hdrs = gpr_realloc( + parser->r.hdrs, parser->hdr_capacity * sizeof(*parser->r.hdrs)); + } parser->r.hdrs[parser->r.hdr_count++] = hdr; return 1; error: - gpr_free (hdr.key); - gpr_free (hdr.value); + gpr_free(hdr.key); + gpr_free(hdr.value); return 0; } -static int -finish_line (grpc_httpcli_parser * parser) -{ - switch (parser->state) - { +static int finish_line(grpc_httpcli_parser *parser) { + switch (parser->state) { case GRPC_HTTPCLI_INITIAL_RESPONSE: - if (!handle_response_line (parser)) - { - return 0; - } + if (!handle_response_line(parser)) { + return 0; + } parser->state = GRPC_HTTPCLI_HEADERS; break; case GRPC_HTTPCLI_HEADERS: - if (parser->cur_line_length == 2) - { - parser->state = GRPC_HTTPCLI_BODY; - break; - } - if (!add_header (parser)) - { - return 0; - } + if (parser->cur_line_length == 2) { + parser->state = GRPC_HTTPCLI_BODY; + break; + } + if (!add_header(parser)) { + return 0; + } break; case GRPC_HTTPCLI_BODY: - gpr_log (GPR_ERROR, "should never reach here"); - abort (); - } + gpr_log(GPR_ERROR, "should never reach here"); + abort(); + } parser->cur_line_length = 0; return 1; } -static int -addbyte (grpc_httpcli_parser * parser, gpr_uint8 byte) -{ - switch (parser->state) - { +static int addbyte(grpc_httpcli_parser *parser, gpr_uint8 byte) { + switch (parser->state) { case GRPC_HTTPCLI_INITIAL_RESPONSE: case GRPC_HTTPCLI_HEADERS: - if (parser->cur_line_length >= GRPC_HTTPCLI_MAX_HEADER_LENGTH) - { - gpr_log (GPR_ERROR, "HTTP client max line length (%d) exceeded", GRPC_HTTPCLI_MAX_HEADER_LENGTH); - return 0; - } + if (parser->cur_line_length >= GRPC_HTTPCLI_MAX_HEADER_LENGTH) { + gpr_log(GPR_ERROR, "HTTP client max line length (%d) exceeded", + GRPC_HTTPCLI_MAX_HEADER_LENGTH); + return 0; + } parser->cur_line[parser->cur_line_length] = byte; parser->cur_line_length++; - if (parser->cur_line_length >= 2 && parser->cur_line[parser->cur_line_length - 2] == '\r' && parser->cur_line[parser->cur_line_length - 1] == '\n') - { - return finish_line (parser); - } - else - { - return 1; - } - gpr_log (GPR_ERROR, "should never reach here"); - abort (); + if (parser->cur_line_length >= 2 && + parser->cur_line[parser->cur_line_length - 2] == '\r' && + parser->cur_line[parser->cur_line_length - 1] == '\n') { + return finish_line(parser); + } else { + return 1; + } + gpr_log(GPR_ERROR, "should never reach here"); + abort(); case GRPC_HTTPCLI_BODY: - if (parser->r.body_length == parser->body_capacity) - { - parser->body_capacity = GPR_MAX (8, parser->body_capacity * 3 / 2); - parser->r.body = gpr_realloc ((void *) parser->r.body, parser->body_capacity); - } - parser->r.body[parser->r.body_length] = (char) byte; + if (parser->r.body_length == parser->body_capacity) { + parser->body_capacity = GPR_MAX(8, parser->body_capacity * 3 / 2); + parser->r.body = + gpr_realloc((void *)parser->r.body, parser->body_capacity); + } + parser->r.body[parser->r.body_length] = (char)byte; parser->r.body_length++; return 1; - } - gpr_log (GPR_ERROR, "should never reach here"); - abort (); + } + gpr_log(GPR_ERROR, "should never reach here"); + abort(); return 0; } -void -grpc_httpcli_parser_init (grpc_httpcli_parser * parser) -{ - memset (parser, 0, sizeof (*parser)); +void grpc_httpcli_parser_init(grpc_httpcli_parser *parser) { + memset(parser, 0, sizeof(*parser)); parser->state = GRPC_HTTPCLI_INITIAL_RESPONSE; parser->r.status = 500; } -void -grpc_httpcli_parser_destroy (grpc_httpcli_parser * parser) -{ +void grpc_httpcli_parser_destroy(grpc_httpcli_parser *parser) { size_t i; - gpr_free (parser->r.body); - for (i = 0; i < parser->r.hdr_count; i++) - { - gpr_free (parser->r.hdrs[i].key); - gpr_free (parser->r.hdrs[i].value); - } - gpr_free (parser->r.hdrs); + gpr_free(parser->r.body); + for (i = 0; i < parser->r.hdr_count; i++) { + gpr_free(parser->r.hdrs[i].key); + gpr_free(parser->r.hdrs[i].value); + } + gpr_free(parser->r.hdrs); } -int -grpc_httpcli_parser_parse (grpc_httpcli_parser * parser, gpr_slice slice) -{ +int grpc_httpcli_parser_parse(grpc_httpcli_parser *parser, gpr_slice slice) { size_t i; - for (i = 0; i < GPR_SLICE_LENGTH (slice); i++) - { - if (!addbyte (parser, GPR_SLICE_START_PTR (slice)[i])) - { - return 0; - } + for (i = 0; i < GPR_SLICE_LENGTH(slice); i++) { + if (!addbyte(parser, GPR_SLICE_START_PTR(slice)[i])) { + return 0; } + } return 1; } -int -grpc_httpcli_parser_eof (grpc_httpcli_parser * parser) -{ +int grpc_httpcli_parser_eof(grpc_httpcli_parser *parser) { return parser->state == GRPC_HTTPCLI_BODY; } diff --git a/src/core/httpcli/parser.h b/src/core/httpcli/parser.h index 9f7e04824c0..40b28f0ee89 100644 --- a/src/core/httpcli/parser.h +++ b/src/core/httpcli/parser.h @@ -38,15 +38,13 @@ #include #include -typedef enum -{ +typedef enum { GRPC_HTTPCLI_INITIAL_RESPONSE, GRPC_HTTPCLI_HEADERS, GRPC_HTTPCLI_BODY } grpc_httpcli_parser_state; -typedef struct -{ +typedef struct { grpc_httpcli_parser_state state; grpc_httpcli_response r; @@ -57,10 +55,10 @@ typedef struct size_t cur_line_length; } grpc_httpcli_parser; -void grpc_httpcli_parser_init (grpc_httpcli_parser * parser); -void grpc_httpcli_parser_destroy (grpc_httpcli_parser * parser); +void grpc_httpcli_parser_init(grpc_httpcli_parser* parser); +void grpc_httpcli_parser_destroy(grpc_httpcli_parser* parser); -int grpc_httpcli_parser_parse (grpc_httpcli_parser * parser, gpr_slice slice); -int grpc_httpcli_parser_eof (grpc_httpcli_parser * parser); +int grpc_httpcli_parser_parse(grpc_httpcli_parser* parser, gpr_slice slice); +int grpc_httpcli_parser_eof(grpc_httpcli_parser* parser); #endif /* GRPC_INTERNAL_CORE_HTTPCLI_PARSER_H */ diff --git a/src/core/iomgr/alarm.c b/src/core/iomgr/alarm.c index 31de5511519..0ba53616064 100644 --- a/src/core/iomgr/alarm.c +++ b/src/core/iomgr/alarm.c @@ -48,8 +48,7 @@ #define MIN_QUEUE_WINDOW_DURATION 0.01 #define MAX_QUEUE_WINDOW_DURATION 1 -typedef struct -{ +typedef struct { gpr_mu mu; grpc_time_averaged_stats stats; /* All and only alarms with deadlines <= this will be in the heap. */ @@ -73,140 +72,127 @@ static shard_type g_shards[NUM_SHARDS]; /* Protected by g_mu */ static shard_type *g_shard_queue[NUM_SHARDS]; -static int run_some_expired_alarms (grpc_exec_ctx * exec_ctx, gpr_timespec now, gpr_timespec * next, int success); +static int run_some_expired_alarms(grpc_exec_ctx *exec_ctx, gpr_timespec now, + gpr_timespec *next, int success); -static gpr_timespec -compute_min_deadline (shard_type * shard) -{ - return grpc_alarm_heap_is_empty (&shard->heap) ? shard->queue_deadline_cap : grpc_alarm_heap_top (&shard->heap)->deadline; +static gpr_timespec compute_min_deadline(shard_type *shard) { + return grpc_alarm_heap_is_empty(&shard->heap) + ? shard->queue_deadline_cap + : grpc_alarm_heap_top(&shard->heap)->deadline; } -void -grpc_alarm_list_init (gpr_timespec now) -{ +void grpc_alarm_list_init(gpr_timespec now) { gpr_uint32 i; - gpr_mu_init (&g_mu); - gpr_mu_init (&g_checker_mu); + gpr_mu_init(&g_mu); + gpr_mu_init(&g_checker_mu); g_clock_type = now.clock_type; - for (i = 0; i < NUM_SHARDS; i++) - { - shard_type *shard = &g_shards[i]; - gpr_mu_init (&shard->mu); - grpc_time_averaged_stats_init (&shard->stats, 1.0 / ADD_DEADLINE_SCALE, 0.1, 0.5); - shard->queue_deadline_cap = now; - shard->shard_queue_index = i; - grpc_alarm_heap_init (&shard->heap); - shard->list.next = shard->list.prev = &shard->list; - shard->min_deadline = compute_min_deadline (shard); - g_shard_queue[i] = shard; - } + for (i = 0; i < NUM_SHARDS; i++) { + shard_type *shard = &g_shards[i]; + gpr_mu_init(&shard->mu); + grpc_time_averaged_stats_init(&shard->stats, 1.0 / ADD_DEADLINE_SCALE, 0.1, + 0.5); + shard->queue_deadline_cap = now; + shard->shard_queue_index = i; + grpc_alarm_heap_init(&shard->heap); + shard->list.next = shard->list.prev = &shard->list; + shard->min_deadline = compute_min_deadline(shard); + g_shard_queue[i] = shard; + } } -void -grpc_alarm_list_shutdown (grpc_exec_ctx *exec_ctx) -{ +void grpc_alarm_list_shutdown(grpc_exec_ctx *exec_ctx) { int i; - run_some_expired_alarms (exec_ctx, gpr_inf_future (g_clock_type), NULL, 0); - for (i = 0; i < NUM_SHARDS; i++) - { - shard_type *shard = &g_shards[i]; - gpr_mu_destroy (&shard->mu); - grpc_alarm_heap_destroy (&shard->heap); - } - gpr_mu_destroy (&g_mu); - gpr_mu_destroy (&g_checker_mu); + run_some_expired_alarms(exec_ctx, gpr_inf_future(g_clock_type), NULL, 0); + for (i = 0; i < NUM_SHARDS; i++) { + shard_type *shard = &g_shards[i]; + gpr_mu_destroy(&shard->mu); + grpc_alarm_heap_destroy(&shard->heap); + } + gpr_mu_destroy(&g_mu); + gpr_mu_destroy(&g_checker_mu); } /* This is a cheap, but good enough, pointer hash for sharding the tasks: */ -static size_t -shard_idx (const grpc_alarm * info) -{ - size_t x = (size_t) info; +static size_t shard_idx(const grpc_alarm *info) { + size_t x = (size_t)info; return ((x >> 4) ^ (x >> 9) ^ (x >> 14)) & (NUM_SHARDS - 1); } -static double -ts_to_dbl (gpr_timespec ts) -{ - return (double) ts.tv_sec + 1e-9 * ts.tv_nsec; +static double ts_to_dbl(gpr_timespec ts) { + return (double)ts.tv_sec + 1e-9 * ts.tv_nsec; } -static gpr_timespec -dbl_to_ts (double d) -{ +static gpr_timespec dbl_to_ts(double d) { gpr_timespec ts; - ts.tv_sec = (time_t) d; - ts.tv_nsec = (int) (1e9 * (d - (double) ts.tv_sec)); + ts.tv_sec = (time_t)d; + ts.tv_nsec = (int)(1e9 * (d - (double)ts.tv_sec)); ts.clock_type = GPR_TIMESPAN; return ts; } -static void -list_join (grpc_alarm * head, grpc_alarm * alarm) -{ +static void list_join(grpc_alarm *head, grpc_alarm *alarm) { alarm->next = head; alarm->prev = head->prev; alarm->next->prev = alarm->prev->next = alarm; } -static void -list_remove (grpc_alarm * alarm) -{ +static void list_remove(grpc_alarm *alarm) { alarm->next->prev = alarm->prev; alarm->prev->next = alarm->next; } -static void -swap_adjacent_shards_in_queue (gpr_uint32 first_shard_queue_index) -{ +static void swap_adjacent_shards_in_queue(gpr_uint32 first_shard_queue_index) { shard_type *temp; temp = g_shard_queue[first_shard_queue_index]; - g_shard_queue[first_shard_queue_index] = g_shard_queue[first_shard_queue_index + 1]; + g_shard_queue[first_shard_queue_index] = + g_shard_queue[first_shard_queue_index + 1]; g_shard_queue[first_shard_queue_index + 1] = temp; - g_shard_queue[first_shard_queue_index]->shard_queue_index = first_shard_queue_index; - g_shard_queue[first_shard_queue_index + 1]->shard_queue_index = first_shard_queue_index + 1; + g_shard_queue[first_shard_queue_index]->shard_queue_index = + first_shard_queue_index; + g_shard_queue[first_shard_queue_index + 1]->shard_queue_index = + first_shard_queue_index + 1; } -static void -note_deadline_change (shard_type * shard) -{ - while (shard->shard_queue_index > 0 && gpr_time_cmp (shard->min_deadline, g_shard_queue[shard->shard_queue_index - 1]->min_deadline) < 0) - { - swap_adjacent_shards_in_queue (shard->shard_queue_index - 1); - } - while (shard->shard_queue_index < NUM_SHARDS - 1 && gpr_time_cmp (shard->min_deadline, g_shard_queue[shard->shard_queue_index + 1]->min_deadline) > 0) - { - swap_adjacent_shards_in_queue (shard->shard_queue_index); - } +static void note_deadline_change(shard_type *shard) { + while (shard->shard_queue_index > 0 && + gpr_time_cmp( + shard->min_deadline, + g_shard_queue[shard->shard_queue_index - 1]->min_deadline) < 0) { + swap_adjacent_shards_in_queue(shard->shard_queue_index - 1); + } + while (shard->shard_queue_index < NUM_SHARDS - 1 && + gpr_time_cmp( + shard->min_deadline, + g_shard_queue[shard->shard_queue_index + 1]->min_deadline) > 0) { + swap_adjacent_shards_in_queue(shard->shard_queue_index); + } } -void -grpc_alarm_init (grpc_exec_ctx * exec_ctx, grpc_alarm * alarm, gpr_timespec deadline, grpc_iomgr_cb_func alarm_cb, void *alarm_cb_arg, gpr_timespec now) -{ +void grpc_alarm_init(grpc_exec_ctx *exec_ctx, grpc_alarm *alarm, + gpr_timespec deadline, grpc_iomgr_cb_func alarm_cb, + void *alarm_cb_arg, gpr_timespec now) { int is_first_alarm = 0; - shard_type *shard = &g_shards[shard_idx (alarm)]; - GPR_ASSERT (deadline.clock_type == g_clock_type); - GPR_ASSERT (now.clock_type == g_clock_type); - grpc_closure_init (&alarm->closure, alarm_cb, alarm_cb_arg); + shard_type *shard = &g_shards[shard_idx(alarm)]; + GPR_ASSERT(deadline.clock_type == g_clock_type); + GPR_ASSERT(now.clock_type == g_clock_type); + grpc_closure_init(&alarm->closure, alarm_cb, alarm_cb_arg); alarm->deadline = deadline; alarm->triggered = 0; /* TODO(ctiller): check deadline expired */ - gpr_mu_lock (&shard->mu); - grpc_time_averaged_stats_add_sample (&shard->stats, ts_to_dbl (gpr_time_sub (deadline, now))); - if (gpr_time_cmp (deadline, shard->queue_deadline_cap) < 0) - { - is_first_alarm = grpc_alarm_heap_add (&shard->heap, alarm); - } - else - { - alarm->heap_index = INVALID_HEAP_INDEX; - list_join (&shard->list, alarm); - } - gpr_mu_unlock (&shard->mu); + gpr_mu_lock(&shard->mu); + grpc_time_averaged_stats_add_sample(&shard->stats, + ts_to_dbl(gpr_time_sub(deadline, now))); + if (gpr_time_cmp(deadline, shard->queue_deadline_cap) < 0) { + is_first_alarm = grpc_alarm_heap_add(&shard->heap, alarm); + } else { + alarm->heap_index = INVALID_HEAP_INDEX; + list_join(&shard->list, alarm); + } + gpr_mu_unlock(&shard->mu); /* Deadline may have decreased, we need to adjust the master queue. Note that there is a potential racy unlocked region here. There could be a @@ -219,42 +205,34 @@ grpc_alarm_init (grpc_exec_ctx * exec_ctx, grpc_alarm * alarm, gpr_timespec dead trigger the new alarm because the min_deadline hadn't yet been reduced. In that case, the alarm will simply have to wait for the next grpc_alarm_check. */ - if (is_first_alarm) - { - gpr_mu_lock (&g_mu); - if (gpr_time_cmp (deadline, shard->min_deadline) < 0) - { - gpr_timespec old_min_deadline = g_shard_queue[0]->min_deadline; - shard->min_deadline = deadline; - note_deadline_change (shard); - if (shard->shard_queue_index == 0 && gpr_time_cmp (deadline, old_min_deadline) < 0) - { - grpc_kick_poller (); - } - } - gpr_mu_unlock (&g_mu); + if (is_first_alarm) { + gpr_mu_lock(&g_mu); + if (gpr_time_cmp(deadline, shard->min_deadline) < 0) { + gpr_timespec old_min_deadline = g_shard_queue[0]->min_deadline; + shard->min_deadline = deadline; + note_deadline_change(shard); + if (shard->shard_queue_index == 0 && + gpr_time_cmp(deadline, old_min_deadline) < 0) { + grpc_kick_poller(); + } } + gpr_mu_unlock(&g_mu); + } } -void -grpc_alarm_cancel (grpc_exec_ctx * exec_ctx, grpc_alarm * alarm) -{ - shard_type *shard = &g_shards[shard_idx (alarm)]; - gpr_mu_lock (&shard->mu); - if (!alarm->triggered) - { - grpc_exec_ctx_enqueue (exec_ctx, &alarm->closure, 0); - alarm->triggered = 1; - if (alarm->heap_index == INVALID_HEAP_INDEX) - { - list_remove (alarm); - } - else - { - grpc_alarm_heap_remove (&shard->heap, alarm); - } +void grpc_alarm_cancel(grpc_exec_ctx *exec_ctx, grpc_alarm *alarm) { + shard_type *shard = &g_shards[shard_idx(alarm)]; + gpr_mu_lock(&shard->mu); + if (!alarm->triggered) { + grpc_exec_ctx_enqueue(exec_ctx, &alarm->closure, 0); + alarm->triggered = 1; + if (alarm->heap_index == INVALID_HEAP_INDEX) { + list_remove(alarm); + } else { + grpc_alarm_heap_remove(&shard->heap, alarm); } - gpr_mu_unlock (&shard->mu); + } + gpr_mu_unlock(&shard->mu); } /* This is called when the queue is empty and "now" has reached the @@ -262,126 +240,114 @@ grpc_alarm_cancel (grpc_exec_ctx * exec_ctx, grpc_alarm * alarm) for alarms that fall at or under it. Returns true if the queue is no longer empty. REQUIRES: shard->mu locked */ -static int -refill_queue (shard_type * shard, gpr_timespec now) -{ +static int refill_queue(shard_type *shard, gpr_timespec now) { /* Compute the new queue window width and bound by the limits: */ - double computed_deadline_delta = grpc_time_averaged_stats_update_average (&shard->stats) * ADD_DEADLINE_SCALE; - double deadline_delta = GPR_CLAMP (computed_deadline_delta, MIN_QUEUE_WINDOW_DURATION, - MAX_QUEUE_WINDOW_DURATION); + double computed_deadline_delta = + grpc_time_averaged_stats_update_average(&shard->stats) * + ADD_DEADLINE_SCALE; + double deadline_delta = + GPR_CLAMP(computed_deadline_delta, MIN_QUEUE_WINDOW_DURATION, + MAX_QUEUE_WINDOW_DURATION); grpc_alarm *alarm, *next; /* Compute the new cap and put all alarms under it into the queue: */ - shard->queue_deadline_cap = gpr_time_add (gpr_time_max (now, shard->queue_deadline_cap), dbl_to_ts (deadline_delta)); - for (alarm = shard->list.next; alarm != &shard->list; alarm = next) - { - next = alarm->next; - - if (gpr_time_cmp (alarm->deadline, shard->queue_deadline_cap) < 0) - { - list_remove (alarm); - grpc_alarm_heap_add (&shard->heap, alarm); - } + shard->queue_deadline_cap = gpr_time_add( + gpr_time_max(now, shard->queue_deadline_cap), dbl_to_ts(deadline_delta)); + for (alarm = shard->list.next; alarm != &shard->list; alarm = next) { + next = alarm->next; + + if (gpr_time_cmp(alarm->deadline, shard->queue_deadline_cap) < 0) { + list_remove(alarm); + grpc_alarm_heap_add(&shard->heap, alarm); } - return !grpc_alarm_heap_is_empty (&shard->heap); + } + return !grpc_alarm_heap_is_empty(&shard->heap); } /* This pops the next non-cancelled alarm with deadline <= now from the queue, or returns NULL if there isn't one. REQUIRES: shard->mu locked */ -static grpc_alarm * -pop_one (shard_type * shard, gpr_timespec now) -{ +static grpc_alarm *pop_one(shard_type *shard, gpr_timespec now) { grpc_alarm *alarm; - for (;;) - { - if (grpc_alarm_heap_is_empty (&shard->heap)) - { - if (gpr_time_cmp (now, shard->queue_deadline_cap) < 0) - return NULL; - if (!refill_queue (shard, now)) - return NULL; - } - alarm = grpc_alarm_heap_top (&shard->heap); - if (gpr_time_cmp (alarm->deadline, now) > 0) - return NULL; - alarm->triggered = 1; - grpc_alarm_heap_pop (&shard->heap); - return alarm; + for (;;) { + if (grpc_alarm_heap_is_empty(&shard->heap)) { + if (gpr_time_cmp(now, shard->queue_deadline_cap) < 0) return NULL; + if (!refill_queue(shard, now)) return NULL; } + alarm = grpc_alarm_heap_top(&shard->heap); + if (gpr_time_cmp(alarm->deadline, now) > 0) return NULL; + alarm->triggered = 1; + grpc_alarm_heap_pop(&shard->heap); + return alarm; + } } /* REQUIRES: shard->mu unlocked */ -static size_t -pop_alarms (grpc_exec_ctx * exec_ctx, shard_type * shard, gpr_timespec now, gpr_timespec * new_min_deadline, int success) -{ +static size_t pop_alarms(grpc_exec_ctx *exec_ctx, shard_type *shard, + gpr_timespec now, gpr_timespec *new_min_deadline, + int success) { size_t n = 0; grpc_alarm *alarm; - gpr_mu_lock (&shard->mu); - while ((alarm = pop_one (shard, now))) - { - grpc_exec_ctx_enqueue (exec_ctx, &alarm->closure, success); - n++; - } - *new_min_deadline = compute_min_deadline (shard); - gpr_mu_unlock (&shard->mu); + gpr_mu_lock(&shard->mu); + while ((alarm = pop_one(shard, now))) { + grpc_exec_ctx_enqueue(exec_ctx, &alarm->closure, success); + n++; + } + *new_min_deadline = compute_min_deadline(shard); + gpr_mu_unlock(&shard->mu); return n; } -static int -run_some_expired_alarms (grpc_exec_ctx * exec_ctx, gpr_timespec now, gpr_timespec * next, int success) -{ +static int run_some_expired_alarms(grpc_exec_ctx *exec_ctx, gpr_timespec now, + gpr_timespec *next, int success) { size_t n = 0; /* TODO(ctiller): verify that there are any alarms (atomically) here */ - if (gpr_mu_trylock (&g_checker_mu)) - { - gpr_mu_lock (&g_mu); - - while (gpr_time_cmp (g_shard_queue[0]->min_deadline, now) < 0) - { - gpr_timespec new_min_deadline; - - /* For efficiency, we pop as many available alarms as we can from the - shard. This may violate perfect alarm deadline ordering, but that - shouldn't be a big deal because we don't make ordering guarantees. */ - n += pop_alarms (exec_ctx, g_shard_queue[0], now, &new_min_deadline, success); - - /* An grpc_alarm_init() on the shard could intervene here, adding a new - alarm that is earlier than new_min_deadline. However, - grpc_alarm_init() will block on the master_lock before it can call - set_min_deadline, so this one will complete first and then the AddAlarm - will reduce the min_deadline (perhaps unnecessarily). */ - g_shard_queue[0]->min_deadline = new_min_deadline; - note_deadline_change (g_shard_queue[0]); - } - - if (next) - { - *next = gpr_time_min (*next, g_shard_queue[0]->min_deadline); - } - - gpr_mu_unlock (&g_mu); - gpr_mu_unlock (&g_checker_mu); + if (gpr_mu_trylock(&g_checker_mu)) { + gpr_mu_lock(&g_mu); + + while (gpr_time_cmp(g_shard_queue[0]->min_deadline, now) < 0) { + gpr_timespec new_min_deadline; + + /* For efficiency, we pop as many available alarms as we can from the + shard. This may violate perfect alarm deadline ordering, but that + shouldn't be a big deal because we don't make ordering guarantees. */ + n += pop_alarms(exec_ctx, g_shard_queue[0], now, &new_min_deadline, + success); + + /* An grpc_alarm_init() on the shard could intervene here, adding a new + alarm that is earlier than new_min_deadline. However, + grpc_alarm_init() will block on the master_lock before it can call + set_min_deadline, so this one will complete first and then the AddAlarm + will reduce the min_deadline (perhaps unnecessarily). */ + g_shard_queue[0]->min_deadline = new_min_deadline; + note_deadline_change(g_shard_queue[0]); } - return (int) n; + if (next) { + *next = gpr_time_min(*next, g_shard_queue[0]->min_deadline); + } + + gpr_mu_unlock(&g_mu); + gpr_mu_unlock(&g_checker_mu); + } + + return (int)n; } -int -grpc_alarm_check (grpc_exec_ctx * exec_ctx, gpr_timespec now, gpr_timespec * next) -{ - GPR_ASSERT (now.clock_type == g_clock_type); - return run_some_expired_alarms (exec_ctx, now, next, gpr_time_cmp (now, gpr_inf_future (now.clock_type)) != 0); +int grpc_alarm_check(grpc_exec_ctx *exec_ctx, gpr_timespec now, + gpr_timespec *next) { + GPR_ASSERT(now.clock_type == g_clock_type); + return run_some_expired_alarms( + exec_ctx, now, next, + gpr_time_cmp(now, gpr_inf_future(now.clock_type)) != 0); } -gpr_timespec -grpc_alarm_list_next_timeout (void) -{ +gpr_timespec grpc_alarm_list_next_timeout(void) { gpr_timespec out; - gpr_mu_lock (&g_mu); + gpr_mu_lock(&g_mu); out = g_shard_queue[0]->min_deadline; - gpr_mu_unlock (&g_mu); + gpr_mu_unlock(&g_mu); return out; } diff --git a/src/core/iomgr/alarm.h b/src/core/iomgr/alarm.h index dc4ce29b466..94f9bc1355e 100644 --- a/src/core/iomgr/alarm.h +++ b/src/core/iomgr/alarm.h @@ -39,10 +39,9 @@ #include #include -typedef struct grpc_alarm -{ +typedef struct grpc_alarm { gpr_timespec deadline; - gpr_uint32 heap_index; /* INVALID_HEAP_INDEX if not in heap */ + gpr_uint32 heap_index; /* INVALID_HEAP_INDEX if not in heap */ int triggered; struct grpc_alarm *next; struct grpc_alarm *prev; @@ -55,7 +54,9 @@ typedef struct grpc_alarm and application code should check the status 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_alarm_init (grpc_exec_ctx * exec_ctx, grpc_alarm * alarm, gpr_timespec deadline, grpc_iomgr_cb_func alarm_cb, void *alarm_cb_arg, gpr_timespec now); +void grpc_alarm_init(grpc_exec_ctx *exec_ctx, grpc_alarm *alarm, + gpr_timespec deadline, grpc_iomgr_cb_func alarm_cb, + void *alarm_cb_arg, gpr_timespec now); /* Note that there is no alarm destroy function. This is because the alarm is a one-time occurrence with a guarantee that the callback will @@ -83,6 +84,6 @@ void grpc_alarm_init (grpc_exec_ctx * exec_ctx, grpc_alarm * alarm, gpr_timespec matches this aim. Requires: cancel() must happen after add() on a given alarm */ -void grpc_alarm_cancel (grpc_exec_ctx * exec_ctx, grpc_alarm * alarm); +void grpc_alarm_cancel(grpc_exec_ctx *exec_ctx, grpc_alarm *alarm); #endif /* GRPC_INTERNAL_CORE_IOMGR_ALARM_H */ diff --git a/src/core/iomgr/alarm_heap.c b/src/core/iomgr/alarm_heap.c index 12e1631476e..769142e425d 100644 --- a/src/core/iomgr/alarm_heap.c +++ b/src/core/iomgr/alarm_heap.c @@ -43,18 +43,14 @@ position. This functor is called each time immediately after modifying a value in the underlying container, with the offset of the modified element as its argument. */ -static void -adjust_upwards (grpc_alarm ** first, gpr_uint32 i, grpc_alarm * t) -{ - while (i > 0) - { - gpr_uint32 parent = (gpr_uint32) (((int) i - 1) / 2); - if (gpr_time_cmp (first[parent]->deadline, t->deadline) >= 0) - break; - first[i] = first[parent]; - first[i]->heap_index = i; - i = parent; - } +static void adjust_upwards(grpc_alarm **first, gpr_uint32 i, grpc_alarm *t) { + while (i > 0) { + gpr_uint32 parent = (gpr_uint32)(((int)i - 1) / 2); + if (gpr_time_cmp(first[parent]->deadline, t->deadline) >= 0) break; + first[i] = first[parent]; + first[i]->heap_index = i; + i = parent; + } first[i] = t; t->heap_index = i; } @@ -62,24 +58,24 @@ adjust_upwards (grpc_alarm ** first, gpr_uint32 i, grpc_alarm * t) /* Adjusts a heap so as to move a hole at position i farther away from the root, until a suitable position is found for element t. Then, copies t into that position. */ -static void -adjust_downwards (grpc_alarm ** first, gpr_uint32 i, gpr_uint32 length, grpc_alarm * t) -{ - for (;;) - { - gpr_uint32 left_child = 1u + 2u * i; - gpr_uint32 right_child; - gpr_uint32 next_i; - if (left_child >= length) - break; - right_child = left_child + 1; - next_i = right_child < length && gpr_time_cmp (first[left_child]->deadline, first[right_child]->deadline) < 0 ? right_child : left_child; - if (gpr_time_cmp (t->deadline, first[next_i]->deadline) >= 0) - break; - first[i] = first[next_i]; - first[i]->heap_index = i; - i = next_i; - } +static void adjust_downwards(grpc_alarm **first, gpr_uint32 i, + gpr_uint32 length, grpc_alarm *t) { + for (;;) { + gpr_uint32 left_child = 1u + 2u * i; + gpr_uint32 right_child; + gpr_uint32 next_i; + if (left_child >= length) break; + right_child = left_child + 1; + next_i = right_child < length && + gpr_time_cmp(first[left_child]->deadline, + first[right_child]->deadline) < 0 + ? right_child + : left_child; + if (gpr_time_cmp(t->deadline, first[next_i]->deadline) >= 0) break; + first[i] = first[next_i]; + first[i]->heap_index = i; + i = next_i; + } first[i] = t; t->heap_index = i; } @@ -87,88 +83,66 @@ adjust_downwards (grpc_alarm ** first, gpr_uint32 i, gpr_uint32 length, grpc_ala #define SHRINK_MIN_ELEMS 8 #define SHRINK_FULLNESS_FACTOR 2 -static void -maybe_shrink (grpc_alarm_heap * heap) -{ - if (heap->alarm_count >= 8 && heap->alarm_count <= heap->alarm_capacity / SHRINK_FULLNESS_FACTOR / 2) - { - heap->alarm_capacity = heap->alarm_count * SHRINK_FULLNESS_FACTOR; - heap->alarms = gpr_realloc (heap->alarms, heap->alarm_capacity * sizeof (grpc_alarm *)); - } +static void maybe_shrink(grpc_alarm_heap *heap) { + if (heap->alarm_count >= 8 && + heap->alarm_count <= heap->alarm_capacity / SHRINK_FULLNESS_FACTOR / 2) { + heap->alarm_capacity = heap->alarm_count * SHRINK_FULLNESS_FACTOR; + heap->alarms = + gpr_realloc(heap->alarms, heap->alarm_capacity * sizeof(grpc_alarm *)); + } } -static void -note_changed_priority (grpc_alarm_heap * heap, grpc_alarm * alarm) -{ +static void note_changed_priority(grpc_alarm_heap *heap, grpc_alarm *alarm) { gpr_uint32 i = alarm->heap_index; - gpr_uint32 parent = (gpr_uint32) (((int) i - 1) / 2); - if (gpr_time_cmp (heap->alarms[parent]->deadline, alarm->deadline) < 0) - { - adjust_upwards (heap->alarms, i, alarm); - } - else - { - adjust_downwards (heap->alarms, i, heap->alarm_count, alarm); - } + gpr_uint32 parent = (gpr_uint32)(((int)i - 1) / 2); + if (gpr_time_cmp(heap->alarms[parent]->deadline, alarm->deadline) < 0) { + adjust_upwards(heap->alarms, i, alarm); + } else { + adjust_downwards(heap->alarms, i, heap->alarm_count, alarm); + } } -void -grpc_alarm_heap_init (grpc_alarm_heap * heap) -{ - memset (heap, 0, sizeof (*heap)); +void grpc_alarm_heap_init(grpc_alarm_heap *heap) { + memset(heap, 0, sizeof(*heap)); } -void -grpc_alarm_heap_destroy (grpc_alarm_heap * heap) -{ - gpr_free (heap->alarms); -} +void grpc_alarm_heap_destroy(grpc_alarm_heap *heap) { gpr_free(heap->alarms); } -int -grpc_alarm_heap_add (grpc_alarm_heap * heap, grpc_alarm * alarm) -{ - if (heap->alarm_count == heap->alarm_capacity) - { - heap->alarm_capacity = GPR_MAX (heap->alarm_capacity + 1, heap->alarm_capacity * 3 / 2); - heap->alarms = gpr_realloc (heap->alarms, heap->alarm_capacity * sizeof (grpc_alarm *)); - } +int grpc_alarm_heap_add(grpc_alarm_heap *heap, grpc_alarm *alarm) { + if (heap->alarm_count == heap->alarm_capacity) { + heap->alarm_capacity = + GPR_MAX(heap->alarm_capacity + 1, heap->alarm_capacity * 3 / 2); + heap->alarms = + gpr_realloc(heap->alarms, heap->alarm_capacity * sizeof(grpc_alarm *)); + } alarm->heap_index = heap->alarm_count; - adjust_upwards (heap->alarms, heap->alarm_count, alarm); + adjust_upwards(heap->alarms, heap->alarm_count, alarm); heap->alarm_count++; return alarm->heap_index == 0; } -void -grpc_alarm_heap_remove (grpc_alarm_heap * heap, grpc_alarm * alarm) -{ +void grpc_alarm_heap_remove(grpc_alarm_heap *heap, grpc_alarm *alarm) { gpr_uint32 i = alarm->heap_index; - if (i == heap->alarm_count - 1) - { - heap->alarm_count--; - maybe_shrink (heap); - return; - } + if (i == heap->alarm_count - 1) { + heap->alarm_count--; + maybe_shrink(heap); + return; + } heap->alarms[i] = heap->alarms[heap->alarm_count - 1]; heap->alarms[i]->heap_index = i; heap->alarm_count--; - maybe_shrink (heap); - note_changed_priority (heap, heap->alarms[i]); + maybe_shrink(heap); + note_changed_priority(heap, heap->alarms[i]); } -int -grpc_alarm_heap_is_empty (grpc_alarm_heap * heap) -{ +int grpc_alarm_heap_is_empty(grpc_alarm_heap *heap) { return heap->alarm_count == 0; } -grpc_alarm * -grpc_alarm_heap_top (grpc_alarm_heap * heap) -{ +grpc_alarm *grpc_alarm_heap_top(grpc_alarm_heap *heap) { return heap->alarms[0]; } -void -grpc_alarm_heap_pop (grpc_alarm_heap * heap) -{ - grpc_alarm_heap_remove (heap, grpc_alarm_heap_top (heap)); +void grpc_alarm_heap_pop(grpc_alarm_heap *heap) { + grpc_alarm_heap_remove(heap, grpc_alarm_heap_top(heap)); } diff --git a/src/core/iomgr/alarm_heap.h b/src/core/iomgr/alarm_heap.h index 1970897356f..91d6ee3ca22 100644 --- a/src/core/iomgr/alarm_heap.h +++ b/src/core/iomgr/alarm_heap.h @@ -36,23 +36,22 @@ #include "src/core/iomgr/alarm.h" -typedef struct -{ +typedef struct { grpc_alarm **alarms; gpr_uint32 alarm_count; gpr_uint32 alarm_capacity; } grpc_alarm_heap; /* return 1 if the new alarm is the first alarm in the heap */ -int grpc_alarm_heap_add (grpc_alarm_heap * heap, grpc_alarm * alarm); +int grpc_alarm_heap_add(grpc_alarm_heap *heap, grpc_alarm *alarm); -void grpc_alarm_heap_init (grpc_alarm_heap * heap); -void grpc_alarm_heap_destroy (grpc_alarm_heap * heap); +void grpc_alarm_heap_init(grpc_alarm_heap *heap); +void grpc_alarm_heap_destroy(grpc_alarm_heap *heap); -void grpc_alarm_heap_remove (grpc_alarm_heap * heap, grpc_alarm * alarm); -grpc_alarm *grpc_alarm_heap_top (grpc_alarm_heap * heap); -void grpc_alarm_heap_pop (grpc_alarm_heap * heap); +void grpc_alarm_heap_remove(grpc_alarm_heap *heap, grpc_alarm *alarm); +grpc_alarm *grpc_alarm_heap_top(grpc_alarm_heap *heap); +void grpc_alarm_heap_pop(grpc_alarm_heap *heap); -int grpc_alarm_heap_is_empty (grpc_alarm_heap * heap); +int grpc_alarm_heap_is_empty(grpc_alarm_heap *heap); #endif /* GRPC_INTERNAL_CORE_IOMGR_ALARM_HEAP_H */ diff --git a/src/core/iomgr/alarm_internal.h b/src/core/iomgr/alarm_internal.h index 398124d83bc..31d840e6f9b 100644 --- a/src/core/iomgr/alarm_internal.h +++ b/src/core/iomgr/alarm_internal.h @@ -49,14 +49,15 @@ with high probability at least one thread in the system will see an update at any time slice. */ -int grpc_alarm_check (grpc_exec_ctx * exec_ctx, gpr_timespec now, gpr_timespec * next); -void grpc_alarm_list_init (gpr_timespec now); -void grpc_alarm_list_shutdown (grpc_exec_ctx * exec_ctx); +int grpc_alarm_check(grpc_exec_ctx* exec_ctx, gpr_timespec now, + gpr_timespec* next); +void grpc_alarm_list_init(gpr_timespec now); +void grpc_alarm_list_shutdown(grpc_exec_ctx* exec_ctx); -gpr_timespec grpc_alarm_list_next_timeout (void); +gpr_timespec grpc_alarm_list_next_timeout(void); /* the following must be implemented by each iomgr implementation */ -void grpc_kick_poller (void); +void grpc_kick_poller(void); #endif /* GRPC_INTERNAL_CORE_IOMGR_ALARM_INTERNAL_H */ diff --git a/src/core/iomgr/closure.c b/src/core/iomgr/closure.c index 4c1a1233d6c..32654257892 100644 --- a/src/core/iomgr/closure.c +++ b/src/core/iomgr/closure.c @@ -33,53 +33,39 @@ #include "src/core/iomgr/closure.h" -void -grpc_closure_init (grpc_closure * closure, grpc_iomgr_cb_func cb, void *cb_arg) -{ +void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, + void *cb_arg) { closure->cb = cb; closure->cb_arg = cb_arg; closure->next = NULL; } -void -grpc_closure_list_add (grpc_closure_list * closure_list, grpc_closure * closure, int success) -{ - if (closure == NULL) - return; +void grpc_closure_list_add(grpc_closure_list *closure_list, + grpc_closure *closure, int success) { + if (closure == NULL) return; closure->next = NULL; closure->success = success; - if (closure_list->head == NULL) - { - closure_list->head = closure; - } - else - { - closure_list->tail->next = closure; - } + if (closure_list->head == NULL) { + closure_list->head = closure; + } else { + closure_list->tail->next = closure; + } closure_list->tail = closure; } -int -grpc_closure_list_empty (grpc_closure_list closure_list) -{ +int grpc_closure_list_empty(grpc_closure_list closure_list) { return closure_list.head == NULL; } -void -grpc_closure_list_move (grpc_closure_list * src, grpc_closure_list * dst) -{ - if (src->head == NULL) - { - return; - } - if (dst->head == NULL) - { - *dst = *src; - } - else - { - dst->tail->next = src->head; - dst->tail = src->tail; - } +void grpc_closure_list_move(grpc_closure_list *src, grpc_closure_list *dst) { + if (src->head == NULL) { + return; + } + if (dst->head == NULL) { + *dst = *src; + } else { + dst->tail->next = src->head; + dst->tail = src->tail; + } src->head = src->tail = NULL; } diff --git a/src/core/iomgr/closure.h b/src/core/iomgr/closure.h index e76e157f6af..982ffa4e1be 100644 --- a/src/core/iomgr/closure.h +++ b/src/core/iomgr/closure.h @@ -43,8 +43,7 @@ typedef struct grpc_closure grpc_closure; struct grpc_exec_ctx; typedef struct grpc_exec_ctx grpc_exec_ctx; -typedef struct grpc_closure_list -{ +typedef struct grpc_closure_list { grpc_closure *head; grpc_closure *tail; } grpc_closure_list; @@ -54,11 +53,11 @@ typedef struct grpc_closure_list * \param arg Arbitrary input. * \param success An indication on the state of the iomgr. On false, cleanup * actions should be taken (eg, shutdown). */ -typedef void (*grpc_iomgr_cb_func) (grpc_exec_ctx * exec_ctx, void *arg, int success); +typedef void (*grpc_iomgr_cb_func)(grpc_exec_ctx *exec_ctx, void *arg, + int success); /** A closure over a grpc_iomgr_cb_func. */ -struct grpc_closure -{ +struct grpc_closure { /** Bound callback. */ grpc_iomgr_cb_func cb; @@ -75,13 +74,15 @@ struct grpc_closure }; /** Initializes \a closure with \a cb and \a cb_arg. */ -void grpc_closure_init (grpc_closure * closure, grpc_iomgr_cb_func cb, void *cb_arg); +void grpc_closure_init(grpc_closure *closure, grpc_iomgr_cb_func cb, + void *cb_arg); #define GRPC_CLOSURE_LIST_INIT \ { NULL, NULL } -void grpc_closure_list_add (grpc_closure_list * list, grpc_closure * closure, int success); -void grpc_closure_list_move (grpc_closure_list * src, grpc_closure_list * dst); -int grpc_closure_list_empty (grpc_closure_list list); +void grpc_closure_list_add(grpc_closure_list *list, grpc_closure *closure, + int success); +void grpc_closure_list_move(grpc_closure_list *src, grpc_closure_list *dst); +int grpc_closure_list_empty(grpc_closure_list list); #endif /* GRPC_INTERNAL_CORE_IOMGR_CLOSURE_H */ diff --git a/src/core/iomgr/endpoint.c b/src/core/iomgr/endpoint.c index d0f272a00bf..bd64707669c 100644 --- a/src/core/iomgr/endpoint.c +++ b/src/core/iomgr/endpoint.c @@ -33,44 +33,35 @@ #include "src/core/iomgr/endpoint.h" -void -grpc_endpoint_read (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb) -{ - ep->vtable->read (exec_ctx, ep, slices, cb); +void grpc_endpoint_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + gpr_slice_buffer* slices, grpc_closure* cb) { + ep->vtable->read(exec_ctx, ep, slices, cb); } -void -grpc_endpoint_write (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb) -{ - ep->vtable->write (exec_ctx, ep, slices, cb); +void grpc_endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + gpr_slice_buffer* slices, grpc_closure* cb) { + ep->vtable->write(exec_ctx, 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_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_exec_ctx * exec_ctx, grpc_endpoint * ep, grpc_pollset_set * pollset_set) -{ - ep->vtable->add_to_pollset_set (exec_ctx, ep, pollset_set); +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(exec_ctx, ep, pollset_set); } -void -grpc_endpoint_shutdown (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep) -{ - ep->vtable->shutdown (exec_ctx, ep); +void grpc_endpoint_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { + ep->vtable->shutdown(exec_ctx, ep); } -void -grpc_endpoint_destroy (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep) -{ - ep->vtable->destroy (exec_ctx, 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); +char* grpc_endpoint_get_peer(grpc_endpoint* ep) { + return ep->vtable->get_peer(ep); } diff --git a/src/core/iomgr/endpoint.h b/src/core/iomgr/endpoint.h index 1a88b852e6b..cbdc947abbf 100644 --- a/src/core/iomgr/endpoint.h +++ b/src/core/iomgr/endpoint.h @@ -46,24 +46,28 @@ 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, gpr_slice_buffer * slices, grpc_closure * cb); - void (*write) (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_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); - void (*destroy) (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep); - char *(*get_peer) (grpc_endpoint * ep); +struct grpc_endpoint_vtable { + void (*read)(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, + gpr_slice_buffer *slices, grpc_closure *cb); + void (*write)(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, + gpr_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); + void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep); + char *(*get_peer)(grpc_endpoint *ep); }; /* When data is available on the connection, calls the callback with slices. Callback success indicates that the endpoint can accept more reads, failure indicates the endpoint is closed. Valid slices may be placed into \a slices even on callback success == 0. */ -void grpc_endpoint_read (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb); +void grpc_endpoint_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, + gpr_slice_buffer *slices, grpc_closure *cb); -char *grpc_endpoint_get_peer (grpc_endpoint * ep); +char *grpc_endpoint_get_peer(grpc_endpoint *ep); /* Write slices out to the socket. @@ -75,20 +79,23 @@ char *grpc_endpoint_get_peer (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, gpr_slice_buffer * slices, grpc_closure * cb); +void grpc_endpoint_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, + gpr_slice_buffer *slices, grpc_closure *cb); /* Causes any pending read/write callbacks to run immediately with success==0 */ -void grpc_endpoint_shutdown (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep); -void grpc_endpoint_destroy (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep); +void grpc_endpoint_shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep); +void grpc_endpoint_destroy(grpc_exec_ctx *exec_ctx, 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, grpc_pollset_set * pollset_set); +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); -struct grpc_endpoint -{ +struct grpc_endpoint { const grpc_endpoint_vtable *vtable; }; diff --git a/src/core/iomgr/endpoint_pair.h b/src/core/iomgr/endpoint_pair.h index 31816c4916a..095ec5fcc9f 100644 --- a/src/core/iomgr/endpoint_pair.h +++ b/src/core/iomgr/endpoint_pair.h @@ -36,12 +36,12 @@ #include "src/core/iomgr/endpoint.h" -typedef struct -{ +typedef struct { grpc_endpoint *client; grpc_endpoint *server; } grpc_endpoint_pair; -grpc_endpoint_pair grpc_iomgr_create_endpoint_pair (const char *name, size_t read_slice_size); +grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name, + size_t read_slice_size); #endif /* GRPC_INTERNAL_CORE_IOMGR_ENDPOINT_PAIR_H */ diff --git a/src/core/iomgr/endpoint_pair_posix.c b/src/core/iomgr/endpoint_pair_posix.c index 5a810fb0102..deae9c68757 100644 --- a/src/core/iomgr/endpoint_pair_posix.c +++ b/src/core/iomgr/endpoint_pair_posix.c @@ -49,31 +49,30 @@ #include #include -static void -create_sockets (int sv[2]) -{ +static void create_sockets(int sv[2]) { int flags; - GPR_ASSERT (socketpair (AF_UNIX, SOCK_STREAM, 0, sv) == 0); - flags = fcntl (sv[0], F_GETFL, 0); - GPR_ASSERT (fcntl (sv[0], F_SETFL, flags | O_NONBLOCK) == 0); - flags = fcntl (sv[1], F_GETFL, 0); - GPR_ASSERT (fcntl (sv[1], F_SETFL, flags | O_NONBLOCK) == 0); + GPR_ASSERT(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); + flags = fcntl(sv[0], F_GETFL, 0); + GPR_ASSERT(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK) == 0); + flags = fcntl(sv[1], F_GETFL, 0); + GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0); } -grpc_endpoint_pair -grpc_iomgr_create_endpoint_pair (const char *name, size_t read_slice_size) -{ +grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name, + size_t read_slice_size) { int sv[2]; grpc_endpoint_pair p; char *final_name; - create_sockets (sv); + create_sockets(sv); - gpr_asprintf (&final_name, "%s:client", name); - p.client = grpc_tcp_create (grpc_fd_create (sv[1], final_name), read_slice_size, "socketpair-server"); - gpr_free (final_name); - gpr_asprintf (&final_name, "%s:server", name); - p.server = grpc_tcp_create (grpc_fd_create (sv[0], final_name), read_slice_size, "socketpair-client"); - gpr_free (final_name); + gpr_asprintf(&final_name, "%s:client", name); + p.client = grpc_tcp_create(grpc_fd_create(sv[1], final_name), read_slice_size, + "socketpair-server"); + gpr_free(final_name); + gpr_asprintf(&final_name, "%s:server", name); + p.server = grpc_tcp_create(grpc_fd_create(sv[0], final_name), read_slice_size, + "socketpair-client"); + gpr_free(final_name); return p; } diff --git a/src/core/iomgr/endpoint_pair_windows.c b/src/core/iomgr/endpoint_pair_windows.c index 990548913a1..db9d092dcab 100644 --- a/src/core/iomgr/endpoint_pair_windows.c +++ b/src/core/iomgr/endpoint_pair_windows.c @@ -45,48 +45,52 @@ #include "src/core/iomgr/socket_windows.h" #include -static void -create_sockets (SOCKET sv[2]) -{ +static void create_sockets(SOCKET sv[2]) { SOCKET svr_sock = INVALID_SOCKET; SOCKET lst_sock = INVALID_SOCKET; SOCKET cli_sock = INVALID_SOCKET; SOCKADDR_IN addr; - int addr_len = sizeof (addr); + int addr_len = sizeof(addr); - lst_sock = WSASocket (AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); - GPR_ASSERT (lst_sock != INVALID_SOCKET); + lst_sock = WSASocket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, + WSA_FLAG_OVERLAPPED); + GPR_ASSERT(lst_sock != INVALID_SOCKET); - memset (&addr, 0, sizeof (addr)); - addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK); + memset(&addr, 0, sizeof(addr)); + addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); addr.sin_family = AF_INET; - GPR_ASSERT (bind (lst_sock, (struct sockaddr *) &addr, sizeof (addr)) != SOCKET_ERROR); - GPR_ASSERT (listen (lst_sock, SOMAXCONN) != SOCKET_ERROR); - GPR_ASSERT (getsockname (lst_sock, (struct sockaddr *) &addr, &addr_len) != SOCKET_ERROR); + GPR_ASSERT(bind(lst_sock, (struct sockaddr *)&addr, sizeof(addr)) != + SOCKET_ERROR); + GPR_ASSERT(listen(lst_sock, SOMAXCONN) != SOCKET_ERROR); + GPR_ASSERT(getsockname(lst_sock, (struct sockaddr *)&addr, &addr_len) != + SOCKET_ERROR); - cli_sock = WSASocket (AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); - GPR_ASSERT (cli_sock != INVALID_SOCKET); + cli_sock = WSASocket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, + WSA_FLAG_OVERLAPPED); + GPR_ASSERT(cli_sock != INVALID_SOCKET); - GPR_ASSERT (WSAConnect (cli_sock, (struct sockaddr *) &addr, addr_len, NULL, NULL, NULL, NULL) == 0); - svr_sock = accept (lst_sock, (struct sockaddr *) &addr, &addr_len); - GPR_ASSERT (svr_sock != INVALID_SOCKET); + GPR_ASSERT(WSAConnect(cli_sock, (struct sockaddr *)&addr, addr_len, NULL, + NULL, NULL, NULL) == 0); + svr_sock = accept(lst_sock, (struct sockaddr *)&addr, &addr_len); + GPR_ASSERT(svr_sock != INVALID_SOCKET); - closesocket (lst_sock); - grpc_tcp_prepare_socket (cli_sock); - grpc_tcp_prepare_socket (svr_sock); + closesocket(lst_sock); + grpc_tcp_prepare_socket(cli_sock); + grpc_tcp_prepare_socket(svr_sock); sv[1] = cli_sock; sv[0] = svr_sock; } -grpc_endpoint_pair -grpc_iomgr_create_endpoint_pair (const char *name, size_t read_slice_size) -{ +grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name, + size_t read_slice_size) { SOCKET sv[2]; grpc_endpoint_pair p; - create_sockets (sv); - p.client = grpc_tcp_create (grpc_winsocket_create (sv[1], "endpoint:client"), "endpoint:server"); - p.server = grpc_tcp_create (grpc_winsocket_create (sv[0], "endpoint:server"), "endpoint:client"); + create_sockets(sv); + p.client = grpc_tcp_create(grpc_winsocket_create(sv[1], "endpoint:client"), + "endpoint:server"); + p.server = grpc_tcp_create(grpc_winsocket_create(sv[0], "endpoint:server"), + "endpoint:client"); return p; } diff --git a/src/core/iomgr/exec_ctx.c b/src/core/iomgr/exec_ctx.c index d5a8cf44755..fe8c48a94b0 100644 --- a/src/core/iomgr/exec_ctx.c +++ b/src/core/iomgr/exec_ctx.c @@ -33,30 +33,28 @@ #include "src/core/iomgr/exec_ctx.h" -void -grpc_exec_ctx_flush (grpc_exec_ctx *exec_ctx) -{ - while (!grpc_closure_list_empty (exec_ctx->closure_list)) - { - grpc_closure *c = closure_list->head; - closure_list->head = closure_list->tail = NULL; - while (c != NULL) - { - grpc_closure *next = c->next; - c->cb (exec_ctx, c->cb_arg, c->success); - c = next; - } +void grpc_exec_ctx_flush(grpc_exec_ctx *exec_ctx) { + while (!grpc_closure_list_empty(exec_ctx->closure_list)) { + grpc_closure *c = closure_list->head; + closure_list->head = closure_list->tail = NULL; + while (c != NULL) { + grpc_closure *next = c->next; + c->cb(exec_ctx, c->cb_arg, c->success); + c = next; } + } } void grpc_exec_ctx_finish(grpc_exec_ctx *exec_ctx) { grpc_exec_ctx_flush(exec_ctx); } -void grpc_exec_ctx_enqueue(grpc_exec_ctx *exec_ctx, grpc_closure *closure, int success) { +void grpc_exec_ctx_enqueue(grpc_exec_ctx *exec_ctx, grpc_closure *closure, + int success) { grpc_closure_list_add(&exec_ctx->closure_list, closure, success); } -void grpc_exec_ctx_enqueue_list(grpc_exec_ctx *exec_ctx, grpc_closure_list *list) { +void grpc_exec_ctx_enqueue_list(grpc_exec_ctx *exec_ctx, + grpc_closure_list *list) { grpc_closure_list_move(list, &exec_ctx->closure_list); } diff --git a/src/core/iomgr/exec_ctx.h b/src/core/iomgr/exec_ctx.h index ff084abeba6..0cebc1665ef 100644 --- a/src/core/iomgr/exec_ctx.h +++ b/src/core/iomgr/exec_ctx.h @@ -40,11 +40,14 @@ struct grpc_exec_ctx { grpc_closure_list closure_list; }; -#define GRPC_EXEC_CTX_INIT { GRPC_CLOSURE_LIST_INIT } +#define GRPC_EXEC_CTX_INIT \ + { GRPC_CLOSURE_LIST_INIT } void grpc_exec_ctx_finish(grpc_exec_ctx *exec_ctx); void grpc_exec_ctx_flush(grpc_exec_ctx *exec_ctx); -void grpc_exec_ctx_enqueue(grpc_exec_ctx *exec_ctx, grpc_closure *closure, int success); -void grpc_exec_ctx_enqueue_list(grpc_exec_ctx *exec_ctx, grpc_closure_list *list); +void grpc_exec_ctx_enqueue(grpc_exec_ctx *exec_ctx, grpc_closure *closure, + int success); +void grpc_exec_ctx_enqueue_list(grpc_exec_ctx *exec_ctx, + grpc_closure_list *list); #endif diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index 27936455c61..31e30d210b6 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -45,11 +45,10 @@ #include #include -enum descriptor_state -{ +enum descriptor_state { NOT_READY = 0, READY = 1 -}; /* or a pointer to a closure to call */ +}; /* or a pointer to a closure to call */ /* We need to keep a freelist not because of any concerns of malloc performance * but instead so that implementations with multiple threads in (for example) @@ -71,40 +70,35 @@ enum descriptor_state static grpc_fd *fd_freelist = NULL; static gpr_mu fd_freelist_mu; -static void -freelist_fd (grpc_fd * fd) -{ - gpr_mu_lock (&fd_freelist_mu); +static void freelist_fd(grpc_fd *fd) { + gpr_mu_lock(&fd_freelist_mu); fd->freelist_next = fd_freelist; fd_freelist = fd; - grpc_iomgr_unregister_object (&fd->iomgr_object); - gpr_mu_unlock (&fd_freelist_mu); + grpc_iomgr_unregister_object(&fd->iomgr_object); + gpr_mu_unlock(&fd_freelist_mu); } -static grpc_fd * -alloc_fd (int fd) -{ +static grpc_fd *alloc_fd(int fd) { grpc_fd *r = NULL; - gpr_mu_lock (&fd_freelist_mu); - if (fd_freelist != NULL) - { - r = fd_freelist; - fd_freelist = fd_freelist->freelist_next; - } - gpr_mu_unlock (&fd_freelist_mu); - if (r == NULL) - { - r = gpr_malloc (sizeof (grpc_fd)); - gpr_mu_init (&r->set_state_mu); - gpr_mu_init (&r->watcher_mu); - } - - gpr_atm_rel_store (&r->refst, 1); - gpr_atm_rel_store (&r->readst, NOT_READY); - gpr_atm_rel_store (&r->writest, NOT_READY); - gpr_atm_rel_store (&r->shutdown, 0); + gpr_mu_lock(&fd_freelist_mu); + if (fd_freelist != NULL) { + r = fd_freelist; + fd_freelist = fd_freelist->freelist_next; + } + gpr_mu_unlock(&fd_freelist_mu); + if (r == NULL) { + r = gpr_malloc(sizeof(grpc_fd)); + gpr_mu_init(&r->set_state_mu); + gpr_mu_init(&r->watcher_mu); + } + + gpr_atm_rel_store(&r->refst, 1); + gpr_atm_rel_store(&r->readst, NOT_READY); + gpr_atm_rel_store(&r->writest, NOT_READY); + gpr_atm_rel_store(&r->shutdown, 0); r->fd = fd; - r->inactive_watcher_root.next = r->inactive_watcher_root.prev = &r->inactive_watcher_root; + r->inactive_watcher_root.next = r->inactive_watcher_root.prev = + &r->inactive_watcher_root; r->freelist_next = NULL; r->read_watcher = r->write_watcher = NULL; r->on_done_closure = NULL; @@ -112,198 +106,147 @@ alloc_fd (int fd) return r; } -static void -destroy (grpc_fd * fd) -{ - gpr_mu_destroy (&fd->set_state_mu); - gpr_mu_destroy (&fd->watcher_mu); - gpr_free (fd); +static void destroy(grpc_fd *fd) { + gpr_mu_destroy(&fd->set_state_mu); + gpr_mu_destroy(&fd->watcher_mu); + gpr_free(fd); } #ifdef GRPC_FD_REF_COUNT_DEBUG #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__) -static void -ref_by (grpc_fd * fd, int n, const char *reason, const char *file, int line) -{ - gpr_log (GPR_DEBUG, "FD %d %p ref %d %d -> %d [%s; %s:%d]", fd->fd, fd, n, gpr_atm_no_barrier_load (&fd->refst), gpr_atm_no_barrier_load (&fd->refst) + n, reason, file, line); +static void ref_by(grpc_fd *fd, int n, const char *reason, const char *file, + int line) { + gpr_log(GPR_DEBUG, "FD %d %p ref %d %d -> %d [%s; %s:%d]", fd->fd, fd, n, + gpr_atm_no_barrier_load(&fd->refst), + gpr_atm_no_barrier_load(&fd->refst) + n, reason, file, line); #else #define REF_BY(fd, n, reason) ref_by(fd, n) #define UNREF_BY(fd, n, reason) unref_by(fd, n) -static void -ref_by (grpc_fd * fd, int n) -{ +static void ref_by(grpc_fd *fd, int n) { #endif - GPR_ASSERT (gpr_atm_no_barrier_fetch_add (&fd->refst, n) > 0); + GPR_ASSERT(gpr_atm_no_barrier_fetch_add(&fd->refst, n) > 0); } #ifdef GRPC_FD_REF_COUNT_DEBUG -static void -unref_by (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) { gpr_atm old; - gpr_log (GPR_DEBUG, "FD %d %p unref %d %d -> %d [%s; %s:%d]", fd->fd, fd, n, gpr_atm_no_barrier_load (&fd->refst), gpr_atm_no_barrier_load (&fd->refst) - n, reason, file, line); + gpr_log(GPR_DEBUG, "FD %d %p unref %d %d -> %d [%s; %s:%d]", fd->fd, fd, n, + gpr_atm_no_barrier_load(&fd->refst), + 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_fd *fd, int n) { gpr_atm old; #endif - old = gpr_atm_full_fetch_add (&fd->refst, -n); - if (old == n) - { - freelist_fd (fd); - } - else - { - GPR_ASSERT (old > n); - } + old = gpr_atm_full_fetch_add(&fd->refst, -n); + if (old == n) { + freelist_fd(fd); + } else { + GPR_ASSERT(old > n); + } } -void -grpc_fd_global_init (void) -{ - gpr_mu_init (&fd_freelist_mu); +void grpc_fd_global_init(void) { gpr_mu_init(&fd_freelist_mu); } + +void grpc_fd_global_shutdown(void) { + gpr_mu_lock(&fd_freelist_mu); + gpr_mu_unlock(&fd_freelist_mu); + while (fd_freelist != NULL) { + grpc_fd *fd = fd_freelist; + fd_freelist = fd_freelist->freelist_next; + destroy(fd); + } + gpr_mu_destroy(&fd_freelist_mu); } -void -grpc_fd_global_shutdown (void) -{ - gpr_mu_lock (&fd_freelist_mu); - gpr_mu_unlock (&fd_freelist_mu); - while (fd_freelist != NULL) - { - grpc_fd *fd = fd_freelist; - fd_freelist = fd_freelist->freelist_next; - destroy (fd); - } - gpr_mu_destroy (&fd_freelist_mu); -} - -grpc_fd * -grpc_fd_create (int fd, const char *name) -{ - grpc_fd *r = alloc_fd (fd); - grpc_iomgr_register_object (&r->iomgr_object, name); +grpc_fd *grpc_fd_create(int fd, const char *name) { + grpc_fd *r = alloc_fd(fd); + grpc_iomgr_register_object(&r->iomgr_object, name); return r; } -int -grpc_fd_is_orphaned (grpc_fd * fd) -{ - return (gpr_atm_acq_load (&fd->refst) & 1) == 0; +int grpc_fd_is_orphaned(grpc_fd *fd) { + return (gpr_atm_acq_load(&fd->refst) & 1) == 0; } -static void -pollset_kick_locked (grpc_pollset * pollset) -{ - gpr_mu_lock (GRPC_POLLSET_MU (pollset)); - grpc_pollset_kick (pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (pollset)); +static void pollset_kick_locked(grpc_pollset *pollset) { + gpr_mu_lock(GRPC_POLLSET_MU(pollset)); + grpc_pollset_kick(pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(pollset)); } -static void -maybe_wake_one_watcher_locked (grpc_fd * fd) -{ - if (fd->inactive_watcher_root.next != &fd->inactive_watcher_root) - { - pollset_kick_locked (fd->inactive_watcher_root.next->pollset); - } - else if (fd->read_watcher) - { - pollset_kick_locked (fd->read_watcher->pollset); - } - else if (fd->write_watcher) - { - pollset_kick_locked (fd->write_watcher->pollset); - } +static void maybe_wake_one_watcher_locked(grpc_fd *fd) { + if (fd->inactive_watcher_root.next != &fd->inactive_watcher_root) { + pollset_kick_locked(fd->inactive_watcher_root.next->pollset); + } else if (fd->read_watcher) { + pollset_kick_locked(fd->read_watcher->pollset); + } else if (fd->write_watcher) { + pollset_kick_locked(fd->write_watcher->pollset); + } } -static void -maybe_wake_one_watcher (grpc_fd * fd) -{ - gpr_mu_lock (&fd->watcher_mu); - maybe_wake_one_watcher_locked (fd); - gpr_mu_unlock (&fd->watcher_mu); +static void maybe_wake_one_watcher(grpc_fd *fd) { + gpr_mu_lock(&fd->watcher_mu); + maybe_wake_one_watcher_locked(fd); + gpr_mu_unlock(&fd->watcher_mu); } -static void -wake_all_watchers_locked (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 (watcher->pollset); - } - if (fd->read_watcher) - { - pollset_kick_locked (fd->read_watcher->pollset); - } - if (fd->write_watcher && fd->write_watcher != fd->read_watcher) - { - pollset_kick_locked (fd->write_watcher->pollset); - } + for (watcher = fd->inactive_watcher_root.next; + watcher != &fd->inactive_watcher_root; watcher = watcher->next) { + pollset_kick_locked(watcher->pollset); + } + if (fd->read_watcher) { + pollset_kick_locked(fd->read_watcher->pollset); + } + if (fd->write_watcher && fd->write_watcher != fd->read_watcher) { + pollset_kick_locked(fd->write_watcher->pollset); + } } -static int -has_watchers (grpc_fd * fd) -{ - return fd->read_watcher != NULL || fd->write_watcher != NULL || fd->inactive_watcher_root.next != &fd->inactive_watcher_root; +static int has_watchers(grpc_fd *fd) { + return fd->read_watcher != NULL || fd->write_watcher != NULL || + fd->inactive_watcher_root.next != &fd->inactive_watcher_root; } -void -grpc_fd_orphan (grpc_exec_ctx * exec_ctx, grpc_fd * fd, grpc_closure * on_done, const char *reason) -{ +void grpc_fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_closure *on_done, + const char *reason) { fd->on_done_closure = on_done; - shutdown (fd->fd, SHUT_RDWR); - gpr_mu_lock (&fd->watcher_mu); - REF_BY (fd, 1, reason); /* remove active status, but keep referenced */ - if (!has_watchers (fd)) - { - fd->closed = 1; - close (fd->fd); - grpc_exec_ctx_enqueue (exec_ctx, fd->on_done_closure, 1); - } - else - { - wake_all_watchers_locked (fd); - } - gpr_mu_unlock (&fd->watcher_mu); - UNREF_BY (fd, 2, reason); /* drop the reference */ + shutdown(fd->fd, SHUT_RDWR); + gpr_mu_lock(&fd->watcher_mu); + REF_BY(fd, 1, reason); /* remove active status, but keep referenced */ + if (!has_watchers(fd)) { + fd->closed = 1; + close(fd->fd); + grpc_exec_ctx_enqueue(exec_ctx, fd->on_done_closure, 1); + } else { + wake_all_watchers_locked(fd); + } + gpr_mu_unlock(&fd->watcher_mu); + UNREF_BY(fd, 2, reason); /* drop the reference */ } /* increment refcount by two to avoid changing the orphan bit */ #ifdef GRPC_FD_REF_COUNT_DEBUG -void -grpc_fd_ref (grpc_fd * fd, const char *reason, const char *file, int line) -{ - ref_by (fd, 2, reason, file, line); +void grpc_fd_ref(grpc_fd *fd, const char *reason, const char *file, int line) { + ref_by(fd, 2, reason, file, line); } -void -grpc_fd_unref (grpc_fd * fd, const char *reason, const char *file, int line) -{ - unref_by (fd, 2, reason, file, line); +void grpc_fd_unref(grpc_fd *fd, const char *reason, const char *file, + int line) { + unref_by(fd, 2, reason, file, line); } #else -void -grpc_fd_ref (grpc_fd * fd) -{ - ref_by (fd, 2); -} +void grpc_fd_ref(grpc_fd *fd) { ref_by(fd, 2); } -void -grpc_fd_unref (grpc_fd * fd) -{ - unref_by (fd, 2); -} +void grpc_fd_unref(grpc_fd *fd) { unref_by(fd, 2); } #endif -static void -notify_on (grpc_exec_ctx * exec_ctx, grpc_fd * fd, gpr_atm * st, grpc_closure * closure) -{ - switch (gpr_atm_acq_load (st)) - { +static void notify_on(grpc_exec_ctx *exec_ctx, grpc_fd *fd, gpr_atm *st, + grpc_closure *closure) { + switch (gpr_atm_acq_load(st)) { case NOT_READY: /* There is no race if the descriptor is already ready, so we skip the interlocked op in that case. As long as the app doesn't @@ -311,195 +254,177 @@ notify_on (grpc_exec_ctx * exec_ctx, grpc_fd * fd, gpr_atm * st, grpc_closure * oldval should never be anything other than READY or NOT_READY. We don't check for user error on the fast path. */ - if (gpr_atm_rel_cas (st, NOT_READY, (gpr_intptr) closure)) - { - /* swap was successful -- the closure will run after the next - set_ready call. NOTE: we don't have an ABA problem here, - since we should never have concurrent calls to the same - notify_on function. */ - maybe_wake_one_watcher (fd); - return; - } - /* swap was unsuccessful due to an intervening set_ready call. - Fall through to the READY code below */ + if (gpr_atm_rel_cas(st, NOT_READY, (gpr_intptr)closure)) { + /* swap was successful -- the closure will run after the next + set_ready call. NOTE: we don't have an ABA problem here, + since we should never have concurrent calls to the same + notify_on function. */ + maybe_wake_one_watcher(fd); + return; + } + /* swap was unsuccessful due to an intervening set_ready call. + Fall through to the READY code below */ case READY: - GPR_ASSERT (gpr_atm_no_barrier_load (st) == READY); - gpr_atm_rel_store (st, NOT_READY); - grpc_exec_ctx_enqueue (exec_ctx, closure, !gpr_atm_acq_load (&fd->shutdown)); + GPR_ASSERT(gpr_atm_no_barrier_load(st) == READY); + gpr_atm_rel_store(st, NOT_READY); + grpc_exec_ctx_enqueue(exec_ctx, closure, + !gpr_atm_acq_load(&fd->shutdown)); return; - default: /* WAITING */ + default: /* WAITING */ /* upcallptr was set to a different closure. This is an error! */ - gpr_log (GPR_ERROR, "User called a notify_on function with a previous callback still " "pending"); - abort (); - } - gpr_log (GPR_ERROR, "Corrupt memory in &st->state"); - abort (); + gpr_log(GPR_ERROR, + "User called a notify_on function with a previous callback still " + "pending"); + abort(); + } + gpr_log(GPR_ERROR, "Corrupt memory in &st->state"); + abort(); } -static void -set_ready_locked (grpc_exec_ctx * exec_ctx, grpc_fd * fd, gpr_atm * st) -{ - gpr_intptr state = gpr_atm_acq_load (st); +static void set_ready_locked(grpc_exec_ctx *exec_ctx, grpc_fd *fd, + gpr_atm *st) { + gpr_intptr state = gpr_atm_acq_load(st); - switch (state) - { + switch (state) { case READY: /* duplicate ready, ignore */ return; case NOT_READY: - if (gpr_atm_rel_cas (st, NOT_READY, READY)) - { - /* swap was successful -- the closure will run after the next - notify_on call. */ - return; - } + if (gpr_atm_rel_cas(st, NOT_READY, READY)) { + /* swap was successful -- the closure will run after the next + notify_on call. */ + return; + } /* swap was unsuccessful due to an intervening set_ready call. Fall through to the WAITING code below */ - state = gpr_atm_acq_load (st); - default: /* waiting */ - GPR_ASSERT (gpr_atm_no_barrier_load (st) != READY && gpr_atm_no_barrier_load (st) != NOT_READY); - grpc_exec_ctx_enqueue (exec_ctx, (grpc_closure *) state, !gpr_atm_acq_load (&fd->shutdown)); - gpr_atm_rel_store (st, NOT_READY); + state = gpr_atm_acq_load(st); + default: /* waiting */ + GPR_ASSERT(gpr_atm_no_barrier_load(st) != READY && + gpr_atm_no_barrier_load(st) != NOT_READY); + grpc_exec_ctx_enqueue(exec_ctx, (grpc_closure *)state, + !gpr_atm_acq_load(&fd->shutdown)); + gpr_atm_rel_store(st, NOT_READY); return; - } + } } -static void -set_ready (grpc_exec_ctx * exec_ctx, grpc_fd * fd, gpr_atm * st) -{ +static void set_ready(grpc_exec_ctx *exec_ctx, grpc_fd *fd, gpr_atm *st) { /* only one set_ready can be active at once (but there may be a racing notify_on) */ - gpr_mu_lock (&fd->set_state_mu); - set_ready_locked (exec_ctx, fd, st); - gpr_mu_unlock (&fd->set_state_mu); + gpr_mu_lock(&fd->set_state_mu); + set_ready_locked(exec_ctx, fd, st); + gpr_mu_unlock(&fd->set_state_mu); } -void -grpc_fd_shutdown (grpc_exec_ctx * exec_ctx, grpc_fd * fd) -{ - gpr_mu_lock (&fd->set_state_mu); - GPR_ASSERT (!gpr_atm_no_barrier_load (&fd->shutdown)); - gpr_atm_rel_store (&fd->shutdown, 1); - set_ready_locked (exec_ctx, fd, &fd->readst); - set_ready_locked (exec_ctx, fd, &fd->writest); - gpr_mu_unlock (&fd->set_state_mu); +void grpc_fd_shutdown(grpc_exec_ctx *exec_ctx, grpc_fd *fd) { + gpr_mu_lock(&fd->set_state_mu); + GPR_ASSERT(!gpr_atm_no_barrier_load(&fd->shutdown)); + gpr_atm_rel_store(&fd->shutdown, 1); + set_ready_locked(exec_ctx, fd, &fd->readst); + set_ready_locked(exec_ctx, fd, &fd->writest); + gpr_mu_unlock(&fd->set_state_mu); } -void -grpc_fd_notify_on_read (grpc_exec_ctx * exec_ctx, grpc_fd * fd, grpc_closure * closure) -{ - notify_on (exec_ctx, fd, &fd->readst, closure); +void grpc_fd_notify_on_read(grpc_exec_ctx *exec_ctx, grpc_fd *fd, + grpc_closure *closure) { + notify_on(exec_ctx, fd, &fd->readst, closure); } -void -grpc_fd_notify_on_write (grpc_exec_ctx * exec_ctx, grpc_fd * fd, grpc_closure * closure) -{ - notify_on (exec_ctx, fd, &fd->writest, closure); +void grpc_fd_notify_on_write(grpc_exec_ctx *exec_ctx, grpc_fd *fd, + grpc_closure *closure) { + notify_on(exec_ctx, fd, &fd->writest, closure); } -gpr_uint32 -grpc_fd_begin_poll (grpc_fd * fd, grpc_pollset * pollset, gpr_uint32 read_mask, gpr_uint32 write_mask, grpc_fd_watcher * watcher) -{ +gpr_uint32 grpc_fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset, + gpr_uint32 read_mask, gpr_uint32 write_mask, + grpc_fd_watcher *watcher) { gpr_uint32 mask = 0; /* keep track of pollers that have requested our events, in case they change */ - GRPC_FD_REF (fd, "poll"); + GRPC_FD_REF(fd, "poll"); - gpr_mu_lock (&fd->watcher_mu); + gpr_mu_lock(&fd->watcher_mu); /* if we are shutdown, then don't add to the watcher set */ - if (gpr_atm_no_barrier_load (&fd->shutdown)) - { - watcher->fd = NULL; - watcher->pollset = NULL; - gpr_mu_unlock (&fd->watcher_mu); - GRPC_FD_UNREF (fd, "poll"); - return 0; - } + if (gpr_atm_no_barrier_load(&fd->shutdown)) { + watcher->fd = NULL; + watcher->pollset = NULL; + gpr_mu_unlock(&fd->watcher_mu); + GRPC_FD_UNREF(fd, "poll"); + return 0; + } /* if there is nobody polling for read, but we need to, then start doing so */ - if (read_mask && !fd->read_watcher && (gpr_uintptr) gpr_atm_acq_load (&fd->readst) > READY) - { - fd->read_watcher = watcher; - mask |= read_mask; - } + if (read_mask && !fd->read_watcher && + (gpr_uintptr)gpr_atm_acq_load(&fd->readst) > READY) { + fd->read_watcher = watcher; + mask |= read_mask; + } /* if there is nobody polling for write, but we need to, then start doing so */ - if (write_mask && !fd->write_watcher && (gpr_uintptr) gpr_atm_acq_load (&fd->writest) > READY) - { - fd->write_watcher = watcher; - mask |= write_mask; - } + if (write_mask && !fd->write_watcher && + (gpr_uintptr)gpr_atm_acq_load(&fd->writest) > READY) { + fd->write_watcher = watcher; + mask |= write_mask; + } /* if not polling, remember this watcher in case we need someone to later */ - if (mask == 0) - { - watcher->next = &fd->inactive_watcher_root; - watcher->prev = watcher->next->prev; - watcher->next->prev = watcher->prev->next = watcher; - } + if (mask == 0) { + watcher->next = &fd->inactive_watcher_root; + watcher->prev = watcher->next->prev; + watcher->next->prev = watcher->prev->next = watcher; + } watcher->pollset = pollset; watcher->fd = fd; - gpr_mu_unlock (&fd->watcher_mu); + gpr_mu_unlock(&fd->watcher_mu); return mask; } -void -grpc_fd_end_poll (grpc_exec_ctx * exec_ctx, grpc_fd_watcher * watcher, int got_read, int got_write) -{ +void grpc_fd_end_poll(grpc_exec_ctx *exec_ctx, grpc_fd_watcher *watcher, + int got_read, int got_write) { int was_polling = 0; int kick = 0; grpc_fd *fd = watcher->fd; - if (fd == NULL) - { - return; - } - - gpr_mu_lock (&fd->watcher_mu); - if (watcher == fd->read_watcher) - { - /* remove read watcher, kick if we still need a read */ - was_polling = 1; - kick = kick || !got_read; - fd->read_watcher = NULL; - } - if (watcher == fd->write_watcher) - { - /* remove write watcher, kick if we still need a write */ - was_polling = 1; - kick = kick || !got_write; - fd->write_watcher = NULL; - } - if (!was_polling) - { - /* remove from inactive list */ - watcher->next->prev = watcher->prev; - watcher->prev->next = watcher->next; - } - if (kick) - { - maybe_wake_one_watcher_locked (fd); - } - if (grpc_fd_is_orphaned (fd) && !has_watchers (fd) && !fd->closed) - { - fd->closed = 1; - close (fd->fd); - grpc_exec_ctx_enqueue (exec_ctx, fd->on_done_closure, 1); - } - gpr_mu_unlock (&fd->watcher_mu); - - GRPC_FD_UNREF (fd, "poll"); + if (fd == NULL) { + return; + } + + gpr_mu_lock(&fd->watcher_mu); + if (watcher == fd->read_watcher) { + /* remove read watcher, kick if we still need a read */ + was_polling = 1; + kick = kick || !got_read; + fd->read_watcher = NULL; + } + if (watcher == fd->write_watcher) { + /* remove write watcher, kick if we still need a write */ + was_polling = 1; + kick = kick || !got_write; + fd->write_watcher = NULL; + } + if (!was_polling) { + /* remove from inactive list */ + watcher->next->prev = watcher->prev; + watcher->prev->next = watcher->next; + } + if (kick) { + maybe_wake_one_watcher_locked(fd); + } + if (grpc_fd_is_orphaned(fd) && !has_watchers(fd) && !fd->closed) { + fd->closed = 1; + close(fd->fd); + grpc_exec_ctx_enqueue(exec_ctx, fd->on_done_closure, 1); + } + gpr_mu_unlock(&fd->watcher_mu); + + GRPC_FD_UNREF(fd, "poll"); } -void -grpc_fd_become_readable (grpc_exec_ctx * exec_ctx, grpc_fd * fd) -{ - set_ready (exec_ctx, fd, &fd->readst); +void grpc_fd_become_readable(grpc_exec_ctx *exec_ctx, grpc_fd *fd) { + set_ready(exec_ctx, fd, &fd->readst); } -void -grpc_fd_become_writable (grpc_exec_ctx * exec_ctx, grpc_fd * fd) -{ - set_ready (exec_ctx, fd, &fd->writest); +void grpc_fd_become_writable(grpc_exec_ctx *exec_ctx, grpc_fd *fd) { + set_ready(exec_ctx, fd, &fd->writest); } #endif diff --git a/src/core/iomgr/fd_posix.h b/src/core/iomgr/fd_posix.h index 550de3753ef..089aa4d7175 100644 --- a/src/core/iomgr/fd_posix.h +++ b/src/core/iomgr/fd_posix.h @@ -42,16 +42,14 @@ typedef struct grpc_fd grpc_fd; -typedef struct grpc_fd_watcher -{ +typedef struct grpc_fd_watcher { struct grpc_fd_watcher *next; struct grpc_fd_watcher *prev; grpc_pollset *pollset; grpc_fd *fd; } grpc_fd_watcher; -struct grpc_fd -{ +struct grpc_fd { int fd; /* refst format: bit0: 1=active/0=orphaned @@ -105,7 +103,7 @@ struct grpc_fd /* Create a wrapped file descriptor. Requires fd is a non-blocking file descriptor. This takes ownership of closing fd. */ -grpc_fd *grpc_fd_create (int fd, const char *name); +grpc_fd *grpc_fd_create(int fd, const char *name); /* Releases fd to be asynchronously destroyed. on_done is called when the underlying file descriptor is definitely close()d. @@ -113,7 +111,8 @@ grpc_fd *grpc_fd_create (int fd, const char *name); 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, const char *reason); +void grpc_fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_closure *on_done, + const char *reason); /* Begin polling on an fd. Registers that the given pollset is interested in this fd - so that if read @@ -126,16 +125,19 @@ void grpc_fd_orphan (grpc_exec_ctx * exec_ctx, grpc_fd * fd, grpc_closure * on_d Polling strategies that do not need to alter their behavior depending on the fd's current interest (such as epoll) do not need to call this function. MUST NOT be called with a pollset lock taken */ -gpr_uint32 grpc_fd_begin_poll (grpc_fd * fd, grpc_pollset * pollset, gpr_uint32 read_mask, gpr_uint32 write_mask, grpc_fd_watcher * rec); +gpr_uint32 grpc_fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset, + gpr_uint32 read_mask, gpr_uint32 write_mask, + grpc_fd_watcher *rec); /* Complete polling previously started with grpc_fd_begin_poll MUST NOT be called with a pollset lock taken */ -void grpc_fd_end_poll (grpc_exec_ctx * exec_ctx, grpc_fd_watcher * rec, int got_read, int got_write); +void grpc_fd_end_poll(grpc_exec_ctx *exec_ctx, grpc_fd_watcher *rec, + int got_read, int got_write); /* Return 1 if this fd is orphaned, 0 otherwise */ -int grpc_fd_is_orphaned (grpc_fd * fd); +int grpc_fd_is_orphaned(grpc_fd *fd); /* Cause any current callbacks to error out with GRPC_CALLBACK_CANCELLED. */ -void grpc_fd_shutdown (grpc_exec_ctx * exec_ctx, grpc_fd * fd); +void grpc_fd_shutdown(grpc_exec_ctx *exec_ctx, grpc_fd *fd); /* Register read interest, causing read_cb to be called once when fd becomes readable, on deadline specified by deadline, or on shutdown triggered by @@ -150,32 +152,34 @@ void grpc_fd_shutdown (grpc_exec_ctx * exec_ctx, grpc_fd * fd); 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_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_exec_ctx * exec_ctx, grpc_fd * fd, grpc_closure * closure); +void grpc_fd_notify_on_write(grpc_exec_ctx *exec_ctx, grpc_fd *fd, + grpc_closure *closure); /* Notification from the poller to an fd that it has become readable or writable. If allow_synchronous_callback is 1, allow running the fd callback inline in this callstack, otherwise register an asynchronous callback and return */ -void grpc_fd_become_readable (grpc_exec_ctx * exec_ctx, grpc_fd * fd); -void grpc_fd_become_writable (grpc_exec_ctx * exec_ctx, grpc_fd * fd); +void grpc_fd_become_readable(grpc_exec_ctx *exec_ctx, grpc_fd *fd); +void grpc_fd_become_writable(grpc_exec_ctx *exec_ctx, grpc_fd *fd); /* Reference counting for fds */ #ifdef GRPC_FD_REF_COUNT_DEBUG -void grpc_fd_ref (grpc_fd * fd, const char *reason, const char *file, int line); -void grpc_fd_unref (grpc_fd * fd, const char *reason, const char *file, int line); +void grpc_fd_ref(grpc_fd *fd, const char *reason, const char *file, int line); +void grpc_fd_unref(grpc_fd *fd, const char *reason, const char *file, int line); #define GRPC_FD_REF(fd, reason) grpc_fd_ref(fd, reason, __FILE__, __LINE__) #define GRPC_FD_UNREF(fd, reason) grpc_fd_unref(fd, reason, __FILE__, __LINE__) #else -void grpc_fd_ref (grpc_fd * fd); -void grpc_fd_unref (grpc_fd * fd); +void grpc_fd_ref(grpc_fd *fd); +void grpc_fd_unref(grpc_fd *fd); #define GRPC_FD_REF(fd, reason) grpc_fd_ref(fd) #define GRPC_FD_UNREF(fd, reason) grpc_fd_unref(fd) #endif -void grpc_fd_global_init (void); -void grpc_fd_global_shutdown (void); +void grpc_fd_global_init(void); +void grpc_fd_global_shutdown(void); #endif /* GRPC_INTERNAL_CORE_IOMGR_FD_POSIX_H */ diff --git a/src/core/iomgr/iocp_windows.c b/src/core/iomgr/iocp_windows.c index d934e638ace..54048910a23 100644 --- a/src/core/iomgr/iocp_windows.c +++ b/src/core/iomgr/iocp_windows.c @@ -56,9 +56,7 @@ static gpr_atm g_custom_events = 0; static HANDLE g_iocp; -static void -do_iocp_work () -{ +static void do_iocp_work() { BOOL success; DWORD bytes = 0; DWORD flags = 0; @@ -66,159 +64,135 @@ do_iocp_work () LPOVERLAPPED overlapped; grpc_winsocket *socket; grpc_winsocket_callback_info *info; - void (*f) (void *, int) = NULL; + void (*f)(void *, int) = NULL; void *opaque = NULL; - success = GetQueuedCompletionStatus (g_iocp, &bytes, &completion_key, &overlapped, INFINITE); + success = GetQueuedCompletionStatus(g_iocp, &bytes, &completion_key, + &overlapped, INFINITE); /* success = 0 and overlapped = NULL means the deadline got attained. Which is impossible. since our wait time is +inf */ - GPR_ASSERT (success || overlapped); - GPR_ASSERT (completion_key && overlapped); - if (overlapped == &g_iocp_custom_overlap) - { - gpr_atm_full_fetch_add (&g_custom_events, -1); - if (completion_key == (ULONG_PTR) & g_iocp_kick_token) - { - /* We were awoken from a kick. */ - return; - } - gpr_log (GPR_ERROR, "Unknown custom completion key."); - abort (); + GPR_ASSERT(success || overlapped); + GPR_ASSERT(completion_key && overlapped); + if (overlapped == &g_iocp_custom_overlap) { + gpr_atm_full_fetch_add(&g_custom_events, -1); + if (completion_key == (ULONG_PTR)&g_iocp_kick_token) { + /* We were awoken from a kick. */ + return; } - - socket = (grpc_winsocket *) completion_key; - if (overlapped == &socket->write_info.overlapped) - { - info = &socket->write_info; - } - else if (overlapped == &socket->read_info.overlapped) - { - info = &socket->read_info; - } - else - { - gpr_log (GPR_ERROR, "Unknown IOCP operation"); - abort (); - } - success = WSAGetOverlappedResult (socket->socket, &info->overlapped, &bytes, FALSE, &flags); + gpr_log(GPR_ERROR, "Unknown custom completion key."); + abort(); + } + + socket = (grpc_winsocket *)completion_key; + if (overlapped == &socket->write_info.overlapped) { + info = &socket->write_info; + } else if (overlapped == &socket->read_info.overlapped) { + info = &socket->read_info; + } else { + gpr_log(GPR_ERROR, "Unknown IOCP operation"); + abort(); + } + success = WSAGetOverlappedResult(socket->socket, &info->overlapped, &bytes, + FALSE, &flags); info->bytes_transfered = bytes; - info->wsa_error = success ? 0 : WSAGetLastError (); - GPR_ASSERT (overlapped == &info->overlapped); - GPR_ASSERT (!info->has_pending_iocp); - gpr_mu_lock (&socket->state_mu); - if (info->cb) - { - f = info->cb; - opaque = info->opaque; - info->cb = NULL; - } - else - { - info->has_pending_iocp = 1; - } - gpr_mu_unlock (&socket->state_mu); - if (f) - f (opaque, 1); + info->wsa_error = success ? 0 : WSAGetLastError(); + GPR_ASSERT(overlapped == &info->overlapped); + GPR_ASSERT(!info->has_pending_iocp); + gpr_mu_lock(&socket->state_mu); + if (info->cb) { + f = info->cb; + opaque = info->opaque; + info->cb = NULL; + } else { + info->has_pending_iocp = 1; + } + gpr_mu_unlock(&socket->state_mu); + if (f) f(opaque, 1); } -static void -iocp_loop (void *p) -{ - while (gpr_atm_acq_load (&g_custom_events) || !gpr_event_get (&g_shutdown_iocp)) - { - do_iocp_work (); - } +static void iocp_loop(void *p) { + while (gpr_atm_acq_load(&g_custom_events) || + !gpr_event_get(&g_shutdown_iocp)) { + do_iocp_work(); + } - gpr_event_set (&g_iocp_done, (void *) 1); + gpr_event_set(&g_iocp_done, (void *)1); } -void -grpc_iocp_init (void) -{ +void grpc_iocp_init(void) { gpr_thd_id id; - g_iocp = CreateIoCompletionPort (INVALID_HANDLE_VALUE, NULL, (ULONG_PTR) NULL, 0); - GPR_ASSERT (g_iocp); + g_iocp = + CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, (ULONG_PTR)NULL, 0); + GPR_ASSERT(g_iocp); - gpr_event_init (&g_iocp_done); - gpr_event_init (&g_shutdown_iocp); - gpr_thd_new (&id, iocp_loop, NULL, NULL); + gpr_event_init(&g_iocp_done); + gpr_event_init(&g_shutdown_iocp); + gpr_thd_new(&id, iocp_loop, NULL, NULL); } -void -grpc_iocp_kick (void) -{ +void grpc_iocp_kick(void) { BOOL success; - gpr_atm_full_fetch_add (&g_custom_events, 1); - success = PostQueuedCompletionStatus (g_iocp, 0, (ULONG_PTR) & g_iocp_kick_token, &g_iocp_custom_overlap); - GPR_ASSERT (success); + gpr_atm_full_fetch_add(&g_custom_events, 1); + success = PostQueuedCompletionStatus(g_iocp, 0, (ULONG_PTR)&g_iocp_kick_token, + &g_iocp_custom_overlap); + GPR_ASSERT(success); } -void -grpc_iocp_shutdown (void) -{ +void grpc_iocp_shutdown(void) { BOOL success; - gpr_event_set (&g_shutdown_iocp, (void *) 1); - grpc_iocp_kick (); - gpr_event_wait (&g_iocp_done, gpr_inf_future (GPR_CLOCK_REALTIME)); - success = CloseHandle (g_iocp); - GPR_ASSERT (success); + gpr_event_set(&g_shutdown_iocp, (void *)1); + grpc_iocp_kick(); + gpr_event_wait(&g_iocp_done, gpr_inf_future(GPR_CLOCK_REALTIME)); + success = CloseHandle(g_iocp); + GPR_ASSERT(success); } -void -grpc_iocp_add_socket (grpc_winsocket * socket) -{ +void grpc_iocp_add_socket(grpc_winsocket *socket) { HANDLE ret; - if (socket->added_to_iocp) - return; - ret = CreateIoCompletionPort ((HANDLE) socket->socket, g_iocp, (gpr_uintptr) socket, 0); - if (!ret) - { - char *utf8_message = gpr_format_message (WSAGetLastError ()); - gpr_log (GPR_ERROR, "Unable to add socket to iocp: %s", utf8_message); - gpr_free (utf8_message); - __debugbreak (); - abort (); - } + if (socket->added_to_iocp) return; + ret = CreateIoCompletionPort((HANDLE)socket->socket, g_iocp, + (gpr_uintptr)socket, 0); + if (!ret) { + char *utf8_message = gpr_format_message(WSAGetLastError()); + gpr_log(GPR_ERROR, "Unable to add socket to iocp: %s", utf8_message); + gpr_free(utf8_message); + __debugbreak(); + abort(); + } socket->added_to_iocp = 1; - GPR_ASSERT (ret == g_iocp); + GPR_ASSERT(ret == g_iocp); } /* Calling notify_on_read or write means either of two things: -) 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, void (*cb) (void *, int), void *opaque, grpc_winsocket_callback_info * info) -{ +static void socket_notify_on_iocp(grpc_winsocket *socket, + void (*cb)(void *, int), void *opaque, + grpc_winsocket_callback_info *info) { int run_now = 0; - GPR_ASSERT (!info->cb); - gpr_mu_lock (&socket->state_mu); - if (info->has_pending_iocp) - { - run_now = 1; - info->has_pending_iocp = 0; - } - else - { - info->cb = cb; - info->opaque = opaque; - } - gpr_mu_unlock (&socket->state_mu); - if (run_now) - cb (opaque, 1); + GPR_ASSERT(!info->cb); + gpr_mu_lock(&socket->state_mu); + if (info->has_pending_iocp) { + run_now = 1; + info->has_pending_iocp = 0; + } else { + info->cb = cb; + info->opaque = opaque; + } + gpr_mu_unlock(&socket->state_mu); + if (run_now) cb(opaque, 1); } -void -grpc_socket_notify_on_write (grpc_winsocket * socket, void (*cb) (void *, int), void *opaque) -{ - socket_notify_on_iocp (socket, cb, opaque, &socket->write_info); +void grpc_socket_notify_on_write(grpc_winsocket *socket, + void (*cb)(void *, int), void *opaque) { + socket_notify_on_iocp(socket, cb, opaque, &socket->write_info); } -void -grpc_socket_notify_on_read (grpc_winsocket * socket, void (*cb) (void *, int), void *opaque) -{ - socket_notify_on_iocp (socket, cb, opaque, &socket->read_info); +void grpc_socket_notify_on_read(grpc_winsocket *socket, void (*cb)(void *, int), + void *opaque) { + socket_notify_on_iocp(socket, cb, opaque, &socket->read_info); } #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/iocp_windows.h b/src/core/iomgr/iocp_windows.h index 972378f1db8..7d2dc45176b 100644 --- a/src/core/iomgr/iocp_windows.h +++ b/src/core/iomgr/iocp_windows.h @@ -38,13 +38,15 @@ #include "src/core/iomgr/socket_windows.h" -void grpc_iocp_init (void); -void grpc_iocp_kick (void); -void grpc_iocp_shutdown (void); -void grpc_iocp_add_socket (grpc_winsocket *); +void grpc_iocp_init(void); +void grpc_iocp_kick(void); +void grpc_iocp_shutdown(void); +void grpc_iocp_add_socket(grpc_winsocket *); -void grpc_socket_notify_on_write (grpc_winsocket *, void (*cb) (void *, int success), void *opaque); +void grpc_socket_notify_on_write(grpc_winsocket *, + void (*cb)(void *, int success), void *opaque); -void grpc_socket_notify_on_read (grpc_winsocket *, void (*cb) (void *, int success), void *opaque); +void grpc_socket_notify_on_read(grpc_winsocket *, + void (*cb)(void *, int success), void *opaque); #endif /* GRPC_INTERNAL_CORE_IOMGR_IOCP_WINDOWS_H */ diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index 30da17fdd8f..ef222416af7 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -51,127 +51,112 @@ static gpr_cv g_rcv; static int g_shutdown; static grpc_iomgr_object g_root_object; -void -grpc_kick_poller (void) -{ +void grpc_kick_poller(void) { /* Empty. The background callback executor polls periodically. The activity * the kicker is trying to draw the executor's attention to will be picked up * either by one of the periodic wakeups or by one of the polling application * threads. */ } -void -grpc_iomgr_init (void) -{ +void grpc_iomgr_init(void) { g_shutdown = 0; - gpr_mu_init (&g_mu); - gpr_cv_init (&g_rcv); - grpc_alarm_list_init (gpr_now (GPR_CLOCK_MONOTONIC)); + gpr_mu_init(&g_mu); + gpr_cv_init(&g_rcv); + grpc_alarm_list_init(gpr_now(GPR_CLOCK_MONOTONIC)); g_root_object.next = g_root_object.prev = &g_root_object; g_root_object.name = "root"; - grpc_iomgr_platform_init (); + grpc_iomgr_platform_init(); } -static size_t -count_objects (void) -{ +static size_t count_objects(void) { grpc_iomgr_object *obj; size_t n = 0; - for (obj = g_root_object.next; obj != &g_root_object; obj = obj->next) - { - n++; - } + for (obj = g_root_object.next; obj != &g_root_object; obj = obj->next) { + n++; + } return n; } -static void -dump_objects (const char *kind) -{ +static void dump_objects(const char *kind) { grpc_iomgr_object *obj; - for (obj = g_root_object.next; obj != &g_root_object; obj = obj->next) - { - gpr_log (GPR_DEBUG, "%s OBJECT: %s %p", kind, obj->name, obj); - } + for (obj = g_root_object.next; obj != &g_root_object; obj = obj->next) { + gpr_log(GPR_DEBUG, "%s OBJECT: %s %p", kind, obj->name, obj); + } } -void -grpc_iomgr_shutdown (void) -{ - 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); +void grpc_iomgr_shutdown(void) { + 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_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - gpr_mu_lock (&g_mu); + 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 %d iomgr objects to be destroyed", count_objects ()); - } - last_warning_time = gpr_now (GPR_CLOCK_REALTIME); - } - if (grpc_alarm_check (&exec_ctx, gpr_inf_future (GPR_CLOCK_MONOTONIC), NULL)) - { - gpr_mu_unlock (&g_mu); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (&g_mu); - continue; - } - if (g_root_object.next != &g_root_object) - { - int timeout = 0; - 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) - { - timeout = 1; - break; - } - } - if (timeout && g_root_object.next != &g_root_object) - { - gpr_log (GPR_DEBUG, "Failed to free %d iomgr objects before shutdown deadline: " "memory leaks are likely", count_objects ()); - dump_objects ("LEAKED"); - break; - } - } + 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 %d iomgr objects to be destroyed", + count_objects()); + } + last_warning_time = gpr_now(GPR_CLOCK_REALTIME); + } + if (grpc_alarm_check(&exec_ctx, gpr_inf_future(GPR_CLOCK_MONOTONIC), + NULL)) { + gpr_mu_unlock(&g_mu); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(&g_mu); + continue; + } + if (g_root_object.next != &g_root_object) { + int timeout = 0; + 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) { + timeout = 1; + break; + } + } + if (timeout && g_root_object.next != &g_root_object) { + gpr_log(GPR_DEBUG, + "Failed to free %d iomgr objects before shutdown deadline: " + "memory leaks are likely", + count_objects()); + dump_objects("LEAKED"); + break; + } } - gpr_mu_unlock (&g_mu); + } + gpr_mu_unlock(&g_mu); - grpc_alarm_list_shutdown (&exec_ctx); - grpc_exec_ctx_finish (&exec_ctx); + grpc_alarm_list_shutdown(&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); /* ensure all threads have left g_mu */ - gpr_mu_lock (&g_mu); - gpr_mu_unlock (&g_mu); + gpr_mu_lock(&g_mu); + gpr_mu_unlock(&g_mu); - grpc_iomgr_platform_shutdown (); - gpr_mu_destroy (&g_mu); - gpr_cv_destroy (&g_rcv); + grpc_iomgr_platform_shutdown(); + gpr_mu_destroy(&g_mu); + gpr_cv_destroy(&g_rcv); } -void -grpc_iomgr_register_object (grpc_iomgr_object * obj, const char *name) -{ - obj->name = gpr_strdup (name); - gpr_mu_lock (&g_mu); +void grpc_iomgr_register_object(grpc_iomgr_object *obj, const char *name) { + obj->name = gpr_strdup(name); + gpr_mu_lock(&g_mu); obj->next = &g_root_object; obj->prev = g_root_object.prev; obj->next->prev = obj->prev->next = obj; - gpr_mu_unlock (&g_mu); + gpr_mu_unlock(&g_mu); } -void -grpc_iomgr_unregister_object (grpc_iomgr_object * obj) -{ - gpr_mu_lock (&g_mu); +void grpc_iomgr_unregister_object(grpc_iomgr_object *obj) { + gpr_mu_lock(&g_mu); obj->next->prev = obj->prev; obj->prev->next = obj->next; - gpr_cv_signal (&g_rcv); - gpr_mu_unlock (&g_mu); - gpr_free (obj->name); + gpr_cv_signal(&g_rcv); + gpr_mu_unlock(&g_mu); + gpr_free(obj->name); } diff --git a/src/core/iomgr/iomgr.h b/src/core/iomgr/iomgr.h index dc9f3c9b4ea..c9ea84c6050 100644 --- a/src/core/iomgr/iomgr.h +++ b/src/core/iomgr/iomgr.h @@ -35,9 +35,9 @@ #define GRPC_INTERNAL_CORE_IOMGR_IOMGR_H /** Initializes the iomgr. */ -void grpc_iomgr_init (void); +void grpc_iomgr_init(void); /** Signals the intention to shutdown the iomgr. */ -void grpc_iomgr_shutdown (void); +void grpc_iomgr_shutdown(void); #endif /* GRPC_INTERNAL_CORE_IOMGR_IOMGR_H */ diff --git a/src/core/iomgr/iomgr_internal.h b/src/core/iomgr/iomgr_internal.h index 9793734722b..f266732c96b 100644 --- a/src/core/iomgr/iomgr_internal.h +++ b/src/core/iomgr/iomgr_internal.h @@ -37,17 +37,16 @@ #include "src/core/iomgr/iomgr.h" #include -typedef struct grpc_iomgr_object -{ +typedef struct grpc_iomgr_object { char *name; struct grpc_iomgr_object *next; struct grpc_iomgr_object *prev; } grpc_iomgr_object; -void grpc_iomgr_register_object (grpc_iomgr_object * obj, const char *name); -void grpc_iomgr_unregister_object (grpc_iomgr_object * obj); +void grpc_iomgr_register_object(grpc_iomgr_object *obj, const char *name); +void grpc_iomgr_unregister_object(grpc_iomgr_object *obj); -void grpc_iomgr_platform_init (void); -void grpc_iomgr_platform_shutdown (void); +void grpc_iomgr_platform_init(void); +void grpc_iomgr_platform_shutdown(void); #endif /* GRPC_INTERNAL_CORE_IOMGR_IOMGR_INTERNAL_H */ diff --git a/src/core/iomgr/iomgr_posix.c b/src/core/iomgr/iomgr_posix.c index 5bc7b0eca30..2425e599415 100644 --- a/src/core/iomgr/iomgr_posix.c +++ b/src/core/iomgr/iomgr_posix.c @@ -40,19 +40,15 @@ #include "src/core/iomgr/fd_posix.h" #include "src/core/iomgr/tcp_posix.h" -void -grpc_iomgr_platform_init (void) -{ - grpc_fd_global_init (); - grpc_pollset_global_init (); - grpc_register_tracer ("tcp", &grpc_tcp_trace); +void grpc_iomgr_platform_init(void) { + grpc_fd_global_init(); + grpc_pollset_global_init(); + grpc_register_tracer("tcp", &grpc_tcp_trace); } -void -grpc_iomgr_platform_shutdown (void) -{ - grpc_pollset_global_shutdown (); - grpc_fd_global_shutdown (); +void grpc_iomgr_platform_shutdown(void) { + grpc_pollset_global_shutdown(); + grpc_fd_global_shutdown(); } #endif /* GRPC_POSIX_SOCKET */ diff --git a/src/core/iomgr/iomgr_posix.h b/src/core/iomgr/iomgr_posix.h index 6725523a8bb..716fedb6368 100644 --- a/src/core/iomgr/iomgr_posix.h +++ b/src/core/iomgr/iomgr_posix.h @@ -36,7 +36,7 @@ #include "src/core/iomgr/iomgr_internal.h" -void grpc_pollset_global_init (void); -void grpc_pollset_global_shutdown (void); +void grpc_pollset_global_init(void); +void grpc_pollset_global_shutdown(void); #endif /* GRPC_INTERNAL_CORE_IOMGR_IOMGR_POSIX_H */ diff --git a/src/core/iomgr/iomgr_windows.c b/src/core/iomgr/iomgr_windows.c index 4b2e154d0df..b49cb87e97b 100644 --- a/src/core/iomgr/iomgr_windows.c +++ b/src/core/iomgr/iomgr_windows.c @@ -47,33 +47,25 @@ ports. All of what we're doing here is basically make sure that Windows sockets are initialized in and out. */ -static void -winsock_init (void) -{ +static void winsock_init(void) { WSADATA wsaData; - int status = WSAStartup (MAKEWORD (2, 0), &wsaData); - GPR_ASSERT (status == 0); + int status = WSAStartup(MAKEWORD(2, 0), &wsaData); + GPR_ASSERT(status == 0); } -static void -winsock_shutdown (void) -{ - int status = WSACleanup (); - GPR_ASSERT (status == 0); +static void winsock_shutdown(void) { + int status = WSACleanup(); + GPR_ASSERT(status == 0); } -void -grpc_iomgr_platform_init (void) -{ - winsock_init (); - grpc_iocp_init (); +void grpc_iomgr_platform_init(void) { + winsock_init(); + grpc_iocp_init(); } -void -grpc_iomgr_platform_shutdown (void) -{ - grpc_iocp_shutdown (); - winsock_shutdown (); +void grpc_iomgr_platform_shutdown(void) { + grpc_iocp_shutdown(); + winsock_shutdown(); } #endif /* GRPC_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/pollset.h b/src/core/iomgr/pollset.h index 11f0c592e6c..d15553a12ab 100644 --- a/src/core/iomgr/pollset.h +++ b/src/core/iomgr/pollset.h @@ -54,9 +54,10 @@ #include "src/core/iomgr/pollset_windows.h" #endif -void grpc_pollset_init (grpc_pollset * pollset); -void grpc_pollset_shutdown (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_closure * closure); -void grpc_pollset_destroy (grpc_pollset * pollset); +void grpc_pollset_init(grpc_pollset *pollset); +void grpc_pollset_shutdown(grpc_exec_ctx *exec_ctx, 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 @@ -76,11 +77,14 @@ void grpc_pollset_destroy (grpc_pollset * pollset); May call grpc_closure_list_run on grpc_closure_list, without holding the pollset lock */ -void grpc_pollset_work (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec now, gpr_timespec deadline); +void grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + grpc_pollset_worker *worker, gpr_timespec now, + gpr_timespec deadline); /* Break one polling thread out of polling work for this pollset. If specific_worker is GRPC_POLLSET_KICK_BROADCAST, kick ALL the workers. Otherwise, if specific_worker is non-NULL, then kick that worker. */ -void grpc_pollset_kick (grpc_pollset * pollset, grpc_pollset_worker * specific_worker); +void grpc_pollset_kick(grpc_pollset *pollset, + grpc_pollset_worker *specific_worker); #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_H */ diff --git a/src/core/iomgr/pollset_multipoller_with_epoll.c b/src/core/iomgr/pollset_multipoller_with_epoll.c index c62a786cf65..5626b08a478 100644 --- a/src/core/iomgr/pollset_multipoller_with_epoll.c +++ b/src/core/iomgr/pollset_multipoller_with_epoll.c @@ -45,28 +45,24 @@ #include #include -typedef struct wakeup_fd_hdl -{ +typedef struct wakeup_fd_hdl { grpc_wakeup_fd wakeup_fd; struct wakeup_fd_hdl *next; } wakeup_fd_hdl; -typedef struct -{ +typedef struct { grpc_pollset *pollset; grpc_fd *fd; grpc_closure closure; } delayed_add; -typedef struct -{ +typedef struct { int epoll_fd; wakeup_fd_hdl *free_wakeup_fds; } pollset_hdr; -static void -finally_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd) -{ +static void finally_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + grpc_fd *fd) { pollset_hdr *h = pollset->data.ptr; struct epoll_event ev; int err; @@ -75,98 +71,90 @@ finally_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd) /* We pretend to be polling whilst adding an fd to keep the fd from being closed during the add. This may result in a spurious wakeup being assigned to this pollset whilst adding, but that should be benign. */ - GPR_ASSERT (grpc_fd_begin_poll (fd, pollset, 0, 0, &watcher) == 0); - if (watcher.fd != NULL) - { - ev.events = (uint32_t) (EPOLLIN | EPOLLOUT | EPOLLET); - ev.data.ptr = fd; - err = epoll_ctl (h->epoll_fd, EPOLL_CTL_ADD, fd->fd, &ev); - if (err < 0) - { - /* FDs may be added to a pollset multiple times, so EEXIST is normal. */ - if (errno != EEXIST) - { - gpr_log (GPR_ERROR, "epoll_ctl add for %d failed: %s", fd->fd, strerror (errno)); - } - } + GPR_ASSERT(grpc_fd_begin_poll(fd, pollset, 0, 0, &watcher) == 0); + if (watcher.fd != NULL) { + ev.events = (uint32_t)(EPOLLIN | EPOLLOUT | EPOLLET); + ev.data.ptr = fd; + err = epoll_ctl(h->epoll_fd, EPOLL_CTL_ADD, fd->fd, &ev); + if (err < 0) { + /* FDs may be added to a pollset multiple times, so EEXIST is normal. */ + if (errno != EEXIST) { + gpr_log(GPR_ERROR, "epoll_ctl add for %d failed: %s", fd->fd, + strerror(errno)); + } } - grpc_fd_end_poll (exec_ctx, &watcher, 0, 0); + } + grpc_fd_end_poll(exec_ctx, &watcher, 0, 0); } -static void -perform_delayed_add (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_status) -{ +static void perform_delayed_add(grpc_exec_ctx *exec_ctx, void *arg, + int iomgr_status) { delayed_add *da = arg; - if (!grpc_fd_is_orphaned (da->fd)) - { - finally_add_fd (exec_ctx, da->pollset, da->fd); - } + if (!grpc_fd_is_orphaned(da->fd)) { + finally_add_fd(exec_ctx, da->pollset, da->fd); + } - gpr_mu_lock (&da->pollset->mu); + gpr_mu_lock(&da->pollset->mu); da->pollset->in_flight_cbs--; - if (da->pollset->shutting_down) - { - /* We don't care about this pollset anymore. */ - if (da->pollset->in_flight_cbs == 0 && !da->pollset->called_shutdown) - { - da->pollset->called_shutdown = 1; - grpc_exec_ctx_enqueue (exec_ctx, da->pollset->shutdown_done, 1); - } + if (da->pollset->shutting_down) { + /* We don't care about this pollset anymore. */ + if (da->pollset->in_flight_cbs == 0 && !da->pollset->called_shutdown) { + da->pollset->called_shutdown = 1; + grpc_exec_ctx_enqueue(exec_ctx, da->pollset->shutdown_done, 1); } - gpr_mu_unlock (&da->pollset->mu); + } + gpr_mu_unlock(&da->pollset->mu); - GRPC_FD_UNREF (da->fd, "delayed_add"); + GRPC_FD_UNREF(da->fd, "delayed_add"); - gpr_free (da); + gpr_free(da); } -static void -multipoll_with_epoll_pollset_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset) -{ - if (and_unlock_pollset) - { - gpr_mu_unlock (&pollset->mu); - finally_add_fd (exec_ctx, pollset, fd); - } - else - { - delayed_add *da = gpr_malloc (sizeof (*da)); - da->pollset = pollset; - da->fd = fd; - GRPC_FD_REF (fd, "delayed_add"); - grpc_closure_init (&da->closure, perform_delayed_add, da); - pollset->in_flight_cbs++; - grpc_exec_ctx_enqueue (exec_ctx, &da->closure, 1); - } +static void multipoll_with_epoll_pollset_add_fd(grpc_exec_ctx *exec_ctx, + grpc_pollset *pollset, + grpc_fd *fd, + int and_unlock_pollset) { + if (and_unlock_pollset) { + gpr_mu_unlock(&pollset->mu); + finally_add_fd(exec_ctx, pollset, fd); + } else { + delayed_add *da = gpr_malloc(sizeof(*da)); + da->pollset = pollset; + da->fd = fd; + GRPC_FD_REF(fd, "delayed_add"); + grpc_closure_init(&da->closure, perform_delayed_add, da); + pollset->in_flight_cbs++; + grpc_exec_ctx_enqueue(exec_ctx, &da->closure, 1); + } } -static void -multipoll_with_epoll_pollset_del_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset) -{ +static void multipoll_with_epoll_pollset_del_fd(grpc_exec_ctx *exec_ctx, + grpc_pollset *pollset, + grpc_fd *fd, + int and_unlock_pollset) { pollset_hdr *h = pollset->data.ptr; int err; - if (and_unlock_pollset) - { - gpr_mu_unlock (&pollset->mu); - } + if (and_unlock_pollset) { + gpr_mu_unlock(&pollset->mu); + } /* Note that this can race with concurrent poll, but that should be fine since * at worst it creates a spurious read event on a reused grpc_fd object. */ - err = epoll_ctl (h->epoll_fd, EPOLL_CTL_DEL, fd->fd, NULL); - if (err < 0) - { - gpr_log (GPR_ERROR, "epoll_ctl del for %d failed: %s", fd->fd, strerror (errno)); - } + err = epoll_ctl(h->epoll_fd, EPOLL_CTL_DEL, fd->fd, NULL); + if (err < 0) { + gpr_log(GPR_ERROR, "epoll_ctl del for %d failed: %s", fd->fd, + strerror(errno)); + } } /* TODO(klempner): We probably want to turn this down a bit */ #define GRPC_EPOLL_MAX_EVENTS 1000 -static void -multipoll_with_epoll_pollset_maybe_work_and_unlock (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now) -{ +static void multipoll_with_epoll_pollset_maybe_work_and_unlock( + grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, grpc_pollset_worker *worker, + gpr_timespec deadline, gpr_timespec now) { struct epoll_event ep_ev[GRPC_EPOLL_MAX_EVENTS]; int ep_rv; int poll_rv; @@ -180,116 +168,93 @@ multipoll_with_epoll_pollset_maybe_work_and_unlock (grpc_exec_ctx * exec_ctx, gr * here. */ - gpr_mu_unlock (&pollset->mu); + gpr_mu_unlock(&pollset->mu); - timeout_ms = grpc_poll_deadline_to_millis_timeout (deadline, now); + timeout_ms = grpc_poll_deadline_to_millis_timeout(deadline, now); - pfds[0].fd = GRPC_WAKEUP_FD_GET_READ_FD (&worker->wakeup_fd); + pfds[0].fd = GRPC_WAKEUP_FD_GET_READ_FD(&worker->wakeup_fd); pfds[0].events = POLLIN; pfds[0].revents = 0; pfds[1].fd = h->epoll_fd; pfds[1].events = POLLIN; pfds[1].revents = 0; - poll_rv = grpc_poll_function (pfds, 2, timeout_ms); + poll_rv = grpc_poll_function(pfds, 2, timeout_ms); - if (poll_rv < 0) - { - if (errno != EINTR) - { - gpr_log (GPR_ERROR, "poll() failed: %s", strerror (errno)); - } + if (poll_rv < 0) { + if (errno != EINTR) { + gpr_log(GPR_ERROR, "poll() failed: %s", strerror(errno)); } - else if (poll_rv == 0) - { - /* do nothing */ + } else if (poll_rv == 0) { + /* do nothing */ + } else { + if (pfds[0].revents) { + grpc_wakeup_fd_consume_wakeup(&worker->wakeup_fd); } - else - { - if (pfds[0].revents) - { - grpc_wakeup_fd_consume_wakeup (&worker->wakeup_fd); - } - if (pfds[1].revents) - { - do - { - ep_rv = epoll_wait (h->epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS, 0); - if (ep_rv < 0) - { - if (errno != EINTR) - { - gpr_log (GPR_ERROR, "epoll_wait() failed: %s", strerror (errno)); - } - } - else - { - int i; - for (i = 0; i < ep_rv; ++i) - { - grpc_fd *fd = ep_ev[i].data.ptr; - /* TODO(klempner): We might want to consider making err and pri - * separate events */ - int cancel = ep_ev[i].events & (EPOLLERR | EPOLLHUP); - int read = ep_ev[i].events & (EPOLLIN | EPOLLPRI); - int write = ep_ev[i].events & EPOLLOUT; - if (read || cancel) - { - grpc_fd_become_readable (exec_ctx, fd); - } - if (write || cancel) - { - grpc_fd_become_writable (exec_ctx, fd); - } - } - } - } - while (ep_rv == GRPC_EPOLL_MAX_EVENTS); - } + if (pfds[1].revents) { + do { + ep_rv = epoll_wait(h->epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS, 0); + if (ep_rv < 0) { + if (errno != EINTR) { + gpr_log(GPR_ERROR, "epoll_wait() failed: %s", strerror(errno)); + } + } else { + int i; + for (i = 0; i < ep_rv; ++i) { + grpc_fd *fd = ep_ev[i].data.ptr; + /* TODO(klempner): We might want to consider making err and pri + * separate events */ + int cancel = ep_ev[i].events & (EPOLLERR | EPOLLHUP); + int read = ep_ev[i].events & (EPOLLIN | EPOLLPRI); + int write = ep_ev[i].events & EPOLLOUT; + if (read || cancel) { + grpc_fd_become_readable(exec_ctx, fd); + } + if (write || cancel) { + grpc_fd_become_writable(exec_ctx, fd); + } + } + } + } while (ep_rv == GRPC_EPOLL_MAX_EVENTS); } + } } -static void -multipoll_with_epoll_pollset_finish_shutdown (grpc_pollset * pollset) -{ -} +static void multipoll_with_epoll_pollset_finish_shutdown( + grpc_pollset *pollset) {} -static void -multipoll_with_epoll_pollset_destroy (grpc_pollset * pollset) -{ +static void multipoll_with_epoll_pollset_destroy(grpc_pollset *pollset) { pollset_hdr *h = pollset->data.ptr; - close (h->epoll_fd); - gpr_free (h); + close(h->epoll_fd); + gpr_free(h); } static const grpc_pollset_vtable multipoll_with_epoll_pollset = { - multipoll_with_epoll_pollset_add_fd, multipoll_with_epoll_pollset_del_fd, - multipoll_with_epoll_pollset_maybe_work_and_unlock, - multipoll_with_epoll_pollset_finish_shutdown, - multipoll_with_epoll_pollset_destroy -}; - -static void -epoll_become_multipoller (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd ** fds, size_t nfds) -{ + multipoll_with_epoll_pollset_add_fd, multipoll_with_epoll_pollset_del_fd, + multipoll_with_epoll_pollset_maybe_work_and_unlock, + multipoll_with_epoll_pollset_finish_shutdown, + multipoll_with_epoll_pollset_destroy}; + +static void epoll_become_multipoller(grpc_exec_ctx *exec_ctx, + grpc_pollset *pollset, grpc_fd **fds, + size_t nfds) { size_t i; - pollset_hdr *h = gpr_malloc (sizeof (pollset_hdr)); + pollset_hdr *h = gpr_malloc(sizeof(pollset_hdr)); pollset->vtable = &multipoll_with_epoll_pollset; pollset->data.ptr = h; - h->epoll_fd = epoll_create1 (EPOLL_CLOEXEC); - if (h->epoll_fd < 0) - { - /* TODO(klempner): Fall back to poll here, especially on ENOSYS */ - gpr_log (GPR_ERROR, "epoll_create1 failed: %s", strerror (errno)); - abort (); - } - for (i = 0; i < nfds; i++) - { - multipoll_with_epoll_pollset_add_fd (exec_ctx, pollset, fds[i], 0); - } + h->epoll_fd = epoll_create1(EPOLL_CLOEXEC); + if (h->epoll_fd < 0) { + /* TODO(klempner): Fall back to poll here, especially on ENOSYS */ + gpr_log(GPR_ERROR, "epoll_create1 failed: %s", strerror(errno)); + abort(); + } + for (i = 0; i < nfds; i++) { + multipoll_with_epoll_pollset_add_fd(exec_ctx, pollset, fds[i], 0); + } } -grpc_platform_become_multipoller_type grpc_platform_become_multipoller = epoll_become_multipoller; +grpc_platform_become_multipoller_type grpc_platform_become_multipoller = + epoll_become_multipoller; #endif /* GPR_LINUX_MULTIPOLL_WITH_EPOLL */ diff --git a/src/core/iomgr/pollset_multipoller_with_poll_posix.c b/src/core/iomgr/pollset_multipoller_with_poll_posix.c index b7eb6c0ab03..2a18cedb337 100644 --- a/src/core/iomgr/pollset_multipoller_with_poll_posix.c +++ b/src/core/iomgr/pollset_multipoller_with_poll_posix.c @@ -48,8 +48,7 @@ #include #include -typedef struct -{ +typedef struct { /* all polled fds */ size_t fd_count; size_t fd_capacity; @@ -60,52 +59,48 @@ typedef struct grpc_fd **dels; } pollset_hdr; -static void -multipoll_with_poll_pollset_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset) -{ +static void multipoll_with_poll_pollset_add_fd(grpc_exec_ctx *exec_ctx, + grpc_pollset *pollset, + grpc_fd *fd, + int and_unlock_pollset) { size_t i; pollset_hdr *h = pollset->data.ptr; /* TODO(ctiller): this is O(num_fds^2); maybe switch to a hash set here */ - for (i = 0; i < h->fd_count; i++) - { - if (h->fds[i] == fd) - goto exit; - } - if (h->fd_count == h->fd_capacity) - { - h->fd_capacity = GPR_MAX (h->fd_capacity + 8, h->fd_count * 3 / 2); - h->fds = gpr_realloc (h->fds, sizeof (grpc_fd *) * h->fd_capacity); - } + for (i = 0; i < h->fd_count; i++) { + if (h->fds[i] == fd) goto exit; + } + if (h->fd_count == h->fd_capacity) { + h->fd_capacity = GPR_MAX(h->fd_capacity + 8, h->fd_count * 3 / 2); + h->fds = gpr_realloc(h->fds, sizeof(grpc_fd *) * h->fd_capacity); + } h->fds[h->fd_count++] = fd; - GRPC_FD_REF (fd, "multipoller"); + GRPC_FD_REF(fd, "multipoller"); exit: - if (and_unlock_pollset) - { - gpr_mu_unlock (&pollset->mu); - } + if (and_unlock_pollset) { + gpr_mu_unlock(&pollset->mu); + } } -static void -multipoll_with_poll_pollset_del_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset) -{ +static void multipoll_with_poll_pollset_del_fd(grpc_exec_ctx *exec_ctx, + grpc_pollset *pollset, + grpc_fd *fd, + int and_unlock_pollset) { /* will get removed next poll cycle */ pollset_hdr *h = pollset->data.ptr; - if (h->del_count == h->del_capacity) - { - h->del_capacity = GPR_MAX (h->del_capacity + 8, h->del_count * 3 / 2); - h->dels = gpr_realloc (h->dels, sizeof (grpc_fd *) * h->del_capacity); - } + if (h->del_count == h->del_capacity) { + h->del_capacity = GPR_MAX(h->del_capacity + 8, h->del_count * 3 / 2); + h->dels = gpr_realloc(h->dels, sizeof(grpc_fd *) * h->del_capacity); + } h->dels[h->del_count++] = fd; - GRPC_FD_REF (fd, "multipoller_del"); - if (and_unlock_pollset) - { - gpr_mu_unlock (&pollset->mu); - } + GRPC_FD_REF(fd, "multipoller_del"); + if (and_unlock_pollset) { + gpr_mu_unlock(&pollset->mu); + } } -static void -multipoll_with_poll_pollset_maybe_work_and_unlock (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now) -{ +static void multipoll_with_poll_pollset_maybe_work_and_unlock( + grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, grpc_pollset_worker *worker, + gpr_timespec deadline, gpr_timespec now) { int timeout; int r; size_t i, j, fd_count; @@ -116,150 +111,125 @@ multipoll_with_poll_pollset_maybe_work_and_unlock (grpc_exec_ctx * exec_ctx, grp struct pollfd *pfds; h = pollset->data.ptr; - timeout = grpc_poll_deadline_to_millis_timeout (deadline, now); + timeout = grpc_poll_deadline_to_millis_timeout(deadline, now); /* TODO(ctiller): perform just one malloc here if we exceed the inline case */ - pfds = gpr_malloc (sizeof (*pfds) * (h->fd_count + 1)); - watchers = gpr_malloc (sizeof (*watchers) * (h->fd_count + 1)); + pfds = gpr_malloc(sizeof(*pfds) * (h->fd_count + 1)); + watchers = gpr_malloc(sizeof(*watchers) * (h->fd_count + 1)); fd_count = 0; pfd_count = 1; - pfds[0].fd = GRPC_WAKEUP_FD_GET_READ_FD (&worker->wakeup_fd); + pfds[0].fd = GRPC_WAKEUP_FD_GET_READ_FD(&worker->wakeup_fd); pfds[0].events = POLLIN; pfds[0].revents = POLLOUT; - for (i = 0; i < h->fd_count; i++) - { - int remove = grpc_fd_is_orphaned (h->fds[i]); - for (j = 0; !remove && j < h->del_count; j++) - { - if (h->fds[i] == h->dels[j]) - remove = 1; - } - if (remove) - { - GRPC_FD_UNREF (h->fds[i], "multipoller"); - } - else - { - h->fds[fd_count++] = h->fds[i]; - watchers[pfd_count].fd = h->fds[i]; - pfds[pfd_count].fd = h->fds[i]->fd; - pfds[pfd_count].revents = 0; - pfd_count++; - } + for (i = 0; i < h->fd_count; i++) { + int remove = grpc_fd_is_orphaned(h->fds[i]); + for (j = 0; !remove && j < h->del_count; j++) { + if (h->fds[i] == h->dels[j]) remove = 1; } - for (j = 0; j < h->del_count; j++) - { - GRPC_FD_UNREF (h->dels[j], "multipoller_del"); + if (remove) { + GRPC_FD_UNREF(h->fds[i], "multipoller"); + } else { + h->fds[fd_count++] = h->fds[i]; + watchers[pfd_count].fd = h->fds[i]; + pfds[pfd_count].fd = h->fds[i]->fd; + pfds[pfd_count].revents = 0; + pfd_count++; } + } + for (j = 0; j < h->del_count; j++) { + GRPC_FD_UNREF(h->dels[j], "multipoller_del"); + } h->del_count = 0; h->fd_count = fd_count; - gpr_mu_unlock (&pollset->mu); + gpr_mu_unlock(&pollset->mu); - for (i = 1; i < pfd_count; i++) - { - pfds[i].events = (short) grpc_fd_begin_poll (watchers[i].fd, pollset, POLLIN, POLLOUT, &watchers[i]); - } + for (i = 1; i < pfd_count; i++) { + pfds[i].events = (short)grpc_fd_begin_poll(watchers[i].fd, pollset, POLLIN, + POLLOUT, &watchers[i]); + } - r = grpc_poll_function (pfds, pfd_count, timeout); + r = grpc_poll_function(pfds, pfd_count, timeout); - for (i = 1; i < pfd_count; i++) - { - grpc_fd_end_poll (exec_ctx, &watchers[i], pfds[i].revents & POLLIN, pfds[i].revents & POLLOUT); - } + for (i = 1; i < pfd_count; i++) { + grpc_fd_end_poll(exec_ctx, &watchers[i], pfds[i].revents & POLLIN, + pfds[i].revents & POLLOUT); + } - if (r < 0) - { - if (errno != EINTR) - { - gpr_log (GPR_ERROR, "poll() failed: %s", strerror (errno)); - } + if (r < 0) { + if (errno != EINTR) { + gpr_log(GPR_ERROR, "poll() failed: %s", strerror(errno)); } - else if (r == 0) - { - /* do nothing */ + } else if (r == 0) { + /* do nothing */ + } else { + if (pfds[0].revents & POLLIN) { + grpc_wakeup_fd_consume_wakeup(&worker->wakeup_fd); } - else - { - if (pfds[0].revents & POLLIN) - { - grpc_wakeup_fd_consume_wakeup (&worker->wakeup_fd); - } - for (i = 1; i < pfd_count; i++) - { - if (watchers[i].fd == NULL) - { - continue; - } - if (pfds[i].revents & (POLLIN | POLLHUP | POLLERR)) - { - grpc_fd_become_readable (exec_ctx, watchers[i].fd); - } - if (pfds[i].revents & (POLLOUT | POLLHUP | POLLERR)) - { - grpc_fd_become_writable (exec_ctx, watchers[i].fd); - } - } + for (i = 1; i < pfd_count; i++) { + if (watchers[i].fd == NULL) { + continue; + } + if (pfds[i].revents & (POLLIN | POLLHUP | POLLERR)) { + grpc_fd_become_readable(exec_ctx, watchers[i].fd); + } + if (pfds[i].revents & (POLLOUT | POLLHUP | POLLERR)) { + grpc_fd_become_writable(exec_ctx, watchers[i].fd); + } } + } - gpr_free (pfds); - gpr_free (watchers); + gpr_free(pfds); + gpr_free(watchers); } -static void -multipoll_with_poll_pollset_finish_shutdown (grpc_pollset * pollset) -{ +static void multipoll_with_poll_pollset_finish_shutdown(grpc_pollset *pollset) { size_t i; pollset_hdr *h = pollset->data.ptr; - for (i = 0; i < h->fd_count; i++) - { - GRPC_FD_UNREF (h->fds[i], "multipoller"); - } - for (i = 0; i < h->del_count; i++) - { - GRPC_FD_UNREF (h->dels[i], "multipoller_del"); - } + for (i = 0; i < h->fd_count; i++) { + GRPC_FD_UNREF(h->fds[i], "multipoller"); + } + for (i = 0; i < h->del_count; i++) { + GRPC_FD_UNREF(h->dels[i], "multipoller_del"); + } h->fd_count = 0; h->del_count = 0; } -static void -multipoll_with_poll_pollset_destroy (grpc_pollset * pollset) -{ +static void multipoll_with_poll_pollset_destroy(grpc_pollset *pollset) { pollset_hdr *h = pollset->data.ptr; - multipoll_with_poll_pollset_finish_shutdown (pollset); - gpr_free (h->fds); - gpr_free (h->dels); - gpr_free (h); + multipoll_with_poll_pollset_finish_shutdown(pollset); + gpr_free(h->fds); + gpr_free(h->dels); + gpr_free(h); } static const grpc_pollset_vtable multipoll_with_poll_pollset = { - multipoll_with_poll_pollset_add_fd, multipoll_with_poll_pollset_del_fd, - multipoll_with_poll_pollset_maybe_work_and_unlock, - multipoll_with_poll_pollset_finish_shutdown, - multipoll_with_poll_pollset_destroy -}; - -void -grpc_poll_become_multipoller (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd ** fds, size_t nfds) -{ + multipoll_with_poll_pollset_add_fd, multipoll_with_poll_pollset_del_fd, + multipoll_with_poll_pollset_maybe_work_and_unlock, + multipoll_with_poll_pollset_finish_shutdown, + multipoll_with_poll_pollset_destroy}; + +void grpc_poll_become_multipoller(grpc_exec_ctx *exec_ctx, + grpc_pollset *pollset, grpc_fd **fds, + size_t nfds) { size_t i; - pollset_hdr *h = gpr_malloc (sizeof (pollset_hdr)); + pollset_hdr *h = gpr_malloc(sizeof(pollset_hdr)); pollset->vtable = &multipoll_with_poll_pollset; pollset->data.ptr = h; h->fd_count = nfds; h->fd_capacity = nfds; - h->fds = gpr_malloc (nfds * sizeof (grpc_fd *)); + h->fds = gpr_malloc(nfds * sizeof(grpc_fd *)); h->del_count = 0; h->del_capacity = 0; h->dels = NULL; - for (i = 0; i < nfds; i++) - { - h->fds[i] = fds[i]; - GRPC_FD_REF (fds[i], "multipoller"); - } + for (i = 0; i < nfds; i++) { + h->fds[i] = fds[i]; + GRPC_FD_REF(fds[i], "multipoller"); + } } #endif /* GPR_POSIX_SOCKET */ #ifdef GPR_POSIX_MULTIPOLL_WITH_POLL -grpc_platform_become_multipoller_type grpc_platform_become_multipoller = grpc_poll_become_multipoller; +grpc_platform_become_multipoller_type grpc_platform_become_multipoller = + grpc_poll_become_multipoller; #endif diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index fedc0d8aed6..850b51e09e3 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -53,281 +53,234 @@ #include #include -GPR_TLS_DECL (g_current_thread_poller); -GPR_TLS_DECL (g_current_thread_worker); +GPR_TLS_DECL(g_current_thread_poller); +GPR_TLS_DECL(g_current_thread_worker); grpc_poll_function_type grpc_poll_function = poll; -static void -remove_worker (grpc_pollset * p, grpc_pollset_worker * worker) -{ +static void remove_worker(grpc_pollset *p, grpc_pollset_worker *worker) { worker->prev->next = worker->next; worker->next->prev = worker->prev; } -int -grpc_pollset_has_workers (grpc_pollset * p) -{ +int grpc_pollset_has_workers(grpc_pollset *p) { return p->root_worker.next != &p->root_worker; } -static grpc_pollset_worker * -pop_front_worker (grpc_pollset * p) -{ - if (grpc_pollset_has_workers (p)) - { - grpc_pollset_worker *w = p->root_worker.next; - remove_worker (p, w); - return w; - } - else - { - return NULL; - } +static grpc_pollset_worker *pop_front_worker(grpc_pollset *p) { + if (grpc_pollset_has_workers(p)) { + grpc_pollset_worker *w = p->root_worker.next; + remove_worker(p, w); + return w; + } else { + return NULL; + } } -static void -push_back_worker (grpc_pollset * p, grpc_pollset_worker * worker) -{ +static void push_back_worker(grpc_pollset *p, grpc_pollset_worker *worker) { worker->next = &p->root_worker; worker->prev = worker->next->prev; worker->prev->next = worker->next->prev = worker; } -static void -push_front_worker (grpc_pollset * p, grpc_pollset_worker * worker) -{ +static void push_front_worker(grpc_pollset *p, grpc_pollset_worker *worker) { worker->prev = &p->root_worker; worker->next = worker->prev->next; worker->prev->next = worker->next->prev = worker; } -void -grpc_pollset_kick (grpc_pollset * p, grpc_pollset_worker * specific_worker) -{ +void grpc_pollset_kick(grpc_pollset *p, grpc_pollset_worker *specific_worker) { /* pollset->mu already held */ - if (specific_worker != NULL) - { - if (specific_worker == GRPC_POLLSET_KICK_BROADCAST) - { - for (specific_worker = p->root_worker.next; specific_worker != &p->root_worker; specific_worker = specific_worker->next) - { - grpc_wakeup_fd_wakeup (&specific_worker->wakeup_fd); - } - p->kicked_without_pollers = 1; - } - else if (gpr_tls_get (&g_current_thread_worker) != (gpr_intptr) specific_worker) - { - grpc_wakeup_fd_wakeup (&specific_worker->wakeup_fd); - } - } - else if (gpr_tls_get (&g_current_thread_poller) != (gpr_intptr) p) - { - specific_worker = pop_front_worker (p); - if (specific_worker != NULL) - { - push_back_worker (p, specific_worker); - grpc_wakeup_fd_wakeup (&specific_worker->wakeup_fd); - } - else - { - p->kicked_without_pollers = 1; - } - } + if (specific_worker != NULL) { + if (specific_worker == GRPC_POLLSET_KICK_BROADCAST) { + for (specific_worker = p->root_worker.next; + specific_worker != &p->root_worker; + specific_worker = specific_worker->next) { + grpc_wakeup_fd_wakeup(&specific_worker->wakeup_fd); + } + p->kicked_without_pollers = 1; + } else if (gpr_tls_get(&g_current_thread_worker) != + (gpr_intptr)specific_worker) { + grpc_wakeup_fd_wakeup(&specific_worker->wakeup_fd); + } + } else if (gpr_tls_get(&g_current_thread_poller) != (gpr_intptr)p) { + specific_worker = pop_front_worker(p); + if (specific_worker != NULL) { + push_back_worker(p, specific_worker); + grpc_wakeup_fd_wakeup(&specific_worker->wakeup_fd); + } else { + p->kicked_without_pollers = 1; + } + } } /* global state management */ -void -grpc_pollset_global_init (void) -{ - gpr_tls_init (&g_current_thread_poller); - grpc_wakeup_fd_global_init (); +void grpc_pollset_global_init(void) { + gpr_tls_init(&g_current_thread_poller); + grpc_wakeup_fd_global_init(); } -void -grpc_pollset_global_shutdown (void) -{ - gpr_tls_destroy (&g_current_thread_poller); - grpc_wakeup_fd_global_destroy (); +void grpc_pollset_global_shutdown(void) { + gpr_tls_destroy(&g_current_thread_poller); + grpc_wakeup_fd_global_destroy(); } /* main interface */ -static void become_basic_pollset (grpc_pollset * pollset, grpc_fd * fd_or_null); +static void become_basic_pollset(grpc_pollset *pollset, grpc_fd *fd_or_null); -void -grpc_pollset_init (grpc_pollset * pollset) -{ - gpr_mu_init (&pollset->mu); +void grpc_pollset_init(grpc_pollset *pollset) { + gpr_mu_init(&pollset->mu); pollset->root_worker.next = pollset->root_worker.prev = &pollset->root_worker; pollset->in_flight_cbs = 0; pollset->shutting_down = 0; pollset->called_shutdown = 0; pollset->idle_jobs.head = pollset->idle_jobs.tail = NULL; - become_basic_pollset (pollset, NULL); + become_basic_pollset(pollset, NULL); } -void -grpc_pollset_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd) -{ - gpr_mu_lock (&pollset->mu); - pollset->vtable->add_fd (exec_ctx, pollset, fd, 1); +void grpc_pollset_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + grpc_fd *fd) { + gpr_mu_lock(&pollset->mu); + pollset->vtable->add_fd(exec_ctx, pollset, fd, 1); /* the following (enabled only in debug) will reacquire and then release our lock - meaning that if the unlocking flag passed to del_fd above is not respected, the code will deadlock (in a way that we have a chance of debugging) */ #ifndef NDEBUG - gpr_mu_lock (&pollset->mu); - gpr_mu_unlock (&pollset->mu); + gpr_mu_lock(&pollset->mu); + gpr_mu_unlock(&pollset->mu); #endif } -void -grpc_pollset_del_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd) -{ - gpr_mu_lock (&pollset->mu); - pollset->vtable->del_fd (exec_ctx, pollset, fd, 1); +void grpc_pollset_del_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + grpc_fd *fd) { + gpr_mu_lock(&pollset->mu); + pollset->vtable->del_fd(exec_ctx, pollset, fd, 1); /* the following (enabled only in debug) will reacquire and then release our lock - meaning that if the unlocking flag passed to del_fd above is not respected, the code will deadlock (in a way that we have a chance of debugging) */ #ifndef NDEBUG - gpr_mu_lock (&pollset->mu); - gpr_mu_unlock (&pollset->mu); + gpr_mu_lock(&pollset->mu); + gpr_mu_unlock(&pollset->mu); #endif } -static void -finish_shutdown (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset) -{ - pollset->vtable->finish_shutdown (pollset); - grpc_exec_ctx_enqueue (exec_ctx, pollset->shutdown_done, 1); +static void finish_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) { + pollset->vtable->finish_shutdown(pollset); + grpc_exec_ctx_enqueue(exec_ctx, pollset->shutdown_done, 1); } -void -grpc_pollset_work (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec now, gpr_timespec deadline) -{ +void grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + grpc_pollset_worker *worker, gpr_timespec now, + gpr_timespec deadline) { /* pollset->mu already held */ int added_worker = 0; int locked = 1; /* this must happen before we (potentially) drop pollset->mu */ worker->next = worker->prev = NULL; /* TODO(ctiller): pool these */ - grpc_wakeup_fd_init (&worker->wakeup_fd); - if (!grpc_pollset_has_workers (pollset) && !grpc_closure_list_empty (pollset->idle_jobs)) - { - grpc_exec_ctx_enqueue_list (exec_ctx, &pollset->idle_jobs); - goto done; - } - if (grpc_alarm_check (exec_ctx, now, &deadline)) - { - goto done; - } - if (pollset->shutting_down) - { - goto done; - } - if (pollset->in_flight_cbs) - { - /* Give do_promote priority so we don't starve it out */ - gpr_mu_unlock (&pollset->mu); - locked = 0; - goto done; - } - if (!pollset->kicked_without_pollers) - { - push_front_worker (pollset, worker); - added_worker = 1; - gpr_tls_set (&g_current_thread_poller, (gpr_intptr) pollset); - pollset->vtable->maybe_work_and_unlock (exec_ctx, pollset, worker, deadline, now); - locked = 0; - gpr_tls_set (&g_current_thread_poller, 0); - } - else - { - pollset->kicked_without_pollers = 0; - } + grpc_wakeup_fd_init(&worker->wakeup_fd); + if (!grpc_pollset_has_workers(pollset) && + !grpc_closure_list_empty(pollset->idle_jobs)) { + grpc_exec_ctx_enqueue_list(exec_ctx, &pollset->idle_jobs); + goto done; + } + if (grpc_alarm_check(exec_ctx, now, &deadline)) { + goto done; + } + if (pollset->shutting_down) { + goto done; + } + if (pollset->in_flight_cbs) { + /* Give do_promote priority so we don't starve it out */ + gpr_mu_unlock(&pollset->mu); + locked = 0; + goto done; + } + if (!pollset->kicked_without_pollers) { + push_front_worker(pollset, worker); + added_worker = 1; + gpr_tls_set(&g_current_thread_poller, (gpr_intptr)pollset); + pollset->vtable->maybe_work_and_unlock(exec_ctx, pollset, worker, deadline, + now); + locked = 0; + gpr_tls_set(&g_current_thread_poller, 0); + } else { + pollset->kicked_without_pollers = 0; + } done: - if (!locked) - { - grpc_exec_ctx_flush (exec_ctx); - gpr_mu_lock (&pollset->mu); - locked = 1; - } - grpc_wakeup_fd_destroy (&worker->wakeup_fd); - if (added_worker) - { - remove_worker (pollset, worker); - } - if (pollset->shutting_down) - { - if (grpc_pollset_has_workers (pollset)) - { - grpc_pollset_kick (pollset, NULL); - } - else if (!pollset->called_shutdown && pollset->in_flight_cbs == 0) - { - pollset->called_shutdown = 1; - gpr_mu_unlock (&pollset->mu); - 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 - * grpc_pollset_work. - * TODO(dklempner): Can we refactor the shutdown logic to avoid this? */ - gpr_mu_lock (&pollset->mu); - } - } + if (!locked) { + grpc_exec_ctx_flush(exec_ctx); + gpr_mu_lock(&pollset->mu); + locked = 1; + } + grpc_wakeup_fd_destroy(&worker->wakeup_fd); + if (added_worker) { + remove_worker(pollset, worker); + } + if (pollset->shutting_down) { + if (grpc_pollset_has_workers(pollset)) { + grpc_pollset_kick(pollset, NULL); + } else if (!pollset->called_shutdown && pollset->in_flight_cbs == 0) { + pollset->called_shutdown = 1; + gpr_mu_unlock(&pollset->mu); + 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 + * grpc_pollset_work. + * TODO(dklempner): Can we refactor the shutdown logic to avoid this? */ + gpr_mu_lock(&pollset->mu); + } + } } -void -grpc_pollset_shutdown (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_closure * closure) -{ +void grpc_pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + grpc_closure *closure) { int call_shutdown = 0; - gpr_mu_lock (&pollset->mu); - GPR_ASSERT (!pollset->shutting_down); + gpr_mu_lock(&pollset->mu); + GPR_ASSERT(!pollset->shutting_down); pollset->shutting_down = 1; - if (!pollset->called_shutdown && pollset->in_flight_cbs == 0 && !grpc_pollset_has_workers (pollset)) - { - pollset->called_shutdown = 1; - call_shutdown = 1; - } + if (!pollset->called_shutdown && pollset->in_flight_cbs == 0 && + !grpc_pollset_has_workers(pollset)) { + pollset->called_shutdown = 1; + call_shutdown = 1; + } pollset->shutdown_done = closure; - grpc_pollset_kick (pollset, GRPC_POLLSET_KICK_BROADCAST); - gpr_mu_unlock (&pollset->mu); + grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); + gpr_mu_unlock(&pollset->mu); - if (call_shutdown) - { - finish_shutdown (exec_ctx, pollset); - } + if (call_shutdown) { + finish_shutdown(exec_ctx, pollset); + } } -void -grpc_pollset_destroy (grpc_pollset * pollset) -{ - GPR_ASSERT (pollset->shutting_down); - GPR_ASSERT (pollset->in_flight_cbs == 0); - GPR_ASSERT (!grpc_pollset_has_workers (pollset)); - pollset->vtable->destroy (pollset); - gpr_mu_destroy (&pollset->mu); +void grpc_pollset_destroy(grpc_pollset *pollset) { + GPR_ASSERT(pollset->shutting_down); + GPR_ASSERT(pollset->in_flight_cbs == 0); + GPR_ASSERT(!grpc_pollset_has_workers(pollset)); + pollset->vtable->destroy(pollset); + gpr_mu_destroy(&pollset->mu); } -int -grpc_poll_deadline_to_millis_timeout (gpr_timespec deadline, gpr_timespec now) -{ +int grpc_poll_deadline_to_millis_timeout(gpr_timespec deadline, + gpr_timespec now) { gpr_timespec timeout; static const int max_spin_polling_us = 10; - if (gpr_time_cmp (deadline, gpr_inf_future (deadline.clock_type)) == 0) - { - return -1; - } - if (gpr_time_cmp (deadline, gpr_time_add (now, gpr_time_from_micros (max_spin_polling_us, GPR_TIMESPAN))) <= 0) - { - return 0; - } - timeout = gpr_time_sub (deadline, now); - return gpr_time_to_millis (gpr_time_add (timeout, gpr_time_from_nanos (GPR_NS_PER_SEC - 1, GPR_TIMESPAN))); + if (gpr_time_cmp(deadline, gpr_inf_future(deadline.clock_type)) == 0) { + return -1; + } + if (gpr_time_cmp(deadline, gpr_time_add(now, gpr_time_from_micros( + max_spin_polling_us, + GPR_TIMESPAN))) <= 0) { + return 0; + } + timeout = gpr_time_sub(deadline, now); + return gpr_time_to_millis(gpr_time_add( + timeout, gpr_time_from_nanos(GPR_NS_PER_SEC - 1, GPR_TIMESPAN))); } /* @@ -335,17 +288,14 @@ grpc_poll_deadline_to_millis_timeout (gpr_timespec deadline, gpr_timespec now) * descriptor via poll() */ -typedef struct grpc_unary_promote_args -{ +typedef struct grpc_unary_promote_args { const grpc_pollset_vtable *original_vtable; grpc_pollset *pollset; grpc_fd *fd; grpc_closure promotion_closure; } grpc_unary_promote_args; -static void -basic_do_promote (grpc_exec_ctx * exec_ctx, void *args, int success) -{ +static void basic_do_promote(grpc_exec_ctx *exec_ctx, void *args, int success) { grpc_unary_promote_args *up_args = args; const grpc_pollset_vtable *original_vtable = up_args->original_vtable; grpc_pollset *pollset = up_args->pollset; @@ -360,143 +310,123 @@ basic_do_promote (grpc_exec_ctx * exec_ctx, void *args, int success) * 4. The pollset may be shutting down. */ - gpr_mu_lock (&pollset->mu); + gpr_mu_lock(&pollset->mu); /* First we need to ensure that nobody is polling concurrently */ - GPR_ASSERT (!grpc_pollset_has_workers (pollset)); + GPR_ASSERT(!grpc_pollset_has_workers(pollset)); - gpr_free (up_args); + gpr_free(up_args); /* At this point the pollset may no longer be a unary poller. In that case * we should just call the right add function and be done. */ /* TODO(klempner): If we're not careful this could cause infinite recursion. * That's not a problem for now because empty_pollset has a trivial poller * and we don't have any mechanism to unbecome multipoller. */ pollset->in_flight_cbs--; - if (pollset->shutting_down) - { - /* We don't care about this pollset anymore. */ - if (pollset->in_flight_cbs == 0 && !pollset->called_shutdown) - { - GPR_ASSERT (!grpc_pollset_has_workers (pollset)); - pollset->called_shutdown = 1; - grpc_exec_ctx_enqueue (exec_ctx, pollset->shutdown_done, 1); - } - } - else if (grpc_fd_is_orphaned (fd)) - { - /* Don't try to add it to anything, we'll drop our ref on it below */ - } - else if (pollset->vtable != original_vtable) - { - pollset->vtable->add_fd (exec_ctx, pollset, fd, 0); - } - else if (fd != pollset->data.ptr) - { - grpc_fd *fds[2]; - fds[0] = pollset->data.ptr; - fds[1] = fd; - - if (fds[0] && !grpc_fd_is_orphaned (fds[0])) - { - grpc_platform_become_multipoller (exec_ctx, pollset, fds, GPR_ARRAY_SIZE (fds)); - GRPC_FD_UNREF (fds[0], "basicpoll"); - } - else - { - /* old fd is orphaned and we haven't cleaned it up until now, so remain a - * unary poller */ - /* Note that it is possible that fds[1] is also orphaned at this point. - * That's okay, we'll correct it at the next add or poll. */ - if (fds[0]) - GRPC_FD_UNREF (fds[0], "basicpoll"); - pollset->data.ptr = fd; - GRPC_FD_REF (fd, "basicpoll"); - } - } - - gpr_mu_unlock (&pollset->mu); + if (pollset->shutting_down) { + /* We don't care about this pollset anymore. */ + if (pollset->in_flight_cbs == 0 && !pollset->called_shutdown) { + GPR_ASSERT(!grpc_pollset_has_workers(pollset)); + pollset->called_shutdown = 1; + grpc_exec_ctx_enqueue(exec_ctx, pollset->shutdown_done, 1); + } + } else if (grpc_fd_is_orphaned(fd)) { + /* Don't try to add it to anything, we'll drop our ref on it below */ + } else if (pollset->vtable != original_vtable) { + pollset->vtable->add_fd(exec_ctx, pollset, fd, 0); + } else if (fd != pollset->data.ptr) { + grpc_fd *fds[2]; + fds[0] = pollset->data.ptr; + fds[1] = fd; + + if (fds[0] && !grpc_fd_is_orphaned(fds[0])) { + grpc_platform_become_multipoller(exec_ctx, pollset, fds, + GPR_ARRAY_SIZE(fds)); + GRPC_FD_UNREF(fds[0], "basicpoll"); + } else { + /* old fd is orphaned and we haven't cleaned it up until now, so remain a + * unary poller */ + /* Note that it is possible that fds[1] is also orphaned at this point. + * That's okay, we'll correct it at the next add or poll. */ + if (fds[0]) GRPC_FD_UNREF(fds[0], "basicpoll"); + pollset->data.ptr = fd; + GRPC_FD_REF(fd, "basicpoll"); + } + } + + gpr_mu_unlock(&pollset->mu); /* Matching ref in basic_pollset_add_fd */ - GRPC_FD_UNREF (fd, "basicpoll_add"); + GRPC_FD_UNREF(fd, "basicpoll_add"); } -static void -basic_pollset_add_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset) -{ +static void basic_pollset_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + grpc_fd *fd, int and_unlock_pollset) { grpc_unary_promote_args *up_args; - GPR_ASSERT (fd); - if (fd == pollset->data.ptr) - goto exit; - - if (!grpc_pollset_has_workers (pollset)) - { - /* Fast path -- no in flight cbs */ - /* TODO(klempner): Comment this out and fix any test failures or establish - * they are due to timing issues */ - grpc_fd *fds[2]; - fds[0] = pollset->data.ptr; - fds[1] = fd; - - if (fds[0] == NULL) - { - pollset->data.ptr = fd; - GRPC_FD_REF (fd, "basicpoll"); - } - else if (!grpc_fd_is_orphaned (fds[0])) - { - grpc_platform_become_multipoller (exec_ctx, pollset, fds, GPR_ARRAY_SIZE (fds)); - GRPC_FD_UNREF (fds[0], "basicpoll"); - } - else - { - /* old fd is orphaned and we haven't cleaned it up until now, so remain a - * unary poller */ - GRPC_FD_UNREF (fds[0], "basicpoll"); - pollset->data.ptr = fd; - GRPC_FD_REF (fd, "basicpoll"); - } - goto exit; + GPR_ASSERT(fd); + if (fd == pollset->data.ptr) goto exit; + + if (!grpc_pollset_has_workers(pollset)) { + /* Fast path -- no in flight cbs */ + /* TODO(klempner): Comment this out and fix any test failures or establish + * they are due to timing issues */ + grpc_fd *fds[2]; + fds[0] = pollset->data.ptr; + fds[1] = fd; + + if (fds[0] == NULL) { + pollset->data.ptr = fd; + GRPC_FD_REF(fd, "basicpoll"); + } else if (!grpc_fd_is_orphaned(fds[0])) { + grpc_platform_become_multipoller(exec_ctx, pollset, fds, + GPR_ARRAY_SIZE(fds)); + GRPC_FD_UNREF(fds[0], "basicpoll"); + } else { + /* old fd is orphaned and we haven't cleaned it up until now, so remain a + * unary poller */ + GRPC_FD_UNREF(fds[0], "basicpoll"); + pollset->data.ptr = fd; + GRPC_FD_REF(fd, "basicpoll"); } + goto exit; + } /* Now we need to promote. This needs to happen when we're not polling. Since * this may be called from poll, the wait needs to happen asynchronously. */ - GRPC_FD_REF (fd, "basicpoll_add"); + GRPC_FD_REF(fd, "basicpoll_add"); pollset->in_flight_cbs++; - up_args = gpr_malloc (sizeof (*up_args)); + up_args = gpr_malloc(sizeof(*up_args)); up_args->fd = fd; up_args->original_vtable = pollset->vtable; up_args->pollset = pollset; up_args->promotion_closure.cb = basic_do_promote; up_args->promotion_closure.cb_arg = up_args; - grpc_closure_list_add (&pollset->idle_jobs, &up_args->promotion_closure, 1); - grpc_pollset_kick (pollset, GRPC_POLLSET_KICK_BROADCAST); + grpc_closure_list_add(&pollset->idle_jobs, &up_args->promotion_closure, 1); + grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); exit: - if (and_unlock_pollset) - { - gpr_mu_unlock (&pollset->mu); - } + if (and_unlock_pollset) { + gpr_mu_unlock(&pollset->mu); + } } -static void -basic_pollset_del_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_fd * fd, int and_unlock_pollset) -{ - GPR_ASSERT (fd); - if (fd == pollset->data.ptr) - { - GRPC_FD_UNREF (pollset->data.ptr, "basicpoll"); - pollset->data.ptr = NULL; - } - - if (and_unlock_pollset) - { - gpr_mu_unlock (&pollset->mu); - } +static void basic_pollset_del_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + grpc_fd *fd, int and_unlock_pollset) { + GPR_ASSERT(fd); + if (fd == pollset->data.ptr) { + GRPC_FD_UNREF(pollset->data.ptr, "basicpoll"); + pollset->data.ptr = NULL; + } + + if (and_unlock_pollset) { + gpr_mu_unlock(&pollset->mu); + } } -static void -basic_pollset_maybe_work_and_unlock (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now) -{ +static void basic_pollset_maybe_work_and_unlock(grpc_exec_ctx *exec_ctx, + grpc_pollset *pollset, + grpc_pollset_worker *worker, + gpr_timespec deadline, + gpr_timespec now) { struct pollfd pfd[2]; grpc_fd *fd; grpc_fd_watcher fd_watcher; @@ -505,98 +435,77 @@ basic_pollset_maybe_work_and_unlock (grpc_exec_ctx * exec_ctx, grpc_pollset * po nfds_t nfds; fd = pollset->data.ptr; - if (fd && grpc_fd_is_orphaned (fd)) - { - GRPC_FD_UNREF (fd, "basicpoll"); - fd = pollset->data.ptr = NULL; - } - timeout = grpc_poll_deadline_to_millis_timeout (deadline, now); - pfd[0].fd = GRPC_WAKEUP_FD_GET_READ_FD (&worker->wakeup_fd); + if (fd && grpc_fd_is_orphaned(fd)) { + GRPC_FD_UNREF(fd, "basicpoll"); + fd = pollset->data.ptr = NULL; + } + timeout = grpc_poll_deadline_to_millis_timeout(deadline, now); + pfd[0].fd = GRPC_WAKEUP_FD_GET_READ_FD(&worker->wakeup_fd); pfd[0].events = POLLIN; pfd[0].revents = 0; nfds = 1; - if (fd) - { - pfd[1].fd = fd->fd; - pfd[1].revents = 0; - gpr_mu_unlock (&pollset->mu); - pfd[1].events = (short) grpc_fd_begin_poll (fd, pollset, POLLIN, POLLOUT, &fd_watcher); - if (pfd[1].events != 0) - { - nfds++; - } - } - else - { - gpr_mu_unlock (&pollset->mu); - } + if (fd) { + pfd[1].fd = fd->fd; + pfd[1].revents = 0; + gpr_mu_unlock(&pollset->mu); + pfd[1].events = + (short)grpc_fd_begin_poll(fd, pollset, POLLIN, POLLOUT, &fd_watcher); + if (pfd[1].events != 0) { + nfds++; + } + } else { + gpr_mu_unlock(&pollset->mu); + } /* poll fd count (argument 2) is shortened by one if we have no events to poll on - such that it only includes the kicker */ - r = grpc_poll_function (pfd, nfds, timeout); - GRPC_TIMER_MARK (GRPC_PTAG_POLL_FINISHED, r); - - if (fd) - { - grpc_fd_end_poll (exec_ctx, &fd_watcher, pfd[1].revents & POLLIN, pfd[1].revents & POLLOUT); - } - - if (r < 0) - { - if (errno != EINTR) - { - gpr_log (GPR_ERROR, "poll() failed: %s", strerror (errno)); - } - } - else if (r == 0) - { - /* do nothing */ - } - else - { - if (pfd[0].revents & POLLIN) - { - grpc_wakeup_fd_consume_wakeup (&worker->wakeup_fd); - } - if (nfds > 1) - { - if (pfd[1].revents & (POLLIN | POLLHUP | POLLERR)) - { - grpc_fd_become_readable (exec_ctx, fd); - } - if (pfd[1].revents & (POLLOUT | POLLHUP | POLLERR)) - { - grpc_fd_become_writable (exec_ctx, fd); - } - } - } + r = grpc_poll_function(pfd, nfds, timeout); + GRPC_TIMER_MARK(GRPC_PTAG_POLL_FINISHED, r); + + if (fd) { + grpc_fd_end_poll(exec_ctx, &fd_watcher, pfd[1].revents & POLLIN, + pfd[1].revents & POLLOUT); + } + + if (r < 0) { + if (errno != EINTR) { + gpr_log(GPR_ERROR, "poll() failed: %s", strerror(errno)); + } + } else if (r == 0) { + /* do nothing */ + } else { + if (pfd[0].revents & POLLIN) { + grpc_wakeup_fd_consume_wakeup(&worker->wakeup_fd); + } + if (nfds > 1) { + if (pfd[1].revents & (POLLIN | POLLHUP | POLLERR)) { + grpc_fd_become_readable(exec_ctx, fd); + } + if (pfd[1].revents & (POLLOUT | POLLHUP | POLLERR)) { + grpc_fd_become_writable(exec_ctx, fd); + } + } + } } -static void -basic_pollset_destroy (grpc_pollset * pollset) -{ - if (pollset->data.ptr != NULL) - { - GRPC_FD_UNREF (pollset->data.ptr, "basicpoll"); - pollset->data.ptr = NULL; - } +static void basic_pollset_destroy(grpc_pollset *pollset) { + if (pollset->data.ptr != NULL) { + GRPC_FD_UNREF(pollset->data.ptr, "basicpoll"); + pollset->data.ptr = NULL; + } } static const grpc_pollset_vtable basic_pollset = { - basic_pollset_add_fd, basic_pollset_del_fd, - basic_pollset_maybe_work_and_unlock, basic_pollset_destroy, - basic_pollset_destroy -}; - -static void -become_basic_pollset (grpc_pollset * pollset, grpc_fd * fd_or_null) -{ + basic_pollset_add_fd, basic_pollset_del_fd, + basic_pollset_maybe_work_and_unlock, basic_pollset_destroy, + basic_pollset_destroy}; + +static void become_basic_pollset(grpc_pollset *pollset, grpc_fd *fd_or_null) { pollset->vtable = &basic_pollset; pollset->data.ptr = fd_or_null; - if (fd_or_null != NULL) - { - GRPC_FD_REF (fd_or_null, "basicpoll"); - } + if (fd_or_null != NULL) { + GRPC_FD_REF(fd_or_null, "basicpoll"); + } } #endif /* GPR_POSIX_POLLSET */ diff --git a/src/core/iomgr/pollset_posix.h b/src/core/iomgr/pollset_posix.h index 91cf93580fc..f996dd1edfb 100644 --- a/src/core/iomgr/pollset_posix.h +++ b/src/core/iomgr/pollset_posix.h @@ -48,15 +48,13 @@ typedef struct grpc_pollset_vtable grpc_pollset_vtable; use the struct tag */ struct grpc_fd; -typedef struct grpc_pollset_worker -{ +typedef struct grpc_pollset_worker { grpc_wakeup_fd wakeup_fd; struct grpc_pollset_worker *next; struct grpc_pollset_worker *prev; } grpc_pollset_worker; -typedef struct grpc_pollset -{ +typedef struct grpc_pollset { /* pollsets under posix can mutate representation as fds are added and removed. For example, we may choose a poll() based implementation on linux for @@ -70,34 +68,38 @@ typedef struct grpc_pollset int kicked_without_pollers; grpc_closure *shutdown_done; grpc_closure_list idle_jobs; - union - { + union { int fd; void *ptr; } data; } grpc_pollset; -struct grpc_pollset_vtable -{ - void (*add_fd) (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, struct grpc_fd * fd, int and_unlock_pollset); - void (*del_fd) (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, struct grpc_fd * fd, int and_unlock_pollset); - void (*maybe_work_and_unlock) (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec deadline, gpr_timespec now); - void (*finish_shutdown) (grpc_pollset * pollset); - void (*destroy) (grpc_pollset * pollset); +struct grpc_pollset_vtable { + void (*add_fd)(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + struct grpc_fd *fd, int and_unlock_pollset); + void (*del_fd)(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + struct grpc_fd *fd, int and_unlock_pollset); + void (*maybe_work_and_unlock)(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + grpc_pollset_worker *worker, + gpr_timespec deadline, gpr_timespec now); + void (*finish_shutdown)(grpc_pollset *pollset); + void (*destroy)(grpc_pollset *pollset); }; #define GRPC_POLLSET_MU(pollset) (&(pollset)->mu) /* 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_exec_ctx *exec_ctx, grpc_pollset *pollset, + struct grpc_fd *fd); /* Force remove an fd from a pollset (normally they are removed on the next poll after an fd is orphaned) */ -void grpc_pollset_del_fd (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, struct grpc_fd *fd); +void grpc_pollset_del_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + struct grpc_fd *fd); /* Returns the fd to listen on for kicks */ -int grpc_kick_read_fd (grpc_pollset * p); +int grpc_kick_read_fd(grpc_pollset *p); /* Call after polling has been kicked to leave the kicked state */ -void grpc_kick_drain (grpc_pollset * p); +void grpc_kick_drain(grpc_pollset *p); /* Convert a timespec to milliseconds: - very small or negative poll times are clamped to zero to do a @@ -106,20 +108,26 @@ void grpc_kick_drain (grpc_pollset * p); - longer than a millisecond polls are rounded up to the next nearest millisecond to avoid spinning - infinite timeouts are converted to -1 */ -int grpc_poll_deadline_to_millis_timeout (gpr_timespec deadline, gpr_timespec now); +int grpc_poll_deadline_to_millis_timeout(gpr_timespec deadline, + gpr_timespec now); /* turn a pollset into a multipoller: platform specific */ -typedef void (*grpc_platform_become_multipoller_type) (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, struct grpc_fd ** fds, size_t fd_count); +typedef void (*grpc_platform_become_multipoller_type)(grpc_exec_ctx *exec_ctx, + grpc_pollset *pollset, + struct grpc_fd **fds, + size_t fd_count); extern grpc_platform_become_multipoller_type grpc_platform_become_multipoller; -void grpc_poll_become_multipoller (grpc_exec_ctx * exec_ctx, grpc_pollset * pollset, struct grpc_fd **fds, size_t fd_count); +void grpc_poll_become_multipoller(grpc_exec_ctx *exec_ctx, + grpc_pollset *pollset, struct grpc_fd **fds, + size_t fd_count); /* Return 1 if the pollset has active threads in grpc_pollset_work (pollset must * be locked) */ -int grpc_pollset_has_workers (grpc_pollset * pollset); +int grpc_pollset_has_workers(grpc_pollset *pollset); /* override to allow tests to hook poll() usage */ -typedef int (*grpc_poll_function_type) (struct pollfd *, nfds_t, int); +typedef int (*grpc_poll_function_type)(struct pollfd *, nfds_t, int); extern grpc_poll_function_type grpc_poll_function; #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_POSIX_H */ diff --git a/src/core/iomgr/pollset_set.h b/src/core/iomgr/pollset_set.h index a777c6ca23c..0fdcba01a4b 100644 --- a/src/core/iomgr/pollset_set.h +++ b/src/core/iomgr/pollset_set.h @@ -49,9 +49,13 @@ #include "src/core/iomgr/pollset_set_windows.h" #endif -void grpc_pollset_set_init (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, grpc_pollset * pollset); -void grpc_pollset_set_del_pollset (grpc_exec_ctx * exec_ctx, grpc_pollset_set * pollset_set, grpc_pollset * pollset); +void grpc_pollset_set_init(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, + grpc_pollset* pollset); +void grpc_pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, + grpc_pollset* pollset); #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_H */ diff --git a/src/core/iomgr/pollset_set_posix.c b/src/core/iomgr/pollset_set_posix.c index cb2e6aede3c..c86ed3d5da6 100644 --- a/src/core/iomgr/pollset_set_posix.c +++ b/src/core/iomgr/pollset_set_posix.c @@ -43,105 +43,93 @@ #include "src/core/iomgr/pollset_set.h" -void -grpc_pollset_set_init (grpc_pollset_set * pollset_set) -{ - memset (pollset_set, 0, sizeof (*pollset_set)); - gpr_mu_init (&pollset_set->mu); +void grpc_pollset_set_init(grpc_pollset_set *pollset_set) { + memset(pollset_set, 0, sizeof(*pollset_set)); + gpr_mu_init(&pollset_set->mu); } -void -grpc_pollset_set_destroy (grpc_pollset_set * pollset_set) -{ +void grpc_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++) - { - GRPC_FD_UNREF (pollset_set->fds[i], "pollset"); - } - gpr_free (pollset_set->pollsets); - gpr_free (pollset_set->fds); + gpr_mu_destroy(&pollset_set->mu); + for (i = 0; i < pollset_set->fd_count; i++) { + GRPC_FD_UNREF(pollset_set->fds[i], "pollset"); + } + gpr_free(pollset_set->pollsets); + gpr_free(pollset_set->fds); } -void -grpc_pollset_set_add_pollset (grpc_exec_ctx * exec_ctx, grpc_pollset_set * pollset_set, grpc_pollset * pollset) -{ +void grpc_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_set->mu); - if (pollset_set->pollset_count == pollset_set->pollset_capacity) - { - pollset_set->pollset_capacity = GPR_MAX (8, 2 * pollset_set->pollset_capacity); - pollset_set->pollsets = gpr_realloc (pollset_set->pollsets, pollset_set->pollset_capacity * sizeof (*pollset_set->pollsets)); - } + gpr_mu_lock(&pollset_set->mu); + if (pollset_set->pollset_count == pollset_set->pollset_capacity) { + pollset_set->pollset_capacity = + GPR_MAX(8, 2 * pollset_set->pollset_capacity); + pollset_set->pollsets = + gpr_realloc(pollset_set->pollsets, pollset_set->pollset_capacity * + sizeof(*pollset_set->pollsets)); + } pollset_set->pollsets[pollset_set->pollset_count++] = pollset; - for (i = 0, j = 0; i < pollset_set->fd_count; i++) - { - if (grpc_fd_is_orphaned (pollset_set->fds[i])) - { - GRPC_FD_UNREF (pollset_set->fds[i], "pollset"); - } - else - { - grpc_pollset_add_fd (exec_ctx, pollset, pollset_set->fds[i]); - pollset_set->fds[j++] = pollset_set->fds[i]; - } + for (i = 0, j = 0; i < pollset_set->fd_count; i++) { + if (grpc_fd_is_orphaned(pollset_set->fds[i])) { + GRPC_FD_UNREF(pollset_set->fds[i], "pollset"); + } else { + grpc_pollset_add_fd(exec_ctx, pollset, pollset_set->fds[i]); + pollset_set->fds[j++] = pollset_set->fds[i]; } + } pollset_set->fd_count = j; - gpr_mu_unlock (&pollset_set->mu); + gpr_mu_unlock(&pollset_set->mu); } -void -grpc_pollset_set_del_pollset (grpc_exec_ctx * exec_ctx, grpc_pollset_set * pollset_set, grpc_pollset * pollset) -{ +void grpc_pollset_set_del_pollset(grpc_exec_ctx *exec_ctx, + grpc_pollset_set *pollset_set, + grpc_pollset *pollset) { size_t i; - gpr_mu_lock (&pollset_set->mu); - for (i = 0; i < pollset_set->pollset_count; i++) - { - if (pollset_set->pollsets[i] == pollset) - { - pollset_set->pollset_count--; - GPR_SWAP (grpc_pollset *, pollset_set->pollsets[i], pollset_set->pollsets[pollset_set->pollset_count]); - break; - } + gpr_mu_lock(&pollset_set->mu); + for (i = 0; i < pollset_set->pollset_count; i++) { + if (pollset_set->pollsets[i] == pollset) { + pollset_set->pollset_count--; + GPR_SWAP(grpc_pollset *, pollset_set->pollsets[i], + pollset_set->pollsets[pollset_set->pollset_count]); + break; } - gpr_mu_unlock (&pollset_set->mu); + } + gpr_mu_unlock(&pollset_set->mu); } -void -grpc_pollset_set_add_fd (grpc_exec_ctx * exec_ctx, 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) { size_t i; - gpr_mu_lock (&pollset_set->mu); - if (pollset_set->fd_count == pollset_set->fd_capacity) - { - pollset_set->fd_capacity = GPR_MAX (8, 2 * pollset_set->fd_capacity); - pollset_set->fds = gpr_realloc (pollset_set->fds, pollset_set->fd_capacity * sizeof (*pollset_set->fds)); - } - GRPC_FD_REF (fd, "pollset_set"); + gpr_mu_lock(&pollset_set->mu); + if (pollset_set->fd_count == pollset_set->fd_capacity) { + pollset_set->fd_capacity = GPR_MAX(8, 2 * pollset_set->fd_capacity); + pollset_set->fds = gpr_realloc( + pollset_set->fds, pollset_set->fd_capacity * sizeof(*pollset_set->fds)); + } + GRPC_FD_REF(fd, "pollset_set"); pollset_set->fds[pollset_set->fd_count++] = fd; - for (i = 0; i < pollset_set->pollset_count; i++) - { - grpc_pollset_add_fd (exec_ctx, pollset_set->pollsets[i], fd); - } - gpr_mu_unlock (&pollset_set->mu); + for (i = 0; i < pollset_set->pollset_count; i++) { + grpc_pollset_add_fd(exec_ctx, pollset_set->pollsets[i], fd); + } + gpr_mu_unlock(&pollset_set->mu); } -void -grpc_pollset_set_del_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) { size_t i; - gpr_mu_lock (&pollset_set->mu); - for (i = 0; i < pollset_set->fd_count; i++) - { - if (pollset_set->fds[i] == fd) - { - pollset_set->fd_count--; - GPR_SWAP (grpc_fd *, pollset_set->fds[i], pollset_set->fds[pollset_set->fd_count]); - GRPC_FD_UNREF (fd, "pollset_set"); - break; - } + gpr_mu_lock(&pollset_set->mu); + for (i = 0; i < pollset_set->fd_count; i++) { + if (pollset_set->fds[i] == fd) { + pollset_set->fd_count--; + GPR_SWAP(grpc_fd *, pollset_set->fds[i], + pollset_set->fds[pollset_set->fd_count]); + GRPC_FD_UNREF(fd, "pollset_set"); + break; } - gpr_mu_unlock (&pollset_set->mu); + } + gpr_mu_unlock(&pollset_set->mu); } #endif /* GPR_POSIX_SOCKET */ diff --git a/src/core/iomgr/pollset_set_posix.h b/src/core/iomgr/pollset_set_posix.h index 6075ae8f866..05234fb642f 100644 --- a/src/core/iomgr/pollset_set_posix.h +++ b/src/core/iomgr/pollset_set_posix.h @@ -37,8 +37,7 @@ #include "src/core/iomgr/fd_posix.h" #include "src/core/iomgr/pollset_posix.h" -typedef struct grpc_pollset_set -{ +typedef struct grpc_pollset_set { gpr_mu mu; size_t pollset_count; @@ -50,7 +49,9 @@ typedef struct grpc_pollset_set grpc_fd **fds; } grpc_pollset_set; -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_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); #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_WINDOWS_H */ diff --git a/src/core/iomgr/pollset_set_windows.c b/src/core/iomgr/pollset_set_windows.c index 642e6fb983c..c80dd592b0d 100644 --- a/src/core/iomgr/pollset_set_windows.c +++ b/src/core/iomgr/pollset_set_windows.c @@ -37,24 +37,14 @@ #include "src/core/iomgr/pollset_set.h" -void -grpc_pollset_set_init (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_pollset_set * pollset_set, grpc_pollset * pollset) -{ -} +void grpc_pollset_set_init(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_pollset_set* pollset_set, + grpc_pollset* pollset) {} #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/pollset_set_windows.h b/src/core/iomgr/pollset_set_windows.h index 0fb03cd27a4..cada0d2b61f 100644 --- a/src/core/iomgr/pollset_set_windows.h +++ b/src/core/iomgr/pollset_set_windows.h @@ -34,9 +34,6 @@ #ifndef GRPC_INTERNAL_CORE_IOMGR_POLLSET_SET_WINDOWS_H #define GRPC_INTERNAL_CORE_IOMGR_POLLSET_SET_WINDOWS_H -typedef struct grpc_pollset_set -{ - void *unused; -} grpc_pollset_set; +typedef struct grpc_pollset_set { void *unused; } grpc_pollset_set; #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_WINDOWS_H */ diff --git a/src/core/iomgr/pollset_windows.c b/src/core/iomgr/pollset_windows.c index da0024b921d..e6791d49438 100644 --- a/src/core/iomgr/pollset_windows.c +++ b/src/core/iomgr/pollset_windows.c @@ -42,45 +42,32 @@ #include "src/core/iomgr/pollset.h" #include "src/core/iomgr/pollset_windows.h" -static void -remove_worker (grpc_pollset * p, grpc_pollset_worker * worker) -{ +static void remove_worker(grpc_pollset *p, grpc_pollset_worker *worker) { worker->prev->next = worker->next; worker->next->prev = worker->prev; } -static int -has_workers (grpc_pollset * p) -{ +static int has_workers(grpc_pollset *p) { return p->root_worker.next != &p->root_worker; } -static grpc_pollset_worker * -pop_front_worker (grpc_pollset * p) -{ - if (has_workers (p)) - { - grpc_pollset_worker *w = p->root_worker.next; - remove_worker (p, w); - return w; - } - else - { - return NULL; - } +static grpc_pollset_worker *pop_front_worker(grpc_pollset *p) { + if (has_workers(p)) { + grpc_pollset_worker *w = p->root_worker.next; + remove_worker(p, w); + return w; + } else { + return NULL; + } } -static void -push_back_worker (grpc_pollset * p, grpc_pollset_worker * worker) -{ +static void push_back_worker(grpc_pollset *p, grpc_pollset_worker *worker) { worker->next = &p->root_worker; worker->prev = worker->next->prev; worker->prev->next = worker->next->prev = worker; } -static void -push_front_worker (grpc_pollset * p, grpc_pollset_worker * worker) -{ +static void push_front_worker(grpc_pollset *p, grpc_pollset_worker *worker) { worker->prev = &p->root_worker; worker->next = worker->prev->next; worker->prev->next = worker->next->prev = worker; @@ -91,94 +78,73 @@ push_front_worker (grpc_pollset * p, grpc_pollset_worker * worker) set of features for the sake of the rest of grpc. But grpc_pollset_work won't actually do any polling, and return as quickly as possible. */ -void -grpc_pollset_init (grpc_pollset * pollset) -{ - memset (pollset, 0, sizeof (*pollset)); - gpr_mu_init (&pollset->mu); +void grpc_pollset_init(grpc_pollset *pollset) { + memset(pollset, 0, sizeof(*pollset)); + gpr_mu_init(&pollset->mu); pollset->root_worker.next = pollset->root_worker.prev = &pollset->root_worker; pollset->kicked_without_pollers = 0; } -void -grpc_pollset_shutdown (grpc_pollset * pollset, void (*shutdown_done) (void *arg), void *shutdown_done_arg) -{ - gpr_mu_lock (&pollset->mu); +void grpc_pollset_shutdown(grpc_pollset *pollset, + void (*shutdown_done)(void *arg), + void *shutdown_done_arg) { + gpr_mu_lock(&pollset->mu); pollset->shutting_down = 1; - grpc_pollset_kick (pollset, GRPC_POLLSET_KICK_BROADCAST); - gpr_mu_unlock (&pollset->mu); - shutdown_done (shutdown_done_arg); + grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); + gpr_mu_unlock(&pollset->mu); + shutdown_done(shutdown_done_arg); } -void -grpc_pollset_destroy (grpc_pollset * pollset) -{ - gpr_mu_destroy (&pollset->mu); +void grpc_pollset_destroy(grpc_pollset *pollset) { + gpr_mu_destroy(&pollset->mu); } -void -grpc_pollset_work (grpc_pollset * pollset, grpc_pollset_worker * worker, gpr_timespec now, gpr_timespec deadline) -{ +void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, + gpr_timespec now, gpr_timespec deadline) { int added_worker = 0; worker->next = worker->prev = NULL; - gpr_cv_init (&worker->cv); - if (grpc_maybe_call_delayed_callbacks (&pollset->mu, 1 /* GPR_TRUE */ )) - { - goto done; - } - if (grpc_alarm_check (&pollset->mu, now, &deadline)) - { - goto done; - } - if (!pollset->kicked_without_pollers && !pollset->shutting_down) - { - push_front_worker (pollset, worker); - added_worker = 1; - gpr_cv_wait (&worker->cv, &pollset->mu, deadline); - } - else - { - pollset->kicked_without_pollers = 0; - } + gpr_cv_init(&worker->cv); + if (grpc_maybe_call_delayed_callbacks(&pollset->mu, 1 /* GPR_TRUE */)) { + goto done; + } + if (grpc_alarm_check(&pollset->mu, now, &deadline)) { + goto done; + } + if (!pollset->kicked_without_pollers && !pollset->shutting_down) { + push_front_worker(pollset, worker); + added_worker = 1; + gpr_cv_wait(&worker->cv, &pollset->mu, deadline); + } else { + pollset->kicked_without_pollers = 0; + } done: - gpr_cv_destroy (&worker->cv); - if (added_worker) - { - remove_worker (pollset, worker); - } + gpr_cv_destroy(&worker->cv); + if (added_worker) { + remove_worker(pollset, worker); + } } -void -grpc_pollset_kick (grpc_pollset * p, grpc_pollset_worker * specific_worker) -{ - if (specific_worker != NULL) - { - if (specific_worker == GRPC_POLLSET_KICK_BROADCAST) - { - for (specific_worker = p->root_worker.next; specific_worker != &p->root_worker; specific_worker = specific_worker->next) - { - gpr_cv_signal (&specific_worker->cv); - } - p->kicked_without_pollers = 1; - } - else - { - gpr_cv_signal (&specific_worker->cv); - } +void grpc_pollset_kick(grpc_pollset *p, grpc_pollset_worker *specific_worker) { + if (specific_worker != NULL) { + if (specific_worker == GRPC_POLLSET_KICK_BROADCAST) { + for (specific_worker = p->root_worker.next; + specific_worker != &p->root_worker; + specific_worker = specific_worker->next) { + gpr_cv_signal(&specific_worker->cv); + } + p->kicked_without_pollers = 1; + } else { + gpr_cv_signal(&specific_worker->cv); } - else - { - specific_worker = pop_front_worker (p); - if (specific_worker != NULL) - { - push_back_worker (p, specific_worker); - gpr_cv_signal (&specific_worker->cv); - } - else - { - p->kicked_without_pollers = 1; - } + } else { + specific_worker = pop_front_worker(p); + if (specific_worker != NULL) { + push_back_worker(p, specific_worker); + gpr_cv_signal(&specific_worker->cv); + } else { + p->kicked_without_pollers = 1; } + } } #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/pollset_windows.h b/src/core/iomgr/pollset_windows.h index 6da7415709c..4efa5a1717c 100644 --- a/src/core/iomgr/pollset_windows.h +++ b/src/core/iomgr/pollset_windows.h @@ -43,15 +43,13 @@ used to synchronize with the IOCP, and workers are condition variables used to block threads until work is ready. */ -typedef struct grpc_pollset_worker -{ +typedef struct grpc_pollset_worker { gpr_cv cv; struct grpc_pollset_worker *next; struct grpc_pollset_worker *prev; } grpc_pollset_worker; -typedef struct grpc_pollset -{ +typedef struct grpc_pollset { gpr_mu mu; int shutting_down; int kicked_without_pollers; diff --git a/src/core/iomgr/resolve_address.h b/src/core/iomgr/resolve_address.h index aeee82584a7..01eedffa889 100644 --- a/src/core/iomgr/resolve_address.h +++ b/src/core/iomgr/resolve_address.h @@ -40,14 +40,12 @@ #define GRPC_MAX_SOCKADDR_SIZE 128 -typedef struct -{ +typedef struct { char addr[GRPC_MAX_SOCKADDR_SIZE]; size_t len; } grpc_resolved_address; -typedef struct -{ +typedef struct { size_t naddrs; grpc_resolved_address *addrs; } grpc_resolved_addresses; @@ -56,16 +54,19 @@ typedef struct On success: addresses is the result, and the callee must call grpc_resolved_addresses_destroy when it's done with them On failure: addresses is NULL */ -typedef void (*grpc_resolve_cb) (grpc_exec_ctx * exec_ctx, void *arg, grpc_resolved_addresses * addresses); +typedef void (*grpc_resolve_cb)(grpc_exec_ctx *exec_ctx, void *arg, + grpc_resolved_addresses *addresses); /* 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 */ -void grpc_resolve_address (const char *addr, const char *default_port, grpc_resolve_cb cb, void *arg); +void grpc_resolve_address(const char *addr, const char *default_port, + grpc_resolve_cb cb, void *arg); /* Destroy resolved addresses */ -void grpc_resolved_addresses_destroy (grpc_resolved_addresses * addresses); +void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addresses); /* Resolve addr in a blocking fashion. Returns NULL on failure. On success, result must be freed with grpc_resolved_addresses_destroy. */ -grpc_resolved_addresses *grpc_blocking_resolve_address (const char *addr, const char *default_port); +grpc_resolved_addresses *grpc_blocking_resolve_address( + const char *addr, const char *default_port); #endif /* GRPC_INTERNAL_CORE_IOMGR_RESOLVE_ADDRESS_H */ diff --git a/src/core/iomgr/resolve_address_posix.c b/src/core/iomgr/resolve_address_posix.c index 1017a788ff3..aacd185548d 100644 --- a/src/core/iomgr/resolve_address_posix.c +++ b/src/core/iomgr/resolve_address_posix.c @@ -51,8 +51,7 @@ #include #include -typedef struct -{ +typedef struct { char *name; char *default_port; grpc_resolve_cb cb; @@ -60,9 +59,8 @@ typedef struct grpc_iomgr_object iomgr_object; } request; -grpc_resolved_addresses * -grpc_blocking_resolve_address (const char *name, const char *default_port) -{ +grpc_resolved_addresses *grpc_blocking_resolve_address( + const char *name, const char *default_port) { struct addrinfo hints; struct addrinfo *result = NULL, *resp; char *host; @@ -72,127 +70,114 @@ grpc_blocking_resolve_address (const char *name, const char *default_port) grpc_resolved_addresses *addrs = NULL; struct sockaddr_un *un; - if (name[0] == 'u' && name[1] == 'n' && name[2] == 'i' && name[3] == 'x' && name[4] == ':' && name[5] != 0) - { - addrs = gpr_malloc (sizeof (grpc_resolved_addresses)); - addrs->naddrs = 1; - addrs->addrs = gpr_malloc (sizeof (grpc_resolved_address)); - un = (struct sockaddr_un *) addrs->addrs->addr; - un->sun_family = AF_UNIX; - strcpy (un->sun_path, name + 5); - addrs->addrs->len = strlen (un->sun_path) + sizeof (un->sun_family) + 1; - return addrs; - } + if (name[0] == 'u' && name[1] == 'n' && name[2] == 'i' && name[3] == 'x' && + name[4] == ':' && name[5] != 0) { + addrs = gpr_malloc(sizeof(grpc_resolved_addresses)); + addrs->naddrs = 1; + addrs->addrs = gpr_malloc(sizeof(grpc_resolved_address)); + un = (struct sockaddr_un *)addrs->addrs->addr; + un->sun_family = AF_UNIX; + strcpy(un->sun_path, name + 5); + addrs->addrs->len = strlen(un->sun_path) + sizeof(un->sun_family) + 1; + return addrs; + } /* parse name, splitting it into host and port parts */ - gpr_split_host_port (name, &host, &port); - if (host == NULL) - { - gpr_log (GPR_ERROR, "unparseable host:port: '%s'", name); + gpr_split_host_port(name, &host, &port); + if (host == NULL) { + gpr_log(GPR_ERROR, "unparseable host:port: '%s'", name); + goto done; + } + if (port == NULL) { + if (default_port == NULL) { + gpr_log(GPR_ERROR, "no port in name '%s'", name); goto done; } - if (port == NULL) - { - if (default_port == NULL) - { - gpr_log (GPR_ERROR, "no port in name '%s'", name); - goto done; - } - port = gpr_strdup (default_port); - } + port = gpr_strdup(default_port); + } /* Call getaddrinfo */ - memset (&hints, 0, sizeof (hints)); - hints.ai_family = AF_UNSPEC; /* ipv4 or ipv6 */ - hints.ai_socktype = SOCK_STREAM; /* stream socket */ - hints.ai_flags = AI_PASSIVE; /* for wildcard IP address */ - - s = getaddrinfo (host, port, &hints, &result); - if (s != 0) - { - /* Retry if well-known service name is recognized */ - char *svc[][2] = { {"http", "80"}, {"https", "443"} }; - int i; - for (i = 0; i < (int) (sizeof (svc) / sizeof (svc[0])); i++) - { - if (strcmp (port, svc[i][0]) == 0) - { - s = getaddrinfo (host, svc[i][1], &hints, &result); - break; - } - } + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_UNSPEC; /* ipv4 or ipv6 */ + hints.ai_socktype = SOCK_STREAM; /* stream socket */ + hints.ai_flags = AI_PASSIVE; /* for wildcard IP address */ + + s = getaddrinfo(host, port, &hints, &result); + if (s != 0) { + /* Retry if well-known service name is recognized */ + char *svc[][2] = {{"http", "80"}, {"https", "443"}}; + int i; + for (i = 0; i < (int)(sizeof(svc) / sizeof(svc[0])); i++) { + if (strcmp(port, svc[i][0]) == 0) { + s = getaddrinfo(host, svc[i][1], &hints, &result); + break; + } } + } - if (s != 0) - { - gpr_log (GPR_ERROR, "getaddrinfo: %s", gai_strerror (s)); - goto done; - } + if (s != 0) { + gpr_log(GPR_ERROR, "getaddrinfo: %s", gai_strerror(s)); + goto done; + } /* Success path: set addrs non-NULL, fill it in */ - addrs = gpr_malloc (sizeof (grpc_resolved_addresses)); + addrs = gpr_malloc(sizeof(grpc_resolved_addresses)); addrs->naddrs = 0; - for (resp = result; resp != NULL; resp = resp->ai_next) - { - addrs->naddrs++; - } - addrs->addrs = gpr_malloc (sizeof (grpc_resolved_address) * addrs->naddrs); + for (resp = result; resp != NULL; resp = resp->ai_next) { + addrs->naddrs++; + } + addrs->addrs = gpr_malloc(sizeof(grpc_resolved_address) * addrs->naddrs); i = 0; - for (resp = result; resp != NULL; resp = resp->ai_next) - { - memcpy (&addrs->addrs[i].addr, resp->ai_addr, resp->ai_addrlen); - addrs->addrs[i].len = resp->ai_addrlen; - i++; - } + for (resp = result; resp != NULL; resp = resp->ai_next) { + memcpy(&addrs->addrs[i].addr, resp->ai_addr, resp->ai_addrlen); + addrs->addrs[i].len = resp->ai_addrlen; + i++; + } done: - gpr_free (host); - gpr_free (port); - if (result) - { - freeaddrinfo (result); - } + gpr_free(host); + gpr_free(port); + if (result) { + freeaddrinfo(result); + } return addrs; } /* Thread function to asynch-ify grpc_blocking_resolve_address */ -static void -do_request_thread (void *rp) -{ +static void do_request_thread(void *rp) { request *r = rp; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resolved_addresses *resolved = grpc_blocking_resolve_address (r->name, r->default_port); + grpc_resolved_addresses *resolved = + grpc_blocking_resolve_address(r->name, r->default_port); void *arg = r->arg; grpc_resolve_cb cb = r->cb; - gpr_free (r->name); - gpr_free (r->default_port); - cb (&exec_ctx, arg, resolved); - grpc_iomgr_unregister_object (&r->iomgr_object); - gpr_free (r); - grpc_exec_ctx_finish (&exec_ctx); + gpr_free(r->name); + gpr_free(r->default_port); + cb(&exec_ctx, arg, resolved); + grpc_iomgr_unregister_object(&r->iomgr_object); + gpr_free(r); + grpc_exec_ctx_finish(&exec_ctx); } -void -grpc_resolved_addresses_destroy (grpc_resolved_addresses * addrs) -{ - gpr_free (addrs->addrs); - gpr_free (addrs); +void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) { + gpr_free(addrs->addrs); + gpr_free(addrs); } -void -grpc_resolve_address (const char *name, const char *default_port, grpc_resolve_cb cb, void *arg) -{ - request *r = gpr_malloc (sizeof (request)); +void grpc_resolve_address(const char *name, const char *default_port, + grpc_resolve_cb cb, void *arg) { + request *r = gpr_malloc(sizeof(request)); gpr_thd_id id; char *tmp; - gpr_asprintf (&tmp, "resolve_address:name='%s':default_port='%s'", name, default_port); - grpc_iomgr_register_object (&r->iomgr_object, tmp); - gpr_free (tmp); - r->name = gpr_strdup (name); - r->default_port = gpr_strdup (default_port); + gpr_asprintf(&tmp, "resolve_address:name='%s':default_port='%s'", name, + default_port); + grpc_iomgr_register_object(&r->iomgr_object, tmp); + gpr_free(tmp); + r->name = gpr_strdup(name); + r->default_port = gpr_strdup(default_port); r->cb = cb; r->arg = arg; - gpr_thd_new (&id, do_request_thread, r, NULL); + gpr_thd_new(&id, do_request_thread, r, NULL); } #endif diff --git a/src/core/iomgr/resolve_address_windows.c b/src/core/iomgr/resolve_address_windows.c index 4a85a0a7ad9..fb5fd0d4f63 100644 --- a/src/core/iomgr/resolve_address_windows.c +++ b/src/core/iomgr/resolve_address_windows.c @@ -50,8 +50,7 @@ #include #include -typedef struct -{ +typedef struct { char *name; char *default_port; grpc_resolve_cb cb; @@ -59,9 +58,8 @@ typedef struct grpc_iomgr_object iomgr_object; } request; -grpc_resolved_addresses * -grpc_blocking_resolve_address (const char *name, const char *default_port) -{ +grpc_resolved_addresses *grpc_blocking_resolve_address( + const char *name, const char *default_port) { struct addrinfo hints; struct addrinfo *result = NULL, *resp; char *host; @@ -71,106 +69,95 @@ grpc_blocking_resolve_address (const char *name, const char *default_port) grpc_resolved_addresses *addrs = NULL; /* parse name, splitting it into host and port parts */ - gpr_split_host_port (name, &host, &port); - if (host == NULL) - { - gpr_log (GPR_ERROR, "unparseable host:port: '%s'", name); + gpr_split_host_port(name, &host, &port); + if (host == NULL) { + gpr_log(GPR_ERROR, "unparseable host:port: '%s'", name); + goto done; + } + if (port == NULL) { + if (default_port == NULL) { + gpr_log(GPR_ERROR, "no port in name '%s'", name); goto done; } - if (port == NULL) - { - if (default_port == NULL) - { - gpr_log (GPR_ERROR, "no port in name '%s'", name); - goto done; - } - port = gpr_strdup (default_port); - } + port = gpr_strdup(default_port); + } /* Call getaddrinfo */ - memset (&hints, 0, sizeof (hints)); - hints.ai_family = AF_UNSPEC; /* ipv4 or ipv6 */ - hints.ai_socktype = SOCK_STREAM; /* stream socket */ - hints.ai_flags = AI_PASSIVE; /* for wildcard IP address */ - - s = getaddrinfo (host, port, &hints, &result); - if (s != 0) - { - gpr_log (GPR_ERROR, "getaddrinfo: %s", gai_strerror (s)); - goto done; - } + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_UNSPEC; /* ipv4 or ipv6 */ + hints.ai_socktype = SOCK_STREAM; /* stream socket */ + hints.ai_flags = AI_PASSIVE; /* for wildcard IP address */ + + s = getaddrinfo(host, port, &hints, &result); + if (s != 0) { + gpr_log(GPR_ERROR, "getaddrinfo: %s", gai_strerror(s)); + goto done; + } /* Success path: set addrs non-NULL, fill it in */ - addrs = gpr_malloc (sizeof (grpc_resolved_addresses)); + addrs = gpr_malloc(sizeof(grpc_resolved_addresses)); addrs->naddrs = 0; - for (resp = result; resp != NULL; resp = resp->ai_next) - { - addrs->naddrs++; - } - addrs->addrs = gpr_malloc (sizeof (grpc_resolved_address) * addrs->naddrs); + for (resp = result; resp != NULL; resp = resp->ai_next) { + addrs->naddrs++; + } + addrs->addrs = gpr_malloc(sizeof(grpc_resolved_address) * addrs->naddrs); i = 0; - for (resp = result; resp != NULL; resp = resp->ai_next) - { - memcpy (&addrs->addrs[i].addr, resp->ai_addr, resp->ai_addrlen); - addrs->addrs[i].len = resp->ai_addrlen; - i++; - } + for (resp = result; resp != NULL; resp = resp->ai_next) { + memcpy(&addrs->addrs[i].addr, resp->ai_addr, resp->ai_addrlen); + addrs->addrs[i].len = resp->ai_addrlen; + i++; + } { - for (i = 0; i < addrs->naddrs; i++) - { - char *buf; - grpc_sockaddr_to_string (&buf, (struct sockaddr *) &addrs->addrs[i].addr, 0); - gpr_free (buf); - } + for (i = 0; i < addrs->naddrs; i++) { + char *buf; + grpc_sockaddr_to_string(&buf, (struct sockaddr *)&addrs->addrs[i].addr, + 0); + gpr_free(buf); + } } done: - gpr_free (host); - gpr_free (port); - if (result) - { - freeaddrinfo (result); - } + gpr_free(host); + gpr_free(port); + if (result) { + freeaddrinfo(result); + } return addrs; } /* Thread function to asynch-ify grpc_blocking_resolve_address */ -static void -do_request (void *rp) -{ +static void do_request(void *rp) { request *r = rp; - grpc_resolved_addresses *resolved = grpc_blocking_resolve_address (r->name, r->default_port); + grpc_resolved_addresses *resolved = + grpc_blocking_resolve_address(r->name, r->default_port); void *arg = r->arg; grpc_resolve_cb cb = r->cb; - gpr_free (r->name); - gpr_free (r->default_port); - grpc_iomgr_unregister_object (&r->iomgr_object); - gpr_free (r); - cb (arg, resolved); + gpr_free(r->name); + gpr_free(r->default_port); + grpc_iomgr_unregister_object(&r->iomgr_object); + gpr_free(r); + cb(arg, resolved); } -void -grpc_resolved_addresses_destroy (grpc_resolved_addresses * addrs) -{ - gpr_free (addrs->addrs); - gpr_free (addrs); +void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) { + gpr_free(addrs->addrs); + gpr_free(addrs); } -void -grpc_resolve_address (const char *name, const char *default_port, grpc_resolve_cb cb, void *arg) -{ - request *r = gpr_malloc (sizeof (request)); +void grpc_resolve_address(const char *name, const char *default_port, + grpc_resolve_cb cb, void *arg) { + request *r = gpr_malloc(sizeof(request)); gpr_thd_id id; const char *label; - gpr_asprintf (&label, "resolve:%s", name); - grpc_iomgr_register_object (&r->iomgr_object, label); - gpr_free (label); - r->name = gpr_strdup (name); - r->default_port = gpr_strdup (default_port); + gpr_asprintf(&label, "resolve:%s", name); + grpc_iomgr_register_object(&r->iomgr_object, label); + gpr_free(label); + r->name = gpr_strdup(name); + r->default_port = gpr_strdup(default_port); r->cb = cb; r->arg = arg; - gpr_thd_new (&id, do_request, r, NULL); + gpr_thd_new(&id, do_request, r, NULL); } #endif diff --git a/src/core/iomgr/sockaddr_utils.c b/src/core/iomgr/sockaddr_utils.c index d55d26ff046..0e4bf245498 100644 --- a/src/core/iomgr/sockaddr_utils.c +++ b/src/core/iomgr/sockaddr_utils.c @@ -48,119 +48,96 @@ #include "src/core/support/string.h" -static const gpr_uint8 kV4MappedPrefix[] = { 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0xff, 0xff -}; - -int -grpc_sockaddr_is_v4mapped (const struct sockaddr *addr, struct sockaddr_in *addr4_out) -{ - GPR_ASSERT (addr != (struct sockaddr *) addr4_out); - if (addr->sa_family == AF_INET6) - { - const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *) addr; - if (memcmp (addr6->sin6_addr.s6_addr, kV4MappedPrefix, sizeof (kV4MappedPrefix)) == 0) - { - if (addr4_out != NULL) - { - /* Normalize ::ffff:0.0.0.0/96 to IPv4. */ - memset (addr4_out, 0, sizeof (*addr4_out)); - addr4_out->sin_family = AF_INET; - /* s6_addr32 would be nice, but it's non-standard. */ - memcpy (&addr4_out->sin_addr, &addr6->sin6_addr.s6_addr[12], 4); - addr4_out->sin_port = addr6->sin6_port; - } - return 1; - } +static const gpr_uint8 kV4MappedPrefix[] = {0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0xff, 0xff}; + +int grpc_sockaddr_is_v4mapped(const struct sockaddr *addr, + struct sockaddr_in *addr4_out) { + GPR_ASSERT(addr != (struct sockaddr *)addr4_out); + if (addr->sa_family == AF_INET6) { + const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *)addr; + if (memcmp(addr6->sin6_addr.s6_addr, kV4MappedPrefix, + sizeof(kV4MappedPrefix)) == 0) { + if (addr4_out != NULL) { + /* Normalize ::ffff:0.0.0.0/96 to IPv4. */ + memset(addr4_out, 0, sizeof(*addr4_out)); + addr4_out->sin_family = AF_INET; + /* s6_addr32 would be nice, but it's non-standard. */ + memcpy(&addr4_out->sin_addr, &addr6->sin6_addr.s6_addr[12], 4); + addr4_out->sin_port = addr6->sin6_port; + } + return 1; } + } return 0; } -int -grpc_sockaddr_to_v4mapped (const struct sockaddr *addr, struct sockaddr_in6 *addr6_out) -{ - GPR_ASSERT (addr != (struct sockaddr *) addr6_out); - if (addr->sa_family == AF_INET) - { - const struct sockaddr_in *addr4 = (const struct sockaddr_in *) addr; - memset (addr6_out, 0, sizeof (*addr6_out)); - addr6_out->sin6_family = AF_INET6; - memcpy (&addr6_out->sin6_addr.s6_addr[0], kV4MappedPrefix, 12); - memcpy (&addr6_out->sin6_addr.s6_addr[12], &addr4->sin_addr, 4); - addr6_out->sin6_port = addr4->sin_port; - return 1; - } +int grpc_sockaddr_to_v4mapped(const struct sockaddr *addr, + struct sockaddr_in6 *addr6_out) { + GPR_ASSERT(addr != (struct sockaddr *)addr6_out); + if (addr->sa_family == AF_INET) { + const struct sockaddr_in *addr4 = (const struct sockaddr_in *)addr; + memset(addr6_out, 0, sizeof(*addr6_out)); + addr6_out->sin6_family = AF_INET6; + memcpy(&addr6_out->sin6_addr.s6_addr[0], kV4MappedPrefix, 12); + memcpy(&addr6_out->sin6_addr.s6_addr[12], &addr4->sin_addr, 4); + addr6_out->sin6_port = addr4->sin_port; + return 1; + } return 0; } -int -grpc_sockaddr_is_wildcard (const struct sockaddr *addr, int *port_out) -{ +int grpc_sockaddr_is_wildcard(const struct sockaddr *addr, int *port_out) { struct sockaddr_in addr4_normalized; - if (grpc_sockaddr_is_v4mapped (addr, &addr4_normalized)) - { - addr = (struct sockaddr *) &addr4_normalized; - } - if (addr->sa_family == AF_INET) - { - /* Check for 0.0.0.0 */ - const struct sockaddr_in *addr4 = (const struct sockaddr_in *) addr; - if (addr4->sin_addr.s_addr != 0) - { - return 0; - } - *port_out = ntohs (addr4->sin_port); - return 1; - } - else if (addr->sa_family == AF_INET6) - { - /* Check for :: */ - const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *) addr; - int i; - for (i = 0; i < 16; i++) - { - if (addr6->sin6_addr.s6_addr[i] != 0) - { - return 0; - } - } - *port_out = ntohs (addr6->sin6_port); - return 1; - } - else - { + if (grpc_sockaddr_is_v4mapped(addr, &addr4_normalized)) { + addr = (struct sockaddr *)&addr4_normalized; + } + if (addr->sa_family == AF_INET) { + /* Check for 0.0.0.0 */ + const struct sockaddr_in *addr4 = (const struct sockaddr_in *)addr; + if (addr4->sin_addr.s_addr != 0) { return 0; } + *port_out = ntohs(addr4->sin_port); + return 1; + } else if (addr->sa_family == AF_INET6) { + /* Check for :: */ + const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *)addr; + int i; + for (i = 0; i < 16; i++) { + if (addr6->sin6_addr.s6_addr[i] != 0) { + return 0; + } + } + *port_out = ntohs(addr6->sin6_port); + return 1; + } else { + return 0; + } } -void -grpc_sockaddr_make_wildcards (int port, struct sockaddr_in *wild4_out, struct sockaddr_in6 *wild6_out) -{ - grpc_sockaddr_make_wildcard4 (port, wild4_out); - grpc_sockaddr_make_wildcard6 (port, wild6_out); +void grpc_sockaddr_make_wildcards(int port, struct sockaddr_in *wild4_out, + struct sockaddr_in6 *wild6_out) { + grpc_sockaddr_make_wildcard4(port, wild4_out); + grpc_sockaddr_make_wildcard6(port, wild6_out); } -void -grpc_sockaddr_make_wildcard4 (int port, struct sockaddr_in *wild_out) -{ - GPR_ASSERT (port >= 0 && port < 65536); - memset (wild_out, 0, sizeof (*wild_out)); +void grpc_sockaddr_make_wildcard4(int port, struct sockaddr_in *wild_out) { + GPR_ASSERT(port >= 0 && port < 65536); + memset(wild_out, 0, sizeof(*wild_out)); wild_out->sin_family = AF_INET; - wild_out->sin_port = htons ((gpr_uint16) port); + wild_out->sin_port = htons((gpr_uint16)port); } -void -grpc_sockaddr_make_wildcard6 (int port, struct sockaddr_in6 *wild_out) -{ - GPR_ASSERT (port >= 0 && port < 65536); - memset (wild_out, 0, sizeof (*wild_out)); +void grpc_sockaddr_make_wildcard6(int port, struct sockaddr_in6 *wild_out) { + GPR_ASSERT(port >= 0 && port < 65536); + memset(wild_out, 0, sizeof(*wild_out)); wild_out->sin6_family = AF_INET6; - wild_out->sin6_port = htons ((gpr_uint16) port); + wild_out->sin6_port = htons((gpr_uint16)port); } -int -grpc_sockaddr_to_string (char **out, const struct sockaddr *addr, int normalize) -{ +int grpc_sockaddr_to_string(char **out, const struct sockaddr *addr, + int normalize) { const int save_errno = errno; struct sockaddr_in addr_normalized; char ntop_buf[INET6_ADDRSTRLEN]; @@ -169,101 +146,87 @@ grpc_sockaddr_to_string (char **out, const struct sockaddr *addr, int normalize) int ret; *out = NULL; - if (normalize && grpc_sockaddr_is_v4mapped (addr, &addr_normalized)) - { - addr = (const struct sockaddr *) &addr_normalized; - } - if (addr->sa_family == AF_INET) - { - const struct sockaddr_in *addr4 = (const struct sockaddr_in *) addr; - ip = &addr4->sin_addr; - port = ntohs (addr4->sin_port); - } - else if (addr->sa_family == AF_INET6) - { - const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *) addr; - ip = &addr6->sin6_addr; - port = ntohs (addr6->sin6_port); - } - if (ip != NULL && inet_ntop (addr->sa_family, ip, ntop_buf, sizeof (ntop_buf)) != NULL) - { - ret = gpr_join_host_port (out, ntop_buf, port); - } - else - { - ret = gpr_asprintf (out, "(sockaddr family=%d)", addr->sa_family); - } + if (normalize && grpc_sockaddr_is_v4mapped(addr, &addr_normalized)) { + addr = (const struct sockaddr *)&addr_normalized; + } + if (addr->sa_family == AF_INET) { + const struct sockaddr_in *addr4 = (const struct sockaddr_in *)addr; + ip = &addr4->sin_addr; + port = ntohs(addr4->sin_port); + } else if (addr->sa_family == AF_INET6) { + const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *)addr; + ip = &addr6->sin6_addr; + port = ntohs(addr6->sin6_port); + } + if (ip != NULL && + inet_ntop(addr->sa_family, ip, ntop_buf, sizeof(ntop_buf)) != NULL) { + ret = gpr_join_host_port(out, ntop_buf, port); + } else { + ret = gpr_asprintf(out, "(sockaddr family=%d)", addr->sa_family); + } /* This is probably redundant, but we wouldn't want to log the wrong error. */ errno = save_errno; return ret; } -char * -grpc_sockaddr_to_uri (const struct sockaddr *addr) -{ +char *grpc_sockaddr_to_uri(const struct sockaddr *addr) { char *temp; char *result; struct sockaddr_in addr_normalized; - if (grpc_sockaddr_is_v4mapped (addr, &addr_normalized)) - { - addr = (const struct sockaddr *) &addr_normalized; - } + if (grpc_sockaddr_is_v4mapped(addr, &addr_normalized)) { + addr = (const struct sockaddr *)&addr_normalized; + } - switch (addr->sa_family) - { + switch (addr->sa_family) { case AF_INET: - grpc_sockaddr_to_string (&temp, addr, 0); - gpr_asprintf (&result, "ipv4:%s", temp); - gpr_free (temp); + grpc_sockaddr_to_string(&temp, addr, 0); + gpr_asprintf(&result, "ipv4:%s", temp); + gpr_free(temp); return result; case AF_INET6: - grpc_sockaddr_to_string (&temp, addr, 0); - gpr_asprintf (&result, "ipv6:%s", temp); - gpr_free (temp); + grpc_sockaddr_to_string(&temp, addr, 0); + gpr_asprintf(&result, "ipv6:%s", temp); + gpr_free(temp); return result; #ifdef GPR_POSIX_SOCKET case AF_UNIX: - gpr_asprintf (&result, "unix:%s", ((struct sockaddr_un *) addr)->sun_path); + gpr_asprintf(&result, "unix:%s", ((struct sockaddr_un *)addr)->sun_path); return result; #endif - } + } return NULL; } -int -grpc_sockaddr_get_port (const struct sockaddr *addr) -{ - switch (addr->sa_family) - { +int grpc_sockaddr_get_port(const struct sockaddr *addr) { + switch (addr->sa_family) { case AF_INET: - return ntohs (((struct sockaddr_in *) addr)->sin_port); + return ntohs(((struct sockaddr_in *)addr)->sin_port); case AF_INET6: - return ntohs (((struct sockaddr_in6 *) addr)->sin6_port); + return ntohs(((struct sockaddr_in6 *)addr)->sin6_port); case AF_UNIX: return 1; default: - gpr_log (GPR_ERROR, "Unknown socket family %d in grpc_sockaddr_get_port", addr->sa_family); + gpr_log(GPR_ERROR, "Unknown socket family %d in grpc_sockaddr_get_port", + addr->sa_family); return 0; - } + } } -int -grpc_sockaddr_set_port (const struct sockaddr *addr, int port) -{ - switch (addr->sa_family) - { +int grpc_sockaddr_set_port(const struct sockaddr *addr, int port) { + switch (addr->sa_family) { case AF_INET: - GPR_ASSERT (port >= 0 && port < 65536); - ((struct sockaddr_in *) addr)->sin_port = htons ((gpr_uint16) port); + GPR_ASSERT(port >= 0 && port < 65536); + ((struct sockaddr_in *)addr)->sin_port = htons((gpr_uint16)port); return 1; case AF_INET6: - GPR_ASSERT (port >= 0 && port < 65536); - ((struct sockaddr_in6 *) addr)->sin6_port = htons ((gpr_uint16) port); + GPR_ASSERT(port >= 0 && port < 65536); + ((struct sockaddr_in6 *)addr)->sin6_port = htons((gpr_uint16)port); return 1; default: - gpr_log (GPR_ERROR, "Unknown socket family %d in grpc_sockaddr_set_port", addr->sa_family); + gpr_log(GPR_ERROR, "Unknown socket family %d in grpc_sockaddr_set_port", + addr->sa_family); return 0; - } + } } diff --git a/src/core/iomgr/sockaddr_utils.h b/src/core/iomgr/sockaddr_utils.h index bfbe37a28b8..6f7a279900d 100644 --- a/src/core/iomgr/sockaddr_utils.h +++ b/src/core/iomgr/sockaddr_utils.h @@ -41,30 +41,33 @@ If addr4_out is non-NULL, the inner IPv4 address will be copied here when returning true. */ -int grpc_sockaddr_is_v4mapped (const struct sockaddr *addr, struct sockaddr_in *addr4_out); +int grpc_sockaddr_is_v4mapped(const struct sockaddr *addr, + struct sockaddr_in *addr4_out); /* If addr is an AF_INET address, writes the corresponding ::ffff:0.0.0.0/96 address to addr6_out and returns true. Otherwise returns false. */ -int grpc_sockaddr_to_v4mapped (const struct sockaddr *addr, struct sockaddr_in6 *addr6_out); +int grpc_sockaddr_to_v4mapped(const struct sockaddr *addr, + struct sockaddr_in6 *addr6_out); /* If addr is ::, 0.0.0.0, or ::ffff:0.0.0.0, writes the port number to *port_out (if not NULL) and returns true, otherwise returns false. */ -int grpc_sockaddr_is_wildcard (const struct sockaddr *addr, int *port_out); +int grpc_sockaddr_is_wildcard(const struct sockaddr *addr, int *port_out); /* Writes 0.0.0.0:port and [::]:port to separate sockaddrs. */ -void grpc_sockaddr_make_wildcards (int port, struct sockaddr_in *wild4_out, struct sockaddr_in6 *wild6_out); +void grpc_sockaddr_make_wildcards(int port, struct sockaddr_in *wild4_out, + struct sockaddr_in6 *wild6_out); /* Writes 0.0.0.0:port. */ -void grpc_sockaddr_make_wildcard4 (int port, struct sockaddr_in *wild_out); +void grpc_sockaddr_make_wildcard4(int port, struct sockaddr_in *wild_out); /* Writes [::]:port. */ -void grpc_sockaddr_make_wildcard6 (int port, struct sockaddr_in6 *wild_out); +void grpc_sockaddr_make_wildcard6(int port, struct sockaddr_in6 *wild_out); /* Return the IP port number of a sockaddr */ -int grpc_sockaddr_get_port (const struct sockaddr *addr); +int grpc_sockaddr_get_port(const struct sockaddr *addr); /* Set IP port number of a sockaddr */ -int grpc_sockaddr_set_port (const struct sockaddr *addr, int port); +int grpc_sockaddr_set_port(const struct sockaddr *addr, int port); /* Converts a sockaddr into a newly-allocated human-readable string. @@ -78,8 +81,9 @@ int grpc_sockaddr_set_port (const struct sockaddr *addr, int port); In the unlikely event of an error, returns -1 and sets *out to NULL. The existing value of errno is always preserved. */ -int grpc_sockaddr_to_string (char **out, const struct sockaddr *addr, int normalize); +int grpc_sockaddr_to_string(char **out, const struct sockaddr *addr, + int normalize); -char *grpc_sockaddr_to_uri (const struct sockaddr *addr); +char *grpc_sockaddr_to_uri(const struct sockaddr *addr); #endif /* GRPC_INTERNAL_CORE_IOMGR_SOCKADDR_UTILS_H */ diff --git a/src/core/iomgr/sockaddr_win32.h b/src/core/iomgr/sockaddr_win32.h index a5bcf9146f0..fe2be991454 100644 --- a/src/core/iomgr/sockaddr_win32.h +++ b/src/core/iomgr/sockaddr_win32.h @@ -40,7 +40,7 @@ #ifdef __MINGW32__ /* mingw seems to be missing that definition. */ -const char *inet_ntop (int af, const void *src, char *dst, socklen_t size); +const char *inet_ntop(int af, const void *src, char *dst, socklen_t size); #endif #endif /* GRPC_INTERNAL_CORE_IOMGR_SOCKADDR_WIN32_H */ diff --git a/src/core/iomgr/socket_utils_common_posix.c b/src/core/iomgr/socket_utils_common_posix.c index 668383ff6ed..a9af5947009 100644 --- a/src/core/iomgr/socket_utils_common_posix.c +++ b/src/core/iomgr/socket_utils_common_posix.c @@ -57,126 +57,103 @@ #include /* set a socket to non blocking mode */ -int -grpc_set_socket_nonblocking (int fd, int non_blocking) -{ - int oldflags = fcntl (fd, F_GETFL, 0); - if (oldflags < 0) - { - return 0; - } - - if (non_blocking) - { - oldflags |= O_NONBLOCK; - } - else - { - oldflags &= ~O_NONBLOCK; - } - - if (fcntl (fd, F_SETFL, oldflags) != 0) - { - return 0; - } +int grpc_set_socket_nonblocking(int fd, int non_blocking) { + int oldflags = fcntl(fd, F_GETFL, 0); + if (oldflags < 0) { + return 0; + } + + if (non_blocking) { + oldflags |= O_NONBLOCK; + } else { + oldflags &= ~O_NONBLOCK; + } + + if (fcntl(fd, F_SETFL, oldflags) != 0) { + return 0; + } return 1; } -int -grpc_set_socket_no_sigpipe_if_possible (int fd) -{ +int grpc_set_socket_no_sigpipe_if_possible(int fd) { #ifdef GPR_HAVE_SO_NOSIGPIPE int val = 1; int newval; - socklen_t intlen = sizeof (newval); - return 0 == setsockopt (fd, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof (val)) && 0 == getsockopt (fd, SOL_SOCKET, SO_NOSIGPIPE, &newval, &intlen) && (newval != 0) == val; + socklen_t intlen = sizeof(newval); + return 0 == setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof(val)) && + 0 == getsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &newval, &intlen) && + (newval != 0) == val; #else return 1; #endif } /* set a socket to close on exec */ -int -grpc_set_socket_cloexec (int fd, int close_on_exec) -{ - int oldflags = fcntl (fd, F_GETFD, 0); - if (oldflags < 0) - { - return 0; - } - - if (close_on_exec) - { - oldflags |= FD_CLOEXEC; - } - else - { - oldflags &= ~FD_CLOEXEC; - } - - if (fcntl (fd, F_SETFD, oldflags) != 0) - { - return 0; - } +int grpc_set_socket_cloexec(int fd, int close_on_exec) { + int oldflags = fcntl(fd, F_GETFD, 0); + if (oldflags < 0) { + return 0; + } + + if (close_on_exec) { + oldflags |= FD_CLOEXEC; + } else { + oldflags &= ~FD_CLOEXEC; + } + + if (fcntl(fd, F_SETFD, oldflags) != 0) { + return 0; + } return 1; } /* set a socket to reuse old addresses */ -int -grpc_set_socket_reuse_addr (int fd, int reuse) -{ +int grpc_set_socket_reuse_addr(int fd, int reuse) { int val = (reuse != 0); int newval; - socklen_t intlen = sizeof (newval); - return 0 == setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof (val)) && 0 == getsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &newval, &intlen) && (newval != 0) == val; + socklen_t intlen = sizeof(newval); + return 0 == setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) && + 0 == getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &newval, &intlen) && + (newval != 0) == val; } /* disable nagle */ -int -grpc_set_socket_low_latency (int fd, int low_latency) -{ +int grpc_set_socket_low_latency(int fd, int low_latency) { int val = (low_latency != 0); int newval; - socklen_t intlen = sizeof (newval); - return 0 == setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)) && 0 == getsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &newval, &intlen) && (newval != 0) == val; + socklen_t intlen = sizeof(newval); + return 0 == setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)) && + 0 == getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &newval, &intlen) && + (newval != 0) == val; } static gpr_once g_probe_ipv6_once = GPR_ONCE_INIT; static int g_ipv6_loopback_available; -static void -probe_ipv6_once (void) -{ - int fd = socket (AF_INET6, SOCK_STREAM, 0); +static void probe_ipv6_once(void) { + int fd = socket(AF_INET6, SOCK_STREAM, 0); g_ipv6_loopback_available = 0; - if (fd < 0) - { - gpr_log (GPR_INFO, "Disabling AF_INET6 sockets because socket() failed."); - } - else - { - struct sockaddr_in6 addr; - memset (&addr, 0, sizeof (addr)); - addr.sin6_family = AF_INET6; - addr.sin6_addr.s6_addr[15] = 1; /* [::1]:0 */ - if (bind (fd, (struct sockaddr *) &addr, sizeof (addr)) == 0) - { - g_ipv6_loopback_available = 1; - } - else - { - gpr_log (GPR_INFO, "Disabling AF_INET6 sockets because ::1 is not available."); - } - close (fd); + if (fd < 0) { + gpr_log(GPR_INFO, "Disabling AF_INET6 sockets because socket() failed."); + } else { + struct sockaddr_in6 addr; + memset(&addr, 0, sizeof(addr)); + addr.sin6_family = AF_INET6; + addr.sin6_addr.s6_addr[15] = 1; /* [::1]:0 */ + if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) == 0) { + g_ipv6_loopback_available = 1; + } else { + gpr_log(GPR_INFO, + "Disabling AF_INET6 sockets because ::1 is not available."); } + close(fd); + } } -int -grpc_ipv6_loopback_available (void) -{ - gpr_once_init (&g_probe_ipv6_once, probe_ipv6_once); +int grpc_ipv6_loopback_available(void) { + gpr_once_init(&g_probe_ipv6_once, probe_ipv6_once); return g_ipv6_loopback_available; } @@ -185,60 +162,47 @@ grpc_ipv6_loopback_available (void) also speak IPv4. */ int grpc_forbid_dualstack_sockets_for_testing = 0; -static int -set_socket_dualstack (int fd) -{ - if (!grpc_forbid_dualstack_sockets_for_testing) - { - const int off = 0; - return 0 == setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, &off, sizeof (off)); - } - else - { - /* Force an IPv6-only socket, for testing purposes. */ - const int on = 1; - setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof (on)); - return 0; - } +static int set_socket_dualstack(int fd) { + if (!grpc_forbid_dualstack_sockets_for_testing) { + const int off = 0; + return 0 == setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &off, sizeof(off)); + } else { + /* Force an IPv6-only socket, for testing purposes. */ + const int on = 1; + setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)); + return 0; + } } -int -grpc_create_dualstack_socket (const struct sockaddr *addr, int type, int protocol, grpc_dualstack_mode * dsmode) -{ +int grpc_create_dualstack_socket(const struct sockaddr *addr, int type, + int protocol, grpc_dualstack_mode *dsmode) { int family = addr->sa_family; - if (family == AF_INET6) - { - int fd; - if (grpc_ipv6_loopback_available ()) - { - fd = socket (family, type, protocol); - } - else - { - fd = -1; - errno = EAFNOSUPPORT; - } - /* Check if we've got a valid dualstack socket. */ - if (fd >= 0 && set_socket_dualstack (fd)) - { - *dsmode = GRPC_DSMODE_DUALSTACK; - return fd; - } - /* If this isn't an IPv4 address, then return whatever we've got. */ - if (!grpc_sockaddr_is_v4mapped (addr, NULL)) - { - *dsmode = GRPC_DSMODE_IPV6; - return fd; - } - /* Fall back to AF_INET. */ - if (fd >= 0) - { - close (fd); - } - family = AF_INET; + if (family == AF_INET6) { + int fd; + if (grpc_ipv6_loopback_available()) { + fd = socket(family, type, protocol); + } else { + fd = -1; + errno = EAFNOSUPPORT; + } + /* Check if we've got a valid dualstack socket. */ + if (fd >= 0 && set_socket_dualstack(fd)) { + *dsmode = GRPC_DSMODE_DUALSTACK; + return fd; + } + /* If this isn't an IPv4 address, then return whatever we've got. */ + if (!grpc_sockaddr_is_v4mapped(addr, NULL)) { + *dsmode = GRPC_DSMODE_IPV6; + return fd; + } + /* Fall back to AF_INET. */ + if (fd >= 0) { + close(fd); } + family = AF_INET; + } *dsmode = family == AF_INET ? GRPC_DSMODE_IPV4 : GRPC_DSMODE_NONE; - return socket (family, type, protocol); + return socket(family, type, protocol); } #endif diff --git a/src/core/iomgr/socket_utils_linux.c b/src/core/iomgr/socket_utils_linux.c index a21ae656fb7..a87625262b2 100644 --- a/src/core/iomgr/socket_utils_linux.c +++ b/src/core/iomgr/socket_utils_linux.c @@ -40,13 +40,12 @@ #include #include -int -grpc_accept4 (int sockfd, struct sockaddr *addr, socklen_t * addrlen, int nonblock, int cloexec) -{ +int grpc_accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, + int nonblock, int cloexec) { int flags = 0; flags |= nonblock ? SOCK_NONBLOCK : 0; flags |= cloexec ? SOCK_CLOEXEC : 0; - return accept4 (sockfd, addr, addrlen, flags); + return accept4(sockfd, addr, addrlen, flags); } #endif diff --git a/src/core/iomgr/socket_utils_posix.c b/src/core/iomgr/socket_utils_posix.c index 1e32d7461fd..3c56b467443 100644 --- a/src/core/iomgr/socket_utils_posix.c +++ b/src/core/iomgr/socket_utils_posix.c @@ -43,35 +43,27 @@ #include -int -grpc_accept4 (int sockfd, struct sockaddr *addr, socklen_t * addrlen, int nonblock, int cloexec) -{ +int grpc_accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, + int nonblock, int cloexec) { int fd, flags; - fd = accept (sockfd, addr, addrlen); - if (fd >= 0) - { - if (nonblock) - { - flags = fcntl (fd, F_GETFL, 0); - if (flags < 0) - goto close_and_error; - if (fcntl (fd, F_SETFL, flags | O_NONBLOCK) != 0) - goto close_and_error; - } - if (cloexec) - { - flags = fcntl (fd, F_GETFD, 0); - if (flags < 0) - goto close_and_error; - if (fcntl (fd, F_SETFD, flags | FD_CLOEXEC) != 0) - goto close_and_error; - } + fd = accept(sockfd, addr, addrlen); + if (fd >= 0) { + if (nonblock) { + flags = fcntl(fd, F_GETFL, 0); + if (flags < 0) goto close_and_error; + if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) != 0) goto close_and_error; } + if (cloexec) { + flags = fcntl(fd, F_GETFD, 0); + if (flags < 0) goto close_and_error; + if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) != 0) goto close_and_error; + } + } return fd; close_and_error: - close (fd); + close(fd); return -1; } diff --git a/src/core/iomgr/socket_utils_posix.h b/src/core/iomgr/socket_utils_posix.h index 8e0492802a1..d330d1986eb 100644 --- a/src/core/iomgr/socket_utils_posix.h +++ b/src/core/iomgr/socket_utils_posix.h @@ -38,19 +38,20 @@ #include /* a wrapper for accept or accept4 */ -int grpc_accept4 (int sockfd, struct sockaddr *addr, socklen_t * addrlen, int nonblock, int cloexec); +int grpc_accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, + int nonblock, int cloexec); /* set a socket to non blocking mode */ -int grpc_set_socket_nonblocking (int fd, int non_blocking); +int grpc_set_socket_nonblocking(int fd, int non_blocking); /* set a socket to close on exec */ -int grpc_set_socket_cloexec (int fd, int close_on_exec); +int grpc_set_socket_cloexec(int fd, int close_on_exec); /* set a socket to reuse old addresses */ -int grpc_set_socket_reuse_addr (int fd, int reuse); +int grpc_set_socket_reuse_addr(int fd, int reuse); /* disable nagle */ -int grpc_set_socket_low_latency (int fd, int low_latency); +int grpc_set_socket_low_latency(int fd, int low_latency); /* Returns true if this system can create AF_INET6 sockets bound to ::1. The value is probed once, and cached for the life of the process. @@ -60,20 +61,19 @@ int grpc_set_socket_low_latency (int fd, int low_latency); and bind IPv6 sockets, but cannot connect to a getsockname() of [::]:port without a valid loopback interface. Rather than expose this half-broken state to library users, we turn off IPv6 sockets. */ -int grpc_ipv6_loopback_available (void); +int grpc_ipv6_loopback_available(void); /* Tries to set SO_NOSIGPIPE if available on this platform. Returns 1 on success, 0 on failure. If SO_NO_SIGPIPE is not available, returns 1. */ -int grpc_set_socket_no_sigpipe_if_possible (int fd); +int grpc_set_socket_no_sigpipe_if_possible(int fd); /* An enum to keep track of IPv4/IPv6 socket modes. Currently, this information is only used when a socket is first created, but in the future we may wish to store it alongside the fd. This would let calls like sendto() know which family to use without asking the kernel first. */ -typedef enum grpc_dualstack_mode -{ +typedef enum grpc_dualstack_mode { /* Uninitialized, or a non-IP socket. */ GRPC_DSMODE_NONE, /* AF_INET only. */ @@ -107,6 +107,7 @@ extern int grpc_forbid_dualstack_sockets_for_testing; IPv4, so that bind() or connect() see the correct family. Also, it's important to distinguish between DUALSTACK and IPV6 when listening on the [::] wildcard address. */ -int grpc_create_dualstack_socket (const struct sockaddr *addr, int type, int protocol, grpc_dualstack_mode * dsmode); +int grpc_create_dualstack_socket(const struct sockaddr *addr, int type, + int protocol, grpc_dualstack_mode *dsmode); #endif /* GRPC_INTERNAL_CORE_IOMGR_SOCKET_UTILS_POSIX_H */ diff --git a/src/core/iomgr/socket_windows.c b/src/core/iomgr/socket_windows.c index 3e0cad0c7bf..fafb7b6622b 100644 --- a/src/core/iomgr/socket_windows.c +++ b/src/core/iomgr/socket_windows.c @@ -49,18 +49,16 @@ #include "src/core/iomgr/pollset_windows.h" #include "src/core/iomgr/socket_windows.h" -grpc_winsocket * -grpc_winsocket_create (SOCKET socket, const char *name) -{ +grpc_winsocket *grpc_winsocket_create(SOCKET socket, const char *name) { char *final_name; - grpc_winsocket *r = gpr_malloc (sizeof (grpc_winsocket)); - memset (r, 0, sizeof (grpc_winsocket)); + grpc_winsocket *r = gpr_malloc(sizeof(grpc_winsocket)); + memset(r, 0, sizeof(grpc_winsocket)); r->socket = socket; - gpr_mu_init (&r->state_mu); - gpr_asprintf (&final_name, "%s:socket=0x%p", name, r); - grpc_iomgr_register_object (&r->iomgr_object, final_name); - gpr_free (final_name); - grpc_iocp_add_socket (r); + gpr_mu_init(&r->state_mu); + gpr_asprintf(&final_name, "%s:socket=0x%p", name, r); + grpc_iomgr_register_object(&r->iomgr_object, final_name); + gpr_free(final_name); + grpc_iocp_add_socket(r); return r; } @@ -68,9 +66,7 @@ grpc_winsocket_create (SOCKET socket, const char *name) operations to abort them. We need to do that this way because of the various callsites of that function, which happens to be in various mutex hold states, and that'd be unsafe to call them directly. */ -void -grpc_winsocket_shutdown (grpc_winsocket * winsocket) -{ +void grpc_winsocket_shutdown(grpc_winsocket *winsocket) { /* Grab the function pointer for DisconnectEx for that specific socket. It may change depending on the interface. */ int status; @@ -78,27 +74,25 @@ grpc_winsocket_shutdown (grpc_winsocket * winsocket) LPFN_DISCONNECTEX DisconnectEx; DWORD ioctl_num_bytes; - status = WSAIoctl (winsocket->socket, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof (guid), &DisconnectEx, sizeof (DisconnectEx), &ioctl_num_bytes, NULL, NULL); + status = WSAIoctl(winsocket->socket, SIO_GET_EXTENSION_FUNCTION_POINTER, + &guid, sizeof(guid), &DisconnectEx, sizeof(DisconnectEx), + &ioctl_num_bytes, NULL, NULL); - if (status == 0) - { - DisconnectEx (winsocket->socket, NULL, 0, 0); - } - else - { - char *utf8_message = gpr_format_message (WSAGetLastError ()); - gpr_log (GPR_ERROR, "Unable to retrieve DisconnectEx pointer : %s", utf8_message); - gpr_free (utf8_message); - } - closesocket (winsocket->socket); + if (status == 0) { + DisconnectEx(winsocket->socket, NULL, 0, 0); + } else { + char *utf8_message = gpr_format_message(WSAGetLastError()); + gpr_log(GPR_ERROR, "Unable to retrieve DisconnectEx pointer : %s", + utf8_message); + gpr_free(utf8_message); + } + closesocket(winsocket->socket); } -void -grpc_winsocket_destroy (grpc_winsocket * winsocket) -{ - grpc_iomgr_unregister_object (&winsocket->iomgr_object); - gpr_mu_destroy (&winsocket->state_mu); - gpr_free (winsocket); +void grpc_winsocket_destroy(grpc_winsocket *winsocket) { + grpc_iomgr_unregister_object(&winsocket->iomgr_object); + gpr_mu_destroy(&winsocket->state_mu); + gpr_free(winsocket); } #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/socket_windows.h b/src/core/iomgr/socket_windows.h index df2a7304138..45bc6572257 100644 --- a/src/core/iomgr/socket_windows.h +++ b/src/core/iomgr/socket_windows.h @@ -45,8 +45,7 @@ /* This holds the data for an outstanding read or write on a socket. The mutex to protect the concurrent access to that data is the one inside the winsocket wrapper. */ -typedef struct grpc_winsocket_callback_info -{ +typedef struct grpc_winsocket_callback_info { /* This is supposed to be a WSAOVERLAPPED, but in order to get that definition, we need to include ws2tcpip.h, which needs to be included from the top, otherwise it'll clash with a previous inclusion of @@ -55,7 +54,7 @@ typedef struct grpc_winsocket_callback_info OVERLAPPED overlapped; /* The callback information for the pending operation. May be empty if the caller hasn't registered a callback yet. */ - void (*cb) (void *opaque, int success); + void (*cb)(void *opaque, int success); void *opaque; /* A boolean to describe if the IO Completion Port got a notification for that operation. This will happen if the operation completed before the @@ -80,8 +79,7 @@ typedef struct grpc_winsocket_callback_info operation callbacks for connect and listen. But given the scope of listen and accept, we don't need to go to that extent and waste memory. Also, this is closer to what happens in posix world. */ -typedef struct grpc_winsocket -{ +typedef struct grpc_winsocket { SOCKET socket; grpc_winsocket_callback_info write_info; @@ -101,13 +99,13 @@ typedef struct grpc_winsocket /* Create a wrapped windows handle. This takes ownership of it, meaning that it will be responsible for closing it. */ -grpc_winsocket *grpc_winsocket_create (SOCKET socket, const char *name); +grpc_winsocket *grpc_winsocket_create(SOCKET socket, const char *name); /* Initiate an asynchronous shutdown of the socket. Will call off any pending operation to cancel them. */ -void grpc_winsocket_shutdown (grpc_winsocket * socket); +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_winsocket_destroy(grpc_winsocket *socket); #endif /* GRPC_INTERNAL_CORE_IOMGR_SOCKET_WINDOWS_H */ diff --git a/src/core/iomgr/tcp_client.h b/src/core/iomgr/tcp_client.h index 2e140740062..5e18e71ca2f 100644 --- a/src/core/iomgr/tcp_client.h +++ b/src/core/iomgr/tcp_client.h @@ -44,6 +44,10 @@ 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, grpc_pollset_set * interested_parties, const struct sockaddr *addr, size_t addr_len, gpr_timespec deadline); +void grpc_tcp_client_connect(grpc_exec_ctx *exec_ctx, grpc_closure *on_connect, + grpc_endpoint **endpoint, + grpc_pollset_set *interested_parties, + const struct sockaddr *addr, size_t addr_len, + gpr_timespec deadline); #endif /* GRPC_INTERNAL_CORE_IOMGR_TCP_CLIENT_H */ diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c index 3949ce6f24e..346566866a2 100644 --- a/src/core/iomgr/tcp_client_posix.c +++ b/src/core/iomgr/tcp_client_posix.c @@ -56,8 +56,7 @@ extern int grpc_tcp_trace; -typedef struct -{ +typedef struct { gpr_mu mu; grpc_fd *fd; gpr_timespec deadline; @@ -70,57 +69,49 @@ typedef struct grpc_closure *closure; } async_connect; -static int -prepare_socket (const struct sockaddr *addr, int fd) -{ - if (fd < 0) - { - goto error; - } +static int prepare_socket(const struct sockaddr *addr, int fd) { + if (fd < 0) { + goto error; + } - if (!grpc_set_socket_nonblocking (fd, 1) || !grpc_set_socket_cloexec (fd, 1) || (addr->sa_family != AF_UNIX && !grpc_set_socket_low_latency (fd, 1)) || !grpc_set_socket_no_sigpipe_if_possible (fd)) - { - gpr_log (GPR_ERROR, "Unable to configure socket %d: %s", fd, strerror (errno)); - goto error; - } + if (!grpc_set_socket_nonblocking(fd, 1) || !grpc_set_socket_cloexec(fd, 1) || + (addr->sa_family != AF_UNIX && !grpc_set_socket_low_latency(fd, 1)) || + !grpc_set_socket_no_sigpipe_if_possible(fd)) { + gpr_log(GPR_ERROR, "Unable to configure socket %d: %s", fd, + strerror(errno)); + goto error; + } return 1; error: - if (fd >= 0) - { - close (fd); - } + if (fd >= 0) { + close(fd); + } return 0; } -static void -tc_on_alarm (grpc_exec_ctx * exec_ctx, void *acp, int success) -{ +static void tc_on_alarm(grpc_exec_ctx *exec_ctx, void *acp, int success) { int done; async_connect *ac = acp; - if (grpc_tcp_trace) - { - gpr_log (GPR_DEBUG, "CLIENT_CONNECT: %s: on_alarm: success=%d", ac->addr_str, success); - } - gpr_mu_lock (&ac->mu); - if (ac->fd != NULL) - { - grpc_fd_shutdown (exec_ctx, ac->fd); - } + if (grpc_tcp_trace) { + gpr_log(GPR_DEBUG, "CLIENT_CONNECT: %s: on_alarm: success=%d", ac->addr_str, + success); + } + gpr_mu_lock(&ac->mu); + if (ac->fd != NULL) { + grpc_fd_shutdown(exec_ctx, ac->fd); + } done = (--ac->refs == 0); - gpr_mu_unlock (&ac->mu); - if (done) - { - gpr_mu_destroy (&ac->mu); - gpr_free (ac->addr_str); - gpr_free (ac); - } + gpr_mu_unlock(&ac->mu); + if (done) { + gpr_mu_destroy(&ac->mu); + gpr_free(ac->addr_str); + gpr_free(ac); + } } -static void -on_writable (grpc_exec_ctx * exec_ctx, void *acp, int success) -{ +static void on_writable(grpc_exec_ctx *exec_ctx, void *acp, int success) { async_connect *ac = acp; int so_error = 0; socklen_t so_error_size; @@ -130,107 +121,93 @@ on_writable (grpc_exec_ctx * exec_ctx, void *acp, int success) grpc_closure *closure = ac->closure; grpc_fd *fd; - if (grpc_tcp_trace) - { - gpr_log (GPR_DEBUG, "CLIENT_CONNECT: %s: on_writable: success=%d", ac->addr_str, success); - } + if (grpc_tcp_trace) { + gpr_log(GPR_DEBUG, "CLIENT_CONNECT: %s: on_writable: success=%d", + ac->addr_str, success); + } - gpr_mu_lock (&ac->mu); - GPR_ASSERT (ac->fd); + gpr_mu_lock(&ac->mu); + GPR_ASSERT(ac->fd); fd = ac->fd; ac->fd = NULL; - gpr_mu_unlock (&ac->mu); - - grpc_alarm_cancel (exec_ctx, &ac->alarm); - - gpr_mu_lock (&ac->mu); - if (success) - { - do - { - so_error_size = sizeof (so_error); - err = getsockopt (fd->fd, SOL_SOCKET, SO_ERROR, &so_error, &so_error_size); - } - while (err < 0 && errno == EINTR); - if (err < 0) - { - gpr_log (GPR_ERROR, "getsockopt(ERROR): %s", strerror (errno)); - goto finish; - } - else if (so_error != 0) - { - if (so_error == ENOBUFS) - { - /* We will get one of these errors if we have run out of - memory in the kernel for the data structures allocated - when you connect a socket. If this happens it is very - likely that if we wait a little bit then try again the - connection will work (since other programs or this - program will close their network connections and free up - memory). This does _not_ indicate that there is anything - wrong with the server we are connecting to, this is a - local problem. - - If you are looking at this code, then chances are that - your program or another program on the same computer - opened too many network connections. The "easy" fix: - 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); - return; - } - else - { - switch (so_error) - { - case ECONNREFUSED: - gpr_log (GPR_ERROR, "socket error: connection refused"); - break; - default: - gpr_log (GPR_ERROR, "socket error: %d", so_error); - break; - } - goto finish; - } - } - else - { - grpc_pollset_set_del_fd (exec_ctx, ac->interested_parties, fd); - *ep = grpc_tcp_create (fd, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, ac->addr_str); - fd = NULL; - goto finish; - } - } - else - { - gpr_log (GPR_ERROR, "on_writable failed during connect"); + gpr_mu_unlock(&ac->mu); + + grpc_alarm_cancel(exec_ctx, &ac->alarm); + + gpr_mu_lock(&ac->mu); + if (success) { + do { + so_error_size = sizeof(so_error); + err = getsockopt(fd->fd, SOL_SOCKET, SO_ERROR, &so_error, &so_error_size); + } while (err < 0 && errno == EINTR); + if (err < 0) { + gpr_log(GPR_ERROR, "getsockopt(ERROR): %s", strerror(errno)); + goto finish; + } else if (so_error != 0) { + if (so_error == ENOBUFS) { + /* We will get one of these errors if we have run out of + memory in the kernel for the data structures allocated + when you connect a socket. If this happens it is very + likely that if we wait a little bit then try again the + connection will work (since other programs or this + program will close their network connections and free up + memory). This does _not_ indicate that there is anything + wrong with the server we are connecting to, this is a + local problem. + + If you are looking at this code, then chances are that + your program or another program on the same computer + opened too many network connections. The "easy" fix: + 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); + return; + } else { + switch (so_error) { + case ECONNREFUSED: + gpr_log(GPR_ERROR, "socket error: connection refused"); + break; + default: + gpr_log(GPR_ERROR, "socket error: %d", so_error); + break; + } + goto finish; + } + } else { + grpc_pollset_set_del_fd(exec_ctx, ac->interested_parties, fd); + *ep = grpc_tcp_create(fd, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, ac->addr_str); + fd = NULL; goto finish; } + } else { + gpr_log(GPR_ERROR, "on_writable failed during connect"); + goto finish; + } - abort (); + abort(); finish: - if (fd != NULL) - { - grpc_pollset_set_del_fd (exec_ctx, ac->interested_parties, fd); - grpc_fd_orphan (exec_ctx, fd, NULL, "tcp_client_orphan"); - fd = NULL; - } + if (fd != NULL) { + grpc_pollset_set_del_fd(exec_ctx, ac->interested_parties, fd); + grpc_fd_orphan(exec_ctx, fd, NULL, "tcp_client_orphan"); + fd = NULL; + } done = (--ac->refs == 0); - gpr_mu_unlock (&ac->mu); - if (done) - { - gpr_mu_destroy (&ac->mu); - gpr_free (ac->addr_str); - gpr_free (ac); - } - grpc_exec_ctx_enqueue (exec_ctx, closure, *ep != NULL); + gpr_mu_unlock(&ac->mu); + if (done) { + gpr_mu_destroy(&ac->mu); + gpr_free(ac->addr_str); + gpr_free(ac); + } + grpc_exec_ctx_enqueue(exec_ctx, closure, *ep != NULL); } -void -grpc_tcp_client_connect (grpc_exec_ctx * exec_ctx, grpc_closure * closure, grpc_endpoint ** ep, grpc_pollset_set * interested_parties, const struct sockaddr *addr, size_t addr_len, gpr_timespec deadline) -{ +void grpc_tcp_client_connect(grpc_exec_ctx *exec_ctx, grpc_closure *closure, + grpc_endpoint **ep, + grpc_pollset_set *interested_parties, + const struct sockaddr *addr, size_t addr_len, + gpr_timespec deadline) { int fd; grpc_dualstack_mode dsmode; int err; @@ -244,84 +221,78 @@ grpc_tcp_client_connect (grpc_exec_ctx * exec_ctx, grpc_closure * closure, grpc_ *ep = NULL; /* Use dualstack sockets where available. */ - if (grpc_sockaddr_to_v4mapped (addr, &addr6_v4mapped)) - { - addr = (const struct sockaddr *) &addr6_v4mapped; - addr_len = sizeof (addr6_v4mapped); - } - - fd = grpc_create_dualstack_socket (addr, SOCK_STREAM, 0, &dsmode); - if (fd < 0) - { - gpr_log (GPR_ERROR, "Unable to create socket: %s", strerror (errno)); - } - 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 = (struct sockaddr *) &addr4_copy; - addr_len = sizeof (addr4_copy); - } - if (!prepare_socket (addr, fd)) - { - grpc_exec_ctx_enqueue (exec_ctx, closure, 0); - return; - } - - do - { - GPR_ASSERT (addr_len < ~(socklen_t) 0); - err = connect (fd, 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) - { - *ep = grpc_tcp_create (fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str); - grpc_exec_ctx_enqueue (exec_ctx, closure, 1); - goto done; - } - - if (errno != EWOULDBLOCK && errno != EINPROGRESS) - { - gpr_log (GPR_ERROR, "connect error to '%s': %s", addr_str, strerror (errno)); - grpc_fd_orphan (exec_ctx, fdobj, NULL, "tcp_client_connect_error"); - grpc_exec_ctx_enqueue (exec_ctx, closure, 0); - goto done; - } - - grpc_pollset_set_add_fd (exec_ctx, interested_parties, fdobj); - - ac = gpr_malloc (sizeof (async_connect)); + if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) { + addr = (const struct sockaddr *)&addr6_v4mapped; + addr_len = sizeof(addr6_v4mapped); + } + + fd = grpc_create_dualstack_socket(addr, SOCK_STREAM, 0, &dsmode); + if (fd < 0) { + gpr_log(GPR_ERROR, "Unable to create socket: %s", strerror(errno)); + } + 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 = (struct sockaddr *)&addr4_copy; + addr_len = sizeof(addr4_copy); + } + if (!prepare_socket(addr, fd)) { + grpc_exec_ctx_enqueue(exec_ctx, closure, 0); + return; + } + + do { + GPR_ASSERT(addr_len < ~(socklen_t)0); + err = connect(fd, 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) { + *ep = grpc_tcp_create(fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str); + grpc_exec_ctx_enqueue(exec_ctx, closure, 1); + goto done; + } + + if (errno != EWOULDBLOCK && errno != EINPROGRESS) { + gpr_log(GPR_ERROR, "connect error to '%s': %s", addr_str, strerror(errno)); + grpc_fd_orphan(exec_ctx, fdobj, NULL, "tcp_client_connect_error"); + grpc_exec_ctx_enqueue(exec_ctx, closure, 0); + goto done; + } + + grpc_pollset_set_add_fd(exec_ctx, interested_parties, fdobj); + + ac = gpr_malloc(sizeof(async_connect)); ac->closure = closure; ac->ep = ep; ac->fd = fdobj; ac->interested_parties = interested_parties; ac->addr_str = addr_str; addr_str = NULL; - gpr_mu_init (&ac->mu); + gpr_mu_init(&ac->mu); ac->refs = 2; ac->write_closure.cb = on_writable; ac->write_closure.cb_arg = ac; - if (grpc_tcp_trace) - { - gpr_log (GPR_DEBUG, "CLIENT_CONNECT: %s: asynchronously connecting", ac->addr_str); - } + if (grpc_tcp_trace) { + gpr_log(GPR_DEBUG, "CLIENT_CONNECT: %s: asynchronously connecting", + ac->addr_str); + } - gpr_mu_lock (&ac->mu); - grpc_alarm_init (exec_ctx, &ac->alarm, gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC), tc_on_alarm, ac, gpr_now (GPR_CLOCK_MONOTONIC)); - grpc_fd_notify_on_write (exec_ctx, ac->fd, &ac->write_closure); - gpr_mu_unlock (&ac->mu); + gpr_mu_lock(&ac->mu); + grpc_alarm_init(exec_ctx, &ac->alarm, + gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC), + tc_on_alarm, ac, gpr_now(GPR_CLOCK_MONOTONIC)); + grpc_fd_notify_on_write(exec_ctx, ac->fd, &ac->write_closure); + gpr_mu_unlock(&ac->mu); done: - gpr_free (name); - gpr_free (addr_str); + gpr_free(name); + gpr_free(addr_str); } #endif diff --git a/src/core/iomgr/tcp_client_windows.c b/src/core/iomgr/tcp_client_windows.c index 03a9a9c9d69..28f1bc96c8d 100644 --- a/src/core/iomgr/tcp_client_windows.c +++ b/src/core/iomgr/tcp_client_windows.c @@ -51,9 +51,8 @@ #include "src/core/iomgr/sockaddr_utils.h" #include "src/core/iomgr/socket_windows.h" -typedef struct -{ - void (*cb) (void *arg, grpc_endpoint * tcp); +typedef struct { + void (*cb)(void *arg, grpc_endpoint *tcp); void *cb_arg; gpr_mu mu; grpc_winsocket *socket; @@ -63,79 +62,67 @@ typedef struct int refs; } async_connect; -static void -async_connect_unlock_and_cleanup (async_connect * ac) -{ +static void async_connect_unlock_and_cleanup(async_connect *ac) { int done = (--ac->refs == 0); - gpr_mu_unlock (&ac->mu); - if (done) - { - if (ac->socket != NULL) - grpc_winsocket_destroy (ac->socket); - gpr_mu_destroy (&ac->mu); - gpr_free (ac->addr_name); - gpr_free (ac); - } + gpr_mu_unlock(&ac->mu); + if (done) { + if (ac->socket != NULL) grpc_winsocket_destroy(ac->socket); + gpr_mu_destroy(&ac->mu); + gpr_free(ac->addr_name); + gpr_free(ac); + } } -static void -on_alarm (void *acp, int occured) -{ +static void on_alarm(void *acp, int occured) { async_connect *ac = acp; - gpr_mu_lock (&ac->mu); + gpr_mu_lock(&ac->mu); /* If the alarm didn't occur, it got cancelled. */ - if (ac->socket != NULL && occured) - { - grpc_winsocket_shutdown (ac->socket); - } - async_connect_unlock_and_cleanup (ac); + if (ac->socket != NULL && occured) { + grpc_winsocket_shutdown(ac->socket); + } + async_connect_unlock_and_cleanup(ac); } -static void -on_connect (void *acp, int from_iocp) -{ +static void on_connect(void *acp, int from_iocp) { async_connect *ac = acp; SOCKET sock = ac->socket->socket; grpc_endpoint *ep = NULL; grpc_winsocket_callback_info *info = &ac->socket->write_info; - void (*cb) (void *arg, grpc_endpoint * tcp) = ac->cb; + void (*cb)(void *arg, grpc_endpoint *tcp) = ac->cb; void *cb_arg = ac->cb_arg; - grpc_alarm_cancel (&ac->alarm); - - gpr_mu_lock (&ac->mu); - - if (from_iocp) - { - DWORD transfered_bytes = 0; - DWORD flags; - BOOL wsa_success = WSAGetOverlappedResult (sock, &info->overlapped, - &transfered_bytes, FALSE, &flags); - GPR_ASSERT (transfered_bytes == 0); - if (!wsa_success) - { - char *utf8_message = gpr_format_message (WSAGetLastError ()); - gpr_log (GPR_ERROR, "on_connect error: %s", utf8_message); - gpr_free (utf8_message); - } - else - { - ep = grpc_tcp_create (ac->socket, ac->addr_name); - ac->socket = NULL; - } + grpc_alarm_cancel(&ac->alarm); + + gpr_mu_lock(&ac->mu); + + if (from_iocp) { + DWORD transfered_bytes = 0; + DWORD flags; + BOOL wsa_success = WSAGetOverlappedResult(sock, &info->overlapped, + &transfered_bytes, FALSE, &flags); + GPR_ASSERT(transfered_bytes == 0); + if (!wsa_success) { + char *utf8_message = gpr_format_message(WSAGetLastError()); + gpr_log(GPR_ERROR, "on_connect error: %s", utf8_message); + gpr_free(utf8_message); + } else { + ep = grpc_tcp_create(ac->socket, ac->addr_name); + ac->socket = NULL; } + } - async_connect_unlock_and_cleanup (ac); + async_connect_unlock_and_cleanup(ac); /* If the connection was aborted, the callback was already called when the deadline was met. */ - cb (cb_arg, ep); + cb(cb_arg, ep); } /* Tries to issue one async connection, then schedules both an IOCP notification request for the connection, and one timeout alert. */ -void -grpc_tcp_client_connect (void (*cb) (void *arg, grpc_endpoint * tcp), void *arg, grpc_pollset_set * interested_parties, const struct sockaddr *addr, int addr_len, gpr_timespec deadline) -{ +void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *tcp), + void *arg, grpc_pollset_set *interested_parties, + const struct sockaddr *addr, int addr_len, + gpr_timespec deadline) { SOCKET sock = INVALID_SOCKET; BOOL success; int status; @@ -151,85 +138,79 @@ grpc_tcp_client_connect (void (*cb) (void *arg, grpc_endpoint * tcp), void *arg, grpc_winsocket_callback_info *info; /* Use dualstack sockets where available. */ - if (grpc_sockaddr_to_v4mapped (addr, &addr6_v4mapped)) - { - addr = (const struct sockaddr *) &addr6_v4mapped; - addr_len = sizeof (addr6_v4mapped); - } - - sock = WSASocket (AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); - if (sock == INVALID_SOCKET) - { - message = "Unable to create socket: %s"; - goto failure; - } - - if (!grpc_tcp_prepare_socket (sock)) - { - message = "Unable to set socket options: %s"; - goto failure; - } + if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) { + addr = (const struct sockaddr *)&addr6_v4mapped; + addr_len = sizeof(addr6_v4mapped); + } + + sock = WSASocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0, + WSA_FLAG_OVERLAPPED); + if (sock == INVALID_SOCKET) { + message = "Unable to create socket: %s"; + goto failure; + } + + if (!grpc_tcp_prepare_socket(sock)) { + message = "Unable to set socket options: %s"; + goto failure; + } /* Grab the function pointer for ConnectEx for that specific socket. It may change depending on the interface. */ - status = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof (guid), &ConnectEx, sizeof (ConnectEx), &ioctl_num_bytes, NULL, NULL); + status = + WSAIoctl(sock, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof(guid), + &ConnectEx, sizeof(ConnectEx), &ioctl_num_bytes, NULL, NULL); - if (status != 0) - { - message = "Unable to retrieve ConnectEx pointer: %s"; - goto failure; - } + if (status != 0) { + message = "Unable to retrieve ConnectEx pointer: %s"; + goto failure; + } - grpc_sockaddr_make_wildcard6 (0, &local_address); + grpc_sockaddr_make_wildcard6(0, &local_address); - status = bind (sock, (struct sockaddr *) &local_address, sizeof (local_address)); - if (status != 0) - { - message = "Unable to bind socket: %s"; - goto failure; - } + status = bind(sock, (struct sockaddr *)&local_address, sizeof(local_address)); + if (status != 0) { + message = "Unable to bind socket: %s"; + goto failure; + } - socket = grpc_winsocket_create (sock, "client"); + socket = grpc_winsocket_create(sock, "client"); info = &socket->write_info; - success = ConnectEx (sock, addr, addr_len, NULL, 0, NULL, &info->overlapped); + success = ConnectEx(sock, addr, addr_len, NULL, 0, NULL, &info->overlapped); /* It wouldn't be unusual to get a success immediately. But we'll still get an IOCP notification, so let's ignore it. */ - if (!success) - { - int error = WSAGetLastError (); - if (error != ERROR_IO_PENDING) - { - message = "ConnectEx failed: %s"; - goto failure; - } + if (!success) { + int error = WSAGetLastError(); + if (error != ERROR_IO_PENDING) { + message = "ConnectEx failed: %s"; + goto failure; } + } - ac = gpr_malloc (sizeof (async_connect)); + ac = gpr_malloc(sizeof(async_connect)); ac->cb = cb; ac->cb_arg = arg; ac->socket = socket; - gpr_mu_init (&ac->mu); + gpr_mu_init(&ac->mu); ac->refs = 2; - ac->addr_name = grpc_sockaddr_to_uri (addr); + ac->addr_name = grpc_sockaddr_to_uri(addr); - grpc_alarm_init (&ac->alarm, deadline, on_alarm, ac, gpr_now (GPR_CLOCK_MONOTONIC)); - grpc_socket_notify_on_write (socket, on_connect, ac); + grpc_alarm_init(&ac->alarm, deadline, on_alarm, ac, + gpr_now(GPR_CLOCK_MONOTONIC)); + grpc_socket_notify_on_write(socket, on_connect, ac); return; failure: - utf8_message = gpr_format_message (WSAGetLastError ()); - gpr_log (GPR_ERROR, message, utf8_message); - gpr_free (utf8_message); - if (socket != NULL) - { - grpc_winsocket_destroy (socket); - } - else if (sock != INVALID_SOCKET) - { - closesocket (sock); - } - cb (arg, NULL); + utf8_message = gpr_format_message(WSAGetLastError()); + gpr_log(GPR_ERROR, message, utf8_message); + gpr_free(utf8_message); + if (socket != NULL) { + grpc_winsocket_destroy(socket); + } else if (sock != INVALID_SOCKET) { + closesocket(sock); + } + cb(arg, NULL); } #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c index cd0769a48bb..c98f0125f8a 100644 --- a/src/core/iomgr/tcp_posix.c +++ b/src/core/iomgr/tcp_posix.c @@ -69,13 +69,12 @@ typedef size_t msg_iovlen_type; int grpc_tcp_trace = 0; -typedef struct -{ +typedef struct { grpc_endpoint base; grpc_fd *em_fd; int fd; int finished_edge; - msg_iovlen_type iov_size; /* Number of slices to allocate per read attempt */ + msg_iovlen_type iov_size; /* Number of slices to allocate per read attempt */ size_t slice_size; gpr_refcount refcount; @@ -95,22 +94,20 @@ typedef struct char *peer_string; } grpc_tcp; -static void tcp_handle_read (grpc_exec_ctx * exec_ctx, void *arg /* grpc_tcp */ , int success); -static void tcp_handle_write (grpc_exec_ctx * exec_ctx, void *arg /* grpc_tcp */ , int success); +static void tcp_handle_read(grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */, + int success); +static void tcp_handle_write(grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */, + int success); -static void -tcp_shutdown (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep) -{ - grpc_tcp *tcp = (grpc_tcp *) ep; - grpc_fd_shutdown (exec_ctx, tcp->em_fd); +static void tcp_shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep) { + grpc_tcp *tcp = (grpc_tcp *)ep; + grpc_fd_shutdown(exec_ctx, tcp->em_fd); } -static void -tcp_free (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) -{ - grpc_fd_orphan (exec_ctx, tcp->em_fd, NULL, "tcp_unref_orphan"); - gpr_free (tcp->peer_string); - gpr_free (tcp); +static void tcp_free(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { + grpc_fd_orphan(exec_ctx, tcp->em_fd, NULL, "tcp_unref_orphan"); + gpr_free(tcp->peer_string); + gpr_free(tcp); } /*#define GRPC_TCP_REFCOUNT_DEBUG*/ @@ -118,94 +115,77 @@ tcp_free (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) #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_exec_ctx *exec_ctx, grpc_tcp * tcp, const char *reason, const char *file, int line) -{ - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "TCP unref %p : %s %d -> %d", tcp, reason, tcp->refcount.count, tcp->refcount.count - 1); - if (gpr_unref (&tcp->refcount)) - { - tcp_free (exec_ctx, tcp); - } +static void tcp_unref(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp, + const char *reason, const char *file, int line) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "TCP unref %p : %s %d -> %d", tcp, + reason, tcp->refcount.count, tcp->refcount.count - 1); + if (gpr_unref(&tcp->refcount)) { + tcp_free(exec_ctx, tcp); + } } -static void -tcp_ref (grpc_tcp * tcp, const char *reason, const char *file, int line) -{ - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "TCP ref %p : %s %d -> %d", tcp, reason, tcp->refcount.count, tcp->refcount.count + 1); - gpr_ref (&tcp->refcount); +static void tcp_ref(grpc_tcp *tcp, const char *reason, const char *file, + int line) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "TCP ref %p : %s %d -> %d", tcp, + reason, tcp->refcount.count, tcp->refcount.count + 1); + gpr_ref(&tcp->refcount); } #else #define TCP_UNREF(cl, tcp, reason) tcp_unref((cl), (tcp)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void -tcp_unref (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) -{ - if (gpr_unref (&tcp->refcount)) - { - tcp_free (exec_ctx, tcp); - } +static void tcp_unref(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { + if (gpr_unref(&tcp->refcount)) { + tcp_free(exec_ctx, tcp); + } } -static void -tcp_ref (grpc_tcp * tcp) -{ - gpr_ref (&tcp->refcount); -} +static void tcp_ref(grpc_tcp *tcp) { gpr_ref(&tcp->refcount); } #endif -static void -tcp_destroy (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep) -{ - grpc_tcp *tcp = (grpc_tcp *) ep; - TCP_UNREF (exec_ctx, tcp, "destroy"); +static void tcp_destroy(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep) { + grpc_tcp *tcp = (grpc_tcp *)ep; + TCP_UNREF(exec_ctx, tcp, "destroy"); } -static void -call_read_cb (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp, int success) -{ +static void call_read_cb(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp, int success) { grpc_closure *cb = tcp->read_cb; - if (grpc_tcp_trace) - { - size_t i; - gpr_log (GPR_DEBUG, "read: success=%d", success); - for (i = 0; i < tcp->incoming_buffer->count; i++) - { - char *dump = gpr_dump_slice (tcp->incoming_buffer->slices[i], - GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log (GPR_DEBUG, "READ %p: %s", tcp, dump); - gpr_free (dump); - } + if (grpc_tcp_trace) { + size_t i; + gpr_log(GPR_DEBUG, "read: success=%d", success); + for (i = 0; i < tcp->incoming_buffer->count; i++) { + char *dump = gpr_dump_slice(tcp->incoming_buffer->slices[i], + GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log(GPR_DEBUG, "READ %p: %s", tcp, dump); + gpr_free(dump); } + } tcp->read_cb = NULL; tcp->incoming_buffer = NULL; - cb->cb (exec_ctx, cb->cb_arg, success); + cb->cb(exec_ctx, cb->cb_arg, success); } #define MAX_READ_IOVEC 4 -static void -tcp_continue_read (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) -{ +static void tcp_continue_read(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { struct msghdr msg; struct iovec iov[MAX_READ_IOVEC]; ssize_t read_bytes; size_t i; - GPR_ASSERT (!tcp->finished_edge); - GPR_ASSERT (tcp->iov_size <= MAX_READ_IOVEC); - GPR_ASSERT (tcp->incoming_buffer->count <= MAX_READ_IOVEC); - GRPC_TIMER_BEGIN (GRPC_PTAG_HANDLE_READ, 0); + GPR_ASSERT(!tcp->finished_edge); + GPR_ASSERT(tcp->iov_size <= MAX_READ_IOVEC); + GPR_ASSERT(tcp->incoming_buffer->count <= MAX_READ_IOVEC); + GRPC_TIMER_BEGIN(GRPC_PTAG_HANDLE_READ, 0); - while (tcp->incoming_buffer->count < (size_t) tcp->iov_size) - { - gpr_slice_buffer_add_indexed (tcp->incoming_buffer, gpr_slice_malloc (tcp->slice_size)); - } - for (i = 0; i < tcp->incoming_buffer->count; i++) - { - iov[i].iov_base = GPR_SLICE_START_PTR (tcp->incoming_buffer->slices[i]); - iov[i].iov_len = GPR_SLICE_LENGTH (tcp->incoming_buffer->slices[i]); - } + while (tcp->incoming_buffer->count < (size_t)tcp->iov_size) { + gpr_slice_buffer_add_indexed(tcp->incoming_buffer, + gpr_slice_malloc(tcp->slice_size)); + } + for (i = 0; i < tcp->incoming_buffer->count; i++) { + iov[i].iov_base = GPR_SLICE_START_PTR(tcp->incoming_buffer->slices[i]); + iov[i].iov_len = GPR_SLICE_LENGTH(tcp->incoming_buffer->slices[i]); + } msg.msg_name = NULL; msg.msg_namelen = 0; @@ -215,106 +195,83 @@ tcp_continue_read (grpc_exec_ctx * exec_ctx, grpc_tcp * tcp) msg.msg_controllen = 0; msg.msg_flags = 0; - GRPC_TIMER_BEGIN (GRPC_PTAG_RECVMSG, 0); - do - { - read_bytes = recvmsg (tcp->fd, &msg, 0); - } - while (read_bytes < 0 && errno == EINTR); - GRPC_TIMER_END (GRPC_PTAG_RECVMSG, 0); - - if (read_bytes < 0) - { - /* NB: After calling call_read_cb a parallel call of the read handler may - * be running. */ - if (errno == EAGAIN) - { - if (tcp->iov_size > 1) - { - tcp->iov_size /= 2; - } - /* We've consumed the edge, request a new one */ - grpc_fd_notify_on_read (exec_ctx, tcp->em_fd, &tcp->read_closure); - } - else - { - /* TODO(klempner): Log interesting errors */ - gpr_slice_buffer_reset_and_unref (tcp->incoming_buffer); - call_read_cb (exec_ctx, tcp, 0); - TCP_UNREF (exec_ctx, tcp, "read"); - } - } - else if (read_bytes == 0) - { - /* 0 read size ==> end of stream */ - gpr_slice_buffer_reset_and_unref (tcp->incoming_buffer); - call_read_cb (exec_ctx, tcp, 0); - TCP_UNREF (exec_ctx, tcp, "read"); + GRPC_TIMER_BEGIN(GRPC_PTAG_RECVMSG, 0); + do { + read_bytes = recvmsg(tcp->fd, &msg, 0); + } while (read_bytes < 0 && errno == EINTR); + GRPC_TIMER_END(GRPC_PTAG_RECVMSG, 0); + + if (read_bytes < 0) { + /* NB: After calling call_read_cb a parallel call of the read handler may + * be running. */ + if (errno == EAGAIN) { + if (tcp->iov_size > 1) { + tcp->iov_size /= 2; + } + /* We've consumed the edge, request a new one */ + grpc_fd_notify_on_read(exec_ctx, tcp->em_fd, &tcp->read_closure); + } else { + /* TODO(klempner): Log interesting errors */ + gpr_slice_buffer_reset_and_unref(tcp->incoming_buffer); + call_read_cb(exec_ctx, tcp, 0); + TCP_UNREF(exec_ctx, tcp, "read"); } - else - { - GPR_ASSERT ((size_t) read_bytes <= tcp->incoming_buffer->length); - if ((size_t) read_bytes < tcp->incoming_buffer->length) - { - gpr_slice_buffer_trim_end (tcp->incoming_buffer, tcp->incoming_buffer->length - (size_t) read_bytes); - } - else if (tcp->iov_size < MAX_READ_IOVEC) - { - ++tcp->iov_size; - } - GPR_ASSERT ((size_t) read_bytes == tcp->incoming_buffer->length); - call_read_cb (exec_ctx, tcp, 1); - TCP_UNREF (exec_ctx, tcp, "read"); + } else if (read_bytes == 0) { + /* 0 read size ==> end of stream */ + gpr_slice_buffer_reset_and_unref(tcp->incoming_buffer); + call_read_cb(exec_ctx, tcp, 0); + TCP_UNREF(exec_ctx, tcp, "read"); + } else { + GPR_ASSERT((size_t)read_bytes <= tcp->incoming_buffer->length); + if ((size_t)read_bytes < tcp->incoming_buffer->length) { + gpr_slice_buffer_trim_end( + tcp->incoming_buffer, + tcp->incoming_buffer->length - (size_t)read_bytes); + } else if (tcp->iov_size < MAX_READ_IOVEC) { + ++tcp->iov_size; } + GPR_ASSERT((size_t)read_bytes == tcp->incoming_buffer->length); + call_read_cb(exec_ctx, tcp, 1); + TCP_UNREF(exec_ctx, tcp, "read"); + } - GRPC_TIMER_END (GRPC_PTAG_HANDLE_READ, 0); + GRPC_TIMER_END(GRPC_PTAG_HANDLE_READ, 0); } -static void -tcp_handle_read (grpc_exec_ctx * exec_ctx, void *arg /* grpc_tcp */ , int success) -{ - grpc_tcp *tcp = (grpc_tcp *) arg; - GPR_ASSERT (!tcp->finished_edge); - - if (!success) - { - gpr_slice_buffer_reset_and_unref (tcp->incoming_buffer); - call_read_cb (exec_ctx, tcp, 0); - TCP_UNREF (exec_ctx, tcp, "read"); - } - else - { - tcp_continue_read (exec_ctx, tcp); - } +static void tcp_handle_read(grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */, + int success) { + grpc_tcp *tcp = (grpc_tcp *)arg; + GPR_ASSERT(!tcp->finished_edge); + + if (!success) { + gpr_slice_buffer_reset_and_unref(tcp->incoming_buffer); + call_read_cb(exec_ctx, tcp, 0); + TCP_UNREF(exec_ctx, tcp, "read"); + } else { + tcp_continue_read(exec_ctx, tcp); + } } -static void -tcp_read (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * incoming_buffer, grpc_closure * cb) -{ - grpc_tcp *tcp = (grpc_tcp *) ep; - GPR_ASSERT (tcp->read_cb == NULL); +static void tcp_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, + gpr_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; - gpr_slice_buffer_reset_and_unref (incoming_buffer); - TCP_REF (tcp, "read"); - if (tcp->finished_edge) - { - tcp->finished_edge = 0; - grpc_fd_notify_on_read (exec_ctx, tcp->em_fd, &tcp->read_closure); - } - else - { - grpc_exec_ctx_enqueue (exec_ctx, &tcp->read_closure, 1); - } + gpr_slice_buffer_reset_and_unref(incoming_buffer); + TCP_REF(tcp, "read"); + if (tcp->finished_edge) { + tcp->finished_edge = 0; + grpc_fd_notify_on_read(exec_ctx, tcp->em_fd, &tcp->read_closure); + } else { + grpc_exec_ctx_enqueue(exec_ctx, &tcp->read_closure, 1); + } } -typedef enum -{ FLUSH_DONE, FLUSH_PENDING, FLUSH_ERROR } flush_result; +typedef enum { FLUSH_DONE, FLUSH_PENDING, FLUSH_ERROR } flush_result; #define MAX_WRITE_IOVEC 16 -static flush_result -tcp_flush (grpc_tcp * tcp) -{ +static flush_result tcp_flush(grpc_tcp *tcp) { struct msghdr msg; struct iovec iov[MAX_WRITE_IOVEC]; msg_iovlen_type iov_size; @@ -324,189 +281,168 @@ tcp_flush (grpc_tcp * tcp) size_t unwind_slice_idx; size_t unwind_byte_idx; - for (;;) - { - sending_length = 0; - unwind_slice_idx = tcp->outgoing_slice_idx; - unwind_byte_idx = tcp->outgoing_byte_idx; - for (iov_size = 0; tcp->outgoing_slice_idx != tcp->outgoing_buffer->count && iov_size != MAX_WRITE_IOVEC; iov_size++) - { - iov[iov_size].iov_base = GPR_SLICE_START_PTR (tcp->outgoing_buffer->slices[tcp->outgoing_slice_idx]) + tcp->outgoing_byte_idx; - iov[iov_size].iov_len = GPR_SLICE_LENGTH (tcp->outgoing_buffer->slices[tcp->outgoing_slice_idx]) - tcp->outgoing_byte_idx; - sending_length += iov[iov_size].iov_len; - tcp->outgoing_slice_idx++; - tcp->outgoing_byte_idx = 0; - } - GPR_ASSERT (iov_size > 0); - - msg.msg_name = NULL; - msg.msg_namelen = 0; - msg.msg_iov = iov; - msg.msg_iovlen = iov_size; - msg.msg_control = NULL; - msg.msg_controllen = 0; - msg.msg_flags = 0; - - GRPC_TIMER_BEGIN (GRPC_PTAG_SENDMSG, 0); - do - { - /* TODO(klempner): Cork if this is a partial write */ - sent_length = sendmsg (tcp->fd, &msg, SENDMSG_FLAGS); - } - while (sent_length < 0 && errno == EINTR); - GRPC_TIMER_END (GRPC_PTAG_SENDMSG, 0); - - if (sent_length < 0) - { - if (errno == EAGAIN) - { - tcp->outgoing_slice_idx = unwind_slice_idx; - tcp->outgoing_byte_idx = unwind_byte_idx; - return FLUSH_PENDING; - } - else - { - /* TODO(klempner): Log some of these */ - return FLUSH_ERROR; - } - } - - GPR_ASSERT (tcp->outgoing_byte_idx == 0); - trailing = sending_length - (size_t) sent_length; - while (trailing > 0) - { - size_t slice_length; - - tcp->outgoing_slice_idx--; - slice_length = GPR_SLICE_LENGTH (tcp->outgoing_buffer->slices[tcp->outgoing_slice_idx]); - if (slice_length > trailing) - { - tcp->outgoing_byte_idx = slice_length - trailing; - break; - } - else - { - trailing -= slice_length; - } - } - - if (tcp->outgoing_slice_idx == tcp->outgoing_buffer->count) - { - return FLUSH_DONE; - } - }; + for (;;) { + sending_length = 0; + unwind_slice_idx = tcp->outgoing_slice_idx; + unwind_byte_idx = tcp->outgoing_byte_idx; + for (iov_size = 0; tcp->outgoing_slice_idx != tcp->outgoing_buffer->count && + iov_size != MAX_WRITE_IOVEC; + iov_size++) { + iov[iov_size].iov_base = + GPR_SLICE_START_PTR( + tcp->outgoing_buffer->slices[tcp->outgoing_slice_idx]) + + tcp->outgoing_byte_idx; + iov[iov_size].iov_len = + GPR_SLICE_LENGTH( + tcp->outgoing_buffer->slices[tcp->outgoing_slice_idx]) - + tcp->outgoing_byte_idx; + sending_length += iov[iov_size].iov_len; + tcp->outgoing_slice_idx++; + tcp->outgoing_byte_idx = 0; + } + GPR_ASSERT(iov_size > 0); + + msg.msg_name = NULL; + msg.msg_namelen = 0; + msg.msg_iov = iov; + msg.msg_iovlen = iov_size; + msg.msg_control = NULL; + msg.msg_controllen = 0; + msg.msg_flags = 0; + + GRPC_TIMER_BEGIN(GRPC_PTAG_SENDMSG, 0); + do { + /* TODO(klempner): Cork if this is a partial write */ + sent_length = sendmsg(tcp->fd, &msg, SENDMSG_FLAGS); + } while (sent_length < 0 && errno == EINTR); + GRPC_TIMER_END(GRPC_PTAG_SENDMSG, 0); + + if (sent_length < 0) { + if (errno == EAGAIN) { + tcp->outgoing_slice_idx = unwind_slice_idx; + tcp->outgoing_byte_idx = unwind_byte_idx; + return FLUSH_PENDING; + } else { + /* TODO(klempner): Log some of these */ + return FLUSH_ERROR; + } + } + + GPR_ASSERT(tcp->outgoing_byte_idx == 0); + trailing = sending_length - (size_t)sent_length; + while (trailing > 0) { + size_t slice_length; + + tcp->outgoing_slice_idx--; + slice_length = GPR_SLICE_LENGTH( + tcp->outgoing_buffer->slices[tcp->outgoing_slice_idx]); + if (slice_length > trailing) { + tcp->outgoing_byte_idx = slice_length - trailing; + break; + } else { + trailing -= slice_length; + } + } + + if (tcp->outgoing_slice_idx == tcp->outgoing_buffer->count) { + return FLUSH_DONE; + } + }; } -static void -tcp_handle_write (grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */ , int success) -{ - grpc_tcp *tcp = (grpc_tcp *) arg; +static void tcp_handle_write(grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */, + int success) { + grpc_tcp *tcp = (grpc_tcp *)arg; flush_result status; grpc_closure *cb; - if (!success) - { - cb = tcp->write_cb; - tcp->write_cb = NULL; - cb->cb (exec_ctx, cb->cb_arg, 0); - TCP_UNREF (exec_ctx, tcp, "write"); - return; - } - - GRPC_TIMER_BEGIN (GRPC_PTAG_TCP_CB_WRITE, 0); - status = tcp_flush (tcp); - if (status == FLUSH_PENDING) - { - grpc_fd_notify_on_write (exec_ctx, tcp->em_fd, &tcp->write_closure); - } - else - { - cb = tcp->write_cb; - tcp->write_cb = NULL; - cb->cb (exec_ctx, cb->cb_arg, status == FLUSH_DONE); - TCP_UNREF (exec_ctx, tcp, "write"); - } - GRPC_TIMER_END (GRPC_PTAG_TCP_CB_WRITE, 0); + if (!success) { + cb = tcp->write_cb; + tcp->write_cb = NULL; + cb->cb(exec_ctx, cb->cb_arg, 0); + TCP_UNREF(exec_ctx, tcp, "write"); + return; + } + + GRPC_TIMER_BEGIN(GRPC_PTAG_TCP_CB_WRITE, 0); + status = tcp_flush(tcp); + if (status == FLUSH_PENDING) { + grpc_fd_notify_on_write(exec_ctx, tcp->em_fd, &tcp->write_closure); + } else { + cb = tcp->write_cb; + tcp->write_cb = NULL; + cb->cb(exec_ctx, cb->cb_arg, status == FLUSH_DONE); + TCP_UNREF(exec_ctx, tcp, "write"); + } + GRPC_TIMER_END(GRPC_PTAG_TCP_CB_WRITE, 0); } -static void -tcp_write (grpc_exec_ctx * exec_ctx, grpc_endpoint * ep, gpr_slice_buffer * buf, grpc_closure * cb) -{ - grpc_tcp *tcp = (grpc_tcp *) ep; +static void tcp_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, + gpr_slice_buffer *buf, grpc_closure *cb) { + grpc_tcp *tcp = (grpc_tcp *)ep; flush_result status; - if (grpc_tcp_trace) - { - size_t i; + if (grpc_tcp_trace) { + size_t i; - for (i = 0; i < buf->count; i++) - { - char *data = gpr_dump_slice (buf->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log (GPR_DEBUG, "WRITE %p: %s", tcp, data); - gpr_free (data); - } + for (i = 0; i < buf->count; i++) { + char *data = + gpr_dump_slice(buf->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log(GPR_DEBUG, "WRITE %p: %s", tcp, data); + gpr_free(data); } + } - GRPC_TIMER_BEGIN (GRPC_PTAG_TCP_WRITE, 0); - GPR_ASSERT (tcp->write_cb == NULL); + GRPC_TIMER_BEGIN(GRPC_PTAG_TCP_WRITE, 0); + GPR_ASSERT(tcp->write_cb == NULL); - if (buf->length == 0) - { - GRPC_TIMER_END (GRPC_PTAG_TCP_WRITE, 0); - grpc_exec_ctx_enqueue (exec_ctx, cb, 1); - return; - } + if (buf->length == 0) { + GRPC_TIMER_END(GRPC_PTAG_TCP_WRITE, 0); + grpc_exec_ctx_enqueue(exec_ctx, cb, 1); + return; + } tcp->outgoing_buffer = buf; tcp->outgoing_slice_idx = 0; tcp->outgoing_byte_idx = 0; - status = tcp_flush (tcp); - if (status == FLUSH_PENDING) - { - TCP_REF (tcp, "write"); - tcp->write_cb = cb; - grpc_fd_notify_on_write (exec_ctx, tcp->em_fd, &tcp->write_closure); - } - else - { - grpc_exec_ctx_enqueue (exec_ctx, cb, status == FLUSH_DONE); - } + status = tcp_flush(tcp); + if (status == FLUSH_PENDING) { + TCP_REF(tcp, "write"); + tcp->write_cb = cb; + grpc_fd_notify_on_write(exec_ctx, tcp->em_fd, &tcp->write_closure); + } else { + grpc_exec_ctx_enqueue(exec_ctx, cb, status == FLUSH_DONE); + } - GRPC_TIMER_END (GRPC_PTAG_TCP_WRITE, 0); + GRPC_TIMER_END(GRPC_PTAG_TCP_WRITE, 0); } -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 (exec_ctx, pollset, tcp->em_fd); +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(exec_ctx, pollset, tcp->em_fd); } -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 (exec_ctx, pollset_set, tcp->em_fd); +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(exec_ctx, pollset_set, tcp->em_fd); } -static char * -tcp_get_peer (grpc_endpoint * ep) -{ - grpc_tcp *tcp = (grpc_tcp *) ep; - return gpr_strdup (tcp->peer_string); +static char *tcp_get_peer(grpc_endpoint *ep) { + grpc_tcp *tcp = (grpc_tcp *)ep; + return gpr_strdup(tcp->peer_string); } static const grpc_endpoint_vtable vtable = { - tcp_read, tcp_write, tcp_add_to_pollset, tcp_add_to_pollset_set, - tcp_shutdown, tcp_destroy, tcp_get_peer -}; - -grpc_endpoint * -grpc_tcp_create (grpc_fd * em_fd, size_t slice_size, const char *peer_string) -{ - grpc_tcp *tcp = (grpc_tcp *) gpr_malloc (sizeof (grpc_tcp)); + tcp_read, tcp_write, tcp_add_to_pollset, tcp_add_to_pollset_set, + tcp_shutdown, tcp_destroy, tcp_get_peer}; + +grpc_endpoint *grpc_tcp_create(grpc_fd *em_fd, size_t slice_size, + const char *peer_string) { + grpc_tcp *tcp = (grpc_tcp *)gpr_malloc(sizeof(grpc_tcp)); tcp->base.vtable = &vtable; - tcp->peer_string = gpr_strdup (peer_string); + tcp->peer_string = gpr_strdup(peer_string); tcp->fd = em_fd->fd; tcp->read_cb = NULL; tcp->write_cb = NULL; @@ -515,7 +451,7 @@ grpc_tcp_create (grpc_fd * em_fd, size_t slice_size, const char *peer_string) tcp->iov_size = 1; tcp->finished_edge = 1; /* paired with unref in grpc_tcp_destroy */ - gpr_ref_init (&tcp->refcount, 1); + gpr_ref_init(&tcp->refcount, 1); tcp->em_fd = em_fd; tcp->read_closure.cb = tcp_handle_read; tcp->read_closure.cb_arg = tcp; diff --git a/src/core/iomgr/tcp_posix.h b/src/core/iomgr/tcp_posix.h index 4f73be4b9de..40b3ae26798 100644 --- a/src/core/iomgr/tcp_posix.h +++ b/src/core/iomgr/tcp_posix.h @@ -53,6 +53,7 @@ extern int 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, size_t read_slice_size, const char *peer_string); +grpc_endpoint *grpc_tcp_create(grpc_fd *fd, size_t read_slice_size, + const char *peer_string); #endif /* GRPC_INTERNAL_CORE_IOMGR_TCP_POSIX_H */ diff --git a/src/core/iomgr/tcp_server.h b/src/core/iomgr/tcp_server.h index ee373a76bf3..882635f6388 100644 --- a/src/core/iomgr/tcp_server.h +++ b/src/core/iomgr/tcp_server.h @@ -40,13 +40,16 @@ typedef struct grpc_tcp_server grpc_tcp_server; /* Called for newly connected TCP connections. */ -typedef void (*grpc_tcp_server_cb) (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * ep); +typedef void (*grpc_tcp_server_cb)(grpc_exec_ctx *exec_ctx, void *arg, + grpc_endpoint *ep); /* Create a server, initially not bound to any ports */ -grpc_tcp_server *grpc_tcp_server_create (void); +grpc_tcp_server *grpc_tcp_server_create(void); /* 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, grpc_tcp_server_cb on_accept_cb, void *cb_arg); +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 port number on success, or negative on failure. @@ -59,15 +62,17 @@ void grpc_tcp_server_start (grpc_exec_ctx * exec_ctx, grpc_tcp_server * server, For raw access to the underlying sockets, see grpc_tcp_server_get_fd(). */ /* TODO(ctiller): deprecate this, and make grpc_tcp_server_add_ports to handle all of the multiple socket port matching logic in one place */ -int grpc_tcp_server_add_port (grpc_tcp_server * s, const void *addr, size_t addr_len); +int grpc_tcp_server_add_port(grpc_tcp_server *s, const void *addr, + size_t addr_len); /* Returns the file descriptor of the Nth listening socket on this server, or -1 if the index is out of bounds. The file descriptor remains owned by the server, and will be cleaned up when grpc_tcp_server_destroy is called. */ -int grpc_tcp_server_get_fd (grpc_tcp_server * s, unsigned index); +int grpc_tcp_server_get_fd(grpc_tcp_server *s, unsigned index); -void grpc_tcp_server_destroy (grpc_exec_ctx * exec_ctx, grpc_tcp_server * server, grpc_closure * closure); +void grpc_tcp_server_destroy(grpc_exec_ctx *exec_ctx, grpc_tcp_server *server, + grpc_closure *closure); #endif /* GRPC_INTERNAL_CORE_IOMGR_TCP_SERVER_H */ diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c index 79e8039c799..a582f4a7c31 100644 --- a/src/core/iomgr/tcp_server_posix.c +++ b/src/core/iomgr/tcp_server_posix.c @@ -74,13 +74,11 @@ static gpr_once s_init_max_accept_queue_size; static int s_max_accept_queue_size; /* one listening port */ -typedef struct -{ +typedef struct { int fd; grpc_fd *emfd; grpc_tcp_server *server; - union - { + union { gpr_uint8 untyped[GRPC_MAX_SOCKADDR_SIZE]; struct sockaddr sockaddr; struct sockaddr_un un; @@ -90,20 +88,16 @@ typedef struct grpc_closure destroyed_closure; } server_port; -static void -unlink_if_unix_domain_socket (const struct sockaddr_un *un) -{ +static void unlink_if_unix_domain_socket(const struct sockaddr_un *un) { struct stat st; - if (stat (un->sun_path, &st) == 0 && (st.st_mode & S_IFMT) == S_IFSOCK) - { - unlink (un->sun_path); - } + if (stat(un->sun_path, &st) == 0 && (st.st_mode & S_IFMT) == S_IFSOCK) { + unlink(un->sun_path); + } } /* the overall server */ -struct grpc_tcp_server -{ +struct grpc_tcp_server { /* Called whenever accept() succeeds on a server port. */ grpc_tcp_server_cb on_accept_cb; void *on_accept_cb_arg; @@ -132,321 +126,279 @@ struct grpc_tcp_server size_t pollset_count; }; -grpc_tcp_server * -grpc_tcp_server_create (void) -{ - grpc_tcp_server *s = gpr_malloc (sizeof (grpc_tcp_server)); - gpr_mu_init (&s->mu); +grpc_tcp_server *grpc_tcp_server_create(void) { + grpc_tcp_server *s = gpr_malloc(sizeof(grpc_tcp_server)); + gpr_mu_init(&s->mu); s->active_ports = 0; s->destroyed_ports = 0; s->shutdown = 0; s->on_accept_cb = NULL; s->on_accept_cb_arg = NULL; - s->ports = gpr_malloc (sizeof (server_port) * INIT_PORT_CAP); + s->ports = gpr_malloc(sizeof(server_port) * INIT_PORT_CAP); s->nports = 0; s->port_capacity = INIT_PORT_CAP; return s; } -static void -finish_shutdown (grpc_exec_ctx * exec_ctx, grpc_tcp_server * s) -{ - grpc_exec_ctx_enqueue (exec_ctx, s->shutdown_complete, 1); +static void finish_shutdown(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { + grpc_exec_ctx_enqueue(exec_ctx, s->shutdown_complete, 1); - gpr_mu_destroy (&s->mu); + gpr_mu_destroy(&s->mu); - gpr_free (s->ports); - gpr_free (s); + gpr_free(s->ports); + gpr_free(s); } -static void -destroyed_port (grpc_exec_ctx * exec_ctx, void *server, int success) -{ +static void destroyed_port(grpc_exec_ctx *exec_ctx, void *server, int success) { grpc_tcp_server *s = server; - gpr_mu_lock (&s->mu); + gpr_mu_lock(&s->mu); s->destroyed_ports++; - if (s->destroyed_ports == s->nports) - { - gpr_mu_unlock (&s->mu); - finish_shutdown (exec_ctx, s); - } - else - { - GPR_ASSERT (s->destroyed_ports < s->nports); - gpr_mu_unlock (&s->mu); - } + if (s->destroyed_ports == s->nports) { + gpr_mu_unlock(&s->mu); + finish_shutdown(exec_ctx, s); + } else { + GPR_ASSERT(s->destroyed_ports < s->nports); + gpr_mu_unlock(&s->mu); + } } /* 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_exec_ctx *exec_ctx, grpc_tcp_server *s) { size_t i; /* delete ALL the things */ - gpr_mu_lock (&s->mu); - - if (!s->shutdown) - { - gpr_mu_unlock (&s->mu); - return; - } - - if (s->nports) - { - for (i = 0; i < s->nports; i++) - { - server_port *sp = &s->ports[i]; - if (sp->addr.sockaddr.sa_family == AF_UNIX) - { - unlink_if_unix_domain_socket (&sp->addr.un); - } - sp->destroyed_closure.cb = destroyed_port; - sp->destroyed_closure.cb_arg = s; - grpc_fd_orphan (exec_ctx, sp->emfd, &sp->destroyed_closure, "tcp_listener_shutdown"); - } - gpr_mu_unlock (&s->mu); - } - else - { - gpr_mu_unlock (&s->mu); - finish_shutdown (exec_ctx, s); + gpr_mu_lock(&s->mu); + + if (!s->shutdown) { + gpr_mu_unlock(&s->mu); + return; + } + + if (s->nports) { + for (i = 0; i < s->nports; i++) { + server_port *sp = &s->ports[i]; + if (sp->addr.sockaddr.sa_family == AF_UNIX) { + unlink_if_unix_domain_socket(&sp->addr.un); + } + sp->destroyed_closure.cb = destroyed_port; + sp->destroyed_closure.cb_arg = s; + grpc_fd_orphan(exec_ctx, sp->emfd, &sp->destroyed_closure, + "tcp_listener_shutdown"); } + gpr_mu_unlock(&s->mu); + } else { + gpr_mu_unlock(&s->mu); + finish_shutdown(exec_ctx, s); + } } -void -grpc_tcp_server_destroy (grpc_exec_ctx * exec_ctx, grpc_tcp_server * s, grpc_closure * closure) -{ +void grpc_tcp_server_destroy(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s, + grpc_closure *closure) { size_t i; - gpr_mu_lock (&s->mu); + gpr_mu_lock(&s->mu); - GPR_ASSERT (!s->shutdown); + GPR_ASSERT(!s->shutdown); s->shutdown = 1; s->shutdown_complete = closure; /* shutdown all fd's */ - if (s->active_ports) - { - for (i = 0; i < s->nports; i++) - { - grpc_fd_shutdown (exec_ctx, s->ports[i].emfd); - } - gpr_mu_unlock (&s->mu); - } - else - { - gpr_mu_unlock (&s->mu); - deactivated_all_ports (exec_ctx, s); + if (s->active_ports) { + for (i = 0; i < s->nports; i++) { + grpc_fd_shutdown(exec_ctx, s->ports[i].emfd); } + gpr_mu_unlock(&s->mu); + } else { + gpr_mu_unlock(&s->mu); + deactivated_all_ports(exec_ctx, s); + } } /* get max listen queue size on linux */ -static void -init_max_accept_queue_size (void) -{ +static void init_max_accept_queue_size(void) { int n = SOMAXCONN; char buf[64]; - FILE *fp = fopen ("/proc/sys/net/core/somaxconn", "r"); - if (fp == NULL) - { - /* 2.4 kernel. */ - s_max_accept_queue_size = SOMAXCONN; - return; + FILE *fp = fopen("/proc/sys/net/core/somaxconn", "r"); + if (fp == NULL) { + /* 2.4 kernel. */ + s_max_accept_queue_size = SOMAXCONN; + return; + } + if (fgets(buf, sizeof buf, fp)) { + char *end; + long i = strtol(buf, &end, 10); + if (i > 0 && i <= INT_MAX && end && *end == 0) { + n = (int)i; } - if (fgets (buf, sizeof buf, fp)) - { - char *end; - long i = strtol (buf, &end, 10); - if (i > 0 && i <= INT_MAX && end && *end == 0) - { - n = (int) i; - } - } - fclose (fp); + } + fclose(fp); s_max_accept_queue_size = n; - if (s_max_accept_queue_size < MIN_SAFE_ACCEPT_QUEUE_SIZE) - { - gpr_log (GPR_INFO, "Suspiciously small accept queue (%d) will probably lead to " "connection drops", s_max_accept_queue_size); - } + if (s_max_accept_queue_size < MIN_SAFE_ACCEPT_QUEUE_SIZE) { + gpr_log(GPR_INFO, + "Suspiciously small accept queue (%d) will probably lead to " + "connection drops", + s_max_accept_queue_size); + } } -static int -get_max_accept_queue_size (void) -{ - gpr_once_init (&s_init_max_accept_queue_size, init_max_accept_queue_size); +static int get_max_accept_queue_size(void) { + gpr_once_init(&s_init_max_accept_queue_size, init_max_accept_queue_size); return s_max_accept_queue_size; } /* Prepare a recently-created socket for listening. */ -static int -prepare_socket (int fd, const struct sockaddr *addr, size_t addr_len) -{ +static int prepare_socket(int fd, const struct sockaddr *addr, + size_t addr_len) { struct sockaddr_storage sockname_temp; socklen_t sockname_len; - if (fd < 0) - { - goto error; - } - - if (!grpc_set_socket_nonblocking (fd, 1) || !grpc_set_socket_cloexec (fd, 1) || (addr->sa_family != AF_UNIX && (!grpc_set_socket_low_latency (fd, 1) || !grpc_set_socket_reuse_addr (fd, 1))) || !grpc_set_socket_no_sigpipe_if_possible (fd)) - { - gpr_log (GPR_ERROR, "Unable to configure socket %d: %s", fd, strerror (errno)); - goto error; - } - - GPR_ASSERT (addr_len < ~(socklen_t) 0); - if (bind (fd, addr, (socklen_t) addr_len) < 0) - { - char *addr_str; - grpc_sockaddr_to_string (&addr_str, addr, 0); - gpr_log (GPR_ERROR, "bind addr=%s: %s", addr_str, strerror (errno)); - gpr_free (addr_str); - goto error; - } - - if (listen (fd, get_max_accept_queue_size ()) < 0) - { - gpr_log (GPR_ERROR, "listen: %s", strerror (errno)); - goto error; - } - - sockname_len = sizeof (sockname_temp); - if (getsockname (fd, (struct sockaddr *) &sockname_temp, &sockname_len) < 0) - { - goto error; - } - - return grpc_sockaddr_get_port ((struct sockaddr *) &sockname_temp); + if (fd < 0) { + goto error; + } + + if (!grpc_set_socket_nonblocking(fd, 1) || !grpc_set_socket_cloexec(fd, 1) || + (addr->sa_family != AF_UNIX && (!grpc_set_socket_low_latency(fd, 1) || + !grpc_set_socket_reuse_addr(fd, 1))) || + !grpc_set_socket_no_sigpipe_if_possible(fd)) { + gpr_log(GPR_ERROR, "Unable to configure socket %d: %s", fd, + strerror(errno)); + goto error; + } + + GPR_ASSERT(addr_len < ~(socklen_t)0); + if (bind(fd, addr, (socklen_t)addr_len) < 0) { + char *addr_str; + grpc_sockaddr_to_string(&addr_str, addr, 0); + gpr_log(GPR_ERROR, "bind addr=%s: %s", addr_str, strerror(errno)); + gpr_free(addr_str); + goto error; + } + + if (listen(fd, get_max_accept_queue_size()) < 0) { + gpr_log(GPR_ERROR, "listen: %s", strerror(errno)); + goto error; + } + + sockname_len = sizeof(sockname_temp); + if (getsockname(fd, (struct sockaddr *)&sockname_temp, &sockname_len) < 0) { + goto error; + } + + return grpc_sockaddr_get_port((struct sockaddr *)&sockname_temp); error: - if (fd >= 0) - { - close (fd); - } + if (fd >= 0) { + close(fd); + } return -1; } /* event manager callback when reads are ready */ -static void -on_read (grpc_exec_ctx * exec_ctx, void *arg, int success) -{ +static void on_read(grpc_exec_ctx *exec_ctx, void *arg, int success) { server_port *sp = arg; grpc_fd *fdobj; size_t i; - if (!success) - { - goto error; - } + if (!success) { + goto error; + } /* loop until accept4 returns EAGAIN, and then re-arm notification */ - for (;;) - { - struct sockaddr_storage addr; - socklen_t addrlen = sizeof (addr); - char *addr_str; - char *name; - /* Note: If we ever decide to return this address to the user, remember to - strip off the ::ffff:0.0.0.0/96 prefix first. */ - int fd = grpc_accept4 (sp->fd, (struct sockaddr *) &addr, &addrlen, 1, 1); - if (fd < 0) - { - switch (errno) - { - case EINTR: - continue; - case EAGAIN: - grpc_fd_notify_on_read (exec_ctx, sp->emfd, &sp->read_closure); - return; - default: - gpr_log (GPR_ERROR, "Failed accept4: %s", strerror (errno)); - goto error; - } - } - - grpc_set_socket_no_sigpipe_if_possible (fd); - - addr_str = grpc_sockaddr_to_uri ((struct sockaddr *) &addr); - gpr_asprintf (&name, "tcp-server-connection:%s", addr_str); - - if (grpc_tcp_trace) - { - gpr_log (GPR_DEBUG, "SERVER_CONNECT: incoming connection: %s", addr_str); - } - - fdobj = grpc_fd_create (fd, name); - /* TODO(ctiller): revise this when we have server-side sharding - of channels -- we certainly should not be automatically adding every - incoming channel to every pollset owned by the server */ - for (i = 0; i < sp->server->pollset_count; i++) - { - grpc_pollset_add_fd (exec_ctx, sp->server->pollsets[i], fdobj); - } - sp->server->on_accept_cb (exec_ctx, sp->server->on_accept_cb_arg, grpc_tcp_create (fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str)); - - gpr_free (name); - gpr_free (addr_str); + for (;;) { + struct sockaddr_storage addr; + socklen_t addrlen = sizeof(addr); + char *addr_str; + char *name; + /* Note: If we ever decide to return this address to the user, remember to + strip off the ::ffff:0.0.0.0/96 prefix first. */ + int fd = grpc_accept4(sp->fd, (struct sockaddr *)&addr, &addrlen, 1, 1); + if (fd < 0) { + switch (errno) { + case EINTR: + continue; + case EAGAIN: + grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); + return; + default: + gpr_log(GPR_ERROR, "Failed accept4: %s", strerror(errno)); + goto error; + } } - abort (); + grpc_set_socket_no_sigpipe_if_possible(fd); -error: - gpr_mu_lock (&sp->server->mu); - if (0 == --sp->server->active_ports) - { - gpr_mu_unlock (&sp->server->mu); - deactivated_all_ports (exec_ctx, sp->server); + addr_str = grpc_sockaddr_to_uri((struct sockaddr *)&addr); + gpr_asprintf(&name, "tcp-server-connection:%s", addr_str); + + if (grpc_tcp_trace) { + gpr_log(GPR_DEBUG, "SERVER_CONNECT: incoming connection: %s", addr_str); } - else - { - gpr_mu_unlock (&sp->server->mu); + + fdobj = grpc_fd_create(fd, name); + /* TODO(ctiller): revise this when we have server-side sharding + of channels -- we certainly should not be automatically adding every + incoming channel to every pollset owned by the server */ + for (i = 0; i < sp->server->pollset_count; i++) { + grpc_pollset_add_fd(exec_ctx, sp->server->pollsets[i], fdobj); } + sp->server->on_accept_cb( + exec_ctx, sp->server->on_accept_cb_arg, + grpc_tcp_create(fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str)); + + gpr_free(name); + gpr_free(addr_str); + } + + abort(); + +error: + gpr_mu_lock(&sp->server->mu); + if (0 == --sp->server->active_ports) { + gpr_mu_unlock(&sp->server->mu); + deactivated_all_ports(exec_ctx, sp->server); + } else { + gpr_mu_unlock(&sp->server->mu); + } } -static int -add_socket_to_server (grpc_tcp_server * s, int fd, const struct sockaddr *addr, size_t addr_len) -{ +static int add_socket_to_server(grpc_tcp_server *s, int fd, + const struct sockaddr *addr, size_t addr_len) { server_port *sp; int port; char *addr_str; char *name; - port = prepare_socket (fd, addr, addr_len); - if (port >= 0) - { - grpc_sockaddr_to_string (&addr_str, (struct sockaddr *) &addr, 1); - gpr_asprintf (&name, "tcp-server-listener:%s", addr_str); - gpr_mu_lock (&s->mu); - GPR_ASSERT (!s->on_accept_cb && "must add ports before starting server"); - /* append it to the list under a lock */ - if (s->nports == s->port_capacity) - { - s->port_capacity *= 2; - s->ports = gpr_realloc (s->ports, sizeof (server_port) * s->port_capacity); - } - sp = &s->ports[s->nports++]; - sp->server = s; - sp->fd = fd; - sp->emfd = grpc_fd_create (fd, name); - memcpy (sp->addr.untyped, addr, addr_len); - sp->addr_len = addr_len; - GPR_ASSERT (sp->emfd); - gpr_mu_unlock (&s->mu); - gpr_free (addr_str); - gpr_free (name); + port = prepare_socket(fd, addr, addr_len); + if (port >= 0) { + grpc_sockaddr_to_string(&addr_str, (struct sockaddr *)&addr, 1); + gpr_asprintf(&name, "tcp-server-listener:%s", addr_str); + gpr_mu_lock(&s->mu); + GPR_ASSERT(!s->on_accept_cb && "must add ports before starting server"); + /* append it to the list under a lock */ + if (s->nports == s->port_capacity) { + s->port_capacity *= 2; + s->ports = gpr_realloc(s->ports, sizeof(server_port) * s->port_capacity); } + sp = &s->ports[s->nports++]; + sp->server = s; + sp->fd = fd; + sp->emfd = grpc_fd_create(fd, name); + memcpy(sp->addr.untyped, addr, addr_len); + sp->addr_len = addr_len; + GPR_ASSERT(sp->emfd); + gpr_mu_unlock(&s->mu); + gpr_free(addr_str); + gpr_free(name); + } return port; } -int -grpc_tcp_server_add_port (grpc_tcp_server * s, const void *addr, size_t addr_len) -{ +int grpc_tcp_server_add_port(grpc_tcp_server *s, const void *addr, + size_t addr_len) { int allocated_port1 = -1; int allocated_port2 = -1; unsigned i; @@ -461,110 +413,99 @@ grpc_tcp_server_add_port (grpc_tcp_server * s, const void *addr, size_t addr_len socklen_t sockname_len; int port; - if (((struct sockaddr *) addr)->sa_family == AF_UNIX) - { - unlink_if_unix_domain_socket (addr); - } + if (((struct sockaddr *)addr)->sa_family == AF_UNIX) { + unlink_if_unix_domain_socket(addr); + } /* Check if this is a wildcard port, and if so, try to keep the port the same as some previously created listener. */ - if (grpc_sockaddr_get_port (addr) == 0) - { - for (i = 0; i < s->nports; i++) - { - sockname_len = sizeof (sockname_temp); - if (0 == getsockname (s->ports[i].fd, (struct sockaddr *) &sockname_temp, &sockname_len)) - { - port = grpc_sockaddr_get_port ((struct sockaddr *) &sockname_temp); - if (port > 0) - { - allocated_addr = malloc (addr_len); - memcpy (allocated_addr, addr, addr_len); - grpc_sockaddr_set_port (allocated_addr, port); - addr = allocated_addr; - break; - } - } - } + if (grpc_sockaddr_get_port(addr) == 0) { + for (i = 0; i < s->nports; i++) { + sockname_len = sizeof(sockname_temp); + if (0 == getsockname(s->ports[i].fd, (struct sockaddr *)&sockname_temp, + &sockname_len)) { + port = grpc_sockaddr_get_port((struct sockaddr *)&sockname_temp); + if (port > 0) { + allocated_addr = malloc(addr_len); + memcpy(allocated_addr, addr, addr_len); + grpc_sockaddr_set_port(allocated_addr, port); + addr = allocated_addr; + break; + } + } } + } - if (grpc_sockaddr_to_v4mapped (addr, &addr6_v4mapped)) - { - addr = (const struct sockaddr *) &addr6_v4mapped; - addr_len = sizeof (addr6_v4mapped); - } + if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) { + addr = (const struct sockaddr *)&addr6_v4mapped; + addr_len = sizeof(addr6_v4mapped); + } /* Treat :: or 0.0.0.0 as a family-agnostic wildcard. */ - if (grpc_sockaddr_is_wildcard (addr, &port)) - { - grpc_sockaddr_make_wildcards (port, &wild4, &wild6); - - /* Try listening on IPv6 first. */ - addr = (struct sockaddr *) &wild6; - addr_len = sizeof (wild6); - fd = grpc_create_dualstack_socket (addr, SOCK_STREAM, 0, &dsmode); - allocated_port1 = add_socket_to_server (s, fd, addr, addr_len); - if (fd >= 0 && dsmode == GRPC_DSMODE_DUALSTACK) - { - goto done; - } - - /* If we didn't get a dualstack socket, also listen on 0.0.0.0. */ - if (port == 0 && allocated_port1 > 0) - { - grpc_sockaddr_set_port ((struct sockaddr *) &wild4, allocated_port1); - } - addr = (struct sockaddr *) &wild4; - addr_len = sizeof (wild4); + if (grpc_sockaddr_is_wildcard(addr, &port)) { + grpc_sockaddr_make_wildcards(port, &wild4, &wild6); + + /* Try listening on IPv6 first. */ + addr = (struct sockaddr *)&wild6; + addr_len = sizeof(wild6); + fd = grpc_create_dualstack_socket(addr, SOCK_STREAM, 0, &dsmode); + allocated_port1 = add_socket_to_server(s, fd, addr, addr_len); + if (fd >= 0 && dsmode == GRPC_DSMODE_DUALSTACK) { + goto done; } - fd = grpc_create_dualstack_socket (addr, SOCK_STREAM, 0, &dsmode); - if (fd < 0) - { - gpr_log (GPR_ERROR, "Unable to create socket: %s", strerror (errno)); - } - if (dsmode == GRPC_DSMODE_IPV4 && grpc_sockaddr_is_v4mapped (addr, &addr4_copy)) - { - addr = (struct sockaddr *) &addr4_copy; - addr_len = sizeof (addr4_copy); + /* If we didn't get a dualstack socket, also listen on 0.0.0.0. */ + if (port == 0 && allocated_port1 > 0) { + grpc_sockaddr_set_port((struct sockaddr *)&wild4, allocated_port1); } - allocated_port2 = add_socket_to_server (s, fd, addr, addr_len); + addr = (struct sockaddr *)&wild4; + addr_len = sizeof(wild4); + } + + fd = grpc_create_dualstack_socket(addr, SOCK_STREAM, 0, &dsmode); + if (fd < 0) { + gpr_log(GPR_ERROR, "Unable to create socket: %s", strerror(errno)); + } + if (dsmode == GRPC_DSMODE_IPV4 && + grpc_sockaddr_is_v4mapped(addr, &addr4_copy)) { + addr = (struct sockaddr *)&addr4_copy; + addr_len = sizeof(addr4_copy); + } + allocated_port2 = add_socket_to_server(s, fd, addr, addr_len); done: - gpr_free (allocated_addr); + gpr_free(allocated_addr); return allocated_port1 >= 0 ? allocated_port1 : allocated_port2; } -int -grpc_tcp_server_get_fd (grpc_tcp_server * s, unsigned index) -{ +int grpc_tcp_server_get_fd(grpc_tcp_server *s, unsigned index) { return (index < s->nports) ? s->ports[index].fd : -1; } -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) -{ +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, j; - GPR_ASSERT (on_accept_cb); - gpr_mu_lock (&s->mu); - GPR_ASSERT (!s->on_accept_cb); - GPR_ASSERT (s->active_ports == 0); + GPR_ASSERT(on_accept_cb); + gpr_mu_lock(&s->mu); + GPR_ASSERT(!s->on_accept_cb); + GPR_ASSERT(s->active_ports == 0); s->on_accept_cb = on_accept_cb; s->on_accept_cb_arg = on_accept_cb_arg; s->pollsets = pollsets; s->pollset_count = pollset_count; - for (i = 0; i < s->nports; i++) - { - for (j = 0; j < pollset_count; j++) - { - grpc_pollset_add_fd (exec_ctx, pollsets[j], s->ports[i].emfd); - } - s->ports[i].read_closure.cb = on_read; - s->ports[i].read_closure.cb_arg = &s->ports[i]; - grpc_fd_notify_on_read (exec_ctx, s->ports[i].emfd, &s->ports[i].read_closure); - s->active_ports++; + for (i = 0; i < s->nports; i++) { + for (j = 0; j < pollset_count; j++) { + grpc_pollset_add_fd(exec_ctx, pollsets[j], s->ports[i].emfd); } - gpr_mu_unlock (&s->mu); + s->ports[i].read_closure.cb = on_read; + s->ports[i].read_closure.cb_arg = &s->ports[i]; + grpc_fd_notify_on_read(exec_ctx, s->ports[i].emfd, + &s->ports[i].read_closure); + s->active_ports++; + } + gpr_mu_unlock(&s->mu); } #endif diff --git a/src/core/iomgr/tcp_server_windows.c b/src/core/iomgr/tcp_server_windows.c index 9d4e0e1531f..be2c0055db5 100644 --- a/src/core/iomgr/tcp_server_windows.c +++ b/src/core/iomgr/tcp_server_windows.c @@ -55,11 +55,10 @@ #define MIN_SAFE_ACCEPT_QUEUE_SIZE 100 /* one listening port */ -typedef struct server_port -{ +typedef struct server_port { /* This seemingly magic number comes from AcceptEx's documentation. each address buffer needs to have at least 16 more bytes at their end. */ - gpr_uint8 addresses[(sizeof (struct sockaddr_in6) + 16) * 2]; + gpr_uint8 addresses[(sizeof(struct sockaddr_in6) + 16) * 2]; /* This will hold the socket for the next accept. */ SOCKET new_socket; /* The listener winsocked. */ @@ -71,8 +70,7 @@ typedef struct server_port } server_port; /* the overall server */ -struct grpc_tcp_server -{ +struct grpc_tcp_server { /* Called whenever accept() succeeds on a server port. */ grpc_tcp_server_cb on_accept_cb; void *on_accept_cb_arg; @@ -88,226 +86,201 @@ struct grpc_tcp_server size_t port_capacity; /* shutdown callback */ - void (*shutdown_complete) (void *); + void (*shutdown_complete)(void *); void *shutdown_complete_arg; }; /* Public function. Allocates the proper data structures to hold a grpc_tcp_server. */ -grpc_tcp_server * -grpc_tcp_server_create (void) -{ - grpc_tcp_server *s = gpr_malloc (sizeof (grpc_tcp_server)); - gpr_mu_init (&s->mu); +grpc_tcp_server *grpc_tcp_server_create(void) { + grpc_tcp_server *s = gpr_malloc(sizeof(grpc_tcp_server)); + gpr_mu_init(&s->mu); s->active_ports = 0; s->on_accept_cb = NULL; s->on_accept_cb_arg = NULL; - s->ports = gpr_malloc (sizeof (server_port) * INIT_PORT_CAP); + s->ports = gpr_malloc(sizeof(server_port) * INIT_PORT_CAP); s->nports = 0; s->port_capacity = INIT_PORT_CAP; s->shutdown_complete = NULL; return s; } -static void -dont_care_about_shutdown_completion (void *arg) -{ -} +static void dont_care_about_shutdown_completion(void *arg) {} -static void -finish_shutdown (grpc_tcp_server * s) -{ +static void finish_shutdown(grpc_tcp_server *s) { size_t i; - s->shutdown_complete (s->shutdown_complete_arg); + s->shutdown_complete(s->shutdown_complete_arg); /* Now that the accepts have been aborted, we can destroy the sockets. The IOCP won't get notified on these, so we can flag them as already closed by the system. */ - for (i = 0; i < s->nports; i++) - { - server_port *sp = &s->ports[i]; - grpc_winsocket_destroy (sp->socket); - } - gpr_free (s->ports); - gpr_free (s); + for (i = 0; i < s->nports; i++) { + server_port *sp = &s->ports[i]; + grpc_winsocket_destroy(sp->socket); + } + gpr_free(s->ports); + gpr_free(s); } /* Public function. Stops and destroys a grpc_tcp_server. */ -void -grpc_tcp_server_destroy (grpc_tcp_server * s, void (*shutdown_complete) (void *shutdown_done_arg), void *shutdown_complete_arg) -{ +void grpc_tcp_server_destroy(grpc_tcp_server *s, + void (*shutdown_complete)(void *shutdown_done_arg), + void *shutdown_complete_arg) { size_t i; int immediately_done = 0; - gpr_mu_lock (&s->mu); + gpr_mu_lock(&s->mu); - s->shutdown_complete = shutdown_complete ? shutdown_complete : dont_care_about_shutdown_completion; + s->shutdown_complete = shutdown_complete + ? shutdown_complete + : dont_care_about_shutdown_completion; s->shutdown_complete_arg = shutdown_complete_arg; /* 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) - { - immediately_done = 1; - } - for (i = 0; i < s->nports; i++) - { - server_port *sp = &s->ports[i]; - sp->shutting_down = 1; - grpc_winsocket_shutdown (sp->socket); - } - gpr_mu_unlock (&s->mu); - - if (immediately_done) - { - finish_shutdown (s); - } + if (s->active_ports == 0) { + immediately_done = 1; + } + for (i = 0; i < s->nports; i++) { + server_port *sp = &s->ports[i]; + sp->shutting_down = 1; + grpc_winsocket_shutdown(sp->socket); + } + gpr_mu_unlock(&s->mu); + + if (immediately_done) { + finish_shutdown(s); + } } /* Prepare (bind) a recently-created socket for listening. */ -static int -prepare_socket (SOCKET sock, const struct sockaddr *addr, int addr_len) -{ +static int prepare_socket(SOCKET sock, const struct sockaddr *addr, + int addr_len) { struct sockaddr_storage sockname_temp; socklen_t sockname_len; - if (sock == INVALID_SOCKET) - goto error; + if (sock == INVALID_SOCKET) goto error; - if (!grpc_tcp_prepare_socket (sock)) - { - char *utf8_message = gpr_format_message (WSAGetLastError ()); - gpr_log (GPR_ERROR, "Unable to prepare socket: %s", utf8_message); - gpr_free (utf8_message); - goto error; - } - - if (bind (sock, addr, addr_len) == SOCKET_ERROR) - { - char *addr_str; - char *utf8_message = gpr_format_message (WSAGetLastError ()); - grpc_sockaddr_to_string (&addr_str, addr, 0); - gpr_log (GPR_ERROR, "bind addr=%s: %s", addr_str, utf8_message); - gpr_free (utf8_message); - gpr_free (addr_str); - goto error; - } - - if (listen (sock, SOMAXCONN) == SOCKET_ERROR) - { - char *utf8_message = gpr_format_message (WSAGetLastError ()); - gpr_log (GPR_ERROR, "listen: %s", utf8_message); - gpr_free (utf8_message); - goto error; - } + if (!grpc_tcp_prepare_socket(sock)) { + char *utf8_message = gpr_format_message(WSAGetLastError()); + gpr_log(GPR_ERROR, "Unable to prepare socket: %s", utf8_message); + gpr_free(utf8_message); + goto error; + } + + if (bind(sock, addr, addr_len) == SOCKET_ERROR) { + char *addr_str; + char *utf8_message = gpr_format_message(WSAGetLastError()); + grpc_sockaddr_to_string(&addr_str, addr, 0); + gpr_log(GPR_ERROR, "bind addr=%s: %s", addr_str, utf8_message); + gpr_free(utf8_message); + gpr_free(addr_str); + goto error; + } - sockname_len = sizeof (sockname_temp); - if (getsockname (sock, (struct sockaddr *) &sockname_temp, &sockname_len) == SOCKET_ERROR) - { - char *utf8_message = gpr_format_message (WSAGetLastError ()); - gpr_log (GPR_ERROR, "getsockname: %s", utf8_message); - gpr_free (utf8_message); - goto error; - } + if (listen(sock, SOMAXCONN) == SOCKET_ERROR) { + char *utf8_message = gpr_format_message(WSAGetLastError()); + gpr_log(GPR_ERROR, "listen: %s", utf8_message); + gpr_free(utf8_message); + goto error; + } + + sockname_len = sizeof(sockname_temp); + if (getsockname(sock, (struct sockaddr *)&sockname_temp, &sockname_len) == + SOCKET_ERROR) { + char *utf8_message = gpr_format_message(WSAGetLastError()); + gpr_log(GPR_ERROR, "getsockname: %s", utf8_message); + gpr_free(utf8_message); + goto error; + } - return grpc_sockaddr_get_port ((struct sockaddr *) &sockname_temp); + return grpc_sockaddr_get_port((struct sockaddr *)&sockname_temp); error: - if (sock != INVALID_SOCKET) - closesocket (sock); + if (sock != INVALID_SOCKET) closesocket(sock); return -1; } -static void -decrement_active_ports_and_notify (server_port * sp) -{ +static void decrement_active_ports_and_notify(server_port *sp) { int notify = 0; sp->shutting_down = 0; - gpr_mu_lock (&sp->server->mu); - GPR_ASSERT (sp->server->active_ports > 0); - if (0 == --sp->server->active_ports && sp->server->shutdown_complete != NULL) - { - notify = 1; - } - gpr_mu_unlock (&sp->server->mu); - if (notify) - { - finish_shutdown (sp->server); - } + gpr_mu_lock(&sp->server->mu); + GPR_ASSERT(sp->server->active_ports > 0); + if (0 == --sp->server->active_ports && + sp->server->shutdown_complete != NULL) { + notify = 1; + } + gpr_mu_unlock(&sp->server->mu); + if (notify) { + finish_shutdown(sp->server); + } } /* start_accept will reference that for the IOCP notification request. */ -static void on_accept (void *arg, int from_iocp); +static void on_accept(void *arg, int from_iocp); /* 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 void -start_accept (server_port * port) -{ +static void start_accept(server_port *port) { SOCKET sock = INVALID_SOCKET; char *message; char *utf8_message; BOOL success; - DWORD addrlen = sizeof (struct sockaddr_in6) + 16; + DWORD addrlen = sizeof(struct sockaddr_in6) + 16; DWORD bytes_received = 0; - sock = WSASocket (AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + sock = WSASocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0, + WSA_FLAG_OVERLAPPED); - if (sock == INVALID_SOCKET) - { - message = "Unable to create socket: %s"; - goto failure; - } + if (sock == INVALID_SOCKET) { + message = "Unable to create socket: %s"; + goto failure; + } - if (!grpc_tcp_prepare_socket (sock)) - { - message = "Unable to prepare socket: %s"; - goto failure; - } + if (!grpc_tcp_prepare_socket(sock)) { + message = "Unable to prepare socket: %s"; + goto failure; + } /* Start the "accept" asynchronously. */ - success = port->AcceptEx (port->socket->socket, sock, port->addresses, 0, addrlen, addrlen, &bytes_received, &port->socket->read_info.overlapped); + success = port->AcceptEx(port->socket->socket, sock, port->addresses, 0, + addrlen, addrlen, &bytes_received, + &port->socket->read_info.overlapped); /* It is possible to get an accept immediately without delay. However, we will still get an IOCP notification for it. So let's just ignore it. */ - if (!success) - { - int error = WSAGetLastError (); - if (error != ERROR_IO_PENDING) - { - message = "AcceptEx failed: %s"; - goto failure; - } + if (!success) { + int error = WSAGetLastError(); + if (error != ERROR_IO_PENDING) { + message = "AcceptEx failed: %s"; + goto failure; } + } /* 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, on_accept, port); + grpc_socket_notify_on_read(port->socket, on_accept, port); return; failure: - if (port->shutting_down) - { - /* We are abandoning the listener port, take that into account to prevent - occasional hangs on shutdown. The hang happens when sp->shutting_down - change is not seen by on_accept and we proceed to trying new accept, - but we fail there because the listening port has been closed in the - meantime. */ - decrement_active_ports_and_notify (port); - return; - } - utf8_message = gpr_format_message (WSAGetLastError ()); - gpr_log (GPR_ERROR, message, utf8_message); - gpr_free (utf8_message); - if (sock != INVALID_SOCKET) - closesocket (sock); + if (port->shutting_down) { + /* We are abandoning the listener port, take that into account to prevent + occasional hangs on shutdown. The hang happens when sp->shutting_down + change is not seen by on_accept and we proceed to trying new accept, + but we fail there because the listening port has been closed in the + meantime. */ + decrement_active_ports_and_notify(port); + return; + } + utf8_message = gpr_format_message(WSAGetLastError()); + gpr_log(GPR_ERROR, message, utf8_message); + gpr_free(utf8_message); + if (sock != INVALID_SOCKET) closesocket(sock); } /* Event manager callback when reads are ready. */ -static void -on_accept (void *arg, int from_iocp) -{ +static void on_accept(void *arg, int from_iocp) { server_port *sp = arg; SOCKET sock = sp->new_socket; grpc_winsocket_callback_info *info = &sp->socket->read_info; @@ -315,7 +288,7 @@ on_accept (void *arg, int from_iocp) struct sockaddr_storage peer_name; char *peer_name_string; char *fd_name; - int peer_name_len = sizeof (peer_name); + int peer_name_len = sizeof(peer_name); DWORD transfered_bytes; DWORD flags; BOOL wsa_success; @@ -324,76 +297,65 @@ on_accept (void *arg, int from_iocp) /* The general mechanism for shutting down is to queue abortion calls. While this is necessary in the read/write case, it's useless for the accept case. We only need to adjust the pending callback count */ - if (!from_iocp) - { - return; - } + if (!from_iocp) { + return; + } /* The IOCP notified us of a completed operation. Let's grab the results, and act accordingly. */ transfered_bytes = 0; - wsa_success = WSAGetOverlappedResult (sock, &info->overlapped, &transfered_bytes, FALSE, &flags); - if (!wsa_success) - { - if (sp->shutting_down) - { - /* During the shutdown case, we ARE expecting an error. So that's well, - and we can wake up the shutdown thread. */ - decrement_active_ports_and_notify (sp); - return; - } - else - { - char *utf8_message = gpr_format_message (WSAGetLastError ()); - gpr_log (GPR_ERROR, "on_accept error: %s", utf8_message); - gpr_free (utf8_message); - closesocket (sock); - } + wsa_success = WSAGetOverlappedResult(sock, &info->overlapped, + &transfered_bytes, FALSE, &flags); + if (!wsa_success) { + if (sp->shutting_down) { + /* During the shutdown case, we ARE expecting an error. So that's well, + and we can wake up the shutdown thread. */ + decrement_active_ports_and_notify(sp); + return; + } else { + char *utf8_message = gpr_format_message(WSAGetLastError()); + gpr_log(GPR_ERROR, "on_accept error: %s", utf8_message); + gpr_free(utf8_message); + closesocket(sock); } - else - { - if (!sp->shutting_down) - { - peer_name_string = NULL; - err = setsockopt (sock, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char *) &sp->socket->socket, sizeof (sp->socket->socket)); - if (err) - { - char *utf8_message = gpr_format_message (WSAGetLastError ()); - gpr_log (GPR_ERROR, "setsockopt error: %s", utf8_message); - gpr_free (utf8_message); - } - err = getpeername (sock, (struct sockaddr *) &peer_name, &peer_name_len); - if (!err) - { - peer_name_string = grpc_sockaddr_to_uri ((struct sockaddr *) &peer_name); - } - else - { - char *utf8_message = gpr_format_message (WSAGetLastError ()); - gpr_log (GPR_ERROR, "getpeername error: %s", utf8_message); - gpr_free (utf8_message); - } - gpr_asprintf (&fd_name, "tcp_server:%s", peer_name_string); - ep = grpc_tcp_create (grpc_winsocket_create (sock, fd_name), peer_name_string); - gpr_free (fd_name); - gpr_free (peer_name_string); - } + } else { + if (!sp->shutting_down) { + peer_name_string = NULL; + err = setsockopt(sock, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, + (char *)&sp->socket->socket, sizeof(sp->socket->socket)); + if (err) { + char *utf8_message = gpr_format_message(WSAGetLastError()); + gpr_log(GPR_ERROR, "setsockopt error: %s", utf8_message); + gpr_free(utf8_message); + } + err = getpeername(sock, (struct sockaddr *)&peer_name, &peer_name_len); + if (!err) { + peer_name_string = grpc_sockaddr_to_uri((struct sockaddr *)&peer_name); + } else { + char *utf8_message = gpr_format_message(WSAGetLastError()); + gpr_log(GPR_ERROR, "getpeername error: %s", utf8_message); + gpr_free(utf8_message); + } + gpr_asprintf(&fd_name, "tcp_server:%s", peer_name_string); + ep = grpc_tcp_create(grpc_winsocket_create(sock, fd_name), + peer_name_string); + gpr_free(fd_name); + gpr_free(peer_name_string); } + } /* The only time we should call our callback, is where we successfully managed to accept a connection, and created an endpoint. */ - if (ep) - sp->server->on_accept_cb (sp->server->on_accept_cb_arg, ep); + if (ep) sp->server->on_accept_cb(sp->server->on_accept_cb_arg, ep); /* 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. */ - start_accept (sp); + start_accept(sp); } -static int -add_socket_to_server (grpc_tcp_server * s, SOCKET sock, const struct sockaddr *addr, int addr_len) -{ +static int add_socket_to_server(grpc_tcp_server *s, SOCKET sock, + const struct sockaddr *addr, int addr_len) { server_port *sp; int port; int status; @@ -401,49 +363,46 @@ add_socket_to_server (grpc_tcp_server * s, SOCKET sock, const struct sockaddr *a DWORD ioctl_num_bytes; LPFN_ACCEPTEX AcceptEx; - if (sock == INVALID_SOCKET) - return -1; + if (sock == INVALID_SOCKET) return -1; /* We need to grab the AcceptEx pointer for that port, as it may be interface-dependent. We'll cache it to avoid doing that again. */ - status = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof (guid), &AcceptEx, sizeof (AcceptEx), &ioctl_num_bytes, NULL, NULL); - - if (status != 0) - { - char *utf8_message = gpr_format_message (WSAGetLastError ()); - gpr_log (GPR_ERROR, "on_connect error: %s", utf8_message); - gpr_free (utf8_message); - closesocket (sock); - return -1; - } - - port = prepare_socket (sock, addr, addr_len); - if (port >= 0) - { - gpr_mu_lock (&s->mu); - GPR_ASSERT (!s->on_accept_cb && "must add ports before starting server"); - /* append it to the list under a lock */ - if (s->nports == s->port_capacity) - { - s->port_capacity *= 2; - s->ports = gpr_realloc (s->ports, sizeof (server_port) * s->port_capacity); - } - sp = &s->ports[s->nports++]; - sp->server = s; - sp->socket = grpc_winsocket_create (sock, "listener"); - sp->shutting_down = 0; - sp->AcceptEx = AcceptEx; - sp->new_socket = INVALID_SOCKET; - GPR_ASSERT (sp->socket); - gpr_mu_unlock (&s->mu); + status = + WSAIoctl(sock, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof(guid), + &AcceptEx, sizeof(AcceptEx), &ioctl_num_bytes, NULL, NULL); + + if (status != 0) { + char *utf8_message = gpr_format_message(WSAGetLastError()); + gpr_log(GPR_ERROR, "on_connect error: %s", utf8_message); + gpr_free(utf8_message); + closesocket(sock); + return -1; + } + + port = prepare_socket(sock, addr, addr_len); + if (port >= 0) { + gpr_mu_lock(&s->mu); + GPR_ASSERT(!s->on_accept_cb && "must add ports before starting server"); + /* append it to the list under a lock */ + if (s->nports == s->port_capacity) { + s->port_capacity *= 2; + s->ports = gpr_realloc(s->ports, sizeof(server_port) * s->port_capacity); } + sp = &s->ports[s->nports++]; + sp->server = s; + sp->socket = grpc_winsocket_create(sock, "listener"); + sp->shutting_down = 0; + sp->AcceptEx = AcceptEx; + sp->new_socket = INVALID_SOCKET; + GPR_ASSERT(sp->socket); + gpr_mu_unlock(&s->mu); + } return port; } -int -grpc_tcp_server_add_port (grpc_tcp_server * s, const void *addr, int addr_len) -{ +int grpc_tcp_server_add_port(grpc_tcp_server *s, const void *addr, + int addr_len) { int allocated_port = -1; unsigned i; SOCKET sock; @@ -456,77 +415,71 @@ grpc_tcp_server_add_port (grpc_tcp_server * s, const void *addr, int addr_len) /* Check if this is a wildcard port, and if so, try to keep the port the same as some previously created listener. */ - if (grpc_sockaddr_get_port (addr) == 0) - { - for (i = 0; i < s->nports; i++) - { - sockname_len = sizeof (sockname_temp); - if (0 == getsockname (s->ports[i].socket->socket, (struct sockaddr *) &sockname_temp, &sockname_len)) - { - port = grpc_sockaddr_get_port ((struct sockaddr *) &sockname_temp); - if (port > 0) - { - allocated_addr = malloc (addr_len); - memcpy (allocated_addr, addr, addr_len); - grpc_sockaddr_set_port (allocated_addr, port); - addr = allocated_addr; - break; - } - } - } + if (grpc_sockaddr_get_port(addr) == 0) { + for (i = 0; i < s->nports; i++) { + sockname_len = sizeof(sockname_temp); + if (0 == getsockname(s->ports[i].socket->socket, + (struct sockaddr *)&sockname_temp, &sockname_len)) { + port = grpc_sockaddr_get_port((struct sockaddr *)&sockname_temp); + if (port > 0) { + allocated_addr = malloc(addr_len); + memcpy(allocated_addr, addr, addr_len); + grpc_sockaddr_set_port(allocated_addr, port); + addr = allocated_addr; + break; + } + } } + } - if (grpc_sockaddr_to_v4mapped (addr, &addr6_v4mapped)) - { - addr = (const struct sockaddr *) &addr6_v4mapped; - addr_len = sizeof (addr6_v4mapped); - } + if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) { + addr = (const struct sockaddr *)&addr6_v4mapped; + addr_len = sizeof(addr6_v4mapped); + } /* Treat :: or 0.0.0.0 as a family-agnostic wildcard. */ - if (grpc_sockaddr_is_wildcard (addr, &port)) - { - grpc_sockaddr_make_wildcard6 (port, &wildcard); + if (grpc_sockaddr_is_wildcard(addr, &port)) { + grpc_sockaddr_make_wildcard6(port, &wildcard); - addr = (struct sockaddr *) &wildcard; - addr_len = sizeof (wildcard); - } + addr = (struct sockaddr *)&wildcard; + addr_len = sizeof(wildcard); + } - sock = WSASocket (AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); - if (sock == INVALID_SOCKET) - { - char *utf8_message = gpr_format_message (WSAGetLastError ()); - gpr_log (GPR_ERROR, "unable to create socket: %s", utf8_message); - gpr_free (utf8_message); - } + sock = WSASocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0, + WSA_FLAG_OVERLAPPED); + if (sock == INVALID_SOCKET) { + char *utf8_message = gpr_format_message(WSAGetLastError()); + gpr_log(GPR_ERROR, "unable to create socket: %s", utf8_message); + gpr_free(utf8_message); + } - allocated_port = add_socket_to_server (s, sock, addr, addr_len); - gpr_free (allocated_addr); + allocated_port = add_socket_to_server(s, sock, addr, addr_len); + gpr_free(allocated_addr); return allocated_port; } SOCKET -grpc_tcp_server_get_socket (grpc_tcp_server * s, unsigned index) -{ +grpc_tcp_server_get_socket(grpc_tcp_server *s, unsigned index) { return (index < s->nports) ? s->ports[index].socket->socket : INVALID_SOCKET; } -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) -{ +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) { size_t i; - GPR_ASSERT (on_accept_cb); - gpr_mu_lock (&s->mu); - GPR_ASSERT (!s->on_accept_cb); - GPR_ASSERT (s->active_ports == 0); + GPR_ASSERT(on_accept_cb); + gpr_mu_lock(&s->mu); + GPR_ASSERT(!s->on_accept_cb); + GPR_ASSERT(s->active_ports == 0); s->on_accept_cb = on_accept_cb; s->on_accept_cb_arg = on_accept_cb_arg; - for (i = 0; i < s->nports; i++) - { - start_accept (s->ports + i); - s->active_ports++; - } - gpr_mu_unlock (&s->mu); + for (i = 0; i < s->nports; i++) { + start_accept(s->ports + i); + s->active_ports++; + } + gpr_mu_unlock(&s->mu); } #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/tcp_windows.c b/src/core/iomgr/tcp_windows.c index 9837b026b13..ab309180eb1 100644 --- a/src/core/iomgr/tcp_windows.c +++ b/src/core/iomgr/tcp_windows.c @@ -51,37 +51,30 @@ #include "src/core/iomgr/socket_windows.h" #include "src/core/iomgr/tcp_client.h" -static int -set_non_block (SOCKET sock) -{ +static int set_non_block(SOCKET sock) { int status; unsigned long param = 1; DWORD ret; - status = WSAIoctl (sock, FIONBIO, ¶m, sizeof (param), NULL, 0, &ret, NULL, NULL); + status = + WSAIoctl(sock, FIONBIO, ¶m, sizeof(param), NULL, 0, &ret, NULL, NULL); return status == 0; } -static int -set_dualstack (SOCKET sock) -{ +static int set_dualstack(SOCKET sock) { int status; unsigned long param = 0; - status = setsockopt (sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char *) ¶m, sizeof (param)); + status = setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)¶m, + sizeof(param)); return status == 0; } -int -grpc_tcp_prepare_socket (SOCKET sock) -{ - if (!set_non_block (sock)) - return 0; - if (!set_dualstack (sock)) - return 0; +int grpc_tcp_prepare_socket(SOCKET sock) { + if (!set_non_block(sock)) return 0; + if (!set_dualstack(sock)) return 0; return 1; } -typedef struct grpc_tcp -{ +typedef struct grpc_tcp { /* This is our C++ class derivation emulation. */ grpc_endpoint base; /* The one socket this endpoint is using. */ @@ -103,58 +96,46 @@ typedef struct grpc_tcp char *peer_string; } grpc_tcp; -static void -tcp_free (grpc_tcp * tcp) -{ - grpc_winsocket_destroy (tcp->socket); - gpr_mu_destroy (&tcp->mu); - gpr_free (tcp->peer_string); - gpr_free (tcp); +static void tcp_free(grpc_tcp *tcp) { + grpc_winsocket_destroy(tcp->socket); + gpr_mu_destroy(&tcp->mu); + gpr_free(tcp->peer_string); + gpr_free(tcp); } /*#define GRPC_TCP_REFCOUNT_DEBUG*/ #ifdef GRPC_TCP_REFCOUNT_DEBUG #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_tcp * tcp, const char *reason, const char *file, int line) -{ - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "TCP unref %p : %s %d -> %d", tcp, reason, tcp->refcount.count, tcp->refcount.count - 1); - if (gpr_unref (&tcp->refcount)) - { - tcp_free (tcp); - } +static void tcp_unref(grpc_tcp *tcp, const char *reason, const char *file, + int line) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "TCP unref %p : %s %d -> %d", tcp, + reason, tcp->refcount.count, tcp->refcount.count - 1); + if (gpr_unref(&tcp->refcount)) { + tcp_free(tcp); + } } -static void -tcp_ref (grpc_tcp * tcp, const char *reason, const char *file, int line) -{ - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "TCP ref %p : %s %d -> %d", tcp, reason, tcp->refcount.count, tcp->refcount.count + 1); - gpr_ref (&tcp->refcount); +static void tcp_ref(grpc_tcp *tcp, const char *reason, const char *file, + int line) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "TCP ref %p : %s %d -> %d", tcp, + reason, tcp->refcount.count, tcp->refcount.count + 1); + gpr_ref(&tcp->refcount); } #else #define TCP_UNREF(tcp, reason) tcp_unref((tcp)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void -tcp_unref (grpc_tcp * tcp) -{ - if (gpr_unref (&tcp->refcount)) - { - tcp_free (tcp); - } +static void tcp_unref(grpc_tcp *tcp) { + if (gpr_unref(&tcp->refcount)) { + tcp_free(tcp); + } } -static void -tcp_ref (grpc_tcp * tcp) -{ - gpr_ref (&tcp->refcount); -} +static void tcp_ref(grpc_tcp *tcp) { gpr_ref(&tcp->refcount); } #endif /* Asynchronous callback from the IOCP, or the background thread. */ -static int -on_read (grpc_tcp * tcp, int success) -{ +static int on_read(grpc_tcp *tcp, int success) { grpc_winsocket *socket = tcp->socket; gpr_slice sub; gpr_slice *slice = NULL; @@ -162,56 +143,45 @@ on_read (grpc_tcp * tcp, int success) grpc_winsocket_callback_info *info = &socket->read_info; int do_abort = 0; - if (success) - { - if (socket->read_info.wsa_error != 0) - { - if (socket->read_info.wsa_error != WSAECONNRESET) - { - char *utf8_message = gpr_format_message (info->wsa_error); - gpr_log (GPR_ERROR, "ReadFile overlapped error: %s", utf8_message); - gpr_free (utf8_message); - } - success = 0; - gpr_slice_unref (tcp->read_slice); - } - else - { - if (info->bytes_transfered != 0) - { - sub = gpr_slice_sub_no_ref (tcp->read_slice, 0, info->bytes_transfered); - gpr_slice_buffer_add (tcp->read_slices, sub); - success = 1; - } - else - { - gpr_slice_unref (tcp->read_slice); - success = 0; - } - } + if (success) { + if (socket->read_info.wsa_error != 0) { + if (socket->read_info.wsa_error != WSAECONNRESET) { + char *utf8_message = gpr_format_message(info->wsa_error); + gpr_log(GPR_ERROR, "ReadFile overlapped error: %s", utf8_message); + gpr_free(utf8_message); + } + success = 0; + gpr_slice_unref(tcp->read_slice); + } else { + if (info->bytes_transfered != 0) { + sub = gpr_slice_sub_no_ref(tcp->read_slice, 0, info->bytes_transfered); + gpr_slice_buffer_add(tcp->read_slices, sub); + success = 1; + } else { + gpr_slice_unref(tcp->read_slice); + success = 0; + } } + } return success; } -static void -on_read_cb (void *tcpp, int from_iocp) -{ +static void on_read_cb(void *tcpp, int from_iocp) { grpc_tcp *tcp = tcpp; grpc_closure *cb = tcp->read_cb; - int success = on_read (tcp, from_iocp); + int success = on_read(tcp, from_iocp); tcp->read_cb = NULL; - TCP_UNREF (tcp, "read"); - if (cb) - { - cb->cb (cb->cb_arg, success); - } + TCP_UNREF(tcp, "read"); + if (cb) { + cb->cb(cb->cb_arg, success); + } } -static grpc_endpoint_op_status -win_read (grpc_endpoint * ep, gpr_slice_buffer * read_slices, grpc_closure * cb) -{ - grpc_tcp *tcp = (grpc_tcp *) ep; +static grpc_endpoint_op_status win_read(grpc_endpoint *ep, + gpr_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; int status; @@ -219,97 +189,88 @@ win_read (grpc_endpoint * ep, gpr_slice_buffer * read_slices, grpc_closure * cb) DWORD flags = 0; WSABUF buffer; - if (tcp->shutting_down) - { - return GRPC_ENDPOINT_ERROR; - } + if (tcp->shutting_down) { + return GRPC_ENDPOINT_ERROR; + } tcp->read_cb = cb; tcp->read_slices = read_slices; - gpr_slice_buffer_reset_and_unref (read_slices); + gpr_slice_buffer_reset_and_unref(read_slices); - tcp->read_slice = gpr_slice_malloc (8192); + tcp->read_slice = gpr_slice_malloc(8192); - buffer.len = GPR_SLICE_LENGTH (tcp->read_slice); - buffer.buf = (char *) GPR_SLICE_START_PTR (tcp->read_slice); + buffer.len = GPR_SLICE_LENGTH(tcp->read_slice); + buffer.buf = (char *)GPR_SLICE_START_PTR(tcp->read_slice); /* First let's try a synchronous, non-blocking read. */ - status = WSARecv (tcp->socket->socket, &buffer, 1, &bytes_read, &flags, NULL, NULL); - info->wsa_error = status == 0 ? 0 : WSAGetLastError (); + status = + WSARecv(tcp->socket->socket, &buffer, 1, &bytes_read, &flags, NULL, NULL); + info->wsa_error = status == 0 ? 0 : WSAGetLastError(); /* Did we get data immediately ? Yay. */ - if (info->wsa_error != WSAEWOULDBLOCK) - { - int ok; - info->bytes_transfered = bytes_read; - ok = on_read (tcp, 1); - return ok ? GRPC_ENDPOINT_DONE : GRPC_ENDPOINT_ERROR; - } + if (info->wsa_error != WSAEWOULDBLOCK) { + int ok; + info->bytes_transfered = bytes_read; + ok = on_read(tcp, 1); + return ok ? GRPC_ENDPOINT_DONE : GRPC_ENDPOINT_ERROR; + } - TCP_REF (tcp, "read"); + TCP_REF(tcp, "read"); /* Otherwise, let's retry, by queuing a read. */ - memset (&tcp->socket->read_info.overlapped, 0, sizeof (OVERLAPPED)); - status = WSARecv (tcp->socket->socket, &buffer, 1, &bytes_read, &flags, &info->overlapped, NULL); - - if (status != 0) - { - int wsa_error = WSAGetLastError (); - if (wsa_error != WSA_IO_PENDING) - { - int ok; - info->wsa_error = wsa_error; - ok = on_read (tcp, 1); - return ok ? GRPC_ENDPOINT_DONE : GRPC_ENDPOINT_ERROR; - } + memset(&tcp->socket->read_info.overlapped, 0, sizeof(OVERLAPPED)); + status = WSARecv(tcp->socket->socket, &buffer, 1, &bytes_read, &flags, + &info->overlapped, NULL); + + if (status != 0) { + int wsa_error = WSAGetLastError(); + if (wsa_error != WSA_IO_PENDING) { + int ok; + info->wsa_error = wsa_error; + ok = on_read(tcp, 1); + return ok ? GRPC_ENDPOINT_DONE : GRPC_ENDPOINT_ERROR; } + } - grpc_socket_notify_on_read (tcp->socket, on_read_cb, tcp); + grpc_socket_notify_on_read(tcp->socket, on_read_cb, tcp); return GRPC_ENDPOINT_PENDING; } /* Asynchronous callback from the IOCP, or the background thread. */ -static void -on_write (void *tcpp, int success) -{ - grpc_tcp *tcp = (grpc_tcp *) tcpp; +static void on_write(void *tcpp, int success) { + grpc_tcp *tcp = (grpc_tcp *)tcpp; grpc_winsocket *handle = tcp->socket; grpc_winsocket_callback_info *info = &handle->write_info; grpc_closure *cb; int do_abort = 0; - gpr_mu_lock (&tcp->mu); + gpr_mu_lock(&tcp->mu); cb = tcp->write_cb; tcp->write_cb = NULL; - gpr_mu_unlock (&tcp->mu); - - if (success) - { - if (info->wsa_error != 0) - { - if (info->wsa_error != WSAECONNRESET) - { - char *utf8_message = gpr_format_message (info->wsa_error); - gpr_log (GPR_ERROR, "WSASend overlapped error: %s", utf8_message); - gpr_free (utf8_message); - } - success = 0; - } - else - { - GPR_ASSERT (info->bytes_transfered == tcp->write_slices->length); - } + gpr_mu_unlock(&tcp->mu); + + if (success) { + if (info->wsa_error != 0) { + if (info->wsa_error != WSAECONNRESET) { + char *utf8_message = gpr_format_message(info->wsa_error); + gpr_log(GPR_ERROR, "WSASend overlapped error: %s", utf8_message); + gpr_free(utf8_message); + } + success = 0; + } else { + GPR_ASSERT(info->bytes_transfered == tcp->write_slices->length); } + } - TCP_UNREF (tcp, "write"); - cb->cb (cb->cb_arg, success); + TCP_UNREF(tcp, "write"); + cb->cb(cb->cb_arg, success); } /* Initiates a write. */ -static grpc_endpoint_op_status -win_write (grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb) -{ - grpc_tcp *tcp = (grpc_tcp *) ep; +static grpc_endpoint_op_status win_write(grpc_endpoint *ep, + gpr_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; unsigned i; @@ -319,96 +280,82 @@ win_write (grpc_endpoint * ep, gpr_slice_buffer * slices, grpc_closure * cb) WSABUF *allocated = NULL; WSABUF *buffers = local_buffers; - if (tcp->shutting_down) - { - return GRPC_ENDPOINT_ERROR; - } + if (tcp->shutting_down) { + return GRPC_ENDPOINT_ERROR; + } tcp->write_cb = cb; tcp->write_slices = slices; - if (tcp->write_slices->count > GPR_ARRAY_SIZE (local_buffers)) - { - buffers = (WSABUF *) gpr_malloc (sizeof (WSABUF) * tcp->write_slices->count); - allocated = buffers; - } + if (tcp->write_slices->count > GPR_ARRAY_SIZE(local_buffers)) { + buffers = (WSABUF *)gpr_malloc(sizeof(WSABUF) * tcp->write_slices->count); + allocated = buffers; + } - for (i = 0; i < tcp->write_slices->count; i++) - { - buffers[i].len = GPR_SLICE_LENGTH (tcp->write_slices->slices[i]); - buffers[i].buf = (char *) GPR_SLICE_START_PTR (tcp->write_slices->slices[i]); - } + for (i = 0; i < tcp->write_slices->count; i++) { + buffers[i].len = GPR_SLICE_LENGTH(tcp->write_slices->slices[i]); + buffers[i].buf = (char *)GPR_SLICE_START_PTR(tcp->write_slices->slices[i]); + } /* First, let's try a synchronous, non-blocking write. */ - status = WSASend (socket->socket, buffers, tcp->write_slices->count, &bytes_sent, 0, NULL, NULL); - info->wsa_error = status == 0 ? 0 : WSAGetLastError (); + status = WSASend(socket->socket, buffers, tcp->write_slices->count, + &bytes_sent, 0, NULL, NULL); + info->wsa_error = status == 0 ? 0 : WSAGetLastError(); /* We would kind of expect to get a WSAEWOULDBLOCK here, especially on a busy connection that has its send queue filled up. But if we don't, then we can avoid doing an async write operation at all. */ - if (info->wsa_error != WSAEWOULDBLOCK) - { - grpc_endpoint_op_status ret = GRPC_ENDPOINT_ERROR; - if (status == 0) - { - ret = GRPC_ENDPOINT_DONE; - GPR_ASSERT (bytes_sent == tcp->write_slices->length); - } - else - { - if (socket->read_info.wsa_error != WSAECONNRESET) - { - char *utf8_message = gpr_format_message (info->wsa_error); - gpr_log (GPR_ERROR, "WSASend error: %s", utf8_message); - gpr_free (utf8_message); - } - } - if (allocated) - gpr_free (allocated); - return ret; + if (info->wsa_error != WSAEWOULDBLOCK) { + grpc_endpoint_op_status ret = GRPC_ENDPOINT_ERROR; + if (status == 0) { + ret = GRPC_ENDPOINT_DONE; + GPR_ASSERT(bytes_sent == tcp->write_slices->length); + } else { + if (socket->read_info.wsa_error != WSAECONNRESET) { + char *utf8_message = gpr_format_message(info->wsa_error); + gpr_log(GPR_ERROR, "WSASend error: %s", utf8_message); + gpr_free(utf8_message); + } } + if (allocated) gpr_free(allocated); + return ret; + } - TCP_REF (tcp, "write"); + TCP_REF(tcp, "write"); /* If we got a WSAEWOULDBLOCK earlier, then we need to re-do the same operation, this time asynchronously. */ - memset (&socket->write_info.overlapped, 0, sizeof (OVERLAPPED)); - status = WSASend (socket->socket, buffers, tcp->write_slices->count, &bytes_sent, 0, &socket->write_info.overlapped, NULL); - if (allocated) - gpr_free (allocated); - - if (status != 0) - { - int wsa_error = WSAGetLastError (); - if (wsa_error != WSA_IO_PENDING) - { - TCP_UNREF (tcp, "write"); - return GRPC_ENDPOINT_ERROR; - } + memset(&socket->write_info.overlapped, 0, sizeof(OVERLAPPED)); + status = WSASend(socket->socket, buffers, tcp->write_slices->count, + &bytes_sent, 0, &socket->write_info.overlapped, NULL); + if (allocated) gpr_free(allocated); + + if (status != 0) { + int wsa_error = WSAGetLastError(); + if (wsa_error != WSA_IO_PENDING) { + TCP_UNREF(tcp, "write"); + return GRPC_ENDPOINT_ERROR; } + } /* 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, on_write, tcp); + grpc_socket_notify_on_write(socket, on_write, tcp); return GRPC_ENDPOINT_PENDING; } -static void -win_add_to_pollset (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); + (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_endpoint *ep, grpc_pollset_set *pss) { grpc_tcp *tcp; - (void) pss; - tcp = (grpc_tcp *) ep; - grpc_iocp_add_socket (tcp->socket); + (void)pss; + tcp = (grpc_tcp *)ep; + grpc_iocp_add_socket(tcp->socket); } /* Initiates a shutdown of the TCP endpoint. This will queue abort callbacks @@ -417,47 +364,38 @@ win_add_to_pollset_set (grpc_endpoint * ep, grpc_pollset_set * pss) 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_tcp *tcp = (grpc_tcp *) ep; - gpr_mu_lock (&tcp->mu); +static void win_shutdown(grpc_endpoint *ep) { + 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 callback. See the comments in on_read and on_write. */ tcp->shutting_down = 1; - grpc_winsocket_shutdown (tcp->socket); - gpr_mu_unlock (&tcp->mu); + grpc_winsocket_shutdown(tcp->socket); + gpr_mu_unlock(&tcp->mu); } -static void -win_destroy (grpc_endpoint * ep) -{ - grpc_tcp *tcp = (grpc_tcp *) ep; - TCP_UNREF (tcp, "destroy"); +static void win_destroy(grpc_endpoint *ep) { + grpc_tcp *tcp = (grpc_tcp *)ep; + TCP_UNREF(tcp, "destroy"); } -static char * -win_get_peer (grpc_endpoint * ep) -{ - grpc_tcp *tcp = (grpc_tcp *) ep; - return gpr_strdup (tcp->peer_string); +static char *win_get_peer(grpc_endpoint *ep) { + grpc_tcp *tcp = (grpc_tcp *)ep; + return gpr_strdup(tcp->peer_string); } static grpc_endpoint_vtable vtable = { - win_read, win_write, win_add_to_pollset, win_add_to_pollset_set, - win_shutdown, win_destroy, win_get_peer -}; - -grpc_endpoint * -grpc_tcp_create (grpc_winsocket * socket, char *peer_string) -{ - grpc_tcp *tcp = (grpc_tcp *) gpr_malloc (sizeof (grpc_tcp)); - memset (tcp, 0, sizeof (grpc_tcp)); + win_read, win_write, win_add_to_pollset, win_add_to_pollset_set, + win_shutdown, win_destroy, win_get_peer}; + +grpc_endpoint *grpc_tcp_create(grpc_winsocket *socket, char *peer_string) { + grpc_tcp *tcp = (grpc_tcp *)gpr_malloc(sizeof(grpc_tcp)); + memset(tcp, 0, sizeof(grpc_tcp)); tcp->base.vtable = &vtable; tcp->socket = socket; - gpr_mu_init (&tcp->mu); - gpr_ref_init (&tcp->refcount, 1); - tcp->peer_string = gpr_strdup (peer_string); + gpr_mu_init(&tcp->mu); + gpr_ref_init(&tcp->refcount, 1); + tcp->peer_string = gpr_strdup(peer_string); return &tcp->base; } diff --git a/src/core/iomgr/tcp_windows.h b/src/core/iomgr/tcp_windows.h index 2b87a875adb..deb3e48293c 100644 --- a/src/core/iomgr/tcp_windows.h +++ b/src/core/iomgr/tcp_windows.h @@ -50,8 +50,8 @@ /* Create a tcp endpoint given a winsock handle. * Takes ownership of the handle. */ -grpc_endpoint *grpc_tcp_create (grpc_winsocket * socket, char *peer_string); +grpc_endpoint *grpc_tcp_create(grpc_winsocket *socket, char *peer_string); -int grpc_tcp_prepare_socket (SOCKET sock); +int grpc_tcp_prepare_socket(SOCKET sock); #endif /* GRPC_INTERNAL_CORE_IOMGR_TCP_WINDOWS_H */ diff --git a/src/core/iomgr/time_averaged_stats.c b/src/core/iomgr/time_averaged_stats.c index c2d1cdf2125..e075db43735 100644 --- a/src/core/iomgr/time_averaged_stats.c +++ b/src/core/iomgr/time_averaged_stats.c @@ -33,9 +33,9 @@ #include "src/core/iomgr/time_averaged_stats.h" -void -grpc_time_averaged_stats_init (grpc_time_averaged_stats * stats, double init_avg, double regress_weight, double persistence_factor) -{ +void grpc_time_averaged_stats_init(grpc_time_averaged_stats* stats, + double init_avg, double regress_weight, + double persistence_factor) { stats->init_avg = init_avg; stats->regress_weight = regress_weight; stats->persistence_factor = persistence_factor; @@ -45,33 +45,31 @@ grpc_time_averaged_stats_init (grpc_time_averaged_stats * stats, double init_avg stats->aggregate_weighted_avg = init_avg; } -void -grpc_time_averaged_stats_add_sample (grpc_time_averaged_stats * stats, double value) -{ +void grpc_time_averaged_stats_add_sample(grpc_time_averaged_stats* stats, + double value) { stats->batch_total_value += value; ++stats->batch_num_samples; } -double -grpc_time_averaged_stats_update_average (grpc_time_averaged_stats * stats) -{ +double grpc_time_averaged_stats_update_average( + grpc_time_averaged_stats* stats) { /* Start with the current batch: */ double weighted_sum = stats->batch_total_value; double total_weight = stats->batch_num_samples; - if (stats->regress_weight > 0) - { - /* Add in the regression towards init_avg_: */ - weighted_sum += stats->regress_weight * stats->init_avg; - total_weight += stats->regress_weight; - } - if (stats->persistence_factor > 0) - { - /* Add in the persistence: */ - const double prev_sample_weight = stats->persistence_factor * stats->aggregate_total_weight; - weighted_sum += prev_sample_weight * stats->aggregate_weighted_avg; - total_weight += prev_sample_weight; - } - stats->aggregate_weighted_avg = (total_weight > 0) ? (weighted_sum / total_weight) : stats->init_avg; + if (stats->regress_weight > 0) { + /* Add in the regression towards init_avg_: */ + weighted_sum += stats->regress_weight * stats->init_avg; + total_weight += stats->regress_weight; + } + if (stats->persistence_factor > 0) { + /* Add in the persistence: */ + const double prev_sample_weight = + stats->persistence_factor * stats->aggregate_total_weight; + weighted_sum += prev_sample_weight * stats->aggregate_weighted_avg; + total_weight += prev_sample_weight; + } + stats->aggregate_weighted_avg = + (total_weight > 0) ? (weighted_sum / total_weight) : stats->init_avg; stats->aggregate_total_weight = total_weight; stats->batch_num_samples = 0; stats->batch_total_value = 0; diff --git a/src/core/iomgr/time_averaged_stats.h b/src/core/iomgr/time_averaged_stats.h index c4f9a610634..4e9e3956c28 100644 --- a/src/core/iomgr/time_averaged_stats.h +++ b/src/core/iomgr/time_averaged_stats.h @@ -39,8 +39,7 @@ weighted mean. It is designed for batch operations where we do many adds before updating the average. */ -typedef struct -{ +typedef struct { /* The initial average value. This is the reported average until the first grpc_time_averaged_stats_update_average call. If a positive regress_weight is used, we also regress towards this value on each update. */ @@ -76,11 +75,14 @@ typedef struct /* See the comments on the members above for an explanation of init_avg, regress_weight, and persistence_factor. */ -void grpc_time_averaged_stats_init (grpc_time_averaged_stats * stats, double init_avg, double regress_weight, double persistence_factor); +void grpc_time_averaged_stats_init(grpc_time_averaged_stats* stats, + double init_avg, double regress_weight, + double persistence_factor); /* Add a sample to the current batch. */ -void grpc_time_averaged_stats_add_sample (grpc_time_averaged_stats * stats, double value); +void grpc_time_averaged_stats_add_sample(grpc_time_averaged_stats* stats, + double value); /* Complete a batch and compute the new estimate of the average sample value. */ -double grpc_time_averaged_stats_update_average (grpc_time_averaged_stats * stats); +double grpc_time_averaged_stats_update_average(grpc_time_averaged_stats* stats); #endif /* GRPC_INTERNAL_CORE_IOMGR_TIME_AVERAGED_STATS_H */ diff --git a/src/core/iomgr/udp_server.c b/src/core/iomgr/udp_server.c index a1b6f75ede6..e1a57b035fa 100644 --- a/src/core/iomgr/udp_server.c +++ b/src/core/iomgr/udp_server.c @@ -69,13 +69,11 @@ #define INIT_PORT_CAP 2 /* one listening port */ -typedef struct -{ +typedef struct { int fd; grpc_fd *emfd; grpc_udp_server *server; - union - { + union { gpr_uint8 untyped[GRPC_MAX_SOCKADDR_SIZE]; struct sockaddr sockaddr; struct sockaddr_un un; @@ -86,20 +84,16 @@ typedef struct grpc_udp_server_read_cb read_cb; } server_port; -static void -unlink_if_unix_domain_socket (const struct sockaddr_un *un) -{ +static void unlink_if_unix_domain_socket(const struct sockaddr_un *un) { struct stat st; - if (stat (un->sun_path, &st) == 0 && (st.st_mode & S_IFMT) == S_IFSOCK) - { - unlink (un->sun_path); - } + if (stat(un->sun_path, &st) == 0 && (st.st_mode & S_IFMT) == S_IFSOCK) { + unlink(un->sun_path); + } } /* the overall server */ -struct grpc_udp_server -{ +struct grpc_udp_server { gpr_mu mu; gpr_cv cv; @@ -125,237 +119,203 @@ struct grpc_udp_server size_t pollset_count; }; -grpc_udp_server * -grpc_udp_server_create (void) -{ - grpc_udp_server *s = gpr_malloc (sizeof (grpc_udp_server)); - gpr_mu_init (&s->mu); - gpr_cv_init (&s->cv); +grpc_udp_server *grpc_udp_server_create(void) { + grpc_udp_server *s = gpr_malloc(sizeof(grpc_udp_server)); + gpr_mu_init(&s->mu); + gpr_cv_init(&s->cv); s->active_ports = 0; s->destroyed_ports = 0; s->shutdown = 0; - s->ports = gpr_malloc (sizeof (server_port) * INIT_PORT_CAP); + s->ports = gpr_malloc(sizeof(server_port) * INIT_PORT_CAP); s->nports = 0; s->port_capacity = INIT_PORT_CAP; return s; } -static void -finish_shutdown (grpc_exec_ctx * exec_ctx, grpc_udp_server * s) -{ - grpc_exec_ctx_enqueue (exec_ctx, s->shutdown_complete, 1); +static void finish_shutdown(grpc_exec_ctx *exec_ctx, grpc_udp_server *s) { + grpc_exec_ctx_enqueue(exec_ctx, s->shutdown_complete, 1); - gpr_mu_destroy (&s->mu); - gpr_cv_destroy (&s->cv); + gpr_mu_destroy(&s->mu); + gpr_cv_destroy(&s->cv); - gpr_free (s->ports); - gpr_free (s); + gpr_free(s->ports); + gpr_free(s); } -static void -destroyed_port (grpc_exec_ctx * exec_ctx, void *server, int success) -{ +static void destroyed_port(grpc_exec_ctx *exec_ctx, void *server, int success) { grpc_udp_server *s = server; - gpr_mu_lock (&s->mu); + gpr_mu_lock(&s->mu); s->destroyed_ports++; - if (s->destroyed_ports == s->nports) - { - gpr_mu_unlock (&s->mu); - finish_shutdown (exec_ctx, s); - } - else - { - gpr_mu_unlock (&s->mu); - } + if (s->destroyed_ports == s->nports) { + gpr_mu_unlock(&s->mu); + finish_shutdown(exec_ctx, s); + } else { + gpr_mu_unlock(&s->mu); + } } /* 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_exec_ctx *exec_ctx, grpc_udp_server *s) { size_t i; /* delete ALL the things */ - gpr_mu_lock (&s->mu); - - if (!s->shutdown) - { - gpr_mu_unlock (&s->mu); - return; - } - - if (s->nports) - { - for (i = 0; i < s->nports; i++) - { - server_port *sp = &s->ports[i]; - if (sp->addr.sockaddr.sa_family == AF_UNIX) - { - unlink_if_unix_domain_socket (&sp->addr.un); - } - sp->destroyed_closure.cb = destroyed_port; - sp->destroyed_closure.cb_arg = s; - grpc_fd_orphan (exec_ctx, sp->emfd, &sp->destroyed_closure, "udp_listener_shutdown"); - } - gpr_mu_unlock (&s->mu); - } - else - { - gpr_mu_unlock (&s->mu); - finish_shutdown (exec_ctx, s); + gpr_mu_lock(&s->mu); + + if (!s->shutdown) { + gpr_mu_unlock(&s->mu); + return; + } + + if (s->nports) { + for (i = 0; i < s->nports; i++) { + server_port *sp = &s->ports[i]; + if (sp->addr.sockaddr.sa_family == AF_UNIX) { + unlink_if_unix_domain_socket(&sp->addr.un); + } + sp->destroyed_closure.cb = destroyed_port; + sp->destroyed_closure.cb_arg = s; + grpc_fd_orphan(exec_ctx, sp->emfd, &sp->destroyed_closure, + "udp_listener_shutdown"); } + gpr_mu_unlock(&s->mu); + } else { + gpr_mu_unlock(&s->mu); + finish_shutdown(exec_ctx, 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_exec_ctx *exec_ctx, grpc_udp_server *s, + grpc_closure *on_done) { size_t i; - gpr_mu_lock (&s->mu); + gpr_mu_lock(&s->mu); - GPR_ASSERT (!s->shutdown); + GPR_ASSERT(!s->shutdown); s->shutdown = 1; s->shutdown_complete = on_done; /* shutdown all fd's */ - if (s->active_ports) - { - for (i = 0; i < s->nports; i++) - { - grpc_fd_shutdown (exec_ctx, s->ports[i].emfd); - } - gpr_mu_unlock (&s->mu); - } - else - { - gpr_mu_unlock (&s->mu); - deactivated_all_ports (exec_ctx, s); + if (s->active_ports) { + for (i = 0; i < s->nports; i++) { + grpc_fd_shutdown(exec_ctx, s->ports[i].emfd); } + gpr_mu_unlock(&s->mu); + } else { + gpr_mu_unlock(&s->mu); + deactivated_all_ports(exec_ctx, s); + } } /* Prepare a recently-created socket for listening. */ -static int -prepare_socket (int fd, const struct sockaddr *addr, size_t addr_len) -{ +static int prepare_socket(int fd, const struct sockaddr *addr, + size_t addr_len) { struct sockaddr_storage sockname_temp; socklen_t sockname_len; int get_local_ip; int rc; - if (fd < 0) - { - goto error; - } + if (fd < 0) { + goto error; + } - if (!grpc_set_socket_nonblocking (fd, 1) || !grpc_set_socket_cloexec (fd, 1)) - { - gpr_log (GPR_ERROR, "Unable to configure socket %d: %s", fd, strerror (errno)); - } + if (!grpc_set_socket_nonblocking(fd, 1) || !grpc_set_socket_cloexec(fd, 1)) { + gpr_log(GPR_ERROR, "Unable to configure socket %d: %s", fd, + strerror(errno)); + } get_local_ip = 1; - rc = setsockopt (fd, IPPROTO_IP, IP_PKTINFO, &get_local_ip, sizeof (get_local_ip)); - if (rc == 0 && addr->sa_family == AF_INET6) - { + rc = setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &get_local_ip, + sizeof(get_local_ip)); + if (rc == 0 && addr->sa_family == AF_INET6) { #if !TARGET_OS_IPHONE - rc = setsockopt (fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &get_local_ip, sizeof (get_local_ip)); + rc = setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &get_local_ip, + sizeof(get_local_ip)); #endif - } + } - GPR_ASSERT (addr_len < ~(socklen_t) 0); - if (bind (fd, addr, (socklen_t) addr_len) < 0) - { - char *addr_str; - grpc_sockaddr_to_string (&addr_str, addr, 0); - gpr_log (GPR_ERROR, "bind addr=%s: %s", addr_str, strerror (errno)); - gpr_free (addr_str); - goto error; - } + GPR_ASSERT(addr_len < ~(socklen_t)0); + if (bind(fd, addr, (socklen_t)addr_len) < 0) { + char *addr_str; + grpc_sockaddr_to_string(&addr_str, addr, 0); + gpr_log(GPR_ERROR, "bind addr=%s: %s", addr_str, strerror(errno)); + gpr_free(addr_str); + goto error; + } - sockname_len = sizeof (sockname_temp); - if (getsockname (fd, (struct sockaddr *) &sockname_temp, &sockname_len) < 0) - { - goto error; - } + sockname_len = sizeof(sockname_temp); + if (getsockname(fd, (struct sockaddr *)&sockname_temp, &sockname_len) < 0) { + goto error; + } - return grpc_sockaddr_get_port ((struct sockaddr *) &sockname_temp); + return grpc_sockaddr_get_port((struct sockaddr *)&sockname_temp); error: - if (fd >= 0) - { - close (fd); - } + if (fd >= 0) { + close(fd); + } return -1; } /* event manager callback when reads are ready */ -static void -on_read (grpc_exec_ctx * exec_ctx, void *arg, int success) -{ +static void on_read(grpc_exec_ctx *exec_ctx, void *arg, int success) { server_port *sp = arg; - if (success == 0) - { - gpr_mu_lock (&sp->server->mu); - if (0 == --sp->server->active_ports) - { - gpr_mu_unlock (&sp->server->mu); - deactivated_all_ports (exec_ctx, sp->server); - } - else - { - gpr_mu_unlock (&sp->server->mu); - } - return; + if (success == 0) { + gpr_mu_lock(&sp->server->mu); + if (0 == --sp->server->active_ports) { + gpr_mu_unlock(&sp->server->mu); + deactivated_all_ports(exec_ctx, sp->server); + } else { + gpr_mu_unlock(&sp->server->mu); } + return; + } /* Tell the registered callback that data is available to read. */ - GPR_ASSERT (sp->read_cb); - sp->read_cb (sp->fd); + GPR_ASSERT(sp->read_cb); + sp->read_cb(sp->fd); /* 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(exec_ctx, sp->emfd, &sp->read_closure); } -static int -add_socket_to_server (grpc_udp_server * s, int fd, const struct sockaddr *addr, size_t addr_len, grpc_udp_server_read_cb read_cb) -{ +static int add_socket_to_server(grpc_udp_server *s, int fd, + const struct sockaddr *addr, size_t addr_len, + grpc_udp_server_read_cb read_cb) { server_port *sp; int port; char *addr_str; char *name; - port = prepare_socket (fd, addr, addr_len); - if (port >= 0) - { - grpc_sockaddr_to_string (&addr_str, (struct sockaddr *) &addr, 1); - gpr_asprintf (&name, "udp-server-listener:%s", addr_str); - gpr_mu_lock (&s->mu); - /* append it to the list under a lock */ - if (s->nports == s->port_capacity) - { - s->port_capacity *= 2; - s->ports = gpr_realloc (s->ports, sizeof (server_port) * s->port_capacity); - } - sp = &s->ports[s->nports++]; - sp->server = s; - sp->fd = fd; - sp->emfd = grpc_fd_create (fd, name); - memcpy (sp->addr.untyped, addr, addr_len); - sp->addr_len = addr_len; - sp->read_cb = read_cb; - GPR_ASSERT (sp->emfd); - gpr_mu_unlock (&s->mu); + port = prepare_socket(fd, addr, addr_len); + if (port >= 0) { + grpc_sockaddr_to_string(&addr_str, (struct sockaddr *)&addr, 1); + gpr_asprintf(&name, "udp-server-listener:%s", addr_str); + gpr_mu_lock(&s->mu); + /* append it to the list under a lock */ + if (s->nports == s->port_capacity) { + s->port_capacity *= 2; + s->ports = gpr_realloc(s->ports, sizeof(server_port) * s->port_capacity); } + sp = &s->ports[s->nports++]; + sp->server = s; + sp->fd = fd; + sp->emfd = grpc_fd_create(fd, name); + memcpy(sp->addr.untyped, addr, addr_len); + sp->addr_len = addr_len; + sp->read_cb = read_cb; + GPR_ASSERT(sp->emfd); + gpr_mu_unlock(&s->mu); + } return port; } -int -grpc_udp_server_add_port (grpc_udp_server * s, const void *addr, size_t addr_len, grpc_udp_server_read_cb read_cb) -{ +int grpc_udp_server_add_port(grpc_udp_server *s, const void *addr, + size_t addr_len, grpc_udp_server_read_cb read_cb) { int allocated_port1 = -1; int allocated_port2 = -1; unsigned i; @@ -370,117 +330,102 @@ grpc_udp_server_add_port (grpc_udp_server * s, const void *addr, size_t addr_len socklen_t sockname_len; int port; - if (((struct sockaddr *) addr)->sa_family == AF_UNIX) - { - unlink_if_unix_domain_socket (addr); - } + if (((struct sockaddr *)addr)->sa_family == AF_UNIX) { + unlink_if_unix_domain_socket(addr); + } /* Check if this is a wildcard port, and if so, try to keep the port the same as some previously created listener. */ - if (grpc_sockaddr_get_port (addr) == 0) - { - for (i = 0; i < s->nports; i++) - { - sockname_len = sizeof (sockname_temp); - if (0 == getsockname (s->ports[i].fd, (struct sockaddr *) &sockname_temp, &sockname_len)) - { - port = grpc_sockaddr_get_port ((struct sockaddr *) &sockname_temp); - if (port > 0) - { - allocated_addr = malloc (addr_len); - memcpy (allocated_addr, addr, addr_len); - grpc_sockaddr_set_port (allocated_addr, port); - addr = allocated_addr; - break; - } - } - } + if (grpc_sockaddr_get_port(addr) == 0) { + for (i = 0; i < s->nports; i++) { + sockname_len = sizeof(sockname_temp); + if (0 == getsockname(s->ports[i].fd, (struct sockaddr *)&sockname_temp, + &sockname_len)) { + port = grpc_sockaddr_get_port((struct sockaddr *)&sockname_temp); + if (port > 0) { + allocated_addr = malloc(addr_len); + memcpy(allocated_addr, addr, addr_len); + grpc_sockaddr_set_port(allocated_addr, port); + addr = allocated_addr; + break; + } + } } + } - if (grpc_sockaddr_to_v4mapped (addr, &addr6_v4mapped)) - { - addr = (const struct sockaddr *) &addr6_v4mapped; - addr_len = sizeof (addr6_v4mapped); - } + if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) { + addr = (const struct sockaddr *)&addr6_v4mapped; + addr_len = sizeof(addr6_v4mapped); + } /* Treat :: or 0.0.0.0 as a family-agnostic wildcard. */ - if (grpc_sockaddr_is_wildcard (addr, &port)) - { - grpc_sockaddr_make_wildcards (port, &wild4, &wild6); - - /* Try listening on IPv6 first. */ - addr = (struct sockaddr *) &wild6; - addr_len = sizeof (wild6); - fd = grpc_create_dualstack_socket (addr, SOCK_DGRAM, IPPROTO_UDP, &dsmode); - allocated_port1 = add_socket_to_server (s, fd, addr, addr_len, read_cb); - if (fd >= 0 && dsmode == GRPC_DSMODE_DUALSTACK) - { - goto done; - } - - /* If we didn't get a dualstack socket, also listen on 0.0.0.0. */ - if (port == 0 && allocated_port1 > 0) - { - grpc_sockaddr_set_port ((struct sockaddr *) &wild4, allocated_port1); - } - addr = (struct sockaddr *) &wild4; - addr_len = sizeof (wild4); + if (grpc_sockaddr_is_wildcard(addr, &port)) { + grpc_sockaddr_make_wildcards(port, &wild4, &wild6); + + /* Try listening on IPv6 first. */ + addr = (struct sockaddr *)&wild6; + addr_len = sizeof(wild6); + fd = grpc_create_dualstack_socket(addr, SOCK_DGRAM, IPPROTO_UDP, &dsmode); + allocated_port1 = add_socket_to_server(s, fd, addr, addr_len, read_cb); + if (fd >= 0 && dsmode == GRPC_DSMODE_DUALSTACK) { + goto done; } - fd = grpc_create_dualstack_socket (addr, SOCK_DGRAM, IPPROTO_UDP, &dsmode); - if (fd < 0) - { - gpr_log (GPR_ERROR, "Unable to create socket: %s", strerror (errno)); + /* If we didn't get a dualstack socket, also listen on 0.0.0.0. */ + if (port == 0 && allocated_port1 > 0) { + grpc_sockaddr_set_port((struct sockaddr *)&wild4, allocated_port1); } - if (dsmode == GRPC_DSMODE_IPV4 && grpc_sockaddr_is_v4mapped (addr, &addr4_copy)) - { - addr = (struct sockaddr *) &addr4_copy; - addr_len = sizeof (addr4_copy); - } - allocated_port2 = add_socket_to_server (s, fd, addr, addr_len, read_cb); + addr = (struct sockaddr *)&wild4; + addr_len = sizeof(wild4); + } + + fd = grpc_create_dualstack_socket(addr, SOCK_DGRAM, IPPROTO_UDP, &dsmode); + if (fd < 0) { + gpr_log(GPR_ERROR, "Unable to create socket: %s", strerror(errno)); + } + if (dsmode == GRPC_DSMODE_IPV4 && + grpc_sockaddr_is_v4mapped(addr, &addr4_copy)) { + addr = (struct sockaddr *)&addr4_copy; + addr_len = sizeof(addr4_copy); + } + allocated_port2 = add_socket_to_server(s, fd, addr, addr_len, read_cb); done: - gpr_free (allocated_addr); + gpr_free(allocated_addr); return allocated_port1 >= 0 ? allocated_port1 : allocated_port2; } -int -grpc_udp_server_get_fd (grpc_udp_server * s, unsigned index) -{ +int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index) { return (index < s->nports) ? s->ports[index].fd : -1; } -void -grpc_udp_server_start (grpc_exec_ctx * exec_ctx, grpc_udp_server * s, grpc_pollset ** pollsets, size_t pollset_count) -{ +void grpc_udp_server_start(grpc_exec_ctx *exec_ctx, grpc_udp_server *s, + grpc_pollset **pollsets, size_t pollset_count) { size_t i, j; - gpr_mu_lock (&s->mu); - GPR_ASSERT (s->active_ports == 0); + gpr_mu_lock(&s->mu); + GPR_ASSERT(s->active_ports == 0); s->pollsets = pollsets; - for (i = 0; i < s->nports; i++) - { - for (j = 0; j < pollset_count; j++) - { - grpc_pollset_add_fd (exec_ctx, pollsets[j], s->ports[i].emfd); - } - s->ports[i].read_closure.cb = on_read; - s->ports[i].read_closure.cb_arg = &s->ports[i]; - grpc_fd_notify_on_read (exec_ctx, s->ports[i].emfd, &s->ports[i].read_closure); - s->active_ports++; + for (i = 0; i < s->nports; i++) { + for (j = 0; j < pollset_count; j++) { + grpc_pollset_add_fd(exec_ctx, pollsets[j], s->ports[i].emfd); } - gpr_mu_unlock (&s->mu); + s->ports[i].read_closure.cb = on_read; + s->ports[i].read_closure.cb_arg = &s->ports[i]; + grpc_fd_notify_on_read(exec_ctx, s->ports[i].emfd, + &s->ports[i].read_closure); + s->active_ports++; + } + gpr_mu_unlock(&s->mu); } /* TODO(rjshade): Add a test for this method. */ -void -grpc_udp_server_write (server_port * sp, const char *buffer, size_t buf_len, const struct sockaddr *peer_address) -{ +void grpc_udp_server_write(server_port *sp, const char *buffer, size_t buf_len, + const struct sockaddr *peer_address) { ssize_t rc; - rc = sendto (sp->fd, buffer, buf_len, 0, peer_address, sizeof (peer_address)); - if (rc < 0) - { - gpr_log (GPR_ERROR, "Unable to send data: %s", strerror (errno)); - } + rc = sendto(sp->fd, buffer, buf_len, 0, peer_address, sizeof(peer_address)); + if (rc < 0) { + gpr_log(GPR_ERROR, "Unable to send data: %s", strerror(errno)); + } } #endif diff --git a/src/core/iomgr/udp_server.h b/src/core/iomgr/udp_server.h index e37d0485c13..76082d7761a 100644 --- a/src/core/iomgr/udp_server.h +++ b/src/core/iomgr/udp_server.h @@ -40,15 +40,16 @@ 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) (int fd); +typedef void (*grpc_udp_server_read_cb)(int fd); /* Create a server, initially not bound to any ports */ -grpc_udp_server *grpc_udp_server_create (void); +grpc_udp_server *grpc_udp_server_create(void); /* Start listening to bound ports */ -void grpc_udp_server_start (grpc_exec_ctx * exec_ctx, grpc_udp_server * udp_server, grpc_pollset ** pollsets, size_t pollset_count); +void grpc_udp_server_start(grpc_exec_ctx *exec_ctx, grpc_udp_server *udp_server, + grpc_pollset **pollsets, size_t pollset_count); -int grpc_udp_server_get_fd (grpc_udp_server * s, unsigned index); +int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index); /* Add a port to the server, returning port number on success, or negative on failure. @@ -60,9 +61,11 @@ int grpc_udp_server_get_fd (grpc_udp_server * s, unsigned index); /* TODO(ctiller): deprecate this, and make grpc_udp_server_add_ports to handle all of the multiple socket port matching logic in one place */ -int grpc_udp_server_add_port (grpc_udp_server * s, const void *addr, size_t addr_len, grpc_udp_server_read_cb read_cb); +int grpc_udp_server_add_port(grpc_udp_server *s, const void *addr, + size_t addr_len, grpc_udp_server_read_cb read_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_exec_ctx *exec_ctx, grpc_udp_server *server, + grpc_closure *on_done); /* Write the contents of buffer to the underlying UDP socket. */ /* diff --git a/src/core/iomgr/wakeup_fd_eventfd.c b/src/core/iomgr/wakeup_fd_eventfd.c index 23b5033fcf5..48eb1afb3d8 100644 --- a/src/core/iomgr/wakeup_fd_eventfd.c +++ b/src/core/iomgr/wakeup_fd_eventfd.c @@ -42,56 +42,40 @@ #include "src/core/iomgr/wakeup_fd_posix.h" #include -static void -eventfd_create (grpc_wakeup_fd * fd_info) -{ - int efd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); +static void eventfd_create(grpc_wakeup_fd* fd_info) { + int efd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); /* TODO(klempner): Handle failure more gracefully */ - GPR_ASSERT (efd >= 0); + GPR_ASSERT(efd >= 0); fd_info->read_fd = efd; fd_info->write_fd = -1; } -static void -eventfd_consume (grpc_wakeup_fd * fd_info) -{ +static void eventfd_consume(grpc_wakeup_fd* fd_info) { eventfd_t value; int err; - do - { - err = eventfd_read (fd_info->read_fd, &value); - } - while (err < 0 && errno == EINTR); + do { + err = eventfd_read(fd_info->read_fd, &value); + } while (err < 0 && errno == EINTR); } -static void -eventfd_wakeup (grpc_wakeup_fd * fd_info) -{ +static void eventfd_wakeup(grpc_wakeup_fd* fd_info) { int err; - do - { - err = eventfd_write (fd_info->read_fd, 1); - } - while (err < 0 && errno == EINTR); + do { + err = eventfd_write(fd_info->read_fd, 1); + } while (err < 0 && errno == EINTR); } -static void -eventfd_destroy (grpc_wakeup_fd * fd_info) -{ - if (fd_info->read_fd != 0) - close (fd_info->read_fd); +static void eventfd_destroy(grpc_wakeup_fd* fd_info) { + if (fd_info->read_fd != 0) close(fd_info->read_fd); } -static int -eventfd_check_availability (void) -{ +static int eventfd_check_availability(void) { /* TODO(klempner): Actually check if eventfd is available */ return 1; } const grpc_wakeup_fd_vtable grpc_specialized_wakeup_fd_vtable = { - eventfd_create, eventfd_consume, eventfd_wakeup, eventfd_destroy, - eventfd_check_availability -}; + eventfd_create, eventfd_consume, eventfd_wakeup, eventfd_destroy, + eventfd_check_availability}; #endif /* GPR_LINUX_EVENTFD */ diff --git a/src/core/iomgr/wakeup_fd_nospecial.c b/src/core/iomgr/wakeup_fd_nospecial.c index 95b819393f3..78d763c103a 100644 --- a/src/core/iomgr/wakeup_fd_nospecial.c +++ b/src/core/iomgr/wakeup_fd_nospecial.c @@ -43,14 +43,9 @@ #include "src/core/iomgr/wakeup_fd_posix.h" #include -static int -check_availability_invalid (void) -{ - return 0; -} +static int check_availability_invalid(void) { return 0; } const grpc_wakeup_fd_vtable grpc_specialized_wakeup_fd_vtable = { - NULL, NULL, NULL, NULL, check_availability_invalid -}; + NULL, NULL, NULL, NULL, check_availability_invalid}; #endif /* GPR_POSIX_NO_SPECIAL_WAKEUP_FD */ diff --git a/src/core/iomgr/wakeup_fd_pipe.c b/src/core/iomgr/wakeup_fd_pipe.c index 4c87e3e1d9a..80de181d9d1 100644 --- a/src/core/iomgr/wakeup_fd_pipe.c +++ b/src/core/iomgr/wakeup_fd_pipe.c @@ -44,71 +44,54 @@ #include "src/core/iomgr/socket_utils_posix.h" #include -static void -pipe_init (grpc_wakeup_fd * fd_info) -{ +static void pipe_init(grpc_wakeup_fd* fd_info) { int pipefd[2]; /* TODO(klempner): Make this nonfatal */ - GPR_ASSERT (0 == pipe (pipefd)); - GPR_ASSERT (grpc_set_socket_nonblocking (pipefd[0], 1)); - GPR_ASSERT (grpc_set_socket_nonblocking (pipefd[1], 1)); + GPR_ASSERT(0 == pipe(pipefd)); + GPR_ASSERT(grpc_set_socket_nonblocking(pipefd[0], 1)); + GPR_ASSERT(grpc_set_socket_nonblocking(pipefd[1], 1)); fd_info->read_fd = pipefd[0]; fd_info->write_fd = pipefd[1]; } -static void -pipe_consume (grpc_wakeup_fd * fd_info) -{ +static void pipe_consume(grpc_wakeup_fd* fd_info) { char buf[128]; ssize_t r; - for (;;) - { - r = read (fd_info->read_fd, buf, sizeof (buf)); - if (r > 0) - continue; - if (r == 0) - return; - switch (errno) - { - case EAGAIN: - return; - case EINTR: - continue; - default: - gpr_log (GPR_ERROR, "error reading pipe: %s", strerror (errno)); - return; - } + for (;;) { + r = read(fd_info->read_fd, buf, sizeof(buf)); + if (r > 0) continue; + if (r == 0) return; + switch (errno) { + case EAGAIN: + return; + case EINTR: + continue; + default: + gpr_log(GPR_ERROR, "error reading pipe: %s", strerror(errno)); + return; } + } } -static void -pipe_wakeup (grpc_wakeup_fd * fd_info) -{ +static void pipe_wakeup(grpc_wakeup_fd* fd_info) { char c = 0; - while (write (fd_info->write_fd, &c, 1) != 1 && errno == EINTR) + while (write(fd_info->write_fd, &c, 1) != 1 && errno == EINTR) ; } -static void -pipe_destroy (grpc_wakeup_fd * fd_info) -{ - if (fd_info->read_fd != 0) - close (fd_info->read_fd); - if (fd_info->write_fd != 0) - close (fd_info->write_fd); +static void pipe_destroy(grpc_wakeup_fd* fd_info) { + if (fd_info->read_fd != 0) close(fd_info->read_fd); + if (fd_info->write_fd != 0) close(fd_info->write_fd); } -static int -pipe_check_availability (void) -{ +static int pipe_check_availability(void) { /* Assume that pipes are always available. */ return 1; } const grpc_wakeup_fd_vtable grpc_pipe_wakeup_fd_vtable = { - pipe_init, pipe_consume, pipe_wakeup, pipe_destroy, - pipe_check_availability -}; + pipe_init, pipe_consume, pipe_wakeup, pipe_destroy, + pipe_check_availability}; #endif /* GPR_POSIX_WAKUP_FD */ diff --git a/src/core/iomgr/wakeup_fd_posix.c b/src/core/iomgr/wakeup_fd_posix.c index dae3e94f650..d09fb78d123 100644 --- a/src/core/iomgr/wakeup_fd_posix.c +++ b/src/core/iomgr/wakeup_fd_posix.c @@ -41,53 +41,34 @@ static const grpc_wakeup_fd_vtable *wakeup_fd_vtable = NULL; -void -grpc_wakeup_fd_global_init (void) -{ - if (grpc_specialized_wakeup_fd_vtable.check_availability ()) - { - wakeup_fd_vtable = &grpc_specialized_wakeup_fd_vtable; - } - else - { - wakeup_fd_vtable = &grpc_pipe_wakeup_fd_vtable; - } +void grpc_wakeup_fd_global_init(void) { + if (grpc_specialized_wakeup_fd_vtable.check_availability()) { + wakeup_fd_vtable = &grpc_specialized_wakeup_fd_vtable; + } else { + wakeup_fd_vtable = &grpc_pipe_wakeup_fd_vtable; + } } -void -grpc_wakeup_fd_global_init_force_fallback (void) -{ +void grpc_wakeup_fd_global_init_force_fallback(void) { wakeup_fd_vtable = &grpc_pipe_wakeup_fd_vtable; } -void -grpc_wakeup_fd_global_destroy (void) -{ - wakeup_fd_vtable = NULL; -} +void grpc_wakeup_fd_global_destroy(void) { wakeup_fd_vtable = NULL; } -void -grpc_wakeup_fd_init (grpc_wakeup_fd * fd_info) -{ - wakeup_fd_vtable->init (fd_info); +void grpc_wakeup_fd_init(grpc_wakeup_fd *fd_info) { + wakeup_fd_vtable->init(fd_info); } -void -grpc_wakeup_fd_consume_wakeup (grpc_wakeup_fd * fd_info) -{ - wakeup_fd_vtable->consume (fd_info); +void grpc_wakeup_fd_consume_wakeup(grpc_wakeup_fd *fd_info) { + wakeup_fd_vtable->consume(fd_info); } -void -grpc_wakeup_fd_wakeup (grpc_wakeup_fd * fd_info) -{ - wakeup_fd_vtable->wakeup (fd_info); +void grpc_wakeup_fd_wakeup(grpc_wakeup_fd *fd_info) { + wakeup_fd_vtable->wakeup(fd_info); } -void -grpc_wakeup_fd_destroy (grpc_wakeup_fd * fd_info) -{ - wakeup_fd_vtable->destroy (fd_info); +void grpc_wakeup_fd_destroy(grpc_wakeup_fd *fd_info) { + wakeup_fd_vtable->destroy(fd_info); } #endif /* GPR_POSIX_WAKEUP_FD */ diff --git a/src/core/iomgr/wakeup_fd_posix.h b/src/core/iomgr/wakeup_fd_posix.h index 63efde714fd..fe71b5abe91 100644 --- a/src/core/iomgr/wakeup_fd_posix.h +++ b/src/core/iomgr/wakeup_fd_posix.h @@ -62,37 +62,35 @@ #ifndef GRPC_INTERNAL_CORE_IOMGR_WAKEUP_FD_POSIX_H #define GRPC_INTERNAL_CORE_IOMGR_WAKEUP_FD_POSIX_H -void grpc_wakeup_fd_global_init (void); -void grpc_wakeup_fd_global_destroy (void); +void grpc_wakeup_fd_global_init(void); +void grpc_wakeup_fd_global_destroy(void); /* Force using the fallback implementation. This is intended for testing * purposes only.*/ -void grpc_wakeup_fd_global_init_force_fallback (void); +void grpc_wakeup_fd_global_init_force_fallback(void); typedef struct grpc_wakeup_fd grpc_wakeup_fd; -typedef struct grpc_wakeup_fd_vtable -{ - void (*init) (grpc_wakeup_fd * fd_info); - void (*consume) (grpc_wakeup_fd * fd_info); - void (*wakeup) (grpc_wakeup_fd * fd_info); - void (*destroy) (grpc_wakeup_fd * fd_info); +typedef struct grpc_wakeup_fd_vtable { + void (*init)(grpc_wakeup_fd* fd_info); + void (*consume)(grpc_wakeup_fd* fd_info); + void (*wakeup)(grpc_wakeup_fd* fd_info); + void (*destroy)(grpc_wakeup_fd* fd_info); /* Must be called before calling any other functions */ - int (*check_availability) (void); + int (*check_availability)(void); } grpc_wakeup_fd_vtable; -struct grpc_wakeup_fd -{ +struct grpc_wakeup_fd { int read_fd; int write_fd; }; #define GRPC_WAKEUP_FD_GET_READ_FD(fd_info) ((fd_info)->read_fd) -void grpc_wakeup_fd_init (grpc_wakeup_fd * fd_info); -void grpc_wakeup_fd_consume_wakeup (grpc_wakeup_fd * fd_info); -void grpc_wakeup_fd_wakeup (grpc_wakeup_fd * fd_info); -void grpc_wakeup_fd_destroy (grpc_wakeup_fd * fd_info); +void grpc_wakeup_fd_init(grpc_wakeup_fd* fd_info); +void grpc_wakeup_fd_consume_wakeup(grpc_wakeup_fd* fd_info); +void grpc_wakeup_fd_wakeup(grpc_wakeup_fd* fd_info); +void grpc_wakeup_fd_destroy(grpc_wakeup_fd* fd_info); /* Defined in some specialized implementation's .c file, or by * wakeup_fd_nospecial.c if no such implementation exists. */ diff --git a/src/core/iomgr/workqueue.h b/src/core/iomgr/workqueue.h index 0790fdb006b..714536233cf 100644 --- a/src/core/iomgr/workqueue.h +++ b/src/core/iomgr/workqueue.h @@ -52,9 +52,9 @@ struct grpc_workqueue; typedef struct grpc_workqueue grpc_workqueue; /** Create a work queue */ -grpc_workqueue *grpc_workqueue_create (grpc_exec_ctx *exec_ctx); +grpc_workqueue *grpc_workqueue_create(grpc_exec_ctx *exec_ctx); -void grpc_workqueue_flush (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue); +void grpc_workqueue_flush(grpc_exec_ctx *exec_ctx, grpc_workqueue *workqueue); #define GRPC_WORKQUEUE_REFCOUNT_DEBUG #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG @@ -62,19 +62,24 @@ void grpc_workqueue_flush (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue) grpc_workqueue_ref((p), __FILE__, __LINE__, (r)) #define GRPC_WORKQUEUE_UNREF(cl, p, r) \ grpc_workqueue_unref((cl), (p), __FILE__, __LINE__, (r)) -void grpc_workqueue_ref (grpc_workqueue * workqueue, const char *file, int line, const char *reason); -void grpc_workqueue_unref (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue, const char *file, int line, const char *reason); +void grpc_workqueue_ref(grpc_workqueue *workqueue, const char *file, int line, + const char *reason); +void grpc_workqueue_unref(grpc_exec_ctx *exec_ctx, grpc_workqueue *workqueue, + const char *file, int line, const char *reason); #else #define GRPC_WORKQUEUE_REF(p, r) grpc_workqueue_ref((p)) #define GRPC_WORKQUEUE_UNREF(cl, p, r) grpc_workqueue_unref((cl), (p)) -void grpc_workqueue_ref (grpc_workqueue * workqueue); -void grpc_workqueue_unref (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue); +void grpc_workqueue_ref(grpc_workqueue *workqueue); +void grpc_workqueue_unref(grpc_exec_ctx *exec_ctx, grpc_workqueue *workqueue); #endif /** Bind this workqueue to a pollset */ -void grpc_workqueue_add_to_pollset (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue, grpc_pollset * pollset); +void grpc_workqueue_add_to_pollset(grpc_exec_ctx *exec_ctx, + grpc_workqueue *workqueue, + grpc_pollset *pollset); /** Add a work item to a workqueue */ -void grpc_workqueue_push (grpc_workqueue * workqueue, grpc_closure * closure, int success); +void grpc_workqueue_push(grpc_workqueue *workqueue, grpc_closure *closure, + int success); #endif diff --git a/src/core/iomgr/workqueue_posix.c b/src/core/iomgr/workqueue_posix.c index 91ac0f32e4c..2e510ee5a2d 100644 --- a/src/core/iomgr/workqueue_posix.c +++ b/src/core/iomgr/workqueue_posix.c @@ -45,110 +45,98 @@ #include "src/core/iomgr/fd_posix.h" -static void on_readable (grpc_exec_ctx * exec_ctx, void *arg, int success); +static void on_readable(grpc_exec_ctx *exec_ctx, void *arg, int success); -grpc_workqueue * -grpc_workqueue_create (grpc_exec_ctx *exec_ctx) -{ +grpc_workqueue *grpc_workqueue_create(grpc_exec_ctx *exec_ctx) { char name[32]; - grpc_workqueue *workqueue = gpr_malloc (sizeof (grpc_workqueue)); - gpr_ref_init (&workqueue->refs, 1); - gpr_mu_init (&workqueue->mu); + grpc_workqueue *workqueue = gpr_malloc(sizeof(grpc_workqueue)); + gpr_ref_init(&workqueue->refs, 1); + gpr_mu_init(&workqueue->mu); workqueue->closure_list.head = workqueue->closure_list.tail = NULL; - grpc_wakeup_fd_init (&workqueue->wakeup_fd); - sprintf (name, "workqueue:%p", (void *) workqueue); - workqueue->wakeup_read_fd = grpc_fd_create (GRPC_WAKEUP_FD_GET_READ_FD (&workqueue->wakeup_fd), name); - grpc_closure_init (&workqueue->read_closure, on_readable, workqueue); - grpc_fd_notify_on_read (exec_ctx, workqueue->wakeup_read_fd, &workqueue->read_closure); + grpc_wakeup_fd_init(&workqueue->wakeup_fd); + sprintf(name, "workqueue:%p", (void *)workqueue); + workqueue->wakeup_read_fd = + grpc_fd_create(GRPC_WAKEUP_FD_GET_READ_FD(&workqueue->wakeup_fd), name); + grpc_closure_init(&workqueue->read_closure, on_readable, workqueue); + grpc_fd_notify_on_read(exec_ctx, workqueue->wakeup_read_fd, + &workqueue->read_closure); return workqueue; } -static void -workqueue_destroy (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue) -{ - GPR_ASSERT (grpc_closure_list_empty (workqueue->closure_list)); - grpc_fd_shutdown (exec_ctx, workqueue->wakeup_read_fd); +static void workqueue_destroy(grpc_exec_ctx *exec_ctx, + grpc_workqueue *workqueue) { + GPR_ASSERT(grpc_closure_list_empty(workqueue->closure_list)); + grpc_fd_shutdown(exec_ctx, workqueue->wakeup_read_fd); } #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG -void -grpc_workqueue_ref (grpc_workqueue * workqueue, const char *file, int line, const char *reason) -{ - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p ref %d -> %d %s", workqueue, (int) workqueue->refs.count, (int) workqueue->refs.count + 1, reason); +void grpc_workqueue_ref(grpc_workqueue *workqueue, const char *file, int line, + const char *reason) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p ref %d -> %d %s", + workqueue, (int)workqueue->refs.count, (int)workqueue->refs.count + 1, + reason); #else -void -grpc_workqueue_ref (grpc_workqueue * workqueue) -{ +void grpc_workqueue_ref(grpc_workqueue *workqueue) { #endif - gpr_ref (&workqueue->refs); + gpr_ref(&workqueue->refs); } #ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG -void -grpc_workqueue_unref (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue, const char *file, int line, const char *reason) -{ - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p unref %d -> %d %s", workqueue, (int) workqueue->refs.count, (int) workqueue->refs.count - 1, reason); +void grpc_workqueue_unref(grpc_exec_ctx *exec_ctx, grpc_workqueue *workqueue, + const char *file, int line, const char *reason) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p unref %d -> %d %s", + workqueue, (int)workqueue->refs.count, (int)workqueue->refs.count - 1, + reason); #else -void -grpc_workqueue_unref (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue) -{ +void grpc_workqueue_unref(grpc_exec_ctx *exec_ctx, grpc_workqueue *workqueue) { #endif - if (gpr_unref (&workqueue->refs)) - { - workqueue_destroy (exec_ctx, workqueue); - } + if (gpr_unref(&workqueue->refs)) { + workqueue_destroy(exec_ctx, workqueue); + } } -void -grpc_workqueue_add_to_pollset (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue, grpc_pollset * pollset) -{ - grpc_pollset_add_fd (exec_ctx, pollset, workqueue->wakeup_read_fd); +void grpc_workqueue_add_to_pollset(grpc_exec_ctx *exec_ctx, + grpc_workqueue *workqueue, + grpc_pollset *pollset) { + grpc_pollset_add_fd(exec_ctx, pollset, workqueue->wakeup_read_fd); } -void -grpc_workqueue_flush (grpc_exec_ctx * exec_ctx, grpc_workqueue * workqueue) -{ - gpr_mu_lock (&workqueue->mu); - grpc_closure_list_move (&exec_ctx->closure_list, &workqueue->closure_list); - gpr_mu_unlock (&workqueue->mu); +void grpc_workqueue_flush(grpc_exec_ctx *exec_ctx, grpc_workqueue *workqueue) { + gpr_mu_lock(&workqueue->mu); + grpc_closure_list_move(&exec_ctx->closure_list, &workqueue->closure_list); + gpr_mu_unlock(&workqueue->mu); } -static void -on_readable (grpc_exec_ctx * exec_ctx, void *arg, int success) -{ +static void on_readable(grpc_exec_ctx *exec_ctx, void *arg, int success) { grpc_workqueue *workqueue = arg; - if (!success) - { - gpr_mu_destroy (&workqueue->mu); - /* HACK: let wakeup_fd code know that we stole the fd */ - workqueue->wakeup_fd.read_fd = 0; - grpc_wakeup_fd_destroy (&workqueue->wakeup_fd); - grpc_fd_orphan (exec_ctx, workqueue->wakeup_read_fd, NULL, "destroy"); - gpr_free (workqueue); - } - else - { - gpr_mu_lock (&workqueue->mu); - grpc_closure_list_move (&exec_ctx->closure_list, &workqueue->closure_list); - grpc_wakeup_fd_consume_wakeup (&workqueue->wakeup_fd); - gpr_mu_unlock (&workqueue->mu); - grpc_fd_notify_on_read (exec_ctx, workqueue->wakeup_read_fd, &workqueue->read_closure); - } + if (!success) { + gpr_mu_destroy(&workqueue->mu); + /* HACK: let wakeup_fd code know that we stole the fd */ + workqueue->wakeup_fd.read_fd = 0; + grpc_wakeup_fd_destroy(&workqueue->wakeup_fd); + grpc_fd_orphan(exec_ctx, workqueue->wakeup_read_fd, NULL, "destroy"); + gpr_free(workqueue); + } else { + gpr_mu_lock(&workqueue->mu); + grpc_closure_list_move(&exec_ctx->closure_list, &workqueue->closure_list); + grpc_wakeup_fd_consume_wakeup(&workqueue->wakeup_fd); + gpr_mu_unlock(&workqueue->mu); + grpc_fd_notify_on_read(exec_ctx, workqueue->wakeup_read_fd, + &workqueue->read_closure); + } } -void -grpc_workqueue_push (grpc_workqueue * workqueue, grpc_closure * closure, int success) -{ +void grpc_workqueue_push(grpc_workqueue *workqueue, grpc_closure *closure, + int success) { closure->success = success; closure->next = NULL; - gpr_mu_lock (&workqueue->mu); - if (grpc_closure_list_empty (workqueue->closure_list)) - { - grpc_wakeup_fd_wakeup (&workqueue->wakeup_fd); - } - grpc_closure_list_add (&workqueue->closure_list, closure, success); - gpr_mu_unlock (&workqueue->mu); + gpr_mu_lock(&workqueue->mu); + if (grpc_closure_list_empty(workqueue->closure_list)) { + grpc_wakeup_fd_wakeup(&workqueue->wakeup_fd); + } + grpc_closure_list_add(&workqueue->closure_list, closure, success); + gpr_mu_unlock(&workqueue->mu); } #endif /* GPR_POSIX_SOCKET */ diff --git a/src/core/iomgr/workqueue_posix.h b/src/core/iomgr/workqueue_posix.h index 48c5af9caee..589034fe1bb 100644 --- a/src/core/iomgr/workqueue_posix.h +++ b/src/core/iomgr/workqueue_posix.h @@ -36,8 +36,7 @@ struct grpc_fd; -struct grpc_workqueue -{ +struct grpc_workqueue { gpr_refcount refs; gpr_mu mu; diff --git a/src/core/json/json.c b/src/core/json/json.c index a44e74b1e1d..96e11eebb11 100644 --- a/src/core/json/json.c +++ b/src/core/json/json.c @@ -37,37 +37,28 @@ #include "src/core/json/json.h" -grpc_json * -grpc_json_create (grpc_json_type type) -{ - grpc_json *json = gpr_malloc (sizeof (*json)); - memset (json, 0, sizeof (*json)); +grpc_json *grpc_json_create(grpc_json_type type) { + grpc_json *json = gpr_malloc(sizeof(*json)); + memset(json, 0, sizeof(*json)); json->type = type; return json; } -void -grpc_json_destroy (grpc_json * json) -{ - while (json->child) - { - grpc_json_destroy (json->child); - } +void grpc_json_destroy(grpc_json *json) { + while (json->child) { + grpc_json_destroy(json->child); + } - if (json->next) - { - json->next->prev = json->prev; - } + if (json->next) { + json->next->prev = json->prev; + } - if (json->prev) - { - json->prev->next = json->next; - } - else if (json->parent) - { - json->parent->child = json->next; - } + if (json->prev) { + json->prev->next = json->next; + } else if (json->parent) { + json->parent->child = json->next; + } - gpr_free (json); + gpr_free(json); } diff --git a/src/core/json/json.h b/src/core/json/json.h index 37584ee2622..c4df2998c3a 100644 --- a/src/core/json/json.h +++ b/src/core/json/json.h @@ -41,8 +41,7 @@ /* A tree-like structure to hold json values. The key and value pointers * are not owned by it. */ -typedef struct grpc_json -{ +typedef struct grpc_json { struct grpc_json *next; struct grpc_json *prev; struct grpc_json *child; @@ -66,8 +65,8 @@ typedef struct grpc_json * * Delete the allocated tree afterward using grpc_json_destroy(). */ -grpc_json *grpc_json_parse_string_with_len (char *input, size_t size); -grpc_json *grpc_json_parse_string (char *input); +grpc_json *grpc_json_parse_string_with_len(char *input, size_t size); +grpc_json *grpc_json_parse_string(char *input); /* This function will create a new string using gpr_realloc, and will * deserialize the grpc_json tree into it. It'll be zero-terminated, @@ -77,13 +76,13 @@ grpc_json *grpc_json_parse_string (char *input); * If indent is 0, then newlines will be suppressed as well, and the * output will be condensed at its maximum. */ -char *grpc_json_dump_to_string (grpc_json * json, int indent); +char *grpc_json_dump_to_string(grpc_json *json, int indent); /* Use these to create or delete a grpc_json object. * Deletion is recursive. We will not attempt to free any of the strings * in any of the objects of that tree. */ -grpc_json *grpc_json_create (grpc_json_type type); -void grpc_json_destroy (grpc_json * json); +grpc_json *grpc_json_create(grpc_json_type type); +void grpc_json_destroy(grpc_json *json); #endif /* GRPC_INTERNAL_CORE_JSON_JSON_H */ diff --git a/src/core/json/json_common.h b/src/core/json/json_common.h index f9dbeb47664..481695b38b8 100644 --- a/src/core/json/json_common.h +++ b/src/core/json/json_common.h @@ -35,8 +35,7 @@ #define GRPC_INTERNAL_CORE_JSON_JSON_COMMON_H /* The various json types. */ -typedef enum -{ +typedef enum { GRPC_JSON_OBJECT, GRPC_JSON_ARRAY, GRPC_JSON_STRING, diff --git a/src/core/json/json_reader.c b/src/core/json/json_reader.c index 70dfe0efcf6..8abad012528 100644 --- a/src/core/json/json_reader.c +++ b/src/core/json/json_reader.c @@ -37,718 +37,623 @@ #include "src/core/json/json_reader.h" -static void -json_reader_string_clear (grpc_json_reader * reader) -{ - reader->vtable->string_clear (reader->userdata); +static void json_reader_string_clear(grpc_json_reader *reader) { + reader->vtable->string_clear(reader->userdata); } -static void -json_reader_string_add_char (grpc_json_reader * reader, gpr_uint32 c) -{ - reader->vtable->string_add_char (reader->userdata, c); +static void json_reader_string_add_char(grpc_json_reader *reader, + gpr_uint32 c) { + reader->vtable->string_add_char(reader->userdata, c); } -static void -json_reader_string_add_utf32 (grpc_json_reader * reader, gpr_uint32 utf32) -{ - reader->vtable->string_add_utf32 (reader->userdata, utf32); +static void json_reader_string_add_utf32(grpc_json_reader *reader, + gpr_uint32 utf32) { + reader->vtable->string_add_utf32(reader->userdata, utf32); } -static gpr_uint32 -grpc_json_reader_read_char (grpc_json_reader * reader) -{ - return reader->vtable->read_char (reader->userdata); +static gpr_uint32 grpc_json_reader_read_char(grpc_json_reader *reader) { + return reader->vtable->read_char(reader->userdata); } -static void -json_reader_container_begins (grpc_json_reader * reader, grpc_json_type type) -{ - reader->vtable->container_begins (reader->userdata, type); +static void json_reader_container_begins(grpc_json_reader *reader, + grpc_json_type type) { + reader->vtable->container_begins(reader->userdata, type); } -static grpc_json_type -grpc_json_reader_container_ends (grpc_json_reader * reader) -{ - return reader->vtable->container_ends (reader->userdata); +static grpc_json_type grpc_json_reader_container_ends( + grpc_json_reader *reader) { + return reader->vtable->container_ends(reader->userdata); } -static void -json_reader_set_key (grpc_json_reader * reader) -{ - reader->vtable->set_key (reader->userdata); +static void json_reader_set_key(grpc_json_reader *reader) { + reader->vtable->set_key(reader->userdata); } -static void -json_reader_set_string (grpc_json_reader * reader) -{ - reader->vtable->set_string (reader->userdata); +static void json_reader_set_string(grpc_json_reader *reader) { + reader->vtable->set_string(reader->userdata); } -static int -json_reader_set_number (grpc_json_reader * reader) -{ - return reader->vtable->set_number (reader->userdata); +static int json_reader_set_number(grpc_json_reader *reader) { + return reader->vtable->set_number(reader->userdata); } -static void -json_reader_set_true (grpc_json_reader * reader) -{ - reader->vtable->set_true (reader->userdata); +static void json_reader_set_true(grpc_json_reader *reader) { + reader->vtable->set_true(reader->userdata); } -static void -json_reader_set_false (grpc_json_reader * reader) -{ - reader->vtable->set_false (reader->userdata); +static void json_reader_set_false(grpc_json_reader *reader) { + reader->vtable->set_false(reader->userdata); } -static void -json_reader_set_null (grpc_json_reader * reader) -{ - reader->vtable->set_null (reader->userdata); +static void json_reader_set_null(grpc_json_reader *reader) { + reader->vtable->set_null(reader->userdata); } /* Call this function to initialize the reader structure. */ -void -grpc_json_reader_init (grpc_json_reader * reader, grpc_json_reader_vtable * vtable, void *userdata) -{ - memset (reader, 0, sizeof (*reader)); +void grpc_json_reader_init(grpc_json_reader *reader, + grpc_json_reader_vtable *vtable, void *userdata) { + memset(reader, 0, sizeof(*reader)); reader->vtable = vtable; reader->userdata = userdata; - json_reader_string_clear (reader); + json_reader_string_clear(reader); reader->state = GRPC_JSON_STATE_VALUE_BEGIN; } -int -grpc_json_reader_is_complete (grpc_json_reader * reader) -{ - return ((reader->depth == 0) && ((reader->state == GRPC_JSON_STATE_END) || (reader->state == GRPC_JSON_STATE_VALUE_END))); +int grpc_json_reader_is_complete(grpc_json_reader *reader) { + return ((reader->depth == 0) && + ((reader->state == GRPC_JSON_STATE_END) || + (reader->state == GRPC_JSON_STATE_VALUE_END))); } -grpc_json_reader_status -grpc_json_reader_run (grpc_json_reader * reader) -{ +grpc_json_reader_status grpc_json_reader_run(grpc_json_reader *reader) { gpr_uint32 c, success; /* This state-machine is a strict implementation of ECMA-404 */ - for (;;) - { - c = grpc_json_reader_read_char (reader); - switch (c) - { - /* Let's process the error cases first. */ - case GRPC_JSON_READ_CHAR_ERROR: - return GRPC_JSON_READ_ERROR; - - case GRPC_JSON_READ_CHAR_EAGAIN: - return GRPC_JSON_EAGAIN; - - case GRPC_JSON_READ_CHAR_EOF: - if (grpc_json_reader_is_complete (reader)) - { - return GRPC_JSON_DONE; - } - else - { - return GRPC_JSON_PARSE_ERROR; - } - break; - - /* Processing whitespaces. */ - case ' ': - case '\t': - case '\n': - case '\r': - switch (reader->state) - { - case GRPC_JSON_STATE_OBJECT_KEY_BEGIN: - case GRPC_JSON_STATE_OBJECT_KEY_END: - case GRPC_JSON_STATE_VALUE_BEGIN: - case GRPC_JSON_STATE_VALUE_END: - case GRPC_JSON_STATE_END: - break; - - case GRPC_JSON_STATE_OBJECT_KEY_STRING: - case GRPC_JSON_STATE_VALUE_STRING: - if (c != ' ') - return GRPC_JSON_PARSE_ERROR; - if (reader->unicode_high_surrogate != 0) - return GRPC_JSON_PARSE_ERROR; - json_reader_string_add_char (reader, c); - break; - - case GRPC_JSON_STATE_VALUE_NUMBER: - case GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL: - case GRPC_JSON_STATE_VALUE_NUMBER_ZERO: - case GRPC_JSON_STATE_VALUE_NUMBER_EPM: - success = (gpr_uint32) json_reader_set_number (reader); - if (!success) - return GRPC_JSON_PARSE_ERROR; - json_reader_string_clear (reader); - reader->state = GRPC_JSON_STATE_VALUE_END; - break; - - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - /* Value, object or array terminations. */ - case ',': - case '}': - case ']': - switch (reader->state) - { - case GRPC_JSON_STATE_OBJECT_KEY_STRING: - case GRPC_JSON_STATE_VALUE_STRING: - if (reader->unicode_high_surrogate != 0) - return GRPC_JSON_PARSE_ERROR; - json_reader_string_add_char (reader, c); - break; - - case GRPC_JSON_STATE_VALUE_NUMBER: - case GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL: - case GRPC_JSON_STATE_VALUE_NUMBER_ZERO: - case GRPC_JSON_STATE_VALUE_NUMBER_EPM: - success = (gpr_uint32) json_reader_set_number (reader); - if (!success) - return GRPC_JSON_PARSE_ERROR; - json_reader_string_clear (reader); - reader->state = GRPC_JSON_STATE_VALUE_END; - /* The missing break here is intentional. */ - - case GRPC_JSON_STATE_VALUE_END: - case GRPC_JSON_STATE_OBJECT_KEY_BEGIN: - case GRPC_JSON_STATE_VALUE_BEGIN: - if (c == ',') - { - if (reader->state != GRPC_JSON_STATE_VALUE_END) - { - return GRPC_JSON_PARSE_ERROR; - } - if (reader->in_object) - { - reader->state = GRPC_JSON_STATE_OBJECT_KEY_BEGIN; - } - else - { - reader->state = GRPC_JSON_STATE_VALUE_BEGIN; - } - } - else - { - if (reader->depth-- == 0) - return GRPC_JSON_PARSE_ERROR; - if ((c == '}') && !reader->in_object) - { - return GRPC_JSON_PARSE_ERROR; - } - if ((c == '}') && (reader->state == GRPC_JSON_STATE_OBJECT_KEY_BEGIN) && !reader->container_just_begun) - { - return GRPC_JSON_PARSE_ERROR; - } - if ((c == ']') && !reader->in_array) - return GRPC_JSON_PARSE_ERROR; - if ((c == ']') && (reader->state == GRPC_JSON_STATE_VALUE_BEGIN) && !reader->container_just_begun) - { - return GRPC_JSON_PARSE_ERROR; - } - reader->state = GRPC_JSON_STATE_VALUE_END; - switch (grpc_json_reader_container_ends (reader)) - { - case GRPC_JSON_OBJECT: - reader->in_object = 1; - reader->in_array = 0; - break; - case GRPC_JSON_ARRAY: - reader->in_object = 0; - reader->in_array = 1; - break; - case GRPC_JSON_TOP_LEVEL: - if (reader->depth != 0) - return GRPC_JSON_INTERNAL_ERROR; - reader->in_object = 0; - reader->in_array = 0; - reader->state = GRPC_JSON_STATE_END; - break; - default: - return GRPC_JSON_INTERNAL_ERROR; - } - } - break; - - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - /* In-string escaping. */ - case '\\': - switch (reader->state) - { - case GRPC_JSON_STATE_OBJECT_KEY_STRING: - reader->escaped_string_was_key = 1; - reader->state = GRPC_JSON_STATE_STRING_ESCAPE; - break; - - case GRPC_JSON_STATE_VALUE_STRING: - reader->escaped_string_was_key = 0; - reader->state = GRPC_JSON_STATE_STRING_ESCAPE; - break; - - /* This is the \\ case. */ - case GRPC_JSON_STATE_STRING_ESCAPE: - if (reader->unicode_high_surrogate != 0) - return GRPC_JSON_PARSE_ERROR; - json_reader_string_add_char (reader, '\\'); - if (reader->escaped_string_was_key) - { - reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; - } - else - { - reader->state = GRPC_JSON_STATE_VALUE_STRING; - } - break; - - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - default: - reader->container_just_begun = 0; - switch (reader->state) - { - case GRPC_JSON_STATE_OBJECT_KEY_BEGIN: - if (c != '"') - return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; - break; - - case GRPC_JSON_STATE_OBJECT_KEY_STRING: - if (reader->unicode_high_surrogate != 0) - return GRPC_JSON_PARSE_ERROR; - if (c == '"') - { - reader->state = GRPC_JSON_STATE_OBJECT_KEY_END; - json_reader_set_key (reader); - json_reader_string_clear (reader); - } - else - { - if (c <= 0x001f) - return GRPC_JSON_PARSE_ERROR; - json_reader_string_add_char (reader, c); - } - break; - - case GRPC_JSON_STATE_VALUE_STRING: - if (reader->unicode_high_surrogate != 0) - return GRPC_JSON_PARSE_ERROR; - if (c == '"') - { - reader->state = GRPC_JSON_STATE_VALUE_END; - json_reader_set_string (reader); - json_reader_string_clear (reader); - } - else - { - if (c < 32) - return GRPC_JSON_PARSE_ERROR; - json_reader_string_add_char (reader, c); - } - break; - - case GRPC_JSON_STATE_OBJECT_KEY_END: - if (c != ':') - return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_BEGIN; - break; - - case GRPC_JSON_STATE_VALUE_BEGIN: - switch (c) - { - case 't': - reader->state = GRPC_JSON_STATE_VALUE_TRUE_R; - break; - - case 'f': - reader->state = GRPC_JSON_STATE_VALUE_FALSE_A; - break; - - case 'n': - reader->state = GRPC_JSON_STATE_VALUE_NULL_U; - break; - - case '"': - reader->state = GRPC_JSON_STATE_VALUE_STRING; - break; - - case '0': - json_reader_string_add_char (reader, c); - reader->state = GRPC_JSON_STATE_VALUE_NUMBER_ZERO; - break; - - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - case '-': - json_reader_string_add_char (reader, c); - reader->state = GRPC_JSON_STATE_VALUE_NUMBER; - break; - - case '{': - reader->container_just_begun = 1; - json_reader_container_begins (reader, GRPC_JSON_OBJECT); - reader->depth++; - reader->state = GRPC_JSON_STATE_OBJECT_KEY_BEGIN; - reader->in_object = 1; - reader->in_array = 0; - break; - - case '[': - reader->container_just_begun = 1; - json_reader_container_begins (reader, GRPC_JSON_ARRAY); - reader->depth++; - reader->in_object = 0; - reader->in_array = 1; - break; - } - break; - - case GRPC_JSON_STATE_STRING_ESCAPE: - if (reader->escaped_string_was_key) - { - reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; - } - else - { - reader->state = GRPC_JSON_STATE_VALUE_STRING; - } - if (reader->unicode_high_surrogate && c != 'u') - return GRPC_JSON_PARSE_ERROR; - switch (c) - { - case '"': - case '/': - json_reader_string_add_char (reader, c); - break; - case 'b': - json_reader_string_add_char (reader, '\b'); - break; - case 'f': - json_reader_string_add_char (reader, '\f'); - break; - case 'n': - json_reader_string_add_char (reader, '\n'); - break; - case 'r': - json_reader_string_add_char (reader, '\r'); - break; - case 't': - json_reader_string_add_char (reader, '\t'); - break; - case 'u': - reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U1; - reader->unicode_char = 0; - break; - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - case GRPC_JSON_STATE_STRING_ESCAPE_U1: - case GRPC_JSON_STATE_STRING_ESCAPE_U2: - case GRPC_JSON_STATE_STRING_ESCAPE_U3: - case GRPC_JSON_STATE_STRING_ESCAPE_U4: - if ((c >= '0') && (c <= '9')) - { - c -= '0'; - } - else if ((c >= 'A') && (c <= 'F')) - { - c -= 'A' - 10; - } - else if ((c >= 'a') && (c <= 'f')) - { - c -= 'a' - 10; - } - else - { - return GRPC_JSON_PARSE_ERROR; - } - reader->unicode_char = (gpr_uint16) (reader->unicode_char << 4); - reader->unicode_char = (gpr_uint16) (reader->unicode_char | c); - - switch (reader->state) - { - case GRPC_JSON_STATE_STRING_ESCAPE_U1: - reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U2; - break; - case GRPC_JSON_STATE_STRING_ESCAPE_U2: - reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U3; - break; - case GRPC_JSON_STATE_STRING_ESCAPE_U3: - reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U4; - break; - case GRPC_JSON_STATE_STRING_ESCAPE_U4: - /* See grpc_json_writer_escape_string to have a description - * of what's going on here. - */ - if ((reader->unicode_char & 0xfc00) == 0xd800) - { - /* high surrogate utf-16 */ - if (reader->unicode_high_surrogate != 0) - return GRPC_JSON_PARSE_ERROR; - reader->unicode_high_surrogate = reader->unicode_char; - } - else if ((reader->unicode_char & 0xfc00) == 0xdc00) - { - /* low surrogate utf-16 */ - gpr_uint32 utf32; - if (reader->unicode_high_surrogate == 0) - return GRPC_JSON_PARSE_ERROR; - utf32 = 0x10000; - utf32 += (gpr_uint32) ((reader->unicode_high_surrogate - 0xd800) * 0x400); - utf32 += (gpr_uint32) (reader->unicode_char - 0xdc00); - json_reader_string_add_utf32 (reader, utf32); - reader->unicode_high_surrogate = 0; - } - else - { - /* anything else */ - if (reader->unicode_high_surrogate != 0) - return GRPC_JSON_PARSE_ERROR; - json_reader_string_add_utf32 (reader, reader->unicode_char); - } - if (reader->escaped_string_was_key) - { - reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; - } - else - { - reader->state = GRPC_JSON_STATE_VALUE_STRING; - } - break; - default: - return GRPC_JSON_INTERNAL_ERROR; - } - break; - - case GRPC_JSON_STATE_VALUE_NUMBER: - json_reader_string_add_char (reader, c); - switch (c) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - break; - case 'e': - case 'E': - reader->state = GRPC_JSON_STATE_VALUE_NUMBER_E; - break; - case '.': - reader->state = GRPC_JSON_STATE_VALUE_NUMBER_DOT; - break; - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - case GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL: - json_reader_string_add_char (reader, c); - switch (c) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - break; - case 'e': - case 'E': - reader->state = GRPC_JSON_STATE_VALUE_NUMBER_E; - break; - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - case GRPC_JSON_STATE_VALUE_NUMBER_ZERO: - if (c != '.') - return GRPC_JSON_PARSE_ERROR; - json_reader_string_add_char (reader, c); - reader->state = GRPC_JSON_STATE_VALUE_NUMBER_DOT; - break; - - case GRPC_JSON_STATE_VALUE_NUMBER_DOT: - json_reader_string_add_char (reader, c); - switch (c) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - reader->state = GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL; - break; - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - case GRPC_JSON_STATE_VALUE_NUMBER_E: - json_reader_string_add_char (reader, c); - switch (c) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - case '+': - case '-': - reader->state = GRPC_JSON_STATE_VALUE_NUMBER_EPM; - break; - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - case GRPC_JSON_STATE_VALUE_NUMBER_EPM: - json_reader_string_add_char (reader, c); - switch (c) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - break; - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - case GRPC_JSON_STATE_VALUE_TRUE_R: - if (c != 'r') - return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_TRUE_U; - break; - - case GRPC_JSON_STATE_VALUE_TRUE_U: - if (c != 'u') - return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_TRUE_E; - break; - - case GRPC_JSON_STATE_VALUE_TRUE_E: - if (c != 'e') - return GRPC_JSON_PARSE_ERROR; - json_reader_set_true (reader); - reader->state = GRPC_JSON_STATE_VALUE_END; - break; - - case GRPC_JSON_STATE_VALUE_FALSE_A: - if (c != 'a') - return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_FALSE_L; - break; - - case GRPC_JSON_STATE_VALUE_FALSE_L: - if (c != 'l') - return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_FALSE_S; - break; - - case GRPC_JSON_STATE_VALUE_FALSE_S: - if (c != 's') - return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_FALSE_E; - break; - - case GRPC_JSON_STATE_VALUE_FALSE_E: - if (c != 'e') - return GRPC_JSON_PARSE_ERROR; - json_reader_set_false (reader); - reader->state = GRPC_JSON_STATE_VALUE_END; - break; - - case GRPC_JSON_STATE_VALUE_NULL_U: - if (c != 'u') - return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_NULL_L1; - break; - - case GRPC_JSON_STATE_VALUE_NULL_L1: - if (c != 'l') - return GRPC_JSON_PARSE_ERROR; - reader->state = GRPC_JSON_STATE_VALUE_NULL_L2; - break; - - case GRPC_JSON_STATE_VALUE_NULL_L2: - if (c != 'l') - return GRPC_JSON_PARSE_ERROR; - json_reader_set_null (reader); - reader->state = GRPC_JSON_STATE_VALUE_END; - break; - - /* All of the VALUE_END cases are handled in the specialized case - * above. */ - case GRPC_JSON_STATE_VALUE_END: - switch (c) - { - case ',': - case '}': - case ']': - return GRPC_JSON_INTERNAL_ERROR; - break; - - default: - return GRPC_JSON_PARSE_ERROR; - } - break; - - case GRPC_JSON_STATE_END: - return GRPC_JSON_PARSE_ERROR; - } - } + for (;;) { + c = grpc_json_reader_read_char(reader); + switch (c) { + /* Let's process the error cases first. */ + case GRPC_JSON_READ_CHAR_ERROR: + return GRPC_JSON_READ_ERROR; + + case GRPC_JSON_READ_CHAR_EAGAIN: + return GRPC_JSON_EAGAIN; + + case GRPC_JSON_READ_CHAR_EOF: + if (grpc_json_reader_is_complete(reader)) { + return GRPC_JSON_DONE; + } else { + return GRPC_JSON_PARSE_ERROR; + } + break; + + /* Processing whitespaces. */ + case ' ': + case '\t': + case '\n': + case '\r': + switch (reader->state) { + case GRPC_JSON_STATE_OBJECT_KEY_BEGIN: + case GRPC_JSON_STATE_OBJECT_KEY_END: + case GRPC_JSON_STATE_VALUE_BEGIN: + case GRPC_JSON_STATE_VALUE_END: + case GRPC_JSON_STATE_END: + break; + + case GRPC_JSON_STATE_OBJECT_KEY_STRING: + case GRPC_JSON_STATE_VALUE_STRING: + if (c != ' ') return GRPC_JSON_PARSE_ERROR; + if (reader->unicode_high_surrogate != 0) + return GRPC_JSON_PARSE_ERROR; + json_reader_string_add_char(reader, c); + break; + + case GRPC_JSON_STATE_VALUE_NUMBER: + case GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL: + case GRPC_JSON_STATE_VALUE_NUMBER_ZERO: + case GRPC_JSON_STATE_VALUE_NUMBER_EPM: + success = (gpr_uint32)json_reader_set_number(reader); + if (!success) return GRPC_JSON_PARSE_ERROR; + json_reader_string_clear(reader); + reader->state = GRPC_JSON_STATE_VALUE_END; + break; + + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + /* Value, object or array terminations. */ + case ',': + case '}': + case ']': + switch (reader->state) { + case GRPC_JSON_STATE_OBJECT_KEY_STRING: + case GRPC_JSON_STATE_VALUE_STRING: + if (reader->unicode_high_surrogate != 0) + return GRPC_JSON_PARSE_ERROR; + json_reader_string_add_char(reader, c); + break; + + case GRPC_JSON_STATE_VALUE_NUMBER: + case GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL: + case GRPC_JSON_STATE_VALUE_NUMBER_ZERO: + case GRPC_JSON_STATE_VALUE_NUMBER_EPM: + success = (gpr_uint32)json_reader_set_number(reader); + if (!success) return GRPC_JSON_PARSE_ERROR; + json_reader_string_clear(reader); + reader->state = GRPC_JSON_STATE_VALUE_END; + /* The missing break here is intentional. */ + + case GRPC_JSON_STATE_VALUE_END: + case GRPC_JSON_STATE_OBJECT_KEY_BEGIN: + case GRPC_JSON_STATE_VALUE_BEGIN: + if (c == ',') { + if (reader->state != GRPC_JSON_STATE_VALUE_END) { + return GRPC_JSON_PARSE_ERROR; + } + if (reader->in_object) { + reader->state = GRPC_JSON_STATE_OBJECT_KEY_BEGIN; + } else { + reader->state = GRPC_JSON_STATE_VALUE_BEGIN; + } + } else { + if (reader->depth-- == 0) return GRPC_JSON_PARSE_ERROR; + if ((c == '}') && !reader->in_object) { + return GRPC_JSON_PARSE_ERROR; + } + if ((c == '}') && + (reader->state == GRPC_JSON_STATE_OBJECT_KEY_BEGIN) && + !reader->container_just_begun) { + return GRPC_JSON_PARSE_ERROR; + } + if ((c == ']') && !reader->in_array) return GRPC_JSON_PARSE_ERROR; + if ((c == ']') && + (reader->state == GRPC_JSON_STATE_VALUE_BEGIN) && + !reader->container_just_begun) { + return GRPC_JSON_PARSE_ERROR; + } + reader->state = GRPC_JSON_STATE_VALUE_END; + switch (grpc_json_reader_container_ends(reader)) { + case GRPC_JSON_OBJECT: + reader->in_object = 1; + reader->in_array = 0; + break; + case GRPC_JSON_ARRAY: + reader->in_object = 0; + reader->in_array = 1; + break; + case GRPC_JSON_TOP_LEVEL: + if (reader->depth != 0) return GRPC_JSON_INTERNAL_ERROR; + reader->in_object = 0; + reader->in_array = 0; + reader->state = GRPC_JSON_STATE_END; + break; + default: + return GRPC_JSON_INTERNAL_ERROR; + } + } + break; + + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + /* In-string escaping. */ + case '\\': + switch (reader->state) { + case GRPC_JSON_STATE_OBJECT_KEY_STRING: + reader->escaped_string_was_key = 1; + reader->state = GRPC_JSON_STATE_STRING_ESCAPE; + break; + + case GRPC_JSON_STATE_VALUE_STRING: + reader->escaped_string_was_key = 0; + reader->state = GRPC_JSON_STATE_STRING_ESCAPE; + break; + + /* This is the \\ case. */ + case GRPC_JSON_STATE_STRING_ESCAPE: + if (reader->unicode_high_surrogate != 0) + return GRPC_JSON_PARSE_ERROR; + json_reader_string_add_char(reader, '\\'); + if (reader->escaped_string_was_key) { + reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; + } else { + reader->state = GRPC_JSON_STATE_VALUE_STRING; + } + break; + + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + default: + reader->container_just_begun = 0; + switch (reader->state) { + case GRPC_JSON_STATE_OBJECT_KEY_BEGIN: + if (c != '"') return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; + break; + + case GRPC_JSON_STATE_OBJECT_KEY_STRING: + if (reader->unicode_high_surrogate != 0) + return GRPC_JSON_PARSE_ERROR; + if (c == '"') { + reader->state = GRPC_JSON_STATE_OBJECT_KEY_END; + json_reader_set_key(reader); + json_reader_string_clear(reader); + } else { + if (c <= 0x001f) return GRPC_JSON_PARSE_ERROR; + json_reader_string_add_char(reader, c); + } + break; + + case GRPC_JSON_STATE_VALUE_STRING: + if (reader->unicode_high_surrogate != 0) + return GRPC_JSON_PARSE_ERROR; + if (c == '"') { + reader->state = GRPC_JSON_STATE_VALUE_END; + json_reader_set_string(reader); + json_reader_string_clear(reader); + } else { + if (c < 32) return GRPC_JSON_PARSE_ERROR; + json_reader_string_add_char(reader, c); + } + break; + + case GRPC_JSON_STATE_OBJECT_KEY_END: + if (c != ':') return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_BEGIN; + break; + + case GRPC_JSON_STATE_VALUE_BEGIN: + switch (c) { + case 't': + reader->state = GRPC_JSON_STATE_VALUE_TRUE_R; + break; + + case 'f': + reader->state = GRPC_JSON_STATE_VALUE_FALSE_A; + break; + + case 'n': + reader->state = GRPC_JSON_STATE_VALUE_NULL_U; + break; + + case '"': + reader->state = GRPC_JSON_STATE_VALUE_STRING; + break; + + case '0': + json_reader_string_add_char(reader, c); + reader->state = GRPC_JSON_STATE_VALUE_NUMBER_ZERO; + break; + + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '-': + json_reader_string_add_char(reader, c); + reader->state = GRPC_JSON_STATE_VALUE_NUMBER; + break; + + case '{': + reader->container_just_begun = 1; + json_reader_container_begins(reader, GRPC_JSON_OBJECT); + reader->depth++; + reader->state = GRPC_JSON_STATE_OBJECT_KEY_BEGIN; + reader->in_object = 1; + reader->in_array = 0; + break; + + case '[': + reader->container_just_begun = 1; + json_reader_container_begins(reader, GRPC_JSON_ARRAY); + reader->depth++; + reader->in_object = 0; + reader->in_array = 1; + break; + } + break; + + case GRPC_JSON_STATE_STRING_ESCAPE: + if (reader->escaped_string_was_key) { + reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; + } else { + reader->state = GRPC_JSON_STATE_VALUE_STRING; + } + if (reader->unicode_high_surrogate && c != 'u') + return GRPC_JSON_PARSE_ERROR; + switch (c) { + case '"': + case '/': + json_reader_string_add_char(reader, c); + break; + case 'b': + json_reader_string_add_char(reader, '\b'); + break; + case 'f': + json_reader_string_add_char(reader, '\f'); + break; + case 'n': + json_reader_string_add_char(reader, '\n'); + break; + case 'r': + json_reader_string_add_char(reader, '\r'); + break; + case 't': + json_reader_string_add_char(reader, '\t'); + break; + case 'u': + reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U1; + reader->unicode_char = 0; + break; + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + case GRPC_JSON_STATE_STRING_ESCAPE_U1: + case GRPC_JSON_STATE_STRING_ESCAPE_U2: + case GRPC_JSON_STATE_STRING_ESCAPE_U3: + case GRPC_JSON_STATE_STRING_ESCAPE_U4: + if ((c >= '0') && (c <= '9')) { + c -= '0'; + } else if ((c >= 'A') && (c <= 'F')) { + c -= 'A' - 10; + } else if ((c >= 'a') && (c <= 'f')) { + c -= 'a' - 10; + } else { + return GRPC_JSON_PARSE_ERROR; + } + reader->unicode_char = (gpr_uint16)(reader->unicode_char << 4); + reader->unicode_char = (gpr_uint16)(reader->unicode_char | c); + + switch (reader->state) { + case GRPC_JSON_STATE_STRING_ESCAPE_U1: + reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U2; + break; + case GRPC_JSON_STATE_STRING_ESCAPE_U2: + reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U3; + break; + case GRPC_JSON_STATE_STRING_ESCAPE_U3: + reader->state = GRPC_JSON_STATE_STRING_ESCAPE_U4; + break; + case GRPC_JSON_STATE_STRING_ESCAPE_U4: + /* See grpc_json_writer_escape_string to have a description + * of what's going on here. + */ + if ((reader->unicode_char & 0xfc00) == 0xd800) { + /* high surrogate utf-16 */ + if (reader->unicode_high_surrogate != 0) + return GRPC_JSON_PARSE_ERROR; + reader->unicode_high_surrogate = reader->unicode_char; + } else if ((reader->unicode_char & 0xfc00) == 0xdc00) { + /* low surrogate utf-16 */ + gpr_uint32 utf32; + if (reader->unicode_high_surrogate == 0) + return GRPC_JSON_PARSE_ERROR; + utf32 = 0x10000; + utf32 += (gpr_uint32)( + (reader->unicode_high_surrogate - 0xd800) * 0x400); + utf32 += (gpr_uint32)(reader->unicode_char - 0xdc00); + json_reader_string_add_utf32(reader, utf32); + reader->unicode_high_surrogate = 0; + } else { + /* anything else */ + if (reader->unicode_high_surrogate != 0) + return GRPC_JSON_PARSE_ERROR; + json_reader_string_add_utf32(reader, reader->unicode_char); + } + if (reader->escaped_string_was_key) { + reader->state = GRPC_JSON_STATE_OBJECT_KEY_STRING; + } else { + reader->state = GRPC_JSON_STATE_VALUE_STRING; + } + break; + default: + return GRPC_JSON_INTERNAL_ERROR; + } + break; + + case GRPC_JSON_STATE_VALUE_NUMBER: + json_reader_string_add_char(reader, c); + switch (c) { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + break; + case 'e': + case 'E': + reader->state = GRPC_JSON_STATE_VALUE_NUMBER_E; + break; + case '.': + reader->state = GRPC_JSON_STATE_VALUE_NUMBER_DOT; + break; + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + case GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL: + json_reader_string_add_char(reader, c); + switch (c) { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + break; + case 'e': + case 'E': + reader->state = GRPC_JSON_STATE_VALUE_NUMBER_E; + break; + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + case GRPC_JSON_STATE_VALUE_NUMBER_ZERO: + if (c != '.') return GRPC_JSON_PARSE_ERROR; + json_reader_string_add_char(reader, c); + reader->state = GRPC_JSON_STATE_VALUE_NUMBER_DOT; + break; + + case GRPC_JSON_STATE_VALUE_NUMBER_DOT: + json_reader_string_add_char(reader, c); + switch (c) { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + reader->state = GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL; + break; + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + case GRPC_JSON_STATE_VALUE_NUMBER_E: + json_reader_string_add_char(reader, c); + switch (c) { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '+': + case '-': + reader->state = GRPC_JSON_STATE_VALUE_NUMBER_EPM; + break; + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + case GRPC_JSON_STATE_VALUE_NUMBER_EPM: + json_reader_string_add_char(reader, c); + switch (c) { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + break; + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + case GRPC_JSON_STATE_VALUE_TRUE_R: + if (c != 'r') return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_TRUE_U; + break; + + case GRPC_JSON_STATE_VALUE_TRUE_U: + if (c != 'u') return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_TRUE_E; + break; + + case GRPC_JSON_STATE_VALUE_TRUE_E: + if (c != 'e') return GRPC_JSON_PARSE_ERROR; + json_reader_set_true(reader); + reader->state = GRPC_JSON_STATE_VALUE_END; + break; + + case GRPC_JSON_STATE_VALUE_FALSE_A: + if (c != 'a') return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_FALSE_L; + break; + + case GRPC_JSON_STATE_VALUE_FALSE_L: + if (c != 'l') return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_FALSE_S; + break; + + case GRPC_JSON_STATE_VALUE_FALSE_S: + if (c != 's') return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_FALSE_E; + break; + + case GRPC_JSON_STATE_VALUE_FALSE_E: + if (c != 'e') return GRPC_JSON_PARSE_ERROR; + json_reader_set_false(reader); + reader->state = GRPC_JSON_STATE_VALUE_END; + break; + + case GRPC_JSON_STATE_VALUE_NULL_U: + if (c != 'u') return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_NULL_L1; + break; + + case GRPC_JSON_STATE_VALUE_NULL_L1: + if (c != 'l') return GRPC_JSON_PARSE_ERROR; + reader->state = GRPC_JSON_STATE_VALUE_NULL_L2; + break; + + case GRPC_JSON_STATE_VALUE_NULL_L2: + if (c != 'l') return GRPC_JSON_PARSE_ERROR; + json_reader_set_null(reader); + reader->state = GRPC_JSON_STATE_VALUE_END; + break; + + /* All of the VALUE_END cases are handled in the specialized case + * above. */ + case GRPC_JSON_STATE_VALUE_END: + switch (c) { + case ',': + case '}': + case ']': + return GRPC_JSON_INTERNAL_ERROR; + break; + + default: + return GRPC_JSON_PARSE_ERROR; + } + break; + + case GRPC_JSON_STATE_END: + return GRPC_JSON_PARSE_ERROR; + } } + } return GRPC_JSON_INTERNAL_ERROR; } diff --git a/src/core/json/json_reader.h b/src/core/json/json_reader.h index f77036b4cba..417db110cfb 100644 --- a/src/core/json/json_reader.h +++ b/src/core/json/json_reader.h @@ -37,8 +37,7 @@ #include #include "src/core/json/json_common.h" -typedef enum -{ +typedef enum { GRPC_JSON_STATE_OBJECT_KEY_BEGIN, GRPC_JSON_STATE_OBJECT_KEY_STRING, GRPC_JSON_STATE_OBJECT_KEY_END, @@ -69,8 +68,7 @@ typedef enum GRPC_JSON_STATE_END } grpc_json_reader_state; -enum -{ +enum { /* The first non-unicode value is 0x110000. But let's pick * a value high enough to start our error codes from. These * values are safe to return from the read_char function. @@ -82,34 +80,32 @@ enum struct grpc_json_reader; -typedef struct grpc_json_reader_vtable -{ +typedef struct grpc_json_reader_vtable { /* Clears your internal string scratchpad. */ - void (*string_clear) (void *userdata); + void (*string_clear)(void *userdata); /* Adds a char to the string scratchpad. */ - void (*string_add_char) (void *userdata, gpr_uint32 c); + void (*string_add_char)(void *userdata, gpr_uint32 c); /* Adds a utf32 char to the string scratchpad. */ - void (*string_add_utf32) (void *userdata, gpr_uint32 c); + void (*string_add_utf32)(void *userdata, gpr_uint32 c); /* Reads a character from your input. May be utf-8, 16 or 32. */ - gpr_uint32 (*read_char) (void *userdata); + gpr_uint32 (*read_char)(void *userdata); /* Starts a container of type GRPC_JSON_ARRAY or GRPC_JSON_OBJECT. */ - void (*container_begins) (void *userdata, grpc_json_type type); + void (*container_begins)(void *userdata, grpc_json_type type); /* Ends the current container. Must return the type of its parent. */ - grpc_json_type (*container_ends) (void *userdata); + grpc_json_type (*container_ends)(void *userdata); /* Your internal string scratchpad is an object's key. */ - void (*set_key) (void *userdata); + void (*set_key)(void *userdata); /* Your internal string scratchpad is a string value. */ - void (*set_string) (void *userdata); + void (*set_string)(void *userdata); /* Your internal string scratchpad is a numerical value. Return 1 if valid. */ - int (*set_number) (void *userdata); + int (*set_number)(void *userdata); /* Sets the values true, false or null. */ - void (*set_true) (void *userdata); - void (*set_false) (void *userdata); - void (*set_null) (void *userdata); + void (*set_true)(void *userdata); + void (*set_false)(void *userdata); + void (*set_null)(void *userdata); } grpc_json_reader_vtable; -typedef struct grpc_json_reader -{ +typedef struct grpc_json_reader { /* That structure is fully private, and initialized by grpc_json_reader_init. * The definition is public so you can put it on your stack. */ @@ -126,13 +122,12 @@ typedef struct grpc_json_reader } grpc_json_reader; /* The return type of the parser. */ -typedef enum -{ - GRPC_JSON_DONE, /* The parser finished successfully. */ - GRPC_JSON_EAGAIN, /* The parser yields to get more data. */ - GRPC_JSON_READ_ERROR, /* The parser passes through a read error. */ - GRPC_JSON_PARSE_ERROR, /* The parser found an error in the json stream. */ - GRPC_JSON_INTERNAL_ERROR /* The parser got an internal error. */ +typedef enum { + GRPC_JSON_DONE, /* The parser finished successfully. */ + GRPC_JSON_EAGAIN, /* The parser yields to get more data. */ + GRPC_JSON_READ_ERROR, /* The parser passes through a read error. */ + GRPC_JSON_PARSE_ERROR, /* The parser found an error in the json stream. */ + GRPC_JSON_INTERNAL_ERROR /* The parser got an internal error. */ } grpc_json_reader_status; /* Call this function to start parsing the input. It will return the following: @@ -149,16 +144,17 @@ typedef enum * . GRPC_JSON_INTERNAL_ERROR if the parser somehow ended into an invalid * internal state. */ -grpc_json_reader_status grpc_json_reader_run (grpc_json_reader * reader); +grpc_json_reader_status grpc_json_reader_run(grpc_json_reader *reader); /* Call this function to initialize the reader structure. */ -void grpc_json_reader_init (grpc_json_reader * reader, grpc_json_reader_vtable * vtable, void *userdata); +void grpc_json_reader_init(grpc_json_reader *reader, + grpc_json_reader_vtable *vtable, void *userdata); /* You may call this from the read_char callback if you don't know where is the * end of your input stream, and you'd like the json reader to hint you that it * has completed reading its input, so you can return an EOF to it. Note that * there might still be trailing whitespaces after that point. */ -int grpc_json_reader_is_complete (grpc_json_reader * reader); +int grpc_json_reader_is_complete(grpc_json_reader *reader); #endif /* GRPC_INTERNAL_CORE_JSON_JSON_READER_H */ diff --git a/src/core/json/json_string.c b/src/core/json/json_string.c index ea596ee8fd2..0461c2703ff 100644 --- a/src/core/json/json_string.c +++ b/src/core/json/json_string.c @@ -52,8 +52,7 @@ * Note that this works because the act of parsing json always reduces its * input size, and never expands it. */ -typedef struct -{ +typedef struct { grpc_json *top; grpc_json *current_container; grpc_json *current_value; @@ -67,8 +66,7 @@ typedef struct /* This json writer will put everything in a big string. * The point is that we allocate that string in chunks of 256 bytes. */ -typedef struct -{ +typedef struct { char *output; size_t free_space; size_t string_len; @@ -79,130 +77,104 @@ typedef struct * and will enlarge it if necessary. We're only allocating chunks of 256 * bytes at a time (or multiples thereof). */ -static void -json_writer_output_check (void *userdata, size_t needed) -{ +static void json_writer_output_check(void *userdata, size_t needed) { json_writer_userdata *state = userdata; - if (state->free_space >= needed) - return; + if (state->free_space >= needed) return; needed -= state->free_space; /* Round up by 256 bytes. */ needed = (needed + 0xff) & ~0xffU; - state->output = gpr_realloc (state->output, state->allocated + needed); + state->output = gpr_realloc(state->output, state->allocated + needed); state->free_space += needed; state->allocated += needed; } /* These are needed by the writer's implementation. */ -static void -json_writer_output_char (void *userdata, char c) -{ +static void json_writer_output_char(void *userdata, char c) { json_writer_userdata *state = userdata; - json_writer_output_check (userdata, 1); + json_writer_output_check(userdata, 1); state->output[state->string_len++] = c; state->free_space--; } -static void -json_writer_output_string_with_len (void *userdata, const char *str, size_t len) -{ +static void json_writer_output_string_with_len(void *userdata, const char *str, + size_t len) { json_writer_userdata *state = userdata; - json_writer_output_check (userdata, len); - memcpy (state->output + state->string_len, str, len); + json_writer_output_check(userdata, len); + memcpy(state->output + state->string_len, str, len); state->string_len += len; state->free_space -= len; } -static void -json_writer_output_string (void *userdata, const char *str) -{ - size_t len = strlen (str); - json_writer_output_string_with_len (userdata, str, len); +static void json_writer_output_string(void *userdata, const char *str) { + size_t len = strlen(str); + json_writer_output_string_with_len(userdata, str, len); } /* The reader asks us to clear our scratchpad. In our case, we'll simply mark * the end of the current string, and advance our output pointer. */ -static void -json_reader_string_clear (void *userdata) -{ +static void json_reader_string_clear(void *userdata) { json_reader_userdata *state = userdata; - if (state->string) - { - GPR_ASSERT (state->string_ptr < state->input); - *state->string_ptr++ = 0; - } + if (state->string) { + GPR_ASSERT(state->string_ptr < state->input); + *state->string_ptr++ = 0; + } state->string = state->string_ptr; } -static void -json_reader_string_add_char (void *userdata, gpr_uint32 c) -{ +static void json_reader_string_add_char(void *userdata, gpr_uint32 c) { json_reader_userdata *state = userdata; - GPR_ASSERT (state->string_ptr < state->input); - GPR_ASSERT (c <= 0xff); - *state->string_ptr++ = (gpr_uint8) c; + GPR_ASSERT(state->string_ptr < state->input); + GPR_ASSERT(c <= 0xff); + *state->string_ptr++ = (gpr_uint8)c; } /* We are converting a UTF-32 character into UTF-8 here, * as described by RFC3629. */ -static void -json_reader_string_add_utf32 (void *userdata, gpr_uint32 c) -{ - if (c <= 0x7f) - { - json_reader_string_add_char (userdata, c); - } - else if (c <= 0x7ff) - { - gpr_uint32 b1 = 0xc0 | ((c >> 6) & 0x1f); - gpr_uint32 b2 = 0x80 | (c & 0x3f); - json_reader_string_add_char (userdata, b1); - json_reader_string_add_char (userdata, b2); - } - else if (c <= 0xffff) - { - gpr_uint32 b1 = 0xe0 | ((c >> 12) & 0x0f); - gpr_uint32 b2 = 0x80 | ((c >> 6) & 0x3f); - gpr_uint32 b3 = 0x80 | (c & 0x3f); - json_reader_string_add_char (userdata, b1); - json_reader_string_add_char (userdata, b2); - json_reader_string_add_char (userdata, b3); - } - else if (c <= 0x1fffff) - { - gpr_uint32 b1 = 0xf0 | ((c >> 18) & 0x07); - gpr_uint32 b2 = 0x80 | ((c >> 12) & 0x3f); - gpr_uint32 b3 = 0x80 | ((c >> 6) & 0x3f); - gpr_uint32 b4 = 0x80 | (c & 0x3f); - json_reader_string_add_char (userdata, b1); - json_reader_string_add_char (userdata, b2); - json_reader_string_add_char (userdata, b3); - json_reader_string_add_char (userdata, b4); - } +static void json_reader_string_add_utf32(void *userdata, gpr_uint32 c) { + if (c <= 0x7f) { + json_reader_string_add_char(userdata, c); + } else if (c <= 0x7ff) { + gpr_uint32 b1 = 0xc0 | ((c >> 6) & 0x1f); + gpr_uint32 b2 = 0x80 | (c & 0x3f); + json_reader_string_add_char(userdata, b1); + json_reader_string_add_char(userdata, b2); + } else if (c <= 0xffff) { + gpr_uint32 b1 = 0xe0 | ((c >> 12) & 0x0f); + gpr_uint32 b2 = 0x80 | ((c >> 6) & 0x3f); + gpr_uint32 b3 = 0x80 | (c & 0x3f); + json_reader_string_add_char(userdata, b1); + json_reader_string_add_char(userdata, b2); + json_reader_string_add_char(userdata, b3); + } else if (c <= 0x1fffff) { + gpr_uint32 b1 = 0xf0 | ((c >> 18) & 0x07); + gpr_uint32 b2 = 0x80 | ((c >> 12) & 0x3f); + gpr_uint32 b3 = 0x80 | ((c >> 6) & 0x3f); + gpr_uint32 b4 = 0x80 | (c & 0x3f); + json_reader_string_add_char(userdata, b1); + json_reader_string_add_char(userdata, b2); + json_reader_string_add_char(userdata, b3); + json_reader_string_add_char(userdata, b4); + } } /* We consider that the input may be a zero-terminated string. So we * can end up hitting eof before the end of the alleged string length. */ -static gpr_uint32 -json_reader_read_char (void *userdata) -{ +static gpr_uint32 json_reader_read_char(void *userdata) { gpr_uint32 r; json_reader_userdata *state = userdata; - if (state->remaining_input == 0) - return GRPC_JSON_READ_CHAR_EOF; + if (state->remaining_input == 0) return GRPC_JSON_READ_CHAR_EOF; r = *state->input++; state->remaining_input--; - if (r == 0) - { - state->remaining_input = 0; - return GRPC_JSON_READ_CHAR_EOF; - } + if (r == 0) { + state->remaining_input = 0; + return GRPC_JSON_READ_CHAR_EOF; + } return r; } @@ -210,48 +182,39 @@ json_reader_read_char (void *userdata) /* Helper function to create a new grpc_json object and link it into * our tree-in-progress inside our opaque structure. */ -static grpc_json * -json_create_and_link (void *userdata, grpc_json_type type) -{ +static grpc_json *json_create_and_link(void *userdata, grpc_json_type type) { json_reader_userdata *state = userdata; - grpc_json *json = grpc_json_create (type); + grpc_json *json = grpc_json_create(type); json->parent = state->current_container; json->prev = state->current_value; state->current_value = json; - if (json->prev) - { - json->prev->next = json; - } - if (json->parent) - { - if (!json->parent->child) - { - json->parent->child = json; - } - if (json->parent->type == GRPC_JSON_OBJECT) - { - json->key = (char *) state->key; - } + if (json->prev) { + json->prev->next = json; + } + if (json->parent) { + if (!json->parent->child) { + json->parent->child = json; } - if (!state->top) - { - state->top = json; + if (json->parent->type == GRPC_JSON_OBJECT) { + json->key = (char *)state->key; } + } + if (!state->top) { + state->top = json; + } return json; } -static void -json_reader_container_begins (void *userdata, grpc_json_type type) -{ +static void json_reader_container_begins(void *userdata, grpc_json_type type) { json_reader_userdata *state = userdata; grpc_json *container; - GPR_ASSERT (type == GRPC_JSON_ARRAY || type == GRPC_JSON_OBJECT); + GPR_ASSERT(type == GRPC_JSON_ARRAY || type == GRPC_JSON_OBJECT); - container = json_create_and_link (userdata, type); + container = json_create_and_link(userdata, type); state->current_container = container; state->current_value = NULL; } @@ -265,21 +228,18 @@ json_reader_container_begins (void *userdata, grpc_json_type type) * Also note that if we're at the top of the tree, and the last container * ends, we have to return GRPC_JSON_TOP_LEVEL. */ -static grpc_json_type -json_reader_container_ends (void *userdata) -{ +static grpc_json_type json_reader_container_ends(void *userdata) { grpc_json_type container_type = GRPC_JSON_TOP_LEVEL; json_reader_userdata *state = userdata; - GPR_ASSERT (state->current_container); + GPR_ASSERT(state->current_container); state->current_value = state->current_container; state->current_container = state->current_container->parent; - if (state->current_container) - { - container_type = state->current_container->type; - } + if (state->current_container) { + container_type = state->current_container->type; + } return container_type; } @@ -290,155 +250,130 @@ json_reader_container_ends (void *userdata) * Note that in the set_number case, we're not going to try interpreting it. * We'll keep it as a string, and leave it to the caller to evaluate it. */ -static void -json_reader_set_key (void *userdata) -{ +static void json_reader_set_key(void *userdata) { json_reader_userdata *state = userdata; state->key = state->string; } -static void -json_reader_set_string (void *userdata) -{ +static void json_reader_set_string(void *userdata) { json_reader_userdata *state = userdata; - grpc_json *json = json_create_and_link (userdata, GRPC_JSON_STRING); - json->value = (char *) state->string; + grpc_json *json = json_create_and_link(userdata, GRPC_JSON_STRING); + json->value = (char *)state->string; } -static int -json_reader_set_number (void *userdata) -{ +static int json_reader_set_number(void *userdata) { json_reader_userdata *state = userdata; - grpc_json *json = json_create_and_link (userdata, GRPC_JSON_NUMBER); - json->value = (char *) state->string; + grpc_json *json = json_create_and_link(userdata, GRPC_JSON_NUMBER); + json->value = (char *)state->string; return 1; } /* The object types true, false and null are self-sufficient, and don't need * any more information beside their type. */ -static void -json_reader_set_true (void *userdata) -{ - json_create_and_link (userdata, GRPC_JSON_TRUE); +static void json_reader_set_true(void *userdata) { + json_create_and_link(userdata, GRPC_JSON_TRUE); } -static void -json_reader_set_false (void *userdata) -{ - json_create_and_link (userdata, GRPC_JSON_FALSE); +static void json_reader_set_false(void *userdata) { + json_create_and_link(userdata, GRPC_JSON_FALSE); } -static void -json_reader_set_null (void *userdata) -{ - json_create_and_link (userdata, GRPC_JSON_NULL); +static void json_reader_set_null(void *userdata) { + json_create_and_link(userdata, GRPC_JSON_NULL); } static grpc_json_reader_vtable reader_vtable = { - json_reader_string_clear, json_reader_string_add_char, - json_reader_string_add_utf32, json_reader_read_char, - json_reader_container_begins, json_reader_container_ends, - json_reader_set_key, json_reader_set_string, - json_reader_set_number, json_reader_set_true, - json_reader_set_false, json_reader_set_null -}; + json_reader_string_clear, json_reader_string_add_char, + json_reader_string_add_utf32, json_reader_read_char, + json_reader_container_begins, json_reader_container_ends, + json_reader_set_key, json_reader_set_string, + json_reader_set_number, json_reader_set_true, + json_reader_set_false, json_reader_set_null}; /* And finally, let's define our public API. */ -grpc_json * -grpc_json_parse_string_with_len (char *input, size_t size) -{ +grpc_json *grpc_json_parse_string_with_len(char *input, size_t size) { grpc_json_reader reader; json_reader_userdata state; grpc_json *json = NULL; grpc_json_reader_status status; - if (!input) - return NULL; + if (!input) return NULL; state.top = state.current_container = state.current_value = NULL; state.string = state.key = NULL; - state.string_ptr = state.input = (gpr_uint8 *) input; + state.string_ptr = state.input = (gpr_uint8 *)input; state.remaining_input = size; - grpc_json_reader_init (&reader, &reader_vtable, &state); + grpc_json_reader_init(&reader, &reader_vtable, &state); - status = grpc_json_reader_run (&reader); + status = grpc_json_reader_run(&reader); json = state.top; - if ((status != GRPC_JSON_DONE) && json) - { - grpc_json_destroy (json); - json = NULL; - } + if ((status != GRPC_JSON_DONE) && json) { + grpc_json_destroy(json); + json = NULL; + } return json; } #define UNBOUND_JSON_STRING_LENGTH 0x7fffffff -grpc_json * -grpc_json_parse_string (char *input) -{ - return grpc_json_parse_string_with_len (input, UNBOUND_JSON_STRING_LENGTH); +grpc_json *grpc_json_parse_string(char *input) { + return grpc_json_parse_string_with_len(input, UNBOUND_JSON_STRING_LENGTH); } -static void -json_dump_recursive (grpc_json_writer * writer, grpc_json * json, int in_object) -{ - while (json) - { - if (in_object) - grpc_json_writer_object_key (writer, json->key); - - switch (json->type) - { - case GRPC_JSON_OBJECT: - case GRPC_JSON_ARRAY: - grpc_json_writer_container_begins (writer, json->type); - if (json->child) - json_dump_recursive (writer, json->child, json->type == GRPC_JSON_OBJECT); - grpc_json_writer_container_ends (writer, json->type); - break; - case GRPC_JSON_STRING: - grpc_json_writer_value_string (writer, json->value); - break; - case GRPC_JSON_NUMBER: - grpc_json_writer_value_raw (writer, json->value); - break; - case GRPC_JSON_TRUE: - grpc_json_writer_value_raw_with_len (writer, "true", 4); - break; - case GRPC_JSON_FALSE: - grpc_json_writer_value_raw_with_len (writer, "false", 5); - break; - case GRPC_JSON_NULL: - grpc_json_writer_value_raw_with_len (writer, "null", 4); - break; - default: - abort (); - } - json = json->next; +static void json_dump_recursive(grpc_json_writer *writer, grpc_json *json, + int in_object) { + while (json) { + if (in_object) grpc_json_writer_object_key(writer, json->key); + + switch (json->type) { + case GRPC_JSON_OBJECT: + case GRPC_JSON_ARRAY: + grpc_json_writer_container_begins(writer, json->type); + if (json->child) + json_dump_recursive(writer, json->child, + json->type == GRPC_JSON_OBJECT); + grpc_json_writer_container_ends(writer, json->type); + break; + case GRPC_JSON_STRING: + grpc_json_writer_value_string(writer, json->value); + break; + case GRPC_JSON_NUMBER: + grpc_json_writer_value_raw(writer, json->value); + break; + case GRPC_JSON_TRUE: + grpc_json_writer_value_raw_with_len(writer, "true", 4); + break; + case GRPC_JSON_FALSE: + grpc_json_writer_value_raw_with_len(writer, "false", 5); + break; + case GRPC_JSON_NULL: + grpc_json_writer_value_raw_with_len(writer, "null", 4); + break; + default: + abort(); } + json = json->next; + } } static grpc_json_writer_vtable writer_vtable = { - json_writer_output_char, json_writer_output_string, - json_writer_output_string_with_len -}; + json_writer_output_char, json_writer_output_string, + json_writer_output_string_with_len}; -char * -grpc_json_dump_to_string (grpc_json * json, int indent) -{ +char *grpc_json_dump_to_string(grpc_json *json, int indent) { grpc_json_writer writer; json_writer_userdata state; state.output = NULL; state.free_space = state.string_len = state.allocated = 0; - grpc_json_writer_init (&writer, indent, &writer_vtable, &state); + grpc_json_writer_init(&writer, indent, &writer_vtable, &state); - json_dump_recursive (&writer, json, 0); + json_dump_recursive(&writer, json, 0); - json_writer_output_char (&state, 0); + json_writer_output_char(&state, 0); return state.output; } diff --git a/src/core/json/json_writer.c b/src/core/json/json_writer.c index fc49d72998d..e0d02f411e0 100644 --- a/src/core/json/json_writer.c +++ b/src/core/json/json_writer.c @@ -37,273 +37,224 @@ #include "src/core/json/json_writer.h" -static void -json_writer_output_char (grpc_json_writer * writer, char c) -{ - writer->vtable->output_char (writer->userdata, c); +static void json_writer_output_char(grpc_json_writer *writer, char c) { + writer->vtable->output_char(writer->userdata, c); } -static void -json_writer_output_string (grpc_json_writer * writer, const char *str) -{ - writer->vtable->output_string (writer->userdata, str); +static void json_writer_output_string(grpc_json_writer *writer, + const char *str) { + writer->vtable->output_string(writer->userdata, str); } -static void -json_writer_output_string_with_len (grpc_json_writer * writer, const char *str, size_t len) -{ - writer->vtable->output_string_with_len (writer->userdata, str, len); +static void json_writer_output_string_with_len(grpc_json_writer *writer, + const char *str, size_t len) { + writer->vtable->output_string_with_len(writer->userdata, str, len); } -void -grpc_json_writer_init (grpc_json_writer * writer, int indent, grpc_json_writer_vtable * vtable, void *userdata) -{ - memset (writer, 0, sizeof (*writer)); +void grpc_json_writer_init(grpc_json_writer *writer, int indent, + grpc_json_writer_vtable *vtable, void *userdata) { + memset(writer, 0, sizeof(*writer)); writer->container_empty = 1; writer->indent = indent; writer->vtable = vtable; writer->userdata = userdata; } -static void -json_writer_output_indent (grpc_json_writer * writer) -{ - static const char spacesstr[] = " " " " " " " "; +static void json_writer_output_indent(grpc_json_writer *writer) { + static const char spacesstr[] = + " " + " " + " " + " "; - unsigned spaces = (unsigned) (writer->depth * writer->indent); + unsigned spaces = (unsigned)(writer->depth * writer->indent); - if (writer->indent == 0) + if (writer->indent == 0) return; + + if (writer->got_key) { + json_writer_output_char(writer, ' '); return; + } - if (writer->got_key) - { - json_writer_output_char (writer, ' '); - return; - } + while (spaces >= (sizeof(spacesstr) - 1)) { + json_writer_output_string_with_len(writer, spacesstr, + sizeof(spacesstr) - 1); + spaces -= (unsigned)(sizeof(spacesstr) - 1); + } - while (spaces >= (sizeof (spacesstr) - 1)) - { - json_writer_output_string_with_len (writer, spacesstr, sizeof (spacesstr) - 1); - spaces -= (unsigned) (sizeof (spacesstr) - 1); - } + if (spaces == 0) return; - if (spaces == 0) - return; - - json_writer_output_string_with_len (writer, spacesstr + sizeof (spacesstr) - 1 - spaces, spaces); + json_writer_output_string_with_len( + writer, spacesstr + sizeof(spacesstr) - 1 - spaces, spaces); } -static void -json_writer_value_end (grpc_json_writer * writer) -{ - if (writer->container_empty) - { - writer->container_empty = 0; - if ((writer->indent == 0) || (writer->depth == 0)) - return; - json_writer_output_char (writer, '\n'); - } - else - { - json_writer_output_char (writer, ','); - if (writer->indent == 0) - return; - json_writer_output_char (writer, '\n'); - } +static void json_writer_value_end(grpc_json_writer *writer) { + if (writer->container_empty) { + writer->container_empty = 0; + if ((writer->indent == 0) || (writer->depth == 0)) return; + json_writer_output_char(writer, '\n'); + } else { + json_writer_output_char(writer, ','); + if (writer->indent == 0) return; + json_writer_output_char(writer, '\n'); + } } -static void -json_writer_escape_utf16 (grpc_json_writer * writer, gpr_uint16 utf16) -{ +static void json_writer_escape_utf16(grpc_json_writer *writer, + gpr_uint16 utf16) { static const char hex[] = "0123456789abcdef"; - json_writer_output_string_with_len (writer, "\\u", 2); - json_writer_output_char (writer, hex[(utf16 >> 12) & 0x0f]); - json_writer_output_char (writer, hex[(utf16 >> 8) & 0x0f]); - json_writer_output_char (writer, hex[(utf16 >> 4) & 0x0f]); - json_writer_output_char (writer, hex[(utf16) & 0x0f]); + json_writer_output_string_with_len(writer, "\\u", 2); + json_writer_output_char(writer, hex[(utf16 >> 12) & 0x0f]); + json_writer_output_char(writer, hex[(utf16 >> 8) & 0x0f]); + json_writer_output_char(writer, hex[(utf16 >> 4) & 0x0f]); + json_writer_output_char(writer, hex[(utf16)&0x0f]); } -static void -json_writer_escape_string (grpc_json_writer * writer, const char *string) -{ - json_writer_output_char (writer, '"'); +static void json_writer_escape_string(grpc_json_writer *writer, + const char *string) { + json_writer_output_char(writer, '"'); - for (;;) - { - gpr_uint8 c = (gpr_uint8) * string++; - if (c == 0) - { - break; - } - else if ((c >= 32) && (c <= 126)) - { - if ((c == '\\') || (c == '"')) - json_writer_output_char (writer, '\\'); - json_writer_output_char (writer, (char) c); - } - else if ((c < 32) || (c == 127)) - { - switch (c) - { - case '\b': - json_writer_output_string_with_len (writer, "\\b", 2); - break; - case '\f': - json_writer_output_string_with_len (writer, "\\f", 2); - break; - case '\n': - json_writer_output_string_with_len (writer, "\\n", 2); - break; - case '\r': - json_writer_output_string_with_len (writer, "\\r", 2); - break; - case '\t': - json_writer_output_string_with_len (writer, "\\t", 2); - break; - default: - json_writer_escape_utf16 (writer, c); - break; - } - } - else - { - gpr_uint32 utf32 = 0; - int extra = 0; - int i; - int valid = 1; - if ((c & 0xe0) == 0xc0) - { - utf32 = c & 0x1f; - extra = 1; - } - else if ((c & 0xf0) == 0xe0) - { - utf32 = c & 0x0f; - extra = 2; - } - else if ((c & 0xf8) == 0xf0) - { - utf32 = c & 0x07; - extra = 3; - } - else - { - break; - } - for (i = 0; i < extra; i++) - { - utf32 <<= 6; - c = (gpr_uint8) (*string++); - /* Breaks out and bail on any invalid UTF-8 sequence, including \0. */ - if ((c & 0xc0) != 0x80) - { - valid = 0; - break; - } - utf32 |= c & 0x3f; - } - if (!valid) - break; - /* The range 0xd800 - 0xdfff is reserved by the surrogates ad vitam. - * Any other range is technically reserved for future usage, so if we - * don't want the software to break in the future, we have to allow - * anything else. The first non-unicode character is 0x110000. */ - if (((utf32 >= 0xd800) && (utf32 <= 0xdfff)) || (utf32 >= 0x110000)) - break; - if (utf32 >= 0x10000) - { - /* If utf32 contains a character that is above 0xffff, it needs to be - * broken down into a utf-16 surrogate pair. A surrogate pair is first - * a high surrogate, followed by a low surrogate. Each surrogate holds - * 10 bits of usable data, thus allowing a total of 20 bits of data. - * The high surrogate marker is 0xd800, while the low surrogate marker - * is 0xdc00. The low 10 bits of each will be the usable data. - * - * After re-combining the 20 bits of data, one has to add 0x10000 to - * the resulting value, in order to obtain the original character. - * This is obviously because the range 0x0000 - 0xffff can be written - * without any special trick. - * - * Since 0x10ffff is the highest allowed character, we're working in - * the range 0x00000 - 0xfffff after we decrement it by 0x10000. - * That range is exactly 20 bits. - */ - utf32 -= 0x10000; - json_writer_escape_utf16 (writer, (gpr_uint16) (0xd800 | (utf32 >> 10))); - json_writer_escape_utf16 (writer, (gpr_uint16) (0xdc00 | (utf32 & 0x3ff))); - } - else - { - json_writer_escape_utf16 (writer, (gpr_uint16) utf32); - } - } + for (;;) { + gpr_uint8 c = (gpr_uint8)*string++; + if (c == 0) { + break; + } else if ((c >= 32) && (c <= 126)) { + if ((c == '\\') || (c == '"')) json_writer_output_char(writer, '\\'); + json_writer_output_char(writer, (char)c); + } else if ((c < 32) || (c == 127)) { + switch (c) { + case '\b': + json_writer_output_string_with_len(writer, "\\b", 2); + break; + case '\f': + json_writer_output_string_with_len(writer, "\\f", 2); + break; + case '\n': + json_writer_output_string_with_len(writer, "\\n", 2); + break; + case '\r': + json_writer_output_string_with_len(writer, "\\r", 2); + break; + case '\t': + json_writer_output_string_with_len(writer, "\\t", 2); + break; + default: + json_writer_escape_utf16(writer, c); + break; + } + } else { + gpr_uint32 utf32 = 0; + int extra = 0; + int i; + int valid = 1; + if ((c & 0xe0) == 0xc0) { + utf32 = c & 0x1f; + extra = 1; + } else if ((c & 0xf0) == 0xe0) { + utf32 = c & 0x0f; + extra = 2; + } else if ((c & 0xf8) == 0xf0) { + utf32 = c & 0x07; + extra = 3; + } else { + break; + } + for (i = 0; i < extra; i++) { + utf32 <<= 6; + c = (gpr_uint8)(*string++); + /* Breaks out and bail on any invalid UTF-8 sequence, including \0. */ + if ((c & 0xc0) != 0x80) { + valid = 0; + break; + } + utf32 |= c & 0x3f; + } + if (!valid) break; + /* The range 0xd800 - 0xdfff is reserved by the surrogates ad vitam. + * Any other range is technically reserved for future usage, so if we + * don't want the software to break in the future, we have to allow + * anything else. The first non-unicode character is 0x110000. */ + if (((utf32 >= 0xd800) && (utf32 <= 0xdfff)) || (utf32 >= 0x110000)) + break; + if (utf32 >= 0x10000) { + /* If utf32 contains a character that is above 0xffff, it needs to be + * broken down into a utf-16 surrogate pair. A surrogate pair is first + * a high surrogate, followed by a low surrogate. Each surrogate holds + * 10 bits of usable data, thus allowing a total of 20 bits of data. + * The high surrogate marker is 0xd800, while the low surrogate marker + * is 0xdc00. The low 10 bits of each will be the usable data. + * + * After re-combining the 20 bits of data, one has to add 0x10000 to + * the resulting value, in order to obtain the original character. + * This is obviously because the range 0x0000 - 0xffff can be written + * without any special trick. + * + * Since 0x10ffff is the highest allowed character, we're working in + * the range 0x00000 - 0xfffff after we decrement it by 0x10000. + * That range is exactly 20 bits. + */ + utf32 -= 0x10000; + json_writer_escape_utf16(writer, (gpr_uint16)(0xd800 | (utf32 >> 10))); + json_writer_escape_utf16(writer, + (gpr_uint16)(0xdc00 | (utf32 & 0x3ff))); + } else { + json_writer_escape_utf16(writer, (gpr_uint16)utf32); + } } + } - json_writer_output_char (writer, '"'); + json_writer_output_char(writer, '"'); } -void -grpc_json_writer_container_begins (grpc_json_writer * writer, grpc_json_type type) -{ - if (!writer->got_key) - json_writer_value_end (writer); - json_writer_output_indent (writer); - json_writer_output_char (writer, type == GRPC_JSON_OBJECT ? '{' : '['); +void grpc_json_writer_container_begins(grpc_json_writer *writer, + grpc_json_type type) { + if (!writer->got_key) json_writer_value_end(writer); + json_writer_output_indent(writer); + json_writer_output_char(writer, type == GRPC_JSON_OBJECT ? '{' : '['); writer->container_empty = 1; writer->got_key = 0; writer->depth++; } -void -grpc_json_writer_container_ends (grpc_json_writer * writer, grpc_json_type type) -{ +void grpc_json_writer_container_ends(grpc_json_writer *writer, + grpc_json_type type) { if (writer->indent && !writer->container_empty) - json_writer_output_char (writer, '\n'); + json_writer_output_char(writer, '\n'); writer->depth--; - if (!writer->container_empty) - json_writer_output_indent (writer); - json_writer_output_char (writer, type == GRPC_JSON_OBJECT ? '}' : ']'); + if (!writer->container_empty) json_writer_output_indent(writer); + json_writer_output_char(writer, type == GRPC_JSON_OBJECT ? '}' : ']'); writer->container_empty = 0; writer->got_key = 0; } -void -grpc_json_writer_object_key (grpc_json_writer * writer, const char *string) -{ - json_writer_value_end (writer); - json_writer_output_indent (writer); - json_writer_escape_string (writer, string); - json_writer_output_char (writer, ':'); +void grpc_json_writer_object_key(grpc_json_writer *writer, const char *string) { + json_writer_value_end(writer); + json_writer_output_indent(writer); + json_writer_escape_string(writer, string); + json_writer_output_char(writer, ':'); writer->got_key = 1; } -void -grpc_json_writer_value_raw (grpc_json_writer * writer, const char *string) -{ - if (!writer->got_key) - json_writer_value_end (writer); - json_writer_output_indent (writer); - json_writer_output_string (writer, string); +void grpc_json_writer_value_raw(grpc_json_writer *writer, const char *string) { + if (!writer->got_key) json_writer_value_end(writer); + json_writer_output_indent(writer); + json_writer_output_string(writer, string); writer->got_key = 0; } -void -grpc_json_writer_value_raw_with_len (grpc_json_writer * writer, const char *string, size_t len) -{ - if (!writer->got_key) - json_writer_value_end (writer); - json_writer_output_indent (writer); - json_writer_output_string_with_len (writer, string, len); +void grpc_json_writer_value_raw_with_len(grpc_json_writer *writer, + const char *string, size_t len) { + if (!writer->got_key) json_writer_value_end(writer); + json_writer_output_indent(writer); + json_writer_output_string_with_len(writer, string, len); writer->got_key = 0; } -void -grpc_json_writer_value_string (grpc_json_writer * writer, const char *string) -{ - if (!writer->got_key) - json_writer_value_end (writer); - json_writer_output_indent (writer); - json_writer_escape_string (writer, string); +void grpc_json_writer_value_string(grpc_json_writer *writer, + const char *string) { + if (!writer->got_key) json_writer_value_end(writer); + json_writer_output_indent(writer); + json_writer_escape_string(writer, string); writer->got_key = 0; } diff --git a/src/core/json/json_writer.h b/src/core/json/json_writer.h index d7dfe2846f3..9ef04aab012 100644 --- a/src/core/json/json_writer.h +++ b/src/core/json/json_writer.h @@ -50,19 +50,17 @@ #include "src/core/json/json_common.h" -typedef struct grpc_json_writer_vtable -{ +typedef struct grpc_json_writer_vtable { /* Adds a character to the output stream. */ - void (*output_char) (void *userdata, char); + void (*output_char)(void *userdata, char); /* Adds a zero-terminated string to the output stream. */ - void (*output_string) (void *userdata, const char *str); + void (*output_string)(void *userdata, const char *str); /* Adds a fixed-length string to the output stream. */ - void (*output_string_with_len) (void *userdata, const char *str, size_t len); + void (*output_string_with_len)(void *userdata, const char *str, size_t len); } grpc_json_writer_vtable; -typedef struct grpc_json_writer -{ +typedef struct grpc_json_writer { void *userdata; grpc_json_writer_vtable *vtable; int indent; @@ -76,19 +74,24 @@ typedef struct grpc_json_writer * use indent=0, then the output will not have any newlines either, thus * emitting a condensed json output. */ -void grpc_json_writer_init (grpc_json_writer * writer, int indent, grpc_json_writer_vtable * vtable, void *userdata); +void grpc_json_writer_init(grpc_json_writer *writer, int indent, + grpc_json_writer_vtable *vtable, void *userdata); /* Signals the beginning of a container. */ -void grpc_json_writer_container_begins (grpc_json_writer * writer, grpc_json_type type); +void grpc_json_writer_container_begins(grpc_json_writer *writer, + grpc_json_type type); /* Signals the end of a container. */ -void grpc_json_writer_container_ends (grpc_json_writer * writer, grpc_json_type type); +void grpc_json_writer_container_ends(grpc_json_writer *writer, + grpc_json_type type); /* Writes down an object key for the next value. */ -void grpc_json_writer_object_key (grpc_json_writer * writer, const char *string); +void grpc_json_writer_object_key(grpc_json_writer *writer, const char *string); /* Sets a raw value. Useful for numbers. */ -void grpc_json_writer_value_raw (grpc_json_writer * writer, const char *string); +void grpc_json_writer_value_raw(grpc_json_writer *writer, const char *string); /* Sets a raw value with its length. Useful for values like true or false. */ -void grpc_json_writer_value_raw_with_len (grpc_json_writer * writer, const char *string, size_t len); +void grpc_json_writer_value_raw_with_len(grpc_json_writer *writer, + const char *string, size_t len); /* Sets a string value. It'll be escaped, and utf-8 validated. */ -void grpc_json_writer_value_string (grpc_json_writer * writer, const char *string); +void grpc_json_writer_value_string(grpc_json_writer *writer, + const char *string); #endif /* GRPC_INTERNAL_CORE_JSON_JSON_WRITER_H */ diff --git a/src/core/profiling/basic_timers.c b/src/core/profiling/basic_timers.c index d4506857b15..2f6c88daacf 100644 --- a/src/core/profiling/basic_timers.c +++ b/src/core/profiling/basic_timers.c @@ -44,16 +44,14 @@ #include #include -typedef enum -{ +typedef enum { BEGIN = '{', END = '}', MARK = '.', IMPORTANT = '!' } marker_type; -typedef struct grpc_timer_entry -{ +typedef struct grpc_timer_entry { gpr_timespec tm; int tag; const char *tagstr; @@ -68,34 +66,32 @@ typedef struct grpc_timer_entry static __thread grpc_timer_entry log[MAX_COUNT]; static __thread int count; -static void -log_report () -{ +static void log_report() { int i; - for (i = 0; i < count; i++) - { - grpc_timer_entry *entry = &(log[i]); - printf ("GRPC_LAT_PROF %ld.%09d %p %c %d(%s) %p %s %d\n", entry->tm.tv_sec, entry->tm.tv_nsec, (void *) (gpr_intptr) gpr_thd_currentid (), entry->type, entry->tag, entry->tagstr, entry->id, entry->file, entry->line); - } + for (i = 0; i < count; i++) { + grpc_timer_entry *entry = &(log[i]); + printf("GRPC_LAT_PROF %ld.%09d %p %c %d(%s) %p %s %d\n", entry->tm.tv_sec, + entry->tm.tv_nsec, (void *)(gpr_intptr)gpr_thd_currentid(), + entry->type, entry->tag, entry->tagstr, entry->id, entry->file, + entry->line); + } /* Now clear out the log */ count = 0; } -static void -grpc_timers_log_add (int tag, const char *tagstr, marker_type type, void *id, const char *file, int line) -{ +static void grpc_timers_log_add(int tag, const char *tagstr, marker_type type, + void *id, const char *file, int line) { grpc_timer_entry *entry; /* TODO (vpai) : Improve concurrency */ - if (count == MAX_COUNT) - { - log_report (); - } + if (count == MAX_COUNT) { + log_report(); + } entry = &log[count++]; - entry->tm = gpr_now (GPR_CLOCK_PRECISE); + entry->tm = gpr_now(GPR_CLOCK_PRECISE); entry->tag = tag; entry->tagstr = tagstr; entry->type = type; @@ -105,61 +101,41 @@ grpc_timers_log_add (int tag, const char *tagstr, marker_type type, void *id, co } /* Latency profiler API implementation. */ -void -grpc_timer_add_mark (int tag, const char *tagstr, void *id, const char *file, int line) -{ - if (tag < GRPC_PTAG_IGNORE_THRESHOLD) - { - grpc_timers_log_add (tag, tagstr, MARK, id, file, line); - } +void grpc_timer_add_mark(int tag, const char *tagstr, void *id, + const char *file, int line) { + if (tag < GRPC_PTAG_IGNORE_THRESHOLD) { + grpc_timers_log_add(tag, tagstr, MARK, id, file, line); + } } -void -grpc_timer_add_important_mark (int tag, const char *tagstr, void *id, const char *file, int line) -{ - if (tag < GRPC_PTAG_IGNORE_THRESHOLD) - { - grpc_timers_log_add (tag, tagstr, IMPORTANT, id, file, line); - } +void grpc_timer_add_important_mark(int tag, const char *tagstr, void *id, + const char *file, int line) { + if (tag < GRPC_PTAG_IGNORE_THRESHOLD) { + grpc_timers_log_add(tag, tagstr, IMPORTANT, id, file, line); + } } -void -grpc_timer_begin (int tag, const char *tagstr, void *id, const char *file, int line) -{ - if (tag < GRPC_PTAG_IGNORE_THRESHOLD) - { - grpc_timers_log_add (tag, tagstr, BEGIN, id, file, line); - } +void grpc_timer_begin(int tag, const char *tagstr, void *id, const char *file, + int line) { + if (tag < GRPC_PTAG_IGNORE_THRESHOLD) { + grpc_timers_log_add(tag, tagstr, BEGIN, id, file, line); + } } -void -grpc_timer_end (int tag, const char *tagstr, void *id, const char *file, int line) -{ - if (tag < GRPC_PTAG_IGNORE_THRESHOLD) - { - grpc_timers_log_add (tag, tagstr, END, id, file, line); - } +void grpc_timer_end(int tag, const char *tagstr, void *id, const char *file, + int line) { + if (tag < GRPC_PTAG_IGNORE_THRESHOLD) { + grpc_timers_log_add(tag, tagstr, END, id, file, line); + } } /* Basic profiler specific API functions. */ -void -grpc_timers_global_init (void) -{ -} +void grpc_timers_global_init(void) {} -void -grpc_timers_global_destroy (void) -{ -} +void grpc_timers_global_destroy(void) {} -#else /* !GRPC_BASIC_PROFILER */ -void -grpc_timers_global_init (void) -{ -} +#else /* !GRPC_BASIC_PROFILER */ +void grpc_timers_global_init(void) {} -void -grpc_timers_global_destroy (void) -{ -} +void grpc_timers_global_destroy(void) {} #endif /* GRPC_BASIC_PROFILER */ diff --git a/src/core/profiling/stap_timers.c b/src/core/profiling/stap_timers.c index f284e32433b..6868a674a98 100644 --- a/src/core/profiling/stap_timers.c +++ b/src/core/profiling/stap_timers.c @@ -42,28 +42,24 @@ #include "src/core/profiling/stap_probes.h" /* Latency profiler API implementation. */ -void -grpc_timer_add_mark (int tag, const char *tagstr, void *id, const char *file, int line) -{ - _STAP_ADD_MARK (tag); +void grpc_timer_add_mark(int tag, const char *tagstr, void *id, + const char *file, int line) { + _STAP_ADD_MARK(tag); } -void -grpc_timer_add_important_mark (int tag, const char *tagstr, void *id, const char *file, int line) -{ - _STAP_ADD_IMPORTANT_MARK (tag); +void grpc_timer_add_important_mark(int tag, const char *tagstr, void *id, + const char *file, int line) { + _STAP_ADD_IMPORTANT_MARK(tag); } -void -grpc_timer_begin (int tag, const char *tagstr, void *id, const char *file, int line) -{ - _STAP_TIMING_NS_BEGIN (tag); +void grpc_timer_begin(int tag, const char *tagstr, void *id, const char *file, + int line) { + _STAP_TIMING_NS_BEGIN(tag); } -void -grpc_timer_end (int tag, const char *tagstr, void *id, const char *file, int line) -{ - _STAP_TIMING_NS_END (tag); +void grpc_timer_end(int tag, const char *tagstr, void *id, const char *file, + int line) { + _STAP_TIMING_NS_END(tag); } #endif /* GRPC_STAP_PROFILER */ diff --git a/src/core/profiling/timers.h b/src/core/profiling/timers.h index 34929d8217b..a70520408c3 100644 --- a/src/core/profiling/timers.h +++ b/src/core/profiling/timers.h @@ -35,49 +35,51 @@ #define GRPC_CORE_PROFILING_TIMERS_H #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif - void grpc_timers_global_init (void); - void grpc_timers_global_destroy (void); - - void grpc_timer_add_mark (int tag, const char *tagstr, void *id, const char *file, int line); - void grpc_timer_add_important_mark (int tag, const char *tagstr, void *id, const char *file, int line); - void grpc_timer_begin (int tag, const char *tagstr, void *id, const char *file, int line); - void grpc_timer_end (int tag, const char *tagstr, void *id, const char *file, int line); - - enum grpc_profiling_tags - { - /* Any GRPC_PTAG_* >= than the threshold won't generate any profiling mark. */ - GRPC_PTAG_IGNORE_THRESHOLD = 1000000, - - /* Re. Protos. */ - GRPC_PTAG_PROTO_SERIALIZE = 100 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_PROTO_DESERIALIZE = 101 + GRPC_PTAG_IGNORE_THRESHOLD, - - /* Re. sockets. */ - GRPC_PTAG_HANDLE_READ = 200 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_SENDMSG = 201 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_RECVMSG = 202 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_POLL_FINISHED = 203 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_TCP_CB_WRITE = 204 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_TCP_WRITE = 205 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_CALL_ON_DONE_RECV = 206 + GRPC_PTAG_IGNORE_THRESHOLD, - - /* C++ */ - GRPC_PTAG_CPP_CALL_CREATED = 300 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_CPP_PERFORM_OPS = 301 + GRPC_PTAG_IGNORE_THRESHOLD, - - /* Transports */ - GRPC_PTAG_HTTP2_UNLOCK = 401 + GRPC_PTAG_IGNORE_THRESHOLD, - GRPC_PTAG_HTTP2_UNLOCK_CLEANUP = 402 + GRPC_PTAG_IGNORE_THRESHOLD, - - /* > 1024 Unassigned reserved. For any miscellaneous use. - * Use addition to generate tags from this base or take advantage of the 10 - * zero'd bits for OR-ing. */ - GRPC_PTAG_OTHER_BASE = 1024 - }; +void grpc_timers_global_init(void); +void grpc_timers_global_destroy(void); + +void grpc_timer_add_mark(int tag, const char *tagstr, void *id, + const char *file, int line); +void grpc_timer_add_important_mark(int tag, const char *tagstr, void *id, + const char *file, int line); +void grpc_timer_begin(int tag, const char *tagstr, void *id, const char *file, + int line); +void grpc_timer_end(int tag, const char *tagstr, void *id, const char *file, + int line); + +enum grpc_profiling_tags { + /* Any GRPC_PTAG_* >= than the threshold won't generate any profiling mark. */ + GRPC_PTAG_IGNORE_THRESHOLD = 1000000, + + /* Re. Protos. */ + GRPC_PTAG_PROTO_SERIALIZE = 100 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_PROTO_DESERIALIZE = 101 + GRPC_PTAG_IGNORE_THRESHOLD, + + /* Re. sockets. */ + GRPC_PTAG_HANDLE_READ = 200 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_SENDMSG = 201 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_RECVMSG = 202 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_POLL_FINISHED = 203 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_TCP_CB_WRITE = 204 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_TCP_WRITE = 205 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_CALL_ON_DONE_RECV = 206 + GRPC_PTAG_IGNORE_THRESHOLD, + + /* C++ */ + GRPC_PTAG_CPP_CALL_CREATED = 300 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_CPP_PERFORM_OPS = 301 + GRPC_PTAG_IGNORE_THRESHOLD, + + /* Transports */ + GRPC_PTAG_HTTP2_UNLOCK = 401 + GRPC_PTAG_IGNORE_THRESHOLD, + GRPC_PTAG_HTTP2_UNLOCK_CLEANUP = 402 + GRPC_PTAG_IGNORE_THRESHOLD, + + /* > 1024 Unassigned reserved. For any miscellaneous use. + * Use addition to generate tags from this base or take advantage of the 10 + * zero'd bits for OR-ing. */ + GRPC_PTAG_OTHER_BASE = 1024 +}; #if !(defined(GRPC_STAP_PROFILER) + defined(GRPC_BASIC_PROFILER)) /* No profiling. No-op all the things. */ @@ -97,7 +99,7 @@ extern "C" do { \ } while (0) -#else /* at least one profiler requested... */ +#else /* at least one profiler requested... */ /* ... hopefully only one. */ #if defined(GRPC_STAP_PROFILER) && defined(GRPC_BASIC_PROFILER) #error "GRPC_STAP_PROFILER and GRPC_BASIC_PROFILER are mutually exclusive." @@ -129,16 +131,16 @@ extern "C" #ifdef GRPC_STAP_PROFILER /* Empty placeholder for now. */ -#endif /* GRPC_STAP_PROFILER */ +#endif /* GRPC_STAP_PROFILER */ #ifdef GRPC_BASIC_PROFILER /* Empty placeholder for now. */ -#endif /* GRPC_BASIC_PROFILER */ +#endif /* GRPC_BASIC_PROFILER */ -#endif /* at least one profiler requested. */ +#endif /* at least one profiler requested. */ #ifdef __cplusplus } #endif -#endif /* GRPC_CORE_PROFILING_TIMERS_H */ +#endif /* GRPC_CORE_PROFILING_TIMERS_H */ diff --git a/src/core/security/base64.c b/src/core/security/base64.c index 4d86da9453a..5226d2c5786 100644 --- a/src/core/security/base64.c +++ b/src/core/security/base64.c @@ -42,21 +42,22 @@ /* --- Constants. --- */ static const char base64_bytes[] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 0x3E, -1, -1, -1, 0x3F, - 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, -1, -1, - -1, 0x7F, -1, -1, -1, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, - 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, - 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, -1, -1, -1, -1, -1, - -1, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, - 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, - 0x31, 0x32, 0x33, -1, -1, -1, -1, -1 -}; - -static const char base64_url_unsafe_chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -static const char base64_url_safe_chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 0x3E, -1, -1, -1, 0x3F, + 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, -1, -1, + -1, 0x7F, -1, -1, -1, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, + 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, + 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, -1, -1, -1, -1, -1, + -1, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, + 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, + 0x31, 0x32, 0x33, -1, -1, -1, -1, -1}; + +static const char base64_url_unsafe_chars[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +static const char base64_url_safe_chars[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; #define GRPC_BASE64_PAD_CHAR '=' #define GRPC_BASE64_PAD_BYTE 0x7F @@ -65,194 +66,168 @@ static const char base64_url_safe_chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghi /* --- base64 functions. --- */ -char * -grpc_base64_encode (const void *vdata, size_t data_size, int url_safe, int multiline) -{ +char *grpc_base64_encode(const void *vdata, size_t data_size, int url_safe, + int multiline) { const unsigned char *data = vdata; - const char *base64_chars = url_safe ? base64_url_safe_chars : base64_url_unsafe_chars; - size_t result_projected_size = 4 * ((data_size + 3) / 3) + 2 * (multiline ? (data_size / (3 * GRPC_BASE64_MULTILINE_NUM_BLOCKS)) : 0) + 1; - char *result = gpr_malloc (result_projected_size); + const char *base64_chars = + url_safe ? base64_url_safe_chars : base64_url_unsafe_chars; + size_t result_projected_size = + 4 * ((data_size + 3) / 3) + + 2 * (multiline ? (data_size / (3 * GRPC_BASE64_MULTILINE_NUM_BLOCKS)) + : 0) + + 1; + char *result = gpr_malloc(result_projected_size); char *current = result; size_t num_blocks = 0; size_t i = 0; /* Encode each block. */ - while (data_size >= 3) - { - *current++ = base64_chars[(data[i] >> 2) & 0x3F]; - *current++ = base64_chars[((data[i] & 0x03) << 4) | ((data[i + 1] >> 4) & 0x0F)]; - *current++ = base64_chars[((data[i + 1] & 0x0F) << 2) | ((data[i + 2] >> 6) & 0x03)]; - *current++ = base64_chars[data[i + 2] & 0x3F]; - - data_size -= 3; - i += 3; - if (multiline && (++num_blocks == GRPC_BASE64_MULTILINE_NUM_BLOCKS)) - { - *current++ = '\r'; - *current++ = '\n'; - num_blocks = 0; - } + while (data_size >= 3) { + *current++ = base64_chars[(data[i] >> 2) & 0x3F]; + *current++ = + base64_chars[((data[i] & 0x03) << 4) | ((data[i + 1] >> 4) & 0x0F)]; + *current++ = + base64_chars[((data[i + 1] & 0x0F) << 2) | ((data[i + 2] >> 6) & 0x03)]; + *current++ = base64_chars[data[i + 2] & 0x3F]; + + data_size -= 3; + i += 3; + if (multiline && (++num_blocks == GRPC_BASE64_MULTILINE_NUM_BLOCKS)) { + *current++ = '\r'; + *current++ = '\n'; + num_blocks = 0; } + } /* Take care of the tail. */ - if (data_size == 2) - { - *current++ = base64_chars[(data[i] >> 2) & 0x3F]; - *current++ = base64_chars[((data[i] & 0x03) << 4) | ((data[i + 1] >> 4) & 0x0F)]; - *current++ = base64_chars[(data[i + 1] & 0x0F) << 2]; - *current++ = GRPC_BASE64_PAD_CHAR; - } - else if (data_size == 1) - { - *current++ = base64_chars[(data[i] >> 2) & 0x3F]; - *current++ = base64_chars[(data[i] & 0x03) << 4]; - *current++ = GRPC_BASE64_PAD_CHAR; - *current++ = GRPC_BASE64_PAD_CHAR; - } - - GPR_ASSERT (current >= result); - GPR_ASSERT ((gpr_uintptr) (current - result) < result_projected_size); + if (data_size == 2) { + *current++ = base64_chars[(data[i] >> 2) & 0x3F]; + *current++ = + base64_chars[((data[i] & 0x03) << 4) | ((data[i + 1] >> 4) & 0x0F)]; + *current++ = base64_chars[(data[i + 1] & 0x0F) << 2]; + *current++ = GRPC_BASE64_PAD_CHAR; + } else if (data_size == 1) { + *current++ = base64_chars[(data[i] >> 2) & 0x3F]; + *current++ = base64_chars[(data[i] & 0x03) << 4]; + *current++ = GRPC_BASE64_PAD_CHAR; + *current++ = GRPC_BASE64_PAD_CHAR; + } + + GPR_ASSERT(current >= result); + GPR_ASSERT((gpr_uintptr)(current - result) < result_projected_size); result[current - result] = '\0'; return result; } -gpr_slice -grpc_base64_decode (const char *b64, int url_safe) -{ - return grpc_base64_decode_with_len (b64, strlen (b64), url_safe); +gpr_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, size_t * result_offset) -{ - gpr_uint32 packed = ((gpr_uint32) codes[0] << 2) | ((gpr_uint32) codes[1] >> 4); - result[(*result_offset)++] = (unsigned char) packed; +static void decode_one_char(const unsigned char *codes, unsigned char *result, + size_t *result_offset) { + gpr_uint32 packed = ((gpr_uint32)codes[0] << 2) | ((gpr_uint32)codes[1] >> 4); + result[(*result_offset)++] = (unsigned char)packed; } -static void -decode_two_chars (const unsigned char *codes, unsigned char *result, size_t * result_offset) -{ - gpr_uint32 packed = ((gpr_uint32) codes[0] << 10) | ((gpr_uint32) codes[1] << 4) | ((gpr_uint32) codes[2] >> 2); - result[(*result_offset)++] = (unsigned char) (packed >> 8); - result[(*result_offset)++] = (unsigned char) (packed); +static void decode_two_chars(const unsigned char *codes, unsigned char *result, + size_t *result_offset) { + gpr_uint32 packed = ((gpr_uint32)codes[0] << 10) | + ((gpr_uint32)codes[1] << 4) | ((gpr_uint32)codes[2] >> 2); + result[(*result_offset)++] = (unsigned char)(packed >> 8); + result[(*result_offset)++] = (unsigned char)(packed); } -static int -decode_group (const unsigned char *codes, size_t num_codes, unsigned char *result, size_t * result_offset) -{ - GPR_ASSERT (num_codes <= 4); +static int decode_group(const unsigned char *codes, size_t num_codes, + unsigned char *result, size_t *result_offset) { + GPR_ASSERT(num_codes <= 4); /* Short end groups that may not have padding. */ - if (num_codes == 1) - { - gpr_log (GPR_ERROR, "Invalid group. Must be at least 2 bytes."); - return 0; - } - if (num_codes == 2) - { - decode_one_char (codes, result, result_offset); - return 1; - } - if (num_codes == 3) - { - decode_two_chars (codes, result, result_offset); - return 1; - } + if (num_codes == 1) { + gpr_log(GPR_ERROR, "Invalid group. Must be at least 2 bytes."); + return 0; + } + if (num_codes == 2) { + decode_one_char(codes, result, result_offset); + return 1; + } + if (num_codes == 3) { + decode_two_chars(codes, result, result_offset); + return 1; + } /* Regular 4 byte groups with padding or not. */ - GPR_ASSERT (num_codes == 4); - if (codes[0] == GRPC_BASE64_PAD_BYTE || codes[1] == GRPC_BASE64_PAD_BYTE) - { - gpr_log (GPR_ERROR, "Invalid padding detected."); + GPR_ASSERT(num_codes == 4); + if (codes[0] == GRPC_BASE64_PAD_BYTE || codes[1] == GRPC_BASE64_PAD_BYTE) { + gpr_log(GPR_ERROR, "Invalid padding detected."); + return 0; + } + if (codes[2] == GRPC_BASE64_PAD_BYTE) { + if (codes[3] == GRPC_BASE64_PAD_BYTE) { + decode_one_char(codes, result, result_offset); + } else { + gpr_log(GPR_ERROR, "Invalid padding detected."); return 0; } - if (codes[2] == GRPC_BASE64_PAD_BYTE) - { - if (codes[3] == GRPC_BASE64_PAD_BYTE) - { - decode_one_char (codes, result, result_offset); - } - else - { - gpr_log (GPR_ERROR, "Invalid padding detected."); - return 0; - } - } - else if (codes[3] == GRPC_BASE64_PAD_BYTE) - { - decode_two_chars (codes, result, result_offset); - } - else - { - /* No padding. */ - gpr_uint32 packed = ((gpr_uint32) codes[0] << 18) | ((gpr_uint32) codes[1] << 12) | ((gpr_uint32) codes[2] << 6) | codes[3]; - result[(*result_offset)++] = (unsigned char) (packed >> 16); - result[(*result_offset)++] = (unsigned char) (packed >> 8); - result[(*result_offset)++] = (unsigned char) (packed); - } + } else if (codes[3] == GRPC_BASE64_PAD_BYTE) { + decode_two_chars(codes, result, result_offset); + } else { + /* No padding. */ + gpr_uint32 packed = ((gpr_uint32)codes[0] << 18) | + ((gpr_uint32)codes[1] << 12) | + ((gpr_uint32)codes[2] << 6) | codes[3]; + result[(*result_offset)++] = (unsigned char)(packed >> 16); + result[(*result_offset)++] = (unsigned char)(packed >> 8); + result[(*result_offset)++] = (unsigned char)(packed); + } return 1; } -gpr_slice -grpc_base64_decode_with_len (const char *b64, size_t b64_len, int url_safe) -{ - gpr_slice result = gpr_slice_malloc (b64_len); - unsigned char *current = GPR_SLICE_START_PTR (result); +gpr_slice grpc_base64_decode_with_len(const char *b64, size_t b64_len, + int url_safe) { + gpr_slice result = gpr_slice_malloc(b64_len); + unsigned char *current = GPR_SLICE_START_PTR(result); size_t result_size = 0; unsigned char codes[4]; size_t num_codes = 0; - while (b64_len--) - { - unsigned char c = (unsigned char) (*b64++); - signed char code; - if (c >= GPR_ARRAY_SIZE (base64_bytes)) - continue; - if (url_safe) - { - if (c == '+' || c == '/') - { - gpr_log (GPR_ERROR, "Invalid character for url safe base64 %c", c); - goto fail; - } - if (c == '-') - { - c = '+'; - } - else if (c == '_') - { - c = '/'; - } - } - code = base64_bytes[c]; - if (code == -1) - { - if (c != '\r' && c != '\n') - { - gpr_log (GPR_ERROR, "Invalid character %c", c); - goto fail; - } - } - else - { - codes[num_codes++] = (unsigned char) code; - if (num_codes == 4) - { - if (!decode_group (codes, num_codes, current, &result_size)) - goto fail; - num_codes = 0; - } - } + while (b64_len--) { + unsigned char c = (unsigned char)(*b64++); + signed char code; + if (c >= GPR_ARRAY_SIZE(base64_bytes)) continue; + if (url_safe) { + if (c == '+' || c == '/') { + gpr_log(GPR_ERROR, "Invalid character for url safe base64 %c", c); + goto fail; + } + if (c == '-') { + c = '+'; + } else if (c == '_') { + c = '/'; + } } - - if (num_codes != 0 && !decode_group (codes, num_codes, current, &result_size)) - { - goto fail; + code = base64_bytes[c]; + if (code == -1) { + if (c != '\r' && c != '\n') { + gpr_log(GPR_ERROR, "Invalid character %c", c); + goto fail; + } + } else { + codes[num_codes++] = (unsigned char)code; + if (num_codes == 4) { + if (!decode_group(codes, num_codes, current, &result_size)) goto fail; + num_codes = 0; + } } - GPR_SLICE_SET_LENGTH (result, result_size); + } + + if (num_codes != 0 && + !decode_group(codes, num_codes, current, &result_size)) { + goto fail; + } + GPR_SLICE_SET_LENGTH(result, result_size); return result; fail: - gpr_slice_unref (result); - return gpr_empty_slice (); + gpr_slice_unref(result); + return gpr_empty_slice(); } diff --git a/src/core/security/base64.h b/src/core/security/base64.h index 9d4b44c4b0e..31ae982691a 100644 --- a/src/core/security/base64.h +++ b/src/core/security/base64.h @@ -38,13 +38,15 @@ /* Encodes data using base64. It is the caller's responsability to free the returned char * using gpr_free. Returns NULL on NULL input. */ -char *grpc_base64_encode (const void *data, size_t data_size, int url_safe, int multiline); +char *grpc_base64_encode(const void *data, size_t data_size, int url_safe, + int multiline); /* Decodes data according to the base64 specification. Returns an empty slice in case of failure. */ -gpr_slice grpc_base64_decode (const char *b64, int url_safe); +gpr_slice grpc_base64_decode(const char *b64, int url_safe); /* Same as above except that the length is provided by the caller. */ -gpr_slice grpc_base64_decode_with_len (const char *b64, size_t b64_len, int url_safe); +gpr_slice grpc_base64_decode_with_len(const char *b64, size_t b64_len, + int url_safe); #endif /* GRPC_INTERNAL_CORE_SECURITY_BASE64_H */ diff --git a/src/core/security/client_auth_filter.c b/src/core/security/client_auth_filter.c index 33f2e8093a5..e24281bdff2 100644 --- a/src/core/security/client_auth_filter.c +++ b/src/core/security/client_auth_filter.c @@ -49,8 +49,7 @@ #define MAX_CREDENTIALS_METADATA_COUNT 4 /* We can have a per-call credentials. */ -typedef struct -{ +typedef struct { grpc_credentials *creds; grpc_mdstr *host; grpc_mdstr *method; @@ -68,8 +67,7 @@ typedef struct } call_data; /* We can have a per-channel credentials. */ -typedef struct -{ +typedef struct { grpc_channel_security_connector *security_connector; grpc_mdctx *md_ctx; grpc_mdstr *authority_string; @@ -78,130 +76,125 @@ typedef struct grpc_mdstr *status_key; } channel_data; -static void -reset_service_url (call_data * calld) -{ - if (calld->service_url != NULL) - { - gpr_free (calld->service_url); - calld->service_url = NULL; - } +static void reset_service_url(call_data *calld) { + if (calld->service_url != NULL) { + gpr_free(calld->service_url); + calld->service_url = NULL; + } } -static void -bubble_up_error (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_status_code status, const char *error_msg) -{ +static void bubble_up_error(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + grpc_status_code status, const char *error_msg) { call_data *calld = elem->call_data; - gpr_log (GPR_ERROR, "Client side authentication failure: %s", error_msg); - grpc_transport_stream_op_add_cancellation (&calld->op, status); - grpc_call_next_op (exec_ctx, elem, &calld->op); + gpr_log(GPR_ERROR, "Client side authentication failure: %s", error_msg); + grpc_transport_stream_op_add_cancellation(&calld->op, status); + grpc_call_next_op(exec_ctx, elem, &calld->op); } -static void -on_credentials_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) -{ - grpc_call_element *elem = (grpc_call_element *) user_data; +static void on_credentials_metadata(grpc_exec_ctx *exec_ctx, void *user_data, + grpc_credentials_md *md_elems, + size_t num_md, + grpc_credentials_status status) { + grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_transport_stream_op *op = &calld->op; grpc_metadata_batch *mdb; size_t i; - reset_service_url (calld); - if (status != GRPC_CREDENTIALS_OK) - { - bubble_up_error (exec_ctx, elem, GRPC_STATUS_UNAUTHENTICATED, "Credentials failed to get metadata."); - return; - } - GPR_ASSERT (num_md <= MAX_CREDENTIALS_METADATA_COUNT); - GPR_ASSERT (op->send_ops && op->send_ops->nops > calld->op_md_idx && op->send_ops->ops[calld->op_md_idx].type == GRPC_OP_METADATA); + reset_service_url(calld); + if (status != GRPC_CREDENTIALS_OK) { + bubble_up_error(exec_ctx, elem, GRPC_STATUS_UNAUTHENTICATED, + "Credentials failed to get metadata."); + return; + } + GPR_ASSERT(num_md <= MAX_CREDENTIALS_METADATA_COUNT); + GPR_ASSERT(op->send_ops && op->send_ops->nops > calld->op_md_idx && + op->send_ops->ops[calld->op_md_idx].type == GRPC_OP_METADATA); mdb = &op->send_ops->ops[calld->op_md_idx].data.metadata; - for (i = 0; i < num_md; i++) - { - grpc_metadata_batch_add_tail (mdb, &calld->md_links[i], grpc_mdelem_from_slices (chand->md_ctx, gpr_slice_ref (md_elems[i].key), gpr_slice_ref (md_elems[i].value))); - } - grpc_call_next_op (exec_ctx, elem, op); + for (i = 0; i < num_md; i++) { + grpc_metadata_batch_add_tail( + mdb, &calld->md_links[i], + grpc_mdelem_from_slices(chand->md_ctx, gpr_slice_ref(md_elems[i].key), + gpr_slice_ref(md_elems[i].value))); + } + grpc_call_next_op(exec_ctx, elem, op); } -void -build_service_url (const char *url_scheme, call_data * calld) -{ - char *service = gpr_strdup (grpc_mdstr_as_c_string (calld->method)); - char *last_slash = strrchr (service, '/'); - if (last_slash == NULL) - { - gpr_log (GPR_ERROR, "No '/' found in fully qualified method name"); - service[0] = '\0'; - } - else if (last_slash == service) - { - /* No service part in fully qualified method name: will just be "/". */ - service[1] = '\0'; - } - else - { - *last_slash = '\0'; - } - if (url_scheme == NULL) - url_scheme = ""; - reset_service_url (calld); - gpr_asprintf (&calld->service_url, "%s://%s%s", url_scheme, grpc_mdstr_as_c_string (calld->host), service); - gpr_free (service); +void build_service_url(const char *url_scheme, call_data *calld) { + char *service = gpr_strdup(grpc_mdstr_as_c_string(calld->method)); + char *last_slash = strrchr(service, '/'); + if (last_slash == NULL) { + gpr_log(GPR_ERROR, "No '/' found in fully qualified method name"); + service[0] = '\0'; + } else if (last_slash == service) { + /* No service part in fully qualified method name: will just be "/". */ + service[1] = '\0'; + } else { + *last_slash = '\0'; + } + if (url_scheme == NULL) url_scheme = ""; + reset_service_url(calld); + gpr_asprintf(&calld->service_url, "%s://%s%s", url_scheme, + grpc_mdstr_as_c_string(calld->host), service); + gpr_free(service); } -static void -send_security_metadata (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ +static void send_security_metadata(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - grpc_client_security_context *ctx = (grpc_client_security_context *) op->context[GRPC_CONTEXT_SECURITY].value; - grpc_credentials *channel_creds = chand->security_connector->request_metadata_creds; - int channel_creds_has_md = (channel_creds != NULL) && grpc_credentials_has_request_metadata (channel_creds); - int call_creds_has_md = (ctx != NULL) && (ctx->creds != NULL) && grpc_credentials_has_request_metadata (ctx->creds); + grpc_client_security_context *ctx = + (grpc_client_security_context *)op->context[GRPC_CONTEXT_SECURITY].value; + grpc_credentials *channel_creds = + chand->security_connector->request_metadata_creds; + int channel_creds_has_md = + (channel_creds != NULL) && + grpc_credentials_has_request_metadata(channel_creds); + int call_creds_has_md = (ctx != NULL) && (ctx->creds != NULL) && + grpc_credentials_has_request_metadata(ctx->creds); - if (!channel_creds_has_md && !call_creds_has_md) - { - /* Skip sending metadata altogether. */ - grpc_call_next_op (exec_ctx, elem, op); - return; - } + if (!channel_creds_has_md && !call_creds_has_md) { + /* Skip sending metadata altogether. */ + grpc_call_next_op(exec_ctx, elem, op); + return; + } - if (channel_creds_has_md && call_creds_has_md) - { - calld->creds = grpc_composite_credentials_create (channel_creds, ctx->creds, NULL); - if (calld->creds == NULL) - { - bubble_up_error (exec_ctx, elem, GRPC_STATUS_INVALID_ARGUMENT, "Incompatible credentials set on channel and call."); - return; - } - } - else - { - calld->creds = grpc_credentials_ref (call_creds_has_md ? ctx->creds : channel_creds); + if (channel_creds_has_md && call_creds_has_md) { + calld->creds = + grpc_composite_credentials_create(channel_creds, ctx->creds, NULL); + if (calld->creds == NULL) { + bubble_up_error(exec_ctx, elem, GRPC_STATUS_INVALID_ARGUMENT, + "Incompatible credentials set on channel and call."); + return; } + } else { + calld->creds = + grpc_credentials_ref(call_creds_has_md ? ctx->creds : channel_creds); + } - build_service_url (chand->security_connector->base.url_scheme, calld); - calld->op = *op; /* Copy op (originates from the caller's stack). */ - GPR_ASSERT (calld->pollset); - grpc_credentials_get_request_metadata (exec_ctx, calld->creds, calld->pollset, calld->service_url, on_credentials_metadata, elem); + build_service_url(chand->security_connector->base.url_scheme, calld); + calld->op = *op; /* Copy op (originates from the caller's stack). */ + GPR_ASSERT(calld->pollset); + grpc_credentials_get_request_metadata(exec_ctx, calld->creds, calld->pollset, + calld->service_url, + on_credentials_metadata, elem); } -static void -on_host_checked (grpc_exec_ctx * exec_ctx, void *user_data, grpc_security_status status) -{ - grpc_call_element *elem = (grpc_call_element *) user_data; +static void on_host_checked(grpc_exec_ctx *exec_ctx, void *user_data, + grpc_security_status status) { + grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = elem->call_data; - if (status == GRPC_SECURITY_OK) - { - send_security_metadata (exec_ctx, elem, &calld->op); - } - else - { - char *error_msg; - gpr_asprintf (&error_msg, "Invalid host %s set in :authority metadata.", grpc_mdstr_as_c_string (calld->host)); - bubble_up_error (exec_ctx, elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg); - gpr_free (error_msg); - } + if (status == GRPC_SECURITY_OK) { + send_security_metadata(exec_ctx, elem, &calld->op); + } else { + char *error_msg; + gpr_asprintf(&error_msg, "Invalid host %s set in :authority metadata.", + grpc_mdstr_as_c_string(calld->host)); + bubble_up_error(exec_ctx, elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg); + gpr_free(error_msg); + } } /* Called either: @@ -209,9 +202,9 @@ on_host_checked (grpc_exec_ctx * exec_ctx, void *user_data, grpc_security_status - a network event (or similar) from below, to receive something op contains type and call direction information, in addition to the data that is being sent or received. */ -static void -auth_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ +static void auth_start_transport_op(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; @@ -219,162 +212,152 @@ auth_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grp size_t i; grpc_client_security_context *sec_ctx = NULL; - if (calld->security_context_set == 0) - { - calld->security_context_set = 1; - GPR_ASSERT (op->context); - if (op->context[GRPC_CONTEXT_SECURITY].value == NULL) - { - op->context[GRPC_CONTEXT_SECURITY].value = grpc_client_security_context_create (); - op->context[GRPC_CONTEXT_SECURITY].destroy = grpc_client_security_context_destroy; - } - sec_ctx = op->context[GRPC_CONTEXT_SECURITY].value; - GRPC_AUTH_CONTEXT_UNREF (sec_ctx->auth_context, "client auth filter"); - sec_ctx->auth_context = GRPC_AUTH_CONTEXT_REF (chand->security_connector->base.auth_context, "client_auth_filter"); + if (calld->security_context_set == 0) { + calld->security_context_set = 1; + GPR_ASSERT(op->context); + if (op->context[GRPC_CONTEXT_SECURITY].value == NULL) { + op->context[GRPC_CONTEXT_SECURITY].value = + grpc_client_security_context_create(); + op->context[GRPC_CONTEXT_SECURITY].destroy = + grpc_client_security_context_destroy; } + sec_ctx = op->context[GRPC_CONTEXT_SECURITY].value; + GRPC_AUTH_CONTEXT_UNREF(sec_ctx->auth_context, "client auth filter"); + sec_ctx->auth_context = GRPC_AUTH_CONTEXT_REF( + chand->security_connector->base.auth_context, "client_auth_filter"); + } - if (op->bind_pollset) - { - calld->pollset = op->bind_pollset; - } + if (op->bind_pollset) { + calld->pollset = op->bind_pollset; + } - if (op->send_ops && !calld->sent_initial_metadata) - { - size_t nops = op->send_ops->nops; - grpc_stream_op *ops = op->send_ops->ops; - for (i = 0; i < nops; i++) - { - grpc_stream_op *sop = &ops[i]; - if (sop->type != GRPC_OP_METADATA) - continue; - calld->op_md_idx = i; - calld->sent_initial_metadata = 1; - for (l = sop->data.metadata.list.head; l != NULL; l = l->next) - { - grpc_mdelem *md = l->md; - /* Pointer comparison is OK for md_elems created from the same context. - */ - if (md->key == chand->authority_string) - { - if (calld->host != NULL) - GRPC_MDSTR_UNREF (calld->host); - calld->host = GRPC_MDSTR_REF (md->value); - } - else if (md->key == chand->path_string) - { - if (calld->method != NULL) - GRPC_MDSTR_UNREF (calld->method); - calld->method = GRPC_MDSTR_REF (md->value); - } - } - if (calld->host != NULL) - { - grpc_security_status status; - const char *call_host = grpc_mdstr_as_c_string (calld->host); - calld->op = *op; /* Copy op (originates from the caller's stack). */ - status = grpc_channel_security_connector_check_call_host (exec_ctx, chand->security_connector, call_host, on_host_checked, elem); - if (status != GRPC_SECURITY_OK) - { - if (status == GRPC_SECURITY_ERROR) - { - char *error_msg; - gpr_asprintf (&error_msg, "Invalid host %s set in :authority metadata.", call_host); - bubble_up_error (exec_ctx, elem, GRPC_STATUS_INVALID_ARGUMENT, error_msg); - gpr_free (error_msg); - } - return; /* early exit */ - } - } - send_security_metadata (exec_ctx, elem, op); - return; /* early exit */ - } + if (op->send_ops && !calld->sent_initial_metadata) { + size_t nops = op->send_ops->nops; + grpc_stream_op *ops = op->send_ops->ops; + for (i = 0; i < nops; i++) { + grpc_stream_op *sop = &ops[i]; + if (sop->type != GRPC_OP_METADATA) continue; + calld->op_md_idx = i; + calld->sent_initial_metadata = 1; + for (l = sop->data.metadata.list.head; l != NULL; l = l->next) { + grpc_mdelem *md = l->md; + /* Pointer comparison is OK for md_elems created from the same context. + */ + if (md->key == chand->authority_string) { + if (calld->host != NULL) GRPC_MDSTR_UNREF(calld->host); + calld->host = GRPC_MDSTR_REF(md->value); + } else if (md->key == chand->path_string) { + if (calld->method != NULL) GRPC_MDSTR_UNREF(calld->method); + calld->method = GRPC_MDSTR_REF(md->value); + } + } + if (calld->host != NULL) { + grpc_security_status status; + const char *call_host = grpc_mdstr_as_c_string(calld->host); + calld->op = *op; /* Copy op (originates from the caller's stack). */ + status = grpc_channel_security_connector_check_call_host( + exec_ctx, chand->security_connector, call_host, on_host_checked, + elem); + if (status != GRPC_SECURITY_OK) { + if (status == GRPC_SECURITY_ERROR) { + char *error_msg; + gpr_asprintf(&error_msg, + "Invalid host %s set in :authority metadata.", + call_host); + bubble_up_error(exec_ctx, elem, GRPC_STATUS_INVALID_ARGUMENT, + error_msg); + gpr_free(error_msg); + } + return; /* early exit */ + } + } + send_security_metadata(exec_ctx, elem, op); + return; /* early exit */ } + } /* pass control down the stack */ - grpc_call_next_op (exec_ctx, elem, op); + grpc_call_next_op(exec_ctx, elem, op); } /* Constructor for call_data */ -static void -init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) -{ +static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + const void *server_transport_data, + grpc_transport_stream_op *initial_op) { call_data *calld = elem->call_data; - memset (calld, 0, sizeof (*calld)); - GPR_ASSERT (!initial_op || !initial_op->send_ops); + memset(calld, 0, sizeof(*calld)); + GPR_ASSERT(!initial_op || !initial_op->send_ops); } /* Destructor for call_data */ -static void -destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ +static void destroy_call_elem(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem) { call_data *calld = elem->call_data; - grpc_credentials_unref (calld->creds); - if (calld->host != NULL) - { - GRPC_MDSTR_UNREF (calld->host); - } - if (calld->method != NULL) - { - GRPC_MDSTR_UNREF (calld->method); - } - reset_service_url (calld); + grpc_credentials_unref(calld->creds); + if (calld->host != NULL) { + GRPC_MDSTR_UNREF(calld->host); + } + if (calld->method != NULL) { + GRPC_MDSTR_UNREF(calld->method); + } + reset_service_url(calld); } /* Constructor for channel_data */ -static void -init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last) -{ - grpc_security_connector *sc = grpc_find_security_connector_in_args (args); +static void init_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, grpc_channel *master, + const grpc_channel_args *args, + grpc_mdctx *metadata_context, int is_first, + int is_last) { + grpc_security_connector *sc = grpc_find_security_connector_in_args(args); /* grab pointers to our data from the channel element */ channel_data *chand = elem->channel_data; /* The first and the last filters tend to be implemented differently to handle the case that there's no 'next' filter to call on the up or down path */ - GPR_ASSERT (!is_last); - GPR_ASSERT (sc != NULL); + GPR_ASSERT(!is_last); + GPR_ASSERT(sc != NULL); /* initialize members */ - GPR_ASSERT (sc->is_client_side); - chand->security_connector = (grpc_channel_security_connector *) GRPC_SECURITY_CONNECTOR_REF (sc, "client_auth_filter"); + GPR_ASSERT(sc->is_client_side); + chand->security_connector = + (grpc_channel_security_connector *)GRPC_SECURITY_CONNECTOR_REF( + sc, "client_auth_filter"); chand->md_ctx = metadata_context; - chand->authority_string = grpc_mdstr_from_string (chand->md_ctx, ":authority", 0); - chand->path_string = grpc_mdstr_from_string (chand->md_ctx, ":path", 0); - chand->error_msg_key = grpc_mdstr_from_string (chand->md_ctx, "grpc-message", 0); - chand->status_key = grpc_mdstr_from_string (chand->md_ctx, "grpc-status", 0); + chand->authority_string = + grpc_mdstr_from_string(chand->md_ctx, ":authority", 0); + chand->path_string = grpc_mdstr_from_string(chand->md_ctx, ":path", 0); + chand->error_msg_key = + grpc_mdstr_from_string(chand->md_ctx, "grpc-message", 0); + chand->status_key = grpc_mdstr_from_string(chand->md_ctx, "grpc-status", 0); } /* Destructor for channel data */ -static void -destroy_channel_elem (grpc_exec_ctx * exec_ctx, 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 = elem->channel_data; grpc_channel_security_connector *ctx = chand->security_connector; if (ctx != NULL) - GRPC_SECURITY_CONNECTOR_UNREF (&ctx->base, "client_auth_filter"); - if (chand->authority_string != NULL) - { - GRPC_MDSTR_UNREF (chand->authority_string); - } - if (chand->error_msg_key != NULL) - { - GRPC_MDSTR_UNREF (chand->error_msg_key); - } - if (chand->status_key != NULL) - { - GRPC_MDSTR_UNREF (chand->status_key); - } - if (chand->path_string != NULL) - { - GRPC_MDSTR_UNREF (chand->path_string); - } + GRPC_SECURITY_CONNECTOR_UNREF(&ctx->base, "client_auth_filter"); + if (chand->authority_string != NULL) { + GRPC_MDSTR_UNREF(chand->authority_string); + } + if (chand->error_msg_key != NULL) { + GRPC_MDSTR_UNREF(chand->error_msg_key); + } + if (chand->status_key != NULL) { + GRPC_MDSTR_UNREF(chand->status_key); + } + if (chand->path_string != NULL) { + GRPC_MDSTR_UNREF(chand->path_string); + } } const grpc_channel_filter grpc_client_auth_filter = { - auth_start_transport_op, grpc_channel_next_op, - sizeof (call_data), init_call_elem, - destroy_call_elem, sizeof (channel_data), - init_channel_elem, destroy_channel_elem, - grpc_call_next_get_peer, "client-auth" -}; + auth_start_transport_op, grpc_channel_next_op, + sizeof(call_data), init_call_elem, + destroy_call_elem, sizeof(channel_data), + init_channel_elem, destroy_channel_elem, + grpc_call_next_get_peer, "client-auth"}; diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index 71dfb258258..48cfed74768 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -52,935 +52,857 @@ /* -- Common. -- */ -struct grpc_credentials_metadata_request -{ +struct grpc_credentials_metadata_request { grpc_credentials *creds; grpc_credentials_metadata_cb cb; void *user_data; }; static grpc_credentials_metadata_request * -grpc_credentials_metadata_request_create (grpc_credentials * creds, grpc_credentials_metadata_cb cb, void *user_data) -{ - grpc_credentials_metadata_request *r = gpr_malloc (sizeof (grpc_credentials_metadata_request)); - r->creds = grpc_credentials_ref (creds); +grpc_credentials_metadata_request_create(grpc_credentials *creds, + grpc_credentials_metadata_cb cb, + void *user_data) { + grpc_credentials_metadata_request *r = + gpr_malloc(sizeof(grpc_credentials_metadata_request)); + r->creds = grpc_credentials_ref(creds); r->cb = cb; r->user_data = user_data; return r; } -static void -grpc_credentials_metadata_request_destroy (grpc_credentials_metadata_request * r) -{ - grpc_credentials_unref (r->creds); - gpr_free (r); +static void grpc_credentials_metadata_request_destroy( + grpc_credentials_metadata_request *r) { + grpc_credentials_unref(r->creds); + gpr_free(r); } -grpc_credentials * -grpc_credentials_ref (grpc_credentials * creds) -{ - if (creds == NULL) - return NULL; - gpr_ref (&creds->refcount); +grpc_credentials *grpc_credentials_ref(grpc_credentials *creds) { + if (creds == NULL) return NULL; + gpr_ref(&creds->refcount); return creds; } -void -grpc_credentials_unref (grpc_credentials * creds) -{ - if (creds == NULL) - return; - if (gpr_unref (&creds->refcount)) - { - creds->vtable->destruct (creds); - gpr_free (creds); - } +void grpc_credentials_unref(grpc_credentials *creds) { + if (creds == NULL) return; + if (gpr_unref(&creds->refcount)) { + creds->vtable->destruct(creds); + gpr_free(creds); + } } -void -grpc_credentials_release (grpc_credentials * creds) -{ - grpc_credentials_unref (creds); +void grpc_credentials_release(grpc_credentials *creds) { + grpc_credentials_unref(creds); } -int -grpc_credentials_has_request_metadata (grpc_credentials * creds) -{ - if (creds == NULL) - return 0; - return creds->vtable->has_request_metadata (creds); +int grpc_credentials_has_request_metadata(grpc_credentials *creds) { + if (creds == NULL) return 0; + return creds->vtable->has_request_metadata(creds); } -int -grpc_credentials_has_request_metadata_only (grpc_credentials * creds) -{ - if (creds == NULL) - return 0; - return creds->vtable->has_request_metadata_only (creds); +int grpc_credentials_has_request_metadata_only(grpc_credentials *creds) { + if (creds == NULL) return 0; + return creds->vtable->has_request_metadata_only(creds); } -void -grpc_credentials_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) -{ - if (creds == NULL || !grpc_credentials_has_request_metadata (creds) || creds->vtable->get_request_metadata == NULL) - { - if (cb != NULL) - { - cb (exec_ctx, user_data, NULL, 0, GRPC_CREDENTIALS_OK); - } - return; +void grpc_credentials_get_request_metadata( + grpc_exec_ctx *exec_ctx, grpc_credentials *creds, grpc_pollset *pollset, + const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { + if (creds == NULL || !grpc_credentials_has_request_metadata(creds) || + creds->vtable->get_request_metadata == NULL) { + if (cb != NULL) { + cb(exec_ctx, user_data, NULL, 0, GRPC_CREDENTIALS_OK); } - creds->vtable->get_request_metadata (exec_ctx, creds, pollset, service_url, cb, user_data); + return; + } + creds->vtable->get_request_metadata(exec_ctx, creds, pollset, service_url, cb, + user_data); } -grpc_security_status -grpc_credentials_create_security_connector (grpc_credentials * creds, const char *target, const grpc_channel_args * args, grpc_credentials * request_metadata_creds, grpc_channel_security_connector ** sc, grpc_channel_args ** new_args) -{ +grpc_security_status grpc_credentials_create_security_connector( + grpc_credentials *creds, const char *target, const grpc_channel_args *args, + grpc_credentials *request_metadata_creds, + grpc_channel_security_connector **sc, grpc_channel_args **new_args) { *new_args = NULL; - if (creds == NULL || creds->vtable->create_security_connector == NULL || grpc_credentials_has_request_metadata_only (creds)) - { - gpr_log (GPR_ERROR, "Invalid credentials for creating a security connector."); - return GRPC_SECURITY_ERROR; - } - return creds->vtable->create_security_connector (creds, target, args, request_metadata_creds, sc, new_args); + if (creds == NULL || creds->vtable->create_security_connector == NULL || + grpc_credentials_has_request_metadata_only(creds)) { + gpr_log(GPR_ERROR, + "Invalid credentials for creating a security connector."); + return GRPC_SECURITY_ERROR; + } + return creds->vtable->create_security_connector( + creds, target, args, request_metadata_creds, sc, new_args); } -grpc_server_credentials * -grpc_server_credentials_ref (grpc_server_credentials * creds) -{ - if (creds == NULL) - return NULL; - gpr_ref (&creds->refcount); +grpc_server_credentials *grpc_server_credentials_ref( + grpc_server_credentials *creds) { + if (creds == NULL) return NULL; + gpr_ref(&creds->refcount); return creds; } -void -grpc_server_credentials_unref (grpc_server_credentials * creds) -{ - if (creds == NULL) - return; - if (gpr_unref (&creds->refcount)) - { - creds->vtable->destruct (creds); - if (creds->processor.destroy != NULL && creds->processor.state != NULL) - { - creds->processor.destroy (creds->processor.state); - } - gpr_free (creds); +void grpc_server_credentials_unref(grpc_server_credentials *creds) { + if (creds == NULL) return; + if (gpr_unref(&creds->refcount)) { + creds->vtable->destruct(creds); + if (creds->processor.destroy != NULL && creds->processor.state != NULL) { + creds->processor.destroy(creds->processor.state); } + gpr_free(creds); + } } -void -grpc_server_credentials_release (grpc_server_credentials * creds) -{ - grpc_server_credentials_unref (creds); +void grpc_server_credentials_release(grpc_server_credentials *creds) { + grpc_server_credentials_unref(creds); } -grpc_security_status -grpc_server_credentials_create_security_connector (grpc_server_credentials * creds, grpc_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 (creds, sc); +grpc_security_status grpc_server_credentials_create_security_connector( + grpc_server_credentials *creds, grpc_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(creds, sc); } -void -grpc_server_credentials_set_auth_metadata_processor (grpc_server_credentials * creds, grpc_auth_metadata_processor processor) -{ - if (creds == NULL) - return; - if (creds->processor.destroy != NULL && creds->processor.state != NULL) - { - creds->processor.destroy (creds->processor.state); - } +void grpc_server_credentials_set_auth_metadata_processor( + grpc_server_credentials *creds, grpc_auth_metadata_processor processor) { + if (creds == NULL) return; + if (creds->processor.destroy != NULL && creds->processor.state != NULL) { + creds->processor.destroy(creds->processor.state); + } creds->processor = processor; } /* -- Ssl credentials. -- */ -static void -ssl_destruct (grpc_credentials * creds) -{ - grpc_ssl_credentials *c = (grpc_ssl_credentials *) creds; - if (c->config.pem_root_certs != NULL) - gpr_free (c->config.pem_root_certs); - if (c->config.pem_private_key != NULL) - gpr_free (c->config.pem_private_key); - if (c->config.pem_cert_chain != NULL) - gpr_free (c->config.pem_cert_chain); -} - -static void -ssl_server_destruct (grpc_server_credentials * creds) -{ - grpc_ssl_server_credentials *c = (grpc_ssl_server_credentials *) creds; +static void ssl_destruct(grpc_credentials *creds) { + grpc_ssl_credentials *c = (grpc_ssl_credentials *)creds; + if (c->config.pem_root_certs != NULL) gpr_free(c->config.pem_root_certs); + if (c->config.pem_private_key != NULL) gpr_free(c->config.pem_private_key); + if (c->config.pem_cert_chain != NULL) gpr_free(c->config.pem_cert_chain); +} + +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++) - { - if (c->config.pem_private_keys[i] != NULL) - { - gpr_free (c->config.pem_private_keys[i]); - } - if (c->config.pem_cert_chains[i] != NULL) - { - gpr_free (c->config.pem_cert_chains[i]); - } - } - if (c->config.pem_private_keys != NULL) - gpr_free (c->config.pem_private_keys); - if (c->config.pem_private_keys_sizes != NULL) - { - gpr_free (c->config.pem_private_keys_sizes); + for (i = 0; i < c->config.num_key_cert_pairs; i++) { + if (c->config.pem_private_keys[i] != NULL) { + gpr_free(c->config.pem_private_keys[i]); } - if (c->config.pem_cert_chains != NULL) - gpr_free (c->config.pem_cert_chains); - if (c->config.pem_cert_chains_sizes != NULL) - { - gpr_free (c->config.pem_cert_chains_sizes); + if (c->config.pem_cert_chains[i] != NULL) { + gpr_free(c->config.pem_cert_chains[i]); } - if (c->config.pem_root_certs != NULL) - gpr_free (c->config.pem_root_certs); + } + if (c->config.pem_private_keys != NULL) gpr_free(c->config.pem_private_keys); + if (c->config.pem_private_keys_sizes != NULL) { + gpr_free(c->config.pem_private_keys_sizes); + } + if (c->config.pem_cert_chains != NULL) gpr_free(c->config.pem_cert_chains); + if (c->config.pem_cert_chains_sizes != NULL) { + gpr_free(c->config.pem_cert_chains_sizes); + } + if (c->config.pem_root_certs != NULL) gpr_free(c->config.pem_root_certs); } -static int -ssl_has_request_metadata (const grpc_credentials * creds) -{ - return 0; -} +static int ssl_has_request_metadata(const grpc_credentials *creds) { return 0; } -static int -ssl_has_request_metadata_only (const grpc_credentials * creds) -{ +static int ssl_has_request_metadata_only(const grpc_credentials *creds) { return 0; } -static grpc_security_status -ssl_create_security_connector (grpc_credentials * creds, const char *target, const grpc_channel_args * args, grpc_credentials * request_metadata_creds, grpc_channel_security_connector ** sc, grpc_channel_args ** new_args) -{ - grpc_ssl_credentials *c = (grpc_ssl_credentials *) creds; +static grpc_security_status ssl_create_security_connector( + grpc_credentials *creds, const char *target, const grpc_channel_args *args, + grpc_credentials *request_metadata_creds, + 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; size_t i = 0; const char *overridden_target_name = NULL; grpc_arg arg; - for (i = 0; args && i < args->num_args; i++) - { - grpc_arg *arg = &args->args[i]; - if (strcmp (arg->key, GRPC_SSL_TARGET_NAME_OVERRIDE_ARG) == 0 && arg->type == GRPC_ARG_STRING) - { - overridden_target_name = arg->value.string; - break; - } - } - status = grpc_ssl_channel_security_connector_create (request_metadata_creds, &c->config, target, overridden_target_name, sc); - if (status != GRPC_SECURITY_OK) - { - return status; + for (i = 0; args && i < args->num_args; i++) { + grpc_arg *arg = &args->args[i]; + if (strcmp(arg->key, GRPC_SSL_TARGET_NAME_OVERRIDE_ARG) == 0 && + arg->type == GRPC_ARG_STRING) { + overridden_target_name = arg->value.string; + break; } + } + status = grpc_ssl_channel_security_connector_create( + request_metadata_creds, &c->config, target, overridden_target_name, sc); + if (status != GRPC_SECURITY_OK) { + return status; + } arg.type = GRPC_ARG_STRING; arg.key = GRPC_ARG_HTTP2_SCHEME; arg.value.string = "https"; - *new_args = grpc_channel_args_copy_and_add (args, &arg, 1); + *new_args = grpc_channel_args_copy_and_add(args, &arg, 1); return status; } -static grpc_security_status -ssl_server_create_security_connector (grpc_server_credentials * creds, grpc_security_connector ** sc) -{ - grpc_ssl_server_credentials *c = (grpc_ssl_server_credentials *) creds; - return grpc_ssl_server_security_connector_create (&c->config, sc); +static grpc_security_status ssl_server_create_security_connector( + grpc_server_credentials *creds, grpc_security_connector **sc) { + grpc_ssl_server_credentials *c = (grpc_ssl_server_credentials *)creds; + return grpc_ssl_server_security_connector_create(&c->config, sc); } static grpc_credentials_vtable ssl_vtable = { - ssl_destruct, ssl_has_request_metadata, ssl_has_request_metadata_only, NULL, - ssl_create_security_connector -}; + ssl_destruct, ssl_has_request_metadata, ssl_has_request_metadata_only, NULL, + ssl_create_security_connector}; static grpc_server_credentials_vtable ssl_server_vtable = { - ssl_server_destruct, ssl_server_create_security_connector -}; + ssl_server_destruct, ssl_server_create_security_connector}; -static void -ssl_copy_key_material (const char *input, unsigned char **output, size_t * output_size) -{ - *output_size = strlen (input); - *output = gpr_malloc (*output_size); - memcpy (*output, input, *output_size); +static void ssl_copy_key_material(const char *input, unsigned char **output, + size_t *output_size) { + *output_size = strlen(input); + *output = gpr_malloc(*output_size); + memcpy(*output, input, *output_size); } -static void -ssl_build_config (const char *pem_root_certs, grpc_ssl_pem_key_cert_pair * pem_key_cert_pair, grpc_ssl_config * config) -{ - if (pem_root_certs != NULL) - { - ssl_copy_key_material (pem_root_certs, &config->pem_root_certs, &config->pem_root_certs_size); - } - if (pem_key_cert_pair != NULL) - { - GPR_ASSERT (pem_key_cert_pair->private_key != NULL); - GPR_ASSERT (pem_key_cert_pair->cert_chain != NULL); - ssl_copy_key_material (pem_key_cert_pair->private_key, &config->pem_private_key, &config->pem_private_key_size); - ssl_copy_key_material (pem_key_cert_pair->cert_chain, &config->pem_cert_chain, &config->pem_cert_chain_size); - } +static void ssl_build_config(const char *pem_root_certs, + grpc_ssl_pem_key_cert_pair *pem_key_cert_pair, + grpc_ssl_config *config) { + if (pem_root_certs != NULL) { + ssl_copy_key_material(pem_root_certs, &config->pem_root_certs, + &config->pem_root_certs_size); + } + if (pem_key_cert_pair != NULL) { + GPR_ASSERT(pem_key_cert_pair->private_key != NULL); + GPR_ASSERT(pem_key_cert_pair->cert_chain != NULL); + ssl_copy_key_material(pem_key_cert_pair->private_key, + &config->pem_private_key, + &config->pem_private_key_size); + ssl_copy_key_material(pem_key_cert_pair->cert_chain, + &config->pem_cert_chain, + &config->pem_cert_chain_size); + } } -static void -ssl_build_server_config (const char *pem_root_certs, grpc_ssl_pem_key_cert_pair * pem_key_cert_pairs, size_t num_key_cert_pairs, int force_client_auth, grpc_ssl_server_config * config) -{ +static void ssl_build_server_config( + const char *pem_root_certs, grpc_ssl_pem_key_cert_pair *pem_key_cert_pairs, + size_t num_key_cert_pairs, int force_client_auth, + grpc_ssl_server_config *config) { size_t i; config->force_client_auth = force_client_auth; - if (pem_root_certs != NULL) - { - ssl_copy_key_material (pem_root_certs, &config->pem_root_certs, &config->pem_root_certs_size); - } - if (num_key_cert_pairs > 0) - { - GPR_ASSERT (pem_key_cert_pairs != NULL); - config->pem_private_keys = gpr_malloc (num_key_cert_pairs * sizeof (unsigned char *)); - config->pem_cert_chains = gpr_malloc (num_key_cert_pairs * sizeof (unsigned char *)); - config->pem_private_keys_sizes = gpr_malloc (num_key_cert_pairs * sizeof (size_t)); - config->pem_cert_chains_sizes = gpr_malloc (num_key_cert_pairs * sizeof (size_t)); - } + if (pem_root_certs != NULL) { + ssl_copy_key_material(pem_root_certs, &config->pem_root_certs, + &config->pem_root_certs_size); + } + if (num_key_cert_pairs > 0) { + GPR_ASSERT(pem_key_cert_pairs != NULL); + config->pem_private_keys = + gpr_malloc(num_key_cert_pairs * sizeof(unsigned char *)); + config->pem_cert_chains = + gpr_malloc(num_key_cert_pairs * sizeof(unsigned char *)); + config->pem_private_keys_sizes = + gpr_malloc(num_key_cert_pairs * sizeof(size_t)); + config->pem_cert_chains_sizes = + gpr_malloc(num_key_cert_pairs * sizeof(size_t)); + } config->num_key_cert_pairs = num_key_cert_pairs; - for (i = 0; i < num_key_cert_pairs; i++) - { - GPR_ASSERT (pem_key_cert_pairs[i].private_key != NULL); - GPR_ASSERT (pem_key_cert_pairs[i].cert_chain != NULL); - ssl_copy_key_material (pem_key_cert_pairs[i].private_key, &config->pem_private_keys[i], &config->pem_private_keys_sizes[i]); - ssl_copy_key_material (pem_key_cert_pairs[i].cert_chain, &config->pem_cert_chains[i], &config->pem_cert_chains_sizes[i]); - } + for (i = 0; i < num_key_cert_pairs; i++) { + GPR_ASSERT(pem_key_cert_pairs[i].private_key != NULL); + GPR_ASSERT(pem_key_cert_pairs[i].cert_chain != NULL); + ssl_copy_key_material(pem_key_cert_pairs[i].private_key, + &config->pem_private_keys[i], + &config->pem_private_keys_sizes[i]); + ssl_copy_key_material(pem_key_cert_pairs[i].cert_chain, + &config->pem_cert_chains[i], + &config->pem_cert_chains_sizes[i]); + } } -grpc_credentials * -grpc_ssl_credentials_create (const char *pem_root_certs, grpc_ssl_pem_key_cert_pair * pem_key_cert_pair, void *reserved) -{ - grpc_ssl_credentials *c = gpr_malloc (sizeof (grpc_ssl_credentials)); - GPR_ASSERT (reserved == NULL); - memset (c, 0, sizeof (grpc_ssl_credentials)); +grpc_credentials *grpc_ssl_credentials_create( + const char *pem_root_certs, grpc_ssl_pem_key_cert_pair *pem_key_cert_pair, + void *reserved) { + grpc_ssl_credentials *c = gpr_malloc(sizeof(grpc_ssl_credentials)); + GPR_ASSERT(reserved == NULL); + memset(c, 0, sizeof(grpc_ssl_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_SSL; c->base.vtable = &ssl_vtable; - gpr_ref_init (&c->base.refcount, 1); - ssl_build_config (pem_root_certs, pem_key_cert_pair, &c->config); + gpr_ref_init(&c->base.refcount, 1); + ssl_build_config(pem_root_certs, pem_key_cert_pair, &c->config); return &c->base; } -grpc_server_credentials * -grpc_ssl_server_credentials_create (const char *pem_root_certs, grpc_ssl_pem_key_cert_pair * pem_key_cert_pairs, size_t num_key_cert_pairs, int force_client_auth, void *reserved) -{ - grpc_ssl_server_credentials *c = gpr_malloc (sizeof (grpc_ssl_server_credentials)); - GPR_ASSERT (reserved == NULL); - memset (c, 0, sizeof (grpc_ssl_server_credentials)); +grpc_server_credentials *grpc_ssl_server_credentials_create( + const char *pem_root_certs, grpc_ssl_pem_key_cert_pair *pem_key_cert_pairs, + size_t num_key_cert_pairs, int force_client_auth, void *reserved) { + grpc_ssl_server_credentials *c = + gpr_malloc(sizeof(grpc_ssl_server_credentials)); + GPR_ASSERT(reserved == NULL); + memset(c, 0, sizeof(grpc_ssl_server_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_SSL; - gpr_ref_init (&c->base.refcount, 1); + gpr_ref_init(&c->base.refcount, 1); c->base.vtable = &ssl_server_vtable; - ssl_build_server_config (pem_root_certs, pem_key_cert_pairs, num_key_cert_pairs, force_client_auth, &c->config); + ssl_build_server_config(pem_root_certs, pem_key_cert_pairs, + num_key_cert_pairs, force_client_auth, &c->config); return &c->base; } /* -- Jwt credentials -- */ -static void -jwt_reset_cache (grpc_service_account_jwt_access_credentials * c) -{ - if (c->cached.jwt_md != NULL) - { - grpc_credentials_md_store_unref (c->cached.jwt_md); - c->cached.jwt_md = NULL; - } - if (c->cached.service_url != NULL) - { - gpr_free (c->cached.service_url); - c->cached.service_url = NULL; - } - c->cached.jwt_expiration = gpr_inf_past (GPR_CLOCK_REALTIME); +static void jwt_reset_cache(grpc_service_account_jwt_access_credentials *c) { + if (c->cached.jwt_md != NULL) { + grpc_credentials_md_store_unref(c->cached.jwt_md); + c->cached.jwt_md = NULL; + } + if (c->cached.service_url != NULL) { + gpr_free(c->cached.service_url); + c->cached.service_url = NULL; + } + c->cached.jwt_expiration = gpr_inf_past(GPR_CLOCK_REALTIME); } -static void -jwt_destruct (grpc_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); - gpr_mu_destroy (&c->cache_mu); +static void jwt_destruct(grpc_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); + gpr_mu_destroy(&c->cache_mu); } -static int -jwt_has_request_metadata (const grpc_credentials * creds) -{ - return 1; -} +static int jwt_has_request_metadata(const grpc_credentials *creds) { return 1; } -static int -jwt_has_request_metadata_only (const grpc_credentials * creds) -{ +static int jwt_has_request_metadata_only(const grpc_credentials *creds) { return 1; } -static void -jwt_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) -{ - grpc_service_account_jwt_access_credentials *c = (grpc_service_account_jwt_access_credentials *) creds; - gpr_timespec refresh_threshold = gpr_time_from_seconds (GRPC_SECURE_TOKEN_REFRESH_THRESHOLD_SECS, GPR_TIMESPAN); +static void jwt_get_request_metadata( + grpc_exec_ctx *exec_ctx, grpc_credentials *creds, grpc_pollset *pollset, + const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { + grpc_service_account_jwt_access_credentials *c = + (grpc_service_account_jwt_access_credentials *)creds; + gpr_timespec refresh_threshold = gpr_time_from_seconds( + GRPC_SECURE_TOKEN_REFRESH_THRESHOLD_SECS, GPR_TIMESPAN); /* See if we can return a cached jwt. */ grpc_credentials_md_store *jwt_md = NULL; { - gpr_mu_lock (&c->cache_mu); - if (c->cached.service_url != NULL && strcmp (c->cached.service_url, service_url) == 0 && c->cached.jwt_md != NULL && (gpr_time_cmp (gpr_time_sub (c->cached.jwt_expiration, gpr_now (GPR_CLOCK_REALTIME)), refresh_threshold) > 0)) - { - jwt_md = grpc_credentials_md_store_ref (c->cached.jwt_md); - } - gpr_mu_unlock (&c->cache_mu); + gpr_mu_lock(&c->cache_mu); + if (c->cached.service_url != NULL && + strcmp(c->cached.service_url, service_url) == 0 && + c->cached.jwt_md != NULL && + (gpr_time_cmp(gpr_time_sub(c->cached.jwt_expiration, + gpr_now(GPR_CLOCK_REALTIME)), + refresh_threshold) > 0)) { + jwt_md = grpc_credentials_md_store_ref(c->cached.jwt_md); + } + gpr_mu_unlock(&c->cache_mu); } - if (jwt_md == NULL) - { - char *jwt = NULL; - /* Generate a new jwt. */ - gpr_mu_lock (&c->cache_mu); - jwt_reset_cache (c); - jwt = grpc_jwt_encode_and_sign (&c->key, service_url, c->jwt_lifetime, NULL); - if (jwt != NULL) - { - char *md_value; - gpr_asprintf (&md_value, "Bearer %s", jwt); - gpr_free (jwt); - c->cached.jwt_expiration = gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), c->jwt_lifetime); - c->cached.service_url = gpr_strdup (service_url); - c->cached.jwt_md = grpc_credentials_md_store_create (1); - grpc_credentials_md_store_add_cstrings (c->cached.jwt_md, GRPC_AUTHORIZATION_METADATA_KEY, md_value); - gpr_free (md_value); - jwt_md = grpc_credentials_md_store_ref (c->cached.jwt_md); - } - gpr_mu_unlock (&c->cache_mu); + if (jwt_md == NULL) { + char *jwt = NULL; + /* Generate a new jwt. */ + gpr_mu_lock(&c->cache_mu); + jwt_reset_cache(c); + jwt = grpc_jwt_encode_and_sign(&c->key, service_url, c->jwt_lifetime, NULL); + if (jwt != NULL) { + char *md_value; + gpr_asprintf(&md_value, "Bearer %s", jwt); + gpr_free(jwt); + c->cached.jwt_expiration = + gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), c->jwt_lifetime); + c->cached.service_url = gpr_strdup(service_url); + c->cached.jwt_md = grpc_credentials_md_store_create(1); + grpc_credentials_md_store_add_cstrings( + c->cached.jwt_md, GRPC_AUTHORIZATION_METADATA_KEY, md_value); + gpr_free(md_value); + jwt_md = grpc_credentials_md_store_ref(c->cached.jwt_md); } + gpr_mu_unlock(&c->cache_mu); + } - if (jwt_md != NULL) - { - cb (exec_ctx, user_data, jwt_md->entries, jwt_md->num_entries, GRPC_CREDENTIALS_OK); - grpc_credentials_md_store_unref (jwt_md); - } - else - { - cb (exec_ctx, user_data, NULL, 0, GRPC_CREDENTIALS_ERROR); - } + if (jwt_md != NULL) { + cb(exec_ctx, user_data, jwt_md->entries, jwt_md->num_entries, + GRPC_CREDENTIALS_OK); + grpc_credentials_md_store_unref(jwt_md); + } else { + cb(exec_ctx, user_data, NULL, 0, GRPC_CREDENTIALS_ERROR); + } } static grpc_credentials_vtable jwt_vtable = { - jwt_destruct, jwt_has_request_metadata, jwt_has_request_metadata_only, - jwt_get_request_metadata, NULL -}; + jwt_destruct, jwt_has_request_metadata, jwt_has_request_metadata_only, + jwt_get_request_metadata, NULL}; grpc_credentials * -grpc_service_account_jwt_access_credentials_create_from_auth_json_key (grpc_auth_json_key key, gpr_timespec token_lifetime) -{ +grpc_service_account_jwt_access_credentials_create_from_auth_json_key( + 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"); - return NULL; - } - c = gpr_malloc (sizeof (grpc_service_account_jwt_access_credentials)); - memset (c, 0, sizeof (grpc_service_account_jwt_access_credentials)); + if (!grpc_auth_json_key_is_valid(&key)) { + gpr_log(GPR_ERROR, "Invalid input for jwt credentials creation"); + return NULL; + } + c = gpr_malloc(sizeof(grpc_service_account_jwt_access_credentials)); + memset(c, 0, sizeof(grpc_service_account_jwt_access_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_JWT; - gpr_ref_init (&c->base.refcount, 1); + gpr_ref_init(&c->base.refcount, 1); c->base.vtable = &jwt_vtable; c->key = key; c->jwt_lifetime = token_lifetime; - gpr_mu_init (&c->cache_mu); - jwt_reset_cache (c); + gpr_mu_init(&c->cache_mu); + jwt_reset_cache(c); return &c->base; } -grpc_credentials * -grpc_service_account_jwt_access_credentials_create (const char *json_key, gpr_timespec token_lifetime, void *reserved) -{ - GPR_ASSERT (reserved == NULL); - return grpc_service_account_jwt_access_credentials_create_from_auth_json_key (grpc_auth_json_key_create_from_string (json_key), token_lifetime); +grpc_credentials *grpc_service_account_jwt_access_credentials_create( + const char *json_key, gpr_timespec token_lifetime, void *reserved) { + GPR_ASSERT(reserved == NULL); + return grpc_service_account_jwt_access_credentials_create_from_auth_json_key( + grpc_auth_json_key_create_from_string(json_key), token_lifetime); } /* -- Oauth2TokenFetcher credentials -- */ -static void -oauth2_token_fetcher_destruct (grpc_credentials * creds) -{ - grpc_oauth2_token_fetcher_credentials *c = (grpc_oauth2_token_fetcher_credentials *) creds; - grpc_credentials_md_store_unref (c->access_token_md); - gpr_mu_destroy (&c->mu); - grpc_httpcli_context_destroy (&c->httpcli_context); +static void oauth2_token_fetcher_destruct(grpc_credentials *creds) { + grpc_oauth2_token_fetcher_credentials *c = + (grpc_oauth2_token_fetcher_credentials *)creds; + grpc_credentials_md_store_unref(c->access_token_md); + gpr_mu_destroy(&c->mu); + grpc_httpcli_context_destroy(&c->httpcli_context); } -static int -oauth2_token_fetcher_has_request_metadata (const grpc_credentials * creds) -{ +static int oauth2_token_fetcher_has_request_metadata( + const grpc_credentials *creds) { return 1; } -static int -oauth2_token_fetcher_has_request_metadata_only (const grpc_credentials * creds) -{ +static int oauth2_token_fetcher_has_request_metadata_only( + const grpc_credentials *creds) { return 1; } grpc_credentials_status -grpc_oauth2_token_fetcher_credentials_parse_server_response (const grpc_httpcli_response * response, grpc_credentials_md_store ** token_md, gpr_timespec * token_lifetime) -{ +grpc_oauth2_token_fetcher_credentials_parse_server_response( + const grpc_httpcli_response *response, grpc_credentials_md_store **token_md, + gpr_timespec *token_lifetime) { char *null_terminated_body = NULL; char *new_access_token = NULL; grpc_credentials_status status = GRPC_CREDENTIALS_OK; grpc_json *json = NULL; - if (response == NULL) - { - gpr_log (GPR_ERROR, "Received NULL response."); + if (response == NULL) { + gpr_log(GPR_ERROR, "Received NULL response."); + status = GRPC_CREDENTIALS_ERROR; + goto end; + } + + if (response->body_length > 0) { + null_terminated_body = gpr_malloc(response->body_length + 1); + null_terminated_body[response->body_length] = '\0'; + memcpy(null_terminated_body, response->body, response->body_length); + } + + if (response->status != 200) { + gpr_log(GPR_ERROR, "Call to http server ended with error %d [%s].", + response->status, + null_terminated_body != NULL ? null_terminated_body : ""); + status = GRPC_CREDENTIALS_ERROR; + goto end; + } else { + grpc_json *access_token = NULL; + grpc_json *token_type = NULL; + grpc_json *expires_in = NULL; + grpc_json *ptr; + json = grpc_json_parse_string(null_terminated_body); + if (json == NULL) { + gpr_log(GPR_ERROR, "Could not parse JSON from %s", null_terminated_body); status = GRPC_CREDENTIALS_ERROR; goto end; } - - if (response->body_length > 0) - { - null_terminated_body = gpr_malloc (response->body_length + 1); - null_terminated_body[response->body_length] = '\0'; - memcpy (null_terminated_body, response->body, response->body_length); + if (json->type != GRPC_JSON_OBJECT) { + gpr_log(GPR_ERROR, "Response should be a JSON object"); + status = GRPC_CREDENTIALS_ERROR; + goto end; } - - if (response->status != 200) - { - gpr_log (GPR_ERROR, "Call to http server ended with error %d [%s].", response->status, null_terminated_body != NULL ? null_terminated_body : ""); + for (ptr = json->child; ptr; ptr = ptr->next) { + if (strcmp(ptr->key, "access_token") == 0) { + access_token = ptr; + } else if (strcmp(ptr->key, "token_type") == 0) { + token_type = ptr; + } else if (strcmp(ptr->key, "expires_in") == 0) { + expires_in = ptr; + } + } + if (access_token == NULL || access_token->type != GRPC_JSON_STRING) { + gpr_log(GPR_ERROR, "Missing or invalid access_token in JSON."); + status = GRPC_CREDENTIALS_ERROR; + goto end; + } + if (token_type == NULL || token_type->type != GRPC_JSON_STRING) { + gpr_log(GPR_ERROR, "Missing or invalid token_type in JSON."); status = GRPC_CREDENTIALS_ERROR; goto end; } - else - { - grpc_json *access_token = NULL; - grpc_json *token_type = NULL; - grpc_json *expires_in = NULL; - grpc_json *ptr; - json = grpc_json_parse_string (null_terminated_body); - if (json == NULL) - { - gpr_log (GPR_ERROR, "Could not parse JSON from %s", null_terminated_body); - status = GRPC_CREDENTIALS_ERROR; - goto end; - } - if (json->type != GRPC_JSON_OBJECT) - { - gpr_log (GPR_ERROR, "Response should be a JSON object"); - status = GRPC_CREDENTIALS_ERROR; - goto end; - } - for (ptr = json->child; ptr; ptr = ptr->next) - { - if (strcmp (ptr->key, "access_token") == 0) - { - access_token = ptr; - } - else if (strcmp (ptr->key, "token_type") == 0) - { - token_type = ptr; - } - else if (strcmp (ptr->key, "expires_in") == 0) - { - expires_in = ptr; - } - } - if (access_token == NULL || access_token->type != GRPC_JSON_STRING) - { - gpr_log (GPR_ERROR, "Missing or invalid access_token in JSON."); - status = GRPC_CREDENTIALS_ERROR; - goto end; - } - if (token_type == NULL || token_type->type != GRPC_JSON_STRING) - { - gpr_log (GPR_ERROR, "Missing or invalid token_type in JSON."); - status = GRPC_CREDENTIALS_ERROR; - goto end; - } - if (expires_in == NULL || expires_in->type != GRPC_JSON_NUMBER) - { - gpr_log (GPR_ERROR, "Missing or invalid expires_in in JSON."); - status = GRPC_CREDENTIALS_ERROR; - goto end; - } - gpr_asprintf (&new_access_token, "%s %s", token_type->value, access_token->value); - token_lifetime->tv_sec = strtol (expires_in->value, NULL, 10); - token_lifetime->tv_nsec = 0; - token_lifetime->clock_type = GPR_TIMESPAN; - if (*token_md != NULL) - grpc_credentials_md_store_unref (*token_md); - *token_md = grpc_credentials_md_store_create (1); - grpc_credentials_md_store_add_cstrings (*token_md, GRPC_AUTHORIZATION_METADATA_KEY, new_access_token); - status = GRPC_CREDENTIALS_OK; + if (expires_in == NULL || expires_in->type != GRPC_JSON_NUMBER) { + gpr_log(GPR_ERROR, "Missing or invalid expires_in in JSON."); + status = GRPC_CREDENTIALS_ERROR; + goto end; } + gpr_asprintf(&new_access_token, "%s %s", token_type->value, + access_token->value); + token_lifetime->tv_sec = strtol(expires_in->value, NULL, 10); + token_lifetime->tv_nsec = 0; + token_lifetime->clock_type = GPR_TIMESPAN; + if (*token_md != NULL) grpc_credentials_md_store_unref(*token_md); + *token_md = grpc_credentials_md_store_create(1); + grpc_credentials_md_store_add_cstrings( + *token_md, GRPC_AUTHORIZATION_METADATA_KEY, new_access_token); + status = GRPC_CREDENTIALS_OK; + } end: - if (status != GRPC_CREDENTIALS_OK && (*token_md != NULL)) - { - grpc_credentials_md_store_unref (*token_md); - *token_md = NULL; - } - if (null_terminated_body != NULL) - gpr_free (null_terminated_body); - if (new_access_token != NULL) - gpr_free (new_access_token); - if (json != NULL) - grpc_json_destroy (json); + if (status != GRPC_CREDENTIALS_OK && (*token_md != NULL)) { + grpc_credentials_md_store_unref(*token_md); + *token_md = NULL; + } + if (null_terminated_body != NULL) gpr_free(null_terminated_body); + if (new_access_token != NULL) gpr_free(new_access_token); + if (json != NULL) grpc_json_destroy(json); return status; } -static void -on_oauth2_token_fetcher_http_response (grpc_exec_ctx * exec_ctx, void *user_data, const grpc_httpcli_response * response) -{ - grpc_credentials_metadata_request *r = (grpc_credentials_metadata_request *) user_data; - grpc_oauth2_token_fetcher_credentials *c = (grpc_oauth2_token_fetcher_credentials *) r->creds; +static void on_oauth2_token_fetcher_http_response( + grpc_exec_ctx *exec_ctx, void *user_data, + const grpc_httpcli_response *response) { + grpc_credentials_metadata_request *r = + (grpc_credentials_metadata_request *)user_data; + grpc_oauth2_token_fetcher_credentials *c = + (grpc_oauth2_token_fetcher_credentials *)r->creds; gpr_timespec token_lifetime; grpc_credentials_status status; - gpr_mu_lock (&c->mu); - status = grpc_oauth2_token_fetcher_credentials_parse_server_response (response, &c->access_token_md, &token_lifetime); - if (status == GRPC_CREDENTIALS_OK) - { - c->token_expiration = gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), token_lifetime); - r->cb (exec_ctx, r->user_data, c->access_token_md->entries, c->access_token_md->num_entries, status); - } - else - { - c->token_expiration = gpr_inf_past (GPR_CLOCK_REALTIME); - r->cb (exec_ctx, r->user_data, NULL, 0, status); - } - gpr_mu_unlock (&c->mu); - grpc_credentials_metadata_request_destroy (r); + gpr_mu_lock(&c->mu); + status = grpc_oauth2_token_fetcher_credentials_parse_server_response( + response, &c->access_token_md, &token_lifetime); + if (status == GRPC_CREDENTIALS_OK) { + c->token_expiration = + gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), token_lifetime); + r->cb(exec_ctx, r->user_data, c->access_token_md->entries, + c->access_token_md->num_entries, status); + } else { + c->token_expiration = gpr_inf_past(GPR_CLOCK_REALTIME); + r->cb(exec_ctx, r->user_data, NULL, 0, status); + } + gpr_mu_unlock(&c->mu); + grpc_credentials_metadata_request_destroy(r); } -static void -oauth2_token_fetcher_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) -{ - grpc_oauth2_token_fetcher_credentials *c = (grpc_oauth2_token_fetcher_credentials *) creds; - gpr_timespec refresh_threshold = gpr_time_from_seconds (GRPC_SECURE_TOKEN_REFRESH_THRESHOLD_SECS, GPR_TIMESPAN); +static void oauth2_token_fetcher_get_request_metadata( + grpc_exec_ctx *exec_ctx, grpc_credentials *creds, grpc_pollset *pollset, + const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { + grpc_oauth2_token_fetcher_credentials *c = + (grpc_oauth2_token_fetcher_credentials *)creds; + gpr_timespec refresh_threshold = gpr_time_from_seconds( + GRPC_SECURE_TOKEN_REFRESH_THRESHOLD_SECS, GPR_TIMESPAN); grpc_credentials_md_store *cached_access_token_md = NULL; { - gpr_mu_lock (&c->mu); - if (c->access_token_md != NULL && (gpr_time_cmp (gpr_time_sub (c->token_expiration, gpr_now (GPR_CLOCK_REALTIME)), refresh_threshold) > 0)) - { - cached_access_token_md = grpc_credentials_md_store_ref (c->access_token_md); - } - gpr_mu_unlock (&c->mu); - } - if (cached_access_token_md != NULL) - { - cb (exec_ctx, user_data, cached_access_token_md->entries, cached_access_token_md->num_entries, GRPC_CREDENTIALS_OK); - grpc_credentials_md_store_unref (cached_access_token_md); - } - else - { - c->fetch_func (exec_ctx, grpc_credentials_metadata_request_create (creds, cb, user_data), &c->httpcli_context, pollset, on_oauth2_token_fetcher_http_response, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), refresh_threshold)); + gpr_mu_lock(&c->mu); + if (c->access_token_md != NULL && + (gpr_time_cmp( + gpr_time_sub(c->token_expiration, gpr_now(GPR_CLOCK_REALTIME)), + refresh_threshold) > 0)) { + cached_access_token_md = + grpc_credentials_md_store_ref(c->access_token_md); } + gpr_mu_unlock(&c->mu); + } + if (cached_access_token_md != NULL) { + cb(exec_ctx, user_data, cached_access_token_md->entries, + cached_access_token_md->num_entries, GRPC_CREDENTIALS_OK); + grpc_credentials_md_store_unref(cached_access_token_md); + } else { + c->fetch_func( + exec_ctx, + grpc_credentials_metadata_request_create(creds, cb, user_data), + &c->httpcli_context, pollset, on_oauth2_token_fetcher_http_response, + gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), refresh_threshold)); + } } -static void -init_oauth2_token_fetcher (grpc_oauth2_token_fetcher_credentials * c, grpc_fetch_oauth2_func fetch_func) -{ - memset (c, 0, sizeof (grpc_oauth2_token_fetcher_credentials)); +static void init_oauth2_token_fetcher(grpc_oauth2_token_fetcher_credentials *c, + grpc_fetch_oauth2_func fetch_func) { + memset(c, 0, sizeof(grpc_oauth2_token_fetcher_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_OAUTH2; - gpr_ref_init (&c->base.refcount, 1); - gpr_mu_init (&c->mu); - c->token_expiration = gpr_inf_past (GPR_CLOCK_REALTIME); + gpr_ref_init(&c->base.refcount, 1); + gpr_mu_init(&c->mu); + c->token_expiration = gpr_inf_past(GPR_CLOCK_REALTIME); c->fetch_func = fetch_func; - grpc_httpcli_context_init (&c->httpcli_context); + grpc_httpcli_context_init(&c->httpcli_context); } /* -- GoogleComputeEngine credentials. -- */ static grpc_credentials_vtable compute_engine_vtable = { - oauth2_token_fetcher_destruct, oauth2_token_fetcher_has_request_metadata, - oauth2_token_fetcher_has_request_metadata_only, - oauth2_token_fetcher_get_request_metadata, NULL -}; - -static void -compute_engine_fetch_oauth2 (grpc_exec_ctx * exec_ctx, grpc_credentials_metadata_request * metadata_req, grpc_httpcli_context * httpcli_context, grpc_pollset * pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline) -{ - grpc_httpcli_header header = { "Metadata-Flavor", "Google" }; + oauth2_token_fetcher_destruct, oauth2_token_fetcher_has_request_metadata, + oauth2_token_fetcher_has_request_metadata_only, + oauth2_token_fetcher_get_request_metadata, NULL}; + +static void compute_engine_fetch_oauth2( + grpc_exec_ctx *exec_ctx, grpc_credentials_metadata_request *metadata_req, + grpc_httpcli_context *httpcli_context, grpc_pollset *pollset, + grpc_httpcli_response_cb response_cb, gpr_timespec deadline) { + grpc_httpcli_header header = {"Metadata-Flavor", "Google"}; grpc_httpcli_request request; - memset (&request, 0, sizeof (grpc_httpcli_request)); + memset(&request, 0, sizeof(grpc_httpcli_request)); request.host = GRPC_COMPUTE_ENGINE_METADATA_HOST; request.path = GRPC_COMPUTE_ENGINE_METADATA_TOKEN_PATH; request.hdr_count = 1; request.hdrs = &header; - grpc_httpcli_get (exec_ctx, httpcli_context, pollset, &request, deadline, response_cb, metadata_req); + grpc_httpcli_get(exec_ctx, httpcli_context, pollset, &request, deadline, + response_cb, metadata_req); } -grpc_credentials * -grpc_google_compute_engine_credentials_create (void *reserved) -{ - grpc_oauth2_token_fetcher_credentials *c = gpr_malloc (sizeof (grpc_oauth2_token_fetcher_credentials)); - GPR_ASSERT (reserved == NULL); - init_oauth2_token_fetcher (c, compute_engine_fetch_oauth2); +grpc_credentials *grpc_google_compute_engine_credentials_create( + void *reserved) { + grpc_oauth2_token_fetcher_credentials *c = + gpr_malloc(sizeof(grpc_oauth2_token_fetcher_credentials)); + GPR_ASSERT(reserved == NULL); + init_oauth2_token_fetcher(c, compute_engine_fetch_oauth2); c->base.vtable = &compute_engine_vtable; return &c->base; } /* -- GoogleRefreshToken credentials. -- */ -static void -refresh_token_destruct (grpc_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); +static void refresh_token_destruct(grpc_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); } static grpc_credentials_vtable refresh_token_vtable = { - refresh_token_destruct, oauth2_token_fetcher_has_request_metadata, - oauth2_token_fetcher_has_request_metadata_only, - oauth2_token_fetcher_get_request_metadata, NULL -}; - -static void -refresh_token_fetch_oauth2 (grpc_exec_ctx * exec_ctx, grpc_credentials_metadata_request * metadata_req, grpc_httpcli_context * httpcli_context, grpc_pollset * pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline) -{ - grpc_google_refresh_token_credentials *c = (grpc_google_refresh_token_credentials *) metadata_req->creds; - grpc_httpcli_header header = { "Content-Type", - "application/x-www-form-urlencoded" - }; + refresh_token_destruct, oauth2_token_fetcher_has_request_metadata, + oauth2_token_fetcher_has_request_metadata_only, + oauth2_token_fetcher_get_request_metadata, NULL}; + +static void refresh_token_fetch_oauth2( + grpc_exec_ctx *exec_ctx, grpc_credentials_metadata_request *metadata_req, + grpc_httpcli_context *httpcli_context, grpc_pollset *pollset, + grpc_httpcli_response_cb response_cb, gpr_timespec deadline) { + grpc_google_refresh_token_credentials *c = + (grpc_google_refresh_token_credentials *)metadata_req->creds; + grpc_httpcli_header header = {"Content-Type", + "application/x-www-form-urlencoded"}; grpc_httpcli_request request; char *body = NULL; - gpr_asprintf (&body, GRPC_REFRESH_TOKEN_POST_BODY_FORMAT_STRING, c->refresh_token.client_id, c->refresh_token.client_secret, c->refresh_token.refresh_token); - memset (&request, 0, sizeof (grpc_httpcli_request)); + gpr_asprintf(&body, GRPC_REFRESH_TOKEN_POST_BODY_FORMAT_STRING, + c->refresh_token.client_id, c->refresh_token.client_secret, + c->refresh_token.refresh_token); + memset(&request, 0, sizeof(grpc_httpcli_request)); request.host = GRPC_GOOGLE_OAUTH2_SERVICE_HOST; request.path = GRPC_GOOGLE_OAUTH2_SERVICE_TOKEN_PATH; request.hdr_count = 1; request.hdrs = &header; request.handshaker = &grpc_httpcli_ssl; - grpc_httpcli_post (exec_ctx,httpcli_context, pollset, &request, body, strlen ( body), deadline, response_cb, metadata_req); - gpr_free (body); + grpc_httpcli_post(exec_ctx, httpcli_context, pollset, &request, body, + strlen(body), deadline, response_cb, metadata_req); + gpr_free(body); } -grpc_credentials * -grpc_refresh_token_credentials_create_from_auth_refresh_token (grpc_auth_refresh_token refresh_token) -{ +grpc_credentials *grpc_refresh_token_credentials_create_from_auth_refresh_token( + grpc_auth_refresh_token refresh_token) { grpc_google_refresh_token_credentials *c; - if (!grpc_auth_refresh_token_is_valid (&refresh_token)) - { - gpr_log (GPR_ERROR, "Invalid input for refresh token credentials creation"); - return NULL; - } - c = gpr_malloc (sizeof (grpc_google_refresh_token_credentials)); - memset (c, 0, sizeof (grpc_google_refresh_token_credentials)); - init_oauth2_token_fetcher (&c->base, refresh_token_fetch_oauth2); + if (!grpc_auth_refresh_token_is_valid(&refresh_token)) { + gpr_log(GPR_ERROR, "Invalid input for refresh token credentials creation"); + return NULL; + } + c = gpr_malloc(sizeof(grpc_google_refresh_token_credentials)); + memset(c, 0, sizeof(grpc_google_refresh_token_credentials)); + init_oauth2_token_fetcher(&c->base, refresh_token_fetch_oauth2); c->base.base.vtable = &refresh_token_vtable; c->refresh_token = refresh_token; return &c->base.base; } -grpc_credentials * -grpc_google_refresh_token_credentials_create (const char *json_refresh_token, void *reserved) -{ - GPR_ASSERT (reserved == NULL); - return grpc_refresh_token_credentials_create_from_auth_refresh_token (grpc_auth_refresh_token_create_from_string (json_refresh_token)); +grpc_credentials *grpc_google_refresh_token_credentials_create( + const char *json_refresh_token, void *reserved) { + GPR_ASSERT(reserved == NULL); + return grpc_refresh_token_credentials_create_from_auth_refresh_token( + grpc_auth_refresh_token_create_from_string(json_refresh_token)); } /* -- Metadata-only credentials. -- */ -static void -md_only_test_destruct (grpc_credentials * creds) -{ - grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *) creds; - grpc_credentials_md_store_unref (c->md_store); +static void md_only_test_destruct(grpc_credentials *creds) { + grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)creds; + grpc_credentials_md_store_unref(c->md_store); } -static int -md_only_test_has_request_metadata (const grpc_credentials * creds) -{ +static int md_only_test_has_request_metadata(const grpc_credentials *creds) { return 1; } -static int -md_only_test_has_request_metadata_only (const grpc_credentials * creds) -{ +static int md_only_test_has_request_metadata_only( + const grpc_credentials *creds) { return 1; } -static void -on_simulated_token_fetch_done (void *user_data) -{ - grpc_credentials_metadata_request *r = (grpc_credentials_metadata_request *) user_data; - grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *) r->creds; +static void on_simulated_token_fetch_done(void *user_data) { + grpc_credentials_metadata_request *r = + (grpc_credentials_metadata_request *)user_data; + grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)r->creds; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - r->cb (&exec_ctx, r->user_data, c->md_store->entries, c->md_store->num_entries, GRPC_CREDENTIALS_OK); - grpc_credentials_metadata_request_destroy (r); - grpc_exec_ctx_finish (&exec_ctx); -} - -static void -md_only_test_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) -{ - grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *) creds; - - if (c->is_async) - { - gpr_thd_id thd_id; - grpc_credentials_metadata_request *cb_arg = grpc_credentials_metadata_request_create (creds, cb, user_data); - gpr_thd_new (&thd_id, on_simulated_token_fetch_done, cb_arg, NULL); - } - else - { - cb (exec_ctx, user_data, c->md_store->entries, 1, GRPC_CREDENTIALS_OK); - } + r->cb(&exec_ctx, r->user_data, c->md_store->entries, c->md_store->num_entries, + GRPC_CREDENTIALS_OK); + grpc_credentials_metadata_request_destroy(r); + grpc_exec_ctx_finish(&exec_ctx); +} + +static void md_only_test_get_request_metadata( + grpc_exec_ctx *exec_ctx, grpc_credentials *creds, grpc_pollset *pollset, + const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { + grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)creds; + + if (c->is_async) { + gpr_thd_id thd_id; + grpc_credentials_metadata_request *cb_arg = + grpc_credentials_metadata_request_create(creds, cb, user_data); + gpr_thd_new(&thd_id, on_simulated_token_fetch_done, cb_arg, NULL); + } else { + cb(exec_ctx, user_data, c->md_store->entries, 1, GRPC_CREDENTIALS_OK); + } } static grpc_credentials_vtable md_only_test_vtable = { - md_only_test_destruct, md_only_test_has_request_metadata, - md_only_test_has_request_metadata_only, md_only_test_get_request_metadata, - NULL -}; - -grpc_credentials * -grpc_md_only_test_credentials_create (const char *md_key, const char *md_value, int is_async) -{ - grpc_md_only_test_credentials *c = gpr_malloc (sizeof (grpc_md_only_test_credentials)); - memset (c, 0, sizeof (grpc_md_only_test_credentials)); + md_only_test_destruct, md_only_test_has_request_metadata, + md_only_test_has_request_metadata_only, md_only_test_get_request_metadata, + NULL}; + +grpc_credentials *grpc_md_only_test_credentials_create(const char *md_key, + const char *md_value, + int is_async) { + grpc_md_only_test_credentials *c = + gpr_malloc(sizeof(grpc_md_only_test_credentials)); + memset(c, 0, sizeof(grpc_md_only_test_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_OAUTH2; c->base.vtable = &md_only_test_vtable; - gpr_ref_init (&c->base.refcount, 1); - c->md_store = grpc_credentials_md_store_create (1); - grpc_credentials_md_store_add_cstrings (c->md_store, md_key, md_value); + gpr_ref_init(&c->base.refcount, 1); + c->md_store = grpc_credentials_md_store_create(1); + grpc_credentials_md_store_add_cstrings(c->md_store, md_key, md_value); c->is_async = is_async; return &c->base; } /* -- Oauth2 Access Token credentials. -- */ -static void -access_token_destruct (grpc_credentials * creds) -{ - grpc_access_token_credentials *c = (grpc_access_token_credentials *) creds; - grpc_credentials_md_store_unref (c->access_token_md); +static void access_token_destruct(grpc_credentials *creds) { + grpc_access_token_credentials *c = (grpc_access_token_credentials *)creds; + grpc_credentials_md_store_unref(c->access_token_md); } -static int -access_token_has_request_metadata (const grpc_credentials * creds) -{ +static int access_token_has_request_metadata(const grpc_credentials *creds) { return 1; } -static int -access_token_has_request_metadata_only (const grpc_credentials * creds) -{ +static int access_token_has_request_metadata_only( + const grpc_credentials *creds) { return 1; } -static void -access_token_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) -{ - grpc_access_token_credentials *c = (grpc_access_token_credentials *) creds; - cb (exec_ctx, user_data, c->access_token_md->entries, 1, GRPC_CREDENTIALS_OK); +static void access_token_get_request_metadata( + grpc_exec_ctx *exec_ctx, grpc_credentials *creds, grpc_pollset *pollset, + const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { + grpc_access_token_credentials *c = (grpc_access_token_credentials *)creds; + cb(exec_ctx, user_data, c->access_token_md->entries, 1, GRPC_CREDENTIALS_OK); } static grpc_credentials_vtable access_token_vtable = { - access_token_destruct, access_token_has_request_metadata, - access_token_has_request_metadata_only, access_token_get_request_metadata, - NULL -}; - -grpc_credentials * -grpc_access_token_credentials_create (const char *access_token, void *reserved) -{ - grpc_access_token_credentials *c = gpr_malloc (sizeof (grpc_access_token_credentials)); + access_token_destruct, access_token_has_request_metadata, + access_token_has_request_metadata_only, access_token_get_request_metadata, + NULL}; + +grpc_credentials *grpc_access_token_credentials_create(const char *access_token, + void *reserved) { + grpc_access_token_credentials *c = + gpr_malloc(sizeof(grpc_access_token_credentials)); char *token_md_value; - GPR_ASSERT (reserved == NULL); - memset (c, 0, sizeof (grpc_access_token_credentials)); + GPR_ASSERT(reserved == NULL); + memset(c, 0, sizeof(grpc_access_token_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_OAUTH2; c->base.vtable = &access_token_vtable; - gpr_ref_init (&c->base.refcount, 1); - c->access_token_md = grpc_credentials_md_store_create (1); - gpr_asprintf (&token_md_value, "Bearer %s", access_token); - grpc_credentials_md_store_add_cstrings (c->access_token_md, GRPC_AUTHORIZATION_METADATA_KEY, token_md_value); - gpr_free (token_md_value); + gpr_ref_init(&c->base.refcount, 1); + c->access_token_md = grpc_credentials_md_store_create(1); + gpr_asprintf(&token_md_value, "Bearer %s", access_token); + grpc_credentials_md_store_add_cstrings( + c->access_token_md, GRPC_AUTHORIZATION_METADATA_KEY, token_md_value); + gpr_free(token_md_value); return &c->base; } /* -- Fake transport security credentials. -- */ -static void -fake_transport_security_credentials_destruct (grpc_credentials * creds) -{ +static void fake_transport_security_credentials_destruct( + grpc_credentials *creds) { /* Nothing to do here. */ } -static void -fake_transport_security_server_credentials_destruct (grpc_server_credentials * creds) -{ +static void fake_transport_security_server_credentials_destruct( + grpc_server_credentials *creds) { /* Nothing to do here. */ } -static int -fake_transport_security_has_request_metadata (const grpc_credentials * creds) -{ +static int fake_transport_security_has_request_metadata( + const grpc_credentials *creds) { return 0; } -static int -fake_transport_security_has_request_metadata_only (const grpc_credentials * creds) -{ +static int fake_transport_security_has_request_metadata_only( + const grpc_credentials *creds) { return 0; } -static grpc_security_status -fake_transport_security_create_security_connector (grpc_credentials * c, const char *target, const grpc_channel_args * args, grpc_credentials * request_metadata_creds, grpc_channel_security_connector ** sc, grpc_channel_args ** new_args) -{ - *sc = grpc_fake_channel_security_connector_create (request_metadata_creds, 1); +static grpc_security_status fake_transport_security_create_security_connector( + grpc_credentials *c, const char *target, const grpc_channel_args *args, + grpc_credentials *request_metadata_creds, + grpc_channel_security_connector **sc, grpc_channel_args **new_args) { + *sc = grpc_fake_channel_security_connector_create(request_metadata_creds, 1); return GRPC_SECURITY_OK; } static grpc_security_status -fake_transport_security_server_create_security_connector (grpc_server_credentials * c, grpc_security_connector ** sc) -{ - *sc = grpc_fake_server_security_connector_create (); +fake_transport_security_server_create_security_connector( + grpc_server_credentials *c, grpc_security_connector **sc) { + *sc = grpc_fake_server_security_connector_create(); return GRPC_SECURITY_OK; } static grpc_credentials_vtable fake_transport_security_credentials_vtable = { - fake_transport_security_credentials_destruct, - fake_transport_security_has_request_metadata, - fake_transport_security_has_request_metadata_only, NULL, - fake_transport_security_create_security_connector -}; - -static grpc_server_credentials_vtable fake_transport_security_server_credentials_vtable = { - fake_transport_security_server_credentials_destruct, - fake_transport_security_server_create_security_connector -}; - -grpc_credentials * -grpc_fake_transport_security_credentials_create (void) -{ - grpc_credentials *c = gpr_malloc (sizeof (grpc_credentials)); - memset (c, 0, sizeof (grpc_credentials)); + fake_transport_security_credentials_destruct, + fake_transport_security_has_request_metadata, + fake_transport_security_has_request_metadata_only, NULL, + fake_transport_security_create_security_connector}; + +static grpc_server_credentials_vtable + fake_transport_security_server_credentials_vtable = { + fake_transport_security_server_credentials_destruct, + fake_transport_security_server_create_security_connector}; + +grpc_credentials *grpc_fake_transport_security_credentials_create(void) { + grpc_credentials *c = gpr_malloc(sizeof(grpc_credentials)); + memset(c, 0, sizeof(grpc_credentials)); c->type = GRPC_CREDENTIALS_TYPE_FAKE_TRANSPORT_SECURITY; c->vtable = &fake_transport_security_credentials_vtable; - gpr_ref_init (&c->refcount, 1); + gpr_ref_init(&c->refcount, 1); return c; } -grpc_server_credentials * -grpc_fake_transport_security_server_credentials_create (void) -{ - grpc_server_credentials *c = gpr_malloc (sizeof (grpc_server_credentials)); - memset (c, 0, sizeof (grpc_server_credentials)); +grpc_server_credentials *grpc_fake_transport_security_server_credentials_create( + void) { + grpc_server_credentials *c = gpr_malloc(sizeof(grpc_server_credentials)); + memset(c, 0, sizeof(grpc_server_credentials)); c->type = GRPC_CREDENTIALS_TYPE_FAKE_TRANSPORT_SECURITY; - gpr_ref_init (&c->refcount, 1); + gpr_ref_init(&c->refcount, 1); c->vtable = &fake_transport_security_server_credentials_vtable; return c; } /* -- Composite credentials. -- */ -typedef struct -{ +typedef struct { grpc_composite_credentials *composite_creds; size_t creds_index; grpc_credentials_md_store *md_elems; @@ -990,406 +912,355 @@ typedef struct grpc_credentials_metadata_cb cb; } grpc_composite_credentials_metadata_context; -static void -composite_destruct (grpc_credentials * creds) -{ - grpc_composite_credentials *c = (grpc_composite_credentials *) creds; +static void composite_destruct(grpc_credentials *creds) { + grpc_composite_credentials *c = (grpc_composite_credentials *)creds; size_t i; - for (i = 0; i < c->inner.num_creds; i++) - { - grpc_credentials_unref (c->inner.creds_array[i]); - } - gpr_free (c->inner.creds_array); + for (i = 0; i < c->inner.num_creds; i++) { + grpc_credentials_unref(c->inner.creds_array[i]); + } + gpr_free(c->inner.creds_array); } -static int -composite_has_request_metadata (const grpc_credentials * creds) -{ - const grpc_composite_credentials *c = (const grpc_composite_credentials *) creds; +static int composite_has_request_metadata(const grpc_credentials *creds) { + const grpc_composite_credentials *c = + (const grpc_composite_credentials *)creds; size_t i; - for (i = 0; i < c->inner.num_creds; i++) - { - if (grpc_credentials_has_request_metadata (c->inner.creds_array[i])) - { - return 1; - } + for (i = 0; i < c->inner.num_creds; i++) { + if (grpc_credentials_has_request_metadata(c->inner.creds_array[i])) { + return 1; } + } return 0; } -static int -composite_has_request_metadata_only (const grpc_credentials * creds) -{ - const grpc_composite_credentials *c = (const grpc_composite_credentials *) creds; +static int composite_has_request_metadata_only(const grpc_credentials *creds) { + const grpc_composite_credentials *c = + (const grpc_composite_credentials *)creds; size_t i; - for (i = 0; i < c->inner.num_creds; i++) - { - if (!grpc_credentials_has_request_metadata_only (c->inner.creds_array[i])) - { - return 0; - } + for (i = 0; i < c->inner.num_creds; i++) { + if (!grpc_credentials_has_request_metadata_only(c->inner.creds_array[i])) { + return 0; } + } return 1; } -static void -composite_md_context_destroy (grpc_composite_credentials_metadata_context * ctx) -{ - grpc_credentials_md_store_unref (ctx->md_elems); - if (ctx->service_url != NULL) - gpr_free (ctx->service_url); - gpr_free (ctx); +static void composite_md_context_destroy( + grpc_composite_credentials_metadata_context *ctx) { + grpc_credentials_md_store_unref(ctx->md_elems); + if (ctx->service_url != NULL) gpr_free(ctx->service_url); + gpr_free(ctx); } -static void -composite_metadata_cb (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) -{ - grpc_composite_credentials_metadata_context *ctx = (grpc_composite_credentials_metadata_context *) user_data; - if (status != GRPC_CREDENTIALS_OK) - { - ctx->cb (exec_ctx, ctx->user_data, NULL, 0, status); - return; - } +static void composite_metadata_cb(grpc_exec_ctx *exec_ctx, void *user_data, + grpc_credentials_md *md_elems, size_t num_md, + grpc_credentials_status status) { + grpc_composite_credentials_metadata_context *ctx = + (grpc_composite_credentials_metadata_context *)user_data; + if (status != GRPC_CREDENTIALS_OK) { + ctx->cb(exec_ctx, ctx->user_data, NULL, 0, status); + return; + } /* Copy the metadata in the context. */ - if (num_md > 0) - { - size_t i; - for (i = 0; i < num_md; i++) - { - grpc_credentials_md_store_add (ctx->md_elems, md_elems[i].key, md_elems[i].value); - } + if (num_md > 0) { + size_t i; + for (i = 0; i < num_md; i++) { + grpc_credentials_md_store_add(ctx->md_elems, md_elems[i].key, + md_elems[i].value); } + } /* See if we need to get some more metadata. */ - while (ctx->creds_index < ctx->composite_creds->inner.num_creds) - { - grpc_credentials *inner_creds = ctx->composite_creds->inner.creds_array[ctx->creds_index++]; - if (grpc_credentials_has_request_metadata (inner_creds)) - { - grpc_credentials_get_request_metadata (exec_ctx, inner_creds, ctx->pollset, ctx->service_url, composite_metadata_cb, ctx); - return; - } + while (ctx->creds_index < ctx->composite_creds->inner.num_creds) { + grpc_credentials *inner_creds = + ctx->composite_creds->inner.creds_array[ctx->creds_index++]; + if (grpc_credentials_has_request_metadata(inner_creds)) { + grpc_credentials_get_request_metadata(exec_ctx, inner_creds, ctx->pollset, + ctx->service_url, + composite_metadata_cb, ctx); + return; } + } /* We're done!. */ - ctx->cb (exec_ctx, ctx->user_data, ctx->md_elems->entries, ctx->md_elems->num_entries, GRPC_CREDENTIALS_OK); - composite_md_context_destroy (ctx); + ctx->cb(exec_ctx, ctx->user_data, ctx->md_elems->entries, + ctx->md_elems->num_entries, GRPC_CREDENTIALS_OK); + composite_md_context_destroy(ctx); } -static void -composite_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) -{ - grpc_composite_credentials *c = (grpc_composite_credentials *) creds; +static void composite_get_request_metadata( + grpc_exec_ctx *exec_ctx, grpc_credentials *creds, grpc_pollset *pollset, + const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { + grpc_composite_credentials *c = (grpc_composite_credentials *)creds; grpc_composite_credentials_metadata_context *ctx; - if (!grpc_credentials_has_request_metadata (creds)) - { - cb (exec_ctx, user_data, NULL, 0, GRPC_CREDENTIALS_OK); - return; - } - ctx = gpr_malloc (sizeof (grpc_composite_credentials_metadata_context)); - memset (ctx, 0, sizeof (grpc_composite_credentials_metadata_context)); - ctx->service_url = gpr_strdup (service_url); + if (!grpc_credentials_has_request_metadata(creds)) { + cb(exec_ctx, user_data, NULL, 0, GRPC_CREDENTIALS_OK); + return; + } + ctx = gpr_malloc(sizeof(grpc_composite_credentials_metadata_context)); + memset(ctx, 0, sizeof(grpc_composite_credentials_metadata_context)); + ctx->service_url = gpr_strdup(service_url); ctx->user_data = user_data; ctx->cb = cb; ctx->composite_creds = c; ctx->pollset = pollset; - ctx->md_elems = grpc_credentials_md_store_create (c->inner.num_creds); - while (ctx->creds_index < c->inner.num_creds) - { - grpc_credentials *inner_creds = c->inner.creds_array[ctx->creds_index++]; - if (grpc_credentials_has_request_metadata (inner_creds)) - { - grpc_credentials_get_request_metadata (exec_ctx, inner_creds, pollset, service_url, composite_metadata_cb, ctx); - return; - } - } - GPR_ASSERT (0); /* Should have exited before. */ -} - -static grpc_security_status -composite_create_security_connector (grpc_credentials * creds, const char *target, const grpc_channel_args * args, grpc_credentials * request_metadata_creds, grpc_channel_security_connector ** sc, grpc_channel_args ** new_args) -{ - grpc_composite_credentials *c = (grpc_composite_credentials *) creds; - if (c->connector_creds == NULL) - { - gpr_log (GPR_ERROR, "Cannot create security connector, missing connector credentials."); - return GRPC_SECURITY_ERROR; + ctx->md_elems = grpc_credentials_md_store_create(c->inner.num_creds); + while (ctx->creds_index < c->inner.num_creds) { + grpc_credentials *inner_creds = c->inner.creds_array[ctx->creds_index++]; + if (grpc_credentials_has_request_metadata(inner_creds)) { + grpc_credentials_get_request_metadata(exec_ctx, inner_creds, pollset, + service_url, composite_metadata_cb, + ctx); + return; } - return grpc_credentials_create_security_connector (c->connector_creds, target, args, creds, sc, new_args); + } + GPR_ASSERT(0); /* Should have exited before. */ +} + +static grpc_security_status composite_create_security_connector( + grpc_credentials *creds, const char *target, const grpc_channel_args *args, + grpc_credentials *request_metadata_creds, + grpc_channel_security_connector **sc, grpc_channel_args **new_args) { + grpc_composite_credentials *c = (grpc_composite_credentials *)creds; + if (c->connector_creds == NULL) { + gpr_log(GPR_ERROR, + "Cannot create security connector, missing connector credentials."); + return GRPC_SECURITY_ERROR; + } + return grpc_credentials_create_security_connector(c->connector_creds, target, + args, creds, sc, new_args); } static grpc_credentials_vtable composite_credentials_vtable = { - composite_destruct, composite_has_request_metadata, - composite_has_request_metadata_only, composite_get_request_metadata, - composite_create_security_connector -}; + composite_destruct, composite_has_request_metadata, + composite_has_request_metadata_only, composite_get_request_metadata, + composite_create_security_connector}; -static grpc_credentials_array -get_creds_array (grpc_credentials ** creds_addr) -{ +static grpc_credentials_array get_creds_array(grpc_credentials **creds_addr) { grpc_credentials_array result; grpc_credentials *creds = *creds_addr; result.creds_array = creds_addr; result.num_creds = 1; - if (strcmp (creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0) - { - result = *grpc_composite_credentials_get_credentials (creds); - } + if (strcmp(creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0) { + result = *grpc_composite_credentials_get_credentials(creds); + } return result; } -grpc_credentials * -grpc_composite_credentials_create (grpc_credentials * creds1, grpc_credentials * creds2, void *reserved) -{ +grpc_credentials *grpc_composite_credentials_create(grpc_credentials *creds1, + grpc_credentials *creds2, + void *reserved) { size_t i; size_t creds_array_byte_size; grpc_credentials_array creds1_array; grpc_credentials_array creds2_array; grpc_composite_credentials *c; - GPR_ASSERT (reserved == NULL); - GPR_ASSERT (creds1 != NULL); - GPR_ASSERT (creds2 != NULL); - c = gpr_malloc (sizeof (grpc_composite_credentials)); - memset (c, 0, sizeof (grpc_composite_credentials)); + GPR_ASSERT(reserved == NULL); + GPR_ASSERT(creds1 != NULL); + GPR_ASSERT(creds2 != NULL); + c = gpr_malloc(sizeof(grpc_composite_credentials)); + memset(c, 0, sizeof(grpc_composite_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_COMPOSITE; c->base.vtable = &composite_credentials_vtable; - gpr_ref_init (&c->base.refcount, 1); - creds1_array = get_creds_array (&creds1); - creds2_array = get_creds_array (&creds2); + gpr_ref_init(&c->base.refcount, 1); + creds1_array = get_creds_array(&creds1); + creds2_array = get_creds_array(&creds2); c->inner.num_creds = creds1_array.num_creds + creds2_array.num_creds; - creds_array_byte_size = c->inner.num_creds * sizeof (grpc_credentials *); - c->inner.creds_array = gpr_malloc (creds_array_byte_size); - memset (c->inner.creds_array, 0, creds_array_byte_size); - for (i = 0; i < creds1_array.num_creds; i++) - { - grpc_credentials *cur_creds = creds1_array.creds_array[i]; - if (!grpc_credentials_has_request_metadata_only (cur_creds)) - { - if (c->connector_creds == NULL) - { - c->connector_creds = cur_creds; - } - else - { - gpr_log (GPR_ERROR, "Cannot compose multiple connector credentials."); - goto fail; - } - } - c->inner.creds_array[i] = grpc_credentials_ref (cur_creds); + creds_array_byte_size = c->inner.num_creds * sizeof(grpc_credentials *); + c->inner.creds_array = gpr_malloc(creds_array_byte_size); + memset(c->inner.creds_array, 0, creds_array_byte_size); + for (i = 0; i < creds1_array.num_creds; i++) { + grpc_credentials *cur_creds = creds1_array.creds_array[i]; + if (!grpc_credentials_has_request_metadata_only(cur_creds)) { + if (c->connector_creds == NULL) { + c->connector_creds = cur_creds; + } else { + gpr_log(GPR_ERROR, "Cannot compose multiple connector credentials."); + goto fail; + } } - for (i = 0; i < creds2_array.num_creds; i++) - { - grpc_credentials *cur_creds = creds2_array.creds_array[i]; - if (!grpc_credentials_has_request_metadata_only (cur_creds)) - { - if (c->connector_creds == NULL) - { - c->connector_creds = cur_creds; - } - else - { - gpr_log (GPR_ERROR, "Cannot compose multiple connector credentials."); - goto fail; - } - } - c->inner.creds_array[i + creds1_array.num_creds] = grpc_credentials_ref (cur_creds); + c->inner.creds_array[i] = grpc_credentials_ref(cur_creds); + } + for (i = 0; i < creds2_array.num_creds; i++) { + grpc_credentials *cur_creds = creds2_array.creds_array[i]; + if (!grpc_credentials_has_request_metadata_only(cur_creds)) { + if (c->connector_creds == NULL) { + c->connector_creds = cur_creds; + } else { + gpr_log(GPR_ERROR, "Cannot compose multiple connector credentials."); + goto fail; + } } + c->inner.creds_array[i + creds1_array.num_creds] = + grpc_credentials_ref(cur_creds); + } return &c->base; fail: - grpc_credentials_unref (&c->base); + grpc_credentials_unref(&c->base); return NULL; } -const grpc_credentials_array * -grpc_composite_credentials_get_credentials (grpc_credentials * creds) -{ - const grpc_composite_credentials *c = (const grpc_composite_credentials *) creds; - GPR_ASSERT (strcmp (creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0); +const grpc_credentials_array *grpc_composite_credentials_get_credentials( + grpc_credentials *creds) { + const grpc_composite_credentials *c = + (const grpc_composite_credentials *)creds; + GPR_ASSERT(strcmp(creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0); return &c->inner; } -grpc_credentials * -grpc_credentials_contains_type (grpc_credentials * creds, const char *type, grpc_credentials ** composite_creds) -{ +grpc_credentials *grpc_credentials_contains_type( + grpc_credentials *creds, const char *type, + grpc_credentials **composite_creds) { size_t i; - if (strcmp (creds->type, type) == 0) - { - if (composite_creds != NULL) - *composite_creds = NULL; - return creds; - } - else if (strcmp (creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0) - { - const grpc_credentials_array *inner_creds_array = grpc_composite_credentials_get_credentials (creds); - for (i = 0; i < inner_creds_array->num_creds; i++) - { - if (strcmp (type, inner_creds_array->creds_array[i]->type) == 0) - { - if (composite_creds != NULL) - *composite_creds = creds; - return inner_creds_array->creds_array[i]; - } - } + if (strcmp(creds->type, type) == 0) { + if (composite_creds != NULL) *composite_creds = NULL; + return creds; + } else if (strcmp(creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0) { + const grpc_credentials_array *inner_creds_array = + grpc_composite_credentials_get_credentials(creds); + for (i = 0; i < inner_creds_array->num_creds; i++) { + if (strcmp(type, inner_creds_array->creds_array[i]->type) == 0) { + if (composite_creds != NULL) *composite_creds = creds; + return inner_creds_array->creds_array[i]; + } } + } return NULL; } /* -- IAM credentials. -- */ -static void -iam_destruct (grpc_credentials * creds) -{ - grpc_google_iam_credentials *c = (grpc_google_iam_credentials *) creds; - grpc_credentials_md_store_unref (c->iam_md); +static void iam_destruct(grpc_credentials *creds) { + grpc_google_iam_credentials *c = (grpc_google_iam_credentials *)creds; + grpc_credentials_md_store_unref(c->iam_md); } -static int -iam_has_request_metadata (const grpc_credentials * creds) -{ - return 1; -} +static int iam_has_request_metadata(const grpc_credentials *creds) { return 1; } -static int -iam_has_request_metadata_only (const grpc_credentials * creds) -{ +static int iam_has_request_metadata_only(const grpc_credentials *creds) { return 1; } -static void -iam_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) -{ - grpc_google_iam_credentials *c = (grpc_google_iam_credentials *) creds; - cb (exec_ctx, user_data, c->iam_md->entries, c->iam_md->num_entries, GRPC_CREDENTIALS_OK); +static void iam_get_request_metadata( + grpc_exec_ctx *exec_ctx, grpc_credentials *creds, grpc_pollset *pollset, + const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { + grpc_google_iam_credentials *c = (grpc_google_iam_credentials *)creds; + cb(exec_ctx, user_data, c->iam_md->entries, c->iam_md->num_entries, + GRPC_CREDENTIALS_OK); } static grpc_credentials_vtable iam_vtable = { - iam_destruct, iam_has_request_metadata, iam_has_request_metadata_only, - iam_get_request_metadata, NULL -}; + iam_destruct, iam_has_request_metadata, iam_has_request_metadata_only, + iam_get_request_metadata, NULL}; -grpc_credentials * -grpc_google_iam_credentials_create (const char *token, const char *authority_selector, void *reserved) -{ +grpc_credentials *grpc_google_iam_credentials_create( + const char *token, const char *authority_selector, void *reserved) { grpc_google_iam_credentials *c; - GPR_ASSERT (reserved == NULL); - GPR_ASSERT (token != NULL); - GPR_ASSERT (authority_selector != NULL); - c = gpr_malloc (sizeof (grpc_google_iam_credentials)); - memset (c, 0, sizeof (grpc_google_iam_credentials)); + GPR_ASSERT(reserved == NULL); + GPR_ASSERT(token != NULL); + GPR_ASSERT(authority_selector != NULL); + c = gpr_malloc(sizeof(grpc_google_iam_credentials)); + memset(c, 0, sizeof(grpc_google_iam_credentials)); c->base.type = GRPC_CREDENTIALS_TYPE_IAM; c->base.vtable = &iam_vtable; - gpr_ref_init (&c->base.refcount, 1); - c->iam_md = grpc_credentials_md_store_create (2); - grpc_credentials_md_store_add_cstrings (c->iam_md, GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, token); - grpc_credentials_md_store_add_cstrings (c->iam_md, GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, authority_selector); + gpr_ref_init(&c->base.refcount, 1); + c->iam_md = grpc_credentials_md_store_create(2); + grpc_credentials_md_store_add_cstrings( + c->iam_md, GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, token); + grpc_credentials_md_store_add_cstrings( + c->iam_md, GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, authority_selector); return &c->base; } /* -- Plugin credentials. -- */ -typedef struct -{ +typedef struct { void *user_data; grpc_credentials_metadata_cb cb; } grpc_metadata_plugin_request; -static void -plugin_destruct (grpc_credentials * creds) -{ - grpc_plugin_credentials *c = (grpc_plugin_credentials *) creds; - if (c->plugin.state != NULL && c->plugin.destroy != NULL) - { - c->plugin.destroy (c->plugin.state); - } +static void plugin_destruct(grpc_credentials *creds) { + grpc_plugin_credentials *c = (grpc_plugin_credentials *)creds; + if (c->plugin.state != NULL && c->plugin.destroy != NULL) { + c->plugin.destroy(c->plugin.state); + } } -static int -plugin_has_request_metadata (const grpc_credentials * creds) -{ +static int plugin_has_request_metadata(const grpc_credentials *creds) { return 1; } -static int -plugin_has_request_metadata_only (const grpc_credentials * creds) -{ +static int plugin_has_request_metadata_only(const grpc_credentials *creds) { return 1; } -static void -plugin_md_request_metadata_ready (void *request, const grpc_metadata * md, size_t num_md, grpc_status_code status, const char *error_details) -{ +static void plugin_md_request_metadata_ready(void *request, + const grpc_metadata *md, + size_t num_md, + grpc_status_code status, + const char *error_details) { /* called from application code */ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_metadata_plugin_request *r = (grpc_metadata_plugin_request *) request; - if (status != GRPC_STATUS_OK) - { - if (error_details != NULL) - { - gpr_log (GPR_ERROR, "Getting metadata from plugin failed with error: %s", error_details); - } - r->cb (&exec_ctx, r->user_data, NULL, 0, GRPC_CREDENTIALS_ERROR); - } - else - { - size_t i; - grpc_credentials_md *md_array = NULL; - if (num_md > 0) - { - md_array = gpr_malloc (num_md * sizeof (grpc_credentials_md)); - for (i = 0; i < num_md; i++) - { - md_array[i].key = gpr_slice_from_copied_string (md[i].key); - md_array[i].value = gpr_slice_from_copied_buffer (md[i].value, md[i].value_length); - } - } - r->cb (&exec_ctx, r->user_data, md_array, num_md, GRPC_CREDENTIALS_OK); - if (md_array != NULL) - { - for (i = 0; i < num_md; i++) - { - gpr_slice_unref (md_array[i].key); - gpr_slice_unref (md_array[i].value); - } - gpr_free (md_array); - } + grpc_metadata_plugin_request *r = (grpc_metadata_plugin_request *)request; + if (status != GRPC_STATUS_OK) { + if (error_details != NULL) { + gpr_log(GPR_ERROR, "Getting metadata from plugin failed with error: %s", + error_details); } - gpr_free (r); -} - -static void -plugin_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) -{ - grpc_plugin_credentials *c = (grpc_plugin_credentials *) creds; - if (c->plugin.get_metadata != NULL) - { - grpc_metadata_plugin_request *request = gpr_malloc (sizeof (*request)); - memset (request, 0, sizeof (*request)); - request->user_data = user_data; - request->cb = cb; - c->plugin.get_metadata (c->plugin.state, service_url, plugin_md_request_metadata_ready, request); + r->cb(&exec_ctx, r->user_data, NULL, 0, GRPC_CREDENTIALS_ERROR); + } else { + size_t i; + grpc_credentials_md *md_array = NULL; + if (num_md > 0) { + md_array = gpr_malloc(num_md * sizeof(grpc_credentials_md)); + for (i = 0; i < num_md; i++) { + md_array[i].key = gpr_slice_from_copied_string(md[i].key); + md_array[i].value = + gpr_slice_from_copied_buffer(md[i].value, md[i].value_length); + } } - else - { - cb (exec_ctx, user_data, NULL, 0, GRPC_CREDENTIALS_OK); + r->cb(&exec_ctx, r->user_data, md_array, num_md, GRPC_CREDENTIALS_OK); + if (md_array != NULL) { + for (i = 0; i < num_md; i++) { + gpr_slice_unref(md_array[i].key); + gpr_slice_unref(md_array[i].value); + } + gpr_free(md_array); } + } + gpr_free(r); +} + +static void plugin_get_request_metadata( + grpc_exec_ctx *exec_ctx, grpc_credentials *creds, grpc_pollset *pollset, + const char *service_url, grpc_credentials_metadata_cb cb, void *user_data) { + grpc_plugin_credentials *c = (grpc_plugin_credentials *)creds; + if (c->plugin.get_metadata != NULL) { + grpc_metadata_plugin_request *request = gpr_malloc(sizeof(*request)); + memset(request, 0, sizeof(*request)); + request->user_data = user_data; + request->cb = cb; + c->plugin.get_metadata(c->plugin.state, service_url, + plugin_md_request_metadata_ready, request); + } else { + cb(exec_ctx, user_data, NULL, 0, GRPC_CREDENTIALS_OK); + } } static grpc_credentials_vtable plugin_vtable = { - plugin_destruct, plugin_has_request_metadata, - plugin_has_request_metadata_only, plugin_get_request_metadata, NULL -}; - -grpc_credentials * -grpc_metadata_credentials_create_from_plugin (grpc_metadata_credentials_plugin plugin, void *reserved) -{ - grpc_plugin_credentials *c = gpr_malloc (sizeof (*c)); - GPR_ASSERT (reserved == NULL); - memset (c, 0, sizeof (*c)); + plugin_destruct, plugin_has_request_metadata, + plugin_has_request_metadata_only, plugin_get_request_metadata, NULL}; + +grpc_credentials *grpc_metadata_credentials_create_from_plugin( + grpc_metadata_credentials_plugin plugin, void *reserved) { + grpc_plugin_credentials *c = gpr_malloc(sizeof(*c)); + GPR_ASSERT(reserved == NULL); + memset(c, 0, sizeof(*c)); c->base.type = GRPC_CREDENTIALS_TYPE_METADATA_PLUGIN; c->base.vtable = &plugin_vtable; - gpr_ref_init (&c->base.refcount, 1); + gpr_ref_init(&c->base.refcount, 1); c->plugin = plugin; return &c->base; } diff --git a/src/core/security/credentials.h b/src/core/security/credentials.h index c10c9db6263..b213e052d34 100644 --- a/src/core/security/credentials.h +++ b/src/core/security/credentials.h @@ -47,8 +47,7 @@ struct grpc_httpcli_response; /* --- Constants. --- */ -typedef enum -{ +typedef enum { GRPC_CREDENTIALS_OK = 0, GRPC_CREDENTIALS_ERROR } grpc_credentials_status; @@ -90,146 +89,169 @@ typedef enum /* --- grpc_credentials_md. --- */ -typedef struct -{ +typedef struct { gpr_slice key; gpr_slice value; } grpc_credentials_md; -typedef struct -{ +typedef struct { grpc_credentials_md *entries; size_t num_entries; size_t allocated; gpr_refcount refcount; } grpc_credentials_md_store; -grpc_credentials_md_store *grpc_credentials_md_store_create (size_t initial_capacity); +grpc_credentials_md_store *grpc_credentials_md_store_create( + size_t initial_capacity); /* Will ref key and value. */ -void grpc_credentials_md_store_add (grpc_credentials_md_store * store, gpr_slice key, gpr_slice value); -void grpc_credentials_md_store_add_cstrings (grpc_credentials_md_store * store, const char *key, const char *value); -grpc_credentials_md_store *grpc_credentials_md_store_ref (grpc_credentials_md_store * store); -void grpc_credentials_md_store_unref (grpc_credentials_md_store * store); +void grpc_credentials_md_store_add(grpc_credentials_md_store *store, + gpr_slice key, gpr_slice value); +void grpc_credentials_md_store_add_cstrings(grpc_credentials_md_store *store, + const char *key, const char *value); +grpc_credentials_md_store *grpc_credentials_md_store_ref( + grpc_credentials_md_store *store); +void grpc_credentials_md_store_unref(grpc_credentials_md_store *store); /* --- grpc_credentials. --- */ /* Creates a fake transport security credentials object for testing. */ -grpc_credentials *grpc_fake_transport_security_credentials_create (void); +grpc_credentials *grpc_fake_transport_security_credentials_create(void); /* Creates a fake server transport security credentials object for testing. */ -grpc_server_credentials *grpc_fake_transport_security_server_credentials_create (void); +grpc_server_credentials *grpc_fake_transport_security_server_credentials_create( + void); /* It is the caller's responsibility to gpr_free the result if not NULL. */ -char *grpc_get_well_known_google_credentials_file_path (void); - -typedef void (*grpc_credentials_metadata_cb) (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status); - -typedef struct -{ - void (*destruct) (grpc_credentials * c); - int (*has_request_metadata) (const grpc_credentials * c); - int (*has_request_metadata_only) (const grpc_credentials * c); - void (*get_request_metadata) (grpc_exec_ctx * exec_ctx, grpc_credentials * c, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data); - grpc_security_status (*create_security_connector) (grpc_credentials * c, const char *target, const grpc_channel_args * args, grpc_credentials * request_metadata_creds, grpc_channel_security_connector ** sc, grpc_channel_args ** new_args); +char *grpc_get_well_known_google_credentials_file_path(void); + +typedef void (*grpc_credentials_metadata_cb)(grpc_exec_ctx *exec_ctx, + void *user_data, + grpc_credentials_md *md_elems, + size_t num_md, + grpc_credentials_status status); + +typedef struct { + void (*destruct)(grpc_credentials *c); + int (*has_request_metadata)(const grpc_credentials *c); + int (*has_request_metadata_only)(const grpc_credentials *c); + void (*get_request_metadata)(grpc_exec_ctx *exec_ctx, grpc_credentials *c, + grpc_pollset *pollset, const char *service_url, + grpc_credentials_metadata_cb cb, + void *user_data); + grpc_security_status (*create_security_connector)( + grpc_credentials *c, const char *target, const grpc_channel_args *args, + grpc_credentials *request_metadata_creds, + grpc_channel_security_connector **sc, grpc_channel_args **new_args); } grpc_credentials_vtable; -struct grpc_credentials -{ +struct grpc_credentials { const grpc_credentials_vtable *vtable; const char *type; gpr_refcount refcount; }; -grpc_credentials *grpc_credentials_ref (grpc_credentials * creds); -void grpc_credentials_unref (grpc_credentials * creds); -int grpc_credentials_has_request_metadata (grpc_credentials * creds); -int grpc_credentials_has_request_metadata_only (grpc_credentials * creds); -void grpc_credentials_get_request_metadata (grpc_exec_ctx * exec_ctx, grpc_credentials * creds, grpc_pollset * pollset, const char *service_url, grpc_credentials_metadata_cb cb, void *user_data); +grpc_credentials *grpc_credentials_ref(grpc_credentials *creds); +void grpc_credentials_unref(grpc_credentials *creds); +int grpc_credentials_has_request_metadata(grpc_credentials *creds); +int grpc_credentials_has_request_metadata_only(grpc_credentials *creds); +void grpc_credentials_get_request_metadata( + grpc_exec_ctx *exec_ctx, grpc_credentials *creds, grpc_pollset *pollset, + const char *service_url, grpc_credentials_metadata_cb cb, void *user_data); /* 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_credentials_create_security_connector (grpc_credentials * creds, const char *target, const grpc_channel_args * args, grpc_credentials * request_metadata_creds, grpc_channel_security_connector ** sc, grpc_channel_args ** new_args); +grpc_security_status grpc_credentials_create_security_connector( + grpc_credentials *creds, const char *target, const grpc_channel_args *args, + grpc_credentials *request_metadata_creds, + grpc_channel_security_connector **sc, grpc_channel_args **new_args); -typedef struct -{ +typedef struct { grpc_credentials **creds_array; size_t num_creds; } grpc_credentials_array; -const grpc_credentials_array *grpc_composite_credentials_get_credentials (grpc_credentials * composite_creds); +const grpc_credentials_array *grpc_composite_credentials_get_credentials( + grpc_credentials *composite_creds); /* Returns creds if creds is of the specified type or the inner creds of the specified type (if found), if the creds is of type COMPOSITE. If composite_creds is not NULL, *composite_creds will point to creds if of type COMPOSITE in case of success. */ -grpc_credentials *grpc_credentials_contains_type (grpc_credentials * creds, const char *type, grpc_credentials ** composite_creds); +grpc_credentials *grpc_credentials_contains_type( + grpc_credentials *creds, const char *type, + grpc_credentials **composite_creds); /* Exposed for testing only. */ -grpc_credentials_status grpc_oauth2_token_fetcher_credentials_parse_server_response (const struct grpc_httpcli_response *response, grpc_credentials_md_store ** token_md, gpr_timespec * token_lifetime); -void grpc_flush_cached_google_default_credentials (void); +grpc_credentials_status +grpc_oauth2_token_fetcher_credentials_parse_server_response( + const struct grpc_httpcli_response *response, + grpc_credentials_md_store **token_md, gpr_timespec *token_lifetime); +void grpc_flush_cached_google_default_credentials(void); /* Metadata-only credentials with the specified key and value where asynchronicity can be simulated for testing. */ -grpc_credentials *grpc_md_only_test_credentials_create (const char *md_key, const char *md_value, int is_async); +grpc_credentials *grpc_md_only_test_credentials_create(const char *md_key, + const char *md_value, + int is_async); /* Private constructor for jwt credentials from an already parsed json key. Takes ownership of the key. */ -grpc_credentials *grpc_service_account_jwt_access_credentials_create_from_auth_json_key (grpc_auth_json_key key, gpr_timespec token_lifetime); +grpc_credentials * +grpc_service_account_jwt_access_credentials_create_from_auth_json_key( + grpc_auth_json_key key, gpr_timespec token_lifetime); /* Private constructor for refresh token credentials from an already parsed refresh token. Takes ownership of the refresh token. */ -grpc_credentials *grpc_refresh_token_credentials_create_from_auth_refresh_token (grpc_auth_refresh_token token); +grpc_credentials *grpc_refresh_token_credentials_create_from_auth_refresh_token( + grpc_auth_refresh_token token); /* --- grpc_server_credentials. --- */ -typedef struct -{ - void (*destruct) (grpc_server_credentials * c); - grpc_security_status (*create_security_connector) (grpc_server_credentials * c, grpc_security_connector ** sc); +typedef struct { + void (*destruct)(grpc_server_credentials *c); + grpc_security_status (*create_security_connector)( + grpc_server_credentials *c, grpc_security_connector **sc); } grpc_server_credentials_vtable; /* TODO(jboeuf): Add a refcount. */ -struct grpc_server_credentials -{ +struct grpc_server_credentials { const grpc_server_credentials_vtable *vtable; const char *type; gpr_refcount refcount; grpc_auth_metadata_processor processor; }; -grpc_security_status grpc_server_credentials_create_security_connector (grpc_server_credentials * creds, grpc_security_connector ** sc); +grpc_security_status grpc_server_credentials_create_security_connector( + grpc_server_credentials *creds, grpc_security_connector **sc); -grpc_server_credentials *grpc_server_credentials_ref (grpc_server_credentials * creds); +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_server_credentials *creds); /* -- Ssl credentials. -- */ -typedef struct -{ +typedef struct { grpc_credentials base; grpc_ssl_config config; } grpc_ssl_credentials; -typedef struct -{ +typedef struct { grpc_server_credentials base; grpc_ssl_server_config config; } grpc_ssl_server_credentials; /* -- Jwt credentials -- */ -typedef struct -{ +typedef struct { grpc_credentials base; /* Have a simple cache for now with just 1 entry. We could have a map based on the service_url for a more sophisticated one. */ gpr_mu cache_mu; - struct - { + struct { grpc_credentials_md_store *jwt_md; char *service_url; gpr_timespec jwt_expiration; @@ -244,12 +266,17 @@ typedef struct This object is a base for credentials that need to acquire an oauth2 token from an http service. */ -typedef struct grpc_credentials_metadata_request grpc_credentials_metadata_request; +typedef struct grpc_credentials_metadata_request + grpc_credentials_metadata_request; -typedef void (*grpc_fetch_oauth2_func) (grpc_exec_ctx * exec_ctx, grpc_credentials_metadata_request * req, grpc_httpcli_context * http_context, grpc_pollset * pollset, grpc_httpcli_response_cb response_cb, gpr_timespec deadline); +typedef void (*grpc_fetch_oauth2_func)(grpc_exec_ctx *exec_ctx, + grpc_credentials_metadata_request *req, + grpc_httpcli_context *http_context, + grpc_pollset *pollset, + grpc_httpcli_response_cb response_cb, + gpr_timespec deadline); -typedef struct -{ +typedef struct { grpc_credentials base; gpr_mu mu; grpc_credentials_md_store *access_token_md; @@ -260,24 +287,21 @@ typedef struct /* -- GoogleRefreshToken credentials. -- */ -typedef struct -{ +typedef struct { grpc_oauth2_token_fetcher_credentials base; grpc_auth_refresh_token refresh_token; } grpc_google_refresh_token_credentials; /* -- Oauth2 Access Token credentials. -- */ -typedef struct -{ +typedef struct { grpc_credentials base; grpc_credentials_md_store *access_token_md; } grpc_access_token_credentials; /* -- Metadata-only Test credentials. -- */ -typedef struct -{ +typedef struct { grpc_credentials base; grpc_credentials_md_store *md_store; int is_async; @@ -285,16 +309,14 @@ typedef struct /* -- GoogleIAM credentials. -- */ -typedef struct -{ +typedef struct { grpc_credentials base; grpc_credentials_md_store *iam_md; } grpc_google_iam_credentials; /* -- Composite credentials. -- */ -typedef struct -{ +typedef struct { grpc_credentials base; grpc_credentials_array inner; grpc_credentials *connector_creds; @@ -302,8 +324,7 @@ typedef struct /* -- Plugin credentials. -- */ -typedef struct -{ +typedef struct { grpc_credentials base; grpc_metadata_credentials_plugin plugin; grpc_credentials_md_store *plugin_md; diff --git a/src/core/security/credentials_metadata.c b/src/core/security/credentials_metadata.c index f9a5f5fd4f7..b8a132f1eaf 100644 --- a/src/core/security/credentials_metadata.c +++ b/src/core/security/credentials_metadata.c @@ -37,78 +37,65 @@ #include -static void -store_ensure_capacity (grpc_credentials_md_store * store) -{ - if (store->num_entries == store->allocated) - { - store->allocated = (store->allocated == 0) ? 1 : store->allocated * 2; - store->entries = gpr_realloc (store->entries, store->allocated * sizeof (grpc_credentials_md)); - } +static void store_ensure_capacity(grpc_credentials_md_store *store) { + if (store->num_entries == store->allocated) { + store->allocated = (store->allocated == 0) ? 1 : store->allocated * 2; + store->entries = gpr_realloc( + store->entries, store->allocated * sizeof(grpc_credentials_md)); + } } -grpc_credentials_md_store * -grpc_credentials_md_store_create (size_t initial_capacity) -{ - grpc_credentials_md_store *store = gpr_malloc (sizeof (grpc_credentials_md_store)); - memset (store, 0, sizeof (grpc_credentials_md_store)); - if (initial_capacity > 0) - { - store->entries = gpr_malloc (initial_capacity * sizeof (grpc_credentials_md)); - store->allocated = initial_capacity; - } - gpr_ref_init (&store->refcount, 1); +grpc_credentials_md_store *grpc_credentials_md_store_create( + size_t initial_capacity) { + grpc_credentials_md_store *store = + gpr_malloc(sizeof(grpc_credentials_md_store)); + memset(store, 0, sizeof(grpc_credentials_md_store)); + if (initial_capacity > 0) { + store->entries = gpr_malloc(initial_capacity * sizeof(grpc_credentials_md)); + store->allocated = initial_capacity; + } + gpr_ref_init(&store->refcount, 1); return store; } -void -grpc_credentials_md_store_add (grpc_credentials_md_store * store, gpr_slice key, gpr_slice value) -{ - if (store == NULL) - return; - store_ensure_capacity (store); - store->entries[store->num_entries].key = gpr_slice_ref (key); - store->entries[store->num_entries].value = gpr_slice_ref (value); +void grpc_credentials_md_store_add(grpc_credentials_md_store *store, + gpr_slice key, gpr_slice value) { + if (store == NULL) return; + store_ensure_capacity(store); + store->entries[store->num_entries].key = gpr_slice_ref(key); + store->entries[store->num_entries].value = gpr_slice_ref(value); store->num_entries++; } -void -grpc_credentials_md_store_add_cstrings (grpc_credentials_md_store * store, const char *key, const char *value) -{ - if (store == NULL) - return; - store_ensure_capacity (store); - store->entries[store->num_entries].key = gpr_slice_from_copied_string (key); - store->entries[store->num_entries].value = gpr_slice_from_copied_string (value); +void grpc_credentials_md_store_add_cstrings(grpc_credentials_md_store *store, + const char *key, + const char *value) { + if (store == NULL) return; + store_ensure_capacity(store); + store->entries[store->num_entries].key = gpr_slice_from_copied_string(key); + store->entries[store->num_entries].value = + gpr_slice_from_copied_string(value); store->num_entries++; } -grpc_credentials_md_store * -grpc_credentials_md_store_ref (grpc_credentials_md_store * store) -{ - if (store == NULL) - return NULL; - gpr_ref (&store->refcount); +grpc_credentials_md_store *grpc_credentials_md_store_ref( + grpc_credentials_md_store *store) { + if (store == NULL) return NULL; + gpr_ref(&store->refcount); return store; } -void -grpc_credentials_md_store_unref (grpc_credentials_md_store * store) -{ - if (store == NULL) - return; - if (gpr_unref (&store->refcount)) - { - if (store->entries != NULL) - { - size_t i; - for (i = 0; i < store->num_entries; i++) - { - gpr_slice_unref (store->entries[i].key); - gpr_slice_unref (store->entries[i].value); - } - gpr_free (store->entries); - } - gpr_free (store); +void grpc_credentials_md_store_unref(grpc_credentials_md_store *store) { + if (store == NULL) return; + if (gpr_unref(&store->refcount)) { + if (store->entries != NULL) { + size_t i; + for (i = 0; i < store->num_entries; i++) { + gpr_slice_unref(store->entries[i].key); + gpr_slice_unref(store->entries[i].value); + } + gpr_free(store->entries); } + gpr_free(store); + } } diff --git a/src/core/security/credentials_posix.c b/src/core/security/credentials_posix.c index ba897bd7c5e..20f67a7f149 100644 --- a/src/core/security/credentials_posix.c +++ b/src/core/security/credentials_posix.c @@ -44,18 +44,17 @@ #include "src/core/support/env.h" #include "src/core/support/string.h" -char * -grpc_get_well_known_google_credentials_file_path (void) -{ +char *grpc_get_well_known_google_credentials_file_path(void) { char *result = NULL; - char *home = gpr_getenv ("HOME"); - if (home == NULL) - { - gpr_log (GPR_ERROR, "Could not get HOME environment variable."); - return NULL; - } - gpr_asprintf (&result, "%s/.config/%s/%s", home, GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY, GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE); - gpr_free (home); + char *home = gpr_getenv("HOME"); + if (home == NULL) { + gpr_log(GPR_ERROR, "Could not get HOME environment variable."); + return NULL; + } + gpr_asprintf(&result, "%s/.config/%s/%s", home, + GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY, + GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE); + gpr_free(home); return result; } diff --git a/src/core/security/credentials_win32.c b/src/core/security/credentials_win32.c index 26306471214..92dfd9bdfe6 100644 --- a/src/core/security/credentials_win32.c +++ b/src/core/security/credentials_win32.c @@ -44,18 +44,17 @@ #include "src/core/support/env.h" #include "src/core/support/string.h" -char * -grpc_get_well_known_google_credentials_file_path (void) -{ +char *grpc_get_well_known_google_credentials_file_path(void) { char *result = NULL; - char *appdata_path = gpr_getenv ("APPDATA"); - if (appdata_path == NULL) - { - gpr_log (GPR_ERROR, "Could not get APPDATA environment variable."); - return NULL; - } - gpr_asprintf (&result, "%s/%s/%s", appdata_path, GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY, GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE); - gpr_free (appdata_path); + char *appdata_path = gpr_getenv("APPDATA"); + if (appdata_path == NULL) { + gpr_log(GPR_ERROR, "Could not get APPDATA environment variable."); + return NULL; + } + gpr_asprintf(&result, "%s/%s/%s", appdata_path, + GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY, + GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE); + gpr_free(appdata_path); return result; } diff --git a/src/core/security/google_default_credentials.c b/src/core/security/google_default_credentials.c index 945cb42427c..7b858428083 100644 --- a/src/core/security/google_default_credentials.c +++ b/src/core/security/google_default_credentials.c @@ -54,53 +54,42 @@ static int compute_engine_detection_done = 0; static gpr_mu g_mu; static gpr_once g_once = GPR_ONCE_INIT; -static void -init_default_credentials (void) -{ - gpr_mu_init (&g_mu); -} +static void init_default_credentials(void) { gpr_mu_init(&g_mu); } -typedef struct -{ +typedef struct { grpc_pollset pollset; int is_done; int success; } compute_engine_detector; -static void -on_compute_engine_detection_http_response (grpc_exec_ctx * exec_ctx, void *user_data, const grpc_httpcli_response * response) -{ - compute_engine_detector *detector = (compute_engine_detector *) user_data; - if (response != NULL && response->status == 200 && response->hdr_count > 0) - { - /* Internet providers can return a generic response to all requests, so - it is necessary to check that metadata header is present also. */ - size_t i; - for (i = 0; i < response->hdr_count; i++) - { - grpc_httpcli_header *header = &response->hdrs[i]; - if (strcmp (header->key, "Metadata-Flavor") == 0 && strcmp (header->value, "Google") == 0) - { - detector->success = 1; - break; - } - } +static void on_compute_engine_detection_http_response( + grpc_exec_ctx *exec_ctx, void *user_data, + const grpc_httpcli_response *response) { + compute_engine_detector *detector = (compute_engine_detector *)user_data; + if (response != NULL && response->status == 200 && response->hdr_count > 0) { + /* Internet providers can return a generic response to all requests, so + it is necessary to check that metadata header is present also. */ + size_t i; + for (i = 0; i < response->hdr_count; i++) { + grpc_httpcli_header *header = &response->hdrs[i]; + if (strcmp(header->key, "Metadata-Flavor") == 0 && + strcmp(header->value, "Google") == 0) { + detector->success = 1; + break; + } } - gpr_mu_lock (GRPC_POLLSET_MU (&detector->pollset)); + } + gpr_mu_lock(GRPC_POLLSET_MU(&detector->pollset)); detector->is_done = 1; - grpc_pollset_kick (&detector->pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&detector->pollset)); + grpc_pollset_kick(&detector->pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&detector->pollset)); } -static void -destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int s) -{ - grpc_pollset_destroy (p); +static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, int s) { + grpc_pollset_destroy(p); } -static int -is_stack_running_on_compute_engine (void) -{ +static int is_stack_running_on_compute_engine(void) { compute_engine_detector detector; grpc_httpcli_request request; grpc_httpcli_context context; @@ -109,147 +98,138 @@ is_stack_running_on_compute_engine (void) /* The http call is local. If it takes more than one sec, it is for sure not on compute engine. */ - gpr_timespec max_detection_delay = gpr_time_from_seconds (1, GPR_TIMESPAN); + gpr_timespec max_detection_delay = gpr_time_from_seconds(1, GPR_TIMESPAN); - grpc_pollset_init (&detector.pollset); + grpc_pollset_init(&detector.pollset); detector.is_done = 0; detector.success = 0; - memset (&request, 0, sizeof (grpc_httpcli_request)); + memset(&request, 0, sizeof(grpc_httpcli_request)); request.host = GRPC_COMPUTE_ENGINE_DETECTION_HOST; request.path = "/"; - grpc_httpcli_context_init (&context); + grpc_httpcli_context_init(&context); - grpc_httpcli_get (&exec_ctx, &context, &detector.pollset, &request, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), max_detection_delay), on_compute_engine_detection_http_response, &detector); + grpc_httpcli_get( + &exec_ctx, &context, &detector.pollset, &request, + gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), max_detection_delay), + on_compute_engine_detection_http_response, &detector); - grpc_exec_ctx_finish (&exec_ctx); + grpc_exec_ctx_finish(&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. */ - gpr_mu_lock (GRPC_POLLSET_MU (&detector.pollset)); - while (!detector.is_done) - { - grpc_pollset_worker worker; - grpc_pollset_work (&exec_ctx, &detector.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC)); - } - gpr_mu_unlock (GRPC_POLLSET_MU (&detector.pollset)); - - grpc_httpcli_context_destroy (&context); - grpc_closure_init (&destroy_closure, destroy_pollset, &detector.pollset); - grpc_pollset_shutdown (&exec_ctx, &detector.pollset, &destroy_closure); - grpc_exec_ctx_finish (&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&detector.pollset)); + while (!detector.is_done) { + grpc_pollset_worker worker; + grpc_pollset_work(&exec_ctx, &detector.pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), + gpr_inf_future(GPR_CLOCK_MONOTONIC)); + } + gpr_mu_unlock(GRPC_POLLSET_MU(&detector.pollset)); + + grpc_httpcli_context_destroy(&context); + grpc_closure_init(&destroy_closure, destroy_pollset, &detector.pollset); + grpc_pollset_shutdown(&exec_ctx, &detector.pollset, &destroy_closure); + grpc_exec_ctx_finish(&exec_ctx); return detector.success; } /* Takes ownership of creds_path if not NULL. */ -static grpc_credentials * -create_default_creds_from_path (char *creds_path) -{ +static grpc_credentials *create_default_creds_from_path(char *creds_path) { grpc_json *json = NULL; grpc_auth_json_key key; grpc_auth_refresh_token token; grpc_credentials *result = NULL; - gpr_slice creds_data = gpr_empty_slice (); + gpr_slice creds_data = gpr_empty_slice(); int file_ok = 0; - if (creds_path == NULL) - goto end; - creds_data = gpr_load_file (creds_path, 0, &file_ok); - if (!file_ok) - goto end; - json = grpc_json_parse_string_with_len ((char *) GPR_SLICE_START_PTR (creds_data), GPR_SLICE_LENGTH (creds_data)); - if (json == NULL) - goto end; + if (creds_path == NULL) goto end; + creds_data = gpr_load_file(creds_path, 0, &file_ok); + if (!file_ok) goto end; + json = grpc_json_parse_string_with_len( + (char *)GPR_SLICE_START_PTR(creds_data), GPR_SLICE_LENGTH(creds_data)); + if (json == NULL) goto end; /* First, try an auth json key. */ - key = grpc_auth_json_key_create_from_json (json); - 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); - goto end; - } + key = grpc_auth_json_key_create_from_json(json); + 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); + goto end; + } /* Then try a refresh token if the auth json key was invalid. */ - token = grpc_auth_refresh_token_create_from_json (json); - if (grpc_auth_refresh_token_is_valid (&token)) - { - result = grpc_refresh_token_credentials_create_from_auth_refresh_token (token); - goto end; - } + token = grpc_auth_refresh_token_create_from_json(json); + if (grpc_auth_refresh_token_is_valid(&token)) { + result = + grpc_refresh_token_credentials_create_from_auth_refresh_token(token); + goto end; + } end: - if (creds_path != NULL) - gpr_free (creds_path); - gpr_slice_unref (creds_data); - if (json != NULL) - grpc_json_destroy (json); + if (creds_path != NULL) gpr_free(creds_path); + gpr_slice_unref(creds_data); + if (json != NULL) grpc_json_destroy(json); return result; } -grpc_credentials * -grpc_google_default_credentials_create (void) -{ +grpc_credentials *grpc_google_default_credentials_create(void) { grpc_credentials *result = NULL; int serving_cached_credentials = 0; - gpr_once_init (&g_once, init_default_credentials); + gpr_once_init(&g_once, init_default_credentials); - gpr_mu_lock (&g_mu); + gpr_mu_lock(&g_mu); - if (default_credentials != NULL) - { - result = grpc_credentials_ref (default_credentials); - serving_cached_credentials = 1; - goto end; - } + if (default_credentials != NULL) { + result = grpc_credentials_ref(default_credentials); + serving_cached_credentials = 1; + goto end; + } /* First, try the environment variable. */ - result = create_default_creds_from_path (gpr_getenv (GRPC_GOOGLE_CREDENTIALS_ENV_VAR)); - if (result != NULL) - goto end; + result = create_default_creds_from_path( + gpr_getenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR)); + if (result != NULL) goto end; /* Then the well-known file. */ - result = create_default_creds_from_path (grpc_get_well_known_google_credentials_file_path ()); - if (result != NULL) - goto end; + result = create_default_creds_from_path( + grpc_get_well_known_google_credentials_file_path()); + if (result != NULL) goto end; /* 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 (); - compute_engine_detection_done = 1; - if (need_compute_engine_creds) - { - result = grpc_google_compute_engine_credentials_create (NULL); - } + if (!compute_engine_detection_done) { + int need_compute_engine_creds = is_stack_running_on_compute_engine(); + compute_engine_detection_done = 1; + if (need_compute_engine_creds) { + result = grpc_google_compute_engine_credentials_create(NULL); } + } end: - if (!serving_cached_credentials && result != NULL) - { - /* Blend with default ssl credentials and add a global reference so that it - can be cached and re-served. */ - grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL); - default_credentials = grpc_credentials_ref (grpc_composite_credentials_create (ssl_creds, result, NULL)); - GPR_ASSERT (default_credentials != NULL); - grpc_credentials_unref (ssl_creds); - grpc_credentials_unref (result); - result = default_credentials; - } - gpr_mu_unlock (&g_mu); + if (!serving_cached_credentials && result != NULL) { + /* Blend with default ssl credentials and add a global reference so that it + can be cached and re-served. */ + grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL); + default_credentials = grpc_credentials_ref( + grpc_composite_credentials_create(ssl_creds, result, NULL)); + GPR_ASSERT(default_credentials != NULL); + grpc_credentials_unref(ssl_creds); + grpc_credentials_unref(result); + result = default_credentials; + } + gpr_mu_unlock(&g_mu); return result; } -void -grpc_flush_cached_google_default_credentials (void) -{ - gpr_once_init (&g_once, init_default_credentials); - gpr_mu_lock (&g_mu); - if (default_credentials != NULL) - { - grpc_credentials_unref (default_credentials); - default_credentials = NULL; - } - gpr_mu_unlock (&g_mu); +void grpc_flush_cached_google_default_credentials(void) { + gpr_once_init(&g_once, init_default_credentials); + gpr_mu_lock(&g_mu); + if (default_credentials != NULL) { + grpc_credentials_unref(default_credentials); + default_credentials = NULL; + } + gpr_mu_unlock(&g_mu); } diff --git a/src/core/security/handshake.c b/src/core/security/handshake.c index 687cc575a7c..adbdd0b40eb 100644 --- a/src/core/security/handshake.c +++ b/src/core/security/handshake.c @@ -42,8 +42,7 @@ #define GRPC_INITIAL_HANDSHAKE_BUFFER_SIZE 256 -typedef struct -{ +typedef struct { grpc_security_connector *connector; tsi_handshaker *handshaker; unsigned char *handshake_buffer; @@ -59,131 +58,123 @@ typedef struct grpc_closure on_handshake_data_received_from_peer; } grpc_security_handshake; -static void on_handshake_data_received_from_peer (grpc_exec_ctx * exec_ctx, void *setup, int success); +static void on_handshake_data_received_from_peer(grpc_exec_ctx *exec_ctx, + void *setup, int success); -static void on_handshake_data_sent_to_peer (grpc_exec_ctx * exec_ctx, void *setup, int success); +static void on_handshake_data_sent_to_peer(grpc_exec_ctx *exec_ctx, void *setup, + int success); -static void -security_handshake_done (grpc_exec_ctx * exec_ctx, grpc_security_handshake * h, int is_success) -{ - if (is_success) - { - h->cb (exec_ctx, h->user_data, GRPC_SECURITY_OK, h->wrapped_endpoint, h->secure_endpoint); +static void security_handshake_done(grpc_exec_ctx *exec_ctx, + grpc_security_handshake *h, + int is_success) { + if (is_success) { + h->cb(exec_ctx, h->user_data, GRPC_SECURITY_OK, h->wrapped_endpoint, + h->secure_endpoint); + } else { + if (h->secure_endpoint != NULL) { + grpc_endpoint_shutdown(exec_ctx, h->secure_endpoint); + grpc_endpoint_destroy(exec_ctx, h->secure_endpoint); + } else { + grpc_endpoint_destroy(exec_ctx, h->wrapped_endpoint); } - else - { - if (h->secure_endpoint != NULL) - { - grpc_endpoint_shutdown (exec_ctx, h->secure_endpoint); - grpc_endpoint_destroy (exec_ctx, h->secure_endpoint); - } - else - { - grpc_endpoint_destroy (exec_ctx, h->wrapped_endpoint); - } - h->cb (exec_ctx, h->user_data, GRPC_SECURITY_ERROR, h->wrapped_endpoint, NULL); - } - if (h->handshaker != NULL) - tsi_handshaker_destroy (h->handshaker); - if (h->handshake_buffer != NULL) - gpr_free (h->handshake_buffer); - gpr_slice_buffer_destroy (&h->left_overs); - gpr_slice_buffer_destroy (&h->outgoing); - gpr_slice_buffer_destroy (&h->incoming); - GRPC_SECURITY_CONNECTOR_UNREF (h->connector, "handshake"); - gpr_free (h); + h->cb(exec_ctx, h->user_data, GRPC_SECURITY_ERROR, h->wrapped_endpoint, + NULL); + } + if (h->handshaker != NULL) tsi_handshaker_destroy(h->handshaker); + if (h->handshake_buffer != NULL) gpr_free(h->handshake_buffer); + gpr_slice_buffer_destroy(&h->left_overs); + gpr_slice_buffer_destroy(&h->outgoing); + gpr_slice_buffer_destroy(&h->incoming); + GRPC_SECURITY_CONNECTOR_UNREF(h->connector, "handshake"); + gpr_free(h); } -static void -on_peer_checked (grpc_exec_ctx * exec_ctx, void *user_data, grpc_security_status status) -{ +static void on_peer_checked(grpc_exec_ctx *exec_ctx, void *user_data, + grpc_security_status status) { grpc_security_handshake *h = user_data; tsi_frame_protector *protector; tsi_result result; - if (status != GRPC_SECURITY_OK) - { - gpr_log (GPR_ERROR, "Error checking peer."); - security_handshake_done (exec_ctx, h, 0); - return; - } - result = tsi_handshaker_create_frame_protector (h->handshaker, NULL, &protector); - if (result != TSI_OK) - { - gpr_log (GPR_ERROR, "Frame protector creation failed with error %s.", tsi_result_to_string (result)); - security_handshake_done (exec_ctx, h, 0); - return; - } - h->secure_endpoint = grpc_secure_endpoint_create (protector, h->wrapped_endpoint, h->left_overs.slices, h->left_overs.count); + if (status != GRPC_SECURITY_OK) { + gpr_log(GPR_ERROR, "Error checking peer."); + security_handshake_done(exec_ctx, h, 0); + return; + } + result = + tsi_handshaker_create_frame_protector(h->handshaker, NULL, &protector); + if (result != TSI_OK) { + gpr_log(GPR_ERROR, "Frame protector creation failed with error %s.", + tsi_result_to_string(result)); + security_handshake_done(exec_ctx, h, 0); + return; + } + h->secure_endpoint = + grpc_secure_endpoint_create(protector, h->wrapped_endpoint, + h->left_overs.slices, h->left_overs.count); h->left_overs.count = 0; h->left_overs.length = 0; - security_handshake_done (exec_ctx, h, 1); + security_handshake_done(exec_ctx, h, 1); return; } -static void -check_peer (grpc_exec_ctx * exec_ctx, grpc_security_handshake * h) -{ +static void check_peer(grpc_exec_ctx *exec_ctx, grpc_security_handshake *h) { grpc_security_status peer_status; tsi_peer peer; - tsi_result result = tsi_handshaker_extract_peer (h->handshaker, &peer); + tsi_result result = tsi_handshaker_extract_peer(h->handshaker, &peer); - if (result != TSI_OK) - { - gpr_log (GPR_ERROR, "Peer extraction failed with error %s", tsi_result_to_string (result)); - security_handshake_done (exec_ctx, h, 0); - return; - } - peer_status = grpc_security_connector_check_peer (h->connector, peer, on_peer_checked, h); - if (peer_status == GRPC_SECURITY_ERROR) - { - gpr_log (GPR_ERROR, "Peer check failed."); - security_handshake_done (exec_ctx, h, 0); - return; - } - else if (peer_status == GRPC_SECURITY_OK) - { - on_peer_checked (exec_ctx, h, peer_status); - } + if (result != TSI_OK) { + gpr_log(GPR_ERROR, "Peer extraction failed with error %s", + tsi_result_to_string(result)); + security_handshake_done(exec_ctx, h, 0); + return; + } + peer_status = grpc_security_connector_check_peer(h->connector, peer, + on_peer_checked, h); + if (peer_status == GRPC_SECURITY_ERROR) { + gpr_log(GPR_ERROR, "Peer check failed."); + security_handshake_done(exec_ctx, h, 0); + return; + } else if (peer_status == GRPC_SECURITY_OK) { + on_peer_checked(exec_ctx, h, peer_status); + } } -static void -send_handshake_bytes_to_peer (grpc_exec_ctx * exec_ctx, grpc_security_handshake * h) -{ +static void send_handshake_bytes_to_peer(grpc_exec_ctx *exec_ctx, + grpc_security_handshake *h) { size_t offset = 0; tsi_result result = TSI_OK; gpr_slice to_send; - do - { - size_t to_send_size = h->handshake_buffer_size - offset; - result = tsi_handshaker_get_bytes_to_send_to_peer (h->handshaker, h->handshake_buffer + offset, &to_send_size); - offset += to_send_size; - if (result == TSI_INCOMPLETE_DATA) - { - h->handshake_buffer_size *= 2; - h->handshake_buffer = gpr_realloc (h->handshake_buffer, h->handshake_buffer_size); - } + do { + size_t to_send_size = h->handshake_buffer_size - offset; + result = tsi_handshaker_get_bytes_to_send_to_peer( + h->handshaker, h->handshake_buffer + offset, &to_send_size); + offset += to_send_size; + if (result == TSI_INCOMPLETE_DATA) { + h->handshake_buffer_size *= 2; + h->handshake_buffer = + gpr_realloc(h->handshake_buffer, h->handshake_buffer_size); } - while (result == TSI_INCOMPLETE_DATA); + } while (result == TSI_INCOMPLETE_DATA); - if (result != TSI_OK) - { - gpr_log (GPR_ERROR, "Handshake failed with error %s", tsi_result_to_string (result)); - security_handshake_done (exec_ctx, h, 0); - return; - } + if (result != TSI_OK) { + gpr_log(GPR_ERROR, "Handshake failed with error %s", + tsi_result_to_string(result)); + security_handshake_done(exec_ctx, h, 0); + return; + } - to_send = gpr_slice_from_copied_buffer ((const char *) h->handshake_buffer, offset); - gpr_slice_buffer_reset_and_unref (&h->outgoing); - gpr_slice_buffer_add (&h->outgoing, to_send); + to_send = + gpr_slice_from_copied_buffer((const char *)h->handshake_buffer, offset); + gpr_slice_buffer_reset_and_unref(&h->outgoing); + gpr_slice_buffer_add(&h->outgoing, to_send); /* TODO(klempner,jboeuf): This should probably use the client setup deadline */ - grpc_endpoint_write (exec_ctx, h->wrapped_endpoint, &h->outgoing, &h->on_handshake_data_sent_to_peer); + grpc_endpoint_write(exec_ctx, h->wrapped_endpoint, &h->outgoing, + &h->on_handshake_data_sent_to_peer); } -static void -on_handshake_data_received_from_peer (grpc_exec_ctx * exec_ctx, void *handshake, int success) -{ +static void on_handshake_data_received_from_peer(grpc_exec_ctx *exec_ctx, + void *handshake, int success) { grpc_security_handshake *h = handshake; size_t consumed_slice_size = 0; tsi_result result = TSI_OK; @@ -191,106 +182,107 @@ on_handshake_data_received_from_peer (grpc_exec_ctx * exec_ctx, void *handshake, size_t num_left_overs; int has_left_overs_in_current_slice = 0; - if (!success) - { - gpr_log (GPR_ERROR, "Read failed."); - security_handshake_done (exec_ctx, h, 0); - return; - } - - for (i = 0; i < h->incoming.count; i++) - { - consumed_slice_size = GPR_SLICE_LENGTH (h->incoming.slices[i]); - result = tsi_handshaker_process_bytes_from_peer (h->handshaker, GPR_SLICE_START_PTR (h->incoming.slices[i]), &consumed_slice_size); - if (!tsi_handshaker_is_in_progress (h->handshaker)) - break; - } + if (!success) { + gpr_log(GPR_ERROR, "Read failed."); + security_handshake_done(exec_ctx, h, 0); + return; + } - if (tsi_handshaker_is_in_progress (h->handshaker)) - { - /* We may need more data. */ - if (result == TSI_INCOMPLETE_DATA) - { - grpc_endpoint_read (exec_ctx, h->wrapped_endpoint, &h->incoming, &h->on_handshake_data_received_from_peer); - return; - } - else - { - send_handshake_bytes_to_peer (exec_ctx, h); - return; - } - } + for (i = 0; i < h->incoming.count; i++) { + consumed_slice_size = GPR_SLICE_LENGTH(h->incoming.slices[i]); + result = tsi_handshaker_process_bytes_from_peer( + h->handshaker, GPR_SLICE_START_PTR(h->incoming.slices[i]), + &consumed_slice_size); + if (!tsi_handshaker_is_in_progress(h->handshaker)) break; + } - if (result != TSI_OK) - { - gpr_log (GPR_ERROR, "Handshake failed with error %s", tsi_result_to_string (result)); - security_handshake_done (exec_ctx, h, 0); + if (tsi_handshaker_is_in_progress(h->handshaker)) { + /* We may need more data. */ + if (result == TSI_INCOMPLETE_DATA) { + grpc_endpoint_read(exec_ctx, h->wrapped_endpoint, &h->incoming, + &h->on_handshake_data_received_from_peer); + return; + } else { + send_handshake_bytes_to_peer(exec_ctx, h); return; } + } + + if (result != TSI_OK) { + gpr_log(GPR_ERROR, "Handshake failed with error %s", + tsi_result_to_string(result)); + security_handshake_done(exec_ctx, h, 0); + return; + } /* Handshake is done and successful this point. */ - has_left_overs_in_current_slice = (consumed_slice_size < GPR_SLICE_LENGTH (h->incoming.slices[i])); - num_left_overs = (has_left_overs_in_current_slice ? 1 : 0) + h->incoming.count - i - 1; - if (num_left_overs == 0) - { - check_peer (exec_ctx, h); - return; - } + has_left_overs_in_current_slice = + (consumed_slice_size < GPR_SLICE_LENGTH(h->incoming.slices[i])); + num_left_overs = + (has_left_overs_in_current_slice ? 1 : 0) + h->incoming.count - i - 1; + if (num_left_overs == 0) { + check_peer(exec_ctx, h); + return; + } /* Put the leftovers in our buffer (ownership transfered). */ - if (has_left_overs_in_current_slice) - { - gpr_slice_buffer_add (&h->left_overs, gpr_slice_split_tail (&h->incoming.slices[i], consumed_slice_size)); - gpr_slice_unref (h->incoming.slices[i]); /* split_tail above increments refcount. */ - } - gpr_slice_buffer_addn (&h->left_overs, &h->incoming.slices[i + 1], num_left_overs - (size_t) has_left_overs_in_current_slice); - check_peer (exec_ctx, h); + if (has_left_overs_in_current_slice) { + gpr_slice_buffer_add( + &h->left_overs, + gpr_slice_split_tail(&h->incoming.slices[i], consumed_slice_size)); + gpr_slice_unref( + h->incoming.slices[i]); /* split_tail above increments refcount. */ + } + gpr_slice_buffer_addn( + &h->left_overs, &h->incoming.slices[i + 1], + num_left_overs - (size_t)has_left_overs_in_current_slice); + check_peer(exec_ctx, h); } /* If handshake is NULL, the handshake is done. */ -static void -on_handshake_data_sent_to_peer (grpc_exec_ctx * exec_ctx, void *handshake, int success) -{ +static void on_handshake_data_sent_to_peer(grpc_exec_ctx *exec_ctx, + void *handshake, int success) { grpc_security_handshake *h = handshake; /* Make sure that write is OK. */ - if (!success) - { - gpr_log (GPR_ERROR, "Write failed."); - if (handshake != NULL) - security_handshake_done (exec_ctx, h, 0); - return; - } + if (!success) { + gpr_log(GPR_ERROR, "Write failed."); + if (handshake != NULL) security_handshake_done(exec_ctx, h, 0); + return; + } /* We may be done. */ - if (tsi_handshaker_is_in_progress (h->handshaker)) - { - /* TODO(klempner,jboeuf): This should probably use the client setup - deadline */ - grpc_endpoint_read (exec_ctx, h->wrapped_endpoint, &h->incoming, &h->on_handshake_data_received_from_peer); - } - else - { - check_peer (exec_ctx, h); - } + if (tsi_handshaker_is_in_progress(h->handshaker)) { + /* TODO(klempner,jboeuf): This should probably use the client setup + deadline */ + grpc_endpoint_read(exec_ctx, h->wrapped_endpoint, &h->incoming, + &h->on_handshake_data_received_from_peer); + } else { + check_peer(exec_ctx, h); + } } -void -grpc_do_security_handshake (grpc_exec_ctx * exec_ctx, tsi_handshaker * handshaker, grpc_security_connector * connector, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) -{ - grpc_security_handshake *h = gpr_malloc (sizeof (grpc_security_handshake)); - memset (h, 0, sizeof (grpc_security_handshake)); +void grpc_do_security_handshake(grpc_exec_ctx *exec_ctx, + tsi_handshaker *handshaker, + grpc_security_connector *connector, + grpc_endpoint *nonsecure_endpoint, + grpc_security_handshake_done_cb cb, + void *user_data) { + grpc_security_handshake *h = gpr_malloc(sizeof(grpc_security_handshake)); + memset(h, 0, sizeof(grpc_security_handshake)); h->handshaker = handshaker; - h->connector = GRPC_SECURITY_CONNECTOR_REF (connector, "handshake"); + h->connector = GRPC_SECURITY_CONNECTOR_REF(connector, "handshake"); h->handshake_buffer_size = GRPC_INITIAL_HANDSHAKE_BUFFER_SIZE; - h->handshake_buffer = gpr_malloc (h->handshake_buffer_size); + h->handshake_buffer = gpr_malloc(h->handshake_buffer_size); h->wrapped_endpoint = nonsecure_endpoint; h->user_data = user_data; h->cb = cb; - grpc_closure_init (&h->on_handshake_data_sent_to_peer, on_handshake_data_sent_to_peer, h); - grpc_closure_init (&h->on_handshake_data_received_from_peer, on_handshake_data_received_from_peer, h); - gpr_slice_buffer_init (&h->left_overs); - gpr_slice_buffer_init (&h->outgoing); - gpr_slice_buffer_init (&h->incoming); - send_handshake_bytes_to_peer (exec_ctx, h); + grpc_closure_init(&h->on_handshake_data_sent_to_peer, + on_handshake_data_sent_to_peer, h); + grpc_closure_init(&h->on_handshake_data_received_from_peer, + on_handshake_data_received_from_peer, h); + gpr_slice_buffer_init(&h->left_overs); + gpr_slice_buffer_init(&h->outgoing); + gpr_slice_buffer_init(&h->incoming); + send_handshake_bytes_to_peer(exec_ctx, h); } diff --git a/src/core/security/handshake.h b/src/core/security/handshake.h index 84798e96ecc..28eaa79dc39 100644 --- a/src/core/security/handshake.h +++ b/src/core/security/handshake.h @@ -38,6 +38,11 @@ #include "src/core/security/security_connector.h" /* Calls the callback upon completion. Takes owership of handshaker. */ -void grpc_do_security_handshake (grpc_exec_ctx * exec_ctx, tsi_handshaker * handshaker, grpc_security_connector * connector, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data); +void grpc_do_security_handshake(grpc_exec_ctx *exec_ctx, + tsi_handshaker *handshaker, + grpc_security_connector *connector, + grpc_endpoint *nonsecure_endpoint, + grpc_security_handshake_done_cb cb, + void *user_data); #endif /* GRPC_INTERNAL_CORE_SECURITY_HANDSHAKE_H */ diff --git a/src/core/security/json_token.c b/src/core/security/json_token.c index cf9b25bdc6c..021912f3337 100644 --- a/src/core/security/json_token.c +++ b/src/core/security/json_token.c @@ -49,7 +49,7 @@ /* --- Constants. --- */ /* 1 hour max. */ -const gpr_timespec grpc_max_auth_token_lifetime = { 3600, 0, GPR_TIMESPAN }; +const gpr_timespec grpc_max_auth_token_lifetime = {3600, 0, GPR_TIMESPAN}; #define GRPC_JWT_RSA_SHA256_ALGORITHM "RS256" #define GRPC_JWT_TYPE "JWT" @@ -60,398 +60,346 @@ static grpc_jwt_encode_and_sign_override g_jwt_encode_and_sign_override = NULL; /* --- grpc_auth_json_key. --- */ -static const char * -json_get_string_property (const grpc_json * json, const char *prop_name) -{ +static const char *json_get_string_property(const grpc_json *json, + const char *prop_name) { grpc_json *child; - for (child = json->child; child != NULL; child = child->next) - { - if (strcmp (child->key, prop_name) == 0) - break; - } - if (child == NULL || child->type != GRPC_JSON_STRING) - { - gpr_log (GPR_ERROR, "Invalid or missing %s property.", prop_name); - return NULL; - } + for (child = json->child; child != NULL; child = child->next) { + if (strcmp(child->key, prop_name) == 0) break; + } + if (child == NULL || child->type != GRPC_JSON_STRING) { + gpr_log(GPR_ERROR, "Invalid or missing %s property.", prop_name); + return NULL; + } return child->value; } -static int -set_json_key_string_property (const grpc_json * json, const char *prop_name, char **json_key_field) -{ - const char *prop_value = json_get_string_property (json, prop_name); - if (prop_value == NULL) - return 0; - *json_key_field = gpr_strdup (prop_value); +static int set_json_key_string_property(const grpc_json *json, + const char *prop_name, + char **json_key_field) { + const char *prop_value = json_get_string_property(json, prop_name); + if (prop_value == NULL) return 0; + *json_key_field = gpr_strdup(prop_value); return 1; } -int -grpc_auth_json_key_is_valid (const grpc_auth_json_key * json_key) -{ - return (json_key != NULL) && strcmp (json_key->type, GRPC_AUTH_JSON_TYPE_INVALID); +int grpc_auth_json_key_is_valid(const grpc_auth_json_key *json_key) { + return (json_key != NULL) && + strcmp(json_key->type, GRPC_AUTH_JSON_TYPE_INVALID); } -grpc_auth_json_key -grpc_auth_json_key_create_from_json (const grpc_json * json) -{ +grpc_auth_json_key grpc_auth_json_key_create_from_json(const grpc_json *json) { grpc_auth_json_key result; BIO *bio = NULL; const char *prop_value; int success = 0; - memset (&result, 0, sizeof (grpc_auth_json_key)); + memset(&result, 0, sizeof(grpc_auth_json_key)); result.type = GRPC_AUTH_JSON_TYPE_INVALID; - if (json == NULL) - { - gpr_log (GPR_ERROR, "Invalid json."); - goto end; - } - - prop_value = json_get_string_property (json, "type"); - if (prop_value == NULL || strcmp (prop_value, GRPC_AUTH_JSON_TYPE_SERVICE_ACCOUNT)) - { - goto end; - } + if (json == NULL) { + gpr_log(GPR_ERROR, "Invalid json."); + goto end; + } + + prop_value = json_get_string_property(json, "type"); + if (prop_value == NULL || + strcmp(prop_value, GRPC_AUTH_JSON_TYPE_SERVICE_ACCOUNT)) { + goto end; + } result.type = GRPC_AUTH_JSON_TYPE_SERVICE_ACCOUNT; - if (!set_json_key_string_property (json, "private_key_id", &result.private_key_id) || !set_json_key_string_property (json, "client_id", &result.client_id) || !set_json_key_string_property (json, "client_email", &result.client_email)) - { - goto end; - } - - prop_value = json_get_string_property (json, "private_key"); - if (prop_value == NULL) - { - goto end; - } - bio = BIO_new (BIO_s_mem ()); - success = BIO_puts (bio, prop_value); - if ((success < 0) || ((size_t) success != strlen (prop_value))) - { - gpr_log (GPR_ERROR, "Could not write into openssl BIO."); - goto end; - } - result.private_key = PEM_read_bio_RSAPrivateKey (bio, NULL, NULL, ""); - if (result.private_key == NULL) - { - gpr_log (GPR_ERROR, "Could not deserialize private key."); - goto end; - } + if (!set_json_key_string_property(json, "private_key_id", + &result.private_key_id) || + !set_json_key_string_property(json, "client_id", &result.client_id) || + !set_json_key_string_property(json, "client_email", + &result.client_email)) { + goto end; + } + + prop_value = json_get_string_property(json, "private_key"); + if (prop_value == NULL) { + goto end; + } + bio = BIO_new(BIO_s_mem()); + success = BIO_puts(bio, prop_value); + if ((success < 0) || ((size_t)success != strlen(prop_value))) { + gpr_log(GPR_ERROR, "Could not write into openssl BIO."); + goto end; + } + result.private_key = PEM_read_bio_RSAPrivateKey(bio, NULL, NULL, ""); + if (result.private_key == NULL) { + gpr_log(GPR_ERROR, "Could not deserialize private key."); + goto end; + } success = 1; end: - if (bio != NULL) - BIO_free (bio); - if (!success) - grpc_auth_json_key_destruct (&result); + if (bio != NULL) BIO_free(bio); + if (!success) grpc_auth_json_key_destruct(&result); return result; } -grpc_auth_json_key -grpc_auth_json_key_create_from_string (const char *json_string) -{ - char *scratchpad = gpr_strdup (json_string); - grpc_json *json = grpc_json_parse_string (scratchpad); - grpc_auth_json_key result = grpc_auth_json_key_create_from_json (json); - if (json != NULL) - grpc_json_destroy (json); - gpr_free (scratchpad); +grpc_auth_json_key grpc_auth_json_key_create_from_string( + const char *json_string) { + char *scratchpad = gpr_strdup(json_string); + grpc_json *json = grpc_json_parse_string(scratchpad); + grpc_auth_json_key result = grpc_auth_json_key_create_from_json(json); + if (json != NULL) grpc_json_destroy(json); + gpr_free(scratchpad); return result; } -void -grpc_auth_json_key_destruct (grpc_auth_json_key * json_key) -{ - if (json_key == NULL) - return; +void grpc_auth_json_key_destruct(grpc_auth_json_key *json_key) { + if (json_key == NULL) return; json_key->type = GRPC_AUTH_JSON_TYPE_INVALID; - if (json_key->client_id != NULL) - { - gpr_free (json_key->client_id); - json_key->client_id = NULL; - } - if (json_key->private_key_id != NULL) - { - gpr_free (json_key->private_key_id); - json_key->private_key_id = NULL; - } - if (json_key->client_email != NULL) - { - gpr_free (json_key->client_email); - json_key->client_email = NULL; - } - if (json_key->private_key != NULL) - { - RSA_free (json_key->private_key); - json_key->private_key = NULL; - } + if (json_key->client_id != NULL) { + gpr_free(json_key->client_id); + json_key->client_id = NULL; + } + if (json_key->private_key_id != NULL) { + gpr_free(json_key->private_key_id); + json_key->private_key_id = NULL; + } + if (json_key->client_email != NULL) { + gpr_free(json_key->client_email); + json_key->client_email = NULL; + } + if (json_key->private_key != NULL) { + RSA_free(json_key->private_key); + json_key->private_key = NULL; + } } /* --- jwt encoding and signature. --- */ -static grpc_json * -create_child (grpc_json * brother, grpc_json * parent, const char *key, const char *value, grpc_json_type type) -{ - grpc_json *child = grpc_json_create (type); - if (brother) - brother->next = child; - if (!parent->child) - parent->child = child; +static grpc_json *create_child(grpc_json *brother, grpc_json *parent, + const char *key, const char *value, + grpc_json_type type) { + grpc_json *child = grpc_json_create(type); + if (brother) brother->next = child; + if (!parent->child) parent->child = child; child->parent = parent; child->value = value; child->key = key; return child; } -static char * -encoded_jwt_header (const char *key_id, const char *algorithm) -{ - grpc_json *json = grpc_json_create (GRPC_JSON_OBJECT); +static char *encoded_jwt_header(const char *key_id, const char *algorithm) { + grpc_json *json = grpc_json_create(GRPC_JSON_OBJECT); grpc_json *child = NULL; char *json_str = NULL; char *result = NULL; - child = create_child (NULL, json, "alg", algorithm, GRPC_JSON_STRING); - child = create_child (child, json, "typ", GRPC_JWT_TYPE, GRPC_JSON_STRING); - create_child (child, json, "kid", key_id, GRPC_JSON_STRING); + child = create_child(NULL, json, "alg", algorithm, GRPC_JSON_STRING); + child = create_child(child, json, "typ", GRPC_JWT_TYPE, GRPC_JSON_STRING); + create_child(child, json, "kid", key_id, GRPC_JSON_STRING); - json_str = grpc_json_dump_to_string (json, 0); - result = grpc_base64_encode (json_str, strlen (json_str), 1, 0); - gpr_free (json_str); - grpc_json_destroy (json); + json_str = grpc_json_dump_to_string(json, 0); + result = grpc_base64_encode(json_str, strlen(json_str), 1, 0); + gpr_free(json_str); + grpc_json_destroy(json); return result; } -static char * -encoded_jwt_claim (const grpc_auth_json_key * json_key, const char *audience, gpr_timespec token_lifetime, const char *scope) -{ - grpc_json *json = grpc_json_create (GRPC_JSON_OBJECT); +static char *encoded_jwt_claim(const grpc_auth_json_key *json_key, + const char *audience, + gpr_timespec token_lifetime, const char *scope) { + grpc_json *json = grpc_json_create(GRPC_JSON_OBJECT); grpc_json *child = NULL; char *json_str = NULL; char *result = NULL; - gpr_timespec now = gpr_now (GPR_CLOCK_REALTIME); - gpr_timespec expiration = gpr_time_add (now, token_lifetime); + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + gpr_timespec expiration = gpr_time_add(now, token_lifetime); char now_str[GPR_LTOA_MIN_BUFSIZE]; char expiration_str[GPR_LTOA_MIN_BUFSIZE]; - if (gpr_time_cmp (token_lifetime, grpc_max_auth_token_lifetime) > 0) - { - gpr_log (GPR_INFO, "Cropping token lifetime to maximum allowed value."); - expiration = gpr_time_add (now, grpc_max_auth_token_lifetime); - } - gpr_ltoa (now.tv_sec, now_str); - gpr_ltoa (expiration.tv_sec, expiration_str); - - child = create_child (NULL, json, "iss", json_key->client_email, GRPC_JSON_STRING); - if (scope != NULL) - { - child = create_child (child, json, "scope", scope, GRPC_JSON_STRING); - } - else - { - /* Unscoped JWTs need a sub field. */ - child = create_child (child, json, "sub", json_key->client_email, GRPC_JSON_STRING); - } - - child = create_child (child, json, "aud", audience, GRPC_JSON_STRING); - child = create_child (child, json, "iat", now_str, GRPC_JSON_NUMBER); - create_child (child, json, "exp", expiration_str, GRPC_JSON_NUMBER); - - json_str = grpc_json_dump_to_string (json, 0); - result = grpc_base64_encode (json_str, strlen (json_str), 1, 0); - gpr_free (json_str); - grpc_json_destroy (json); + if (gpr_time_cmp(token_lifetime, grpc_max_auth_token_lifetime) > 0) { + gpr_log(GPR_INFO, "Cropping token lifetime to maximum allowed value."); + expiration = gpr_time_add(now, grpc_max_auth_token_lifetime); + } + gpr_ltoa(now.tv_sec, now_str); + gpr_ltoa(expiration.tv_sec, expiration_str); + + child = + create_child(NULL, json, "iss", json_key->client_email, GRPC_JSON_STRING); + if (scope != NULL) { + child = create_child(child, json, "scope", scope, GRPC_JSON_STRING); + } else { + /* Unscoped JWTs need a sub field. */ + child = create_child(child, json, "sub", json_key->client_email, + GRPC_JSON_STRING); + } + + child = create_child(child, json, "aud", audience, GRPC_JSON_STRING); + child = create_child(child, json, "iat", now_str, GRPC_JSON_NUMBER); + create_child(child, json, "exp", expiration_str, GRPC_JSON_NUMBER); + + json_str = grpc_json_dump_to_string(json, 0); + result = grpc_base64_encode(json_str, strlen(json_str), 1, 0); + gpr_free(json_str); + grpc_json_destroy(json); return result; } -static char * -dot_concat_and_free_strings (char *str1, char *str2) -{ - size_t str1_len = strlen (str1); - size_t str2_len = strlen (str2); - size_t result_len = str1_len + 1 /* dot */ + str2_len; - char *result = gpr_malloc (result_len + 1 /* NULL terminated */ ); +static char *dot_concat_and_free_strings(char *str1, char *str2) { + size_t str1_len = strlen(str1); + size_t str2_len = strlen(str2); + size_t result_len = str1_len + 1 /* dot */ + str2_len; + char *result = gpr_malloc(result_len + 1 /* NULL terminated */); char *current = result; - memcpy (current, str1, str1_len); + memcpy(current, str1, str1_len); current += str1_len; *(current++) = '.'; - memcpy (current, str2, str2_len); + memcpy(current, str2, str2_len); current += str2_len; - GPR_ASSERT (current >= result); - GPR_ASSERT ((gpr_uintptr) (current - result) == result_len); + GPR_ASSERT(current >= result); + GPR_ASSERT((gpr_uintptr)(current - result) == result_len); *current = '\0'; - gpr_free (str1); - gpr_free (str2); + gpr_free(str1); + gpr_free(str2); return result; } -const EVP_MD * -openssl_digest_from_algorithm (const char *algorithm) -{ - if (strcmp (algorithm, GRPC_JWT_RSA_SHA256_ALGORITHM) == 0) - { - return EVP_sha256 (); - } - else - { - gpr_log (GPR_ERROR, "Unknown algorithm %s.", algorithm); - return NULL; - } +const EVP_MD *openssl_digest_from_algorithm(const char *algorithm) { + if (strcmp(algorithm, GRPC_JWT_RSA_SHA256_ALGORITHM) == 0) { + return EVP_sha256(); + } else { + gpr_log(GPR_ERROR, "Unknown algorithm %s.", algorithm); + return NULL; + } } -char * -compute_and_encode_signature (const grpc_auth_json_key * json_key, const char *signature_algorithm, const char *to_sign) -{ - const EVP_MD *md = openssl_digest_from_algorithm (signature_algorithm); +char *compute_and_encode_signature(const grpc_auth_json_key *json_key, + const char *signature_algorithm, + const char *to_sign) { + const EVP_MD *md = openssl_digest_from_algorithm(signature_algorithm); EVP_MD_CTX *md_ctx = NULL; - EVP_PKEY *key = EVP_PKEY_new (); + EVP_PKEY *key = EVP_PKEY_new(); size_t sig_len = 0; unsigned char *sig = NULL; char *result = NULL; - if (md == NULL) - return NULL; - md_ctx = EVP_MD_CTX_create (); - if (md_ctx == NULL) - { - gpr_log (GPR_ERROR, "Could not create MD_CTX"); - goto end; - } - EVP_PKEY_set1_RSA (key, json_key->private_key); - if (EVP_DigestSignInit (md_ctx, NULL, md, NULL, key) != 1) - { - gpr_log (GPR_ERROR, "DigestInit failed."); - goto end; - } - if (EVP_DigestSignUpdate (md_ctx, to_sign, strlen (to_sign)) != 1) - { - gpr_log (GPR_ERROR, "DigestUpdate failed."); - goto end; - } - if (EVP_DigestSignFinal (md_ctx, NULL, &sig_len) != 1) - { - gpr_log (GPR_ERROR, "DigestFinal (get signature length) failed."); - goto end; - } - sig = gpr_malloc (sig_len); - if (EVP_DigestSignFinal (md_ctx, sig, &sig_len) != 1) - { - gpr_log (GPR_ERROR, "DigestFinal (signature compute) failed."); - goto end; - } - result = grpc_base64_encode (sig, sig_len, 1, 0); + if (md == NULL) return NULL; + md_ctx = EVP_MD_CTX_create(); + if (md_ctx == NULL) { + gpr_log(GPR_ERROR, "Could not create MD_CTX"); + goto end; + } + EVP_PKEY_set1_RSA(key, json_key->private_key); + if (EVP_DigestSignInit(md_ctx, NULL, md, NULL, key) != 1) { + gpr_log(GPR_ERROR, "DigestInit failed."); + goto end; + } + if (EVP_DigestSignUpdate(md_ctx, to_sign, strlen(to_sign)) != 1) { + gpr_log(GPR_ERROR, "DigestUpdate failed."); + goto end; + } + if (EVP_DigestSignFinal(md_ctx, NULL, &sig_len) != 1) { + gpr_log(GPR_ERROR, "DigestFinal (get signature length) failed."); + goto end; + } + sig = gpr_malloc(sig_len); + if (EVP_DigestSignFinal(md_ctx, sig, &sig_len) != 1) { + gpr_log(GPR_ERROR, "DigestFinal (signature compute) failed."); + goto end; + } + result = grpc_base64_encode(sig, sig_len, 1, 0); end: - if (key != NULL) - EVP_PKEY_free (key); - if (md_ctx != NULL) - EVP_MD_CTX_destroy (md_ctx); - if (sig != NULL) - gpr_free (sig); + if (key != NULL) EVP_PKEY_free(key); + if (md_ctx != NULL) EVP_MD_CTX_destroy(md_ctx); + if (sig != NULL) gpr_free(sig); return result; } -char * -grpc_jwt_encode_and_sign (const grpc_auth_json_key * json_key, const char *audience, gpr_timespec token_lifetime, const char *scope) -{ - if (g_jwt_encode_and_sign_override != NULL) - { - return g_jwt_encode_and_sign_override (json_key, audience, token_lifetime, scope); - } - else - { - const char *sig_algo = GRPC_JWT_RSA_SHA256_ALGORITHM; - char *to_sign = dot_concat_and_free_strings (encoded_jwt_header (json_key->private_key_id, sig_algo), - encoded_jwt_claim (json_key, audience, token_lifetime, scope)); - char *sig = compute_and_encode_signature (json_key, sig_algo, to_sign); - if (sig == NULL) - { - gpr_free (to_sign); - return NULL; - } - return dot_concat_and_free_strings (to_sign, sig); +char *grpc_jwt_encode_and_sign(const grpc_auth_json_key *json_key, + const char *audience, + gpr_timespec token_lifetime, const char *scope) { + if (g_jwt_encode_and_sign_override != NULL) { + return g_jwt_encode_and_sign_override(json_key, audience, token_lifetime, + scope); + } else { + const char *sig_algo = GRPC_JWT_RSA_SHA256_ALGORITHM; + char *to_sign = dot_concat_and_free_strings( + encoded_jwt_header(json_key->private_key_id, sig_algo), + encoded_jwt_claim(json_key, audience, token_lifetime, scope)); + char *sig = compute_and_encode_signature(json_key, sig_algo, to_sign); + if (sig == NULL) { + gpr_free(to_sign); + return NULL; } + return dot_concat_and_free_strings(to_sign, sig); + } } -void -grpc_jwt_encode_and_sign_set_override (grpc_jwt_encode_and_sign_override func) -{ +void grpc_jwt_encode_and_sign_set_override( + grpc_jwt_encode_and_sign_override func) { g_jwt_encode_and_sign_override = func; } /* --- grpc_auth_refresh_token --- */ -int -grpc_auth_refresh_token_is_valid (const grpc_auth_refresh_token * refresh_token) -{ - return (refresh_token != NULL) && strcmp (refresh_token->type, GRPC_AUTH_JSON_TYPE_INVALID); +int grpc_auth_refresh_token_is_valid( + const grpc_auth_refresh_token *refresh_token) { + return (refresh_token != NULL) && + strcmp(refresh_token->type, GRPC_AUTH_JSON_TYPE_INVALID); } -grpc_auth_refresh_token -grpc_auth_refresh_token_create_from_json (const grpc_json * json) -{ +grpc_auth_refresh_token grpc_auth_refresh_token_create_from_json( + const grpc_json *json) { grpc_auth_refresh_token result; const char *prop_value; int success = 0; - memset (&result, 0, sizeof (grpc_auth_refresh_token)); + memset(&result, 0, sizeof(grpc_auth_refresh_token)); result.type = GRPC_AUTH_JSON_TYPE_INVALID; - if (json == NULL) - { - gpr_log (GPR_ERROR, "Invalid json."); - goto end; - } - - prop_value = json_get_string_property (json, "type"); - if (prop_value == NULL || strcmp (prop_value, GRPC_AUTH_JSON_TYPE_AUTHORIZED_USER)) - { - goto end; - } + if (json == NULL) { + gpr_log(GPR_ERROR, "Invalid json."); + goto end; + } + + prop_value = json_get_string_property(json, "type"); + if (prop_value == NULL || + strcmp(prop_value, GRPC_AUTH_JSON_TYPE_AUTHORIZED_USER)) { + goto end; + } result.type = GRPC_AUTH_JSON_TYPE_AUTHORIZED_USER; - if (!set_json_key_string_property (json, "client_secret", &result.client_secret) || !set_json_key_string_property (json, "client_id", &result.client_id) || !set_json_key_string_property (json, "refresh_token", &result.refresh_token)) - { - goto end; - } + if (!set_json_key_string_property(json, "client_secret", + &result.client_secret) || + !set_json_key_string_property(json, "client_id", &result.client_id) || + !set_json_key_string_property(json, "refresh_token", + &result.refresh_token)) { + goto end; + } success = 1; end: - if (!success) - grpc_auth_refresh_token_destruct (&result); + if (!success) grpc_auth_refresh_token_destruct(&result); return result; } -grpc_auth_refresh_token -grpc_auth_refresh_token_create_from_string (const char *json_string) -{ - char *scratchpad = gpr_strdup (json_string); - grpc_json *json = grpc_json_parse_string (scratchpad); - grpc_auth_refresh_token result = grpc_auth_refresh_token_create_from_json (json); - if (json != NULL) - grpc_json_destroy (json); - gpr_free (scratchpad); +grpc_auth_refresh_token grpc_auth_refresh_token_create_from_string( + const char *json_string) { + char *scratchpad = gpr_strdup(json_string); + grpc_json *json = grpc_json_parse_string(scratchpad); + grpc_auth_refresh_token result = + grpc_auth_refresh_token_create_from_json(json); + if (json != NULL) grpc_json_destroy(json); + gpr_free(scratchpad); return result; } -void -grpc_auth_refresh_token_destruct (grpc_auth_refresh_token * refresh_token) -{ - if (refresh_token == NULL) - return; +void grpc_auth_refresh_token_destruct(grpc_auth_refresh_token *refresh_token) { + if (refresh_token == NULL) return; refresh_token->type = GRPC_AUTH_JSON_TYPE_INVALID; - if (refresh_token->client_id != NULL) - { - gpr_free (refresh_token->client_id); - refresh_token->client_id = NULL; - } - if (refresh_token->client_secret != NULL) - { - gpr_free (refresh_token->client_secret); - refresh_token->client_secret = NULL; - } - if (refresh_token->refresh_token != NULL) - { - gpr_free (refresh_token->refresh_token); - refresh_token->refresh_token = NULL; - } + if (refresh_token->client_id != NULL) { + gpr_free(refresh_token->client_id); + refresh_token->client_id = NULL; + } + if (refresh_token->client_secret != NULL) { + gpr_free(refresh_token->client_secret); + refresh_token->client_secret = NULL; + } + if (refresh_token->refresh_token != NULL) { + gpr_free(refresh_token->refresh_token); + refresh_token->refresh_token = NULL; + } } diff --git a/src/core/security/json_token.h b/src/core/security/json_token.h index 1955bd5b895..7e06864ff3a 100644 --- a/src/core/security/json_token.h +++ b/src/core/security/json_token.h @@ -49,8 +49,7 @@ /* --- auth_json_key parsing. --- */ -typedef struct -{ +typedef struct { const char *type; char *private_key_id; char *client_id; @@ -59,35 +58,40 @@ typedef struct } grpc_auth_json_key; /* Returns 1 if the object is valid, 0 otherwise. */ -int grpc_auth_json_key_is_valid (const grpc_auth_json_key * json_key); +int grpc_auth_json_key_is_valid(const grpc_auth_json_key *json_key); /* Creates a json_key object from string. Returns an invalid object if a parsing error has been encountered. */ -grpc_auth_json_key grpc_auth_json_key_create_from_string (const char *json_string); +grpc_auth_json_key grpc_auth_json_key_create_from_string( + const char *json_string); /* Creates a json_key object from parsed json. Returns an invalid object if a parsing error has been encountered. */ -grpc_auth_json_key grpc_auth_json_key_create_from_json (const grpc_json * json); +grpc_auth_json_key grpc_auth_json_key_create_from_json(const grpc_json *json); /* Destructs the object. */ -void grpc_auth_json_key_destruct (grpc_auth_json_key * json_key); +void grpc_auth_json_key_destruct(grpc_auth_json_key *json_key); /* --- json token encoding and signing. --- */ /* Caller is responsible for calling gpr_free on the returned value. May return NULL on invalid input. The scope parameter may be NULL. */ -char *grpc_jwt_encode_and_sign (const grpc_auth_json_key * json_key, const char *audience, gpr_timespec token_lifetime, const char *scope); +char *grpc_jwt_encode_and_sign(const grpc_auth_json_key *json_key, + const char *audience, + gpr_timespec token_lifetime, const char *scope); /* Override encode_and_sign function for testing. */ -typedef char *(*grpc_jwt_encode_and_sign_override) (const grpc_auth_json_key * json_key, const char *audience, gpr_timespec token_lifetime, const char *scope); +typedef char *(*grpc_jwt_encode_and_sign_override)( + const grpc_auth_json_key *json_key, const char *audience, + gpr_timespec token_lifetime, const char *scope); /* Set a custom encode_and_sign override for testing. */ -void grpc_jwt_encode_and_sign_set_override (grpc_jwt_encode_and_sign_override func); +void grpc_jwt_encode_and_sign_set_override( + grpc_jwt_encode_and_sign_override func); /* --- auth_refresh_token parsing. --- */ -typedef struct -{ +typedef struct { const char *type; char *client_id; char *client_secret; @@ -95,17 +99,20 @@ typedef struct } grpc_auth_refresh_token; /* Returns 1 if the object is valid, 0 otherwise. */ -int grpc_auth_refresh_token_is_valid (const grpc_auth_refresh_token * refresh_token); +int grpc_auth_refresh_token_is_valid( + const grpc_auth_refresh_token *refresh_token); /* Creates a refresh token object from string. Returns an invalid object if a parsing error has been encountered. */ -grpc_auth_refresh_token grpc_auth_refresh_token_create_from_string (const char *json_string); +grpc_auth_refresh_token grpc_auth_refresh_token_create_from_string( + const char *json_string); /* Creates a refresh token object from parsed json. Returns an invalid object if a parsing error has been encountered. */ -grpc_auth_refresh_token grpc_auth_refresh_token_create_from_json (const grpc_json * json); +grpc_auth_refresh_token grpc_auth_refresh_token_create_from_json( + const grpc_json *json); /* Destructs the object. */ -void grpc_auth_refresh_token_destruct (grpc_auth_refresh_token * refresh_token); +void grpc_auth_refresh_token_destruct(grpc_auth_refresh_token *refresh_token); #endif /* GRPC_INTERNAL_CORE_SECURITY_JSON_TOKEN_H */ diff --git a/src/core/security/jwt_verifier.c b/src/core/security/jwt_verifier.c index bc1e3f3b547..9de8482025d 100644 --- a/src/core/security/jwt_verifier.c +++ b/src/core/security/jwt_verifier.c @@ -47,11 +47,9 @@ /* --- Utils. --- */ -const char * -grpc_jwt_verifier_status_to_string (grpc_jwt_verifier_status status) -{ - switch (status) - { +const char *grpc_jwt_verifier_status_to_string( + grpc_jwt_verifier_status status) { + switch (status) { case GRPC_JWT_VERIFIER_OK: return "OK"; case GRPC_JWT_VERIFIER_BAD_SIGNATURE: @@ -68,78 +66,62 @@ grpc_jwt_verifier_status_to_string (grpc_jwt_verifier_status status) return "GENERIC_ERROR"; default: return "UNKNOWN"; - } + } } -static const EVP_MD * -evp_md_from_alg (const char *alg) -{ - if (strcmp (alg, "RS256") == 0) - { - return EVP_sha256 (); - } - else if (strcmp (alg, "RS384") == 0) - { - return EVP_sha384 (); - } - else if (strcmp (alg, "RS512") == 0) - { - return EVP_sha512 (); - } - else - { - return NULL; - } +static const EVP_MD *evp_md_from_alg(const char *alg) { + if (strcmp(alg, "RS256") == 0) { + return EVP_sha256(); + } else if (strcmp(alg, "RS384") == 0) { + return EVP_sha384(); + } else if (strcmp(alg, "RS512") == 0) { + return EVP_sha512(); + } else { + return NULL; + } } -static grpc_json * -parse_json_part_from_jwt (const char *str, size_t len, gpr_slice * buffer) -{ +static grpc_json *parse_json_part_from_jwt(const char *str, size_t len, + gpr_slice *buffer) { grpc_json *json; - *buffer = grpc_base64_decode_with_len (str, len, 1); - if (GPR_SLICE_IS_EMPTY (*buffer)) - { - gpr_log (GPR_ERROR, "Invalid base64."); - return NULL; - } - json = grpc_json_parse_string_with_len ((char *) GPR_SLICE_START_PTR (*buffer), GPR_SLICE_LENGTH (*buffer)); - if (json == NULL) - { - gpr_slice_unref (*buffer); - gpr_log (GPR_ERROR, "JSON parsing error."); - } + *buffer = grpc_base64_decode_with_len(str, len, 1); + if (GPR_SLICE_IS_EMPTY(*buffer)) { + gpr_log(GPR_ERROR, "Invalid base64."); + return NULL; + } + json = grpc_json_parse_string_with_len((char *)GPR_SLICE_START_PTR(*buffer), + GPR_SLICE_LENGTH(*buffer)); + if (json == NULL) { + gpr_slice_unref(*buffer); + gpr_log(GPR_ERROR, "JSON parsing error."); + } return json; } -static const char * -validate_string_field (const grpc_json * json, const char *key) -{ - if (json->type != GRPC_JSON_STRING) - { - gpr_log (GPR_ERROR, "Invalid %s field [%s]", key, json->value); - return NULL; - } +static const char *validate_string_field(const grpc_json *json, + const char *key) { + if (json->type != GRPC_JSON_STRING) { + gpr_log(GPR_ERROR, "Invalid %s field [%s]", key, json->value); + return NULL; + } return json->value; } -static gpr_timespec -validate_time_field (const grpc_json * json, const char *key) -{ - gpr_timespec result = gpr_time_0 (GPR_CLOCK_REALTIME); - if (json->type != GRPC_JSON_NUMBER) - { - gpr_log (GPR_ERROR, "Invalid %s field [%s]", key, json->value); - return result; - } - result.tv_sec = strtol (json->value, NULL, 10); +static gpr_timespec validate_time_field(const grpc_json *json, + const char *key) { + gpr_timespec result = gpr_time_0(GPR_CLOCK_REALTIME); + if (json->type != GRPC_JSON_NUMBER) { + gpr_log(GPR_ERROR, "Invalid %s field [%s]", key, json->value); + return result; + } + result.tv_sec = strtol(json->value, NULL, 10); return result; } /* --- JOSE header. see http://tools.ietf.org/html/rfc7515#section-4 --- */ -typedef struct -{ +typedef struct { const char *alg; const char *kid; const char *typ; @@ -147,68 +129,54 @@ typedef struct gpr_slice buffer; } jose_header; -static void -jose_header_destroy (jose_header * h) -{ - gpr_slice_unref (h->buffer); - gpr_free (h); +static void jose_header_destroy(jose_header *h) { + gpr_slice_unref(h->buffer); + gpr_free(h); } /* Takes ownership of json and buffer. */ -static jose_header * -jose_header_from_json (grpc_json * json, gpr_slice buffer) -{ +static jose_header *jose_header_from_json(grpc_json *json, gpr_slice buffer) { grpc_json *cur; - jose_header *h = gpr_malloc (sizeof (jose_header)); - memset (h, 0, sizeof (jose_header)); + jose_header *h = gpr_malloc(sizeof(jose_header)); + memset(h, 0, sizeof(jose_header)); h->buffer = buffer; - for (cur = json->child; cur != NULL; cur = cur->next) - { - if (strcmp (cur->key, "alg") == 0) - { - /* We only support RSA-1.5 signatures for now. - Beware of this if we add HMAC support: - https://auth0.com/blog/2015/03/31/critical-vulnerabilities-in-json-web-token-libraries/ - */ - if (cur->type != GRPC_JSON_STRING || strncmp (cur->value, "RS", 2) || evp_md_from_alg (cur->value) == NULL) - { - gpr_log (GPR_ERROR, "Invalid alg field [%s]", cur->value); - goto error; - } - h->alg = cur->value; - } - else if (strcmp (cur->key, "typ") == 0) - { - h->typ = validate_string_field (cur, "typ"); - if (h->typ == NULL) - goto error; - } - else if (strcmp (cur->key, "kid") == 0) - { - h->kid = validate_string_field (cur, "kid"); - if (h->kid == NULL) - goto error; - } - } - if (h->alg == NULL) - { - gpr_log (GPR_ERROR, "Missing alg field."); - goto error; - } - grpc_json_destroy (json); + for (cur = json->child; cur != NULL; cur = cur->next) { + if (strcmp(cur->key, "alg") == 0) { + /* We only support RSA-1.5 signatures for now. + Beware of this if we add HMAC support: + https://auth0.com/blog/2015/03/31/critical-vulnerabilities-in-json-web-token-libraries/ + */ + if (cur->type != GRPC_JSON_STRING || strncmp(cur->value, "RS", 2) || + evp_md_from_alg(cur->value) == NULL) { + gpr_log(GPR_ERROR, "Invalid alg field [%s]", cur->value); + goto error; + } + h->alg = cur->value; + } else if (strcmp(cur->key, "typ") == 0) { + h->typ = validate_string_field(cur, "typ"); + if (h->typ == NULL) goto error; + } else if (strcmp(cur->key, "kid") == 0) { + h->kid = validate_string_field(cur, "kid"); + if (h->kid == NULL) goto error; + } + } + if (h->alg == NULL) { + gpr_log(GPR_ERROR, "Missing alg field."); + goto error; + } + grpc_json_destroy(json); h->buffer = buffer; return h; error: - grpc_json_destroy (json); - jose_header_destroy (h); + grpc_json_destroy(json); + jose_header_destroy(h); return NULL; } /* --- JWT claims. see http://tools.ietf.org/html/rfc7519#section-4.1 */ -struct grpc_jwt_claims -{ +struct grpc_jwt_claims { /* Well known properties already parsed. */ const char *sub; const char *iss; @@ -222,185 +190,135 @@ struct grpc_jwt_claims gpr_slice buffer; }; -void -grpc_jwt_claims_destroy (grpc_jwt_claims * claims) -{ - grpc_json_destroy (claims->json); - gpr_slice_unref (claims->buffer); - gpr_free (claims); +void grpc_jwt_claims_destroy(grpc_jwt_claims *claims) { + grpc_json_destroy(claims->json); + gpr_slice_unref(claims->buffer); + gpr_free(claims); } -const grpc_json * -grpc_jwt_claims_json (const grpc_jwt_claims * claims) -{ - if (claims == NULL) - return NULL; +const grpc_json *grpc_jwt_claims_json(const grpc_jwt_claims *claims) { + if (claims == NULL) return NULL; return claims->json; } -const char * -grpc_jwt_claims_subject (const grpc_jwt_claims * claims) -{ - if (claims == NULL) - return NULL; +const char *grpc_jwt_claims_subject(const grpc_jwt_claims *claims) { + if (claims == NULL) return NULL; return claims->sub; } -const char * -grpc_jwt_claims_issuer (const grpc_jwt_claims * claims) -{ - if (claims == NULL) - return NULL; +const char *grpc_jwt_claims_issuer(const grpc_jwt_claims *claims) { + if (claims == NULL) return NULL; return claims->iss; } -const char * -grpc_jwt_claims_id (const grpc_jwt_claims * claims) -{ - if (claims == NULL) - return NULL; +const char *grpc_jwt_claims_id(const grpc_jwt_claims *claims) { + if (claims == NULL) return NULL; return claims->jti; } -const char * -grpc_jwt_claims_audience (const grpc_jwt_claims * claims) -{ - if (claims == NULL) - return NULL; +const char *grpc_jwt_claims_audience(const grpc_jwt_claims *claims) { + if (claims == NULL) return NULL; return claims->aud; } -gpr_timespec -grpc_jwt_claims_issued_at (const grpc_jwt_claims * claims) -{ - if (claims == NULL) - return gpr_inf_past (GPR_CLOCK_REALTIME); +gpr_timespec grpc_jwt_claims_issued_at(const grpc_jwt_claims *claims) { + if (claims == NULL) return gpr_inf_past(GPR_CLOCK_REALTIME); return claims->iat; } -gpr_timespec -grpc_jwt_claims_expires_at (const grpc_jwt_claims * claims) -{ - if (claims == NULL) - return gpr_inf_future (GPR_CLOCK_REALTIME); +gpr_timespec grpc_jwt_claims_expires_at(const grpc_jwt_claims *claims) { + if (claims == NULL) return gpr_inf_future(GPR_CLOCK_REALTIME); return claims->exp; } -gpr_timespec -grpc_jwt_claims_not_before (const grpc_jwt_claims * claims) -{ - if (claims == NULL) - return gpr_inf_past (GPR_CLOCK_REALTIME); +gpr_timespec grpc_jwt_claims_not_before(const grpc_jwt_claims *claims) { + if (claims == NULL) return gpr_inf_past(GPR_CLOCK_REALTIME); return claims->nbf; } /* Takes ownership of json and buffer even in case of failure. */ -grpc_jwt_claims * -grpc_jwt_claims_from_json (grpc_json * json, gpr_slice buffer) -{ +grpc_jwt_claims *grpc_jwt_claims_from_json(grpc_json *json, gpr_slice buffer) { grpc_json *cur; - grpc_jwt_claims *claims = gpr_malloc (sizeof (grpc_jwt_claims)); - memset (claims, 0, sizeof (grpc_jwt_claims)); + grpc_jwt_claims *claims = gpr_malloc(sizeof(grpc_jwt_claims)); + memset(claims, 0, sizeof(grpc_jwt_claims)); claims->json = json; claims->buffer = buffer; - claims->iat = gpr_inf_past (GPR_CLOCK_REALTIME); - claims->nbf = gpr_inf_past (GPR_CLOCK_REALTIME); - claims->exp = gpr_inf_future (GPR_CLOCK_REALTIME); + claims->iat = gpr_inf_past(GPR_CLOCK_REALTIME); + claims->nbf = gpr_inf_past(GPR_CLOCK_REALTIME); + claims->exp = gpr_inf_future(GPR_CLOCK_REALTIME); /* Per the spec, all fields are optional. */ - for (cur = json->child; cur != NULL; cur = cur->next) - { - if (strcmp (cur->key, "sub") == 0) - { - claims->sub = validate_string_field (cur, "sub"); - if (claims->sub == NULL) - goto error; - } - else if (strcmp (cur->key, "iss") == 0) - { - claims->iss = validate_string_field (cur, "iss"); - if (claims->iss == NULL) - goto error; - } - else if (strcmp (cur->key, "aud") == 0) - { - claims->aud = validate_string_field (cur, "aud"); - if (claims->aud == NULL) - goto error; - } - else if (strcmp (cur->key, "jti") == 0) - { - claims->jti = validate_string_field (cur, "jti"); - if (claims->jti == NULL) - goto error; - } - else if (strcmp (cur->key, "iat") == 0) - { - claims->iat = validate_time_field (cur, "iat"); - if (gpr_time_cmp (claims->iat, gpr_time_0 (GPR_CLOCK_REALTIME)) == 0) - goto error; - } - else if (strcmp (cur->key, "exp") == 0) - { - claims->exp = validate_time_field (cur, "exp"); - if (gpr_time_cmp (claims->exp, gpr_time_0 (GPR_CLOCK_REALTIME)) == 0) - goto error; - } - else if (strcmp (cur->key, "nbf") == 0) - { - claims->nbf = validate_time_field (cur, "nbf"); - if (gpr_time_cmp (claims->nbf, gpr_time_0 (GPR_CLOCK_REALTIME)) == 0) - goto error; - } - } + for (cur = json->child; cur != NULL; cur = cur->next) { + if (strcmp(cur->key, "sub") == 0) { + claims->sub = validate_string_field(cur, "sub"); + if (claims->sub == NULL) goto error; + } else if (strcmp(cur->key, "iss") == 0) { + claims->iss = validate_string_field(cur, "iss"); + if (claims->iss == NULL) goto error; + } else if (strcmp(cur->key, "aud") == 0) { + claims->aud = validate_string_field(cur, "aud"); + if (claims->aud == NULL) goto error; + } else if (strcmp(cur->key, "jti") == 0) { + claims->jti = validate_string_field(cur, "jti"); + if (claims->jti == NULL) goto error; + } else if (strcmp(cur->key, "iat") == 0) { + claims->iat = validate_time_field(cur, "iat"); + if (gpr_time_cmp(claims->iat, gpr_time_0(GPR_CLOCK_REALTIME)) == 0) + goto error; + } else if (strcmp(cur->key, "exp") == 0) { + claims->exp = validate_time_field(cur, "exp"); + if (gpr_time_cmp(claims->exp, gpr_time_0(GPR_CLOCK_REALTIME)) == 0) + goto error; + } else if (strcmp(cur->key, "nbf") == 0) { + claims->nbf = validate_time_field(cur, "nbf"); + if (gpr_time_cmp(claims->nbf, gpr_time_0(GPR_CLOCK_REALTIME)) == 0) + goto error; + } + } return claims; error: - grpc_jwt_claims_destroy (claims); + grpc_jwt_claims_destroy(claims); return NULL; } -grpc_jwt_verifier_status -grpc_jwt_claims_check (const grpc_jwt_claims * claims, const char *audience) -{ +grpc_jwt_verifier_status grpc_jwt_claims_check(const grpc_jwt_claims *claims, + const char *audience) { gpr_timespec skewed_now; int audience_ok; - GPR_ASSERT (claims != NULL); - - skewed_now = gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), grpc_jwt_verifier_clock_skew); - if (gpr_time_cmp (skewed_now, claims->nbf) < 0) - { - gpr_log (GPR_ERROR, "JWT is not valid yet."); - return GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE; - } - skewed_now = gpr_time_sub (gpr_now (GPR_CLOCK_REALTIME), grpc_jwt_verifier_clock_skew); - if (gpr_time_cmp (skewed_now, claims->exp) > 0) - { - gpr_log (GPR_ERROR, "JWT is expired."); - return GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE; - } - - if (audience == NULL) - { - audience_ok = claims->aud == NULL; - } - else - { - audience_ok = claims->aud != NULL && strcmp (audience, claims->aud) == 0; - } - if (!audience_ok) - { - gpr_log (GPR_ERROR, "Audience mismatch: expected %s and found %s.", audience == NULL ? "NULL" : audience, claims->aud == NULL ? "NULL" : claims->aud); - return GRPC_JWT_VERIFIER_BAD_AUDIENCE; - } + GPR_ASSERT(claims != NULL); + + skewed_now = + gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), grpc_jwt_verifier_clock_skew); + if (gpr_time_cmp(skewed_now, claims->nbf) < 0) { + gpr_log(GPR_ERROR, "JWT is not valid yet."); + return GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE; + } + skewed_now = + gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), grpc_jwt_verifier_clock_skew); + if (gpr_time_cmp(skewed_now, claims->exp) > 0) { + gpr_log(GPR_ERROR, "JWT is expired."); + return GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE; + } + + if (audience == NULL) { + audience_ok = claims->aud == NULL; + } else { + audience_ok = claims->aud != NULL && strcmp(audience, claims->aud) == 0; + } + if (!audience_ok) { + gpr_log(GPR_ERROR, "Audience mismatch: expected %s and found %s.", + audience == NULL ? "NULL" : audience, + claims->aud == NULL ? "NULL" : claims->aud); + return GRPC_JWT_VERIFIER_BAD_AUDIENCE; + } return GRPC_JWT_VERIFIER_OK; } /* --- verifier_cb_ctx object. --- */ -typedef struct -{ +typedef struct { grpc_jwt_verifier *verifier; grpc_pollset *pollset; jose_header *header; @@ -413,436 +331,377 @@ typedef struct } verifier_cb_ctx; /* Takes ownership of the header, claims and signature. */ -static verifier_cb_ctx * -verifier_cb_ctx_create (grpc_jwt_verifier * verifier, grpc_pollset * pollset, jose_header * header, grpc_jwt_claims * claims, const char *audience, gpr_slice signature, const char *signed_jwt, size_t signed_jwt_len, void *user_data, grpc_jwt_verification_done_cb cb) -{ - verifier_cb_ctx *ctx = gpr_malloc (sizeof (verifier_cb_ctx)); - memset (ctx, 0, sizeof (verifier_cb_ctx)); +static verifier_cb_ctx *verifier_cb_ctx_create( + grpc_jwt_verifier *verifier, grpc_pollset *pollset, jose_header *header, + grpc_jwt_claims *claims, const char *audience, gpr_slice signature, + const char *signed_jwt, size_t signed_jwt_len, void *user_data, + grpc_jwt_verification_done_cb cb) { + verifier_cb_ctx *ctx = gpr_malloc(sizeof(verifier_cb_ctx)); + memset(ctx, 0, sizeof(verifier_cb_ctx)); ctx->verifier = verifier; ctx->pollset = pollset; ctx->header = header; - ctx->audience = gpr_strdup (audience); + ctx->audience = gpr_strdup(audience); ctx->claims = claims; ctx->signature = signature; - ctx->signed_data = gpr_slice_from_copied_buffer (signed_jwt, signed_jwt_len); + ctx->signed_data = gpr_slice_from_copied_buffer(signed_jwt, signed_jwt_len); ctx->user_data = user_data; ctx->user_cb = cb; return 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 (ctx->claims); - gpr_slice_unref (ctx->signature); - gpr_slice_unref (ctx->signed_data); - jose_header_destroy (ctx->header); +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(ctx->claims); + gpr_slice_unref(ctx->signature); + gpr_slice_unref(ctx->signed_data); + jose_header_destroy(ctx->header); /* TODO: see what to do with claims... */ - gpr_free (ctx); + gpr_free(ctx); } /* --- grpc_jwt_verifier object. --- */ /* Clock skew defaults to one minute. */ -gpr_timespec grpc_jwt_verifier_clock_skew = { 60, 0, GPR_TIMESPAN }; +gpr_timespec grpc_jwt_verifier_clock_skew = {60, 0, GPR_TIMESPAN}; /* Max delay defaults to one minute. */ -gpr_timespec grpc_jwt_verifier_max_delay = { 60, 0, GPR_TIMESPAN }; +gpr_timespec grpc_jwt_verifier_max_delay = {60, 0, GPR_TIMESPAN}; -typedef struct -{ +typedef struct { char *email_domain; char *key_url_prefix; } email_key_mapping; -struct grpc_jwt_verifier -{ +struct grpc_jwt_verifier { email_key_mapping *mappings; - size_t num_mappings; /* Should be very few, linear search ok. */ + size_t num_mappings; /* Should be very few, linear search ok. */ size_t allocated_mappings; grpc_httpcli_context http_ctx; }; -static grpc_json * -json_from_http (const grpc_httpcli_response * response) -{ +static grpc_json *json_from_http(const grpc_httpcli_response *response) { grpc_json *json = NULL; - if (response == NULL) - { - gpr_log (GPR_ERROR, "HTTP response is NULL."); - return NULL; - } - if (response->status != 200) - { - gpr_log (GPR_ERROR, "Call to http server failed with error %d.", response->status); - return NULL; - } + if (response == NULL) { + gpr_log(GPR_ERROR, "HTTP response is NULL."); + return NULL; + } + if (response->status != 200) { + gpr_log(GPR_ERROR, "Call to http server failed with error %d.", + response->status); + return NULL; + } - json = grpc_json_parse_string_with_len (response->body, response->body_length); - if (json == NULL) - { - gpr_log (GPR_ERROR, "Invalid JSON found in response."); - } + json = grpc_json_parse_string_with_len(response->body, response->body_length); + if (json == NULL) { + gpr_log(GPR_ERROR, "Invalid JSON found in response."); + } return json; } -static const grpc_json * -find_property_by_name (const grpc_json * json, const char *name) -{ +static const grpc_json *find_property_by_name(const grpc_json *json, + const char *name) { const grpc_json *cur; - for (cur = json->child; cur != NULL; cur = cur->next) - { - if (strcmp (cur->key, name) == 0) - return cur; - } + for (cur = json->child; cur != NULL; cur = cur->next) { + if (strcmp(cur->key, name) == 0) return cur; + } return NULL; } -static EVP_PKEY * -extract_pkey_from_x509 (const char *x509_str) -{ +static EVP_PKEY *extract_pkey_from_x509(const char *x509_str) { X509 *x509 = NULL; EVP_PKEY *result = NULL; - BIO *bio = BIO_new (BIO_s_mem ()); - size_t len = strlen (x509_str); - GPR_ASSERT (len < INT_MAX); - BIO_write (bio, x509_str, (int) len); - x509 = PEM_read_bio_X509 (bio, NULL, NULL, NULL); - if (x509 == NULL) - { - gpr_log (GPR_ERROR, "Unable to parse x509 cert."); - goto end; - } - result = X509_get_pubkey (x509); - if (result == NULL) - { - gpr_log (GPR_ERROR, "Cannot find public key in X509 cert."); - } + BIO *bio = BIO_new(BIO_s_mem()); + size_t len = strlen(x509_str); + GPR_ASSERT(len < INT_MAX); + BIO_write(bio, x509_str, (int)len); + x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL); + if (x509 == NULL) { + gpr_log(GPR_ERROR, "Unable to parse x509 cert."); + goto end; + } + result = X509_get_pubkey(x509); + if (result == NULL) { + gpr_log(GPR_ERROR, "Cannot find public key in X509 cert."); + } end: - BIO_free (bio); - if (x509 != NULL) - X509_free (x509); + BIO_free(bio); + if (x509 != NULL) X509_free(x509); return result; } -static BIGNUM * -bignum_from_base64 (const char *b64) -{ +static BIGNUM *bignum_from_base64(const char *b64) { BIGNUM *result = NULL; gpr_slice bin; - if (b64 == NULL) + if (b64 == NULL) return NULL; + bin = grpc_base64_decode(b64, 1); + if (GPR_SLICE_IS_EMPTY(bin)) { + gpr_log(GPR_ERROR, "Invalid base64 for big num."); return NULL; - bin = grpc_base64_decode (b64, 1); - if (GPR_SLICE_IS_EMPTY (bin)) - { - gpr_log (GPR_ERROR, "Invalid base64 for big num."); - return NULL; - } - result = BN_bin2bn (GPR_SLICE_START_PTR (bin), (int) GPR_SLICE_LENGTH (bin), NULL); - gpr_slice_unref (bin); + } + result = + BN_bin2bn(GPR_SLICE_START_PTR(bin), (int)GPR_SLICE_LENGTH(bin), NULL); + gpr_slice_unref(bin); return result; } -static EVP_PKEY * -pkey_from_jwk (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; - GPR_ASSERT (kty != NULL && json != NULL); - if (strcmp (kty, "RSA") != 0) - { - gpr_log (GPR_ERROR, "Unsupported key type %s.", kty); - goto end; - } - rsa = RSA_new (); - if (rsa == NULL) - { - gpr_log (GPR_ERROR, "Could not create rsa key."); - goto end; - } - for (key_prop = json->child; key_prop != NULL; key_prop = key_prop->next) - { - if (strcmp (key_prop->key, "n") == 0) - { - rsa->n = bignum_from_base64 (validate_string_field (key_prop, "n")); - if (rsa->n == NULL) - goto end; - } - else if (strcmp (key_prop->key, "e") == 0) - { - rsa->e = bignum_from_base64 (validate_string_field (key_prop, "e")); - if (rsa->e == NULL) - goto end; - } - } - if (rsa->e == NULL || rsa->n == NULL) - { - gpr_log (GPR_ERROR, "Missing RSA public key field."); - goto end; - } - result = EVP_PKEY_new (); - EVP_PKEY_set1_RSA (result, rsa); /* uprefs rsa. */ + GPR_ASSERT(kty != NULL && json != NULL); + if (strcmp(kty, "RSA") != 0) { + gpr_log(GPR_ERROR, "Unsupported key type %s.", kty); + goto end; + } + rsa = RSA_new(); + if (rsa == NULL) { + gpr_log(GPR_ERROR, "Could not create rsa key."); + goto end; + } + for (key_prop = json->child; key_prop != NULL; key_prop = key_prop->next) { + if (strcmp(key_prop->key, "n") == 0) { + rsa->n = bignum_from_base64(validate_string_field(key_prop, "n")); + if (rsa->n == NULL) goto end; + } else if (strcmp(key_prop->key, "e") == 0) { + rsa->e = bignum_from_base64(validate_string_field(key_prop, "e")); + if (rsa->e == NULL) goto end; + } + } + if (rsa->e == NULL || rsa->n == NULL) { + gpr_log(GPR_ERROR, "Missing RSA public key field."); + goto end; + } + result = EVP_PKEY_new(); + EVP_PKEY_set1_RSA(result, rsa); /* uprefs rsa. */ end: - if (rsa != NULL) - RSA_free (rsa); + if (rsa != NULL) RSA_free(rsa); return result; } -static EVP_PKEY * -find_verification_key (const grpc_json * json, const char *header_alg, const char *header_kid) -{ +static EVP_PKEY *find_verification_key(const grpc_json *json, + const char *header_alg, + const char *header_kid) { const grpc_json *jkey; const grpc_json *jwk_keys; /* Try to parse the json as a JWK set: https://tools.ietf.org/html/rfc7517#section-5. */ - jwk_keys = find_property_by_name (json, "keys"); - if (jwk_keys == NULL) - { - /* Use the google proprietary format which is: - { : , : , ... } */ - const grpc_json *cur = find_property_by_name (json, header_kid); - if (cur == NULL) - return NULL; - return extract_pkey_from_x509 (cur->value); - } - - if (jwk_keys->type != GRPC_JSON_ARRAY) - { - gpr_log (GPR_ERROR, "Unexpected value type of keys property in jwks key set."); - return NULL; - } + jwk_keys = find_property_by_name(json, "keys"); + if (jwk_keys == NULL) { + /* Use the google proprietary format which is: + { : , : , ... } */ + const grpc_json *cur = find_property_by_name(json, header_kid); + if (cur == NULL) return NULL; + return extract_pkey_from_x509(cur->value); + } + + if (jwk_keys->type != GRPC_JSON_ARRAY) { + gpr_log(GPR_ERROR, + "Unexpected value type of keys property in jwks key set."); + return NULL; + } /* Key format is specified in: https://tools.ietf.org/html/rfc7518#section-6. */ - for (jkey = jwk_keys->child; jkey != NULL; jkey = jkey->next) - { - grpc_json *key_prop; - const char *alg = NULL; - const char *kid = NULL; - const char *kty = NULL; - - if (jkey->type != GRPC_JSON_OBJECT) - continue; - for (key_prop = jkey->child; key_prop != NULL; key_prop = key_prop->next) - { - if (strcmp (key_prop->key, "alg") == 0 && key_prop->type == GRPC_JSON_STRING) - { - alg = key_prop->value; - } - else if (strcmp (key_prop->key, "kid") == 0 && key_prop->type == GRPC_JSON_STRING) - { - kid = key_prop->value; - } - else if (strcmp (key_prop->key, "kty") == 0 && key_prop->type == GRPC_JSON_STRING) - { - kty = key_prop->value; - } - } - if (alg != NULL && kid != NULL && kty != NULL && strcmp (kid, header_kid) == 0 && strcmp (alg, header_alg) == 0) - { - return pkey_from_jwk (jkey, kty); - } - } - gpr_log (GPR_ERROR, "Could not find matching key in key set for kid=%s and alg=%s", header_kid, header_alg); + for (jkey = jwk_keys->child; jkey != NULL; jkey = jkey->next) { + grpc_json *key_prop; + const char *alg = NULL; + const char *kid = NULL; + const char *kty = NULL; + + if (jkey->type != GRPC_JSON_OBJECT) continue; + for (key_prop = jkey->child; key_prop != NULL; key_prop = key_prop->next) { + if (strcmp(key_prop->key, "alg") == 0 && + key_prop->type == GRPC_JSON_STRING) { + alg = key_prop->value; + } else if (strcmp(key_prop->key, "kid") == 0 && + key_prop->type == GRPC_JSON_STRING) { + kid = key_prop->value; + } else if (strcmp(key_prop->key, "kty") == 0 && + key_prop->type == GRPC_JSON_STRING) { + kty = key_prop->value; + } + } + if (alg != NULL && kid != NULL && kty != NULL && + strcmp(kid, header_kid) == 0 && strcmp(alg, header_alg) == 0) { + return pkey_from_jwk(jkey, kty); + } + } + gpr_log(GPR_ERROR, + "Could not find matching key in key set for kid=%s and alg=%s", + header_kid, header_alg); return NULL; } -static int -verify_jwt_signature (EVP_PKEY * key, const char *alg, gpr_slice signature, gpr_slice signed_data) -{ - EVP_MD_CTX *md_ctx = EVP_MD_CTX_create (); - const EVP_MD *md = evp_md_from_alg (alg); +static int verify_jwt_signature(EVP_PKEY *key, const char *alg, + gpr_slice signature, gpr_slice signed_data) { + EVP_MD_CTX *md_ctx = EVP_MD_CTX_create(); + const EVP_MD *md = evp_md_from_alg(alg); int result = 0; - GPR_ASSERT (md != NULL); /* Checked before. */ - if (md_ctx == NULL) - { - gpr_log (GPR_ERROR, "Could not create EVP_MD_CTX."); - goto end; - } - if (EVP_DigestVerifyInit (md_ctx, NULL, md, NULL, key) != 1) - { - gpr_log (GPR_ERROR, "EVP_DigestVerifyInit failed."); - goto end; - } - if (EVP_DigestVerifyUpdate (md_ctx, GPR_SLICE_START_PTR (signed_data), GPR_SLICE_LENGTH (signed_data)) != 1) - { - gpr_log (GPR_ERROR, "EVP_DigestVerifyUpdate failed."); - goto end; - } - if (EVP_DigestVerifyFinal (md_ctx, GPR_SLICE_START_PTR (signature), GPR_SLICE_LENGTH (signature)) != 1) - { - gpr_log (GPR_ERROR, "JWT signature verification failed."); - goto end; - } + GPR_ASSERT(md != NULL); /* Checked before. */ + if (md_ctx == NULL) { + gpr_log(GPR_ERROR, "Could not create EVP_MD_CTX."); + goto end; + } + if (EVP_DigestVerifyInit(md_ctx, NULL, md, NULL, key) != 1) { + gpr_log(GPR_ERROR, "EVP_DigestVerifyInit failed."); + goto end; + } + if (EVP_DigestVerifyUpdate(md_ctx, GPR_SLICE_START_PTR(signed_data), + GPR_SLICE_LENGTH(signed_data)) != 1) { + gpr_log(GPR_ERROR, "EVP_DigestVerifyUpdate failed."); + goto end; + } + if (EVP_DigestVerifyFinal(md_ctx, GPR_SLICE_START_PTR(signature), + GPR_SLICE_LENGTH(signature)) != 1) { + gpr_log(GPR_ERROR, "JWT signature verification failed."); + goto end; + } result = 1; end: - if (md_ctx != NULL) - EVP_MD_CTX_destroy (md_ctx); + if (md_ctx != NULL) EVP_MD_CTX_destroy(md_ctx); return result; } -static void -on_keys_retrieved (grpc_exec_ctx * exec_ctx, void *user_data, const grpc_httpcli_response * response) -{ - grpc_json *json = json_from_http (response); - verifier_cb_ctx *ctx = (verifier_cb_ctx *) user_data; +static void on_keys_retrieved(grpc_exec_ctx *exec_ctx, void *user_data, + const grpc_httpcli_response *response) { + grpc_json *json = json_from_http(response); + verifier_cb_ctx *ctx = (verifier_cb_ctx *)user_data; EVP_PKEY *verification_key = NULL; grpc_jwt_verifier_status status = GRPC_JWT_VERIFIER_GENERIC_ERROR; grpc_jwt_claims *claims = NULL; - if (json == NULL) - { - status = GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR; - goto end; - } - verification_key = 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); - status = GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR; - goto end; - } - - if (!verify_jwt_signature (verification_key, ctx->header->alg, ctx->signature, ctx->signed_data)) - { - status = GRPC_JWT_VERIFIER_BAD_SIGNATURE; - goto end; - } - - status = grpc_jwt_claims_check (ctx->claims, ctx->audience); - if (status == GRPC_JWT_VERIFIER_OK) - { - /* Pass ownership. */ - claims = ctx->claims; - ctx->claims = NULL; - } + if (json == NULL) { + status = GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR; + goto end; + } + verification_key = + 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); + status = GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR; + goto end; + } + + if (!verify_jwt_signature(verification_key, ctx->header->alg, ctx->signature, + ctx->signed_data)) { + status = GRPC_JWT_VERIFIER_BAD_SIGNATURE; + goto end; + } + + status = grpc_jwt_claims_check(ctx->claims, ctx->audience); + if (status == GRPC_JWT_VERIFIER_OK) { + /* Pass ownership. */ + claims = ctx->claims; + ctx->claims = NULL; + } end: - if (json != NULL) - grpc_json_destroy (json); - if (verification_key != NULL) - EVP_PKEY_free (verification_key); - ctx->user_cb (ctx->user_data, status, claims); - verifier_cb_ctx_destroy (ctx); + if (json != NULL) grpc_json_destroy(json); + if (verification_key != NULL) EVP_PKEY_free(verification_key); + 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, const grpc_httpcli_response * response) -{ +static void on_openid_config_retrieved(grpc_exec_ctx *exec_ctx, void *user_data, + const grpc_httpcli_response *response) { const grpc_json *cur; - grpc_json *json = json_from_http (response); - verifier_cb_ctx *ctx = (verifier_cb_ctx *) user_data; + grpc_json *json = json_from_http(response); + verifier_cb_ctx *ctx = (verifier_cb_ctx *)user_data; grpc_httpcli_request req; const char *jwks_uri; /* TODO(jboeuf): Cache the jwks_uri in order to avoid this hop next time. */ - if (json == NULL) + if (json == NULL) goto error; + cur = find_property_by_name(json, "jwks_uri"); + if (cur == NULL) { + gpr_log(GPR_ERROR, "Could not find jwks_uri in openid config."); goto error; - cur = find_property_by_name (json, "jwks_uri"); - if (cur == NULL) - { - gpr_log (GPR_ERROR, "Could not find jwks_uri in openid config."); - goto error; - } - jwks_uri = validate_string_field (cur, "jwks_uri"); - if (jwks_uri == NULL) + } + jwks_uri = validate_string_field(cur, "jwks_uri"); + if (jwks_uri == NULL) goto error; + if (strstr(jwks_uri, "https://") != jwks_uri) { + gpr_log(GPR_ERROR, "Invalid non https jwks_uri: %s.", jwks_uri); goto error; - if (strstr (jwks_uri, "https://") != jwks_uri) - { - gpr_log (GPR_ERROR, "Invalid non https jwks_uri: %s.", jwks_uri); - goto error; - } + } jwks_uri += 8; req.handshaker = &grpc_httpcli_ssl; - req.host = gpr_strdup (jwks_uri); - req.path = strchr (jwks_uri, '/'); - if (req.path == NULL) - { - req.path = ""; - } - else - { - *(req.host + (req.path - jwks_uri)) = '\0'; - } - grpc_httpcli_get (exec_ctx, &ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), on_keys_retrieved, ctx); - grpc_json_destroy (json); - gpr_free (req.host); + req.host = gpr_strdup(jwks_uri); + req.path = strchr(jwks_uri, '/'); + if (req.path == NULL) { + req.path = ""; + } else { + *(req.host + (req.path - jwks_uri)) = '\0'; + } + grpc_httpcli_get( + exec_ctx, &ctx->verifier->http_ctx, ctx->pollset, &req, + gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), + on_keys_retrieved, ctx); + grpc_json_destroy(json); + gpr_free(req.host); return; error: - if (json != NULL) - grpc_json_destroy (json); - ctx->user_cb (ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, NULL); - verifier_cb_ctx_destroy (ctx); + if (json != NULL) grpc_json_destroy(json); + 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, const char *email_domain) -{ +static email_key_mapping *verifier_get_mapping(grpc_jwt_verifier *v, + const char *email_domain) { size_t i; - if (v->mappings == NULL) - return NULL; - for (i = 0; i < v->num_mappings; i++) - { - if (strcmp (email_domain, v->mappings[i].email_domain) == 0) - { - return &v->mappings[i]; - } + if (v->mappings == NULL) return NULL; + for (i = 0; i < v->num_mappings; i++) { + if (strcmp(email_domain, v->mappings[i].email_domain) == 0) { + return &v->mappings[i]; } + } return NULL; } -static void -verifier_put_mapping (grpc_jwt_verifier * v, const char *email_domain, const char *key_url_prefix) -{ - email_key_mapping *mapping = verifier_get_mapping (v, email_domain); - GPR_ASSERT (v->num_mappings < v->allocated_mappings); - if (mapping != NULL) - { - gpr_free (mapping->key_url_prefix); - mapping->key_url_prefix = gpr_strdup (key_url_prefix); - return; - } - v->mappings[v->num_mappings].email_domain = gpr_strdup (email_domain); - v->mappings[v->num_mappings].key_url_prefix = gpr_strdup (key_url_prefix); +static void verifier_put_mapping(grpc_jwt_verifier *v, const char *email_domain, + const char *key_url_prefix) { + email_key_mapping *mapping = verifier_get_mapping(v, email_domain); + GPR_ASSERT(v->num_mappings < v->allocated_mappings); + if (mapping != NULL) { + gpr_free(mapping->key_url_prefix); + mapping->key_url_prefix = gpr_strdup(key_url_prefix); + return; + } + v->mappings[v->num_mappings].email_domain = gpr_strdup(email_domain); + v->mappings[v->num_mappings].key_url_prefix = gpr_strdup(key_url_prefix); v->num_mappings++; - GPR_ASSERT (v->num_mappings <= v->allocated_mappings); + GPR_ASSERT(v->num_mappings <= v->allocated_mappings); } /* 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(grpc_exec_ctx *exec_ctx, + verifier_cb_ctx *ctx) { const char *at_sign; grpc_httpcli_response_cb http_cb; char *path_prefix = NULL; const char *iss; grpc_httpcli_request req; - memset (&req, 0, sizeof (grpc_httpcli_request)); + memset(&req, 0, sizeof(grpc_httpcli_request)); req.handshaker = &grpc_httpcli_ssl; - GPR_ASSERT (ctx != NULL && ctx->header != NULL && ctx->claims != NULL); + GPR_ASSERT(ctx != NULL && ctx->header != NULL && ctx->claims != NULL); iss = ctx->claims->iss; - if (ctx->header->kid == NULL) - { - gpr_log (GPR_ERROR, "Missing kid in jose header."); - goto error; - } - if (iss == NULL) - { - gpr_log (GPR_ERROR, "Missing iss in claims."); - goto error; - } + if (ctx->header->kid == NULL) { + gpr_log(GPR_ERROR, "Missing kid in jose header."); + goto error; + } + if (iss == NULL) { + gpr_log(GPR_ERROR, "Missing iss in claims."); + goto error; + } /* This code relies on: https://openid.net/specs/openid-connect-discovery-1_0.html @@ -852,60 +711,57 @@ retrieve_key_and_verify (grpc_exec_ctx * exec_ctx, verifier_cb_ctx * ctx) /* Very non-sophisticated way to detect an email address. Should be good enough for now... */ - at_sign = strchr (iss, '@'); - if (at_sign != NULL) - { - email_key_mapping *mapping; - const char *email_domain = at_sign + 1; - GPR_ASSERT (ctx->verifier != NULL); - mapping = verifier_get_mapping (ctx->verifier, email_domain); - if (mapping == NULL) - { - gpr_log (GPR_ERROR, "Missing mapping for issuer email."); - goto error; - } - req.host = gpr_strdup (mapping->key_url_prefix); - path_prefix = strchr (req.host, '/'); - if (path_prefix == NULL) - { - gpr_asprintf (&req.path, "/%s", iss); - } - else - { - *(path_prefix++) = '\0'; - gpr_asprintf (&req.path, "/%s/%s", path_prefix, iss); - } - http_cb = on_keys_retrieved; - } - else - { - req.host = gpr_strdup (strstr (iss, "https://") == iss ? iss + 8 : iss); - path_prefix = strchr (req.host, '/'); - if (path_prefix == NULL) - { - req.path = gpr_strdup (GRPC_OPENID_CONFIG_URL_SUFFIX); - } - else - { - *(path_prefix++) = 0; - gpr_asprintf (&req.path, "/%s%s", path_prefix, GRPC_OPENID_CONFIG_URL_SUFFIX); - } - http_cb = on_openid_config_retrieved; + at_sign = strchr(iss, '@'); + if (at_sign != NULL) { + email_key_mapping *mapping; + const char *email_domain = at_sign + 1; + GPR_ASSERT(ctx->verifier != NULL); + mapping = verifier_get_mapping(ctx->verifier, email_domain); + if (mapping == NULL) { + gpr_log(GPR_ERROR, "Missing mapping for issuer email."); + goto error; } - - grpc_httpcli_get (exec_ctx, &ctx->verifier->http_ctx, ctx->pollset, &req, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), http_cb, ctx); - gpr_free (req.host); - gpr_free (req.path); + req.host = gpr_strdup(mapping->key_url_prefix); + path_prefix = strchr(req.host, '/'); + if (path_prefix == NULL) { + gpr_asprintf(&req.path, "/%s", iss); + } else { + *(path_prefix++) = '\0'; + gpr_asprintf(&req.path, "/%s/%s", path_prefix, iss); + } + http_cb = on_keys_retrieved; + } else { + req.host = gpr_strdup(strstr(iss, "https://") == iss ? iss + 8 : iss); + path_prefix = strchr(req.host, '/'); + if (path_prefix == NULL) { + req.path = gpr_strdup(GRPC_OPENID_CONFIG_URL_SUFFIX); + } else { + *(path_prefix++) = 0; + gpr_asprintf(&req.path, "/%s%s", path_prefix, + GRPC_OPENID_CONFIG_URL_SUFFIX); + } + http_cb = on_openid_config_retrieved; + } + + grpc_httpcli_get( + exec_ctx, &ctx->verifier->http_ctx, ctx->pollset, &req, + gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), grpc_jwt_verifier_max_delay), + http_cb, ctx); + gpr_free(req.host); + gpr_free(req.path); return; error: - ctx->user_cb (ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, NULL); - verifier_cb_ctx_destroy (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, grpc_pollset * pollset, const char *jwt, const char *audience, grpc_jwt_verification_done_cb cb, void *user_data) -{ +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, + void *user_data) { const char *dot = NULL; grpc_json *json; jose_header *header = NULL; @@ -916,82 +772,71 @@ grpc_jwt_verifier_verify (grpc_exec_ctx * exec_ctx, grpc_jwt_verifier * verifier size_t signed_jwt_len; const char *cur = jwt; - GPR_ASSERT (verifier != NULL && jwt != NULL && audience != NULL && cb != NULL); - dot = strchr (cur, '.'); - if (dot == NULL) - goto error; - json = parse_json_part_from_jwt (cur, (size_t) (dot - cur), &header_buffer); - if (json == NULL) - goto error; - header = jose_header_from_json (json, header_buffer); - if (header == NULL) - goto error; + GPR_ASSERT(verifier != NULL && jwt != NULL && audience != NULL && cb != NULL); + dot = strchr(cur, '.'); + if (dot == NULL) goto error; + json = parse_json_part_from_jwt(cur, (size_t)(dot - cur), &header_buffer); + if (json == NULL) goto error; + 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 (cur, (size_t) (dot - cur), &claims_buffer); - if (json == NULL) - goto error; - claims = grpc_jwt_claims_from_json (json, claims_buffer); - if (claims == NULL) - goto error; - - signed_jwt_len = (size_t) (dot - jwt); + dot = strchr(cur, '.'); + if (dot == NULL) goto error; + json = parse_json_part_from_jwt(cur, (size_t)(dot - cur), &claims_buffer); + if (json == NULL) goto error; + 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 (cur, 1); - if (GPR_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)); + signature = grpc_base64_decode(cur, 1); + if (GPR_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 (header); - if (claims != NULL) - grpc_jwt_claims_destroy (claims); - cb (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 (const grpc_jwt_verifier_email_domain_key_url_mapping * mappings, size_t num_mappings) -{ - grpc_jwt_verifier *v = gpr_malloc (sizeof (grpc_jwt_verifier)); - memset (v, 0, sizeof (grpc_jwt_verifier)); - grpc_httpcli_context_init (&v->http_ctx); +grpc_jwt_verifier *grpc_jwt_verifier_create( + const grpc_jwt_verifier_email_domain_key_url_mapping *mappings, + size_t num_mappings) { + grpc_jwt_verifier *v = gpr_malloc(sizeof(grpc_jwt_verifier)); + memset(v, 0, sizeof(grpc_jwt_verifier)); + grpc_httpcli_context_init(&v->http_ctx); /* We know at least of one mapping. */ v->allocated_mappings = 1 + num_mappings; - v->mappings = gpr_malloc (v->allocated_mappings * sizeof (email_key_mapping)); - verifier_put_mapping (v, GRPC_GOOGLE_SERVICE_ACCOUNTS_EMAIL_DOMAIN, GRPC_GOOGLE_SERVICE_ACCOUNTS_KEY_URL_PREFIX); + v->mappings = gpr_malloc(v->allocated_mappings * sizeof(email_key_mapping)); + verifier_put_mapping(v, GRPC_GOOGLE_SERVICE_ACCOUNTS_EMAIL_DOMAIN, + GRPC_GOOGLE_SERVICE_ACCOUNTS_KEY_URL_PREFIX); /* User-Provided mappings. */ - if (mappings != NULL) - { - size_t i; - for (i = 0; i < num_mappings; i++) - { - verifier_put_mapping (v, mappings[i].email_domain, mappings[i].key_url_prefix); - } + if (mappings != NULL) { + size_t i; + for (i = 0; i < num_mappings; i++) { + verifier_put_mapping(v, mappings[i].email_domain, + mappings[i].key_url_prefix); } + } return v; } -void -grpc_jwt_verifier_destroy (grpc_jwt_verifier * v) -{ +void grpc_jwt_verifier_destroy(grpc_jwt_verifier *v) { size_t i; - if (v == NULL) - return; - 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); - gpr_free (v->mappings[i].key_url_prefix); - } - gpr_free (v->mappings); - } - gpr_free (v); + if (v == NULL) return; + 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); + gpr_free(v->mappings[i].key_url_prefix); + } + gpr_free(v->mappings); + } + gpr_free(v); } diff --git a/src/core/security/jwt_verifier.h b/src/core/security/jwt_verifier.h index 5fc99aafe09..51ea036e4ae 100644 --- a/src/core/security/jwt_verifier.h +++ b/src/core/security/jwt_verifier.h @@ -50,8 +50,7 @@ /* --- grpc_jwt_verifier_status. --- */ -typedef enum -{ +typedef enum { GRPC_JWT_VERIFIER_OK = 0, GRPC_JWT_VERIFIER_BAD_SIGNATURE, GRPC_JWT_VERIFIER_BAD_FORMAT, @@ -61,32 +60,31 @@ typedef enum GRPC_JWT_VERIFIER_GENERIC_ERROR } grpc_jwt_verifier_status; -const char *grpc_jwt_verifier_status_to_string (grpc_jwt_verifier_status status); +const char *grpc_jwt_verifier_status_to_string(grpc_jwt_verifier_status status); /* --- grpc_jwt_claims. --- */ typedef struct grpc_jwt_claims grpc_jwt_claims; -void grpc_jwt_claims_destroy (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); +const grpc_json *grpc_jwt_claims_json(const grpc_jwt_claims *claims); /* Access to registered claims in https://tools.ietf.org/html/rfc7519#page-9 */ -const char *grpc_jwt_claims_subject (const grpc_jwt_claims * claims); -const char *grpc_jwt_claims_issuer (const grpc_jwt_claims * claims); -const char *grpc_jwt_claims_id (const grpc_jwt_claims * claims); -const char *grpc_jwt_claims_audience (const grpc_jwt_claims * claims); -gpr_timespec grpc_jwt_claims_issued_at (const grpc_jwt_claims * claims); -gpr_timespec grpc_jwt_claims_expires_at (const grpc_jwt_claims * claims); -gpr_timespec grpc_jwt_claims_not_before (const grpc_jwt_claims * claims); +const char *grpc_jwt_claims_subject(const grpc_jwt_claims *claims); +const char *grpc_jwt_claims_issuer(const grpc_jwt_claims *claims); +const char *grpc_jwt_claims_id(const grpc_jwt_claims *claims); +const char *grpc_jwt_claims_audience(const grpc_jwt_claims *claims); +gpr_timespec grpc_jwt_claims_issued_at(const grpc_jwt_claims *claims); +gpr_timespec grpc_jwt_claims_expires_at(const grpc_jwt_claims *claims); +gpr_timespec grpc_jwt_claims_not_before(const grpc_jwt_claims *claims); /* --- grpc_jwt_verifier. --- */ typedef struct grpc_jwt_verifier grpc_jwt_verifier; -typedef struct -{ +typedef struct { /* The email domain is the part after the @ sign. */ const char *email_domain; @@ -106,23 +104,33 @@ extern gpr_timespec grpc_jwt_verifier_max_delay; A verifier object has one built-in mapping (unless overridden): GRPC_GOOGLE_SERVICE_ACCOUNTS_EMAIL_DOMAIN -> GRPC_GOOGLE_SERVICE_ACCOUNTS_KEY_URL_PREFIX.*/ -grpc_jwt_verifier *grpc_jwt_verifier_create (const grpc_jwt_verifier_email_domain_key_url_mapping * mappings, size_t num_mappings); +grpc_jwt_verifier *grpc_jwt_verifier_create( + const grpc_jwt_verifier_email_domain_key_url_mapping *mappings, + 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_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, grpc_jwt_verifier_status status, grpc_jwt_claims * claims); +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, grpc_pollset * pollset, const char *jwt, const char *audience, grpc_jwt_verification_done_cb cb, void *user_data); +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, + void *user_data); /* --- TESTING ONLY exposed functions. --- */ -grpc_jwt_claims *grpc_jwt_claims_from_json (grpc_json * json, gpr_slice buffer); -grpc_jwt_verifier_status grpc_jwt_claims_check (const grpc_jwt_claims * claims, const char *audience); +grpc_jwt_claims *grpc_jwt_claims_from_json(grpc_json *json, gpr_slice buffer); +grpc_jwt_verifier_status grpc_jwt_claims_check(const grpc_jwt_claims *claims, + const char *audience); #endif /* GRPC_INTERNAL_CORE_SECURITY_JWT_VERIFIER_H */ diff --git a/src/core/security/secure_endpoint.c b/src/core/security/secure_endpoint.c index 642068c8c90..0288f7128a7 100644 --- a/src/core/security/secure_endpoint.c +++ b/src/core/security/secure_endpoint.c @@ -43,8 +43,7 @@ #define STAGING_BUFFER_SIZE 8192 -typedef struct -{ +typedef struct { grpc_endpoint base; grpc_endpoint *wrapped_ep; struct tsi_frame_protector *protector; @@ -68,19 +67,17 @@ typedef struct int grpc_trace_secure_endpoint = 0; -static void -destroy (grpc_exec_ctx * exec_ctx, secure_endpoint * secure_ep) -{ +static void destroy(grpc_exec_ctx *exec_ctx, secure_endpoint *secure_ep) { secure_endpoint *ep = secure_ep; - grpc_endpoint_destroy (exec_ctx, ep->wrapped_ep); - tsi_frame_protector_destroy (ep->protector); - gpr_slice_buffer_destroy (&ep->leftover_bytes); - gpr_slice_unref (ep->read_staging_buffer); - gpr_slice_unref (ep->write_staging_buffer); - gpr_slice_buffer_destroy (&ep->output_buffer); - gpr_slice_buffer_destroy (&ep->source_buffer); - gpr_mu_destroy (&ep->protector_mu); - gpr_free (ep); + grpc_endpoint_destroy(exec_ctx, ep->wrapped_ep); + tsi_frame_protector_destroy(ep->protector); + gpr_slice_buffer_destroy(&ep->leftover_bytes); + gpr_slice_unref(ep->read_staging_buffer); + gpr_slice_unref(ep->write_staging_buffer); + gpr_slice_buffer_destroy(&ep->output_buffer); + gpr_slice_buffer_destroy(&ep->source_buffer); + gpr_mu_destroy(&ep->protector_mu); + gpr_free(ep); } /*#define GRPC_SECURE_ENDPOINT_REFCOUNT_DEBUG*/ @@ -89,326 +86,299 @@ destroy (grpc_exec_ctx * exec_ctx, secure_endpoint * secure_ep) 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, grpc_closure_list * closure_list, const char *reason, const char *file, int line) -{ - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "SECENDP unref %p : %s %d -> %d", ep, reason, ep->ref.count, ep->ref.count - 1); - if (gpr_unref (&ep->ref)) - { - destroy (exec_ctx, ep); - } +static void secure_endpoint_unref(secure_endpoint *ep, + grpc_closure_list *closure_list, + const char *reason, const char *file, + int line) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "SECENDP unref %p : %s %d -> %d", + ep, reason, ep->ref.count, ep->ref.count - 1); + if (gpr_unref(&ep->ref)) { + destroy(exec_ctx, ep); + } } -static void -secure_endpoint_ref (secure_endpoint * ep, const char *reason, const char *file, int line) -{ - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "SECENDP ref %p : %s %d -> %d", ep, reason, ep->ref.count, ep->ref.count + 1); - gpr_ref (&ep->ref); +static void secure_endpoint_ref(secure_endpoint *ep, const char *reason, + const char *file, int line) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "SECENDP ref %p : %s %d -> %d", + ep, reason, ep->ref.count, ep->ref.count + 1); + gpr_ref(&ep->ref); } #else -#define SECURE_ENDPOINT_UNREF(exec_ctx, ep, reason) secure_endpoint_unref((exec_ctx), (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 (grpc_exec_ctx * exec_ctx, secure_endpoint * ep) -{ - if (gpr_unref (&ep->ref)) - { - destroy (exec_ctx, ep); - } +static void secure_endpoint_unref(grpc_exec_ctx *exec_ctx, + secure_endpoint *ep) { + if (gpr_unref(&ep->ref)) { + destroy(exec_ctx, ep); + } } -static void -secure_endpoint_ref (secure_endpoint * ep) -{ - gpr_ref (&ep->ref); -} +static void secure_endpoint_ref(secure_endpoint *ep) { gpr_ref(&ep->ref); } #endif -static void -flush_read_staging_buffer (secure_endpoint * ep, gpr_uint8 ** cur, gpr_uint8 ** end) -{ - gpr_slice_buffer_add (ep->read_buffer, ep->read_staging_buffer); - ep->read_staging_buffer = gpr_slice_malloc (STAGING_BUFFER_SIZE); - *cur = GPR_SLICE_START_PTR (ep->read_staging_buffer); - *end = GPR_SLICE_END_PTR (ep->read_staging_buffer); +static void flush_read_staging_buffer(secure_endpoint *ep, gpr_uint8 **cur, + gpr_uint8 **end) { + gpr_slice_buffer_add(ep->read_buffer, ep->read_staging_buffer); + ep->read_staging_buffer = gpr_slice_malloc(STAGING_BUFFER_SIZE); + *cur = GPR_SLICE_START_PTR(ep->read_staging_buffer); + *end = GPR_SLICE_END_PTR(ep->read_staging_buffer); } -static void -call_read_cb (grpc_exec_ctx * exec_ctx, secure_endpoint * ep, int success) -{ - if (grpc_trace_secure_endpoint) - { - size_t i; - for (i = 0; i < ep->read_buffer->count; i++) - { - char *data = gpr_dump_slice (ep->read_buffer->slices[i], - GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log (GPR_DEBUG, "READ %p: %s", ep, data); - gpr_free (data); - } +static void call_read_cb(grpc_exec_ctx *exec_ctx, secure_endpoint *ep, + int success) { + if (grpc_trace_secure_endpoint) { + size_t i; + for (i = 0; i < ep->read_buffer->count; i++) { + char *data = gpr_dump_slice(ep->read_buffer->slices[i], + GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log(GPR_DEBUG, "READ %p: %s", ep, data); + gpr_free(data); } + } ep->read_buffer = NULL; - grpc_exec_ctx_enqueue (exec_ctx, ep->read_cb, success); - SECURE_ENDPOINT_UNREF (exec_ctx, ep, "read"); + grpc_exec_ctx_enqueue(exec_ctx, ep->read_cb, success); + SECURE_ENDPOINT_UNREF(exec_ctx, ep, "read"); } -static void -on_read (grpc_exec_ctx * exec_ctx, void *user_data, int success) -{ +static void on_read(grpc_exec_ctx *exec_ctx, void *user_data, int success) { unsigned i; gpr_uint8 keep_looping = 0; tsi_result result = TSI_OK; - secure_endpoint *ep = (secure_endpoint *) user_data; - gpr_uint8 *cur = GPR_SLICE_START_PTR (ep->read_staging_buffer); - gpr_uint8 *end = GPR_SLICE_END_PTR (ep->read_staging_buffer); - - if (!success) - { - gpr_slice_buffer_reset_and_unref (ep->read_buffer); - call_read_cb (exec_ctx, ep, 0); - return; - } + secure_endpoint *ep = (secure_endpoint *)user_data; + gpr_uint8 *cur = GPR_SLICE_START_PTR(ep->read_staging_buffer); + gpr_uint8 *end = GPR_SLICE_END_PTR(ep->read_staging_buffer); + + if (!success) { + gpr_slice_buffer_reset_and_unref(ep->read_buffer); + call_read_cb(exec_ctx, ep, 0); + return; + } /* TODO(yangg) check error, maybe bail out early */ - for (i = 0; i < ep->source_buffer.count; i++) - { - gpr_slice encrypted = ep->source_buffer.slices[i]; - gpr_uint8 *message_bytes = GPR_SLICE_START_PTR (encrypted); - size_t message_size = GPR_SLICE_LENGTH (encrypted); - - while (message_size > 0 || keep_looping) - { - size_t unprotected_buffer_size_written = (size_t) (end - cur); - size_t processed_message_size = message_size; - gpr_mu_lock (&ep->protector_mu); - result = tsi_frame_protector_unprotect (ep->protector, message_bytes, &processed_message_size, cur, &unprotected_buffer_size_written); - gpr_mu_unlock (&ep->protector_mu); - if (result != TSI_OK) - { - gpr_log (GPR_ERROR, "Decryption error: %s", tsi_result_to_string (result)); - break; - } - message_bytes += processed_message_size; - message_size -= processed_message_size; - cur += unprotected_buffer_size_written; - - if (cur == end) - { - flush_read_staging_buffer (ep, &cur, &end); - /* Force to enter the loop again to extract buffered bytes in protector. - The bytes could be buffered because of running out of staging_buffer. - If this happens at the end of all slices, doing another unprotect - avoids leaving data in the protector. */ - keep_looping = 1; - } - else if (unprotected_buffer_size_written > 0) - { - keep_looping = 1; - } - else - { - keep_looping = 0; - } - } - if (result != TSI_OK) - break; + for (i = 0; i < ep->source_buffer.count; i++) { + gpr_slice encrypted = ep->source_buffer.slices[i]; + gpr_uint8 *message_bytes = GPR_SLICE_START_PTR(encrypted); + size_t message_size = GPR_SLICE_LENGTH(encrypted); + + while (message_size > 0 || keep_looping) { + size_t unprotected_buffer_size_written = (size_t)(end - cur); + size_t processed_message_size = message_size; + gpr_mu_lock(&ep->protector_mu); + result = tsi_frame_protector_unprotect(ep->protector, message_bytes, + &processed_message_size, cur, + &unprotected_buffer_size_written); + gpr_mu_unlock(&ep->protector_mu); + if (result != TSI_OK) { + gpr_log(GPR_ERROR, "Decryption error: %s", + tsi_result_to_string(result)); + break; + } + message_bytes += processed_message_size; + message_size -= processed_message_size; + cur += unprotected_buffer_size_written; + + if (cur == end) { + flush_read_staging_buffer(ep, &cur, &end); + /* Force to enter the loop again to extract buffered bytes in protector. + The bytes could be buffered because of running out of staging_buffer. + If this happens at the end of all slices, doing another unprotect + avoids leaving data in the protector. */ + keep_looping = 1; + } else if (unprotected_buffer_size_written > 0) { + keep_looping = 1; + } else { + keep_looping = 0; + } } + if (result != TSI_OK) break; + } - if (cur != GPR_SLICE_START_PTR (ep->read_staging_buffer)) - { - gpr_slice_buffer_add (ep->read_buffer, gpr_slice_split_head (&ep->read_staging_buffer, (size_t) (cur - GPR_SLICE_START_PTR (ep->read_staging_buffer)))); - } + if (cur != GPR_SLICE_START_PTR(ep->read_staging_buffer)) { + gpr_slice_buffer_add( + ep->read_buffer, + gpr_slice_split_head( + &ep->read_staging_buffer, + (size_t)(cur - GPR_SLICE_START_PTR(ep->read_staging_buffer)))); + } /* TODO(yangg) experiment with moving this block after read_cb to see if it helps latency */ - gpr_slice_buffer_reset_and_unref (&ep->source_buffer); + gpr_slice_buffer_reset_and_unref(&ep->source_buffer); - if (result != TSI_OK) - { - gpr_slice_buffer_reset_and_unref (ep->read_buffer); - call_read_cb (exec_ctx, ep, 0); - return; - } + if (result != TSI_OK) { + gpr_slice_buffer_reset_and_unref(ep->read_buffer); + call_read_cb(exec_ctx, ep, 0); + return; + } - call_read_cb (exec_ctx, ep, 1); + call_read_cb(exec_ctx, ep, 1); } -static void -endpoint_read (grpc_exec_ctx * exec_ctx, grpc_endpoint * secure_ep, gpr_slice_buffer * slices, grpc_closure * cb) -{ - secure_endpoint *ep = (secure_endpoint *) secure_ep; +static void endpoint_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *secure_ep, + gpr_slice_buffer *slices, grpc_closure *cb) { + secure_endpoint *ep = (secure_endpoint *)secure_ep; ep->read_cb = cb; ep->read_buffer = slices; - gpr_slice_buffer_reset_and_unref (ep->read_buffer); - - SECURE_ENDPOINT_REF (ep, "read"); - if (ep->leftover_bytes.count) - { - gpr_slice_buffer_swap (&ep->leftover_bytes, &ep->source_buffer); - GPR_ASSERT (ep->leftover_bytes.count == 0); - on_read (exec_ctx, ep, 1); - return; - } - - grpc_endpoint_read (exec_ctx, ep->wrapped_ep, &ep->source_buffer, &ep->on_read); + gpr_slice_buffer_reset_and_unref(ep->read_buffer); + + SECURE_ENDPOINT_REF(ep, "read"); + if (ep->leftover_bytes.count) { + gpr_slice_buffer_swap(&ep->leftover_bytes, &ep->source_buffer); + GPR_ASSERT(ep->leftover_bytes.count == 0); + on_read(exec_ctx, ep, 1); + return; + } + + grpc_endpoint_read(exec_ctx, ep->wrapped_ep, &ep->source_buffer, + &ep->on_read); } -static void -flush_write_staging_buffer (secure_endpoint * ep, gpr_uint8 ** cur, gpr_uint8 ** end) -{ - gpr_slice_buffer_add (&ep->output_buffer, ep->write_staging_buffer); - ep->write_staging_buffer = gpr_slice_malloc (STAGING_BUFFER_SIZE); - *cur = GPR_SLICE_START_PTR (ep->write_staging_buffer); - *end = GPR_SLICE_END_PTR (ep->write_staging_buffer); +static void flush_write_staging_buffer(secure_endpoint *ep, gpr_uint8 **cur, + gpr_uint8 **end) { + gpr_slice_buffer_add(&ep->output_buffer, ep->write_staging_buffer); + ep->write_staging_buffer = gpr_slice_malloc(STAGING_BUFFER_SIZE); + *cur = GPR_SLICE_START_PTR(ep->write_staging_buffer); + *end = GPR_SLICE_END_PTR(ep->write_staging_buffer); } -static void -endpoint_write (grpc_exec_ctx * exec_ctx, grpc_endpoint * secure_ep, gpr_slice_buffer * slices, grpc_closure * cb) -{ +static void endpoint_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *secure_ep, + gpr_slice_buffer *slices, grpc_closure *cb) { unsigned i; tsi_result result = TSI_OK; - secure_endpoint *ep = (secure_endpoint *) secure_ep; - gpr_uint8 *cur = GPR_SLICE_START_PTR (ep->write_staging_buffer); - gpr_uint8 *end = GPR_SLICE_END_PTR (ep->write_staging_buffer); - - gpr_slice_buffer_reset_and_unref (&ep->output_buffer); - - if (grpc_trace_secure_endpoint) - { - for (i = 0; i < slices->count; i++) - { - char *data = gpr_dump_slice (slices->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log (GPR_DEBUG, "WRITE %p: %s", ep, data); - gpr_free (data); - } + secure_endpoint *ep = (secure_endpoint *)secure_ep; + gpr_uint8 *cur = GPR_SLICE_START_PTR(ep->write_staging_buffer); + gpr_uint8 *end = GPR_SLICE_END_PTR(ep->write_staging_buffer); + + gpr_slice_buffer_reset_and_unref(&ep->output_buffer); + + if (grpc_trace_secure_endpoint) { + for (i = 0; i < slices->count; i++) { + char *data = + gpr_dump_slice(slices->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log(GPR_DEBUG, "WRITE %p: %s", ep, data); + gpr_free(data); } - - for (i = 0; i < slices->count; i++) - { - gpr_slice plain = slices->slices[i]; - gpr_uint8 *message_bytes = GPR_SLICE_START_PTR (plain); - size_t message_size = GPR_SLICE_LENGTH (plain); - while (message_size > 0) - { - size_t protected_buffer_size_to_send = (size_t) (end - cur); - size_t processed_message_size = message_size; - gpr_mu_lock (&ep->protector_mu); - result = tsi_frame_protector_protect (ep->protector, message_bytes, &processed_message_size, cur, &protected_buffer_size_to_send); - gpr_mu_unlock (&ep->protector_mu); - if (result != TSI_OK) - { - gpr_log (GPR_ERROR, "Encryption error: %s", tsi_result_to_string (result)); - break; - } - message_bytes += processed_message_size; - message_size -= processed_message_size; - cur += protected_buffer_size_to_send; - - if (cur == end) - { - flush_write_staging_buffer (ep, &cur, &end); - } - } - if (result != TSI_OK) - break; + } + + for (i = 0; i < slices->count; i++) { + gpr_slice plain = slices->slices[i]; + gpr_uint8 *message_bytes = GPR_SLICE_START_PTR(plain); + size_t message_size = GPR_SLICE_LENGTH(plain); + while (message_size > 0) { + size_t protected_buffer_size_to_send = (size_t)(end - cur); + size_t processed_message_size = message_size; + gpr_mu_lock(&ep->protector_mu); + result = tsi_frame_protector_protect(ep->protector, message_bytes, + &processed_message_size, cur, + &protected_buffer_size_to_send); + gpr_mu_unlock(&ep->protector_mu); + if (result != TSI_OK) { + gpr_log(GPR_ERROR, "Encryption error: %s", + tsi_result_to_string(result)); + break; + } + message_bytes += processed_message_size; + message_size -= processed_message_size; + cur += protected_buffer_size_to_send; + + if (cur == end) { + flush_write_staging_buffer(ep, &cur, &end); + } } - if (result == TSI_OK) - { - size_t still_pending_size; - do - { - size_t protected_buffer_size_to_send = (size_t) (end - cur); - gpr_mu_lock (&ep->protector_mu); - result = tsi_frame_protector_protect_flush (ep->protector, cur, &protected_buffer_size_to_send, &still_pending_size); - gpr_mu_unlock (&ep->protector_mu); - if (result != TSI_OK) - break; - cur += protected_buffer_size_to_send; - if (cur == end) - { - flush_write_staging_buffer (ep, &cur, &end); - } - } - while (still_pending_size > 0); - if (cur != GPR_SLICE_START_PTR (ep->write_staging_buffer)) - { - gpr_slice_buffer_add (&ep->output_buffer, gpr_slice_split_head (&ep->write_staging_buffer, (size_t) (cur - GPR_SLICE_START_PTR (ep->write_staging_buffer)))); - } + if (result != TSI_OK) break; + } + if (result == TSI_OK) { + size_t still_pending_size; + do { + size_t protected_buffer_size_to_send = (size_t)(end - cur); + gpr_mu_lock(&ep->protector_mu); + result = tsi_frame_protector_protect_flush(ep->protector, cur, + &protected_buffer_size_to_send, + &still_pending_size); + gpr_mu_unlock(&ep->protector_mu); + if (result != TSI_OK) break; + cur += protected_buffer_size_to_send; + if (cur == end) { + flush_write_staging_buffer(ep, &cur, &end); + } + } while (still_pending_size > 0); + if (cur != GPR_SLICE_START_PTR(ep->write_staging_buffer)) { + gpr_slice_buffer_add( + &ep->output_buffer, + gpr_slice_split_head( + &ep->write_staging_buffer, + (size_t)(cur - GPR_SLICE_START_PTR(ep->write_staging_buffer)))); } + } - if (result != TSI_OK) - { - /* TODO(yangg) do different things according to the error type? */ - gpr_slice_buffer_reset_and_unref (&ep->output_buffer); - grpc_exec_ctx_enqueue (exec_ctx, cb, 0); - return; - } + if (result != TSI_OK) { + /* TODO(yangg) do different things according to the error type? */ + gpr_slice_buffer_reset_and_unref(&ep->output_buffer); + grpc_exec_ctx_enqueue(exec_ctx, cb, 0); + return; + } - grpc_endpoint_write (exec_ctx, ep->wrapped_ep, &ep->output_buffer, cb); + grpc_endpoint_write(exec_ctx, ep->wrapped_ep, &ep->output_buffer, cb); } -static void -endpoint_shutdown (grpc_exec_ctx * exec_ctx, grpc_endpoint * secure_ep) -{ - secure_endpoint *ep = (secure_endpoint *) secure_ep; - grpc_endpoint_shutdown (exec_ctx, ep->wrapped_ep); +static void endpoint_shutdown(grpc_exec_ctx *exec_ctx, + grpc_endpoint *secure_ep) { + secure_endpoint *ep = (secure_endpoint *)secure_ep; + grpc_endpoint_shutdown(exec_ctx, ep->wrapped_ep); } -static void -endpoint_destroy (grpc_exec_ctx * exec_ctx, grpc_endpoint * secure_ep) -{ - secure_endpoint *ep = (secure_endpoint *) secure_ep; - SECURE_ENDPOINT_UNREF (exec_ctx, ep, "destroy"); +static void endpoint_destroy(grpc_exec_ctx *exec_ctx, + grpc_endpoint *secure_ep) { + secure_endpoint *ep = (secure_endpoint *)secure_ep; + SECURE_ENDPOINT_UNREF(exec_ctx, ep, "destroy"); } -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 (exec_ctx, ep->wrapped_ep, pollset); +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(exec_ctx, ep->wrapped_ep, pollset); } -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 (exec_ctx, ep->wrapped_ep, pollset_set); +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(exec_ctx, ep->wrapped_ep, pollset_set); } -static char * -endpoint_get_peer (grpc_endpoint * secure_ep) -{ - secure_endpoint *ep = (secure_endpoint *) secure_ep; - return grpc_endpoint_get_peer (ep->wrapped_ep); +static char *endpoint_get_peer(grpc_endpoint *secure_ep) { + secure_endpoint *ep = (secure_endpoint *)secure_ep; + return grpc_endpoint_get_peer(ep->wrapped_ep); } static const grpc_endpoint_vtable vtable = { - endpoint_read, endpoint_write, - endpoint_add_to_pollset, endpoint_add_to_pollset_set, - endpoint_shutdown, endpoint_destroy, - endpoint_get_peer -}; - -grpc_endpoint * -grpc_secure_endpoint_create (struct tsi_frame_protector *protector, grpc_endpoint * transport, gpr_slice * leftover_slices, size_t leftover_nslices) -{ + endpoint_read, endpoint_write, + endpoint_add_to_pollset, endpoint_add_to_pollset_set, + endpoint_shutdown, endpoint_destroy, + endpoint_get_peer}; + +grpc_endpoint *grpc_secure_endpoint_create( + struct tsi_frame_protector *protector, grpc_endpoint *transport, + gpr_slice *leftover_slices, size_t leftover_nslices) { size_t i; - secure_endpoint *ep = (secure_endpoint *) gpr_malloc (sizeof (secure_endpoint)); + secure_endpoint *ep = (secure_endpoint *)gpr_malloc(sizeof(secure_endpoint)); ep->base.vtable = &vtable; ep->wrapped_ep = transport; ep->protector = protector; - gpr_slice_buffer_init (&ep->leftover_bytes); - for (i = 0; i < leftover_nslices; i++) - { - gpr_slice_buffer_add (&ep->leftover_bytes, gpr_slice_ref (leftover_slices[i])); - } - ep->write_staging_buffer = gpr_slice_malloc (STAGING_BUFFER_SIZE); - ep->read_staging_buffer = gpr_slice_malloc (STAGING_BUFFER_SIZE); - gpr_slice_buffer_init (&ep->output_buffer); - gpr_slice_buffer_init (&ep->source_buffer); + gpr_slice_buffer_init(&ep->leftover_bytes); + for (i = 0; i < leftover_nslices; i++) { + gpr_slice_buffer_add(&ep->leftover_bytes, + gpr_slice_ref(leftover_slices[i])); + } + ep->write_staging_buffer = gpr_slice_malloc(STAGING_BUFFER_SIZE); + ep->read_staging_buffer = gpr_slice_malloc(STAGING_BUFFER_SIZE); + gpr_slice_buffer_init(&ep->output_buffer); + gpr_slice_buffer_init(&ep->source_buffer); ep->read_buffer = NULL; - grpc_closure_init (&ep->on_read, on_read, ep); - gpr_mu_init (&ep->protector_mu); - gpr_ref_init (&ep->ref, 1); + grpc_closure_init(&ep->on_read, on_read, ep); + gpr_mu_init(&ep->protector_mu); + gpr_ref_init(&ep->ref, 1); return &ep->base; } diff --git a/src/core/security/secure_endpoint.h b/src/core/security/secure_endpoint.h index e80a177dd55..c563bdd9c50 100644 --- a/src/core/security/secure_endpoint.h +++ b/src/core/security/secure_endpoint.h @@ -42,6 +42,8 @@ struct tsi_frame_protector; extern int grpc_trace_secure_endpoint; /* Takes ownership of protector and to_wrap, and refs leftover_slices. */ -grpc_endpoint *grpc_secure_endpoint_create (struct tsi_frame_protector *protector, grpc_endpoint * to_wrap, gpr_slice * leftover_slices, size_t leftover_nslices); +grpc_endpoint *grpc_secure_endpoint_create( + struct tsi_frame_protector *protector, grpc_endpoint *to_wrap, + gpr_slice *leftover_slices, size_t leftover_nslices); #endif /* GRPC_INTERNAL_CORE_SECURITY_SECURE_ENDPOINT_H */ diff --git a/src/core/security/security_connector.c b/src/core/security/security_connector.c index f720f5d7284..ec5b1c86e52 100644 --- a/src/core/security/security_connector.c +++ b/src/core/security/security_connector.c @@ -57,7 +57,8 @@ #ifndef INSTALL_PREFIX static const char *installed_roots_path = "/usr/share/grpc/roots.pem"; #else -static const char *installed_roots_path = INSTALL_PREFIX "/share/grpc/roots.pem"; +static const char *installed_roots_path = + INSTALL_PREFIX "/share/grpc/roots.pem"; #endif /* -- Cipher suites. -- */ @@ -71,127 +72,106 @@ static const char *installed_roots_path = INSTALL_PREFIX "/share/grpc/roots.pem" static gpr_once cipher_suites_once = GPR_ONCE_INIT; static const char *cipher_suites = NULL; -static void -init_cipher_suites (void) -{ - char *overridden = gpr_getenv ("GRPC_SSL_CIPHER_SUITES"); +static void init_cipher_suites(void) { + char *overridden = gpr_getenv("GRPC_SSL_CIPHER_SUITES"); cipher_suites = overridden != NULL ? overridden : GRPC_SSL_CIPHER_SUITES; } -static const char * -ssl_cipher_suites (void) -{ - gpr_once_init (&cipher_suites_once, init_cipher_suites); +static const char *ssl_cipher_suites(void) { + gpr_once_init(&cipher_suites_once, init_cipher_suites); return cipher_suites; } /* -- Common methods. -- */ /* Returns the first property with that name. */ -const tsi_peer_property * -tsi_peer_get_property_by_name (const tsi_peer * peer, const char *name) -{ +const tsi_peer_property *tsi_peer_get_property_by_name(const tsi_peer *peer, + const char *name) { size_t i; - if (peer == NULL) - return NULL; - for (i = 0; i < peer->property_count; i++) - { - const tsi_peer_property *property = &peer->properties[i]; - if (name == NULL && property->name == NULL) - { - return property; - } - if (name != NULL && property->name != NULL && strcmp (property->name, name) == 0) - { - return property; - } + if (peer == NULL) return NULL; + for (i = 0; i < peer->property_count; i++) { + const tsi_peer_property *property = &peer->properties[i]; + if (name == NULL && property->name == NULL) { + return property; + } + if (name != NULL && property->name != NULL && + strcmp(property->name, name) == 0) { + return property; } + } return NULL; } -void -grpc_security_connector_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) -{ - if (sc == NULL || nonsecure_endpoint == NULL) - { - cb (exec_ctx, user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL); - } - else - { - sc->vtable->do_handshake (exec_ctx, sc, nonsecure_endpoint, cb, user_data); - } +void grpc_security_connector_do_handshake(grpc_exec_ctx *exec_ctx, + grpc_security_connector *sc, + grpc_endpoint *nonsecure_endpoint, + grpc_security_handshake_done_cb cb, + void *user_data) { + if (sc == NULL || nonsecure_endpoint == NULL) { + cb(exec_ctx, user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL); + } else { + sc->vtable->do_handshake(exec_ctx, sc, nonsecure_endpoint, cb, user_data); + } } -grpc_security_status -grpc_security_connector_check_peer (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data) -{ - if (sc == NULL) - { - tsi_peer_destruct (&peer); - return GRPC_SECURITY_ERROR; - } - return sc->vtable->check_peer (sc, peer, cb, user_data); +grpc_security_status grpc_security_connector_check_peer( + grpc_security_connector *sc, tsi_peer peer, grpc_security_check_cb cb, + void *user_data) { + if (sc == NULL) { + tsi_peer_destruct(&peer); + return GRPC_SECURITY_ERROR; + } + return sc->vtable->check_peer(sc, peer, cb, user_data); } -grpc_security_status -grpc_channel_security_connector_check_call_host (grpc_exec_ctx * exec_ctx, grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data) -{ - if (sc == NULL || sc->check_call_host == NULL) - return GRPC_SECURITY_ERROR; - return sc->check_call_host (exec_ctx, sc, host, cb, user_data); +grpc_security_status grpc_channel_security_connector_check_call_host( + grpc_exec_ctx *exec_ctx, grpc_channel_security_connector *sc, + const char *host, grpc_security_check_cb cb, void *user_data) { + if (sc == NULL || sc->check_call_host == NULL) return GRPC_SECURITY_ERROR; + return sc->check_call_host(exec_ctx, sc, host, cb, user_data); } #ifdef GRPC_SECURITY_CONNECTOR_REFCOUNT_DEBUG -grpc_security_connector * -grpc_security_connector_ref (grpc_security_connector * sc, const char *file, int line, const char *reason) -{ - if (sc == NULL) - return NULL; - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "SECURITY_CONNECTOR:%p ref %d -> %d %s", sc, (int) sc->refcount.count, (int) sc->refcount.count + 1, reason); +grpc_security_connector *grpc_security_connector_ref( + grpc_security_connector *sc, const char *file, int line, + const char *reason) { + if (sc == NULL) return NULL; + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, + "SECURITY_CONNECTOR:%p ref %d -> %d %s", sc, + (int)sc->refcount.count, (int)sc->refcount.count + 1, reason); #else -grpc_security_connector * -grpc_security_connector_ref (grpc_security_connector * sc) -{ - if (sc == NULL) - return NULL; +grpc_security_connector *grpc_security_connector_ref( + grpc_security_connector *sc) { + if (sc == NULL) return NULL; #endif - gpr_ref (&sc->refcount); + gpr_ref(&sc->refcount); return sc; } #ifdef GRPC_SECURITY_CONNECTOR_REFCOUNT_DEBUG -void -grpc_security_connector_unref (grpc_security_connector * sc, const char *file, int line, const char *reason) -{ - if (sc == NULL) - return; - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "SECURITY_CONNECTOR:%p unref %d -> %d %s", sc, (int) sc->refcount.count, (int) sc->refcount.count - 1, reason); +void grpc_security_connector_unref(grpc_security_connector *sc, + const char *file, int line, + const char *reason) { + if (sc == NULL) return; + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, + "SECURITY_CONNECTOR:%p unref %d -> %d %s", sc, + (int)sc->refcount.count, (int)sc->refcount.count - 1, reason); #else -void -grpc_security_connector_unref (grpc_security_connector * sc) -{ - if (sc == NULL) - return; +void grpc_security_connector_unref(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(sc); } -static void -connector_pointer_arg_destroy (void *p) -{ - GRPC_SECURITY_CONNECTOR_UNREF (p, "connector_pointer_arg"); +static void connector_pointer_arg_destroy(void *p) { + GRPC_SECURITY_CONNECTOR_UNREF(p, "connector_pointer_arg"); } -static void * -connector_pointer_arg_copy (void *p) -{ - return GRPC_SECURITY_CONNECTOR_REF (p, "connector_pointer_arg"); +static void *connector_pointer_arg_copy(void *p) { + return GRPC_SECURITY_CONNECTOR_REF(p, "connector_pointer_arg"); } -grpc_arg -grpc_security_connector_to_arg (grpc_security_connector * sc) -{ +grpc_arg grpc_security_connector_to_arg(grpc_security_connector *sc) { grpc_arg result; result.type = GRPC_ARG_POINTER; result.key = GRPC_SECURITY_CONNECTOR_ARG; @@ -201,159 +181,150 @@ grpc_security_connector_to_arg (grpc_security_connector * sc) return result; } -grpc_security_connector * -grpc_security_connector_from_arg (const grpc_arg * arg) -{ - if (strcmp (arg->key, GRPC_SECURITY_CONNECTOR_ARG)) +grpc_security_connector *grpc_security_connector_from_arg(const grpc_arg *arg) { + if (strcmp(arg->key, GRPC_SECURITY_CONNECTOR_ARG)) return NULL; + if (arg->type != GRPC_ARG_POINTER) { + gpr_log(GPR_ERROR, "Invalid type %d for arg %s", arg->type, + GRPC_SECURITY_CONNECTOR_ARG); return NULL; - if (arg->type != GRPC_ARG_POINTER) - { - gpr_log (GPR_ERROR, "Invalid type %d for arg %s", arg->type, GRPC_SECURITY_CONNECTOR_ARG); - return NULL; - } + } return arg->value.pointer.p; } -grpc_security_connector * -grpc_find_security_connector_in_args (const grpc_channel_args * args) -{ +grpc_security_connector *grpc_find_security_connector_in_args( + const grpc_channel_args *args) { size_t i; - if (args == NULL) - return NULL; - for (i = 0; i < args->num_args; i++) - { - grpc_security_connector *sc = grpc_security_connector_from_arg (&args->args[i]); - if (sc != NULL) - return sc; - } + if (args == NULL) return NULL; + for (i = 0; i < args->num_args; i++) { + grpc_security_connector *sc = + grpc_security_connector_from_arg(&args->args[i]); + if (sc != NULL) return sc; + } return NULL; } -static int -check_request_metadata_creds (grpc_credentials * creds) -{ - if (creds != NULL && !grpc_credentials_has_request_metadata (creds)) - { - gpr_log (GPR_ERROR, "Incompatible credentials for channel security connector: needs to " "set request metadata."); - return 0; - } +static int check_request_metadata_creds(grpc_credentials *creds) { + if (creds != NULL && !grpc_credentials_has_request_metadata(creds)) { + gpr_log(GPR_ERROR, + "Incompatible credentials for channel security connector: needs to " + "set request metadata."); + return 0; + } return 1; } /* -- Fake implementation. -- */ -typedef struct -{ +typedef struct { grpc_channel_security_connector base; int call_host_check_is_async; } grpc_fake_channel_security_connector; -static void -fake_channel_destroy (grpc_security_connector * sc) -{ - grpc_channel_security_connector *c = (grpc_channel_security_connector *) sc; - grpc_credentials_unref (c->request_metadata_creds); - GRPC_AUTH_CONTEXT_UNREF (sc->auth_context, "connector"); - gpr_free (sc); +static void fake_channel_destroy(grpc_security_connector *sc) { + grpc_channel_security_connector *c = (grpc_channel_security_connector *)sc; + grpc_credentials_unref(c->request_metadata_creds); + GRPC_AUTH_CONTEXT_UNREF(sc->auth_context, "connector"); + gpr_free(sc); } -static void -fake_server_destroy (grpc_security_connector * sc) -{ - GRPC_AUTH_CONTEXT_UNREF (sc->auth_context, "connector"); - gpr_free (sc); +static void fake_server_destroy(grpc_security_connector *sc) { + GRPC_AUTH_CONTEXT_UNREF(sc->auth_context, "connector"); + gpr_free(sc); } -static grpc_security_status -fake_check_peer (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data) -{ +static grpc_security_status fake_check_peer(grpc_security_connector *sc, + tsi_peer peer, + grpc_security_check_cb cb, + void *user_data) { const char *prop_name; grpc_security_status status = GRPC_SECURITY_OK; - if (peer.property_count != 1) - { - gpr_log (GPR_ERROR, "Fake peers should only have 1 property."); - status = GRPC_SECURITY_ERROR; - goto end; - } + if (peer.property_count != 1) { + gpr_log(GPR_ERROR, "Fake peers should only have 1 property."); + status = GRPC_SECURITY_ERROR; + goto end; + } prop_name = peer.properties[0].name; - if (prop_name == NULL || strcmp (prop_name, TSI_CERTIFICATE_TYPE_PEER_PROPERTY)) - { - gpr_log (GPR_ERROR, "Unexpected property in fake peer: %s.", prop_name == NULL ? "" : prop_name); - status = GRPC_SECURITY_ERROR; - goto end; - } - if (strncmp (peer.properties[0].value.data, TSI_FAKE_CERTIFICATE_TYPE, peer.properties[0].value.length)) - { - gpr_log (GPR_ERROR, "Invalid value for cert type property."); - status = GRPC_SECURITY_ERROR; - goto end; - } - GRPC_AUTH_CONTEXT_UNREF (sc->auth_context, "connector"); - sc->auth_context = grpc_auth_context_create (NULL); - grpc_auth_context_add_cstring_property (sc->auth_context, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME, GRPC_FAKE_TRANSPORT_SECURITY_TYPE); + if (prop_name == NULL || + strcmp(prop_name, TSI_CERTIFICATE_TYPE_PEER_PROPERTY)) { + gpr_log(GPR_ERROR, "Unexpected property in fake peer: %s.", + prop_name == NULL ? "" : prop_name); + status = GRPC_SECURITY_ERROR; + goto end; + } + if (strncmp(peer.properties[0].value.data, TSI_FAKE_CERTIFICATE_TYPE, + peer.properties[0].value.length)) { + gpr_log(GPR_ERROR, "Invalid value for cert type property."); + status = GRPC_SECURITY_ERROR; + goto end; + } + GRPC_AUTH_CONTEXT_UNREF(sc->auth_context, "connector"); + sc->auth_context = grpc_auth_context_create(NULL); + grpc_auth_context_add_cstring_property( + sc->auth_context, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME, + GRPC_FAKE_TRANSPORT_SECURITY_TYPE); end: - tsi_peer_destruct (&peer); + tsi_peer_destruct(&peer); return status; } -static grpc_security_status -fake_channel_check_call_host (grpc_exec_ctx * exec_ctx, grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data) -{ - grpc_fake_channel_security_connector *c = (grpc_fake_channel_security_connector *) sc; - if (c->call_host_check_is_async) - { - cb (exec_ctx, user_data, GRPC_SECURITY_OK); - return GRPC_SECURITY_PENDING; - } - else - { - return GRPC_SECURITY_OK; - } +static grpc_security_status fake_channel_check_call_host( + grpc_exec_ctx *exec_ctx, grpc_channel_security_connector *sc, + const char *host, grpc_security_check_cb cb, void *user_data) { + grpc_fake_channel_security_connector *c = + (grpc_fake_channel_security_connector *)sc; + if (c->call_host_check_is_async) { + cb(exec_ctx, user_data, GRPC_SECURITY_OK); + return GRPC_SECURITY_PENDING; + } else { + return GRPC_SECURITY_OK; + } } -static void -fake_channel_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) -{ - grpc_do_security_handshake (exec_ctx, tsi_create_fake_handshaker (1), sc, nonsecure_endpoint, cb, user_data); +static void fake_channel_do_handshake(grpc_exec_ctx *exec_ctx, + grpc_security_connector *sc, + grpc_endpoint *nonsecure_endpoint, + grpc_security_handshake_done_cb cb, + void *user_data) { + grpc_do_security_handshake(exec_ctx, tsi_create_fake_handshaker(1), sc, + nonsecure_endpoint, cb, user_data); } -static void -fake_server_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) -{ - grpc_do_security_handshake (exec_ctx, tsi_create_fake_handshaker (0), sc, nonsecure_endpoint, cb, user_data); +static void fake_server_do_handshake(grpc_exec_ctx *exec_ctx, + grpc_security_connector *sc, + grpc_endpoint *nonsecure_endpoint, + grpc_security_handshake_done_cb cb, + void *user_data) { + grpc_do_security_handshake(exec_ctx, tsi_create_fake_handshaker(0), sc, + nonsecure_endpoint, cb, user_data); } static grpc_security_connector_vtable fake_channel_vtable = { - fake_channel_destroy, fake_channel_do_handshake, fake_check_peer -}; + fake_channel_destroy, fake_channel_do_handshake, fake_check_peer}; static grpc_security_connector_vtable fake_server_vtable = { - fake_server_destroy, fake_server_do_handshake, fake_check_peer -}; - -grpc_channel_security_connector * -grpc_fake_channel_security_connector_create (grpc_credentials * request_metadata_creds, int call_host_check_is_async) -{ - grpc_fake_channel_security_connector *c = gpr_malloc (sizeof (grpc_fake_channel_security_connector)); - memset (c, 0, sizeof (grpc_fake_channel_security_connector)); - gpr_ref_init (&c->base.base.refcount, 1); + fake_server_destroy, fake_server_do_handshake, fake_check_peer}; + +grpc_channel_security_connector *grpc_fake_channel_security_connector_create( + grpc_credentials *request_metadata_creds, int call_host_check_is_async) { + grpc_fake_channel_security_connector *c = + gpr_malloc(sizeof(grpc_fake_channel_security_connector)); + memset(c, 0, sizeof(grpc_fake_channel_security_connector)); + gpr_ref_init(&c->base.base.refcount, 1); c->base.base.is_client_side = 1; c->base.base.url_scheme = GRPC_FAKE_SECURITY_URL_SCHEME; c->base.base.vtable = &fake_channel_vtable; - GPR_ASSERT (check_request_metadata_creds (request_metadata_creds)); - c->base.request_metadata_creds = grpc_credentials_ref (request_metadata_creds); + GPR_ASSERT(check_request_metadata_creds(request_metadata_creds)); + c->base.request_metadata_creds = grpc_credentials_ref(request_metadata_creds); c->base.check_call_host = fake_channel_check_call_host; c->call_host_check_is_async = call_host_check_is_async; return &c->base; } -grpc_security_connector * -grpc_fake_server_security_connector_create (void) -{ - grpc_security_connector *c = gpr_malloc (sizeof (grpc_security_connector)); - memset (c, 0, sizeof (grpc_security_connector)); - gpr_ref_init (&c->refcount, 1); +grpc_security_connector *grpc_fake_server_security_connector_create(void) { + grpc_security_connector *c = gpr_malloc(sizeof(grpc_security_connector)); + memset(c, 0, sizeof(grpc_security_connector)); + gpr_ref_init(&c->refcount, 1); c->is_client_side = 0; c->vtable = &fake_server_vtable; c->url_scheme = GRPC_FAKE_SECURITY_URL_SCHEME; @@ -362,8 +333,7 @@ grpc_fake_server_security_connector_create (void) /* --- Ssl implementation. --- */ -typedef struct -{ +typedef struct { grpc_channel_security_connector base; tsi_ssl_handshaker_factory *handshaker_factory; char *target_name; @@ -371,268 +341,253 @@ typedef struct tsi_peer peer; } grpc_ssl_channel_security_connector; -typedef struct -{ +typedef struct { grpc_security_connector base; tsi_ssl_handshaker_factory *handshaker_factory; } grpc_ssl_server_security_connector; -static void -ssl_channel_destroy (grpc_security_connector * sc) -{ - grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *) sc; - grpc_credentials_unref (c->base.request_metadata_creds); - if (c->handshaker_factory != NULL) - { - tsi_ssl_handshaker_factory_destroy (c->handshaker_factory); - } - if (c->target_name != NULL) - gpr_free (c->target_name); - if (c->overridden_target_name != NULL) - gpr_free (c->overridden_target_name); - tsi_peer_destruct (&c->peer); - GRPC_AUTH_CONTEXT_UNREF (sc->auth_context, "connector"); - gpr_free (sc); -} - -static void -ssl_server_destroy (grpc_security_connector * sc) -{ - grpc_ssl_server_security_connector *c = (grpc_ssl_server_security_connector *) sc; - if (c->handshaker_factory != NULL) - { - tsi_ssl_handshaker_factory_destroy (c->handshaker_factory); - } - GRPC_AUTH_CONTEXT_UNREF (sc->auth_context, "connector"); - gpr_free (sc); -} - -static grpc_security_status -ssl_create_handshaker (tsi_ssl_handshaker_factory * handshaker_factory, int is_client, const char *peer_name, tsi_handshaker ** handshaker) -{ +static void ssl_channel_destroy(grpc_security_connector *sc) { + grpc_ssl_channel_security_connector *c = + (grpc_ssl_channel_security_connector *)sc; + grpc_credentials_unref(c->base.request_metadata_creds); + if (c->handshaker_factory != NULL) { + tsi_ssl_handshaker_factory_destroy(c->handshaker_factory); + } + if (c->target_name != NULL) gpr_free(c->target_name); + if (c->overridden_target_name != NULL) gpr_free(c->overridden_target_name); + tsi_peer_destruct(&c->peer); + GRPC_AUTH_CONTEXT_UNREF(sc->auth_context, "connector"); + gpr_free(sc); +} + +static void ssl_server_destroy(grpc_security_connector *sc) { + grpc_ssl_server_security_connector *c = + (grpc_ssl_server_security_connector *)sc; + if (c->handshaker_factory != NULL) { + tsi_ssl_handshaker_factory_destroy(c->handshaker_factory); + } + GRPC_AUTH_CONTEXT_UNREF(sc->auth_context, "connector"); + gpr_free(sc); +} + +static grpc_security_status ssl_create_handshaker( + tsi_ssl_handshaker_factory *handshaker_factory, int is_client, + const char *peer_name, tsi_handshaker **handshaker) { tsi_result result = TSI_OK; - if (handshaker_factory == NULL) + if (handshaker_factory == NULL) return GRPC_SECURITY_ERROR; + result = tsi_ssl_handshaker_factory_create_handshaker( + handshaker_factory, is_client ? peer_name : NULL, handshaker); + if (result != TSI_OK) { + gpr_log(GPR_ERROR, "Handshaker creation failed with error %s.", + tsi_result_to_string(result)); return GRPC_SECURITY_ERROR; - result = tsi_ssl_handshaker_factory_create_handshaker (handshaker_factory, is_client ? peer_name : NULL, handshaker); - if (result != TSI_OK) - { - gpr_log (GPR_ERROR, "Handshaker creation failed with error %s.", tsi_result_to_string (result)); - return GRPC_SECURITY_ERROR; - } + } return GRPC_SECURITY_OK; } -static void -ssl_channel_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) -{ - grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *) sc; +static void ssl_channel_do_handshake(grpc_exec_ctx *exec_ctx, + grpc_security_connector *sc, + grpc_endpoint *nonsecure_endpoint, + grpc_security_handshake_done_cb cb, + void *user_data) { + grpc_ssl_channel_security_connector *c = + (grpc_ssl_channel_security_connector *)sc; tsi_handshaker *handshaker; - grpc_security_status status = ssl_create_handshaker (c->handshaker_factory, 1, - c->overridden_target_name != NULL ? c->overridden_target_name : c->target_name, - &handshaker); - if (status != GRPC_SECURITY_OK) - { - cb (exec_ctx, user_data, status, nonsecure_endpoint, NULL); - } - else - { - grpc_do_security_handshake (exec_ctx, handshaker, sc, nonsecure_endpoint, cb, user_data); - } -} - -static void -ssl_server_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data) -{ - grpc_ssl_server_security_connector *c = (grpc_ssl_server_security_connector *) sc; + grpc_security_status status = ssl_create_handshaker( + c->handshaker_factory, 1, + c->overridden_target_name != NULL ? c->overridden_target_name + : c->target_name, + &handshaker); + if (status != GRPC_SECURITY_OK) { + cb(exec_ctx, user_data, status, nonsecure_endpoint, NULL); + } else { + grpc_do_security_handshake(exec_ctx, handshaker, sc, nonsecure_endpoint, cb, + user_data); + } +} + +static void ssl_server_do_handshake(grpc_exec_ctx *exec_ctx, + grpc_security_connector *sc, + grpc_endpoint *nonsecure_endpoint, + grpc_security_handshake_done_cb cb, + void *user_data) { + grpc_ssl_server_security_connector *c = + (grpc_ssl_server_security_connector *)sc; tsi_handshaker *handshaker; - grpc_security_status status = ssl_create_handshaker (c->handshaker_factory, 0, NULL, &handshaker); - if (status != GRPC_SECURITY_OK) - { - cb (exec_ctx, user_data, status, nonsecure_endpoint, NULL); - } - else - { - grpc_do_security_handshake (exec_ctx, handshaker, sc, nonsecure_endpoint, cb, user_data); - } + grpc_security_status status = + ssl_create_handshaker(c->handshaker_factory, 0, NULL, &handshaker); + if (status != GRPC_SECURITY_OK) { + cb(exec_ctx, user_data, status, nonsecure_endpoint, NULL); + } else { + grpc_do_security_handshake(exec_ctx, handshaker, sc, nonsecure_endpoint, cb, + user_data); + } } -static int -ssl_host_matches_name (const tsi_peer * peer, const char *peer_name) -{ +static int ssl_host_matches_name(const tsi_peer *peer, const char *peer_name) { char *allocated_name = NULL; int r; - if (strchr (peer_name, ':') != NULL) - { - char *ignored_port; - gpr_split_host_port (peer_name, &allocated_name, &ignored_port); - gpr_free (ignored_port); - peer_name = allocated_name; - if (!peer_name) - return 0; - } - r = tsi_ssl_peer_matches_name (peer, peer_name); - gpr_free (allocated_name); + if (strchr(peer_name, ':') != NULL) { + char *ignored_port; + gpr_split_host_port(peer_name, &allocated_name, &ignored_port); + gpr_free(ignored_port); + peer_name = allocated_name; + if (!peer_name) return 0; + } + r = tsi_ssl_peer_matches_name(peer, peer_name); + gpr_free(allocated_name); return r; } -grpc_auth_context * -tsi_ssl_peer_to_auth_context (const tsi_peer * peer) -{ +grpc_auth_context *tsi_ssl_peer_to_auth_context(const tsi_peer *peer) { size_t i; grpc_auth_context *ctx = NULL; const char *peer_identity_property_name = NULL; /* The caller has checked the certificate type property. */ - GPR_ASSERT (peer->property_count >= 1); - ctx = grpc_auth_context_create (NULL); - grpc_auth_context_add_cstring_property (ctx, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME, GRPC_SSL_TRANSPORT_SECURITY_TYPE); - for (i = 0; i < peer->property_count; i++) - { - const tsi_peer_property *prop = &peer->properties[i]; - if (prop->name == NULL) - continue; - if (strcmp (prop->name, TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY) == 0) - { - /* If there is no subject alt name, have the CN as the identity. */ - if (peer_identity_property_name == NULL) - { - peer_identity_property_name = GRPC_X509_CN_PROPERTY_NAME; - } - grpc_auth_context_add_property (ctx, GRPC_X509_CN_PROPERTY_NAME, prop->value.data, prop->value.length); - } - else if (strcmp (prop->name, TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY) == 0) - { - peer_identity_property_name = GRPC_X509_SAN_PROPERTY_NAME; - grpc_auth_context_add_property (ctx, GRPC_X509_SAN_PROPERTY_NAME, prop->value.data, prop->value.length); - } - } - if (peer_identity_property_name != NULL) - { - GPR_ASSERT (grpc_auth_context_set_peer_identity_property_name (ctx, peer_identity_property_name) == 1); - } + GPR_ASSERT(peer->property_count >= 1); + ctx = grpc_auth_context_create(NULL); + grpc_auth_context_add_cstring_property( + ctx, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME, + GRPC_SSL_TRANSPORT_SECURITY_TYPE); + for (i = 0; i < peer->property_count; i++) { + const tsi_peer_property *prop = &peer->properties[i]; + if (prop->name == NULL) continue; + if (strcmp(prop->name, TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY) == 0) { + /* If there is no subject alt name, have the CN as the identity. */ + if (peer_identity_property_name == NULL) { + peer_identity_property_name = GRPC_X509_CN_PROPERTY_NAME; + } + grpc_auth_context_add_property(ctx, GRPC_X509_CN_PROPERTY_NAME, + prop->value.data, prop->value.length); + } else if (strcmp(prop->name, + TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY) == 0) { + peer_identity_property_name = GRPC_X509_SAN_PROPERTY_NAME; + grpc_auth_context_add_property(ctx, GRPC_X509_SAN_PROPERTY_NAME, + prop->value.data, prop->value.length); + } + } + if (peer_identity_property_name != NULL) { + GPR_ASSERT(grpc_auth_context_set_peer_identity_property_name( + ctx, peer_identity_property_name) == 1); + } return ctx; } -static grpc_security_status -ssl_check_peer (grpc_security_connector * sc, const char *peer_name, const tsi_peer * peer) -{ +static grpc_security_status ssl_check_peer(grpc_security_connector *sc, + const char *peer_name, + const tsi_peer *peer) { /* Check the ALPN. */ - const tsi_peer_property *p = tsi_peer_get_property_by_name (peer, TSI_SSL_ALPN_SELECTED_PROTOCOL); - if (p == NULL) - { - gpr_log (GPR_ERROR, "Missing selected ALPN property."); - return GRPC_SECURITY_ERROR; - } - if (!grpc_chttp2_is_alpn_version_supported (p->value.data, p->value.length)) - { - gpr_log (GPR_ERROR, "Invalid ALPN value."); - return GRPC_SECURITY_ERROR; - } + const tsi_peer_property *p = + tsi_peer_get_property_by_name(peer, TSI_SSL_ALPN_SELECTED_PROTOCOL); + if (p == NULL) { + gpr_log(GPR_ERROR, "Missing selected ALPN property."); + return GRPC_SECURITY_ERROR; + } + if (!grpc_chttp2_is_alpn_version_supported(p->value.data, p->value.length)) { + gpr_log(GPR_ERROR, "Invalid ALPN value."); + return GRPC_SECURITY_ERROR; + } /* Check the peer name if specified. */ - if (peer_name != NULL && !ssl_host_matches_name (peer, peer_name)) - { - gpr_log (GPR_ERROR, "Peer name %s is not in peer certificate", peer_name); - return GRPC_SECURITY_ERROR; - } - if (sc->auth_context != NULL) - { - GRPC_AUTH_CONTEXT_UNREF (sc->auth_context, "connector"); - } - sc->auth_context = tsi_ssl_peer_to_auth_context (peer); + if (peer_name != NULL && !ssl_host_matches_name(peer, peer_name)) { + gpr_log(GPR_ERROR, "Peer name %s is not in peer certificate", peer_name); + return GRPC_SECURITY_ERROR; + } + if (sc->auth_context != NULL) { + GRPC_AUTH_CONTEXT_UNREF(sc->auth_context, "connector"); + } + sc->auth_context = tsi_ssl_peer_to_auth_context(peer); return GRPC_SECURITY_OK; } -static grpc_security_status -ssl_channel_check_peer (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data) -{ - grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *) sc; +static grpc_security_status ssl_channel_check_peer(grpc_security_connector *sc, + tsi_peer peer, + grpc_security_check_cb cb, + void *user_data) { + grpc_ssl_channel_security_connector *c = + (grpc_ssl_channel_security_connector *)sc; grpc_security_status status; - tsi_peer_destruct (&c->peer); + tsi_peer_destruct(&c->peer); c->peer = peer; - status = ssl_check_peer (sc, c->overridden_target_name != NULL ? c->overridden_target_name : c->target_name, &peer); + status = ssl_check_peer(sc, c->overridden_target_name != NULL + ? c->overridden_target_name + : c->target_name, + &peer); return status; } -static grpc_security_status -ssl_server_check_peer (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data) -{ - grpc_security_status status = ssl_check_peer (sc, NULL, &peer); - tsi_peer_destruct (&peer); +static grpc_security_status ssl_server_check_peer(grpc_security_connector *sc, + tsi_peer peer, + grpc_security_check_cb cb, + void *user_data) { + grpc_security_status status = ssl_check_peer(sc, NULL, &peer); + tsi_peer_destruct(&peer); return status; } -static grpc_security_status -ssl_channel_check_call_host (grpc_exec_ctx * exec_ctx, grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data) -{ - grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *) sc; +static grpc_security_status ssl_channel_check_call_host( + grpc_exec_ctx *exec_ctx, grpc_channel_security_connector *sc, + const char *host, grpc_security_check_cb cb, void *user_data) { + grpc_ssl_channel_security_connector *c = + (grpc_ssl_channel_security_connector *)sc; - if (ssl_host_matches_name (&c->peer, host)) - return GRPC_SECURITY_OK; + if (ssl_host_matches_name(&c->peer, host)) return GRPC_SECURITY_OK; /* If the target name was overridden, then the original target_name was 'checked' transitively during the previous peer check at the end of the handshake. */ - if (c->overridden_target_name != NULL && strcmp (host, c->target_name) == 0) - { - return GRPC_SECURITY_OK; - } - else - { - return GRPC_SECURITY_ERROR; - } + if (c->overridden_target_name != NULL && strcmp(host, c->target_name) == 0) { + return GRPC_SECURITY_OK; + } else { + return GRPC_SECURITY_ERROR; + } } static grpc_security_connector_vtable ssl_channel_vtable = { - ssl_channel_destroy, ssl_channel_do_handshake, ssl_channel_check_peer -}; + ssl_channel_destroy, ssl_channel_do_handshake, ssl_channel_check_peer}; static grpc_security_connector_vtable ssl_server_vtable = { - ssl_server_destroy, ssl_server_do_handshake, ssl_server_check_peer -}; + ssl_server_destroy, ssl_server_do_handshake, ssl_server_check_peer}; static gpr_slice default_pem_root_certs; -static void -init_default_pem_root_certs (void) -{ +static void init_default_pem_root_certs(void) { /* First try to load the roots from the environment. */ - char *default_root_certs_path = gpr_getenv (GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR); - if (default_root_certs_path == NULL) - { - default_pem_root_certs = gpr_empty_slice (); - } - else - { - default_pem_root_certs = gpr_load_file (default_root_certs_path, 0, NULL); - gpr_free (default_root_certs_path); - } + char *default_root_certs_path = + gpr_getenv(GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR); + if (default_root_certs_path == NULL) { + default_pem_root_certs = gpr_empty_slice(); + } else { + default_pem_root_certs = gpr_load_file(default_root_certs_path, 0, NULL); + gpr_free(default_root_certs_path); + } /* Fall back to installed certs if needed. */ - if (GPR_SLICE_IS_EMPTY (default_pem_root_certs)) - { - default_pem_root_certs = gpr_load_file (installed_roots_path, 0, NULL); - } + if (GPR_SLICE_IS_EMPTY(default_pem_root_certs)) { + default_pem_root_certs = gpr_load_file(installed_roots_path, 0, NULL); + } } -size_t -grpc_get_default_ssl_roots (const unsigned char **pem_root_certs) -{ +size_t grpc_get_default_ssl_roots(const unsigned char **pem_root_certs) { /* TODO(jboeuf@google.com): Maybe revisit the approach which consists in loading all the roots once for the lifetime of the process. */ static gpr_once once = GPR_ONCE_INIT; - gpr_once_init (&once, init_default_pem_root_certs); - *pem_root_certs = GPR_SLICE_START_PTR (default_pem_root_certs); - return GPR_SLICE_LENGTH (default_pem_root_certs); -} - -grpc_security_status -grpc_ssl_channel_security_connector_create (grpc_credentials * request_metadata_creds, const grpc_ssl_config * config, const char *target_name, const char *overridden_target_name, grpc_channel_security_connector ** sc) -{ - size_t num_alpn_protocols = grpc_chttp2_num_alpn_versions (); - const unsigned char **alpn_protocol_strings = gpr_malloc (sizeof (const char *) * num_alpn_protocols); - unsigned char *alpn_protocol_string_lengths = gpr_malloc (sizeof (unsigned char) * num_alpn_protocols); + gpr_once_init(&once, init_default_pem_root_certs); + *pem_root_certs = GPR_SLICE_START_PTR(default_pem_root_certs); + return GPR_SLICE_LENGTH(default_pem_root_certs); +} + +grpc_security_status grpc_ssl_channel_security_connector_create( + grpc_credentials *request_metadata_creds, const grpc_ssl_config *config, + const char *target_name, const char *overridden_target_name, + grpc_channel_security_connector **sc) { + size_t num_alpn_protocols = grpc_chttp2_num_alpn_versions(); + const unsigned char **alpn_protocol_strings = + gpr_malloc(sizeof(const char *) * num_alpn_protocols); + unsigned char *alpn_protocol_string_lengths = + gpr_malloc(sizeof(unsigned char) * num_alpn_protocols); tsi_result result = TSI_OK; grpc_ssl_channel_security_connector *c; size_t i; @@ -640,112 +595,120 @@ grpc_ssl_channel_security_connector_create (grpc_credentials * request_metadata_ size_t pem_root_certs_size; char *port; - for (i = 0; i < num_alpn_protocols; i++) - { - alpn_protocol_strings[i] = (const unsigned char *) grpc_chttp2_get_alpn_version_index (i); - alpn_protocol_string_lengths[i] = (unsigned char) strlen (grpc_chttp2_get_alpn_version_index (i)); - } - - if (config == NULL || target_name == NULL) - { - gpr_log (GPR_ERROR, "An ssl channel needs a config and a target name."); - goto error; - } - if (!check_request_metadata_creds (request_metadata_creds)) - { + for (i = 0; i < num_alpn_protocols; i++) { + alpn_protocol_strings[i] = + (const unsigned char *)grpc_chttp2_get_alpn_version_index(i); + alpn_protocol_string_lengths[i] = + (unsigned char)strlen(grpc_chttp2_get_alpn_version_index(i)); + } + + if (config == NULL || target_name == NULL) { + gpr_log(GPR_ERROR, "An ssl channel needs a config and a target name."); + goto error; + } + if (!check_request_metadata_creds(request_metadata_creds)) { + goto error; + } + if (config->pem_root_certs == NULL) { + pem_root_certs_size = grpc_get_default_ssl_roots(&pem_root_certs); + if (pem_root_certs == NULL || pem_root_certs_size == 0) { + gpr_log(GPR_ERROR, "Could not get default pem root certs."); goto error; } - if (config->pem_root_certs == NULL) - { - pem_root_certs_size = grpc_get_default_ssl_roots (&pem_root_certs); - if (pem_root_certs == NULL || pem_root_certs_size == 0) - { - gpr_log (GPR_ERROR, "Could not get default pem root certs."); - goto error; - } - } - else - { - pem_root_certs = config->pem_root_certs; - pem_root_certs_size = config->pem_root_certs_size; - } + } else { + pem_root_certs = config->pem_root_certs; + pem_root_certs_size = config->pem_root_certs_size; + } - c = gpr_malloc (sizeof (grpc_ssl_channel_security_connector)); - memset (c, 0, sizeof (grpc_ssl_channel_security_connector)); + c = gpr_malloc(sizeof(grpc_ssl_channel_security_connector)); + memset(c, 0, sizeof(grpc_ssl_channel_security_connector)); - gpr_ref_init (&c->base.base.refcount, 1); + gpr_ref_init(&c->base.base.refcount, 1); c->base.base.vtable = &ssl_channel_vtable; c->base.base.is_client_side = 1; c->base.base.url_scheme = GRPC_SSL_URL_SCHEME; - c->base.request_metadata_creds = grpc_credentials_ref (request_metadata_creds); + c->base.request_metadata_creds = grpc_credentials_ref(request_metadata_creds); c->base.check_call_host = ssl_channel_check_call_host; - gpr_split_host_port (target_name, &c->target_name, &port); - gpr_free (port); - if (overridden_target_name != NULL) - { - c->overridden_target_name = gpr_strdup (overridden_target_name); - } - result = tsi_create_ssl_client_handshaker_factory (config->pem_private_key, config->pem_private_key_size, config->pem_cert_chain, config->pem_cert_chain_size, pem_root_certs, pem_root_certs_size, ssl_cipher_suites (), alpn_protocol_strings, alpn_protocol_string_lengths, (uint16_t) num_alpn_protocols, &c->handshaker_factory); - 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); - *sc = NULL; - goto error; - } + gpr_split_host_port(target_name, &c->target_name, &port); + gpr_free(port); + if (overridden_target_name != NULL) { + c->overridden_target_name = gpr_strdup(overridden_target_name); + } + result = tsi_create_ssl_client_handshaker_factory( + config->pem_private_key, config->pem_private_key_size, + config->pem_cert_chain, config->pem_cert_chain_size, pem_root_certs, + pem_root_certs_size, ssl_cipher_suites(), alpn_protocol_strings, + alpn_protocol_string_lengths, (uint16_t)num_alpn_protocols, + &c->handshaker_factory); + 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); + *sc = NULL; + goto error; + } *sc = &c->base; - gpr_free (alpn_protocol_strings); - gpr_free (alpn_protocol_string_lengths); + gpr_free(alpn_protocol_strings); + gpr_free(alpn_protocol_string_lengths); return GRPC_SECURITY_OK; error: - gpr_free (alpn_protocol_strings); - gpr_free (alpn_protocol_string_lengths); + gpr_free(alpn_protocol_strings); + gpr_free(alpn_protocol_string_lengths); return GRPC_SECURITY_ERROR; } -grpc_security_status -grpc_ssl_server_security_connector_create (const grpc_ssl_server_config * config, grpc_security_connector ** sc) -{ - size_t num_alpn_protocols = grpc_chttp2_num_alpn_versions (); - const unsigned char **alpn_protocol_strings = gpr_malloc (sizeof (const char *) * num_alpn_protocols); - unsigned char *alpn_protocol_string_lengths = gpr_malloc (sizeof (unsigned char) * num_alpn_protocols); +grpc_security_status grpc_ssl_server_security_connector_create( + const grpc_ssl_server_config *config, grpc_security_connector **sc) { + size_t num_alpn_protocols = grpc_chttp2_num_alpn_versions(); + const unsigned char **alpn_protocol_strings = + gpr_malloc(sizeof(const char *) * num_alpn_protocols); + unsigned char *alpn_protocol_string_lengths = + gpr_malloc(sizeof(unsigned char) * num_alpn_protocols); tsi_result result = TSI_OK; grpc_ssl_server_security_connector *c; size_t i; - for (i = 0; i < num_alpn_protocols; i++) - { - alpn_protocol_strings[i] = (const unsigned char *) grpc_chttp2_get_alpn_version_index (i); - alpn_protocol_string_lengths[i] = (unsigned char) strlen (grpc_chttp2_get_alpn_version_index (i)); - } - - if (config == NULL || config->num_key_cert_pairs == 0) - { - gpr_log (GPR_ERROR, "An SSL server needs a key and a cert."); - goto error; - } - c = gpr_malloc (sizeof (grpc_ssl_server_security_connector)); - memset (c, 0, sizeof (grpc_ssl_server_security_connector)); - - gpr_ref_init (&c->base.refcount, 1); + for (i = 0; i < num_alpn_protocols; i++) { + alpn_protocol_strings[i] = + (const unsigned char *)grpc_chttp2_get_alpn_version_index(i); + alpn_protocol_string_lengths[i] = + (unsigned char)strlen(grpc_chttp2_get_alpn_version_index(i)); + } + + if (config == NULL || config->num_key_cert_pairs == 0) { + gpr_log(GPR_ERROR, "An SSL server needs a key and a cert."); + goto error; + } + c = gpr_malloc(sizeof(grpc_ssl_server_security_connector)); + memset(c, 0, sizeof(grpc_ssl_server_security_connector)); + + gpr_ref_init(&c->base.refcount, 1); c->base.url_scheme = GRPC_SSL_URL_SCHEME; c->base.vtable = &ssl_server_vtable; - result = tsi_create_ssl_server_handshaker_factory ((const unsigned char **) config->pem_private_keys, config->pem_private_keys_sizes, (const unsigned char **) config->pem_cert_chains, config->pem_cert_chains_sizes, config->num_key_cert_pairs, config->pem_root_certs, config->pem_root_certs_size, config->force_client_auth, ssl_cipher_suites (), alpn_protocol_strings, alpn_protocol_string_lengths, (uint16_t) num_alpn_protocols, &c->handshaker_factory); - if (result != TSI_OK) - { - gpr_log (GPR_ERROR, "Handshaker factory creation failed with %s.", tsi_result_to_string (result)); - ssl_server_destroy (&c->base); - *sc = NULL; - goto error; - } + result = tsi_create_ssl_server_handshaker_factory( + (const unsigned char **)config->pem_private_keys, + config->pem_private_keys_sizes, + (const unsigned char **)config->pem_cert_chains, + config->pem_cert_chains_sizes, config->num_key_cert_pairs, + config->pem_root_certs, config->pem_root_certs_size, + config->force_client_auth, ssl_cipher_suites(), alpn_protocol_strings, + alpn_protocol_string_lengths, (uint16_t)num_alpn_protocols, + &c->handshaker_factory); + if (result != TSI_OK) { + gpr_log(GPR_ERROR, "Handshaker factory creation failed with %s.", + tsi_result_to_string(result)); + ssl_server_destroy(&c->base); + *sc = NULL; + goto error; + } *sc = &c->base; - gpr_free (alpn_protocol_strings); - gpr_free (alpn_protocol_string_lengths); + gpr_free(alpn_protocol_strings); + gpr_free(alpn_protocol_string_lengths); return GRPC_SECURITY_OK; error: - gpr_free (alpn_protocol_strings); - gpr_free (alpn_protocol_string_lengths); + gpr_free(alpn_protocol_strings); + gpr_free(alpn_protocol_string_lengths); return GRPC_SECURITY_ERROR; } diff --git a/src/core/security/security_connector.h b/src/core/security/security_connector.h index 3af7f6f83ab..9218a3caab0 100644 --- a/src/core/security/security_connector.h +++ b/src/core/security/security_connector.h @@ -40,8 +40,7 @@ /* --- status enum. --- */ -typedef enum -{ +typedef enum { GRPC_SECURITY_OK = 0, GRPC_SECURITY_PENDING, GRPC_SECURITY_ERROR @@ -61,25 +60,32 @@ typedef struct grpc_security_connector grpc_security_connector; #define GRPC_SECURITY_CONNECTOR_ARG "grpc.security_connector" -typedef void (*grpc_security_check_cb) (grpc_exec_ctx * exec_ctx, void *user_data, grpc_security_status status); +typedef void (*grpc_security_check_cb)(grpc_exec_ctx *exec_ctx, void *user_data, + grpc_security_status status); /* Ownership of the secure_endpoint is transfered. */ -typedef void (*grpc_security_handshake_done_cb) (grpc_exec_ctx * exec_ctx, void *user_data, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint); - -typedef struct -{ - void (*destroy) (grpc_security_connector * sc); - void (*do_handshake) (grpc_exec_ctx * exec_ctx, grpc_security_connector * sc, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data); - grpc_security_status (*check_peer) (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data); +typedef void (*grpc_security_handshake_done_cb)(grpc_exec_ctx *exec_ctx, + void *user_data, + grpc_security_status status, + grpc_endpoint *wrapped_endpoint, + grpc_endpoint *secure_endpoint); + +typedef struct { + void (*destroy)(grpc_security_connector *sc); + void (*do_handshake)(grpc_exec_ctx *exec_ctx, grpc_security_connector *sc, + grpc_endpoint *nonsecure_endpoint, + grpc_security_handshake_done_cb cb, void *user_data); + grpc_security_status (*check_peer)(grpc_security_connector *sc, tsi_peer peer, + grpc_security_check_cb cb, + void *user_data); } grpc_security_connector_vtable; -struct grpc_security_connector -{ +struct grpc_security_connector { const grpc_security_connector_vtable *vtable; gpr_refcount refcount; int is_client_side; const char *url_scheme; - grpc_auth_context *auth_context; /* Populated after the peer is checked. */ + grpc_auth_context *auth_context; /* Populated after the peer is checked. */ }; /* Refcounting. */ @@ -88,17 +94,26 @@ struct grpc_security_connector grpc_security_connector_ref((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_security_connector * policy, const char *file, int line, const char *reason); +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, + 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)) -grpc_security_connector *grpc_security_connector_ref (grpc_security_connector * policy); -void grpc_security_connector_unref (grpc_security_connector * policy); +grpc_security_connector *grpc_security_connector_ref( + grpc_security_connector *policy); +void grpc_security_connector_unref(grpc_security_connector *policy); #endif /* Handshake. */ -void grpc_security_connector_do_handshake (grpc_exec_ctx * exec_ctx, grpc_security_connector * connector, grpc_endpoint * nonsecure_endpoint, grpc_security_handshake_done_cb cb, void *user_data); +void grpc_security_connector_do_handshake(grpc_exec_ctx *exec_ctx, + grpc_security_connector *connector, + grpc_endpoint *nonsecure_endpoint, + grpc_security_handshake_done_cb cb, + void *user_data); /* Check the peer. Implementations can choose to check the peer either synchronously or @@ -107,16 +122,19 @@ void grpc_security_connector_do_handshake (grpc_exec_ctx * exec_ctx, grpc_securi GRPC_SECURITY_PENDING unless an error is detected early on. Ownership of the peer is transfered. */ -grpc_security_status grpc_security_connector_check_peer (grpc_security_connector * sc, tsi_peer peer, grpc_security_check_cb cb, void *user_data); +grpc_security_status grpc_security_connector_check_peer( + grpc_security_connector *sc, tsi_peer peer, grpc_security_check_cb cb, + void *user_data); /* Util to encapsulate the connector in a channel arg. */ -grpc_arg grpc_security_connector_to_arg (grpc_security_connector * sc); +grpc_arg grpc_security_connector_to_arg(grpc_security_connector *sc); /* Util to get the connector from a channel arg. */ -grpc_security_connector *grpc_security_connector_from_arg (const grpc_arg * arg); +grpc_security_connector *grpc_security_connector_from_arg(const grpc_arg *arg); /* Util to find the connector from channel args. */ -grpc_security_connector *grpc_find_security_connector_in_args (const grpc_channel_args * args); +grpc_security_connector *grpc_find_security_connector_in_args( + const grpc_channel_args *args); /* --- channel_security_connector object. --- @@ -125,11 +143,14 @@ grpc_security_connector *grpc_find_security_connector_in_args (const grpc_channe typedef struct grpc_channel_security_connector grpc_channel_security_connector; -struct grpc_channel_security_connector -{ - grpc_security_connector base; /* requires is_client_side to be non 0. */ +struct grpc_channel_security_connector { + grpc_security_connector base; /* requires is_client_side to be non 0. */ grpc_credentials *request_metadata_creds; - grpc_security_status (*check_call_host) (grpc_exec_ctx * exec_ctx, grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data); + grpc_security_status (*check_call_host)(grpc_exec_ctx *exec_ctx, + grpc_channel_security_connector *sc, + const char *host, + grpc_security_check_cb cb, + void *user_data); }; /* Checks that the host that will be set for a call is acceptable. @@ -137,21 +158,23 @@ struct grpc_channel_security_connector asynchronously. In the first case, a successful call will return GRPC_SECURITY_OK. In the asynchronous case, the call will return GRPC_SECURITY_PENDING unless an error is detected early on. */ -grpc_security_status grpc_channel_security_connector_check_call_host (grpc_exec_ctx * exec_ctx, grpc_channel_security_connector * sc, const char *host, grpc_security_check_cb cb, void *user_data); +grpc_security_status grpc_channel_security_connector_check_call_host( + grpc_exec_ctx *exec_ctx, grpc_channel_security_connector *sc, + const char *host, grpc_security_check_cb cb, void *user_data); /* --- Creation security connectors. --- */ /* For TESTING ONLY! Creates a fake connector that emulates real channel security. */ -grpc_channel_security_connector *grpc_fake_channel_security_connector_create (grpc_credentials * request_metadata_creds, int call_host_check_is_async); +grpc_channel_security_connector *grpc_fake_channel_security_connector_create( + grpc_credentials *request_metadata_creds, int call_host_check_is_async); /* For TESTING ONLY! Creates a fake connector that emulates real server security. */ -grpc_security_connector *grpc_fake_server_security_connector_create (void); +grpc_security_connector *grpc_fake_server_security_connector_create(void); /* Config for ssl clients. */ -typedef struct -{ +typedef struct { unsigned char *pem_private_key; size_t pem_private_key_size; unsigned char *pem_cert_chain; @@ -173,14 +196,16 @@ typedef struct This function returns GRPC_SECURITY_OK in case of success or a specific error code otherwise. */ -grpc_security_status grpc_ssl_channel_security_connector_create (grpc_credentials * request_metadata_creds, const grpc_ssl_config * config, const char *target_name, const char *overridden_target_name, grpc_channel_security_connector ** sc); +grpc_security_status grpc_ssl_channel_security_connector_create( + grpc_credentials *request_metadata_creds, const grpc_ssl_config *config, + const char *target_name, const char *overridden_target_name, + grpc_channel_security_connector **sc); /* Gets the default ssl roots. */ -size_t grpc_get_default_ssl_roots (const unsigned char **pem_root_certs); +size_t grpc_get_default_ssl_roots(const unsigned char **pem_root_certs); /* Config for ssl servers. */ -typedef struct -{ +typedef struct { unsigned char **pem_private_keys; size_t *pem_private_keys_sizes; unsigned char **pem_cert_chains; @@ -197,12 +222,14 @@ typedef struct This function returns GRPC_SECURITY_OK in case of success or a specific error code otherwise. */ -grpc_security_status grpc_ssl_server_security_connector_create (const grpc_ssl_server_config * config, grpc_security_connector ** sc); +grpc_security_status grpc_ssl_server_security_connector_create( + const grpc_ssl_server_config *config, grpc_security_connector **sc); /* Util. */ -const tsi_peer_property *tsi_peer_get_property_by_name (const tsi_peer * peer, const char *name); +const tsi_peer_property *tsi_peer_get_property_by_name(const tsi_peer *peer, + const char *name); /* Exposed for testing only. */ -grpc_auth_context *tsi_ssl_peer_to_auth_context (const tsi_peer * peer); +grpc_auth_context *tsi_ssl_peer_to_auth_context(const tsi_peer *peer); #endif /* GRPC_INTERNAL_CORE_SECURITY_SECURITY_CONNECTOR_H */ diff --git a/src/core/security/security_context.c b/src/core/security/security_context.c index 5b3326d341e..95d80ba122f 100644 --- a/src/core/security/security_context.c +++ b/src/core/security/security_context.c @@ -44,317 +44,271 @@ /* --- grpc_call --- */ -grpc_call_error -grpc_call_set_credentials (grpc_call * call, grpc_credentials * creds) -{ +grpc_call_error grpc_call_set_credentials(grpc_call *call, + grpc_credentials *creds) { grpc_client_security_context *ctx = NULL; - if (!grpc_call_is_client (call)) - { - gpr_log (GPR_ERROR, "Method is client-side only."); - return GRPC_CALL_ERROR_NOT_ON_SERVER; - } - if (creds != NULL && !grpc_credentials_has_request_metadata_only (creds)) - { - gpr_log (GPR_ERROR, "Incompatible credentials to set on a call."); - return GRPC_CALL_ERROR; - } - ctx = (grpc_client_security_context *) grpc_call_context_get (call, GRPC_CONTEXT_SECURITY); - if (ctx == NULL) - { - ctx = grpc_client_security_context_create (); - ctx->creds = grpc_credentials_ref (creds); - grpc_call_context_set (call, GRPC_CONTEXT_SECURITY, ctx, grpc_client_security_context_destroy); - } - else - { - grpc_credentials_unref (ctx->creds); - ctx->creds = grpc_credentials_ref (creds); - } + if (!grpc_call_is_client(call)) { + gpr_log(GPR_ERROR, "Method is client-side only."); + return GRPC_CALL_ERROR_NOT_ON_SERVER; + } + if (creds != NULL && !grpc_credentials_has_request_metadata_only(creds)) { + gpr_log(GPR_ERROR, "Incompatible credentials to set on a call."); + return GRPC_CALL_ERROR; + } + ctx = (grpc_client_security_context *)grpc_call_context_get( + call, GRPC_CONTEXT_SECURITY); + if (ctx == NULL) { + ctx = grpc_client_security_context_create(); + ctx->creds = grpc_credentials_ref(creds); + grpc_call_context_set(call, GRPC_CONTEXT_SECURITY, ctx, + grpc_client_security_context_destroy); + } else { + grpc_credentials_unref(ctx->creds); + ctx->creds = grpc_credentials_ref(creds); + } return GRPC_CALL_OK; } -grpc_auth_context * -grpc_call_auth_context (grpc_call * call) -{ - void *sec_ctx = grpc_call_context_get (call, GRPC_CONTEXT_SECURITY); - if (sec_ctx == NULL) - return NULL; - return grpc_call_is_client (call) ? GRPC_AUTH_CONTEXT_REF (((grpc_client_security_context *) sec_ctx)->auth_context, "grpc_call_auth_context client") : GRPC_AUTH_CONTEXT_REF (((grpc_server_security_context *) sec_ctx)->auth_context, "grpc_call_auth_context server"); +grpc_auth_context *grpc_call_auth_context(grpc_call *call) { + void *sec_ctx = grpc_call_context_get(call, GRPC_CONTEXT_SECURITY); + if (sec_ctx == NULL) return NULL; + return grpc_call_is_client(call) + ? GRPC_AUTH_CONTEXT_REF( + ((grpc_client_security_context *)sec_ctx)->auth_context, + "grpc_call_auth_context client") + : GRPC_AUTH_CONTEXT_REF( + ((grpc_server_security_context *)sec_ctx)->auth_context, + "grpc_call_auth_context server"); } -void -grpc_auth_context_release (grpc_auth_context * context) -{ - GRPC_AUTH_CONTEXT_UNREF (context, "grpc_auth_context_unref"); +void grpc_auth_context_release(grpc_auth_context *context) { + GRPC_AUTH_CONTEXT_UNREF(context, "grpc_auth_context_unref"); } /* --- grpc_client_security_context --- */ -grpc_client_security_context * -grpc_client_security_context_create (void) -{ - grpc_client_security_context *ctx = gpr_malloc (sizeof (grpc_client_security_context)); - memset (ctx, 0, sizeof (grpc_client_security_context)); +grpc_client_security_context *grpc_client_security_context_create(void) { + grpc_client_security_context *ctx = + gpr_malloc(sizeof(grpc_client_security_context)); + memset(ctx, 0, sizeof(grpc_client_security_context)); return ctx; } -void -grpc_client_security_context_destroy (void *ctx) -{ - grpc_client_security_context *c = (grpc_client_security_context *) ctx; - grpc_credentials_unref (c->creds); - GRPC_AUTH_CONTEXT_UNREF (c->auth_context, "client_security_context"); - gpr_free (ctx); +void grpc_client_security_context_destroy(void *ctx) { + grpc_client_security_context *c = (grpc_client_security_context *)ctx; + grpc_credentials_unref(c->creds); + GRPC_AUTH_CONTEXT_UNREF(c->auth_context, "client_security_context"); + gpr_free(ctx); } /* --- grpc_server_security_context --- */ -grpc_server_security_context * -grpc_server_security_context_create (void) -{ - grpc_server_security_context *ctx = gpr_malloc (sizeof (grpc_server_security_context)); - memset (ctx, 0, sizeof (grpc_server_security_context)); +grpc_server_security_context *grpc_server_security_context_create(void) { + grpc_server_security_context *ctx = + gpr_malloc(sizeof(grpc_server_security_context)); + memset(ctx, 0, sizeof(grpc_server_security_context)); return ctx; } -void -grpc_server_security_context_destroy (void *ctx) -{ - grpc_server_security_context *c = (grpc_server_security_context *) ctx; - GRPC_AUTH_CONTEXT_UNREF (c->auth_context, "server_security_context"); - gpr_free (ctx); +void grpc_server_security_context_destroy(void *ctx) { + grpc_server_security_context *c = (grpc_server_security_context *)ctx; + GRPC_AUTH_CONTEXT_UNREF(c->auth_context, "server_security_context"); + gpr_free(ctx); } /* --- grpc_auth_context --- */ -static grpc_auth_property_iterator empty_iterator = { NULL, 0, NULL }; - -grpc_auth_context * -grpc_auth_context_create (grpc_auth_context * chained) -{ - grpc_auth_context *ctx = gpr_malloc (sizeof (grpc_auth_context)); - memset (ctx, 0, sizeof (grpc_auth_context)); - gpr_ref_init (&ctx->refcount, 1); - if (chained != NULL) - { - ctx->chained = GRPC_AUTH_CONTEXT_REF (chained, "chained"); - ctx->peer_identity_property_name = ctx->chained->peer_identity_property_name; - } +static grpc_auth_property_iterator empty_iterator = {NULL, 0, NULL}; + +grpc_auth_context *grpc_auth_context_create(grpc_auth_context *chained) { + grpc_auth_context *ctx = gpr_malloc(sizeof(grpc_auth_context)); + memset(ctx, 0, sizeof(grpc_auth_context)); + gpr_ref_init(&ctx->refcount, 1); + if (chained != NULL) { + ctx->chained = GRPC_AUTH_CONTEXT_REF(chained, "chained"); + ctx->peer_identity_property_name = + ctx->chained->peer_identity_property_name; + } return ctx; } #ifdef GRPC_AUTH_CONTEXT_REFCOUNT_DEBUG -grpc_auth_context * -grpc_auth_context_ref (grpc_auth_context * ctx, const char *file, int line, const char *reason) -{ - if (ctx == NULL) - return NULL; - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "AUTH_CONTEXT:%p ref %d -> %d %s", ctx, (int) ctx->refcount.count, (int) ctx->refcount.count + 1, reason); +grpc_auth_context *grpc_auth_context_ref(grpc_auth_context *ctx, + const char *file, int line, + const char *reason) { + if (ctx == NULL) return NULL; + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, + "AUTH_CONTEXT:%p ref %d -> %d %s", ctx, (int)ctx->refcount.count, + (int)ctx->refcount.count + 1, reason); #else -grpc_auth_context * -grpc_auth_context_ref (grpc_auth_context * ctx) -{ - if (ctx == NULL) - return NULL; +grpc_auth_context *grpc_auth_context_ref(grpc_auth_context *ctx) { + if (ctx == NULL) return NULL; #endif - gpr_ref (&ctx->refcount); + gpr_ref(&ctx->refcount); return ctx; } #ifdef GRPC_AUTH_CONTEXT_REFCOUNT_DEBUG -void -grpc_auth_context_unref (grpc_auth_context * ctx, const char *file, int line, const char *reason) -{ - if (ctx == NULL) - return; - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "AUTH_CONTEXT:%p unref %d -> %d %s", ctx, (int) ctx->refcount.count, (int) ctx->refcount.count - 1, reason); +void grpc_auth_context_unref(grpc_auth_context *ctx, const char *file, int line, + const char *reason) { + if (ctx == NULL) return; + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, + "AUTH_CONTEXT:%p unref %d -> %d %s", ctx, (int)ctx->refcount.count, + (int)ctx->refcount.count - 1, reason); #else -void -grpc_auth_context_unref (grpc_auth_context * ctx) -{ - if (ctx == NULL) - return; +void grpc_auth_context_unref(grpc_auth_context *ctx) { + if (ctx == NULL) return; #endif - if (gpr_unref (&ctx->refcount)) - { - size_t i; - GRPC_AUTH_CONTEXT_UNREF (ctx->chained, "chained"); - if (ctx->properties.array != NULL) - { - for (i = 0; i < ctx->properties.count; i++) - { - grpc_auth_property_reset (&ctx->properties.array[i]); - } - gpr_free (ctx->properties.array); - } - gpr_free (ctx); + if (gpr_unref(&ctx->refcount)) { + size_t i; + GRPC_AUTH_CONTEXT_UNREF(ctx->chained, "chained"); + if (ctx->properties.array != NULL) { + for (i = 0; i < ctx->properties.count; i++) { + grpc_auth_property_reset(&ctx->properties.array[i]); + } + gpr_free(ctx->properties.array); } + gpr_free(ctx); + } } -const char * -grpc_auth_context_peer_identity_property_name (const grpc_auth_context * ctx) -{ +const char *grpc_auth_context_peer_identity_property_name( + const grpc_auth_context *ctx) { return ctx->peer_identity_property_name; } -int -grpc_auth_context_set_peer_identity_property_name (grpc_auth_context * ctx, const char *name) -{ - grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name (ctx, name); - const grpc_auth_property *prop = grpc_auth_property_iterator_next (&it); - if (prop == NULL) - { - gpr_log (GPR_ERROR, "Property name %s not found in auth context.", name != NULL ? name : "NULL"); - return 0; - } +int grpc_auth_context_set_peer_identity_property_name(grpc_auth_context *ctx, + const char *name) { + grpc_auth_property_iterator it = + grpc_auth_context_find_properties_by_name(ctx, name); + const grpc_auth_property *prop = grpc_auth_property_iterator_next(&it); + if (prop == NULL) { + gpr_log(GPR_ERROR, "Property name %s not found in auth context.", + name != NULL ? name : "NULL"); + return 0; + } ctx->peer_identity_property_name = prop->name; return 1; } -int -grpc_auth_context_peer_is_authenticated (const grpc_auth_context * ctx) -{ +int grpc_auth_context_peer_is_authenticated(const grpc_auth_context *ctx) { return ctx->peer_identity_property_name == NULL ? 0 : 1; } -grpc_auth_property_iterator -grpc_auth_context_property_iterator (const grpc_auth_context * ctx) -{ +grpc_auth_property_iterator grpc_auth_context_property_iterator( + const grpc_auth_context *ctx) { grpc_auth_property_iterator it = empty_iterator; - if (ctx == NULL) - return it; + if (ctx == NULL) return it; it.ctx = ctx; return it; } -const grpc_auth_property * -grpc_auth_property_iterator_next (grpc_auth_property_iterator * it) -{ - if (it == NULL || it->ctx == NULL) - return NULL; - while (it->index == it->ctx->properties.count) - { - if (it->ctx->chained == NULL) - return NULL; - it->ctx = it->ctx->chained; - it->index = 0; - } - if (it->name == NULL) - { - return &it->ctx->properties.array[it->index++]; - } - else - { - while (it->index < it->ctx->properties.count) - { - const grpc_auth_property *prop = &it->ctx->properties.array[it->index++]; - GPR_ASSERT (prop->name != NULL); - if (strcmp (it->name, prop->name) == 0) - { - return prop; - } - } - /* We could not find the name, try another round. */ - return grpc_auth_property_iterator_next (it); +const grpc_auth_property *grpc_auth_property_iterator_next( + grpc_auth_property_iterator *it) { + if (it == NULL || it->ctx == NULL) return NULL; + while (it->index == it->ctx->properties.count) { + if (it->ctx->chained == NULL) return NULL; + it->ctx = it->ctx->chained; + it->index = 0; + } + if (it->name == NULL) { + return &it->ctx->properties.array[it->index++]; + } else { + while (it->index < it->ctx->properties.count) { + const grpc_auth_property *prop = &it->ctx->properties.array[it->index++]; + GPR_ASSERT(prop->name != NULL); + if (strcmp(it->name, prop->name) == 0) { + return prop; + } } + /* We could not find the name, try another round. */ + return grpc_auth_property_iterator_next(it); + } } -grpc_auth_property_iterator -grpc_auth_context_find_properties_by_name (const grpc_auth_context * ctx, const char *name) -{ +grpc_auth_property_iterator grpc_auth_context_find_properties_by_name( + const grpc_auth_context *ctx, const char *name) { grpc_auth_property_iterator it = empty_iterator; - if (ctx == NULL || name == NULL) - return empty_iterator; + if (ctx == NULL || name == NULL) return empty_iterator; it.ctx = ctx; it.name = name; return it; } -grpc_auth_property_iterator -grpc_auth_context_peer_identity (const grpc_auth_context * ctx) -{ - if (ctx == NULL) - return empty_iterator; - return grpc_auth_context_find_properties_by_name (ctx, ctx->peer_identity_property_name); +grpc_auth_property_iterator grpc_auth_context_peer_identity( + const grpc_auth_context *ctx) { + if (ctx == NULL) return empty_iterator; + return grpc_auth_context_find_properties_by_name( + ctx, ctx->peer_identity_property_name); } -static void -ensure_auth_context_capacity (grpc_auth_context * ctx) -{ - if (ctx->properties.count == ctx->properties.capacity) - { - ctx->properties.capacity = GPR_MAX (ctx->properties.capacity + 8, ctx->properties.capacity * 2); - ctx->properties.array = gpr_realloc (ctx->properties.array, ctx->properties.capacity * sizeof (grpc_auth_property)); - } +static void ensure_auth_context_capacity(grpc_auth_context *ctx) { + if (ctx->properties.count == ctx->properties.capacity) { + ctx->properties.capacity = + GPR_MAX(ctx->properties.capacity + 8, ctx->properties.capacity * 2); + ctx->properties.array = + gpr_realloc(ctx->properties.array, + ctx->properties.capacity * sizeof(grpc_auth_property)); + } } -void -grpc_auth_context_add_property (grpc_auth_context * ctx, const char *name, const char *value, size_t value_length) -{ +void grpc_auth_context_add_property(grpc_auth_context *ctx, const char *name, + const char *value, size_t value_length) { grpc_auth_property *prop; - ensure_auth_context_capacity (ctx); + ensure_auth_context_capacity(ctx); prop = &ctx->properties.array[ctx->properties.count++]; - prop->name = gpr_strdup (name); - prop->value = gpr_malloc (value_length + 1); - memcpy (prop->value, value, value_length); + prop->name = gpr_strdup(name); + prop->value = gpr_malloc(value_length + 1); + memcpy(prop->value, value, value_length); prop->value[value_length] = '\0'; prop->value_length = value_length; } -void -grpc_auth_context_add_cstring_property (grpc_auth_context * ctx, const char *name, const char *value) -{ +void grpc_auth_context_add_cstring_property(grpc_auth_context *ctx, + const char *name, + const char *value) { grpc_auth_property *prop; - ensure_auth_context_capacity (ctx); + ensure_auth_context_capacity(ctx); prop = &ctx->properties.array[ctx->properties.count++]; - prop->name = gpr_strdup (name); - prop->value = gpr_strdup (value); - prop->value_length = strlen (value); + prop->name = gpr_strdup(name); + prop->value = gpr_strdup(value); + prop->value_length = strlen(value); } -void -grpc_auth_property_reset (grpc_auth_property * property) -{ - gpr_free (property->name); - gpr_free (property->value); - memset (property, 0, sizeof (grpc_auth_property)); +void grpc_auth_property_reset(grpc_auth_property *property) { + gpr_free(property->name); + gpr_free(property->value); + memset(property, 0, sizeof(grpc_auth_property)); } -grpc_arg -grpc_auth_metadata_processor_to_arg (grpc_auth_metadata_processor * p) -{ +grpc_arg grpc_auth_metadata_processor_to_arg(grpc_auth_metadata_processor *p) { grpc_arg arg; - memset (&arg, 0, sizeof (grpc_arg)); + memset(&arg, 0, sizeof(grpc_arg)); arg.type = GRPC_ARG_POINTER; arg.key = GRPC_AUTH_METADATA_PROCESSOR_ARG; arg.value.pointer.p = p; return arg; } -grpc_auth_metadata_processor * -grpc_auth_metadata_processor_from_arg (const grpc_arg * arg) -{ - if (strcmp (arg->key, GRPC_AUTH_METADATA_PROCESSOR_ARG) != 0) +grpc_auth_metadata_processor *grpc_auth_metadata_processor_from_arg( + const grpc_arg *arg) { + if (strcmp(arg->key, GRPC_AUTH_METADATA_PROCESSOR_ARG) != 0) return NULL; + if (arg->type != GRPC_ARG_POINTER) { + gpr_log(GPR_ERROR, "Invalid type %d for arg %s", arg->type, + GRPC_AUTH_METADATA_PROCESSOR_ARG); return NULL; - if (arg->type != GRPC_ARG_POINTER) - { - gpr_log (GPR_ERROR, "Invalid type %d for arg %s", arg->type, GRPC_AUTH_METADATA_PROCESSOR_ARG); - return NULL; - } + } return arg->value.pointer.p; } -grpc_auth_metadata_processor * -grpc_find_auth_metadata_processor_in_args (const grpc_channel_args * args) -{ +grpc_auth_metadata_processor *grpc_find_auth_metadata_processor_in_args( + const grpc_channel_args *args) { size_t i; - if (args == NULL) - return NULL; - for (i = 0; i < args->num_args; i++) - { - grpc_auth_metadata_processor *p = grpc_auth_metadata_processor_from_arg (&args->args[i]); - if (p != NULL) - return p; - } + if (args == NULL) return NULL; + for (i = 0; i < args->num_args; i++) { + grpc_auth_metadata_processor *p = + grpc_auth_metadata_processor_from_arg(&args->args[i]); + if (p != NULL) return p; + } return NULL; } diff --git a/src/core/security/security_context.h b/src/core/security/security_context.h index 93b31f60d64..a9a03064108 100644 --- a/src/core/security/security_context.h +++ b/src/core/security/security_context.h @@ -43,15 +43,13 @@ /* Property names are always NULL terminated. */ -typedef struct -{ +typedef struct { grpc_auth_property *array; size_t count; size_t capacity; } grpc_auth_property_array; -struct grpc_auth_context -{ +struct grpc_auth_context { struct grpc_auth_context *chained; grpc_auth_property_array properties; gpr_refcount refcount; @@ -60,7 +58,7 @@ struct grpc_auth_context }; /* Creation. */ -grpc_auth_context *grpc_auth_context_create (grpc_auth_context * chained); +grpc_auth_context *grpc_auth_context_create(grpc_auth_context *chained); /* Refcounting. */ #ifdef GRPC_AUTH_CONTEXT_REFCOUNT_DEBUG @@ -68,47 +66,50 @@ grpc_auth_context *grpc_auth_context_create (grpc_auth_context * chained); grpc_auth_context_ref((p), __FILE__, __LINE__, (r)) #define GRPC_AUTH_CONTEXT_UNREF(p, r) \ grpc_auth_context_unref((p), __FILE__, __LINE__, (r)) -grpc_auth_context *grpc_auth_context_ref (grpc_auth_context * policy, const char *file, int line, const char *reason); -void grpc_auth_context_unref (grpc_auth_context * policy, const char *file, int line, const char *reason); +grpc_auth_context *grpc_auth_context_ref(grpc_auth_context *policy, + const char *file, int line, + const char *reason); +void grpc_auth_context_unref(grpc_auth_context *policy, const char *file, + int line, const char *reason); #else #define GRPC_AUTH_CONTEXT_REF(p, r) grpc_auth_context_ref((p)) #define GRPC_AUTH_CONTEXT_UNREF(p, r) grpc_auth_context_unref((p)) -grpc_auth_context *grpc_auth_context_ref (grpc_auth_context * policy); -void grpc_auth_context_unref (grpc_auth_context * policy); +grpc_auth_context *grpc_auth_context_ref(grpc_auth_context *policy); +void grpc_auth_context_unref(grpc_auth_context *policy); #endif -void grpc_auth_property_reset (grpc_auth_property * property); +void grpc_auth_property_reset(grpc_auth_property *property); /* --- grpc_client_security_context --- Internal client-side security context. */ -typedef struct -{ +typedef struct { grpc_credentials *creds; grpc_auth_context *auth_context; } grpc_client_security_context; -grpc_client_security_context *grpc_client_security_context_create (void); -void grpc_client_security_context_destroy (void *ctx); +grpc_client_security_context *grpc_client_security_context_create(void); +void grpc_client_security_context_destroy(void *ctx); /* --- grpc_server_security_context --- Internal server-side security context. */ -typedef struct -{ +typedef struct { grpc_auth_context *auth_context; } grpc_server_security_context; -grpc_server_security_context *grpc_server_security_context_create (void); -void grpc_server_security_context_destroy (void *ctx); +grpc_server_security_context *grpc_server_security_context_create(void); +void grpc_server_security_context_destroy(void *ctx); /* --- Auth metadata processing. --- */ #define GRPC_AUTH_METADATA_PROCESSOR_ARG "grpc.auth_metadata_processor" -grpc_arg grpc_auth_metadata_processor_to_arg (grpc_auth_metadata_processor * p); -grpc_auth_metadata_processor *grpc_auth_metadata_processor_from_arg (const grpc_arg * arg); -grpc_auth_metadata_processor *grpc_find_auth_metadata_processor_in_args (const grpc_channel_args * args); +grpc_arg grpc_auth_metadata_processor_to_arg(grpc_auth_metadata_processor *p); +grpc_auth_metadata_processor *grpc_auth_metadata_processor_from_arg( + const grpc_arg *arg); +grpc_auth_metadata_processor *grpc_find_auth_metadata_processor_in_args( + const grpc_channel_args *args); #endif /* GRPC_INTERNAL_CORE_SECURITY_SECURITY_CONTEXT_H */ diff --git a/src/core/security/server_auth_filter.c b/src/core/security/server_auth_filter.c index 68f64c4d7ed..9638b18e882 100644 --- a/src/core/security/server_auth_filter.c +++ b/src/core/security/server_auth_filter.c @@ -40,8 +40,7 @@ #include #include -typedef struct call_data -{ +typedef struct call_data { gpr_uint8 got_client_metadata; grpc_stream_op_buffer *recv_ops; /* Closure to call when finished with the auth_on_recv hook. */ @@ -58,139 +57,132 @@ typedef struct call_data grpc_auth_context *auth_context; } call_data; -typedef struct channel_data -{ +typedef struct channel_data { grpc_security_connector *security_connector; grpc_auth_metadata_processor processor; grpc_mdctx *mdctx; } channel_data; -static grpc_metadata_array -metadata_batch_to_md_array (const grpc_metadata_batch * batch) -{ +static grpc_metadata_array metadata_batch_to_md_array( + const grpc_metadata_batch *batch) { grpc_linked_mdelem *l; grpc_metadata_array result; - grpc_metadata_array_init (&result); - for (l = batch->list.head; l != NULL; l = l->next) - { - grpc_metadata *usr_md = NULL; - grpc_mdelem *md = l->md; - grpc_mdstr *key = md->key; - grpc_mdstr *value = md->value; - if (result.count == result.capacity) - { - result.capacity = GPR_MAX (result.capacity + 8, result.capacity * 2); - result.metadata = gpr_realloc (result.metadata, result.capacity * sizeof (grpc_metadata)); - } - usr_md = &result.metadata[result.count++]; - usr_md->key = grpc_mdstr_as_c_string (key); - usr_md->value = grpc_mdstr_as_c_string (value); - usr_md->value_length = GPR_SLICE_LENGTH (value->slice); + grpc_metadata_array_init(&result); + for (l = batch->list.head; l != NULL; l = l->next) { + grpc_metadata *usr_md = NULL; + grpc_mdelem *md = l->md; + grpc_mdstr *key = md->key; + grpc_mdstr *value = md->value; + if (result.count == result.capacity) { + result.capacity = GPR_MAX(result.capacity + 8, result.capacity * 2); + result.metadata = + gpr_realloc(result.metadata, result.capacity * sizeof(grpc_metadata)); } + usr_md = &result.metadata[result.count++]; + usr_md->key = grpc_mdstr_as_c_string(key); + usr_md->value = grpc_mdstr_as_c_string(value); + usr_md->value_length = GPR_SLICE_LENGTH(value->slice); + } return result; } -static grpc_mdelem * -remove_consumed_md (void *user_data, grpc_mdelem * md) -{ +static grpc_mdelem *remove_consumed_md(void *user_data, grpc_mdelem *md) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; size_t i; - for (i = 0; i < calld->num_consumed_md; i++) - { - const grpc_metadata *consumed_md = &calld->consumed_md[i]; - /* Maybe we could do a pointer comparison but we do not have any guarantee - that the metadata processor used the same pointers for consumed_md in the - callback. */ - if (GPR_SLICE_LENGTH (md->key->slice) != strlen (consumed_md->key) || GPR_SLICE_LENGTH (md->value->slice) != consumed_md->value_length) - { - continue; - } - if (memcmp (GPR_SLICE_START_PTR (md->key->slice), consumed_md->key, GPR_SLICE_LENGTH (md->key->slice)) == 0 && memcmp (GPR_SLICE_START_PTR (md->value->slice), consumed_md->value, GPR_SLICE_LENGTH (md->value->slice)) == 0) - { - return NULL; /* Delete. */ - } + for (i = 0; i < calld->num_consumed_md; i++) { + const grpc_metadata *consumed_md = &calld->consumed_md[i]; + /* Maybe we could do a pointer comparison but we do not have any guarantee + that the metadata processor used the same pointers for consumed_md in the + callback. */ + if (GPR_SLICE_LENGTH(md->key->slice) != strlen(consumed_md->key) || + GPR_SLICE_LENGTH(md->value->slice) != consumed_md->value_length) { + continue; } + if (memcmp(GPR_SLICE_START_PTR(md->key->slice), consumed_md->key, + GPR_SLICE_LENGTH(md->key->slice)) == 0 && + memcmp(GPR_SLICE_START_PTR(md->value->slice), consumed_md->value, + GPR_SLICE_LENGTH(md->value->slice)) == 0) { + return NULL; /* Delete. */ + } + } return md; } /* called from application code */ -static void -on_md_processing_done (void *user_data, const grpc_metadata * consumed_md, size_t num_consumed_md, const grpc_metadata * response_md, size_t num_response_md, grpc_status_code status, const char *error_details) -{ +static void on_md_processing_done( + void *user_data, const grpc_metadata *consumed_md, size_t num_consumed_md, + const grpc_metadata *response_md, size_t num_response_md, + grpc_status_code status, const char *error_details) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; /* TODO(jboeuf): Implement support for response_md. */ - if (response_md != NULL && num_response_md > 0) - { - gpr_log (GPR_INFO, "response_md in auth metadata processing not supported for now. " "Ignoring..."); - } + if (response_md != NULL && num_response_md > 0) { + gpr_log(GPR_INFO, + "response_md in auth metadata processing not supported for now. " + "Ignoring..."); + } - if (status == GRPC_STATUS_OK) - { - calld->consumed_md = consumed_md; - calld->num_consumed_md = num_consumed_md; - grpc_metadata_batch_filter (&calld->md_op->data.metadata, remove_consumed_md, elem); - grpc_metadata_array_destroy (&calld->md); - calld->on_done_recv->cb (&exec_ctx, calld->on_done_recv->cb_arg, 1); - } - else - { - gpr_slice message; - grpc_metadata_array_destroy (&calld->md); - error_details = error_details != NULL ? error_details : "Authentication metadata processing failed."; - message = gpr_slice_from_copied_string (error_details); - grpc_sopb_reset (calld->recv_ops); - grpc_transport_stream_op_add_close (&calld->transport_op, status, &message); - grpc_call_next_op (&exec_ctx, elem, &calld->transport_op); - } + if (status == GRPC_STATUS_OK) { + calld->consumed_md = consumed_md; + calld->num_consumed_md = num_consumed_md; + grpc_metadata_batch_filter(&calld->md_op->data.metadata, remove_consumed_md, + elem); + grpc_metadata_array_destroy(&calld->md); + calld->on_done_recv->cb(&exec_ctx, calld->on_done_recv->cb_arg, 1); + } else { + gpr_slice message; + grpc_metadata_array_destroy(&calld->md); + error_details = error_details != NULL + ? error_details + : "Authentication metadata processing failed."; + message = gpr_slice_from_copied_string(error_details); + grpc_sopb_reset(calld->recv_ops); + grpc_transport_stream_op_add_close(&calld->transport_op, status, &message); + grpc_call_next_op(&exec_ctx, elem, &calld->transport_op); + } - grpc_exec_ctx_finish (&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); } -static void -auth_on_recv (grpc_exec_ctx * exec_ctx, void *user_data, int success) -{ +static void auth_on_recv(grpc_exec_ctx *exec_ctx, void *user_data, + int success) { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - if (success) - { - size_t i; - size_t nops = calld->recv_ops->nops; - grpc_stream_op *ops = calld->recv_ops->ops; - for (i = 0; i < nops; i++) - { - grpc_stream_op *op = &ops[i]; - if (op->type != GRPC_OP_METADATA || calld->got_client_metadata) - continue; - calld->got_client_metadata = 1; - if (chand->processor.process == NULL) - continue; - calld->md_op = op; - calld->md = metadata_batch_to_md_array (&op->data.metadata); - chand->processor.process (chand->processor.state, calld->auth_context, calld->md.metadata, calld->md.count, on_md_processing_done, elem); - return; - } + if (success) { + size_t i; + size_t nops = calld->recv_ops->nops; + grpc_stream_op *ops = calld->recv_ops->ops; + for (i = 0; i < nops; i++) { + grpc_stream_op *op = &ops[i]; + if (op->type != GRPC_OP_METADATA || calld->got_client_metadata) continue; + calld->got_client_metadata = 1; + if (chand->processor.process == NULL) continue; + calld->md_op = op; + calld->md = metadata_batch_to_md_array(&op->data.metadata); + chand->processor.process(chand->processor.state, calld->auth_context, + calld->md.metadata, calld->md.count, + on_md_processing_done, elem); + return; } - calld->on_done_recv->cb (exec_ctx, calld->on_done_recv->cb_arg, success); + } + calld->on_done_recv->cb(exec_ctx, calld->on_done_recv->cb_arg, success); } -static void -set_recv_ops_md_callbacks (grpc_call_element * elem, grpc_transport_stream_op * op) -{ +static void set_recv_ops_md_callbacks(grpc_call_element *elem, + grpc_transport_stream_op *op) { call_data *calld = elem->call_data; - if (op->recv_ops && !calld->got_client_metadata) - { - /* substitute our callback for the higher callback */ - calld->recv_ops = op->recv_ops; - calld->on_done_recv = op->on_done_recv; - op->on_done_recv = &calld->auth_on_recv; - calld->transport_op = *op; - } + if (op->recv_ops && !calld->got_client_metadata) { + /* substitute our callback for the higher callback */ + calld->recv_ops = op->recv_ops; + calld->on_done_recv = op->on_done_recv; + op->on_done_recv = &calld->auth_on_recv; + calld->transport_op = *op; + } } /* Called either: @@ -198,88 +190,91 @@ set_recv_ops_md_callbacks (grpc_call_element * elem, grpc_transport_stream_op * - a network event (or similar) from below, to receive something op contains type and call direction information, in addition to the data that is being sent or received. */ -static void -auth_start_transport_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ - set_recv_ops_md_callbacks (elem, op); - grpc_call_next_op (exec_ctx, elem, op); +static void auth_start_transport_op(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op) { + set_recv_ops_md_callbacks(elem, op); + grpc_call_next_op(exec_ctx, elem, op); } /* Constructor for call_data */ -static void -init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) -{ +static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + const void *server_transport_data, + grpc_transport_stream_op *initial_op) { /* grab pointers to our data from the call element */ call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; grpc_server_security_context *server_ctx = NULL; /* initialize members */ - memset (calld, 0, sizeof (*calld)); - grpc_closure_init (&calld->auth_on_recv, auth_on_recv, elem); + memset(calld, 0, sizeof(*calld)); + grpc_closure_init(&calld->auth_on_recv, auth_on_recv, elem); - GPR_ASSERT (initial_op && initial_op->context != NULL && initial_op->context[GRPC_CONTEXT_SECURITY].value == NULL); + GPR_ASSERT(initial_op && initial_op->context != NULL && + initial_op->context[GRPC_CONTEXT_SECURITY].value == NULL); /* Create a security context for the call and reference the auth context from the channel. */ - if (initial_op->context[GRPC_CONTEXT_SECURITY].value != NULL) - { - initial_op->context[GRPC_CONTEXT_SECURITY].destroy (initial_op->context[GRPC_CONTEXT_SECURITY].value); - } - server_ctx = grpc_server_security_context_create (); - server_ctx->auth_context = grpc_auth_context_create (chand->security_connector->auth_context); + if (initial_op->context[GRPC_CONTEXT_SECURITY].value != NULL) { + initial_op->context[GRPC_CONTEXT_SECURITY].destroy( + initial_op->context[GRPC_CONTEXT_SECURITY].value); + } + server_ctx = grpc_server_security_context_create(); + server_ctx->auth_context = + grpc_auth_context_create(chand->security_connector->auth_context); server_ctx->auth_context->pollset = initial_op->bind_pollset; initial_op->context[GRPC_CONTEXT_SECURITY].value = server_ctx; - initial_op->context[GRPC_CONTEXT_SECURITY].destroy = grpc_server_security_context_destroy; + initial_op->context[GRPC_CONTEXT_SECURITY].destroy = + grpc_server_security_context_destroy; calld->auth_context = server_ctx->auth_context; /* Set the metadata callbacks. */ - set_recv_ops_md_callbacks (elem, initial_op); + set_recv_ops_md_callbacks(elem, initial_op); } /* Destructor for call_data */ -static void -destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ -} +static void destroy_call_elem(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem) {} /* Constructor for channel_data */ -static void -init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last) -{ - grpc_security_connector *sc = grpc_find_security_connector_in_args (args); - grpc_auth_metadata_processor *processor = grpc_find_auth_metadata_processor_in_args (args); +static void init_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, grpc_channel *master, + const grpc_channel_args *args, grpc_mdctx *mdctx, + int is_first, int is_last) { + grpc_security_connector *sc = grpc_find_security_connector_in_args(args); + grpc_auth_metadata_processor *processor = + grpc_find_auth_metadata_processor_in_args(args); /* grab pointers to our data from the channel element */ channel_data *chand = elem->channel_data; /* The first and the last filters tend to be implemented differently to handle the case that there's no 'next' filter to call on the up or down path */ - GPR_ASSERT (!is_first); - GPR_ASSERT (!is_last); - GPR_ASSERT (sc != NULL); - GPR_ASSERT (processor != NULL); + GPR_ASSERT(!is_first); + GPR_ASSERT(!is_last); + GPR_ASSERT(sc != NULL); + GPR_ASSERT(processor != NULL); /* initialize members */ - GPR_ASSERT (!sc->is_client_side); - chand->security_connector = GRPC_SECURITY_CONNECTOR_REF (sc, "server_auth_filter"); + GPR_ASSERT(!sc->is_client_side); + chand->security_connector = + GRPC_SECURITY_CONNECTOR_REF(sc, "server_auth_filter"); chand->mdctx = mdctx; chand->processor = *processor; } /* Destructor for channel data */ -static void -destroy_channel_elem (grpc_exec_ctx * exec_ctx, 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 = elem->channel_data; - GRPC_SECURITY_CONNECTOR_UNREF (chand->security_connector, "server_auth_filter"); + GRPC_SECURITY_CONNECTOR_UNREF(chand->security_connector, + "server_auth_filter"); } const grpc_channel_filter grpc_server_auth_filter = { - auth_start_transport_op, grpc_channel_next_op, - sizeof (call_data), init_call_elem, - destroy_call_elem, sizeof (channel_data), - init_channel_elem, destroy_channel_elem, - grpc_call_next_get_peer, "server-auth" -}; + auth_start_transport_op, grpc_channel_next_op, + sizeof(call_data), init_call_elem, + destroy_call_elem, sizeof(channel_data), + init_channel_elem, destroy_channel_elem, + grpc_call_next_get_peer, "server-auth"}; diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index 336d59f624c..a6c515dc34e 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -51,14 +51,12 @@ #include #include -typedef struct tcp_endpoint_list -{ +typedef struct tcp_endpoint_list { grpc_endpoint *tcp_endpoint; struct tcp_endpoint_list *next; } tcp_endpoint_list; -typedef struct grpc_server_secure_state -{ +typedef struct grpc_server_secure_state { grpc_server *server; grpc_tcp_server *tcp; grpc_security_connector *sc; @@ -71,160 +69,148 @@ typedef struct grpc_server_secure_state grpc_closure *destroy_callback; } grpc_server_secure_state; -static void -state_ref (grpc_server_secure_state * state) -{ - gpr_ref (&state->refcount); +static void state_ref(grpc_server_secure_state *state) { + gpr_ref(&state->refcount); } -static void -state_unref (grpc_server_secure_state * state) -{ - if (gpr_unref (&state->refcount)) - { - /* ensure all threads have unlocked */ - gpr_mu_lock (&state->mu); - gpr_mu_unlock (&state->mu); - /* clean up */ - GRPC_SECURITY_CONNECTOR_UNREF (state->sc, "server"); - grpc_server_credentials_unref (state->creds); - gpr_free (state); - } +static void state_unref(grpc_server_secure_state *state) { + if (gpr_unref(&state->refcount)) { + /* ensure all threads have unlocked */ + gpr_mu_lock(&state->mu); + gpr_mu_unlock(&state->mu); + /* clean up */ + GRPC_SECURITY_CONNECTOR_UNREF(state->sc, "server"); + grpc_server_credentials_unref(state->creds); + gpr_free(state); + } } -static void -setup_transport (grpc_exec_ctx * exec_ctx, void *statep, grpc_transport * transport, grpc_mdctx * mdctx) -{ +static void setup_transport(grpc_exec_ctx *exec_ctx, void *statep, + grpc_transport *transport, grpc_mdctx *mdctx) { static grpc_channel_filter const *extra_filters[] = { - &grpc_server_auth_filter, &grpc_http_server_filter - }; + &grpc_server_auth_filter, &grpc_http_server_filter}; grpc_server_secure_state *state = statep; grpc_channel_args *args_copy; grpc_arg args_to_add[2]; - args_to_add[0] = grpc_security_connector_to_arg (state->sc); - args_to_add[1] = grpc_auth_metadata_processor_to_arg (&state->creds->processor); - args_copy = grpc_channel_args_copy_and_add (grpc_server_get_channel_args (state->server), args_to_add, GPR_ARRAY_SIZE (args_to_add)); - grpc_server_setup_transport (exec_ctx, state->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, args_copy); - grpc_channel_args_destroy (args_copy); + args_to_add[0] = grpc_security_connector_to_arg(state->sc); + args_to_add[1] = + grpc_auth_metadata_processor_to_arg(&state->creds->processor); + args_copy = grpc_channel_args_copy_and_add( + grpc_server_get_channel_args(state->server), args_to_add, + GPR_ARRAY_SIZE(args_to_add)); + grpc_server_setup_transport(exec_ctx, state->server, transport, extra_filters, + GPR_ARRAY_SIZE(extra_filters), mdctx, args_copy); + grpc_channel_args_destroy(args_copy); } -static int -remove_tcp_from_list_locked (grpc_server_secure_state * state, grpc_endpoint * tcp) -{ +static int remove_tcp_from_list_locked(grpc_server_secure_state *state, + grpc_endpoint *tcp) { tcp_endpoint_list *node = state->handshaking_tcp_endpoints; tcp_endpoint_list *tmp = NULL; - if (node && node->tcp_endpoint == tcp) - { - state->handshaking_tcp_endpoints = state->handshaking_tcp_endpoints->next; - gpr_free (node); + if (node && node->tcp_endpoint == tcp) { + state->handshaking_tcp_endpoints = state->handshaking_tcp_endpoints->next; + gpr_free(node); + return 0; + } + while (node) { + if (node->next->tcp_endpoint == tcp) { + tmp = node->next; + node->next = node->next->next; + gpr_free(tmp); return 0; } - while (node) - { - if (node->next->tcp_endpoint == tcp) - { - tmp = node->next; - node->next = node->next->next; - gpr_free (tmp); - return 0; - } - node = node->next; - } + node = node->next; + } return -1; } -static void -on_secure_handshake_done (grpc_exec_ctx * exec_ctx, void *statep, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint) -{ +static void on_secure_handshake_done(grpc_exec_ctx *exec_ctx, void *statep, + grpc_security_status status, + grpc_endpoint *wrapped_endpoint, + grpc_endpoint *secure_endpoint) { grpc_server_secure_state *state = statep; grpc_transport *transport; grpc_mdctx *mdctx; - if (status == GRPC_SECURITY_OK) - { - gpr_mu_lock (&state->mu); - remove_tcp_from_list_locked (state, wrapped_endpoint); - if (!state->is_shutdown) - { - mdctx = grpc_mdctx_create (); - transport = grpc_create_chttp2_transport (exec_ctx, grpc_server_get_channel_args (state->server), secure_endpoint, mdctx, 0); - setup_transport (exec_ctx, state, transport, mdctx); - grpc_chttp2_transport_start_reading (exec_ctx, transport, NULL, 0); - } - else - { - /* We need to consume this here, because the server may already have gone - * away. */ - grpc_endpoint_destroy (exec_ctx, secure_endpoint); - } - gpr_mu_unlock (&state->mu); + if (status == GRPC_SECURITY_OK) { + gpr_mu_lock(&state->mu); + remove_tcp_from_list_locked(state, wrapped_endpoint); + if (!state->is_shutdown) { + mdctx = grpc_mdctx_create(); + transport = grpc_create_chttp2_transport( + exec_ctx, grpc_server_get_channel_args(state->server), + secure_endpoint, mdctx, 0); + setup_transport(exec_ctx, state, transport, mdctx); + grpc_chttp2_transport_start_reading(exec_ctx, transport, NULL, 0); + } else { + /* We need to consume this here, because the server may already have gone + * away. */ + grpc_endpoint_destroy(exec_ctx, secure_endpoint); } - else - { - gpr_mu_lock (&state->mu); - remove_tcp_from_list_locked (state, wrapped_endpoint); - gpr_mu_unlock (&state->mu); - gpr_log (GPR_ERROR, "Secure transport failed with error %d", status); - } - state_unref (state); + gpr_mu_unlock(&state->mu); + } else { + gpr_mu_lock(&state->mu); + remove_tcp_from_list_locked(state, wrapped_endpoint); + gpr_mu_unlock(&state->mu); + gpr_log(GPR_ERROR, "Secure transport failed with error %d", status); + } + state_unref(state); } -static void -on_accept (grpc_exec_ctx * exec_ctx, void *statep, grpc_endpoint * tcp) -{ +static void on_accept(grpc_exec_ctx *exec_ctx, void *statep, + grpc_endpoint *tcp) { grpc_server_secure_state *state = statep; tcp_endpoint_list *node; - state_ref (state); - node = gpr_malloc (sizeof (tcp_endpoint_list)); + state_ref(state); + node = gpr_malloc(sizeof(tcp_endpoint_list)); node->tcp_endpoint = tcp; - gpr_mu_lock (&state->mu); + gpr_mu_lock(&state->mu); node->next = state->handshaking_tcp_endpoints; state->handshaking_tcp_endpoints = node; - gpr_mu_unlock (&state->mu); - grpc_security_connector_do_handshake (exec_ctx, state->sc, tcp, on_secure_handshake_done, state); + gpr_mu_unlock(&state->mu); + grpc_security_connector_do_handshake(exec_ctx, state->sc, tcp, + on_secure_handshake_done, state); } /* Server callback: start listening on our ports */ -static void -start (grpc_exec_ctx * exec_ctx, grpc_server * server, void *statep, grpc_pollset ** pollsets, size_t pollset_count) -{ +static void start(grpc_exec_ctx *exec_ctx, grpc_server *server, void *statep, + grpc_pollset **pollsets, size_t pollset_count) { grpc_server_secure_state *state = statep; - grpc_tcp_server_start (exec_ctx, state->tcp, pollsets, pollset_count, on_accept, state); + grpc_tcp_server_start(exec_ctx, state->tcp, pollsets, pollset_count, + on_accept, state); } -static void -destroy_done (grpc_exec_ctx * exec_ctx, void *statep, int success) -{ +static void destroy_done(grpc_exec_ctx *exec_ctx, void *statep, int success) { grpc_server_secure_state *state = statep; - state->destroy_callback->cb (exec_ctx, state->destroy_callback->cb_arg, success); - gpr_mu_lock (&state->mu); - while (state->handshaking_tcp_endpoints != NULL) - { - grpc_endpoint_shutdown (exec_ctx, state->handshaking_tcp_endpoints->tcp_endpoint); - remove_tcp_from_list_locked (state, state->handshaking_tcp_endpoints->tcp_endpoint); - } - gpr_mu_unlock (&state->mu); - state_unref (state); + state->destroy_callback->cb(exec_ctx, state->destroy_callback->cb_arg, + success); + gpr_mu_lock(&state->mu); + while (state->handshaking_tcp_endpoints != NULL) { + grpc_endpoint_shutdown(exec_ctx, + state->handshaking_tcp_endpoints->tcp_endpoint); + remove_tcp_from_list_locked(state, + state->handshaking_tcp_endpoints->tcp_endpoint); + } + gpr_mu_unlock(&state->mu); + state_unref(state); } /* Server callback: destroy the tcp listener (so we don't generate further callbacks) */ -static void -destroy (grpc_exec_ctx * exec_ctx, grpc_server * server, void *statep, grpc_closure * callback) -{ +static void destroy(grpc_exec_ctx *exec_ctx, grpc_server *server, void *statep, + grpc_closure *callback) { grpc_server_secure_state *state = statep; grpc_tcp_server *tcp; - gpr_mu_lock (&state->mu); + gpr_mu_lock(&state->mu); state->is_shutdown = 1; state->destroy_callback = callback; tcp = state->tcp; - gpr_mu_unlock (&state->mu); - grpc_closure_init (&state->destroy_closure, destroy_done, state); - grpc_tcp_server_destroy (exec_ctx, tcp, &state->destroy_closure); + gpr_mu_unlock(&state->mu); + grpc_closure_init(&state->destroy_closure, destroy_done, state); + grpc_tcp_server_destroy(exec_ctx, tcp, &state->destroy_closure); } -int -grpc_server_add_secure_http2_port (grpc_server * server, const char *addr, grpc_server_credentials * creds) -{ +int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, + grpc_server_credentials *creds) { grpc_resolved_addresses *resolved = NULL; grpc_tcp_server *tcp = NULL; grpc_server_secure_state *state = NULL; @@ -237,92 +223,83 @@ grpc_server_add_secure_http2_port (grpc_server * server, const char *addr, grpc_ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; /* create security context */ - if (creds == NULL) + if (creds == NULL) goto error; + status = grpc_server_credentials_create_security_connector(creds, &sc); + if (status != GRPC_SECURITY_OK) { + gpr_log(GPR_ERROR, + "Unable to create secure server with credentials of type %s.", + creds->type); goto error; - status = grpc_server_credentials_create_security_connector (creds, &sc); - if (status != GRPC_SECURITY_OK) - { - gpr_log (GPR_ERROR, "Unable to create secure server with credentials of type %s.", creds->type); - goto error; - } + } /* resolve address */ - resolved = grpc_blocking_resolve_address (addr, "https"); - if (!resolved) - { - goto error; - } + resolved = grpc_blocking_resolve_address(addr, "https"); + if (!resolved) { + goto error; + } - tcp = grpc_tcp_server_create (); - if (!tcp) - { - goto error; - } + tcp = grpc_tcp_server_create(); + if (!tcp) { + goto error; + } - for (i = 0; i < resolved->naddrs; i++) - { - port_temp = grpc_tcp_server_add_port (tcp, (struct sockaddr *) &resolved->addrs[i].addr, resolved->addrs[i].len); - if (port_temp >= 0) - { - if (port_num == -1) - { - port_num = port_temp; - } - else - { - GPR_ASSERT (port_num == port_temp); - } - count++; - } - } - if (count == 0) - { - gpr_log (GPR_ERROR, "No address added out of total %d resolved", resolved->naddrs); - goto error; + for (i = 0; i < resolved->naddrs; i++) { + port_temp = grpc_tcp_server_add_port( + tcp, (struct sockaddr *)&resolved->addrs[i].addr, + resolved->addrs[i].len); + if (port_temp >= 0) { + if (port_num == -1) { + port_num = port_temp; + } else { + GPR_ASSERT(port_num == port_temp); + } + count++; } - if (count != resolved->naddrs) - { - gpr_log (GPR_ERROR, "Only %d addresses added out of total %d resolved", count, resolved->naddrs); - /* if it's an error, don't we want to goto error; here ? */ - } - grpc_resolved_addresses_destroy (resolved); + } + if (count == 0) { + gpr_log(GPR_ERROR, "No address added out of total %d resolved", + resolved->naddrs); + goto error; + } + if (count != resolved->naddrs) { + gpr_log(GPR_ERROR, "Only %d addresses added out of total %d resolved", + count, resolved->naddrs); + /* if it's an error, don't we want to goto error; here ? */ + } + grpc_resolved_addresses_destroy(resolved); - state = gpr_malloc (sizeof (*state)); - memset (state, 0, sizeof (*state)); + state = gpr_malloc(sizeof(*state)); + memset(state, 0, sizeof(*state)); state->server = server; state->tcp = tcp; state->sc = sc; - state->creds = grpc_server_credentials_ref (creds); + state->creds = grpc_server_credentials_ref(creds); state->handshaking_tcp_endpoints = NULL; state->is_shutdown = 0; - gpr_mu_init (&state->mu); - gpr_ref_init (&state->refcount, 1); + gpr_mu_init(&state->mu); + gpr_ref_init(&state->refcount, 1); /* Register with the server only upon success */ - grpc_server_add_listener (&exec_ctx, server, state, start, destroy); + grpc_server_add_listener(&exec_ctx, server, state, start, destroy); - grpc_exec_ctx_finish (&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); return port_num; /* Error path: cleanup and return */ error: - if (sc) - { - GRPC_SECURITY_CONNECTOR_UNREF (sc, "server"); - } - if (resolved) - { - grpc_resolved_addresses_destroy (resolved); - } - if (tcp) - { - grpc_tcp_server_destroy (&exec_ctx, tcp, NULL); - } - if (state) - { - gpr_free (state); - } - grpc_exec_ctx_finish (&exec_ctx); + if (sc) { + GRPC_SECURITY_CONNECTOR_UNREF(sc, "server"); + } + if (resolved) { + grpc_resolved_addresses_destroy(resolved); + } + if (tcp) { + grpc_tcp_server_destroy(&exec_ctx, tcp, NULL); + } + if (state) { + gpr_free(state); + } + grpc_exec_ctx_finish(&exec_ctx); return 0; } diff --git a/src/core/statistics/census_init.c b/src/core/statistics/census_init.c index abe1acf1709..e6306f5e6fa 100644 --- a/src/core/statistics/census_init.c +++ b/src/core/statistics/census_init.c @@ -37,16 +37,12 @@ #include "src/core/statistics/census_rpc_stats.h" #include "src/core/statistics/census_tracing.h" -void -census_init (void) -{ - census_tracing_init (); - census_stats_store_init (); +void census_init(void) { + census_tracing_init(); + census_stats_store_init(); } -void -census_shutdown (void) -{ - census_stats_store_shutdown (); - census_tracing_shutdown (); +void census_shutdown(void) { + census_stats_store_shutdown(); + census_tracing_shutdown(); } diff --git a/src/core/statistics/census_interface.h b/src/core/statistics/census_interface.h index 22b3cc8c883..e8703572769 100644 --- a/src/core/statistics/census_interface.h +++ b/src/core/statistics/census_interface.h @@ -41,8 +41,7 @@ /* Structure of a census op id. Define as structure because 64bit integer is not available on every platform for C89. */ -typedef struct census_op_id -{ +typedef struct census_op_id { gpr_uint32 upper; gpr_uint32 lower; } census_op_id; @@ -50,10 +49,10 @@ typedef struct census_op_id typedef struct census_rpc_stats census_rpc_stats; /* Initializes Census library. No-op if Census is already initialized. */ -void census_init (void); +void census_init(void); /* Shutdown Census Library. */ -void census_shutdown (void); +void census_shutdown(void); /* Annotates grpc method name on a census_op_id. The method name has the format of /. Returns 0 iff @@ -62,16 +61,16 @@ void census_shutdown (void); TODO(hongyu): Figure out valid characters set for service name and command name and document requirements here.*/ -int census_add_method_tag (census_op_id op_id, const char *method_name); +int census_add_method_tag(census_op_id op_id, const char *method_name); /* Annotates tracing information to a specific op_id. Up to CENSUS_MAX_ANNOTATION_LENGTH bytes are recorded. */ -void census_tracing_print (census_op_id op_id, const char *annotation); +void census_tracing_print(census_op_id op_id, const char *annotation); /* Starts tracing for an RPC. Returns a locally unique census_op_id */ -census_op_id census_tracing_start_op (void); +census_op_id census_tracing_start_op(void); /* Ends tracing. Calling this function will invalidate the input op_id. */ -void census_tracing_end_op (census_op_id op_id); +void census_tracing_end_op(census_op_id op_id); #endif /* GRPC_INTERNAL_CORE_STATISTICS_CENSUS_INTERFACE_H */ diff --git a/src/core/statistics/census_log.c b/src/core/statistics/census_log.c index 16a9e28b1fb..88e338038df 100644 --- a/src/core/statistics/census_log.c +++ b/src/core/statistics/census_log.c @@ -101,15 +101,13 @@ /* End of platform specific code */ -typedef struct census_log_block_list_struct -{ +typedef struct census_log_block_list_struct { struct census_log_block_list_struct *next; struct census_log_block_list_struct *prev; struct census_log_block *block; } cl_block_list_struct; -typedef struct census_log_block -{ +typedef struct census_log_block { /* Pointer to underlying buffer */ char *buffer; gpr_atm writer_lock; @@ -148,16 +146,14 @@ typedef struct census_log_block } cl_block; /* A list of cl_blocks, doubly-linked through cl_block::link. */ -typedef struct census_log_block_list -{ - gpr_int32 count; /* Number of items in list. */ - cl_block_list_struct ht; /* head/tail of linked list. */ +typedef struct census_log_block_list { + gpr_int32 count; /* Number of items in list. */ + cl_block_list_struct ht; /* head/tail of linked list. */ } cl_block_list; /* Cacheline aligned block pointers to avoid false sharing. Block pointer must be initialized via set_block(), before calling other functions */ -typedef struct census_log_core_local_block -{ +typedef struct census_log_core_local_block { gpr_atm block; /* Ensure cachline alignment: we assume sizeof(gpr_atm) == 4 or 8 */ #if defined(GPR_ARCH_64) @@ -174,17 +170,16 @@ typedef struct census_log_core_local_block #endif } cl_core_local_block; -struct census_log -{ +struct census_log { int discard_old_records; /* Number of cores (aka hardware-contexts) */ unsigned num_cores; /* number of CENSUS_LOG_2_MAX_RECORD_SIZE blocks in log */ gpr_int32 num_blocks; - cl_block *blocks; /* Block metadata. */ - cl_core_local_block *core_local_blocks; /* Keeps core to block mappings. */ + cl_block *blocks; /* Block metadata. */ + cl_core_local_block *core_local_blocks; /* Keeps core to block mappings. */ gpr_mu lock; - int initialized; /* has log been initialized? */ + int initialized; /* has log been initialized? */ /* Keeps the state of the reader iterator. A value of 0 indicates that iterator has reached the end. census_log_init_reader() resets the value to num_core to restart iteration. */ @@ -206,61 +201,44 @@ static struct census_log g_log; /* Functions that operate on an atomic memory location used as a lock */ /* Returns non-zero if lock is acquired */ -static int -cl_try_lock (gpr_atm * lock) -{ - return gpr_atm_acq_cas (lock, 0, 1); -} +static int cl_try_lock(gpr_atm *lock) { return gpr_atm_acq_cas(lock, 0, 1); } -static void -cl_unlock (gpr_atm * lock) -{ - gpr_atm_rel_store (lock, 0); -} +static void cl_unlock(gpr_atm *lock) { gpr_atm_rel_store(lock, 0); } /* Functions that operate on cl_core_local_block's */ -static void -cl_core_local_block_set_block (cl_core_local_block * clb, cl_block * block) -{ - gpr_atm_rel_store (&clb->block, (gpr_atm) block); +static void cl_core_local_block_set_block(cl_core_local_block *clb, + cl_block *block) { + gpr_atm_rel_store(&clb->block, (gpr_atm)block); } -static cl_block * -cl_core_local_block_get_block (cl_core_local_block * clb) -{ - return (cl_block *) gpr_atm_acq_load (&clb->block); +static cl_block *cl_core_local_block_get_block(cl_core_local_block *clb) { + return (cl_block *)gpr_atm_acq_load(&clb->block); } /* Functions that operate on cl_block_list_struct's */ -static void -cl_block_list_struct_initialize (cl_block_list_struct * bls, cl_block * block) -{ +static void cl_block_list_struct_initialize(cl_block_list_struct *bls, + cl_block *block) { bls->next = bls->prev = bls; bls->block = block; } /* Functions that operate on cl_block_list's */ -static void -cl_block_list_initialize (cl_block_list * list) -{ +static void cl_block_list_initialize(cl_block_list *list) { list->count = 0; - cl_block_list_struct_initialize (&list->ht, NULL); + cl_block_list_struct_initialize(&list->ht, NULL); } /* Returns head of *this, or NULL if empty. */ -static cl_block * -cl_block_list_head (cl_block_list * list) -{ +static cl_block *cl_block_list_head(cl_block_list *list) { return list->ht.next->block; } /* Insert element *e after *pos. */ -static void -cl_block_list_insert (cl_block_list * list, cl_block_list_struct * pos, cl_block_list_struct * e) -{ +static void cl_block_list_insert(cl_block_list *list, cl_block_list_struct *pos, + cl_block_list_struct *e) { list->count++; e->next = pos->next; e->prev = pos; @@ -269,23 +247,17 @@ cl_block_list_insert (cl_block_list * list, cl_block_list_struct * pos, cl_block } /* Insert block at the head of the list */ -static void -cl_block_list_insert_at_head (cl_block_list * list, cl_block * block) -{ - cl_block_list_insert (list, &list->ht, &block->link); +static void cl_block_list_insert_at_head(cl_block_list *list, cl_block *block) { + cl_block_list_insert(list, &list->ht, &block->link); } /* Insert block at the tail of the list */ -static void -cl_block_list_insert_at_tail (cl_block_list * list, cl_block * block) -{ - cl_block_list_insert (list, list->ht.prev, &block->link); +static void cl_block_list_insert_at_tail(cl_block_list *list, cl_block *block) { + cl_block_list_insert(list, list->ht.prev, &block->link); } /* Removes block *b. Requires *b be in the list. */ -static void -cl_block_list_remove (cl_block_list * list, cl_block * b) -{ +static void cl_block_list_remove(cl_block_list *list, cl_block *b) { list->count--; b->link.next->prev = b->link.prev; b->link.prev->next = b->link.next; @@ -293,28 +265,23 @@ cl_block_list_remove (cl_block_list * list, cl_block * b) /* Functions that operate on cl_block's */ -static void -cl_block_initialize (cl_block * block, char *buffer) -{ +static void cl_block_initialize(cl_block *block, char *buffer) { block->buffer = buffer; - gpr_atm_rel_store (&block->writer_lock, 0); - gpr_atm_rel_store (&block->reader_lock, 0); - gpr_atm_rel_store (&block->bytes_committed, 0); + gpr_atm_rel_store(&block->writer_lock, 0); + gpr_atm_rel_store(&block->reader_lock, 0); + gpr_atm_rel_store(&block->bytes_committed, 0); block->bytes_read = 0; - cl_block_list_struct_initialize (&block->link, block); + cl_block_list_struct_initialize(&block->link, block); } /* Guards against exposing partially written buffer to the reader. */ -static void -cl_block_set_bytes_committed (cl_block * block, gpr_int32 bytes_committed) -{ - gpr_atm_rel_store (&block->bytes_committed, bytes_committed); +static void cl_block_set_bytes_committed(cl_block *block, + gpr_int32 bytes_committed) { + gpr_atm_rel_store(&block->bytes_committed, bytes_committed); } -static gpr_int32 -cl_block_get_bytes_committed (cl_block * block) -{ - return gpr_atm_acq_load (&block->bytes_committed); +static gpr_int32 cl_block_get_bytes_committed(cl_block *block) { + return gpr_atm_acq_load(&block->bytes_committed); } /* Tries to disable future read/write access to this block. Succeeds if: @@ -324,62 +291,51 @@ cl_block_get_bytes_committed (cl_block * block) On success, clears the block state and returns with writer_lock_ and reader_lock_ held. These locks are released by a subsequent cl_block_access_enable() call. */ -static int -cl_block_try_disable_access (cl_block * block, int discard_data) -{ - if (!cl_try_lock (&block->writer_lock)) - { - return 0; - } - if (!cl_try_lock (&block->reader_lock)) - { - cl_unlock (&block->writer_lock); - return 0; - } - if (!discard_data && (block->bytes_read != cl_block_get_bytes_committed (block))) - { - cl_unlock (&block->reader_lock); - cl_unlock (&block->writer_lock); - return 0; - } - cl_block_set_bytes_committed (block, 0); +static int cl_block_try_disable_access(cl_block *block, int discard_data) { + if (!cl_try_lock(&block->writer_lock)) { + return 0; + } + if (!cl_try_lock(&block->reader_lock)) { + cl_unlock(&block->writer_lock); + return 0; + } + if (!discard_data && + (block->bytes_read != cl_block_get_bytes_committed(block))) { + cl_unlock(&block->reader_lock); + cl_unlock(&block->writer_lock); + return 0; + } + cl_block_set_bytes_committed(block, 0); block->bytes_read = 0; return 1; } -static void -cl_block_enable_access (cl_block * block) -{ - cl_unlock (&block->reader_lock); - cl_unlock (&block->writer_lock); +static void cl_block_enable_access(cl_block *block) { + cl_unlock(&block->reader_lock); + cl_unlock(&block->writer_lock); } /* Returns with writer_lock held. */ -static void * -cl_block_start_write (cl_block * block, size_t size) -{ +static void *cl_block_start_write(cl_block *block, size_t size) { gpr_int32 bytes_committed; - if (!cl_try_lock (&block->writer_lock)) - { - return NULL; - } - bytes_committed = cl_block_get_bytes_committed (block); - if (bytes_committed + size > CENSUS_LOG_MAX_RECORD_SIZE) - { - cl_unlock (&block->writer_lock); - return NULL; - } + if (!cl_try_lock(&block->writer_lock)) { + return NULL; + } + bytes_committed = cl_block_get_bytes_committed(block); + if (bytes_committed + size > CENSUS_LOG_MAX_RECORD_SIZE) { + cl_unlock(&block->writer_lock); + return NULL; + } return block->buffer + bytes_committed; } /* Releases writer_lock and increments committed bytes by 'bytes_written'. 'bytes_written' must be <= 'size' specified in the corresponding StartWrite() call. This function is thread-safe. */ -static void -cl_block_end_write (cl_block * block, size_t bytes_written) -{ - cl_block_set_bytes_committed (block, cl_block_get_bytes_committed (block) + bytes_written); - cl_unlock (&block->writer_lock); +static void cl_block_end_write(cl_block *block, size_t bytes_written) { + cl_block_set_bytes_committed( + block, cl_block_get_bytes_committed(block) + bytes_written); + cl_unlock(&block->writer_lock); } /* Returns a pointer to the first unread byte in buffer. The number of bytes @@ -387,60 +343,49 @@ cl_block_end_write (cl_block * block, size_t bytes_written) released by a subsequent cl_block_end_read() call. Returns NULL if: - read in progress - no data available */ -static void * -cl_block_start_read (cl_block * block, size_t * bytes_available) -{ +static void *cl_block_start_read(cl_block *block, size_t *bytes_available) { void *record; - if (!cl_try_lock (&block->reader_lock)) - { - return NULL; - } + if (!cl_try_lock(&block->reader_lock)) { + return NULL; + } /* bytes_committed may change from under us. Use bytes_available to update bytes_read below. */ - *bytes_available = cl_block_get_bytes_committed (block) - block->bytes_read; - if (*bytes_available == 0) - { - cl_unlock (&block->reader_lock); - return NULL; - } + *bytes_available = cl_block_get_bytes_committed(block) - block->bytes_read; + if (*bytes_available == 0) { + cl_unlock(&block->reader_lock); + return NULL; + } record = block->buffer + block->bytes_read; block->bytes_read += *bytes_available; return record; } -static void -cl_block_end_read (cl_block * block) -{ - cl_unlock (&block->reader_lock); +static void cl_block_end_read(cl_block *block) { + cl_unlock(&block->reader_lock); } /* Internal functions operating on g_log */ /* Allocates a new free block (or recycles an available dirty block if log is configured to discard old records). Returns NULL if out-of-space. */ -static cl_block * -cl_allocate_block (void) -{ - cl_block *block = cl_block_list_head (&g_log.free_block_list); - if (block != NULL) - { - cl_block_list_remove (&g_log.free_block_list, block); - return block; - } - if (!g_log.discard_old_records) - { - /* No free block and log is configured to keep old records. */ - return NULL; - } +static cl_block *cl_allocate_block(void) { + cl_block *block = cl_block_list_head(&g_log.free_block_list); + if (block != NULL) { + cl_block_list_remove(&g_log.free_block_list, block); + return block; + } + if (!g_log.discard_old_records) { + /* No free block and log is configured to keep old records. */ + return NULL; + } /* Recycle dirty block. Start from the oldest. */ - for (block = cl_block_list_head (&g_log.dirty_block_list); block != NULL; block = block->link.next->block) - { - if (cl_block_try_disable_access (block, 1 /* discard data */ )) - { - cl_block_list_remove (&g_log.dirty_block_list, block); - return block; - } + for (block = cl_block_list_head(&g_log.dirty_block_list); block != NULL; + block = block->link.next->block) { + if (cl_block_try_disable_access(block, 1 /* discard data */)) { + cl_block_list_remove(&g_log.dirty_block_list, block); + return block; } + } return NULL; } @@ -450,250 +395,210 @@ cl_allocate_block (void) - allocated a new block OR - 'core_id' => 'old_block' mapping changed (another thread allocated a block before lock was acquired). */ -static int -cl_allocate_core_local_block (gpr_int32 core_id, cl_block * old_block) -{ +static int cl_allocate_core_local_block(gpr_int32 core_id, + cl_block *old_block) { /* Now that we have the lock, check if core-local mapping has changed. */ cl_core_local_block *core_local_block = &g_log.core_local_blocks[core_id]; - cl_block *block = cl_core_local_block_get_block (core_local_block); - if ((block != NULL) && (block != old_block)) - { - return 1; - } - if (block != NULL) - { - cl_core_local_block_set_block (core_local_block, NULL); - cl_block_list_insert_at_tail (&g_log.dirty_block_list, block); - } - block = cl_allocate_block (); - if (block == NULL) - { - gpr_atm_rel_store (&g_log.is_full, 1); - return 0; - } - cl_core_local_block_set_block (core_local_block, block); - cl_block_enable_access (block); + cl_block *block = cl_core_local_block_get_block(core_local_block); + if ((block != NULL) && (block != old_block)) { + return 1; + } + if (block != NULL) { + cl_core_local_block_set_block(core_local_block, NULL); + cl_block_list_insert_at_tail(&g_log.dirty_block_list, block); + } + block = cl_allocate_block(); + if (block == NULL) { + gpr_atm_rel_store(&g_log.is_full, 1); + return 0; + } + cl_core_local_block_set_block(core_local_block, block); + cl_block_enable_access(block); return 1; } -static cl_block * -cl_get_block (void *record) -{ - gpr_uintptr p = (gpr_uintptr) ((char *) record - g_log.buffer); +static cl_block *cl_get_block(void *record) { + gpr_uintptr p = (gpr_uintptr)((char *)record - g_log.buffer); gpr_uintptr index = p >> CENSUS_LOG_2_MAX_RECORD_SIZE; return &g_log.blocks[index]; } /* Gets the next block to read and tries to free 'prev' block (if not NULL). Returns NULL if reached the end. */ -static cl_block * -cl_next_block_to_read (cl_block * prev) -{ +static cl_block *cl_next_block_to_read(cl_block *prev) { cl_block *block = NULL; - if (g_log.read_iterator_state == g_log.num_cores) - { - /* We are traversing dirty list; find the next dirty block. */ - if (prev != NULL) - { - /* Try to free the previous block if there is no unread data. This block - may have unread data if previously incomplete record completed between - read_next() calls. */ - block = prev->link.next->block; - if (cl_block_try_disable_access (prev, 0 /* do not discard data */ )) - { - cl_block_list_remove (&g_log.dirty_block_list, prev); - cl_block_list_insert_at_head (&g_log.free_block_list, prev); - gpr_atm_rel_store (&g_log.is_full, 0); - } - } - else - { - block = cl_block_list_head (&g_log.dirty_block_list); - } - if (block != NULL) - { - return block; - } - /* We are done with the dirty list; moving on to core-local blocks. */ + if (g_log.read_iterator_state == g_log.num_cores) { + /* We are traversing dirty list; find the next dirty block. */ + if (prev != NULL) { + /* Try to free the previous block if there is no unread data. This block + may have unread data if previously incomplete record completed between + read_next() calls. */ + block = prev->link.next->block; + if (cl_block_try_disable_access(prev, 0 /* do not discard data */)) { + cl_block_list_remove(&g_log.dirty_block_list, prev); + cl_block_list_insert_at_head(&g_log.free_block_list, prev); + gpr_atm_rel_store(&g_log.is_full, 0); + } + } else { + block = cl_block_list_head(&g_log.dirty_block_list); } - while (g_log.read_iterator_state > 0) - { - g_log.read_iterator_state--; - block = cl_core_local_block_get_block (&g_log.core_local_blocks[g_log.read_iterator_state]); - if (block != NULL) - { - return block; - } + if (block != NULL) { + return block; + } + /* We are done with the dirty list; moving on to core-local blocks. */ + } + while (g_log.read_iterator_state > 0) { + g_log.read_iterator_state--; + block = cl_core_local_block_get_block( + &g_log.core_local_blocks[g_log.read_iterator_state]); + if (block != NULL) { + return block; } + } return NULL; } /* External functions: primary stats_log interface */ -void -census_log_initialize (size_t size_in_mb, int discard_old_records) -{ +void census_log_initialize(size_t size_in_mb, int discard_old_records) { gpr_int32 ix; /* Check cacheline alignment. */ - GPR_ASSERT (sizeof (cl_block) % GPR_CACHELINE_SIZE == 0); - GPR_ASSERT (sizeof (cl_core_local_block) % GPR_CACHELINE_SIZE == 0); - GPR_ASSERT (!g_log.initialized); + GPR_ASSERT(sizeof(cl_block) % GPR_CACHELINE_SIZE == 0); + GPR_ASSERT(sizeof(cl_core_local_block) % GPR_CACHELINE_SIZE == 0); + GPR_ASSERT(!g_log.initialized); g_log.discard_old_records = discard_old_records; - g_log.num_cores = gpr_cpu_num_cores (); + g_log.num_cores = gpr_cpu_num_cores(); /* Ensure at least as many blocks as there are cores. */ - g_log.num_blocks = GPR_MAX (g_log.num_cores, (size_in_mb << 20) >> CENSUS_LOG_2_MAX_RECORD_SIZE); - gpr_mu_init (&g_log.lock); + g_log.num_blocks = GPR_MAX( + g_log.num_cores, (size_in_mb << 20) >> CENSUS_LOG_2_MAX_RECORD_SIZE); + gpr_mu_init(&g_log.lock); g_log.read_iterator_state = 0; g_log.block_being_read = NULL; - gpr_atm_rel_store (&g_log.is_full, 0); - g_log.core_local_blocks = (cl_core_local_block *) gpr_malloc_aligned (g_log.num_cores * sizeof (cl_core_local_block), GPR_CACHELINE_SIZE_LOG); - memset (g_log.core_local_blocks, 0, g_log.num_cores * sizeof (cl_core_local_block)); - g_log.blocks = (cl_block *) gpr_malloc_aligned (g_log.num_blocks * sizeof (cl_block), GPR_CACHELINE_SIZE_LOG); - memset (g_log.blocks, 0, g_log.num_blocks * sizeof (cl_block)); - g_log.buffer = gpr_malloc (g_log.num_blocks * CENSUS_LOG_MAX_RECORD_SIZE); - memset (g_log.buffer, 0, g_log.num_blocks * CENSUS_LOG_MAX_RECORD_SIZE); - cl_block_list_initialize (&g_log.free_block_list); - cl_block_list_initialize (&g_log.dirty_block_list); - for (ix = 0; ix < g_log.num_blocks; ++ix) - { - cl_block *block = g_log.blocks + ix; - cl_block_initialize (block, g_log.buffer + (CENSUS_LOG_MAX_RECORD_SIZE * ix)); - cl_block_try_disable_access (block, 1 /* discard data */ ); - cl_block_list_insert_at_tail (&g_log.free_block_list, block); - } - gpr_atm_rel_store (&g_log.out_of_space_count, 0); + gpr_atm_rel_store(&g_log.is_full, 0); + g_log.core_local_blocks = (cl_core_local_block *)gpr_malloc_aligned( + g_log.num_cores * sizeof(cl_core_local_block), GPR_CACHELINE_SIZE_LOG); + memset(g_log.core_local_blocks, 0, + g_log.num_cores * sizeof(cl_core_local_block)); + g_log.blocks = (cl_block *)gpr_malloc_aligned( + g_log.num_blocks * sizeof(cl_block), GPR_CACHELINE_SIZE_LOG); + memset(g_log.blocks, 0, g_log.num_blocks * sizeof(cl_block)); + g_log.buffer = gpr_malloc(g_log.num_blocks * CENSUS_LOG_MAX_RECORD_SIZE); + memset(g_log.buffer, 0, g_log.num_blocks * CENSUS_LOG_MAX_RECORD_SIZE); + cl_block_list_initialize(&g_log.free_block_list); + cl_block_list_initialize(&g_log.dirty_block_list); + for (ix = 0; ix < g_log.num_blocks; ++ix) { + cl_block *block = g_log.blocks + ix; + cl_block_initialize(block, + g_log.buffer + (CENSUS_LOG_MAX_RECORD_SIZE * ix)); + cl_block_try_disable_access(block, 1 /* discard data */); + cl_block_list_insert_at_tail(&g_log.free_block_list, block); + } + gpr_atm_rel_store(&g_log.out_of_space_count, 0); g_log.initialized = 1; } -void -census_log_shutdown (void) -{ - GPR_ASSERT (g_log.initialized); - gpr_mu_destroy (&g_log.lock); - gpr_free_aligned (g_log.core_local_blocks); +void census_log_shutdown(void) { + GPR_ASSERT(g_log.initialized); + gpr_mu_destroy(&g_log.lock); + gpr_free_aligned(g_log.core_local_blocks); g_log.core_local_blocks = NULL; - gpr_free_aligned (g_log.blocks); + gpr_free_aligned(g_log.blocks); g_log.blocks = NULL; - gpr_free (g_log.buffer); + gpr_free(g_log.buffer); g_log.buffer = NULL; g_log.initialized = 0; } -void * -census_log_start_write (size_t size) -{ +void *census_log_start_write(size_t size) { /* Used to bound number of times block allocation is attempted. */ gpr_int32 attempts_remaining = g_log.num_blocks; /* TODO(aveitch): move this inside the do loop when current_cpu is fixed */ - gpr_int32 core_id = gpr_cpu_current_cpu (); - GPR_ASSERT (g_log.initialized); - if (size > CENSUS_LOG_MAX_RECORD_SIZE) - { + gpr_int32 core_id = gpr_cpu_current_cpu(); + GPR_ASSERT(g_log.initialized); + if (size > CENSUS_LOG_MAX_RECORD_SIZE) { + return NULL; + } + do { + int allocated; + void *record = NULL; + cl_block *block = + cl_core_local_block_get_block(&g_log.core_local_blocks[core_id]); + if (block && (record = cl_block_start_write(block, size))) { + return record; + } + /* Need to allocate a new block. We are here if: + - No block associated with the core OR + - Write in-progress on the block OR + - block is out of space */ + if (gpr_atm_acq_load(&g_log.is_full)) { + gpr_atm_no_barrier_fetch_add(&g_log.out_of_space_count, 1); return NULL; } - do - { - int allocated; - void *record = NULL; - cl_block *block = cl_core_local_block_get_block (&g_log.core_local_blocks[core_id]); - if (block && (record = cl_block_start_write (block, size))) - { - return record; - } - /* Need to allocate a new block. We are here if: - - No block associated with the core OR - - Write in-progress on the block OR - - block is out of space */ - if (gpr_atm_acq_load (&g_log.is_full)) - { - gpr_atm_no_barrier_fetch_add (&g_log.out_of_space_count, 1); - return NULL; - } - gpr_mu_lock (&g_log.lock); - allocated = cl_allocate_core_local_block (core_id, block); - gpr_mu_unlock (&g_log.lock); - if (!allocated) - { - gpr_atm_no_barrier_fetch_add (&g_log.out_of_space_count, 1); - return NULL; - } + gpr_mu_lock(&g_log.lock); + allocated = cl_allocate_core_local_block(core_id, block); + gpr_mu_unlock(&g_log.lock); + if (!allocated) { + gpr_atm_no_barrier_fetch_add(&g_log.out_of_space_count, 1); + return NULL; } - while (attempts_remaining--); + } while (attempts_remaining--); /* Give up. */ - gpr_atm_no_barrier_fetch_add (&g_log.out_of_space_count, 1); + gpr_atm_no_barrier_fetch_add(&g_log.out_of_space_count, 1); return NULL; } -void -census_log_end_write (void *record, size_t bytes_written) -{ - GPR_ASSERT (g_log.initialized); - cl_block_end_write (cl_get_block (record), bytes_written); +void census_log_end_write(void *record, size_t bytes_written) { + GPR_ASSERT(g_log.initialized); + cl_block_end_write(cl_get_block(record), bytes_written); } -void -census_log_init_reader (void) -{ - GPR_ASSERT (g_log.initialized); - gpr_mu_lock (&g_log.lock); +void census_log_init_reader(void) { + GPR_ASSERT(g_log.initialized); + gpr_mu_lock(&g_log.lock); /* If a block is locked for reading unlock it. */ - if (g_log.block_being_read != NULL) - { - cl_block_end_read (g_log.block_being_read); - g_log.block_being_read = NULL; - } + if (g_log.block_being_read != NULL) { + cl_block_end_read(g_log.block_being_read); + g_log.block_being_read = NULL; + } g_log.read_iterator_state = g_log.num_cores; - gpr_mu_unlock (&g_log.lock); -} - -const void * -census_log_read_next (size_t * bytes_available) -{ - GPR_ASSERT (g_log.initialized); - gpr_mu_lock (&g_log.lock); - if (g_log.block_being_read != NULL) - { - cl_block_end_read (g_log.block_being_read); - } - do - { - g_log.block_being_read = cl_next_block_to_read (g_log.block_being_read); - if (g_log.block_being_read != NULL) - { - void *record = cl_block_start_read (g_log.block_being_read, bytes_available); - if (record != NULL) - { - gpr_mu_unlock (&g_log.lock); - return record; - } - } + gpr_mu_unlock(&g_log.lock); +} + +const void *census_log_read_next(size_t *bytes_available) { + GPR_ASSERT(g_log.initialized); + gpr_mu_lock(&g_log.lock); + if (g_log.block_being_read != NULL) { + cl_block_end_read(g_log.block_being_read); + } + do { + g_log.block_being_read = cl_next_block_to_read(g_log.block_being_read); + if (g_log.block_being_read != NULL) { + void *record = + cl_block_start_read(g_log.block_being_read, bytes_available); + if (record != NULL) { + gpr_mu_unlock(&g_log.lock); + return record; + } } - while (g_log.block_being_read != NULL); - gpr_mu_unlock (&g_log.lock); + } while (g_log.block_being_read != NULL); + gpr_mu_unlock(&g_log.lock); return NULL; } -size_t -census_log_remaining_space (void) -{ +size_t census_log_remaining_space(void) { size_t space; - GPR_ASSERT (g_log.initialized); - gpr_mu_lock (&g_log.lock); - if (g_log.discard_old_records) - { - /* Remaining space is not meaningful; just return the entire log space. */ - space = g_log.num_blocks << CENSUS_LOG_2_MAX_RECORD_SIZE; - } - else - { - space = g_log.free_block_list.count * CENSUS_LOG_MAX_RECORD_SIZE; - } - gpr_mu_unlock (&g_log.lock); + GPR_ASSERT(g_log.initialized); + gpr_mu_lock(&g_log.lock); + if (g_log.discard_old_records) { + /* Remaining space is not meaningful; just return the entire log space. */ + space = g_log.num_blocks << CENSUS_LOG_2_MAX_RECORD_SIZE; + } else { + space = g_log.free_block_list.count * CENSUS_LOG_MAX_RECORD_SIZE; + } + gpr_mu_unlock(&g_log.lock); return space; } -int -census_log_out_of_space_count (void) -{ - GPR_ASSERT (g_log.initialized); - return gpr_atm_acq_load (&g_log.out_of_space_count); +int census_log_out_of_space_count(void) { + GPR_ASSERT(g_log.initialized); + return gpr_atm_acq_load(&g_log.out_of_space_count); } diff --git a/src/core/statistics/census_log.h b/src/core/statistics/census_log.h index 3c0c2dc52da..356437c346e 100644 --- a/src/core/statistics/census_log.h +++ b/src/core/statistics/census_log.h @@ -37,7 +37,7 @@ #include /* Maximum record size, in bytes. */ -#define CENSUS_LOG_2_MAX_RECORD_SIZE 14 /* 2^14 = 16KB */ +#define CENSUS_LOG_2_MAX_RECORD_SIZE 14 /* 2^14 = 16KB */ #define CENSUS_LOG_MAX_RECORD_SIZE (1 << CENSUS_LOG_2_MAX_RECORD_SIZE) /* Initialize the statistics logging subsystem with the given log size. A log @@ -47,13 +47,13 @@ when the log is full. This function must be called before any other census_log functions. */ -void census_log_initialize (size_t size_in_mb, int discard_old_records); +void census_log_initialize(size_t size_in_mb, int discard_old_records); /* Shutdown the logging subsystem. Caller must ensure that: - no in progress or future call to any census_log functions - no incomplete records */ -void census_log_shutdown (void); +void census_log_shutdown(void); /* Allocates and returns a 'size' bytes record and marks it in use. A subsequent census_log_end_write() marks the record complete. The @@ -62,9 +62,9 @@ void census_log_shutdown (void); - log is configured to keep old records OR - all blocks are pinned by incomplete records. */ -void *census_log_start_write (size_t size); +void *census_log_start_write(size_t size); -void census_log_end_write (void *record, size_t bytes_written); +void census_log_end_write(void *record, size_t bytes_written); /* census_log_read_next() iterates over blocks with data and for each block returns a pointer to the first unread byte. The number of bytes that can be @@ -74,18 +74,18 @@ void census_log_end_write (void *record, size_t bytes_written); is read. census_log_init_reader() starts the iteration or aborts the current iteration. */ -void census_log_init_reader (void); -const void *census_log_read_next (size_t * bytes_available); +void census_log_init_reader(void); +const void *census_log_read_next(size_t *bytes_available); /* Returns estimated remaining space across all blocks, in bytes. If log is configured to discard old records, returns total log space. Otherwise, returns space available in empty blocks (partially filled blocks are treated as full). */ -size_t census_log_remaining_space (void); +size_t census_log_remaining_space(void); /* Returns the number of times gprc_stats_log_start_write() failed due to out-of-space. */ -int census_log_out_of_space_count (void); +int census_log_out_of_space_count(void); #endif /* GRPC_INTERNAL_CORE_STATISTICS_CENSUS_LOG_H */ diff --git a/src/core/statistics/census_rpc_stats.c b/src/core/statistics/census_rpc_stats.c index 87e05e19f26..ba2c81d6a3b 100644 --- a/src/core/statistics/census_rpc_stats.c +++ b/src/core/statistics/census_rpc_stats.c @@ -59,62 +59,43 @@ static gpr_mu g_mu; static census_ht *g_client_stats_store = NULL; static census_ht *g_server_stats_store = NULL; -static void -init_mutex (void) -{ - gpr_mu_init (&g_mu); -} +static void init_mutex(void) { gpr_mu_init(&g_mu); } -static void -init_mutex_once (void) -{ - gpr_once_init (&g_stats_store_mu_init, init_mutex); +static void init_mutex_once(void) { + gpr_once_init(&g_stats_store_mu_init, init_mutex); } -static int -cmp_str_keys (const void *k1, const void *k2) -{ - return strcmp ((const char *) k1, (const char *) k2); +static int cmp_str_keys(const void *k1, const void *k2) { + return strcmp((const char *)k1, (const char *)k2); } /* TODO(hongyu): replace it with cityhash64 */ -static gpr_uint64 -simple_hash (const void *k) -{ - size_t len = strlen (k); - gpr_uint64 higher = gpr_murmur_hash3 ((const char *) k, len / 2, 0); - return higher << 32 | gpr_murmur_hash3 ((const char *) k + len / 2, len - len / 2, 0); +static gpr_uint64 simple_hash(const void *k) { + size_t len = strlen(k); + gpr_uint64 higher = gpr_murmur_hash3((const char *)k, len / 2, 0); + return higher << 32 | + gpr_murmur_hash3((const char *)k + len / 2, len - len / 2, 0); } -static void -delete_stats (void *stats) -{ - census_window_stats_destroy ((struct census_window_stats *) stats); +static void delete_stats(void *stats) { + census_window_stats_destroy((struct census_window_stats *)stats); } -static void -delete_key (void *key) -{ - gpr_free (key); -} +static void delete_key(void *key) { gpr_free(key); } static const census_ht_option ht_opt = { - CENSUS_HT_POINTER /* key type */ , 1999 /* n_of_buckets */ , - simple_hash /* hash function */ , cmp_str_keys /* key comparator */ , - delete_stats /* data deleter */ , delete_key /* key deleter */ + CENSUS_HT_POINTER /* key type */, 1999 /* n_of_buckets */, + simple_hash /* hash function */, cmp_str_keys /* key comparator */, + delete_stats /* data deleter */, delete_key /* key deleter */ }; -static void -init_rpc_stats (void *stats) -{ - memset (stats, 0, sizeof (census_rpc_stats)); +static void init_rpc_stats(void *stats) { + memset(stats, 0, sizeof(census_rpc_stats)); } -static void -stat_add_proportion (double p, void *base, const void *addme) -{ - census_rpc_stats *b = (census_rpc_stats *) base; - census_rpc_stats *a = (census_rpc_stats *) addme; +static void stat_add_proportion(double p, void *base, const void *addme) { + census_rpc_stats *b = (census_rpc_stats *)base; + census_rpc_stats *a = (census_rpc_stats *)addme; b->cnt += p * a->cnt; b->rpc_error_cnt += p * a->rpc_error_cnt; b->app_error_cnt += p * a->app_error_cnt; @@ -125,186 +106,148 @@ stat_add_proportion (double p, void *base, const void *addme) b->wire_response_bytes += p * a->wire_response_bytes; } -static void -stat_add (void *base, const void *addme) -{ - stat_add_proportion (1.0, base, addme); +static void stat_add(void *base, const void *addme) { + stat_add_proportion(1.0, base, addme); } static gpr_timespec min_hour_total_intervals[3] = { - {60, 0}, {3600, 0}, {36000000, 0} -}; + {60, 0}, {3600, 0}, {36000000, 0}}; static const census_window_stats_stat_info window_stats_settings = { - sizeof (census_rpc_stats), init_rpc_stats, stat_add, stat_add_proportion -}; + sizeof(census_rpc_stats), init_rpc_stats, stat_add, stat_add_proportion}; -census_rpc_stats * -census_rpc_stats_create_empty (void) -{ - census_rpc_stats *ret = (census_rpc_stats *) gpr_malloc (sizeof (census_rpc_stats)); - memset (ret, 0, sizeof (census_rpc_stats)); +census_rpc_stats *census_rpc_stats_create_empty(void) { + census_rpc_stats *ret = + (census_rpc_stats *)gpr_malloc(sizeof(census_rpc_stats)); + memset(ret, 0, sizeof(census_rpc_stats)); return ret; } -void -census_aggregated_rpc_stats_set_empty (census_aggregated_rpc_stats * data) -{ +void census_aggregated_rpc_stats_set_empty(census_aggregated_rpc_stats *data) { int i = 0; - for (i = 0; i < data->num_entries; i++) - { - if (data->stats[i].method != NULL) - { - gpr_free ((void *) data->stats[i].method); - } - } - if (data->stats != NULL) - { - gpr_free (data->stats); + for (i = 0; i < data->num_entries; i++) { + if (data->stats[i].method != NULL) { + gpr_free((void *)data->stats[i].method); } + } + if (data->stats != NULL) { + gpr_free(data->stats); + } data->num_entries = 0; data->stats = NULL; } -static void -record_stats (census_ht * store, census_op_id op_id, const census_rpc_stats * stats) -{ - gpr_mu_lock (&g_mu); - if (store != NULL) - { - census_trace_obj *trace = NULL; - census_internal_lock_trace_store (); - trace = census_get_trace_obj_locked (op_id); - if (trace != NULL) - { - const char *method_name = census_get_trace_method_name (trace); - struct census_window_stats *window_stats = NULL; - census_ht_key key; - key.ptr = (void *) method_name; - window_stats = census_ht_find (store, key); - census_internal_unlock_trace_store (); - if (window_stats == NULL) - { - window_stats = census_window_stats_create (3, min_hour_total_intervals, 30, &window_stats_settings); - key.ptr = gpr_strdup (key.ptr); - census_ht_insert (store, key, (void *) window_stats); - } - census_window_stats_add (window_stats, gpr_now (GPR_CLOCK_REALTIME), stats); - } - else - { - census_internal_unlock_trace_store (); - } +static void record_stats(census_ht *store, census_op_id op_id, + const census_rpc_stats *stats) { + gpr_mu_lock(&g_mu); + if (store != NULL) { + census_trace_obj *trace = NULL; + census_internal_lock_trace_store(); + trace = census_get_trace_obj_locked(op_id); + if (trace != NULL) { + const char *method_name = census_get_trace_method_name(trace); + struct census_window_stats *window_stats = NULL; + census_ht_key key; + key.ptr = (void *)method_name; + window_stats = census_ht_find(store, key); + census_internal_unlock_trace_store(); + if (window_stats == NULL) { + window_stats = census_window_stats_create(3, min_hour_total_intervals, + 30, &window_stats_settings); + key.ptr = gpr_strdup(key.ptr); + census_ht_insert(store, key, (void *)window_stats); + } + census_window_stats_add(window_stats, gpr_now(GPR_CLOCK_REALTIME), stats); + } else { + census_internal_unlock_trace_store(); } - gpr_mu_unlock (&g_mu); + } + gpr_mu_unlock(&g_mu); } -void -census_record_rpc_client_stats (census_op_id op_id, const census_rpc_stats * stats) -{ - record_stats (g_client_stats_store, op_id, stats); +void census_record_rpc_client_stats(census_op_id op_id, + const census_rpc_stats *stats) { + record_stats(g_client_stats_store, op_id, stats); } -void -census_record_rpc_server_stats (census_op_id op_id, const census_rpc_stats * stats) -{ - record_stats (g_server_stats_store, op_id, stats); +void census_record_rpc_server_stats(census_op_id op_id, + const census_rpc_stats *stats) { + record_stats(g_server_stats_store, op_id, stats); } /* Get stats from input stats store */ -static void -get_stats (census_ht * store, census_aggregated_rpc_stats * data) -{ - GPR_ASSERT (data != NULL); - if (data->num_entries != 0) - { - census_aggregated_rpc_stats_set_empty (data); - } - gpr_mu_lock (&g_mu); - if (store != NULL) - { - size_t n; - unsigned i, j; - gpr_timespec now = gpr_now (GPR_CLOCK_REALTIME); - census_ht_kv *kv = census_ht_get_all_elements (store, &n); - if (kv != NULL) - { - data->num_entries = n; - data->stats = (per_method_stats *) gpr_malloc (sizeof (per_method_stats) * n); - for (i = 0; i < n; i++) - { - census_window_stats_sums sums[NUM_INTERVALS]; - for (j = 0; j < NUM_INTERVALS; j++) - { - sums[j].statistic = (void *) census_rpc_stats_create_empty (); - } - data->stats[i].method = gpr_strdup (kv[i].k.ptr); - census_window_stats_get_sums (kv[i].v, now, sums); - data->stats[i].minute_stats = *(census_rpc_stats *) sums[MINUTE_INTERVAL].statistic; - data->stats[i].hour_stats = *(census_rpc_stats *) sums[HOUR_INTERVAL].statistic; - data->stats[i].total_stats = *(census_rpc_stats *) sums[TOTAL_INTERVAL].statistic; - for (j = 0; j < NUM_INTERVALS; j++) - { - gpr_free (sums[j].statistic); - } - } - gpr_free (kv); - } - } - gpr_mu_unlock (&g_mu); -} - -void -census_get_client_stats (census_aggregated_rpc_stats * data) -{ - get_stats (g_client_stats_store, data); -} - -void -census_get_server_stats (census_aggregated_rpc_stats * data) -{ - get_stats (g_server_stats_store, data); -} - -void -census_stats_store_init (void) -{ - init_mutex_once (); - gpr_mu_lock (&g_mu); - if (g_client_stats_store == NULL && g_server_stats_store == NULL) - { - g_client_stats_store = census_ht_create (&ht_opt); - g_server_stats_store = census_ht_create (&ht_opt); - } - else - { - gpr_log (GPR_ERROR, "Census stats store already initialized."); - } - gpr_mu_unlock (&g_mu); -} - -void -census_stats_store_shutdown (void) -{ - init_mutex_once (); - gpr_mu_lock (&g_mu); - if (g_client_stats_store != NULL) - { - census_ht_destroy (g_client_stats_store); - g_client_stats_store = NULL; - } - else - { - gpr_log (GPR_ERROR, "Census server stats store not initialized."); - } - if (g_server_stats_store != NULL) - { - census_ht_destroy (g_server_stats_store); - g_server_stats_store = NULL; - } - else - { - gpr_log (GPR_ERROR, "Census client stats store not initialized."); +static void get_stats(census_ht *store, census_aggregated_rpc_stats *data) { + GPR_ASSERT(data != NULL); + if (data->num_entries != 0) { + census_aggregated_rpc_stats_set_empty(data); + } + gpr_mu_lock(&g_mu); + if (store != NULL) { + size_t n; + unsigned i, j; + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + census_ht_kv *kv = census_ht_get_all_elements(store, &n); + if (kv != NULL) { + data->num_entries = n; + data->stats = + (per_method_stats *)gpr_malloc(sizeof(per_method_stats) * n); + for (i = 0; i < n; i++) { + census_window_stats_sums sums[NUM_INTERVALS]; + for (j = 0; j < NUM_INTERVALS; j++) { + sums[j].statistic = (void *)census_rpc_stats_create_empty(); + } + data->stats[i].method = gpr_strdup(kv[i].k.ptr); + census_window_stats_get_sums(kv[i].v, now, sums); + data->stats[i].minute_stats = + *(census_rpc_stats *)sums[MINUTE_INTERVAL].statistic; + data->stats[i].hour_stats = + *(census_rpc_stats *)sums[HOUR_INTERVAL].statistic; + data->stats[i].total_stats = + *(census_rpc_stats *)sums[TOTAL_INTERVAL].statistic; + for (j = 0; j < NUM_INTERVALS; j++) { + gpr_free(sums[j].statistic); + } + } + gpr_free(kv); } - gpr_mu_unlock (&g_mu); + } + gpr_mu_unlock(&g_mu); +} + +void census_get_client_stats(census_aggregated_rpc_stats *data) { + get_stats(g_client_stats_store, data); +} + +void census_get_server_stats(census_aggregated_rpc_stats *data) { + get_stats(g_server_stats_store, data); +} + +void census_stats_store_init(void) { + init_mutex_once(); + gpr_mu_lock(&g_mu); + if (g_client_stats_store == NULL && g_server_stats_store == NULL) { + g_client_stats_store = census_ht_create(&ht_opt); + g_server_stats_store = census_ht_create(&ht_opt); + } else { + gpr_log(GPR_ERROR, "Census stats store already initialized."); + } + gpr_mu_unlock(&g_mu); +} + +void census_stats_store_shutdown(void) { + init_mutex_once(); + gpr_mu_lock(&g_mu); + if (g_client_stats_store != NULL) { + census_ht_destroy(g_client_stats_store); + g_client_stats_store = NULL; + } else { + gpr_log(GPR_ERROR, "Census server stats store not initialized."); + } + if (g_server_stats_store != NULL) { + census_ht_destroy(g_server_stats_store); + g_server_stats_store = NULL; + } else { + gpr_log(GPR_ERROR, "Census client stats store not initialized."); + } + gpr_mu_unlock(&g_mu); } diff --git a/src/core/statistics/census_rpc_stats.h b/src/core/statistics/census_rpc_stats.h index 7119699f6ea..5edbe9f478a 100644 --- a/src/core/statistics/census_rpc_stats.h +++ b/src/core/statistics/census_rpc_stats.h @@ -38,47 +38,45 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif - struct census_rpc_stats - { - gpr_uint64 cnt; - gpr_uint64 rpc_error_cnt; - gpr_uint64 app_error_cnt; - double elapsed_time_ms; - double api_request_bytes; - double wire_request_bytes; - double api_response_bytes; - double wire_response_bytes; - }; +struct census_rpc_stats { + gpr_uint64 cnt; + gpr_uint64 rpc_error_cnt; + gpr_uint64 app_error_cnt; + double elapsed_time_ms; + double api_request_bytes; + double wire_request_bytes; + double api_response_bytes; + double wire_response_bytes; +}; /* Creates an empty rpc stats object on heap. */ - census_rpc_stats *census_rpc_stats_create_empty (void); - - typedef struct census_per_method_rpc_stats - { - const char *method; - census_rpc_stats minute_stats; /* cumulative stats in the past minute */ - census_rpc_stats hour_stats; /* cumulative stats in the past hour */ - census_rpc_stats total_stats; /* cumulative stats from last gc */ - } census_per_method_rpc_stats; - - typedef struct census_aggregated_rpc_stats - { - int num_entries; - census_per_method_rpc_stats *stats; - } census_aggregated_rpc_stats; +census_rpc_stats *census_rpc_stats_create_empty(void); + +typedef struct census_per_method_rpc_stats { + const char *method; + census_rpc_stats minute_stats; /* cumulative stats in the past minute */ + census_rpc_stats hour_stats; /* cumulative stats in the past hour */ + census_rpc_stats total_stats; /* cumulative stats from last gc */ +} census_per_method_rpc_stats; + +typedef struct census_aggregated_rpc_stats { + int num_entries; + census_per_method_rpc_stats *stats; +} census_aggregated_rpc_stats; /* Initializes an aggregated rpc stats object to an empty state. */ - void census_aggregated_rpc_stats_set_empty (census_aggregated_rpc_stats * data); +void census_aggregated_rpc_stats_set_empty(census_aggregated_rpc_stats *data); /* Records client side stats of a rpc. */ - void census_record_rpc_client_stats (census_op_id op_id, const census_rpc_stats * stats); +void census_record_rpc_client_stats(census_op_id op_id, + const census_rpc_stats *stats); /* Records server side stats of a rpc. */ - void census_record_rpc_server_stats (census_op_id op_id, const census_rpc_stats * stats); +void census_record_rpc_server_stats(census_op_id op_id, + const census_rpc_stats *stats); /* The following two functions are intended for inprocess query of per-service per-method stats from grpc implementations. */ @@ -86,18 +84,18 @@ extern "C" /* Populates *data_map with server side aggregated per-service per-method stats. DO NOT CALL from outside of grpc code. */ - void census_get_server_stats (census_aggregated_rpc_stats * data_map); +void census_get_server_stats(census_aggregated_rpc_stats *data_map); /* Populates *data_map with client side aggregated per-service per-method stats. DO NOT CALL from outside of grpc code. */ - void census_get_client_stats (census_aggregated_rpc_stats * data_map); +void census_get_client_stats(census_aggregated_rpc_stats *data_map); - void census_stats_store_init (void); - void census_stats_store_shutdown (void); +void census_stats_store_init(void); +void census_stats_store_shutdown(void); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_STATISTICS_CENSUS_RPC_STATS_H */ +#endif /* GRPC_INTERNAL_CORE_STATISTICS_CENSUS_RPC_STATS_H */ diff --git a/src/core/statistics/census_tracing.c b/src/core/statistics/census_tracing.c index f914cae1b04..0eeecfe6c87 100644 --- a/src/core/statistics/census_tracing.c +++ b/src/core/statistics/census_tracing.c @@ -44,255 +44,198 @@ #include #include -void -census_trace_obj_destroy (census_trace_obj * obj) -{ +void census_trace_obj_destroy(census_trace_obj *obj) { census_trace_annotation *p = obj->annotations; - while (p != NULL) - { - census_trace_annotation *next = p->next; - gpr_free (p); - p = next; - } - gpr_free (obj->method); - gpr_free (obj); + while (p != NULL) { + census_trace_annotation *next = p->next; + gpr_free(p); + p = next; + } + gpr_free(obj->method); + gpr_free(obj); } -static void -delete_trace_obj (void *obj) -{ - census_trace_obj_destroy ((census_trace_obj *) obj); +static void delete_trace_obj(void *obj) { + census_trace_obj_destroy((census_trace_obj *)obj); } static const census_ht_option ht_opt = { - CENSUS_HT_UINT64 /* key type */ , - 571 /* n_of_buckets */ , - NULL /* hash */ , - NULL /* compare_keys */ , - delete_trace_obj /* delete data */ , - NULL /* delete key */ + CENSUS_HT_UINT64 /* key type */, + 571 /* n_of_buckets */, + NULL /* hash */, + NULL /* compare_keys */, + delete_trace_obj /* delete data */, + NULL /* delete key */ }; static gpr_once g_init_mutex_once = GPR_ONCE_INIT; -static gpr_mu g_mu; /* Guards following two static variables. */ +static gpr_mu g_mu; /* Guards following two static variables. */ static census_ht *g_trace_store = NULL; static gpr_uint64 g_id = 0; -static census_ht_key -op_id_as_key (census_op_id * id) -{ - return *(census_ht_key *) id; +static census_ht_key op_id_as_key(census_op_id *id) { + return *(census_ht_key *)id; } -static gpr_uint64 -op_id_2_uint64 (census_op_id * id) -{ +static gpr_uint64 op_id_2_uint64(census_op_id *id) { gpr_uint64 ret; - memcpy (&ret, id, sizeof (census_op_id)); + memcpy(&ret, id, sizeof(census_op_id)); return ret; } -static void -init_mutex (void) -{ - gpr_mu_init (&g_mu); -} +static void init_mutex(void) { gpr_mu_init(&g_mu); } -static void -init_mutex_once (void) -{ - gpr_once_init (&g_init_mutex_once, init_mutex); +static void init_mutex_once(void) { + gpr_once_init(&g_init_mutex_once, init_mutex); } -census_op_id -census_tracing_start_op (void) -{ - gpr_mu_lock (&g_mu); +census_op_id census_tracing_start_op(void) { + gpr_mu_lock(&g_mu); { - census_trace_obj *ret = gpr_malloc (sizeof (census_trace_obj)); - memset (ret, 0, sizeof (census_trace_obj)); + census_trace_obj *ret = gpr_malloc(sizeof(census_trace_obj)); + memset(ret, 0, sizeof(census_trace_obj)); g_id++; - memcpy (&ret->id, &g_id, sizeof (census_op_id)); + memcpy(&ret->id, &g_id, sizeof(census_op_id)); ret->rpc_stats.cnt = 1; - ret->ts = gpr_now (GPR_CLOCK_REALTIME); - census_ht_insert (g_trace_store, op_id_as_key (&ret->id), (void *) ret); - gpr_log (GPR_DEBUG, "Start tracing for id %lu", g_id); - gpr_mu_unlock (&g_mu); + ret->ts = gpr_now(GPR_CLOCK_REALTIME); + census_ht_insert(g_trace_store, op_id_as_key(&ret->id), (void *)ret); + gpr_log(GPR_DEBUG, "Start tracing for id %lu", g_id); + gpr_mu_unlock(&g_mu); return ret->id; } } -int -census_add_method_tag (census_op_id op_id, const char *method) -{ +int census_add_method_tag(census_op_id op_id, const char *method) { int ret = 0; census_trace_obj *trace = NULL; - gpr_mu_lock (&g_mu); - trace = census_ht_find (g_trace_store, op_id_as_key (&op_id)); - if (trace == NULL) - { - ret = 1; - } - else - { - trace->method = gpr_strdup (method); - } - gpr_mu_unlock (&g_mu); + gpr_mu_lock(&g_mu); + trace = census_ht_find(g_trace_store, op_id_as_key(&op_id)); + if (trace == NULL) { + ret = 1; + } else { + trace->method = gpr_strdup(method); + } + gpr_mu_unlock(&g_mu); return ret; } -void -census_tracing_print (census_op_id op_id, const char *anno_txt) -{ +void census_tracing_print(census_op_id op_id, const char *anno_txt) { census_trace_obj *trace = NULL; - gpr_mu_lock (&g_mu); - trace = census_ht_find (g_trace_store, op_id_as_key (&op_id)); - if (trace != NULL) + gpr_mu_lock(&g_mu); + trace = census_ht_find(g_trace_store, op_id_as_key(&op_id)); + if (trace != NULL) { + census_trace_annotation *anno = gpr_malloc(sizeof(census_trace_annotation)); + anno->ts = gpr_now(GPR_CLOCK_REALTIME); { - census_trace_annotation *anno = gpr_malloc (sizeof (census_trace_annotation)); - anno->ts = gpr_now (GPR_CLOCK_REALTIME); - { - char *d = anno->txt; - const char *s = anno_txt; - int n = 0; - for (; n < CENSUS_MAX_ANNOTATION_LENGTH && *s != '\0'; ++n) - { - *d++ = *s++; - } - *d = '\0'; + char *d = anno->txt; + const char *s = anno_txt; + int n = 0; + for (; n < CENSUS_MAX_ANNOTATION_LENGTH && *s != '\0'; ++n) { + *d++ = *s++; } - anno->next = trace->annotations; - trace->annotations = anno; + *d = '\0'; } - gpr_mu_unlock (&g_mu); + anno->next = trace->annotations; + trace->annotations = anno; + } + gpr_mu_unlock(&g_mu); } -void -census_tracing_end_op (census_op_id op_id) -{ +void census_tracing_end_op(census_op_id op_id) { census_trace_obj *trace = NULL; - gpr_mu_lock (&g_mu); - trace = census_ht_find (g_trace_store, op_id_as_key (&op_id)); - if (trace != NULL) - { - trace->rpc_stats.elapsed_time_ms = gpr_timespec_to_micros (gpr_time_sub (gpr_now (GPR_CLOCK_REALTIME), trace->ts)); - gpr_log (GPR_DEBUG, "End tracing for id %lu, method %s, latency %f us", op_id_2_uint64 (&op_id), trace->method, trace->rpc_stats.elapsed_time_ms); - census_ht_erase (g_trace_store, op_id_as_key (&op_id)); - } - gpr_mu_unlock (&g_mu); + gpr_mu_lock(&g_mu); + trace = census_ht_find(g_trace_store, op_id_as_key(&op_id)); + if (trace != NULL) { + trace->rpc_stats.elapsed_time_ms = gpr_timespec_to_micros( + gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), trace->ts)); + gpr_log(GPR_DEBUG, "End tracing for id %lu, method %s, latency %f us", + op_id_2_uint64(&op_id), trace->method, + trace->rpc_stats.elapsed_time_ms); + census_ht_erase(g_trace_store, op_id_as_key(&op_id)); + } + gpr_mu_unlock(&g_mu); } -void -census_tracing_init (void) -{ - init_mutex_once (); - gpr_mu_lock (&g_mu); - if (g_trace_store == NULL) - { - g_id = 1; - g_trace_store = census_ht_create (&ht_opt); - } - else - { - gpr_log (GPR_ERROR, "Census trace store already initialized."); - } - gpr_mu_unlock (&g_mu); +void census_tracing_init(void) { + init_mutex_once(); + gpr_mu_lock(&g_mu); + if (g_trace_store == NULL) { + g_id = 1; + g_trace_store = census_ht_create(&ht_opt); + } else { + gpr_log(GPR_ERROR, "Census trace store already initialized."); + } + gpr_mu_unlock(&g_mu); } -void -census_tracing_shutdown (void) -{ - gpr_mu_lock (&g_mu); - if (g_trace_store != NULL) - { - census_ht_destroy (g_trace_store); - g_trace_store = NULL; - } - else - { - gpr_log (GPR_ERROR, "Census trace store is not initialized."); - } - gpr_mu_unlock (&g_mu); +void census_tracing_shutdown(void) { + gpr_mu_lock(&g_mu); + if (g_trace_store != NULL) { + census_ht_destroy(g_trace_store); + g_trace_store = NULL; + } else { + gpr_log(GPR_ERROR, "Census trace store is not initialized."); + } + gpr_mu_unlock(&g_mu); } -void -census_internal_lock_trace_store (void) -{ - gpr_mu_lock (&g_mu); -} +void census_internal_lock_trace_store(void) { gpr_mu_lock(&g_mu); } -void -census_internal_unlock_trace_store (void) -{ - gpr_mu_unlock (&g_mu); -} +void census_internal_unlock_trace_store(void) { gpr_mu_unlock(&g_mu); } -census_trace_obj * -census_get_trace_obj_locked (census_op_id op_id) -{ - if (g_trace_store == NULL) - { - gpr_log (GPR_ERROR, "Census trace store is not initialized."); - return NULL; - } - return (census_trace_obj *) census_ht_find (g_trace_store, op_id_as_key (&op_id)); +census_trace_obj *census_get_trace_obj_locked(census_op_id op_id) { + if (g_trace_store == NULL) { + gpr_log(GPR_ERROR, "Census trace store is not initialized."); + return NULL; + } + return (census_trace_obj *)census_ht_find(g_trace_store, + op_id_as_key(&op_id)); } -const char * -census_get_trace_method_name (const census_trace_obj * trace) -{ +const char *census_get_trace_method_name(const census_trace_obj *trace) { return trace->method; } -static census_trace_annotation * -dup_annotation_chain (census_trace_annotation * from) -{ +static census_trace_annotation *dup_annotation_chain( + census_trace_annotation *from) { census_trace_annotation *ret = NULL; census_trace_annotation **to = &ret; - for (; from != NULL; from = from->next) - { - *to = gpr_malloc (sizeof (census_trace_annotation)); - memcpy (*to, from, sizeof (census_trace_annotation)); - to = &(*to)->next; - } + for (; from != NULL; from = from->next) { + *to = gpr_malloc(sizeof(census_trace_annotation)); + memcpy(*to, from, sizeof(census_trace_annotation)); + to = &(*to)->next; + } return ret; } -static census_trace_obj * -trace_obj_dup (census_trace_obj * from) -{ +static census_trace_obj *trace_obj_dup(census_trace_obj *from) { census_trace_obj *to = NULL; - GPR_ASSERT (from != NULL); - to = gpr_malloc (sizeof (census_trace_obj)); + GPR_ASSERT(from != NULL); + to = gpr_malloc(sizeof(census_trace_obj)); to->id = from->id; to->ts = from->ts; to->rpc_stats = from->rpc_stats; - to->method = gpr_strdup (from->method); - to->annotations = dup_annotation_chain (from->annotations); + to->method = gpr_strdup(from->method); + to->annotations = dup_annotation_chain(from->annotations); return to; } -census_trace_obj ** -census_get_active_ops (int *num_active_ops) -{ +census_trace_obj **census_get_active_ops(int *num_active_ops) { census_trace_obj **ret = NULL; - gpr_mu_lock (&g_mu); - if (g_trace_store != NULL) - { - size_t n = 0; - census_ht_kv *all_kvs = census_ht_get_all_elements (g_trace_store, &n); - *num_active_ops = (int) n; - if (n != 0) - { - size_t i = 0; - ret = gpr_malloc (sizeof (census_trace_obj *) * n); - for (i = 0; i < n; i++) - { - ret[i] = trace_obj_dup ((census_trace_obj *) all_kvs[i].v); - } - } - gpr_free (all_kvs); + gpr_mu_lock(&g_mu); + if (g_trace_store != NULL) { + size_t n = 0; + census_ht_kv *all_kvs = census_ht_get_all_elements(g_trace_store, &n); + *num_active_ops = (int)n; + if (n != 0) { + size_t i = 0; + ret = gpr_malloc(sizeof(census_trace_obj *) * n); + for (i = 0; i < n; i++) { + ret[i] = trace_obj_dup((census_trace_obj *)all_kvs[i].v); + } } - gpr_mu_unlock (&g_mu); + gpr_free(all_kvs); + } + gpr_mu_unlock(&g_mu); return ret; } diff --git a/src/core/statistics/census_tracing.h b/src/core/statistics/census_tracing.h index 02888296a9d..bb3f2556d20 100644 --- a/src/core/statistics/census_tracing.h +++ b/src/core/statistics/census_tracing.h @@ -43,57 +43,54 @@ They are not recommended for external use. */ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* Struct for a trace annotation. */ - typedef struct census_trace_annotation - { - gpr_timespec ts; /* timestamp of the annotation */ - char txt[CENSUS_MAX_ANNOTATION_LENGTH + 1]; /* actual txt annotation */ - struct census_trace_annotation *next; - } census_trace_annotation; +typedef struct census_trace_annotation { + gpr_timespec ts; /* timestamp of the annotation */ + char txt[CENSUS_MAX_ANNOTATION_LENGTH + 1]; /* actual txt annotation */ + struct census_trace_annotation *next; +} census_trace_annotation; - typedef struct census_trace_obj - { - census_op_id id; - gpr_timespec ts; - census_rpc_stats rpc_stats; - char *method; - census_trace_annotation *annotations; - } census_trace_obj; +typedef struct census_trace_obj { + census_op_id id; + gpr_timespec ts; + census_rpc_stats rpc_stats; + char *method; + census_trace_annotation *annotations; +} census_trace_obj; /* Deletes trace object. */ - void census_trace_obj_destroy (census_trace_obj * obj); +void census_trace_obj_destroy(census_trace_obj *obj); /* Initializes trace store. This function is thread safe. */ - void census_tracing_init (void); +void census_tracing_init(void); /* Shutsdown trace store. This function is thread safe. */ - void census_tracing_shutdown (void); +void census_tracing_shutdown(void); /* Gets trace obj corresponding to the input op_id. Returns NULL if trace store is not initialized or trace obj is not found. Requires trace store being locked before calling this function. */ - census_trace_obj *census_get_trace_obj_locked (census_op_id op_id); +census_trace_obj *census_get_trace_obj_locked(census_op_id op_id); /* The following two functions acquire and release the trace store global lock. They are for census internal use only. */ - void census_internal_lock_trace_store (void); - void census_internal_unlock_trace_store (void); +void census_internal_lock_trace_store(void); +void census_internal_unlock_trace_store(void); /* Gets method name associated with the input trace object. */ - const char *census_get_trace_method_name (const census_trace_obj * trace); +const char *census_get_trace_method_name(const census_trace_obj *trace); /* Returns an array of pointers to trace objects of currently active operations and fills in number of active operations. Returns NULL if there are no active operations. Caller owns the returned objects. */ - census_trace_obj **census_get_active_ops (int *num_active_ops); +census_trace_obj **census_get_active_ops(int *num_active_ops); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_STATISTICS_CENSUS_TRACING_H */ +#endif /* GRPC_INTERNAL_CORE_STATISTICS_CENSUS_TRACING_H */ diff --git a/src/core/statistics/hash_table.c b/src/core/statistics/hash_table.c index e0f89233d20..39b760f0e09 100644 --- a/src/core/statistics/hash_table.c +++ b/src/core/statistics/hash_table.c @@ -43,16 +43,14 @@ #define CENSUS_HT_NUM_BUCKETS 1999 /* A single hash table data entry */ -typedef struct ht_entry -{ +typedef struct ht_entry { census_ht_key key; void *data; struct ht_entry *next; } ht_entry; /* hash table bucket */ -typedef struct bucket -{ +typedef struct bucket { /* NULL if bucket is empty */ ht_entry *next; /* -1 if all buckets are empty. */ @@ -61,8 +59,7 @@ typedef struct bucket gpr_int32 next_non_empty_bucket; } bucket; -struct unresizable_hash_table -{ +struct unresizable_hash_table { /* Number of entries in the table */ size_t size; /* Number of buckets */ @@ -78,8 +75,7 @@ struct unresizable_hash_table census_ht_option options; }; -typedef struct entry_locator -{ +typedef struct entry_locator { gpr_int32 bucket_idx; int is_first_in_chain; int found; @@ -87,171 +83,139 @@ typedef struct entry_locator } entry_locator; /* Asserts if option is not valid. */ -void -check_options (const census_ht_option * option) -{ - GPR_ASSERT (option != NULL); - GPR_ASSERT (option->num_buckets > 0); - GPR_ASSERT (option->key_type == CENSUS_HT_UINT64 || option->key_type == CENSUS_HT_POINTER); - if (option->key_type == CENSUS_HT_UINT64) - { - GPR_ASSERT (option->hash == NULL); - } - else if (option->key_type == CENSUS_HT_POINTER) - { - GPR_ASSERT (option->hash != NULL); - GPR_ASSERT (option->compare_keys != NULL); - } +void check_options(const census_ht_option *option) { + GPR_ASSERT(option != NULL); + GPR_ASSERT(option->num_buckets > 0); + GPR_ASSERT(option->key_type == CENSUS_HT_UINT64 || + option->key_type == CENSUS_HT_POINTER); + if (option->key_type == CENSUS_HT_UINT64) { + GPR_ASSERT(option->hash == NULL); + } else if (option->key_type == CENSUS_HT_POINTER) { + GPR_ASSERT(option->hash != NULL); + GPR_ASSERT(option->compare_keys != NULL); + } } #define REMOVE_NEXT(options, ptr) \ do { \ - ht_entry* tmp = (ptr)->next; \ + ht_entry *tmp = (ptr)->next; \ (ptr)->next = tmp->next; \ delete_entry(options, tmp); \ } while (0) -static void -delete_entry (const census_ht_option * opt, ht_entry * p) -{ - if (opt->delete_data != NULL) - { - opt->delete_data (p->data); - } - if (opt->delete_key != NULL) - { - opt->delete_key (p->key.ptr); - } - gpr_free (p); +static void delete_entry(const census_ht_option *opt, ht_entry *p) { + if (opt->delete_data != NULL) { + opt->delete_data(p->data); + } + if (opt->delete_key != NULL) { + opt->delete_key(p->key.ptr); + } + gpr_free(p); } -static gpr_uint64 -hash (const census_ht_option * opt, census_ht_key key) -{ - return opt->key_type == CENSUS_HT_UINT64 ? key.val : opt->hash (key.ptr); +static gpr_uint64 hash(const census_ht_option *opt, census_ht_key key) { + return opt->key_type == CENSUS_HT_UINT64 ? key.val : opt->hash(key.ptr); } -census_ht * -census_ht_create (const census_ht_option * option) -{ +census_ht *census_ht_create(const census_ht_option *option) { int i; census_ht *ret = NULL; - check_options (option); - ret = (census_ht *) gpr_malloc (sizeof (census_ht)); + check_options(option); + ret = (census_ht *)gpr_malloc(sizeof(census_ht)); ret->size = 0; ret->num_buckets = option->num_buckets; - ret->buckets = (bucket *) gpr_malloc (sizeof (bucket) * ret->num_buckets); + ret->buckets = (bucket *)gpr_malloc(sizeof(bucket) * ret->num_buckets); ret->options = *option; /* initialize each bucket */ - for (i = 0; i < ret->options.num_buckets; i++) - { - ret->buckets[i].prev_non_empty_bucket = -1; - ret->buckets[i].next_non_empty_bucket = -1; - ret->buckets[i].next = NULL; - } + for (i = 0; i < ret->options.num_buckets; i++) { + ret->buckets[i].prev_non_empty_bucket = -1; + ret->buckets[i].next_non_empty_bucket = -1; + ret->buckets[i].next = NULL; + } return ret; } -static gpr_int32 -find_bucket_idx (const census_ht * ht, census_ht_key key) -{ - return hash (&ht->options, key) % ht->num_buckets; +static gpr_int32 find_bucket_idx(const census_ht *ht, census_ht_key key) { + return hash(&ht->options, key) % ht->num_buckets; } -static int -keys_match (const census_ht_option * opt, const ht_entry * p, const census_ht_key key) -{ - GPR_ASSERT (opt->key_type == CENSUS_HT_UINT64 || opt->key_type == CENSUS_HT_POINTER); - if (opt->key_type == CENSUS_HT_UINT64) - return p->key.val == key.val; - return !opt->compare_keys ((p->key).ptr, key.ptr); +static int keys_match(const census_ht_option *opt, const ht_entry *p, + const census_ht_key key) { + GPR_ASSERT(opt->key_type == CENSUS_HT_UINT64 || + opt->key_type == CENSUS_HT_POINTER); + if (opt->key_type == CENSUS_HT_UINT64) return p->key.val == key.val; + return !opt->compare_keys((p->key).ptr, key.ptr); } -static entry_locator -ht_find (const census_ht * ht, census_ht_key key) -{ - entry_locator loc = { 0, 0, 0, NULL }; +static entry_locator ht_find(const census_ht *ht, census_ht_key key) { + entry_locator loc = {0, 0, 0, NULL}; gpr_int32 idx = 0; ht_entry *ptr = NULL; - GPR_ASSERT (ht != NULL); - idx = find_bucket_idx (ht, key); + GPR_ASSERT(ht != NULL); + idx = find_bucket_idx(ht, key); ptr = ht->buckets[idx].next; - if (ptr == NULL) - { - /* bucket is empty */ - return loc; - } - if (keys_match (&ht->options, ptr, key)) - { - loc.bucket_idx = idx; - loc.is_first_in_chain = 1; - loc.found = 1; - return loc; - } - else - { - for (; ptr->next != NULL; ptr = ptr->next) - { - if (keys_match (&ht->options, ptr->next, key)) - { - loc.bucket_idx = idx; - loc.is_first_in_chain = 0; - loc.found = 1; - loc.prev_entry = ptr; - return loc; - } - } + if (ptr == NULL) { + /* bucket is empty */ + return loc; + } + if (keys_match(&ht->options, ptr, key)) { + loc.bucket_idx = idx; + loc.is_first_in_chain = 1; + loc.found = 1; + return loc; + } else { + for (; ptr->next != NULL; ptr = ptr->next) { + if (keys_match(&ht->options, ptr->next, key)) { + loc.bucket_idx = idx; + loc.is_first_in_chain = 0; + loc.found = 1; + loc.prev_entry = ptr; + return loc; + } } + } /* Could not find the key */ return loc; } -void * -census_ht_find (const census_ht * ht, census_ht_key key) -{ - entry_locator loc = ht_find (ht, key); - if (loc.found == 0) - { - return NULL; - } - return loc.is_first_in_chain ? ht->buckets[loc.bucket_idx].next->data : loc.prev_entry->next->data; +void *census_ht_find(const census_ht *ht, census_ht_key key) { + entry_locator loc = ht_find(ht, key); + if (loc.found == 0) { + return NULL; + } + return loc.is_first_in_chain ? ht->buckets[loc.bucket_idx].next->data + : loc.prev_entry->next->data; } -void -census_ht_insert (census_ht * ht, census_ht_key key, void *data) -{ - gpr_int32 idx = find_bucket_idx (ht, key); +void census_ht_insert(census_ht *ht, census_ht_key key, void *data) { + gpr_int32 idx = find_bucket_idx(ht, key); ht_entry *ptr = NULL; - entry_locator loc = ht_find (ht, key); - if (loc.found) - { - /* Replace old value with new value. */ - ptr = loc.is_first_in_chain ? ht->buckets[loc.bucket_idx].next : loc.prev_entry->next; - if (ht->options.delete_data != NULL) - { - ht->options.delete_data (ptr->data); - } - ptr->data = data; - return; + entry_locator loc = ht_find(ht, key); + if (loc.found) { + /* Replace old value with new value. */ + ptr = loc.is_first_in_chain ? ht->buckets[loc.bucket_idx].next + : loc.prev_entry->next; + if (ht->options.delete_data != NULL) { + ht->options.delete_data(ptr->data); } + ptr->data = data; + return; + } /* first entry in the table. */ - if (ht->size == 0) - { - ht->buckets[idx].next_non_empty_bucket = -1; - ht->buckets[idx].prev_non_empty_bucket = -1; - ht->first_non_empty_bucket = idx; - ht->last_non_empty_bucket = idx; - } - else if (ht->buckets[idx].next == NULL) - { - /* first entry in the bucket. */ - ht->buckets[ht->last_non_empty_bucket].next_non_empty_bucket = idx; - ht->buckets[idx].prev_non_empty_bucket = ht->last_non_empty_bucket; - ht->buckets[idx].next_non_empty_bucket = -1; - ht->last_non_empty_bucket = idx; - } - ptr = (ht_entry *) gpr_malloc (sizeof (ht_entry)); + if (ht->size == 0) { + ht->buckets[idx].next_non_empty_bucket = -1; + ht->buckets[idx].prev_non_empty_bucket = -1; + ht->first_non_empty_bucket = idx; + ht->last_non_empty_bucket = idx; + } else if (ht->buckets[idx].next == NULL) { + /* first entry in the bucket. */ + ht->buckets[ht->last_non_empty_bucket].next_non_empty_bucket = idx; + ht->buckets[idx].prev_non_empty_bucket = ht->last_non_empty_bucket; + ht->buckets[idx].next_non_empty_bucket = -1; + ht->last_non_empty_bucket = idx; + } + ptr = (ht_entry *)gpr_malloc(sizeof(ht_entry)); ptr->key = key; ptr->data = data; ptr->next = ht->buckets[idx].next; @@ -259,109 +223,81 @@ census_ht_insert (census_ht * ht, census_ht_key key, void *data) ht->size++; } -void -census_ht_erase (census_ht * ht, census_ht_key key) -{ - entry_locator loc = ht_find (ht, key); - if (loc.found == 0) - { - /* noop if not found */ - return; - } +void census_ht_erase(census_ht *ht, census_ht_key key) { + entry_locator loc = ht_find(ht, key); + if (loc.found == 0) { + /* noop if not found */ + return; + } ht->size--; - if (loc.is_first_in_chain) - { - bucket *b = &ht->buckets[loc.bucket_idx]; - GPR_ASSERT (b->next != NULL); - /* The only entry in the bucket */ - if (b->next->next == NULL) - { - int prev = b->prev_non_empty_bucket; - int next = b->next_non_empty_bucket; - if (prev != -1) - { - ht->buckets[prev].next_non_empty_bucket = next; - } - else - { - ht->first_non_empty_bucket = next; - } - if (next != -1) - { - ht->buckets[next].prev_non_empty_bucket = prev; - } - else - { - ht->last_non_empty_bucket = prev; - } - } - REMOVE_NEXT (&ht->options, b); - } - else - { - GPR_ASSERT (loc.prev_entry->next != NULL); - REMOVE_NEXT (&ht->options, loc.prev_entry); + if (loc.is_first_in_chain) { + bucket *b = &ht->buckets[loc.bucket_idx]; + GPR_ASSERT(b->next != NULL); + /* The only entry in the bucket */ + if (b->next->next == NULL) { + int prev = b->prev_non_empty_bucket; + int next = b->next_non_empty_bucket; + if (prev != -1) { + ht->buckets[prev].next_non_empty_bucket = next; + } else { + ht->first_non_empty_bucket = next; + } + if (next != -1) { + ht->buckets[next].prev_non_empty_bucket = prev; + } else { + ht->last_non_empty_bucket = prev; + } } + REMOVE_NEXT(&ht->options, b); + } else { + GPR_ASSERT(loc.prev_entry->next != NULL); + REMOVE_NEXT(&ht->options, loc.prev_entry); + } } /* Returns NULL if input table is empty. */ -census_ht_kv * -census_ht_get_all_elements (const census_ht * ht, size_t * num) -{ +census_ht_kv *census_ht_get_all_elements(const census_ht *ht, size_t *num) { census_ht_kv *ret = NULL; int i = 0; gpr_int32 idx = -1; - GPR_ASSERT (ht != NULL && num != NULL); + GPR_ASSERT(ht != NULL && num != NULL); *num = ht->size; - if (*num == 0) - { - return NULL; - } + if (*num == 0) { + return NULL; + } - ret = (census_ht_kv *) gpr_malloc (sizeof (census_ht_kv) * ht->size); + ret = (census_ht_kv *)gpr_malloc(sizeof(census_ht_kv) * ht->size); idx = ht->first_non_empty_bucket; - while (idx >= 0) - { - ht_entry *ptr = ht->buckets[idx].next; - for (; ptr != NULL; ptr = ptr->next) - { - ret[i].k = ptr->key; - ret[i].v = ptr->data; - i++; - } - idx = ht->buckets[idx].next_non_empty_bucket; + while (idx >= 0) { + ht_entry *ptr = ht->buckets[idx].next; + for (; ptr != NULL; ptr = ptr->next) { + ret[i].k = ptr->key; + ret[i].v = ptr->data; + i++; } + idx = ht->buckets[idx].next_non_empty_bucket; + } return ret; } -static void -ht_delete_entry_chain (const census_ht_option * options, ht_entry * first) -{ - if (first == NULL) - { - return; - } - if (first->next != NULL) - { - ht_delete_entry_chain (options, first->next); - } - delete_entry (options, first); +static void ht_delete_entry_chain(const census_ht_option *options, + ht_entry *first) { + if (first == NULL) { + return; + } + if (first->next != NULL) { + ht_delete_entry_chain(options, first->next); + } + delete_entry(options, first); } -void -census_ht_destroy (census_ht * ht) -{ +void census_ht_destroy(census_ht *ht) { unsigned i; - for (i = 0; i < ht->num_buckets; ++i) - { - ht_delete_entry_chain (&ht->options, ht->buckets[i].next); - } - gpr_free (ht->buckets); - gpr_free (ht); + for (i = 0; i < ht->num_buckets; ++i) { + ht_delete_entry_chain(&ht->options, ht->buckets[i].next); + } + gpr_free(ht->buckets); + gpr_free(ht); } -size_t -census_ht_get_size (const census_ht * ht) -{ - return ht->size; -} +size_t census_ht_get_size(const census_ht *ht) { return ht->size; } diff --git a/src/core/statistics/hash_table.h b/src/core/statistics/hash_table.h index 21f223cceb0..8b39f536fd9 100644 --- a/src/core/statistics/hash_table.h +++ b/src/core/statistics/hash_table.h @@ -59,58 +59,54 @@ typedef struct unresizable_hash_table census_ht; /* Currently, the hash_table can take two types of keys. (uint64 for trace store and const char* for stats store). */ -typedef union -{ +typedef union { gpr_uint64 val; void *ptr; } census_ht_key; -typedef enum census_ht_key_type -{ +typedef enum census_ht_key_type { CENSUS_HT_UINT64 = 0, CENSUS_HT_POINTER = 1 } census_ht_key_type; -typedef struct census_ht_option -{ +typedef struct census_ht_option { /* Type of hash key */ census_ht_key_type key_type; /* Desired number of buckets, preferably a prime number */ gpr_int32 num_buckets; /* Fucntion to calculate uint64 hash value of the key. Only takes effect if key_type is POINTER. */ - gpr_uint64 (*hash) (const void *); + gpr_uint64 (*hash)(const void *); /* Function to compare two keys, returns 0 iff equal. Only takes effect if key_type is POINTER */ - int (*compare_keys) (const void *k1, const void *k2); + int (*compare_keys)(const void *k1, const void *k2); /* Value deleter. NULL if no specialized delete function is needed. */ - void (*delete_data) (void *); + void (*delete_data)(void *); /* Key deleter. NULL if table does not own the key. (e.g. key is part of the value or key is not owned by the table.) */ - void (*delete_key) (void *); + void (*delete_key)(void *); } census_ht_option; /* Creates a hashtable with fixed number of buckets according to the settings specified in 'options' arg. Function pointers "hash" and "compare_keys" must be provided if key_type is POINTER. Asserts if fail to create. */ -census_ht *census_ht_create (const census_ht_option * options); +census_ht *census_ht_create(const census_ht_option *options); /* Deletes hash table instance. Frees all dynamic memory owned by ht.*/ -void census_ht_destroy (census_ht * ht); +void census_ht_destroy(census_ht *ht); /* Inserts the input key-val pair into hash_table. If an entry with the same key exists in the table, the corresponding value will be overwritten by the input val. */ -void census_ht_insert (census_ht * ht, census_ht_key key, void *val); +void census_ht_insert(census_ht *ht, census_ht_key key, void *val); /* Returns pointer to data, returns NULL if not found. */ -void *census_ht_find (const census_ht * ht, census_ht_key key); +void *census_ht_find(const census_ht *ht, census_ht_key key); /* Erase hash table entry with input key. Noop if key is not found. */ -void census_ht_erase (census_ht * ht, census_ht_key key); +void census_ht_erase(census_ht *ht, census_ht_key key); -typedef struct census_ht_kv -{ +typedef struct census_ht_kv { census_ht_key k; void *v; } census_ht_kv; @@ -118,17 +114,18 @@ typedef struct census_ht_kv /* Returns an array of pointers to all values in the hash table. Order of the elements can be arbitrary. Sets 'num' to the size of returned array. Caller owns returned array. */ -census_ht_kv *census_ht_get_all_elements (const census_ht * ht, size_t * num); +census_ht_kv *census_ht_get_all_elements(const census_ht *ht, size_t *num); /* Returns number of elements kept. */ -size_t census_ht_get_size (const census_ht * ht); +size_t census_ht_get_size(const census_ht *ht); /* Functor applied on each key-value pair while iterating through entries in the table. The functor should not mutate data. */ -typedef void (*census_ht_itr_cb) (census_ht_key key, const void *val_ptr, void *state); +typedef void (*census_ht_itr_cb)(census_ht_key key, const void *val_ptr, + void *state); /* Iterates through all key-value pairs in the hash_table. The callback function should not invalidate data entries. */ -gpr_uint64 census_ht_for_all (const census_ht * ht, census_ht_itr_cb); +gpr_uint64 census_ht_for_all(const census_ht *ht, census_ht_itr_cb); #endif /* GRPC_INTERNAL_CORE_STATISTICS_HASH_TABLE_H */ diff --git a/src/core/statistics/window_stats.c b/src/core/statistics/window_stats.c index 385d75d4f4e..4d0d3cca4ac 100644 --- a/src/core/statistics/window_stats.c +++ b/src/core/statistics/window_stats.c @@ -46,16 +46,14 @@ typedef struct census_window_stats_sum cws_sum; /* Each interval is composed of a number of buckets, which hold a count of entries and a single statistic */ -typedef struct census_window_stats_bucket -{ +typedef struct census_window_stats_bucket { gpr_int64 count; void *statistic; } cws_bucket; /* Each interval has a set of buckets, and the variables needed to keep track of their current state */ -typedef struct census_window_stats_interval_stats -{ +typedef struct census_window_stats_interval_stats { /* The buckets. There will be 'granularity' + 1 of these. */ cws_bucket *buckets; /* Index of the bucket containing the smallest time interval. */ @@ -68,8 +66,7 @@ typedef struct census_window_stats_interval_stats gpr_int64 width; } cws_interval_stats; -typedef struct census_window_stats -{ +typedef struct census_window_stats { /* Number of intervals. */ int nintervals; /* Number of buckets in each interval. 'granularity' + 1. */ @@ -90,252 +87,231 @@ typedef struct census_window_stats /* The maximum seconds value we can have in a valid timespec. More than this will result in overflow in timespec_to_ns(). This works out to ~292 years. TODO: consider using doubles instead of int64. */ -static gpr_int64 max_seconds = (GPR_INT64_MAX - GPR_NS_PER_SEC) / GPR_NS_PER_SEC; +static gpr_int64 max_seconds = + (GPR_INT64_MAX - GPR_NS_PER_SEC) / GPR_NS_PER_SEC; -static gpr_int64 -timespec_to_ns (const gpr_timespec ts) -{ - if (ts.tv_sec > max_seconds) - { - return GPR_INT64_MAX - 1; - } - return (gpr_int64) ts.tv_sec * GPR_NS_PER_SEC + ts.tv_nsec; +static gpr_int64 timespec_to_ns(const gpr_timespec ts) { + if (ts.tv_sec > max_seconds) { + return GPR_INT64_MAX - 1; + } + return (gpr_int64)ts.tv_sec * GPR_NS_PER_SEC + ts.tv_nsec; } -static void -cws_initialize_statistic (void *statistic, const cws_stat_info * stat_info) -{ - if (stat_info->stat_initialize == NULL) - { - memset (statistic, 0, stat_info->stat_size); - } - else - { - stat_info->stat_initialize (statistic); - } +static void cws_initialize_statistic(void *statistic, + const cws_stat_info *stat_info) { + if (stat_info->stat_initialize == NULL) { + memset(statistic, 0, stat_info->stat_size); + } else { + stat_info->stat_initialize(statistic); + } } /* Create and initialize a statistic */ -static void * -cws_create_statistic (const cws_stat_info * stat_info) -{ - void *stat = gpr_malloc (stat_info->stat_size); - cws_initialize_statistic (stat, stat_info); +static void *cws_create_statistic(const cws_stat_info *stat_info) { + void *stat = gpr_malloc(stat_info->stat_size); + cws_initialize_statistic(stat, stat_info); return stat; } -window_stats * -census_window_stats_create (int nintervals, const gpr_timespec intervals[], int granularity, const cws_stat_info * stat_info) -{ +window_stats *census_window_stats_create(int nintervals, + const gpr_timespec intervals[], + int granularity, + const cws_stat_info *stat_info) { window_stats *ret; int i; /* validate inputs */ - GPR_ASSERT (nintervals > 0 && granularity > 2 && intervals != NULL && stat_info != NULL); - for (i = 0; i < nintervals; i++) - { - gpr_int64 ns = timespec_to_ns (intervals[i]); - GPR_ASSERT (intervals[i].tv_sec >= 0 && intervals[i].tv_nsec >= 0 && intervals[i].tv_nsec < GPR_NS_PER_SEC && ns >= 100 && granularity * 10 <= ns); - } + GPR_ASSERT(nintervals > 0 && granularity > 2 && intervals != NULL && + stat_info != NULL); + for (i = 0; i < nintervals; i++) { + gpr_int64 ns = timespec_to_ns(intervals[i]); + GPR_ASSERT(intervals[i].tv_sec >= 0 && intervals[i].tv_nsec >= 0 && + intervals[i].tv_nsec < GPR_NS_PER_SEC && ns >= 100 && + granularity * 10 <= ns); + } /* Allocate and initialize relevant data structures */ - ret = (window_stats *) gpr_malloc (sizeof (window_stats)); + ret = (window_stats *)gpr_malloc(sizeof(window_stats)); ret->nintervals = nintervals; ret->nbuckets = granularity + 1; ret->stat_info = *stat_info; - ret->interval_stats = (cws_interval_stats *) gpr_malloc (nintervals * sizeof (cws_interval_stats)); - for (i = 0; i < nintervals; i++) - { - gpr_int64 size_ns = timespec_to_ns (intervals[i]); - cws_interval_stats *is = ret->interval_stats + i; - cws_bucket *buckets = is->buckets = (cws_bucket *) gpr_malloc (ret->nbuckets * sizeof (cws_bucket)); - int b; - for (b = 0; b < ret->nbuckets; b++) - { - buckets[b].statistic = cws_create_statistic (stat_info); - buckets[b].count = 0; - } - is->bottom_bucket = 0; - is->bottom = 0; - is->width = size_ns / granularity; - /* Check for possible overflow issues, and maximize interval size if the - user requested something large enough. */ - if ((GPR_INT64_MAX - is->width) > size_ns) - { - is->top = size_ns + is->width; - } - else - { - is->top = GPR_INT64_MAX; - is->width = GPR_INT64_MAX / (granularity + 1); - } - /* If size doesn't divide evenly, we can have a width slightly too small; - better to have it slightly large. */ - if ((size_ns - (granularity + 1) * is->width) > 0) - { - is->width += 1; - } + ret->interval_stats = + (cws_interval_stats *)gpr_malloc(nintervals * sizeof(cws_interval_stats)); + for (i = 0; i < nintervals; i++) { + gpr_int64 size_ns = timespec_to_ns(intervals[i]); + cws_interval_stats *is = ret->interval_stats + i; + cws_bucket *buckets = is->buckets = + (cws_bucket *)gpr_malloc(ret->nbuckets * sizeof(cws_bucket)); + int b; + for (b = 0; b < ret->nbuckets; b++) { + buckets[b].statistic = cws_create_statistic(stat_info); + buckets[b].count = 0; + } + is->bottom_bucket = 0; + is->bottom = 0; + is->width = size_ns / granularity; + /* Check for possible overflow issues, and maximize interval size if the + user requested something large enough. */ + if ((GPR_INT64_MAX - is->width) > size_ns) { + is->top = size_ns + is->width; + } else { + is->top = GPR_INT64_MAX; + is->width = GPR_INT64_MAX / (granularity + 1); + } + /* If size doesn't divide evenly, we can have a width slightly too small; + better to have it slightly large. */ + if ((size_ns - (granularity + 1) * is->width) > 0) { + is->width += 1; } + } ret->newest_time = 0; return ret; } /* When we try adding a measurement above the current interval range, we need to "shift" the buckets sufficiently to cover the new range. */ -static void -cws_shift_buckets (const window_stats * wstats, cws_interval_stats * is, gpr_int64 when_ns) -{ +static void cws_shift_buckets(const window_stats *wstats, + cws_interval_stats *is, gpr_int64 when_ns) { int i; /* number of bucket time widths to "shift" */ int shift; /* number of buckets to clear */ int nclear; - GPR_ASSERT (when_ns >= is->top); + GPR_ASSERT(when_ns >= is->top); /* number of bucket time widths to "shift" */ shift = ((when_ns - is->top) / is->width) + 1; /* number of buckets to clear - limited by actual number of buckets */ - nclear = GPR_MIN (shift, wstats->nbuckets); - for (i = 0; i < nclear; i++) - { - int b = BUCKET_IDX (is, i, wstats); - is->buckets[b].count = 0; - cws_initialize_statistic (is->buckets[b].statistic, &wstats->stat_info); - } + nclear = GPR_MIN(shift, wstats->nbuckets); + for (i = 0; i < nclear; i++) { + int b = BUCKET_IDX(is, i, wstats); + is->buckets[b].count = 0; + cws_initialize_statistic(is->buckets[b].statistic, &wstats->stat_info); + } /* adjust top/bottom times and current bottom bucket */ - is->bottom_bucket = BUCKET_IDX (is, shift, wstats); + is->bottom_bucket = BUCKET_IDX(is, shift, wstats); is->top += shift * is->width; is->bottom += shift * is->width; } -void -census_window_stats_add (window_stats * wstats, const gpr_timespec when, const void *stat_value) -{ +void census_window_stats_add(window_stats *wstats, const gpr_timespec when, + const void *stat_value) { int i; - gpr_int64 when_ns = timespec_to_ns (when); - GPR_ASSERT (wstats->interval_stats != NULL); - for (i = 0; i < wstats->nintervals; i++) - { - cws_interval_stats *is = wstats->interval_stats + i; - cws_bucket *bucket; - if (when_ns < is->bottom) - { /* Below smallest time in interval: drop */ - continue; - } - if (when_ns >= is->top) - { /* above limit: shift buckets */ - cws_shift_buckets (wstats, is, when_ns); - } - /* Add the stat. */ - GPR_ASSERT (is->bottom <= when_ns && when_ns < is->top); - bucket = is->buckets + BUCKET_IDX (is, (when_ns - is->bottom) / is->width, wstats); - bucket->count++; - wstats->stat_info.stat_add (bucket->statistic, stat_value); + gpr_int64 when_ns = timespec_to_ns(when); + GPR_ASSERT(wstats->interval_stats != NULL); + for (i = 0; i < wstats->nintervals; i++) { + cws_interval_stats *is = wstats->interval_stats + i; + cws_bucket *bucket; + if (when_ns < is->bottom) { /* Below smallest time in interval: drop */ + continue; } - if (when_ns > wstats->newest_time) - { - wstats->newest_time = when_ns; + if (when_ns >= is->top) { /* above limit: shift buckets */ + cws_shift_buckets(wstats, is, when_ns); } + /* Add the stat. */ + GPR_ASSERT(is->bottom <= when_ns && when_ns < is->top); + bucket = is->buckets + + BUCKET_IDX(is, (when_ns - is->bottom) / is->width, wstats); + bucket->count++; + wstats->stat_info.stat_add(bucket->statistic, stat_value); + } + if (when_ns > wstats->newest_time) { + wstats->newest_time = when_ns; + } } /* Add a specific bucket contents to an accumulating total. */ -static void -cws_add_bucket_to_sum (cws_sum * sum, const cws_bucket * bucket, const cws_stat_info * stat_info) -{ +static void cws_add_bucket_to_sum(cws_sum *sum, const cws_bucket *bucket, + const cws_stat_info *stat_info) { sum->count += bucket->count; - stat_info->stat_add (sum->statistic, bucket->statistic); + stat_info->stat_add(sum->statistic, bucket->statistic); } /* Add a proportion to an accumulating sum. */ -static void -cws_add_proportion_to_sum (double p, cws_sum * sum, const cws_bucket * bucket, const cws_stat_info * stat_info) -{ +static void cws_add_proportion_to_sum(double p, cws_sum *sum, + const cws_bucket *bucket, + const cws_stat_info *stat_info) { sum->count += p * bucket->count; - stat_info->stat_add_proportion (p, sum->statistic, bucket->statistic); + stat_info->stat_add_proportion(p, sum->statistic, bucket->statistic); } -void -census_window_stats_get_sums (const window_stats * wstats, const gpr_timespec when, cws_sum sums[]) -{ +void census_window_stats_get_sums(const window_stats *wstats, + const gpr_timespec when, cws_sum sums[]) { int i; - gpr_int64 when_ns = timespec_to_ns (when); - GPR_ASSERT (wstats->interval_stats != NULL); - for (i = 0; i < wstats->nintervals; i++) - { - int when_bucket; - int new_bucket; - double last_proportion = 1.0; - double bottom_proportion; - cws_interval_stats *is = wstats->interval_stats + i; - cws_sum *sum = sums + i; - sum->count = 0; - cws_initialize_statistic (sum->statistic, &wstats->stat_info); - if (when_ns < is->bottom) - { - continue; - } - if (when_ns >= is->top) - { - cws_shift_buckets (wstats, is, when_ns); - } - /* Calculating the appropriate amount of which buckets to use can get - complicated. Essentially there are two cases: - 1) if the "top" bucket (new_bucket, where the newest additions to the - stats recorded are entered) corresponds to 'when', then we need - to take a proportion of it - (if when < newest_time) or the full - thing. We also (possibly) need to take a corresponding - proportion of the bottom bucket. - 2) Other cases, we just take a straight proportion. - */ - when_bucket = (when_ns - is->bottom) / is->width; - new_bucket = (wstats->newest_time - is->bottom) / is->width; - if (new_bucket == when_bucket) - { - gpr_int64 bottom_bucket_time = is->bottom + when_bucket * is->width; - if (when_ns < wstats->newest_time) - { - last_proportion = (double) (when_ns - bottom_bucket_time) / (double) (wstats->newest_time - bottom_bucket_time); - bottom_proportion = (double) (is->width - (when_ns - bottom_bucket_time)) / is->width; - } - else - { - bottom_proportion = (double) (is->width - (wstats->newest_time - bottom_bucket_time)) / is->width; - } - } - else - { - last_proportion = (double) (when_ns + 1 - is->bottom - when_bucket * is->width) / is->width; - bottom_proportion = 1.0 - last_proportion; - } - cws_add_proportion_to_sum (last_proportion, sum, is->buckets + BUCKET_IDX (is, when_bucket, wstats), &wstats->stat_info); - if (when_bucket != 0) - { /* last bucket isn't also bottom bucket */ - int b; - /* Add all of "bottom" bucket if we are looking at a subset of the - full interval, or a proportion if we are adding full interval. */ - cws_add_proportion_to_sum ((when_bucket == wstats->nbuckets - 1 ? bottom_proportion : 1.0), sum, is->buckets + is->bottom_bucket, &wstats->stat_info); - /* Add all the remaining buckets (everything but top and bottom). */ - for (b = 1; b < when_bucket; b++) - { - cws_add_bucket_to_sum (sum, is->buckets + BUCKET_IDX (is, b, wstats), &wstats->stat_info); - } - } + gpr_int64 when_ns = timespec_to_ns(when); + GPR_ASSERT(wstats->interval_stats != NULL); + for (i = 0; i < wstats->nintervals; i++) { + int when_bucket; + int new_bucket; + double last_proportion = 1.0; + double bottom_proportion; + cws_interval_stats *is = wstats->interval_stats + i; + cws_sum *sum = sums + i; + sum->count = 0; + cws_initialize_statistic(sum->statistic, &wstats->stat_info); + if (when_ns < is->bottom) { + continue; + } + if (when_ns >= is->top) { + cws_shift_buckets(wstats, is, when_ns); + } + /* Calculating the appropriate amount of which buckets to use can get + complicated. Essentially there are two cases: + 1) if the "top" bucket (new_bucket, where the newest additions to the + stats recorded are entered) corresponds to 'when', then we need + to take a proportion of it - (if when < newest_time) or the full + thing. We also (possibly) need to take a corresponding + proportion of the bottom bucket. + 2) Other cases, we just take a straight proportion. + */ + when_bucket = (when_ns - is->bottom) / is->width; + new_bucket = (wstats->newest_time - is->bottom) / is->width; + if (new_bucket == when_bucket) { + gpr_int64 bottom_bucket_time = is->bottom + when_bucket * is->width; + if (when_ns < wstats->newest_time) { + last_proportion = (double)(when_ns - bottom_bucket_time) / + (double)(wstats->newest_time - bottom_bucket_time); + bottom_proportion = + (double)(is->width - (when_ns - bottom_bucket_time)) / is->width; + } else { + bottom_proportion = + (double)(is->width - (wstats->newest_time - bottom_bucket_time)) / + is->width; + } + } else { + last_proportion = + (double)(when_ns + 1 - is->bottom - when_bucket * is->width) / + is->width; + bottom_proportion = 1.0 - last_proportion; } + cws_add_proportion_to_sum(last_proportion, sum, + is->buckets + BUCKET_IDX(is, when_bucket, wstats), + &wstats->stat_info); + if (when_bucket != 0) { /* last bucket isn't also bottom bucket */ + int b; + /* Add all of "bottom" bucket if we are looking at a subset of the + full interval, or a proportion if we are adding full interval. */ + cws_add_proportion_to_sum( + (when_bucket == wstats->nbuckets - 1 ? bottom_proportion : 1.0), sum, + is->buckets + is->bottom_bucket, &wstats->stat_info); + /* Add all the remaining buckets (everything but top and bottom). */ + for (b = 1; b < when_bucket; b++) { + cws_add_bucket_to_sum(sum, is->buckets + BUCKET_IDX(is, b, wstats), + &wstats->stat_info); + } + } + } } -void -census_window_stats_destroy (window_stats * wstats) -{ +void census_window_stats_destroy(window_stats *wstats) { int i; - GPR_ASSERT (wstats->interval_stats != NULL); - for (i = 0; i < wstats->nintervals; i++) - { - int b; - for (b = 0; b < wstats->nbuckets; b++) - { - gpr_free (wstats->interval_stats[i].buckets[b].statistic); - } - gpr_free (wstats->interval_stats[i].buckets); + GPR_ASSERT(wstats->interval_stats != NULL); + for (i = 0; i < wstats->nintervals; i++) { + int b; + for (b = 0; b < wstats->nbuckets; b++) { + gpr_free(wstats->interval_stats[i].buckets[b].statistic); } - gpr_free (wstats->interval_stats); + gpr_free(wstats->interval_stats[i].buckets); + } + gpr_free(wstats->interval_stats); /* Ensure any use-after free triggers assert. */ wstats->interval_stats = NULL; - gpr_free (wstats); + gpr_free(wstats); } diff --git a/src/core/statistics/window_stats.h b/src/core/statistics/window_stats.h index ce67633b56c..f4732e96a02 100644 --- a/src/core/statistics/window_stats.h +++ b/src/core/statistics/window_stats.h @@ -115,19 +115,18 @@ struct census_window_stats; /* Information provided by API user on the information they want to record */ -typedef struct census_window_stats_stat_info -{ +typedef struct census_window_stats_stat_info { /* Number of bytes in user-defined object. */ size_t stat_size; /* Function to initialize a user-defined statistics object. If this is set * to NULL, then the object will be zero-initialized. */ - void (*stat_initialize) (void *stat); + void (*stat_initialize)(void *stat); /* Function to add one user-defined statistics object ('addme') to 'base' */ - void (*stat_add) (void *base, const void *addme); + void (*stat_add)(void *base, const void *addme); /* As for previous function, but only add a proportion 'p'. This API will currently only use 'p' values in the range [0,1], but other values are possible in the future, and should be supported. */ - void (*stat_add_proportion) (double p, void *base, const void *addme); + void (*stat_add_proportion)(double p, void *base, const void *addme); } census_window_stats_stat_info; /* Create a new window_stats object. 'nintervals' is the number of @@ -139,15 +138,17 @@ typedef struct census_window_stats_stat_info years will be treated as essentially infinite in size. This function will GPR_ASSERT() if the object cannot be created or any of the parameters have invalid values. This function is thread-safe. */ -struct census_window_stats *census_window_stats_create (int nintervals, const gpr_timespec intervals[], int granularity, const census_window_stats_stat_info * stat_info); +struct census_window_stats *census_window_stats_create( + int nintervals, const gpr_timespec intervals[], int granularity, + const census_window_stats_stat_info *stat_info); /* Add a new measurement (in 'stat_value'), as of a given time ('when'). This function is thread-compatible. */ -void census_window_stats_add (struct census_window_stats *wstats, const gpr_timespec when, const void *stat_value); +void census_window_stats_add(struct census_window_stats *wstats, + const gpr_timespec when, const void *stat_value); /* Structure used to record a single intervals sum for a given statistic */ -typedef struct census_window_stats_sum -{ +typedef struct census_window_stats_sum { /* Total count of samples. Note that because some internal interpolation is performed, the count of samples returned for each interval may not be an integral value. */ @@ -159,12 +160,14 @@ typedef struct census_window_stats_sum /* Retrieve a set of all values stored in a window_stats object 'wstats'. The number of 'sums' MUST be the same as the number 'nintervals' used in census_window_stats_create(). This function is thread-compatible. */ -void census_window_stats_get_sums (const struct census_window_stats *wstats, const gpr_timespec when, struct census_window_stats_sum sums[]); +void census_window_stats_get_sums(const struct census_window_stats *wstats, + const gpr_timespec when, + struct census_window_stats_sum sums[]); /* Destroy a window_stats object. Once this function has been called, the object will no longer be usable from any of the above functions (and calling them will most likely result in a NULL-pointer dereference or assertion failure). This function is thread-compatible. */ -void census_window_stats_destroy (struct census_window_stats *wstats); +void census_window_stats_destroy(struct census_window_stats *wstats); #endif /* GRPC_INTERNAL_CORE_STATISTICS_WINDOW_STATS_H */ diff --git a/src/core/support/alloc.c b/src/core/support/alloc.c index d83a1684e6f..d2ed82e7717 100644 --- a/src/core/support/alloc.c +++ b/src/core/support/alloc.c @@ -36,47 +36,31 @@ #include #include -void * -gpr_malloc (size_t size) -{ - void *p = malloc (size); - if (!p) - { - abort (); - } +void *gpr_malloc(size_t size) { + void *p = malloc(size); + if (!p) { + abort(); + } return p; } -void -gpr_free (void *p) -{ - free (p); -} +void gpr_free(void *p) { free(p); } -void * -gpr_realloc (void *p, size_t size) -{ - p = realloc (p, size); - if (!p) - { - abort (); - } +void *gpr_realloc(void *p, size_t size) { + p = realloc(p, size); + if (!p) { + abort(); + } return p; } -void * -gpr_malloc_aligned (size_t size, size_t alignment_log) -{ - size_t alignment = ((size_t) 1) << alignment_log; - size_t extra = alignment - 1 + sizeof (void *); - void *p = gpr_malloc (size + extra); - void **ret = (void **) (((gpr_uintptr) p + extra) & ~(alignment - 1)); +void *gpr_malloc_aligned(size_t size, size_t alignment_log) { + size_t alignment = ((size_t)1) << alignment_log; + size_t extra = alignment - 1 + sizeof(void *); + void *p = gpr_malloc(size + extra); + void **ret = (void **)(((gpr_uintptr)p + extra) & ~(alignment - 1)); ret[-1] = p; - return (void *) ret; + return (void *)ret; } -void -gpr_free_aligned (void *ptr) -{ - free (((void **) ptr)[-1]); -} +void gpr_free_aligned(void *ptr) { free(((void **)ptr)[-1]); } diff --git a/src/core/support/cmdline.c b/src/core/support/cmdline.c index 1975212385e..45a3182f73a 100644 --- a/src/core/support/cmdline.c +++ b/src/core/support/cmdline.c @@ -42,11 +42,9 @@ #include #include -typedef enum -{ ARGTYPE_INT, ARGTYPE_BOOL, ARGTYPE_STRING } argtype; +typedef enum { ARGTYPE_INT, ARGTYPE_BOOL, ARGTYPE_STRING } argtype; -typedef struct arg -{ +typedef struct arg { const char *name; const char *help; argtype type; @@ -54,28 +52,25 @@ typedef struct arg struct arg *next; } arg; -struct gpr_cmdline -{ +struct gpr_cmdline { const char *description; arg *args; const char *argv0; const char *extra_arg_name; const char *extra_arg_help; - void (*extra_arg) (void *user_data, const char *arg); + void (*extra_arg)(void *user_data, const char *arg); void *extra_arg_user_data; - void (*state) (gpr_cmdline * cl, char *arg); + void (*state)(gpr_cmdline *cl, char *arg); arg *cur_arg; }; -static void normal_state (gpr_cmdline * cl, char *arg); +static void normal_state(gpr_cmdline *cl, char *arg); -gpr_cmdline * -gpr_cmdline_create (const char *description) -{ - gpr_cmdline *cl = gpr_malloc (sizeof (gpr_cmdline)); - memset (cl, 0, sizeof (gpr_cmdline)); +gpr_cmdline *gpr_cmdline_create(const char *description) { + gpr_cmdline *cl = gpr_malloc(sizeof(gpr_cmdline)); + memset(cl, 0, sizeof(gpr_cmdline)); cl->description = description; cl->state = normal_state; @@ -83,30 +78,25 @@ gpr_cmdline_create (const char *description) return cl; } -void -gpr_cmdline_destroy (gpr_cmdline * cl) -{ - while (cl->args) - { - arg *a = cl->args; - cl->args = a->next; - gpr_free (a); - } - gpr_free (cl); +void gpr_cmdline_destroy(gpr_cmdline *cl) { + while (cl->args) { + arg *a = cl->args; + cl->args = a->next; + gpr_free(a); + } + gpr_free(cl); } -static void -add_arg (gpr_cmdline * cl, const char *name, const char *help, argtype type, void *value) -{ +static void add_arg(gpr_cmdline *cl, const char *name, const char *help, + argtype type, void *value) { arg *a; - for (a = cl->args; a; a = a->next) - { - GPR_ASSERT (0 != strcmp (a->name, name)); - } + for (a = cl->args; a; a = a->next) { + GPR_ASSERT(0 != strcmp(a->name, name)); + } - a = gpr_malloc (sizeof (arg)); - memset (a, 0, sizeof (arg)); + a = gpr_malloc(sizeof(arg)); + memset(a, 0, sizeof(arg)); a->name = name; a->help = help; a->type = type; @@ -115,29 +105,26 @@ add_arg (gpr_cmdline * cl, const char *name, const char *help, argtype type, voi cl->args = a; } -void -gpr_cmdline_add_int (gpr_cmdline * cl, const char *name, const char *help, int *value) -{ - add_arg (cl, name, help, ARGTYPE_INT, value); +void gpr_cmdline_add_int(gpr_cmdline *cl, const char *name, const char *help, + int *value) { + add_arg(cl, name, help, ARGTYPE_INT, value); } -void -gpr_cmdline_add_flag (gpr_cmdline * cl, const char *name, const char *help, int *value) -{ - add_arg (cl, name, help, ARGTYPE_BOOL, value); +void gpr_cmdline_add_flag(gpr_cmdline *cl, const char *name, const char *help, + int *value) { + add_arg(cl, name, help, ARGTYPE_BOOL, value); } -void -gpr_cmdline_add_string (gpr_cmdline * cl, const char *name, const char *help, char **value) -{ - add_arg (cl, name, help, ARGTYPE_STRING, value); +void gpr_cmdline_add_string(gpr_cmdline *cl, const char *name, const char *help, + char **value) { + add_arg(cl, name, help, ARGTYPE_STRING, value); } -void -gpr_cmdline_on_extra_arg (gpr_cmdline * cl, const char *name, const char *help, void (*on_extra_arg) (void *user_data, const char *arg), void *user_data) -{ - GPR_ASSERT (!cl->extra_arg); - GPR_ASSERT (on_extra_arg); +void gpr_cmdline_on_extra_arg( + gpr_cmdline *cl, const char *name, const char *help, + void (*on_extra_arg)(void *user_data, const char *arg), void *user_data) { + GPR_ASSERT(!cl->extra_arg); + GPR_ASSERT(on_extra_arg); cl->extra_arg = on_extra_arg; cl->extra_arg_user_data = user_data; @@ -148,238 +135,189 @@ gpr_cmdline_on_extra_arg (gpr_cmdline * cl, const char *name, const char *help, /* recursively descend argument list, adding the last element to s first - so that arguments are added in the order they were added to the list by api calls */ -static void -add_args_to_usage (gpr_strvec * s, arg * a) -{ +static void add_args_to_usage(gpr_strvec *s, arg *a) { char *tmp; - if (!a) - return; - add_args_to_usage (s, a->next); + if (!a) return; + add_args_to_usage(s, a->next); - switch (a->type) - { + switch (a->type) { case ARGTYPE_BOOL: - gpr_asprintf (&tmp, " [--%s|--no-%s]", a->name, a->name); - gpr_strvec_add (s, tmp); + gpr_asprintf(&tmp, " [--%s|--no-%s]", a->name, a->name); + gpr_strvec_add(s, tmp); break; case ARGTYPE_STRING: - gpr_asprintf (&tmp, " [--%s=string]", a->name); - gpr_strvec_add (s, tmp); + gpr_asprintf(&tmp, " [--%s=string]", a->name); + gpr_strvec_add(s, tmp); break; case ARGTYPE_INT: - gpr_asprintf (&tmp, " [--%s=int]", a->name); - gpr_strvec_add (s, tmp); + gpr_asprintf(&tmp, " [--%s=int]", a->name); + gpr_strvec_add(s, tmp); break; - } + } } -char * -gpr_cmdline_usage_string (gpr_cmdline * cl, const char *argv0) -{ +char *gpr_cmdline_usage_string(gpr_cmdline *cl, const char *argv0) { /* TODO(ctiller): make this prettier */ gpr_strvec s; char *tmp; - const char *name = strrchr (argv0, '/'); - - if (name) - { - name++; - } - else - { - name = argv0; - } - - gpr_strvec_init (&s); - - gpr_asprintf (&tmp, "Usage: %s", name); - gpr_strvec_add (&s, tmp); - add_args_to_usage (&s, cl->args); - if (cl->extra_arg) - { - gpr_asprintf (&tmp, " [%s...]", cl->extra_arg_name); - gpr_strvec_add (&s, tmp); - } - gpr_strvec_add (&s, gpr_strdup ("\n")); - - tmp = gpr_strvec_flatten (&s, NULL); - gpr_strvec_destroy (&s); + const char *name = strrchr(argv0, '/'); + + if (name) { + name++; + } else { + name = argv0; + } + + gpr_strvec_init(&s); + + gpr_asprintf(&tmp, "Usage: %s", name); + gpr_strvec_add(&s, tmp); + add_args_to_usage(&s, cl->args); + if (cl->extra_arg) { + gpr_asprintf(&tmp, " [%s...]", cl->extra_arg_name); + gpr_strvec_add(&s, tmp); + } + gpr_strvec_add(&s, gpr_strdup("\n")); + + tmp = gpr_strvec_flatten(&s, NULL); + gpr_strvec_destroy(&s); return tmp; } -static void -print_usage_and_die (gpr_cmdline * cl) -{ - char *usage = gpr_cmdline_usage_string (cl, cl->argv0); - fprintf (stderr, "%s", usage); - gpr_free (usage); - exit (1); +static void print_usage_and_die(gpr_cmdline *cl) { + char *usage = gpr_cmdline_usage_string(cl, cl->argv0); + fprintf(stderr, "%s", usage); + gpr_free(usage); + exit(1); } -static void -extra_state (gpr_cmdline * cl, char *arg) -{ - if (!cl->extra_arg) - print_usage_and_die (cl); - cl->extra_arg (cl->extra_arg_user_data, arg); +static void extra_state(gpr_cmdline *cl, char *arg) { + if (!cl->extra_arg) print_usage_and_die(cl); + cl->extra_arg(cl->extra_arg_user_data, arg); } -static arg * -find_arg (gpr_cmdline * cl, char *name) -{ +static arg *find_arg(gpr_cmdline *cl, char *name) { arg *a; - for (a = cl->args; a; a = a->next) - { - if (0 == strcmp (a->name, name)) - { - break; - } + for (a = cl->args; a; a = a->next) { + if (0 == strcmp(a->name, name)) { + break; } + } - if (!a) - { - fprintf (stderr, "Unknown argument: %s\n", name); - print_usage_and_die (cl); - } + if (!a) { + fprintf(stderr, "Unknown argument: %s\n", name); + print_usage_and_die(cl); + } return a; } -static void -value_state (gpr_cmdline * cl, char *arg) -{ +static void value_state(gpr_cmdline *cl, char *arg) { long intval; char *end; - GPR_ASSERT (cl->cur_arg); + GPR_ASSERT(cl->cur_arg); - switch (cl->cur_arg->type) - { + switch (cl->cur_arg->type) { case ARGTYPE_INT: - intval = strtol (arg, &end, 0); - if (*end || intval < INT_MIN || intval > INT_MAX) - { - fprintf (stderr, "expected integer, got '%s' for %s\n", arg, cl->cur_arg->name); - print_usage_and_die (cl); - } - *(int *) cl->cur_arg->value = (int) intval; + intval = strtol(arg, &end, 0); + if (*end || intval < INT_MIN || intval > INT_MAX) { + fprintf(stderr, "expected integer, got '%s' for %s\n", arg, + cl->cur_arg->name); + print_usage_and_die(cl); + } + *(int *)cl->cur_arg->value = (int)intval; break; case ARGTYPE_BOOL: - if (0 == strcmp (arg, "1") || 0 == strcmp (arg, "true")) - { - *(int *) cl->cur_arg->value = 1; - } - else if (0 == strcmp (arg, "0") || 0 == strcmp (arg, "false")) - { - *(int *) cl->cur_arg->value = 0; - } - else - { - fprintf (stderr, "expected boolean, got '%s' for %s\n", arg, cl->cur_arg->name); - print_usage_and_die (cl); - } + if (0 == strcmp(arg, "1") || 0 == strcmp(arg, "true")) { + *(int *)cl->cur_arg->value = 1; + } else if (0 == strcmp(arg, "0") || 0 == strcmp(arg, "false")) { + *(int *)cl->cur_arg->value = 0; + } else { + fprintf(stderr, "expected boolean, got '%s' for %s\n", arg, + cl->cur_arg->name); + print_usage_and_die(cl); + } break; case ARGTYPE_STRING: - *(char **) cl->cur_arg->value = arg; + *(char **)cl->cur_arg->value = arg; break; - } + } cl->state = normal_state; } -static void -normal_state (gpr_cmdline * cl, char *arg) -{ +static void normal_state(gpr_cmdline *cl, char *arg) { char *eq = NULL; char *tmp = NULL; char *arg_name = NULL; - if (0 == strcmp (arg, "-help") || 0 == strcmp (arg, "--help") || 0 == strcmp (arg, "-h")) - { - print_usage_and_die (cl); - } + if (0 == strcmp(arg, "-help") || 0 == strcmp(arg, "--help") || + 0 == strcmp(arg, "-h")) { + print_usage_and_die(cl); + } cl->cur_arg = NULL; - if (arg[0] == '-') - { - if (arg[1] == '-') - { - if (arg[2] == 0) - { - /* handle '--' to move to just extra args */ - cl->state = extra_state; - return; - } - arg += 2; - } - else - { - arg += 1; - } - /* first byte of arg is now past the leading '-' or '--' */ - if (arg[0] == 'n' && arg[1] == 'o' && arg[2] == '-') - { - /* arg is of the form '--no-foo' - it's a flag disable */ - arg += 3; - cl->cur_arg = find_arg (cl, arg); - if (cl->cur_arg->type != ARGTYPE_BOOL) - { - fprintf (stderr, "%s is not a flag argument\n", arg); - print_usage_and_die (cl); - } - *(int *) cl->cur_arg->value = 0; - return; /* early out */ - } - eq = strchr (arg, '='); - if (eq != NULL) - { - /* copy the string into a temp buffer and extract the name */ - tmp = arg_name = gpr_malloc ((size_t) (eq - arg + 1)); - memcpy (arg_name, arg, (size_t) (eq - arg)); - arg_name[eq - arg] = 0; - } - else - { - arg_name = arg; - } - cl->cur_arg = find_arg (cl, arg_name); - if (eq != NULL) - { - /* arg was of the type --foo=value, parse the value */ - value_state (cl, eq + 1); - } - else if (cl->cur_arg->type != ARGTYPE_BOOL) - { - /* flag types don't have a '--foo value' variant, other types do */ - cl->state = value_state; - } - else - { - /* flag parameter: just set the value */ - *(int *) cl->cur_arg->value = 1; - } + if (arg[0] == '-') { + if (arg[1] == '-') { + if (arg[2] == 0) { + /* handle '--' to move to just extra args */ + cl->state = extra_state; + return; + } + arg += 2; + } else { + arg += 1; + } + /* first byte of arg is now past the leading '-' or '--' */ + if (arg[0] == 'n' && arg[1] == 'o' && arg[2] == '-') { + /* arg is of the form '--no-foo' - it's a flag disable */ + arg += 3; + cl->cur_arg = find_arg(cl, arg); + if (cl->cur_arg->type != ARGTYPE_BOOL) { + fprintf(stderr, "%s is not a flag argument\n", arg); + print_usage_and_die(cl); + } + *(int *)cl->cur_arg->value = 0; + return; /* early out */ } - else - { - extra_state (cl, arg); + eq = strchr(arg, '='); + if (eq != NULL) { + /* copy the string into a temp buffer and extract the name */ + tmp = arg_name = gpr_malloc((size_t)(eq - arg + 1)); + memcpy(arg_name, arg, (size_t)(eq - arg)); + arg_name[eq - arg] = 0; + } else { + arg_name = arg; } + cl->cur_arg = find_arg(cl, arg_name); + if (eq != NULL) { + /* arg was of the type --foo=value, parse the value */ + value_state(cl, eq + 1); + } else if (cl->cur_arg->type != ARGTYPE_BOOL) { + /* flag types don't have a '--foo value' variant, other types do */ + cl->state = value_state; + } else { + /* flag parameter: just set the value */ + *(int *)cl->cur_arg->value = 1; + } + } else { + extra_state(cl, arg); + } - gpr_free (tmp); + gpr_free(tmp); } -void -gpr_cmdline_parse (gpr_cmdline * cl, int argc, char **argv) -{ +void gpr_cmdline_parse(gpr_cmdline *cl, int argc, char **argv) { int i; - GPR_ASSERT (argc >= 1); + GPR_ASSERT(argc >= 1); cl->argv0 = argv[0]; - for (i = 1; i < argc; i++) - { - cl->state (cl, argv[i]); - } + for (i = 1; i < argc; i++) { + cl->state(cl, argv[i]); + } } diff --git a/src/core/support/cpu_iphone.c b/src/core/support/cpu_iphone.c index 0d679414acd..82b49b47bc0 100644 --- a/src/core/support/cpu_iphone.c +++ b/src/core/support/cpu_iphone.c @@ -36,11 +36,7 @@ #ifdef GPR_CPU_IPHONE /* Probably 2 instead of 1, but see comment on gpr_cpu_current_cpu. */ -unsigned -gpr_cpu_num_cores (void) -{ - return 1; -} +unsigned gpr_cpu_num_cores(void) { return 1; } /* Most code that's using this is using it to shard across work queues. So unless profiling shows it's a problem or there appears a way to detect the @@ -48,10 +44,6 @@ gpr_cpu_num_cores (void) Note that the interface in cpu.h lets gpr_cpu_num_cores return 0, but doing it makes it impossible for gpr_cpu_current_cpu to satisfy its stated range, and some code might be relying on it. */ -unsigned -gpr_cpu_current_cpu (void) -{ - return 0; -} +unsigned gpr_cpu_current_cpu(void) { return 0; } #endif /* GPR_CPU_IPHONE */ diff --git a/src/core/support/cpu_linux.c b/src/core/support/cpu_linux.c index b969218ba9b..7af6a8f0090 100644 --- a/src/core/support/cpu_linux.c +++ b/src/core/support/cpu_linux.c @@ -50,37 +50,29 @@ static int ncpus = 0; -static void -init_num_cpus () -{ +static void init_num_cpus() { /* This must be signed. sysconf returns -1 when the number cannot be determined */ - ncpus = (int) sysconf (_SC_NPROCESSORS_ONLN); - if (ncpus < 1) - { - gpr_log (GPR_ERROR, "Cannot determine number of CPUs: assuming 1"); - ncpus = 1; - } + ncpus = (int)sysconf(_SC_NPROCESSORS_ONLN); + if (ncpus < 1) { + gpr_log(GPR_ERROR, "Cannot determine number of CPUs: assuming 1"); + ncpus = 1; + } } -unsigned -gpr_cpu_num_cores (void) -{ +unsigned gpr_cpu_num_cores(void) { static gpr_once once = GPR_ONCE_INIT; - gpr_once_init (&once, init_num_cpus); - return (unsigned) ncpus; + gpr_once_init(&once, init_num_cpus); + return (unsigned)ncpus; } -unsigned -gpr_cpu_current_cpu (void) -{ - int cpu = sched_getcpu (); - if (cpu < 0) - { - gpr_log (GPR_ERROR, "Error determining current CPU: %s\n", strerror (errno)); - return 0; - } - return (unsigned) cpu; +unsigned gpr_cpu_current_cpu(void) { + int cpu = sched_getcpu(); + if (cpu < 0) { + gpr_log(GPR_ERROR, "Error determining current CPU: %s\n", strerror(errno)); + return 0; + } + return (unsigned)cpu; } #endif /* GPR_CPU_LINUX */ diff --git a/src/core/support/cpu_posix.c b/src/core/support/cpu_posix.c index 22282cae9fc..55d92c0555f 100644 --- a/src/core/support/cpu_posix.c +++ b/src/core/support/cpu_posix.c @@ -46,41 +46,32 @@ static __thread char magic_thread_local; static long ncpus = 0; -static void -init_ncpus () -{ - ncpus = sysconf (_SC_NPROCESSORS_ONLN); - if (ncpus < 1 || ncpus > GPR_UINT32_MAX) - { - gpr_log (GPR_ERROR, "Cannot determine number of CPUs: assuming 1"); - ncpus = 1; - } +static void init_ncpus() { + ncpus = sysconf(_SC_NPROCESSORS_ONLN); + if (ncpus < 1 || ncpus > GPR_UINT32_MAX) { + gpr_log(GPR_ERROR, "Cannot determine number of CPUs: assuming 1"); + ncpus = 1; + } } -unsigned -gpr_cpu_num_cores (void) -{ +unsigned gpr_cpu_num_cores(void) { static gpr_once once = GPR_ONCE_INIT; - gpr_once_init (&once, init_ncpus); - return (unsigned) ncpus; + gpr_once_init(&once, init_ncpus); + return (unsigned)ncpus; } /* This is a cheap, but good enough, pointer hash for sharding things: */ -static size_t -shard_ptr (const void *info) -{ - size_t x = (size_t) info; - return ((x >> 4) ^ (x >> 9) ^ (x >> 14)) % gpr_cpu_num_cores (); +static size_t shard_ptr(const void *info) { + size_t x = (size_t)info; + return ((x >> 4) ^ (x >> 9) ^ (x >> 14)) % gpr_cpu_num_cores(); } -unsigned -gpr_cpu_current_cpu (void) -{ +unsigned gpr_cpu_current_cpu(void) { /* NOTE: there's no way I know to return the actual cpu index portably... most code that's using this is using it to shard across work queues though, so here we use thread identity instead to achieve a similar though not identical effect */ - return (unsigned) shard_ptr (&magic_thread_local); + return (unsigned)shard_ptr(&magic_thread_local); } #endif /* GPR_CPU_POSIX */ diff --git a/src/core/support/cpu_windows.c b/src/core/support/cpu_windows.c index e6696db913a..ce32eb0a9d6 100644 --- a/src/core/support/cpu_windows.c +++ b/src/core/support/cpu_windows.c @@ -36,18 +36,12 @@ #ifdef GPR_WIN32 #include -unsigned -gpr_cpu_num_cores (void) -{ +unsigned gpr_cpu_num_cores(void) { SYSTEM_INFO si; - GetSystemInfo (&si); + GetSystemInfo(&si); return si.dwNumberOfProcessors; } -unsigned -gpr_cpu_current_cpu (void) -{ - return GetCurrentProcessorNumber (); -} +unsigned gpr_cpu_current_cpu(void) { return GetCurrentProcessorNumber(); } #endif /* GPR_WIN32 */ diff --git a/src/core/support/env.h b/src/core/support/env.h index 69887b2c49c..24172d86737 100644 --- a/src/core/support/env.h +++ b/src/core/support/env.h @@ -39,8 +39,7 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* Env utility functions */ @@ -49,13 +48,13 @@ extern "C" Returns a newly allocated string. It is the responsability of the caller to gpr_free the return value if not NULL (which means that the environment variable exists). */ - char *gpr_getenv (const char *name); +char *gpr_getenv(const char *name); /* Sets the the environment with the specified name to the specified value. */ - void gpr_setenv (const char *name, const char *value); +void gpr_setenv(const char *name, const char *value); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_SUPPORT_ENV_H */ +#endif /* GRPC_INTERNAL_CORE_SUPPORT_ENV_H */ diff --git a/src/core/support/env_linux.c b/src/core/support/env_linux.c index cdb6c759502..2e03365e338 100644 --- a/src/core/support/env_linux.c +++ b/src/core/support/env_linux.c @@ -49,18 +49,14 @@ #include "src/core/support/string.h" -char * -gpr_getenv (const char *name) -{ - char *result = secure_getenv (name); - return result == NULL ? result : gpr_strdup (result); +char *gpr_getenv(const char *name) { + char *result = secure_getenv(name); + return result == NULL ? result : gpr_strdup(result); } -void -gpr_setenv (const char *name, const char *value) -{ - int res = setenv (name, value, 1); - GPR_ASSERT (res == 0); +void gpr_setenv(const char *name, const char *value) { + int res = setenv(name, value, 1); + GPR_ASSERT(res == 0); } #endif /* GPR_LINUX_ENV */ diff --git a/src/core/support/env_posix.c b/src/core/support/env_posix.c index e30b67ed20b..1dd2af56bcb 100644 --- a/src/core/support/env_posix.c +++ b/src/core/support/env_posix.c @@ -44,18 +44,14 @@ #include "src/core/support/string.h" #include -char * -gpr_getenv (const char *name) -{ - char *result = getenv (name); - return result == NULL ? result : gpr_strdup (result); +char *gpr_getenv(const char *name) { + char *result = getenv(name); + return result == NULL ? result : gpr_strdup(result); } -void -gpr_setenv (const char *name, const char *value) -{ - int res = setenv (name, value, 1); - GPR_ASSERT (res == 0); +void gpr_setenv(const char *name, const char *value) { + int res = setenv(name, value, 1); + GPR_ASSERT(res == 0); } #endif /* GPR_POSIX_ENV */ diff --git a/src/core/support/env_win32.c b/src/core/support/env_win32.c index 976f031eb1f..6b1ff102b04 100644 --- a/src/core/support/env_win32.c +++ b/src/core/support/env_win32.c @@ -44,27 +44,22 @@ #include #include -char * -gpr_getenv (const char *name) -{ +char *gpr_getenv(const char *name) { size_t size; char *result = NULL; char *duplicated; errno_t err; - err = _dupenv_s (&result, &size, name); - if (err) - return NULL; - duplicated = gpr_strdup (result); - free (result); + err = _dupenv_s(&result, &size, name); + if (err) return NULL; + duplicated = gpr_strdup(result); + free(result); return duplicated; } -void -gpr_setenv (const char *name, const char *value) -{ - errno_t res = _putenv_s (name, value); - GPR_ASSERT (res == 0); +void gpr_setenv(const char *name, const char *value) { + errno_t res = _putenv_s(name, value); + GPR_ASSERT(res == 0); } #endif /* GPR_WIN32 */ diff --git a/src/core/support/file.c b/src/core/support/file.c index 96ca7e19da1..c1361d8a9e3 100644 --- a/src/core/support/file.c +++ b/src/core/support/file.c @@ -42,52 +42,46 @@ #include "src/core/support/string.h" -gpr_slice -gpr_load_file (const char *filename, int add_null_terminator, int *success) -{ +gpr_slice gpr_load_file(const char *filename, int add_null_terminator, + int *success) { unsigned char *contents = NULL; size_t contents_size = 0; char *error_msg = NULL; - gpr_slice result = gpr_empty_slice (); - FILE *file = fopen (filename, "rb"); + gpr_slice result = gpr_empty_slice(); + FILE *file = fopen(filename, "rb"); size_t bytes_read = 0; - if (file == NULL) - { - gpr_asprintf (&error_msg, "Could not open file %s (error = %s).", filename, strerror (errno)); - GPR_ASSERT (error_msg != NULL); - goto end; - } - fseek (file, 0, SEEK_END); + if (file == NULL) { + gpr_asprintf(&error_msg, "Could not open file %s (error = %s).", filename, + strerror(errno)); + GPR_ASSERT(error_msg != NULL); + goto end; + } + fseek(file, 0, SEEK_END); /* Converting to size_t on the assumption that it will not fail */ - contents_size = (size_t) ftell (file); - fseek (file, 0, SEEK_SET); - contents = gpr_malloc (contents_size + (add_null_terminator ? 1 : 0)); - bytes_read = fread (contents, 1, contents_size, file); - if (bytes_read < contents_size) - { - GPR_ASSERT (ferror (file)); - gpr_asprintf (&error_msg, "Error %s occured while reading file %s.", strerror (errno), filename); - GPR_ASSERT (error_msg != NULL); - goto end; - } - if (success != NULL) - *success = 1; - if (add_null_terminator) - { - contents[contents_size++] = 0; - } - result = gpr_slice_new (contents, contents_size, gpr_free); + contents_size = (size_t)ftell(file); + fseek(file, 0, SEEK_SET); + contents = gpr_malloc(contents_size + (add_null_terminator ? 1 : 0)); + bytes_read = fread(contents, 1, contents_size, file); + if (bytes_read < contents_size) { + GPR_ASSERT(ferror(file)); + gpr_asprintf(&error_msg, "Error %s occured while reading file %s.", + strerror(errno), filename); + GPR_ASSERT(error_msg != NULL); + goto end; + } + if (success != NULL) *success = 1; + if (add_null_terminator) { + contents[contents_size++] = 0; + } + result = gpr_slice_new(contents, contents_size, gpr_free); end: - if (error_msg != NULL) - { - gpr_log (GPR_ERROR, "%s", error_msg); - gpr_free (error_msg); - if (success != NULL) - *success = 0; - } - if (file != NULL) - fclose (file); + if (error_msg != NULL) { + gpr_log(GPR_ERROR, "%s", error_msg); + gpr_free(error_msg); + if (success != NULL) *success = 0; + } + if (file != NULL) fclose(file); return result; } diff --git a/src/core/support/file.h b/src/core/support/file.h index 9b42f09f765..d8b7cea44fd 100644 --- a/src/core/support/file.h +++ b/src/core/support/file.h @@ -39,8 +39,7 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* File utility functions */ @@ -48,16 +47,17 @@ extern "C" /* Loads the content of a file into a slice. add_null_terminator will add a NULL terminator if non-zero. The success parameter, if not NULL, will be set to 1 in case of success and 0 in case of failure. */ - gpr_slice gpr_load_file (const char *filename, int add_null_terminator, int *success); +gpr_slice gpr_load_file(const char *filename, int add_null_terminator, + int *success); /* Creates a temporary file from a prefix. If tmp_filename is not NULL, *tmp_filename is assigned the name of the created file and it is the responsibility of the caller to gpr_free it unless an error occurs in which case it will be set to NULL. */ - FILE *gpr_tmpfile (const char *prefix, char **tmp_filename); +FILE *gpr_tmpfile(const char *prefix, char **tmp_filename); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_SUPPORT_FILE_H */ +#endif /* GRPC_INTERNAL_CORE_SUPPORT_FILE_H */ diff --git a/src/core/support/file_posix.c b/src/core/support/file_posix.c index d68a334eea7..c11c07148ab 100644 --- a/src/core/support/file_posix.c +++ b/src/core/support/file_posix.c @@ -48,43 +48,37 @@ #include "src/core/support/string.h" -FILE * -gpr_tmpfile (const char *prefix, char **tmp_filename) -{ +FILE *gpr_tmpfile(const char *prefix, char **tmp_filename) { FILE *result = NULL; char *template; int fd; - if (tmp_filename != NULL) - *tmp_filename = NULL; + if (tmp_filename != NULL) *tmp_filename = NULL; - gpr_asprintf (&template, "/tmp/%s_XXXXXX", prefix); - GPR_ASSERT (template != NULL); + gpr_asprintf(&template, "/tmp/%s_XXXXXX", prefix); + GPR_ASSERT(template != NULL); - fd = mkstemp (template); - if (fd == -1) - { - gpr_log (GPR_ERROR, "mkstemp failed for template %s with error %s.", template, strerror (errno)); - goto end; - } - result = fdopen (fd, "w+"); - if (result == NULL) - { - gpr_log (GPR_ERROR, "Could not open file %s from fd %d (error = %s).", template, fd, strerror (errno)); - unlink (template); - close (fd); - goto end; - } + fd = mkstemp(template); + if (fd == -1) { + gpr_log(GPR_ERROR, "mkstemp failed for template %s with error %s.", + template, strerror(errno)); + goto end; + } + result = fdopen(fd, "w+"); + if (result == NULL) { + gpr_log(GPR_ERROR, "Could not open file %s from fd %d (error = %s).", + template, fd, strerror(errno)); + unlink(template); + close(fd); + goto end; + } end: - if (result != NULL && tmp_filename != NULL) - { - *tmp_filename = template; - } - else - { - gpr_free (template); - } + if (result != NULL && tmp_filename != NULL) { + *tmp_filename = template; + } else { + gpr_free(template); + } return result; } diff --git a/src/core/support/file_win32.c b/src/core/support/file_win32.c index 26c1c2664f8..355744f79a5 100644 --- a/src/core/support/file_win32.c +++ b/src/core/support/file_win32.c @@ -47,9 +47,7 @@ #include "src/core/support/file.h" #include "src/core/support/string_win32.h" -FILE * -gpr_tmpfile (const char *prefix, char **tmp_filename_out) -{ +FILE *gpr_tmpfile(const char *prefix, char **tmp_filename_out) { FILE *result = NULL; LPTSTR template_string = NULL; TCHAR tmp_path[MAX_PATH]; @@ -57,34 +55,29 @@ gpr_tmpfile (const char *prefix, char **tmp_filename_out) DWORD status; UINT success; - if (tmp_filename_out != NULL) - *tmp_filename_out = NULL; + if (tmp_filename_out != NULL) *tmp_filename_out = NULL; /* Convert our prefix to TCHAR. */ - template_string = gpr_char_to_tchar (prefix); - GPR_ASSERT (template_string); + template_string = gpr_char_to_tchar(prefix); + GPR_ASSERT(template_string); /* Get the path to the best temporary folder available. */ - status = GetTempPath (MAX_PATH, tmp_path); - if (status == 0 || status > MAX_PATH) - goto end; + status = GetTempPath(MAX_PATH, tmp_path); + if (status == 0 || status > MAX_PATH) goto end; /* Generate a unique filename with our template + temporary path. */ - success = GetTempFileName (tmp_path, template_string, 0, tmp_filename); - if (!success) - goto end; + success = GetTempFileName(tmp_path, template_string, 0, tmp_filename); + if (!success) goto end; /* Open a file there. */ - if (_tfopen_s (&result, tmp_filename, TEXT ("wb+")) != 0) - goto end; + if (_tfopen_s(&result, tmp_filename, TEXT("wb+")) != 0) goto end; end: - if (result && tmp_filename_out) - { - *tmp_filename_out = gpr_tchar_to_char (tmp_filename); - } + if (result && tmp_filename_out) { + *tmp_filename_out = gpr_tchar_to_char(tmp_filename); + } - gpr_free (template_string); + gpr_free(template_string); return result; } diff --git a/src/core/support/histogram.c b/src/core/support/histogram.c index 0383c5433b4..78dbf98684a 100644 --- a/src/core/support/histogram.c +++ b/src/core/support/histogram.c @@ -47,8 +47,7 @@ Bucket n (n>=1) contains [m**n, m**(n+1)) There are sufficient buckets to reach max_bucket_start */ -struct gpr_histogram -{ +struct gpr_histogram { /* Sum of all values seen so far */ double sum; /* Sum of squares of all values seen so far */ @@ -71,224 +70,175 @@ struct gpr_histogram }; /* determine a bucket index given a value - does no bounds checking */ -static size_t -bucket_for_unchecked (gpr_histogram * h, double x) -{ - return (size_t) (log (x) * h->one_on_log_multiplier); +static size_t bucket_for_unchecked(gpr_histogram *h, double x) { + return (size_t)(log(x) * h->one_on_log_multiplier); } /* bounds checked version of the above */ -static size_t -bucket_for (gpr_histogram * h, double x) -{ - size_t bucket = bucket_for_unchecked (h, GPR_CLAMP (x, 1.0, h->max_possible)); - GPR_ASSERT (bucket < h->num_buckets); +static size_t bucket_for(gpr_histogram *h, double x) { + size_t bucket = bucket_for_unchecked(h, GPR_CLAMP(x, 1.0, h->max_possible)); + GPR_ASSERT(bucket < h->num_buckets); return bucket; } /* at what value does a bucket start? */ -static double -bucket_start (gpr_histogram * h, double x) -{ - return pow (h->multiplier, x); +static double bucket_start(gpr_histogram *h, double x) { + return pow(h->multiplier, x); } -gpr_histogram * -gpr_histogram_create (double resolution, double max_bucket_start) -{ - gpr_histogram *h = gpr_malloc (sizeof (gpr_histogram)); - GPR_ASSERT (resolution > 0.0); - GPR_ASSERT (max_bucket_start > resolution); +gpr_histogram *gpr_histogram_create(double resolution, + double max_bucket_start) { + gpr_histogram *h = gpr_malloc(sizeof(gpr_histogram)); + GPR_ASSERT(resolution > 0.0); + GPR_ASSERT(max_bucket_start > resolution); h->sum = 0.0; h->sum_of_squares = 0.0; h->multiplier = 1.0 + resolution; - h->one_on_log_multiplier = 1.0 / log (1.0 + resolution); + h->one_on_log_multiplier = 1.0 / log(1.0 + resolution); h->max_possible = max_bucket_start; h->count = 0.0; h->min_seen = max_bucket_start; h->max_seen = 0.0; - h->num_buckets = bucket_for_unchecked (h, max_bucket_start) + 1; - GPR_ASSERT (h->num_buckets > 1); - GPR_ASSERT (h->num_buckets < 100000000); - h->buckets = gpr_malloc (sizeof (gpr_uint32) * h->num_buckets); - memset (h->buckets, 0, sizeof (gpr_uint32) * h->num_buckets); + h->num_buckets = bucket_for_unchecked(h, max_bucket_start) + 1; + GPR_ASSERT(h->num_buckets > 1); + GPR_ASSERT(h->num_buckets < 100000000); + h->buckets = gpr_malloc(sizeof(gpr_uint32) * h->num_buckets); + memset(h->buckets, 0, sizeof(gpr_uint32) * h->num_buckets); return h; } -void -gpr_histogram_destroy (gpr_histogram * h) -{ - gpr_free (h->buckets); - gpr_free (h); +void gpr_histogram_destroy(gpr_histogram *h) { + gpr_free(h->buckets); + gpr_free(h); } -void -gpr_histogram_add (gpr_histogram * h, double x) -{ +void gpr_histogram_add(gpr_histogram *h, double x) { h->sum += x; h->sum_of_squares += x * x; h->count++; - if (x < h->min_seen) - { - h->min_seen = x; - } - if (x > h->max_seen) - { - h->max_seen = x; - } - h->buckets[bucket_for (h, x)]++; -} - -int -gpr_histogram_merge (gpr_histogram * dst, gpr_histogram * src) -{ - if ((dst->num_buckets != src->num_buckets) || (dst->multiplier != src->multiplier)) - { - /* Fail because these histograms don't match */ - return 0; - } - gpr_histogram_merge_contents (dst, src->buckets, src->num_buckets, src->min_seen, src->max_seen, src->sum, src->sum_of_squares, src->count); + if (x < h->min_seen) { + h->min_seen = x; + } + if (x > h->max_seen) { + h->max_seen = x; + } + h->buckets[bucket_for(h, x)]++; +} + +int gpr_histogram_merge(gpr_histogram *dst, gpr_histogram *src) { + if ((dst->num_buckets != src->num_buckets) || + (dst->multiplier != src->multiplier)) { + /* Fail because these histograms don't match */ + return 0; + } + gpr_histogram_merge_contents(dst, src->buckets, src->num_buckets, + src->min_seen, src->max_seen, src->sum, + src->sum_of_squares, src->count); return 1; } -void -gpr_histogram_merge_contents (gpr_histogram * dst, const gpr_uint32 * data, size_t data_count, double min_seen, double max_seen, double sum, double sum_of_squares, double count) -{ +void gpr_histogram_merge_contents(gpr_histogram *dst, const gpr_uint32 *data, + size_t data_count, double min_seen, + double max_seen, double sum, + double sum_of_squares, double count) { size_t i; - GPR_ASSERT (dst->num_buckets == data_count); + GPR_ASSERT(dst->num_buckets == data_count); dst->sum += sum; dst->sum_of_squares += sum_of_squares; dst->count += count; - if (min_seen < dst->min_seen) - { - dst->min_seen = min_seen; - } - if (max_seen > dst->max_seen) - { - dst->max_seen = max_seen; - } - for (i = 0; i < dst->num_buckets; i++) - { - dst->buckets[i] += data[i]; - } -} - -static double -threshold_for_count_below (gpr_histogram * h, double count_below) -{ + if (min_seen < dst->min_seen) { + dst->min_seen = min_seen; + } + if (max_seen > dst->max_seen) { + dst->max_seen = max_seen; + } + for (i = 0; i < dst->num_buckets; i++) { + dst->buckets[i] += data[i]; + } +} + +static double threshold_for_count_below(gpr_histogram *h, double count_below) { double count_so_far; double lower_bound; double upper_bound; size_t lower_idx; size_t upper_idx; - if (h->count == 0) - { - return 0.0; - } + if (h->count == 0) { + return 0.0; + } - if (count_below <= 0) - { - return h->min_seen; - } - if (count_below >= h->count) - { - return h->max_seen; - } + if (count_below <= 0) { + return h->min_seen; + } + if (count_below >= h->count) { + return h->max_seen; + } /* find the lowest bucket that gets us above count_below */ count_so_far = 0.0; - for (lower_idx = 0; lower_idx < h->num_buckets; lower_idx++) - { - count_so_far += h->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 = lower_idx + 1; upper_idx < h->num_buckets; upper_idx++) - { - if (h->buckets[upper_idx]) - { - break; - } - } - return (bucket_start (h, (double) lower_idx) + bucket_start (h, (double) upper_idx)) / 2.0; + for (lower_idx = 0; lower_idx < h->num_buckets; lower_idx++) { + count_so_far += h->buckets[lower_idx]; + if (count_so_far >= count_below) { + break; } - else - { - /* treat values as uniform throughout the bucket, and find where this value - should lie */ - lower_bound = bucket_start (h, (double) lower_idx); - upper_bound = bucket_start (h, (double) (lower_idx + 1)); - return GPR_CLAMP (upper_bound - (upper_bound - lower_bound) * (count_so_far - count_below) / h->buckets[lower_idx], h->min_seen, h->max_seen); + } + 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 = lower_idx + 1; upper_idx < h->num_buckets; upper_idx++) { + if (h->buckets[upper_idx]) { + break; + } } -} - -double -gpr_histogram_percentile (gpr_histogram * h, double percentile) -{ - return threshold_for_count_below (h, h->count * percentile / 100.0); -} - -double -gpr_histogram_mean (gpr_histogram * h) -{ - GPR_ASSERT (h->count); + return (bucket_start(h, (double)lower_idx) + + bucket_start(h, (double)upper_idx)) / + 2.0; + } else { + /* treat values as uniform throughout the bucket, and find where this value + should lie */ + lower_bound = bucket_start(h, (double)lower_idx); + upper_bound = bucket_start(h, (double)(lower_idx + 1)); + return GPR_CLAMP(upper_bound - + (upper_bound - lower_bound) * + (count_so_far - count_below) / + h->buckets[lower_idx], + h->min_seen, h->max_seen); + } +} + +double gpr_histogram_percentile(gpr_histogram *h, double percentile) { + return threshold_for_count_below(h, h->count * percentile / 100.0); +} + +double gpr_histogram_mean(gpr_histogram *h) { + GPR_ASSERT(h->count); return h->sum / h->count; } -double -gpr_histogram_stddev (gpr_histogram * h) -{ - return sqrt (gpr_histogram_variance (h)); +double gpr_histogram_stddev(gpr_histogram *h) { + return sqrt(gpr_histogram_variance(h)); } -double -gpr_histogram_variance (gpr_histogram * h) -{ - if (h->count == 0) - return 0.0; - return (h->sum_of_squares * h->count - h->sum * h->sum) / (h->count * h->count); +double gpr_histogram_variance(gpr_histogram *h) { + if (h->count == 0) return 0.0; + return (h->sum_of_squares * h->count - h->sum * h->sum) / + (h->count * h->count); } -double -gpr_histogram_maximum (gpr_histogram * h) -{ - return h->max_seen; -} +double gpr_histogram_maximum(gpr_histogram *h) { return h->max_seen; } -double -gpr_histogram_minimum (gpr_histogram * h) -{ - return h->min_seen; -} +double gpr_histogram_minimum(gpr_histogram *h) { return h->min_seen; } -double -gpr_histogram_count (gpr_histogram * h) -{ - return h->count; -} +double gpr_histogram_count(gpr_histogram *h) { return h->count; } -double -gpr_histogram_sum (gpr_histogram * h) -{ - return h->sum; -} +double gpr_histogram_sum(gpr_histogram *h) { return h->sum; } -double -gpr_histogram_sum_of_squares (gpr_histogram * h) -{ +double gpr_histogram_sum_of_squares(gpr_histogram *h) { return h->sum_of_squares; } -const gpr_uint32 * -gpr_histogram_get_contents (gpr_histogram * h, size_t * size) -{ +const gpr_uint32 *gpr_histogram_get_contents(gpr_histogram *h, size_t *size) { *size = h->num_buckets; return h->buckets; } diff --git a/src/core/support/host_port.c b/src/core/support/host_port.c index a95b9d0d81f..23f65b15812 100644 --- a/src/core/support/host_port.c +++ b/src/core/support/host_port.c @@ -40,24 +40,17 @@ #include #include -int -gpr_join_host_port (char **out, const char *host, int port) -{ - if (host[0] != '[' && strchr (host, ':') != NULL) - { - /* IPv6 literals must be enclosed in brackets. */ - return gpr_asprintf (out, "[%s]:%d", host, port); - } - else - { - /* Ordinary non-bracketed host:port. */ - return gpr_asprintf (out, "%s:%d", host, port); - } +int gpr_join_host_port(char **out, const char *host, int port) { + if (host[0] != '[' && strchr(host, ':') != NULL) { + /* IPv6 literals must be enclosed in brackets. */ + return gpr_asprintf(out, "[%s]:%d", host, port); + } else { + /* Ordinary non-bracketed host:port. */ + return gpr_asprintf(out, "%s:%d", host, port); + } } -int -gpr_split_host_port (const char *name, char **host, char **port) -{ +int gpr_split_host_port(const char *name, char **host, char **port) { const char *host_start; size_t host_len; const char *port_start; @@ -65,67 +58,53 @@ gpr_split_host_port (const char *name, char **host, char **port) *host = NULL; *port = NULL; - if (name[0] == '[') - { - /* Parse a bracketed host, typically an IPv6 literal. */ - const char *rbracket = strchr (name, ']'); - if (rbracket == NULL) - { - /* Unmatched [ */ - return 0; - } - if (rbracket[1] == '\0') - { - /* ] */ - port_start = NULL; - } - else if (rbracket[1] == ':') - { - /* ]: */ - port_start = rbracket + 2; - } - else - { - /* ] */ - return 0; - } - host_start = name + 1; - host_len = (size_t) (rbracket - host_start); - if (memchr (host_start, ':', host_len) == NULL) - { - /* Require all bracketed hosts to contain a colon, because a hostname or - IPv4 address should never use brackets. */ - return 0; - } + if (name[0] == '[') { + /* Parse a bracketed host, typically an IPv6 literal. */ + const char *rbracket = strchr(name, ']'); + if (rbracket == NULL) { + /* Unmatched [ */ + return 0; + } + if (rbracket[1] == '\0') { + /* ] */ + port_start = NULL; + } else if (rbracket[1] == ':') { + /* ]: */ + port_start = rbracket + 2; + } else { + /* ] */ + return 0; } - else - { - const char *colon = strchr (name, ':'); - if (colon != NULL && strchr (colon + 1, ':') == NULL) - { - /* Exactly 1 colon. Split into host:port. */ - host_start = name; - host_len = (size_t) (colon - name); - port_start = colon + 1; - } - else - { - /* 0 or 2+ colons. Bare hostname or IPv6 litearal. */ - host_start = name; - host_len = strlen (name); - port_start = NULL; - } + host_start = name + 1; + host_len = (size_t)(rbracket - host_start); + if (memchr(host_start, ':', host_len) == NULL) { + /* Require all bracketed hosts to contain a colon, because a hostname or + IPv4 address should never use brackets. */ + return 0; } + } else { + const char *colon = strchr(name, ':'); + if (colon != NULL && strchr(colon + 1, ':') == NULL) { + /* Exactly 1 colon. Split into host:port. */ + host_start = name; + host_len = (size_t)(colon - name); + port_start = colon + 1; + } else { + /* 0 or 2+ colons. Bare hostname or IPv6 litearal. */ + host_start = name; + host_len = strlen(name); + port_start = NULL; + } + } /* Allocate return values. */ - *host = gpr_malloc (host_len + 1); - memcpy (*host, host_start, host_len); + *host = gpr_malloc(host_len + 1); + memcpy(*host, host_start, host_len); (*host)[host_len] = '\0'; - if (port_start != NULL) - { - *port = gpr_strdup (port_start); - } + if (port_start != NULL) { + *port = gpr_strdup(port_start); + } return 1; } diff --git a/src/core/support/log.c b/src/core/support/log.c index 60dcdf1369e..f52c2035b9c 100644 --- a/src/core/support/log.c +++ b/src/core/support/log.c @@ -36,38 +36,30 @@ #include #include -extern void gpr_default_log (gpr_log_func_args * args); +extern void gpr_default_log(gpr_log_func_args *args); static gpr_log_func g_log_func = gpr_default_log; -const char * -gpr_log_severity_string (gpr_log_severity severity) -{ - switch (severity) - { +const char *gpr_log_severity_string(gpr_log_severity severity) { + switch (severity) { case GPR_LOG_SEVERITY_DEBUG: return "D"; case GPR_LOG_SEVERITY_INFO: return "I"; case GPR_LOG_SEVERITY_ERROR: return "E"; - } + } return "UNKNOWN"; } -void -gpr_log_message (const char *file, int line, gpr_log_severity severity, const char *message) -{ +void gpr_log_message(const char *file, int line, gpr_log_severity severity, + const char *message) { gpr_log_func_args lfargs; - memset (&lfargs, 0, sizeof (lfargs)); + memset(&lfargs, 0, sizeof(lfargs)); lfargs.file = file; lfargs.line = line; lfargs.severity = severity; lfargs.message = message; - g_log_func (&lfargs); + g_log_func(&lfargs); } -void -gpr_set_log_function (gpr_log_func f) -{ - g_log_func = f; -} +void gpr_set_log_function(gpr_log_func f) { g_log_func = f; } diff --git a/src/core/support/log_android.c b/src/core/support/log_android.c index 891281444df..5d0c7d820d8 100644 --- a/src/core/support/log_android.c +++ b/src/core/support/log_android.c @@ -42,52 +42,46 @@ #include #include -static android_LogPriority -severity_to_log_priority (gpr_log_severity severity) -{ - switch (severity) - { +static android_LogPriority severity_to_log_priority(gpr_log_severity severity) { + switch (severity) { case GPR_LOG_SEVERITY_DEBUG: return ANDROID_LOG_DEBUG; case GPR_LOG_SEVERITY_INFO: return ANDROID_LOG_INFO; case GPR_LOG_SEVERITY_ERROR: return ANDROID_LOG_ERROR; - } + } return ANDROID_LOG_DEFAULT; } -void -gpr_log (const char *file, int line, gpr_log_severity severity, const char *format, ...) -{ +void gpr_log(const char *file, int line, gpr_log_severity severity, + const char *format, ...) { char *message = NULL; va_list args; - va_start (args, format); - vasprintf (&message, format, args); - va_end (args); - gpr_log_message (file, line, severity, message); - free (message); + va_start(args, format); + vasprintf(&message, format, args); + va_end(args); + gpr_log_message(file, line, severity, message); + free(message); } -void -gpr_default_log (gpr_log_func_args * args) -{ +void gpr_default_log(gpr_log_func_args *args) { char *final_slash; const char *display_file; char *output = NULL; - final_slash = strrchr (args->file, '/'); + final_slash = strrchr(args->file, '/'); if (final_slash == NULL) display_file = args->file; else display_file = final_slash + 1; - asprintf (&output, "%s:%d] %s", display_file, args->line, args->message); + asprintf(&output, "%s:%d] %s", display_file, args->line, args->message); - __android_log_write (severity_to_log_priority (args->severity), "GRPC", output); + __android_log_write(severity_to_log_priority(args->severity), "GRPC", output); /* allocated by asprintf => use free, not gpr_free */ - free (output); + free(output); } #endif /* GPR_ANDROID */ diff --git a/src/core/support/log_linux.c b/src/core/support/log_linux.c index 7f52b74b0e4..02f64d8b7e4 100644 --- a/src/core/support/log_linux.c +++ b/src/core/support/log_linux.c @@ -55,57 +55,49 @@ #include #include -static long -gettid (void) -{ - return syscall (__NR_gettid); -} +static long gettid(void) { return syscall(__NR_gettid); } -void -gpr_log (const char *file, int line, gpr_log_severity severity, const char *format, ...) -{ +void gpr_log(const char *file, int line, gpr_log_severity severity, + const char *format, ...) { char *message = NULL; va_list args; - va_start (args, format); - if (vasprintf (&message, format, args) == -1) - { - va_end (args); - return; - } - va_end (args); - gpr_log_message (file, line, severity, message); - free (message); + va_start(args, format); + if (vasprintf(&message, format, args) == -1) { + va_end(args); + return; + } + va_end(args); + gpr_log_message(file, line, severity, message); + free(message); } -void -gpr_default_log (gpr_log_func_args * args) -{ +void gpr_default_log(gpr_log_func_args *args) { char *final_slash; char *prefix; const char *display_file; char time_buffer[64]; - gpr_timespec now = gpr_now (GPR_CLOCK_REALTIME); + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); struct tm tm; - final_slash = strrchr (args->file, '/'); + final_slash = strrchr(args->file, '/'); if (final_slash == NULL) display_file = args->file; else display_file = final_slash + 1; - if (!localtime_r (&now.tv_sec, &tm)) - { - strcpy (time_buffer, "error:localtime"); - } - else if (0 == strftime (time_buffer, sizeof (time_buffer), "%m%d %H:%M:%S", &tm)) - { - strcpy (time_buffer, "error:strftime"); - } + if (!localtime_r(&now.tv_sec, &tm)) { + strcpy(time_buffer, "error:localtime"); + } else if (0 == + strftime(time_buffer, sizeof(time_buffer), "%m%d %H:%M:%S", &tm)) { + strcpy(time_buffer, "error:strftime"); + } - gpr_asprintf (&prefix, "%s%s.%09d %7tu %s:%d]", gpr_log_severity_string (args->severity), time_buffer, (int) (now.tv_nsec), gettid (), display_file, args->line); + gpr_asprintf(&prefix, "%s%s.%09d %7tu %s:%d]", + gpr_log_severity_string(args->severity), time_buffer, + (int)(now.tv_nsec), gettid(), display_file, args->line); - fprintf (stderr, "%-60s %s\n", prefix, args->message); - gpr_free (prefix); + fprintf(stderr, "%-60s %s\n", prefix, args->message); + gpr_free(prefix); } #endif diff --git a/src/core/support/log_posix.c b/src/core/support/log_posix.c index 46ab98f140c..8b050dbee70 100644 --- a/src/core/support/log_posix.c +++ b/src/core/support/log_posix.c @@ -45,67 +45,56 @@ #include #include -static gpr_intptr -gettid (void) -{ - return (gpr_intptr) pthread_self (); -} +static gpr_intptr gettid(void) { return (gpr_intptr)pthread_self(); } -void -gpr_log (const char *file, int line, gpr_log_severity severity, const char *format, ...) -{ +void gpr_log(const char *file, int line, gpr_log_severity severity, + const char *format, ...) { char buf[64]; char *allocated = NULL; char *message = NULL; int ret; va_list args; - va_start (args, format); - ret = vsnprintf (buf, sizeof (buf), format, args); - va_end (args); - if (ret < 0) - { - message = NULL; - } - else if ((size_t) ret <= sizeof (buf) - 1) - { - message = buf; - } - else - { - message = allocated = gpr_malloc ((size_t) ret + 1); - va_start (args, format); - vsnprintf (message, (size_t) (ret + 1), format, args); - va_end (args); - } - gpr_log_message (file, line, severity, message); - gpr_free (allocated); + va_start(args, format); + ret = vsnprintf(buf, sizeof(buf), format, args); + va_end(args); + if (ret < 0) { + message = NULL; + } else if ((size_t)ret <= sizeof(buf) - 1) { + message = buf; + } else { + message = allocated = gpr_malloc((size_t)ret + 1); + va_start(args, format); + vsnprintf(message, (size_t)(ret + 1), format, args); + va_end(args); + } + gpr_log_message(file, line, severity, message); + gpr_free(allocated); } -void -gpr_default_log (gpr_log_func_args * args) -{ +void gpr_default_log(gpr_log_func_args *args) { char *final_slash; const char *display_file; char time_buffer[64]; - gpr_timespec now = gpr_now (GPR_CLOCK_REALTIME); + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); struct tm tm; - final_slash = strrchr (args->file, '/'); + final_slash = strrchr(args->file, '/'); if (final_slash == NULL) display_file = args->file; else display_file = final_slash + 1; - if (!localtime_r (&now.tv_sec, &tm)) - { - strcpy (time_buffer, "error:localtime"); - } - else if (0 == strftime (time_buffer, sizeof (time_buffer), "%m%d %H:%M:%S", &tm)) - { - strcpy (time_buffer, "error:strftime"); - } + if (!localtime_r(&now.tv_sec, &tm)) { + strcpy(time_buffer, "error:localtime"); + } else if (0 == + strftime(time_buffer, sizeof(time_buffer), "%m%d %H:%M:%S", &tm)) { + strcpy(time_buffer, "error:strftime"); + } - fprintf (stderr, "%s%s.%09d %7tu %s:%d] %s\n", gpr_log_severity_string (args->severity), time_buffer, (int) (now.tv_nsec), gettid (), display_file, args->line, args->message); + fprintf(stderr, "%s%s.%09d %7tu %s:%d] %s\n", + gpr_log_severity_string(args->severity), time_buffer, + (int)(now.tv_nsec), gettid(), display_file, args->line, + args->message); } #endif /* defined(GPR_POSIX_LOG) */ diff --git a/src/core/support/log_win32.c b/src/core/support/log_win32.c index aa31fa6de0f..b68239f8f58 100644 --- a/src/core/support/log_win32.c +++ b/src/core/support/log_win32.c @@ -47,83 +47,76 @@ #include "src/core/support/string.h" #include "src/core/support/string_win32.h" -void -gpr_log (const char *file, int line, gpr_log_severity severity, const char *format, ...) -{ +void gpr_log(const char *file, int line, gpr_log_severity severity, + const char *format, ...) { char *message = NULL; va_list args; int ret; /* Determine the length. */ - va_start (args, format); - ret = _vscprintf (format, args); - va_end (args); - if (ret < 0) - { - message = NULL; - } - else - { - /* Allocate a new buffer, with space for the NUL terminator. */ - size_t strp_buflen = (size_t) ret + 1; - message = gpr_malloc (strp_buflen); + va_start(args, format); + ret = _vscprintf(format, args); + va_end(args); + if (ret < 0) { + message = NULL; + } else { + /* Allocate a new buffer, with space for the NUL terminator. */ + size_t strp_buflen = (size_t)ret + 1; + message = gpr_malloc(strp_buflen); - /* Print to the buffer. */ - va_start (args, format); - ret = vsnprintf_s (message, strp_buflen, _TRUNCATE, format, args); - va_end (args); - if ((size_t) ret != strp_buflen - 1) - { - /* This should never happen. */ - gpr_free (message); - message = NULL; - } + /* Print to the buffer. */ + va_start(args, format); + ret = vsnprintf_s(message, strp_buflen, _TRUNCATE, format, args); + va_end(args); + if ((size_t)ret != strp_buflen - 1) { + /* This should never happen. */ + gpr_free(message); + message = NULL; } + } - gpr_log_message (file, line, severity, message); - gpr_free (message); + gpr_log_message(file, line, severity, message); + gpr_free(message); } /* Simple starter implementation */ -void -gpr_default_log (gpr_log_func_args * args) -{ +void gpr_default_log(gpr_log_func_args *args) { char *final_slash; const char *display_file; char time_buffer[64]; - gpr_timespec now = gpr_now (GPR_CLOCK_REALTIME); + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); struct tm tm; - final_slash = strrchr (args->file, '\\'); + final_slash = strrchr(args->file, '\\'); if (final_slash == NULL) display_file = args->file; else display_file = final_slash + 1; - if (localtime_s (&tm, &now.tv_sec)) - { - strcpy (time_buffer, "error:localtime"); - } - else if (0 == strftime (time_buffer, sizeof (time_buffer), "%m%d %H:%M:%S", &tm)) - { - strcpy (time_buffer, "error:strftime"); - } + if (localtime_s(&tm, &now.tv_sec)) { + strcpy(time_buffer, "error:localtime"); + } else if (0 == + strftime(time_buffer, sizeof(time_buffer), "%m%d %H:%M:%S", &tm)) { + strcpy(time_buffer, "error:strftime"); + } - fprintf (stderr, "%s%s.%09u %5lu %s:%d] %s\n", gpr_log_severity_string (args->severity), time_buffer, (int) (now.tv_nsec), GetCurrentThreadId (), display_file, args->line, args->message); + fprintf(stderr, "%s%s.%09u %5lu %s:%d] %s\n", + gpr_log_severity_string(args->severity), time_buffer, + (int)(now.tv_nsec), GetCurrentThreadId(), display_file, args->line, + args->message); } -char * -gpr_format_message (DWORD messageid) -{ +char *gpr_format_message(DWORD messageid) { LPTSTR tmessage; char *message; - DWORD status = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, messageid, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) (&tmessage), 0, NULL); - if (status == 0) - return gpr_strdup ("Unable to retrieve error string"); - message = gpr_tchar_to_char (tmessage); - LocalFree (tmessage); + DWORD status = FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, messageid, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)(&tmessage), 0, NULL); + if (status == 0) return gpr_strdup("Unable to retrieve error string"); + message = gpr_tchar_to_char(tmessage); + LocalFree(tmessage); return message; } diff --git a/src/core/support/murmur_hash.c b/src/core/support/murmur_hash.c index e4ac59467d5..37fdca82ba0 100644 --- a/src/core/support/murmur_hash.c +++ b/src/core/support/murmur_hash.c @@ -46,10 +46,8 @@ handle aligned reads, do the conversion here */ #define GETBLOCK32(p, i) (p)[(i)] -gpr_uint32 -gpr_murmur_hash3 (const void *key, size_t len, gpr_uint32 seed) -{ - const gpr_uint8 *data = (const gpr_uint8 *) key; +gpr_uint32 gpr_murmur_hash3(const void *key, size_t len, gpr_uint32 seed) { + const gpr_uint8 *data = (const gpr_uint8 *)key; const size_t nblocks = len / 4; int i; @@ -59,42 +57,40 @@ gpr_murmur_hash3 (const void *key, size_t len, gpr_uint32 seed) const gpr_uint32 c1 = 0xcc9e2d51; const gpr_uint32 c2 = 0x1b873593; - const gpr_uint32 *blocks = ((const gpr_uint32 *) key) + nblocks; - const gpr_uint8 *tail = (const gpr_uint8 *) (data + nblocks * 4); + const gpr_uint32 *blocks = ((const gpr_uint32 *)key) + nblocks; + const gpr_uint8 *tail = (const gpr_uint8 *)(data + nblocks * 4); /* body */ - for (i = -(int) nblocks; i; i++) - { - k1 = GETBLOCK32 (blocks, i); + for (i = -(int)nblocks; i; i++) { + k1 = GETBLOCK32(blocks, i); - k1 *= c1; - k1 = ROTL32 (k1, 15); - k1 *= c2; + k1 *= c1; + k1 = ROTL32(k1, 15); + k1 *= c2; - h1 ^= k1; - h1 = ROTL32 (h1, 13); - h1 = h1 * 5 + 0xe6546b64; - } + h1 ^= k1; + h1 = ROTL32(h1, 13); + h1 = h1 * 5 + 0xe6546b64; + } k1 = 0; /* tail */ - switch (len & 3) - { + switch (len & 3) { case 3: - k1 ^= ((gpr_uint32) tail[2]) << 16; + k1 ^= ((gpr_uint32)tail[2]) << 16; case 2: - k1 ^= ((gpr_uint32) tail[1]) << 8; + k1 ^= ((gpr_uint32)tail[1]) << 8; case 1: k1 ^= tail[0]; k1 *= c1; - k1 = ROTL32 (k1, 15); + k1 = ROTL32(k1, 15); k1 *= c2; h1 ^= k1; - }; + }; /* finalization */ - h1 ^= (gpr_uint32) len; - FMIX32 (h1); + h1 ^= (gpr_uint32)len; + FMIX32(h1); return h1; } diff --git a/src/core/support/murmur_hash.h b/src/core/support/murmur_hash.h index 0ef198e88ea..343fcb99f7d 100644 --- a/src/core/support/murmur_hash.h +++ b/src/core/support/murmur_hash.h @@ -39,6 +39,6 @@ #include /* compute the hash of key (length len) */ -gpr_uint32 gpr_murmur_hash3 (const void *key, size_t len, gpr_uint32 seed); +gpr_uint32 gpr_murmur_hash3(const void *key, size_t len, gpr_uint32 seed); #endif /* GRPC_INTERNAL_CORE_SUPPORT_MURMUR_HASH_H */ diff --git a/src/core/support/slice.c b/src/core/support/slice.c index d866b99eb70..53024e88f1b 100644 --- a/src/core/support/slice.c +++ b/src/core/support/slice.c @@ -37,68 +37,52 @@ #include -gpr_slice -gpr_empty_slice (void) -{ +gpr_slice gpr_empty_slice(void) { gpr_slice out; out.refcount = 0; out.data.inlined.length = 0; return out; } -gpr_slice -gpr_slice_ref (gpr_slice slice) -{ - if (slice.refcount) - { - slice.refcount->ref (slice.refcount); - } +gpr_slice gpr_slice_ref(gpr_slice slice) { + if (slice.refcount) { + slice.refcount->ref(slice.refcount); + } return slice; } -void -gpr_slice_unref (gpr_slice slice) -{ - if (slice.refcount) - { - slice.refcount->unref (slice.refcount); - } +void gpr_slice_unref(gpr_slice slice) { + if (slice.refcount) { + slice.refcount->unref(slice.refcount); + } } /* gpr_slice_new support structures - we create a refcount object extended with the user provided data pointer & destroy function */ -typedef struct new_slice_refcount -{ +typedef struct new_slice_refcount { gpr_slice_refcount rc; gpr_refcount refs; - void (*user_destroy) (void *); + void (*user_destroy)(void *); void *user_data; } new_slice_refcount; -static void -new_slice_ref (void *p) -{ +static void new_slice_ref(void *p) { new_slice_refcount *r = p; - gpr_ref (&r->refs); + gpr_ref(&r->refs); } -static void -new_slice_unref (void *p) -{ +static void new_slice_unref(void *p) { new_slice_refcount *r = p; - if (gpr_unref (&r->refs)) - { - r->user_destroy (r->user_data); - gpr_free (r); - } + if (gpr_unref(&r->refs)) { + r->user_destroy(r->user_data); + gpr_free(r); + } } -gpr_slice -gpr_slice_new (void *p, size_t len, void (*destroy) (void *)) -{ +gpr_slice gpr_slice_new(void *p, size_t len, void (*destroy)(void *)) { gpr_slice slice; - new_slice_refcount *rc = gpr_malloc (sizeof (new_slice_refcount)); - gpr_ref_init (&rc->refs, 1); + new_slice_refcount *rc = gpr_malloc(sizeof(new_slice_refcount)); + gpr_ref_init(&rc->refs, 1); rc->rc.ref = new_slice_ref; rc->rc.unref = new_slice_unref; rc->user_destroy = destroy; @@ -112,39 +96,33 @@ gpr_slice_new (void *p, size_t len, void (*destroy) (void *)) /* gpr_slice_new_with_len support structures - we create a refcount object extended with the user provided data pointer & destroy function */ -typedef struct new_with_len_slice_refcount -{ +typedef struct new_with_len_slice_refcount { gpr_slice_refcount rc; gpr_refcount refs; void *user_data; size_t user_length; - void (*user_destroy) (void *, size_t); + void (*user_destroy)(void *, size_t); } new_with_len_slice_refcount; -static void -new_with_len_ref (void *p) -{ +static void new_with_len_ref(void *p) { new_with_len_slice_refcount *r = p; - gpr_ref (&r->refs); + gpr_ref(&r->refs); } -static void -new_with_len_unref (void *p) -{ +static void new_with_len_unref(void *p) { new_with_len_slice_refcount *r = p; - if (gpr_unref (&r->refs)) - { - r->user_destroy (r->user_data, r->user_length); - gpr_free (r); - } + if (gpr_unref(&r->refs)) { + r->user_destroy(r->user_data, r->user_length); + gpr_free(r); + } } -gpr_slice -gpr_slice_new_with_len (void *p, size_t len, void (*destroy) (void *, size_t)) -{ +gpr_slice gpr_slice_new_with_len(void *p, size_t len, + void (*destroy)(void *, size_t)) { gpr_slice slice; - new_with_len_slice_refcount *rc = gpr_malloc (sizeof (new_with_len_slice_refcount)); - gpr_ref_init (&rc->refs, 1); + new_with_len_slice_refcount *rc = + gpr_malloc(sizeof(new_with_len_slice_refcount)); + gpr_ref_init(&rc->refs, 1); rc->rc.ref = new_with_len_ref; rc->rc.unref = new_with_len_unref; rc->user_destroy = destroy; @@ -157,242 +135,201 @@ gpr_slice_new_with_len (void *p, size_t len, void (*destroy) (void *, size_t)) return slice; } -gpr_slice -gpr_slice_from_copied_buffer (const char *source, size_t length) -{ - gpr_slice slice = gpr_slice_malloc (length); - memcpy (GPR_SLICE_START_PTR (slice), source, length); +gpr_slice gpr_slice_from_copied_buffer(const char *source, size_t length) { + gpr_slice slice = gpr_slice_malloc(length); + memcpy(GPR_SLICE_START_PTR(slice), source, length); return slice; } -gpr_slice -gpr_slice_from_copied_string (const char *source) -{ - return gpr_slice_from_copied_buffer (source, strlen (source)); +gpr_slice gpr_slice_from_copied_string(const char *source) { + return gpr_slice_from_copied_buffer(source, strlen(source)); } -typedef struct -{ +typedef struct { gpr_slice_refcount base; gpr_refcount refs; } malloc_refcount; -static void -malloc_ref (void *p) -{ +static void malloc_ref(void *p) { malloc_refcount *r = p; - gpr_ref (&r->refs); + gpr_ref(&r->refs); } -static void -malloc_unref (void *p) -{ +static void malloc_unref(void *p) { malloc_refcount *r = p; - if (gpr_unref (&r->refs)) - { - gpr_free (r); - } + if (gpr_unref(&r->refs)) { + gpr_free(r); + } } -gpr_slice -gpr_slice_malloc (size_t length) -{ +gpr_slice gpr_slice_malloc(size_t length) { gpr_slice slice; - if (length > sizeof (slice.data.inlined.bytes)) - { - /* Memory layout used by the slice created here: - - +-----------+----------------------------------------------------------+ - | refcount | bytes | - +-----------+----------------------------------------------------------+ - - refcount is a malloc_refcount - bytes is an array of bytes of the requested length - Both parts are placed in the same allocation returned from gpr_malloc */ - malloc_refcount *rc = gpr_malloc (sizeof (malloc_refcount) + length); - - /* Initial refcount on rc is 1 - and it's up to the caller to release - this reference. */ - gpr_ref_init (&rc->refs, 1); - - rc->base.ref = malloc_ref; - rc->base.unref = malloc_unref; - - /* Build up the slice to be returned. */ - /* The slices refcount points back to the allocated block. */ - slice.refcount = &rc->base; - /* The data bytes are placed immediately after the refcount struct */ - slice.data.refcounted.bytes = (gpr_uint8 *) (rc + 1); - /* And the length of the block is set to the requested length */ - slice.data.refcounted.length = length; - } - else - { - /* small slice: just inline the data */ - slice.refcount = NULL; - slice.data.inlined.length = (gpr_uint8) length; - } + if (length > sizeof(slice.data.inlined.bytes)) { + /* Memory layout used by the slice created here: + + +-----------+----------------------------------------------------------+ + | refcount | bytes | + +-----------+----------------------------------------------------------+ + + refcount is a malloc_refcount + bytes is an array of bytes of the requested length + Both parts are placed in the same allocation returned from gpr_malloc */ + malloc_refcount *rc = gpr_malloc(sizeof(malloc_refcount) + length); + + /* Initial refcount on rc is 1 - and it's up to the caller to release + this reference. */ + gpr_ref_init(&rc->refs, 1); + + rc->base.ref = malloc_ref; + rc->base.unref = malloc_unref; + + /* Build up the slice to be returned. */ + /* The slices refcount points back to the allocated block. */ + slice.refcount = &rc->base; + /* The data bytes are placed immediately after the refcount struct */ + slice.data.refcounted.bytes = (gpr_uint8 *)(rc + 1); + /* And the length of the block is set to the requested length */ + slice.data.refcounted.length = length; + } else { + /* small slice: just inline the data */ + slice.refcount = NULL; + slice.data.inlined.length = (gpr_uint8)length; + } return slice; } -gpr_slice -gpr_slice_sub_no_ref (gpr_slice source, size_t begin, size_t end) -{ +gpr_slice gpr_slice_sub_no_ref(gpr_slice source, size_t begin, size_t end) { gpr_slice subset; - GPR_ASSERT (end >= begin); - - if (source.refcount) - { - /* Enforce preconditions */ - GPR_ASSERT (source.data.refcounted.length >= end); - - /* Build the result */ - subset.refcount = source.refcount; - /* Point into the source array */ - subset.data.refcounted.bytes = source.data.refcounted.bytes + begin; - subset.data.refcounted.length = end - begin; - } - else - { - /* Enforce preconditions */ - GPR_ASSERT (source.data.inlined.length >= end); - subset.refcount = NULL; - subset.data.inlined.length = (gpr_uint8) (end - begin); - memcpy (subset.data.inlined.bytes, source.data.inlined.bytes + begin, end - begin); - } + GPR_ASSERT(end >= begin); + + if (source.refcount) { + /* Enforce preconditions */ + GPR_ASSERT(source.data.refcounted.length >= end); + + /* Build the result */ + subset.refcount = source.refcount; + /* Point into the source array */ + subset.data.refcounted.bytes = source.data.refcounted.bytes + begin; + subset.data.refcounted.length = end - begin; + } else { + /* Enforce preconditions */ + GPR_ASSERT(source.data.inlined.length >= end); + subset.refcount = NULL; + subset.data.inlined.length = (gpr_uint8)(end - begin); + memcpy(subset.data.inlined.bytes, source.data.inlined.bytes + begin, + end - begin); + } return subset; } -gpr_slice -gpr_slice_sub (gpr_slice source, size_t begin, size_t end) -{ +gpr_slice gpr_slice_sub(gpr_slice source, size_t begin, size_t end) { gpr_slice subset; - if (end - begin <= sizeof (subset.data.inlined.bytes)) - { - subset.refcount = NULL; - subset.data.inlined.length = (gpr_uint8) (end - begin); - memcpy (subset.data.inlined.bytes, GPR_SLICE_START_PTR (source) + begin, end - begin); - } - else - { - subset = gpr_slice_sub_no_ref (source, begin, end); - /* Bump the refcount */ - subset.refcount->ref (subset.refcount); - } + if (end - begin <= sizeof(subset.data.inlined.bytes)) { + subset.refcount = NULL; + subset.data.inlined.length = (gpr_uint8)(end - begin); + memcpy(subset.data.inlined.bytes, GPR_SLICE_START_PTR(source) + begin, + end - begin); + } else { + subset = gpr_slice_sub_no_ref(source, begin, end); + /* Bump the refcount */ + subset.refcount->ref(subset.refcount); + } return subset; } -gpr_slice -gpr_slice_split_tail (gpr_slice * source, size_t split) -{ +gpr_slice gpr_slice_split_tail(gpr_slice *source, size_t split) { gpr_slice tail; - if (source->refcount == NULL) - { - /* inlined data, copy it out */ - GPR_ASSERT (source->data.inlined.length >= split); + if (source->refcount == NULL) { + /* inlined data, copy it out */ + GPR_ASSERT(source->data.inlined.length >= split); + tail.refcount = NULL; + tail.data.inlined.length = (gpr_uint8)(source->data.inlined.length - split); + memcpy(tail.data.inlined.bytes, source->data.inlined.bytes + split, + tail.data.inlined.length); + source->data.inlined.length = (gpr_uint8)split; + } else { + size_t tail_length = source->data.refcounted.length - split; + GPR_ASSERT(source->data.refcounted.length >= split); + if (tail_length < sizeof(tail.data.inlined.bytes)) { + /* Copy out the bytes - it'll be cheaper than refcounting */ tail.refcount = NULL; - tail.data.inlined.length = (gpr_uint8) (source->data.inlined.length - split); - memcpy (tail.data.inlined.bytes, source->data.inlined.bytes + split, tail.data.inlined.length); - source->data.inlined.length = (gpr_uint8) split; - } - else - { - size_t tail_length = source->data.refcounted.length - split; - GPR_ASSERT (source->data.refcounted.length >= split); - if (tail_length < sizeof (tail.data.inlined.bytes)) - { - /* Copy out the bytes - it'll be cheaper than refcounting */ - tail.refcount = NULL; - tail.data.inlined.length = (gpr_uint8) tail_length; - memcpy (tail.data.inlined.bytes, source->data.refcounted.bytes + split, tail_length); - } - else - { - /* Build the result */ - tail.refcount = source->refcount; - /* Bump the refcount */ - tail.refcount->ref (tail.refcount); - /* Point into the source array */ - tail.data.refcounted.bytes = source->data.refcounted.bytes + split; - tail.data.refcounted.length = tail_length; - } - source->data.refcounted.length = split; + tail.data.inlined.length = (gpr_uint8)tail_length; + memcpy(tail.data.inlined.bytes, source->data.refcounted.bytes + split, + tail_length); + } else { + /* Build the result */ + tail.refcount = source->refcount; + /* Bump the refcount */ + tail.refcount->ref(tail.refcount); + /* Point into the source array */ + tail.data.refcounted.bytes = source->data.refcounted.bytes + split; + tail.data.refcounted.length = tail_length; } + source->data.refcounted.length = split; + } return tail; } -gpr_slice -gpr_slice_split_head (gpr_slice * source, size_t split) -{ +gpr_slice gpr_slice_split_head(gpr_slice *source, size_t split) { gpr_slice head; - if (source->refcount == NULL) - { - GPR_ASSERT (source->data.inlined.length >= split); - - head.refcount = NULL; - head.data.inlined.length = (gpr_uint8) split; - memcpy (head.data.inlined.bytes, source->data.inlined.bytes, split); - source->data.inlined.length = (gpr_uint8) (source->data.inlined.length - split); - memmove (source->data.inlined.bytes, source->data.inlined.bytes + split, source->data.inlined.length); - } - else if (split < sizeof (head.data.inlined.bytes)) - { - GPR_ASSERT (source->data.refcounted.length >= split); - - head.refcount = NULL; - head.data.inlined.length = (gpr_uint8) split; - memcpy (head.data.inlined.bytes, source->data.refcounted.bytes, split); - source->data.refcounted.bytes += split; - source->data.refcounted.length -= split; - } - else - { - GPR_ASSERT (source->data.refcounted.length >= split); - - /* Build the result */ - head.refcount = source->refcount; - /* Bump the refcount */ - head.refcount->ref (head.refcount); - /* Point into the source array */ - head.data.refcounted.bytes = source->data.refcounted.bytes; - head.data.refcounted.length = split; - source->data.refcounted.bytes += split; - source->data.refcounted.length -= split; - } + if (source->refcount == NULL) { + GPR_ASSERT(source->data.inlined.length >= split); + + head.refcount = NULL; + head.data.inlined.length = (gpr_uint8)split; + memcpy(head.data.inlined.bytes, source->data.inlined.bytes, split); + source->data.inlined.length = + (gpr_uint8)(source->data.inlined.length - split); + memmove(source->data.inlined.bytes, source->data.inlined.bytes + split, + source->data.inlined.length); + } else if (split < sizeof(head.data.inlined.bytes)) { + GPR_ASSERT(source->data.refcounted.length >= split); + + head.refcount = NULL; + head.data.inlined.length = (gpr_uint8)split; + memcpy(head.data.inlined.bytes, source->data.refcounted.bytes, split); + source->data.refcounted.bytes += split; + source->data.refcounted.length -= split; + } else { + GPR_ASSERT(source->data.refcounted.length >= split); + + /* Build the result */ + head.refcount = source->refcount; + /* Bump the refcount */ + head.refcount->ref(head.refcount); + /* Point into the source array */ + head.data.refcounted.bytes = source->data.refcounted.bytes; + head.data.refcounted.length = split; + source->data.refcounted.bytes += split; + source->data.refcounted.length -= split; + } return head; } -int -gpr_slice_cmp (gpr_slice a, gpr_slice b) -{ - int d = (int) (GPR_SLICE_LENGTH (a) - GPR_SLICE_LENGTH (b)); - if (d != 0) - return d; - return memcmp (GPR_SLICE_START_PTR (a), GPR_SLICE_START_PTR (b), GPR_SLICE_LENGTH (a)); +int gpr_slice_cmp(gpr_slice a, gpr_slice b) { + int d = (int)(GPR_SLICE_LENGTH(a) - GPR_SLICE_LENGTH(b)); + if (d != 0) return d; + return memcmp(GPR_SLICE_START_PTR(a), GPR_SLICE_START_PTR(b), + GPR_SLICE_LENGTH(a)); } -int -gpr_slice_str_cmp (gpr_slice a, const char *b) -{ - size_t b_length = strlen (b); - int d = (int) (GPR_SLICE_LENGTH (a) - b_length); - if (d != 0) - return d; - return memcmp (GPR_SLICE_START_PTR (a), b, b_length); +int gpr_slice_str_cmp(gpr_slice a, const char *b) { + size_t b_length = strlen(b); + int d = (int)(GPR_SLICE_LENGTH(a) - b_length); + if (d != 0) return d; + return memcmp(GPR_SLICE_START_PTR(a), b, b_length); } -char * -gpr_slice_to_cstring (gpr_slice slice) -{ - char *result = gpr_malloc (GPR_SLICE_LENGTH (slice) + 1); - memcpy (result, GPR_SLICE_START_PTR (slice), GPR_SLICE_LENGTH (slice)); - result[GPR_SLICE_LENGTH (slice)] = '\0'; +char *gpr_slice_to_cstring(gpr_slice slice) { + char *result = gpr_malloc(GPR_SLICE_LENGTH(slice) + 1); + memcpy(result, GPR_SLICE_START_PTR(slice), GPR_SLICE_LENGTH(slice)); + result[GPR_SLICE_LENGTH(slice)] = '\0'; return result; } diff --git a/src/core/support/slice_buffer.c b/src/core/support/slice_buffer.c index fac90ea6a63..8873d459d56 100644 --- a/src/core/support/slice_buffer.c +++ b/src/core/support/slice_buffer.c @@ -42,240 +42,190 @@ /* grow a buffer; requires GRPC_SLICE_BUFFER_INLINE_ELEMENTS > 1 */ #define GROW(x) (3 * (x) / 2) -static void -maybe_embiggen (gpr_slice_buffer * sb) -{ - if (sb->count == sb->capacity) - { - sb->capacity = GROW (sb->capacity); - GPR_ASSERT (sb->capacity > sb->count); - if (sb->slices == sb->inlined) - { - sb->slices = gpr_malloc (sb->capacity * sizeof (gpr_slice)); - memcpy (sb->slices, sb->inlined, sb->count * sizeof (gpr_slice)); - } - else - { - sb->slices = gpr_realloc (sb->slices, sb->capacity * sizeof (gpr_slice)); - } +static void maybe_embiggen(gpr_slice_buffer *sb) { + if (sb->count == sb->capacity) { + sb->capacity = GROW(sb->capacity); + GPR_ASSERT(sb->capacity > sb->count); + if (sb->slices == sb->inlined) { + sb->slices = gpr_malloc(sb->capacity * sizeof(gpr_slice)); + memcpy(sb->slices, sb->inlined, sb->count * sizeof(gpr_slice)); + } else { + sb->slices = gpr_realloc(sb->slices, sb->capacity * sizeof(gpr_slice)); } + } } -void -gpr_slice_buffer_init (gpr_slice_buffer * sb) -{ +void gpr_slice_buffer_init(gpr_slice_buffer *sb) { sb->count = 0; sb->length = 0; sb->capacity = GRPC_SLICE_BUFFER_INLINE_ELEMENTS; sb->slices = sb->inlined; } -void -gpr_slice_buffer_destroy (gpr_slice_buffer * sb) -{ - gpr_slice_buffer_reset_and_unref (sb); - if (sb->slices != sb->inlined) - { - gpr_free (sb->slices); - } +void gpr_slice_buffer_destroy(gpr_slice_buffer *sb) { + gpr_slice_buffer_reset_and_unref(sb); + if (sb->slices != sb->inlined) { + gpr_free(sb->slices); + } } -gpr_uint8 * -gpr_slice_buffer_tiny_add (gpr_slice_buffer * sb, size_t n) -{ +gpr_uint8 *gpr_slice_buffer_tiny_add(gpr_slice_buffer *sb, size_t n) { gpr_slice *back; gpr_uint8 *out; sb->length += n; - if (sb->count == 0) - goto add_new; + if (sb->count == 0) goto add_new; back = &sb->slices[sb->count - 1]; - if (back->refcount) - goto add_new; - if ((back->data.inlined.length + n) > sizeof (back->data.inlined.bytes)) + if (back->refcount) goto add_new; + if ((back->data.inlined.length + n) > sizeof(back->data.inlined.bytes)) goto add_new; out = back->data.inlined.bytes + back->data.inlined.length; - back->data.inlined.length = (gpr_uint8) (back->data.inlined.length + n); + back->data.inlined.length = (gpr_uint8)(back->data.inlined.length + n); return out; add_new: - maybe_embiggen (sb); + maybe_embiggen(sb); back = &sb->slices[sb->count]; sb->count++; back->refcount = NULL; - back->data.inlined.length = (gpr_uint8) n; + back->data.inlined.length = (gpr_uint8)n; return back->data.inlined.bytes; } -size_t -gpr_slice_buffer_add_indexed (gpr_slice_buffer * sb, gpr_slice s) -{ +size_t gpr_slice_buffer_add_indexed(gpr_slice_buffer *sb, gpr_slice s) { size_t out = sb->count; - maybe_embiggen (sb); + maybe_embiggen(sb); sb->slices[out] = s; - sb->length += GPR_SLICE_LENGTH (s); + sb->length += GPR_SLICE_LENGTH(s); sb->count = out + 1; return out; } -void -gpr_slice_buffer_add (gpr_slice_buffer * sb, gpr_slice s) -{ +void gpr_slice_buffer_add(gpr_slice_buffer *sb, gpr_slice s) { size_t n = sb->count; /* if both the last slice in the slice buffer and the slice being added are inlined (that is, that they carry their data inside the slice data structure), and the back slice is not full, then concatenate directly into the back slice, preventing many small slices being passed into writes */ - if (!s.refcount && n) - { - gpr_slice *back = &sb->slices[n - 1]; - if (!back->refcount && back->data.inlined.length < GPR_SLICE_INLINED_SIZE) - { - if (s.data.inlined.length + back->data.inlined.length <= GPR_SLICE_INLINED_SIZE) - { - memcpy (back->data.inlined.bytes + back->data.inlined.length, s.data.inlined.bytes, s.data.inlined.length); - back->data.inlined.length = (gpr_uint8) (back->data.inlined.length + s.data.inlined.length); - } - else - { - size_t cp1 = GPR_SLICE_INLINED_SIZE - back->data.inlined.length; - memcpy (back->data.inlined.bytes + back->data.inlined.length, s.data.inlined.bytes, cp1); - back->data.inlined.length = GPR_SLICE_INLINED_SIZE; - maybe_embiggen (sb); - back = &sb->slices[n]; - sb->count = n + 1; - back->refcount = NULL; - back->data.inlined.length = (gpr_uint8) (s.data.inlined.length - cp1); - memcpy (back->data.inlined.bytes, s.data.inlined.bytes + cp1, s.data.inlined.length - cp1); - } - sb->length += s.data.inlined.length; - return; /* early out */ - } + if (!s.refcount && n) { + gpr_slice *back = &sb->slices[n - 1]; + if (!back->refcount && back->data.inlined.length < GPR_SLICE_INLINED_SIZE) { + if (s.data.inlined.length + back->data.inlined.length <= + GPR_SLICE_INLINED_SIZE) { + memcpy(back->data.inlined.bytes + back->data.inlined.length, + s.data.inlined.bytes, s.data.inlined.length); + back->data.inlined.length = + (gpr_uint8)(back->data.inlined.length + s.data.inlined.length); + } else { + size_t cp1 = GPR_SLICE_INLINED_SIZE - back->data.inlined.length; + memcpy(back->data.inlined.bytes + back->data.inlined.length, + s.data.inlined.bytes, cp1); + back->data.inlined.length = GPR_SLICE_INLINED_SIZE; + maybe_embiggen(sb); + back = &sb->slices[n]; + sb->count = n + 1; + back->refcount = NULL; + back->data.inlined.length = (gpr_uint8)(s.data.inlined.length - cp1); + memcpy(back->data.inlined.bytes, s.data.inlined.bytes + cp1, + s.data.inlined.length - cp1); + } + sb->length += s.data.inlined.length; + return; /* early out */ } - gpr_slice_buffer_add_indexed (sb, s); + } + gpr_slice_buffer_add_indexed(sb, s); } -void -gpr_slice_buffer_addn (gpr_slice_buffer * sb, gpr_slice * s, size_t n) -{ +void gpr_slice_buffer_addn(gpr_slice_buffer *sb, gpr_slice *s, size_t n) { size_t i; - for (i = 0; i < n; i++) - { - gpr_slice_buffer_add (sb, s[i]); - } + for (i = 0; i < n; i++) { + gpr_slice_buffer_add(sb, s[i]); + } } -void -gpr_slice_buffer_pop (gpr_slice_buffer * sb) -{ - if (sb->count != 0) - { - size_t count = --sb->count; - sb->length -= GPR_SLICE_LENGTH (sb->slices[count]); - } +void gpr_slice_buffer_pop(gpr_slice_buffer *sb) { + if (sb->count != 0) { + size_t count = --sb->count; + sb->length -= GPR_SLICE_LENGTH(sb->slices[count]); + } } -void -gpr_slice_buffer_reset_and_unref (gpr_slice_buffer * sb) -{ +void gpr_slice_buffer_reset_and_unref(gpr_slice_buffer *sb) { size_t i; - for (i = 0; i < sb->count; i++) - { - gpr_slice_unref (sb->slices[i]); - } + for (i = 0; i < sb->count; i++) { + gpr_slice_unref(sb->slices[i]); + } sb->count = 0; sb->length = 0; } -void -gpr_slice_buffer_swap (gpr_slice_buffer * a, gpr_slice_buffer * b) -{ - GPR_SWAP (size_t, a->count, b->count); - GPR_SWAP (size_t, a->capacity, b->capacity); - GPR_SWAP (size_t, a->length, b->length); - - if (a->slices == a->inlined) - { - if (b->slices == b->inlined) - { - /* swap contents of inlined buffer */ - gpr_slice temp[GRPC_SLICE_BUFFER_INLINE_ELEMENTS]; - memcpy (temp, a->slices, b->count * sizeof (gpr_slice)); - memcpy (a->slices, b->slices, a->count * sizeof (gpr_slice)); - memcpy (b->slices, temp, b->count * sizeof (gpr_slice)); - } - else - { - /* a is inlined, b is not - copy a inlined into b, fix pointers */ - a->slices = b->slices; - b->slices = b->inlined; - memcpy (b->slices, a->inlined, b->count * sizeof (gpr_slice)); - } - } - else if (b->slices == b->inlined) - { - /* b is inlined, a is not - copy b inlined int a, fix pointers */ - b->slices = a->slices; - a->slices = a->inlined; - memcpy (a->slices, b->inlined, a->count * sizeof (gpr_slice)); - } - else - { - /* no inlining: easy swap */ - GPR_SWAP (gpr_slice *, a->slices, b->slices); +void gpr_slice_buffer_swap(gpr_slice_buffer *a, gpr_slice_buffer *b) { + GPR_SWAP(size_t, a->count, b->count); + GPR_SWAP(size_t, a->capacity, b->capacity); + GPR_SWAP(size_t, a->length, b->length); + + if (a->slices == a->inlined) { + if (b->slices == b->inlined) { + /* swap contents of inlined buffer */ + gpr_slice temp[GRPC_SLICE_BUFFER_INLINE_ELEMENTS]; + memcpy(temp, a->slices, b->count * sizeof(gpr_slice)); + memcpy(a->slices, b->slices, a->count * sizeof(gpr_slice)); + memcpy(b->slices, temp, b->count * sizeof(gpr_slice)); + } else { + /* a is inlined, b is not - copy a inlined into b, fix pointers */ + a->slices = b->slices; + b->slices = b->inlined; + memcpy(b->slices, a->inlined, b->count * sizeof(gpr_slice)); } + } else if (b->slices == b->inlined) { + /* b is inlined, a is not - copy b inlined int a, fix pointers */ + b->slices = a->slices; + a->slices = a->inlined; + memcpy(a->slices, b->inlined, a->count * sizeof(gpr_slice)); + } else { + /* no inlining: easy swap */ + GPR_SWAP(gpr_slice *, a->slices, b->slices); + } } -void -gpr_slice_buffer_move_into (gpr_slice_buffer * src, gpr_slice_buffer * dst) -{ +void gpr_slice_buffer_move_into(gpr_slice_buffer *src, gpr_slice_buffer *dst) { /* anything to move? */ - if (src->count == 0) - { - return; - } + if (src->count == 0) { + return; + } /* anything in dst? */ - if (dst->count == 0) - { - gpr_slice_buffer_swap (src, dst); - return; - } + if (dst->count == 0) { + gpr_slice_buffer_swap(src, dst); + return; + } /* both buffers have data - copy, and reset src */ - gpr_slice_buffer_addn (dst, src->slices, src->count); + gpr_slice_buffer_addn(dst, src->slices, src->count); src->count = 0; src->length = 0; } -void -gpr_slice_buffer_trim_end (gpr_slice_buffer * sb, size_t n) -{ - GPR_ASSERT (n <= sb->length); +void gpr_slice_buffer_trim_end(gpr_slice_buffer *sb, size_t n) { + GPR_ASSERT(n <= sb->length); sb->length -= n; - for (;;) - { - size_t idx = sb->count - 1; - gpr_slice slice = sb->slices[idx]; - size_t slice_len = GPR_SLICE_LENGTH (slice); - if (slice_len > n) - { - sb->slices[idx] = gpr_slice_sub_no_ref (slice, 0, slice_len - n); - return; - } - else if (slice_len == n) - { - gpr_slice_unref (slice); - sb->count = idx; - return; - } - else - { - gpr_slice_unref (slice); - n -= slice_len; - sb->count = idx; - } + for (;;) { + size_t idx = sb->count - 1; + gpr_slice slice = sb->slices[idx]; + size_t slice_len = GPR_SLICE_LENGTH(slice); + if (slice_len > n) { + sb->slices[idx] = gpr_slice_sub_no_ref(slice, 0, slice_len - n); + return; + } else if (slice_len == n) { + gpr_slice_unref(slice); + sb->count = idx; + return; + } else { + gpr_slice_unref(slice); + n -= slice_len; + sb->count = idx; } + } } diff --git a/src/core/support/stack_lockfree.c b/src/core/support/stack_lockfree.c index 19171af8a22..7e6beec0c24 100644 --- a/src/core/support/stack_lockfree.c +++ b/src/core/support/stack_lockfree.c @@ -43,8 +43,7 @@ /* The lockfree node structure is a single architecture-level word that allows for an atomic CAS to set it up. */ -struct lockfree_node_contents -{ +struct lockfree_node_contents { /* next thing to look at. Actual index for head, next index otherwise */ gpr_uint16 index; #ifdef GPR_ARCH_64 @@ -60,126 +59,115 @@ struct lockfree_node_contents }; /* Use a union to make sure that these are in the same bits as an atm word */ -typedef union lockfree_node -{ +typedef union lockfree_node { gpr_atm atm; struct lockfree_node_contents contents; } lockfree_node; -#define ENTRY_ALIGNMENT_BITS 3 /* make sure that entries aligned to 8-bytes */ +#define ENTRY_ALIGNMENT_BITS 3 /* make sure that entries aligned to 8-bytes */ #define INVALID_ENTRY_INDEX \ - ((1 << 16) - 1) /* reserve this entry as invalid \ - */ + ((1 << 16) - 1) /* reserve this entry as invalid \ + */ -struct gpr_stack_lockfree -{ +struct gpr_stack_lockfree { lockfree_node *entries; - lockfree_node head; /* An atomic entry describing curr head */ + lockfree_node head; /* An atomic entry describing curr head */ #ifndef NDEBUG /* Bitmap of pushed entries to check for double-push or pop */ - gpr_atm pushed[(INVALID_ENTRY_INDEX + 1) / (8 * sizeof (gpr_atm))]; + gpr_atm pushed[(INVALID_ENTRY_INDEX + 1) / (8 * sizeof(gpr_atm))]; #endif }; -gpr_stack_lockfree * -gpr_stack_lockfree_create (size_t entries) -{ +gpr_stack_lockfree *gpr_stack_lockfree_create(size_t entries) { gpr_stack_lockfree *stack; - stack = gpr_malloc (sizeof (*stack)); + stack = gpr_malloc(sizeof(*stack)); /* Since we only allocate 16 bits to represent an entry number, * make sure that we are within the desired range */ /* Reserve the highest entry number as a dummy */ - GPR_ASSERT (entries < INVALID_ENTRY_INDEX); - stack->entries = gpr_malloc_aligned (entries * sizeof (stack->entries[0]), ENTRY_ALIGNMENT_BITS); + GPR_ASSERT(entries < INVALID_ENTRY_INDEX); + stack->entries = gpr_malloc_aligned(entries * sizeof(stack->entries[0]), + ENTRY_ALIGNMENT_BITS); /* Clear out all entries */ - memset (stack->entries, 0, entries * sizeof (stack->entries[0])); - memset (&stack->head, 0, sizeof (stack->head)); + memset(stack->entries, 0, entries * sizeof(stack->entries[0])); + memset(&stack->head, 0, sizeof(stack->head)); #ifndef NDEBUG - memset (&stack->pushed, 0, sizeof (stack->pushed)); + memset(&stack->pushed, 0, sizeof(stack->pushed)); #endif - GPR_ASSERT (sizeof (stack->entries->atm) == sizeof (stack->entries->contents)); + GPR_ASSERT(sizeof(stack->entries->atm) == sizeof(stack->entries->contents)); /* Point the head at reserved dummy entry */ stack->head.contents.index = INVALID_ENTRY_INDEX; return stack; } -void -gpr_stack_lockfree_destroy (gpr_stack_lockfree * stack) -{ - gpr_free_aligned (stack->entries); - gpr_free (stack); +void gpr_stack_lockfree_destroy(gpr_stack_lockfree *stack) { + gpr_free_aligned(stack->entries); + gpr_free(stack); } -int -gpr_stack_lockfree_push (gpr_stack_lockfree * stack, int entry) -{ +int gpr_stack_lockfree_push(gpr_stack_lockfree *stack, int entry) { lockfree_node head; lockfree_node newhead; lockfree_node curent; lockfree_node newent; /* First fill in the entry's index and aba ctr for new head */ - newhead.contents.index = (gpr_uint16) entry; + newhead.contents.index = (gpr_uint16)entry; /* Also post-increment the aba_ctr */ - curent.atm = gpr_atm_no_barrier_load (&stack->entries[entry].atm); + curent.atm = gpr_atm_no_barrier_load(&stack->entries[entry].atm); newhead.contents.aba_ctr = ++curent.contents.aba_ctr; - gpr_atm_no_barrier_store (&stack->entries[entry].atm, curent.atm); + gpr_atm_no_barrier_store(&stack->entries[entry].atm, curent.atm); #ifndef NDEBUG /* Check for double push */ { - int pushed_index = entry / (int) (8 * sizeof (gpr_atm)); - int pushed_bit = entry % (int) (8 * sizeof (gpr_atm)); + int pushed_index = entry / (int)(8 * sizeof(gpr_atm)); + int pushed_bit = entry % (int)(8 * sizeof(gpr_atm)); gpr_atm old_val; - old_val = gpr_atm_no_barrier_fetch_add (&stack->pushed[pushed_index], (gpr_atm) (1UL << pushed_bit)); - GPR_ASSERT ((old_val & (gpr_atm) (1UL << pushed_bit)) == 0); + old_val = gpr_atm_no_barrier_fetch_add(&stack->pushed[pushed_index], + (gpr_atm)(1UL << pushed_bit)); + GPR_ASSERT((old_val & (gpr_atm)(1UL << pushed_bit)) == 0); } #endif - do - { - /* Atomically get the existing head value for use */ - head.atm = gpr_atm_no_barrier_load (&(stack->head.atm)); - /* Point to it */ - newent.atm = gpr_atm_no_barrier_load (&stack->entries[entry].atm); - newent.contents.index = head.contents.index; - gpr_atm_no_barrier_store (&stack->entries[entry].atm, newent.atm); - } - while (!gpr_atm_rel_cas (&(stack->head.atm), head.atm, newhead.atm)); + do { + /* Atomically get the existing head value for use */ + head.atm = gpr_atm_no_barrier_load(&(stack->head.atm)); + /* Point to it */ + newent.atm = gpr_atm_no_barrier_load(&stack->entries[entry].atm); + newent.contents.index = head.contents.index; + gpr_atm_no_barrier_store(&stack->entries[entry].atm, newent.atm); + } while (!gpr_atm_rel_cas(&(stack->head.atm), head.atm, newhead.atm)); /* Use rel_cas above to make sure that entry index is set properly */ return head.contents.index == INVALID_ENTRY_INDEX; } -int -gpr_stack_lockfree_pop (gpr_stack_lockfree * stack) -{ +int gpr_stack_lockfree_pop(gpr_stack_lockfree *stack) { lockfree_node head; lockfree_node newhead; - do - { - head.atm = gpr_atm_acq_load (&(stack->head.atm)); - if (head.contents.index == INVALID_ENTRY_INDEX) - { - return -1; - } - newhead.atm = gpr_atm_no_barrier_load (&(stack->entries[head.contents.index].atm)); - + do { + head.atm = gpr_atm_acq_load(&(stack->head.atm)); + if (head.contents.index == INVALID_ENTRY_INDEX) { + return -1; } - while (!gpr_atm_no_barrier_cas (&(stack->head.atm), head.atm, newhead.atm)); + newhead.atm = + gpr_atm_no_barrier_load(&(stack->entries[head.contents.index].atm)); + + } while (!gpr_atm_no_barrier_cas(&(stack->head.atm), head.atm, newhead.atm)); #ifndef NDEBUG /* Check for valid pop */ { - int pushed_index = head.contents.index / (8 * sizeof (gpr_atm)); - int pushed_bit = head.contents.index % (8 * sizeof (gpr_atm)); + int pushed_index = head.contents.index / (8 * sizeof(gpr_atm)); + int pushed_bit = head.contents.index % (8 * sizeof(gpr_atm)); gpr_atm old_val; - old_val = gpr_atm_no_barrier_fetch_add (&stack->pushed[pushed_index], -(gpr_atm) (1UL << pushed_bit)); - GPR_ASSERT ((old_val & (gpr_atm) (1UL << pushed_bit)) != 0); + old_val = gpr_atm_no_barrier_fetch_add(&stack->pushed[pushed_index], + -(gpr_atm)(1UL << pushed_bit)); + GPR_ASSERT((old_val & (gpr_atm)(1UL << pushed_bit)) != 0); } #endif diff --git a/src/core/support/stack_lockfree.h b/src/core/support/stack_lockfree.h index 2f966d29636..ca58dd007a2 100644 --- a/src/core/support/stack_lockfree.h +++ b/src/core/support/stack_lockfree.h @@ -40,14 +40,14 @@ typedef struct gpr_stack_lockfree gpr_stack_lockfree; /* This stack must specify the maximum number of entries to track. The current implementation only allows up to 65534 entries */ -gpr_stack_lockfree *gpr_stack_lockfree_create (size_t entries); -void gpr_stack_lockfree_destroy (gpr_stack_lockfree * stack); +gpr_stack_lockfree *gpr_stack_lockfree_create(size_t entries); +void gpr_stack_lockfree_destroy(gpr_stack_lockfree *stack); /* Pass in a valid entry number for the next stack entry */ /* Returns 1 if this is the first element on the stack, 0 otherwise */ -int gpr_stack_lockfree_push (gpr_stack_lockfree *, int entry); +int gpr_stack_lockfree_push(gpr_stack_lockfree *, int entry); /* Returns -1 on empty or the actual entry number */ -int gpr_stack_lockfree_pop (gpr_stack_lockfree * stack); +int gpr_stack_lockfree_pop(gpr_stack_lockfree *stack); #endif /* GRPC_INTERNAL_CORE_SUPPORT_STACK_LOCKFREE_H */ diff --git a/src/core/support/string.c b/src/core/support/string.c index 28207f5dc2b..e0ffeb8a4af 100644 --- a/src/core/support/string.c +++ b/src/core/support/string.c @@ -42,215 +42,169 @@ #include #include -char * -gpr_strdup (const char *src) -{ +char *gpr_strdup(const char *src) { char *dst; size_t len; - if (!src) - { - return NULL; - } + if (!src) { + return NULL; + } - len = strlen (src) + 1; - dst = gpr_malloc (len); + len = strlen(src) + 1; + dst = gpr_malloc(len); - memcpy (dst, src, len); + memcpy(dst, src, len); return dst; } -typedef struct -{ +typedef struct { size_t capacity; size_t length; char *data; } dump_out; -static dump_out -dump_out_create (void) -{ - dump_out r = { 0, 0, NULL }; +static dump_out dump_out_create(void) { + dump_out r = {0, 0, NULL}; return r; } -static void -dump_out_append (dump_out * out, char c) -{ - if (out->length == out->capacity) - { - out->capacity = GPR_MAX (8, 2 * out->capacity); - out->data = gpr_realloc (out->data, out->capacity); - } +static void dump_out_append(dump_out *out, char c) { + if (out->length == out->capacity) { + out->capacity = GPR_MAX(8, 2 * out->capacity); + out->data = gpr_realloc(out->data, out->capacity); + } out->data[out->length++] = c; } -static void -hexdump (dump_out * out, const char *buf, size_t len) -{ +static void hexdump(dump_out *out, const char *buf, size_t len) { static const char hex[16] = "0123456789abcdef"; - const gpr_uint8 *const beg = (const gpr_uint8 *) buf; + const gpr_uint8 *const beg = (const gpr_uint8 *)buf; const gpr_uint8 *const end = beg + len; const gpr_uint8 *cur; - for (cur = beg; cur != end; ++cur) - { - if (cur != beg) - dump_out_append (out, ' '); - dump_out_append (out, hex[*cur >> 4]); - dump_out_append (out, hex[*cur & 0xf]); - } + for (cur = beg; cur != end; ++cur) { + if (cur != beg) dump_out_append(out, ' '); + dump_out_append(out, hex[*cur >> 4]); + dump_out_append(out, hex[*cur & 0xf]); + } } -static void -asciidump (dump_out * out, const char *buf, size_t len) -{ - const gpr_uint8 *const beg = (const gpr_uint8 *) buf; +static void asciidump(dump_out *out, const char *buf, size_t len) { + const gpr_uint8 *const beg = (const gpr_uint8 *)buf; const gpr_uint8 *const end = beg + len; const gpr_uint8 *cur; int out_was_empty = (out->length == 0); - if (!out_was_empty) - { - dump_out_append (out, ' '); - dump_out_append (out, '\''); - } - for (cur = beg; cur != end; ++cur) - { - dump_out_append (out, (char) (isprint (*cur) ? *(char *) cur : '.')); - } - if (!out_was_empty) - { - dump_out_append (out, '\''); - } + if (!out_was_empty) { + dump_out_append(out, ' '); + dump_out_append(out, '\''); + } + for (cur = beg; cur != end; ++cur) { + dump_out_append(out, (char)(isprint(*cur) ? *(char *)cur : '.')); + } + if (!out_was_empty) { + dump_out_append(out, '\''); + } } -char * -gpr_dump (const char *buf, size_t len, gpr_uint32 flags) -{ - dump_out out = dump_out_create (); - if (flags & GPR_DUMP_HEX) - { - hexdump (&out, buf, len); - } - if (flags & GPR_DUMP_ASCII) - { - asciidump (&out, buf, len); - } - dump_out_append (&out, 0); +char *gpr_dump(const char *buf, size_t len, gpr_uint32 flags) { + dump_out out = dump_out_create(); + if (flags & GPR_DUMP_HEX) { + hexdump(&out, buf, len); + } + if (flags & GPR_DUMP_ASCII) { + asciidump(&out, buf, len); + } + dump_out_append(&out, 0); return out.data; } -char * -gpr_dump_slice (gpr_slice s, gpr_uint32 flags) -{ - return gpr_dump ((const char *) GPR_SLICE_START_PTR (s), GPR_SLICE_LENGTH (s), flags); +char *gpr_dump_slice(gpr_slice s, gpr_uint32 flags) { + return gpr_dump((const char *)GPR_SLICE_START_PTR(s), GPR_SLICE_LENGTH(s), + flags); } -int -gpr_parse_bytes_to_uint32 (const char *buf, size_t len, gpr_uint32 * result) -{ +int gpr_parse_bytes_to_uint32(const char *buf, size_t len, gpr_uint32 *result) { gpr_uint32 out = 0; gpr_uint32 new; size_t i; - if (len == 0) - return 0; /* must have some bytes */ - - for (i = 0; i < len; i++) - { - if (buf[i] < '0' || buf[i] > '9') - return 0; /* bad char */ - new = 10 * out + (gpr_uint32) (buf[i] - '0'); - if (new < out) - return 0; /* overflow */ - out = new; - } + if (len == 0) return 0; /* must have some bytes */ + + for (i = 0; i < len; i++) { + if (buf[i] < '0' || buf[i] > '9') return 0; /* bad char */ + new = 10 * out + (gpr_uint32)(buf[i] - '0'); + if (new < out) return 0; /* overflow */ + out = new; + } *result = out; return 1; } -void -gpr_reverse_bytes (char *str, int len) -{ +void gpr_reverse_bytes(char *str, int len) { char *p1, *p2; - for (p1 = str, p2 = str + len - 1; p2 > p1; ++p1, --p2) - { - char temp = *p1; - *p1 = *p2; - *p2 = temp; - } + for (p1 = str, p2 = str + len - 1; p2 > p1; ++p1, --p2) { + char temp = *p1; + *p1 = *p2; + *p2 = temp; + } } -int -gpr_ltoa (long value, char *string) -{ +int gpr_ltoa(long value, char *string) { int i = 0; int neg = value < 0; - if (value == 0) - { - string[0] = '0'; - string[1] = 0; - return 1; - } - - if (neg) - value = -value; - while (value) - { - string[i++] = (char) ('0' + value % 10); - value /= 10; - } - if (neg) - string[i++] = '-'; - gpr_reverse_bytes (string, i); + if (value == 0) { + string[0] = '0'; + string[1] = 0; + return 1; + } + + if (neg) value = -value; + while (value) { + string[i++] = (char)('0' + value % 10); + value /= 10; + } + if (neg) string[i++] = '-'; + gpr_reverse_bytes(string, i); string[i] = 0; return i; } -char * -gpr_strjoin (const char **strs, size_t nstrs, size_t * final_length) -{ - return gpr_strjoin_sep (strs, nstrs, "", final_length); +char *gpr_strjoin(const char **strs, size_t nstrs, size_t *final_length) { + return gpr_strjoin_sep(strs, nstrs, "", final_length); } -char * -gpr_strjoin_sep (const char **strs, size_t nstrs, const char *sep, size_t * final_length) -{ - const size_t sep_len = strlen (sep); +char *gpr_strjoin_sep(const char **strs, size_t nstrs, const char *sep, + size_t *final_length) { + const size_t sep_len = strlen(sep); size_t out_length = 0; size_t i; char *out; - for (i = 0; i < nstrs; i++) - { - out_length += strlen (strs[i]); - } - out_length += 1; /* null terminator */ - if (nstrs > 0) - { - out_length += sep_len * (nstrs - 1); /* separators */ - } - out = gpr_malloc (out_length); + for (i = 0; i < nstrs; i++) { + out_length += strlen(strs[i]); + } + out_length += 1; /* null terminator */ + if (nstrs > 0) { + out_length += sep_len * (nstrs - 1); /* separators */ + } + out = gpr_malloc(out_length); out_length = 0; - for (i = 0; i < nstrs; i++) - { - const size_t slen = strlen (strs[i]); - if (i != 0) - { - memcpy (out + out_length, sep, sep_len); - out_length += sep_len; - } - memcpy (out + out_length, strs[i], slen); - out_length += slen; + for (i = 0; i < nstrs; i++) { + const size_t slen = strlen(strs[i]); + if (i != 0) { + memcpy(out + out_length, sep, sep_len); + out_length += sep_len; } + memcpy(out + out_length, strs[i], slen); + out_length += slen; + } out[out_length] = 0; - if (final_length != NULL) - { - *final_length = out_length; - } + if (final_length != NULL) { + *final_length = out_length; + } return out; } @@ -259,83 +213,63 @@ gpr_strjoin_sep (const char **strs, size_t nstrs, const char *sep, size_t * fina * str. * * Returns 1 and updates \a begin and \a end. Returns 0 otherwise. */ -static int -slice_find_separator_offset (const gpr_slice str, const char *sep, const size_t read_offset, size_t * begin, size_t * end) -{ +static int slice_find_separator_offset(const gpr_slice str, const char *sep, + const size_t read_offset, size_t *begin, + size_t *end) { size_t i; - const gpr_uint8 *str_ptr = GPR_SLICE_START_PTR (str) + read_offset; - const size_t str_len = GPR_SLICE_LENGTH (str) - read_offset; - const size_t sep_len = strlen (sep); - if (str_len < sep_len) - { - return 0; - } - - for (i = 0; i <= str_len - sep_len; i++) - { - if (memcmp (str_ptr + i, sep, sep_len) == 0) - { - *begin = read_offset; - *end = read_offset + i; - return 1; - } + const gpr_uint8 *str_ptr = GPR_SLICE_START_PTR(str) + read_offset; + const size_t str_len = GPR_SLICE_LENGTH(str) - read_offset; + const size_t sep_len = strlen(sep); + if (str_len < sep_len) { + return 0; + } + + for (i = 0; i <= str_len - sep_len; i++) { + if (memcmp(str_ptr + i, sep, sep_len) == 0) { + *begin = read_offset; + *end = read_offset + i; + return 1; } + } return 0; } -void -gpr_slice_split (gpr_slice str, const char *sep, gpr_slice_buffer * dst) -{ - const size_t sep_len = strlen (sep); +void gpr_slice_split(gpr_slice str, const char *sep, gpr_slice_buffer *dst) { + const size_t sep_len = strlen(sep); size_t begin, end; - GPR_ASSERT (sep_len > 0); - - if (slice_find_separator_offset (str, sep, 0, &begin, &end) != 0) - { - do - { - gpr_slice_buffer_add_indexed (dst, gpr_slice_sub (str, begin, end)); - } - while (slice_find_separator_offset (str, sep, end + sep_len, &begin, &end) != 0); - gpr_slice_buffer_add_indexed (dst, gpr_slice_sub (str, end + sep_len, GPR_SLICE_LENGTH (str))); - } - else - { /* no sep found, add whole input */ - gpr_slice_buffer_add_indexed (dst, gpr_slice_ref (str)); - } + GPR_ASSERT(sep_len > 0); + + if (slice_find_separator_offset(str, sep, 0, &begin, &end) != 0) { + do { + gpr_slice_buffer_add_indexed(dst, gpr_slice_sub(str, begin, end)); + } while (slice_find_separator_offset(str, sep, end + sep_len, &begin, + &end) != 0); + gpr_slice_buffer_add_indexed( + dst, gpr_slice_sub(str, end + sep_len, GPR_SLICE_LENGTH(str))); + } else { /* no sep found, add whole input */ + gpr_slice_buffer_add_indexed(dst, gpr_slice_ref(str)); + } } -void -gpr_strvec_init (gpr_strvec * sv) -{ - memset (sv, 0, sizeof (*sv)); -} +void gpr_strvec_init(gpr_strvec *sv) { memset(sv, 0, sizeof(*sv)); } -void -gpr_strvec_destroy (gpr_strvec * sv) -{ +void gpr_strvec_destroy(gpr_strvec *sv) { size_t i; - for (i = 0; i < sv->count; i++) - { - gpr_free (sv->strs[i]); - } - gpr_free (sv->strs); + for (i = 0; i < sv->count; i++) { + gpr_free(sv->strs[i]); + } + gpr_free(sv->strs); } -void -gpr_strvec_add (gpr_strvec * sv, char *str) -{ - if (sv->count == sv->capacity) - { - sv->capacity = GPR_MAX (sv->capacity + 8, sv->capacity * 2); - sv->strs = gpr_realloc (sv->strs, sizeof (char *) * sv->capacity); - } +void gpr_strvec_add(gpr_strvec *sv, char *str) { + if (sv->count == sv->capacity) { + sv->capacity = GPR_MAX(sv->capacity + 8, sv->capacity * 2); + sv->strs = gpr_realloc(sv->strs, sizeof(char *) * sv->capacity); + } sv->strs[sv->count++] = str; } -char * -gpr_strvec_flatten (gpr_strvec * sv, size_t * final_length) -{ - return gpr_strjoin ((const char **) sv->strs, sv->count, final_length); +char *gpr_strvec_flatten(gpr_strvec *sv, size_t *final_length) { + return gpr_strjoin((const char **)sv->strs, sv->count, final_length); } diff --git a/src/core/support/string.h b/src/core/support/string.h index 4304bcb5f5d..a28e00fd3ec 100644 --- a/src/core/support/string.h +++ b/src/core/support/string.h @@ -41,8 +41,7 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* String utility functions */ @@ -53,14 +52,15 @@ extern "C" /* Converts array buf, of length len, into a C string according to the flags. Result should be freed with gpr_free() */ - char *gpr_dump (const char *buf, size_t len, gpr_uint32 flags); +char *gpr_dump(const char *buf, size_t len, gpr_uint32 flags); /* Calls gpr_dump on a slice. */ - char *gpr_dump_slice (gpr_slice slice, gpr_uint32 flags); +char *gpr_dump_slice(gpr_slice slice, gpr_uint32 flags); /* Parses an array of bytes into an integer (base 10). Returns 1 on success, 0 on failure. */ - int gpr_parse_bytes_to_uint32 (const char *data, size_t length, gpr_uint32 * result); +int gpr_parse_bytes_to_uint32(const char *data, size_t length, + gpr_uint32 *result); /* Minimum buffer size for calling ltoa */ #define GPR_LTOA_MIN_BUFSIZE (3 * sizeof(long)) @@ -68,44 +68,44 @@ extern "C" /* Convert a long to a string in base 10; returns the length of the output string (or 0 on failure). output must be at least GPR_LTOA_MIN_BUFSIZE bytes long. */ - int gpr_ltoa (long value, char *output); +int gpr_ltoa(long value, char *output); /* Reverse a run of bytes */ - void gpr_reverse_bytes (char *str, int len); +void gpr_reverse_bytes(char *str, int len); /* Join a set of strings, returning the resulting string. Total combined length (excluding null terminator) is returned in total_length if it is non-null. */ - char *gpr_strjoin (const char **strs, size_t nstrs, size_t * total_length); +char *gpr_strjoin(const char **strs, size_t nstrs, size_t *total_length); /* Join a set of strings using a separator, returning the resulting string. Total combined length (excluding null terminator) is returned in total_length if it is non-null. */ - char *gpr_strjoin_sep (const char **strs, size_t nstrs, const char *sep, size_t * total_length); +char *gpr_strjoin_sep(const char **strs, size_t nstrs, const char *sep, + size_t *total_length); /** Split \a str by the separator \a sep. Results are stored in \a dst, which * should be a properly initialized instance. */ - void gpr_slice_split (gpr_slice str, const char *sep, gpr_slice_buffer * dst); +void gpr_slice_split(gpr_slice str, const char *sep, gpr_slice_buffer *dst); /* A vector of strings... for building up a final string one piece at a time */ - typedef struct - { - char **strs; - size_t count; - size_t capacity; - } gpr_strvec; +typedef struct { + char **strs; + size_t count; + size_t capacity; +} gpr_strvec; /* Initialize/destroy */ - void gpr_strvec_init (gpr_strvec * strs); - void gpr_strvec_destroy (gpr_strvec * strs); +void gpr_strvec_init(gpr_strvec *strs); +void gpr_strvec_destroy(gpr_strvec *strs); /* Add a string to a strvec, takes ownership of the string */ - void gpr_strvec_add (gpr_strvec * strs, char *add); +void gpr_strvec_add(gpr_strvec *strs, char *add); /* Return a joined string with all added substrings, optionally setting total_length as per gpr_strjoin */ - char *gpr_strvec_flatten (gpr_strvec * strs, size_t * total_length); +char *gpr_strvec_flatten(gpr_strvec *strs, size_t *total_length); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_SUPPORT_STRING_H */ +#endif /* GRPC_INTERNAL_CORE_SUPPORT_STRING_H */ diff --git a/src/core/support/string_posix.c b/src/core/support/string_posix.c index 729d5b1a9c3..25c333db4ed 100644 --- a/src/core/support/string_posix.c +++ b/src/core/support/string_posix.c @@ -41,50 +41,44 @@ #include -int -gpr_asprintf (char **strp, const char *format, ...) -{ +int gpr_asprintf(char **strp, const char *format, ...) { va_list args; int ret; char buf[64]; size_t strp_buflen; /* Use a constant-sized buffer to determine the length. */ - va_start (args, format); - ret = vsnprintf (buf, sizeof (buf), format, args); - va_end (args); - if (ret < 0) - { - *strp = NULL; - return -1; - } + va_start(args, format); + ret = vsnprintf(buf, sizeof(buf), format, args); + va_end(args); + if (ret < 0) { + *strp = NULL; + return -1; + } /* Allocate a new buffer, with space for the NUL terminator. */ - strp_buflen = (size_t) ret + 1; - if ((*strp = gpr_malloc (strp_buflen)) == NULL) - { - /* This shouldn't happen, because gpr_malloc() calls abort(). */ - return -1; - } + strp_buflen = (size_t)ret + 1; + if ((*strp = gpr_malloc(strp_buflen)) == NULL) { + /* This shouldn't happen, because gpr_malloc() calls abort(). */ + return -1; + } /* Return early if we have all the bytes. */ - if (strp_buflen <= sizeof (buf)) - { - memcpy (*strp, buf, strp_buflen); - return ret; - } + if (strp_buflen <= sizeof(buf)) { + memcpy(*strp, buf, strp_buflen); + return ret; + } /* Try again using the larger buffer. */ - va_start (args, format); - ret = vsnprintf (*strp, strp_buflen, format, args); - va_end (args); - if ((size_t) ret == strp_buflen - 1) - { - return ret; - } + va_start(args, format); + ret = vsnprintf(*strp, strp_buflen, format, args); + va_end(args); + if ((size_t)ret == strp_buflen - 1) { + return ret; + } /* This should never happen. */ - gpr_free (*strp); + gpr_free(*strp); *strp = NULL; return -1; } diff --git a/src/core/support/string_win32.c b/src/core/support/string_win32.c index 6d1909fa049..914ba8771c4 100644 --- a/src/core/support/string_win32.c +++ b/src/core/support/string_win32.c @@ -45,82 +45,65 @@ #include "src/core/support/string.h" -int -gpr_asprintf (char **strp, const char *format, ...) -{ +int gpr_asprintf(char **strp, const char *format, ...) { va_list args; int ret; size_t strp_buflen; /* Determine the length. */ - va_start (args, format); - ret = _vscprintf (format, args); - va_end (args); - if (ret < 0) - { - *strp = NULL; - return -1; - } + va_start(args, format); + ret = _vscprintf(format, args); + va_end(args); + if (ret < 0) { + *strp = NULL; + return -1; + } /* Allocate a new buffer, with space for the NUL terminator. */ - strp_buflen = (size_t) ret + 1; - if ((*strp = gpr_malloc (strp_buflen)) == NULL) - { - /* This shouldn't happen, because gpr_malloc() calls abort(). */ - return -1; - } + strp_buflen = (size_t)ret + 1; + if ((*strp = gpr_malloc(strp_buflen)) == NULL) { + /* This shouldn't happen, because gpr_malloc() calls abort(). */ + return -1; + } /* Print to the buffer. */ - va_start (args, format); - ret = vsnprintf_s (*strp, strp_buflen, _TRUNCATE, format, args); - va_end (args); - if ((size_t) ret == strp_buflen - 1) - { - return ret; - } + va_start(args, format); + ret = vsnprintf_s(*strp, strp_buflen, _TRUNCATE, format, args); + va_end(args); + if ((size_t)ret == strp_buflen - 1) { + return ret; + } /* This should never happen. */ - gpr_free (*strp); + gpr_free(*strp); *strp = NULL; return -1; } #if defined UNICODE || defined _UNICODE LPTSTR -gpr_char_to_tchar (LPCSTR input) -{ +gpr_char_to_tchar(LPCSTR input) { LPTSTR ret; - int needed = MultiByteToWideChar (CP_UTF8, 0, input, -1, NULL, 0); - if (needed == 0) - return NULL; - ret = gpr_malloc (needed * sizeof (TCHAR)); - MultiByteToWideChar (CP_UTF8, 0, input, -1, ret, needed); + int needed = MultiByteToWideChar(CP_UTF8, 0, input, -1, NULL, 0); + if (needed == 0) return NULL; + ret = gpr_malloc(needed * sizeof(TCHAR)); + MultiByteToWideChar(CP_UTF8, 0, input, -1, ret, needed); return ret; } LPSTR -gpr_tchar_to_char (LPCTSTR input) -{ +gpr_tchar_to_char(LPCTSTR input) { LPSTR ret; - int needed = WideCharToMultiByte (CP_UTF8, 0, input, -1, NULL, 0, NULL, NULL); - if (needed == 0) - return NULL; - ret = gpr_malloc (needed); - WideCharToMultiByte (CP_UTF8, 0, input, -1, ret, needed, NULL, NULL); + int needed = WideCharToMultiByte(CP_UTF8, 0, input, -1, NULL, 0, NULL, NULL); + if (needed == 0) return NULL; + ret = gpr_malloc(needed); + WideCharToMultiByte(CP_UTF8, 0, input, -1, ret, needed, NULL, NULL); return ret; } #else -char * -gpr_tchar_to_char (LPTSTR input) -{ - return gpr_strdup (input); -} +char *gpr_tchar_to_char(LPTSTR input) { return gpr_strdup(input); } -char * -gpr_char_to_tchar (LPTSTR input) -{ - return gpr_strdup (input); -} +char *gpr_char_to_tchar(LPTSTR input) { return gpr_strdup(input); } #endif #endif /* GPR_WIN32 */ diff --git a/src/core/support/string_win32.h b/src/core/support/string_win32.h index a07bdd9c47b..e3043656fba 100644 --- a/src/core/support/string_win32.h +++ b/src/core/support/string_win32.h @@ -39,8 +39,8 @@ #ifdef GPR_WIN32 /* These allocate new strings using gpr_malloc to convert from and to utf-8. */ -LPTSTR gpr_char_to_tchar (LPCSTR input); -LPSTR gpr_tchar_to_char (LPCTSTR input); +LPTSTR gpr_char_to_tchar(LPCSTR input); +LPSTR gpr_tchar_to_char(LPCTSTR input); #endif /* GPR_WIN32 */ diff --git a/src/core/support/subprocess_posix.c b/src/core/support/subprocess_posix.c index eb5cc63d626..171054e4da6 100644 --- a/src/core/support/subprocess_posix.c +++ b/src/core/support/subprocess_posix.c @@ -50,85 +50,63 @@ #include #include -struct gpr_subprocess -{ +struct gpr_subprocess { int pid; int joined; }; -const char * -gpr_subprocess_binary_extension () -{ - return ""; -} +const char *gpr_subprocess_binary_extension() { return ""; } -gpr_subprocess * -gpr_subprocess_create (int argc, const char **argv) -{ +gpr_subprocess *gpr_subprocess_create(int argc, const char **argv) { gpr_subprocess *r; int pid; char **exec_args; - pid = fork (); - if (pid == -1) - { - return NULL; - } - else if (pid == 0) - { - exec_args = gpr_malloc (((size_t) argc + 1) * sizeof (char *)); - memcpy (exec_args, argv, (size_t) argc * sizeof (char *)); - exec_args[argc] = NULL; - execv (exec_args[0], exec_args); - /* if we reach here, an error has occurred */ - gpr_log (GPR_ERROR, "execv '%s' failed: %s", exec_args[0], strerror (errno)); - _exit (1); - return NULL; - } - else - { - r = gpr_malloc (sizeof (gpr_subprocess)); - memset (r, 0, sizeof (*r)); - r->pid = pid; - return r; - } + pid = fork(); + if (pid == -1) { + return NULL; + } else if (pid == 0) { + exec_args = gpr_malloc(((size_t)argc + 1) * sizeof(char *)); + memcpy(exec_args, argv, (size_t)argc * sizeof(char *)); + exec_args[argc] = NULL; + execv(exec_args[0], exec_args); + /* if we reach here, an error has occurred */ + gpr_log(GPR_ERROR, "execv '%s' failed: %s", exec_args[0], strerror(errno)); + _exit(1); + return NULL; + } else { + r = gpr_malloc(sizeof(gpr_subprocess)); + memset(r, 0, sizeof(*r)); + r->pid = pid; + return r; + } } -void -gpr_subprocess_destroy (gpr_subprocess * p) -{ - if (!p->joined) - { - kill (p->pid, SIGKILL); - gpr_subprocess_join (p); - } - gpr_free (p); +void gpr_subprocess_destroy(gpr_subprocess *p) { + if (!p->joined) { + kill(p->pid, SIGKILL); + gpr_subprocess_join(p); + } + gpr_free(p); } -int -gpr_subprocess_join (gpr_subprocess * p) -{ +int gpr_subprocess_join(gpr_subprocess *p) { int status; retry: - if (waitpid (p->pid, &status, 0) == -1) - { - if (errno == EINTR) - { - goto retry; - } - gpr_log (GPR_ERROR, "waitpid failed: %s", strerror (errno)); - return -1; + if (waitpid(p->pid, &status, 0) == -1) { + if (errno == EINTR) { + goto retry; } + gpr_log(GPR_ERROR, "waitpid failed: %s", strerror(errno)); + return -1; + } return status; } -void -gpr_subprocess_interrupt (gpr_subprocess * p) -{ - if (!p->joined) - { - kill (p->pid, SIGINT); - } +void gpr_subprocess_interrupt(gpr_subprocess *p) { + if (!p->joined) { + kill(p->pid, SIGINT); + } } #endif /* GPR_POSIX_SUBPROCESS */ diff --git a/src/core/support/sync.c b/src/core/support/sync.c index de3ec7c86f6..d3cf77faea9 100644 --- a/src/core/support/sync.c +++ b/src/core/support/sync.c @@ -39,120 +39,84 @@ /* Number of mutexes to allocate for events, to avoid lock contention. Should be a prime. */ -enum -{ event_sync_partitions = 31 }; +enum { event_sync_partitions = 31 }; /* Events are partitioned by address to avoid lock contention. */ -static struct sync_array_s -{ +static struct sync_array_s { gpr_mu mu; gpr_cv cv; } sync_array[event_sync_partitions]; /* This routine is executed once on first use, via event_once */ static gpr_once event_once = GPR_ONCE_INIT; -static void -event_initialize (void) -{ +static void event_initialize(void) { int i; - for (i = 0; i != event_sync_partitions; i++) - { - gpr_mu_init (&sync_array[i].mu); - gpr_cv_init (&sync_array[i].cv); - } + for (i = 0; i != event_sync_partitions; i++) { + gpr_mu_init(&sync_array[i].mu); + gpr_cv_init(&sync_array[i].cv); + } } /* Hash ev into an element of sync_array[]. */ -static struct sync_array_s * -hash (gpr_event * ev) -{ - return &sync_array[((gpr_uintptr) ev) % event_sync_partitions]; +static struct sync_array_s *hash(gpr_event *ev) { + return &sync_array[((gpr_uintptr)ev) % event_sync_partitions]; } -void -gpr_event_init (gpr_event * ev) -{ - gpr_once_init (&event_once, &event_initialize); +void gpr_event_init(gpr_event *ev) { + gpr_once_init(&event_once, &event_initialize); ev->state = 0; } -void -gpr_event_set (gpr_event * ev, void *value) -{ - struct sync_array_s *s = hash (ev); - gpr_mu_lock (&s->mu); - GPR_ASSERT (gpr_atm_acq_load (&ev->state) == 0); - gpr_atm_rel_store (&ev->state, (gpr_atm) value); - gpr_cv_broadcast (&s->cv); - gpr_mu_unlock (&s->mu); - GPR_ASSERT (value != NULL); +void gpr_event_set(gpr_event *ev, void *value) { + struct sync_array_s *s = hash(ev); + gpr_mu_lock(&s->mu); + GPR_ASSERT(gpr_atm_acq_load(&ev->state) == 0); + gpr_atm_rel_store(&ev->state, (gpr_atm)value); + gpr_cv_broadcast(&s->cv); + gpr_mu_unlock(&s->mu); + GPR_ASSERT(value != NULL); } -void * -gpr_event_get (gpr_event * ev) -{ - return (void *) gpr_atm_acq_load (&ev->state); +void *gpr_event_get(gpr_event *ev) { + return (void *)gpr_atm_acq_load(&ev->state); } -void * -gpr_event_wait (gpr_event * ev, gpr_timespec abs_deadline) -{ - void *result = (void *) gpr_atm_acq_load (&ev->state); - if (result == NULL) - { - struct sync_array_s *s = hash (ev); - gpr_mu_lock (&s->mu); - do - { - result = (void *) gpr_atm_acq_load (&ev->state); - } - while (result == NULL && !gpr_cv_wait (&s->cv, &s->mu, abs_deadline)); - gpr_mu_unlock (&s->mu); - } +void *gpr_event_wait(gpr_event *ev, gpr_timespec abs_deadline) { + void *result = (void *)gpr_atm_acq_load(&ev->state); + if (result == NULL) { + struct sync_array_s *s = hash(ev); + gpr_mu_lock(&s->mu); + do { + result = (void *)gpr_atm_acq_load(&ev->state); + } while (result == NULL && !gpr_cv_wait(&s->cv, &s->mu, abs_deadline)); + gpr_mu_unlock(&s->mu); + } return result; } -void -gpr_ref_init (gpr_refcount * r, int n) -{ - gpr_atm_rel_store (&r->count, n); -} +void gpr_ref_init(gpr_refcount *r, int n) { gpr_atm_rel_store(&r->count, n); } -void -gpr_ref (gpr_refcount * r) -{ - gpr_atm_no_barrier_fetch_add (&r->count, 1); -} +void gpr_ref(gpr_refcount *r) { gpr_atm_no_barrier_fetch_add(&r->count, 1); } -void -gpr_refn (gpr_refcount * r, int n) -{ - gpr_atm_no_barrier_fetch_add (&r->count, n); +void gpr_refn(gpr_refcount *r, int n) { + gpr_atm_no_barrier_fetch_add(&r->count, n); } -int -gpr_unref (gpr_refcount * r) -{ - gpr_atm prior = gpr_atm_full_fetch_add (&r->count, -1); - GPR_ASSERT (prior > 0); +int gpr_unref(gpr_refcount *r) { + gpr_atm prior = gpr_atm_full_fetch_add(&r->count, -1); + GPR_ASSERT(prior > 0); return prior == 1; } -void -gpr_stats_init (gpr_stats_counter * c, gpr_intptr n) -{ - gpr_atm_rel_store (&c->value, n); +void gpr_stats_init(gpr_stats_counter *c, gpr_intptr n) { + gpr_atm_rel_store(&c->value, n); } -void -gpr_stats_inc (gpr_stats_counter * c, gpr_intptr inc) -{ - gpr_atm_no_barrier_fetch_add (&c->value, inc); +void gpr_stats_inc(gpr_stats_counter *c, gpr_intptr inc) { + gpr_atm_no_barrier_fetch_add(&c->value, inc); } -gpr_intptr -gpr_stats_read (const gpr_stats_counter * c) -{ +gpr_intptr gpr_stats_read(const gpr_stats_counter *c) { /* don't need acquire-load, but we have no no-barrier load yet */ - return gpr_atm_acq_load (&c->value); + return gpr_atm_acq_load(&c->value); } diff --git a/src/core/support/sync_posix.c b/src/core/support/sync_posix.c index e7ca7e01d43..91c30989ce8 100644 --- a/src/core/support/sync_posix.c +++ b/src/core/support/sync_posix.c @@ -41,90 +41,52 @@ #include #include -void -gpr_mu_init (gpr_mu * mu) -{ - GPR_ASSERT (pthread_mutex_init (mu, NULL) == 0); -} +void gpr_mu_init(gpr_mu* mu) { GPR_ASSERT(pthread_mutex_init(mu, NULL) == 0); } -void -gpr_mu_destroy (gpr_mu * mu) -{ - GPR_ASSERT (pthread_mutex_destroy (mu) == 0); -} +void gpr_mu_destroy(gpr_mu* mu) { GPR_ASSERT(pthread_mutex_destroy(mu) == 0); } -void -gpr_mu_lock (gpr_mu * mu) -{ - GPR_ASSERT (pthread_mutex_lock (mu) == 0); -} +void gpr_mu_lock(gpr_mu* mu) { GPR_ASSERT(pthread_mutex_lock(mu) == 0); } -void -gpr_mu_unlock (gpr_mu * mu) -{ - GPR_ASSERT (pthread_mutex_unlock (mu) == 0); -} +void gpr_mu_unlock(gpr_mu* mu) { GPR_ASSERT(pthread_mutex_unlock(mu) == 0); } -int -gpr_mu_trylock (gpr_mu * mu) -{ - int err = pthread_mutex_trylock (mu); - GPR_ASSERT (err == 0 || err == EBUSY); +int gpr_mu_trylock(gpr_mu* mu) { + int err = pthread_mutex_trylock(mu); + GPR_ASSERT(err == 0 || err == EBUSY); return err == 0; } /*----------------------------------------*/ -void -gpr_cv_init (gpr_cv * cv) -{ - GPR_ASSERT (pthread_cond_init (cv, NULL) == 0); -} +void gpr_cv_init(gpr_cv* cv) { GPR_ASSERT(pthread_cond_init(cv, NULL) == 0); } -void -gpr_cv_destroy (gpr_cv * cv) -{ - GPR_ASSERT (pthread_cond_destroy (cv) == 0); -} +void gpr_cv_destroy(gpr_cv* cv) { GPR_ASSERT(pthread_cond_destroy(cv) == 0); } -int -gpr_cv_wait (gpr_cv * cv, gpr_mu * mu, gpr_timespec abs_deadline) -{ +int gpr_cv_wait(gpr_cv* cv, gpr_mu* mu, gpr_timespec abs_deadline) { int err = 0; - if (gpr_time_cmp (abs_deadline, gpr_inf_future (abs_deadline.clock_type)) == 0) - { - err = pthread_cond_wait (cv, mu); - } - else - { - struct timespec abs_deadline_ts; - abs_deadline = gpr_convert_clock_type (abs_deadline, GPR_CLOCK_REALTIME); - abs_deadline_ts.tv_sec = abs_deadline.tv_sec; - abs_deadline_ts.tv_nsec = abs_deadline.tv_nsec; - err = pthread_cond_timedwait (cv, mu, &abs_deadline_ts); - } - GPR_ASSERT (err == 0 || err == ETIMEDOUT || err == EAGAIN); + if (gpr_time_cmp(abs_deadline, gpr_inf_future(abs_deadline.clock_type)) == + 0) { + err = pthread_cond_wait(cv, mu); + } else { + struct timespec abs_deadline_ts; + abs_deadline = gpr_convert_clock_type(abs_deadline, GPR_CLOCK_REALTIME); + abs_deadline_ts.tv_sec = abs_deadline.tv_sec; + abs_deadline_ts.tv_nsec = abs_deadline.tv_nsec; + err = pthread_cond_timedwait(cv, mu, &abs_deadline_ts); + } + GPR_ASSERT(err == 0 || err == ETIMEDOUT || err == EAGAIN); return err == ETIMEDOUT; } -void -gpr_cv_signal (gpr_cv * cv) -{ - GPR_ASSERT (pthread_cond_signal (cv) == 0); -} +void gpr_cv_signal(gpr_cv* cv) { GPR_ASSERT(pthread_cond_signal(cv) == 0); } -void -gpr_cv_broadcast (gpr_cv * cv) -{ - GPR_ASSERT (pthread_cond_broadcast (cv) == 0); +void gpr_cv_broadcast(gpr_cv* cv) { + GPR_ASSERT(pthread_cond_broadcast(cv) == 0); } /*----------------------------------------*/ -void -gpr_once_init (gpr_once * once, void (*init_function) (void)) -{ - GPR_ASSERT (pthread_once (once, init_function) == 0); +void gpr_once_init(gpr_once* once, void (*init_function)(void)) { + GPR_ASSERT(pthread_once(once, init_function) == 0); } #endif /* GRP_POSIX_SYNC */ diff --git a/src/core/support/sync_win32.c b/src/core/support/sync_win32.c index 9cfcad9fe7e..69dd46399a6 100644 --- a/src/core/support/sync_win32.c +++ b/src/core/support/sync_win32.c @@ -41,126 +41,88 @@ #include #include -void -gpr_mu_init (gpr_mu * mu) -{ - InitializeCriticalSection (&mu->cs); +void gpr_mu_init(gpr_mu *mu) { + InitializeCriticalSection(&mu->cs); mu->locked = 0; } -void -gpr_mu_destroy (gpr_mu * mu) -{ - DeleteCriticalSection (&mu->cs); -} +void gpr_mu_destroy(gpr_mu *mu) { DeleteCriticalSection(&mu->cs); } -void -gpr_mu_lock (gpr_mu * mu) -{ - EnterCriticalSection (&mu->cs); - GPR_ASSERT (!mu->locked); +void gpr_mu_lock(gpr_mu *mu) { + EnterCriticalSection(&mu->cs); + GPR_ASSERT(!mu->locked); mu->locked = 1; } -void -gpr_mu_unlock (gpr_mu * mu) -{ +void gpr_mu_unlock(gpr_mu *mu) { mu->locked = 0; - LeaveCriticalSection (&mu->cs); + LeaveCriticalSection(&mu->cs); } -int -gpr_mu_trylock (gpr_mu * mu) -{ - int result = TryEnterCriticalSection (&mu->cs); - if (result) - { - if (mu->locked) - { /* This thread already holds the lock. */ - LeaveCriticalSection (&mu->cs); /* Decrement lock count. */ - result = 0; /* Indicate failure */ - } - mu->locked = 1; +int gpr_mu_trylock(gpr_mu *mu) { + int result = TryEnterCriticalSection(&mu->cs); + if (result) { + if (mu->locked) { /* This thread already holds the lock. */ + LeaveCriticalSection(&mu->cs); /* Decrement lock count. */ + result = 0; /* Indicate failure */ } + mu->locked = 1; + } return result; } /*----------------------------------------*/ -void -gpr_cv_init (gpr_cv * cv) -{ - InitializeConditionVariable (cv); -} +void gpr_cv_init(gpr_cv *cv) { InitializeConditionVariable(cv); } -void -gpr_cv_destroy (gpr_cv * cv) -{ +void gpr_cv_destroy(gpr_cv *cv) { /* Condition variables don't need destruction in Win32. */ } -int -gpr_cv_wait (gpr_cv * cv, gpr_mu * mu, gpr_timespec abs_deadline) -{ +int gpr_cv_wait(gpr_cv *cv, gpr_mu *mu, gpr_timespec abs_deadline) { int timeout = 0; DWORD timeout_max_ms; mu->locked = 0; - if (gpr_time_cmp (abs_deadline, gpr_inf_future (abs_deadline.clock_type)) == 0) - { - SleepConditionVariableCS (cv, &mu->cs, INFINITE); - } - else - { - gpr_timespec now = gpr_now (abs_deadline.clock_type); - gpr_int64 now_ms = (gpr_int64) now.tv_sec * 1000 + now.tv_nsec / 1000000; - gpr_int64 deadline_ms = (gpr_int64) abs_deadline.tv_sec * 1000 + abs_deadline.tv_nsec / 1000000; - if (now_ms >= deadline_ms) - { - timeout = 1; - } - else - { - timeout_max_ms = (DWORD) min (deadline_ms - now_ms, INFINITE - 1); - timeout = (SleepConditionVariableCS (cv, &mu->cs, timeout_max_ms) == 0 && GetLastError () == ERROR_TIMEOUT); - } + if (gpr_time_cmp(abs_deadline, gpr_inf_future(abs_deadline.clock_type)) == + 0) { + SleepConditionVariableCS(cv, &mu->cs, INFINITE); + } else { + gpr_timespec now = gpr_now(abs_deadline.clock_type); + gpr_int64 now_ms = (gpr_int64)now.tv_sec * 1000 + now.tv_nsec / 1000000; + gpr_int64 deadline_ms = + (gpr_int64)abs_deadline.tv_sec * 1000 + abs_deadline.tv_nsec / 1000000; + if (now_ms >= deadline_ms) { + timeout = 1; + } else { + timeout_max_ms = (DWORD)min(deadline_ms - now_ms, INFINITE - 1); + timeout = (SleepConditionVariableCS(cv, &mu->cs, timeout_max_ms) == 0 && + GetLastError() == ERROR_TIMEOUT); } + } mu->locked = 1; return timeout; } -void -gpr_cv_signal (gpr_cv * cv) -{ - WakeConditionVariable (cv); -} +void gpr_cv_signal(gpr_cv *cv) { WakeConditionVariable(cv); } -void -gpr_cv_broadcast (gpr_cv * cv) -{ - WakeAllConditionVariable (cv); -} +void gpr_cv_broadcast(gpr_cv *cv) { WakeAllConditionVariable(cv); } /*----------------------------------------*/ static void *dummy; -struct run_once_func_arg -{ - void (*init_function) (void); +struct run_once_func_arg { + void (*init_function)(void); }; -static BOOL CALLBACK -run_once_func (gpr_once * once, void *v, void **pv) -{ +static BOOL CALLBACK run_once_func(gpr_once *once, void *v, void **pv) { struct run_once_func_arg *arg = v; - (*arg->init_function) (); + (*arg->init_function)(); return 1; } -void -gpr_once_init (gpr_once * once, void (*init_function) (void)) -{ +void gpr_once_init(gpr_once *once, void (*init_function)(void)) { struct run_once_func_arg arg; arg.init_function = init_function; - InitOnceExecuteOnce (once, run_once_func, &arg, &dummy); + InitOnceExecuteOnce(once, run_once_func, &arg, &dummy); } #endif /* GPR_WIN32 */ diff --git a/src/core/support/thd.c b/src/core/support/thd.c index 3023cc7802d..41daeb5d0e5 100644 --- a/src/core/support/thd.c +++ b/src/core/support/thd.c @@ -37,41 +37,28 @@ #include -enum -{ GPR_THD_JOINABLE = 1 }; +enum { GPR_THD_JOINABLE = 1 }; -gpr_thd_options -gpr_thd_options_default (void) -{ +gpr_thd_options gpr_thd_options_default(void) { gpr_thd_options options; - memset (&options, 0, sizeof (options)); + memset(&options, 0, sizeof(options)); return options; } -void -gpr_thd_options_set_detached (gpr_thd_options * options) -{ +void gpr_thd_options_set_detached(gpr_thd_options* options) { options->flags &= ~GPR_THD_JOINABLE; } -void -gpr_thd_options_set_joinable (gpr_thd_options * options) -{ +void gpr_thd_options_set_joinable(gpr_thd_options* options) { options->flags |= GPR_THD_JOINABLE; } -int -gpr_thd_options_is_detached (const gpr_thd_options * options) -{ - if (!options) - return 1; +int gpr_thd_options_is_detached(const gpr_thd_options* options) { + if (!options) return 1; return (options->flags & GPR_THD_JOINABLE) == 0; } -int -gpr_thd_options_is_joinable (const gpr_thd_options * options) -{ - if (!options) - return 0; +int gpr_thd_options_is_joinable(const gpr_thd_options* options) { + if (!options) return 0; return (options->flags & GPR_THD_JOINABLE) == GPR_THD_JOINABLE; } diff --git a/src/core/support/thd_posix.c b/src/core/support/thd_posix.c index 0091d3a289e..c36d94d044d 100644 --- a/src/core/support/thd_posix.c +++ b/src/core/support/thd_posix.c @@ -45,61 +45,47 @@ #include #include -struct thd_arg -{ - void (*body) (void *arg); /* body of a thread */ - void *arg; /* argument to a thread */ +struct thd_arg { + void (*body)(void *arg); /* body of a thread */ + void *arg; /* argument to a thread */ }; /* Body of every thread started via gpr_thd_new. */ -static void * -thread_body (void *v) -{ - struct thd_arg a = *(struct thd_arg *) v; - gpr_free (v); - (*a.body) (a.arg); +static void *thread_body(void *v) { + struct thd_arg a = *(struct thd_arg *)v; + gpr_free(v); + (*a.body)(a.arg); return NULL; } -int -gpr_thd_new (gpr_thd_id * t, void (*thd_body) (void *arg), void *arg, const gpr_thd_options * options) -{ +int gpr_thd_new(gpr_thd_id *t, void (*thd_body)(void *arg), void *arg, + const gpr_thd_options *options) { int thread_started; pthread_attr_t attr; pthread_t p; - struct thd_arg *a = gpr_malloc (sizeof (*a)); + struct thd_arg *a = gpr_malloc(sizeof(*a)); a->body = thd_body; a->arg = arg; - GPR_ASSERT (pthread_attr_init (&attr) == 0); - if (gpr_thd_options_is_detached (options)) - { - GPR_ASSERT (pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED) == 0); - } - else - { - GPR_ASSERT (pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_JOINABLE) == 0); - } - thread_started = (pthread_create (&p, &attr, &thread_body, a) == 0); - GPR_ASSERT (pthread_attr_destroy (&attr) == 0); - if (!thread_started) - { - gpr_free (a); - } - *t = (gpr_thd_id) p; + GPR_ASSERT(pthread_attr_init(&attr) == 0); + if (gpr_thd_options_is_detached(options)) { + GPR_ASSERT(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) == + 0); + } else { + GPR_ASSERT(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE) == + 0); + } + thread_started = (pthread_create(&p, &attr, &thread_body, a) == 0); + GPR_ASSERT(pthread_attr_destroy(&attr) == 0); + if (!thread_started) { + gpr_free(a); + } + *t = (gpr_thd_id)p; return thread_started; } -gpr_thd_id -gpr_thd_currentid (void) -{ - return (gpr_thd_id) pthread_self (); -} +gpr_thd_id gpr_thd_currentid(void) { return (gpr_thd_id)pthread_self(); } -void -gpr_thd_join (gpr_thd_id t) -{ - pthread_join ((pthread_t) t, NULL); -} +void gpr_thd_join(gpr_thd_id t) { pthread_join((pthread_t)t, NULL); } #endif /* GPR_POSIX_SYNC */ diff --git a/src/core/support/thd_win32.c b/src/core/support/thd_win32.c index ffb5be30282..a9db180c1b0 100644 --- a/src/core/support/thd_win32.c +++ b/src/core/support/thd_win32.c @@ -50,91 +50,68 @@ #error "Unknown compiler - please file a bug report" #endif -struct thd_info -{ - void (*body) (void *arg); /* body of a thread */ - void *arg; /* argument to a thread */ - HANDLE join_event; /* if joinable, the join event */ - int joinable; /* true if not detached */ +struct thd_info { + void (*body)(void *arg); /* body of a thread */ + void *arg; /* argument to a thread */ + HANDLE join_event; /* if joinable, the join event */ + int joinable; /* true if not detached */ }; static thread_local struct thd_info *g_thd_info; /* Destroys a thread info */ -static void -destroy_thread (struct thd_info *t) -{ - if (t->joinable) - CloseHandle (t->join_event); - gpr_free (t); +static void destroy_thread(struct thd_info *t) { + if (t->joinable) CloseHandle(t->join_event); + gpr_free(t); } /* Body of every thread started via gpr_thd_new. */ -static DWORD WINAPI -thread_body (void *v) -{ - g_thd_info = (struct thd_info *) v; - g_thd_info->body (g_thd_info->arg); - if (g_thd_info->joinable) - { - BOOL ret = SetEvent (g_thd_info->join_event); - GPR_ASSERT (ret); - } - else - { - destroy_thread (g_thd_info); - } +static DWORD WINAPI thread_body(void *v) { + g_thd_info = (struct thd_info *)v; + g_thd_info->body(g_thd_info->arg); + if (g_thd_info->joinable) { + BOOL ret = SetEvent(g_thd_info->join_event); + GPR_ASSERT(ret); + } else { + destroy_thread(g_thd_info); + } return 0; } -int -gpr_thd_new (gpr_thd_id * t, void (*thd_body) (void *arg), void *arg, const gpr_thd_options * options) -{ +int gpr_thd_new(gpr_thd_id *t, void (*thd_body)(void *arg), void *arg, + const gpr_thd_options *options) { HANDLE handle; - struct thd_info *info = gpr_malloc (sizeof (*info)); + struct thd_info *info = gpr_malloc(sizeof(*info)); info->body = thd_body; info->arg = arg; *t = 0; - if (gpr_thd_options_is_joinable (options)) - { - info->joinable = 1; - info->join_event = CreateEvent (NULL, FALSE, FALSE, NULL); - if (info->join_event == NULL) - { - gpr_free (info); - return 0; - } - } - else - { - info->joinable = 0; - } - handle = CreateThread (NULL, 64 * 1024, thread_body, info, 0, NULL); - if (handle == NULL) - { - destroy_thread (info); - } - else - { - *t = (gpr_thd_id) info; - CloseHandle (handle); + if (gpr_thd_options_is_joinable(options)) { + info->joinable = 1; + info->join_event = CreateEvent(NULL, FALSE, FALSE, NULL); + if (info->join_event == NULL) { + gpr_free(info); + return 0; } + } else { + info->joinable = 0; + } + handle = CreateThread(NULL, 64 * 1024, thread_body, info, 0, NULL); + if (handle == NULL) { + destroy_thread(info); + } else { + *t = (gpr_thd_id)info; + CloseHandle(handle); + } return handle != NULL; } -gpr_thd_id -gpr_thd_currentid (void) -{ - return (gpr_thd_id) g_thd_info; -} +gpr_thd_id gpr_thd_currentid(void) { return (gpr_thd_id)g_thd_info; } -void -gpr_thd_join (gpr_thd_id t) -{ - struct thd_info *info = (struct thd_info *) t; - DWORD ret = WaitForSingleObject (info->join_event, INFINITE); - GPR_ASSERT (ret == WAIT_OBJECT_0); - destroy_thread (info); +void gpr_thd_join(gpr_thd_id t) { + struct thd_info *info = (struct thd_info *)t; + DWORD ret = WaitForSingleObject(info->join_event, INFINITE); + GPR_ASSERT(ret == WAIT_OBJECT_0); + destroy_thread(info); } #endif /* GPR_WIN32 */ diff --git a/src/core/support/time.c b/src/core/support/time.c index c6fdeaee0b6..929adac918c 100644 --- a/src/core/support/time.c +++ b/src/core/support/time.c @@ -39,28 +39,21 @@ #include #include -int -gpr_time_cmp (gpr_timespec a, gpr_timespec b) -{ +int gpr_time_cmp(gpr_timespec a, gpr_timespec b) { int cmp = (a.tv_sec > b.tv_sec) - (a.tv_sec < b.tv_sec); - GPR_ASSERT (a.clock_type == b.clock_type); - if (cmp == 0) - { - cmp = (a.tv_nsec > b.tv_nsec) - (a.tv_nsec < b.tv_nsec); - } + GPR_ASSERT(a.clock_type == b.clock_type); + if (cmp == 0) { + cmp = (a.tv_nsec > b.tv_nsec) - (a.tv_nsec < b.tv_nsec); + } return cmp; } -gpr_timespec -gpr_time_min (gpr_timespec a, gpr_timespec b) -{ - return gpr_time_cmp (a, b) < 0 ? a : b; +gpr_timespec gpr_time_min(gpr_timespec a, gpr_timespec b) { + return gpr_time_cmp(a, b) < 0 ? a : b; } -gpr_timespec -gpr_time_max (gpr_timespec a, gpr_timespec b) -{ - return gpr_time_cmp (a, b) > 0 ? a : b; +gpr_timespec gpr_time_max(gpr_timespec a, gpr_timespec b) { + return gpr_time_cmp(a, b) > 0 ? a : b; } /* There's no standard TIME_T_MIN and TIME_T_MAX, so we construct them. The @@ -79,9 +72,7 @@ gpr_time_max (gpr_timespec a, gpr_timespec b) ((t)(TYPE_IS_SIGNED(t) ? (TOP_BIT_OF_TYPE(t) - 1) \ : ((TOP_BIT_OF_TYPE(t) - 1) << 1) + 1)) -gpr_timespec -gpr_time_0 (gpr_clock_type type) -{ +gpr_timespec gpr_time_0(gpr_clock_type type) { gpr_timespec out; out.tv_sec = 0; out.tv_nsec = 0; @@ -89,21 +80,17 @@ gpr_time_0 (gpr_clock_type type) return out; } -gpr_timespec -gpr_inf_future (gpr_clock_type type) -{ +gpr_timespec gpr_inf_future(gpr_clock_type type) { gpr_timespec out; - out.tv_sec = TYPE_MAX (time_t); + out.tv_sec = TYPE_MAX(time_t); out.tv_nsec = 0; out.clock_type = type; return out; } -gpr_timespec -gpr_inf_past (gpr_clock_type type) -{ +gpr_timespec gpr_inf_past(gpr_clock_type type) { gpr_timespec out; - out.tv_sec = TYPE_MIN (time_t); + out.tv_sec = TYPE_MIN(time_t); out.tv_nsec = 0; out.clock_type = type; return out; @@ -112,318 +99,222 @@ gpr_inf_past (gpr_clock_type type) /* TODO(ctiller): consider merging _nanos, _micros, _millis into a single function for maintainability. Similarly for _seconds, _minutes, and _hours */ -gpr_timespec -gpr_time_from_nanos (long ns, gpr_clock_type type) -{ +gpr_timespec gpr_time_from_nanos(long ns, gpr_clock_type type) { gpr_timespec result; result.clock_type = type; - if (ns == LONG_MAX) - { - result = gpr_inf_future (type); - } - else if (ns == LONG_MIN) - { - result = gpr_inf_past (type); - } - else if (ns >= 0) - { - result.tv_sec = ns / GPR_NS_PER_SEC; - result.tv_nsec = (int) (ns - result.tv_sec * GPR_NS_PER_SEC); - } - else - { - /* Calculation carefully formulated to avoid any possible under/overflow. */ - result.tv_sec = (-(999999999 - (ns + GPR_NS_PER_SEC)) / GPR_NS_PER_SEC) - 1; - result.tv_nsec = (int) (ns - result.tv_sec * GPR_NS_PER_SEC); - } + if (ns == LONG_MAX) { + result = gpr_inf_future(type); + } else if (ns == LONG_MIN) { + result = gpr_inf_past(type); + } else if (ns >= 0) { + result.tv_sec = ns / GPR_NS_PER_SEC; + result.tv_nsec = (int)(ns - result.tv_sec * GPR_NS_PER_SEC); + } else { + /* Calculation carefully formulated to avoid any possible under/overflow. */ + result.tv_sec = (-(999999999 - (ns + GPR_NS_PER_SEC)) / GPR_NS_PER_SEC) - 1; + result.tv_nsec = (int)(ns - result.tv_sec * GPR_NS_PER_SEC); + } return result; } -gpr_timespec -gpr_time_from_micros (long us, gpr_clock_type type) -{ +gpr_timespec gpr_time_from_micros(long us, gpr_clock_type type) { gpr_timespec result; result.clock_type = type; - if (us == LONG_MAX) - { - result = gpr_inf_future (type); - } - else if (us == LONG_MIN) - { - result = gpr_inf_past (type); - } - else if (us >= 0) - { - result.tv_sec = us / 1000000; - result.tv_nsec = (int) ((us - result.tv_sec * 1000000) * 1000); - } - else - { - /* Calculation carefully formulated to avoid any possible under/overflow. */ - result.tv_sec = (-(999999 - (us + 1000000)) / 1000000) - 1; - result.tv_nsec = (int) ((us - result.tv_sec * 1000000) * 1000); - } + if (us == LONG_MAX) { + result = gpr_inf_future(type); + } else if (us == LONG_MIN) { + result = gpr_inf_past(type); + } else if (us >= 0) { + result.tv_sec = us / 1000000; + result.tv_nsec = (int)((us - result.tv_sec * 1000000) * 1000); + } else { + /* Calculation carefully formulated to avoid any possible under/overflow. */ + result.tv_sec = (-(999999 - (us + 1000000)) / 1000000) - 1; + result.tv_nsec = (int)((us - result.tv_sec * 1000000) * 1000); + } return result; } -gpr_timespec -gpr_time_from_millis (long ms, gpr_clock_type type) -{ +gpr_timespec gpr_time_from_millis(long ms, gpr_clock_type type) { gpr_timespec result; result.clock_type = type; - if (ms == LONG_MAX) - { - result = gpr_inf_future (type); - } - else if (ms == LONG_MIN) - { - result = gpr_inf_past (type); - } - else if (ms >= 0) - { - result.tv_sec = ms / 1000; - result.tv_nsec = (int) ((ms - result.tv_sec * 1000) * 1000000); - } - else - { - /* Calculation carefully formulated to avoid any possible under/overflow. */ - result.tv_sec = (-(999 - (ms + 1000)) / 1000) - 1; - result.tv_nsec = (int) ((ms - result.tv_sec * 1000) * 1000000); - } + if (ms == LONG_MAX) { + result = gpr_inf_future(type); + } else if (ms == LONG_MIN) { + result = gpr_inf_past(type); + } else if (ms >= 0) { + result.tv_sec = ms / 1000; + result.tv_nsec = (int)((ms - result.tv_sec * 1000) * 1000000); + } else { + /* Calculation carefully formulated to avoid any possible under/overflow. */ + result.tv_sec = (-(999 - (ms + 1000)) / 1000) - 1; + result.tv_nsec = (int)((ms - result.tv_sec * 1000) * 1000000); + } return result; } -gpr_timespec -gpr_time_from_seconds (long s, gpr_clock_type type) -{ +gpr_timespec gpr_time_from_seconds(long s, gpr_clock_type type) { gpr_timespec result; result.clock_type = type; - if (s == LONG_MAX) - { - result = gpr_inf_future (type); - } - else if (s == LONG_MIN) - { - result = gpr_inf_past (type); - } - else - { - result.tv_sec = s; - result.tv_nsec = 0; - } + if (s == LONG_MAX) { + result = gpr_inf_future(type); + } else if (s == LONG_MIN) { + result = gpr_inf_past(type); + } else { + result.tv_sec = s; + result.tv_nsec = 0; + } return result; } -gpr_timespec -gpr_time_from_minutes (long m, gpr_clock_type type) -{ +gpr_timespec gpr_time_from_minutes(long m, gpr_clock_type type) { gpr_timespec result; result.clock_type = type; - if (m >= LONG_MAX / 60) - { - result = gpr_inf_future (type); - } - else if (m <= LONG_MIN / 60) - { - result = gpr_inf_past (type); - } - else - { - result.tv_sec = m * 60; - result.tv_nsec = 0; - } + if (m >= LONG_MAX / 60) { + result = gpr_inf_future(type); + } else if (m <= LONG_MIN / 60) { + result = gpr_inf_past(type); + } else { + result.tv_sec = m * 60; + result.tv_nsec = 0; + } return result; } -gpr_timespec -gpr_time_from_hours (long h, gpr_clock_type type) -{ +gpr_timespec gpr_time_from_hours(long h, gpr_clock_type type) { gpr_timespec result; result.clock_type = type; - if (h >= LONG_MAX / 3600) - { - result = gpr_inf_future (type); - } - else if (h <= LONG_MIN / 3600) - { - result = gpr_inf_past (type); - } - else - { - result.tv_sec = h * 3600; - result.tv_nsec = 0; - } + if (h >= LONG_MAX / 3600) { + result = gpr_inf_future(type); + } else if (h <= LONG_MIN / 3600) { + result = gpr_inf_past(type); + } else { + result.tv_sec = h * 3600; + result.tv_nsec = 0; + } return result; } -gpr_timespec -gpr_time_add (gpr_timespec a, gpr_timespec b) -{ +gpr_timespec gpr_time_add(gpr_timespec a, gpr_timespec b) { gpr_timespec sum; int inc = 0; - GPR_ASSERT (b.clock_type == GPR_TIMESPAN); + GPR_ASSERT(b.clock_type == GPR_TIMESPAN); sum.clock_type = a.clock_type; sum.tv_nsec = a.tv_nsec + b.tv_nsec; - if (sum.tv_nsec >= GPR_NS_PER_SEC) - { - sum.tv_nsec -= GPR_NS_PER_SEC; - inc++; - } - if (a.tv_sec == TYPE_MAX (time_t) || a.tv_sec == TYPE_MIN (time_t)) - { - sum = a; - } - else if (b.tv_sec == TYPE_MAX (time_t) || (b.tv_sec >= 0 && a.tv_sec >= TYPE_MAX (time_t) - b.tv_sec)) - { - sum = gpr_inf_future (sum.clock_type); - } - else if (b.tv_sec == TYPE_MIN (time_t) || (b.tv_sec <= 0 && a.tv_sec <= TYPE_MIN (time_t) - b.tv_sec)) - { - sum = gpr_inf_past (sum.clock_type); - } - else - { - sum.tv_sec = a.tv_sec + b.tv_sec; - if (inc != 0 && sum.tv_sec == TYPE_MAX (time_t) - 1) - { - sum = gpr_inf_future (sum.clock_type); - } - else - { - sum.tv_sec += inc; - } - } + if (sum.tv_nsec >= GPR_NS_PER_SEC) { + sum.tv_nsec -= GPR_NS_PER_SEC; + inc++; + } + if (a.tv_sec == TYPE_MAX(time_t) || a.tv_sec == TYPE_MIN(time_t)) { + sum = a; + } else if (b.tv_sec == TYPE_MAX(time_t) || + (b.tv_sec >= 0 && a.tv_sec >= TYPE_MAX(time_t) - b.tv_sec)) { + sum = gpr_inf_future(sum.clock_type); + } else if (b.tv_sec == TYPE_MIN(time_t) || + (b.tv_sec <= 0 && a.tv_sec <= TYPE_MIN(time_t) - b.tv_sec)) { + sum = gpr_inf_past(sum.clock_type); + } else { + sum.tv_sec = a.tv_sec + b.tv_sec; + if (inc != 0 && sum.tv_sec == TYPE_MAX(time_t) - 1) { + sum = gpr_inf_future(sum.clock_type); + } else { + sum.tv_sec += inc; + } + } return sum; } -gpr_timespec -gpr_time_sub (gpr_timespec a, gpr_timespec b) -{ +gpr_timespec gpr_time_sub(gpr_timespec a, gpr_timespec b) { gpr_timespec diff; int dec = 0; - if (b.clock_type == GPR_TIMESPAN) - { - diff.clock_type = a.clock_type; - } - else - { - GPR_ASSERT (a.clock_type == b.clock_type); - diff.clock_type = GPR_TIMESPAN; - } + if (b.clock_type == GPR_TIMESPAN) { + diff.clock_type = a.clock_type; + } else { + GPR_ASSERT(a.clock_type == b.clock_type); + diff.clock_type = GPR_TIMESPAN; + } diff.tv_nsec = a.tv_nsec - b.tv_nsec; - if (diff.tv_nsec < 0) - { - diff.tv_nsec += GPR_NS_PER_SEC; - dec++; - } - if (a.tv_sec == TYPE_MAX (time_t) || a.tv_sec == TYPE_MIN (time_t)) - { - diff = a; - } - else if (b.tv_sec == TYPE_MIN (time_t) || (b.tv_sec <= 0 && a.tv_sec >= TYPE_MAX (time_t) + b.tv_sec)) - { - diff = gpr_inf_future (GPR_CLOCK_REALTIME); - } - else if (b.tv_sec == TYPE_MAX (time_t) || (b.tv_sec >= 0 && a.tv_sec <= TYPE_MIN (time_t) + b.tv_sec)) - { - diff = gpr_inf_past (GPR_CLOCK_REALTIME); - } - else - { - diff.tv_sec = a.tv_sec - b.tv_sec; - if (dec != 0 && diff.tv_sec == TYPE_MIN (time_t) + 1) - { - diff = gpr_inf_past (GPR_CLOCK_REALTIME); - } - else - { - diff.tv_sec -= dec; - } - } + if (diff.tv_nsec < 0) { + diff.tv_nsec += GPR_NS_PER_SEC; + dec++; + } + if (a.tv_sec == TYPE_MAX(time_t) || a.tv_sec == TYPE_MIN(time_t)) { + diff = a; + } else if (b.tv_sec == TYPE_MIN(time_t) || + (b.tv_sec <= 0 && a.tv_sec >= TYPE_MAX(time_t) + b.tv_sec)) { + diff = gpr_inf_future(GPR_CLOCK_REALTIME); + } else if (b.tv_sec == TYPE_MAX(time_t) || + (b.tv_sec >= 0 && a.tv_sec <= TYPE_MIN(time_t) + b.tv_sec)) { + diff = gpr_inf_past(GPR_CLOCK_REALTIME); + } else { + diff.tv_sec = a.tv_sec - b.tv_sec; + if (dec != 0 && diff.tv_sec == TYPE_MIN(time_t) + 1) { + diff = gpr_inf_past(GPR_CLOCK_REALTIME); + } else { + diff.tv_sec -= dec; + } + } return diff; } -int -gpr_time_similar (gpr_timespec a, gpr_timespec b, gpr_timespec threshold) -{ +int gpr_time_similar(gpr_timespec a, gpr_timespec b, gpr_timespec threshold) { int cmp_ab; - GPR_ASSERT (a.clock_type == b.clock_type); - GPR_ASSERT (threshold.clock_type == GPR_TIMESPAN); + GPR_ASSERT(a.clock_type == b.clock_type); + GPR_ASSERT(threshold.clock_type == GPR_TIMESPAN); - cmp_ab = gpr_time_cmp (a, b); - if (cmp_ab == 0) - return 1; - if (cmp_ab < 0) - { - return gpr_time_cmp (gpr_time_sub (b, a), threshold) <= 0; - } - else - { - return gpr_time_cmp (gpr_time_sub (a, b), threshold) <= 0; - } + cmp_ab = gpr_time_cmp(a, b); + if (cmp_ab == 0) return 1; + if (cmp_ab < 0) { + return gpr_time_cmp(gpr_time_sub(b, a), threshold) <= 0; + } else { + return gpr_time_cmp(gpr_time_sub(a, b), threshold) <= 0; + } } -gpr_int32 -gpr_time_to_millis (gpr_timespec t) -{ - if (t.tv_sec >= 2147483) - { - if (t.tv_sec == 2147483 && t.tv_nsec < 648 * GPR_NS_PER_MS) - { - return 2147483 * GPR_MS_PER_SEC + t.tv_nsec / GPR_NS_PER_MS; - } - return 2147483647; - } - else if (t.tv_sec <= -2147483) - { - /* TODO(ctiller): correct handling here (it's so far in the past do we - care?) */ - return -2147483647; - } - else - { - return (gpr_int32) (t.tv_sec * GPR_MS_PER_SEC + t.tv_nsec / GPR_NS_PER_MS); - } +gpr_int32 gpr_time_to_millis(gpr_timespec t) { + if (t.tv_sec >= 2147483) { + if (t.tv_sec == 2147483 && t.tv_nsec < 648 * GPR_NS_PER_MS) { + return 2147483 * GPR_MS_PER_SEC + t.tv_nsec / GPR_NS_PER_MS; + } + return 2147483647; + } else if (t.tv_sec <= -2147483) { + /* TODO(ctiller): correct handling here (it's so far in the past do we + care?) */ + return -2147483647; + } else { + return (gpr_int32)(t.tv_sec * GPR_MS_PER_SEC + t.tv_nsec / GPR_NS_PER_MS); + } } -double -gpr_timespec_to_micros (gpr_timespec t) -{ - return (double) t.tv_sec * GPR_US_PER_SEC + t.tv_nsec * 1e-3; +double gpr_timespec_to_micros(gpr_timespec t) { + return (double)t.tv_sec * GPR_US_PER_SEC + t.tv_nsec * 1e-3; } -gpr_timespec -gpr_convert_clock_type (gpr_timespec t, gpr_clock_type clock_type) -{ - if (t.clock_type == clock_type) - { +gpr_timespec gpr_convert_clock_type(gpr_timespec t, gpr_clock_type clock_type) { + if (t.clock_type == clock_type) { + return t; + } + + if (t.tv_nsec == 0) { + if (t.tv_sec == TYPE_MAX(time_t)) { + t.clock_type = clock_type; return t; } - - if (t.tv_nsec == 0) - { - if (t.tv_sec == TYPE_MAX (time_t)) - { - t.clock_type = clock_type; - return t; - } - if (t.tv_sec == TYPE_MIN (time_t)) - { - t.clock_type = clock_type; - return t; - } + if (t.tv_sec == TYPE_MIN(time_t)) { + t.clock_type = clock_type; + return t; } + } - if (clock_type == GPR_TIMESPAN) - { - return gpr_time_sub (t, gpr_now (t.clock_type)); - } + if (clock_type == GPR_TIMESPAN) { + return gpr_time_sub(t, gpr_now(t.clock_type)); + } - if (t.clock_type == GPR_TIMESPAN) - { - return gpr_time_add (gpr_now (clock_type), t); - } + if (t.clock_type == GPR_TIMESPAN) { + return gpr_time_add(gpr_now(clock_type), t); + } - return gpr_time_add (gpr_now (clock_type), gpr_time_sub (t, gpr_now (t.clock_type))); + return gpr_time_add(gpr_now(clock_type), + gpr_time_sub(t, gpr_now(t.clock_type))); } diff --git a/src/core/support/time_posix.c b/src/core/support/time_posix.c index 34cbd4b3c88..dcecff0d05d 100644 --- a/src/core/support/time_posix.c +++ b/src/core/support/time_posix.c @@ -42,9 +42,7 @@ #include #include -static struct timespec -timespec_from_gpr (gpr_timespec gts) -{ +static struct timespec timespec_from_gpr(gpr_timespec gts) { struct timespec rv; rv.tv_sec = gts.tv_sec; rv.tv_nsec = gts.tv_nsec; @@ -52,40 +50,31 @@ timespec_from_gpr (gpr_timespec gts) } #if _POSIX_TIMERS > 0 -static gpr_timespec -gpr_from_timespec (struct timespec ts, gpr_clock_type clock) -{ +static gpr_timespec gpr_from_timespec(struct timespec ts, + gpr_clock_type clock) { gpr_timespec rv; rv.tv_sec = ts.tv_sec; - rv.tv_nsec = (int) ts.tv_nsec; + rv.tv_nsec = (int)ts.tv_nsec; rv.clock_type = clock; return rv; } /** maps gpr_clock_type --> clockid_t for clock_gettime */ -static clockid_t clockid_for_gpr_clock[] = { CLOCK_MONOTONIC, CLOCK_REALTIME }; +static clockid_t clockid_for_gpr_clock[] = {CLOCK_MONOTONIC, CLOCK_REALTIME}; -void -gpr_time_init (void) -{ -} +void gpr_time_init(void) {} -gpr_timespec -gpr_now (gpr_clock_type clock) -{ +gpr_timespec gpr_now(gpr_clock_type clock) { struct timespec now; - GPR_ASSERT (clock != GPR_TIMESPAN); - if (clock == GPR_CLOCK_PRECISE) - { - gpr_timespec ret; - gpr_precise_clock_now (&ret); - return ret; - } - else - { - clock_gettime (clockid_for_gpr_clock[clock], &now); - return gpr_from_timespec (now, clock); - } + GPR_ASSERT(clock != GPR_TIMESPAN); + if (clock == GPR_CLOCK_PRECISE) { + gpr_timespec ret; + gpr_precise_clock_now(&ret); + return ret; + } else { + clock_gettime(clockid_for_gpr_clock[clock], &now); + return gpr_from_timespec(now, clock); + } } #else /* For some reason Apple's OSes haven't implemented clock_gettime. */ @@ -97,71 +86,61 @@ gpr_now (gpr_clock_type clock) static double g_time_scale; static uint64_t g_time_start; -void -gpr_time_init (void) -{ - mach_timebase_info_data_t tb = { 0, 1 }; - mach_timebase_info (&tb); +void gpr_time_init(void) { + mach_timebase_info_data_t tb = {0, 1}; + mach_timebase_info(&tb); g_time_scale = tb.numer; g_time_scale /= tb.denom; - g_time_start = mach_absolute_time (); + g_time_start = mach_absolute_time(); } -gpr_timespec -gpr_now (gpr_clock_type clock) -{ +gpr_timespec gpr_now(gpr_clock_type clock) { gpr_timespec now; struct timeval now_tv; double now_dbl; now.clock_type = clock; - switch (clock) - { + switch (clock) { case GPR_CLOCK_REALTIME: - gettimeofday (&now_tv, NULL); + gettimeofday(&now_tv, NULL); now.tv_sec = now_tv.tv_sec; now.tv_nsec = now_tv.tv_usec * 1000; break; case GPR_CLOCK_MONOTONIC: - now_dbl = (mach_absolute_time () - g_time_start) * g_time_scale; - now.tv_sec = (time_t) (now_dbl * 1e-9); - now.tv_nsec = (int) (now_dbl - ((double) now.tv_sec) * 1e9); + now_dbl = (mach_absolute_time() - g_time_start) * g_time_scale; + now.tv_sec = (time_t)(now_dbl * 1e-9); + now.tv_nsec = (int)(now_dbl - ((double)now.tv_sec) * 1e9); break; case GPR_CLOCK_PRECISE: - gpr_precise_clock_now (&now); + gpr_precise_clock_now(&now); break; case GPR_TIMESPAN: - abort (); - } + abort(); + } return now; } #endif -void -gpr_sleep_until (gpr_timespec until) -{ +void gpr_sleep_until(gpr_timespec until) { gpr_timespec now; gpr_timespec delta; struct timespec delta_ts; - for (;;) - { - /* We could simplify by using clock_nanosleep instead, but it might be - * slightly less portable. */ - now = gpr_now (until.clock_type); - if (gpr_time_cmp (until, now) <= 0) - { - return; - } - - delta = gpr_time_sub (until, now); - delta_ts = timespec_from_gpr (delta); - if (nanosleep (&delta_ts, NULL) == 0) - { - break; - } + for (;;) { + /* We could simplify by using clock_nanosleep instead, but it might be + * slightly less portable. */ + now = gpr_now(until.clock_type); + if (gpr_time_cmp(until, now) <= 0) { + return; + } + + delta = gpr_time_sub(until, now); + delta_ts = timespec_from_gpr(delta); + if (nanosleep(&delta_ts, NULL) == 0) { + break; } + } } #endif /* GPR_POSIX_TIME */ diff --git a/src/core/support/time_precise.h b/src/core/support/time_precise.h index 81b3049b729..a72d37e2f14 100644 --- a/src/core/support/time_precise.h +++ b/src/core/support/time_precise.h @@ -40,64 +40,52 @@ #ifdef GRPC_TIMERS_RDTSC #if defined(__i386__) -static void -gpr_get_cycle_counter (long long int *clk) -{ +static void gpr_get_cycle_counter(long long int *clk) { long long int ret; - __asm__ volatile ("rdtsc":"=A" (ret)); + __asm__ volatile("rdtsc" : "=A"(ret)); *clk = ret; } // ---------------------------------------------------------------- #elif defined(__x86_64__) || defined(__amd64__) -static void -gpr_get_cycle_counter (long long int *clk) -{ +static void gpr_get_cycle_counter(long long int *clk) { unsigned long long low, high; - __asm__ volatile ("rdtsc":"=a" (low), "=d" (high)); + __asm__ volatile("rdtsc" : "=a"(low), "=d"(high)); *clk = (high << 32) | low; } #endif static gpr_once precise_clock_init = GPR_ONCE_INIT; static long long cycles_per_second = 0; -static void -gpr_precise_clock_init () -{ - time_t start = time (NULL); +static void gpr_precise_clock_init() { + time_t start = time(NULL); gpr_precise_clock start_cycle; gpr_precise_clock end_cycle; - while (time (NULL) == start) + while (time(NULL) == start) ; - gpr_get_cycle_counter (&start_cycle); - while (time (NULL) == start + 1) + gpr_get_cycle_counter(&start_cycle); + while (time(NULL) == start + 1) ; - gpr_get_cycle_counter (&end_cycle); + gpr_get_cycle_counter(&end_cycle); cycles_per_second = end_cycle - start_cycle; } -static double -grpc_precise_clock_scaling_factor () -{ - gpr_once_init (&precise_clock_init, grpc_precise_clock_init); +static double grpc_precise_clock_scaling_factor() { + gpr_once_init(&precise_clock_init, grpc_precise_clock_init); return 1e6 / cycles_per_second; } -static void -gpr_precise_clock_now (gpr_timespec * clk) -{ +static void gpr_precise_clock_now(gpr_timespec *clk) { long long int counter; - gpr_get_cycle_counter (&counter); + gpr_get_cycle_counter(&counter); clk->clock = GPR_CLOCK_REALTIME; clk->tv_sec = counter / cycles_per_second; clk->tv_nsec = counter % cycles_per_second; } -#else /* GRPC_TIMERS_RDTSC */ -static void -gpr_precise_clock_now (gpr_timespec * clk) -{ - *clk = gpr_now (GPR_CLOCK_REALTIME); +#else /* GRPC_TIMERS_RDTSC */ +static void gpr_precise_clock_now(gpr_timespec* clk) { + *clk = gpr_now(GPR_CLOCK_REALTIME); clk->clock_type = GPR_CLOCK_PRECISE; } #endif /* GRPC_TIMERS_RDTSC */ diff --git a/src/core/support/time_win32.c b/src/core/support/time_win32.c index 5af49fe5cda..f794855429b 100644 --- a/src/core/support/time_win32.c +++ b/src/core/support/time_win32.c @@ -44,64 +44,56 @@ static LARGE_INTEGER g_start_time; static double g_time_scale; -void -gpr_time_init (void) -{ +void gpr_time_init(void) { LARGE_INTEGER frequency; - QueryPerformanceFrequency (&frequency); - QueryPerformanceCounter (&g_start_time); + QueryPerformanceFrequency(&frequency); + QueryPerformanceCounter(&g_start_time); g_time_scale = 1.0 / frequency.QuadPart; } -gpr_timespec -gpr_now (gpr_clock_type clock) -{ +gpr_timespec gpr_now(gpr_clock_type clock) { gpr_timespec now_tv; struct _timeb now_tb; LARGE_INTEGER timestamp; double now_dbl; now_tv.clock_type = clock; - switch (clock) - { + switch (clock) { case GPR_CLOCK_REALTIME: - _ftime_s (&now_tb); + _ftime_s(&now_tb); now_tv.tv_sec = now_tb.time; now_tv.tv_nsec = now_tb.millitm * 1000000; break; case GPR_CLOCK_MONOTONIC: - QueryPerformanceCounter (×tamp); + QueryPerformanceCounter(×tamp); now_dbl = (timestamp.QuadPart - g_start_time.QuadPart) * g_time_scale; - now_tv.tv_sec = (time_t) now_dbl; - now_tv.tv_nsec = (int) ((now_dbl - (double) now_tv.tv_sec) * 1e9); + now_tv.tv_sec = (time_t)now_dbl; + now_tv.tv_nsec = (int)((now_dbl - (double)now_tv.tv_sec) * 1e9); break; case GPR_CLOCK_PRECISE: - gpr_precise_clock_now (&now_tv); + gpr_precise_clock_now(&now_tv); break; - } + } return now_tv; } -void -gpr_sleep_until (gpr_timespec until) -{ +void gpr_sleep_until(gpr_timespec until) { gpr_timespec now; gpr_timespec delta; DWORD sleep_millis; - for (;;) - { - /* We could simplify by using clock_nanosleep instead, but it might be - * slightly less portable. */ - now = gpr_now (until.clock_type); - if (gpr_time_cmp (until, now) <= 0) - { - return; - } - - delta = gpr_time_sub (until, now); - sleep_millis = (DWORD) delta.tv_sec * GPR_MS_PER_SEC + delta.tv_nsec / GPR_NS_PER_MS; - Sleep (sleep_millis); + for (;;) { + /* We could simplify by using clock_nanosleep instead, but it might be + * slightly less portable. */ + now = gpr_now(until.clock_type); + if (gpr_time_cmp(until, now) <= 0) { + return; } + + delta = gpr_time_sub(until, now); + sleep_millis = + (DWORD)delta.tv_sec * GPR_MS_PER_SEC + delta.tv_nsec / GPR_NS_PER_MS; + Sleep(sleep_millis); + } } #endif /* GPR_WIN32 */ diff --git a/src/core/support/tls_pthread.c b/src/core/support/tls_pthread.c index d24b2bc114f..2d28226fc47 100644 --- a/src/core/support/tls_pthread.c +++ b/src/core/support/tls_pthread.c @@ -37,10 +37,8 @@ #include -gpr_intptr -gpr_tls_set (struct gpr_pthread_thread_local * tls, gpr_intptr value) -{ - GPR_ASSERT (0 == pthread_setspecific (tls->key, (void *) value)); +gpr_intptr gpr_tls_set(struct gpr_pthread_thread_local *tls, gpr_intptr value) { + GPR_ASSERT(0 == pthread_setspecific(tls->key, (void *)value)); return value; } diff --git a/src/core/surface/byte_buffer.c b/src/core/surface/byte_buffer.c index c26e3e13174..a930949f2d4 100644 --- a/src/core/surface/byte_buffer.c +++ b/src/core/surface/byte_buffer.c @@ -35,79 +35,66 @@ #include #include -grpc_byte_buffer * -grpc_raw_byte_buffer_create (gpr_slice * slices, size_t nslices) -{ - return grpc_raw_compressed_byte_buffer_create (slices, nslices, GRPC_COMPRESS_NONE); +grpc_byte_buffer *grpc_raw_byte_buffer_create(gpr_slice *slices, + size_t nslices) { + return grpc_raw_compressed_byte_buffer_create(slices, nslices, + GRPC_COMPRESS_NONE); } -grpc_byte_buffer * -grpc_raw_compressed_byte_buffer_create (gpr_slice * slices, size_t nslices, grpc_compression_algorithm compression) -{ +grpc_byte_buffer *grpc_raw_compressed_byte_buffer_create( + gpr_slice *slices, size_t nslices, grpc_compression_algorithm compression) { size_t i; - grpc_byte_buffer *bb = malloc (sizeof (grpc_byte_buffer)); + grpc_byte_buffer *bb = malloc(sizeof(grpc_byte_buffer)); bb->type = GRPC_BB_RAW; bb->data.raw.compression = compression; - gpr_slice_buffer_init (&bb->data.raw.slice_buffer); - for (i = 0; i < nslices; i++) - { - gpr_slice_ref (slices[i]); - gpr_slice_buffer_add (&bb->data.raw.slice_buffer, slices[i]); - } + gpr_slice_buffer_init(&bb->data.raw.slice_buffer); + for (i = 0; i < nslices; i++) { + gpr_slice_ref(slices[i]); + gpr_slice_buffer_add(&bb->data.raw.slice_buffer, slices[i]); + } return bb; } -grpc_byte_buffer * -grpc_raw_byte_buffer_from_reader (grpc_byte_buffer_reader * reader) -{ - grpc_byte_buffer *bb = malloc (sizeof (grpc_byte_buffer)); +grpc_byte_buffer *grpc_raw_byte_buffer_from_reader( + grpc_byte_buffer_reader *reader) { + grpc_byte_buffer *bb = malloc(sizeof(grpc_byte_buffer)); gpr_slice slice; bb->type = GRPC_BB_RAW; bb->data.raw.compression = GRPC_COMPRESS_NONE; - gpr_slice_buffer_init (&bb->data.raw.slice_buffer); + gpr_slice_buffer_init(&bb->data.raw.slice_buffer); - while (grpc_byte_buffer_reader_next (reader, &slice)) - { - gpr_slice_buffer_add (&bb->data.raw.slice_buffer, slice); - } + while (grpc_byte_buffer_reader_next(reader, &slice)) { + gpr_slice_buffer_add(&bb->data.raw.slice_buffer, slice); + } return bb; } -grpc_byte_buffer * -grpc_byte_buffer_copy (grpc_byte_buffer * bb) -{ - switch (bb->type) - { +grpc_byte_buffer *grpc_byte_buffer_copy(grpc_byte_buffer *bb) { + switch (bb->type) { case GRPC_BB_RAW: - return grpc_raw_byte_buffer_create (bb->data.raw.slice_buffer.slices, bb->data.raw.slice_buffer.count); - } - gpr_log (GPR_INFO, "should never get here"); - abort (); + return grpc_raw_byte_buffer_create(bb->data.raw.slice_buffer.slices, + bb->data.raw.slice_buffer.count); + } + gpr_log(GPR_INFO, "should never get here"); + abort(); return NULL; } -void -grpc_byte_buffer_destroy (grpc_byte_buffer * bb) -{ - if (!bb) - return; - switch (bb->type) - { +void grpc_byte_buffer_destroy(grpc_byte_buffer *bb) { + if (!bb) return; + switch (bb->type) { case GRPC_BB_RAW: - gpr_slice_buffer_destroy (&bb->data.raw.slice_buffer); + gpr_slice_buffer_destroy(&bb->data.raw.slice_buffer); break; - } - free (bb); + } + free(bb); } -size_t -grpc_byte_buffer_length (grpc_byte_buffer * bb) -{ - switch (bb->type) - { +size_t grpc_byte_buffer_length(grpc_byte_buffer *bb) { + switch (bb->type) { case GRPC_BB_RAW: return bb->data.raw.slice_buffer.length; - } - gpr_log (GPR_ERROR, "should never reach here"); - abort (); + } + gpr_log(GPR_ERROR, "should never reach here"); + abort(); } diff --git a/src/core/surface/byte_buffer_queue.c b/src/core/surface/byte_buffer_queue.c index 543da6a0006..e47dc4f4ce6 100644 --- a/src/core/surface/byte_buffer_queue.c +++ b/src/core/surface/byte_buffer_queue.c @@ -35,86 +35,63 @@ #include #include -static void -bba_destroy (grpc_bbq_array * array, size_t start_pos) -{ +static void bba_destroy(grpc_bbq_array *array, size_t start_pos) { size_t i; - for (i = start_pos; i < array->count; i++) - { - grpc_byte_buffer_destroy (array->data[i]); - } - gpr_free (array->data); + for (i = start_pos; i < array->count; i++) { + grpc_byte_buffer_destroy(array->data[i]); + } + gpr_free(array->data); } /* Append an operation to an array, expanding as needed */ -static void -bba_push (grpc_bbq_array * a, grpc_byte_buffer * buffer) -{ - if (a->count == a->capacity) - { - a->capacity = GPR_MAX (a->capacity * 2, 8); - a->data = gpr_realloc (a->data, sizeof (grpc_byte_buffer *) * a->capacity); - } +static void bba_push(grpc_bbq_array *a, grpc_byte_buffer *buffer) { + if (a->count == a->capacity) { + a->capacity = GPR_MAX(a->capacity * 2, 8); + a->data = gpr_realloc(a->data, sizeof(grpc_byte_buffer *) * a->capacity); + } a->data[a->count++] = buffer; } -void -grpc_bbq_destroy (grpc_byte_buffer_queue * q) -{ - bba_destroy (&q->filling, 0); - bba_destroy (&q->draining, q->drain_pos); +void grpc_bbq_destroy(grpc_byte_buffer_queue *q) { + bba_destroy(&q->filling, 0); + bba_destroy(&q->draining, q->drain_pos); } -int -grpc_bbq_empty (grpc_byte_buffer_queue * q) -{ +int grpc_bbq_empty(grpc_byte_buffer_queue *q) { return (q->drain_pos == q->draining.count && q->filling.count == 0); } -void -grpc_bbq_push (grpc_byte_buffer_queue * q, grpc_byte_buffer * buffer) -{ - q->bytes += grpc_byte_buffer_length (buffer); - bba_push (&q->filling, buffer); +void grpc_bbq_push(grpc_byte_buffer_queue *q, grpc_byte_buffer *buffer) { + q->bytes += grpc_byte_buffer_length(buffer); + bba_push(&q->filling, buffer); } -void -grpc_bbq_flush (grpc_byte_buffer_queue * q) -{ +void grpc_bbq_flush(grpc_byte_buffer_queue *q) { grpc_byte_buffer *bb; - while ((bb = grpc_bbq_pop (q))) - { - grpc_byte_buffer_destroy (bb); - } + while ((bb = grpc_bbq_pop(q))) { + grpc_byte_buffer_destroy(bb); + } } -size_t -grpc_bbq_bytes (grpc_byte_buffer_queue * q) -{ - return q->bytes; -} +size_t grpc_bbq_bytes(grpc_byte_buffer_queue *q) { return q->bytes; } -grpc_byte_buffer * -grpc_bbq_pop (grpc_byte_buffer_queue * q) -{ +grpc_byte_buffer *grpc_bbq_pop(grpc_byte_buffer_queue *q) { grpc_bbq_array temp_array; grpc_byte_buffer *out; - if (q->drain_pos == q->draining.count) - { - if (q->filling.count == 0) - { - return NULL; - } - q->draining.count = 0; - q->drain_pos = 0; - /* swap arrays */ - temp_array = q->filling; - q->filling = q->draining; - q->draining = temp_array; + if (q->drain_pos == q->draining.count) { + if (q->filling.count == 0) { + return NULL; } + q->draining.count = 0; + q->drain_pos = 0; + /* swap arrays */ + temp_array = q->filling; + q->filling = q->draining; + q->draining = temp_array; + } out = q->draining.data[q->drain_pos++]; - q->bytes -= grpc_byte_buffer_length (out); + q->bytes -= grpc_byte_buffer_length(out); return out; } diff --git a/src/core/surface/byte_buffer_queue.h b/src/core/surface/byte_buffer_queue.h index 3e344c1e54c..2c3b22d24e9 100644 --- a/src/core/surface/byte_buffer_queue.h +++ b/src/core/surface/byte_buffer_queue.h @@ -38,27 +38,25 @@ /* TODO(ctiller): inline an element or two into this struct to avoid per-call allocations */ -typedef struct -{ +typedef struct { grpc_byte_buffer **data; size_t count; size_t capacity; } grpc_bbq_array; /* should be initialized by zeroing memory */ -typedef struct -{ +typedef struct { size_t drain_pos; grpc_bbq_array filling; grpc_bbq_array draining; size_t bytes; } grpc_byte_buffer_queue; -void grpc_bbq_destroy (grpc_byte_buffer_queue * q); -grpc_byte_buffer *grpc_bbq_pop (grpc_byte_buffer_queue * q); -void grpc_bbq_flush (grpc_byte_buffer_queue * q); -int grpc_bbq_empty (grpc_byte_buffer_queue * q); -void grpc_bbq_push (grpc_byte_buffer_queue * q, grpc_byte_buffer * bb); -size_t grpc_bbq_bytes (grpc_byte_buffer_queue * q); +void grpc_bbq_destroy(grpc_byte_buffer_queue *q); +grpc_byte_buffer *grpc_bbq_pop(grpc_byte_buffer_queue *q); +void grpc_bbq_flush(grpc_byte_buffer_queue *q); +int grpc_bbq_empty(grpc_byte_buffer_queue *q); +void grpc_bbq_push(grpc_byte_buffer_queue *q, grpc_byte_buffer *bb); +size_t grpc_bbq_bytes(grpc_byte_buffer_queue *q); #endif /* GRPC_INTERNAL_CORE_SURFACE_BYTE_BUFFER_QUEUE_H */ diff --git a/src/core/surface/byte_buffer_reader.c b/src/core/surface/byte_buffer_reader.c index c4c9e43d7e8..283db83833d 100644 --- a/src/core/surface/byte_buffer_reader.c +++ b/src/core/surface/byte_buffer_reader.c @@ -42,77 +42,64 @@ #include "src/core/compression/message_compress.h" -static int -is_compressed (grpc_byte_buffer * buffer) -{ - switch (buffer->type) - { +static int is_compressed(grpc_byte_buffer *buffer) { + switch (buffer->type) { case GRPC_BB_RAW: - if (buffer->data.raw.compression == GRPC_COMPRESS_NONE) - { - return 0 /* GPR_FALSE */ ; - } + if (buffer->data.raw.compression == GRPC_COMPRESS_NONE) { + return 0 /* GPR_FALSE */; + } break; - } - return 1 /* GPR_TRUE */ ; + } + return 1 /* GPR_TRUE */; } -void -grpc_byte_buffer_reader_init (grpc_byte_buffer_reader * reader, grpc_byte_buffer * buffer) -{ +void grpc_byte_buffer_reader_init(grpc_byte_buffer_reader *reader, + grpc_byte_buffer *buffer) { gpr_slice_buffer decompressed_slices_buffer; reader->buffer_in = buffer; - switch (reader->buffer_in->type) - { + switch (reader->buffer_in->type) { case GRPC_BB_RAW: - gpr_slice_buffer_init (&decompressed_slices_buffer); - if (is_compressed (reader->buffer_in)) - { - grpc_msg_decompress (reader->buffer_in->data.raw.compression, &reader->buffer_in->data.raw.slice_buffer, &decompressed_slices_buffer); - reader->buffer_out = grpc_raw_byte_buffer_create (decompressed_slices_buffer.slices, decompressed_slices_buffer.count); - gpr_slice_buffer_destroy (&decompressed_slices_buffer); - } - else - { /* not compressed, use the input buffer as output */ - reader->buffer_out = reader->buffer_in; - } + gpr_slice_buffer_init(&decompressed_slices_buffer); + if (is_compressed(reader->buffer_in)) { + grpc_msg_decompress(reader->buffer_in->data.raw.compression, + &reader->buffer_in->data.raw.slice_buffer, + &decompressed_slices_buffer); + reader->buffer_out = + grpc_raw_byte_buffer_create(decompressed_slices_buffer.slices, + decompressed_slices_buffer.count); + gpr_slice_buffer_destroy(&decompressed_slices_buffer); + } else { /* not compressed, use the input buffer as output */ + reader->buffer_out = reader->buffer_in; + } reader->current.index = 0; break; - } + } } -void -grpc_byte_buffer_reader_destroy (grpc_byte_buffer_reader * reader) -{ - switch (reader->buffer_in->type) - { +void grpc_byte_buffer_reader_destroy(grpc_byte_buffer_reader *reader) { + switch (reader->buffer_in->type) { case GRPC_BB_RAW: /* keeping the same if-else structure as in the init function */ - if (is_compressed (reader->buffer_in)) - { - grpc_byte_buffer_destroy (reader->buffer_out); - } + if (is_compressed(reader->buffer_in)) { + grpc_byte_buffer_destroy(reader->buffer_out); + } break; - } + } } -int -grpc_byte_buffer_reader_next (grpc_byte_buffer_reader * reader, gpr_slice * slice) -{ - switch (reader->buffer_in->type) - { - case GRPC_BB_RAW: - { - gpr_slice_buffer *slice_buffer; - slice_buffer = &reader->buffer_out->data.raw.slice_buffer; - if (reader->current.index < slice_buffer->count) - { - *slice = gpr_slice_ref (slice_buffer->slices[reader->current.index]); - reader->current.index += 1; - return 1; - } - break; +int grpc_byte_buffer_reader_next(grpc_byte_buffer_reader *reader, + gpr_slice *slice) { + switch (reader->buffer_in->type) { + case GRPC_BB_RAW: { + gpr_slice_buffer *slice_buffer; + slice_buffer = &reader->buffer_out->data.raw.slice_buffer; + if (reader->current.index < slice_buffer->count) { + *slice = gpr_slice_ref(slice_buffer->slices[reader->current.index]); + reader->current.index += 1; + return 1; } + break; } + } return 0; } diff --git a/src/core/surface/call.c b/src/core/surface/call.c index 418c75efd27..d97bf532064 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -61,8 +61,7 @@ - status/close recv (depending on client/server) */ #define MAX_CONCURRENT_COMPLETIONS 6 -typedef struct -{ +typedef struct { grpc_ioreq_completion_func on_complete; void *user_data; int success; @@ -74,8 +73,7 @@ typedef struct #define MAX_SEND_INITIAL_METADATA_COUNT 3 -typedef struct -{ +typedef struct { /* Overall status of the operation: starts OK, may degrade to non-OK */ gpr_uint8 success; @@ -92,8 +90,7 @@ typedef struct enumerates them all, and acts as a priority sorting for which status to return to the application - earlier entries override later ones */ -typedef enum -{ +typedef enum { /* Status came from the application layer overriding whatever the wire says */ STATUS_FROM_API_OVERRIDE = 0, @@ -107,16 +104,14 @@ typedef enum STATUS_SOURCE_COUNT } status_source; -typedef struct -{ +typedef struct { gpr_uint8 is_set; grpc_status_code code; grpc_mdstr *details; } received_status; /* How far through the GRPC stream have we read? */ -typedef enum -{ +typedef enum { /* We are still waiting for initial metadata to complete */ READ_STATE_INITIAL = 0, /* We have gotten initial metadata, and are reading either @@ -128,15 +123,13 @@ typedef enum READ_STATE_STREAM_CLOSED } read_state; -typedef enum -{ +typedef enum { WRITE_STATE_INITIAL = 0, WRITE_STATE_STARTED, WRITE_STATE_WRITE_CLOSED } write_state; -struct grpc_call -{ +struct grpc_call { grpc_completion_queue *cq; grpc_channel *channel; grpc_call *parent; @@ -283,363 +276,328 @@ struct grpc_call #define CALL_FROM_TOP_ELEM(top_elem) \ CALL_FROM_CALL_STACK(grpc_call_stack_from_top_element(top_elem)) -static void set_deadline_alarm (grpc_exec_ctx * exec_ctx, grpc_call * call, gpr_timespec deadline); -static void call_on_done_recv (grpc_exec_ctx * exec_ctx, void *call, int success); -static void call_on_done_send (grpc_exec_ctx * exec_ctx, void *call, int success); -static int fill_send_ops (grpc_call * call, grpc_transport_stream_op * op); -static void execute_op (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_transport_stream_op * op); -static void recv_metadata (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_metadata_batch * metadata); -static void finish_read_ops (grpc_call * call); -static grpc_call_error cancel_with_status (grpc_call * c, grpc_status_code status, const char *description); -static void finished_loose_op (grpc_exec_ctx * exec_ctx, void *call, int success); - -static void lock (grpc_call * call); -static void unlock (grpc_exec_ctx * exec_ctx, grpc_call * call); - -grpc_call * -grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 propagation_mask, grpc_completion_queue * cq, const void *server_transport_data, grpc_mdelem ** add_initial_metadata, size_t add_initial_metadata_count, gpr_timespec send_deadline) -{ +static void set_deadline_alarm(grpc_exec_ctx *exec_ctx, grpc_call *call, + gpr_timespec deadline); +static void call_on_done_recv(grpc_exec_ctx *exec_ctx, void *call, int success); +static void call_on_done_send(grpc_exec_ctx *exec_ctx, void *call, int success); +static int fill_send_ops(grpc_call *call, grpc_transport_stream_op *op); +static void execute_op(grpc_exec_ctx *exec_ctx, grpc_call *call, + grpc_transport_stream_op *op); +static void recv_metadata(grpc_exec_ctx *exec_ctx, grpc_call *call, + grpc_metadata_batch *metadata); +static void finish_read_ops(grpc_call *call); +static grpc_call_error cancel_with_status(grpc_call *c, grpc_status_code status, + const char *description); +static void finished_loose_op(grpc_exec_ctx *exec_ctx, void *call, int success); + +static void lock(grpc_call *call); +static void unlock(grpc_exec_ctx *exec_ctx, grpc_call *call); + +grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, + gpr_uint32 propagation_mask, + grpc_completion_queue *cq, + const void *server_transport_data, + grpc_mdelem **add_initial_metadata, + size_t add_initial_metadata_count, + gpr_timespec send_deadline) { size_t i; grpc_transport_stream_op initial_op; grpc_transport_stream_op *initial_op_ptr = NULL; - grpc_channel_stack *channel_stack = grpc_channel_get_channel_stack (channel); + grpc_channel_stack *channel_stack = grpc_channel_get_channel_stack(channel); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_call *call = gpr_malloc (sizeof (grpc_call) + channel_stack->call_stack_size); - memset (call, 0, sizeof (grpc_call)); - gpr_mu_init (&call->mu); - gpr_mu_init (&call->completion_mu); + grpc_call *call = + gpr_malloc(sizeof(grpc_call) + channel_stack->call_stack_size); + memset(call, 0, sizeof(grpc_call)); + gpr_mu_init(&call->mu); + gpr_mu_init(&call->completion_mu); call->channel = channel; call->cq = cq; - if (cq != NULL) - { - GRPC_CQ_INTERNAL_REF (cq, "bind"); - } + if (cq != NULL) { + GRPC_CQ_INTERNAL_REF(cq, "bind"); + } call->parent = parent_call; call->is_client = server_transport_data == NULL; - for (i = 0; i < GRPC_IOREQ_OP_COUNT; i++) - { - call->request_set[i] = REQSET_EMPTY; - } - if (call->is_client) - { - call->request_set[GRPC_IOREQ_SEND_TRAILING_METADATA] = REQSET_DONE; - call->request_set[GRPC_IOREQ_SEND_STATUS] = REQSET_DONE; - } - GPR_ASSERT (add_initial_metadata_count < MAX_SEND_INITIAL_METADATA_COUNT); - for (i = 0; i < add_initial_metadata_count; i++) - { - call->send_initial_metadata[i].md = add_initial_metadata[i]; - } + for (i = 0; i < GRPC_IOREQ_OP_COUNT; i++) { + call->request_set[i] = REQSET_EMPTY; + } + if (call->is_client) { + call->request_set[GRPC_IOREQ_SEND_TRAILING_METADATA] = REQSET_DONE; + call->request_set[GRPC_IOREQ_SEND_STATUS] = REQSET_DONE; + } + GPR_ASSERT(add_initial_metadata_count < MAX_SEND_INITIAL_METADATA_COUNT); + for (i = 0; i < add_initial_metadata_count; i++) { + call->send_initial_metadata[i].md = add_initial_metadata[i]; + } call->send_initial_metadata_count = add_initial_metadata_count; call->send_deadline = send_deadline; - GRPC_CHANNEL_INTERNAL_REF (channel, "call"); - call->metadata_context = grpc_channel_get_metadata_context (channel); - grpc_sopb_init (&call->send_ops); - grpc_sopb_init (&call->recv_ops); - gpr_slice_buffer_init (&call->incoming_message); - grpc_closure_init (&call->on_done_recv, call_on_done_recv, call); - grpc_closure_init (&call->on_done_send, call_on_done_send, call); - grpc_closure_init (&call->on_done_bind, finished_loose_op, call); + GRPC_CHANNEL_INTERNAL_REF(channel, "call"); + call->metadata_context = grpc_channel_get_metadata_context(channel); + grpc_sopb_init(&call->send_ops); + grpc_sopb_init(&call->recv_ops); + gpr_slice_buffer_init(&call->incoming_message); + grpc_closure_init(&call->on_done_recv, call_on_done_recv, call); + grpc_closure_init(&call->on_done_send, call_on_done_send, call); + grpc_closure_init(&call->on_done_bind, finished_loose_op, call); /* dropped in destroy and when READ_STATE_STREAM_CLOSED received */ - gpr_ref_init (&call->internal_refcount, 2); + gpr_ref_init(&call->internal_refcount, 2); /* server hack: start reads immediately so we can get initial metadata. TODO(ctiller): figure out a cleaner solution */ - if (!call->is_client) - { - memset (&initial_op, 0, sizeof (initial_op)); - initial_op.recv_ops = &call->recv_ops; - initial_op.recv_state = &call->recv_state; - initial_op.on_done_recv = &call->on_done_recv; - initial_op.context = call->context; - call->receiving = 1; - GRPC_CALL_INTERNAL_REF (call, "receiving"); - initial_op_ptr = &initial_op; - } - grpc_call_stack_init (&exec_ctx, channel_stack, server_transport_data, initial_op_ptr, CALL_STACK_FROM_CALL (call)); - if (parent_call != NULL) - { - GRPC_CALL_INTERNAL_REF (parent_call, "child"); - GPR_ASSERT (call->is_client); - GPR_ASSERT (!parent_call->is_client); - - gpr_mu_lock (&parent_call->mu); - - if (propagation_mask & GRPC_PROPAGATE_DEADLINE) - { - send_deadline = gpr_time_min (gpr_convert_clock_type (send_deadline, parent_call->send_deadline.clock_type), parent_call->send_deadline); - } - /* for now GRPC_PROPAGATE_TRACING_CONTEXT *MUST* be passed with - * GRPC_PROPAGATE_STATS_CONTEXT */ - /* TODO(ctiller): This should change to use the appropriate census start_op - * call. */ - if (propagation_mask & GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT) - { - GPR_ASSERT (propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT); - grpc_call_context_set (call, GRPC_CONTEXT_TRACING, parent_call->context[GRPC_CONTEXT_TRACING].value, NULL); - } - else - { - GPR_ASSERT (propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT); - } - if (propagation_mask & GRPC_PROPAGATE_CANCELLATION) - { - call->cancellation_is_inherited = 1; - } - - if (parent_call->first_child == NULL) - { - parent_call->first_child = call; - call->sibling_next = call->sibling_prev = call; - } - else - { - call->sibling_next = parent_call->first_child; - call->sibling_prev = parent_call->first_child->sibling_prev; - call->sibling_next->sibling_prev = call->sibling_prev->sibling_next = call; - } - - gpr_mu_unlock (&parent_call->mu); - } - if (gpr_time_cmp (send_deadline, gpr_inf_future (send_deadline.clock_type)) != 0) - { - set_deadline_alarm (&exec_ctx, call, send_deadline); - } - grpc_exec_ctx_finish (&exec_ctx); + if (!call->is_client) { + memset(&initial_op, 0, sizeof(initial_op)); + initial_op.recv_ops = &call->recv_ops; + initial_op.recv_state = &call->recv_state; + initial_op.on_done_recv = &call->on_done_recv; + initial_op.context = call->context; + call->receiving = 1; + GRPC_CALL_INTERNAL_REF(call, "receiving"); + initial_op_ptr = &initial_op; + } + grpc_call_stack_init(&exec_ctx, channel_stack, server_transport_data, + initial_op_ptr, CALL_STACK_FROM_CALL(call)); + if (parent_call != NULL) { + GRPC_CALL_INTERNAL_REF(parent_call, "child"); + GPR_ASSERT(call->is_client); + GPR_ASSERT(!parent_call->is_client); + + gpr_mu_lock(&parent_call->mu); + + if (propagation_mask & GRPC_PROPAGATE_DEADLINE) { + send_deadline = gpr_time_min( + gpr_convert_clock_type(send_deadline, + parent_call->send_deadline.clock_type), + parent_call->send_deadline); + } + /* for now GRPC_PROPAGATE_TRACING_CONTEXT *MUST* be passed with + * GRPC_PROPAGATE_STATS_CONTEXT */ + /* TODO(ctiller): This should change to use the appropriate census start_op + * call. */ + if (propagation_mask & GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT) { + GPR_ASSERT(propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT); + grpc_call_context_set(call, GRPC_CONTEXT_TRACING, + parent_call->context[GRPC_CONTEXT_TRACING].value, + NULL); + } else { + GPR_ASSERT(propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT); + } + if (propagation_mask & GRPC_PROPAGATE_CANCELLATION) { + call->cancellation_is_inherited = 1; + } + + if (parent_call->first_child == NULL) { + parent_call->first_child = call; + call->sibling_next = call->sibling_prev = call; + } else { + call->sibling_next = parent_call->first_child; + call->sibling_prev = parent_call->first_child->sibling_prev; + call->sibling_next->sibling_prev = call->sibling_prev->sibling_next = + call; + } + + gpr_mu_unlock(&parent_call->mu); + } + if (gpr_time_cmp(send_deadline, gpr_inf_future(send_deadline.clock_type)) != + 0) { + set_deadline_alarm(&exec_ctx, call, send_deadline); + } + grpc_exec_ctx_finish(&exec_ctx); return call; } -void -grpc_call_set_completion_queue (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_completion_queue * cq) -{ - lock (call); +void grpc_call_set_completion_queue(grpc_exec_ctx *exec_ctx, grpc_call *call, + grpc_completion_queue *cq) { + lock(call); call->cq = cq; - if (cq) - { - GRPC_CQ_INTERNAL_REF (cq, "bind"); - } - unlock (exec_ctx, call); + if (cq) { + GRPC_CQ_INTERNAL_REF(cq, "bind"); + } + unlock(exec_ctx, call); } -grpc_completion_queue * -grpc_call_get_completion_queue (grpc_call * call) -{ +grpc_completion_queue *grpc_call_get_completion_queue(grpc_call *call) { return call->cq; } -static grpc_cq_completion * -allocate_completion (grpc_call * call) -{ +static grpc_cq_completion *allocate_completion(grpc_call *call) { gpr_uint8 i; - gpr_mu_lock (&call->completion_mu); - for (i = 0; i < GPR_ARRAY_SIZE (call->completions); i++) - { - if (call->allocated_completions & (1u << i)) - { - continue; - } - call->allocated_completions |= (gpr_uint8) (1u << i); - gpr_mu_unlock (&call->completion_mu); - return &call->completions[i]; - } - gpr_log (GPR_ERROR, "should never reach here"); - abort (); + gpr_mu_lock(&call->completion_mu); + for (i = 0; i < GPR_ARRAY_SIZE(call->completions); i++) { + if (call->allocated_completions & (1u << i)) { + continue; + } + call->allocated_completions |= (gpr_uint8)(1u << i); + gpr_mu_unlock(&call->completion_mu); + return &call->completions[i]; + } + gpr_log(GPR_ERROR, "should never reach here"); + abort(); } -static void -done_completion (grpc_exec_ctx * exec_ctx, void *call, grpc_cq_completion * completion) -{ +static void done_completion(grpc_exec_ctx *exec_ctx, void *call, + grpc_cq_completion *completion) { grpc_call *c = call; - gpr_mu_lock (&c->completion_mu); - c->allocated_completions &= (gpr_uint8) ~ (1u << (completion - c->completions)); - gpr_mu_unlock (&c->completion_mu); - GRPC_CALL_INTERNAL_UNREF (exec_ctx, c, "completion"); + gpr_mu_lock(&c->completion_mu); + c->allocated_completions &= + (gpr_uint8) ~(1u << (completion - c->completions)); + gpr_mu_unlock(&c->completion_mu); + GRPC_CALL_INTERNAL_UNREF(exec_ctx, c, "completion"); } #ifdef GRPC_CALL_REF_COUNT_DEBUG -void -grpc_call_internal_ref (grpc_call * c, const char *reason) -{ - gpr_log (GPR_DEBUG, "CALL: ref %p %d -> %d [%s]", c, c->internal_refcount.count, c->internal_refcount.count + 1, reason); +void grpc_call_internal_ref(grpc_call *c, const char *reason) { + gpr_log(GPR_DEBUG, "CALL: ref %p %d -> %d [%s]", c, + c->internal_refcount.count, c->internal_refcount.count + 1, reason); #else -void -grpc_call_internal_ref (grpc_call * c) -{ +void grpc_call_internal_ref(grpc_call *c) { #endif - gpr_ref (&c->internal_refcount); + gpr_ref(&c->internal_refcount); } -static void -destroy_call (grpc_exec_ctx * exec_ctx, grpc_call * call) -{ +static void destroy_call(grpc_exec_ctx *exec_ctx, grpc_call *call) { size_t i; grpc_call *c = call; - grpc_call_stack_destroy (exec_ctx, CALL_STACK_FROM_CALL (c)); - GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, c->channel, "call"); - gpr_mu_destroy (&c->mu); - gpr_mu_destroy (&c->completion_mu); - for (i = 0; i < STATUS_SOURCE_COUNT; i++) - { - if (c->status[i].details) - { - GRPC_MDSTR_UNREF (c->status[i].details); - } - } - for (i = 0; i < c->owned_metadata_count; i++) - { - GRPC_MDELEM_UNREF (c->owned_metadata[i]); - } - gpr_free (c->owned_metadata); - for (i = 0; i < GPR_ARRAY_SIZE (c->buffered_metadata); i++) - { - gpr_free (c->buffered_metadata[i].metadata); - } - for (i = 0; i < c->send_initial_metadata_count; i++) - { - GRPC_MDELEM_UNREF (c->send_initial_metadata[i].md); - } - for (i = 0; i < GRPC_CONTEXT_COUNT; i++) - { - if (c->context[i].destroy) - { - c->context[i].destroy (c->context[i].value); - } - } - grpc_sopb_destroy (&c->send_ops); - grpc_sopb_destroy (&c->recv_ops); - grpc_bbq_destroy (&c->incoming_queue); - gpr_slice_buffer_destroy (&c->incoming_message); - if (c->cq) - { - GRPC_CQ_INTERNAL_UNREF (c->cq, "bind"); - } - gpr_free (c); + grpc_call_stack_destroy(exec_ctx, CALL_STACK_FROM_CALL(c)); + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, c->channel, "call"); + gpr_mu_destroy(&c->mu); + gpr_mu_destroy(&c->completion_mu); + for (i = 0; i < STATUS_SOURCE_COUNT; i++) { + if (c->status[i].details) { + GRPC_MDSTR_UNREF(c->status[i].details); + } + } + for (i = 0; i < c->owned_metadata_count; i++) { + GRPC_MDELEM_UNREF(c->owned_metadata[i]); + } + gpr_free(c->owned_metadata); + for (i = 0; i < GPR_ARRAY_SIZE(c->buffered_metadata); i++) { + gpr_free(c->buffered_metadata[i].metadata); + } + for (i = 0; i < c->send_initial_metadata_count; i++) { + GRPC_MDELEM_UNREF(c->send_initial_metadata[i].md); + } + for (i = 0; i < GRPC_CONTEXT_COUNT; i++) { + if (c->context[i].destroy) { + c->context[i].destroy(c->context[i].value); + } + } + grpc_sopb_destroy(&c->send_ops); + grpc_sopb_destroy(&c->recv_ops); + grpc_bbq_destroy(&c->incoming_queue); + gpr_slice_buffer_destroy(&c->incoming_message); + if (c->cq) { + GRPC_CQ_INTERNAL_UNREF(c->cq, "bind"); + } + gpr_free(c); } #ifdef GRPC_CALL_REF_COUNT_DEBUG -void -grpc_call_internal_unref (grpc_exec_ctx * exec_ctx, grpc_call * c, const char *reason) -{ - gpr_log (GPR_DEBUG, "CALL: unref %p %d -> %d [%s]", c, c->internal_refcount.count, c->internal_refcount.count - 1, reason); +void grpc_call_internal_unref(grpc_exec_ctx *exec_ctx, grpc_call *c, + const char *reason) { + gpr_log(GPR_DEBUG, "CALL: unref %p %d -> %d [%s]", c, + c->internal_refcount.count, c->internal_refcount.count - 1, reason); #else -void -grpc_call_internal_unref (grpc_exec_ctx * exec_ctx, grpc_call * c) -{ +void grpc_call_internal_unref(grpc_exec_ctx *exec_ctx, grpc_call *c) { #endif - if (gpr_unref (&c->internal_refcount)) - { - destroy_call (exec_ctx, c); - } + if (gpr_unref(&c->internal_refcount)) { + destroy_call(exec_ctx, c); + } } -static void -set_status_code (grpc_call * call, status_source source, gpr_uint32 status) -{ - if (call->status[source].is_set) - return; +static void set_status_code(grpc_call *call, status_source source, + gpr_uint32 status) { + if (call->status[source].is_set) return; call->status[source].is_set = 1; - call->status[source].code = (grpc_status_code) status; + call->status[source].code = (grpc_status_code)status; call->error_status_set = status != GRPC_STATUS_OK; - if (status != GRPC_STATUS_OK && !grpc_bbq_empty (&call->incoming_queue)) - { - grpc_bbq_flush (&call->incoming_queue); - } + if (status != GRPC_STATUS_OK && !grpc_bbq_empty(&call->incoming_queue)) { + grpc_bbq_flush(&call->incoming_queue); + } } -static void -set_compression_algorithm (grpc_call * call, grpc_compression_algorithm algo) -{ +static void set_compression_algorithm(grpc_call *call, + grpc_compression_algorithm algo) { call->compression_algorithm = algo; } -grpc_compression_algorithm -grpc_call_get_compression_algorithm (const grpc_call * call) -{ +grpc_compression_algorithm grpc_call_get_compression_algorithm( + const grpc_call *call) { return call->compression_algorithm; } -static void -set_encodings_accepted_by_peer (grpc_call * call, const gpr_slice accept_encoding_slice) -{ +static void set_encodings_accepted_by_peer( + grpc_call *call, const gpr_slice accept_encoding_slice) { size_t i; grpc_compression_algorithm algorithm; gpr_slice_buffer accept_encoding_parts; - gpr_slice_buffer_init (&accept_encoding_parts); - gpr_slice_split (accept_encoding_slice, ",", &accept_encoding_parts); + gpr_slice_buffer_init(&accept_encoding_parts); + gpr_slice_split(accept_encoding_slice, ",", &accept_encoding_parts); /* No need to zero call->encodings_accepted_by_peer: grpc_call_create already * zeroes the whole grpc_call */ /* Always support no compression */ - GPR_BITSET (&call->encodings_accepted_by_peer, GRPC_COMPRESS_NONE); - for (i = 0; i < accept_encoding_parts.count; i++) - { - const gpr_slice *accept_encoding_entry_slice = &accept_encoding_parts.slices[i]; - if (grpc_compression_algorithm_parse ((const char *) GPR_SLICE_START_PTR (*accept_encoding_entry_slice), GPR_SLICE_LENGTH (*accept_encoding_entry_slice), &algorithm)) - { - GPR_BITSET (&call->encodings_accepted_by_peer, algorithm); - } - else - { - char *accept_encoding_entry_str = gpr_dump_slice (*accept_encoding_entry_slice, GPR_DUMP_ASCII); - gpr_log (GPR_ERROR, "Invalid entry in accept encoding metadata: '%s'. Ignoring.", accept_encoding_entry_str); - gpr_free (accept_encoding_entry_str); - } - } + GPR_BITSET(&call->encodings_accepted_by_peer, GRPC_COMPRESS_NONE); + for (i = 0; i < accept_encoding_parts.count; i++) { + const gpr_slice *accept_encoding_entry_slice = + &accept_encoding_parts.slices[i]; + if (grpc_compression_algorithm_parse( + (const char *)GPR_SLICE_START_PTR(*accept_encoding_entry_slice), + GPR_SLICE_LENGTH(*accept_encoding_entry_slice), &algorithm)) { + GPR_BITSET(&call->encodings_accepted_by_peer, algorithm); + } else { + char *accept_encoding_entry_str = + gpr_dump_slice(*accept_encoding_entry_slice, GPR_DUMP_ASCII); + gpr_log(GPR_ERROR, + "Invalid entry in accept encoding metadata: '%s'. Ignoring.", + accept_encoding_entry_str); + gpr_free(accept_encoding_entry_str); + } + } } -gpr_uint32 -grpc_call_get_encodings_accepted_by_peer (grpc_call * call) -{ +gpr_uint32 grpc_call_get_encodings_accepted_by_peer(grpc_call *call) { return call->encodings_accepted_by_peer; } -gpr_uint32 -grpc_call_get_message_flags (const grpc_call * call) -{ +gpr_uint32 grpc_call_get_message_flags(const grpc_call *call) { return call->incoming_message_flags; } -static void -set_status_details (grpc_call * call, status_source source, grpc_mdstr * status) -{ - if (call->status[source].details != NULL) - { - GRPC_MDSTR_UNREF (call->status[source].details); - } +static void set_status_details(grpc_call *call, status_source source, + grpc_mdstr *status) { + if (call->status[source].details != NULL) { + GRPC_MDSTR_UNREF(call->status[source].details); + } call->status[source].details = status; } -static int -is_op_live (grpc_call * call, grpc_ioreq_op op) -{ +static int is_op_live(grpc_call *call, grpc_ioreq_op op) { gpr_uint8 set = call->request_set[op]; reqinfo_master *master; - if (set >= GRPC_IOREQ_OP_COUNT) - return 0; + if (set >= GRPC_IOREQ_OP_COUNT) return 0; master = &call->masters[set]; return (master->complete_mask & (1u << op)) == 0; } -static void -lock (grpc_call * call) -{ - gpr_mu_lock (&call->mu); -} +static void lock(grpc_call *call) { gpr_mu_lock(&call->mu); } -static int -need_more_data (grpc_call * call) -{ - if (call->read_state == READ_STATE_STREAM_CLOSED) - return 0; +static int need_more_data(grpc_call *call) { + if (call->read_state == READ_STATE_STREAM_CLOSED) return 0; /* TODO(ctiller): this needs some serious cleanup */ - return is_op_live (call, GRPC_IOREQ_RECV_INITIAL_METADATA) || (is_op_live (call, GRPC_IOREQ_RECV_MESSAGE) && grpc_bbq_empty (&call->incoming_queue)) || is_op_live (call, GRPC_IOREQ_RECV_TRAILING_METADATA) || is_op_live (call, GRPC_IOREQ_RECV_STATUS) || is_op_live (call, GRPC_IOREQ_RECV_STATUS_DETAILS) || (is_op_live (call, GRPC_IOREQ_RECV_CLOSE) && grpc_bbq_empty (&call->incoming_queue)) || (call->write_state == WRITE_STATE_INITIAL && !call->is_client) || (call->cancel_with_status != GRPC_STATUS_OK) || call->destroy_called; + return is_op_live(call, GRPC_IOREQ_RECV_INITIAL_METADATA) || + (is_op_live(call, GRPC_IOREQ_RECV_MESSAGE) && + grpc_bbq_empty(&call->incoming_queue)) || + is_op_live(call, GRPC_IOREQ_RECV_TRAILING_METADATA) || + is_op_live(call, GRPC_IOREQ_RECV_STATUS) || + is_op_live(call, GRPC_IOREQ_RECV_STATUS_DETAILS) || + (is_op_live(call, GRPC_IOREQ_RECV_CLOSE) && + grpc_bbq_empty(&call->incoming_queue)) || + (call->write_state == WRITE_STATE_INITIAL && !call->is_client) || + (call->cancel_with_status != GRPC_STATUS_OK) || call->destroy_called; } -static void -unlock (grpc_exec_ctx * exec_ctx, grpc_call * call) -{ +static void unlock(grpc_exec_ctx *exec_ctx, grpc_call *call) { grpc_transport_stream_op op; completed_request completed_requests[GRPC_IOREQ_OP_COUNT]; int completing_requests = 0; @@ -648,677 +606,607 @@ unlock (grpc_exec_ctx * exec_ctx, grpc_call * call) const size_t MAX_RECV_PEEK_AHEAD = 65536; size_t buffered_bytes; - memset (&op, 0, sizeof (op)); + memset(&op, 0, sizeof(op)); op.cancel_with_status = call->cancel_with_status; start_op = op.cancel_with_status != GRPC_STATUS_OK; - call->cancel_with_status = GRPC_STATUS_OK; /* reset */ - - if (!call->receiving && need_more_data (call)) - { - if (grpc_bbq_empty (&call->incoming_queue) && call->reading_message) - { - op.max_recv_bytes = call->incoming_message_length - call->incoming_message.length + MAX_RECV_PEEK_AHEAD; - } - else - { - buffered_bytes = grpc_bbq_bytes (&call->incoming_queue); - if (buffered_bytes > MAX_RECV_PEEK_AHEAD) - { - op.max_recv_bytes = 0; - } - else - { - op.max_recv_bytes = MAX_RECV_PEEK_AHEAD - buffered_bytes; - } - } - /* TODO(ctiller): 1024 is basically to cover a bug - I don't understand yet */ - if (op.max_recv_bytes > 1024) - { - op.recv_ops = &call->recv_ops; - op.recv_state = &call->recv_state; - op.on_done_recv = &call->on_done_recv; - call->receiving = 1; - GRPC_CALL_INTERNAL_REF (call, "receiving"); - start_op = 1; - } - } - - if (!call->sending) - { - if (fill_send_ops (call, &op)) - { - call->sending = 1; - GRPC_CALL_INTERNAL_REF (call, "sending"); - start_op = 1; - } - } - - if (!call->bound_pollset && call->cq && (!call->is_client || start_op)) - { - call->bound_pollset = 1; - op.bind_pollset = grpc_cq_pollset (call->cq); + call->cancel_with_status = GRPC_STATUS_OK; /* reset */ + + if (!call->receiving && need_more_data(call)) { + if (grpc_bbq_empty(&call->incoming_queue) && call->reading_message) { + op.max_recv_bytes = call->incoming_message_length - + call->incoming_message.length + MAX_RECV_PEEK_AHEAD; + } else { + buffered_bytes = grpc_bbq_bytes(&call->incoming_queue); + if (buffered_bytes > MAX_RECV_PEEK_AHEAD) { + op.max_recv_bytes = 0; + } else { + op.max_recv_bytes = MAX_RECV_PEEK_AHEAD - buffered_bytes; + } + } + /* TODO(ctiller): 1024 is basically to cover a bug + I don't understand yet */ + if (op.max_recv_bytes > 1024) { + op.recv_ops = &call->recv_ops; + op.recv_state = &call->recv_state; + op.on_done_recv = &call->on_done_recv; + call->receiving = 1; + GRPC_CALL_INTERNAL_REF(call, "receiving"); start_op = 1; } + } - if (!call->completing && call->num_completed_requests != 0) - { - completing_requests = call->num_completed_requests; - memcpy (completed_requests, call->completed_requests, sizeof (completed_requests)); - call->num_completed_requests = 0; - call->completing = 1; - GRPC_CALL_INTERNAL_REF (call, "completing"); - } - - gpr_mu_unlock (&call->mu); - - if (start_op) - { - execute_op (exec_ctx, call, &op); - } - - if (completing_requests > 0) - { - for (i = 0; i < completing_requests; i++) - { - completed_requests[i].on_complete (exec_ctx, call, completed_requests[i].success, completed_requests[i].user_data); - } - lock (call); - call->completing = 0; - unlock (exec_ctx, call); - GRPC_CALL_INTERNAL_UNREF (exec_ctx, call, "completing"); + if (!call->sending) { + if (fill_send_ops(call, &op)) { + call->sending = 1; + GRPC_CALL_INTERNAL_REF(call, "sending"); + start_op = 1; } + } + + if (!call->bound_pollset && call->cq && (!call->is_client || start_op)) { + call->bound_pollset = 1; + op.bind_pollset = grpc_cq_pollset(call->cq); + start_op = 1; + } + + if (!call->completing && call->num_completed_requests != 0) { + completing_requests = call->num_completed_requests; + memcpy(completed_requests, call->completed_requests, + sizeof(completed_requests)); + call->num_completed_requests = 0; + call->completing = 1; + GRPC_CALL_INTERNAL_REF(call, "completing"); + } + + gpr_mu_unlock(&call->mu); + + if (start_op) { + execute_op(exec_ctx, call, &op); + } + + if (completing_requests > 0) { + for (i = 0; i < completing_requests; i++) { + completed_requests[i].on_complete(exec_ctx, call, + completed_requests[i].success, + completed_requests[i].user_data); + } + lock(call); + call->completing = 0; + unlock(exec_ctx, call); + GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, "completing"); + } } -static void -get_final_status (grpc_call * call, grpc_ioreq_data out) -{ +static void get_final_status(grpc_call *call, grpc_ioreq_data out) { int i; - for (i = 0; i < STATUS_SOURCE_COUNT; i++) - { - if (call->status[i].is_set) - { - out.recv_status.set_value (call->status[i].code, out.recv_status.user_data); - return; - } - } - if (call->is_client) - { - out.recv_status.set_value (GRPC_STATUS_UNKNOWN, out.recv_status.user_data); - } - else - { - out.recv_status.set_value (GRPC_STATUS_OK, out.recv_status.user_data); + for (i = 0; i < STATUS_SOURCE_COUNT; i++) { + if (call->status[i].is_set) { + out.recv_status.set_value(call->status[i].code, + out.recv_status.user_data); + return; } + } + if (call->is_client) { + out.recv_status.set_value(GRPC_STATUS_UNKNOWN, out.recv_status.user_data); + } else { + out.recv_status.set_value(GRPC_STATUS_OK, out.recv_status.user_data); + } } -static void -get_final_details (grpc_call * call, grpc_ioreq_data out) -{ +static void get_final_details(grpc_call *call, grpc_ioreq_data out) { int i; - for (i = 0; i < STATUS_SOURCE_COUNT; i++) - { - if (call->status[i].is_set) - { - if (call->status[i].details) - { - gpr_slice details = call->status[i].details->slice; - size_t len = GPR_SLICE_LENGTH (details); - if (len + 1 > *out.recv_status_details.details_capacity) - { - *out.recv_status_details.details_capacity = GPR_MAX (len + 1, *out.recv_status_details.details_capacity * 3 / 2); - *out.recv_status_details.details = gpr_realloc (*out.recv_status_details.details, *out.recv_status_details.details_capacity); - } - memcpy (*out.recv_status_details.details, GPR_SLICE_START_PTR (details), len); - (*out.recv_status_details.details)[len] = 0; - } - else - { - goto no_details; - } - return; - } + for (i = 0; i < STATUS_SOURCE_COUNT; i++) { + if (call->status[i].is_set) { + if (call->status[i].details) { + gpr_slice details = call->status[i].details->slice; + size_t len = GPR_SLICE_LENGTH(details); + if (len + 1 > *out.recv_status_details.details_capacity) { + *out.recv_status_details.details_capacity = GPR_MAX( + len + 1, *out.recv_status_details.details_capacity * 3 / 2); + *out.recv_status_details.details = + gpr_realloc(*out.recv_status_details.details, + *out.recv_status_details.details_capacity); + } + memcpy(*out.recv_status_details.details, GPR_SLICE_START_PTR(details), + len); + (*out.recv_status_details.details)[len] = 0; + } else { + goto no_details; + } + return; } + } no_details: - if (0 == *out.recv_status_details.details_capacity) - { - *out.recv_status_details.details_capacity = 8; - *out.recv_status_details.details = gpr_malloc (*out.recv_status_details.details_capacity); - } + if (0 == *out.recv_status_details.details_capacity) { + *out.recv_status_details.details_capacity = 8; + *out.recv_status_details.details = + gpr_malloc(*out.recv_status_details.details_capacity); + } **out.recv_status_details.details = 0; } -static void -finish_live_ioreq_op (grpc_call * call, grpc_ioreq_op op, int success) -{ +static void finish_live_ioreq_op(grpc_call *call, grpc_ioreq_op op, + int success) { completed_request *cr; gpr_uint8 master_set = call->request_set[op]; reqinfo_master *master; size_t i; /* ioreq is live: we need to do something */ master = &call->masters[master_set]; - master->complete_mask |= (gpr_uint16) (1u << op); - if (!success) - { - master->success = 0; - } - if (master->complete_mask == master->need_mask) - { - for (i = 0; i < GRPC_IOREQ_OP_COUNT; i++) - { - if (call->request_set[i] != master_set) - { - continue; - } - call->request_set[i] = REQSET_DONE; - switch ((grpc_ioreq_op) i) - { - case GRPC_IOREQ_RECV_MESSAGE: - case GRPC_IOREQ_SEND_MESSAGE: - call->request_set[i] = REQSET_EMPTY; - if (!master->success) - { - call->write_state = WRITE_STATE_WRITE_CLOSED; - } - break; - case GRPC_IOREQ_SEND_STATUS: - if (call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details != NULL) - { - GRPC_MDSTR_UNREF (call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details); - call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details = NULL; - } - break; - case GRPC_IOREQ_RECV_CLOSE: - case GRPC_IOREQ_SEND_INITIAL_METADATA: - case GRPC_IOREQ_SEND_TRAILING_METADATA: - case GRPC_IOREQ_SEND_CLOSE: - break; - case GRPC_IOREQ_RECV_STATUS: - get_final_status (call, call->request_data[GRPC_IOREQ_RECV_STATUS]); - break; - case GRPC_IOREQ_RECV_STATUS_DETAILS: - get_final_details (call, call->request_data[GRPC_IOREQ_RECV_STATUS_DETAILS]); - break; - case GRPC_IOREQ_RECV_INITIAL_METADATA: - GPR_SWAP (grpc_metadata_array, call->buffered_metadata[0], *call->request_data[GRPC_IOREQ_RECV_INITIAL_METADATA].recv_metadata); - break; - case GRPC_IOREQ_RECV_TRAILING_METADATA: - GPR_SWAP (grpc_metadata_array, call->buffered_metadata[1], *call->request_data[GRPC_IOREQ_RECV_TRAILING_METADATA].recv_metadata); - break; - case GRPC_IOREQ_OP_COUNT: - abort (); - break; - } - } - cr = &call->completed_requests[call->num_completed_requests++]; - cr->success = master->success; - cr->on_complete = master->on_complete; - cr->user_data = master->user_data; - } + master->complete_mask |= (gpr_uint16)(1u << op); + if (!success) { + master->success = 0; + } + if (master->complete_mask == master->need_mask) { + for (i = 0; i < GRPC_IOREQ_OP_COUNT; i++) { + if (call->request_set[i] != master_set) { + continue; + } + call->request_set[i] = REQSET_DONE; + switch ((grpc_ioreq_op)i) { + case GRPC_IOREQ_RECV_MESSAGE: + case GRPC_IOREQ_SEND_MESSAGE: + call->request_set[i] = REQSET_EMPTY; + if (!master->success) { + call->write_state = WRITE_STATE_WRITE_CLOSED; + } + break; + case GRPC_IOREQ_SEND_STATUS: + if (call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details != + NULL) { + GRPC_MDSTR_UNREF( + call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details); + call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details = + NULL; + } + break; + case GRPC_IOREQ_RECV_CLOSE: + case GRPC_IOREQ_SEND_INITIAL_METADATA: + case GRPC_IOREQ_SEND_TRAILING_METADATA: + case GRPC_IOREQ_SEND_CLOSE: + break; + case GRPC_IOREQ_RECV_STATUS: + get_final_status(call, call->request_data[GRPC_IOREQ_RECV_STATUS]); + break; + case GRPC_IOREQ_RECV_STATUS_DETAILS: + get_final_details(call, + call->request_data[GRPC_IOREQ_RECV_STATUS_DETAILS]); + break; + case GRPC_IOREQ_RECV_INITIAL_METADATA: + GPR_SWAP(grpc_metadata_array, call->buffered_metadata[0], + *call->request_data[GRPC_IOREQ_RECV_INITIAL_METADATA] + .recv_metadata); + break; + case GRPC_IOREQ_RECV_TRAILING_METADATA: + GPR_SWAP(grpc_metadata_array, call->buffered_metadata[1], + *call->request_data[GRPC_IOREQ_RECV_TRAILING_METADATA] + .recv_metadata); + break; + case GRPC_IOREQ_OP_COUNT: + abort(); + break; + } + } + cr = &call->completed_requests[call->num_completed_requests++]; + cr->success = master->success; + cr->on_complete = master->on_complete; + cr->user_data = master->user_data; + } } -static void -finish_ioreq_op (grpc_call * call, grpc_ioreq_op op, int success) -{ - if (is_op_live (call, op)) - { - finish_live_ioreq_op (call, op, success); - } +static void finish_ioreq_op(grpc_call *call, grpc_ioreq_op op, int success) { + if (is_op_live(call, op)) { + finish_live_ioreq_op(call, op, success); + } } -static void -early_out_write_ops (grpc_call * call) -{ - switch (call->write_state) - { +static void early_out_write_ops(grpc_call *call) { + switch (call->write_state) { case WRITE_STATE_WRITE_CLOSED: - finish_ioreq_op (call, GRPC_IOREQ_SEND_MESSAGE, 0); - finish_ioreq_op (call, GRPC_IOREQ_SEND_STATUS, 0); - finish_ioreq_op (call, GRPC_IOREQ_SEND_TRAILING_METADATA, 0); - finish_ioreq_op (call, GRPC_IOREQ_SEND_CLOSE, 1); - /* fallthrough */ + finish_ioreq_op(call, GRPC_IOREQ_SEND_MESSAGE, 0); + finish_ioreq_op(call, GRPC_IOREQ_SEND_STATUS, 0); + finish_ioreq_op(call, GRPC_IOREQ_SEND_TRAILING_METADATA, 0); + finish_ioreq_op(call, GRPC_IOREQ_SEND_CLOSE, 1); + /* fallthrough */ case WRITE_STATE_STARTED: - finish_ioreq_op (call, GRPC_IOREQ_SEND_INITIAL_METADATA, 0); - /* fallthrough */ + finish_ioreq_op(call, GRPC_IOREQ_SEND_INITIAL_METADATA, 0); + /* fallthrough */ case WRITE_STATE_INITIAL: /* do nothing */ break; - } + } } -static void -call_on_done_send (grpc_exec_ctx * exec_ctx, void *pc, int success) -{ +static void call_on_done_send(grpc_exec_ctx *exec_ctx, void *pc, int success) { grpc_call *call = pc; - lock (call); - if (call->last_send_contains & (1 << GRPC_IOREQ_SEND_INITIAL_METADATA)) - { - finish_ioreq_op (call, GRPC_IOREQ_SEND_INITIAL_METADATA, success); - call->write_state = WRITE_STATE_STARTED; - } - if (call->last_send_contains & (1 << GRPC_IOREQ_SEND_MESSAGE)) - { - finish_ioreq_op (call, GRPC_IOREQ_SEND_MESSAGE, success); - } - if (call->last_send_contains & (1 << GRPC_IOREQ_SEND_CLOSE)) - { - finish_ioreq_op (call, GRPC_IOREQ_SEND_TRAILING_METADATA, success); - finish_ioreq_op (call, GRPC_IOREQ_SEND_STATUS, success); - finish_ioreq_op (call, GRPC_IOREQ_SEND_CLOSE, 1); - call->write_state = WRITE_STATE_WRITE_CLOSED; - } - if (!success) - { - call->write_state = WRITE_STATE_WRITE_CLOSED; - early_out_write_ops (call); - } + lock(call); + if (call->last_send_contains & (1 << GRPC_IOREQ_SEND_INITIAL_METADATA)) { + finish_ioreq_op(call, GRPC_IOREQ_SEND_INITIAL_METADATA, success); + call->write_state = WRITE_STATE_STARTED; + } + if (call->last_send_contains & (1 << GRPC_IOREQ_SEND_MESSAGE)) { + finish_ioreq_op(call, GRPC_IOREQ_SEND_MESSAGE, success); + } + if (call->last_send_contains & (1 << GRPC_IOREQ_SEND_CLOSE)) { + finish_ioreq_op(call, GRPC_IOREQ_SEND_TRAILING_METADATA, success); + finish_ioreq_op(call, GRPC_IOREQ_SEND_STATUS, success); + finish_ioreq_op(call, GRPC_IOREQ_SEND_CLOSE, 1); + call->write_state = WRITE_STATE_WRITE_CLOSED; + } + if (!success) { + call->write_state = WRITE_STATE_WRITE_CLOSED; + early_out_write_ops(call); + } call->send_ops.nops = 0; call->last_send_contains = 0; call->sending = 0; - unlock (exec_ctx, call); - GRPC_CALL_INTERNAL_UNREF (exec_ctx, call, "sending"); + unlock(exec_ctx, call); + GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, "sending"); } -static void -finish_message (grpc_call * call) -{ - if (call->error_status_set == 0) - { - /* TODO(ctiller): this could be a lot faster if coded directly */ - grpc_byte_buffer *byte_buffer; - /* some aliases for readability */ - gpr_slice *slices = call->incoming_message.slices; - const size_t nslices = call->incoming_message.count; - - if ((call->incoming_message_flags & GRPC_WRITE_INTERNAL_COMPRESS) && (call->compression_algorithm > GRPC_COMPRESS_NONE)) - { - byte_buffer = grpc_raw_compressed_byte_buffer_create (slices, nslices, call->compression_algorithm); - } - else - { - byte_buffer = grpc_raw_byte_buffer_create (slices, nslices); - } - grpc_bbq_push (&call->incoming_queue, byte_buffer); - } - gpr_slice_buffer_reset_and_unref (&call->incoming_message); - GPR_ASSERT (call->incoming_message.count == 0); +static void finish_message(grpc_call *call) { + if (call->error_status_set == 0) { + /* TODO(ctiller): this could be a lot faster if coded directly */ + grpc_byte_buffer *byte_buffer; + /* some aliases for readability */ + gpr_slice *slices = call->incoming_message.slices; + const size_t nslices = call->incoming_message.count; + + if ((call->incoming_message_flags & GRPC_WRITE_INTERNAL_COMPRESS) && + (call->compression_algorithm > GRPC_COMPRESS_NONE)) { + byte_buffer = grpc_raw_compressed_byte_buffer_create( + slices, nslices, call->compression_algorithm); + } else { + byte_buffer = grpc_raw_byte_buffer_create(slices, nslices); + } + grpc_bbq_push(&call->incoming_queue, byte_buffer); + } + gpr_slice_buffer_reset_and_unref(&call->incoming_message); + GPR_ASSERT(call->incoming_message.count == 0); call->reading_message = 0; } -static int -begin_message (grpc_call * call, grpc_begin_message msg) -{ +static int begin_message(grpc_call *call, grpc_begin_message msg) { /* can't begin a message when we're still reading a message */ - if (call->reading_message) - { - char *message = NULL; - gpr_asprintf (&message, "Message terminated early; read %d bytes, expected %d", (int) call->incoming_message.length, (int) call->incoming_message_length); - cancel_with_status (call, GRPC_STATUS_INVALID_ARGUMENT, message); - gpr_free (message); - return 0; - } + if (call->reading_message) { + char *message = NULL; + gpr_asprintf( + &message, "Message terminated early; read %d bytes, expected %d", + (int)call->incoming_message.length, (int)call->incoming_message_length); + cancel_with_status(call, GRPC_STATUS_INVALID_ARGUMENT, message); + gpr_free(message); + return 0; + } /* sanity check: if message flags indicate a compressed message, the * compression level should already be present in the call, as parsed off its * corresponding metadata. */ - if ((msg.flags & GRPC_WRITE_INTERNAL_COMPRESS) && (call->compression_algorithm == GRPC_COMPRESS_NONE)) - { - char *message = NULL; - char *alg_name; - if (!grpc_compression_algorithm_name (call->compression_algorithm, &alg_name)) - { - /* This shouldn't happen, other than due to data corruption */ - alg_name = ""; - } - gpr_asprintf (&message, "Invalid compression algorithm (%s) for compressed message.", alg_name); - cancel_with_status (call, GRPC_STATUS_INTERNAL, message); - gpr_free (message); - return 0; - } + if ((msg.flags & GRPC_WRITE_INTERNAL_COMPRESS) && + (call->compression_algorithm == GRPC_COMPRESS_NONE)) { + char *message = NULL; + char *alg_name; + if (!grpc_compression_algorithm_name(call->compression_algorithm, + &alg_name)) { + /* This shouldn't happen, other than due to data corruption */ + alg_name = ""; + } + gpr_asprintf(&message, + "Invalid compression algorithm (%s) for compressed message.", + alg_name); + cancel_with_status(call, GRPC_STATUS_INTERNAL, message); + gpr_free(message); + return 0; + } /* stash away parameters, and prepare for incoming slices */ - if (msg.length > grpc_channel_get_max_message_length (call->channel)) - { - char *message = NULL; - gpr_asprintf (&message, "Maximum message length of %d exceeded by a message of length %d", grpc_channel_get_max_message_length (call->channel), msg.length); - cancel_with_status (call, GRPC_STATUS_INVALID_ARGUMENT, message); - gpr_free (message); - return 0; - } - else if (msg.length > 0) - { - call->reading_message = 1; - call->incoming_message_length = msg.length; - call->incoming_message_flags = msg.flags; - return 1; - } - else - { - finish_message (call); - return 1; - } + if (msg.length > grpc_channel_get_max_message_length(call->channel)) { + char *message = NULL; + gpr_asprintf( + &message, + "Maximum message length of %d exceeded by a message of length %d", + grpc_channel_get_max_message_length(call->channel), msg.length); + cancel_with_status(call, GRPC_STATUS_INVALID_ARGUMENT, message); + gpr_free(message); + return 0; + } else if (msg.length > 0) { + call->reading_message = 1; + call->incoming_message_length = msg.length; + call->incoming_message_flags = msg.flags; + return 1; + } else { + finish_message(call); + return 1; + } } -static int -add_slice_to_message (grpc_call * call, gpr_slice slice) -{ - if (GPR_SLICE_LENGTH (slice) == 0) - { - gpr_slice_unref (slice); - return 1; - } +static int add_slice_to_message(grpc_call *call, gpr_slice slice) { + if (GPR_SLICE_LENGTH(slice) == 0) { + gpr_slice_unref(slice); + return 1; + } /* we have to be reading a message to know what to do here */ - if (!call->reading_message) - { - cancel_with_status (call, GRPC_STATUS_INVALID_ARGUMENT, "Received payload data while not reading a message"); - return 0; - } + if (!call->reading_message) { + cancel_with_status(call, GRPC_STATUS_INVALID_ARGUMENT, + "Received payload data while not reading a message"); + return 0; + } /* append the slice to the incoming buffer */ - gpr_slice_buffer_add (&call->incoming_message, slice); - if (call->incoming_message.length > call->incoming_message_length) - { - /* if we got too many bytes, complain */ - char *message = NULL; - gpr_asprintf (&message, "Receiving message overflow; read %d bytes, expected %d", (int) call->incoming_message.length, (int) call->incoming_message_length); - cancel_with_status (call, GRPC_STATUS_INVALID_ARGUMENT, message); - gpr_free (message); - return 0; - } - else if (call->incoming_message.length == call->incoming_message_length) - { - finish_message (call); - return 1; - } - else - { - return 1; - } + gpr_slice_buffer_add(&call->incoming_message, slice); + if (call->incoming_message.length > call->incoming_message_length) { + /* if we got too many bytes, complain */ + char *message = NULL; + gpr_asprintf( + &message, "Receiving message overflow; read %d bytes, expected %d", + (int)call->incoming_message.length, (int)call->incoming_message_length); + cancel_with_status(call, GRPC_STATUS_INVALID_ARGUMENT, message); + gpr_free(message); + return 0; + } else if (call->incoming_message.length == call->incoming_message_length) { + finish_message(call); + return 1; + } else { + return 1; + } } -static void -call_on_done_recv (grpc_exec_ctx * exec_ctx, void *pc, int success) -{ +static void call_on_done_recv(grpc_exec_ctx *exec_ctx, void *pc, int success) { grpc_call *call = pc; grpc_call *child_call; grpc_call *next_child_call; size_t i; - GRPC_TIMER_BEGIN (GRPC_PTAG_CALL_ON_DONE_RECV, 0); - lock (call); + GRPC_TIMER_BEGIN(GRPC_PTAG_CALL_ON_DONE_RECV, 0); + lock(call); call->receiving = 0; - if (success) - { - for (i = 0; success && i < call->recv_ops.nops; i++) - { - grpc_stream_op *op = &call->recv_ops.ops[i]; - switch (op->type) - { - case GRPC_NO_OP: - break; - case GRPC_OP_METADATA: - recv_metadata (exec_ctx, call, &op->data.metadata); - break; - case GRPC_OP_BEGIN_MESSAGE: - success = begin_message (call, op->data.begin_message); - break; - case GRPC_OP_SLICE: - success = add_slice_to_message (call, op->data.slice); - break; - } - } - if (!success) - { - grpc_stream_ops_unref_owned_objects (&call->recv_ops.ops[i], call->recv_ops.nops - i); - } - if (call->recv_state == GRPC_STREAM_RECV_CLOSED) - { - GPR_ASSERT (call->read_state <= READ_STATE_READ_CLOSED); - call->read_state = READ_STATE_READ_CLOSED; - } - if (call->recv_state == GRPC_STREAM_CLOSED) - { - GPR_ASSERT (call->read_state <= READ_STATE_STREAM_CLOSED); - call->read_state = READ_STATE_STREAM_CLOSED; - if (call->have_alarm) - { - grpc_alarm_cancel (exec_ctx, &call->alarm); - } - /* propagate cancellation to any interested children */ - child_call = call->first_child; - if (child_call != NULL) - { - do - { - next_child_call = child_call->sibling_next; - if (child_call->cancellation_is_inherited) - { - GRPC_CALL_INTERNAL_REF (child_call, "propagate_cancel"); - grpc_call_cancel (child_call, NULL); - GRPC_CALL_INTERNAL_UNREF (exec_ctx, child_call, "propagate_cancel"); - } - child_call = next_child_call; - } - while (child_call != call->first_child); - } - GRPC_CALL_INTERNAL_UNREF (exec_ctx, call, "closed"); - } - finish_read_ops (call); - } - else - { - finish_ioreq_op (call, GRPC_IOREQ_RECV_MESSAGE, 0); - finish_ioreq_op (call, GRPC_IOREQ_RECV_STATUS, 0); - finish_ioreq_op (call, GRPC_IOREQ_RECV_CLOSE, 0); - finish_ioreq_op (call, GRPC_IOREQ_RECV_TRAILING_METADATA, 0); - finish_ioreq_op (call, GRPC_IOREQ_RECV_INITIAL_METADATA, 0); - finish_ioreq_op (call, GRPC_IOREQ_RECV_STATUS_DETAILS, 0); - } + if (success) { + for (i = 0; success && i < call->recv_ops.nops; i++) { + grpc_stream_op *op = &call->recv_ops.ops[i]; + switch (op->type) { + case GRPC_NO_OP: + break; + case GRPC_OP_METADATA: + recv_metadata(exec_ctx, call, &op->data.metadata); + break; + case GRPC_OP_BEGIN_MESSAGE: + success = begin_message(call, op->data.begin_message); + break; + case GRPC_OP_SLICE: + success = add_slice_to_message(call, op->data.slice); + break; + } + } + if (!success) { + grpc_stream_ops_unref_owned_objects(&call->recv_ops.ops[i], + call->recv_ops.nops - i); + } + if (call->recv_state == GRPC_STREAM_RECV_CLOSED) { + GPR_ASSERT(call->read_state <= READ_STATE_READ_CLOSED); + call->read_state = READ_STATE_READ_CLOSED; + } + if (call->recv_state == GRPC_STREAM_CLOSED) { + GPR_ASSERT(call->read_state <= READ_STATE_STREAM_CLOSED); + call->read_state = READ_STATE_STREAM_CLOSED; + if (call->have_alarm) { + grpc_alarm_cancel(exec_ctx, &call->alarm); + } + /* propagate cancellation to any interested children */ + child_call = call->first_child; + if (child_call != NULL) { + do { + next_child_call = child_call->sibling_next; + if (child_call->cancellation_is_inherited) { + GRPC_CALL_INTERNAL_REF(child_call, "propagate_cancel"); + grpc_call_cancel(child_call, NULL); + GRPC_CALL_INTERNAL_UNREF(exec_ctx, child_call, "propagate_cancel"); + } + child_call = next_child_call; + } while (child_call != call->first_child); + } + GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, "closed"); + } + finish_read_ops(call); + } else { + finish_ioreq_op(call, GRPC_IOREQ_RECV_MESSAGE, 0); + finish_ioreq_op(call, GRPC_IOREQ_RECV_STATUS, 0); + finish_ioreq_op(call, GRPC_IOREQ_RECV_CLOSE, 0); + finish_ioreq_op(call, GRPC_IOREQ_RECV_TRAILING_METADATA, 0); + finish_ioreq_op(call, GRPC_IOREQ_RECV_INITIAL_METADATA, 0); + finish_ioreq_op(call, GRPC_IOREQ_RECV_STATUS_DETAILS, 0); + } call->recv_ops.nops = 0; - unlock (exec_ctx, call); + unlock(exec_ctx, call); - GRPC_CALL_INTERNAL_UNREF (exec_ctx, call, "receiving"); - GRPC_TIMER_END (GRPC_PTAG_CALL_ON_DONE_RECV, 0); + GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, "receiving"); + GRPC_TIMER_END(GRPC_PTAG_CALL_ON_DONE_RECV, 0); } -static int -prepare_application_metadata (grpc_call * call, size_t count, grpc_metadata * metadata) -{ +static int prepare_application_metadata(grpc_call *call, size_t count, + grpc_metadata *metadata) { size_t i; - for (i = 0; i < count; i++) - { - grpc_metadata *md = &metadata[i]; - grpc_metadata *next_md = (i == count - 1) ? NULL : &metadata[i + 1]; - grpc_metadata *prev_md = (i == 0) ? NULL : &metadata[i - 1]; - grpc_linked_mdelem *l = (grpc_linked_mdelem *) & md->internal_data; - GPR_ASSERT (sizeof (grpc_linked_mdelem) == sizeof (md->internal_data)); - l->md = grpc_mdelem_from_string_and_buffer (call->metadata_context, md->key, (const gpr_uint8 *) md->value, md->value_length, 1); - if (!grpc_mdstr_is_legal_header (l->md->key)) - { - gpr_log (GPR_ERROR, "attempt to send invalid metadata key: %s", grpc_mdstr_as_c_string (l->md->key)); - return 0; - } - else if (!grpc_mdstr_is_bin_suffixed (l->md->key) && !grpc_mdstr_is_legal_nonbin_header (l->md->value)) - { - gpr_log (GPR_ERROR, "attempt to send invalid metadata value"); - return 0; - } - l->next = next_md ? (grpc_linked_mdelem *) & next_md->internal_data : NULL; - l->prev = prev_md ? (grpc_linked_mdelem *) & prev_md->internal_data : NULL; + for (i = 0; i < count; i++) { + grpc_metadata *md = &metadata[i]; + grpc_metadata *next_md = (i == count - 1) ? NULL : &metadata[i + 1]; + grpc_metadata *prev_md = (i == 0) ? NULL : &metadata[i - 1]; + grpc_linked_mdelem *l = (grpc_linked_mdelem *)&md->internal_data; + GPR_ASSERT(sizeof(grpc_linked_mdelem) == sizeof(md->internal_data)); + l->md = grpc_mdelem_from_string_and_buffer(call->metadata_context, md->key, + (const gpr_uint8 *)md->value, + md->value_length, 1); + if (!grpc_mdstr_is_legal_header(l->md->key)) { + gpr_log(GPR_ERROR, "attempt to send invalid metadata key: %s", + grpc_mdstr_as_c_string(l->md->key)); + return 0; + } else if (!grpc_mdstr_is_bin_suffixed(l->md->key) && + !grpc_mdstr_is_legal_nonbin_header(l->md->value)) { + gpr_log(GPR_ERROR, "attempt to send invalid metadata value"); + return 0; } + l->next = next_md ? (grpc_linked_mdelem *)&next_md->internal_data : NULL; + l->prev = prev_md ? (grpc_linked_mdelem *)&prev_md->internal_data : NULL; + } return 1; } -static grpc_mdelem_list -chain_metadata_from_app (grpc_call * call, size_t count, grpc_metadata * metadata) -{ +static grpc_mdelem_list chain_metadata_from_app(grpc_call *call, size_t count, + grpc_metadata *metadata) { grpc_mdelem_list out; - if (count == 0) - { - out.head = out.tail = NULL; - return out; - } - out.head = (grpc_linked_mdelem *) & (metadata[0].internal_data); - out.tail = (grpc_linked_mdelem *) & (metadata[count - 1].internal_data); + if (count == 0) { + out.head = out.tail = NULL; + return out; + } + out.head = (grpc_linked_mdelem *)&(metadata[0].internal_data); + out.tail = (grpc_linked_mdelem *)&(metadata[count - 1].internal_data); return out; } /* Copy the contents of a byte buffer into stream ops */ -static void -copy_byte_buffer_to_stream_ops (grpc_byte_buffer * byte_buffer, grpc_stream_op_buffer * sopb) -{ +static void copy_byte_buffer_to_stream_ops(grpc_byte_buffer *byte_buffer, + grpc_stream_op_buffer *sopb) { size_t i; - switch (byte_buffer->type) - { + switch (byte_buffer->type) { case GRPC_BB_RAW: - for (i = 0; i < byte_buffer->data.raw.slice_buffer.count; i++) - { - gpr_slice slice = byte_buffer->data.raw.slice_buffer.slices[i]; - gpr_slice_ref (slice); - grpc_sopb_add_slice (sopb, slice); - } + for (i = 0; i < byte_buffer->data.raw.slice_buffer.count; i++) { + gpr_slice slice = byte_buffer->data.raw.slice_buffer.slices[i]; + gpr_slice_ref(slice); + grpc_sopb_add_slice(sopb, slice); + } break; - } + } } -static int -fill_send_ops (grpc_call * call, grpc_transport_stream_op * op) -{ +static int fill_send_ops(grpc_call *call, grpc_transport_stream_op *op) { grpc_ioreq_data data; gpr_uint32 flags; grpc_metadata_batch mdb; size_t i; - GPR_ASSERT (op->send_ops == NULL); + GPR_ASSERT(op->send_ops == NULL); - switch (call->write_state) - { + switch (call->write_state) { case WRITE_STATE_INITIAL: - if (!is_op_live (call, GRPC_IOREQ_SEND_INITIAL_METADATA)) - { - break; - } + if (!is_op_live(call, GRPC_IOREQ_SEND_INITIAL_METADATA)) { + break; + } data = call->request_data[GRPC_IOREQ_SEND_INITIAL_METADATA]; - mdb.list = chain_metadata_from_app (call, data.send_metadata.count, data.send_metadata.metadata); + mdb.list = chain_metadata_from_app(call, data.send_metadata.count, + data.send_metadata.metadata); mdb.garbage.head = mdb.garbage.tail = NULL; mdb.deadline = call->send_deadline; - for (i = 0; i < call->send_initial_metadata_count; i++) - { - grpc_metadata_batch_link_head (&mdb, &call->send_initial_metadata[i]); - } - grpc_sopb_add_metadata (&call->send_ops, mdb); + for (i = 0; i < call->send_initial_metadata_count; i++) { + grpc_metadata_batch_link_head(&mdb, &call->send_initial_metadata[i]); + } + grpc_sopb_add_metadata(&call->send_ops, mdb); op->send_ops = &call->send_ops; call->last_send_contains |= 1 << GRPC_IOREQ_SEND_INITIAL_METADATA; call->send_initial_metadata_count = 0; - /* fall through intended */ + /* fall through intended */ case WRITE_STATE_STARTED: - if (is_op_live (call, GRPC_IOREQ_SEND_MESSAGE)) - { - size_t length; - data = call->request_data[GRPC_IOREQ_SEND_MESSAGE]; - flags = call->request_flags[GRPC_IOREQ_SEND_MESSAGE]; - length = grpc_byte_buffer_length (data.send_message); - GPR_ASSERT (length <= GPR_UINT32_MAX); - grpc_sopb_add_begin_message (&call->send_ops, (gpr_uint32) length, flags); - copy_byte_buffer_to_stream_ops (data.send_message, &call->send_ops); - op->send_ops = &call->send_ops; - call->last_send_contains |= 1 << GRPC_IOREQ_SEND_MESSAGE; - } - if (is_op_live (call, GRPC_IOREQ_SEND_CLOSE)) - { - op->is_last_send = 1; - op->send_ops = &call->send_ops; - call->last_send_contains |= 1 << GRPC_IOREQ_SEND_CLOSE; - if (!call->is_client) - { - /* send trailing metadata */ - data = call->request_data[GRPC_IOREQ_SEND_TRAILING_METADATA]; - mdb.list = chain_metadata_from_app (call, data.send_metadata.count, data.send_metadata.metadata); - mdb.garbage.head = mdb.garbage.tail = NULL; - mdb.deadline = gpr_inf_future (GPR_CLOCK_REALTIME); - /* send status */ - /* TODO(ctiller): cache common status values */ - data = call->request_data[GRPC_IOREQ_SEND_STATUS]; - grpc_metadata_batch_add_tail (&mdb, &call->status_link, grpc_channel_get_reffed_status_elem (call->channel, data.send_status.code)); - if (data.send_status.details) - { - grpc_metadata_batch_add_tail (&mdb, &call->details_link, grpc_mdelem_from_metadata_strings (call->metadata_context, GRPC_MDSTR_REF (grpc_channel_get_message_string (call->channel)), data.send_status.details)); - call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details = NULL; - } - grpc_sopb_add_metadata (&call->send_ops, mdb); - } - } + if (is_op_live(call, GRPC_IOREQ_SEND_MESSAGE)) { + size_t length; + data = call->request_data[GRPC_IOREQ_SEND_MESSAGE]; + flags = call->request_flags[GRPC_IOREQ_SEND_MESSAGE]; + length = grpc_byte_buffer_length(data.send_message); + GPR_ASSERT(length <= GPR_UINT32_MAX); + grpc_sopb_add_begin_message(&call->send_ops, (gpr_uint32)length, flags); + copy_byte_buffer_to_stream_ops(data.send_message, &call->send_ops); + op->send_ops = &call->send_ops; + call->last_send_contains |= 1 << GRPC_IOREQ_SEND_MESSAGE; + } + if (is_op_live(call, GRPC_IOREQ_SEND_CLOSE)) { + op->is_last_send = 1; + op->send_ops = &call->send_ops; + call->last_send_contains |= 1 << GRPC_IOREQ_SEND_CLOSE; + if (!call->is_client) { + /* send trailing metadata */ + data = call->request_data[GRPC_IOREQ_SEND_TRAILING_METADATA]; + mdb.list = chain_metadata_from_app(call, data.send_metadata.count, + data.send_metadata.metadata); + mdb.garbage.head = mdb.garbage.tail = NULL; + mdb.deadline = gpr_inf_future(GPR_CLOCK_REALTIME); + /* send status */ + /* TODO(ctiller): cache common status values */ + data = call->request_data[GRPC_IOREQ_SEND_STATUS]; + grpc_metadata_batch_add_tail( + &mdb, &call->status_link, + grpc_channel_get_reffed_status_elem(call->channel, + data.send_status.code)); + if (data.send_status.details) { + grpc_metadata_batch_add_tail( + &mdb, &call->details_link, + grpc_mdelem_from_metadata_strings( + call->metadata_context, + GRPC_MDSTR_REF( + grpc_channel_get_message_string(call->channel)), + data.send_status.details)); + call->request_data[GRPC_IOREQ_SEND_STATUS].send_status.details = + NULL; + } + grpc_sopb_add_metadata(&call->send_ops, mdb); + } + } break; case WRITE_STATE_WRITE_CLOSED: break; - } - if (op->send_ops) - { - op->on_done_send = &call->on_done_send; - } + } + if (op->send_ops) { + op->on_done_send = &call->on_done_send; + } return op->send_ops != NULL; } -static grpc_call_error -start_ioreq_error (grpc_call * call, gpr_uint32 mutated_ops, grpc_call_error ret) -{ +static grpc_call_error start_ioreq_error(grpc_call *call, + gpr_uint32 mutated_ops, + grpc_call_error ret) { size_t i; - for (i = 0; i < GRPC_IOREQ_OP_COUNT; i++) - { - if (mutated_ops & (1u << i)) - { - call->request_set[i] = REQSET_EMPTY; - } + for (i = 0; i < GRPC_IOREQ_OP_COUNT; i++) { + if (mutated_ops & (1u << i)) { + call->request_set[i] = REQSET_EMPTY; } + } return ret; } -static void -finish_read_ops (grpc_call * call) -{ +static void finish_read_ops(grpc_call *call) { int empty; - if (is_op_live (call, GRPC_IOREQ_RECV_MESSAGE)) - { - empty = (NULL == (*call->request_data[GRPC_IOREQ_RECV_MESSAGE].recv_message = grpc_bbq_pop (&call->incoming_queue))); - if (!empty) - { - finish_live_ioreq_op (call, GRPC_IOREQ_RECV_MESSAGE, 1); - empty = grpc_bbq_empty (&call->incoming_queue); - } - } - else - { - empty = grpc_bbq_empty (&call->incoming_queue); + if (is_op_live(call, GRPC_IOREQ_RECV_MESSAGE)) { + empty = + (NULL == (*call->request_data[GRPC_IOREQ_RECV_MESSAGE].recv_message = + grpc_bbq_pop(&call->incoming_queue))); + if (!empty) { + finish_live_ioreq_op(call, GRPC_IOREQ_RECV_MESSAGE, 1); + empty = grpc_bbq_empty(&call->incoming_queue); } + } else { + empty = grpc_bbq_empty(&call->incoming_queue); + } - switch (call->read_state) - { + switch (call->read_state) { case READ_STATE_STREAM_CLOSED: - if (empty && !call->have_alarm) - { - finish_ioreq_op (call, GRPC_IOREQ_RECV_CLOSE, 1); - } - /* fallthrough */ + if (empty && !call->have_alarm) { + finish_ioreq_op(call, GRPC_IOREQ_RECV_CLOSE, 1); + } + /* fallthrough */ case READ_STATE_READ_CLOSED: - if (empty) - { - finish_ioreq_op (call, GRPC_IOREQ_RECV_MESSAGE, 1); - } - finish_ioreq_op (call, GRPC_IOREQ_RECV_STATUS, 1); - finish_ioreq_op (call, GRPC_IOREQ_RECV_STATUS_DETAILS, 1); - finish_ioreq_op (call, GRPC_IOREQ_RECV_TRAILING_METADATA, 1); - /* fallthrough */ + if (empty) { + finish_ioreq_op(call, GRPC_IOREQ_RECV_MESSAGE, 1); + } + finish_ioreq_op(call, GRPC_IOREQ_RECV_STATUS, 1); + finish_ioreq_op(call, GRPC_IOREQ_RECV_STATUS_DETAILS, 1); + finish_ioreq_op(call, GRPC_IOREQ_RECV_TRAILING_METADATA, 1); + /* fallthrough */ case READ_STATE_GOT_INITIAL_METADATA: - finish_ioreq_op (call, GRPC_IOREQ_RECV_INITIAL_METADATA, 1); - /* fallthrough */ + finish_ioreq_op(call, GRPC_IOREQ_RECV_INITIAL_METADATA, 1); + /* fallthrough */ case READ_STATE_INITIAL: /* do nothing */ break; - } + } } -static grpc_call_error -start_ioreq (grpc_call * call, const grpc_ioreq * reqs, size_t nreqs, grpc_ioreq_completion_func completion, void *user_data) -{ +static grpc_call_error start_ioreq(grpc_call *call, const grpc_ioreq *reqs, + size_t nreqs, + grpc_ioreq_completion_func completion, + void *user_data) { size_t i; gpr_uint16 have_ops = 0; grpc_ioreq_op op; @@ -1326,46 +1214,43 @@ start_ioreq (grpc_call * call, const grpc_ioreq * reqs, size_t nreqs, grpc_ioreq grpc_ioreq_data data; gpr_uint8 set; - if (nreqs == 0) - { - return GRPC_CALL_OK; - } + if (nreqs == 0) { + return GRPC_CALL_OK; + } set = reqs[0].op; - for (i = 0; i < nreqs; i++) - { - op = reqs[i].op; - if (call->request_set[op] < GRPC_IOREQ_OP_COUNT) - { - return start_ioreq_error (call, have_ops, GRPC_CALL_ERROR_TOO_MANY_OPERATIONS); - } - else if (call->request_set[op] == REQSET_DONE) - { - return start_ioreq_error (call, have_ops, GRPC_CALL_ERROR_ALREADY_INVOKED); - } - data = reqs[i].data; - if (op == GRPC_IOREQ_SEND_INITIAL_METADATA || op == GRPC_IOREQ_SEND_TRAILING_METADATA) - { - if (!prepare_application_metadata (call, data.send_metadata.count, data.send_metadata.metadata)) - { - return start_ioreq_error (call, have_ops, GRPC_CALL_ERROR_INVALID_METADATA); - } - } - if (op == GRPC_IOREQ_SEND_STATUS) - { - set_status_code (call, STATUS_FROM_SERVER_STATUS, (gpr_uint32) reqs[i].data.send_status.code); - if (reqs[i].data.send_status.details) - { - set_status_details (call, STATUS_FROM_SERVER_STATUS, GRPC_MDSTR_REF (reqs[i].data.send_status.details)); - } - } - have_ops |= (gpr_uint16) (1u << op); - - call->request_data[op] = data; - call->request_flags[op] = reqs[i].flags; - call->request_set[op] = set; - } + for (i = 0; i < nreqs; i++) { + op = reqs[i].op; + if (call->request_set[op] < GRPC_IOREQ_OP_COUNT) { + return start_ioreq_error(call, have_ops, + GRPC_CALL_ERROR_TOO_MANY_OPERATIONS); + } else if (call->request_set[op] == REQSET_DONE) { + return start_ioreq_error(call, have_ops, GRPC_CALL_ERROR_ALREADY_INVOKED); + } + data = reqs[i].data; + if (op == GRPC_IOREQ_SEND_INITIAL_METADATA || + op == GRPC_IOREQ_SEND_TRAILING_METADATA) { + if (!prepare_application_metadata(call, data.send_metadata.count, + data.send_metadata.metadata)) { + return start_ioreq_error(call, have_ops, + GRPC_CALL_ERROR_INVALID_METADATA); + } + } + if (op == GRPC_IOREQ_SEND_STATUS) { + set_status_code(call, STATUS_FROM_SERVER_STATUS, + (gpr_uint32)reqs[i].data.send_status.code); + if (reqs[i].data.send_status.details) { + set_status_details(call, STATUS_FROM_SERVER_STATUS, + GRPC_MDSTR_REF(reqs[i].data.send_status.details)); + } + } + have_ops |= (gpr_uint16)(1u << op); + + call->request_data[op] = data; + call->request_flags[op] = reqs[i].flags; + call->request_set[op] = set; + } master = &call->masters[set]; master->success = 1; @@ -1374,251 +1259,218 @@ start_ioreq (grpc_call * call, const grpc_ioreq * reqs, size_t nreqs, grpc_ioreq master->on_complete = completion; master->user_data = user_data; - finish_read_ops (call); - early_out_write_ops (call); + finish_read_ops(call); + early_out_write_ops(call); return GRPC_CALL_OK; } -grpc_call_error -grpc_call_start_ioreq_and_call_back (grpc_exec_ctx * exec_ctx, grpc_call * call, const grpc_ioreq * reqs, size_t nreqs, grpc_ioreq_completion_func on_complete, void *user_data) -{ +grpc_call_error grpc_call_start_ioreq_and_call_back( + grpc_exec_ctx *exec_ctx, grpc_call *call, const grpc_ioreq *reqs, + size_t nreqs, grpc_ioreq_completion_func on_complete, void *user_data) { grpc_call_error err; - lock (call); - err = start_ioreq (call, reqs, nreqs, on_complete, user_data); - unlock (exec_ctx, call); + lock(call); + err = start_ioreq(call, reqs, nreqs, on_complete, user_data); + unlock(exec_ctx, call); return err; } -void -grpc_call_destroy (grpc_call * c) -{ +void grpc_call_destroy(grpc_call *c) { int cancel; grpc_call *parent = c->parent; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - if (parent) - { - gpr_mu_lock (&parent->mu); - if (c == parent->first_child) - { - parent->first_child = c->sibling_next; - if (c == parent->first_child) - { - parent->first_child = NULL; - } - c->sibling_prev->sibling_next = c->sibling_next; - c->sibling_next->sibling_prev = c->sibling_prev; - } - gpr_mu_unlock (&parent->mu); - GRPC_CALL_INTERNAL_UNREF (&exec_ctx, parent, "child"); - } - - lock (c); - GPR_ASSERT (!c->destroy_called); + if (parent) { + gpr_mu_lock(&parent->mu); + if (c == parent->first_child) { + parent->first_child = c->sibling_next; + if (c == parent->first_child) { + parent->first_child = NULL; + } + c->sibling_prev->sibling_next = c->sibling_next; + c->sibling_next->sibling_prev = c->sibling_prev; + } + gpr_mu_unlock(&parent->mu); + GRPC_CALL_INTERNAL_UNREF(&exec_ctx, parent, "child"); + } + + lock(c); + GPR_ASSERT(!c->destroy_called); c->destroy_called = 1; - if (c->have_alarm) - { - grpc_alarm_cancel (&exec_ctx, &c->alarm); - } + if (c->have_alarm) { + grpc_alarm_cancel(&exec_ctx, &c->alarm); + } cancel = c->read_state != READ_STATE_STREAM_CLOSED; - unlock (&exec_ctx, c); - if (cancel) - grpc_call_cancel (c, NULL); - GRPC_CALL_INTERNAL_UNREF (&exec_ctx, c, "destroy"); - grpc_exec_ctx_finish (&exec_ctx); + unlock(&exec_ctx, c); + if (cancel) grpc_call_cancel(c, NULL); + GRPC_CALL_INTERNAL_UNREF(&exec_ctx, c, "destroy"); + grpc_exec_ctx_finish(&exec_ctx); } -grpc_call_error -grpc_call_cancel (grpc_call * call, void *reserved) -{ - GPR_ASSERT (!reserved); - return grpc_call_cancel_with_status (call, GRPC_STATUS_CANCELLED, "Cancelled", NULL); +grpc_call_error grpc_call_cancel(grpc_call *call, void *reserved) { + GPR_ASSERT(!reserved); + return grpc_call_cancel_with_status(call, GRPC_STATUS_CANCELLED, "Cancelled", + NULL); } -grpc_call_error -grpc_call_cancel_with_status (grpc_call * c, grpc_status_code status, const char *description, void *reserved) -{ +grpc_call_error grpc_call_cancel_with_status(grpc_call *c, + grpc_status_code status, + const char *description, + void *reserved) { grpc_call_error r; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT (reserved == NULL); - lock (c); - r = cancel_with_status (c, status, description); - unlock (&exec_ctx, c); - grpc_exec_ctx_finish (&exec_ctx); + GPR_ASSERT(reserved == NULL); + lock(c); + r = cancel_with_status(c, status, description); + unlock(&exec_ctx, c); + grpc_exec_ctx_finish(&exec_ctx); return r; } -static grpc_call_error -cancel_with_status (grpc_call * c, grpc_status_code status, const char *description) -{ - grpc_mdstr *details = description ? grpc_mdstr_from_string (c->metadata_context, description, 0) : NULL; +static grpc_call_error cancel_with_status(grpc_call *c, grpc_status_code status, + const char *description) { + grpc_mdstr *details = + description ? grpc_mdstr_from_string(c->metadata_context, description, 0) + : NULL; - GPR_ASSERT (status != GRPC_STATUS_OK); + GPR_ASSERT(status != GRPC_STATUS_OK); - set_status_code (c, STATUS_FROM_API_OVERRIDE, (gpr_uint32) status); - set_status_details (c, STATUS_FROM_API_OVERRIDE, details); + set_status_code(c, STATUS_FROM_API_OVERRIDE, (gpr_uint32)status); + set_status_details(c, STATUS_FROM_API_OVERRIDE, details); c->cancel_with_status = status; return GRPC_CALL_OK; } -static void -finished_loose_op (grpc_exec_ctx * exec_ctx, void *call, int success_ignored) -{ - GRPC_CALL_INTERNAL_UNREF (exec_ctx, call, "loose-op"); +static void finished_loose_op(grpc_exec_ctx *exec_ctx, void *call, + int success_ignored) { + GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, "loose-op"); } -typedef struct -{ +typedef struct { grpc_call *call; grpc_closure closure; } finished_loose_op_allocated_args; -static void -finished_loose_op_allocated (grpc_exec_ctx * exec_ctx, void *alloc, int success) -{ +static void finished_loose_op_allocated(grpc_exec_ctx *exec_ctx, void *alloc, + int success) { finished_loose_op_allocated_args *args = alloc; - finished_loose_op (exec_ctx, args->call, success); - gpr_free (args); + finished_loose_op(exec_ctx, args->call, success); + gpr_free(args); } -static void -execute_op (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_transport_stream_op * op) -{ +static void execute_op(grpc_exec_ctx *exec_ctx, grpc_call *call, + grpc_transport_stream_op *op) { grpc_call_element *elem; - GPR_ASSERT (op->on_consumed == NULL); - if (op->cancel_with_status != GRPC_STATUS_OK || op->bind_pollset) - { - GRPC_CALL_INTERNAL_REF (call, "loose-op"); - if (op->bind_pollset) - { - op->on_consumed = &call->on_done_bind; - } - else - { - finished_loose_op_allocated_args *args = gpr_malloc (sizeof (*args)); - args->call = call; - grpc_closure_init (&args->closure, finished_loose_op_allocated, args); - op->on_consumed = &args->closure; - } + GPR_ASSERT(op->on_consumed == NULL); + if (op->cancel_with_status != GRPC_STATUS_OK || op->bind_pollset) { + GRPC_CALL_INTERNAL_REF(call, "loose-op"); + if (op->bind_pollset) { + op->on_consumed = &call->on_done_bind; + } else { + finished_loose_op_allocated_args *args = gpr_malloc(sizeof(*args)); + args->call = call; + grpc_closure_init(&args->closure, finished_loose_op_allocated, args); + op->on_consumed = &args->closure; } + } - elem = CALL_ELEM_FROM_CALL (call, 0); + elem = CALL_ELEM_FROM_CALL(call, 0); op->context = call->context; - elem->filter->start_transport_stream_op (exec_ctx, elem, op); + elem->filter->start_transport_stream_op(exec_ctx, elem, op); } -char * -grpc_call_get_peer (grpc_call * call) -{ - grpc_call_element *elem = CALL_ELEM_FROM_CALL (call, 0); +char *grpc_call_get_peer(grpc_call *call) { + grpc_call_element *elem = CALL_ELEM_FROM_CALL(call, 0); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - char *result = elem->filter->get_peer (&exec_ctx, elem); - grpc_exec_ctx_finish (&exec_ctx); + char *result = elem->filter->get_peer(&exec_ctx, elem); + grpc_exec_ctx_finish(&exec_ctx); return result; } -grpc_call * -grpc_call_from_top_element (grpc_call_element * elem) -{ - return CALL_FROM_TOP_ELEM (elem); +grpc_call *grpc_call_from_top_element(grpc_call_element *elem) { + return CALL_FROM_TOP_ELEM(elem); } -static void -call_alarm (grpc_exec_ctx * exec_ctx, void *arg, int success) -{ +static void call_alarm(grpc_exec_ctx *exec_ctx, void *arg, int success) { grpc_call *call = arg; - lock (call); + lock(call); call->have_alarm = 0; - if (success) - { - cancel_with_status (call, GRPC_STATUS_DEADLINE_EXCEEDED, "Deadline Exceeded"); - } - finish_read_ops (call); - unlock (exec_ctx, call); - GRPC_CALL_INTERNAL_UNREF (exec_ctx, call, "alarm"); + if (success) { + cancel_with_status(call, GRPC_STATUS_DEADLINE_EXCEEDED, + "Deadline Exceeded"); + } + finish_read_ops(call); + unlock(exec_ctx, call); + GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, "alarm"); } -static void -set_deadline_alarm (grpc_exec_ctx * exec_ctx, grpc_call * call, gpr_timespec deadline) -{ - if (call->have_alarm) - { - gpr_log (GPR_ERROR, "Attempt to set deadline alarm twice"); - assert (0); - return; - } - GRPC_CALL_INTERNAL_REF (call, "alarm"); +static void set_deadline_alarm(grpc_exec_ctx *exec_ctx, grpc_call *call, + gpr_timespec deadline) { + if (call->have_alarm) { + gpr_log(GPR_ERROR, "Attempt to set deadline alarm twice"); + assert(0); + return; + } + GRPC_CALL_INTERNAL_REF(call, "alarm"); call->have_alarm = 1; - call->send_deadline = gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC); - grpc_alarm_init (exec_ctx, &call->alarm, call->send_deadline, call_alarm, call, gpr_now (GPR_CLOCK_MONOTONIC)); + call->send_deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC); + grpc_alarm_init(exec_ctx, &call->alarm, call->send_deadline, call_alarm, call, + gpr_now(GPR_CLOCK_MONOTONIC)); } /* we offset status by a small amount when storing it into transport metadata as metadata cannot store a 0 value (which is used as OK for grpc_status_codes */ #define STATUS_OFFSET 1 -static void -destroy_status (void *ignored) -{ -} +static void destroy_status(void *ignored) {} -static gpr_uint32 -decode_status (grpc_mdelem * md) -{ +static gpr_uint32 decode_status(grpc_mdelem *md) { gpr_uint32 status; - void *user_data = grpc_mdelem_get_user_data (md, destroy_status); - if (user_data) - { - status = ((gpr_uint32) (gpr_intptr) user_data) - STATUS_OFFSET; - } - else - { - if (!gpr_parse_bytes_to_uint32 (grpc_mdstr_as_c_string (md->value), GPR_SLICE_LENGTH (md->value->slice), &status)) - { - status = GRPC_STATUS_UNKNOWN; /* could not parse status code */ - } - grpc_mdelem_set_user_data (md, destroy_status, (void *) (gpr_intptr) (status + STATUS_OFFSET)); - } + void *user_data = grpc_mdelem_get_user_data(md, destroy_status); + if (user_data) { + status = ((gpr_uint32)(gpr_intptr)user_data) - STATUS_OFFSET; + } else { + if (!gpr_parse_bytes_to_uint32(grpc_mdstr_as_c_string(md->value), + GPR_SLICE_LENGTH(md->value->slice), + &status)) { + status = GRPC_STATUS_UNKNOWN; /* could not parse status code */ + } + grpc_mdelem_set_user_data(md, destroy_status, + (void *)(gpr_intptr)(status + STATUS_OFFSET)); + } return status; } /* just as for status above, we need to offset: metadata userdata can't hold a * zero (null), which in this case is used to signal no compression */ #define COMPRESS_OFFSET 1 -static void -destroy_compression (void *ignored) -{ -} +static void destroy_compression(void *ignored) {} -static gpr_uint32 -decode_compression (grpc_mdelem * md) -{ +static gpr_uint32 decode_compression(grpc_mdelem *md) { grpc_compression_algorithm algorithm; - void *user_data = grpc_mdelem_get_user_data (md, destroy_compression); - if (user_data) - { - algorithm = ((grpc_compression_algorithm) (gpr_intptr) user_data) - COMPRESS_OFFSET; - } - else - { - const char *md_c_str = grpc_mdstr_as_c_string (md->value); - if (!grpc_compression_algorithm_parse (md_c_str, strlen (md_c_str), &algorithm)) - { - gpr_log (GPR_ERROR, "Invalid compression algorithm: '%s'", md_c_str); - assert (0); - } - grpc_mdelem_set_user_data (md, destroy_compression, (void *) (gpr_intptr) (algorithm + COMPRESS_OFFSET)); - } + void *user_data = grpc_mdelem_get_user_data(md, destroy_compression); + if (user_data) { + algorithm = + ((grpc_compression_algorithm)(gpr_intptr)user_data) - COMPRESS_OFFSET; + } else { + const char *md_c_str = grpc_mdstr_as_c_string(md->value); + if (!grpc_compression_algorithm_parse(md_c_str, strlen(md_c_str), + &algorithm)) { + gpr_log(GPR_ERROR, "Invalid compression algorithm: '%s'", md_c_str); + assert(0); + } + grpc_mdelem_set_user_data( + md, destroy_compression, + (void *)(gpr_intptr)(algorithm + COMPRESS_OFFSET)); + } return algorithm; } -static void -recv_metadata (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_metadata_batch * md) -{ +static void recv_metadata(grpc_exec_ctx *exec_ctx, grpc_call *call, + grpc_metadata_batch *md) { grpc_linked_mdelem *l; grpc_metadata_array *dest; grpc_metadata *mdusr; @@ -1626,397 +1478,355 @@ recv_metadata (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_metadata_batch * grpc_mdctx *mdctx = call->metadata_context; is_trailing = call->read_state >= READ_STATE_GOT_INITIAL_METADATA; - for (l = md->list.head; l != NULL; l = l->next) - { - grpc_mdelem *md = l->md; - grpc_mdstr *key = md->key; - if (key == grpc_channel_get_status_string (call->channel)) - { - set_status_code (call, STATUS_FROM_WIRE, decode_status (md)); - } - else if (key == grpc_channel_get_message_string (call->channel)) - { - set_status_details (call, STATUS_FROM_WIRE, GRPC_MDSTR_REF (md->value)); - } - else if (key == grpc_channel_get_compression_algorithm_string (call->channel)) - { - set_compression_algorithm (call, decode_compression (md)); - } - else if (key == grpc_channel_get_encodings_accepted_by_peer_string (call->channel)) - { - set_encodings_accepted_by_peer (call, md->value->slice); - } - else - { - dest = &call->buffered_metadata[is_trailing]; - if (dest->count == dest->capacity) - { - dest->capacity = GPR_MAX (dest->capacity + 8, dest->capacity * 2); - dest->metadata = gpr_realloc (dest->metadata, sizeof (grpc_metadata) * dest->capacity); - } - mdusr = &dest->metadata[dest->count++]; - mdusr->key = grpc_mdstr_as_c_string (md->key); - mdusr->value = grpc_mdstr_as_c_string (md->value); - mdusr->value_length = GPR_SLICE_LENGTH (md->value->slice); - if (call->owned_metadata_count == call->owned_metadata_capacity) - { - call->owned_metadata_capacity = GPR_MAX (call->owned_metadata_capacity + 8, call->owned_metadata_capacity * 2); - call->owned_metadata = gpr_realloc (call->owned_metadata, sizeof (grpc_mdelem *) * call->owned_metadata_capacity); - } - call->owned_metadata[call->owned_metadata_count++] = md; - l->md = 0; - } - } - if (gpr_time_cmp (md->deadline, gpr_inf_future (md->deadline.clock_type)) != 0 && !call->is_client) - { - set_deadline_alarm (exec_ctx, call, md->deadline); - } - if (!is_trailing) - { - call->read_state = READ_STATE_GOT_INITIAL_METADATA; - } - - grpc_mdctx_lock (mdctx); - for (l = md->list.head; l; l = l->next) - { - if (l->md) - GRPC_MDCTX_LOCKED_MDELEM_UNREF (mdctx, l->md); - } - for (l = md->garbage.head; l; l = l->next) - { - GRPC_MDCTX_LOCKED_MDELEM_UNREF (mdctx, l->md); - } - grpc_mdctx_unlock (mdctx); + for (l = md->list.head; l != NULL; l = l->next) { + grpc_mdelem *md = l->md; + grpc_mdstr *key = md->key; + if (key == grpc_channel_get_status_string(call->channel)) { + set_status_code(call, STATUS_FROM_WIRE, decode_status(md)); + } else if (key == grpc_channel_get_message_string(call->channel)) { + set_status_details(call, STATUS_FROM_WIRE, GRPC_MDSTR_REF(md->value)); + } else if (key == + grpc_channel_get_compression_algorithm_string(call->channel)) { + set_compression_algorithm(call, decode_compression(md)); + } else if (key == grpc_channel_get_encodings_accepted_by_peer_string( + call->channel)) { + set_encodings_accepted_by_peer(call, md->value->slice); + } else { + dest = &call->buffered_metadata[is_trailing]; + if (dest->count == dest->capacity) { + dest->capacity = GPR_MAX(dest->capacity + 8, dest->capacity * 2); + dest->metadata = + gpr_realloc(dest->metadata, sizeof(grpc_metadata) * dest->capacity); + } + mdusr = &dest->metadata[dest->count++]; + mdusr->key = grpc_mdstr_as_c_string(md->key); + mdusr->value = grpc_mdstr_as_c_string(md->value); + mdusr->value_length = GPR_SLICE_LENGTH(md->value->slice); + if (call->owned_metadata_count == call->owned_metadata_capacity) { + call->owned_metadata_capacity = + GPR_MAX(call->owned_metadata_capacity + 8, + call->owned_metadata_capacity * 2); + call->owned_metadata = + gpr_realloc(call->owned_metadata, + sizeof(grpc_mdelem *) * call->owned_metadata_capacity); + } + call->owned_metadata[call->owned_metadata_count++] = md; + l->md = 0; + } + } + if (gpr_time_cmp(md->deadline, gpr_inf_future(md->deadline.clock_type)) != + 0 && + !call->is_client) { + set_deadline_alarm(exec_ctx, call, md->deadline); + } + if (!is_trailing) { + call->read_state = READ_STATE_GOT_INITIAL_METADATA; + } + + grpc_mdctx_lock(mdctx); + for (l = md->list.head; l; l = l->next) { + if (l->md) GRPC_MDCTX_LOCKED_MDELEM_UNREF(mdctx, l->md); + } + for (l = md->garbage.head; l; l = l->next) { + GRPC_MDCTX_LOCKED_MDELEM_UNREF(mdctx, l->md); + } + grpc_mdctx_unlock(mdctx); } -grpc_call_stack * -grpc_call_get_call_stack (grpc_call * call) -{ - return CALL_STACK_FROM_CALL (call); +grpc_call_stack *grpc_call_get_call_stack(grpc_call *call) { + return CALL_STACK_FROM_CALL(call); } /* * BATCH API IMPLEMENTATION */ -static void -set_status_value_directly (grpc_status_code status, void *dest) -{ - *(grpc_status_code *) dest = status; +static void set_status_value_directly(grpc_status_code status, void *dest) { + *(grpc_status_code *)dest = status; } -static void -set_cancelled_value (grpc_status_code status, void *dest) -{ - *(grpc_status_code *) dest = (status != GRPC_STATUS_OK); +static void set_cancelled_value(grpc_status_code status, void *dest) { + *(grpc_status_code *)dest = (status != GRPC_STATUS_OK); } -static void -finish_batch (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *tag) -{ - grpc_cq_end_op (exec_ctx,call->cq, tag, success, done_completion, call, allocate_completion ( call)); +static void finish_batch(grpc_exec_ctx *exec_ctx, grpc_call *call, int success, + void *tag) { + grpc_cq_end_op(exec_ctx, call->cq, tag, success, done_completion, call, + allocate_completion(call)); } -static void -finish_batch_with_close (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *tag) -{ - grpc_cq_end_op (exec_ctx,call->cq, tag, 1, done_completion, call, allocate_completion ( call)); +static void finish_batch_with_close(grpc_exec_ctx *exec_ctx, grpc_call *call, + int success, void *tag) { + grpc_cq_end_op(exec_ctx, call->cq, tag, 1, done_completion, call, + allocate_completion(call)); } -static int -are_write_flags_valid (gpr_uint32 flags) -{ +static int are_write_flags_valid(gpr_uint32 flags) { /* check that only bits in GRPC_WRITE_(INTERNAL?)_USED_MASK are set */ - const gpr_uint32 allowed_write_positions = (GRPC_WRITE_USED_MASK | GRPC_WRITE_INTERNAL_USED_MASK); + const gpr_uint32 allowed_write_positions = + (GRPC_WRITE_USED_MASK | GRPC_WRITE_INTERNAL_USED_MASK); const gpr_uint32 invalid_positions = ~allowed_write_positions; return !(flags & invalid_positions); } -grpc_call_error -grpc_call_start_batch (grpc_call * call, const grpc_op * ops, size_t nops, void *tag, void *reserved) -{ +grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, + size_t nops, void *tag, void *reserved) { grpc_ioreq reqs[GRPC_IOREQ_OP_COUNT]; size_t in; size_t out; const grpc_op *op; grpc_ioreq *req; - void (*finish_func) (grpc_exec_ctx *, grpc_call *, int, void *) = finish_batch; + void (*finish_func)(grpc_exec_ctx *, grpc_call *, int, void *) = finish_batch; grpc_call_error error; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - if (reserved != NULL) - { - error = GRPC_CALL_ERROR; - goto done; - } + if (reserved != NULL) { + error = GRPC_CALL_ERROR; + goto done; + } - GRPC_CALL_LOG_BATCH (GPR_INFO, call, ops, nops, tag); + GRPC_CALL_LOG_BATCH(GPR_INFO, call, ops, nops, tag); - if (nops == 0) - { - grpc_cq_begin_op (call->cq); - GRPC_CALL_INTERNAL_REF (call, "completion"); - grpc_cq_end_op (&exec_ctx, call->cq, tag, 1, done_completion, call, allocate_completion (call)); - error = GRPC_CALL_OK; - goto done; - } + if (nops == 0) { + grpc_cq_begin_op(call->cq); + GRPC_CALL_INTERNAL_REF(call, "completion"); + grpc_cq_end_op(&exec_ctx, call->cq, tag, 1, done_completion, call, + allocate_completion(call)); + error = GRPC_CALL_OK; + goto done; + } /* rewrite batch ops into ioreq ops */ - for (in = 0, out = 0; in < nops; in++) - { - op = &ops[in]; - if (op->reserved != NULL) - { - error = GRPC_CALL_ERROR; - goto done; - } - switch (op->op) - { - case GRPC_OP_SEND_INITIAL_METADATA: - /* Flag validation: currently allow no flags */ - if (op->flags != 0) - { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) - { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_SEND_INITIAL_METADATA; - req->data.send_metadata.count = op->data.send_initial_metadata.count; - req->data.send_metadata.metadata = op->data.send_initial_metadata.metadata; - req->flags = op->flags; - break; - case GRPC_OP_SEND_MESSAGE: - if (!are_write_flags_valid (op->flags)) - { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - if (op->data.send_message == NULL) - { - error = GRPC_CALL_ERROR_INVALID_MESSAGE; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) - { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_SEND_MESSAGE; - req->data.send_message = op->data.send_message; - req->flags = op->flags; - break; - case GRPC_OP_SEND_CLOSE_FROM_CLIENT: - /* Flag validation: currently allow no flags */ - if (op->flags != 0) - { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - if (!call->is_client) - { - error = GRPC_CALL_ERROR_NOT_ON_SERVER; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) - { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_SEND_CLOSE; - req->flags = op->flags; - break; - case GRPC_OP_SEND_STATUS_FROM_SERVER: - /* Flag validation: currently allow no flags */ - if (op->flags != 0) - { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - if (call->is_client) - { - error = GRPC_CALL_ERROR_NOT_ON_CLIENT; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) - { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_SEND_TRAILING_METADATA; - req->flags = op->flags; - req->data.send_metadata.count = op->data.send_status_from_server.trailing_metadata_count; - req->data.send_metadata.metadata = op->data.send_status_from_server.trailing_metadata; - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) - { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_SEND_STATUS; - req->data.send_status.code = op->data.send_status_from_server.status; - req->data.send_status.details = op->data.send_status_from_server.status_details != NULL ? grpc_mdstr_from_string (call->metadata_context, op->data.send_status_from_server.status_details, 0) : NULL; - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) - { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_SEND_CLOSE; - break; - case GRPC_OP_RECV_INITIAL_METADATA: - /* Flag validation: currently allow no flags */ - if (op->flags != 0) - { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - if (!call->is_client) - { - error = GRPC_CALL_ERROR_NOT_ON_SERVER; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) - { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_INITIAL_METADATA; - req->data.recv_metadata = op->data.recv_initial_metadata; - req->data.recv_metadata->count = 0; - req->flags = op->flags; - break; - case GRPC_OP_RECV_MESSAGE: - /* Flag validation: currently allow no flags */ - if (op->flags != 0) - { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) - { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_MESSAGE; - req->data.recv_message = op->data.recv_message; - req->flags = op->flags; - break; - case GRPC_OP_RECV_STATUS_ON_CLIENT: - /* Flag validation: currently allow no flags */ - if (op->flags != 0) - { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - if (!call->is_client) - { - error = GRPC_CALL_ERROR_NOT_ON_SERVER; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) - { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_STATUS; - req->flags = op->flags; - req->data.recv_status.set_value = set_status_value_directly; - req->data.recv_status.user_data = op->data.recv_status_on_client.status; - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) - { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_STATUS_DETAILS; - req->data.recv_status_details.details = op->data.recv_status_on_client.status_details; - req->data.recv_status_details.details_capacity = op->data.recv_status_on_client.status_details_capacity; - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) - { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_TRAILING_METADATA; - req->data.recv_metadata = op->data.recv_status_on_client.trailing_metadata; - req->data.recv_metadata->count = 0; - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) - { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_CLOSE; - finish_func = finish_batch_with_close; - break; - case GRPC_OP_RECV_CLOSE_ON_SERVER: - /* Flag validation: currently allow no flags */ - if (op->flags != 0) - { - error = GRPC_CALL_ERROR_INVALID_FLAGS; - goto done; - } - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) - { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_STATUS; - req->flags = op->flags; - req->data.recv_status.set_value = set_cancelled_value; - req->data.recv_status.user_data = op->data.recv_close_on_server.cancelled; - req = &reqs[out++]; - if (out > GRPC_IOREQ_OP_COUNT) - { - error = GRPC_CALL_ERROR_BATCH_TOO_BIG; - goto done; - } - req->op = GRPC_IOREQ_RECV_CLOSE; - finish_func = finish_batch_with_close; - break; - } + for (in = 0, out = 0; in < nops; in++) { + op = &ops[in]; + if (op->reserved != NULL) { + error = GRPC_CALL_ERROR; + goto done; } - - GRPC_CALL_INTERNAL_REF (call, "completion"); - grpc_cq_begin_op (call->cq); - - error = grpc_call_start_ioreq_and_call_back (&exec_ctx, call, reqs, out, finish_func, tag); + switch (op->op) { + case GRPC_OP_SEND_INITIAL_METADATA: + /* Flag validation: currently allow no flags */ + if (op->flags != 0) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_SEND_INITIAL_METADATA; + req->data.send_metadata.count = op->data.send_initial_metadata.count; + req->data.send_metadata.metadata = + op->data.send_initial_metadata.metadata; + req->flags = op->flags; + break; + case GRPC_OP_SEND_MESSAGE: + if (!are_write_flags_valid(op->flags)) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + if (op->data.send_message == NULL) { + error = GRPC_CALL_ERROR_INVALID_MESSAGE; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_SEND_MESSAGE; + req->data.send_message = op->data.send_message; + req->flags = op->flags; + break; + case GRPC_OP_SEND_CLOSE_FROM_CLIENT: + /* Flag validation: currently allow no flags */ + if (op->flags != 0) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + if (!call->is_client) { + error = GRPC_CALL_ERROR_NOT_ON_SERVER; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_SEND_CLOSE; + req->flags = op->flags; + break; + case GRPC_OP_SEND_STATUS_FROM_SERVER: + /* Flag validation: currently allow no flags */ + if (op->flags != 0) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + if (call->is_client) { + error = GRPC_CALL_ERROR_NOT_ON_CLIENT; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_SEND_TRAILING_METADATA; + req->flags = op->flags; + req->data.send_metadata.count = + op->data.send_status_from_server.trailing_metadata_count; + req->data.send_metadata.metadata = + op->data.send_status_from_server.trailing_metadata; + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_SEND_STATUS; + req->data.send_status.code = op->data.send_status_from_server.status; + req->data.send_status.details = + op->data.send_status_from_server.status_details != NULL + ? grpc_mdstr_from_string( + call->metadata_context, + op->data.send_status_from_server.status_details, 0) + : NULL; + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_SEND_CLOSE; + break; + case GRPC_OP_RECV_INITIAL_METADATA: + /* Flag validation: currently allow no flags */ + if (op->flags != 0) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + if (!call->is_client) { + error = GRPC_CALL_ERROR_NOT_ON_SERVER; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_INITIAL_METADATA; + req->data.recv_metadata = op->data.recv_initial_metadata; + req->data.recv_metadata->count = 0; + req->flags = op->flags; + break; + case GRPC_OP_RECV_MESSAGE: + /* Flag validation: currently allow no flags */ + if (op->flags != 0) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_MESSAGE; + req->data.recv_message = op->data.recv_message; + req->flags = op->flags; + break; + case GRPC_OP_RECV_STATUS_ON_CLIENT: + /* Flag validation: currently allow no flags */ + if (op->flags != 0) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + if (!call->is_client) { + error = GRPC_CALL_ERROR_NOT_ON_SERVER; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_STATUS; + req->flags = op->flags; + req->data.recv_status.set_value = set_status_value_directly; + req->data.recv_status.user_data = op->data.recv_status_on_client.status; + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_STATUS_DETAILS; + req->data.recv_status_details.details = + op->data.recv_status_on_client.status_details; + req->data.recv_status_details.details_capacity = + op->data.recv_status_on_client.status_details_capacity; + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_TRAILING_METADATA; + req->data.recv_metadata = + op->data.recv_status_on_client.trailing_metadata; + req->data.recv_metadata->count = 0; + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_CLOSE; + finish_func = finish_batch_with_close; + break; + case GRPC_OP_RECV_CLOSE_ON_SERVER: + /* Flag validation: currently allow no flags */ + if (op->flags != 0) { + error = GRPC_CALL_ERROR_INVALID_FLAGS; + goto done; + } + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_STATUS; + req->flags = op->flags; + req->data.recv_status.set_value = set_cancelled_value; + req->data.recv_status.user_data = + op->data.recv_close_on_server.cancelled; + req = &reqs[out++]; + if (out > GRPC_IOREQ_OP_COUNT) { + error = GRPC_CALL_ERROR_BATCH_TOO_BIG; + goto done; + } + req->op = GRPC_IOREQ_RECV_CLOSE; + finish_func = finish_batch_with_close; + break; + } + } + + GRPC_CALL_INTERNAL_REF(call, "completion"); + grpc_cq_begin_op(call->cq); + + error = grpc_call_start_ioreq_and_call_back(&exec_ctx, call, reqs, out, + finish_func, tag); done: - grpc_exec_ctx_finish (&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); return error; } -void -grpc_call_context_set (grpc_call * call, grpc_context_index elem, void *value, void (*destroy) (void *value)) -{ - if (call->context[elem].destroy) - { - call->context[elem].destroy (call->context[elem].value); - } +void grpc_call_context_set(grpc_call *call, grpc_context_index elem, + void *value, void (*destroy)(void *value)) { + if (call->context[elem].destroy) { + call->context[elem].destroy(call->context[elem].value); + } call->context[elem].value = value; call->context[elem].destroy = destroy; } -void * -grpc_call_context_get (grpc_call * call, grpc_context_index elem) -{ +void *grpc_call_context_get(grpc_call *call, grpc_context_index elem) { return call->context[elem].value; } -gpr_uint8 -grpc_call_is_client (grpc_call * call) -{ - return call->is_client; -} +gpr_uint8 grpc_call_is_client(grpc_call *call) { return call->is_client; } diff --git a/src/core/surface/call.h b/src/core/surface/call.h index b1f3be85217..7ac0c92ab73 100644 --- a/src/core/surface/call.h +++ b/src/core/surface/call.h @@ -39,104 +39,120 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* Primitive operation types - grpc_op's get rewritten into these */ - typedef enum - { - GRPC_IOREQ_RECV_INITIAL_METADATA, - GRPC_IOREQ_RECV_MESSAGE, - GRPC_IOREQ_RECV_TRAILING_METADATA, - GRPC_IOREQ_RECV_STATUS, - GRPC_IOREQ_RECV_STATUS_DETAILS, - GRPC_IOREQ_RECV_CLOSE, - GRPC_IOREQ_SEND_INITIAL_METADATA, - GRPC_IOREQ_SEND_MESSAGE, - GRPC_IOREQ_SEND_TRAILING_METADATA, - GRPC_IOREQ_SEND_STATUS, - GRPC_IOREQ_SEND_CLOSE, - GRPC_IOREQ_OP_COUNT - } grpc_ioreq_op; - - typedef union - { - grpc_metadata_array *recv_metadata; - grpc_byte_buffer **recv_message; - struct - { - void (*set_value) (grpc_status_code status, void *user_data); - void *user_data; - } recv_status; - struct - { - char **details; - size_t *details_capacity; - } recv_status_details; - struct - { - size_t count; - grpc_metadata *metadata; - } send_metadata; - grpc_byte_buffer *send_message; - struct - { - grpc_status_code code; - grpc_mdstr *details; - } send_status; - } grpc_ioreq_data; - - typedef struct - { - grpc_ioreq_op op; - gpr_uint32 flags; - /**< A copy of the write flags from grpc_op */ - grpc_ioreq_data data; - } grpc_ioreq; - - typedef void (*grpc_ioreq_completion_func) (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *user_data); - - grpc_call *grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 propagation_mask, grpc_completion_queue * cq, const void *server_transport_data, grpc_mdelem ** add_initial_metadata, size_t add_initial_metadata_count, gpr_timespec send_deadline); - - void grpc_call_set_completion_queue (grpc_exec_ctx * exec_ctx, grpc_call * call, grpc_completion_queue * cq); - grpc_completion_queue *grpc_call_get_completion_queue (grpc_call * call); +typedef enum { + GRPC_IOREQ_RECV_INITIAL_METADATA, + GRPC_IOREQ_RECV_MESSAGE, + GRPC_IOREQ_RECV_TRAILING_METADATA, + GRPC_IOREQ_RECV_STATUS, + GRPC_IOREQ_RECV_STATUS_DETAILS, + GRPC_IOREQ_RECV_CLOSE, + GRPC_IOREQ_SEND_INITIAL_METADATA, + GRPC_IOREQ_SEND_MESSAGE, + GRPC_IOREQ_SEND_TRAILING_METADATA, + GRPC_IOREQ_SEND_STATUS, + GRPC_IOREQ_SEND_CLOSE, + GRPC_IOREQ_OP_COUNT +} grpc_ioreq_op; + +typedef union { + grpc_metadata_array *recv_metadata; + grpc_byte_buffer **recv_message; + struct { + void (*set_value)(grpc_status_code status, void *user_data); + void *user_data; + } recv_status; + struct { + char **details; + size_t *details_capacity; + } recv_status_details; + struct { + size_t count; + grpc_metadata *metadata; + } send_metadata; + grpc_byte_buffer *send_message; + struct { + grpc_status_code code; + grpc_mdstr *details; + } send_status; +} grpc_ioreq_data; + +typedef struct { + grpc_ioreq_op op; + gpr_uint32 flags; + /**< A copy of the write flags from grpc_op */ + grpc_ioreq_data data; +} grpc_ioreq; + +typedef void (*grpc_ioreq_completion_func)(grpc_exec_ctx *exec_ctx, + grpc_call *call, int success, + void *user_data); + +grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, + gpr_uint32 propagation_mask, + grpc_completion_queue *cq, + const void *server_transport_data, + grpc_mdelem **add_initial_metadata, + size_t add_initial_metadata_count, + gpr_timespec send_deadline); + +void grpc_call_set_completion_queue(grpc_exec_ctx *exec_ctx, grpc_call *call, + grpc_completion_queue *cq); +grpc_completion_queue *grpc_call_get_completion_queue(grpc_call *call); #ifdef GRPC_CALL_REF_COUNT_DEBUG - 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_ref(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(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_exec_ctx * exec_ctx, grpc_call * call); +void grpc_call_internal_ref(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(exec_ctx, call, reason) \ grpc_call_internal_unref(exec_ctx, call) #endif - grpc_call_error grpc_call_start_ioreq_and_call_back (grpc_exec_ctx * exec_ctx, grpc_call * call, const grpc_ioreq * reqs, size_t nreqs, grpc_ioreq_completion_func on_complete, void *user_data); +grpc_call_error grpc_call_start_ioreq_and_call_back( + grpc_exec_ctx *exec_ctx, grpc_call *call, const grpc_ioreq *reqs, + size_t nreqs, grpc_ioreq_completion_func on_complete, void *user_data); - grpc_call_stack *grpc_call_get_call_stack (grpc_call * call); +grpc_call_stack *grpc_call_get_call_stack(grpc_call *call); /* Given the top call_element, get the call object. */ - grpc_call *grpc_call_from_top_element (grpc_call_element * surface_element); +grpc_call *grpc_call_from_top_element(grpc_call_element *surface_element); - extern int grpc_trace_batch; +extern int grpc_trace_batch; - void grpc_call_log_batch (char *file, int line, gpr_log_severity severity, grpc_call * call, const grpc_op * ops, size_t nops, void *tag); +void grpc_call_log_batch(char *file, int line, gpr_log_severity severity, + grpc_call *call, const grpc_op *ops, size_t nops, + void *tag); - void grpc_server_log_request_call (char *file, int line, gpr_log_severity severity, grpc_server * server, grpc_call ** call, grpc_call_details * details, grpc_metadata_array * initial_metadata, grpc_completion_queue * cq_bound_to_call, grpc_completion_queue * cq_for_notification, void *tag); +void grpc_server_log_request_call(char *file, int line, + gpr_log_severity severity, + grpc_server *server, grpc_call **call, + grpc_call_details *details, + grpc_metadata_array *initial_metadata, + grpc_completion_queue *cq_bound_to_call, + grpc_completion_queue *cq_for_notification, + void *tag); - void grpc_server_log_shutdown (char *file, int line, gpr_log_severity severity, grpc_server * server, grpc_completion_queue * cq, void *tag); +void grpc_server_log_shutdown(char *file, int line, gpr_log_severity severity, + grpc_server *server, grpc_completion_queue *cq, + void *tag); /* Set a context pointer. No thread safety guarantees are made wrt this value. */ - void grpc_call_context_set (grpc_call * call, grpc_context_index elem, void *value, void (*destroy) (void *value)); +void grpc_call_context_set(grpc_call *call, grpc_context_index elem, + void *value, void (*destroy)(void *value)); /* Get a context pointer. */ - void *grpc_call_context_get (grpc_call * call, grpc_context_index elem); +void *grpc_call_context_get(grpc_call *call, grpc_context_index elem); #define GRPC_CALL_LOG_BATCH(sev, call, ops, nops, tag) \ if (grpc_trace_batch) grpc_call_log_batch(sev, call, ops, nops, tag) @@ -151,20 +167,21 @@ extern "C" #define GRPC_SERVER_LOG_SHUTDOWN(sev, server, cq, tag) \ if (grpc_trace_batch) grpc_server_log_shutdown(sev, server, cq, tag) - gpr_uint8 grpc_call_is_client (grpc_call * call); +gpr_uint8 grpc_call_is_client(grpc_call *call); - grpc_compression_algorithm grpc_call_get_compression_algorithm (const grpc_call * call); +grpc_compression_algorithm grpc_call_get_compression_algorithm( + const grpc_call *call); - gpr_uint32 grpc_call_get_message_flags (const grpc_call * call); +gpr_uint32 grpc_call_get_message_flags(const grpc_call *call); /** Returns a bitset for the encodings (compression algorithms) supported by \a * call's peer. * * To be indexed by grpc_compression_algorithm enum values. */ - gpr_uint32 grpc_call_get_encodings_accepted_by_peer (grpc_call * call); +gpr_uint32 grpc_call_get_encodings_accepted_by_peer(grpc_call *call); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_SURFACE_CALL_H */ +#endif /* GRPC_INTERNAL_CORE_SURFACE_CALL_H */ diff --git a/src/core/surface/call_details.c b/src/core/surface/call_details.c index ac9ba7ebe20..65d2d1da5b2 100644 --- a/src/core/surface/call_details.c +++ b/src/core/surface/call_details.c @@ -36,15 +36,11 @@ #include -void -grpc_call_details_init (grpc_call_details * cd) -{ - memset (cd, 0, sizeof (*cd)); +void grpc_call_details_init(grpc_call_details* cd) { + memset(cd, 0, sizeof(*cd)); } -void -grpc_call_details_destroy (grpc_call_details * cd) -{ - gpr_free (cd->method); - gpr_free (cd->host); +void grpc_call_details_destroy(grpc_call_details* cd) { + gpr_free(cd->method); + gpr_free(cd->host); } diff --git a/src/core/surface/call_log_batch.c b/src/core/surface/call_log_batch.c index 3b0f922cdab..5a3ef1e5f4b 100644 --- a/src/core/surface/call_log_batch.c +++ b/src/core/surface/call_log_batch.c @@ -39,91 +39,109 @@ int grpc_trace_batch = 0; -static void -add_metadata (gpr_strvec * b, const grpc_metadata * md, size_t count) -{ +static void add_metadata(gpr_strvec *b, const grpc_metadata *md, size_t count) { size_t i; - for (i = 0; i < count; i++) - { - gpr_strvec_add (b, gpr_strdup ("\nkey=")); - gpr_strvec_add (b, gpr_strdup (md[i].key)); + for (i = 0; i < count; i++) { + gpr_strvec_add(b, gpr_strdup("\nkey=")); + gpr_strvec_add(b, gpr_strdup(md[i].key)); - gpr_strvec_add (b, gpr_strdup (" value=")); - gpr_strvec_add (b, gpr_dump (md[i].value, md[i].value_length, GPR_DUMP_HEX | GPR_DUMP_ASCII)); - } + gpr_strvec_add(b, gpr_strdup(" value=")); + gpr_strvec_add(b, gpr_dump(md[i].value, md[i].value_length, + GPR_DUMP_HEX | GPR_DUMP_ASCII)); + } } -char * -grpc_op_string (const grpc_op * op) -{ +char *grpc_op_string(const grpc_op *op) { char *tmp; char *out; gpr_strvec b; - gpr_strvec_init (&b); + gpr_strvec_init(&b); - switch (op->op) - { + switch (op->op) { case GRPC_OP_SEND_INITIAL_METADATA: - gpr_strvec_add (&b, gpr_strdup ("SEND_INITIAL_METADATA")); - add_metadata (&b, op->data.send_initial_metadata.metadata, op->data.send_initial_metadata.count); + gpr_strvec_add(&b, gpr_strdup("SEND_INITIAL_METADATA")); + add_metadata(&b, op->data.send_initial_metadata.metadata, + op->data.send_initial_metadata.count); break; case GRPC_OP_SEND_MESSAGE: - gpr_asprintf (&tmp, "SEND_MESSAGE ptr=%p", op->data.send_message); - gpr_strvec_add (&b, tmp); + gpr_asprintf(&tmp, "SEND_MESSAGE ptr=%p", op->data.send_message); + gpr_strvec_add(&b, tmp); break; case GRPC_OP_SEND_CLOSE_FROM_CLIENT: - gpr_strvec_add (&b, gpr_strdup ("SEND_CLOSE_FROM_CLIENT")); + gpr_strvec_add(&b, gpr_strdup("SEND_CLOSE_FROM_CLIENT")); break; case GRPC_OP_SEND_STATUS_FROM_SERVER: - gpr_asprintf (&tmp, "SEND_STATUS_FROM_SERVER status=%d details=%s", op->data.send_status_from_server.status, op->data.send_status_from_server.status_details); - gpr_strvec_add (&b, tmp); - add_metadata (&b, op->data.send_status_from_server.trailing_metadata, op->data.send_status_from_server.trailing_metadata_count); + gpr_asprintf(&tmp, "SEND_STATUS_FROM_SERVER status=%d details=%s", + op->data.send_status_from_server.status, + op->data.send_status_from_server.status_details); + gpr_strvec_add(&b, tmp); + add_metadata(&b, op->data.send_status_from_server.trailing_metadata, + op->data.send_status_from_server.trailing_metadata_count); break; case GRPC_OP_RECV_INITIAL_METADATA: - gpr_asprintf (&tmp, "RECV_INITIAL_METADATA ptr=%p", op->data.recv_initial_metadata); - gpr_strvec_add (&b, tmp); + gpr_asprintf(&tmp, "RECV_INITIAL_METADATA ptr=%p", + op->data.recv_initial_metadata); + gpr_strvec_add(&b, tmp); break; case GRPC_OP_RECV_MESSAGE: - gpr_asprintf (&tmp, "RECV_MESSAGE ptr=%p", op->data.recv_message); - gpr_strvec_add (&b, tmp); + gpr_asprintf(&tmp, "RECV_MESSAGE ptr=%p", op->data.recv_message); + gpr_strvec_add(&b, tmp); break; case GRPC_OP_RECV_STATUS_ON_CLIENT: - gpr_asprintf (&tmp, "RECV_STATUS_ON_CLIENT metadata=%p status=%p details=%p", op->data.recv_status_on_client.trailing_metadata, op->data.recv_status_on_client.status, op->data.recv_status_on_client.status_details); - gpr_strvec_add (&b, tmp); + gpr_asprintf(&tmp, + "RECV_STATUS_ON_CLIENT metadata=%p status=%p details=%p", + op->data.recv_status_on_client.trailing_metadata, + op->data.recv_status_on_client.status, + op->data.recv_status_on_client.status_details); + gpr_strvec_add(&b, tmp); break; case GRPC_OP_RECV_CLOSE_ON_SERVER: - gpr_asprintf (&tmp, "RECV_CLOSE_ON_SERVER cancelled=%p", op->data.recv_close_on_server.cancelled); - gpr_strvec_add (&b, tmp); - } - out = gpr_strvec_flatten (&b, NULL); - gpr_strvec_destroy (&b); + gpr_asprintf(&tmp, "RECV_CLOSE_ON_SERVER cancelled=%p", + op->data.recv_close_on_server.cancelled); + gpr_strvec_add(&b, tmp); + } + out = gpr_strvec_flatten(&b, NULL); + gpr_strvec_destroy(&b); return out; } -void -grpc_call_log_batch (char *file, int line, gpr_log_severity severity, grpc_call * call, const grpc_op * ops, size_t nops, void *tag) -{ +void grpc_call_log_batch(char *file, int line, gpr_log_severity severity, + grpc_call *call, const grpc_op *ops, size_t nops, + void *tag) { char *tmp; size_t i; - gpr_log (file, line, severity, "grpc_call_start_batch(call=%p, ops=%p, nops=%d, tag=%p)", call, ops, nops, tag); - for (i = 0; i < nops; i++) - { - tmp = grpc_op_string (&ops[i]); - gpr_log (file, line, severity, "ops[%d]: %s", i, tmp); - gpr_free (tmp); - } + gpr_log(file, line, severity, + "grpc_call_start_batch(call=%p, ops=%p, nops=%d, tag=%p)", call, ops, + nops, tag); + for (i = 0; i < nops; i++) { + tmp = grpc_op_string(&ops[i]); + gpr_log(file, line, severity, "ops[%d]: %s", i, tmp); + gpr_free(tmp); + } } -void -grpc_server_log_request_call (char *file, int line, gpr_log_severity severity, grpc_server * server, grpc_call ** call, grpc_call_details * details, grpc_metadata_array * initial_metadata, grpc_completion_queue * cq_bound_to_call, grpc_completion_queue * cq_for_notification, void *tag) -{ - gpr_log (file, line, severity, "grpc_server_request_call(server=%p, call=%p, details=%p, " "initial_metadata=%p, cq_bound_to_call=%p, cq_for_notification=%p, " "tag=%p)", server, call, details, initial_metadata, cq_bound_to_call, cq_for_notification, tag); +void grpc_server_log_request_call(char *file, int line, + gpr_log_severity severity, + grpc_server *server, grpc_call **call, + grpc_call_details *details, + grpc_metadata_array *initial_metadata, + grpc_completion_queue *cq_bound_to_call, + grpc_completion_queue *cq_for_notification, + void *tag) { + gpr_log(file, line, severity, + "grpc_server_request_call(server=%p, call=%p, details=%p, " + "initial_metadata=%p, cq_bound_to_call=%p, cq_for_notification=%p, " + "tag=%p)", + server, call, details, initial_metadata, cq_bound_to_call, + cq_for_notification, tag); } -void -grpc_server_log_shutdown (char *file, int line, gpr_log_severity severity, grpc_server * server, grpc_completion_queue * cq, void *tag) -{ - gpr_log (file, line, severity, "grpc_server_shutdown_and_notify(server=%p, cq=%p, tag=%p)", server, cq, tag); +void grpc_server_log_shutdown(char *file, int line, gpr_log_severity severity, + grpc_server *server, grpc_completion_queue *cq, + void *tag) { + gpr_log(file, line, severity, + "grpc_server_shutdown_and_notify(server=%p, cq=%p, tag=%p)", server, + cq, tag); } diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index a5816c3fb39..08d003daca6 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -53,15 +53,13 @@ * (OK, Cancelled, Unknown). */ #define NUM_CACHED_STATUS_ELEMS 3 -typedef struct registered_call -{ +typedef struct registered_call { grpc_mdelem *path; grpc_mdelem *authority; struct registered_call *next; } registered_call; -struct grpc_channel -{ +struct grpc_channel { int is_client; gpr_refcount refs; gpr_uint32 max_message_length; @@ -91,297 +89,283 @@ struct grpc_channel /* the protobuf library will (by default) start warning at 100megs */ #define DEFAULT_MAX_MESSAGE_LENGTH (100 * 1024 * 1024) -grpc_channel * -grpc_channel_create_from_filters (grpc_exec_ctx * exec_ctx, const char *target, const grpc_channel_filter ** filters, size_t num_filters, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_client) -{ +grpc_channel *grpc_channel_create_from_filters( + grpc_exec_ctx *exec_ctx, const char *target, + const grpc_channel_filter **filters, size_t num_filters, + const grpc_channel_args *args, grpc_mdctx *mdctx, int is_client) { size_t i; - size_t size = sizeof (grpc_channel) + grpc_channel_stack_size (filters, num_filters); - grpc_channel *channel = gpr_malloc (size); - memset (channel, 0, sizeof (*channel)); - channel->target = gpr_strdup (target); - GPR_ASSERT (grpc_is_initialized () && "call grpc_init()"); + size_t size = + sizeof(grpc_channel) + grpc_channel_stack_size(filters, num_filters); + grpc_channel *channel = gpr_malloc(size); + memset(channel, 0, sizeof(*channel)); + channel->target = gpr_strdup(target); + GPR_ASSERT(grpc_is_initialized() && "call grpc_init()"); channel->is_client = is_client; /* decremented by grpc_channel_destroy */ - gpr_ref_init (&channel->refs, 1); + gpr_ref_init(&channel->refs, 1); channel->metadata_context = mdctx; - channel->grpc_status_string = grpc_mdstr_from_string (mdctx, "grpc-status", 0); - channel->grpc_compression_algorithm_string = grpc_mdstr_from_string (mdctx, "grpc-encoding", 0); - channel->grpc_encodings_accepted_by_peer_string = grpc_mdstr_from_string (mdctx, "grpc-accept-encoding", 0); - channel->grpc_message_string = grpc_mdstr_from_string (mdctx, "grpc-message", 0); - for (i = 0; i < NUM_CACHED_STATUS_ELEMS; i++) - { - char buf[GPR_LTOA_MIN_BUFSIZE]; - gpr_ltoa ((long) i, buf); - channel->grpc_status_elem[i] = grpc_mdelem_from_metadata_strings (mdctx, GRPC_MDSTR_REF (channel->grpc_status_string), grpc_mdstr_from_string (mdctx, buf, 0)); - } - channel->path_string = grpc_mdstr_from_string (mdctx, ":path", 0); - channel->authority_string = grpc_mdstr_from_string (mdctx, ":authority", 0); - gpr_mu_init (&channel->registered_call_mu); + channel->grpc_status_string = grpc_mdstr_from_string(mdctx, "grpc-status", 0); + channel->grpc_compression_algorithm_string = + grpc_mdstr_from_string(mdctx, "grpc-encoding", 0); + channel->grpc_encodings_accepted_by_peer_string = + grpc_mdstr_from_string(mdctx, "grpc-accept-encoding", 0); + channel->grpc_message_string = + grpc_mdstr_from_string(mdctx, "grpc-message", 0); + for (i = 0; i < NUM_CACHED_STATUS_ELEMS; i++) { + char buf[GPR_LTOA_MIN_BUFSIZE]; + gpr_ltoa((long)i, buf); + channel->grpc_status_elem[i] = grpc_mdelem_from_metadata_strings( + mdctx, GRPC_MDSTR_REF(channel->grpc_status_string), + grpc_mdstr_from_string(mdctx, buf, 0)); + } + channel->path_string = grpc_mdstr_from_string(mdctx, ":path", 0); + channel->authority_string = grpc_mdstr_from_string(mdctx, ":authority", 0); + gpr_mu_init(&channel->registered_call_mu); channel->registered_calls = NULL; channel->max_message_length = DEFAULT_MAX_MESSAGE_LENGTH; - if (args) - { - for (i = 0; i < args->num_args; i++) - { - if (0 == strcmp (args->args[i].key, GRPC_ARG_MAX_MESSAGE_LENGTH)) - { - if (args->args[i].type != GRPC_ARG_INTEGER) - { - gpr_log (GPR_ERROR, "%s ignored: it must be an integer", GRPC_ARG_MAX_MESSAGE_LENGTH); - } - else if (args->args[i].value.integer < 0) - { - gpr_log (GPR_ERROR, "%s ignored: it must be >= 0", GRPC_ARG_MAX_MESSAGE_LENGTH); - } - else - { - channel->max_message_length = (gpr_uint32) args->args[i].value.integer; - } - } - else if (0 == strcmp (args->args[i].key, GRPC_ARG_DEFAULT_AUTHORITY)) - { - if (args->args[i].type != GRPC_ARG_STRING) - { - gpr_log (GPR_ERROR, "%s: must be an string", GRPC_ARG_DEFAULT_AUTHORITY); - } - else - { - if (channel->default_authority) - { - /* setting this takes precedence over anything else */ - GRPC_MDELEM_UNREF (channel->default_authority); - } - channel->default_authority = grpc_mdelem_from_strings (mdctx, ":authority", args->args[i].value.string); - } - } - else if (0 == strcmp (args->args[i].key, GRPC_SSL_TARGET_NAME_OVERRIDE_ARG)) - { - if (args->args[i].type != GRPC_ARG_STRING) - { - gpr_log (GPR_ERROR, "%s: must be an string", GRPC_SSL_TARGET_NAME_OVERRIDE_ARG); - } - else - { - if (channel->default_authority) - { - /* other ways of setting this (notably ssl) take precedence */ - gpr_log (GPR_ERROR, "%s: default host already set some other way", GRPC_ARG_DEFAULT_AUTHORITY); - } - else - { - channel->default_authority = grpc_mdelem_from_strings (mdctx, ":authority", args->args[i].value.string); - } - } - } - } + if (args) { + for (i = 0; i < args->num_args; i++) { + if (0 == strcmp(args->args[i].key, GRPC_ARG_MAX_MESSAGE_LENGTH)) { + if (args->args[i].type != GRPC_ARG_INTEGER) { + gpr_log(GPR_ERROR, "%s ignored: it must be an integer", + GRPC_ARG_MAX_MESSAGE_LENGTH); + } else if (args->args[i].value.integer < 0) { + gpr_log(GPR_ERROR, "%s ignored: it must be >= 0", + GRPC_ARG_MAX_MESSAGE_LENGTH); + } else { + channel->max_message_length = (gpr_uint32)args->args[i].value.integer; + } + } else if (0 == strcmp(args->args[i].key, GRPC_ARG_DEFAULT_AUTHORITY)) { + if (args->args[i].type != GRPC_ARG_STRING) { + gpr_log(GPR_ERROR, "%s: must be an string", + GRPC_ARG_DEFAULT_AUTHORITY); + } else { + if (channel->default_authority) { + /* setting this takes precedence over anything else */ + GRPC_MDELEM_UNREF(channel->default_authority); + } + channel->default_authority = grpc_mdelem_from_strings( + mdctx, ":authority", args->args[i].value.string); + } + } else if (0 == + strcmp(args->args[i].key, GRPC_SSL_TARGET_NAME_OVERRIDE_ARG)) { + if (args->args[i].type != GRPC_ARG_STRING) { + gpr_log(GPR_ERROR, "%s: must be an string", + GRPC_SSL_TARGET_NAME_OVERRIDE_ARG); + } else { + if (channel->default_authority) { + /* other ways of setting this (notably ssl) take precedence */ + gpr_log(GPR_ERROR, "%s: default host already set some other way", + GRPC_ARG_DEFAULT_AUTHORITY); + } else { + channel->default_authority = grpc_mdelem_from_strings( + mdctx, ":authority", args->args[i].value.string); + } + } + } } - - if (channel->is_client && channel->default_authority == NULL && target != NULL) - { - char *default_authority = grpc_get_default_authority (target); - if (default_authority) - { - channel->default_authority = grpc_mdelem_from_strings (channel->metadata_context, ":authority", default_authority); - } - gpr_free (default_authority); + } + + if (channel->is_client && channel->default_authority == NULL && + target != NULL) { + char *default_authority = grpc_get_default_authority(target); + if (default_authority) { + channel->default_authority = grpc_mdelem_from_strings( + channel->metadata_context, ":authority", default_authority); } + gpr_free(default_authority); + } - grpc_channel_stack_init (exec_ctx, filters, num_filters, channel, args, channel->metadata_context, CHANNEL_STACK_FROM_CHANNEL (channel)); + grpc_channel_stack_init(exec_ctx, filters, num_filters, channel, args, + channel->metadata_context, + CHANNEL_STACK_FROM_CHANNEL(channel)); return channel; } -char * -grpc_channel_get_target (grpc_channel * channel) -{ - return gpr_strdup (channel->target); +char *grpc_channel_get_target(grpc_channel *channel) { + return gpr_strdup(channel->target); } -static grpc_call * -grpc_channel_create_call_internal (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 propagation_mask, grpc_completion_queue * cq, grpc_mdelem * path_mdelem, grpc_mdelem * authority_mdelem, gpr_timespec deadline) -{ +static grpc_call *grpc_channel_create_call_internal( + grpc_channel *channel, grpc_call *parent_call, gpr_uint32 propagation_mask, + grpc_completion_queue *cq, grpc_mdelem *path_mdelem, + grpc_mdelem *authority_mdelem, gpr_timespec deadline) { grpc_mdelem *send_metadata[2]; size_t num_metadata = 0; - GPR_ASSERT (channel->is_client); + GPR_ASSERT(channel->is_client); send_metadata[num_metadata++] = path_mdelem; - if (authority_mdelem != NULL) - { - send_metadata[num_metadata++] = authority_mdelem; - } - else if (channel->default_authority != NULL) - { - send_metadata[num_metadata++] = GRPC_MDELEM_REF (channel->default_authority); - } - - return grpc_call_create (channel, parent_call, propagation_mask, cq, NULL, send_metadata, num_metadata, deadline); + if (authority_mdelem != NULL) { + send_metadata[num_metadata++] = authority_mdelem; + } else if (channel->default_authority != NULL) { + send_metadata[num_metadata++] = GRPC_MDELEM_REF(channel->default_authority); + } + + return grpc_call_create(channel, parent_call, propagation_mask, cq, NULL, + send_metadata, num_metadata, deadline); } -grpc_call * -grpc_channel_create_call (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 propagation_mask, grpc_completion_queue * cq, const char *method, const char *host, gpr_timespec deadline, void *reserved) -{ - GPR_ASSERT (!reserved); - return grpc_channel_create_call_internal (channel, parent_call, propagation_mask, cq, grpc_mdelem_from_metadata_strings (channel->metadata_context, GRPC_MDSTR_REF (channel->path_string), grpc_mdstr_from_string (channel->metadata_context, method, 0)), host ? grpc_mdelem_from_metadata_strings (channel->metadata_context, GRPC_MDSTR_REF (channel->authority_string), grpc_mdstr_from_string (channel->metadata_context, host, 0)) : NULL, deadline); +grpc_call *grpc_channel_create_call(grpc_channel *channel, + grpc_call *parent_call, + gpr_uint32 propagation_mask, + grpc_completion_queue *cq, + const char *method, const char *host, + gpr_timespec deadline, void *reserved) { + GPR_ASSERT(!reserved); + return grpc_channel_create_call_internal( + channel, parent_call, propagation_mask, cq, + grpc_mdelem_from_metadata_strings( + channel->metadata_context, GRPC_MDSTR_REF(channel->path_string), + grpc_mdstr_from_string(channel->metadata_context, method, 0)), + host ? grpc_mdelem_from_metadata_strings( + channel->metadata_context, + GRPC_MDSTR_REF(channel->authority_string), + grpc_mdstr_from_string(channel->metadata_context, host, 0)) + : NULL, + deadline); } -void * -grpc_channel_register_call (grpc_channel * channel, const char *method, const char *host, void *reserved) -{ - registered_call *rc = gpr_malloc (sizeof (registered_call)); - GPR_ASSERT (!reserved); - rc->path = grpc_mdelem_from_metadata_strings (channel->metadata_context, GRPC_MDSTR_REF (channel->path_string), grpc_mdstr_from_string (channel->metadata_context, method, 0)); - rc->authority = host ? grpc_mdelem_from_metadata_strings (channel->metadata_context, GRPC_MDSTR_REF (channel->authority_string), grpc_mdstr_from_string (channel->metadata_context, host, 0)) : NULL; - gpr_mu_lock (&channel->registered_call_mu); +void *grpc_channel_register_call(grpc_channel *channel, const char *method, + const char *host, void *reserved) { + registered_call *rc = gpr_malloc(sizeof(registered_call)); + GPR_ASSERT(!reserved); + rc->path = grpc_mdelem_from_metadata_strings( + channel->metadata_context, GRPC_MDSTR_REF(channel->path_string), + grpc_mdstr_from_string(channel->metadata_context, method, 0)); + rc->authority = + host ? grpc_mdelem_from_metadata_strings( + channel->metadata_context, + GRPC_MDSTR_REF(channel->authority_string), + grpc_mdstr_from_string(channel->metadata_context, host, 0)) + : NULL; + gpr_mu_lock(&channel->registered_call_mu); rc->next = channel->registered_calls; channel->registered_calls = rc; - gpr_mu_unlock (&channel->registered_call_mu); + gpr_mu_unlock(&channel->registered_call_mu); return rc; } -grpc_call * -grpc_channel_create_registered_call (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 propagation_mask, grpc_completion_queue * completion_queue, void *registered_call_handle, gpr_timespec deadline, void *reserved) -{ +grpc_call *grpc_channel_create_registered_call( + grpc_channel *channel, grpc_call *parent_call, gpr_uint32 propagation_mask, + grpc_completion_queue *completion_queue, void *registered_call_handle, + gpr_timespec deadline, void *reserved) { registered_call *rc = registered_call_handle; - GPR_ASSERT (!reserved); - return grpc_channel_create_call_internal (channel, parent_call, propagation_mask, completion_queue, GRPC_MDELEM_REF (rc->path), rc->authority ? GRPC_MDELEM_REF (rc->authority) : NULL, deadline); + GPR_ASSERT(!reserved); + return grpc_channel_create_call_internal( + channel, parent_call, propagation_mask, completion_queue, + GRPC_MDELEM_REF(rc->path), + rc->authority ? GRPC_MDELEM_REF(rc->authority) : NULL, deadline); } #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG -void -grpc_channel_internal_ref (grpc_channel * c, const char *reason) -{ - gpr_log (GPR_DEBUG, "CHANNEL: ref %p %d -> %d [%s]", c, c->refs.count, c->refs.count + 1, reason); +void grpc_channel_internal_ref(grpc_channel *c, const char *reason) { + gpr_log(GPR_DEBUG, "CHANNEL: ref %p %d -> %d [%s]", c, c->refs.count, + c->refs.count + 1, reason); #else -void -grpc_channel_internal_ref (grpc_channel * c) -{ +void grpc_channel_internal_ref(grpc_channel *c) { #endif - gpr_ref (&c->refs); + gpr_ref(&c->refs); } -static void -destroy_channel (grpc_exec_ctx * exec_ctx, grpc_channel * channel) -{ +static void destroy_channel(grpc_exec_ctx *exec_ctx, grpc_channel *channel) { size_t i; - grpc_channel_stack_destroy (exec_ctx,CHANNEL_STACK_FROM_CHANNEL ( channel)); - for (i = 0; i < NUM_CACHED_STATUS_ELEMS; i++) - { - GRPC_MDELEM_UNREF (channel->grpc_status_elem[i]); + grpc_channel_stack_destroy(exec_ctx, CHANNEL_STACK_FROM_CHANNEL(channel)); + for (i = 0; i < NUM_CACHED_STATUS_ELEMS; i++) { + GRPC_MDELEM_UNREF(channel->grpc_status_elem[i]); + } + GRPC_MDSTR_UNREF(channel->grpc_status_string); + GRPC_MDSTR_UNREF(channel->grpc_compression_algorithm_string); + GRPC_MDSTR_UNREF(channel->grpc_encodings_accepted_by_peer_string); + GRPC_MDSTR_UNREF(channel->grpc_message_string); + GRPC_MDSTR_UNREF(channel->path_string); + GRPC_MDSTR_UNREF(channel->authority_string); + while (channel->registered_calls) { + registered_call *rc = channel->registered_calls; + channel->registered_calls = rc->next; + GRPC_MDELEM_UNREF(rc->path); + if (rc->authority) { + GRPC_MDELEM_UNREF(rc->authority); } - GRPC_MDSTR_UNREF (channel->grpc_status_string); - GRPC_MDSTR_UNREF (channel->grpc_compression_algorithm_string); - GRPC_MDSTR_UNREF (channel->grpc_encodings_accepted_by_peer_string); - GRPC_MDSTR_UNREF (channel->grpc_message_string); - GRPC_MDSTR_UNREF (channel->path_string); - GRPC_MDSTR_UNREF (channel->authority_string); - while (channel->registered_calls) - { - registered_call *rc = channel->registered_calls; - channel->registered_calls = rc->next; - GRPC_MDELEM_UNREF (rc->path); - if (rc->authority) - { - GRPC_MDELEM_UNREF (rc->authority); - } - gpr_free (rc); - } - if (channel->default_authority != NULL) - { - GRPC_MDELEM_UNREF (channel->default_authority); - } - grpc_mdctx_unref (channel->metadata_context); - gpr_mu_destroy (&channel->registered_call_mu); - gpr_free (channel->target); - gpr_free (channel); + gpr_free(rc); + } + if (channel->default_authority != NULL) { + GRPC_MDELEM_UNREF(channel->default_authority); + } + grpc_mdctx_unref(channel->metadata_context); + gpr_mu_destroy(&channel->registered_call_mu); + gpr_free(channel->target); + gpr_free(channel); } #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG -void -grpc_channel_internal_unref (grpc_exec_ctx * exec_ctx, grpc_channel * channel, const char *reason) -{ - gpr_log (GPR_DEBUG, "CHANNEL: unref %p %d -> %d [%s]", channel, channel->refs.count, channel->refs.count - 1, reason); +void grpc_channel_internal_unref(grpc_exec_ctx *exec_ctx, grpc_channel *channel, + const char *reason) { + gpr_log(GPR_DEBUG, "CHANNEL: unref %p %d -> %d [%s]", channel, + channel->refs.count, channel->refs.count - 1, reason); #else -void -grpc_channel_internal_unref (grpc_exec_ctx * exec_ctx, grpc_channel * channel) -{ +void grpc_channel_internal_unref(grpc_exec_ctx *exec_ctx, + grpc_channel *channel) { #endif - if (gpr_unref (&channel->refs)) - { - destroy_channel (exec_ctx, channel); - } + if (gpr_unref(&channel->refs)) { + destroy_channel(exec_ctx, channel); + } } -void -grpc_channel_destroy (grpc_channel * channel) -{ +void grpc_channel_destroy(grpc_channel *channel) { grpc_transport_op op; grpc_channel_element *elem; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - memset (&op, 0, sizeof (op)); + memset(&op, 0, sizeof(op)); op.disconnect = 1; - elem = grpc_channel_stack_element (CHANNEL_STACK_FROM_CHANNEL (channel), 0); - elem->filter->start_transport_op (&exec_ctx, elem, &op); + 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"); + GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, channel, "channel"); - grpc_exec_ctx_finish (&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); } -grpc_channel_stack * -grpc_channel_get_channel_stack (grpc_channel * channel) -{ - return CHANNEL_STACK_FROM_CHANNEL (channel); +grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel) { + return CHANNEL_STACK_FROM_CHANNEL(channel); } -grpc_mdctx * -grpc_channel_get_metadata_context (grpc_channel * channel) -{ +grpc_mdctx *grpc_channel_get_metadata_context(grpc_channel *channel) { return channel->metadata_context; } -grpc_mdstr * -grpc_channel_get_status_string (grpc_channel * channel) -{ +grpc_mdstr *grpc_channel_get_status_string(grpc_channel *channel) { return channel->grpc_status_string; } -grpc_mdstr * -grpc_channel_get_compression_algorithm_string (grpc_channel * channel) -{ +grpc_mdstr *grpc_channel_get_compression_algorithm_string( + grpc_channel *channel) { return channel->grpc_compression_algorithm_string; } -grpc_mdstr * -grpc_channel_get_encodings_accepted_by_peer_string (grpc_channel * channel) -{ +grpc_mdstr *grpc_channel_get_encodings_accepted_by_peer_string( + grpc_channel *channel) { return channel->grpc_encodings_accepted_by_peer_string; } -grpc_mdelem * -grpc_channel_get_reffed_status_elem (grpc_channel * channel, int i) -{ - if (i >= 0 && i < NUM_CACHED_STATUS_ELEMS) - { - return GRPC_MDELEM_REF (channel->grpc_status_elem[i]); - } - else - { - char tmp[GPR_LTOA_MIN_BUFSIZE]; - gpr_ltoa (i, tmp); - return grpc_mdelem_from_metadata_strings (channel->metadata_context, GRPC_MDSTR_REF (channel->grpc_status_string), grpc_mdstr_from_string (channel->metadata_context, tmp, 0)); - } +grpc_mdelem *grpc_channel_get_reffed_status_elem(grpc_channel *channel, int i) { + if (i >= 0 && i < NUM_CACHED_STATUS_ELEMS) { + return GRPC_MDELEM_REF(channel->grpc_status_elem[i]); + } else { + char tmp[GPR_LTOA_MIN_BUFSIZE]; + gpr_ltoa(i, tmp); + return grpc_mdelem_from_metadata_strings( + channel->metadata_context, GRPC_MDSTR_REF(channel->grpc_status_string), + grpc_mdstr_from_string(channel->metadata_context, tmp, 0)); + } } -grpc_mdstr * -grpc_channel_get_message_string (grpc_channel * channel) -{ +grpc_mdstr *grpc_channel_get_message_string(grpc_channel *channel) { return channel->grpc_message_string; } -gpr_uint32 -grpc_channel_get_max_message_length (grpc_channel * channel) -{ +gpr_uint32 grpc_channel_get_max_message_length(grpc_channel *channel) { return channel->max_message_length; } diff --git a/src/core/surface/channel.h b/src/core/surface/channel.h index 678aa5ba567..e5030d52d2f 100644 --- a/src/core/surface/channel.h +++ b/src/core/surface/channel.h @@ -37,35 +37,43 @@ #include "src/core/channel/channel_stack.h" #include "src/core/client_config/subchannel_factory.h" -grpc_channel *grpc_channel_create_from_filters (grpc_exec_ctx * exec_ctx, const char *target, const grpc_channel_filter ** filters, size_t count, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_client); +grpc_channel *grpc_channel_create_from_filters( + grpc_exec_ctx *exec_ctx, const char *target, + const grpc_channel_filter **filters, size_t count, + const grpc_channel_args *args, grpc_mdctx *mdctx, int is_client); /** Get a (borrowed) pointer to this channels underlying channel stack */ -grpc_channel_stack *grpc_channel_get_channel_stack (grpc_channel * channel); +grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel); /** Get a (borrowed) pointer to the channel wide metadata context */ -grpc_mdctx *grpc_channel_get_metadata_context (grpc_channel * channel); +grpc_mdctx *grpc_channel_get_metadata_context(grpc_channel *channel); /** Get a grpc_mdelem of grpc-status: X where X is the numeric value of status_code. The returned elem is owned by the caller. */ -grpc_mdelem *grpc_channel_get_reffed_status_elem (grpc_channel * channel, int status_code); -grpc_mdstr *grpc_channel_get_status_string (grpc_channel * channel); -grpc_mdstr *grpc_channel_get_compression_algorithm_string (grpc_channel * channel); -grpc_mdstr *grpc_channel_get_encodings_accepted_by_peer_string (grpc_channel * channel); -grpc_mdstr *grpc_channel_get_message_string (grpc_channel * channel); -gpr_uint32 grpc_channel_get_max_message_length (grpc_channel * channel); +grpc_mdelem *grpc_channel_get_reffed_status_elem(grpc_channel *channel, + int status_code); +grpc_mdstr *grpc_channel_get_status_string(grpc_channel *channel); +grpc_mdstr *grpc_channel_get_compression_algorithm_string( + grpc_channel *channel); +grpc_mdstr *grpc_channel_get_encodings_accepted_by_peer_string( + grpc_channel *channel); +grpc_mdstr *grpc_channel_get_message_string(grpc_channel *channel); +gpr_uint32 grpc_channel_get_max_message_length(grpc_channel *channel); #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG -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_ref(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(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_exec_ctx * exec_ctx, grpc_channel * channel); +void grpc_channel_internal_ref(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(exec_ctx, channel, reason) \ diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index a9fc1cf59fa..a685a99eacd 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -40,33 +40,34 @@ #include "src/core/iomgr/alarm.h" #include "src/core/surface/completion_queue.h" -grpc_connectivity_state -grpc_channel_check_connectivity_state (grpc_channel * channel, int try_to_connect) -{ +grpc_connectivity_state grpc_channel_check_connectivity_state( + grpc_channel *channel, int try_to_connect) { /* 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_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_connectivity_state state; - if (client_channel_elem->filter != &grpc_client_channel_filter) - { - 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); - return GRPC_CHANNEL_FATAL_FAILURE; - } - state = grpc_client_channel_check_connectivity_state (&exec_ctx, client_channel_elem, try_to_connect); - grpc_exec_ctx_finish (&exec_ctx); + if (client_channel_elem->filter != &grpc_client_channel_filter) { + 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); + return GRPC_CHANNEL_FATAL_FAILURE; + } + state = grpc_client_channel_check_connectivity_state( + &exec_ctx, client_channel_elem, try_to_connect); + grpc_exec_ctx_finish(&exec_ctx); return state; } -typedef enum -{ +typedef enum { WAITING, CALLING_BACK, CALLING_BACK_AND_FINISHED, CALLED_BACK } callback_phase; -typedef struct -{ +typedef struct { gpr_mu mu; callback_phase phase; int success; @@ -80,26 +81,22 @@ typedef struct void *tag; } state_watcher; -static void -delete_state_watcher (grpc_exec_ctx * exec_ctx, state_watcher * w) -{ - GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, w->channel, "watch_connectivity"); - gpr_mu_destroy (&w->mu); - gpr_free (w); +static void delete_state_watcher(grpc_exec_ctx *exec_ctx, state_watcher *w) { + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, w->channel, "watch_connectivity"); + gpr_mu_destroy(&w->mu); + gpr_free(w); } -static void -finished_completion (grpc_exec_ctx * exec_ctx, void *pw, grpc_cq_completion * ignored) -{ +static void finished_completion(grpc_exec_ctx *exec_ctx, void *pw, + grpc_cq_completion *ignored) { int delete = 0; state_watcher *w = pw; - gpr_mu_lock (&w->mu); - switch (w->phase) - { + gpr_mu_lock(&w->mu); + switch (w->phase) { case WAITING: case CALLED_BACK: - gpr_log (GPR_ERROR, "should never reach here"); - abort (); + gpr_log(GPR_ERROR, "should never reach here"); + abort(); break; case CALLING_BACK: w->phase = CALLED_BACK; @@ -107,86 +104,80 @@ finished_completion (grpc_exec_ctx * exec_ctx, void *pw, grpc_cq_completion * ig case CALLING_BACK_AND_FINISHED: delete = 1; break; - } - gpr_mu_unlock (&w->mu); + } + gpr_mu_unlock(&w->mu); - if (delete) - { - delete_state_watcher (exec_ctx, w); - } + if (delete) { + delete_state_watcher(exec_ctx, w); + } } -static void -partly_done (grpc_exec_ctx * exec_ctx, state_watcher * w, int due_to_completion) -{ +static void partly_done(grpc_exec_ctx *exec_ctx, state_watcher *w, + int due_to_completion) { int delete = 0; grpc_channel_element *client_channel_elem = NULL; - gpr_mu_lock (&w->mu); - if (w->removed == 0) - { - w->removed = 1; - client_channel_elem = grpc_channel_stack_last_element (grpc_channel_get_channel_stack (w->channel)); - grpc_client_channel_del_interested_party (exec_ctx, client_channel_elem, grpc_cq_pollset (w->cq)); - } - gpr_mu_unlock (&w->mu); - if (due_to_completion) - { - gpr_mu_lock (&w->mu); - w->success = 1; - gpr_mu_unlock (&w->mu); - grpc_alarm_cancel (exec_ctx, &w->alarm); - } - - gpr_mu_lock (&w->mu); - switch (w->phase) - { + gpr_mu_lock(&w->mu); + if (w->removed == 0) { + w->removed = 1; + client_channel_elem = grpc_channel_stack_last_element( + grpc_channel_get_channel_stack(w->channel)); + grpc_client_channel_del_interested_party(exec_ctx, client_channel_elem, + grpc_cq_pollset(w->cq)); + } + gpr_mu_unlock(&w->mu); + if (due_to_completion) { + gpr_mu_lock(&w->mu); + w->success = 1; + gpr_mu_unlock(&w->mu); + grpc_alarm_cancel(exec_ctx, &w->alarm); + } + + gpr_mu_lock(&w->mu); + switch (w->phase) { case WAITING: w->phase = CALLING_BACK; - grpc_cq_end_op (exec_ctx, w->cq, w->tag, w->success, finished_completion, w, &w->completion_storage); + grpc_cq_end_op(exec_ctx, w->cq, w->tag, w->success, finished_completion, + w, &w->completion_storage); break; case CALLING_BACK: w->phase = CALLING_BACK_AND_FINISHED; break; case CALLING_BACK_AND_FINISHED: - gpr_log (GPR_ERROR, "should never reach here"); - abort (); + gpr_log(GPR_ERROR, "should never reach here"); + abort(); break; case CALLED_BACK: delete = 1; break; - } - gpr_mu_unlock (&w->mu); + } + gpr_mu_unlock(&w->mu); - if (delete) - { - delete_state_watcher (exec_ctx, w); - } + if (delete) { + delete_state_watcher(exec_ctx, w); + } } -static void -watch_complete (grpc_exec_ctx * exec_ctx, void *pw, int success) -{ - partly_done (exec_ctx, pw, 1); +static void watch_complete(grpc_exec_ctx *exec_ctx, void *pw, int success) { + partly_done(exec_ctx, pw, 1); } -static void -timeout_complete (grpc_exec_ctx * exec_ctx, void *pw, int success) -{ - partly_done (exec_ctx, pw, 0); +static void timeout_complete(grpc_exec_ctx *exec_ctx, void *pw, int success) { + partly_done(exec_ctx, pw, 0); } -void -grpc_channel_watch_connectivity_state (grpc_channel * channel, grpc_connectivity_state last_observed_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)); +void grpc_channel_watch_connectivity_state( + grpc_channel *channel, grpc_connectivity_state last_observed_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; - state_watcher *w = gpr_malloc (sizeof (*w)); + state_watcher *w = gpr_malloc(sizeof(*w)); - grpc_cq_begin_op (cq); + grpc_cq_begin_op(cq); - gpr_mu_init (&w->mu); - grpc_closure_init (&w->on_complete, watch_complete, w); + gpr_mu_init(&w->mu); + grpc_closure_init(&w->on_complete, watch_complete, w); w->phase = WAITING; w->state = last_observed_state; w->success = 0; @@ -195,19 +186,23 @@ grpc_channel_watch_connectivity_state (grpc_channel * channel, grpc_connectivity w->tag = tag; w->channel = channel; - grpc_alarm_init (&exec_ctx, &w->alarm, gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC), timeout_complete, w, gpr_now (GPR_CLOCK_MONOTONIC)); - - if (client_channel_elem->filter != &grpc_client_channel_filter) - { - gpr_log (GPR_ERROR, "grpc_channel_watch_connectivity_state called on something that is " "not a client channel, but '%s'", client_channel_elem->filter->name); - grpc_exec_ctx_enqueue(&exec_ctx, &w->on_complete ,1); - } - else - { - GRPC_CHANNEL_INTERNAL_REF (channel, "watch_connectivity"); - grpc_client_channel_add_interested_party (&exec_ctx, client_channel_elem, grpc_cq_pollset (cq)); - grpc_client_channel_watch_connectivity_state (&exec_ctx, client_channel_elem, &w->state, &w->on_complete); - } - - grpc_exec_ctx_finish (&exec_ctx); + grpc_alarm_init(&exec_ctx, &w->alarm, + gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC), + timeout_complete, w, gpr_now(GPR_CLOCK_MONOTONIC)); + + if (client_channel_elem->filter != &grpc_client_channel_filter) { + gpr_log(GPR_ERROR, + "grpc_channel_watch_connectivity_state called on something that is " + "not a client channel, but '%s'", + client_channel_elem->filter->name); + grpc_exec_ctx_enqueue(&exec_ctx, &w->on_complete, 1); + } else { + GRPC_CHANNEL_INTERNAL_REF(channel, "watch_connectivity"); + grpc_client_channel_add_interested_party(&exec_ctx, client_channel_elem, + grpc_cq_pollset(cq)); + grpc_client_channel_watch_connectivity_state(&exec_ctx, client_channel_elem, + &w->state, &w->on_complete); + } + + grpc_exec_ctx_finish(&exec_ctx); } diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index 1fd1479a664..05591ce27f9 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -48,8 +48,7 @@ #include "src/core/surface/channel.h" #include "src/core/transport/chttp2_transport.h" -typedef struct -{ +typedef struct { grpc_connector base; gpr_refcount refs; @@ -64,73 +63,63 @@ typedef struct grpc_closure connected; } connector; -static void -connector_ref (grpc_connector * con) -{ - connector *c = (connector *) con; - gpr_ref (&c->refs); +static void connector_ref(grpc_connector *con) { + connector *c = (connector *)con; + gpr_ref(&c->refs); } -static void -connector_unref (grpc_exec_ctx * exec_ctx, grpc_connector * con) -{ - connector *c = (connector *) con; - if (gpr_unref (&c->refs)) - { - grpc_mdctx_unref (c->mdctx); - gpr_free (c); - } +static void connector_unref(grpc_exec_ctx *exec_ctx, grpc_connector *con) { + connector *c = (connector *)con; + if (gpr_unref(&c->refs)) { + grpc_mdctx_unref(c->mdctx); + gpr_free(c); + } } -static void -connected (grpc_exec_ctx * exec_ctx, void *arg, int success) -{ +static void connected(grpc_exec_ctx *exec_ctx, void *arg, int success) { connector *c = arg; grpc_closure *notify; grpc_endpoint *tcp = c->tcp; - if (tcp != NULL) - { - c->result->transport = grpc_create_chttp2_transport (exec_ctx, c->args.channel_args, tcp, c->mdctx, 1); - grpc_chttp2_transport_start_reading (exec_ctx, c->result->transport, NULL, 0); - GPR_ASSERT (c->result->transport); - c->result->filters = gpr_malloc (sizeof (grpc_channel_filter *)); - c->result->filters[0] = &grpc_http_client_filter; - c->result->num_filters = 1; - } - else - { - memset (c->result, 0, sizeof (*c->result)); - } + if (tcp != NULL) { + c->result->transport = grpc_create_chttp2_transport( + exec_ctx, c->args.channel_args, tcp, c->mdctx, 1); + grpc_chttp2_transport_start_reading(exec_ctx, c->result->transport, NULL, + 0); + GPR_ASSERT(c->result->transport); + c->result->filters = gpr_malloc(sizeof(grpc_channel_filter *)); + c->result->filters[0] = &grpc_http_client_filter; + c->result->num_filters = 1; + } else { + memset(c->result, 0, sizeof(*c->result)); + } notify = c->notify; c->notify = NULL; - notify->cb (exec_ctx, notify->cb_arg, 1); + notify->cb(exec_ctx, notify->cb_arg, 1); } -static void -connector_shutdown (grpc_exec_ctx * exec_ctx, grpc_connector * con) -{ -} +static void connector_shutdown(grpc_exec_ctx *exec_ctx, grpc_connector *con) {} -static void -connector_connect (grpc_exec_ctx * exec_ctx, grpc_connector * con, const grpc_connect_in_args * args, grpc_connect_out_args * result, grpc_closure * notify) -{ - connector *c = (connector *) con; - GPR_ASSERT (c->notify == NULL); - GPR_ASSERT (notify->cb); +static void connector_connect(grpc_exec_ctx *exec_ctx, grpc_connector *con, + const grpc_connect_in_args *args, + grpc_connect_out_args *result, + grpc_closure *notify) { + connector *c = (connector *)con; + GPR_ASSERT(c->notify == NULL); + GPR_ASSERT(notify->cb); c->notify = notify; c->args = *args; c->result = result; c->tcp = NULL; - grpc_closure_init (&c->connected, connected, c); - grpc_tcp_client_connect (exec_ctx, &c->connected, &c->tcp, args->interested_parties, args->addr, args->addr_len, args->deadline); + grpc_closure_init(&c->connected, connected, c); + grpc_tcp_client_connect(exec_ctx, &c->connected, &c->tcp, + args->interested_parties, args->addr, args->addr_len, + args->deadline); } static const grpc_connector_vtable connector_vtable = { - connector_ref, connector_unref, connector_shutdown, connector_connect -}; + connector_ref, connector_unref, connector_shutdown, connector_connect}; -typedef struct -{ +typedef struct { grpc_subchannel_factory base; gpr_refcount refs; grpc_mdctx *mdctx; @@ -138,97 +127,93 @@ typedef struct grpc_channel *master; } subchannel_factory; -static void -subchannel_factory_ref (grpc_subchannel_factory * scf) -{ - subchannel_factory *f = (subchannel_factory *) scf; - gpr_ref (&f->refs); +static void subchannel_factory_ref(grpc_subchannel_factory *scf) { + subchannel_factory *f = (subchannel_factory *)scf; + gpr_ref(&f->refs); } -static void -subchannel_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * scf) -{ - subchannel_factory *f = (subchannel_factory *) scf; - if (gpr_unref (&f->refs)) - { - GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, f->master, "subchannel_factory"); - grpc_channel_args_destroy (f->merge_args); - grpc_mdctx_unref (f->mdctx); - gpr_free (f); - } +static void subchannel_factory_unref(grpc_exec_ctx *exec_ctx, + grpc_subchannel_factory *scf) { + subchannel_factory *f = (subchannel_factory *)scf; + if (gpr_unref(&f->refs)) { + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, f->master, "subchannel_factory"); + grpc_channel_args_destroy(f->merge_args); + grpc_mdctx_unref(f->mdctx); + gpr_free(f); + } } -static grpc_subchannel * -subchannel_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * scf, grpc_subchannel_args * args) -{ - subchannel_factory *f = (subchannel_factory *) scf; - connector *c = gpr_malloc (sizeof (*c)); - grpc_channel_args *final_args = grpc_channel_args_merge (args->args, f->merge_args); +static grpc_subchannel *subchannel_factory_create_subchannel( + grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *scf, + grpc_subchannel_args *args) { + subchannel_factory *f = (subchannel_factory *)scf; + connector *c = gpr_malloc(sizeof(*c)); + grpc_channel_args *final_args = + grpc_channel_args_merge(args->args, f->merge_args); grpc_subchannel *s; - memset (c, 0, sizeof (*c)); + memset(c, 0, sizeof(*c)); c->base.vtable = &connector_vtable; c->mdctx = f->mdctx; - grpc_mdctx_ref (c->mdctx); - gpr_ref_init (&c->refs, 1); + grpc_mdctx_ref(c->mdctx); + gpr_ref_init(&c->refs, 1); args->mdctx = f->mdctx; args->args = final_args; args->master = f->master; - s = grpc_subchannel_create (&c->base, args); - grpc_connector_unref (exec_ctx, &c->base); - grpc_channel_args_destroy (final_args); + s = grpc_subchannel_create(&c->base, args); + grpc_connector_unref(exec_ctx, &c->base); + grpc_channel_args_destroy(final_args); return s; } static const grpc_subchannel_factory_vtable subchannel_factory_vtable = { - subchannel_factory_ref, subchannel_factory_unref, - subchannel_factory_create_subchannel -}; + subchannel_factory_ref, subchannel_factory_unref, + subchannel_factory_create_subchannel}; /* Create a client channel: Asynchronously: - resolve target - connect to it (trying alternatives as presented) - perform handshakes */ -grpc_channel * -grpc_insecure_channel_create (const char *target, const grpc_channel_args * args, void *reserved) -{ +grpc_channel *grpc_insecure_channel_create(const char *target, + const grpc_channel_args *args, + void *reserved) { grpc_channel *channel = NULL; #define MAX_FILTERS 3 const grpc_channel_filter *filters[MAX_FILTERS]; grpc_resolver *resolver; subchannel_factory *f; - grpc_mdctx *mdctx = grpc_mdctx_create (); + grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; size_t n = 0; - GPR_ASSERT (!reserved); - if (grpc_channel_args_is_census_enabled (args)) - { - filters[n++] = &grpc_client_census_filter; - } + GPR_ASSERT(!reserved); + if (grpc_channel_args_is_census_enabled(args)) { + filters[n++] = &grpc_client_census_filter; + } filters[n++] = &grpc_compress_filter; filters[n++] = &grpc_client_channel_filter; - GPR_ASSERT (n <= MAX_FILTERS); + GPR_ASSERT(n <= MAX_FILTERS); - channel = grpc_channel_create_from_filters (&exec_ctx, target, filters, n, args, mdctx, 1); + channel = grpc_channel_create_from_filters(&exec_ctx, target, filters, n, + args, mdctx, 1); - f = gpr_malloc (sizeof (*f)); + f = gpr_malloc(sizeof(*f)); f->base.vtable = &subchannel_factory_vtable; - gpr_ref_init (&f->refs, 1); - grpc_mdctx_ref (mdctx); + gpr_ref_init(&f->refs, 1); + grpc_mdctx_ref(mdctx); f->mdctx = mdctx; - f->merge_args = grpc_channel_args_copy (args); + f->merge_args = grpc_channel_args_copy(args); f->master = channel; - GRPC_CHANNEL_INTERNAL_REF (f->master, "subchannel_factory"); - resolver = grpc_resolver_create (target, &f->base); - if (!resolver) - { - return NULL; - } - - grpc_client_channel_set_resolver (&exec_ctx, grpc_channel_get_channel_stack (channel), resolver); - GRPC_RESOLVER_UNREF (&exec_ctx, resolver, "create"); - grpc_subchannel_factory_unref (&exec_ctx, &f->base); - - grpc_exec_ctx_finish (&exec_ctx); + GRPC_CHANNEL_INTERNAL_REF(f->master, "subchannel_factory"); + resolver = grpc_resolver_create(target, &f->base); + if (!resolver) { + return NULL; + } + + grpc_client_channel_set_resolver( + &exec_ctx, grpc_channel_get_channel_stack(channel), resolver); + GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "create"); + grpc_subchannel_factory_unref(&exec_ctx, &f->base); + + grpc_exec_ctx_finish(&exec_ctx); return channel; } diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index 56dceec30c1..5dac8ebcf8b 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -45,15 +45,13 @@ #include #include -typedef struct -{ +typedef struct { grpc_pollset_worker *worker; void *tag; } plucker; /* Completion queue structure */ -struct grpc_completion_queue -{ +struct grpc_completion_queue { /** completed events */ grpc_cq_completion completed_head; grpc_cq_completion *completed_tail; @@ -72,80 +70,73 @@ struct grpc_completion_queue grpc_closure pollset_destroy_done; }; -static void on_pollset_destroy_done (grpc_exec_ctx * exec_ctx, void *cc, int success); +static void on_pollset_destroy_done(grpc_exec_ctx *exec_ctx, void *cc, + int success); -grpc_completion_queue * -grpc_completion_queue_create (void *reserved) -{ - grpc_completion_queue *cc = gpr_malloc (sizeof (grpc_completion_queue)); - GPR_ASSERT (!reserved); - memset (cc, 0, sizeof (*cc)); +grpc_completion_queue *grpc_completion_queue_create(void *reserved) { + grpc_completion_queue *cc = gpr_malloc(sizeof(grpc_completion_queue)); + GPR_ASSERT(!reserved); + memset(cc, 0, sizeof(*cc)); /* Initial ref is dropped by grpc_completion_queue_shutdown */ - gpr_ref_init (&cc->pending_events, 1); + gpr_ref_init(&cc->pending_events, 1); /* One for destroy(), one for pollset_shutdown */ - gpr_ref_init (&cc->owning_refs, 2); - grpc_pollset_init (&cc->pollset); + gpr_ref_init(&cc->owning_refs, 2); + grpc_pollset_init(&cc->pollset); cc->completed_tail = &cc->completed_head; - cc->completed_head.next = (gpr_uintptr) cc->completed_tail; - grpc_closure_init (&cc->pollset_destroy_done, on_pollset_destroy_done, cc); + cc->completed_head.next = (gpr_uintptr)cc->completed_tail; + grpc_closure_init(&cc->pollset_destroy_done, on_pollset_destroy_done, cc); return cc; } #ifdef GRPC_CQ_REF_COUNT_DEBUG -void -grpc_cq_internal_ref (grpc_completion_queue * cc, const char *reason, const char *file, int line) -{ - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "CQ:%p ref %d -> %d %s", cc, (int) cc->owning_refs.count, (int) cc->owning_refs.count + 1, reason); +void grpc_cq_internal_ref(grpc_completion_queue *cc, const char *reason, + const char *file, int line) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "CQ:%p ref %d -> %d %s", cc, + (int)cc->owning_refs.count, (int)cc->owning_refs.count + 1, reason); #else -void -grpc_cq_internal_ref (grpc_completion_queue * cc) -{ +void grpc_cq_internal_ref(grpc_completion_queue *cc) { #endif - gpr_ref (&cc->owning_refs); + gpr_ref(&cc->owning_refs); } -static void -on_pollset_destroy_done (grpc_exec_ctx * exec_ctx, void *arg, int success) -{ +static void on_pollset_destroy_done(grpc_exec_ctx *exec_ctx, void *arg, + int success) { grpc_completion_queue *cc = arg; - GRPC_CQ_INTERNAL_UNREF (cc, "pollset_destroy"); + GRPC_CQ_INTERNAL_UNREF(cc, "pollset_destroy"); } #ifdef GRPC_CQ_REF_COUNT_DEBUG -void -grpc_cq_internal_unref (grpc_completion_queue * cc, const char *reason, const char *file, int line) -{ - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "CQ:%p unref %d -> %d %s", cc, (int) cc->owning_refs.count, (int) cc->owning_refs.count - 1, reason); +void grpc_cq_internal_unref(grpc_completion_queue *cc, const char *reason, + const char *file, int line) { + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "CQ:%p unref %d -> %d %s", cc, + (int)cc->owning_refs.count, (int)cc->owning_refs.count - 1, reason); #else -void -grpc_cq_internal_unref (grpc_completion_queue * cc) -{ +void grpc_cq_internal_unref(grpc_completion_queue *cc) { #endif - if (gpr_unref (&cc->owning_refs)) - { - GPR_ASSERT (cc->completed_head.next == (gpr_uintptr) & cc->completed_head); - grpc_pollset_destroy (&cc->pollset); - gpr_free (cc); - } + if (gpr_unref(&cc->owning_refs)) { + GPR_ASSERT(cc->completed_head.next == (gpr_uintptr)&cc->completed_head); + grpc_pollset_destroy(&cc->pollset); + gpr_free(cc); + } } -void -grpc_cq_begin_op (grpc_completion_queue * cc) -{ +void grpc_cq_begin_op(grpc_completion_queue *cc) { #ifndef NDEBUG - gpr_mu_lock (GRPC_POLLSET_MU (&cc->pollset)); - GPR_ASSERT (!cc->shutdown_called); - gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); + GPR_ASSERT(!cc->shutdown_called); + gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); #endif - gpr_ref (&cc->pending_events); + gpr_ref(&cc->pending_events); } /* Signal the end of an operation - if this is the last waiting-to-be-queued event, then enter shutdown mode */ /* Queue a GRPC_OP_COMPLETED operation */ -void -grpc_cq_end_op (grpc_exec_ctx * exec_ctx,grpc_completion_queue * cc, void *tag, int success, void (*done) (grpc_exec_ctx * exec_ctx, void *done_arg, grpc_cq_completion * storage), void *done_arg, grpc_cq_completion * storage) -{ +void grpc_cq_end_op(grpc_exec_ctx *exec_ctx, grpc_completion_queue *cc, + void *tag, int success, + void (*done)(grpc_exec_ctx *exec_ctx, void *done_arg, + grpc_cq_completion *storage), + void *done_arg, grpc_cq_completion *storage) { int shutdown; int i; grpc_pollset_worker *pluck_worker; @@ -153,127 +144,113 @@ grpc_cq_end_op (grpc_exec_ctx * exec_ctx,grpc_completion_queue * cc, void *tag, storage->tag = tag; storage->done = done; storage->done_arg = done_arg; - storage->next = ((gpr_uintptr) & cc->completed_head) | ((gpr_uintptr) (success != 0)); + storage->next = + ((gpr_uintptr)&cc->completed_head) | ((gpr_uintptr)(success != 0)); - gpr_mu_lock (GRPC_POLLSET_MU (&cc->pollset)); - shutdown = gpr_unref (&cc->pending_events); - if (!shutdown) - { - cc->completed_tail->next = ((gpr_uintptr) storage) | (1u & (gpr_uintptr) cc->completed_tail->next); - cc->completed_tail = storage; - pluck_worker = NULL; - for (i = 0; i < cc->num_pluckers; i++) - { - if (cc->pluckers[i].tag == tag) - { - pluck_worker = cc->pluckers[i].worker; - break; - } - } - grpc_pollset_kick (&cc->pollset, pluck_worker); - gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); - } - else - { - cc->completed_tail->next = ((gpr_uintptr) storage) | (1u & (gpr_uintptr) cc->completed_tail->next); - cc->completed_tail = storage; - GPR_ASSERT (!cc->shutdown); - GPR_ASSERT (cc->shutdown_called); - cc->shutdown = 1; - gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); - grpc_pollset_shutdown (exec_ctx, &cc->pollset, &cc->pollset_destroy_done); + gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); + shutdown = gpr_unref(&cc->pending_events); + if (!shutdown) { + cc->completed_tail->next = + ((gpr_uintptr)storage) | (1u & (gpr_uintptr)cc->completed_tail->next); + cc->completed_tail = storage; + pluck_worker = NULL; + for (i = 0; i < cc->num_pluckers; i++) { + if (cc->pluckers[i].tag == tag) { + pluck_worker = cc->pluckers[i].worker; + break; + } } + grpc_pollset_kick(&cc->pollset, pluck_worker); + gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); + } else { + cc->completed_tail->next = + ((gpr_uintptr)storage) | (1u & (gpr_uintptr)cc->completed_tail->next); + cc->completed_tail = storage; + GPR_ASSERT(!cc->shutdown); + GPR_ASSERT(cc->shutdown_called); + cc->shutdown = 1; + gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); + grpc_pollset_shutdown(exec_ctx, &cc->pollset, &cc->pollset_destroy_done); + } } -grpc_event -grpc_completion_queue_next (grpc_completion_queue * cc, gpr_timespec deadline, void *reserved) -{ +grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, + gpr_timespec deadline, void *reserved) { grpc_event ret; grpc_pollset_worker worker; int first_loop = 1; gpr_timespec now; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT (!reserved); + GPR_ASSERT(!reserved); - deadline = gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC); + deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC); - GRPC_CQ_INTERNAL_REF (cc, "next"); - gpr_mu_lock (GRPC_POLLSET_MU (&cc->pollset)); - for (;;) - { - if (cc->completed_tail != &cc->completed_head) - { - grpc_cq_completion *c = (grpc_cq_completion *) cc->completed_head.next; - cc->completed_head.next = c->next & ~(gpr_uintptr) 1; - if (c == cc->completed_tail) - { - cc->completed_tail = &cc->completed_head; - } - gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); - ret.type = GRPC_OP_COMPLETE; - ret.success = c->next & 1u; - ret.tag = c->tag; - c->done (&exec_ctx, c->done_arg, c); - break; - } - if (cc->shutdown) - { - gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); - memset (&ret, 0, sizeof (ret)); - ret.type = GRPC_QUEUE_SHUTDOWN; - break; - } - now = gpr_now (GPR_CLOCK_MONOTONIC); - if (!first_loop && gpr_time_cmp (now, deadline) >= 0) - { - gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); - memset (&ret, 0, sizeof (ret)); - ret.type = GRPC_QUEUE_TIMEOUT; - break; - } - first_loop = 0; - grpc_pollset_work (&exec_ctx, &cc->pollset, &worker, now, deadline); + GRPC_CQ_INTERNAL_REF(cc, "next"); + gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); + for (;;) { + if (cc->completed_tail != &cc->completed_head) { + grpc_cq_completion *c = (grpc_cq_completion *)cc->completed_head.next; + cc->completed_head.next = c->next & ~(gpr_uintptr)1; + if (c == cc->completed_tail) { + cc->completed_tail = &cc->completed_head; + } + gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); + ret.type = GRPC_OP_COMPLETE; + ret.success = c->next & 1u; + ret.tag = c->tag; + c->done(&exec_ctx, c->done_arg, c); + break; + } + if (cc->shutdown) { + gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); + memset(&ret, 0, sizeof(ret)); + ret.type = GRPC_QUEUE_SHUTDOWN; + break; + } + now = gpr_now(GPR_CLOCK_MONOTONIC); + if (!first_loop && gpr_time_cmp(now, deadline) >= 0) { + gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); + memset(&ret, 0, sizeof(ret)); + ret.type = GRPC_QUEUE_TIMEOUT; + break; } - GRPC_SURFACE_TRACE_RETURNED_EVENT (cc, &ret); - GRPC_CQ_INTERNAL_UNREF (cc, "next"); - grpc_exec_ctx_finish (&exec_ctx); + first_loop = 0; + grpc_pollset_work(&exec_ctx, &cc->pollset, &worker, now, deadline); + } + GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret); + GRPC_CQ_INTERNAL_UNREF(cc, "next"); + grpc_exec_ctx_finish(&exec_ctx); return ret; } -static int -add_plucker (grpc_completion_queue * cc, void *tag, grpc_pollset_worker * worker) -{ - if (cc->num_pluckers == GRPC_MAX_COMPLETION_QUEUE_PLUCKERS) - { - return 0; - } +static int add_plucker(grpc_completion_queue *cc, void *tag, + grpc_pollset_worker *worker) { + if (cc->num_pluckers == GRPC_MAX_COMPLETION_QUEUE_PLUCKERS) { + return 0; + } cc->pluckers[cc->num_pluckers].tag = tag; cc->pluckers[cc->num_pluckers].worker = worker; cc->num_pluckers++; return 1; } -static void -del_plucker (grpc_completion_queue * cc, void *tag, grpc_pollset_worker * worker) -{ +static void del_plucker(grpc_completion_queue *cc, void *tag, + grpc_pollset_worker *worker) { int i; - for (i = 0; i < cc->num_pluckers; i++) - { - if (cc->pluckers[i].tag == tag && cc->pluckers[i].worker == worker) - { - cc->num_pluckers--; - GPR_SWAP (plucker, cc->pluckers[i], cc->pluckers[cc->num_pluckers]); - return; - } + for (i = 0; i < cc->num_pluckers; i++) { + if (cc->pluckers[i].tag == tag && cc->pluckers[i].worker == worker) { + cc->num_pluckers--; + GPR_SWAP(plucker, cc->pluckers[i], cc->pluckers[cc->num_pluckers]); + return; } - gpr_log (GPR_ERROR, "should never reach here"); - abort (); + } + gpr_log(GPR_ERROR, "should never reach here"); + abort(); } -grpc_event -grpc_completion_queue_pluck (grpc_completion_queue * cc, void *tag, gpr_timespec deadline, void *reserved) -{ +grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, + gpr_timespec deadline, void *reserved) { grpc_event ret; grpc_cq_completion *c; grpc_cq_completion *prev; @@ -282,116 +259,98 @@ grpc_completion_queue_pluck (grpc_completion_queue * cc, void *tag, gpr_timespec int first_loop = 1; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT (!reserved); + GPR_ASSERT(!reserved); - deadline = gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC); + deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC); - GRPC_CQ_INTERNAL_REF (cc, "pluck"); - gpr_mu_lock (GRPC_POLLSET_MU (&cc->pollset)); - for (;;) - { - prev = &cc->completed_head; - while ((c = (grpc_cq_completion *) (prev->next & ~(gpr_uintptr) 1)) != &cc->completed_head) - { - if (c->tag == tag) - { - prev->next = (prev->next & (gpr_uintptr) 1) | (c->next & ~(gpr_uintptr) 1); - if (c == cc->completed_tail) - { - cc->completed_tail = prev; - } - gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); - ret.type = GRPC_OP_COMPLETE; - ret.success = c->next & 1u; - ret.tag = c->tag; - c->done (&exec_ctx, c->done_arg, c); - goto done; - } - prev = c; - } - if (cc->shutdown) - { - gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); - memset (&ret, 0, sizeof (ret)); - ret.type = GRPC_QUEUE_SHUTDOWN; - break; - } - if (!add_plucker (cc, tag, &worker)) - { - gpr_log (GPR_DEBUG, "Too many outstanding grpc_completion_queue_pluck calls: maximum " "is %d", GRPC_MAX_COMPLETION_QUEUE_PLUCKERS); - gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); - memset (&ret, 0, sizeof (ret)); - /* TODO(ctiller): should we use a different result here */ - ret.type = GRPC_QUEUE_TIMEOUT; - break; - } - now = gpr_now (GPR_CLOCK_MONOTONIC); - if (!first_loop && gpr_time_cmp (now, deadline) >= 0) - { - del_plucker (cc, tag, &worker); - gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); - memset (&ret, 0, sizeof (ret)); - ret.type = GRPC_QUEUE_TIMEOUT; - break; - } - first_loop = 0; - grpc_pollset_work (&exec_ctx, &cc->pollset, &worker, now, deadline); - del_plucker (cc, tag, &worker); + GRPC_CQ_INTERNAL_REF(cc, "pluck"); + gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); + for (;;) { + prev = &cc->completed_head; + while ((c = (grpc_cq_completion *)(prev->next & ~(gpr_uintptr)1)) != + &cc->completed_head) { + if (c->tag == tag) { + prev->next = + (prev->next & (gpr_uintptr)1) | (c->next & ~(gpr_uintptr)1); + if (c == cc->completed_tail) { + cc->completed_tail = prev; + } + gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); + ret.type = GRPC_OP_COMPLETE; + ret.success = c->next & 1u; + ret.tag = c->tag; + c->done(&exec_ctx, c->done_arg, c); + goto done; + } + prev = c; + } + if (cc->shutdown) { + gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); + memset(&ret, 0, sizeof(ret)); + ret.type = GRPC_QUEUE_SHUTDOWN; + break; } + if (!add_plucker(cc, tag, &worker)) { + gpr_log(GPR_DEBUG, + "Too many outstanding grpc_completion_queue_pluck calls: maximum " + "is %d", + GRPC_MAX_COMPLETION_QUEUE_PLUCKERS); + gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); + memset(&ret, 0, sizeof(ret)); + /* TODO(ctiller): should we use a different result here */ + ret.type = GRPC_QUEUE_TIMEOUT; + break; + } + now = gpr_now(GPR_CLOCK_MONOTONIC); + if (!first_loop && gpr_time_cmp(now, deadline) >= 0) { + del_plucker(cc, tag, &worker); + gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); + memset(&ret, 0, sizeof(ret)); + ret.type = GRPC_QUEUE_TIMEOUT; + break; + } + first_loop = 0; + grpc_pollset_work(&exec_ctx, &cc->pollset, &worker, now, deadline); + del_plucker(cc, tag, &worker); + } done: - GRPC_SURFACE_TRACE_RETURNED_EVENT (cc, &ret); - GRPC_CQ_INTERNAL_UNREF (cc, "pluck"); - grpc_exec_ctx_finish (&exec_ctx); + GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret); + GRPC_CQ_INTERNAL_UNREF(cc, "pluck"); + grpc_exec_ctx_finish(&exec_ctx); return ret; } /* 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 * cc) -{ +void grpc_completion_queue_shutdown(grpc_completion_queue *cc) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - gpr_mu_lock (GRPC_POLLSET_MU (&cc->pollset)); - if (cc->shutdown_called) - { - gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); - return; - } + gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); + if (cc->shutdown_called) { + gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); + return; + } cc->shutdown_called = 1; - gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); + gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); - if (gpr_unref (&cc->pending_events)) - { - gpr_mu_lock (GRPC_POLLSET_MU (&cc->pollset)); - GPR_ASSERT (!cc->shutdown); - cc->shutdown = 1; - gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset)); - grpc_pollset_shutdown (&exec_ctx, &cc->pollset, &cc->pollset_destroy_done); - } - grpc_exec_ctx_finish (&exec_ctx); + if (gpr_unref(&cc->pending_events)) { + gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); + GPR_ASSERT(!cc->shutdown); + cc->shutdown = 1; + gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); + grpc_pollset_shutdown(&exec_ctx, &cc->pollset, &cc->pollset_destroy_done); + } + grpc_exec_ctx_finish(&exec_ctx); } -void -grpc_completion_queue_destroy (grpc_completion_queue * cc) -{ - grpc_completion_queue_shutdown (cc); - GRPC_CQ_INTERNAL_UNREF (cc, "destroy"); +void grpc_completion_queue_destroy(grpc_completion_queue *cc) { + grpc_completion_queue_shutdown(cc); + GRPC_CQ_INTERNAL_UNREF(cc, "destroy"); } -grpc_pollset * -grpc_cq_pollset (grpc_completion_queue * cc) -{ +grpc_pollset *grpc_cq_pollset(grpc_completion_queue *cc) { return &cc->pollset; } -void -grpc_cq_mark_server_cq (grpc_completion_queue * cc) -{ - cc->is_server_cq = 1; -} +void grpc_cq_mark_server_cq(grpc_completion_queue *cc) { cc->is_server_cq = 1; } -int -grpc_cq_is_server_cq (grpc_completion_queue * cc) -{ - return cc->is_server_cq; -} +int grpc_cq_is_server_cq(grpc_completion_queue *cc) { return cc->is_server_cq; } diff --git a/src/core/surface/completion_queue.h b/src/core/surface/completion_queue.h index d9b06223a87..5f8282e5429 100644 --- a/src/core/surface/completion_queue.h +++ b/src/core/surface/completion_queue.h @@ -39,42 +39,48 @@ #include "src/core/iomgr/pollset.h" #include -typedef struct grpc_cq_completion -{ +typedef struct grpc_cq_completion { /** user supplied tag */ 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)(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 */ gpr_uintptr next; } grpc_cq_completion; #ifdef GRPC_CQ_REF_COUNT_DEBUG -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_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); #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__) #else -void grpc_cq_internal_ref (grpc_completion_queue * cc); -void grpc_cq_internal_unref (grpc_completion_queue * cc); +void grpc_cq_internal_ref(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(cc, reason) grpc_cq_internal_unref(cc) #endif /* Flag that an operation is beginning: the completion channel will not finish shutdown until a corrensponding grpc_cq_end_* call is made */ -void grpc_cq_begin_op (grpc_completion_queue * cc); +void grpc_cq_begin_op(grpc_completion_queue *cc); /* Queue a GRPC_OP_COMPLETED operation */ -void grpc_cq_end_op (grpc_exec_ctx * exec_ctx, grpc_completion_queue * cc, void *tag, int success, void (*done) (grpc_exec_ctx * exec_ctx,void *done_arg, grpc_cq_completion * storage), void *done_arg, grpc_cq_completion * storage); +void grpc_cq_end_op(grpc_exec_ctx *exec_ctx, grpc_completion_queue *cc, + void *tag, int success, + 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); +grpc_pollset *grpc_cq_pollset(grpc_completion_queue *cc); -void grpc_cq_mark_server_cq (grpc_completion_queue * cc); -int grpc_cq_is_server_cq (grpc_completion_queue * cc); +void grpc_cq_mark_server_cq(grpc_completion_queue *cc); +int grpc_cq_is_server_cq(grpc_completion_queue *cc); #endif /* GRPC_INTERNAL_CORE_SURFACE_COMPLETION_QUEUE_H */ diff --git a/src/core/surface/event_string.c b/src/core/surface/event_string.c index ac5cb657cd0..33cd4a43aa0 100644 --- a/src/core/surface/event_string.c +++ b/src/core/surface/event_string.c @@ -39,55 +39,43 @@ #include #include -static void -addhdr (gpr_strvec * buf, grpc_event * ev) -{ +static void addhdr(gpr_strvec *buf, grpc_event *ev) { char *tmp; - gpr_asprintf (&tmp, "tag:%p", ev->tag); - gpr_strvec_add (buf, tmp); + gpr_asprintf(&tmp, "tag:%p", ev->tag); + gpr_strvec_add(buf, tmp); } -static const char * -errstr (int success) -{ - return success ? "OK" : "ERROR"; -} +static const char *errstr(int success) { return success ? "OK" : "ERROR"; } -static void -adderr (gpr_strvec * buf, int success) -{ +static void adderr(gpr_strvec *buf, int success) { char *tmp; - gpr_asprintf (&tmp, " %s", errstr (success)); - gpr_strvec_add (buf, tmp); + gpr_asprintf(&tmp, " %s", errstr(success)); + gpr_strvec_add(buf, tmp); } -char * -grpc_event_string (grpc_event * ev) -{ +char *grpc_event_string(grpc_event *ev) { char *out; gpr_strvec buf; - if (ev == NULL) - return gpr_strdup ("null"); + if (ev == NULL) return gpr_strdup("null"); - gpr_strvec_init (&buf); + gpr_strvec_init(&buf); - switch (ev->type) - { + switch (ev->type) { case GRPC_QUEUE_TIMEOUT: - gpr_strvec_add (&buf, gpr_strdup ("QUEUE_TIMEOUT")); + gpr_strvec_add(&buf, gpr_strdup("QUEUE_TIMEOUT")); break; case GRPC_QUEUE_SHUTDOWN: - gpr_strvec_add (&buf, gpr_strdup ("QUEUE_SHUTDOWN")); + gpr_strvec_add(&buf, gpr_strdup("QUEUE_SHUTDOWN")); break; case GRPC_OP_COMPLETE: - gpr_strvec_add (&buf, gpr_strdup ("OP_COMPLETE: ")); - addhdr (&buf, ev); - adderr (&buf, ev->success); + gpr_strvec_add(&buf, gpr_strdup("OP_COMPLETE: ")); + addhdr(&buf, ev); + adderr(&buf, ev->success); break; - } + } - out = gpr_strvec_flatten (&buf, NULL); - gpr_strvec_destroy (&buf); + out = gpr_strvec_flatten(&buf, NULL); + gpr_strvec_destroy(&buf); return out; } diff --git a/src/core/surface/event_string.h b/src/core/surface/event_string.h index 6f2dfe0282a..07c474e3a02 100644 --- a/src/core/surface/event_string.h +++ b/src/core/surface/event_string.h @@ -37,6 +37,6 @@ #include /* Returns a string describing an event. Must be later freed with gpr_free() */ -char *grpc_event_string (grpc_event * ev); +char *grpc_event_string(grpc_event *ev); #endif /* GRPC_INTERNAL_CORE_SURFACE_EVENT_STRING_H */ diff --git a/src/core/surface/init.c b/src/core/surface/init.c index 4d0be4f7b90..93c27c77bf6 100644 --- a/src/core/surface/init.c +++ b/src/core/surface/init.c @@ -61,110 +61,91 @@ static gpr_once g_basic_init = GPR_ONCE_INIT; static gpr_mu g_init_mu; static int g_initializations; -static void -do_basic_init (void) -{ - gpr_mu_init (&g_init_mu); +static void do_basic_init(void) { + gpr_mu_init(&g_init_mu); g_initializations = 0; } -typedef struct grpc_plugin -{ - void (*init) (); - void (*destroy) (); +typedef struct grpc_plugin { + void (*init)(); + void (*destroy)(); } grpc_plugin; static grpc_plugin g_all_of_the_plugins[MAX_PLUGINS]; static int g_number_of_plugins = 0; -void -grpc_register_plugin (void (*init) (void), void (*destroy) (void)) -{ - GPR_ASSERT (g_number_of_plugins != MAX_PLUGINS); +void grpc_register_plugin(void (*init)(void), void (*destroy)(void)) { + GPR_ASSERT(g_number_of_plugins != MAX_PLUGINS); g_all_of_the_plugins[g_number_of_plugins].init = init; g_all_of_the_plugins[g_number_of_plugins].destroy = destroy; g_number_of_plugins++; } -void -grpc_init (void) -{ +void grpc_init(void) { int i; - gpr_once_init (&g_basic_init, do_basic_init); + gpr_once_init(&g_basic_init, do_basic_init); - gpr_mu_lock (&g_init_mu); - if (++g_initializations == 1) - { - gpr_time_init (); - grpc_lb_policy_registry_init (grpc_pick_first_lb_factory_create ()); - grpc_register_lb_policy (grpc_pick_first_lb_factory_create ()); - grpc_register_lb_policy (grpc_round_robin_lb_factory_create ()); - grpc_resolver_registry_init ("dns:///"); - grpc_register_resolver_type (grpc_dns_resolver_factory_create ()); - grpc_register_resolver_type (grpc_ipv4_resolver_factory_create ()); - grpc_register_resolver_type (grpc_ipv6_resolver_factory_create ()); + gpr_mu_lock(&g_init_mu); + if (++g_initializations == 1) { + gpr_time_init(); + grpc_lb_policy_registry_init(grpc_pick_first_lb_factory_create()); + grpc_register_lb_policy(grpc_pick_first_lb_factory_create()); + grpc_register_lb_policy(grpc_round_robin_lb_factory_create()); + grpc_resolver_registry_init("dns:///"); + grpc_register_resolver_type(grpc_dns_resolver_factory_create()); + grpc_register_resolver_type(grpc_ipv4_resolver_factory_create()); + grpc_register_resolver_type(grpc_ipv6_resolver_factory_create()); #ifdef GPR_POSIX_SOCKET - grpc_register_resolver_type (grpc_unix_resolver_factory_create ()); + grpc_register_resolver_type(grpc_unix_resolver_factory_create()); #endif - grpc_register_tracer ("channel", &grpc_trace_channel); - grpc_register_tracer ("surface", &grpc_surface_trace); - grpc_register_tracer ("http", &grpc_http_trace); - grpc_register_tracer ("flowctl", &grpc_flowctl_trace); - grpc_register_tracer ("batch", &grpc_trace_batch); - grpc_register_tracer ("connectivity_state", &grpc_connectivity_state_trace); - grpc_security_pre_init (); - grpc_iomgr_init (); - grpc_tracer_init ("GRPC_TRACE"); - /* Only initialize census if noone else has. */ - if (census_enabled () == CENSUS_FEATURE_NONE) - { - if (census_initialize (census_supported ())) - { /* enable all features. */ - gpr_log (GPR_ERROR, "Could not initialize census."); - } - } - grpc_timers_global_init (); - for (i = 0; i < g_number_of_plugins; i++) - { - if (g_all_of_the_plugins[i].init != NULL) - { - g_all_of_the_plugins[i].init (); - } - } + grpc_register_tracer("channel", &grpc_trace_channel); + grpc_register_tracer("surface", &grpc_surface_trace); + grpc_register_tracer("http", &grpc_http_trace); + grpc_register_tracer("flowctl", &grpc_flowctl_trace); + grpc_register_tracer("batch", &grpc_trace_batch); + grpc_register_tracer("connectivity_state", &grpc_connectivity_state_trace); + grpc_security_pre_init(); + grpc_iomgr_init(); + grpc_tracer_init("GRPC_TRACE"); + /* Only initialize census if noone else has. */ + if (census_enabled() == CENSUS_FEATURE_NONE) { + if (census_initialize(census_supported())) { /* enable all features. */ + gpr_log(GPR_ERROR, "Could not initialize census."); + } } - gpr_mu_unlock (&g_init_mu); + grpc_timers_global_init(); + for (i = 0; i < g_number_of_plugins; i++) { + if (g_all_of_the_plugins[i].init != NULL) { + g_all_of_the_plugins[i].init(); + } + } + } + gpr_mu_unlock(&g_init_mu); } -void -grpc_shutdown (void) -{ +void grpc_shutdown(void) { int i; - gpr_mu_lock (&g_init_mu); - if (--g_initializations == 0) - { - grpc_iomgr_shutdown (); - census_shutdown (); - grpc_timers_global_destroy (); - grpc_tracer_shutdown (); - grpc_resolver_registry_shutdown (); - for (i = 0; i < g_number_of_plugins; i++) - { - if (g_all_of_the_plugins[i].destroy != NULL) - { - g_all_of_the_plugins[i].destroy (); - } - } + gpr_mu_lock(&g_init_mu); + if (--g_initializations == 0) { + grpc_iomgr_shutdown(); + census_shutdown(); + grpc_timers_global_destroy(); + grpc_tracer_shutdown(); + grpc_resolver_registry_shutdown(); + for (i = 0; i < g_number_of_plugins; i++) { + if (g_all_of_the_plugins[i].destroy != NULL) { + g_all_of_the_plugins[i].destroy(); + } } - gpr_mu_unlock (&g_init_mu); + } + gpr_mu_unlock(&g_init_mu); } -int -grpc_is_initialized (void) -{ +int grpc_is_initialized(void) { int r; - gpr_once_init (&g_basic_init, do_basic_init); - gpr_mu_lock (&g_init_mu); + gpr_once_init(&g_basic_init, do_basic_init); + gpr_mu_lock(&g_init_mu); r = g_initializations > 0; - gpr_mu_unlock (&g_init_mu); + gpr_mu_unlock(&g_init_mu); return r; } diff --git a/src/core/surface/init.h b/src/core/surface/init.h index e880e3b2c0d..771c30f4125 100644 --- a/src/core/surface/init.h +++ b/src/core/surface/init.h @@ -34,7 +34,7 @@ #ifndef GRPC_INTERNAL_CORE_SURFACE_INIT_H #define GRPC_INTERNAL_CORE_SURFACE_INIT_H -void grpc_security_pre_init (void); -int grpc_is_initialized (void); +void grpc_security_pre_init(void); +int grpc_is_initialized(void); #endif /* GRPC_INTERNAL_CORE_SURFACE_INIT_H */ diff --git a/src/core/surface/init_secure.c b/src/core/surface/init_secure.c index 2ae1dd8b6fd..fa20e91583c 100644 --- a/src/core/surface/init_secure.c +++ b/src/core/surface/init_secure.c @@ -36,9 +36,7 @@ #include "src/core/security/secure_endpoint.h" #include "src/core/tsi/transport_security_interface.h" -void -grpc_security_pre_init (void) -{ - grpc_register_tracer ("secure_endpoint", &grpc_trace_secure_endpoint); - grpc_register_tracer ("transport_security", &tsi_tracing_enabled); +void grpc_security_pre_init(void) { + grpc_register_tracer("secure_endpoint", &grpc_trace_secure_endpoint); + grpc_register_tracer("transport_security", &tsi_tracing_enabled); } diff --git a/src/core/surface/init_unsecure.c b/src/core/surface/init_unsecure.c index 5b8a0abf6f6..630d564a7d8 100644 --- a/src/core/surface/init_unsecure.c +++ b/src/core/surface/init_unsecure.c @@ -33,7 +33,4 @@ #include "src/core/surface/init.h" -void -grpc_security_pre_init (void) -{ -} +void grpc_security_pre_init(void) {} diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c index 2d786235903..0b22d225d03 100644 --- a/src/core/surface/lame_client.c +++ b/src/core/surface/lame_client.c @@ -42,135 +42,126 @@ #include #include -typedef struct -{ +typedef struct { grpc_linked_mdelem status; grpc_linked_mdelem details; } call_data; -typedef struct -{ +typedef struct { grpc_mdctx *mdctx; grpc_channel *master; grpc_status_code error_code; const char *error_message; } channel_data; -static void -lame_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ +static void lame_start_transport_stream_op(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - GRPC_CALL_LOG_OP (GPR_INFO, elem, op); - if (op->send_ops != NULL) - { - grpc_stream_ops_unref_owned_objects (op->send_ops->ops, op->send_ops->nops); - op->on_done_send->cb (exec_ctx, op->on_done_send->cb_arg, 0); - } - if (op->recv_ops != NULL) - { - char tmp[GPR_LTOA_MIN_BUFSIZE]; - grpc_metadata_batch mdb; - gpr_ltoa (chand->error_code, tmp); - calld->status.md = grpc_mdelem_from_strings (chand->mdctx, "grpc-status", tmp); - calld->details.md = grpc_mdelem_from_strings (chand->mdctx, "grpc-message", chand->error_message); - calld->status.prev = calld->details.next = NULL; - calld->status.next = &calld->details; - calld->details.prev = &calld->status; - mdb.list.head = &calld->status; - mdb.list.tail = &calld->details; - mdb.garbage.head = mdb.garbage.tail = NULL; - mdb.deadline = gpr_inf_future (GPR_CLOCK_REALTIME); - grpc_sopb_add_metadata (op->recv_ops, mdb); - *op->recv_state = GRPC_STREAM_CLOSED; - op->on_done_recv->cb (exec_ctx, op->on_done_recv->cb_arg, 1); - } - if (op->on_consumed != NULL) - { - op->on_consumed->cb (exec_ctx, op->on_consumed->cb_arg, 0); - } + GRPC_CALL_LOG_OP(GPR_INFO, elem, op); + if (op->send_ops != NULL) { + grpc_stream_ops_unref_owned_objects(op->send_ops->ops, op->send_ops->nops); + op->on_done_send->cb(exec_ctx, op->on_done_send->cb_arg, 0); + } + if (op->recv_ops != NULL) { + char tmp[GPR_LTOA_MIN_BUFSIZE]; + grpc_metadata_batch mdb; + gpr_ltoa(chand->error_code, tmp); + calld->status.md = + grpc_mdelem_from_strings(chand->mdctx, "grpc-status", tmp); + calld->details.md = grpc_mdelem_from_strings(chand->mdctx, "grpc-message", + chand->error_message); + calld->status.prev = calld->details.next = NULL; + calld->status.next = &calld->details; + calld->details.prev = &calld->status; + mdb.list.head = &calld->status; + mdb.list.tail = &calld->details; + mdb.garbage.head = mdb.garbage.tail = NULL; + mdb.deadline = gpr_inf_future(GPR_CLOCK_REALTIME); + grpc_sopb_add_metadata(op->recv_ops, mdb); + *op->recv_state = GRPC_STREAM_CLOSED; + op->on_done_recv->cb(exec_ctx, op->on_done_recv->cb_arg, 1); + } + if (op->on_consumed != NULL) { + op->on_consumed->cb(exec_ctx, op->on_consumed->cb_arg, 0); + } } -static char * -lame_get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ +static char *lame_get_peer(grpc_exec_ctx *exec_ctx, grpc_call_element *elem) { channel_data *chand = elem->channel_data; - return grpc_channel_get_target (chand->master); + return grpc_channel_get_target(chand->master); } -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_FATAL_FAILURE); - *op->connectivity_state = GRPC_CHANNEL_FATAL_FAILURE; - op->on_connectivity_state_change->cb (exec_ctx, op->on_connectivity_state_change->cb_arg, 1); - } - if (op->on_consumed != NULL) - { - op->on_consumed->cb (exec_ctx, op->on_consumed->cb_arg, 1); - } +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_FATAL_FAILURE); + *op->connectivity_state = GRPC_CHANNEL_FATAL_FAILURE; + op->on_connectivity_state_change->cb( + exec_ctx, op->on_connectivity_state_change->cb_arg, 1); + } + if (op->on_consumed != NULL) { + op->on_consumed->cb(exec_ctx, op->on_consumed->cb_arg, 1); + } } -static void -init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *transport_server_data, grpc_transport_stream_op * initial_op) -{ - if (initial_op) - { - grpc_transport_stream_op_finish_with_failure (exec_ctx, initial_op); - } +static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + const void *transport_server_data, + grpc_transport_stream_op *initial_op) { + if (initial_op) { + grpc_transport_stream_op_finish_with_failure(exec_ctx, initial_op); + } } -static void -destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ -} +static void destroy_call_elem(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem) {} -static void -init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * mdctx, int is_first, int is_last) -{ +static void init_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, grpc_channel *master, + const grpc_channel_args *args, grpc_mdctx *mdctx, + int is_first, int is_last) { channel_data *chand = elem->channel_data; - GPR_ASSERT (is_first); - GPR_ASSERT (is_last); + GPR_ASSERT(is_first); + GPR_ASSERT(is_last); chand->mdctx = mdctx; chand->master = master; } -static void -destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) -{ -} +static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem) {} static const grpc_channel_filter lame_filter = { - lame_start_transport_stream_op, - lame_start_transport_op, - sizeof (call_data), - init_call_elem, - destroy_call_elem, - sizeof (channel_data), - init_channel_elem, - destroy_channel_elem, - lame_get_peer, - "lame-client", + lame_start_transport_stream_op, + lame_start_transport_op, + sizeof(call_data), + init_call_elem, + destroy_call_elem, + sizeof(channel_data), + init_channel_elem, + destroy_channel_elem, + lame_get_peer, + "lame-client", }; #define CHANNEL_STACK_FROM_CHANNEL(c) ((grpc_channel_stack *)((c) + 1)) -grpc_channel * -grpc_lame_client_channel_create (const char *target, grpc_status_code error_code, const char *error_message) -{ +grpc_channel *grpc_lame_client_channel_create(const char *target, + grpc_status_code error_code, + const char *error_message) { grpc_channel *channel; grpc_channel_element *elem; channel_data *chand; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - static const grpc_channel_filter *filters[] = { &lame_filter }; - channel = grpc_channel_create_from_filters (&exec_ctx, target, filters, 1, NULL, grpc_mdctx_create (), 1); - elem = grpc_channel_stack_element (grpc_channel_get_channel_stack (channel), 0); - GPR_ASSERT (elem->filter == &lame_filter); - chand = (channel_data *) elem->channel_data; + static const grpc_channel_filter *filters[] = {&lame_filter}; + channel = grpc_channel_create_from_filters(&exec_ctx, target, filters, 1, + NULL, grpc_mdctx_create(), 1); + elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); + GPR_ASSERT(elem->filter == &lame_filter); + chand = (channel_data *)elem->channel_data; chand->error_code = error_code; chand->error_message = error_message; - grpc_exec_ctx_finish (&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); return channel; } diff --git a/src/core/surface/metadata_array.c b/src/core/surface/metadata_array.c index 5abc582f647..648c5792667 100644 --- a/src/core/surface/metadata_array.c +++ b/src/core/surface/metadata_array.c @@ -36,14 +36,10 @@ #include -void -grpc_metadata_array_init (grpc_metadata_array * array) -{ - memset (array, 0, sizeof (*array)); +void grpc_metadata_array_init(grpc_metadata_array* array) { + memset(array, 0, sizeof(*array)); } -void -grpc_metadata_array_destroy (grpc_metadata_array * array) -{ - gpr_free (array->metadata); +void grpc_metadata_array_destroy(grpc_metadata_array* array) { + gpr_free(array->metadata); } diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index dbbf6f51406..ae2eaad8969 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -51,8 +51,7 @@ #include "src/core/transport/chttp2_transport.h" #include "src/core/tsi/transport_security_interface.h" -typedef struct -{ +typedef struct { grpc_connector base; gpr_refcount refs; @@ -71,120 +70,107 @@ typedef struct grpc_mdctx *mdctx; } connector; -static void -connector_ref (grpc_connector * con) -{ - connector *c = (connector *) con; - gpr_ref (&c->refs); +static void connector_ref(grpc_connector *con) { + connector *c = (connector *)con; + gpr_ref(&c->refs); } -static void -connector_unref (grpc_exec_ctx * exec_ctx, grpc_connector * con) -{ - connector *c = (connector *) con; - if (gpr_unref (&c->refs)) - { - grpc_mdctx_unref (c->mdctx); - gpr_free (c); - } +static void connector_unref(grpc_exec_ctx *exec_ctx, grpc_connector *con) { + connector *c = (connector *)con; + if (gpr_unref(&c->refs)) { + grpc_mdctx_unref(c->mdctx); + gpr_free(c); + } } -static void -on_secure_handshake_done (grpc_exec_ctx * exec_ctx, void *arg, grpc_security_status status, grpc_endpoint * wrapped_endpoint, grpc_endpoint * secure_endpoint) -{ +static void on_secure_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, + grpc_security_status status, + grpc_endpoint *wrapped_endpoint, + grpc_endpoint *secure_endpoint) { connector *c = arg; grpc_closure *notify; - gpr_mu_lock (&c->mu); - if (c->connecting_endpoint == NULL) - { - memset (c->result, 0, sizeof (*c->result)); - gpr_mu_unlock (&c->mu); - } - else if (status != GRPC_SECURITY_OK) - { - GPR_ASSERT (c->connecting_endpoint == wrapped_endpoint); - gpr_log (GPR_ERROR, "Secure handshake failed with error %d.", status); - memset (c->result, 0, sizeof (*c->result)); - c->connecting_endpoint = NULL; - gpr_mu_unlock (&c->mu); - } - else - { - GPR_ASSERT (c->connecting_endpoint == wrapped_endpoint); - c->connecting_endpoint = NULL; - gpr_mu_unlock (&c->mu); - c->result->transport = grpc_create_chttp2_transport (exec_ctx, c->args.channel_args, secure_endpoint, c->mdctx, 1); - grpc_chttp2_transport_start_reading (exec_ctx, c->result->transport, NULL, 0); - c->result->filters = gpr_malloc (sizeof (grpc_channel_filter *) * 2); - c->result->filters[0] = &grpc_http_client_filter; - c->result->filters[1] = &grpc_client_auth_filter; - c->result->num_filters = 2; - } + gpr_mu_lock(&c->mu); + if (c->connecting_endpoint == NULL) { + memset(c->result, 0, sizeof(*c->result)); + gpr_mu_unlock(&c->mu); + } else if (status != GRPC_SECURITY_OK) { + GPR_ASSERT(c->connecting_endpoint == wrapped_endpoint); + gpr_log(GPR_ERROR, "Secure handshake failed with error %d.", status); + memset(c->result, 0, sizeof(*c->result)); + c->connecting_endpoint = NULL; + gpr_mu_unlock(&c->mu); + } else { + GPR_ASSERT(c->connecting_endpoint == wrapped_endpoint); + c->connecting_endpoint = NULL; + gpr_mu_unlock(&c->mu); + c->result->transport = grpc_create_chttp2_transport( + exec_ctx, c->args.channel_args, secure_endpoint, c->mdctx, 1); + grpc_chttp2_transport_start_reading(exec_ctx, c->result->transport, NULL, + 0); + c->result->filters = gpr_malloc(sizeof(grpc_channel_filter *) * 2); + c->result->filters[0] = &grpc_http_client_filter; + c->result->filters[1] = &grpc_client_auth_filter; + c->result->num_filters = 2; + } notify = c->notify; c->notify = NULL; - notify->cb (exec_ctx, notify->cb_arg, 1); + notify->cb(exec_ctx, notify->cb_arg, 1); } -static void -connected (grpc_exec_ctx * exec_ctx, void *arg, int success) -{ +static void connected(grpc_exec_ctx *exec_ctx, void *arg, int success) { connector *c = arg; grpc_closure *notify; grpc_endpoint *tcp = c->newly_connecting_endpoint; - if (tcp != NULL) - { - gpr_mu_lock (&c->mu); - GPR_ASSERT (c->connecting_endpoint == NULL); - c->connecting_endpoint = tcp; - gpr_mu_unlock (&c->mu); - grpc_security_connector_do_handshake (exec_ctx, &c->security_connector->base, tcp, on_secure_handshake_done, c); - } - else - { - memset (c->result, 0, sizeof (*c->result)); - notify = c->notify; - c->notify = NULL; - notify->cb (exec_ctx, notify->cb_arg, 1); - } + if (tcp != NULL) { + gpr_mu_lock(&c->mu); + GPR_ASSERT(c->connecting_endpoint == NULL); + c->connecting_endpoint = tcp; + gpr_mu_unlock(&c->mu); + grpc_security_connector_do_handshake(exec_ctx, &c->security_connector->base, + tcp, on_secure_handshake_done, c); + } else { + memset(c->result, 0, sizeof(*c->result)); + notify = c->notify; + c->notify = NULL; + notify->cb(exec_ctx, notify->cb_arg, 1); + } } -static void -connector_shutdown (grpc_exec_ctx * exec_ctx, grpc_connector * con) -{ - connector *c = (connector *) con; +static void connector_shutdown(grpc_exec_ctx *exec_ctx, grpc_connector *con) { + connector *c = (connector *)con; grpc_endpoint *ep; - gpr_mu_lock (&c->mu); + gpr_mu_lock(&c->mu); ep = c->connecting_endpoint; c->connecting_endpoint = NULL; - gpr_mu_unlock (&c->mu); - if (ep) - { - grpc_endpoint_shutdown (exec_ctx, ep); - } + gpr_mu_unlock(&c->mu); + if (ep) { + grpc_endpoint_shutdown(exec_ctx, ep); + } } -static void -connector_connect (grpc_exec_ctx * exec_ctx, grpc_connector * con, const grpc_connect_in_args * args, grpc_connect_out_args * result, grpc_closure * notify) -{ - connector *c = (connector *) con; - GPR_ASSERT (c->notify == NULL); - GPR_ASSERT (notify->cb); +static void connector_connect(grpc_exec_ctx *exec_ctx, grpc_connector *con, + const grpc_connect_in_args *args, + grpc_connect_out_args *result, + grpc_closure *notify) { + connector *c = (connector *)con; + GPR_ASSERT(c->notify == NULL); + GPR_ASSERT(notify->cb); c->notify = notify; c->args = *args; c->result = result; - gpr_mu_lock (&c->mu); - GPR_ASSERT (c->connecting_endpoint == NULL); - gpr_mu_unlock (&c->mu); - grpc_closure_init (&c->connected_closure, connected, c); - grpc_tcp_client_connect (exec_ctx, &c->connected_closure, &c->newly_connecting_endpoint, args->interested_parties, args->addr, args->addr_len, args->deadline); + gpr_mu_lock(&c->mu); + GPR_ASSERT(c->connecting_endpoint == NULL); + gpr_mu_unlock(&c->mu); + grpc_closure_init(&c->connected_closure, connected, c); + grpc_tcp_client_connect( + exec_ctx, &c->connected_closure, &c->newly_connecting_endpoint, + args->interested_parties, args->addr, args->addr_len, args->deadline); } static const grpc_connector_vtable connector_vtable = { - connector_ref, connector_unref, connector_shutdown, connector_connect -}; + connector_ref, connector_unref, connector_shutdown, connector_connect}; -typedef struct -{ +typedef struct { grpc_subchannel_factory base; gpr_refcount refs; grpc_mdctx *mdctx; @@ -193,61 +179,59 @@ typedef struct grpc_channel *master; } subchannel_factory; -static void -subchannel_factory_ref (grpc_subchannel_factory * scf) -{ - subchannel_factory *f = (subchannel_factory *) scf; - gpr_ref (&f->refs); +static void subchannel_factory_ref(grpc_subchannel_factory *scf) { + subchannel_factory *f = (subchannel_factory *)scf; + gpr_ref(&f->refs); } -static void -subchannel_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * scf) -{ - subchannel_factory *f = (subchannel_factory *) scf; - if (gpr_unref (&f->refs)) - { - GRPC_SECURITY_CONNECTOR_UNREF (&f->security_connector->base, "subchannel_factory"); - GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, f->master, "subchannel_factory"); - grpc_channel_args_destroy (f->merge_args); - grpc_mdctx_unref (f->mdctx); - gpr_free (f); - } +static void subchannel_factory_unref(grpc_exec_ctx *exec_ctx, + grpc_subchannel_factory *scf) { + subchannel_factory *f = (subchannel_factory *)scf; + if (gpr_unref(&f->refs)) { + GRPC_SECURITY_CONNECTOR_UNREF(&f->security_connector->base, + "subchannel_factory"); + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, f->master, "subchannel_factory"); + grpc_channel_args_destroy(f->merge_args); + grpc_mdctx_unref(f->mdctx); + gpr_free(f); + } } -static grpc_subchannel * -subchannel_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * scf, grpc_subchannel_args * args) -{ - subchannel_factory *f = (subchannel_factory *) scf; - connector *c = gpr_malloc (sizeof (*c)); - grpc_channel_args *final_args = grpc_channel_args_merge (args->args, f->merge_args); +static grpc_subchannel *subchannel_factory_create_subchannel( + grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *scf, + grpc_subchannel_args *args) { + subchannel_factory *f = (subchannel_factory *)scf; + connector *c = gpr_malloc(sizeof(*c)); + grpc_channel_args *final_args = + grpc_channel_args_merge(args->args, f->merge_args); grpc_subchannel *s; - memset (c, 0, sizeof (*c)); + memset(c, 0, sizeof(*c)); c->base.vtable = &connector_vtable; c->security_connector = f->security_connector; c->mdctx = f->mdctx; - grpc_mdctx_ref (c->mdctx); - gpr_ref_init (&c->refs, 1); + grpc_mdctx_ref(c->mdctx); + gpr_ref_init(&c->refs, 1); args->args = final_args; args->master = f->master; args->mdctx = f->mdctx; - s = grpc_subchannel_create (&c->base, args); - grpc_connector_unref (exec_ctx, &c->base); - grpc_channel_args_destroy (final_args); + s = grpc_subchannel_create(&c->base, args); + grpc_connector_unref(exec_ctx, &c->base); + grpc_channel_args_destroy(final_args); return s; } static const grpc_subchannel_factory_vtable subchannel_factory_vtable = { - subchannel_factory_ref, subchannel_factory_unref, - subchannel_factory_create_subchannel -}; + subchannel_factory_ref, subchannel_factory_unref, + subchannel_factory_create_subchannel}; /* Create a secure client channel: Asynchronously: - resolve target - connect to it (trying alternatives as presented) - perform handshakes */ -grpc_channel * -grpc_secure_channel_create (grpc_credentials * creds, const char *target, const grpc_channel_args * args, void *reserved) -{ +grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, + const char *target, + const grpc_channel_args *args, + void *reserved) { grpc_channel *channel; grpc_arg connector_arg; grpc_channel_args *args_copy; @@ -261,59 +245,64 @@ grpc_secure_channel_create (grpc_credentials * creds, const char *target, const grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; size_t n = 0; - GPR_ASSERT (reserved == NULL); - if (grpc_find_security_connector_in_args (args) != NULL) - { - gpr_log (GPR_ERROR, "Cannot set security context in channel args."); - return grpc_lame_client_channel_create (target, GRPC_STATUS_INVALID_ARGUMENT, "Security connector exists in channel args."); - } - - if (grpc_credentials_create_security_connector (creds, target, args, NULL, &connector, &new_args_from_connector) != GRPC_SECURITY_OK) - { - return grpc_lame_client_channel_create (target, GRPC_STATUS_INVALID_ARGUMENT, "Failed to create security connector."); - } - mdctx = grpc_mdctx_create (); - - connector_arg = grpc_security_connector_to_arg (&connector->base); - args_copy = grpc_channel_args_copy_and_add (new_args_from_connector != NULL ? new_args_from_connector : args, &connector_arg, 1); - if (grpc_channel_args_is_census_enabled (args)) - { - filters[n++] = &grpc_client_census_filter; - } + GPR_ASSERT(reserved == NULL); + if (grpc_find_security_connector_in_args(args) != NULL) { + gpr_log(GPR_ERROR, "Cannot set security context in channel args."); + return grpc_lame_client_channel_create( + target, GRPC_STATUS_INVALID_ARGUMENT, + "Security connector exists in channel args."); + } + + if (grpc_credentials_create_security_connector( + creds, target, args, NULL, &connector, &new_args_from_connector) != + GRPC_SECURITY_OK) { + return grpc_lame_client_channel_create( + target, GRPC_STATUS_INVALID_ARGUMENT, + "Failed to create security connector."); + } + mdctx = grpc_mdctx_create(); + + connector_arg = grpc_security_connector_to_arg(&connector->base); + args_copy = grpc_channel_args_copy_and_add( + new_args_from_connector != NULL ? new_args_from_connector : args, + &connector_arg, 1); + if (grpc_channel_args_is_census_enabled(args)) { + filters[n++] = &grpc_client_census_filter; + } filters[n++] = &grpc_compress_filter; filters[n++] = &grpc_client_channel_filter; - GPR_ASSERT (n <= MAX_FILTERS); + GPR_ASSERT(n <= MAX_FILTERS); - channel = grpc_channel_create_from_filters (&exec_ctx, target, filters, n, args_copy, mdctx, 1); + channel = grpc_channel_create_from_filters(&exec_ctx, target, filters, n, + args_copy, mdctx, 1); - f = gpr_malloc (sizeof (*f)); + f = gpr_malloc(sizeof(*f)); f->base.vtable = &subchannel_factory_vtable; - gpr_ref_init (&f->refs, 1); - grpc_mdctx_ref (mdctx); + gpr_ref_init(&f->refs, 1); + grpc_mdctx_ref(mdctx); f->mdctx = mdctx; - GRPC_SECURITY_CONNECTOR_REF (&connector->base, "subchannel_factory"); + GRPC_SECURITY_CONNECTOR_REF(&connector->base, "subchannel_factory"); f->security_connector = connector; - f->merge_args = grpc_channel_args_copy (args_copy); + f->merge_args = grpc_channel_args_copy(args_copy); f->master = channel; - GRPC_CHANNEL_INTERNAL_REF (channel, "subchannel_factory"); - resolver = grpc_resolver_create (target, &f->base); - if (!resolver) - { - return NULL; - } - - grpc_client_channel_set_resolver (&exec_ctx, grpc_channel_get_channel_stack (channel), resolver); - GRPC_RESOLVER_UNREF (&exec_ctx, resolver, "create"); - grpc_subchannel_factory_unref (&exec_ctx, &f->base); - GRPC_SECURITY_CONNECTOR_UNREF (&connector->base, "channel_create"); - - grpc_channel_args_destroy (args_copy); - if (new_args_from_connector != NULL) - { - grpc_channel_args_destroy (new_args_from_connector); - } - - grpc_exec_ctx_finish (&exec_ctx); + GRPC_CHANNEL_INTERNAL_REF(channel, "subchannel_factory"); + resolver = grpc_resolver_create(target, &f->base); + if (!resolver) { + return NULL; + } + + grpc_client_channel_set_resolver( + &exec_ctx, grpc_channel_get_channel_stack(channel), resolver); + GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "create"); + grpc_subchannel_factory_unref(&exec_ctx, &f->base); + GRPC_SECURITY_CONNECTOR_UNREF(&connector->base, "channel_create"); + + grpc_channel_args_destroy(args_copy); + if (new_args_from_connector != NULL) { + grpc_channel_args_destroy(new_args_from_connector); + } + + grpc_exec_ctx_finish(&exec_ctx); return channel; } diff --git a/src/core/surface/server.c b/src/core/surface/server.c index c11ea26da7e..a26b84c0d3b 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -54,11 +54,12 @@ #include "src/core/surface/init.h" #include "src/core/transport/metadata.h" -typedef struct listener -{ +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_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; @@ -67,17 +68,14 @@ typedef struct call_data call_data; typedef struct channel_data channel_data; typedef struct registered_method registered_method; -typedef struct -{ +typedef struct { call_data *next; call_data *prev; } call_link; -typedef enum -{ BATCH_CALL, REGISTERED_CALL } requested_call_type; +typedef enum { BATCH_CALL, REGISTERED_CALL } requested_call_type; -typedef struct requested_call -{ +typedef struct requested_call { requested_call_type type; void *tag; grpc_server *server; @@ -85,15 +83,12 @@ typedef struct requested_call grpc_completion_queue *cq_for_notification; grpc_call **call; grpc_cq_completion completion; - union - { - struct - { + union { + struct { grpc_call_details *details; grpc_metadata_array *initial_metadata; } batch; - struct - { + struct { registered_method *registered_method; gpr_timespec *deadline; grpc_metadata_array *initial_metadata; @@ -102,15 +97,13 @@ typedef struct requested_call } data; } requested_call; -typedef struct channel_registered_method -{ +typedef struct channel_registered_method { registered_method *server_registered_method; grpc_mdstr *method; grpc_mdstr *host; } channel_registered_method; -struct channel_data -{ +struct channel_data { grpc_server *server; grpc_connectivity_state connectivity_state; grpc_channel *channel; @@ -126,15 +119,13 @@ struct channel_data grpc_closure channel_connectivity_changed; }; -typedef struct shutdown_tag -{ +typedef struct shutdown_tag { void *tag; grpc_completion_queue *cq; grpc_cq_completion completion; } shutdown_tag; -typedef enum -{ +typedef enum { /* waiting for metadata */ NOT_STARTED, /* inital metadata read, not flow controlled in yet */ @@ -147,8 +138,7 @@ typedef enum typedef struct request_matcher request_matcher; -struct call_data -{ +struct call_data { grpc_call *call; /** protects state */ @@ -173,29 +163,25 @@ struct call_data call_data *pending_next; }; -struct request_matcher -{ +struct request_matcher { call_data *pending_head; call_data *pending_tail; gpr_stack_lockfree *requests; }; -struct registered_method -{ +struct registered_method { char *method; char *host; request_matcher request_matcher; registered_method *next; }; -typedef struct -{ +typedef struct { grpc_channel **channels; size_t num_channels; } channel_broadcaster; -struct grpc_server -{ +struct grpc_server { size_t channel_filter_count; const grpc_channel_filter **channel_filters; grpc_channel_args *channel_args; @@ -211,8 +197,8 @@ struct grpc_server If they are ever required to be nested, you must lock mu_global before mu_call. This is currently used in shutdown processing (grpc_server_shutdown_and_notify and maybe_finish_shutdown) */ - gpr_mu mu_global; /* mutex for server and channel state */ - gpr_mu mu_call; /* mutex for call-specific state */ + gpr_mu mu_global; /* mutex for server and channel state */ + gpr_mu mu_call; /* mutex for call-specific state */ registered_method *registered_methods; request_matcher unregistered_request_matcher; @@ -240,267 +226,230 @@ struct grpc_server #define SERVER_FROM_CALL_ELEM(elem) \ (((channel_data *)(elem)->channel_data)->server) -static void begin_call (grpc_exec_ctx * exec_ctx, grpc_server * server, call_data * calld, requested_call * rc); -static void fail_call (grpc_exec_ctx * exec_ctx, grpc_server * server, requested_call * rc); +static void begin_call(grpc_exec_ctx *exec_ctx, grpc_server *server, + call_data *calld, requested_call *rc); +static void fail_call(grpc_exec_ctx *exec_ctx, grpc_server *server, + requested_call *rc); /* 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_exec_ctx *exec_ctx, grpc_server *server); /* * channel broadcaster */ /* assumes server locked */ -static void -channel_broadcaster_init (grpc_server * s, channel_broadcaster * cb) -{ +static void channel_broadcaster_init(grpc_server *s, channel_broadcaster *cb) { channel_data *c; size_t count = 0; - for (c = s->root_channel_data.next; c != &s->root_channel_data; c = c->next) - { - count++; - } + for (c = s->root_channel_data.next; c != &s->root_channel_data; c = c->next) { + count++; + } cb->num_channels = count; - cb->channels = gpr_malloc (sizeof (*cb->channels) * cb->num_channels); + cb->channels = gpr_malloc(sizeof(*cb->channels) * cb->num_channels); count = 0; - for (c = s->root_channel_data.next; c != &s->root_channel_data; c = c->next) - { - cb->channels[count++] = c->channel; - GRPC_CHANNEL_INTERNAL_REF (c->channel, "broadcast"); - } + for (c = s->root_channel_data.next; c != &s->root_channel_data; c = c->next) { + cb->channels[count++] = c->channel; + GRPC_CHANNEL_INTERNAL_REF(c->channel, "broadcast"); + } } -struct shutdown_cleanup_args -{ +struct shutdown_cleanup_args { grpc_closure closure; gpr_slice slice; }; -static void -shutdown_cleanup (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_status_ignored) -{ +static void shutdown_cleanup(grpc_exec_ctx *exec_ctx, void *arg, + int iomgr_status_ignored) { struct shutdown_cleanup_args *a = arg; - gpr_slice_unref (a->slice); - gpr_free (a); + gpr_slice_unref(a->slice); + gpr_free(a); } -static void -send_shutdown (grpc_exec_ctx * exec_ctx, grpc_channel * channel, int send_goaway, int send_disconnect) -{ +static void send_shutdown(grpc_exec_ctx *exec_ctx, grpc_channel *channel, + int send_goaway, int send_disconnect) { grpc_transport_op op; struct shutdown_cleanup_args *sc; grpc_channel_element *elem; - memset (&op, 0, sizeof (op)); + memset(&op, 0, sizeof(op)); op.send_goaway = send_goaway; - sc = gpr_malloc (sizeof (*sc)); - sc->slice = gpr_slice_from_copied_string ("Server shutdown"); + sc = gpr_malloc(sizeof(*sc)); + sc->slice = gpr_slice_from_copied_string("Server shutdown"); op.goaway_message = &sc->slice; op.goaway_status = GRPC_STATUS_OK; op.disconnect = send_disconnect; - grpc_closure_init (&sc->closure, shutdown_cleanup, sc); + grpc_closure_init(&sc->closure, shutdown_cleanup, sc); op.on_consumed = &sc->closure; - elem = grpc_channel_stack_element (grpc_channel_get_channel_stack (channel), 0); - elem->filter->start_transport_op (exec_ctx, elem, &op); + elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); + elem->filter->start_transport_op(exec_ctx, elem, &op); } -static void -channel_broadcaster_shutdown (grpc_exec_ctx * exec_ctx, channel_broadcaster * cb, int send_goaway, int force_disconnect) -{ +static void channel_broadcaster_shutdown(grpc_exec_ctx *exec_ctx, + channel_broadcaster *cb, + int send_goaway, + int force_disconnect) { size_t i; - for (i = 0; i < cb->num_channels; i++) - { - send_shutdown (exec_ctx, cb->channels[i], send_goaway, force_disconnect); - GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, cb->channels[i], "broadcast"); - } - gpr_free (cb->channels); + for (i = 0; i < cb->num_channels; i++) { + send_shutdown(exec_ctx, cb->channels[i], send_goaway, force_disconnect); + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, cb->channels[i], "broadcast"); + } + gpr_free(cb->channels); } /* * request_matcher */ -static void -request_matcher_init (request_matcher * request_matcher, size_t entries) -{ - memset (request_matcher, 0, sizeof (*request_matcher)); - request_matcher->requests = gpr_stack_lockfree_create (entries); +static void request_matcher_init(request_matcher *request_matcher, + size_t entries) { + memset(request_matcher, 0, sizeof(*request_matcher)); + request_matcher->requests = gpr_stack_lockfree_create(entries); } -static void -request_matcher_destroy (request_matcher * request_matcher) -{ - GPR_ASSERT (gpr_stack_lockfree_pop (request_matcher->requests) == -1); - gpr_stack_lockfree_destroy (request_matcher->requests); +static void request_matcher_destroy(request_matcher *request_matcher) { + GPR_ASSERT(gpr_stack_lockfree_pop(request_matcher->requests) == -1); + gpr_stack_lockfree_destroy(request_matcher->requests); } -static void -kill_zombie (grpc_exec_ctx * exec_ctx, void *elem, int success) -{ - grpc_call_destroy (grpc_call_from_top_element (elem)); +static void kill_zombie(grpc_exec_ctx *exec_ctx, void *elem, int success) { + grpc_call_destroy(grpc_call_from_top_element(elem)); } -static void -request_matcher_zombify_all_pending_calls (grpc_exec_ctx * exec_ctx, request_matcher * request_matcher) -{ - while (request_matcher->pending_head) - { - call_data *calld = request_matcher->pending_head; - request_matcher->pending_head = calld->pending_next; - gpr_mu_lock (&calld->mu_state); - calld->state = ZOMBIED; - gpr_mu_unlock (&calld->mu_state); - grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element (grpc_call_get_call_stack (calld->call), 0)); - grpc_exec_ctx_enqueue (exec_ctx, &calld->kill_zombie_closure, 1); - } +static void request_matcher_zombify_all_pending_calls( + grpc_exec_ctx *exec_ctx, request_matcher *request_matcher) { + while (request_matcher->pending_head) { + call_data *calld = request_matcher->pending_head; + request_matcher->pending_head = calld->pending_next; + gpr_mu_lock(&calld->mu_state); + calld->state = ZOMBIED; + gpr_mu_unlock(&calld->mu_state); + grpc_closure_init( + &calld->kill_zombie_closure, kill_zombie, + grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0)); + grpc_exec_ctx_enqueue(exec_ctx, &calld->kill_zombie_closure, 1); + } } -static void -request_matcher_kill_requests (grpc_exec_ctx * exec_ctx, grpc_server * server, request_matcher * rm) -{ +static void request_matcher_kill_requests(grpc_exec_ctx *exec_ctx, + grpc_server *server, + request_matcher *rm) { int request_id; - while ((request_id = gpr_stack_lockfree_pop (rm->requests)) != -1) - { - fail_call (exec_ctx, server, &server->requested_calls[request_id]); - } + while ((request_id = gpr_stack_lockfree_pop(rm->requests)) != -1) { + fail_call(exec_ctx, server, &server->requested_calls[request_id]); + } } /* * server proper */ -static void -server_ref (grpc_server * server) -{ - gpr_ref (&server->internal_refcount); +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_exec_ctx *exec_ctx, grpc_server *server) { registered_method *rm; size_t i; - grpc_channel_args_destroy (server->channel_args); - gpr_mu_destroy (&server->mu_global); - gpr_mu_destroy (&server->mu_call); - gpr_free (server->channel_filters); - while ((rm = server->registered_methods) != NULL) - { - server->registered_methods = rm->next; - request_matcher_destroy (&rm->request_matcher); - gpr_free (rm->method); - gpr_free (rm->host); - gpr_free (rm); - } - for (i = 0; i < server->cq_count; i++) - { - GRPC_CQ_INTERNAL_UNREF (server->cqs[i], "server"); - } - request_matcher_destroy (&server->unregistered_request_matcher); - gpr_stack_lockfree_destroy (server->request_freelist); - gpr_free (server->cqs); - gpr_free (server->pollsets); - gpr_free (server->shutdown_tags); - gpr_free (server->requested_calls); - gpr_free (server); + grpc_channel_args_destroy(server->channel_args); + gpr_mu_destroy(&server->mu_global); + gpr_mu_destroy(&server->mu_call); + gpr_free(server->channel_filters); + while ((rm = server->registered_methods) != NULL) { + server->registered_methods = rm->next; + request_matcher_destroy(&rm->request_matcher); + gpr_free(rm->method); + gpr_free(rm->host); + gpr_free(rm); + } + for (i = 0; i < server->cq_count; i++) { + GRPC_CQ_INTERNAL_UNREF(server->cqs[i], "server"); + } + request_matcher_destroy(&server->unregistered_request_matcher); + gpr_stack_lockfree_destroy(server->request_freelist); + gpr_free(server->cqs); + gpr_free(server->pollsets); + gpr_free(server->shutdown_tags); + gpr_free(server->requested_calls); + gpr_free(server); } -static void -server_unref (grpc_exec_ctx * exec_ctx, grpc_server * server) -{ - if (gpr_unref (&server->internal_refcount)) - { - server_delete (exec_ctx, server); - } +static void server_unref(grpc_exec_ctx *exec_ctx, grpc_server *server) { + if (gpr_unref(&server->internal_refcount)) { + server_delete(exec_ctx, server); + } } -static int -is_channel_orphaned (channel_data * chand) -{ +static int is_channel_orphaned(channel_data *chand) { return chand->next == chand; } -static void -orphan_channel (channel_data * chand) -{ +static void orphan_channel(channel_data *chand) { chand->next->prev = chand->prev; chand->prev->next = chand->next; chand->next = chand->prev = chand; } -static void -finish_destroy_channel (grpc_exec_ctx * exec_ctx, void *cd, int success) -{ +static void finish_destroy_channel(grpc_exec_ctx *exec_ctx, void *cd, + int success) { channel_data *chand = cd; grpc_server *server = chand->server; - gpr_log (GPR_DEBUG, "finish_destroy_channel: %p", chand->channel); - GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, chand->channel, "server"); - server_unref (exec_ctx, server); + gpr_log(GPR_DEBUG, "finish_destroy_channel: %p", chand->channel); + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, chand->channel, "server"); + server_unref(exec_ctx, server); } -static void -destroy_channel (grpc_exec_ctx * exec_ctx, channel_data * chand) -{ - 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); +static void destroy_channel(grpc_exec_ctx *exec_ctx, channel_data *chand) { + 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); chand->finish_destroy_channel_closure.cb = finish_destroy_channel; chand->finish_destroy_channel_closure.cb_arg = chand; - grpc_exec_ctx_enqueue (exec_ctx, &chand->finish_destroy_channel_closure, 1); + grpc_exec_ctx_enqueue(exec_ctx, &chand->finish_destroy_channel_closure, 1); } -static void -finish_start_new_rpc (grpc_exec_ctx * exec_ctx, grpc_server * server, grpc_call_element * elem, request_matcher * request_matcher) -{ +static void finish_start_new_rpc(grpc_exec_ctx *exec_ctx, grpc_server *server, + grpc_call_element *elem, + request_matcher *request_matcher) { call_data *calld = elem->call_data; int request_id; - if (gpr_atm_acq_load (&server->shutdown_flag)) - { - gpr_mu_lock (&calld->mu_state); - calld->state = ZOMBIED; - gpr_mu_unlock (&calld->mu_state); - grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, elem); - grpc_exec_ctx_enqueue (exec_ctx, &calld->kill_zombie_closure, 1); - return; - } - - request_id = gpr_stack_lockfree_pop (request_matcher->requests); - if (request_id == -1) - { - gpr_mu_lock (&server->mu_call); - gpr_mu_lock (&calld->mu_state); - calld->state = PENDING; - gpr_mu_unlock (&calld->mu_state); - if (request_matcher->pending_head == NULL) - { - request_matcher->pending_tail = request_matcher->pending_head = calld; - } - else - { - request_matcher->pending_tail->pending_next = calld; - request_matcher->pending_tail = calld; - } - calld->pending_next = NULL; - gpr_mu_unlock (&server->mu_call); - } - else - { - gpr_mu_lock (&calld->mu_state); - calld->state = ACTIVATED; - gpr_mu_unlock (&calld->mu_state); - begin_call (exec_ctx, server, calld, &server->requested_calls[request_id]); + if (gpr_atm_acq_load(&server->shutdown_flag)) { + gpr_mu_lock(&calld->mu_state); + calld->state = ZOMBIED; + gpr_mu_unlock(&calld->mu_state); + grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); + grpc_exec_ctx_enqueue(exec_ctx, &calld->kill_zombie_closure, 1); + return; + } + + request_id = gpr_stack_lockfree_pop(request_matcher->requests); + if (request_id == -1) { + gpr_mu_lock(&server->mu_call); + gpr_mu_lock(&calld->mu_state); + calld->state = PENDING; + gpr_mu_unlock(&calld->mu_state); + if (request_matcher->pending_head == NULL) { + request_matcher->pending_tail = request_matcher->pending_head = calld; + } else { + request_matcher->pending_tail->pending_next = calld; + request_matcher->pending_tail = calld; } + calld->pending_next = NULL; + gpr_mu_unlock(&server->mu_call); + } else { + gpr_mu_lock(&calld->mu_state); + calld->state = ACTIVATED; + gpr_mu_unlock(&calld->mu_state); + begin_call(exec_ctx, server, calld, &server->requested_calls[request_id]); + } } -static void -start_new_rpc (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ +static void start_new_rpc(grpc_exec_ctx *exec_ctx, grpc_call_element *elem) { channel_data *chand = elem->channel_data; call_data *calld = elem->call_data; grpc_server *server = chand->server; @@ -508,411 +457,380 @@ start_new_rpc (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) gpr_uint32 hash; channel_registered_method *rm; - if (chand->registered_methods && calld->path && calld->host) - { - /* TODO(ctiller): unify these two searches */ - /* check for an exact match with host */ - hash = GRPC_MDSTR_KV_HASH (calld->host->hash, calld->path->hash); - for (i = 0; i <= chand->registered_method_max_probes; i++) - { - rm = &chand->registered_methods[(hash + i) % chand->registered_method_slots]; - if (!rm) - break; - if (rm->host != calld->host) - continue; - if (rm->method != calld->path) - continue; - finish_start_new_rpc (exec_ctx, server, elem, &rm->server_registered_method->request_matcher); - return; - } - /* check for a wildcard method definition (no host set) */ - hash = GRPC_MDSTR_KV_HASH (0, calld->path->hash); - for (i = 0; i <= chand->registered_method_max_probes; i++) - { - rm = &chand->registered_methods[(hash + i) % chand->registered_method_slots]; - if (!rm) - break; - if (rm->host != NULL) - continue; - if (rm->method != calld->path) - continue; - finish_start_new_rpc (exec_ctx, server, elem, &rm->server_registered_method->request_matcher); - return; - } + if (chand->registered_methods && calld->path && calld->host) { + /* TODO(ctiller): unify these two searches */ + /* check for an exact match with host */ + hash = GRPC_MDSTR_KV_HASH(calld->host->hash, calld->path->hash); + for (i = 0; i <= chand->registered_method_max_probes; i++) { + rm = &chand->registered_methods[(hash + i) % + chand->registered_method_slots]; + if (!rm) break; + if (rm->host != calld->host) continue; + if (rm->method != calld->path) continue; + finish_start_new_rpc(exec_ctx, server, elem, + &rm->server_registered_method->request_matcher); + return; + } + /* check for a wildcard method definition (no host set) */ + hash = GRPC_MDSTR_KV_HASH(0, calld->path->hash); + for (i = 0; i <= chand->registered_method_max_probes; i++) { + rm = &chand->registered_methods[(hash + i) % + chand->registered_method_slots]; + if (!rm) break; + if (rm->host != NULL) continue; + if (rm->method != calld->path) continue; + finish_start_new_rpc(exec_ctx, server, elem, + &rm->server_registered_method->request_matcher); + return; } - finish_start_new_rpc (exec_ctx, server, elem, &server->unregistered_request_matcher); + } + finish_start_new_rpc(exec_ctx, server, elem, + &server->unregistered_request_matcher); } -static int -num_listeners (grpc_server * server) -{ +static int num_listeners(grpc_server *server) { listener *l; int n = 0; - for (l = server->listeners; l; l = l->next) - { - n++; - } + for (l = server->listeners; l; l = l->next) { + n++; + } return n; } -static void -done_shutdown_event (grpc_exec_ctx * exec_ctx, void *server, grpc_cq_completion * completion) -{ - server_unref (exec_ctx, server); +static void done_shutdown_event(grpc_exec_ctx *exec_ctx, void *server, + grpc_cq_completion *completion) { + server_unref(exec_ctx, server); } -static int -num_channels (grpc_server * server) -{ +static int num_channels(grpc_server *server) { channel_data *chand; int n = 0; - for (chand = server->root_channel_data.next; chand != &server->root_channel_data; chand = chand->next) - { - n++; - } + for (chand = server->root_channel_data.next; + chand != &server->root_channel_data; chand = chand->next) { + n++; + } return n; } -static void -kill_pending_work_locked (grpc_exec_ctx * exec_ctx, grpc_server * server) -{ +static void kill_pending_work_locked(grpc_exec_ctx *exec_ctx, + grpc_server *server) { registered_method *rm; - request_matcher_kill_requests (exec_ctx, server, &server->unregistered_request_matcher); - request_matcher_zombify_all_pending_calls (exec_ctx, &server->unregistered_request_matcher); - for (rm = server->registered_methods; rm; rm = rm->next) - { - request_matcher_kill_requests (exec_ctx, server, &rm->request_matcher); - request_matcher_zombify_all_pending_calls (exec_ctx, &rm->request_matcher); - } + request_matcher_kill_requests(exec_ctx, server, + &server->unregistered_request_matcher); + request_matcher_zombify_all_pending_calls( + exec_ctx, &server->unregistered_request_matcher); + for (rm = server->registered_methods; rm; rm = rm->next) { + request_matcher_kill_requests(exec_ctx, server, &rm->request_matcher); + request_matcher_zombify_all_pending_calls(exec_ctx, &rm->request_matcher); + } } -static void -maybe_finish_shutdown (grpc_exec_ctx * exec_ctx, 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 (exec_ctx, server); - - if (server->root_channel_data.next != &server->root_channel_data || server->listeners_destroyed < num_listeners (server)) - { - if (gpr_time_cmp (gpr_time_sub (gpr_now (GPR_CLOCK_REALTIME), server->last_shutdown_message_time), gpr_time_from_seconds (1, GPR_TIMESPAN)) >= 0) - { - server->last_shutdown_message_time = gpr_now (GPR_CLOCK_REALTIME); - gpr_log (GPR_DEBUG, "Waiting for %d channels and %d/%d listeners to be destroyed" " before shutting down server", num_channels (server), num_listeners (server) - server->listeners_destroyed, num_listeners (server)); - } - return; + if (!gpr_atm_acq_load(&server->shutdown_flag) || server->shutdown_published) { + return; + } + + kill_pending_work_locked(exec_ctx, server); + + if (server->root_channel_data.next != &server->root_channel_data || + server->listeners_destroyed < num_listeners(server)) { + if (gpr_time_cmp(gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), + server->last_shutdown_message_time), + gpr_time_from_seconds(1, GPR_TIMESPAN)) >= 0) { + server->last_shutdown_message_time = gpr_now(GPR_CLOCK_REALTIME); + gpr_log(GPR_DEBUG, + "Waiting for %d channels and %d/%d listeners to be destroyed" + " before shutting down server", + num_channels(server), + num_listeners(server) - server->listeners_destroyed, + num_listeners(server)); } + return; + } 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, 1, done_shutdown_event, server, &server->shutdown_tags[i].completion); - } + 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, 1, done_shutdown_event, server, + &server->shutdown_tags[i].completion); + } } -static grpc_mdelem * -server_filter (void *user_data, grpc_mdelem * md) -{ +static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { grpc_call_element *elem = user_data; channel_data *chand = elem->channel_data; call_data *calld = elem->call_data; - if (md->key == chand->path_key) - { - calld->path = GRPC_MDSTR_REF (md->value); - return NULL; - } - else if (md->key == chand->authority_key) - { - calld->host = GRPC_MDSTR_REF (md->value); - return NULL; - } + if (md->key == chand->path_key) { + calld->path = GRPC_MDSTR_REF(md->value); + return NULL; + } else if (md->key == chand->authority_key) { + calld->host = GRPC_MDSTR_REF(md->value); + return NULL; + } return md; } -static void -server_on_recv (grpc_exec_ctx * exec_ctx, void *ptr, int success) -{ +static void server_on_recv(grpc_exec_ctx *exec_ctx, void *ptr, int success) { grpc_call_element *elem = ptr; call_data *calld = elem->call_data; gpr_timespec op_deadline; - if (success && !calld->got_initial_metadata) - { - size_t i; - size_t nops = calld->recv_ops->nops; - grpc_stream_op *ops = calld->recv_ops->ops; - for (i = 0; i < nops; i++) - { - grpc_stream_op *op = &ops[i]; - if (op->type != GRPC_OP_METADATA) - continue; - grpc_metadata_batch_filter (&op->data.metadata, server_filter, elem); - op_deadline = op->data.metadata.deadline; - if (0 != gpr_time_cmp (op_deadline, gpr_inf_future (op_deadline.clock_type))) - { - calld->deadline = op->data.metadata.deadline; - } - if (calld->host && calld->path) - { - calld->got_initial_metadata = 1; - start_new_rpc (exec_ctx, elem); - } - break; - } + if (success && !calld->got_initial_metadata) { + size_t i; + size_t nops = calld->recv_ops->nops; + grpc_stream_op *ops = calld->recv_ops->ops; + for (i = 0; i < nops; i++) { + grpc_stream_op *op = &ops[i]; + if (op->type != GRPC_OP_METADATA) continue; + grpc_metadata_batch_filter(&op->data.metadata, server_filter, elem); + op_deadline = op->data.metadata.deadline; + if (0 != + gpr_time_cmp(op_deadline, gpr_inf_future(op_deadline.clock_type))) { + calld->deadline = op->data.metadata.deadline; + } + if (calld->host && calld->path) { + calld->got_initial_metadata = 1; + start_new_rpc(exec_ctx, elem); + } + break; } + } - switch (*calld->recv_state) - { + switch (*calld->recv_state) { case GRPC_STREAM_OPEN: break; case GRPC_STREAM_SEND_CLOSED: break; case GRPC_STREAM_RECV_CLOSED: - gpr_mu_lock (&calld->mu_state); - if (calld->state == NOT_STARTED) - { - calld->state = ZOMBIED; - gpr_mu_unlock (&calld->mu_state); - grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, elem); - grpc_exec_ctx_enqueue (exec_ctx, &calld->kill_zombie_closure, 1); - } - else - { - gpr_mu_unlock (&calld->mu_state); - } + gpr_mu_lock(&calld->mu_state); + if (calld->state == NOT_STARTED) { + calld->state = ZOMBIED; + gpr_mu_unlock(&calld->mu_state); + grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); + grpc_exec_ctx_enqueue(exec_ctx, &calld->kill_zombie_closure, 1); + } else { + gpr_mu_unlock(&calld->mu_state); + } break; case GRPC_STREAM_CLOSED: - gpr_mu_lock (&calld->mu_state); - if (calld->state == NOT_STARTED) - { - calld->state = ZOMBIED; - gpr_mu_unlock (&calld->mu_state); - grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, elem); - grpc_exec_ctx_enqueue (exec_ctx, &calld->kill_zombie_closure, 1); - } - else if (calld->state == PENDING) - { - calld->state = ZOMBIED; - gpr_mu_unlock (&calld->mu_state); - /* zombied call will be destroyed when it's removed from the pending - queue... later */ - } - else - { - gpr_mu_unlock (&calld->mu_state); - } + gpr_mu_lock(&calld->mu_state); + if (calld->state == NOT_STARTED) { + calld->state = ZOMBIED; + gpr_mu_unlock(&calld->mu_state); + grpc_closure_init(&calld->kill_zombie_closure, kill_zombie, elem); + grpc_exec_ctx_enqueue(exec_ctx, &calld->kill_zombie_closure, 1); + } else if (calld->state == PENDING) { + calld->state = ZOMBIED; + gpr_mu_unlock(&calld->mu_state); + /* zombied call will be destroyed when it's removed from the pending + queue... later */ + } else { + gpr_mu_unlock(&calld->mu_state); + } break; - } + } - calld->on_done_recv->cb (exec_ctx, calld->on_done_recv->cb_arg, success); + calld->on_done_recv->cb(exec_ctx, calld->on_done_recv->cb_arg, success); } -static void -server_mutate_op (grpc_call_element * elem, grpc_transport_stream_op * op) -{ +static void server_mutate_op(grpc_call_element *elem, + grpc_transport_stream_op *op) { call_data *calld = elem->call_data; - if (op->recv_ops) - { - /* substitute our callback for the higher callback */ - calld->recv_ops = op->recv_ops; - calld->recv_state = op->recv_state; - calld->on_done_recv = op->on_done_recv; - op->on_done_recv = &calld->server_on_recv; - } + if (op->recv_ops) { + /* substitute our callback for the higher callback */ + calld->recv_ops = op->recv_ops; + calld->recv_state = op->recv_state; + calld->on_done_recv = op->on_done_recv; + op->on_done_recv = &calld->server_on_recv; + } } -static void -server_start_transport_stream_op (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ - GRPC_CALL_LOG_OP (GPR_INFO, elem, op); - server_mutate_op (elem, op); - grpc_call_next_op (exec_ctx, elem, op); +static void server_start_transport_stream_op(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem, + grpc_transport_stream_op *op) { + GRPC_CALL_LOG_OP(GPR_INFO, elem, op); + server_mutate_op(elem, op); + grpc_call_next_op(exec_ctx, elem, op); } -static void -accept_stream (void *cd, grpc_transport * transport, const void *transport_server_data) -{ +static void accept_stream(void *cd, grpc_transport *transport, + const void *transport_server_data) { channel_data *chand = cd; /* create a call */ - grpc_call_create (chand->channel, NULL, 0, NULL, transport_server_data, NULL, 0, gpr_inf_future (GPR_CLOCK_MONOTONIC)); + grpc_call_create(chand->channel, NULL, 0, NULL, transport_server_data, NULL, + 0, gpr_inf_future(GPR_CLOCK_MONOTONIC)); } -static void -channel_connectivity_changed (grpc_exec_ctx * exec_ctx, void *cd, int iomgr_status_ignored) -{ +static void channel_connectivity_changed(grpc_exec_ctx *exec_ctx, void *cd, + int iomgr_status_ignored) { channel_data *chand = cd; grpc_server *server = chand->server; - if (chand->connectivity_state != GRPC_CHANNEL_FATAL_FAILURE) - { - grpc_transport_op op; - memset (&op, 0, sizeof (op)); - 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_get_channel_stack (chand->channel), 0), &op); - } - else - { - gpr_mu_lock (&server->mu_global); - destroy_channel (exec_ctx, chand); - gpr_mu_unlock (&server->mu_global); - GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, chand->channel, "connectivity"); - } + if (chand->connectivity_state != GRPC_CHANNEL_FATAL_FAILURE) { + grpc_transport_op op; + memset(&op, 0, sizeof(op)); + 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_get_channel_stack(chand->channel), 0), + &op); + } else { + gpr_mu_lock(&server->mu_global); + destroy_channel(exec_ctx, chand); + gpr_mu_unlock(&server->mu_global); + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, chand->channel, "connectivity"); + } } -static void -init_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) -{ +static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + const void *server_transport_data, + grpc_transport_stream_op *initial_op) { call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - memset (calld, 0, sizeof (call_data)); - calld->deadline = gpr_inf_future (GPR_CLOCK_REALTIME); - calld->call = grpc_call_from_top_element (elem); - gpr_mu_init (&calld->mu_state); + memset(calld, 0, sizeof(call_data)); + calld->deadline = gpr_inf_future(GPR_CLOCK_REALTIME); + calld->call = grpc_call_from_top_element(elem); + gpr_mu_init(&calld->mu_state); - grpc_closure_init (&calld->server_on_recv, server_on_recv, elem); + grpc_closure_init(&calld->server_on_recv, server_on_recv, elem); - server_ref (chand->server); + server_ref(chand->server); - if (initial_op) - server_mutate_op (elem, initial_op); + if (initial_op) server_mutate_op(elem, initial_op); } -static void -destroy_call_elem (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ +static void destroy_call_elem(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem) { channel_data *chand = elem->channel_data; call_data *calld = elem->call_data; - GPR_ASSERT (calld->state != PENDING); + GPR_ASSERT(calld->state != PENDING); - if (calld->host) - { - GRPC_MDSTR_UNREF (calld->host); - } - if (calld->path) - { - GRPC_MDSTR_UNREF (calld->path); - } + if (calld->host) { + GRPC_MDSTR_UNREF(calld->host); + } + if (calld->path) { + GRPC_MDSTR_UNREF(calld->path); + } - gpr_mu_destroy (&calld->mu_state); + gpr_mu_destroy(&calld->mu_state); - server_unref (exec_ctx, chand->server); + server_unref(exec_ctx, chand->server); } -static void -init_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last) -{ +static void init_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, grpc_channel *master, + const grpc_channel_args *args, + grpc_mdctx *metadata_context, int is_first, + int is_last) { channel_data *chand = elem->channel_data; - GPR_ASSERT (is_first); - GPR_ASSERT (!is_last); + GPR_ASSERT(is_first); + GPR_ASSERT(!is_last); chand->server = NULL; chand->channel = NULL; - chand->path_key = grpc_mdstr_from_string (metadata_context, ":path", 0); - chand->authority_key = grpc_mdstr_from_string (metadata_context, ":authority", 0); + chand->path_key = grpc_mdstr_from_string(metadata_context, ":path", 0); + chand->authority_key = + grpc_mdstr_from_string(metadata_context, ":authority", 0); chand->next = chand->prev = chand; chand->registered_methods = NULL; chand->connectivity_state = GRPC_CHANNEL_IDLE; - grpc_closure_init (&chand->channel_connectivity_changed, channel_connectivity_changed, chand); + grpc_closure_init(&chand->channel_connectivity_changed, + channel_connectivity_changed, chand); } -static void -destroy_channel_elem (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) -{ +static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem) { size_t i; channel_data *chand = elem->channel_data; - if (chand->registered_methods) - { - for (i = 0; i < chand->registered_method_slots; i++) - { - if (chand->registered_methods[i].method) - { - GRPC_MDSTR_UNREF (chand->registered_methods[i].method); - } - if (chand->registered_methods[i].host) - { - GRPC_MDSTR_UNREF (chand->registered_methods[i].host); - } - } - gpr_free (chand->registered_methods); - } - if (chand->server) - { - gpr_mu_lock (&chand->server->mu_global); - chand->next->prev = chand->prev; - chand->prev->next = chand->next; - chand->next = chand->prev = chand; - maybe_finish_shutdown (exec_ctx, chand->server); - gpr_mu_unlock (&chand->server->mu_global); - GRPC_MDSTR_UNREF (chand->path_key); - GRPC_MDSTR_UNREF (chand->authority_key); - server_unref (exec_ctx, chand->server); + if (chand->registered_methods) { + for (i = 0; i < chand->registered_method_slots; i++) { + if (chand->registered_methods[i].method) { + GRPC_MDSTR_UNREF(chand->registered_methods[i].method); + } + if (chand->registered_methods[i].host) { + GRPC_MDSTR_UNREF(chand->registered_methods[i].host); + } } + gpr_free(chand->registered_methods); + } + if (chand->server) { + gpr_mu_lock(&chand->server->mu_global); + chand->next->prev = chand->prev; + chand->prev->next = chand->next; + chand->next = chand->prev = chand; + maybe_finish_shutdown(exec_ctx, chand->server); + gpr_mu_unlock(&chand->server->mu_global); + GRPC_MDSTR_UNREF(chand->path_key); + GRPC_MDSTR_UNREF(chand->authority_key); + server_unref(exec_ctx, chand->server); + } } static const grpc_channel_filter server_surface_filter = { - server_start_transport_stream_op, - grpc_channel_next_op, - sizeof (call_data), - init_call_elem, - destroy_call_elem, - sizeof (channel_data), - init_channel_elem, - destroy_channel_elem, - grpc_call_next_get_peer, - "server", + server_start_transport_stream_op, + grpc_channel_next_op, + sizeof(call_data), + init_call_elem, + destroy_call_elem, + sizeof(channel_data), + init_channel_elem, + destroy_channel_elem, + grpc_call_next_get_peer, + "server", }; -void -grpc_server_register_completion_queue (grpc_server * server, grpc_completion_queue * cq, void *reserved) -{ +void grpc_server_register_completion_queue(grpc_server *server, + grpc_completion_queue *cq, + void *reserved) { size_t i, n; - GPR_ASSERT (!reserved); - for (i = 0; i < server->cq_count; i++) - { - if (server->cqs[i] == cq) - return; - } - GRPC_CQ_INTERNAL_REF (cq, "server"); - grpc_cq_mark_server_cq (cq); + GPR_ASSERT(!reserved); + for (i = 0; i < server->cq_count; i++) { + if (server->cqs[i] == cq) return; + } + GRPC_CQ_INTERNAL_REF(cq, "server"); + grpc_cq_mark_server_cq(cq); n = server->cq_count++; - server->cqs = gpr_realloc (server->cqs, server->cq_count * sizeof (grpc_completion_queue *)); + server->cqs = gpr_realloc(server->cqs, + server->cq_count * sizeof(grpc_completion_queue *)); server->cqs[n] = cq; } -grpc_server * -grpc_server_create_from_filters (const grpc_channel_filter ** filters, size_t filter_count, const grpc_channel_args * args) -{ +grpc_server *grpc_server_create_from_filters( + const grpc_channel_filter **filters, size_t filter_count, + const grpc_channel_args *args) { size_t i; /* TODO(census): restore this once we finalize census filter etc. int census_enabled = grpc_channel_args_is_census_enabled(args); */ int census_enabled = 0; - grpc_server *server = gpr_malloc (sizeof (grpc_server)); + grpc_server *server = gpr_malloc(sizeof(grpc_server)); - GPR_ASSERT (grpc_is_initialized () && "call grpc_init()"); + GPR_ASSERT(grpc_is_initialized() && "call grpc_init()"); - memset (server, 0, sizeof (grpc_server)); + memset(server, 0, sizeof(grpc_server)); - gpr_mu_init (&server->mu_global); - gpr_mu_init (&server->mu_call); + gpr_mu_init(&server->mu_global); + gpr_mu_init(&server->mu_call); /* decremented by grpc_server_destroy */ - gpr_ref_init (&server->internal_refcount, 1); - server->root_channel_data.next = server->root_channel_data.prev = &server->root_channel_data; + gpr_ref_init(&server->internal_refcount, 1); + server->root_channel_data.next = server->root_channel_data.prev = + &server->root_channel_data; /* TODO(ctiller): expose a channel_arg for this */ server->max_requested_calls = 32768; - server->request_freelist = gpr_stack_lockfree_create (server->max_requested_calls); - for (i = 0; i < (size_t) server->max_requested_calls; i++) - { - gpr_stack_lockfree_push (server->request_freelist, (int) i); - } - request_matcher_init (&server->unregistered_request_matcher, server->max_requested_calls); - server->requested_calls = gpr_malloc (server->max_requested_calls * sizeof (*server->requested_calls)); + server->request_freelist = + gpr_stack_lockfree_create(server->max_requested_calls); + for (i = 0; i < (size_t)server->max_requested_calls; i++) { + gpr_stack_lockfree_push(server->request_freelist, (int)i); + } + request_matcher_init(&server->unregistered_request_matcher, + server->max_requested_calls); + server->requested_calls = gpr_malloc(server->max_requested_calls * + sizeof(*server->requested_calls)); /* Server filter stack is: @@ -921,87 +839,78 @@ grpc_server_create_from_filters (const grpc_channel_filter ** filters, size_t fi {passed in filter stack} grpc_connected_channel_filter - for interfacing with transports */ server->channel_filter_count = filter_count + 1u + (census_enabled ? 1u : 0u); - server->channel_filters = gpr_malloc (server->channel_filter_count * sizeof (grpc_channel_filter *)); + server->channel_filters = + gpr_malloc(server->channel_filter_count * sizeof(grpc_channel_filter *)); server->channel_filters[0] = &server_surface_filter; - if (census_enabled) - { - server->channel_filters[1] = &grpc_server_census_filter; - } - for (i = 0; i < filter_count; i++) - { - server->channel_filters[i + 1u + (census_enabled ? 1u : 0u)] = filters[i]; - } + if (census_enabled) { + server->channel_filters[1] = &grpc_server_census_filter; + } + for (i = 0; i < filter_count; i++) { + server->channel_filters[i + 1u + (census_enabled ? 1u : 0u)] = filters[i]; + } - server->channel_args = grpc_channel_args_copy (args); + server->channel_args = grpc_channel_args_copy(args); return server; } -static int -streq (const char *a, const char *b) -{ - if (a == NULL && b == NULL) - return 1; - if (a == NULL) - return 0; - if (b == NULL) - return 0; - return 0 == strcmp (a, b); +static int streq(const char *a, const char *b) { + if (a == NULL && b == NULL) return 1; + if (a == NULL) return 0; + if (b == NULL) return 0; + return 0 == strcmp(a, b); } -void * -grpc_server_register_method (grpc_server * server, const char *method, const char *host) -{ +void *grpc_server_register_method(grpc_server *server, const char *method, + const char *host) { registered_method *m; - if (!method) - { - gpr_log (GPR_ERROR, "grpc_server_register_method method string cannot be NULL"); + if (!method) { + gpr_log(GPR_ERROR, + "grpc_server_register_method method string cannot be NULL"); + return NULL; + } + for (m = server->registered_methods; m; m = m->next) { + if (streq(m->method, method) && streq(m->host, host)) { + gpr_log(GPR_ERROR, "duplicate registration for %s@%s", method, + host ? host : "*"); return NULL; } - for (m = server->registered_methods; m; m = m->next) - { - if (streq (m->method, method) && streq (m->host, host)) - { - gpr_log (GPR_ERROR, "duplicate registration for %s@%s", method, host ? host : "*"); - return NULL; - } - } - m = gpr_malloc (sizeof (registered_method)); - memset (m, 0, sizeof (*m)); - request_matcher_init (&m->request_matcher, server->max_requested_calls); - m->method = gpr_strdup (method); - m->host = gpr_strdup (host); + } + m = gpr_malloc(sizeof(registered_method)); + memset(m, 0, sizeof(*m)); + request_matcher_init(&m->request_matcher, server->max_requested_calls); + m->method = gpr_strdup(method); + m->host = gpr_strdup(host); m->next = server->registered_methods; server->registered_methods = m; return m; } -void -grpc_server_start (grpc_server * server) -{ +void grpc_server_start(grpc_server *server) { listener *l; size_t i; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - server->pollsets = gpr_malloc (sizeof (grpc_pollset *) * server->cq_count); - for (i = 0; i < server->cq_count; i++) - { - server->pollsets[i] = grpc_cq_pollset (server->cqs[i]); - } + server->pollsets = gpr_malloc(sizeof(grpc_pollset *) * server->cq_count); + for (i = 0; i < server->cq_count; i++) { + server->pollsets[i] = grpc_cq_pollset(server->cqs[i]); + } - for (l = server->listeners; l; l = l->next) - { - l->start (&exec_ctx, server, l->arg, server->pollsets, server->cq_count); - } + for (l = server->listeners; l; l = l->next) { + l->start(&exec_ctx, server, l->arg, server->pollsets, server->cq_count); + } - grpc_exec_ctx_finish (&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); } -void -grpc_server_setup_transport (grpc_exec_ctx * exec_ctx, grpc_server * s, grpc_transport * transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx * mdctx, const grpc_channel_args * args) -{ +void grpc_server_setup_transport(grpc_exec_ctx *exec_ctx, grpc_server *s, + grpc_transport *transport, + grpc_channel_filter const **extra_filters, + size_t num_extra_filters, grpc_mdctx *mdctx, + const grpc_channel_args *args) { size_t num_filters = s->channel_filter_count + num_extra_filters + 1; - grpc_channel_filter const **filters = gpr_malloc (sizeof (grpc_channel_filter *) * num_filters); + grpc_channel_filter const **filters = + gpr_malloc(sizeof(grpc_channel_filter *) * num_filters); size_t i; size_t num_registered_methods; size_t alloc; @@ -1017,194 +926,188 @@ grpc_server_setup_transport (grpc_exec_ctx * exec_ctx, grpc_server * s, grpc_tra gpr_uint32 max_probes = 0; grpc_transport_op op; - for (i = 0; i < s->channel_filter_count; i++) - { - filters[i] = s->channel_filters[i]; - } - for (; i < s->channel_filter_count + num_extra_filters; i++) - { - filters[i] = extra_filters[i - s->channel_filter_count]; - } + for (i = 0; i < s->channel_filter_count; i++) { + filters[i] = s->channel_filters[i]; + } + for (; i < s->channel_filter_count + num_extra_filters; i++) { + filters[i] = extra_filters[i - s->channel_filter_count]; + } filters[i] = &grpc_connected_channel_filter; - for (i = 0; i < s->cq_count; i++) - { - memset (&op, 0, sizeof (op)); - op.bind_pollset = grpc_cq_pollset (s->cqs[i]); - grpc_transport_perform_op (exec_ctx, transport, &op); - } - - channel = grpc_channel_create_from_filters (exec_ctx, NULL, filters, num_filters, args, mdctx, 0); - chand = (channel_data *) grpc_channel_stack_element (grpc_channel_get_channel_stack (channel), 0)->channel_data; + for (i = 0; i < s->cq_count; i++) { + memset(&op, 0, sizeof(op)); + op.bind_pollset = grpc_cq_pollset(s->cqs[i]); + grpc_transport_perform_op(exec_ctx, transport, &op); + } + + channel = grpc_channel_create_from_filters(exec_ctx, NULL, filters, + num_filters, args, mdctx, 0); + chand = (channel_data *)grpc_channel_stack_element( + grpc_channel_get_channel_stack(channel), 0) + ->channel_data; chand->server = s; - server_ref (s); + server_ref(s); chand->channel = channel; num_registered_methods = 0; - for (rm = s->registered_methods; rm; rm = rm->next) - { - num_registered_methods++; - } + for (rm = s->registered_methods; rm; rm = rm->next) { + num_registered_methods++; + } /* build a lookup table phrased in terms of mdstr's in this channels context to quickly find registered methods */ - if (num_registered_methods > 0) - { - slots = 2 * num_registered_methods; - alloc = sizeof (channel_registered_method) * slots; - chand->registered_methods = gpr_malloc (alloc); - memset (chand->registered_methods, 0, alloc); - for (rm = s->registered_methods; rm; rm = rm->next) - { - host = rm->host ? grpc_mdstr_from_string (mdctx, rm->host, 0) : NULL; - method = grpc_mdstr_from_string (mdctx, rm->method, 0); - hash = GRPC_MDSTR_KV_HASH (host ? host->hash : 0, method->hash); - for (probes = 0; chand->registered_methods[(hash + probes) % slots].server_registered_method != NULL; probes++) - ; - if (probes > max_probes) - max_probes = probes; - crm = &chand->registered_methods[(hash + probes) % slots]; - crm->server_registered_method = rm; - crm->host = host; - crm->method = method; - } - GPR_ASSERT (slots <= GPR_UINT32_MAX); - chand->registered_method_slots = (gpr_uint32) slots; - chand->registered_method_max_probes = max_probes; + if (num_registered_methods > 0) { + slots = 2 * num_registered_methods; + alloc = sizeof(channel_registered_method) * slots; + chand->registered_methods = gpr_malloc(alloc); + memset(chand->registered_methods, 0, alloc); + for (rm = s->registered_methods; rm; rm = rm->next) { + host = rm->host ? grpc_mdstr_from_string(mdctx, rm->host, 0) : NULL; + method = grpc_mdstr_from_string(mdctx, rm->method, 0); + hash = GRPC_MDSTR_KV_HASH(host ? host->hash : 0, method->hash); + for (probes = 0; chand->registered_methods[(hash + probes) % slots] + .server_registered_method != NULL; + probes++) + ; + if (probes > max_probes) max_probes = probes; + crm = &chand->registered_methods[(hash + probes) % slots]; + crm->server_registered_method = rm; + crm->host = host; + crm->method = method; } + GPR_ASSERT(slots <= GPR_UINT32_MAX); + chand->registered_method_slots = (gpr_uint32)slots; + chand->registered_method_max_probes = max_probes; + } - grpc_connected_channel_bind_transport (grpc_channel_get_channel_stack (channel), transport); + grpc_connected_channel_bind_transport(grpc_channel_get_channel_stack(channel), + transport); - gpr_mu_lock (&s->mu_global); + gpr_mu_lock(&s->mu_global); chand->next = &s->root_channel_data; chand->prev = chand->next->prev; chand->next->prev = chand->prev->next = chand; - gpr_mu_unlock (&s->mu_global); + gpr_mu_unlock(&s->mu_global); - gpr_free (filters); + gpr_free(filters); - GRPC_CHANNEL_INTERNAL_REF (channel, "connectivity"); - memset (&op, 0, sizeof (op)); + GRPC_CHANNEL_INTERNAL_REF(channel, "connectivity"); + memset(&op, 0, sizeof(op)); op.set_accept_stream = accept_stream; op.set_accept_stream_user_data = chand; op.on_connectivity_state_change = &chand->channel_connectivity_changed; op.connectivity_state = &chand->connectivity_state; - op.disconnect = gpr_atm_acq_load (&s->shutdown_flag) != 0; - grpc_transport_perform_op (exec_ctx, transport, &op); + op.disconnect = gpr_atm_acq_load(&s->shutdown_flag) != 0; + grpc_transport_perform_op(exec_ctx, transport, &op); } -void -done_published_shutdown (grpc_exec_ctx * exec_ctx, void *done_arg, grpc_cq_completion * storage) -{ - (void) done_arg; - gpr_free (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 (grpc_exec_ctx * exec_ctx, void *s, int success) -{ +static void listener_destroy_done(grpc_exec_ctx *exec_ctx, void *s, + int success) { grpc_server *server = s; - gpr_mu_lock (&server->mu_global); + gpr_mu_lock(&server->mu_global); server->listeners_destroyed++; - maybe_finish_shutdown (exec_ctx, server); - gpr_mu_unlock (&server->mu_global); + maybe_finish_shutdown(exec_ctx, server); + gpr_mu_unlock(&server->mu_global); } -void -grpc_server_shutdown_and_notify (grpc_server * server, grpc_completion_queue * cq, void *tag) -{ +void grpc_server_shutdown_and_notify(grpc_server *server, + grpc_completion_queue *cq, void *tag) { listener *l; shutdown_tag *sdt; channel_broadcaster broadcaster; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_SERVER_LOG_SHUTDOWN (GPR_INFO, server, cq, tag); + GRPC_SERVER_LOG_SHUTDOWN(GPR_INFO, server, cq, tag); /* lock, and gather up some stuff to do */ - gpr_mu_lock (&server->mu_global); - grpc_cq_begin_op (cq); - if (server->shutdown_published) - { - grpc_cq_end_op (&exec_ctx, cq, tag, 1, done_published_shutdown, NULL, gpr_malloc (sizeof (grpc_cq_completion))); - gpr_mu_unlock (&server->mu_global); - goto done; - } - server->shutdown_tags = gpr_realloc (server->shutdown_tags, sizeof (shutdown_tag) * (server->num_shutdown_tags + 1)); + gpr_mu_lock(&server->mu_global); + grpc_cq_begin_op(cq); + if (server->shutdown_published) { + grpc_cq_end_op(&exec_ctx, cq, tag, 1, done_published_shutdown, NULL, + gpr_malloc(sizeof(grpc_cq_completion))); + gpr_mu_unlock(&server->mu_global); + goto done; + } + server->shutdown_tags = + gpr_realloc(server->shutdown_tags, + sizeof(shutdown_tag) * (server->num_shutdown_tags + 1)); sdt = &server->shutdown_tags[server->num_shutdown_tags++]; sdt->tag = tag; sdt->cq = cq; - if (gpr_atm_acq_load (&server->shutdown_flag)) - { - gpr_mu_unlock (&server->mu_global); - goto done; - } + if (gpr_atm_acq_load(&server->shutdown_flag)) { + gpr_mu_unlock(&server->mu_global); + goto done; + } - server->last_shutdown_message_time = gpr_now (GPR_CLOCK_REALTIME); + server->last_shutdown_message_time = gpr_now(GPR_CLOCK_REALTIME); - channel_broadcaster_init (server, &broadcaster); + channel_broadcaster_init(server, &broadcaster); /* collect all unregistered then registered calls */ - gpr_mu_lock (&server->mu_call); - kill_pending_work_locked (&exec_ctx, server); - gpr_mu_unlock (&server->mu_call); + gpr_mu_lock(&server->mu_call); + kill_pending_work_locked(&exec_ctx, server); + gpr_mu_unlock(&server->mu_call); - gpr_atm_rel_store (&server->shutdown_flag, 1); - maybe_finish_shutdown (&exec_ctx, server); - gpr_mu_unlock (&server->mu_global); + gpr_atm_rel_store(&server->shutdown_flag, 1); + 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); - l->destroy (&exec_ctx, server, l->arg, &l->destroy_done); - } + for (l = server->listeners; l; l = l->next) { + grpc_closure_init(&l->destroy_done, listener_destroy_done, server); + l->destroy(&exec_ctx, server, l->arg, &l->destroy_done); + } - channel_broadcaster_shutdown (&exec_ctx, &broadcaster, 1, 0); + channel_broadcaster_shutdown(&exec_ctx, &broadcaster, 1, 0); done: - grpc_exec_ctx_finish (&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); } -void -grpc_server_cancel_all_calls (grpc_server * server) -{ +void grpc_server_cancel_all_calls(grpc_server *server) { channel_broadcaster broadcaster; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - gpr_mu_lock (&server->mu_global); - channel_broadcaster_init (server, &broadcaster); - gpr_mu_unlock (&server->mu_global); + gpr_mu_lock(&server->mu_global); + channel_broadcaster_init(server, &broadcaster); + gpr_mu_unlock(&server->mu_global); - channel_broadcaster_shutdown (&exec_ctx, &broadcaster, 0, 1); - grpc_exec_ctx_finish (&exec_ctx); + channel_broadcaster_shutdown(&exec_ctx, &broadcaster, 0, 1); + grpc_exec_ctx_finish(&exec_ctx); } -void -grpc_server_destroy (grpc_server * server) -{ +void grpc_server_destroy(grpc_server *server) { listener *l; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - gpr_mu_lock (&server->mu_global); - GPR_ASSERT (gpr_atm_acq_load (&server->shutdown_flag) || !server->listeners); - GPR_ASSERT (server->listeners_destroyed == num_listeners (server)); + gpr_mu_lock(&server->mu_global); + GPR_ASSERT(gpr_atm_acq_load(&server->shutdown_flag) || !server->listeners); + GPR_ASSERT(server->listeners_destroyed == num_listeners(server)); - while (server->listeners) - { - l = server->listeners; - server->listeners = l->next; - gpr_free (l); - } + while (server->listeners) { + l = server->listeners; + server->listeners = l->next; + gpr_free(l); + } - gpr_mu_unlock (&server->mu_global); + gpr_mu_unlock(&server->mu_global); - server_unref (&exec_ctx, server); - grpc_exec_ctx_finish (&exec_ctx); + server_unref(&exec_ctx, server); + grpc_exec_ctx_finish(&exec_ctx); } -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 = gpr_malloc (sizeof (listener)); +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 = gpr_malloc(sizeof(listener)); l->arg = arg; l->start = start; l->destroy = destroy; @@ -1212,82 +1115,79 @@ grpc_server_add_listener (grpc_exec_ctx * exec_ctx, grpc_server * server, void * server->listeners = l; } -static grpc_call_error -queue_call_request (grpc_exec_ctx * exec_ctx, grpc_server * server, requested_call * rc) -{ +static grpc_call_error queue_call_request(grpc_exec_ctx *exec_ctx, + grpc_server *server, + requested_call *rc) { call_data *calld = NULL; request_matcher *request_matcher = NULL; int request_id; - if (gpr_atm_acq_load (&server->shutdown_flag)) - { - fail_call (exec_ctx, server, rc); - return GRPC_CALL_OK; - } - request_id = gpr_stack_lockfree_pop (server->request_freelist); - if (request_id == -1) - { - /* out of request ids: just fail this one */ - fail_call (exec_ctx, server, rc); - return GRPC_CALL_OK; - } - switch (rc->type) - { + if (gpr_atm_acq_load(&server->shutdown_flag)) { + fail_call(exec_ctx, server, rc); + return GRPC_CALL_OK; + } + request_id = gpr_stack_lockfree_pop(server->request_freelist); + if (request_id == -1) { + /* out of request ids: just fail this one */ + fail_call(exec_ctx, server, rc); + return GRPC_CALL_OK; + } + switch (rc->type) { case BATCH_CALL: request_matcher = &server->unregistered_request_matcher; break; case REGISTERED_CALL: request_matcher = &rc->data.registered.registered_method->request_matcher; break; - } + } server->requested_calls[request_id] = *rc; - gpr_free (rc); - if (gpr_stack_lockfree_push (request_matcher->requests, request_id)) - { - /* this was the first queued request: we need to lock and start - matching calls */ - gpr_mu_lock (&server->mu_call); - while ((calld = request_matcher->pending_head) != NULL) - { - request_id = gpr_stack_lockfree_pop (request_matcher->requests); - if (request_id == -1) - break; - request_matcher->pending_head = calld->pending_next; - gpr_mu_unlock (&server->mu_call); - gpr_mu_lock (&calld->mu_state); - if (calld->state == ZOMBIED) - { - gpr_mu_unlock (&calld->mu_state); - grpc_closure_init (&calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element (grpc_call_get_call_stack (calld->call), 0)); - grpc_exec_ctx_enqueue (exec_ctx, &calld->kill_zombie_closure, 1); - } - else - { - GPR_ASSERT (calld->state == PENDING); - calld->state = ACTIVATED; - gpr_mu_unlock (&calld->mu_state); - begin_call (exec_ctx, server, calld, &server->requested_calls[request_id]); - } - gpr_mu_lock (&server->mu_call); - } - gpr_mu_unlock (&server->mu_call); + gpr_free(rc); + if (gpr_stack_lockfree_push(request_matcher->requests, request_id)) { + /* this was the first queued request: we need to lock and start + matching calls */ + gpr_mu_lock(&server->mu_call); + while ((calld = request_matcher->pending_head) != NULL) { + request_id = gpr_stack_lockfree_pop(request_matcher->requests); + if (request_id == -1) break; + request_matcher->pending_head = calld->pending_next; + gpr_mu_unlock(&server->mu_call); + gpr_mu_lock(&calld->mu_state); + if (calld->state == ZOMBIED) { + gpr_mu_unlock(&calld->mu_state); + grpc_closure_init( + &calld->kill_zombie_closure, kill_zombie, + grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0)); + grpc_exec_ctx_enqueue(exec_ctx, &calld->kill_zombie_closure, 1); + } else { + GPR_ASSERT(calld->state == PENDING); + calld->state = ACTIVATED; + gpr_mu_unlock(&calld->mu_state); + begin_call(exec_ctx, server, calld, + &server->requested_calls[request_id]); + } + gpr_mu_lock(&server->mu_call); } + gpr_mu_unlock(&server->mu_call); + } return GRPC_CALL_OK; } -grpc_call_error -grpc_server_request_call (grpc_server * server, grpc_call ** call, grpc_call_details * details, grpc_metadata_array * initial_metadata, grpc_completion_queue * cq_bound_to_call, grpc_completion_queue * cq_for_notification, void *tag) -{ +grpc_call_error grpc_server_request_call( + grpc_server *server, grpc_call **call, grpc_call_details *details, + grpc_metadata_array *initial_metadata, + 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; - requested_call *rc = gpr_malloc (sizeof (*rc)); - GRPC_SERVER_LOG_REQUEST_CALL (GPR_INFO, server, call, details, initial_metadata, cq_bound_to_call, cq_for_notification, tag); - if (!grpc_cq_is_server_cq (cq_for_notification)) - { - gpr_free (rc); - error = GRPC_CALL_ERROR_NOT_SERVER_COMPLETION_QUEUE; - goto done; - } - grpc_cq_begin_op (cq_for_notification); + requested_call *rc = gpr_malloc(sizeof(*rc)); + GRPC_SERVER_LOG_REQUEST_CALL(GPR_INFO, server, call, details, + initial_metadata, cq_bound_to_call, + cq_for_notification, tag); + if (!grpc_cq_is_server_cq(cq_for_notification)) { + gpr_free(rc); + error = GRPC_CALL_ERROR_NOT_SERVER_COMPLETION_QUEUE; + goto done; + } + grpc_cq_begin_op(cq_for_notification); details->reserved = NULL; rc->type = BATCH_CALL; rc->server = server; @@ -1297,26 +1197,27 @@ grpc_server_request_call (grpc_server * server, grpc_call ** call, grpc_call_det rc->call = call; rc->data.batch.details = details; rc->data.batch.initial_metadata = initial_metadata; - error = queue_call_request (&exec_ctx, server, rc); + error = queue_call_request(&exec_ctx, server, rc); done: - grpc_exec_ctx_finish (&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); return error; } -grpc_call_error -grpc_server_request_registered_call (grpc_server * server, void *rm, grpc_call ** call, gpr_timespec * deadline, grpc_metadata_array * initial_metadata, grpc_byte_buffer ** optional_payload, grpc_completion_queue * cq_bound_to_call, grpc_completion_queue * cq_for_notification, void *tag) -{ +grpc_call_error grpc_server_request_registered_call( + grpc_server *server, void *rm, grpc_call **call, gpr_timespec *deadline, + grpc_metadata_array *initial_metadata, grpc_byte_buffer **optional_payload, + 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; - requested_call *rc = gpr_malloc (sizeof (*rc)); + requested_call *rc = gpr_malloc(sizeof(*rc)); registered_method *registered_method = rm; - if (!grpc_cq_is_server_cq (cq_for_notification)) - { - gpr_free (rc); - error = GRPC_CALL_ERROR_NOT_SERVER_COMPLETION_QUEUE; - goto done; - } - grpc_cq_begin_op (cq_for_notification); + if (!grpc_cq_is_server_cq(cq_for_notification)) { + gpr_free(rc); + error = GRPC_CALL_ERROR_NOT_SERVER_COMPLETION_QUEUE; + goto done; + } + grpc_cq_begin_op(cq_for_notification); rc->type = REGISTERED_CALL; rc->server = server; rc->tag = tag; @@ -1327,36 +1228,33 @@ grpc_server_request_registered_call (grpc_server * server, void *rm, grpc_call * rc->data.registered.deadline = deadline; rc->data.registered.initial_metadata = initial_metadata; rc->data.registered.optional_payload = optional_payload; - error = queue_call_request (&exec_ctx, server, rc); + error = queue_call_request(&exec_ctx, server, rc); done: - grpc_exec_ctx_finish (&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); return error; } -static void publish_registered_or_batch (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *tag); -static void -publish_was_not_set (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *tag) -{ - abort (); +static void publish_registered_or_batch(grpc_exec_ctx *exec_ctx, + grpc_call *call, int success, + void *tag); +static void publish_was_not_set(grpc_exec_ctx *exec_ctx, grpc_call *call, + int success, void *tag) { + abort(); } -static void -cpstr (char **dest, size_t * capacity, grpc_mdstr * value) -{ +static void cpstr(char **dest, size_t *capacity, grpc_mdstr *value) { gpr_slice slice = value->slice; - size_t len = GPR_SLICE_LENGTH (slice); + size_t len = GPR_SLICE_LENGTH(slice); - if (len + 1 > *capacity) - { - *capacity = GPR_MAX (len + 1, *capacity * 2); - *dest = gpr_realloc (*dest, *capacity); - } - memcpy (*dest, grpc_mdstr_as_c_string (value), len + 1); + if (len + 1 > *capacity) { + *capacity = GPR_MAX(len + 1, *capacity * 2); + *dest = gpr_realloc(*dest, *capacity); + } + memcpy(*dest, grpc_mdstr_as_c_string(value), len + 1); } -static void -begin_call (grpc_exec_ctx * exec_ctx, grpc_server * server, call_data * calld, requested_call * rc) -{ +static void begin_call(grpc_exec_ctx *exec_ctx, grpc_server *server, + call_data *calld, requested_call *rc) { grpc_ioreq_completion_func publish = publish_was_not_set; grpc_ioreq req[2]; grpc_ioreq *r = req; @@ -1367,16 +1265,17 @@ begin_call (grpc_exec_ctx * exec_ctx, grpc_server * server, call_data * calld, r fill in the metadata array passed by the client, we need to perform an ioreq op, that should complete immediately. */ - grpc_call_set_completion_queue (exec_ctx, calld->call, rc->cq_bound_to_call); + grpc_call_set_completion_queue(exec_ctx, calld->call, rc->cq_bound_to_call); *rc->call = calld->call; calld->cq_new = rc->cq_for_notification; - switch (rc->type) - { + switch (rc->type) { case BATCH_CALL: - GPR_ASSERT (calld->host != NULL); - GPR_ASSERT (calld->path != NULL); - cpstr (&rc->data.batch.details->host, &rc->data.batch.details->host_capacity, calld->host); - cpstr (&rc->data.batch.details->method, &rc->data.batch.details->method_capacity, calld->path); + GPR_ASSERT(calld->host != NULL); + GPR_ASSERT(calld->path != NULL); + cpstr(&rc->data.batch.details->host, + &rc->data.batch.details->host_capacity, calld->host); + cpstr(&rc->data.batch.details->method, + &rc->data.batch.details->method_capacity, calld->path); rc->data.batch.details->deadline = calld->deadline; r->op = GRPC_IOREQ_RECV_INITIAL_METADATA; r->data.recv_metadata = rc->data.batch.initial_metadata; @@ -1390,81 +1289,76 @@ begin_call (grpc_exec_ctx * exec_ctx, grpc_server * server, call_data * calld, r r->data.recv_metadata = rc->data.registered.initial_metadata; r->flags = 0; r++; - if (rc->data.registered.optional_payload) - { - r->op = GRPC_IOREQ_RECV_MESSAGE; - r->data.recv_message = rc->data.registered.optional_payload; - r->flags = 0; - r++; - } + if (rc->data.registered.optional_payload) { + r->op = GRPC_IOREQ_RECV_MESSAGE; + r->data.recv_message = rc->data.registered.optional_payload; + r->flags = 0; + r++; + } publish = publish_registered_or_batch; break; - } + } - GRPC_CALL_INTERNAL_REF (calld->call, "server"); - grpc_call_start_ioreq_and_call_back (exec_ctx, calld->call, req, (size_t) (r - req), publish, rc); + GRPC_CALL_INTERNAL_REF(calld->call, "server"); + grpc_call_start_ioreq_and_call_back(exec_ctx, calld->call, req, + (size_t)(r - req), publish, rc); } -static void -done_request_event (grpc_exec_ctx * exec_ctx, void *req, grpc_cq_completion * c) -{ +static void done_request_event(grpc_exec_ctx *exec_ctx, void *req, + grpc_cq_completion *c) { requested_call *rc = req; grpc_server *server = rc->server; - if (rc >= server->requested_calls && rc < server->requested_calls + server->max_requested_calls) - { - GPR_ASSERT (rc - server->requested_calls <= INT_MAX); - gpr_stack_lockfree_push (server->request_freelist, (int) (rc - server->requested_calls)); - } - else - { - gpr_free (req); - } + if (rc >= server->requested_calls && + rc < server->requested_calls + server->max_requested_calls) { + GPR_ASSERT(rc - server->requested_calls <= INT_MAX); + gpr_stack_lockfree_push(server->request_freelist, + (int)(rc - server->requested_calls)); + } else { + gpr_free(req); + } - server_unref (exec_ctx, server); + server_unref(exec_ctx, server); } -static void -fail_call (grpc_exec_ctx * exec_ctx, grpc_server * server, requested_call * rc) -{ +static void fail_call(grpc_exec_ctx *exec_ctx, grpc_server *server, + requested_call *rc) { *rc->call = NULL; - switch (rc->type) - { + switch (rc->type) { case BATCH_CALL: rc->data.batch.initial_metadata->count = 0; break; case REGISTERED_CALL: rc->data.registered.initial_metadata->count = 0; break; - } - server_ref (server); - grpc_cq_end_op (exec_ctx, rc->cq_for_notification, rc->tag, 0, done_request_event, rc, &rc->completion); + } + server_ref(server); + grpc_cq_end_op(exec_ctx, rc->cq_for_notification, rc->tag, 0, + done_request_event, rc, &rc->completion); } -static void -publish_registered_or_batch (grpc_exec_ctx * exec_ctx, grpc_call * call, int success, void *prc) -{ - grpc_call_element *elem = grpc_call_stack_element (grpc_call_get_call_stack (call), 0); +static void publish_registered_or_batch(grpc_exec_ctx *exec_ctx, + grpc_call *call, int success, + void *prc) { + grpc_call_element *elem = + grpc_call_stack_element(grpc_call_get_call_stack(call), 0); requested_call *rc = prc; call_data *calld = elem->call_data; channel_data *chand = elem->channel_data; - server_ref (chand->server); - grpc_cq_end_op (exec_ctx, calld->cq_new, rc->tag, success, done_request_event, rc, &rc->completion); - GRPC_CALL_INTERNAL_UNREF (exec_ctx, call, "server"); + server_ref(chand->server); + grpc_cq_end_op(exec_ctx, calld->cq_new, rc->tag, success, done_request_event, + rc, &rc->completion); + GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, "server"); } -const grpc_channel_args * -grpc_server_get_channel_args (grpc_server * server) -{ +const grpc_channel_args *grpc_server_get_channel_args(grpc_server *server) { return server->channel_args; } -int -grpc_server_has_open_connections (grpc_server * server) -{ +int grpc_server_has_open_connections(grpc_server *server) { int r; - gpr_mu_lock (&server->mu_global); + gpr_mu_lock(&server->mu_global); r = server->root_channel_data.next != &server->root_channel_data; - gpr_mu_unlock (&server->mu_global); + gpr_mu_unlock(&server->mu_global); return r; } diff --git a/src/core/surface/server.h b/src/core/surface/server.h index 96d47de3cb9..4c46d076792 100644 --- a/src/core/surface/server.h +++ b/src/core/surface/server.h @@ -39,18 +39,29 @@ #include "src/core/transport/transport.h" /* Create a server */ -grpc_server *grpc_server_create_from_filters (const grpc_channel_filter ** filters, size_t filter_count, const grpc_channel_args * args); +grpc_server *grpc_server_create_from_filters( + const grpc_channel_filter **filters, size_t filter_count, + const grpc_channel_args *args); /* 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_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_exec_ctx * exec_ctx, grpc_server * server, grpc_transport * transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, grpc_mdctx * mdctx, const grpc_channel_args * args); +void grpc_server_setup_transport(grpc_exec_ctx *exec_ctx, grpc_server *server, + grpc_transport *transport, + grpc_channel_filter const **extra_filters, + size_t num_extra_filters, grpc_mdctx *mdctx, + const grpc_channel_args *args); -const grpc_channel_args *grpc_server_get_channel_args (grpc_server * server); +const grpc_channel_args *grpc_server_get_channel_args(grpc_server *server); -int grpc_server_has_open_connections (grpc_server * server); +int grpc_server_has_open_connections(grpc_server *server); #endif /* GRPC_INTERNAL_CORE_SURFACE_SERVER_H */ diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c index 8ea3f734e4c..3904ce969dd 100644 --- a/src/core/surface/server_chttp2.c +++ b/src/core/surface/server_chttp2.c @@ -42,18 +42,17 @@ #include #include -static void -setup_transport (grpc_exec_ctx * exec_ctx, void *server, grpc_transport * transport, grpc_mdctx * mdctx) -{ +static void setup_transport(grpc_exec_ctx *exec_ctx, void *server, + grpc_transport *transport, grpc_mdctx *mdctx) { static grpc_channel_filter const *extra_filters[] = { - &grpc_http_server_filter - }; - grpc_server_setup_transport (exec_ctx, server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (server)); + &grpc_http_server_filter}; + grpc_server_setup_transport(exec_ctx, server, transport, extra_filters, + GPR_ARRAY_SIZE(extra_filters), mdctx, + grpc_server_get_channel_args(server)); } -static void -new_transport (grpc_exec_ctx * exec_ctx, void *server, grpc_endpoint * tcp) -{ +static void new_transport(grpc_exec_ctx *exec_ctx, void *server, + grpc_endpoint *tcp) { /* * Beware that the call to grpc_create_chttp2_transport() has to happen before * grpc_tcp_server_destroy(). This is fine here, but similar code @@ -61,32 +60,30 @@ new_transport (grpc_exec_ctx * exec_ctx, void *server, grpc_endpoint * tcp) * (as in server_secure_chttp2.c) needs to add synchronization to avoid this * case. */ - grpc_mdctx *mdctx = grpc_mdctx_create (); - grpc_transport *transport = grpc_create_chttp2_transport (exec_ctx, grpc_server_get_channel_args (server), tcp, mdctx, 0); - setup_transport (exec_ctx, server, transport, mdctx); - grpc_chttp2_transport_start_reading (exec_ctx, transport, NULL, 0); + grpc_mdctx *mdctx = grpc_mdctx_create(); + grpc_transport *transport = grpc_create_chttp2_transport( + exec_ctx, grpc_server_get_channel_args(server), tcp, mdctx, 0); + setup_transport(exec_ctx, server, transport, mdctx); + grpc_chttp2_transport_start_reading(exec_ctx, transport, NULL, 0); } /* Server callback: start listening on our ports */ -static void -start (grpc_exec_ctx * exec_ctx, grpc_server * server, void *tcpp, grpc_pollset ** pollsets, size_t pollset_count) -{ +static void start(grpc_exec_ctx *exec_ctx, grpc_server *server, void *tcpp, + grpc_pollset **pollsets, size_t pollset_count) { grpc_tcp_server *tcp = tcpp; - grpc_tcp_server_start (exec_ctx, tcp, pollsets, pollset_count, new_transport, server); + grpc_tcp_server_start(exec_ctx, tcp, pollsets, pollset_count, new_transport, + server); } /* Server callback: destroy the tcp listener (so we don't generate further callbacks) */ -static void -destroy (grpc_exec_ctx * exec_ctx, grpc_server * server, void *tcpp, grpc_closure * destroy_done) -{ +static void destroy(grpc_exec_ctx *exec_ctx, grpc_server *server, void *tcpp, + grpc_closure *destroy_done) { grpc_tcp_server *tcp = tcpp; - grpc_tcp_server_destroy (exec_ctx, tcp, destroy_done); + grpc_tcp_server_destroy(exec_ctx, tcp, destroy_done); } -int -grpc_server_add_insecure_http2_port (grpc_server * server, const char *addr) -{ +int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) { grpc_resolved_addresses *resolved = NULL; grpc_tcp_server *tcp = NULL; size_t i; @@ -95,62 +92,55 @@ grpc_server_add_insecure_http2_port (grpc_server * server, const char *addr) int port_temp; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - resolved = grpc_blocking_resolve_address (addr, "http"); - if (!resolved) - { - goto error; - } + resolved = grpc_blocking_resolve_address(addr, "http"); + if (!resolved) { + goto error; + } - tcp = grpc_tcp_server_create (); - if (!tcp) - { - goto error; - } + tcp = grpc_tcp_server_create(); + if (!tcp) { + goto error; + } - for (i = 0; i < resolved->naddrs; i++) - { - port_temp = grpc_tcp_server_add_port (tcp, (struct sockaddr *) &resolved->addrs[i].addr, resolved->addrs[i].len); - if (port_temp >= 0) - { - if (port_num == -1) - { - port_num = port_temp; - } - else - { - GPR_ASSERT (port_num == port_temp); - } - count++; - } - } - if (count == 0) - { - gpr_log (GPR_ERROR, "No address added out of total %d resolved", resolved->naddrs); - goto error; + for (i = 0; i < resolved->naddrs; i++) { + port_temp = grpc_tcp_server_add_port( + tcp, (struct sockaddr *)&resolved->addrs[i].addr, + resolved->addrs[i].len); + if (port_temp >= 0) { + if (port_num == -1) { + port_num = port_temp; + } else { + GPR_ASSERT(port_num == port_temp); + } + count++; } - if (count != resolved->naddrs) - { - gpr_log (GPR_ERROR, "Only %d addresses added out of total %d resolved", count, resolved->naddrs); - } - grpc_resolved_addresses_destroy (resolved); + } + if (count == 0) { + gpr_log(GPR_ERROR, "No address added out of total %d resolved", + resolved->naddrs); + goto error; + } + if (count != resolved->naddrs) { + gpr_log(GPR_ERROR, "Only %d addresses added out of total %d resolved", + count, resolved->naddrs); + } + grpc_resolved_addresses_destroy(resolved); /* Register with the server only upon success */ - grpc_server_add_listener (&exec_ctx, server, tcp, start, destroy); + grpc_server_add_listener(&exec_ctx, server, tcp, start, destroy); goto done; /* Error path: cleanup and return */ error: - if (resolved) - { - grpc_resolved_addresses_destroy (resolved); - } - if (tcp) - { - grpc_tcp_server_destroy (&exec_ctx, tcp, NULL); - } + if (resolved) { + grpc_resolved_addresses_destroy(resolved); + } + if (tcp) { + grpc_tcp_server_destroy(&exec_ctx, tcp, NULL); + } port_num = 0; done: - grpc_exec_ctx_finish (&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); return port_num; } diff --git a/src/core/surface/server_create.c b/src/core/surface/server_create.c index d2f7b8e262d..fc7ae820f53 100644 --- a/src/core/surface/server_create.c +++ b/src/core/surface/server_create.c @@ -36,10 +36,9 @@ #include "src/core/surface/server.h" #include "src/core/channel/compress_filter.h" -grpc_server * -grpc_server_create (const grpc_channel_args * args, void *reserved) -{ - const grpc_channel_filter *filters[] = { &grpc_compress_filter }; - (void) reserved; - return grpc_server_create_from_filters (filters, GPR_ARRAY_SIZE (filters), args); +grpc_server *grpc_server_create(const grpc_channel_args *args, void *reserved) { + const grpc_channel_filter *filters[] = {&grpc_compress_filter}; + (void)reserved; + return grpc_server_create_from_filters(filters, GPR_ARRAY_SIZE(filters), + args); } diff --git a/src/core/surface/version.c b/src/core/surface/version.c index 4b90e06a043..e559d51448a 100644 --- a/src/core/surface/version.c +++ b/src/core/surface/version.c @@ -36,6 +36,4 @@ #include -const char *grpc_version_string(void) { - return "0.11.0.0"; -} +const char *grpc_version_string(void) { return "0.11.0.0"; } diff --git a/src/core/transport/chttp2/alpn.c b/src/core/transport/chttp2/alpn.c index f008615c9a5..69da4e6718e 100644 --- a/src/core/transport/chttp2/alpn.c +++ b/src/core/transport/chttp2/alpn.c @@ -36,29 +36,21 @@ #include /* in order of preference */ -static const char *const supported_versions[] = { "h2" }; +static const char *const supported_versions[] = {"h2"}; -int -grpc_chttp2_is_alpn_version_supported (const char *version, size_t size) -{ +int grpc_chttp2_is_alpn_version_supported(const char *version, size_t size) { size_t i; - for (i = 0; i < GPR_ARRAY_SIZE (supported_versions); i++) - { - if (!strncmp (version, supported_versions[i], size)) - return 1; - } + for (i = 0; i < GPR_ARRAY_SIZE(supported_versions); i++) { + if (!strncmp(version, supported_versions[i], size)) return 1; + } return 0; } -size_t -grpc_chttp2_num_alpn_versions (void) -{ - return GPR_ARRAY_SIZE (supported_versions); +size_t grpc_chttp2_num_alpn_versions(void) { + return GPR_ARRAY_SIZE(supported_versions); } -const char * -grpc_chttp2_get_alpn_version_index (size_t i) -{ - GPR_ASSERT (i < GPR_ARRAY_SIZE (supported_versions)); +const char *grpc_chttp2_get_alpn_version_index(size_t i) { + GPR_ASSERT(i < GPR_ARRAY_SIZE(supported_versions)); return supported_versions[i]; } diff --git a/src/core/transport/chttp2/alpn.h b/src/core/transport/chttp2/alpn.h index b45081eccff..f38b4c3167e 100644 --- a/src/core/transport/chttp2/alpn.h +++ b/src/core/transport/chttp2/alpn.h @@ -37,13 +37,13 @@ #include /* Retuns 1 if the version is supported, 0 otherwise. */ -int grpc_chttp2_is_alpn_version_supported (const char *version, size_t size); +int grpc_chttp2_is_alpn_version_supported(const char *version, size_t size); /* Returns the number of protocol versions to advertise */ -size_t grpc_chttp2_num_alpn_versions (void); +size_t grpc_chttp2_num_alpn_versions(void); /* Returns the protocol version at index i (0 <= i < * grpc_chttp2_num_alpn_versions()) */ -const char *grpc_chttp2_get_alpn_version_index (size_t i); +const char *grpc_chttp2_get_alpn_version_index(size_t i); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_ALPN_H */ diff --git a/src/core/transport/chttp2/bin_encoder.c b/src/core/transport/chttp2/bin_encoder.c index 929f65ad66d..e21d8000832 100644 --- a/src/core/transport/chttp2/bin_encoder.c +++ b/src/core/transport/chttp2/bin_encoder.c @@ -38,56 +38,51 @@ #include "src/core/transport/chttp2/huffsyms.h" #include -static const char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +static const char alphabet[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -typedef struct -{ +typedef struct { gpr_uint16 bits; gpr_uint8 length; } b64_huff_sym; static const b64_huff_sym huff_alphabet[64] = { - {0x21, 6}, {0x5d, 7}, {0x5e, 7}, {0x5f, 7}, {0x60, 7}, {0x61, 7}, - {0x62, 7}, {0x63, 7}, {0x64, 7}, {0x65, 7}, {0x66, 7}, {0x67, 7}, - {0x68, 7}, {0x69, 7}, {0x6a, 7}, {0x6b, 7}, {0x6c, 7}, {0x6d, 7}, - {0x6e, 7}, {0x6f, 7}, {0x70, 7}, {0x71, 7}, {0x72, 7}, {0xfc, 8}, - {0x73, 7}, {0xfd, 8}, {0x3, 5}, {0x23, 6}, {0x4, 5}, {0x24, 6}, - {0x5, 5}, {0x25, 6}, {0x26, 6}, {0x27, 6}, {0x6, 5}, {0x74, 7}, - {0x75, 7}, {0x28, 6}, {0x29, 6}, {0x2a, 6}, {0x7, 5}, {0x2b, 6}, - {0x76, 7}, {0x2c, 6}, {0x8, 5}, {0x9, 5}, {0x2d, 6}, {0x77, 7}, - {0x78, 7}, {0x79, 7}, {0x7a, 7}, {0x7b, 7}, {0x0, 5}, {0x1, 5}, - {0x2, 5}, {0x19, 6}, {0x1a, 6}, {0x1b, 6}, {0x1c, 6}, {0x1d, 6}, - {0x1e, 6}, {0x1f, 6}, {0x7fb, 11}, {0x18, 6} -}; - -static const gpr_uint8 tail_xtra[3] = { 0, 2, 3 }; - -gpr_slice -grpc_chttp2_base64_encode (gpr_slice input) -{ - size_t input_length = GPR_SLICE_LENGTH (input); + {0x21, 6}, {0x5d, 7}, {0x5e, 7}, {0x5f, 7}, {0x60, 7}, {0x61, 7}, + {0x62, 7}, {0x63, 7}, {0x64, 7}, {0x65, 7}, {0x66, 7}, {0x67, 7}, + {0x68, 7}, {0x69, 7}, {0x6a, 7}, {0x6b, 7}, {0x6c, 7}, {0x6d, 7}, + {0x6e, 7}, {0x6f, 7}, {0x70, 7}, {0x71, 7}, {0x72, 7}, {0xfc, 8}, + {0x73, 7}, {0xfd, 8}, {0x3, 5}, {0x23, 6}, {0x4, 5}, {0x24, 6}, + {0x5, 5}, {0x25, 6}, {0x26, 6}, {0x27, 6}, {0x6, 5}, {0x74, 7}, + {0x75, 7}, {0x28, 6}, {0x29, 6}, {0x2a, 6}, {0x7, 5}, {0x2b, 6}, + {0x76, 7}, {0x2c, 6}, {0x8, 5}, {0x9, 5}, {0x2d, 6}, {0x77, 7}, + {0x78, 7}, {0x79, 7}, {0x7a, 7}, {0x7b, 7}, {0x0, 5}, {0x1, 5}, + {0x2, 5}, {0x19, 6}, {0x1a, 6}, {0x1b, 6}, {0x1c, 6}, {0x1d, 6}, + {0x1e, 6}, {0x1f, 6}, {0x7fb, 11}, {0x18, 6}}; + +static const gpr_uint8 tail_xtra[3] = {0, 2, 3}; + +gpr_slice grpc_chttp2_base64_encode(gpr_slice input) { + size_t input_length = GPR_SLICE_LENGTH(input); size_t input_triplets = input_length / 3; size_t tail_case = input_length % 3; size_t output_length = input_triplets * 4 + tail_xtra[tail_case]; - gpr_slice output = gpr_slice_malloc (output_length); - gpr_uint8 *in = GPR_SLICE_START_PTR (input); - char *out = (char *) GPR_SLICE_START_PTR (output); + gpr_slice output = gpr_slice_malloc(output_length); + gpr_uint8 *in = GPR_SLICE_START_PTR(input); + char *out = (char *)GPR_SLICE_START_PTR(output); size_t i; /* encode full triplets */ - for (i = 0; i < input_triplets; i++) - { - out[0] = alphabet[in[0] >> 2]; - out[1] = alphabet[((in[0] & 0x3) << 4) | (in[1] >> 4)]; - out[2] = alphabet[((in[1] & 0xf) << 2) | (in[2] >> 6)]; - out[3] = alphabet[in[2] & 0x3f]; - out += 4; - in += 3; - } + for (i = 0; i < input_triplets; i++) { + out[0] = alphabet[in[0] >> 2]; + out[1] = alphabet[((in[0] & 0x3) << 4) | (in[1] >> 4)]; + out[2] = alphabet[((in[1] & 0xf) << 2) | (in[2] >> 6)]; + out[3] = alphabet[in[2] & 0x3f]; + out += 4; + in += 3; + } /* encode the remaining bytes */ - switch (tail_case) - { + switch (tail_case) { case 0: break; case 1: @@ -103,16 +98,14 @@ grpc_chttp2_base64_encode (gpr_slice input) out += 3; in += 2; break; - } + } - GPR_ASSERT (out == (char *) GPR_SLICE_END_PTR (output)); - GPR_ASSERT (in == GPR_SLICE_END_PTR (input)); + GPR_ASSERT(out == (char *)GPR_SLICE_END_PTR(output)); + GPR_ASSERT(in == GPR_SLICE_END_PTR(input)); return output; } -gpr_slice -grpc_chttp2_huffman_compress (gpr_slice input) -{ +gpr_slice grpc_chttp2_huffman_compress(gpr_slice input) { size_t nbits; gpr_uint8 *in; gpr_uint8 *out; @@ -121,85 +114,73 @@ grpc_chttp2_huffman_compress (gpr_slice input) gpr_uint32 temp_length = 0; nbits = 0; - for (in = GPR_SLICE_START_PTR (input); in != GPR_SLICE_END_PTR (input); ++in) - { - nbits += grpc_chttp2_huffsyms[*in].length; + for (in = GPR_SLICE_START_PTR(input); in != GPR_SLICE_END_PTR(input); ++in) { + nbits += grpc_chttp2_huffsyms[*in].length; + } + + output = gpr_slice_malloc(nbits / 8 + (nbits % 8 != 0)); + out = GPR_SLICE_START_PTR(output); + for (in = GPR_SLICE_START_PTR(input); in != GPR_SLICE_END_PTR(input); ++in) { + int sym = *in; + temp <<= grpc_chttp2_huffsyms[sym].length; + temp |= grpc_chttp2_huffsyms[sym].bits; + temp_length += grpc_chttp2_huffsyms[sym].length; + + while (temp_length > 8) { + temp_length -= 8; + *out++ = (gpr_uint8)(temp >> temp_length); } + } - output = gpr_slice_malloc (nbits / 8 + (nbits % 8 != 0)); - out = GPR_SLICE_START_PTR (output); - for (in = GPR_SLICE_START_PTR (input); in != GPR_SLICE_END_PTR (input); ++in) - { - int sym = *in; - temp <<= grpc_chttp2_huffsyms[sym].length; - temp |= grpc_chttp2_huffsyms[sym].bits; - temp_length += grpc_chttp2_huffsyms[sym].length; - - while (temp_length > 8) - { - temp_length -= 8; - *out++ = (gpr_uint8) (temp >> temp_length); - } - } + if (temp_length) { + *out++ = (gpr_uint8)(temp << (8u - temp_length)) | + (gpr_uint8)(0xffu >> temp_length); + } - if (temp_length) - { - *out++ = (gpr_uint8) (temp << (8u - temp_length)) | (gpr_uint8) (0xffu >> temp_length); - } - - GPR_ASSERT (out == GPR_SLICE_END_PTR (output)); + GPR_ASSERT(out == GPR_SLICE_END_PTR(output)); return output; } -typedef struct -{ +typedef struct { gpr_uint32 temp; gpr_uint32 temp_length; gpr_uint8 *out; } huff_out; -static void -enc_flush_some (huff_out * out) -{ - while (out->temp_length > 8) - { - out->temp_length -= 8; - *out->out++ = (gpr_uint8) (out->temp >> out->temp_length); - } +static void enc_flush_some(huff_out *out) { + while (out->temp_length > 8) { + out->temp_length -= 8; + *out->out++ = (gpr_uint8)(out->temp >> out->temp_length); + } } -static void -enc_add2 (huff_out * out, gpr_uint8 a, gpr_uint8 b) -{ +static void enc_add2(huff_out *out, gpr_uint8 a, gpr_uint8 b) { b64_huff_sym sa = huff_alphabet[a]; b64_huff_sym sb = huff_alphabet[b]; - out->temp = (out->temp << (sa.length + sb.length)) | ((gpr_uint32) sa.bits << sb.length) | sb.bits; - out->temp_length += (gpr_uint32) sa.length + (gpr_uint32) sb.length; - enc_flush_some (out); + out->temp = (out->temp << (sa.length + sb.length)) | + ((gpr_uint32)sa.bits << sb.length) | sb.bits; + out->temp_length += (gpr_uint32)sa.length + (gpr_uint32)sb.length; + enc_flush_some(out); } -static void -enc_add1 (huff_out * out, gpr_uint8 a) -{ +static void enc_add1(huff_out *out, gpr_uint8 a) { b64_huff_sym sa = huff_alphabet[a]; out->temp = (out->temp << sa.length) | sa.bits; out->temp_length += sa.length; - enc_flush_some (out); + enc_flush_some(out); } -gpr_slice -grpc_chttp2_base64_encode_and_huffman_compress (gpr_slice input) -{ - size_t input_length = GPR_SLICE_LENGTH (input); +gpr_slice grpc_chttp2_base64_encode_and_huffman_compress(gpr_slice input) { + size_t input_length = GPR_SLICE_LENGTH(input); size_t input_triplets = input_length / 3; size_t tail_case = input_length % 3; size_t output_syms = input_triplets * 4 + tail_xtra[tail_case]; size_t max_output_bits = 11 * output_syms; size_t max_output_length = max_output_bits / 8 + (max_output_bits % 8 != 0); - gpr_slice output = gpr_slice_malloc (max_output_length); - gpr_uint8 *in = GPR_SLICE_START_PTR (input); - gpr_uint8 *start_out = GPR_SLICE_START_PTR (output); + gpr_slice output = gpr_slice_malloc(max_output_length); + gpr_uint8 *in = GPR_SLICE_START_PTR(input); + gpr_uint8 *start_out = GPR_SLICE_START_PTR(output); huff_out out; size_t i; @@ -208,45 +189,42 @@ grpc_chttp2_base64_encode_and_huffman_compress (gpr_slice input) out.out = start_out; /* encode full triplets */ - for (i = 0; i < input_triplets; i++) - { - enc_add2 (&out, in[0] >> 2, (gpr_uint8) ((in[0] & 0x3) << 4) | (in[1] >> 4)); - enc_add2 (&out, (gpr_uint8) ((in[1] & 0xf) << 2) | (in[2] >> 6), (gpr_uint8) (in[2] & 0x3f)); - in += 3; - } + for (i = 0; i < input_triplets; i++) { + enc_add2(&out, in[0] >> 2, (gpr_uint8)((in[0] & 0x3) << 4) | (in[1] >> 4)); + enc_add2(&out, (gpr_uint8)((in[1] & 0xf) << 2) | (in[2] >> 6), + (gpr_uint8)(in[2] & 0x3f)); + in += 3; + } /* encode the remaining bytes */ - switch (tail_case) - { + switch (tail_case) { case 0: break; case 1: - enc_add2 (&out, in[0] >> 2, (gpr_uint8) ((in[0] & 0x3) << 4)); + enc_add2(&out, in[0] >> 2, (gpr_uint8)((in[0] & 0x3) << 4)); in += 1; break; case 2: - enc_add2 (&out, in[0] >> 2, (gpr_uint8) ((in[0] & 0x3) << 4) | (gpr_uint8) (in[1] >> 4)); - enc_add1 (&out, (gpr_uint8) ((in[1] & 0xf) << 2)); + enc_add2(&out, in[0] >> 2, + (gpr_uint8)((in[0] & 0x3) << 4) | (gpr_uint8)(in[1] >> 4)); + enc_add1(&out, (gpr_uint8)((in[1] & 0xf) << 2)); in += 2; break; - } + } - if (out.temp_length) - { - *out.out++ = (gpr_uint8) (out.temp << (8u - out.temp_length)) | (gpr_uint8) (0xffu >> out.temp_length); - } + if (out.temp_length) { + *out.out++ = (gpr_uint8)(out.temp << (8u - out.temp_length)) | + (gpr_uint8)(0xffu >> out.temp_length); + } - GPR_ASSERT (out.out <= GPR_SLICE_END_PTR (output)); - GPR_SLICE_SET_LENGTH (output, out.out - start_out); + GPR_ASSERT(out.out <= GPR_SLICE_END_PTR(output)); + GPR_SLICE_SET_LENGTH(output, out.out - start_out); - GPR_ASSERT (in == GPR_SLICE_END_PTR (input)); + GPR_ASSERT(in == GPR_SLICE_END_PTR(input)); return output; } -int -grpc_is_binary_header (const char *key, size_t length) -{ - if (length < 5) - return 0; - return 0 == memcmp (key + length - 4, "-bin", 4); +int grpc_is_binary_header(const char *key, size_t length) { + if (length < 5) return 0; + return 0 == memcmp(key + length - 4, "-bin", 4); } diff --git a/src/core/transport/chttp2/bin_encoder.h b/src/core/transport/chttp2/bin_encoder.h index 6e57615f7fb..d3e5a855ddb 100644 --- a/src/core/transport/chttp2/bin_encoder.h +++ b/src/core/transport/chttp2/bin_encoder.h @@ -38,19 +38,19 @@ /* base64 encode a slice. Returns a new slice, does not take ownership of the input */ -gpr_slice grpc_chttp2_base64_encode (gpr_slice input); +gpr_slice grpc_chttp2_base64_encode(gpr_slice input); /* Compress a slice with the static huffman encoder detailed in the hpack standard. Returns a new slice, does not take ownership of the input */ -gpr_slice grpc_chttp2_huffman_compress (gpr_slice input); +gpr_slice grpc_chttp2_huffman_compress(gpr_slice input); /* equivalent to: gpr_slice x = grpc_chttp2_base64_encode(input); gpr_slice y = grpc_chttp2_huffman_compress(x); gpr_slice_unref(x); return y; */ -gpr_slice grpc_chttp2_base64_encode_and_huffman_compress (gpr_slice input); +gpr_slice grpc_chttp2_base64_encode_and_huffman_compress(gpr_slice input); -int grpc_is_binary_header (const char *key, size_t length); +int grpc_is_binary_header(const char *key, size_t length); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_BIN_ENCODER_H */ diff --git a/src/core/transport/chttp2/frame.h b/src/core/transport/chttp2/frame.h index 84aa1549675..879ee036fac 100644 --- a/src/core/transport/chttp2/frame.h +++ b/src/core/transport/chttp2/frame.h @@ -39,8 +39,7 @@ /* Common definitions for frame handling in the chttp2 transport */ -typedef enum -{ +typedef enum { GRPC_CHTTP2_PARSE_OK, GRPC_CHTTP2_STREAM_ERROR, GRPC_CHTTP2_CONNECTION_ERROR diff --git a/src/core/transport/chttp2/frame_data.c b/src/core/transport/chttp2/frame_data.c index a806e357a88..99414523d56 100644 --- a/src/core/transport/chttp2/frame_data.c +++ b/src/core/transport/chttp2/frame_data.c @@ -42,146 +42,133 @@ #include #include "src/core/transport/transport.h" -grpc_chttp2_parse_error -grpc_chttp2_data_parser_init (grpc_chttp2_data_parser * parser) -{ +grpc_chttp2_parse_error grpc_chttp2_data_parser_init( + grpc_chttp2_data_parser *parser) { parser->state = GRPC_CHTTP2_DATA_FH_0; - grpc_sopb_init (&parser->incoming_sopb); + grpc_sopb_init(&parser->incoming_sopb); return GRPC_CHTTP2_PARSE_OK; } -void -grpc_chttp2_data_parser_destroy (grpc_chttp2_data_parser * parser) -{ - grpc_sopb_destroy (&parser->incoming_sopb); +void grpc_chttp2_data_parser_destroy(grpc_chttp2_data_parser *parser) { + grpc_sopb_destroy(&parser->incoming_sopb); } -grpc_chttp2_parse_error -grpc_chttp2_data_parser_begin_frame (grpc_chttp2_data_parser * parser, gpr_uint8 flags) -{ - if (flags & ~GRPC_CHTTP2_DATA_FLAG_END_STREAM) - { - gpr_log (GPR_ERROR, "unsupported data flags: 0x%02x", flags); - return GRPC_CHTTP2_STREAM_ERROR; - } +grpc_chttp2_parse_error grpc_chttp2_data_parser_begin_frame( + grpc_chttp2_data_parser *parser, gpr_uint8 flags) { + if (flags & ~GRPC_CHTTP2_DATA_FLAG_END_STREAM) { + gpr_log(GPR_ERROR, "unsupported data flags: 0x%02x", flags); + return GRPC_CHTTP2_STREAM_ERROR; + } - if (flags & GRPC_CHTTP2_DATA_FLAG_END_STREAM) - { - parser->is_last_frame = 1; - } - else - { - parser->is_last_frame = 0; - } + if (flags & GRPC_CHTTP2_DATA_FLAG_END_STREAM) { + parser->is_last_frame = 1; + } else { + parser->is_last_frame = 0; + } return GRPC_CHTTP2_PARSE_OK; } -grpc_chttp2_parse_error -grpc_chttp2_data_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) -{ - gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); - gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); +grpc_chttp2_parse_error grpc_chttp2_data_parser_parse( + grpc_exec_ctx *exec_ctx, void *parser, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { + gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); + gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; grpc_chttp2_data_parser *p = parser; gpr_uint32 message_flags = 0; - if (is_last && p->is_last_frame) - { - stream_parsing->received_close = 1; - } + if (is_last && p->is_last_frame) { + stream_parsing->received_close = 1; + } - if (cur == end) - { - return GRPC_CHTTP2_PARSE_OK; - } + if (cur == end) { + return GRPC_CHTTP2_PARSE_OK; + } - switch (p->state) - { - fh_0: + switch (p->state) { + fh_0: case GRPC_CHTTP2_DATA_FH_0: p->frame_type = *cur; - switch (p->frame_type) - { - case 0: - p->is_frame_compressed = 0; /* GPR_FALSE */ - break; - case 1: - p->is_frame_compressed = 1; /* GPR_TRUE */ - break; - default: - gpr_log (GPR_ERROR, "Bad GRPC frame type 0x%02x", p->frame_type); - return GRPC_CHTTP2_STREAM_ERROR; - } - if (++cur == end) - { - p->state = GRPC_CHTTP2_DATA_FH_1; - return GRPC_CHTTP2_PARSE_OK; - } - /* fallthrough */ + switch (p->frame_type) { + case 0: + p->is_frame_compressed = 0; /* GPR_FALSE */ + break; + case 1: + p->is_frame_compressed = 1; /* GPR_TRUE */ + break; + default: + gpr_log(GPR_ERROR, "Bad GRPC frame type 0x%02x", p->frame_type); + return GRPC_CHTTP2_STREAM_ERROR; + } + if (++cur == end) { + p->state = GRPC_CHTTP2_DATA_FH_1; + return GRPC_CHTTP2_PARSE_OK; + } + /* fallthrough */ case GRPC_CHTTP2_DATA_FH_1: - p->frame_size = ((gpr_uint32) * cur) << 24; - if (++cur == end) - { - p->state = GRPC_CHTTP2_DATA_FH_2; - return GRPC_CHTTP2_PARSE_OK; - } - /* fallthrough */ + p->frame_size = ((gpr_uint32)*cur) << 24; + if (++cur == end) { + p->state = GRPC_CHTTP2_DATA_FH_2; + return GRPC_CHTTP2_PARSE_OK; + } + /* fallthrough */ case GRPC_CHTTP2_DATA_FH_2: - p->frame_size |= ((gpr_uint32) * cur) << 16; - if (++cur == end) - { - p->state = GRPC_CHTTP2_DATA_FH_3; - return GRPC_CHTTP2_PARSE_OK; - } - /* fallthrough */ + p->frame_size |= ((gpr_uint32)*cur) << 16; + if (++cur == end) { + p->state = GRPC_CHTTP2_DATA_FH_3; + return GRPC_CHTTP2_PARSE_OK; + } + /* fallthrough */ case GRPC_CHTTP2_DATA_FH_3: - p->frame_size |= ((gpr_uint32) * cur) << 8; - if (++cur == end) - { - p->state = GRPC_CHTTP2_DATA_FH_4; - return GRPC_CHTTP2_PARSE_OK; - } - /* fallthrough */ + p->frame_size |= ((gpr_uint32)*cur) << 8; + if (++cur == end) { + p->state = GRPC_CHTTP2_DATA_FH_4; + return GRPC_CHTTP2_PARSE_OK; + } + /* fallthrough */ case GRPC_CHTTP2_DATA_FH_4: - p->frame_size |= ((gpr_uint32) * cur); + p->frame_size |= ((gpr_uint32)*cur); p->state = GRPC_CHTTP2_DATA_FRAME; ++cur; - if (p->is_frame_compressed) - { - message_flags |= GRPC_WRITE_INTERNAL_COMPRESS; - } - grpc_sopb_add_begin_message (&p->incoming_sopb, p->frame_size, message_flags); - /* fallthrough */ + if (p->is_frame_compressed) { + message_flags |= GRPC_WRITE_INTERNAL_COMPRESS; + } + grpc_sopb_add_begin_message(&p->incoming_sopb, p->frame_size, + message_flags); + /* fallthrough */ case GRPC_CHTTP2_DATA_FRAME: - if (cur == end) - { - grpc_chttp2_list_add_parsing_seen_stream (transport_parsing, stream_parsing); - return GRPC_CHTTP2_PARSE_OK; - } - grpc_chttp2_list_add_parsing_seen_stream (transport_parsing, stream_parsing); - if ((gpr_uint32) (end - cur) == p->frame_size) - { - grpc_sopb_add_slice (&p->incoming_sopb, gpr_slice_sub (slice, (size_t) (cur - beg), (size_t) (end - beg))); - p->state = GRPC_CHTTP2_DATA_FH_0; - return GRPC_CHTTP2_PARSE_OK; - } - else if ((gpr_uint32) (end - cur) > p->frame_size) - { - grpc_sopb_add_slice (&p->incoming_sopb, gpr_slice_sub (slice, (size_t) (cur - beg), (size_t) (cur + p->frame_size - beg))); - cur += p->frame_size; - goto fh_0; /* loop */ - } - else - { - grpc_sopb_add_slice (&p->incoming_sopb, gpr_slice_sub (slice, (size_t) (cur - beg), (size_t) (end - beg))); - GPR_ASSERT (end - cur <= p->frame_size); - p->frame_size -= (gpr_uint32) (end - cur); - return GRPC_CHTTP2_PARSE_OK; - } - } + if (cur == end) { + grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, + stream_parsing); + return GRPC_CHTTP2_PARSE_OK; + } + grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, + stream_parsing); + if ((gpr_uint32)(end - cur) == p->frame_size) { + grpc_sopb_add_slice( + &p->incoming_sopb, + gpr_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg))); + p->state = GRPC_CHTTP2_DATA_FH_0; + return GRPC_CHTTP2_PARSE_OK; + } else if ((gpr_uint32)(end - cur) > p->frame_size) { + grpc_sopb_add_slice(&p->incoming_sopb, + gpr_slice_sub(slice, (size_t)(cur - beg), + (size_t)(cur + p->frame_size - beg))); + cur += p->frame_size; + goto fh_0; /* loop */ + } else { + grpc_sopb_add_slice( + &p->incoming_sopb, + gpr_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg))); + GPR_ASSERT(end - cur <= p->frame_size); + p->frame_size -= (gpr_uint32)(end - cur); + return GRPC_CHTTP2_PARSE_OK; + } + } - gpr_log (GPR_ERROR, "should never reach here"); - abort (); + gpr_log(GPR_ERROR, "should never reach here"); + abort(); return GRPC_CHTTP2_CONNECTION_ERROR; } diff --git a/src/core/transport/chttp2/frame_data.h b/src/core/transport/chttp2/frame_data.h index 18c7e00cd12..6762484e5b1 100644 --- a/src/core/transport/chttp2/frame_data.h +++ b/src/core/transport/chttp2/frame_data.h @@ -42,8 +42,7 @@ #include "src/core/transport/stream_op.h" #include "src/core/transport/chttp2/frame.h" -typedef enum -{ +typedef enum { GRPC_CHTTP2_DATA_FH_0, GRPC_CHTTP2_DATA_FH_1, GRPC_CHTTP2_DATA_FH_2, @@ -52,8 +51,7 @@ typedef enum GRPC_CHTTP2_DATA_FRAME } grpc_chttp2_stream_state; -typedef struct -{ +typedef struct { grpc_chttp2_stream_state state; gpr_uint8 is_last_frame; gpr_uint8 frame_type; @@ -64,18 +62,23 @@ typedef struct } grpc_chttp2_data_parser; /* initialize per-stream state for data frame parsing */ -grpc_chttp2_parse_error grpc_chttp2_data_parser_init (grpc_chttp2_data_parser * parser); +grpc_chttp2_parse_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_chttp2_data_parser *parser); /* start processing a new data frame */ -grpc_chttp2_parse_error grpc_chttp2_data_parser_begin_frame (grpc_chttp2_data_parser * parser, gpr_uint8 flags); +grpc_chttp2_parse_error grpc_chttp2_data_parser_begin_frame( + grpc_chttp2_data_parser *parser, gpr_uint8 flags); /* handle a slice of a data frame - is_last indicates the last slice of a frame */ -grpc_chttp2_parse_error grpc_chttp2_data_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); +grpc_chttp2_parse_error grpc_chttp2_data_parser_parse( + grpc_exec_ctx *exec_ctx, void *parser, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); /* create a slice with an empty data frame and is_last set */ -gpr_slice grpc_chttp2_data_frame_create_empty_close (gpr_uint32 id); +gpr_slice grpc_chttp2_data_frame_create_empty_close(gpr_uint32 id); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_DATA_H */ diff --git a/src/core/transport/chttp2/frame_goaway.c b/src/core/transport/chttp2/frame_goaway.c index 891e77e3333..d2065ce79d0 100644 --- a/src/core/transport/chttp2/frame_goaway.c +++ b/src/core/transport/chttp2/frame_goaway.c @@ -39,151 +39,137 @@ #include #include -void -grpc_chttp2_goaway_parser_init (grpc_chttp2_goaway_parser * p) -{ +void grpc_chttp2_goaway_parser_init(grpc_chttp2_goaway_parser *p) { p->debug_data = NULL; } -void -grpc_chttp2_goaway_parser_destroy (grpc_chttp2_goaway_parser * p) -{ - gpr_free (p->debug_data); +void grpc_chttp2_goaway_parser_destroy(grpc_chttp2_goaway_parser *p) { + gpr_free(p->debug_data); } -grpc_chttp2_parse_error -grpc_chttp2_goaway_parser_begin_frame (grpc_chttp2_goaway_parser * p, gpr_uint32 length, gpr_uint8 flags) -{ - if (length < 8) - { - gpr_log (GPR_ERROR, "goaway frame too short (%d bytes)", length); - return GRPC_CHTTP2_CONNECTION_ERROR; - } +grpc_chttp2_parse_error grpc_chttp2_goaway_parser_begin_frame( + grpc_chttp2_goaway_parser *p, gpr_uint32 length, gpr_uint8 flags) { + if (length < 8) { + gpr_log(GPR_ERROR, "goaway frame too short (%d bytes)", length); + return GRPC_CHTTP2_CONNECTION_ERROR; + } - gpr_free (p->debug_data); + gpr_free(p->debug_data); p->debug_length = length - 8; - p->debug_data = gpr_malloc (p->debug_length); + p->debug_data = gpr_malloc(p->debug_length); p->debug_pos = 0; p->state = GRPC_CHTTP2_GOAWAY_LSI0; return GRPC_CHTTP2_PARSE_OK; } -grpc_chttp2_parse_error -grpc_chttp2_goaway_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) -{ - gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); - gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); +grpc_chttp2_parse_error grpc_chttp2_goaway_parser_parse( + grpc_exec_ctx *exec_ctx, void *parser, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { + gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); + gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; grpc_chttp2_goaway_parser *p = parser; - switch (p->state) - { + switch (p->state) { case GRPC_CHTTP2_GOAWAY_LSI0: - if (cur == end) - { - p->state = GRPC_CHTTP2_GOAWAY_LSI0; - return GRPC_CHTTP2_PARSE_OK; - } - p->last_stream_id = ((gpr_uint32) * cur) << 24; + if (cur == end) { + p->state = GRPC_CHTTP2_GOAWAY_LSI0; + return GRPC_CHTTP2_PARSE_OK; + } + p->last_stream_id = ((gpr_uint32)*cur) << 24; ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_LSI1: - if (cur == end) - { - p->state = GRPC_CHTTP2_GOAWAY_LSI1; - return GRPC_CHTTP2_PARSE_OK; - } - p->last_stream_id |= ((gpr_uint32) * cur) << 16; + if (cur == end) { + p->state = GRPC_CHTTP2_GOAWAY_LSI1; + return GRPC_CHTTP2_PARSE_OK; + } + p->last_stream_id |= ((gpr_uint32)*cur) << 16; ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_LSI2: - if (cur == end) - { - p->state = GRPC_CHTTP2_GOAWAY_LSI2; - return GRPC_CHTTP2_PARSE_OK; - } - p->last_stream_id |= ((gpr_uint32) * cur) << 8; + if (cur == end) { + p->state = GRPC_CHTTP2_GOAWAY_LSI2; + return GRPC_CHTTP2_PARSE_OK; + } + p->last_stream_id |= ((gpr_uint32)*cur) << 8; ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_LSI3: - if (cur == end) - { - p->state = GRPC_CHTTP2_GOAWAY_LSI3; - return GRPC_CHTTP2_PARSE_OK; - } - p->last_stream_id |= ((gpr_uint32) * cur); + if (cur == end) { + p->state = GRPC_CHTTP2_GOAWAY_LSI3; + return GRPC_CHTTP2_PARSE_OK; + } + p->last_stream_id |= ((gpr_uint32)*cur); ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_ERR0: - if (cur == end) - { - p->state = GRPC_CHTTP2_GOAWAY_ERR0; - return GRPC_CHTTP2_PARSE_OK; - } - p->error_code = ((gpr_uint32) * cur) << 24; + if (cur == end) { + p->state = GRPC_CHTTP2_GOAWAY_ERR0; + return GRPC_CHTTP2_PARSE_OK; + } + p->error_code = ((gpr_uint32)*cur) << 24; ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_ERR1: - if (cur == end) - { - p->state = GRPC_CHTTP2_GOAWAY_ERR1; - return GRPC_CHTTP2_PARSE_OK; - } - p->error_code |= ((gpr_uint32) * cur) << 16; + if (cur == end) { + p->state = GRPC_CHTTP2_GOAWAY_ERR1; + return GRPC_CHTTP2_PARSE_OK; + } + p->error_code |= ((gpr_uint32)*cur) << 16; ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_ERR2: - if (cur == end) - { - p->state = GRPC_CHTTP2_GOAWAY_ERR2; - return GRPC_CHTTP2_PARSE_OK; - } - p->error_code |= ((gpr_uint32) * cur) << 8; + if (cur == end) { + p->state = GRPC_CHTTP2_GOAWAY_ERR2; + return GRPC_CHTTP2_PARSE_OK; + } + p->error_code |= ((gpr_uint32)*cur) << 8; ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_ERR3: - if (cur == end) - { - p->state = GRPC_CHTTP2_GOAWAY_ERR3; - return GRPC_CHTTP2_PARSE_OK; - } - p->error_code |= ((gpr_uint32) * cur); + if (cur == end) { + p->state = GRPC_CHTTP2_GOAWAY_ERR3; + return GRPC_CHTTP2_PARSE_OK; + } + p->error_code |= ((gpr_uint32)*cur); ++cur; - /* fallthrough */ + /* fallthrough */ case GRPC_CHTTP2_GOAWAY_DEBUG: - memcpy (p->debug_data + p->debug_pos, cur, (size_t) (end - cur)); - GPR_ASSERT (end - cur < GPR_UINT32_MAX - p->debug_pos); - p->debug_pos += (gpr_uint32) (end - cur); + memcpy(p->debug_data + p->debug_pos, cur, (size_t)(end - cur)); + GPR_ASSERT(end - cur < GPR_UINT32_MAX - p->debug_pos); + p->debug_pos += (gpr_uint32)(end - cur); p->state = GRPC_CHTTP2_GOAWAY_DEBUG; - if (is_last) - { - transport_parsing->goaway_received = 1; - transport_parsing->goaway_last_stream_index = p->last_stream_id; - gpr_slice_unref (transport_parsing->goaway_text); - transport_parsing->goaway_error = (grpc_status_code) p->error_code; - transport_parsing->goaway_text = gpr_slice_new (p->debug_data, p->debug_length, gpr_free); - p->debug_data = NULL; - } + if (is_last) { + transport_parsing->goaway_received = 1; + transport_parsing->goaway_last_stream_index = p->last_stream_id; + gpr_slice_unref(transport_parsing->goaway_text); + transport_parsing->goaway_error = (grpc_status_code)p->error_code; + transport_parsing->goaway_text = + gpr_slice_new(p->debug_data, p->debug_length, gpr_free); + p->debug_data = NULL; + } return GRPC_CHTTP2_PARSE_OK; - } - gpr_log (GPR_ERROR, "Should never end up here"); - abort (); + } + gpr_log(GPR_ERROR, "Should never end up here"); + abort(); return GRPC_CHTTP2_CONNECTION_ERROR; } -void -grpc_chttp2_goaway_append (gpr_uint32 last_stream_id, gpr_uint32 error_code, gpr_slice debug_data, gpr_slice_buffer * slice_buffer) -{ - gpr_slice header = gpr_slice_malloc (9 + 4 + 4); - gpr_uint8 *p = GPR_SLICE_START_PTR (header); +void grpc_chttp2_goaway_append(gpr_uint32 last_stream_id, gpr_uint32 error_code, + gpr_slice debug_data, + gpr_slice_buffer *slice_buffer) { + gpr_slice header = gpr_slice_malloc(9 + 4 + 4); + gpr_uint8 *p = GPR_SLICE_START_PTR(header); gpr_uint32 frame_length; - GPR_ASSERT (GPR_SLICE_LENGTH (debug_data) < GPR_UINT32_MAX - 4 - 4); - frame_length = 4 + 4 + (gpr_uint32) GPR_SLICE_LENGTH (debug_data); + GPR_ASSERT(GPR_SLICE_LENGTH(debug_data) < GPR_UINT32_MAX - 4 - 4); + frame_length = 4 + 4 + (gpr_uint32)GPR_SLICE_LENGTH(debug_data); /* frame header: length */ - *p++ = (gpr_uint8) (frame_length >> 16); - *p++ = (gpr_uint8) (frame_length >> 8); - *p++ = (gpr_uint8) (frame_length); + *p++ = (gpr_uint8)(frame_length >> 16); + *p++ = (gpr_uint8)(frame_length >> 8); + *p++ = (gpr_uint8)(frame_length); /* frame header: type */ *p++ = GRPC_CHTTP2_FRAME_GOAWAY; /* frame header: flags */ @@ -194,16 +180,16 @@ grpc_chttp2_goaway_append (gpr_uint32 last_stream_id, gpr_uint32 error_code, gpr *p++ = 0; *p++ = 0; /* payload: last stream id */ - *p++ = (gpr_uint8) (last_stream_id >> 24); - *p++ = (gpr_uint8) (last_stream_id >> 16); - *p++ = (gpr_uint8) (last_stream_id >> 8); - *p++ = (gpr_uint8) (last_stream_id); + *p++ = (gpr_uint8)(last_stream_id >> 24); + *p++ = (gpr_uint8)(last_stream_id >> 16); + *p++ = (gpr_uint8)(last_stream_id >> 8); + *p++ = (gpr_uint8)(last_stream_id); /* payload: error code */ - *p++ = (gpr_uint8) (error_code >> 24); - *p++ = (gpr_uint8) (error_code >> 16); - *p++ = (gpr_uint8) (error_code >> 8); - *p++ = (gpr_uint8) (error_code); - GPR_ASSERT (p == GPR_SLICE_END_PTR (header)); - gpr_slice_buffer_add (slice_buffer, header); - gpr_slice_buffer_add (slice_buffer, debug_data); + *p++ = (gpr_uint8)(error_code >> 24); + *p++ = (gpr_uint8)(error_code >> 16); + *p++ = (gpr_uint8)(error_code >> 8); + *p++ = (gpr_uint8)(error_code); + GPR_ASSERT(p == GPR_SLICE_END_PTR(header)); + gpr_slice_buffer_add(slice_buffer, header); + gpr_slice_buffer_add(slice_buffer, debug_data); } diff --git a/src/core/transport/chttp2/frame_goaway.h b/src/core/transport/chttp2/frame_goaway.h index f1eada9881f..06aaa92f070 100644 --- a/src/core/transport/chttp2/frame_goaway.h +++ b/src/core/transport/chttp2/frame_goaway.h @@ -40,8 +40,7 @@ #include #include -typedef enum -{ +typedef enum { GRPC_CHTTP2_GOAWAY_LSI0, GRPC_CHTTP2_GOAWAY_LSI1, GRPC_CHTTP2_GOAWAY_LSI2, @@ -53,8 +52,7 @@ typedef enum GRPC_CHTTP2_GOAWAY_DEBUG } grpc_chttp2_goaway_parse_state; -typedef struct -{ +typedef struct { grpc_chttp2_goaway_parse_state state; gpr_uint32 last_stream_id; gpr_uint32 error_code; @@ -63,11 +61,17 @@ typedef struct gpr_uint32 debug_pos; } grpc_chttp2_goaway_parser; -void grpc_chttp2_goaway_parser_init (grpc_chttp2_goaway_parser * p); -void grpc_chttp2_goaway_parser_destroy (grpc_chttp2_goaway_parser * p); -grpc_chttp2_parse_error grpc_chttp2_goaway_parser_begin_frame (grpc_chttp2_goaway_parser * parser, gpr_uint32 length, gpr_uint8 flags); -grpc_chttp2_parse_error grpc_chttp2_goaway_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); +void grpc_chttp2_goaway_parser_init(grpc_chttp2_goaway_parser *p); +void grpc_chttp2_goaway_parser_destroy(grpc_chttp2_goaway_parser *p); +grpc_chttp2_parse_error grpc_chttp2_goaway_parser_begin_frame( + grpc_chttp2_goaway_parser *parser, gpr_uint32 length, gpr_uint8 flags); +grpc_chttp2_parse_error grpc_chttp2_goaway_parser_parse( + grpc_exec_ctx *exec_ctx, void *parser, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); -void grpc_chttp2_goaway_append (gpr_uint32 last_stream_id, gpr_uint32 error_code, gpr_slice debug_data, gpr_slice_buffer * slice_buffer); +void grpc_chttp2_goaway_append(gpr_uint32 last_stream_id, gpr_uint32 error_code, + gpr_slice debug_data, + gpr_slice_buffer *slice_buffer); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_GOAWAY_H */ diff --git a/src/core/transport/chttp2/frame_ping.c b/src/core/transport/chttp2/frame_ping.c index eaa086bd2b6..4d2c54269d5 100644 --- a/src/core/transport/chttp2/frame_ping.c +++ b/src/core/transport/chttp2/frame_ping.c @@ -39,11 +39,9 @@ #include #include -gpr_slice -grpc_chttp2_ping_create (gpr_uint8 ack, gpr_uint8 * opaque_8bytes) -{ - gpr_slice slice = gpr_slice_malloc (9 + 8); - gpr_uint8 *p = GPR_SLICE_START_PTR (slice); +gpr_slice grpc_chttp2_ping_create(gpr_uint8 ack, gpr_uint8 *opaque_8bytes) { + gpr_slice slice = gpr_slice_malloc(9 + 8); + gpr_uint8 *p = GPR_SLICE_START_PTR(slice); *p++ = 0; *p++ = 0; @@ -54,61 +52,55 @@ grpc_chttp2_ping_create (gpr_uint8 ack, gpr_uint8 * opaque_8bytes) *p++ = 0; *p++ = 0; *p++ = 0; - memcpy (p, opaque_8bytes, 8); + memcpy(p, opaque_8bytes, 8); return slice; } -grpc_chttp2_parse_error -grpc_chttp2_ping_parser_begin_frame (grpc_chttp2_ping_parser * parser, gpr_uint32 length, gpr_uint8 flags) -{ - if (flags & 0xfe || length != 8) - { - gpr_log (GPR_ERROR, "invalid ping: length=%d, flags=%02x", length, flags); - return GRPC_CHTTP2_CONNECTION_ERROR; - } +grpc_chttp2_parse_error grpc_chttp2_ping_parser_begin_frame( + grpc_chttp2_ping_parser *parser, gpr_uint32 length, gpr_uint8 flags) { + if (flags & 0xfe || length != 8) { + gpr_log(GPR_ERROR, "invalid ping: length=%d, flags=%02x", length, flags); + return GRPC_CHTTP2_CONNECTION_ERROR; + } parser->byte = 0; parser->is_ack = flags; return GRPC_CHTTP2_PARSE_OK; } -grpc_chttp2_parse_error -grpc_chttp2_ping_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) -{ - gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); - gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); +grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse( + grpc_exec_ctx *exec_ctx, void *parser, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { + gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); + gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; grpc_chttp2_ping_parser *p = parser; grpc_chttp2_outstanding_ping *ping; - while (p->byte != 8 && cur != end) - { - p->opaque_8bytes[p->byte] = *cur; - cur++; - p->byte++; - } + while (p->byte != 8 && cur != end) { + p->opaque_8bytes[p->byte] = *cur; + cur++; + p->byte++; + } - if (p->byte == 8) - { - GPR_ASSERT (is_last); - if (p->is_ack) - { - for (ping = transport_parsing->pings.next; ping != &transport_parsing->pings; ping = ping->next) - { - if (0 == memcmp (p->opaque_8bytes, ping->id, 8)) - { - grpc_exec_ctx_enqueue (exec_ctx, ping->on_recv, 1); - } - ping->next->prev = ping->prev; - ping->prev->next = ping->next; - gpr_free (ping); - } - } - else - { - gpr_slice_buffer_add (&transport_parsing->qbuf, grpc_chttp2_ping_create (1, p->opaque_8bytes)); - } + if (p->byte == 8) { + GPR_ASSERT(is_last); + if (p->is_ack) { + for (ping = transport_parsing->pings.next; + ping != &transport_parsing->pings; ping = ping->next) { + if (0 == memcmp(p->opaque_8bytes, ping->id, 8)) { + grpc_exec_ctx_enqueue(exec_ctx, ping->on_recv, 1); + } + ping->next->prev = ping->prev; + ping->prev->next = ping->next; + gpr_free(ping); + } + } else { + gpr_slice_buffer_add(&transport_parsing->qbuf, + grpc_chttp2_ping_create(1, p->opaque_8bytes)); } + } return GRPC_CHTTP2_PARSE_OK; } diff --git a/src/core/transport/chttp2/frame_ping.h b/src/core/transport/chttp2/frame_ping.h index 066573940a5..2c71d0d4915 100644 --- a/src/core/transport/chttp2/frame_ping.h +++ b/src/core/transport/chttp2/frame_ping.h @@ -38,16 +38,19 @@ #include #include "src/core/transport/chttp2/frame.h" -typedef struct -{ +typedef struct { gpr_uint8 byte; gpr_uint8 is_ack; gpr_uint8 opaque_8bytes[8]; } grpc_chttp2_ping_parser; -gpr_slice grpc_chttp2_ping_create (gpr_uint8 ack, gpr_uint8 * opaque_8bytes); +gpr_slice grpc_chttp2_ping_create(gpr_uint8 ack, gpr_uint8 *opaque_8bytes); -grpc_chttp2_parse_error grpc_chttp2_ping_parser_begin_frame (grpc_chttp2_ping_parser * parser, gpr_uint32 length, gpr_uint8 flags); -grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); +grpc_chttp2_parse_error grpc_chttp2_ping_parser_begin_frame( + grpc_chttp2_ping_parser *parser, gpr_uint32 length, gpr_uint8 flags); +grpc_chttp2_parse_error grpc_chttp2_ping_parser_parse( + grpc_exec_ctx *exec_ctx, void *parser, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_PING_H */ diff --git a/src/core/transport/chttp2/frame_rst_stream.c b/src/core/transport/chttp2/frame_rst_stream.c index 545d1b42b90..3cd5bcfc390 100644 --- a/src/core/transport/chttp2/frame_rst_stream.c +++ b/src/core/transport/chttp2/frame_rst_stream.c @@ -38,63 +38,63 @@ #include "src/core/transport/chttp2/frame.h" -gpr_slice -grpc_chttp2_rst_stream_create (gpr_uint32 id, gpr_uint32 code) -{ - gpr_slice slice = gpr_slice_malloc (13); - gpr_uint8 *p = GPR_SLICE_START_PTR (slice); +gpr_slice grpc_chttp2_rst_stream_create(gpr_uint32 id, gpr_uint32 code) { + gpr_slice slice = gpr_slice_malloc(13); + gpr_uint8 *p = GPR_SLICE_START_PTR(slice); *p++ = 0; *p++ = 0; *p++ = 4; *p++ = GRPC_CHTTP2_FRAME_RST_STREAM; *p++ = 0; - *p++ = (gpr_uint8) (id >> 24); - *p++ = (gpr_uint8) (id >> 16); - *p++ = (gpr_uint8) (id >> 8); - *p++ = (gpr_uint8) (id); - *p++ = (gpr_uint8) (code >> 24); - *p++ = (gpr_uint8) (code >> 16); - *p++ = (gpr_uint8) (code >> 8); - *p++ = (gpr_uint8) (code); + *p++ = (gpr_uint8)(id >> 24); + *p++ = (gpr_uint8)(id >> 16); + *p++ = (gpr_uint8)(id >> 8); + *p++ = (gpr_uint8)(id); + *p++ = (gpr_uint8)(code >> 24); + *p++ = (gpr_uint8)(code >> 16); + *p++ = (gpr_uint8)(code >> 8); + *p++ = (gpr_uint8)(code); return slice; } -grpc_chttp2_parse_error -grpc_chttp2_rst_stream_parser_begin_frame (grpc_chttp2_rst_stream_parser * parser, gpr_uint32 length, gpr_uint8 flags) -{ - if (length != 4) - { - gpr_log (GPR_ERROR, "invalid rst_stream: length=%d, flags=%02x", length, flags); - return GRPC_CHTTP2_CONNECTION_ERROR; - } +grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_begin_frame( + grpc_chttp2_rst_stream_parser *parser, gpr_uint32 length, gpr_uint8 flags) { + if (length != 4) { + gpr_log(GPR_ERROR, "invalid rst_stream: length=%d, flags=%02x", length, + flags); + return GRPC_CHTTP2_CONNECTION_ERROR; + } parser->byte = 0; return GRPC_CHTTP2_PARSE_OK; } -grpc_chttp2_parse_error -grpc_chttp2_rst_stream_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) -{ - gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); - gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); +grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_parse( + grpc_exec_ctx *exec_ctx, void *parser, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { + gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); + gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; grpc_chttp2_rst_stream_parser *p = parser; - while (p->byte != 4 && cur != end) - { - p->reason_bytes[p->byte] = *cur; - cur++; - p->byte++; - } + while (p->byte != 4 && cur != end) { + p->reason_bytes[p->byte] = *cur; + cur++; + p->byte++; + } - if (p->byte == 4) - { - GPR_ASSERT (is_last); - stream_parsing->received_close = 1; - stream_parsing->saw_rst_stream = 1; - stream_parsing->rst_stream_reason = (((gpr_uint32) p->reason_bytes[0]) << 24) | (((gpr_uint32) p->reason_bytes[1]) << 16) | (((gpr_uint32) p->reason_bytes[2]) << 8) | (((gpr_uint32) p->reason_bytes[3])); - } + if (p->byte == 4) { + GPR_ASSERT(is_last); + stream_parsing->received_close = 1; + stream_parsing->saw_rst_stream = 1; + stream_parsing->rst_stream_reason = + (((gpr_uint32)p->reason_bytes[0]) << 24) | + (((gpr_uint32)p->reason_bytes[1]) << 16) | + (((gpr_uint32)p->reason_bytes[2]) << 8) | + (((gpr_uint32)p->reason_bytes[3])); + } return GRPC_CHTTP2_PARSE_OK; } diff --git a/src/core/transport/chttp2/frame_rst_stream.h b/src/core/transport/chttp2/frame_rst_stream.h index b222e70861d..92cb77c971d 100644 --- a/src/core/transport/chttp2/frame_rst_stream.h +++ b/src/core/transport/chttp2/frame_rst_stream.h @@ -38,15 +38,18 @@ #include "src/core/transport/chttp2/frame.h" #include "src/core/iomgr/exec_ctx.h" -typedef struct -{ +typedef struct { gpr_uint8 byte; gpr_uint8 reason_bytes[4]; } grpc_chttp2_rst_stream_parser; -gpr_slice grpc_chttp2_rst_stream_create (gpr_uint32 stream_id, gpr_uint32 code); +gpr_slice grpc_chttp2_rst_stream_create(gpr_uint32 stream_id, gpr_uint32 code); -grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_begin_frame (grpc_chttp2_rst_stream_parser * parser, gpr_uint32 length, gpr_uint8 flags); -grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); +grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_begin_frame( + grpc_chttp2_rst_stream_parser *parser, gpr_uint32 length, gpr_uint8 flags); +grpc_chttp2_parse_error grpc_chttp2_rst_stream_parser_parse( + grpc_exec_ctx *exec_ctx, void *parser, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_RST_STREAM_H */ diff --git a/src/core/transport/chttp2/frame_settings.c b/src/core/transport/chttp2/frame_settings.c index 4b6204e6ea4..395a2da452e 100644 --- a/src/core/transport/chttp2/frame_settings.c +++ b/src/core/transport/chttp2/frame_settings.c @@ -43,27 +43,27 @@ #include /* HTTP/2 mandated initial connection settings */ -const grpc_chttp2_setting_parameters grpc_chttp2_settings_parameters[GRPC_CHTTP2_NUM_SETTINGS] = { - {NULL, 0, 0, 0, GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, - {"HEADER_TABLE_SIZE", 4096, 0, 0xffffffff, - GRPC_CHTTP2_CLAMP_INVALID_VALUE}, - {"ENABLE_PUSH", 1, 0, 1, GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, - {"MAX_CONCURRENT_STREAMS", 0xffffffffu, 0, 0xffffffffu, - GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, - {"INITIAL_WINDOW_SIZE", 65535, 0, 0xffffffffu, - GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, - {"MAX_FRAME_SIZE", 16384, 16384, 16777215, - GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, - {"MAX_HEADER_LIST_SIZE", 0xffffffffu, 0, 0xffffffffu, - GRPC_CHTTP2_CLAMP_INVALID_VALUE}, +const grpc_chttp2_setting_parameters + grpc_chttp2_settings_parameters[GRPC_CHTTP2_NUM_SETTINGS] = { + {NULL, 0, 0, 0, GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, + {"HEADER_TABLE_SIZE", 4096, 0, 0xffffffff, + GRPC_CHTTP2_CLAMP_INVALID_VALUE}, + {"ENABLE_PUSH", 1, 0, 1, GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, + {"MAX_CONCURRENT_STREAMS", 0xffffffffu, 0, 0xffffffffu, + GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, + {"INITIAL_WINDOW_SIZE", 65535, 0, 0xffffffffu, + GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, + {"MAX_FRAME_SIZE", 16384, 16384, 16777215, + GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE}, + {"MAX_HEADER_LIST_SIZE", 0xffffffffu, 0, 0xffffffffu, + GRPC_CHTTP2_CLAMP_INVALID_VALUE}, }; -static gpr_uint8 * -fill_header (gpr_uint8 * out, gpr_uint32 length, gpr_uint8 flags) -{ - *out++ = (gpr_uint8) (length >> 16); - *out++ = (gpr_uint8) (length >> 8); - *out++ = (gpr_uint8) (length); +static gpr_uint8 *fill_header(gpr_uint8 *out, gpr_uint32 length, + gpr_uint8 flags) { + *out++ = (gpr_uint8)(length >> 16); + *out++ = (gpr_uint8)(length >> 8); + *out++ = (gpr_uint8)(length); *out++ = GRPC_CHTTP2_FRAME_SETTINGS; *out++ = flags; *out++ = 0; @@ -73,194 +73,175 @@ fill_header (gpr_uint8 * out, gpr_uint32 length, gpr_uint8 flags) return out; } -gpr_slice -grpc_chttp2_settings_create (gpr_uint32 * old, const gpr_uint32 * new, gpr_uint32 force_mask, size_t count) -{ +gpr_slice grpc_chttp2_settings_create(gpr_uint32 *old, const gpr_uint32 *new, + gpr_uint32 force_mask, size_t count) { size_t i; gpr_uint32 n = 0; gpr_slice output; gpr_uint8 *p; - for (i = 0; i < count; i++) - { - n += (new[i] != old[i] || (force_mask & (1u << i)) != 0); + for (i = 0; i < count; i++) { + n += (new[i] != old[i] || (force_mask & (1u << i)) != 0); + } + + output = gpr_slice_malloc(9 + 6 * n); + p = fill_header(GPR_SLICE_START_PTR(output), 6 * n, 0); + + for (i = 0; i < count; i++) { + if (new[i] != old[i] || (force_mask & (1u << i)) != 0) { + GPR_ASSERT(i); + *p++ = (gpr_uint8)(i >> 8); + *p++ = (gpr_uint8)(i); + *p++ = (gpr_uint8)(new[i] >> 24); + *p++ = (gpr_uint8)(new[i] >> 16); + *p++ = (gpr_uint8)(new[i] >> 8); + *p++ = (gpr_uint8)(new[i]); + old[i] = new[i]; } + } - output = gpr_slice_malloc (9 + 6 * n); - p = fill_header (GPR_SLICE_START_PTR (output), 6 * n, 0); - - for (i = 0; i < count; i++) - { - if (new[i] != old[i] || (force_mask & (1u << i)) != 0) - { - GPR_ASSERT (i); - *p++ = (gpr_uint8) (i >> 8); - *p++ = (gpr_uint8) (i); - *p++ = (gpr_uint8) (new[i] >> 24); - *p++ = (gpr_uint8) (new[i] >> 16); - *p++ = (gpr_uint8) (new[i] >> 8); - *p++ = (gpr_uint8) (new[i]); - old[i] = new[i]; - } - } - - GPR_ASSERT (p == GPR_SLICE_END_PTR (output)); + GPR_ASSERT(p == GPR_SLICE_END_PTR(output)); return output; } -gpr_slice -grpc_chttp2_settings_ack_create (void) -{ - gpr_slice output = gpr_slice_malloc (9); - fill_header (GPR_SLICE_START_PTR (output), 0, GRPC_CHTTP2_FLAG_ACK); +gpr_slice grpc_chttp2_settings_ack_create(void) { + gpr_slice output = gpr_slice_malloc(9); + fill_header(GPR_SLICE_START_PTR(output), 0, GRPC_CHTTP2_FLAG_ACK); return output; } -grpc_chttp2_parse_error -grpc_chttp2_settings_parser_begin_frame (grpc_chttp2_settings_parser * parser, gpr_uint32 length, gpr_uint8 flags, gpr_uint32 * settings) -{ +grpc_chttp2_parse_error grpc_chttp2_settings_parser_begin_frame( + grpc_chttp2_settings_parser *parser, gpr_uint32 length, gpr_uint8 flags, + gpr_uint32 *settings) { parser->target_settings = settings; - memcpy (parser->incoming_settings, settings, GRPC_CHTTP2_NUM_SETTINGS * sizeof (gpr_uint32)); + memcpy(parser->incoming_settings, settings, + GRPC_CHTTP2_NUM_SETTINGS * sizeof(gpr_uint32)); parser->is_ack = 0; parser->state = GRPC_CHTTP2_SPS_ID0; - if (flags == GRPC_CHTTP2_FLAG_ACK) - { - parser->is_ack = 1; - if (length != 0) - { - gpr_log (GPR_ERROR, "non-empty settings ack frame received"); - return GRPC_CHTTP2_CONNECTION_ERROR; - } - return GRPC_CHTTP2_PARSE_OK; - } - else if (flags != 0) - { - gpr_log (GPR_ERROR, "invalid flags on settings frame"); - return GRPC_CHTTP2_CONNECTION_ERROR; - } - else if (length % 6 != 0) - { - gpr_log (GPR_ERROR, "settings frames must be a multiple of six bytes"); + if (flags == GRPC_CHTTP2_FLAG_ACK) { + parser->is_ack = 1; + if (length != 0) { + gpr_log(GPR_ERROR, "non-empty settings ack frame received"); return GRPC_CHTTP2_CONNECTION_ERROR; } - else - { - return GRPC_CHTTP2_PARSE_OK; - } + return GRPC_CHTTP2_PARSE_OK; + } else if (flags != 0) { + gpr_log(GPR_ERROR, "invalid flags on settings frame"); + return GRPC_CHTTP2_CONNECTION_ERROR; + } else if (length % 6 != 0) { + gpr_log(GPR_ERROR, "settings frames must be a multiple of six bytes"); + return GRPC_CHTTP2_CONNECTION_ERROR; + } else { + return GRPC_CHTTP2_PARSE_OK; + } } -grpc_chttp2_parse_error -grpc_chttp2_settings_parser_parse (grpc_exec_ctx * exec_ctx, void *p, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) -{ +grpc_chttp2_parse_error grpc_chttp2_settings_parser_parse( + grpc_exec_ctx *exec_ctx, void *p, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { grpc_chttp2_settings_parser *parser = p; - const gpr_uint8 *cur = GPR_SLICE_START_PTR (slice); - const gpr_uint8 *end = GPR_SLICE_END_PTR (slice); - - if (parser->is_ack) - { - return GRPC_CHTTP2_PARSE_OK; - } - - for (;;) - { - switch (parser->state) - { - case GRPC_CHTTP2_SPS_ID0: - if (cur == end) - { - parser->state = GRPC_CHTTP2_SPS_ID0; - if (is_last) - { - transport_parsing->settings_updated = 1; - memcpy (parser->target_settings, parser->incoming_settings, GRPC_CHTTP2_NUM_SETTINGS * sizeof (gpr_uint32)); - gpr_slice_buffer_add (&transport_parsing->qbuf, grpc_chttp2_settings_ack_create ()); - } - return GRPC_CHTTP2_PARSE_OK; - } - parser->id = (gpr_uint16) (((gpr_uint16) * cur) << 8); - cur++; - /* fallthrough */ - case GRPC_CHTTP2_SPS_ID1: - if (cur == end) - { - parser->state = GRPC_CHTTP2_SPS_ID1; - return GRPC_CHTTP2_PARSE_OK; - } - parser->id = (gpr_uint16) (parser->id | (*cur)); - cur++; - /* fallthrough */ - case GRPC_CHTTP2_SPS_VAL0: - if (cur == end) - { - parser->state = GRPC_CHTTP2_SPS_VAL0; - return GRPC_CHTTP2_PARSE_OK; - } - parser->value = ((gpr_uint32) * cur) << 24; - cur++; - /* fallthrough */ - case GRPC_CHTTP2_SPS_VAL1: - if (cur == end) - { - parser->state = GRPC_CHTTP2_SPS_VAL1; - return GRPC_CHTTP2_PARSE_OK; - } - parser->value |= ((gpr_uint32) * cur) << 16; - cur++; - /* fallthrough */ - case GRPC_CHTTP2_SPS_VAL2: - if (cur == end) - { - parser->state = GRPC_CHTTP2_SPS_VAL2; - return GRPC_CHTTP2_PARSE_OK; - } - parser->value |= ((gpr_uint32) * cur) << 8; - cur++; - /* fallthrough */ - case GRPC_CHTTP2_SPS_VAL3: - if (cur == end) - { - parser->state = GRPC_CHTTP2_SPS_VAL3; - return GRPC_CHTTP2_PARSE_OK; - } - else - { - parser->state = GRPC_CHTTP2_SPS_ID0; - } - parser->value |= *cur; - cur++; - - if (parser->id > 0 && parser->id < GRPC_CHTTP2_NUM_SETTINGS) - { - const grpc_chttp2_setting_parameters *sp = &grpc_chttp2_settings_parameters[parser->id]; - if (parser->value < sp->min_value || parser->value > sp->max_value) - { - switch (sp->invalid_value_behavior) - { - case GRPC_CHTTP2_CLAMP_INVALID_VALUE: - parser->value = GPR_CLAMP (parser->value, sp->min_value, sp->max_value); - break; - case GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE: - gpr_log (GPR_ERROR, "invalid value %u passed for %s", parser->value, sp->name); - return GRPC_CHTTP2_CONNECTION_ERROR; - } - } - if (parser->id == GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE && parser->incoming_settings[parser->id] != parser->value) - { - transport_parsing->initial_window_update = (gpr_int64) parser->value - parser->incoming_settings[parser->id]; - gpr_log (GPR_DEBUG, "adding %d for initial_window change", (int) transport_parsing->initial_window_update); - } - parser->incoming_settings[parser->id] = parser->value; - if (grpc_http_trace) - { - gpr_log (GPR_DEBUG, "CHTTP2:%s: got setting %d = %d", transport_parsing->is_client ? "CLI" : "SVR", parser->id, parser->value); - } - } - else - { - gpr_log (GPR_ERROR, "CHTTP2: Ignoring unknown setting %d (value %d)", parser->id, parser->value); - } - break; - } + const gpr_uint8 *cur = GPR_SLICE_START_PTR(slice); + const gpr_uint8 *end = GPR_SLICE_END_PTR(slice); + + if (parser->is_ack) { + return GRPC_CHTTP2_PARSE_OK; + } + + for (;;) { + switch (parser->state) { + case GRPC_CHTTP2_SPS_ID0: + if (cur == end) { + parser->state = GRPC_CHTTP2_SPS_ID0; + if (is_last) { + transport_parsing->settings_updated = 1; + memcpy(parser->target_settings, parser->incoming_settings, + GRPC_CHTTP2_NUM_SETTINGS * sizeof(gpr_uint32)); + gpr_slice_buffer_add(&transport_parsing->qbuf, + grpc_chttp2_settings_ack_create()); + } + return GRPC_CHTTP2_PARSE_OK; + } + parser->id = (gpr_uint16)(((gpr_uint16)*cur) << 8); + cur++; + /* fallthrough */ + case GRPC_CHTTP2_SPS_ID1: + if (cur == end) { + parser->state = GRPC_CHTTP2_SPS_ID1; + return GRPC_CHTTP2_PARSE_OK; + } + parser->id = (gpr_uint16)(parser->id | (*cur)); + cur++; + /* fallthrough */ + case GRPC_CHTTP2_SPS_VAL0: + if (cur == end) { + parser->state = GRPC_CHTTP2_SPS_VAL0; + return GRPC_CHTTP2_PARSE_OK; + } + parser->value = ((gpr_uint32)*cur) << 24; + cur++; + /* fallthrough */ + case GRPC_CHTTP2_SPS_VAL1: + if (cur == end) { + parser->state = GRPC_CHTTP2_SPS_VAL1; + return GRPC_CHTTP2_PARSE_OK; + } + parser->value |= ((gpr_uint32)*cur) << 16; + cur++; + /* fallthrough */ + case GRPC_CHTTP2_SPS_VAL2: + if (cur == end) { + parser->state = GRPC_CHTTP2_SPS_VAL2; + return GRPC_CHTTP2_PARSE_OK; + } + parser->value |= ((gpr_uint32)*cur) << 8; + cur++; + /* fallthrough */ + case GRPC_CHTTP2_SPS_VAL3: + if (cur == end) { + parser->state = GRPC_CHTTP2_SPS_VAL3; + return GRPC_CHTTP2_PARSE_OK; + } else { + parser->state = GRPC_CHTTP2_SPS_ID0; + } + parser->value |= *cur; + cur++; + + if (parser->id > 0 && parser->id < GRPC_CHTTP2_NUM_SETTINGS) { + const grpc_chttp2_setting_parameters *sp = + &grpc_chttp2_settings_parameters[parser->id]; + if (parser->value < sp->min_value || parser->value > sp->max_value) { + switch (sp->invalid_value_behavior) { + case GRPC_CHTTP2_CLAMP_INVALID_VALUE: + parser->value = + GPR_CLAMP(parser->value, sp->min_value, sp->max_value); + break; + case GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE: + gpr_log(GPR_ERROR, "invalid value %u passed for %s", + parser->value, sp->name); + return GRPC_CHTTP2_CONNECTION_ERROR; + } + } + if (parser->id == GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE && + parser->incoming_settings[parser->id] != parser->value) { + transport_parsing->initial_window_update = + (gpr_int64)parser->value - + parser->incoming_settings[parser->id]; + gpr_log(GPR_DEBUG, "adding %d for initial_window change", + (int)transport_parsing->initial_window_update); + } + parser->incoming_settings[parser->id] = parser->value; + if (grpc_http_trace) { + gpr_log(GPR_DEBUG, "CHTTP2:%s: got setting %d = %d", + transport_parsing->is_client ? "CLI" : "SVR", parser->id, + parser->value); + } + } else { + gpr_log(GPR_ERROR, "CHTTP2: Ignoring unknown setting %d (value %d)", + parser->id, parser->value); + } + break; } + } } diff --git a/src/core/transport/chttp2/frame_settings.h b/src/core/transport/chttp2/frame_settings.h index 3c57e3ae899..cf857dd602a 100644 --- a/src/core/transport/chttp2/frame_settings.h +++ b/src/core/transport/chttp2/frame_settings.h @@ -39,8 +39,7 @@ #include "src/core/transport/chttp2/frame.h" #include "src/core/iomgr/exec_ctx.h" -typedef enum -{ +typedef enum { GRPC_CHTTP2_SPS_ID0, GRPC_CHTTP2_SPS_ID1, GRPC_CHTTP2_SPS_VAL0, @@ -50,8 +49,7 @@ typedef enum } grpc_chttp2_settings_parse_state; /* The things HTTP/2 defines as connection level settings */ -typedef enum -{ +typedef enum { GRPC_CHTTP2_SETTINGS_HEADER_TABLE_SIZE = 1, GRPC_CHTTP2_SETTINGS_ENABLE_PUSH = 2, GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS = 3, @@ -61,8 +59,7 @@ typedef enum GRPC_CHTTP2_NUM_SETTINGS } grpc_chttp2_setting_id; -typedef struct -{ +typedef struct { grpc_chttp2_settings_parse_state state; gpr_uint32 *target_settings; gpr_uint8 is_ack; @@ -71,14 +68,12 @@ typedef struct gpr_uint32 incoming_settings[GRPC_CHTTP2_NUM_SETTINGS]; } grpc_chttp2_settings_parser; -typedef enum -{ +typedef enum { GRPC_CHTTP2_CLAMP_INVALID_VALUE, GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE } grpc_chttp2_invalid_value_behavior; -typedef struct -{ +typedef struct { const char *name; gpr_uint32 default_value; gpr_uint32 min_value; @@ -87,14 +82,21 @@ typedef struct } grpc_chttp2_setting_parameters; /* HTTP/2 mandated connection setting parameters */ -extern const grpc_chttp2_setting_parameters grpc_chttp2_settings_parameters[GRPC_CHTTP2_NUM_SETTINGS]; +extern const grpc_chttp2_setting_parameters + grpc_chttp2_settings_parameters[GRPC_CHTTP2_NUM_SETTINGS]; /* Create a settings frame by diffing old & new, and updating old to be new */ -gpr_slice grpc_chttp2_settings_create (gpr_uint32 * old, const gpr_uint32 * new, gpr_uint32 force_mask, size_t count); +gpr_slice grpc_chttp2_settings_create(gpr_uint32 *old, const gpr_uint32 *new, + gpr_uint32 force_mask, size_t count); /* Create an ack settings frame */ -gpr_slice grpc_chttp2_settings_ack_create (void); +gpr_slice grpc_chttp2_settings_ack_create(void); -grpc_chttp2_parse_error grpc_chttp2_settings_parser_begin_frame (grpc_chttp2_settings_parser * parser, gpr_uint32 length, gpr_uint8 flags, gpr_uint32 * settings); -grpc_chttp2_parse_error grpc_chttp2_settings_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); +grpc_chttp2_parse_error grpc_chttp2_settings_parser_begin_frame( + grpc_chttp2_settings_parser *parser, gpr_uint32 length, gpr_uint8 flags, + gpr_uint32 *settings); +grpc_chttp2_parse_error grpc_chttp2_settings_parser_parse( + grpc_exec_ctx *exec_ctx, void *parser, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_SETTINGS_H */ diff --git a/src/core/transport/chttp2/frame_window_update.c b/src/core/transport/chttp2/frame_window_update.c index 81f2ce2b52e..91bbcfe2c10 100644 --- a/src/core/transport/chttp2/frame_window_update.c +++ b/src/core/transport/chttp2/frame_window_update.c @@ -36,83 +36,80 @@ #include -gpr_slice -grpc_chttp2_window_update_create (gpr_uint32 id, gpr_uint32 window_update) -{ - gpr_slice slice = gpr_slice_malloc (13); - gpr_uint8 *p = GPR_SLICE_START_PTR (slice); +gpr_slice grpc_chttp2_window_update_create(gpr_uint32 id, + gpr_uint32 window_update) { + gpr_slice slice = gpr_slice_malloc(13); + gpr_uint8 *p = GPR_SLICE_START_PTR(slice); - GPR_ASSERT (window_update); + GPR_ASSERT(window_update); *p++ = 0; *p++ = 0; *p++ = 4; *p++ = GRPC_CHTTP2_FRAME_WINDOW_UPDATE; *p++ = 0; - *p++ = (gpr_uint8) (id >> 24); - *p++ = (gpr_uint8) (id >> 16); - *p++ = (gpr_uint8) (id >> 8); - *p++ = (gpr_uint8) (id); - *p++ = (gpr_uint8) (window_update >> 24); - *p++ = (gpr_uint8) (window_update >> 16); - *p++ = (gpr_uint8) (window_update >> 8); - *p++ = (gpr_uint8) (window_update); + *p++ = (gpr_uint8)(id >> 24); + *p++ = (gpr_uint8)(id >> 16); + *p++ = (gpr_uint8)(id >> 8); + *p++ = (gpr_uint8)(id); + *p++ = (gpr_uint8)(window_update >> 24); + *p++ = (gpr_uint8)(window_update >> 16); + *p++ = (gpr_uint8)(window_update >> 8); + *p++ = (gpr_uint8)(window_update); return slice; } -grpc_chttp2_parse_error -grpc_chttp2_window_update_parser_begin_frame (grpc_chttp2_window_update_parser * parser, gpr_uint32 length, gpr_uint8 flags) -{ - if (flags || length != 4) - { - gpr_log (GPR_ERROR, "invalid window update: length=%d, flags=%02x", length, flags); - return GRPC_CHTTP2_CONNECTION_ERROR; - } +grpc_chttp2_parse_error grpc_chttp2_window_update_parser_begin_frame( + grpc_chttp2_window_update_parser *parser, gpr_uint32 length, + gpr_uint8 flags) { + if (flags || length != 4) { + gpr_log(GPR_ERROR, "invalid window update: length=%d, flags=%02x", length, + flags); + return GRPC_CHTTP2_CONNECTION_ERROR; + } parser->byte = 0; parser->amount = 0; return GRPC_CHTTP2_PARSE_OK; } -grpc_chttp2_parse_error -grpc_chttp2_window_update_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) -{ - gpr_uint8 *const beg = GPR_SLICE_START_PTR (slice); - gpr_uint8 *const end = GPR_SLICE_END_PTR (slice); +grpc_chttp2_parse_error grpc_chttp2_window_update_parser_parse( + grpc_exec_ctx *exec_ctx, void *parser, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { + gpr_uint8 *const beg = GPR_SLICE_START_PTR(slice); + gpr_uint8 *const end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; grpc_chttp2_window_update_parser *p = parser; - while (p->byte != 4 && cur != end) - { - p->amount |= ((gpr_uint32) * cur) << (8 * (3 - p->byte)); - cur++; - p->byte++; - } + while (p->byte != 4 && cur != end) { + p->amount |= ((gpr_uint32)*cur) << (8 * (3 - p->byte)); + cur++; + p->byte++; + } - if (p->byte == 4) - { - if (p->amount == 0 || (p->amount & 0x80000000u)) - { - gpr_log (GPR_ERROR, "invalid window update bytes: %d", p->amount); - return GRPC_CHTTP2_CONNECTION_ERROR; - } - GPR_ASSERT (is_last); + if (p->byte == 4) { + if (p->amount == 0 || (p->amount & 0x80000000u)) { + gpr_log(GPR_ERROR, "invalid window update bytes: %d", p->amount); + return GRPC_CHTTP2_CONNECTION_ERROR; + } + GPR_ASSERT(is_last); - if (transport_parsing->incoming_stream_id != 0) - { - if (stream_parsing != NULL) - { - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("update", transport_parsing, stream_parsing, outgoing_window_update, p->amount); - stream_parsing->outgoing_window_update += p->amount; - grpc_chttp2_list_add_parsing_seen_stream (transport_parsing, stream_parsing); - } - } - else - { - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("update", transport_parsing, outgoing_window_update, p->amount); - transport_parsing->outgoing_window_update += p->amount; - } + if (transport_parsing->incoming_stream_id != 0) { + if (stream_parsing != NULL) { + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM("update", transport_parsing, + stream_parsing, outgoing_window_update, + p->amount); + stream_parsing->outgoing_window_update += p->amount; + grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, + stream_parsing); + } + } else { + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT("update", transport_parsing, + outgoing_window_update, p->amount); + transport_parsing->outgoing_window_update += p->amount; } + } return GRPC_CHTTP2_PARSE_OK; } diff --git a/src/core/transport/chttp2/frame_window_update.h b/src/core/transport/chttp2/frame_window_update.h index b6b61e89871..fc074092ffb 100644 --- a/src/core/transport/chttp2/frame_window_update.h +++ b/src/core/transport/chttp2/frame_window_update.h @@ -38,16 +38,21 @@ #include #include "src/core/transport/chttp2/frame.h" -typedef struct -{ +typedef struct { gpr_uint8 byte; gpr_uint8 is_connection_update; gpr_uint32 amount; } grpc_chttp2_window_update_parser; -gpr_slice grpc_chttp2_window_update_create (gpr_uint32 id, gpr_uint32 window_delta); +gpr_slice grpc_chttp2_window_update_create(gpr_uint32 id, + gpr_uint32 window_delta); -grpc_chttp2_parse_error grpc_chttp2_window_update_parser_begin_frame (grpc_chttp2_window_update_parser * parser, gpr_uint32 length, gpr_uint8 flags); -grpc_chttp2_parse_error grpc_chttp2_window_update_parser_parse (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); +grpc_chttp2_parse_error grpc_chttp2_window_update_parser_begin_frame( + grpc_chttp2_window_update_parser *parser, gpr_uint32 length, + gpr_uint8 flags); +grpc_chttp2_parse_error grpc_chttp2_window_update_parser_parse( + grpc_exec_ctx *exec_ctx, void *parser, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_FRAME_WINDOW_UPDATE_H */ diff --git a/src/core/transport/chttp2/hpack_parser.c b/src/core/transport/chttp2/hpack_parser.c index 0d19a577cc7..3b0a5e7207c 100644 --- a/src/core/transport/chttp2/hpack_parser.c +++ b/src/core/transport/chttp2/hpack_parser.c @@ -45,8 +45,7 @@ #include #include -typedef enum -{ +typedef enum { NOT_BINARY, B64_BYTE0, B64_BYTE1, @@ -69,34 +68,61 @@ typedef enum a set of indirect jumps, and so not waste stack space. */ /* forward declarations for parsing states */ -static int parse_begin (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_error (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); - -static int parse_string_prefix (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_key_string (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_value_string_with_indexed_key (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_value_string_with_literal_key (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); - -static int parse_value0 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_value1 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_value2 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_value3 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_value4 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_value5up (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); - -static int parse_indexed_field (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_indexed_field_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_lithdr_incidx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_lithdr_incidx_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_lithdr_incidx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_lithdr_notidx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_lithdr_notidx_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_lithdr_notidx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_lithdr_nvridx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_lithdr_nvridx_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_lithdr_nvridx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_max_tbl_size (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); -static int parse_max_tbl_size_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end); +static int parse_begin(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end); +static int parse_error(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end); + +static int parse_string_prefix(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end); +static int parse_key_string(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end); +static int parse_value_string_with_indexed_key(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, + const gpr_uint8 *end); +static int parse_value_string_with_literal_key(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, + const gpr_uint8 *end); + +static int parse_value0(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end); +static int parse_value1(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end); +static int parse_value2(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end); +static int parse_value3(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end); +static int parse_value4(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end); +static int parse_value5up(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end); + +static int parse_indexed_field(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end); +static int parse_indexed_field_x(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end); +static int parse_lithdr_incidx(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end); +static int parse_lithdr_incidx_x(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end); +static int parse_lithdr_incidx_v(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end); +static int parse_lithdr_notidx(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end); +static int parse_lithdr_notidx_x(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end); +static int parse_lithdr_notidx_v(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end); +static int parse_lithdr_nvridx(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end); +static int parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end); +static int parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end); +static int parse_max_tbl_size(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end); +static int parse_max_tbl_size_x(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end); /* we translate the first byte of a hpack field into one of these decoding cases, then use a lookup table to jump directly to the appropriate parser. @@ -104,8 +130,7 @@ static int parse_max_tbl_size_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * _X => the integer index is all ones, meaning we need to do varint decoding _V => the integer index is all zeros, meaning we need to decode an additional string value */ -typedef enum -{ +typedef enum { INDEXED_FIELD, INDEXED_FIELD_X, LITHDR_INCIDX, @@ -125,82 +150,81 @@ typedef enum /* jump table of parse state functions -- order must match first_byte_type above */ static const grpc_chttp2_hpack_parser_state first_byte_action[] = { - parse_indexed_field, parse_indexed_field_x, - parse_lithdr_incidx, parse_lithdr_incidx_x, - parse_lithdr_incidx_v, parse_lithdr_notidx, - parse_lithdr_notidx_x, parse_lithdr_notidx_v, - parse_lithdr_nvridx, parse_lithdr_nvridx_x, - parse_lithdr_nvridx_v, parse_max_tbl_size, - parse_max_tbl_size_x, parse_error -}; + parse_indexed_field, parse_indexed_field_x, + parse_lithdr_incidx, parse_lithdr_incidx_x, + parse_lithdr_incidx_v, parse_lithdr_notidx, + parse_lithdr_notidx_x, parse_lithdr_notidx_v, + parse_lithdr_nvridx, parse_lithdr_nvridx_x, + parse_lithdr_nvridx_v, parse_max_tbl_size, + parse_max_tbl_size_x, parse_error}; /* indexes the first byte to a parse state function - generated by gen_hpack_tables.c */ static const gpr_uint8 first_byte_lut[256] = { - LITHDR_NOTIDX_V, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, - LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, - LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, - LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX_X, - LITHDR_NVRIDX_V, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, - LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, - LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, - LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX_X, - ILLEGAL, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, - MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, - MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, - MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, - MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, - MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, - MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, - MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE_X, - LITHDR_INCIDX_V, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, - LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX_X, - ILLEGAL, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, - INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD_X, + LITHDR_NOTIDX_V, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, + LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, + LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, + LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX, LITHDR_NOTIDX_X, + LITHDR_NVRIDX_V, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, + LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, + LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, + LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX, LITHDR_NVRIDX_X, + ILLEGAL, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, + MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, + MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, + MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, + MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, + MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, + MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, + MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE, MAX_TBL_SIZE_X, + LITHDR_INCIDX_V, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, + LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX, LITHDR_INCIDX_X, + ILLEGAL, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, + INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD, INDEXED_FIELD_X, }; /* state table for huffman decoding: given a state, gives an index/16 into @@ -209,76 +233,76 @@ static const gpr_uint8 first_byte_lut[256] = { generated by gen_hpack_tables.c */ static const gpr_uint8 next_tbl[256] = { - 0, 1, 2, 3, 4, 1, 2, 5, 6, 1, 7, 8, 1, 3, 3, 9, 10, 11, 1, 1, - 1, 12, 1, 2, 13, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 14, 1, 15, 16, 1, 17, 1, 15, 2, 7, 3, 18, 19, 1, 1, 1, 1, 20, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 15, 2, 2, 7, 21, 1, 22, 1, 1, 1, 1, 1, - 1, 1, 1, 15, 2, 2, 2, 2, 2, 2, 23, 24, 25, 1, 1, 1, 1, 2, 2, 2, - 26, 3, 3, 27, 10, 28, 1, 1, 1, 1, 1, 1, 2, 3, 29, 10, 30, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 31, 1, 1, 1, 1, 1, 1, 1, 2, - 2, 2, 2, 2, 2, 2, 2, 32, 1, 1, 15, 33, 1, 34, 35, 9, 36, 1, 1, 1, - 1, 1, 1, 1, 37, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 26, 9, - 38, 1, 1, 1, 1, 1, 1, 1, 15, 2, 2, 2, 2, 26, 3, 3, 39, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 7, 3, 3, 3, 40, 2, - 41, 1, 1, 1, 42, 43, 1, 1, 44, 1, 1, 1, 1, 15, 2, 2, 2, 2, 2, 2, - 3, 3, 3, 45, 46, 1, 1, 2, 2, 2, 35, 3, 3, 18, 47, 2, + 0, 1, 2, 3, 4, 1, 2, 5, 6, 1, 7, 8, 1, 3, 3, 9, 10, 11, 1, 1, + 1, 12, 1, 2, 13, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 14, 1, 15, 16, 1, 17, 1, 15, 2, 7, 3, 18, 19, 1, 1, 1, 1, 20, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 15, 2, 2, 7, 21, 1, 22, 1, 1, 1, 1, 1, + 1, 1, 1, 15, 2, 2, 2, 2, 2, 2, 23, 24, 25, 1, 1, 1, 1, 2, 2, 2, + 26, 3, 3, 27, 10, 28, 1, 1, 1, 1, 1, 1, 2, 3, 29, 10, 30, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 31, 1, 1, 1, 1, 1, 1, 1, 2, + 2, 2, 2, 2, 2, 2, 2, 32, 1, 1, 15, 33, 1, 34, 35, 9, 36, 1, 1, 1, + 1, 1, 1, 1, 37, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 26, 9, + 38, 1, 1, 1, 1, 1, 1, 1, 15, 2, 2, 2, 2, 26, 3, 3, 39, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 7, 3, 3, 3, 40, 2, + 41, 1, 1, 1, 42, 43, 1, 1, 44, 1, 1, 1, 1, 15, 2, 2, 2, 2, 2, 2, + 3, 3, 3, 45, 46, 1, 1, 2, 2, 2, 35, 3, 3, 18, 47, 2, }; /* next state, based upon current state and the current nibble: see above. generated by gen_hpack_tables.c */ static const gpr_int16 next_sub_tbl[48 * 16] = { - 1, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, - 218, 2, 6, 10, 13, 14, 15, 16, 17, 2, 6, 10, 13, 14, 15, - 16, 17, 3, 7, 11, 24, 3, 7, 11, 24, 3, 7, 11, 24, 3, - 7, 11, 24, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, - 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, - 199, 200, 201, 202, 203, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 9, 133, 134, 135, 136, 137, 138, 139, 140, - 141, 142, 143, 144, 145, 146, 147, 3, 7, 11, 24, 3, 7, 11, 24, - 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 12, 132, 4, 8, 4, 8, 4, 8, - 4, 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 18, 19, 20, 21, 4, 8, 4, - 8, 4, 8, 4, 8, 4, 8, 0, 0, 0, 22, 23, 91, 25, 26, - 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 3, - 7, 11, 24, 3, 7, 11, 24, 0, 0, 0, 0, 0, 41, 42, 43, - 2, 6, 10, 13, 14, 15, 16, 17, 3, 7, 11, 24, 3, 7, 11, - 24, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, - 44, 45, 2, 6, 10, 13, 14, 15, 16, 17, 46, 47, 48, 49, 50, - 51, 52, 57, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 53, 54, 55, 56, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 73, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 88, 89, 90, 3, 7, 11, 24, 3, 7, 11, - 24, 3, 7, 11, 24, 0, 0, 0, 0, 3, 7, 11, 24, 3, 7, - 11, 24, 4, 8, 4, 8, 0, 0, 0, 92, 0, 0, 0, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 3, 7, 11, 24, - 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, - 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 4, - 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, - 0, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, - 131, 2, 6, 10, 13, 14, 15, 16, 17, 4, 8, 4, 8, 4, 8, - 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 148, - 149, 150, 151, 3, 7, 11, 24, 4, 8, 4, 8, 0, 0, 0, 0, - 0, 0, 152, 153, 3, 7, 11, 24, 3, 7, 11, 24, 3, 7, 11, - 24, 154, 155, 156, 164, 3, 7, 11, 24, 3, 7, 11, 24, 3, 7, - 11, 24, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 157, 158, 159, 160, 161, 162, 163, 165, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 191, 192, 193, 194, 195, 196, 4, 8, 4, 8, 4, 8, - 4, 8, 4, 8, 4, 8, 4, 8, 197, 198, 4, 8, 4, 8, 4, - 8, 4, 8, 0, 0, 0, 0, 0, 0, 219, 220, 3, 7, 11, 24, - 4, 8, 4, 8, 4, 8, 0, 0, 221, 222, 223, 224, 3, 7, 11, - 24, 3, 7, 11, 24, 4, 8, 4, 8, 4, 8, 225, 228, 4, 8, - 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 226, 227, 229, - 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, - 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 245, 246, 247, 248, 249, 250, 251, 252, - 253, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 255, + 1, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, + 218, 2, 6, 10, 13, 14, 15, 16, 17, 2, 6, 10, 13, 14, 15, + 16, 17, 3, 7, 11, 24, 3, 7, 11, 24, 3, 7, 11, 24, 3, + 7, 11, 24, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, + 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, + 199, 200, 201, 202, 203, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 9, 133, 134, 135, 136, 137, 138, 139, 140, + 141, 142, 143, 144, 145, 146, 147, 3, 7, 11, 24, 3, 7, 11, 24, + 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 12, 132, 4, 8, 4, 8, 4, 8, + 4, 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 18, 19, 20, 21, 4, 8, 4, + 8, 4, 8, 4, 8, 4, 8, 0, 0, 0, 22, 23, 91, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 3, + 7, 11, 24, 3, 7, 11, 24, 0, 0, 0, 0, 0, 41, 42, 43, + 2, 6, 10, 13, 14, 15, 16, 17, 3, 7, 11, 24, 3, 7, 11, + 24, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, + 44, 45, 2, 6, 10, 13, 14, 15, 16, 17, 46, 47, 48, 49, 50, + 51, 52, 57, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 53, 54, 55, 56, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 73, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, 89, 90, 3, 7, 11, 24, 3, 7, 11, + 24, 3, 7, 11, 24, 0, 0, 0, 0, 3, 7, 11, 24, 3, 7, + 11, 24, 4, 8, 4, 8, 0, 0, 0, 92, 0, 0, 0, 93, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 3, 7, 11, 24, + 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, + 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 4, + 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, + 0, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 2, 6, 10, 13, 14, 15, 16, 17, 4, 8, 4, 8, 4, 8, + 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 148, + 149, 150, 151, 3, 7, 11, 24, 4, 8, 4, 8, 0, 0, 0, 0, + 0, 0, 152, 153, 3, 7, 11, 24, 3, 7, 11, 24, 3, 7, 11, + 24, 154, 155, 156, 164, 3, 7, 11, 24, 3, 7, 11, 24, 3, 7, + 11, 24, 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 157, 158, 159, 160, 161, 162, 163, 165, 166, 167, 168, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, + 188, 189, 190, 191, 192, 193, 194, 195, 196, 4, 8, 4, 8, 4, 8, + 4, 8, 4, 8, 4, 8, 4, 8, 197, 198, 4, 8, 4, 8, 4, + 8, 4, 8, 0, 0, 0, 0, 0, 0, 219, 220, 3, 7, 11, 24, + 4, 8, 4, 8, 4, 8, 0, 0, 221, 222, 223, 224, 3, 7, 11, + 24, 3, 7, 11, 24, 4, 8, 4, 8, 4, 8, 225, 228, 4, 8, + 4, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 226, 227, 229, + 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, + 4, 8, 4, 8, 4, 8, 4, 8, 4, 8, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 245, 246, 247, 248, 249, 250, 251, 252, + 253, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 255, }; /* emission table: indexed like next_tbl, ultimately gives the byte to be @@ -286,1140 +310,1044 @@ static const gpr_int16 next_sub_tbl[48 * 16] = { generated by gen_hpack_tables.c */ static const gpr_uint16 emit_tbl[256] = { - 0, 1, 2, 3, 4, 5, 6, 7, 0, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 0, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 0, 55, 56, - 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 0, - 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, - 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, - 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, - 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 0, - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 0, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, - 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, - 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, - 219, 220, 221, 0, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, - 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, - 248, + 0, 1, 2, 3, 4, 5, 6, 7, 0, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 0, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 0, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 0, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, + 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, + 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 0, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 0, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, + 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, + 219, 220, 221, 0, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, + 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, + 248, }; /* generated by gen_hpack_tables.c */ static const gpr_int16 emit_sub_tbl[249 * 16] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 48, 48, 48, 48, 48, 48, 48, 48, 49, 49, 49, 49, 49, 49, - 49, 49, 48, 48, 48, 48, 49, 49, 49, 49, 50, 50, 50, 50, 97, - 97, 97, 97, 48, 48, 49, 49, 50, 50, 97, 97, 99, 99, 101, 101, - 105, 105, 111, 111, 48, 49, 50, 97, 99, 101, 105, 111, 115, 116, -1, - -1, -1, -1, -1, -1, 32, 32, 32, 32, 32, 32, 32, 32, 37, 37, - 37, 37, 37, 37, 37, 37, 99, 99, 99, 99, 101, 101, 101, 101, 105, - 105, 105, 105, 111, 111, 111, 111, 115, 115, 116, 116, 32, 37, 45, 46, - 47, 51, 52, 53, 54, 55, 56, 57, 61, 61, 61, 61, 61, 61, 61, - 61, 65, 65, 65, 65, 65, 65, 65, 65, 115, 115, 115, 115, 116, 116, - 116, 116, 32, 32, 37, 37, 45, 45, 46, 46, 61, 65, 95, 98, 100, - 102, 103, 104, 108, 109, 110, 112, 114, 117, -1, -1, 58, 58, 58, 58, - 58, 58, 58, 58, 66, 66, 66, 66, 66, 66, 66, 66, 47, 47, 51, - 51, 52, 52, 53, 53, 54, 54, 55, 55, 56, 56, 57, 57, 61, 61, - 65, 65, 95, 95, 98, 98, 100, 100, 102, 102, 103, 103, 104, 104, 108, - 108, 109, 109, 110, 110, 112, 112, 114, 114, 117, 117, 58, 66, 67, 68, - 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 89, 106, 107, 113, 118, 119, 120, 121, 122, -1, -1, - -1, -1, 38, 38, 38, 38, 38, 38, 38, 38, 42, 42, 42, 42, 42, - 42, 42, 42, 44, 44, 44, 44, 44, 44, 44, 44, 59, 59, 59, 59, - 59, 59, 59, 59, 88, 88, 88, 88, 88, 88, 88, 88, 90, 90, 90, - 90, 90, 90, 90, 90, 33, 33, 34, 34, 40, 40, 41, 41, 63, 63, - 39, 43, 124, -1, -1, -1, 35, 35, 35, 35, 35, 35, 35, 35, 62, - 62, 62, 62, 62, 62, 62, 62, 0, 0, 0, 0, 36, 36, 36, 36, - 64, 64, 64, 64, 91, 91, 91, 91, 69, 69, 69, 69, 69, 69, 69, - 69, 70, 70, 70, 70, 70, 70, 70, 70, 71, 71, 71, 71, 71, 71, - 71, 71, 72, 72, 72, 72, 72, 72, 72, 72, 73, 73, 73, 73, 73, - 73, 73, 73, 74, 74, 74, 74, 74, 74, 74, 74, 75, 75, 75, 75, - 75, 75, 75, 75, 76, 76, 76, 76, 76, 76, 76, 76, 77, 77, 77, - 77, 77, 77, 77, 77, 78, 78, 78, 78, 78, 78, 78, 78, 79, 79, - 79, 79, 79, 79, 79, 79, 80, 80, 80, 80, 80, 80, 80, 80, 81, - 81, 81, 81, 81, 81, 81, 81, 82, 82, 82, 82, 82, 82, 82, 82, - 83, 83, 83, 83, 83, 83, 83, 83, 84, 84, 84, 84, 84, 84, 84, - 84, 85, 85, 85, 85, 85, 85, 85, 85, 86, 86, 86, 86, 86, 86, - 86, 86, 87, 87, 87, 87, 87, 87, 87, 87, 89, 89, 89, 89, 89, - 89, 89, 89, 106, 106, 106, 106, 106, 106, 106, 106, 107, 107, 107, 107, - 107, 107, 107, 107, 113, 113, 113, 113, 113, 113, 113, 113, 118, 118, 118, - 118, 118, 118, 118, 118, 119, 119, 119, 119, 119, 119, 119, 119, 120, 120, - 120, 120, 120, 120, 120, 120, 121, 121, 121, 121, 121, 121, 121, 121, 122, - 122, 122, 122, 122, 122, 122, 122, 38, 38, 38, 38, 42, 42, 42, 42, - 44, 44, 44, 44, 59, 59, 59, 59, 88, 88, 88, 88, 90, 90, 90, - 90, 33, 34, 40, 41, 63, -1, -1, -1, 39, 39, 39, 39, 39, 39, - 39, 39, 43, 43, 43, 43, 43, 43, 43, 43, 124, 124, 124, 124, 124, - 124, 124, 124, 35, 35, 35, 35, 62, 62, 62, 62, 0, 0, 36, 36, - 64, 64, 91, 91, 93, 93, 126, 126, 94, 125, -1, -1, 60, 60, 60, - 60, 60, 60, 60, 60, 96, 96, 96, 96, 96, 96, 96, 96, 123, 123, - 123, 123, 123, 123, 123, 123, -1, -1, -1, -1, -1, -1, -1, -1, 92, - 92, 92, 92, 92, 92, 92, 92, 195, 195, 195, 195, 195, 195, 195, 195, - 208, 208, 208, 208, 208, 208, 208, 208, 128, 128, 128, 128, 130, 130, 130, - 130, 131, 131, 131, 131, 162, 162, 162, 162, 184, 184, 184, 184, 194, 194, - 194, 194, 224, 224, 224, 224, 226, 226, 226, 226, 153, 153, 161, 161, 167, - 167, 172, 172, 176, 176, 177, 177, 179, 179, 209, 209, 216, 216, 217, 217, - 227, 227, 229, 229, 230, 230, 129, 132, 133, 134, 136, 146, 154, 156, 160, - 163, 164, 169, 170, 173, 178, 181, 185, 186, 187, 189, 190, 196, 198, 228, - 232, 233, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 135, - 135, 135, 135, 135, 135, 135, 135, 137, 137, 137, 137, 137, 137, 137, 137, - 138, 138, 138, 138, 138, 138, 138, 138, 139, 139, 139, 139, 139, 139, 139, - 139, 140, 140, 140, 140, 140, 140, 140, 140, 141, 141, 141, 141, 141, 141, - 141, 141, 143, 143, 143, 143, 143, 143, 143, 143, 147, 147, 147, 147, 147, - 147, 147, 147, 149, 149, 149, 149, 149, 149, 149, 149, 150, 150, 150, 150, - 150, 150, 150, 150, 151, 151, 151, 151, 151, 151, 151, 151, 152, 152, 152, - 152, 152, 152, 152, 152, 155, 155, 155, 155, 155, 155, 155, 155, 157, 157, - 157, 157, 157, 157, 157, 157, 158, 158, 158, 158, 158, 158, 158, 158, 165, - 165, 165, 165, 165, 165, 165, 165, 166, 166, 166, 166, 166, 166, 166, 166, - 168, 168, 168, 168, 168, 168, 168, 168, 174, 174, 174, 174, 174, 174, 174, - 174, 175, 175, 175, 175, 175, 175, 175, 175, 180, 180, 180, 180, 180, 180, - 180, 180, 182, 182, 182, 182, 182, 182, 182, 182, 183, 183, 183, 183, 183, - 183, 183, 183, 188, 188, 188, 188, 188, 188, 188, 188, 191, 191, 191, 191, - 191, 191, 191, 191, 197, 197, 197, 197, 197, 197, 197, 197, 231, 231, 231, - 231, 231, 231, 231, 231, 239, 239, 239, 239, 239, 239, 239, 239, 9, 9, - 9, 9, 142, 142, 142, 142, 144, 144, 144, 144, 145, 145, 145, 145, 148, - 148, 148, 148, 159, 159, 159, 159, 171, 171, 171, 171, 206, 206, 206, 206, - 215, 215, 215, 215, 225, 225, 225, 225, 236, 236, 236, 236, 237, 237, 237, - 237, 199, 199, 207, 207, 234, 234, 235, 235, 192, 193, 200, 201, 202, 205, - 210, 213, 218, 219, 238, 240, 242, 243, 255, -1, 203, 203, 203, 203, 203, - 203, 203, 203, 204, 204, 204, 204, 204, 204, 204, 204, 211, 211, 211, 211, - 211, 211, 211, 211, 212, 212, 212, 212, 212, 212, 212, 212, 214, 214, 214, - 214, 214, 214, 214, 214, 221, 221, 221, 221, 221, 221, 221, 221, 222, 222, - 222, 222, 222, 222, 222, 222, 223, 223, 223, 223, 223, 223, 223, 223, 241, - 241, 241, 241, 241, 241, 241, 241, 244, 244, 244, 244, 244, 244, 244, 244, - 245, 245, 245, 245, 245, 245, 245, 245, 246, 246, 246, 246, 246, 246, 246, - 246, 247, 247, 247, 247, 247, 247, 247, 247, 248, 248, 248, 248, 248, 248, - 248, 248, 250, 250, 250, 250, 250, 250, 250, 250, 251, 251, 251, 251, 251, - 251, 251, 251, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, - 253, 253, 253, 253, 254, 254, 254, 254, 254, 254, 254, 254, 2, 2, 2, - 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, - 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 11, 11, 11, 11, 12, - 12, 12, 12, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, - 17, 17, 17, 17, 18, 18, 18, 18, 19, 19, 19, 19, 20, 20, 20, - 20, 21, 21, 21, 21, 23, 23, 23, 23, 24, 24, 24, 24, 25, 25, - 25, 25, 26, 26, 26, 26, 27, 27, 27, 27, 28, 28, 28, 28, 29, - 29, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31, 127, 127, 127, 127, - 220, 220, 220, 220, 249, 249, 249, 249, 10, 13, 22, 256, 93, 93, 93, - 93, 126, 126, 126, 126, 94, 94, 125, 125, 60, 96, 123, -1, 92, 195, - 208, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 128, - 128, 128, 128, 128, 128, 128, 128, 130, 130, 130, 130, 130, 130, 130, 130, - 131, 131, 131, 131, 131, 131, 131, 131, 162, 162, 162, 162, 162, 162, 162, - 162, 184, 184, 184, 184, 184, 184, 184, 184, 194, 194, 194, 194, 194, 194, - 194, 194, 224, 224, 224, 224, 224, 224, 224, 224, 226, 226, 226, 226, 226, - 226, 226, 226, 153, 153, 153, 153, 161, 161, 161, 161, 167, 167, 167, 167, - 172, 172, 172, 172, 176, 176, 176, 176, 177, 177, 177, 177, 179, 179, 179, - 179, 209, 209, 209, 209, 216, 216, 216, 216, 217, 217, 217, 217, 227, 227, - 227, 227, 229, 229, 229, 229, 230, 230, 230, 230, 129, 129, 132, 132, 133, - 133, 134, 134, 136, 136, 146, 146, 154, 154, 156, 156, 160, 160, 163, 163, - 164, 164, 169, 169, 170, 170, 173, 173, 178, 178, 181, 181, 185, 185, 186, - 186, 187, 187, 189, 189, 190, 190, 196, 196, 198, 198, 228, 228, 232, 232, - 233, 233, 1, 135, 137, 138, 139, 140, 141, 143, 147, 149, 150, 151, 152, - 155, 157, 158, 165, 166, 168, 174, 175, 180, 182, 183, 188, 191, 197, 231, - 239, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 9, 9, 9, - 9, 9, 9, 9, 9, 142, 142, 142, 142, 142, 142, 142, 142, 144, 144, - 144, 144, 144, 144, 144, 144, 145, 145, 145, 145, 145, 145, 145, 145, 148, - 148, 148, 148, 148, 148, 148, 148, 159, 159, 159, 159, 159, 159, 159, 159, - 171, 171, 171, 171, 171, 171, 171, 171, 206, 206, 206, 206, 206, 206, 206, - 206, 215, 215, 215, 215, 215, 215, 215, 215, 225, 225, 225, 225, 225, 225, - 225, 225, 236, 236, 236, 236, 236, 236, 236, 236, 237, 237, 237, 237, 237, - 237, 237, 237, 199, 199, 199, 199, 207, 207, 207, 207, 234, 234, 234, 234, - 235, 235, 235, 235, 192, 192, 193, 193, 200, 200, 201, 201, 202, 202, 205, - 205, 210, 210, 213, 213, 218, 218, 219, 219, 238, 238, 240, 240, 242, 242, - 243, 243, 255, 255, 203, 204, 211, 212, 214, 221, 222, 223, 241, 244, 245, - 246, 247, 248, 250, 251, 252, 253, 254, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 2, 2, 2, 2, 2, 2, 2, - 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, - 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, - 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, - 8, 8, 8, 8, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, - 12, 12, 12, 12, 12, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, - 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 17, - 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, - 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, - 20, 21, 21, 21, 21, 21, 21, 21, 21, 23, 23, 23, 23, 23, 23, - 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, - 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, - 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, - 29, 29, 29, 29, 29, 30, 30, 30, 30, 30, 30, 30, 30, 31, 31, - 31, 31, 31, 31, 31, 31, 127, 127, 127, 127, 127, 127, 127, 127, 220, - 220, 220, 220, 220, 220, 220, 220, 249, 249, 249, 249, 249, 249, 249, 249, - 10, 10, 13, 13, 22, 22, 256, 256, 67, 67, 67, 67, 67, 67, 67, - 67, 68, 68, 68, 68, 68, 68, 68, 68, 95, 95, 95, 95, 95, 95, - 95, 95, 98, 98, 98, 98, 98, 98, 98, 98, 100, 100, 100, 100, 100, - 100, 100, 100, 102, 102, 102, 102, 102, 102, 102, 102, 103, 103, 103, 103, - 103, 103, 103, 103, 104, 104, 104, 104, 104, 104, 104, 104, 108, 108, 108, - 108, 108, 108, 108, 108, 109, 109, 109, 109, 109, 109, 109, 109, 110, 110, - 110, 110, 110, 110, 110, 110, 112, 112, 112, 112, 112, 112, 112, 112, 114, - 114, 114, 114, 114, 114, 114, 114, 117, 117, 117, 117, 117, 117, 117, 117, - 58, 58, 58, 58, 66, 66, 66, 66, 67, 67, 67, 67, 68, 68, 68, - 68, 69, 69, 69, 69, 70, 70, 70, 70, 71, 71, 71, 71, 72, 72, - 72, 72, 73, 73, 73, 73, 74, 74, 74, 74, 75, 75, 75, 75, 76, - 76, 76, 76, 77, 77, 77, 77, 78, 78, 78, 78, 79, 79, 79, 79, - 80, 80, 80, 80, 81, 81, 81, 81, 82, 82, 82, 82, 83, 83, 83, - 83, 84, 84, 84, 84, 85, 85, 85, 85, 86, 86, 86, 86, 87, 87, - 87, 87, 89, 89, 89, 89, 106, 106, 106, 106, 107, 107, 107, 107, 113, - 113, 113, 113, 118, 118, 118, 118, 119, 119, 119, 119, 120, 120, 120, 120, - 121, 121, 121, 121, 122, 122, 122, 122, 38, 38, 42, 42, 44, 44, 59, - 59, 88, 88, 90, 90, -1, -1, -1, -1, 33, 33, 33, 33, 33, 33, - 33, 33, 34, 34, 34, 34, 34, 34, 34, 34, 40, 40, 40, 40, 40, - 40, 40, 40, 41, 41, 41, 41, 41, 41, 41, 41, 63, 63, 63, 63, - 63, 63, 63, 63, 39, 39, 39, 39, 43, 43, 43, 43, 124, 124, 124, - 124, 35, 35, 62, 62, 0, 36, 64, 91, 93, 126, -1, -1, 94, 94, - 94, 94, 94, 94, 94, 94, 125, 125, 125, 125, 125, 125, 125, 125, 60, - 60, 60, 60, 96, 96, 96, 96, 123, 123, 123, 123, -1, -1, -1, -1, - 92, 92, 92, 92, 195, 195, 195, 195, 208, 208, 208, 208, 128, 128, 130, - 130, 131, 131, 162, 162, 184, 184, 194, 194, 224, 224, 226, 226, 153, 161, - 167, 172, 176, 177, 179, 209, 216, 217, 227, 229, 230, -1, -1, -1, -1, - -1, -1, -1, 129, 129, 129, 129, 129, 129, 129, 129, 132, 132, 132, 132, - 132, 132, 132, 132, 133, 133, 133, 133, 133, 133, 133, 133, 134, 134, 134, - 134, 134, 134, 134, 134, 136, 136, 136, 136, 136, 136, 136, 136, 146, 146, - 146, 146, 146, 146, 146, 146, 154, 154, 154, 154, 154, 154, 154, 154, 156, - 156, 156, 156, 156, 156, 156, 156, 160, 160, 160, 160, 160, 160, 160, 160, - 163, 163, 163, 163, 163, 163, 163, 163, 164, 164, 164, 164, 164, 164, 164, - 164, 169, 169, 169, 169, 169, 169, 169, 169, 170, 170, 170, 170, 170, 170, - 170, 170, 173, 173, 173, 173, 173, 173, 173, 173, 178, 178, 178, 178, 178, - 178, 178, 178, 181, 181, 181, 181, 181, 181, 181, 181, 185, 185, 185, 185, - 185, 185, 185, 185, 186, 186, 186, 186, 186, 186, 186, 186, 187, 187, 187, - 187, 187, 187, 187, 187, 189, 189, 189, 189, 189, 189, 189, 189, 190, 190, - 190, 190, 190, 190, 190, 190, 196, 196, 196, 196, 196, 196, 196, 196, 198, - 198, 198, 198, 198, 198, 198, 198, 228, 228, 228, 228, 228, 228, 228, 228, - 232, 232, 232, 232, 232, 232, 232, 232, 233, 233, 233, 233, 233, 233, 233, - 233, 1, 1, 1, 1, 135, 135, 135, 135, 137, 137, 137, 137, 138, 138, - 138, 138, 139, 139, 139, 139, 140, 140, 140, 140, 141, 141, 141, 141, 143, - 143, 143, 143, 147, 147, 147, 147, 149, 149, 149, 149, 150, 150, 150, 150, - 151, 151, 151, 151, 152, 152, 152, 152, 155, 155, 155, 155, 157, 157, 157, - 157, 158, 158, 158, 158, 165, 165, 165, 165, 166, 166, 166, 166, 168, 168, - 168, 168, 174, 174, 174, 174, 175, 175, 175, 175, 180, 180, 180, 180, 182, - 182, 182, 182, 183, 183, 183, 183, 188, 188, 188, 188, 191, 191, 191, 191, - 197, 197, 197, 197, 231, 231, 231, 231, 239, 239, 239, 239, 9, 9, 142, - 142, 144, 144, 145, 145, 148, 148, 159, 159, 171, 171, 206, 206, 215, 215, - 225, 225, 236, 236, 237, 237, 199, 207, 234, 235, 192, 192, 192, 192, 192, - 192, 192, 192, 193, 193, 193, 193, 193, 193, 193, 193, 200, 200, 200, 200, - 200, 200, 200, 200, 201, 201, 201, 201, 201, 201, 201, 201, 202, 202, 202, - 202, 202, 202, 202, 202, 205, 205, 205, 205, 205, 205, 205, 205, 210, 210, - 210, 210, 210, 210, 210, 210, 213, 213, 213, 213, 213, 213, 213, 213, 218, - 218, 218, 218, 218, 218, 218, 218, 219, 219, 219, 219, 219, 219, 219, 219, - 238, 238, 238, 238, 238, 238, 238, 238, 240, 240, 240, 240, 240, 240, 240, - 240, 242, 242, 242, 242, 242, 242, 242, 242, 243, 243, 243, 243, 243, 243, - 243, 243, 255, 255, 255, 255, 255, 255, 255, 255, 203, 203, 203, 203, 204, - 204, 204, 204, 211, 211, 211, 211, 212, 212, 212, 212, 214, 214, 214, 214, - 221, 221, 221, 221, 222, 222, 222, 222, 223, 223, 223, 223, 241, 241, 241, - 241, 244, 244, 244, 244, 245, 245, 245, 245, 246, 246, 246, 246, 247, 247, - 247, 247, 248, 248, 248, 248, 250, 250, 250, 250, 251, 251, 251, 251, 252, - 252, 252, 252, 253, 253, 253, 253, 254, 254, 254, 254, 2, 2, 3, 3, - 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 11, 11, 12, 12, 14, - 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, - 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, - 30, 31, 31, 127, 127, 220, 220, 249, 249, -1, -1, 10, 10, 10, 10, - 10, 10, 10, 10, 13, 13, 13, 13, 13, 13, 13, 13, 22, 22, 22, - 22, 22, 22, 22, 22, 256, 256, 256, 256, 256, 256, 256, 256, 45, 45, - 45, 45, 45, 45, 45, 45, 46, 46, 46, 46, 46, 46, 46, 46, 47, - 47, 47, 47, 47, 47, 47, 47, 51, 51, 51, 51, 51, 51, 51, 51, - 52, 52, 52, 52, 52, 52, 52, 52, 53, 53, 53, 53, 53, 53, 53, - 53, 54, 54, 54, 54, 54, 54, 54, 54, 55, 55, 55, 55, 55, 55, - 55, 55, 56, 56, 56, 56, 56, 56, 56, 56, 57, 57, 57, 57, 57, - 57, 57, 57, 50, 50, 50, 50, 50, 50, 50, 50, 97, 97, 97, 97, - 97, 97, 97, 97, 99, 99, 99, 99, 99, 99, 99, 99, 101, 101, 101, - 101, 101, 101, 101, 101, 105, 105, 105, 105, 105, 105, 105, 105, 111, 111, - 111, 111, 111, 111, 111, 111, 115, 115, 115, 115, 115, 115, 115, 115, 116, - 116, 116, 116, 116, 116, 116, 116, 32, 32, 32, 32, 37, 37, 37, 37, - 45, 45, 45, 45, 46, 46, 46, 46, 47, 47, 47, 47, 51, 51, 51, - 51, 52, 52, 52, 52, 53, 53, 53, 53, 54, 54, 54, 54, 55, 55, - 55, 55, 56, 56, 56, 56, 57, 57, 57, 57, 61, 61, 61, 61, 65, - 65, 65, 65, 95, 95, 95, 95, 98, 98, 98, 98, 100, 100, 100, 100, - 102, 102, 102, 102, 103, 103, 103, 103, 104, 104, 104, 104, 108, 108, 108, - 108, 109, 109, 109, 109, 110, 110, 110, 110, 112, 112, 112, 112, 114, 114, - 114, 114, 117, 117, 117, 117, 58, 58, 66, 66, 67, 67, 68, 68, 69, - 69, 70, 70, 71, 71, 72, 72, 73, 73, 74, 74, 75, 75, 76, 76, - 77, 77, 78, 78, 79, 79, 80, 80, 81, 81, 82, 82, 83, 83, 84, - 84, 85, 85, 86, 86, 87, 87, 89, 89, 106, 106, 107, 107, 113, 113, - 118, 118, 119, 119, 120, 120, 121, 121, 122, 122, 38, 42, 44, 59, 88, - 90, -1, -1, 33, 33, 33, 33, 34, 34, 34, 34, 40, 40, 40, 40, - 41, 41, 41, 41, 63, 63, 63, 63, 39, 39, 43, 43, 124, 124, 35, - 62, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 36, 36, - 36, 36, 36, 36, 36, 36, 64, 64, 64, 64, 64, 64, 64, 64, 91, - 91, 91, 91, 91, 91, 91, 91, 93, 93, 93, 93, 93, 93, 93, 93, - 126, 126, 126, 126, 126, 126, 126, 126, 94, 94, 94, 94, 125, 125, 125, - 125, 60, 60, 96, 96, 123, 123, -1, -1, 92, 92, 195, 195, 208, 208, - 128, 130, 131, 162, 184, 194, 224, 226, -1, -1, 153, 153, 153, 153, 153, - 153, 153, 153, 161, 161, 161, 161, 161, 161, 161, 161, 167, 167, 167, 167, - 167, 167, 167, 167, 172, 172, 172, 172, 172, 172, 172, 172, 176, 176, 176, - 176, 176, 176, 176, 176, 177, 177, 177, 177, 177, 177, 177, 177, 179, 179, - 179, 179, 179, 179, 179, 179, 209, 209, 209, 209, 209, 209, 209, 209, 216, - 216, 216, 216, 216, 216, 216, 216, 217, 217, 217, 217, 217, 217, 217, 217, - 227, 227, 227, 227, 227, 227, 227, 227, 229, 229, 229, 229, 229, 229, 229, - 229, 230, 230, 230, 230, 230, 230, 230, 230, 129, 129, 129, 129, 132, 132, - 132, 132, 133, 133, 133, 133, 134, 134, 134, 134, 136, 136, 136, 136, 146, - 146, 146, 146, 154, 154, 154, 154, 156, 156, 156, 156, 160, 160, 160, 160, - 163, 163, 163, 163, 164, 164, 164, 164, 169, 169, 169, 169, 170, 170, 170, - 170, 173, 173, 173, 173, 178, 178, 178, 178, 181, 181, 181, 181, 185, 185, - 185, 185, 186, 186, 186, 186, 187, 187, 187, 187, 189, 189, 189, 189, 190, - 190, 190, 190, 196, 196, 196, 196, 198, 198, 198, 198, 228, 228, 228, 228, - 232, 232, 232, 232, 233, 233, 233, 233, 1, 1, 135, 135, 137, 137, 138, - 138, 139, 139, 140, 140, 141, 141, 143, 143, 147, 147, 149, 149, 150, 150, - 151, 151, 152, 152, 155, 155, 157, 157, 158, 158, 165, 165, 166, 166, 168, - 168, 174, 174, 175, 175, 180, 180, 182, 182, 183, 183, 188, 188, 191, 191, - 197, 197, 231, 231, 239, 239, 9, 142, 144, 145, 148, 159, 171, 206, 215, - 225, 236, 237, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 199, 199, - 199, 199, 199, 199, 199, 199, 207, 207, 207, 207, 207, 207, 207, 207, 234, - 234, 234, 234, 234, 234, 234, 234, 235, 235, 235, 235, 235, 235, 235, 235, - 192, 192, 192, 192, 193, 193, 193, 193, 200, 200, 200, 200, 201, 201, 201, - 201, 202, 202, 202, 202, 205, 205, 205, 205, 210, 210, 210, 210, 213, 213, - 213, 213, 218, 218, 218, 218, 219, 219, 219, 219, 238, 238, 238, 238, 240, - 240, 240, 240, 242, 242, 242, 242, 243, 243, 243, 243, 255, 255, 255, 255, - 203, 203, 204, 204, 211, 211, 212, 212, 214, 214, 221, 221, 222, 222, 223, - 223, 241, 241, 244, 244, 245, 245, 246, 246, 247, 247, 248, 248, 250, 250, - 251, 251, 252, 252, 253, 253, 254, 254, 2, 3, 4, 5, 6, 7, 8, - 11, 12, 14, 15, 16, 17, 18, 19, 20, 21, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 127, 220, 249, -1, 10, 10, 10, 10, 13, 13, 13, - 13, 22, 22, 22, 22, 256, 256, 256, 256, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 48, 48, 48, 48, 48, 48, 48, 48, 49, 49, 49, 49, 49, 49, + 49, 49, 48, 48, 48, 48, 49, 49, 49, 49, 50, 50, 50, 50, 97, + 97, 97, 97, 48, 48, 49, 49, 50, 50, 97, 97, 99, 99, 101, 101, + 105, 105, 111, 111, 48, 49, 50, 97, 99, 101, 105, 111, 115, 116, -1, + -1, -1, -1, -1, -1, 32, 32, 32, 32, 32, 32, 32, 32, 37, 37, + 37, 37, 37, 37, 37, 37, 99, 99, 99, 99, 101, 101, 101, 101, 105, + 105, 105, 105, 111, 111, 111, 111, 115, 115, 116, 116, 32, 37, 45, 46, + 47, 51, 52, 53, 54, 55, 56, 57, 61, 61, 61, 61, 61, 61, 61, + 61, 65, 65, 65, 65, 65, 65, 65, 65, 115, 115, 115, 115, 116, 116, + 116, 116, 32, 32, 37, 37, 45, 45, 46, 46, 61, 65, 95, 98, 100, + 102, 103, 104, 108, 109, 110, 112, 114, 117, -1, -1, 58, 58, 58, 58, + 58, 58, 58, 58, 66, 66, 66, 66, 66, 66, 66, 66, 47, 47, 51, + 51, 52, 52, 53, 53, 54, 54, 55, 55, 56, 56, 57, 57, 61, 61, + 65, 65, 95, 95, 98, 98, 100, 100, 102, 102, 103, 103, 104, 104, 108, + 108, 109, 109, 110, 110, 112, 112, 114, 114, 117, 117, 58, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 89, 106, 107, 113, 118, 119, 120, 121, 122, -1, -1, + -1, -1, 38, 38, 38, 38, 38, 38, 38, 38, 42, 42, 42, 42, 42, + 42, 42, 42, 44, 44, 44, 44, 44, 44, 44, 44, 59, 59, 59, 59, + 59, 59, 59, 59, 88, 88, 88, 88, 88, 88, 88, 88, 90, 90, 90, + 90, 90, 90, 90, 90, 33, 33, 34, 34, 40, 40, 41, 41, 63, 63, + 39, 43, 124, -1, -1, -1, 35, 35, 35, 35, 35, 35, 35, 35, 62, + 62, 62, 62, 62, 62, 62, 62, 0, 0, 0, 0, 36, 36, 36, 36, + 64, 64, 64, 64, 91, 91, 91, 91, 69, 69, 69, 69, 69, 69, 69, + 69, 70, 70, 70, 70, 70, 70, 70, 70, 71, 71, 71, 71, 71, 71, + 71, 71, 72, 72, 72, 72, 72, 72, 72, 72, 73, 73, 73, 73, 73, + 73, 73, 73, 74, 74, 74, 74, 74, 74, 74, 74, 75, 75, 75, 75, + 75, 75, 75, 75, 76, 76, 76, 76, 76, 76, 76, 76, 77, 77, 77, + 77, 77, 77, 77, 77, 78, 78, 78, 78, 78, 78, 78, 78, 79, 79, + 79, 79, 79, 79, 79, 79, 80, 80, 80, 80, 80, 80, 80, 80, 81, + 81, 81, 81, 81, 81, 81, 81, 82, 82, 82, 82, 82, 82, 82, 82, + 83, 83, 83, 83, 83, 83, 83, 83, 84, 84, 84, 84, 84, 84, 84, + 84, 85, 85, 85, 85, 85, 85, 85, 85, 86, 86, 86, 86, 86, 86, + 86, 86, 87, 87, 87, 87, 87, 87, 87, 87, 89, 89, 89, 89, 89, + 89, 89, 89, 106, 106, 106, 106, 106, 106, 106, 106, 107, 107, 107, 107, + 107, 107, 107, 107, 113, 113, 113, 113, 113, 113, 113, 113, 118, 118, 118, + 118, 118, 118, 118, 118, 119, 119, 119, 119, 119, 119, 119, 119, 120, 120, + 120, 120, 120, 120, 120, 120, 121, 121, 121, 121, 121, 121, 121, 121, 122, + 122, 122, 122, 122, 122, 122, 122, 38, 38, 38, 38, 42, 42, 42, 42, + 44, 44, 44, 44, 59, 59, 59, 59, 88, 88, 88, 88, 90, 90, 90, + 90, 33, 34, 40, 41, 63, -1, -1, -1, 39, 39, 39, 39, 39, 39, + 39, 39, 43, 43, 43, 43, 43, 43, 43, 43, 124, 124, 124, 124, 124, + 124, 124, 124, 35, 35, 35, 35, 62, 62, 62, 62, 0, 0, 36, 36, + 64, 64, 91, 91, 93, 93, 126, 126, 94, 125, -1, -1, 60, 60, 60, + 60, 60, 60, 60, 60, 96, 96, 96, 96, 96, 96, 96, 96, 123, 123, + 123, 123, 123, 123, 123, 123, -1, -1, -1, -1, -1, -1, -1, -1, 92, + 92, 92, 92, 92, 92, 92, 92, 195, 195, 195, 195, 195, 195, 195, 195, + 208, 208, 208, 208, 208, 208, 208, 208, 128, 128, 128, 128, 130, 130, 130, + 130, 131, 131, 131, 131, 162, 162, 162, 162, 184, 184, 184, 184, 194, 194, + 194, 194, 224, 224, 224, 224, 226, 226, 226, 226, 153, 153, 161, 161, 167, + 167, 172, 172, 176, 176, 177, 177, 179, 179, 209, 209, 216, 216, 217, 217, + 227, 227, 229, 229, 230, 230, 129, 132, 133, 134, 136, 146, 154, 156, 160, + 163, 164, 169, 170, 173, 178, 181, 185, 186, 187, 189, 190, 196, 198, 228, + 232, 233, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 135, + 135, 135, 135, 135, 135, 135, 135, 137, 137, 137, 137, 137, 137, 137, 137, + 138, 138, 138, 138, 138, 138, 138, 138, 139, 139, 139, 139, 139, 139, 139, + 139, 140, 140, 140, 140, 140, 140, 140, 140, 141, 141, 141, 141, 141, 141, + 141, 141, 143, 143, 143, 143, 143, 143, 143, 143, 147, 147, 147, 147, 147, + 147, 147, 147, 149, 149, 149, 149, 149, 149, 149, 149, 150, 150, 150, 150, + 150, 150, 150, 150, 151, 151, 151, 151, 151, 151, 151, 151, 152, 152, 152, + 152, 152, 152, 152, 152, 155, 155, 155, 155, 155, 155, 155, 155, 157, 157, + 157, 157, 157, 157, 157, 157, 158, 158, 158, 158, 158, 158, 158, 158, 165, + 165, 165, 165, 165, 165, 165, 165, 166, 166, 166, 166, 166, 166, 166, 166, + 168, 168, 168, 168, 168, 168, 168, 168, 174, 174, 174, 174, 174, 174, 174, + 174, 175, 175, 175, 175, 175, 175, 175, 175, 180, 180, 180, 180, 180, 180, + 180, 180, 182, 182, 182, 182, 182, 182, 182, 182, 183, 183, 183, 183, 183, + 183, 183, 183, 188, 188, 188, 188, 188, 188, 188, 188, 191, 191, 191, 191, + 191, 191, 191, 191, 197, 197, 197, 197, 197, 197, 197, 197, 231, 231, 231, + 231, 231, 231, 231, 231, 239, 239, 239, 239, 239, 239, 239, 239, 9, 9, + 9, 9, 142, 142, 142, 142, 144, 144, 144, 144, 145, 145, 145, 145, 148, + 148, 148, 148, 159, 159, 159, 159, 171, 171, 171, 171, 206, 206, 206, 206, + 215, 215, 215, 215, 225, 225, 225, 225, 236, 236, 236, 236, 237, 237, 237, + 237, 199, 199, 207, 207, 234, 234, 235, 235, 192, 193, 200, 201, 202, 205, + 210, 213, 218, 219, 238, 240, 242, 243, 255, -1, 203, 203, 203, 203, 203, + 203, 203, 203, 204, 204, 204, 204, 204, 204, 204, 204, 211, 211, 211, 211, + 211, 211, 211, 211, 212, 212, 212, 212, 212, 212, 212, 212, 214, 214, 214, + 214, 214, 214, 214, 214, 221, 221, 221, 221, 221, 221, 221, 221, 222, 222, + 222, 222, 222, 222, 222, 222, 223, 223, 223, 223, 223, 223, 223, 223, 241, + 241, 241, 241, 241, 241, 241, 241, 244, 244, 244, 244, 244, 244, 244, 244, + 245, 245, 245, 245, 245, 245, 245, 245, 246, 246, 246, 246, 246, 246, 246, + 246, 247, 247, 247, 247, 247, 247, 247, 247, 248, 248, 248, 248, 248, 248, + 248, 248, 250, 250, 250, 250, 250, 250, 250, 250, 251, 251, 251, 251, 251, + 251, 251, 251, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, + 253, 253, 253, 253, 254, 254, 254, 254, 254, 254, 254, 254, 2, 2, 2, + 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, + 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 11, 11, 11, 11, 12, + 12, 12, 12, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, + 17, 17, 17, 17, 18, 18, 18, 18, 19, 19, 19, 19, 20, 20, 20, + 20, 21, 21, 21, 21, 23, 23, 23, 23, 24, 24, 24, 24, 25, 25, + 25, 25, 26, 26, 26, 26, 27, 27, 27, 27, 28, 28, 28, 28, 29, + 29, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31, 127, 127, 127, 127, + 220, 220, 220, 220, 249, 249, 249, 249, 10, 13, 22, 256, 93, 93, 93, + 93, 126, 126, 126, 126, 94, 94, 125, 125, 60, 96, 123, -1, 92, 195, + 208, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 128, + 128, 128, 128, 128, 128, 128, 128, 130, 130, 130, 130, 130, 130, 130, 130, + 131, 131, 131, 131, 131, 131, 131, 131, 162, 162, 162, 162, 162, 162, 162, + 162, 184, 184, 184, 184, 184, 184, 184, 184, 194, 194, 194, 194, 194, 194, + 194, 194, 224, 224, 224, 224, 224, 224, 224, 224, 226, 226, 226, 226, 226, + 226, 226, 226, 153, 153, 153, 153, 161, 161, 161, 161, 167, 167, 167, 167, + 172, 172, 172, 172, 176, 176, 176, 176, 177, 177, 177, 177, 179, 179, 179, + 179, 209, 209, 209, 209, 216, 216, 216, 216, 217, 217, 217, 217, 227, 227, + 227, 227, 229, 229, 229, 229, 230, 230, 230, 230, 129, 129, 132, 132, 133, + 133, 134, 134, 136, 136, 146, 146, 154, 154, 156, 156, 160, 160, 163, 163, + 164, 164, 169, 169, 170, 170, 173, 173, 178, 178, 181, 181, 185, 185, 186, + 186, 187, 187, 189, 189, 190, 190, 196, 196, 198, 198, 228, 228, 232, 232, + 233, 233, 1, 135, 137, 138, 139, 140, 141, 143, 147, 149, 150, 151, 152, + 155, 157, 158, 165, 166, 168, 174, 175, 180, 182, 183, 188, 191, 197, 231, + 239, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 9, 9, 9, + 9, 9, 9, 9, 9, 142, 142, 142, 142, 142, 142, 142, 142, 144, 144, + 144, 144, 144, 144, 144, 144, 145, 145, 145, 145, 145, 145, 145, 145, 148, + 148, 148, 148, 148, 148, 148, 148, 159, 159, 159, 159, 159, 159, 159, 159, + 171, 171, 171, 171, 171, 171, 171, 171, 206, 206, 206, 206, 206, 206, 206, + 206, 215, 215, 215, 215, 215, 215, 215, 215, 225, 225, 225, 225, 225, 225, + 225, 225, 236, 236, 236, 236, 236, 236, 236, 236, 237, 237, 237, 237, 237, + 237, 237, 237, 199, 199, 199, 199, 207, 207, 207, 207, 234, 234, 234, 234, + 235, 235, 235, 235, 192, 192, 193, 193, 200, 200, 201, 201, 202, 202, 205, + 205, 210, 210, 213, 213, 218, 218, 219, 219, 238, 238, 240, 240, 242, 242, + 243, 243, 255, 255, 203, 204, 211, 212, 214, 221, 222, 223, 241, 244, 245, + 246, 247, 248, 250, 251, 252, 253, 254, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 2, 2, 2, 2, 2, 2, 2, + 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, + 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, + 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, + 8, 8, 8, 8, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, + 12, 12, 12, 12, 12, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, + 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 17, + 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, + 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, + 20, 21, 21, 21, 21, 21, 21, 21, 21, 23, 23, 23, 23, 23, 23, + 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, + 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, + 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, + 29, 29, 29, 29, 29, 30, 30, 30, 30, 30, 30, 30, 30, 31, 31, + 31, 31, 31, 31, 31, 31, 127, 127, 127, 127, 127, 127, 127, 127, 220, + 220, 220, 220, 220, 220, 220, 220, 249, 249, 249, 249, 249, 249, 249, 249, + 10, 10, 13, 13, 22, 22, 256, 256, 67, 67, 67, 67, 67, 67, 67, + 67, 68, 68, 68, 68, 68, 68, 68, 68, 95, 95, 95, 95, 95, 95, + 95, 95, 98, 98, 98, 98, 98, 98, 98, 98, 100, 100, 100, 100, 100, + 100, 100, 100, 102, 102, 102, 102, 102, 102, 102, 102, 103, 103, 103, 103, + 103, 103, 103, 103, 104, 104, 104, 104, 104, 104, 104, 104, 108, 108, 108, + 108, 108, 108, 108, 108, 109, 109, 109, 109, 109, 109, 109, 109, 110, 110, + 110, 110, 110, 110, 110, 110, 112, 112, 112, 112, 112, 112, 112, 112, 114, + 114, 114, 114, 114, 114, 114, 114, 117, 117, 117, 117, 117, 117, 117, 117, + 58, 58, 58, 58, 66, 66, 66, 66, 67, 67, 67, 67, 68, 68, 68, + 68, 69, 69, 69, 69, 70, 70, 70, 70, 71, 71, 71, 71, 72, 72, + 72, 72, 73, 73, 73, 73, 74, 74, 74, 74, 75, 75, 75, 75, 76, + 76, 76, 76, 77, 77, 77, 77, 78, 78, 78, 78, 79, 79, 79, 79, + 80, 80, 80, 80, 81, 81, 81, 81, 82, 82, 82, 82, 83, 83, 83, + 83, 84, 84, 84, 84, 85, 85, 85, 85, 86, 86, 86, 86, 87, 87, + 87, 87, 89, 89, 89, 89, 106, 106, 106, 106, 107, 107, 107, 107, 113, + 113, 113, 113, 118, 118, 118, 118, 119, 119, 119, 119, 120, 120, 120, 120, + 121, 121, 121, 121, 122, 122, 122, 122, 38, 38, 42, 42, 44, 44, 59, + 59, 88, 88, 90, 90, -1, -1, -1, -1, 33, 33, 33, 33, 33, 33, + 33, 33, 34, 34, 34, 34, 34, 34, 34, 34, 40, 40, 40, 40, 40, + 40, 40, 40, 41, 41, 41, 41, 41, 41, 41, 41, 63, 63, 63, 63, + 63, 63, 63, 63, 39, 39, 39, 39, 43, 43, 43, 43, 124, 124, 124, + 124, 35, 35, 62, 62, 0, 36, 64, 91, 93, 126, -1, -1, 94, 94, + 94, 94, 94, 94, 94, 94, 125, 125, 125, 125, 125, 125, 125, 125, 60, + 60, 60, 60, 96, 96, 96, 96, 123, 123, 123, 123, -1, -1, -1, -1, + 92, 92, 92, 92, 195, 195, 195, 195, 208, 208, 208, 208, 128, 128, 130, + 130, 131, 131, 162, 162, 184, 184, 194, 194, 224, 224, 226, 226, 153, 161, + 167, 172, 176, 177, 179, 209, 216, 217, 227, 229, 230, -1, -1, -1, -1, + -1, -1, -1, 129, 129, 129, 129, 129, 129, 129, 129, 132, 132, 132, 132, + 132, 132, 132, 132, 133, 133, 133, 133, 133, 133, 133, 133, 134, 134, 134, + 134, 134, 134, 134, 134, 136, 136, 136, 136, 136, 136, 136, 136, 146, 146, + 146, 146, 146, 146, 146, 146, 154, 154, 154, 154, 154, 154, 154, 154, 156, + 156, 156, 156, 156, 156, 156, 156, 160, 160, 160, 160, 160, 160, 160, 160, + 163, 163, 163, 163, 163, 163, 163, 163, 164, 164, 164, 164, 164, 164, 164, + 164, 169, 169, 169, 169, 169, 169, 169, 169, 170, 170, 170, 170, 170, 170, + 170, 170, 173, 173, 173, 173, 173, 173, 173, 173, 178, 178, 178, 178, 178, + 178, 178, 178, 181, 181, 181, 181, 181, 181, 181, 181, 185, 185, 185, 185, + 185, 185, 185, 185, 186, 186, 186, 186, 186, 186, 186, 186, 187, 187, 187, + 187, 187, 187, 187, 187, 189, 189, 189, 189, 189, 189, 189, 189, 190, 190, + 190, 190, 190, 190, 190, 190, 196, 196, 196, 196, 196, 196, 196, 196, 198, + 198, 198, 198, 198, 198, 198, 198, 228, 228, 228, 228, 228, 228, 228, 228, + 232, 232, 232, 232, 232, 232, 232, 232, 233, 233, 233, 233, 233, 233, 233, + 233, 1, 1, 1, 1, 135, 135, 135, 135, 137, 137, 137, 137, 138, 138, + 138, 138, 139, 139, 139, 139, 140, 140, 140, 140, 141, 141, 141, 141, 143, + 143, 143, 143, 147, 147, 147, 147, 149, 149, 149, 149, 150, 150, 150, 150, + 151, 151, 151, 151, 152, 152, 152, 152, 155, 155, 155, 155, 157, 157, 157, + 157, 158, 158, 158, 158, 165, 165, 165, 165, 166, 166, 166, 166, 168, 168, + 168, 168, 174, 174, 174, 174, 175, 175, 175, 175, 180, 180, 180, 180, 182, + 182, 182, 182, 183, 183, 183, 183, 188, 188, 188, 188, 191, 191, 191, 191, + 197, 197, 197, 197, 231, 231, 231, 231, 239, 239, 239, 239, 9, 9, 142, + 142, 144, 144, 145, 145, 148, 148, 159, 159, 171, 171, 206, 206, 215, 215, + 225, 225, 236, 236, 237, 237, 199, 207, 234, 235, 192, 192, 192, 192, 192, + 192, 192, 192, 193, 193, 193, 193, 193, 193, 193, 193, 200, 200, 200, 200, + 200, 200, 200, 200, 201, 201, 201, 201, 201, 201, 201, 201, 202, 202, 202, + 202, 202, 202, 202, 202, 205, 205, 205, 205, 205, 205, 205, 205, 210, 210, + 210, 210, 210, 210, 210, 210, 213, 213, 213, 213, 213, 213, 213, 213, 218, + 218, 218, 218, 218, 218, 218, 218, 219, 219, 219, 219, 219, 219, 219, 219, + 238, 238, 238, 238, 238, 238, 238, 238, 240, 240, 240, 240, 240, 240, 240, + 240, 242, 242, 242, 242, 242, 242, 242, 242, 243, 243, 243, 243, 243, 243, + 243, 243, 255, 255, 255, 255, 255, 255, 255, 255, 203, 203, 203, 203, 204, + 204, 204, 204, 211, 211, 211, 211, 212, 212, 212, 212, 214, 214, 214, 214, + 221, 221, 221, 221, 222, 222, 222, 222, 223, 223, 223, 223, 241, 241, 241, + 241, 244, 244, 244, 244, 245, 245, 245, 245, 246, 246, 246, 246, 247, 247, + 247, 247, 248, 248, 248, 248, 250, 250, 250, 250, 251, 251, 251, 251, 252, + 252, 252, 252, 253, 253, 253, 253, 254, 254, 254, 254, 2, 2, 3, 3, + 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 11, 11, 12, 12, 14, + 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, + 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, + 30, 31, 31, 127, 127, 220, 220, 249, 249, -1, -1, 10, 10, 10, 10, + 10, 10, 10, 10, 13, 13, 13, 13, 13, 13, 13, 13, 22, 22, 22, + 22, 22, 22, 22, 22, 256, 256, 256, 256, 256, 256, 256, 256, 45, 45, + 45, 45, 45, 45, 45, 45, 46, 46, 46, 46, 46, 46, 46, 46, 47, + 47, 47, 47, 47, 47, 47, 47, 51, 51, 51, 51, 51, 51, 51, 51, + 52, 52, 52, 52, 52, 52, 52, 52, 53, 53, 53, 53, 53, 53, 53, + 53, 54, 54, 54, 54, 54, 54, 54, 54, 55, 55, 55, 55, 55, 55, + 55, 55, 56, 56, 56, 56, 56, 56, 56, 56, 57, 57, 57, 57, 57, + 57, 57, 57, 50, 50, 50, 50, 50, 50, 50, 50, 97, 97, 97, 97, + 97, 97, 97, 97, 99, 99, 99, 99, 99, 99, 99, 99, 101, 101, 101, + 101, 101, 101, 101, 101, 105, 105, 105, 105, 105, 105, 105, 105, 111, 111, + 111, 111, 111, 111, 111, 111, 115, 115, 115, 115, 115, 115, 115, 115, 116, + 116, 116, 116, 116, 116, 116, 116, 32, 32, 32, 32, 37, 37, 37, 37, + 45, 45, 45, 45, 46, 46, 46, 46, 47, 47, 47, 47, 51, 51, 51, + 51, 52, 52, 52, 52, 53, 53, 53, 53, 54, 54, 54, 54, 55, 55, + 55, 55, 56, 56, 56, 56, 57, 57, 57, 57, 61, 61, 61, 61, 65, + 65, 65, 65, 95, 95, 95, 95, 98, 98, 98, 98, 100, 100, 100, 100, + 102, 102, 102, 102, 103, 103, 103, 103, 104, 104, 104, 104, 108, 108, 108, + 108, 109, 109, 109, 109, 110, 110, 110, 110, 112, 112, 112, 112, 114, 114, + 114, 114, 117, 117, 117, 117, 58, 58, 66, 66, 67, 67, 68, 68, 69, + 69, 70, 70, 71, 71, 72, 72, 73, 73, 74, 74, 75, 75, 76, 76, + 77, 77, 78, 78, 79, 79, 80, 80, 81, 81, 82, 82, 83, 83, 84, + 84, 85, 85, 86, 86, 87, 87, 89, 89, 106, 106, 107, 107, 113, 113, + 118, 118, 119, 119, 120, 120, 121, 121, 122, 122, 38, 42, 44, 59, 88, + 90, -1, -1, 33, 33, 33, 33, 34, 34, 34, 34, 40, 40, 40, 40, + 41, 41, 41, 41, 63, 63, 63, 63, 39, 39, 43, 43, 124, 124, 35, + 62, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 36, 36, + 36, 36, 36, 36, 36, 36, 64, 64, 64, 64, 64, 64, 64, 64, 91, + 91, 91, 91, 91, 91, 91, 91, 93, 93, 93, 93, 93, 93, 93, 93, + 126, 126, 126, 126, 126, 126, 126, 126, 94, 94, 94, 94, 125, 125, 125, + 125, 60, 60, 96, 96, 123, 123, -1, -1, 92, 92, 195, 195, 208, 208, + 128, 130, 131, 162, 184, 194, 224, 226, -1, -1, 153, 153, 153, 153, 153, + 153, 153, 153, 161, 161, 161, 161, 161, 161, 161, 161, 167, 167, 167, 167, + 167, 167, 167, 167, 172, 172, 172, 172, 172, 172, 172, 172, 176, 176, 176, + 176, 176, 176, 176, 176, 177, 177, 177, 177, 177, 177, 177, 177, 179, 179, + 179, 179, 179, 179, 179, 179, 209, 209, 209, 209, 209, 209, 209, 209, 216, + 216, 216, 216, 216, 216, 216, 216, 217, 217, 217, 217, 217, 217, 217, 217, + 227, 227, 227, 227, 227, 227, 227, 227, 229, 229, 229, 229, 229, 229, 229, + 229, 230, 230, 230, 230, 230, 230, 230, 230, 129, 129, 129, 129, 132, 132, + 132, 132, 133, 133, 133, 133, 134, 134, 134, 134, 136, 136, 136, 136, 146, + 146, 146, 146, 154, 154, 154, 154, 156, 156, 156, 156, 160, 160, 160, 160, + 163, 163, 163, 163, 164, 164, 164, 164, 169, 169, 169, 169, 170, 170, 170, + 170, 173, 173, 173, 173, 178, 178, 178, 178, 181, 181, 181, 181, 185, 185, + 185, 185, 186, 186, 186, 186, 187, 187, 187, 187, 189, 189, 189, 189, 190, + 190, 190, 190, 196, 196, 196, 196, 198, 198, 198, 198, 228, 228, 228, 228, + 232, 232, 232, 232, 233, 233, 233, 233, 1, 1, 135, 135, 137, 137, 138, + 138, 139, 139, 140, 140, 141, 141, 143, 143, 147, 147, 149, 149, 150, 150, + 151, 151, 152, 152, 155, 155, 157, 157, 158, 158, 165, 165, 166, 166, 168, + 168, 174, 174, 175, 175, 180, 180, 182, 182, 183, 183, 188, 188, 191, 191, + 197, 197, 231, 231, 239, 239, 9, 142, 144, 145, 148, 159, 171, 206, 215, + 225, 236, 237, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 199, 199, + 199, 199, 199, 199, 199, 199, 207, 207, 207, 207, 207, 207, 207, 207, 234, + 234, 234, 234, 234, 234, 234, 234, 235, 235, 235, 235, 235, 235, 235, 235, + 192, 192, 192, 192, 193, 193, 193, 193, 200, 200, 200, 200, 201, 201, 201, + 201, 202, 202, 202, 202, 205, 205, 205, 205, 210, 210, 210, 210, 213, 213, + 213, 213, 218, 218, 218, 218, 219, 219, 219, 219, 238, 238, 238, 238, 240, + 240, 240, 240, 242, 242, 242, 242, 243, 243, 243, 243, 255, 255, 255, 255, + 203, 203, 204, 204, 211, 211, 212, 212, 214, 214, 221, 221, 222, 222, 223, + 223, 241, 241, 244, 244, 245, 245, 246, 246, 247, 247, 248, 248, 250, 250, + 251, 251, 252, 252, 253, 253, 254, 254, 2, 3, 4, 5, 6, 7, 8, + 11, 12, 14, 15, 16, 17, 18, 19, 20, 21, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 127, 220, 249, -1, 10, 10, 10, 10, 13, 13, 13, + 13, 22, 22, 22, 22, 256, 256, 256, 256, }; static const gpr_uint8 inverse_base64[256] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 62, 255, - 255, 255, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 255, 255, - 255, 64, 255, 255, 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 255, 255, 255, 255, 255, 255, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 49, 50, 51, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 62, 255, + 255, 255, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 255, 255, + 255, 64, 255, 255, 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 255, 255, 255, 255, 255, 255, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, }; /* emission helpers */ -static void -on_hdr (grpc_chttp2_hpack_parser * p, grpc_mdelem * md, int add_to_table) -{ - if (add_to_table) - { - GRPC_MDELEM_REF (md); - grpc_chttp2_hptbl_add (&p->table, md); - } - p->on_header (p->on_header_user_data, md); +static void on_hdr(grpc_chttp2_hpack_parser *p, grpc_mdelem *md, + int add_to_table) { + if (add_to_table) { + GRPC_MDELEM_REF(md); + grpc_chttp2_hptbl_add(&p->table, md); + } + p->on_header(p->on_header_user_data, md); } -static grpc_mdstr * -take_string (grpc_chttp2_hpack_parser * p, grpc_chttp2_hpack_parser_string * str) -{ - grpc_mdstr *s = grpc_mdstr_from_buffer (p->table.mdctx, (gpr_uint8 *) str->str, - str->length); +static grpc_mdstr *take_string(grpc_chttp2_hpack_parser *p, + grpc_chttp2_hpack_parser_string *str) { + grpc_mdstr *s = grpc_mdstr_from_buffer(p->table.mdctx, (gpr_uint8 *)str->str, + str->length); str->length = 0; return s; } /* jump to the next state */ -static int -parse_next (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_next(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { p->state = *p->next_state++; - return p->state (p, cur, end); + return p->state(p, cur, end); } /* begin parsing a header: all functionality is encoded into lookup tables above */ -static int -parse_begin (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - if (cur == end) - { - p->state = parse_begin; - return 1; - } - - return first_byte_action[first_byte_lut[*cur]] (p, cur, end); +static int parse_begin(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { + if (cur == end) { + p->state = parse_begin; + return 1; + } + + return first_byte_action[first_byte_lut[*cur]](p, cur, end); } /* stream dependency and prioritization data: we just skip it */ -static int -parse_stream_weight (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - if (cur == end) - { - p->state = parse_stream_weight; - return 1; - } - - return p->after_prioritization (p, cur + 1, end); +static int parse_stream_weight(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { + if (cur == end) { + p->state = parse_stream_weight; + return 1; + } + + return p->after_prioritization(p, cur + 1, end); } -static int -parse_stream_dep3 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - if (cur == end) - { - p->state = parse_stream_dep3; - return 1; - } +static int parse_stream_dep3(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { + if (cur == end) { + p->state = parse_stream_dep3; + return 1; + } - return parse_stream_weight (p, cur + 1, end); + return parse_stream_weight(p, cur + 1, end); } -static int -parse_stream_dep2 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - if (cur == end) - { - p->state = parse_stream_dep2; - return 1; - } +static int parse_stream_dep2(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { + if (cur == end) { + p->state = parse_stream_dep2; + return 1; + } - return parse_stream_dep3 (p, cur + 1, end); + return parse_stream_dep3(p, cur + 1, end); } -static int -parse_stream_dep1 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - if (cur == end) - { - p->state = parse_stream_dep1; - return 1; - } +static int parse_stream_dep1(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { + if (cur == end) { + p->state = parse_stream_dep1; + return 1; + } - return parse_stream_dep2 (p, cur + 1, end); + return parse_stream_dep2(p, cur + 1, end); } -static int -parse_stream_dep0 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - if (cur == end) - { - p->state = parse_stream_dep0; - return 1; - } +static int parse_stream_dep0(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { + if (cur == end) { + p->state = parse_stream_dep0; + return 1; + } - return parse_stream_dep1 (p, cur + 1, end); + return parse_stream_dep1(p, cur + 1, end); } /* emit an indexed field; for now just logs it to console; jumps to begin the next field on completion */ -static int -finish_indexed_field (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - grpc_mdelem *md = grpc_chttp2_hptbl_lookup (&p->table, p->index); - GRPC_MDELEM_REF (md); - on_hdr (p, md, 0); - return parse_begin (p, cur, end); +static int finish_indexed_field(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { + grpc_mdelem *md = grpc_chttp2_hptbl_lookup(&p->table, p->index); + GRPC_MDELEM_REF(md); + on_hdr(p, md, 0); + return parse_begin(p, cur, end); } /* parse an indexed field with index < 127 */ -static int -parse_indexed_field (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_indexed_field(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { p->index = (*cur) & 0x7f; - return finish_indexed_field (p, cur + 1, end); + return finish_indexed_field(p, cur + 1, end); } /* parse an indexed field with index >= 127 */ -static int -parse_indexed_field_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_indexed_field_x(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { - finish_indexed_field - }; + finish_indexed_field}; p->next_state = and_then; p->index = 0x7f; p->parsing.value = &p->index; - return parse_value0 (p, cur + 1, end); + return parse_value0(p, cur + 1, end); } /* finish a literal header with incremental indexing: just log, and jump to ' begin */ -static int -finish_lithdr_incidx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - grpc_mdelem *md = grpc_chttp2_hptbl_lookup (&p->table, p->index); - on_hdr (p, grpc_mdelem_from_metadata_strings (p->table.mdctx, GRPC_MDSTR_REF (md->key), take_string (p, &p->value)), 1); - return parse_begin (p, cur, end); +static int finish_lithdr_incidx(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { + grpc_mdelem *md = grpc_chttp2_hptbl_lookup(&p->table, p->index); + on_hdr(p, grpc_mdelem_from_metadata_strings(p->table.mdctx, + GRPC_MDSTR_REF(md->key), + take_string(p, &p->value)), + 1); + return parse_begin(p, cur, end); } /* finish a literal header with incremental indexing with no index */ -static int -finish_lithdr_incidx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - on_hdr (p, grpc_mdelem_from_metadata_strings (p->table.mdctx, take_string (p, &p->key), take_string (p, &p->value)), 1); - return parse_begin (p, cur, end); +static int finish_lithdr_incidx_v(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { + on_hdr(p, grpc_mdelem_from_metadata_strings(p->table.mdctx, + take_string(p, &p->key), + take_string(p, &p->value)), + 1); + return parse_begin(p, cur, end); } /* parse a literal header with incremental indexing; index < 63 */ -static int -parse_lithdr_incidx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_lithdr_incidx(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_value_string_with_indexed_key, finish_lithdr_incidx - }; + parse_value_string_with_indexed_key, finish_lithdr_incidx}; p->next_state = and_then; p->index = (*cur) & 0x3f; - return parse_string_prefix (p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* parse a literal header with incremental indexing; index >= 63 */ -static int -parse_lithdr_incidx_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_lithdr_incidx_x(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_string_prefix, parse_value_string_with_indexed_key, - finish_lithdr_incidx - }; + parse_string_prefix, parse_value_string_with_indexed_key, + finish_lithdr_incidx}; p->next_state = and_then; p->index = 0x3f; p->parsing.value = &p->index; - return parse_value0 (p, cur + 1, end); + return parse_value0(p, cur + 1, end); } /* parse a literal header with incremental indexing; index = 0 */ -static int -parse_lithdr_incidx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_lithdr_incidx_v(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_key_string, parse_string_prefix, - parse_value_string_with_literal_key, finish_lithdr_incidx_v - }; + parse_key_string, parse_string_prefix, + parse_value_string_with_literal_key, finish_lithdr_incidx_v}; p->next_state = and_then; - return parse_string_prefix (p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* finish a literal header without incremental indexing */ -static int -finish_lithdr_notidx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - grpc_mdelem *md = grpc_chttp2_hptbl_lookup (&p->table, p->index); - on_hdr (p, grpc_mdelem_from_metadata_strings (p->table.mdctx, GRPC_MDSTR_REF (md->key), take_string (p, &p->value)), 0); - return parse_begin (p, cur, end); +static int finish_lithdr_notidx(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { + grpc_mdelem *md = grpc_chttp2_hptbl_lookup(&p->table, p->index); + on_hdr(p, grpc_mdelem_from_metadata_strings(p->table.mdctx, + GRPC_MDSTR_REF(md->key), + take_string(p, &p->value)), + 0); + return parse_begin(p, cur, end); } /* finish a literal header without incremental indexing with index = 0 */ -static int -finish_lithdr_notidx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - on_hdr (p, grpc_mdelem_from_metadata_strings (p->table.mdctx, take_string (p, &p->key), take_string (p, &p->value)), 0); - return parse_begin (p, cur, end); +static int finish_lithdr_notidx_v(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { + on_hdr(p, grpc_mdelem_from_metadata_strings(p->table.mdctx, + take_string(p, &p->key), + take_string(p, &p->value)), + 0); + return parse_begin(p, cur, end); } /* parse a literal header without incremental indexing; index < 15 */ -static int -parse_lithdr_notidx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_lithdr_notidx(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_value_string_with_indexed_key, finish_lithdr_notidx - }; + parse_value_string_with_indexed_key, finish_lithdr_notidx}; p->next_state = and_then; p->index = (*cur) & 0xf; - return parse_string_prefix (p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* parse a literal header without incremental indexing; index >= 15 */ -static int -parse_lithdr_notidx_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_lithdr_notidx_x(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_string_prefix, parse_value_string_with_indexed_key, - finish_lithdr_notidx - }; + parse_string_prefix, parse_value_string_with_indexed_key, + finish_lithdr_notidx}; p->next_state = and_then; p->index = 0xf; p->parsing.value = &p->index; - return parse_value0 (p, cur + 1, end); + return parse_value0(p, cur + 1, end); } /* parse a literal header without incremental indexing; index == 0 */ -static int -parse_lithdr_notidx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_lithdr_notidx_v(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_key_string, parse_string_prefix, - parse_value_string_with_literal_key, finish_lithdr_notidx_v - }; + parse_key_string, parse_string_prefix, + parse_value_string_with_literal_key, finish_lithdr_notidx_v}; p->next_state = and_then; - return parse_string_prefix (p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* finish a literal header that is never indexed */ -static int -finish_lithdr_nvridx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - grpc_mdelem *md = grpc_chttp2_hptbl_lookup (&p->table, p->index); - on_hdr (p, grpc_mdelem_from_metadata_strings (p->table.mdctx, GRPC_MDSTR_REF (md->key), take_string (p, &p->value)), 0); - return parse_begin (p, cur, end); +static int finish_lithdr_nvridx(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { + grpc_mdelem *md = grpc_chttp2_hptbl_lookup(&p->table, p->index); + on_hdr(p, grpc_mdelem_from_metadata_strings(p->table.mdctx, + GRPC_MDSTR_REF(md->key), + take_string(p, &p->value)), + 0); + return parse_begin(p, cur, end); } /* finish a literal header that is never indexed with an extra value */ -static int -finish_lithdr_nvridx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - on_hdr (p, grpc_mdelem_from_metadata_strings (p->table.mdctx, take_string (p, &p->key), take_string (p, &p->value)), 0); - return parse_begin (p, cur, end); +static int finish_lithdr_nvridx_v(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { + on_hdr(p, grpc_mdelem_from_metadata_strings(p->table.mdctx, + take_string(p, &p->key), + take_string(p, &p->value)), + 0); + return parse_begin(p, cur, end); } /* parse a literal header that is never indexed; index < 15 */ -static int -parse_lithdr_nvridx (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_lithdr_nvridx(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_value_string_with_indexed_key, finish_lithdr_nvridx - }; + parse_value_string_with_indexed_key, finish_lithdr_nvridx}; p->next_state = and_then; p->index = (*cur) & 0xf; - return parse_string_prefix (p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* parse a literal header that is never indexed; index >= 15 */ -static int -parse_lithdr_nvridx_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_string_prefix, parse_value_string_with_indexed_key, - finish_lithdr_nvridx - }; + parse_string_prefix, parse_value_string_with_indexed_key, + finish_lithdr_nvridx}; p->next_state = and_then; p->index = 0xf; p->parsing.value = &p->index; - return parse_value0 (p, cur + 1, end); + return parse_value0(p, cur + 1, end); } /* parse a literal header that is never indexed; index == 0 */ -static int -parse_lithdr_nvridx_v (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { - parse_key_string, parse_string_prefix, - parse_value_string_with_literal_key, finish_lithdr_nvridx_v - }; + parse_key_string, parse_string_prefix, + parse_value_string_with_literal_key, finish_lithdr_nvridx_v}; p->next_state = and_then; - return parse_string_prefix (p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* finish parsing a max table size change */ -static int -finish_max_tbl_size (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - gpr_log (GPR_INFO, "MAX TABLE SIZE: %d", p->index); - abort (); /* not implemented */ - return parse_begin (p, cur, end); +static int finish_max_tbl_size(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { + gpr_log(GPR_INFO, "MAX TABLE SIZE: %d", p->index); + abort(); /* not implemented */ + return parse_begin(p, cur, end); } /* parse a max table size change, max size < 15 */ -static int -parse_max_tbl_size (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_max_tbl_size(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { p->index = (*cur) & 0xf; - return finish_max_tbl_size (p, cur + 1, end); + return finish_max_tbl_size(p, cur + 1, end); } /* parse a max table size change, max size >= 15 */ -static int -parse_max_tbl_size_x (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_max_tbl_size_x(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { - finish_max_tbl_size - }; + finish_max_tbl_size}; p->next_state = and_then; p->index = 0xf; p->parsing.value = &p->index; - return parse_value0 (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 int -parse_error (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_error(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { p->state = parse_error; return 0; } /* parse the 1st byte of a varint into p->parsing.value no overflow is possible */ -static int -parse_value0 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - if (cur == end) - { - p->state = parse_value0; - return 1; - } +static int parse_value0(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { + if (cur == end) { + p->state = parse_value0; + return 1; + } *p->parsing.value += (*cur) & 0x7f; - if ((*cur) & 0x80) - { - return parse_value1 (p, cur + 1, end); - } - else - { - return parse_next (p, cur + 1, end); - } + if ((*cur) & 0x80) { + return parse_value1(p, cur + 1, end); + } else { + return parse_next(p, cur + 1, end); + } } /* parse the 2nd byte of a varint into p->parsing.value no overflow is possible */ -static int -parse_value1 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - if (cur == end) - { - p->state = parse_value1; - return 1; - } - - *p->parsing.value += (((gpr_uint32) * cur) & 0x7f) << 7; - - if ((*cur) & 0x80) - { - return parse_value2 (p, cur + 1, end); - } - else - { - return parse_next (p, cur + 1, end); - } +static int parse_value1(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { + if (cur == end) { + p->state = parse_value1; + return 1; + } + + *p->parsing.value += (((gpr_uint32)*cur) & 0x7f) << 7; + + if ((*cur) & 0x80) { + return parse_value2(p, cur + 1, end); + } else { + return parse_next(p, cur + 1, end); + } } /* parse the 3rd byte of a varint into p->parsing.value no overflow is possible */ -static int -parse_value2 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - if (cur == end) - { - p->state = parse_value2; - return 1; - } - - *p->parsing.value += (((gpr_uint32) * cur) & 0x7f) << 14; - - if ((*cur) & 0x80) - { - return parse_value3 (p, cur + 1, end); - } - else - { - return parse_next (p, cur + 1, end); - } +static int parse_value2(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { + if (cur == end) { + p->state = parse_value2; + return 1; + } + + *p->parsing.value += (((gpr_uint32)*cur) & 0x7f) << 14; + + if ((*cur) & 0x80) { + return parse_value3(p, cur + 1, end); + } else { + return parse_next(p, cur + 1, end); + } } /* parse the 4th byte of a varint into p->parsing.value no overflow is possible */ -static int -parse_value3 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - if (cur == end) - { - p->state = parse_value3; - return 1; - } - - *p->parsing.value += (((gpr_uint32) * cur) & 0x7f) << 21; - - if ((*cur) & 0x80) - { - return parse_value4 (p, cur + 1, end); - } - else - { - return parse_next (p, cur + 1, end); - } +static int parse_value3(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { + if (cur == end) { + p->state = parse_value3; + return 1; + } + + *p->parsing.value += (((gpr_uint32)*cur) & 0x7f) << 21; + + if ((*cur) & 0x80) { + return parse_value4(p, cur + 1, end); + } else { + 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 int -parse_value4 (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_value4(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { gpr_uint8 c; gpr_uint32 cur_value; gpr_uint32 add_value; - if (cur == end) - { - p->state = parse_value4; - return 1; - } + if (cur == end) { + p->state = parse_value4; + return 1; + } c = (*cur) & 0x7f; - if (c > 0xf) - { - goto error; - } + if (c > 0xf) { + goto error; + } cur_value = *p->parsing.value; - add_value = ((gpr_uint32) c) << 28; - if (add_value > 0xffffffffu - cur_value) - { - goto error; - } + add_value = ((gpr_uint32)c) << 28; + if (add_value > 0xffffffffu - cur_value) { + goto error; + } *p->parsing.value = cur_value + add_value; - if ((*cur) & 0x80) - { - return parse_value5up (p, cur + 1, end); - } - else - { - return parse_next (p, cur + 1, end); - } + if ((*cur) & 0x80) { + return parse_value5up(p, cur + 1, end); + } else { + return parse_next(p, cur + 1, end); + } error: - gpr_log (GPR_ERROR, "integer overflow in hpack integer decoding: have 0x%08x, " "got byte 0x%02x", *p->parsing.value, *cur); - return parse_error (p, cur, end); + gpr_log(GPR_ERROR, + "integer overflow in hpack integer decoding: have 0x%08x, " + "got byte 0x%02x", + *p->parsing.value, *cur); + return parse_error(p, cur, end); } /* 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 int -parse_value5up (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - while (cur != end && *cur == 0x80) - { - ++cur; - } - - if (cur == end) - { - p->state = parse_value5up; - return 1; - } - - if (*cur == 0) - { - return parse_next (p, cur + 1, end); - } - - gpr_log (GPR_ERROR, "integer overflow in hpack integer decoding: have 0x%08x, " "got byte 0x%02x sometime after byte 4"); - return parse_error (p, cur, end); +static int parse_value5up(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { + while (cur != end && *cur == 0x80) { + ++cur; + } + + if (cur == end) { + p->state = parse_value5up; + return 1; + } + + if (*cur == 0) { + return parse_next(p, cur + 1, end); + } + + gpr_log(GPR_ERROR, + "integer overflow in hpack integer decoding: have 0x%08x, " + "got byte 0x%02x sometime after byte 4"); + return parse_error(p, cur, end); } /* parse a string prefix */ -static int -parse_string_prefix (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - if (cur == end) - { - p->state = parse_string_prefix; - return 1; - } +static int parse_string_prefix(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, const gpr_uint8 *end) { + if (cur == end) { + p->state = parse_string_prefix; + return 1; + } p->strlen = (*cur) & 0x7f; p->huff = (*cur) >> 7; - if (p->strlen == 0x7f) - { - p->parsing.value = &p->strlen; - return parse_value0 (p, cur + 1, end); - } - else - { - return parse_next (p, cur + 1, end); - } + if (p->strlen == 0x7f) { + p->parsing.value = &p->strlen; + return parse_value0(p, cur + 1, end); + } else { + return parse_next(p, cur + 1, end); + } } /* append some bytes to a string */ -static void -append_bytes (grpc_chttp2_hpack_parser_string * str, const gpr_uint8 * data, size_t length) -{ - if (length + str->length > str->capacity) - { - GPR_ASSERT (str->length + length <= GPR_UINT32_MAX); - str->capacity = (gpr_uint32) (str->length + length); - str->str = gpr_realloc (str->str, str->capacity); - } - memcpy (str->str + str->length, data, length); - GPR_ASSERT (length <= GPR_UINT32_MAX - str->length); - str->length += (gpr_uint32) length; +static void append_bytes(grpc_chttp2_hpack_parser_string *str, + const gpr_uint8 *data, size_t length) { + if (length + str->length > str->capacity) { + GPR_ASSERT(str->length + length <= GPR_UINT32_MAX); + str->capacity = (gpr_uint32)(str->length + length); + str->str = gpr_realloc(str->str, str->capacity); + } + memcpy(str->str + str->length, data, length); + GPR_ASSERT(length <= GPR_UINT32_MAX - str->length); + str->length += (gpr_uint32)length; } -static int -append_string (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int append_string(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { grpc_chttp2_hpack_parser_string *str = p->parsing.str; gpr_uint32 bits; gpr_uint8 decoded[3]; - switch ((binary_state) p->binary) - { + switch ((binary_state)p->binary) { case NOT_BINARY: - append_bytes (str, cur, (size_t) (end - cur)); + append_bytes(str, cur, (size_t)(end - cur)); return 1; b64_byte0: case B64_BYTE0: - if (cur == end) - { - p->binary = B64_BYTE0; - return 1; - } + if (cur == end) { + p->binary = B64_BYTE0; + return 1; + } bits = inverse_base64[*cur]; ++cur; if (bits == 255) - return 0; + return 0; else if (bits == 64) - goto b64_byte0; + goto b64_byte0; p->base64_buffer = bits << 18; - /* fallthrough */ + /* fallthrough */ b64_byte1: case B64_BYTE1: - if (cur == end) - { - p->binary = B64_BYTE1; - return 1; - } + if (cur == end) { + p->binary = B64_BYTE1; + return 1; + } bits = inverse_base64[*cur]; ++cur; if (bits == 255) - return 0; + return 0; else if (bits == 64) - goto b64_byte1; + goto b64_byte1; p->base64_buffer |= bits << 12; - /* fallthrough */ + /* fallthrough */ b64_byte2: case B64_BYTE2: - if (cur == end) - { - p->binary = B64_BYTE2; - return 1; - } + if (cur == end) { + p->binary = B64_BYTE2; + return 1; + } bits = inverse_base64[*cur]; ++cur; if (bits == 255) - return 0; + return 0; else if (bits == 64) - goto b64_byte2; + goto b64_byte2; p->base64_buffer |= bits << 6; - /* fallthrough */ + /* fallthrough */ b64_byte3: case B64_BYTE3: - if (cur == end) - { - p->binary = B64_BYTE3; - return 1; - } + if (cur == end) { + p->binary = B64_BYTE3; + return 1; + } bits = inverse_base64[*cur]; ++cur; if (bits == 255) - return 0; + return 0; else if (bits == 64) - goto b64_byte3; + goto b64_byte3; p->base64_buffer |= bits; bits = p->base64_buffer; - decoded[0] = (gpr_uint8) (bits >> 16); - decoded[1] = (gpr_uint8) (bits >> 8); - decoded[2] = (gpr_uint8) (bits); - append_bytes (str, decoded, 3); + decoded[0] = (gpr_uint8)(bits >> 16); + decoded[1] = (gpr_uint8)(bits >> 8); + decoded[2] = (gpr_uint8)(bits); + append_bytes(str, decoded, 3); goto b64_byte0; - } - gpr_log (GPR_ERROR, "should never reach here"); - abort (); + } + gpr_log(GPR_ERROR, "should never reach here"); + abort(); return 1; } /* append a null terminator to a string */ -static int -finish_str (grpc_chttp2_hpack_parser * p) -{ +static int finish_str(grpc_chttp2_hpack_parser *p) { gpr_uint8 terminator = 0; gpr_uint8 decoded[2]; gpr_uint32 bits; grpc_chttp2_hpack_parser_string *str = p->parsing.str; - switch ((binary_state) p->binary) - { + switch ((binary_state)p->binary) { case NOT_BINARY: break; case B64_BYTE0: break; case B64_BYTE1: - gpr_log (GPR_ERROR, "illegal base64 encoding"); - return 0; /* illegal encoding */ + gpr_log(GPR_ERROR, "illegal base64 encoding"); + return 0; /* illegal encoding */ case B64_BYTE2: bits = p->base64_buffer; - if (bits & 0xffff) - { - gpr_log (GPR_ERROR, "trailing bits in base64 encoding: 0x%04x", bits & 0xffff); - return 0; - } - decoded[0] = (gpr_uint8) (bits >> 16); - append_bytes (str, decoded, 1); + if (bits & 0xffff) { + gpr_log(GPR_ERROR, "trailing bits in base64 encoding: 0x%04x", + bits & 0xffff); + return 0; + } + decoded[0] = (gpr_uint8)(bits >> 16); + append_bytes(str, decoded, 1); break; case B64_BYTE3: bits = p->base64_buffer; - if (bits & 0xff) - { - gpr_log (GPR_ERROR, "trailing bits in base64 encoding: 0x%02x", bits & 0xff); - return 0; - } - decoded[0] = (gpr_uint8) (bits >> 16); - decoded[1] = (gpr_uint8) (bits >> 8); - append_bytes (str, decoded, 2); + if (bits & 0xff) { + gpr_log(GPR_ERROR, "trailing bits in base64 encoding: 0x%02x", + bits & 0xff); + return 0; + } + decoded[0] = (gpr_uint8)(bits >> 16); + decoded[1] = (gpr_uint8)(bits >> 8); + append_bytes(str, decoded, 2); break; - } - append_bytes (str, &terminator, 1); - p->parsing.str->length--; /* don't actually count the null terminator */ + } + append_bytes(str, &terminator, 1); + p->parsing.str->length--; /* don't actually count the null terminator */ return 1; } /* decode a nibble from a huffman encoded stream */ -static int -huff_nibble (grpc_chttp2_hpack_parser * p, gpr_uint8 nibble) -{ +static int huff_nibble(grpc_chttp2_hpack_parser *p, gpr_uint8 nibble) { gpr_int16 emit = emit_sub_tbl[16 * emit_tbl[p->huff_state] + nibble]; gpr_int16 next = next_sub_tbl[16 * next_tbl[p->huff_state] + nibble]; - if (emit != -1) - { - if (emit >= 0 && emit < 256) - { - gpr_uint8 c = (gpr_uint8) emit; - if (!append_string (p, &c, (&c) + 1)) - return 0; - } - else - { - assert (emit == 256); - } + if (emit != -1) { + if (emit >= 0 && emit < 256) { + gpr_uint8 c = (gpr_uint8)emit; + if (!append_string(p, &c, (&c) + 1)) return 0; + } else { + assert(emit == 256); } + } p->huff_state = next; return 1; } /* decode full bytes from a huffman encoded stream */ -static int -add_huff_bytes (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - for (; cur != end; ++cur) - { - if (!huff_nibble (p, *cur >> 4) || !huff_nibble (p, *cur & 0xf)) - return 0; - } +static int add_huff_bytes(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { + for (; cur != end; ++cur) { + if (!huff_nibble(p, *cur >> 4) || !huff_nibble(p, *cur & 0xf)) return 0; + } return 1; } /* decode some string bytes based on the current decoding mode (huffman or not) */ -static int -add_str_bytes (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - if (p->huff) - { - return add_huff_bytes (p, cur, end); - } - else - { - return append_string (p, cur, end); - } +static int add_str_bytes(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { + if (p->huff) { + return add_huff_bytes(p, cur, end); + } else { + return append_string(p, cur, end); + } } /* parse a string - tries to do large chunks at a time */ -static int -parse_string (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ +static int parse_string(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { size_t remaining = p->strlen - p->strgot; - size_t given = (size_t) (end - cur); - if (remaining <= given) - { - return add_str_bytes (p, cur, cur + remaining) && finish_str (p) && parse_next (p, cur + remaining, end); - } - else - { - if (!add_str_bytes (p, cur, cur + given)) - return 0; - GPR_ASSERT (given <= GPR_UINT32_MAX - p->strgot); - p->strgot += (gpr_uint32) given; - p->state = parse_string; - return 1; - } + size_t given = (size_t)(end - cur); + if (remaining <= given) { + return add_str_bytes(p, cur, cur + remaining) && finish_str(p) && + parse_next(p, cur + remaining, end); + } else { + if (!add_str_bytes(p, cur, cur + given)) return 0; + GPR_ASSERT(given <= GPR_UINT32_MAX - p->strgot); + p->strgot += (gpr_uint32)given; + p->state = parse_string; + return 1; + } } /* begin parsing a string - performs setup, calls parse_string */ -static int -begin_parse_string (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end, gpr_uint8 binary, grpc_chttp2_hpack_parser_string * str) -{ +static int begin_parse_string(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end, gpr_uint8 binary, + grpc_chttp2_hpack_parser_string *str) { p->strgot = 0; str->length = 0; p->parsing.str = str; p->huff_state = 0; p->binary = binary; - return parse_string (p, cur, end); + return parse_string(p, cur, end); } /* parse the key string */ -static int -parse_key_string (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - return begin_parse_string (p, cur, end, NOT_BINARY, &p->key); +static int parse_key_string(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end) { + return begin_parse_string(p, cur, end, NOT_BINARY, &p->key); } /* check if a key represents a binary header or not */ -typedef enum -{ BINARY_HEADER, PLAINTEXT_HEADER, ERROR_HEADER } is_binary_header; +typedef enum { BINARY_HEADER, PLAINTEXT_HEADER, ERROR_HEADER } is_binary_header; -static is_binary_header -is_binary_literal_header (grpc_chttp2_hpack_parser * p) -{ - return grpc_is_binary_header (p->key.str, p->key.length) ? BINARY_HEADER : PLAINTEXT_HEADER; +static is_binary_header is_binary_literal_header(grpc_chttp2_hpack_parser *p) { + return grpc_is_binary_header(p->key.str, p->key.length) ? BINARY_HEADER + : PLAINTEXT_HEADER; } -static is_binary_header -is_binary_indexed_header (grpc_chttp2_hpack_parser * p) -{ - grpc_mdelem *elem = grpc_chttp2_hptbl_lookup (&p->table, p->index); - if (!elem) - return ERROR_HEADER; - return grpc_is_binary_header ((const char *) GPR_SLICE_START_PTR (elem->key->slice), GPR_SLICE_LENGTH (elem->key->slice)) ? BINARY_HEADER : PLAINTEXT_HEADER; +static is_binary_header is_binary_indexed_header(grpc_chttp2_hpack_parser *p) { + grpc_mdelem *elem = grpc_chttp2_hptbl_lookup(&p->table, p->index); + if (!elem) return ERROR_HEADER; + return grpc_is_binary_header( + (const char *)GPR_SLICE_START_PTR(elem->key->slice), + GPR_SLICE_LENGTH(elem->key->slice)) + ? BINARY_HEADER + : PLAINTEXT_HEADER; } /* parse the value string */ -static int -parse_value_string (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end, is_binary_header type) -{ - switch (type) - { +static int parse_value_string(grpc_chttp2_hpack_parser *p, const gpr_uint8 *cur, + const gpr_uint8 *end, is_binary_header type) { + switch (type) { case BINARY_HEADER: - return begin_parse_string (p, cur, end, B64_BYTE0, &p->value); + return begin_parse_string(p, cur, end, B64_BYTE0, &p->value); case PLAINTEXT_HEADER: - return begin_parse_string (p, cur, end, NOT_BINARY, &p->value); + return begin_parse_string(p, cur, end, NOT_BINARY, &p->value); case ERROR_HEADER: return 0; - } + } /* Add code to prevent return without value error */ - gpr_log (GPR_ERROR, "Should never reach beyond switch in parse_value_string"); - abort (); + gpr_log(GPR_ERROR, "Should never reach beyond switch in parse_value_string"); + abort(); return 0; } -static int -parse_value_string_with_indexed_key (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - return parse_value_string (p, cur, end, is_binary_indexed_header (p)); +static int parse_value_string_with_indexed_key(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, + const gpr_uint8 *end) { + return parse_value_string(p, cur, end, is_binary_indexed_header(p)); } -static int -parse_value_string_with_literal_key (grpc_chttp2_hpack_parser * p, const gpr_uint8 * cur, const gpr_uint8 * end) -{ - return parse_value_string (p, cur, end, is_binary_literal_header (p)); +static int parse_value_string_with_literal_key(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *cur, + const gpr_uint8 *end) { + return parse_value_string(p, cur, end, is_binary_literal_header(p)); } /* PUBLIC INTERFACE */ -static void -on_header_not_set (void *user_data, grpc_mdelem * md) -{ - char *keyhex = gpr_dump_slice (md->key->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); - char *valuehex = gpr_dump_slice (md->value->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log (GPR_ERROR, "on_header callback not set; key=%s value=%s", keyhex, valuehex); - gpr_free (keyhex); - gpr_free (valuehex); - GRPC_MDELEM_UNREF (md); - abort (); +static void on_header_not_set(void *user_data, grpc_mdelem *md) { + char *keyhex = gpr_dump_slice(md->key->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); + char *valuehex = + gpr_dump_slice(md->value->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log(GPR_ERROR, "on_header callback not set; key=%s value=%s", keyhex, + valuehex); + gpr_free(keyhex); + gpr_free(valuehex); + GRPC_MDELEM_UNREF(md); + abort(); } -void -grpc_chttp2_hpack_parser_init (grpc_chttp2_hpack_parser * p, grpc_mdctx * mdctx) -{ +void grpc_chttp2_hpack_parser_init(grpc_chttp2_hpack_parser *p, + grpc_mdctx *mdctx) { p->on_header = on_header_not_set; p->on_header_user_data = NULL; p->state = parse_begin; @@ -1429,62 +1357,58 @@ grpc_chttp2_hpack_parser_init (grpc_chttp2_hpack_parser * p, grpc_mdctx * mdctx) p->value.str = NULL; p->value.capacity = 0; p->value.length = 0; - grpc_chttp2_hptbl_init (&p->table, mdctx); + grpc_chttp2_hptbl_init(&p->table, mdctx); } -void -grpc_chttp2_hpack_parser_set_has_priority (grpc_chttp2_hpack_parser * p) -{ +void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser *p) { p->after_prioritization = p->state; p->state = parse_stream_dep0; } -void -grpc_chttp2_hpack_parser_destroy (grpc_chttp2_hpack_parser * p) -{ - grpc_chttp2_hptbl_destroy (&p->table); - gpr_free (p->key.str); - gpr_free (p->value.str); +void grpc_chttp2_hpack_parser_destroy(grpc_chttp2_hpack_parser *p) { + grpc_chttp2_hptbl_destroy(&p->table); + gpr_free(p->key.str); + gpr_free(p->value.str); } -int -grpc_chttp2_hpack_parser_parse (grpc_chttp2_hpack_parser * p, const gpr_uint8 * beg, const gpr_uint8 * end) -{ +int grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *beg, const gpr_uint8 *end) { /* TODO(ctiller): limit the distance of end from beg, and perform multiple steps in the event of a large chunk of data to limit stack space usage when no tail call optimization is available */ - return p->state (p, beg, end); + return p->state(p, beg, end); } -grpc_chttp2_parse_error -grpc_chttp2_header_parser_parse (grpc_exec_ctx * exec_ctx, void *hpack_parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) -{ +grpc_chttp2_parse_error grpc_chttp2_header_parser_parse( + grpc_exec_ctx *exec_ctx, void *hpack_parser, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { grpc_chttp2_hpack_parser *parser = hpack_parser; - if (!grpc_chttp2_hpack_parser_parse (parser, GPR_SLICE_START_PTR (slice), GPR_SLICE_END_PTR (slice))) - { + if (!grpc_chttp2_hpack_parser_parse(parser, GPR_SLICE_START_PTR(slice), + GPR_SLICE_END_PTR(slice))) { + return GRPC_CHTTP2_CONNECTION_ERROR; + } + if (is_last) { + if (parser->is_boundary && parser->state != parse_begin) { + gpr_log(GPR_ERROR, + "end of header frame not aligned with a hpack record boundary"); return GRPC_CHTTP2_CONNECTION_ERROR; } - if (is_last) - { - if (parser->is_boundary && parser->state != parse_begin) - { - gpr_log (GPR_ERROR, "end of header frame not aligned with a hpack record boundary"); - return GRPC_CHTTP2_CONNECTION_ERROR; - } - if (parser->is_boundary) - { - grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into (&stream_parsing->incoming_metadata, &stream_parsing->data_parser.incoming_sopb); - grpc_chttp2_list_add_parsing_seen_stream (transport_parsing, stream_parsing); - } - if (parser->is_eof) - { - stream_parsing->received_close = 1; - } - parser->on_header = on_header_not_set; - parser->on_header_user_data = NULL; - parser->is_boundary = 0xde; - parser->is_eof = 0xde; + if (parser->is_boundary) { + grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into( + &stream_parsing->incoming_metadata, + &stream_parsing->data_parser.incoming_sopb); + grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, + stream_parsing); + } + if (parser->is_eof) { + stream_parsing->received_close = 1; } + parser->on_header = on_header_not_set; + parser->on_header_user_data = NULL; + parser->is_boundary = 0xde; + parser->is_eof = 0xde; + } return GRPC_CHTTP2_PARSE_OK; } diff --git a/src/core/transport/chttp2/hpack_parser.h b/src/core/transport/chttp2/hpack_parser.h index 209bb6b9c16..f56867016cf 100644 --- a/src/core/transport/chttp2/hpack_parser.h +++ b/src/core/transport/chttp2/hpack_parser.h @@ -44,19 +44,19 @@ typedef struct grpc_chttp2_hpack_parser grpc_chttp2_hpack_parser; -typedef int (*grpc_chttp2_hpack_parser_state) (grpc_chttp2_hpack_parser * p, const gpr_uint8 * beg, const gpr_uint8 * end); +typedef int (*grpc_chttp2_hpack_parser_state)(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *beg, + const gpr_uint8 *end); -typedef struct -{ +typedef struct { char *str; gpr_uint32 length; gpr_uint32 capacity; } grpc_chttp2_hpack_parser_string; -struct grpc_chttp2_hpack_parser -{ +struct grpc_chttp2_hpack_parser { /* user specified callback for each header output */ - void (*on_header) (void *user_data, grpc_mdelem * md); + void (*on_header)(void *user_data, grpc_mdelem *md); void *on_header_user_data; /* current parse state - or a function that implements it */ @@ -66,8 +66,7 @@ struct grpc_chttp2_hpack_parser /* what to do after skipping prioritization data */ grpc_chttp2_hpack_parser_state after_prioritization; /* the value we're currently parsing */ - union - { + union { gpr_uint32 *value; grpc_chttp2_hpack_parser_string *str; } parsing; @@ -96,16 +95,21 @@ struct grpc_chttp2_hpack_parser grpc_chttp2_hptbl table; }; -void grpc_chttp2_hpack_parser_init (grpc_chttp2_hpack_parser * p, grpc_mdctx * mdctx); -void grpc_chttp2_hpack_parser_destroy (grpc_chttp2_hpack_parser * p); +void grpc_chttp2_hpack_parser_init(grpc_chttp2_hpack_parser *p, + grpc_mdctx *mdctx); +void grpc_chttp2_hpack_parser_destroy(grpc_chttp2_hpack_parser *p); -void grpc_chttp2_hpack_parser_set_has_priority (grpc_chttp2_hpack_parser * p); +void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser *p); /* returns 1 on success, 0 on error */ -int grpc_chttp2_hpack_parser_parse (grpc_chttp2_hpack_parser * p, const gpr_uint8 * beg, const gpr_uint8 * end); +int grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser *p, + const gpr_uint8 *beg, const gpr_uint8 *end); /* wraps grpc_chttp2_hpack_parser_parse to provide a frame level parser for the transport */ -grpc_chttp2_parse_error grpc_chttp2_header_parser_parse (grpc_exec_ctx * exec_ctx, void *hpack_parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); +grpc_chttp2_parse_error grpc_chttp2_header_parser_parse( + grpc_exec_ctx *exec_ctx, void *hpack_parser, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_HPACK_PARSER_H */ diff --git a/src/core/transport/chttp2/hpack_table.c b/src/core/transport/chttp2/hpack_table.c index 099766c85ea..d5cb752789f 100644 --- a/src/core/transport/chttp2/hpack_table.c +++ b/src/core/transport/chttp2/hpack_table.c @@ -39,329 +39,253 @@ #include #include "src/core/support/murmur_hash.h" -static struct -{ +static struct { const char *key; const char *value; -} static_table[] = -{ - /* 0: */ - { - NULL, NULL}, +} static_table[] = { + /* 0: */ + {NULL, NULL}, /* 1: */ - { - ":authority", ""}, + {":authority", ""}, /* 2: */ - { - ":method", "GET"}, + {":method", "GET"}, /* 3: */ - { - ":method", "POST"}, + {":method", "POST"}, /* 4: */ - { - ":path", "/"}, + {":path", "/"}, /* 5: */ - { - ":path", "/index.html"}, + {":path", "/index.html"}, /* 6: */ - { - ":scheme", "http"}, + {":scheme", "http"}, /* 7: */ - { - ":scheme", "https"}, + {":scheme", "https"}, /* 8: */ - { - ":status", "200"}, + {":status", "200"}, /* 9: */ - { - ":status", "204"}, + {":status", "204"}, /* 10: */ - { - ":status", "206"}, + {":status", "206"}, /* 11: */ - { - ":status", "304"}, + {":status", "304"}, /* 12: */ - { - ":status", "400"}, + {":status", "400"}, /* 13: */ - { - ":status", "404"}, + {":status", "404"}, /* 14: */ - { - ":status", "500"}, + {":status", "500"}, /* 15: */ - { - "accept-charset", ""}, + {"accept-charset", ""}, /* 16: */ - { - "accept-encoding", "gzip, deflate"}, + {"accept-encoding", "gzip, deflate"}, /* 17: */ - { - "accept-language", ""}, + {"accept-language", ""}, /* 18: */ - { - "accept-ranges", ""}, + {"accept-ranges", ""}, /* 19: */ - { - "accept", ""}, + {"accept", ""}, /* 20: */ - { - "access-control-allow-origin", ""}, + {"access-control-allow-origin", ""}, /* 21: */ - { - "age", ""}, + {"age", ""}, /* 22: */ - { - "allow", ""}, + {"allow", ""}, /* 23: */ - { - "authorization", ""}, + {"authorization", ""}, /* 24: */ - { - "cache-control", ""}, + {"cache-control", ""}, /* 25: */ - { - "content-disposition", ""}, + {"content-disposition", ""}, /* 26: */ - { - "content-encoding", ""}, + {"content-encoding", ""}, /* 27: */ - { - "content-language", ""}, + {"content-language", ""}, /* 28: */ - { - "content-length", ""}, + {"content-length", ""}, /* 29: */ - { - "content-location", ""}, + {"content-location", ""}, /* 30: */ - { - "content-range", ""}, + {"content-range", ""}, /* 31: */ - { - "content-type", ""}, + {"content-type", ""}, /* 32: */ - { - "cookie", ""}, + {"cookie", ""}, /* 33: */ - { - "date", ""}, + {"date", ""}, /* 34: */ - { - "etag", ""}, + {"etag", ""}, /* 35: */ - { - "expect", ""}, + {"expect", ""}, /* 36: */ - { - "expires", ""}, + {"expires", ""}, /* 37: */ - { - "from", ""}, + {"from", ""}, /* 38: */ - { - "host", ""}, + {"host", ""}, /* 39: */ - { - "if-match", ""}, + {"if-match", ""}, /* 40: */ - { - "if-modified-since", ""}, + {"if-modified-since", ""}, /* 41: */ - { - "if-none-match", ""}, + {"if-none-match", ""}, /* 42: */ - { - "if-range", ""}, + {"if-range", ""}, /* 43: */ - { - "if-unmodified-since", ""}, + {"if-unmodified-since", ""}, /* 44: */ - { - "last-modified", ""}, + {"last-modified", ""}, /* 45: */ - { - "link", ""}, + {"link", ""}, /* 46: */ - { - "location", ""}, + {"location", ""}, /* 47: */ - { - "max-forwards", ""}, + {"max-forwards", ""}, /* 48: */ - { - "proxy-authenticate", ""}, + {"proxy-authenticate", ""}, /* 49: */ - { - "proxy-authorization", ""}, + {"proxy-authorization", ""}, /* 50: */ - { - "range", ""}, + {"range", ""}, /* 51: */ - { - "referer", ""}, + {"referer", ""}, /* 52: */ - { - "refresh", ""}, + {"refresh", ""}, /* 53: */ - { - "retry-after", ""}, + {"retry-after", ""}, /* 54: */ - { - "server", ""}, + {"server", ""}, /* 55: */ - { - "set-cookie", ""}, + {"set-cookie", ""}, /* 56: */ - { - "strict-transport-security", ""}, + {"strict-transport-security", ""}, /* 57: */ - { - "transfer-encoding", ""}, + {"transfer-encoding", ""}, /* 58: */ - { - "user-agent", ""}, + {"user-agent", ""}, /* 59: */ - { - "vary", ""}, + {"vary", ""}, /* 60: */ - { - "via", ""}, + {"via", ""}, /* 61: */ - { -"www-authenticate", ""},}; + {"www-authenticate", ""}, +}; -void -grpc_chttp2_hptbl_init (grpc_chttp2_hptbl * tbl, grpc_mdctx * mdctx) -{ +void grpc_chttp2_hptbl_init(grpc_chttp2_hptbl *tbl, grpc_mdctx *mdctx) { size_t i; - memset (tbl, 0, sizeof (*tbl)); + memset(tbl, 0, sizeof(*tbl)); tbl->mdctx = mdctx; tbl->max_bytes = GRPC_CHTTP2_INITIAL_HPACK_TABLE_SIZE; - for (i = 1; i <= GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) - { - tbl->static_ents[i - 1] = grpc_mdelem_from_strings (mdctx, static_table[i].key, static_table[i].value); - } + for (i = 1; i <= GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) { + tbl->static_ents[i - 1] = grpc_mdelem_from_strings( + mdctx, static_table[i].key, static_table[i].value); + } } -void -grpc_chttp2_hptbl_destroy (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 (tbl->static_ents[i]); - } - for (i = 0; i < tbl->num_ents; i++) - { - GRPC_MDELEM_UNREF (tbl->ents[(tbl->first_ent + i) % GRPC_CHTTP2_MAX_TABLE_COUNT]); - } + for (i = 0; i < GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) { + GRPC_MDELEM_UNREF(tbl->static_ents[i]); + } + for (i = 0; i < tbl->num_ents; i++) { + GRPC_MDELEM_UNREF( + tbl->ents[(tbl->first_ent + i) % GRPC_CHTTP2_MAX_TABLE_COUNT]); + } } -grpc_mdelem * -grpc_chttp2_hptbl_lookup (const grpc_chttp2_hptbl * tbl, gpr_uint32 index) -{ +grpc_mdelem *grpc_chttp2_hptbl_lookup(const grpc_chttp2_hptbl *tbl, + gpr_uint32 index) { /* Static table comes first, just return an entry from it */ - if (index <= GRPC_CHTTP2_LAST_STATIC_ENTRY) - { - return tbl->static_ents[index - 1]; - } + if (index <= GRPC_CHTTP2_LAST_STATIC_ENTRY) { + return tbl->static_ents[index - 1]; + } /* Otherwise, find the value in the list of valid entries */ index -= (GRPC_CHTTP2_LAST_STATIC_ENTRY + 1); - if (index < tbl->num_ents) - { - gpr_uint32 offset = (tbl->num_ents - 1u - index + tbl->first_ent) % GRPC_CHTTP2_MAX_TABLE_COUNT; - return tbl->ents[offset]; - } + if (index < tbl->num_ents) { + gpr_uint32 offset = (tbl->num_ents - 1u - index + tbl->first_ent) % + GRPC_CHTTP2_MAX_TABLE_COUNT; + return tbl->ents[offset]; + } /* Invalid entry: return error */ return NULL; } /* Evict one element from the table */ -static void -evict1 (grpc_chttp2_hptbl * tbl) -{ +static void evict1(grpc_chttp2_hptbl *tbl) { grpc_mdelem *first_ent = tbl->ents[tbl->first_ent]; - size_t elem_bytes = GPR_SLICE_LENGTH (first_ent->key->slice) + GPR_SLICE_LENGTH (first_ent->value->slice) + GRPC_CHTTP2_HPACK_ENTRY_OVERHEAD; - GPR_ASSERT (elem_bytes <= tbl->mem_used); - tbl->mem_used = (gpr_uint16) (tbl->mem_used - elem_bytes); - tbl->first_ent = (gpr_uint16) ((tbl->first_ent + 1) % GRPC_CHTTP2_MAX_TABLE_COUNT); + size_t elem_bytes = GPR_SLICE_LENGTH(first_ent->key->slice) + + GPR_SLICE_LENGTH(first_ent->value->slice) + + GRPC_CHTTP2_HPACK_ENTRY_OVERHEAD; + GPR_ASSERT(elem_bytes <= tbl->mem_used); + tbl->mem_used = (gpr_uint16)(tbl->mem_used - elem_bytes); + tbl->first_ent = + (gpr_uint16)((tbl->first_ent + 1) % GRPC_CHTTP2_MAX_TABLE_COUNT); tbl->num_ents--; - GRPC_MDELEM_UNREF (first_ent); + GRPC_MDELEM_UNREF(first_ent); } -void -grpc_chttp2_hptbl_add (grpc_chttp2_hptbl * tbl, grpc_mdelem * md) -{ +void grpc_chttp2_hptbl_add(grpc_chttp2_hptbl *tbl, grpc_mdelem *md) { /* determine how many bytes of buffer this entry represents */ - size_t elem_bytes = GPR_SLICE_LENGTH (md->key->slice) + GPR_SLICE_LENGTH (md->value->slice) + GRPC_CHTTP2_HPACK_ENTRY_OVERHEAD; + size_t elem_bytes = GPR_SLICE_LENGTH(md->key->slice) + + GPR_SLICE_LENGTH(md->value->slice) + + GRPC_CHTTP2_HPACK_ENTRY_OVERHEAD; /* we can't add elements bigger than the max table size */ - if (elem_bytes > tbl->max_bytes) - { - /* HPACK draft 10 section 4.4 states: - * If the size of the new entry is less than or equal to the maximum - * size, that entry is added to the table. It is not an error to - * attempt to add an entry that is larger than the maximum size; an - * attempt to add an entry larger than the entire table causes - * the table - * to be emptied of all existing entries, and results in an - * empty table. - */ - while (tbl->num_ents) - { - evict1 (tbl); - } - return; + if (elem_bytes > tbl->max_bytes) { + /* HPACK draft 10 section 4.4 states: + * If the size of the new entry is less than or equal to the maximum + * size, that entry is added to the table. It is not an error to + * attempt to add an entry that is larger than the maximum size; an + * attempt to add an entry larger than the entire table causes + * the table + * to be emptied of all existing entries, and results in an + * empty table. + */ + while (tbl->num_ents) { + evict1(tbl); } + return; + } /* evict entries to ensure no overflow */ - while (elem_bytes > (size_t) tbl->max_bytes - tbl->mem_used) - { - evict1 (tbl); - } + while (elem_bytes > (size_t)tbl->max_bytes - tbl->mem_used) { + evict1(tbl); + } /* copy the finalized entry in */ tbl->ents[tbl->last_ent] = md; /* update accounting values */ - tbl->last_ent = (gpr_uint16) ((tbl->last_ent + 1) % GRPC_CHTTP2_MAX_TABLE_COUNT); + tbl->last_ent = + (gpr_uint16)((tbl->last_ent + 1) % GRPC_CHTTP2_MAX_TABLE_COUNT); tbl->num_ents++; - tbl->mem_used = (gpr_uint16) (tbl->mem_used + elem_bytes); + tbl->mem_used = (gpr_uint16)(tbl->mem_used + elem_bytes); } -grpc_chttp2_hptbl_find_result -grpc_chttp2_hptbl_find (const grpc_chttp2_hptbl * tbl, grpc_mdelem * md) -{ - grpc_chttp2_hptbl_find_result r = { 0, 0 }; +grpc_chttp2_hptbl_find_result grpc_chttp2_hptbl_find( + const grpc_chttp2_hptbl *tbl, grpc_mdelem *md) { + grpc_chttp2_hptbl_find_result r = {0, 0}; gpr_uint16 i; /* See if the string is in the static table */ - for (i = 0; i < GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) - { - grpc_mdelem *ent = tbl->static_ents[i]; - if (md->key != ent->key) - continue; - r.index = (gpr_uint16) (i + 1); - r.has_value = md->value == ent->value; - if (r.has_value) - return r; - } + for (i = 0; i < GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) { + grpc_mdelem *ent = tbl->static_ents[i]; + if (md->key != ent->key) continue; + r.index = (gpr_uint16)(i + 1); + r.has_value = md->value == ent->value; + if (r.has_value) return r; + } /* Scan the dynamic table */ - for (i = 0; i < tbl->num_ents; i++) - { - gpr_uint16 idx = (gpr_uint16) (tbl->num_ents - i + GRPC_CHTTP2_LAST_STATIC_ENTRY); - grpc_mdelem *ent = tbl->ents[(tbl->first_ent + i) % GRPC_CHTTP2_MAX_TABLE_COUNT]; - if (md->key != ent->key) - continue; - r.index = idx; - r.has_value = md->value == ent->value; - if (r.has_value) - return r; - } + for (i = 0; i < tbl->num_ents; i++) { + gpr_uint16 idx = + (gpr_uint16)(tbl->num_ents - i + GRPC_CHTTP2_LAST_STATIC_ENTRY); + grpc_mdelem *ent = + tbl->ents[(tbl->first_ent + i) % GRPC_CHTTP2_MAX_TABLE_COUNT]; + if (md->key != ent->key) continue; + r.index = idx; + r.has_value = md->value == ent->value; + if (r.has_value) return r; + } return r; } diff --git a/src/core/transport/chttp2/hpack_table.h b/src/core/transport/chttp2/hpack_table.h index 5c58a351862..4f882e2e03b 100644 --- a/src/core/transport/chttp2/hpack_table.h +++ b/src/core/transport/chttp2/hpack_table.h @@ -56,8 +56,7 @@ GRPC_CHTTP2_HPACK_ENTRY_OVERHEAD) /* hpack decoder table */ -typedef struct -{ +typedef struct { grpc_mdctx *mdctx; /* the first used entry in ents */ gpr_uint16 first_ent; @@ -78,20 +77,21 @@ typedef struct } grpc_chttp2_hptbl; /* initialize a hpack table */ -void grpc_chttp2_hptbl_init (grpc_chttp2_hptbl * tbl, grpc_mdctx * mdctx); -void grpc_chttp2_hptbl_destroy (grpc_chttp2_hptbl * tbl); +void grpc_chttp2_hptbl_init(grpc_chttp2_hptbl *tbl, grpc_mdctx *mdctx); +void grpc_chttp2_hptbl_destroy(grpc_chttp2_hptbl *tbl); /* lookup a table entry based on its hpack index */ -grpc_mdelem *grpc_chttp2_hptbl_lookup (const grpc_chttp2_hptbl * tbl, gpr_uint32 index); +grpc_mdelem *grpc_chttp2_hptbl_lookup(const grpc_chttp2_hptbl *tbl, + gpr_uint32 index); /* add a table entry to the index */ -void grpc_chttp2_hptbl_add (grpc_chttp2_hptbl * tbl, grpc_mdelem * md); +void grpc_chttp2_hptbl_add(grpc_chttp2_hptbl *tbl, grpc_mdelem *md); /* 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 */ -typedef struct -{ +typedef struct { gpr_uint16 index; gpr_uint8 has_value; } grpc_chttp2_hptbl_find_result; -grpc_chttp2_hptbl_find_result grpc_chttp2_hptbl_find (const grpc_chttp2_hptbl * tbl, grpc_mdelem * md); +grpc_chttp2_hptbl_find_result grpc_chttp2_hptbl_find( + const grpc_chttp2_hptbl *tbl, grpc_mdelem *md); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_HPACK_TABLE_H */ diff --git a/src/core/transport/chttp2/http2_errors.h b/src/core/transport/chttp2/http2_errors.h index 8385d6ba449..a4f309e0565 100644 --- a/src/core/transport/chttp2/http2_errors.h +++ b/src/core/transport/chttp2/http2_errors.h @@ -35,8 +35,7 @@ #define GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_HTTP2_ERRORS_H /* error codes for RST_STREAM from http2 draft 14 section 7 */ -typedef enum -{ +typedef enum { GRPC_CHTTP2_NO_ERROR = 0x0, GRPC_CHTTP2_PROTOCOL_ERROR = 0x1, GRPC_CHTTP2_INTERNAL_ERROR = 0x2, diff --git a/src/core/transport/chttp2/huffsyms.c b/src/core/transport/chttp2/huffsyms.c index 058c6ee61e2..6f5cf6a2a92 100644 --- a/src/core/transport/chttp2/huffsyms.c +++ b/src/core/transport/chttp2/huffsyms.c @@ -37,69 +37,69 @@ command: :%s/.* \([0-9a-f]\+\) \[ *\([0-9]\+\)\]/{0x\1, \2},/g */ const grpc_chttp2_huffsym grpc_chttp2_huffsyms[GRPC_CHTTP2_NUM_HUFFSYMS] = { - {0x1ff8, 13}, {0x7fffd8, 23}, {0xfffffe2, 28}, {0xfffffe3, 28}, - {0xfffffe4, 28}, {0xfffffe5, 28}, {0xfffffe6, 28}, {0xfffffe7, 28}, - {0xfffffe8, 28}, {0xffffea, 24}, {0x3ffffffc, 30}, {0xfffffe9, 28}, - {0xfffffea, 28}, {0x3ffffffd, 30}, {0xfffffeb, 28}, {0xfffffec, 28}, - {0xfffffed, 28}, {0xfffffee, 28}, {0xfffffef, 28}, {0xffffff0, 28}, - {0xffffff1, 28}, {0xffffff2, 28}, {0x3ffffffe, 30}, {0xffffff3, 28}, - {0xffffff4, 28}, {0xffffff5, 28}, {0xffffff6, 28}, {0xffffff7, 28}, - {0xffffff8, 28}, {0xffffff9, 28}, {0xffffffa, 28}, {0xffffffb, 28}, - {0x14, 6}, {0x3f8, 10}, {0x3f9, 10}, {0xffa, 12}, - {0x1ff9, 13}, {0x15, 6}, {0xf8, 8}, {0x7fa, 11}, - {0x3fa, 10}, {0x3fb, 10}, {0xf9, 8}, {0x7fb, 11}, - {0xfa, 8}, {0x16, 6}, {0x17, 6}, {0x18, 6}, - {0x0, 5}, {0x1, 5}, {0x2, 5}, {0x19, 6}, - {0x1a, 6}, {0x1b, 6}, {0x1c, 6}, {0x1d, 6}, - {0x1e, 6}, {0x1f, 6}, {0x5c, 7}, {0xfb, 8}, - {0x7ffc, 15}, {0x20, 6}, {0xffb, 12}, {0x3fc, 10}, - {0x1ffa, 13}, {0x21, 6}, {0x5d, 7}, {0x5e, 7}, - {0x5f, 7}, {0x60, 7}, {0x61, 7}, {0x62, 7}, - {0x63, 7}, {0x64, 7}, {0x65, 7}, {0x66, 7}, - {0x67, 7}, {0x68, 7}, {0x69, 7}, {0x6a, 7}, - {0x6b, 7}, {0x6c, 7}, {0x6d, 7}, {0x6e, 7}, - {0x6f, 7}, {0x70, 7}, {0x71, 7}, {0x72, 7}, - {0xfc, 8}, {0x73, 7}, {0xfd, 8}, {0x1ffb, 13}, - {0x7fff0, 19}, {0x1ffc, 13}, {0x3ffc, 14}, {0x22, 6}, - {0x7ffd, 15}, {0x3, 5}, {0x23, 6}, {0x4, 5}, - {0x24, 6}, {0x5, 5}, {0x25, 6}, {0x26, 6}, - {0x27, 6}, {0x6, 5}, {0x74, 7}, {0x75, 7}, - {0x28, 6}, {0x29, 6}, {0x2a, 6}, {0x7, 5}, - {0x2b, 6}, {0x76, 7}, {0x2c, 6}, {0x8, 5}, - {0x9, 5}, {0x2d, 6}, {0x77, 7}, {0x78, 7}, - {0x79, 7}, {0x7a, 7}, {0x7b, 7}, {0x7ffe, 15}, - {0x7fc, 11}, {0x3ffd, 14}, {0x1ffd, 13}, {0xffffffc, 28}, - {0xfffe6, 20}, {0x3fffd2, 22}, {0xfffe7, 20}, {0xfffe8, 20}, - {0x3fffd3, 22}, {0x3fffd4, 22}, {0x3fffd5, 22}, {0x7fffd9, 23}, - {0x3fffd6, 22}, {0x7fffda, 23}, {0x7fffdb, 23}, {0x7fffdc, 23}, - {0x7fffdd, 23}, {0x7fffde, 23}, {0xffffeb, 24}, {0x7fffdf, 23}, - {0xffffec, 24}, {0xffffed, 24}, {0x3fffd7, 22}, {0x7fffe0, 23}, - {0xffffee, 24}, {0x7fffe1, 23}, {0x7fffe2, 23}, {0x7fffe3, 23}, - {0x7fffe4, 23}, {0x1fffdc, 21}, {0x3fffd8, 22}, {0x7fffe5, 23}, - {0x3fffd9, 22}, {0x7fffe6, 23}, {0x7fffe7, 23}, {0xffffef, 24}, - {0x3fffda, 22}, {0x1fffdd, 21}, {0xfffe9, 20}, {0x3fffdb, 22}, - {0x3fffdc, 22}, {0x7fffe8, 23}, {0x7fffe9, 23}, {0x1fffde, 21}, - {0x7fffea, 23}, {0x3fffdd, 22}, {0x3fffde, 22}, {0xfffff0, 24}, - {0x1fffdf, 21}, {0x3fffdf, 22}, {0x7fffeb, 23}, {0x7fffec, 23}, - {0x1fffe0, 21}, {0x1fffe1, 21}, {0x3fffe0, 22}, {0x1fffe2, 21}, - {0x7fffed, 23}, {0x3fffe1, 22}, {0x7fffee, 23}, {0x7fffef, 23}, - {0xfffea, 20}, {0x3fffe2, 22}, {0x3fffe3, 22}, {0x3fffe4, 22}, - {0x7ffff0, 23}, {0x3fffe5, 22}, {0x3fffe6, 22}, {0x7ffff1, 23}, - {0x3ffffe0, 26}, {0x3ffffe1, 26}, {0xfffeb, 20}, {0x7fff1, 19}, - {0x3fffe7, 22}, {0x7ffff2, 23}, {0x3fffe8, 22}, {0x1ffffec, 25}, - {0x3ffffe2, 26}, {0x3ffffe3, 26}, {0x3ffffe4, 26}, {0x7ffffde, 27}, - {0x7ffffdf, 27}, {0x3ffffe5, 26}, {0xfffff1, 24}, {0x1ffffed, 25}, - {0x7fff2, 19}, {0x1fffe3, 21}, {0x3ffffe6, 26}, {0x7ffffe0, 27}, - {0x7ffffe1, 27}, {0x3ffffe7, 26}, {0x7ffffe2, 27}, {0xfffff2, 24}, - {0x1fffe4, 21}, {0x1fffe5, 21}, {0x3ffffe8, 26}, {0x3ffffe9, 26}, - {0xffffffd, 28}, {0x7ffffe3, 27}, {0x7ffffe4, 27}, {0x7ffffe5, 27}, - {0xfffec, 20}, {0xfffff3, 24}, {0xfffed, 20}, {0x1fffe6, 21}, - {0x3fffe9, 22}, {0x1fffe7, 21}, {0x1fffe8, 21}, {0x7ffff3, 23}, - {0x3fffea, 22}, {0x3fffeb, 22}, {0x1ffffee, 25}, {0x1ffffef, 25}, - {0xfffff4, 24}, {0xfffff5, 24}, {0x3ffffea, 26}, {0x7ffff4, 23}, - {0x3ffffeb, 26}, {0x7ffffe6, 27}, {0x3ffffec, 26}, {0x3ffffed, 26}, - {0x7ffffe7, 27}, {0x7ffffe8, 27}, {0x7ffffe9, 27}, {0x7ffffea, 27}, - {0x7ffffeb, 27}, {0xffffffe, 28}, {0x7ffffec, 27}, {0x7ffffed, 27}, - {0x7ffffee, 27}, {0x7ffffef, 27}, {0x7fffff0, 27}, {0x3ffffee, 26}, - {0x3fffffff, 30}, + {0x1ff8, 13}, {0x7fffd8, 23}, {0xfffffe2, 28}, {0xfffffe3, 28}, + {0xfffffe4, 28}, {0xfffffe5, 28}, {0xfffffe6, 28}, {0xfffffe7, 28}, + {0xfffffe8, 28}, {0xffffea, 24}, {0x3ffffffc, 30}, {0xfffffe9, 28}, + {0xfffffea, 28}, {0x3ffffffd, 30}, {0xfffffeb, 28}, {0xfffffec, 28}, + {0xfffffed, 28}, {0xfffffee, 28}, {0xfffffef, 28}, {0xffffff0, 28}, + {0xffffff1, 28}, {0xffffff2, 28}, {0x3ffffffe, 30}, {0xffffff3, 28}, + {0xffffff4, 28}, {0xffffff5, 28}, {0xffffff6, 28}, {0xffffff7, 28}, + {0xffffff8, 28}, {0xffffff9, 28}, {0xffffffa, 28}, {0xffffffb, 28}, + {0x14, 6}, {0x3f8, 10}, {0x3f9, 10}, {0xffa, 12}, + {0x1ff9, 13}, {0x15, 6}, {0xf8, 8}, {0x7fa, 11}, + {0x3fa, 10}, {0x3fb, 10}, {0xf9, 8}, {0x7fb, 11}, + {0xfa, 8}, {0x16, 6}, {0x17, 6}, {0x18, 6}, + {0x0, 5}, {0x1, 5}, {0x2, 5}, {0x19, 6}, + {0x1a, 6}, {0x1b, 6}, {0x1c, 6}, {0x1d, 6}, + {0x1e, 6}, {0x1f, 6}, {0x5c, 7}, {0xfb, 8}, + {0x7ffc, 15}, {0x20, 6}, {0xffb, 12}, {0x3fc, 10}, + {0x1ffa, 13}, {0x21, 6}, {0x5d, 7}, {0x5e, 7}, + {0x5f, 7}, {0x60, 7}, {0x61, 7}, {0x62, 7}, + {0x63, 7}, {0x64, 7}, {0x65, 7}, {0x66, 7}, + {0x67, 7}, {0x68, 7}, {0x69, 7}, {0x6a, 7}, + {0x6b, 7}, {0x6c, 7}, {0x6d, 7}, {0x6e, 7}, + {0x6f, 7}, {0x70, 7}, {0x71, 7}, {0x72, 7}, + {0xfc, 8}, {0x73, 7}, {0xfd, 8}, {0x1ffb, 13}, + {0x7fff0, 19}, {0x1ffc, 13}, {0x3ffc, 14}, {0x22, 6}, + {0x7ffd, 15}, {0x3, 5}, {0x23, 6}, {0x4, 5}, + {0x24, 6}, {0x5, 5}, {0x25, 6}, {0x26, 6}, + {0x27, 6}, {0x6, 5}, {0x74, 7}, {0x75, 7}, + {0x28, 6}, {0x29, 6}, {0x2a, 6}, {0x7, 5}, + {0x2b, 6}, {0x76, 7}, {0x2c, 6}, {0x8, 5}, + {0x9, 5}, {0x2d, 6}, {0x77, 7}, {0x78, 7}, + {0x79, 7}, {0x7a, 7}, {0x7b, 7}, {0x7ffe, 15}, + {0x7fc, 11}, {0x3ffd, 14}, {0x1ffd, 13}, {0xffffffc, 28}, + {0xfffe6, 20}, {0x3fffd2, 22}, {0xfffe7, 20}, {0xfffe8, 20}, + {0x3fffd3, 22}, {0x3fffd4, 22}, {0x3fffd5, 22}, {0x7fffd9, 23}, + {0x3fffd6, 22}, {0x7fffda, 23}, {0x7fffdb, 23}, {0x7fffdc, 23}, + {0x7fffdd, 23}, {0x7fffde, 23}, {0xffffeb, 24}, {0x7fffdf, 23}, + {0xffffec, 24}, {0xffffed, 24}, {0x3fffd7, 22}, {0x7fffe0, 23}, + {0xffffee, 24}, {0x7fffe1, 23}, {0x7fffe2, 23}, {0x7fffe3, 23}, + {0x7fffe4, 23}, {0x1fffdc, 21}, {0x3fffd8, 22}, {0x7fffe5, 23}, + {0x3fffd9, 22}, {0x7fffe6, 23}, {0x7fffe7, 23}, {0xffffef, 24}, + {0x3fffda, 22}, {0x1fffdd, 21}, {0xfffe9, 20}, {0x3fffdb, 22}, + {0x3fffdc, 22}, {0x7fffe8, 23}, {0x7fffe9, 23}, {0x1fffde, 21}, + {0x7fffea, 23}, {0x3fffdd, 22}, {0x3fffde, 22}, {0xfffff0, 24}, + {0x1fffdf, 21}, {0x3fffdf, 22}, {0x7fffeb, 23}, {0x7fffec, 23}, + {0x1fffe0, 21}, {0x1fffe1, 21}, {0x3fffe0, 22}, {0x1fffe2, 21}, + {0x7fffed, 23}, {0x3fffe1, 22}, {0x7fffee, 23}, {0x7fffef, 23}, + {0xfffea, 20}, {0x3fffe2, 22}, {0x3fffe3, 22}, {0x3fffe4, 22}, + {0x7ffff0, 23}, {0x3fffe5, 22}, {0x3fffe6, 22}, {0x7ffff1, 23}, + {0x3ffffe0, 26}, {0x3ffffe1, 26}, {0xfffeb, 20}, {0x7fff1, 19}, + {0x3fffe7, 22}, {0x7ffff2, 23}, {0x3fffe8, 22}, {0x1ffffec, 25}, + {0x3ffffe2, 26}, {0x3ffffe3, 26}, {0x3ffffe4, 26}, {0x7ffffde, 27}, + {0x7ffffdf, 27}, {0x3ffffe5, 26}, {0xfffff1, 24}, {0x1ffffed, 25}, + {0x7fff2, 19}, {0x1fffe3, 21}, {0x3ffffe6, 26}, {0x7ffffe0, 27}, + {0x7ffffe1, 27}, {0x3ffffe7, 26}, {0x7ffffe2, 27}, {0xfffff2, 24}, + {0x1fffe4, 21}, {0x1fffe5, 21}, {0x3ffffe8, 26}, {0x3ffffe9, 26}, + {0xffffffd, 28}, {0x7ffffe3, 27}, {0x7ffffe4, 27}, {0x7ffffe5, 27}, + {0xfffec, 20}, {0xfffff3, 24}, {0xfffed, 20}, {0x1fffe6, 21}, + {0x3fffe9, 22}, {0x1fffe7, 21}, {0x1fffe8, 21}, {0x7ffff3, 23}, + {0x3fffea, 22}, {0x3fffeb, 22}, {0x1ffffee, 25}, {0x1ffffef, 25}, + {0xfffff4, 24}, {0xfffff5, 24}, {0x3ffffea, 26}, {0x7ffff4, 23}, + {0x3ffffeb, 26}, {0x7ffffe6, 27}, {0x3ffffec, 26}, {0x3ffffed, 26}, + {0x7ffffe7, 27}, {0x7ffffe8, 27}, {0x7ffffe9, 27}, {0x7ffffea, 27}, + {0x7ffffeb, 27}, {0xffffffe, 28}, {0x7ffffec, 27}, {0x7ffffed, 27}, + {0x7ffffee, 27}, {0x7ffffef, 27}, {0x7fffff0, 27}, {0x3ffffee, 26}, + {0x3fffffff, 30}, }; diff --git a/src/core/transport/chttp2/huffsyms.h b/src/core/transport/chttp2/huffsyms.h index 04f062dd5e9..a3cdba8235a 100644 --- a/src/core/transport/chttp2/huffsyms.h +++ b/src/core/transport/chttp2/huffsyms.h @@ -38,8 +38,7 @@ #define GRPC_CHTTP2_NUM_HUFFSYMS 257 -typedef struct -{ +typedef struct { unsigned bits; unsigned length; } grpc_chttp2_huffsym; diff --git a/src/core/transport/chttp2/incoming_metadata.c b/src/core/transport/chttp2/incoming_metadata.c index 93eee0be3f0..d216c421139 100644 --- a/src/core/transport/chttp2/incoming_metadata.c +++ b/src/core/transport/chttp2/incoming_metadata.c @@ -40,50 +40,43 @@ #include #include -void -grpc_chttp2_incoming_metadata_buffer_init (grpc_chttp2_incoming_metadata_buffer * buffer) -{ - buffer->deadline = gpr_inf_future (GPR_CLOCK_REALTIME); +void grpc_chttp2_incoming_metadata_buffer_init( + grpc_chttp2_incoming_metadata_buffer *buffer) { + buffer->deadline = gpr_inf_future(GPR_CLOCK_REALTIME); } -void -grpc_chttp2_incoming_metadata_buffer_destroy (grpc_chttp2_incoming_metadata_buffer * buffer) -{ +void grpc_chttp2_incoming_metadata_buffer_destroy( + grpc_chttp2_incoming_metadata_buffer *buffer) { size_t i; - for (i = 0; i < buffer->count; i++) - { - GRPC_MDELEM_UNREF (buffer->elems[i].md); - } - gpr_free (buffer->elems); + for (i = 0; i < buffer->count; i++) { + GRPC_MDELEM_UNREF(buffer->elems[i].md); + } + gpr_free(buffer->elems); } -void -grpc_chttp2_incoming_metadata_buffer_add (grpc_chttp2_incoming_metadata_buffer * buffer, grpc_mdelem * elem) -{ - if (buffer->capacity == buffer->count) - { - buffer->capacity = GPR_MAX (8, 2 * buffer->capacity); - buffer->elems = gpr_realloc (buffer->elems, sizeof (*buffer->elems) * buffer->capacity); - } +void grpc_chttp2_incoming_metadata_buffer_add( + grpc_chttp2_incoming_metadata_buffer *buffer, grpc_mdelem *elem) { + if (buffer->capacity == buffer->count) { + buffer->capacity = GPR_MAX(8, 2 * buffer->capacity); + buffer->elems = + gpr_realloc(buffer->elems, sizeof(*buffer->elems) * buffer->capacity); + } buffer->elems[buffer->count++].md = elem; } -void -grpc_chttp2_incoming_metadata_buffer_set_deadline (grpc_chttp2_incoming_metadata_buffer * buffer, gpr_timespec deadline) -{ +void grpc_chttp2_incoming_metadata_buffer_set_deadline( + grpc_chttp2_incoming_metadata_buffer *buffer, gpr_timespec deadline) { buffer->deadline = deadline; } -void -grpc_chttp2_incoming_metadata_live_op_buffer_end (grpc_chttp2_incoming_metadata_live_op_buffer * buffer) -{ - gpr_free (buffer->elems); +void grpc_chttp2_incoming_metadata_live_op_buffer_end( + grpc_chttp2_incoming_metadata_live_op_buffer *buffer) { + gpr_free(buffer->elems); buffer->elems = NULL; } -void -grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into (grpc_chttp2_incoming_metadata_buffer * buffer, grpc_stream_op_buffer * sopb) -{ +void grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into( + grpc_chttp2_incoming_metadata_buffer *buffer, grpc_stream_op_buffer *sopb) { grpc_metadata_batch b; b.list.head = NULL; @@ -91,56 +84,52 @@ grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into (grpc_chttp2_inco we can reconstitute the list. We can't do list building here as later incoming metadata may reallocate the underlying array. */ - b.list.tail = (void *) (gpr_intptr) buffer->count; + b.list.tail = (void *)(gpr_intptr)buffer->count; b.garbage.head = b.garbage.tail = NULL; b.deadline = buffer->deadline; - buffer->deadline = gpr_inf_future (GPR_CLOCK_REALTIME); + buffer->deadline = gpr_inf_future(GPR_CLOCK_REALTIME); - grpc_sopb_add_metadata (sopb, b); + grpc_sopb_add_metadata(sopb, b); } -void -grpc_chttp2_incoming_metadata_buffer_swap (grpc_chttp2_incoming_metadata_buffer * a, grpc_chttp2_incoming_metadata_buffer * b) -{ - GPR_SWAP (grpc_chttp2_incoming_metadata_buffer, *a, *b); +void grpc_chttp2_incoming_metadata_buffer_swap( + grpc_chttp2_incoming_metadata_buffer *a, + grpc_chttp2_incoming_metadata_buffer *b) { + GPR_SWAP(grpc_chttp2_incoming_metadata_buffer, *a, *b); } -void -grpc_incoming_metadata_buffer_move_to_referencing_sopb (grpc_chttp2_incoming_metadata_buffer * src, grpc_chttp2_incoming_metadata_buffer * dst, grpc_stream_op_buffer * sopb) -{ +void grpc_incoming_metadata_buffer_move_to_referencing_sopb( + grpc_chttp2_incoming_metadata_buffer *src, + grpc_chttp2_incoming_metadata_buffer *dst, grpc_stream_op_buffer *sopb) { size_t delta; size_t i; - dst->deadline = gpr_time_min (src->deadline, dst->deadline); - - if (src->count == 0) - { - return; - } - if (dst->count == 0) - { - grpc_chttp2_incoming_metadata_buffer_swap (src, dst); - return; - } + dst->deadline = gpr_time_min(src->deadline, dst->deadline); + + if (src->count == 0) { + return; + } + if (dst->count == 0) { + grpc_chttp2_incoming_metadata_buffer_swap(src, dst); + return; + } delta = dst->count; - if (dst->capacity < src->count + dst->count) - { - dst->capacity = GPR_MAX (dst->capacity * 2, src->count + dst->count); - dst->elems = gpr_realloc (dst->elems, dst->capacity * sizeof (*dst->elems)); - } - memcpy (dst->elems + dst->count, src->elems, src->count * sizeof (*src->elems)); + if (dst->capacity < src->count + dst->count) { + dst->capacity = GPR_MAX(dst->capacity * 2, src->count + dst->count); + dst->elems = gpr_realloc(dst->elems, dst->capacity * sizeof(*dst->elems)); + } + memcpy(dst->elems + dst->count, src->elems, src->count * sizeof(*src->elems)); dst->count += src->count; - for (i = 0; i < sopb->nops; i++) - { - if (sopb->ops[i].type != GRPC_OP_METADATA) - continue; - sopb->ops[i].data.metadata.list.tail = (void *) (delta + (gpr_uintptr) sopb->ops[i].data.metadata.list.tail); - } + for (i = 0; i < sopb->nops; i++) { + if (sopb->ops[i].type != GRPC_OP_METADATA) continue; + sopb->ops[i].data.metadata.list.tail = + (void *)(delta + (gpr_uintptr)sopb->ops[i].data.metadata.list.tail); + } src->count = 0; } -void -grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op (grpc_chttp2_incoming_metadata_buffer * buffer, grpc_stream_op_buffer * sopb, grpc_chttp2_incoming_metadata_live_op_buffer * live_op_buffer) -{ +void grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op( + grpc_chttp2_incoming_metadata_buffer *buffer, grpc_stream_op_buffer *sopb, + grpc_chttp2_incoming_metadata_live_op_buffer *live_op_buffer) { grpc_stream_op *ops = sopb->ops; size_t nops = sopb->nops; size_t i; @@ -152,49 +141,42 @@ grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op (grpc_ch /* rework the array of metadata into a linked list, making use of the breadcrumbs we left in metadata batches during add_metadata_batch */ - for (i = 0; i < nops; i++) - { - grpc_stream_op *op = &ops[i]; - if (op->type != GRPC_OP_METADATA) - continue; - found_metadata = 1; - /* we left a breadcrumb indicating where the end of this list is, - and since we add sequentially, we know from the end of the last - segment where this segment begins */ - last_mdidx = (size_t) (gpr_intptr) (op->data.metadata.list.tail); - GPR_ASSERT (last_mdidx > mdidx); - GPR_ASSERT (last_mdidx <= buffer->count); - /* turn the array into a doubly linked list */ - op->data.metadata.list.head = &buffer->elems[mdidx]; - op->data.metadata.list.tail = &buffer->elems[last_mdidx - 1]; - for (j = mdidx + 1; j < last_mdidx; j++) - { - buffer->elems[j].prev = &buffer->elems[j - 1]; - buffer->elems[j - 1].next = &buffer->elems[j]; - } - buffer->elems[mdidx].prev = NULL; - buffer->elems[last_mdidx - 1].next = NULL; - /* track where we're up to */ - mdidx = last_mdidx; + for (i = 0; i < nops; i++) { + grpc_stream_op *op = &ops[i]; + if (op->type != GRPC_OP_METADATA) continue; + found_metadata = 1; + /* we left a breadcrumb indicating where the end of this list is, + and since we add sequentially, we know from the end of the last + segment where this segment begins */ + last_mdidx = (size_t)(gpr_intptr)(op->data.metadata.list.tail); + GPR_ASSERT(last_mdidx > mdidx); + GPR_ASSERT(last_mdidx <= buffer->count); + /* turn the array into a doubly linked list */ + op->data.metadata.list.head = &buffer->elems[mdidx]; + op->data.metadata.list.tail = &buffer->elems[last_mdidx - 1]; + for (j = mdidx + 1; j < last_mdidx; j++) { + buffer->elems[j].prev = &buffer->elems[j - 1]; + buffer->elems[j - 1].next = &buffer->elems[j]; } - if (found_metadata) - { - live_op_buffer->elems = buffer->elems; - if (mdidx != buffer->count) - { - /* we have a partially read metadata batch still in incoming_metadata */ - size_t new_count = buffer->count - mdidx; - size_t copy_bytes = sizeof (*buffer->elems) * new_count; - GPR_ASSERT (mdidx < buffer->count); - buffer->elems = gpr_malloc (copy_bytes); - memcpy (live_op_buffer->elems + mdidx, buffer->elems, copy_bytes); - buffer->count = buffer->capacity = new_count; - } - else - { - buffer->elems = NULL; - buffer->count = 0; - buffer->capacity = 0; - } + buffer->elems[mdidx].prev = NULL; + buffer->elems[last_mdidx - 1].next = NULL; + /* track where we're up to */ + mdidx = last_mdidx; + } + if (found_metadata) { + live_op_buffer->elems = buffer->elems; + if (mdidx != buffer->count) { + /* we have a partially read metadata batch still in incoming_metadata */ + size_t new_count = buffer->count - mdidx; + size_t copy_bytes = sizeof(*buffer->elems) * new_count; + GPR_ASSERT(mdidx < buffer->count); + buffer->elems = gpr_malloc(copy_bytes); + memcpy(live_op_buffer->elems + mdidx, buffer->elems, copy_bytes); + buffer->count = buffer->capacity = new_count; + } else { + buffer->elems = NULL; + buffer->count = 0; + buffer->capacity = 0; } + } } diff --git a/src/core/transport/chttp2/incoming_metadata.h b/src/core/transport/chttp2/incoming_metadata.h index 7ca0f722c3d..2f1de411bae 100644 --- a/src/core/transport/chttp2/incoming_metadata.h +++ b/src/core/transport/chttp2/incoming_metadata.h @@ -36,36 +36,45 @@ #include "src/core/transport/transport.h" -typedef struct -{ +typedef struct { grpc_linked_mdelem *elems; size_t count; size_t capacity; gpr_timespec deadline; } grpc_chttp2_incoming_metadata_buffer; -typedef struct -{ +typedef struct { grpc_linked_mdelem *elems; } grpc_chttp2_incoming_metadata_live_op_buffer; /** assumes everything initially zeroed */ -void grpc_chttp2_incoming_metadata_buffer_init (grpc_chttp2_incoming_metadata_buffer * buffer); -void grpc_chttp2_incoming_metadata_buffer_destroy (grpc_chttp2_incoming_metadata_buffer * buffer); -void grpc_chttp2_incoming_metadata_buffer_reset (grpc_chttp2_incoming_metadata_buffer * buffer); +void grpc_chttp2_incoming_metadata_buffer_init( + grpc_chttp2_incoming_metadata_buffer *buffer); +void grpc_chttp2_incoming_metadata_buffer_destroy( + grpc_chttp2_incoming_metadata_buffer *buffer); +void grpc_chttp2_incoming_metadata_buffer_reset( + grpc_chttp2_incoming_metadata_buffer *buffer); -void grpc_chttp2_incoming_metadata_buffer_add (grpc_chttp2_incoming_metadata_buffer * buffer, grpc_mdelem * elem); -void grpc_chttp2_incoming_metadata_buffer_set_deadline (grpc_chttp2_incoming_metadata_buffer * buffer, gpr_timespec deadline); +void grpc_chttp2_incoming_metadata_buffer_add( + grpc_chttp2_incoming_metadata_buffer *buffer, grpc_mdelem *elem); +void grpc_chttp2_incoming_metadata_buffer_set_deadline( + grpc_chttp2_incoming_metadata_buffer *buffer, gpr_timespec deadline); /** extend sopb with a metadata batch; this must be post-processed by grpc_chttp2_incoming_metadata_buffer_postprocess_sopb before being handed out of the transport */ -void grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into (grpc_chttp2_incoming_metadata_buffer * buffer, grpc_stream_op_buffer * sopb); +void grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into( + grpc_chttp2_incoming_metadata_buffer *buffer, grpc_stream_op_buffer *sopb); -void grpc_incoming_metadata_buffer_move_to_referencing_sopb (grpc_chttp2_incoming_metadata_buffer * src, grpc_chttp2_incoming_metadata_buffer * dst, grpc_stream_op_buffer * sopb); +void grpc_incoming_metadata_buffer_move_to_referencing_sopb( + grpc_chttp2_incoming_metadata_buffer *src, + grpc_chttp2_incoming_metadata_buffer *dst, grpc_stream_op_buffer *sopb); -void grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op (grpc_chttp2_incoming_metadata_buffer * buffer, grpc_stream_op_buffer * sopb, grpc_chttp2_incoming_metadata_live_op_buffer * live_op_buffer); +void grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op( + grpc_chttp2_incoming_metadata_buffer *buffer, grpc_stream_op_buffer *sopb, + grpc_chttp2_incoming_metadata_live_op_buffer *live_op_buffer); -void grpc_chttp2_incoming_metadata_live_op_buffer_end (grpc_chttp2_incoming_metadata_live_op_buffer * live_op_buffer); +void grpc_chttp2_incoming_metadata_live_op_buffer_end( + grpc_chttp2_incoming_metadata_live_op_buffer *live_op_buffer); #endif /* GRPC_INTERNAL_CORE_CHTTP2_INCOMING_METADATA_H */ diff --git a/src/core/transport/chttp2/internal.h b/src/core/transport/chttp2/internal.h index aaf090cd44e..b35f8b5d883 100644 --- a/src/core/transport/chttp2/internal.h +++ b/src/core/transport/chttp2/internal.h @@ -54,8 +54,7 @@ typedef struct grpc_chttp2_stream grpc_chttp2_stream; /* streams are kept in various linked lists depending on what things need to happen to them... this enum labels each list */ -typedef enum -{ +typedef enum { GRPC_CHTTP2_LIST_ALL_STREAMS, GRPC_CHTTP2_LIST_READ_WRITE_STATE_CHANGED, GRPC_CHTTP2_LIST_WRITABLE, @@ -68,12 +67,11 @@ typedef enum /** streams that are waiting to start because there are too many concurrent streams on the connection */ GRPC_CHTTP2_LIST_WAITING_FOR_CONCURRENCY, - STREAM_LIST_COUNT /* must be last */ + STREAM_LIST_COUNT /* must be last */ } grpc_chttp2_stream_list_id; /* deframer state for the overall http2 stream of bytes */ -typedef enum -{ +typedef enum { /* prefix: one entry per http2 connection prefix byte */ GRPC_DTS_CLIENT_PREFIX_0 = 0, GRPC_DTS_CLIENT_PREFIX_1, @@ -115,8 +113,7 @@ typedef enum GRPC_DTS_FRAME } grpc_chttp2_deframe_transport_state; -typedef enum -{ +typedef enum { GRPC_WRITE_STATE_OPEN, GRPC_WRITE_STATE_QUEUED_CLOSE, GRPC_WRITE_STATE_SENT_CLOSE @@ -126,28 +123,24 @@ typedef enum #define GRPC_CHTTP2_WRITING_DATA 1 #define GRPC_CHTTP2_WRITING_WINDOW 2 -typedef enum -{ +typedef enum { GRPC_DONT_SEND_CLOSED = 0, GRPC_SEND_CLOSED, GRPC_SEND_CLOSED_WITH_RST_STREAM } grpc_chttp2_send_closed; -typedef struct -{ +typedef struct { grpc_chttp2_stream *head; grpc_chttp2_stream *tail; } grpc_chttp2_stream_list; -typedef struct -{ +typedef struct { grpc_chttp2_stream *next; grpc_chttp2_stream *prev; } grpc_chttp2_stream_link; /* We keep several sets of connection wide parameters */ -typedef enum -{ +typedef enum { /* The settings our peer has asked for (and we have acked) */ GRPC_PEER_SETTINGS = 0, /* The settings we'd like to have */ @@ -160,16 +153,14 @@ typedef enum } grpc_chttp2_setting_set; /* Outstanding ping request data */ -typedef struct grpc_chttp2_outstanding_ping -{ +typedef struct grpc_chttp2_outstanding_ping { gpr_uint8 id[8]; grpc_closure *on_recv; struct grpc_chttp2_outstanding_ping *next; struct grpc_chttp2_outstanding_ping *prev; } grpc_chttp2_outstanding_ping; -typedef struct -{ +typedef struct { /** data to write next write */ gpr_slice_buffer qbuf; @@ -213,8 +204,7 @@ typedef struct gpr_uint32 concurrent_stream_count; } grpc_chttp2_transport_global; -typedef struct -{ +typedef struct { /** data to write now */ gpr_slice_buffer outbuf; /** hpack encoding */ @@ -225,8 +215,7 @@ typedef struct grpc_closure done_cb; } grpc_chttp2_transport_writing; -struct grpc_chttp2_transport_parsing -{ +struct grpc_chttp2_transport_parsing { /** is this transport a client? (boolean) */ gpr_uint8 is_client; @@ -247,8 +236,7 @@ struct grpc_chttp2_transport_parsing /** parser for headers */ grpc_chttp2_hpack_parser hpack_parser; /** simple one shot parsers */ - union - { + union { grpc_chttp2_window_update_parser window_update; grpc_chttp2_settings_parser settings; grpc_chttp2_ping_parser ping; @@ -277,7 +265,10 @@ struct grpc_chttp2_transport_parsing /* active parser */ void *parser_data; grpc_chttp2_stream_parsing *incoming_stream; - grpc_chttp2_parse_error (*parser) (grpc_exec_ctx * exec_ctx, void *parser_user_data, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last); + grpc_chttp2_parse_error (*parser)( + grpc_exec_ctx *exec_ctx, void *parser_user_data, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last); /* received settings */ gpr_uint32 settings[GRPC_CHTTP2_NUM_SETTINGS]; @@ -293,9 +284,8 @@ struct grpc_chttp2_transport_parsing grpc_chttp2_outstanding_ping pings; }; -struct grpc_chttp2_transport -{ - grpc_transport base; /* must be first */ +struct grpc_chttp2_transport { + grpc_transport base; /* must be first */ grpc_endpoint *ep; grpc_mdctx *metadata_context; gpr_refcount refs; @@ -353,10 +343,10 @@ struct grpc_chttp2_transport publish the accepted server stream */ grpc_chttp2_stream **accepting_stream; - struct - { + struct { /* accept stream callback */ - void (*accept_stream) (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 */ @@ -364,8 +354,7 @@ struct grpc_chttp2_transport } channel_callback; }; -typedef struct -{ +typedef struct { /** HTTP2 stream id for this stream, or zero if one has not been assigned */ gpr_uint32 id; @@ -421,8 +410,7 @@ typedef struct grpc_chttp2_incoming_metadata_live_op_buffer outstanding_metadata; } grpc_chttp2_stream_global; -typedef struct -{ +typedef struct { /** HTTP2 stream id for this stream, or zero if one has not been assigned */ gpr_uint32 id; /** sops that have passed flow control to be written */ @@ -433,8 +421,7 @@ typedef struct gpr_uint32 announce_window; } grpc_chttp2_stream_writing; -struct grpc_chttp2_stream_parsing -{ +struct grpc_chttp2_stream_parsing { /** HTTP2 stream id for this stream, or zero if one has not been assigned */ gpr_uint32 id; /** has this stream received a close */ @@ -456,8 +443,7 @@ struct grpc_chttp2_stream_parsing grpc_chttp2_incoming_metadata_buffer incoming_metadata; }; -struct grpc_chttp2_stream -{ +struct grpc_chttp2_stream { grpc_chttp2_stream_global global; grpc_chttp2_stream_writing writing; grpc_chttp2_stream_parsing parsing; @@ -479,71 +465,141 @@ struct grpc_chttp2_stream /** Someone is unlocking the transport mutex: check to see if writes are required, and schedule them if so */ -int grpc_chttp2_unlocking_check_writes (grpc_chttp2_transport_global * global, grpc_chttp2_transport_writing * writing); -void grpc_chttp2_perform_writes (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_writing * transport_writing, grpc_endpoint * endpoint); -void grpc_chttp2_terminate_writing (grpc_exec_ctx * exec_ctx, void *transport_writing, int success); -void grpc_chttp2_cleanup_writing (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * global, grpc_chttp2_transport_writing * writing); - -void grpc_chttp2_prepare_to_read (grpc_chttp2_transport_global * global, grpc_chttp2_transport_parsing * parsing); +int grpc_chttp2_unlocking_check_writes(grpc_chttp2_transport_global *global, + grpc_chttp2_transport_writing *writing); +void grpc_chttp2_perform_writes( + grpc_exec_ctx *exec_ctx, grpc_chttp2_transport_writing *transport_writing, + grpc_endpoint *endpoint); +void grpc_chttp2_terminate_writing(grpc_exec_ctx *exec_ctx, + void *transport_writing, int success); +void grpc_chttp2_cleanup_writing(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport_global *global, + grpc_chttp2_transport_writing *writing); + +void grpc_chttp2_prepare_to_read(grpc_chttp2_transport_global *global, + grpc_chttp2_transport_parsing *parsing); /** 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 */ -int grpc_chttp2_perform_read (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice); -void grpc_chttp2_publish_reads (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * global, grpc_chttp2_transport_parsing * parsing); +int grpc_chttp2_perform_read(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport_parsing *transport_parsing, + gpr_slice slice); +void grpc_chttp2_publish_reads(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport_global *global, + grpc_chttp2_transport_parsing *parsing); /** Get a writable stream returns non-zero if there was a stream available */ -void grpc_chttp2_list_add_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); -void grpc_chttp2_list_add_first_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); -int grpc_chttp2_list_pop_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_writing ** stream_writing); -void grpc_chttp2_list_remove_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); - -void grpc_chttp2_list_add_incoming_window_updated (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); -int grpc_chttp2_list_pop_incoming_window_updated (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_parsing ** stream_parsing); -void grpc_chttp2_list_remove_incoming_window_updated (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); - -void grpc_chttp2_list_add_writing_stream (grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_writing * stream_writing); -int grpc_chttp2_list_have_writing_streams (grpc_chttp2_transport_writing * transport_writing); -int grpc_chttp2_list_pop_writing_stream (grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_writing ** stream_writing); - -void grpc_chttp2_list_add_written_stream (grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_writing * stream_writing); -int grpc_chttp2_list_pop_written_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_writing ** stream_writing); - -void grpc_chttp2_list_add_parsing_seen_stream (grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing); -int grpc_chttp2_list_pop_parsing_seen_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_parsing ** stream_parsing); - -void grpc_chttp2_list_add_waiting_for_concurrency (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); -int grpc_chttp2_list_pop_waiting_for_concurrency (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global); - -void grpc_chttp2_list_add_closed_waiting_for_parsing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); -int grpc_chttp2_list_pop_closed_waiting_for_parsing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global); - -void grpc_chttp2_list_add_cancelled_waiting_for_writing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); -int grpc_chttp2_list_pop_cancelled_waiting_for_writing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global); - -void grpc_chttp2_list_add_read_write_state_changed (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global); -int grpc_chttp2_list_pop_read_write_state_changed (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global); - -grpc_chttp2_stream_parsing *grpc_chttp2_parsing_lookup_stream (grpc_chttp2_transport_parsing * transport_parsing, gpr_uint32 id); -grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream (grpc_chttp2_transport_parsing * transport_parsing, gpr_uint32 id); - -void grpc_chttp2_add_incoming_goaway (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, gpr_uint32 goaway_error, gpr_slice goaway_text); - -void grpc_chttp2_register_stream (grpc_chttp2_transport * t, grpc_chttp2_stream * s); +void grpc_chttp2_list_add_writable_stream( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global); +void grpc_chttp2_list_add_first_writable_stream( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global); +int grpc_chttp2_list_pop_writable_stream( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_transport_writing *transport_writing, + grpc_chttp2_stream_global **stream_global, + grpc_chttp2_stream_writing **stream_writing); +void grpc_chttp2_list_remove_writable_stream( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global); + +void grpc_chttp2_list_add_incoming_window_updated( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global); +int grpc_chttp2_list_pop_incoming_window_updated( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_global **stream_global, + grpc_chttp2_stream_parsing **stream_parsing); +void grpc_chttp2_list_remove_incoming_window_updated( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global); + +void grpc_chttp2_list_add_writing_stream( + grpc_chttp2_transport_writing *transport_writing, + grpc_chttp2_stream_writing *stream_writing); +int grpc_chttp2_list_have_writing_streams( + grpc_chttp2_transport_writing *transport_writing); +int grpc_chttp2_list_pop_writing_stream( + grpc_chttp2_transport_writing *transport_writing, + grpc_chttp2_stream_writing **stream_writing); + +void grpc_chttp2_list_add_written_stream( + grpc_chttp2_transport_writing *transport_writing, + grpc_chttp2_stream_writing *stream_writing); +int grpc_chttp2_list_pop_written_stream( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_transport_writing *transport_writing, + grpc_chttp2_stream_global **stream_global, + grpc_chttp2_stream_writing **stream_writing); + +void grpc_chttp2_list_add_parsing_seen_stream( + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing); +int grpc_chttp2_list_pop_parsing_seen_stream( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_global **stream_global, + grpc_chttp2_stream_parsing **stream_parsing); + +void grpc_chttp2_list_add_waiting_for_concurrency( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global); +int grpc_chttp2_list_pop_waiting_for_concurrency( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global **stream_global); + +void grpc_chttp2_list_add_closed_waiting_for_parsing( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global); +int grpc_chttp2_list_pop_closed_waiting_for_parsing( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global **stream_global); + +void grpc_chttp2_list_add_cancelled_waiting_for_writing( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global); +int grpc_chttp2_list_pop_cancelled_waiting_for_writing( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global **stream_global); + +void grpc_chttp2_list_add_read_write_state_changed( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global); +int grpc_chttp2_list_pop_read_write_state_changed( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global **stream_global); + +grpc_chttp2_stream_parsing *grpc_chttp2_parsing_lookup_stream( + grpc_chttp2_transport_parsing *transport_parsing, gpr_uint32 id); +grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream( + grpc_chttp2_transport_parsing *transport_parsing, gpr_uint32 id); + +void grpc_chttp2_add_incoming_goaway( + grpc_exec_ctx *exec_ctx, grpc_chttp2_transport_global *transport_global, + gpr_uint32 goaway_error, gpr_slice goaway_text); + +void grpc_chttp2_register_stream(grpc_chttp2_transport *t, + grpc_chttp2_stream *s); /* returns 1 if this is the last stream, 0 otherwise */ -int -grpc_chttp2_unregister_stream (grpc_chttp2_transport * t, grpc_chttp2_stream * s) - GRPC_MUST_USE_RESULT; - int grpc_chttp2_has_streams (grpc_chttp2_transport * t); - void grpc_chttp2_for_all_streams (grpc_chttp2_transport_global * transport_global, void *user_data, void (*cb) (grpc_chttp2_transport_global * transport_global, void *user_data, grpc_chttp2_stream_global * stream_global)); +int grpc_chttp2_unregister_stream(grpc_chttp2_transport *t, + grpc_chttp2_stream *s) GRPC_MUST_USE_RESULT; +int grpc_chttp2_has_streams(grpc_chttp2_transport *t); +void grpc_chttp2_for_all_streams( + grpc_chttp2_transport_global *transport_global, void *user_data, + void (*cb)(grpc_chttp2_transport_global *transport_global, void *user_data, + grpc_chttp2_stream_global *stream_global)); - void grpc_chttp2_parsing_become_skip_parser (grpc_chttp2_transport_parsing * transport_parsing); +void grpc_chttp2_parsing_become_skip_parser( + grpc_chttp2_transport_parsing *transport_parsing); #define GRPC_CHTTP2_CLIENT_CONNECT_STRING "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" #define GRPC_CHTTP2_CLIENT_CONNECT_STRLEN \ (sizeof(GRPC_CHTTP2_CLIENT_CONNECT_STRING) - 1) - extern int grpc_http_trace; - extern int grpc_flowctl_trace; +extern int grpc_http_trace; +extern int grpc_flowctl_trace; #define GRPC_CHTTP2_IF_TRACING(stmt) \ if (!(grpc_http_trace)) \ @@ -568,6 +624,9 @@ grpc_chttp2_unregister_stream (grpc_chttp2_transport * t, grpc_chttp2_stream * s (gpr_int64)(context->var), (gpr_int64)(delta)); \ } - void grpc_chttp2_flowctl_trace (const char *file, int line, const char *reason, const char *context, const char *var, int is_client, gpr_uint32 stream_id, gpr_int64 current_value, gpr_int64 delta); +void grpc_chttp2_flowctl_trace(const char *file, int line, const char *reason, + const char *context, const char *var, + int is_client, gpr_uint32 stream_id, + gpr_int64 current_value, gpr_int64 delta); #endif diff --git a/src/core/transport/chttp2/parsing.c b/src/core/transport/chttp2/parsing.c index 9e19590e725..f7a0a10581b 100644 --- a/src/core/transport/chttp2/parsing.c +++ b/src/core/transport/chttp2/parsing.c @@ -42,46 +42,58 @@ #include #include -static int init_frame_parser (grpc_chttp2_transport_parsing * transport_parsing); -static int init_header_frame_parser (grpc_chttp2_transport_parsing * transport_parsing, int is_continuation); -static int init_data_frame_parser (grpc_chttp2_transport_parsing * transport_parsing); -static int init_rst_stream_parser (grpc_chttp2_transport_parsing * transport_parsing); -static int init_settings_frame_parser (grpc_chttp2_transport_parsing * transport_parsing); -static int init_window_update_frame_parser (grpc_chttp2_transport_parsing * transport_parsing); -static int init_ping_parser (grpc_chttp2_transport_parsing * transport_parsing); -static int init_goaway_parser (grpc_chttp2_transport_parsing * transport_parsing); -static int init_skip_frame_parser (grpc_chttp2_transport_parsing * transport_parsing, int is_header); - -static int parse_frame_slice (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice, int is_last); - -void -grpc_chttp2_prepare_to_read (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing) -{ +static int init_frame_parser(grpc_chttp2_transport_parsing *transport_parsing); +static int init_header_frame_parser( + grpc_chttp2_transport_parsing *transport_parsing, int is_continuation); +static int init_data_frame_parser( + grpc_chttp2_transport_parsing *transport_parsing); +static int init_rst_stream_parser( + grpc_chttp2_transport_parsing *transport_parsing); +static int init_settings_frame_parser( + grpc_chttp2_transport_parsing *transport_parsing); +static int init_window_update_frame_parser( + grpc_chttp2_transport_parsing *transport_parsing); +static int init_ping_parser(grpc_chttp2_transport_parsing *transport_parsing); +static int init_goaway_parser(grpc_chttp2_transport_parsing *transport_parsing); +static int init_skip_frame_parser( + grpc_chttp2_transport_parsing *transport_parsing, int is_header); + +static int parse_frame_slice(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport_parsing *transport_parsing, + gpr_slice slice, int is_last); + +void grpc_chttp2_prepare_to_read( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_transport_parsing *transport_parsing) { grpc_chttp2_stream_global *stream_global; grpc_chttp2_stream_parsing *stream_parsing; transport_parsing->next_stream_id = transport_global->next_stream_id; /* update the parsing view of incoming window */ - if (transport_parsing->incoming_window != transport_global->incoming_window) - { - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("parse", transport_parsing, incoming_window, (gpr_int64) transport_global->incoming_window - (gpr_int64) transport_parsing->incoming_window); - transport_parsing->incoming_window = transport_global->incoming_window; - } - while (grpc_chttp2_list_pop_incoming_window_updated (transport_global, transport_parsing, &stream_global, &stream_parsing)) - { - stream_parsing->id = stream_global->id; - if (stream_parsing->incoming_window != stream_global->incoming_window) - { - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("parse", transport_parsing, stream_parsing, incoming_window, (gpr_int64) stream_global->incoming_window - (gpr_int64) stream_parsing->incoming_window); - stream_parsing->incoming_window = stream_global->incoming_window; - } - } + if (transport_parsing->incoming_window != transport_global->incoming_window) { + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT( + "parse", transport_parsing, incoming_window, + (gpr_int64)transport_global->incoming_window - + (gpr_int64)transport_parsing->incoming_window); + transport_parsing->incoming_window = transport_global->incoming_window; + } + while (grpc_chttp2_list_pop_incoming_window_updated( + transport_global, transport_parsing, &stream_global, &stream_parsing)) { + stream_parsing->id = stream_global->id; + if (stream_parsing->incoming_window != stream_global->incoming_window) { + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( + "parse", transport_parsing, stream_parsing, incoming_window, + (gpr_int64)stream_global->incoming_window - + (gpr_int64)stream_parsing->incoming_window); + stream_parsing->incoming_window = stream_global->incoming_window; + } + } } -void -grpc_chttp2_publish_reads (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing) -{ +void grpc_chttp2_publish_reads( + grpc_exec_ctx *exec_ctx, grpc_chttp2_transport_global *transport_global, + grpc_chttp2_transport_parsing *transport_parsing) { grpc_chttp2_stream_global *stream_global; grpc_chttp2_stream_parsing *stream_parsing; @@ -93,126 +105,146 @@ grpc_chttp2_publish_reads (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_globa ID. So, since we don't have server pushed streams, client should send GOAWAY last-grpc_chttp2_stream-id=0 in this case. */ - if (!transport_parsing->is_client) - { - transport_global->last_incoming_stream_id = transport_parsing->incoming_stream_id; - } + if (!transport_parsing->is_client) { + transport_global->last_incoming_stream_id = + transport_parsing->incoming_stream_id; + } /* copy parsing qbuf to global qbuf */ - gpr_slice_buffer_move_into (&transport_parsing->qbuf, &transport_global->qbuf); + gpr_slice_buffer_move_into(&transport_parsing->qbuf, &transport_global->qbuf); /* update global settings */ - if (transport_parsing->settings_updated) - { - memcpy (transport_global->settings[GRPC_PEER_SETTINGS], transport_parsing->settings, sizeof (transport_parsing->settings)); - transport_parsing->settings_updated = 0; - } + if (transport_parsing->settings_updated) { + memcpy(transport_global->settings[GRPC_PEER_SETTINGS], + transport_parsing->settings, sizeof(transport_parsing->settings)); + transport_parsing->settings_updated = 0; + } /* update settings based on ack if received */ - if (transport_parsing->settings_ack_received) - { - memcpy (transport_global->settings[GRPC_ACKED_SETTINGS], transport_global->settings[GRPC_SENT_SETTINGS], GRPC_CHTTP2_NUM_SETTINGS * sizeof (gpr_uint32)); - transport_parsing->settings_ack_received = 0; - } + if (transport_parsing->settings_ack_received) { + memcpy(transport_global->settings[GRPC_ACKED_SETTINGS], + transport_global->settings[GRPC_SENT_SETTINGS], + GRPC_CHTTP2_NUM_SETTINGS * sizeof(gpr_uint32)); + transport_parsing->settings_ack_received = 0; + } /* move goaway to the global state if we received one (it will be published later */ - if (transport_parsing->goaway_received) - { - grpc_chttp2_add_incoming_goaway (exec_ctx,transport_global, ( gpr_uint32) transport_parsing->goaway_error, transport_parsing->goaway_text); - transport_parsing->goaway_text = gpr_empty_slice (); - transport_parsing->goaway_received = 0; - } + if (transport_parsing->goaway_received) { + grpc_chttp2_add_incoming_goaway(exec_ctx, transport_global, + (gpr_uint32)transport_parsing->goaway_error, + transport_parsing->goaway_text); + transport_parsing->goaway_text = gpr_empty_slice(); + transport_parsing->goaway_received = 0; + } /* propagate flow control tokens to global state */ - if (transport_parsing->outgoing_window_update) - { - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("parsed", transport_global, outgoing_window, transport_parsing->outgoing_window_update); - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("parsed", transport_parsing, outgoing_window_update, -(gpr_int64) transport_parsing->outgoing_window_update); - transport_global->outgoing_window += transport_parsing->outgoing_window_update; - transport_parsing->outgoing_window_update = 0; - } - - if (transport_parsing->incoming_window_delta) - { - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("parsed", transport_global, incoming_window, -(gpr_int64) transport_parsing->incoming_window_delta); - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("parsed", transport_parsing, incoming_window_delta, -(gpr_int64) transport_parsing->incoming_window_delta); - transport_global->incoming_window -= transport_parsing->incoming_window_delta; - transport_parsing->incoming_window_delta = 0; - } + if (transport_parsing->outgoing_window_update) { + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT( + "parsed", transport_global, outgoing_window, + transport_parsing->outgoing_window_update); + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT( + "parsed", transport_parsing, outgoing_window_update, + -(gpr_int64)transport_parsing->outgoing_window_update); + transport_global->outgoing_window += + transport_parsing->outgoing_window_update; + transport_parsing->outgoing_window_update = 0; + } + + if (transport_parsing->incoming_window_delta) { + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT( + "parsed", transport_global, incoming_window, + -(gpr_int64)transport_parsing->incoming_window_delta); + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT( + "parsed", transport_parsing, incoming_window_delta, + -(gpr_int64)transport_parsing->incoming_window_delta); + transport_global->incoming_window -= + transport_parsing->incoming_window_delta; + transport_parsing->incoming_window_delta = 0; + } /* for each stream that saw an update, fixup global state */ - while (grpc_chttp2_list_pop_parsing_seen_stream (transport_global, transport_parsing, &stream_global, &stream_parsing)) - { - /* update incoming flow control window */ - if (stream_parsing->incoming_window_delta) - { - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("parsed", transport_parsing, stream_global, incoming_window, -(gpr_int64) stream_parsing->incoming_window_delta); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("parsed", transport_parsing, stream_parsing, incoming_window_delta, -(gpr_int64) stream_parsing->incoming_window_delta); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("parsed", transport_parsing, stream_global, max_recv_bytes, -(gpr_int64) stream_parsing->incoming_window_delta); - stream_global->incoming_window -= stream_parsing->incoming_window_delta; - GPR_ASSERT (stream_global->max_recv_bytes >= stream_parsing->incoming_window_delta); - stream_global->max_recv_bytes -= stream_parsing->incoming_window_delta; - stream_parsing->incoming_window_delta = 0; - grpc_chttp2_list_add_writable_stream (transport_global, stream_global); - } - - /* update outgoing flow control window */ - if (stream_parsing->outgoing_window_update) - { - int was_zero = stream_global->outgoing_window <= 0; - int is_zero; - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("parsed", transport_parsing, stream_global, outgoing_window, stream_parsing->outgoing_window_update); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("parsed", transport_parsing, stream_parsing, outgoing_window_update, -(gpr_int64) stream_parsing->outgoing_window_update); - GPR_ASSERT (stream_parsing->outgoing_window_update <= GPR_UINT32_MAX); - stream_global->outgoing_window += (gpr_uint32) stream_parsing->outgoing_window_update; - stream_parsing->outgoing_window_update = 0; - is_zero = stream_global->outgoing_window <= 0; - if (was_zero && !is_zero) - { - grpc_chttp2_list_add_writable_stream (transport_global, stream_global); - } - } - - /* updating closed status */ - if (stream_parsing->received_close) - { - stream_global->read_closed = 1; - grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); - } - if (stream_parsing->saw_rst_stream) - { - stream_global->cancelled = 1; - stream_global->cancelled_status = grpc_chttp2_http2_error_to_grpc_status ((grpc_chttp2_error_code) stream_parsing->rst_stream_reason); - if (stream_parsing->rst_stream_reason == GRPC_CHTTP2_NO_ERROR) - { - stream_global->published_cancelled = 1; - } - grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); - } - - /* publish incoming stream ops */ - if (stream_parsing->data_parser.incoming_sopb.nops > 0) - { - grpc_incoming_metadata_buffer_move_to_referencing_sopb (&stream_parsing->incoming_metadata, &stream_global->incoming_metadata, &stream_parsing->data_parser.incoming_sopb); - grpc_sopb_move_to (&stream_parsing->data_parser.incoming_sopb, &stream_global->incoming_sopb); - grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); - } - } + while (grpc_chttp2_list_pop_parsing_seen_stream( + transport_global, transport_parsing, &stream_global, &stream_parsing)) { + /* update incoming flow control window */ + if (stream_parsing->incoming_window_delta) { + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( + "parsed", transport_parsing, stream_global, incoming_window, + -(gpr_int64)stream_parsing->incoming_window_delta); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( + "parsed", transport_parsing, stream_parsing, incoming_window_delta, + -(gpr_int64)stream_parsing->incoming_window_delta); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( + "parsed", transport_parsing, stream_global, max_recv_bytes, + -(gpr_int64)stream_parsing->incoming_window_delta); + stream_global->incoming_window -= stream_parsing->incoming_window_delta; + GPR_ASSERT(stream_global->max_recv_bytes >= + stream_parsing->incoming_window_delta); + stream_global->max_recv_bytes -= stream_parsing->incoming_window_delta; + stream_parsing->incoming_window_delta = 0; + grpc_chttp2_list_add_writable_stream(transport_global, stream_global); + } + + /* update outgoing flow control window */ + if (stream_parsing->outgoing_window_update) { + int was_zero = stream_global->outgoing_window <= 0; + int is_zero; + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM("parsed", transport_parsing, + stream_global, outgoing_window, + stream_parsing->outgoing_window_update); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( + "parsed", transport_parsing, stream_parsing, outgoing_window_update, + -(gpr_int64)stream_parsing->outgoing_window_update); + GPR_ASSERT(stream_parsing->outgoing_window_update <= GPR_UINT32_MAX); + stream_global->outgoing_window += + (gpr_uint32)stream_parsing->outgoing_window_update; + stream_parsing->outgoing_window_update = 0; + is_zero = stream_global->outgoing_window <= 0; + if (was_zero && !is_zero) { + grpc_chttp2_list_add_writable_stream(transport_global, stream_global); + } + } + + /* updating closed status */ + if (stream_parsing->received_close) { + stream_global->read_closed = 1; + grpc_chttp2_list_add_read_write_state_changed(transport_global, + stream_global); + } + if (stream_parsing->saw_rst_stream) { + stream_global->cancelled = 1; + stream_global->cancelled_status = grpc_chttp2_http2_error_to_grpc_status( + (grpc_chttp2_error_code)stream_parsing->rst_stream_reason); + if (stream_parsing->rst_stream_reason == GRPC_CHTTP2_NO_ERROR) { + stream_global->published_cancelled = 1; + } + grpc_chttp2_list_add_read_write_state_changed(transport_global, + stream_global); + } + + /* publish incoming stream ops */ + if (stream_parsing->data_parser.incoming_sopb.nops > 0) { + grpc_incoming_metadata_buffer_move_to_referencing_sopb( + &stream_parsing->incoming_metadata, &stream_global->incoming_metadata, + &stream_parsing->data_parser.incoming_sopb); + grpc_sopb_move_to(&stream_parsing->data_parser.incoming_sopb, + &stream_global->incoming_sopb); + grpc_chttp2_list_add_read_write_state_changed(transport_global, + stream_global); + } + } } -int -grpc_chttp2_perform_read (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice) -{ - gpr_uint8 *beg = GPR_SLICE_START_PTR (slice); - gpr_uint8 *end = GPR_SLICE_END_PTR (slice); +int grpc_chttp2_perform_read(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport_parsing *transport_parsing, + gpr_slice slice) { + gpr_uint8 *beg = GPR_SLICE_START_PTR(slice); + gpr_uint8 *end = GPR_SLICE_END_PTR(slice); gpr_uint8 *cur = beg; - if (cur == end) - return 1; + if (cur == end) return 1; - switch (transport_parsing->deframe_state) - { + switch (transport_parsing->deframe_state) { case GRPC_DTS_CLIENT_PREFIX_0: case GRPC_DTS_CLIENT_PREFIX_1: case GRPC_DTS_CLIENT_PREFIX_2: @@ -237,294 +269,300 @@ grpc_chttp2_perform_read (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsin case GRPC_DTS_CLIENT_PREFIX_21: case GRPC_DTS_CLIENT_PREFIX_22: case GRPC_DTS_CLIENT_PREFIX_23: - while (cur != end && transport_parsing->deframe_state != GRPC_DTS_FH_0) - { - if (*cur != GRPC_CHTTP2_CLIENT_CONNECT_STRING[transport_parsing->deframe_state]) - { - gpr_log (GPR_INFO, "Connect string mismatch: expected '%c' (%d) got '%c' (%d) " "at byte %d", GRPC_CHTTP2_CLIENT_CONNECT_STRING[transport_parsing->deframe_state], (int) (gpr_uint8) GRPC_CHTTP2_CLIENT_CONNECT_STRING[transport_parsing->deframe_state], *cur, (int) *cur, transport_parsing->deframe_state); - return 0; - } - ++cur; - ++transport_parsing->deframe_state; - } - if (cur == end) - { - return 1; - } - /* fallthrough */ + while (cur != end && transport_parsing->deframe_state != GRPC_DTS_FH_0) { + if (*cur != GRPC_CHTTP2_CLIENT_CONNECT_STRING[transport_parsing + ->deframe_state]) { + gpr_log(GPR_INFO, + "Connect string mismatch: expected '%c' (%d) got '%c' (%d) " + "at byte %d", + GRPC_CHTTP2_CLIENT_CONNECT_STRING[transport_parsing + ->deframe_state], + (int)(gpr_uint8)GRPC_CHTTP2_CLIENT_CONNECT_STRING + [transport_parsing->deframe_state], + *cur, (int)*cur, transport_parsing->deframe_state); + return 0; + } + ++cur; + ++transport_parsing->deframe_state; + } + if (cur == end) { + return 1; + } + /* fallthrough */ dts_fh_0: case GRPC_DTS_FH_0: - GPR_ASSERT (cur < end); - transport_parsing->incoming_frame_size = ((gpr_uint32) * cur) << 16; - if (++cur == end) - { - transport_parsing->deframe_state = GRPC_DTS_FH_1; - return 1; - } - /* fallthrough */ + GPR_ASSERT(cur < end); + transport_parsing->incoming_frame_size = ((gpr_uint32)*cur) << 16; + if (++cur == end) { + transport_parsing->deframe_state = GRPC_DTS_FH_1; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_1: - GPR_ASSERT (cur < end); - transport_parsing->incoming_frame_size |= ((gpr_uint32) * cur) << 8; - if (++cur == end) - { - transport_parsing->deframe_state = GRPC_DTS_FH_2; - return 1; - } - /* fallthrough */ + GPR_ASSERT(cur < end); + transport_parsing->incoming_frame_size |= ((gpr_uint32)*cur) << 8; + if (++cur == end) { + transport_parsing->deframe_state = GRPC_DTS_FH_2; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_2: - GPR_ASSERT (cur < end); + GPR_ASSERT(cur < end); transport_parsing->incoming_frame_size |= *cur; - if (++cur == end) - { - transport_parsing->deframe_state = GRPC_DTS_FH_3; - return 1; - } - /* fallthrough */ + if (++cur == end) { + transport_parsing->deframe_state = GRPC_DTS_FH_3; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_3: - GPR_ASSERT (cur < end); + GPR_ASSERT(cur < end); transport_parsing->incoming_frame_type = *cur; - if (++cur == end) - { - transport_parsing->deframe_state = GRPC_DTS_FH_4; - return 1; - } - /* fallthrough */ + if (++cur == end) { + transport_parsing->deframe_state = GRPC_DTS_FH_4; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_4: - GPR_ASSERT (cur < end); + GPR_ASSERT(cur < end); transport_parsing->incoming_frame_flags = *cur; - if (++cur == end) - { - transport_parsing->deframe_state = GRPC_DTS_FH_5; - return 1; - } - /* fallthrough */ + if (++cur == end) { + transport_parsing->deframe_state = GRPC_DTS_FH_5; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_5: - GPR_ASSERT (cur < end); - transport_parsing->incoming_stream_id = (((gpr_uint32) * cur) & 0x7f) << 24; - if (++cur == end) - { - transport_parsing->deframe_state = GRPC_DTS_FH_6; - return 1; - } - /* fallthrough */ + GPR_ASSERT(cur < end); + transport_parsing->incoming_stream_id = (((gpr_uint32)*cur) & 0x7f) << 24; + if (++cur == end) { + transport_parsing->deframe_state = GRPC_DTS_FH_6; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_6: - GPR_ASSERT (cur < end); - transport_parsing->incoming_stream_id |= ((gpr_uint32) * cur) << 16; - if (++cur == end) - { - transport_parsing->deframe_state = GRPC_DTS_FH_7; - return 1; - } - /* fallthrough */ + GPR_ASSERT(cur < end); + transport_parsing->incoming_stream_id |= ((gpr_uint32)*cur) << 16; + if (++cur == end) { + transport_parsing->deframe_state = GRPC_DTS_FH_7; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_7: - GPR_ASSERT (cur < end); - transport_parsing->incoming_stream_id |= ((gpr_uint32) * cur) << 8; - if (++cur == end) - { - transport_parsing->deframe_state = GRPC_DTS_FH_8; - return 1; - } - /* fallthrough */ + GPR_ASSERT(cur < end); + transport_parsing->incoming_stream_id |= ((gpr_uint32)*cur) << 8; + if (++cur == end) { + transport_parsing->deframe_state = GRPC_DTS_FH_8; + return 1; + } + /* fallthrough */ case GRPC_DTS_FH_8: - GPR_ASSERT (cur < end); - transport_parsing->incoming_stream_id |= ((gpr_uint32) * cur); + GPR_ASSERT(cur < end); + transport_parsing->incoming_stream_id |= ((gpr_uint32)*cur); transport_parsing->deframe_state = GRPC_DTS_FRAME; - if (!init_frame_parser (transport_parsing)) - { - return 0; - } - if (transport_parsing->incoming_stream_id) - { - transport_parsing->last_incoming_stream_id = transport_parsing->incoming_stream_id; - } - if (transport_parsing->incoming_frame_size == 0) - { - if (!parse_frame_slice (exec_ctx, transport_parsing, gpr_empty_slice (), 1)) - { - return 0; - } - transport_parsing->incoming_stream = NULL; - if (++cur == end) - { - transport_parsing->deframe_state = GRPC_DTS_FH_0; - return 1; - } - goto dts_fh_0; /* loop */ - } - if (++cur == end) - { - return 1; - } - /* fallthrough */ + if (!init_frame_parser(transport_parsing)) { + return 0; + } + if (transport_parsing->incoming_stream_id) { + transport_parsing->last_incoming_stream_id = + transport_parsing->incoming_stream_id; + } + if (transport_parsing->incoming_frame_size == 0) { + if (!parse_frame_slice(exec_ctx, transport_parsing, gpr_empty_slice(), + 1)) { + return 0; + } + transport_parsing->incoming_stream = NULL; + if (++cur == end) { + transport_parsing->deframe_state = GRPC_DTS_FH_0; + return 1; + } + goto dts_fh_0; /* loop */ + } + if (++cur == end) { + return 1; + } + /* fallthrough */ case GRPC_DTS_FRAME: - GPR_ASSERT (cur < end); - if ((gpr_uint32) (end - cur) == transport_parsing->incoming_frame_size) - { - if (!parse_frame_slice (exec_ctx, transport_parsing, gpr_slice_sub_no_ref (slice, (size_t) (cur - beg), (size_t) (end - beg)), 1)) - { - return 0; - } - transport_parsing->deframe_state = GRPC_DTS_FH_0; - transport_parsing->incoming_stream = NULL; - return 1; - } - else if ((gpr_uint32) (end - cur) > transport_parsing->incoming_frame_size) - { - size_t cur_offset = (size_t) (cur - beg); - if (!parse_frame_slice (exec_ctx, transport_parsing, gpr_slice_sub_no_ref (slice, cur_offset, cur_offset + transport_parsing->incoming_frame_size), 1)) - { - return 0; - } - cur += transport_parsing->incoming_frame_size; - transport_parsing->incoming_stream = NULL; - goto dts_fh_0; /* loop */ - } - else - { - if (!parse_frame_slice (exec_ctx, transport_parsing, gpr_slice_sub_no_ref (slice, (size_t) (cur - beg), (size_t) (end - beg)), 0)) - { - return 0; - } - transport_parsing->incoming_frame_size -= (gpr_uint32) (end - cur); - return 1; - } - gpr_log (GPR_ERROR, "should never reach here"); - abort (); - } - - gpr_log (GPR_ERROR, "should never reach here"); - abort (); + GPR_ASSERT(cur < end); + if ((gpr_uint32)(end - cur) == transport_parsing->incoming_frame_size) { + if (!parse_frame_slice(exec_ctx, transport_parsing, + gpr_slice_sub_no_ref(slice, (size_t)(cur - beg), + (size_t)(end - beg)), + 1)) { + return 0; + } + transport_parsing->deframe_state = GRPC_DTS_FH_0; + transport_parsing->incoming_stream = NULL; + return 1; + } else if ((gpr_uint32)(end - cur) > + transport_parsing->incoming_frame_size) { + size_t cur_offset = (size_t)(cur - beg); + if (!parse_frame_slice( + exec_ctx, transport_parsing, + gpr_slice_sub_no_ref( + slice, cur_offset, + cur_offset + transport_parsing->incoming_frame_size), + 1)) { + return 0; + } + cur += transport_parsing->incoming_frame_size; + transport_parsing->incoming_stream = NULL; + goto dts_fh_0; /* loop */ + } else { + if (!parse_frame_slice(exec_ctx, transport_parsing, + gpr_slice_sub_no_ref(slice, (size_t)(cur - beg), + (size_t)(end - beg)), + 0)) { + return 0; + } + transport_parsing->incoming_frame_size -= (gpr_uint32)(end - cur); + return 1; + } + gpr_log(GPR_ERROR, "should never reach here"); + abort(); + } + + gpr_log(GPR_ERROR, "should never reach here"); + abort(); return 0; } -static int -init_frame_parser (grpc_chttp2_transport_parsing * transport_parsing) -{ - if (transport_parsing->expect_continuation_stream_id != 0) - { - if (transport_parsing->incoming_frame_type != GRPC_CHTTP2_FRAME_CONTINUATION) - { - gpr_log (GPR_ERROR, "Expected CONTINUATION frame, got frame type %02x", transport_parsing->incoming_frame_type); - return 0; - } - if (transport_parsing->expect_continuation_stream_id != transport_parsing->incoming_stream_id) - { - gpr_log (GPR_ERROR, "Expected CONTINUATION frame for grpc_chttp2_stream %08x, got " "grpc_chttp2_stream %08x", transport_parsing->expect_continuation_stream_id, transport_parsing->incoming_stream_id); - return 0; - } - return init_header_frame_parser (transport_parsing, 1); +static int init_frame_parser(grpc_chttp2_transport_parsing *transport_parsing) { + if (transport_parsing->expect_continuation_stream_id != 0) { + if (transport_parsing->incoming_frame_type != + GRPC_CHTTP2_FRAME_CONTINUATION) { + gpr_log(GPR_ERROR, "Expected CONTINUATION frame, got frame type %02x", + transport_parsing->incoming_frame_type); + return 0; + } + if (transport_parsing->expect_continuation_stream_id != + transport_parsing->incoming_stream_id) { + gpr_log(GPR_ERROR, + "Expected CONTINUATION frame for grpc_chttp2_stream %08x, got " + "grpc_chttp2_stream %08x", + transport_parsing->expect_continuation_stream_id, + transport_parsing->incoming_stream_id); + return 0; } - switch (transport_parsing->incoming_frame_type) - { + return init_header_frame_parser(transport_parsing, 1); + } + switch (transport_parsing->incoming_frame_type) { case GRPC_CHTTP2_FRAME_DATA: - return init_data_frame_parser (transport_parsing); + return init_data_frame_parser(transport_parsing); case GRPC_CHTTP2_FRAME_HEADER: - return init_header_frame_parser (transport_parsing, 0); + return init_header_frame_parser(transport_parsing, 0); case GRPC_CHTTP2_FRAME_CONTINUATION: - gpr_log (GPR_ERROR, "Unexpected CONTINUATION frame"); + gpr_log(GPR_ERROR, "Unexpected CONTINUATION frame"); return 0; case GRPC_CHTTP2_FRAME_RST_STREAM: - return init_rst_stream_parser (transport_parsing); + return init_rst_stream_parser(transport_parsing); case GRPC_CHTTP2_FRAME_SETTINGS: - return init_settings_frame_parser (transport_parsing); + return init_settings_frame_parser(transport_parsing); case GRPC_CHTTP2_FRAME_WINDOW_UPDATE: - return init_window_update_frame_parser (transport_parsing); + return init_window_update_frame_parser(transport_parsing); case GRPC_CHTTP2_FRAME_PING: - return init_ping_parser (transport_parsing); + return init_ping_parser(transport_parsing); case GRPC_CHTTP2_FRAME_GOAWAY: - return init_goaway_parser (transport_parsing); + return init_goaway_parser(transport_parsing); default: - gpr_log (GPR_ERROR, "Unknown frame type %02x", transport_parsing->incoming_frame_type); - return init_skip_frame_parser (transport_parsing, 0); - } + gpr_log(GPR_ERROR, "Unknown frame type %02x", + transport_parsing->incoming_frame_type); + return init_skip_frame_parser(transport_parsing, 0); + } } -static grpc_chttp2_parse_error -skip_parser (grpc_exec_ctx * exec_ctx, void *parser, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing, gpr_slice slice, int is_last) -{ +static grpc_chttp2_parse_error skip_parser( + grpc_exec_ctx *exec_ctx, void *parser, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing, gpr_slice slice, int is_last) { return GRPC_CHTTP2_PARSE_OK; } -static void -skip_header (void *tp, grpc_mdelem * md) -{ - GRPC_MDELEM_UNREF (md); -} - -static int -init_skip_frame_parser (grpc_chttp2_transport_parsing * transport_parsing, int is_header) -{ - if (is_header) - { - gpr_uint8 is_eoh = transport_parsing->expect_continuation_stream_id != 0; - transport_parsing->parser = grpc_chttp2_header_parser_parse; - transport_parsing->parser_data = &transport_parsing->hpack_parser; - transport_parsing->hpack_parser.on_header = skip_header; - transport_parsing->hpack_parser.on_header_user_data = NULL; - transport_parsing->hpack_parser.is_boundary = is_eoh; - transport_parsing->hpack_parser.is_eof = (gpr_uint8) (is_eoh ? transport_parsing->header_eof : 0); - } - else - { - transport_parsing->parser = skip_parser; - } +static void skip_header(void *tp, grpc_mdelem *md) { GRPC_MDELEM_UNREF(md); } + +static int init_skip_frame_parser( + grpc_chttp2_transport_parsing *transport_parsing, int is_header) { + if (is_header) { + gpr_uint8 is_eoh = transport_parsing->expect_continuation_stream_id != 0; + transport_parsing->parser = grpc_chttp2_header_parser_parse; + transport_parsing->parser_data = &transport_parsing->hpack_parser; + transport_parsing->hpack_parser.on_header = skip_header; + transport_parsing->hpack_parser.on_header_user_data = NULL; + transport_parsing->hpack_parser.is_boundary = is_eoh; + transport_parsing->hpack_parser.is_eof = + (gpr_uint8)(is_eoh ? transport_parsing->header_eof : 0); + } else { + transport_parsing->parser = skip_parser; + } return 1; } -void -grpc_chttp2_parsing_become_skip_parser (grpc_chttp2_transport_parsing * transport_parsing) -{ - init_skip_frame_parser (transport_parsing, transport_parsing->parser == grpc_chttp2_header_parser_parse); +void grpc_chttp2_parsing_become_skip_parser( + grpc_chttp2_transport_parsing *transport_parsing) { + init_skip_frame_parser( + transport_parsing, + transport_parsing->parser == grpc_chttp2_header_parser_parse); } -static grpc_chttp2_parse_error -update_incoming_window (grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing) -{ - if (transport_parsing->incoming_frame_size > transport_parsing->incoming_window) - { - gpr_log (GPR_ERROR, "frame of size %d overflows incoming window of %d", transport_parsing->incoming_frame_size, transport_parsing->incoming_window); - return GRPC_CHTTP2_CONNECTION_ERROR; - } - - if (transport_parsing->incoming_frame_size > stream_parsing->incoming_window) - { - gpr_log (GPR_ERROR, "frame of size %d overflows incoming window of %d", transport_parsing->incoming_frame_size, stream_parsing->incoming_window); - return GRPC_CHTTP2_CONNECTION_ERROR; - } - - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("data", transport_parsing, incoming_window, -(gpr_int64) transport_parsing->incoming_frame_size); - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("data", transport_parsing, incoming_window_delta, transport_parsing->incoming_frame_size); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("data", transport_parsing, stream_parsing, incoming_window, -(gpr_int64) transport_parsing->incoming_frame_size); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("data", transport_parsing, stream_parsing, incoming_window_delta, transport_parsing->incoming_frame_size); +static grpc_chttp2_parse_error update_incoming_window( + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing) { + if (transport_parsing->incoming_frame_size > + transport_parsing->incoming_window) { + gpr_log(GPR_ERROR, "frame of size %d overflows incoming window of %d", + transport_parsing->incoming_frame_size, + transport_parsing->incoming_window); + return GRPC_CHTTP2_CONNECTION_ERROR; + } + + if (transport_parsing->incoming_frame_size > + stream_parsing->incoming_window) { + gpr_log(GPR_ERROR, "frame of size %d overflows incoming window of %d", + transport_parsing->incoming_frame_size, + stream_parsing->incoming_window); + return GRPC_CHTTP2_CONNECTION_ERROR; + } + + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT( + "data", transport_parsing, incoming_window, + -(gpr_int64)transport_parsing->incoming_frame_size); + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT("data", transport_parsing, + incoming_window_delta, + transport_parsing->incoming_frame_size); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( + "data", transport_parsing, stream_parsing, incoming_window, + -(gpr_int64)transport_parsing->incoming_frame_size); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM("data", transport_parsing, stream_parsing, + incoming_window_delta, + transport_parsing->incoming_frame_size); transport_parsing->incoming_window -= transport_parsing->incoming_frame_size; - transport_parsing->incoming_window_delta += transport_parsing->incoming_frame_size; + transport_parsing->incoming_window_delta += + transport_parsing->incoming_frame_size; stream_parsing->incoming_window -= transport_parsing->incoming_frame_size; - stream_parsing->incoming_window_delta += transport_parsing->incoming_frame_size; - grpc_chttp2_list_add_parsing_seen_stream (transport_parsing, stream_parsing); + stream_parsing->incoming_window_delta += + transport_parsing->incoming_frame_size; + grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, stream_parsing); return GRPC_CHTTP2_PARSE_OK; } -static int -init_data_frame_parser (grpc_chttp2_transport_parsing * transport_parsing) -{ - grpc_chttp2_stream_parsing *stream_parsing = grpc_chttp2_parsing_lookup_stream (transport_parsing, - transport_parsing->incoming_stream_id); +static int init_data_frame_parser( + grpc_chttp2_transport_parsing *transport_parsing) { + grpc_chttp2_stream_parsing *stream_parsing = + grpc_chttp2_parsing_lookup_stream(transport_parsing, + transport_parsing->incoming_stream_id); grpc_chttp2_parse_error err = GRPC_CHTTP2_PARSE_OK; if (!stream_parsing || stream_parsing->received_close) - return init_skip_frame_parser (transport_parsing, 0); - if (err == GRPC_CHTTP2_PARSE_OK) - { - err = update_incoming_window (transport_parsing, stream_parsing); - } - if (err == GRPC_CHTTP2_PARSE_OK) - { - err = grpc_chttp2_data_parser_begin_frame (&stream_parsing->data_parser, transport_parsing->incoming_frame_flags); - } - switch (err) - { + return init_skip_frame_parser(transport_parsing, 0); + if (err == GRPC_CHTTP2_PARSE_OK) { + err = update_incoming_window(transport_parsing, stream_parsing); + } + if (err == GRPC_CHTTP2_PARSE_OK) { + err = grpc_chttp2_data_parser_begin_frame( + &stream_parsing->data_parser, transport_parsing->incoming_frame_flags); + } + switch (err) { case GRPC_CHTTP2_PARSE_OK: transport_parsing->incoming_stream = stream_parsing; transport_parsing->parser = grpc_chttp2_data_parser_parse; @@ -534,214 +572,215 @@ init_data_frame_parser (grpc_chttp2_transport_parsing * transport_parsing) stream_parsing->received_close = 1; stream_parsing->saw_rst_stream = 1; stream_parsing->rst_stream_reason = GRPC_CHTTP2_PROTOCOL_ERROR; - gpr_slice_buffer_add (&transport_parsing->qbuf, grpc_chttp2_rst_stream_create (transport_parsing->incoming_stream_id, GRPC_CHTTP2_PROTOCOL_ERROR)); - return init_skip_frame_parser (transport_parsing, 0); + gpr_slice_buffer_add( + &transport_parsing->qbuf, + grpc_chttp2_rst_stream_create(transport_parsing->incoming_stream_id, + GRPC_CHTTP2_PROTOCOL_ERROR)); + return init_skip_frame_parser(transport_parsing, 0); case GRPC_CHTTP2_CONNECTION_ERROR: return 0; - } - gpr_log (GPR_ERROR, "should never reach here"); - abort (); + } + gpr_log(GPR_ERROR, "should never reach here"); + abort(); return 0; } -static void -free_timeout (void *p) -{ - gpr_free (p); -} +static void free_timeout(void *p) { gpr_free(p); } -static void -on_header (void *tp, grpc_mdelem * md) -{ +static void on_header(void *tp, grpc_mdelem *md) { grpc_chttp2_transport_parsing *transport_parsing = tp; - grpc_chttp2_stream_parsing *stream_parsing = transport_parsing->incoming_stream; - - GPR_ASSERT (stream_parsing); - - GRPC_CHTTP2_IF_TRACING (gpr_log (GPR_INFO, "HTTP:%d:HDR:%s: %s: %s", stream_parsing->id, transport_parsing->is_client ? "CLI" : "SVR", grpc_mdstr_as_c_string (md->key), grpc_mdstr_as_c_string (md->value))); - - if (md->key == transport_parsing->str_grpc_timeout) - { - gpr_timespec *cached_timeout = grpc_mdelem_get_user_data (md, free_timeout); - if (!cached_timeout) - { - /* not already parsed: parse it now, and store the result away */ - cached_timeout = gpr_malloc (sizeof (gpr_timespec)); - if (!grpc_chttp2_decode_timeout (grpc_mdstr_as_c_string (md->value), cached_timeout)) - { - gpr_log (GPR_ERROR, "Ignoring bad timeout value '%s'", grpc_mdstr_as_c_string (md->value)); - *cached_timeout = gpr_inf_future (GPR_CLOCK_REALTIME); - } - grpc_mdelem_set_user_data (md, free_timeout, cached_timeout); - } - grpc_chttp2_incoming_metadata_buffer_set_deadline (&stream_parsing->incoming_metadata, gpr_time_add (gpr_now (GPR_CLOCK_MONOTONIC), *cached_timeout)); - GRPC_MDELEM_UNREF (md); - } - else - { - grpc_chttp2_incoming_metadata_buffer_add (&stream_parsing->incoming_metadata, md); - } - - grpc_chttp2_list_add_parsing_seen_stream (transport_parsing, stream_parsing); + grpc_chttp2_stream_parsing *stream_parsing = + transport_parsing->incoming_stream; + + GPR_ASSERT(stream_parsing); + + GRPC_CHTTP2_IF_TRACING(gpr_log( + GPR_INFO, "HTTP:%d:HDR:%s: %s: %s", stream_parsing->id, + transport_parsing->is_client ? "CLI" : "SVR", + grpc_mdstr_as_c_string(md->key), grpc_mdstr_as_c_string(md->value))); + + if (md->key == transport_parsing->str_grpc_timeout) { + gpr_timespec *cached_timeout = grpc_mdelem_get_user_data(md, free_timeout); + if (!cached_timeout) { + /* not already parsed: parse it now, and store the result away */ + cached_timeout = gpr_malloc(sizeof(gpr_timespec)); + if (!grpc_chttp2_decode_timeout(grpc_mdstr_as_c_string(md->value), + cached_timeout)) { + gpr_log(GPR_ERROR, "Ignoring bad timeout value '%s'", + grpc_mdstr_as_c_string(md->value)); + *cached_timeout = gpr_inf_future(GPR_CLOCK_REALTIME); + } + grpc_mdelem_set_user_data(md, free_timeout, cached_timeout); + } + grpc_chttp2_incoming_metadata_buffer_set_deadline( + &stream_parsing->incoming_metadata, + gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), *cached_timeout)); + GRPC_MDELEM_UNREF(md); + } else { + grpc_chttp2_incoming_metadata_buffer_add(&stream_parsing->incoming_metadata, + md); + } + + grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, stream_parsing); } -static int -init_header_frame_parser (grpc_chttp2_transport_parsing * transport_parsing, int is_continuation) -{ - gpr_uint8 is_eoh = (transport_parsing->incoming_frame_flags & GRPC_CHTTP2_DATA_FLAG_END_HEADERS) != 0; +static int init_header_frame_parser( + grpc_chttp2_transport_parsing *transport_parsing, int is_continuation) { + gpr_uint8 is_eoh = (transport_parsing->incoming_frame_flags & + GRPC_CHTTP2_DATA_FLAG_END_HEADERS) != 0; int via_accept = 0; grpc_chttp2_stream_parsing *stream_parsing; - if (is_eoh) - { - transport_parsing->expect_continuation_stream_id = 0; - } - else - { - transport_parsing->expect_continuation_stream_id = transport_parsing->incoming_stream_id; - } + if (is_eoh) { + transport_parsing->expect_continuation_stream_id = 0; + } else { + transport_parsing->expect_continuation_stream_id = + transport_parsing->incoming_stream_id; + } - if (!is_continuation) - { - transport_parsing->header_eof = (transport_parsing->incoming_frame_flags & GRPC_CHTTP2_DATA_FLAG_END_STREAM) != 0; - } + if (!is_continuation) { + transport_parsing->header_eof = (transport_parsing->incoming_frame_flags & + GRPC_CHTTP2_DATA_FLAG_END_STREAM) != 0; + } /* could be a new grpc_chttp2_stream or an existing grpc_chttp2_stream */ - stream_parsing = grpc_chttp2_parsing_lookup_stream (transport_parsing, transport_parsing->incoming_stream_id); - if (stream_parsing == NULL) - { - if (is_continuation) - { - gpr_log (GPR_ERROR, "grpc_chttp2_stream disbanded before CONTINUATION received"); - return init_skip_frame_parser (transport_parsing, 1); - } - if (transport_parsing->is_client) - { - if ((transport_parsing->incoming_stream_id & 1) && transport_parsing->incoming_stream_id < transport_parsing->next_stream_id) - { - /* this is an old (probably cancelled) grpc_chttp2_stream */ - } - else - { - gpr_log (GPR_ERROR, "ignoring new grpc_chttp2_stream creation on client"); - } - return init_skip_frame_parser (transport_parsing, 1); - } - else if (transport_parsing->last_incoming_stream_id > transport_parsing->incoming_stream_id) - { - gpr_log (GPR_ERROR, "ignoring out of order new grpc_chttp2_stream request on server; " "last grpc_chttp2_stream " "id=%d, new grpc_chttp2_stream id=%d", transport_parsing->last_incoming_stream_id, transport_parsing->incoming_stream_id); - return init_skip_frame_parser (transport_parsing, 1); - } - else if ((transport_parsing->incoming_stream_id & 1) == 0) - { - gpr_log (GPR_ERROR, "ignoring grpc_chttp2_stream with non-client generated index %d", transport_parsing->incoming_stream_id); - return init_skip_frame_parser (transport_parsing, 1); - } - stream_parsing = transport_parsing->incoming_stream = grpc_chttp2_parsing_accept_stream (transport_parsing, transport_parsing->incoming_stream_id); - if (stream_parsing == NULL) - { - gpr_log (GPR_ERROR, "grpc_chttp2_stream not accepted"); - return init_skip_frame_parser (transport_parsing, 1); - } - via_accept = 1; - } - else - { - transport_parsing->incoming_stream = stream_parsing; - } - GPR_ASSERT (stream_parsing != NULL && (via_accept == 0 || via_accept == 1)); - if (stream_parsing->received_close) - { - gpr_log (GPR_ERROR, "skipping already closed grpc_chttp2_stream header"); - transport_parsing->incoming_stream = NULL; - return init_skip_frame_parser (transport_parsing, 1); - } + stream_parsing = grpc_chttp2_parsing_lookup_stream( + transport_parsing, transport_parsing->incoming_stream_id); + if (stream_parsing == NULL) { + if (is_continuation) { + gpr_log(GPR_ERROR, + "grpc_chttp2_stream disbanded before CONTINUATION received"); + return init_skip_frame_parser(transport_parsing, 1); + } + if (transport_parsing->is_client) { + if ((transport_parsing->incoming_stream_id & 1) && + transport_parsing->incoming_stream_id < + transport_parsing->next_stream_id) { + /* this is an old (probably cancelled) grpc_chttp2_stream */ + } else { + gpr_log(GPR_ERROR, + "ignoring new grpc_chttp2_stream creation on client"); + } + return init_skip_frame_parser(transport_parsing, 1); + } else if (transport_parsing->last_incoming_stream_id > + transport_parsing->incoming_stream_id) { + gpr_log(GPR_ERROR, + "ignoring out of order new grpc_chttp2_stream request on server; " + "last grpc_chttp2_stream " + "id=%d, new grpc_chttp2_stream id=%d", + transport_parsing->last_incoming_stream_id, + transport_parsing->incoming_stream_id); + return init_skip_frame_parser(transport_parsing, 1); + } else if ((transport_parsing->incoming_stream_id & 1) == 0) { + gpr_log(GPR_ERROR, + "ignoring grpc_chttp2_stream with non-client generated index %d", + transport_parsing->incoming_stream_id); + return init_skip_frame_parser(transport_parsing, 1); + } + stream_parsing = transport_parsing->incoming_stream = + grpc_chttp2_parsing_accept_stream( + transport_parsing, transport_parsing->incoming_stream_id); + if (stream_parsing == NULL) { + gpr_log(GPR_ERROR, "grpc_chttp2_stream not accepted"); + return init_skip_frame_parser(transport_parsing, 1); + } + via_accept = 1; + } else { + transport_parsing->incoming_stream = stream_parsing; + } + GPR_ASSERT(stream_parsing != NULL && (via_accept == 0 || via_accept == 1)); + if (stream_parsing->received_close) { + gpr_log(GPR_ERROR, "skipping already closed grpc_chttp2_stream header"); + transport_parsing->incoming_stream = NULL; + return init_skip_frame_parser(transport_parsing, 1); + } transport_parsing->parser = grpc_chttp2_header_parser_parse; transport_parsing->parser_data = &transport_parsing->hpack_parser; transport_parsing->hpack_parser.on_header = on_header; transport_parsing->hpack_parser.on_header_user_data = transport_parsing; transport_parsing->hpack_parser.is_boundary = is_eoh; - transport_parsing->hpack_parser.is_eof = (gpr_uint8) (is_eoh ? transport_parsing->header_eof : 0); - if (!is_continuation && (transport_parsing->incoming_frame_flags & GRPC_CHTTP2_FLAG_HAS_PRIORITY)) - { - grpc_chttp2_hpack_parser_set_has_priority (&transport_parsing->hpack_parser); - } + transport_parsing->hpack_parser.is_eof = + (gpr_uint8)(is_eoh ? transport_parsing->header_eof : 0); + if (!is_continuation && (transport_parsing->incoming_frame_flags & + GRPC_CHTTP2_FLAG_HAS_PRIORITY)) { + grpc_chttp2_hpack_parser_set_has_priority(&transport_parsing->hpack_parser); + } return 1; } -static int -init_window_update_frame_parser (grpc_chttp2_transport_parsing * transport_parsing) -{ - int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_window_update_parser_begin_frame (&transport_parsing->simple.window_update, - transport_parsing->incoming_frame_size, - transport_parsing->incoming_frame_flags); - if (transport_parsing->incoming_stream_id) - { - transport_parsing->incoming_stream = grpc_chttp2_parsing_lookup_stream (transport_parsing, transport_parsing->incoming_stream_id); - } +static int init_window_update_frame_parser( + grpc_chttp2_transport_parsing *transport_parsing) { + int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_window_update_parser_begin_frame( + &transport_parsing->simple.window_update, + transport_parsing->incoming_frame_size, + transport_parsing->incoming_frame_flags); + if (transport_parsing->incoming_stream_id) { + transport_parsing->incoming_stream = grpc_chttp2_parsing_lookup_stream( + transport_parsing, transport_parsing->incoming_stream_id); + } transport_parsing->parser = grpc_chttp2_window_update_parser_parse; transport_parsing->parser_data = &transport_parsing->simple.window_update; return ok; } -static int -init_ping_parser (grpc_chttp2_transport_parsing * transport_parsing) -{ - int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_ping_parser_begin_frame (&transport_parsing->simple.ping, - transport_parsing->incoming_frame_size, - transport_parsing->incoming_frame_flags); +static int init_ping_parser(grpc_chttp2_transport_parsing *transport_parsing) { + int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_ping_parser_begin_frame( + &transport_parsing->simple.ping, + transport_parsing->incoming_frame_size, + transport_parsing->incoming_frame_flags); transport_parsing->parser = grpc_chttp2_ping_parser_parse; transport_parsing->parser_data = &transport_parsing->simple.ping; return ok; } -static int -init_rst_stream_parser (grpc_chttp2_transport_parsing * transport_parsing) -{ - int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_rst_stream_parser_begin_frame (&transport_parsing->simple.rst_stream, - transport_parsing->incoming_frame_size, - transport_parsing->incoming_frame_flags); - transport_parsing->incoming_stream = grpc_chttp2_parsing_lookup_stream (transport_parsing, transport_parsing->incoming_stream_id); - if (!transport_parsing->incoming_stream) - { - return init_skip_frame_parser (transport_parsing, 0); - } +static int init_rst_stream_parser( + grpc_chttp2_transport_parsing *transport_parsing) { + int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_rst_stream_parser_begin_frame( + &transport_parsing->simple.rst_stream, + transport_parsing->incoming_frame_size, + transport_parsing->incoming_frame_flags); + transport_parsing->incoming_stream = grpc_chttp2_parsing_lookup_stream( + transport_parsing, transport_parsing->incoming_stream_id); + if (!transport_parsing->incoming_stream) { + return init_skip_frame_parser(transport_parsing, 0); + } transport_parsing->parser = grpc_chttp2_rst_stream_parser_parse; transport_parsing->parser_data = &transport_parsing->simple.rst_stream; return ok; } -static int -init_goaway_parser (grpc_chttp2_transport_parsing * transport_parsing) -{ - int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_goaway_parser_begin_frame (&transport_parsing->goaway_parser, - transport_parsing->incoming_frame_size, - transport_parsing->incoming_frame_flags); +static int init_goaway_parser( + grpc_chttp2_transport_parsing *transport_parsing) { + int ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_goaway_parser_begin_frame( + &transport_parsing->goaway_parser, + transport_parsing->incoming_frame_size, + transport_parsing->incoming_frame_flags); transport_parsing->parser = grpc_chttp2_goaway_parser_parse; transport_parsing->parser_data = &transport_parsing->goaway_parser; return ok; } -static int -init_settings_frame_parser (grpc_chttp2_transport_parsing * transport_parsing) -{ +static int init_settings_frame_parser( + grpc_chttp2_transport_parsing *transport_parsing) { int ok; - if (transport_parsing->incoming_stream_id != 0) - { - gpr_log (GPR_ERROR, "settings frame received for grpc_chttp2_stream %d", transport_parsing->incoming_stream_id); - return 0; - } - - ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_settings_parser_begin_frame (&transport_parsing->simple.settings, transport_parsing->incoming_frame_size, transport_parsing->incoming_frame_flags, transport_parsing->settings); - if (!ok) - { - return 0; - } - if (transport_parsing->incoming_frame_flags & GRPC_CHTTP2_FLAG_ACK) - { - transport_parsing->settings_ack_received = 1; - } + if (transport_parsing->incoming_stream_id != 0) { + gpr_log(GPR_ERROR, "settings frame received for grpc_chttp2_stream %d", + transport_parsing->incoming_stream_id); + return 0; + } + + ok = GRPC_CHTTP2_PARSE_OK == grpc_chttp2_settings_parser_begin_frame( + &transport_parsing->simple.settings, + transport_parsing->incoming_frame_size, + transport_parsing->incoming_frame_flags, + transport_parsing->settings); + if (!ok) { + return 0; + } + if (transport_parsing->incoming_frame_flags & GRPC_CHTTP2_FLAG_ACK) { + transport_parsing->settings_ack_received = 1; + } transport_parsing->parser = grpc_chttp2_settings_parser_parse; transport_parsing->parser_data = &transport_parsing->simple.settings; return ok; @@ -753,31 +792,35 @@ static int is_window_update_legal(gpr_int64 window_update, gpr_int64 window) { } */ -static int -parse_frame_slice (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_parsing * transport_parsing, gpr_slice slice, int is_last) -{ - grpc_chttp2_stream_parsing *stream_parsing = transport_parsing->incoming_stream; - switch (transport_parsing->parser (exec_ctx, transport_parsing->parser_data, transport_parsing, stream_parsing, slice, is_last)) - { +static int parse_frame_slice(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport_parsing *transport_parsing, + gpr_slice slice, int is_last) { + grpc_chttp2_stream_parsing *stream_parsing = + transport_parsing->incoming_stream; + switch (transport_parsing->parser(exec_ctx, transport_parsing->parser_data, + transport_parsing, stream_parsing, slice, + is_last)) { case GRPC_CHTTP2_PARSE_OK: - if (stream_parsing) - { - grpc_chttp2_list_add_parsing_seen_stream (transport_parsing, stream_parsing); - } + if (stream_parsing) { + grpc_chttp2_list_add_parsing_seen_stream(transport_parsing, + stream_parsing); + } return 1; case GRPC_CHTTP2_STREAM_ERROR: - grpc_chttp2_parsing_become_skip_parser (transport_parsing); - if (stream_parsing) - { - stream_parsing->saw_rst_stream = 1; - stream_parsing->rst_stream_reason = GRPC_CHTTP2_PROTOCOL_ERROR; - gpr_slice_buffer_add (&transport_parsing->qbuf, grpc_chttp2_rst_stream_create (transport_parsing->incoming_stream_id, GRPC_CHTTP2_PROTOCOL_ERROR)); - } + grpc_chttp2_parsing_become_skip_parser(transport_parsing); + if (stream_parsing) { + stream_parsing->saw_rst_stream = 1; + stream_parsing->rst_stream_reason = GRPC_CHTTP2_PROTOCOL_ERROR; + gpr_slice_buffer_add( + &transport_parsing->qbuf, + grpc_chttp2_rst_stream_create(transport_parsing->incoming_stream_id, + GRPC_CHTTP2_PROTOCOL_ERROR)); + } return 1; case GRPC_CHTTP2_CONNECTION_ERROR: return 0; - } - gpr_log (GPR_ERROR, "should never reach here"); - abort (); + } + gpr_log(GPR_ERROR, "should never reach here"); + abort(); return 0; } diff --git a/src/core/transport/chttp2/status_conversion.c b/src/core/transport/chttp2/status_conversion.c index 8be4dc61504..bf214b017a2 100644 --- a/src/core/transport/chttp2/status_conversion.c +++ b/src/core/transport/chttp2/status_conversion.c @@ -33,11 +33,8 @@ #include "src/core/transport/chttp2/status_conversion.h" -int -grpc_chttp2_grpc_status_to_http2_error (grpc_status_code status) -{ - switch (status) - { +int grpc_chttp2_grpc_status_to_http2_error(grpc_status_code status) { + switch (status) { case GRPC_STATUS_OK: return GRPC_CHTTP2_NO_ERROR; case GRPC_STATUS_CANCELLED: @@ -50,14 +47,12 @@ grpc_chttp2_grpc_status_to_http2_error (grpc_status_code status) return GRPC_CHTTP2_REFUSED_STREAM; default: return GRPC_CHTTP2_INTERNAL_ERROR; - } + } } -grpc_status_code -grpc_chttp2_http2_error_to_grpc_status (grpc_chttp2_error_code error) -{ - switch (error) - { +grpc_status_code grpc_chttp2_http2_error_to_grpc_status( + grpc_chttp2_error_code error) { + switch (error) { case GRPC_CHTTP2_NO_ERROR: /* should never be received */ return GRPC_STATUS_INTERNAL; @@ -71,15 +66,12 @@ grpc_chttp2_http2_error_to_grpc_status (grpc_chttp2_error_code error) return GRPC_STATUS_UNAVAILABLE; default: return GRPC_STATUS_INTERNAL; - } + } } -grpc_status_code -grpc_chttp2_http2_status_to_grpc_status (int status) -{ - switch (status) - { - /* these HTTP2 status codes are called out explicitly in status.proto */ +grpc_status_code grpc_chttp2_http2_status_to_grpc_status(int status) { + switch (status) { + /* these HTTP2 status codes are called out explicitly in status.proto */ case 200: return GRPC_STATUS_OK; case 400: @@ -106,14 +98,12 @@ grpc_chttp2_http2_status_to_grpc_status (int status) return GRPC_STATUS_UNAVAILABLE; case 504: return GRPC_STATUS_DEADLINE_EXCEEDED; - /* everything else is unknown */ + /* everything else is unknown */ default: return GRPC_STATUS_UNKNOWN; - } + } } -int -grpc_chttp2_grpc_status_to_http2_status (grpc_status_code status) -{ +int grpc_chttp2_grpc_status_to_http2_status(grpc_status_code status) { return 200; } diff --git a/src/core/transport/chttp2/status_conversion.h b/src/core/transport/chttp2/status_conversion.h index ae5b4960df2..0ec5b560b8e 100644 --- a/src/core/transport/chttp2/status_conversion.h +++ b/src/core/transport/chttp2/status_conversion.h @@ -38,11 +38,13 @@ #include "src/core/transport/chttp2/http2_errors.h" /* Conversion of grpc status codes to http2 error codes (for RST_STREAM) */ -grpc_chttp2_error_code grpc_chttp2_grpc_status_to_http2_error (grpc_status_code status); -grpc_status_code grpc_chttp2_http2_error_to_grpc_status (grpc_chttp2_error_code error); +grpc_chttp2_error_code grpc_chttp2_grpc_status_to_http2_error( + grpc_status_code status); +grpc_status_code grpc_chttp2_http2_error_to_grpc_status( + grpc_chttp2_error_code error); /* Conversion of HTTP status codes (:status) to grpc status codes */ -grpc_status_code grpc_chttp2_http2_status_to_grpc_status (int status); -int grpc_chttp2_grpc_status_to_http2_status (grpc_status_code status); +grpc_status_code grpc_chttp2_http2_status_to_grpc_status(int status); +int grpc_chttp2_grpc_status_to_http2_status(grpc_status_code status); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_STATUS_CONVERSION_H */ diff --git a/src/core/transport/chttp2/stream_encoder.c b/src/core/transport/chttp2/stream_encoder.c index cafd735ba2e..eb02ccdec37 100644 --- a/src/core/transport/chttp2/stream_encoder.c +++ b/src/core/transport/chttp2/stream_encoder.c @@ -55,11 +55,9 @@ #define MAX_DECODER_SPACE_USAGE 512 /* what kind of frame our we encoding? */ -typedef enum -{ HEADER, DATA, NONE } frame_type; +typedef enum { HEADER, DATA, NONE } frame_type; -typedef struct -{ +typedef struct { frame_type cur_frame_type; /* number of bytes in 'output' when we started the frame - used to calculate frame length */ @@ -76,30 +74,28 @@ typedef struct } framer_state; /* fills p (which is expected to be 9 bytes long) with a data frame header */ -static void -fill_header (gpr_uint8 * p, gpr_uint8 type, gpr_uint32 id, size_t len, gpr_uint8 flags) -{ - GPR_ASSERT (len < 16777316); - *p++ = (gpr_uint8) (len >> 16); - *p++ = (gpr_uint8) (len >> 8); - *p++ = (gpr_uint8) (len); +static void fill_header(gpr_uint8 *p, gpr_uint8 type, gpr_uint32 id, size_t len, + gpr_uint8 flags) { + GPR_ASSERT(len < 16777316); + *p++ = (gpr_uint8)(len >> 16); + *p++ = (gpr_uint8)(len >> 8); + *p++ = (gpr_uint8)(len); *p++ = type; *p++ = flags; - *p++ = (gpr_uint8) (id >> 24); - *p++ = (gpr_uint8) (id >> 16); - *p++ = (gpr_uint8) (id >> 8); - *p++ = (gpr_uint8) (id); + *p++ = (gpr_uint8)(id >> 24); + *p++ = (gpr_uint8)(id >> 16); + *p++ = (gpr_uint8)(id >> 8); + *p++ = (gpr_uint8)(id); } /* finish a frame - fill in the previously reserved header */ -static void -finish_frame (framer_state * st, int is_header_boundary, int is_last_in_stream) -{ +static void finish_frame(framer_state *st, int is_header_boundary, + int is_last_in_stream) { gpr_uint8 type = 0xff; - switch (st->cur_frame_type) - { + switch (st->cur_frame_type) { case HEADER: - type = st->last_was_header ? GRPC_CHTTP2_FRAME_CONTINUATION : GRPC_CHTTP2_FRAME_HEADER; + type = st->last_was_header ? GRPC_CHTTP2_FRAME_CONTINUATION + : GRPC_CHTTP2_FRAME_HEADER; st->last_was_header = 1; break; case DATA: @@ -109,435 +105,397 @@ finish_frame (framer_state * st, int is_header_boundary, int is_last_in_stream) break; case NONE: return; - } - fill_header (GPR_SLICE_START_PTR (st->output->slices[st->header_idx]), type, st->stream_id, st->output->length - st->output_length_at_start_of_frame, (gpr_uint8) ((is_last_in_stream ? GRPC_CHTTP2_DATA_FLAG_END_STREAM : 0) | (is_header_boundary ? GRPC_CHTTP2_DATA_FLAG_END_HEADERS : 0))); + } + fill_header( + GPR_SLICE_START_PTR(st->output->slices[st->header_idx]), type, + st->stream_id, st->output->length - st->output_length_at_start_of_frame, + (gpr_uint8)( + (is_last_in_stream ? GRPC_CHTTP2_DATA_FLAG_END_STREAM : 0) | + (is_header_boundary ? GRPC_CHTTP2_DATA_FLAG_END_HEADERS : 0))); st->cur_frame_type = NONE; } /* begin a new frame: reserve off header space, remember how many bytes we'd output before beginning */ -static void -begin_frame (framer_state * st, frame_type type) -{ - GPR_ASSERT (type != NONE); - GPR_ASSERT (st->cur_frame_type == NONE); +static void begin_frame(framer_state *st, frame_type type) { + GPR_ASSERT(type != NONE); + GPR_ASSERT(st->cur_frame_type == NONE); st->cur_frame_type = type; - st->header_idx = gpr_slice_buffer_add_indexed (st->output, gpr_slice_malloc (9)); + st->header_idx = + gpr_slice_buffer_add_indexed(st->output, gpr_slice_malloc(9)); st->output_length_at_start_of_frame = st->output->length; } -static void -begin_new_frame (framer_state * st, frame_type type) -{ - finish_frame (st, 1, 0); +static void begin_new_frame(framer_state *st, frame_type type) { + finish_frame(st, 1, 0); st->last_was_header = 0; - begin_frame (st, type); + begin_frame(st, type); } /* make sure that the current frame is of the type desired, and has sufficient space to add at least about_to_add bytes -- finishes the current frame if needed */ -static void -ensure_frame_type (framer_state * st, frame_type type, size_t need_bytes) -{ - if (st->cur_frame_type == type && st->output->length - st->output_length_at_start_of_frame + need_bytes <= GRPC_CHTTP2_MAX_PAYLOAD_LENGTH) - { - return; - } - finish_frame (st, type != HEADER, 0); - begin_frame (st, type); +static void ensure_frame_type(framer_state *st, frame_type type, + size_t need_bytes) { + if (st->cur_frame_type == type && + st->output->length - st->output_length_at_start_of_frame + need_bytes <= + GRPC_CHTTP2_MAX_PAYLOAD_LENGTH) { + return; + } + finish_frame(st, type != HEADER, 0); + begin_frame(st, type); } /* increment a filter count, halve all counts if one element reaches max */ -static void -inc_filter (gpr_uint8 idx, gpr_uint32 * sum, gpr_uint8 * elems) -{ +static void inc_filter(gpr_uint8 idx, gpr_uint32 *sum, gpr_uint8 *elems) { elems[idx]++; - if (elems[idx] < 255) - { - (*sum)++; - } - else - { - int i; - *sum = 0; - for (i = 0; i < GRPC_CHTTP2_HPACKC_NUM_FILTERS; i++) - { - elems[i] /= 2; - (*sum) += elems[i]; - } - } + if (elems[idx] < 255) { + (*sum)++; + } else { + int i; + *sum = 0; + for (i = 0; i < GRPC_CHTTP2_HPACKC_NUM_FILTERS; i++) { + elems[i] /= 2; + (*sum) += elems[i]; + } + } } -static void -add_header_data (framer_state * st, gpr_slice slice) -{ - size_t len = GPR_SLICE_LENGTH (slice); +static void add_header_data(framer_state *st, gpr_slice slice) { + size_t len = GPR_SLICE_LENGTH(slice); size_t remaining; - if (len == 0) - return; - ensure_frame_type (st, HEADER, 1); - remaining = GRPC_CHTTP2_MAX_PAYLOAD_LENGTH + st->output_length_at_start_of_frame - st->output->length; - if (len <= remaining) - { - gpr_slice_buffer_add (st->output, slice); - } - else - { - gpr_slice_buffer_add (st->output, gpr_slice_split_head (&slice, remaining)); - add_header_data (st, slice); - } + if (len == 0) return; + ensure_frame_type(st, HEADER, 1); + remaining = GRPC_CHTTP2_MAX_PAYLOAD_LENGTH + + st->output_length_at_start_of_frame - st->output->length; + if (len <= remaining) { + gpr_slice_buffer_add(st->output, slice); + } else { + gpr_slice_buffer_add(st->output, gpr_slice_split_head(&slice, remaining)); + add_header_data(st, slice); + } } -static gpr_uint8 * -add_tiny_header_data (framer_state * st, size_t len) -{ - ensure_frame_type (st, HEADER, len); - return gpr_slice_buffer_tiny_add (st->output, len); +static gpr_uint8 *add_tiny_header_data(framer_state *st, size_t len) { + ensure_frame_type(st, HEADER, len); + return gpr_slice_buffer_tiny_add(st->output, len); } /* add an element to the decoder table: returns metadata element to unref */ -static grpc_mdelem * -add_elem (grpc_chttp2_hpack_compressor * c, grpc_mdelem * elem) -{ +static grpc_mdelem *add_elem(grpc_chttp2_hpack_compressor *c, + grpc_mdelem *elem) { gpr_uint32 key_hash = elem->key->hash; - gpr_uint32 elem_hash = GRPC_MDSTR_KV_HASH (key_hash, elem->value->hash); + gpr_uint32 elem_hash = GRPC_MDSTR_KV_HASH(key_hash, elem->value->hash); gpr_uint32 new_index = c->tail_remote_index + c->table_elems + 1; - size_t elem_size = 32 + GPR_SLICE_LENGTH (elem->key->slice) + GPR_SLICE_LENGTH (elem->value->slice); + size_t elem_size = 32 + GPR_SLICE_LENGTH(elem->key->slice) + + GPR_SLICE_LENGTH(elem->value->slice); grpc_mdelem *elem_to_unref; - GPR_ASSERT (elem_size < 65536); + GPR_ASSERT(elem_size < 65536); /* Reserve space for this element in the remote table: if this overflows the current table, drop elements until it fits, matching the decompressor algorithm */ /* TODO(ctiller): constant */ - while (c->table_size + elem_size > 4096) - { - c->tail_remote_index++; - GPR_ASSERT (c->tail_remote_index > 0); - GPR_ASSERT (c->table_size >= c->table_elem_size[c->tail_remote_index % GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS]); - GPR_ASSERT (c->table_elems > 0); - c->table_size = (gpr_uint16) (c->table_size - c->table_elem_size[c->tail_remote_index % GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS]); - c->table_elems--; - } - GPR_ASSERT (c->table_elems < GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS); - c->table_elem_size[new_index % GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS] = (gpr_uint16) elem_size; - c->table_size = (gpr_uint16) (c->table_size + elem_size); + while (c->table_size + elem_size > 4096) { + c->tail_remote_index++; + GPR_ASSERT(c->tail_remote_index > 0); + GPR_ASSERT(c->table_size >= + c->table_elem_size[c->tail_remote_index % + GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS]); + GPR_ASSERT(c->table_elems > 0); + c->table_size = + (gpr_uint16)(c->table_size - + c->table_elem_size[c->tail_remote_index % + GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS]); + c->table_elems--; + } + GPR_ASSERT(c->table_elems < GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS); + c->table_elem_size[new_index % GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS] = + (gpr_uint16)elem_size; + c->table_size = (gpr_uint16)(c->table_size + elem_size); c->table_elems++; /* Store this element into {entries,indices}_elem */ - if (c->entries_elems[HASH_FRAGMENT_2 (elem_hash)] == elem) - { - /* already there: update with new index */ - c->indices_elems[HASH_FRAGMENT_2 (elem_hash)] = new_index; - elem_to_unref = elem; - } - else if (c->entries_elems[HASH_FRAGMENT_3 (elem_hash)] == elem) - { - /* already there (cuckoo): update with new index */ - c->indices_elems[HASH_FRAGMENT_3 (elem_hash)] = new_index; - elem_to_unref = elem; - } - else if (c->entries_elems[HASH_FRAGMENT_2 (elem_hash)] == NULL) - { - /* not there, but a free element: add */ - c->entries_elems[HASH_FRAGMENT_2 (elem_hash)] = elem; - c->indices_elems[HASH_FRAGMENT_2 (elem_hash)] = new_index; - elem_to_unref = NULL; - } - else if (c->entries_elems[HASH_FRAGMENT_3 (elem_hash)] == NULL) - { - /* not there (cuckoo), but a free element: add */ - c->entries_elems[HASH_FRAGMENT_3 (elem_hash)] = elem; - c->indices_elems[HASH_FRAGMENT_3 (elem_hash)] = new_index; - elem_to_unref = NULL; - } - else if (c->indices_elems[HASH_FRAGMENT_2 (elem_hash)] < c->indices_elems[HASH_FRAGMENT_3 (elem_hash)]) - { - /* not there: replace oldest */ - elem_to_unref = c->entries_elems[HASH_FRAGMENT_2 (elem_hash)]; - c->entries_elems[HASH_FRAGMENT_2 (elem_hash)] = elem; - c->indices_elems[HASH_FRAGMENT_2 (elem_hash)] = new_index; - } - else - { - /* not there: replace oldest */ - elem_to_unref = c->entries_elems[HASH_FRAGMENT_3 (elem_hash)]; - c->entries_elems[HASH_FRAGMENT_3 (elem_hash)] = elem; - c->indices_elems[HASH_FRAGMENT_3 (elem_hash)] = new_index; - } + if (c->entries_elems[HASH_FRAGMENT_2(elem_hash)] == elem) { + /* already there: update with new index */ + c->indices_elems[HASH_FRAGMENT_2(elem_hash)] = new_index; + elem_to_unref = elem; + } else if (c->entries_elems[HASH_FRAGMENT_3(elem_hash)] == elem) { + /* already there (cuckoo): update with new index */ + c->indices_elems[HASH_FRAGMENT_3(elem_hash)] = new_index; + elem_to_unref = elem; + } else if (c->entries_elems[HASH_FRAGMENT_2(elem_hash)] == NULL) { + /* not there, but a free element: add */ + c->entries_elems[HASH_FRAGMENT_2(elem_hash)] = elem; + c->indices_elems[HASH_FRAGMENT_2(elem_hash)] = new_index; + elem_to_unref = NULL; + } else if (c->entries_elems[HASH_FRAGMENT_3(elem_hash)] == NULL) { + /* not there (cuckoo), but a free element: add */ + c->entries_elems[HASH_FRAGMENT_3(elem_hash)] = elem; + c->indices_elems[HASH_FRAGMENT_3(elem_hash)] = new_index; + elem_to_unref = NULL; + } else if (c->indices_elems[HASH_FRAGMENT_2(elem_hash)] < + c->indices_elems[HASH_FRAGMENT_3(elem_hash)]) { + /* not there: replace oldest */ + elem_to_unref = c->entries_elems[HASH_FRAGMENT_2(elem_hash)]; + c->entries_elems[HASH_FRAGMENT_2(elem_hash)] = elem; + c->indices_elems[HASH_FRAGMENT_2(elem_hash)] = new_index; + } else { + /* not there: replace oldest */ + elem_to_unref = c->entries_elems[HASH_FRAGMENT_3(elem_hash)]; + c->entries_elems[HASH_FRAGMENT_3(elem_hash)] = elem; + c->indices_elems[HASH_FRAGMENT_3(elem_hash)] = new_index; + } /* do exactly the same for the key (so we can find by that again too) */ - if (c->entries_keys[HASH_FRAGMENT_2 (key_hash)] == elem->key) - { - c->indices_keys[HASH_FRAGMENT_2 (key_hash)] = new_index; - } - else if (c->entries_keys[HASH_FRAGMENT_3 (key_hash)] == elem->key) - { - c->indices_keys[HASH_FRAGMENT_3 (key_hash)] = new_index; - } - else if (c->entries_keys[HASH_FRAGMENT_2 (key_hash)] == NULL) - { - c->entries_keys[HASH_FRAGMENT_2 (key_hash)] = GRPC_MDSTR_REF (elem->key); - c->indices_keys[HASH_FRAGMENT_2 (key_hash)] = new_index; - } - else if (c->entries_keys[HASH_FRAGMENT_3 (key_hash)] == NULL) - { - c->entries_keys[HASH_FRAGMENT_3 (key_hash)] = GRPC_MDSTR_REF (elem->key); - 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_MDSTR_UNREF (c->entries_keys[HASH_FRAGMENT_2 (key_hash)]); - c->entries_keys[HASH_FRAGMENT_2 (key_hash)] = GRPC_MDSTR_REF (elem->key); - c->indices_keys[HASH_FRAGMENT_2 (key_hash)] = new_index; - } - else - { - GRPC_MDSTR_UNREF (c->entries_keys[HASH_FRAGMENT_3 (key_hash)]); - c->entries_keys[HASH_FRAGMENT_3 (key_hash)] = GRPC_MDSTR_REF (elem->key); - c->indices_keys[HASH_FRAGMENT_3 (key_hash)] = new_index; - } + if (c->entries_keys[HASH_FRAGMENT_2(key_hash)] == elem->key) { + c->indices_keys[HASH_FRAGMENT_2(key_hash)] = new_index; + } else if (c->entries_keys[HASH_FRAGMENT_3(key_hash)] == elem->key) { + c->indices_keys[HASH_FRAGMENT_3(key_hash)] = new_index; + } else if (c->entries_keys[HASH_FRAGMENT_2(key_hash)] == NULL) { + c->entries_keys[HASH_FRAGMENT_2(key_hash)] = GRPC_MDSTR_REF(elem->key); + c->indices_keys[HASH_FRAGMENT_2(key_hash)] = new_index; + } else if (c->entries_keys[HASH_FRAGMENT_3(key_hash)] == NULL) { + c->entries_keys[HASH_FRAGMENT_3(key_hash)] = GRPC_MDSTR_REF(elem->key); + 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_MDSTR_UNREF(c->entries_keys[HASH_FRAGMENT_2(key_hash)]); + c->entries_keys[HASH_FRAGMENT_2(key_hash)] = GRPC_MDSTR_REF(elem->key); + c->indices_keys[HASH_FRAGMENT_2(key_hash)] = new_index; + } else { + GRPC_MDSTR_UNREF(c->entries_keys[HASH_FRAGMENT_3(key_hash)]); + c->entries_keys[HASH_FRAGMENT_3(key_hash)] = GRPC_MDSTR_REF(elem->key); + c->indices_keys[HASH_FRAGMENT_3(key_hash)] = new_index; + } return elem_to_unref; } -static void -emit_indexed (grpc_chttp2_hpack_compressor * c, gpr_uint32 index, framer_state * st) -{ - gpr_uint32 len = GRPC_CHTTP2_VARINT_LENGTH (index, 1); - GRPC_CHTTP2_WRITE_VARINT (index, 1, 0x80, add_tiny_header_data (st, len), len); +static void emit_indexed(grpc_chttp2_hpack_compressor *c, gpr_uint32 index, + framer_state *st) { + gpr_uint32 len = GRPC_CHTTP2_VARINT_LENGTH(index, 1); + GRPC_CHTTP2_WRITE_VARINT(index, 1, 0x80, add_tiny_header_data(st, len), len); } -static gpr_slice -get_wire_value (grpc_mdelem * elem, gpr_uint8 * huffman_prefix) -{ - if (grpc_is_binary_header ((const char *) GPR_SLICE_START_PTR (elem->key->slice), GPR_SLICE_LENGTH (elem->key->slice))) - { - *huffman_prefix = 0x80; - return grpc_mdstr_as_base64_encoded_and_huffman_compressed (elem->value); - } +static gpr_slice get_wire_value(grpc_mdelem *elem, gpr_uint8 *huffman_prefix) { + if (grpc_is_binary_header((const char *)GPR_SLICE_START_PTR(elem->key->slice), + GPR_SLICE_LENGTH(elem->key->slice))) { + *huffman_prefix = 0x80; + return grpc_mdstr_as_base64_encoded_and_huffman_compressed(elem->value); + } /* TODO(ctiller): opportunistically compress non-binary headers */ *huffman_prefix = 0x00; return elem->value->slice; } -static void -emit_lithdr_incidx (grpc_chttp2_hpack_compressor * c, gpr_uint32 key_index, grpc_mdelem * elem, framer_state * st) -{ - gpr_uint32 len_pfx = GRPC_CHTTP2_VARINT_LENGTH (key_index, 2); +static void emit_lithdr_incidx(grpc_chttp2_hpack_compressor *c, + gpr_uint32 key_index, grpc_mdelem *elem, + framer_state *st) { + gpr_uint32 len_pfx = GRPC_CHTTP2_VARINT_LENGTH(key_index, 2); gpr_uint8 huffman_prefix; - gpr_slice value_slice = get_wire_value (elem, &huffman_prefix); - size_t len_val = GPR_SLICE_LENGTH (value_slice); + gpr_slice value_slice = get_wire_value(elem, &huffman_prefix); + size_t len_val = GPR_SLICE_LENGTH(value_slice); gpr_uint32 len_val_len; - GPR_ASSERT (len_val <= GPR_UINT32_MAX); - len_val_len = GRPC_CHTTP2_VARINT_LENGTH ((gpr_uint32) len_val, 1); - GRPC_CHTTP2_WRITE_VARINT (key_index, 2, 0x40, add_tiny_header_data (st, len_pfx), len_pfx); - GRPC_CHTTP2_WRITE_VARINT ((gpr_uint32) len_val, 1, 0x00, add_tiny_header_data (st, len_val_len), len_val_len); - add_header_data (st, gpr_slice_ref (value_slice)); + GPR_ASSERT(len_val <= GPR_UINT32_MAX); + len_val_len = GRPC_CHTTP2_VARINT_LENGTH((gpr_uint32)len_val, 1); + GRPC_CHTTP2_WRITE_VARINT(key_index, 2, 0x40, + add_tiny_header_data(st, len_pfx), len_pfx); + GRPC_CHTTP2_WRITE_VARINT((gpr_uint32)len_val, 1, 0x00, + add_tiny_header_data(st, len_val_len), len_val_len); + add_header_data(st, gpr_slice_ref(value_slice)); } -static void -emit_lithdr_noidx (grpc_chttp2_hpack_compressor * c, gpr_uint32 key_index, grpc_mdelem * elem, framer_state * st) -{ - gpr_uint32 len_pfx = GRPC_CHTTP2_VARINT_LENGTH (key_index, 4); +static void emit_lithdr_noidx(grpc_chttp2_hpack_compressor *c, + gpr_uint32 key_index, grpc_mdelem *elem, + framer_state *st) { + gpr_uint32 len_pfx = GRPC_CHTTP2_VARINT_LENGTH(key_index, 4); gpr_uint8 huffman_prefix; - gpr_slice value_slice = get_wire_value (elem, &huffman_prefix); - size_t len_val = GPR_SLICE_LENGTH (value_slice); + gpr_slice value_slice = get_wire_value(elem, &huffman_prefix); + size_t len_val = GPR_SLICE_LENGTH(value_slice); gpr_uint32 len_val_len; - GPR_ASSERT (len_val <= GPR_UINT32_MAX); - len_val_len = GRPC_CHTTP2_VARINT_LENGTH ((gpr_uint32) len_val, 1); - GRPC_CHTTP2_WRITE_VARINT (key_index, 4, 0x00, add_tiny_header_data (st, len_pfx), len_pfx); - GRPC_CHTTP2_WRITE_VARINT ((gpr_uint32) len_val, 1, 0x00, add_tiny_header_data (st, len_val_len), len_val_len); - add_header_data (st, gpr_slice_ref (value_slice)); + GPR_ASSERT(len_val <= GPR_UINT32_MAX); + len_val_len = GRPC_CHTTP2_VARINT_LENGTH((gpr_uint32)len_val, 1); + GRPC_CHTTP2_WRITE_VARINT(key_index, 4, 0x00, + add_tiny_header_data(st, len_pfx), len_pfx); + GRPC_CHTTP2_WRITE_VARINT((gpr_uint32)len_val, 1, 0x00, + add_tiny_header_data(st, len_val_len), len_val_len); + add_header_data(st, gpr_slice_ref(value_slice)); } -static void -emit_lithdr_incidx_v (grpc_chttp2_hpack_compressor * c, grpc_mdelem * elem, framer_state * st) -{ - gpr_uint32 len_key = (gpr_uint32) GPR_SLICE_LENGTH (elem->key->slice); +static void emit_lithdr_incidx_v(grpc_chttp2_hpack_compressor *c, + grpc_mdelem *elem, framer_state *st) { + gpr_uint32 len_key = (gpr_uint32)GPR_SLICE_LENGTH(elem->key->slice); gpr_uint8 huffman_prefix; - gpr_slice value_slice = get_wire_value (elem, &huffman_prefix); - gpr_uint32 len_val = (gpr_uint32) GPR_SLICE_LENGTH (value_slice); - gpr_uint32 len_key_len = GRPC_CHTTP2_VARINT_LENGTH (len_key, 1); - gpr_uint32 len_val_len = GRPC_CHTTP2_VARINT_LENGTH (len_val, 1); - GPR_ASSERT (len_key <= GPR_UINT32_MAX); - GPR_ASSERT (GPR_SLICE_LENGTH (value_slice) <= GPR_UINT32_MAX); - *add_tiny_header_data (st, 1) = 0x40; - GRPC_CHTTP2_WRITE_VARINT (len_key, 1, 0x00, add_tiny_header_data (st, len_key_len), len_key_len); - add_header_data (st, gpr_slice_ref (elem->key->slice)); - GRPC_CHTTP2_WRITE_VARINT (len_val, 1, huffman_prefix, add_tiny_header_data (st, len_val_len), len_val_len); - add_header_data (st, gpr_slice_ref (value_slice)); + gpr_slice value_slice = get_wire_value(elem, &huffman_prefix); + gpr_uint32 len_val = (gpr_uint32)GPR_SLICE_LENGTH(value_slice); + gpr_uint32 len_key_len = GRPC_CHTTP2_VARINT_LENGTH(len_key, 1); + gpr_uint32 len_val_len = GRPC_CHTTP2_VARINT_LENGTH(len_val, 1); + GPR_ASSERT(len_key <= GPR_UINT32_MAX); + GPR_ASSERT(GPR_SLICE_LENGTH(value_slice) <= GPR_UINT32_MAX); + *add_tiny_header_data(st, 1) = 0x40; + GRPC_CHTTP2_WRITE_VARINT(len_key, 1, 0x00, + add_tiny_header_data(st, len_key_len), len_key_len); + add_header_data(st, gpr_slice_ref(elem->key->slice)); + GRPC_CHTTP2_WRITE_VARINT(len_val, 1, huffman_prefix, + add_tiny_header_data(st, len_val_len), len_val_len); + add_header_data(st, gpr_slice_ref(value_slice)); } -static void -emit_lithdr_noidx_v (grpc_chttp2_hpack_compressor * c, grpc_mdelem * elem, framer_state * st) -{ - gpr_uint32 len_key = (gpr_uint32) GPR_SLICE_LENGTH (elem->key->slice); +static void emit_lithdr_noidx_v(grpc_chttp2_hpack_compressor *c, + grpc_mdelem *elem, framer_state *st) { + gpr_uint32 len_key = (gpr_uint32)GPR_SLICE_LENGTH(elem->key->slice); gpr_uint8 huffman_prefix; - gpr_slice value_slice = get_wire_value (elem, &huffman_prefix); - gpr_uint32 len_val = (gpr_uint32) GPR_SLICE_LENGTH (value_slice); - gpr_uint32 len_key_len = GRPC_CHTTP2_VARINT_LENGTH (len_key, 1); - gpr_uint32 len_val_len = GRPC_CHTTP2_VARINT_LENGTH (len_val, 1); - GPR_ASSERT (len_key <= GPR_UINT32_MAX); - GPR_ASSERT (GPR_SLICE_LENGTH (value_slice) <= GPR_UINT32_MAX); - *add_tiny_header_data (st, 1) = 0x00; - GRPC_CHTTP2_WRITE_VARINT (len_key, 1, 0x00, add_tiny_header_data (st, len_key_len), len_key_len); - add_header_data (st, gpr_slice_ref (elem->key->slice)); - GRPC_CHTTP2_WRITE_VARINT (len_val, 1, huffman_prefix, add_tiny_header_data (st, len_val_len), len_val_len); - add_header_data (st, gpr_slice_ref (value_slice)); + gpr_slice value_slice = get_wire_value(elem, &huffman_prefix); + gpr_uint32 len_val = (gpr_uint32)GPR_SLICE_LENGTH(value_slice); + gpr_uint32 len_key_len = GRPC_CHTTP2_VARINT_LENGTH(len_key, 1); + gpr_uint32 len_val_len = GRPC_CHTTP2_VARINT_LENGTH(len_val, 1); + GPR_ASSERT(len_key <= GPR_UINT32_MAX); + GPR_ASSERT(GPR_SLICE_LENGTH(value_slice) <= GPR_UINT32_MAX); + *add_tiny_header_data(st, 1) = 0x00; + GRPC_CHTTP2_WRITE_VARINT(len_key, 1, 0x00, + add_tiny_header_data(st, len_key_len), len_key_len); + add_header_data(st, gpr_slice_ref(elem->key->slice)); + GRPC_CHTTP2_WRITE_VARINT(len_val, 1, huffman_prefix, + add_tiny_header_data(st, len_val_len), len_val_len); + add_header_data(st, gpr_slice_ref(value_slice)); } -static gpr_uint32 -dynidx (grpc_chttp2_hpack_compressor * c, gpr_uint32 index) -{ - return 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY + c->tail_remote_index + c->table_elems - index; +static gpr_uint32 dynidx(grpc_chttp2_hpack_compressor *c, gpr_uint32 index) { + return 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY + c->tail_remote_index + + c->table_elems - index; } /* encode an mdelem; returns metadata element to unref */ -static grpc_mdelem * -hpack_enc (grpc_chttp2_hpack_compressor * c, grpc_mdelem * elem, framer_state * st) -{ +static grpc_mdelem *hpack_enc(grpc_chttp2_hpack_compressor *c, + grpc_mdelem *elem, framer_state *st) { gpr_uint32 key_hash = elem->key->hash; - gpr_uint32 elem_hash = GRPC_MDSTR_KV_HASH (key_hash, elem->value->hash); + gpr_uint32 elem_hash = GRPC_MDSTR_KV_HASH(key_hash, elem->value->hash); size_t decoder_space_usage; gpr_uint32 indices_key; int should_add_elem; - GPR_ASSERT (GPR_SLICE_LENGTH (elem->key->slice) > 0); - if (GPR_SLICE_START_PTR (elem->key->slice)[0] != ':') - { /* regular header */ - st->seen_regular_header = 1; - } - else if (st->seen_regular_header != 0) - { /* reserved header */ - gpr_log (GPR_ERROR, "Reserved header (colon-prefixed) happening after regular ones."); - abort (); - } + GPR_ASSERT(GPR_SLICE_LENGTH(elem->key->slice) > 0); + if (GPR_SLICE_START_PTR(elem->key->slice)[0] != ':') { /* regular header */ + st->seen_regular_header = 1; + } else if (st->seen_regular_header != 0) { /* reserved header */ + gpr_log(GPR_ERROR, + "Reserved header (colon-prefixed) happening after regular ones."); + abort(); + } - inc_filter (HASH_FRAGMENT_1 (elem_hash), &c->filter_elems_sum, c->filter_elems); + inc_filter(HASH_FRAGMENT_1(elem_hash), &c->filter_elems_sum, c->filter_elems); /* is this elem currently in the decoders table? */ - if (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); - return elem; - } - - if (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); - return elem; - } + if (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); + return elem; + } + + if (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); + return elem; + } /* should this elem be in the table? */ - decoder_space_usage = 32 + GPR_SLICE_LENGTH (elem->key->slice) + GPR_SLICE_LENGTH (elem->value->slice); - should_add_elem = decoder_space_usage < MAX_DECODER_SPACE_USAGE && c->filter_elems[HASH_FRAGMENT_1 (elem_hash)] >= c->filter_elems_sum / ONE_ON_ADD_PROBABILITY; + decoder_space_usage = 32 + GPR_SLICE_LENGTH(elem->key->slice) + + GPR_SLICE_LENGTH(elem->value->slice); + should_add_elem = decoder_space_usage < MAX_DECODER_SPACE_USAGE && + c->filter_elems[HASH_FRAGMENT_1(elem_hash)] >= + c->filter_elems_sum / ONE_ON_ADD_PROBABILITY; /* no hits for the elem... maybe there's a key? */ - indices_key = c->indices_keys[HASH_FRAGMENT_2 (key_hash)]; - if (c->entries_keys[HASH_FRAGMENT_2 (key_hash)] == elem->key && indices_key > c->tail_remote_index) - { - /* HIT: key (first cuckoo hash) */ - if (should_add_elem) - { - emit_lithdr_incidx (c, dynidx (c, indices_key), elem, st); - return add_elem (c, elem); - } - else - { - emit_lithdr_noidx (c, dynidx (c, indices_key), elem, st); - return elem; - } - abort (); + indices_key = c->indices_keys[HASH_FRAGMENT_2(key_hash)]; + if (c->entries_keys[HASH_FRAGMENT_2(key_hash)] == elem->key && + indices_key > c->tail_remote_index) { + /* HIT: key (first cuckoo hash) */ + if (should_add_elem) { + emit_lithdr_incidx(c, dynidx(c, indices_key), elem, st); + return add_elem(c, elem); + } else { + emit_lithdr_noidx(c, dynidx(c, indices_key), elem, st); + return elem; } - - indices_key = c->indices_keys[HASH_FRAGMENT_3 (key_hash)]; - if (c->entries_keys[HASH_FRAGMENT_3 (key_hash)] == elem->key && indices_key > c->tail_remote_index) - { - /* HIT: key (first cuckoo hash) */ - if (should_add_elem) - { - emit_lithdr_incidx (c, dynidx (c, indices_key), elem, st); - return add_elem (c, elem); - } - else - { - emit_lithdr_noidx (c, dynidx (c, indices_key), elem, st); - return elem; - } - abort (); + abort(); + } + + indices_key = c->indices_keys[HASH_FRAGMENT_3(key_hash)]; + if (c->entries_keys[HASH_FRAGMENT_3(key_hash)] == elem->key && + indices_key > c->tail_remote_index) { + /* HIT: key (first cuckoo hash) */ + if (should_add_elem) { + emit_lithdr_incidx(c, dynidx(c, indices_key), elem, st); + return add_elem(c, elem); + } else { + emit_lithdr_noidx(c, dynidx(c, indices_key), elem, st); + return elem; } + abort(); + } /* no elem, key in the table... fall back to literal emission */ - if (should_add_elem) - { - emit_lithdr_incidx_v (c, elem, st); - return add_elem (c, elem); - } - else - { - emit_lithdr_noidx_v (c, elem, st); - return elem; - } - abort (); + if (should_add_elem) { + emit_lithdr_incidx_v(c, elem, st); + return add_elem(c, elem); + } else { + emit_lithdr_noidx_v(c, elem, st); + return elem; + } + abort(); } #define STRLEN_LIT(x) (sizeof(x) - 1) #define TIMEOUT_KEY "grpc-timeout" -static void -deadline_enc (grpc_chttp2_hpack_compressor * c, gpr_timespec deadline, framer_state * st) -{ +static void deadline_enc(grpc_chttp2_hpack_compressor *c, gpr_timespec deadline, + framer_state *st) { char timeout_str[GRPC_CHTTP2_TIMEOUT_ENCODE_MIN_BUFSIZE]; grpc_mdelem *mdelem; - grpc_chttp2_encode_timeout (gpr_time_sub (deadline, gpr_now (deadline.clock_type)), timeout_str); - mdelem = grpc_mdelem_from_metadata_strings (c->mdctx, GRPC_MDSTR_REF (c->timeout_key_str), grpc_mdstr_from_string (c->mdctx, timeout_str, 0)); - mdelem = hpack_enc (c, mdelem, st); - if (mdelem) - GRPC_MDELEM_UNREF (mdelem); + grpc_chttp2_encode_timeout( + gpr_time_sub(deadline, gpr_now(deadline.clock_type)), timeout_str); + mdelem = grpc_mdelem_from_metadata_strings( + c->mdctx, GRPC_MDSTR_REF(c->timeout_key_str), + grpc_mdstr_from_string(c->mdctx, timeout_str, 0)); + mdelem = hpack_enc(c, mdelem, st); + if (mdelem) GRPC_MDELEM_UNREF(mdelem); } -gpr_slice -grpc_chttp2_data_frame_create_empty_close (gpr_uint32 id) -{ - gpr_slice slice = gpr_slice_malloc (9); - fill_header (GPR_SLICE_START_PTR (slice), GRPC_CHTTP2_FRAME_DATA, id, 0, 1); +gpr_slice grpc_chttp2_data_frame_create_empty_close(gpr_uint32 id) { + gpr_slice slice = gpr_slice_malloc(9); + fill_header(GPR_SLICE_START_PTR(slice), GRPC_CHTTP2_FRAME_DATA, id, 0, 1); return slice; } -void -grpc_chttp2_hpack_compressor_init (grpc_chttp2_hpack_compressor * c, grpc_mdctx * ctx) -{ - memset (c, 0, sizeof (*c)); +void grpc_chttp2_hpack_compressor_init(grpc_chttp2_hpack_compressor *c, + grpc_mdctx *ctx) { + memset(c, 0, sizeof(*c)); c->mdctx = ctx; - c->timeout_key_str = grpc_mdstr_from_string (ctx, "grpc-timeout", 0); + c->timeout_key_str = grpc_mdstr_from_string(ctx, "grpc-timeout", 0); } -void -grpc_chttp2_hpack_compressor_destroy (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]) - GRPC_MDSTR_UNREF (c->entries_keys[i]); - if (c->entries_elems[i]) - GRPC_MDELEM_UNREF (c->entries_elems[i]); - } - GRPC_MDSTR_UNREF (c->timeout_key_str); + for (i = 0; i < GRPC_CHTTP2_HPACKC_NUM_VALUES; i++) { + if (c->entries_keys[i]) GRPC_MDSTR_UNREF(c->entries_keys[i]); + if (c->entries_elems[i]) GRPC_MDELEM_UNREF(c->entries_elems[i]); + } + GRPC_MDSTR_UNREF(c->timeout_key_str); } -gpr_uint32 -grpc_chttp2_preencode (grpc_stream_op * inops, size_t * inops_count, gpr_uint32 max_flow_controlled_bytes, grpc_stream_op_buffer * outops) -{ +gpr_uint32 grpc_chttp2_preencode(grpc_stream_op *inops, size_t *inops_count, + gpr_uint32 max_flow_controlled_bytes, + grpc_stream_op_buffer *outops) { gpr_slice slice; grpc_stream_op *op; gpr_uint32 max_take_size; @@ -546,85 +504,78 @@ grpc_chttp2_preencode (grpc_stream_op * inops, size_t * inops_count, gpr_uint32 gpr_uint8 *p; gpr_uint8 compressed_flag_set = 0; - while (curop < *inops_count) - { - GPR_ASSERT (flow_controlled_bytes_taken <= max_flow_controlled_bytes); - op = &inops[curop]; - switch (op->type) - { - case GRPC_NO_OP: - /* skip */ - curop++; - break; - case GRPC_OP_METADATA: - grpc_metadata_batch_assert_ok (&op->data.metadata); - /* these just get copied as they don't impact the number of flow - controlled bytes */ - grpc_sopb_append (outops, op, 1); - curop++; - break; - case GRPC_OP_BEGIN_MESSAGE: - /* begin op: for now we just convert the op to a slice and fall - through - this lets us reuse the slice framing code below */ - compressed_flag_set = (op->data.begin_message.flags & GRPC_WRITE_INTERNAL_COMPRESS) != 0; - slice = gpr_slice_malloc (5); - - p = GPR_SLICE_START_PTR (slice); - p[0] = compressed_flag_set; - p[1] = (gpr_uint8) (op->data.begin_message.length >> 24); - p[2] = (gpr_uint8) (op->data.begin_message.length >> 16); - p[3] = (gpr_uint8) (op->data.begin_message.length >> 8); - p[4] = (gpr_uint8) (op->data.begin_message.length); - op->type = GRPC_OP_SLICE; - op->data.slice = slice; - /* fallthrough */ - case GRPC_OP_SLICE: - slice = op->data.slice; - if (!GPR_SLICE_LENGTH (slice)) - { - /* skip zero length slices */ - gpr_slice_unref (slice); - curop++; - break; - } - max_take_size = max_flow_controlled_bytes - flow_controlled_bytes_taken; - if (max_take_size == 0) - { - goto exit_loop; - } - if (GPR_SLICE_LENGTH (slice) > max_take_size) - { - slice = gpr_slice_split_head (&op->data.slice, max_take_size); - grpc_sopb_add_slice (outops, slice); - } - else - { - /* consume this op immediately */ - grpc_sopb_append (outops, op, 1); - curop++; - } - flow_controlled_bytes_taken += (gpr_uint32) GPR_SLICE_LENGTH (slice); - break; - } - } + while (curop < *inops_count) { + GPR_ASSERT(flow_controlled_bytes_taken <= max_flow_controlled_bytes); + op = &inops[curop]; + switch (op->type) { + case GRPC_NO_OP: + /* skip */ + curop++; + break; + case GRPC_OP_METADATA: + grpc_metadata_batch_assert_ok(&op->data.metadata); + /* these just get copied as they don't impact the number of flow + controlled bytes */ + grpc_sopb_append(outops, op, 1); + curop++; + break; + case GRPC_OP_BEGIN_MESSAGE: + /* begin op: for now we just convert the op to a slice and fall + through - this lets us reuse the slice framing code below */ + compressed_flag_set = + (op->data.begin_message.flags & GRPC_WRITE_INTERNAL_COMPRESS) != 0; + slice = gpr_slice_malloc(5); + + p = GPR_SLICE_START_PTR(slice); + p[0] = compressed_flag_set; + p[1] = (gpr_uint8)(op->data.begin_message.length >> 24); + p[2] = (gpr_uint8)(op->data.begin_message.length >> 16); + p[3] = (gpr_uint8)(op->data.begin_message.length >> 8); + p[4] = (gpr_uint8)(op->data.begin_message.length); + op->type = GRPC_OP_SLICE; + op->data.slice = slice; + /* fallthrough */ + case GRPC_OP_SLICE: + slice = op->data.slice; + if (!GPR_SLICE_LENGTH(slice)) { + /* skip zero length slices */ + gpr_slice_unref(slice); + curop++; + break; + } + max_take_size = max_flow_controlled_bytes - flow_controlled_bytes_taken; + if (max_take_size == 0) { + goto exit_loop; + } + if (GPR_SLICE_LENGTH(slice) > max_take_size) { + slice = gpr_slice_split_head(&op->data.slice, max_take_size); + grpc_sopb_add_slice(outops, slice); + } else { + /* consume this op immediately */ + grpc_sopb_append(outops, op, 1); + curop++; + } + flow_controlled_bytes_taken += (gpr_uint32)GPR_SLICE_LENGTH(slice); + break; + } + } exit_loop: *inops_count -= curop; - memmove (inops, inops + curop, *inops_count * sizeof (grpc_stream_op)); - - for (curop = 0; curop < *inops_count; curop++) - { - if (inops[curop].type == GRPC_OP_METADATA) - { - grpc_metadata_batch_assert_ok (&inops[curop].data.metadata); - } + memmove(inops, inops + curop, *inops_count * sizeof(grpc_stream_op)); + + for (curop = 0; curop < *inops_count; curop++) { + if (inops[curop].type == GRPC_OP_METADATA) { + grpc_metadata_batch_assert_ok(&inops[curop].data.metadata); } + } return flow_controlled_bytes_taken; } -void -grpc_chttp2_encode (grpc_stream_op * ops, size_t ops_count, int eof, gpr_uint32 stream_id, grpc_chttp2_hpack_compressor * compressor, gpr_slice_buffer * output) -{ +void grpc_chttp2_encode(grpc_stream_op *ops, size_t ops_count, int eof, + gpr_uint32 stream_id, + grpc_chttp2_hpack_compressor *compressor, + gpr_slice_buffer *output) { framer_state st; gpr_slice slice; grpc_stream_op *op; @@ -636,7 +587,7 @@ grpc_chttp2_encode (grpc_stream_op * ops, size_t ops_count, int eof, gpr_uint32 int need_unref = 0; gpr_timespec deadline; - GPR_ASSERT (stream_id != 0); + GPR_ASSERT(stream_id != 0); st.cur_frame_type = NONE; st.last_was_header = 0; @@ -644,80 +595,70 @@ grpc_chttp2_encode (grpc_stream_op * ops, size_t ops_count, int eof, gpr_uint32 st.stream_id = stream_id; st.output = output; - while (curop < ops_count) - { - op = &ops[curop]; - switch (op->type) - { - case GRPC_NO_OP: - case GRPC_OP_BEGIN_MESSAGE: - gpr_log (GPR_ERROR, "These stream ops should be filtered out by grpc_chttp2_preencode"); - abort (); - case GRPC_OP_METADATA: - /* Encode a metadata batch; store the returned values, representing - a metadata element that needs to be unreffed back into the metadata - slot. THIS MAY NOT BE THE SAME ELEMENT (if a decoder table slot got - updated). After this loop, we'll do a batch unref of elements. */ - begin_new_frame (&st, HEADER); - need_unref |= op->data.metadata.garbage.head != NULL; - grpc_metadata_batch_assert_ok (&op->data.metadata); - for (l = op->data.metadata.list.head; l; l = l->next) - { - l->md = hpack_enc (compressor, l->md, &st); - need_unref |= l->md != NULL; - } - deadline = op->data.metadata.deadline; - if (gpr_time_cmp (deadline, gpr_inf_future (deadline.clock_type)) != 0) - { - deadline_enc (compressor, deadline, &st); - } - curop++; - break; - case GRPC_OP_SLICE: - slice = op->data.slice; - if (st.cur_frame_type == DATA && st.output->length - st.output_length_at_start_of_frame == GRPC_CHTTP2_MAX_PAYLOAD_LENGTH) - { - finish_frame (&st, 0, 0); - } - ensure_frame_type (&st, DATA, 1); - max_take_size = GRPC_CHTTP2_MAX_PAYLOAD_LENGTH + st.output_length_at_start_of_frame - st.output->length; - if (GPR_SLICE_LENGTH (slice) > max_take_size) - { - slice = gpr_slice_split_head (&op->data.slice, max_take_size); - } - else - { - /* consume this op immediately */ - curop++; - } - gpr_slice_buffer_add (output, slice); - break; - } - } - if (eof && st.cur_frame_type == NONE) - { - begin_frame (&st, DATA); - } - finish_frame (&st, 1, eof); - - if (need_unref) - { - grpc_mdctx_lock (mdctx); - for (unref_op = 0; unref_op < curop; unref_op++) - { - op = &ops[unref_op]; - if (op->type != GRPC_OP_METADATA) - continue; - for (l = op->data.metadata.list.head; l; l = l->next) - { - if (l->md) - GRPC_MDCTX_LOCKED_MDELEM_UNREF (mdctx, l->md); - } - for (l = op->data.metadata.garbage.head; l; l = l->next) - { - GRPC_MDCTX_LOCKED_MDELEM_UNREF (mdctx, l->md); - } - } - grpc_mdctx_unlock (mdctx); - } + while (curop < ops_count) { + op = &ops[curop]; + switch (op->type) { + case GRPC_NO_OP: + case GRPC_OP_BEGIN_MESSAGE: + gpr_log( + GPR_ERROR, + "These stream ops should be filtered out by grpc_chttp2_preencode"); + abort(); + case GRPC_OP_METADATA: + /* Encode a metadata batch; store the returned values, representing + a metadata element that needs to be unreffed back into the metadata + slot. THIS MAY NOT BE THE SAME ELEMENT (if a decoder table slot got + updated). After this loop, we'll do a batch unref of elements. */ + begin_new_frame(&st, HEADER); + need_unref |= op->data.metadata.garbage.head != NULL; + grpc_metadata_batch_assert_ok(&op->data.metadata); + for (l = op->data.metadata.list.head; l; l = l->next) { + l->md = hpack_enc(compressor, l->md, &st); + need_unref |= l->md != NULL; + } + deadline = op->data.metadata.deadline; + if (gpr_time_cmp(deadline, gpr_inf_future(deadline.clock_type)) != 0) { + deadline_enc(compressor, deadline, &st); + } + curop++; + break; + case GRPC_OP_SLICE: + slice = op->data.slice; + if (st.cur_frame_type == DATA && + st.output->length - st.output_length_at_start_of_frame == + GRPC_CHTTP2_MAX_PAYLOAD_LENGTH) { + finish_frame(&st, 0, 0); + } + ensure_frame_type(&st, DATA, 1); + max_take_size = GRPC_CHTTP2_MAX_PAYLOAD_LENGTH + + st.output_length_at_start_of_frame - st.output->length; + if (GPR_SLICE_LENGTH(slice) > max_take_size) { + slice = gpr_slice_split_head(&op->data.slice, max_take_size); + } else { + /* consume this op immediately */ + curop++; + } + gpr_slice_buffer_add(output, slice); + break; + } + } + if (eof && st.cur_frame_type == NONE) { + begin_frame(&st, DATA); + } + finish_frame(&st, 1, eof); + + if (need_unref) { + grpc_mdctx_lock(mdctx); + for (unref_op = 0; unref_op < curop; unref_op++) { + op = &ops[unref_op]; + if (op->type != GRPC_OP_METADATA) continue; + for (l = op->data.metadata.list.head; l; l = l->next) { + if (l->md) GRPC_MDCTX_LOCKED_MDELEM_UNREF(mdctx, l->md); + } + for (l = op->data.metadata.garbage.head; l; l = l->next) { + GRPC_MDCTX_LOCKED_MDELEM_UNREF(mdctx, l->md); + } + } + grpc_mdctx_unlock(mdctx); + } } diff --git a/src/core/transport/chttp2/stream_encoder.h b/src/core/transport/chttp2/stream_encoder.h index 32f003d000c..db52f2a0f6c 100644 --- a/src/core/transport/chttp2/stream_encoder.h +++ b/src/core/transport/chttp2/stream_encoder.h @@ -45,8 +45,7 @@ #define GRPC_CHTTP2_HPACKC_NUM_VALUES 256 #define GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS (4096 / 32) -typedef struct -{ +typedef struct { gpr_uint32 filter_elems_sum; /* one before the lowest usable table index */ gpr_uint32 tail_remote_index; @@ -75,14 +74,20 @@ typedef struct gpr_uint16 table_elem_size[GRPC_CHTTP2_HPACKC_MAX_TABLE_ELEMS]; } grpc_chttp2_hpack_compressor; -void grpc_chttp2_hpack_compressor_init (grpc_chttp2_hpack_compressor * c, grpc_mdctx * mdctx); -void grpc_chttp2_hpack_compressor_destroy (grpc_chttp2_hpack_compressor * c); +void grpc_chttp2_hpack_compressor_init(grpc_chttp2_hpack_compressor *c, + grpc_mdctx *mdctx); +void grpc_chttp2_hpack_compressor_destroy(grpc_chttp2_hpack_compressor *c); /* select stream ops to be encoded, moving them from inops to outops, and moving subsequent ops in inops forward in the queue */ -gpr_uint32 grpc_chttp2_preencode (grpc_stream_op * inops, size_t * inops_count, gpr_uint32 max_flow_controlled_bytes, grpc_stream_op_buffer * outops); +gpr_uint32 grpc_chttp2_preencode(grpc_stream_op *inops, size_t *inops_count, + gpr_uint32 max_flow_controlled_bytes, + grpc_stream_op_buffer *outops); /* encode stream ops to output */ -void grpc_chttp2_encode (grpc_stream_op * ops, size_t ops_count, int eof, gpr_uint32 stream_id, grpc_chttp2_hpack_compressor * compressor, gpr_slice_buffer * output); +void grpc_chttp2_encode(grpc_stream_op *ops, size_t ops_count, int eof, + gpr_uint32 stream_id, + grpc_chttp2_hpack_compressor *compressor, + gpr_slice_buffer *output); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_STREAM_ENCODER_H */ diff --git a/src/core/transport/chttp2/stream_lists.c b/src/core/transport/chttp2/stream_lists.c index 43d7b0b39f2..781db7b0d69 100644 --- a/src/core/transport/chttp2/stream_lists.c +++ b/src/core/transport/chttp2/stream_lists.c @@ -58,348 +58,346 @@ /* core list management */ -static int -stream_list_empty (grpc_chttp2_transport * t, grpc_chttp2_stream_list_id id) -{ +static int stream_list_empty(grpc_chttp2_transport *t, + grpc_chttp2_stream_list_id id) { return t->lists[id].head == NULL; } -static int -stream_list_pop (grpc_chttp2_transport * t, grpc_chttp2_stream ** stream, grpc_chttp2_stream_list_id id) -{ +static int stream_list_pop(grpc_chttp2_transport *t, + grpc_chttp2_stream **stream, + grpc_chttp2_stream_list_id id) { grpc_chttp2_stream *s = t->lists[id].head; - if (s) - { - grpc_chttp2_stream *new_head = s->links[id].next; - GPR_ASSERT (s->included[id]); - if (new_head) - { - t->lists[id].head = new_head; - new_head->links[id].prev = NULL; - } - else - { - t->lists[id].head = NULL; - t->lists[id].tail = NULL; - } - s->included[id] = 0; + if (s) { + grpc_chttp2_stream *new_head = s->links[id].next; + GPR_ASSERT(s->included[id]); + if (new_head) { + t->lists[id].head = new_head; + new_head->links[id].prev = NULL; + } else { + t->lists[id].head = NULL; + t->lists[id].tail = NULL; } + s->included[id] = 0; + } *stream = s; return s != 0; } -static void -stream_list_remove (grpc_chttp2_transport * t, grpc_chttp2_stream * s, grpc_chttp2_stream_list_id id) -{ - GPR_ASSERT (s->included[id]); +static void stream_list_remove(grpc_chttp2_transport *t, grpc_chttp2_stream *s, + grpc_chttp2_stream_list_id id) { + GPR_ASSERT(s->included[id]); s->included[id] = 0; - if (s->links[id].prev) - { - s->links[id].prev->links[id].next = s->links[id].next; - } - else - { - GPR_ASSERT (t->lists[id].head == s); - t->lists[id].head = s->links[id].next; - } - if (s->links[id].next) - { - s->links[id].next->links[id].prev = s->links[id].prev; - } - else - { - t->lists[id].tail = s->links[id].prev; - } -} - -static void -stream_list_maybe_remove (grpc_chttp2_transport * t, grpc_chttp2_stream * s, grpc_chttp2_stream_list_id id) -{ - if (s->included[id]) - { - stream_list_remove (t, s, id); - } -} - -static void -stream_list_add_head (grpc_chttp2_transport * t, grpc_chttp2_stream * s, grpc_chttp2_stream_list_id id) -{ + if (s->links[id].prev) { + s->links[id].prev->links[id].next = s->links[id].next; + } else { + GPR_ASSERT(t->lists[id].head == s); + t->lists[id].head = s->links[id].next; + } + if (s->links[id].next) { + s->links[id].next->links[id].prev = s->links[id].prev; + } else { + t->lists[id].tail = s->links[id].prev; + } +} + +static void stream_list_maybe_remove(grpc_chttp2_transport *t, + grpc_chttp2_stream *s, + grpc_chttp2_stream_list_id id) { + if (s->included[id]) { + stream_list_remove(t, s, id); + } +} + +static void stream_list_add_head(grpc_chttp2_transport *t, + grpc_chttp2_stream *s, + grpc_chttp2_stream_list_id id) { grpc_chttp2_stream *old_head; - GPR_ASSERT (!s->included[id]); + GPR_ASSERT(!s->included[id]); old_head = t->lists[id].head; s->links[id].next = old_head; s->links[id].prev = NULL; - if (old_head) - { - old_head->links[id].prev = s; - } - else - { - t->lists[id].tail = s; - } + if (old_head) { + old_head->links[id].prev = s; + } else { + t->lists[id].tail = s; + } t->lists[id].head = s; s->included[id] = 1; } -static void -stream_list_add_tail (grpc_chttp2_transport * t, grpc_chttp2_stream * s, grpc_chttp2_stream_list_id id) -{ +static void stream_list_add_tail(grpc_chttp2_transport *t, + grpc_chttp2_stream *s, + grpc_chttp2_stream_list_id id) { grpc_chttp2_stream *old_tail; - GPR_ASSERT (!s->included[id]); + GPR_ASSERT(!s->included[id]); old_tail = t->lists[id].tail; s->links[id].next = NULL; s->links[id].prev = old_tail; - if (old_tail) - { - old_tail->links[id].next = s; - } - else - { - t->lists[id].head = s; - } + if (old_tail) { + old_tail->links[id].next = s; + } else { + t->lists[id].head = s; + } t->lists[id].tail = s; s->included[id] = 1; } -static void -stream_list_add (grpc_chttp2_transport * t, grpc_chttp2_stream * s, grpc_chttp2_stream_list_id id) -{ - if (s->included[id]) - { - return; - } - stream_list_add_tail (t, s, id); +static void stream_list_add(grpc_chttp2_transport *t, grpc_chttp2_stream *s, + grpc_chttp2_stream_list_id id) { + if (s->included[id]) { + return; + } + stream_list_add_tail(t, s, id); } /* wrappers for specializations */ -void -grpc_chttp2_list_add_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) -{ - GPR_ASSERT (stream_global->id != 0); - stream_list_add (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_WRITABLE); +void grpc_chttp2_list_add_writable_stream( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global) { + GPR_ASSERT(stream_global->id != 0); + stream_list_add(TRANSPORT_FROM_GLOBAL(transport_global), + STREAM_FROM_GLOBAL(stream_global), GRPC_CHTTP2_LIST_WRITABLE); } -void -grpc_chttp2_list_add_first_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) -{ - GPR_ASSERT (stream_global->id != 0); - stream_list_add_head (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_WRITABLE); +void grpc_chttp2_list_add_first_writable_stream( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global) { + GPR_ASSERT(stream_global->id != 0); + stream_list_add_head(TRANSPORT_FROM_GLOBAL(transport_global), + STREAM_FROM_GLOBAL(stream_global), + GRPC_CHTTP2_LIST_WRITABLE); } -int -grpc_chttp2_list_pop_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_writing ** stream_writing) -{ +int grpc_chttp2_list_pop_writable_stream( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_transport_writing *transport_writing, + grpc_chttp2_stream_global **stream_global, + grpc_chttp2_stream_writing **stream_writing) { grpc_chttp2_stream *stream; - int r = stream_list_pop (TRANSPORT_FROM_GLOBAL (transport_global), &stream, - GRPC_CHTTP2_LIST_WRITABLE); - if (r != 0) - { - *stream_global = &stream->global; - *stream_writing = &stream->writing; - } + int r = stream_list_pop(TRANSPORT_FROM_GLOBAL(transport_global), &stream, + GRPC_CHTTP2_LIST_WRITABLE); + if (r != 0) { + *stream_global = &stream->global; + *stream_writing = &stream->writing; + } return r; } -void -grpc_chttp2_list_remove_writable_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) -{ - stream_list_maybe_remove (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_WRITABLE); +void grpc_chttp2_list_remove_writable_stream( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global) { + stream_list_maybe_remove(TRANSPORT_FROM_GLOBAL(transport_global), + STREAM_FROM_GLOBAL(stream_global), + GRPC_CHTTP2_LIST_WRITABLE); } -void -grpc_chttp2_list_add_writing_stream (grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_writing * stream_writing) -{ - stream_list_add (TRANSPORT_FROM_WRITING (transport_writing), STREAM_FROM_WRITING (stream_writing), GRPC_CHTTP2_LIST_WRITING); +void grpc_chttp2_list_add_writing_stream( + grpc_chttp2_transport_writing *transport_writing, + grpc_chttp2_stream_writing *stream_writing) { + stream_list_add(TRANSPORT_FROM_WRITING(transport_writing), + STREAM_FROM_WRITING(stream_writing), + GRPC_CHTTP2_LIST_WRITING); } -int -grpc_chttp2_list_have_writing_streams (grpc_chttp2_transport_writing * transport_writing) -{ - return !stream_list_empty (TRANSPORT_FROM_WRITING (transport_writing), GRPC_CHTTP2_LIST_WRITING); +int grpc_chttp2_list_have_writing_streams( + grpc_chttp2_transport_writing *transport_writing) { + return !stream_list_empty(TRANSPORT_FROM_WRITING(transport_writing), + GRPC_CHTTP2_LIST_WRITING); } -int -grpc_chttp2_list_pop_writing_stream (grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_writing ** stream_writing) -{ +int grpc_chttp2_list_pop_writing_stream( + grpc_chttp2_transport_writing *transport_writing, + grpc_chttp2_stream_writing **stream_writing) { grpc_chttp2_stream *stream; - int r = stream_list_pop (TRANSPORT_FROM_WRITING (transport_writing), &stream, - GRPC_CHTTP2_LIST_WRITING); - if (r != 0) - { - *stream_writing = &stream->writing; - } + int r = stream_list_pop(TRANSPORT_FROM_WRITING(transport_writing), &stream, + GRPC_CHTTP2_LIST_WRITING); + if (r != 0) { + *stream_writing = &stream->writing; + } return r; } -void -grpc_chttp2_list_add_written_stream (grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_writing * stream_writing) -{ - stream_list_add (TRANSPORT_FROM_WRITING (transport_writing), STREAM_FROM_WRITING (stream_writing), GRPC_CHTTP2_LIST_WRITTEN); +void grpc_chttp2_list_add_written_stream( + grpc_chttp2_transport_writing *transport_writing, + grpc_chttp2_stream_writing *stream_writing) { + stream_list_add(TRANSPORT_FROM_WRITING(transport_writing), + STREAM_FROM_WRITING(stream_writing), + GRPC_CHTTP2_LIST_WRITTEN); } -int -grpc_chttp2_list_pop_written_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_writing * transport_writing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_writing ** stream_writing) -{ +int grpc_chttp2_list_pop_written_stream( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_transport_writing *transport_writing, + grpc_chttp2_stream_global **stream_global, + grpc_chttp2_stream_writing **stream_writing) { grpc_chttp2_stream *stream; - int r = stream_list_pop (TRANSPORT_FROM_WRITING (transport_writing), &stream, - GRPC_CHTTP2_LIST_WRITTEN); - if (r != 0) - { - *stream_global = &stream->global; - *stream_writing = &stream->writing; - } + int r = stream_list_pop(TRANSPORT_FROM_WRITING(transport_writing), &stream, + GRPC_CHTTP2_LIST_WRITTEN); + if (r != 0) { + *stream_global = &stream->global; + *stream_writing = &stream->writing; + } return r; } -void -grpc_chttp2_list_add_parsing_seen_stream (grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_parsing * stream_parsing) -{ - stream_list_add (TRANSPORT_FROM_PARSING (transport_parsing), STREAM_FROM_PARSING (stream_parsing), GRPC_CHTTP2_LIST_PARSING_SEEN); +void grpc_chttp2_list_add_parsing_seen_stream( + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_parsing *stream_parsing) { + stream_list_add(TRANSPORT_FROM_PARSING(transport_parsing), + STREAM_FROM_PARSING(stream_parsing), + GRPC_CHTTP2_LIST_PARSING_SEEN); } -int -grpc_chttp2_list_pop_parsing_seen_stream (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_parsing ** stream_parsing) -{ +int grpc_chttp2_list_pop_parsing_seen_stream( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_global **stream_global, + grpc_chttp2_stream_parsing **stream_parsing) { grpc_chttp2_stream *stream; - int r = stream_list_pop (TRANSPORT_FROM_PARSING (transport_parsing), &stream, - GRPC_CHTTP2_LIST_PARSING_SEEN); - if (r != 0) - { - *stream_global = &stream->global; - *stream_parsing = &stream->parsing; - } + int r = stream_list_pop(TRANSPORT_FROM_PARSING(transport_parsing), &stream, + GRPC_CHTTP2_LIST_PARSING_SEEN); + if (r != 0) { + *stream_global = &stream->global; + *stream_parsing = &stream->parsing; + } return r; } -void -grpc_chttp2_list_add_waiting_for_concurrency (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) -{ - stream_list_add (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_WAITING_FOR_CONCURRENCY); +void grpc_chttp2_list_add_waiting_for_concurrency( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global) { + stream_list_add(TRANSPORT_FROM_GLOBAL(transport_global), + STREAM_FROM_GLOBAL(stream_global), + GRPC_CHTTP2_LIST_WAITING_FOR_CONCURRENCY); } -int -grpc_chttp2_list_pop_waiting_for_concurrency (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global) -{ +int grpc_chttp2_list_pop_waiting_for_concurrency( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global **stream_global) { grpc_chttp2_stream *stream; - int r = stream_list_pop (TRANSPORT_FROM_GLOBAL (transport_global), &stream, - GRPC_CHTTP2_LIST_WAITING_FOR_CONCURRENCY); - if (r != 0) - { - *stream_global = &stream->global; - } + int r = stream_list_pop(TRANSPORT_FROM_GLOBAL(transport_global), &stream, + GRPC_CHTTP2_LIST_WAITING_FOR_CONCURRENCY); + if (r != 0) { + *stream_global = &stream->global; + } return r; } -void -grpc_chttp2_list_add_closed_waiting_for_parsing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) -{ - stream_list_add (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_CLOSED_WAITING_FOR_PARSING); +void grpc_chttp2_list_add_closed_waiting_for_parsing( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global) { + stream_list_add(TRANSPORT_FROM_GLOBAL(transport_global), + STREAM_FROM_GLOBAL(stream_global), + GRPC_CHTTP2_LIST_CLOSED_WAITING_FOR_PARSING); } -int -grpc_chttp2_list_pop_closed_waiting_for_parsing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global) -{ +int grpc_chttp2_list_pop_closed_waiting_for_parsing( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global **stream_global) { grpc_chttp2_stream *stream; - int r = stream_list_pop (TRANSPORT_FROM_GLOBAL (transport_global), &stream, - GRPC_CHTTP2_LIST_CLOSED_WAITING_FOR_PARSING); - if (r != 0) - { - *stream_global = &stream->global; - } + int r = stream_list_pop(TRANSPORT_FROM_GLOBAL(transport_global), &stream, + GRPC_CHTTP2_LIST_CLOSED_WAITING_FOR_PARSING); + if (r != 0) { + *stream_global = &stream->global; + } return r; } -void -grpc_chttp2_list_add_cancelled_waiting_for_writing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) -{ - stream_list_add (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_CANCELLED_WAITING_FOR_WRITING); +void grpc_chttp2_list_add_cancelled_waiting_for_writing( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global) { + stream_list_add(TRANSPORT_FROM_GLOBAL(transport_global), + STREAM_FROM_GLOBAL(stream_global), + GRPC_CHTTP2_LIST_CANCELLED_WAITING_FOR_WRITING); } -int -grpc_chttp2_list_pop_cancelled_waiting_for_writing (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global) -{ +int grpc_chttp2_list_pop_cancelled_waiting_for_writing( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global **stream_global) { grpc_chttp2_stream *stream; - int r = stream_list_pop (TRANSPORT_FROM_GLOBAL (transport_global), &stream, - GRPC_CHTTP2_LIST_CANCELLED_WAITING_FOR_WRITING); - if (r != 0) - { - *stream_global = &stream->global; - } + int r = stream_list_pop(TRANSPORT_FROM_GLOBAL(transport_global), &stream, + GRPC_CHTTP2_LIST_CANCELLED_WAITING_FOR_WRITING); + if (r != 0) { + *stream_global = &stream->global; + } return r; } -void -grpc_chttp2_list_add_incoming_window_updated (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) -{ - stream_list_add (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_INCOMING_WINDOW_UPDATED); +void grpc_chttp2_list_add_incoming_window_updated( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global) { + stream_list_add(TRANSPORT_FROM_GLOBAL(transport_global), + STREAM_FROM_GLOBAL(stream_global), + GRPC_CHTTP2_LIST_INCOMING_WINDOW_UPDATED); } -int -grpc_chttp2_list_pop_incoming_window_updated (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_parsing * transport_parsing, grpc_chttp2_stream_global ** stream_global, grpc_chttp2_stream_parsing ** stream_parsing) -{ +int grpc_chttp2_list_pop_incoming_window_updated( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_transport_parsing *transport_parsing, + grpc_chttp2_stream_global **stream_global, + grpc_chttp2_stream_parsing **stream_parsing) { grpc_chttp2_stream *stream; - int r = stream_list_pop (TRANSPORT_FROM_GLOBAL (transport_global), &stream, - GRPC_CHTTP2_LIST_INCOMING_WINDOW_UPDATED); - if (r != 0) - { - *stream_global = &stream->global; - *stream_parsing = &stream->parsing; - } + int r = stream_list_pop(TRANSPORT_FROM_GLOBAL(transport_global), &stream, + GRPC_CHTTP2_LIST_INCOMING_WINDOW_UPDATED); + if (r != 0) { + *stream_global = &stream->global; + *stream_parsing = &stream->parsing; + } return r; } -void -grpc_chttp2_list_remove_incoming_window_updated (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) -{ - stream_list_maybe_remove (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_INCOMING_WINDOW_UPDATED); +void grpc_chttp2_list_remove_incoming_window_updated( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global) { + stream_list_maybe_remove(TRANSPORT_FROM_GLOBAL(transport_global), + STREAM_FROM_GLOBAL(stream_global), + GRPC_CHTTP2_LIST_INCOMING_WINDOW_UPDATED); } -void -grpc_chttp2_list_add_read_write_state_changed (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global) -{ - stream_list_add (TRANSPORT_FROM_GLOBAL (transport_global), STREAM_FROM_GLOBAL (stream_global), GRPC_CHTTP2_LIST_READ_WRITE_STATE_CHANGED); +void grpc_chttp2_list_add_read_write_state_changed( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global) { + stream_list_add(TRANSPORT_FROM_GLOBAL(transport_global), + STREAM_FROM_GLOBAL(stream_global), + GRPC_CHTTP2_LIST_READ_WRITE_STATE_CHANGED); } -int -grpc_chttp2_list_pop_read_write_state_changed (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global ** stream_global) -{ +int grpc_chttp2_list_pop_read_write_state_changed( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global **stream_global) { grpc_chttp2_stream *stream; - int r = stream_list_pop (TRANSPORT_FROM_GLOBAL (transport_global), &stream, - GRPC_CHTTP2_LIST_READ_WRITE_STATE_CHANGED); - if (r != 0) - { - *stream_global = &stream->global; - } + int r = stream_list_pop(TRANSPORT_FROM_GLOBAL(transport_global), &stream, + GRPC_CHTTP2_LIST_READ_WRITE_STATE_CHANGED); + if (r != 0) { + *stream_global = &stream->global; + } return r; } -void -grpc_chttp2_register_stream (grpc_chttp2_transport * t, grpc_chttp2_stream * s) -{ - stream_list_add_tail (t, s, GRPC_CHTTP2_LIST_ALL_STREAMS); +void grpc_chttp2_register_stream(grpc_chttp2_transport *t, + grpc_chttp2_stream *s) { + stream_list_add_tail(t, s, GRPC_CHTTP2_LIST_ALL_STREAMS); } -int -grpc_chttp2_unregister_stream (grpc_chttp2_transport * t, grpc_chttp2_stream * s) -{ - stream_list_maybe_remove (t, s, GRPC_CHTTP2_LIST_ALL_STREAMS); - return stream_list_empty (t, GRPC_CHTTP2_LIST_ALL_STREAMS); +int grpc_chttp2_unregister_stream(grpc_chttp2_transport *t, + grpc_chttp2_stream *s) { + stream_list_maybe_remove(t, s, GRPC_CHTTP2_LIST_ALL_STREAMS); + return stream_list_empty(t, GRPC_CHTTP2_LIST_ALL_STREAMS); } -int -grpc_chttp2_has_streams (grpc_chttp2_transport * t) -{ - return !stream_list_empty (t, GRPC_CHTTP2_LIST_ALL_STREAMS); +int grpc_chttp2_has_streams(grpc_chttp2_transport *t) { + return !stream_list_empty(t, GRPC_CHTTP2_LIST_ALL_STREAMS); } -void -grpc_chttp2_for_all_streams (grpc_chttp2_transport_global * transport_global, void *user_data, void (*cb) (grpc_chttp2_transport_global * transport_global, void *user_data, grpc_chttp2_stream_global * stream_global)) -{ +void grpc_chttp2_for_all_streams( + grpc_chttp2_transport_global *transport_global, void *user_data, + void (*cb)(grpc_chttp2_transport_global *transport_global, void *user_data, + grpc_chttp2_stream_global *stream_global)) { grpc_chttp2_stream *s; - grpc_chttp2_transport *t = TRANSPORT_FROM_GLOBAL (transport_global); - for (s = t->lists[GRPC_CHTTP2_LIST_ALL_STREAMS].head; s != NULL; s = s->links[GRPC_CHTTP2_LIST_ALL_STREAMS].next) - { - cb (transport_global, user_data, &s->global); - } + grpc_chttp2_transport *t = TRANSPORT_FROM_GLOBAL(transport_global); + for (s = t->lists[GRPC_CHTTP2_LIST_ALL_STREAMS].head; s != NULL; + s = s->links[GRPC_CHTTP2_LIST_ALL_STREAMS].next) { + cb(transport_global, user_data, &s->global); + } } diff --git a/src/core/transport/chttp2/stream_map.c b/src/core/transport/chttp2/stream_map.c index 00878c1d2a3..c983105abb1 100644 --- a/src/core/transport/chttp2/stream_map.c +++ b/src/core/transport/chttp2/stream_map.c @@ -39,117 +39,98 @@ #include #include -void -grpc_chttp2_stream_map_init (grpc_chttp2_stream_map * map, size_t initial_capacity) -{ - GPR_ASSERT (initial_capacity > 1); - map->keys = gpr_malloc (sizeof (gpr_uint32) * initial_capacity); - map->values = gpr_malloc (sizeof (void *) * initial_capacity); +void grpc_chttp2_stream_map_init(grpc_chttp2_stream_map *map, + size_t initial_capacity) { + GPR_ASSERT(initial_capacity > 1); + map->keys = gpr_malloc(sizeof(gpr_uint32) * initial_capacity); + map->values = gpr_malloc(sizeof(void *) * initial_capacity); map->count = 0; map->free = 0; map->capacity = initial_capacity; } -void -grpc_chttp2_stream_map_destroy (grpc_chttp2_stream_map * map) -{ - gpr_free (map->keys); - gpr_free (map->values); +void grpc_chttp2_stream_map_destroy(grpc_chttp2_stream_map *map) { + gpr_free(map->keys); + gpr_free(map->values); } -static size_t -compact (gpr_uint32 * keys, void **values, size_t count) -{ +static size_t compact(gpr_uint32 *keys, void **values, size_t count) { size_t i, out; - for (i = 0, out = 0; i < count; i++) - { - if (values[i]) - { - keys[out] = keys[i]; - values[out] = values[i]; - out++; - } + for (i = 0, out = 0; i < count; i++) { + if (values[i]) { + keys[out] = keys[i]; + values[out] = values[i]; + out++; } + } return out; } -void -grpc_chttp2_stream_map_add (grpc_chttp2_stream_map * map, gpr_uint32 key, void *value) -{ +void grpc_chttp2_stream_map_add(grpc_chttp2_stream_map *map, gpr_uint32 key, + void *value) { size_t count = map->count; size_t capacity = map->capacity; gpr_uint32 *keys = map->keys; void **values = map->values; - GPR_ASSERT (count == 0 || keys[count - 1] < key); - GPR_ASSERT (value); - - if (count == capacity) - { - if (map->free > capacity / 4) - { - count = compact (keys, values, count); - map->free = 0; - } - else - { - /* resize when less than 25% of the table is free, because compaction - won't help much */ - map->capacity = capacity = 3 * capacity / 2; - map->keys = keys = gpr_realloc (keys, capacity * sizeof (gpr_uint32)); - map->values = values = gpr_realloc (values, capacity * sizeof (void *)); - } + GPR_ASSERT(count == 0 || keys[count - 1] < key); + GPR_ASSERT(value); + + if (count == capacity) { + if (map->free > capacity / 4) { + count = compact(keys, values, count); + map->free = 0; + } else { + /* resize when less than 25% of the table is free, because compaction + won't help much */ + map->capacity = capacity = 3 * capacity / 2; + map->keys = keys = gpr_realloc(keys, capacity * sizeof(gpr_uint32)); + map->values = values = gpr_realloc(values, capacity * sizeof(void *)); } + } keys[count] = key; values[count] = value; map->count = count + 1; } -void -grpc_chttp2_stream_map_move_into (grpc_chttp2_stream_map * src, grpc_chttp2_stream_map * dst) -{ +void grpc_chttp2_stream_map_move_into(grpc_chttp2_stream_map *src, + grpc_chttp2_stream_map *dst) { /* if src is empty we dont need to do anything */ - if (src->count == src->free) - { - return; - } + if (src->count == src->free) { + return; + } /* if dst is empty we simply need to swap */ - if (dst->count == dst->free) - { - GPR_SWAP (grpc_chttp2_stream_map, *src, *dst); - return; - } + if (dst->count == dst->free) { + GPR_SWAP(grpc_chttp2_stream_map, *src, *dst); + return; + } /* the first element of src must be greater than the last of dst... * however the maps may need compacting for this property to hold */ - if (src->keys[0] <= dst->keys[dst->count - 1]) - { - src->count = compact (src->keys, src->values, src->count); - src->free = 0; - dst->count = compact (dst->keys, dst->values, dst->count); - dst->free = 0; - } - GPR_ASSERT (src->keys[0] > dst->keys[dst->count - 1]); + if (src->keys[0] <= dst->keys[dst->count - 1]) { + src->count = compact(src->keys, src->values, src->count); + src->free = 0; + dst->count = compact(dst->keys, dst->values, dst->count); + dst->free = 0; + } + GPR_ASSERT(src->keys[0] > dst->keys[dst->count - 1]); /* if dst doesn't have capacity, resize */ - if (dst->count + src->count > dst->capacity) - { - dst->capacity = GPR_MAX (dst->capacity * 3 / 2, dst->count + src->count); - dst->keys = gpr_realloc (dst->keys, dst->capacity * sizeof (gpr_uint32)); - dst->values = gpr_realloc (dst->values, dst->capacity * sizeof (void *)); - } - memcpy (dst->keys + dst->count, src->keys, src->count * sizeof (gpr_uint32)); - memcpy (dst->values + dst->count, src->values, src->count * sizeof (void *)); + if (dst->count + src->count > dst->capacity) { + dst->capacity = GPR_MAX(dst->capacity * 3 / 2, dst->count + src->count); + dst->keys = gpr_realloc(dst->keys, dst->capacity * sizeof(gpr_uint32)); + dst->values = gpr_realloc(dst->values, dst->capacity * sizeof(void *)); + } + memcpy(dst->keys + dst->count, src->keys, src->count * sizeof(gpr_uint32)); + memcpy(dst->values + dst->count, src->values, src->count * sizeof(void *)); dst->count += src->count; dst->free += src->free; src->count = 0; src->free = 0; } -static void ** -find (grpc_chttp2_stream_map * map, gpr_uint32 key) -{ +static void **find(grpc_chttp2_stream_map *map, gpr_uint32 key) { size_t min_idx = 0; size_t max_idx = map->count; size_t mid_idx; @@ -157,75 +138,61 @@ find (grpc_chttp2_stream_map * map, gpr_uint32 key) void **values = map->values; gpr_uint32 mid_key; - if (max_idx == 0) - return NULL; + if (max_idx == 0) return NULL; - while (min_idx < max_idx) + while (min_idx < max_idx) { + /* find the midpoint, avoiding overflow */ + mid_idx = min_idx + ((max_idx - min_idx) / 2); + mid_key = keys[mid_idx]; + + if (mid_key < key) { + min_idx = mid_idx + 1; + } else if (mid_key > key) { + max_idx = mid_idx; + } else /* mid_key == key */ { - /* find the midpoint, avoiding overflow */ - mid_idx = min_idx + ((max_idx - min_idx) / 2); - mid_key = keys[mid_idx]; - - if (mid_key < key) - { - min_idx = mid_idx + 1; - } - else if (mid_key > key) - { - max_idx = mid_idx; - } - else /* mid_key == key */ - { - return &values[mid_idx]; - } + return &values[mid_idx]; } + } return NULL; } -void * -grpc_chttp2_stream_map_delete (grpc_chttp2_stream_map * map, gpr_uint32 key) -{ - void **pvalue = find (map, key); +void *grpc_chttp2_stream_map_delete(grpc_chttp2_stream_map *map, + gpr_uint32 key) { + void **pvalue = find(map, key); void *out = NULL; - if (pvalue != NULL) - { - out = *pvalue; - *pvalue = NULL; - map->free += (out != NULL); - /* recognize complete emptyness and ensure we can skip - * defragmentation later */ - if (map->free == map->count) - { - map->free = map->count = 0; - } + if (pvalue != NULL) { + out = *pvalue; + *pvalue = NULL; + map->free += (out != NULL); + /* recognize complete emptyness and ensure we can skip + * defragmentation later */ + if (map->free == map->count) { + map->free = map->count = 0; } + } return out; } -void * -grpc_chttp2_stream_map_find (grpc_chttp2_stream_map * map, gpr_uint32 key) -{ - void **pvalue = find (map, key); +void *grpc_chttp2_stream_map_find(grpc_chttp2_stream_map *map, gpr_uint32 key) { + void **pvalue = find(map, key); return pvalue != NULL ? *pvalue : NULL; } -size_t -grpc_chttp2_stream_map_size (grpc_chttp2_stream_map * map) -{ +size_t grpc_chttp2_stream_map_size(grpc_chttp2_stream_map *map) { return map->count - map->free; } -void -grpc_chttp2_stream_map_for_each (grpc_chttp2_stream_map * map, void (*f) (void *user_data, gpr_uint32 key, void *value), void *user_data) -{ +void grpc_chttp2_stream_map_for_each(grpc_chttp2_stream_map *map, + void (*f)(void *user_data, gpr_uint32 key, + void *value), + void *user_data) { size_t i; - for (i = 0; i < map->count; i++) - { - if (map->values[i]) - { - f (user_data, map->keys[i], map->values[i]); - } + for (i = 0; i < map->count; i++) { + if (map->values[i]) { + f(user_data, map->keys[i], map->values[i]); } + } } diff --git a/src/core/transport/chttp2/stream_map.h b/src/core/transport/chttp2/stream_map.h index 2af61212da1..71b05820541 100644 --- a/src/core/transport/chttp2/stream_map.h +++ b/src/core/transport/chttp2/stream_map.h @@ -44,8 +44,7 @@ Lookups are performed with binary search. Adds are restricted to strictly higher keys than previously seen (this is guaranteed by http2). */ -typedef struct -{ +typedef struct { gpr_uint32 *keys; void **values; size_t count; @@ -53,27 +52,34 @@ typedef struct size_t capacity; } grpc_chttp2_stream_map; -void grpc_chttp2_stream_map_init (grpc_chttp2_stream_map * map, size_t initial_capacity); -void grpc_chttp2_stream_map_destroy (grpc_chttp2_stream_map * map); +void grpc_chttp2_stream_map_init(grpc_chttp2_stream_map *map, + size_t initial_capacity); +void grpc_chttp2_stream_map_destroy(grpc_chttp2_stream_map *map); /* Add a new key: given http2 semantics, new keys must always be greater than existing keys - this is asserted */ -void grpc_chttp2_stream_map_add (grpc_chttp2_stream_map * map, gpr_uint32 key, void *value); +void grpc_chttp2_stream_map_add(grpc_chttp2_stream_map *map, gpr_uint32 key, + void *value); /* Delete an existing key - returns the previous value of the key if it existed, or NULL otherwise */ -void *grpc_chttp2_stream_map_delete (grpc_chttp2_stream_map * map, gpr_uint32 key); +void *grpc_chttp2_stream_map_delete(grpc_chttp2_stream_map *map, + gpr_uint32 key); /* Move all elements of src into dst */ -void grpc_chttp2_stream_map_move_into (grpc_chttp2_stream_map * src, grpc_chttp2_stream_map * dst); +void grpc_chttp2_stream_map_move_into(grpc_chttp2_stream_map *src, + grpc_chttp2_stream_map *dst); /* Return an existing key, or NULL if it does not exist */ -void *grpc_chttp2_stream_map_find (grpc_chttp2_stream_map * map, gpr_uint32 key); +void *grpc_chttp2_stream_map_find(grpc_chttp2_stream_map *map, gpr_uint32 key); /* How many (populated) entries are in the stream map? */ -size_t grpc_chttp2_stream_map_size (grpc_chttp2_stream_map * map); +size_t grpc_chttp2_stream_map_size(grpc_chttp2_stream_map *map); /* Callback on each stream */ -void grpc_chttp2_stream_map_for_each (grpc_chttp2_stream_map * map, void (*f) (void *user_data, gpr_uint32 key, void *value), void *user_data); +void grpc_chttp2_stream_map_for_each(grpc_chttp2_stream_map *map, + void (*f)(void *user_data, gpr_uint32 key, + void *value), + void *user_data); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_STREAM_MAP_H */ diff --git a/src/core/transport/chttp2/timeout_encoding.c b/src/core/transport/chttp2/timeout_encoding.c index e2412424033..8a9b290ecb9 100644 --- a/src/core/transport/chttp2/timeout_encoding.c +++ b/src/core/transport/chttp2/timeout_encoding.c @@ -38,215 +38,147 @@ #include "src/core/support/string.h" -static int -round_up (int x, int divisor) -{ +static int round_up(int x, int divisor) { return (x / divisor + (x % divisor != 0)) * divisor; } /* round an integer up to the next value with three significant figures */ -static int -round_up_to_three_sig_figs (int x) -{ - if (x < 1000) - return x; - if (x < 10000) - return round_up (x, 10); - if (x < 100000) - return round_up (x, 100); - if (x < 1000000) - return round_up (x, 1000); - if (x < 10000000) - return round_up (x, 10000); - if (x < 100000000) - return round_up (x, 100000); - if (x < 1000000000) - return round_up (x, 1000000); - return round_up (x, 10000000); +static int round_up_to_three_sig_figs(int x) { + if (x < 1000) return x; + if (x < 10000) return round_up(x, 10); + if (x < 100000) return round_up(x, 100); + if (x < 1000000) return round_up(x, 1000); + if (x < 10000000) return round_up(x, 10000); + if (x < 100000000) return round_up(x, 100000); + if (x < 1000000000) return round_up(x, 1000000); + return round_up(x, 10000000); } /* encode our minimum viable timeout value */ -static void -enc_tiny (char *buffer) -{ - memcpy (buffer, "1n", 3); -} +static void enc_tiny(char *buffer) { memcpy(buffer, "1n", 3); } -static void -enc_ext (char *buffer, long value, char ext) -{ - int n = gpr_ltoa (value, buffer); +static void enc_ext(char *buffer, long value, char ext) { + int n = gpr_ltoa(value, buffer); buffer[n] = ext; buffer[n + 1] = 0; } -static void -enc_seconds (char *buffer, long sec) -{ - if (sec % 3600 == 0) - { - enc_ext (buffer, sec / 3600, 'H'); - } - else if (sec % 60 == 0) - { - enc_ext (buffer, sec / 60, 'M'); - } - else - { - enc_ext (buffer, sec, 'S'); - } +static void enc_seconds(char *buffer, long sec) { + if (sec % 3600 == 0) { + enc_ext(buffer, sec / 3600, 'H'); + } else if (sec % 60 == 0) { + enc_ext(buffer, sec / 60, 'M'); + } else { + enc_ext(buffer, sec, 'S'); + } } -static void -enc_nanos (char *buffer, int x) -{ - x = round_up_to_three_sig_figs (x); - if (x < 100000) - { - if (x % 1000 == 0) - { - enc_ext (buffer, x / 1000, 'u'); - } - else - { - enc_ext (buffer, x, 'n'); - } - } - else if (x < 100000000) - { - if (x % 1000000 == 0) - { - enc_ext (buffer, x / 1000000, 'm'); - } - else - { - enc_ext (buffer, x / 1000, 'u'); - } - } - else if (x < 1000000000) - { - enc_ext (buffer, x / 1000000, 'm'); - } - else - { - /* note that this is only ever called with times of less than one second, - so if we reach here the time must have been rounded up to a whole second - (and no more) */ - memcpy (buffer, "1S", 3); - } +static void enc_nanos(char *buffer, int x) { + x = round_up_to_three_sig_figs(x); + if (x < 100000) { + if (x % 1000 == 0) { + enc_ext(buffer, x / 1000, 'u'); + } else { + enc_ext(buffer, x, 'n'); + } + } else if (x < 100000000) { + if (x % 1000000 == 0) { + enc_ext(buffer, x / 1000000, 'm'); + } else { + enc_ext(buffer, x / 1000, 'u'); + } + } else if (x < 1000000000) { + enc_ext(buffer, x / 1000000, 'm'); + } else { + /* note that this is only ever called with times of less than one second, + so if we reach here the time must have been rounded up to a whole second + (and no more) */ + memcpy(buffer, "1S", 3); + } } -static void -enc_micros (char *buffer, int x) -{ - x = round_up_to_three_sig_figs (x); - if (x < 100000) - { - if (x % 1000 == 0) - { - enc_ext (buffer, x / 1000, 'm'); - } - else - { - enc_ext (buffer, x, 'u'); - } - } - else if (x < 100000000) - { - if (x % 1000000 == 0) - { - enc_ext (buffer, x / 1000000, 'S'); - } - else - { - enc_ext (buffer, x / 1000, 'm'); - } - } - else - { - enc_ext (buffer, x / 1000000, 'S'); - } +static void enc_micros(char *buffer, int x) { + x = round_up_to_three_sig_figs(x); + if (x < 100000) { + if (x % 1000 == 0) { + enc_ext(buffer, x / 1000, 'm'); + } else { + enc_ext(buffer, x, 'u'); + } + } else if (x < 100000000) { + if (x % 1000000 == 0) { + enc_ext(buffer, x / 1000000, 'S'); + } else { + enc_ext(buffer, x / 1000, 'm'); + } + } else { + enc_ext(buffer, x / 1000000, 'S'); + } } -void -grpc_chttp2_encode_timeout (gpr_timespec timeout, char *buffer) -{ - if (timeout.tv_sec < 0) - { - enc_tiny (buffer); - } - else if (timeout.tv_sec == 0) - { - enc_nanos (buffer, timeout.tv_nsec); - } - else if (timeout.tv_sec < 1000 && timeout.tv_nsec != 0) - { - enc_micros (buffer, (int) (timeout.tv_sec * 1000000) + (timeout.tv_nsec / 1000 + (timeout.tv_nsec % 1000 != 0))); - } - else - { - enc_seconds (buffer, timeout.tv_sec + (timeout.tv_nsec != 0)); - } +void grpc_chttp2_encode_timeout(gpr_timespec timeout, char *buffer) { + if (timeout.tv_sec < 0) { + enc_tiny(buffer); + } else if (timeout.tv_sec == 0) { + enc_nanos(buffer, timeout.tv_nsec); + } else if (timeout.tv_sec < 1000 && timeout.tv_nsec != 0) { + enc_micros(buffer, + (int)(timeout.tv_sec * 1000000) + + (timeout.tv_nsec / 1000 + (timeout.tv_nsec % 1000 != 0))); + } else { + enc_seconds(buffer, timeout.tv_sec + (timeout.tv_nsec != 0)); + } } -static int -is_all_whitespace (const char *p) -{ - while (*p == ' ') - p++; +static int is_all_whitespace(const char *p) { + while (*p == ' ') p++; return *p == 0; } -int -grpc_chttp2_decode_timeout (const char *buffer, gpr_timespec * timeout) -{ +int grpc_chttp2_decode_timeout(const char *buffer, gpr_timespec *timeout) { gpr_uint32 x = 0; - const gpr_uint8 *p = (const gpr_uint8 *) buffer; + const gpr_uint8 *p = (const gpr_uint8 *)buffer; int have_digit = 0; /* skip whitespace */ for (; *p == ' '; p++) ; /* decode numeric part */ - for (; *p >= '0' && *p <= '9'; p++) - { - gpr_uint32 xp = x * 10u + (gpr_uint32) * p - (gpr_uint32) '0'; - have_digit = 1; - if (xp < x) - { - *timeout = gpr_inf_future (GPR_CLOCK_REALTIME); - return 1; - } - x = xp; - } - if (!have_digit) - return 0; + for (; *p >= '0' && *p <= '9'; p++) { + gpr_uint32 xp = x * 10u + (gpr_uint32)*p - (gpr_uint32)'0'; + have_digit = 1; + if (xp < x) { + *timeout = gpr_inf_future(GPR_CLOCK_REALTIME); + return 1; + } + x = xp; + } + if (!have_digit) return 0; /* skip whitespace */ for (; *p == ' '; p++) ; /* decode unit specifier */ - switch (*p) - { + switch (*p) { case 'n': - *timeout = gpr_time_from_nanos (x, GPR_TIMESPAN); + *timeout = gpr_time_from_nanos(x, GPR_TIMESPAN); break; case 'u': - *timeout = gpr_time_from_micros (x, GPR_TIMESPAN); + *timeout = gpr_time_from_micros(x, GPR_TIMESPAN); break; case 'm': - *timeout = gpr_time_from_millis (x, GPR_TIMESPAN); + *timeout = gpr_time_from_millis(x, GPR_TIMESPAN); break; case 'S': - *timeout = gpr_time_from_seconds (x, GPR_TIMESPAN); + *timeout = gpr_time_from_seconds(x, GPR_TIMESPAN); break; case 'M': - *timeout = gpr_time_from_minutes (x, GPR_TIMESPAN); + *timeout = gpr_time_from_minutes(x, GPR_TIMESPAN); break; case 'H': - *timeout = gpr_time_from_hours (x, GPR_TIMESPAN); + *timeout = gpr_time_from_hours(x, GPR_TIMESPAN); break; default: return 0; - } + } p++; - return is_all_whitespace ((const char *) p); + return is_all_whitespace((const char *)p); } diff --git a/src/core/transport/chttp2/timeout_encoding.h b/src/core/transport/chttp2/timeout_encoding.h index b68ce2e5d6f..9d8756e799d 100644 --- a/src/core/transport/chttp2/timeout_encoding.h +++ b/src/core/transport/chttp2/timeout_encoding.h @@ -41,7 +41,7 @@ /* Encode/decode timeouts to the GRPC over HTTP2 format; encoding may round up arbitrarily */ -void grpc_chttp2_encode_timeout (gpr_timespec timeout, char *buffer); -int grpc_chttp2_decode_timeout (const char *buffer, gpr_timespec * timeout); +void grpc_chttp2_encode_timeout(gpr_timespec timeout, char *buffer); +int grpc_chttp2_decode_timeout(const char *buffer, gpr_timespec *timeout); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_TIMEOUT_ENCODING_H */ diff --git a/src/core/transport/chttp2/varint.c b/src/core/transport/chttp2/varint.c index f478a9d847d..056f68047b3 100644 --- a/src/core/transport/chttp2/varint.c +++ b/src/core/transport/chttp2/varint.c @@ -33,46 +33,34 @@ #include "src/core/transport/chttp2/varint.h" -gpr_uint32 -grpc_chttp2_hpack_varint_length (gpr_uint32 tail_value) -{ - if (tail_value < (1 << 7)) - { - return 2; - } - else if (tail_value < (1 << 14)) - { - return 3; - } - else if (tail_value < (1 << 21)) - { - return 4; - } - else if (tail_value < (1 << 28)) - { - return 5; - } - else - { - return 6; - } +gpr_uint32 grpc_chttp2_hpack_varint_length(gpr_uint32 tail_value) { + if (tail_value < (1 << 7)) { + return 2; + } else if (tail_value < (1 << 14)) { + return 3; + } else if (tail_value < (1 << 21)) { + return 4; + } else if (tail_value < (1 << 28)) { + return 5; + } else { + return 6; + } } -void -grpc_chttp2_hpack_write_varint_tail (gpr_uint32 tail_value, gpr_uint8 * target, gpr_uint32 tail_length) -{ - switch (tail_length) - { +void grpc_chttp2_hpack_write_varint_tail(gpr_uint32 tail_value, + gpr_uint8* target, + gpr_uint32 tail_length) { + switch (tail_length) { case 5: - target[4] = (gpr_uint8) ((tail_value >> 28) | 0x80); + target[4] = (gpr_uint8)((tail_value >> 28) | 0x80); case 4: - target[3] = (gpr_uint8) ((tail_value >> 21) | 0x80); + target[3] = (gpr_uint8)((tail_value >> 21) | 0x80); case 3: - target[2] = (gpr_uint8) ((tail_value >> 14) | 0x80); + target[2] = (gpr_uint8)((tail_value >> 14) | 0x80); case 2: - target[1] = (gpr_uint8) ((tail_value >> 7) | 0x80); + target[1] = (gpr_uint8)((tail_value >> 7) | 0x80); case 1: - target[0] = (gpr_uint8) ((tail_value) | 0x80); - } + target[0] = (gpr_uint8)((tail_value) | 0x80); + } target[tail_length - 1] &= 0x7f; } diff --git a/src/core/transport/chttp2/varint.h b/src/core/transport/chttp2/varint.h index 4193305d0f7..4dfcc76773e 100644 --- a/src/core/transport/chttp2/varint.h +++ b/src/core/transport/chttp2/varint.h @@ -41,9 +41,11 @@ /* length of a value that needs varint tail encoding (it's bigger than can be bitpacked into the opcode byte) - returned value includes the length of the opcode byte */ -gpr_uint32 grpc_chttp2_hpack_varint_length (gpr_uint32 tail_value); +gpr_uint32 grpc_chttp2_hpack_varint_length(gpr_uint32 tail_value); -void grpc_chttp2_hpack_write_varint_tail (gpr_uint32 tail_value, gpr_uint8 * target, gpr_uint32 tail_length); +void grpc_chttp2_hpack_write_varint_tail(gpr_uint32 tail_value, + gpr_uint8* target, + gpr_uint32 tail_length); /* maximum value that can be bitpacked with the opcode if the opcode has a prefix diff --git a/src/core/transport/chttp2/writing.c b/src/core/transport/chttp2/writing.c index ebc170fb431..d1c9da6df09 100644 --- a/src/core/transport/chttp2/writing.c +++ b/src/core/transport/chttp2/writing.c @@ -39,174 +39,203 @@ #include "src/core/transport/chttp2/http2_errors.h" -static void finalize_outbuf (grpc_chttp2_transport_writing * transport_writing); +static void finalize_outbuf(grpc_chttp2_transport_writing *transport_writing); -int -grpc_chttp2_unlocking_check_writes (grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_writing * transport_writing) -{ +int grpc_chttp2_unlocking_check_writes( + grpc_chttp2_transport_global *transport_global, + grpc_chttp2_transport_writing *transport_writing) { grpc_chttp2_stream_global *stream_global; grpc_chttp2_stream_writing *stream_writing; grpc_chttp2_stream_global *first_reinserted_stream = NULL; gpr_uint32 window_delta; /* simple writes are queued to qbuf, and flushed here */ - gpr_slice_buffer_swap (&transport_global->qbuf, &transport_writing->outbuf); - GPR_ASSERT (transport_global->qbuf.count == 0); - - if (transport_global->dirtied_local_settings && !transport_global->sent_local_settings) - { - gpr_slice_buffer_add (&transport_writing->outbuf, grpc_chttp2_settings_create (transport_global->settings[GRPC_SENT_SETTINGS], transport_global->settings[GRPC_LOCAL_SETTINGS], transport_global->force_send_settings, GRPC_CHTTP2_NUM_SETTINGS)); - transport_global->force_send_settings = 0; - transport_global->dirtied_local_settings = 0; - transport_global->sent_local_settings = 1; - } + gpr_slice_buffer_swap(&transport_global->qbuf, &transport_writing->outbuf); + GPR_ASSERT(transport_global->qbuf.count == 0); + + if (transport_global->dirtied_local_settings && + !transport_global->sent_local_settings) { + gpr_slice_buffer_add( + &transport_writing->outbuf, + grpc_chttp2_settings_create( + transport_global->settings[GRPC_SENT_SETTINGS], + transport_global->settings[GRPC_LOCAL_SETTINGS], + transport_global->force_send_settings, GRPC_CHTTP2_NUM_SETTINGS)); + transport_global->force_send_settings = 0; + transport_global->dirtied_local_settings = 0; + transport_global->sent_local_settings = 1; + } /* for each grpc_chttp2_stream that's become writable, frame it's data (according to available window sizes) and add to the output buffer */ - while (grpc_chttp2_list_pop_writable_stream (transport_global, transport_writing, &stream_global, &stream_writing)) - { - if (stream_global == first_reinserted_stream) - { - /* prevent infinite loop */ - grpc_chttp2_list_add_first_writable_stream (transport_global, stream_global); - break; - } - - stream_writing->id = stream_global->id; - stream_writing->send_closed = GRPC_DONT_SEND_CLOSED; - - if (stream_global->outgoing_sopb) - { - window_delta = grpc_chttp2_preencode (stream_global->outgoing_sopb->ops, &stream_global->outgoing_sopb->nops, (gpr_uint32) GPR_MIN (GPR_MIN (transport_global->outgoing_window, stream_global->outgoing_window), GPR_UINT32_MAX), &stream_writing->sopb); - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("write", transport_global, outgoing_window, -(gpr_int64) window_delta); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("write", transport_global, stream_global, outgoing_window, -(gpr_int64) window_delta); - transport_global->outgoing_window -= window_delta; - stream_global->outgoing_window -= window_delta; - - if (stream_global->write_state == GRPC_WRITE_STATE_QUEUED_CLOSE && stream_global->outgoing_sopb->nops == 0) - { - if (!transport_global->is_client && !stream_global->read_closed) - { - stream_writing->send_closed = GRPC_SEND_CLOSED_WITH_RST_STREAM; - } - else - { - stream_writing->send_closed = GRPC_SEND_CLOSED; - } - } - - if (stream_global->outgoing_window > 0 && stream_global->outgoing_sopb->nops != 0) - { - grpc_chttp2_list_add_writable_stream (transport_global, stream_global); - if (first_reinserted_stream == NULL && transport_global->outgoing_window == 0) - { - first_reinserted_stream = stream_global; - } - } - } - - if (!stream_global->read_closed && stream_global->unannounced_incoming_window > 0) - { - GPR_ASSERT (stream_writing->announce_window == 0); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("write", transport_writing, stream_writing, announce_window, stream_global->unannounced_incoming_window); - stream_writing->announce_window = stream_global->unannounced_incoming_window; - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("write", transport_global, stream_global, incoming_window, stream_global->unannounced_incoming_window); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("write", transport_global, stream_global, unannounced_incoming_window, -(gpr_int64) stream_global->unannounced_incoming_window); - stream_global->incoming_window += stream_global->unannounced_incoming_window; - stream_global->unannounced_incoming_window = 0; - grpc_chttp2_list_add_incoming_window_updated (transport_global, stream_global); - stream_global->writing_now |= GRPC_CHTTP2_WRITING_WINDOW; - } - if (stream_writing->sopb.nops > 0 || stream_writing->send_closed != GRPC_DONT_SEND_CLOSED) - { - stream_global->writing_now |= GRPC_CHTTP2_WRITING_DATA; - } - if (stream_global->writing_now != 0) - { - grpc_chttp2_list_add_writing_stream (transport_writing, stream_writing); - } + while (grpc_chttp2_list_pop_writable_stream( + transport_global, transport_writing, &stream_global, &stream_writing)) { + if (stream_global == first_reinserted_stream) { + /* prevent infinite loop */ + grpc_chttp2_list_add_first_writable_stream(transport_global, + stream_global); + break; } - /* if the grpc_chttp2_transport is ready to send a window update, do so here - also; 3/4 is a magic number that will likely get tuned soon */ - if (transport_global->incoming_window < transport_global->connection_window_target * 3 / 4) - { - window_delta = transport_global->connection_window_target - transport_global->incoming_window; - gpr_slice_buffer_add (&transport_writing->outbuf, grpc_chttp2_window_update_create (0, window_delta)); - GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT ("write", transport_global, incoming_window, window_delta); - transport_global->incoming_window += window_delta; + stream_writing->id = stream_global->id; + stream_writing->send_closed = GRPC_DONT_SEND_CLOSED; + + if (stream_global->outgoing_sopb) { + window_delta = grpc_chttp2_preencode( + stream_global->outgoing_sopb->ops, + &stream_global->outgoing_sopb->nops, + (gpr_uint32)GPR_MIN(GPR_MIN(transport_global->outgoing_window, + stream_global->outgoing_window), + GPR_UINT32_MAX), + &stream_writing->sopb); + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT( + "write", transport_global, outgoing_window, -(gpr_int64)window_delta); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM("write", transport_global, stream_global, + outgoing_window, + -(gpr_int64)window_delta); + transport_global->outgoing_window -= window_delta; + stream_global->outgoing_window -= window_delta; + + if (stream_global->write_state == GRPC_WRITE_STATE_QUEUED_CLOSE && + stream_global->outgoing_sopb->nops == 0) { + if (!transport_global->is_client && !stream_global->read_closed) { + stream_writing->send_closed = GRPC_SEND_CLOSED_WITH_RST_STREAM; + } else { + stream_writing->send_closed = GRPC_SEND_CLOSED; + } + } + + if (stream_global->outgoing_window > 0 && + stream_global->outgoing_sopb->nops != 0) { + grpc_chttp2_list_add_writable_stream(transport_global, stream_global); + if (first_reinserted_stream == NULL && + transport_global->outgoing_window == 0) { + first_reinserted_stream = stream_global; + } + } + } + + if (!stream_global->read_closed && + stream_global->unannounced_incoming_window > 0) { + GPR_ASSERT(stream_writing->announce_window == 0); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( + "write", transport_writing, stream_writing, announce_window, + stream_global->unannounced_incoming_window); + stream_writing->announce_window = + stream_global->unannounced_incoming_window; + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( + "write", transport_global, stream_global, incoming_window, + stream_global->unannounced_incoming_window); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( + "write", transport_global, stream_global, unannounced_incoming_window, + -(gpr_int64)stream_global->unannounced_incoming_window); + stream_global->incoming_window += + stream_global->unannounced_incoming_window; + stream_global->unannounced_incoming_window = 0; + grpc_chttp2_list_add_incoming_window_updated(transport_global, + stream_global); + stream_global->writing_now |= GRPC_CHTTP2_WRITING_WINDOW; + } + if (stream_writing->sopb.nops > 0 || + stream_writing->send_closed != GRPC_DONT_SEND_CLOSED) { + stream_global->writing_now |= GRPC_CHTTP2_WRITING_DATA; } + if (stream_global->writing_now != 0) { + grpc_chttp2_list_add_writing_stream(transport_writing, stream_writing); + } + } - return transport_writing->outbuf.count > 0 || grpc_chttp2_list_have_writing_streams (transport_writing); + /* if the grpc_chttp2_transport is ready to send a window update, do so here + also; 3/4 is a magic number that will likely get tuned soon */ + if (transport_global->incoming_window < + transport_global->connection_window_target * 3 / 4) { + window_delta = transport_global->connection_window_target - + transport_global->incoming_window; + gpr_slice_buffer_add(&transport_writing->outbuf, + grpc_chttp2_window_update_create(0, window_delta)); + GRPC_CHTTP2_FLOWCTL_TRACE_TRANSPORT("write", transport_global, + incoming_window, window_delta); + transport_global->incoming_window += window_delta; + } + + return transport_writing->outbuf.count > 0 || + grpc_chttp2_list_have_writing_streams(transport_writing); } -void -grpc_chttp2_perform_writes (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_writing * transport_writing, grpc_endpoint * endpoint) -{ - GPR_ASSERT (transport_writing->outbuf.count > 0 || grpc_chttp2_list_have_writing_streams (transport_writing)); +void grpc_chttp2_perform_writes( + grpc_exec_ctx *exec_ctx, grpc_chttp2_transport_writing *transport_writing, + grpc_endpoint *endpoint) { + GPR_ASSERT(transport_writing->outbuf.count > 0 || + grpc_chttp2_list_have_writing_streams(transport_writing)); - finalize_outbuf (transport_writing); + finalize_outbuf(transport_writing); - GPR_ASSERT (transport_writing->outbuf.count > 0); - GPR_ASSERT (endpoint); + GPR_ASSERT(transport_writing->outbuf.count > 0); + GPR_ASSERT(endpoint); - grpc_endpoint_write (exec_ctx, endpoint, &transport_writing->outbuf, &transport_writing->done_cb); + grpc_endpoint_write(exec_ctx, endpoint, &transport_writing->outbuf, + &transport_writing->done_cb); } -static void -finalize_outbuf (grpc_chttp2_transport_writing * transport_writing) -{ +static void finalize_outbuf(grpc_chttp2_transport_writing *transport_writing) { grpc_chttp2_stream_writing *stream_writing; - while (grpc_chttp2_list_pop_writing_stream (transport_writing, &stream_writing)) - { - if (stream_writing->sopb.nops > 0 || stream_writing->send_closed != GRPC_DONT_SEND_CLOSED) - { - grpc_chttp2_encode (stream_writing->sopb.ops, stream_writing->sopb.nops, stream_writing->send_closed != GRPC_DONT_SEND_CLOSED, stream_writing->id, &transport_writing->hpack_compressor, &transport_writing->outbuf); - stream_writing->sopb.nops = 0; - } - if (stream_writing->announce_window > 0) - { - gpr_slice_buffer_add (&transport_writing->outbuf, grpc_chttp2_window_update_create (stream_writing->id, stream_writing->announce_window)); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("write", transport_writing, stream_writing, announce_window, -(gpr_int64) stream_writing->announce_window); - stream_writing->announce_window = 0; - } - if (stream_writing->send_closed == GRPC_SEND_CLOSED_WITH_RST_STREAM) - { - gpr_slice_buffer_add (&transport_writing->outbuf, grpc_chttp2_rst_stream_create (stream_writing->id, GRPC_CHTTP2_NO_ERROR)); - } - grpc_chttp2_list_add_written_stream (transport_writing, stream_writing); + while ( + grpc_chttp2_list_pop_writing_stream(transport_writing, &stream_writing)) { + if (stream_writing->sopb.nops > 0 || + stream_writing->send_closed != GRPC_DONT_SEND_CLOSED) { + grpc_chttp2_encode(stream_writing->sopb.ops, stream_writing->sopb.nops, + stream_writing->send_closed != GRPC_DONT_SEND_CLOSED, + stream_writing->id, + &transport_writing->hpack_compressor, + &transport_writing->outbuf); + stream_writing->sopb.nops = 0; } + if (stream_writing->announce_window > 0) { + gpr_slice_buffer_add( + &transport_writing->outbuf, + grpc_chttp2_window_update_create(stream_writing->id, + stream_writing->announce_window)); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( + "write", transport_writing, stream_writing, announce_window, + -(gpr_int64)stream_writing->announce_window); + stream_writing->announce_window = 0; + } + if (stream_writing->send_closed == GRPC_SEND_CLOSED_WITH_RST_STREAM) { + gpr_slice_buffer_add(&transport_writing->outbuf, + grpc_chttp2_rst_stream_create(stream_writing->id, + GRPC_CHTTP2_NO_ERROR)); + } + grpc_chttp2_list_add_written_stream(transport_writing, stream_writing); + } } -void -grpc_chttp2_cleanup_writing (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, grpc_chttp2_transport_writing * transport_writing) -{ +void grpc_chttp2_cleanup_writing( + grpc_exec_ctx *exec_ctx, grpc_chttp2_transport_global *transport_global, + grpc_chttp2_transport_writing *transport_writing) { grpc_chttp2_stream_writing *stream_writing; grpc_chttp2_stream_global *stream_global; - while (grpc_chttp2_list_pop_written_stream (transport_global, transport_writing, &stream_global, &stream_writing)) - { - GPR_ASSERT (stream_global->writing_now != 0); - if (stream_writing->send_closed != GRPC_DONT_SEND_CLOSED) - { - stream_global->write_state = GRPC_WRITE_STATE_SENT_CLOSE; - if (!transport_global->is_client) - { - stream_global->read_closed = 1; - } - } - if (stream_global->writing_now & GRPC_CHTTP2_WRITING_DATA) - { - if (stream_global->outgoing_sopb != NULL && stream_global->outgoing_sopb->nops == 0) - { - GPR_ASSERT (stream_global->write_state != GRPC_WRITE_STATE_QUEUED_CLOSE); - stream_global->outgoing_sopb = NULL; - grpc_exec_ctx_enqueue (exec_ctx, stream_global->send_done_closure, 1); - } - } - stream_global->writing_now = 0; - grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); + while (grpc_chttp2_list_pop_written_stream( + transport_global, transport_writing, &stream_global, &stream_writing)) { + GPR_ASSERT(stream_global->writing_now != 0); + if (stream_writing->send_closed != GRPC_DONT_SEND_CLOSED) { + stream_global->write_state = GRPC_WRITE_STATE_SENT_CLOSE; + if (!transport_global->is_client) { + stream_global->read_closed = 1; + } + } + if (stream_global->writing_now & GRPC_CHTTP2_WRITING_DATA) { + if (stream_global->outgoing_sopb != NULL && + stream_global->outgoing_sopb->nops == 0) { + GPR_ASSERT(stream_global->write_state != GRPC_WRITE_STATE_QUEUED_CLOSE); + stream_global->outgoing_sopb = NULL; + grpc_exec_ctx_enqueue(exec_ctx, stream_global->send_done_closure, 1); + } } - gpr_slice_buffer_reset_and_unref (&transport_writing->outbuf); + stream_global->writing_now = 0; + grpc_chttp2_list_add_read_write_state_changed(transport_global, + stream_global); + } + gpr_slice_buffer_reset_and_unref(&transport_writing->outbuf); } diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index bfcb62426cf..1679e4345d8 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -77,153 +77,161 @@ int grpc_flowctl_trace = 0; static const grpc_transport_vtable vtable; -static void lock (grpc_chttp2_transport * t); -static void unlock (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t); +static void lock(grpc_chttp2_transport *t); +static void unlock(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t); -static void unlock_check_read_write_state (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t); +static void unlock_check_read_write_state(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport *t); /* forward declarations of various callbacks that we'll build closures around */ -static void writing_action (grpc_exec_ctx * exec_ctx, void *t, int iomgr_success_ignored); +static void writing_action(grpc_exec_ctx *exec_ctx, void *t, + int iomgr_success_ignored); /** Set a transport level setting, and push it to our peer */ -static void push_setting (grpc_chttp2_transport * t, grpc_chttp2_setting_id id, gpr_uint32 value); +static void push_setting(grpc_chttp2_transport *t, grpc_chttp2_setting_id id, + gpr_uint32 value); /** Endpoint callback to process incoming data */ -static void recv_data (grpc_exec_ctx * exec_ctx, void *tp, int success); +static void recv_data(grpc_exec_ctx *exec_ctx, void *tp, int success); /** Start disconnection chain */ -static void drop_connection (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t); +static void drop_connection(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t); /** Perform a transport_op */ -static void perform_stream_op_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_transport_stream_op * op); +static void perform_stream_op_locked( + grpc_exec_ctx *exec_ctx, grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global, grpc_transport_stream_op *op); /** Cancel a stream: coming from the transport API */ -static void cancel_from_api (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_status_code status); +static void cancel_from_api(grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global, + grpc_status_code status); -static void close_from_api (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_status_code status, gpr_slice * optional_message); +static void close_from_api(grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global, + grpc_status_code status, + gpr_slice *optional_message); /** Add endpoint from this transport to pollset */ -static void add_to_pollset_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, grpc_pollset * pollset); -static void add_to_pollset_set_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, grpc_pollset_set * pollset_set); +static void add_to_pollset_locked(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport *t, + grpc_pollset *pollset); +static void add_to_pollset_set_locked(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport *t, + grpc_pollset_set *pollset_set); /** Start new streams that have been created if we can */ -static void maybe_start_some_streams (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global); +static void maybe_start_some_streams( + grpc_exec_ctx *exec_ctx, grpc_chttp2_transport_global *transport_global); -static void connectivity_state_set (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, grpc_connectivity_state state, const char *reason); +static void connectivity_state_set( + grpc_exec_ctx *exec_ctx, grpc_chttp2_transport_global *transport_global, + grpc_connectivity_state state, const char *reason); /* * CONSTRUCTION/DESTRUCTION/REFCOUNTING */ -static void -destruct_transport (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) -{ +static void destruct_transport(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport *t) { size_t i; - gpr_mu_lock (&t->mu); + gpr_mu_lock(&t->mu); - GPR_ASSERT (t->ep == NULL); + GPR_ASSERT(t->ep == NULL); - gpr_slice_buffer_destroy (&t->global.qbuf); + gpr_slice_buffer_destroy(&t->global.qbuf); - gpr_slice_buffer_destroy (&t->writing.outbuf); - grpc_chttp2_hpack_compressor_destroy (&t->writing.hpack_compressor); + gpr_slice_buffer_destroy(&t->writing.outbuf); + grpc_chttp2_hpack_compressor_destroy(&t->writing.hpack_compressor); - gpr_slice_buffer_destroy (&t->parsing.qbuf); - gpr_slice_buffer_destroy (&t->read_buffer); - grpc_chttp2_hpack_parser_destroy (&t->parsing.hpack_parser); - grpc_chttp2_goaway_parser_destroy (&t->parsing.goaway_parser); + gpr_slice_buffer_destroy(&t->parsing.qbuf); + gpr_slice_buffer_destroy(&t->read_buffer); + grpc_chttp2_hpack_parser_destroy(&t->parsing.hpack_parser); + grpc_chttp2_goaway_parser_destroy(&t->parsing.goaway_parser); - GRPC_MDSTR_UNREF (t->parsing.str_grpc_timeout); + GRPC_MDSTR_UNREF(t->parsing.str_grpc_timeout); - for (i = 0; i < STREAM_LIST_COUNT; i++) - { - GPR_ASSERT (t->lists[i].head == NULL); - GPR_ASSERT (t->lists[i].tail == NULL); - } + for (i = 0; i < STREAM_LIST_COUNT; i++) { + GPR_ASSERT(t->lists[i].head == NULL); + GPR_ASSERT(t->lists[i].tail == NULL); + } - GPR_ASSERT (grpc_chttp2_stream_map_size (&t->parsing_stream_map) == 0); - GPR_ASSERT (grpc_chttp2_stream_map_size (&t->new_stream_map) == 0); + GPR_ASSERT(grpc_chttp2_stream_map_size(&t->parsing_stream_map) == 0); + GPR_ASSERT(grpc_chttp2_stream_map_size(&t->new_stream_map) == 0); - grpc_chttp2_stream_map_destroy (&t->parsing_stream_map); - grpc_chttp2_stream_map_destroy (&t->new_stream_map); - grpc_connectivity_state_destroy (exec_ctx, &t->channel_callback.state_tracker); + grpc_chttp2_stream_map_destroy(&t->parsing_stream_map); + grpc_chttp2_stream_map_destroy(&t->new_stream_map); + grpc_connectivity_state_destroy(exec_ctx, &t->channel_callback.state_tracker); - gpr_mu_unlock (&t->mu); - gpr_mu_destroy (&t->mu); + gpr_mu_unlock(&t->mu); + gpr_mu_destroy(&t->mu); /* callback remaining pings: they're not allowed to call into the transpot, and maybe they hold resources that need to be freed */ - while (t->global.pings.next != &t->global.pings) - { - grpc_chttp2_outstanding_ping *ping = t->global.pings.next; - grpc_exec_ctx_enqueue (exec_ctx, ping->on_recv, 0); - ping->next->prev = ping->prev; - ping->prev->next = ping->next; - gpr_free (ping); - } - - grpc_mdctx_unref (t->metadata_context); - - gpr_free (t->peer_string); - gpr_free (t); + while (t->global.pings.next != &t->global.pings) { + grpc_chttp2_outstanding_ping *ping = t->global.pings.next; + grpc_exec_ctx_enqueue(exec_ctx, ping->on_recv, 0); + ping->next->prev = ping->prev; + ping->prev->next = ping->next; + gpr_free(ping); + } + + grpc_mdctx_unref(t->metadata_context); + + gpr_free(t->peer_string); + gpr_free(t); } #ifdef REFCOUNTING_DEBUG #define REF_TRANSPORT(t, r) ref_transport(t, r, __FILE__, __LINE__) #define UNREF_TRANSPORT(cl, t, r) unref_transport(cl, t, r, __FILE__, __LINE__) -static void -unref_transport (grpc_exec_ctx *exec_ctx, grpc_chttp2_transport * t, const char *reason, const char *file, int line) -{ - gpr_log (GPR_DEBUG, "chttp2:unref:%p %d->%d %s [%s:%d]", t, t->refs.count, t->refs.count - 1, reason, file, line); - if (!gpr_unref (&t->refs)) - return; - destruct_transport (exec_ctx, t); +static void unref_transport(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, + const char *reason, const char *file, int line) { + gpr_log(GPR_DEBUG, "chttp2:unref:%p %d->%d %s [%s:%d]", t, t->refs.count, + t->refs.count - 1, reason, file, line); + if (!gpr_unref(&t->refs)) return; + destruct_transport(exec_ctx, t); } -static void -ref_transport (grpc_chttp2_transport * t, const char *reason, const char *file, int line) -{ - gpr_log (GPR_DEBUG, "chttp2: ref:%p %d->%d %s [%s:%d]", t, t->refs.count, t->refs.count + 1, reason, file, line); - gpr_ref (&t->refs); +static void ref_transport(grpc_chttp2_transport *t, const char *reason, + const char *file, int line) { + gpr_log(GPR_DEBUG, "chttp2: ref:%p %d->%d %s [%s:%d]", t, t->refs.count, + t->refs.count + 1, reason, file, line); + gpr_ref(&t->refs); } #else #define REF_TRANSPORT(t, r) ref_transport(t) #define UNREF_TRANSPORT(cl, t, r) unref_transport(cl, t) -static void -unref_transport (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) -{ - if (!gpr_unref (&t->refs)) - return; - destruct_transport (exec_ctx, t); +static void unref_transport(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t) { + if (!gpr_unref(&t->refs)) return; + destruct_transport(exec_ctx, t); } -static void -ref_transport (grpc_chttp2_transport * t) -{ - gpr_ref (&t->refs); -} +static void ref_transport(grpc_chttp2_transport *t) { gpr_ref(&t->refs); } #endif -static void -init_transport (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, const grpc_channel_args * channel_args, grpc_endpoint * ep, grpc_mdctx * mdctx, gpr_uint8 is_client) -{ +static void init_transport(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, + const grpc_channel_args *channel_args, + grpc_endpoint *ep, grpc_mdctx *mdctx, + gpr_uint8 is_client) { size_t i; int j; - GPR_ASSERT (strlen (GRPC_CHTTP2_CLIENT_CONNECT_STRING) == GRPC_CHTTP2_CLIENT_CONNECT_STRLEN); + GPR_ASSERT(strlen(GRPC_CHTTP2_CLIENT_CONNECT_STRING) == + GRPC_CHTTP2_CLIENT_CONNECT_STRLEN); - memset (t, 0, sizeof (*t)); + memset(t, 0, sizeof(*t)); t->base.vtable = &vtable; t->ep = ep; /* one ref is for destroy, the other for when ep becomes NULL */ - gpr_ref_init (&t->refs, 2); + gpr_ref_init(&t->refs, 2); /* ref is dropped at transport close() */ - gpr_ref_init (&t->shutdown_ep_refs, 1); - gpr_mu_init (&t->mu); - grpc_mdctx_ref (mdctx); - t->peer_string = grpc_endpoint_get_peer (ep); + gpr_ref_init(&t->shutdown_ep_refs, 1); + gpr_mu_init(&t->mu); + grpc_mdctx_ref(mdctx); + t->peer_string = grpc_endpoint_get_peer(ep); t->metadata_context = mdctx; t->endpoint_reading = 1; t->global.next_stream_id = is_client ? 1 : 2; @@ -234,46 +242,51 @@ init_transport (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, const grpc_ t->global.ping_counter = 1; t->global.pings.next = t->global.pings.prev = &t->global.pings; t->parsing.is_client = is_client; - t->parsing.str_grpc_timeout = grpc_mdstr_from_string (t->metadata_context, "grpc-timeout", 0); - t->parsing.deframe_state = is_client ? GRPC_DTS_FH_0 : GRPC_DTS_CLIENT_PREFIX_0; + t->parsing.str_grpc_timeout = + grpc_mdstr_from_string(t->metadata_context, "grpc-timeout", 0); + t->parsing.deframe_state = + is_client ? GRPC_DTS_FH_0 : GRPC_DTS_CLIENT_PREFIX_0; t->writing.is_client = is_client; - grpc_connectivity_state_init (&t->channel_callback.state_tracker, GRPC_CHANNEL_READY, is_client ? "client_transport" : "server_transport"); - - gpr_slice_buffer_init (&t->global.qbuf); - - gpr_slice_buffer_init (&t->writing.outbuf); - grpc_chttp2_hpack_compressor_init (&t->writing.hpack_compressor, mdctx); - grpc_closure_init (&t->writing_action, writing_action, t); - - gpr_slice_buffer_init (&t->parsing.qbuf); - grpc_chttp2_goaway_parser_init (&t->parsing.goaway_parser); - grpc_chttp2_hpack_parser_init (&t->parsing.hpack_parser, t->metadata_context); - - grpc_closure_init (&t->writing.done_cb, grpc_chttp2_terminate_writing, &t->writing); - grpc_closure_init (&t->recv_data, recv_data, t); - gpr_slice_buffer_init (&t->read_buffer); - - if (is_client) - { - gpr_slice_buffer_add (&t->global.qbuf, gpr_slice_from_copied_string (GRPC_CHTTP2_CLIENT_CONNECT_STRING)); - } + grpc_connectivity_state_init( + &t->channel_callback.state_tracker, GRPC_CHANNEL_READY, + is_client ? "client_transport" : "server_transport"); + + gpr_slice_buffer_init(&t->global.qbuf); + + gpr_slice_buffer_init(&t->writing.outbuf); + grpc_chttp2_hpack_compressor_init(&t->writing.hpack_compressor, mdctx); + grpc_closure_init(&t->writing_action, writing_action, t); + + gpr_slice_buffer_init(&t->parsing.qbuf); + grpc_chttp2_goaway_parser_init(&t->parsing.goaway_parser); + grpc_chttp2_hpack_parser_init(&t->parsing.hpack_parser, t->metadata_context); + + grpc_closure_init(&t->writing.done_cb, grpc_chttp2_terminate_writing, + &t->writing); + grpc_closure_init(&t->recv_data, recv_data, t); + gpr_slice_buffer_init(&t->read_buffer); + + if (is_client) { + gpr_slice_buffer_add( + &t->global.qbuf, + gpr_slice_from_copied_string(GRPC_CHTTP2_CLIENT_CONNECT_STRING)); + } /* 8 is a random stab in the dark as to a good initial size: it's small enough that it shouldn't waste memory for infrequently used connections, yet large enough that the exponential growth should happen nicely when it's needed. TODO(ctiller): tune this */ - grpc_chttp2_stream_map_init (&t->parsing_stream_map, 8); - grpc_chttp2_stream_map_init (&t->new_stream_map, 8); + grpc_chttp2_stream_map_init(&t->parsing_stream_map, 8); + grpc_chttp2_stream_map_init(&t->new_stream_map, 8); /* copy in initial settings to all setting sets */ - for (i = 0; i < GRPC_CHTTP2_NUM_SETTINGS; i++) - { - t->parsing.settings[i] = grpc_chttp2_settings_parameters[i].default_value; - for (j = 0; j < GRPC_NUM_SETTING_SETS; j++) - { - t->global.settings[j][i] = grpc_chttp2_settings_parameters[i].default_value; - } + for (i = 0; i < GRPC_CHTTP2_NUM_SETTINGS; i++) { + t->parsing.settings[i] = grpc_chttp2_settings_parameters[i].default_value; + for (j = 0; j < GRPC_NUM_SETTING_SETS; j++) { + t->global.settings[j][i] = + grpc_chttp2_settings_parameters[i].default_value; } + } t->global.dirtied_local_settings = 1; /* Hack: it's common for implementations to assume 65536 bytes initial send window -- this should by rights be 0 */ @@ -281,220 +294,205 @@ init_transport (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, const grpc_ t->global.sent_local_settings = 0; /* configure http2 the way we like it */ - if (is_client) - { - push_setting (t, GRPC_CHTTP2_SETTINGS_ENABLE_PUSH, 0); - push_setting (t, GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 0); - } - push_setting (t, GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, DEFAULT_WINDOW); - - if (channel_args) - { - for (i = 0; i < channel_args->num_args; i++) - { - if (0 == strcmp (channel_args->args[i].key, GRPC_ARG_MAX_CONCURRENT_STREAMS)) - { - if (is_client) - { - gpr_log (GPR_ERROR, "%s: is ignored on the client", GRPC_ARG_MAX_CONCURRENT_STREAMS); - } - else if (channel_args->args[i].type != GRPC_ARG_INTEGER) - { - gpr_log (GPR_ERROR, "%s: must be an integer", GRPC_ARG_MAX_CONCURRENT_STREAMS); - } - else - { - push_setting (t, GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, (gpr_uint32) channel_args->args[i].value.integer); - } - } - else if (0 == strcmp (channel_args->args[i].key, GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER)) - { - if (channel_args->args[i].type != GRPC_ARG_INTEGER) - { - gpr_log (GPR_ERROR, "%s: must be an integer", GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER); - } - else if ((t->global.next_stream_id & 1) !=(channel_args->args[i].value.integer & 1)) - { - gpr_log (GPR_ERROR, "%s: low bit must be %d on %s", GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER, t->global.next_stream_id & 1, is_client ? "client" : "server"); - } - else - { - t->global.next_stream_id = (gpr_uint32) channel_args->args[i].value.integer; - } - } - } + if (is_client) { + push_setting(t, GRPC_CHTTP2_SETTINGS_ENABLE_PUSH, 0); + push_setting(t, GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 0); + } + push_setting(t, GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, DEFAULT_WINDOW); + + if (channel_args) { + for (i = 0; i < channel_args->num_args; i++) { + if (0 == + strcmp(channel_args->args[i].key, GRPC_ARG_MAX_CONCURRENT_STREAMS)) { + if (is_client) { + gpr_log(GPR_ERROR, "%s: is ignored on the client", + GRPC_ARG_MAX_CONCURRENT_STREAMS); + } else if (channel_args->args[i].type != GRPC_ARG_INTEGER) { + gpr_log(GPR_ERROR, "%s: must be an integer", + GRPC_ARG_MAX_CONCURRENT_STREAMS); + } else { + push_setting(t, GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, + (gpr_uint32)channel_args->args[i].value.integer); + } + } else if (0 == strcmp(channel_args->args[i].key, + GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER)) { + if (channel_args->args[i].type != GRPC_ARG_INTEGER) { + gpr_log(GPR_ERROR, "%s: must be an integer", + GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER); + } else if ((t->global.next_stream_id & 1) != + (channel_args->args[i].value.integer & 1)) { + gpr_log(GPR_ERROR, "%s: low bit must be %d on %s", + GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER, + t->global.next_stream_id & 1, + is_client ? "client" : "server"); + } else { + t->global.next_stream_id = + (gpr_uint32)channel_args->args[i].value.integer; + } + } } + } } -static void -destroy_transport (grpc_exec_ctx * exec_ctx, grpc_transport * gt) -{ - grpc_chttp2_transport *t = (grpc_chttp2_transport *) gt; +static void destroy_transport(grpc_exec_ctx *exec_ctx, grpc_transport *gt) { + grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; - lock (t); + lock(t); t->destroying = 1; - drop_connection (exec_ctx, t); - unlock (exec_ctx, t); + drop_connection(exec_ctx, t); + unlock(exec_ctx, t); - UNREF_TRANSPORT (exec_ctx, t, "destroy"); + UNREF_TRANSPORT(exec_ctx, t, "destroy"); } /** block grpc_endpoint_shutdown being called until a paired allow_endpoint_shutdown is made */ -static void -prevent_endpoint_shutdown (grpc_chttp2_transport * t) -{ - GPR_ASSERT (t->ep); - gpr_ref (&t->shutdown_ep_refs); +static void prevent_endpoint_shutdown(grpc_chttp2_transport *t) { + GPR_ASSERT(t->ep); + gpr_ref(&t->shutdown_ep_refs); } -static void -allow_endpoint_shutdown_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) -{ - if (gpr_unref (&t->shutdown_ep_refs)) - { - if (t->ep) - { - grpc_endpoint_shutdown (exec_ctx, t->ep); - } +static void allow_endpoint_shutdown_locked(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport *t) { + if (gpr_unref(&t->shutdown_ep_refs)) { + if (t->ep) { + grpc_endpoint_shutdown(exec_ctx, t->ep); } + } } -static void -allow_endpoint_shutdown_unlocked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) -{ - if (gpr_unref (&t->shutdown_ep_refs)) - { - gpr_mu_lock (&t->mu); - if (t->ep) - { - grpc_endpoint_shutdown (exec_ctx, t->ep); - } - gpr_mu_unlock (&t->mu); +static void allow_endpoint_shutdown_unlocked(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport *t) { + if (gpr_unref(&t->shutdown_ep_refs)) { + gpr_mu_lock(&t->mu); + if (t->ep) { + grpc_endpoint_shutdown(exec_ctx, t->ep); } + gpr_mu_unlock(&t->mu); + } } -static void -destroy_endpoint (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) -{ - grpc_endpoint_destroy (exec_ctx, t->ep); +static void destroy_endpoint(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport *t) { + grpc_endpoint_destroy(exec_ctx, t->ep); t->ep = NULL; /* safe because we'll still have the ref for write */ - UNREF_TRANSPORT (exec_ctx, t, "disconnect"); + UNREF_TRANSPORT(exec_ctx, t, "disconnect"); } -static void -close_transport_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) -{ - if (!t->closed) - { - t->closed = 1; - connectivity_state_set (exec_ctx, &t->global, GRPC_CHANNEL_FATAL_FAILURE, "close_transport"); - if (t->ep) - { - allow_endpoint_shutdown_locked (exec_ctx, t); - } +static void close_transport_locked(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport *t) { + if (!t->closed) { + t->closed = 1; + connectivity_state_set(exec_ctx, &t->global, GRPC_CHANNEL_FATAL_FAILURE, + "close_transport"); + if (t->ep) { + allow_endpoint_shutdown_locked(exec_ctx, t); } + } } -static int -init_stream (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_stream * gs, const void *server_data, grpc_transport_stream_op * initial_op) -{ - grpc_chttp2_transport *t = (grpc_chttp2_transport *) gt; - grpc_chttp2_stream *s = (grpc_chttp2_stream *) gs; - - memset (s, 0, sizeof (*s)); - - grpc_chttp2_incoming_metadata_buffer_init (&s->parsing.incoming_metadata); - grpc_chttp2_incoming_metadata_buffer_init (&s->global.incoming_metadata); - grpc_sopb_init (&s->writing.sopb); - grpc_sopb_init (&s->global.incoming_sopb); - grpc_chttp2_data_parser_init (&s->parsing.data_parser); - - REF_TRANSPORT (t, "stream"); - - lock (t); - grpc_chttp2_register_stream (t, s); - if (server_data) - { - GPR_ASSERT (t->parsing_active); - s->global.id = (gpr_uint32) (gpr_uintptr) server_data; - s->global.outgoing_window = t->global.settings[GRPC_PEER_SETTINGS][GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; - s->global.max_recv_bytes = s->parsing.incoming_window = s->global.incoming_window = t->global.settings[GRPC_SENT_SETTINGS][GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; - *t->accepting_stream = s; - grpc_chttp2_stream_map_add (&t->parsing_stream_map, s->global.id, s); - s->global.in_stream_map = 1; - } +static int init_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, + grpc_stream *gs, const void *server_data, + grpc_transport_stream_op *initial_op) { + grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; + grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; + + memset(s, 0, sizeof(*s)); + + grpc_chttp2_incoming_metadata_buffer_init(&s->parsing.incoming_metadata); + grpc_chttp2_incoming_metadata_buffer_init(&s->global.incoming_metadata); + grpc_sopb_init(&s->writing.sopb); + grpc_sopb_init(&s->global.incoming_sopb); + grpc_chttp2_data_parser_init(&s->parsing.data_parser); + + REF_TRANSPORT(t, "stream"); + + lock(t); + grpc_chttp2_register_stream(t, s); + if (server_data) { + GPR_ASSERT(t->parsing_active); + s->global.id = (gpr_uint32)(gpr_uintptr)server_data; + s->global.outgoing_window = + t->global.settings[GRPC_PEER_SETTINGS] + [GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; + s->global.max_recv_bytes = s->parsing.incoming_window = + s->global.incoming_window = + t->global.settings[GRPC_SENT_SETTINGS] + [GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; + *t->accepting_stream = s; + grpc_chttp2_stream_map_add(&t->parsing_stream_map, s->global.id, s); + s->global.in_stream_map = 1; + } if (initial_op) - perform_stream_op_locked (exec_ctx, &t->global, &s->global, initial_op); - unlock (exec_ctx, t); + perform_stream_op_locked(exec_ctx, &t->global, &s->global, initial_op); + unlock(exec_ctx, t); return 0; } -static void -destroy_stream (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_stream * gs) -{ - grpc_chttp2_transport *t = (grpc_chttp2_transport *) gt; - grpc_chttp2_stream *s = (grpc_chttp2_stream *) gs; +static void destroy_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, + grpc_stream *gs) { + grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; + grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; int i; - gpr_mu_lock (&t->mu); - - GPR_ASSERT (s->global.published_state == GRPC_STREAM_CLOSED || s->global.id == 0); - GPR_ASSERT (!s->global.in_stream_map); - if (grpc_chttp2_unregister_stream (t, s) && t->global.sent_goaway) - { - close_transport_locked (exec_ctx, t); - } - if (!t->parsing_active && s->global.id) - { - GPR_ASSERT (grpc_chttp2_stream_map_find (&t->parsing_stream_map, s->global.id) == NULL); - } - - grpc_chttp2_list_remove_incoming_window_updated (&t->global, &s->global); - grpc_chttp2_list_remove_writable_stream (&t->global, &s->global); - - gpr_mu_unlock (&t->mu); - - for (i = 0; i < STREAM_LIST_COUNT; i++) - { - if (s->included[i]) - { - gpr_log (GPR_ERROR, "%s stream %d still included in list %d", t->global.is_client ? "client" : "server", s->global.id, i); - abort (); - } + gpr_mu_lock(&t->mu); + + GPR_ASSERT(s->global.published_state == GRPC_STREAM_CLOSED || + s->global.id == 0); + GPR_ASSERT(!s->global.in_stream_map); + if (grpc_chttp2_unregister_stream(t, s) && t->global.sent_goaway) { + close_transport_locked(exec_ctx, t); + } + if (!t->parsing_active && s->global.id) { + GPR_ASSERT(grpc_chttp2_stream_map_find(&t->parsing_stream_map, + s->global.id) == NULL); + } + + grpc_chttp2_list_remove_incoming_window_updated(&t->global, &s->global); + grpc_chttp2_list_remove_writable_stream(&t->global, &s->global); + + gpr_mu_unlock(&t->mu); + + for (i = 0; i < STREAM_LIST_COUNT; i++) { + if (s->included[i]) { + gpr_log(GPR_ERROR, "%s stream %d still included in list %d", + t->global.is_client ? "client" : "server", s->global.id, i); + abort(); } - - GPR_ASSERT (s->global.outgoing_sopb == NULL); - GPR_ASSERT (s->global.publish_sopb == NULL); - grpc_sopb_destroy (&s->writing.sopb); - grpc_sopb_destroy (&s->global.incoming_sopb); - grpc_chttp2_data_parser_destroy (&s->parsing.data_parser); - grpc_chttp2_incoming_metadata_buffer_destroy (&s->parsing.incoming_metadata); - grpc_chttp2_incoming_metadata_buffer_destroy (&s->global.incoming_metadata); - grpc_chttp2_incoming_metadata_live_op_buffer_end (&s->global.outstanding_metadata); - - UNREF_TRANSPORT (exec_ctx, t, "stream"); + } + + GPR_ASSERT(s->global.outgoing_sopb == NULL); + GPR_ASSERT(s->global.publish_sopb == NULL); + grpc_sopb_destroy(&s->writing.sopb); + grpc_sopb_destroy(&s->global.incoming_sopb); + grpc_chttp2_data_parser_destroy(&s->parsing.data_parser); + grpc_chttp2_incoming_metadata_buffer_destroy(&s->parsing.incoming_metadata); + grpc_chttp2_incoming_metadata_buffer_destroy(&s->global.incoming_metadata); + grpc_chttp2_incoming_metadata_live_op_buffer_end( + &s->global.outstanding_metadata); + + UNREF_TRANSPORT(exec_ctx, t, "stream"); } -grpc_chttp2_stream_parsing * -grpc_chttp2_parsing_lookup_stream (grpc_chttp2_transport_parsing * transport_parsing, gpr_uint32 id) -{ - grpc_chttp2_transport *t = TRANSPORT_FROM_PARSING (transport_parsing); - grpc_chttp2_stream *s = grpc_chttp2_stream_map_find (&t->parsing_stream_map, id); +grpc_chttp2_stream_parsing *grpc_chttp2_parsing_lookup_stream( + grpc_chttp2_transport_parsing *transport_parsing, gpr_uint32 id) { + grpc_chttp2_transport *t = TRANSPORT_FROM_PARSING(transport_parsing); + grpc_chttp2_stream *s = + grpc_chttp2_stream_map_find(&t->parsing_stream_map, id); return s ? &s->parsing : NULL; } -grpc_chttp2_stream_parsing * -grpc_chttp2_parsing_accept_stream (grpc_chttp2_transport_parsing * transport_parsing, gpr_uint32 id) -{ +grpc_chttp2_stream_parsing *grpc_chttp2_parsing_accept_stream( + grpc_chttp2_transport_parsing *transport_parsing, gpr_uint32 id) { grpc_chttp2_stream *accepting; - grpc_chttp2_transport *t = TRANSPORT_FROM_PARSING (transport_parsing); - GPR_ASSERT (t->accepting_stream == NULL); + grpc_chttp2_transport *t = TRANSPORT_FROM_PARSING(transport_parsing); + GPR_ASSERT(t->accepting_stream == NULL); t->accepting_stream = &accepting; - t->channel_callback.accept_stream (t->channel_callback.accept_stream_user_data, &t->base, (void *) (gpr_uintptr) id); + t->channel_callback.accept_stream(t->channel_callback.accept_stream_user_data, + &t->base, (void *)(gpr_uintptr)id); t->accepting_stream = NULL; return &accepting->parsing; } @@ -509,467 +507,466 @@ grpc_chttp2_parsing_accept_stream (grpc_chttp2_transport_parsing * transport_par is always queued, as are callbacks to process data. During unlock() we check our todo lists and initiate callbacks and flush writes. */ -static void -lock (grpc_chttp2_transport * t) -{ - gpr_mu_lock (&t->mu); -} +static void lock(grpc_chttp2_transport *t) { gpr_mu_lock(&t->mu); } -static void -unlock (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) -{ - unlock_check_read_write_state (exec_ctx, t); - if (!t->writing_active && !t->closed && grpc_chttp2_unlocking_check_writes (&t->global, &t->writing)) - { - t->writing_active = 1; - REF_TRANSPORT (t, "writing"); - grpc_exec_ctx_enqueue (exec_ctx, &t->writing_action, 1); - prevent_endpoint_shutdown (t); - } +static void unlock(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t) { + unlock_check_read_write_state(exec_ctx, t); + if (!t->writing_active && !t->closed && + grpc_chttp2_unlocking_check_writes(&t->global, &t->writing)) { + t->writing_active = 1; + REF_TRANSPORT(t, "writing"); + grpc_exec_ctx_enqueue(exec_ctx, &t->writing_action, 1); + prevent_endpoint_shutdown(t); + } - gpr_mu_unlock (&t->mu); + gpr_mu_unlock(&t->mu); } /* * OUTPUT PROCESSING */ -static void -push_setting (grpc_chttp2_transport * t, grpc_chttp2_setting_id id, gpr_uint32 value) -{ - const grpc_chttp2_setting_parameters *sp = &grpc_chttp2_settings_parameters[id]; - gpr_uint32 use_value = GPR_CLAMP (value, sp->min_value, sp->max_value); - if (use_value != value) - { - gpr_log (GPR_INFO, "Requested parameter %s clamped from %d to %d", sp->name, value, use_value); - } - if (use_value != t->global.settings[GRPC_LOCAL_SETTINGS][id]) - { - t->global.settings[GRPC_LOCAL_SETTINGS][id] = use_value; - t->global.dirtied_local_settings = 1; - } +static void push_setting(grpc_chttp2_transport *t, grpc_chttp2_setting_id id, + gpr_uint32 value) { + const grpc_chttp2_setting_parameters *sp = + &grpc_chttp2_settings_parameters[id]; + gpr_uint32 use_value = GPR_CLAMP(value, sp->min_value, sp->max_value); + if (use_value != value) { + gpr_log(GPR_INFO, "Requested parameter %s clamped from %d to %d", sp->name, + value, use_value); + } + if (use_value != t->global.settings[GRPC_LOCAL_SETTINGS][id]) { + t->global.settings[GRPC_LOCAL_SETTINGS][id] = use_value; + t->global.dirtied_local_settings = 1; + } } -void -grpc_chttp2_terminate_writing (grpc_exec_ctx * exec_ctx, void *transport_writing_ptr, int success) -{ +void grpc_chttp2_terminate_writing(grpc_exec_ctx *exec_ctx, + void *transport_writing_ptr, int success) { grpc_chttp2_transport_writing *transport_writing = transport_writing_ptr; - grpc_chttp2_transport *t = TRANSPORT_FROM_WRITING (transport_writing); + grpc_chttp2_transport *t = TRANSPORT_FROM_WRITING(transport_writing); - lock (t); + lock(t); - allow_endpoint_shutdown_locked (exec_ctx, t); + allow_endpoint_shutdown_locked(exec_ctx, t); - if (!success) - { - drop_connection (exec_ctx, t); - } + if (!success) { + drop_connection(exec_ctx, t); + } /* cleanup writing related jazz */ - grpc_chttp2_cleanup_writing (exec_ctx, &t->global, &t->writing); + grpc_chttp2_cleanup_writing(exec_ctx, &t->global, &t->writing); /* leave the writing flag up on shutdown to prevent further writes in unlock() from starting */ t->writing_active = 0; - if (t->ep && !t->endpoint_reading) - { - destroy_endpoint (exec_ctx, t); - } + if (t->ep && !t->endpoint_reading) { + destroy_endpoint(exec_ctx, t); + } - unlock (exec_ctx, t); + unlock(exec_ctx, t); - UNREF_TRANSPORT (exec_ctx, t, "writing"); + UNREF_TRANSPORT(exec_ctx, t, "writing"); } -static void -writing_action (grpc_exec_ctx * exec_ctx, void *gt, int iomgr_success_ignored) -{ +static void writing_action(grpc_exec_ctx *exec_ctx, void *gt, + int iomgr_success_ignored) { grpc_chttp2_transport *t = gt; - grpc_chttp2_perform_writes (exec_ctx, &t->writing, t->ep); + grpc_chttp2_perform_writes(exec_ctx, &t->writing, t->ep); } -void -grpc_chttp2_add_incoming_goaway (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, gpr_uint32 goaway_error, gpr_slice goaway_text) -{ - char *msg = gpr_dump_slice (goaway_text, GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log (GPR_DEBUG, "got goaway [%d]: %s", goaway_error, msg); - gpr_free (msg); - gpr_slice_unref (goaway_text); +void grpc_chttp2_add_incoming_goaway( + grpc_exec_ctx *exec_ctx, grpc_chttp2_transport_global *transport_global, + gpr_uint32 goaway_error, gpr_slice goaway_text) { + char *msg = gpr_dump_slice(goaway_text, GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log(GPR_DEBUG, "got goaway [%d]: %s", goaway_error, msg); + gpr_free(msg); + gpr_slice_unref(goaway_text); transport_global->seen_goaway = 1; - connectivity_state_set (exec_ctx, transport_global, GRPC_CHANNEL_FATAL_FAILURE, "got_goaway"); + connectivity_state_set(exec_ctx, transport_global, GRPC_CHANNEL_FATAL_FAILURE, + "got_goaway"); } -static void -maybe_start_some_streams (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global) -{ +static void maybe_start_some_streams( + grpc_exec_ctx *exec_ctx, grpc_chttp2_transport_global *transport_global) { grpc_chttp2_stream_global *stream_global; /* start streams where we have free grpc_chttp2_stream ids and free * concurrency */ - while (transport_global->next_stream_id <= MAX_CLIENT_STREAM_ID && transport_global->concurrent_stream_count < transport_global->settings[GRPC_PEER_SETTINGS][GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS] && grpc_chttp2_list_pop_waiting_for_concurrency (transport_global, &stream_global)) - { - GRPC_CHTTP2_IF_TRACING (gpr_log (GPR_DEBUG, "HTTP:%s: Allocating new grpc_chttp2_stream %p to id %d", transport_global->is_client ? "CLI" : "SVR", stream_global, transport_global->next_stream_id)); - - GPR_ASSERT (stream_global->id == 0); - stream_global->id = transport_global->next_stream_id; - transport_global->next_stream_id += 2; - - if (transport_global->next_stream_id >= MAX_CLIENT_STREAM_ID) - { - connectivity_state_set (exec_ctx, transport_global, GRPC_CHANNEL_TRANSIENT_FAILURE, "no_more_stream_ids"); - } - - stream_global->outgoing_window = transport_global->settings[GRPC_PEER_SETTINGS][GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; - stream_global->incoming_window = transport_global->settings[GRPC_SENT_SETTINGS][GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; - stream_global->max_recv_bytes = GPR_MAX (stream_global->incoming_window, stream_global->max_recv_bytes); - grpc_chttp2_stream_map_add (&TRANSPORT_FROM_GLOBAL (transport_global)->new_stream_map, stream_global->id, STREAM_FROM_GLOBAL (stream_global)); - stream_global->in_stream_map = 1; - transport_global->concurrent_stream_count++; - grpc_chttp2_list_add_incoming_window_updated (transport_global, stream_global); - grpc_chttp2_list_add_writable_stream (transport_global, stream_global); + while (transport_global->next_stream_id <= MAX_CLIENT_STREAM_ID && + transport_global->concurrent_stream_count < + transport_global + ->settings[GRPC_PEER_SETTINGS] + [GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS] && + grpc_chttp2_list_pop_waiting_for_concurrency(transport_global, + &stream_global)) { + GRPC_CHTTP2_IF_TRACING(gpr_log( + GPR_DEBUG, "HTTP:%s: Allocating new grpc_chttp2_stream %p to id %d", + transport_global->is_client ? "CLI" : "SVR", stream_global, + transport_global->next_stream_id)); + + GPR_ASSERT(stream_global->id == 0); + stream_global->id = transport_global->next_stream_id; + transport_global->next_stream_id += 2; + + if (transport_global->next_stream_id >= MAX_CLIENT_STREAM_ID) { + connectivity_state_set(exec_ctx, transport_global, + GRPC_CHANNEL_TRANSIENT_FAILURE, + "no_more_stream_ids"); } + + stream_global->outgoing_window = + transport_global->settings[GRPC_PEER_SETTINGS] + [GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; + stream_global->incoming_window = + transport_global->settings[GRPC_SENT_SETTINGS] + [GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; + stream_global->max_recv_bytes = + GPR_MAX(stream_global->incoming_window, stream_global->max_recv_bytes); + grpc_chttp2_stream_map_add( + &TRANSPORT_FROM_GLOBAL(transport_global)->new_stream_map, + stream_global->id, STREAM_FROM_GLOBAL(stream_global)); + stream_global->in_stream_map = 1; + transport_global->concurrent_stream_count++; + grpc_chttp2_list_add_incoming_window_updated(transport_global, + stream_global); + grpc_chttp2_list_add_writable_stream(transport_global, stream_global); + } /* cancel out streams that will never be started */ - while (transport_global->next_stream_id >= MAX_CLIENT_STREAM_ID && grpc_chttp2_list_pop_waiting_for_concurrency (transport_global, &stream_global)) - { - cancel_from_api (transport_global, stream_global, GRPC_STATUS_UNAVAILABLE); - } + while (transport_global->next_stream_id >= MAX_CLIENT_STREAM_ID && + grpc_chttp2_list_pop_waiting_for_concurrency(transport_global, + &stream_global)) { + cancel_from_api(transport_global, stream_global, GRPC_STATUS_UNAVAILABLE); + } } -static void -perform_stream_op_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_transport_stream_op * op) -{ - if (op->cancel_with_status != GRPC_STATUS_OK) - { - cancel_from_api (transport_global, stream_global, op->cancel_with_status); - } - - if (op->close_with_status != GRPC_STATUS_OK) - { - close_from_api (transport_global, stream_global, op->close_with_status, op->optional_close_message); +static void perform_stream_op_locked( + grpc_exec_ctx *exec_ctx, grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global, grpc_transport_stream_op *op) { + if (op->cancel_with_status != GRPC_STATUS_OK) { + cancel_from_api(transport_global, stream_global, op->cancel_with_status); + } + + if (op->close_with_status != GRPC_STATUS_OK) { + close_from_api(transport_global, stream_global, op->close_with_status, + op->optional_close_message); + } + + if (op->send_ops) { + GPR_ASSERT(stream_global->outgoing_sopb == NULL); + stream_global->send_done_closure = op->on_done_send; + if (!stream_global->cancelled) { + stream_global->written_anything = 1; + stream_global->outgoing_sopb = op->send_ops; + if (op->is_last_send && + stream_global->write_state == GRPC_WRITE_STATE_OPEN) { + stream_global->write_state = GRPC_WRITE_STATE_QUEUED_CLOSE; + } + if (stream_global->id == 0) { + GRPC_CHTTP2_IF_TRACING(gpr_log( + GPR_DEBUG, + "HTTP:%s: New grpc_chttp2_stream %p waiting for concurrency", + transport_global->is_client ? "CLI" : "SVR", stream_global)); + grpc_chttp2_list_add_waiting_for_concurrency(transport_global, + stream_global); + maybe_start_some_streams(exec_ctx, transport_global); + } else if (stream_global->outgoing_window > 0) { + grpc_chttp2_list_add_writable_stream(transport_global, stream_global); + } + } else { + grpc_sopb_reset(op->send_ops); + grpc_exec_ctx_enqueue(exec_ctx, stream_global->send_done_closure, 0); } - - if (op->send_ops) - { - GPR_ASSERT (stream_global->outgoing_sopb == NULL); - stream_global->send_done_closure = op->on_done_send; - if (!stream_global->cancelled) - { - stream_global->written_anything = 1; - stream_global->outgoing_sopb = op->send_ops; - if (op->is_last_send && stream_global->write_state == GRPC_WRITE_STATE_OPEN) - { - stream_global->write_state = GRPC_WRITE_STATE_QUEUED_CLOSE; - } - if (stream_global->id == 0) - { - GRPC_CHTTP2_IF_TRACING (gpr_log (GPR_DEBUG, "HTTP:%s: New grpc_chttp2_stream %p waiting for concurrency", transport_global->is_client ? "CLI" : "SVR", stream_global)); - grpc_chttp2_list_add_waiting_for_concurrency (transport_global, stream_global); - maybe_start_some_streams (exec_ctx, transport_global); - } - else if (stream_global->outgoing_window > 0) - { - grpc_chttp2_list_add_writable_stream (transport_global, stream_global); - } - } - else - { - grpc_sopb_reset (op->send_ops); - grpc_exec_ctx_enqueue (exec_ctx, stream_global->send_done_closure, 0); - } + } + + if (op->recv_ops) { + GPR_ASSERT(stream_global->publish_sopb == NULL); + GPR_ASSERT(stream_global->published_state != GRPC_STREAM_CLOSED); + stream_global->recv_done_closure = op->on_done_recv; + stream_global->publish_sopb = op->recv_ops; + stream_global->publish_sopb->nops = 0; + stream_global->publish_state = op->recv_state; + /* clamp max recv bytes */ + op->max_recv_bytes = GPR_MIN(op->max_recv_bytes, GPR_UINT32_MAX); + if (stream_global->max_recv_bytes < op->max_recv_bytes) { + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( + "op", transport_global, stream_global, max_recv_bytes, + op->max_recv_bytes - stream_global->max_recv_bytes); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM( + "op", transport_global, stream_global, unannounced_incoming_window, + op->max_recv_bytes - stream_global->max_recv_bytes); + stream_global->unannounced_incoming_window += + (gpr_uint32)op->max_recv_bytes - stream_global->max_recv_bytes; + stream_global->max_recv_bytes = (gpr_uint32)op->max_recv_bytes; } - - if (op->recv_ops) - { - GPR_ASSERT (stream_global->publish_sopb == NULL); - GPR_ASSERT (stream_global->published_state != GRPC_STREAM_CLOSED); - stream_global->recv_done_closure = op->on_done_recv; - stream_global->publish_sopb = op->recv_ops; - stream_global->publish_sopb->nops = 0; - stream_global->publish_state = op->recv_state; - /* clamp max recv bytes */ - op->max_recv_bytes = GPR_MIN (op->max_recv_bytes, GPR_UINT32_MAX); - if (stream_global->max_recv_bytes < op->max_recv_bytes) - { - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("op", transport_global, stream_global, max_recv_bytes, op->max_recv_bytes - stream_global->max_recv_bytes); - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("op", transport_global, stream_global, unannounced_incoming_window, op->max_recv_bytes - stream_global->max_recv_bytes); - stream_global->unannounced_incoming_window += (gpr_uint32) op->max_recv_bytes - stream_global->max_recv_bytes; - stream_global->max_recv_bytes = (gpr_uint32) op->max_recv_bytes; - } - grpc_chttp2_incoming_metadata_live_op_buffer_end (&stream_global->outstanding_metadata); - grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); - if (stream_global->id != 0) - { - grpc_chttp2_list_add_writable_stream (transport_global, stream_global); - } + grpc_chttp2_incoming_metadata_live_op_buffer_end( + &stream_global->outstanding_metadata); + grpc_chttp2_list_add_read_write_state_changed(transport_global, + stream_global); + if (stream_global->id != 0) { + grpc_chttp2_list_add_writable_stream(transport_global, stream_global); } + } - if (op->bind_pollset) - { - add_to_pollset_locked (exec_ctx,TRANSPORT_FROM_GLOBAL ( transport_global), op->bind_pollset); - } + if (op->bind_pollset) { + add_to_pollset_locked(exec_ctx, TRANSPORT_FROM_GLOBAL(transport_global), + op->bind_pollset); + } - grpc_exec_ctx_enqueue (exec_ctx, op->on_consumed, 1); + grpc_exec_ctx_enqueue(exec_ctx, op->on_consumed, 1); } -static void -perform_stream_op (grpc_exec_ctx * exec_ctx, grpc_transport * gt, grpc_stream * gs, grpc_transport_stream_op * op) -{ - grpc_chttp2_transport *t = (grpc_chttp2_transport *) gt; - grpc_chttp2_stream *s = (grpc_chttp2_stream *) gs; +static void perform_stream_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, + grpc_stream *gs, grpc_transport_stream_op *op) { + grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; + grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; - lock (t); - perform_stream_op_locked (exec_ctx, &t->global, &s->global, op); - unlock (exec_ctx, t); + lock(t); + perform_stream_op_locked(exec_ctx, &t->global, &s->global, op); + unlock(exec_ctx, t); } -static void -send_ping_locked (grpc_chttp2_transport * t, grpc_closure * on_recv) -{ - grpc_chttp2_outstanding_ping *p = gpr_malloc (sizeof (*p)); +static void send_ping_locked(grpc_chttp2_transport *t, grpc_closure *on_recv) { + grpc_chttp2_outstanding_ping *p = gpr_malloc(sizeof(*p)); p->next = &t->global.pings; p->prev = p->next->prev; p->prev->next = p->next->prev = p; - p->id[0] = (gpr_uint8) ((t->global.ping_counter >> 56) &0xff); - p->id[1] = (gpr_uint8) ((t->global.ping_counter >> 48) &0xff); - p->id[2] = (gpr_uint8) ((t->global.ping_counter >> 40) &0xff); - p->id[3] = (gpr_uint8) ((t->global.ping_counter >> 32) &0xff); - p->id[4] = (gpr_uint8) ((t->global.ping_counter >> 24) &0xff); - p->id[5] = (gpr_uint8) ((t->global.ping_counter >> 16) &0xff); - p->id[6] = (gpr_uint8) ((t->global.ping_counter >> 8) &0xff); - p->id[7] = (gpr_uint8) (t->global.ping_counter & 0xff); + p->id[0] = (gpr_uint8)((t->global.ping_counter >> 56) & 0xff); + p->id[1] = (gpr_uint8)((t->global.ping_counter >> 48) & 0xff); + p->id[2] = (gpr_uint8)((t->global.ping_counter >> 40) & 0xff); + p->id[3] = (gpr_uint8)((t->global.ping_counter >> 32) & 0xff); + p->id[4] = (gpr_uint8)((t->global.ping_counter >> 24) & 0xff); + p->id[5] = (gpr_uint8)((t->global.ping_counter >> 16) & 0xff); + p->id[6] = (gpr_uint8)((t->global.ping_counter >> 8) & 0xff); + p->id[7] = (gpr_uint8)(t->global.ping_counter & 0xff); p->on_recv = on_recv; - gpr_slice_buffer_add (&t->global.qbuf, grpc_chttp2_ping_create (0, p->id)); + gpr_slice_buffer_add(&t->global.qbuf, grpc_chttp2_ping_create(0, p->id)); } -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; +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; int close_transport = 0; - lock (t); - - grpc_exec_ctx_enqueue (exec_ctx, op->on_consumed, 1); - - if (op->on_connectivity_state_change) - { - grpc_connectivity_state_notify_on_state_change (exec_ctx, &t->channel_callback.state_tracker, op->connectivity_state, op->on_connectivity_state_change); - } - - if (op->send_goaway) - { - t->global.sent_goaway = 1; - grpc_chttp2_goaway_append (t->global.last_incoming_stream_id, (gpr_uint32) grpc_chttp2_grpc_status_to_http2_error (op->goaway_status), gpr_slice_ref (*op->goaway_message), &t->global.qbuf); - close_transport = !grpc_chttp2_has_streams (t); - } - - if (op->set_accept_stream != NULL) - { - t->channel_callback.accept_stream = op->set_accept_stream; - t->channel_callback.accept_stream_user_data = op->set_accept_stream_user_data; - } - - if (op->bind_pollset) - { - add_to_pollset_locked (exec_ctx, t, op->bind_pollset); - } - - if (op->bind_pollset_set) - { - add_to_pollset_set_locked (exec_ctx, t, op->bind_pollset_set); - } - - if (op->send_ping) - { - send_ping_locked (t, op->send_ping); - } - - if (op->disconnect) - { - close_transport_locked (exec_ctx, t); - } - - unlock (exec_ctx, t); - - if (close_transport) - { - lock (t); - close_transport_locked (exec_ctx, t); - unlock (exec_ctx, t); - } + lock(t); + + grpc_exec_ctx_enqueue(exec_ctx, op->on_consumed, 1); + + if (op->on_connectivity_state_change) { + grpc_connectivity_state_notify_on_state_change( + exec_ctx, &t->channel_callback.state_tracker, op->connectivity_state, + op->on_connectivity_state_change); + } + + if (op->send_goaway) { + t->global.sent_goaway = 1; + grpc_chttp2_goaway_append( + t->global.last_incoming_stream_id, + (gpr_uint32)grpc_chttp2_grpc_status_to_http2_error(op->goaway_status), + gpr_slice_ref(*op->goaway_message), &t->global.qbuf); + close_transport = !grpc_chttp2_has_streams(t); + } + + if (op->set_accept_stream != NULL) { + t->channel_callback.accept_stream = op->set_accept_stream; + t->channel_callback.accept_stream_user_data = + op->set_accept_stream_user_data; + } + + if (op->bind_pollset) { + add_to_pollset_locked(exec_ctx, t, op->bind_pollset); + } + + if (op->bind_pollset_set) { + add_to_pollset_set_locked(exec_ctx, t, op->bind_pollset_set); + } + + if (op->send_ping) { + send_ping_locked(t, op->send_ping); + } + + if (op->disconnect) { + close_transport_locked(exec_ctx, t); + } + + unlock(exec_ctx, t); + + if (close_transport) { + lock(t); + close_transport_locked(exec_ctx, t); + unlock(exec_ctx, t); + } } /* * INPUT PROCESSING */ -static grpc_stream_state -compute_state (gpr_uint8 write_closed, gpr_uint8 read_closed) -{ - if (write_closed && read_closed) - return GRPC_STREAM_CLOSED; - if (write_closed) - return GRPC_STREAM_SEND_CLOSED; - if (read_closed) - return GRPC_STREAM_RECV_CLOSED; +static grpc_stream_state compute_state(gpr_uint8 write_closed, + gpr_uint8 read_closed) { + if (write_closed && read_closed) return GRPC_STREAM_CLOSED; + if (write_closed) return GRPC_STREAM_SEND_CLOSED; + if (read_closed) return GRPC_STREAM_RECV_CLOSED; return GRPC_STREAM_OPEN; } -static void -remove_stream (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, gpr_uint32 id) -{ +static void remove_stream(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, + gpr_uint32 id) { size_t new_stream_count; - grpc_chttp2_stream *s = grpc_chttp2_stream_map_delete (&t->parsing_stream_map, id); - if (!s) - { - s = grpc_chttp2_stream_map_delete (&t->new_stream_map, id); - } - grpc_chttp2_list_remove_writable_stream (&t->global, &s->global); - GPR_ASSERT (s); + grpc_chttp2_stream *s = + grpc_chttp2_stream_map_delete(&t->parsing_stream_map, id); + if (!s) { + s = grpc_chttp2_stream_map_delete(&t->new_stream_map, id); + } + grpc_chttp2_list_remove_writable_stream(&t->global, &s->global); + GPR_ASSERT(s); s->global.in_stream_map = 0; - if (t->parsing.incoming_stream == &s->parsing) - { - t->parsing.incoming_stream = NULL; - grpc_chttp2_parsing_become_skip_parser (&t->parsing); - } - if (grpc_chttp2_unregister_stream (t, s) && t->global.sent_goaway) - { - close_transport_locked (exec_ctx, t); - } - - new_stream_count = grpc_chttp2_stream_map_size (&t->parsing_stream_map) + grpc_chttp2_stream_map_size (&t->new_stream_map); - GPR_ASSERT (new_stream_count <= GPR_UINT32_MAX); - if (new_stream_count != t->global.concurrent_stream_count) - { - t->global.concurrent_stream_count = (gpr_uint32) new_stream_count; - maybe_start_some_streams (exec_ctx, &t->global); - } + if (t->parsing.incoming_stream == &s->parsing) { + t->parsing.incoming_stream = NULL; + grpc_chttp2_parsing_become_skip_parser(&t->parsing); + } + if (grpc_chttp2_unregister_stream(t, s) && t->global.sent_goaway) { + close_transport_locked(exec_ctx, t); + } + + new_stream_count = grpc_chttp2_stream_map_size(&t->parsing_stream_map) + + grpc_chttp2_stream_map_size(&t->new_stream_map); + GPR_ASSERT(new_stream_count <= GPR_UINT32_MAX); + if (new_stream_count != t->global.concurrent_stream_count) { + t->global.concurrent_stream_count = (gpr_uint32)new_stream_count; + maybe_start_some_streams(exec_ctx, &t->global); + } } -static void -unlock_check_read_write_state (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) -{ +static void unlock_check_read_write_state(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport *t) { grpc_chttp2_transport_global *transport_global = &t->global; grpc_chttp2_stream_global *stream_global; grpc_stream_state state; - if (!t->parsing_active) - { - /* if a stream is in the stream map, and gets cancelled, we need to ensure - we are not parsing before continuing the cancellation to keep things in - a sane state */ - while (grpc_chttp2_list_pop_closed_waiting_for_parsing (transport_global, &stream_global)) - { - GPR_ASSERT (stream_global->in_stream_map); - GPR_ASSERT (stream_global->write_state != GRPC_WRITE_STATE_OPEN); - GPR_ASSERT (stream_global->read_closed); - remove_stream (exec_ctx, t, stream_global->id); - grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); - } + if (!t->parsing_active) { + /* if a stream is in the stream map, and gets cancelled, we need to ensure + we are not parsing before continuing the cancellation to keep things in + a sane state */ + while (grpc_chttp2_list_pop_closed_waiting_for_parsing(transport_global, + &stream_global)) { + GPR_ASSERT(stream_global->in_stream_map); + GPR_ASSERT(stream_global->write_state != GRPC_WRITE_STATE_OPEN); + GPR_ASSERT(stream_global->read_closed); + remove_stream(exec_ctx, t, stream_global->id); + grpc_chttp2_list_add_read_write_state_changed(transport_global, + stream_global); } + } - if (!t->writing_active) - { - while (grpc_chttp2_list_pop_cancelled_waiting_for_writing (transport_global, &stream_global)) - { - grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); - } + if (!t->writing_active) { + while (grpc_chttp2_list_pop_cancelled_waiting_for_writing(transport_global, + &stream_global)) { + grpc_chttp2_list_add_read_write_state_changed(transport_global, + stream_global); } - - while (grpc_chttp2_list_pop_read_write_state_changed (transport_global, &stream_global)) - { - if (stream_global->cancelled) - { - if (t->writing_active && stream_global->write_state != GRPC_WRITE_STATE_SENT_CLOSE) - { - grpc_chttp2_list_add_cancelled_waiting_for_writing (transport_global, stream_global); - } - else - { - stream_global->write_state = GRPC_WRITE_STATE_SENT_CLOSE; - if (stream_global->outgoing_sopb != NULL) - { - grpc_sopb_reset (stream_global->outgoing_sopb); - stream_global->outgoing_sopb = NULL; - grpc_exec_ctx_enqueue (exec_ctx, stream_global->send_done_closure, 1); - } - stream_global->read_closed = 1; - if (!stream_global->published_cancelled) - { - char buffer[GPR_LTOA_MIN_BUFSIZE]; - gpr_ltoa (stream_global->cancelled_status, buffer); - grpc_chttp2_incoming_metadata_buffer_add (&stream_global->incoming_metadata, grpc_mdelem_from_strings (t->metadata_context, "grpc-status", buffer)); - grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into (&stream_global->incoming_metadata, &stream_global->incoming_sopb); - stream_global->published_cancelled = 1; - } - } - } - if (stream_global->write_state == GRPC_WRITE_STATE_SENT_CLOSE && stream_global->read_closed && stream_global->in_stream_map) - { - if (t->parsing_active) - { - grpc_chttp2_list_add_closed_waiting_for_parsing (transport_global, stream_global); - } - else - { - remove_stream (exec_ctx, t, stream_global->id); - } - } - if (!stream_global->publish_sopb) - { - continue; - } - if (stream_global->writing_now != 0) - { - continue; - } - /* FIXME(ctiller): we include in_stream_map in our computation of - whether the stream is write-closed. This is completely bogus, - but has the effect of delaying stream-closed until the stream - is indeed evicted from the stream map, making it safe to delete. - To fix this will require having an edge after stream-closed - indicating that the stream is closed AND safe to delete. */ - state = compute_state (stream_global->write_state == GRPC_WRITE_STATE_SENT_CLOSE && !stream_global->in_stream_map, stream_global->read_closed); - if (stream_global->incoming_sopb.nops == 0 && state == stream_global->published_state) - { - continue; - } - grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op (&stream_global->incoming_metadata, &stream_global->incoming_sopb, &stream_global->outstanding_metadata); - grpc_sopb_swap (stream_global->publish_sopb, &stream_global->incoming_sopb); - stream_global->published_state = *stream_global->publish_state = state; - grpc_exec_ctx_enqueue (exec_ctx, stream_global->recv_done_closure, 1); - stream_global->recv_done_closure = NULL; - stream_global->publish_sopb = NULL; - stream_global->publish_state = NULL; + } + + while (grpc_chttp2_list_pop_read_write_state_changed(transport_global, + &stream_global)) { + if (stream_global->cancelled) { + if (t->writing_active && + stream_global->write_state != GRPC_WRITE_STATE_SENT_CLOSE) { + grpc_chttp2_list_add_cancelled_waiting_for_writing(transport_global, + stream_global); + } else { + stream_global->write_state = GRPC_WRITE_STATE_SENT_CLOSE; + if (stream_global->outgoing_sopb != NULL) { + grpc_sopb_reset(stream_global->outgoing_sopb); + stream_global->outgoing_sopb = NULL; + grpc_exec_ctx_enqueue(exec_ctx, stream_global->send_done_closure, 1); + } + stream_global->read_closed = 1; + if (!stream_global->published_cancelled) { + char buffer[GPR_LTOA_MIN_BUFSIZE]; + gpr_ltoa(stream_global->cancelled_status, buffer); + grpc_chttp2_incoming_metadata_buffer_add( + &stream_global->incoming_metadata, + grpc_mdelem_from_strings(t->metadata_context, "grpc-status", + buffer)); + grpc_chttp2_incoming_metadata_buffer_place_metadata_batch_into( + &stream_global->incoming_metadata, &stream_global->incoming_sopb); + stream_global->published_cancelled = 1; + } + } + } + if (stream_global->write_state == GRPC_WRITE_STATE_SENT_CLOSE && + stream_global->read_closed && stream_global->in_stream_map) { + if (t->parsing_active) { + grpc_chttp2_list_add_closed_waiting_for_parsing(transport_global, + stream_global); + } else { + remove_stream(exec_ctx, t, stream_global->id); + } + } + if (!stream_global->publish_sopb) { + continue; } + if (stream_global->writing_now != 0) { + continue; + } + /* FIXME(ctiller): we include in_stream_map in our computation of + whether the stream is write-closed. This is completely bogus, + but has the effect of delaying stream-closed until the stream + is indeed evicted from the stream map, making it safe to delete. + To fix this will require having an edge after stream-closed + indicating that the stream is closed AND safe to delete. */ + state = compute_state( + stream_global->write_state == GRPC_WRITE_STATE_SENT_CLOSE && + !stream_global->in_stream_map, + stream_global->read_closed); + if (stream_global->incoming_sopb.nops == 0 && + state == stream_global->published_state) { + continue; + } + grpc_chttp2_incoming_metadata_buffer_postprocess_sopb_and_begin_live_op( + &stream_global->incoming_metadata, &stream_global->incoming_sopb, + &stream_global->outstanding_metadata); + grpc_sopb_swap(stream_global->publish_sopb, &stream_global->incoming_sopb); + stream_global->published_state = *stream_global->publish_state = state; + grpc_exec_ctx_enqueue(exec_ctx, stream_global->recv_done_closure, 1); + stream_global->recv_done_closure = NULL; + stream_global->publish_sopb = NULL; + stream_global->publish_state = NULL; + } } -static void -cancel_from_api (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_status_code status) -{ +static void cancel_from_api(grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global, + grpc_status_code status) { stream_global->cancelled = 1; stream_global->cancelled_status = status; - if (stream_global->id != 0) - { - gpr_slice_buffer_add (&transport_global->qbuf, grpc_chttp2_rst_stream_create (stream_global->id, (gpr_uint32) grpc_chttp2_grpc_status_to_http2_error (status))); - } - grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); + if (stream_global->id != 0) { + gpr_slice_buffer_add( + &transport_global->qbuf, + grpc_chttp2_rst_stream_create( + stream_global->id, + (gpr_uint32)grpc_chttp2_grpc_status_to_http2_error(status))); + } + grpc_chttp2_list_add_read_write_state_changed(transport_global, + stream_global); } -static void -close_from_api (grpc_chttp2_transport_global * transport_global, grpc_chttp2_stream_global * stream_global, grpc_status_code status, gpr_slice * optional_message) -{ +static void close_from_api(grpc_chttp2_transport_global *transport_global, + grpc_chttp2_stream_global *stream_global, + grpc_status_code status, + gpr_slice *optional_message) { gpr_slice hdr; gpr_slice status_hdr; gpr_slice message_pfx; gpr_uint8 *p; gpr_uint32 len = 0; - GPR_ASSERT (status >= 0 && (int) status < 100); + GPR_ASSERT(status >= 0 && (int)status < 100); stream_global->cancelled = 1; stream_global->cancelled_status = status; - GPR_ASSERT (stream_global->id != 0); - GPR_ASSERT (!stream_global->written_anything); + GPR_ASSERT(stream_global->id != 0); + GPR_ASSERT(!stream_global->written_anything); /* Hand roll a header block. This is unnecessarily ugly - at some point we should find a more elegant @@ -977,10 +974,10 @@ close_from_api (grpc_chttp2_transport_global * transport_global, grpc_chttp2_str It's complicated by the fact that our send machinery would be dead by the time we got around to sending this, so instead we ignore HPACK compression and just write the uncompressed bytes onto the wire. */ - status_hdr = gpr_slice_malloc (15 + (status >= 10)); - p = GPR_SLICE_START_PTR (status_hdr); - *p++ = 0x40; /* literal header */ - *p++ = 11; /* len(grpc-status) */ + status_hdr = gpr_slice_malloc(15 + (status >= 10)); + p = GPR_SLICE_START_PTR(status_hdr); + *p++ = 0x40; /* literal header */ + *p++ = 11; /* len(grpc-status) */ *p++ = 'g'; *p++ = 'r'; *p++ = 'p'; @@ -992,94 +989,87 @@ close_from_api (grpc_chttp2_transport_global * transport_global, grpc_chttp2_str *p++ = 't'; *p++ = 'u'; *p++ = 's'; - if (status < 10) - { - *p++ = 1; - *p++ = (gpr_uint8) ('0' + status); - } - else - { - *p++ = 2; - *p++ = (gpr_uint8) ('0' + (status / 10)); - *p++ = (gpr_uint8) ('0' + (status % 10)); - } - GPR_ASSERT (p == GPR_SLICE_END_PTR (status_hdr)); - len += (gpr_uint32) GPR_SLICE_LENGTH (status_hdr); - - if (optional_message) - { - GPR_ASSERT (GPR_SLICE_LENGTH (*optional_message) < 127); - message_pfx = gpr_slice_malloc (15); - p = GPR_SLICE_START_PTR (message_pfx); - *p++ = 0x40; - *p++ = 12; /* len(grpc-message) */ - *p++ = 'g'; - *p++ = 'r'; - *p++ = 'p'; - *p++ = 'c'; - *p++ = '-'; - *p++ = 'm'; - *p++ = 'e'; - *p++ = 's'; - *p++ = 's'; - *p++ = 'a'; - *p++ = 'g'; - *p++ = 'e'; - *p++ = (gpr_uint8) GPR_SLICE_LENGTH (*optional_message); - GPR_ASSERT (p == GPR_SLICE_END_PTR (message_pfx)); - len += (gpr_uint32) GPR_SLICE_LENGTH (message_pfx); - len += (gpr_uint32) GPR_SLICE_LENGTH (*optional_message); - } - - hdr = gpr_slice_malloc (9); - p = GPR_SLICE_START_PTR (hdr); - *p++ = (gpr_uint8) (len >> 16); - *p++ = (gpr_uint8) (len >> 8); - *p++ = (gpr_uint8) (len); + if (status < 10) { + *p++ = 1; + *p++ = (gpr_uint8)('0' + status); + } else { + *p++ = 2; + *p++ = (gpr_uint8)('0' + (status / 10)); + *p++ = (gpr_uint8)('0' + (status % 10)); + } + GPR_ASSERT(p == GPR_SLICE_END_PTR(status_hdr)); + len += (gpr_uint32)GPR_SLICE_LENGTH(status_hdr); + + if (optional_message) { + GPR_ASSERT(GPR_SLICE_LENGTH(*optional_message) < 127); + message_pfx = gpr_slice_malloc(15); + p = GPR_SLICE_START_PTR(message_pfx); + *p++ = 0x40; + *p++ = 12; /* len(grpc-message) */ + *p++ = 'g'; + *p++ = 'r'; + *p++ = 'p'; + *p++ = 'c'; + *p++ = '-'; + *p++ = 'm'; + *p++ = 'e'; + *p++ = 's'; + *p++ = 's'; + *p++ = 'a'; + *p++ = 'g'; + *p++ = 'e'; + *p++ = (gpr_uint8)GPR_SLICE_LENGTH(*optional_message); + GPR_ASSERT(p == GPR_SLICE_END_PTR(message_pfx)); + len += (gpr_uint32)GPR_SLICE_LENGTH(message_pfx); + len += (gpr_uint32)GPR_SLICE_LENGTH(*optional_message); + } + + hdr = gpr_slice_malloc(9); + p = GPR_SLICE_START_PTR(hdr); + *p++ = (gpr_uint8)(len >> 16); + *p++ = (gpr_uint8)(len >> 8); + *p++ = (gpr_uint8)(len); *p++ = GRPC_CHTTP2_FRAME_HEADER; *p++ = GRPC_CHTTP2_DATA_FLAG_END_STREAM | GRPC_CHTTP2_DATA_FLAG_END_HEADERS; - *p++ = (gpr_uint8) (stream_global->id >> 24); - *p++ = (gpr_uint8) (stream_global->id >> 16); - *p++ = (gpr_uint8) (stream_global->id >> 8); - *p++ = (gpr_uint8) (stream_global->id); - GPR_ASSERT (p == GPR_SLICE_END_PTR (hdr)); - - gpr_slice_buffer_add (&transport_global->qbuf, hdr); - gpr_slice_buffer_add (&transport_global->qbuf, status_hdr); - if (optional_message) - { - gpr_slice_buffer_add (&transport_global->qbuf, message_pfx); - gpr_slice_buffer_add (&transport_global->qbuf, gpr_slice_ref (*optional_message)); - } - - gpr_slice_buffer_add (&transport_global->qbuf, grpc_chttp2_rst_stream_create (stream_global->id, GRPC_CHTTP2_NO_ERROR)); - - grpc_chttp2_list_add_read_write_state_changed (transport_global, stream_global); + *p++ = (gpr_uint8)(stream_global->id >> 24); + *p++ = (gpr_uint8)(stream_global->id >> 16); + *p++ = (gpr_uint8)(stream_global->id >> 8); + *p++ = (gpr_uint8)(stream_global->id); + GPR_ASSERT(p == GPR_SLICE_END_PTR(hdr)); + + gpr_slice_buffer_add(&transport_global->qbuf, hdr); + gpr_slice_buffer_add(&transport_global->qbuf, status_hdr); + if (optional_message) { + gpr_slice_buffer_add(&transport_global->qbuf, message_pfx); + gpr_slice_buffer_add(&transport_global->qbuf, + gpr_slice_ref(*optional_message)); + } + + gpr_slice_buffer_add( + &transport_global->qbuf, + grpc_chttp2_rst_stream_create(stream_global->id, GRPC_CHTTP2_NO_ERROR)); + + grpc_chttp2_list_add_read_write_state_changed(transport_global, + stream_global); } -static void -cancel_stream_cb (grpc_chttp2_transport_global * transport_global, void *user_data, grpc_chttp2_stream_global * stream_global) -{ - cancel_from_api (transport_global, stream_global, GRPC_STATUS_UNAVAILABLE); +static void cancel_stream_cb(grpc_chttp2_transport_global *transport_global, + void *user_data, + grpc_chttp2_stream_global *stream_global) { + cancel_from_api(transport_global, stream_global, GRPC_STATUS_UNAVAILABLE); } -static void -end_all_the_calls (grpc_chttp2_transport * t) -{ - grpc_chttp2_for_all_streams (&t->global, NULL, cancel_stream_cb); +static void end_all_the_calls(grpc_chttp2_transport *t) { + grpc_chttp2_for_all_streams(&t->global, NULL, cancel_stream_cb); } -static void -drop_connection (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) -{ - close_transport_locked (exec_ctx, t); - end_all_the_calls (t); +static void drop_connection(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t) { + close_transport_locked(exec_ctx, t); + end_all_the_calls(t); } /** update window from a settings change */ -static void -update_global_window (void *args, gpr_uint32 id, void *stream) -{ +static void update_global_window(void *args, gpr_uint32 id, void *stream) { grpc_chttp2_transport *t = args; grpc_chttp2_stream *s = stream; grpc_chttp2_transport_global *transport_global = &t->global; @@ -1087,184 +1077,179 @@ update_global_window (void *args, gpr_uint32 id, void *stream) int was_zero; int is_zero; - GRPC_CHTTP2_FLOWCTL_TRACE_STREAM ("settings", transport_global, stream_global, outgoing_window, t->parsing.initial_window_update); + GRPC_CHTTP2_FLOWCTL_TRACE_STREAM("settings", transport_global, stream_global, + outgoing_window, + t->parsing.initial_window_update); was_zero = stream_global->outgoing_window <= 0; stream_global->outgoing_window += t->parsing.initial_window_update; is_zero = stream_global->outgoing_window <= 0; - if (was_zero && !is_zero) - { - grpc_chttp2_list_add_writable_stream (transport_global, stream_global); - } + if (was_zero && !is_zero) { + grpc_chttp2_list_add_writable_stream(transport_global, stream_global); + } } -static void -read_error_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t) -{ +static void read_error_locked(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport *t) { t->endpoint_reading = 0; - if (!t->writing_active && t->ep) - { - destroy_endpoint (exec_ctx, t); - } + if (!t->writing_active && t->ep) { + destroy_endpoint(exec_ctx, t); + } } /* tcp read callback */ -static void -recv_data (grpc_exec_ctx * exec_ctx, void *tp, int success) -{ +static void recv_data(grpc_exec_ctx *exec_ctx, void *tp, int success) { size_t i; int keep_reading = 0; grpc_chttp2_transport *t = tp; - lock (t); + lock(t); i = 0; - GPR_ASSERT (!t->parsing_active); - if (!t->closed) - { - t->parsing_active = 1; - /* merge stream lists */ - grpc_chttp2_stream_map_move_into (&t->new_stream_map, &t->parsing_stream_map); - grpc_chttp2_prepare_to_read (&t->global, &t->parsing); - gpr_mu_unlock (&t->mu); - for (; i < t->read_buffer.count && grpc_chttp2_perform_read (exec_ctx, &t->parsing, t->read_buffer.slices[i]); i++) - ; - gpr_mu_lock (&t->mu); - if (i != t->read_buffer.count) - { - drop_connection (exec_ctx, t); - } - /* merge stream lists */ - grpc_chttp2_stream_map_move_into (&t->new_stream_map, &t->parsing_stream_map); - t->global.concurrent_stream_count = (gpr_uint32) grpc_chttp2_stream_map_size (&t->parsing_stream_map); - if (t->parsing.initial_window_update != 0) - { - grpc_chttp2_stream_map_for_each (&t->parsing_stream_map, update_global_window, t); - t->parsing.initial_window_update = 0; - } - /* handle higher level things */ - grpc_chttp2_publish_reads (exec_ctx, &t->global, &t->parsing); - t->parsing_active = 0; - } - if (!success || i != t->read_buffer.count) - { - drop_connection (exec_ctx, t); - read_error_locked (exec_ctx, t); - } - else if (!t->closed) - { - keep_reading = 1; - REF_TRANSPORT (t, "keep_reading"); - prevent_endpoint_shutdown (t); - } - gpr_slice_buffer_reset_and_unref (&t->read_buffer); - unlock (exec_ctx, t); - - if (keep_reading) - { - grpc_endpoint_read (exec_ctx, t->ep, &t->read_buffer, &t->recv_data); - allow_endpoint_shutdown_unlocked (exec_ctx, t); - UNREF_TRANSPORT (exec_ctx, t, "keep_reading"); + GPR_ASSERT(!t->parsing_active); + if (!t->closed) { + t->parsing_active = 1; + /* merge stream lists */ + grpc_chttp2_stream_map_move_into(&t->new_stream_map, + &t->parsing_stream_map); + grpc_chttp2_prepare_to_read(&t->global, &t->parsing); + gpr_mu_unlock(&t->mu); + for (; i < t->read_buffer.count && + grpc_chttp2_perform_read(exec_ctx, &t->parsing, + t->read_buffer.slices[i]); + i++) + ; + gpr_mu_lock(&t->mu); + if (i != t->read_buffer.count) { + drop_connection(exec_ctx, t); } - else - { - UNREF_TRANSPORT (exec_ctx, t, "recv_data"); + /* merge stream lists */ + grpc_chttp2_stream_map_move_into(&t->new_stream_map, + &t->parsing_stream_map); + t->global.concurrent_stream_count = + (gpr_uint32)grpc_chttp2_stream_map_size(&t->parsing_stream_map); + if (t->parsing.initial_window_update != 0) { + grpc_chttp2_stream_map_for_each(&t->parsing_stream_map, + update_global_window, t); + t->parsing.initial_window_update = 0; } + /* handle higher level things */ + grpc_chttp2_publish_reads(exec_ctx, &t->global, &t->parsing); + t->parsing_active = 0; + } + if (!success || i != t->read_buffer.count) { + drop_connection(exec_ctx, t); + read_error_locked(exec_ctx, t); + } else if (!t->closed) { + keep_reading = 1; + REF_TRANSPORT(t, "keep_reading"); + prevent_endpoint_shutdown(t); + } + gpr_slice_buffer_reset_and_unref(&t->read_buffer); + unlock(exec_ctx, t); + + if (keep_reading) { + grpc_endpoint_read(exec_ctx, t->ep, &t->read_buffer, &t->recv_data); + allow_endpoint_shutdown_unlocked(exec_ctx, t); + UNREF_TRANSPORT(exec_ctx, t, "keep_reading"); + } else { + UNREF_TRANSPORT(exec_ctx, t, "recv_data"); + } } /* * CALLBACK LOOP */ -static void -connectivity_state_set (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport_global * transport_global, grpc_connectivity_state state, const char *reason) -{ - GRPC_CHTTP2_IF_TRACING (gpr_log (GPR_DEBUG, "set connectivity_state=%d", state)); - grpc_connectivity_state_set (exec_ctx,&TRANSPORT_FROM_GLOBAL ( transport_global)->channel_callback.state_tracker, state, reason); +static void connectivity_state_set( + grpc_exec_ctx *exec_ctx, grpc_chttp2_transport_global *transport_global, + grpc_connectivity_state state, const char *reason) { + GRPC_CHTTP2_IF_TRACING( + gpr_log(GPR_DEBUG, "set connectivity_state=%d", state)); + grpc_connectivity_state_set(exec_ctx, &TRANSPORT_FROM_GLOBAL(transport_global) + ->channel_callback.state_tracker, + state, reason); } /* * POLLSET STUFF */ -static void -add_to_pollset_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, grpc_pollset * pollset) -{ - if (t->ep) - { - grpc_endpoint_add_to_pollset (exec_ctx, t->ep, pollset); - } +static void add_to_pollset_locked(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport *t, + grpc_pollset *pollset) { + if (t->ep) { + grpc_endpoint_add_to_pollset(exec_ctx, t->ep, pollset); + } } -static void -add_to_pollset_set_locked (grpc_exec_ctx * exec_ctx, grpc_chttp2_transport * t, grpc_pollset_set * pollset_set) -{ - if (t->ep) - { - grpc_endpoint_add_to_pollset_set (exec_ctx, t->ep, pollset_set); - } +static void add_to_pollset_set_locked(grpc_exec_ctx *exec_ctx, + grpc_chttp2_transport *t, + grpc_pollset_set *pollset_set) { + if (t->ep) { + grpc_endpoint_add_to_pollset_set(exec_ctx, t->ep, pollset_set); + } } /* * TRACING */ -void -grpc_chttp2_flowctl_trace (const char *file, int line, const char *reason, const char *context, const char *var, int is_client, gpr_uint32 stream_id, gpr_int64 current_value, gpr_int64 delta) -{ +void grpc_chttp2_flowctl_trace(const char *file, int line, const char *reason, + const char *context, const char *var, + int is_client, gpr_uint32 stream_id, + gpr_int64 current_value, gpr_int64 delta) { char *identifier; char *context_scope; char *context_thread; - char *underscore_pos = strchr (context, '_'); - GPR_ASSERT (underscore_pos); - context_thread = gpr_strdup (underscore_pos + 1); - context_scope = gpr_strdup (context); + char *underscore_pos = strchr(context, '_'); + GPR_ASSERT(underscore_pos); + context_thread = gpr_strdup(underscore_pos + 1); + context_scope = gpr_strdup(context); context_scope[underscore_pos - context] = 0; - if (stream_id) - { - gpr_asprintf (&identifier, "%s[%d]", context_scope, stream_id); - } - else - { - identifier = gpr_strdup (context_scope); - } - gpr_log (GPR_INFO, "FLOWCTL: %s %-10s %8s %-27s %8lld %c %8lld = %8lld %-10s [%s:%d]", is_client ? "client" : "server", identifier, context_thread, var, current_value, delta < 0 ? '-' : '+', delta < 0 ? -delta : delta, current_value + delta, reason, file, line); - gpr_free (identifier); - gpr_free (context_thread); - gpr_free (context_scope); + if (stream_id) { + gpr_asprintf(&identifier, "%s[%d]", context_scope, stream_id); + } else { + identifier = gpr_strdup(context_scope); + } + gpr_log(GPR_INFO, + "FLOWCTL: %s %-10s %8s %-27s %8lld %c %8lld = %8lld %-10s [%s:%d]", + is_client ? "client" : "server", identifier, context_thread, var, + current_value, delta < 0 ? '-' : '+', delta < 0 ? -delta : delta, + current_value + delta, reason, file, line); + gpr_free(identifier); + gpr_free(context_thread); + gpr_free(context_scope); } /* * INTEGRATION GLUE */ -static char * -chttp2_get_peer (grpc_exec_ctx * exec_ctx, grpc_transport * t) -{ - return gpr_strdup (((grpc_chttp2_transport *) t)->peer_string); +static char *chttp2_get_peer(grpc_exec_ctx *exec_ctx, grpc_transport *t) { + return gpr_strdup(((grpc_chttp2_transport *)t)->peer_string); } -static const grpc_transport_vtable vtable = { sizeof (grpc_chttp2_stream), - init_stream, - perform_stream_op, - perform_transport_op, - destroy_stream, - destroy_transport, - chttp2_get_peer -}; - -grpc_transport * -grpc_create_chttp2_transport (grpc_exec_ctx * exec_ctx, const grpc_channel_args * channel_args, grpc_endpoint * ep, grpc_mdctx * mdctx, int is_client) -{ - grpc_chttp2_transport *t = gpr_malloc (sizeof (grpc_chttp2_transport)); - init_transport (exec_ctx, t, channel_args, ep, mdctx, is_client != 0); +static const grpc_transport_vtable vtable = {sizeof(grpc_chttp2_stream), + init_stream, + perform_stream_op, + perform_transport_op, + destroy_stream, + destroy_transport, + chttp2_get_peer}; + +grpc_transport *grpc_create_chttp2_transport( + grpc_exec_ctx *exec_ctx, const grpc_channel_args *channel_args, + grpc_endpoint *ep, grpc_mdctx *mdctx, int is_client) { + grpc_chttp2_transport *t = gpr_malloc(sizeof(grpc_chttp2_transport)); + init_transport(exec_ctx, t, channel_args, ep, mdctx, is_client != 0); return &t->base; } -void -grpc_chttp2_transport_start_reading (grpc_exec_ctx * exec_ctx, grpc_transport * transport, gpr_slice * slices, size_t nslices) -{ - grpc_chttp2_transport *t = (grpc_chttp2_transport *) transport; - REF_TRANSPORT (t, "recv_data"); /* matches unref inside recv_data */ - gpr_slice_buffer_addn (&t->read_buffer, slices, nslices); - recv_data (exec_ctx, t, 1); +void grpc_chttp2_transport_start_reading(grpc_exec_ctx *exec_ctx, + grpc_transport *transport, + gpr_slice *slices, size_t nslices) { + grpc_chttp2_transport *t = (grpc_chttp2_transport *)transport; + REF_TRANSPORT(t, "recv_data"); /* matches unref inside recv_data */ + gpr_slice_buffer_addn(&t->read_buffer, slices, nslices); + recv_data(exec_ctx, t, 1); } diff --git a/src/core/transport/chttp2_transport.h b/src/core/transport/chttp2_transport.h index fe2f78a5eae..fce2b680fd9 100644 --- a/src/core/transport/chttp2_transport.h +++ b/src/core/transport/chttp2_transport.h @@ -40,8 +40,12 @@ extern int grpc_http_trace; extern int grpc_flowctl_trace; -grpc_transport *grpc_create_chttp2_transport (grpc_exec_ctx * exec_ctx, const grpc_channel_args * channel_args, grpc_endpoint * ep, grpc_mdctx * metadata_context, int is_client); +grpc_transport *grpc_create_chttp2_transport( + grpc_exec_ctx *exec_ctx, const grpc_channel_args *channel_args, + grpc_endpoint *ep, grpc_mdctx *metadata_context, int is_client); -void grpc_chttp2_transport_start_reading (grpc_exec_ctx * exec_ctx, grpc_transport * transport, gpr_slice * slices, size_t nslices); +void grpc_chttp2_transport_start_reading(grpc_exec_ctx *exec_ctx, + grpc_transport *transport, + gpr_slice *slices, size_t nslices); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_TRANSPORT_H */ diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c index fc39515f91a..a53fecc1985 100644 --- a/src/core/transport/connectivity_state.c +++ b/src/core/transport/connectivity_state.c @@ -41,11 +41,8 @@ int grpc_connectivity_state_trace = 0; -const char * -grpc_connectivity_state_name (grpc_connectivity_state state) -{ - switch (state) - { +const char *grpc_connectivity_state_name(grpc_connectivity_state state) { + switch (state) { case GRPC_CHANNEL_IDLE: return "IDLE"; case GRPC_CHANNEL_CONNECTING: @@ -56,95 +53,87 @@ grpc_connectivity_state_name (grpc_connectivity_state state) return "TRANSIENT_FAILURE"; case GRPC_CHANNEL_FATAL_FAILURE: return "FATAL_FAILURE"; - } - abort (); + } + abort(); return "UNKNOWN"; } -void -grpc_connectivity_state_init (grpc_connectivity_state_tracker * tracker, grpc_connectivity_state init_state, const char *name) -{ +void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, + grpc_connectivity_state init_state, + const char *name) { tracker->current_state = init_state; tracker->watchers = NULL; - tracker->name = gpr_strdup (name); + 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_exec_ctx *exec_ctx, + grpc_connectivity_state_tracker *tracker) { int success; grpc_connectivity_state_watcher *w; - while ((w = tracker->watchers)) - { - tracker->watchers = w->next; + while ((w = tracker->watchers)) { + tracker->watchers = w->next; - if (GRPC_CHANNEL_FATAL_FAILURE != *w->current) - { - *w->current = GRPC_CHANNEL_FATAL_FAILURE; - success = 1; - } - else - { - success = 0; - } - grpc_exec_ctx_enqueue (exec_ctx, w->notify, success); - gpr_free (w); + if (GRPC_CHANNEL_FATAL_FAILURE != *w->current) { + *w->current = GRPC_CHANNEL_FATAL_FAILURE; + success = 1; + } else { + success = 0; } - gpr_free (tracker->name); + grpc_exec_ctx_enqueue(exec_ctx, w->notify, success); + gpr_free(w); + } + gpr_free(tracker->name); } -grpc_connectivity_state -grpc_connectivity_state_check (grpc_connectivity_state_tracker * tracker) -{ - if (grpc_connectivity_state_trace) - { - gpr_log (GPR_DEBUG, "CONWATCH: %s: get %s", tracker->name, grpc_connectivity_state_name (tracker->current_state)); - } +grpc_connectivity_state grpc_connectivity_state_check( + grpc_connectivity_state_tracker *tracker) { + if (grpc_connectivity_state_trace) { + gpr_log(GPR_DEBUG, "CONWATCH: %s: get %s", tracker->name, + grpc_connectivity_state_name(tracker->current_state)); + } return tracker->current_state; } -int -grpc_connectivity_state_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_connectivity_state_tracker * tracker, grpc_connectivity_state * current, grpc_closure * notify) -{ - if (grpc_connectivity_state_trace) - { - gpr_log (GPR_DEBUG, "CONWATCH: %s: from %s [cur=%s] notify=%p", tracker->name, grpc_connectivity_state_name (*current), grpc_connectivity_state_name (tracker->current_state), notify); - } - if (tracker->current_state != *current) - { - *current = tracker->current_state; - grpc_exec_ctx_enqueue (exec_ctx, notify, 1); - } - else - { - grpc_connectivity_state_watcher *w = gpr_malloc (sizeof (*w)); - w->current = current; - w->notify = notify; - w->next = tracker->watchers; - tracker->watchers = w; - } +int grpc_connectivity_state_notify_on_state_change( + grpc_exec_ctx *exec_ctx, grpc_connectivity_state_tracker *tracker, + grpc_connectivity_state *current, grpc_closure *notify) { + if (grpc_connectivity_state_trace) { + gpr_log(GPR_DEBUG, "CONWATCH: %s: from %s [cur=%s] notify=%p", + tracker->name, grpc_connectivity_state_name(*current), + grpc_connectivity_state_name(tracker->current_state), notify); + } + if (tracker->current_state != *current) { + *current = tracker->current_state; + grpc_exec_ctx_enqueue(exec_ctx, notify, 1); + } else { + grpc_connectivity_state_watcher *w = gpr_malloc(sizeof(*w)); + w->current = current; + w->notify = notify; + w->next = tracker->watchers; + tracker->watchers = w; + } return tracker->current_state == GRPC_CHANNEL_IDLE; } -void -grpc_connectivity_state_set (grpc_exec_ctx * exec_ctx, grpc_connectivity_state_tracker * tracker, grpc_connectivity_state state, const char *reason) -{ +void grpc_connectivity_state_set(grpc_exec_ctx *exec_ctx, + grpc_connectivity_state_tracker *tracker, + grpc_connectivity_state state, + const char *reason) { grpc_connectivity_state_watcher *w; - if (grpc_connectivity_state_trace) - { - gpr_log (GPR_DEBUG, "SET: %s: %s --> %s [%s]", tracker->name, grpc_connectivity_state_name (tracker->current_state), grpc_connectivity_state_name (state), reason); - } - if (tracker->current_state == state) - { - return; - } - GPR_ASSERT (tracker->current_state != GRPC_CHANNEL_FATAL_FAILURE); + if (grpc_connectivity_state_trace) { + gpr_log(GPR_DEBUG, "SET: %s: %s --> %s [%s]", tracker->name, + grpc_connectivity_state_name(tracker->current_state), + grpc_connectivity_state_name(state), reason); + } + if (tracker->current_state == state) { + return; + } + GPR_ASSERT(tracker->current_state != GRPC_CHANNEL_FATAL_FAILURE); tracker->current_state = state; - while ((w = tracker->watchers) != NULL) - { - *w->current = tracker->current_state; - tracker->watchers = w->next; - grpc_exec_ctx_enqueue (exec_ctx, w->notify, 1); - gpr_free (w); - } + while ((w = tracker->watchers) != NULL) { + *w->current = tracker->current_state; + tracker->watchers = w->next; + grpc_exec_ctx_enqueue(exec_ctx, w->notify, 1); + gpr_free(w); + } } diff --git a/src/core/transport/connectivity_state.h b/src/core/transport/connectivity_state.h index 38742834fbe..8b6b0554cd4 100644 --- a/src/core/transport/connectivity_state.h +++ b/src/core/transport/connectivity_state.h @@ -37,8 +37,7 @@ #include #include "src/core/iomgr/exec_ctx.h" -typedef struct grpc_connectivity_state_watcher -{ +typedef struct grpc_connectivity_state_watcher { /** we keep watchers in a linked list */ struct grpc_connectivity_state_watcher *next; /** closure to notify on change */ @@ -47,8 +46,7 @@ typedef struct grpc_connectivity_state_watcher grpc_connectivity_state *current; } grpc_connectivity_state_watcher; -typedef struct -{ +typedef struct { /** current connectivity state */ grpc_connectivity_state current_state; /** all our watchers */ @@ -59,16 +57,25 @@ typedef struct extern int grpc_connectivity_state_trace; -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_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); /** 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, grpc_connectivity_state state, const char *reason); +void grpc_connectivity_state_set(grpc_exec_ctx *exec_ctx, + grpc_connectivity_state_tracker *tracker, + grpc_connectivity_state state, + const char *reason); -grpc_connectivity_state grpc_connectivity_state_check (grpc_connectivity_state_tracker * tracker); +grpc_connectivity_state grpc_connectivity_state_check( + grpc_connectivity_state_tracker *tracker); /** Return 1 if the channel should start connecting, 0 otherwise */ -int grpc_connectivity_state_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_connectivity_state_tracker * tracker, grpc_connectivity_state * current, grpc_closure * notify); +int grpc_connectivity_state_notify_on_state_change( + grpc_exec_ctx *exec_ctx, grpc_connectivity_state_tracker *tracker, + grpc_connectivity_state *current, grpc_closure *notify); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_CONNECTIVITY_STATE_H */ diff --git a/src/core/transport/metadata.c b/src/core/transport/metadata.c index 0ce18712c30..9d135f43560 100644 --- a/src/core/transport/metadata.c +++ b/src/core/transport/metadata.c @@ -62,8 +62,7 @@ #define REF_MD_LOCKED(s) ref_md_locked((s)) #endif -typedef struct internal_string -{ +typedef struct internal_string { /* must be byte compatible with grpc_mdstr */ gpr_slice slice; gpr_uint32 hash; @@ -80,8 +79,7 @@ typedef struct internal_string struct internal_string *bucket_next; } internal_string; -typedef struct internal_metadata -{ +typedef struct internal_metadata { /* must be byte compatible with grpc_mdelem */ internal_string *key; internal_string *value; @@ -91,14 +89,13 @@ typedef struct internal_metadata /* private only data */ gpr_mu mu_user_data; void *user_data; - void (*destroy_user_data) (void *user_data); + void (*destroy_user_data)(void *user_data); grpc_mdctx *context; struct internal_metadata *bucket_next; } internal_metadata; -struct grpc_mdctx -{ +struct grpc_mdctx { gpr_uint32 hash_seed; int refs; @@ -114,21 +111,15 @@ struct grpc_mdctx size_t mdtab_capacity; }; -static void internal_string_ref (internal_string * s DEBUG_ARGS); -static void internal_string_unref (internal_string * s DEBUG_ARGS); -static void discard_metadata (grpc_mdctx * ctx); -static void gc_mdtab (grpc_mdctx * ctx); -static void metadata_context_destroy_locked (grpc_mdctx * ctx); +static void internal_string_ref(internal_string *s DEBUG_ARGS); +static void internal_string_unref(internal_string *s DEBUG_ARGS); +static void discard_metadata(grpc_mdctx *ctx); +static void gc_mdtab(grpc_mdctx *ctx); +static void metadata_context_destroy_locked(grpc_mdctx *ctx); -static void -lock (grpc_mdctx * ctx) -{ - gpr_mu_lock (&ctx->mu); -} +static void lock(grpc_mdctx *ctx) { gpr_mu_lock(&ctx->mu); } -static void -unlock (grpc_mdctx * ctx) -{ +static void unlock(grpc_mdctx *ctx) { /* If the context has been orphaned we'd like to delete it soon. We check conditions in unlock as it signals the end of mutations on a context. @@ -141,52 +132,49 @@ unlock (grpc_mdctx * ctx) mdelems on every unlock (instead of the usual 'I'm too loaded' trigger case), since otherwise we can be stuck waiting for a garbage collection that will never happen. */ - if (ctx->refs == 0) - { + if (ctx->refs == 0) { /* uncomment if you're having trouble diagnosing an mdelem leak to make things clearer (slows down destruction a lot, however) */ #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gc_mdtab (ctx); + gc_mdtab(ctx); #endif - if (ctx->mdtab_count && ctx->mdtab_count == ctx->mdtab_free) - { - discard_metadata (ctx); - } - if (ctx->strtab_count == 0) - { - metadata_context_destroy_locked (ctx); - return; - } + if (ctx->mdtab_count && ctx->mdtab_count == ctx->mdtab_free) { + discard_metadata(ctx); + } + if (ctx->strtab_count == 0) { + metadata_context_destroy_locked(ctx); + return; } - gpr_mu_unlock (&ctx->mu); + } + gpr_mu_unlock(&ctx->mu); } -static void -ref_md_locked (internal_metadata * md DEBUG_ARGS) -{ +static void ref_md_locked(internal_metadata *md DEBUG_ARGS) { #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "ELM REF:%p:%d->%d: '%s' = '%s'", md, gpr_atm_no_barrier_load (&md->refcnt), gpr_atm_no_barrier_load (&md->refcnt) + 1, grpc_mdstr_as_c_string ((grpc_mdstr *) md->key), grpc_mdstr_as_c_string ((grpc_mdstr *) md->value)); + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, + "ELM REF:%p:%d->%d: '%s' = '%s'", md, + gpr_atm_no_barrier_load(&md->refcnt), + gpr_atm_no_barrier_load(&md->refcnt) + 1, + grpc_mdstr_as_c_string((grpc_mdstr *)md->key), + grpc_mdstr_as_c_string((grpc_mdstr *)md->value)); #endif - if (0 == gpr_atm_no_barrier_fetch_add (&md->refcnt, 1)) - { - md->context->mdtab_free--; - } + if (0 == gpr_atm_no_barrier_fetch_add(&md->refcnt, 1)) { + md->context->mdtab_free--; + } } -grpc_mdctx * -grpc_mdctx_create_with_seed (gpr_uint32 seed) -{ - grpc_mdctx *ctx = gpr_malloc (sizeof (grpc_mdctx)); +grpc_mdctx *grpc_mdctx_create_with_seed(gpr_uint32 seed) { + grpc_mdctx *ctx = gpr_malloc(sizeof(grpc_mdctx)); ctx->refs = 1; ctx->hash_seed = seed; - gpr_mu_init (&ctx->mu); - ctx->strtab = gpr_malloc (sizeof (internal_string *) * INITIAL_STRTAB_CAPACITY); - memset (ctx->strtab, 0, sizeof (grpc_mdstr *) * INITIAL_STRTAB_CAPACITY); + gpr_mu_init(&ctx->mu); + ctx->strtab = gpr_malloc(sizeof(internal_string *) * INITIAL_STRTAB_CAPACITY); + memset(ctx->strtab, 0, sizeof(grpc_mdstr *) * INITIAL_STRTAB_CAPACITY); ctx->strtab_count = 0; ctx->strtab_capacity = INITIAL_STRTAB_CAPACITY; - ctx->mdtab = gpr_malloc (sizeof (internal_metadata *) * INITIAL_MDTAB_CAPACITY); - memset (ctx->mdtab, 0, sizeof (grpc_mdelem *) * INITIAL_MDTAB_CAPACITY); + ctx->mdtab = gpr_malloc(sizeof(internal_metadata *) * INITIAL_MDTAB_CAPACITY); + memset(ctx->mdtab, 0, sizeof(grpc_mdelem *) * INITIAL_MDTAB_CAPACITY); ctx->mdtab_count = 0; ctx->mdtab_capacity = INITIAL_MDTAB_CAPACITY; ctx->mdtab_free = 0; @@ -194,258 +182,218 @@ grpc_mdctx_create_with_seed (gpr_uint32 seed) return ctx; } -grpc_mdctx * -grpc_mdctx_create (void) -{ +grpc_mdctx *grpc_mdctx_create(void) { /* This seed is used to prevent remote connections from controlling hash table * collisions. It needs to be somewhat unpredictable to a remote connection. */ - return grpc_mdctx_create_with_seed ((gpr_uint32) gpr_now (GPR_CLOCK_REALTIME).tv_nsec); + return grpc_mdctx_create_with_seed( + (gpr_uint32)gpr_now(GPR_CLOCK_REALTIME).tv_nsec); } -static void -discard_metadata (grpc_mdctx * ctx) -{ +static void discard_metadata(grpc_mdctx *ctx) { size_t i; internal_metadata *next, *cur; - for (i = 0; i < ctx->mdtab_capacity; i++) - { - cur = ctx->mdtab[i]; - while (cur) - { - GPR_ASSERT (gpr_atm_acq_load (&cur->refcnt) == 0); - next = cur->bucket_next; - INTERNAL_STRING_UNREF (cur->key); - INTERNAL_STRING_UNREF (cur->value); - if (cur->user_data) - { - cur->destroy_user_data (cur->user_data); - } - gpr_mu_destroy (&cur->mu_user_data); - gpr_free (cur); - cur = next; - ctx->mdtab_free--; - ctx->mdtab_count--; - } - ctx->mdtab[i] = NULL; + for (i = 0; i < ctx->mdtab_capacity; i++) { + cur = ctx->mdtab[i]; + while (cur) { + GPR_ASSERT(gpr_atm_acq_load(&cur->refcnt) == 0); + next = cur->bucket_next; + INTERNAL_STRING_UNREF(cur->key); + INTERNAL_STRING_UNREF(cur->value); + if (cur->user_data) { + cur->destroy_user_data(cur->user_data); + } + gpr_mu_destroy(&cur->mu_user_data); + gpr_free(cur); + cur = next; + ctx->mdtab_free--; + ctx->mdtab_count--; } + ctx->mdtab[i] = NULL; + } +} + +static void metadata_context_destroy_locked(grpc_mdctx *ctx) { + GPR_ASSERT(ctx->strtab_count == 0); + GPR_ASSERT(ctx->mdtab_count == 0); + GPR_ASSERT(ctx->mdtab_free == 0); + gpr_free(ctx->strtab); + gpr_free(ctx->mdtab); + gpr_mu_unlock(&ctx->mu); + gpr_mu_destroy(&ctx->mu); + gpr_free(ctx); } -static void -metadata_context_destroy_locked (grpc_mdctx * ctx) -{ - GPR_ASSERT (ctx->strtab_count == 0); - GPR_ASSERT (ctx->mdtab_count == 0); - GPR_ASSERT (ctx->mdtab_free == 0); - gpr_free (ctx->strtab); - gpr_free (ctx->mdtab); - gpr_mu_unlock (&ctx->mu); - gpr_mu_destroy (&ctx->mu); - gpr_free (ctx); -} - -void -grpc_mdctx_ref (grpc_mdctx * ctx) -{ - lock (ctx); - GPR_ASSERT (ctx->refs > 0); +void grpc_mdctx_ref(grpc_mdctx *ctx) { + lock(ctx); + GPR_ASSERT(ctx->refs > 0); ctx->refs++; - unlock (ctx); + unlock(ctx); } -void -grpc_mdctx_unref (grpc_mdctx * ctx) -{ - lock (ctx); - GPR_ASSERT (ctx->refs > 0); +void grpc_mdctx_unref(grpc_mdctx *ctx) { + lock(ctx); + GPR_ASSERT(ctx->refs > 0); ctx->refs--; - unlock (ctx); + unlock(ctx); } -static void -grow_strtab (grpc_mdctx * ctx) -{ +static void grow_strtab(grpc_mdctx *ctx) { size_t capacity = ctx->strtab_capacity * 2; size_t i; - internal_string **strtab = gpr_malloc (sizeof (internal_string *) * capacity); + internal_string **strtab = gpr_malloc(sizeof(internal_string *) * capacity); internal_string *s, *next; - memset (strtab, 0, sizeof (internal_string *) * capacity); - - for (i = 0; i < ctx->strtab_capacity; i++) - { - for (s = ctx->strtab[i]; s; s = next) - { - next = s->bucket_next; - s->bucket_next = strtab[s->hash % capacity]; - strtab[s->hash % capacity] = s; - } + memset(strtab, 0, sizeof(internal_string *) * capacity); + + for (i = 0; i < ctx->strtab_capacity; i++) { + for (s = ctx->strtab[i]; s; s = next) { + next = s->bucket_next; + s->bucket_next = strtab[s->hash % capacity]; + strtab[s->hash % capacity] = s; } + } - gpr_free (ctx->strtab); + gpr_free(ctx->strtab); ctx->strtab = strtab; ctx->strtab_capacity = capacity; } -static void -internal_destroy_string (internal_string * is) -{ +static void internal_destroy_string(internal_string *is) { internal_string **prev_next; internal_string *cur; grpc_mdctx *ctx = is->context; - if (is->has_base64_and_huffman_encoded) - { - gpr_slice_unref (is->base64_and_huffman); - } - for (prev_next = &ctx->strtab[is->hash % ctx->strtab_capacity], cur = *prev_next; cur != is; prev_next = &cur->bucket_next, cur = cur->bucket_next) + if (is->has_base64_and_huffman_encoded) { + gpr_slice_unref(is->base64_and_huffman); + } + for (prev_next = &ctx->strtab[is->hash % ctx->strtab_capacity], + cur = *prev_next; + cur != is; prev_next = &cur->bucket_next, cur = cur->bucket_next) ; *prev_next = cur->bucket_next; ctx->strtab_count--; - gpr_free (is); + gpr_free(is); } -static void -internal_string_ref (internal_string * s DEBUG_ARGS) -{ +static void internal_string_ref(internal_string *s DEBUG_ARGS) { #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "STR REF:%p:%d->%d: '%s'", s, s->refs, s->refs + 1, grpc_mdstr_as_c_string ((grpc_mdstr *) s)); + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "STR REF:%p:%d->%d: '%s'", s, + s->refs, s->refs + 1, grpc_mdstr_as_c_string((grpc_mdstr *)s)); #endif ++s->refs; } -static void -internal_string_unref (internal_string * s DEBUG_ARGS) -{ +static void internal_string_unref(internal_string *s DEBUG_ARGS) { #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "STR UNREF:%p:%d->%d: '%s'", s, s->refs, s->refs - 1, grpc_mdstr_as_c_string ((grpc_mdstr *) s)); + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "STR UNREF:%p:%d->%d: '%s'", s, + s->refs, s->refs - 1, grpc_mdstr_as_c_string((grpc_mdstr *)s)); #endif - GPR_ASSERT (s->refs > 0); - if (0 == --s->refs) - { - internal_destroy_string (s); - } + GPR_ASSERT(s->refs > 0); + if (0 == --s->refs) { + internal_destroy_string(s); + } } -static void -slice_ref (void *p) -{ - internal_string *is = (internal_string *) ((char *) p - offsetof (internal_string, refcount)); +static void slice_ref(void *p) { + internal_string *is = + (internal_string *)((char *)p - offsetof(internal_string, refcount)); grpc_mdctx *ctx = is->context; - lock (ctx); - INTERNAL_STRING_REF (is); - unlock (ctx); + lock(ctx); + INTERNAL_STRING_REF(is); + unlock(ctx); } -static void -slice_unref (void *p) -{ - internal_string *is = (internal_string *) ((char *) p - offsetof (internal_string, refcount)); +static void slice_unref(void *p) { + internal_string *is = + (internal_string *)((char *)p - offsetof(internal_string, refcount)); grpc_mdctx *ctx = is->context; - lock (ctx); - INTERNAL_STRING_UNREF (is); - unlock (ctx); -} - -grpc_mdstr * -grpc_mdstr_from_string (grpc_mdctx * ctx, const char *str, int canonicalize_key) -{ - if (canonicalize_key) - { - size_t len; - size_t i; - int canonical = 1; - - for (i = 0; str[i]; i++) - { - if (str[i] >= 'A' && str[i] <= 'Z') - { - canonical = 0; - /* Keep going in loop just to get string length */ - } - } - len = i; - - if (canonical) - { - return grpc_mdstr_from_buffer (ctx, (const gpr_uint8 *) str, len); - } - else - { - char *copy = gpr_malloc (len); - grpc_mdstr *ret; - for (i = 0; i < len; i++) - { - if (str[i] >= 'A' && str[i] <= 'Z') - { - copy[i] = (char) (str[i] - 'A' + 'a'); - } - else - { - copy[i] = str[i]; - } - } - ret = grpc_mdstr_from_buffer (ctx, (const gpr_uint8 *) copy, len); - gpr_free (copy); - return ret; - } + lock(ctx); + INTERNAL_STRING_UNREF(is); + unlock(ctx); +} + +grpc_mdstr *grpc_mdstr_from_string(grpc_mdctx *ctx, const char *str, + int canonicalize_key) { + if (canonicalize_key) { + size_t len; + size_t i; + int canonical = 1; + + for (i = 0; str[i]; i++) { + if (str[i] >= 'A' && str[i] <= 'Z') { + canonical = 0; + /* Keep going in loop just to get string length */ + } } - return grpc_mdstr_from_buffer (ctx, (const gpr_uint8 *) str, strlen (str)); + len = i; + + if (canonical) { + return grpc_mdstr_from_buffer(ctx, (const gpr_uint8 *)str, len); + } else { + char *copy = gpr_malloc(len); + grpc_mdstr *ret; + for (i = 0; i < len; i++) { + if (str[i] >= 'A' && str[i] <= 'Z') { + copy[i] = (char)(str[i] - 'A' + 'a'); + } else { + copy[i] = str[i]; + } + } + ret = grpc_mdstr_from_buffer(ctx, (const gpr_uint8 *)copy, len); + gpr_free(copy); + return ret; + } + } + return grpc_mdstr_from_buffer(ctx, (const gpr_uint8 *)str, strlen(str)); } -grpc_mdstr * -grpc_mdstr_from_slice (grpc_mdctx * ctx, gpr_slice slice) -{ - grpc_mdstr *result = grpc_mdstr_from_buffer (ctx, GPR_SLICE_START_PTR (slice), - GPR_SLICE_LENGTH (slice)); - gpr_slice_unref (slice); +grpc_mdstr *grpc_mdstr_from_slice(grpc_mdctx *ctx, gpr_slice slice) { + grpc_mdstr *result = grpc_mdstr_from_buffer(ctx, GPR_SLICE_START_PTR(slice), + GPR_SLICE_LENGTH(slice)); + gpr_slice_unref(slice); return result; } -grpc_mdstr * -grpc_mdstr_from_buffer (grpc_mdctx * ctx, const gpr_uint8 * buf, size_t length) -{ - gpr_uint32 hash = gpr_murmur_hash3 (buf, length, ctx->hash_seed); +grpc_mdstr *grpc_mdstr_from_buffer(grpc_mdctx *ctx, const gpr_uint8 *buf, + size_t length) { + gpr_uint32 hash = gpr_murmur_hash3(buf, length, ctx->hash_seed); internal_string *s; - lock (ctx); + lock(ctx); /* search for an existing string */ - for (s = ctx->strtab[hash % ctx->strtab_capacity]; s; s = s->bucket_next) - { - if (s->hash == hash && GPR_SLICE_LENGTH (s->slice) == length && 0 == memcmp (buf, GPR_SLICE_START_PTR (s->slice), length)) - { - INTERNAL_STRING_REF (s); - unlock (ctx); - return (grpc_mdstr *) s; - } + for (s = ctx->strtab[hash % ctx->strtab_capacity]; s; s = s->bucket_next) { + if (s->hash == hash && GPR_SLICE_LENGTH(s->slice) == length && + 0 == memcmp(buf, GPR_SLICE_START_PTR(s->slice), length)) { + INTERNAL_STRING_REF(s); + unlock(ctx); + return (grpc_mdstr *)s; } + } /* not found: create a new string */ - if (length + 1 < GPR_SLICE_INLINED_SIZE) - { - /* string data goes directly into the slice */ - s = gpr_malloc (sizeof (internal_string)); - s->refs = 1; - s->slice.refcount = NULL; - memcpy (s->slice.data.inlined.bytes, buf, length); - s->slice.data.inlined.bytes[length] = 0; - s->slice.data.inlined.length = (gpr_uint8) length; - } - else - { - /* string data goes after the internal_string header, and we +1 for null - terminator */ - s = gpr_malloc (sizeof (internal_string) + length + 1); - s->refs = 1; - s->refcount.ref = slice_ref; - s->refcount.unref = slice_unref; - s->slice.refcount = &s->refcount; - s->slice.data.refcounted.bytes = (gpr_uint8 *) (s + 1); - s->slice.data.refcounted.length = length; - memcpy (s->slice.data.refcounted.bytes, buf, length); - /* add a null terminator for cheap c string conversion when desired */ - s->slice.data.refcounted.bytes[length] = 0; - } + if (length + 1 < GPR_SLICE_INLINED_SIZE) { + /* string data goes directly into the slice */ + s = gpr_malloc(sizeof(internal_string)); + s->refs = 1; + s->slice.refcount = NULL; + memcpy(s->slice.data.inlined.bytes, buf, length); + s->slice.data.inlined.bytes[length] = 0; + s->slice.data.inlined.length = (gpr_uint8)length; + } else { + /* string data goes after the internal_string header, and we +1 for null + terminator */ + s = gpr_malloc(sizeof(internal_string) + length + 1); + s->refs = 1; + s->refcount.ref = slice_ref; + s->refcount.unref = slice_unref; + s->slice.refcount = &s->refcount; + s->slice.data.refcounted.bytes = (gpr_uint8 *)(s + 1); + s->slice.data.refcounted.length = length; + memcpy(s->slice.data.refcounted.bytes, buf, length); + /* add a null terminator for cheap c string conversion when desired */ + s->slice.data.refcounted.bytes[length] = 0; + } s->has_base64_and_huffman_encoded = 0; s->hash = hash; s->context = ctx; @@ -454,357 +402,316 @@ grpc_mdstr_from_buffer (grpc_mdctx * ctx, const gpr_uint8 * buf, size_t length) ctx->strtab_count++; - if (ctx->strtab_count > ctx->strtab_capacity * 2) - { - grow_strtab (ctx); - } + if (ctx->strtab_count > ctx->strtab_capacity * 2) { + grow_strtab(ctx); + } - unlock (ctx); + unlock(ctx); - return (grpc_mdstr *) s; + return (grpc_mdstr *)s; } -static void -gc_mdtab (grpc_mdctx * ctx) -{ +static void gc_mdtab(grpc_mdctx *ctx) { size_t i; internal_metadata **prev_next; internal_metadata *md, *next; - for (i = 0; i < ctx->mdtab_capacity; i++) - { - prev_next = &ctx->mdtab[i]; - for (md = ctx->mdtab[i]; md; md = next) - { - next = md->bucket_next; - if (gpr_atm_acq_load (&md->refcnt) == 0) - { - INTERNAL_STRING_UNREF (md->key); - INTERNAL_STRING_UNREF (md->value); - if (md->user_data) - { - md->destroy_user_data (md->user_data); - } - gpr_free (md); - *prev_next = next; - ctx->mdtab_free--; - ctx->mdtab_count--; - } - else - { - prev_next = &md->bucket_next; - } - } + for (i = 0; i < ctx->mdtab_capacity; i++) { + prev_next = &ctx->mdtab[i]; + for (md = ctx->mdtab[i]; md; md = next) { + next = md->bucket_next; + if (gpr_atm_acq_load(&md->refcnt) == 0) { + INTERNAL_STRING_UNREF(md->key); + INTERNAL_STRING_UNREF(md->value); + if (md->user_data) { + md->destroy_user_data(md->user_data); + } + gpr_free(md); + *prev_next = next; + ctx->mdtab_free--; + ctx->mdtab_count--; + } else { + prev_next = &md->bucket_next; + } } + } - GPR_ASSERT (ctx->mdtab_free == 0); + GPR_ASSERT(ctx->mdtab_free == 0); } -static void -grow_mdtab (grpc_mdctx * ctx) -{ +static void grow_mdtab(grpc_mdctx *ctx) { size_t capacity = ctx->mdtab_capacity * 2; size_t i; - internal_metadata **mdtab = gpr_malloc (sizeof (internal_metadata *) * capacity); + internal_metadata **mdtab = + gpr_malloc(sizeof(internal_metadata *) * capacity); internal_metadata *md, *next; gpr_uint32 hash; - memset (mdtab, 0, sizeof (internal_metadata *) * capacity); - - for (i = 0; i < ctx->mdtab_capacity; i++) - { - for (md = ctx->mdtab[i]; md; md = next) - { - hash = GRPC_MDSTR_KV_HASH (md->key->hash, md->value->hash); - next = md->bucket_next; - md->bucket_next = mdtab[hash % capacity]; - mdtab[hash % capacity] = md; - } + memset(mdtab, 0, sizeof(internal_metadata *) * capacity); + + for (i = 0; i < ctx->mdtab_capacity; i++) { + for (md = ctx->mdtab[i]; md; md = next) { + hash = GRPC_MDSTR_KV_HASH(md->key->hash, md->value->hash); + next = md->bucket_next; + md->bucket_next = mdtab[hash % capacity]; + mdtab[hash % capacity] = md; } + } - gpr_free (ctx->mdtab); + gpr_free(ctx->mdtab); ctx->mdtab = mdtab; ctx->mdtab_capacity = capacity; } -static void -rehash_mdtab (grpc_mdctx * ctx) -{ - if (ctx->mdtab_free > ctx->mdtab_capacity / 4) - { - gc_mdtab (ctx); - } - else - { - grow_mdtab (ctx); - } +static void rehash_mdtab(grpc_mdctx *ctx) { + if (ctx->mdtab_free > ctx->mdtab_capacity / 4) { + gc_mdtab(ctx); + } else { + grow_mdtab(ctx); + } } -grpc_mdelem * -grpc_mdelem_from_metadata_strings (grpc_mdctx * ctx, grpc_mdstr * mkey, grpc_mdstr * mvalue) -{ - internal_string *key = (internal_string *) mkey; - internal_string *value = (internal_string *) mvalue; - gpr_uint32 hash = GRPC_MDSTR_KV_HASH (mkey->hash, mvalue->hash); +grpc_mdelem *grpc_mdelem_from_metadata_strings(grpc_mdctx *ctx, + grpc_mdstr *mkey, + grpc_mdstr *mvalue) { + internal_string *key = (internal_string *)mkey; + internal_string *value = (internal_string *)mvalue; + gpr_uint32 hash = GRPC_MDSTR_KV_HASH(mkey->hash, mvalue->hash); internal_metadata *md; - GPR_ASSERT (key->context == ctx); - GPR_ASSERT (value->context == ctx); + GPR_ASSERT(key->context == ctx); + GPR_ASSERT(value->context == ctx); - lock (ctx); + lock(ctx); /* search for an existing pair */ - for (md = ctx->mdtab[hash % ctx->mdtab_capacity]; md; md = md->bucket_next) - { - if (md->key == key && md->value == value) - { - REF_MD_LOCKED (md); - INTERNAL_STRING_UNREF (key); - INTERNAL_STRING_UNREF (value); - unlock (ctx); - return (grpc_mdelem *) md; - } + for (md = ctx->mdtab[hash % ctx->mdtab_capacity]; md; md = md->bucket_next) { + if (md->key == key && md->value == value) { + REF_MD_LOCKED(md); + INTERNAL_STRING_UNREF(key); + INTERNAL_STRING_UNREF(value); + unlock(ctx); + return (grpc_mdelem *)md; } + } /* not found: create a new pair */ - md = gpr_malloc (sizeof (internal_metadata)); - gpr_atm_rel_store (&md->refcnt, 1); + md = gpr_malloc(sizeof(internal_metadata)); + gpr_atm_rel_store(&md->refcnt, 1); md->context = ctx; md->key = key; md->value = value; md->user_data = NULL; md->destroy_user_data = NULL; md->bucket_next = ctx->mdtab[hash % ctx->mdtab_capacity]; - gpr_mu_init (&md->mu_user_data); + gpr_mu_init(&md->mu_user_data); #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gpr_log (GPR_DEBUG, "ELM NEW:%p:%d: '%s' = '%s'", md, gpr_atm_no_barrier_load (&md->refcnt), grpc_mdstr_as_c_string ((grpc_mdstr *) md->key), grpc_mdstr_as_c_string ((grpc_mdstr *) md->value)); + gpr_log(GPR_DEBUG, "ELM NEW:%p:%d: '%s' = '%s'", md, + gpr_atm_no_barrier_load(&md->refcnt), + grpc_mdstr_as_c_string((grpc_mdstr *)md->key), + grpc_mdstr_as_c_string((grpc_mdstr *)md->value)); #endif ctx->mdtab[hash % ctx->mdtab_capacity] = md; ctx->mdtab_count++; - if (ctx->mdtab_count > ctx->mdtab_capacity * 2) - { - rehash_mdtab (ctx); - } + if (ctx->mdtab_count > ctx->mdtab_capacity * 2) { + rehash_mdtab(ctx); + } - unlock (ctx); + unlock(ctx); - return (grpc_mdelem *) md; + return (grpc_mdelem *)md; } -grpc_mdelem * -grpc_mdelem_from_strings (grpc_mdctx * ctx, const char *key, const char *value) -{ - return grpc_mdelem_from_metadata_strings (ctx, grpc_mdstr_from_string (ctx, key, 0), grpc_mdstr_from_string (ctx, value, 0)); +grpc_mdelem *grpc_mdelem_from_strings(grpc_mdctx *ctx, const char *key, + const char *value) { + return grpc_mdelem_from_metadata_strings( + ctx, grpc_mdstr_from_string(ctx, key, 0), + grpc_mdstr_from_string(ctx, value, 0)); } -grpc_mdelem * -grpc_mdelem_from_slices (grpc_mdctx * ctx, gpr_slice key, gpr_slice value) -{ - return grpc_mdelem_from_metadata_strings (ctx, grpc_mdstr_from_slice (ctx, key), grpc_mdstr_from_slice (ctx, value)); +grpc_mdelem *grpc_mdelem_from_slices(grpc_mdctx *ctx, gpr_slice key, + gpr_slice value) { + return grpc_mdelem_from_metadata_strings(ctx, grpc_mdstr_from_slice(ctx, key), + grpc_mdstr_from_slice(ctx, value)); } -grpc_mdelem * -grpc_mdelem_from_string_and_buffer (grpc_mdctx * ctx, const char *key, const gpr_uint8 * value, size_t value_length, int canonicalize_key) -{ - return grpc_mdelem_from_metadata_strings (ctx, grpc_mdstr_from_string (ctx, key, canonicalize_key), grpc_mdstr_from_buffer (ctx, value, value_length)); +grpc_mdelem *grpc_mdelem_from_string_and_buffer(grpc_mdctx *ctx, + const char *key, + const gpr_uint8 *value, + size_t value_length, + int canonicalize_key) { + return grpc_mdelem_from_metadata_strings( + ctx, grpc_mdstr_from_string(ctx, key, canonicalize_key), + grpc_mdstr_from_buffer(ctx, value, value_length)); } -grpc_mdelem * -grpc_mdelem_ref (grpc_mdelem * gmd DEBUG_ARGS) -{ - internal_metadata *md = (internal_metadata *) gmd; +grpc_mdelem *grpc_mdelem_ref(grpc_mdelem *gmd DEBUG_ARGS) { + internal_metadata *md = (internal_metadata *)gmd; #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "ELM REF:%p:%d->%d: '%s' = '%s'", md, gpr_atm_no_barrier_load (&md->refcnt), gpr_atm_no_barrier_load (&md->refcnt) + 1, grpc_mdstr_as_c_string ((grpc_mdstr *) md->key), grpc_mdstr_as_c_string ((grpc_mdstr *) md->value)); + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, + "ELM REF:%p:%d->%d: '%s' = '%s'", md, + gpr_atm_no_barrier_load(&md->refcnt), + gpr_atm_no_barrier_load(&md->refcnt) + 1, + grpc_mdstr_as_c_string((grpc_mdstr *)md->key), + grpc_mdstr_as_c_string((grpc_mdstr *)md->value)); #endif /* we can assume the ref count is >= 1 as the application is calling this function - meaning that no adjustment to mdtab_free is necessary, simplifying the logic here to be just an atomic increment */ /* use C assert to have this removed in opt builds */ - assert (gpr_atm_no_barrier_load (&md->refcnt) >= 1); - gpr_atm_no_barrier_fetch_add (&md->refcnt, 1); + assert(gpr_atm_no_barrier_load(&md->refcnt) >= 1); + gpr_atm_no_barrier_fetch_add(&md->refcnt, 1); return gmd; } -void -grpc_mdelem_unref (grpc_mdelem * gmd DEBUG_ARGS) -{ - internal_metadata *md = (internal_metadata *) gmd; +void grpc_mdelem_unref(grpc_mdelem *gmd DEBUG_ARGS) { + internal_metadata *md = (internal_metadata *)gmd; grpc_mdctx *ctx = md->context; - lock (ctx); + lock(ctx); #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "ELM UNREF:%p:%d->%d: '%s' = '%s'", md, gpr_atm_no_barrier_load (&md->refcnt), gpr_atm_no_barrier_load (&md->refcnt) - 1, grpc_mdstr_as_c_string ((grpc_mdstr *) md->key), grpc_mdstr_as_c_string ((grpc_mdstr *) md->value)); + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, + "ELM UNREF:%p:%d->%d: '%s' = '%s'", md, + gpr_atm_no_barrier_load(&md->refcnt), + gpr_atm_no_barrier_load(&md->refcnt) - 1, + grpc_mdstr_as_c_string((grpc_mdstr *)md->key), + grpc_mdstr_as_c_string((grpc_mdstr *)md->value)); #endif - assert (gpr_atm_no_barrier_load (&md->refcnt) >= 1); - if (1 == gpr_atm_full_fetch_add (&md->refcnt, -1)) - { - ctx->mdtab_free++; - } - unlock (ctx); + assert(gpr_atm_no_barrier_load(&md->refcnt) >= 1); + if (1 == gpr_atm_full_fetch_add(&md->refcnt, -1)) { + ctx->mdtab_free++; + } + unlock(ctx); } -const char * -grpc_mdstr_as_c_string (grpc_mdstr * s) -{ - return (const char *) GPR_SLICE_START_PTR (s->slice); +const char *grpc_mdstr_as_c_string(grpc_mdstr *s) { + return (const char *)GPR_SLICE_START_PTR(s->slice); } -grpc_mdstr * -grpc_mdstr_ref (grpc_mdstr * gs DEBUG_ARGS) -{ - internal_string *s = (internal_string *) gs; +grpc_mdstr *grpc_mdstr_ref(grpc_mdstr *gs DEBUG_ARGS) { + internal_string *s = (internal_string *)gs; grpc_mdctx *ctx = s->context; - lock (ctx); - internal_string_ref (s FWD_DEBUG_ARGS); - unlock (ctx); + lock(ctx); + internal_string_ref(s FWD_DEBUG_ARGS); + unlock(ctx); return gs; } -void -grpc_mdstr_unref (grpc_mdstr * gs DEBUG_ARGS) -{ - internal_string *s = (internal_string *) gs; +void grpc_mdstr_unref(grpc_mdstr *gs DEBUG_ARGS) { + internal_string *s = (internal_string *)gs; grpc_mdctx *ctx = s->context; - lock (ctx); - internal_string_unref (s FWD_DEBUG_ARGS); - unlock (ctx); + lock(ctx); + internal_string_unref(s FWD_DEBUG_ARGS); + unlock(ctx); } -size_t -grpc_mdctx_get_mdtab_capacity_test_only (grpc_mdctx * ctx) -{ +size_t grpc_mdctx_get_mdtab_capacity_test_only(grpc_mdctx *ctx) { return ctx->mdtab_capacity; } -size_t -grpc_mdctx_get_mdtab_count_test_only (grpc_mdctx * ctx) -{ +size_t grpc_mdctx_get_mdtab_count_test_only(grpc_mdctx *ctx) { return ctx->mdtab_count; } -size_t -grpc_mdctx_get_mdtab_free_test_only (grpc_mdctx * ctx) -{ +size_t grpc_mdctx_get_mdtab_free_test_only(grpc_mdctx *ctx) { return ctx->mdtab_free; } -void * -grpc_mdelem_get_user_data (grpc_mdelem * md, void (*if_destroy_func) (void *)) -{ - internal_metadata *im = (internal_metadata *) md; +void *grpc_mdelem_get_user_data(grpc_mdelem *md, + void (*if_destroy_func)(void *)) { + internal_metadata *im = (internal_metadata *)md; void *result; - gpr_mu_lock (&im->mu_user_data); + gpr_mu_lock(&im->mu_user_data); result = im->destroy_user_data == if_destroy_func ? im->user_data : NULL; - gpr_mu_unlock (&im->mu_user_data); + gpr_mu_unlock(&im->mu_user_data); return result; } -void -grpc_mdelem_set_user_data (grpc_mdelem * md, void (*destroy_func) (void *), void *user_data) -{ - internal_metadata *im = (internal_metadata *) md; - GPR_ASSERT ((user_data == NULL) == (destroy_func == NULL)); - gpr_mu_lock (&im->mu_user_data); - if (im->destroy_user_data) - { - /* user data can only be set once */ - gpr_mu_unlock (&im->mu_user_data); - if (destroy_func != NULL) - { - destroy_func (user_data); - } - return; +void grpc_mdelem_set_user_data(grpc_mdelem *md, void (*destroy_func)(void *), + void *user_data) { + internal_metadata *im = (internal_metadata *)md; + GPR_ASSERT((user_data == NULL) == (destroy_func == NULL)); + gpr_mu_lock(&im->mu_user_data); + if (im->destroy_user_data) { + /* user data can only be set once */ + gpr_mu_unlock(&im->mu_user_data); + if (destroy_func != NULL) { + destroy_func(user_data); } + return; + } im->destroy_user_data = destroy_func; im->user_data = user_data; - gpr_mu_unlock (&im->mu_user_data); + gpr_mu_unlock(&im->mu_user_data); } -gpr_slice -grpc_mdstr_as_base64_encoded_and_huffman_compressed (grpc_mdstr * gs) -{ - internal_string *s = (internal_string *) gs; +gpr_slice grpc_mdstr_as_base64_encoded_and_huffman_compressed(grpc_mdstr *gs) { + internal_string *s = (internal_string *)gs; gpr_slice slice; grpc_mdctx *ctx = s->context; - lock (ctx); - if (!s->has_base64_and_huffman_encoded) - { - s->base64_and_huffman = grpc_chttp2_base64_encode_and_huffman_compress (s->slice); - s->has_base64_and_huffman_encoded = 1; - } + lock(ctx); + if (!s->has_base64_and_huffman_encoded) { + s->base64_and_huffman = + grpc_chttp2_base64_encode_and_huffman_compress(s->slice); + s->has_base64_and_huffman_encoded = 1; + } slice = s->base64_and_huffman; - unlock (ctx); + unlock(ctx); return slice; } -void -grpc_mdctx_lock (grpc_mdctx * ctx) -{ - lock (ctx); -} +void grpc_mdctx_lock(grpc_mdctx *ctx) { lock(ctx); } -void -grpc_mdctx_locked_mdelem_unref (grpc_mdctx * ctx, grpc_mdelem * gmd DEBUG_ARGS) -{ - internal_metadata *md = (internal_metadata *) gmd; +void grpc_mdctx_locked_mdelem_unref(grpc_mdctx *ctx, + grpc_mdelem *gmd DEBUG_ARGS) { + internal_metadata *md = (internal_metadata *)gmd; grpc_mdctx *elem_ctx = md->context; - GPR_ASSERT (ctx == elem_ctx); + GPR_ASSERT(ctx == elem_ctx); #ifdef GRPC_METADATA_REFCOUNT_DEBUG - gpr_log (file, line, GPR_LOG_SEVERITY_DEBUG, "ELM UNREF:%p:%d->%d: '%s' = '%s'", md, gpr_atm_no_barrier_load (&md->refcnt), gpr_atm_no_barrier_load (&md->refcnt) - 1, grpc_mdstr_as_c_string ((grpc_mdstr *) md->key), grpc_mdstr_as_c_string ((grpc_mdstr *) md->value)); + gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, + "ELM UNREF:%p:%d->%d: '%s' = '%s'", md, + gpr_atm_no_barrier_load(&md->refcnt), + gpr_atm_no_barrier_load(&md->refcnt) - 1, + grpc_mdstr_as_c_string((grpc_mdstr *)md->key), + grpc_mdstr_as_c_string((grpc_mdstr *)md->value)); #endif - assert (gpr_atm_no_barrier_load (&md->refcnt) >= 1); - if (1 == gpr_atm_full_fetch_add (&md->refcnt, -1)) - { - ctx->mdtab_free++; - } -} - -void -grpc_mdctx_unlock (grpc_mdctx * ctx) -{ - unlock (ctx); -} - -static int -conforms_to (grpc_mdstr * s, const gpr_uint8 * legal_bits) -{ - const gpr_uint8 *p = GPR_SLICE_START_PTR (s->slice); - const gpr_uint8 *e = GPR_SLICE_END_PTR (s->slice); - for (; p != e; p++) - { - int idx = *p; - int byte = idx / 8; - int bit = idx % 8; - if ((legal_bits[byte] & (1 << bit)) == 0) - return 0; - } + assert(gpr_atm_no_barrier_load(&md->refcnt) >= 1); + if (1 == gpr_atm_full_fetch_add(&md->refcnt, -1)) { + ctx->mdtab_free++; + } +} + +void grpc_mdctx_unlock(grpc_mdctx *ctx) { unlock(ctx); } + +static int conforms_to(grpc_mdstr *s, const gpr_uint8 *legal_bits) { + const gpr_uint8 *p = GPR_SLICE_START_PTR(s->slice); + const gpr_uint8 *e = GPR_SLICE_END_PTR(s->slice); + for (; p != e; p++) { + int idx = *p; + int byte = idx / 8; + int bit = idx % 8; + if ((legal_bits[byte] & (1 << bit)) == 0) return 0; + } return 1; } -int -grpc_mdstr_is_legal_header (grpc_mdstr * s) -{ +int grpc_mdstr_is_legal_header(grpc_mdstr *s) { static const gpr_uint8 legal_header_bits[256 / 8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xff, 0x03, 0x00, 0x00, 0x00, - 0x80, 0xfe, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - }; - return conforms_to (s, legal_header_bits); + 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xff, 0x03, 0x00, 0x00, 0x00, + 0x80, 0xfe, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + return conforms_to(s, legal_header_bits); } -int -grpc_mdstr_is_legal_nonbin_header (grpc_mdstr * s) -{ +int grpc_mdstr_is_legal_nonbin_header(grpc_mdstr *s) { static const gpr_uint8 legal_header_bits[256 / 8] = { - 0x00, 0x00, 0x00, 0x00, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - }; - return conforms_to (s, legal_header_bits); + 0x00, 0x00, 0x00, 0x00, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + return conforms_to(s, legal_header_bits); } -int -grpc_mdstr_is_bin_suffixed (grpc_mdstr * s) -{ +int grpc_mdstr_is_bin_suffixed(grpc_mdstr *s) { /* TODO(ctiller): consider caching this */ - return grpc_is_binary_header ((const char *) GPR_SLICE_START_PTR (s->slice), GPR_SLICE_LENGTH (s->slice)); + return grpc_is_binary_header((const char *)GPR_SLICE_START_PTR(s->slice), + GPR_SLICE_LENGTH(s->slice)); } diff --git a/src/core/transport/metadata.h b/src/core/transport/metadata.h index 75d456eeb67..eb17747be74 100644 --- a/src/core/transport/metadata.h +++ b/src/core/transport/metadata.h @@ -67,8 +67,7 @@ typedef struct grpc_mdstr grpc_mdstr; typedef struct grpc_mdelem grpc_mdelem; /* if changing this, make identical changes in internal_string in metadata.c */ -struct grpc_mdstr -{ +struct grpc_mdstr { const gpr_slice slice; const gpr_uint32 hash; /* there is a private part to this in metadata.c */ @@ -76,48 +75,58 @@ struct grpc_mdstr /* if changing this, make identical changes in internal_metadata in metadata.c */ -struct grpc_mdelem -{ +struct grpc_mdelem { grpc_mdstr *const key; grpc_mdstr *const value; /* there is a private part to this in metadata.c */ }; /* Create/orphan a metadata context */ -grpc_mdctx *grpc_mdctx_create (void); -grpc_mdctx *grpc_mdctx_create_with_seed (gpr_uint32 seed); -void grpc_mdctx_ref (grpc_mdctx * mdctx); -void grpc_mdctx_unref (grpc_mdctx * mdctx); +grpc_mdctx *grpc_mdctx_create(void); +grpc_mdctx *grpc_mdctx_create_with_seed(gpr_uint32 seed); +void grpc_mdctx_ref(grpc_mdctx *mdctx); +void grpc_mdctx_unref(grpc_mdctx *mdctx); /* Test only accessors to internal state - only for testing this code - do not rely on it outside of metadata_test.c */ -size_t grpc_mdctx_get_mdtab_capacity_test_only (grpc_mdctx * mdctx); -size_t grpc_mdctx_get_mdtab_count_test_only (grpc_mdctx * mdctx); -size_t grpc_mdctx_get_mdtab_free_test_only (grpc_mdctx * mdctx); +size_t grpc_mdctx_get_mdtab_capacity_test_only(grpc_mdctx *mdctx); +size_t grpc_mdctx_get_mdtab_count_test_only(grpc_mdctx *mdctx); +size_t grpc_mdctx_get_mdtab_free_test_only(grpc_mdctx *mdctx); /* Constructors for grpc_mdstr instances; take a variety of data types that clients may have handy */ -grpc_mdstr *grpc_mdstr_from_string (grpc_mdctx * ctx, const char *str, int perform_key_canonicalization); +grpc_mdstr *grpc_mdstr_from_string(grpc_mdctx *ctx, const char *str, + int perform_key_canonicalization); /* Unrefs the slice. */ -grpc_mdstr *grpc_mdstr_from_slice (grpc_mdctx * ctx, gpr_slice slice); -grpc_mdstr *grpc_mdstr_from_buffer (grpc_mdctx * ctx, const gpr_uint8 * str, size_t length); +grpc_mdstr *grpc_mdstr_from_slice(grpc_mdctx *ctx, gpr_slice slice); +grpc_mdstr *grpc_mdstr_from_buffer(grpc_mdctx *ctx, const gpr_uint8 *str, + size_t length); /* Returns a borrowed slice from the mdstr with its contents base64 encoded and huffman compressed */ -gpr_slice grpc_mdstr_as_base64_encoded_and_huffman_compressed (grpc_mdstr * str); +gpr_slice grpc_mdstr_as_base64_encoded_and_huffman_compressed(grpc_mdstr *str); /* Constructors for grpc_mdelem instances; take a variety of data types that clients may have handy */ -grpc_mdelem *grpc_mdelem_from_metadata_strings (grpc_mdctx * ctx, grpc_mdstr * key, grpc_mdstr * value); -grpc_mdelem *grpc_mdelem_from_strings (grpc_mdctx * ctx, const char *key, const char *value); +grpc_mdelem *grpc_mdelem_from_metadata_strings(grpc_mdctx *ctx, grpc_mdstr *key, + grpc_mdstr *value); +grpc_mdelem *grpc_mdelem_from_strings(grpc_mdctx *ctx, const char *key, + const char *value); /* Unrefs the slices. */ -grpc_mdelem *grpc_mdelem_from_slices (grpc_mdctx * ctx, gpr_slice key, gpr_slice value); -grpc_mdelem *grpc_mdelem_from_string_and_buffer (grpc_mdctx * ctx, const char *key, const gpr_uint8 * value, size_t value_length, int canonicalize_key); +grpc_mdelem *grpc_mdelem_from_slices(grpc_mdctx *ctx, gpr_slice key, + gpr_slice value); +grpc_mdelem *grpc_mdelem_from_string_and_buffer(grpc_mdctx *ctx, + const char *key, + const gpr_uint8 *value, + size_t value_length, + int canonicalize_key); /* Mutator and accessor for grpc_mdelem user data. The destructor function is used as a type tag and is checked during user_data fetch. */ -void *grpc_mdelem_get_user_data (grpc_mdelem * md, void (*if_destroy_func) (void *)); -void grpc_mdelem_set_user_data (grpc_mdelem * md, void (*destroy_func) (void *), void *user_data); +void *grpc_mdelem_get_user_data(grpc_mdelem *md, + void (*if_destroy_func)(void *)); +void grpc_mdelem_set_user_data(grpc_mdelem *md, void (*destroy_func)(void *), + void *user_data); /* Reference counting */ #ifdef GRPC_METADATA_REFCOUNT_DEBUG @@ -125,28 +134,28 @@ void grpc_mdelem_set_user_data (grpc_mdelem * md, void (*destroy_func) (void *), #define GRPC_MDSTR_UNREF(s) grpc_mdstr_unref((s), __FILE__, __LINE__) #define GRPC_MDELEM_REF(s) grpc_mdelem_ref((s), __FILE__, __LINE__) #define GRPC_MDELEM_UNREF(s) grpc_mdelem_unref((s), __FILE__, __LINE__) -grpc_mdstr *grpc_mdstr_ref (grpc_mdstr * s, const char *file, int line); -void grpc_mdstr_unref (grpc_mdstr * s, const char *file, int 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); +grpc_mdstr *grpc_mdstr_ref(grpc_mdstr *s, const char *file, int line); +void grpc_mdstr_unref(grpc_mdstr *s, const char *file, int 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); #else #define GRPC_MDSTR_REF(s) grpc_mdstr_ref((s)) #define GRPC_MDSTR_UNREF(s) grpc_mdstr_unref((s)) #define GRPC_MDELEM_REF(s) grpc_mdelem_ref((s)) #define GRPC_MDELEM_UNREF(s) grpc_mdelem_unref((s)) -grpc_mdstr *grpc_mdstr_ref (grpc_mdstr * s); -void grpc_mdstr_unref (grpc_mdstr * s); -grpc_mdelem *grpc_mdelem_ref (grpc_mdelem * md); -void grpc_mdelem_unref (grpc_mdelem * md); +grpc_mdstr *grpc_mdstr_ref(grpc_mdstr *s); +void grpc_mdstr_unref(grpc_mdstr *s); +grpc_mdelem *grpc_mdelem_ref(grpc_mdelem *md); +void grpc_mdelem_unref(grpc_mdelem *md); #endif /* Recover a char* from a grpc_mdstr. The returned string is null terminated. Does not promise that the returned string has no embedded nulls however. */ -const char *grpc_mdstr_as_c_string (grpc_mdstr * s); +const char *grpc_mdstr_as_c_string(grpc_mdstr *s); -int grpc_mdstr_is_legal_header (grpc_mdstr * s); -int grpc_mdstr_is_legal_nonbin_header (grpc_mdstr * s); -int grpc_mdstr_is_bin_suffixed (grpc_mdstr * s); +int grpc_mdstr_is_legal_header(grpc_mdstr *s); +int grpc_mdstr_is_legal_nonbin_header(grpc_mdstr *s); +int grpc_mdstr_is_bin_suffixed(grpc_mdstr *s); /* Batch mode metadata functions. These API's have equivalents above, but allow taking the mdctx just once, @@ -154,20 +163,21 @@ int grpc_mdstr_is_bin_suffixed (grpc_mdstr * s); /* Lock the metadata context: it's only safe to call _locked_ functions against this context from the calling thread until grpc_mdctx_unlock is called */ -void grpc_mdctx_lock (grpc_mdctx * ctx); +void grpc_mdctx_lock(grpc_mdctx *ctx); #ifdef GRPC_METADATA_REFCOUNT_DEBUG #define GRPC_MDCTX_LOCKED_MDELEM_UNREF(ctx, elem) \ grpc_mdctx_locked_mdelem_unref((ctx), (elem), __FILE__, __LINE__) /* Unref a metadata element */ -void grpc_mdctx_locked_mdelem_unref (grpc_mdctx * ctx, grpc_mdelem * elem, const char *file, int line); +void grpc_mdctx_locked_mdelem_unref(grpc_mdctx *ctx, grpc_mdelem *elem, + const char *file, int line); #else #define GRPC_MDCTX_LOCKED_MDELEM_UNREF(ctx, elem) \ grpc_mdctx_locked_mdelem_unref((ctx), (elem)) /* Unref a metadata element */ -void grpc_mdctx_locked_mdelem_unref (grpc_mdctx * ctx, grpc_mdelem * elem); +void grpc_mdctx_locked_mdelem_unref(grpc_mdctx *ctx, grpc_mdelem *elem); #endif /* Unlock the metadata context */ -void grpc_mdctx_unlock (grpc_mdctx * ctx); +void grpc_mdctx_unlock(grpc_mdctx *ctx); #define GRPC_MDSTR_KV_HASH(k_hash, v_hash) (GPR_ROTL((k_hash), 2) ^ (v_hash)) diff --git a/src/core/transport/stream_op.c b/src/core/transport/stream_op.c index f188c7d1ae6..038586d48e2 100644 --- a/src/core/transport/stream_op.c +++ b/src/core/transport/stream_op.c @@ -42,367 +42,290 @@ Currently we grow by 1.5 times upon reallocation. */ #define GROW(x) (3 * (x) / 2) -void -grpc_sopb_init (grpc_stream_op_buffer * sopb) -{ +void grpc_sopb_init(grpc_stream_op_buffer *sopb) { sopb->ops = sopb->inlined_ops; sopb->nops = 0; sopb->capacity = GRPC_SOPB_INLINE_ELEMENTS; } -void -grpc_sopb_destroy (grpc_stream_op_buffer * sopb) -{ - grpc_stream_ops_unref_owned_objects (sopb->ops, sopb->nops); - if (sopb->ops != sopb->inlined_ops) - gpr_free (sopb->ops); +void grpc_sopb_destroy(grpc_stream_op_buffer *sopb) { + grpc_stream_ops_unref_owned_objects(sopb->ops, sopb->nops); + if (sopb->ops != sopb->inlined_ops) gpr_free(sopb->ops); } -void -grpc_sopb_reset (grpc_stream_op_buffer * sopb) -{ - grpc_stream_ops_unref_owned_objects (sopb->ops, sopb->nops); +void grpc_sopb_reset(grpc_stream_op_buffer *sopb) { + grpc_stream_ops_unref_owned_objects(sopb->ops, sopb->nops); sopb->nops = 0; } -void -grpc_sopb_swap (grpc_stream_op_buffer * a, grpc_stream_op_buffer * b) -{ - GPR_SWAP (size_t, a->nops, b->nops); - GPR_SWAP (size_t, a->capacity, b->capacity); - - if (a->ops == a->inlined_ops) - { - if (b->ops == b->inlined_ops) - { - /* swap contents of inlined buffer */ - grpc_stream_op temp[GRPC_SOPB_INLINE_ELEMENTS]; - memcpy (temp, a->ops, b->nops * sizeof (grpc_stream_op)); - memcpy (a->ops, b->ops, a->nops * sizeof (grpc_stream_op)); - memcpy (b->ops, temp, b->nops * sizeof (grpc_stream_op)); - } - else - { - /* a is inlined, b is not - copy a inlined into b, fix pointers */ - a->ops = b->ops; - b->ops = b->inlined_ops; - memcpy (b->ops, a->inlined_ops, b->nops * sizeof (grpc_stream_op)); - } - } - else if (b->ops == b->inlined_ops) - { - /* b is inlined, a is not - copy b inlined int a, fix pointers */ - b->ops = a->ops; - a->ops = a->inlined_ops; - memcpy (a->ops, b->inlined_ops, a->nops * sizeof (grpc_stream_op)); - } - else - { - /* no inlining: easy swap */ - GPR_SWAP (grpc_stream_op *, a->ops, b->ops); +void grpc_sopb_swap(grpc_stream_op_buffer *a, grpc_stream_op_buffer *b) { + GPR_SWAP(size_t, a->nops, b->nops); + GPR_SWAP(size_t, a->capacity, b->capacity); + + if (a->ops == a->inlined_ops) { + if (b->ops == b->inlined_ops) { + /* swap contents of inlined buffer */ + grpc_stream_op temp[GRPC_SOPB_INLINE_ELEMENTS]; + memcpy(temp, a->ops, b->nops * sizeof(grpc_stream_op)); + memcpy(a->ops, b->ops, a->nops * sizeof(grpc_stream_op)); + memcpy(b->ops, temp, b->nops * sizeof(grpc_stream_op)); + } else { + /* a is inlined, b is not - copy a inlined into b, fix pointers */ + a->ops = b->ops; + b->ops = b->inlined_ops; + memcpy(b->ops, a->inlined_ops, b->nops * sizeof(grpc_stream_op)); } + } else if (b->ops == b->inlined_ops) { + /* b is inlined, a is not - copy b inlined int a, fix pointers */ + b->ops = a->ops; + a->ops = a->inlined_ops; + memcpy(a->ops, b->inlined_ops, a->nops * sizeof(grpc_stream_op)); + } else { + /* no inlining: easy swap */ + GPR_SWAP(grpc_stream_op *, a->ops, b->ops); + } } -void -grpc_stream_ops_unref_owned_objects (grpc_stream_op * ops, size_t nops) -{ +void grpc_stream_ops_unref_owned_objects(grpc_stream_op *ops, size_t nops) { size_t i; - for (i = 0; i < nops; i++) - { - switch (ops[i].type) - { - case GRPC_OP_SLICE: - gpr_slice_unref (ops[i].data.slice); - break; - case GRPC_OP_METADATA: - grpc_metadata_batch_destroy (&ops[i].data.metadata); - break; - case GRPC_NO_OP: - case GRPC_OP_BEGIN_MESSAGE: - break; - } + for (i = 0; i < nops; i++) { + switch (ops[i].type) { + case GRPC_OP_SLICE: + gpr_slice_unref(ops[i].data.slice); + break; + case GRPC_OP_METADATA: + grpc_metadata_batch_destroy(&ops[i].data.metadata); + break; + case GRPC_NO_OP: + case GRPC_OP_BEGIN_MESSAGE: + break; } + } } -static void -expandto (grpc_stream_op_buffer * sopb, size_t new_capacity) -{ +static void expandto(grpc_stream_op_buffer *sopb, size_t new_capacity) { sopb->capacity = new_capacity; - if (sopb->ops == sopb->inlined_ops) - { - sopb->ops = gpr_malloc (sizeof (grpc_stream_op) * new_capacity); - memcpy (sopb->ops, sopb->inlined_ops, sopb->nops * sizeof (grpc_stream_op)); - } - else - { - sopb->ops = gpr_realloc (sopb->ops, sizeof (grpc_stream_op) * new_capacity); - } + if (sopb->ops == sopb->inlined_ops) { + sopb->ops = gpr_malloc(sizeof(grpc_stream_op) * new_capacity); + memcpy(sopb->ops, sopb->inlined_ops, sopb->nops * sizeof(grpc_stream_op)); + } else { + sopb->ops = gpr_realloc(sopb->ops, sizeof(grpc_stream_op) * new_capacity); + } } -static grpc_stream_op * -add (grpc_stream_op_buffer * sopb) -{ +static grpc_stream_op *add(grpc_stream_op_buffer *sopb) { grpc_stream_op *out; - GPR_ASSERT (sopb->nops <= sopb->capacity); - if (sopb->nops == sopb->capacity) - { - expandto (sopb, GROW (sopb->capacity)); - } + GPR_ASSERT(sopb->nops <= sopb->capacity); + if (sopb->nops == sopb->capacity) { + expandto(sopb, GROW(sopb->capacity)); + } out = sopb->ops + sopb->nops; sopb->nops++; return out; } -void -grpc_sopb_add_no_op (grpc_stream_op_buffer * sopb) -{ - add (sopb)->type = GRPC_NO_OP; +void grpc_sopb_add_no_op(grpc_stream_op_buffer *sopb) { + add(sopb)->type = GRPC_NO_OP; } -void -grpc_sopb_add_begin_message (grpc_stream_op_buffer * sopb, gpr_uint32 length, gpr_uint32 flags) -{ - grpc_stream_op *op = add (sopb); +void grpc_sopb_add_begin_message(grpc_stream_op_buffer *sopb, gpr_uint32 length, + gpr_uint32 flags) { + grpc_stream_op *op = add(sopb); op->type = GRPC_OP_BEGIN_MESSAGE; op->data.begin_message.length = length; op->data.begin_message.flags = flags; } -void -grpc_sopb_add_metadata (grpc_stream_op_buffer * sopb, grpc_metadata_batch b) -{ - grpc_stream_op *op = add (sopb); +void grpc_sopb_add_metadata(grpc_stream_op_buffer *sopb, + grpc_metadata_batch b) { + grpc_stream_op *op = add(sopb); op->type = GRPC_OP_METADATA; op->data.metadata = b; } -void -grpc_sopb_add_slice (grpc_stream_op_buffer * sopb, gpr_slice slice) -{ - grpc_stream_op *op = add (sopb); +void grpc_sopb_add_slice(grpc_stream_op_buffer *sopb, gpr_slice slice) { + grpc_stream_op *op = add(sopb); op->type = GRPC_OP_SLICE; op->data.slice = slice; } -void -grpc_sopb_append (grpc_stream_op_buffer * sopb, grpc_stream_op * ops, size_t nops) -{ +void grpc_sopb_append(grpc_stream_op_buffer *sopb, grpc_stream_op *ops, + size_t nops) { size_t orig_nops = sopb->nops; size_t new_nops = orig_nops + nops; - if (new_nops > sopb->capacity) - { - expandto (sopb, GPR_MAX (GROW (sopb->capacity), new_nops)); - } + if (new_nops > sopb->capacity) { + expandto(sopb, GPR_MAX(GROW(sopb->capacity), new_nops)); + } - memcpy (sopb->ops + orig_nops, ops, sizeof (grpc_stream_op) * nops); + memcpy(sopb->ops + orig_nops, ops, sizeof(grpc_stream_op) * nops); sopb->nops = new_nops; } -void -grpc_sopb_move_to (grpc_stream_op_buffer * src, grpc_stream_op_buffer * dst) -{ - if (src->nops == 0) - { - return; - } - if (dst->nops == 0) - { - grpc_sopb_swap (src, dst); - return; - } - grpc_sopb_append (dst, src->ops, src->nops); +void grpc_sopb_move_to(grpc_stream_op_buffer *src, grpc_stream_op_buffer *dst) { + if (src->nops == 0) { + return; + } + if (dst->nops == 0) { + grpc_sopb_swap(src, dst); + return; + } + grpc_sopb_append(dst, src->ops, src->nops); src->nops = 0; } -static void -assert_valid_list (grpc_mdelem_list * list) -{ +static void assert_valid_list(grpc_mdelem_list *list) { #ifndef NDEBUG grpc_linked_mdelem *l; - GPR_ASSERT ((list->head == NULL) == (list->tail == NULL)); - if (!list->head) - return; - GPR_ASSERT (list->head->prev == NULL); - GPR_ASSERT (list->tail->next == NULL); - GPR_ASSERT ((list->head == list->tail) == (list->head->next == NULL)); - - for (l = list->head; l; l = l->next) - { - GPR_ASSERT (l->md); - GPR_ASSERT ((l->prev == NULL) == (l == list->head)); - GPR_ASSERT ((l->next == NULL) == (l == list->tail)); - if (l->next) - GPR_ASSERT (l->next->prev == l); - if (l->prev) - GPR_ASSERT (l->prev->next == l); - } + GPR_ASSERT((list->head == NULL) == (list->tail == NULL)); + if (!list->head) return; + GPR_ASSERT(list->head->prev == NULL); + GPR_ASSERT(list->tail->next == NULL); + GPR_ASSERT((list->head == list->tail) == (list->head->next == NULL)); + + for (l = list->head; l; l = l->next) { + GPR_ASSERT(l->md); + GPR_ASSERT((l->prev == NULL) == (l == list->head)); + GPR_ASSERT((l->next == NULL) == (l == list->tail)); + if (l->next) GPR_ASSERT(l->next->prev == l); + if (l->prev) GPR_ASSERT(l->prev->next == l); + } #endif /* NDEBUG */ } #ifndef NDEBUG -void -grpc_metadata_batch_assert_ok (grpc_metadata_batch * batch) -{ - assert_valid_list (&batch->list); - assert_valid_list (&batch->garbage); +void grpc_metadata_batch_assert_ok(grpc_metadata_batch *batch) { + assert_valid_list(&batch->list); + assert_valid_list(&batch->garbage); } #endif /* NDEBUG */ -void -grpc_metadata_batch_init (grpc_metadata_batch * batch) -{ - batch->list.head = batch->list.tail = batch->garbage.head = batch->garbage.tail = NULL; - batch->deadline = gpr_inf_future (GPR_CLOCK_REALTIME); +void grpc_metadata_batch_init(grpc_metadata_batch *batch) { + batch->list.head = batch->list.tail = batch->garbage.head = + batch->garbage.tail = NULL; + batch->deadline = gpr_inf_future(GPR_CLOCK_REALTIME); } -void -grpc_metadata_batch_destroy (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 (l->md); - } - for (l = batch->garbage.head; l; l = l->next) - { - GRPC_MDELEM_UNREF (l->md); - } + for (l = batch->list.head; l; l = l->next) { + GRPC_MDELEM_UNREF(l->md); + } + for (l = batch->garbage.head; l; l = l->next) { + GRPC_MDELEM_UNREF(l->md); + } } -void -grpc_metadata_batch_add_head (grpc_metadata_batch * batch, grpc_linked_mdelem * storage, grpc_mdelem * elem_to_add) -{ - GPR_ASSERT (elem_to_add); +void grpc_metadata_batch_add_head(grpc_metadata_batch *batch, + grpc_linked_mdelem *storage, + grpc_mdelem *elem_to_add) { + GPR_ASSERT(elem_to_add); storage->md = elem_to_add; - grpc_metadata_batch_link_head (batch, storage); + grpc_metadata_batch_link_head(batch, storage); } -static void -link_head (grpc_mdelem_list * list, grpc_linked_mdelem * storage) -{ - assert_valid_list (list); - GPR_ASSERT (storage->md); +static void link_head(grpc_mdelem_list *list, grpc_linked_mdelem *storage) { + assert_valid_list(list); + GPR_ASSERT(storage->md); storage->prev = NULL; storage->next = list->head; - if (list->head != NULL) - { - list->head->prev = storage; - } - else - { - list->tail = storage; - } + if (list->head != NULL) { + list->head->prev = storage; + } else { + list->tail = storage; + } list->head = storage; - assert_valid_list (list); + assert_valid_list(list); } -void -grpc_metadata_batch_link_head (grpc_metadata_batch * batch, grpc_linked_mdelem * storage) -{ - link_head (&batch->list, storage); +void grpc_metadata_batch_link_head(grpc_metadata_batch *batch, + grpc_linked_mdelem *storage) { + link_head(&batch->list, storage); } -void -grpc_metadata_batch_add_tail (grpc_metadata_batch * batch, grpc_linked_mdelem * storage, grpc_mdelem * elem_to_add) -{ - GPR_ASSERT (elem_to_add); +void grpc_metadata_batch_add_tail(grpc_metadata_batch *batch, + grpc_linked_mdelem *storage, + grpc_mdelem *elem_to_add) { + GPR_ASSERT(elem_to_add); storage->md = elem_to_add; - grpc_metadata_batch_link_tail (batch, storage); + grpc_metadata_batch_link_tail(batch, storage); } -static void -link_tail (grpc_mdelem_list * list, grpc_linked_mdelem * storage) -{ - assert_valid_list (list); - GPR_ASSERT (storage->md); +static void link_tail(grpc_mdelem_list *list, grpc_linked_mdelem *storage) { + assert_valid_list(list); + GPR_ASSERT(storage->md); storage->prev = list->tail; storage->next = NULL; storage->reserved = NULL; - if (list->tail != NULL) - { - list->tail->next = storage; - } - else - { - list->head = storage; - } + if (list->tail != NULL) { + list->tail->next = storage; + } else { + list->head = storage; + } list->tail = storage; - assert_valid_list (list); + assert_valid_list(list); } -void -grpc_metadata_batch_link_tail (grpc_metadata_batch * batch, grpc_linked_mdelem * storage) -{ - link_tail (&batch->list, storage); +void grpc_metadata_batch_link_tail(grpc_metadata_batch *batch, + grpc_linked_mdelem *storage) { + link_tail(&batch->list, storage); } -void -grpc_metadata_batch_merge (grpc_metadata_batch * target, grpc_metadata_batch * add) -{ +void grpc_metadata_batch_merge(grpc_metadata_batch *target, + grpc_metadata_batch *add) { grpc_linked_mdelem *l; grpc_linked_mdelem *next; - for (l = add->list.head; l; l = next) - { - next = l->next; - link_tail (&target->list, l); - } - for (l = add->garbage.head; l; l = next) - { - next = l->next; - link_tail (&target->garbage, l); - } + for (l = add->list.head; l; l = next) { + next = l->next; + link_tail(&target->list, l); + } + for (l = add->garbage.head; l; l = next) { + next = l->next; + link_tail(&target->garbage, l); + } } -void -grpc_metadata_batch_move (grpc_metadata_batch * dst, grpc_metadata_batch * src) -{ +void grpc_metadata_batch_move(grpc_metadata_batch *dst, + grpc_metadata_batch *src) { *dst = *src; - memset (src, 0, sizeof (grpc_metadata_batch)); + memset(src, 0, sizeof(grpc_metadata_batch)); } -void -grpc_metadata_batch_filter (grpc_metadata_batch * batch, grpc_mdelem * (*filter) (void *user_data, grpc_mdelem * elem), void *user_data) -{ +void grpc_metadata_batch_filter(grpc_metadata_batch *batch, + grpc_mdelem *(*filter)(void *user_data, + grpc_mdelem *elem), + void *user_data) { grpc_linked_mdelem *l; grpc_linked_mdelem *next; - assert_valid_list (&batch->list); - assert_valid_list (&batch->garbage); - for (l = batch->list.head; l; l = next) - { - grpc_mdelem *orig = l->md; - grpc_mdelem *filt = filter (user_data, orig); - next = l->next; - if (filt == NULL) - { - if (l->prev) - { - l->prev->next = l->next; - } - if (l->next) - { - l->next->prev = l->prev; - } - if (batch->list.head == l) - { - batch->list.head = l->next; - } - if (batch->list.tail == l) - { - batch->list.tail = l->prev; - } - assert_valid_list (&batch->list); - link_head (&batch->garbage, l); - } - else if (filt != orig) - { - GRPC_MDELEM_UNREF (orig); - l->md = filt; - } + assert_valid_list(&batch->list); + assert_valid_list(&batch->garbage); + for (l = batch->list.head; l; l = next) { + grpc_mdelem *orig = l->md; + grpc_mdelem *filt = filter(user_data, orig); + next = l->next; + if (filt == NULL) { + if (l->prev) { + l->prev->next = l->next; + } + if (l->next) { + l->next->prev = l->prev; + } + if (batch->list.head == l) { + batch->list.head = l->next; + } + if (batch->list.tail == l) { + batch->list.tail = l->prev; + } + assert_valid_list(&batch->list); + link_head(&batch->garbage, l); + } else if (filt != orig) { + GRPC_MDELEM_UNREF(orig); + l->md = filt; } - assert_valid_list (&batch->list); - assert_valid_list (&batch->garbage); + } + assert_valid_list(&batch->list); + assert_valid_list(&batch->garbage); } diff --git a/src/core/transport/stream_op.h b/src/core/transport/stream_op.h index e37ab09f71b..37f18b02d91 100644 --- a/src/core/transport/stream_op.h +++ b/src/core/transport/stream_op.h @@ -45,8 +45,7 @@ /* Operations that can be performed on a stream. Used by grpc_stream_op. */ -typedef enum grpc_stream_op_code -{ +typedef enum grpc_stream_op_code { /* Do nothing code. Useful if rewriting a batch to exclude some operations. Must be ignored by receivers */ GRPC_NO_OP, @@ -66,8 +65,7 @@ typedef enum grpc_stream_op_code #define GRPC_WRITE_INTERNAL_USED_MASK (GRPC_WRITE_INTERNAL_COMPRESS) /* Arguments for GRPC_OP_BEGIN_MESSAGE */ -typedef struct grpc_begin_message -{ +typedef struct grpc_begin_message { /* How many bytes of data will this message contain */ gpr_uint32 length; /* Write flags for the message: see grpc.h GRPC_WRITE_* for the public bits, @@ -75,22 +73,19 @@ typedef struct grpc_begin_message gpr_uint32 flags; } grpc_begin_message; -typedef struct grpc_linked_mdelem -{ +typedef struct grpc_linked_mdelem { grpc_mdelem *md; struct grpc_linked_mdelem *next; struct grpc_linked_mdelem *prev; void *reserved; } grpc_linked_mdelem; -typedef struct grpc_mdelem_list -{ +typedef struct grpc_mdelem_list { grpc_linked_mdelem *head; grpc_linked_mdelem *tail; } grpc_mdelem_list; -typedef struct grpc_metadata_batch -{ +typedef struct grpc_metadata_batch { /** Metadata elements in this batch */ grpc_mdelem_list list; /** Elements that have been removed from the batch, but have @@ -103,26 +98,30 @@ typedef struct grpc_metadata_batch gpr_timespec deadline; } 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_merge (grpc_metadata_batch * target, grpc_metadata_batch * add); +void grpc_metadata_batch_init(grpc_metadata_batch *batch); +void grpc_metadata_batch_destroy(grpc_metadata_batch *batch); +void grpc_metadata_batch_merge(grpc_metadata_batch *target, + grpc_metadata_batch *add); /** Moves the metadata information from \a src to \a dst. Upon return, \a src is * zeroed. */ -void grpc_metadata_batch_move (grpc_metadata_batch * dst, grpc_metadata_batch * src); +void grpc_metadata_batch_move(grpc_metadata_batch *dst, + grpc_metadata_batch *src); /** Add \a storage to the beginning 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. */ -void grpc_metadata_batch_link_head (grpc_metadata_batch * batch, grpc_linked_mdelem * storage); +void grpc_metadata_batch_link_head(grpc_metadata_batch *batch, + grpc_linked_mdelem *storage); /** 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. */ -void grpc_metadata_batch_link_tail (grpc_metadata_batch * batch, grpc_linked_mdelem * storage); +void grpc_metadata_batch_link_tail(grpc_metadata_batch *batch, + grpc_linked_mdelem *storage); /** Add \a elem_to_add as the first element in \a batch, using \a storage as backing storage for the linked list element. @@ -130,23 +129,30 @@ void grpc_metadata_batch_link_tail (grpc_metadata_batch * batch, grpc_linked_mde lifetime of batch. This usually means it should be around for the lifetime of the call. Takes ownership of \a elem_to_add */ -void grpc_metadata_batch_add_head (grpc_metadata_batch * batch, grpc_linked_mdelem * storage, grpc_mdelem * elem_to_add); +void grpc_metadata_batch_add_head(grpc_metadata_batch *batch, + grpc_linked_mdelem *storage, + grpc_mdelem *elem_to_add); /** 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 lifetime of batch. This usually means it should be around for the lifetime of the call. Takes ownership of \a elem_to_add */ -void grpc_metadata_batch_add_tail (grpc_metadata_batch * batch, grpc_linked_mdelem * storage, grpc_mdelem * elem_to_add); +void grpc_metadata_batch_add_tail(grpc_metadata_batch *batch, + grpc_linked_mdelem *storage, + grpc_mdelem *elem_to_add); /** For each element in \a batch, execute \a filter. The return value from \a filter will be substituted for the grpc_mdelem passed to \a filter. If \a filter returns NULL, the element will be moved to the garbage list. */ -void grpc_metadata_batch_filter (grpc_metadata_batch * batch, grpc_mdelem * (*filter) (void *user_data, grpc_mdelem * elem), void *user_data); +void grpc_metadata_batch_filter(grpc_metadata_batch *batch, + grpc_mdelem *(*filter)(void *user_data, + grpc_mdelem *elem), + void *user_data); #ifndef NDEBUG -void grpc_metadata_batch_assert_ok (grpc_metadata_batch * comd); +void grpc_metadata_batch_assert_ok(grpc_metadata_batch *comd); #else #define grpc_metadata_batch_assert_ok(comd) \ do { \ @@ -154,14 +160,12 @@ void grpc_metadata_batch_assert_ok (grpc_metadata_batch * comd); #endif /* Represents a single operation performed on a stream/transport */ -typedef struct grpc_stream_op -{ +typedef struct grpc_stream_op { /* the operation to be applied */ enum grpc_stream_op_code type; /* the arguments to this operation. union fields are named according to the associated op-code */ - union - { + union { grpc_begin_message begin_message; grpc_metadata_batch metadata; gpr_slice slice; @@ -170,8 +174,7 @@ typedef struct grpc_stream_op /** A stream op buffer is a wrapper around stream operations that is * dynamically extendable. */ -typedef struct grpc_stream_op_buffer -{ +typedef struct grpc_stream_op_buffer { grpc_stream_op *ops; size_t nops; size_t capacity; @@ -179,28 +182,31 @@ typedef struct grpc_stream_op_buffer } grpc_stream_op_buffer; /* Initialize a stream op buffer */ -void grpc_sopb_init (grpc_stream_op_buffer * sopb); +void grpc_sopb_init(grpc_stream_op_buffer *sopb); /* Destroy a stream op buffer */ -void grpc_sopb_destroy (grpc_stream_op_buffer * sopb); +void grpc_sopb_destroy(grpc_stream_op_buffer *sopb); /* Reset a sopb to no elements */ -void grpc_sopb_reset (grpc_stream_op_buffer * sopb); +void grpc_sopb_reset(grpc_stream_op_buffer *sopb); /* Swap two sopbs */ -void grpc_sopb_swap (grpc_stream_op_buffer * a, grpc_stream_op_buffer * b); +void grpc_sopb_swap(grpc_stream_op_buffer *a, grpc_stream_op_buffer *b); -void grpc_stream_ops_unref_owned_objects (grpc_stream_op * ops, size_t nops); +void grpc_stream_ops_unref_owned_objects(grpc_stream_op *ops, size_t nops); /* Append a GRPC_NO_OP to a buffer */ -void grpc_sopb_add_no_op (grpc_stream_op_buffer * sopb); +void grpc_sopb_add_no_op(grpc_stream_op_buffer *sopb); /* Append a GRPC_OP_BEGIN to a buffer */ -void grpc_sopb_add_begin_message (grpc_stream_op_buffer * sopb, gpr_uint32 length, gpr_uint32 flags); -void grpc_sopb_add_metadata (grpc_stream_op_buffer * sopb, grpc_metadata_batch metadata); +void grpc_sopb_add_begin_message(grpc_stream_op_buffer *sopb, gpr_uint32 length, + gpr_uint32 flags); +void grpc_sopb_add_metadata(grpc_stream_op_buffer *sopb, + grpc_metadata_batch metadata); /* Append a GRPC_SLICE to a buffer - does not ref/unref the slice */ -void grpc_sopb_add_slice (grpc_stream_op_buffer * sopb, gpr_slice slice); +void grpc_sopb_add_slice(grpc_stream_op_buffer *sopb, gpr_slice slice); /* Append a buffer to a buffer - does not ref/unref any internal objects */ -void grpc_sopb_append (grpc_stream_op_buffer * sopb, grpc_stream_op * ops, size_t nops); +void grpc_sopb_append(grpc_stream_op_buffer *sopb, grpc_stream_op *ops, + size_t nops); -void grpc_sopb_move_to (grpc_stream_op_buffer * src, grpc_stream_op_buffer * dst); +void grpc_sopb_move_to(grpc_stream_op_buffer *src, grpc_stream_op_buffer *dst); -char *grpc_sopb_string (grpc_stream_op_buffer * sopb); +char *grpc_sopb_string(grpc_stream_op_buffer *sopb); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_STREAM_OP_H */ diff --git a/src/core/transport/transport.c b/src/core/transport/transport.c index 35ba0ba067d..828d212cfe1 100644 --- a/src/core/transport/transport.c +++ b/src/core/transport/transport.c @@ -36,115 +36,103 @@ #include #include "src/core/transport/transport_impl.h" -size_t -grpc_transport_stream_size (grpc_transport * transport) -{ +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_exec_ctx *exec_ctx, + grpc_transport *transport) { + transport->vtable->destroy(exec_ctx, transport); } -int -grpc_transport_init_stream (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_stream * stream, const void *server_data, grpc_transport_stream_op * initial_op) -{ - return transport->vtable->init_stream (exec_ctx, transport, stream, server_data, initial_op); +int grpc_transport_init_stream(grpc_exec_ctx *exec_ctx, + grpc_transport *transport, grpc_stream *stream, + const void *server_data, + grpc_transport_stream_op *initial_op) { + return transport->vtable->init_stream(exec_ctx, transport, stream, + server_data, initial_op); } -void -grpc_transport_perform_stream_op (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_stream * stream, grpc_transport_stream_op * op) -{ - transport->vtable->perform_stream_op (exec_ctx, transport, stream, op); +void grpc_transport_perform_stream_op(grpc_exec_ctx *exec_ctx, + grpc_transport *transport, + grpc_stream *stream, + grpc_transport_stream_op *op) { + transport->vtable->perform_stream_op(exec_ctx, transport, stream, op); } -void -grpc_transport_perform_op (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_transport_op * op) -{ - transport->vtable->perform_op (exec_ctx, transport, op); +void grpc_transport_perform_op(grpc_exec_ctx *exec_ctx, + grpc_transport *transport, + grpc_transport_op *op) { + transport->vtable->perform_op(exec_ctx, transport, op); } -void -grpc_transport_destroy_stream (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_stream * stream) -{ - transport->vtable->destroy_stream (exec_ctx, transport, stream); +void grpc_transport_destroy_stream(grpc_exec_ctx *exec_ctx, + grpc_transport *transport, + grpc_stream *stream) { + transport->vtable->destroy_stream(exec_ctx, transport, stream); } -char * -grpc_transport_get_peer (grpc_exec_ctx * exec_ctx, grpc_transport * transport) -{ - return transport->vtable->get_peer (exec_ctx, transport); +char *grpc_transport_get_peer(grpc_exec_ctx *exec_ctx, + grpc_transport *transport) { + return transport->vtable->get_peer(exec_ctx, transport); } -void -grpc_transport_stream_op_finish_with_failure (grpc_exec_ctx * exec_ctx, grpc_transport_stream_op * op) -{ - grpc_exec_ctx_enqueue (exec_ctx, op->on_done_recv, 0); - grpc_exec_ctx_enqueue (exec_ctx, op->on_done_send, 0); - grpc_exec_ctx_enqueue (exec_ctx, op->on_consumed, 0); +void grpc_transport_stream_op_finish_with_failure( + grpc_exec_ctx *exec_ctx, grpc_transport_stream_op *op) { + grpc_exec_ctx_enqueue(exec_ctx, op->on_done_recv, 0); + grpc_exec_ctx_enqueue(exec_ctx, op->on_done_send, 0); + grpc_exec_ctx_enqueue(exec_ctx, op->on_consumed, 0); } -void -grpc_transport_stream_op_add_cancellation (grpc_transport_stream_op * op, grpc_status_code status) -{ - GPR_ASSERT (status != GRPC_STATUS_OK); - if (op->cancel_with_status == GRPC_STATUS_OK) - { - op->cancel_with_status = status; - } - if (op->close_with_status != GRPC_STATUS_OK) - { - op->close_with_status = GRPC_STATUS_OK; - if (op->optional_close_message != NULL) - { - gpr_slice_unref (*op->optional_close_message); - op->optional_close_message = NULL; - } +void grpc_transport_stream_op_add_cancellation(grpc_transport_stream_op *op, + grpc_status_code status) { + GPR_ASSERT(status != GRPC_STATUS_OK); + if (op->cancel_with_status == GRPC_STATUS_OK) { + op->cancel_with_status = status; + } + if (op->close_with_status != GRPC_STATUS_OK) { + op->close_with_status = GRPC_STATUS_OK; + if (op->optional_close_message != NULL) { + gpr_slice_unref(*op->optional_close_message); + op->optional_close_message = NULL; } + } } -typedef struct -{ +typedef struct { gpr_slice message; grpc_closure *then_call; grpc_closure closure; } close_message_data; -static void -free_message (grpc_exec_ctx * exec_ctx, void *p, int iomgr_success) -{ +static void free_message(grpc_exec_ctx *exec_ctx, void *p, int iomgr_success) { close_message_data *cmd = p; - gpr_slice_unref (cmd->message); - if (cmd->then_call != NULL) - { - cmd->then_call->cb (exec_ctx, cmd->then_call->cb_arg, iomgr_success); - } - gpr_free (cmd); + gpr_slice_unref(cmd->message); + if (cmd->then_call != NULL) { + cmd->then_call->cb(exec_ctx, cmd->then_call->cb_arg, iomgr_success); + } + gpr_free(cmd); } -void -grpc_transport_stream_op_add_close (grpc_transport_stream_op * op, grpc_status_code status, gpr_slice * optional_message) -{ +void grpc_transport_stream_op_add_close(grpc_transport_stream_op *op, + grpc_status_code status, + gpr_slice *optional_message) { close_message_data *cmd; - GPR_ASSERT (status != GRPC_STATUS_OK); - if (op->cancel_with_status != GRPC_STATUS_OK || op->close_with_status != GRPC_STATUS_OK) - { - if (optional_message) - { - gpr_slice_unref (*optional_message); - } - return; - } - if (optional_message) - { - cmd = gpr_malloc (sizeof (*cmd)); - cmd->message = *optional_message; - cmd->then_call = op->on_consumed; - grpc_closure_init (&cmd->closure, free_message, cmd); - op->on_consumed = &cmd->closure; - op->optional_close_message = &cmd->message; + GPR_ASSERT(status != GRPC_STATUS_OK); + if (op->cancel_with_status != GRPC_STATUS_OK || + op->close_with_status != GRPC_STATUS_OK) { + if (optional_message) { + gpr_slice_unref(*optional_message); } + return; + } + if (optional_message) { + cmd = gpr_malloc(sizeof(*cmd)); + cmd->message = *optional_message; + cmd->then_call = op->on_consumed; + grpc_closure_init(&cmd->closure, free_message, cmd); + op->on_consumed = &cmd->closure; + op->optional_close_message = &cmd->message; + } op->close_with_status = status; } diff --git a/src/core/transport/transport.h b/src/core/transport/transport.h index 80d842b4be0..d4cee03862e 100644 --- a/src/core/transport/transport.h +++ b/src/core/transport/transport.h @@ -50,8 +50,7 @@ typedef struct grpc_transport grpc_transport; typedef struct grpc_stream grpc_stream; /* Represents the send/recv closed state of a stream. */ -typedef enum grpc_stream_state -{ +typedef enum grpc_stream_state { /* the stream is open for sends and receives */ GRPC_STREAM_OPEN, /* the stream is closed for sends, but may still receive data */ @@ -64,8 +63,7 @@ typedef enum grpc_stream_state /* Transport stream op: a set of operations to perform on a transport against a single stream */ -typedef struct grpc_transport_stream_op -{ +typedef struct grpc_transport_stream_op { grpc_closure *on_consumed; grpc_stream_op_buffer *send_ops; @@ -95,8 +93,7 @@ typedef struct grpc_transport_stream_op } grpc_transport_stream_op; /** Transport op: a set of operations to perform on a transport as a whole */ -typedef struct grpc_transport_op -{ +typedef struct grpc_transport_op { /** called when processing of this op is done */ grpc_closure *on_consumed; /** connectivity monitoring */ @@ -113,7 +110,8 @@ typedef struct grpc_transport_op gpr_slice *goaway_message; /** set the callback for accepting new streams; this is a permanent callback, unlike the other one-shot closures */ - void (*set_accept_stream) (void *user_data, grpc_transport * transport, const void *server_data); + void (*set_accept_stream)(void *user_data, grpc_transport *transport, + const void *server_data); void *set_accept_stream_user_data; /** add this transport to a pollset */ grpc_pollset *bind_pollset; @@ -125,7 +123,7 @@ typedef struct grpc_transport_op /* Returns the amount of memory required to store a grpc_stream for this transport */ -size_t grpc_transport_stream_size (grpc_transport * transport); +size_t grpc_transport_stream_size(grpc_transport *transport); /* Initialize transport data for a stream. @@ -136,7 +134,10 @@ 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, const void *server_data, grpc_transport_stream_op * initial_op); +int grpc_transport_init_stream(grpc_exec_ctx *exec_ctx, + grpc_transport *transport, grpc_stream *stream, + const void *server_data, + grpc_transport_stream_op *initial_op); /* Destroy transport data for a stream. @@ -148,15 +149,21 @@ int grpc_transport_init_stream (grpc_exec_ctx * exec_ctx, grpc_transport * trans 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, grpc_stream * stream); +void grpc_transport_destroy_stream(grpc_exec_ctx *exec_ctx, + grpc_transport *transport, + grpc_stream *stream); -void grpc_transport_stream_op_finish_with_failure (grpc_exec_ctx * exec_ctx, grpc_transport_stream_op * op); +void grpc_transport_stream_op_finish_with_failure(grpc_exec_ctx *exec_ctx, + grpc_transport_stream_op *op); -void grpc_transport_stream_op_add_cancellation (grpc_transport_stream_op * op, grpc_status_code status); +void grpc_transport_stream_op_add_cancellation(grpc_transport_stream_op *op, + grpc_status_code status); -void grpc_transport_stream_op_add_close (grpc_transport_stream_op * op, grpc_status_code status, gpr_slice * optional_message); +void grpc_transport_stream_op_add_close(grpc_transport_stream_op *op, + grpc_status_code status, + gpr_slice *optional_message); -char *grpc_transport_stream_op_string (grpc_transport_stream_op * op); +char *grpc_transport_stream_op_string(grpc_transport_stream_op *op); /* Send a batch of operations on a transport @@ -167,25 +174,32 @@ char *grpc_transport_stream_op_string (grpc_transport_stream_op * op); stream - the stream on which to send the operations. This must be non-NULL and previously initialized by the same transport. op - a grpc_transport_stream_op specifying the op to perform */ -void grpc_transport_perform_stream_op (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_stream * stream, grpc_transport_stream_op * op); +void grpc_transport_perform_stream_op(grpc_exec_ctx *exec_ctx, + grpc_transport *transport, + grpc_stream *stream, + grpc_transport_stream_op *op); -void grpc_transport_perform_op (grpc_exec_ctx * exec_ctx, grpc_transport * transport, grpc_transport_op * op); +void grpc_transport_perform_op(grpc_exec_ctx *exec_ctx, + grpc_transport *transport, + grpc_transport_op *op); /* Send a ping on a transport Calls cb with user data when a response is received. */ -void grpc_transport_ping (grpc_transport * transport, grpc_closure * cb); +void grpc_transport_ping(grpc_transport *transport, grpc_closure *cb); /* Advise peer of pending connection termination. */ -void grpc_transport_goaway (grpc_transport * transport, grpc_status_code status, gpr_slice debug_data); +void grpc_transport_goaway(grpc_transport *transport, grpc_status_code status, + gpr_slice debug_data); /* Close a transport. Aborts all open streams. */ -void grpc_transport_close (grpc_transport * transport); +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_exec_ctx *exec_ctx, grpc_transport *transport); /* Get the transports peer */ -char *grpc_transport_get_peer (grpc_exec_ctx * exec_ctx, grpc_transport * transport); +char *grpc_transport_get_peer(grpc_exec_ctx *exec_ctx, + grpc_transport *transport); #endif /* GRPC_INTERNAL_CORE_TRANSPORT_TRANSPORT_H */ diff --git a/src/core/transport/transport_impl.h b/src/core/transport/transport_impl.h index 54ebc24ff32..900c6340ffc 100644 --- a/src/core/transport/transport_impl.h +++ b/src/core/transport/transport_impl.h @@ -36,34 +36,37 @@ #include "src/core/transport/transport.h" -typedef struct grpc_transport_vtable -{ +typedef struct grpc_transport_vtable { /* Memory required for a single stream element - this is allocated by upper layers and initialized by the transport */ - size_t sizeof_stream; /* = sizeof(transport stream) */ + size_t sizeof_stream; /* = sizeof(transport stream) */ /* implementation of grpc_transport_init_stream */ - int (*init_stream) (grpc_exec_ctx * exec_ctx, grpc_transport * self, grpc_stream * stream, const void *server_data, grpc_transport_stream_op * initial_op); + int (*init_stream)(grpc_exec_ctx *exec_ctx, grpc_transport *self, + grpc_stream *stream, const void *server_data, + grpc_transport_stream_op *initial_op); /* implementation of grpc_transport_perform_stream_op */ - void (*perform_stream_op) (grpc_exec_ctx * exec_ctx, grpc_transport * self, grpc_stream * stream, grpc_transport_stream_op * op); + void (*perform_stream_op)(grpc_exec_ctx *exec_ctx, grpc_transport *self, + grpc_stream *stream, grpc_transport_stream_op *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_exec_ctx *exec_ctx, 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_exec_ctx *exec_ctx, grpc_transport *self, + grpc_stream *stream); /* implementation of grpc_transport_destroy */ - void (*destroy) (grpc_exec_ctx * exec_ctx, grpc_transport * self); + void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_transport *self); /* implementation of grpc_transport_get_peer */ - char *(*get_peer) (grpc_exec_ctx * exec_ctx, grpc_transport * self); + char *(*get_peer)(grpc_exec_ctx *exec_ctx, grpc_transport *self); } grpc_transport_vtable; /* an instance of a grpc transport */ -struct grpc_transport -{ +struct grpc_transport { /* pointer to a vtable defining operations on this transport */ const grpc_transport_vtable *vtable; }; diff --git a/src/core/transport/transport_op_string.c b/src/core/transport/transport_op_string.c index f9634133104..f62c340e97f 100644 --- a/src/core/transport/transport_op_string.c +++ b/src/core/transport/transport_op_string.c @@ -45,142 +45,122 @@ /* These routines are here to facilitate debugging - they produce string representations of various transport data structures */ -static void -put_metadata (gpr_strvec * b, grpc_mdelem * md) -{ - gpr_strvec_add (b, gpr_strdup ("key=")); - gpr_strvec_add (b, gpr_dump_slice (md->key->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII)); - - gpr_strvec_add (b, gpr_strdup (" value=")); - gpr_strvec_add (b, gpr_dump_slice (md->value->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII)); +static void put_metadata(gpr_strvec *b, grpc_mdelem *md) { + gpr_strvec_add(b, gpr_strdup("key=")); + gpr_strvec_add(b, + gpr_dump_slice(md->key->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII)); + + gpr_strvec_add(b, gpr_strdup(" value=")); + gpr_strvec_add( + b, gpr_dump_slice(md->value->slice, GPR_DUMP_HEX | GPR_DUMP_ASCII)); } -static void -put_metadata_list (gpr_strvec * b, grpc_metadata_batch md) -{ +static void put_metadata_list(gpr_strvec *b, grpc_metadata_batch md) { grpc_linked_mdelem *m; - for (m = md.list.head; m != NULL; m = m->next) - { - if (m != md.list.head) - gpr_strvec_add (b, gpr_strdup (", ")); - put_metadata (b, m->md); - } - if (gpr_time_cmp (md.deadline, gpr_inf_future (md.deadline.clock_type)) != 0) - { - char *tmp; - gpr_asprintf (&tmp, " deadline=%d.%09d", md.deadline.tv_sec, md.deadline.tv_nsec); - gpr_strvec_add (b, tmp); - } + for (m = md.list.head; m != NULL; m = m->next) { + if (m != md.list.head) gpr_strvec_add(b, gpr_strdup(", ")); + put_metadata(b, m->md); + } + if (gpr_time_cmp(md.deadline, gpr_inf_future(md.deadline.clock_type)) != 0) { + char *tmp; + gpr_asprintf(&tmp, " deadline=%d.%09d", md.deadline.tv_sec, + md.deadline.tv_nsec); + gpr_strvec_add(b, tmp); + } } -char * -grpc_sopb_string (grpc_stream_op_buffer * sopb) -{ +char *grpc_sopb_string(grpc_stream_op_buffer *sopb) { char *out; char *tmp; size_t i; gpr_strvec b; - gpr_strvec_init (&b); - - for (i = 0; i < sopb->nops; i++) - { - grpc_stream_op *op = &sopb->ops[i]; - if (i > 0) - gpr_strvec_add (&b, gpr_strdup (", ")); - switch (op->type) - { - case GRPC_NO_OP: - gpr_strvec_add (&b, gpr_strdup ("NO_OP")); - break; - case GRPC_OP_BEGIN_MESSAGE: - gpr_asprintf (&tmp, "BEGIN_MESSAGE:%d", op->data.begin_message.length); - gpr_strvec_add (&b, tmp); - break; - case GRPC_OP_SLICE: - gpr_asprintf (&tmp, "SLICE:%d", GPR_SLICE_LENGTH (op->data.slice)); - gpr_strvec_add (&b, tmp); - break; - case GRPC_OP_METADATA: - gpr_strvec_add (&b, gpr_strdup ("METADATA{")); - put_metadata_list (&b, op->data.metadata); - gpr_strvec_add (&b, gpr_strdup ("}")); - break; - } + gpr_strvec_init(&b); + + for (i = 0; i < sopb->nops; i++) { + grpc_stream_op *op = &sopb->ops[i]; + if (i > 0) gpr_strvec_add(&b, gpr_strdup(", ")); + switch (op->type) { + case GRPC_NO_OP: + gpr_strvec_add(&b, gpr_strdup("NO_OP")); + break; + case GRPC_OP_BEGIN_MESSAGE: + gpr_asprintf(&tmp, "BEGIN_MESSAGE:%d", op->data.begin_message.length); + gpr_strvec_add(&b, tmp); + break; + case GRPC_OP_SLICE: + gpr_asprintf(&tmp, "SLICE:%d", GPR_SLICE_LENGTH(op->data.slice)); + gpr_strvec_add(&b, tmp); + break; + case GRPC_OP_METADATA: + gpr_strvec_add(&b, gpr_strdup("METADATA{")); + put_metadata_list(&b, op->data.metadata); + gpr_strvec_add(&b, gpr_strdup("}")); + break; } + } - out = gpr_strvec_flatten (&b, NULL); - gpr_strvec_destroy (&b); + out = gpr_strvec_flatten(&b, NULL); + gpr_strvec_destroy(&b); return out; } -char * -grpc_transport_stream_op_string (grpc_transport_stream_op * op) -{ +char *grpc_transport_stream_op_string(grpc_transport_stream_op *op) { char *tmp; char *out; int first = 1; gpr_strvec b; - gpr_strvec_init (&b); - - if (op->send_ops) - { - if (!first) - gpr_strvec_add (&b, gpr_strdup (" ")); - first = 0; - gpr_asprintf (&tmp, "SEND%s:%p", op->is_last_send ? "_LAST" : "", op->on_done_send); - gpr_strvec_add (&b, tmp); - gpr_strvec_add (&b, gpr_strdup ("[")); - gpr_strvec_add (&b, grpc_sopb_string (op->send_ops)); - gpr_strvec_add (&b, gpr_strdup ("]")); - } - - if (op->recv_ops) - { - if (!first) - gpr_strvec_add (&b, gpr_strdup (" ")); - first = 0; - gpr_asprintf (&tmp, "RECV:%p:max_recv_bytes=%d", op->on_done_recv, op->max_recv_bytes); - gpr_strvec_add (&b, tmp); - } - - if (op->bind_pollset) - { - if (!first) - gpr_strvec_add (&b, gpr_strdup (" ")); - first = 0; - gpr_strvec_add (&b, gpr_strdup ("BIND")); - } - - if (op->cancel_with_status != GRPC_STATUS_OK) - { - if (!first) - gpr_strvec_add (&b, gpr_strdup (" ")); - first = 0; - gpr_asprintf (&tmp, "CANCEL:%d", op->cancel_with_status); - gpr_strvec_add (&b, tmp); - } - - if (op->on_consumed != NULL) - { - if (!first) - gpr_strvec_add (&b, gpr_strdup (" ")); - first = 0; - gpr_asprintf (&tmp, "ON_CONSUMED:%p", op->on_consumed); - gpr_strvec_add (&b, tmp); - } - - out = gpr_strvec_flatten (&b, NULL); - gpr_strvec_destroy (&b); + gpr_strvec_init(&b); + + if (op->send_ops) { + if (!first) gpr_strvec_add(&b, gpr_strdup(" ")); + first = 0; + gpr_asprintf(&tmp, "SEND%s:%p", op->is_last_send ? "_LAST" : "", + op->on_done_send); + gpr_strvec_add(&b, tmp); + gpr_strvec_add(&b, gpr_strdup("[")); + gpr_strvec_add(&b, grpc_sopb_string(op->send_ops)); + gpr_strvec_add(&b, gpr_strdup("]")); + } + + if (op->recv_ops) { + if (!first) gpr_strvec_add(&b, gpr_strdup(" ")); + first = 0; + gpr_asprintf(&tmp, "RECV:%p:max_recv_bytes=%d", op->on_done_recv, + op->max_recv_bytes); + gpr_strvec_add(&b, tmp); + } + + if (op->bind_pollset) { + if (!first) gpr_strvec_add(&b, gpr_strdup(" ")); + first = 0; + gpr_strvec_add(&b, gpr_strdup("BIND")); + } + + if (op->cancel_with_status != GRPC_STATUS_OK) { + if (!first) gpr_strvec_add(&b, gpr_strdup(" ")); + first = 0; + gpr_asprintf(&tmp, "CANCEL:%d", op->cancel_with_status); + gpr_strvec_add(&b, tmp); + } + + if (op->on_consumed != NULL) { + if (!first) gpr_strvec_add(&b, gpr_strdup(" ")); + first = 0; + gpr_asprintf(&tmp, "ON_CONSUMED:%p", op->on_consumed); + gpr_strvec_add(&b, tmp); + } + + out = gpr_strvec_flatten(&b, NULL); + gpr_strvec_destroy(&b); return out; } -void -grpc_call_log_op (char *file, int line, gpr_log_severity severity, grpc_call_element * elem, grpc_transport_stream_op * op) -{ - char *str = grpc_transport_stream_op_string (op); - gpr_log (file, line, severity, "OP[%s:%p]: %s", elem->filter->name, elem, str); - gpr_free (str); +void grpc_call_log_op(char *file, int line, gpr_log_severity severity, + grpc_call_element *elem, grpc_transport_stream_op *op) { + char *str = grpc_transport_stream_op_string(op); + gpr_log(file, line, severity, "OP[%s:%p]: %s", elem->filter->name, elem, str); + gpr_free(str); } diff --git a/src/core/tsi/fake_transport_security.c b/src/core/tsi/fake_transport_security.c index 3a8383d4b02..9ef4b163beb 100644 --- a/src/core/tsi/fake_transport_security.c +++ b/src/core/tsi/fake_transport_security.c @@ -52,8 +52,7 @@ | size | data | where the size field value is the size of the size field plus the size of the data encoded in little endian on 4 bytes. */ -typedef struct -{ +typedef struct { unsigned char *data; size_t size; size_t allocated_size; @@ -61,8 +60,7 @@ typedef struct int needs_draining; } tsi_fake_frame; -typedef enum -{ +typedef enum { TSI_FAKE_CLIENT_INIT = 0, TSI_FAKE_SERVER_INIT = 1, TSI_FAKE_CLIENT_FINISHED = 2, @@ -70,8 +68,7 @@ typedef enum TSI_FAKE_HANDSHAKE_MESSAGE_MAX = 4 } tsi_fake_handshake_message; -typedef struct -{ +typedef struct { tsi_handshaker base; int is_client; tsi_fake_handshake_message next_message_to_send; @@ -81,8 +78,7 @@ typedef struct tsi_result result; } tsi_fake_handshaker; -typedef struct -{ +typedef struct { tsi_frame_protector base; tsi_fake_frame protect_frame; tsi_fake_frame unprotect_frame; @@ -92,187 +88,156 @@ typedef struct /* --- Utils. ---*/ static const char *tsi_fake_handshake_message_strings[] = { - "CLIENT_INIT", "SERVER_INIT", "CLIENT_FINISHED", "SERVER_FINISHED" -}; + "CLIENT_INIT", "SERVER_INIT", "CLIENT_FINISHED", "SERVER_FINISHED"}; -static const char * -tsi_fake_handshake_message_to_string (int msg) -{ - if (msg < 0 || msg >= TSI_FAKE_HANDSHAKE_MESSAGE_MAX) - { - gpr_log (GPR_ERROR, "Invalid message %d", msg); - return "UNKNOWN"; - } +static const char *tsi_fake_handshake_message_to_string(int msg) { + if (msg < 0 || msg >= TSI_FAKE_HANDSHAKE_MESSAGE_MAX) { + gpr_log(GPR_ERROR, "Invalid message %d", msg); + return "UNKNOWN"; + } return tsi_fake_handshake_message_strings[msg]; } -static tsi_result -tsi_fake_handshake_message_from_string (const char *msg_string, tsi_fake_handshake_message * msg) -{ +static tsi_result tsi_fake_handshake_message_from_string( + const char *msg_string, tsi_fake_handshake_message *msg) { tsi_fake_handshake_message i; - for (i = 0; i < TSI_FAKE_HANDSHAKE_MESSAGE_MAX; i++) - { - if (strncmp (msg_string, tsi_fake_handshake_message_strings[i], strlen (tsi_fake_handshake_message_strings[i])) == 0) - { - *msg = i; - return TSI_OK; - } + for (i = 0; i < TSI_FAKE_HANDSHAKE_MESSAGE_MAX; i++) { + if (strncmp(msg_string, tsi_fake_handshake_message_strings[i], + strlen(tsi_fake_handshake_message_strings[i])) == 0) { + *msg = i; + return TSI_OK; } - gpr_log (GPR_ERROR, "Invalid handshake message."); + } + gpr_log(GPR_ERROR, "Invalid handshake message."); return TSI_DATA_CORRUPTED; } -static gpr_uint32 -load32_little_endian (const unsigned char *buf) -{ - return ((gpr_uint32) (buf[0]) | (gpr_uint32) (buf[1] << 8) | (gpr_uint32) (buf[2] << 16) | (gpr_uint32) (buf[3] << 24)); +static gpr_uint32 load32_little_endian(const unsigned char *buf) { + return ((gpr_uint32)(buf[0]) | (gpr_uint32)(buf[1] << 8) | + (gpr_uint32)(buf[2] << 16) | (gpr_uint32)(buf[3] << 24)); } -static void -store32_little_endian (gpr_uint32 value, unsigned char *buf) -{ - buf[3] = (unsigned char) (value >> 24) & 0xFF; - buf[2] = (unsigned char) (value >> 16) & 0xFF; - buf[1] = (unsigned char) (value >> 8) & 0xFF; - buf[0] = (unsigned char) (value) & 0xFF; +static void store32_little_endian(gpr_uint32 value, unsigned char *buf) { + buf[3] = (unsigned char)(value >> 24) & 0xFF; + buf[2] = (unsigned char)(value >> 16) & 0xFF; + buf[1] = (unsigned char)(value >> 8) & 0xFF; + buf[0] = (unsigned char)(value)&0xFF; } -static void -tsi_fake_frame_reset (tsi_fake_frame * frame, int needs_draining) -{ +static void tsi_fake_frame_reset(tsi_fake_frame *frame, int needs_draining) { frame->offset = 0; frame->needs_draining = needs_draining; - if (!needs_draining) - frame->size = 0; + if (!needs_draining) frame->size = 0; } /* Returns 1 if successful, 0 otherwise. */ -static int -tsi_fake_frame_ensure_size (tsi_fake_frame * frame) -{ - if (frame->data == NULL) - { - frame->allocated_size = frame->size; - frame->data = malloc (frame->allocated_size); - if (frame->data == NULL) - return 0; - } - else if (frame->size > frame->allocated_size) - { - unsigned char *new_data = realloc (frame->data, frame->size); - if (new_data == NULL) - { - free (frame->data); - frame->data = NULL; - return 0; - } - frame->data = new_data; - frame->allocated_size = frame->size; +static int tsi_fake_frame_ensure_size(tsi_fake_frame *frame) { + if (frame->data == NULL) { + frame->allocated_size = frame->size; + frame->data = malloc(frame->allocated_size); + if (frame->data == NULL) return 0; + } else if (frame->size > frame->allocated_size) { + unsigned char *new_data = realloc(frame->data, frame->size); + if (new_data == NULL) { + free(frame->data); + frame->data = NULL; + return 0; } + frame->data = new_data; + frame->allocated_size = frame->size; + } return 1; } /* This method should not be called if frame->needs_framing is not 0. */ -static tsi_result -fill_frame_from_bytes (const unsigned char *incoming_bytes, size_t * incoming_bytes_size, tsi_fake_frame * frame) -{ +static tsi_result fill_frame_from_bytes(const unsigned char *incoming_bytes, + size_t *incoming_bytes_size, + tsi_fake_frame *frame) { size_t available_size = *incoming_bytes_size; size_t to_read_size = 0; const unsigned char *bytes_cursor = incoming_bytes; - if (frame->needs_draining) - return TSI_INTERNAL_ERROR; - if (frame->data == NULL) - { - frame->allocated_size = TSI_FAKE_FRAME_INITIAL_ALLOCATED_SIZE; - frame->data = malloc (frame->allocated_size); - if (frame->data == NULL) - return TSI_OUT_OF_RESOURCES; - } - - if (frame->offset < TSI_FAKE_FRAME_HEADER_SIZE) - { - to_read_size = TSI_FAKE_FRAME_HEADER_SIZE - frame->offset; - if (to_read_size > available_size) - { - /* Just fill what we can and exit. */ - memcpy (frame->data + frame->offset, bytes_cursor, available_size); - bytes_cursor += available_size; - frame->offset += available_size; - *incoming_bytes_size = (size_t) (bytes_cursor - incoming_bytes); - return TSI_INCOMPLETE_DATA; - } - memcpy (frame->data + frame->offset, bytes_cursor, to_read_size); - bytes_cursor += to_read_size; - frame->offset += to_read_size; - available_size -= to_read_size; - frame->size = load32_little_endian (frame->data); - if (!tsi_fake_frame_ensure_size (frame)) - return TSI_OUT_OF_RESOURCES; - } - - to_read_size = frame->size - frame->offset; - if (to_read_size > available_size) - { - memcpy (frame->data + frame->offset, bytes_cursor, available_size); - frame->offset += available_size; + if (frame->needs_draining) return TSI_INTERNAL_ERROR; + if (frame->data == NULL) { + frame->allocated_size = TSI_FAKE_FRAME_INITIAL_ALLOCATED_SIZE; + frame->data = malloc(frame->allocated_size); + if (frame->data == NULL) return TSI_OUT_OF_RESOURCES; + } + + if (frame->offset < TSI_FAKE_FRAME_HEADER_SIZE) { + to_read_size = TSI_FAKE_FRAME_HEADER_SIZE - frame->offset; + if (to_read_size > available_size) { + /* Just fill what we can and exit. */ + memcpy(frame->data + frame->offset, bytes_cursor, available_size); bytes_cursor += available_size; - *incoming_bytes_size = (size_t) (bytes_cursor - incoming_bytes); + frame->offset += available_size; + *incoming_bytes_size = (size_t)(bytes_cursor - incoming_bytes); return TSI_INCOMPLETE_DATA; } - memcpy (frame->data + frame->offset, bytes_cursor, to_read_size); + memcpy(frame->data + frame->offset, bytes_cursor, to_read_size); + bytes_cursor += to_read_size; + frame->offset += to_read_size; + available_size -= to_read_size; + frame->size = load32_little_endian(frame->data); + if (!tsi_fake_frame_ensure_size(frame)) return TSI_OUT_OF_RESOURCES; + } + + to_read_size = frame->size - frame->offset; + if (to_read_size > available_size) { + memcpy(frame->data + frame->offset, bytes_cursor, available_size); + frame->offset += available_size; + bytes_cursor += available_size; + *incoming_bytes_size = (size_t)(bytes_cursor - incoming_bytes); + return TSI_INCOMPLETE_DATA; + } + memcpy(frame->data + frame->offset, bytes_cursor, to_read_size); bytes_cursor += to_read_size; - *incoming_bytes_size = (size_t) (bytes_cursor - incoming_bytes); - tsi_fake_frame_reset (frame, 1 /* needs_draining */ ); + *incoming_bytes_size = (size_t)(bytes_cursor - incoming_bytes); + tsi_fake_frame_reset(frame, 1 /* needs_draining */); return TSI_OK; } /* This method should not be called if frame->needs_framing is 0. */ -static tsi_result -drain_frame_to_bytes (unsigned char *outgoing_bytes, size_t * outgoing_bytes_size, tsi_fake_frame * frame) -{ +static tsi_result drain_frame_to_bytes(unsigned char *outgoing_bytes, + size_t *outgoing_bytes_size, + tsi_fake_frame *frame) { size_t to_write_size = frame->size - frame->offset; - if (!frame->needs_draining) - return TSI_INTERNAL_ERROR; - if (*outgoing_bytes_size < to_write_size) - { - memcpy (outgoing_bytes, frame->data + frame->offset, *outgoing_bytes_size); - frame->offset += *outgoing_bytes_size; - return TSI_INCOMPLETE_DATA; - } - memcpy (outgoing_bytes, frame->data + frame->offset, to_write_size); + if (!frame->needs_draining) return TSI_INTERNAL_ERROR; + if (*outgoing_bytes_size < to_write_size) { + memcpy(outgoing_bytes, frame->data + frame->offset, *outgoing_bytes_size); + frame->offset += *outgoing_bytes_size; + return TSI_INCOMPLETE_DATA; + } + memcpy(outgoing_bytes, frame->data + frame->offset, to_write_size); *outgoing_bytes_size = to_write_size; - tsi_fake_frame_reset (frame, 0 /* needs_draining */ ); + tsi_fake_frame_reset(frame, 0 /* needs_draining */); return TSI_OK; } -static tsi_result -bytes_to_frame (unsigned char *bytes, size_t bytes_size, tsi_fake_frame * frame) -{ +static tsi_result bytes_to_frame(unsigned char *bytes, size_t bytes_size, + tsi_fake_frame *frame) { frame->offset = 0; frame->size = bytes_size + TSI_FAKE_FRAME_HEADER_SIZE; - if (!tsi_fake_frame_ensure_size (frame)) - return TSI_OUT_OF_RESOURCES; - store32_little_endian ((gpr_uint32) frame->size, frame->data); - memcpy (frame->data + TSI_FAKE_FRAME_HEADER_SIZE, bytes, bytes_size); - tsi_fake_frame_reset (frame, 1 /* needs draining */ ); + if (!tsi_fake_frame_ensure_size(frame)) return TSI_OUT_OF_RESOURCES; + store32_little_endian((gpr_uint32)frame->size, frame->data); + memcpy(frame->data + TSI_FAKE_FRAME_HEADER_SIZE, bytes, bytes_size); + tsi_fake_frame_reset(frame, 1 /* needs draining */); return TSI_OK; } -static void -tsi_fake_frame_destruct (tsi_fake_frame * frame) -{ - if (frame->data != NULL) - free (frame->data); +static void tsi_fake_frame_destruct(tsi_fake_frame *frame) { + if (frame->data != NULL) free(frame->data); } /* --- tsi_frame_protector methods implementation. ---*/ -static tsi_result -fake_protector_protect (tsi_frame_protector * self, const unsigned char *unprotected_bytes, size_t * unprotected_bytes_size, unsigned char *protected_output_frames, size_t * protected_output_frames_size) -{ +static tsi_result fake_protector_protect(tsi_frame_protector *self, + const unsigned char *unprotected_bytes, + size_t *unprotected_bytes_size, + unsigned char *protected_output_frames, + size_t *protected_output_frames_size) { tsi_result result = TSI_OK; - tsi_fake_frame_protector *impl = (tsi_fake_frame_protector *) self; + tsi_fake_frame_protector *impl = (tsi_fake_frame_protector *)self; unsigned char frame_header[TSI_FAKE_FRAME_HEADER_SIZE]; tsi_fake_frame *frame = &impl->protect_frame; size_t saved_output_size = *protected_output_frames_size; @@ -281,86 +246,79 @@ fake_protector_protect (tsi_frame_protector * self, const unsigned char *unprote *num_bytes_written = 0; /* Try to drain first. */ - if (frame->needs_draining) - { - drained_size = saved_output_size - *num_bytes_written; - result = drain_frame_to_bytes (protected_output_frames, &drained_size, frame); - *num_bytes_written += drained_size; - protected_output_frames += drained_size; - if (result != TSI_OK) - { - if (result == TSI_INCOMPLETE_DATA) - { - *unprotected_bytes_size = 0; - result = TSI_OK; - } - return result; - } + if (frame->needs_draining) { + drained_size = saved_output_size - *num_bytes_written; + result = + drain_frame_to_bytes(protected_output_frames, &drained_size, frame); + *num_bytes_written += drained_size; + protected_output_frames += drained_size; + if (result != TSI_OK) { + if (result == TSI_INCOMPLETE_DATA) { + *unprotected_bytes_size = 0; + result = TSI_OK; + } + return result; } + } /* Now process the unprotected_bytes. */ - if (frame->needs_draining) - return TSI_INTERNAL_ERROR; - if (frame->size == 0) - { - /* New frame, create a header. */ - size_t written_in_frame_size = 0; - store32_little_endian ((gpr_uint32) impl->max_frame_size, frame_header); - written_in_frame_size = TSI_FAKE_FRAME_HEADER_SIZE; - result = fill_frame_from_bytes (frame_header, &written_in_frame_size, frame); - if (result != TSI_INCOMPLETE_DATA) - { - gpr_log (GPR_ERROR, "fill_frame_from_bytes returned %s", tsi_result_to_string (result)); - return result; - } - } - result = fill_frame_from_bytes (unprotected_bytes, unprotected_bytes_size, frame); - if (result != TSI_OK) - { - if (result == TSI_INCOMPLETE_DATA) - result = TSI_OK; + if (frame->needs_draining) return TSI_INTERNAL_ERROR; + if (frame->size == 0) { + /* New frame, create a header. */ + size_t written_in_frame_size = 0; + store32_little_endian((gpr_uint32)impl->max_frame_size, frame_header); + written_in_frame_size = TSI_FAKE_FRAME_HEADER_SIZE; + result = fill_frame_from_bytes(frame_header, &written_in_frame_size, frame); + if (result != TSI_INCOMPLETE_DATA) { + gpr_log(GPR_ERROR, "fill_frame_from_bytes returned %s", + tsi_result_to_string(result)); return result; } + } + result = + fill_frame_from_bytes(unprotected_bytes, unprotected_bytes_size, frame); + if (result != TSI_OK) { + if (result == TSI_INCOMPLETE_DATA) result = TSI_OK; + return result; + } /* Try to drain again. */ - if (!frame->needs_draining) - return TSI_INTERNAL_ERROR; - if (frame->offset != 0) - return TSI_INTERNAL_ERROR; + if (!frame->needs_draining) return TSI_INTERNAL_ERROR; + if (frame->offset != 0) return TSI_INTERNAL_ERROR; drained_size = saved_output_size - *num_bytes_written; - result = drain_frame_to_bytes (protected_output_frames, &drained_size, frame); + result = drain_frame_to_bytes(protected_output_frames, &drained_size, frame); *num_bytes_written += drained_size; - if (result == TSI_INCOMPLETE_DATA) - result = TSI_OK; + if (result == TSI_INCOMPLETE_DATA) result = TSI_OK; return result; } -static tsi_result -fake_protector_protect_flush (tsi_frame_protector * self, unsigned char *protected_output_frames, size_t * protected_output_frames_size, size_t * still_pending_size) -{ +static tsi_result fake_protector_protect_flush( + tsi_frame_protector *self, unsigned char *protected_output_frames, + size_t *protected_output_frames_size, size_t *still_pending_size) { tsi_result result = TSI_OK; - tsi_fake_frame_protector *impl = (tsi_fake_frame_protector *) self; + tsi_fake_frame_protector *impl = (tsi_fake_frame_protector *)self; tsi_fake_frame *frame = &impl->protect_frame; - if (!frame->needs_draining) - { - /* Create a short frame. */ - frame->size = frame->offset; - frame->offset = 0; - frame->needs_draining = 1; - store32_little_endian ((gpr_uint32) frame->size, frame->data); /* Overwrite header. */ - } - result = drain_frame_to_bytes (protected_output_frames, protected_output_frames_size, frame); - if (result == TSI_INCOMPLETE_DATA) - result = TSI_OK; + if (!frame->needs_draining) { + /* Create a short frame. */ + frame->size = frame->offset; + frame->offset = 0; + frame->needs_draining = 1; + store32_little_endian((gpr_uint32)frame->size, + frame->data); /* Overwrite header. */ + } + result = drain_frame_to_bytes(protected_output_frames, + protected_output_frames_size, frame); + if (result == TSI_INCOMPLETE_DATA) result = TSI_OK; *still_pending_size = frame->size - frame->offset; return result; } -static tsi_result -fake_protector_unprotect (tsi_frame_protector * self, const unsigned char *protected_frames_bytes, size_t * protected_frames_bytes_size, unsigned char *unprotected_bytes, size_t * unprotected_bytes_size) -{ +static tsi_result fake_protector_unprotect( + tsi_frame_protector *self, const unsigned char *protected_frames_bytes, + size_t *protected_frames_bytes_size, unsigned char *unprotected_bytes, + size_t *unprotected_bytes_size) { tsi_result result = TSI_OK; - tsi_fake_frame_protector *impl = (tsi_fake_frame_protector *) self; + tsi_fake_frame_protector *impl = (tsi_fake_frame_protector *)self; tsi_fake_frame *frame = &impl->unprotect_frame; size_t saved_output_size = *unprotected_bytes_size; size_t drained_size = 0; @@ -368,232 +326,202 @@ fake_protector_unprotect (tsi_frame_protector * self, const unsigned char *prote *num_bytes_written = 0; /* Try to drain first. */ - if (frame->needs_draining) - { - /* Go past the header if needed. */ - if (frame->offset == 0) - frame->offset = TSI_FAKE_FRAME_HEADER_SIZE; - drained_size = saved_output_size - *num_bytes_written; - result = drain_frame_to_bytes (unprotected_bytes, &drained_size, frame); - unprotected_bytes += drained_size; - *num_bytes_written += drained_size; - if (result != TSI_OK) - { - if (result == TSI_INCOMPLETE_DATA) - { - *protected_frames_bytes_size = 0; - result = TSI_OK; - } - return result; - } + if (frame->needs_draining) { + /* Go past the header if needed. */ + if (frame->offset == 0) frame->offset = TSI_FAKE_FRAME_HEADER_SIZE; + drained_size = saved_output_size - *num_bytes_written; + result = drain_frame_to_bytes(unprotected_bytes, &drained_size, frame); + unprotected_bytes += drained_size; + *num_bytes_written += drained_size; + if (result != TSI_OK) { + if (result == TSI_INCOMPLETE_DATA) { + *protected_frames_bytes_size = 0; + result = TSI_OK; + } + return result; } + } /* Now process the protected_bytes. */ - if (frame->needs_draining) - return TSI_INTERNAL_ERROR; - result = fill_frame_from_bytes (protected_frames_bytes, protected_frames_bytes_size, frame); - if (result != TSI_OK) - { - if (result == TSI_INCOMPLETE_DATA) - result = TSI_OK; - return result; - } + if (frame->needs_draining) return TSI_INTERNAL_ERROR; + result = fill_frame_from_bytes(protected_frames_bytes, + protected_frames_bytes_size, frame); + if (result != TSI_OK) { + if (result == TSI_INCOMPLETE_DATA) result = TSI_OK; + return result; + } /* Try to drain again. */ - if (!frame->needs_draining) - return TSI_INTERNAL_ERROR; - if (frame->offset != 0) - return TSI_INTERNAL_ERROR; - frame->offset = TSI_FAKE_FRAME_HEADER_SIZE; /* Go past the header. */ + if (!frame->needs_draining) return TSI_INTERNAL_ERROR; + if (frame->offset != 0) return TSI_INTERNAL_ERROR; + frame->offset = TSI_FAKE_FRAME_HEADER_SIZE; /* Go past the header. */ drained_size = saved_output_size - *num_bytes_written; - result = drain_frame_to_bytes (unprotected_bytes, &drained_size, frame); + result = drain_frame_to_bytes(unprotected_bytes, &drained_size, frame); *num_bytes_written += drained_size; - if (result == TSI_INCOMPLETE_DATA) - result = TSI_OK; + if (result == TSI_INCOMPLETE_DATA) result = TSI_OK; return result; } -static void -fake_protector_destroy (tsi_frame_protector * self) -{ - tsi_fake_frame_protector *impl = (tsi_fake_frame_protector *) self; - tsi_fake_frame_destruct (&impl->protect_frame); - tsi_fake_frame_destruct (&impl->unprotect_frame); - free (self); +static void fake_protector_destroy(tsi_frame_protector *self) { + tsi_fake_frame_protector *impl = (tsi_fake_frame_protector *)self; + tsi_fake_frame_destruct(&impl->protect_frame); + tsi_fake_frame_destruct(&impl->unprotect_frame); + free(self); } static const tsi_frame_protector_vtable frame_protector_vtable = { - fake_protector_protect, fake_protector_protect_flush, - fake_protector_unprotect, fake_protector_destroy, + fake_protector_protect, fake_protector_protect_flush, + fake_protector_unprotect, fake_protector_destroy, }; /* --- tsi_handshaker methods implementation. ---*/ -static tsi_result -fake_handshaker_get_bytes_to_send_to_peer (tsi_handshaker * self, unsigned char *bytes, size_t * bytes_size) -{ - tsi_fake_handshaker *impl = (tsi_fake_handshaker *) self; +static tsi_result fake_handshaker_get_bytes_to_send_to_peer( + tsi_handshaker *self, unsigned char *bytes, size_t *bytes_size) { + tsi_fake_handshaker *impl = (tsi_fake_handshaker *)self; tsi_result result = TSI_OK; - if (impl->needs_incoming_message || impl->result == TSI_OK) - { - *bytes_size = 0; - return TSI_OK; + if (impl->needs_incoming_message || impl->result == TSI_OK) { + *bytes_size = 0; + return TSI_OK; + } + if (!impl->outgoing.needs_draining) { + tsi_fake_handshake_message next_message_to_send = + impl->next_message_to_send + 2; + const char *msg_string = + tsi_fake_handshake_message_to_string(impl->next_message_to_send); + result = bytes_to_frame((unsigned char *)msg_string, strlen(msg_string), + &impl->outgoing); + if (result != TSI_OK) return result; + if (next_message_to_send > TSI_FAKE_HANDSHAKE_MESSAGE_MAX) { + next_message_to_send = TSI_FAKE_HANDSHAKE_MESSAGE_MAX; } - if (!impl->outgoing.needs_draining) - { - tsi_fake_handshake_message next_message_to_send = impl->next_message_to_send + 2; - const char *msg_string = tsi_fake_handshake_message_to_string (impl->next_message_to_send); - result = bytes_to_frame ((unsigned char *) msg_string, strlen (msg_string), &impl->outgoing); - if (result != TSI_OK) - return result; - if (next_message_to_send > TSI_FAKE_HANDSHAKE_MESSAGE_MAX) - { - next_message_to_send = TSI_FAKE_HANDSHAKE_MESSAGE_MAX; - } - if (tsi_tracing_enabled) - { - gpr_log (GPR_INFO, "%s prepared %s.", impl->is_client ? "Client" : "Server", tsi_fake_handshake_message_to_string (impl->next_message_to_send)); - } - impl->next_message_to_send = next_message_to_send; + if (tsi_tracing_enabled) { + gpr_log(GPR_INFO, "%s prepared %s.", + impl->is_client ? "Client" : "Server", + tsi_fake_handshake_message_to_string(impl->next_message_to_send)); } - result = drain_frame_to_bytes (bytes, bytes_size, &impl->outgoing); - if (result != TSI_OK) - return result; - if (!impl->is_client && impl->next_message_to_send == TSI_FAKE_HANDSHAKE_MESSAGE_MAX) - { - /* We're done. */ - if (tsi_tracing_enabled) - { - gpr_log (GPR_INFO, "Server is done."); - } - impl->result = TSI_OK; - } - else - { - impl->needs_incoming_message = 1; + impl->next_message_to_send = next_message_to_send; + } + result = drain_frame_to_bytes(bytes, bytes_size, &impl->outgoing); + if (result != TSI_OK) return result; + if (!impl->is_client && + impl->next_message_to_send == TSI_FAKE_HANDSHAKE_MESSAGE_MAX) { + /* We're done. */ + if (tsi_tracing_enabled) { + gpr_log(GPR_INFO, "Server is done."); } + impl->result = TSI_OK; + } else { + impl->needs_incoming_message = 1; + } return TSI_OK; } -static tsi_result -fake_handshaker_process_bytes_from_peer (tsi_handshaker * self, const unsigned char *bytes, size_t * bytes_size) -{ +static tsi_result fake_handshaker_process_bytes_from_peer( + tsi_handshaker *self, const unsigned char *bytes, size_t *bytes_size) { tsi_result result = TSI_OK; - tsi_fake_handshaker *impl = (tsi_fake_handshaker *) self; + tsi_fake_handshaker *impl = (tsi_fake_handshaker *)self; tsi_fake_handshake_message expected_msg = impl->next_message_to_send - 1; tsi_fake_handshake_message received_msg; - if (!impl->needs_incoming_message || impl->result == TSI_OK) - { - *bytes_size = 0; - return TSI_OK; - } - result = fill_frame_from_bytes (bytes, bytes_size, &impl->incoming); - if (result != TSI_OK) - return result; + if (!impl->needs_incoming_message || impl->result == TSI_OK) { + *bytes_size = 0; + return TSI_OK; + } + result = fill_frame_from_bytes(bytes, bytes_size, &impl->incoming); + if (result != TSI_OK) return result; /* We now have a complete frame. */ - result = tsi_fake_handshake_message_from_string ((const char *) impl->incoming.data + TSI_FAKE_FRAME_HEADER_SIZE, &received_msg); - if (result != TSI_OK) - { - impl->result = result; - return result; - } - if (received_msg != expected_msg) - { - gpr_log (GPR_ERROR, "Invalid received message (%s instead of %s)", tsi_fake_handshake_message_to_string (received_msg), tsi_fake_handshake_message_to_string (expected_msg)); - } - if (tsi_tracing_enabled) - { - gpr_log (GPR_INFO, "%s received %s.", impl->is_client ? "Client" : "Server", tsi_fake_handshake_message_to_string (received_msg)); - } - tsi_fake_frame_reset (&impl->incoming, 0 /* needs_draining */ ); + result = tsi_fake_handshake_message_from_string( + (const char *)impl->incoming.data + TSI_FAKE_FRAME_HEADER_SIZE, + &received_msg); + if (result != TSI_OK) { + impl->result = result; + return result; + } + if (received_msg != expected_msg) { + gpr_log(GPR_ERROR, "Invalid received message (%s instead of %s)", + tsi_fake_handshake_message_to_string(received_msg), + tsi_fake_handshake_message_to_string(expected_msg)); + } + if (tsi_tracing_enabled) { + gpr_log(GPR_INFO, "%s received %s.", impl->is_client ? "Client" : "Server", + tsi_fake_handshake_message_to_string(received_msg)); + } + tsi_fake_frame_reset(&impl->incoming, 0 /* needs_draining */); impl->needs_incoming_message = 0; - if (impl->next_message_to_send == TSI_FAKE_HANDSHAKE_MESSAGE_MAX) - { - /* We're done. */ - if (tsi_tracing_enabled) - { - gpr_log (GPR_INFO, "%s is done.", impl->is_client ? "Client" : "Server"); - } - impl->result = TSI_OK; + if (impl->next_message_to_send == TSI_FAKE_HANDSHAKE_MESSAGE_MAX) { + /* We're done. */ + if (tsi_tracing_enabled) { + gpr_log(GPR_INFO, "%s is done.", impl->is_client ? "Client" : "Server"); } + impl->result = TSI_OK; + } return TSI_OK; } -static tsi_result -fake_handshaker_get_result (tsi_handshaker * self) -{ - tsi_fake_handshaker *impl = (tsi_fake_handshaker *) self; +static tsi_result fake_handshaker_get_result(tsi_handshaker *self) { + tsi_fake_handshaker *impl = (tsi_fake_handshaker *)self; return impl->result; } -static tsi_result -fake_handshaker_extract_peer (tsi_handshaker * self, tsi_peer * peer) -{ - tsi_result result = tsi_construct_peer (1, peer); - if (result != TSI_OK) - return result; - result = tsi_construct_string_peer_property_from_cstring (TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_FAKE_CERTIFICATE_TYPE, &peer->properties[0]); - if (result != TSI_OK) - tsi_peer_destruct (peer); +static tsi_result fake_handshaker_extract_peer(tsi_handshaker *self, + tsi_peer *peer) { + tsi_result result = tsi_construct_peer(1, peer); + if (result != TSI_OK) return result; + result = tsi_construct_string_peer_property_from_cstring( + TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_FAKE_CERTIFICATE_TYPE, + &peer->properties[0]); + if (result != TSI_OK) tsi_peer_destruct(peer); return result; } -static tsi_result -fake_handshaker_create_frame_protector (tsi_handshaker * self, size_t * max_protected_frame_size, tsi_frame_protector ** protector) -{ - *protector = tsi_create_fake_protector (max_protected_frame_size); - if (*protector == NULL) - return TSI_OUT_OF_RESOURCES; +static tsi_result fake_handshaker_create_frame_protector( + tsi_handshaker *self, size_t *max_protected_frame_size, + tsi_frame_protector **protector) { + *protector = tsi_create_fake_protector(max_protected_frame_size); + if (*protector == NULL) return TSI_OUT_OF_RESOURCES; return TSI_OK; } -static void -fake_handshaker_destroy (tsi_handshaker * self) -{ - tsi_fake_handshaker *impl = (tsi_fake_handshaker *) self; - tsi_fake_frame_destruct (&impl->incoming); - tsi_fake_frame_destruct (&impl->outgoing); - free (self); +static void fake_handshaker_destroy(tsi_handshaker *self) { + tsi_fake_handshaker *impl = (tsi_fake_handshaker *)self; + tsi_fake_frame_destruct(&impl->incoming); + tsi_fake_frame_destruct(&impl->outgoing); + free(self); } static const tsi_handshaker_vtable handshaker_vtable = { - fake_handshaker_get_bytes_to_send_to_peer, - fake_handshaker_process_bytes_from_peer, - fake_handshaker_get_result, - fake_handshaker_extract_peer, - fake_handshaker_create_frame_protector, - fake_handshaker_destroy, + fake_handshaker_get_bytes_to_send_to_peer, + fake_handshaker_process_bytes_from_peer, + fake_handshaker_get_result, + fake_handshaker_extract_peer, + fake_handshaker_create_frame_protector, + fake_handshaker_destroy, }; -tsi_handshaker * -tsi_create_fake_handshaker (int is_client) -{ - tsi_fake_handshaker *impl = calloc (1, sizeof (tsi_fake_handshaker)); +tsi_handshaker *tsi_create_fake_handshaker(int is_client) { + tsi_fake_handshaker *impl = calloc(1, sizeof(tsi_fake_handshaker)); impl->base.vtable = &handshaker_vtable; impl->is_client = is_client; impl->result = TSI_HANDSHAKE_IN_PROGRESS; - if (is_client) - { - impl->needs_incoming_message = 0; - impl->next_message_to_send = TSI_FAKE_CLIENT_INIT; - } - else - { - impl->needs_incoming_message = 1; - impl->next_message_to_send = TSI_FAKE_SERVER_INIT; - } + if (is_client) { + impl->needs_incoming_message = 0; + impl->next_message_to_send = TSI_FAKE_CLIENT_INIT; + } else { + impl->needs_incoming_message = 1; + impl->next_message_to_send = TSI_FAKE_SERVER_INIT; + } return &impl->base; } -tsi_frame_protector * -tsi_create_fake_protector (size_t * max_protected_frame_size) -{ - tsi_fake_frame_protector *impl = calloc (1, sizeof (tsi_fake_frame_protector)); - if (impl == NULL) - return NULL; - impl->max_frame_size = (max_protected_frame_size == NULL) ? TSI_FAKE_DEFAULT_FRAME_SIZE : *max_protected_frame_size; +tsi_frame_protector *tsi_create_fake_protector( + size_t *max_protected_frame_size) { + tsi_fake_frame_protector *impl = calloc(1, sizeof(tsi_fake_frame_protector)); + if (impl == NULL) return NULL; + impl->max_frame_size = (max_protected_frame_size == NULL) + ? TSI_FAKE_DEFAULT_FRAME_SIZE + : *max_protected_frame_size; impl->base.vtable = &frame_protector_vtable; return &impl->base; } diff --git a/src/core/tsi/fake_transport_security.h b/src/core/tsi/fake_transport_security.h index 27b4008c94f..fe295aa5360 100644 --- a/src/core/tsi/fake_transport_security.h +++ b/src/core/tsi/fake_transport_security.h @@ -37,8 +37,7 @@ #include "src/core/tsi/transport_security_interface.h" #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* Value for the TSI_CERTIFICATE_TYPE_PEER_PROPERTY property for FAKE certs. */ @@ -49,13 +48,14 @@ extern "C" No cryptography is performed in these objects. They just simulate handshake messages going back and forth for the handshaker and do some framing on cleartext data for the protector. */ - tsi_handshaker *tsi_create_fake_handshaker (int is_client); +tsi_handshaker *tsi_create_fake_handshaker(int is_client); /* Creates a protector directly without going through the handshake phase. */ - tsi_frame_protector *tsi_create_fake_protector (size_t * max_protected_frame_size); +tsi_frame_protector *tsi_create_fake_protector( + size_t *max_protected_frame_size); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_TSI_FAKE_TRANSPORT_SECURITY_H */ +#endif /* GRPC_INTERNAL_CORE_TSI_FAKE_TRANSPORT_SECURITY_H */ diff --git a/src/core/tsi/ssl_transport_security.c b/src/core/tsi/ssl_transport_security.c index a4e3503a963..ad6b2d76847 100644 --- a/src/core/tsi/ssl_transport_security.c +++ b/src/core/tsi/ssl_transport_security.c @@ -43,7 +43,7 @@ #include "src/core/tsi/transport_security.h" #include -#include /* For OPENSSL_free */ +#include /* For OPENSSL_free */ #include #include #include @@ -67,22 +67,21 @@ /* --- Structure definitions. ---*/ -struct tsi_ssl_handshaker_factory -{ - tsi_result (*create_handshaker) (tsi_ssl_handshaker_factory * self, const char *server_name_indication, tsi_handshaker ** handshaker); - void (*destroy) (tsi_ssl_handshaker_factory * self); +struct tsi_ssl_handshaker_factory { + tsi_result (*create_handshaker)(tsi_ssl_handshaker_factory *self, + const char *server_name_indication, + tsi_handshaker **handshaker); + void (*destroy)(tsi_ssl_handshaker_factory *self); }; -typedef struct -{ +typedef struct { tsi_ssl_handshaker_factory base; SSL_CTX *ssl_context; unsigned char *alpn_protocol_list; size_t alpn_protocol_list_length; } tsi_ssl_client_handshaker_factory; -typedef struct -{ +typedef struct { tsi_ssl_handshaker_factory base; /* Several contexts to support SNI. @@ -95,8 +94,7 @@ typedef struct size_t alpn_protocol_list_length; } tsi_ssl_server_handshaker_factory; -typedef struct -{ +typedef struct { tsi_handshaker base; SSL *ssl; BIO *into_ssl; @@ -104,8 +102,7 @@ typedef struct tsi_result result; } tsi_ssl_handshaker; -typedef struct -{ +typedef struct { tsi_frame_protector base; SSL *ssl; BIO *into_ssl; @@ -120,52 +117,39 @@ typedef struct static gpr_once init_openssl_once = GPR_ONCE_INIT; static gpr_mu *openssl_mutexes = NULL; -static void -openssl_locking_cb (int mode, int type, const char *file, int line) -{ - if (mode & CRYPTO_LOCK) - { - gpr_mu_lock (&openssl_mutexes[type]); - } - else - { - gpr_mu_unlock (&openssl_mutexes[type]); - } +static void openssl_locking_cb(int mode, int type, const char *file, int line) { + if (mode & CRYPTO_LOCK) { + gpr_mu_lock(&openssl_mutexes[type]); + } else { + gpr_mu_unlock(&openssl_mutexes[type]); + } } -static unsigned long -openssl_thread_id_cb (void) -{ - return (unsigned long) gpr_thd_currentid (); +static unsigned long openssl_thread_id_cb(void) { + return (unsigned long)gpr_thd_currentid(); } -static void -init_openssl (void) -{ +static void init_openssl(void) { int i; int num_locks; - SSL_library_init (); - SSL_load_error_strings (); - OpenSSL_add_all_algorithms (); - num_locks = CRYPTO_num_locks (); - GPR_ASSERT (num_locks > 0); - openssl_mutexes = malloc ((size_t) num_locks * sizeof (gpr_mu)); - GPR_ASSERT (openssl_mutexes != NULL); - for (i = 0; i < CRYPTO_num_locks (); i++) - { - gpr_mu_init (&openssl_mutexes[i]); - } - CRYPTO_set_locking_callback (openssl_locking_cb); - CRYPTO_set_id_callback (openssl_thread_id_cb); + SSL_library_init(); + SSL_load_error_strings(); + OpenSSL_add_all_algorithms(); + num_locks = CRYPTO_num_locks(); + GPR_ASSERT(num_locks > 0); + openssl_mutexes = malloc((size_t)num_locks * sizeof(gpr_mu)); + GPR_ASSERT(openssl_mutexes != NULL); + for (i = 0; i < CRYPTO_num_locks(); i++) { + gpr_mu_init(&openssl_mutexes[i]); + } + CRYPTO_set_locking_callback(openssl_locking_cb); + CRYPTO_set_id_callback(openssl_thread_id_cb); } /* --- Ssl utils. ---*/ -static const char * -ssl_error_string (int error) -{ - switch (error) - { +static const char *ssl_error_string(int error) { + switch (error) { case SSL_ERROR_NONE: return "SSL_ERROR_NONE"; case SSL_ERROR_ZERO_RETURN: @@ -186,885 +170,791 @@ ssl_error_string (int error) return "SSL_ERROR_SSL"; default: return "Unknown error"; - } + } } /* TODO(jboeuf): Remove when we are past the debugging phase with this code. */ -static void -ssl_log_where_info (const SSL * ssl, int where, int flag, const char *msg) -{ - if ((where & flag) && tsi_tracing_enabled) - { - gpr_log (GPR_INFO, "%20.20s - %30.30s - %5.10s", msg, SSL_state_string_long (ssl), SSL_state_string (ssl)); - } +static void ssl_log_where_info(const SSL *ssl, int where, int flag, + const char *msg) { + if ((where & flag) && tsi_tracing_enabled) { + gpr_log(GPR_INFO, "%20.20s - %30.30s - %5.10s", msg, + SSL_state_string_long(ssl), SSL_state_string(ssl)); + } } /* Used for debugging. TODO(jboeuf): Remove when code is mature enough. */ -static void -ssl_info_callback (const SSL * ssl, int where, int ret) -{ - if (ret == 0) - { - gpr_log (GPR_ERROR, "ssl_info_callback: error occured.\n"); - return; - } +static void ssl_info_callback(const SSL *ssl, int where, int ret) { + if (ret == 0) { + gpr_log(GPR_ERROR, "ssl_info_callback: error occured.\n"); + return; + } - ssl_log_where_info (ssl, where, SSL_CB_LOOP, "LOOP"); - ssl_log_where_info (ssl, where, SSL_CB_HANDSHAKE_START, "HANDSHAKE START"); - ssl_log_where_info (ssl, where, SSL_CB_HANDSHAKE_DONE, "HANDSHAKE DONE"); + ssl_log_where_info(ssl, where, SSL_CB_LOOP, "LOOP"); + ssl_log_where_info(ssl, where, SSL_CB_HANDSHAKE_START, "HANDSHAKE START"); + ssl_log_where_info(ssl, where, SSL_CB_HANDSHAKE_DONE, "HANDSHAKE DONE"); } /* Returns 1 if name looks like an IP address, 0 otherwise. This is a very rough heuristic as it does not handle IPV6 or things like: 0300.0250.00.01, 0xC0.0Xa8.0x0.0x1, 000030052000001, 0xc0.052000001 */ -static int -looks_like_ip_address (const char *name) -{ +static int looks_like_ip_address(const char *name) { size_t i; size_t dot_count = 0; size_t num_size = 0; - for (i = 0; i < strlen (name); i++) - { - if (name[i] >= '0' && name[i] <= '9') - { - if (num_size > 3) - return 0; - num_size++; - } - else if (name[i] == '.') - { - if (dot_count > 3 || num_size == 0) - return 0; - dot_count++; - num_size = 0; - } - else - { - return 0; - } + for (i = 0; i < strlen(name); i++) { + if (name[i] >= '0' && name[i] <= '9') { + if (num_size > 3) return 0; + num_size++; + } else if (name[i] == '.') { + if (dot_count > 3 || num_size == 0) return 0; + dot_count++; + num_size = 0; + } else { + return 0; } - if (dot_count < 3 || num_size == 0) - return 0; + } + if (dot_count < 3 || num_size == 0) return 0; return 1; } /* Gets the subject CN from an X509 cert. */ -static tsi_result -ssl_get_x509_common_name (X509 * cert, unsigned char **utf8, size_t * utf8_size) -{ +static tsi_result ssl_get_x509_common_name(X509 *cert, unsigned char **utf8, + size_t *utf8_size) { int common_name_index = -1; X509_NAME_ENTRY *common_name_entry = NULL; ASN1_STRING *common_name_asn1 = NULL; - X509_NAME *subject_name = X509_get_subject_name (cert); + X509_NAME *subject_name = X509_get_subject_name(cert); int utf8_returned_size = 0; - if (subject_name == NULL) - { - gpr_log (GPR_ERROR, "Could not get subject name from certificate."); - return TSI_NOT_FOUND; - } - common_name_index = X509_NAME_get_index_by_NID (subject_name, NID_commonName, -1); - if (common_name_index == -1) - { - gpr_log (GPR_ERROR, "Could not get common name of subject from certificate."); - return TSI_NOT_FOUND; - } - common_name_entry = X509_NAME_get_entry (subject_name, common_name_index); - if (common_name_entry == NULL) - { - gpr_log (GPR_ERROR, "Could not get common name entry from certificate."); - return TSI_INTERNAL_ERROR; - } - common_name_asn1 = X509_NAME_ENTRY_get_data (common_name_entry); - if (common_name_asn1 == NULL) - { - gpr_log (GPR_ERROR, "Could not get common name entry asn1 from certificate."); - return TSI_INTERNAL_ERROR; - } - utf8_returned_size = ASN1_STRING_to_UTF8 (utf8, common_name_asn1); - if (utf8_returned_size < 0) - { - gpr_log (GPR_ERROR, "Could not extract utf8 from asn1 string."); - return TSI_OUT_OF_RESOURCES; - } - *utf8_size = (size_t) utf8_returned_size; + if (subject_name == NULL) { + gpr_log(GPR_ERROR, "Could not get subject name from certificate."); + return TSI_NOT_FOUND; + } + common_name_index = + X509_NAME_get_index_by_NID(subject_name, NID_commonName, -1); + if (common_name_index == -1) { + gpr_log(GPR_ERROR, + "Could not get common name of subject from certificate."); + return TSI_NOT_FOUND; + } + common_name_entry = X509_NAME_get_entry(subject_name, common_name_index); + if (common_name_entry == NULL) { + gpr_log(GPR_ERROR, "Could not get common name entry from certificate."); + return TSI_INTERNAL_ERROR; + } + common_name_asn1 = X509_NAME_ENTRY_get_data(common_name_entry); + if (common_name_asn1 == NULL) { + gpr_log(GPR_ERROR, + "Could not get common name entry asn1 from certificate."); + return TSI_INTERNAL_ERROR; + } + utf8_returned_size = ASN1_STRING_to_UTF8(utf8, common_name_asn1); + if (utf8_returned_size < 0) { + gpr_log(GPR_ERROR, "Could not extract utf8 from asn1 string."); + return TSI_OUT_OF_RESOURCES; + } + *utf8_size = (size_t)utf8_returned_size; return TSI_OK; } /* Gets the subject CN of an X509 cert as a tsi_peer_property. */ -static tsi_result -peer_property_from_x509_common_name (X509 * cert, tsi_peer_property * property) -{ +static tsi_result peer_property_from_x509_common_name( + X509 *cert, tsi_peer_property *property) { unsigned char *common_name; size_t common_name_size; - tsi_result result = ssl_get_x509_common_name (cert, &common_name, &common_name_size); - if (result != TSI_OK) - { - if (result == TSI_NOT_FOUND) - { - common_name = NULL; - common_name_size = 0; - } - else - { - return result; - } + tsi_result result = + ssl_get_x509_common_name(cert, &common_name, &common_name_size); + if (result != TSI_OK) { + if (result == TSI_NOT_FOUND) { + common_name = NULL; + common_name_size = 0; + } else { + return result; } - result = tsi_construct_string_peer_property (TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, common_name == NULL ? "" : (const char *) common_name, common_name_size, property); - OPENSSL_free (common_name); + } + result = tsi_construct_string_peer_property( + TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, + common_name == NULL ? "" : (const char *)common_name, common_name_size, + property); + OPENSSL_free(common_name); return result; } /* Gets the subject SANs from an X509 cert as a tsi_peer_property. */ -static tsi_result -add_subject_alt_names_properties_to_peer (tsi_peer * peer, GENERAL_NAMES * subject_alt_names, size_t subject_alt_name_count) -{ +static tsi_result add_subject_alt_names_properties_to_peer( + tsi_peer *peer, GENERAL_NAMES *subject_alt_names, + size_t subject_alt_name_count) { size_t i; tsi_result result = TSI_OK; /* Reset for DNS entries filtering. */ peer->property_count -= subject_alt_name_count; - for (i = 0; i < subject_alt_name_count; i++) - { - GENERAL_NAME *subject_alt_name = sk_GENERAL_NAME_value (subject_alt_names, (int) i); - /* Filter out the non-dns entries names. */ - if (subject_alt_name->type == GEN_DNS) - { - unsigned char *dns_name = NULL; - int dns_name_size = ASN1_STRING_to_UTF8 (&dns_name, subject_alt_name->d.dNSName); - if (dns_name_size < 0) - { - gpr_log (GPR_ERROR, "Could not get utf8 from asn1 string."); - result = TSI_INTERNAL_ERROR; - break; - } - result = tsi_construct_string_peer_property (TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, (const char *) dns_name, (size_t) dns_name_size, &peer->properties[peer->property_count++]); - OPENSSL_free (dns_name); - if (result != TSI_OK) - break; - } + for (i = 0; i < subject_alt_name_count; i++) { + GENERAL_NAME *subject_alt_name = + sk_GENERAL_NAME_value(subject_alt_names, (int)i); + /* Filter out the non-dns entries names. */ + if (subject_alt_name->type == GEN_DNS) { + unsigned char *dns_name = NULL; + int dns_name_size = + ASN1_STRING_to_UTF8(&dns_name, subject_alt_name->d.dNSName); + if (dns_name_size < 0) { + gpr_log(GPR_ERROR, "Could not get utf8 from asn1 string."); + result = TSI_INTERNAL_ERROR; + break; + } + result = tsi_construct_string_peer_property( + TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, + (const char *)dns_name, (size_t)dns_name_size, + &peer->properties[peer->property_count++]); + OPENSSL_free(dns_name); + if (result != TSI_OK) break; } + } return result; } /* Gets information about the peer's X509 cert as a tsi_peer object. */ -static tsi_result -peer_from_x509 (X509 * cert, int include_certificate_type, tsi_peer * peer) -{ +static tsi_result peer_from_x509(X509 *cert, int include_certificate_type, + tsi_peer *peer) { /* TODO(jboeuf): Maybe add more properties. */ - GENERAL_NAMES *subject_alt_names = X509_get_ext_d2i (cert, NID_subject_alt_name, 0, 0); - int subject_alt_name_count = (subject_alt_names != NULL) ? sk_GENERAL_NAME_num (subject_alt_names) : 0; + GENERAL_NAMES *subject_alt_names = + X509_get_ext_d2i(cert, NID_subject_alt_name, 0, 0); + int subject_alt_name_count = + (subject_alt_names != NULL) ? sk_GENERAL_NAME_num(subject_alt_names) : 0; size_t property_count; tsi_result result; - GPR_ASSERT (subject_alt_name_count >= 0); - property_count = (include_certificate_type ? (size_t) 1 : 0) + 1 /* common name */ + (size_t) subject_alt_name_count; - result = tsi_construct_peer (property_count, peer); - if (result != TSI_OK) - return result; - do - { - if (include_certificate_type) - { - result = tsi_construct_string_peer_property_from_cstring (TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, &peer->properties[0]); - if (result != TSI_OK) - break; - } - result = peer_property_from_x509_common_name (cert, &peer->properties[include_certificate_type ? 1 : 0]); - if (result != TSI_OK) - break; - - if (subject_alt_name_count != 0) - { - result = add_subject_alt_names_properties_to_peer (peer, subject_alt_names, (size_t) subject_alt_name_count); - if (result != TSI_OK) - break; - } - } - while (0); - - if (subject_alt_names != NULL) - { - sk_GENERAL_NAME_pop_free (subject_alt_names, GENERAL_NAME_free); - } - if (result != TSI_OK) - tsi_peer_destruct (peer); + GPR_ASSERT(subject_alt_name_count >= 0); + property_count = (include_certificate_type ? (size_t)1 : 0) + + 1 /* common name */ + (size_t)subject_alt_name_count; + result = tsi_construct_peer(property_count, peer); + if (result != TSI_OK) return result; + do { + if (include_certificate_type) { + result = tsi_construct_string_peer_property_from_cstring( + TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, + &peer->properties[0]); + if (result != TSI_OK) break; + } + result = peer_property_from_x509_common_name( + cert, &peer->properties[include_certificate_type ? 1 : 0]); + if (result != TSI_OK) break; + + if (subject_alt_name_count != 0) { + result = add_subject_alt_names_properties_to_peer( + peer, subject_alt_names, (size_t)subject_alt_name_count); + if (result != TSI_OK) break; + } + } while (0); + + if (subject_alt_names != NULL) { + sk_GENERAL_NAME_pop_free(subject_alt_names, GENERAL_NAME_free); + } + if (result != TSI_OK) tsi_peer_destruct(peer); return result; } /* Logs the SSL error stack. */ -static void -log_ssl_error_stack (void) -{ +static void log_ssl_error_stack(void) { unsigned long err; - while ((err = ERR_get_error ()) != 0) - { - char details[256]; - ERR_error_string_n (err, details, sizeof (details)); - gpr_log (GPR_ERROR, "%s", details); - } + while ((err = ERR_get_error()) != 0) { + char details[256]; + ERR_error_string_n(err, details, sizeof(details)); + gpr_log(GPR_ERROR, "%s", details); + } } /* Performs an SSL_read and handle errors. */ -static tsi_result -do_ssl_read (SSL * ssl, unsigned char *unprotected_bytes, size_t * unprotected_bytes_size) -{ +static tsi_result do_ssl_read(SSL *ssl, unsigned char *unprotected_bytes, + size_t *unprotected_bytes_size) { int read_from_ssl; - GPR_ASSERT (*unprotected_bytes_size <= INT_MAX); - read_from_ssl = SSL_read (ssl, unprotected_bytes, (int) *unprotected_bytes_size); - if (read_from_ssl == 0) - { - gpr_log (GPR_ERROR, "SSL_read returned 0 unexpectedly."); - return TSI_INTERNAL_ERROR; - } - if (read_from_ssl < 0) - { - read_from_ssl = SSL_get_error (ssl, read_from_ssl); - switch (read_from_ssl) - { - case SSL_ERROR_WANT_READ: - /* We need more data to finish the frame. */ - *unprotected_bytes_size = 0; - return TSI_OK; - case SSL_ERROR_WANT_WRITE: - gpr_log (GPR_ERROR, "Peer tried to renegotiate SSL connection. This is unsupported."); - return TSI_UNIMPLEMENTED; - case SSL_ERROR_SSL: - gpr_log (GPR_ERROR, "Corruption detected."); - log_ssl_error_stack (); - return TSI_DATA_CORRUPTED; - default: - gpr_log (GPR_ERROR, "SSL_read failed with error %s.", ssl_error_string (read_from_ssl)); - return TSI_PROTOCOL_FAILURE; - } + GPR_ASSERT(*unprotected_bytes_size <= INT_MAX); + read_from_ssl = + SSL_read(ssl, unprotected_bytes, (int)*unprotected_bytes_size); + if (read_from_ssl == 0) { + gpr_log(GPR_ERROR, "SSL_read returned 0 unexpectedly."); + return TSI_INTERNAL_ERROR; + } + if (read_from_ssl < 0) { + read_from_ssl = SSL_get_error(ssl, read_from_ssl); + switch (read_from_ssl) { + case SSL_ERROR_WANT_READ: + /* We need more data to finish the frame. */ + *unprotected_bytes_size = 0; + return TSI_OK; + case SSL_ERROR_WANT_WRITE: + gpr_log( + GPR_ERROR, + "Peer tried to renegotiate SSL connection. This is unsupported."); + return TSI_UNIMPLEMENTED; + case SSL_ERROR_SSL: + gpr_log(GPR_ERROR, "Corruption detected."); + log_ssl_error_stack(); + return TSI_DATA_CORRUPTED; + default: + gpr_log(GPR_ERROR, "SSL_read failed with error %s.", + ssl_error_string(read_from_ssl)); + return TSI_PROTOCOL_FAILURE; } - *unprotected_bytes_size = (size_t) read_from_ssl; + } + *unprotected_bytes_size = (size_t)read_from_ssl; return TSI_OK; } /* Performs an SSL_write and handle errors. */ -static tsi_result -do_ssl_write (SSL * ssl, unsigned char *unprotected_bytes, size_t unprotected_bytes_size) -{ +static tsi_result do_ssl_write(SSL *ssl, unsigned char *unprotected_bytes, + size_t unprotected_bytes_size) { int ssl_write_result; - GPR_ASSERT (unprotected_bytes_size <= INT_MAX); - ssl_write_result = SSL_write (ssl, unprotected_bytes, (int) unprotected_bytes_size); - if (ssl_write_result < 0) - { - ssl_write_result = SSL_get_error (ssl, ssl_write_result); - if (ssl_write_result == SSL_ERROR_WANT_READ) - { - gpr_log (GPR_ERROR, "Peer tried to renegotiate SSL connection. This is unsupported."); - return TSI_UNIMPLEMENTED; - } - else - { - gpr_log (GPR_ERROR, "SSL_write failed with error %s.", ssl_error_string (ssl_write_result)); - return TSI_INTERNAL_ERROR; - } + GPR_ASSERT(unprotected_bytes_size <= INT_MAX); + ssl_write_result = + SSL_write(ssl, unprotected_bytes, (int)unprotected_bytes_size); + if (ssl_write_result < 0) { + ssl_write_result = SSL_get_error(ssl, ssl_write_result); + if (ssl_write_result == SSL_ERROR_WANT_READ) { + gpr_log(GPR_ERROR, + "Peer tried to renegotiate SSL connection. This is unsupported."); + return TSI_UNIMPLEMENTED; + } else { + gpr_log(GPR_ERROR, "SSL_write failed with error %s.", + ssl_error_string(ssl_write_result)); + return TSI_INTERNAL_ERROR; } + } return TSI_OK; } /* Loads an in-memory PEM certificate chain into the SSL context. */ -static tsi_result -ssl_ctx_use_certificate_chain (SSL_CTX * context, const unsigned char *pem_cert_chain, size_t pem_cert_chain_size) -{ +static tsi_result ssl_ctx_use_certificate_chain( + SSL_CTX *context, const unsigned char *pem_cert_chain, + size_t pem_cert_chain_size) { tsi_result result = TSI_OK; X509 *certificate = NULL; BIO *pem; - GPR_ASSERT (pem_cert_chain_size <= INT_MAX); - pem = BIO_new_mem_buf ((void *) pem_cert_chain, (int) pem_cert_chain_size); - if (pem == NULL) - return TSI_OUT_OF_RESOURCES; + GPR_ASSERT(pem_cert_chain_size <= INT_MAX); + pem = BIO_new_mem_buf((void *)pem_cert_chain, (int)pem_cert_chain_size); + if (pem == NULL) return TSI_OUT_OF_RESOURCES; - do - { - certificate = PEM_read_bio_X509_AUX (pem, NULL, NULL, ""); - if (certificate == NULL) - { - result = TSI_INVALID_ARGUMENT; - break; - } - if (!SSL_CTX_use_certificate (context, certificate)) - { - result = TSI_INVALID_ARGUMENT; - break; - } - while (1) - { - X509 *certificate_authority = PEM_read_bio_X509 (pem, NULL, NULL, ""); - if (certificate_authority == NULL) - { - ERR_clear_error (); - break; /* Done reading. */ - } - if (!SSL_CTX_add_extra_chain_cert (context, certificate_authority)) - { - X509_free (certificate_authority); - result = TSI_INVALID_ARGUMENT; - break; - } - /* We don't need to free certificate_authority as its ownership has been - transfered to the context. That is not the case for certificate though. - */ - } + do { + certificate = PEM_read_bio_X509_AUX(pem, NULL, NULL, ""); + if (certificate == NULL) { + result = TSI_INVALID_ARGUMENT; + break; + } + if (!SSL_CTX_use_certificate(context, certificate)) { + result = TSI_INVALID_ARGUMENT; + break; + } + while (1) { + X509 *certificate_authority = PEM_read_bio_X509(pem, NULL, NULL, ""); + if (certificate_authority == NULL) { + ERR_clear_error(); + break; /* Done reading. */ + } + if (!SSL_CTX_add_extra_chain_cert(context, certificate_authority)) { + X509_free(certificate_authority); + result = TSI_INVALID_ARGUMENT; + break; + } + /* We don't need to free certificate_authority as its ownership has been + transfered to the context. That is not the case for certificate though. + */ } - while (0); + } while (0); - if (certificate != NULL) - X509_free (certificate); - BIO_free (pem); + if (certificate != NULL) X509_free(certificate); + BIO_free(pem); return result; } /* Loads an in-memory PEM private key into the SSL context. */ -static tsi_result -ssl_ctx_use_private_key (SSL_CTX * context, const unsigned char *pem_key, size_t pem_key_size) -{ +static tsi_result ssl_ctx_use_private_key(SSL_CTX *context, + const unsigned char *pem_key, + size_t pem_key_size) { tsi_result result = TSI_OK; EVP_PKEY *private_key = NULL; BIO *pem; - GPR_ASSERT (pem_key_size <= INT_MAX); - pem = BIO_new_mem_buf ((void *) pem_key, (int) pem_key_size); - if (pem == NULL) - return TSI_OUT_OF_RESOURCES; - do - { - private_key = PEM_read_bio_PrivateKey (pem, NULL, NULL, ""); - if (private_key == NULL) - { - result = TSI_INVALID_ARGUMENT; - break; - } - if (!SSL_CTX_use_PrivateKey (context, private_key)) - { - result = TSI_INVALID_ARGUMENT; - break; - } + GPR_ASSERT(pem_key_size <= INT_MAX); + pem = BIO_new_mem_buf((void *)pem_key, (int)pem_key_size); + if (pem == NULL) return TSI_OUT_OF_RESOURCES; + do { + private_key = PEM_read_bio_PrivateKey(pem, NULL, NULL, ""); + if (private_key == NULL) { + result = TSI_INVALID_ARGUMENT; + break; } - while (0); - if (private_key != NULL) - EVP_PKEY_free (private_key); - BIO_free (pem); + if (!SSL_CTX_use_PrivateKey(context, private_key)) { + result = TSI_INVALID_ARGUMENT; + break; + } + } while (0); + if (private_key != NULL) EVP_PKEY_free(private_key); + BIO_free(pem); return result; } /* Loads in-memory PEM verification certs into the SSL context and optionally returns the verification cert names (root_names can be NULL). */ -static tsi_result -ssl_ctx_load_verification_certs (SSL_CTX * context, const unsigned char *pem_roots, size_t pem_roots_size, STACK_OF (X509_NAME) * *root_names) -{ +static tsi_result ssl_ctx_load_verification_certs( + SSL_CTX *context, const unsigned char *pem_roots, size_t pem_roots_size, + STACK_OF(X509_NAME) * *root_names) { tsi_result result = TSI_OK; size_t num_roots = 0; X509 *root = NULL; X509_NAME *root_name = NULL; BIO *pem; X509_STORE *root_store; - GPR_ASSERT (pem_roots_size <= INT_MAX); - pem = BIO_new_mem_buf ((void *) pem_roots, (int) pem_roots_size); - root_store = SSL_CTX_get_cert_store (context); - if (root_store == NULL) - return TSI_INVALID_ARGUMENT; - if (pem == NULL) - return TSI_OUT_OF_RESOURCES; - if (root_names != NULL) - { - *root_names = sk_X509_NAME_new_null (); - if (*root_names == NULL) - return TSI_OUT_OF_RESOURCES; - } + GPR_ASSERT(pem_roots_size <= INT_MAX); + pem = BIO_new_mem_buf((void *)pem_roots, (int)pem_roots_size); + root_store = SSL_CTX_get_cert_store(context); + if (root_store == NULL) return TSI_INVALID_ARGUMENT; + if (pem == NULL) return TSI_OUT_OF_RESOURCES; + if (root_names != NULL) { + *root_names = sk_X509_NAME_new_null(); + if (*root_names == NULL) return TSI_OUT_OF_RESOURCES; + } - while (1) - { - root = PEM_read_bio_X509_AUX (pem, NULL, NULL, ""); - if (root == NULL) - { - ERR_clear_error (); - break; /* We're at the end of stream. */ - } - if (root_names != NULL) - { - root_name = X509_get_subject_name (root); - if (root_name == NULL) - { - gpr_log (GPR_ERROR, "Could not get name from root certificate."); - result = TSI_INVALID_ARGUMENT; - break; - } - root_name = X509_NAME_dup (root_name); - if (root_name == NULL) - { - result = TSI_OUT_OF_RESOURCES; - break; - } - sk_X509_NAME_push (*root_names, root_name); - root_name = NULL; - } - if (!X509_STORE_add_cert (root_store, root)) - { - gpr_log (GPR_ERROR, "Could not add root certificate to ssl context."); - result = TSI_INTERNAL_ERROR; - break; - } - X509_free (root); - num_roots++; + while (1) { + root = PEM_read_bio_X509_AUX(pem, NULL, NULL, ""); + if (root == NULL) { + ERR_clear_error(); + break; /* We're at the end of stream. */ + } + if (root_names != NULL) { + root_name = X509_get_subject_name(root); + if (root_name == NULL) { + gpr_log(GPR_ERROR, "Could not get name from root certificate."); + result = TSI_INVALID_ARGUMENT; + break; + } + root_name = X509_NAME_dup(root_name); + if (root_name == NULL) { + result = TSI_OUT_OF_RESOURCES; + break; + } + sk_X509_NAME_push(*root_names, root_name); + root_name = NULL; } - - if (num_roots == 0) - { - gpr_log (GPR_ERROR, "Could not load any root certificate."); - result = TSI_INVALID_ARGUMENT; + if (!X509_STORE_add_cert(root_store, root)) { + gpr_log(GPR_ERROR, "Could not add root certificate to ssl context."); + result = TSI_INTERNAL_ERROR; + break; } + X509_free(root); + num_roots++; + } - if (result != TSI_OK) - { - if (root != NULL) - X509_free (root); - if (root_names != NULL) - { - sk_X509_NAME_pop_free (*root_names, X509_NAME_free); - *root_names = NULL; - if (root_name != NULL) - X509_NAME_free (root_name); - } + if (num_roots == 0) { + gpr_log(GPR_ERROR, "Could not load any root certificate."); + result = TSI_INVALID_ARGUMENT; + } + + if (result != TSI_OK) { + if (root != NULL) X509_free(root); + if (root_names != NULL) { + sk_X509_NAME_pop_free(*root_names, X509_NAME_free); + *root_names = NULL; + if (root_name != NULL) X509_NAME_free(root_name); } - BIO_free (pem); + } + BIO_free(pem); return result; } /* Populates the SSL context with a private key and a cert chain, and sets the cipher list and the ephemeral ECDH key. */ -static tsi_result -populate_ssl_context (SSL_CTX * context, const unsigned char *pem_private_key, size_t pem_private_key_size, const unsigned char *pem_certificate_chain, size_t pem_certificate_chain_size, const char *cipher_list) -{ +static tsi_result populate_ssl_context( + SSL_CTX *context, const unsigned char *pem_private_key, + size_t pem_private_key_size, const unsigned char *pem_certificate_chain, + size_t pem_certificate_chain_size, const char *cipher_list) { tsi_result result = TSI_OK; - if (pem_certificate_chain != NULL) - { - result = ssl_ctx_use_certificate_chain (context, pem_certificate_chain, pem_certificate_chain_size); - if (result != TSI_OK) - { - gpr_log (GPR_ERROR, "Invalid cert chain file."); - return result; - } - } - if (pem_private_key != NULL) - { - result = ssl_ctx_use_private_key (context, pem_private_key, pem_private_key_size); - if (result != TSI_OK || !SSL_CTX_check_private_key (context)) - { - gpr_log (GPR_ERROR, "Invalid private key."); - return result != TSI_OK ? result : TSI_INVALID_ARGUMENT; - } + if (pem_certificate_chain != NULL) { + result = ssl_ctx_use_certificate_chain(context, pem_certificate_chain, + pem_certificate_chain_size); + if (result != TSI_OK) { + gpr_log(GPR_ERROR, "Invalid cert chain file."); + return result; } - if ((cipher_list != NULL) && !SSL_CTX_set_cipher_list (context, cipher_list)) - { - gpr_log (GPR_ERROR, "Invalid cipher list: %s.", cipher_list); - return TSI_INVALID_ARGUMENT; + } + if (pem_private_key != NULL) { + result = + ssl_ctx_use_private_key(context, pem_private_key, pem_private_key_size); + if (result != TSI_OK || !SSL_CTX_check_private_key(context)) { + gpr_log(GPR_ERROR, "Invalid private key."); + return result != TSI_OK ? result : TSI_INVALID_ARGUMENT; } + } + if ((cipher_list != NULL) && !SSL_CTX_set_cipher_list(context, cipher_list)) { + gpr_log(GPR_ERROR, "Invalid cipher list: %s.", cipher_list); + return TSI_INVALID_ARGUMENT; + } { - EC_KEY *ecdh = EC_KEY_new_by_curve_name (NID_X9_62_prime256v1); - if (!SSL_CTX_set_tmp_ecdh (context, ecdh)) - { - gpr_log (GPR_ERROR, "Could not set ephemeral ECDH key."); - EC_KEY_free (ecdh); - return TSI_INTERNAL_ERROR; - } - SSL_CTX_set_options (context, SSL_OP_SINGLE_ECDH_USE); - EC_KEY_free (ecdh); + EC_KEY *ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); + if (!SSL_CTX_set_tmp_ecdh(context, ecdh)) { + gpr_log(GPR_ERROR, "Could not set ephemeral ECDH key."); + EC_KEY_free(ecdh); + return TSI_INTERNAL_ERROR; + } + SSL_CTX_set_options(context, SSL_OP_SINGLE_ECDH_USE); + EC_KEY_free(ecdh); } return TSI_OK; } /* Extracts the CN and the SANs from an X509 cert as a peer object. */ -static tsi_result -extract_x509_subject_names_from_pem_cert (const unsigned char *pem_cert, size_t pem_cert_size, tsi_peer * peer) -{ +static tsi_result extract_x509_subject_names_from_pem_cert( + const unsigned char *pem_cert, size_t pem_cert_size, tsi_peer *peer) { tsi_result result = TSI_OK; X509 *cert = NULL; BIO *pem; - GPR_ASSERT (pem_cert_size <= INT_MAX); - pem = BIO_new_mem_buf ((void *) pem_cert, (int) pem_cert_size); - if (pem == NULL) - return TSI_OUT_OF_RESOURCES; - - cert = PEM_read_bio_X509 (pem, NULL, NULL, ""); - if (cert == NULL) - { - gpr_log (GPR_ERROR, "Invalid certificate"); - result = TSI_INVALID_ARGUMENT; - } - else - { - result = peer_from_x509 (cert, 0, peer); - } - if (cert != NULL) - X509_free (cert); - BIO_free (pem); + GPR_ASSERT(pem_cert_size <= INT_MAX); + pem = BIO_new_mem_buf((void *)pem_cert, (int)pem_cert_size); + if (pem == NULL) return TSI_OUT_OF_RESOURCES; + + cert = PEM_read_bio_X509(pem, NULL, NULL, ""); + if (cert == NULL) { + gpr_log(GPR_ERROR, "Invalid certificate"); + result = TSI_INVALID_ARGUMENT; + } else { + result = peer_from_x509(cert, 0, peer); + } + if (cert != NULL) X509_free(cert); + BIO_free(pem); return result; } /* Builds the alpn protocol name list according to rfc 7301. */ -static tsi_result -build_alpn_protocol_name_list (const unsigned char **alpn_protocols, const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, unsigned char **protocol_name_list, size_t * protocol_name_list_length) -{ +static tsi_result build_alpn_protocol_name_list( + const unsigned char **alpn_protocols, + const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, + unsigned char **protocol_name_list, size_t *protocol_name_list_length) { uint16_t i; unsigned char *current; *protocol_name_list = NULL; *protocol_name_list_length = 0; - if (num_alpn_protocols == 0) - return TSI_INVALID_ARGUMENT; - for (i = 0; i < num_alpn_protocols; i++) - { - if (alpn_protocols_lengths[i] == 0) - { - gpr_log (GPR_ERROR, "Invalid 0-length protocol name."); - return TSI_INVALID_ARGUMENT; - } - *protocol_name_list_length += (size_t) alpn_protocols_lengths[i] + 1; + if (num_alpn_protocols == 0) return TSI_INVALID_ARGUMENT; + for (i = 0; i < num_alpn_protocols; i++) { + if (alpn_protocols_lengths[i] == 0) { + gpr_log(GPR_ERROR, "Invalid 0-length protocol name."); + return TSI_INVALID_ARGUMENT; } - *protocol_name_list = malloc (*protocol_name_list_length); - if (*protocol_name_list == NULL) - return TSI_OUT_OF_RESOURCES; + *protocol_name_list_length += (size_t)alpn_protocols_lengths[i] + 1; + } + *protocol_name_list = malloc(*protocol_name_list_length); + if (*protocol_name_list == NULL) return TSI_OUT_OF_RESOURCES; current = *protocol_name_list; - for (i = 0; i < num_alpn_protocols; i++) - { - *(current++) = alpn_protocols_lengths[i]; - memcpy (current, alpn_protocols[i], alpn_protocols_lengths[i]); - current += alpn_protocols_lengths[i]; - } + for (i = 0; i < num_alpn_protocols; i++) { + *(current++) = alpn_protocols_lengths[i]; + memcpy(current, alpn_protocols[i], alpn_protocols_lengths[i]); + current += alpn_protocols_lengths[i]; + } /* Safety check. */ - if ((current < *protocol_name_list) || ((gpr_uintptr) (current - *protocol_name_list) != *protocol_name_list_length)) - { - return TSI_INTERNAL_ERROR; - } + if ((current < *protocol_name_list) || + ((gpr_uintptr)(current - *protocol_name_list) != + *protocol_name_list_length)) { + return TSI_INTERNAL_ERROR; + } return TSI_OK; } /* --- tsi_frame_protector methods implementation. ---*/ -static tsi_result -ssl_protector_protect (tsi_frame_protector * self, const unsigned char *unprotected_bytes, size_t * unprotected_bytes_size, unsigned char *protected_output_frames, size_t * protected_output_frames_size) -{ - tsi_ssl_frame_protector *impl = (tsi_ssl_frame_protector *) self; +static tsi_result ssl_protector_protect(tsi_frame_protector *self, + const unsigned char *unprotected_bytes, + size_t *unprotected_bytes_size, + unsigned char *protected_output_frames, + size_t *protected_output_frames_size) { + tsi_ssl_frame_protector *impl = (tsi_ssl_frame_protector *)self; int read_from_ssl; size_t available; tsi_result result = TSI_OK; /* First see if we have some pending data in the SSL BIO. */ - int pending_in_ssl = BIO_pending (impl->from_ssl); - if (pending_in_ssl > 0) - { - *unprotected_bytes_size = 0; - GPR_ASSERT (*protected_output_frames_size <= INT_MAX); - read_from_ssl = BIO_read (impl->from_ssl, protected_output_frames, (int) *protected_output_frames_size); - if (read_from_ssl < 0) - { - gpr_log (GPR_ERROR, "Could not read from BIO even though some data is pending"); - return TSI_INTERNAL_ERROR; - } - *protected_output_frames_size = (size_t) read_from_ssl; - return TSI_OK; + int pending_in_ssl = BIO_pending(impl->from_ssl); + if (pending_in_ssl > 0) { + *unprotected_bytes_size = 0; + GPR_ASSERT(*protected_output_frames_size <= INT_MAX); + read_from_ssl = BIO_read(impl->from_ssl, protected_output_frames, + (int)*protected_output_frames_size); + if (read_from_ssl < 0) { + gpr_log(GPR_ERROR, + "Could not read from BIO even though some data is pending"); + return TSI_INTERNAL_ERROR; } + *protected_output_frames_size = (size_t)read_from_ssl; + return TSI_OK; + } /* Now see if we can send a complete frame. */ available = impl->buffer_size - impl->buffer_offset; - if (available > *unprotected_bytes_size) - { - /* If we cannot, just copy the data in our internal buffer. */ - memcpy (impl->buffer + impl->buffer_offset, unprotected_bytes, *unprotected_bytes_size); - impl->buffer_offset += *unprotected_bytes_size; - *protected_output_frames_size = 0; - return TSI_OK; - } + if (available > *unprotected_bytes_size) { + /* If we cannot, just copy the data in our internal buffer. */ + memcpy(impl->buffer + impl->buffer_offset, unprotected_bytes, + *unprotected_bytes_size); + impl->buffer_offset += *unprotected_bytes_size; + *protected_output_frames_size = 0; + return TSI_OK; + } /* If we can, prepare the buffer, send it to SSL_write and read. */ - memcpy (impl->buffer + impl->buffer_offset, unprotected_bytes, available); - result = do_ssl_write (impl->ssl, impl->buffer, impl->buffer_size); - if (result != TSI_OK) - return result; - - GPR_ASSERT (*protected_output_frames_size <= INT_MAX); - read_from_ssl = BIO_read (impl->from_ssl, protected_output_frames, (int) *protected_output_frames_size); - if (read_from_ssl < 0) - { - gpr_log (GPR_ERROR, "Could not read from BIO after SSL_write."); - return TSI_INTERNAL_ERROR; - } - *protected_output_frames_size = (size_t) read_from_ssl; + memcpy(impl->buffer + impl->buffer_offset, unprotected_bytes, available); + result = do_ssl_write(impl->ssl, impl->buffer, impl->buffer_size); + if (result != TSI_OK) return result; + + GPR_ASSERT(*protected_output_frames_size <= INT_MAX); + read_from_ssl = BIO_read(impl->from_ssl, protected_output_frames, + (int)*protected_output_frames_size); + if (read_from_ssl < 0) { + gpr_log(GPR_ERROR, "Could not read from BIO after SSL_write."); + return TSI_INTERNAL_ERROR; + } + *protected_output_frames_size = (size_t)read_from_ssl; *unprotected_bytes_size = available; impl->buffer_offset = 0; return TSI_OK; } -static tsi_result -ssl_protector_protect_flush (tsi_frame_protector * self, unsigned char *protected_output_frames, size_t * protected_output_frames_size, size_t * still_pending_size) -{ +static tsi_result ssl_protector_protect_flush( + tsi_frame_protector *self, unsigned char *protected_output_frames, + size_t *protected_output_frames_size, size_t *still_pending_size) { tsi_result result = TSI_OK; - tsi_ssl_frame_protector *impl = (tsi_ssl_frame_protector *) self; + tsi_ssl_frame_protector *impl = (tsi_ssl_frame_protector *)self; int read_from_ssl = 0; int pending; - if (impl->buffer_offset != 0) - { - result = do_ssl_write (impl->ssl, impl->buffer, impl->buffer_offset); - if (result != TSI_OK) - return result; - impl->buffer_offset = 0; - } - - pending = BIO_pending (impl->from_ssl); - GPR_ASSERT (pending >= 0); - *still_pending_size = (size_t) pending; - if (*still_pending_size == 0) - return TSI_OK; + if (impl->buffer_offset != 0) { + result = do_ssl_write(impl->ssl, impl->buffer, impl->buffer_offset); + if (result != TSI_OK) return result; + impl->buffer_offset = 0; + } - GPR_ASSERT (*protected_output_frames_size <= INT_MAX); - read_from_ssl = BIO_read (impl->from_ssl, protected_output_frames, (int) *protected_output_frames_size); - if (read_from_ssl <= 0) - { - gpr_log (GPR_ERROR, "Could not read from BIO after SSL_write."); - return TSI_INTERNAL_ERROR; - } - *protected_output_frames_size = (size_t) read_from_ssl; - pending = BIO_pending (impl->from_ssl); - GPR_ASSERT (pending >= 0); - *still_pending_size = (size_t) pending; + pending = BIO_pending(impl->from_ssl); + GPR_ASSERT(pending >= 0); + *still_pending_size = (size_t)pending; + if (*still_pending_size == 0) return TSI_OK; + + GPR_ASSERT(*protected_output_frames_size <= INT_MAX); + read_from_ssl = BIO_read(impl->from_ssl, protected_output_frames, + (int)*protected_output_frames_size); + if (read_from_ssl <= 0) { + gpr_log(GPR_ERROR, "Could not read from BIO after SSL_write."); + return TSI_INTERNAL_ERROR; + } + *protected_output_frames_size = (size_t)read_from_ssl; + pending = BIO_pending(impl->from_ssl); + GPR_ASSERT(pending >= 0); + *still_pending_size = (size_t)pending; return TSI_OK; } -static tsi_result -ssl_protector_unprotect (tsi_frame_protector * self, const unsigned char *protected_frames_bytes, size_t * protected_frames_bytes_size, unsigned char *unprotected_bytes, size_t * unprotected_bytes_size) -{ +static tsi_result ssl_protector_unprotect( + tsi_frame_protector *self, const unsigned char *protected_frames_bytes, + size_t *protected_frames_bytes_size, unsigned char *unprotected_bytes, + size_t *unprotected_bytes_size) { tsi_result result = TSI_OK; int written_into_ssl = 0; size_t output_bytes_size = *unprotected_bytes_size; size_t output_bytes_offset = 0; - tsi_ssl_frame_protector *impl = (tsi_ssl_frame_protector *) self; + tsi_ssl_frame_protector *impl = (tsi_ssl_frame_protector *)self; /* First, try to read remaining data from ssl. */ - result = do_ssl_read (impl->ssl, unprotected_bytes, unprotected_bytes_size); - if (result != TSI_OK) - return result; - if (*unprotected_bytes_size == output_bytes_size) - { - /* We have read everything we could and cannot process any more input. */ - *protected_frames_bytes_size = 0; - return TSI_OK; - } + result = do_ssl_read(impl->ssl, unprotected_bytes, unprotected_bytes_size); + if (result != TSI_OK) return result; + if (*unprotected_bytes_size == output_bytes_size) { + /* We have read everything we could and cannot process any more input. */ + *protected_frames_bytes_size = 0; + return TSI_OK; + } output_bytes_offset = *unprotected_bytes_size; unprotected_bytes += output_bytes_offset; *unprotected_bytes_size = output_bytes_size - output_bytes_offset; /* Then, try to write some data to ssl. */ - GPR_ASSERT (*protected_frames_bytes_size <= INT_MAX); - written_into_ssl = BIO_write (impl->into_ssl, protected_frames_bytes, (int) *protected_frames_bytes_size); - if (written_into_ssl < 0) - { - gpr_log (GPR_ERROR, "Sending protected frame to ssl failed with %d", written_into_ssl); - return TSI_INTERNAL_ERROR; - } - *protected_frames_bytes_size = (size_t) written_into_ssl; + GPR_ASSERT(*protected_frames_bytes_size <= INT_MAX); + written_into_ssl = BIO_write(impl->into_ssl, protected_frames_bytes, + (int)*protected_frames_bytes_size); + if (written_into_ssl < 0) { + gpr_log(GPR_ERROR, "Sending protected frame to ssl failed with %d", + written_into_ssl); + return TSI_INTERNAL_ERROR; + } + *protected_frames_bytes_size = (size_t)written_into_ssl; /* Now try to read some data again. */ - result = do_ssl_read (impl->ssl, unprotected_bytes, unprotected_bytes_size); - if (result == TSI_OK) - { - /* Don't forget to output the total number of bytes read. */ - *unprotected_bytes_size += output_bytes_offset; - } + result = do_ssl_read(impl->ssl, unprotected_bytes, unprotected_bytes_size); + if (result == TSI_OK) { + /* Don't forget to output the total number of bytes read. */ + *unprotected_bytes_size += output_bytes_offset; + } return result; } -static void -ssl_protector_destroy (tsi_frame_protector * self) -{ - tsi_ssl_frame_protector *impl = (tsi_ssl_frame_protector *) self; - if (impl->buffer != NULL) - free (impl->buffer); - if (impl->ssl != NULL) - SSL_free (impl->ssl); - free (self); +static void ssl_protector_destroy(tsi_frame_protector *self) { + tsi_ssl_frame_protector *impl = (tsi_ssl_frame_protector *)self; + if (impl->buffer != NULL) free(impl->buffer); + if (impl->ssl != NULL) SSL_free(impl->ssl); + free(self); } static const tsi_frame_protector_vtable frame_protector_vtable = { - ssl_protector_protect, ssl_protector_protect_flush, ssl_protector_unprotect, - ssl_protector_destroy, + ssl_protector_protect, ssl_protector_protect_flush, ssl_protector_unprotect, + ssl_protector_destroy, }; /* --- tsi_handshaker methods implementation. ---*/ -static tsi_result -ssl_handshaker_get_bytes_to_send_to_peer (tsi_handshaker * self, unsigned char *bytes, size_t * bytes_size) -{ - tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *) self; +static tsi_result ssl_handshaker_get_bytes_to_send_to_peer(tsi_handshaker *self, + unsigned char *bytes, + size_t *bytes_size) { + tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *)self; int bytes_read_from_ssl = 0; - if (bytes == NULL || bytes_size == NULL || *bytes_size == 0 || *bytes_size > INT_MAX) - { - return TSI_INVALID_ARGUMENT; - } - GPR_ASSERT (*bytes_size <= INT_MAX); - bytes_read_from_ssl = BIO_read (impl->from_ssl, bytes, (int) *bytes_size); - if (bytes_read_from_ssl < 0) - { - *bytes_size = 0; - if (!BIO_should_retry (impl->from_ssl)) - { - impl->result = TSI_INTERNAL_ERROR; - return impl->result; - } - else - { - return TSI_OK; - } + if (bytes == NULL || bytes_size == NULL || *bytes_size == 0 || + *bytes_size > INT_MAX) { + return TSI_INVALID_ARGUMENT; + } + GPR_ASSERT(*bytes_size <= INT_MAX); + bytes_read_from_ssl = BIO_read(impl->from_ssl, bytes, (int)*bytes_size); + if (bytes_read_from_ssl < 0) { + *bytes_size = 0; + if (!BIO_should_retry(impl->from_ssl)) { + impl->result = TSI_INTERNAL_ERROR; + return impl->result; + } else { + return TSI_OK; } - *bytes_size = (size_t) bytes_read_from_ssl; - return BIO_pending (impl->from_ssl) == 0 ? TSI_OK : TSI_INCOMPLETE_DATA; + } + *bytes_size = (size_t)bytes_read_from_ssl; + return BIO_pending(impl->from_ssl) == 0 ? TSI_OK : TSI_INCOMPLETE_DATA; } -static tsi_result -ssl_handshaker_get_result (tsi_handshaker * self) -{ - tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *) self; - if ((impl->result == TSI_HANDSHAKE_IN_PROGRESS) && SSL_is_init_finished (impl->ssl)) - { - impl->result = TSI_OK; - } +static tsi_result ssl_handshaker_get_result(tsi_handshaker *self) { + tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *)self; + if ((impl->result == TSI_HANDSHAKE_IN_PROGRESS) && + SSL_is_init_finished(impl->ssl)) { + impl->result = TSI_OK; + } return impl->result; } -static tsi_result -ssl_handshaker_process_bytes_from_peer (tsi_handshaker * self, const unsigned char *bytes, size_t * bytes_size) -{ - tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *) self; +static tsi_result ssl_handshaker_process_bytes_from_peer( + tsi_handshaker *self, const unsigned char *bytes, size_t *bytes_size) { + tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *)self; int bytes_written_into_ssl_size = 0; - if (bytes == NULL || bytes_size == 0 || *bytes_size > INT_MAX) - { - return TSI_INVALID_ARGUMENT; - } - GPR_ASSERT (*bytes_size <= INT_MAX); - bytes_written_into_ssl_size = BIO_write (impl->into_ssl, bytes, (int) *bytes_size); - if (bytes_written_into_ssl_size < 0) - { - gpr_log (GPR_ERROR, "Could not write to memory BIO."); - impl->result = TSI_INTERNAL_ERROR; - return impl->result; - } - *bytes_size = (size_t) bytes_written_into_ssl_size; - - if (!tsi_handshaker_is_in_progress (self)) - { - impl->result = TSI_OK; - return impl->result; - } - else - { - /* Get ready to get some bytes from SSL. */ - int ssl_result = SSL_do_handshake (impl->ssl); - ssl_result = SSL_get_error (impl->ssl, ssl_result); - switch (ssl_result) - { - case SSL_ERROR_WANT_READ: - if (BIO_pending (impl->from_ssl) == 0) - { - /* We need more data. */ - return TSI_INCOMPLETE_DATA; - } - else - { - return TSI_OK; - } - case SSL_ERROR_NONE: - return TSI_OK; - default: - { - char err_str[256]; - ERR_error_string_n (ERR_get_error (), err_str, sizeof (err_str)); - gpr_log (GPR_ERROR, "Handshake failed with fatal error %s: %s.", ssl_error_string (ssl_result), err_str); - impl->result = TSI_PROTOCOL_FAILURE; - return impl->result; - } - } + if (bytes == NULL || bytes_size == 0 || *bytes_size > INT_MAX) { + return TSI_INVALID_ARGUMENT; + } + GPR_ASSERT(*bytes_size <= INT_MAX); + bytes_written_into_ssl_size = + BIO_write(impl->into_ssl, bytes, (int)*bytes_size); + if (bytes_written_into_ssl_size < 0) { + gpr_log(GPR_ERROR, "Could not write to memory BIO."); + impl->result = TSI_INTERNAL_ERROR; + return impl->result; + } + *bytes_size = (size_t)bytes_written_into_ssl_size; + + if (!tsi_handshaker_is_in_progress(self)) { + impl->result = TSI_OK; + return impl->result; + } else { + /* Get ready to get some bytes from SSL. */ + int ssl_result = SSL_do_handshake(impl->ssl); + ssl_result = SSL_get_error(impl->ssl, ssl_result); + switch (ssl_result) { + case SSL_ERROR_WANT_READ: + if (BIO_pending(impl->from_ssl) == 0) { + /* We need more data. */ + return TSI_INCOMPLETE_DATA; + } else { + return TSI_OK; + } + case SSL_ERROR_NONE: + return TSI_OK; + default: { + char err_str[256]; + ERR_error_string_n(ERR_get_error(), err_str, sizeof(err_str)); + gpr_log(GPR_ERROR, "Handshake failed with fatal error %s: %s.", + ssl_error_string(ssl_result), err_str); + impl->result = TSI_PROTOCOL_FAILURE; + return impl->result; + } } + } } -static tsi_result -ssl_handshaker_extract_peer (tsi_handshaker * self, tsi_peer * peer) -{ +static tsi_result ssl_handshaker_extract_peer(tsi_handshaker *self, + tsi_peer *peer) { tsi_result result = TSI_OK; const unsigned char *alpn_selected = NULL; unsigned int alpn_selected_len; - tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *) self; - X509 *peer_cert = SSL_get_peer_certificate (impl->ssl); - if (peer_cert != NULL) - { - result = peer_from_x509 (peer_cert, 1, peer); - X509_free (peer_cert); - if (result != TSI_OK) - return result; - } + tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *)self; + X509 *peer_cert = SSL_get_peer_certificate(impl->ssl); + if (peer_cert != NULL) { + result = peer_from_x509(peer_cert, 1, peer); + X509_free(peer_cert); + if (result != TSI_OK) return result; + } #if TSI_OPENSSL_ALPN_SUPPORT - SSL_get0_alpn_selected (impl->ssl, &alpn_selected, &alpn_selected_len); + SSL_get0_alpn_selected(impl->ssl, &alpn_selected, &alpn_selected_len); #endif /* TSI_OPENSSL_ALPN_SUPPORT */ - if (alpn_selected == NULL) - { - /* Try npn. */ - SSL_get0_next_proto_negotiated (impl->ssl, &alpn_selected, &alpn_selected_len); - } - if (alpn_selected != NULL) - { - size_t i; - tsi_peer_property *new_properties = calloc (1, sizeof (tsi_peer_property) * (peer->property_count + 1)); - if (new_properties == NULL) - return TSI_OUT_OF_RESOURCES; - for (i = 0; i < peer->property_count; i++) - { - new_properties[i] = peer->properties[i]; - } - result = tsi_construct_string_peer_property (TSI_SSL_ALPN_SELECTED_PROTOCOL, (const char *) alpn_selected, alpn_selected_len, &new_properties[peer->property_count]); - if (result != TSI_OK) - { - free (new_properties); - return result; - } - if (peer->properties != NULL) - free (peer->properties); - peer->property_count++; - peer->properties = new_properties; + if (alpn_selected == NULL) { + /* Try npn. */ + SSL_get0_next_proto_negotiated(impl->ssl, &alpn_selected, + &alpn_selected_len); + } + if (alpn_selected != NULL) { + size_t i; + tsi_peer_property *new_properties = + calloc(1, sizeof(tsi_peer_property) * (peer->property_count + 1)); + if (new_properties == NULL) return TSI_OUT_OF_RESOURCES; + for (i = 0; i < peer->property_count; i++) { + new_properties[i] = peer->properties[i]; + } + result = tsi_construct_string_peer_property( + TSI_SSL_ALPN_SELECTED_PROTOCOL, (const char *)alpn_selected, + alpn_selected_len, &new_properties[peer->property_count]); + if (result != TSI_OK) { + free(new_properties); + return result; } + if (peer->properties != NULL) free(peer->properties); + peer->property_count++; + peer->properties = new_properties; + } return result; } -static tsi_result -ssl_handshaker_create_frame_protector (tsi_handshaker * self, size_t * max_output_protected_frame_size, tsi_frame_protector ** protector) -{ - size_t actual_max_output_protected_frame_size = TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND; - tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *) self; - tsi_ssl_frame_protector *protector_impl = calloc (1, sizeof (tsi_ssl_frame_protector)); - if (protector_impl == NULL) - { - return TSI_OUT_OF_RESOURCES; - } +static tsi_result ssl_handshaker_create_frame_protector( + tsi_handshaker *self, size_t *max_output_protected_frame_size, + tsi_frame_protector **protector) { + size_t actual_max_output_protected_frame_size = + TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND; + tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *)self; + tsi_ssl_frame_protector *protector_impl = + calloc(1, sizeof(tsi_ssl_frame_protector)); + if (protector_impl == NULL) { + return TSI_OUT_OF_RESOURCES; + } - if (max_output_protected_frame_size != NULL) - { - if (*max_output_protected_frame_size > TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND) - { - *max_output_protected_frame_size = TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND; - } - else if (*max_output_protected_frame_size < TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND) - { - *max_output_protected_frame_size = TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND; - } - actual_max_output_protected_frame_size = *max_output_protected_frame_size; - } - protector_impl->buffer_size = actual_max_output_protected_frame_size - TSI_SSL_MAX_PROTECTION_OVERHEAD; - protector_impl->buffer = malloc (protector_impl->buffer_size); - if (protector_impl->buffer == NULL) - { - gpr_log (GPR_ERROR, "Could not allocated buffer for tsi_ssl_frame_protector."); - free (protector_impl); - return TSI_INTERNAL_ERROR; - } + if (max_output_protected_frame_size != NULL) { + if (*max_output_protected_frame_size > + TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND) { + *max_output_protected_frame_size = + TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND; + } else if (*max_output_protected_frame_size < + TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND) { + *max_output_protected_frame_size = + TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND; + } + actual_max_output_protected_frame_size = *max_output_protected_frame_size; + } + protector_impl->buffer_size = + actual_max_output_protected_frame_size - TSI_SSL_MAX_PROTECTION_OVERHEAD; + protector_impl->buffer = malloc(protector_impl->buffer_size); + if (protector_impl->buffer == NULL) { + gpr_log(GPR_ERROR, + "Could not allocated buffer for tsi_ssl_frame_protector."); + free(protector_impl); + return TSI_INTERNAL_ERROR; + } /* Transfer ownership of ssl to the frame protector. It is OK as the caller * cannot call anything else but destroy on the handshaker after this call. */ @@ -1078,106 +968,91 @@ ssl_handshaker_create_frame_protector (tsi_handshaker * self, size_t * max_outpu return TSI_OK; } -static void -ssl_handshaker_destroy (tsi_handshaker * self) -{ - tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *) self; - SSL_free (impl->ssl); /* The BIO objects are owned by ssl */ - free (impl); +static void ssl_handshaker_destroy(tsi_handshaker *self) { + tsi_ssl_handshaker *impl = (tsi_ssl_handshaker *)self; + SSL_free(impl->ssl); /* The BIO objects are owned by ssl */ + free(impl); } static const tsi_handshaker_vtable handshaker_vtable = { - ssl_handshaker_get_bytes_to_send_to_peer, - ssl_handshaker_process_bytes_from_peer, - ssl_handshaker_get_result, - ssl_handshaker_extract_peer, - ssl_handshaker_create_frame_protector, - ssl_handshaker_destroy, + ssl_handshaker_get_bytes_to_send_to_peer, + ssl_handshaker_process_bytes_from_peer, + ssl_handshaker_get_result, + ssl_handshaker_extract_peer, + ssl_handshaker_create_frame_protector, + ssl_handshaker_destroy, }; /* --- tsi_ssl_handshaker_factory common methods. --- */ -tsi_result -tsi_ssl_handshaker_factory_create_handshaker (tsi_ssl_handshaker_factory * self, const char *server_name_indication, tsi_handshaker ** handshaker) -{ - if (self == NULL || handshaker == NULL) - return TSI_INVALID_ARGUMENT; - return self->create_handshaker (self, server_name_indication, handshaker); +tsi_result tsi_ssl_handshaker_factory_create_handshaker( + tsi_ssl_handshaker_factory *self, const char *server_name_indication, + tsi_handshaker **handshaker) { + if (self == NULL || handshaker == NULL) return TSI_INVALID_ARGUMENT; + return self->create_handshaker(self, server_name_indication, handshaker); } -void -tsi_ssl_handshaker_factory_destroy (tsi_ssl_handshaker_factory * self) -{ - if (self == NULL) - return; - self->destroy (self); +void tsi_ssl_handshaker_factory_destroy(tsi_ssl_handshaker_factory *self) { + if (self == NULL) return; + self->destroy(self); } -static tsi_result -create_tsi_ssl_handshaker (SSL_CTX * ctx, int is_client, const char *server_name_indication, tsi_handshaker ** handshaker) -{ - SSL *ssl = SSL_new (ctx); +static tsi_result create_tsi_ssl_handshaker(SSL_CTX *ctx, int is_client, + const char *server_name_indication, + tsi_handshaker **handshaker) { + SSL *ssl = SSL_new(ctx); BIO *into_ssl = NULL; BIO *from_ssl = NULL; tsi_ssl_handshaker *impl = NULL; *handshaker = NULL; - if (ctx == NULL) - { - gpr_log (GPR_ERROR, "SSL Context is null. Should never happen."); - return TSI_INTERNAL_ERROR; - } - if (ssl == NULL) - { - return TSI_OUT_OF_RESOURCES; - } - SSL_set_info_callback (ssl, ssl_info_callback); - - into_ssl = BIO_new (BIO_s_mem ()); - from_ssl = BIO_new (BIO_s_mem ()); - if (into_ssl == NULL || from_ssl == NULL) - { - gpr_log (GPR_ERROR, "BIO_new failed."); - SSL_free (ssl); - if (into_ssl != NULL) - BIO_free (into_ssl); - if (from_ssl != NULL) - BIO_free (into_ssl); - return TSI_OUT_OF_RESOURCES; - } - SSL_set_bio (ssl, into_ssl, from_ssl); - if (is_client) - { - int ssl_result; - SSL_set_connect_state (ssl); - if (server_name_indication != NULL) - { - if (!SSL_set_tlsext_host_name (ssl, server_name_indication)) - { - gpr_log (GPR_ERROR, "Invalid server name indication %s.", server_name_indication); - SSL_free (ssl); - return TSI_INTERNAL_ERROR; - } - } - ssl_result = SSL_do_handshake (ssl); - ssl_result = SSL_get_error (ssl, ssl_result); - if (ssl_result != SSL_ERROR_WANT_READ) - { - gpr_log (GPR_ERROR, "Unexpected error received from first SSL_do_handshake call: %s", ssl_error_string (ssl_result)); - SSL_free (ssl); - return TSI_INTERNAL_ERROR; - } + if (ctx == NULL) { + gpr_log(GPR_ERROR, "SSL Context is null. Should never happen."); + return TSI_INTERNAL_ERROR; + } + if (ssl == NULL) { + return TSI_OUT_OF_RESOURCES; + } + SSL_set_info_callback(ssl, ssl_info_callback); + + into_ssl = BIO_new(BIO_s_mem()); + from_ssl = BIO_new(BIO_s_mem()); + if (into_ssl == NULL || from_ssl == NULL) { + gpr_log(GPR_ERROR, "BIO_new failed."); + SSL_free(ssl); + if (into_ssl != NULL) BIO_free(into_ssl); + if (from_ssl != NULL) BIO_free(into_ssl); + return TSI_OUT_OF_RESOURCES; + } + SSL_set_bio(ssl, into_ssl, from_ssl); + if (is_client) { + int ssl_result; + SSL_set_connect_state(ssl); + if (server_name_indication != NULL) { + if (!SSL_set_tlsext_host_name(ssl, server_name_indication)) { + gpr_log(GPR_ERROR, "Invalid server name indication %s.", + server_name_indication); + SSL_free(ssl); + return TSI_INTERNAL_ERROR; + } } - else - { - SSL_set_accept_state (ssl); + ssl_result = SSL_do_handshake(ssl); + ssl_result = SSL_get_error(ssl, ssl_result); + if (ssl_result != SSL_ERROR_WANT_READ) { + gpr_log(GPR_ERROR, + "Unexpected error received from first SSL_do_handshake call: %s", + ssl_error_string(ssl_result)); + SSL_free(ssl); + return TSI_INTERNAL_ERROR; } + } else { + SSL_set_accept_state(ssl); + } - impl = calloc (1, sizeof (tsi_ssl_handshaker)); - if (impl == NULL) - { - SSL_free (ssl); - return TSI_OUT_OF_RESOURCES; - } + impl = calloc(1, sizeof(tsi_ssl_handshaker)); + if (impl == NULL) { + SSL_free(ssl); + return TSI_OUT_OF_RESOURCES; + } impl->ssl = ssl; impl->into_ssl = into_ssl; impl->from_ssl = from_ssl; @@ -1187,412 +1062,407 @@ create_tsi_ssl_handshaker (SSL_CTX * ctx, int is_client, const char *server_name return TSI_OK; } -static int -select_protocol_list (const unsigned char **out, unsigned char *outlen, const unsigned char *client_list, size_t client_list_len, const unsigned char *server_list, size_t server_list_len) -{ +static int select_protocol_list(const unsigned char **out, + unsigned char *outlen, + const unsigned char *client_list, + size_t client_list_len, + const unsigned char *server_list, + size_t server_list_len) { const unsigned char *client_current = client_list; - while ((unsigned int) (client_current - client_list) < client_list_len) - { - unsigned char client_current_len = *(client_current++); - const unsigned char *server_current = server_list; - while ((server_current >= server_list) && (gpr_uintptr) (server_current - server_list) < server_list_len) - { - unsigned char server_current_len = *(server_current++); - if ((client_current_len == server_current_len) && !memcmp (client_current, server_current, server_current_len)) - { - *out = server_current; - *outlen = server_current_len; - return SSL_TLSEXT_ERR_OK; - } - server_current += server_current_len; - } - client_current += client_current_len; + while ((unsigned int)(client_current - client_list) < client_list_len) { + unsigned char client_current_len = *(client_current++); + const unsigned char *server_current = server_list; + while ((server_current >= server_list) && + (gpr_uintptr)(server_current - server_list) < server_list_len) { + unsigned char server_current_len = *(server_current++); + if ((client_current_len == server_current_len) && + !memcmp(client_current, server_current, server_current_len)) { + *out = server_current; + *outlen = server_current_len; + return SSL_TLSEXT_ERR_OK; + } + server_current += server_current_len; } + client_current += client_current_len; + } return SSL_TLSEXT_ERR_NOACK; } /* --- tsi_ssl__client_handshaker_factory methods implementation. --- */ -static tsi_result -ssl_client_handshaker_factory_create_handshaker (tsi_ssl_handshaker_factory * self, const char *server_name_indication, tsi_handshaker ** handshaker) -{ - tsi_ssl_client_handshaker_factory *impl = (tsi_ssl_client_handshaker_factory *) self; - return create_tsi_ssl_handshaker (impl->ssl_context, 1, server_name_indication, handshaker); +static tsi_result ssl_client_handshaker_factory_create_handshaker( + tsi_ssl_handshaker_factory *self, const char *server_name_indication, + tsi_handshaker **handshaker) { + tsi_ssl_client_handshaker_factory *impl = + (tsi_ssl_client_handshaker_factory *)self; + return create_tsi_ssl_handshaker(impl->ssl_context, 1, server_name_indication, + handshaker); } -static void -ssl_client_handshaker_factory_destroy (tsi_ssl_handshaker_factory * self) -{ - tsi_ssl_client_handshaker_factory *impl = (tsi_ssl_client_handshaker_factory *) self; - if (impl->ssl_context != NULL) - SSL_CTX_free (impl->ssl_context); - if (impl->alpn_protocol_list != NULL) - free (impl->alpn_protocol_list); - free (impl); +static void ssl_client_handshaker_factory_destroy( + tsi_ssl_handshaker_factory *self) { + tsi_ssl_client_handshaker_factory *impl = + (tsi_ssl_client_handshaker_factory *)self; + if (impl->ssl_context != NULL) SSL_CTX_free(impl->ssl_context); + if (impl->alpn_protocol_list != NULL) free(impl->alpn_protocol_list); + free(impl); } -static int -client_handshaker_factory_npn_callback (SSL * ssl, unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg) -{ - tsi_ssl_client_handshaker_factory *factory = (tsi_ssl_client_handshaker_factory *) arg; - return select_protocol_list ((const unsigned char **) out, outlen, factory->alpn_protocol_list, factory->alpn_protocol_list_length, in, inlen); +static int client_handshaker_factory_npn_callback(SSL *ssl, unsigned char **out, + unsigned char *outlen, + const unsigned char *in, + unsigned int inlen, + void *arg) { + tsi_ssl_client_handshaker_factory *factory = + (tsi_ssl_client_handshaker_factory *)arg; + return select_protocol_list((const unsigned char **)out, outlen, + factory->alpn_protocol_list, + factory->alpn_protocol_list_length, in, inlen); } /* --- tsi_ssl_server_handshaker_factory methods implementation. --- */ -static tsi_result -ssl_server_handshaker_factory_create_handshaker (tsi_ssl_handshaker_factory * self, const char *server_name_indication, tsi_handshaker ** handshaker) -{ - tsi_ssl_server_handshaker_factory *impl = (tsi_ssl_server_handshaker_factory *) self; - if (impl->ssl_context_count == 0 || server_name_indication != NULL) - { - return TSI_INVALID_ARGUMENT; - } +static tsi_result ssl_server_handshaker_factory_create_handshaker( + tsi_ssl_handshaker_factory *self, const char *server_name_indication, + tsi_handshaker **handshaker) { + tsi_ssl_server_handshaker_factory *impl = + (tsi_ssl_server_handshaker_factory *)self; + if (impl->ssl_context_count == 0 || server_name_indication != NULL) { + return TSI_INVALID_ARGUMENT; + } /* Create the handshaker with the first context. We will switch if needed because of SNI in ssl_server_handshaker_factory_servername_callback. */ - return create_tsi_ssl_handshaker (impl->ssl_contexts[0], 0, NULL, handshaker); + return create_tsi_ssl_handshaker(impl->ssl_contexts[0], 0, NULL, handshaker); } -static void -ssl_server_handshaker_factory_destroy (tsi_ssl_handshaker_factory * self) -{ - tsi_ssl_server_handshaker_factory *impl = (tsi_ssl_server_handshaker_factory *) self; +static void ssl_server_handshaker_factory_destroy( + tsi_ssl_handshaker_factory *self) { + tsi_ssl_server_handshaker_factory *impl = + (tsi_ssl_server_handshaker_factory *)self; size_t i; - for (i = 0; i < impl->ssl_context_count; i++) - { - if (impl->ssl_contexts[i] != NULL) - { - SSL_CTX_free (impl->ssl_contexts[i]); - tsi_peer_destruct (&impl->ssl_context_x509_subject_names[i]); - } + for (i = 0; i < impl->ssl_context_count; i++) { + if (impl->ssl_contexts[i] != NULL) { + SSL_CTX_free(impl->ssl_contexts[i]); + tsi_peer_destruct(&impl->ssl_context_x509_subject_names[i]); } - if (impl->ssl_contexts != NULL) - free (impl->ssl_contexts); - if (impl->ssl_context_x509_subject_names != NULL) - { - free (impl->ssl_context_x509_subject_names); - } - if (impl->alpn_protocol_list != NULL) - free (impl->alpn_protocol_list); - free (impl); + } + if (impl->ssl_contexts != NULL) free(impl->ssl_contexts); + if (impl->ssl_context_x509_subject_names != NULL) { + free(impl->ssl_context_x509_subject_names); + } + if (impl->alpn_protocol_list != NULL) free(impl->alpn_protocol_list); + free(impl); } -static int -does_entry_match_name (const char *entry, size_t entry_length, const char *name) -{ +static int does_entry_match_name(const char *entry, size_t entry_length, + const char *name) { const char *dot; const char *name_subdomain = NULL; - size_t name_length = strlen (name); + size_t name_length = strlen(name); size_t name_subdomain_length; - if (entry_length == 0) - return 0; + if (entry_length == 0) return 0; /* Take care of '.' terminations. */ - if (name[name_length - 1] == '.') - { - name_length--; - } - if (entry[entry_length - 1] == '.') - { - entry_length--; - if (entry_length == 0) - return 0; - } + if (name[name_length - 1] == '.') { + name_length--; + } + if (entry[entry_length - 1] == '.') { + entry_length--; + if (entry_length == 0) return 0; + } - if ((name_length == entry_length) && strncmp (name, entry, entry_length) == 0) - { - return 1; /* Perfect match. */ - } - if (entry[0] != '*') - return 0; + if ((name_length == entry_length) && + strncmp(name, entry, entry_length) == 0) { + return 1; /* Perfect match. */ + } + if (entry[0] != '*') return 0; /* Wildchar subdomain matching. */ - if (entry_length < 3 || entry[1] != '.') - { /* At least *.x */ - gpr_log (GPR_ERROR, "Invalid wildchar entry."); - return 0; - } - name_subdomain = strchr (name, '.'); - if (name_subdomain == NULL) - return 0; - name_subdomain_length = strlen (name_subdomain); - if (name_subdomain_length < 2) + if (entry_length < 3 || entry[1] != '.') { /* At least *.x */ + gpr_log(GPR_ERROR, "Invalid wildchar entry."); return 0; - name_subdomain++; /* Starts after the dot. */ + } + name_subdomain = strchr(name, '.'); + if (name_subdomain == NULL) return 0; + name_subdomain_length = strlen(name_subdomain); + if (name_subdomain_length < 2) return 0; + name_subdomain++; /* Starts after the dot. */ name_subdomain_length--; - entry += 2; /* Remove *. */ + entry += 2; /* Remove *. */ entry_length -= 2; - dot = strchr (name_subdomain, '.'); - if ((dot == NULL) || (dot == &name_subdomain[name_subdomain_length - 1])) - { - gpr_log (GPR_ERROR, "Invalid toplevel subdomain: %s", name_subdomain); - return 0; - } - if (name_subdomain[name_subdomain_length - 1] == '.') - { - name_subdomain_length--; - } - return ((entry_length > 0) && (name_subdomain_length == entry_length) && strncmp (entry, name_subdomain, entry_length) == 0); + dot = strchr(name_subdomain, '.'); + if ((dot == NULL) || (dot == &name_subdomain[name_subdomain_length - 1])) { + gpr_log(GPR_ERROR, "Invalid toplevel subdomain: %s", name_subdomain); + return 0; + } + if (name_subdomain[name_subdomain_length - 1] == '.') { + name_subdomain_length--; + } + return ((entry_length > 0) && (name_subdomain_length == entry_length) && + strncmp(entry, name_subdomain, entry_length) == 0); } -static int -ssl_server_handshaker_factory_servername_callback (SSL * ssl, int *ap, void *arg) -{ - tsi_ssl_server_handshaker_factory *impl = (tsi_ssl_server_handshaker_factory *) arg; +static int ssl_server_handshaker_factory_servername_callback(SSL *ssl, int *ap, + void *arg) { + tsi_ssl_server_handshaker_factory *impl = + (tsi_ssl_server_handshaker_factory *)arg; size_t i = 0; - const char *servername = SSL_get_servername (ssl, TLSEXT_NAMETYPE_host_name); - if (servername == NULL || strlen (servername) == 0) - { - return SSL_TLSEXT_ERR_NOACK; - } + const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name); + if (servername == NULL || strlen(servername) == 0) { + return SSL_TLSEXT_ERR_NOACK; + } - for (i = 0; i < impl->ssl_context_count; i++) - { - if (tsi_ssl_peer_matches_name (&impl->ssl_context_x509_subject_names[i], servername)) - { - SSL_set_SSL_CTX (ssl, impl->ssl_contexts[i]); - return SSL_TLSEXT_ERR_OK; - } + for (i = 0; i < impl->ssl_context_count; i++) { + if (tsi_ssl_peer_matches_name(&impl->ssl_context_x509_subject_names[i], + servername)) { + SSL_set_SSL_CTX(ssl, impl->ssl_contexts[i]); + return SSL_TLSEXT_ERR_OK; } - gpr_log (GPR_ERROR, "No match found for server name: %s.", servername); + } + gpr_log(GPR_ERROR, "No match found for server name: %s.", servername); return SSL_TLSEXT_ERR_ALERT_WARNING; } #if TSI_OPENSSL_ALPN_SUPPORT -static int -server_handshaker_factory_alpn_callback (SSL * ssl, const unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg) -{ - tsi_ssl_server_handshaker_factory *factory = (tsi_ssl_server_handshaker_factory *) arg; - return select_protocol_list (out, outlen, in, inlen, factory->alpn_protocol_list, factory->alpn_protocol_list_length); +static int server_handshaker_factory_alpn_callback( + SSL *ssl, const unsigned char **out, unsigned char *outlen, + const unsigned char *in, unsigned int inlen, void *arg) { + tsi_ssl_server_handshaker_factory *factory = + (tsi_ssl_server_handshaker_factory *)arg; + return select_protocol_list(out, outlen, in, inlen, + factory->alpn_protocol_list, + factory->alpn_protocol_list_length); } #endif /* TSI_OPENSSL_ALPN_SUPPORT */ -static int -server_handshaker_factory_npn_advertised_callback (SSL * ssl, const unsigned char **out, unsigned int *outlen, void *arg) -{ - tsi_ssl_server_handshaker_factory *factory = (tsi_ssl_server_handshaker_factory *) arg; +static int server_handshaker_factory_npn_advertised_callback( + SSL *ssl, const unsigned char **out, unsigned int *outlen, void *arg) { + tsi_ssl_server_handshaker_factory *factory = + (tsi_ssl_server_handshaker_factory *)arg; *out = factory->alpn_protocol_list; - GPR_ASSERT (factory->alpn_protocol_list_length <= UINT_MAX); - *outlen = (unsigned int) factory->alpn_protocol_list_length; + GPR_ASSERT(factory->alpn_protocol_list_length <= UINT_MAX); + *outlen = (unsigned int)factory->alpn_protocol_list_length; return SSL_TLSEXT_ERR_OK; } /* --- tsi_ssl_handshaker_factory constructors. --- */ -tsi_result -tsi_create_ssl_client_handshaker_factory (const unsigned char *pem_private_key, size_t pem_private_key_size, const unsigned char *pem_cert_chain, size_t pem_cert_chain_size, const unsigned char *pem_root_certs, size_t pem_root_certs_size, const char *cipher_list, const unsigned char **alpn_protocols, const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, tsi_ssl_handshaker_factory ** factory) -{ +tsi_result tsi_create_ssl_client_handshaker_factory( + const unsigned char *pem_private_key, size_t pem_private_key_size, + const unsigned char *pem_cert_chain, size_t pem_cert_chain_size, + const unsigned char *pem_root_certs, size_t pem_root_certs_size, + const char *cipher_list, const unsigned char **alpn_protocols, + const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, + tsi_ssl_handshaker_factory **factory) { SSL_CTX *ssl_context = NULL; tsi_ssl_client_handshaker_factory *impl = NULL; tsi_result result = TSI_OK; - gpr_once_init (&init_openssl_once, init_openssl); + gpr_once_init(&init_openssl_once, init_openssl); - if (factory == NULL) - return TSI_INVALID_ARGUMENT; + if (factory == NULL) return TSI_INVALID_ARGUMENT; *factory = NULL; - if (pem_root_certs == NULL) - return TSI_INVALID_ARGUMENT; + if (pem_root_certs == NULL) return TSI_INVALID_ARGUMENT; - ssl_context = SSL_CTX_new (TLSv1_2_method ()); - if (ssl_context == NULL) - { - gpr_log (GPR_ERROR, "Could not create ssl context."); - return TSI_INVALID_ARGUMENT; - } + ssl_context = SSL_CTX_new(TLSv1_2_method()); + if (ssl_context == NULL) { + gpr_log(GPR_ERROR, "Could not create ssl context."); + return TSI_INVALID_ARGUMENT; + } - impl = calloc (1, sizeof (tsi_ssl_client_handshaker_factory)); - if (impl == NULL) - { - SSL_CTX_free (ssl_context); - return TSI_OUT_OF_RESOURCES; - } + impl = calloc(1, sizeof(tsi_ssl_client_handshaker_factory)); + if (impl == NULL) { + SSL_CTX_free(ssl_context); + return TSI_OUT_OF_RESOURCES; + } impl->ssl_context = ssl_context; - do - { - result = populate_ssl_context (ssl_context, pem_private_key, pem_private_key_size, pem_cert_chain, pem_cert_chain_size, cipher_list); - if (result != TSI_OK) - break; - result = ssl_ctx_load_verification_certs (ssl_context, pem_root_certs, pem_root_certs_size, NULL); - if (result != TSI_OK) - { - gpr_log (GPR_ERROR, "Cannot load server root certificates."); - break; - } - - if (num_alpn_protocols != 0) - { - result = build_alpn_protocol_name_list (alpn_protocols, alpn_protocols_lengths, num_alpn_protocols, &impl->alpn_protocol_list, &impl->alpn_protocol_list_length); - if (result != TSI_OK) - { - gpr_log (GPR_ERROR, "Building alpn list failed with error %s.", tsi_result_to_string (result)); - break; - } + do { + result = + populate_ssl_context(ssl_context, pem_private_key, pem_private_key_size, + pem_cert_chain, pem_cert_chain_size, cipher_list); + if (result != TSI_OK) break; + result = ssl_ctx_load_verification_certs(ssl_context, pem_root_certs, + pem_root_certs_size, NULL); + if (result != TSI_OK) { + gpr_log(GPR_ERROR, "Cannot load server root certificates."); + break; + } + + if (num_alpn_protocols != 0) { + result = build_alpn_protocol_name_list( + alpn_protocols, alpn_protocols_lengths, num_alpn_protocols, + &impl->alpn_protocol_list, &impl->alpn_protocol_list_length); + if (result != TSI_OK) { + gpr_log(GPR_ERROR, "Building alpn list failed with error %s.", + tsi_result_to_string(result)); + break; + } #if TSI_OPENSSL_ALPN_SUPPORT - GPR_ASSERT (impl->alpn_protocol_list_length < UINT_MAX); - if (SSL_CTX_set_alpn_protos (ssl_context, impl->alpn_protocol_list, (unsigned int) impl->alpn_protocol_list_length)) - { - gpr_log (GPR_ERROR, "Could not set alpn protocol list to context."); - result = TSI_INVALID_ARGUMENT; - break; - } + GPR_ASSERT(impl->alpn_protocol_list_length < UINT_MAX); + if (SSL_CTX_set_alpn_protos( + ssl_context, impl->alpn_protocol_list, + (unsigned int)impl->alpn_protocol_list_length)) { + gpr_log(GPR_ERROR, "Could not set alpn protocol list to context."); + result = TSI_INVALID_ARGUMENT; + break; + } #endif /* TSI_OPENSSL_ALPN_SUPPORT */ - SSL_CTX_set_next_proto_select_cb (ssl_context, client_handshaker_factory_npn_callback, impl); - } + SSL_CTX_set_next_proto_select_cb( + ssl_context, client_handshaker_factory_npn_callback, impl); } - while (0); - if (result != TSI_OK) - { - ssl_client_handshaker_factory_destroy (&impl->base); - return result; - } - SSL_CTX_set_verify (ssl_context, SSL_VERIFY_PEER, NULL); + } while (0); + if (result != TSI_OK) { + ssl_client_handshaker_factory_destroy(&impl->base); + return result; + } + SSL_CTX_set_verify(ssl_context, SSL_VERIFY_PEER, NULL); /* TODO(jboeuf): Add revocation verification. */ - impl->base.create_handshaker = ssl_client_handshaker_factory_create_handshaker; + impl->base.create_handshaker = + ssl_client_handshaker_factory_create_handshaker; impl->base.destroy = ssl_client_handshaker_factory_destroy; *factory = &impl->base; return TSI_OK; } -tsi_result -tsi_create_ssl_server_handshaker_factory (const unsigned char **pem_private_keys, const size_t * pem_private_keys_sizes, const unsigned char **pem_cert_chains, const size_t * pem_cert_chains_sizes, size_t key_cert_pair_count, const unsigned char *pem_client_root_certs, size_t pem_client_root_certs_size, int force_client_auth, const char *cipher_list, const unsigned char **alpn_protocols, const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, tsi_ssl_handshaker_factory ** factory) -{ +tsi_result tsi_create_ssl_server_handshaker_factory( + const unsigned char **pem_private_keys, + const size_t *pem_private_keys_sizes, const unsigned char **pem_cert_chains, + const size_t *pem_cert_chains_sizes, size_t key_cert_pair_count, + const unsigned char *pem_client_root_certs, + size_t pem_client_root_certs_size, int force_client_auth, + const char *cipher_list, const unsigned char **alpn_protocols, + const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, + tsi_ssl_handshaker_factory **factory) { tsi_ssl_server_handshaker_factory *impl = NULL; tsi_result result = TSI_OK; size_t i = 0; - gpr_once_init (&init_openssl_once, init_openssl); + gpr_once_init(&init_openssl_once, init_openssl); - if (factory == NULL) - return TSI_INVALID_ARGUMENT; + if (factory == NULL) return TSI_INVALID_ARGUMENT; *factory = NULL; - if (key_cert_pair_count == 0 || pem_private_keys == NULL || pem_cert_chains == NULL) - { - return TSI_INVALID_ARGUMENT; - } + if (key_cert_pair_count == 0 || pem_private_keys == NULL || + pem_cert_chains == NULL) { + return TSI_INVALID_ARGUMENT; + } - impl = calloc (1, sizeof (tsi_ssl_server_handshaker_factory)); - if (impl == NULL) - return TSI_OUT_OF_RESOURCES; - impl->base.create_handshaker = ssl_server_handshaker_factory_create_handshaker; + impl = calloc(1, sizeof(tsi_ssl_server_handshaker_factory)); + if (impl == NULL) return TSI_OUT_OF_RESOURCES; + impl->base.create_handshaker = + ssl_server_handshaker_factory_create_handshaker; impl->base.destroy = ssl_server_handshaker_factory_destroy; - impl->ssl_contexts = calloc (key_cert_pair_count, sizeof (SSL_CTX *)); - impl->ssl_context_x509_subject_names = calloc (key_cert_pair_count, sizeof (tsi_peer)); - if (impl->ssl_contexts == NULL || impl->ssl_context_x509_subject_names == NULL) - { - tsi_ssl_handshaker_factory_destroy (&impl->base); - return TSI_OUT_OF_RESOURCES; - } + impl->ssl_contexts = calloc(key_cert_pair_count, sizeof(SSL_CTX *)); + impl->ssl_context_x509_subject_names = + calloc(key_cert_pair_count, sizeof(tsi_peer)); + if (impl->ssl_contexts == NULL || + impl->ssl_context_x509_subject_names == NULL) { + tsi_ssl_handshaker_factory_destroy(&impl->base); + return TSI_OUT_OF_RESOURCES; + } impl->ssl_context_count = key_cert_pair_count; - if (num_alpn_protocols > 0) - { - result = build_alpn_protocol_name_list (alpn_protocols, alpn_protocols_lengths, num_alpn_protocols, &impl->alpn_protocol_list, &impl->alpn_protocol_list_length); - if (result != TSI_OK) - { - tsi_ssl_handshaker_factory_destroy (&impl->base); - return result; - } + if (num_alpn_protocols > 0) { + result = build_alpn_protocol_name_list( + alpn_protocols, alpn_protocols_lengths, num_alpn_protocols, + &impl->alpn_protocol_list, &impl->alpn_protocol_list_length); + if (result != TSI_OK) { + tsi_ssl_handshaker_factory_destroy(&impl->base); + return result; } + } + + for (i = 0; i < key_cert_pair_count; i++) { + do { + impl->ssl_contexts[i] = SSL_CTX_new(TLSv1_2_method()); + if (impl->ssl_contexts[i] == NULL) { + gpr_log(GPR_ERROR, "Could not create ssl context."); + result = TSI_OUT_OF_RESOURCES; + break; + } + result = populate_ssl_context( + impl->ssl_contexts[i], pem_private_keys[i], pem_private_keys_sizes[i], + pem_cert_chains[i], pem_cert_chains_sizes[i], cipher_list); + if (result != TSI_OK) break; + + if (pem_client_root_certs != NULL) { + int flags = SSL_VERIFY_PEER; + STACK_OF(X509_NAME) *root_names = NULL; + result = ssl_ctx_load_verification_certs( + impl->ssl_contexts[i], pem_client_root_certs, + pem_client_root_certs_size, &root_names); + if (result != TSI_OK) { + gpr_log(GPR_ERROR, "Invalid verification certs."); + break; + } + SSL_CTX_set_client_CA_list(impl->ssl_contexts[i], root_names); + if (force_client_auth) flags |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT; + SSL_CTX_set_verify(impl->ssl_contexts[i], flags, NULL); + /* TODO(jboeuf): Add revocation verification. */ + } + + result = extract_x509_subject_names_from_pem_cert( + pem_cert_chains[i], pem_cert_chains_sizes[i], + &impl->ssl_context_x509_subject_names[i]); + if (result != TSI_OK) break; - for (i = 0; i < key_cert_pair_count; i++) - { - do - { - impl->ssl_contexts[i] = SSL_CTX_new (TLSv1_2_method ()); - if (impl->ssl_contexts[i] == NULL) - { - gpr_log (GPR_ERROR, "Could not create ssl context."); - result = TSI_OUT_OF_RESOURCES; - break; - } - result = populate_ssl_context (impl->ssl_contexts[i], pem_private_keys[i], pem_private_keys_sizes[i], pem_cert_chains[i], pem_cert_chains_sizes[i], cipher_list); - if (result != TSI_OK) - break; - - if (pem_client_root_certs != NULL) - { - int flags = SSL_VERIFY_PEER; - STACK_OF (X509_NAME) * root_names = NULL; - result = ssl_ctx_load_verification_certs (impl->ssl_contexts[i], pem_client_root_certs, pem_client_root_certs_size, &root_names); - if (result != TSI_OK) - { - gpr_log (GPR_ERROR, "Invalid verification certs."); - break; - } - SSL_CTX_set_client_CA_list (impl->ssl_contexts[i], root_names); - if (force_client_auth) - flags |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT; - SSL_CTX_set_verify (impl->ssl_contexts[i], flags, NULL); - /* TODO(jboeuf): Add revocation verification. */ - } - - result = extract_x509_subject_names_from_pem_cert (pem_cert_chains[i], pem_cert_chains_sizes[i], &impl->ssl_context_x509_subject_names[i]); - if (result != TSI_OK) - break; - - SSL_CTX_set_tlsext_servername_callback (impl->ssl_contexts[i], ssl_server_handshaker_factory_servername_callback); - SSL_CTX_set_tlsext_servername_arg (impl->ssl_contexts[i], impl); + SSL_CTX_set_tlsext_servername_callback( + impl->ssl_contexts[i], + ssl_server_handshaker_factory_servername_callback); + SSL_CTX_set_tlsext_servername_arg(impl->ssl_contexts[i], impl); #if TSI_OPENSSL_ALPN_SUPPORT - SSL_CTX_set_alpn_select_cb (impl->ssl_contexts[i], server_handshaker_factory_alpn_callback, impl); + SSL_CTX_set_alpn_select_cb(impl->ssl_contexts[i], + server_handshaker_factory_alpn_callback, impl); #endif /* TSI_OPENSSL_ALPN_SUPPORT */ - SSL_CTX_set_next_protos_advertised_cb (impl->ssl_contexts[i], server_handshaker_factory_npn_advertised_callback, impl); - } - while (0); - - if (result != TSI_OK) - { - tsi_ssl_handshaker_factory_destroy (&impl->base); - return result; - } + SSL_CTX_set_next_protos_advertised_cb( + impl->ssl_contexts[i], + server_handshaker_factory_npn_advertised_callback, impl); + } while (0); + + if (result != TSI_OK) { + tsi_ssl_handshaker_factory_destroy(&impl->base); + return result; } + } *factory = &impl->base; return TSI_OK; } /* --- tsi_ssl utils. --- */ -int -tsi_ssl_peer_matches_name (const tsi_peer * peer, const char *name) -{ +int tsi_ssl_peer_matches_name(const tsi_peer *peer, const char *name) { size_t i = 0; size_t san_count = 0; const tsi_peer_property *cn_property = NULL; /* For now reject what looks like an IP address. */ - if (looks_like_ip_address (name)) - return 0; + if (looks_like_ip_address(name)) return 0; /* Check the SAN first. */ - for (i = 0; i < peer->property_count; i++) - { - const tsi_peer_property *property = &peer->properties[i]; - if (property->name == NULL) - continue; - if (strcmp (property->name, TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY) == 0) - { - san_count++; - if (does_entry_match_name (property->value.data, property->value.length, name)) - { - return 1; - } - } - else if (strcmp (property->name, TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY) == 0) - { - cn_property = property; - } + for (i = 0; i < peer->property_count; i++) { + const tsi_peer_property *property = &peer->properties[i]; + if (property->name == NULL) continue; + if (strcmp(property->name, + TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY) == 0) { + san_count++; + if (does_entry_match_name(property->value.data, property->value.length, + name)) { + return 1; + } + } else if (strcmp(property->name, + TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY) == 0) { + cn_property = property; } + } /* If there's no SAN, try the CN. */ - if (san_count == 0 && cn_property != NULL) - { - if (does_entry_match_name (cn_property->value.data, cn_property->value.length, name)) - { - return 1; - } + if (san_count == 0 && cn_property != NULL) { + if (does_entry_match_name(cn_property->value.data, + cn_property->value.length, name)) { + return 1; } + } - return 0; /* Not found. */ + return 0; /* Not found. */ } diff --git a/src/core/tsi/ssl_transport_security.h b/src/core/tsi/ssl_transport_security.h index c3c4c2f9736..51c0003a854 100644 --- a/src/core/tsi/ssl_transport_security.h +++ b/src/core/tsi/ssl_transport_security.h @@ -37,8 +37,7 @@ #include "src/core/tsi/transport_security_interface.h" #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* Value for the TSI_CERTIFICATE_TYPE_PEER_PROPERTY property for X509 certs. */ @@ -56,7 +55,7 @@ extern "C" This object creates tsi_handshaker objects implemented in terms of the TLS 1.2 specificiation. */ - typedef struct tsi_ssl_handshaker_factory tsi_ssl_handshaker_factory; +typedef struct tsi_ssl_handshaker_factory tsi_ssl_handshaker_factory; /* Creates a client handshaker factory. - pem_private_key is the buffer containing the PEM encoding of the client's @@ -85,7 +84,13 @@ extern "C" - This method returns TSI_OK on success or TSI_INVALID_PARAMETER in the case where a parameter is invalid. */ - tsi_result tsi_create_ssl_client_handshaker_factory (const unsigned char *pem_private_key, size_t pem_private_key_size, const unsigned char *pem_cert_chain, size_t pem_cert_chain_size, const unsigned char *pem_root_certs, size_t pem_root_certs_size, const char *cipher_suites, const unsigned char **alpn_protocols, const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, tsi_ssl_handshaker_factory ** factory); +tsi_result tsi_create_ssl_client_handshaker_factory( + const unsigned char *pem_private_key, size_t pem_private_key_size, + const unsigned char *pem_cert_chain, size_t pem_cert_chain_size, + const unsigned char *pem_root_certs, size_t pem_root_certs_size, + const char *cipher_suites, const unsigned char **alpn_protocols, + const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, + tsi_ssl_handshaker_factory **factory); /* Creates a server handshaker factory. - version indicates which version of the specification to use. @@ -125,7 +130,15 @@ extern "C" - This method returns TSI_OK on success or TSI_INVALID_PARAMETER in the case where a parameter is invalid. */ - tsi_result tsi_create_ssl_server_handshaker_factory (const unsigned char **pem_private_keys, const size_t * pem_private_keys_sizes, const unsigned char **pem_cert_chains, const size_t * pem_cert_chains_sizes, size_t key_cert_pair_count, const unsigned char *pem_client_root_certs, size_t pem_client_root_certs_size, int force_client_auth, const char *cipher_suites, const unsigned char **alpn_protocols, const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, tsi_ssl_handshaker_factory ** factory); +tsi_result tsi_create_ssl_server_handshaker_factory( + const unsigned char **pem_private_keys, + const size_t *pem_private_keys_sizes, const unsigned char **pem_cert_chains, + const size_t *pem_cert_chains_sizes, size_t key_cert_pair_count, + const unsigned char *pem_client_root_certs, + size_t pem_client_root_certs_size, int force_client_auth, + const char *cipher_suites, const unsigned char **alpn_protocols, + const unsigned char *alpn_protocols_lengths, uint16_t num_alpn_protocols, + tsi_ssl_handshaker_factory **factory); /* Creates a handshaker. - self is the factory from which the handshaker will be created. @@ -137,11 +150,13 @@ extern "C" - This method returns TSI_OK on success or TSI_INVALID_PARAMETER in the case where a parameter is invalid. */ - tsi_result tsi_ssl_handshaker_factory_create_handshaker (tsi_ssl_handshaker_factory * self, const char *server_name_indication, tsi_handshaker ** handshaker); +tsi_result tsi_ssl_handshaker_factory_create_handshaker( + tsi_ssl_handshaker_factory *self, const char *server_name_indication, + tsi_handshaker **handshaker); /* Destroys the handshaker factory. WARNING: it is unsafe to destroy a factory while handshakers created with this factory are still in use. */ - void tsi_ssl_handshaker_factory_destroy (tsi_ssl_handshaker_factory * self); +void tsi_ssl_handshaker_factory_destroy(tsi_ssl_handshaker_factory *self); /* Util that checks that an ssl peer matches a specific name. Still TODO(jboeuf): @@ -149,10 +164,10 @@ extern "C" - handle %encoded chars. - handle public suffix wildchar more strictly (e.g. *.co.uk) - handle IP addresses in SAN. */ - int tsi_ssl_peer_matches_name (const tsi_peer * peer, const char *name); +int tsi_ssl_peer_matches_name(const tsi_peer *peer, const char *name); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_TSI_SSL_TRANSPORT_SECURITY_H */ +#endif /* GRPC_INTERNAL_CORE_TSI_SSL_TRANSPORT_SECURITY_H */ diff --git a/src/core/tsi/transport_security.c b/src/core/tsi/transport_security.c index c26ee40c4cd..c39e584496c 100644 --- a/src/core/tsi/transport_security.c +++ b/src/core/tsi/transport_security.c @@ -42,28 +42,21 @@ int tsi_tracing_enabled = 0; /* --- Utils. --- */ -char * -tsi_strdup (const char *src) -{ +char *tsi_strdup(const char *src) { char *dst; size_t len; - if (!src) - return NULL; - len = strlen (src) + 1; - dst = malloc (len); - if (!dst) - return NULL; - memcpy (dst, src, len); + if (!src) return NULL; + len = strlen(src) + 1; + dst = malloc(len); + if (!dst) return NULL; + memcpy(dst, src, len); return dst; } /* --- tsi_result common implementation. --- */ -const char * -tsi_result_to_string (tsi_result result) -{ - switch (result) - { +const char *tsi_result_to_string(tsi_result result) { + switch (result) { case TSI_OK: return "TSI_OK"; case TSI_UNKNOWN_ERROR: @@ -92,228 +85,196 @@ tsi_result_to_string (tsi_result result) return "TSI_OUT_OF_RESOURCES"; default: return "UNKNOWN"; - } + } } /* --- tsi_frame_protector common implementation. --- Calls specific implementation after state/input validation. */ -tsi_result -tsi_frame_protector_protect (tsi_frame_protector * self, const unsigned char *unprotected_bytes, size_t * unprotected_bytes_size, unsigned char *protected_output_frames, size_t * protected_output_frames_size) -{ - if (self == NULL || unprotected_bytes == NULL || unprotected_bytes_size == NULL || protected_output_frames == NULL || protected_output_frames_size == NULL) - { - return TSI_INVALID_ARGUMENT; - } - return self->vtable->protect (self, unprotected_bytes, unprotected_bytes_size, protected_output_frames, protected_output_frames_size); +tsi_result tsi_frame_protector_protect(tsi_frame_protector *self, + const unsigned char *unprotected_bytes, + size_t *unprotected_bytes_size, + unsigned char *protected_output_frames, + size_t *protected_output_frames_size) { + if (self == NULL || unprotected_bytes == NULL || + unprotected_bytes_size == NULL || protected_output_frames == NULL || + protected_output_frames_size == NULL) { + return TSI_INVALID_ARGUMENT; + } + return self->vtable->protect(self, unprotected_bytes, unprotected_bytes_size, + protected_output_frames, + protected_output_frames_size); } -tsi_result -tsi_frame_protector_protect_flush (tsi_frame_protector * self, unsigned char *protected_output_frames, size_t * protected_output_frames_size, size_t * still_pending_size) -{ - if (self == NULL || protected_output_frames == NULL || protected_output_frames == NULL || still_pending_size == NULL) - { - return TSI_INVALID_ARGUMENT; - } - return self->vtable->protect_flush (self, protected_output_frames, protected_output_frames_size, still_pending_size); +tsi_result tsi_frame_protector_protect_flush( + tsi_frame_protector *self, unsigned char *protected_output_frames, + size_t *protected_output_frames_size, size_t *still_pending_size) { + if (self == NULL || protected_output_frames == NULL || + protected_output_frames == NULL || still_pending_size == NULL) { + return TSI_INVALID_ARGUMENT; + } + return self->vtable->protect_flush(self, protected_output_frames, + protected_output_frames_size, + still_pending_size); } -tsi_result -tsi_frame_protector_unprotect (tsi_frame_protector * self, const unsigned char *protected_frames_bytes, size_t * protected_frames_bytes_size, unsigned char *unprotected_bytes, size_t * unprotected_bytes_size) -{ - if (self == NULL || protected_frames_bytes == NULL || protected_frames_bytes_size == NULL || unprotected_bytes == NULL || unprotected_bytes_size == NULL) - { - return TSI_INVALID_ARGUMENT; - } - return self->vtable->unprotect (self, protected_frames_bytes, protected_frames_bytes_size, unprotected_bytes, unprotected_bytes_size); +tsi_result tsi_frame_protector_unprotect( + tsi_frame_protector *self, const unsigned char *protected_frames_bytes, + size_t *protected_frames_bytes_size, unsigned char *unprotected_bytes, + size_t *unprotected_bytes_size) { + if (self == NULL || protected_frames_bytes == NULL || + protected_frames_bytes_size == NULL || unprotected_bytes == NULL || + unprotected_bytes_size == NULL) { + return TSI_INVALID_ARGUMENT; + } + return self->vtable->unprotect(self, protected_frames_bytes, + protected_frames_bytes_size, unprotected_bytes, + unprotected_bytes_size); } -void -tsi_frame_protector_destroy (tsi_frame_protector * self) -{ - if (self == NULL) - return; - self->vtable->destroy (self); +void tsi_frame_protector_destroy(tsi_frame_protector *self) { + if (self == NULL) return; + self->vtable->destroy(self); } /* --- tsi_handshaker common implementation. --- Calls specific implementation after state/input validation. */ -tsi_result -tsi_handshaker_get_bytes_to_send_to_peer (tsi_handshaker * self, unsigned char *bytes, size_t * bytes_size) -{ - if (self == NULL) - return TSI_INVALID_ARGUMENT; - if (self->frame_protector_created) - return TSI_FAILED_PRECONDITION; - return self->vtable->get_bytes_to_send_to_peer (self, bytes, bytes_size); +tsi_result tsi_handshaker_get_bytes_to_send_to_peer(tsi_handshaker *self, + unsigned char *bytes, + size_t *bytes_size) { + if (self == NULL) return TSI_INVALID_ARGUMENT; + if (self->frame_protector_created) return TSI_FAILED_PRECONDITION; + return self->vtable->get_bytes_to_send_to_peer(self, bytes, bytes_size); } -tsi_result -tsi_handshaker_process_bytes_from_peer (tsi_handshaker * self, const unsigned char *bytes, size_t * bytes_size) -{ - if (self == NULL) - return TSI_INVALID_ARGUMENT; - if (self->frame_protector_created) - return TSI_FAILED_PRECONDITION; - return self->vtable->process_bytes_from_peer (self, bytes, bytes_size); +tsi_result tsi_handshaker_process_bytes_from_peer(tsi_handshaker *self, + const unsigned char *bytes, + size_t *bytes_size) { + if (self == NULL) return TSI_INVALID_ARGUMENT; + if (self->frame_protector_created) return TSI_FAILED_PRECONDITION; + return self->vtable->process_bytes_from_peer(self, bytes, bytes_size); } -tsi_result -tsi_handshaker_get_result (tsi_handshaker * self) -{ - if (self == NULL) - return TSI_INVALID_ARGUMENT; - if (self->frame_protector_created) - return TSI_FAILED_PRECONDITION; - return self->vtable->get_result (self); +tsi_result tsi_handshaker_get_result(tsi_handshaker *self) { + if (self == NULL) return TSI_INVALID_ARGUMENT; + if (self->frame_protector_created) return TSI_FAILED_PRECONDITION; + return self->vtable->get_result(self); } -tsi_result -tsi_handshaker_extract_peer (tsi_handshaker * self, tsi_peer * peer) -{ - if (self == NULL || peer == NULL) - return TSI_INVALID_ARGUMENT; - memset (peer, 0, sizeof (tsi_peer)); - if (self->frame_protector_created) +tsi_result tsi_handshaker_extract_peer(tsi_handshaker *self, tsi_peer *peer) { + if (self == NULL || peer == NULL) return TSI_INVALID_ARGUMENT; + memset(peer, 0, sizeof(tsi_peer)); + if (self->frame_protector_created) return TSI_FAILED_PRECONDITION; + if (tsi_handshaker_get_result(self) != TSI_OK) { return TSI_FAILED_PRECONDITION; - if (tsi_handshaker_get_result (self) != TSI_OK) - { - return TSI_FAILED_PRECONDITION; - } - return self->vtable->extract_peer (self, peer); + } + return self->vtable->extract_peer(self, peer); } -tsi_result -tsi_handshaker_create_frame_protector (tsi_handshaker * self, size_t * max_protected_frame_size, tsi_frame_protector ** protector) -{ +tsi_result tsi_handshaker_create_frame_protector( + tsi_handshaker *self, size_t *max_protected_frame_size, + tsi_frame_protector **protector) { tsi_result result; - if (self == NULL || protector == NULL) - return TSI_INVALID_ARGUMENT; - if (self->frame_protector_created) + if (self == NULL || protector == NULL) return TSI_INVALID_ARGUMENT; + if (self->frame_protector_created) return TSI_FAILED_PRECONDITION; + if (tsi_handshaker_get_result(self) != TSI_OK) { return TSI_FAILED_PRECONDITION; - if (tsi_handshaker_get_result (self) != TSI_OK) - { - return TSI_FAILED_PRECONDITION; - } - result = self->vtable->create_frame_protector (self, max_protected_frame_size, protector); - if (result == TSI_OK) - { - self->frame_protector_created = 1; - } + } + result = self->vtable->create_frame_protector(self, max_protected_frame_size, + protector); + if (result == TSI_OK) { + self->frame_protector_created = 1; + } return result; } -void -tsi_handshaker_destroy (tsi_handshaker * self) -{ - if (self == NULL) - return; - self->vtable->destroy (self); +void tsi_handshaker_destroy(tsi_handshaker *self) { + if (self == NULL) return; + self->vtable->destroy(self); } /* --- tsi_peer implementation. --- */ -tsi_peer_property -tsi_init_peer_property (void) -{ +tsi_peer_property tsi_init_peer_property(void) { tsi_peer_property property; - memset (&property, 0, sizeof (tsi_peer_property)); + memset(&property, 0, sizeof(tsi_peer_property)); return property; } -static void -tsi_peer_destroy_list_property (tsi_peer_property * children, size_t child_count) -{ +static void tsi_peer_destroy_list_property(tsi_peer_property *children, + size_t child_count) { size_t i; - for (i = 0; i < child_count; i++) - { - tsi_peer_property_destruct (&children[i]); - } - free (children); + for (i = 0; i < child_count; i++) { + tsi_peer_property_destruct(&children[i]); + } + free(children); } -void -tsi_peer_property_destruct (tsi_peer_property * property) -{ - if (property->name != NULL) - { - free (property->name); - } - if (property->value.data != NULL) - { - free (property->value.data); - } - *property = tsi_init_peer_property (); /* Reset everything to 0. */ +void tsi_peer_property_destruct(tsi_peer_property *property) { + if (property->name != NULL) { + free(property->name); + } + if (property->value.data != NULL) { + free(property->value.data); + } + *property = tsi_init_peer_property(); /* Reset everything to 0. */ } -void -tsi_peer_destruct (tsi_peer * self) -{ - if (self == NULL) - return; - if (self->properties != NULL) - { - tsi_peer_destroy_list_property (self->properties, self->property_count); - self->properties = NULL; - } +void tsi_peer_destruct(tsi_peer *self) { + if (self == NULL) return; + if (self->properties != NULL) { + tsi_peer_destroy_list_property(self->properties, self->property_count); + self->properties = NULL; + } self->property_count = 0; } -tsi_result -tsi_construct_allocated_string_peer_property (const char *name, size_t value_length, tsi_peer_property * property) -{ - *property = tsi_init_peer_property (); - if (name != NULL) - { - property->name = tsi_strdup (name); - if (property->name == NULL) - return TSI_OUT_OF_RESOURCES; - } - if (value_length > 0) - { - property->value.data = calloc (1, value_length); - if (property->value.data == NULL) - { - tsi_peer_property_destruct (property); - return TSI_OUT_OF_RESOURCES; - } - property->value.length = value_length; +tsi_result tsi_construct_allocated_string_peer_property( + const char *name, size_t value_length, tsi_peer_property *property) { + *property = tsi_init_peer_property(); + if (name != NULL) { + property->name = tsi_strdup(name); + if (property->name == NULL) return TSI_OUT_OF_RESOURCES; + } + if (value_length > 0) { + property->value.data = calloc(1, value_length); + if (property->value.data == NULL) { + tsi_peer_property_destruct(property); + return TSI_OUT_OF_RESOURCES; } + property->value.length = value_length; + } return TSI_OK; } -tsi_result -tsi_construct_string_peer_property_from_cstring (const char *name, const char *value, tsi_peer_property * property) -{ - return tsi_construct_string_peer_property (name, value, strlen (value), property); +tsi_result tsi_construct_string_peer_property_from_cstring( + const char *name, const char *value, tsi_peer_property *property) { + return tsi_construct_string_peer_property(name, value, strlen(value), + property); } -tsi_result -tsi_construct_string_peer_property (const char *name, const char *value, size_t value_length, tsi_peer_property * property) -{ - tsi_result result = tsi_construct_allocated_string_peer_property (name, value_length, property); - if (result != TSI_OK) - return result; - if (value_length > 0) - { - memcpy (property->value.data, value, value_length); - } +tsi_result tsi_construct_string_peer_property(const char *name, + const char *value, + size_t value_length, + tsi_peer_property *property) { + tsi_result result = tsi_construct_allocated_string_peer_property( + name, value_length, property); + if (result != TSI_OK) return result; + if (value_length > 0) { + memcpy(property->value.data, value, value_length); + } return TSI_OK; } -tsi_result -tsi_construct_peer (size_t property_count, tsi_peer * peer) -{ - memset (peer, 0, sizeof (tsi_peer)); - if (property_count > 0) - { - peer->properties = calloc (property_count, sizeof (tsi_peer_property)); - if (peer->properties == NULL) - return TSI_OUT_OF_RESOURCES; - peer->property_count = property_count; - } +tsi_result tsi_construct_peer(size_t property_count, tsi_peer *peer) { + memset(peer, 0, sizeof(tsi_peer)); + if (property_count > 0) { + peer->properties = calloc(property_count, sizeof(tsi_peer_property)); + if (peer->properties == NULL) return TSI_OUT_OF_RESOURCES; + peer->property_count = property_count; + } return TSI_OK; } diff --git a/src/core/tsi/transport_security.h b/src/core/tsi/transport_security.h index 3ae82a31cc8..4077737473a 100644 --- a/src/core/tsi/transport_security.h +++ b/src/core/tsi/transport_security.h @@ -37,58 +37,75 @@ #include "src/core/tsi/transport_security_interface.h" #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif - extern int tsi_tracing_enabled; +extern int tsi_tracing_enabled; /* Base for tsi_frame_protector implementations. See transport_security_interface.h for documentation. */ - typedef struct - { - tsi_result (*protect) (tsi_frame_protector * self, const unsigned char *unprotected_bytes, size_t * unprotected_bytes_size, unsigned char *protected_output_frames, size_t * protected_output_frames_size); - tsi_result (*protect_flush) (tsi_frame_protector * self, unsigned char *protected_output_frames, size_t * protected_output_frames_size, size_t * still_pending_size); - tsi_result (*unprotect) (tsi_frame_protector * self, const unsigned char *protected_frames_bytes, size_t * protected_frames_bytes_size, unsigned char *unprotected_bytes, size_t * unprotected_bytes_size); - void (*destroy) (tsi_frame_protector * self); - } tsi_frame_protector_vtable; +typedef struct { + tsi_result (*protect)(tsi_frame_protector *self, + const unsigned char *unprotected_bytes, + size_t *unprotected_bytes_size, + unsigned char *protected_output_frames, + size_t *protected_output_frames_size); + tsi_result (*protect_flush)(tsi_frame_protector *self, + unsigned char *protected_output_frames, + size_t *protected_output_frames_size, + size_t *still_pending_size); + tsi_result (*unprotect)(tsi_frame_protector *self, + const unsigned char *protected_frames_bytes, + size_t *protected_frames_bytes_size, + unsigned char *unprotected_bytes, + size_t *unprotected_bytes_size); + void (*destroy)(tsi_frame_protector *self); +} tsi_frame_protector_vtable; - struct tsi_frame_protector - { - const tsi_frame_protector_vtable *vtable; - }; +struct tsi_frame_protector { + const tsi_frame_protector_vtable *vtable; +}; /* Base for tsi_handshaker implementations. See transport_security_interface.h for documentation. */ - typedef struct - { - tsi_result (*get_bytes_to_send_to_peer) (tsi_handshaker * self, unsigned char *bytes, size_t * bytes_size); - tsi_result (*process_bytes_from_peer) (tsi_handshaker * self, const unsigned char *bytes, size_t * bytes_size); - tsi_result (*get_result) (tsi_handshaker * self); - tsi_result (*extract_peer) (tsi_handshaker * self, tsi_peer * peer); - tsi_result (*create_frame_protector) (tsi_handshaker * self, size_t * max_protected_frame_size, tsi_frame_protector ** protector); - void (*destroy) (tsi_handshaker * self); - } tsi_handshaker_vtable; +typedef struct { + tsi_result (*get_bytes_to_send_to_peer)(tsi_handshaker *self, + unsigned char *bytes, + size_t *bytes_size); + tsi_result (*process_bytes_from_peer)(tsi_handshaker *self, + const unsigned char *bytes, + size_t *bytes_size); + tsi_result (*get_result)(tsi_handshaker *self); + tsi_result (*extract_peer)(tsi_handshaker *self, tsi_peer *peer); + tsi_result (*create_frame_protector)(tsi_handshaker *self, + size_t *max_protected_frame_size, + tsi_frame_protector **protector); + void (*destroy)(tsi_handshaker *self); +} tsi_handshaker_vtable; - struct tsi_handshaker - { - const tsi_handshaker_vtable *vtable; - int frame_protector_created; - }; +struct tsi_handshaker { + const tsi_handshaker_vtable *vtable; + int frame_protector_created; +}; /* Peer and property construction/destruction functions. */ - tsi_result tsi_construct_peer (size_t property_count, tsi_peer * peer); - tsi_peer_property tsi_init_peer_property (void); - void tsi_peer_property_destruct (tsi_peer_property * property); - tsi_result tsi_construct_string_peer_property (const char *name, const char *value, size_t value_length, tsi_peer_property * property); - tsi_result tsi_construct_allocated_string_peer_property (const char *name, size_t value_length, tsi_peer_property * property); - tsi_result tsi_construct_string_peer_property_from_cstring (const char *name, const char *value, tsi_peer_property * property); +tsi_result tsi_construct_peer(size_t property_count, tsi_peer *peer); +tsi_peer_property tsi_init_peer_property(void); +void tsi_peer_property_destruct(tsi_peer_property *property); +tsi_result tsi_construct_string_peer_property(const char *name, + const char *value, + size_t value_length, + tsi_peer_property *property); +tsi_result tsi_construct_allocated_string_peer_property( + const char *name, size_t value_length, tsi_peer_property *property); +tsi_result tsi_construct_string_peer_property_from_cstring( + const char *name, const char *value, tsi_peer_property *property); /* Utils. */ - char *tsi_strdup (const char *src); /* Sadly, no strdup in C89. */ +char *tsi_strdup(const char *src); /* Sadly, no strdup in C89. */ #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_TSI_TRANSPORT_SECURITY_H */ +#endif /* GRPC_INTERNAL_CORE_TSI_TRANSPORT_SECURITY_H */ diff --git a/src/core/tsi/transport_security_interface.h b/src/core/tsi/transport_security_interface.h index e43b31fd067..69ee17ae917 100644 --- a/src/core/tsi/transport_security_interface.h +++ b/src/core/tsi/transport_security_interface.h @@ -38,42 +38,40 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* --- tsi result --- */ - typedef enum - { - TSI_OK = 0, - TSI_UNKNOWN_ERROR = 1, - TSI_INVALID_ARGUMENT = 2, - TSI_PERMISSION_DENIED = 3, - TSI_INCOMPLETE_DATA = 4, - TSI_FAILED_PRECONDITION = 5, - TSI_UNIMPLEMENTED = 6, - TSI_INTERNAL_ERROR = 7, - TSI_DATA_CORRUPTED = 8, - TSI_NOT_FOUND = 9, - TSI_PROTOCOL_FAILURE = 10, - TSI_HANDSHAKE_IN_PROGRESS = 11, - TSI_OUT_OF_RESOURCES = 12 - } tsi_result; - - const char *tsi_result_to_string (tsi_result result); +typedef enum { + TSI_OK = 0, + TSI_UNKNOWN_ERROR = 1, + TSI_INVALID_ARGUMENT = 2, + TSI_PERMISSION_DENIED = 3, + TSI_INCOMPLETE_DATA = 4, + TSI_FAILED_PRECONDITION = 5, + TSI_UNIMPLEMENTED = 6, + TSI_INTERNAL_ERROR = 7, + TSI_DATA_CORRUPTED = 8, + TSI_NOT_FOUND = 9, + TSI_PROTOCOL_FAILURE = 10, + TSI_HANDSHAKE_IN_PROGRESS = 11, + TSI_OUT_OF_RESOURCES = 12 +} tsi_result; + +const char *tsi_result_to_string(tsi_result result); /* --- tsi tracing --- */ /* Set this early to avoid races */ - extern int tsi_tracing_enabled; +extern int tsi_tracing_enabled; /* --- tsi_frame_protector object --- This object protects and unprotects buffers once the handshake is done. Implementations of this object must be thread compatible. */ - typedef struct tsi_frame_protector tsi_frame_protector; +typedef struct tsi_frame_protector tsi_frame_protector; /* Outputs protected frames. - unprotected_bytes is an input only parameter and points to the data @@ -128,7 +126,11 @@ extern "C" if (result != TSI_OK) HandleError(result); ------------------------------------------------------------------------ */ - tsi_result tsi_frame_protector_protect (tsi_frame_protector * self, const unsigned char *unprotected_bytes, size_t * unprotected_bytes_size, unsigned char *protected_output_frames, size_t * protected_output_frames_size); +tsi_result tsi_frame_protector_protect(tsi_frame_protector *self, + const unsigned char *unprotected_bytes, + size_t *unprotected_bytes_size, + unsigned char *protected_output_frames, + size_t *protected_output_frames_size); /* Indicates that we need to flush the bytes buffered in the protector and get the resulting frame. @@ -138,7 +140,9 @@ extern "C" caller to specify how many bytes are available in protected_output_frames. - still_pending_bytes is an output parameter indicating the number of bytes that still need to be flushed from the protector.*/ - tsi_result tsi_frame_protector_protect_flush (tsi_frame_protector * self, unsigned char *protected_output_frames, size_t * protected_output_frames_size, size_t * still_pending_size); +tsi_result tsi_frame_protector_protect_flush( + tsi_frame_protector *self, unsigned char *protected_output_frames, + size_t *protected_output_frames_size, size_t *still_pending_size); /* Outputs unprotected bytes. - protected_frames_bytes is an input only parameter and points to the @@ -162,10 +166,13 @@ extern "C" unprotected_bytes_size will be set to 0 and cases where the internal buffer needs to be read before new protected data can be processed in which case protected_frames_size will be set to 0. */ - tsi_result tsi_frame_protector_unprotect (tsi_frame_protector * self, const unsigned char *protected_frames_bytes, size_t * protected_frames_bytes_size, unsigned char *unprotected_bytes, size_t * unprotected_bytes_size); +tsi_result tsi_frame_protector_unprotect( + tsi_frame_protector *self, const unsigned char *protected_frames_bytes, + size_t *protected_frames_bytes_size, unsigned char *unprotected_bytes, + size_t *unprotected_bytes_size); /* Destroys the tsi_frame_protector object. */ - void tsi_frame_protector_destroy (tsi_frame_protector * self); +void tsi_frame_protector_destroy(tsi_frame_protector *self); /* --- tsi_peer objects --- @@ -176,24 +183,21 @@ extern "C" /* Property values may contain NULL characters just like C++ strings. The length field gives the length of the string. */ - typedef struct tsi_peer_property - { - char *name; - struct - { - char *data; - size_t length; - } value; - } tsi_peer_property; - - typedef struct - { - tsi_peer_property *properties; - size_t property_count; - } tsi_peer; +typedef struct tsi_peer_property { + char *name; + struct { + char *data; + size_t length; + } value; +} tsi_peer_property; + +typedef struct { + tsi_peer_property *properties; + size_t property_count; +} tsi_peer; /* Destructs the tsi_peer object. */ - void tsi_peer_destruct (tsi_peer * self); +void tsi_peer_destruct(tsi_peer *self); /* --- tsi_handshaker objects ---- @@ -262,7 +266,7 @@ extern "C" } ... ------------------------------------------------------------------------ */ - typedef struct tsi_handshaker tsi_handshaker; +typedef struct tsi_handshaker tsi_handshaker; /* Gets bytes that need to be sent to the peer. - bytes is the buffer that will be written with the data to be sent to the @@ -275,7 +279,9 @@ extern "C" needs to be called again to get all the bytes to send to the peer (there was more data to write than the specified bytes_size). In case of a fatal error in the handshake, another specific error code is returned. */ - tsi_result tsi_handshaker_get_bytes_to_send_to_peer (tsi_handshaker * self, unsigned char *bytes, size_t * bytes_size); +tsi_result tsi_handshaker_get_bytes_to_send_to_peer(tsi_handshaker *self, + unsigned char *bytes, + size_t *bytes_size); /* Processes bytes received from the peer. - bytes is the buffer containing the data. @@ -286,14 +292,16 @@ extern "C" needs to be called again to complete the data needed for processing. In case of a fatal error in the handshake, another specific error code is returned. */ - tsi_result tsi_handshaker_process_bytes_from_peer (tsi_handshaker * self, const unsigned char *bytes, size_t * bytes_size); +tsi_result tsi_handshaker_process_bytes_from_peer(tsi_handshaker *self, + const unsigned char *bytes, + size_t *bytes_size); /* Gets the result of the handshaker. Returns TSI_OK if the hanshake completed successfully and there has been no errors. Returns TSI_HANDSHAKE_IN_PROGRESS if the handshaker is not done yet but no error has been encountered so far. Otherwise the handshaker failed with the returned error. */ - tsi_result tsi_handshaker_get_result (tsi_handshaker * self); +tsi_result tsi_handshaker_get_result(tsi_handshaker *self); /* Returns 1 if the handshake is in progress, 0 otherwise. */ #define tsi_handshaker_is_in_progress(h) \ @@ -303,7 +311,7 @@ extern "C" tsi_handshaker_is_in_progress returns 1, it returns TSI_OK otherwise assuming the handshaker is not in a fatal error state. The caller is responsible for destructing the peer. */ - tsi_result tsi_handshaker_extract_peer (tsi_handshaker * self, tsi_peer * peer); +tsi_result tsi_handshaker_extract_peer(tsi_handshaker *self, tsi_peer *peer); /* This method creates a tsi_frame_protector object after the handshake phase is done. After this method has been called successfully, the only method @@ -321,14 +329,16 @@ extern "C" tsi_handshaker_is_in_progress returns 1, it returns TSI_OK otherwise assuming the handshaker is not in a fatal error state. The caller is responsible for destroying the protector. */ - tsi_result tsi_handshaker_create_frame_protector (tsi_handshaker * self, size_t * max_output_protected_frame_size, tsi_frame_protector ** protector); +tsi_result tsi_handshaker_create_frame_protector( + tsi_handshaker *self, size_t *max_output_protected_frame_size, + tsi_frame_protector **protector); /* This method releases the tsi_handshaker object. After this method is called, no other method can be called on the object. */ - void tsi_handshaker_destroy (tsi_handshaker * self); +void tsi_handshaker_destroy(tsi_handshaker *self); #ifdef __cplusplus } #endif -#endif /* GRPC_INTERNAL_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H */ +#endif /* GRPC_INTERNAL_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H */ diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index 0315d7d69bc..9c09f00e564 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -45,8 +45,7 @@ #include #include -typedef struct -{ +typedef struct { grpc_server *server; grpc_completion_queue *cq; grpc_bad_client_server_side_validator validator; @@ -54,117 +53,117 @@ typedef struct gpr_event done_write; } thd_args; -static void -thd_func (void *arg) -{ +static void thd_func(void *arg) { thd_args *a = arg; - a->validator (a->server, a->cq); - gpr_event_set (&a->done_thd, (void *) 1); + a->validator(a->server, a->cq); + gpr_event_set(&a->done_thd, (void *)1); } -static void -done_write (grpc_exec_ctx * exec_ctx, void *arg, int success) -{ +static void done_write(grpc_exec_ctx *exec_ctx, void *arg, int success) { thd_args *a = arg; - gpr_event_set (&a->done_write, (void *) 1); + gpr_event_set(&a->done_write, (void *)1); } -static void -server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx) -{ +static void server_setup_transport(void *ts, grpc_transport *transport, + grpc_mdctx *mdctx) { thd_args *a = ts; static grpc_channel_filter const *extra_filters[] = { - &grpc_http_server_filter - }; + &grpc_http_server_filter}; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport (&exec_ctx, a->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (a->server)); - grpc_exec_ctx_finish (&exec_ctx); + grpc_server_setup_transport(&exec_ctx, a->server, transport, extra_filters, + GPR_ARRAY_SIZE(extra_filters), mdctx, + grpc_server_get_channel_args(a->server)); + grpc_exec_ctx_finish(&exec_ctx); } -void -grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const char *client_payload, size_t client_payload_length, gpr_uint32 flags) -{ +void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, + const char *client_payload, + size_t client_payload_length, gpr_uint32 flags) { grpc_endpoint_pair sfd; thd_args a; gpr_thd_id id; char *hex; grpc_transport *transport; - grpc_mdctx *mdctx = grpc_mdctx_create (); - gpr_slice slice = gpr_slice_from_copied_buffer (client_payload, client_payload_length); + grpc_mdctx *mdctx = grpc_mdctx_create(); + gpr_slice slice = + gpr_slice_from_copied_buffer(client_payload, client_payload_length); gpr_slice_buffer outgoing; grpc_closure done_write_closure; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - hex = gpr_dump (client_payload, client_payload_length, GPR_DUMP_HEX | GPR_DUMP_ASCII); + hex = gpr_dump(client_payload, client_payload_length, + GPR_DUMP_HEX | GPR_DUMP_ASCII); /* Add a debug log */ - gpr_log (GPR_INFO, "TEST: %s", hex); + gpr_log(GPR_INFO, "TEST: %s", hex); - gpr_free (hex); + gpr_free(hex); /* Init grpc */ - grpc_init (); + grpc_init(); /* Create endpoints */ - sfd = grpc_iomgr_create_endpoint_pair ("fixture", 65536); + sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536); /* Create server, completion events */ - a.server = grpc_server_create_from_filters (NULL, 0, NULL); - a.cq = grpc_completion_queue_create (NULL); - gpr_event_init (&a.done_thd); - gpr_event_init (&a.done_write); + a.server = grpc_server_create_from_filters(NULL, 0, NULL); + a.cq = grpc_completion_queue_create(NULL); + gpr_event_init(&a.done_thd); + gpr_event_init(&a.done_write); a.validator = validator; - grpc_server_register_completion_queue (a.server, a.cq, NULL); - grpc_server_start (a.server); - transport = grpc_create_chttp2_transport (&exec_ctx, NULL, sfd.server, mdctx, 0); - server_setup_transport (&a, transport, mdctx); - grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0); - grpc_exec_ctx_finish (&exec_ctx); + grpc_server_register_completion_queue(a.server, a.cq, NULL); + grpc_server_start(a.server); + transport = + grpc_create_chttp2_transport(&exec_ctx, NULL, sfd.server, mdctx, 0); + server_setup_transport(&a, transport, mdctx); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL, 0); + grpc_exec_ctx_finish(&exec_ctx); /* 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(&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)); + GPR_ASSERT(grpc_server_has_open_connections(a.server)); /* Start validator */ - gpr_thd_new (&id, thd_func, &a, NULL); + gpr_thd_new(&id, thd_func, &a, NULL); - gpr_slice_buffer_init (&outgoing); - gpr_slice_buffer_add (&outgoing, slice); - grpc_closure_init (&done_write_closure, done_write, &a); + gpr_slice_buffer_init(&outgoing); + gpr_slice_buffer_add(&outgoing, slice); + grpc_closure_init(&done_write_closure, done_write, &a); /* Write data */ - grpc_endpoint_write (&exec_ctx, sfd.client, &outgoing, &done_write_closure); - grpc_exec_ctx_finish (&exec_ctx); + grpc_endpoint_write(&exec_ctx, sfd.client, &outgoing, &done_write_closure); + grpc_exec_ctx_finish(&exec_ctx); /* Await completion */ - GPR_ASSERT (gpr_event_wait (&a.done_write, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5))); + GPR_ASSERT( + gpr_event_wait(&a.done_write, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5))); - if (flags & GRPC_BAD_CLIENT_DISCONNECT) - { - grpc_endpoint_shutdown (&exec_ctx, sfd.client); - grpc_endpoint_destroy (&exec_ctx, sfd.client); - grpc_exec_ctx_finish (&exec_ctx); - sfd.client = NULL; - } + if (flags & GRPC_BAD_CLIENT_DISCONNECT) { + grpc_endpoint_shutdown(&exec_ctx, sfd.client); + grpc_endpoint_destroy(&exec_ctx, sfd.client); + grpc_exec_ctx_finish(&exec_ctx); + sfd.client = NULL; + } - GPR_ASSERT (gpr_event_wait (&a.done_thd, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5))); + GPR_ASSERT(gpr_event_wait(&a.done_thd, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5))); /* Shutdown */ - if (sfd.client) - { - grpc_endpoint_shutdown (&exec_ctx, sfd.client); - grpc_endpoint_destroy (&exec_ctx, sfd.client); - grpc_exec_ctx_finish (&exec_ctx); - } - grpc_server_shutdown_and_notify (a.server, a.cq, NULL); - GPR_ASSERT (grpc_completion_queue_pluck (a.cq, NULL, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (a.server); - grpc_completion_queue_destroy (a.cq); - gpr_slice_buffer_destroy (&outgoing); - - grpc_exec_ctx_finish (&exec_ctx); - grpc_shutdown (); + if (sfd.client) { + grpc_endpoint_shutdown(&exec_ctx, sfd.client); + grpc_endpoint_destroy(&exec_ctx, sfd.client); + grpc_exec_ctx_finish(&exec_ctx); + } + grpc_server_shutdown_and_notify(a.server, a.cq, NULL); + GPR_ASSERT(grpc_completion_queue_pluck( + a.cq, NULL, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(a.server); + grpc_completion_queue_destroy(a.cq); + gpr_slice_buffer_destroy(&outgoing); + + grpc_exec_ctx_finish(&exec_ctx); + grpc_shutdown(); } diff --git a/test/core/bad_client/bad_client.h b/test/core/bad_client/bad_client.h index 437e884f6a9..01beda60ee5 100644 --- a/test/core/bad_client/bad_client.h +++ b/test/core/bad_client/bad_client.h @@ -37,7 +37,8 @@ #include #include "test/core/util/test_config.h" -typedef void (*grpc_bad_client_server_side_validator) (grpc_server * server, grpc_completion_queue * cq); +typedef void (*grpc_bad_client_server_side_validator)( + grpc_server *server, grpc_completion_queue *cq); #define GRPC_BAD_CLIENT_DISCONNECT 1 @@ -46,7 +47,9 @@ typedef void (*grpc_bad_client_server_side_validator) (grpc_server * server, grp Create a server, and send client_payload to it as bytes from a client. Execute validator in a separate thread to assert that the bytes are handled as expected. */ -void grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const char *client_payload, size_t client_payload_length, gpr_uint32 flags); +void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, + const char *client_payload, + size_t client_payload_length, gpr_uint32 flags); #define GRPC_RUN_BAD_CLIENT_TEST(validator, payload, flags) \ grpc_run_bad_client_test(validator, payload, sizeof(payload) - 1, flags) diff --git a/test/core/bad_client/tests/connection_prefix.c b/test/core/bad_client/tests/connection_prefix.c index 0e51e9a267b..ec852116055 100644 --- a/test/core/bad_client/tests/connection_prefix.c +++ b/test/core/bad_client/tests/connection_prefix.c @@ -34,43 +34,40 @@ #include "test/core/bad_client/bad_client.h" #include "src/core/surface/server.h" -static void -verifier (grpc_server * server, grpc_completion_queue * cq) -{ - while (grpc_server_has_open_connections (server)) - { - GPR_ASSERT (grpc_completion_queue_next (cq, GRPC_TIMEOUT_MILLIS_TO_DEADLINE (20), NULL).type == GRPC_QUEUE_TIMEOUT); - } +static void verifier(grpc_server *server, grpc_completion_queue *cq) { + while (grpc_server_has_open_connections(server)) { + GPR_ASSERT(grpc_completion_queue_next( + cq, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(20), NULL) + .type == GRPC_QUEUE_TIMEOUT); + } } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "X", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRIX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI X", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI *X", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * X", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTPX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/X", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2X", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.X", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0X", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\rX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\nX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\n\rX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\n\r\nX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\n\r\nSX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\n\r\nSMX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\n\r\nSM\rX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\n\r\nSM\r\nX", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, "PRI * HTTP/2.0\r\n\r\nSM\r\n\rX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "X", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRIX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI X", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI *X", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * X", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTPX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/X", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2X", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.X", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0X", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\rX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\nX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\n\rX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\n\r\nX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\n\r\nSX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\n\r\nSMX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\n\r\nSM\rX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\n\r\nSM\r\nX", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, "PRI * HTTP/2.0\r\n\r\nSM\r\n\rX", 0); return 0; } diff --git a/test/core/bad_client/tests/initial_settings_frame.c b/test/core/bad_client/tests/initial_settings_frame.c index 3db6d833692..261fecdaf2f 100644 --- a/test/core/bad_client/tests/initial_settings_frame.c +++ b/test/core/bad_client/tests/initial_settings_frame.c @@ -36,43 +36,60 @@ #define PFX_STR "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" -static void -verifier (grpc_server * server, grpc_completion_queue * cq) -{ - while (grpc_server_has_open_connections (server)) - { - GPR_ASSERT (grpc_completion_queue_next (cq, GRPC_TIMEOUT_MILLIS_TO_DEADLINE (20), NULL).type == GRPC_QUEUE_TIMEOUT); - } +static void verifier(grpc_server *server, grpc_completion_queue *cq) { + while (grpc_server_has_open_connections(server)) { + GPR_ASSERT(grpc_completion_queue_next( + cq, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(20), NULL) + .type == GRPC_QUEUE_TIMEOUT); + } } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); /* various partial prefixes */ - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00", GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00", GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00", GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x06", GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x06", GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x06", GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04", GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\x00", GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\x01", GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\xff", GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\x00\x00", GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\x00\x00\x00", GRPC_BAD_CLIENT_DISCONNECT); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\x00\x00\x00\x00", GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00", + GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00", + GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00", + GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x06", + GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x06", + GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x06", + GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00\x04", + GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00\x04\x00", + GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00\x04\x01", + GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00\x04\xff", + GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00\x04\x00\x00", + GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00\x04\x00\x00\x00", + GRPC_BAD_CLIENT_DISCONNECT); + GRPC_RUN_BAD_CLIENT_TEST(verifier, PFX_STR "\x00\x00\x00\x04\x00\x00\x00\x00", + GRPC_BAD_CLIENT_DISCONNECT); /* must not send frames with stream id != 0 */ - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\x00\x00\x00\x00\x01", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x00\x04\x00\x40\x00\x00\x00", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, + PFX_STR "\x00\x00\x00\x04\x00\x00\x00\x00\x01", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, + PFX_STR "\x00\x00\x00\x04\x00\x40\x00\x00\x00", 0); /* settings frame must be a multiple of six bytes long */ - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x01\x04\x00\x00\x00\x00\x00", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x02\x04\x00\x00\x00\x00\x00", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x03\x04\x00\x00\x00\x00\x00", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x04\x04\x00\x00\x00\x00\x00", 0); - GRPC_RUN_BAD_CLIENT_TEST (verifier, PFX_STR "\x00\x00\x05\x04\x00\x00\x00\x00\x00", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, + PFX_STR "\x00\x00\x01\x04\x00\x00\x00\x00\x00", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, + PFX_STR "\x00\x00\x02\x04\x00\x00\x00\x00\x00", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, + PFX_STR "\x00\x00\x03\x04\x00\x00\x00\x00\x00", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, + PFX_STR "\x00\x00\x04\x04\x00\x00\x00\x00\x00", 0); + GRPC_RUN_BAD_CLIENT_TEST(verifier, + PFX_STR "\x00\x00\x05\x04\x00\x00\x00\x00\x00", 0); return 0; } diff --git a/test/core/channel/channel_args_test.c b/test/core/channel/channel_args_test.c index 207196ebdb1..0b74dee41ea 100644 --- a/test/core/channel/channel_args_test.c +++ b/test/core/channel/channel_args_test.c @@ -40,9 +40,7 @@ #include "test/core/util/test_config.h" -static void -test_create (void) -{ +static void test_create(void) { grpc_arg arg_int; grpc_arg arg_string; grpc_arg to_add[2]; @@ -58,94 +56,87 @@ test_create (void) to_add[0] = arg_int; to_add[1] = arg_string; - ch_args = grpc_channel_args_copy_and_add (NULL, to_add, 2); + ch_args = grpc_channel_args_copy_and_add(NULL, to_add, 2); - GPR_ASSERT (ch_args->num_args == 2); - GPR_ASSERT (strcmp (ch_args->args[0].key, arg_int.key) == 0); - GPR_ASSERT (ch_args->args[0].type == arg_int.type); - GPR_ASSERT (ch_args->args[0].value.integer == arg_int.value.integer); + GPR_ASSERT(ch_args->num_args == 2); + GPR_ASSERT(strcmp(ch_args->args[0].key, arg_int.key) == 0); + GPR_ASSERT(ch_args->args[0].type == arg_int.type); + GPR_ASSERT(ch_args->args[0].value.integer == arg_int.value.integer); - GPR_ASSERT (strcmp (ch_args->args[1].key, arg_string.key) == 0); - GPR_ASSERT (ch_args->args[1].type == arg_string.type); - GPR_ASSERT (strcmp (ch_args->args[1].value.string, arg_string.value.string) == 0); + GPR_ASSERT(strcmp(ch_args->args[1].key, arg_string.key) == 0); + GPR_ASSERT(ch_args->args[1].type == arg_string.type); + GPR_ASSERT(strcmp(ch_args->args[1].value.string, arg_string.value.string) == + 0); - grpc_channel_args_destroy (ch_args); + grpc_channel_args_destroy(ch_args); } -static void -test_set_compression_algorithm (void) -{ +static void test_set_compression_algorithm(void) { grpc_channel_args *ch_args; - ch_args = grpc_channel_args_set_compression_algorithm (NULL, GRPC_COMPRESS_GZIP); - GPR_ASSERT (ch_args->num_args == 1); - GPR_ASSERT (strcmp (ch_args->args[0].key, GRPC_COMPRESSION_ALGORITHM_ARG) == 0); - GPR_ASSERT (ch_args->args[0].type == GRPC_ARG_INTEGER); + ch_args = + grpc_channel_args_set_compression_algorithm(NULL, GRPC_COMPRESS_GZIP); + GPR_ASSERT(ch_args->num_args == 1); + GPR_ASSERT(strcmp(ch_args->args[0].key, GRPC_COMPRESSION_ALGORITHM_ARG) == 0); + GPR_ASSERT(ch_args->args[0].type == GRPC_ARG_INTEGER); - grpc_channel_args_destroy (ch_args); + grpc_channel_args_destroy(ch_args); } -static void -test_compression_algorithm_states (void) -{ +static void test_compression_algorithm_states(void) { grpc_channel_args *ch_args, *ch_args_wo_gzip, *ch_args_wo_gzip_deflate; unsigned states_bitset; size_t i; - ch_args = grpc_channel_args_copy_and_add (NULL, NULL, 0); + ch_args = grpc_channel_args_copy_and_add(NULL, NULL, 0); /* by default, all enabled */ - states_bitset = (unsigned) grpc_channel_args_compression_algorithm_get_states (ch_args); + states_bitset = + (unsigned)grpc_channel_args_compression_algorithm_get_states(ch_args); - for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) - { - GPR_ASSERT (GPR_BITGET (states_bitset, i)); - } + for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { + GPR_ASSERT(GPR_BITGET(states_bitset, i)); + } /* disable gzip and deflate */ - ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state (&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); - GPR_ASSERT (ch_args_wo_gzip == ch_args_wo_gzip_deflate); - - states_bitset = (unsigned) grpc_channel_args_compression_algorithm_get_states (ch_args_wo_gzip_deflate); - for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) - { - if (i == GRPC_COMPRESS_GZIP || i == GRPC_COMPRESS_DEFLATE) - { - GPR_ASSERT (GPR_BITGET (states_bitset, i) == 0); - } - else - { - GPR_ASSERT (GPR_BITGET (states_bitset, i) != 0); - } + ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state( + &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); + GPR_ASSERT(ch_args_wo_gzip == ch_args_wo_gzip_deflate); + + states_bitset = (unsigned)grpc_channel_args_compression_algorithm_get_states( + ch_args_wo_gzip_deflate); + for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { + if (i == GRPC_COMPRESS_GZIP || i == GRPC_COMPRESS_DEFLATE) { + GPR_ASSERT(GPR_BITGET(states_bitset, i) == 0); + } else { + GPR_ASSERT(GPR_BITGET(states_bitset, i) != 0); } + } /* re-enabled gzip only */ - ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state (&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 (ch_args_wo_gzip); - for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) - { - if (i == GRPC_COMPRESS_DEFLATE) - { - GPR_ASSERT (GPR_BITGET (states_bitset, i) == 0); - } - else - { - GPR_ASSERT (GPR_BITGET (states_bitset, i) != 0); - } + ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state( + &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( + ch_args_wo_gzip); + for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { + if (i == GRPC_COMPRESS_DEFLATE) { + GPR_ASSERT(GPR_BITGET(states_bitset, i) == 0); + } else { + GPR_ASSERT(GPR_BITGET(states_bitset, i) != 0); } + } - grpc_channel_args_destroy (ch_args); + grpc_channel_args_destroy(ch_args); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_create (); - test_set_compression_algorithm (); - test_compression_algorithm_states (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_create(); + test_set_compression_algorithm(); + test_compression_algorithm_states(); return 0; } diff --git a/test/core/channel/channel_stack_test.c b/test/core/channel/channel_stack_test.c index 24d5093b604..178fe2aa87e 100644 --- a/test/core/channel/channel_stack_test.c +++ b/test/core/channel/channel_stack_test.c @@ -41,63 +41,55 @@ #include "test/core/util/test_config.h" -static void -channel_init_func (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last) -{ - GPR_ASSERT (args->num_args == 1); - GPR_ASSERT (args->args[0].type == GRPC_ARG_INTEGER); - GPR_ASSERT (0 == strcmp (args->args[0].key, "test_key")); - GPR_ASSERT (args->args[0].value.integer == 42); - GPR_ASSERT (is_first); - GPR_ASSERT (is_last); - *(int *) (elem->channel_data) = 0; +static void channel_init_func(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, grpc_channel *master, + const grpc_channel_args *args, + grpc_mdctx *metadata_context, int is_first, + int is_last) { + GPR_ASSERT(args->num_args == 1); + GPR_ASSERT(args->args[0].type == GRPC_ARG_INTEGER); + GPR_ASSERT(0 == strcmp(args->args[0].key, "test_key")); + GPR_ASSERT(args->args[0].value.integer == 42); + GPR_ASSERT(is_first); + GPR_ASSERT(is_last); + *(int *)(elem->channel_data) = 0; } -static void -call_init_func (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) -{ - ++*(int *) (elem->channel_data); - *(int *) (elem->call_data) = 0; +static void call_init_func(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + const void *server_transport_data, + grpc_transport_stream_op *initial_op) { + ++*(int *)(elem->channel_data); + *(int *)(elem->call_data) = 0; } -static void -channel_destroy_func (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) -{ -} +static void channel_destroy_func(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem) {} -static void -call_destroy_func (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ - ++*(int *) (elem->channel_data); +static void call_destroy_func(grpc_exec_ctx *exec_ctx, + grpc_call_element *elem) { + ++*(int *)(elem->channel_data); } -static void -call_func (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) -{ - ++*(int *) (elem->call_data); +static void call_func(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + grpc_transport_stream_op *op) { + ++*(int *)(elem->call_data); } -static void -channel_func (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_transport_op * op) -{ - ++*(int *) (elem->channel_data); +static void channel_func(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, + grpc_transport_op *op) { + ++*(int *)(elem->channel_data); } -static char * -get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) -{ - return gpr_strdup ("peer"); +static char *get_peer(grpc_exec_ctx *exec_ctx, grpc_call_element *elem) { + return gpr_strdup("peer"); } -static void -test_create_channel_stack (void) -{ - const grpc_channel_filter filter = { call_func, channel_func, - sizeof (int), call_init_func, - call_destroy_func, sizeof (int), - channel_init_func, channel_destroy_func, - get_peer, "some_test_filter" - }; +static void test_create_channel_stack(void) { + const grpc_channel_filter filter = {call_func, channel_func, + sizeof(int), call_init_func, + call_destroy_func, sizeof(int), + channel_init_func, channel_destroy_func, + get_peer, "some_test_filter"}; const grpc_channel_filter *filters = &filter; grpc_channel_stack *channel_stack; grpc_call_stack *call_stack; @@ -110,7 +102,7 @@ test_create_channel_stack (void) int *call_data; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - metadata_context = grpc_mdctx_create (); + metadata_context = grpc_mdctx_create(); arg.type = GRPC_ARG_INTEGER; arg.key = "test_key"; @@ -119,39 +111,38 @@ test_create_channel_stack (void) chan_args.num_args = 1; chan_args.args = &arg; - channel_stack = gpr_malloc (grpc_channel_stack_size (&filters, 1)); - grpc_channel_stack_init (&exec_ctx, &filters, 1, NULL, &chan_args, metadata_context, channel_stack); - GPR_ASSERT (channel_stack->count == 1); - channel_elem = grpc_channel_stack_element (channel_stack, 0); - channel_data = (int *) channel_elem->channel_data; - GPR_ASSERT (*channel_data == 0); - - call_stack = gpr_malloc (channel_stack->call_stack_size); - grpc_call_stack_init (&exec_ctx, channel_stack, NULL, NULL, call_stack); - GPR_ASSERT (call_stack->count == 1); - call_elem = grpc_call_stack_element (call_stack, 0); - GPR_ASSERT (call_elem->filter == channel_elem->filter); - GPR_ASSERT (call_elem->channel_data == channel_elem->channel_data); - call_data = (int *) call_elem->call_data; - GPR_ASSERT (*call_data == 0); - GPR_ASSERT (*channel_data == 1); - - grpc_call_stack_destroy (&exec_ctx, call_stack); - gpr_free (call_stack); - GPR_ASSERT (*channel_data == 2); - - grpc_channel_stack_destroy (&exec_ctx, channel_stack); - gpr_free (channel_stack); - - grpc_mdctx_unref (metadata_context); - - GPR_ASSERT (grpc_closure_list_empty (closure_list)); + channel_stack = gpr_malloc(grpc_channel_stack_size(&filters, 1)); + grpc_channel_stack_init(&exec_ctx, &filters, 1, NULL, &chan_args, + metadata_context, channel_stack); + GPR_ASSERT(channel_stack->count == 1); + channel_elem = grpc_channel_stack_element(channel_stack, 0); + channel_data = (int *)channel_elem->channel_data; + GPR_ASSERT(*channel_data == 0); + + call_stack = gpr_malloc(channel_stack->call_stack_size); + grpc_call_stack_init(&exec_ctx, channel_stack, NULL, NULL, call_stack); + GPR_ASSERT(call_stack->count == 1); + call_elem = grpc_call_stack_element(call_stack, 0); + GPR_ASSERT(call_elem->filter == channel_elem->filter); + GPR_ASSERT(call_elem->channel_data == channel_elem->channel_data); + call_data = (int *)call_elem->call_data; + GPR_ASSERT(*call_data == 0); + GPR_ASSERT(*channel_data == 1); + + grpc_call_stack_destroy(&exec_ctx, call_stack); + gpr_free(call_stack); + GPR_ASSERT(*channel_data == 2); + + grpc_channel_stack_destroy(&exec_ctx, channel_stack); + gpr_free(channel_stack); + + grpc_mdctx_unref(metadata_context); + + GPR_ASSERT(grpc_closure_list_empty(closure_list)); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_create_channel_stack (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_create_channel_stack(); return 0; } diff --git a/test/core/client_config/lb_policies_test.c b/test/core/client_config/lb_policies_test.c index f5e9626d95f..2960ba1db6e 100644 --- a/test/core/client_config/lb_policies_test.c +++ b/test/core/client_config/lb_policies_test.c @@ -50,8 +50,7 @@ #include "test/core/util/port.h" #include "test/core/end2end/cq_verifier.h" -typedef struct servers_fixture -{ +typedef struct servers_fixture { size_t num_servers; grpc_server **servers; grpc_call **server_calls; @@ -60,10 +59,10 @@ typedef struct servers_fixture grpc_metadata_array *request_metadata_recv; } servers_fixture; -typedef void (*verifier_fn) (const servers_fixture *, grpc_channel *, const int *, const size_t); +typedef void (*verifier_fn)(const servers_fixture *, grpc_channel *, + const int *, const size_t); -typedef struct test_spec -{ +typedef struct test_spec { size_t num_iters; size_t num_servers; @@ -76,170 +75,145 @@ typedef struct test_spec } test_spec; -static void -test_spec_reset (test_spec * spec) -{ +static void test_spec_reset(test_spec *spec) { size_t i, j; - for (i = 0; i < spec->num_iters; i++) - { - for (j = 0; j < spec->num_servers; j++) - { - spec->kill_at[i][j] = 0; - spec->revive_at[i][j] = 0; - } + for (i = 0; i < spec->num_iters; i++) { + for (j = 0; j < spec->num_servers; j++) { + spec->kill_at[i][j] = 0; + spec->revive_at[i][j] = 0; } + } } -static test_spec * -test_spec_create (size_t num_iters, size_t num_servers) -{ +static test_spec *test_spec_create(size_t num_iters, size_t num_servers) { test_spec *spec; size_t i; - spec = gpr_malloc (sizeof (test_spec)); + spec = gpr_malloc(sizeof(test_spec)); spec->num_iters = num_iters; spec->num_servers = num_servers; - spec->kill_at = gpr_malloc (sizeof (int *) * num_iters); - spec->revive_at = gpr_malloc (sizeof (int *) * num_iters); - for (i = 0; i < num_iters; i++) - { - spec->kill_at[i] = gpr_malloc (sizeof (int) * num_servers); - spec->revive_at[i] = gpr_malloc (sizeof (int) * num_servers); - } - - test_spec_reset (spec); + spec->kill_at = gpr_malloc(sizeof(int *) * num_iters); + spec->revive_at = gpr_malloc(sizeof(int *) * num_iters); + for (i = 0; i < num_iters; i++) { + spec->kill_at[i] = gpr_malloc(sizeof(int) * num_servers); + spec->revive_at[i] = gpr_malloc(sizeof(int) * num_servers); + } + + test_spec_reset(spec); return spec; } -static void -test_spec_destroy (test_spec * spec) -{ +static void test_spec_destroy(test_spec *spec) { size_t i; - for (i = 0; i < spec->num_iters; i++) - { - gpr_free (spec->kill_at[i]); - gpr_free (spec->revive_at[i]); - } + for (i = 0; i < spec->num_iters; i++) { + gpr_free(spec->kill_at[i]); + gpr_free(spec->revive_at[i]); + } - gpr_free (spec->kill_at); - gpr_free (spec->revive_at); + gpr_free(spec->kill_at); + gpr_free(spec->revive_at); - gpr_free (spec); + gpr_free(spec); } -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, n_seconds_time (5), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, n_seconds_time(5), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -kill_server (const servers_fixture * f, size_t i) -{ - gpr_log (GPR_INFO, "KILLING SERVER %d", i); - GPR_ASSERT (f->servers[i] != NULL); - grpc_server_shutdown_and_notify (f->servers[i], f->cq, tag (10000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (10000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->servers[i]); +static void kill_server(const servers_fixture *f, size_t i) { + gpr_log(GPR_INFO, "KILLING SERVER %d", i); + GPR_ASSERT(f->servers[i] != NULL); + grpc_server_shutdown_and_notify(f->servers[i], f->cq, tag(10000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(10000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->servers[i]); f->servers[i] = NULL; } -static void -revive_server (const servers_fixture * f, size_t i) -{ +static void revive_server(const servers_fixture *f, size_t i) { int got_port; - gpr_log (GPR_INFO, "RAISE AGAIN SERVER %d", i); - GPR_ASSERT (f->servers[i] == NULL); - f->servers[i] = grpc_server_create (NULL, NULL); - grpc_server_register_completion_queue (f->servers[i], f->cq, NULL); - GPR_ASSERT ((got_port = grpc_server_add_insecure_http2_port (f->servers[i], f->servers_hostports[i])) > 0); - grpc_server_start (f->servers[i]); + gpr_log(GPR_INFO, "RAISE AGAIN SERVER %d", i); + GPR_ASSERT(f->servers[i] == NULL); + f->servers[i] = grpc_server_create(NULL, NULL); + grpc_server_register_completion_queue(f->servers[i], f->cq, NULL); + GPR_ASSERT((got_port = grpc_server_add_insecure_http2_port( + f->servers[i], f->servers_hostports[i])) > 0); + grpc_server_start(f->servers[i]); } -static servers_fixture * -setup_servers (const char *server_host, const size_t num_servers) -{ - servers_fixture *f = gpr_malloc (sizeof (servers_fixture)); +static servers_fixture *setup_servers(const char *server_host, + const size_t num_servers) { + servers_fixture *f = gpr_malloc(sizeof(servers_fixture)); int *ports; int got_port; size_t i; f->num_servers = num_servers; - f->server_calls = gpr_malloc (sizeof (grpc_call *) * num_servers); - f->request_metadata_recv = gpr_malloc (sizeof (grpc_metadata_array) * num_servers); + f->server_calls = gpr_malloc(sizeof(grpc_call *) * num_servers); + f->request_metadata_recv = + gpr_malloc(sizeof(grpc_metadata_array) * num_servers); /* Create servers. */ - ports = gpr_malloc (sizeof (int *) * num_servers); - f->servers = gpr_malloc (sizeof (grpc_server *) * num_servers); - f->servers_hostports = gpr_malloc (sizeof (char *) * num_servers); - f->cq = grpc_completion_queue_create (NULL); - for (i = 0; i < num_servers; i++) - { - ports[i] = grpc_pick_unused_port_or_die (); - - gpr_join_host_port (&f->servers_hostports[i], server_host, ports[i]); - - f->servers[i] = grpc_server_create (NULL, NULL); - grpc_server_register_completion_queue (f->servers[i], f->cq, NULL); - GPR_ASSERT ((got_port = grpc_server_add_insecure_http2_port (f->servers[i], f->servers_hostports[i])) > 0); - GPR_ASSERT (ports[i] == got_port); - grpc_server_start (f->servers[i]); - } - gpr_free (ports); + ports = gpr_malloc(sizeof(int *) * num_servers); + f->servers = gpr_malloc(sizeof(grpc_server *) * num_servers); + f->servers_hostports = gpr_malloc(sizeof(char *) * num_servers); + f->cq = grpc_completion_queue_create(NULL); + for (i = 0; i < num_servers; i++) { + ports[i] = grpc_pick_unused_port_or_die(); + + gpr_join_host_port(&f->servers_hostports[i], server_host, ports[i]); + + f->servers[i] = grpc_server_create(NULL, NULL); + grpc_server_register_completion_queue(f->servers[i], f->cq, NULL); + GPR_ASSERT((got_port = grpc_server_add_insecure_http2_port( + f->servers[i], f->servers_hostports[i])) > 0); + GPR_ASSERT(ports[i] == got_port); + grpc_server_start(f->servers[i]); + } + gpr_free(ports); return f; } -static void -teardown_servers (servers_fixture * f) -{ +static void teardown_servers(servers_fixture *f) { size_t i; /* Destroy server. */ - for (i = 0; i < f->num_servers; i++) - { - if (f->servers[i] == NULL) - continue; - grpc_server_shutdown_and_notify (f->servers[i], f->cq, tag (10000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (10000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->servers[i]); - } - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); - - gpr_free (f->servers); - - for (i = 0; i < f->num_servers; i++) - { - gpr_free (f->servers_hostports[i]); - } - - gpr_free (f->servers_hostports); - gpr_free (f->request_metadata_recv); - gpr_free (f->server_calls); - gpr_free (f); + for (i = 0; i < f->num_servers; i++) { + if (f->servers[i] == NULL) continue; + grpc_server_shutdown_and_notify(f->servers[i], f->cq, tag(10000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(10000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->servers[i]); + } + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); + + gpr_free(f->servers); + + for (i = 0; i < f->num_servers; i++) { + gpr_free(f->servers_hostports[i]); + } + + gpr_free(f->servers_hostports); + gpr_free(f->request_metadata_recv); + gpr_free(f->server_calls); + gpr_free(f); } /** Returns connection sequence (server indices), which must be freed */ -int * -perform_request (servers_fixture * f, grpc_channel * client, const test_spec * spec) -{ +int *perform_request(servers_fixture *f, grpc_channel *client, + const test_spec *spec) { grpc_call *c; int s_idx; int *s_valid; @@ -258,160 +232,157 @@ perform_request (servers_fixture * f, grpc_channel * client, const test_spec * s grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; - s_valid = gpr_malloc (sizeof (int) * f->num_servers); - call_details = gpr_malloc (sizeof (grpc_call_details) * f->num_servers); - connection_sequence = gpr_malloc (sizeof (int) * spec->num_iters); + s_valid = gpr_malloc(sizeof(int) * f->num_servers); + call_details = gpr_malloc(sizeof(grpc_call_details) * f->num_servers); + connection_sequence = gpr_malloc(sizeof(int) * spec->num_iters); /* Send a trivial request. */ - deadline = n_seconds_time (60); - - for (iter_num = 0; iter_num < spec->num_iters; iter_num++) - { - cq_verifier *cqv = cq_verifier_create (f->cq); - details = NULL; - details_capacity = 0; - was_cancelled = 2; - - for (i = 0; i < f->num_servers; i++) - { - if (spec->kill_at[iter_num][i] != 0) - { - kill_server (f, i); - } - else if (spec->revive_at[iter_num][i] != 0) - { - /* killing takes precedence */ - revive_server (f, i); - } - } - - connection_sequence[iter_num] = -1; - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - - for (i = 0; i < f->num_servers; i++) - { - grpc_call_details_init (&call_details[i]); - } - memset (s_valid, 0, f->num_servers * sizeof (int)); - - c = grpc_channel_create_call (client, NULL, GRPC_PROPAGATE_DEFAULTS, f->cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + deadline = n_seconds_time(60); + + for (iter_num = 0; iter_num < spec->num_iters; iter_num++) { + cq_verifier *cqv = cq_verifier_create(f->cq); + details = NULL; + details_capacity = 0; + was_cancelled = 2; + + for (i = 0; i < f->num_servers; i++) { + if (spec->kill_at[iter_num][i] != 0) { + kill_server(f, i); + } else if (spec->revive_at[iter_num][i] != 0) { + /* killing takes precedence */ + revive_server(f, i); + } + } + + connection_sequence[iter_num] = -1; + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + for (i = 0; i < f->num_servers; i++) { + grpc_call_details_init(&call_details[i]); + } + memset(s_valid, 0, f->num_servers * sizeof(int)); + + c = grpc_channel_create_call(client, NULL, GRPC_PROPAGATE_DEFAULTS, f->cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); + + op = ops; + op->op = GRPC_OP_SEND_INITIAL_METADATA; + op->data.send_initial_metadata.count = 0; + op->flags = 0; + op->reserved = NULL; + op++; + op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; + op->flags = 0; + op->reserved = NULL; + op++; + op->op = GRPC_OP_RECV_INITIAL_METADATA; + op->data.recv_initial_metadata = &initial_metadata_recv; + op->flags = 0; + op->reserved = NULL; + 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->data.recv_status_on_client.status_details_capacity = &details_capacity; + op->flags = 0; + op->reserved = NULL; + op++; + GPR_ASSERT(GRPC_CALL_OK == + grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL)); + + /* "listen" on all servers */ + for (i = 0; i < f->num_servers; i++) { + grpc_metadata_array_init(&f->request_metadata_recv[i]); + if (f->servers[i] != NULL) { + GPR_ASSERT(GRPC_CALL_OK == + grpc_server_request_call(f->servers[i], &f->server_calls[i], + &call_details[i], + &f->request_metadata_recv[i], f->cq, + f->cq, tag(1000 + (int)i))); + } + } + + s_idx = -1; + while ((ev = grpc_completion_queue_next( + f->cq, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1), NULL)) + .type != GRPC_QUEUE_TIMEOUT) { + read_tag = ((int)(gpr_intptr)ev.tag); + gpr_log(GPR_DEBUG, "EVENT: success:%d, type:%d, tag:%d iter:%d", + ev.success, ev.type, read_tag, iter_num); + if (ev.success && read_tag >= 1000) { + GPR_ASSERT(s_idx == -1); /* only one server must reply */ + /* only server notifications for non-shutdown events */ + s_idx = read_tag - 1000; + s_valid[s_idx] = 1; + connection_sequence[iter_num] = s_idx; + } + } + + if (s_idx >= 0) { op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; op->data.send_initial_metadata.count = 0; op->flags = 0; op->reserved = NULL; op++; - op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; - op->flags = 0; - op->reserved = NULL; - op++; - op->op = GRPC_OP_RECV_INITIAL_METADATA; - op->data.recv_initial_metadata = &initial_metadata_recv; + op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; + op->data.send_status_from_server.trailing_metadata_count = 0; + op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED; + op->data.send_status_from_server.status_details = "xyz"; op->flags = 0; op->reserved = NULL; 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->data.recv_status_on_client.status_details_capacity = &details_capacity; + op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; + op->data.recv_close_on_server.cancelled = &was_cancelled; op->flags = 0; op->reserved = NULL; op++; - GPR_ASSERT (GRPC_CALL_OK == grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL)); - - /* "listen" on all servers */ - for (i = 0; i < f->num_servers; i++) - { - grpc_metadata_array_init (&f->request_metadata_recv[i]); - if (f->servers[i] != NULL) - { - GPR_ASSERT (GRPC_CALL_OK == grpc_server_request_call (f->servers[i], &f->server_calls[i], &call_details[i], &f->request_metadata_recv[i], f->cq, f->cq, tag (1000 + (int) i))); - } - } - - s_idx = -1; - while ((ev = grpc_completion_queue_next (f->cq, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1), NULL)).type != GRPC_QUEUE_TIMEOUT) - { - read_tag = ((int) (gpr_intptr) ev.tag); - gpr_log (GPR_DEBUG, "EVENT: success:%d, type:%d, tag:%d iter:%d", ev.success, ev.type, read_tag, iter_num); - if (ev.success && read_tag >= 1000) - { - GPR_ASSERT (s_idx == -1); /* only one server must reply */ - /* only server notifications for non-shutdown events */ - s_idx = read_tag - 1000; - s_valid[s_idx] = 1; - connection_sequence[iter_num] = s_idx; - } - } - - if (s_idx >= 0) - { - op = ops; - op->op = GRPC_OP_SEND_INITIAL_METADATA; - op->data.send_initial_metadata.count = 0; - op->flags = 0; - op->reserved = NULL; - op++; - op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; - op->data.send_status_from_server.trailing_metadata_count = 0; - op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED; - op->data.send_status_from_server.status_details = "xyz"; - op->flags = 0; - op->reserved = NULL; - op++; - op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; - op->data.recv_close_on_server.cancelled = &was_cancelled; - op->flags = 0; - op->reserved = NULL; - op++; - GPR_ASSERT (GRPC_CALL_OK == grpc_call_start_batch (f->server_calls[s_idx], ops, (size_t) (op - ops), tag (102), NULL)); - - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); - - GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details[s_idx].method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details[s_idx].host, "foo.test.google.fr")); - GPR_ASSERT (was_cancelled == 1); - } - - for (i = 0; i < f->num_servers; i++) - { - if (s_valid[i] != 0) - { - grpc_call_destroy (f->server_calls[i]); - } - grpc_metadata_array_destroy (&f->request_metadata_recv[i]); - } - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - - cq_verifier_destroy (cqv); - - grpc_call_destroy (c); - - for (i = 0; i < f->num_servers; i++) - { - grpc_call_details_destroy (&call_details[i]); - } - gpr_free (details); + GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(f->server_calls[s_idx], + ops, (size_t)(op - ops), + tag(102), NULL)); + + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); + + GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details[s_idx].method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details[s_idx].host, "foo.test.google.fr")); + GPR_ASSERT(was_cancelled == 1); + } + + for (i = 0; i < f->num_servers; i++) { + if (s_valid[i] != 0) { + grpc_call_destroy(f->server_calls[i]); + } + grpc_metadata_array_destroy(&f->request_metadata_recv[i]); + } + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + + cq_verifier_destroy(cqv); + + grpc_call_destroy(c); + + for (i = 0; i < f->num_servers; i++) { + grpc_call_details_destroy(&call_details[i]); } + gpr_free(details); + } - gpr_free (call_details); - gpr_free (s_valid); + gpr_free(call_details); + gpr_free(s_valid); return connection_sequence; } -static void -assert_channel_connectivity (grpc_channel * ch, size_t num_accepted_conn_states, grpc_connectivity_state accepted_conn_state, ...) -{ +static void assert_channel_connectivity( + grpc_channel *ch, size_t num_accepted_conn_states, + grpc_connectivity_state accepted_conn_state, ...) { size_t i; grpc_channel_stack *client_stack; grpc_channel_element *client_channel_filter; @@ -419,306 +390,316 @@ assert_channel_connectivity (grpc_channel * ch, size_t num_accepted_conn_states, grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; va_list ap; - client_stack = grpc_channel_get_channel_stack (ch); - client_channel_filter = grpc_channel_stack_last_element (client_stack); - - actual_conn_state = grpc_client_channel_check_connectivity_state (&exec_ctx, client_channel_filter, 0 /* don't try to connect */ ); - grpc_exec_ctx_finish (&exec_ctx); - va_start (ap, accepted_conn_state); - for (i = 0; i < num_accepted_conn_states; i++) - { - if (actual_conn_state == accepted_conn_state) - { - break; - } - accepted_conn_state = va_arg (ap, grpc_connectivity_state); + client_stack = grpc_channel_get_channel_stack(ch); + client_channel_filter = grpc_channel_stack_last_element(client_stack); + + actual_conn_state = grpc_client_channel_check_connectivity_state( + &exec_ctx, client_channel_filter, 0 /* don't try to connect */); + grpc_exec_ctx_finish(&exec_ctx); + va_start(ap, accepted_conn_state); + for (i = 0; i < num_accepted_conn_states; i++) { + if (actual_conn_state == accepted_conn_state) { + break; + } + accepted_conn_state = va_arg(ap, grpc_connectivity_state); + } + va_end(ap); + if (i == num_accepted_conn_states) { + char **accepted_strs = + gpr_malloc(sizeof(char *) * num_accepted_conn_states); + char *accepted_str_joined; + va_start(ap, accepted_conn_state); + for (i = 0; i < num_accepted_conn_states; i++) { + GPR_ASSERT(gpr_asprintf(&accepted_strs[i], "%d", accepted_conn_state) > + 0); + accepted_conn_state = va_arg(ap, grpc_connectivity_state); } - va_end (ap); - if (i == num_accepted_conn_states) - { - char **accepted_strs = gpr_malloc (sizeof (char *) * num_accepted_conn_states); - char *accepted_str_joined; - va_start (ap, accepted_conn_state); - for (i = 0; i < num_accepted_conn_states; i++) - { - GPR_ASSERT (gpr_asprintf (&accepted_strs[i], "%d", accepted_conn_state) > 0); - accepted_conn_state = va_arg (ap, grpc_connectivity_state); - } - va_end (ap); - accepted_str_joined = gpr_strjoin_sep ((const char **) accepted_strs, num_accepted_conn_states, ", ", NULL); - gpr_log (GPR_ERROR, "Channel connectivity assertion failed: expected , got %d", accepted_str_joined, actual_conn_state); - - for (i = 0; i < num_accepted_conn_states; i++) - { - gpr_free (accepted_strs[i]); - } - gpr_free (accepted_strs); - gpr_free (accepted_str_joined); - abort (); + va_end(ap); + accepted_str_joined = gpr_strjoin_sep((const char **)accepted_strs, + num_accepted_conn_states, ", ", NULL); + gpr_log( + GPR_ERROR, + "Channel connectivity assertion failed: expected , got %d", + accepted_str_joined, actual_conn_state); + + for (i = 0; i < num_accepted_conn_states; i++) { + gpr_free(accepted_strs[i]); } + gpr_free(accepted_strs); + gpr_free(accepted_str_joined); + abort(); + } } -void -run_spec (const test_spec * spec) -{ +void run_spec(const test_spec *spec) { grpc_channel *client; char *client_hostport; char *servers_hostports_str; int *actual_connection_sequence; - servers_fixture *f = setup_servers ("127.0.0.1", spec->num_servers); + servers_fixture *f = setup_servers("127.0.0.1", spec->num_servers); /* Create client. */ - servers_hostports_str = gpr_strjoin_sep ((const char **) f->servers_hostports, f->num_servers, ",", NULL); - gpr_asprintf (&client_hostport, "ipv4:%s?lb_policy=round_robin", servers_hostports_str); - client = grpc_insecure_channel_create (client_hostport, NULL, NULL); + servers_hostports_str = gpr_strjoin_sep((const char **)f->servers_hostports, + f->num_servers, ",", NULL); + gpr_asprintf(&client_hostport, "ipv4:%s?lb_policy=round_robin", + servers_hostports_str); + client = grpc_insecure_channel_create(client_hostport, NULL, NULL); - gpr_log (GPR_INFO, "Testing '%s' with servers=%s client=%s", spec->description, servers_hostports_str, client_hostport); + gpr_log(GPR_INFO, "Testing '%s' with servers=%s client=%s", spec->description, + servers_hostports_str, client_hostport); - actual_connection_sequence = perform_request (f, client, spec); + actual_connection_sequence = perform_request(f, client, spec); - spec->verifier (f, client, actual_connection_sequence, spec->num_iters); + spec->verifier(f, client, actual_connection_sequence, spec->num_iters); - gpr_free (client_hostport); - gpr_free (servers_hostports_str); - gpr_free (actual_connection_sequence); + gpr_free(client_hostport); + gpr_free(servers_hostports_str); + gpr_free(actual_connection_sequence); - grpc_channel_destroy (client); - teardown_servers (f); + grpc_channel_destroy(client); + teardown_servers(f); } -static void -print_failed_expectations (const int *expected_connection_sequence, const int *actual_connection_sequence, const size_t expected_seq_length, const size_t num_iters) -{ +static void print_failed_expectations(const int *expected_connection_sequence, + const int *actual_connection_sequence, + const size_t expected_seq_length, + const size_t num_iters) { size_t i; - for (i = 0; i < num_iters; i++) - { - gpr_log (GPR_ERROR, "FAILURE: Iter, expected, actual:%d (%d, %d)", i, expected_connection_sequence[i % expected_seq_length], actual_connection_sequence[i]); - } + for (i = 0; i < num_iters; i++) { + gpr_log(GPR_ERROR, "FAILURE: Iter, expected, actual:%d (%d, %d)", i, + expected_connection_sequence[i % expected_seq_length], + actual_connection_sequence[i]); + } } -static void -verify_vanilla_round_robin (const servers_fixture * f, grpc_channel * client, const int *actual_connection_sequence, const size_t num_iters) -{ +static void verify_vanilla_round_robin(const servers_fixture *f, + grpc_channel *client, + const int *actual_connection_sequence, + const size_t num_iters) { int *expected_connection_sequence; size_t i; const size_t expected_seq_length = f->num_servers; /* verify conn. seq. expectation */ /* get the first sequence of "num_servers" elements */ - expected_connection_sequence = gpr_malloc (sizeof (int) * expected_seq_length); - memcpy (expected_connection_sequence, actual_connection_sequence, sizeof (int) * expected_seq_length); - - for (i = 0; i < num_iters; i++) - { - const int actual = actual_connection_sequence[i]; - const int expected = expected_connection_sequence[i % expected_seq_length]; - if (actual != expected) - { - gpr_log (GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, actual, i); - print_failed_expectations (expected_connection_sequence, actual_connection_sequence, expected_seq_length, num_iters); - abort (); - } + expected_connection_sequence = gpr_malloc(sizeof(int) * expected_seq_length); + memcpy(expected_connection_sequence, actual_connection_sequence, + sizeof(int) * expected_seq_length); + + for (i = 0; i < num_iters; i++) { + const int actual = actual_connection_sequence[i]; + const int expected = expected_connection_sequence[i % expected_seq_length]; + if (actual != expected) { + gpr_log(GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, + actual, i); + print_failed_expectations(expected_connection_sequence, + actual_connection_sequence, expected_seq_length, + num_iters); + abort(); } - assert_channel_connectivity (client, 1, GRPC_CHANNEL_READY); + } + assert_channel_connectivity(client, 1, GRPC_CHANNEL_READY); - gpr_free (expected_connection_sequence); + gpr_free(expected_connection_sequence); } /* At the start of the second iteration, all but the first and last servers (as * given in "f") are killed */ -static void -verify_vanishing_floor_round_robin (const servers_fixture * f, grpc_channel * client, const int *actual_connection_sequence, const size_t num_iters) -{ +static void verify_vanishing_floor_round_robin( + const servers_fixture *f, grpc_channel *client, + const int *actual_connection_sequence, const size_t num_iters) { int *expected_connection_sequence; const size_t expected_seq_length = 2; size_t i; /* verify conn. seq. expectation */ /* copy the first full sequence (without -1s) */ - expected_connection_sequence = gpr_malloc (sizeof (int) * expected_seq_length); - memcpy (expected_connection_sequence, actual_connection_sequence + 2, expected_seq_length * sizeof (int)); + expected_connection_sequence = gpr_malloc(sizeof(int) * expected_seq_length); + memcpy(expected_connection_sequence, actual_connection_sequence + 2, + expected_seq_length * sizeof(int)); /* first three elements of the sequence should be [<1st>, -1] */ - if (actual_connection_sequence[0] != expected_connection_sequence[0]) - { - gpr_log (GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected_connection_sequence[0], actual_connection_sequence[0], 0); - print_failed_expectations (expected_connection_sequence, actual_connection_sequence, expected_seq_length, 1u); - abort (); - } - - GPR_ASSERT (actual_connection_sequence[1] == -1); - - for (i = 2; i < num_iters; i++) - { - const int actual = actual_connection_sequence[i]; - const int expected = expected_connection_sequence[i % expected_seq_length]; - if (actual != expected) - { - gpr_log (GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, actual, i); - print_failed_expectations (expected_connection_sequence, actual_connection_sequence, expected_seq_length, num_iters); - abort (); - } + if (actual_connection_sequence[0] != expected_connection_sequence[0]) { + gpr_log(GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", + expected_connection_sequence[0], actual_connection_sequence[0], 0); + print_failed_expectations(expected_connection_sequence, + actual_connection_sequence, expected_seq_length, + 1u); + abort(); + } + + GPR_ASSERT(actual_connection_sequence[1] == -1); + + for (i = 2; i < num_iters; i++) { + const int actual = actual_connection_sequence[i]; + const int expected = expected_connection_sequence[i % expected_seq_length]; + if (actual != expected) { + gpr_log(GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, + actual, i); + print_failed_expectations(expected_connection_sequence, + actual_connection_sequence, expected_seq_length, + num_iters); + abort(); } - gpr_free (expected_connection_sequence); + } + gpr_free(expected_connection_sequence); } -static void -verify_total_carnage_round_robin (const servers_fixture * f, grpc_channel * client, const int *actual_connection_sequence, const size_t num_iters) -{ +static void verify_total_carnage_round_robin( + const servers_fixture *f, grpc_channel *client, + const int *actual_connection_sequence, const size_t num_iters) { size_t i; - for (i = 0; i < num_iters; i++) - { - const int actual = actual_connection_sequence[i]; - const int expected = -1; - if (actual != expected) - { - gpr_log (GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, actual, i); - abort (); - } + for (i = 0; i < num_iters; i++) { + const int actual = actual_connection_sequence[i]; + const int expected = -1; + if (actual != expected) { + gpr_log(GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, + actual, i); + abort(); } + } /* even though we know all the servers are dead, the client is still trying * retrying, believing it's in a transient failure situation */ - assert_channel_connectivity (client, 2, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_CHANNEL_CONNECTING); + assert_channel_connectivity(client, 2, GRPC_CHANNEL_TRANSIENT_FAILURE, + GRPC_CHANNEL_CONNECTING); } -static void -verify_partial_carnage_round_robin (const servers_fixture * f, grpc_channel * client, const int *actual_connection_sequence, const size_t num_iters) -{ +static void verify_partial_carnage_round_robin( + const servers_fixture *f, grpc_channel *client, + const int *actual_connection_sequence, const size_t num_iters) { int *expected_connection_sequence; size_t i; const size_t expected_seq_length = f->num_servers; /* verify conn. seq. expectation */ /* get the first sequence of "num_servers" elements */ - expected_connection_sequence = gpr_malloc (sizeof (int) * expected_seq_length); - memcpy (expected_connection_sequence, actual_connection_sequence, sizeof (int) * expected_seq_length); - - for (i = 0; i < num_iters / 2; i++) - { - const int actual = actual_connection_sequence[i]; - const int expected = expected_connection_sequence[i % expected_seq_length]; - if (actual != expected) - { - gpr_log (GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, actual, i); - print_failed_expectations (expected_connection_sequence, actual_connection_sequence, expected_seq_length, num_iters); - abort (); - } + expected_connection_sequence = gpr_malloc(sizeof(int) * expected_seq_length); + memcpy(expected_connection_sequence, actual_connection_sequence, + sizeof(int) * expected_seq_length); + + for (i = 0; i < num_iters / 2; i++) { + const int actual = actual_connection_sequence[i]; + const int expected = expected_connection_sequence[i % expected_seq_length]; + if (actual != expected) { + gpr_log(GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, + actual, i); + print_failed_expectations(expected_connection_sequence, + actual_connection_sequence, expected_seq_length, + num_iters); + abort(); } + } /* second half of the iterations go without response */ - for (; i < num_iters; i++) - { - GPR_ASSERT (actual_connection_sequence[i] == -1); - } + for (; i < num_iters; i++) { + GPR_ASSERT(actual_connection_sequence[i] == -1); + } /* even though we know all the servers are dead, the client is still trying * retrying, believing it's in a transient failure situation */ - assert_channel_connectivity (client, 2, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_CHANNEL_CONNECTING); - gpr_free (expected_connection_sequence); + assert_channel_connectivity(client, 2, GRPC_CHANNEL_TRANSIENT_FAILURE, + GRPC_CHANNEL_CONNECTING); + gpr_free(expected_connection_sequence); } -static void -verify_rebirth_round_robin (const servers_fixture * f, grpc_channel * client, const int *actual_connection_sequence, const size_t num_iters) -{ +static void verify_rebirth_round_robin(const servers_fixture *f, + grpc_channel *client, + const int *actual_connection_sequence, + const size_t num_iters) { int *expected_connection_sequence; size_t i; const size_t expected_seq_length = f->num_servers; /* verify conn. seq. expectation */ /* get the first sequence of "num_servers" elements */ - expected_connection_sequence = gpr_malloc (sizeof (int) * expected_seq_length); - memcpy (expected_connection_sequence, actual_connection_sequence + 4, sizeof (int) * expected_seq_length); + expected_connection_sequence = gpr_malloc(sizeof(int) * expected_seq_length); + memcpy(expected_connection_sequence, actual_connection_sequence + 4, + sizeof(int) * expected_seq_length); /* first iteration succeeds */ - GPR_ASSERT (actual_connection_sequence[0] != -1); + GPR_ASSERT(actual_connection_sequence[0] != -1); /* back up on the third (or maybe fourth) iteration */ i = 3; - if (actual_connection_sequence[i] == -1) - { - i = 4; - } - for (; i < num_iters; i++) - { - const int actual = actual_connection_sequence[i]; - const int expected = expected_connection_sequence[i % expected_seq_length]; - if (actual != expected) - { - gpr_log (GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, actual, i); - print_failed_expectations (expected_connection_sequence, actual_connection_sequence, expected_seq_length, num_iters); - abort (); - } + if (actual_connection_sequence[i] == -1) { + i = 4; + } + for (; i < num_iters; i++) { + const int actual = actual_connection_sequence[i]; + const int expected = expected_connection_sequence[i % expected_seq_length]; + if (actual != expected) { + gpr_log(GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected, + actual, i); + print_failed_expectations(expected_connection_sequence, + actual_connection_sequence, expected_seq_length, + num_iters); + abort(); } + } /* things are fine once the servers are brought back up */ - assert_channel_connectivity (client, 1, GRPC_CHANNEL_READY); - gpr_free (expected_connection_sequence); + assert_channel_connectivity(client, 1, GRPC_CHANNEL_READY); + gpr_free(expected_connection_sequence); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { test_spec *spec; size_t i; const size_t NUM_ITERS = 10; const size_t NUM_SERVERS = 4; - grpc_test_init (argc, argv); - grpc_init (); + grpc_test_init(argc, argv); + grpc_init(); /* everything is fine, all servers stay up the whole time and life's peachy */ - spec = test_spec_create (NUM_ITERS, NUM_SERVERS); + spec = test_spec_create(NUM_ITERS, NUM_SERVERS); spec->verifier = verify_vanilla_round_robin; spec->description = "test_all_server_up"; - run_spec (spec); + run_spec(spec); /* Kill all servers first thing in the morning */ - test_spec_reset (spec); + test_spec_reset(spec); spec->verifier = verify_total_carnage_round_robin; spec->description = "test_kill_all_server"; - for (i = 0; i < NUM_SERVERS; i++) - { - spec->kill_at[0][i] = 1; - } - run_spec (spec); + for (i = 0; i < NUM_SERVERS; i++) { + spec->kill_at[0][i] = 1; + } + run_spec(spec); /* at the start of the 2nd iteration, kill all but the first and last servers. * This should knock down the server bound to be selected next */ - test_spec_reset (spec); + test_spec_reset(spec); spec->verifier = verify_vanishing_floor_round_robin; spec->description = "test_kill_all_server_at_2nd_iteration"; - for (i = 1; i < NUM_SERVERS - 1; i++) - { - spec->kill_at[1][i] = 1; - } - run_spec (spec); + for (i = 1; i < NUM_SERVERS - 1; i++) { + spec->kill_at[1][i] = 1; + } + run_spec(spec); /* Midway, kill all servers. */ - test_spec_reset (spec); + test_spec_reset(spec); spec->verifier = verify_partial_carnage_round_robin; spec->description = "test_kill_all_server_midway"; - for (i = 0; i < NUM_SERVERS; i++) - { - spec->kill_at[spec->num_iters / 2][i] = 1; - } - run_spec (spec); + for (i = 0; i < NUM_SERVERS; i++) { + spec->kill_at[spec->num_iters / 2][i] = 1; + } + run_spec(spec); /* After first iteration, kill all servers. On the third one, bring them all * back up. */ - test_spec_reset (spec); + test_spec_reset(spec); spec->verifier = verify_rebirth_round_robin; spec->description = "test_kill_all_server_after_1st_resurrect_at_3rd"; - for (i = 0; i < NUM_SERVERS; i++) - { - spec->kill_at[1][i] = 1; - spec->revive_at[3][i] = 1; - } - run_spec (spec); + for (i = 0; i < NUM_SERVERS; i++) { + spec->kill_at[1][i] = 1; + spec->revive_at[3][i] = 1; + } + run_spec(spec); - test_spec_destroy (spec); + test_spec_destroy(spec); - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/client_config/uri_parser_test.c b/test/core/client_config/uri_parser_test.c index 3f91a3242e2..df12d6b4cb7 100644 --- a/test/core/client_config/uri_parser_test.c +++ b/test/core/client_config/uri_parser_test.c @@ -39,48 +39,48 @@ #include "test/core/util/test_config.h" -static void -test_succeeds (const char *uri_text, const char *scheme, const char *authority, const char *path, const char *query, const char *fragment) -{ - 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_uri_destroy (uri); +static void test_succeeds(const char *uri_text, const char *scheme, + const char *authority, const char *path, + const char *query, const char *fragment) { + 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_uri_destroy(uri); } -static void -test_fails (const char *uri_text) -{ - GPR_ASSERT (NULL == grpc_uri_parse (uri_text, 0)); +static void test_fails(const char *uri_text) { + GPR_ASSERT(NULL == grpc_uri_parse(uri_text, 0)); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - 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", "", "", ""); - test_succeeds ("a192.4-df:foo.coom", "a192.4-df", "", "foo.coom", "", ""); - test_succeeds ("a+b:foo.coom", "a+b", "", "foo.coom", "", ""); - test_succeeds ("zookeeper://127.0.0.1:2181/foo/bar", "zookeeper", "127.0.0.1:2181", "/foo/bar", "", ""); - test_succeeds ("http://www.google.com?yay-i'm-using-queries", "http", "www.google.com", "", "yay-i'm-using-queries", ""); - test_succeeds ("dns:foo.com#fragment-all-the-things", "dns", "", "foo.com", "", "fragment-all-the-things"); - test_succeeds ("http:?legit", "http", "", "", "legit", ""); - test_succeeds ("unix:#this-is-ok-too", "unix", "", "", "", "this-is-ok-too"); - test_succeeds ("http:?legit#twice", "http", "", "", "legit", "twice"); - test_succeeds ("http://foo?bar#lol?", "http", "foo", "", "bar", "lol?"); - test_succeeds ("http://foo?bar#lol?/", "http", "foo", "", "bar", "lol?/"); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + 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", "", "", + ""); + test_succeeds("a192.4-df:foo.coom", "a192.4-df", "", "foo.coom", "", ""); + test_succeeds("a+b:foo.coom", "a+b", "", "foo.coom", "", ""); + test_succeeds("zookeeper://127.0.0.1:2181/foo/bar", "zookeeper", + "127.0.0.1:2181", "/foo/bar", "", ""); + test_succeeds("http://www.google.com?yay-i'm-using-queries", "http", + "www.google.com", "", "yay-i'm-using-queries", ""); + test_succeeds("dns:foo.com#fragment-all-the-things", "dns", "", "foo.com", "", + "fragment-all-the-things"); + test_succeeds("http:?legit", "http", "", "", "legit", ""); + test_succeeds("unix:#this-is-ok-too", "unix", "", "", "", "this-is-ok-too"); + test_succeeds("http:?legit#twice", "http", "", "", "legit", "twice"); + test_succeeds("http://foo?bar#lol?", "http", "foo", "", "bar", "lol?"); + test_succeeds("http://foo?bar#lol?/", "http", "foo", "", "bar", "lol?/"); - test_fails ("xyz"); - test_fails ("http:?dangling-pct-%0"); - test_fails ("http://foo?[bar]"); - test_fails ("http://foo?x[bar]"); - test_fails ("http://foo?bar#lol#"); + test_fails("xyz"); + test_fails("http:?dangling-pct-%0"); + test_fails("http://foo?[bar]"); + test_fails("http://foo?x[bar]"); + test_fails("http://foo?bar#lol#"); return 0; } diff --git a/test/core/compression/compression_test.c b/test/core/compression/compression_test.c index 40b115efb62..633fbd97f40 100644 --- a/test/core/compression/compression_test.c +++ b/test/core/compression/compression_test.c @@ -40,43 +40,38 @@ #include "test/core/util/test_config.h" -static void -test_compression_algorithm_parse (void) -{ +static void test_compression_algorithm_parse(void) { size_t i; - const char *valid_names[] = { "identity", "gzip", "deflate" }; + const char *valid_names[] = {"identity", "gzip", "deflate"}; const grpc_compression_algorithm valid_algorithms[] = { - GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, GRPC_COMPRESS_DEFLATE - }; - const char *invalid_names[] = { "gzip2", "foo", "", "2gzip" }; + GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, GRPC_COMPRESS_DEFLATE}; + const char *invalid_names[] = {"gzip2", "foo", "", "2gzip"}; - gpr_log (GPR_DEBUG, "test_compression_algorithm_parse"); + gpr_log(GPR_DEBUG, "test_compression_algorithm_parse"); - for (i = 0; i < GPR_ARRAY_SIZE (valid_names); i++) - { - const char *valid_name = valid_names[i]; - grpc_compression_algorithm algorithm; - int success; - success = grpc_compression_algorithm_parse (valid_name, strlen (valid_name), &algorithm); - GPR_ASSERT (success != 0); - GPR_ASSERT (algorithm == valid_algorithms[i]); - } + for (i = 0; i < GPR_ARRAY_SIZE(valid_names); i++) { + const char *valid_name = valid_names[i]; + grpc_compression_algorithm algorithm; + int success; + success = grpc_compression_algorithm_parse(valid_name, strlen(valid_name), + &algorithm); + GPR_ASSERT(success != 0); + GPR_ASSERT(algorithm == valid_algorithms[i]); + } - for (i = 0; i < GPR_ARRAY_SIZE (invalid_names); i++) - { - const char *invalid_name = invalid_names[i]; - grpc_compression_algorithm algorithm; - int success; - success = grpc_compression_algorithm_parse (invalid_name, strlen (invalid_name), &algorithm); - GPR_ASSERT (success == 0); - /* the value of "algorithm" is undefined upon failure */ - } + for (i = 0; i < GPR_ARRAY_SIZE(invalid_names); i++) { + const char *invalid_name = invalid_names[i]; + grpc_compression_algorithm algorithm; + int success; + success = grpc_compression_algorithm_parse( + invalid_name, strlen(invalid_name), &algorithm); + GPR_ASSERT(success == 0); + /* the value of "algorithm" is undefined upon failure */ + } } -int -main (int argc, char **argv) -{ - test_compression_algorithm_parse (); +int main(int argc, char **argv) { + test_compression_algorithm_parse(); return 0; } diff --git a/test/core/compression/message_compress_test.c b/test/core/compression/message_compress_test.c index 43978b97f41..98da6a1eaab 100644 --- a/test/core/compression/message_compress_test.c +++ b/test/core/compression/message_compress_test.c @@ -42,19 +42,19 @@ #include #include "test/core/util/slice_splitter.h" -typedef enum -{ ONE_A = 0, ONE_KB_A, ONE_MB_A, TEST_VALUE_COUNT } test_value; +typedef enum { ONE_A = 0, ONE_KB_A, ONE_MB_A, TEST_VALUE_COUNT } test_value; -typedef enum -{ +typedef enum { SHOULD_NOT_COMPRESS, SHOULD_COMPRESS, MAYBE_COMPRESSES } compressability; -static void -assert_passthrough (gpr_slice value, grpc_compression_algorithm algorithm, grpc_slice_split_mode uncompressed_split_mode, grpc_slice_split_mode compressed_split_mode, compressability compress_result_check) -{ +static void assert_passthrough(gpr_slice value, + grpc_compression_algorithm algorithm, + grpc_slice_split_mode uncompressed_split_mode, + grpc_slice_split_mode compressed_split_mode, + compressability compress_result_check) { gpr_slice_buffer input; gpr_slice_buffer compressed_raw; gpr_slice_buffer compressed; @@ -63,145 +63,132 @@ assert_passthrough (gpr_slice value, grpc_compression_algorithm algorithm, grpc_ int was_compressed; char *algorithm_name; - GPR_ASSERT (grpc_compression_algorithm_name (algorithm, &algorithm_name) != 0); - gpr_log (GPR_INFO, "assert_passthrough: value_length=%d value_hash=0x%08x " "algorithm='%s' uncompressed_split='%s' compressed_split='%s'", GPR_SLICE_LENGTH (value), gpr_murmur_hash3 (GPR_SLICE_START_PTR (value), GPR_SLICE_LENGTH (value), 0), algorithm_name, grpc_slice_split_mode_name (uncompressed_split_mode), grpc_slice_split_mode_name (compressed_split_mode)); + GPR_ASSERT(grpc_compression_algorithm_name(algorithm, &algorithm_name) != 0); + gpr_log(GPR_INFO, + "assert_passthrough: value_length=%d value_hash=0x%08x " + "algorithm='%s' uncompressed_split='%s' compressed_split='%s'", + GPR_SLICE_LENGTH(value), gpr_murmur_hash3(GPR_SLICE_START_PTR(value), + GPR_SLICE_LENGTH(value), 0), + algorithm_name, grpc_slice_split_mode_name(uncompressed_split_mode), + grpc_slice_split_mode_name(compressed_split_mode)); - gpr_slice_buffer_init (&input); - gpr_slice_buffer_init (&compressed_raw); - gpr_slice_buffer_init (&compressed); - gpr_slice_buffer_init (&output); + gpr_slice_buffer_init(&input); + gpr_slice_buffer_init(&compressed_raw); + gpr_slice_buffer_init(&compressed); + gpr_slice_buffer_init(&output); - grpc_split_slices_to_buffer (uncompressed_split_mode, &value, 1, &input); + grpc_split_slices_to_buffer(uncompressed_split_mode, &value, 1, &input); - was_compressed = grpc_msg_compress (algorithm, &input, &compressed_raw); - GPR_ASSERT (input.count > 0); + was_compressed = grpc_msg_compress(algorithm, &input, &compressed_raw); + GPR_ASSERT(input.count > 0); - switch (compress_result_check) - { + switch (compress_result_check) { case SHOULD_NOT_COMPRESS: - GPR_ASSERT (was_compressed == 0); + GPR_ASSERT(was_compressed == 0); break; case SHOULD_COMPRESS: - GPR_ASSERT (was_compressed == 1); + GPR_ASSERT(was_compressed == 1); break; case MAYBE_COMPRESSES: /* no check */ break; - } + } - grpc_split_slice_buffer (compressed_split_mode, &compressed_raw, &compressed); + grpc_split_slice_buffer(compressed_split_mode, &compressed_raw, &compressed); - GPR_ASSERT (grpc_msg_decompress (was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, &output)); + GPR_ASSERT(grpc_msg_decompress( + was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, &output)); - final = grpc_slice_merge (output.slices, output.count); - GPR_ASSERT (0 == gpr_slice_cmp (value, final)); + final = grpc_slice_merge(output.slices, output.count); + GPR_ASSERT(0 == gpr_slice_cmp(value, final)); - gpr_slice_buffer_destroy (&input); - gpr_slice_buffer_destroy (&compressed); - gpr_slice_buffer_destroy (&compressed_raw); - gpr_slice_buffer_destroy (&output); - gpr_slice_unref (final); + gpr_slice_buffer_destroy(&input); + gpr_slice_buffer_destroy(&compressed); + gpr_slice_buffer_destroy(&compressed_raw); + gpr_slice_buffer_destroy(&output); + gpr_slice_unref(final); } -static gpr_slice -repeated (char c, size_t length) -{ - gpr_slice out = gpr_slice_malloc (length); - memset (GPR_SLICE_START_PTR (out), c, length); +static gpr_slice repeated(char c, size_t length) { + gpr_slice out = gpr_slice_malloc(length); + memset(GPR_SLICE_START_PTR(out), c, length); return out; } -static compressability -get_compressability (test_value id, grpc_compression_algorithm algorithm) -{ - if (algorithm == GRPC_COMPRESS_NONE) - return SHOULD_NOT_COMPRESS; - switch (id) - { +static compressability get_compressability( + test_value id, grpc_compression_algorithm algorithm) { + if (algorithm == GRPC_COMPRESS_NONE) return SHOULD_NOT_COMPRESS; + switch (id) { case ONE_A: return SHOULD_NOT_COMPRESS; case ONE_KB_A: case ONE_MB_A: return SHOULD_COMPRESS; case TEST_VALUE_COUNT: - abort (); + abort(); break; - } + } return MAYBE_COMPRESSES; } -static gpr_slice -create_test_value (test_value id) -{ - switch (id) - { +static gpr_slice create_test_value(test_value id) { + switch (id) { case ONE_A: - return gpr_slice_from_copied_string ("a"); + return gpr_slice_from_copied_string("a"); case ONE_KB_A: - return repeated ('a', 1024); + return repeated('a', 1024); case ONE_MB_A: - return repeated ('a', 1024 * 1024); + return repeated('a', 1024 * 1024); case TEST_VALUE_COUNT: - abort (); + abort(); break; - } - return gpr_slice_from_copied_string ("bad value"); + } + return gpr_slice_from_copied_string("bad value"); } -static void -test_bad_data (void) -{ +static void test_bad_data(void) { gpr_slice_buffer input; gpr_slice_buffer output; grpc_compression_algorithm i; - gpr_slice_buffer_init (&input); - gpr_slice_buffer_init (&output); - gpr_slice_buffer_add (&input, gpr_slice_from_copied_string ("this is not valid compressed input")); + gpr_slice_buffer_init(&input); + gpr_slice_buffer_init(&output); + gpr_slice_buffer_add(&input, gpr_slice_from_copied_string( + "this is not valid compressed input")); - for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) - { - if (i == GRPC_COMPRESS_NONE) - continue; - GPR_ASSERT (0 == grpc_msg_decompress (i, &input, &output)); - GPR_ASSERT (0 == output.count); - } + for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { + if (i == GRPC_COMPRESS_NONE) continue; + GPR_ASSERT(0 == grpc_msg_decompress(i, &input, &output)); + GPR_ASSERT(0 == output.count); + } - gpr_slice_buffer_destroy (&input); - gpr_slice_buffer_destroy (&output); + gpr_slice_buffer_destroy(&input); + gpr_slice_buffer_destroy(&output); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { unsigned i, j, k, m; grpc_slice_split_mode uncompressed_split_modes[] = { - GRPC_SLICE_SPLIT_IDENTITY, GRPC_SLICE_SPLIT_ONE_BYTE - }; - grpc_slice_split_mode compressed_split_modes[] = { GRPC_SLICE_SPLIT_MERGE_ALL, - GRPC_SLICE_SPLIT_IDENTITY, - GRPC_SLICE_SPLIT_ONE_BYTE - }; - - grpc_test_init (argc, argv); - - for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) - { - for (j = 0; j < GPR_ARRAY_SIZE (uncompressed_split_modes); j++) - { - for (k = 0; k < GPR_ARRAY_SIZE (compressed_split_modes); k++) - { - for (m = 0; m < TEST_VALUE_COUNT; m++) - { - gpr_slice slice = create_test_value (m); - assert_passthrough (slice, i, j, k, get_compressability (m, i)); - gpr_slice_unref (slice); - } - } - } + GRPC_SLICE_SPLIT_IDENTITY, GRPC_SLICE_SPLIT_ONE_BYTE}; + grpc_slice_split_mode compressed_split_modes[] = {GRPC_SLICE_SPLIT_MERGE_ALL, + GRPC_SLICE_SPLIT_IDENTITY, + GRPC_SLICE_SPLIT_ONE_BYTE}; + + grpc_test_init(argc, argv); + + for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { + for (j = 0; j < GPR_ARRAY_SIZE(uncompressed_split_modes); j++) { + for (k = 0; k < GPR_ARRAY_SIZE(compressed_split_modes); k++) { + for (m = 0; m < TEST_VALUE_COUNT; m++) { + gpr_slice slice = create_test_value(m); + assert_passthrough(slice, i, j, k, get_compressability(m, i)); + gpr_slice_unref(slice); + } + } } + } - test_bad_data (); + test_bad_data(); return 0; } diff --git a/test/core/end2end/cq_verifier.c b/test/core/end2end/cq_verifier.c index 3feb3977b31..922de268f41 100644 --- a/test/core/end2end/cq_verifier.c +++ b/test/core/end2end/cq_verifier.c @@ -50,8 +50,7 @@ #define ROOT_EXPECTATION 1000 /* a set of metadata we expect to find on an event */ -typedef struct metadata -{ +typedef struct metadata { size_t count; size_t cap; char **keys; @@ -60,8 +59,7 @@ typedef struct metadata /* details what we expect to find on a single event - and forms a linked list to detail other expectations */ -typedef struct expectation -{ +typedef struct expectation { struct expectation *next; struct expectation *prev; grpc_completion_type type; @@ -70,18 +68,15 @@ typedef struct expectation } expectation; /* the verifier itself */ -struct cq_verifier -{ +struct cq_verifier { /* bound completion queue */ grpc_completion_queue *cq; /* the root/sentinal expectation */ expectation expect; }; -cq_verifier * -cq_verifier_create (grpc_completion_queue * cq) -{ - cq_verifier *v = gpr_malloc (sizeof (cq_verifier)); +cq_verifier *cq_verifier_create(grpc_completion_queue *cq) { + cq_verifier *v = gpr_malloc(sizeof(cq_verifier)); v->expect.type = ROOT_EXPECTATION; v->expect.tag = NULL; v->expect.next = &v->expect; @@ -90,231 +85,197 @@ cq_verifier_create (grpc_completion_queue * cq) return v; } -void -cq_verifier_destroy (cq_verifier * v) -{ - cq_verify (v); - gpr_free (v); +void cq_verifier_destroy(cq_verifier *v) { + cq_verify(v); + gpr_free(v); } -static int -has_metadata (const grpc_metadata * md, size_t count, const char *key, const char *value) -{ +static int has_metadata(const grpc_metadata *md, size_t count, const char *key, + const char *value) { size_t i; - for (i = 0; i < count; i++) - { - if (0 == strcmp (key, md[i].key) && strlen (value) == md[i].value_length && 0 == memcmp (md[i].value, value, md[i].value_length)) - { - return 1; - } + for (i = 0; i < count; i++) { + if (0 == strcmp(key, md[i].key) && strlen(value) == md[i].value_length && + 0 == memcmp(md[i].value, value, md[i].value_length)) { + return 1; } + } return 0; } -int -contains_metadata (grpc_metadata_array * array, const char *key, const char *value) -{ - return has_metadata (array->metadata, array->count, key, value); +int contains_metadata(grpc_metadata_array *array, const char *key, + const char *value) { + return has_metadata(array->metadata, array->count, key, value); } -static gpr_slice -merge_slices (gpr_slice * slices, size_t nslices) -{ +static gpr_slice merge_slices(gpr_slice *slices, size_t nslices) { size_t i; size_t len = 0; gpr_uint8 *cursor; gpr_slice out; - for (i = 0; i < nslices; i++) - { - len += GPR_SLICE_LENGTH (slices[i]); - } + for (i = 0; i < nslices; i++) { + len += GPR_SLICE_LENGTH(slices[i]); + } - out = gpr_slice_malloc (len); - cursor = GPR_SLICE_START_PTR (out); + out = gpr_slice_malloc(len); + cursor = GPR_SLICE_START_PTR(out); - for (i = 0; i < nslices; i++) - { - memcpy (cursor, GPR_SLICE_START_PTR (slices[i]), GPR_SLICE_LENGTH (slices[i])); - cursor += GPR_SLICE_LENGTH (slices[i]); - } + for (i = 0; i < nslices; i++) { + memcpy(cursor, GPR_SLICE_START_PTR(slices[i]), GPR_SLICE_LENGTH(slices[i])); + cursor += GPR_SLICE_LENGTH(slices[i]); + } return out; } -static int -byte_buffer_eq_slice (grpc_byte_buffer * bb, gpr_slice b) -{ +static int byte_buffer_eq_slice(grpc_byte_buffer *bb, gpr_slice b) { gpr_slice a; int ok; - if (!bb) - return 0; + if (!bb) return 0; - a = merge_slices (bb->data.raw.slice_buffer.slices, bb->data.raw.slice_buffer.count); - ok = GPR_SLICE_LENGTH (a) == GPR_SLICE_LENGTH (b) && 0 == memcmp (GPR_SLICE_START_PTR (a), GPR_SLICE_START_PTR (b), GPR_SLICE_LENGTH (a)); - gpr_slice_unref (a); - gpr_slice_unref (b); + a = merge_slices(bb->data.raw.slice_buffer.slices, + bb->data.raw.slice_buffer.count); + ok = GPR_SLICE_LENGTH(a) == GPR_SLICE_LENGTH(b) && + 0 == memcmp(GPR_SLICE_START_PTR(a), GPR_SLICE_START_PTR(b), + GPR_SLICE_LENGTH(a)); + gpr_slice_unref(a); + gpr_slice_unref(b); return ok; } -int -byte_buffer_eq_string (grpc_byte_buffer * bb, const char *str) -{ +int byte_buffer_eq_string(grpc_byte_buffer *bb, const char *str) { grpc_byte_buffer_reader reader; grpc_byte_buffer *rbb; int res; - grpc_byte_buffer_reader_init (&reader, bb); - rbb = grpc_raw_byte_buffer_from_reader (&reader); - res = byte_buffer_eq_slice (rbb, gpr_slice_from_copied_string (str)); - grpc_byte_buffer_reader_destroy (&reader); - grpc_byte_buffer_destroy (rbb); + grpc_byte_buffer_reader_init(&reader, bb); + rbb = grpc_raw_byte_buffer_from_reader(&reader); + res = byte_buffer_eq_slice(rbb, gpr_slice_from_copied_string(str)); + grpc_byte_buffer_reader_destroy(&reader); + grpc_byte_buffer_destroy(rbb); return res; } -static void -verify_matches (expectation * e, grpc_event * ev) -{ - GPR_ASSERT (e->type == ev->type); - switch (e->type) - { +static void verify_matches(expectation *e, grpc_event *ev) { + GPR_ASSERT(e->type == ev->type); + switch (e->type) { case GRPC_QUEUE_SHUTDOWN: - gpr_log (GPR_ERROR, "premature queue shutdown"); - abort (); + gpr_log(GPR_ERROR, "premature queue shutdown"); + abort(); break; case GRPC_OP_COMPLETE: - GPR_ASSERT (e->success == ev->success); + GPR_ASSERT(e->success == ev->success); break; case GRPC_QUEUE_TIMEOUT: - gpr_log (GPR_ERROR, "not implemented"); - abort (); + gpr_log(GPR_ERROR, "not implemented"); + abort(); break; - } + } } -static void -expectation_to_strvec (gpr_strvec * buf, expectation * e) -{ +static void expectation_to_strvec(gpr_strvec *buf, expectation *e) { char *tmp; - gpr_asprintf (&tmp, "%p ", e->tag); - gpr_strvec_add (buf, tmp); + gpr_asprintf(&tmp, "%p ", e->tag); + gpr_strvec_add(buf, tmp); - switch (e->type) - { + switch (e->type) { case GRPC_OP_COMPLETE: - gpr_asprintf (&tmp, "GRPC_OP_COMPLETE result=%d", e->success); - gpr_strvec_add (buf, tmp); + gpr_asprintf(&tmp, "GRPC_OP_COMPLETE result=%d", e->success); + gpr_strvec_add(buf, tmp); break; case GRPC_QUEUE_TIMEOUT: case GRPC_QUEUE_SHUTDOWN: - gpr_log (GPR_ERROR, "not implemented"); - abort (); + gpr_log(GPR_ERROR, "not implemented"); + abort(); break; - } + } } -static void -expectations_to_strvec (gpr_strvec * buf, cq_verifier * v) -{ +static void expectations_to_strvec(gpr_strvec *buf, cq_verifier *v) { expectation *e; - for (e = v->expect.next; e != &v->expect; e = e->next) - { - expectation_to_strvec (buf, e); - gpr_strvec_add (buf, gpr_strdup ("\n")); - } + for (e = v->expect.next; e != &v->expect; e = e->next) { + expectation_to_strvec(buf, e); + gpr_strvec_add(buf, gpr_strdup("\n")); + } } -static void -fail_no_event_received (cq_verifier * v) -{ +static void fail_no_event_received(cq_verifier *v) { gpr_strvec buf; char *msg; - gpr_strvec_init (&buf); - gpr_strvec_add (&buf, gpr_strdup ("no event received, but expected:\n")); - expectations_to_strvec (&buf, v); - msg = gpr_strvec_flatten (&buf, NULL); - gpr_log (GPR_ERROR, "%s", msg); - gpr_strvec_destroy (&buf); - gpr_free (msg); - abort (); + gpr_strvec_init(&buf); + gpr_strvec_add(&buf, gpr_strdup("no event received, but expected:\n")); + expectations_to_strvec(&buf, v); + msg = gpr_strvec_flatten(&buf, NULL); + gpr_log(GPR_ERROR, "%s", msg); + gpr_strvec_destroy(&buf); + gpr_free(msg); + abort(); } -void -cq_verify (cq_verifier * v) -{ - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10); +void cq_verify(cq_verifier *v) { + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10); grpc_event ev; expectation *e; char *s; gpr_strvec have_tags; - gpr_strvec_init (&have_tags); - - while (v->expect.next != &v->expect) - { - ev = grpc_completion_queue_next (v->cq, deadline, NULL); - if (ev.type == GRPC_QUEUE_TIMEOUT) - { - fail_no_event_received (v); - break; - } - - for (e = v->expect.next; e != &v->expect; e = e->next) - { - gpr_asprintf (&s, " %p", e->tag); - gpr_strvec_add (&have_tags, s); - if (e->tag == ev.tag) - { - verify_matches (e, &ev); - e->next->prev = e->prev; - e->prev->next = e->next; - gpr_free (e); - break; - } - } - if (e == &v->expect) - { - s = grpc_event_string (&ev); - gpr_log (GPR_ERROR, "event not found: %s", s); - gpr_free (s); - s = gpr_strvec_flatten (&have_tags, NULL); - gpr_log (GPR_ERROR, "have tags:%s", s); - gpr_free (s); - gpr_strvec_destroy (&have_tags); - abort (); - } + gpr_strvec_init(&have_tags); + + while (v->expect.next != &v->expect) { + ev = grpc_completion_queue_next(v->cq, deadline, NULL); + if (ev.type == GRPC_QUEUE_TIMEOUT) { + fail_no_event_received(v); + break; } - gpr_strvec_destroy (&have_tags); + for (e = v->expect.next; e != &v->expect; e = e->next) { + gpr_asprintf(&s, " %p", e->tag); + gpr_strvec_add(&have_tags, s); + if (e->tag == ev.tag) { + verify_matches(e, &ev); + e->next->prev = e->prev; + e->prev->next = e->next; + gpr_free(e); + break; + } + } + if (e == &v->expect) { + s = grpc_event_string(&ev); + gpr_log(GPR_ERROR, "event not found: %s", s); + gpr_free(s); + s = gpr_strvec_flatten(&have_tags, NULL); + gpr_log(GPR_ERROR, "have tags:%s", s); + gpr_free(s); + gpr_strvec_destroy(&have_tags); + abort(); + } + } + + gpr_strvec_destroy(&have_tags); } -void -cq_verify_empty (cq_verifier * v) -{ - gpr_timespec deadline = gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), - gpr_time_from_seconds (1, GPR_TIMESPAN)); +void cq_verify_empty(cq_verifier *v) { + gpr_timespec deadline = gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), + gpr_time_from_seconds(1, GPR_TIMESPAN)); grpc_event ev; - GPR_ASSERT (v->expect.next == &v->expect && "expectation queue must be empty"); + GPR_ASSERT(v->expect.next == &v->expect && "expectation queue must be empty"); - ev = grpc_completion_queue_next (v->cq, deadline, NULL); - if (ev.type != GRPC_QUEUE_TIMEOUT) - { - char *s = grpc_event_string (&ev); - gpr_log (GPR_ERROR, "unexpected event (expected nothing): %s", s); - gpr_free (s); - abort (); - } + ev = grpc_completion_queue_next(v->cq, deadline, NULL); + if (ev.type != GRPC_QUEUE_TIMEOUT) { + char *s = grpc_event_string(&ev); + gpr_log(GPR_ERROR, "unexpected event (expected nothing): %s", s); + gpr_free(s); + abort(); + } } -static expectation * -add (cq_verifier * v, grpc_completion_type type, void *tag) -{ - expectation *e = gpr_malloc (sizeof (expectation)); +static expectation *add(cq_verifier *v, grpc_completion_type type, void *tag) { + expectation *e = gpr_malloc(sizeof(expectation)); e->type = type; e->tag = tag; e->next = &v->expect; @@ -323,8 +284,6 @@ add (cq_verifier * v, grpc_completion_type type, void *tag) return e; } -void -cq_expect_completion (cq_verifier * v, void *tag, int success) -{ - add (v, GRPC_OP_COMPLETE, tag)->success = success; +void cq_expect_completion(cq_verifier *v, void *tag, int success) { + add(v, GRPC_OP_COMPLETE, tag)->success = success; } diff --git a/test/core/end2end/cq_verifier.h b/test/core/end2end/cq_verifier.h index 4447acb3ee1..b3e07c45a58 100644 --- a/test/core/end2end/cq_verifier.h +++ b/test/core/end2end/cq_verifier.h @@ -43,23 +43,24 @@ typedef struct cq_verifier cq_verifier; /* construct/destroy a cq_verifier */ -cq_verifier *cq_verifier_create (grpc_completion_queue * cq); -void cq_verifier_destroy (cq_verifier * v); +cq_verifier *cq_verifier_create(grpc_completion_queue *cq); +void cq_verifier_destroy(cq_verifier *v); /* ensure all expected events (and only those events) are present on the bound completion queue */ -void cq_verify (cq_verifier * v); +void cq_verify(cq_verifier *v); /* ensure that the completion queue is empty */ -void cq_verify_empty (cq_verifier * v); +void cq_verify_empty(cq_verifier *v); /* Various expectation matchers Any functions taking ... expect a NULL terminated list of key/value pairs (each pair using two parameter slots) of metadata that MUST be present in the event. */ -void cq_expect_completion (cq_verifier * v, void *tag, int success); +void cq_expect_completion(cq_verifier *v, void *tag, int success); -int byte_buffer_eq_string (grpc_byte_buffer * byte_buffer, const char *string); -int contains_metadata (grpc_metadata_array * array, const char *key, const char *value); +int byte_buffer_eq_string(grpc_byte_buffer *byte_buffer, const char *string); +int contains_metadata(grpc_metadata_array *array, const char *key, + const char *value); #endif /* GRPC_TEST_CORE_END2END_CQ_VERIFIER_H */ diff --git a/test/core/end2end/data/server1_cert.c b/test/core/end2end/data/server1_cert.c index a303b272825..d31f2e2d0ed 100644 --- a/test/core/end2end/data/server1_cert.c +++ b/test/core/end2end/data/server1_cert.c @@ -32,85 +32,84 @@ */ const char test_server1_cert[] = { - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, - 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x6d, 0x7a, 0x43, 0x43, - 0x41, 0x67, 0x53, 0x67, 0x41, 0x77, 0x49, 0x42, 0x41, 0x67, 0x49, 0x42, - 0x41, 0x7a, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47, - 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x55, 0x46, 0x41, 0x44, 0x42, 0x57, - 0x4d, 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, - 0x45, 0x77, 0x4a, 0x42, 0x56, 0x54, 0x45, 0x54, 0x0a, 0x4d, 0x42, 0x45, - 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x41, 0x77, 0x4b, 0x55, 0x32, 0x39, - 0x74, 0x5a, 0x53, 0x31, 0x54, 0x64, 0x47, 0x46, 0x30, 0x5a, 0x54, 0x45, - 0x68, 0x4d, 0x42, 0x38, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x67, 0x77, - 0x59, 0x53, 0x57, 0x35, 0x30, 0x5a, 0x58, 0x4a, 0x75, 0x5a, 0x58, 0x51, - 0x67, 0x56, 0x32, 0x6c, 0x6b, 0x5a, 0x32, 0x6c, 0x30, 0x63, 0x79, 0x42, - 0x51, 0x0a, 0x64, 0x48, 0x6b, 0x67, 0x54, 0x48, 0x52, 0x6b, 0x4d, 0x51, - 0x38, 0x77, 0x44, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x44, 0x41, - 0x5a, 0x30, 0x5a, 0x58, 0x4e, 0x30, 0x59, 0x32, 0x45, 0x77, 0x48, 0x68, - 0x63, 0x4e, 0x4d, 0x54, 0x51, 0x77, 0x4e, 0x7a, 0x49, 0x79, 0x4d, 0x44, - 0x59, 0x77, 0x4d, 0x44, 0x55, 0x33, 0x57, 0x68, 0x63, 0x4e, 0x4d, 0x6a, - 0x51, 0x77, 0x4e, 0x7a, 0x45, 0x35, 0x0a, 0x4d, 0x44, 0x59, 0x77, 0x4d, - 0x44, 0x55, 0x33, 0x57, 0x6a, 0x42, 0x6b, 0x4d, 0x51, 0x73, 0x77, 0x43, - 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, 0x45, 0x77, 0x4a, 0x56, 0x55, - 0x7a, 0x45, 0x52, 0x4d, 0x41, 0x38, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, - 0x42, 0x4d, 0x49, 0x53, 0x57, 0x78, 0x73, 0x61, 0x57, 0x35, 0x76, 0x61, - 0x58, 0x4d, 0x78, 0x45, 0x44, 0x41, 0x4f, 0x42, 0x67, 0x4e, 0x56, 0x0a, - 0x42, 0x41, 0x63, 0x54, 0x42, 0x30, 0x4e, 0x6f, 0x61, 0x57, 0x4e, 0x68, - 0x5a, 0x32, 0x38, 0x78, 0x46, 0x44, 0x41, 0x53, 0x42, 0x67, 0x4e, 0x56, - 0x42, 0x41, 0x6f, 0x54, 0x43, 0x30, 0x64, 0x76, 0x62, 0x32, 0x64, 0x73, - 0x5a, 0x53, 0x42, 0x4a, 0x62, 0x6d, 0x4d, 0x75, 0x4d, 0x52, 0x6f, 0x77, - 0x47, 0x41, 0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x46, 0x42, 0x45, 0x71, - 0x4c, 0x6e, 0x52, 0x6c, 0x0a, 0x63, 0x33, 0x51, 0x75, 0x5a, 0x32, 0x39, - 0x76, 0x5a, 0x32, 0x78, 0x6c, 0x4c, 0x6d, 0x4e, 0x76, 0x62, 0x54, 0x43, - 0x42, 0x6e, 0x7a, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, - 0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x45, 0x46, 0x41, 0x41, 0x4f, - 0x42, 0x6a, 0x51, 0x41, 0x77, 0x67, 0x59, 0x6b, 0x43, 0x67, 0x59, 0x45, - 0x41, 0x34, 0x63, 0x4d, 0x56, 0x4a, 0x79, 0x67, 0x73, 0x0a, 0x4a, 0x55, - 0x6d, 0x6c, 0x67, 0x4d, 0x4d, 0x7a, 0x67, 0x64, 0x69, 0x30, 0x68, 0x31, - 0x58, 0x6f, 0x43, 0x52, 0x37, 0x2b, 0x77, 0x77, 0x31, 0x70, 0x6f, 0x70, - 0x30, 0x34, 0x4f, 0x4d, 0x4d, 0x79, 0x79, 0x37, 0x48, 0x2f, 0x69, 0x30, - 0x50, 0x4a, 0x32, 0x57, 0x36, 0x59, 0x33, 0x35, 0x2b, 0x62, 0x34, 0x43, - 0x4d, 0x38, 0x51, 0x72, 0x6b, 0x59, 0x65, 0x45, 0x61, 0x66, 0x55, 0x47, - 0x44, 0x4f, 0x0a, 0x52, 0x59, 0x58, 0x36, 0x79, 0x56, 0x2f, 0x63, 0x48, - 0x47, 0x47, 0x73, 0x44, 0x2f, 0x78, 0x30, 0x32, 0x79, 0x65, 0x36, 0x65, - 0x79, 0x31, 0x55, 0x44, 0x74, 0x6b, 0x47, 0x41, 0x44, 0x2f, 0x6d, 0x70, - 0x44, 0x45, 0x78, 0x38, 0x59, 0x43, 0x72, 0x6a, 0x41, 0x63, 0x31, 0x56, - 0x66, 0x76, 0x74, 0x38, 0x46, 0x6b, 0x36, 0x43, 0x6e, 0x31, 0x57, 0x56, - 0x49, 0x78, 0x56, 0x2f, 0x4a, 0x33, 0x30, 0x0a, 0x33, 0x78, 0x6a, 0x42, - 0x73, 0x46, 0x67, 0x42, 0x79, 0x51, 0x35, 0x35, 0x52, 0x42, 0x70, 0x31, - 0x4f, 0x4c, 0x5a, 0x66, 0x56, 0x4c, 0x6f, 0x36, 0x41, 0x6c, 0x65, 0x42, - 0x44, 0x53, 0x62, 0x63, 0x78, 0x61, 0x45, 0x43, 0x41, 0x77, 0x45, 0x41, - 0x41, 0x61, 0x4e, 0x72, 0x4d, 0x47, 0x6b, 0x77, 0x43, 0x51, 0x59, 0x44, - 0x56, 0x52, 0x30, 0x54, 0x42, 0x41, 0x49, 0x77, 0x41, 0x44, 0x41, 0x4c, - 0x0a, 0x42, 0x67, 0x4e, 0x56, 0x48, 0x51, 0x38, 0x45, 0x42, 0x41, 0x4d, - 0x43, 0x42, 0x65, 0x41, 0x77, 0x54, 0x77, 0x59, 0x44, 0x56, 0x52, 0x30, - 0x52, 0x42, 0x45, 0x67, 0x77, 0x52, 0x6f, 0x49, 0x51, 0x4b, 0x69, 0x35, - 0x30, 0x5a, 0x58, 0x4e, 0x30, 0x4c, 0x6d, 0x64, 0x76, 0x62, 0x32, 0x64, - 0x73, 0x5a, 0x53, 0x35, 0x6d, 0x63, 0x6f, 0x49, 0x59, 0x64, 0x32, 0x46, - 0x30, 0x5a, 0x58, 0x4a, 0x36, 0x0a, 0x62, 0x32, 0x39, 0x70, 0x4c, 0x6e, - 0x52, 0x6c, 0x63, 0x33, 0x51, 0x75, 0x5a, 0x32, 0x39, 0x76, 0x5a, 0x32, - 0x78, 0x6c, 0x4c, 0x6d, 0x4a, 0x6c, 0x67, 0x68, 0x49, 0x71, 0x4c, 0x6e, - 0x52, 0x6c, 0x63, 0x33, 0x51, 0x75, 0x65, 0x57, 0x39, 0x31, 0x64, 0x48, - 0x56, 0x69, 0x5a, 0x53, 0x35, 0x6a, 0x62, 0x32, 0x32, 0x48, 0x42, 0x4d, - 0x43, 0x6f, 0x41, 0x51, 0x4d, 0x77, 0x44, 0x51, 0x59, 0x4a, 0x0a, 0x4b, - 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, 0x41, 0x51, 0x45, 0x46, 0x42, - 0x51, 0x41, 0x44, 0x67, 0x59, 0x45, 0x41, 0x4d, 0x32, 0x49, 0x69, 0x30, - 0x4c, 0x67, 0x54, 0x47, 0x62, 0x4a, 0x31, 0x6a, 0x34, 0x6f, 0x71, 0x58, - 0x39, 0x62, 0x78, 0x56, 0x63, 0x78, 0x6d, 0x2b, 0x2f, 0x52, 0x35, 0x59, - 0x66, 0x38, 0x6f, 0x69, 0x30, 0x61, 0x5a, 0x71, 0x54, 0x4a, 0x6c, 0x6e, - 0x4c, 0x59, 0x53, 0x0a, 0x77, 0x58, 0x63, 0x42, 0x79, 0x6b, 0x78, 0x54, - 0x78, 0x31, 0x38, 0x31, 0x73, 0x37, 0x57, 0x79, 0x66, 0x4a, 0x34, 0x39, - 0x57, 0x77, 0x72, 0x59, 0x58, 0x6f, 0x37, 0x38, 0x7a, 0x54, 0x44, 0x41, - 0x6e, 0x66, 0x31, 0x6d, 0x61, 0x30, 0x66, 0x50, 0x71, 0x33, 0x65, 0x34, - 0x6d, 0x70, 0x73, 0x70, 0x76, 0x79, 0x6e, 0x64, 0x4c, 0x68, 0x31, 0x61, - 0x2b, 0x4f, 0x61, 0x72, 0x48, 0x61, 0x31, 0x65, 0x0a, 0x61, 0x54, 0x30, - 0x44, 0x49, 0x49, 0x59, 0x6b, 0x37, 0x71, 0x65, 0x45, 0x61, 0x31, 0x59, - 0x63, 0x56, 0x6c, 0x6a, 0x78, 0x32, 0x4b, 0x79, 0x4c, 0x64, 0x30, 0x72, - 0x31, 0x42, 0x42, 0x41, 0x66, 0x72, 0x77, 0x79, 0x47, 0x61, 0x45, 0x50, - 0x56, 0x65, 0x4a, 0x51, 0x56, 0x59, 0x57, 0x61, 0x4f, 0x4a, 0x52, 0x55, - 0x32, 0x77, 0x65, 0x2f, 0x4b, 0x44, 0x34, 0x6f, 0x6a, 0x66, 0x39, 0x73, - 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x43, - 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x0a, 0x00 -}; + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, + 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x6d, 0x7a, 0x43, 0x43, + 0x41, 0x67, 0x53, 0x67, 0x41, 0x77, 0x49, 0x42, 0x41, 0x67, 0x49, 0x42, + 0x41, 0x7a, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47, + 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x55, 0x46, 0x41, 0x44, 0x42, 0x57, + 0x4d, 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, + 0x45, 0x77, 0x4a, 0x42, 0x56, 0x54, 0x45, 0x54, 0x0a, 0x4d, 0x42, 0x45, + 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x41, 0x77, 0x4b, 0x55, 0x32, 0x39, + 0x74, 0x5a, 0x53, 0x31, 0x54, 0x64, 0x47, 0x46, 0x30, 0x5a, 0x54, 0x45, + 0x68, 0x4d, 0x42, 0x38, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x67, 0x77, + 0x59, 0x53, 0x57, 0x35, 0x30, 0x5a, 0x58, 0x4a, 0x75, 0x5a, 0x58, 0x51, + 0x67, 0x56, 0x32, 0x6c, 0x6b, 0x5a, 0x32, 0x6c, 0x30, 0x63, 0x79, 0x42, + 0x51, 0x0a, 0x64, 0x48, 0x6b, 0x67, 0x54, 0x48, 0x52, 0x6b, 0x4d, 0x51, + 0x38, 0x77, 0x44, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x44, 0x41, + 0x5a, 0x30, 0x5a, 0x58, 0x4e, 0x30, 0x59, 0x32, 0x45, 0x77, 0x48, 0x68, + 0x63, 0x4e, 0x4d, 0x54, 0x51, 0x77, 0x4e, 0x7a, 0x49, 0x79, 0x4d, 0x44, + 0x59, 0x77, 0x4d, 0x44, 0x55, 0x33, 0x57, 0x68, 0x63, 0x4e, 0x4d, 0x6a, + 0x51, 0x77, 0x4e, 0x7a, 0x45, 0x35, 0x0a, 0x4d, 0x44, 0x59, 0x77, 0x4d, + 0x44, 0x55, 0x33, 0x57, 0x6a, 0x42, 0x6b, 0x4d, 0x51, 0x73, 0x77, 0x43, + 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, 0x45, 0x77, 0x4a, 0x56, 0x55, + 0x7a, 0x45, 0x52, 0x4d, 0x41, 0x38, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, + 0x42, 0x4d, 0x49, 0x53, 0x57, 0x78, 0x73, 0x61, 0x57, 0x35, 0x76, 0x61, + 0x58, 0x4d, 0x78, 0x45, 0x44, 0x41, 0x4f, 0x42, 0x67, 0x4e, 0x56, 0x0a, + 0x42, 0x41, 0x63, 0x54, 0x42, 0x30, 0x4e, 0x6f, 0x61, 0x57, 0x4e, 0x68, + 0x5a, 0x32, 0x38, 0x78, 0x46, 0x44, 0x41, 0x53, 0x42, 0x67, 0x4e, 0x56, + 0x42, 0x41, 0x6f, 0x54, 0x43, 0x30, 0x64, 0x76, 0x62, 0x32, 0x64, 0x73, + 0x5a, 0x53, 0x42, 0x4a, 0x62, 0x6d, 0x4d, 0x75, 0x4d, 0x52, 0x6f, 0x77, + 0x47, 0x41, 0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x46, 0x42, 0x45, 0x71, + 0x4c, 0x6e, 0x52, 0x6c, 0x0a, 0x63, 0x33, 0x51, 0x75, 0x5a, 0x32, 0x39, + 0x76, 0x5a, 0x32, 0x78, 0x6c, 0x4c, 0x6d, 0x4e, 0x76, 0x62, 0x54, 0x43, + 0x42, 0x6e, 0x7a, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, + 0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x45, 0x46, 0x41, 0x41, 0x4f, + 0x42, 0x6a, 0x51, 0x41, 0x77, 0x67, 0x59, 0x6b, 0x43, 0x67, 0x59, 0x45, + 0x41, 0x34, 0x63, 0x4d, 0x56, 0x4a, 0x79, 0x67, 0x73, 0x0a, 0x4a, 0x55, + 0x6d, 0x6c, 0x67, 0x4d, 0x4d, 0x7a, 0x67, 0x64, 0x69, 0x30, 0x68, 0x31, + 0x58, 0x6f, 0x43, 0x52, 0x37, 0x2b, 0x77, 0x77, 0x31, 0x70, 0x6f, 0x70, + 0x30, 0x34, 0x4f, 0x4d, 0x4d, 0x79, 0x79, 0x37, 0x48, 0x2f, 0x69, 0x30, + 0x50, 0x4a, 0x32, 0x57, 0x36, 0x59, 0x33, 0x35, 0x2b, 0x62, 0x34, 0x43, + 0x4d, 0x38, 0x51, 0x72, 0x6b, 0x59, 0x65, 0x45, 0x61, 0x66, 0x55, 0x47, + 0x44, 0x4f, 0x0a, 0x52, 0x59, 0x58, 0x36, 0x79, 0x56, 0x2f, 0x63, 0x48, + 0x47, 0x47, 0x73, 0x44, 0x2f, 0x78, 0x30, 0x32, 0x79, 0x65, 0x36, 0x65, + 0x79, 0x31, 0x55, 0x44, 0x74, 0x6b, 0x47, 0x41, 0x44, 0x2f, 0x6d, 0x70, + 0x44, 0x45, 0x78, 0x38, 0x59, 0x43, 0x72, 0x6a, 0x41, 0x63, 0x31, 0x56, + 0x66, 0x76, 0x74, 0x38, 0x46, 0x6b, 0x36, 0x43, 0x6e, 0x31, 0x57, 0x56, + 0x49, 0x78, 0x56, 0x2f, 0x4a, 0x33, 0x30, 0x0a, 0x33, 0x78, 0x6a, 0x42, + 0x73, 0x46, 0x67, 0x42, 0x79, 0x51, 0x35, 0x35, 0x52, 0x42, 0x70, 0x31, + 0x4f, 0x4c, 0x5a, 0x66, 0x56, 0x4c, 0x6f, 0x36, 0x41, 0x6c, 0x65, 0x42, + 0x44, 0x53, 0x62, 0x63, 0x78, 0x61, 0x45, 0x43, 0x41, 0x77, 0x45, 0x41, + 0x41, 0x61, 0x4e, 0x72, 0x4d, 0x47, 0x6b, 0x77, 0x43, 0x51, 0x59, 0x44, + 0x56, 0x52, 0x30, 0x54, 0x42, 0x41, 0x49, 0x77, 0x41, 0x44, 0x41, 0x4c, + 0x0a, 0x42, 0x67, 0x4e, 0x56, 0x48, 0x51, 0x38, 0x45, 0x42, 0x41, 0x4d, + 0x43, 0x42, 0x65, 0x41, 0x77, 0x54, 0x77, 0x59, 0x44, 0x56, 0x52, 0x30, + 0x52, 0x42, 0x45, 0x67, 0x77, 0x52, 0x6f, 0x49, 0x51, 0x4b, 0x69, 0x35, + 0x30, 0x5a, 0x58, 0x4e, 0x30, 0x4c, 0x6d, 0x64, 0x76, 0x62, 0x32, 0x64, + 0x73, 0x5a, 0x53, 0x35, 0x6d, 0x63, 0x6f, 0x49, 0x59, 0x64, 0x32, 0x46, + 0x30, 0x5a, 0x58, 0x4a, 0x36, 0x0a, 0x62, 0x32, 0x39, 0x70, 0x4c, 0x6e, + 0x52, 0x6c, 0x63, 0x33, 0x51, 0x75, 0x5a, 0x32, 0x39, 0x76, 0x5a, 0x32, + 0x78, 0x6c, 0x4c, 0x6d, 0x4a, 0x6c, 0x67, 0x68, 0x49, 0x71, 0x4c, 0x6e, + 0x52, 0x6c, 0x63, 0x33, 0x51, 0x75, 0x65, 0x57, 0x39, 0x31, 0x64, 0x48, + 0x56, 0x69, 0x5a, 0x53, 0x35, 0x6a, 0x62, 0x32, 0x32, 0x48, 0x42, 0x4d, + 0x43, 0x6f, 0x41, 0x51, 0x4d, 0x77, 0x44, 0x51, 0x59, 0x4a, 0x0a, 0x4b, + 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, 0x41, 0x51, 0x45, 0x46, 0x42, + 0x51, 0x41, 0x44, 0x67, 0x59, 0x45, 0x41, 0x4d, 0x32, 0x49, 0x69, 0x30, + 0x4c, 0x67, 0x54, 0x47, 0x62, 0x4a, 0x31, 0x6a, 0x34, 0x6f, 0x71, 0x58, + 0x39, 0x62, 0x78, 0x56, 0x63, 0x78, 0x6d, 0x2b, 0x2f, 0x52, 0x35, 0x59, + 0x66, 0x38, 0x6f, 0x69, 0x30, 0x61, 0x5a, 0x71, 0x54, 0x4a, 0x6c, 0x6e, + 0x4c, 0x59, 0x53, 0x0a, 0x77, 0x58, 0x63, 0x42, 0x79, 0x6b, 0x78, 0x54, + 0x78, 0x31, 0x38, 0x31, 0x73, 0x37, 0x57, 0x79, 0x66, 0x4a, 0x34, 0x39, + 0x57, 0x77, 0x72, 0x59, 0x58, 0x6f, 0x37, 0x38, 0x7a, 0x54, 0x44, 0x41, + 0x6e, 0x66, 0x31, 0x6d, 0x61, 0x30, 0x66, 0x50, 0x71, 0x33, 0x65, 0x34, + 0x6d, 0x70, 0x73, 0x70, 0x76, 0x79, 0x6e, 0x64, 0x4c, 0x68, 0x31, 0x61, + 0x2b, 0x4f, 0x61, 0x72, 0x48, 0x61, 0x31, 0x65, 0x0a, 0x61, 0x54, 0x30, + 0x44, 0x49, 0x49, 0x59, 0x6b, 0x37, 0x71, 0x65, 0x45, 0x61, 0x31, 0x59, + 0x63, 0x56, 0x6c, 0x6a, 0x78, 0x32, 0x4b, 0x79, 0x4c, 0x64, 0x30, 0x72, + 0x31, 0x42, 0x42, 0x41, 0x66, 0x72, 0x77, 0x79, 0x47, 0x61, 0x45, 0x50, + 0x56, 0x65, 0x4a, 0x51, 0x56, 0x59, 0x57, 0x61, 0x4f, 0x4a, 0x52, 0x55, + 0x32, 0x77, 0x65, 0x2f, 0x4b, 0x44, 0x34, 0x6f, 0x6a, 0x66, 0x39, 0x73, + 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x43, + 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x0a, 0x00}; diff --git a/test/core/end2end/data/server1_key.c b/test/core/end2end/data/server1_key.c index 78353eed6d6..d089660bfd2 100644 --- a/test/core/end2end/data/server1_key.c +++ b/test/core/end2end/data/server1_key.c @@ -32,78 +32,77 @@ */ const char test_server1_key[] = { - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x52, - 0x53, 0x41, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b, - 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, - 0x57, 0x77, 0x49, 0x42, 0x41, 0x41, 0x4b, 0x42, 0x67, 0x51, 0x44, 0x68, - 0x77, 0x78, 0x55, 0x6e, 0x4b, 0x43, 0x77, 0x6c, 0x53, 0x61, 0x57, 0x41, - 0x77, 0x7a, 0x4f, 0x42, 0x32, 0x4c, 0x53, 0x48, 0x56, 0x65, 0x67, 0x4a, - 0x48, 0x76, 0x37, 0x44, 0x44, 0x57, 0x6d, 0x69, 0x6e, 0x54, 0x67, 0x34, - 0x77, 0x7a, 0x4c, 0x4c, 0x73, 0x66, 0x2b, 0x4c, 0x51, 0x38, 0x6e, 0x5a, - 0x0a, 0x62, 0x70, 0x6a, 0x66, 0x6e, 0x35, 0x76, 0x67, 0x49, 0x7a, 0x78, - 0x43, 0x75, 0x52, 0x68, 0x34, 0x52, 0x70, 0x39, 0x51, 0x59, 0x4d, 0x35, - 0x46, 0x68, 0x66, 0x72, 0x4a, 0x58, 0x39, 0x77, 0x63, 0x59, 0x61, 0x77, - 0x50, 0x2f, 0x48, 0x54, 0x62, 0x4a, 0x37, 0x70, 0x37, 0x4c, 0x56, 0x51, - 0x4f, 0x32, 0x51, 0x59, 0x41, 0x50, 0x2b, 0x61, 0x6b, 0x4d, 0x54, 0x48, - 0x78, 0x67, 0x4b, 0x75, 0x4d, 0x0a, 0x42, 0x7a, 0x56, 0x56, 0x2b, 0x2b, - 0x33, 0x77, 0x57, 0x54, 0x6f, 0x4b, 0x66, 0x56, 0x5a, 0x55, 0x6a, 0x46, - 0x58, 0x38, 0x6e, 0x66, 0x54, 0x66, 0x47, 0x4d, 0x47, 0x77, 0x57, 0x41, - 0x48, 0x4a, 0x44, 0x6e, 0x6c, 0x45, 0x47, 0x6e, 0x55, 0x34, 0x74, 0x6c, - 0x39, 0x55, 0x75, 0x6a, 0x6f, 0x43, 0x56, 0x34, 0x45, 0x4e, 0x4a, 0x74, - 0x7a, 0x46, 0x6f, 0x51, 0x49, 0x44, 0x41, 0x51, 0x41, 0x42, 0x0a, 0x41, - 0x6f, 0x47, 0x41, 0x4a, 0x2b, 0x36, 0x68, 0x70, 0x7a, 0x4e, 0x72, 0x32, - 0x34, 0x79, 0x54, 0x51, 0x5a, 0x74, 0x46, 0x57, 0x51, 0x70, 0x44, 0x70, - 0x45, 0x79, 0x46, 0x70, 0x6c, 0x64, 0x64, 0x4b, 0x4a, 0x4d, 0x4f, 0x78, - 0x44, 0x79, 0x61, 0x33, 0x53, 0x39, 0x70, 0x70, 0x4b, 0x33, 0x76, 0x54, - 0x57, 0x72, 0x49, 0x49, 0x54, 0x56, 0x32, 0x78, 0x4e, 0x63, 0x75, 0x63, - 0x77, 0x37, 0x49, 0x0a, 0x63, 0x65, 0x54, 0x62, 0x64, 0x79, 0x72, 0x47, - 0x73, 0x79, 0x6a, 0x73, 0x55, 0x30, 0x2f, 0x48, 0x64, 0x43, 0x63, 0x49, - 0x66, 0x39, 0x79, 0x6d, 0x32, 0x6a, 0x66, 0x6d, 0x47, 0x4c, 0x55, 0x77, - 0x6d, 0x79, 0x68, 0x6c, 0x74, 0x4b, 0x56, 0x77, 0x30, 0x51, 0x59, 0x63, - 0x46, 0x42, 0x30, 0x58, 0x4c, 0x6b, 0x63, 0x30, 0x6e, 0x49, 0x35, 0x59, - 0x76, 0x45, 0x59, 0x6f, 0x65, 0x56, 0x44, 0x67, 0x0a, 0x6f, 0x6d, 0x5a, - 0x49, 0x58, 0x6e, 0x31, 0x45, 0x33, 0x45, 0x57, 0x2b, 0x73, 0x53, 0x49, - 0x57, 0x53, 0x62, 0x6b, 0x4d, 0x75, 0x39, 0x62, 0x59, 0x32, 0x6b, 0x73, - 0x74, 0x4b, 0x58, 0x52, 0x32, 0x55, 0x5a, 0x6d, 0x4d, 0x67, 0x57, 0x44, - 0x74, 0x6d, 0x42, 0x45, 0x50, 0x4d, 0x61, 0x45, 0x43, 0x51, 0x51, 0x44, - 0x36, 0x79, 0x54, 0x34, 0x54, 0x41, 0x5a, 0x4d, 0x35, 0x68, 0x47, 0x42, - 0x62, 0x0a, 0x63, 0x69, 0x42, 0x4b, 0x67, 0x4d, 0x55, 0x50, 0x36, 0x50, - 0x77, 0x4f, 0x68, 0x50, 0x68, 0x4f, 0x4d, 0x50, 0x49, 0x76, 0x69, 0x6a, - 0x4f, 0x35, 0x30, 0x41, 0x69, 0x75, 0x36, 0x69, 0x75, 0x43, 0x56, 0x38, - 0x38, 0x6c, 0x31, 0x51, 0x49, 0x79, 0x33, 0x38, 0x67, 0x57, 0x56, 0x68, - 0x78, 0x6a, 0x4e, 0x72, 0x71, 0x36, 0x50, 0x33, 0x34, 0x36, 0x6a, 0x34, - 0x49, 0x42, 0x67, 0x2b, 0x6b, 0x42, 0x0a, 0x39, 0x61, 0x6c, 0x77, 0x70, - 0x43, 0x4f, 0x44, 0x41, 0x6b, 0x45, 0x41, 0x35, 0x6e, 0x53, 0x6e, 0x6d, - 0x39, 0x6b, 0x36, 0x79, 0x6b, 0x59, 0x65, 0x51, 0x57, 0x4e, 0x53, 0x30, - 0x66, 0x4e, 0x57, 0x69, 0x52, 0x69, 0x6e, 0x43, 0x64, 0x6c, 0x32, 0x33, - 0x41, 0x37, 0x75, 0x73, 0x44, 0x47, 0x53, 0x75, 0x4b, 0x4b, 0x6c, 0x6d, - 0x30, 0x31, 0x39, 0x69, 0x6f, 0x6d, 0x4a, 0x2f, 0x52, 0x67, 0x64, 0x0a, - 0x4d, 0x4b, 0x44, 0x4f, 0x70, 0x30, 0x71, 0x2f, 0x32, 0x4f, 0x6f, 0x73, - 0x74, 0x62, 0x74, 0x65, 0x4f, 0x57, 0x4d, 0x32, 0x4d, 0x52, 0x46, 0x66, - 0x34, 0x6a, 0x4d, 0x48, 0x33, 0x77, 0x79, 0x56, 0x43, 0x77, 0x4a, 0x41, - 0x66, 0x41, 0x64, 0x6a, 0x4a, 0x38, 0x73, 0x7a, 0x6f, 0x4e, 0x4b, 0x54, - 0x52, 0x53, 0x61, 0x67, 0x53, 0x62, 0x68, 0x39, 0x76, 0x57, 0x79, 0x67, - 0x6e, 0x42, 0x32, 0x76, 0x0a, 0x49, 0x42, 0x79, 0x63, 0x36, 0x6c, 0x34, - 0x54, 0x54, 0x75, 0x5a, 0x51, 0x4a, 0x52, 0x47, 0x7a, 0x43, 0x76, 0x65, - 0x61, 0x66, 0x7a, 0x39, 0x6c, 0x6f, 0x76, 0x75, 0x42, 0x33, 0x57, 0x6f, - 0x68, 0x43, 0x41, 0x42, 0x64, 0x51, 0x52, 0x64, 0x39, 0x75, 0x6b, 0x43, - 0x58, 0x4c, 0x32, 0x43, 0x70, 0x73, 0x45, 0x70, 0x71, 0x7a, 0x6b, 0x61, - 0x66, 0x4f, 0x51, 0x4a, 0x41, 0x4a, 0x55, 0x6a, 0x63, 0x0a, 0x55, 0x53, - 0x65, 0x64, 0x44, 0x6c, 0x71, 0x33, 0x7a, 0x47, 0x5a, 0x77, 0x59, 0x4d, - 0x31, 0x59, 0x77, 0x38, 0x64, 0x38, 0x52, 0x75, 0x69, 0x72, 0x42, 0x55, - 0x46, 0x5a, 0x4e, 0x71, 0x4a, 0x65, 0x6c, 0x59, 0x61, 0x69, 0x2b, 0x6e, - 0x52, 0x59, 0x43, 0x6c, 0x44, 0x6b, 0x52, 0x56, 0x46, 0x67, 0x62, 0x35, - 0x79, 0x6b, 0x73, 0x6f, 0x59, 0x79, 0x63, 0x62, 0x71, 0x35, 0x54, 0x78, - 0x47, 0x6f, 0x0a, 0x56, 0x65, 0x71, 0x4b, 0x4f, 0x76, 0x67, 0x50, 0x70, - 0x6a, 0x34, 0x52, 0x57, 0x50, 0x48, 0x6c, 0x4c, 0x77, 0x4a, 0x41, 0x47, - 0x55, 0x4d, 0x6b, 0x33, 0x62, 0x71, 0x54, 0x39, 0x31, 0x78, 0x42, 0x55, - 0x43, 0x6e, 0x4c, 0x52, 0x73, 0x2f, 0x76, 0x66, 0x6f, 0x43, 0x70, 0x48, - 0x70, 0x67, 0x36, 0x65, 0x79, 0x77, 0x51, 0x54, 0x42, 0x44, 0x41, 0x56, - 0x36, 0x78, 0x6b, 0x79, 0x7a, 0x34, 0x61, 0x0a, 0x52, 0x48, 0x33, 0x49, - 0x37, 0x2f, 0x2b, 0x79, 0x6a, 0x33, 0x5a, 0x78, 0x52, 0x32, 0x4a, 0x6f, - 0x57, 0x48, 0x67, 0x55, 0x77, 0x5a, 0x37, 0x6c, 0x5a, 0x6b, 0x31, 0x56, - 0x6e, 0x68, 0x66, 0x66, 0x46, 0x79, 0x65, 0x37, 0x53, 0x42, 0x58, 0x79, - 0x61, 0x67, 0x3d, 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, - 0x44, 0x20, 0x52, 0x53, 0x41, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, - 0x45, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x00 -}; + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x52, + 0x53, 0x41, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b, + 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, + 0x57, 0x77, 0x49, 0x42, 0x41, 0x41, 0x4b, 0x42, 0x67, 0x51, 0x44, 0x68, + 0x77, 0x78, 0x55, 0x6e, 0x4b, 0x43, 0x77, 0x6c, 0x53, 0x61, 0x57, 0x41, + 0x77, 0x7a, 0x4f, 0x42, 0x32, 0x4c, 0x53, 0x48, 0x56, 0x65, 0x67, 0x4a, + 0x48, 0x76, 0x37, 0x44, 0x44, 0x57, 0x6d, 0x69, 0x6e, 0x54, 0x67, 0x34, + 0x77, 0x7a, 0x4c, 0x4c, 0x73, 0x66, 0x2b, 0x4c, 0x51, 0x38, 0x6e, 0x5a, + 0x0a, 0x62, 0x70, 0x6a, 0x66, 0x6e, 0x35, 0x76, 0x67, 0x49, 0x7a, 0x78, + 0x43, 0x75, 0x52, 0x68, 0x34, 0x52, 0x70, 0x39, 0x51, 0x59, 0x4d, 0x35, + 0x46, 0x68, 0x66, 0x72, 0x4a, 0x58, 0x39, 0x77, 0x63, 0x59, 0x61, 0x77, + 0x50, 0x2f, 0x48, 0x54, 0x62, 0x4a, 0x37, 0x70, 0x37, 0x4c, 0x56, 0x51, + 0x4f, 0x32, 0x51, 0x59, 0x41, 0x50, 0x2b, 0x61, 0x6b, 0x4d, 0x54, 0x48, + 0x78, 0x67, 0x4b, 0x75, 0x4d, 0x0a, 0x42, 0x7a, 0x56, 0x56, 0x2b, 0x2b, + 0x33, 0x77, 0x57, 0x54, 0x6f, 0x4b, 0x66, 0x56, 0x5a, 0x55, 0x6a, 0x46, + 0x58, 0x38, 0x6e, 0x66, 0x54, 0x66, 0x47, 0x4d, 0x47, 0x77, 0x57, 0x41, + 0x48, 0x4a, 0x44, 0x6e, 0x6c, 0x45, 0x47, 0x6e, 0x55, 0x34, 0x74, 0x6c, + 0x39, 0x55, 0x75, 0x6a, 0x6f, 0x43, 0x56, 0x34, 0x45, 0x4e, 0x4a, 0x74, + 0x7a, 0x46, 0x6f, 0x51, 0x49, 0x44, 0x41, 0x51, 0x41, 0x42, 0x0a, 0x41, + 0x6f, 0x47, 0x41, 0x4a, 0x2b, 0x36, 0x68, 0x70, 0x7a, 0x4e, 0x72, 0x32, + 0x34, 0x79, 0x54, 0x51, 0x5a, 0x74, 0x46, 0x57, 0x51, 0x70, 0x44, 0x70, + 0x45, 0x79, 0x46, 0x70, 0x6c, 0x64, 0x64, 0x4b, 0x4a, 0x4d, 0x4f, 0x78, + 0x44, 0x79, 0x61, 0x33, 0x53, 0x39, 0x70, 0x70, 0x4b, 0x33, 0x76, 0x54, + 0x57, 0x72, 0x49, 0x49, 0x54, 0x56, 0x32, 0x78, 0x4e, 0x63, 0x75, 0x63, + 0x77, 0x37, 0x49, 0x0a, 0x63, 0x65, 0x54, 0x62, 0x64, 0x79, 0x72, 0x47, + 0x73, 0x79, 0x6a, 0x73, 0x55, 0x30, 0x2f, 0x48, 0x64, 0x43, 0x63, 0x49, + 0x66, 0x39, 0x79, 0x6d, 0x32, 0x6a, 0x66, 0x6d, 0x47, 0x4c, 0x55, 0x77, + 0x6d, 0x79, 0x68, 0x6c, 0x74, 0x4b, 0x56, 0x77, 0x30, 0x51, 0x59, 0x63, + 0x46, 0x42, 0x30, 0x58, 0x4c, 0x6b, 0x63, 0x30, 0x6e, 0x49, 0x35, 0x59, + 0x76, 0x45, 0x59, 0x6f, 0x65, 0x56, 0x44, 0x67, 0x0a, 0x6f, 0x6d, 0x5a, + 0x49, 0x58, 0x6e, 0x31, 0x45, 0x33, 0x45, 0x57, 0x2b, 0x73, 0x53, 0x49, + 0x57, 0x53, 0x62, 0x6b, 0x4d, 0x75, 0x39, 0x62, 0x59, 0x32, 0x6b, 0x73, + 0x74, 0x4b, 0x58, 0x52, 0x32, 0x55, 0x5a, 0x6d, 0x4d, 0x67, 0x57, 0x44, + 0x74, 0x6d, 0x42, 0x45, 0x50, 0x4d, 0x61, 0x45, 0x43, 0x51, 0x51, 0x44, + 0x36, 0x79, 0x54, 0x34, 0x54, 0x41, 0x5a, 0x4d, 0x35, 0x68, 0x47, 0x42, + 0x62, 0x0a, 0x63, 0x69, 0x42, 0x4b, 0x67, 0x4d, 0x55, 0x50, 0x36, 0x50, + 0x77, 0x4f, 0x68, 0x50, 0x68, 0x4f, 0x4d, 0x50, 0x49, 0x76, 0x69, 0x6a, + 0x4f, 0x35, 0x30, 0x41, 0x69, 0x75, 0x36, 0x69, 0x75, 0x43, 0x56, 0x38, + 0x38, 0x6c, 0x31, 0x51, 0x49, 0x79, 0x33, 0x38, 0x67, 0x57, 0x56, 0x68, + 0x78, 0x6a, 0x4e, 0x72, 0x71, 0x36, 0x50, 0x33, 0x34, 0x36, 0x6a, 0x34, + 0x49, 0x42, 0x67, 0x2b, 0x6b, 0x42, 0x0a, 0x39, 0x61, 0x6c, 0x77, 0x70, + 0x43, 0x4f, 0x44, 0x41, 0x6b, 0x45, 0x41, 0x35, 0x6e, 0x53, 0x6e, 0x6d, + 0x39, 0x6b, 0x36, 0x79, 0x6b, 0x59, 0x65, 0x51, 0x57, 0x4e, 0x53, 0x30, + 0x66, 0x4e, 0x57, 0x69, 0x52, 0x69, 0x6e, 0x43, 0x64, 0x6c, 0x32, 0x33, + 0x41, 0x37, 0x75, 0x73, 0x44, 0x47, 0x53, 0x75, 0x4b, 0x4b, 0x6c, 0x6d, + 0x30, 0x31, 0x39, 0x69, 0x6f, 0x6d, 0x4a, 0x2f, 0x52, 0x67, 0x64, 0x0a, + 0x4d, 0x4b, 0x44, 0x4f, 0x70, 0x30, 0x71, 0x2f, 0x32, 0x4f, 0x6f, 0x73, + 0x74, 0x62, 0x74, 0x65, 0x4f, 0x57, 0x4d, 0x32, 0x4d, 0x52, 0x46, 0x66, + 0x34, 0x6a, 0x4d, 0x48, 0x33, 0x77, 0x79, 0x56, 0x43, 0x77, 0x4a, 0x41, + 0x66, 0x41, 0x64, 0x6a, 0x4a, 0x38, 0x73, 0x7a, 0x6f, 0x4e, 0x4b, 0x54, + 0x52, 0x53, 0x61, 0x67, 0x53, 0x62, 0x68, 0x39, 0x76, 0x57, 0x79, 0x67, + 0x6e, 0x42, 0x32, 0x76, 0x0a, 0x49, 0x42, 0x79, 0x63, 0x36, 0x6c, 0x34, + 0x54, 0x54, 0x75, 0x5a, 0x51, 0x4a, 0x52, 0x47, 0x7a, 0x43, 0x76, 0x65, + 0x61, 0x66, 0x7a, 0x39, 0x6c, 0x6f, 0x76, 0x75, 0x42, 0x33, 0x57, 0x6f, + 0x68, 0x43, 0x41, 0x42, 0x64, 0x51, 0x52, 0x64, 0x39, 0x75, 0x6b, 0x43, + 0x58, 0x4c, 0x32, 0x43, 0x70, 0x73, 0x45, 0x70, 0x71, 0x7a, 0x6b, 0x61, + 0x66, 0x4f, 0x51, 0x4a, 0x41, 0x4a, 0x55, 0x6a, 0x63, 0x0a, 0x55, 0x53, + 0x65, 0x64, 0x44, 0x6c, 0x71, 0x33, 0x7a, 0x47, 0x5a, 0x77, 0x59, 0x4d, + 0x31, 0x59, 0x77, 0x38, 0x64, 0x38, 0x52, 0x75, 0x69, 0x72, 0x42, 0x55, + 0x46, 0x5a, 0x4e, 0x71, 0x4a, 0x65, 0x6c, 0x59, 0x61, 0x69, 0x2b, 0x6e, + 0x52, 0x59, 0x43, 0x6c, 0x44, 0x6b, 0x52, 0x56, 0x46, 0x67, 0x62, 0x35, + 0x79, 0x6b, 0x73, 0x6f, 0x59, 0x79, 0x63, 0x62, 0x71, 0x35, 0x54, 0x78, + 0x47, 0x6f, 0x0a, 0x56, 0x65, 0x71, 0x4b, 0x4f, 0x76, 0x67, 0x50, 0x70, + 0x6a, 0x34, 0x52, 0x57, 0x50, 0x48, 0x6c, 0x4c, 0x77, 0x4a, 0x41, 0x47, + 0x55, 0x4d, 0x6b, 0x33, 0x62, 0x71, 0x54, 0x39, 0x31, 0x78, 0x42, 0x55, + 0x43, 0x6e, 0x4c, 0x52, 0x73, 0x2f, 0x76, 0x66, 0x6f, 0x43, 0x70, 0x48, + 0x70, 0x67, 0x36, 0x65, 0x79, 0x77, 0x51, 0x54, 0x42, 0x44, 0x41, 0x56, + 0x36, 0x78, 0x6b, 0x79, 0x7a, 0x34, 0x61, 0x0a, 0x52, 0x48, 0x33, 0x49, + 0x37, 0x2f, 0x2b, 0x79, 0x6a, 0x33, 0x5a, 0x78, 0x52, 0x32, 0x4a, 0x6f, + 0x57, 0x48, 0x67, 0x55, 0x77, 0x5a, 0x37, 0x6c, 0x5a, 0x6b, 0x31, 0x56, + 0x6e, 0x68, 0x66, 0x66, 0x46, 0x79, 0x65, 0x37, 0x53, 0x42, 0x58, 0x79, + 0x61, 0x67, 0x3d, 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, + 0x44, 0x20, 0x52, 0x53, 0x41, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, + 0x45, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x00}; diff --git a/test/core/end2end/data/test_root_cert.c b/test/core/end2end/data/test_root_cert.c index f8e69e61b2f..58d98050175 100644 --- a/test/core/end2end/data/test_root_cert.c +++ b/test/core/end2end/data/test_root_cert.c @@ -32,71 +32,70 @@ */ const char test_root_cert[] = { - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, - 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x49, 0x7a, 0x43, 0x43, - 0x41, 0x59, 0x77, 0x43, 0x43, 0x51, 0x43, 0x46, 0x54, 0x62, 0x46, 0x37, - 0x58, 0x4e, 0x53, 0x76, 0x76, 0x6a, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, - 0x68, 0x6b, 0x69, 0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x55, 0x46, - 0x41, 0x44, 0x42, 0x57, 0x4d, 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44, - 0x56, 0x51, 0x51, 0x47, 0x45, 0x77, 0x4a, 0x42, 0x0a, 0x56, 0x54, 0x45, - 0x54, 0x4d, 0x42, 0x45, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x41, 0x77, - 0x4b, 0x55, 0x32, 0x39, 0x74, 0x5a, 0x53, 0x31, 0x54, 0x64, 0x47, 0x46, - 0x30, 0x5a, 0x54, 0x45, 0x68, 0x4d, 0x42, 0x38, 0x47, 0x41, 0x31, 0x55, - 0x45, 0x43, 0x67, 0x77, 0x59, 0x53, 0x57, 0x35, 0x30, 0x5a, 0x58, 0x4a, - 0x75, 0x5a, 0x58, 0x51, 0x67, 0x56, 0x32, 0x6c, 0x6b, 0x5a, 0x32, 0x6c, - 0x30, 0x0a, 0x63, 0x79, 0x42, 0x51, 0x64, 0x48, 0x6b, 0x67, 0x54, 0x48, - 0x52, 0x6b, 0x4d, 0x51, 0x38, 0x77, 0x44, 0x51, 0x59, 0x44, 0x56, 0x51, - 0x51, 0x44, 0x44, 0x41, 0x5a, 0x30, 0x5a, 0x58, 0x4e, 0x30, 0x59, 0x32, - 0x45, 0x77, 0x48, 0x68, 0x63, 0x4e, 0x4d, 0x54, 0x51, 0x77, 0x4e, 0x7a, - 0x45, 0x33, 0x4d, 0x6a, 0x4d, 0x78, 0x4e, 0x7a, 0x55, 0x78, 0x57, 0x68, - 0x63, 0x4e, 0x4d, 0x6a, 0x51, 0x77, 0x0a, 0x4e, 0x7a, 0x45, 0x30, 0x4d, - 0x6a, 0x4d, 0x78, 0x4e, 0x7a, 0x55, 0x78, 0x57, 0x6a, 0x42, 0x57, 0x4d, - 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, 0x45, - 0x77, 0x4a, 0x42, 0x56, 0x54, 0x45, 0x54, 0x4d, 0x42, 0x45, 0x47, 0x41, - 0x31, 0x55, 0x45, 0x43, 0x41, 0x77, 0x4b, 0x55, 0x32, 0x39, 0x74, 0x5a, - 0x53, 0x31, 0x54, 0x64, 0x47, 0x46, 0x30, 0x5a, 0x54, 0x45, 0x68, 0x0a, - 0x4d, 0x42, 0x38, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x67, 0x77, 0x59, - 0x53, 0x57, 0x35, 0x30, 0x5a, 0x58, 0x4a, 0x75, 0x5a, 0x58, 0x51, 0x67, - 0x56, 0x32, 0x6c, 0x6b, 0x5a, 0x32, 0x6c, 0x30, 0x63, 0x79, 0x42, 0x51, - 0x64, 0x48, 0x6b, 0x67, 0x54, 0x48, 0x52, 0x6b, 0x4d, 0x51, 0x38, 0x77, - 0x44, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x44, 0x41, 0x5a, 0x30, - 0x5a, 0x58, 0x4e, 0x30, 0x0a, 0x59, 0x32, 0x45, 0x77, 0x67, 0x5a, 0x38, - 0x77, 0x44, 0x51, 0x59, 0x4a, 0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, - 0x4e, 0x41, 0x51, 0x45, 0x42, 0x42, 0x51, 0x41, 0x44, 0x67, 0x59, 0x30, - 0x41, 0x4d, 0x49, 0x47, 0x4a, 0x41, 0x6f, 0x47, 0x42, 0x41, 0x4d, 0x42, - 0x41, 0x33, 0x77, 0x56, 0x65, 0x54, 0x47, 0x48, 0x5a, 0x52, 0x31, 0x52, - 0x79, 0x65, 0x2f, 0x69, 0x2b, 0x4a, 0x38, 0x61, 0x32, 0x0a, 0x63, 0x75, - 0x35, 0x67, 0x58, 0x77, 0x46, 0x56, 0x36, 0x54, 0x6e, 0x4f, 0x62, 0x7a, - 0x47, 0x4d, 0x37, 0x62, 0x4c, 0x46, 0x43, 0x4f, 0x35, 0x69, 0x39, 0x76, - 0x34, 0x6d, 0x4c, 0x6f, 0x34, 0x69, 0x46, 0x7a, 0x50, 0x73, 0x48, 0x6d, - 0x57, 0x44, 0x55, 0x78, 0x4b, 0x53, 0x33, 0x59, 0x38, 0x69, 0x58, 0x62, - 0x75, 0x30, 0x65, 0x59, 0x42, 0x6c, 0x4c, 0x6f, 0x4e, 0x59, 0x30, 0x6c, - 0x53, 0x76, 0x0a, 0x78, 0x44, 0x78, 0x33, 0x33, 0x4f, 0x2b, 0x44, 0x75, - 0x77, 0x4d, 0x6d, 0x56, 0x4e, 0x2b, 0x44, 0x7a, 0x53, 0x44, 0x2b, 0x45, - 0x6f, 0x64, 0x39, 0x7a, 0x66, 0x76, 0x77, 0x4f, 0x57, 0x48, 0x73, 0x61, - 0x7a, 0x59, 0x43, 0x5a, 0x54, 0x32, 0x50, 0x68, 0x4e, 0x78, 0x6e, 0x56, - 0x57, 0x49, 0x75, 0x4a, 0x58, 0x56, 0x69, 0x59, 0x34, 0x4a, 0x41, 0x48, - 0x55, 0x47, 0x6f, 0x64, 0x6a, 0x78, 0x2b, 0x0a, 0x51, 0x41, 0x69, 0x36, - 0x79, 0x43, 0x41, 0x75, 0x72, 0x55, 0x5a, 0x47, 0x76, 0x59, 0x58, 0x47, - 0x67, 0x5a, 0x53, 0x42, 0x41, 0x67, 0x4d, 0x42, 0x41, 0x41, 0x45, 0x77, - 0x44, 0x51, 0x59, 0x4a, 0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, - 0x41, 0x51, 0x45, 0x46, 0x42, 0x51, 0x41, 0x44, 0x67, 0x59, 0x45, 0x41, - 0x51, 0x6f, 0x51, 0x56, 0x44, 0x38, 0x62, 0x77, 0x64, 0x74, 0x57, 0x4a, - 0x0a, 0x41, 0x6e, 0x69, 0x47, 0x42, 0x77, 0x63, 0x43, 0x66, 0x71, 0x59, - 0x79, 0x48, 0x2b, 0x2f, 0x4b, 0x70, 0x41, 0x31, 0x30, 0x41, 0x63, 0x65, - 0x62, 0x4a, 0x56, 0x56, 0x54, 0x79, 0x59, 0x62, 0x59, 0x76, 0x49, 0x39, - 0x51, 0x38, 0x64, 0x36, 0x52, 0x53, 0x56, 0x75, 0x34, 0x50, 0x5a, 0x79, - 0x39, 0x4f, 0x41, 0x4c, 0x48, 0x52, 0x2f, 0x51, 0x72, 0x57, 0x42, 0x64, - 0x59, 0x54, 0x41, 0x79, 0x7a, 0x0a, 0x66, 0x4e, 0x41, 0x6d, 0x63, 0x32, - 0x63, 0x6d, 0x64, 0x6b, 0x53, 0x52, 0x4a, 0x7a, 0x6a, 0x68, 0x49, 0x61, - 0x4f, 0x73, 0x74, 0x6e, 0x51, 0x79, 0x31, 0x4a, 0x2b, 0x46, 0x6b, 0x30, - 0x54, 0x39, 0x58, 0x79, 0x76, 0x51, 0x74, 0x71, 0x34, 0x39, 0x39, 0x79, - 0x46, 0x62, 0x71, 0x39, 0x78, 0x6f, 0x67, 0x55, 0x56, 0x6c, 0x45, 0x47, - 0x48, 0x36, 0x32, 0x78, 0x50, 0x36, 0x76, 0x48, 0x30, 0x59, 0x0a, 0x35, - 0x75, 0x6b, 0x4b, 0x2f, 0x2f, 0x64, 0x43, 0x50, 0x41, 0x7a, 0x41, 0x31, - 0x31, 0x59, 0x75, 0x58, 0x32, 0x72, 0x6e, 0x65, 0x78, 0x30, 0x4a, 0x68, - 0x75, 0x54, 0x51, 0x66, 0x63, 0x49, 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x43, 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, - 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x00 -}; + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, + 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x49, 0x7a, 0x43, 0x43, + 0x41, 0x59, 0x77, 0x43, 0x43, 0x51, 0x43, 0x46, 0x54, 0x62, 0x46, 0x37, + 0x58, 0x4e, 0x53, 0x76, 0x76, 0x6a, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, + 0x68, 0x6b, 0x69, 0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x55, 0x46, + 0x41, 0x44, 0x42, 0x57, 0x4d, 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44, + 0x56, 0x51, 0x51, 0x47, 0x45, 0x77, 0x4a, 0x42, 0x0a, 0x56, 0x54, 0x45, + 0x54, 0x4d, 0x42, 0x45, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x41, 0x77, + 0x4b, 0x55, 0x32, 0x39, 0x74, 0x5a, 0x53, 0x31, 0x54, 0x64, 0x47, 0x46, + 0x30, 0x5a, 0x54, 0x45, 0x68, 0x4d, 0x42, 0x38, 0x47, 0x41, 0x31, 0x55, + 0x45, 0x43, 0x67, 0x77, 0x59, 0x53, 0x57, 0x35, 0x30, 0x5a, 0x58, 0x4a, + 0x75, 0x5a, 0x58, 0x51, 0x67, 0x56, 0x32, 0x6c, 0x6b, 0x5a, 0x32, 0x6c, + 0x30, 0x0a, 0x63, 0x79, 0x42, 0x51, 0x64, 0x48, 0x6b, 0x67, 0x54, 0x48, + 0x52, 0x6b, 0x4d, 0x51, 0x38, 0x77, 0x44, 0x51, 0x59, 0x44, 0x56, 0x51, + 0x51, 0x44, 0x44, 0x41, 0x5a, 0x30, 0x5a, 0x58, 0x4e, 0x30, 0x59, 0x32, + 0x45, 0x77, 0x48, 0x68, 0x63, 0x4e, 0x4d, 0x54, 0x51, 0x77, 0x4e, 0x7a, + 0x45, 0x33, 0x4d, 0x6a, 0x4d, 0x78, 0x4e, 0x7a, 0x55, 0x78, 0x57, 0x68, + 0x63, 0x4e, 0x4d, 0x6a, 0x51, 0x77, 0x0a, 0x4e, 0x7a, 0x45, 0x30, 0x4d, + 0x6a, 0x4d, 0x78, 0x4e, 0x7a, 0x55, 0x78, 0x57, 0x6a, 0x42, 0x57, 0x4d, + 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, 0x45, + 0x77, 0x4a, 0x42, 0x56, 0x54, 0x45, 0x54, 0x4d, 0x42, 0x45, 0x47, 0x41, + 0x31, 0x55, 0x45, 0x43, 0x41, 0x77, 0x4b, 0x55, 0x32, 0x39, 0x74, 0x5a, + 0x53, 0x31, 0x54, 0x64, 0x47, 0x46, 0x30, 0x5a, 0x54, 0x45, 0x68, 0x0a, + 0x4d, 0x42, 0x38, 0x47, 0x41, 0x31, 0x55, 0x45, 0x43, 0x67, 0x77, 0x59, + 0x53, 0x57, 0x35, 0x30, 0x5a, 0x58, 0x4a, 0x75, 0x5a, 0x58, 0x51, 0x67, + 0x56, 0x32, 0x6c, 0x6b, 0x5a, 0x32, 0x6c, 0x30, 0x63, 0x79, 0x42, 0x51, + 0x64, 0x48, 0x6b, 0x67, 0x54, 0x48, 0x52, 0x6b, 0x4d, 0x51, 0x38, 0x77, + 0x44, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x44, 0x41, 0x5a, 0x30, + 0x5a, 0x58, 0x4e, 0x30, 0x0a, 0x59, 0x32, 0x45, 0x77, 0x67, 0x5a, 0x38, + 0x77, 0x44, 0x51, 0x59, 0x4a, 0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, + 0x4e, 0x41, 0x51, 0x45, 0x42, 0x42, 0x51, 0x41, 0x44, 0x67, 0x59, 0x30, + 0x41, 0x4d, 0x49, 0x47, 0x4a, 0x41, 0x6f, 0x47, 0x42, 0x41, 0x4d, 0x42, + 0x41, 0x33, 0x77, 0x56, 0x65, 0x54, 0x47, 0x48, 0x5a, 0x52, 0x31, 0x52, + 0x79, 0x65, 0x2f, 0x69, 0x2b, 0x4a, 0x38, 0x61, 0x32, 0x0a, 0x63, 0x75, + 0x35, 0x67, 0x58, 0x77, 0x46, 0x56, 0x36, 0x54, 0x6e, 0x4f, 0x62, 0x7a, + 0x47, 0x4d, 0x37, 0x62, 0x4c, 0x46, 0x43, 0x4f, 0x35, 0x69, 0x39, 0x76, + 0x34, 0x6d, 0x4c, 0x6f, 0x34, 0x69, 0x46, 0x7a, 0x50, 0x73, 0x48, 0x6d, + 0x57, 0x44, 0x55, 0x78, 0x4b, 0x53, 0x33, 0x59, 0x38, 0x69, 0x58, 0x62, + 0x75, 0x30, 0x65, 0x59, 0x42, 0x6c, 0x4c, 0x6f, 0x4e, 0x59, 0x30, 0x6c, + 0x53, 0x76, 0x0a, 0x78, 0x44, 0x78, 0x33, 0x33, 0x4f, 0x2b, 0x44, 0x75, + 0x77, 0x4d, 0x6d, 0x56, 0x4e, 0x2b, 0x44, 0x7a, 0x53, 0x44, 0x2b, 0x45, + 0x6f, 0x64, 0x39, 0x7a, 0x66, 0x76, 0x77, 0x4f, 0x57, 0x48, 0x73, 0x61, + 0x7a, 0x59, 0x43, 0x5a, 0x54, 0x32, 0x50, 0x68, 0x4e, 0x78, 0x6e, 0x56, + 0x57, 0x49, 0x75, 0x4a, 0x58, 0x56, 0x69, 0x59, 0x34, 0x4a, 0x41, 0x48, + 0x55, 0x47, 0x6f, 0x64, 0x6a, 0x78, 0x2b, 0x0a, 0x51, 0x41, 0x69, 0x36, + 0x79, 0x43, 0x41, 0x75, 0x72, 0x55, 0x5a, 0x47, 0x76, 0x59, 0x58, 0x47, + 0x67, 0x5a, 0x53, 0x42, 0x41, 0x67, 0x4d, 0x42, 0x41, 0x41, 0x45, 0x77, + 0x44, 0x51, 0x59, 0x4a, 0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, + 0x41, 0x51, 0x45, 0x46, 0x42, 0x51, 0x41, 0x44, 0x67, 0x59, 0x45, 0x41, + 0x51, 0x6f, 0x51, 0x56, 0x44, 0x38, 0x62, 0x77, 0x64, 0x74, 0x57, 0x4a, + 0x0a, 0x41, 0x6e, 0x69, 0x47, 0x42, 0x77, 0x63, 0x43, 0x66, 0x71, 0x59, + 0x79, 0x48, 0x2b, 0x2f, 0x4b, 0x70, 0x41, 0x31, 0x30, 0x41, 0x63, 0x65, + 0x62, 0x4a, 0x56, 0x56, 0x54, 0x79, 0x59, 0x62, 0x59, 0x76, 0x49, 0x39, + 0x51, 0x38, 0x64, 0x36, 0x52, 0x53, 0x56, 0x75, 0x34, 0x50, 0x5a, 0x79, + 0x39, 0x4f, 0x41, 0x4c, 0x48, 0x52, 0x2f, 0x51, 0x72, 0x57, 0x42, 0x64, + 0x59, 0x54, 0x41, 0x79, 0x7a, 0x0a, 0x66, 0x4e, 0x41, 0x6d, 0x63, 0x32, + 0x63, 0x6d, 0x64, 0x6b, 0x53, 0x52, 0x4a, 0x7a, 0x6a, 0x68, 0x49, 0x61, + 0x4f, 0x73, 0x74, 0x6e, 0x51, 0x79, 0x31, 0x4a, 0x2b, 0x46, 0x6b, 0x30, + 0x54, 0x39, 0x58, 0x79, 0x76, 0x51, 0x74, 0x71, 0x34, 0x39, 0x39, 0x79, + 0x46, 0x62, 0x71, 0x39, 0x78, 0x6f, 0x67, 0x55, 0x56, 0x6c, 0x45, 0x47, + 0x48, 0x36, 0x32, 0x78, 0x50, 0x36, 0x76, 0x48, 0x30, 0x59, 0x0a, 0x35, + 0x75, 0x6b, 0x4b, 0x2f, 0x2f, 0x64, 0x43, 0x50, 0x41, 0x7a, 0x41, 0x31, + 0x31, 0x59, 0x75, 0x58, 0x32, 0x72, 0x6e, 0x65, 0x78, 0x30, 0x4a, 0x68, + 0x75, 0x54, 0x51, 0x66, 0x63, 0x49, 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x43, 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, + 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x00}; diff --git a/test/core/end2end/dualstack_socket_test.c b/test/core/end2end/dualstack_socket_test.c index 5da851bbcd2..ca72d71dc1d 100644 --- a/test/core/end2end/dualstack_socket_test.c +++ b/test/core/end2end/dualstack_socket_test.c @@ -49,37 +49,23 @@ /* This test exercises IPv4, IPv6, and dualstack sockets in various ways. */ -static void * -tag (gpr_intptr i) -{ - return (void *) i; -} +static void *tag(gpr_intptr i) { return (void *)i; } -static gpr_timespec -ms_from_now (int ms) -{ - return GRPC_TIMEOUT_MILLIS_TO_DEADLINE (ms); +static gpr_timespec ms_from_now(int ms) { + return GRPC_TIMEOUT_MILLIS_TO_DEADLINE(ms); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, ms_from_now (5000), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, ms_from_now(5000), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -do_nothing (void *ignored) -{ -} +static void do_nothing(void *ignored) {} -void -test_connect (const char *server_host, const char *client_host, int port, int expect_ok) -{ +void test_connect(const char *server_host, const char *client_host, int port, + int expect_ok) { char *client_hostport; char *server_hostport; grpc_channel *client; @@ -103,88 +89,81 @@ test_connect (const char *server_host, const char *client_host, int port, int ex grpc_call_details call_details; char *peer; - if (port == 0) - { - port = grpc_pick_unused_port_or_die (); - } + if (port == 0) { + port = grpc_pick_unused_port_or_die(); + } - gpr_join_host_port (&server_hostport, server_host, port); + gpr_join_host_port(&server_hostport, server_host, port); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); /* Create server. */ - cq = grpc_completion_queue_create (NULL); - server = grpc_server_create (NULL, NULL); - grpc_server_register_completion_queue (server, cq, NULL); - GPR_ASSERT ((got_port = grpc_server_add_insecure_http2_port (server, server_hostport)) > 0); - if (port == 0) - { - port = got_port; - } - else - { - GPR_ASSERT (port == got_port); - } - grpc_server_start (server); - cqv = cq_verifier_create (cq); + cq = grpc_completion_queue_create(NULL); + server = grpc_server_create(NULL, NULL); + grpc_server_register_completion_queue(server, cq, NULL); + GPR_ASSERT((got_port = grpc_server_add_insecure_http2_port( + server, server_hostport)) > 0); + if (port == 0) { + port = got_port; + } else { + GPR_ASSERT(port == got_port); + } + grpc_server_start(server); + cqv = cq_verifier_create(cq); /* Create client. */ - if (client_host[0] == 'i') - { - /* for ipv4:/ipv6: addresses, concatenate the port to each of the parts */ - size_t i; - gpr_slice uri_slice; - gpr_slice_buffer uri_parts; - char **hosts_with_port; - - uri_slice = gpr_slice_new ((char *) client_host, strlen (client_host), do_nothing); - gpr_slice_buffer_init (&uri_parts); - gpr_slice_split (uri_slice, ",", &uri_parts); - hosts_with_port = gpr_malloc (sizeof (char *) * uri_parts.count); - for (i = 0; i < uri_parts.count; i++) - { - char *uri_part_str = gpr_dump_slice (uri_parts.slices[i], GPR_DUMP_ASCII); - gpr_asprintf (&hosts_with_port[i], "%s:%d", uri_part_str, port); - gpr_free (uri_part_str); - } - client_hostport = gpr_strjoin_sep ((const char **) hosts_with_port, uri_parts.count, ",", NULL); - for (i = 0; i < uri_parts.count; i++) - { - gpr_free (hosts_with_port[i]); - } - gpr_free (hosts_with_port); - gpr_slice_buffer_destroy (&uri_parts); - gpr_slice_unref (uri_slice); - } - else - { - gpr_join_host_port (&client_hostport, client_host, port); - } - client = grpc_insecure_channel_create (client_hostport, NULL, NULL); - - gpr_log (GPR_INFO, "Testing with server=%s client=%s (expecting %s)", server_hostport, client_hostport, expect_ok ? "success" : "failure"); - - gpr_free (client_hostport); - gpr_free (server_hostport); - - if (expect_ok) - { - /* Normal deadline, shouldn't be reached. */ - deadline = ms_from_now (60000); + if (client_host[0] == 'i') { + /* for ipv4:/ipv6: addresses, concatenate the port to each of the parts */ + size_t i; + gpr_slice uri_slice; + gpr_slice_buffer uri_parts; + char **hosts_with_port; + + uri_slice = + gpr_slice_new((char *)client_host, strlen(client_host), do_nothing); + gpr_slice_buffer_init(&uri_parts); + gpr_slice_split(uri_slice, ",", &uri_parts); + hosts_with_port = gpr_malloc(sizeof(char *) * uri_parts.count); + for (i = 0; i < uri_parts.count; i++) { + char *uri_part_str = gpr_dump_slice(uri_parts.slices[i], GPR_DUMP_ASCII); + gpr_asprintf(&hosts_with_port[i], "%s:%d", uri_part_str, port); + gpr_free(uri_part_str); } - else - { - /* Give up faster when failure is expected. - BUG: Setting this to 1000 reveals a memory leak (b/18608927). */ - deadline = ms_from_now (1500); + client_hostport = gpr_strjoin_sep((const char **)hosts_with_port, + uri_parts.count, ",", NULL); + for (i = 0; i < uri_parts.count; i++) { + gpr_free(hosts_with_port[i]); } + gpr_free(hosts_with_port); + gpr_slice_buffer_destroy(&uri_parts); + gpr_slice_unref(uri_slice); + } else { + gpr_join_host_port(&client_hostport, client_host, port); + } + client = grpc_insecure_channel_create(client_hostport, NULL, NULL); + + gpr_log(GPR_INFO, "Testing with server=%s client=%s (expecting %s)", + server_hostport, client_hostport, expect_ok ? "success" : "failure"); + + gpr_free(client_hostport); + gpr_free(server_hostport); + + if (expect_ok) { + /* Normal deadline, shouldn't be reached. */ + deadline = ms_from_now(60000); + } else { + /* Give up faster when failure is expected. + BUG: Setting this to 1000 reveals a memory leak (b/18608927). */ + deadline = ms_from_now(1500); + } /* Send a trivial request. */ - c = grpc_channel_create_call (client, NULL, GRPC_PROPAGATE_DEFAULTS, cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(client, NULL, GRPC_PROPAGATE_DEFAULTS, cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -209,164 +188,159 @@ test_connect (const char *server_host, const char *client_host, int port, int ex op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - - if (expect_ok) - { - /* Check for a successful request. */ - error = grpc_server_request_call (server, &s, &call_details, &request_metadata_recv, cq, cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); - - op = ops; - op->op = GRPC_OP_SEND_INITIAL_METADATA; - op->data.send_initial_metadata.count = 0; - op->flags = 0; - op++; - op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; - op->data.send_status_from_server.trailing_metadata_count = 0; - op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED; - op->data.send_status_from_server.status_details = "xyz"; - op->flags = 0; - op++; - op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; - op->data.recv_close_on_server.cancelled = &was_cancelled; - op->flags = 0; - op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); - - peer = grpc_call_get_peer (c); - gpr_log (GPR_DEBUG, "got peer: '%s'", peer); - gpr_free (peer); - - GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); - GPR_ASSERT (was_cancelled == 1); - - grpc_call_destroy (s); - } - else - { - /* Check for a failed connection. */ - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); - - GPR_ASSERT (status == GRPC_STATUS_DEADLINE_EXCEEDED); - } - - grpc_call_destroy (c); - - cq_verifier_destroy (cqv); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + + if (expect_ok) { + /* Check for a successful request. */ + error = grpc_server_request_call(server, &s, &call_details, + &request_metadata_recv, cq, cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); + + op = ops; + op->op = GRPC_OP_SEND_INITIAL_METADATA; + op->data.send_initial_metadata.count = 0; + op->flags = 0; + op++; + op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; + op->data.send_status_from_server.trailing_metadata_count = 0; + op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED; + op->data.send_status_from_server.status_details = "xyz"; + op->flags = 0; + op++; + op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; + op->data.recv_close_on_server.cancelled = &was_cancelled; + op->flags = 0; + op++; + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); + + peer = grpc_call_get_peer(c); + gpr_log(GPR_DEBUG, "got peer: '%s'", peer); + gpr_free(peer); + + GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); + GPR_ASSERT(was_cancelled == 1); + + grpc_call_destroy(s); + } else { + /* Check for a failed connection. */ + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); + + GPR_ASSERT(status == GRPC_STATUS_DEADLINE_EXCEEDED); + } + + grpc_call_destroy(c); + + cq_verifier_destroy(cqv); /* Destroy client. */ - grpc_channel_destroy (client); + grpc_channel_destroy(client); /* Destroy server. */ - grpc_server_shutdown_and_notify (server, cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (server); - grpc_completion_queue_shutdown (cq); - drain_cq (cq); - grpc_completion_queue_destroy (cq); - - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - - grpc_call_details_destroy (&call_details); - gpr_free (details); + grpc_server_shutdown_and_notify(server, cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(server); + grpc_completion_queue_shutdown(cq); + drain_cq(cq); + grpc_completion_queue_destroy(cq); + + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + + grpc_call_details_destroy(&call_details); + gpr_free(details); } -int -external_dns_works (const char *host) -{ - grpc_resolved_addresses *res = grpc_blocking_resolve_address (host, "80"); - if (res != NULL) - { - grpc_resolved_addresses_destroy (res); - return 1; - } +int external_dns_works(const char *host) { + grpc_resolved_addresses *res = grpc_blocking_resolve_address(host, "80"); + if (res != NULL) { + grpc_resolved_addresses_destroy(res); + return 1; + } return 0; } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { int do_ipv6 = 1; - grpc_test_init (argc, argv); - grpc_init (); + grpc_test_init(argc, argv); + grpc_init(); - if (!grpc_ipv6_loopback_available ()) - { - gpr_log (GPR_INFO, "Can't bind to ::1. Skipping IPv6 tests."); - do_ipv6 = 0; - } + if (!grpc_ipv6_loopback_available()) { + gpr_log(GPR_INFO, "Can't bind to ::1. Skipping IPv6 tests."); + do_ipv6 = 0; + } /* For coverage, test with and without dualstack sockets. */ - for (grpc_forbid_dualstack_sockets_for_testing = 0; grpc_forbid_dualstack_sockets_for_testing <= 1; grpc_forbid_dualstack_sockets_for_testing++) - { - /* :: and 0.0.0.0 are handled identically. */ - test_connect ("::", "127.0.0.1", 0, 1); - test_connect ("::", "::ffff:127.0.0.1", 0, 1); - test_connect ("::", "ipv4:127.0.0.1", 0, 1); - test_connect ("::", "ipv6:[::ffff:127.0.0.1]", 0, 1); - test_connect ("::", "localhost", 0, 1); - test_connect ("0.0.0.0", "127.0.0.1", 0, 1); - test_connect ("0.0.0.0", "::ffff:127.0.0.1", 0, 1); - test_connect ("0.0.0.0", "ipv4:127.0.0.1", 0, 1); - test_connect ("0.0.0.0", "ipv4:127.0.0.1,127.0.0.2,127.0.0.3", 0, 1); - test_connect ("0.0.0.0", "ipv6:[::ffff:127.0.0.1],[::ffff:127.0.0.2]", 0, 1); - test_connect ("0.0.0.0", "localhost", 0, 1); - if (do_ipv6) - { - test_connect ("::", "::1", 0, 1); - test_connect ("0.0.0.0", "::1", 0, 1); - test_connect ("::", "ipv6:[::1]", 0, 1); - test_connect ("0.0.0.0", "ipv6:[::1]", 0, 1); - } - - /* These only work when the families agree. */ - test_connect ("127.0.0.1", "127.0.0.1", 0, 1); - test_connect ("127.0.0.1", "ipv4:127.0.0.1", 0, 1); - if (do_ipv6) - { - test_connect ("::1", "::1", 0, 1); - test_connect ("::1", "127.0.0.1", 0, 0); - test_connect ("127.0.0.1", "::1", 0, 0); - test_connect ("::1", "ipv6:[::1]", 0, 1); - test_connect ("::1", "ipv4:127.0.0.1", 0, 0); - test_connect ("127.0.0.1", "ipv6:[::1]", 0, 0); - } - - if (!external_dns_works ("loopback46.unittest.grpc.io")) - { - gpr_log (GPR_INFO, "Skipping tests that depend on *.unittest.grpc.io."); - } - else - { - test_connect ("loopback46.unittest.grpc.io", "loopback4.unittest.grpc.io", 0, 1); - test_connect ("loopback4.unittest.grpc.io", "loopback46.unittest.grpc.io", 0, 1); - if (do_ipv6) - { - test_connect ("loopback46.unittest.grpc.io", "loopback6.unittest.grpc.io", 0, 1); - test_connect ("loopback6.unittest.grpc.io", "loopback46.unittest.grpc.io", 0, 1); - test_connect ("loopback4.unittest.grpc.io", "loopback6.unittest.grpc.io", 0, 0); - test_connect ("loopback6.unittest.grpc.io", "loopback4.unittest.grpc.io", 0, 0); - } - } + for (grpc_forbid_dualstack_sockets_for_testing = 0; + grpc_forbid_dualstack_sockets_for_testing <= 1; + grpc_forbid_dualstack_sockets_for_testing++) { + /* :: and 0.0.0.0 are handled identically. */ + test_connect("::", "127.0.0.1", 0, 1); + test_connect("::", "::ffff:127.0.0.1", 0, 1); + test_connect("::", "ipv4:127.0.0.1", 0, 1); + test_connect("::", "ipv6:[::ffff:127.0.0.1]", 0, 1); + test_connect("::", "localhost", 0, 1); + test_connect("0.0.0.0", "127.0.0.1", 0, 1); + test_connect("0.0.0.0", "::ffff:127.0.0.1", 0, 1); + test_connect("0.0.0.0", "ipv4:127.0.0.1", 0, 1); + test_connect("0.0.0.0", "ipv4:127.0.0.1,127.0.0.2,127.0.0.3", 0, 1); + test_connect("0.0.0.0", "ipv6:[::ffff:127.0.0.1],[::ffff:127.0.0.2]", 0, 1); + test_connect("0.0.0.0", "localhost", 0, 1); + if (do_ipv6) { + test_connect("::", "::1", 0, 1); + test_connect("0.0.0.0", "::1", 0, 1); + test_connect("::", "ipv6:[::1]", 0, 1); + test_connect("0.0.0.0", "ipv6:[::1]", 0, 1); + } + + /* These only work when the families agree. */ + test_connect("127.0.0.1", "127.0.0.1", 0, 1); + test_connect("127.0.0.1", "ipv4:127.0.0.1", 0, 1); + if (do_ipv6) { + test_connect("::1", "::1", 0, 1); + test_connect("::1", "127.0.0.1", 0, 0); + test_connect("127.0.0.1", "::1", 0, 0); + test_connect("::1", "ipv6:[::1]", 0, 1); + test_connect("::1", "ipv4:127.0.0.1", 0, 0); + test_connect("127.0.0.1", "ipv6:[::1]", 0, 0); + } + + if (!external_dns_works("loopback46.unittest.grpc.io")) { + gpr_log(GPR_INFO, "Skipping tests that depend on *.unittest.grpc.io."); + } else { + test_connect("loopback46.unittest.grpc.io", "loopback4.unittest.grpc.io", + 0, 1); + test_connect("loopback4.unittest.grpc.io", "loopback46.unittest.grpc.io", + 0, 1); + if (do_ipv6) { + test_connect("loopback46.unittest.grpc.io", + "loopback6.unittest.grpc.io", 0, 1); + test_connect("loopback6.unittest.grpc.io", + "loopback46.unittest.grpc.io", 0, 1); + test_connect("loopback4.unittest.grpc.io", "loopback6.unittest.grpc.io", + 0, 0); + test_connect("loopback6.unittest.grpc.io", "loopback4.unittest.grpc.io", + 0, 0); + } } + } - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h index 4f653ec8685..3f1665613c6 100644 --- a/test/core/end2end/end2end_tests.h +++ b/test/core/end2end/end2end_tests.h @@ -45,24 +45,25 @@ typedef struct grpc_end2end_test_config grpc_end2end_test_config; #define FAIL_AUTH_CHECK_SERVER_ARG_NAME "fail_auth_check" -struct grpc_end2end_test_fixture -{ +struct grpc_end2end_test_fixture { grpc_completion_queue *cq; grpc_server *server; grpc_channel *client; void *fixture_data; }; -struct grpc_end2end_test_config -{ +struct grpc_end2end_test_config { const char *name; gpr_uint32 feature_mask; - grpc_end2end_test_fixture (*create_fixture) (grpc_channel_args * client_args, grpc_channel_args * server_args); - void (*init_client) (grpc_end2end_test_fixture * f, grpc_channel_args * client_args); - void (*init_server) (grpc_end2end_test_fixture * f, grpc_channel_args * server_args); - void (*tear_down_data) (grpc_end2end_test_fixture * f); + grpc_end2end_test_fixture (*create_fixture)(grpc_channel_args *client_args, + grpc_channel_args *server_args); + void (*init_client)(grpc_end2end_test_fixture *f, + grpc_channel_args *client_args); + void (*init_server)(grpc_end2end_test_fixture *f, + grpc_channel_args *server_args); + void (*tear_down_data)(grpc_end2end_test_fixture *f); }; -void grpc_end2end_tests (grpc_end2end_test_config config); +void grpc_end2end_tests(grpc_end2end_test_config config); #endif /* GRPC_TEST_CORE_END2END_END2END_TESTS_H */ diff --git a/test/core/end2end/fixtures/h2_compress.c b/test/core/end2end/fixtures/h2_compress.c index 7117777bfaa..6e7a1faf55a 100644 --- a/test/core/end2end/fixtures/h2_compress.c +++ b/test/core/end2end/fixtures/h2_compress.c @@ -51,94 +51,86 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -typedef struct fullstack_compression_fixture_data -{ +typedef struct fullstack_compression_fixture_data { char *localaddr; grpc_channel_args *client_args_compression; grpc_channel_args *server_args_compression; } fullstack_compression_fixture_data; -static grpc_end2end_test_fixture -chttp2_create_fixture_fullstack_compression (grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture chttp2_create_fixture_fullstack_compression( + grpc_channel_args *client_args, grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - int port = grpc_pick_unused_port_or_die (); - fullstack_compression_fixture_data *ffd = gpr_malloc (sizeof (fullstack_compression_fixture_data)); - memset (ffd, 0, sizeof (fullstack_compression_fixture_data)); + int port = grpc_pick_unused_port_or_die(); + fullstack_compression_fixture_data *ffd = + gpr_malloc(sizeof(fullstack_compression_fixture_data)); + memset(ffd, 0, sizeof(fullstack_compression_fixture_data)); - gpr_join_host_port (&ffd->localaddr, "localhost", port); + gpr_join_host_port(&ffd->localaddr, "localhost", port); - memset (&f, 0, sizeof (f)); + memset(&f, 0, sizeof(f)); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create (NULL); + f.cq = grpc_completion_queue_create(NULL); return f; } -void -chttp2_init_client_fullstack_compression (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) -{ +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_channel_args_destroy (ffd->client_args_compression); - } - ffd->client_args_compression = grpc_channel_args_set_compression_algorithm (client_args, GRPC_COMPRESS_GZIP); - f->client = grpc_insecure_channel_create (ffd->localaddr, ffd->client_args_compression, NULL); + if (ffd->client_args_compression != NULL) { + grpc_channel_args_destroy(ffd->client_args_compression); + } + ffd->client_args_compression = grpc_channel_args_set_compression_algorithm( + client_args, GRPC_COMPRESS_GZIP); + f->client = grpc_insecure_channel_create(ffd->localaddr, + ffd->client_args_compression, NULL); } -void -chttp2_init_server_fullstack_compression (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) -{ +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_channel_args_destroy (ffd->server_args_compression); - } - ffd->server_args_compression = grpc_channel_args_set_compression_algorithm (server_args, GRPC_COMPRESS_GZIP); - if (f->server) - { - grpc_server_destroy (f->server); - } - f->server = grpc_server_create (ffd->server_args_compression, NULL); - 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); + if (ffd->server_args_compression != NULL) { + grpc_channel_args_destroy(ffd->server_args_compression); + } + ffd->server_args_compression = grpc_channel_args_set_compression_algorithm( + server_args, GRPC_COMPRESS_GZIP); + if (f->server) { + grpc_server_destroy(f->server); + } + f->server = grpc_server_create(ffd->server_args_compression, NULL); + 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); } -void -chttp2_tear_down_fullstack_compression (grpc_end2end_test_fixture * f) -{ +void chttp2_tear_down_fullstack_compression(grpc_end2end_test_fixture *f) { fullstack_compression_fixture_data *ffd = f->fixture_data; - grpc_channel_args_destroy (ffd->client_args_compression); - grpc_channel_args_destroy (ffd->server_args_compression); - gpr_free (ffd->localaddr); - gpr_free (ffd); + grpc_channel_args_destroy(ffd->client_args_compression); + grpc_channel_args_destroy(ffd->server_args_compression); + gpr_free(ffd->localaddr); + gpr_free(ffd); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/fullstack_compression", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, - chttp2_create_fixture_fullstack_compression, - chttp2_init_client_fullstack_compression, - chttp2_init_server_fullstack_compression, - chttp2_tear_down_fullstack_compression}, + {"chttp2/fullstack_compression", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, + chttp2_create_fixture_fullstack_compression, + chttp2_init_client_fullstack_compression, + chttp2_init_server_fullstack_compression, + chttp2_tear_down_fullstack_compression}, }; -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; - grpc_test_init (argc, argv); - grpc_init (); + grpc_test_init(argc, argv); + grpc_init(); - for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) - { - grpc_end2end_tests (configs[i]); - } + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(configs[i]); + } - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/fixtures/h2_fakesec.c b/test/core/end2end/fixtures/h2_fakesec.c index c663f40ede8..3e64cc08e88 100644 --- a/test/core/end2end/fixtures/h2_fakesec.c +++ b/test/core/end2end/fixtures/h2_fakesec.c @@ -45,126 +45,119 @@ #include "test/core/util/port.h" #include "test/core/end2end/data/ssl_test_data.h" -typedef struct fullstack_secure_fixture_data -{ +typedef struct fullstack_secure_fixture_data { char *localaddr; } fullstack_secure_fixture_data; -static grpc_end2end_test_fixture -chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( + grpc_channel_args *client_args, grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - int port = grpc_pick_unused_port_or_die (); - fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data)); + int port = grpc_pick_unused_port_or_die(); + fullstack_secure_fixture_data *ffd = + gpr_malloc(sizeof(fullstack_secure_fixture_data)); - memset (&f, 0, sizeof (f)); - gpr_join_host_port (&ffd->localaddr, "localhost", port); + memset(&f, 0, sizeof(f)); + gpr_join_host_port(&ffd->localaddr, "localhost", port); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create (NULL); + f.cq = grpc_completion_queue_create(NULL); return f; } -static void -process_auth_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data) -{ - GPR_ASSERT (state == NULL); - cb (user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); +static void process_auth_failure(void *state, grpc_auth_context *ctx, + const grpc_metadata *md, size_t md_count, + grpc_process_auth_metadata_done_cb cb, + void *user_data) { + GPR_ASSERT(state == NULL); + cb(user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); } -static void -chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds) -{ +static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *client_args, + grpc_credentials *creds) { fullstack_secure_fixture_data *ffd = f->fixture_data; - f->client = grpc_secure_channel_create (creds, ffd->localaddr, client_args, NULL); - GPR_ASSERT (f->client != NULL); - grpc_credentials_release (creds); + f->client = + grpc_secure_channel_create(creds, ffd->localaddr, client_args, NULL); + GPR_ASSERT(f->client != NULL); + grpc_credentials_release(creds); } -static void -chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds) -{ +static void chttp2_init_server_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *server_args, + grpc_server_credentials *server_creds) { fullstack_secure_fixture_data *ffd = f->fixture_data; - if (f->server) - { - grpc_server_destroy (f->server); - } - f->server = grpc_server_create (server_args, NULL); - grpc_server_register_completion_queue (f->server, f->cq, NULL); - GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, ffd->localaddr, server_creds)); - grpc_server_credentials_release (server_creds); - grpc_server_start (f->server); + if (f->server) { + grpc_server_destroy(f->server); + } + f->server = grpc_server_create(server_args, NULL); + grpc_server_register_completion_queue(f->server, f->cq, NULL); + GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr, + server_creds)); + grpc_server_credentials_release(server_creds); + grpc_server_start(f->server); } -void -chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f) -{ +void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { fullstack_secure_fixture_data *ffd = f->fixture_data; - gpr_free (ffd->localaddr); - gpr_free (ffd); + gpr_free(ffd->localaddr); + gpr_free(ffd); } -static void -chttp2_init_client_fake_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) -{ - grpc_credentials *fake_ts_creds = grpc_fake_transport_security_credentials_create (); - chttp2_init_client_secure_fullstack (f, client_args, fake_ts_creds); +static void chttp2_init_client_fake_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { + grpc_credentials *fake_ts_creds = + grpc_fake_transport_security_credentials_create(); + chttp2_init_client_secure_fullstack(f, client_args, fake_ts_creds); } -static int -fail_server_auth_check (grpc_channel_args * server_args) -{ +static int fail_server_auth_check(grpc_channel_args *server_args) { size_t i; - if (server_args == NULL) - return 0; - for (i = 0; i < server_args->num_args; i++) - { - if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0) - { - return 1; - } + if (server_args == NULL) return 0; + for (i = 0; i < server_args->num_args; i++) { + if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == + 0) { + return 1; } + } return 0; } -static void -chttp2_init_server_fake_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) -{ - grpc_server_credentials *fake_ts_creds = grpc_fake_transport_security_server_credentials_create (); - if (fail_server_auth_check (server_args)) - { - grpc_auth_metadata_processor processor = { process_auth_failure, NULL, NULL }; - grpc_server_credentials_set_auth_metadata_processor (fake_ts_creds, processor); - } - chttp2_init_server_secure_fullstack (f, server_args, fake_ts_creds); +static void chttp2_init_server_fake_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { + grpc_server_credentials *fake_ts_creds = + grpc_fake_transport_security_server_credentials_create(); + if (fail_server_auth_check(server_args)) { + grpc_auth_metadata_processor processor = {process_auth_failure, NULL, NULL}; + grpc_server_credentials_set_auth_metadata_processor(fake_ts_creds, + processor); + } + chttp2_init_server_secure_fullstack(f, server_args, fake_ts_creds); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/fake_secure_fullstack", - FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, - chttp2_create_fixture_secure_fullstack, - chttp2_init_client_fake_secure_fullstack, - chttp2_init_server_fake_secure_fullstack, - chttp2_tear_down_secure_fullstack}, + {"chttp2/fake_secure_fullstack", + FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | + FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, + chttp2_create_fixture_secure_fullstack, + chttp2_init_client_fake_secure_fullstack, + chttp2_init_server_fake_secure_fullstack, + chttp2_tear_down_secure_fullstack}, }; -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; - grpc_test_init (argc, argv); + grpc_test_init(argc, argv); - grpc_init (); + grpc_init(); - for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) - { - grpc_end2end_tests (configs[i]); - } + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(configs[i]); + } - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/fixtures/h2_full+poll.c b/test/core/end2end/fixtures/h2_full+poll.c index 92f49c0bc68..48feefc9312 100644 --- a/test/core/end2end/fixtures/h2_full+poll.c +++ b/test/core/end2end/fixtures/h2_full+poll.c @@ -50,79 +50,69 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -typedef struct fullstack_fixture_data -{ +typedef struct fullstack_fixture_data { char *localaddr; } fullstack_fixture_data; -static grpc_end2end_test_fixture -chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( + grpc_channel_args *client_args, grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - int port = grpc_pick_unused_port_or_die (); - fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data)); - memset (&f, 0, sizeof (f)); + int port = grpc_pick_unused_port_or_die(); + fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data)); + memset(&f, 0, sizeof(f)); - gpr_join_host_port (&ffd->localaddr, "localhost", port); + gpr_join_host_port(&ffd->localaddr, "localhost", port); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create (NULL); + f.cq = grpc_completion_queue_create(NULL); return f; } -void -chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) -{ +void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *client_args) { fullstack_fixture_data *ffd = f->fixture_data; - f->client = grpc_insecure_channel_create (ffd->localaddr, client_args, NULL); + f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL); } -void -chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) -{ +void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *server_args) { fullstack_fixture_data *ffd = f->fixture_data; - if (f->server) - { - grpc_server_destroy (f->server); - } - f->server = grpc_server_create (server_args, NULL); - 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); + if (f->server) { + grpc_server_destroy(f->server); + } + f->server = grpc_server_create(server_args, NULL); + 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); } -void -chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f) -{ +void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) { fullstack_fixture_data *ffd = f->fixture_data; - gpr_free (ffd->localaddr); - gpr_free (ffd); + gpr_free(ffd->localaddr); + gpr_free(ffd); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, - chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, - chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, + {"chttp2/fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, + chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, + chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, }; -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; grpc_platform_become_multipoller = grpc_poll_become_multipoller; - grpc_test_init (argc, argv); - grpc_init (); + grpc_test_init(argc, argv); + grpc_init(); - for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) - { - grpc_end2end_tests (configs[i]); - } + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(configs[i]); + } - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/fixtures/h2_full.c b/test/core/end2end/fixtures/h2_full.c index 16e93595007..0170dcf0e5a 100644 --- a/test/core/end2end/fixtures/h2_full.c +++ b/test/core/end2end/fixtures/h2_full.c @@ -50,78 +50,68 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -typedef struct fullstack_fixture_data -{ +typedef struct fullstack_fixture_data { char *localaddr; } fullstack_fixture_data; -static grpc_end2end_test_fixture -chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( + grpc_channel_args *client_args, grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - int port = grpc_pick_unused_port_or_die (); - fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data)); - memset (&f, 0, sizeof (f)); + int port = grpc_pick_unused_port_or_die(); + fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data)); + memset(&f, 0, sizeof(f)); - gpr_join_host_port (&ffd->localaddr, "localhost", port); + gpr_join_host_port(&ffd->localaddr, "localhost", port); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create (NULL); + f.cq = grpc_completion_queue_create(NULL); return f; } -void -chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) -{ +void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *client_args) { fullstack_fixture_data *ffd = f->fixture_data; - f->client = grpc_insecure_channel_create (ffd->localaddr, client_args, NULL); - GPR_ASSERT (f->client); + f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL); + GPR_ASSERT(f->client); } -void -chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) -{ +void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *server_args) { fullstack_fixture_data *ffd = f->fixture_data; - if (f->server) - { - grpc_server_destroy (f->server); - } - f->server = grpc_server_create (server_args, NULL); - 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); + if (f->server) { + grpc_server_destroy(f->server); + } + f->server = grpc_server_create(server_args, NULL); + 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); } -void -chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f) -{ +void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) { fullstack_fixture_data *ffd = f->fixture_data; - gpr_free (ffd->localaddr); - gpr_free (ffd); + gpr_free(ffd->localaddr); + gpr_free(ffd); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, - chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, - chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, + {"chttp2/fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, + chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, + chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, }; -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; - grpc_test_init (argc, argv); - grpc_init (); + grpc_test_init(argc, argv); + grpc_init(); - for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) - { - grpc_end2end_tests (configs[i]); - } + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(configs[i]); + } - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/fixtures/h2_oauth2.c b/test/core/end2end/fixtures/h2_oauth2.c index a328eb1ed5b..b4b2e026844 100644 --- a/test/core/end2end/fixtures/h2_oauth2.c +++ b/test/core/end2end/fixtures/h2_oauth2.c @@ -50,201 +50,191 @@ static const char oauth2_md[] = "Bearer aaslkfjs424535asdf"; static const char *client_identity_property_name = "smurf_name"; static const char *client_identity = "Brainy Smurf"; -typedef struct fullstack_secure_fixture_data -{ +typedef struct fullstack_secure_fixture_data { char *localaddr; } fullstack_secure_fixture_data; -static const grpc_metadata * -find_metadata (const grpc_metadata * md, size_t md_count, const char *key, const char *value) -{ +static const grpc_metadata *find_metadata(const grpc_metadata *md, + size_t md_count, const char *key, + const char *value) { size_t i; - for (i = 0; i < md_count; i++) - { - if (strcmp (key, md[i].key) == 0 && strlen (value) == md[i].value_length && memcmp (md[i].value, value, md[i].value_length) == 0) - { - return &md[i]; - } + for (i = 0; i < md_count; i++) { + if (strcmp(key, md[i].key) == 0 && strlen(value) == md[i].value_length && + memcmp(md[i].value, value, md[i].value_length) == 0) { + return &md[i]; } + } return NULL; } -typedef struct -{ - size_t pseudo_refcount; -} test_processor_state; +typedef struct { size_t pseudo_refcount; } test_processor_state; -static void -process_oauth2_success (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data) -{ - const grpc_metadata *oauth2 = find_metadata (md, md_count, "Authorization", oauth2_md); +static void process_oauth2_success(void *state, grpc_auth_context *ctx, + const grpc_metadata *md, size_t md_count, + grpc_process_auth_metadata_done_cb cb, + void *user_data) { + const grpc_metadata *oauth2 = + find_metadata(md, md_count, "Authorization", oauth2_md); test_processor_state *s; - GPR_ASSERT (state != NULL); - s = (test_processor_state *) state; - GPR_ASSERT (s->pseudo_refcount == 1); - GPR_ASSERT (oauth2 != NULL); - grpc_auth_context_add_cstring_property (ctx, client_identity_property_name, client_identity); - GPR_ASSERT (grpc_auth_context_set_peer_identity_property_name (ctx, client_identity_property_name) == 1); - cb (user_data, oauth2, 1, NULL, 0, GRPC_STATUS_OK, NULL); + GPR_ASSERT(state != NULL); + s = (test_processor_state *)state; + GPR_ASSERT(s->pseudo_refcount == 1); + GPR_ASSERT(oauth2 != NULL); + grpc_auth_context_add_cstring_property(ctx, client_identity_property_name, + client_identity); + GPR_ASSERT(grpc_auth_context_set_peer_identity_property_name( + ctx, client_identity_property_name) == 1); + cb(user_data, oauth2, 1, NULL, 0, GRPC_STATUS_OK, NULL); } -static void -process_oauth2_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data) -{ - const grpc_metadata *oauth2 = find_metadata (md, md_count, "Authorization", oauth2_md); +static void process_oauth2_failure(void *state, grpc_auth_context *ctx, + const grpc_metadata *md, size_t md_count, + grpc_process_auth_metadata_done_cb cb, + void *user_data) { + const grpc_metadata *oauth2 = + find_metadata(md, md_count, "Authorization", oauth2_md); test_processor_state *s; - GPR_ASSERT (state != NULL); - s = (test_processor_state *) state; - GPR_ASSERT (s->pseudo_refcount == 1); - GPR_ASSERT (oauth2 != NULL); - cb (user_data, oauth2, 1, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); + GPR_ASSERT(state != NULL); + s = (test_processor_state *)state; + GPR_ASSERT(s->pseudo_refcount == 1); + GPR_ASSERT(oauth2 != NULL); + cb(user_data, oauth2, 1, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); } -static grpc_end2end_test_fixture -chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( + grpc_channel_args *client_args, grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - int port = grpc_pick_unused_port_or_die (); - fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data)); - memset (&f, 0, sizeof (f)); + int port = grpc_pick_unused_port_or_die(); + fullstack_secure_fixture_data *ffd = + gpr_malloc(sizeof(fullstack_secure_fixture_data)); + memset(&f, 0, sizeof(f)); - gpr_join_host_port (&ffd->localaddr, "localhost", port); + gpr_join_host_port(&ffd->localaddr, "localhost", port); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create (NULL); + f.cq = grpc_completion_queue_create(NULL); return f; } -static void -chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds) -{ +static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *client_args, + grpc_credentials *creds) { fullstack_secure_fixture_data *ffd = f->fixture_data; - f->client = grpc_secure_channel_create (creds, ffd->localaddr, client_args, NULL); - GPR_ASSERT (f->client != NULL); - grpc_credentials_release (creds); + f->client = + grpc_secure_channel_create(creds, ffd->localaddr, client_args, NULL); + GPR_ASSERT(f->client != NULL); + grpc_credentials_release(creds); } -static void -chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds) -{ +static void chttp2_init_server_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *server_args, + grpc_server_credentials *server_creds) { fullstack_secure_fixture_data *ffd = f->fixture_data; - if (f->server) - { - grpc_server_destroy (f->server); - } - f->server = grpc_server_create (server_args, NULL); - grpc_server_register_completion_queue (f->server, f->cq, NULL); - GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, ffd->localaddr, server_creds)); - grpc_server_credentials_release (server_creds); - grpc_server_start (f->server); + if (f->server) { + grpc_server_destroy(f->server); + } + f->server = grpc_server_create(server_args, NULL); + grpc_server_register_completion_queue(f->server, f->cq, NULL); + GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr, + server_creds)); + grpc_server_credentials_release(server_creds); + grpc_server_start(f->server); } -void -chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f) -{ +void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { fullstack_secure_fixture_data *ffd = f->fixture_data; - gpr_free (ffd->localaddr); - gpr_free (ffd); + gpr_free(ffd->localaddr); + gpr_free(ffd); } -static void -chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) -{ - grpc_credentials *ssl_creds = grpc_ssl_credentials_create (test_root_cert, NULL, NULL); - grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create ("Authorization", oauth2_md, 1); - grpc_credentials *ssl_oauth2_creds = grpc_composite_credentials_create (ssl_creds, oauth2_creds, NULL); - grpc_arg ssl_name_override = { GRPC_ARG_STRING, - GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, - {"foo.test.google.fr"} - }; - 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_credentials_release (ssl_creds); - grpc_credentials_release (oauth2_creds); +static void chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { + grpc_credentials *ssl_creds = + grpc_ssl_credentials_create(test_root_cert, NULL, NULL); + grpc_credentials *oauth2_creds = + grpc_md_only_test_credentials_create("Authorization", oauth2_md, 1); + grpc_credentials *ssl_oauth2_creds = + grpc_composite_credentials_create(ssl_creds, oauth2_creds, NULL); + grpc_arg ssl_name_override = {GRPC_ARG_STRING, + GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, + {"foo.test.google.fr"}}; + 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_credentials_release(ssl_creds); + grpc_credentials_release(oauth2_creds); } -static int -fail_server_auth_check (grpc_channel_args * server_args) -{ +static int fail_server_auth_check(grpc_channel_args *server_args) { size_t i; - if (server_args == NULL) - return 0; - for (i = 0; i < server_args->num_args; i++) - { - if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0) - { - return 1; - } + if (server_args == NULL) return 0; + for (i = 0; i < server_args->num_args; i++) { + if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == + 0) { + return 1; } + } return 0; } -static void -processor_destroy (void *state) -{ - test_processor_state *s = (test_processor_state *) state; - GPR_ASSERT ((s->pseudo_refcount--) == 1); - gpr_free (s); +static void processor_destroy(void *state) { + test_processor_state *s = (test_processor_state *)state; + GPR_ASSERT((s->pseudo_refcount--) == 1); + gpr_free(s); } -static grpc_auth_metadata_processor -test_processor_create (int failing) -{ - test_processor_state *s = gpr_malloc (sizeof (*s)); +static grpc_auth_metadata_processor test_processor_create(int failing) { + test_processor_state *s = gpr_malloc(sizeof(*s)); grpc_auth_metadata_processor result; s->pseudo_refcount = 1; result.state = s; result.destroy = processor_destroy; - if (failing) - { - result.process = process_oauth2_failure; - } - else - { - result.process = process_oauth2_success; - } + if (failing) { + result.process = process_oauth2_failure; + } else { + result.process = process_oauth2_success; + } return result; } -static void -chttp2_init_server_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) -{ - grpc_ssl_pem_key_cert_pair pem_key_cert_pair = { test_server1_key, - test_server1_cert - }; - grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_key_cert_pair, 1, 0, NULL); - grpc_server_credentials_set_auth_metadata_processor (ssl_creds, test_processor_create (fail_server_auth_check (server_args))); - chttp2_init_server_secure_fullstack (f, server_args, ssl_creds); +static void chttp2_init_server_simple_ssl_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { + grpc_ssl_pem_key_cert_pair pem_key_cert_pair = {test_server1_key, + test_server1_cert}; + grpc_server_credentials *ssl_creds = + grpc_ssl_server_credentials_create(NULL, &pem_key_cert_pair, 1, 0, NULL); + grpc_server_credentials_set_auth_metadata_processor( + ssl_creds, test_processor_create(fail_server_auth_check(server_args))); + chttp2_init_server_secure_fullstack(f, server_args, ssl_creds); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/simple_ssl_with_oauth2_fullstack", - FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, - chttp2_create_fixture_secure_fullstack, - chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack, - chttp2_init_server_simple_ssl_secure_fullstack, - chttp2_tear_down_secure_fullstack}, + {"chttp2/simple_ssl_with_oauth2_fullstack", + FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | + FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | + FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, + chttp2_create_fixture_secure_fullstack, + chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack, + chttp2_init_server_simple_ssl_secure_fullstack, + chttp2_tear_down_secure_fullstack}, }; -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; - grpc_test_init (argc, argv); + grpc_test_init(argc, argv); - grpc_init (); + grpc_init(); - for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) - { - grpc_end2end_tests (configs[i]); - } + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(configs[i]); + } - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/fixtures/h2_proxy.c b/test/core/end2end/fixtures/h2_proxy.c index 479db966cac..44083e26762 100644 --- a/test/core/end2end/fixtures/h2_proxy.c +++ b/test/core/end2end/fixtures/h2_proxy.c @@ -51,95 +51,82 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -typedef struct fullstack_fixture_data -{ +typedef struct fullstack_fixture_data { grpc_end2end_proxy *proxy; } fullstack_fixture_data; -static grpc_server * -create_proxy_server (const char *port) -{ - grpc_server *s = grpc_server_create (NULL, NULL); - GPR_ASSERT (grpc_server_add_insecure_http2_port (s, port)); +static grpc_server *create_proxy_server(const char *port) { + grpc_server *s = grpc_server_create(NULL, NULL); + GPR_ASSERT(grpc_server_add_insecure_http2_port(s, port)); return s; } -static grpc_channel * -create_proxy_client (const char *target) -{ - return grpc_insecure_channel_create (target, NULL, NULL); +static grpc_channel *create_proxy_client(const char *target) { + return grpc_insecure_channel_create(target, NULL, NULL); } -static const grpc_end2end_proxy_def proxy_def = { create_proxy_server, - create_proxy_client -}; +static const grpc_end2end_proxy_def proxy_def = {create_proxy_server, + create_proxy_client}; -static grpc_end2end_test_fixture -chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( + grpc_channel_args *client_args, grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data)); - memset (&f, 0, sizeof (f)); + fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data)); + memset(&f, 0, sizeof(f)); - ffd->proxy = grpc_end2end_proxy_create (&proxy_def); + ffd->proxy = grpc_end2end_proxy_create(&proxy_def); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create (NULL); + f.cq = grpc_completion_queue_create(NULL); return f; } -void -chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) -{ +void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *client_args) { fullstack_fixture_data *ffd = f->fixture_data; - f->client = grpc_insecure_channel_create (grpc_end2end_proxy_get_client_target (ffd->proxy), client_args, NULL); - GPR_ASSERT (f->client); + f->client = grpc_insecure_channel_create( + grpc_end2end_proxy_get_client_target(ffd->proxy), client_args, NULL); + GPR_ASSERT(f->client); } -void -chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) -{ +void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *server_args) { fullstack_fixture_data *ffd = f->fixture_data; - if (f->server) - { - grpc_server_destroy (f->server); - } - f->server = grpc_server_create (server_args, NULL); - grpc_server_register_completion_queue (f->server, f->cq, NULL); - GPR_ASSERT (grpc_server_add_insecure_http2_port (f->server, grpc_end2end_proxy_get_server_port (ffd->proxy))); - grpc_server_start (f->server); + if (f->server) { + grpc_server_destroy(f->server); + } + f->server = grpc_server_create(server_args, NULL); + grpc_server_register_completion_queue(f->server, f->cq, NULL); + GPR_ASSERT(grpc_server_add_insecure_http2_port( + f->server, grpc_end2end_proxy_get_server_port(ffd->proxy))); + grpc_server_start(f->server); } -void -chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f) -{ +void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) { fullstack_fixture_data *ffd = f->fixture_data; - grpc_end2end_proxy_destroy (ffd->proxy); - gpr_free (ffd); + grpc_end2end_proxy_destroy(ffd->proxy); + gpr_free(ffd); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/fullstack+proxy", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, - chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, - chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, + {"chttp2/fullstack+proxy", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, + chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, + chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, }; -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; - grpc_test_init (argc, argv); - grpc_init (); + grpc_test_init(argc, argv); + grpc_init(); - for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) - { - grpc_end2end_tests (configs[i]); - } + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(configs[i]); + } - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 2ba0c0793f2..1f5051f0aba 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -57,133 +57,127 @@ /* chttp2 transport that is immediately available (used for testing connected_channel without a client_channel */ -static void -server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx) -{ +static void server_setup_transport(void *ts, grpc_transport *transport, + grpc_mdctx *mdctx) { grpc_end2end_test_fixture *f = ts; static grpc_channel_filter const *extra_filters[] = { - &grpc_http_server_filter - }; + &grpc_http_server_filter}; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport (&exec_ctx, f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server)); - grpc_exec_ctx_finish (&exec_ctx); + grpc_server_setup_transport(&exec_ctx, f->server, transport, extra_filters, + GPR_ARRAY_SIZE(extra_filters), mdctx, + grpc_server_get_channel_args(f->server)); + grpc_exec_ctx_finish(&exec_ctx); } -typedef struct -{ +typedef struct { grpc_end2end_test_fixture *f; grpc_channel_args *client_args; } sp_client_setup; -static void -client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * transport, grpc_mdctx * mdctx) -{ +static void client_setup_transport(grpc_exec_ctx *exec_ctx, void *ts, + grpc_transport *transport, + grpc_mdctx *mdctx) { sp_client_setup *cs = ts; - const grpc_channel_filter *filters[] = { &grpc_http_client_filter, - &grpc_compress_filter, - &grpc_connected_channel_filter - }; - size_t nfilters = sizeof (filters) / sizeof (*filters); - grpc_channel *channel = grpc_channel_create_from_filters (exec_ctx, "socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1); + const grpc_channel_filter *filters[] = {&grpc_http_client_filter, + &grpc_compress_filter, + &grpc_connected_channel_filter}; + size_t nfilters = sizeof(filters) / sizeof(*filters); + grpc_channel *channel = + grpc_channel_create_from_filters(exec_ctx, "socketpair-target", filters, + nfilters, cs->client_args, mdctx, 1); cs->f->client = channel; - grpc_connected_channel_bind_transport (grpc_channel_get_channel_stack (channel), transport); + grpc_connected_channel_bind_transport(grpc_channel_get_channel_stack(channel), + transport); } -static grpc_end2end_test_fixture -chttp2_create_fixture_socketpair (grpc_channel_args * client_args, grpc_channel_args * server_args) -{ - grpc_endpoint_pair *sfd = gpr_malloc (sizeof (grpc_endpoint_pair)); +static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( + grpc_channel_args *client_args, grpc_channel_args *server_args) { + grpc_endpoint_pair *sfd = gpr_malloc(sizeof(grpc_endpoint_pair)); grpc_end2end_test_fixture f; - memset (&f, 0, sizeof (f)); + memset(&f, 0, sizeof(f)); f.fixture_data = sfd; - f.cq = grpc_completion_queue_create (NULL); + f.cq = grpc_completion_queue_create(NULL); - *sfd = grpc_iomgr_create_endpoint_pair ("fixture", 65536); + *sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536); return f; } -static void -chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) -{ +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_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; - grpc_mdctx *mdctx = grpc_mdctx_create (); + grpc_mdctx *mdctx = grpc_mdctx_create(); sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport (&exec_ctx, client_args, sfd->client, mdctx, 1); - client_setup_transport (&exec_ctx, &cs, transport, mdctx); - GPR_ASSERT (f->client); - grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0); - grpc_exec_ctx_finish (&exec_ctx); + transport = grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client, + mdctx, 1); + client_setup_transport(&exec_ctx, &cs, transport, mdctx); + GPR_ASSERT(f->client); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL, 0); + grpc_exec_ctx_finish(&exec_ctx); } -static void -chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) -{ +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_endpoint_pair *sfd = f->fixture_data; - grpc_mdctx *mdctx = grpc_mdctx_create (); + grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_transport *transport; - GPR_ASSERT (!f->server); - f->server = grpc_server_create_from_filters (NULL, 0, server_args); - 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, mdctx, 0); - server_setup_transport (f, transport, mdctx); - grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0); - grpc_exec_ctx_finish (&exec_ctx); + GPR_ASSERT(!f->server); + f->server = grpc_server_create_from_filters(NULL, 0, server_args); + 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, + mdctx, 0); + server_setup_transport(f, transport, mdctx); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL, 0); + grpc_exec_ctx_finish(&exec_ctx); } -static void -chttp2_tear_down_socketpair (grpc_end2end_test_fixture * f) -{ - gpr_free (f->fixture_data); +static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { + gpr_free(f->fixture_data); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/socketpair", 0, chttp2_create_fixture_socketpair, - chttp2_init_client_socketpair, chttp2_init_server_socketpair, - chttp2_tear_down_socketpair}, + {"chttp2/socketpair", 0, chttp2_create_fixture_socketpair, + chttp2_init_client_socketpair, chttp2_init_server_socketpair, + chttp2_tear_down_socketpair}, }; -int -main (int argc, char **argv) -{ +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 */ - gpr_setenv ("GRPC_TRACE", "doesnt-exist,http,all"); + gpr_setenv("GRPC_TRACE", "doesnt-exist,http,all"); #ifdef GPR_POSIX_SOCKET - g_fixture_slowdown_factor = isatty (STDOUT_FILENO) ? 10.0 : 1.0; + g_fixture_slowdown_factor = isatty(STDOUT_FILENO) ? 10.0 : 1.0; #else g_fixture_slowdown_factor = 10.0; #endif - grpc_test_init (argc, argv); - grpc_init (); - grpc_exec_ctx_finish (&exec_ctx); + grpc_test_init(argc, argv); + 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)); - GPR_ASSERT (1 == grpc_tracer_set_enabled ("all", 1)); + GPR_ASSERT(0 == grpc_tracer_set_enabled("also-doesnt-exist", 0)); + GPR_ASSERT(1 == grpc_tracer_set_enabled("http", 1)); + GPR_ASSERT(1 == grpc_tracer_set_enabled("all", 1)); - for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) - { - grpc_end2end_tests (configs[i]); - } + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(configs[i]); + } - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index c0296a1b09b..b61fe986107 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -56,118 +56,112 @@ /* chttp2 transport that is immediately available (used for testing connected_channel without a client_channel */ -static void -server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx) -{ +static void server_setup_transport(void *ts, grpc_transport *transport, + grpc_mdctx *mdctx) { grpc_end2end_test_fixture *f = ts; static grpc_channel_filter const *extra_filters[] = { - &grpc_http_server_filter - }; + &grpc_http_server_filter}; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport (&exec_ctx, f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server)); - grpc_exec_ctx_finish (&exec_ctx); + grpc_server_setup_transport(&exec_ctx, f->server, transport, extra_filters, + GPR_ARRAY_SIZE(extra_filters), mdctx, + grpc_server_get_channel_args(f->server)); + grpc_exec_ctx_finish(&exec_ctx); } -typedef struct -{ +typedef struct { grpc_end2end_test_fixture *f; grpc_channel_args *client_args; } sp_client_setup; -static void -client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * transport, grpc_mdctx * mdctx) -{ +static void client_setup_transport(grpc_exec_ctx *exec_ctx, void *ts, + grpc_transport *transport, + grpc_mdctx *mdctx) { sp_client_setup *cs = ts; - const grpc_channel_filter *filters[] = { &grpc_http_client_filter, - &grpc_compress_filter, - &grpc_connected_channel_filter - }; - size_t nfilters = sizeof (filters) / sizeof (*filters); - grpc_channel *channel = grpc_channel_create_from_filters (exec_ctx,"socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1); + const grpc_channel_filter *filters[] = {&grpc_http_client_filter, + &grpc_compress_filter, + &grpc_connected_channel_filter}; + size_t nfilters = sizeof(filters) / sizeof(*filters); + grpc_channel *channel = + grpc_channel_create_from_filters(exec_ctx, "socketpair-target", filters, + nfilters, cs->client_args, mdctx, 1); cs->f->client = channel; - grpc_connected_channel_bind_transport (grpc_channel_get_channel_stack (channel), transport); + grpc_connected_channel_bind_transport(grpc_channel_get_channel_stack(channel), + transport); } -static grpc_end2end_test_fixture -chttp2_create_fixture_socketpair (grpc_channel_args * client_args, grpc_channel_args * server_args) -{ - grpc_endpoint_pair *sfd = gpr_malloc (sizeof (grpc_endpoint_pair)); +static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( + grpc_channel_args *client_args, grpc_channel_args *server_args) { + grpc_endpoint_pair *sfd = gpr_malloc(sizeof(grpc_endpoint_pair)); grpc_end2end_test_fixture f; - memset (&f, 0, sizeof (f)); + memset(&f, 0, sizeof(f)); f.fixture_data = sfd; - f.cq = grpc_completion_queue_create (NULL); + f.cq = grpc_completion_queue_create(NULL); - *sfd = grpc_iomgr_create_endpoint_pair ("fixture", 65536); + *sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536); return f; } -static void -chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) -{ +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_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; - grpc_mdctx *mdctx = grpc_mdctx_create (); + grpc_mdctx *mdctx = grpc_mdctx_create(); sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport (&exec_ctx, client_args, sfd->client, mdctx, 1); - client_setup_transport (&exec_ctx, &cs, transport, mdctx); - GPR_ASSERT (f->client); - grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0); - grpc_exec_ctx_finish (&exec_ctx); + transport = grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client, + mdctx, 1); + client_setup_transport(&exec_ctx, &cs, transport, mdctx); + GPR_ASSERT(f->client); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL, 0); + grpc_exec_ctx_finish(&exec_ctx); } -static void -chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) -{ +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_endpoint_pair *sfd = f->fixture_data; - grpc_mdctx *mdctx = grpc_mdctx_create (); + grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_transport *transport; - GPR_ASSERT (!f->server); - f->server = grpc_server_create_from_filters (NULL, 0, server_args); - 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, mdctx, 0); - server_setup_transport (f, transport, mdctx); - grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0); - grpc_exec_ctx_finish (&exec_ctx); + GPR_ASSERT(!f->server); + f->server = grpc_server_create_from_filters(NULL, 0, server_args); + 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, + mdctx, 0); + server_setup_transport(f, transport, mdctx); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL, 0); + grpc_exec_ctx_finish(&exec_ctx); } -static void -chttp2_tear_down_socketpair (grpc_end2end_test_fixture * f) -{ - gpr_free (f->fixture_data); +static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { + gpr_free(f->fixture_data); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/socketpair", 0, chttp2_create_fixture_socketpair, - chttp2_init_client_socketpair, chttp2_init_server_socketpair, - chttp2_tear_down_socketpair}, + {"chttp2/socketpair", 0, chttp2_create_fixture_socketpair, + chttp2_init_client_socketpair, chttp2_init_server_socketpair, + chttp2_tear_down_socketpair}, }; -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; - grpc_test_init (argc, argv); - grpc_init (); + grpc_test_init(argc, argv); + grpc_init(); - for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) - { - grpc_end2end_tests (configs[i]); - } + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(configs[i]); + } - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 1f39499d09a..9f0fd2ea9a5 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -56,118 +56,112 @@ /* chttp2 transport that is immediately available (used for testing connected_channel without a client_channel */ -static void -server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx) -{ +static void server_setup_transport(void *ts, grpc_transport *transport, + grpc_mdctx *mdctx) { grpc_end2end_test_fixture *f = ts; static grpc_channel_filter const *extra_filters[] = { - &grpc_http_server_filter - }; + &grpc_http_server_filter}; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport (&exec_ctx, f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server)); - grpc_exec_ctx_finish (&exec_ctx); + grpc_server_setup_transport(&exec_ctx, f->server, transport, extra_filters, + GPR_ARRAY_SIZE(extra_filters), mdctx, + grpc_server_get_channel_args(f->server)); + grpc_exec_ctx_finish(&exec_ctx); } -typedef struct -{ +typedef struct { grpc_end2end_test_fixture *f; grpc_channel_args *client_args; } sp_client_setup; -static void -client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * transport, grpc_mdctx * mdctx) -{ +static void client_setup_transport(grpc_exec_ctx *exec_ctx, void *ts, + grpc_transport *transport, + grpc_mdctx *mdctx) { sp_client_setup *cs = ts; - const grpc_channel_filter *filters[] = { &grpc_http_client_filter, - &grpc_compress_filter, - &grpc_connected_channel_filter - }; - size_t nfilters = sizeof (filters) / sizeof (*filters); - grpc_channel *channel = grpc_channel_create_from_filters (exec_ctx, "socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1); + const grpc_channel_filter *filters[] = {&grpc_http_client_filter, + &grpc_compress_filter, + &grpc_connected_channel_filter}; + size_t nfilters = sizeof(filters) / sizeof(*filters); + grpc_channel *channel = + grpc_channel_create_from_filters(exec_ctx, "socketpair-target", filters, + nfilters, cs->client_args, mdctx, 1); cs->f->client = channel; - grpc_connected_channel_bind_transport (grpc_channel_get_channel_stack (channel), transport); + grpc_connected_channel_bind_transport(grpc_channel_get_channel_stack(channel), + transport); } -static grpc_end2end_test_fixture -chttp2_create_fixture_socketpair (grpc_channel_args * client_args, grpc_channel_args * server_args) -{ - grpc_endpoint_pair *sfd = gpr_malloc (sizeof (grpc_endpoint_pair)); +static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( + grpc_channel_args *client_args, grpc_channel_args *server_args) { + grpc_endpoint_pair *sfd = gpr_malloc(sizeof(grpc_endpoint_pair)); grpc_end2end_test_fixture f; - memset (&f, 0, sizeof (f)); + memset(&f, 0, sizeof(f)); f.fixture_data = sfd; - f.cq = grpc_completion_queue_create (NULL); + f.cq = grpc_completion_queue_create(NULL); - *sfd = grpc_iomgr_create_endpoint_pair ("fixture", 1); + *sfd = grpc_iomgr_create_endpoint_pair("fixture", 1); return f; } -static void -chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) -{ +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_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; - grpc_mdctx *mdctx = grpc_mdctx_create (); + grpc_mdctx *mdctx = grpc_mdctx_create(); sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport (&exec_ctx, client_args, sfd->client, mdctx, 1); - client_setup_transport (&exec_ctx, &cs, transport, mdctx); - GPR_ASSERT (f->client); - grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0); - grpc_exec_ctx_finish (&exec_ctx); + transport = grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client, + mdctx, 1); + client_setup_transport(&exec_ctx, &cs, transport, mdctx); + GPR_ASSERT(f->client); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL, 0); + grpc_exec_ctx_finish(&exec_ctx); } -static void -chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) -{ +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_endpoint_pair *sfd = f->fixture_data; - grpc_mdctx *mdctx = grpc_mdctx_create (); + grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_transport *transport; - GPR_ASSERT (!f->server); - f->server = grpc_server_create_from_filters (NULL, 0, server_args); - 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, mdctx, 0); - server_setup_transport (f, transport, mdctx); - grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0); - grpc_exec_ctx_finish (&exec_ctx); + GPR_ASSERT(!f->server); + f->server = grpc_server_create_from_filters(NULL, 0, server_args); + 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, + mdctx, 0); + server_setup_transport(f, transport, mdctx); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL, 0); + grpc_exec_ctx_finish(&exec_ctx); } -static void -chttp2_tear_down_socketpair (grpc_end2end_test_fixture * f) -{ - gpr_free (f->fixture_data); +static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { + gpr_free(f->fixture_data); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/socketpair_one_byte_at_a_time", 0, - chttp2_create_fixture_socketpair, chttp2_init_client_socketpair, - chttp2_init_server_socketpair, chttp2_tear_down_socketpair}, + {"chttp2/socketpair_one_byte_at_a_time", 0, + chttp2_create_fixture_socketpair, chttp2_init_client_socketpair, + chttp2_init_server_socketpair, chttp2_tear_down_socketpair}, }; -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; - grpc_test_init (argc, argv); - grpc_init (); + grpc_test_init(argc, argv); + grpc_init(); - for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) - { - grpc_end2end_tests (configs[i]); - } + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(configs[i]); + } - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/fixtures/h2_ssl+poll.c b/test/core/end2end/fixtures/h2_ssl+poll.c index 55c12a37ca2..2c605d1471c 100644 --- a/test/core/end2end/fixtures/h2_ssl+poll.c +++ b/test/core/end2end/fixtures/h2_ssl+poll.c @@ -48,153 +48,145 @@ #include "test/core/util/port.h" #include "test/core/end2end/data/ssl_test_data.h" -typedef struct fullstack_secure_fixture_data -{ +typedef struct fullstack_secure_fixture_data { char *localaddr; } fullstack_secure_fixture_data; -static grpc_end2end_test_fixture -chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( + grpc_channel_args *client_args, grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - int port = grpc_pick_unused_port_or_die (); - fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data)); - memset (&f, 0, sizeof (f)); + int port = grpc_pick_unused_port_or_die(); + fullstack_secure_fixture_data *ffd = + gpr_malloc(sizeof(fullstack_secure_fixture_data)); + memset(&f, 0, sizeof(f)); - gpr_join_host_port (&ffd->localaddr, "localhost", port); + gpr_join_host_port(&ffd->localaddr, "localhost", port); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create (NULL); + f.cq = grpc_completion_queue_create(NULL); return f; } -static void -process_auth_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data) -{ - GPR_ASSERT (state == NULL); - cb (user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); +static void process_auth_failure(void *state, grpc_auth_context *ctx, + const grpc_metadata *md, size_t md_count, + grpc_process_auth_metadata_done_cb cb, + void *user_data) { + GPR_ASSERT(state == NULL); + cb(user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); } -static void -chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds) -{ +static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *client_args, + grpc_credentials *creds) { fullstack_secure_fixture_data *ffd = f->fixture_data; - f->client = grpc_secure_channel_create (creds, ffd->localaddr, client_args, NULL); - GPR_ASSERT (f->client != NULL); - grpc_credentials_release (creds); + f->client = + grpc_secure_channel_create(creds, ffd->localaddr, client_args, NULL); + GPR_ASSERT(f->client != NULL); + grpc_credentials_release(creds); } -static void -chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds) -{ +static void chttp2_init_server_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *server_args, + grpc_server_credentials *server_creds) { fullstack_secure_fixture_data *ffd = f->fixture_data; - if (f->server) - { - grpc_server_destroy (f->server); - } - f->server = grpc_server_create (server_args, NULL); - grpc_server_register_completion_queue (f->server, f->cq, NULL); - GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, ffd->localaddr, server_creds)); - grpc_server_credentials_release (server_creds); - grpc_server_start (f->server); + if (f->server) { + grpc_server_destroy(f->server); + } + f->server = grpc_server_create(server_args, NULL); + grpc_server_register_completion_queue(f->server, f->cq, NULL); + GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr, + server_creds)); + grpc_server_credentials_release(server_creds); + grpc_server_start(f->server); } -void -chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f) -{ +void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { fullstack_secure_fixture_data *ffd = f->fixture_data; - gpr_free (ffd->localaddr); - gpr_free (ffd); + gpr_free(ffd->localaddr); + gpr_free(ffd); } -static void -chttp2_init_client_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) -{ - grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL); - grpc_arg ssl_name_override = { GRPC_ARG_STRING, - GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, - {"foo.test.google.fr"} - }; - 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_creds); - grpc_channel_args_destroy (new_client_args); +static void chttp2_init_client_simple_ssl_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { + grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL); + grpc_arg ssl_name_override = {GRPC_ARG_STRING, + GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, + {"foo.test.google.fr"}}; + 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_creds); + grpc_channel_args_destroy(new_client_args); } -static int -fail_server_auth_check (grpc_channel_args * server_args) -{ +static int fail_server_auth_check(grpc_channel_args *server_args) { size_t i; - if (server_args == NULL) - return 0; - for (i = 0; i < server_args->num_args; i++) - { - if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0) - { - return 1; - } + if (server_args == NULL) return 0; + for (i = 0; i < server_args->num_args; i++) { + if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == + 0) { + return 1; } + } return 0; } -static void -chttp2_init_server_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) -{ - grpc_ssl_pem_key_cert_pair pem_cert_key_pair = { test_server1_key, - test_server1_cert - }; - grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_cert_key_pair, 1, 0, NULL); - if (fail_server_auth_check (server_args)) - { - grpc_auth_metadata_processor processor = { process_auth_failure, NULL, NULL }; - grpc_server_credentials_set_auth_metadata_processor (ssl_creds, processor); - } - chttp2_init_server_secure_fullstack (f, server_args, ssl_creds); +static void chttp2_init_server_simple_ssl_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { + grpc_ssl_pem_key_cert_pair pem_cert_key_pair = {test_server1_key, + test_server1_cert}; + grpc_server_credentials *ssl_creds = + grpc_ssl_server_credentials_create(NULL, &pem_cert_key_pair, 1, 0, NULL); + if (fail_server_auth_check(server_args)) { + grpc_auth_metadata_processor processor = {process_auth_failure, NULL, NULL}; + grpc_server_credentials_set_auth_metadata_processor(ssl_creds, processor); + } + chttp2_init_server_secure_fullstack(f, server_args, ssl_creds); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/simple_ssl_fullstack", - FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, - chttp2_create_fixture_secure_fullstack, - chttp2_init_client_simple_ssl_secure_fullstack, - chttp2_init_server_simple_ssl_secure_fullstack, - chttp2_tear_down_secure_fullstack}, + {"chttp2/simple_ssl_fullstack", + FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | + FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | + FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, + chttp2_create_fixture_secure_fullstack, + chttp2_init_client_simple_ssl_secure_fullstack, + chttp2_init_server_simple_ssl_secure_fullstack, + chttp2_tear_down_secure_fullstack}, }; -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; FILE *roots_file; - size_t roots_size = strlen (test_root_cert); + size_t roots_size = strlen(test_root_cert); char *roots_filename; grpc_platform_become_multipoller = grpc_poll_become_multipoller; - grpc_test_init (argc, argv); + grpc_test_init(argc, argv); /* Set the SSL roots env var. */ - roots_file = gpr_tmpfile ("chttp2_simple_ssl_with_poll_fullstack_test", &roots_filename); - GPR_ASSERT (roots_filename != NULL); - GPR_ASSERT (roots_file != NULL); - GPR_ASSERT (fwrite (test_root_cert, 1, roots_size, roots_file) == roots_size); - fclose (roots_file); - gpr_setenv (GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename); - - grpc_init (); - - for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) - { - grpc_end2end_tests (configs[i]); - } + roots_file = gpr_tmpfile("chttp2_simple_ssl_with_poll_fullstack_test", + &roots_filename); + GPR_ASSERT(roots_filename != NULL); + GPR_ASSERT(roots_file != NULL); + GPR_ASSERT(fwrite(test_root_cert, 1, roots_size, roots_file) == roots_size); + fclose(roots_file); + gpr_setenv(GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename); + + grpc_init(); + + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(configs[i]); + } - grpc_shutdown (); + grpc_shutdown(); /* Cleanup. */ - remove (roots_filename); - gpr_free (roots_filename); + remove(roots_filename); + gpr_free(roots_filename); return 0; } diff --git a/test/core/end2end/fixtures/h2_ssl.c b/test/core/end2end/fixtures/h2_ssl.c index 7752ff2703a..9193a09b178 100644 --- a/test/core/end2end/fixtures/h2_ssl.c +++ b/test/core/end2end/fixtures/h2_ssl.c @@ -48,151 +48,142 @@ #include "test/core/util/port.h" #include "test/core/end2end/data/ssl_test_data.h" -typedef struct fullstack_secure_fixture_data -{ +typedef struct fullstack_secure_fixture_data { char *localaddr; } fullstack_secure_fixture_data; -static grpc_end2end_test_fixture -chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( + grpc_channel_args *client_args, grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - int port = grpc_pick_unused_port_or_die (); - fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data)); - memset (&f, 0, sizeof (f)); + int port = grpc_pick_unused_port_or_die(); + fullstack_secure_fixture_data *ffd = + gpr_malloc(sizeof(fullstack_secure_fixture_data)); + memset(&f, 0, sizeof(f)); - gpr_join_host_port (&ffd->localaddr, "localhost", port); + gpr_join_host_port(&ffd->localaddr, "localhost", port); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create (NULL); + f.cq = grpc_completion_queue_create(NULL); return f; } -static void -process_auth_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data) -{ - GPR_ASSERT (state == NULL); - cb (user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); +static void process_auth_failure(void *state, grpc_auth_context *ctx, + const grpc_metadata *md, size_t md_count, + grpc_process_auth_metadata_done_cb cb, + void *user_data) { + GPR_ASSERT(state == NULL); + cb(user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); } -static void -chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds) -{ +static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *client_args, + grpc_credentials *creds) { fullstack_secure_fixture_data *ffd = f->fixture_data; - f->client = grpc_secure_channel_create (creds, ffd->localaddr, client_args, NULL); - GPR_ASSERT (f->client != NULL); - grpc_credentials_release (creds); + f->client = + grpc_secure_channel_create(creds, ffd->localaddr, client_args, NULL); + GPR_ASSERT(f->client != NULL); + grpc_credentials_release(creds); } -static void -chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds) -{ +static void chttp2_init_server_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *server_args, + grpc_server_credentials *server_creds) { fullstack_secure_fixture_data *ffd = f->fixture_data; - if (f->server) - { - grpc_server_destroy (f->server); - } - f->server = grpc_server_create (server_args, NULL); - grpc_server_register_completion_queue (f->server, f->cq, NULL); - GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, ffd->localaddr, server_creds)); - grpc_server_credentials_release (server_creds); - grpc_server_start (f->server); + if (f->server) { + grpc_server_destroy(f->server); + } + f->server = grpc_server_create(server_args, NULL); + grpc_server_register_completion_queue(f->server, f->cq, NULL); + GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr, + server_creds)); + grpc_server_credentials_release(server_creds); + grpc_server_start(f->server); } -void -chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f) -{ +void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { fullstack_secure_fixture_data *ffd = f->fixture_data; - gpr_free (ffd->localaddr); - gpr_free (ffd); + gpr_free(ffd->localaddr); + gpr_free(ffd); } -static void -chttp2_init_client_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) -{ - grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL); - grpc_arg ssl_name_override = { GRPC_ARG_STRING, - GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, - {"foo.test.google.fr"} - }; - 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_creds); - grpc_channel_args_destroy (new_client_args); +static void chttp2_init_client_simple_ssl_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { + grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL); + grpc_arg ssl_name_override = {GRPC_ARG_STRING, + GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, + {"foo.test.google.fr"}}; + 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_creds); + grpc_channel_args_destroy(new_client_args); } -static int -fail_server_auth_check (grpc_channel_args * server_args) -{ +static int fail_server_auth_check(grpc_channel_args *server_args) { size_t i; - if (server_args == NULL) - return 0; - for (i = 0; i < server_args->num_args; i++) - { - if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0) - { - return 1; - } + if (server_args == NULL) return 0; + for (i = 0; i < server_args->num_args; i++) { + if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == + 0) { + return 1; } + } return 0; } -static void -chttp2_init_server_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) -{ - grpc_ssl_pem_key_cert_pair pem_cert_key_pair = { test_server1_key, - test_server1_cert - }; - grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_cert_key_pair, 1, 0, NULL); - if (fail_server_auth_check (server_args)) - { - grpc_auth_metadata_processor processor = { process_auth_failure, NULL, NULL }; - grpc_server_credentials_set_auth_metadata_processor (ssl_creds, processor); - } - chttp2_init_server_secure_fullstack (f, server_args, ssl_creds); +static void chttp2_init_server_simple_ssl_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { + grpc_ssl_pem_key_cert_pair pem_cert_key_pair = {test_server1_key, + test_server1_cert}; + grpc_server_credentials *ssl_creds = + grpc_ssl_server_credentials_create(NULL, &pem_cert_key_pair, 1, 0, NULL); + if (fail_server_auth_check(server_args)) { + grpc_auth_metadata_processor processor = {process_auth_failure, NULL, NULL}; + grpc_server_credentials_set_auth_metadata_processor(ssl_creds, processor); + } + chttp2_init_server_secure_fullstack(f, server_args, ssl_creds); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/simple_ssl_fullstack", - FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, - chttp2_create_fixture_secure_fullstack, - chttp2_init_client_simple_ssl_secure_fullstack, - chttp2_init_server_simple_ssl_secure_fullstack, - chttp2_tear_down_secure_fullstack}, + {"chttp2/simple_ssl_fullstack", + FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | + FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | + FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, + chttp2_create_fixture_secure_fullstack, + chttp2_init_client_simple_ssl_secure_fullstack, + chttp2_init_server_simple_ssl_secure_fullstack, + chttp2_tear_down_secure_fullstack}, }; -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; FILE *roots_file; - size_t roots_size = strlen (test_root_cert); + size_t roots_size = strlen(test_root_cert); char *roots_filename; - grpc_test_init (argc, argv); + grpc_test_init(argc, argv); /* Set the SSL roots env var. */ - roots_file = gpr_tmpfile ("chttp2_simple_ssl_fullstack_test", &roots_filename); - GPR_ASSERT (roots_filename != NULL); - GPR_ASSERT (roots_file != NULL); - GPR_ASSERT (fwrite (test_root_cert, 1, roots_size, roots_file) == roots_size); - fclose (roots_file); - gpr_setenv (GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename); - - grpc_init (); - - for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) - { - grpc_end2end_tests (configs[i]); - } + roots_file = gpr_tmpfile("chttp2_simple_ssl_fullstack_test", &roots_filename); + GPR_ASSERT(roots_filename != NULL); + GPR_ASSERT(roots_file != NULL); + GPR_ASSERT(fwrite(test_root_cert, 1, roots_size, roots_file) == roots_size); + fclose(roots_file); + gpr_setenv(GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename); + + grpc_init(); + + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(configs[i]); + } - grpc_shutdown (); + grpc_shutdown(); /* Cleanup. */ - remove (roots_filename); - gpr_free (roots_filename); + remove(roots_filename); + gpr_free(roots_filename); return 0; } diff --git a/test/core/end2end/fixtures/h2_ssl_proxy.c b/test/core/end2end/fixtures/h2_ssl_proxy.c index ff82a0f2918..8133a69a0cd 100644 --- a/test/core/end2end/fixtures/h2_ssl_proxy.c +++ b/test/core/end2end/fixtures/h2_ssl_proxy.c @@ -49,184 +49,170 @@ #include "test/core/util/test_config.h" #include "test/core/util/port.h" -typedef struct fullstack_secure_fixture_data -{ +typedef struct fullstack_secure_fixture_data { grpc_end2end_proxy *proxy; } fullstack_secure_fixture_data; -static grpc_server * -create_proxy_server (const char *port) -{ - grpc_server *s = grpc_server_create (NULL, NULL); - grpc_ssl_pem_key_cert_pair pem_cert_key_pair = { test_server1_key, - test_server1_cert - }; - grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_cert_key_pair, 1, 0, NULL); - GPR_ASSERT (grpc_server_add_secure_http2_port (s, port, ssl_creds)); - grpc_server_credentials_release (ssl_creds); +static grpc_server *create_proxy_server(const char *port) { + grpc_server *s = grpc_server_create(NULL, NULL); + grpc_ssl_pem_key_cert_pair pem_cert_key_pair = {test_server1_key, + test_server1_cert}; + grpc_server_credentials *ssl_creds = + grpc_ssl_server_credentials_create(NULL, &pem_cert_key_pair, 1, 0, NULL); + GPR_ASSERT(grpc_server_add_secure_http2_port(s, port, ssl_creds)); + grpc_server_credentials_release(ssl_creds); return s; } -static grpc_channel * -create_proxy_client (const char *target) -{ +static grpc_channel *create_proxy_client(const char *target) { grpc_channel *channel; - grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL); - grpc_arg ssl_name_override = { GRPC_ARG_STRING, - GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, - {"foo.test.google.fr"} - }; + grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL); + grpc_arg ssl_name_override = {GRPC_ARG_STRING, + GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, + {"foo.test.google.fr"}}; grpc_channel_args client_args; client_args.num_args = 1; client_args.args = &ssl_name_override; - channel = grpc_secure_channel_create (ssl_creds, target, &client_args, NULL); - grpc_credentials_release (ssl_creds); + channel = grpc_secure_channel_create(ssl_creds, target, &client_args, NULL); + grpc_credentials_release(ssl_creds); return channel; } -static const grpc_end2end_proxy_def proxy_def = { create_proxy_server, - create_proxy_client -}; +static const grpc_end2end_proxy_def proxy_def = {create_proxy_server, + create_proxy_client}; -static grpc_end2end_test_fixture -chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( + grpc_channel_args *client_args, grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data)); - memset (&f, 0, sizeof (f)); + fullstack_secure_fixture_data *ffd = + gpr_malloc(sizeof(fullstack_secure_fixture_data)); + memset(&f, 0, sizeof(f)); - ffd->proxy = grpc_end2end_proxy_create (&proxy_def); + ffd->proxy = grpc_end2end_proxy_create(&proxy_def); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create (NULL); + f.cq = grpc_completion_queue_create(NULL); return f; } -static void -process_auth_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data) -{ - GPR_ASSERT (state == NULL); - cb (user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); +static void process_auth_failure(void *state, grpc_auth_context *ctx, + const grpc_metadata *md, size_t md_count, + grpc_process_auth_metadata_done_cb cb, + void *user_data) { + GPR_ASSERT(state == NULL); + cb(user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL); } -static void -chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds) -{ +static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *client_args, + grpc_credentials *creds) { fullstack_secure_fixture_data *ffd = f->fixture_data; - f->client = grpc_secure_channel_create (creds, grpc_end2end_proxy_get_client_target (ffd->proxy), client_args, NULL); - GPR_ASSERT (f->client != NULL); - grpc_credentials_release (creds); + f->client = grpc_secure_channel_create( + creds, grpc_end2end_proxy_get_client_target(ffd->proxy), client_args, + NULL); + GPR_ASSERT(f->client != NULL); + grpc_credentials_release(creds); } -static void -chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds) -{ +static void chttp2_init_server_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *server_args, + grpc_server_credentials *server_creds) { fullstack_secure_fixture_data *ffd = f->fixture_data; - if (f->server) - { - grpc_server_destroy (f->server); - } - f->server = grpc_server_create (server_args, NULL); - grpc_server_register_completion_queue (f->server, f->cq, NULL); - GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, grpc_end2end_proxy_get_server_port (ffd->proxy), server_creds)); - grpc_server_credentials_release (server_creds); - grpc_server_start (f->server); + if (f->server) { + grpc_server_destroy(f->server); + } + f->server = grpc_server_create(server_args, NULL); + grpc_server_register_completion_queue(f->server, f->cq, NULL); + GPR_ASSERT(grpc_server_add_secure_http2_port( + f->server, grpc_end2end_proxy_get_server_port(ffd->proxy), server_creds)); + grpc_server_credentials_release(server_creds); + grpc_server_start(f->server); } -void -chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f) -{ +void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { fullstack_secure_fixture_data *ffd = f->fixture_data; - grpc_end2end_proxy_destroy (ffd->proxy); - gpr_free (ffd); + grpc_end2end_proxy_destroy(ffd->proxy); + gpr_free(ffd); } -static void -chttp2_init_client_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) -{ - grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL); - grpc_arg ssl_name_override = { GRPC_ARG_STRING, - GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, - {"foo.test.google.fr"} - }; - 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_creds); - grpc_channel_args_destroy (new_client_args); +static void chttp2_init_client_simple_ssl_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { + grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL); + grpc_arg ssl_name_override = {GRPC_ARG_STRING, + GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, + {"foo.test.google.fr"}}; + 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_creds); + grpc_channel_args_destroy(new_client_args); } -static int -fail_server_auth_check (grpc_channel_args * server_args) -{ +static int fail_server_auth_check(grpc_channel_args *server_args) { size_t i; - if (server_args == NULL) - return 0; - for (i = 0; i < server_args->num_args; i++) - { - if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0) - { - return 1; - } + if (server_args == NULL) return 0; + for (i = 0; i < server_args->num_args; i++) { + if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == + 0) { + return 1; } + } return 0; } -static void -chttp2_init_server_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) -{ - grpc_ssl_pem_key_cert_pair pem_cert_key_pair = { test_server1_key, - test_server1_cert - }; - grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_cert_key_pair, 1, 0, NULL); - if (fail_server_auth_check (server_args)) - { - grpc_auth_metadata_processor processor = { process_auth_failure, NULL, NULL }; - grpc_server_credentials_set_auth_metadata_processor (ssl_creds, processor); - } - chttp2_init_server_secure_fullstack (f, server_args, ssl_creds); +static void chttp2_init_server_simple_ssl_secure_fullstack( + grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { + grpc_ssl_pem_key_cert_pair pem_cert_key_pair = {test_server1_key, + test_server1_cert}; + grpc_server_credentials *ssl_creds = + grpc_ssl_server_credentials_create(NULL, &pem_cert_key_pair, 1, 0, NULL); + if (fail_server_auth_check(server_args)) { + grpc_auth_metadata_processor processor = {process_auth_failure, NULL, NULL}; + grpc_server_credentials_set_auth_metadata_processor(ssl_creds, processor); + } + chttp2_init_server_secure_fullstack(f, server_args, ssl_creds); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/simple_ssl_fullstack", - FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, - chttp2_create_fixture_secure_fullstack, - chttp2_init_client_simple_ssl_secure_fullstack, - chttp2_init_server_simple_ssl_secure_fullstack, - chttp2_tear_down_secure_fullstack}, + {"chttp2/simple_ssl_fullstack", + FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | + FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | + FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, + chttp2_create_fixture_secure_fullstack, + chttp2_init_client_simple_ssl_secure_fullstack, + chttp2_init_server_simple_ssl_secure_fullstack, + chttp2_tear_down_secure_fullstack}, }; -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; FILE *roots_file; - size_t roots_size = strlen (test_root_cert); + size_t roots_size = strlen(test_root_cert); char *roots_filename; - grpc_test_init (argc, argv); + grpc_test_init(argc, argv); /* Set the SSL roots env var. */ - roots_file = gpr_tmpfile ("chttp2_simple_ssl_fullstack_test", &roots_filename); - GPR_ASSERT (roots_filename != NULL); - GPR_ASSERT (roots_file != NULL); - GPR_ASSERT (fwrite (test_root_cert, 1, roots_size, roots_file) == roots_size); - fclose (roots_file); - gpr_setenv (GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename); - - grpc_init (); - - for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) - { - grpc_end2end_tests (configs[i]); - } + roots_file = gpr_tmpfile("chttp2_simple_ssl_fullstack_test", &roots_filename); + GPR_ASSERT(roots_filename != NULL); + GPR_ASSERT(roots_file != NULL); + GPR_ASSERT(fwrite(test_root_cert, 1, roots_size, roots_file) == roots_size); + fclose(roots_file); + gpr_setenv(GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename); + + grpc_init(); + + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(configs[i]); + } - grpc_shutdown (); + grpc_shutdown(); /* Cleanup. */ - remove (roots_filename); - gpr_free (roots_filename); + remove(roots_filename); + gpr_free(roots_filename); return 0; } diff --git a/test/core/end2end/fixtures/h2_uds+poll.c b/test/core/end2end/fixtures/h2_uds+poll.c index b2981fe0bcc..05b9ea09493 100644 --- a/test/core/end2end/fixtures/h2_uds+poll.c +++ b/test/core/end2end/fixtures/h2_uds+poll.c @@ -54,80 +54,71 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -typedef struct fullstack_fixture_data -{ +typedef struct fullstack_fixture_data { char *localaddr; } fullstack_fixture_data; static int unique = 1; -static grpc_end2end_test_fixture -chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( + grpc_channel_args *client_args, grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data)); - memset (&f, 0, sizeof (f)); + fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data)); + memset(&f, 0, sizeof(f)); - gpr_asprintf (&ffd->localaddr, "unix:/tmp/grpc_fullstack_test.%d.%d", getpid (), unique++); + gpr_asprintf(&ffd->localaddr, "unix:/tmp/grpc_fullstack_test.%d.%d", getpid(), + unique++); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create (NULL); + f.cq = grpc_completion_queue_create(NULL); return f; } -void -chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) -{ +void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *client_args) { fullstack_fixture_data *ffd = f->fixture_data; - f->client = grpc_insecure_channel_create (ffd->localaddr, client_args, NULL); + f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL); } -void -chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) -{ +void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *server_args) { fullstack_fixture_data *ffd = f->fixture_data; - if (f->server) - { - grpc_server_destroy (f->server); - } - f->server = grpc_server_create (server_args, NULL); - 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); + if (f->server) { + grpc_server_destroy(f->server); + } + f->server = grpc_server_create(server_args, NULL); + 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); } -void -chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f) -{ +void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) { fullstack_fixture_data *ffd = f->fixture_data; - gpr_free (ffd->localaddr); - gpr_free (ffd); + gpr_free(ffd->localaddr); + gpr_free(ffd); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/fullstack_uds", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, - chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, - chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, + {"chttp2/fullstack_uds", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, + chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, + chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, }; -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; grpc_platform_become_multipoller = grpc_poll_become_multipoller; - grpc_test_init (argc, argv); - grpc_init (); + grpc_test_init(argc, argv); + grpc_init(); - for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) - { - grpc_end2end_tests (configs[i]); - } + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(configs[i]); + } - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/fixtures/h2_uds.c b/test/core/end2end/fixtures/h2_uds.c index 6b664d3aeca..59d39bbb0fd 100644 --- a/test/core/end2end/fixtures/h2_uds.c +++ b/test/core/end2end/fixtures/h2_uds.c @@ -54,78 +54,69 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -typedef struct fullstack_fixture_data -{ +typedef struct fullstack_fixture_data { char *localaddr; } fullstack_fixture_data; static int unique = 1; -static grpc_end2end_test_fixture -chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( + grpc_channel_args *client_args, grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data)); - memset (&f, 0, sizeof (f)); + fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data)); + memset(&f, 0, sizeof(f)); - gpr_asprintf (&ffd->localaddr, "unix:/tmp/grpc_fullstack_test.%d.%d", getpid (), unique++); + gpr_asprintf(&ffd->localaddr, "unix:/tmp/grpc_fullstack_test.%d.%d", getpid(), + unique++); f.fixture_data = ffd; - f.cq = grpc_completion_queue_create (NULL); + f.cq = grpc_completion_queue_create(NULL); return f; } -void -chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args) -{ +void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *client_args) { fullstack_fixture_data *ffd = f->fixture_data; - f->client = grpc_insecure_channel_create (ffd->localaddr, client_args, NULL); + f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL); } -void -chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args) -{ +void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, + grpc_channel_args *server_args) { fullstack_fixture_data *ffd = f->fixture_data; - if (f->server) - { - grpc_server_destroy (f->server); - } - f->server = grpc_server_create (server_args, NULL); - 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); + if (f->server) { + grpc_server_destroy(f->server); + } + f->server = grpc_server_create(server_args, NULL); + 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); } -void -chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f) -{ +void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) { fullstack_fixture_data *ffd = f->fixture_data; - gpr_free (ffd->localaddr); - gpr_free (ffd); + gpr_free(ffd->localaddr); + gpr_free(ffd); } /* All test configurations */ static grpc_end2end_test_config configs[] = { - {"chttp2/fullstack_uds", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, - chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, - chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, + {"chttp2/fullstack_uds", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION, + chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, + chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, }; -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; - grpc_test_init (argc, argv); - grpc_init (); + grpc_test_init(argc, argv); + grpc_init(); - for (i = 0; i < sizeof (configs) / sizeof (*configs); i++) - { - grpc_end2end_tests (configs[i]); - } + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(configs[i]); + } - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/fixtures/proxy.c b/test/core/end2end/fixtures/proxy.c index 14a55fb8529..434e75dd15e 100644 --- a/test/core/end2end/fixtures/proxy.c +++ b/test/core/end2end/fixtures/proxy.c @@ -44,8 +44,7 @@ #include "test/core/util/port.h" -struct grpc_end2end_proxy -{ +struct grpc_end2end_proxy { gpr_thd_id thd; char *proxy_port; char *server_port; @@ -61,14 +60,12 @@ struct grpc_end2end_proxy grpc_metadata_array new_call_metadata; }; -typedef struct -{ - void (*func) (void *arg, int success); +typedef struct { + void (*func)(void *arg, int success); void *arg; } closure; -typedef struct -{ +typedef struct { gpr_refcount refs; grpc_end2end_proxy *proxy; @@ -89,383 +86,351 @@ typedef struct int c2p_server_cancelled; } proxy_call; -static void thread_main (void *arg); -static void request_call (grpc_end2end_proxy * proxy); +static void thread_main(void *arg); +static void request_call(grpc_end2end_proxy *proxy); -grpc_end2end_proxy * -grpc_end2end_proxy_create (const grpc_end2end_proxy_def * def) -{ - gpr_thd_options opt = gpr_thd_options_default (); - int proxy_port = grpc_pick_unused_port_or_die (); - int server_port = grpc_pick_unused_port_or_die (); +grpc_end2end_proxy *grpc_end2end_proxy_create( + const grpc_end2end_proxy_def *def) { + gpr_thd_options opt = gpr_thd_options_default(); + int proxy_port = grpc_pick_unused_port_or_die(); + int server_port = grpc_pick_unused_port_or_die(); - grpc_end2end_proxy *proxy = gpr_malloc (sizeof (*proxy)); - memset (proxy, 0, sizeof (*proxy)); + grpc_end2end_proxy *proxy = gpr_malloc(sizeof(*proxy)); + memset(proxy, 0, sizeof(*proxy)); - gpr_join_host_port (&proxy->proxy_port, "localhost", proxy_port); - gpr_join_host_port (&proxy->server_port, "localhost", server_port); + gpr_join_host_port(&proxy->proxy_port, "localhost", proxy_port); + gpr_join_host_port(&proxy->server_port, "localhost", server_port); - gpr_log (GPR_DEBUG, "PROXY ADDR:%s BACKEND:%s", proxy->proxy_port, proxy->server_port); + gpr_log(GPR_DEBUG, "PROXY ADDR:%s BACKEND:%s", proxy->proxy_port, + proxy->server_port); - proxy->cq = grpc_completion_queue_create (NULL); - proxy->server = def->create_server (proxy->proxy_port); - proxy->client = def->create_client (proxy->server_port); + proxy->cq = grpc_completion_queue_create(NULL); + proxy->server = def->create_server(proxy->proxy_port); + proxy->client = def->create_client(proxy->server_port); - grpc_server_register_completion_queue (proxy->server, proxy->cq, NULL); - grpc_server_start (proxy->server); + grpc_server_register_completion_queue(proxy->server, proxy->cq, NULL); + grpc_server_start(proxy->server); - gpr_thd_options_set_joinable (&opt); - GPR_ASSERT (gpr_thd_new (&proxy->thd, thread_main, proxy, &opt)); + gpr_thd_options_set_joinable(&opt); + GPR_ASSERT(gpr_thd_new(&proxy->thd, thread_main, proxy, &opt)); - request_call (proxy); + request_call(proxy); return proxy; } -static closure * -new_closure (void (*func) (void *arg, int success), void *arg) -{ - closure *cl = gpr_malloc (sizeof (*cl)); +static closure *new_closure(void (*func)(void *arg, int success), void *arg) { + closure *cl = gpr_malloc(sizeof(*cl)); cl->func = func; cl->arg = arg; return cl; } -static void -shutdown_complete (void *arg, int success) -{ +static void shutdown_complete(void *arg, int success) { grpc_end2end_proxy *proxy = arg; proxy->shutdown = 1; - grpc_completion_queue_shutdown (proxy->cq); + grpc_completion_queue_shutdown(proxy->cq); } -void -grpc_end2end_proxy_destroy (grpc_end2end_proxy * proxy) -{ - grpc_server_shutdown_and_notify (proxy->server, proxy->cq, new_closure (shutdown_complete, proxy)); - gpr_thd_join (proxy->thd); - gpr_free (proxy->proxy_port); - gpr_free (proxy->server_port); - grpc_server_destroy (proxy->server); - grpc_channel_destroy (proxy->client); - grpc_completion_queue_destroy (proxy->cq); - grpc_call_details_destroy (&proxy->new_call_details); - gpr_free (proxy); +void grpc_end2end_proxy_destroy(grpc_end2end_proxy *proxy) { + grpc_server_shutdown_and_notify(proxy->server, proxy->cq, + new_closure(shutdown_complete, proxy)); + gpr_thd_join(proxy->thd); + gpr_free(proxy->proxy_port); + gpr_free(proxy->server_port); + grpc_server_destroy(proxy->server); + grpc_channel_destroy(proxy->client); + grpc_completion_queue_destroy(proxy->cq); + grpc_call_details_destroy(&proxy->new_call_details); + gpr_free(proxy); } -static void -unrefpc (proxy_call * pc, const char *reason) -{ - if (gpr_unref (&pc->refs)) - { - grpc_call_destroy (pc->c2p); - grpc_call_destroy (pc->p2s); - grpc_metadata_array_destroy (&pc->c2p_initial_metadata); - grpc_metadata_array_destroy (&pc->p2s_initial_metadata); - grpc_metadata_array_destroy (&pc->p2s_trailing_metadata); - gpr_free (pc->p2s_status_details); - gpr_free (pc); - } +static void unrefpc(proxy_call *pc, const char *reason) { + if (gpr_unref(&pc->refs)) { + grpc_call_destroy(pc->c2p); + grpc_call_destroy(pc->p2s); + grpc_metadata_array_destroy(&pc->c2p_initial_metadata); + grpc_metadata_array_destroy(&pc->p2s_initial_metadata); + grpc_metadata_array_destroy(&pc->p2s_trailing_metadata); + gpr_free(pc->p2s_status_details); + gpr_free(pc); + } } -static void -refpc (proxy_call * pc, const char *reason) -{ - gpr_ref (&pc->refs); -} +static void refpc(proxy_call *pc, const char *reason) { gpr_ref(&pc->refs); } -static void -on_c2p_sent_initial_metadata (void *arg, int success) -{ +static void on_c2p_sent_initial_metadata(void *arg, int success) { proxy_call *pc = arg; - unrefpc (pc, "on_c2p_sent_initial_metadata"); + unrefpc(pc, "on_c2p_sent_initial_metadata"); } -static void -on_p2s_recv_initial_metadata (void *arg, int success) -{ +static void on_p2s_recv_initial_metadata(void *arg, int success) { proxy_call *pc = arg; grpc_op op; grpc_call_error err; - if (!pc->proxy->shutdown) - { - op.op = GRPC_OP_SEND_INITIAL_METADATA; - op.flags = 0; - op.reserved = NULL; - op.data.send_initial_metadata.count = pc->p2s_initial_metadata.count; - op.data.send_initial_metadata.metadata = pc->p2s_initial_metadata.metadata; - refpc (pc, "on_c2p_sent_initial_metadata"); - err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_sent_initial_metadata, pc), NULL); - GPR_ASSERT (err == GRPC_CALL_OK); - } - - unrefpc (pc, "on_p2s_recv_initial_metadata"); + if (!pc->proxy->shutdown) { + op.op = GRPC_OP_SEND_INITIAL_METADATA; + op.flags = 0; + op.reserved = NULL; + op.data.send_initial_metadata.count = pc->p2s_initial_metadata.count; + op.data.send_initial_metadata.metadata = pc->p2s_initial_metadata.metadata; + refpc(pc, "on_c2p_sent_initial_metadata"); + err = grpc_call_start_batch( + pc->c2p, &op, 1, new_closure(on_c2p_sent_initial_metadata, pc), NULL); + GPR_ASSERT(err == GRPC_CALL_OK); + } + + unrefpc(pc, "on_p2s_recv_initial_metadata"); } -static void -on_p2s_sent_initial_metadata (void *arg, int success) -{ +static void on_p2s_sent_initial_metadata(void *arg, int success) { proxy_call *pc = arg; - unrefpc (pc, "on_p2s_sent_initial_metadata"); + unrefpc(pc, "on_p2s_sent_initial_metadata"); } -static void on_c2p_recv_msg (void *arg, int success); +static void on_c2p_recv_msg(void *arg, int success); -static void -on_p2s_sent_message (void *arg, int success) -{ +static void on_p2s_sent_message(void *arg, int success) { proxy_call *pc = arg; grpc_op op; grpc_call_error err; - grpc_byte_buffer_destroy (pc->c2p_msg); - if (!pc->proxy->shutdown && success) - { - op.op = GRPC_OP_RECV_MESSAGE; - op.flags = 0; - op.reserved = NULL; - op.data.recv_message = &pc->c2p_msg; - refpc (pc, "on_c2p_recv_msg"); - err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_recv_msg, pc), NULL); - GPR_ASSERT (err == GRPC_CALL_OK); - } - - unrefpc (pc, "on_p2s_sent_message"); + grpc_byte_buffer_destroy(pc->c2p_msg); + if (!pc->proxy->shutdown && success) { + op.op = GRPC_OP_RECV_MESSAGE; + op.flags = 0; + op.reserved = NULL; + op.data.recv_message = &pc->c2p_msg; + refpc(pc, "on_c2p_recv_msg"); + err = grpc_call_start_batch(pc->c2p, &op, 1, + new_closure(on_c2p_recv_msg, pc), NULL); + GPR_ASSERT(err == GRPC_CALL_OK); + } + + unrefpc(pc, "on_p2s_sent_message"); } -static void -on_p2s_sent_close (void *arg, int success) -{ +static void on_p2s_sent_close(void *arg, int success) { proxy_call *pc = arg; - unrefpc (pc, "on_p2s_sent_close"); + unrefpc(pc, "on_p2s_sent_close"); } -static void -on_c2p_recv_msg (void *arg, int success) -{ +static void on_c2p_recv_msg(void *arg, int success) { proxy_call *pc = arg; grpc_op op; grpc_call_error err; - if (!pc->proxy->shutdown && success) - { - if (pc->c2p_msg != NULL) - { - op.op = GRPC_OP_SEND_MESSAGE; - op.flags = 0; - op.reserved = NULL; - op.data.send_message = pc->c2p_msg; - refpc (pc, "on_p2s_sent_message"); - err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_sent_message, pc), NULL); - GPR_ASSERT (err == GRPC_CALL_OK); - } - else - { - op.op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; - op.flags = 0; - op.reserved = NULL; - refpc (pc, "on_p2s_sent_close"); - err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_sent_close, pc), NULL); - GPR_ASSERT (err == GRPC_CALL_OK); - } + if (!pc->proxy->shutdown && success) { + if (pc->c2p_msg != NULL) { + op.op = GRPC_OP_SEND_MESSAGE; + op.flags = 0; + op.reserved = NULL; + op.data.send_message = pc->c2p_msg; + refpc(pc, "on_p2s_sent_message"); + err = grpc_call_start_batch(pc->p2s, &op, 1, + new_closure(on_p2s_sent_message, pc), NULL); + GPR_ASSERT(err == GRPC_CALL_OK); + } else { + op.op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; + op.flags = 0; + op.reserved = NULL; + refpc(pc, "on_p2s_sent_close"); + err = grpc_call_start_batch(pc->p2s, &op, 1, + new_closure(on_p2s_sent_close, pc), NULL); + GPR_ASSERT(err == GRPC_CALL_OK); } + } - unrefpc (pc, "on_c2p_recv_msg"); + unrefpc(pc, "on_c2p_recv_msg"); } -static void on_p2s_recv_msg (void *arg, int success); +static void on_p2s_recv_msg(void *arg, int success); -static void -on_c2p_sent_message (void *arg, int success) -{ +static void on_c2p_sent_message(void *arg, int success) { proxy_call *pc = arg; grpc_op op; grpc_call_error err; - grpc_byte_buffer_destroy (pc->p2s_msg); - if (!pc->proxy->shutdown && success) - { - op.op = GRPC_OP_RECV_MESSAGE; - op.flags = 0; - op.reserved = NULL; - op.data.recv_message = &pc->p2s_msg; - refpc (pc, "on_p2s_recv_msg"); - err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_recv_msg, pc), NULL); - GPR_ASSERT (err == GRPC_CALL_OK); - } - - unrefpc (pc, "on_c2p_sent_message"); + grpc_byte_buffer_destroy(pc->p2s_msg); + if (!pc->proxy->shutdown && success) { + op.op = GRPC_OP_RECV_MESSAGE; + op.flags = 0; + op.reserved = NULL; + op.data.recv_message = &pc->p2s_msg; + refpc(pc, "on_p2s_recv_msg"); + err = grpc_call_start_batch(pc->p2s, &op, 1, + new_closure(on_p2s_recv_msg, pc), NULL); + GPR_ASSERT(err == GRPC_CALL_OK); + } + + unrefpc(pc, "on_c2p_sent_message"); } -static void -on_p2s_recv_msg (void *arg, int success) -{ +static void on_p2s_recv_msg(void *arg, int success) { proxy_call *pc = arg; grpc_op op; grpc_call_error err; - if (!pc->proxy->shutdown && success && pc->p2s_msg) - { - op.op = GRPC_OP_SEND_MESSAGE; - op.flags = 0; - op.reserved = NULL; - op.data.send_message = pc->p2s_msg; - refpc (pc, "on_c2p_sent_message"); - err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_sent_message, pc), NULL); - GPR_ASSERT (err == GRPC_CALL_OK); - } - unrefpc (pc, "on_p2s_recv_msg"); + if (!pc->proxy->shutdown && success && pc->p2s_msg) { + op.op = GRPC_OP_SEND_MESSAGE; + op.flags = 0; + op.reserved = NULL; + op.data.send_message = pc->p2s_msg; + refpc(pc, "on_c2p_sent_message"); + err = grpc_call_start_batch(pc->c2p, &op, 1, + new_closure(on_c2p_sent_message, pc), NULL); + GPR_ASSERT(err == GRPC_CALL_OK); + } + unrefpc(pc, "on_p2s_recv_msg"); } -static void -on_c2p_sent_status (void *arg, int success) -{ +static void on_c2p_sent_status(void *arg, int success) { proxy_call *pc = arg; - unrefpc (pc, "on_c2p_sent_status"); + unrefpc(pc, "on_c2p_sent_status"); } -static void -on_p2s_status (void *arg, int success) -{ +static void on_p2s_status(void *arg, int success) { proxy_call *pc = arg; grpc_op op; grpc_call_error err; - if (!pc->proxy->shutdown) - { - GPR_ASSERT (success); - op.op = GRPC_OP_SEND_STATUS_FROM_SERVER; - op.flags = 0; - op.reserved = NULL; - op.data.send_status_from_server.trailing_metadata_count = pc->p2s_trailing_metadata.count; - op.data.send_status_from_server.trailing_metadata = pc->p2s_trailing_metadata.metadata; - op.data.send_status_from_server.status = pc->p2s_status; - op.data.send_status_from_server.status_details = pc->p2s_status_details; - refpc (pc, "on_c2p_sent_status"); - err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_sent_status, pc), NULL); - GPR_ASSERT (err == GRPC_CALL_OK); - } - - unrefpc (pc, "on_p2s_status"); + if (!pc->proxy->shutdown) { + GPR_ASSERT(success); + op.op = GRPC_OP_SEND_STATUS_FROM_SERVER; + op.flags = 0; + op.reserved = NULL; + op.data.send_status_from_server.trailing_metadata_count = + pc->p2s_trailing_metadata.count; + op.data.send_status_from_server.trailing_metadata = + pc->p2s_trailing_metadata.metadata; + op.data.send_status_from_server.status = pc->p2s_status; + op.data.send_status_from_server.status_details = pc->p2s_status_details; + refpc(pc, "on_c2p_sent_status"); + err = grpc_call_start_batch(pc->c2p, &op, 1, + new_closure(on_c2p_sent_status, pc), NULL); + GPR_ASSERT(err == GRPC_CALL_OK); + } + + unrefpc(pc, "on_p2s_status"); } -static void -on_c2p_closed (void *arg, int success) -{ +static void on_c2p_closed(void *arg, int success) { proxy_call *pc = arg; - unrefpc (pc, "on_c2p_closed"); + unrefpc(pc, "on_c2p_closed"); } -static void -on_new_call (void *arg, int success) -{ +static void on_new_call(void *arg, int success) { grpc_end2end_proxy *proxy = arg; grpc_call_error err; - if (success) - { - grpc_op op; - proxy_call *pc = gpr_malloc (sizeof (*pc)); - memset (pc, 0, sizeof (*pc)); - pc->proxy = proxy; - GPR_SWAP (grpc_metadata_array, pc->c2p_initial_metadata, proxy->new_call_metadata); - pc->c2p = proxy->new_call; - pc->p2s = grpc_channel_create_call (proxy->client, pc->c2p, GRPC_PROPAGATE_DEFAULTS, proxy->cq, proxy->new_call_details.method, proxy->new_call_details.host, proxy->new_call_details.deadline, NULL); - gpr_ref_init (&pc->refs, 1); - - op.flags = 0; - op.reserved = NULL; - - op.op = GRPC_OP_RECV_INITIAL_METADATA; - op.data.recv_initial_metadata = &pc->p2s_initial_metadata; - refpc (pc, "on_p2s_recv_initial_metadata"); - err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_recv_initial_metadata, pc), NULL); - GPR_ASSERT (err == GRPC_CALL_OK); - - op.op = GRPC_OP_SEND_INITIAL_METADATA; - op.data.send_initial_metadata.count = pc->c2p_initial_metadata.count; - op.data.send_initial_metadata.metadata = pc->c2p_initial_metadata.metadata; - refpc (pc, "on_p2s_sent_initial_metadata"); - err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_sent_initial_metadata, pc), NULL); - GPR_ASSERT (err == GRPC_CALL_OK); - - op.op = GRPC_OP_RECV_MESSAGE; - op.data.recv_message = &pc->c2p_msg; - refpc (pc, "on_c2p_recv_msg"); - err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_recv_msg, pc), NULL); - GPR_ASSERT (err == GRPC_CALL_OK); - - op.op = GRPC_OP_RECV_MESSAGE; - op.data.recv_message = &pc->p2s_msg; - refpc (pc, "on_p2s_recv_msg"); - err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_recv_msg, pc), NULL); - GPR_ASSERT (err == GRPC_CALL_OK); - - op.op = GRPC_OP_RECV_STATUS_ON_CLIENT; - op.data.recv_status_on_client.trailing_metadata = &pc->p2s_trailing_metadata; - op.data.recv_status_on_client.status = &pc->p2s_status; - op.data.recv_status_on_client.status_details = &pc->p2s_status_details; - op.data.recv_status_on_client.status_details_capacity = &pc->p2s_status_details_capacity; - refpc (pc, "on_p2s_status"); - err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_status, pc), NULL); - GPR_ASSERT (err == GRPC_CALL_OK); - - op.op = GRPC_OP_RECV_CLOSE_ON_SERVER; - op.data.recv_close_on_server.cancelled = &pc->c2p_server_cancelled; - refpc (pc, "on_c2p_closed"); - err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_closed, pc), NULL); - GPR_ASSERT (err == GRPC_CALL_OK); - - request_call (proxy); - - unrefpc (pc, "init"); - } - else - { - GPR_ASSERT (proxy->new_call == NULL); - } + if (success) { + grpc_op op; + proxy_call *pc = gpr_malloc(sizeof(*pc)); + memset(pc, 0, sizeof(*pc)); + pc->proxy = proxy; + GPR_SWAP(grpc_metadata_array, pc->c2p_initial_metadata, + proxy->new_call_metadata); + pc->c2p = proxy->new_call; + pc->p2s = grpc_channel_create_call( + proxy->client, pc->c2p, GRPC_PROPAGATE_DEFAULTS, proxy->cq, + proxy->new_call_details.method, proxy->new_call_details.host, + proxy->new_call_details.deadline, NULL); + gpr_ref_init(&pc->refs, 1); + + op.flags = 0; + op.reserved = NULL; + + op.op = GRPC_OP_RECV_INITIAL_METADATA; + op.data.recv_initial_metadata = &pc->p2s_initial_metadata; + refpc(pc, "on_p2s_recv_initial_metadata"); + err = grpc_call_start_batch( + pc->p2s, &op, 1, new_closure(on_p2s_recv_initial_metadata, pc), NULL); + GPR_ASSERT(err == GRPC_CALL_OK); + + op.op = GRPC_OP_SEND_INITIAL_METADATA; + op.data.send_initial_metadata.count = pc->c2p_initial_metadata.count; + op.data.send_initial_metadata.metadata = pc->c2p_initial_metadata.metadata; + refpc(pc, "on_p2s_sent_initial_metadata"); + err = grpc_call_start_batch( + pc->p2s, &op, 1, new_closure(on_p2s_sent_initial_metadata, pc), NULL); + GPR_ASSERT(err == GRPC_CALL_OK); + + op.op = GRPC_OP_RECV_MESSAGE; + op.data.recv_message = &pc->c2p_msg; + refpc(pc, "on_c2p_recv_msg"); + err = grpc_call_start_batch(pc->c2p, &op, 1, + new_closure(on_c2p_recv_msg, pc), NULL); + GPR_ASSERT(err == GRPC_CALL_OK); + + op.op = GRPC_OP_RECV_MESSAGE; + op.data.recv_message = &pc->p2s_msg; + refpc(pc, "on_p2s_recv_msg"); + err = grpc_call_start_batch(pc->p2s, &op, 1, + new_closure(on_p2s_recv_msg, pc), NULL); + GPR_ASSERT(err == GRPC_CALL_OK); + + op.op = GRPC_OP_RECV_STATUS_ON_CLIENT; + op.data.recv_status_on_client.trailing_metadata = + &pc->p2s_trailing_metadata; + op.data.recv_status_on_client.status = &pc->p2s_status; + op.data.recv_status_on_client.status_details = &pc->p2s_status_details; + op.data.recv_status_on_client.status_details_capacity = + &pc->p2s_status_details_capacity; + refpc(pc, "on_p2s_status"); + err = grpc_call_start_batch(pc->p2s, &op, 1, new_closure(on_p2s_status, pc), + NULL); + GPR_ASSERT(err == GRPC_CALL_OK); + + op.op = GRPC_OP_RECV_CLOSE_ON_SERVER; + op.data.recv_close_on_server.cancelled = &pc->c2p_server_cancelled; + refpc(pc, "on_c2p_closed"); + err = grpc_call_start_batch(pc->c2p, &op, 1, new_closure(on_c2p_closed, pc), + NULL); + GPR_ASSERT(err == GRPC_CALL_OK); + + request_call(proxy); + + unrefpc(pc, "init"); + } else { + GPR_ASSERT(proxy->new_call == NULL); + } } -static void -request_call (grpc_end2end_proxy * proxy) -{ +static void request_call(grpc_end2end_proxy *proxy) { proxy->new_call = NULL; - GPR_ASSERT (GRPC_CALL_OK == grpc_server_request_call (proxy->server, &proxy->new_call, &proxy->new_call_details, &proxy->new_call_metadata, proxy->cq, proxy->cq, new_closure (on_new_call, proxy))); + GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call( + proxy->server, &proxy->new_call, + &proxy->new_call_details, + &proxy->new_call_metadata, proxy->cq, + proxy->cq, new_closure(on_new_call, proxy))); } -static void -thread_main (void *arg) -{ +static void thread_main(void *arg) { grpc_end2end_proxy *proxy = arg; closure *cl; - for (;;) - { - grpc_event ev = grpc_completion_queue_next (proxy->cq, gpr_inf_future (GPR_CLOCK_MONOTONIC), NULL); - switch (ev.type) - { - case GRPC_QUEUE_TIMEOUT: - gpr_log (GPR_ERROR, "Should never reach here"); - abort (); - case GRPC_QUEUE_SHUTDOWN: - return; - case GRPC_OP_COMPLETE: - cl = ev.tag; - cl->func (cl->arg, ev.success); - gpr_free (cl); - break; - } + for (;;) { + grpc_event ev = grpc_completion_queue_next( + proxy->cq, gpr_inf_future(GPR_CLOCK_MONOTONIC), NULL); + switch (ev.type) { + case GRPC_QUEUE_TIMEOUT: + gpr_log(GPR_ERROR, "Should never reach here"); + abort(); + case GRPC_QUEUE_SHUTDOWN: + return; + case GRPC_OP_COMPLETE: + cl = ev.tag; + cl->func(cl->arg, ev.success); + gpr_free(cl); + break; } + } } -const char * -grpc_end2end_proxy_get_client_target (grpc_end2end_proxy * proxy) -{ +const char *grpc_end2end_proxy_get_client_target(grpc_end2end_proxy *proxy) { return proxy->proxy_port; } -const char * -grpc_end2end_proxy_get_server_port (grpc_end2end_proxy * proxy) -{ +const char *grpc_end2end_proxy_get_server_port(grpc_end2end_proxy *proxy) { return proxy->server_port; } diff --git a/test/core/end2end/fixtures/proxy.h b/test/core/end2end/fixtures/proxy.h index 616fa1e10ee..c1cf01d39a4 100644 --- a/test/core/end2end/fixtures/proxy.h +++ b/test/core/end2end/fixtures/proxy.h @@ -40,16 +40,16 @@ typedef struct grpc_end2end_proxy grpc_end2end_proxy; -typedef struct grpc_end2end_proxy_def -{ - grpc_server *(*create_server) (const char *port); - grpc_channel *(*create_client) (const char *target); +typedef struct grpc_end2end_proxy_def { + grpc_server *(*create_server)(const char *port); + grpc_channel *(*create_client)(const char *target); } grpc_end2end_proxy_def; -grpc_end2end_proxy *grpc_end2end_proxy_create (const grpc_end2end_proxy_def * def); -void grpc_end2end_proxy_destroy (grpc_end2end_proxy * proxy); +grpc_end2end_proxy *grpc_end2end_proxy_create( + const grpc_end2end_proxy_def *def); +void grpc_end2end_proxy_destroy(grpc_end2end_proxy *proxy); -const char *grpc_end2end_proxy_get_client_target (grpc_end2end_proxy * proxy); -const char *grpc_end2end_proxy_get_server_port (grpc_end2end_proxy * proxy); +const char *grpc_end2end_proxy_get_client_target(grpc_end2end_proxy *proxy); +const char *grpc_end2end_proxy_get_server_port(grpc_end2end_proxy *proxy); #endif /* GRPC_TEST_CORE_END2END_FIXTURES_PROXY_H */ diff --git a/test/core/end2end/multiple_server_queues_test.c b/test/core/end2end/multiple_server_queues_test.c index 4d68a2d40df..5e2eaf4ae94 100644 --- a/test/core/end2end/multiple_server_queues_test.c +++ b/test/core/end2end/multiple_server_queues_test.c @@ -34,31 +34,30 @@ #include #include "test/core/util/test_config.h" -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { grpc_completion_queue *cq1; grpc_completion_queue *cq2; grpc_server *server; - grpc_test_init (argc, argv); - grpc_init (); - cq1 = grpc_completion_queue_create (NULL); - cq2 = grpc_completion_queue_create (NULL); - server = grpc_server_create (NULL, NULL); - grpc_server_register_completion_queue (server, cq1, NULL); - grpc_server_add_insecure_http2_port (server, "[::]:0"); - grpc_server_register_completion_queue (server, cq2, NULL); - grpc_server_start (server); - grpc_server_shutdown_and_notify (server, cq2, NULL); - grpc_completion_queue_next (cq2, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); /* cue queue hang */ - grpc_completion_queue_shutdown (cq1); - grpc_completion_queue_shutdown (cq2); - grpc_completion_queue_next (cq1, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); - grpc_completion_queue_next (cq2, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); - grpc_server_destroy (server); - grpc_completion_queue_destroy (cq1); - grpc_completion_queue_destroy (cq2); - grpc_shutdown (); + grpc_test_init(argc, argv); + grpc_init(); + cq1 = grpc_completion_queue_create(NULL); + cq2 = grpc_completion_queue_create(NULL); + server = grpc_server_create(NULL, NULL); + grpc_server_register_completion_queue(server, cq1, NULL); + grpc_server_add_insecure_http2_port(server, "[::]:0"); + grpc_server_register_completion_queue(server, cq2, NULL); + grpc_server_start(server); + grpc_server_shutdown_and_notify(server, cq2, NULL); + grpc_completion_queue_next(cq2, gpr_inf_future(GPR_CLOCK_REALTIME), + NULL); /* cue queue hang */ + grpc_completion_queue_shutdown(cq1); + grpc_completion_queue_shutdown(cq2); + grpc_completion_queue_next(cq1, gpr_inf_future(GPR_CLOCK_REALTIME), NULL); + grpc_completion_queue_next(cq2, gpr_inf_future(GPR_CLOCK_REALTIME), NULL); + grpc_server_destroy(server); + grpc_completion_queue_destroy(cq1); + grpc_completion_queue_destroy(cq2); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/no_server_test.c b/test/core/end2end/no_server_test.c index 45642dca2b3..c391003141b 100644 --- a/test/core/end2end/no_server_test.c +++ b/test/core/end2end/no_server_test.c @@ -37,18 +37,12 @@ #include "test/core/end2end/cq_verifier.h" #include "test/core/util/test_config.h" -static void * -tag (gpr_intptr i) -{ - return (void *) i; -} +static void *tag(gpr_intptr i) { return (void *)i; } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { grpc_channel *chan; grpc_call *call; - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (2); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(2); grpc_completion_queue *cq; cq_verifier *cqv; grpc_op ops[6]; @@ -58,17 +52,18 @@ main (int argc, char **argv) char *details = NULL; size_t details_capacity = 0; - grpc_test_init (argc, argv); - grpc_init (); + grpc_test_init(argc, argv); + grpc_init(); - grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); - cq = grpc_completion_queue_create (NULL); - cqv = cq_verifier_create (cq); + cq = grpc_completion_queue_create(NULL); + cqv = cq_verifier_create(cq); /* create a call, channel to a non existant server */ - chan = grpc_insecure_channel_create ("nonexistant:54321", NULL, NULL); - call = grpc_channel_create_call (chan, NULL, GRPC_PROPAGATE_DEFAULTS, cq, "/Foo", "nonexistant", deadline, NULL); + chan = grpc_insecure_channel_create("nonexistant:54321", NULL, NULL); + call = grpc_channel_create_call(chan, NULL, GRPC_PROPAGATE_DEFAULTS, cq, + "/Foo", "nonexistant", deadline, NULL); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -84,25 +79,28 @@ main (int argc, char **argv) op->flags = 0; op->reserved = NULL; op++; - GPR_ASSERT (GRPC_CALL_OK == grpc_call_start_batch (call, ops, (size_t) (op - ops), tag (1), NULL)); + GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch( + call, ops, (size_t)(op - ops), tag(1), NULL)); /* verify that all tags get completed */ - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_DEADLINE_EXCEEDED); + GPR_ASSERT(status == GRPC_STATUS_DEADLINE_EXCEEDED); - grpc_completion_queue_shutdown (cq); - while (grpc_completion_queue_next (cq, gpr_inf_future (GPR_CLOCK_REALTIME), NULL).type != GRPC_QUEUE_SHUTDOWN) + grpc_completion_queue_shutdown(cq); + while ( + grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), NULL) + .type != GRPC_QUEUE_SHUTDOWN) ; - grpc_completion_queue_destroy (cq); - grpc_call_destroy (call); - grpc_channel_destroy (chan); - cq_verifier_destroy (cqv); + grpc_completion_queue_destroy(cq); + grpc_call_destroy(call); + grpc_channel_destroy(chan); + cq_verifier_destroy(cqv); - gpr_free (details); - grpc_metadata_array_destroy (&trailing_metadata_recv); + gpr_free(details); + grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/tests/bad_hostname.c b/test/core/end2end/tests/bad_hostname.c index 901b4b2210b..93e2df1e43b 100644 --- a/test/core/end2end/tests/bad_hostname.c +++ b/test/core/end2end/tests/bad_hostname.c @@ -45,86 +45,64 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -simple_request_body (grpc_end2end_test_fixture f) -{ +static void simple_request_body(grpc_end2end_test_fixture f) { grpc_call *c; - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f.cq); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -136,13 +114,14 @@ simple_request_body (grpc_end2end_test_fixture f) char *details = NULL; size_t details_capacity = 0; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "slartibartfast.local", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "slartibartfast.local", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -167,41 +146,36 @@ simple_request_body (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_INVALID_ARGUMENT); + GPR_ASSERT(status == GRPC_STATUS_INVALID_ARGUMENT); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); + grpc_call_destroy(c); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); } -static void -test_invoke_simple_request (grpc_end2end_test_config config) -{ +static void test_invoke_simple_request(grpc_end2end_test_config config) { grpc_end2end_test_fixture f; - f = begin_test (config, "test_invoke_simple_request", NULL, NULL); - simple_request_body (f); - end_test (&f); - config.tear_down_data (&f); + f = begin_test(config, "test_invoke_simple_request", NULL, NULL); + simple_request_body(f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - if (config.feature_mask & FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION) - { - test_invoke_simple_request (config); - } +void grpc_end2end_tests(grpc_end2end_test_config config) { + if (config.feature_mask & FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION) { + test_invoke_simple_request(config); + } } diff --git a/test/core/end2end/tests/binary_metadata.c b/test/core/end2end/tests/binary_metadata.c index 2b32077847a..21e0bbcc49c 100644 --- a/test/core/end2end/tests/binary_metadata.c +++ b/test/core/end2end/tests/binary_metadata.c @@ -43,117 +43,97 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } /* Request/response with metadata and payload.*/ -static void -test_request_response_with_metadata_and_payload (grpc_end2end_test_config config) -{ +static void test_request_response_with_metadata_and_payload( + grpc_end2end_test_config config) { grpc_call *c; grpc_call *s; - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); - gpr_timespec deadline = five_seconds_time (); + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); + grpc_byte_buffer *response_payload = + grpc_raw_byte_buffer_create(&response_payload_slice, 1); + gpr_timespec deadline = five_seconds_time(); grpc_metadata meta_c[2] = { - {"key1-bin", - "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc", - 13, - 0, - {{NULL, NULL, NULL, NULL}}}, - {"key2-bin", - "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d", - 14, - 0, - {{NULL, NULL, NULL, NULL}}} - }; + {"key1-bin", + "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc", + 13, + 0, + {{NULL, NULL, NULL, NULL}}}, + {"key2-bin", + "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d", + 14, + 0, + {{NULL, NULL, NULL, NULL}}}}; grpc_metadata meta_s[2] = { - {"key3-bin", - "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee", - 15, - 0, - {{NULL, NULL, NULL, NULL}}}, - {"key4-bin", - "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", - 16, - 0, - {{NULL, NULL, NULL, NULL}}} - }; - grpc_end2end_test_fixture f = begin_test (config, "test_request_response_with_metadata_and_payload", NULL, NULL); - cq_verifier *cqv = cq_verifier_create (f.cq); + {"key3-bin", + "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee", + 15, + 0, + {{NULL, NULL, NULL, NULL}}}, + {"key4-bin", + "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", + 16, + 0, + {{NULL, NULL, NULL, NULL}}}}; + grpc_end2end_test_fixture f = begin_test( + config, "test_request_response_with_metadata_and_payload", NULL, NULL); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -168,13 +148,14 @@ test_request_response_with_metadata_and_payload (grpc_end2end_test_config config size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -210,13 +191,15 @@ test_request_response_with_metadata_and_payload (grpc_end2end_test_config config op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -230,11 +213,11 @@ test_request_response_with_metadata_and_payload (grpc_end2end_test_config config op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -254,47 +237,53 @@ test_request_response_with_metadata_and_payload (grpc_end2end_test_config config op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (103), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(103), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_OK); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); - GPR_ASSERT (was_cancelled == 0); - GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, "hello world")); - GPR_ASSERT (byte_buffer_eq_string (response_payload_recv, "hello you")); - GPR_ASSERT (contains_metadata (&request_metadata_recv, "key1-bin", "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc")); - GPR_ASSERT (contains_metadata (&request_metadata_recv, "key2-bin", "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d")); - GPR_ASSERT (contains_metadata (&initial_metadata_recv, "key3-bin", "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee")); - GPR_ASSERT (contains_metadata (&initial_metadata_recv, "key4-bin", "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff")); + GPR_ASSERT(status == GRPC_STATUS_OK); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); + GPR_ASSERT(was_cancelled == 0); + GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); + GPR_ASSERT(byte_buffer_eq_string(response_payload_recv, "hello you")); + GPR_ASSERT(contains_metadata( + &request_metadata_recv, "key1-bin", + "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc")); + GPR_ASSERT(contains_metadata( + &request_metadata_recv, "key2-bin", + "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d")); + GPR_ASSERT(contains_metadata( + &initial_metadata_recv, "key3-bin", + "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee")); + GPR_ASSERT(contains_metadata( + &initial_metadata_recv, "key4-bin", + "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff")); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (response_payload); - grpc_byte_buffer_destroy (request_payload_recv); - grpc_byte_buffer_destroy (response_payload_recv); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(response_payload); + grpc_byte_buffer_destroy(request_payload_recv); + grpc_byte_buffer_destroy(response_payload_recv); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_request_response_with_metadata_and_payload (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_request_response_with_metadata_and_payload(config); } diff --git a/test/core/end2end/tests/call_creds.c b/test/core/end2end/tests/call_creds.c index a8ec505ffb8..4e905aafc7a 100644 --- a/test/core/end2end/tests/call_creds.c +++ b/test/core/end2end/tests/call_creds.c @@ -51,147 +51,120 @@ static const char iam_selector[] = "selector"; static const char overridden_iam_token[] = "overridden_token"; static const char overridden_iam_selector[] = "overridden_selector"; -typedef enum -{ NONE, OVERRIDE, DESTROY } override_mode; +typedef enum { NONE, OVERRIDE, DESTROY } override_mode; -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, int fail_server_auth_check) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + int fail_server_auth_check) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (NULL, NULL); - config.init_client (&f, NULL); - if (fail_server_auth_check) - { - grpc_arg fail_auth_arg = { - GRPC_ARG_STRING, FAIL_AUTH_CHECK_SERVER_ARG_NAME, {NULL} - }; - grpc_channel_args args; - args.num_args = 1; - args.args = &fail_auth_arg; - config.init_server (&f, &args); - } - else - { - config.init_server (&f, NULL); - } + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(NULL, NULL); + config.init_client(&f, NULL); + if (fail_server_auth_check) { + grpc_arg fail_auth_arg = { + GRPC_ARG_STRING, FAIL_AUTH_CHECK_SERVER_ARG_NAME, {NULL}}; + grpc_channel_args args; + args.num_args = 1; + args.args = &fail_auth_arg; + config.init_server(&f, &args); + } else { + config.init_server(&f, NULL); + } return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -print_auth_context (int is_client, const grpc_auth_context * ctx) -{ +static void print_auth_context(int is_client, const grpc_auth_context *ctx) { const grpc_auth_property *p; grpc_auth_property_iterator it; - gpr_log (GPR_INFO, "%s peer:", is_client ? "client" : "server"); - gpr_log (GPR_INFO, "\tauthenticated: %s", grpc_auth_context_peer_is_authenticated (ctx) ? "YES" : "NO"); - it = grpc_auth_context_peer_identity (ctx); - while ((p = grpc_auth_property_iterator_next (&it)) != NULL) - { - gpr_log (GPR_INFO, "\t\t%s: %s", p->name, p->value); - } - gpr_log (GPR_INFO, "\tall properties:"); - it = grpc_auth_context_property_iterator (ctx); - while ((p = grpc_auth_property_iterator_next (&it)) != NULL) - { - gpr_log (GPR_INFO, "\t\t%s: %s", p->name, p->value); - } + gpr_log(GPR_INFO, "%s peer:", is_client ? "client" : "server"); + gpr_log(GPR_INFO, "\tauthenticated: %s", + grpc_auth_context_peer_is_authenticated(ctx) ? "YES" : "NO"); + it = grpc_auth_context_peer_identity(ctx); + while ((p = grpc_auth_property_iterator_next(&it)) != NULL) { + gpr_log(GPR_INFO, "\t\t%s: %s", p->name, p->value); + } + gpr_log(GPR_INFO, "\tall properties:"); + it = grpc_auth_context_property_iterator(ctx); + while ((p = grpc_auth_property_iterator_next(&it)) != NULL) { + gpr_log(GPR_INFO, "\t\t%s: %s", p->name, p->value); + } } -static void -test_call_creds_failure (grpc_end2end_test_config config) -{ +static void test_call_creds_failure(grpc_end2end_test_config config) { grpc_call *c; grpc_credentials *creds = NULL; - grpc_end2end_test_fixture f = begin_test (config, "test_call_creds_failure", 0); - gpr_timespec deadline = five_seconds_time (); - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + grpc_end2end_test_fixture f = + begin_test(config, "test_call_creds_failure", 0); + gpr_timespec deadline = five_seconds_time(); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); /* Try with credentials unfit to be set on a call (channel creds). */ - creds = grpc_fake_transport_security_credentials_create (); - GPR_ASSERT (grpc_call_set_credentials (c, creds) != GRPC_CALL_OK); - grpc_credentials_release (creds); + creds = grpc_fake_transport_security_credentials_create(); + GPR_ASSERT(grpc_call_set_credentials(c, creds) != GRPC_CALL_OK); + grpc_credentials_release(creds); - grpc_call_destroy (c); + grpc_call_destroy(c); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -static void -request_response_with_payload_and_call_creds (const char *test_name, grpc_end2end_test_config config, override_mode mode) -{ +static void request_response_with_payload_and_call_creds( + const char *test_name, grpc_end2end_test_config config, + override_mode mode) { grpc_call *c; grpc_call *s; - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); - gpr_timespec deadline = five_seconds_time (); + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); + grpc_byte_buffer *response_payload = + grpc_raw_byte_buffer_create(&response_payload_slice, 1); + gpr_timespec deadline = five_seconds_time(); grpc_end2end_test_fixture f; cq_verifier *cqv; grpc_op ops[6]; @@ -211,34 +184,35 @@ request_response_with_payload_and_call_creds (const char *test_name, grpc_end2en grpc_auth_context *s_auth_context = NULL; grpc_auth_context *c_auth_context = NULL; - f = begin_test (config, test_name, 0); - cqv = cq_verifier_create (f.cq); + f = begin_test(config, test_name, 0); + cqv = cq_verifier_create(f.cq); - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); - creds = grpc_google_iam_credentials_create (iam_token, iam_selector, NULL); - GPR_ASSERT (creds != NULL); - GPR_ASSERT (grpc_call_set_credentials (c, creds) == GRPC_CALL_OK); - switch (mode) - { + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); + creds = grpc_google_iam_credentials_create(iam_token, iam_selector, NULL); + GPR_ASSERT(creds != NULL); + GPR_ASSERT(grpc_call_set_credentials(c, creds) == GRPC_CALL_OK); + switch (mode) { case NONE: break; case OVERRIDE: - grpc_credentials_release (creds); - creds = grpc_google_iam_credentials_create (overridden_iam_token, overridden_iam_selector, NULL); - GPR_ASSERT (creds != NULL); - GPR_ASSERT (grpc_call_set_credentials (c, creds) == GRPC_CALL_OK); + grpc_credentials_release(creds); + creds = grpc_google_iam_credentials_create(overridden_iam_token, + overridden_iam_selector, NULL); + GPR_ASSERT(creds != NULL); + GPR_ASSERT(grpc_call_set_credentials(c, creds) == GRPC_CALL_OK); break; case DESTROY: - GPR_ASSERT (grpc_call_set_credentials (c, NULL) == GRPC_CALL_OK); + GPR_ASSERT(grpc_call_set_credentials(c, NULL) == GRPC_CALL_OK); break; - } - grpc_credentials_release (creds); + } + grpc_credentials_release(creds); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -273,25 +247,27 @@ request_response_with_payload_and_call_creds (const char *test_name, grpc_end2en op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); - s_auth_context = grpc_call_auth_context (s); - GPR_ASSERT (s_auth_context != NULL); - print_auth_context (0, s_auth_context); - grpc_auth_context_release (s_auth_context); - - c_auth_context = grpc_call_auth_context (c); - GPR_ASSERT (c_auth_context != NULL); - print_auth_context (1, c_auth_context); - grpc_auth_context_release (c_auth_context); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); + s_auth_context = grpc_call_auth_context(s); + GPR_ASSERT(s_auth_context != NULL); + print_auth_context(0, s_auth_context); + grpc_auth_context_release(s_auth_context); + + c_auth_context = grpc_call_auth_context(c); + GPR_ASSERT(c_auth_context != NULL); + print_auth_context(1, c_auth_context); + grpc_auth_context_release(c_auth_context); /* Cannot set creds on the server call object. */ - GPR_ASSERT (grpc_call_set_credentials (s, NULL) != GRPC_CALL_OK); + GPR_ASSERT(grpc_call_set_credentials(s, NULL) != GRPC_CALL_OK); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -304,11 +280,11 @@ request_response_with_payload_and_call_creds (const char *test_name, grpc_end2en op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -328,85 +304,101 @@ request_response_with_payload_and_call_creds (const char *test_name, grpc_end2en op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - - cq_expect_completion (cqv, tag (103), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); - - GPR_ASSERT (status == GRPC_STATUS_OK); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); - GPR_ASSERT (was_cancelled == 0); - GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, "hello world")); - GPR_ASSERT (byte_buffer_eq_string (response_payload_recv, "hello you")); - - switch (mode) - { + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + + cq_expect_completion(cqv, tag(103), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); + + GPR_ASSERT(status == GRPC_STATUS_OK); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); + GPR_ASSERT(was_cancelled == 0); + GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); + GPR_ASSERT(byte_buffer_eq_string(response_payload_recv, "hello you")); + + switch (mode) { case NONE: - GPR_ASSERT (contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, iam_token)); - GPR_ASSERT (contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, iam_selector)); + GPR_ASSERT(contains_metadata(&request_metadata_recv, + GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, + iam_token)); + GPR_ASSERT(contains_metadata(&request_metadata_recv, + GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, + iam_selector)); break; case OVERRIDE: - GPR_ASSERT (contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, overridden_iam_token)); - GPR_ASSERT (contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, overridden_iam_selector)); + GPR_ASSERT(contains_metadata(&request_metadata_recv, + GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, + overridden_iam_token)); + GPR_ASSERT(contains_metadata(&request_metadata_recv, + GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, + overridden_iam_selector)); break; case DESTROY: - GPR_ASSERT (!contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, iam_token)); - GPR_ASSERT (!contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, iam_selector)); - GPR_ASSERT (!contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, overridden_iam_token)); - GPR_ASSERT (!contains_metadata (&request_metadata_recv, GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, overridden_iam_selector)); + GPR_ASSERT(!contains_metadata(&request_metadata_recv, + GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, + iam_token)); + GPR_ASSERT(!contains_metadata(&request_metadata_recv, + GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, + iam_selector)); + GPR_ASSERT(!contains_metadata(&request_metadata_recv, + GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, + overridden_iam_token)); + GPR_ASSERT(!contains_metadata(&request_metadata_recv, + GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, + overridden_iam_selector)); break; - } + } - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (response_payload); - grpc_byte_buffer_destroy (request_payload_recv); - grpc_byte_buffer_destroy (response_payload_recv); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(response_payload); + grpc_byte_buffer_destroy(request_payload_recv); + grpc_byte_buffer_destroy(response_payload_recv); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -static void -test_request_response_with_payload_and_call_creds (grpc_end2end_test_config config) -{ - request_response_with_payload_and_call_creds ("test_request_response_with_payload_and_call_creds", config, NONE); +static void test_request_response_with_payload_and_call_creds( + grpc_end2end_test_config config) { + request_response_with_payload_and_call_creds( + "test_request_response_with_payload_and_call_creds", config, NONE); } -static void -test_request_response_with_payload_and_overridden_call_creds (grpc_end2end_test_config config) -{ - request_response_with_payload_and_call_creds ("test_request_response_with_payload_and_overridden_call_creds", config, OVERRIDE); +static void test_request_response_with_payload_and_overridden_call_creds( + grpc_end2end_test_config config) { + request_response_with_payload_and_call_creds( + "test_request_response_with_payload_and_overridden_call_creds", config, + OVERRIDE); } -static void -test_request_response_with_payload_and_deleted_call_creds (grpc_end2end_test_config config) -{ - request_response_with_payload_and_call_creds ("test_request_response_with_payload_and_deleted_call_creds", config, DESTROY); +static void test_request_response_with_payload_and_deleted_call_creds( + grpc_end2end_test_config config) { + request_response_with_payload_and_call_creds( + "test_request_response_with_payload_and_deleted_call_creds", config, + DESTROY); } -static void -test_request_with_server_rejecting_client_creds (grpc_end2end_test_config config) -{ +static void test_request_with_server_rejecting_client_creds( + grpc_end2end_test_config config) { grpc_op ops[6]; grpc_op *op; grpc_call *c; grpc_end2end_test_fixture f; - gpr_timespec deadline = five_seconds_time (); + gpr_timespec deadline = five_seconds_time(); cq_verifier *cqv; grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; @@ -417,25 +409,27 @@ test_request_with_server_rejecting_client_creds (grpc_end2end_test_config config char *details = NULL; size_t details_capacity = 0; grpc_byte_buffer *response_payload_recv = NULL; - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); grpc_credentials *creds; - f = begin_test (config, "test_request_with_server_rejecting_client_creds", 1); - cqv = cq_verifier_create (f.cq); + f = begin_test(config, "test_request_with_server_rejecting_client_creds", 1); + cqv = cq_verifier_create(f.cq); - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - creds = grpc_google_iam_credentials_create (iam_token, iam_selector, NULL); - GPR_ASSERT (creds != NULL); - GPR_ASSERT (grpc_call_set_credentials (c, creds) == GRPC_CALL_OK); - grpc_credentials_release (creds); + creds = grpc_google_iam_credentials_create(iam_token, iam_selector, NULL); + GPR_ASSERT(creds != NULL); + GPR_ASSERT(grpc_call_set_credentials(c, creds) == GRPC_CALL_OK); + grpc_credentials_release(creds); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; @@ -470,39 +464,36 @@ test_request_with_server_rejecting_client_creds (grpc_end2end_test_config config op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (error == GRPC_CALL_OK); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(error == GRPC_CALL_OK); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_UNAUTHENTICATED); + GPR_ASSERT(status == GRPC_STATUS_UNAUTHENTICATED); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (response_payload_recv); - gpr_free (details); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(response_payload_recv); + gpr_free(details); - grpc_call_destroy (c); + grpc_call_destroy(c); - cq_verifier_destroy (cqv); - end_test (&f); - config.tear_down_data (&f); + cq_verifier_destroy(cqv); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - if (config.feature_mask & FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS) - { - test_call_creds_failure (config); - test_request_response_with_payload_and_call_creds (config); - test_request_response_with_payload_and_overridden_call_creds (config); - test_request_response_with_payload_and_deleted_call_creds (config); - test_request_with_server_rejecting_client_creds (config); - } +void grpc_end2end_tests(grpc_end2end_test_config config) { + if (config.feature_mask & FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS) { + test_call_creds_failure(config); + test_request_response_with_payload_and_call_creds(config); + test_request_response_with_payload_and_overridden_call_creds(config); + test_request_response_with_payload_and_deleted_call_creds(config); + test_request_with_server_rejecting_client_creds(config); + } } diff --git a/test/core/end2end/tests/cancel_after_accept.c b/test/core/end2end/tests/cancel_after_accept.c index bbef223229f..10e62275ab0 100644 --- a/test/core/end2end/tests/cancel_after_accept.c +++ b/test/core/end2end/tests/cancel_after_accept.c @@ -44,91 +44,71 @@ #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/tests/cancel_test_helpers.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } /* Cancel after accept, no payload */ -static void -test_cancel_after_accept (grpc_end2end_test_config config, cancellation_mode mode) -{ +static void test_cancel_after_accept(grpc_end2end_test_config config, + cancellation_mode mode) { grpc_op ops[6]; grpc_op *op; grpc_call *c; grpc_call *s; - grpc_end2end_test_fixture f = begin_test (config, "cancel_after_accept", NULL, NULL); - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f.cq); + grpc_end2end_test_fixture f = + begin_test(config, "cancel_after_accept", NULL, NULL); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; grpc_metadata_array request_metadata_recv; @@ -139,19 +119,22 @@ test_cancel_after_accept (grpc_end2end_test_config config, cancellation_mode mod size_t details_capacity = 0; grpc_byte_buffer *request_payload_recv = NULL; grpc_byte_buffer *response_payload_recv = NULL; - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); + grpc_byte_buffer *response_payload = + grpc_raw_byte_buffer_create(&response_payload_slice, 1); int was_cancelled = 2; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; @@ -182,13 +165,14 @@ test_cancel_after_accept (grpc_end2end_test_config config, cancellation_mode mod op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (2)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (2), 1); - cq_verify (cqv); + error = grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(2)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(2), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_RECV_MESSAGE; @@ -211,44 +195,41 @@ test_cancel_after_accept (grpc_end2end_test_config config, cancellation_mode mod op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (3), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(3), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - GPR_ASSERT (GRPC_CALL_OK == mode.initiate_cancel (c, NULL)); + GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c, NULL)); - cq_expect_completion (cqv, tag (3), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(3), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == mode.expect_status || status == GRPC_STATUS_INTERNAL); - GPR_ASSERT (was_cancelled == 1); + GPR_ASSERT(status == mode.expect_status || status == GRPC_STATUS_INTERNAL); + GPR_ASSERT(was_cancelled == 1); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (response_payload); - grpc_byte_buffer_destroy (request_payload_recv); - grpc_byte_buffer_destroy (response_payload_recv); - gpr_free (details); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(response_payload); + grpc_byte_buffer_destroy(request_payload_recv); + grpc_byte_buffer_destroy(response_payload_recv); + gpr_free(details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); - end_test (&f); - config.tear_down_data (&f); + cq_verifier_destroy(cqv); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ +void grpc_end2end_tests(grpc_end2end_test_config config) { unsigned i; - for (i = 0; i < GPR_ARRAY_SIZE (cancellation_modes); i++) - { - test_cancel_after_accept (config, cancellation_modes[i]); - } + for (i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); i++) { + test_cancel_after_accept(config, cancellation_modes[i]); + } } diff --git a/test/core/end2end/tests/cancel_after_client_done.c b/test/core/end2end/tests/cancel_after_client_done.c index b02d40c250c..4fed5be5f79 100644 --- a/test/core/end2end/tests/cancel_after_client_done.c +++ b/test/core/end2end/tests/cancel_after_client_done.c @@ -44,91 +44,71 @@ #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/tests/cancel_test_helpers.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } /* Cancel after accept with a writes closed, no payload */ -static void -test_cancel_after_accept_and_writes_closed (grpc_end2end_test_config config, cancellation_mode mode) -{ +static void test_cancel_after_accept_and_writes_closed( + grpc_end2end_test_config config, cancellation_mode mode) { grpc_op ops[6]; grpc_op *op; grpc_call *c; grpc_call *s; - grpc_end2end_test_fixture f = begin_test (config, "test_cancel_after_accept_and_writes_closed", NULL, NULL); - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f.cq); + grpc_end2end_test_fixture f = begin_test( + config, "test_cancel_after_accept_and_writes_closed", NULL, NULL); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; grpc_metadata_array request_metadata_recv; @@ -139,19 +119,22 @@ test_cancel_after_accept_and_writes_closed (grpc_end2end_test_config config, can size_t details_capacity = 0; grpc_byte_buffer *request_payload_recv = NULL; grpc_byte_buffer *response_payload_recv = NULL; - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); + grpc_byte_buffer *response_payload = + grpc_raw_byte_buffer_create(&response_payload_slice, 1); int was_cancelled = 2; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; @@ -186,13 +169,14 @@ test_cancel_after_accept_and_writes_closed (grpc_end2end_test_config config, can op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (2)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (2), 1); - cq_verify (cqv); + error = grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(2)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(2), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_RECV_MESSAGE; @@ -215,44 +199,41 @@ test_cancel_after_accept_and_writes_closed (grpc_end2end_test_config config, can op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (3), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(3), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - GPR_ASSERT (GRPC_CALL_OK == mode.initiate_cancel (c, NULL)); + GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c, NULL)); - cq_expect_completion (cqv, tag (3), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(3), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == mode.expect_status || status == GRPC_STATUS_INTERNAL); - GPR_ASSERT (was_cancelled == 1); + GPR_ASSERT(status == mode.expect_status || status == GRPC_STATUS_INTERNAL); + GPR_ASSERT(was_cancelled == 1); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (response_payload); - grpc_byte_buffer_destroy (request_payload_recv); - grpc_byte_buffer_destroy (response_payload_recv); - gpr_free (details); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(response_payload); + grpc_byte_buffer_destroy(request_payload_recv); + grpc_byte_buffer_destroy(response_payload_recv); + gpr_free(details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); - end_test (&f); - config.tear_down_data (&f); + cq_verifier_destroy(cqv); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ +void grpc_end2end_tests(grpc_end2end_test_config config) { unsigned i; - for (i = 0; i < GPR_ARRAY_SIZE (cancellation_modes); i++) - { - test_cancel_after_accept_and_writes_closed (config, cancellation_modes[i]); - } + for (i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); i++) { + test_cancel_after_accept_and_writes_closed(config, cancellation_modes[i]); + } } diff --git a/test/core/end2end/tests/cancel_after_invoke.c b/test/core/end2end/tests/cancel_after_invoke.c index 4f83a3ea7ca..40595e4c7b9 100644 --- a/test/core/end2end/tests/cancel_after_invoke.c +++ b/test/core/end2end/tests/cancel_after_invoke.c @@ -44,90 +44,71 @@ #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/tests/cancel_test_helpers.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, cancellation_mode mode, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + cancellation_mode mode, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s/%s", test_name, config.name, mode.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s/%s", test_name, config.name, mode.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } /* Cancel after invoke, no payload */ -static void -test_cancel_after_invoke (grpc_end2end_test_config config, cancellation_mode mode, size_t test_ops) -{ +static void test_cancel_after_invoke(grpc_end2end_test_config config, + cancellation_mode mode, size_t test_ops) { grpc_op ops[6]; grpc_op *op; grpc_call *c; - grpc_end2end_test_fixture f = begin_test (config, "test_cancel_after_invoke", mode, NULL, NULL); - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f.cq); + grpc_end2end_test_fixture f = + begin_test(config, "test_cancel_after_invoke", mode, NULL, NULL); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; grpc_metadata_array request_metadata_recv; @@ -137,16 +118,18 @@ test_cancel_after_invoke (grpc_end2end_test_config config, cancellation_mode mod char *details = NULL; size_t details_capacity = 0; grpc_byte_buffer *response_payload_recv = NULL; - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; @@ -181,42 +164,38 @@ test_cancel_after_invoke (grpc_end2end_test_config config, cancellation_mode mod op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, test_ops, tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, test_ops, tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - GPR_ASSERT (GRPC_CALL_OK == mode.initiate_cancel (c, NULL)); + GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c, NULL)); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == mode.expect_status || status == GRPC_STATUS_INTERNAL); + GPR_ASSERT(status == mode.expect_status || status == GRPC_STATUS_INTERNAL); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (response_payload_recv); - gpr_free (details); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(response_payload_recv); + gpr_free(details); - grpc_call_destroy (c); + grpc_call_destroy(c); - cq_verifier_destroy (cqv); - end_test (&f); - config.tear_down_data (&f); + cq_verifier_destroy(cqv); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ +void grpc_end2end_tests(grpc_end2end_test_config config) { unsigned i, j; - for (j = 2; j < 6; j++) - { - for (i = 0; i < GPR_ARRAY_SIZE (cancellation_modes); i++) - { - test_cancel_after_invoke (config, cancellation_modes[i], j); - } + for (j = 2; j < 6; j++) { + for (i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); i++) { + test_cancel_after_invoke(config, cancellation_modes[i], j); } + } } diff --git a/test/core/end2end/tests/cancel_before_invoke.c b/test/core/end2end/tests/cancel_before_invoke.c index 065ed43ebd7..c049e0c2d63 100644 --- a/test/core/end2end/tests/cancel_before_invoke.c +++ b/test/core/end2end/tests/cancel_before_invoke.c @@ -43,90 +43,70 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } /* Cancel before invoke */ -static void -test_cancel_before_invoke (grpc_end2end_test_config config, size_t test_ops) -{ +static void test_cancel_before_invoke(grpc_end2end_test_config config, + size_t test_ops) { grpc_op ops[6]; grpc_op *op; grpc_call *c; - grpc_end2end_test_fixture f = begin_test (config, "cancel_before_invoke", NULL, NULL); - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f.cq); + grpc_end2end_test_fixture f = + begin_test(config, "cancel_before_invoke", NULL, NULL); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; grpc_metadata_array request_metadata_recv; @@ -136,18 +116,20 @@ test_cancel_before_invoke (grpc_end2end_test_config config, size_t test_ops) char *details = NULL; size_t details_capacity = 0; grpc_byte_buffer *response_payload_recv = NULL; - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - GPR_ASSERT (GRPC_CALL_OK == grpc_call_cancel (c, NULL)); + GPR_ASSERT(GRPC_CALL_OK == grpc_call_cancel(c, NULL)); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; @@ -182,36 +164,33 @@ test_cancel_before_invoke (grpc_end2end_test_config config, size_t test_ops) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, test_ops, tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, test_ops, tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_CANCELLED); + GPR_ASSERT(status == GRPC_STATUS_CANCELLED); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (response_payload_recv); - gpr_free (details); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(response_payload_recv); + gpr_free(details); - grpc_call_destroy (c); + grpc_call_destroy(c); - cq_verifier_destroy (cqv); - end_test (&f); - config.tear_down_data (&f); + cq_verifier_destroy(cqv); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ +void grpc_end2end_tests(grpc_end2end_test_config config) { size_t i; - for (i = 1; i <= 6; i++) - { - test_cancel_before_invoke (config, i); - } + for (i = 1; i <= 6; i++) { + test_cancel_before_invoke(config, i); + } } diff --git a/test/core/end2end/tests/cancel_in_a_vacuum.c b/test/core/end2end/tests/cancel_in_a_vacuum.c index 512bceb6e57..6c63d7c0ad9 100644 --- a/test/core/end2end/tests/cancel_in_a_vacuum.c +++ b/test/core/end2end/tests/cancel_in_a_vacuum.c @@ -44,108 +44,86 @@ #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/tests/cancel_test_helpers.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } /* Cancel and do nothing */ -static void -test_cancel_in_a_vacuum (grpc_end2end_test_config config, cancellation_mode mode) -{ +static void test_cancel_in_a_vacuum(grpc_end2end_test_config config, + cancellation_mode mode) { grpc_call *c; - grpc_end2end_test_fixture f = begin_test (config, "test_cancel_in_a_vacuum", NULL, NULL); - gpr_timespec deadline = five_seconds_time (); - cq_verifier *v_client = cq_verifier_create (f.cq); + grpc_end2end_test_fixture f = + begin_test(config, "test_cancel_in_a_vacuum", NULL, NULL); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *v_client = cq_verifier_create(f.cq); - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - GPR_ASSERT (GRPC_CALL_OK == mode.initiate_cancel (c, NULL)); + GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c, NULL)); - grpc_call_destroy (c); + grpc_call_destroy(c); - cq_verifier_destroy (v_client); - end_test (&f); - config.tear_down_data (&f); + cq_verifier_destroy(v_client); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ +void grpc_end2end_tests(grpc_end2end_test_config config) { unsigned i; - for (i = 0; i < GPR_ARRAY_SIZE (cancellation_modes); i++) - { - test_cancel_in_a_vacuum (config, cancellation_modes[i]); - } + for (i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); i++) { + test_cancel_in_a_vacuum(config, cancellation_modes[i]); + } } diff --git a/test/core/end2end/tests/cancel_test_helpers.h b/test/core/end2end/tests/cancel_test_helpers.h index 20bcfc86aa3..f8fafae597c 100644 --- a/test/core/end2end/tests/cancel_test_helpers.h +++ b/test/core/end2end/tests/cancel_test_helpers.h @@ -34,25 +34,22 @@ #ifndef GRPC_TEST_CORE_END2END_TESTS_CANCEL_TEST_HELPERS_H #define GRPC_TEST_CORE_END2END_TESTS_CANCEL_TEST_HELPERS_H -typedef struct -{ +typedef struct { const char *name; - grpc_call_error (*initiate_cancel) (grpc_call * call, void *reserved); + grpc_call_error (*initiate_cancel)(grpc_call *call, void *reserved); grpc_status_code expect_status; const char *expect_details; } cancellation_mode; -static grpc_call_error -wait_for_deadline (grpc_call * call, void *reserved) -{ - (void) reserved; +static grpc_call_error wait_for_deadline(grpc_call *call, void *reserved) { + (void)reserved; return GRPC_CALL_OK; } static const cancellation_mode cancellation_modes[] = { - {"cancel", grpc_call_cancel, GRPC_STATUS_CANCELLED, "Cancelled"}, - {"deadline", wait_for_deadline, GRPC_STATUS_DEADLINE_EXCEEDED, - "Deadline Exceeded"}, + {"cancel", grpc_call_cancel, GRPC_STATUS_CANCELLED, "Cancelled"}, + {"deadline", wait_for_deadline, GRPC_STATUS_DEADLINE_EXCEEDED, + "Deadline Exceeded"}, }; #endif /* GRPC_TEST_CORE_END2END_TESTS_CANCEL_TEST_HELPERS_H */ diff --git a/test/core/end2end/tests/census_simple_request.c b/test/core/end2end/tests/census_simple_request.c index 71fd9e0e491..adf855ca60b 100644 --- a/test/core/end2end/tests/census_simple_request.c +++ b/test/core/end2end/tests/census_simple_request.c @@ -45,78 +45,61 @@ #include #include "test/core/end2end/cq_verifier.h" -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, n_seconds_time (5), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, n_seconds_time(5), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -test_body (grpc_end2end_test_fixture f) -{ +static void test_body(grpc_end2end_test_fixture f) { grpc_call *c; grpc_call *s; - gpr_timespec deadline = n_seconds_time (5); - cq_verifier *cqv = cq_verifier_create (f.cq); + gpr_timespec deadline = n_seconds_time(5); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -129,13 +112,15 @@ test_body (grpc_end2end_test_fixture f) size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr:1234", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr:1234", deadline, + NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -160,13 +145,15 @@ test_body (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -186,34 +173,34 @@ test_body (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT (was_cancelled == 1); + GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT(was_cancelled == 1); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); } -static void -test_invoke_request_with_census (grpc_end2end_test_config config, const char *name, void (*body) (grpc_end2end_test_fixture f)) -{ +static void test_invoke_request_with_census( + grpc_end2end_test_config config, const char *name, + void (*body)(grpc_end2end_test_fixture f)) { char *fullname; grpc_end2end_test_fixture f; grpc_arg client_arg, server_arg; @@ -232,16 +219,14 @@ test_invoke_request_with_census (grpc_end2end_test_config config, const char *na server_args.num_args = 1; server_args.args = &server_arg; - gpr_asprintf (&fullname, "%s/%s", "test_invoke_request_with_census", name); - f = begin_test (config, fullname, &client_args, &server_args); - body (f); - end_test (&f); - config.tear_down_data (&f); - gpr_free (fullname); + gpr_asprintf(&fullname, "%s/%s", "test_invoke_request_with_census", name); + f = begin_test(config, fullname, &client_args, &server_args); + body(f); + end_test(&f); + config.tear_down_data(&f); + gpr_free(fullname); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_invoke_request_with_census (config, "census_simple_request", test_body); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_invoke_request_with_census(config, "census_simple_request", test_body); } diff --git a/test/core/end2end/tests/channel_connectivity.c b/test/core/end2end/tests/channel_connectivity.c index 54e719e545f..0b7a8a664b1 100644 --- a/test/core/end2end/tests/channel_connectivity.c +++ b/test/core/end2end/tests/channel_connectivity.c @@ -38,95 +38,101 @@ #include "test/core/end2end/cq_verifier.h" -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static void -test_connectivity (grpc_end2end_test_config config) -{ - grpc_end2end_test_fixture f = config.create_fixture (NULL, NULL); +static void test_connectivity(grpc_end2end_test_config config) { + grpc_end2end_test_fixture f = config.create_fixture(NULL, NULL); grpc_connectivity_state state; - cq_verifier *cqv = cq_verifier_create (f.cq); + cq_verifier *cqv = cq_verifier_create(f.cq); - config.init_client (&f, NULL); + config.init_client(&f, NULL); /* channels should start life in IDLE, and stay there */ - GPR_ASSERT (grpc_channel_check_connectivity_state (f.client, 0) == GRPC_CHANNEL_IDLE); - gpr_sleep_until (GRPC_TIMEOUT_MILLIS_TO_DEADLINE (100)); - GPR_ASSERT (grpc_channel_check_connectivity_state (f.client, 0) == GRPC_CHANNEL_IDLE); + GPR_ASSERT(grpc_channel_check_connectivity_state(f.client, 0) == + GRPC_CHANNEL_IDLE); + gpr_sleep_until(GRPC_TIMEOUT_MILLIS_TO_DEADLINE(100)); + GPR_ASSERT(grpc_channel_check_connectivity_state(f.client, 0) == + GRPC_CHANNEL_IDLE); /* start watching for a change */ - grpc_channel_watch_connectivity_state (f.client, GRPC_CHANNEL_IDLE, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (3), f.cq, tag (1)); + grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_IDLE, + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), + f.cq, tag(1)); /* nothing should happen */ - cq_verify_empty (cqv); + cq_verify_empty(cqv); /* check that we're still in idle, and start connecting */ - GPR_ASSERT (grpc_channel_check_connectivity_state (f.client, 1) == GRPC_CHANNEL_IDLE); + GPR_ASSERT(grpc_channel_check_connectivity_state(f.client, 1) == + GRPC_CHANNEL_IDLE); /* and now the watch should trigger */ - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); - state = grpc_channel_check_connectivity_state (f.client, 0); - GPR_ASSERT (state == GRPC_CHANNEL_TRANSIENT_FAILURE || state == GRPC_CHANNEL_CONNECTING); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); + state = grpc_channel_check_connectivity_state(f.client, 0); + GPR_ASSERT(state == GRPC_CHANNEL_TRANSIENT_FAILURE || + state == GRPC_CHANNEL_CONNECTING); /* quickly followed by a transition to TRANSIENT_FAILURE */ - grpc_channel_watch_connectivity_state (f.client, GRPC_CHANNEL_CONNECTING, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (3), f.cq, tag (2)); - cq_expect_completion (cqv, tag (2), 1); - cq_verify (cqv); - state = grpc_channel_check_connectivity_state (f.client, 0); - GPR_ASSERT (state == GRPC_CHANNEL_TRANSIENT_FAILURE || state == GRPC_CHANNEL_CONNECTING); + grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_CONNECTING, + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), + f.cq, tag(2)); + cq_expect_completion(cqv, tag(2), 1); + cq_verify(cqv); + state = grpc_channel_check_connectivity_state(f.client, 0); + GPR_ASSERT(state == GRPC_CHANNEL_TRANSIENT_FAILURE || + state == GRPC_CHANNEL_CONNECTING); - gpr_log (GPR_DEBUG, "*** STARTING SERVER ***"); + gpr_log(GPR_DEBUG, "*** STARTING SERVER ***"); /* now let's bring up a server to connect to */ - config.init_server (&f, NULL); + config.init_server(&f, NULL); - gpr_log (GPR_DEBUG, "*** STARTED SERVER ***"); + gpr_log(GPR_DEBUG, "*** STARTED SERVER ***"); /* we'll go through some set of transitions (some might be missed), until READY is reached */ - while (state != GRPC_CHANNEL_READY) - { - grpc_channel_watch_connectivity_state (f.client, state, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (3), f.cq, tag (3)); - cq_expect_completion (cqv, tag (3), 1); - cq_verify (cqv); - state = grpc_channel_check_connectivity_state (f.client, 0); - GPR_ASSERT (state == GRPC_CHANNEL_READY || state == GRPC_CHANNEL_CONNECTING || state == GRPC_CHANNEL_TRANSIENT_FAILURE); - } + while (state != GRPC_CHANNEL_READY) { + grpc_channel_watch_connectivity_state( + f.client, state, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), f.cq, tag(3)); + cq_expect_completion(cqv, tag(3), 1); + cq_verify(cqv); + state = grpc_channel_check_connectivity_state(f.client, 0); + GPR_ASSERT(state == GRPC_CHANNEL_READY || + state == GRPC_CHANNEL_CONNECTING || + state == GRPC_CHANNEL_TRANSIENT_FAILURE); + } /* bring down the server again */ /* we should go immediately to TRANSIENT_FAILURE */ - gpr_log (GPR_DEBUG, "*** SHUTTING DOWN SERVER ***"); + gpr_log(GPR_DEBUG, "*** SHUTTING DOWN SERVER ***"); - grpc_channel_watch_connectivity_state (f.client, GRPC_CHANNEL_READY, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (3), f.cq, tag (4)); + grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_READY, + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), + f.cq, tag(4)); - grpc_server_shutdown_and_notify (f.server, f.cq, tag (0xdead)); + grpc_server_shutdown_and_notify(f.server, f.cq, tag(0xdead)); - cq_expect_completion (cqv, tag (4), 1); - cq_expect_completion (cqv, tag (0xdead), 1); - cq_verify (cqv); - state = grpc_channel_check_connectivity_state (f.client, 0); - GPR_ASSERT (state == GRPC_CHANNEL_TRANSIENT_FAILURE || state == GRPC_CHANNEL_CONNECTING); + cq_expect_completion(cqv, tag(4), 1); + cq_expect_completion(cqv, tag(0xdead), 1); + cq_verify(cqv); + state = grpc_channel_check_connectivity_state(f.client, 0); + GPR_ASSERT(state == GRPC_CHANNEL_TRANSIENT_FAILURE || + state == GRPC_CHANNEL_CONNECTING); /* cleanup server */ - grpc_server_destroy (f.server); + grpc_server_destroy(f.server); - gpr_log (GPR_DEBUG, "*** SHUTDOWN SERVER ***"); + gpr_log(GPR_DEBUG, "*** SHUTDOWN SERVER ***"); - grpc_channel_destroy (f.client); - grpc_completion_queue_shutdown (f.cq); - grpc_completion_queue_destroy (f.cq); - config.tear_down_data (&f); + grpc_channel_destroy(f.client); + grpc_completion_queue_shutdown(f.cq); + grpc_completion_queue_destroy(f.cq); + config.tear_down_data(&f); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - GPR_ASSERT (config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION); - test_connectivity (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + GPR_ASSERT(config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION); + test_connectivity(config); } diff --git a/test/core/end2end/tests/compressed_payload.c b/test/core/end2end/tests/compressed_payload.c index e7c0768d225..c50eaba8b24 100644 --- a/test/core/end2end/tests/compressed_payload.c +++ b/test/core/end2end/tests/compressed_payload.c @@ -48,88 +48,71 @@ #include "src/core/channel/compress_filter.h" #include "src/core/surface/call.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -request_with_payload_template (grpc_end2end_test_config config, const char *test_name, gpr_uint32 send_flags_bitmask, grpc_compression_algorithm requested_compression_algorithm, grpc_compression_algorithm expected_compression_algorithm, grpc_metadata * client_metadata) -{ +static void request_with_payload_template( + grpc_end2end_test_config config, const char *test_name, + gpr_uint32 send_flags_bitmask, + grpc_compression_algorithm requested_compression_algorithm, + grpc_compression_algorithm expected_compression_algorithm, + grpc_metadata *client_metadata) { grpc_call *c; grpc_call *s; gpr_slice request_payload_slice; grpc_byte_buffer *request_payload; - gpr_timespec deadline = five_seconds_time (); + gpr_timespec deadline = five_seconds_time(); grpc_channel_args *client_args; grpc_channel_args *server_args; grpc_end2end_test_fixture f; @@ -148,36 +131,36 @@ request_with_payload_template (grpc_end2end_test_config config, const char *test cq_verifier *cqv; char str[1024]; - memset (str, 'x', 1023); + memset(str, 'x', 1023); str[1023] = '\0'; - request_payload_slice = gpr_slice_from_copied_string (str); - request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + request_payload_slice = gpr_slice_from_copied_string(str); + request_payload = grpc_raw_byte_buffer_create(&request_payload_slice, 1); - client_args = grpc_channel_args_set_compression_algorithm (NULL, requested_compression_algorithm); - server_args = grpc_channel_args_set_compression_algorithm (NULL, requested_compression_algorithm); + client_args = grpc_channel_args_set_compression_algorithm( + NULL, requested_compression_algorithm); + server_args = grpc_channel_args_set_compression_algorithm( + NULL, requested_compression_algorithm); - f = begin_test (config, test_name, client_args, server_args); - cqv = cq_verifier_create (f.cq); + f = begin_test(config, test_name, client_args, server_args); + cqv = cq_verifier_create(f.cq); - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; - if (client_metadata != NULL) - { - op->data.send_initial_metadata.count = 1; - op->data.send_initial_metadata.metadata = client_metadata; - } - else - { - op->data.send_initial_metadata.count = 0; - } + if (client_metadata != NULL) { + op->data.send_initial_metadata.count = 1; + op->data.send_initial_metadata.metadata = client_metadata; + } else { + op->data.send_initial_metadata.count = 0; + } op->flags = 0; op->reserved = NULL; op++; @@ -203,18 +186,23 @@ request_with_payload_template (grpc_end2end_test_config config, const char *test op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); - - GPR_ASSERT (GPR_BITCOUNT (grpc_call_get_encodings_accepted_by_peer (s)) == 3); - GPR_ASSERT (GPR_BITGET (grpc_call_get_encodings_accepted_by_peer (s), GRPC_COMPRESS_NONE) != 0); - GPR_ASSERT (GPR_BITGET (grpc_call_get_encodings_accepted_by_peer (s), GRPC_COMPRESS_DEFLATE) != 0); - GPR_ASSERT (GPR_BITGET (grpc_call_get_encodings_accepted_by_peer (s), GRPC_COMPRESS_GZIP) != 0); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); + + GPR_ASSERT(GPR_BITCOUNT(grpc_call_get_encodings_accepted_by_peer(s)) == 3); + GPR_ASSERT(GPR_BITGET(grpc_call_get_encodings_accepted_by_peer(s), + GRPC_COMPRESS_NONE) != 0); + GPR_ASSERT(GPR_BITGET(grpc_call_get_encodings_accepted_by_peer(s), + GRPC_COMPRESS_DEFLATE) != 0); + GPR_ASSERT(GPR_BITGET(grpc_call_get_encodings_accepted_by_peer(s), + GRPC_COMPRESS_GZIP) != 0); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -227,11 +215,11 @@ request_with_payload_template (grpc_end2end_test_config config, const char *test op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -246,95 +234,104 @@ request_with_payload_template (grpc_end2end_test_config config, const char *test op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (103), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(103), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_OK); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); - GPR_ASSERT (was_cancelled == 0); + GPR_ASSERT(status == GRPC_STATUS_OK); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); + GPR_ASSERT(was_cancelled == 0); - GPR_ASSERT (request_payload_recv->type == GRPC_BB_RAW); - GPR_ASSERT (request_payload_recv->data.raw.compression == expected_compression_algorithm); + GPR_ASSERT(request_payload_recv->type == GRPC_BB_RAW); + GPR_ASSERT(request_payload_recv->data.raw.compression == + expected_compression_algorithm); - GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, str)); + GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, str)); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - gpr_slice_unref (request_payload_slice); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (request_payload_recv); + gpr_slice_unref(request_payload_slice); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(request_payload_recv); - grpc_channel_args_destroy (client_args); - grpc_channel_args_destroy (server_args); + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -static void -test_invoke_request_with_exceptionally_uncompressed_payload (grpc_end2end_test_config config) -{ - request_with_payload_template (config, "test_invoke_request_with_exceptionally_uncompressed_payload", GRPC_WRITE_NO_COMPRESS, GRPC_COMPRESS_GZIP, GRPC_COMPRESS_NONE, NULL); +static void test_invoke_request_with_exceptionally_uncompressed_payload( + grpc_end2end_test_config config) { + request_with_payload_template( + config, "test_invoke_request_with_exceptionally_uncompressed_payload", + GRPC_WRITE_NO_COMPRESS, GRPC_COMPRESS_GZIP, GRPC_COMPRESS_NONE, NULL); } -static void -test_invoke_request_with_uncompressed_payload (grpc_end2end_test_config config) -{ - request_with_payload_template (config, "test_invoke_request_with_uncompressed_payload", 0, GRPC_COMPRESS_NONE, GRPC_COMPRESS_NONE, NULL); +static void test_invoke_request_with_uncompressed_payload( + grpc_end2end_test_config config) { + request_with_payload_template( + config, "test_invoke_request_with_uncompressed_payload", 0, + GRPC_COMPRESS_NONE, GRPC_COMPRESS_NONE, NULL); } -static void -test_invoke_request_with_compressed_payload (grpc_end2end_test_config config) -{ - request_with_payload_template (config, "test_invoke_request_with_compressed_payload", 0, GRPC_COMPRESS_GZIP, GRPC_COMPRESS_GZIP, NULL); +static void test_invoke_request_with_compressed_payload( + grpc_end2end_test_config config) { + request_with_payload_template( + config, "test_invoke_request_with_compressed_payload", 0, + GRPC_COMPRESS_GZIP, GRPC_COMPRESS_GZIP, NULL); } -static void -test_invoke_request_with_compressed_payload_md_override (grpc_end2end_test_config config) -{ +static void test_invoke_request_with_compressed_payload_md_override( + grpc_end2end_test_config config) { grpc_metadata gzip_compression_override; grpc_metadata none_compression_override; gzip_compression_override.key = GRPC_COMPRESS_REQUEST_ALGORITHM_KEY; gzip_compression_override.value = "gzip"; gzip_compression_override.value_length = 4; - memset (&gzip_compression_override.internal_data, 0, sizeof (gzip_compression_override.internal_data)); + memset(&gzip_compression_override.internal_data, 0, + sizeof(gzip_compression_override.internal_data)); none_compression_override.key = GRPC_COMPRESS_REQUEST_ALGORITHM_KEY; none_compression_override.value = "identity"; none_compression_override.value_length = 4; - memset (&none_compression_override.internal_data, 0, sizeof (none_compression_override.internal_data)); + memset(&none_compression_override.internal_data, 0, + sizeof(none_compression_override.internal_data)); /* Channel default NONE (aka IDENTITY), call override to GZIP */ - request_with_payload_template (config, "test_invoke_request_with_compressed_payload_md_override_1", 0, GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, &gzip_compression_override); + request_with_payload_template( + config, "test_invoke_request_with_compressed_payload_md_override_1", 0, + GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, &gzip_compression_override); /* Channel default DEFLATE, call override to GZIP */ - request_with_payload_template (config, "test_invoke_request_with_compressed_payload_md_override_2", 0, GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_GZIP, &gzip_compression_override); + request_with_payload_template( + config, "test_invoke_request_with_compressed_payload_md_override_2", 0, + GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_GZIP, &gzip_compression_override); /* Channel default DEFLATE, call override to NONE (aka IDENTITY) */ - request_with_payload_template (config, "test_invoke_request_with_compressed_payload_md_override_3", 0, GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_NONE, &none_compression_override); + request_with_payload_template( + config, "test_invoke_request_with_compressed_payload_md_override_3", 0, + GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_NONE, &none_compression_override); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_invoke_request_with_exceptionally_uncompressed_payload (config); - test_invoke_request_with_uncompressed_payload (config); - test_invoke_request_with_compressed_payload (config); - test_invoke_request_with_compressed_payload_md_override (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_invoke_request_with_exceptionally_uncompressed_payload(config); + test_invoke_request_with_uncompressed_payload(config); + test_invoke_request_with_compressed_payload(config); + test_invoke_request_with_compressed_payload_md_override(config); } diff --git a/test/core/end2end/tests/default_host.c b/test/core/end2end/tests/default_host.c index 2bffa8d692e..7b62505a9a0 100644 --- a/test/core/end2end/tests/default_host.c +++ b/test/core/end2end/tests/default_host.c @@ -45,87 +45,65 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -simple_request_body (grpc_end2end_test_fixture f) -{ +static void simple_request_body(grpc_end2end_test_fixture f) { grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f.cq); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -139,18 +117,19 @@ simple_request_body (grpc_end2end_test_fixture f) int was_cancelled = 2; char *peer; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", NULL, deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", NULL, deadline, NULL); + GPR_ASSERT(c); - peer = grpc_call_get_peer (c); - GPR_ASSERT (peer != NULL); - gpr_log (GPR_DEBUG, "client_peer_before_call=%s", peer); - gpr_free (peer); + peer = grpc_call_get_peer(c); + GPR_ASSERT(peer != NULL); + gpr_log(GPR_DEBUG, "client_peer_before_call=%s", peer); + gpr_free(peer); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -175,22 +154,24 @@ simple_request_body (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (error == GRPC_CALL_OK); - - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (error == GRPC_CALL_OK); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); - - peer = grpc_call_get_peer (s); - GPR_ASSERT (peer != NULL); - gpr_log (GPR_DEBUG, "server_peer=%s", peer); - gpr_free (peer); - peer = grpc_call_get_peer (c); - GPR_ASSERT (peer != NULL); - gpr_log (GPR_DEBUG, "client_peer=%s", peer); - gpr_free (peer); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(error == GRPC_CALL_OK); + + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(error == GRPC_CALL_OK); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); + + peer = grpc_call_get_peer(s); + GPR_ASSERT(peer != NULL); + gpr_log(GPR_DEBUG, "server_peer=%s", peer); + gpr_free(peer); + peer = grpc_call_get_peer(c); + GPR_ASSERT(peer != NULL); + gpr_log(GPR_DEBUG, "client_peer=%s", peer); + gpr_free(peer); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -210,48 +191,44 @@ simple_request_body (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (error == GRPC_CALL_OK); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(error == GRPC_CALL_OK); - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strncmp (call_details.host, "localhost", 9)); - GPR_ASSERT (was_cancelled == 1); + GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strncmp(call_details.host, "localhost", 9)); + GPR_ASSERT(was_cancelled == 1); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); } -static void -test_invoke_simple_request (grpc_end2end_test_config config) -{ +static void test_invoke_simple_request(grpc_end2end_test_config config) { grpc_end2end_test_fixture f; - f = begin_test (config, "test_invoke_simple_request", NULL, NULL); - simple_request_body (f); - end_test (&f); - config.tear_down_data (&f); + f = begin_test(config, "test_invoke_simple_request", NULL, NULL); + simple_request_body(f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ +void grpc_end2end_tests(grpc_end2end_test_config config) { if ((config.feature_mask & FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION) != 0) return; if ((config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION) == 0) return; - test_invoke_simple_request (config); + test_invoke_simple_request(config); } diff --git a/test/core/end2end/tests/disappearing_server.c b/test/core/end2end/tests/disappearing_server.c index e1758706bcf..de3ea16f667 100644 --- a/test/core/end2end/tests/disappearing_server.c +++ b/test/core/end2end/tests/disappearing_server.c @@ -43,73 +43,49 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -do_request_and_shutdown_server (grpc_end2end_test_fixture * f, cq_verifier * cqv) -{ +static void do_request_and_shutdown_server(grpc_end2end_test_fixture *f, + cq_verifier *cqv) { grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time (); + gpr_timespec deadline = five_seconds_time(); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -122,13 +98,15 @@ do_request_and_shutdown_server (grpc_end2end_test_fixture * f, cq_verifier * cqv size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call (f->client, NULL, GRPC_PROPAGATE_DEFAULTS, f->cq, "/foo", "foo.test.google.fr:1234", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f->client, NULL, GRPC_PROPAGATE_DEFAULTS, f->cq, + "/foo", "foo.test.google.fr:1234", deadline, + NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -153,17 +131,19 @@ do_request_and_shutdown_server (grpc_end2end_test_fixture * f, cq_verifier * cqv op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f->server, &s, &call_details, &request_metadata_recv, f->cq, f->cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f->server, &s, &call_details, + &request_metadata_recv, f->cq, f->cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); /* should be able to shut down the server early - and still complete the request */ - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -183,57 +163,53 @@ do_request_and_shutdown_server (grpc_end2end_test_fixture * f, cq_verifier * cqv op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_expect_completion (cqv, tag (1000), 1); - cq_verify (cqv); - - GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT (was_cancelled == 1); - - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); - - grpc_call_destroy (c); - grpc_call_destroy (s); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_expect_completion(cqv, tag(1000), 1); + cq_verify(cqv); + + GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT(was_cancelled == 1); + + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); + + grpc_call_destroy(c); + grpc_call_destroy(s); } -static void -disappearing_server_test (grpc_end2end_test_config config) -{ - grpc_end2end_test_fixture f = config.create_fixture (NULL, NULL); - cq_verifier *cqv = cq_verifier_create (f.cq); +static void disappearing_server_test(grpc_end2end_test_config config) { + grpc_end2end_test_fixture f = config.create_fixture(NULL, NULL); + cq_verifier *cqv = cq_verifier_create(f.cq); - gpr_log (GPR_INFO, "%s/%s", "disappearing_server_test", config.name); + gpr_log(GPR_INFO, "%s/%s", "disappearing_server_test", config.name); - config.init_client (&f, NULL); - config.init_server (&f, NULL); + config.init_client(&f, NULL); + config.init_server(&f, NULL); - do_request_and_shutdown_server (&f, cqv); + do_request_and_shutdown_server(&f, cqv); /* now destroy and recreate the server */ - config.init_server (&f, NULL); + config.init_server(&f, NULL); - do_request_and_shutdown_server (&f, cqv); + do_request_and_shutdown_server(&f, cqv); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - GPR_ASSERT (config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION); - disappearing_server_test (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + GPR_ASSERT(config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION); + disappearing_server_test(config); } diff --git a/test/core/end2end/tests/empty_batch.c b/test/core/end2end/tests/empty_batch.c index a73bdc7b3f6..c93d236a6a7 100644 --- a/test/core/end2end/tests/empty_batch.c +++ b/test/core/end2end/tests/empty_batch.c @@ -45,115 +45,90 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -empty_batch_body (grpc_end2end_test_fixture f) -{ +static void empty_batch_body(grpc_end2end_test_fixture f) { grpc_call *c; - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f.cq); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_call_error error; grpc_op *op = NULL; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - error = grpc_call_start_batch (c, op, 0, tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + error = grpc_call_start_batch(c, op, 0, tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - grpc_call_destroy (c); + grpc_call_destroy(c); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); } -static void -test_invoke_empty_body (grpc_end2end_test_config config) -{ +static void test_invoke_empty_body(grpc_end2end_test_config config) { grpc_end2end_test_fixture f; - f = begin_test (config, "test_invoke_empty_body", NULL, NULL); - empty_batch_body (f); - end_test (&f); - config.tear_down_data (&f); + f = begin_test(config, "test_invoke_empty_body", NULL, NULL); + empty_batch_body(f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_invoke_empty_body (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_invoke_empty_body(config); } diff --git a/test/core/end2end/tests/graceful_server_shutdown.c b/test/core/end2end/tests/graceful_server_shutdown.c index b3e30964aea..df420a9846d 100644 --- a/test/core/end2end/tests/graceful_server_shutdown.c +++ b/test/core/end2end/tests/graceful_server_shutdown.c @@ -43,86 +43,64 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -test_early_server_shutdown_finishes_inflight_calls (grpc_end2end_test_config config) -{ +static void test_early_server_shutdown_finishes_inflight_calls( + grpc_end2end_test_config config) { grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time (); - grpc_end2end_test_fixture f = begin_test (config, "test_early_server_shutdown_finishes_inflight_calls", NULL, NULL); - cq_verifier *cqv = cq_verifier_create (f.cq); + gpr_timespec deadline = five_seconds_time(); + grpc_end2end_test_fixture f = begin_test( + config, "test_early_server_shutdown_finishes_inflight_calls", NULL, NULL); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -135,13 +113,14 @@ test_early_server_shutdown_finishes_inflight_calls (grpc_end2end_test_config con size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -167,17 +146,19 @@ test_early_server_shutdown_finishes_inflight_calls (grpc_end2end_test_config con op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); /* shutdown and destroy the server */ - grpc_server_shutdown_and_notify (f.server, f.cq, tag (0xdead)); - cq_verify_empty (cqv); + grpc_server_shutdown_and_notify(f.server, f.cq, tag(0xdead)); + cq_verify_empty(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -197,37 +178,35 @@ test_early_server_shutdown_finishes_inflight_calls (grpc_end2end_test_config con op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (0xdead), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(0xdead), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - grpc_call_destroy (s); + grpc_call_destroy(s); - GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); - GPR_ASSERT (was_cancelled == 1); + GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); + GPR_ASSERT(was_cancelled == 1); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); + grpc_call_destroy(c); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_early_server_shutdown_finishes_inflight_calls (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_early_server_shutdown_finishes_inflight_calls(config); } diff --git a/test/core/end2end/tests/high_initial_seqno.c b/test/core/end2end/tests/high_initial_seqno.c index 4d9d09cd809..44d6a60c104 100644 --- a/test/core/end2end/tests/high_initial_seqno.c +++ b/test/core/end2end/tests/high_initial_seqno.c @@ -45,87 +45,65 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -simple_request_body (grpc_end2end_test_fixture f) -{ +static void simple_request_body(grpc_end2end_test_fixture f) { grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f.cq); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -138,13 +116,15 @@ simple_request_body (grpc_end2end_test_fixture f) size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr:1234", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr:1234", deadline, + NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -169,13 +149,15 @@ simple_request_body (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -195,34 +177,33 @@ simple_request_body (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT (was_cancelled == 1); + GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT(was_cancelled == 1); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); } -static void -test_invoke_10_simple_requests (grpc_end2end_test_config config, int initial_sequence_number) -{ +static void test_invoke_10_simple_requests(grpc_end2end_test_config config, + int initial_sequence_number) { int i; grpc_end2end_test_fixture f; grpc_arg client_arg; @@ -235,22 +216,18 @@ test_invoke_10_simple_requests (grpc_end2end_test_config config, int initial_seq client_args.num_args = 1; client_args.args = &client_arg; - f = begin_test (config, "test_invoke_10_simple_requests", &client_args, NULL); - for (i = 0; i < 10; i++) - { - simple_request_body (f); - gpr_log (GPR_INFO, "Passed simple request %d", i); - } - end_test (&f); - config.tear_down_data (&f); + f = begin_test(config, "test_invoke_10_simple_requests", &client_args, NULL); + for (i = 0; i < 10; i++) { + simple_request_body(f); + gpr_log(GPR_INFO, "Passed simple request %d", i); + } + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_invoke_10_simple_requests (config, 16777213); - if (config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION) - { - test_invoke_10_simple_requests (config, 2147483645); - } +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_invoke_10_simple_requests(config, 16777213); + if (config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION) { + test_invoke_10_simple_requests(config, 2147483645); + } } diff --git a/test/core/end2end/tests/invoke_large_request.c b/test/core/end2end/tests/invoke_large_request.c index da19222c537..f79d146da10 100644 --- a/test/core/end2end/tests/invoke_large_request.c +++ b/test/core/end2end/tests/invoke_large_request.c @@ -43,95 +43,78 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, n_seconds_time (5), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, n_seconds_time(5), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static gpr_slice -large_slice (void) -{ - gpr_slice slice = gpr_slice_malloc (1000000); - memset (GPR_SLICE_START_PTR (slice), 'x', GPR_SLICE_LENGTH (slice)); +static gpr_slice large_slice(void) { + gpr_slice slice = gpr_slice_malloc(1000000); + memset(GPR_SLICE_START_PTR(slice), 'x', GPR_SLICE_LENGTH(slice)); return slice; } -static void -test_invoke_large_request (grpc_end2end_test_config config) -{ - grpc_end2end_test_fixture f = begin_test (config, "test_invoke_large_request", NULL, NULL); +static void test_invoke_large_request(grpc_end2end_test_config config) { + grpc_end2end_test_fixture f = + begin_test(config, "test_invoke_large_request", NULL, NULL); - gpr_slice request_payload_slice = large_slice (); - gpr_slice response_payload_slice = large_slice (); + gpr_slice request_payload_slice = large_slice(); + gpr_slice response_payload_slice = large_slice(); grpc_call *c; grpc_call *s; - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); - gpr_timespec deadline = n_seconds_time (30); - cq_verifier *cqv = cq_verifier_create (f.cq); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); + grpc_byte_buffer *response_payload = + grpc_raw_byte_buffer_create(&response_payload_slice, 1); + gpr_timespec deadline = n_seconds_time(30); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -146,13 +129,14 @@ test_invoke_large_request (grpc_end2end_test_config config) size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -187,13 +171,15 @@ test_invoke_large_request (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -206,11 +192,11 @@ test_invoke_large_request (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -230,43 +216,41 @@ test_invoke_large_request (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (103), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(103), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); - GPR_ASSERT (was_cancelled == 1); + GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); + GPR_ASSERT(was_cancelled == 1); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (response_payload); - grpc_byte_buffer_destroy (request_payload_recv); - grpc_byte_buffer_destroy (response_payload_recv); - gpr_slice_unref (request_payload_slice); - gpr_slice_unref (response_payload_slice); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(response_payload); + grpc_byte_buffer_destroy(request_payload_recv); + grpc_byte_buffer_destroy(response_payload_recv); + gpr_slice_unref(request_payload_slice); + gpr_slice_unref(response_payload_slice); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_invoke_large_request (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_invoke_large_request(config); } diff --git a/test/core/end2end/tests/large_metadata.c b/test/core/end2end/tests/large_metadata.c index ff7605ebe99..87529639a76 100644 --- a/test/core/end2end/tests/large_metadata.c +++ b/test/core/end2end/tests/large_metadata.c @@ -43,92 +43,72 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } /* Request with a large amount of metadata.*/ -static void -test_request_with_large_metadata (grpc_end2end_test_config config) -{ +static void test_request_with_large_metadata(grpc_end2end_test_config config) { grpc_call *c; grpc_call *s; - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - gpr_timespec deadline = five_seconds_time (); + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); + gpr_timespec deadline = five_seconds_time(); grpc_metadata meta; - grpc_end2end_test_fixture f = begin_test (config, "test_request_with_large_metadata", NULL, NULL); - cq_verifier *cqv = cq_verifier_create (f.cq); + grpc_end2end_test_fixture f = + begin_test(config, "test_request_with_large_metadata", NULL, NULL); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -143,19 +123,20 @@ test_request_with_large_metadata (grpc_end2end_test_config config) int was_cancelled = 2; const size_t large_size = 64 * 1024; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); meta.key = "key"; - meta.value = gpr_malloc (large_size + 1); - memset ((char *) meta.value, 'a', large_size); - ((char *) meta.value)[large_size] = 0; + meta.value = gpr_malloc(large_size + 1); + memset((char *)meta.value, 'a', large_size); + ((char *)meta.value)[large_size] = 0; meta.value_length = large_size; - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -186,13 +167,15 @@ test_request_with_large_metadata (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -205,11 +188,11 @@ test_request_with_large_metadata (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -224,43 +207,41 @@ test_request_with_large_metadata (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (103), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(103), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_OK); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); - GPR_ASSERT (was_cancelled == 0); - GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, "hello world")); - GPR_ASSERT (contains_metadata (&request_metadata_recv, "key", meta.value)); + GPR_ASSERT(status == GRPC_STATUS_OK); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); + GPR_ASSERT(was_cancelled == 0); + GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); + GPR_ASSERT(contains_metadata(&request_metadata_recv, "key", meta.value)); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (request_payload_recv); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(request_payload_recv); - gpr_free ((char *) meta.value); + gpr_free((char *)meta.value); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_request_with_large_metadata (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_request_with_large_metadata(config); } diff --git a/test/core/end2end/tests/max_concurrent_streams.c b/test/core/end2end/tests/max_concurrent_streams.c index 1d4ba32ee08..87eb4dd451e 100644 --- a/test/core/end2end/tests/max_concurrent_streams.c +++ b/test/core/end2end/tests/max_concurrent_streams.c @@ -43,87 +43,65 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -simple_request_body (grpc_end2end_test_fixture f) -{ +static void simple_request_body(grpc_end2end_test_fixture f) { grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f.cq); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -136,13 +114,15 @@ simple_request_body (grpc_end2end_test_fixture f) size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr:1234", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr:1234", deadline, + NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -167,13 +147,15 @@ simple_request_body (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -193,34 +175,32 @@ simple_request_body (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT (was_cancelled == 1); + GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT(was_cancelled == 1); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); } -static void -test_max_concurrent_streams (grpc_end2end_test_config config) -{ +static void test_max_concurrent_streams(grpc_end2end_test_config config) { grpc_end2end_test_fixture f; grpc_arg server_arg; grpc_channel_args server_args; @@ -258,31 +238,37 @@ test_max_concurrent_streams (grpc_end2end_test_config config) server_args.num_args = 1; server_args.args = &server_arg; - f = begin_test (config, "test_max_concurrent_streams", NULL, &server_args); - cqv = cq_verifier_create (f.cq); + f = begin_test(config, "test_max_concurrent_streams", NULL, &server_args); + cqv = cq_verifier_create(f.cq); - grpc_metadata_array_init (&request_metadata_recv); - grpc_metadata_array_init (&initial_metadata_recv1); - grpc_metadata_array_init (&trailing_metadata_recv1); - grpc_metadata_array_init (&initial_metadata_recv2); - grpc_metadata_array_init (&trailing_metadata_recv2); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&request_metadata_recv); + grpc_metadata_array_init(&initial_metadata_recv1); + grpc_metadata_array_init(&trailing_metadata_recv1); + grpc_metadata_array_init(&initial_metadata_recv2); + grpc_metadata_array_init(&trailing_metadata_recv2); + grpc_call_details_init(&call_details); /* perform a ping-pong to ensure that settings have had a chance to round trip */ - simple_request_body (f); + simple_request_body(f); /* perform another one to make sure that the one stream case still works */ - simple_request_body (f); + simple_request_body(f); /* start two requests - ensuring that the second is not accepted until the first completes */ - deadline = n_seconds_time (1000); - c1 = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/alpha", "foo.test.google.fr:1234", deadline, NULL); - GPR_ASSERT (c1); - c2 = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/beta", "foo.test.google.fr:1234", deadline, NULL); - GPR_ASSERT (c2); - - GPR_ASSERT (GRPC_CALL_OK == grpc_server_request_call (f.server, &s1, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101))); + deadline = n_seconds_time(1000); + c1 = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/alpha", "foo.test.google.fr:1234", deadline, + NULL); + GPR_ASSERT(c1); + c2 = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/beta", "foo.test.google.fr:1234", deadline, + NULL); + GPR_ASSERT(c2); + + GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call( + f.server, &s1, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101))); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -294,8 +280,8 @@ test_max_concurrent_streams (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c1, ops, (size_t) (op - ops), tag (301), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c1, ops, (size_t)(op - ops), tag(301), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); op = ops; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; @@ -311,8 +297,8 @@ test_max_concurrent_streams (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c1, ops, (size_t) (op - ops), tag (302), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c1, ops, (size_t)(op - ops), tag(302), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -324,8 +310,8 @@ test_max_concurrent_streams (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c2, ops, (size_t) (op - ops), tag (401), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c2, ops, (size_t)(op - ops), tag(401), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); op = ops; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; @@ -341,35 +327,32 @@ test_max_concurrent_streams (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c2, ops, (size_t) (op - ops), tag (402), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c2, ops, (size_t)(op - ops), tag(402), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); got_client_start = 0; got_server_start = 0; live_call = -1; - while (!got_client_start || !got_server_start) - { - ev = grpc_completion_queue_next (f.cq, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (3), NULL); - GPR_ASSERT (ev.type == GRPC_OP_COMPLETE); - GPR_ASSERT (ev.success); - if (ev.tag == tag (101)) - { - GPR_ASSERT (!got_server_start); - got_server_start = 1; - } - else - { - GPR_ASSERT (!got_client_start); - GPR_ASSERT (ev.tag == tag (301) || ev.tag == tag (401)); - /* The /alpha or /beta calls started above could be invoked (but NOT - * both); - * check this here */ - /* We'll get tag 303 or 403, we want 300, 400 */ - live_call = ((int) (gpr_intptr) ev.tag) - 1; - got_client_start = 1; - } + while (!got_client_start || !got_server_start) { + ev = grpc_completion_queue_next(f.cq, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), + NULL); + GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + GPR_ASSERT(ev.success); + if (ev.tag == tag(101)) { + GPR_ASSERT(!got_server_start); + got_server_start = 1; + } else { + GPR_ASSERT(!got_client_start); + GPR_ASSERT(ev.tag == tag(301) || ev.tag == tag(401)); + /* The /alpha or /beta calls started above could be invoked (but NOT + * both); + * check this here */ + /* We'll get tag 303 or 403, we want 300, 400 */ + live_call = ((int)(gpr_intptr)ev.tag) - 1; + got_client_start = 1; } - GPR_ASSERT (live_call == 300 || live_call == 400); + } + GPR_ASSERT(live_call == 300 || live_call == 400); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -389,19 +372,21 @@ test_max_concurrent_streams (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s1, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s1, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (live_call + 2), 1); + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(live_call + 2), 1); /* first request is finished, we should be able to start the second */ live_call = (live_call == 300) ? 400 : 300; - cq_expect_completion (cqv, tag (live_call + 1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(live_call + 1), 1); + cq_verify(cqv); - GPR_ASSERT (GRPC_CALL_OK == grpc_server_request_call (f.server, &s2, &call_details, &request_metadata_recv, f.cq, f.cq, tag (201))); - cq_expect_completion (cqv, tag (201), 1); - cq_verify (cqv); + GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call( + f.server, &s2, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(201))); + cq_expect_completion(cqv, tag(201), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -421,35 +406,33 @@ test_max_concurrent_streams (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s2, ops, (size_t) (op - ops), tag (202), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - - cq_expect_completion (cqv, tag (live_call + 2), 1); - cq_expect_completion (cqv, tag (202), 1); - cq_verify (cqv); - - cq_verifier_destroy (cqv); - - grpc_call_destroy (c1); - grpc_call_destroy (s1); - grpc_call_destroy (c2); - grpc_call_destroy (s2); - - gpr_free (details1); - gpr_free (details2); - grpc_metadata_array_destroy (&initial_metadata_recv1); - grpc_metadata_array_destroy (&trailing_metadata_recv1); - grpc_metadata_array_destroy (&initial_metadata_recv2); - grpc_metadata_array_destroy (&trailing_metadata_recv2); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); - - end_test (&f); - config.tear_down_data (&f); + error = grpc_call_start_batch(s2, ops, (size_t)(op - ops), tag(202), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + + cq_expect_completion(cqv, tag(live_call + 2), 1); + cq_expect_completion(cqv, tag(202), 1); + cq_verify(cqv); + + cq_verifier_destroy(cqv); + + grpc_call_destroy(c1); + grpc_call_destroy(s1); + grpc_call_destroy(c2); + grpc_call_destroy(s2); + + gpr_free(details1); + gpr_free(details2); + grpc_metadata_array_destroy(&initial_metadata_recv1); + grpc_metadata_array_destroy(&trailing_metadata_recv1); + grpc_metadata_array_destroy(&initial_metadata_recv2); + grpc_metadata_array_destroy(&trailing_metadata_recv2); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); + + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_max_concurrent_streams (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_max_concurrent_streams(config); } diff --git a/test/core/end2end/tests/max_message_length.c b/test/core/end2end/tests/max_message_length.c index e1949692cad..782b9d0f264 100644 --- a/test/core/end2end/tests/max_message_length.c +++ b/test/core/end2end/tests/max_message_length.c @@ -43,83 +43,61 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -test_max_message_length (grpc_end2end_test_config config) -{ +static void test_max_message_length(grpc_end2end_test_config config) { grpc_end2end_test_fixture f; grpc_arg server_arg; grpc_channel_args server_args; @@ -128,8 +106,9 @@ test_max_message_length (grpc_end2end_test_config config) cq_verifier *cqv; grpc_op ops[6]; grpc_op *op; - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; grpc_metadata_array request_metadata_recv; @@ -147,16 +126,18 @@ test_max_message_length (grpc_end2end_test_config config) server_args.num_args = 1; server_args.args = &server_arg; - f = begin_test (config, "test_max_message_length", NULL, &server_args); - cqv = cq_verifier_create (f.cq); + f = begin_test(config, "test_max_message_length", NULL, &server_args); + cqv = cq_verifier_create(f.cq); - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr:1234", gpr_inf_future (GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr:1234", + gpr_inf_future(GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -186,13 +167,15 @@ test_max_message_length (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -200,36 +183,34 @@ test_max_message_length (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status != GRPC_STATUS_OK); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT (was_cancelled == 1); + GPR_ASSERT(status != GRPC_STATUS_OK); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT(was_cancelled == 1); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); - grpc_byte_buffer_destroy (request_payload); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); + grpc_byte_buffer_destroy(request_payload); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_max_message_length (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_max_message_length(config); } diff --git a/test/core/end2end/tests/metadata.c b/test/core/end2end/tests/metadata.c index b1aefa77c6a..d0604cc6b6f 100644 --- a/test/core/end2end/tests/metadata.c +++ b/test/core/end2end/tests/metadata.c @@ -43,101 +43,81 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } /* Request/response with metadata and payload.*/ -static void -test_request_response_with_metadata_and_payload (grpc_end2end_test_config config) -{ +static void test_request_response_with_metadata_and_payload( + grpc_end2end_test_config config) { grpc_call *c; grpc_call *s; - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); - gpr_timespec deadline = five_seconds_time (); + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); + grpc_byte_buffer *response_payload = + grpc_raw_byte_buffer_create(&response_payload_slice, 1); + gpr_timespec deadline = five_seconds_time(); grpc_metadata meta_c[2] = { - {"key1", "val1", 4, 0, {{NULL, NULL, NULL, NULL}}}, - {"key2", "val2", 4, 0, {{NULL, NULL, NULL, NULL}}} - }; + {"key1", "val1", 4, 0, {{NULL, NULL, NULL, NULL}}}, + {"key2", "val2", 4, 0, {{NULL, NULL, NULL, NULL}}}}; grpc_metadata meta_s[2] = { - {"KeY3", "val3", 4, 0, {{NULL, NULL, NULL, NULL}}}, - {"KeY4", "val4", 4, 0, {{NULL, NULL, NULL, NULL}}} - }; - grpc_end2end_test_fixture f = begin_test (config, "test_request_response_with_metadata_and_payload", NULL, NULL); - cq_verifier *cqv = cq_verifier_create (f.cq); + {"KeY3", "val3", 4, 0, {{NULL, NULL, NULL, NULL}}}, + {"KeY4", "val4", 4, 0, {{NULL, NULL, NULL, NULL}}}}; + grpc_end2end_test_fixture f = begin_test( + config, "test_request_response_with_metadata_and_payload", NULL, NULL); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -152,13 +132,14 @@ test_request_response_with_metadata_and_payload (grpc_end2end_test_config config size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -194,13 +175,15 @@ test_request_response_with_metadata_and_payload (grpc_end2end_test_config config op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -214,11 +197,11 @@ test_request_response_with_metadata_and_payload (grpc_end2end_test_config config op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -238,47 +221,45 @@ test_request_response_with_metadata_and_payload (grpc_end2end_test_config config op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (103), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(103), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_OK); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); - GPR_ASSERT (was_cancelled == 0); - GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, "hello world")); - GPR_ASSERT (byte_buffer_eq_string (response_payload_recv, "hello you")); - GPR_ASSERT (contains_metadata (&request_metadata_recv, "key1", "val1")); - GPR_ASSERT (contains_metadata (&request_metadata_recv, "key2", "val2")); - GPR_ASSERT (contains_metadata (&initial_metadata_recv, "key3", "val3")); - GPR_ASSERT (contains_metadata (&initial_metadata_recv, "key4", "val4")); + GPR_ASSERT(status == GRPC_STATUS_OK); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); + GPR_ASSERT(was_cancelled == 0); + GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); + GPR_ASSERT(byte_buffer_eq_string(response_payload_recv, "hello you")); + GPR_ASSERT(contains_metadata(&request_metadata_recv, "key1", "val1")); + GPR_ASSERT(contains_metadata(&request_metadata_recv, "key2", "val2")); + GPR_ASSERT(contains_metadata(&initial_metadata_recv, "key3", "val3")); + GPR_ASSERT(contains_metadata(&initial_metadata_recv, "key4", "val4")); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (response_payload); - grpc_byte_buffer_destroy (request_payload_recv); - grpc_byte_buffer_destroy (response_payload_recv); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(response_payload); + grpc_byte_buffer_destroy(request_payload_recv); + grpc_byte_buffer_destroy(response_payload_recv); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_request_response_with_metadata_and_payload (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_request_response_with_metadata_and_payload(config); } diff --git a/test/core/end2end/tests/no_op.c b/test/core/end2end/tests/no_op.c index 0f15963a4a3..157d0d53490 100644 --- a/test/core/end2end/tests/no_op.c +++ b/test/core/end2end/tests/no_op.c @@ -43,90 +43,64 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -test_no_op (grpc_end2end_test_config config) -{ - grpc_end2end_test_fixture f = begin_test (config, "no-op", NULL, NULL); - end_test (&f); - config.tear_down_data (&f); +static void test_no_op(grpc_end2end_test_config config) { + grpc_end2end_test_fixture f = begin_test(config, "no-op", NULL, NULL); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_no_op (config); -} +void grpc_end2end_tests(grpc_end2end_test_config config) { test_no_op(config); } diff --git a/test/core/end2end/tests/payload.c b/test/core/end2end/tests/payload.c index 16749741356..0b303268fc6 100644 --- a/test/core/end2end/tests/payload.c +++ b/test/core/end2end/tests/payload.c @@ -43,91 +43,71 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -request_response_with_payload (grpc_end2end_test_fixture f) -{ - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); +static void request_response_with_payload(grpc_end2end_test_fixture f) { + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); grpc_call *c; grpc_call *s; - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f.cq); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); + grpc_byte_buffer *response_payload = + grpc_raw_byte_buffer_create(&response_payload_slice, 1); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -142,13 +122,14 @@ request_response_with_payload (grpc_end2end_test_fixture f) size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -183,13 +164,15 @@ request_response_with_payload (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -202,11 +185,11 @@ request_response_with_payload (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -226,65 +209,62 @@ request_response_with_payload (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (103), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(103), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_OK); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); - GPR_ASSERT (was_cancelled == 0); - GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, "hello world")); - GPR_ASSERT (byte_buffer_eq_string (response_payload_recv, "hello you")); + GPR_ASSERT(status == GRPC_STATUS_OK); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); + GPR_ASSERT(was_cancelled == 0); + GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); + GPR_ASSERT(byte_buffer_eq_string(response_payload_recv, "hello you")); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (response_payload); - grpc_byte_buffer_destroy (request_payload_recv); - grpc_byte_buffer_destroy (response_payload_recv); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(response_payload); + grpc_byte_buffer_destroy(request_payload_recv); + grpc_byte_buffer_destroy(response_payload_recv); } /* Client sends a request with payload, server reads then returns a response payload and status. */ -static void -test_invoke_request_response_with_payload (grpc_end2end_test_config config) -{ - grpc_end2end_test_fixture f = begin_test (config, "test_invoke_request_response_with_payload", NULL, NULL); - request_response_with_payload (f); - end_test (&f); - config.tear_down_data (&f); +static void test_invoke_request_response_with_payload( + grpc_end2end_test_config config) { + grpc_end2end_test_fixture f = begin_test( + config, "test_invoke_request_response_with_payload", NULL, NULL); + request_response_with_payload(f); + end_test(&f); + config.tear_down_data(&f); } -static void -test_invoke_10_request_response_with_payload (grpc_end2end_test_config config) -{ +static void test_invoke_10_request_response_with_payload( + grpc_end2end_test_config config) { int i; - grpc_end2end_test_fixture f = begin_test (config, "test_invoke_10_request_response_with_payload", NULL, NULL); - for (i = 0; i < 10; i++) - { - request_response_with_payload (f); - } - end_test (&f); - config.tear_down_data (&f); + grpc_end2end_test_fixture f = begin_test( + config, "test_invoke_10_request_response_with_payload", NULL, NULL); + for (i = 0; i < 10; i++) { + request_response_with_payload(f); + } + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_invoke_request_response_with_payload (config); - test_invoke_10_request_response_with_payload (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_invoke_request_response_with_payload(config); + test_invoke_10_request_response_with_payload(config); } diff --git a/test/core/end2end/tests/ping_pong_streaming.c b/test/core/end2end/tests/ping_pong_streaming.c index c3431dd03d3..39682d8bc50 100644 --- a/test/core/end2end/tests/ping_pong_streaming.c +++ b/test/core/end2end/tests/ping_pong_streaming.c @@ -43,89 +43,69 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } /* Client pings and server pongs. Repeat messages rounds before finishing. */ -static void -test_pingpong_streaming (grpc_end2end_test_config config, int messages) -{ - grpc_end2end_test_fixture f = begin_test (config, "test_pingpong_streaming", NULL, NULL); +static void test_pingpong_streaming(grpc_end2end_test_config config, + int messages) { + grpc_end2end_test_fixture f = + begin_test(config, "test_pingpong_streaming", NULL, NULL); grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f.cq); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -142,16 +122,18 @@ test_pingpong_streaming (grpc_end2end_test_config config, int messages) grpc_byte_buffer *response_payload; grpc_byte_buffer *response_payload_recv; int i; - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr:1234", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr:1234", deadline, + NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -172,13 +154,15 @@ test_pingpong_streaming (grpc_end2end_test_config config, int messages) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (100)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (100), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(100)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(100), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -191,67 +175,66 @@ test_pingpong_streaming (grpc_end2end_test_config config, int messages) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (101), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - - for (i = 0; i < messages; i++) - { - request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); - - op = ops; - op->op = GRPC_OP_SEND_MESSAGE; - op->data.send_message = request_payload; - op->flags = 0; - op->reserved = NULL; - op++; - op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message = &response_payload_recv; - op->flags = 0; - op->reserved = NULL; - op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (2), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - - op = ops; - op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message = &request_payload_recv; - op->flags = 0; - op->reserved = NULL; - op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_verify (cqv); - - op = ops; - op->op = GRPC_OP_SEND_MESSAGE; - op->data.send_message = response_payload; - op->flags = 0; - op->reserved = NULL; - op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (103), 1); - cq_expect_completion (cqv, tag (2), 1); - cq_verify (cqv); - - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (response_payload); - grpc_byte_buffer_destroy (request_payload_recv); - grpc_byte_buffer_destroy (response_payload_recv); - } - - gpr_slice_unref (request_payload_slice); - gpr_slice_unref (response_payload_slice); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(101), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + + for (i = 0; i < messages; i++) { + request_payload = grpc_raw_byte_buffer_create(&request_payload_slice, 1); + response_payload = grpc_raw_byte_buffer_create(&response_payload_slice, 1); + + op = ops; + op->op = GRPC_OP_SEND_MESSAGE; + op->data.send_message = request_payload; + op->flags = 0; + op->reserved = NULL; + op++; + op->op = GRPC_OP_RECV_MESSAGE; + op->data.recv_message = &response_payload_recv; + op->flags = 0; + op->reserved = NULL; + op++; + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(2), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + + op = ops; + op->op = GRPC_OP_RECV_MESSAGE; + op->data.recv_message = &request_payload_recv; + op->flags = 0; + op->reserved = NULL; + op++; + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(102), 1); + cq_verify(cqv); + + op = ops; + op->op = GRPC_OP_SEND_MESSAGE; + op->data.send_message = response_payload; + op->flags = 0; + op->reserved = NULL; + op++; + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(103), 1); + cq_expect_completion(cqv, tag(2), 1); + cq_verify(cqv); + + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(response_payload); + grpc_byte_buffer_destroy(request_payload_recv); + grpc_byte_buffer_destroy(response_payload_recv); + } + + gpr_slice_unref(request_payload_slice); + gpr_slice_unref(response_payload_slice); op = ops; op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (3), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(3), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); op = ops; op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; @@ -261,37 +244,34 @@ test_pingpong_streaming (grpc_end2end_test_config config, int messages) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (104), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(104), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (1), 1); - cq_expect_completion (cqv, tag (3), 1); - cq_expect_completion (cqv, tag (101), 1); - cq_expect_completion (cqv, tag (104), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(1), 1); + cq_expect_completion(cqv, tag(3), 1); + cq_expect_completion(cqv, tag(101), 1); + cq_expect_completion(cqv, tag(104), 1); + cq_verify(cqv); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); - gpr_free (details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); + gpr_free(details); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ +void grpc_end2end_tests(grpc_end2end_test_config config) { int i; - for (i = 1; i < 10; i++) - { - test_pingpong_streaming (config, i); - } + for (i = 1; i < 10; i++) { + test_pingpong_streaming(config, i); + } } diff --git a/test/core/end2end/tests/registered_call.c b/test/core/end2end/tests/registered_call.c index b30498a9900..b3156e0248a 100644 --- a/test/core/end2end/tests/registered_call.c +++ b/test/core/end2end/tests/registered_call.c @@ -45,87 +45,65 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -simple_request_body (grpc_end2end_test_fixture f, void *rc) -{ +static void simple_request_body(grpc_end2end_test_fixture f, void *rc) { grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f.cq); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -138,13 +116,14 @@ simple_request_body (grpc_end2end_test_fixture f, void *rc) size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_registered_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, rc, deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_registered_call( + f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, rc, deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -169,13 +148,15 @@ simple_request_body (grpc_end2end_test_fixture f, void *rc) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -195,63 +176,58 @@ simple_request_body (grpc_end2end_test_fixture f, void *rc) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT (was_cancelled == 1); + GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT(was_cancelled == 1); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); } -static void -test_invoke_simple_request (grpc_end2end_test_config config) -{ - grpc_end2end_test_fixture f = begin_test (config, "test_invoke_simple_request", NULL, NULL); - void *rc = grpc_channel_register_call (f.client, "/foo", - "foo.test.google.fr:1234", NULL); +static void test_invoke_simple_request(grpc_end2end_test_config config) { + grpc_end2end_test_fixture f = + begin_test(config, "test_invoke_simple_request", NULL, NULL); + void *rc = grpc_channel_register_call(f.client, "/foo", + "foo.test.google.fr:1234", NULL); - simple_request_body (f, rc); - end_test (&f); - config.tear_down_data (&f); + simple_request_body(f, rc); + end_test(&f); + config.tear_down_data(&f); } -static void -test_invoke_10_simple_requests (grpc_end2end_test_config config) -{ +static void test_invoke_10_simple_requests(grpc_end2end_test_config config) { int i; - grpc_end2end_test_fixture f = begin_test (config, "test_invoke_10_simple_requests", NULL, NULL); - void *rc = grpc_channel_register_call (f.client, "/foo", - "foo.test.google.fr:1234", NULL); - - for (i = 0; i < 10; i++) - { - simple_request_body (f, rc); - gpr_log (GPR_INFO, "Passed simple request %d", i); - } - end_test (&f); - config.tear_down_data (&f); + grpc_end2end_test_fixture f = + begin_test(config, "test_invoke_10_simple_requests", NULL, NULL); + void *rc = grpc_channel_register_call(f.client, "/foo", + "foo.test.google.fr:1234", NULL); + + for (i = 0; i < 10; i++) { + simple_request_body(f, rc); + gpr_log(GPR_INFO, "Passed simple request %d", i); + } + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_invoke_simple_request (config); - test_invoke_10_simple_requests (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_invoke_simple_request(config); + test_invoke_10_simple_requests(config); } diff --git a/test/core/end2end/tests/request_with_flags.c b/test/core/end2end/tests/request_with_flags.c index 49474bb14fc..b9cdf5168ce 100644 --- a/test/core/end2end/tests/request_with_flags.c +++ b/test/core/end2end/tests/request_with_flags.c @@ -44,89 +44,71 @@ #include "src/core/transport/stream_op.h" #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -test_invoke_request_with_flags (grpc_end2end_test_config config, gpr_uint32 * flags_for_op, grpc_call_error call_start_batch_expected_result) -{ +static void test_invoke_request_with_flags( + grpc_end2end_test_config config, gpr_uint32 *flags_for_op, + grpc_call_error call_start_batch_expected_result) { grpc_call *c; - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - gpr_timespec deadline = GRPC_TIMEOUT_MILLIS_TO_DEADLINE (10); - grpc_end2end_test_fixture f = begin_test (config, "test_invoke_request_with_flags", NULL, NULL); - cq_verifier *cqv = cq_verifier_create (f.cq); + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); + gpr_timespec deadline = GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10); + grpc_end2end_test_fixture f = + begin_test(config, "test_invoke_request_with_flags", NULL, NULL); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -140,13 +122,14 @@ test_invoke_request_with_flags (grpc_end2end_test_config config, gpr_uint32 * fl size_t details_capacity = 0; grpc_call_error expectation; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -177,63 +160,57 @@ test_invoke_request_with_flags (grpc_end2end_test_config config, gpr_uint32 * fl op->reserved = NULL; op++; expectation = call_start_batch_expected_result; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (expectation == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(expectation == error); - if (expectation == GRPC_CALL_OK) - { - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); - } + if (expectation == GRPC_CALL_OK) { + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); + } - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); + grpc_call_destroy(c); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (request_payload_recv); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(request_payload_recv); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ +void grpc_end2end_tests(grpc_end2end_test_config config) { size_t i; gpr_uint32 flags_for_op[GRPC_OP_RECV_CLOSE_ON_SERVER + 1]; { /* check that all grpc_op_types fail when their flag value is set to an * invalid value */ - int indices[] = { GRPC_OP_SEND_INITIAL_METADATA, GRPC_OP_SEND_MESSAGE, - GRPC_OP_SEND_CLOSE_FROM_CLIENT, - GRPC_OP_RECV_INITIAL_METADATA, - GRPC_OP_RECV_STATUS_ON_CLIENT - }; - for (i = 0; i < GPR_ARRAY_SIZE (indices); ++i) - { - memset (flags_for_op, 0, sizeof (flags_for_op)); - flags_for_op[indices[i]] = 0xDEADBEEF; - test_invoke_request_with_flags (config, flags_for_op, GRPC_CALL_ERROR_INVALID_FLAGS); - } + int indices[] = {GRPC_OP_SEND_INITIAL_METADATA, GRPC_OP_SEND_MESSAGE, + GRPC_OP_SEND_CLOSE_FROM_CLIENT, + GRPC_OP_RECV_INITIAL_METADATA, + GRPC_OP_RECV_STATUS_ON_CLIENT}; + for (i = 0; i < GPR_ARRAY_SIZE(indices); ++i) { + memset(flags_for_op, 0, sizeof(flags_for_op)); + flags_for_op[indices[i]] = 0xDEADBEEF; + test_invoke_request_with_flags(config, flags_for_op, + GRPC_CALL_ERROR_INVALID_FLAGS); + } } { /* check valid operation with allowed flags for GRPC_OP_SEND_BUFFER */ - gpr_uint32 flags[] = { GRPC_WRITE_BUFFER_HINT, GRPC_WRITE_NO_COMPRESS, - GRPC_WRITE_INTERNAL_COMPRESS - }; - for (i = 0; i < GPR_ARRAY_SIZE (flags); ++i) - { - memset (flags_for_op, 0, sizeof (flags_for_op)); - flags_for_op[GRPC_OP_SEND_MESSAGE] = flags[i]; - test_invoke_request_with_flags (config, flags_for_op, GRPC_CALL_OK); - } + gpr_uint32 flags[] = {GRPC_WRITE_BUFFER_HINT, GRPC_WRITE_NO_COMPRESS, + GRPC_WRITE_INTERNAL_COMPRESS}; + for (i = 0; i < GPR_ARRAY_SIZE(flags); ++i) { + memset(flags_for_op, 0, sizeof(flags_for_op)); + flags_for_op[GRPC_OP_SEND_MESSAGE] = flags[i]; + test_invoke_request_with_flags(config, flags_for_op, GRPC_CALL_OK); + } } } diff --git a/test/core/end2end/tests/request_with_payload.c b/test/core/end2end/tests/request_with_payload.c index bbfbae8140e..a323b43ab08 100644 --- a/test/core/end2end/tests/request_with_payload.c +++ b/test/core/end2end/tests/request_with_payload.c @@ -43,91 +43,71 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } /* Client sends a request with payload, server reads then returns status. */ -static void -test_invoke_request_with_payload (grpc_end2end_test_config config) -{ +static void test_invoke_request_with_payload(grpc_end2end_test_config config) { grpc_call *c; grpc_call *s; - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - gpr_timespec deadline = five_seconds_time (); - grpc_end2end_test_fixture f = begin_test (config, "test_invoke_request_with_payload", NULL, NULL); - cq_verifier *cqv = cq_verifier_create (f.cq); + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); + gpr_timespec deadline = five_seconds_time(); + grpc_end2end_test_fixture f = + begin_test(config, "test_invoke_request_with_payload", NULL, NULL); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -141,13 +121,14 @@ test_invoke_request_with_payload (grpc_end2end_test_config config) size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -177,12 +158,14 @@ test_invoke_request_with_payload (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - GPR_ASSERT (GRPC_CALL_OK == grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101))); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call( + f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101))); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -195,11 +178,11 @@ test_invoke_request_with_payload (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -214,40 +197,38 @@ test_invoke_request_with_payload (grpc_end2end_test_config config) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (103), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(103), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_OK); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); - GPR_ASSERT (was_cancelled == 0); - GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, "hello world")); + GPR_ASSERT(status == GRPC_STATUS_OK); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); + GPR_ASSERT(was_cancelled == 0); + GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (request_payload_recv); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(request_payload_recv); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_invoke_request_with_payload (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_invoke_request_with_payload(config); } diff --git a/test/core/end2end/tests/server_finishes_request.c b/test/core/end2end/tests/server_finishes_request.c index 14830735a23..bdc18a5e381 100644 --- a/test/core/end2end/tests/server_finishes_request.c +++ b/test/core/end2end/tests/server_finishes_request.c @@ -45,87 +45,65 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -simple_request_body (grpc_end2end_test_fixture f) -{ +static void simple_request_body(grpc_end2end_test_fixture f) { grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f.cq); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -138,13 +116,15 @@ simple_request_body (grpc_end2end_test_fixture f) size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr:1234", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr:1234", deadline, + NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -165,13 +145,15 @@ simple_request_body (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -191,44 +173,40 @@ simple_request_body (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT (was_cancelled == 1); + GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT(was_cancelled == 1); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); } -static void -test_invoke_simple_request (grpc_end2end_test_config config) -{ +static void test_invoke_simple_request(grpc_end2end_test_config config) { grpc_end2end_test_fixture f; - f = begin_test (config, "test_invoke_simple_request", NULL, NULL); - simple_request_body (f); - end_test (&f); - config.tear_down_data (&f); + f = begin_test(config, "test_invoke_simple_request", NULL, NULL); + simple_request_body(f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_invoke_simple_request (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_invoke_simple_request(config); } diff --git a/test/core/end2end/tests/shutdown_finishes_calls.c b/test/core/end2end/tests/shutdown_finishes_calls.c index a9d8535e314..ad7def09a94 100644 --- a/test/core/end2end/tests/shutdown_finishes_calls.c +++ b/test/core/end2end/tests/shutdown_finishes_calls.c @@ -43,76 +43,57 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -test_early_server_shutdown_finishes_inflight_calls (grpc_end2end_test_config config) -{ +static void test_early_server_shutdown_finishes_inflight_calls( + grpc_end2end_test_config config) { grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time (); - grpc_end2end_test_fixture f = begin_test (config, "test_early_server_shutdown_finishes_inflight_calls", NULL, NULL); - cq_verifier *cqv = cq_verifier_create (f.cq); + gpr_timespec deadline = five_seconds_time(); + grpc_end2end_test_fixture f = begin_test( + config, "test_early_server_shutdown_finishes_inflight_calls", NULL, NULL); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -125,13 +106,14 @@ test_early_server_shutdown_finishes_inflight_calls (grpc_end2end_test_config con size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -157,13 +139,15 @@ test_early_server_shutdown_finishes_inflight_calls (grpc_end2end_test_config con op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -171,42 +155,40 @@ test_early_server_shutdown_finishes_inflight_calls (grpc_end2end_test_config con op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); /* shutdown and destroy the server */ - grpc_server_shutdown_and_notify (f.server, f.cq, tag (1000)); - grpc_server_cancel_all_calls (f.server); + grpc_server_shutdown_and_notify(f.server, f.cq, tag(1000)); + grpc_server_cancel_all_calls(f.server); - cq_expect_completion (cqv, tag (1000), 1); - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(1000), 1); + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - grpc_server_destroy (f.server); + grpc_server_destroy(f.server); - GPR_ASSERT (status == GRPC_STATUS_UNAVAILABLE); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); - GPR_ASSERT (was_cancelled == 1); + GPR_ASSERT(status == GRPC_STATUS_UNAVAILABLE); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); + GPR_ASSERT(was_cancelled == 1); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_early_server_shutdown_finishes_inflight_calls (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_early_server_shutdown_finishes_inflight_calls(config); } diff --git a/test/core/end2end/tests/shutdown_finishes_tags.c b/test/core/end2end/tests/shutdown_finishes_tags.c index 9569d42424d..9b678a17541 100644 --- a/test/core/end2end/tests/shutdown_finishes_tags.c +++ b/test/core/end2end/tests/shutdown_finishes_tags.c @@ -43,98 +43,79 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -test_early_server_shutdown_finishes_tags (grpc_end2end_test_config config) -{ - grpc_end2end_test_fixture f = begin_test (config, "test_early_server_shutdown_finishes_tags", NULL, NULL); - cq_verifier *cqv = cq_verifier_create (f.cq); - grpc_call *s = (void *) 1; +static void test_early_server_shutdown_finishes_tags( + grpc_end2end_test_config config) { + grpc_end2end_test_fixture f = begin_test( + config, "test_early_server_shutdown_finishes_tags", NULL, NULL); + cq_verifier *cqv = cq_verifier_create(f.cq); + grpc_call *s = (void *)1; grpc_call_details call_details; grpc_metadata_array request_metadata_recv; - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); /* upon shutdown, the server should finish all requested calls indicating no new call */ - GPR_ASSERT (GRPC_CALL_OK == grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101))); - grpc_server_shutdown_and_notify (f.server, f.cq, tag (1000)); - cq_expect_completion (cqv, tag (101), 0); - cq_expect_completion (cqv, tag (1000), 1); - cq_verify (cqv); - GPR_ASSERT (s == NULL); - - grpc_server_destroy (f.server); - - end_test (&f); - config.tear_down_data (&f); - cq_verifier_destroy (cqv); + GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call( + f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101))); + grpc_server_shutdown_and_notify(f.server, f.cq, tag(1000)); + cq_expect_completion(cqv, tag(101), 0); + cq_expect_completion(cqv, tag(1000), 1); + cq_verify(cqv); + GPR_ASSERT(s == NULL); + + grpc_server_destroy(f.server); + + end_test(&f); + config.tear_down_data(&f); + cq_verifier_destroy(cqv); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_early_server_shutdown_finishes_tags (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_early_server_shutdown_finishes_tags(config); } diff --git a/test/core/end2end/tests/simple_delayed_request.c b/test/core/end2end/tests/simple_delayed_request.c index ea21827b3ea..14e0ac8f665 100644 --- a/test/core/end2end/tests/simple_delayed_request.c +++ b/test/core/end2end/tests/simple_delayed_request.c @@ -43,76 +43,57 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -simple_delayed_request_body (grpc_end2end_test_config config, grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_channel_args * server_args, long delay_us) -{ +static void simple_delayed_request_body(grpc_end2end_test_config config, + grpc_end2end_test_fixture *f, + grpc_channel_args *client_args, + grpc_channel_args *server_args, + long delay_us) { grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f->cq); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f->cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -125,15 +106,16 @@ simple_delayed_request_body (grpc_end2end_test_config config, grpc_end2end_test_ size_t details_capacity = 0; int was_cancelled = 2; - config.init_client (f, client_args); + config.init_client(f, client_args); - c = grpc_channel_create_call (f->client, NULL, GRPC_PROPAGATE_DEFAULTS, f->cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f->client, NULL, GRPC_PROPAGATE_DEFAULTS, f->cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -158,15 +140,17 @@ simple_delayed_request_body (grpc_end2end_test_config config, grpc_end2end_test_ op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - config.init_server (f, server_args); + config.init_server(f, server_args); - error = grpc_server_request_call (f->server, &s, &call_details, &request_metadata_recv, f->cq, f->cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f->server, &s, &call_details, + &request_metadata_recv, f->cq, f->cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -186,60 +170,54 @@ simple_delayed_request_body (grpc_end2end_test_config config, grpc_end2end_test_ op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); - GPR_ASSERT (was_cancelled == 1); + GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); + GPR_ASSERT(was_cancelled == 1); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); } -static void -test_simple_delayed_request_short (grpc_end2end_test_config config) -{ +static void test_simple_delayed_request_short(grpc_end2end_test_config config) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", "test_simple_delayed_request_short", config.name); - f = config.create_fixture (NULL, NULL); - simple_delayed_request_body (config, &f, NULL, NULL, 100000); - end_test (&f); - config.tear_down_data (&f); + gpr_log(GPR_INFO, "%s/%s", "test_simple_delayed_request_short", config.name); + f = config.create_fixture(NULL, NULL); + simple_delayed_request_body(config, &f, NULL, NULL, 100000); + end_test(&f); + config.tear_down_data(&f); } -static void -test_simple_delayed_request_long (grpc_end2end_test_config config) -{ +static void test_simple_delayed_request_long(grpc_end2end_test_config config) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", "test_simple_delayed_request_long", config.name); - f = config.create_fixture (NULL, NULL); + gpr_log(GPR_INFO, "%s/%s", "test_simple_delayed_request_long", config.name); + f = config.create_fixture(NULL, NULL); /* This timeout should be longer than a single retry */ - simple_delayed_request_body (config, &f, NULL, NULL, 1500000); - end_test (&f); - config.tear_down_data (&f); + simple_delayed_request_body(config, &f, NULL, NULL, 1500000); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - GPR_ASSERT (config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION); - test_simple_delayed_request_short (config); - test_simple_delayed_request_long (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + GPR_ASSERT(config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION); + test_simple_delayed_request_short(config); + test_simple_delayed_request_long(config); } diff --git a/test/core/end2end/tests/simple_request.c b/test/core/end2end/tests/simple_request.c index 76f00912984..a8746408372 100644 --- a/test/core/end2end/tests/simple_request.c +++ b/test/core/end2end/tests/simple_request.c @@ -45,87 +45,65 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } -static void -simple_request_body (grpc_end2end_test_fixture f) -{ +static void simple_request_body(grpc_end2end_test_fixture f) { grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time (); - cq_verifier *cqv = cq_verifier_create (f.cq); + gpr_timespec deadline = five_seconds_time(); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -139,18 +117,20 @@ simple_request_body (grpc_end2end_test_fixture f) int was_cancelled = 2; char *peer; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr:1234", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr:1234", deadline, + NULL); + GPR_ASSERT(c); - peer = grpc_call_get_peer (c); - GPR_ASSERT (peer != NULL); - gpr_log (GPR_DEBUG, "client_peer_before_call=%s", peer); - gpr_free (peer); + peer = grpc_call_get_peer(c); + GPR_ASSERT(peer != NULL); + gpr_log(GPR_DEBUG, "client_peer_before_call=%s", peer); + gpr_free(peer); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -175,22 +155,24 @@ simple_request_body (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); - - peer = grpc_call_get_peer (s); - GPR_ASSERT (peer != NULL); - gpr_log (GPR_DEBUG, "server_peer=%s", peer); - gpr_free (peer); - peer = grpc_call_get_peer (c); - GPR_ASSERT (peer != NULL); - gpr_log (GPR_DEBUG, "client_peer=%s", peer); - gpr_free (peer); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); + + peer = grpc_call_get_peer(s); + GPR_ASSERT(peer != NULL); + gpr_log(GPR_DEBUG, "server_peer=%s", peer); + gpr_free(peer); + peer = grpc_call_get_peer(c); + GPR_ASSERT(peer != NULL); + gpr_log(GPR_DEBUG, "client_peer=%s", peer); + gpr_free(peer); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -210,63 +192,56 @@ simple_request_body (grpc_end2end_test_fixture f) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_UNIMPLEMENTED); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr:1234")); - GPR_ASSERT (was_cancelled == 1); + GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234")); + GPR_ASSERT(was_cancelled == 1); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); } -static void -test_invoke_simple_request (grpc_end2end_test_config config) -{ +static void test_invoke_simple_request(grpc_end2end_test_config config) { grpc_end2end_test_fixture f; - f = begin_test (config, "test_invoke_simple_request", NULL, NULL); - simple_request_body (f); - end_test (&f); - config.tear_down_data (&f); + f = begin_test(config, "test_invoke_simple_request", NULL, NULL); + simple_request_body(f); + end_test(&f); + config.tear_down_data(&f); } -static void -test_invoke_10_simple_requests (grpc_end2end_test_config config) -{ +static void test_invoke_10_simple_requests(grpc_end2end_test_config config) { int i; - grpc_end2end_test_fixture f = begin_test (config, "test_invoke_10_simple_requests", NULL, NULL); - for (i = 0; i < 10; i++) - { - simple_request_body (f); - gpr_log (GPR_INFO, "Passed simple request %d", i); - } - end_test (&f); - config.tear_down_data (&f); + grpc_end2end_test_fixture f = + begin_test(config, "test_invoke_10_simple_requests", NULL, NULL); + for (i = 0; i < 10; i++) { + simple_request_body(f); + gpr_log(GPR_INFO, "Passed simple request %d", i); + } + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ +void grpc_end2end_tests(grpc_end2end_test_config config) { int i; - for (i = 0; i < 10; i++) - { - test_invoke_simple_request (config); - } - test_invoke_10_simple_requests (config); + for (i = 0; i < 10; i++) { + test_invoke_simple_request(config); + } + test_invoke_10_simple_requests(config); } diff --git a/test/core/end2end/tests/trailing_metadata.c b/test/core/end2end/tests/trailing_metadata.c index 28bcfadc8a8..c040b9fac14 100644 --- a/test/core/end2end/tests/trailing_metadata.c +++ b/test/core/end2end/tests/trailing_metadata.c @@ -43,105 +43,84 @@ #include #include "test/core/end2end/cq_verifier.h" -enum -{ TIMEOUT = 200000 }; +enum { TIMEOUT = 200000 }; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -static grpc_end2end_test_fixture -begin_test (grpc_end2end_test_config config, const char *test_name, grpc_channel_args * client_args, grpc_channel_args * server_args) -{ +static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, + const char *test_name, + grpc_channel_args *client_args, + grpc_channel_args *server_args) { grpc_end2end_test_fixture f; - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - f = config.create_fixture (client_args, server_args); - config.init_client (&f, client_args); - config.init_server (&f, server_args); + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + f = config.create_fixture(client_args, server_args); + config.init_client(&f, client_args); + config.init_server(&f, server_args); return f; } -static gpr_timespec -n_seconds_time (int n) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (n); +static gpr_timespec n_seconds_time(int n) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } -static gpr_timespec -five_seconds_time (void) -{ - return n_seconds_time (5); -} +static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } -static void -drain_cq (grpc_completion_queue * cq) -{ +static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; - do - { - ev = grpc_completion_queue_next (cq, five_seconds_time (), NULL); - } - while (ev.type != GRPC_QUEUE_SHUTDOWN); + do { + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } -static void -shutdown_server (grpc_end2end_test_fixture * f) -{ - if (!f->server) - return; - grpc_server_shutdown_and_notify (f->server, f->cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (f->cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_server_destroy (f->server); +static void shutdown_server(grpc_end2end_test_fixture *f) { + if (!f->server) return; + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_server_destroy(f->server); f->server = NULL; } -static void -shutdown_client (grpc_end2end_test_fixture * f) -{ - if (!f->client) - return; - grpc_channel_destroy (f->client); +static void shutdown_client(grpc_end2end_test_fixture *f) { + if (!f->client) return; + grpc_channel_destroy(f->client); f->client = NULL; } -static void -end_test (grpc_end2end_test_fixture * f) -{ - shutdown_server (f); - shutdown_client (f); +static void end_test(grpc_end2end_test_fixture *f) { + shutdown_server(f); + shutdown_client(f); - grpc_completion_queue_shutdown (f->cq); - drain_cq (f->cq); - grpc_completion_queue_destroy (f->cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } /* Request/response with metadata and payload.*/ -static void -test_request_response_with_metadata_and_payload (grpc_end2end_test_config config) -{ +static void test_request_response_with_metadata_and_payload( + grpc_end2end_test_config config) { grpc_call *c; grpc_call *s; - gpr_slice request_payload_slice = gpr_slice_from_copied_string ("hello world"); - gpr_slice response_payload_slice = gpr_slice_from_copied_string ("hello you"); - grpc_byte_buffer *request_payload = grpc_raw_byte_buffer_create (&request_payload_slice, 1); - grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create (&response_payload_slice, 1); - gpr_timespec deadline = five_seconds_time (); + gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world"); + gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you"); + grpc_byte_buffer *request_payload = + grpc_raw_byte_buffer_create(&request_payload_slice, 1); + grpc_byte_buffer *response_payload = + grpc_raw_byte_buffer_create(&response_payload_slice, 1); + gpr_timespec deadline = five_seconds_time(); grpc_metadata meta_c[2] = { - {"key1", "val1", 4, 0, {{NULL, NULL, NULL, NULL}}}, - {"key2", "val2", 4, 0, {{NULL, NULL, NULL, NULL}}} - }; + {"key1", "val1", 4, 0, {{NULL, NULL, NULL, NULL}}}, + {"key2", "val2", 4, 0, {{NULL, NULL, NULL, NULL}}}}; grpc_metadata meta_s[2] = { - {"key3", "val3", 4, 0, {{NULL, NULL, NULL, NULL}}}, - {"key4", "val4", 4, 0, {{NULL, NULL, NULL, NULL}}} - }; + {"key3", "val3", 4, 0, {{NULL, NULL, NULL, NULL}}}, + {"key4", "val4", 4, 0, {{NULL, NULL, NULL, NULL}}}}; grpc_metadata meta_t[2] = { - {"key5", "val5", 4, 0, {{NULL, NULL, NULL, NULL}}}, - {"key6", "val6", 4, 0, {{NULL, NULL, NULL, NULL}}} - }; - grpc_end2end_test_fixture f = begin_test (config, "test_request_response_with_metadata_and_payload", NULL, NULL); - cq_verifier *cqv = cq_verifier_create (f.cq); + {"key5", "val5", 4, 0, {{NULL, NULL, NULL, NULL}}}, + {"key6", "val6", 4, 0, {{NULL, NULL, NULL, NULL}}}}; + grpc_end2end_test_fixture f = begin_test( + config, "test_request_response_with_metadata_and_payload", NULL, NULL); + cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; grpc_metadata_array initial_metadata_recv; @@ -156,13 +135,14 @@ test_request_response_with_metadata_and_payload (grpc_end2end_test_config config size_t details_capacity = 0; int was_cancelled = 2; - c = grpc_channel_create_call (f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", "foo.test.google.fr", deadline, NULL); - GPR_ASSERT (c); + c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + "/foo", "foo.test.google.fr", deadline, NULL); + GPR_ASSERT(c); - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); - grpc_metadata_array_init (&request_metadata_recv); - grpc_call_details_init (&call_details); + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_metadata_array_init(&request_metadata_recv); + grpc_call_details_init(&call_details); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -198,13 +178,15 @@ test_request_response_with_metadata_and_payload (grpc_end2end_test_config config op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (c, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - error = grpc_server_request_call (f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag (101)); - GPR_ASSERT (GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (101), 1); - cq_verify (cqv); + error = + grpc_server_request_call(f.server, &s, &call_details, + &request_metadata_recv, f.cq, f.cq, tag(101)); + GPR_ASSERT(GRPC_CALL_OK == error); + cq_expect_completion(cqv, tag(101), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -218,11 +200,11 @@ test_request_response_with_metadata_and_payload (grpc_end2end_test_config config op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (102), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (102), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(102), 1); + cq_verify(cqv); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -243,48 +225,46 @@ test_request_response_with_metadata_and_payload (grpc_end2end_test_config config op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (s, ops, (size_t) (op - ops), tag (103), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion (cqv, tag (103), 1); - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(103), 1); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - GPR_ASSERT (status == GRPC_STATUS_OK); - GPR_ASSERT (0 == strcmp (details, "xyz")); - GPR_ASSERT (0 == strcmp (call_details.method, "/foo")); - GPR_ASSERT (0 == strcmp (call_details.host, "foo.test.google.fr")); - GPR_ASSERT (byte_buffer_eq_string (request_payload_recv, "hello world")); - GPR_ASSERT (byte_buffer_eq_string (response_payload_recv, "hello you")); - GPR_ASSERT (contains_metadata (&request_metadata_recv, "key1", "val1")); - GPR_ASSERT (contains_metadata (&request_metadata_recv, "key2", "val2")); - GPR_ASSERT (contains_metadata (&initial_metadata_recv, "key3", "val3")); - GPR_ASSERT (contains_metadata (&initial_metadata_recv, "key4", "val4")); - GPR_ASSERT (contains_metadata (&trailing_metadata_recv, "key5", "val5")); - GPR_ASSERT (contains_metadata (&trailing_metadata_recv, "key6", "val6")); + GPR_ASSERT(status == GRPC_STATUS_OK); + GPR_ASSERT(0 == strcmp(details, "xyz")); + GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); + GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); + GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); + GPR_ASSERT(byte_buffer_eq_string(response_payload_recv, "hello you")); + GPR_ASSERT(contains_metadata(&request_metadata_recv, "key1", "val1")); + GPR_ASSERT(contains_metadata(&request_metadata_recv, "key2", "val2")); + GPR_ASSERT(contains_metadata(&initial_metadata_recv, "key3", "val3")); + GPR_ASSERT(contains_metadata(&initial_metadata_recv, "key4", "val4")); + GPR_ASSERT(contains_metadata(&trailing_metadata_recv, "key5", "val5")); + GPR_ASSERT(contains_metadata(&trailing_metadata_recv, "key6", "val6")); - gpr_free (details); - grpc_metadata_array_destroy (&initial_metadata_recv); - grpc_metadata_array_destroy (&trailing_metadata_recv); - grpc_metadata_array_destroy (&request_metadata_recv); - grpc_call_details_destroy (&call_details); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_metadata_array_destroy(&request_metadata_recv); + grpc_call_details_destroy(&call_details); - grpc_call_destroy (c); - grpc_call_destroy (s); + grpc_call_destroy(c); + grpc_call_destroy(s); - cq_verifier_destroy (cqv); + cq_verifier_destroy(cqv); - grpc_byte_buffer_destroy (request_payload); - grpc_byte_buffer_destroy (response_payload); - grpc_byte_buffer_destroy (request_payload_recv); - grpc_byte_buffer_destroy (response_payload_recv); + grpc_byte_buffer_destroy(request_payload); + grpc_byte_buffer_destroy(response_payload); + grpc_byte_buffer_destroy(request_payload_recv); + grpc_byte_buffer_destroy(response_payload_recv); - end_test (&f); - config.tear_down_data (&f); + end_test(&f); + config.tear_down_data(&f); } -void -grpc_end2end_tests (grpc_end2end_test_config config) -{ - test_request_response_with_metadata_and_payload (config); +void grpc_end2end_tests(grpc_end2end_test_config config) { + test_request_response_with_metadata_and_payload(config); } diff --git a/test/core/fling/client.c b/test/core/fling/client.c index 29d81530061..a53411c2f56 100644 --- a/test/core/fling/client.c +++ b/test/core/fling/client.c @@ -60,11 +60,9 @@ static char *details = NULL; static size_t details_capacity = 0; static grpc_op *op; -static void -init_ping_pong_request (void) -{ - grpc_metadata_array_init (&initial_metadata_recv); - grpc_metadata_array_init (&trailing_metadata_recv); +static void init_ping_pong_request(void) { + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); op = ops; @@ -90,29 +88,31 @@ init_ping_pong_request (void) op++; } -static void -step_ping_pong_request (void) -{ - call = grpc_channel_create_call (channel, NULL, GRPC_PROPAGATE_DEFAULTS, cq, "/Reflector/reflectUnary", "localhost", gpr_inf_future (GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT (GRPC_CALL_OK == grpc_call_start_batch (call, ops, (size_t) (op - ops), (void *) 1, NULL)); - grpc_completion_queue_next (cq, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); - grpc_call_destroy (call); - grpc_byte_buffer_destroy (response_payload_recv); +static void step_ping_pong_request(void) { + call = grpc_channel_create_call(channel, NULL, GRPC_PROPAGATE_DEFAULTS, cq, + "/Reflector/reflectUnary", "localhost", + gpr_inf_future(GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(call, ops, + (size_t)(op - ops), + (void *)1, NULL)); + grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), NULL); + grpc_call_destroy(call); + grpc_byte_buffer_destroy(response_payload_recv); call = NULL; } -static void -init_ping_pong_stream (void) -{ +static void init_ping_pong_stream(void) { grpc_call_error error; - call = grpc_channel_create_call (channel, NULL, GRPC_PROPAGATE_DEFAULTS, cq, "/Reflector/reflectStream", "localhost", gpr_inf_future (GPR_CLOCK_REALTIME), NULL); + call = grpc_channel_create_call(channel, NULL, GRPC_PROPAGATE_DEFAULTS, cq, + "/Reflector/reflectStream", "localhost", + gpr_inf_future(GPR_CLOCK_REALTIME), NULL); stream_init_op.op = GRPC_OP_SEND_INITIAL_METADATA; stream_init_op.data.send_initial_metadata.count = 0; - error = grpc_call_start_batch (call, &stream_init_op, 1, (void *) 1, NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - grpc_completion_queue_next (cq, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); + error = grpc_call_start_batch(call, &stream_init_op, 1, (void *)1, NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), NULL); - grpc_metadata_array_init (&initial_metadata_recv); + grpc_metadata_array_init(&initial_metadata_recv); stream_step_ops[0].op = GRPC_OP_SEND_MESSAGE; stream_step_ops[0].data.send_message = the_buffer; @@ -120,39 +120,32 @@ init_ping_pong_stream (void) stream_step_ops[1].data.recv_message = &response_payload_recv; } -static void -step_ping_pong_stream (void) -{ +static void step_ping_pong_stream(void) { grpc_call_error error; - error = grpc_call_start_batch (call, stream_step_ops, 2, (void *) 1, NULL); - GPR_ASSERT (GRPC_CALL_OK == error); - grpc_completion_queue_next (cq, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); - grpc_byte_buffer_destroy (response_payload_recv); + error = grpc_call_start_batch(call, stream_step_ops, 2, (void *)1, NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), NULL); + grpc_byte_buffer_destroy(response_payload_recv); } -static double -now (void) -{ - gpr_timespec tv = gpr_now (GPR_CLOCK_REALTIME); - return 1e9 * (double) tv.tv_sec + tv.tv_nsec; +static double now(void) { + gpr_timespec tv = gpr_now(GPR_CLOCK_REALTIME); + return 1e9 * (double)tv.tv_sec + tv.tv_nsec; } -typedef struct -{ +typedef struct { const char *name; - void (*init) (); - void (*do_one_step) (); + void (*init)(); + void (*do_one_step)(); } scenario; static const scenario scenarios[] = { - {"ping-pong-request", init_ping_pong_request, step_ping_pong_request}, - {"ping-pong-stream", init_ping_pong_stream, step_ping_pong_stream}, + {"ping-pong-request", init_ping_pong_request, step_ping_pong_request}, + {"ping-pong-stream", init_ping_pong_stream, step_ping_pong_stream}, }; -int -main (int argc, char **argv) -{ - gpr_slice slice = gpr_slice_from_copied_string ("x"); +int main(int argc, char **argv) { + gpr_slice slice = gpr_slice_from_copied_string("x"); double start, stop; unsigned i; @@ -164,82 +157,79 @@ main (int argc, char **argv) gpr_cmdline *cl; grpc_event event; char *scenario_name = "ping-pong-request"; - scenario sc = { NULL, NULL, NULL }; + scenario sc = {NULL, NULL, NULL}; - GPR_ASSERT (argc >= 1); + GPR_ASSERT(argc >= 1); fake_argv[0] = argv[0]; - grpc_test_init (1, fake_argv); - - grpc_init (); - - cl = gpr_cmdline_create ("fling client"); - gpr_cmdline_add_int (cl, "payload_size", "Size of the payload to send", &payload_size); - gpr_cmdline_add_string (cl, "target", "Target host:port", &target); - gpr_cmdline_add_flag (cl, "secure", "Run with security?", &secure); - gpr_cmdline_add_string (cl, "scenario", "Scenario", &scenario_name); - gpr_cmdline_parse (cl, argc, argv); - gpr_cmdline_destroy (cl); - - for (i = 0; i < GPR_ARRAY_SIZE (scenarios); i++) - { - if (0 == strcmp (scenarios[i].name, scenario_name)) - { - sc = scenarios[i]; - } + grpc_test_init(1, fake_argv); + + grpc_init(); + + cl = gpr_cmdline_create("fling client"); + gpr_cmdline_add_int(cl, "payload_size", "Size of the payload to send", + &payload_size); + gpr_cmdline_add_string(cl, "target", "Target host:port", &target); + gpr_cmdline_add_flag(cl, "secure", "Run with security?", &secure); + gpr_cmdline_add_string(cl, "scenario", "Scenario", &scenario_name); + gpr_cmdline_parse(cl, argc, argv); + gpr_cmdline_destroy(cl); + + for (i = 0; i < GPR_ARRAY_SIZE(scenarios); i++) { + if (0 == strcmp(scenarios[i].name, scenario_name)) { + sc = scenarios[i]; } - if (!sc.name) - { - fprintf (stderr, "unsupported scenario '%s'. Valid are:", scenario_name); - for (i = 0; i < GPR_ARRAY_SIZE (scenarios); i++) - { - fprintf (stderr, " %s", scenarios[i].name); - } - return 1; + } + if (!sc.name) { + fprintf(stderr, "unsupported scenario '%s'. Valid are:", scenario_name); + for (i = 0; i < GPR_ARRAY_SIZE(scenarios); i++) { + fprintf(stderr, " %s", scenarios[i].name); } - - channel = grpc_insecure_channel_create (target, NULL, NULL); - cq = grpc_completion_queue_create (NULL); - the_buffer = grpc_raw_byte_buffer_create (&slice, (size_t) payload_size); - histogram = gpr_histogram_create (0.01, 60e9); - - sc.init (); - - for (i = 0; i < 1000; i++) - { - sc.do_one_step (); - } - - gpr_log (GPR_INFO, "start profiling"); - grpc_profiler_start ("client.prof"); - for (i = 0; i < 100000; i++) - { - start = now (); - sc.do_one_step (); - stop = now (); - gpr_histogram_add (histogram, stop - start); - } - grpc_profiler_stop (); - - if (call) - { - grpc_call_destroy (call); - } - - grpc_channel_destroy (channel); - grpc_completion_queue_shutdown (cq); - do - { - event = grpc_completion_queue_next (cq, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); - } - while (event.type != GRPC_QUEUE_SHUTDOWN); - grpc_completion_queue_destroy (cq); - grpc_byte_buffer_destroy (the_buffer); - gpr_slice_unref (slice); - - gpr_log (GPR_INFO, "latency (50/95/99/99.9): %f/%f/%f/%f", gpr_histogram_percentile (histogram, 50), gpr_histogram_percentile (histogram, 95), gpr_histogram_percentile (histogram, 99), gpr_histogram_percentile (histogram, 99.9)); - gpr_histogram_destroy (histogram); - - grpc_shutdown (); + return 1; + } + + channel = grpc_insecure_channel_create(target, NULL, NULL); + cq = grpc_completion_queue_create(NULL); + the_buffer = grpc_raw_byte_buffer_create(&slice, (size_t)payload_size); + histogram = gpr_histogram_create(0.01, 60e9); + + sc.init(); + + for (i = 0; i < 1000; i++) { + sc.do_one_step(); + } + + gpr_log(GPR_INFO, "start profiling"); + grpc_profiler_start("client.prof"); + for (i = 0; i < 100000; i++) { + start = now(); + sc.do_one_step(); + stop = now(); + gpr_histogram_add(histogram, stop - start); + } + grpc_profiler_stop(); + + if (call) { + grpc_call_destroy(call); + } + + grpc_channel_destroy(channel); + grpc_completion_queue_shutdown(cq); + do { + event = grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), + NULL); + } while (event.type != GRPC_QUEUE_SHUTDOWN); + grpc_completion_queue_destroy(cq); + grpc_byte_buffer_destroy(the_buffer); + gpr_slice_unref(slice); + + gpr_log(GPR_INFO, "latency (50/95/99/99.9): %f/%f/%f/%f", + gpr_histogram_percentile(histogram, 50), + gpr_histogram_percentile(histogram, 95), + gpr_histogram_percentile(histogram, 99), + gpr_histogram_percentile(histogram, 99.9)); + gpr_histogram_destroy(histogram); + + grpc_shutdown(); return 0; } diff --git a/test/core/fling/fling_stream_test.c b/test/core/fling/fling_stream_test.c index 0bda19f5e23..78a73372aa8 100644 --- a/test/core/fling/fling_stream_test.c +++ b/test/core/fling/fling_stream_test.c @@ -50,77 +50,64 @@ #include #include "test/core/util/port.h" -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { char *me = argv[0]; - char *lslash = strrchr (me, '/'); + char *lslash = strrchr(me, '/'); char root[1024]; - int port = grpc_pick_unused_port_or_die (); + int port = grpc_pick_unused_port_or_die(); char *args[10]; int status; pid_t svr, cli; /* seed rng with pid, so we don't end up with the same random numbers as a concurrently running test binary */ - srand ((unsigned) getpid ()); + srand((unsigned)getpid()); /* figure out where we are */ - if (lslash) - { - memcpy (root, me, (size_t) (lslash - me)); - root[lslash - me] = 0; - } - else - { - strcpy (root, "."); - } + if (lslash) { + memcpy(root, me, (size_t)(lslash - me)); + root[lslash - me] = 0; + } else { + strcpy(root, "."); + } /* start the server */ - svr = fork (); - if (svr == 0) - { - gpr_asprintf (&args[0], "%s/fling_server", root); - args[1] = "--bind"; - gpr_join_host_port (&args[2], "::", port); - args[3] = "--no-secure"; - args[4] = 0; - execv (args[0], args); + svr = fork(); + if (svr == 0) { + gpr_asprintf(&args[0], "%s/fling_server", root); + args[1] = "--bind"; + gpr_join_host_port(&args[2], "::", port); + args[3] = "--no-secure"; + args[4] = 0; + execv(args[0], args); - gpr_free (args[0]); - gpr_free (args[2]); - return 1; - } + gpr_free(args[0]); + gpr_free(args[2]); + return 1; + } /* wait a little */ - sleep (2); + sleep(2); /* start the client */ - cli = fork (); - if (cli == 0) - { - gpr_asprintf (&args[0], "%s/fling_client", root); - args[1] = "--target"; - gpr_join_host_port (&args[2], "127.0.0.1", port); - args[3] = "--scenario=ping-pong-stream"; - args[4] = "--no-secure"; - args[5] = 0; - execv (args[0], args); + cli = fork(); + if (cli == 0) { + gpr_asprintf(&args[0], "%s/fling_client", root); + args[1] = "--target"; + gpr_join_host_port(&args[2], "127.0.0.1", port); + args[3] = "--scenario=ping-pong-stream"; + args[4] = "--no-secure"; + args[5] = 0; + execv(args[0], args); - gpr_free (args[0]); - gpr_free (args[2]); - return 1; - } + gpr_free(args[0]); + gpr_free(args[2]); + return 1; + } /* wait for completion */ - printf ("waiting for client\n"); - if (waitpid (cli, &status, 0) == -1) - return 2; - if (!WIFEXITED (status)) - return 4; - if (WEXITSTATUS (status)) - return WEXITSTATUS (status); - printf ("waiting for server\n"); - kill (svr, SIGINT); - if (waitpid (svr, &status, 0) == -1) - return 2; - if (!WIFEXITED (status)) - return 4; - if (WEXITSTATUS (status)) - return WEXITSTATUS (status); + printf("waiting for client\n"); + if (waitpid(cli, &status, 0) == -1) return 2; + if (!WIFEXITED(status)) return 4; + if (WEXITSTATUS(status)) return WEXITSTATUS(status); + printf("waiting for server\n"); + kill(svr, SIGINT); + if (waitpid(svr, &status, 0) == -1) return 2; + if (!WIFEXITED(status)) return 4; + if (WEXITSTATUS(status)) return WEXITSTATUS(status); return 0; } diff --git a/test/core/fling/fling_test.c b/test/core/fling/fling_test.c index a4b789f6ca6..cf43ecfd2de 100644 --- a/test/core/fling/fling_test.c +++ b/test/core/fling/fling_test.c @@ -41,58 +41,54 @@ #include "src/core/support/string.h" #include "test/core/util/port.h" -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { char *me = argv[0]; - char *lslash = strrchr (me, '/'); + char *lslash = strrchr(me, '/'); char root[1024]; - int port = grpc_pick_unused_port_or_die (); + int port = grpc_pick_unused_port_or_die(); char *args[10]; int status; gpr_subprocess *svr, *cli; /* figure out where we are */ - if (lslash) - { - memcpy (root, me, (size_t) (lslash - me)); - root[lslash - me] = 0; - } - else - { - strcpy (root, "."); - } + if (lslash) { + memcpy(root, me, (size_t)(lslash - me)); + root[lslash - me] = 0; + } else { + strcpy(root, "."); + } /* start the server */ - gpr_asprintf (&args[0], "%s/fling_server%s", root, gpr_subprocess_binary_extension ()); + gpr_asprintf(&args[0], "%s/fling_server%s", root, + gpr_subprocess_binary_extension()); args[1] = "--bind"; - gpr_join_host_port (&args[2], "::", port); + gpr_join_host_port(&args[2], "::", port); args[3] = "--no-secure"; - svr = gpr_subprocess_create (4, (const char **) args); - gpr_free (args[0]); - gpr_free (args[2]); + svr = gpr_subprocess_create(4, (const char **)args); + gpr_free(args[0]); + gpr_free(args[2]); /* start the client */ - gpr_asprintf (&args[0], "%s/fling_client%s", root, gpr_subprocess_binary_extension ()); + gpr_asprintf(&args[0], "%s/fling_client%s", root, + gpr_subprocess_binary_extension()); args[1] = "--target"; - gpr_join_host_port (&args[2], "127.0.0.1", port); + gpr_join_host_port(&args[2], "127.0.0.1", port); args[3] = "--scenario=ping-pong-request"; args[4] = "--no-secure"; args[5] = 0; - cli = gpr_subprocess_create (6, (const char **) args); - gpr_free (args[0]); - gpr_free (args[2]); + cli = gpr_subprocess_create(6, (const char **)args); + gpr_free(args[0]); + gpr_free(args[2]); /* wait for completion */ - printf ("waiting for client\n"); - if ((status = gpr_subprocess_join (cli))) - { - gpr_subprocess_destroy (cli); - gpr_subprocess_destroy (svr); - return status; - } - gpr_subprocess_destroy (cli); + printf("waiting for client\n"); + if ((status = gpr_subprocess_join(cli))) { + gpr_subprocess_destroy(cli); + gpr_subprocess_destroy(svr); + return status; + } + gpr_subprocess_destroy(cli); - gpr_subprocess_interrupt (svr); - status = gpr_subprocess_join (svr); - gpr_subprocess_destroy (svr); + gpr_subprocess_interrupt(svr); + status = gpr_subprocess_join(svr); + gpr_subprocess_destroy(svr); return status; } diff --git a/test/core/fling/server.c b/test/core/fling/server.c index 75c0edbd5ab..67631e5a07e 100644 --- a/test/core/fling/server.c +++ b/test/core/fling/server.c @@ -72,14 +72,9 @@ static int was_cancelled = 2; static grpc_op unary_ops[6]; static int got_sigint = 0; -static void * -tag (gpr_intptr t) -{ - return (void *) t; -} +static void *tag(gpr_intptr t) { return (void *)t; } -typedef enum -{ +typedef enum { FLING_SERVER_NEW_REQUEST = 1, FLING_SERVER_READ_FOR_UNARY, FLING_SERVER_BATCH_OPS_FOR_UNARY, @@ -89,26 +84,22 @@ typedef enum FLING_SERVER_SEND_STATUS_FOR_STREAMING } fling_server_tags; -typedef struct -{ +typedef struct { gpr_refcount pending_ops; gpr_uint32 flags; } call_state; -static void -request_call (void) -{ - grpc_metadata_array_init (&request_metadata_recv); - grpc_server_request_call (server, &call, &call_details, &request_metadata_recv, cq, cq, tag (FLING_SERVER_NEW_REQUEST)); +static void request_call(void) { + grpc_metadata_array_init(&request_metadata_recv); + grpc_server_request_call(server, &call, &call_details, &request_metadata_recv, + cq, cq, tag(FLING_SERVER_NEW_REQUEST)); } -static void -handle_unary_method (void) -{ +static void handle_unary_method(void) { grpc_op *op; grpc_call_error error; - grpc_metadata_array_init (&initial_metadata_send); + grpc_metadata_array_init(&initial_metadata_send); op = unary_ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -118,10 +109,9 @@ handle_unary_method (void) op->data.recv_message = &terminal_buffer; op++; op->op = GRPC_OP_SEND_MESSAGE; - if (payload_buffer == NULL) - { - gpr_log (GPR_INFO, "NULL payload buffer !!!"); - } + if (payload_buffer == NULL) { + gpr_log(GPR_INFO, "NULL payload buffer !!!"); + } op->data.send_message = payload_buffer; op++; op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; @@ -133,55 +123,47 @@ handle_unary_method (void) op->data.recv_close_on_server.cancelled = &was_cancelled; op++; - error = grpc_call_start_batch (call, unary_ops, (size_t) (op - unary_ops), tag (FLING_SERVER_BATCH_OPS_FOR_UNARY), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(call, unary_ops, (size_t)(op - unary_ops), + tag(FLING_SERVER_BATCH_OPS_FOR_UNARY), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); } -static void -send_initial_metadata (void) -{ +static void send_initial_metadata(void) { grpc_call_error error; - void *tagarg = tag (FLING_SERVER_SEND_INIT_METADATA_FOR_STREAMING); - grpc_metadata_array_init (&initial_metadata_send); + void *tagarg = tag(FLING_SERVER_SEND_INIT_METADATA_FOR_STREAMING); + grpc_metadata_array_init(&initial_metadata_send); metadata_send_op.op = GRPC_OP_SEND_INITIAL_METADATA; metadata_send_op.data.send_initial_metadata.count = 0; - error = grpc_call_start_batch (call, &metadata_send_op, 1, tagarg, NULL); + error = grpc_call_start_batch(call, &metadata_send_op, 1, tagarg, NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + GPR_ASSERT(GRPC_CALL_OK == error); } -static void -start_read_op (int t) -{ +static void start_read_op(int t) { grpc_call_error error; /* Starting read at server */ read_op.op = GRPC_OP_RECV_MESSAGE; read_op.data.recv_message = &payload_buffer; - error = grpc_call_start_batch (call, &read_op, 1, tag (t), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(call, &read_op, 1, tag(t), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); } -static void -start_write_op (void) -{ +static void start_write_op(void) { grpc_call_error error; - void *tagarg = tag (FLING_SERVER_WRITE_FOR_STREAMING); + void *tagarg = tag(FLING_SERVER_WRITE_FOR_STREAMING); /* Starting write at server */ write_op.op = GRPC_OP_SEND_MESSAGE; - if (payload_buffer == NULL) - { - gpr_log (GPR_INFO, "NULL payload buffer !!!"); - } + if (payload_buffer == NULL) { + gpr_log(GPR_INFO, "NULL payload buffer !!!"); + } write_op.data.send_message = payload_buffer; - error = grpc_call_start_batch (call, &write_op, 1, tagarg, NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(call, &write_op, 1, tagarg, NULL); + GPR_ASSERT(GRPC_CALL_OK == error); } -static void -start_send_status (void) -{ +static void start_send_status(void) { grpc_call_error error; - void *tagarg = tag (FLING_SERVER_SEND_STATUS_FOR_STREAMING); + void *tagarg = tag(FLING_SERVER_SEND_STATUS_FOR_STREAMING); status_op[0].op = GRPC_OP_SEND_STATUS_FROM_SERVER; status_op[0].data.send_status_from_server.status = GRPC_STATUS_OK; status_op[0].data.send_status_from_server.trailing_metadata_count = 0; @@ -189,21 +171,15 @@ start_send_status (void) status_op[1].op = GRPC_OP_RECV_CLOSE_ON_SERVER; status_op[1].data.recv_close_on_server.cancelled = &was_cancelled; - error = grpc_call_start_batch (call, status_op, 2, tagarg, NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(call, status_op, 2, tagarg, NULL); + GPR_ASSERT(GRPC_CALL_OK == error); } /* We have some sort of deadlock, so let's not exit gracefully for now. When that is resolved, please remove the #include above. */ -static void -sigint_handler (int x) -{ - _exit (0); -} +static void sigint_handler(int x) { _exit(0); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { grpc_event ev; call_state *s; char *addr_buf = NULL; @@ -216,149 +192,136 @@ main (int argc, char **argv) char *fake_argv[1]; - GPR_ASSERT (argc >= 1); + GPR_ASSERT(argc >= 1); fake_argv[0] = argv[0]; - grpc_test_init (1, fake_argv); - - grpc_init (); - srand ((unsigned) clock ()); - - cl = gpr_cmdline_create ("fling server"); - gpr_cmdline_add_string (cl, "bind", "Bind host:port", &addr); - gpr_cmdline_add_flag (cl, "secure", "Run with security?", &secure); - gpr_cmdline_parse (cl, argc, argv); - gpr_cmdline_destroy (cl); - - if (addr == NULL) - { - gpr_join_host_port (&addr_buf, "::", grpc_pick_unused_port_or_die ()); - addr = addr_buf; - } - gpr_log (GPR_INFO, "creating server on: %s", addr); - - cq = grpc_completion_queue_create (NULL); - if (secure) - { - grpc_ssl_pem_key_cert_pair pem_key_cert_pair = { test_server1_key, - test_server1_cert - }; - grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_key_cert_pair, 1, 0, NULL); - server = grpc_server_create (NULL, NULL); - GPR_ASSERT (grpc_server_add_secure_http2_port (server, addr, ssl_creds)); - grpc_server_credentials_release (ssl_creds); - } - else - { - server = grpc_server_create (NULL, NULL); - GPR_ASSERT (grpc_server_add_insecure_http2_port (server, addr)); - } - grpc_server_register_completion_queue (server, cq, NULL); - grpc_server_start (server); - - gpr_free (addr_buf); + grpc_test_init(1, fake_argv); + + grpc_init(); + srand((unsigned)clock()); + + cl = gpr_cmdline_create("fling server"); + gpr_cmdline_add_string(cl, "bind", "Bind host:port", &addr); + gpr_cmdline_add_flag(cl, "secure", "Run with security?", &secure); + gpr_cmdline_parse(cl, argc, argv); + gpr_cmdline_destroy(cl); + + if (addr == NULL) { + gpr_join_host_port(&addr_buf, "::", grpc_pick_unused_port_or_die()); + addr = addr_buf; + } + gpr_log(GPR_INFO, "creating server on: %s", addr); + + cq = grpc_completion_queue_create(NULL); + if (secure) { + grpc_ssl_pem_key_cert_pair pem_key_cert_pair = {test_server1_key, + test_server1_cert}; + grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create( + NULL, &pem_key_cert_pair, 1, 0, NULL); + server = grpc_server_create(NULL, NULL); + GPR_ASSERT(grpc_server_add_secure_http2_port(server, addr, ssl_creds)); + grpc_server_credentials_release(ssl_creds); + } else { + server = grpc_server_create(NULL, NULL); + GPR_ASSERT(grpc_server_add_insecure_http2_port(server, addr)); + } + grpc_server_register_completion_queue(server, cq, NULL); + grpc_server_start(server); + + gpr_free(addr_buf); addr = addr_buf = NULL; - grpc_call_details_init (&call_details); - - request_call (); - - grpc_profiler_start ("server.prof"); - signal (SIGINT, sigint_handler); - while (!shutdown_finished) - { - if (got_sigint && !shutdown_started) - { - gpr_log (GPR_INFO, "Shutting down due to SIGINT"); - grpc_server_shutdown_and_notify (server, cq, tag (1000)); - GPR_ASSERT (grpc_completion_queue_pluck (cq, tag (1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), NULL).type == GRPC_OP_COMPLETE); - grpc_completion_queue_shutdown (cq); - shutdown_started = 1; - } - ev = grpc_completion_queue_next (cq, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), gpr_time_from_micros (1000000, GPR_TIMESPAN)), NULL); - s = ev.tag; - switch (ev.type) - { - case GRPC_OP_COMPLETE: - switch ((gpr_intptr) s) - { - case FLING_SERVER_NEW_REQUEST: - if (call != NULL) - { - if (0 == strcmp (call_details.method, "/Reflector/reflectStream")) - { - /* Received streaming call. Send metadata here. */ - start_read_op (FLING_SERVER_READ_FOR_STREAMING); - send_initial_metadata (); - } - else - { - /* Received unary call. Can do all ops in one batch. */ - start_read_op (FLING_SERVER_READ_FOR_UNARY); - } - } - else - { - GPR_ASSERT (shutdown_started); - } - /* request_call(); - */ - break; - case FLING_SERVER_READ_FOR_STREAMING: - if (payload_buffer != NULL) - { - /* Received payload from client. */ - start_write_op (); - } - else - { - /* Received end of stream from client. */ - start_send_status (); - } - break; - case FLING_SERVER_WRITE_FOR_STREAMING: - /* Write completed at server */ - grpc_byte_buffer_destroy (payload_buffer); - payload_buffer = NULL; - start_read_op (FLING_SERVER_READ_FOR_STREAMING); - break; - case FLING_SERVER_SEND_INIT_METADATA_FOR_STREAMING: - /* Metadata send completed at server */ - break; - case FLING_SERVER_SEND_STATUS_FOR_STREAMING: - /* Send status and close completed at server */ - grpc_call_destroy (call); - if (!shutdown_started) - request_call (); - break; - case FLING_SERVER_READ_FOR_UNARY: - /* Finished payload read for unary. Start all reamaining - * unary ops in a batch. - */ - handle_unary_method (); - break; - case FLING_SERVER_BATCH_OPS_FOR_UNARY: - /* Finished unary call. */ - grpc_byte_buffer_destroy (payload_buffer); - payload_buffer = NULL; - grpc_call_destroy (call); - if (!shutdown_started) - request_call (); - break; - } - break; - case GRPC_QUEUE_SHUTDOWN: - GPR_ASSERT (shutdown_started); - shutdown_finished = 1; - break; - case GRPC_QUEUE_TIMEOUT: - break; - } + grpc_call_details_init(&call_details); + + request_call(); + + grpc_profiler_start("server.prof"); + signal(SIGINT, sigint_handler); + while (!shutdown_finished) { + if (got_sigint && !shutdown_started) { + gpr_log(GPR_INFO, "Shutting down due to SIGINT"); + grpc_server_shutdown_and_notify(server, cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck( + cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_completion_queue_shutdown(cq); + shutdown_started = 1; + } + ev = grpc_completion_queue_next( + cq, gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), + gpr_time_from_micros(1000000, GPR_TIMESPAN)), + NULL); + s = ev.tag; + switch (ev.type) { + case GRPC_OP_COMPLETE: + switch ((gpr_intptr)s) { + case FLING_SERVER_NEW_REQUEST: + if (call != NULL) { + if (0 == + strcmp(call_details.method, "/Reflector/reflectStream")) { + /* Received streaming call. Send metadata here. */ + start_read_op(FLING_SERVER_READ_FOR_STREAMING); + send_initial_metadata(); + } else { + /* Received unary call. Can do all ops in one batch. */ + start_read_op(FLING_SERVER_READ_FOR_UNARY); + } + } else { + GPR_ASSERT(shutdown_started); + } + /* request_call(); + */ + break; + case FLING_SERVER_READ_FOR_STREAMING: + if (payload_buffer != NULL) { + /* Received payload from client. */ + start_write_op(); + } else { + /* Received end of stream from client. */ + start_send_status(); + } + break; + case FLING_SERVER_WRITE_FOR_STREAMING: + /* Write completed at server */ + grpc_byte_buffer_destroy(payload_buffer); + payload_buffer = NULL; + start_read_op(FLING_SERVER_READ_FOR_STREAMING); + break; + case FLING_SERVER_SEND_INIT_METADATA_FOR_STREAMING: + /* Metadata send completed at server */ + break; + case FLING_SERVER_SEND_STATUS_FOR_STREAMING: + /* Send status and close completed at server */ + grpc_call_destroy(call); + if (!shutdown_started) request_call(); + break; + case FLING_SERVER_READ_FOR_UNARY: + /* Finished payload read for unary. Start all reamaining + * unary ops in a batch. + */ + handle_unary_method(); + break; + case FLING_SERVER_BATCH_OPS_FOR_UNARY: + /* Finished unary call. */ + grpc_byte_buffer_destroy(payload_buffer); + payload_buffer = NULL; + grpc_call_destroy(call); + if (!shutdown_started) request_call(); + break; + } + break; + case GRPC_QUEUE_SHUTDOWN: + GPR_ASSERT(shutdown_started); + shutdown_finished = 1; + break; + case GRPC_QUEUE_TIMEOUT: + break; } - grpc_profiler_stop (); - grpc_call_details_destroy (&call_details); + } + grpc_profiler_stop(); + grpc_call_details_destroy(&call_details); - grpc_server_destroy (server); - grpc_completion_queue_destroy (cq); - grpc_shutdown (); + grpc_server_destroy(server); + grpc_completion_queue_destroy(cq); + grpc_shutdown(); return 0; } diff --git a/test/core/httpcli/format_request_test.c b/test/core/httpcli/format_request_test.c index 7aa7624f207..82b2ccb122c 100644 --- a/test/core/httpcli/format_request_test.c +++ b/test/core/httpcli/format_request_test.c @@ -38,71 +38,87 @@ #include #include "test/core/util/test_config.h" -static void -test_format_get_request (void) -{ - grpc_httpcli_header hdr = { "x-yz", "abc" }; +static void test_format_get_request(void) { + grpc_httpcli_header hdr = {"x-yz", "abc"}; grpc_httpcli_request req; gpr_slice slice; - memset (&req, 0, sizeof (req)); + memset(&req, 0, sizeof(req)); req.host = "example.com"; req.path = "/index.html"; req.hdr_count = 1; req.hdrs = &hdr; - slice = grpc_httpcli_format_get_request (&req); + slice = grpc_httpcli_format_get_request(&req); - GPR_ASSERT (0 == gpr_slice_str_cmp (slice, "GET /index.html HTTP/1.0\r\n" "Host: example.com\r\n" "Connection: close\r\n" "User-Agent: " GRPC_HTTPCLI_USER_AGENT "\r\n" "x-yz: abc\r\n" "\r\n")); + GPR_ASSERT(0 == gpr_slice_str_cmp(slice, + "GET /index.html HTTP/1.0\r\n" + "Host: example.com\r\n" + "Connection: close\r\n" + "User-Agent: " GRPC_HTTPCLI_USER_AGENT + "\r\n" + "x-yz: abc\r\n" + "\r\n")); - gpr_slice_unref (slice); + gpr_slice_unref(slice); } -static void -test_format_post_request (void) -{ - grpc_httpcli_header hdr = { "x-yz", "abc" }; +static void test_format_post_request(void) { + grpc_httpcli_header hdr = {"x-yz", "abc"}; grpc_httpcli_request req; gpr_slice slice; char body_bytes[] = "fake body"; size_t body_len = 9; - memset (&req, 0, sizeof (req)); + memset(&req, 0, sizeof(req)); req.host = "example.com"; req.path = "/index.html"; req.hdr_count = 1; req.hdrs = &hdr; - slice = grpc_httpcli_format_post_request (&req, body_bytes, body_len); - - GPR_ASSERT (0 == gpr_slice_str_cmp (slice, "POST /index.html HTTP/1.0\r\n" "Host: example.com\r\n" "Connection: close\r\n" "User-Agent: " GRPC_HTTPCLI_USER_AGENT "\r\n" "x-yz: abc\r\n" "Content-Type: text/plain\r\n" "Content-Length: 9\r\n" "\r\n" "fake body")); - - gpr_slice_unref (slice); + slice = grpc_httpcli_format_post_request(&req, body_bytes, body_len); + + GPR_ASSERT(0 == gpr_slice_str_cmp(slice, + "POST /index.html HTTP/1.0\r\n" + "Host: example.com\r\n" + "Connection: close\r\n" + "User-Agent: " GRPC_HTTPCLI_USER_AGENT + "\r\n" + "x-yz: abc\r\n" + "Content-Type: text/plain\r\n" + "Content-Length: 9\r\n" + "\r\n" + "fake body")); + + gpr_slice_unref(slice); } -static void -test_format_post_request_no_body (void) -{ - grpc_httpcli_header hdr = { "x-yz", "abc" }; +static void test_format_post_request_no_body(void) { + grpc_httpcli_header hdr = {"x-yz", "abc"}; grpc_httpcli_request req; gpr_slice slice; - memset (&req, 0, sizeof (req)); + memset(&req, 0, sizeof(req)); req.host = "example.com"; req.path = "/index.html"; req.hdr_count = 1; req.hdrs = &hdr; - slice = grpc_httpcli_format_post_request (&req, NULL, 0); + slice = grpc_httpcli_format_post_request(&req, NULL, 0); - GPR_ASSERT (0 == gpr_slice_str_cmp (slice, "POST /index.html HTTP/1.0\r\n" "Host: example.com\r\n" "Connection: close\r\n" "User-Agent: " GRPC_HTTPCLI_USER_AGENT "\r\n" "x-yz: abc\r\n" "\r\n")); + GPR_ASSERT(0 == gpr_slice_str_cmp(slice, + "POST /index.html HTTP/1.0\r\n" + "Host: example.com\r\n" + "Connection: close\r\n" + "User-Agent: " GRPC_HTTPCLI_USER_AGENT + "\r\n" + "x-yz: abc\r\n" + "\r\n")); - gpr_slice_unref (slice); + gpr_slice_unref(slice); } -static void -test_format_post_request_content_type_override (void) -{ +static void test_format_post_request_content_type_override(void) { grpc_httpcli_header hdrs[2]; grpc_httpcli_request req; gpr_slice slice; @@ -113,28 +129,36 @@ test_format_post_request_content_type_override (void) hdrs[0].value = "abc"; hdrs[1].key = "Content-Type"; hdrs[1].value = "application/x-www-form-urlencoded"; - memset (&req, 0, sizeof (req)); + memset(&req, 0, sizeof(req)); req.host = "example.com"; req.path = "/index.html"; req.hdr_count = 2; req.hdrs = hdrs; - slice = grpc_httpcli_format_post_request (&req, body_bytes, body_len); - - GPR_ASSERT (0 == gpr_slice_str_cmp (slice, "POST /index.html HTTP/1.0\r\n" "Host: example.com\r\n" "Connection: close\r\n" "User-Agent: " GRPC_HTTPCLI_USER_AGENT "\r\n" "x-yz: abc\r\n" "Content-Type: application/x-www-form-urlencoded\r\n" "Content-Length: 11\r\n" "\r\n" "fake%20body")); - - gpr_slice_unref (slice); + slice = grpc_httpcli_format_post_request(&req, body_bytes, body_len); + + GPR_ASSERT(0 == gpr_slice_str_cmp( + slice, + "POST /index.html HTTP/1.0\r\n" + "Host: example.com\r\n" + "Connection: close\r\n" + "User-Agent: " GRPC_HTTPCLI_USER_AGENT "\r\n" + "x-yz: abc\r\n" + "Content-Type: application/x-www-form-urlencoded\r\n" + "Content-Length: 11\r\n" + "\r\n" + "fake%20body")); + + gpr_slice_unref(slice); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); - test_format_get_request (); - test_format_post_request (); - test_format_post_request_no_body (); - test_format_post_request_content_type_override (); + test_format_get_request(); + test_format_post_request(); + test_format_post_request_no_body(); + test_format_post_request_content_type_override(); return 0; } diff --git a/test/core/httpcli/httpcli_test.c b/test/core/httpcli/httpcli_test.c index 504423c9da5..d3a2f40bd03 100644 --- a/test/core/httpcli/httpcli_test.c +++ b/test/core/httpcli/httpcli_test.c @@ -49,146 +49,137 @@ static int g_done = 0; static grpc_httpcli_context g_context; static grpc_pollset g_pollset; -static gpr_timespec -n_seconds_time (int seconds) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (seconds); +static gpr_timespec n_seconds_time(int seconds) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(seconds); } -static void -on_finish (grpc_exec_ctx * exec_ctx, void *arg, const grpc_httpcli_response * response) -{ - const char *expect = "Hello world!" "

This is a test

"; - GPR_ASSERT (arg == (void *) 42); - GPR_ASSERT (response); - GPR_ASSERT (response->status == 200); - GPR_ASSERT (response->body_length == strlen (expect)); - GPR_ASSERT (0 == memcmp (expect, response->body, response->body_length)); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); +static void on_finish(grpc_exec_ctx *exec_ctx, void *arg, + const grpc_httpcli_response *response) { + const char *expect = + "Hello world!" + "

This is a test

"; + GPR_ASSERT(arg == (void *)42); + GPR_ASSERT(response); + GPR_ASSERT(response->status == 200); + GPR_ASSERT(response->body_length == strlen(expect)); + GPR_ASSERT(0 == memcmp(expect, response->body, response->body_length)); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); g_done = 1; - grpc_pollset_kick (&g_pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_pollset_kick(&g_pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } -static void -test_get (int use_ssl, int port) -{ +static void test_get(int use_ssl, int port) { grpc_httpcli_request req; char *host; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; - gpr_log (GPR_INFO, "running %s with use_ssl=%d.", "test_get", use_ssl); + gpr_log(GPR_INFO, "running %s with use_ssl=%d.", "test_get", use_ssl); - gpr_asprintf (&host, "localhost:%d", port); - gpr_log (GPR_INFO, "requesting from %s", host); + gpr_asprintf(&host, "localhost:%d", port); + gpr_log(GPR_INFO, "requesting from %s", host); - memset (&req, 0, sizeof (req)); + memset(&req, 0, sizeof(req)); req.host = host; req.path = "/get"; req.handshaker = use_ssl ? &grpc_httpcli_ssl : &grpc_httpcli_plaintext; - grpc_httpcli_get (&g_context, &g_pollset, &req, n_seconds_time (15), on_finish, (&exec_ctx, void *) 42); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - while (!g_done) - { - grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), n_seconds_time (&exec_ctx, 20)); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - } - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - gpr_free (host); + grpc_httpcli_get(&g_context, &g_pollset, &req, n_seconds_time(15), on_finish, + (&exec_ctx, void *)42); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + while (!g_done) { + grpc_pollset_worker worker; + grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + n_seconds_time(&exec_ctx, 20)); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + } + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + gpr_free(host); } -static void -test_post (int use_ssl, int port) -{ +static void test_post(int use_ssl, int port) { grpc_httpcli_request req; char *host; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; - gpr_log (GPR_INFO, "running %s with use_ssl=%d.", "test_post", (int) use_ssl); + gpr_log(GPR_INFO, "running %s with use_ssl=%d.", "test_post", (int)use_ssl); - gpr_asprintf (&host, "localhost:%d", port); - gpr_log (GPR_INFO, "posting to %s", host); + gpr_asprintf(&host, "localhost:%d", port); + gpr_log(GPR_INFO, "posting to %s", host); - memset (&req, 0, sizeof (req)); + memset(&req, 0, sizeof(req)); req.host = host; req.path = "/post"; req.handshaker = use_ssl ? &grpc_httpcli_ssl : &grpc_httpcli_plaintext; - grpc_httpcli_post (&g_context, &g_pollset, &req, "hello", 5, n_seconds_time (15), on_finish, (&exec_ctx, void *) 42); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - while (!g_done) - { - grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), n_seconds_time (&exec_ctx, 20)); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - } - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - gpr_free (host); + grpc_httpcli_post(&g_context, &g_pollset, &req, "hello", 5, + n_seconds_time(15), on_finish, (&exec_ctx, void *)42); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + while (!g_done) { + grpc_pollset_worker worker; + grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + n_seconds_time(&exec_ctx, 20)); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + } + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + gpr_free(host); } -static void -destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) -{ - grpc_pollset_destroy (p); +static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, int success) { + grpc_pollset_destroy(p); } -int -main (int argc, char **argv) -{ +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 *lslash = strrchr(me, '/'); char *args[4]; char root[1024]; - int port = grpc_pick_unused_port_or_die (); + int port = grpc_pick_unused_port_or_die(); /* figure out where we are */ - if (lslash) - { - memcpy (root, me, (size_t) (lslash - me)); - root[lslash - me] = 0; - } - else - { - strcpy (root, "."); - } + if (lslash) { + memcpy(root, me, (size_t)(lslash - me)); + root[lslash - me] = 0; + } else { + strcpy(root, "."); + } /* start the server */ - gpr_asprintf (&args[0], "%s/../../test/core/httpcli/test_server.py", root); + gpr_asprintf(&args[0], "%s/../../test/core/httpcli/test_server.py", root); args[1] = "--port"; - gpr_asprintf (&args[2], "%d", port); - server = gpr_subprocess_create (3, (const char **) args); - GPR_ASSERT (server); - gpr_free (args[0]); - gpr_free (args[2]); - - 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_init (&g_pollset); - - test_get (0, port); - test_post (0, port); - - grpc_httpcli_context_destroy (&g_context); - grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); - grpc_exec_ctx_finish (&exec_ctx); - grpc_shutdown (); - - gpr_subprocess_destroy (server); + gpr_asprintf(&args[2], "%d", port); + server = gpr_subprocess_create(3, (const char **)args); + GPR_ASSERT(server); + gpr_free(args[0]); + gpr_free(args[2]); + + 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_init(&g_pollset); + + test_get(0, port); + test_post(0, port); + + grpc_httpcli_context_destroy(&g_context); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&exec_ctx, &g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); + grpc_shutdown(); + + gpr_subprocess_destroy(server); return 0; } diff --git a/test/core/httpcli/parser_test.c b/test/core/httpcli/parser_test.c index 227cbbf4ece..dacec0f72f7 100644 --- a/test/core/httpcli/parser_test.c +++ b/test/core/httpcli/parser_test.c @@ -42,117 +42,114 @@ #include "test/core/util/slice_splitter.h" #include "test/core/util/test_config.h" -static void -test_succeeds (grpc_slice_split_mode split_mode, char *response, int expect_status, char *expect_body, ...) -{ +static void test_succeeds(grpc_slice_split_mode split_mode, char *response, + int expect_status, char *expect_body, ...) { grpc_httpcli_parser parser; - gpr_slice input_slice = gpr_slice_from_copied_string (response); + gpr_slice input_slice = gpr_slice_from_copied_string(response); size_t num_slices; size_t i; gpr_slice *slices; va_list args; - grpc_split_slices (split_mode, &input_slice, 1, &slices, &num_slices); - gpr_slice_unref (input_slice); + grpc_split_slices(split_mode, &input_slice, 1, &slices, &num_slices); + gpr_slice_unref(input_slice); - grpc_httpcli_parser_init (&parser); + grpc_httpcli_parser_init(&parser); - for (i = 0; i < num_slices; i++) - { - GPR_ASSERT (grpc_httpcli_parser_parse (&parser, slices[i])); - gpr_slice_unref (slices[i]); - } - GPR_ASSERT (grpc_httpcli_parser_eof (&parser)); + for (i = 0; i < num_slices; i++) { + GPR_ASSERT(grpc_httpcli_parser_parse(&parser, slices[i])); + gpr_slice_unref(slices[i]); + } + GPR_ASSERT(grpc_httpcli_parser_eof(&parser)); - GPR_ASSERT (expect_status == parser.r.status); - if (expect_body != NULL) - { - GPR_ASSERT (strlen (expect_body) == parser.r.body_length); - GPR_ASSERT (0 == memcmp (expect_body, parser.r.body, parser.r.body_length)); - } - else - { - GPR_ASSERT (parser.r.body_length == 0); - } + GPR_ASSERT(expect_status == parser.r.status); + if (expect_body != NULL) { + GPR_ASSERT(strlen(expect_body) == parser.r.body_length); + GPR_ASSERT(0 == memcmp(expect_body, parser.r.body, parser.r.body_length)); + } else { + GPR_ASSERT(parser.r.body_length == 0); + } - va_start (args, expect_body); + va_start(args, expect_body); i = 0; - for (;;) - { - char *expect_key; - char *expect_value; - expect_key = va_arg (args, char *); - if (!expect_key) - break; - GPR_ASSERT (i < parser.r.hdr_count); - expect_value = va_arg (args, char *); - GPR_ASSERT (expect_value); - GPR_ASSERT (0 == strcmp (expect_key, parser.r.hdrs[i].key)); - GPR_ASSERT (0 == strcmp (expect_value, parser.r.hdrs[i].value)); - i++; - } - va_end (args); - GPR_ASSERT (i == parser.r.hdr_count); - - grpc_httpcli_parser_destroy (&parser); - gpr_free (slices); + for (;;) { + char *expect_key; + char *expect_value; + expect_key = va_arg(args, char *); + if (!expect_key) break; + GPR_ASSERT(i < parser.r.hdr_count); + expect_value = va_arg(args, char *); + GPR_ASSERT(expect_value); + GPR_ASSERT(0 == strcmp(expect_key, parser.r.hdrs[i].key)); + GPR_ASSERT(0 == strcmp(expect_value, parser.r.hdrs[i].value)); + i++; + } + va_end(args); + GPR_ASSERT(i == parser.r.hdr_count); + + grpc_httpcli_parser_destroy(&parser); + gpr_free(slices); } -static void -test_fails (grpc_slice_split_mode split_mode, char *response) -{ +static void test_fails(grpc_slice_split_mode split_mode, char *response) { grpc_httpcli_parser parser; - gpr_slice input_slice = gpr_slice_from_copied_string (response); + gpr_slice input_slice = gpr_slice_from_copied_string(response); size_t num_slices; size_t i; gpr_slice *slices; int done = 0; - grpc_split_slices (split_mode, &input_slice, 1, &slices, &num_slices); - gpr_slice_unref (input_slice); + grpc_split_slices(split_mode, &input_slice, 1, &slices, &num_slices); + gpr_slice_unref(input_slice); - grpc_httpcli_parser_init (&parser); + grpc_httpcli_parser_init(&parser); - for (i = 0; i < num_slices; i++) - { - if (!done && !grpc_httpcli_parser_parse (&parser, slices[i])) - { - done = 1; - } - gpr_slice_unref (slices[i]); - } - if (!done && !grpc_httpcli_parser_eof (&parser)) - { + for (i = 0; i < num_slices; i++) { + if (!done && !grpc_httpcli_parser_parse(&parser, slices[i])) { done = 1; } - GPR_ASSERT (done); - - grpc_httpcli_parser_destroy (&parser); - gpr_free (slices); + gpr_slice_unref(slices[i]); + } + if (!done && !grpc_httpcli_parser_eof(&parser)) { + done = 1; + } + GPR_ASSERT(done); + + grpc_httpcli_parser_destroy(&parser); + gpr_free(slices); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; - const grpc_slice_split_mode split_modes[] = { GRPC_SLICE_SPLIT_IDENTITY, - GRPC_SLICE_SPLIT_ONE_BYTE - }; - - grpc_test_init (argc, argv); - - for (i = 0; i < GPR_ARRAY_SIZE (split_modes); i++) - { - test_succeeds (split_modes[i], "HTTP/1.0 200 OK\r\n" "xyz: abc\r\n" "\r\n" "hello world!", 200, "hello world!", "xyz", "abc", NULL); - test_succeeds (split_modes[i], "HTTP/1.0 404 Not Found\r\n" "\r\n", 404, NULL, NULL); - test_succeeds (split_modes[i], "HTTP/1.1 200 OK\r\n" "xyz: abc\r\n" "\r\n" "hello world!", 200, "hello world!", "xyz", "abc", NULL); - test_fails (split_modes[i], "HTTP/1.0\r\n"); - test_fails (split_modes[i], "HTTP/1.2\r\n"); - test_fails (split_modes[i], "HTTP/1.0 000 XYX\r\n"); - test_fails (split_modes[i], "HTTP/1.0 200 OK\n"); - test_fails (split_modes[i], "HTTP/1.0 200 OK\r\n"); - test_fails (split_modes[i], "HTTP/1.0 200 OK\r\nFoo x\r\n"); - } + const grpc_slice_split_mode split_modes[] = {GRPC_SLICE_SPLIT_IDENTITY, + GRPC_SLICE_SPLIT_ONE_BYTE}; + + grpc_test_init(argc, argv); + + for (i = 0; i < GPR_ARRAY_SIZE(split_modes); i++) { + test_succeeds(split_modes[i], + "HTTP/1.0 200 OK\r\n" + "xyz: abc\r\n" + "\r\n" + "hello world!", + 200, "hello world!", "xyz", "abc", NULL); + test_succeeds(split_modes[i], + "HTTP/1.0 404 Not Found\r\n" + "\r\n", + 404, NULL, NULL); + test_succeeds(split_modes[i], + "HTTP/1.1 200 OK\r\n" + "xyz: abc\r\n" + "\r\n" + "hello world!", + 200, "hello world!", "xyz", "abc", NULL); + test_fails(split_modes[i], "HTTP/1.0\r\n"); + test_fails(split_modes[i], "HTTP/1.2\r\n"); + test_fails(split_modes[i], "HTTP/1.0 000 XYX\r\n"); + test_fails(split_modes[i], "HTTP/1.0 200 OK\n"); + test_fails(split_modes[i], "HTTP/1.0 200 OK\r\n"); + test_fails(split_modes[i], "HTTP/1.0 200 OK\r\nFoo x\r\n"); + } return 0; } diff --git a/test/core/iomgr/alarm_heap_test.c b/test/core/iomgr/alarm_heap_test.c index b179e62de42..13bf7e43f64 100644 --- a/test/core/iomgr/alarm_heap_test.c +++ b/test/core/iomgr/alarm_heap_test.c @@ -40,280 +40,242 @@ #include #include "test/core/util/test_config.h" -static gpr_timespec -random_deadline (void) -{ +static gpr_timespec random_deadline(void) { gpr_timespec ts; - ts.tv_sec = rand (); - ts.tv_nsec = rand (); + ts.tv_sec = rand(); + ts.tv_nsec = rand(); ts.clock_type = GPR_CLOCK_REALTIME; return ts; } -static grpc_alarm * -create_test_elements (size_t num_elements) -{ - grpc_alarm *elems = gpr_malloc (num_elements * sizeof (grpc_alarm)); +static grpc_alarm *create_test_elements(size_t num_elements) { + grpc_alarm *elems = gpr_malloc(num_elements * sizeof(grpc_alarm)); size_t i; - for (i = 0; i < num_elements; i++) - { - elems[i].deadline = random_deadline (); - } + for (i = 0; i < num_elements; i++) { + elems[i].deadline = random_deadline(); + } return elems; } -static int -cmp_elem (const void *a, const void *b) -{ - int i = *(const int *) a; - int j = *(const int *) b; +static int cmp_elem(const void *a, const void *b) { + int i = *(const int *)a; + int j = *(const int *)b; return i - j; } -static size_t * -all_top (grpc_alarm_heap * pq, size_t * n) -{ +static size_t *all_top(grpc_alarm_heap *pq, size_t *n) { size_t *vec = NULL; size_t *need_to_check_children; size_t num_need_to_check_children = 0; *n = 0; - if (pq->alarm_count == 0) - return vec; - need_to_check_children = gpr_malloc (pq->alarm_count * sizeof (*need_to_check_children)); + if (pq->alarm_count == 0) return vec; + need_to_check_children = + gpr_malloc(pq->alarm_count * sizeof(*need_to_check_children)); need_to_check_children[num_need_to_check_children++] = 0; - vec = gpr_malloc (pq->alarm_count * sizeof (*vec)); - while (num_need_to_check_children > 0) - { - size_t ind = need_to_check_children[0]; - size_t leftchild, rightchild; - num_need_to_check_children--; - memmove (need_to_check_children, need_to_check_children + 1, num_need_to_check_children * sizeof (*need_to_check_children)); - vec[(*n)++] = ind; - leftchild = 1u + 2u * ind; - if (leftchild < pq->alarm_count) - { - if (gpr_time_cmp (pq->alarms[leftchild]->deadline, pq->alarms[ind]->deadline) >= 0) - { - need_to_check_children[num_need_to_check_children++] = leftchild; - } - rightchild = leftchild + 1; - if (rightchild < pq->alarm_count && gpr_time_cmp (pq->alarms[rightchild]->deadline, pq->alarms[ind]->deadline) >= 0) - { - need_to_check_children[num_need_to_check_children++] = rightchild; - } - } + vec = gpr_malloc(pq->alarm_count * sizeof(*vec)); + while (num_need_to_check_children > 0) { + size_t ind = need_to_check_children[0]; + size_t leftchild, rightchild; + num_need_to_check_children--; + memmove(need_to_check_children, need_to_check_children + 1, + num_need_to_check_children * sizeof(*need_to_check_children)); + vec[(*n)++] = ind; + leftchild = 1u + 2u * ind; + if (leftchild < pq->alarm_count) { + if (gpr_time_cmp(pq->alarms[leftchild]->deadline, + pq->alarms[ind]->deadline) >= 0) { + need_to_check_children[num_need_to_check_children++] = leftchild; + } + rightchild = leftchild + 1; + if (rightchild < pq->alarm_count && + gpr_time_cmp(pq->alarms[rightchild]->deadline, + pq->alarms[ind]->deadline) >= 0) { + need_to_check_children[num_need_to_check_children++] = rightchild; + } } + } - gpr_free (need_to_check_children); + gpr_free(need_to_check_children); return vec; } -static void -check_pq_top (grpc_alarm * elements, grpc_alarm_heap * pq, gpr_uint8 * inpq, size_t num_elements) -{ - gpr_timespec max_deadline = gpr_inf_past (GPR_CLOCK_REALTIME); - size_t *max_deadline_indices = gpr_malloc (num_elements * sizeof (*max_deadline_indices)); +static void check_pq_top(grpc_alarm *elements, grpc_alarm_heap *pq, + gpr_uint8 *inpq, size_t num_elements) { + gpr_timespec max_deadline = gpr_inf_past(GPR_CLOCK_REALTIME); + size_t *max_deadline_indices = + gpr_malloc(num_elements * sizeof(*max_deadline_indices)); size_t *top_elements; size_t num_max_deadline_indices = 0; size_t num_top_elements; size_t i; - for (i = 0; i < num_elements; ++i) - { - if (inpq[i] && gpr_time_cmp (elements[i].deadline, max_deadline) >= 0) - { - if (gpr_time_cmp (elements[i].deadline, max_deadline) > 0) - { - num_max_deadline_indices = 0; - max_deadline = elements[i].deadline; - } - max_deadline_indices[num_max_deadline_indices++] = elements[i].heap_index; - } - } - qsort (max_deadline_indices, num_max_deadline_indices, sizeof (*max_deadline_indices), cmp_elem); - top_elements = all_top (pq, &num_top_elements); - GPR_ASSERT (num_top_elements == num_max_deadline_indices); - for (i = 0; i < num_top_elements; i++) - { - GPR_ASSERT (max_deadline_indices[i] == top_elements[i]); + for (i = 0; i < num_elements; ++i) { + if (inpq[i] && gpr_time_cmp(elements[i].deadline, max_deadline) >= 0) { + if (gpr_time_cmp(elements[i].deadline, max_deadline) > 0) { + num_max_deadline_indices = 0; + max_deadline = elements[i].deadline; + } + max_deadline_indices[num_max_deadline_indices++] = elements[i].heap_index; } - gpr_free (max_deadline_indices); - gpr_free (top_elements); + } + qsort(max_deadline_indices, num_max_deadline_indices, + sizeof(*max_deadline_indices), cmp_elem); + top_elements = all_top(pq, &num_top_elements); + GPR_ASSERT(num_top_elements == num_max_deadline_indices); + for (i = 0; i < num_top_elements; i++) { + GPR_ASSERT(max_deadline_indices[i] == top_elements[i]); + } + gpr_free(max_deadline_indices); + gpr_free(top_elements); } -static int -contains (grpc_alarm_heap * pq, grpc_alarm * el) -{ +static int contains(grpc_alarm_heap *pq, grpc_alarm *el) { size_t i; - for (i = 0; i < pq->alarm_count; i++) - { - if (pq->alarms[i] == el) - return 1; - } + for (i = 0; i < pq->alarm_count; i++) { + if (pq->alarms[i] == el) return 1; + } return 0; } -static void -check_valid (grpc_alarm_heap * pq) -{ +static void check_valid(grpc_alarm_heap *pq) { size_t i; - for (i = 0; i < pq->alarm_count; ++i) - { - size_t left_child = 1u + 2u * i; - size_t right_child = left_child + 1u; - if (left_child < pq->alarm_count) - { - GPR_ASSERT (gpr_time_cmp (pq->alarms[i]->deadline, pq->alarms[left_child]->deadline) >= 0); - } - if (right_child < pq->alarm_count) - { - GPR_ASSERT (gpr_time_cmp (pq->alarms[i]->deadline, pq->alarms[right_child]->deadline) >= 0); - } + for (i = 0; i < pq->alarm_count; ++i) { + size_t left_child = 1u + 2u * i; + size_t right_child = left_child + 1u; + if (left_child < pq->alarm_count) { + GPR_ASSERT(gpr_time_cmp(pq->alarms[i]->deadline, + pq->alarms[left_child]->deadline) >= 0); } + if (right_child < pq->alarm_count) { + GPR_ASSERT(gpr_time_cmp(pq->alarms[i]->deadline, + pq->alarms[right_child]->deadline) >= 0); + } + } } -static void -test1 (void) -{ +static void test1(void) { grpc_alarm_heap pq; const size_t num_test_elements = 200; const size_t num_test_operations = 10000; size_t i; - grpc_alarm *test_elements = create_test_elements (num_test_elements); - gpr_uint8 *inpq = gpr_malloc (num_test_elements); - - grpc_alarm_heap_init (&pq); - memset (inpq, 0, num_test_elements); - GPR_ASSERT (grpc_alarm_heap_is_empty (&pq)); - check_valid (&pq); - for (i = 0; i < num_test_elements; ++i) - { - GPR_ASSERT (!contains (&pq, &test_elements[i])); - grpc_alarm_heap_add (&pq, &test_elements[i]); - check_valid (&pq); - GPR_ASSERT (contains (&pq, &test_elements[i])); - inpq[i] = 1; - check_pq_top (test_elements, &pq, inpq, num_test_elements); - } - for (i = 0; i < num_test_elements; ++i) - { - /* Test that check still succeeds even for element that wasn't just - inserted. */ - GPR_ASSERT (contains (&pq, &test_elements[i])); + grpc_alarm *test_elements = create_test_elements(num_test_elements); + gpr_uint8 *inpq = gpr_malloc(num_test_elements); + + grpc_alarm_heap_init(&pq); + memset(inpq, 0, num_test_elements); + GPR_ASSERT(grpc_alarm_heap_is_empty(&pq)); + check_valid(&pq); + for (i = 0; i < num_test_elements; ++i) { + GPR_ASSERT(!contains(&pq, &test_elements[i])); + grpc_alarm_heap_add(&pq, &test_elements[i]); + check_valid(&pq); + GPR_ASSERT(contains(&pq, &test_elements[i])); + inpq[i] = 1; + check_pq_top(test_elements, &pq, inpq, num_test_elements); + } + for (i = 0; i < num_test_elements; ++i) { + /* Test that check still succeeds even for element that wasn't just + inserted. */ + GPR_ASSERT(contains(&pq, &test_elements[i])); + } + + GPR_ASSERT(pq.alarm_count == num_test_elements); + + check_pq_top(test_elements, &pq, inpq, num_test_elements); + + for (i = 0; i < num_test_operations; ++i) { + size_t elem_num = (size_t)rand() % num_test_elements; + grpc_alarm *el = &test_elements[elem_num]; + if (!inpq[elem_num]) { /* not in pq */ + GPR_ASSERT(!contains(&pq, el)); + el->deadline = random_deadline(); + grpc_alarm_heap_add(&pq, el); + GPR_ASSERT(contains(&pq, el)); + inpq[elem_num] = 1; + check_pq_top(test_elements, &pq, inpq, num_test_elements); + check_valid(&pq); + } else { + GPR_ASSERT(contains(&pq, el)); + grpc_alarm_heap_remove(&pq, el); + GPR_ASSERT(!contains(&pq, el)); + inpq[elem_num] = 0; + check_pq_top(test_elements, &pq, inpq, num_test_elements); + check_valid(&pq); } + } - GPR_ASSERT (pq.alarm_count == num_test_elements); - - check_pq_top (test_elements, &pq, inpq, num_test_elements); - - for (i = 0; i < num_test_operations; ++i) - { - size_t elem_num = (size_t) rand () % num_test_elements; - grpc_alarm *el = &test_elements[elem_num]; - if (!inpq[elem_num]) - { /* not in pq */ - GPR_ASSERT (!contains (&pq, el)); - el->deadline = random_deadline (); - grpc_alarm_heap_add (&pq, el); - GPR_ASSERT (contains (&pq, el)); - inpq[elem_num] = 1; - check_pq_top (test_elements, &pq, inpq, num_test_elements); - check_valid (&pq); - } - else - { - GPR_ASSERT (contains (&pq, el)); - grpc_alarm_heap_remove (&pq, el); - GPR_ASSERT (!contains (&pq, el)); - inpq[elem_num] = 0; - check_pq_top (test_elements, &pq, inpq, num_test_elements); - check_valid (&pq); - } - } - - grpc_alarm_heap_destroy (&pq); - gpr_free (test_elements); - gpr_free (inpq); + grpc_alarm_heap_destroy(&pq); + gpr_free(test_elements); + gpr_free(inpq); } -static void -shrink_test (void) -{ +static void shrink_test(void) { grpc_alarm_heap pq; size_t i; size_t expected_size; /* A large random number to allow for multiple shrinkages, at least 512. */ - const size_t num_elements = (size_t) rand () % 2000 + 512; + const size_t num_elements = (size_t)rand() % 2000 + 512; - grpc_alarm_heap_init (&pq); + grpc_alarm_heap_init(&pq); /* Create a priority queue with many elements. Make sure the Size() is correct. */ - for (i = 0; i < num_elements; ++i) - { - GPR_ASSERT (i == pq.alarm_count); - grpc_alarm_heap_add (&pq, create_test_elements (1)); - } - GPR_ASSERT (num_elements == pq.alarm_count); + for (i = 0; i < num_elements; ++i) { + GPR_ASSERT(i == pq.alarm_count); + grpc_alarm_heap_add(&pq, create_test_elements(1)); + } + GPR_ASSERT(num_elements == pq.alarm_count); /* Remove elements until the Size is 1/4 the original size. */ - while (pq.alarm_count > num_elements / 4) - { - grpc_alarm *const te = pq.alarms[pq.alarm_count - 1]; - grpc_alarm_heap_remove (&pq, te); - gpr_free (te); - } - GPR_ASSERT (num_elements / 4 == pq.alarm_count); + while (pq.alarm_count > num_elements / 4) { + grpc_alarm *const te = pq.alarms[pq.alarm_count - 1]; + grpc_alarm_heap_remove(&pq, te); + gpr_free(te); + } + GPR_ASSERT(num_elements / 4 == pq.alarm_count); /* Expect that Capacity is in the right range: Size * 2 <= Capacity <= Size * 4 */ - GPR_ASSERT (pq.alarm_count * 2 <= pq.alarm_capacity); - GPR_ASSERT (pq.alarm_capacity <= pq.alarm_count * 4); - check_valid (&pq); + GPR_ASSERT(pq.alarm_count * 2 <= pq.alarm_capacity); + GPR_ASSERT(pq.alarm_capacity <= pq.alarm_count * 4); + check_valid(&pq); /* Remove the rest of the elements. Check that the Capacity is not more than 4 times the Size and not less than 2 times, but never goes below 16. */ expected_size = pq.alarm_count; - while (pq.alarm_count > 0) - { - const size_t which = (size_t) rand () % pq.alarm_count; - grpc_alarm *te = pq.alarms[which]; - grpc_alarm_heap_remove (&pq, te); - gpr_free (te); - expected_size--; - GPR_ASSERT (expected_size == pq.alarm_count); - GPR_ASSERT (pq.alarm_count * 2 <= pq.alarm_capacity); - if (pq.alarm_count >= 8) - { - GPR_ASSERT (pq.alarm_capacity <= pq.alarm_count * 4); - } - else - { - GPR_ASSERT (16 <= pq.alarm_capacity); - } - check_valid (&pq); + while (pq.alarm_count > 0) { + const size_t which = (size_t)rand() % pq.alarm_count; + grpc_alarm *te = pq.alarms[which]; + grpc_alarm_heap_remove(&pq, te); + gpr_free(te); + expected_size--; + GPR_ASSERT(expected_size == pq.alarm_count); + GPR_ASSERT(pq.alarm_count * 2 <= pq.alarm_capacity); + if (pq.alarm_count >= 8) { + GPR_ASSERT(pq.alarm_capacity <= pq.alarm_count * 4); + } else { + GPR_ASSERT(16 <= pq.alarm_capacity); } + check_valid(&pq); + } - GPR_ASSERT (0 == pq.alarm_count); - GPR_ASSERT (pq.alarm_capacity >= 16 && pq.alarm_capacity < 32); + GPR_ASSERT(0 == pq.alarm_count); + GPR_ASSERT(pq.alarm_capacity >= 16 && pq.alarm_capacity < 32); - grpc_alarm_heap_destroy (&pq); + grpc_alarm_heap_destroy(&pq); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { int i; - grpc_test_init (argc, argv); + grpc_test_init(argc, argv); - for (i = 0; i < 5; i++) - { - test1 (); - shrink_test (); - } + for (i = 0; i < 5; i++) { + test1(); + shrink_test(); + } return 0; } diff --git a/test/core/iomgr/alarm_list_test.c b/test/core/iomgr/alarm_list_test.c index da311edd2ae..6656a8fa3b0 100644 --- a/test/core/iomgr/alarm_list_test.c +++ b/test/core/iomgr/alarm_list_test.c @@ -43,115 +43,121 @@ static int cb_called[MAX_CB][2]; -static void -cb (grpc_exec_ctx * exec_ctx, void *arg, int success) -{ - cb_called[(gpr_intptr) arg][success]++; +static void cb(grpc_exec_ctx *exec_ctx, void *arg, int success) { + cb_called[(gpr_intptr)arg][success]++; } -static void -add_test (void) -{ - gpr_timespec start = gpr_now (GPR_CLOCK_REALTIME); +static void add_test(void) { + gpr_timespec start = gpr_now(GPR_CLOCK_REALTIME); int i; grpc_alarm alarms[20]; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_alarm_list_init (start); - memset (cb_called, 0, sizeof (cb_called)); + grpc_alarm_list_init(start); + memset(cb_called, 0, sizeof(cb_called)); /* 10 ms alarms. will expire in the current epoch */ - for (i = 0; i < 10; i++) - { - grpc_alarm_init (&exec_ctx, &alarms[i], gpr_time_add (start, gpr_time_from_millis (10, GPR_TIMESPAN)), cb, (void *) (gpr_intptr) i, start); - } + for (i = 0; i < 10; i++) { + grpc_alarm_init(&exec_ctx, &alarms[i], + gpr_time_add(start, gpr_time_from_millis(10, GPR_TIMESPAN)), + cb, (void *)(gpr_intptr)i, start); + } /* 1010 ms alarms. will expire in the next epoch */ - for (i = 10; i < 20; i++) - { - grpc_alarm_init (&exec_ctx, &alarms[i], gpr_time_add (start, gpr_time_from_millis (1010, GPR_TIMESPAN)), cb, (void *) (gpr_intptr) i, start); - } + for (i = 10; i < 20; i++) { + grpc_alarm_init( + &exec_ctx, &alarms[i], + gpr_time_add(start, gpr_time_from_millis(1010, GPR_TIMESPAN)), cb, + (void *)(gpr_intptr)i, start); + } /* collect alarms. Only the first batch should be ready. */ - GPR_ASSERT (10 == grpc_alarm_check (&exec_ctx, gpr_time_add (start, gpr_time_from_millis (500, GPR_TIMESPAN)), NULL)); - 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); - } - - GPR_ASSERT (0 == grpc_alarm_check (&exec_ctx, gpr_time_add (start, gpr_time_from_millis (600, GPR_TIMESPAN)), NULL)); - 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); - } + GPR_ASSERT(10 == grpc_alarm_check(&exec_ctx, + gpr_time_add(start, gpr_time_from_millis( + 500, GPR_TIMESPAN)), + NULL)); + 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); + } + + GPR_ASSERT(0 == grpc_alarm_check(&exec_ctx, + gpr_time_add(start, gpr_time_from_millis( + 600, GPR_TIMESPAN)), + NULL)); + 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 alarms */ - GPR_ASSERT (10 == grpc_alarm_check (&exec_ctx, gpr_time_add (start, gpr_time_from_millis (1500, GPR_TIMESPAN)), NULL)); - 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); - } - - GPR_ASSERT (0 == grpc_alarm_check (&exec_ctx, gpr_time_add (start, gpr_time_from_millis (1600, GPR_TIMESPAN)), NULL)); - for (i = 0; i < 30; i++) - { - GPR_ASSERT (cb_called[i][1] == (i < 20)); - GPR_ASSERT (cb_called[i][0] == 0); - } - - grpc_alarm_list_shutdown (&exec_ctx); - grpc_exec_ctx_finish (&exec_ctx); + GPR_ASSERT(10 == grpc_alarm_check( + &exec_ctx, gpr_time_add(start, gpr_time_from_millis( + 1500, GPR_TIMESPAN)), + NULL)); + 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); + } + + GPR_ASSERT(0 == grpc_alarm_check(&exec_ctx, + gpr_time_add(start, gpr_time_from_millis( + 1600, GPR_TIMESPAN)), + NULL)); + for (i = 0; i < 30; i++) { + GPR_ASSERT(cb_called[i][1] == (i < 20)); + GPR_ASSERT(cb_called[i][0] == 0); + } + + grpc_alarm_list_shutdown(&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); } -static gpr_timespec -tfm (int m) -{ - gpr_timespec t = gpr_time_from_millis (m, GPR_TIMESPAN); +static gpr_timespec tfm(int m) { + gpr_timespec t = gpr_time_from_millis(m, GPR_TIMESPAN); t.clock_type = GPR_CLOCK_REALTIME; return t; } /* Cleaning up a list with pending alarms. */ -void -destruction_test (void) -{ +void destruction_test(void) { grpc_alarm alarms[5]; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_alarm_list_init (gpr_time_0 (GPR_CLOCK_REALTIME)); - memset (cb_called, 0, sizeof (cb_called)); - - grpc_alarm_init (&exec_ctx, &alarms[0], tfm (100), cb, (void *) (gpr_intptr) 0, gpr_time_0 (GPR_CLOCK_REALTIME)); - grpc_alarm_init (&exec_ctx, &alarms[1], tfm (3), cb, (void *) (gpr_intptr) 1, gpr_time_0 (GPR_CLOCK_REALTIME)); - grpc_alarm_init (&exec_ctx, &alarms[2], tfm (100), cb, (void *) (gpr_intptr) 2, gpr_time_0 (GPR_CLOCK_REALTIME)); - grpc_alarm_init (&exec_ctx, &alarms[3], tfm (3), cb, (void *) (gpr_intptr) 3, gpr_time_0 (GPR_CLOCK_REALTIME)); - grpc_alarm_init (&exec_ctx, &alarms[4], tfm (1), cb, (void *) (gpr_intptr) 4, gpr_time_0 (GPR_CLOCK_REALTIME)); - GPR_ASSERT (1 == grpc_alarm_check (&exec_ctx,tfm ( 2), NULL)); - grpc_exec_ctx_finish (&exec_ctx); - GPR_ASSERT (1 == cb_called[4][1]); - grpc_alarm_cancel (&exec_ctx, &alarms[0]); - grpc_alarm_cancel (&exec_ctx, &alarms[3]); - grpc_exec_ctx_finish (&exec_ctx); - GPR_ASSERT (1 == cb_called[0][0]); - GPR_ASSERT (1 == cb_called[3][0]); - - grpc_alarm_list_shutdown (&exec_ctx); - grpc_exec_ctx_finish (&exec_ctx); - GPR_ASSERT (1 == cb_called[1][0]); - GPR_ASSERT (1 == cb_called[2][0]); + grpc_alarm_list_init(gpr_time_0(GPR_CLOCK_REALTIME)); + memset(cb_called, 0, sizeof(cb_called)); + + grpc_alarm_init(&exec_ctx, &alarms[0], tfm(100), cb, (void *)(gpr_intptr)0, + gpr_time_0(GPR_CLOCK_REALTIME)); + grpc_alarm_init(&exec_ctx, &alarms[1], tfm(3), cb, (void *)(gpr_intptr)1, + gpr_time_0(GPR_CLOCK_REALTIME)); + grpc_alarm_init(&exec_ctx, &alarms[2], tfm(100), cb, (void *)(gpr_intptr)2, + gpr_time_0(GPR_CLOCK_REALTIME)); + grpc_alarm_init(&exec_ctx, &alarms[3], tfm(3), cb, (void *)(gpr_intptr)3, + gpr_time_0(GPR_CLOCK_REALTIME)); + grpc_alarm_init(&exec_ctx, &alarms[4], tfm(1), cb, (void *)(gpr_intptr)4, + gpr_time_0(GPR_CLOCK_REALTIME)); + GPR_ASSERT(1 == grpc_alarm_check(&exec_ctx, tfm(2), NULL)); + grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(1 == cb_called[4][1]); + grpc_alarm_cancel(&exec_ctx, &alarms[0]); + grpc_alarm_cancel(&exec_ctx, &alarms[3]); + grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(1 == cb_called[0][0]); + GPR_ASSERT(1 == cb_called[3][0]); + + grpc_alarm_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); - add_test (); - destruction_test (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + add_test(); + destruction_test(); return 0; } diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c index 5f1e3600dd8..ff590cf2d5c 100644 --- a/test/core/iomgr/endpoint_pair_test.c +++ b/test/core/iomgr/endpoint_pair_test.c @@ -44,50 +44,42 @@ static grpc_pollset g_pollset; -static void -clean_up (void) -{ -} +static void clean_up(void) {} -static grpc_endpoint_test_fixture -create_fixture_endpoint_pair (size_t slice_size) -{ +static grpc_endpoint_test_fixture create_fixture_endpoint_pair( + size_t slice_size) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_test_fixture f; - grpc_endpoint_pair p = grpc_iomgr_create_endpoint_pair ("test", slice_size); + grpc_endpoint_pair p = grpc_iomgr_create_endpoint_pair("test", slice_size); 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(&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; } static grpc_endpoint_test_config configs[] = { - {"tcp/tcp_socketpair", create_fixture_endpoint_pair, clean_up}, + {"tcp/tcp_socketpair", create_fixture_endpoint_pair, clean_up}, }; -static void -destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) -{ - grpc_pollset_destroy (p); +static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, int success) { + grpc_pollset_destroy(p); } -int -main (int argc, char **argv) -{ +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_pollset_init (&g_pollset); - grpc_endpoint_tests (configs[0], &g_pollset); - grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); - grpc_exec_ctx_finish (&exec_ctx); - grpc_shutdown (); + grpc_test_init(argc, argv); + grpc_init(); + grpc_pollset_init(&g_pollset); + grpc_endpoint_tests(configs[0], &g_pollset); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&exec_ctx, &g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); + grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index 3f91485ac92..4b72590819f 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -60,67 +60,56 @@ static grpc_pollset *g_pollset; -size_t -count_slices (gpr_slice * slices, size_t nslices, int *current_data) -{ +size_t count_slices(gpr_slice *slices, size_t nslices, int *current_data) { size_t num_bytes = 0; size_t i; size_t j; unsigned char *buf; - for (i = 0; i < nslices; ++i) - { - buf = GPR_SLICE_START_PTR (slices[i]); - for (j = 0; j < GPR_SLICE_LENGTH (slices[i]); ++j) - { - GPR_ASSERT (buf[j] == *current_data); - *current_data = (*current_data + 1) % 256; - } - num_bytes += GPR_SLICE_LENGTH (slices[i]); + for (i = 0; i < nslices; ++i) { + buf = GPR_SLICE_START_PTR(slices[i]); + for (j = 0; j < GPR_SLICE_LENGTH(slices[i]); ++j) { + GPR_ASSERT(buf[j] == *current_data); + *current_data = (*current_data + 1) % 256; } + num_bytes += GPR_SLICE_LENGTH(slices[i]); + } return num_bytes; } -static grpc_endpoint_test_fixture -begin_test (grpc_endpoint_test_config config, const char *test_name, size_t slice_size) -{ - gpr_log (GPR_INFO, "%s/%s", test_name, config.name); - return config.create_fixture (slice_size); +static grpc_endpoint_test_fixture begin_test(grpc_endpoint_test_config config, + const char *test_name, + size_t slice_size) { + gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + return config.create_fixture(slice_size); } -static void -end_test (grpc_endpoint_test_config config) -{ - config.clean_up (); -} +static void end_test(grpc_endpoint_test_config config) { config.clean_up(); } -static gpr_slice * -allocate_blocks (size_t num_bytes, size_t slice_size, size_t * num_blocks, gpr_uint8 * current_data) -{ +static gpr_slice *allocate_blocks(size_t num_bytes, size_t slice_size, + size_t *num_blocks, gpr_uint8 *current_data) { size_t nslices = num_bytes / slice_size + (num_bytes % slice_size ? 1 : 0); - gpr_slice *slices = malloc (sizeof (gpr_slice) * nslices); + gpr_slice *slices = malloc(sizeof(gpr_slice) * nslices); size_t num_bytes_left = num_bytes; size_t i; size_t j; unsigned char *buf; *num_blocks = nslices; - for (i = 0; i < nslices; ++i) - { - slices[i] = gpr_slice_malloc (slice_size > num_bytes_left ? num_bytes_left : slice_size); - num_bytes_left -= GPR_SLICE_LENGTH (slices[i]); - buf = GPR_SLICE_START_PTR (slices[i]); - for (j = 0; j < GPR_SLICE_LENGTH (slices[i]); ++j) - { - buf[j] = *current_data; - (*current_data)++; - } + for (i = 0; i < nslices; ++i) { + slices[i] = gpr_slice_malloc(slice_size > num_bytes_left ? num_bytes_left + : slice_size); + num_bytes_left -= GPR_SLICE_LENGTH(slices[i]); + buf = GPR_SLICE_START_PTR(slices[i]); + for (j = 0; j < GPR_SLICE_LENGTH(slices[i]); ++j) { + buf[j] = *current_data; + (*current_data)++; } - GPR_ASSERT (num_bytes_left == 0); + } + GPR_ASSERT(num_bytes_left == 0); return slices; } -struct read_and_write_test_state -{ +struct read_and_write_test_state { grpc_endpoint *read_ep; grpc_endpoint *write_ep; size_t target_bytes; @@ -137,79 +126,76 @@ 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, int success) -{ +static void read_and_write_test_read_handler(grpc_exec_ctx *exec_ctx, + void *data, int success) { struct read_and_write_test_state *state = data; - state->bytes_read += count_slices (state->incoming.slices, state->incoming.count, &state->current_read_data); - if (state->bytes_read == state->target_bytes || !success) - { - gpr_log (GPR_INFO, "Read handler done"); - gpr_mu_lock (GRPC_POLLSET_MU (g_pollset)); - state->read_done = 1 + success; - grpc_pollset_kick (g_pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (g_pollset)); - } - else if (success) - { - grpc_endpoint_read (exec_ctx, state->read_ep, &state->incoming, &state->done_read); - } + state->bytes_read += count_slices( + state->incoming.slices, state->incoming.count, &state->current_read_data); + if (state->bytes_read == state->target_bytes || !success) { + gpr_log(GPR_INFO, "Read handler done"); + gpr_mu_lock(GRPC_POLLSET_MU(g_pollset)); + state->read_done = 1 + success; + grpc_pollset_kick(g_pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(g_pollset)); + } else if (success) { + grpc_endpoint_read(exec_ctx, state->read_ep, &state->incoming, + &state->done_read); + } } -static void -read_and_write_test_write_handler (grpc_exec_ctx * exec_ctx, void *data, int success) -{ +static void read_and_write_test_write_handler(grpc_exec_ctx *exec_ctx, + void *data, int success) { struct read_and_write_test_state *state = data; gpr_slice *slices = NULL; size_t nslices; - if (success) - { - state->bytes_written += state->current_write_size; - if (state->target_bytes - state->bytes_written < state->current_write_size) - { - state->current_write_size = state->target_bytes - state->bytes_written; - } - if (state->current_write_size != 0) - { - slices = allocate_blocks (state->current_write_size, 8192, &nslices, &state->current_write_data); - gpr_slice_buffer_reset_and_unref (&state->outgoing); - gpr_slice_buffer_addn (&state->outgoing, slices, nslices); - grpc_endpoint_write (exec_ctx, state->write_ep, &state->outgoing, &state->done_write); - free (slices); - return; - } + if (success) { + state->bytes_written += state->current_write_size; + if (state->target_bytes - state->bytes_written < + state->current_write_size) { + state->current_write_size = state->target_bytes - state->bytes_written; } + if (state->current_write_size != 0) { + slices = allocate_blocks(state->current_write_size, 8192, &nslices, + &state->current_write_data); + gpr_slice_buffer_reset_and_unref(&state->outgoing); + gpr_slice_buffer_addn(&state->outgoing, slices, nslices); + grpc_endpoint_write(exec_ctx, state->write_ep, &state->outgoing, + &state->done_write); + free(slices); + return; + } + } - gpr_log (GPR_INFO, "Write handler done"); - gpr_mu_lock (GRPC_POLLSET_MU (g_pollset)); + gpr_log(GPR_INFO, "Write handler done"); + gpr_mu_lock(GRPC_POLLSET_MU(g_pollset)); state->write_done = 1 + success; - grpc_pollset_kick (g_pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (g_pollset)); + grpc_pollset_kick(g_pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(g_pollset)); } /* Do both reading and writing using the grpc_endpoint API. This also includes a test of the shutdown behavior. */ -static void -read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t write_size, size_t slice_size, int shutdown) -{ +static void read_and_write_test(grpc_endpoint_test_config config, + size_t num_bytes, size_t write_size, + size_t slice_size, int shutdown) { struct read_and_write_test_state state; - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (20); - grpc_endpoint_test_fixture f = begin_test (config, "read_and_write_test", slice_size); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); + grpc_endpoint_test_fixture f = + begin_test(config, "read_and_write_test", slice_size); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - gpr_log (GPR_DEBUG, "num_bytes=%d write_size=%d slice_size=%d shutdown=%d", num_bytes, write_size, slice_size, shutdown); + gpr_log(GPR_DEBUG, "num_bytes=%d write_size=%d slice_size=%d shutdown=%d", + num_bytes, write_size, slice_size, shutdown); - if (shutdown) - { - gpr_log (GPR_INFO, "Start read and write shutdown test"); - } - else - { - gpr_log (GPR_INFO, "Start read and write test with %d bytes, slice size %d", num_bytes, slice_size); - } + if (shutdown) { + gpr_log(GPR_INFO, "Start read and write shutdown test"); + } else { + gpr_log(GPR_INFO, "Start read and write test with %d bytes, slice size %d", + num_bytes, slice_size); + } state.read_ep = f.client_ep; state.write_ep = f.server_ep; @@ -221,59 +207,58 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t state.write_done = 0; state.current_read_data = 0; state.current_write_data = 0; - grpc_closure_init (&state.done_read, read_and_write_test_read_handler, &state); - grpc_closure_init (&state.done_write, read_and_write_test_write_handler, &state); - gpr_slice_buffer_init (&state.outgoing); - gpr_slice_buffer_init (&state.incoming); + grpc_closure_init(&state.done_read, read_and_write_test_read_handler, &state); + grpc_closure_init(&state.done_write, read_and_write_test_write_handler, + &state); + gpr_slice_buffer_init(&state.outgoing); + gpr_slice_buffer_init(&state.incoming); /* Get started by pretending an initial write completed */ /* NOTE: Sets up initial conditions so we can have the same write handler 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, 1); - grpc_exec_ctx_finish (&exec_ctx); + read_and_write_test_write_handler(&exec_ctx, &state, 1); + grpc_exec_ctx_finish(&exec_ctx); - grpc_endpoint_read (&exec_ctx, 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 (&exec_ctx, state.read_ep); - gpr_log (GPR_DEBUG, "shutdown write"); - grpc_endpoint_shutdown (&exec_ctx, state.write_ep); - } - grpc_exec_ctx_finish (&exec_ctx); + if (shutdown) { + gpr_log(GPR_DEBUG, "shutdown read"); + grpc_endpoint_shutdown(&exec_ctx, state.read_ep); + gpr_log(GPR_DEBUG, "shutdown write"); + grpc_endpoint_shutdown(&exec_ctx, state.write_ep); + } + grpc_exec_ctx_finish(&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (g_pollset)); - while (!state.read_done || !state.write_done) - { - grpc_pollset_worker worker; - GPR_ASSERT (gpr_time_cmp (gpr_now (GPR_CLOCK_MONOTONIC), deadline) < 0); - grpc_pollset_work (&exec_ctx, g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline); - } - gpr_mu_unlock (GRPC_POLLSET_MU (g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(g_pollset)); + while (!state.read_done || !state.write_done) { + grpc_pollset_worker worker; + GPR_ASSERT(gpr_time_cmp(gpr_now(GPR_CLOCK_MONOTONIC), deadline) < 0); + grpc_pollset_work(&exec_ctx, g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), deadline); + } + gpr_mu_unlock(GRPC_POLLSET_MU(g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); - end_test (config); - gpr_slice_buffer_destroy (&state.outgoing); - gpr_slice_buffer_destroy (&state.incoming); - grpc_endpoint_destroy (&exec_ctx, state.read_ep); - grpc_endpoint_destroy (&exec_ctx, state.write_ep); - grpc_exec_ctx_finish (&exec_ctx); + end_test(config); + gpr_slice_buffer_destroy(&state.outgoing); + gpr_slice_buffer_destroy(&state.incoming); + grpc_endpoint_destroy(&exec_ctx, state.read_ep); + grpc_endpoint_destroy(&exec_ctx, state.write_ep); + grpc_exec_ctx_finish(&exec_ctx); } -void -grpc_endpoint_tests (grpc_endpoint_test_config config, grpc_pollset * pollset) -{ +void grpc_endpoint_tests(grpc_endpoint_test_config config, + grpc_pollset *pollset) { size_t i; g_pollset = pollset; - read_and_write_test (config, 10000000, 100000, 8192, 0); - read_and_write_test (config, 1000000, 100000, 1, 0); - read_and_write_test (config, 100000000, 100000, 1, 1); - for (i = 1; i < 1000; i = GPR_MAX (i + 1, i * 5 / 4)) - { - read_and_write_test (config, 40320, i, i, 0); - } + read_and_write_test(config, 10000000, 100000, 8192, 0); + read_and_write_test(config, 1000000, 100000, 1, 0); + read_and_write_test(config, 100000000, 100000, 1, 1); + for (i = 1; i < 1000; i = GPR_MAX(i + 1, i * 5 / 4)) { + read_and_write_test(config, 40320, i, i, 0); + } g_pollset = NULL; } diff --git a/test/core/iomgr/endpoint_tests.h b/test/core/iomgr/endpoint_tests.h index 2e6335c22ec..700f854891e 100644 --- a/test/core/iomgr/endpoint_tests.h +++ b/test/core/iomgr/endpoint_tests.h @@ -41,19 +41,18 @@ typedef struct grpc_endpoint_test_config grpc_endpoint_test_config; typedef struct grpc_endpoint_test_fixture grpc_endpoint_test_fixture; -struct grpc_endpoint_test_fixture -{ +struct grpc_endpoint_test_fixture { grpc_endpoint *client_ep; grpc_endpoint *server_ep; }; -struct grpc_endpoint_test_config -{ +struct grpc_endpoint_test_config { const char *name; - grpc_endpoint_test_fixture (*create_fixture) (size_t slice_size); - void (*clean_up) (); + grpc_endpoint_test_fixture (*create_fixture)(size_t slice_size); + void (*clean_up)(); }; -void grpc_endpoint_tests (grpc_endpoint_test_config config, grpc_pollset * pollset); +void grpc_endpoint_tests(grpc_endpoint_test_config config, + grpc_pollset *pollset); #endif /* GRPC_TEST_CORE_IOMGR_ENDPOINT_TESTS_H */ diff --git a/test/core/iomgr/fd_conservation_posix_test.c b/test/core/iomgr/fd_conservation_posix_test.c index b0fbd78ca03..401bf70a9e9 100644 --- a/test/core/iomgr/fd_conservation_posix_test.c +++ b/test/core/iomgr/fd_conservation_posix_test.c @@ -39,31 +39,28 @@ #include "src/core/iomgr/endpoint_pair.h" #include "src/core/iomgr/iomgr.h" -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { int i; struct rlimit rlim; grpc_endpoint_pair p; - grpc_test_init (argc, argv); - grpc_iomgr_init (); + grpc_test_init(argc, argv); + grpc_iomgr_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)); + GPR_ASSERT(0 == setrlimit(RLIMIT_NOFILE, &rlim)); - for (i = 0; i < 100; i++) - { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - p = grpc_iomgr_create_endpoint_pair ("test", 1); - grpc_endpoint_destroy (&exec_ctx, p.client); - grpc_endpoint_destroy (&exec_ctx, p.server); - grpc_exec_ctx_finish (&exec_ctx); - } + for (i = 0; i < 100; i++) { + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + p = grpc_iomgr_create_endpoint_pair("test", 1); + grpc_endpoint_destroy(&exec_ctx, p.client); + grpc_endpoint_destroy(&exec_ctx, p.server); + grpc_exec_ctx_finish(&exec_ctx); + } - grpc_iomgr_shutdown (); + grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index 8b76e0dc6de..c3d57157ad0 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -60,186 +60,161 @@ static grpc_pollset g_pollset; /* Create a test socket with the right properties for testing. port is the TCP port to listen or connect to. Return a socket FD and sockaddr_in. */ -static void -create_test_socket (int port, int *socket_fd, struct sockaddr_in *sin) -{ +static void create_test_socket(int port, int *socket_fd, + struct sockaddr_in *sin) { int fd; int one = 1; int buf_size = BUF_SIZE; int flags; - fd = socket (AF_INET, SOCK_STREAM, 0); - setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof (one)); + fd = socket(AF_INET, SOCK_STREAM, 0); + setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)); /* Reset the size of socket send buffer to the minimal value to facilitate buffer filling up and triggering notify_on_write */ - GPR_ASSERT (setsockopt (fd, SOL_SOCKET, SO_SNDBUF, &buf_size, sizeof (buf_size)) != -1); - GPR_ASSERT (setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &buf_size, sizeof (buf_size)) != -1); + GPR_ASSERT( + setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &buf_size, sizeof(buf_size)) != -1); + GPR_ASSERT( + setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &buf_size, sizeof(buf_size)) != -1); /* Make fd non-blocking */ - flags = fcntl (fd, F_GETFL, 0); - GPR_ASSERT (fcntl (fd, F_SETFL, flags | O_NONBLOCK) == 0); + flags = fcntl(fd, F_GETFL, 0); + GPR_ASSERT(fcntl(fd, F_SETFL, flags | O_NONBLOCK) == 0); *socket_fd = fd; /* Use local address for test */ sin->sin_family = AF_INET; - sin->sin_addr.s_addr = htonl (0x7f000001); - GPR_ASSERT (port >= 0 && port < 65536); - sin->sin_port = htons ((gpr_uint16) port); + sin->sin_addr.s_addr = htonl(0x7f000001); + GPR_ASSERT(port >= 0 && port < 65536); + sin->sin_port = htons((gpr_uint16)port); } /* Dummy gRPC callback */ -void -no_op_cb (void *arg, int success) -{ -} +void no_op_cb(void *arg, int success) {} /* =======An upload server to test notify_on_read=========== The server simply reads and counts a stream of bytes. */ /* An upload server. */ -typedef struct -{ - grpc_fd *em_fd; /* listening fd */ - ssize_t read_bytes_total; /* total number of received bytes */ - int done; /* set to 1 when a server finishes serving */ +typedef struct { + grpc_fd *em_fd; /* listening fd */ + ssize_t read_bytes_total; /* total number of received bytes */ + int done; /* set to 1 when a server finishes serving */ grpc_closure listen_closure; } server; -static void -server_init (server * sv) -{ +static void server_init(server *sv) { sv->read_bytes_total = 0; sv->done = 0; } /* An upload session. Created when a new upload request arrives in the server. */ -typedef struct -{ - server *sv; /* not owned by a single session */ - grpc_fd *em_fd; /* fd to read upload bytes */ - char read_buf[BUF_SIZE]; /* buffer to store upload bytes */ +typedef struct { + server *sv; /* not owned by a single session */ + grpc_fd *em_fd; /* fd to read upload bytes */ + char read_buf[BUF_SIZE]; /* buffer to store upload bytes */ grpc_closure session_read_closure; } session; /* 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 */ - int success, grpc_closure_list * closure_list) -{ +static void session_shutdown_cb(void *arg, /*session */ + int success, grpc_closure_list *closure_list) { session *se = arg; server *sv = se->sv; - grpc_fd_orphan (exec_ctx, se->em_fd, NULL, "a"); - gpr_free (se); + grpc_fd_orphan(exec_ctx, se->em_fd, NULL, "a"); + gpr_free(se); /* Start to shutdown listen fd. */ - grpc_fd_shutdown (exec_ctx, sv->em_fd); + grpc_fd_shutdown(exec_ctx, sv->em_fd); } /* Called when data become readable in a session. */ -static void -session_read_cb (void *arg, /*session */ - int success, grpc_closure_list * closure_list) -{ +static void session_read_cb(void *arg, /*session */ + int success, grpc_closure_list *closure_list) { session *se = arg; int fd = se->em_fd->fd; ssize_t read_once = 0; ssize_t read_total = 0; - if (!success) - { - session_shutdown_cb (exec_ctx, arg, 1); - return; - } + if (!success) { + session_shutdown_cb(exec_ctx, arg, 1); + return; + } - do - { - read_once = read (fd, se->read_buf, BUF_SIZE); - if (read_once > 0) - read_total += read_once; - } - while (read_once > 0); + do { + read_once = read(fd, se->read_buf, BUF_SIZE); + if (read_once > 0) read_total += read_once; + } while (read_once > 0); se->sv->read_bytes_total += read_total; /* read() returns 0 to indicate the TCP connection was closed by the client. read(fd, read_buf, 0) also returns 0 which should never be called as such. 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); - } - else if (read_once == -1) - { - if (errno == EAGAIN) - { - /* An edge triggered event is cached in the kernel until next poll. - In the current single thread implementation, session_read_cb is called - in the polling thread, such that polling only happens after this - callback, and will catch read edge event if data is available again - before notify_on_read. - 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); - } - else - { - gpr_log (GPR_ERROR, "Unhandled read error %s", strerror (errno)); - abort (); - } + if (read_once == 0) { + 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. + In the current single thread implementation, session_read_cb is called + in the polling thread, such that polling only happens after this + callback, and will catch read edge event if data is available again + before notify_on_read. + 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); + } else { + gpr_log(GPR_ERROR, "Unhandled read error %s", strerror(errno)); + abort(); } + } } /* 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, - grpc_closure_list * closure_list) -{ +static void listen_shutdown_cb(void *arg /*server */, int success, + grpc_closure_list *closure_list) { server *sv = arg; - grpc_fd_orphan (exec_ctx, sv->em_fd, NULL, "b"); + grpc_fd_orphan(exec_ctx, sv->em_fd, NULL, "b"); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); sv->done = 1; - grpc_pollset_kick (&g_pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_pollset_kick(&g_pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } /* Called when a new TCP connection request arrives in the listening port. */ -static void -listen_cb (void *arg, /*=sv_arg*/ - int success, grpc_closure_list * closure_list) -{ +static void listen_cb(void *arg, /*=sv_arg*/ + int success, grpc_closure_list *closure_list) { server *sv = arg; int fd; int flags; session *se; struct sockaddr_storage ss; - socklen_t slen = sizeof (ss); + socklen_t slen = sizeof(ss); grpc_fd *listen_em_fd = sv->em_fd; - if (!success) - { - listen_shutdown_cb (exec_ctx, arg, 1); - return; - } - - fd = accept (listen_em_fd->fd, (struct sockaddr *) &ss, &slen); - GPR_ASSERT (fd >= 0); - GPR_ASSERT (fd < FD_SETSIZE); - flags = fcntl (fd, F_GETFL, 0); - fcntl (fd, F_SETFL, flags | O_NONBLOCK); - se = gpr_malloc (sizeof (*se)); + if (!success) { + listen_shutdown_cb(exec_ctx, arg, 1); + return; + } + + fd = accept(listen_em_fd->fd, (struct sockaddr *)&ss, &slen); + GPR_ASSERT(fd >= 0); + GPR_ASSERT(fd < FD_SETSIZE); + flags = fcntl(fd, F_GETFL, 0); + fcntl(fd, F_SETFL, flags | O_NONBLOCK); + 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); + se->em_fd = grpc_fd_create(fd, "listener"); + grpc_pollset_add_fd(exec_ctx, &g_pollset, se->em_fd); se->session_read_closure.cb = session_read_cb; se->session_read_closure.cb_arg = se; - grpc_fd_notify_on_read (exec_ctx, 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 (exec_ctx, 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(). */ @@ -249,46 +224,42 @@ 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 (grpc_exec_ctx * exec_ctx, server * sv) -{ +static int server_start(grpc_exec_ctx *exec_ctx, server *sv) { int port = 0; int fd; struct sockaddr_in sin; socklen_t addr_len; - create_test_socket (port, &fd, &sin); - addr_len = sizeof (sin); - GPR_ASSERT (bind (fd, (struct sockaddr *) &sin, addr_len) == 0); - GPR_ASSERT (getsockname (fd, (struct sockaddr *) &sin, &addr_len) == 0); - port = ntohs (sin.sin_port); - GPR_ASSERT (listen (fd, MAX_NUM_FD) == 0); + create_test_socket(port, &fd, &sin); + addr_len = sizeof(sin); + GPR_ASSERT(bind(fd, (struct sockaddr *)&sin, addr_len) == 0); + GPR_ASSERT(getsockname(fd, (struct sockaddr *)&sin, &addr_len) == 0); + port = ntohs(sin.sin_port); + 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); + sv->em_fd = grpc_fd_create(fd, "server"); + grpc_pollset_add_fd(exec_ctx, &g_pollset, sv->em_fd); /* Register to be interested in reading from listen_fd. */ sv->listen_closure.cb = listen_cb; sv->listen_closure.cb_arg = sv; - grpc_fd_notify_on_read (exec_ctx, sv->em_fd, &sv->listen_closure); + grpc_fd_notify_on_read(exec_ctx, sv->em_fd, &sv->listen_closure); return port; } /* Wait and shutdown a sever. */ -static void -server_wait_and_shutdown (server * sv) -{ - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - while (!sv->done) - { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - } - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); +static void server_wait_and_shutdown(server *sv) { + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + while (!sv->done) { + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_pollset_worker worker; + grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + gpr_inf_future(&exec_ctx, GPR_CLOCK_MONOTONIC)); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + } + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } /* ===An upload client to test notify_on_write=== */ @@ -299,8 +270,7 @@ server_wait_and_shutdown (server * sv) #define CLIENT_TOTAL_WRITE_CNT 3 /* An upload client. */ -typedef struct -{ +typedef struct { grpc_fd *em_fd; char write_buf[CLIENT_WRITE_BUF_SIZE]; ssize_t write_bytes_total; @@ -308,198 +278,157 @@ typedef struct notify_on_write to schedule another write. */ int client_write_cnt; - int done; /* set to 1 when a client finishes sending */ + int done; /* set to 1 when a client finishes sending */ grpc_closure write_closure; } client; -static void -client_init (client * cl) -{ - memset (cl->write_buf, 0, sizeof (cl->write_buf)); +static void client_init(client *cl) { + memset(cl->write_buf, 0, sizeof(cl->write_buf)); cl->write_bytes_total = 0; cl->client_write_cnt = 0; cl->done = 0; } /* Called when a client upload session is ready to shutdown. */ -static void -client_session_shutdown_cb (void *arg /*client */ , int success, - grpc_closure_list * closure_list) -{ +static void client_session_shutdown_cb(void *arg /*client */, int success, + grpc_closure_list *closure_list) { client *cl = arg; - grpc_fd_orphan (exec_ctx, cl->em_fd, NULL, "c"); + grpc_fd_orphan(exec_ctx, cl->em_fd, NULL, "c"); cl->done = 1; - grpc_pollset_kick (&g_pollset, NULL); + grpc_pollset_kick(&g_pollset, NULL); } /* Write as much as possible, then register notify_on_write. */ -static void -client_session_write (void *arg, /*client */ - int success, grpc_closure_list * closure_list) -{ +static void client_session_write(void *arg, /*client */ + int success, grpc_closure_list *closure_list) { client *cl = arg; int fd = cl->em_fd->fd; ssize_t write_once = 0; - if (!success) - { - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - client_session_shutdown_cb (exec_ctx, arg, 1); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - return; - } - - do - { - write_once = write (fd, cl->write_buf, CLIENT_WRITE_BUF_SIZE); - if (write_once > 0) - cl->write_bytes_total += write_once; - } - while (write_once > 0); - - if (errno == EAGAIN) - { - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - if (cl->client_write_cnt < CLIENT_TOTAL_WRITE_CNT) - { - cl->write_closure.cb = client_session_write; - cl->write_closure.cb_arg = cl; - grpc_fd_notify_on_write (exec_ctx, cl->em_fd, &cl->write_closure); - cl->client_write_cnt++; - } - else - { - client_session_shutdown_cb (exec_ctx, arg, 1); - } - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - } - else - { - gpr_log (GPR_ERROR, "unknown errno %s", strerror (errno)); - abort (); + if (!success) { + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + client_session_shutdown_cb(exec_ctx, arg, 1); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + return; + } + + do { + write_once = write(fd, cl->write_buf, CLIENT_WRITE_BUF_SIZE); + if (write_once > 0) cl->write_bytes_total += write_once; + } while (write_once > 0); + + if (errno == EAGAIN) { + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + if (cl->client_write_cnt < CLIENT_TOTAL_WRITE_CNT) { + cl->write_closure.cb = client_session_write; + cl->write_closure.cb_arg = cl; + grpc_fd_notify_on_write(exec_ctx, cl->em_fd, &cl->write_closure); + cl->client_write_cnt++; + } else { + client_session_shutdown_cb(exec_ctx, arg, 1); } + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + } else { + gpr_log(GPR_ERROR, "unknown errno %s", strerror(errno)); + abort(); + } } /* 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(grpc_exec_ctx *exec_ctx, client *cl, int port) { int fd; struct sockaddr_in sin; - create_test_socket (port, &fd, &sin); - if (connect (fd, (struct sockaddr *) &sin, sizeof (sin)) == -1) - { - if (errno == EINPROGRESS) - { - struct pollfd pfd; - pfd.fd = fd; - pfd.events = POLLOUT; - pfd.revents = 0; - if (poll (&pfd, 1, -1) == -1) - { - gpr_log (GPR_ERROR, "poll() failed during connect; errno=%d", errno); - abort (); - } - } - else - { - gpr_log (GPR_ERROR, "Failed to connect to the server (errno=%d)", errno); - abort (); - } + create_test_socket(port, &fd, &sin); + if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) { + if (errno == EINPROGRESS) { + struct pollfd pfd; + pfd.fd = fd; + pfd.events = POLLOUT; + pfd.revents = 0; + if (poll(&pfd, 1, -1) == -1) { + gpr_log(GPR_ERROR, "poll() failed during connect; errno=%d", errno); + abort(); + } + } else { + gpr_log(GPR_ERROR, "Failed to connect to the server (errno=%d)", errno); + abort(); } + } - cl->em_fd = grpc_fd_create (fd, "client"); - grpc_pollset_add_fd (exec_ctx, &g_pollset, cl->em_fd); + cl->em_fd = grpc_fd_create(fd, "client"); + grpc_pollset_add_fd(exec_ctx, &g_pollset, cl->em_fd); - client_session_write (exec_ctx, cl, 1); + client_session_write(exec_ctx, cl, 1); } /* Wait for the signal to shutdown a client. */ -static void -client_wait_and_shutdown (client * cl) -{ - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - while (!cl->done) - { - grpc_pollset_worker worker; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - } - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); +static void client_wait_and_shutdown(client *cl) { + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + while (!cl->done) { + grpc_pollset_worker worker; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + gpr_inf_future(&exec_ctx, GPR_CLOCK_MONOTONIC)); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + } + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } /* Test grpc_fd. Start an upload server and client, upload a stream of bytes from the client to the server, and verify that the total number of sent bytes is equal to the total number of received bytes. */ -static void -test_grpc_fd (void) -{ +static void test_grpc_fd(void) { server sv; client cl; int port; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - server_init (&sv); - port = server_start (&exec_ctx, &sv); - client_init (&cl); - 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); - gpr_log (GPR_INFO, "Total read bytes %d", sv.read_bytes_total); + server_init(&sv); + port = server_start(&exec_ctx, &sv); + client_init(&cl); + 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); + gpr_log(GPR_INFO, "Total read bytes %d", sv.read_bytes_total); } -typedef struct fd_change_data -{ - void (*cb_that_ran) (grpc_exec_ctx * exec_ctx, void *, int success); +typedef struct fd_change_data { + void (*cb_that_ran)(grpc_exec_ctx *exec_ctx, void *, int success); } fd_change_data; -void -init_change_data (fd_change_data * fdc) -{ - fdc->cb_that_ran = NULL; -} +void init_change_data(fd_change_data *fdc) { fdc->cb_that_ran = NULL; } -void -destroy_change_data (fd_change_data * fdc) -{ -} +void destroy_change_data(fd_change_data *fdc) {} -static void -first_read_callback (void *arg /* fd_change_data */ , int success, - grpc_closure_list * closure_list) -{ +static void first_read_callback(void *arg /* fd_change_data */, int success, + grpc_closure_list *closure_list) { fd_change_data *fdc = arg; - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); fdc->cb_that_ran = first_read_callback; - grpc_pollset_kick (&g_pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_pollset_kick(&g_pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } -static void -second_read_callback (void *arg /* fd_change_data */ , int success, - grpc_closure_list * closure_list) -{ +static void second_read_callback(void *arg /* fd_change_data */, int success, + grpc_closure_list *closure_list) { fd_change_data *fdc = arg; - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); fdc->cb_that_ran = second_read_callback; - grpc_pollset_kick (&g_pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_pollset_kick(&g_pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } /* Test that changing the callback we use for notify_on_read actually works. Note that we have two different but almost identical callbacks above -- the point is to have two different function pointers and two different data pointers and make sure that changing both really works. */ -static void -test_grpc_fd_change (void) -{ +static void test_grpc_fd_change(void) { grpc_fd *em_fd; fd_change_data a, b; int flags; @@ -515,87 +444,83 @@ test_grpc_fd_change (void) second_closure.cb = second_read_callback; second_closure.cb_arg = &b; - init_change_data (&a); - init_change_data (&b); + init_change_data(&a); + init_change_data(&b); - GPR_ASSERT (socketpair (AF_UNIX, SOCK_STREAM, 0, sv) == 0); - flags = fcntl (sv[0], F_GETFL, 0); - GPR_ASSERT (fcntl (sv[0], F_SETFL, flags | O_NONBLOCK) == 0); - flags = fcntl (sv[1], F_GETFL, 0); - GPR_ASSERT (fcntl (sv[1], F_SETFL, flags | O_NONBLOCK) == 0); + GPR_ASSERT(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); + flags = fcntl(sv[0], F_GETFL, 0); + GPR_ASSERT(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK) == 0); + flags = fcntl(sv[1], F_GETFL, 0); + 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); + em_fd = grpc_fd_create(sv[0], "test_grpc_fd_change"); + grpc_pollset_add_fd(&exec_ctx, &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(&exec_ctx, em_fd, &first_closure); data = 0; - result = write (sv[1], &data, 1); - GPR_ASSERT (result == 1); + result = write(sv[1], &data, 1); + GPR_ASSERT(result == 1); /* And now wait for it to run. */ - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - while (a.cb_that_ran == NULL) - { - grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - } - GPR_ASSERT (a.cb_that_ran == first_read_callback); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + while (a.cb_that_ran == NULL) { + grpc_pollset_worker worker; + grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + gpr_inf_future(&exec_ctx, GPR_CLOCK_MONOTONIC)); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + } + GPR_ASSERT(a.cb_that_ran == first_read_callback); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); /* And drain the socket so we can generate a new read edge */ - result = read (sv[0], &data, 1); - GPR_ASSERT (result == 1); + result = read(sv[0], &data, 1); + GPR_ASSERT(result == 1); /* 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(&exec_ctx, em_fd, &second_closure); data = 0; - result = write (sv[1], &data, 1); - GPR_ASSERT (result == 1); - - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - while (b.cb_that_ran == NULL) - { - grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - } + result = write(sv[1], &data, 1); + GPR_ASSERT(result == 1); + + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + while (b.cb_that_ran == NULL) { + grpc_pollset_worker worker; + grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + gpr_inf_future(&exec_ctx, GPR_CLOCK_MONOTONIC)); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + } /* Except now we verify that second_read_callback ran instead */ - GPR_ASSERT (b.cb_that_ran == second_read_callback); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - - grpc_fd_orphan (&exec_ctx, em_fd, NULL, "d"); - grpc_exec_ctx_finish (&exec_ctx); - destroy_change_data (&a); - destroy_change_data (&b); - close (sv[1]); + GPR_ASSERT(b.cb_that_ran == second_read_callback); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + + grpc_fd_orphan(&exec_ctx, em_fd, NULL, "d"); + grpc_exec_ctx_finish(&exec_ctx); + destroy_change_data(&a); + destroy_change_data(&b); + close(sv[1]); } -static void -destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) -{ - grpc_pollset_destroy (p); +static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, int success) { + grpc_pollset_destroy(p); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { grpc_closure destroyed; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_test_init (argc, argv); - grpc_iomgr_init (); - grpc_pollset_init (&g_pollset); - test_grpc_fd (); - test_grpc_fd_change (); - grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); - grpc_exec_ctx_finish (&exec_ctx); - grpc_iomgr_shutdown (); + grpc_test_init(argc, argv); + grpc_iomgr_init(); + grpc_pollset_init(&g_pollset); + test_grpc_fd(); + test_grpc_fd_change(); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&exec_ctx, &g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); + grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/resolve_address_test.c b/test/core/iomgr/resolve_address_test.c index 814cb9e150c..1c95a9960e0 100644 --- a/test/core/iomgr/resolve_address_test.c +++ b/test/core/iomgr/resolve_address_test.c @@ -38,124 +38,101 @@ #include #include "test/core/util/test_config.h" -static gpr_timespec -test_deadline (void) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (100); +static gpr_timespec test_deadline(void) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(100); } -static void -must_succeed (grpc_exec_ctx * exec_ctx, void *evp, grpc_resolved_addresses * p) -{ - GPR_ASSERT (p); - GPR_ASSERT (p->naddrs >= 1); - grpc_resolved_addresses_destroy (p); - gpr_event_set (evp, (void *) 1); +static void must_succeed(grpc_exec_ctx *exec_ctx, void *evp, + grpc_resolved_addresses *p) { + GPR_ASSERT(p); + GPR_ASSERT(p->naddrs >= 1); + grpc_resolved_addresses_destroy(p); + gpr_event_set(evp, (void *)1); } -static void -must_fail (grpc_exec_ctx * exec_ctx, void *evp, grpc_resolved_addresses * p) -{ - GPR_ASSERT (!p); - gpr_event_set (evp, (void *) 1); +static void must_fail(grpc_exec_ctx *exec_ctx, void *evp, + grpc_resolved_addresses *p) { + GPR_ASSERT(!p); + gpr_event_set(evp, (void *)1); } -static void -test_localhost (void) -{ +static void test_localhost(void) { gpr_event ev; - gpr_event_init (&ev); - grpc_resolve_address ("localhost:1", NULL, must_succeed, &ev); - GPR_ASSERT (gpr_event_wait (&ev, test_deadline ())); + gpr_event_init(&ev); + grpc_resolve_address("localhost:1", NULL, must_succeed, &ev); + GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); } -static void -test_default_port (void) -{ +static void test_default_port(void) { gpr_event ev; - gpr_event_init (&ev); - grpc_resolve_address ("localhost", "1", must_succeed, &ev); - GPR_ASSERT (gpr_event_wait (&ev, test_deadline ())); + gpr_event_init(&ev); + grpc_resolve_address("localhost", "1", must_succeed, &ev); + GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); } -static void -test_missing_default_port (void) -{ +static void test_missing_default_port(void) { gpr_event ev; - gpr_event_init (&ev); - grpc_resolve_address ("localhost", NULL, must_fail, &ev); - GPR_ASSERT (gpr_event_wait (&ev, test_deadline ())); + gpr_event_init(&ev); + grpc_resolve_address("localhost", NULL, must_fail, &ev); + GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); } -static void -test_ipv6_with_port (void) -{ +static void test_ipv6_with_port(void) { gpr_event ev; - gpr_event_init (&ev); - grpc_resolve_address ("[2001:db8::1]:1", NULL, must_succeed, &ev); - GPR_ASSERT (gpr_event_wait (&ev, test_deadline ())); + gpr_event_init(&ev); + grpc_resolve_address("[2001:db8::1]:1", NULL, must_succeed, &ev); + GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); } -static void -test_ipv6_without_port (void) -{ +static void test_ipv6_without_port(void) { const char *const kCases[] = { - "2001:db8::1", "2001:db8::1.2.3.4", "[2001:db8::1]", + "2001:db8::1", "2001:db8::1.2.3.4", "[2001:db8::1]", }; unsigned i; - for (i = 0; i < sizeof (kCases) / sizeof (*kCases); i++) - { - gpr_event ev; - gpr_event_init (&ev); - grpc_resolve_address (kCases[i], "80", must_succeed, &ev); - GPR_ASSERT (gpr_event_wait (&ev, test_deadline ())); - } + for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { + gpr_event ev; + gpr_event_init(&ev); + grpc_resolve_address(kCases[i], "80", must_succeed, &ev); + GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); + } } -static void -test_invalid_ip_addresses (void) -{ +static void test_invalid_ip_addresses(void) { const char *const kCases[] = { - "293.283.1238.3:1", "[2001:db8::11111]:1", + "293.283.1238.3:1", "[2001:db8::11111]:1", }; unsigned i; - for (i = 0; i < sizeof (kCases) / sizeof (*kCases); i++) - { - gpr_event ev; - gpr_event_init (&ev); - grpc_resolve_address (kCases[i], NULL, must_fail, &ev); - GPR_ASSERT (gpr_event_wait (&ev, test_deadline ())); - } + for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { + gpr_event ev; + gpr_event_init(&ev); + grpc_resolve_address(kCases[i], NULL, must_fail, &ev); + GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); + } } -static void -test_unparseable_hostports (void) -{ +static void test_unparseable_hostports(void) { const char *const kCases[] = { - "[", "[::1", "[::1]bad", "[1.2.3.4]", "[localhost]", "[localhost]:1", + "[", "[::1", "[::1]bad", "[1.2.3.4]", "[localhost]", "[localhost]:1", }; unsigned i; - for (i = 0; i < sizeof (kCases) / sizeof (*kCases); i++) - { - gpr_event ev; - gpr_event_init (&ev); - grpc_resolve_address (kCases[i], "1", must_fail, &ev); - GPR_ASSERT (gpr_event_wait (&ev, test_deadline ())); - } + for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { + gpr_event ev; + gpr_event_init(&ev); + grpc_resolve_address(kCases[i], "1", must_fail, &ev); + GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); + } } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - grpc_iomgr_init (); - test_localhost (); - test_default_port (); - test_missing_default_port (); - test_ipv6_with_port (); - test_ipv6_without_port (); - test_invalid_ip_addresses (); - test_unparseable_hostports (); - grpc_iomgr_shutdown (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + grpc_iomgr_init(); + test_localhost(); + test_default_port(); + test_missing_default_port(); + test_ipv6_with_port(); + test_ipv6_without_port(); + test_invalid_ip_addresses(); + test_unparseable_hostports(); + grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/sockaddr_utils_test.c b/test/core/iomgr/sockaddr_utils_test.c index 2f061cfa466..5009a641ea0 100644 --- a/test/core/iomgr/sockaddr_utils_test.c +++ b/test/core/iomgr/sockaddr_utils_test.c @@ -41,216 +41,208 @@ #include #include "test/core/util/test_config.h" -static struct sockaddr_in -make_addr4 (const gpr_uint8 * data, size_t data_len) -{ +static struct sockaddr_in make_addr4(const gpr_uint8 *data, size_t data_len) { struct sockaddr_in addr4; - memset (&addr4, 0, sizeof (addr4)); + memset(&addr4, 0, sizeof(addr4)); addr4.sin_family = AF_INET; - GPR_ASSERT (data_len == sizeof (addr4.sin_addr.s_addr)); - memcpy (&addr4.sin_addr.s_addr, data, data_len); - addr4.sin_port = htons (12345); + GPR_ASSERT(data_len == sizeof(addr4.sin_addr.s_addr)); + memcpy(&addr4.sin_addr.s_addr, data, data_len); + addr4.sin_port = htons(12345); return addr4; } -static struct sockaddr_in6 -make_addr6 (const gpr_uint8 * data, size_t data_len) -{ +static struct sockaddr_in6 make_addr6(const gpr_uint8 *data, size_t data_len) { struct sockaddr_in6 addr6; - memset (&addr6, 0, sizeof (addr6)); + memset(&addr6, 0, sizeof(addr6)); addr6.sin6_family = AF_INET6; - GPR_ASSERT (data_len == sizeof (addr6.sin6_addr.s6_addr)); - memcpy (&addr6.sin6_addr.s6_addr, data, data_len); - addr6.sin6_port = htons (12345); + GPR_ASSERT(data_len == sizeof(addr6.sin6_addr.s6_addr)); + memcpy(&addr6.sin6_addr.s6_addr, data, data_len); + addr6.sin6_port = htons(12345); return addr6; } -static const gpr_uint8 kMapped[] = { 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0xff, 0xff, 192, 0, 2, 1 -}; +static const gpr_uint8 kMapped[] = {0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0xff, 0xff, 192, 0, 2, 1}; -static const gpr_uint8 kNotQuiteMapped[] = { 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0xff, 0xfe, 192, 0, 2, 99 -}; -static const gpr_uint8 kIPv4[] = { 192, 0, 2, 1 }; +static const gpr_uint8 kNotQuiteMapped[] = {0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0xff, 0xfe, 192, 0, 2, 99}; +static const gpr_uint8 kIPv4[] = {192, 0, 2, 1}; -static const gpr_uint8 kIPv6[] = { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1 -}; +static const gpr_uint8 kIPv6[] = {0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1}; -static void -test_sockaddr_is_v4mapped (void) -{ +static void test_sockaddr_is_v4mapped(void) { struct sockaddr_in input4; struct sockaddr_in6 input6; struct sockaddr_in output4; struct sockaddr_in expect4; - gpr_log (GPR_INFO, "%s", "test_sockaddr_is_v4mapped"); + gpr_log(GPR_INFO, "%s", "test_sockaddr_is_v4mapped"); /* v4mapped input should succeed. */ - input6 = make_addr6 (kMapped, sizeof (kMapped)); - GPR_ASSERT (grpc_sockaddr_is_v4mapped ((const struct sockaddr *) &input6, NULL)); - GPR_ASSERT (grpc_sockaddr_is_v4mapped ((const struct sockaddr *) &input6, &output4)); - expect4 = make_addr4 (kIPv4, sizeof (kIPv4)); - GPR_ASSERT (memcmp (&expect4, &output4, sizeof (expect4)) == 0); + input6 = make_addr6(kMapped, sizeof(kMapped)); + GPR_ASSERT(grpc_sockaddr_is_v4mapped((const struct sockaddr *)&input6, NULL)); + GPR_ASSERT( + grpc_sockaddr_is_v4mapped((const struct sockaddr *)&input6, &output4)); + expect4 = make_addr4(kIPv4, sizeof(kIPv4)); + GPR_ASSERT(memcmp(&expect4, &output4, sizeof(expect4)) == 0); /* Non-v4mapped input should fail. */ - input6 = make_addr6 (kNotQuiteMapped, sizeof (kNotQuiteMapped)); - GPR_ASSERT (!grpc_sockaddr_is_v4mapped ((const struct sockaddr *) &input6, NULL)); - GPR_ASSERT (!grpc_sockaddr_is_v4mapped ((const struct sockaddr *) &input6, &output4)); + input6 = make_addr6(kNotQuiteMapped, sizeof(kNotQuiteMapped)); + GPR_ASSERT( + !grpc_sockaddr_is_v4mapped((const struct sockaddr *)&input6, NULL)); + GPR_ASSERT( + !grpc_sockaddr_is_v4mapped((const struct sockaddr *)&input6, &output4)); /* Output is unchanged. */ - GPR_ASSERT (memcmp (&expect4, &output4, sizeof (expect4)) == 0); + GPR_ASSERT(memcmp(&expect4, &output4, sizeof(expect4)) == 0); /* Plain IPv4 input should also fail. */ - input4 = make_addr4 (kIPv4, sizeof (kIPv4)); - GPR_ASSERT (!grpc_sockaddr_is_v4mapped ((const struct sockaddr *) &input4, NULL)); + input4 = make_addr4(kIPv4, sizeof(kIPv4)); + GPR_ASSERT( + !grpc_sockaddr_is_v4mapped((const struct sockaddr *)&input4, NULL)); } -static void -test_sockaddr_to_v4mapped (void) -{ +static void test_sockaddr_to_v4mapped(void) { struct sockaddr_in input4; struct sockaddr_in6 input6; struct sockaddr_in6 output6; struct sockaddr_in6 expect6; - gpr_log (GPR_INFO, "%s", "test_sockaddr_to_v4mapped"); + gpr_log(GPR_INFO, "%s", "test_sockaddr_to_v4mapped"); /* IPv4 input should succeed. */ - input4 = make_addr4 (kIPv4, sizeof (kIPv4)); - GPR_ASSERT (grpc_sockaddr_to_v4mapped ((const struct sockaddr *) &input4, &output6)); - expect6 = make_addr6 (kMapped, sizeof (kMapped)); - GPR_ASSERT (memcmp (&expect6, &output6, sizeof (output6)) == 0); + input4 = make_addr4(kIPv4, sizeof(kIPv4)); + GPR_ASSERT( + grpc_sockaddr_to_v4mapped((const struct sockaddr *)&input4, &output6)); + expect6 = make_addr6(kMapped, sizeof(kMapped)); + GPR_ASSERT(memcmp(&expect6, &output6, sizeof(output6)) == 0); /* IPv6 input should fail. */ - input6 = make_addr6 (kIPv6, sizeof (kIPv6)); - GPR_ASSERT (!grpc_sockaddr_to_v4mapped ((const struct sockaddr *) &input6, &output6)); + input6 = make_addr6(kIPv6, sizeof(kIPv6)); + GPR_ASSERT( + !grpc_sockaddr_to_v4mapped((const struct sockaddr *)&input6, &output6)); /* Output is unchanged. */ - GPR_ASSERT (memcmp (&expect6, &output6, sizeof (output6)) == 0); + GPR_ASSERT(memcmp(&expect6, &output6, sizeof(output6)) == 0); /* Already-v4mapped input should also fail. */ - input6 = make_addr6 (kMapped, sizeof (kMapped)); - GPR_ASSERT (!grpc_sockaddr_to_v4mapped ((const struct sockaddr *) &input6, &output6)); + input6 = make_addr6(kMapped, sizeof(kMapped)); + GPR_ASSERT( + !grpc_sockaddr_to_v4mapped((const struct sockaddr *)&input6, &output6)); } -static void -test_sockaddr_is_wildcard (void) -{ +static void test_sockaddr_is_wildcard(void) { struct sockaddr_in wild4; struct sockaddr_in6 wild6; struct sockaddr_in6 wild_mapped; struct sockaddr dummy; int port; - gpr_log (GPR_INFO, "%s", "test_sockaddr_is_wildcard"); + gpr_log(GPR_INFO, "%s", "test_sockaddr_is_wildcard"); /* Generate wildcards. */ - grpc_sockaddr_make_wildcards (555, &wild4, &wild6); - GPR_ASSERT (grpc_sockaddr_to_v4mapped ((const struct sockaddr *) &wild4, &wild_mapped)); + grpc_sockaddr_make_wildcards(555, &wild4, &wild6); + GPR_ASSERT( + grpc_sockaddr_to_v4mapped((const struct sockaddr *)&wild4, &wild_mapped)); /* Test 0.0.0.0:555 */ port = -1; - GPR_ASSERT (grpc_sockaddr_is_wildcard ((const struct sockaddr *) &wild4, &port)); - GPR_ASSERT (port == 555); - memset (&wild4.sin_addr.s_addr, 0xbd, 1); - GPR_ASSERT (!grpc_sockaddr_is_wildcard ((const struct sockaddr *) &wild4, &port)); + GPR_ASSERT(grpc_sockaddr_is_wildcard((const struct sockaddr *)&wild4, &port)); + GPR_ASSERT(port == 555); + memset(&wild4.sin_addr.s_addr, 0xbd, 1); + GPR_ASSERT( + !grpc_sockaddr_is_wildcard((const struct sockaddr *)&wild4, &port)); /* Test [::]:555 */ port = -1; - GPR_ASSERT (grpc_sockaddr_is_wildcard ((const struct sockaddr *) &wild6, &port)); - GPR_ASSERT (port == 555); - memset (&wild6.sin6_addr.s6_addr, 0xbd, 1); - GPR_ASSERT (!grpc_sockaddr_is_wildcard ((const struct sockaddr *) &wild6, &port)); + GPR_ASSERT(grpc_sockaddr_is_wildcard((const struct sockaddr *)&wild6, &port)); + GPR_ASSERT(port == 555); + memset(&wild6.sin6_addr.s6_addr, 0xbd, 1); + GPR_ASSERT( + !grpc_sockaddr_is_wildcard((const struct sockaddr *)&wild6, &port)); /* Test [::ffff:0.0.0.0]:555 */ port = -1; - GPR_ASSERT (grpc_sockaddr_is_wildcard ((const struct sockaddr *) &wild_mapped, &port)); - GPR_ASSERT (port == 555); - memset (&wild_mapped.sin6_addr.s6_addr, 0xbd, 1); - GPR_ASSERT (!grpc_sockaddr_is_wildcard ((const struct sockaddr *) &wild_mapped, &port)); + GPR_ASSERT( + grpc_sockaddr_is_wildcard((const struct sockaddr *)&wild_mapped, &port)); + GPR_ASSERT(port == 555); + memset(&wild_mapped.sin6_addr.s6_addr, 0xbd, 1); + GPR_ASSERT( + !grpc_sockaddr_is_wildcard((const struct sockaddr *)&wild_mapped, &port)); /* Test AF_UNSPEC. */ port = -1; - memset (&dummy, 0, sizeof (dummy)); - GPR_ASSERT (!grpc_sockaddr_is_wildcard (&dummy, &port)); - GPR_ASSERT (port == -1); + memset(&dummy, 0, sizeof(dummy)); + GPR_ASSERT(!grpc_sockaddr_is_wildcard(&dummy, &port)); + GPR_ASSERT(port == -1); } -static void -expect_sockaddr_str (const char *expected, void *addr, int normalize) -{ +static void expect_sockaddr_str(const char *expected, void *addr, + int normalize) { int result; char *str; - gpr_log (GPR_INFO, " expect_sockaddr_str(%s)", expected); - result = grpc_sockaddr_to_string (&str, (struct sockaddr *) addr, normalize); - GPR_ASSERT (str != NULL); - GPR_ASSERT (result >= 0); - GPR_ASSERT ((size_t) result == strlen (str)); - GPR_ASSERT (strcmp (expected, str) == 0); - gpr_free (str); + gpr_log(GPR_INFO, " expect_sockaddr_str(%s)", expected); + result = grpc_sockaddr_to_string(&str, (struct sockaddr *)addr, normalize); + GPR_ASSERT(str != NULL); + GPR_ASSERT(result >= 0); + GPR_ASSERT((size_t)result == strlen(str)); + GPR_ASSERT(strcmp(expected, str) == 0); + gpr_free(str); } -static void -expect_sockaddr_uri (const char *expected, void *addr) -{ +static void expect_sockaddr_uri(const char *expected, void *addr) { char *str; - gpr_log (GPR_INFO, " expect_sockaddr_uri(%s)", expected); - str = grpc_sockaddr_to_uri ((struct sockaddr *) addr); - GPR_ASSERT (str != NULL); - GPR_ASSERT (strcmp (expected, str) == 0); - gpr_free (str); + gpr_log(GPR_INFO, " expect_sockaddr_uri(%s)", expected); + str = grpc_sockaddr_to_uri((struct sockaddr *)addr); + GPR_ASSERT(str != NULL); + GPR_ASSERT(strcmp(expected, str) == 0); + gpr_free(str); } -static void -test_sockaddr_to_string (void) -{ +static void test_sockaddr_to_string(void) { struct sockaddr_in input4; struct sockaddr_in6 input6; struct sockaddr dummy; - gpr_log (GPR_INFO, "%s", "test_sockaddr_to_string"); + gpr_log(GPR_INFO, "%s", "test_sockaddr_to_string"); errno = 0x7EADBEEF; - input4 = make_addr4 (kIPv4, sizeof (kIPv4)); - expect_sockaddr_str ("192.0.2.1:12345", &input4, 0); - expect_sockaddr_str ("192.0.2.1:12345", &input4, 1); - expect_sockaddr_uri ("ipv4:192.0.2.1:12345", &input4); + input4 = make_addr4(kIPv4, sizeof(kIPv4)); + expect_sockaddr_str("192.0.2.1:12345", &input4, 0); + expect_sockaddr_str("192.0.2.1:12345", &input4, 1); + expect_sockaddr_uri("ipv4:192.0.2.1:12345", &input4); - input6 = make_addr6 (kIPv6, sizeof (kIPv6)); - expect_sockaddr_str ("[2001:db8::1]:12345", &input6, 0); - expect_sockaddr_str ("[2001:db8::1]:12345", &input6, 1); - expect_sockaddr_uri ("ipv6:[2001:db8::1]:12345", &input6); + input6 = make_addr6(kIPv6, sizeof(kIPv6)); + expect_sockaddr_str("[2001:db8::1]:12345", &input6, 0); + expect_sockaddr_str("[2001:db8::1]:12345", &input6, 1); + expect_sockaddr_uri("ipv6:[2001:db8::1]:12345", &input6); - input6 = make_addr6 (kMapped, sizeof (kMapped)); - expect_sockaddr_str ("[::ffff:192.0.2.1]:12345", &input6, 0); - expect_sockaddr_str ("192.0.2.1:12345", &input6, 1); - expect_sockaddr_uri ("ipv4:192.0.2.1:12345", &input6); + input6 = make_addr6(kMapped, sizeof(kMapped)); + expect_sockaddr_str("[::ffff:192.0.2.1]:12345", &input6, 0); + expect_sockaddr_str("192.0.2.1:12345", &input6, 1); + expect_sockaddr_uri("ipv4:192.0.2.1:12345", &input6); - input6 = make_addr6 (kNotQuiteMapped, sizeof (kNotQuiteMapped)); - expect_sockaddr_str ("[::fffe:c000:263]:12345", &input6, 0); - expect_sockaddr_str ("[::fffe:c000:263]:12345", &input6, 1); - expect_sockaddr_uri ("ipv6:[::fffe:c000:263]:12345", &input6); + input6 = make_addr6(kNotQuiteMapped, sizeof(kNotQuiteMapped)); + expect_sockaddr_str("[::fffe:c000:263]:12345", &input6, 0); + expect_sockaddr_str("[::fffe:c000:263]:12345", &input6, 1); + expect_sockaddr_uri("ipv6:[::fffe:c000:263]:12345", &input6); - memset (&dummy, 0, sizeof (dummy)); + memset(&dummy, 0, sizeof(dummy)); dummy.sa_family = 123; - expect_sockaddr_str ("(sockaddr family=123)", &dummy, 0); - expect_sockaddr_str ("(sockaddr family=123)", &dummy, 1); - GPR_ASSERT (grpc_sockaddr_to_uri (&dummy) == NULL); + expect_sockaddr_str("(sockaddr family=123)", &dummy, 0); + expect_sockaddr_str("(sockaddr family=123)", &dummy, 1); + GPR_ASSERT(grpc_sockaddr_to_uri(&dummy) == NULL); - GPR_ASSERT (errno == 0x7EADBEEF); + GPR_ASSERT(errno == 0x7EADBEEF); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); - test_sockaddr_is_v4mapped (); - test_sockaddr_to_v4mapped (); - test_sockaddr_is_wildcard (); - test_sockaddr_to_string (); + test_sockaddr_is_v4mapped(); + test_sockaddr_to_v4mapped(); + test_sockaddr_is_wildcard(); + test_sockaddr_to_string(); return 0; } diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index 7ce85b7403e..a7033f246b2 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -52,137 +52,125 @@ static grpc_pollset g_pollset; static int g_connections_complete = 0; static grpc_endpoint *g_connecting = NULL; -static gpr_timespec -test_deadline (void) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10); +static gpr_timespec test_deadline(void) { + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10); } -static void -finish_connection () -{ - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); +static void finish_connection() { + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); g_connections_complete++; - grpc_pollset_kick (&g_pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_pollset_kick(&g_pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } -static void -must_succeed (grpc_exec_ctx * exec_ctx, void *arg, int success) -{ - GPR_ASSERT (g_connecting != NULL); - GPR_ASSERT (success); - grpc_endpoint_shutdown (exec_ctx, g_connecting); - grpc_endpoint_destroy (exec_ctx, g_connecting); +static void must_succeed(grpc_exec_ctx *exec_ctx, void *arg, int success) { + GPR_ASSERT(g_connecting != NULL); + GPR_ASSERT(success); + grpc_endpoint_shutdown(exec_ctx, g_connecting); + grpc_endpoint_destroy(exec_ctx, g_connecting); g_connecting = NULL; - finish_connection (); + finish_connection(); } -static void -must_fail (grpc_exec_ctx * exec_ctx, void *arg, int success) -{ - GPR_ASSERT (g_connecting == NULL); - GPR_ASSERT (!success); - finish_connection (); +static void must_fail(grpc_exec_ctx *exec_ctx, void *arg, int success) { + GPR_ASSERT(g_connecting == NULL); + GPR_ASSERT(!success); + finish_connection(); } -void -test_succeeds (void) -{ +void test_succeeds(void) { struct sockaddr_in addr; - socklen_t addr_len = sizeof (addr); + socklen_t addr_len = sizeof(addr); int svr_fd; int r; int connections_complete_before; grpc_closure done; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - gpr_log (GPR_DEBUG, "test_succeeds"); + gpr_log(GPR_DEBUG, "test_succeeds"); - memset (&addr, 0, sizeof (addr)); + memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; /* create a dummy server */ - svr_fd = socket (AF_INET, SOCK_STREAM, 0); - GPR_ASSERT (svr_fd >= 0); - GPR_ASSERT (0 == bind (svr_fd, (struct sockaddr *) &addr, addr_len)); - GPR_ASSERT (0 == listen (svr_fd, 1)); + svr_fd = socket(AF_INET, SOCK_STREAM, 0); + GPR_ASSERT(svr_fd >= 0); + GPR_ASSERT(0 == bind(svr_fd, (struct sockaddr *)&addr, addr_len)); + GPR_ASSERT(0 == listen(svr_fd, 1)); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); connections_complete_before = g_connections_complete; - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); /* connect to it */ - GPR_ASSERT (getsockname (svr_fd, (struct sockaddr *) &addr, &addr_len) == 0); - grpc_closure_init (&done, must_succeed, NULL); - grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, gpr_inf_future (&exec_ctx, GPR_CLOCK_REALTIME)); + GPR_ASSERT(getsockname(svr_fd, (struct sockaddr *)&addr, &addr_len) == 0); + grpc_closure_init(&done, must_succeed, NULL); + grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, + (struct sockaddr *)&addr, addr_len, + gpr_inf_future(&exec_ctx, GPR_CLOCK_REALTIME)); /* await the connection */ - do - { - addr_len = sizeof (addr); - r = accept (svr_fd, (struct sockaddr *) &addr, &addr_len); - } - while (r == -1 && errno == EINTR); - GPR_ASSERT (r >= 0); - close (r); - - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - - while (g_connections_complete == connections_complete_before) - { - grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 5)); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - } - - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + do { + addr_len = sizeof(addr); + r = accept(svr_fd, (struct sockaddr *)&addr, &addr_len); + } while (r == -1 && errno == EINTR); + GPR_ASSERT(r >= 0); + close(r); + + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + + while (g_connections_complete == connections_complete_before) { + grpc_pollset_worker worker; + grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(&exec_ctx, 5)); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + } + + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } -void -test_fails (void) -{ +void test_fails(void) { struct sockaddr_in addr; - socklen_t addr_len = sizeof (addr); + socklen_t addr_len = sizeof(addr); int connections_complete_before; grpc_closure done; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - gpr_log (GPR_DEBUG, "test_fails"); + gpr_log(GPR_DEBUG, "test_fails"); - memset (&addr, 0, sizeof (addr)); + memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); connections_complete_before = g_connections_complete; - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); /* connect to a broken address */ - grpc_closure_init (&done, must_fail, NULL); - grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, gpr_inf_future (&exec_ctx, GPR_CLOCK_REALTIME)); + grpc_closure_init(&done, must_fail, NULL); + grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, + (struct sockaddr *)&addr, addr_len, + gpr_inf_future(&exec_ctx, GPR_CLOCK_REALTIME)); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); /* wait for the connection callback to finish */ - while (g_connections_complete == connections_complete_before) - { - grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), test_deadline (&exec_ctx, )); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - } - - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + while (g_connections_complete == connections_complete_before) { + grpc_pollset_worker worker; + grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + test_deadline(&exec_ctx, )); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + } + + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } -void -test_times_out (void) -{ +void test_times_out(void) { struct sockaddr_in addr; - socklen_t addr_len = sizeof (addr); + socklen_t addr_len = sizeof(addr); int svr_fd; #define NUM_CLIENT_CONNECTS 100 int client_fd[NUM_CLIENT_CONNECTS]; @@ -193,107 +181,102 @@ test_times_out (void) grpc_closure done; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - gpr_log (GPR_DEBUG, "test_times_out"); + gpr_log(GPR_DEBUG, "test_times_out"); - memset (&addr, 0, sizeof (addr)); + memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; /* create a dummy server */ - svr_fd = socket (AF_INET, SOCK_STREAM, 0); - GPR_ASSERT (svr_fd >= 0); - GPR_ASSERT (0 == bind (svr_fd, (struct sockaddr *) &addr, addr_len)); - GPR_ASSERT (0 == listen (svr_fd, 1)); + svr_fd = socket(AF_INET, SOCK_STREAM, 0); + GPR_ASSERT(svr_fd >= 0); + GPR_ASSERT(0 == bind(svr_fd, (struct sockaddr *)&addr, addr_len)); + GPR_ASSERT(0 == listen(svr_fd, 1)); /* Get its address */ - GPR_ASSERT (getsockname (svr_fd, (struct sockaddr *) &addr, &addr_len) == 0); + GPR_ASSERT(getsockname(svr_fd, (struct sockaddr *)&addr, &addr_len) == 0); /* tie up the listen buffer, which is somewhat arbitrarily sized. */ - for (i = 0; i < NUM_CLIENT_CONNECTS; ++i) - { - client_fd[i] = socket (AF_INET, SOCK_STREAM, 0); - grpc_set_socket_nonblocking (client_fd[i], 1); - do - { - r = connect (client_fd[i], (struct sockaddr *) &addr, addr_len); - } - while (r == -1 && errno == EINTR); - GPR_ASSERT (r < 0); - GPR_ASSERT (errno == EWOULDBLOCK || errno == EINPROGRESS); - } + for (i = 0; i < NUM_CLIENT_CONNECTS; ++i) { + client_fd[i] = socket(AF_INET, SOCK_STREAM, 0); + grpc_set_socket_nonblocking(client_fd[i], 1); + do { + r = connect(client_fd[i], (struct sockaddr *)&addr, addr_len); + } while (r == -1 && errno == EINTR); + GPR_ASSERT(r < 0); + GPR_ASSERT(errno == EWOULDBLOCK || errno == EINPROGRESS); + } /* connect to dummy server address */ - connect_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1); + connect_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); connections_complete_before = g_connections_complete; - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_closure_init (&done, must_fail, NULL); - grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (&exec_ctx, struct sockaddr *) &addr, addr_len, connect_deadline); + grpc_closure_init(&done, must_fail, NULL); + grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, + (&exec_ctx, struct sockaddr *)&addr, addr_len, + connect_deadline); /* Make sure the event doesn't trigger early */ - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - for (;;) - { - grpc_pollset_worker worker; - gpr_timespec now = gpr_now (connect_deadline.clock_type); - gpr_timespec continue_verifying_time = gpr_time_from_seconds (5, GPR_TIMESPAN); - gpr_timespec grace_time = gpr_time_from_seconds (3, GPR_TIMESPAN); - gpr_timespec finish_time = gpr_time_add (connect_deadline, continue_verifying_time); - gpr_timespec restart_verifying_time = gpr_time_add (connect_deadline, grace_time); - int is_after_deadline = gpr_time_cmp (now, connect_deadline) > 0; - if (gpr_time_cmp (now, finish_time) > 0) - { - break; - } - gpr_log (GPR_DEBUG, "now=%d.%09d connect_deadline=%d.%09d", now.tv_sec, now.tv_nsec, connect_deadline.tv_sec, connect_deadline.tv_nsec); - if (is_after_deadline && gpr_time_cmp (now, restart_verifying_time) <= 0) - { - /* allow some slack before insisting that things be done */ - } - else - { - GPR_ASSERT (g_connections_complete == connections_complete_before + is_after_deadline); - } - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_MILLIS_TO_DEADLINE (&exec_ctx, 10)); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + for (;;) { + grpc_pollset_worker worker; + gpr_timespec now = gpr_now(connect_deadline.clock_type); + gpr_timespec continue_verifying_time = + gpr_time_from_seconds(5, GPR_TIMESPAN); + gpr_timespec grace_time = gpr_time_from_seconds(3, GPR_TIMESPAN); + gpr_timespec finish_time = + gpr_time_add(connect_deadline, continue_verifying_time); + gpr_timespec restart_verifying_time = + gpr_time_add(connect_deadline, grace_time); + int is_after_deadline = gpr_time_cmp(now, connect_deadline) > 0; + if (gpr_time_cmp(now, finish_time) > 0) { + break; } - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - - close (svr_fd); - for (i = 0; i < NUM_CLIENT_CONNECTS; ++i) - { - close (client_fd[i]); + gpr_log(GPR_DEBUG, "now=%d.%09d connect_deadline=%d.%09d", now.tv_sec, + now.tv_nsec, connect_deadline.tv_sec, connect_deadline.tv_nsec); + if (is_after_deadline && gpr_time_cmp(now, restart_verifying_time) <= 0) { + /* allow some slack before insisting that things be done */ + } else { + GPR_ASSERT(g_connections_complete == + connections_complete_before + is_after_deadline); } + grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + GRPC_TIMEOUT_MILLIS_TO_DEADLINE(&exec_ctx, 10)); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + } + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + + close(svr_fd); + for (i = 0; i < NUM_CLIENT_CONNECTS; ++i) { + close(client_fd[i]); + } } -static void -destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) -{ - grpc_pollset_destroy (p); +static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, int success) { + grpc_pollset_destroy(p); } -int -main (int argc, char **argv) -{ +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_pollset_set_init (&g_pollset_set); - grpc_pollset_init (&g_pollset); - 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 (); - test_times_out (); - grpc_pollset_set_destroy (&g_pollset_set); - grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); - grpc_exec_ctx_finish (&exec_ctx); - grpc_shutdown (); + grpc_test_init(argc, argv); + grpc_init(); + grpc_pollset_set_init(&g_pollset_set); + grpc_pollset_init(&g_pollset); + 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(); + test_times_out(); + grpc_pollset_set_destroy(&g_pollset_set); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&exec_ctx, &g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); + grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index 2ed6157479e..d2471c9668a 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -66,70 +66,55 @@ static grpc_pollset g_pollset; */ -static void -create_sockets (int sv[2]) -{ +static void create_sockets(int sv[2]) { int flags; - GPR_ASSERT (socketpair (AF_UNIX, SOCK_STREAM, 0, sv) == 0); - flags = fcntl (sv[0], F_GETFL, 0); - GPR_ASSERT (fcntl (sv[0], F_SETFL, flags | O_NONBLOCK) == 0); - flags = fcntl (sv[1], F_GETFL, 0); - GPR_ASSERT (fcntl (sv[1], F_SETFL, flags | O_NONBLOCK) == 0); + GPR_ASSERT(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); + flags = fcntl(sv[0], F_GETFL, 0); + GPR_ASSERT(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK) == 0); + flags = fcntl(sv[1], F_GETFL, 0); + GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0); } -static ssize_t -fill_socket (int fd) -{ +static ssize_t fill_socket(int fd) { ssize_t write_bytes; ssize_t total_bytes = 0; int i; unsigned char buf[256]; - for (i = 0; i < 256; ++i) - { - buf[i] = (gpr_uint8) i; + for (i = 0; i < 256; ++i) { + buf[i] = (gpr_uint8)i; + } + do { + write_bytes = write(fd, buf, 256); + if (write_bytes > 0) { + total_bytes += write_bytes; } - do - { - write_bytes = write (fd, buf, 256); - if (write_bytes > 0) - { - total_bytes += write_bytes; - } - } - while (write_bytes >= 0 || errno == EINTR); - GPR_ASSERT (errno == EAGAIN); + } while (write_bytes >= 0 || errno == EINTR); + GPR_ASSERT(errno == EAGAIN); return total_bytes; } -static size_t -fill_socket_partial (int fd, size_t bytes) -{ +static size_t fill_socket_partial(int fd, size_t bytes) { ssize_t write_bytes; size_t total_bytes = 0; - unsigned char *buf = malloc (bytes); + unsigned char *buf = malloc(bytes); unsigned i; - for (i = 0; i < bytes; ++i) - { - buf[i] = (gpr_uint8) (i % 256); - } - - do - { - write_bytes = write (fd, buf, bytes - total_bytes); - if (write_bytes > 0) - { - total_bytes += (size_t) write_bytes; - } + for (i = 0; i < bytes; ++i) { + buf[i] = (gpr_uint8)(i % 256); + } + + do { + write_bytes = write(fd, buf, bytes - total_bytes); + if (write_bytes > 0) { + total_bytes += (size_t)write_bytes; } - while ((write_bytes >= 0 || errno == EINTR) && bytes > total_bytes); + } while ((write_bytes >= 0 || errno == EINTR) && bytes > total_bytes); - gpr_free (buf); + gpr_free(buf); return total_bytes; } -struct read_socket_state -{ +struct read_socket_state { grpc_endpoint *ep; size_t read_bytes; size_t target_read_bytes; @@ -137,191 +122,176 @@ struct read_socket_state grpc_closure read_cb; }; -static size_t -count_slices (gpr_slice * slices, size_t nslices, int *current_data) -{ +static size_t count_slices(gpr_slice *slices, size_t nslices, + int *current_data) { size_t num_bytes = 0; unsigned i, j; unsigned char *buf; - for (i = 0; i < nslices; ++i) - { - buf = GPR_SLICE_START_PTR (slices[i]); - for (j = 0; j < GPR_SLICE_LENGTH (slices[i]); ++j) - { - GPR_ASSERT (buf[j] == *current_data); - *current_data = (*current_data + 1) % 256; - } - num_bytes += GPR_SLICE_LENGTH (slices[i]); + for (i = 0; i < nslices; ++i) { + buf = GPR_SLICE_START_PTR(slices[i]); + for (j = 0; j < GPR_SLICE_LENGTH(slices[i]); ++j) { + GPR_ASSERT(buf[j] == *current_data); + *current_data = (*current_data + 1) % 256; } + num_bytes += GPR_SLICE_LENGTH(slices[i]); + } return num_bytes; } -static void -read_cb (grpc_exec_ctx * exec_ctx, void *user_data, int success) -{ - struct read_socket_state *state = (struct read_socket_state *) user_data; +static void read_cb(grpc_exec_ctx *exec_ctx, void *user_data, int success) { + struct read_socket_state *state = (struct read_socket_state *)user_data; size_t read_bytes; int current_data; - GPR_ASSERT (success); + GPR_ASSERT(success); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); current_data = state->read_bytes % 256; - read_bytes = count_slices (state->incoming.slices, state->incoming.count, ¤t_data); + read_bytes = count_slices(state->incoming.slices, state->incoming.count, + ¤t_data); state->read_bytes += read_bytes; - gpr_log (GPR_INFO, "Read %d bytes of %d", read_bytes, state->target_read_bytes); - if (state->read_bytes >= state->target_read_bytes) - { - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - } - else - { - grpc_endpoint_read (exec_ctx, state->ep, &state->incoming, &state->read_cb); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - } + gpr_log(GPR_INFO, "Read %d bytes of %d", read_bytes, + state->target_read_bytes); + if (state->read_bytes >= state->target_read_bytes) { + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + } else { + grpc_endpoint_read(exec_ctx, state->ep, &state->incoming, &state->read_cb); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + } } /* Write to a socket, then read from it using the grpc_tcp API. */ -static void -read_test (size_t num_bytes, size_t slice_size) -{ +static void read_test(size_t num_bytes, size_t slice_size) { int sv[2]; grpc_endpoint *ep; struct read_socket_state state; size_t written_bytes; - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (20); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - gpr_log (GPR_INFO, "Read test of size %d, slice size %d", num_bytes, slice_size); + gpr_log(GPR_INFO, "Read test of size %d, slice size %d", num_bytes, + slice_size); - create_sockets (sv); + create_sockets(sv); - ep = grpc_tcp_create (grpc_fd_create (sv[1], "read_test"), slice_size, "test"); - grpc_endpoint_add_to_pollset (&exec_ctx, ep, &g_pollset); + ep = grpc_tcp_create(grpc_fd_create(sv[1], "read_test"), slice_size, "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 %d bytes", written_bytes); + written_bytes = fill_socket_partial(sv[0], num_bytes); + gpr_log(GPR_INFO, "Wrote %d bytes", written_bytes); state.ep = ep; state.read_bytes = 0; state.target_read_bytes = written_bytes; - gpr_slice_buffer_init (&state.incoming); - grpc_closure_init (&state.read_cb, read_cb, &state); - - grpc_endpoint_read (&exec_ctx, ep, &state.incoming, &state.read_cb); - - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - while (state.read_bytes < state.target_read_bytes) - { - grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - } - GPR_ASSERT (state.read_bytes == state.target_read_bytes); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - - gpr_slice_buffer_destroy (&state.incoming); - grpc_endpoint_destroy (&exec_ctx, ep); - grpc_exec_ctx_finish (&exec_ctx); + gpr_slice_buffer_init(&state.incoming); + grpc_closure_init(&state.read_cb, read_cb, &state); + + grpc_endpoint_read(&exec_ctx, ep, &state.incoming, &state.read_cb); + + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + while (state.read_bytes < state.target_read_bytes) { + grpc_pollset_worker worker; + grpc_pollset_work(&g_pollset, &worker, + gpr_now(&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + } + GPR_ASSERT(state.read_bytes == state.target_read_bytes); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + + gpr_slice_buffer_destroy(&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 API. */ -static void -large_read_test (size_t slice_size) -{ +static void large_read_test(size_t slice_size) { int sv[2]; grpc_endpoint *ep; struct read_socket_state state; ssize_t written_bytes; - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (20); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - gpr_log (GPR_INFO, "Start large read test, slice size %d", slice_size); + gpr_log(GPR_INFO, "Start large read test, slice size %d", slice_size); - create_sockets (sv); + create_sockets(sv); - ep = grpc_tcp_create (grpc_fd_create (sv[1], "large_read_test"), slice_size, "test"); - grpc_endpoint_add_to_pollset (&exec_ctx, ep, &g_pollset); + ep = grpc_tcp_create(grpc_fd_create(sv[1], "large_read_test"), slice_size, + "test"); + grpc_endpoint_add_to_pollset(&exec_ctx, ep, &g_pollset); - written_bytes = fill_socket (sv[0]); - gpr_log (GPR_INFO, "Wrote %d bytes", written_bytes); + written_bytes = fill_socket(sv[0]); + gpr_log(GPR_INFO, "Wrote %d bytes", written_bytes); state.ep = ep; state.read_bytes = 0; - state.target_read_bytes = (size_t) written_bytes; - gpr_slice_buffer_init (&state.incoming); - grpc_closure_init (&state.read_cb, read_cb, &state); - - grpc_endpoint_read (&exec_ctx, ep, &state.incoming, &state.read_cb); - - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - while (state.read_bytes < state.target_read_bytes) - { - grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - } - GPR_ASSERT (state.read_bytes == state.target_read_bytes); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - - gpr_slice_buffer_destroy (&state.incoming); - grpc_endpoint_destroy (&exec_ctx, ep); - grpc_exec_ctx_finish (&exec_ctx); + state.target_read_bytes = (size_t)written_bytes; + gpr_slice_buffer_init(&state.incoming); + grpc_closure_init(&state.read_cb, read_cb, &state); + + grpc_endpoint_read(&exec_ctx, ep, &state.incoming, &state.read_cb); + + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + while (state.read_bytes < state.target_read_bytes) { + grpc_pollset_worker worker; + grpc_pollset_work(&g_pollset, &worker, + gpr_now(&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + } + GPR_ASSERT(state.read_bytes == state.target_read_bytes); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + + gpr_slice_buffer_destroy(&state.incoming); + grpc_endpoint_destroy(&exec_ctx, ep); + grpc_exec_ctx_finish(&exec_ctx); } -struct write_socket_state -{ +struct write_socket_state { grpc_endpoint *ep; int write_done; }; -static gpr_slice * -allocate_blocks (size_t num_bytes, size_t slice_size, size_t * num_blocks, gpr_uint8 * current_data) -{ +static gpr_slice *allocate_blocks(size_t num_bytes, size_t slice_size, + size_t *num_blocks, gpr_uint8 *current_data) { size_t nslices = num_bytes / slice_size + (num_bytes % slice_size ? 1u : 0u); - gpr_slice *slices = gpr_malloc (sizeof (gpr_slice) * nslices); + gpr_slice *slices = gpr_malloc(sizeof(gpr_slice) * nslices); size_t num_bytes_left = num_bytes; unsigned i, j; unsigned char *buf; *num_blocks = nslices; - for (i = 0; i < nslices; ++i) - { - slices[i] = gpr_slice_malloc (slice_size > num_bytes_left ? num_bytes_left : slice_size); - num_bytes_left -= GPR_SLICE_LENGTH (slices[i]); - buf = GPR_SLICE_START_PTR (slices[i]); - for (j = 0; j < GPR_SLICE_LENGTH (slices[i]); ++j) - { - buf[j] = *current_data; - (*current_data)++; - } + for (i = 0; i < nslices; ++i) { + slices[i] = gpr_slice_malloc(slice_size > num_bytes_left ? num_bytes_left + : slice_size); + num_bytes_left -= GPR_SLICE_LENGTH(slices[i]); + buf = GPR_SLICE_START_PTR(slices[i]); + for (j = 0; j < GPR_SLICE_LENGTH(slices[i]); ++j) { + buf[j] = *current_data; + (*current_data)++; } - GPR_ASSERT (num_bytes_left == 0); + } + GPR_ASSERT(num_bytes_left == 0); return slices; } -static void -write_done (void *user_data /* write_socket_state */ , int success, - grpc_closure_list * closure_list) -{ - struct write_socket_state *state = (struct write_socket_state *) user_data; - gpr_log (GPR_INFO, "Write done callback called"); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - gpr_log (GPR_INFO, "Signalling write done"); +static void write_done(void *user_data /* write_socket_state */, int success, + grpc_closure_list *closure_list) { + struct write_socket_state *state = (struct write_socket_state *)user_data; + gpr_log(GPR_INFO, "Write done callback called"); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + gpr_log(GPR_INFO, "Signalling write done"); state->write_done = 1; - grpc_pollset_kick (&g_pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_pollset_kick(&g_pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } -void -drain_socket_blocking (int fd, size_t num_bytes, size_t read_size) -{ - unsigned char *buf = malloc (read_size); +void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { + unsigned char *buf = malloc(read_size); ssize_t bytes_read; size_t bytes_left = num_bytes; int flags; @@ -329,43 +299,38 @@ drain_socket_blocking (int fd, size_t num_bytes, size_t read_size) int i; 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); - - for (;;) - { - grpc_pollset_worker worker; - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_MILLIS_TO_DEADLINE (&exec_ctx, 10)); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - do - { - bytes_read = read (fd, buf, bytes_left > read_size ? read_size : bytes_left); - } - while (bytes_read < 0 && errno == EINTR); - GPR_ASSERT (bytes_read >= 0); - for (i = 0; i < bytes_read; ++i) - { - GPR_ASSERT (buf[i] == current); - current = (current + 1) % 256; - } - bytes_left -= (size_t) bytes_read; - if (bytes_left == 0) - break; + flags = fcntl(fd, F_GETFL, 0); + GPR_ASSERT(fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) == 0); + + for (;;) { + grpc_pollset_worker worker; + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + GRPC_TIMEOUT_MILLIS_TO_DEADLINE(&exec_ctx, 10)); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + do { + bytes_read = + read(fd, buf, bytes_left > read_size ? read_size : bytes_left); + } while (bytes_read < 0 && errno == EINTR); + GPR_ASSERT(bytes_read >= 0); + for (i = 0; i < bytes_read; ++i) { + GPR_ASSERT(buf[i] == current); + current = (current + 1) % 256; } - flags = fcntl (fd, F_GETFL, 0); - GPR_ASSERT (fcntl (fd, F_SETFL, flags | O_NONBLOCK) == 0); + bytes_left -= (size_t)bytes_read; + if (bytes_left == 0) break; + } + flags = fcntl(fd, F_GETFL, 0); + GPR_ASSERT(fcntl(fd, F_SETFL, flags | O_NONBLOCK) == 0); - gpr_free (buf); + gpr_free(buf); } /* Write to a socket using the grpc_tcp API, then drain it directly. Note that if the write does not complete immediately we need to drain the socket in parallel with the read. */ -static void -write_test (size_t num_bytes, size_t slice_size) -{ +static void write_test(size_t num_bytes, size_t slice_size) { int sv[2]; grpc_endpoint *ep; struct write_socket_state state; @@ -374,119 +339,111 @@ write_test (size_t num_bytes, size_t slice_size) gpr_uint8 current_data = 0; gpr_slice_buffer outgoing; grpc_closure write_done_closure; - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (20); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - gpr_log (GPR_INFO, "Start write test with %d bytes, slice size %d", num_bytes, slice_size); + gpr_log(GPR_INFO, "Start write test with %d bytes, slice size %d", num_bytes, + slice_size); - create_sockets (sv); + create_sockets(sv); - ep = grpc_tcp_create (grpc_fd_create (sv[1], "write_test"), GRPC_TCP_DEFAULT_READ_SLICE_SIZE, "test"); - grpc_endpoint_add_to_pollset (&exec_ctx, ep, &g_pollset); + ep = grpc_tcp_create(grpc_fd_create(sv[1], "write_test"), + GRPC_TCP_DEFAULT_READ_SLICE_SIZE, "test"); + grpc_endpoint_add_to_pollset(&exec_ctx, ep, &g_pollset); state.ep = ep; state.write_done = 0; - slices = allocate_blocks (num_bytes, slice_size, &num_blocks, ¤t_data); - - gpr_slice_buffer_init (&outgoing); - gpr_slice_buffer_addn (&outgoing, slices, num_blocks); - grpc_closure_init (&write_done_closure, write_done, &state); - - grpc_endpoint_write (&exec_ctx, ep, &outgoing, &write_done_closure); - drain_socket_blocking (sv[0], num_bytes, num_bytes); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - for (;;) - { - grpc_pollset_worker worker; - if (state.write_done) - { - break; - } - grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - } - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + slices = allocate_blocks(num_bytes, slice_size, &num_blocks, ¤t_data); + + gpr_slice_buffer_init(&outgoing); + gpr_slice_buffer_addn(&outgoing, slices, num_blocks); + grpc_closure_init(&write_done_closure, write_done, &state); - gpr_slice_buffer_destroy (&outgoing); - grpc_endpoint_destroy (&exec_ctx, ep); - gpr_free (slices); - grpc_exec_ctx_finish (&exec_ctx); + grpc_endpoint_write(&exec_ctx, ep, &outgoing, &write_done_closure); + drain_socket_blocking(sv[0], num_bytes, num_bytes); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + for (;;) { + grpc_pollset_worker worker; + if (state.write_done) { + break; + } + grpc_pollset_work(&g_pollset, &worker, + gpr_now(&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + } + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + + gpr_slice_buffer_destroy(&outgoing); + grpc_endpoint_destroy(&exec_ctx, ep); + gpr_free(slices); + grpc_exec_ctx_finish(&exec_ctx); } -void -run_tests (void) -{ +void run_tests(void) { size_t i = 0; - read_test (100, 8192); - read_test (10000, 8192); - read_test (10000, 137); - read_test (10000, 1); - large_read_test (8192); - large_read_test (1); - - write_test (100, 8192); - write_test (100, 1); - write_test (100000, 8192); - write_test (100000, 1); - write_test (100000, 137); - - for (i = 1; i < 1000; i = GPR_MAX (i + 1, i * 5 / 4)) - { - write_test (40320, i); - } + read_test(100, 8192); + read_test(10000, 8192); + read_test(10000, 137); + read_test(10000, 1); + large_read_test(8192); + large_read_test(1); + + write_test(100, 8192); + write_test(100, 1); + write_test(100000, 8192); + write_test(100000, 1); + write_test(100000, 137); + + for (i = 1; i < 1000; i = GPR_MAX(i + 1, i * 5 / 4)) { + write_test(40320, i); + } } -static void -clean_up (void) -{ -} +static void clean_up(void) {} -static grpc_endpoint_test_fixture -create_fixture_tcp_socketpair (size_t slice_size) -{ +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; - create_sockets (sv); - f.client_ep = grpc_tcp_create (grpc_fd_create (sv[0], "fixture:client"), slice_size, "test"); - f.server_ep = grpc_tcp_create (grpc_fd_create (sv[1], "fixture:server"), slice_size, "test"); - grpc_endpoint_add_to_pollset (&exec_ctx, f.client_ep, &g_pollset); - grpc_endpoint_add_to_pollset (&exec_ctx, f.server_ep, &g_pollset); + create_sockets(sv); + f.client_ep = grpc_tcp_create(grpc_fd_create(sv[0], "fixture:client"), + slice_size, "test"); + f.server_ep = grpc_tcp_create(grpc_fd_create(sv[1], "fixture:server"), + slice_size, "test"); + 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_exec_ctx_finish(&exec_ctx); return f; } static grpc_endpoint_test_config configs[] = { - {"tcp/tcp_socketpair", create_fixture_tcp_socketpair, clean_up}, + {"tcp/tcp_socketpair", create_fixture_tcp_socketpair, clean_up}, }; -static void -destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) -{ - grpc_pollset_destroy (p); +static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, int success) { + grpc_pollset_destroy(p); } -int -main (int argc, char **argv) -{ +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_pollset_init (&g_pollset); - run_tests (); - grpc_endpoint_tests (configs[0], &g_pollset); - grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); - grpc_exec_ctx_finish (&exec_ctx); - grpc_shutdown (); + grpc_test_init(argc, argv); + grpc_init(); + grpc_pollset_init(&g_pollset); + run_tests(); + grpc_endpoint_tests(configs[0], &g_pollset); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&exec_ctx, &g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); + grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index 1ccc31faf7f..dd5fe7875ba 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -48,155 +48,141 @@ static grpc_pollset g_pollset; static int g_nconnects = 0; -static void -on_connect (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * tcp) -{ - grpc_endpoint_shutdown (exec_ctx, tcp); - grpc_endpoint_destroy (exec_ctx, tcp); +static void on_connect(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp) { + grpc_endpoint_shutdown(exec_ctx, tcp); + grpc_endpoint_destroy(exec_ctx, tcp); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); g_nconnects++; - grpc_pollset_kick (&g_pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_pollset_kick(&g_pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } -static void -test_no_op (void) -{ - grpc_tcp_server *s = grpc_tcp_server_create (); - grpc_tcp_server_destroy (s, NULL, NULL); +static void test_no_op(void) { + grpc_tcp_server *s = grpc_tcp_server_create(); + grpc_tcp_server_destroy(s, NULL, NULL); } -static void -test_no_op_with_start (void) -{ +static void test_no_op_with_start(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_tcp_server *s = grpc_tcp_server_create (); - LOG_TEST ("test_no_op_with_start"); - grpc_tcp_server_start (&exec_ctx, s, NULL, 0, on_connect, NULL); - grpc_tcp_server_destroy (s, NULL, NULL); - grpc_exec_ctx_finish (&exec_ctx); + grpc_tcp_server *s = grpc_tcp_server_create(); + LOG_TEST("test_no_op_with_start"); + grpc_tcp_server_start(&exec_ctx, s, NULL, 0, on_connect, NULL); + grpc_tcp_server_destroy(s, NULL, NULL); + grpc_exec_ctx_finish(&exec_ctx); } -static void -test_no_op_with_port (void) -{ +static void test_no_op_with_port(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; struct sockaddr_in addr; - grpc_tcp_server *s = grpc_tcp_server_create (); - LOG_TEST ("test_no_op_with_port"); + grpc_tcp_server *s = grpc_tcp_server_create(); + LOG_TEST("test_no_op_with_port"); - memset (&addr, 0, sizeof (addr)); + memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - GPR_ASSERT (grpc_tcp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr))); + GPR_ASSERT( + grpc_tcp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr))); - grpc_tcp_server_destroy (&exec_ctx, s, NULL); - grpc_exec_ctx_finish (&exec_ctx); + grpc_tcp_server_destroy(&exec_ctx, s, NULL); + grpc_exec_ctx_finish(&exec_ctx); } -static void -test_no_op_with_port_and_start (void) -{ +static void test_no_op_with_port_and_start(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; struct sockaddr_in addr; - grpc_tcp_server *s = grpc_tcp_server_create (); - LOG_TEST ("test_no_op_with_port_and_start"); + grpc_tcp_server *s = grpc_tcp_server_create(); + LOG_TEST("test_no_op_with_port_and_start"); - memset (&addr, 0, sizeof (addr)); + memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - GPR_ASSERT (grpc_tcp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr))); + GPR_ASSERT( + grpc_tcp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr))); - grpc_tcp_server_start (&exec_ctx, s, NULL, 0, on_connect, NULL); + grpc_tcp_server_start(&exec_ctx, s, NULL, 0, on_connect, NULL); - grpc_tcp_server_destroy (&exec_ctx, s, NULL); - grpc_exec_ctx_finish (&exec_ctx); + grpc_tcp_server_destroy(&exec_ctx, s, NULL); + grpc_exec_ctx_finish(&exec_ctx); } -static void -test_connect (int n) -{ +static void test_connect(int n) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; struct sockaddr_storage addr; - socklen_t addr_len = sizeof (addr); + socklen_t addr_len = sizeof(addr); int svrfd, clifd; - grpc_tcp_server *s = grpc_tcp_server_create (); + grpc_tcp_server *s = grpc_tcp_server_create(); int nconnects_before; gpr_timespec deadline; grpc_pollset *pollsets[1]; int i; - LOG_TEST ("test_connect"); - gpr_log (GPR_INFO, "clients=%d", n); + LOG_TEST("test_connect"); + gpr_log(GPR_INFO, "clients=%d", n); - memset (&addr, 0, sizeof (addr)); + memset(&addr, 0, sizeof(addr)); addr.ss_family = AF_INET; - GPR_ASSERT (grpc_tcp_server_add_port (s, (struct sockaddr *) &addr, addr_len)); + GPR_ASSERT(grpc_tcp_server_add_port(s, (struct sockaddr *)&addr, addr_len)); - svrfd = grpc_tcp_server_get_fd (s, 0); - GPR_ASSERT (svrfd >= 0); - GPR_ASSERT (getsockname (svrfd, (struct sockaddr *) &addr, &addr_len) == 0); - GPR_ASSERT (addr_len <= sizeof (addr)); + svrfd = grpc_tcp_server_get_fd(s, 0); + GPR_ASSERT(svrfd >= 0); + GPR_ASSERT(getsockname(svrfd, (struct sockaddr *)&addr, &addr_len) == 0); + GPR_ASSERT(addr_len <= sizeof(addr)); pollsets[0] = &g_pollset; - grpc_tcp_server_start (&exec_ctx, s, pollsets, 1, on_connect, NULL); - - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - - for (i = 0; i < n; i++) - { - deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10); - - nconnects_before = g_nconnects; - clifd = socket (addr.ss_family, SOCK_STREAM, 0); - GPR_ASSERT (clifd >= 0); - gpr_log (GPR_DEBUG, "start connect"); - GPR_ASSERT (connect (clifd, (struct sockaddr *) &addr, addr_len) == 0); - - gpr_log (GPR_DEBUG, "wait"); - while (g_nconnects == nconnects_before && gpr_time_cmp (deadline, gpr_now (deadline.clock_type)) > 0) - { - grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - } - gpr_log (GPR_DEBUG, "wait done"); - - GPR_ASSERT (g_nconnects == nconnects_before + 1); - close (clifd); + grpc_tcp_server_start(&exec_ctx, s, pollsets, 1, on_connect, NULL); + + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + + for (i = 0; i < n; i++) { + deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10); + + nconnects_before = g_nconnects; + clifd = socket(addr.ss_family, SOCK_STREAM, 0); + GPR_ASSERT(clifd >= 0); + gpr_log(GPR_DEBUG, "start connect"); + GPR_ASSERT(connect(clifd, (struct sockaddr *)&addr, addr_len) == 0); + + gpr_log(GPR_DEBUG, "wait"); + while (g_nconnects == nconnects_before && + gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0) { + grpc_pollset_worker worker; + grpc_pollset_work(&g_pollset, &worker, + gpr_now(&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } + gpr_log(GPR_DEBUG, "wait done"); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + GPR_ASSERT(g_nconnects == nconnects_before + 1); + close(clifd); + } - grpc_tcp_server_destroy (&exec_ctx, s, NULL); - grpc_exec_ctx_finish (&exec_ctx); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + + grpc_tcp_server_destroy(&exec_ctx, s, NULL); + grpc_exec_ctx_finish(&exec_ctx); } -static void -destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) -{ - grpc_pollset_destroy (p); +static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, int success) { + grpc_pollset_destroy(p); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { grpc_closure destroyed; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_test_init (argc, argv); - grpc_iomgr_init (); - grpc_pollset_init (&g_pollset); - - test_no_op (); - test_no_op_with_start (); - test_no_op_with_port (); - test_no_op_with_port_and_start (); - test_connect (1); - test_connect (10); - - grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); - grpc_exec_ctx_finish (&exec_ctx); - grpc_iomgr_shutdown (); + grpc_test_init(argc, argv); + grpc_iomgr_init(); + grpc_pollset_init(&g_pollset); + + test_no_op(); + test_no_op_with_start(); + test_no_op_with_port(); + test_no_op_with_port_and_start(); + test_connect(1); + test_connect(10); + + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&exec_ctx, &g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); + grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/time_averaged_stats_test.c b/test/core/iomgr/time_averaged_stats_test.c index 9bef4e0526b..cb006d152a3 100644 --- a/test/core/iomgr/time_averaged_stats_test.c +++ b/test/core/iomgr/time_averaged_stats_test.c @@ -41,186 +41,168 @@ #define EXPECT_EQ(a, b) GPR_ASSERT((a) == (b)) #define EXPECT_DOUBLE_EQ(a, b) GPR_ASSERT(fabs((a) - (b)) < 1e-9) -static void -no_regress_no_persist_test_1 (void) -{ +static void no_regress_no_persist_test_1(void) { grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init (&tas, 1000, 0, 0.0); - EXPECT_DOUBLE_EQ (1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (0, tas.aggregate_total_weight); + grpc_time_averaged_stats_init(&tas, 1000, 0, 0.0); + EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(0, tas.aggregate_total_weight); /* Should have no effect */ - grpc_time_averaged_stats_update_average (&tas); - EXPECT_DOUBLE_EQ (1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (0, tas.aggregate_total_weight); + grpc_time_averaged_stats_update_average(&tas); + EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(0, tas.aggregate_total_weight); /* Should replace old average */ - grpc_time_averaged_stats_add_sample (&tas, 2000); - grpc_time_averaged_stats_update_average (&tas); - EXPECT_DOUBLE_EQ (2000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (1, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample(&tas, 2000); + grpc_time_averaged_stats_update_average(&tas); + EXPECT_DOUBLE_EQ(2000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); } -static void -no_regress_no_persist_test_2 (void) -{ +static void no_regress_no_persist_test_2(void) { grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init (&tas, 1000, 0, 0.0); - EXPECT_DOUBLE_EQ (1000, tas.aggregate_weighted_avg); + grpc_time_averaged_stats_init(&tas, 1000, 0, 0.0); + EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); /* Should replace init value */ - grpc_time_averaged_stats_add_sample (&tas, 2000); - grpc_time_averaged_stats_update_average (&tas); - EXPECT_DOUBLE_EQ (2000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (1, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample (&tas, 3000); - grpc_time_averaged_stats_update_average (&tas); - EXPECT_DOUBLE_EQ (3000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (1, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample(&tas, 2000); + grpc_time_averaged_stats_update_average(&tas); + EXPECT_DOUBLE_EQ(2000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); + + grpc_time_averaged_stats_add_sample(&tas, 3000); + grpc_time_averaged_stats_update_average(&tas); + EXPECT_DOUBLE_EQ(3000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); } -static void -no_regress_no_persist_test_3 (void) -{ +static void no_regress_no_persist_test_3(void) { grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init (&tas, 1000, 0, 0.0); - EXPECT_DOUBLE_EQ (1000, tas.aggregate_weighted_avg); + grpc_time_averaged_stats_init(&tas, 1000, 0, 0.0); + EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); /* Should replace init value */ - grpc_time_averaged_stats_add_sample (&tas, 2500); - grpc_time_averaged_stats_update_average (&tas); - EXPECT_DOUBLE_EQ (2500, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (1, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample (&tas, 3500); - grpc_time_averaged_stats_add_sample (&tas, 4500); - grpc_time_averaged_stats_update_average (&tas); - EXPECT_DOUBLE_EQ (4000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (2, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample(&tas, 2500); + grpc_time_averaged_stats_update_average(&tas); + EXPECT_DOUBLE_EQ(2500, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); + + grpc_time_averaged_stats_add_sample(&tas, 3500); + grpc_time_averaged_stats_add_sample(&tas, 4500); + grpc_time_averaged_stats_update_average(&tas); + EXPECT_DOUBLE_EQ(4000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(2, tas.aggregate_total_weight); } -static void -some_regress_no_persist_test (void) -{ +static void some_regress_no_persist_test(void) { grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init (&tas, 1000, 0.5, 0.0); - EXPECT_DOUBLE_EQ (1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (0, tas.aggregate_total_weight); - grpc_time_averaged_stats_add_sample (&tas, 2000); - grpc_time_averaged_stats_add_sample (&tas, 2000); - grpc_time_averaged_stats_update_average (&tas); + grpc_time_averaged_stats_init(&tas, 1000, 0.5, 0.0); + EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(0, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample(&tas, 2000); + grpc_time_averaged_stats_add_sample(&tas, 2000); + grpc_time_averaged_stats_update_average(&tas); /* (2 * 2000 + 0.5 * 1000) / 2.5 */ - EXPECT_DOUBLE_EQ (1800, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (2.5, tas.aggregate_total_weight); + EXPECT_DOUBLE_EQ(1800, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(2.5, tas.aggregate_total_weight); } -static void -some_decay_test (void) -{ +static void some_decay_test(void) { grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init (&tas, 1000, 1, 0.0); - EXPECT_EQ (1000, tas.aggregate_weighted_avg); + grpc_time_averaged_stats_init(&tas, 1000, 1, 0.0); + EXPECT_EQ(1000, tas.aggregate_weighted_avg); /* Should avg with init value */ - grpc_time_averaged_stats_add_sample (&tas, 2000); - grpc_time_averaged_stats_update_average (&tas); - EXPECT_DOUBLE_EQ (1500, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (2, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample (&tas, 2000); - grpc_time_averaged_stats_update_average (&tas); - EXPECT_DOUBLE_EQ (1500, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (2, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample (&tas, 2000); - grpc_time_averaged_stats_update_average (&tas); - EXPECT_DOUBLE_EQ (1500, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (2, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample(&tas, 2000); + grpc_time_averaged_stats_update_average(&tas); + EXPECT_DOUBLE_EQ(1500, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(2, tas.aggregate_total_weight); + + grpc_time_averaged_stats_add_sample(&tas, 2000); + grpc_time_averaged_stats_update_average(&tas); + EXPECT_DOUBLE_EQ(1500, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(2, tas.aggregate_total_weight); + + grpc_time_averaged_stats_add_sample(&tas, 2000); + grpc_time_averaged_stats_update_average(&tas); + EXPECT_DOUBLE_EQ(1500, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(2, tas.aggregate_total_weight); } -static void -no_regress_full_persist_test (void) -{ +static void no_regress_full_persist_test(void) { grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init (&tas, 1000, 0, 1.0); - EXPECT_DOUBLE_EQ (1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (0, tas.aggregate_total_weight); + grpc_time_averaged_stats_init(&tas, 1000, 0, 1.0); + EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(0, tas.aggregate_total_weight); /* Should replace init value */ - grpc_time_averaged_stats_add_sample (&tas, 2000); - grpc_time_averaged_stats_update_average (&tas); - EXPECT_EQ (2000, tas.aggregate_weighted_avg); - EXPECT_EQ (1, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample(&tas, 2000); + grpc_time_averaged_stats_update_average(&tas); + EXPECT_EQ(2000, tas.aggregate_weighted_avg); + EXPECT_EQ(1, tas.aggregate_total_weight); /* Will result in average of the 3 samples. */ - grpc_time_averaged_stats_add_sample (&tas, 2300); - grpc_time_averaged_stats_add_sample (&tas, 2300); - grpc_time_averaged_stats_update_average (&tas); - EXPECT_DOUBLE_EQ (2200, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (3, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample(&tas, 2300); + grpc_time_averaged_stats_add_sample(&tas, 2300); + grpc_time_averaged_stats_update_average(&tas); + EXPECT_DOUBLE_EQ(2200, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(3, tas.aggregate_total_weight); } -static void -no_regress_some_persist_test (void) -{ +static void no_regress_some_persist_test(void) { grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init (&tas, 1000, 0, 0.5); + grpc_time_averaged_stats_init(&tas, 1000, 0, 0.5); /* Should replace init value */ - grpc_time_averaged_stats_add_sample (&tas, 2000); - grpc_time_averaged_stats_update_average (&tas); - EXPECT_DOUBLE_EQ (2000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (1, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample (&tas, 2500); - grpc_time_averaged_stats_add_sample (&tas, 4000); - grpc_time_averaged_stats_update_average (&tas); - EXPECT_DOUBLE_EQ (3000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (2.5, tas.aggregate_total_weight); + grpc_time_averaged_stats_add_sample(&tas, 2000); + grpc_time_averaged_stats_update_average(&tas); + EXPECT_DOUBLE_EQ(2000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); + + grpc_time_averaged_stats_add_sample(&tas, 2500); + grpc_time_averaged_stats_add_sample(&tas, 4000); + grpc_time_averaged_stats_update_average(&tas); + EXPECT_DOUBLE_EQ(3000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(2.5, tas.aggregate_total_weight); } -static void -some_regress_some_persist_test (void) -{ +static void some_regress_some_persist_test(void) { grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init (&tas, 1000, 0.4, 0.6); + grpc_time_averaged_stats_init(&tas, 1000, 0.4, 0.6); /* Sample weight = 0 */ - EXPECT_EQ (1000, tas.aggregate_weighted_avg); - EXPECT_EQ (0, tas.aggregate_total_weight); + EXPECT_EQ(1000, tas.aggregate_weighted_avg); + EXPECT_EQ(0, tas.aggregate_total_weight); - grpc_time_averaged_stats_update_average (&tas); + grpc_time_averaged_stats_update_average(&tas); /* (0.6 * 0 * 1000 + 0.4 * 1000 / 0.4) */ - EXPECT_DOUBLE_EQ (1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (0.4, tas.aggregate_total_weight); + EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(0.4, tas.aggregate_total_weight); - grpc_time_averaged_stats_add_sample (&tas, 2640); - grpc_time_averaged_stats_update_average (&tas); + grpc_time_averaged_stats_add_sample(&tas, 2640); + grpc_time_averaged_stats_update_average(&tas); /* (1 * 2640 + 0.6 * 0.4 * 1000 + 0.4 * 1000 / (1 + 0.6 * 0.4 + 0.4) */ - EXPECT_DOUBLE_EQ (2000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (1.64, tas.aggregate_total_weight); + EXPECT_DOUBLE_EQ(2000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(1.64, tas.aggregate_total_weight); - grpc_time_averaged_stats_add_sample (&tas, 2876.8); - grpc_time_averaged_stats_update_average (&tas); + grpc_time_averaged_stats_add_sample(&tas, 2876.8); + grpc_time_averaged_stats_update_average(&tas); /* (1 * 2876.8 + 0.6 * 1.64 * 2000 + 0.4 * 1000 / (1 + 0.6 * 1.64 + 0.4) */ - EXPECT_DOUBLE_EQ (2200, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (2.384, tas.aggregate_total_weight); + EXPECT_DOUBLE_EQ(2200, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(2.384, tas.aggregate_total_weight); - grpc_time_averaged_stats_add_sample (&tas, 4944.32); - grpc_time_averaged_stats_update_average (&tas); + grpc_time_averaged_stats_add_sample(&tas, 4944.32); + grpc_time_averaged_stats_update_average(&tas); /* (1 * 4944.32 + 0.6 * 2.384 * 2200 + 0.4 * 1000) / (1 + 0.6 * 2.384 + 0.4) */ - EXPECT_DOUBLE_EQ (3000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ (2.8304, tas.aggregate_total_weight); + EXPECT_DOUBLE_EQ(3000, tas.aggregate_weighted_avg); + EXPECT_DOUBLE_EQ(2.8304, tas.aggregate_total_weight); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - no_regress_no_persist_test_1 (); - no_regress_no_persist_test_2 (); - no_regress_no_persist_test_3 (); - some_regress_no_persist_test (); - some_decay_test (); - no_regress_full_persist_test (); - no_regress_some_persist_test (); - some_regress_some_persist_test (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + no_regress_no_persist_test_1(); + no_regress_no_persist_test_2(); + no_regress_no_persist_test_3(); + some_regress_no_persist_test(); + some_decay_test(); + no_regress_full_persist_test(); + no_regress_some_persist_test(); + some_regress_some_persist_test(); return 0; } diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c index c2729c759d8..0f0cd98a603 100644 --- a/test/core/iomgr/udp_server_test.c +++ b/test/core/iomgr/udp_server_test.c @@ -49,156 +49,143 @@ static grpc_pollset g_pollset; static int g_number_of_reads = 0; static int g_number_of_bytes_read = 0; -static void -on_read (int fd) -{ +static void on_read(int fd) { char read_buffer[512]; ssize_t byte_count; - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - byte_count = recv (fd, read_buffer, sizeof (read_buffer), 0); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + byte_count = recv(fd, read_buffer, sizeof(read_buffer), 0); g_number_of_reads++; - g_number_of_bytes_read += (int) byte_count; + g_number_of_bytes_read += (int)byte_count; - grpc_pollset_kick (&g_pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + grpc_pollset_kick(&g_pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } -static void -test_no_op (void) -{ - grpc_udp_server *s = grpc_udp_server_create (); - grpc_udp_server_destroy (s, NULL, NULL); +static void test_no_op(void) { + grpc_udp_server *s = grpc_udp_server_create(); + grpc_udp_server_destroy(s, NULL, NULL); } -static void -test_no_op_with_start (void) -{ +static void test_no_op_with_start(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_udp_server *s = grpc_udp_server_create (); - LOG_TEST ("test_no_op_with_start"); - grpc_udp_server_start (&exec_ctx, s, NULL, 0); - grpc_udp_server_destroy (s, NULL, NULL); - grpc_exec_ctx_finish (&exec_ctx); + grpc_udp_server *s = grpc_udp_server_create(); + LOG_TEST("test_no_op_with_start"); + grpc_udp_server_start(&exec_ctx, s, NULL, 0); + grpc_udp_server_destroy(s, NULL, NULL); + grpc_exec_ctx_finish(&exec_ctx); } -static void -test_no_op_with_port (void) -{ +static void test_no_op_with_port(void) { struct sockaddr_in addr; - grpc_udp_server *s = grpc_udp_server_create (); - LOG_TEST ("test_no_op_with_port"); + grpc_udp_server *s = grpc_udp_server_create(); + LOG_TEST("test_no_op_with_port"); - memset (&addr, 0, sizeof (addr)); + memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - GPR_ASSERT (grpc_udp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr), on_read)); + GPR_ASSERT(grpc_udp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr), + on_read)); - grpc_udp_server_destroy (s, NULL, NULL); + grpc_udp_server_destroy(s, NULL, NULL); } -static void -test_no_op_with_port_and_start (void) -{ +static void test_no_op_with_port_and_start(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; struct sockaddr_in addr; - grpc_udp_server *s = grpc_udp_server_create (); - LOG_TEST ("test_no_op_with_port_and_start"); + grpc_udp_server *s = grpc_udp_server_create(); + LOG_TEST("test_no_op_with_port_and_start"); - memset (&addr, 0, sizeof (addr)); + memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - GPR_ASSERT (grpc_udp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr), on_read)); + GPR_ASSERT(grpc_udp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr), + on_read)); - grpc_udp_server_start (&exec_ctx, s, NULL, 0); + grpc_udp_server_start(&exec_ctx, s, NULL, 0); - grpc_udp_server_destroy (&exec_ctx, s, NULL); - grpc_exec_ctx_finish (&exec_ctx); + grpc_udp_server_destroy(&exec_ctx, s, NULL); + grpc_exec_ctx_finish(&exec_ctx); } -static void -test_receive (int number_of_clients) -{ +static void test_receive(int number_of_clients) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; struct sockaddr_storage addr; - socklen_t addr_len = sizeof (addr); + socklen_t addr_len = sizeof(addr); int clifd, svrfd; - grpc_udp_server *s = grpc_udp_server_create (); + grpc_udp_server *s = grpc_udp_server_create(); int i; int number_of_reads_before; gpr_timespec deadline; grpc_pollset *pollsets[1]; - LOG_TEST ("test_receive"); - gpr_log (GPR_INFO, "clients=%d", number_of_clients); + LOG_TEST("test_receive"); + gpr_log(GPR_INFO, "clients=%d", number_of_clients); g_number_of_bytes_read = 0; - memset (&addr, 0, sizeof (addr)); + memset(&addr, 0, sizeof(addr)); addr.ss_family = AF_INET; - GPR_ASSERT (grpc_udp_server_add_port (s, (struct sockaddr *) &addr, addr_len, on_read)); + GPR_ASSERT( + grpc_udp_server_add_port(s, (struct sockaddr *)&addr, addr_len, on_read)); - svrfd = grpc_udp_server_get_fd (s, 0); - GPR_ASSERT (svrfd >= 0); - GPR_ASSERT (getsockname (svrfd, (struct sockaddr *) &addr, &addr_len) == 0); - GPR_ASSERT (addr_len <= sizeof (addr)); + svrfd = grpc_udp_server_get_fd(s, 0); + GPR_ASSERT(svrfd >= 0); + GPR_ASSERT(getsockname(svrfd, (struct sockaddr *)&addr, &addr_len) == 0); + GPR_ASSERT(addr_len <= sizeof(addr)); pollsets[0] = &g_pollset; - grpc_udp_server_start (&exec_ctx, s, pollsets, 1); - - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - - for (i = 0; i < number_of_clients; i++) - { - deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10); - - number_of_reads_before = g_number_of_reads; - /* Create a socket, send a packet to the UDP server. */ - clifd = socket (addr.ss_family, SOCK_DGRAM, 0); - GPR_ASSERT (clifd >= 0); - GPR_ASSERT (connect (clifd, (struct sockaddr *) &addr, addr_len) == 0); - GPR_ASSERT (5 == write (clifd, "hello", 5)); - while (g_number_of_reads == number_of_reads_before && gpr_time_cmp (deadline, gpr_now (deadline.clock_type)) > 0) - { - grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - } - GPR_ASSERT (g_number_of_reads == number_of_reads_before + 1); - close (clifd); + grpc_udp_server_start(&exec_ctx, s, pollsets, 1); + + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + + for (i = 0; i < number_of_clients; i++) { + deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10); + + number_of_reads_before = g_number_of_reads; + /* Create a socket, send a packet to the UDP server. */ + clifd = socket(addr.ss_family, SOCK_DGRAM, 0); + GPR_ASSERT(clifd >= 0); + GPR_ASSERT(connect(clifd, (struct sockaddr *)&addr, addr_len) == 0); + GPR_ASSERT(5 == write(clifd, "hello", 5)); + while (g_number_of_reads == number_of_reads_before && + gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0) { + grpc_pollset_worker worker; + grpc_pollset_work(&g_pollset, &worker, + gpr_now(&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } - GPR_ASSERT (g_number_of_bytes_read == 5 * number_of_clients); + GPR_ASSERT(g_number_of_reads == number_of_reads_before + 1); + close(clifd); + } + GPR_ASSERT(g_number_of_bytes_read == 5 * number_of_clients); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_udp_server_destroy (s, NULL, NULL); + grpc_udp_server_destroy(s, NULL, NULL); } -static void -destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) -{ - grpc_pollset_destroy (p); +static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, int success) { + grpc_pollset_destroy(p); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { grpc_closure destroyed; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_test_init (argc, argv); - grpc_iomgr_init (); - grpc_pollset_init (&g_pollset); - - test_no_op (); - test_no_op_with_start (); - test_no_op_with_port (); - test_no_op_with_port_and_start (); - test_receive (1); - test_receive (10); - - grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); - grpc_exec_ctx_finish (&exec_ctx); - grpc_iomgr_shutdown (); + grpc_test_init(argc, argv); + grpc_iomgr_init(); + grpc_pollset_init(&g_pollset); + + test_no_op(); + test_no_op_with_start(); + test_no_op_with_port(); + test_no_op_with_port_and_start(); + test_receive(1); + test_receive(10); + + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&exec_ctx, &g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); + grpc_iomgr_shutdown(); return 0; } diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c index eadb080a410..a7394ae0511 100644 --- a/test/core/iomgr/workqueue_test.c +++ b/test/core/iomgr/workqueue_test.c @@ -40,61 +40,54 @@ static grpc_pollset g_pollset; -static void -must_succeed (grpc_exec_ctx * exec_ctx, void *p, int success) -{ - GPR_ASSERT (success == 1); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - *(int *) p = 1; - grpc_pollset_kick (&g_pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); +static void must_succeed(grpc_exec_ctx *exec_ctx, void *p, int success) { + GPR_ASSERT(success == 1); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + *(int *)p = 1; + grpc_pollset_kick(&g_pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } -static void -test_add_closure (void) -{ +static void test_add_closure(void) { grpc_closure c; int done = 0; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_workqueue *wq = grpc_workqueue_create (&closure_list); - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5); + grpc_workqueue *wq = grpc_workqueue_create(&closure_list); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5); grpc_pollset_worker worker; - grpc_closure_init (&c, must_succeed, &done); + grpc_closure_init(&c, must_succeed, &done); - grpc_workqueue_push (wq, &c, 1); - grpc_workqueue_add_to_pollset (&exec_ctx, wq, &g_pollset); + grpc_workqueue_push(wq, &c, 1); + grpc_workqueue_add_to_pollset(&exec_ctx, wq, &g_pollset); - gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); - GPR_ASSERT (!done); - grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, deadline.clock_type), deadline); - gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_exec_ctx_finish (&exec_ctx); - GPR_ASSERT (done); + gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); + GPR_ASSERT(!done); + grpc_pollset_work(&g_pollset, &worker, + gpr_now(&exec_ctx, deadline.clock_type), deadline); + gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); + grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(done); - GRPC_WORKQUEUE_UNREF (&exec_ctx, wq, "destroy"); - grpc_exec_ctx_finish (&exec_ctx); + GRPC_WORKQUEUE_UNREF(&exec_ctx, wq, "destroy"); + grpc_exec_ctx_finish(&exec_ctx); } -static void -destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) -{ - grpc_pollset_destroy (p); +static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, int success) { + grpc_pollset_destroy(p); } -int -main (int argc, char **argv) -{ +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_pollset_init (&g_pollset); + grpc_test_init(argc, argv); + grpc_init(); + grpc_pollset_init(&g_pollset); - test_add_closure (); + test_add_closure(); - grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); - grpc_exec_ctx_finish (&exec_ctx); - grpc_shutdown (); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&exec_ctx, &g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); + grpc_shutdown(); return 0; } diff --git a/test/core/json/json_rewrite.c b/test/core/json/json_rewrite.c index 920c03164a0..42fdbd6d549 100644 --- a/test/core/json/json_rewrite.c +++ b/test/core/json/json_rewrite.c @@ -41,19 +41,14 @@ #include "src/core/json/json_reader.h" #include "src/core/json/json_writer.h" -typedef struct json_writer_userdata -{ - FILE *out; -} json_writer_userdata; +typedef struct json_writer_userdata { FILE *out; } json_writer_userdata; -typedef struct stacked_container -{ +typedef struct stacked_container { grpc_json_type type; struct stacked_container *next; } stacked_container; -typedef struct json_reader_userdata -{ +typedef struct json_reader_userdata { FILE *in; grpc_json_writer *writer; char *scratchpad; @@ -64,198 +59,155 @@ typedef struct json_reader_userdata stacked_container *top; } json_reader_userdata; -static void -json_writer_output_char (void *userdata, char c) -{ +static void json_writer_output_char(void *userdata, char c) { json_writer_userdata *state = userdata; - fputc (c, state->out); + fputc(c, state->out); } -static void -json_writer_output_string (void *userdata, const char *str) -{ +static void json_writer_output_string(void *userdata, const char *str) { json_writer_userdata *state = userdata; - fputs (str, state->out); + fputs(str, state->out); } -static void -json_writer_output_string_with_len (void *userdata, const char *str, size_t len) -{ +static void json_writer_output_string_with_len(void *userdata, const char *str, + size_t len) { json_writer_userdata *state = userdata; - fwrite (str, len, 1, state->out); + fwrite(str, len, 1, state->out); } -grpc_json_writer_vtable writer_vtable = { json_writer_output_char, - json_writer_output_string, - json_writer_output_string_with_len -}; +grpc_json_writer_vtable writer_vtable = {json_writer_output_char, + json_writer_output_string, + json_writer_output_string_with_len}; -static void -check_string (json_reader_userdata * state, size_t needed) -{ - if (state->free_space >= needed) - return; +static void check_string(json_reader_userdata *state, size_t needed) { + if (state->free_space >= needed) return; needed -= state->free_space; needed = (needed + 0xffu) & ~0xffu; - state->scratchpad = gpr_realloc (state->scratchpad, state->allocated + needed); + state->scratchpad = gpr_realloc(state->scratchpad, state->allocated + needed); state->free_space += needed; state->allocated += needed; } -static void -json_reader_string_clear (void *userdata) -{ +static void json_reader_string_clear(void *userdata) { json_reader_userdata *state = userdata; state->free_space = state->allocated; state->string_len = 0; } -static void -json_reader_string_add_char (void *userdata, gpr_uint32 c) -{ +static void json_reader_string_add_char(void *userdata, gpr_uint32 c) { json_reader_userdata *state = userdata; - check_string (state, 1); - GPR_ASSERT (c < 256); - state->scratchpad[state->string_len++] = (char) c; -} - -static void -json_reader_string_add_utf32 (void *userdata, gpr_uint32 c) -{ - if (c <= 0x7f) - { - json_reader_string_add_char (userdata, c); - } - else if (c <= 0x7ff) - { - gpr_uint32 b1 = 0xc0u | ((c >> 6u) & 0x1fu); - gpr_uint32 b2 = 0x80u | (c & 0x3fu); - json_reader_string_add_char (userdata, b1); - json_reader_string_add_char (userdata, b2); - } - else if (c <= 0xffffu) - { - gpr_uint32 b1 = 0xe0u | ((c >> 12u) & 0x0fu); - gpr_uint32 b2 = 0x80u | ((c >> 6u) & 0x3fu); - gpr_uint32 b3 = 0x80u | (c & 0x3fu); - json_reader_string_add_char (userdata, b1); - json_reader_string_add_char (userdata, b2); - json_reader_string_add_char (userdata, b3); - } - else if (c <= 0x1fffffu) - { - gpr_uint32 b1 = 0xf0u | ((c >> 18u) & 0x07u); - gpr_uint32 b2 = 0x80u | ((c >> 12u) & 0x3fu); - gpr_uint32 b3 = 0x80u | ((c >> 6u) & 0x3fu); - gpr_uint32 b4 = 0x80u | (c & 0x3fu); - json_reader_string_add_char (userdata, b1); - json_reader_string_add_char (userdata, b2); - json_reader_string_add_char (userdata, b3); - json_reader_string_add_char (userdata, b4); - } -} - -static gpr_uint32 -json_reader_read_char (void *userdata) -{ + check_string(state, 1); + GPR_ASSERT(c < 256); + state->scratchpad[state->string_len++] = (char)c; +} + +static void json_reader_string_add_utf32(void *userdata, gpr_uint32 c) { + if (c <= 0x7f) { + json_reader_string_add_char(userdata, c); + } else if (c <= 0x7ff) { + gpr_uint32 b1 = 0xc0u | ((c >> 6u) & 0x1fu); + gpr_uint32 b2 = 0x80u | (c & 0x3fu); + json_reader_string_add_char(userdata, b1); + json_reader_string_add_char(userdata, b2); + } else if (c <= 0xffffu) { + gpr_uint32 b1 = 0xe0u | ((c >> 12u) & 0x0fu); + gpr_uint32 b2 = 0x80u | ((c >> 6u) & 0x3fu); + gpr_uint32 b3 = 0x80u | (c & 0x3fu); + json_reader_string_add_char(userdata, b1); + json_reader_string_add_char(userdata, b2); + json_reader_string_add_char(userdata, b3); + } else if (c <= 0x1fffffu) { + gpr_uint32 b1 = 0xf0u | ((c >> 18u) & 0x07u); + gpr_uint32 b2 = 0x80u | ((c >> 12u) & 0x3fu); + gpr_uint32 b3 = 0x80u | ((c >> 6u) & 0x3fu); + gpr_uint32 b4 = 0x80u | (c & 0x3fu); + json_reader_string_add_char(userdata, b1); + json_reader_string_add_char(userdata, b2); + json_reader_string_add_char(userdata, b3); + json_reader_string_add_char(userdata, b4); + } +} + +static gpr_uint32 json_reader_read_char(void *userdata) { int r; json_reader_userdata *state = userdata; - r = fgetc (state->in); - if (r == EOF) - r = GRPC_JSON_READ_CHAR_EOF; - return (gpr_uint32) r; + r = fgetc(state->in); + if (r == EOF) r = GRPC_JSON_READ_CHAR_EOF; + return (gpr_uint32)r; } -static void -json_reader_container_begins (void *userdata, grpc_json_type type) -{ +static void json_reader_container_begins(void *userdata, grpc_json_type type) { json_reader_userdata *state = userdata; - stacked_container *container = gpr_malloc (sizeof (stacked_container)); + stacked_container *container = gpr_malloc(sizeof(stacked_container)); container->type = type; container->next = state->top; state->top = container; - grpc_json_writer_container_begins (state->writer, type); + grpc_json_writer_container_begins(state->writer, type); } -static grpc_json_type -json_reader_container_ends (void *userdata) -{ +static grpc_json_type json_reader_container_ends(void *userdata) { json_reader_userdata *state = userdata; stacked_container *container = state->top; - grpc_json_writer_container_ends (state->writer, container->type); + grpc_json_writer_container_ends(state->writer, container->type); state->top = container->next; - gpr_free (container); + gpr_free(container); return state->top ? state->top->type : GRPC_JSON_TOP_LEVEL; } -static void -json_reader_set_key (void *userdata) -{ +static void json_reader_set_key(void *userdata) { json_reader_userdata *state = userdata; - json_reader_string_add_char (userdata, 0); + json_reader_string_add_char(userdata, 0); - grpc_json_writer_object_key (state->writer, state->scratchpad); + grpc_json_writer_object_key(state->writer, state->scratchpad); } -static void -json_reader_set_string (void *userdata) -{ +static void json_reader_set_string(void *userdata) { json_reader_userdata *state = userdata; - json_reader_string_add_char (userdata, 0); + json_reader_string_add_char(userdata, 0); - grpc_json_writer_value_string (state->writer, state->scratchpad); + grpc_json_writer_value_string(state->writer, state->scratchpad); } -static int -json_reader_set_number (void *userdata) -{ +static int json_reader_set_number(void *userdata) { json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len (state->writer, state->scratchpad, state->string_len); + grpc_json_writer_value_raw_with_len(state->writer, state->scratchpad, + state->string_len); return 1; } -static void -json_reader_set_true (void *userdata) -{ +static void json_reader_set_true(void *userdata) { json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len (state->writer, "true", 4); + grpc_json_writer_value_raw_with_len(state->writer, "true", 4); } -static void -json_reader_set_false (void *userdata) -{ +static void json_reader_set_false(void *userdata) { json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len (state->writer, "false", 5); + grpc_json_writer_value_raw_with_len(state->writer, "false", 5); } -static void -json_reader_set_null (void *userdata) -{ +static void json_reader_set_null(void *userdata) { json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len (state->writer, "null", 4); + grpc_json_writer_value_raw_with_len(state->writer, "null", 4); } static grpc_json_reader_vtable reader_vtable = { - json_reader_string_clear, json_reader_string_add_char, - json_reader_string_add_utf32, json_reader_read_char, - json_reader_container_begins, json_reader_container_ends, - json_reader_set_key, json_reader_set_string, - json_reader_set_number, json_reader_set_true, - json_reader_set_false, json_reader_set_null -}; - -int -rewrite (FILE * in, FILE * out, int indent) -{ + json_reader_string_clear, json_reader_string_add_char, + json_reader_string_add_utf32, json_reader_read_char, + json_reader_container_begins, json_reader_container_ends, + json_reader_set_key, json_reader_set_string, + json_reader_set_number, json_reader_set_true, + json_reader_set_false, json_reader_set_null}; + +int rewrite(FILE *in, FILE *out, int indent) { grpc_json_writer writer; grpc_json_reader reader; grpc_json_reader_status status; @@ -272,32 +224,29 @@ rewrite (FILE * in, FILE * out, int indent) writer_user.out = out; - grpc_json_writer_init (&writer, indent, &writer_vtable, &writer_user); - grpc_json_reader_init (&reader, &reader_vtable, &reader_user); + grpc_json_writer_init(&writer, indent, &writer_vtable, &writer_user); + grpc_json_reader_init(&reader, &reader_vtable, &reader_user); - status = grpc_json_reader_run (&reader); + status = grpc_json_reader_run(&reader); - free (reader_user.scratchpad); - while (reader_user.top) - { - stacked_container *container = reader_user.top; - reader_user.top = container->next; - free (container); - } + free(reader_user.scratchpad); + while (reader_user.top) { + stacked_container *container = reader_user.top; + reader_user.top = container->next; + free(container); + } return status == GRPC_JSON_DONE; } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { int indent = 2; gpr_cmdline *cl; - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_int (cl, "indent", NULL, &indent); - gpr_cmdline_parse (cl, argc, argv); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_int(cl, "indent", NULL, &indent); + gpr_cmdline_parse(cl, argc, argv); + gpr_cmdline_destroy(cl); - return rewrite (stdin, stdout, indent) ? 0 : 1; + return rewrite(stdin, stdout, indent) ? 0 : 1; } diff --git a/test/core/json/json_rewrite_test.c b/test/core/json/json_rewrite_test.c index 470c0218c57..644a1426e98 100644 --- a/test/core/json/json_rewrite_test.c +++ b/test/core/json/json_rewrite_test.c @@ -42,19 +42,14 @@ #include "src/core/json/json_reader.h" #include "src/core/json/json_writer.h" -typedef struct json_writer_userdata -{ - FILE *cmp; -} json_writer_userdata; +typedef struct json_writer_userdata { FILE *cmp; } json_writer_userdata; -typedef struct stacked_container -{ +typedef struct stacked_container { grpc_json_type type; struct stacked_container *next; } stacked_container; -typedef struct json_reader_userdata -{ +typedef struct json_reader_userdata { FILE *in; grpc_json_writer *writer; char *scratchpad; @@ -66,226 +61,179 @@ typedef struct json_reader_userdata int did_eagain; } json_reader_userdata; -static void -json_writer_output_char (void *userdata, char c) -{ +static void json_writer_output_char(void *userdata, char c) { json_writer_userdata *state = userdata; - int cmp = fgetc (state->cmp); + int cmp = fgetc(state->cmp); /* treat CRLF as LF */ - if (cmp == '\r' && c == '\n') - { - cmp = fgetc (state->cmp); - } - GPR_ASSERT (cmp == c); + if (cmp == '\r' && c == '\n') { + cmp = fgetc(state->cmp); + } + GPR_ASSERT(cmp == c); } -static void -json_writer_output_string (void *userdata, const char *str) -{ - while (*str) - { - json_writer_output_char (userdata, *str++); - } +static void json_writer_output_string(void *userdata, const char *str) { + while (*str) { + json_writer_output_char(userdata, *str++); + } } -static void -json_writer_output_string_with_len (void *userdata, const char *str, size_t len) -{ +static void json_writer_output_string_with_len(void *userdata, const char *str, + size_t len) { size_t i; - for (i = 0; i < len; i++) - { - json_writer_output_char (userdata, str[i]); - } + for (i = 0; i < len; i++) { + json_writer_output_char(userdata, str[i]); + } } -grpc_json_writer_vtable writer_vtable = { json_writer_output_char, - json_writer_output_string, - json_writer_output_string_with_len -}; +grpc_json_writer_vtable writer_vtable = {json_writer_output_char, + json_writer_output_string, + json_writer_output_string_with_len}; -static void -check_string (json_reader_userdata * state, size_t needed) -{ - if (state->free_space >= needed) - return; +static void check_string(json_reader_userdata *state, size_t needed) { + if (state->free_space >= needed) return; needed -= state->free_space; needed = (needed + 0xffu) & ~0xffu; - state->scratchpad = gpr_realloc (state->scratchpad, state->allocated + needed); + state->scratchpad = gpr_realloc(state->scratchpad, state->allocated + needed); state->free_space += needed; state->allocated += needed; } -static void -json_reader_string_clear (void *userdata) -{ +static void json_reader_string_clear(void *userdata) { json_reader_userdata *state = userdata; state->free_space = state->allocated; state->string_len = 0; } -static void -json_reader_string_add_char (void *userdata, gpr_uint32 c) -{ +static void json_reader_string_add_char(void *userdata, gpr_uint32 c) { json_reader_userdata *state = userdata; - check_string (state, 1); - GPR_ASSERT (c <= 256); - state->scratchpad[state->string_len++] = (char) c; + check_string(state, 1); + GPR_ASSERT(c <= 256); + state->scratchpad[state->string_len++] = (char)c; } -static void -json_reader_string_add_utf32 (void *userdata, gpr_uint32 c) -{ - if (c <= 0x7f) - { - json_reader_string_add_char (userdata, c); - } - else if (c <= 0x7ffu) - { - gpr_uint32 b1 = 0xc0u | ((c >> 6u) & 0x1fu); - gpr_uint32 b2 = 0x80u | (c & 0x3fu); - json_reader_string_add_char (userdata, b1); - json_reader_string_add_char (userdata, b2); - } - else if (c <= 0xffffu) - { - gpr_uint32 b1 = 0xe0u | ((c >> 12u) & 0x0fu); - gpr_uint32 b2 = 0x80u | ((c >> 6u) & 0x3fu); - gpr_uint32 b3 = 0x80u | (c & 0x3fu); - json_reader_string_add_char (userdata, b1); - json_reader_string_add_char (userdata, b2); - json_reader_string_add_char (userdata, b3); - } - else if (c <= 0x1fffffu) - { - gpr_uint32 b1 = 0xf0u | ((c >> 18u) & 0x07u); - gpr_uint32 b2 = 0x80u | ((c >> 12u) & 0x3fu); - gpr_uint32 b3 = 0x80u | ((c >> 6u) & 0x3fu); - gpr_uint32 b4 = 0x80u | (c & 0x3fu); - json_reader_string_add_char (userdata, b1); - json_reader_string_add_char (userdata, b2); - json_reader_string_add_char (userdata, b3); - json_reader_string_add_char (userdata, b4); - } +static void json_reader_string_add_utf32(void *userdata, gpr_uint32 c) { + if (c <= 0x7f) { + json_reader_string_add_char(userdata, c); + } else if (c <= 0x7ffu) { + gpr_uint32 b1 = 0xc0u | ((c >> 6u) & 0x1fu); + gpr_uint32 b2 = 0x80u | (c & 0x3fu); + json_reader_string_add_char(userdata, b1); + json_reader_string_add_char(userdata, b2); + } else if (c <= 0xffffu) { + gpr_uint32 b1 = 0xe0u | ((c >> 12u) & 0x0fu); + gpr_uint32 b2 = 0x80u | ((c >> 6u) & 0x3fu); + gpr_uint32 b3 = 0x80u | (c & 0x3fu); + json_reader_string_add_char(userdata, b1); + json_reader_string_add_char(userdata, b2); + json_reader_string_add_char(userdata, b3); + } else if (c <= 0x1fffffu) { + gpr_uint32 b1 = 0xf0u | ((c >> 18u) & 0x07u); + gpr_uint32 b2 = 0x80u | ((c >> 12u) & 0x3fu); + gpr_uint32 b3 = 0x80u | ((c >> 6u) & 0x3fu); + gpr_uint32 b4 = 0x80u | (c & 0x3fu); + json_reader_string_add_char(userdata, b1); + json_reader_string_add_char(userdata, b2); + json_reader_string_add_char(userdata, b3); + json_reader_string_add_char(userdata, b4); + } } -static gpr_uint32 -json_reader_read_char (void *userdata) -{ +static gpr_uint32 json_reader_read_char(void *userdata) { int r; json_reader_userdata *state = userdata; - if (!state->did_eagain) - { - state->did_eagain = 1; - return GRPC_JSON_READ_CHAR_EAGAIN; - } + if (!state->did_eagain) { + state->did_eagain = 1; + return GRPC_JSON_READ_CHAR_EAGAIN; + } state->did_eagain = 0; - r = fgetc (state->in); - if (r == EOF) - r = GRPC_JSON_READ_CHAR_EOF; - return (gpr_uint32) r; + r = fgetc(state->in); + if (r == EOF) r = GRPC_JSON_READ_CHAR_EOF; + return (gpr_uint32)r; } -static void -json_reader_container_begins (void *userdata, grpc_json_type type) -{ +static void json_reader_container_begins(void *userdata, grpc_json_type type) { json_reader_userdata *state = userdata; - stacked_container *container = gpr_malloc (sizeof (stacked_container)); + stacked_container *container = gpr_malloc(sizeof(stacked_container)); container->type = type; container->next = state->top; state->top = container; - grpc_json_writer_container_begins (state->writer, type); + grpc_json_writer_container_begins(state->writer, type); } -static grpc_json_type -json_reader_container_ends (void *userdata) -{ +static grpc_json_type json_reader_container_ends(void *userdata) { json_reader_userdata *state = userdata; stacked_container *container = state->top; - grpc_json_writer_container_ends (state->writer, container->type); + grpc_json_writer_container_ends(state->writer, container->type); state->top = container->next; - gpr_free (container); + gpr_free(container); return state->top ? state->top->type : GRPC_JSON_TOP_LEVEL; } -static void -json_reader_set_key (void *userdata) -{ +static void json_reader_set_key(void *userdata) { json_reader_userdata *state = userdata; - json_reader_string_add_char (userdata, 0); + json_reader_string_add_char(userdata, 0); - grpc_json_writer_object_key (state->writer, state->scratchpad); + grpc_json_writer_object_key(state->writer, state->scratchpad); } -static void -json_reader_set_string (void *userdata) -{ +static void json_reader_set_string(void *userdata) { json_reader_userdata *state = userdata; - json_reader_string_add_char (userdata, 0); + json_reader_string_add_char(userdata, 0); - grpc_json_writer_value_string (state->writer, state->scratchpad); + grpc_json_writer_value_string(state->writer, state->scratchpad); } -static int -json_reader_set_number (void *userdata) -{ +static int json_reader_set_number(void *userdata) { json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len (state->writer, state->scratchpad, state->string_len); + grpc_json_writer_value_raw_with_len(state->writer, state->scratchpad, + state->string_len); return 1; } -static void -json_reader_set_true (void *userdata) -{ +static void json_reader_set_true(void *userdata) { json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len (state->writer, "true", 4); + grpc_json_writer_value_raw_with_len(state->writer, "true", 4); } -static void -json_reader_set_false (void *userdata) -{ +static void json_reader_set_false(void *userdata) { json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len (state->writer, "false", 5); + grpc_json_writer_value_raw_with_len(state->writer, "false", 5); } -static void -json_reader_set_null (void *userdata) -{ +static void json_reader_set_null(void *userdata) { json_reader_userdata *state = userdata; - grpc_json_writer_value_raw_with_len (state->writer, "null", 4); + grpc_json_writer_value_raw_with_len(state->writer, "null", 4); } static grpc_json_reader_vtable reader_vtable = { - json_reader_string_clear, json_reader_string_add_char, - json_reader_string_add_utf32, json_reader_read_char, - json_reader_container_begins, json_reader_container_ends, - json_reader_set_key, json_reader_set_string, - json_reader_set_number, json_reader_set_true, - json_reader_set_false, json_reader_set_null -}; - -int -rewrite_and_compare (FILE * in, FILE * cmp, int indent) -{ + json_reader_string_clear, json_reader_string_add_char, + json_reader_string_add_utf32, json_reader_read_char, + json_reader_container_begins, json_reader_container_ends, + json_reader_set_key, json_reader_set_string, + json_reader_set_number, json_reader_set_true, + json_reader_set_false, json_reader_set_null}; + +int rewrite_and_compare(FILE *in, FILE *cmp, int indent) { grpc_json_writer writer; grpc_json_reader reader; grpc_json_reader_status status; json_writer_userdata writer_user; json_reader_userdata reader_user; - GPR_ASSERT (in); - GPR_ASSERT (cmp); + GPR_ASSERT(in); + GPR_ASSERT(cmp); reader_user.writer = &writer; reader_user.in = in; @@ -298,68 +246,60 @@ rewrite_and_compare (FILE * in, FILE * cmp, int indent) writer_user.cmp = cmp; - grpc_json_writer_init (&writer, indent, &writer_vtable, &writer_user); - grpc_json_reader_init (&reader, &reader_vtable, &reader_user); + grpc_json_writer_init(&writer, indent, &writer_vtable, &writer_user); + grpc_json_reader_init(&reader, &reader_vtable, &reader_user); - do - { - status = grpc_json_reader_run (&reader); - } - while (status == GRPC_JSON_EAGAIN); + do { + status = grpc_json_reader_run(&reader); + } while (status == GRPC_JSON_EAGAIN); - free (reader_user.scratchpad); - while (reader_user.top) - { - stacked_container *container = reader_user.top; - reader_user.top = container->next; - free (container); - } + free(reader_user.scratchpad); + while (reader_user.top) { + stacked_container *container = reader_user.top; + reader_user.top = container->next; + free(container); + } return status == GRPC_JSON_DONE; } -typedef struct test_file -{ +typedef struct test_file { const char *input; const char *cmp; int indent; } test_file; static test_file test_files[] = { - {"test/core/json/rewrite_test_input.json", - "test/core/json/rewrite_test_output_condensed.json", 0}, - {"test/core/json/rewrite_test_input.json", - "test/core/json/rewrite_test_output_indented.json", 2}, - {"test/core/json/rewrite_test_output_indented.json", - "test/core/json/rewrite_test_output_condensed.json", 0}, - {"test/core/json/rewrite_test_output_condensed.json", - "test/core/json/rewrite_test_output_indented.json", 2}, + {"test/core/json/rewrite_test_input.json", + "test/core/json/rewrite_test_output_condensed.json", 0}, + {"test/core/json/rewrite_test_input.json", + "test/core/json/rewrite_test_output_indented.json", 2}, + {"test/core/json/rewrite_test_output_indented.json", + "test/core/json/rewrite_test_output_condensed.json", 0}, + {"test/core/json/rewrite_test_output_condensed.json", + "test/core/json/rewrite_test_output_indented.json", 2}, }; -void -test_rewrites () -{ +void test_rewrites() { unsigned i; - for (i = 0; i < GPR_ARRAY_SIZE (test_files); i++) - { - test_file *test = test_files + i; - FILE *input = fopen (test->input, "rb"); - FILE *cmp = fopen (test->cmp, "rb"); - int status; - gpr_log (GPR_INFO, "Testing file %s against %s using indent=%i", test->input, test->cmp, test->indent); - status = rewrite_and_compare (input, cmp, test->indent); - GPR_ASSERT (status); - fclose (input); - fclose (cmp); - } + for (i = 0; i < GPR_ARRAY_SIZE(test_files); i++) { + test_file *test = test_files + i; + FILE *input = fopen(test->input, "rb"); + FILE *cmp = fopen(test->cmp, "rb"); + int status; + gpr_log(GPR_INFO, "Testing file %s against %s using indent=%i", test->input, + test->cmp, test->indent); + status = rewrite_and_compare(input, cmp, test->indent); + GPR_ASSERT(status); + fclose(input); + fclose(cmp); + } } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_rewrites (); - gpr_log (GPR_INFO, "json_rewrite_test success"); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_rewrites(); + gpr_log(GPR_INFO, "json_rewrite_test success"); return 0; } diff --git a/test/core/json/json_test.c b/test/core/json/json_test.c index 2f4e2921eb9..8575331cabd 100644 --- a/test/core/json/json_test.c +++ b/test/core/json/json_test.c @@ -42,151 +42,141 @@ #include "test/core/util/test_config.h" -typedef struct testing_pair -{ +typedef struct testing_pair { const char *input; const char *output; } testing_pair; static testing_pair testing_pairs[] = { - /* Testing valid parsing. */ - - /* Testing trivial parses, with de-indentation. */ - {" 0 ", "0"}, - {" 1 ", "1"}, - {" \"a\" ", "\"a\""}, - {" true ", "true"}, - /* Testing the parser's ability to decode trivial UTF-16. */ - {"\"\\u0020\\\\\\u0010\\u000a\\u000D\"", "\" \\\\\\u0010\\n\\r\""}, - /* Testing various UTF-8 sequences. */ - {"\"ßâñć௵⇒\"", "\"\\u00df\\u00e2\\u00f1\\u0107\\u0bf5\\u21d2\""}, - {"\"\\u00df\\u00e2\\u00f1\\u0107\\u0bf5\\u21d2\"", - "\"\\u00df\\u00e2\\u00f1\\u0107\\u0bf5\\u21d2\""}, - /* Testing UTF-8 character "𝄞", U+11D1E. */ - {"\"\xf0\x9d\x84\x9e\"", "\"\\ud834\\udd1e\""}, - {"\"\\ud834\\udd1e\"", "\"\\ud834\\udd1e\""}, - /* Testing nested empty containers. */ - { - " [ [ ] , { } , [ ] ] ", "[[],{},[]]", - }, - /* Testing escapes and control chars in key strings. */ - {" { \"\x7f\\n\\\\a , b\": 1, \"\": 0 } ", - "{\"\\u007f\\n\\\\a , b\":1,\"\":0}"}, - /* Testing the writer's ability to cut off invalid UTF-8 sequences. */ - {"\"abc\xf0\x9d\x24\"", "\"abc\""}, - {"\"\xff\"", "\"\""}, - /* Testing valid number parsing. */ - {"[0, 42 , 0.0123, 123.456]", "[0,42,0.0123,123.456]"}, - {"[1e4,-53.235e-31, 0.3e+3]", "[1e4,-53.235e-31,0.3e+3]"}, - /* Testing keywords parsing. */ - {"[true, false, null]", "[true,false,null]"}, - - /* Testing invalid parsing. */ - - /* Testing plain invalid things, exercising the state machine. */ - {"\\", NULL}, - {"nu ll", NULL}, - {"fals", NULL}, - /* Testing unterminated string. */ - {"\"\\x", NULL}, - /* Testing invalid UTF-16 number. */ - {"\"\\u123x", NULL}, - /* Testing imbalanced surrogate pairs. */ - {"\"\\ud834f", NULL}, - {"\"\\ud834\\n", NULL}, - {"\"\\udd1ef", NULL}, - {"\"\\ud834\\ud834\"", NULL}, - {"\"\\ud834\\u1234\"", NULL}, - /* Testing embedded invalid whitechars. */ - {"\"\n\"", NULL}, - {"\"\t\"", NULL}, - /* Testing empty json data. */ - {"", NULL}, - /* Testing extra characters after end of parsing. */ - {"{},", NULL}, - /* Testing imbalanced containers. */ - {"{}}", NULL}, - {"[]]", NULL}, - {"{{}", NULL}, - {"[[]", NULL}, - {"[}", NULL}, - {"{]", NULL}, - /*Testing trailing comma. */ - {"{,}", NULL}, - {"[1,2,3,4,]", NULL}, - /* Testing having a key syntax in an array. */ - {"[\"x\":0]", NULL}, - /* Testing invalid numbers. */ - {"1.", NULL}, - {"1e", NULL}, - {".12", NULL}, - {"1.x", NULL}, - {"1.12x", NULL}, - {"1ex", NULL}, - {"1e12x", NULL}, - {".12x", NULL}, - {"000", NULL}, + /* Testing valid parsing. */ + + /* Testing trivial parses, with de-indentation. */ + {" 0 ", "0"}, + {" 1 ", "1"}, + {" \"a\" ", "\"a\""}, + {" true ", "true"}, + /* Testing the parser's ability to decode trivial UTF-16. */ + {"\"\\u0020\\\\\\u0010\\u000a\\u000D\"", "\" \\\\\\u0010\\n\\r\""}, + /* Testing various UTF-8 sequences. */ + {"\"ßâñć௵⇒\"", "\"\\u00df\\u00e2\\u00f1\\u0107\\u0bf5\\u21d2\""}, + {"\"\\u00df\\u00e2\\u00f1\\u0107\\u0bf5\\u21d2\"", + "\"\\u00df\\u00e2\\u00f1\\u0107\\u0bf5\\u21d2\""}, + /* Testing UTF-8 character "𝄞", U+11D1E. */ + {"\"\xf0\x9d\x84\x9e\"", "\"\\ud834\\udd1e\""}, + {"\"\\ud834\\udd1e\"", "\"\\ud834\\udd1e\""}, + /* Testing nested empty containers. */ + { + " [ [ ] , { } , [ ] ] ", "[[],{},[]]", + }, + /* Testing escapes and control chars in key strings. */ + {" { \"\x7f\\n\\\\a , b\": 1, \"\": 0 } ", + "{\"\\u007f\\n\\\\a , b\":1,\"\":0}"}, + /* Testing the writer's ability to cut off invalid UTF-8 sequences. */ + {"\"abc\xf0\x9d\x24\"", "\"abc\""}, + {"\"\xff\"", "\"\""}, + /* Testing valid number parsing. */ + {"[0, 42 , 0.0123, 123.456]", "[0,42,0.0123,123.456]"}, + {"[1e4,-53.235e-31, 0.3e+3]", "[1e4,-53.235e-31,0.3e+3]"}, + /* Testing keywords parsing. */ + {"[true, false, null]", "[true,false,null]"}, + + /* Testing invalid parsing. */ + + /* Testing plain invalid things, exercising the state machine. */ + {"\\", NULL}, + {"nu ll", NULL}, + {"fals", NULL}, + /* Testing unterminated string. */ + {"\"\\x", NULL}, + /* Testing invalid UTF-16 number. */ + {"\"\\u123x", NULL}, + /* Testing imbalanced surrogate pairs. */ + {"\"\\ud834f", NULL}, + {"\"\\ud834\\n", NULL}, + {"\"\\udd1ef", NULL}, + {"\"\\ud834\\ud834\"", NULL}, + {"\"\\ud834\\u1234\"", NULL}, + /* Testing embedded invalid whitechars. */ + {"\"\n\"", NULL}, + {"\"\t\"", NULL}, + /* Testing empty json data. */ + {"", NULL}, + /* Testing extra characters after end of parsing. */ + {"{},", NULL}, + /* Testing imbalanced containers. */ + {"{}}", NULL}, + {"[]]", NULL}, + {"{{}", NULL}, + {"[[]", NULL}, + {"[}", NULL}, + {"{]", NULL}, + /*Testing trailing comma. */ + {"{,}", NULL}, + {"[1,2,3,4,]", NULL}, + /* Testing having a key syntax in an array. */ + {"[\"x\":0]", NULL}, + /* Testing invalid numbers. */ + {"1.", NULL}, + {"1e", NULL}, + {".12", NULL}, + {"1.x", NULL}, + {"1.12x", NULL}, + {"1ex", NULL}, + {"1e12x", NULL}, + {".12x", NULL}, + {"000", NULL}, }; -static void -test_pairs () -{ +static void test_pairs() { unsigned i; - for (i = 0; i < GPR_ARRAY_SIZE (testing_pairs); i++) - { - testing_pair *pair = testing_pairs + i; - char *scratchpad = gpr_strdup (pair->input); - grpc_json *json; - - gpr_log (GPR_INFO, "parsing string %i - should %s", i, pair->output ? "succeed" : "fail"); - json = grpc_json_parse_string (scratchpad); - - if (pair->output) - { - char *output; - - GPR_ASSERT (json); - output = grpc_json_dump_to_string (json, 0); - GPR_ASSERT (output); - gpr_log (GPR_INFO, "succeeded with output = %s", output); - GPR_ASSERT (strcmp (output, pair->output) == 0); - - grpc_json_destroy (json); - gpr_free (output); - } - else - { - gpr_log (GPR_INFO, "failed"); - GPR_ASSERT (!json); - } - - gpr_free (scratchpad); + for (i = 0; i < GPR_ARRAY_SIZE(testing_pairs); i++) { + testing_pair *pair = testing_pairs + i; + char *scratchpad = gpr_strdup(pair->input); + grpc_json *json; + + gpr_log(GPR_INFO, "parsing string %i - should %s", i, + pair->output ? "succeed" : "fail"); + json = grpc_json_parse_string(scratchpad); + + if (pair->output) { + char *output; + + GPR_ASSERT(json); + output = grpc_json_dump_to_string(json, 0); + GPR_ASSERT(output); + gpr_log(GPR_INFO, "succeeded with output = %s", output); + GPR_ASSERT(strcmp(output, pair->output) == 0); + + grpc_json_destroy(json); + gpr_free(output); + } else { + gpr_log(GPR_INFO, "failed"); + GPR_ASSERT(!json); } + + gpr_free(scratchpad); + } } -static void -test_atypical () -{ - char *scratchpad = gpr_strdup ("[[],[]]"); - grpc_json *json = grpc_json_parse_string (scratchpad); +static void test_atypical() { + char *scratchpad = gpr_strdup("[[],[]]"); + grpc_json *json = grpc_json_parse_string(scratchpad); grpc_json *brother; - GPR_ASSERT (json); - GPR_ASSERT (json->child); + GPR_ASSERT(json); + GPR_ASSERT(json->child); brother = json->child->next; - grpc_json_destroy (json->child); + grpc_json_destroy(json->child); json->child = brother; - grpc_json_destroy (json); - gpr_free (scratchpad); + grpc_json_destroy(json); + gpr_free(scratchpad); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_pairs (); - test_atypical (); - gpr_log (GPR_INFO, "json_test success"); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_pairs(); + test_atypical(); + gpr_log(GPR_INFO, "json_test success"); return 0; } diff --git a/test/core/network_benchmarks/low_level_ping_pong.c b/test/core/network_benchmarks/low_level_ping_pong.c index 35c892f2c80..0ce4bd4b250 100644 --- a/test/core/network_benchmarks/low_level_ping_pong.c +++ b/test/core/network_benchmarks/low_level_ping_pong.c @@ -57,19 +57,17 @@ #include #include -typedef struct fd_pair -{ +typedef struct fd_pair { int read_fd; int write_fd; } fd_pair; -typedef struct thread_args -{ +typedef struct thread_args { fd_pair fds; size_t msg_size; - int (*read_bytes) (struct thread_args * args, char *buf); - int (*write_bytes) (struct thread_args * args, char *buf); - int (*setup) (struct thread_args * args); + int (*read_bytes)(struct thread_args *args, char *buf); + int (*write_bytes)(struct thread_args *args, char *buf); + int (*setup)(struct thread_args *args); int epoll_fd; char *strategy_name; } thread_args; @@ -82,163 +80,116 @@ typedef struct thread_args */ /* Basic call to read() */ -static int -read_bytes (int fd, char *buf, size_t read_size, int spin) -{ +static int read_bytes(int fd, char *buf, size_t read_size, int spin) { size_t bytes_read = 0; int err; - do - { - err = read (fd, buf + bytes_read, read_size - bytes_read); - if (err < 0) - { - if (errno == EINTR) - { - continue; - } - else - { - if (errno == EAGAIN && spin == 1) - { - continue; - } - gpr_log (GPR_ERROR, "Read failed: %s", strerror (errno)); - return -1; - } - } - else - { - bytes_read += err; - } + do { + err = read(fd, buf + bytes_read, read_size - bytes_read); + if (err < 0) { + if (errno == EINTR) { + continue; + } else { + if (errno == EAGAIN && spin == 1) { + continue; + } + gpr_log(GPR_ERROR, "Read failed: %s", strerror(errno)); + return -1; + } + } else { + bytes_read += err; } - while (bytes_read < read_size); + } while (bytes_read < read_size); return 0; } -static int -blocking_read_bytes (thread_args * args, char *buf) -{ - return read_bytes (args->fds.read_fd, buf, args->msg_size, 0); +static int blocking_read_bytes(thread_args *args, char *buf) { + return read_bytes(args->fds.read_fd, buf, args->msg_size, 0); } -static int -spin_read_bytes (thread_args * args, char *buf) -{ - return read_bytes (args->fds.read_fd, buf, args->msg_size, 1); +static int spin_read_bytes(thread_args *args, char *buf) { + return read_bytes(args->fds.read_fd, buf, args->msg_size, 1); } /* Call poll() to monitor a non-blocking fd */ -static int -poll_read_bytes (int fd, char *buf, size_t read_size, int spin) -{ +static int poll_read_bytes(int fd, char *buf, size_t read_size, int spin) { struct pollfd pfd; size_t bytes_read = 0; int err; pfd.fd = fd; pfd.events = POLLIN; - do - { - err = poll (&pfd, 1, spin ? 0 : -1); - if (err < 0) - { - if (errno == EINTR) - { - continue; - } - else - { - gpr_log (GPR_ERROR, "Poll failed: %s", strerror (errno)); - return -1; - } - } - if (err == 0 && spin) - continue; - GPR_ASSERT (err == 1); - GPR_ASSERT (pfd.revents == POLLIN); - do - { - err = read (fd, buf + bytes_read, read_size - bytes_read); - } - while (err < 0 && errno == EINTR); - if (err < 0 && errno != EAGAIN) - { - gpr_log (GPR_ERROR, "Read failed: %s", strerror (errno)); - return -1; - } - bytes_read += err; + do { + err = poll(&pfd, 1, spin ? 0 : -1); + if (err < 0) { + if (errno == EINTR) { + continue; + } else { + gpr_log(GPR_ERROR, "Poll failed: %s", strerror(errno)); + return -1; + } + } + if (err == 0 && spin) continue; + GPR_ASSERT(err == 1); + GPR_ASSERT(pfd.revents == POLLIN); + do { + err = read(fd, buf + bytes_read, read_size - bytes_read); + } while (err < 0 && errno == EINTR); + if (err < 0 && errno != EAGAIN) { + gpr_log(GPR_ERROR, "Read failed: %s", strerror(errno)); + return -1; } - while (bytes_read < read_size); + bytes_read += err; + } while (bytes_read < read_size); return 0; } -static int -poll_read_bytes_blocking (struct thread_args *args, char *buf) -{ - return poll_read_bytes (args->fds.read_fd, buf, args->msg_size, 0); +static int poll_read_bytes_blocking(struct thread_args *args, char *buf) { + return poll_read_bytes(args->fds.read_fd, buf, args->msg_size, 0); } -static int -poll_read_bytes_spin (struct thread_args *args, char *buf) -{ - return poll_read_bytes (args->fds.read_fd, buf, args->msg_size, 1); +static int poll_read_bytes_spin(struct thread_args *args, char *buf) { + return poll_read_bytes(args->fds.read_fd, buf, args->msg_size, 1); } #ifdef __linux__ /* Call epoll_wait() to monitor a non-blocking fd */ -static int -epoll_read_bytes (struct thread_args *args, char *buf, int spin) -{ +static int epoll_read_bytes(struct thread_args *args, char *buf, int spin) { struct epoll_event ev; size_t bytes_read = 0; int err; size_t read_size = args->msg_size; - do - { - err = epoll_wait (args->epoll_fd, &ev, 1, spin ? 0 : -1); - if (err < 0) - { - if (errno == EINTR) - continue; - gpr_log (GPR_ERROR, "epoll_wait failed: %s", strerror (errno)); - return -1; - } - if (err == 0 && spin) - continue; - GPR_ASSERT (err == 1); - GPR_ASSERT (ev.events & EPOLLIN); - GPR_ASSERT (ev.data.fd == args->fds.read_fd); - do - { - do - { - err = read (args->fds.read_fd, buf + bytes_read, read_size - bytes_read); - } - while (err < 0 && errno == EINTR); - if (errno == EAGAIN) - break; - bytes_read += err; - /* TODO(klempner): This should really be doing an extra call after we are - done to ensure we see an EAGAIN */ - } - while (bytes_read < read_size); + do { + err = epoll_wait(args->epoll_fd, &ev, 1, spin ? 0 : -1); + if (err < 0) { + if (errno == EINTR) continue; + gpr_log(GPR_ERROR, "epoll_wait failed: %s", strerror(errno)); + return -1; } - while (bytes_read < read_size); - GPR_ASSERT (bytes_read == read_size); + if (err == 0 && spin) continue; + GPR_ASSERT(err == 1); + GPR_ASSERT(ev.events & EPOLLIN); + GPR_ASSERT(ev.data.fd == args->fds.read_fd); + do { + do { + err = read(args->fds.read_fd, buf + bytes_read, read_size - bytes_read); + } while (err < 0 && errno == EINTR); + if (errno == EAGAIN) break; + bytes_read += err; + /* TODO(klempner): This should really be doing an extra call after we are + done to ensure we see an EAGAIN */ + } while (bytes_read < read_size); + } while (bytes_read < read_size); + GPR_ASSERT(bytes_read == read_size); return 0; } -static int -epoll_read_bytes_blocking (struct thread_args *args, char *buf) -{ - return epoll_read_bytes (args, buf, 0); +static int epoll_read_bytes_blocking(struct thread_args *args, char *buf) { + return epoll_read_bytes(args, buf, 0); } -static int -epoll_read_bytes_spin (struct thread_args *args, char *buf) -{ - return epoll_read_bytes (args, buf, 1); +static int epoll_read_bytes_spin(struct thread_args *args, char *buf) { + return epoll_read_bytes(args, buf, 1); } #endif /* __linux__ */ @@ -246,33 +197,24 @@ epoll_read_bytes_spin (struct thread_args *args, char *buf) At this point we only have one strategy, since in the common case these writes go directly out to the kernel. */ -static int -blocking_write_bytes (struct thread_args *args, char *buf) -{ +static int blocking_write_bytes(struct thread_args *args, char *buf) { size_t bytes_written = 0; int err; size_t write_size = args->msg_size; - do - { - err = write (args->fds.write_fd, buf + bytes_written, write_size - bytes_written); - if (err < 0) - { - if (errno == EINTR) - { - continue; - } - else - { - gpr_log (GPR_ERROR, "Read failed: %s", strerror (errno)); - return -1; - } - } - else - { - bytes_written += err; - } - } - while (bytes_written < write_size); + do { + err = write(args->fds.write_fd, buf + bytes_written, + write_size - bytes_written); + if (err < 0) { + if (errno == EINTR) { + continue; + } else { + gpr_log(GPR_ERROR, "Read failed: %s", strerror(errno)); + return -1; + } + } else { + bytes_written += err; + } + } while (bytes_written < write_size); return 0; } @@ -282,305 +224,250 @@ blocking_write_bytes (struct thread_args *args, char *buf) These are called at the beginning of the client and server thread, depending on the scenario we're using. */ -static int -set_socket_nonblocking (thread_args * args) -{ - if (!grpc_set_socket_nonblocking (args->fds.read_fd, 1)) - { - gpr_log (GPR_ERROR, "Unable to set socket nonblocking: %s", strerror (errno)); - return -1; - } - if (!grpc_set_socket_nonblocking (args->fds.write_fd, 1)) - { - gpr_log (GPR_ERROR, "Unable to set socket nonblocking: %s", strerror (errno)); - return -1; - } +static int set_socket_nonblocking(thread_args *args) { + if (!grpc_set_socket_nonblocking(args->fds.read_fd, 1)) { + gpr_log(GPR_ERROR, "Unable to set socket nonblocking: %s", strerror(errno)); + return -1; + } + if (!grpc_set_socket_nonblocking(args->fds.write_fd, 1)) { + gpr_log(GPR_ERROR, "Unable to set socket nonblocking: %s", strerror(errno)); + return -1; + } return 0; } -static int -do_nothing (thread_args * args) -{ - return 0; -} +static int do_nothing(thread_args *args) { return 0; } #ifdef __linux__ /* Special case for epoll, where we need to create the fd ahead of time. */ -static int -epoll_setup (thread_args * args) -{ +static int epoll_setup(thread_args *args) { int epoll_fd; struct epoll_event ev; - set_socket_nonblocking (args); - epoll_fd = epoll_create (1); - if (epoll_fd < 0) - { - gpr_log (GPR_ERROR, "epoll_create: %s", strerror (errno)); - return -1; - } + set_socket_nonblocking(args); + epoll_fd = epoll_create(1); + if (epoll_fd < 0) { + gpr_log(GPR_ERROR, "epoll_create: %s", strerror(errno)); + return -1; + } args->epoll_fd = epoll_fd; ev.events = EPOLLIN | EPOLLET; ev.data.fd = args->fds.read_fd; - if (epoll_ctl (epoll_fd, EPOLL_CTL_ADD, args->fds.read_fd, &ev) < 0) - { - gpr_log (GPR_ERROR, "epoll_ctl: %s", strerror (errno)); - } + if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, args->fds.read_fd, &ev) < 0) { + gpr_log(GPR_ERROR, "epoll_ctl: %s", strerror(errno)); + } return 0; } #endif -static void -server_thread (thread_args * args) -{ - char *buf = malloc (args->msg_size); - if (args->setup (args) < 0) - { - gpr_log (GPR_ERROR, "Setup failed"); - } - for (;;) - { - if (args->read_bytes (args, buf) < 0) - { - gpr_log (GPR_ERROR, "Server read failed"); - free (buf); - return; - } - if (args->write_bytes (args, buf) < 0) - { - gpr_log (GPR_ERROR, "Server write failed"); - free (buf); - return; - } - } +static void server_thread(thread_args *args) { + char *buf = malloc(args->msg_size); + if (args->setup(args) < 0) { + gpr_log(GPR_ERROR, "Setup failed"); + } + for (;;) { + if (args->read_bytes(args, buf) < 0) { + gpr_log(GPR_ERROR, "Server read failed"); + free(buf); + return; + } + if (args->write_bytes(args, buf) < 0) { + gpr_log(GPR_ERROR, "Server write failed"); + free(buf); + return; + } + } } -static void -server_thread_wrap (void *arg) -{ +static void server_thread_wrap(void *arg) { thread_args *args = arg; - server_thread (args); + server_thread(args); } -static void -print_histogram (gpr_histogram * histogram) -{ +static void print_histogram(gpr_histogram *histogram) { /* TODO(klempner): Print more detailed information, such as detailed histogram buckets */ - gpr_log (GPR_INFO, "latency (50/95/99/99.9): %f/%f/%f/%f", gpr_histogram_percentile (histogram, 50), gpr_histogram_percentile (histogram, 95), gpr_histogram_percentile (histogram, 99), gpr_histogram_percentile (histogram, 99.9)); + gpr_log(GPR_INFO, "latency (50/95/99/99.9): %f/%f/%f/%f", + gpr_histogram_percentile(histogram, 50), + gpr_histogram_percentile(histogram, 95), + gpr_histogram_percentile(histogram, 99), + gpr_histogram_percentile(histogram, 99.9)); } -static double -now (void) -{ - gpr_timespec tv = gpr_now (GPR_CLOCK_REALTIME); +static double now(void) { + gpr_timespec tv = gpr_now(GPR_CLOCK_REALTIME); return 1e9 * tv.tv_sec + tv.tv_nsec; } -static void -client_thread (thread_args * args) -{ - char *buf = calloc (args->msg_size, sizeof (char)); - gpr_histogram *histogram = gpr_histogram_create (0.01, 60e9); +static void client_thread(thread_args *args) { + char *buf = calloc(args->msg_size, sizeof(char)); + gpr_histogram *histogram = gpr_histogram_create(0.01, 60e9); double start_time; double end_time; double interval; const int kNumIters = 100000; int i; - if (args->setup (args) < 0) - { - gpr_log (GPR_ERROR, "Setup failed"); - } - for (i = 0; i < kNumIters; ++i) - { - start_time = now (); - if (args->write_bytes (args, buf) < 0) - { - gpr_log (GPR_ERROR, "Client write failed"); - goto error; - } - if (args->read_bytes (args, buf) < 0) - { - gpr_log (GPR_ERROR, "Client read failed"); - goto error; - } - end_time = now (); - if (i > kNumIters / 2) - { - interval = end_time - start_time; - gpr_histogram_add (histogram, interval); - } - } - print_histogram (histogram); -error: - free (buf); - gpr_histogram_destroy (histogram); -} - -/* This roughly matches tcp_server's create_listening_socket */ -static int -create_listening_socket (struct sockaddr *port, socklen_t len) -{ - int fd = socket (port->sa_family, SOCK_STREAM, 0); - if (fd < 0) - { - gpr_log (GPR_ERROR, "Unable to create socket: %s", strerror (errno)); + if (args->setup(args) < 0) { + gpr_log(GPR_ERROR, "Setup failed"); + } + for (i = 0; i < kNumIters; ++i) { + start_time = now(); + if (args->write_bytes(args, buf) < 0) { + gpr_log(GPR_ERROR, "Client write failed"); goto error; } - - if (!grpc_set_socket_cloexec (fd, 1) || !grpc_set_socket_low_latency (fd, 1) || !grpc_set_socket_reuse_addr (fd, 1)) - { - gpr_log (GPR_ERROR, "Unable to configure socket %d: %s", fd, strerror (errno)); + if (args->read_bytes(args, buf) < 0) { + gpr_log(GPR_ERROR, "Client read failed"); goto error; } - - if (bind (fd, port, len) < 0) - { - gpr_log (GPR_ERROR, "bind: %s", strerror (errno)); - goto error; - } - - if (listen (fd, 1) < 0) - { - gpr_log (GPR_ERROR, "listen: %s", strerror (errno)); - goto error; + end_time = now(); + if (i > kNumIters / 2) { + interval = end_time - start_time; + gpr_histogram_add(histogram, interval); } + } + print_histogram(histogram); +error: + free(buf); + gpr_histogram_destroy(histogram); +} - if (getsockname (fd, port, &len) < 0) - { - gpr_log (GPR_ERROR, "getsockname: %s", strerror (errno)); - goto error; - } +/* This roughly matches tcp_server's create_listening_socket */ +static int create_listening_socket(struct sockaddr *port, socklen_t len) { + int fd = socket(port->sa_family, SOCK_STREAM, 0); + if (fd < 0) { + gpr_log(GPR_ERROR, "Unable to create socket: %s", strerror(errno)); + goto error; + } + + if (!grpc_set_socket_cloexec(fd, 1) || !grpc_set_socket_low_latency(fd, 1) || + !grpc_set_socket_reuse_addr(fd, 1)) { + gpr_log(GPR_ERROR, "Unable to configure socket %d: %s", fd, + strerror(errno)); + goto error; + } + + if (bind(fd, port, len) < 0) { + gpr_log(GPR_ERROR, "bind: %s", strerror(errno)); + goto error; + } + + if (listen(fd, 1) < 0) { + gpr_log(GPR_ERROR, "listen: %s", strerror(errno)); + goto error; + } + + if (getsockname(fd, port, &len) < 0) { + gpr_log(GPR_ERROR, "getsockname: %s", strerror(errno)); + goto error; + } return fd; error: - if (fd >= 0) - { - close (fd); - } + if (fd >= 0) { + close(fd); + } return -1; } -static int -connect_client (struct sockaddr *addr, int len) -{ - int fd = socket (addr->sa_family, SOCK_STREAM, 0); +static int connect_client(struct sockaddr *addr, int len) { + int fd = socket(addr->sa_family, SOCK_STREAM, 0); int err; - if (fd < 0) - { - gpr_log (GPR_ERROR, "Unable to create socket: %s", strerror (errno)); - goto error; - } - - if (!grpc_set_socket_cloexec (fd, 1) || !grpc_set_socket_low_latency (fd, 1)) - { - gpr_log (GPR_ERROR, "Failed to configure socket"); - goto error; - } - - do - { - err = connect (fd, addr, len); - } - while (err < 0 && errno == EINTR); - - if (err < 0) - { - gpr_log (GPR_ERROR, "connect error: %s", strerror (errno)); - goto error; - } + if (fd < 0) { + gpr_log(GPR_ERROR, "Unable to create socket: %s", strerror(errno)); + goto error; + } + + if (!grpc_set_socket_cloexec(fd, 1) || !grpc_set_socket_low_latency(fd, 1)) { + gpr_log(GPR_ERROR, "Failed to configure socket"); + goto error; + } + + do { + err = connect(fd, addr, len); + } while (err < 0 && errno == EINTR); + + if (err < 0) { + gpr_log(GPR_ERROR, "connect error: %s", strerror(errno)); + goto error; + } return fd; error: - if (fd >= 0) - { - close (fd); - } + if (fd >= 0) { + close(fd); + } return -1; } -static int -accept_server (int listen_fd) -{ - int fd = accept (listen_fd, NULL, NULL); - if (fd < 0) - { - gpr_log (GPR_ERROR, "Accept failed: %s", strerror (errno)); - return -1; - } +static int accept_server(int listen_fd) { + int fd = accept(listen_fd, NULL, NULL); + if (fd < 0) { + gpr_log(GPR_ERROR, "Accept failed: %s", strerror(errno)); + return -1; + } return fd; } -static int -create_sockets_tcp (fd_pair * client_fds, fd_pair * server_fds) -{ +static int create_sockets_tcp(fd_pair *client_fds, fd_pair *server_fds) { int listen_fd = -1; int client_fd = -1; int server_fd = -1; struct sockaddr_in port; - struct sockaddr *sa_port = (struct sockaddr *) &port; + struct sockaddr *sa_port = (struct sockaddr *)&port; port.sin_family = AF_INET; port.sin_port = 0; port.sin_addr.s_addr = INADDR_ANY; - listen_fd = create_listening_socket (sa_port, sizeof (port)); - if (listen_fd == -1) - { - gpr_log (GPR_ERROR, "Listen failed"); - goto error; - } + listen_fd = create_listening_socket(sa_port, sizeof(port)); + if (listen_fd == -1) { + gpr_log(GPR_ERROR, "Listen failed"); + goto error; + } - client_fd = connect_client (sa_port, sizeof (port)); - if (client_fd == -1) - { - gpr_log (GPR_ERROR, "Connect failed"); - goto error; - } + client_fd = connect_client(sa_port, sizeof(port)); + if (client_fd == -1) { + gpr_log(GPR_ERROR, "Connect failed"); + goto error; + } - server_fd = accept_server (listen_fd); - if (server_fd == -1) - { - gpr_log (GPR_ERROR, "Accept failed"); - goto error; - } + server_fd = accept_server(listen_fd); + if (server_fd == -1) { + gpr_log(GPR_ERROR, "Accept failed"); + goto error; + } client_fds->read_fd = client_fd; client_fds->write_fd = client_fd; server_fds->read_fd = server_fd; server_fds->write_fd = server_fd; - close (listen_fd); + close(listen_fd); return 0; error: - if (listen_fd != -1) - { - close (listen_fd); - } - if (client_fd != -1) - { - close (client_fd); - } - if (server_fd != -1) - { - close (server_fd); - } + if (listen_fd != -1) { + close(listen_fd); + } + if (client_fd != -1) { + close(client_fd); + } + if (server_fd != -1) { + close(server_fd); + } return -1; } -static int -create_sockets_socketpair (fd_pair * client_fds, fd_pair * server_fds) -{ +static int create_sockets_socketpair(fd_pair *client_fds, fd_pair *server_fds) { int fds[2]; - if (socketpair (AF_UNIX, SOCK_STREAM, 0, fds) < 0) - { - gpr_log (GPR_ERROR, "socketpair: %s", strerror (errno)); - return -1; - } + if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) < 0) { + gpr_log(GPR_ERROR, "socketpair: %s", strerror(errno)); + return -1; + } client_fds->read_fd = fds[0]; client_fds->write_fd = fds[0]; @@ -589,22 +476,18 @@ create_sockets_socketpair (fd_pair * client_fds, fd_pair * server_fds) return 0; } -static int -create_sockets_pipe (fd_pair * client_fds, fd_pair * server_fds) -{ +static int create_sockets_pipe(fd_pair *client_fds, fd_pair *server_fds) { int cfds[2]; int sfds[2]; - if (pipe (cfds) < 0) - { - gpr_log (GPR_ERROR, "pipe: %s", strerror (errno)); - return -1; - } + if (pipe(cfds) < 0) { + gpr_log(GPR_ERROR, "pipe: %s", strerror(errno)); + return -1; + } - if (pipe (sfds) < 0) - { - gpr_log (GPR_ERROR, "pipe: %s", strerror (errno)); - return -1; - } + if (pipe(sfds) < 0) { + gpr_log(GPR_ERROR, "pipe: %s", strerror(errno)); + return -1; + } client_fds->read_fd = cfds[0]; client_fds->write_fd = cfds[1]; @@ -613,142 +496,129 @@ create_sockets_pipe (fd_pair * client_fds, fd_pair * server_fds) return 0; } -static const char *read_strategy_usage = "Strategy for doing reads, which is one of:\n" " blocking: blocking read calls\n" " same_thread_poll: poll() call on same thread \n" +static const char *read_strategy_usage = + "Strategy for doing reads, which is one of:\n" + " blocking: blocking read calls\n" + " same_thread_poll: poll() call on same thread \n" #ifdef __linux__ - " same_thread_epoll: epoll_wait() on same thread \n" + " same_thread_epoll: epoll_wait() on same thread \n" #endif - " spin_read: spinning non-blocking read() calls \n" " spin_poll: spinning 0 timeout poll() calls \n" + " spin_read: spinning non-blocking read() calls \n" + " spin_poll: spinning 0 timeout poll() calls \n" #ifdef __linux__ - " spin_epoll: spinning 0 timeout epoll_wait() calls \n" + " spin_epoll: spinning 0 timeout epoll_wait() calls \n" #endif - ""; - -static const char *socket_type_usage = "Type of socket used, one of:\n" " tcp: fds are endpoints of a TCP connection\n" " socketpair: fds come from socketpair()\n" " pipe: fds come from pipe()\n"; - -void -print_usage (char *argv0) -{ - fprintf (stderr, "%s usage:\n\n", argv0); - fprintf (stderr, "%s read_strategy socket_type msg_size\n\n", argv0); - fprintf (stderr, "where read_strategy is one of:\n"); - fprintf (stderr, " blocking: blocking read calls\n"); - fprintf (stderr, " same_thread_poll: poll() call on same thread \n"); + ""; + +static const char *socket_type_usage = + "Type of socket used, one of:\n" + " tcp: fds are endpoints of a TCP connection\n" + " socketpair: fds come from socketpair()\n" + " pipe: fds come from pipe()\n"; + +void print_usage(char *argv0) { + fprintf(stderr, "%s usage:\n\n", argv0); + fprintf(stderr, "%s read_strategy socket_type msg_size\n\n", argv0); + fprintf(stderr, "where read_strategy is one of:\n"); + fprintf(stderr, " blocking: blocking read calls\n"); + fprintf(stderr, " same_thread_poll: poll() call on same thread \n"); #ifdef __linux__ - fprintf (stderr, " same_thread_epoll: epoll_wait() on same thread \n"); + fprintf(stderr, " same_thread_epoll: epoll_wait() on same thread \n"); #endif - fprintf (stderr, " spin_read: spinning non-blocking read() calls \n"); - fprintf (stderr, " spin_poll: spinning 0 timeout poll() calls \n"); + fprintf(stderr, " spin_read: spinning non-blocking read() calls \n"); + fprintf(stderr, " spin_poll: spinning 0 timeout poll() calls \n"); #ifdef __linux__ - fprintf (stderr, " spin_epoll: spinning 0 timeout epoll_wait() calls \n"); + fprintf(stderr, " spin_epoll: spinning 0 timeout epoll_wait() calls \n"); #endif - fprintf (stderr, "and socket_type is one of:\n"); - fprintf (stderr, " tcp: fds are endpoints of a TCP connection\n"); - fprintf (stderr, " socketpair: fds come from socketpair()\n"); - fprintf (stderr, " pipe: fds come from pipe()\n"); + fprintf(stderr, "and socket_type is one of:\n"); + fprintf(stderr, " tcp: fds are endpoints of a TCP connection\n"); + fprintf(stderr, " socketpair: fds come from socketpair()\n"); + fprintf(stderr, " pipe: fds come from pipe()\n"); } -typedef struct test_strategy -{ +typedef struct test_strategy { char *name; - int (*read_strategy) (struct thread_args * args, char *buf); - int (*setup) (struct thread_args * args); + int (*read_strategy)(struct thread_args *args, char *buf); + int (*setup)(struct thread_args *args); } test_strategy; static test_strategy test_strategies[] = { - {"blocking", blocking_read_bytes, do_nothing}, - {"same_thread_poll", poll_read_bytes_blocking, set_socket_nonblocking}, + {"blocking", blocking_read_bytes, do_nothing}, + {"same_thread_poll", poll_read_bytes_blocking, set_socket_nonblocking}, #ifdef __linux__ - {"same_thread_epoll", epoll_read_bytes_blocking, epoll_setup}, - {"spin_epoll", epoll_read_bytes_spin, epoll_setup}, + {"same_thread_epoll", epoll_read_bytes_blocking, epoll_setup}, + {"spin_epoll", epoll_read_bytes_spin, epoll_setup}, #endif /* __linux__ */ - {"spin_read", spin_read_bytes, set_socket_nonblocking}, - {"spin_poll", poll_read_bytes_spin, set_socket_nonblocking} -}; - -static char *socket_types[] = { "tcp", "socketpair", "pipe" }; - -int -create_socket (char *socket_type, fd_pair * client_fds, fd_pair * server_fds) -{ - if (strcmp (socket_type, "tcp") == 0) - { - create_sockets_tcp (client_fds, server_fds); - } - else if (strcmp (socket_type, "socketpair") == 0) - { - create_sockets_socketpair (client_fds, server_fds); - } - else if (strcmp (socket_type, "pipe") == 0) - { - create_sockets_pipe (client_fds, server_fds); - } - else - { - fprintf (stderr, "Invalid socket type %s\n", socket_type); - return -1; - } + {"spin_read", spin_read_bytes, set_socket_nonblocking}, + {"spin_poll", poll_read_bytes_spin, set_socket_nonblocking}}; + +static char *socket_types[] = {"tcp", "socketpair", "pipe"}; + +int create_socket(char *socket_type, fd_pair *client_fds, fd_pair *server_fds) { + if (strcmp(socket_type, "tcp") == 0) { + create_sockets_tcp(client_fds, server_fds); + } else if (strcmp(socket_type, "socketpair") == 0) { + create_sockets_socketpair(client_fds, server_fds); + } else if (strcmp(socket_type, "pipe") == 0) { + create_sockets_pipe(client_fds, server_fds); + } else { + fprintf(stderr, "Invalid socket type %s\n", socket_type); + return -1; + } return 0; } -static int -run_benchmark (char *socket_type, thread_args * client_args, thread_args * server_args) -{ +static int run_benchmark(char *socket_type, thread_args *client_args, + thread_args *server_args) { gpr_thd_id tid; int rv = 0; - rv = create_socket (socket_type, &client_args->fds, &server_args->fds); - if (rv < 0) - { - return rv; - } + rv = create_socket(socket_type, &client_args->fds, &server_args->fds); + if (rv < 0) { + return rv; + } - gpr_log (GPR_INFO, "Starting test %s %s %d", client_args->strategy_name, socket_type, client_args->msg_size); + gpr_log(GPR_INFO, "Starting test %s %s %d", client_args->strategy_name, + socket_type, client_args->msg_size); - gpr_thd_new (&tid, server_thread_wrap, server_args, NULL); - client_thread (client_args); + gpr_thd_new(&tid, server_thread_wrap, server_args, NULL); + client_thread(client_args); return 0; } -static int -run_all_benchmarks (int msg_size) -{ +static int run_all_benchmarks(int msg_size) { int error = 0; size_t i; - for (i = 0; i < GPR_ARRAY_SIZE (test_strategies); ++i) - { - test_strategy *test_strategy = &test_strategies[i]; - size_t j; - for (j = 0; j < GPR_ARRAY_SIZE (socket_types); ++j) - { - thread_args *client_args = malloc (sizeof (thread_args)); - thread_args *server_args = malloc (sizeof (thread_args)); - char *socket_type = socket_types[j]; - - client_args->read_bytes = test_strategy->read_strategy; - client_args->write_bytes = blocking_write_bytes; - client_args->setup = test_strategy->setup; - client_args->msg_size = msg_size; - client_args->strategy_name = test_strategy->name; - server_args->read_bytes = test_strategy->read_strategy; - server_args->write_bytes = blocking_write_bytes; - server_args->setup = test_strategy->setup; - server_args->msg_size = msg_size; - server_args->strategy_name = test_strategy->name; - error = run_benchmark (socket_type, client_args, server_args); - if (error < 0) - { - return error; - } - } - } + for (i = 0; i < GPR_ARRAY_SIZE(test_strategies); ++i) { + test_strategy *test_strategy = &test_strategies[i]; + size_t j; + for (j = 0; j < GPR_ARRAY_SIZE(socket_types); ++j) { + thread_args *client_args = malloc(sizeof(thread_args)); + thread_args *server_args = malloc(sizeof(thread_args)); + char *socket_type = socket_types[j]; + + client_args->read_bytes = test_strategy->read_strategy; + client_args->write_bytes = blocking_write_bytes; + client_args->setup = test_strategy->setup; + client_args->msg_size = msg_size; + client_args->strategy_name = test_strategy->name; + server_args->read_bytes = test_strategy->read_strategy; + server_args->write_bytes = blocking_write_bytes; + server_args->setup = test_strategy->setup; + server_args->msg_size = msg_size; + server_args->strategy_name = test_strategy->name; + error = run_benchmark(socket_type, client_args, server_args); + if (error < 0) { + return error; + } + } + } return error; } -int -main (int argc, char **argv) -{ - thread_args *client_args = malloc (sizeof (thread_args)); - thread_args *server_args = malloc (sizeof (thread_args)); +int main(int argc, char **argv) { + thread_args *client_args = malloc(sizeof(thread_args)); + thread_args *server_args = malloc(sizeof(thread_args)); int msg_size = -1; char *read_strategy = NULL; char *socket_type = NULL; @@ -756,48 +626,44 @@ main (int argc, char **argv) const test_strategy *test_strategy = NULL; int error = 0; - gpr_cmdline *cmdline = gpr_cmdline_create ("low_level_ping_pong network benchmarking tool"); - - gpr_cmdline_add_int (cmdline, "msg_size", "Size of sent messages", &msg_size); - gpr_cmdline_add_string (cmdline, "read_strategy", read_strategy_usage, &read_strategy); - gpr_cmdline_add_string (cmdline, "socket_type", socket_type_usage, &socket_type); - - gpr_cmdline_parse (cmdline, argc, argv); - - if (msg_size == -1) - { - msg_size = 50; - } - - if (read_strategy == NULL) - { - gpr_log (GPR_INFO, "No strategy specified, running all benchmarks"); - return run_all_benchmarks (msg_size); - } - - if (socket_type == NULL) - { - socket_type = "tcp"; - } - if (msg_size <= 0) - { - fprintf (stderr, "msg_size must be > 0\n"); - print_usage (argv[0]); - return -1; - } - - for (i = 0; i < GPR_ARRAY_SIZE (test_strategies); ++i) - { - if (strcmp (test_strategies[i].name, read_strategy) == 0) - { - test_strategy = &test_strategies[i]; - } - } - if (test_strategy == NULL) - { - fprintf (stderr, "Invalid read strategy %s\n", read_strategy); - return -1; - } + gpr_cmdline *cmdline = + gpr_cmdline_create("low_level_ping_pong network benchmarking tool"); + + gpr_cmdline_add_int(cmdline, "msg_size", "Size of sent messages", &msg_size); + gpr_cmdline_add_string(cmdline, "read_strategy", read_strategy_usage, + &read_strategy); + gpr_cmdline_add_string(cmdline, "socket_type", socket_type_usage, + &socket_type); + + gpr_cmdline_parse(cmdline, argc, argv); + + if (msg_size == -1) { + msg_size = 50; + } + + if (read_strategy == NULL) { + gpr_log(GPR_INFO, "No strategy specified, running all benchmarks"); + return run_all_benchmarks(msg_size); + } + + if (socket_type == NULL) { + socket_type = "tcp"; + } + if (msg_size <= 0) { + fprintf(stderr, "msg_size must be > 0\n"); + print_usage(argv[0]); + return -1; + } + + for (i = 0; i < GPR_ARRAY_SIZE(test_strategies); ++i) { + if (strcmp(test_strategies[i].name, read_strategy) == 0) { + test_strategy = &test_strategies[i]; + } + } + if (test_strategy == NULL) { + fprintf(stderr, "Invalid read strategy %s\n", read_strategy); + return -1; + } client_args->read_bytes = test_strategy->read_strategy; client_args->write_bytes = blocking_write_bytes; @@ -810,8 +676,8 @@ main (int argc, char **argv) server_args->msg_size = msg_size; server_args->strategy_name = read_strategy; - error = run_benchmark (socket_type, client_args, server_args); + error = run_benchmark(socket_type, client_args, server_args); - gpr_cmdline_destroy (cmdline); + gpr_cmdline_destroy(cmdline); return error; } diff --git a/test/core/profiling/timers_test.c b/test/core/profiling/timers_test.c index 6017f130ddc..b79cde64bdb 100644 --- a/test/core/profiling/timers_test.c +++ b/test/core/profiling/timers_test.c @@ -35,58 +35,49 @@ #include #include "test/core/util/test_config.h" -void -test_log_events (size_t num_seqs) -{ +void test_log_events(size_t num_seqs) { size_t start = 0; size_t *state; - state = calloc (num_seqs, sizeof (state[0])); - while (start < num_seqs) - { - size_t i; - size_t row; - if (state[start] == 3) - { /* Already done with this posn */ - start++; - continue; - } + state = calloc(num_seqs, sizeof(state[0])); + while (start < num_seqs) { + size_t i; + size_t row; + if (state[start] == 3) { /* Already done with this posn */ + start++; + continue; + } - row = (size_t) rand () % 10; /* how many in a row */ - for (i = start; (i < start + row) && (i < num_seqs); i++) - { - size_t j; - size_t advance = 1 + (size_t) rand () % 3; /* how many to advance by */ - for (j = 0; j < advance; j++) - { - switch (state[i]) - { - case 0: - GRPC_TIMER_MARK (STATE_0, i); - state[i]++; - break; - case 1: - GRPC_TIMER_MARK (STATE_1, i); - state[i]++; - break; - case 2: - GRPC_TIMER_MARK (STATE_2, i); - state[i]++; - break; - case 3: - break; - } - } - } + row = (size_t)rand() % 10; /* how many in a row */ + for (i = start; (i < start + row) && (i < num_seqs); i++) { + size_t j; + size_t advance = 1 + (size_t)rand() % 3; /* how many to advance by */ + for (j = 0; j < advance; j++) { + switch (state[i]) { + case 0: + GRPC_TIMER_MARK(STATE_0, i); + state[i]++; + break; + case 1: + GRPC_TIMER_MARK(STATE_1, i); + state[i]++; + break; + case 2: + GRPC_TIMER_MARK(STATE_2, i); + state[i]++; + break; + case 3: + break; + } + } } - free (state); + } + free(state); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - grpc_timers_global_init (); - test_log_events (1000000); - grpc_timers_global_destroy (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + grpc_timers_global_init(); + test_log_events(1000000); + grpc_timers_global_destroy(); return 0; } diff --git a/test/core/security/auth_context_test.c b/test/core/security/auth_context_test.c index 9b58b3533ad..d091c7e7e63 100644 --- a/test/core/security/auth_context_test.c +++ b/test/core/security/auth_context_test.c @@ -39,113 +39,115 @@ #include -static void -test_empty_context (void) -{ - grpc_auth_context *ctx = grpc_auth_context_create (NULL); +static void test_empty_context(void) { + grpc_auth_context *ctx = grpc_auth_context_create(NULL); grpc_auth_property_iterator it; - gpr_log (GPR_INFO, "test_empty_context"); - GPR_ASSERT (ctx != NULL); - GPR_ASSERT (grpc_auth_context_peer_identity_property_name (ctx) == NULL); - it = grpc_auth_context_peer_identity (ctx); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); - it = grpc_auth_context_property_iterator (ctx); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); - it = grpc_auth_context_find_properties_by_name (ctx, "foo"); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); - GPR_ASSERT (grpc_auth_context_set_peer_identity_property_name (ctx, "bar") == 0); - GPR_ASSERT (grpc_auth_context_peer_identity_property_name (ctx) == NULL); - GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); + gpr_log(GPR_INFO, "test_empty_context"); + GPR_ASSERT(ctx != NULL); + GPR_ASSERT(grpc_auth_context_peer_identity_property_name(ctx) == NULL); + it = grpc_auth_context_peer_identity(ctx); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); + it = grpc_auth_context_property_iterator(ctx); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); + it = grpc_auth_context_find_properties_by_name(ctx, "foo"); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); + GPR_ASSERT(grpc_auth_context_set_peer_identity_property_name(ctx, "bar") == + 0); + GPR_ASSERT(grpc_auth_context_peer_identity_property_name(ctx) == NULL); + GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); } -static void -test_simple_context (void) -{ - grpc_auth_context *ctx = grpc_auth_context_create (NULL); +static void test_simple_context(void) { + grpc_auth_context *ctx = grpc_auth_context_create(NULL); grpc_auth_property_iterator it; size_t i; - gpr_log (GPR_INFO, "test_simple_context"); - GPR_ASSERT (ctx != NULL); - grpc_auth_context_add_cstring_property (ctx, "name", "chapi"); - grpc_auth_context_add_cstring_property (ctx, "name", "chapo"); - grpc_auth_context_add_cstring_property (ctx, "foo", "bar"); - GPR_ASSERT (ctx->properties.count == 3); - GPR_ASSERT (grpc_auth_context_set_peer_identity_property_name (ctx, "name") == 1); - - GPR_ASSERT (strcmp (grpc_auth_context_peer_identity_property_name (ctx), "name") == 0); - it = grpc_auth_context_property_iterator (ctx); - for (i = 0; i < ctx->properties.count; i++) - { - const grpc_auth_property *p = grpc_auth_property_iterator_next (&it); - GPR_ASSERT (p == &ctx->properties.array[i]); - } - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); - - it = grpc_auth_context_find_properties_by_name (ctx, "foo"); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &ctx->properties.array[2]); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); - - it = grpc_auth_context_peer_identity (ctx); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &ctx->properties.array[0]); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &ctx->properties.array[1]); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); - - GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); + gpr_log(GPR_INFO, "test_simple_context"); + GPR_ASSERT(ctx != NULL); + grpc_auth_context_add_cstring_property(ctx, "name", "chapi"); + grpc_auth_context_add_cstring_property(ctx, "name", "chapo"); + grpc_auth_context_add_cstring_property(ctx, "foo", "bar"); + GPR_ASSERT(ctx->properties.count == 3); + GPR_ASSERT(grpc_auth_context_set_peer_identity_property_name(ctx, "name") == + 1); + + GPR_ASSERT( + strcmp(grpc_auth_context_peer_identity_property_name(ctx), "name") == 0); + it = grpc_auth_context_property_iterator(ctx); + for (i = 0; i < ctx->properties.count; i++) { + const grpc_auth_property *p = grpc_auth_property_iterator_next(&it); + GPR_ASSERT(p == &ctx->properties.array[i]); + } + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); + + it = grpc_auth_context_find_properties_by_name(ctx, "foo"); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == + &ctx->properties.array[2]); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); + + it = grpc_auth_context_peer_identity(ctx); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == + &ctx->properties.array[0]); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == + &ctx->properties.array[1]); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); + + GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); } -static void -test_chained_context (void) -{ - grpc_auth_context *chained = grpc_auth_context_create (NULL); - grpc_auth_context *ctx = grpc_auth_context_create (chained); +static void test_chained_context(void) { + grpc_auth_context *chained = grpc_auth_context_create(NULL); + grpc_auth_context *ctx = grpc_auth_context_create(chained); grpc_auth_property_iterator it; size_t i; - gpr_log (GPR_INFO, "test_chained_context"); - GRPC_AUTH_CONTEXT_UNREF (chained, "chained"); - grpc_auth_context_add_cstring_property (chained, "name", "padapo"); - grpc_auth_context_add_cstring_property (chained, "foo", "baz"); - grpc_auth_context_add_cstring_property (ctx, "name", "chapi"); - grpc_auth_context_add_cstring_property (ctx, "name", "chap0"); - grpc_auth_context_add_cstring_property (ctx, "foo", "bar"); - GPR_ASSERT (grpc_auth_context_set_peer_identity_property_name (ctx, "name") == 1); - - GPR_ASSERT (strcmp (grpc_auth_context_peer_identity_property_name (ctx), "name") == 0); - it = grpc_auth_context_property_iterator (ctx); - for (i = 0; i < ctx->properties.count; i++) - { - const grpc_auth_property *p = grpc_auth_property_iterator_next (&it); - GPR_ASSERT (p == &ctx->properties.array[i]); - } - for (i = 0; i < chained->properties.count; i++) - { - const grpc_auth_property *p = grpc_auth_property_iterator_next (&it); - GPR_ASSERT (p == &chained->properties.array[i]); - } - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); - - it = grpc_auth_context_find_properties_by_name (ctx, "foo"); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &ctx->properties.array[2]); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &chained->properties.array[1]); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); - - it = grpc_auth_context_peer_identity (ctx); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &ctx->properties.array[0]); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &ctx->properties.array[1]); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == &chained->properties.array[0]); - GPR_ASSERT (grpc_auth_property_iterator_next (&it) == NULL); - - GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); + gpr_log(GPR_INFO, "test_chained_context"); + GRPC_AUTH_CONTEXT_UNREF(chained, "chained"); + grpc_auth_context_add_cstring_property(chained, "name", "padapo"); + grpc_auth_context_add_cstring_property(chained, "foo", "baz"); + grpc_auth_context_add_cstring_property(ctx, "name", "chapi"); + grpc_auth_context_add_cstring_property(ctx, "name", "chap0"); + grpc_auth_context_add_cstring_property(ctx, "foo", "bar"); + GPR_ASSERT(grpc_auth_context_set_peer_identity_property_name(ctx, "name") == + 1); + + GPR_ASSERT( + strcmp(grpc_auth_context_peer_identity_property_name(ctx), "name") == 0); + it = grpc_auth_context_property_iterator(ctx); + for (i = 0; i < ctx->properties.count; i++) { + const grpc_auth_property *p = grpc_auth_property_iterator_next(&it); + GPR_ASSERT(p == &ctx->properties.array[i]); + } + for (i = 0; i < chained->properties.count; i++) { + const grpc_auth_property *p = grpc_auth_property_iterator_next(&it); + GPR_ASSERT(p == &chained->properties.array[i]); + } + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); + + it = grpc_auth_context_find_properties_by_name(ctx, "foo"); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == + &ctx->properties.array[2]); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == + &chained->properties.array[1]); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); + + it = grpc_auth_context_peer_identity(ctx); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == + &ctx->properties.array[0]); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == + &ctx->properties.array[1]); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == + &chained->properties.array[0]); + GPR_ASSERT(grpc_auth_property_iterator_next(&it) == NULL); + + GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_empty_context (); - test_simple_context (); - test_chained_context (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_empty_context(); + test_simple_context(); + test_chained_context(); return 0; } diff --git a/test/core/security/base64_test.c b/test/core/security/base64_test.c index a8471c69e31..a8f784d4fad 100644 --- a/test/core/security/base64_test.c +++ b/test/core/security/base64_test.c @@ -40,215 +40,185 @@ #include #include "test/core/util/test_config.h" -static int -buffers_are_equal (const unsigned char *buf1, const unsigned char *buf2, size_t size) -{ +static int buffers_are_equal(const unsigned char *buf1, + const unsigned char *buf2, size_t size) { size_t i; - for (i = 0; i < size; i++) - { - if (buf1[i] != buf2[i]) - { - gpr_log (GPR_ERROR, "buf1 and buf2 differ: buf1[%d] = %x vs buf2[%d] = %x", (int) i, buf1[i], (int) i, buf2[i]); - return 0; - } + for (i = 0; i < size; i++) { + if (buf1[i] != buf2[i]) { + gpr_log(GPR_ERROR, "buf1 and buf2 differ: buf1[%d] = %x vs buf2[%d] = %x", + (int)i, buf1[i], (int)i, buf2[i]); + return 0; } + } return 1; } -static void -test_simple_encode_decode_b64 (int url_safe, int multiline) -{ +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); - gpr_slice hello_slice = grpc_base64_decode (hello_b64, url_safe); - GPR_ASSERT (GPR_SLICE_LENGTH (hello_slice) == strlen (hello)); - GPR_ASSERT (strncmp ((const char *) GPR_SLICE_START_PTR (hello_slice), hello, GPR_SLICE_LENGTH (hello_slice)) == 0); - - gpr_slice_unref (hello_slice); - gpr_free (hello_b64); + char *hello_b64 = + grpc_base64_encode(hello, strlen(hello), url_safe, multiline); + gpr_slice hello_slice = grpc_base64_decode(hello_b64, url_safe); + GPR_ASSERT(GPR_SLICE_LENGTH(hello_slice) == strlen(hello)); + GPR_ASSERT(strncmp((const char *)GPR_SLICE_START_PTR(hello_slice), hello, + GPR_SLICE_LENGTH(hello_slice)) == 0); + + gpr_slice_unref(hello_slice); + gpr_free(hello_b64); } -static void -test_full_range_encode_decode_b64 (int url_safe, int multiline) -{ +static void test_full_range_encode_decode_b64(int url_safe, int multiline) { unsigned char orig[256]; size_t i; char *b64; gpr_slice orig_decoded; - for (i = 0; i < sizeof (orig); i++) - orig[i] = (gpr_uint8) i; + for (i = 0; i < sizeof(orig); i++) orig[i] = (gpr_uint8)i; /* Try all the different paddings. */ - for (i = 0; i < 3; i++) - { - b64 = grpc_base64_encode (orig, sizeof (orig) - i, url_safe, multiline); - orig_decoded = grpc_base64_decode (b64, url_safe); - GPR_ASSERT (GPR_SLICE_LENGTH (orig_decoded) == (sizeof (orig) - i)); - GPR_ASSERT (buffers_are_equal (orig, GPR_SLICE_START_PTR (orig_decoded), sizeof (orig) - i)); - gpr_slice_unref (orig_decoded); - gpr_free (b64); - } + for (i = 0; i < 3; i++) { + b64 = grpc_base64_encode(orig, sizeof(orig) - i, url_safe, multiline); + orig_decoded = grpc_base64_decode(b64, url_safe); + GPR_ASSERT(GPR_SLICE_LENGTH(orig_decoded) == (sizeof(orig) - i)); + GPR_ASSERT(buffers_are_equal(orig, GPR_SLICE_START_PTR(orig_decoded), + sizeof(orig) - i)); + gpr_slice_unref(orig_decoded); + gpr_free(b64); + } } -static void -test_simple_encode_decode_b64_no_multiline (void) -{ - test_simple_encode_decode_b64 (0, 0); +static void test_simple_encode_decode_b64_no_multiline(void) { + test_simple_encode_decode_b64(0, 0); } -static void -test_simple_encode_decode_b64_multiline (void) -{ - test_simple_encode_decode_b64 (0, 1); +static void test_simple_encode_decode_b64_multiline(void) { + test_simple_encode_decode_b64(0, 1); } -static void -test_simple_encode_decode_b64_urlsafe_no_multiline (void) -{ - test_simple_encode_decode_b64 (1, 0); +static void test_simple_encode_decode_b64_urlsafe_no_multiline(void) { + test_simple_encode_decode_b64(1, 0); } -static void -test_simple_encode_decode_b64_urlsafe_multiline (void) -{ - test_simple_encode_decode_b64 (1, 1); +static void test_simple_encode_decode_b64_urlsafe_multiline(void) { + test_simple_encode_decode_b64(1, 1); } -static void -test_full_range_encode_decode_b64_no_multiline (void) -{ - test_full_range_encode_decode_b64 (0, 0); +static void test_full_range_encode_decode_b64_no_multiline(void) { + test_full_range_encode_decode_b64(0, 0); } -static void -test_full_range_encode_decode_b64_multiline (void) -{ - test_full_range_encode_decode_b64 (0, 1); +static void test_full_range_encode_decode_b64_multiline(void) { + test_full_range_encode_decode_b64(0, 1); } -static void -test_full_range_encode_decode_b64_urlsafe_no_multiline (void) -{ - test_full_range_encode_decode_b64 (1, 0); +static void test_full_range_encode_decode_b64_urlsafe_no_multiline(void) { + test_full_range_encode_decode_b64(1, 0); } -static void -test_full_range_encode_decode_b64_urlsafe_multiline (void) -{ - test_full_range_encode_decode_b64 (1, 1); +static void test_full_range_encode_decode_b64_urlsafe_multiline(void) { + test_full_range_encode_decode_b64(1, 1); } -static void -test_url_safe_unsafe_mismtach_failure (void) -{ +static void test_url_safe_unsafe_mismtach_failure(void) { unsigned char orig[256]; size_t i; char *b64; gpr_slice orig_decoded; int url_safe = 1; - for (i = 0; i < sizeof (orig); i++) - orig[i] = (gpr_uint8) i; - - b64 = grpc_base64_encode (orig, sizeof (orig), url_safe, 0); - orig_decoded = grpc_base64_decode (b64, !url_safe); - GPR_ASSERT (GPR_SLICE_IS_EMPTY (orig_decoded)); - gpr_free (b64); - gpr_slice_unref (orig_decoded); - - b64 = grpc_base64_encode (orig, sizeof (orig), !url_safe, 0); - orig_decoded = grpc_base64_decode (b64, url_safe); - GPR_ASSERT (GPR_SLICE_IS_EMPTY (orig_decoded)); - gpr_free (b64); - gpr_slice_unref (orig_decoded); + for (i = 0; i < sizeof(orig); i++) orig[i] = (gpr_uint8)i; + + b64 = grpc_base64_encode(orig, sizeof(orig), url_safe, 0); + orig_decoded = grpc_base64_decode(b64, !url_safe); + GPR_ASSERT(GPR_SLICE_IS_EMPTY(orig_decoded)); + gpr_free(b64); + gpr_slice_unref(orig_decoded); + + b64 = grpc_base64_encode(orig, sizeof(orig), !url_safe, 0); + orig_decoded = grpc_base64_decode(b64, url_safe); + GPR_ASSERT(GPR_SLICE_IS_EMPTY(orig_decoded)); + gpr_free(b64); + gpr_slice_unref(orig_decoded); } -static void -test_rfc4648_test_vectors (void) -{ +static void test_rfc4648_test_vectors(void) { char *b64; - b64 = grpc_base64_encode ("", 0, 0, 0); - GPR_ASSERT (strcmp ("", b64) == 0); - gpr_free (b64); + b64 = grpc_base64_encode("", 0, 0, 0); + GPR_ASSERT(strcmp("", b64) == 0); + gpr_free(b64); - b64 = grpc_base64_encode ("f", 1, 0, 0); - GPR_ASSERT (strcmp ("Zg==", b64) == 0); - gpr_free (b64); + b64 = grpc_base64_encode("f", 1, 0, 0); + GPR_ASSERT(strcmp("Zg==", b64) == 0); + gpr_free(b64); - b64 = grpc_base64_encode ("fo", 2, 0, 0); - GPR_ASSERT (strcmp ("Zm8=", b64) == 0); - gpr_free (b64); + b64 = grpc_base64_encode("fo", 2, 0, 0); + GPR_ASSERT(strcmp("Zm8=", b64) == 0); + gpr_free(b64); - b64 = grpc_base64_encode ("foo", 3, 0, 0); - GPR_ASSERT (strcmp ("Zm9v", b64) == 0); - gpr_free (b64); + b64 = grpc_base64_encode("foo", 3, 0, 0); + GPR_ASSERT(strcmp("Zm9v", b64) == 0); + gpr_free(b64); - b64 = grpc_base64_encode ("foob", 4, 0, 0); - GPR_ASSERT (strcmp ("Zm9vYg==", b64) == 0); - gpr_free (b64); + b64 = grpc_base64_encode("foob", 4, 0, 0); + GPR_ASSERT(strcmp("Zm9vYg==", b64) == 0); + gpr_free(b64); - b64 = grpc_base64_encode ("fooba", 5, 0, 0); - GPR_ASSERT (strcmp ("Zm9vYmE=", b64) == 0); - gpr_free (b64); + b64 = grpc_base64_encode("fooba", 5, 0, 0); + GPR_ASSERT(strcmp("Zm9vYmE=", b64) == 0); + gpr_free(b64); - b64 = grpc_base64_encode ("foobar", 6, 0, 0); - GPR_ASSERT (strcmp ("Zm9vYmFy", b64) == 0); - gpr_free (b64); + b64 = grpc_base64_encode("foobar", 6, 0, 0); + GPR_ASSERT(strcmp("Zm9vYmFy", b64) == 0); + gpr_free(b64); } -static void -test_unpadded_decode (void) -{ +static void test_unpadded_decode(void) { gpr_slice decoded; - decoded = grpc_base64_decode ("Zm9vYmFy", 0); - GPR_ASSERT (!GPR_SLICE_IS_EMPTY (decoded)); - GPR_ASSERT (gpr_slice_str_cmp (decoded, "foobar") == 0); - gpr_slice_unref (decoded); - - decoded = grpc_base64_decode ("Zm9vYmE", 0); - GPR_ASSERT (!GPR_SLICE_IS_EMPTY (decoded)); - GPR_ASSERT (gpr_slice_str_cmp (decoded, "fooba") == 0); - gpr_slice_unref (decoded); - - decoded = grpc_base64_decode ("Zm9vYg", 0); - GPR_ASSERT (!GPR_SLICE_IS_EMPTY (decoded)); - GPR_ASSERT (gpr_slice_str_cmp (decoded, "foob") == 0); - gpr_slice_unref (decoded); - - decoded = grpc_base64_decode ("Zm9v", 0); - GPR_ASSERT (!GPR_SLICE_IS_EMPTY (decoded)); - GPR_ASSERT (gpr_slice_str_cmp (decoded, "foo") == 0); - gpr_slice_unref (decoded); - - decoded = grpc_base64_decode ("Zm8", 0); - GPR_ASSERT (!GPR_SLICE_IS_EMPTY (decoded)); - GPR_ASSERT (gpr_slice_str_cmp (decoded, "fo") == 0); - gpr_slice_unref (decoded); - - decoded = grpc_base64_decode ("Zg", 0); - GPR_ASSERT (!GPR_SLICE_IS_EMPTY (decoded)); - GPR_ASSERT (gpr_slice_str_cmp (decoded, "f") == 0); - gpr_slice_unref (decoded); - - decoded = grpc_base64_decode ("", 0); - GPR_ASSERT (GPR_SLICE_IS_EMPTY (decoded)); + decoded = grpc_base64_decode("Zm9vYmFy", 0); + GPR_ASSERT(!GPR_SLICE_IS_EMPTY(decoded)); + GPR_ASSERT(gpr_slice_str_cmp(decoded, "foobar") == 0); + gpr_slice_unref(decoded); + + decoded = grpc_base64_decode("Zm9vYmE", 0); + GPR_ASSERT(!GPR_SLICE_IS_EMPTY(decoded)); + GPR_ASSERT(gpr_slice_str_cmp(decoded, "fooba") == 0); + gpr_slice_unref(decoded); + + decoded = grpc_base64_decode("Zm9vYg", 0); + GPR_ASSERT(!GPR_SLICE_IS_EMPTY(decoded)); + GPR_ASSERT(gpr_slice_str_cmp(decoded, "foob") == 0); + gpr_slice_unref(decoded); + + decoded = grpc_base64_decode("Zm9v", 0); + GPR_ASSERT(!GPR_SLICE_IS_EMPTY(decoded)); + GPR_ASSERT(gpr_slice_str_cmp(decoded, "foo") == 0); + gpr_slice_unref(decoded); + + decoded = grpc_base64_decode("Zm8", 0); + GPR_ASSERT(!GPR_SLICE_IS_EMPTY(decoded)); + GPR_ASSERT(gpr_slice_str_cmp(decoded, "fo") == 0); + gpr_slice_unref(decoded); + + decoded = grpc_base64_decode("Zg", 0); + GPR_ASSERT(!GPR_SLICE_IS_EMPTY(decoded)); + GPR_ASSERT(gpr_slice_str_cmp(decoded, "f") == 0); + gpr_slice_unref(decoded); + + decoded = grpc_base64_decode("", 0); + GPR_ASSERT(GPR_SLICE_IS_EMPTY(decoded)); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_simple_encode_decode_b64_no_multiline (); - test_simple_encode_decode_b64_multiline (); - test_simple_encode_decode_b64_urlsafe_no_multiline (); - test_simple_encode_decode_b64_urlsafe_multiline (); - test_full_range_encode_decode_b64_no_multiline (); - test_full_range_encode_decode_b64_multiline (); - test_full_range_encode_decode_b64_urlsafe_no_multiline (); - test_full_range_encode_decode_b64_urlsafe_multiline (); - test_url_safe_unsafe_mismtach_failure (); - test_rfc4648_test_vectors (); - test_unpadded_decode (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_simple_encode_decode_b64_no_multiline(); + test_simple_encode_decode_b64_multiline(); + test_simple_encode_decode_b64_urlsafe_no_multiline(); + test_simple_encode_decode_b64_urlsafe_multiline(); + test_full_range_encode_decode_b64_no_multiline(); + test_full_range_encode_decode_b64_multiline(); + test_full_range_encode_decode_b64_urlsafe_no_multiline(); + test_full_range_encode_decode_b64_urlsafe_multiline(); + test_url_safe_unsafe_mismtach_failure(); + test_rfc4648_test_vectors(); + test_unpadded_decode(); return 0; } diff --git a/test/core/security/create_jwt.c b/test/core/security/create_jwt.c index 47cc26cefa0..b02469fb351 100644 --- a/test/core/security/create_jwt.c +++ b/test/core/security/create_jwt.c @@ -43,69 +43,68 @@ #include #include -void -create_jwt (const char *json_key_file_path, const char *service_url, const char *scope) -{ +void create_jwt(const char *json_key_file_path, const char *service_url, + const char *scope) { grpc_auth_json_key key; int ok = 0; char *jwt; - gpr_slice json_key_data = gpr_load_file (json_key_file_path, 1, &ok); - if (!ok) - { - fprintf (stderr, "Could not read %s.\n", json_key_file_path); - exit (1); - } - key = grpc_auth_json_key_create_from_string ((const char *) GPR_SLICE_START_PTR (json_key_data)); - gpr_slice_unref (json_key_data); - if (!grpc_auth_json_key_is_valid (&key)) - { - fprintf (stderr, "Could not parse json key.\n"); - exit (1); - } - jwt = grpc_jwt_encode_and_sign (&key, service_url == NULL ? GRPC_JWT_OAUTH2_AUDIENCE : service_url, grpc_max_auth_token_lifetime, scope); - grpc_auth_json_key_destruct (&key); - if (jwt == NULL) - { - fprintf (stderr, "Could not create JWT.\n"); - exit (1); - } - fprintf (stdout, "%s\n", jwt); - gpr_free (jwt); + gpr_slice json_key_data = gpr_load_file(json_key_file_path, 1, &ok); + if (!ok) { + fprintf(stderr, "Could not read %s.\n", json_key_file_path); + exit(1); + } + key = grpc_auth_json_key_create_from_string( + (const char *)GPR_SLICE_START_PTR(json_key_data)); + gpr_slice_unref(json_key_data); + if (!grpc_auth_json_key_is_valid(&key)) { + fprintf(stderr, "Could not parse json key.\n"); + exit(1); + } + jwt = grpc_jwt_encode_and_sign( + &key, service_url == NULL ? GRPC_JWT_OAUTH2_AUDIENCE : service_url, + grpc_max_auth_token_lifetime, scope); + grpc_auth_json_key_destruct(&key); + if (jwt == NULL) { + fprintf(stderr, "Could not create JWT.\n"); + exit(1); + } + fprintf(stdout, "%s\n", jwt); + gpr_free(jwt); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { char *scope = NULL; char *json_key_file_path = NULL; char *service_url = NULL; - gpr_cmdline *cl = gpr_cmdline_create ("create_jwt"); - gpr_cmdline_add_string (cl, "json_key", "File path of the json key.", &json_key_file_path); - gpr_cmdline_add_string (cl, "scope", "OPTIONAL Space delimited permissions. Mutually " "exclusive with service_url", &scope); - gpr_cmdline_add_string (cl, "service_url", "OPTIONAL service URL. Mutually exclusive with scope.", &service_url); - gpr_cmdline_parse (cl, argc, argv); + gpr_cmdline *cl = gpr_cmdline_create("create_jwt"); + gpr_cmdline_add_string(cl, "json_key", "File path of the json key.", + &json_key_file_path); + gpr_cmdline_add_string(cl, "scope", + "OPTIONAL Space delimited permissions. Mutually " + "exclusive with service_url", + &scope); + gpr_cmdline_add_string(cl, "service_url", + "OPTIONAL service URL. Mutually exclusive with scope.", + &service_url); + gpr_cmdline_parse(cl, argc, argv); - if (json_key_file_path == NULL) - { - fprintf (stderr, "Missing --json_key option.\n"); - exit (1); - } - if (scope != NULL) - { - if (service_url != NULL) - { - fprintf (stderr, "Options --scope and --service_url are mutually exclusive.\n"); - exit (1); - } - } - else if (service_url == NULL) - { - fprintf (stderr, "Need one of --service_url or --scope options.\n"); - exit (1); + if (json_key_file_path == NULL) { + fprintf(stderr, "Missing --json_key option.\n"); + exit(1); + } + if (scope != NULL) { + if (service_url != NULL) { + fprintf(stderr, + "Options --scope and --service_url are mutually exclusive.\n"); + exit(1); } + } else if (service_url == NULL) { + fprintf(stderr, "Need one of --service_url or --scope options.\n"); + exit(1); + } - create_jwt (json_key_file_path, service_url, scope); + create_jwt(json_key_file_path, service_url, scope); - gpr_cmdline_destroy (cl); + gpr_cmdline_destroy(cl); return 0; } diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index b34feabfe53..7d19d5ae85b 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -52,797 +52,888 @@ static const char test_google_iam_authorization_token[] = "blahblahblhahb"; static const char test_google_iam_authority_selector[] = "respectmyauthoritah"; -static const char test_oauth2_bearer_token[] = "Bearer blaaslkdjfaslkdfasdsfasf"; +static const char test_oauth2_bearer_token[] = + "Bearer blaaslkdjfaslkdfasdsfasf"; static const char test_root_cert[] = "I am the root!"; /* This JSON key was generated with the GCE console and revoked immediately. The identifiers have been changed as well. Maximum size for a string literal is 509 chars in C89, yay! */ -static const char test_json_key_str_part1[] = "{ \"private_key\": \"-----BEGIN PRIVATE KEY-----" "\\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOEvJsnoHnyHkXcp\\n7mJE" "qg" "WGjiw71NfXByguekSKho65FxaGbsnSM9SMQAqVk7Q2rG+I0OpsT0LrWQtZ\\nyjSeg/" "rWBQvS4hle4LfijkP3J5BG+" "IXDMP8RfziNRQsenAXDNPkY4kJCvKux2xdD\\nOnVF6N7dL3nTYZg+" "uQrNsMTz9UxVAgMBAAECgYEAzbLewe1xe9vy+2GoSsfib+28\\nDZgSE6Bu/" "zuFoPrRc6qL9p2SsnV7txrunTyJkkOnPLND9ABAXybRTlcVKP/sGgza\\n/" "8HpCqFYM9V8f34SBWfD4fRFT+n/" "73cfRUtGXdXpseva2lh8RilIQfPhNZAncenU\\ngqXjDvpkypEusgXAykECQQD+"; -static const char test_json_key_str_part2[] = "53XxNVnxBHsYb+AYEfklR96yVi8HywjVHP34+OQZ\\nCslxoHQM8s+" "dBnjfScLu22JqkPv04xyxmt0QAKm9+vTdAkEA4ib7YvEAn2jXzcCI\\nEkoy2L/" "XydR1GCHoacdfdAwiL2npOdnbvi4ZmdYRPY1LSTO058tQHKVXV7NLeCa3\\nAARh2QJBAMKeDA" "G" "W303SQv2cZTdbeaLKJbB5drz3eo3j7dDKjrTD9JupixFbzcGw\\n8FZi5c8idxiwC36kbAL6Hz" "A" "ZoX+ofI0CQE6KCzPJTtYNqyShgKAZdJ8hwOcvCZtf\\n6z8RJm0+" "6YBd38lfh5j8mZd7aHFf6I17j5AQY7oPEc47TjJj/" "5nZ68ECQQDvYuI3\\nLyK5fS8g0SYbmPOL9TlcHDOqwG0mrX9qpg5DC2fniXNSrrZ64GTDKdzZ" "Y" "Ap6LI9W\\nIqv4vr6y38N79TTC\\n-----END PRIVATE KEY-----\\n\", "; -static const char test_json_key_str_part3[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; +static const char test_json_key_str_part1[] = + "{ \"private_key\": \"-----BEGIN PRIVATE KEY-----" + "\\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOEvJsnoHnyHkXcp\\n7mJE" + "qg" + "WGjiw71NfXByguekSKho65FxaGbsnSM9SMQAqVk7Q2rG+I0OpsT0LrWQtZ\\nyjSeg/" + "rWBQvS4hle4LfijkP3J5BG+" + "IXDMP8RfziNRQsenAXDNPkY4kJCvKux2xdD\\nOnVF6N7dL3nTYZg+" + "uQrNsMTz9UxVAgMBAAECgYEAzbLewe1xe9vy+2GoSsfib+28\\nDZgSE6Bu/" + "zuFoPrRc6qL9p2SsnV7txrunTyJkkOnPLND9ABAXybRTlcVKP/sGgza\\n/" + "8HpCqFYM9V8f34SBWfD4fRFT+n/" + "73cfRUtGXdXpseva2lh8RilIQfPhNZAncenU\\ngqXjDvpkypEusgXAykECQQD+"; +static const char test_json_key_str_part2[] = + "53XxNVnxBHsYb+AYEfklR96yVi8HywjVHP34+OQZ\\nCslxoHQM8s+" + "dBnjfScLu22JqkPv04xyxmt0QAKm9+vTdAkEA4ib7YvEAn2jXzcCI\\nEkoy2L/" + "XydR1GCHoacdfdAwiL2npOdnbvi4ZmdYRPY1LSTO058tQHKVXV7NLeCa3\\nAARh2QJBAMKeDA" + "G" + "W303SQv2cZTdbeaLKJbB5drz3eo3j7dDKjrTD9JupixFbzcGw\\n8FZi5c8idxiwC36kbAL6Hz" + "A" + "ZoX+ofI0CQE6KCzPJTtYNqyShgKAZdJ8hwOcvCZtf\\n6z8RJm0+" + "6YBd38lfh5j8mZd7aHFf6I17j5AQY7oPEc47TjJj/" + "5nZ68ECQQDvYuI3\\nLyK5fS8g0SYbmPOL9TlcHDOqwG0mrX9qpg5DC2fniXNSrrZ64GTDKdzZ" + "Y" + "Ap6LI9W\\nIqv4vr6y38N79TTC\\n-----END PRIVATE KEY-----\\n\", "; +static const char test_json_key_str_part3[] = + "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " + "\"client_email\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." + "com\", \"client_id\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." + "com\", \"type\": \"service_account\" }"; /* Test refresh token. */ -static const char test_refresh_token_str[] = "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," " \"type\": \"authorized_user\"}"; +static const char test_refresh_token_str[] = + "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," + " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," + " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," + " \"type\": \"authorized_user\"}"; -static const char valid_oauth2_json_response[] = "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," " \"expires_in\":3599, " " \"token_type\":\"Bearer\"}"; +static const char valid_oauth2_json_response[] = + "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," + " \"expires_in\":3599, " + " \"token_type\":\"Bearer\"}"; static const char test_user_data[] = "user data"; static const char test_scope[] = "perm1 perm2"; -static const char test_signed_jwt[] = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6ImY0OTRkN2M1YWU2MGRmOTcyNmM4YW" "U0MDcyZTViYTdmZDkwODg2YzcifQ"; +static const char test_signed_jwt[] = + "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6ImY0OTRkN2M1YWU2MGRmOTcyNmM4YW" + "U0MDcyZTViYTdmZDkwODg2YzcifQ"; static const char test_service_url[] = "https://foo.com/foo.v1"; static const char other_test_service_url[] = "https://bar.com/bar.v1"; -static char * -test_json_key_str (void) -{ - size_t result_len = strlen (test_json_key_str_part1) + strlen (test_json_key_str_part2) + strlen (test_json_key_str_part3); - char *result = gpr_malloc (result_len + 1); +static char *test_json_key_str(void) { + size_t result_len = strlen(test_json_key_str_part1) + + strlen(test_json_key_str_part2) + + strlen(test_json_key_str_part3); + char *result = gpr_malloc(result_len + 1); char *current = result; - strcpy (result, test_json_key_str_part1); - current += strlen (test_json_key_str_part1); - strcpy (current, test_json_key_str_part2); - current += strlen (test_json_key_str_part2); - strcpy (current, test_json_key_str_part3); + strcpy(result, test_json_key_str_part1); + current += strlen(test_json_key_str_part1); + strcpy(current, test_json_key_str_part2); + current += strlen(test_json_key_str_part2); + strcpy(current, test_json_key_str_part3); return result; } -typedef struct -{ +typedef struct { const char *key; const char *value; } expected_md; -static grpc_httpcli_response -http_response (int status, const char *body) -{ +static grpc_httpcli_response http_response(int status, const char *body) { grpc_httpcli_response response; - memset (&response, 0, sizeof (grpc_httpcli_response)); + memset(&response, 0, sizeof(grpc_httpcli_response)); response.status = status; - response.body = (char *) body; - response.body_length = strlen (body); + response.body = (char *)body; + response.body_length = strlen(body); return response; } -static void -test_empty_md_store (void) -{ - grpc_credentials_md_store *store = grpc_credentials_md_store_create (0); - GPR_ASSERT (store->num_entries == 0); - GPR_ASSERT (store->allocated == 0); - grpc_credentials_md_store_unref (store); -} - -static void -test_ref_unref_empty_md_store (void) -{ - grpc_credentials_md_store *store = grpc_credentials_md_store_create (0); - grpc_credentials_md_store_ref (store); - grpc_credentials_md_store_ref (store); - GPR_ASSERT (store->num_entries == 0); - GPR_ASSERT (store->allocated == 0); - grpc_credentials_md_store_unref (store); - grpc_credentials_md_store_unref (store); - grpc_credentials_md_store_unref (store); -} - -static void -test_add_to_empty_md_store (void) -{ - grpc_credentials_md_store *store = grpc_credentials_md_store_create (0); +static void test_empty_md_store(void) { + grpc_credentials_md_store *store = grpc_credentials_md_store_create(0); + GPR_ASSERT(store->num_entries == 0); + GPR_ASSERT(store->allocated == 0); + grpc_credentials_md_store_unref(store); +} + +static void test_ref_unref_empty_md_store(void) { + grpc_credentials_md_store *store = grpc_credentials_md_store_create(0); + grpc_credentials_md_store_ref(store); + grpc_credentials_md_store_ref(store); + GPR_ASSERT(store->num_entries == 0); + GPR_ASSERT(store->allocated == 0); + grpc_credentials_md_store_unref(store); + grpc_credentials_md_store_unref(store); + grpc_credentials_md_store_unref(store); +} + +static void test_add_to_empty_md_store(void) { + grpc_credentials_md_store *store = grpc_credentials_md_store_create(0); const char *key_str = "hello"; const char *value_str = "there blah blah blah blah blah blah blah"; - gpr_slice key = gpr_slice_from_copied_string (key_str); - gpr_slice value = gpr_slice_from_copied_string (value_str); - grpc_credentials_md_store_add (store, key, value); - GPR_ASSERT (store->num_entries == 1); - GPR_ASSERT (gpr_slice_cmp (key, store->entries[0].key) == 0); - GPR_ASSERT (gpr_slice_cmp (value, store->entries[0].value) == 0); - gpr_slice_unref (key); - gpr_slice_unref (value); - grpc_credentials_md_store_unref (store); -} - -static void -test_add_cstrings_to_empty_md_store (void) -{ - grpc_credentials_md_store *store = grpc_credentials_md_store_create (0); + gpr_slice key = gpr_slice_from_copied_string(key_str); + gpr_slice value = gpr_slice_from_copied_string(value_str); + grpc_credentials_md_store_add(store, key, value); + GPR_ASSERT(store->num_entries == 1); + GPR_ASSERT(gpr_slice_cmp(key, store->entries[0].key) == 0); + GPR_ASSERT(gpr_slice_cmp(value, store->entries[0].value) == 0); + gpr_slice_unref(key); + gpr_slice_unref(value); + grpc_credentials_md_store_unref(store); +} + +static void test_add_cstrings_to_empty_md_store(void) { + grpc_credentials_md_store *store = grpc_credentials_md_store_create(0); const char *key_str = "hello"; const char *value_str = "there blah blah blah blah blah blah blah"; - grpc_credentials_md_store_add_cstrings (store, key_str, value_str); - GPR_ASSERT (store->num_entries == 1); - GPR_ASSERT (gpr_slice_str_cmp (store->entries[0].key, key_str) == 0); - GPR_ASSERT (gpr_slice_str_cmp (store->entries[0].value, value_str) == 0); - grpc_credentials_md_store_unref (store); -} - -static void -test_empty_preallocated_md_store (void) -{ - grpc_credentials_md_store *store = grpc_credentials_md_store_create (4); - GPR_ASSERT (store->num_entries == 0); - GPR_ASSERT (store->allocated == 4); - GPR_ASSERT (store->entries != NULL); - grpc_credentials_md_store_unref (store); -} - -static void -test_add_abunch_to_md_store (void) -{ - grpc_credentials_md_store *store = grpc_credentials_md_store_create (4); + grpc_credentials_md_store_add_cstrings(store, key_str, value_str); + GPR_ASSERT(store->num_entries == 1); + GPR_ASSERT(gpr_slice_str_cmp(store->entries[0].key, key_str) == 0); + GPR_ASSERT(gpr_slice_str_cmp(store->entries[0].value, value_str) == 0); + grpc_credentials_md_store_unref(store); +} + +static void test_empty_preallocated_md_store(void) { + grpc_credentials_md_store *store = grpc_credentials_md_store_create(4); + GPR_ASSERT(store->num_entries == 0); + GPR_ASSERT(store->allocated == 4); + GPR_ASSERT(store->entries != NULL); + grpc_credentials_md_store_unref(store); +} + +static void test_add_abunch_to_md_store(void) { + grpc_credentials_md_store *store = grpc_credentials_md_store_create(4); size_t num_entries = 1000; const char *key_str = "hello"; const char *value_str = "there blah blah blah blah blah blah blah"; size_t i; - for (i = 0; i < num_entries; i++) - { - grpc_credentials_md_store_add_cstrings (store, key_str, value_str); - } - for (i = 0; i < num_entries; i++) - { - GPR_ASSERT (gpr_slice_str_cmp (store->entries[i].key, key_str) == 0); - GPR_ASSERT (gpr_slice_str_cmp (store->entries[i].value, value_str) == 0); - } - grpc_credentials_md_store_unref (store); + for (i = 0; i < num_entries; i++) { + grpc_credentials_md_store_add_cstrings(store, key_str, value_str); + } + for (i = 0; i < num_entries; i++) { + GPR_ASSERT(gpr_slice_str_cmp(store->entries[i].key, key_str) == 0); + GPR_ASSERT(gpr_slice_str_cmp(store->entries[i].value, value_str) == 0); + } + grpc_credentials_md_store_unref(store); } -static void -test_oauth2_token_fetcher_creds_parsing_ok (void) -{ +static void test_oauth2_token_fetcher_creds_parsing_ok(void) { grpc_credentials_md_store *token_md = NULL; gpr_timespec 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); - GPR_ASSERT (token_lifetime.tv_sec == 3599); - GPR_ASSERT (token_lifetime.tv_nsec == 0); - GPR_ASSERT (token_md->num_entries == 1); - GPR_ASSERT (gpr_slice_str_cmp (token_md->entries[0].key, "Authorization") == 0); - GPR_ASSERT (gpr_slice_str_cmp (token_md->entries[0].value, "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_") == 0); - grpc_credentials_md_store_unref (token_md); -} - -static void -test_oauth2_token_fetcher_creds_parsing_bad_http_status (void) -{ + 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); + GPR_ASSERT(token_lifetime.tv_sec == 3599); + GPR_ASSERT(token_lifetime.tv_nsec == 0); + GPR_ASSERT(token_md->num_entries == 1); + GPR_ASSERT(gpr_slice_str_cmp(token_md->entries[0].key, "Authorization") == 0); + GPR_ASSERT(gpr_slice_str_cmp(token_md->entries[0].value, + "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_") == + 0); + grpc_credentials_md_store_unref(token_md); +} + +static void test_oauth2_token_fetcher_creds_parsing_bad_http_status(void) { grpc_credentials_md_store *token_md = NULL; gpr_timespec 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) == GRPC_CREDENTIALS_ERROR); + 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) == + GRPC_CREDENTIALS_ERROR); } -static void -test_oauth2_token_fetcher_creds_parsing_empty_http_body (void) -{ +static void test_oauth2_token_fetcher_creds_parsing_empty_http_body(void) { grpc_credentials_md_store *token_md = NULL; gpr_timespec token_lifetime; - grpc_httpcli_response response = http_response (200, ""); - GPR_ASSERT (grpc_oauth2_token_fetcher_credentials_parse_server_response (&response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); + grpc_httpcli_response response = http_response(200, ""); + GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( + &response, &token_md, &token_lifetime) == + GRPC_CREDENTIALS_ERROR); } -static void -test_oauth2_token_fetcher_creds_parsing_invalid_json (void) -{ +static void test_oauth2_token_fetcher_creds_parsing_invalid_json(void) { grpc_credentials_md_store *token_md = NULL; gpr_timespec token_lifetime; - grpc_httpcli_response response = http_response (200, - "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," " \"expires_in\":3599, " " \"token_type\":\"Bearer\""); - GPR_ASSERT (grpc_oauth2_token_fetcher_credentials_parse_server_response (&response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); + grpc_httpcli_response response = + http_response(200, + "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," + " \"expires_in\":3599, " + " \"token_type\":\"Bearer\""); + GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( + &response, &token_md, &token_lifetime) == + GRPC_CREDENTIALS_ERROR); } -static void -test_oauth2_token_fetcher_creds_parsing_missing_token (void) -{ +static void test_oauth2_token_fetcher_creds_parsing_missing_token(void) { grpc_credentials_md_store *token_md = NULL; gpr_timespec token_lifetime; - grpc_httpcli_response response = http_response (200, - "{" " \"expires_in\":3599, " " \"token_type\":\"Bearer\"}"); - GPR_ASSERT (grpc_oauth2_token_fetcher_credentials_parse_server_response (&response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); + grpc_httpcli_response response = http_response(200, + "{" + " \"expires_in\":3599, " + " \"token_type\":\"Bearer\"}"); + GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( + &response, &token_md, &token_lifetime) == + GRPC_CREDENTIALS_ERROR); } -static void -test_oauth2_token_fetcher_creds_parsing_missing_token_type (void) -{ +static void test_oauth2_token_fetcher_creds_parsing_missing_token_type(void) { grpc_credentials_md_store *token_md = NULL; gpr_timespec token_lifetime; - grpc_httpcli_response response = http_response (200, - "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," " \"expires_in\":3599, " "}"); - GPR_ASSERT (grpc_oauth2_token_fetcher_credentials_parse_server_response (&response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); -} - -static void -test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime (void) -{ + grpc_httpcli_response response = + http_response(200, + "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," + " \"expires_in\":3599, " + "}"); + GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( + &response, &token_md, &token_lifetime) == + GRPC_CREDENTIALS_ERROR); +} + +static void test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime( + void) { grpc_credentials_md_store *token_md = NULL; gpr_timespec token_lifetime; - grpc_httpcli_response response = http_response (200, - "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," " \"token_type\":\"Bearer\"}"); - GPR_ASSERT (grpc_oauth2_token_fetcher_credentials_parse_server_response (&response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); + grpc_httpcli_response response = + http_response(200, + "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," + " \"token_type\":\"Bearer\"}"); + GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( + &response, &token_md, &token_lifetime) == + GRPC_CREDENTIALS_ERROR); } -static void -check_metadata (expected_md * expected, grpc_credentials_md * md_elems, size_t num_md) -{ +static void check_metadata(expected_md *expected, grpc_credentials_md *md_elems, + size_t num_md) { size_t i; - for (i = 0; i < num_md; i++) - { - size_t j; - for (j = 0; j < num_md; j++) - { - if (0 == gpr_slice_str_cmp (md_elems[j].key, expected[i].key)) - { - GPR_ASSERT (gpr_slice_str_cmp (md_elems[j].value, expected[i].value) == 0); - break; - } - } - if (j == num_md) - { - gpr_log (GPR_ERROR, "key %s not found", expected[i].key); - GPR_ASSERT (0); - } + for (i = 0; i < num_md; i++) { + size_t j; + for (j = 0; j < num_md; j++) { + if (0 == gpr_slice_str_cmp(md_elems[j].key, expected[i].key)) { + GPR_ASSERT(gpr_slice_str_cmp(md_elems[j].value, expected[i].value) == + 0); + break; + } + } + if (j == num_md) { + gpr_log(GPR_ERROR, "key %s not found", expected[i].key); + GPR_ASSERT(0); } + } +} + +static void check_google_iam_metadata(grpc_exec_ctx *exec_ctx, void *user_data, + grpc_credentials_md *md_elems, + size_t num_md, + grpc_credentials_status status) { + grpc_credentials *c = (grpc_credentials *)user_data; + expected_md emd[] = {{GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, + test_google_iam_authorization_token}, + {GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, + test_google_iam_authority_selector}}; + GPR_ASSERT(status == GRPC_CREDENTIALS_OK); + GPR_ASSERT(num_md == 2); + check_metadata(emd, md_elems, num_md); + grpc_credentials_unref(c); } -static void -check_google_iam_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) -{ - grpc_credentials *c = (grpc_credentials *) user_data; - expected_md emd[] = { {GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, - test_google_iam_authorization_token}, - {GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, - test_google_iam_authority_selector} - }; - GPR_ASSERT (status == GRPC_CREDENTIALS_OK); - GPR_ASSERT (num_md == 2); - check_metadata (emd, md_elems, num_md); - grpc_credentials_unref (c); -} - -static void -test_google_iam_creds (void) -{ +static void test_google_iam_creds(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_credentials *creds = grpc_google_iam_credentials_create (test_google_iam_authorization_token, test_google_iam_authority_selector, - NULL); - GPR_ASSERT (grpc_credentials_has_request_metadata (creds)); - GPR_ASSERT (grpc_credentials_has_request_metadata_only (creds)); - grpc_credentials_get_request_metadata (&exec_ctx, creds, NULL, test_service_url, check_google_iam_metadata, creds); - grpc_exec_ctx_finish (&exec_ctx); -} - -static void -check_access_token_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) -{ - grpc_credentials *c = (grpc_credentials *) user_data; - expected_md emd[] = { {GRPC_AUTHORIZATION_METADATA_KEY, "Bearer blah"} }; - GPR_ASSERT (status == GRPC_CREDENTIALS_OK); - GPR_ASSERT (num_md == 1); - check_metadata (emd, md_elems, num_md); - grpc_credentials_unref (c); -} - -static void -test_access_token_creds (void) -{ + grpc_credentials *creds = grpc_google_iam_credentials_create( + test_google_iam_authorization_token, test_google_iam_authority_selector, + NULL); + GPR_ASSERT(grpc_credentials_has_request_metadata(creds)); + GPR_ASSERT(grpc_credentials_has_request_metadata_only(creds)); + grpc_credentials_get_request_metadata(&exec_ctx, creds, NULL, + test_service_url, + check_google_iam_metadata, creds); + grpc_exec_ctx_finish(&exec_ctx); +} + +static void check_access_token_metadata(grpc_exec_ctx *exec_ctx, + void *user_data, + grpc_credentials_md *md_elems, + size_t num_md, + grpc_credentials_status status) { + grpc_credentials *c = (grpc_credentials *)user_data; + expected_md emd[] = {{GRPC_AUTHORIZATION_METADATA_KEY, "Bearer blah"}}; + GPR_ASSERT(status == GRPC_CREDENTIALS_OK); + GPR_ASSERT(num_md == 1); + check_metadata(emd, md_elems, num_md); + grpc_credentials_unref(c); +} + +static void test_access_token_creds(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_credentials *creds = grpc_access_token_credentials_create ("blah", NULL); - GPR_ASSERT (grpc_credentials_has_request_metadata (creds)); - GPR_ASSERT (grpc_credentials_has_request_metadata_only (creds)); - GPR_ASSERT (strcmp (creds->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); - grpc_credentials_get_request_metadata (&exec_ctx, creds, NULL, test_service_url, check_access_token_metadata, creds); - grpc_exec_ctx_finish (&exec_ctx); -} - -static void -check_ssl_oauth2_composite_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) -{ - grpc_credentials *c = (grpc_credentials *) user_data; + grpc_credentials *creds = grpc_access_token_credentials_create("blah", NULL); + GPR_ASSERT(grpc_credentials_has_request_metadata(creds)); + GPR_ASSERT(grpc_credentials_has_request_metadata_only(creds)); + GPR_ASSERT(strcmp(creds->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); + grpc_credentials_get_request_metadata(&exec_ctx, creds, NULL, + test_service_url, + check_access_token_metadata, creds); + grpc_exec_ctx_finish(&exec_ctx); +} + +static void check_ssl_oauth2_composite_metadata( + grpc_exec_ctx *exec_ctx, void *user_data, grpc_credentials_md *md_elems, + size_t num_md, grpc_credentials_status status) { + grpc_credentials *c = (grpc_credentials *)user_data; expected_md emd[] = { - {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token} - }; - GPR_ASSERT (status == GRPC_CREDENTIALS_OK); - GPR_ASSERT (num_md == 1); - check_metadata (emd, md_elems, num_md); - grpc_credentials_unref (c); + {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}}; + GPR_ASSERT(status == GRPC_CREDENTIALS_OK); + GPR_ASSERT(num_md == 1); + check_metadata(emd, md_elems, num_md); + grpc_credentials_unref(c); } -static void -test_ssl_oauth2_composite_creds (void) -{ +static void test_ssl_oauth2_composite_creds(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_credentials *ssl_creds = grpc_ssl_credentials_create (test_root_cert, NULL, NULL); + grpc_credentials *ssl_creds = + grpc_ssl_credentials_create(test_root_cert, NULL, NULL); const grpc_credentials_array *creds_array; - grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create ("Authorization", test_oauth2_bearer_token, 0); - grpc_credentials *composite_creds = grpc_composite_credentials_create (ssl_creds, oauth2_creds, NULL); - grpc_credentials_unref (ssl_creds); - grpc_credentials_unref (oauth2_creds); - GPR_ASSERT (strcmp (composite_creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0); - GPR_ASSERT (grpc_credentials_has_request_metadata (composite_creds)); - GPR_ASSERT (!grpc_credentials_has_request_metadata_only (composite_creds)); - creds_array = grpc_composite_credentials_get_credentials (composite_creds); - GPR_ASSERT (creds_array->num_creds == 2); - GPR_ASSERT (strcmp (creds_array->creds_array[0]->type, GRPC_CREDENTIALS_TYPE_SSL) == 0); - GPR_ASSERT (strcmp (creds_array->creds_array[1]->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); - grpc_credentials_get_request_metadata (&exec_ctx, composite_creds, NULL, test_service_url, check_ssl_oauth2_composite_metadata, composite_creds); - grpc_exec_ctx_finish (&exec_ctx); -} - -void -test_ssl_fake_transport_security_composite_creds_failure (void) -{ - grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL); - grpc_credentials *fake_transport_security_creds = grpc_fake_transport_security_credentials_create (); + grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create( + "Authorization", test_oauth2_bearer_token, 0); + grpc_credentials *composite_creds = + grpc_composite_credentials_create(ssl_creds, oauth2_creds, NULL); + grpc_credentials_unref(ssl_creds); + grpc_credentials_unref(oauth2_creds); + GPR_ASSERT(strcmp(composite_creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == + 0); + GPR_ASSERT(grpc_credentials_has_request_metadata(composite_creds)); + GPR_ASSERT(!grpc_credentials_has_request_metadata_only(composite_creds)); + creds_array = grpc_composite_credentials_get_credentials(composite_creds); + GPR_ASSERT(creds_array->num_creds == 2); + GPR_ASSERT(strcmp(creds_array->creds_array[0]->type, + GRPC_CREDENTIALS_TYPE_SSL) == 0); + GPR_ASSERT(strcmp(creds_array->creds_array[1]->type, + GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); + grpc_credentials_get_request_metadata( + &exec_ctx, composite_creds, NULL, test_service_url, + check_ssl_oauth2_composite_metadata, composite_creds); + grpc_exec_ctx_finish(&exec_ctx); +} + +void test_ssl_fake_transport_security_composite_creds_failure(void) { + grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL); + grpc_credentials *fake_transport_security_creds = + grpc_fake_transport_security_credentials_create(); /* 2 connector credentials: should not work. */ - GPR_ASSERT (grpc_composite_credentials_create (ssl_creds, fake_transport_security_creds, NULL) == NULL); - grpc_credentials_unref (ssl_creds); - grpc_credentials_unref (fake_transport_security_creds); + GPR_ASSERT(grpc_composite_credentials_create( + ssl_creds, fake_transport_security_creds, NULL) == NULL); + grpc_credentials_unref(ssl_creds); + grpc_credentials_unref(fake_transport_security_creds); } -static void -check_ssl_oauth2_google_iam_composite_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) -{ - grpc_credentials *c = (grpc_credentials *) user_data; +static void check_ssl_oauth2_google_iam_composite_metadata( + grpc_exec_ctx *exec_ctx, void *user_data, grpc_credentials_md *md_elems, + size_t num_md, grpc_credentials_status status) { + grpc_credentials *c = (grpc_credentials *)user_data; expected_md emd[] = { - {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}, - {GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, - test_google_iam_authorization_token}, - {GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, - test_google_iam_authority_selector} - }; - GPR_ASSERT (status == GRPC_CREDENTIALS_OK); - GPR_ASSERT (num_md == 3); - check_metadata (emd, md_elems, num_md); - grpc_credentials_unref (c); -} - -static void -test_ssl_oauth2_google_iam_composite_creds (void) -{ + {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}, + {GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, + test_google_iam_authorization_token}, + {GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, + test_google_iam_authority_selector}}; + GPR_ASSERT(status == GRPC_CREDENTIALS_OK); + GPR_ASSERT(num_md == 3); + check_metadata(emd, md_elems, num_md); + grpc_credentials_unref(c); +} + +static void test_ssl_oauth2_google_iam_composite_creds(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_credentials *ssl_creds = grpc_ssl_credentials_create (test_root_cert, NULL, NULL); + grpc_credentials *ssl_creds = + grpc_ssl_credentials_create(test_root_cert, NULL, NULL); const grpc_credentials_array *creds_array; - grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create ("Authorization", test_oauth2_bearer_token, 0); - grpc_credentials *aux_creds = grpc_composite_credentials_create (ssl_creds, oauth2_creds, NULL); - grpc_credentials *google_iam_creds = grpc_google_iam_credentials_create (test_google_iam_authorization_token, test_google_iam_authority_selector, - NULL); - grpc_credentials *composite_creds = grpc_composite_credentials_create (aux_creds, google_iam_creds, NULL); - grpc_credentials_unref (ssl_creds); - grpc_credentials_unref (oauth2_creds); - grpc_credentials_unref (aux_creds); - grpc_credentials_unref (google_iam_creds); - GPR_ASSERT (strcmp (composite_creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0); - GPR_ASSERT (grpc_credentials_has_request_metadata (composite_creds)); - GPR_ASSERT (!grpc_credentials_has_request_metadata_only (composite_creds)); - creds_array = grpc_composite_credentials_get_credentials (composite_creds); - GPR_ASSERT (creds_array->num_creds == 3); - GPR_ASSERT (strcmp (creds_array->creds_array[0]->type, GRPC_CREDENTIALS_TYPE_SSL) == 0); - GPR_ASSERT (strcmp (creds_array->creds_array[1]->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); - GPR_ASSERT (strcmp (creds_array->creds_array[2]->type, GRPC_CREDENTIALS_TYPE_IAM) == 0); - grpc_credentials_get_request_metadata (&exec_ctx, composite_creds, NULL, test_service_url, check_ssl_oauth2_google_iam_composite_metadata, composite_creds); - grpc_exec_ctx_finish (&exec_ctx); -} - -static void -on_oauth2_creds_get_metadata_success (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) -{ - GPR_ASSERT (status == GRPC_CREDENTIALS_OK); - GPR_ASSERT (num_md == 1); - GPR_ASSERT (gpr_slice_str_cmp (md_elems[0].key, "Authorization") == 0); - GPR_ASSERT (gpr_slice_str_cmp (md_elems[0].value, "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_") == 0); - GPR_ASSERT (user_data != NULL); - GPR_ASSERT (strcmp ((const char *) user_data, test_user_data) == 0); -} - -static void -on_oauth2_creds_get_metadata_failure (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) -{ - GPR_ASSERT (status == GRPC_CREDENTIALS_ERROR); - GPR_ASSERT (num_md == 0); - GPR_ASSERT (user_data != NULL); - GPR_ASSERT (strcmp ((const char *) user_data, test_user_data) == 0); -} - -static void -validate_compute_engine_http_request (const grpc_httpcli_request * request) -{ - GPR_ASSERT (request->handshaker != &grpc_httpcli_ssl); - GPR_ASSERT (strcmp (request->host, "metadata") == 0); - GPR_ASSERT (strcmp (request->path, "/computeMetadata/v1/instance/service-accounts/default/token") == 0); - GPR_ASSERT (request->hdr_count == 1); - GPR_ASSERT (strcmp (request->hdrs[0].key, "Metadata-Flavor") == 0); - GPR_ASSERT (strcmp (request->hdrs[0].value, "Google") == 0); -} - -static int -compute_engine_httpcli_get_success_override (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ - grpc_httpcli_response response = http_response (200, valid_oauth2_json_response); - validate_compute_engine_http_request (request); - on_response (exec_ctx, user_data, &response); + grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create( + "Authorization", test_oauth2_bearer_token, 0); + grpc_credentials *aux_creds = + grpc_composite_credentials_create(ssl_creds, oauth2_creds, NULL); + grpc_credentials *google_iam_creds = grpc_google_iam_credentials_create( + test_google_iam_authorization_token, test_google_iam_authority_selector, + NULL); + grpc_credentials *composite_creds = + grpc_composite_credentials_create(aux_creds, google_iam_creds, NULL); + grpc_credentials_unref(ssl_creds); + grpc_credentials_unref(oauth2_creds); + grpc_credentials_unref(aux_creds); + grpc_credentials_unref(google_iam_creds); + GPR_ASSERT(strcmp(composite_creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == + 0); + GPR_ASSERT(grpc_credentials_has_request_metadata(composite_creds)); + GPR_ASSERT(!grpc_credentials_has_request_metadata_only(composite_creds)); + creds_array = grpc_composite_credentials_get_credentials(composite_creds); + GPR_ASSERT(creds_array->num_creds == 3); + GPR_ASSERT(strcmp(creds_array->creds_array[0]->type, + GRPC_CREDENTIALS_TYPE_SSL) == 0); + GPR_ASSERT(strcmp(creds_array->creds_array[1]->type, + GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); + GPR_ASSERT(strcmp(creds_array->creds_array[2]->type, + GRPC_CREDENTIALS_TYPE_IAM) == 0); + grpc_credentials_get_request_metadata( + &exec_ctx, composite_creds, NULL, test_service_url, + check_ssl_oauth2_google_iam_composite_metadata, composite_creds); + grpc_exec_ctx_finish(&exec_ctx); +} + +static void on_oauth2_creds_get_metadata_success( + grpc_exec_ctx *exec_ctx, void *user_data, grpc_credentials_md *md_elems, + size_t num_md, grpc_credentials_status status) { + GPR_ASSERT(status == GRPC_CREDENTIALS_OK); + GPR_ASSERT(num_md == 1); + GPR_ASSERT(gpr_slice_str_cmp(md_elems[0].key, "Authorization") == 0); + GPR_ASSERT(gpr_slice_str_cmp(md_elems[0].value, + "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_") == + 0); + GPR_ASSERT(user_data != NULL); + GPR_ASSERT(strcmp((const char *)user_data, test_user_data) == 0); +} + +static void on_oauth2_creds_get_metadata_failure( + grpc_exec_ctx *exec_ctx, void *user_data, grpc_credentials_md *md_elems, + size_t num_md, grpc_credentials_status status) { + GPR_ASSERT(status == GRPC_CREDENTIALS_ERROR); + GPR_ASSERT(num_md == 0); + GPR_ASSERT(user_data != NULL); + GPR_ASSERT(strcmp((const char *)user_data, test_user_data) == 0); +} + +static void validate_compute_engine_http_request( + const grpc_httpcli_request *request) { + GPR_ASSERT(request->handshaker != &grpc_httpcli_ssl); + GPR_ASSERT(strcmp(request->host, "metadata") == 0); + GPR_ASSERT( + strcmp(request->path, + "/computeMetadata/v1/instance/service-accounts/default/token") == + 0); + GPR_ASSERT(request->hdr_count == 1); + GPR_ASSERT(strcmp(request->hdrs[0].key, "Metadata-Flavor") == 0); + GPR_ASSERT(strcmp(request->hdrs[0].value, "Google") == 0); +} + +static int compute_engine_httpcli_get_success_override( + grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, + gpr_timespec deadline, grpc_httpcli_response_cb on_response, + void *user_data) { + grpc_httpcli_response response = + http_response(200, valid_oauth2_json_response); + validate_compute_engine_http_request(request); + on_response(exec_ctx, user_data, &response); return 1; } -static int -compute_engine_httpcli_get_failure_override (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ - grpc_httpcli_response response = http_response (403, "Not Authorized."); - validate_compute_engine_http_request (request); - on_response (exec_ctx, user_data, &response); +static int compute_engine_httpcli_get_failure_override( + grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, + gpr_timespec deadline, grpc_httpcli_response_cb on_response, + void *user_data) { + grpc_httpcli_response response = http_response(403, "Not Authorized."); + validate_compute_engine_http_request(request); + on_response(exec_ctx, user_data, &response); 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, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ - GPR_ASSERT ("HTTP POST should not be called" == NULL); +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, gpr_timespec deadline, + grpc_httpcli_response_cb on_response, void *user_data) { + 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, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ - GPR_ASSERT ("HTTP GET should not be called" == NULL); +static int httpcli_get_should_not_be_called( + grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, + gpr_timespec deadline, grpc_httpcli_response_cb on_response, + void *user_data) { + GPR_ASSERT("HTTP GET should not be called" == NULL); return 1; } -static void -test_compute_engine_creds_success (void) -{ +static void test_compute_engine_creds_success(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_credentials *compute_engine_creds = grpc_google_compute_engine_credentials_create (NULL); - GPR_ASSERT (grpc_credentials_has_request_metadata (compute_engine_creds)); - GPR_ASSERT (grpc_credentials_has_request_metadata_only (compute_engine_creds)); + grpc_credentials *compute_engine_creds = + grpc_google_compute_engine_credentials_create(NULL); + GPR_ASSERT(grpc_credentials_has_request_metadata(compute_engine_creds)); + GPR_ASSERT(grpc_credentials_has_request_metadata_only(compute_engine_creds)); /* First request: http get should be called. */ - grpc_httpcli_set_override (compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); - grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (&exec_ctx, void *) test_user_data); - grpc_exec_ctx_finish (&exec_ctx); + grpc_httpcli_set_override(compute_engine_httpcli_get_success_override, + httpcli_post_should_not_be_called); + grpc_credentials_get_request_metadata( + compute_engine_creds, NULL, test_service_url, + on_oauth2_creds_get_metadata_success, (&exec_ctx, void *)test_user_data); + grpc_exec_ctx_finish(&exec_ctx); /* Second request: the cached token should be served directly. */ - grpc_httpcli_set_override (httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (&exec_ctx, void *) test_user_data); - grpc_exec_ctx_finish (&exec_ctx); + grpc_httpcli_set_override(httpcli_get_should_not_be_called, + httpcli_post_should_not_be_called); + grpc_credentials_get_request_metadata( + compute_engine_creds, NULL, test_service_url, + on_oauth2_creds_get_metadata_success, (&exec_ctx, void *)test_user_data); + grpc_exec_ctx_finish(&exec_ctx); - grpc_credentials_unref (compute_engine_creds); - grpc_httpcli_set_override (NULL, NULL); + grpc_credentials_unref(compute_engine_creds); + grpc_httpcli_set_override(NULL, NULL); } -static void -test_compute_engine_creds_failure (void) -{ +static void test_compute_engine_creds_failure(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_credentials *compute_engine_creds = grpc_google_compute_engine_credentials_create (NULL); - grpc_httpcli_set_override (compute_engine_httpcli_get_failure_override, httpcli_post_should_not_be_called); - GPR_ASSERT (grpc_credentials_has_request_metadata (compute_engine_creds)); - GPR_ASSERT (grpc_credentials_has_request_metadata_only (compute_engine_creds)); - grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (&exec_ctx, void *) test_user_data); - grpc_credentials_unref (compute_engine_creds); - grpc_httpcli_set_override (NULL, NULL); - grpc_exec_ctx_finish (&exec_ctx); -} - -static void -validate_refresh_token_http_request (const grpc_httpcli_request * request, const char *body, size_t body_size) -{ + grpc_credentials *compute_engine_creds = + grpc_google_compute_engine_credentials_create(NULL); + grpc_httpcli_set_override(compute_engine_httpcli_get_failure_override, + httpcli_post_should_not_be_called); + GPR_ASSERT(grpc_credentials_has_request_metadata(compute_engine_creds)); + GPR_ASSERT(grpc_credentials_has_request_metadata_only(compute_engine_creds)); + grpc_credentials_get_request_metadata( + compute_engine_creds, NULL, test_service_url, + on_oauth2_creds_get_metadata_failure, (&exec_ctx, void *)test_user_data); + grpc_credentials_unref(compute_engine_creds); + grpc_httpcli_set_override(NULL, NULL); + grpc_exec_ctx_finish(&exec_ctx); +} + +static void validate_refresh_token_http_request( + const grpc_httpcli_request *request, const char *body, size_t body_size) { /* The content of the assertion is tested extensively in json_token_test. */ char *expected_body = NULL; - GPR_ASSERT (body != NULL); - GPR_ASSERT (body_size != 0); - gpr_asprintf (&expected_body, GRPC_REFRESH_TOKEN_POST_BODY_FORMAT_STRING, "32555999999.apps.googleusercontent.com", "EmssLNjJy1332hD4KFsecret", "1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42"); - GPR_ASSERT (strlen (expected_body) == body_size); - GPR_ASSERT (memcmp (expected_body, body, body_size) == 0); - gpr_free (expected_body); - GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); - GPR_ASSERT (strcmp (request->host, GRPC_GOOGLE_OAUTH2_SERVICE_HOST) == 0); - GPR_ASSERT (strcmp (request->path, GRPC_GOOGLE_OAUTH2_SERVICE_TOKEN_PATH) == 0); - GPR_ASSERT (request->hdr_count == 1); - GPR_ASSERT (strcmp (request->hdrs[0].key, "Content-Type") == 0); - GPR_ASSERT (strcmp (request->hdrs[0].value, "application/x-www-form-urlencoded") == 0); -} - -static int -refresh_token_httpcli_post_success (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ - grpc_httpcli_response response = http_response (200, valid_oauth2_json_response); - validate_refresh_token_http_request (request, body, body_size); - on_response (exec_ctx, user_data, &response); + GPR_ASSERT(body != NULL); + GPR_ASSERT(body_size != 0); + gpr_asprintf(&expected_body, GRPC_REFRESH_TOKEN_POST_BODY_FORMAT_STRING, + "32555999999.apps.googleusercontent.com", + "EmssLNjJy1332hD4KFsecret", + "1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42"); + GPR_ASSERT(strlen(expected_body) == body_size); + GPR_ASSERT(memcmp(expected_body, body, body_size) == 0); + gpr_free(expected_body); + GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); + GPR_ASSERT(strcmp(request->host, GRPC_GOOGLE_OAUTH2_SERVICE_HOST) == 0); + GPR_ASSERT(strcmp(request->path, GRPC_GOOGLE_OAUTH2_SERVICE_TOKEN_PATH) == 0); + GPR_ASSERT(request->hdr_count == 1); + GPR_ASSERT(strcmp(request->hdrs[0].key, "Content-Type") == 0); + GPR_ASSERT( + strcmp(request->hdrs[0].value, "application/x-www-form-urlencoded") == 0); +} + +static int refresh_token_httpcli_post_success( + grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, + const char *body, size_t body_size, gpr_timespec deadline, + grpc_httpcli_response_cb on_response, void *user_data) { + grpc_httpcli_response response = + http_response(200, valid_oauth2_json_response); + validate_refresh_token_http_request(request, body, body_size); + on_response(exec_ctx, user_data, &response); 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, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ - grpc_httpcli_response response = http_response (403, "Not Authorized."); - validate_refresh_token_http_request (request, body, body_size); - on_response (exec_ctx, user_data, &response); +static int refresh_token_httpcli_post_failure( + grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, + const char *body, size_t body_size, gpr_timespec deadline, + grpc_httpcli_response_cb on_response, void *user_data) { + grpc_httpcli_response response = http_response(403, "Not Authorized."); + validate_refresh_token_http_request(request, body, body_size); + on_response(exec_ctx, user_data, &response); return 1; } -static void -test_refresh_token_creds_success (void) -{ +static void test_refresh_token_creds_success(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_credentials *refresh_token_creds = grpc_google_refresh_token_credentials_create (test_refresh_token_str, - NULL); - GPR_ASSERT (grpc_credentials_has_request_metadata (refresh_token_creds)); - GPR_ASSERT (grpc_credentials_has_request_metadata_only (refresh_token_creds)); + grpc_credentials *refresh_token_creds = + grpc_google_refresh_token_credentials_create(test_refresh_token_str, + NULL); + GPR_ASSERT(grpc_credentials_has_request_metadata(refresh_token_creds)); + GPR_ASSERT(grpc_credentials_has_request_metadata_only(refresh_token_creds)); /* First request: http get should be called. */ - grpc_httpcli_set_override (httpcli_get_should_not_be_called, refresh_token_httpcli_post_success); - grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (&exec_ctx, void *) test_user_data); - grpc_exec_ctx_finish (&exec_ctx); + grpc_httpcli_set_override(httpcli_get_should_not_be_called, + refresh_token_httpcli_post_success); + grpc_credentials_get_request_metadata( + refresh_token_creds, NULL, test_service_url, + on_oauth2_creds_get_metadata_success, (&exec_ctx, void *)test_user_data); + grpc_exec_ctx_finish(&exec_ctx); /* Second request: the cached token should be served directly. */ - grpc_httpcli_set_override (httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (&exec_ctx, void *) test_user_data); - grpc_exec_ctx_finish (&exec_ctx); + grpc_httpcli_set_override(httpcli_get_should_not_be_called, + httpcli_post_should_not_be_called); + grpc_credentials_get_request_metadata( + refresh_token_creds, NULL, test_service_url, + on_oauth2_creds_get_metadata_success, (&exec_ctx, void *)test_user_data); + grpc_exec_ctx_finish(&exec_ctx); - grpc_credentials_unref (refresh_token_creds); - grpc_httpcli_set_override (NULL, NULL); - grpc_exec_ctx_finish (&exec_ctx); + grpc_credentials_unref(refresh_token_creds); + grpc_httpcli_set_override(NULL, NULL); + grpc_exec_ctx_finish(&exec_ctx); } -static void -test_refresh_token_creds_failure (void) -{ +static void test_refresh_token_creds_failure(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_credentials *refresh_token_creds = grpc_google_refresh_token_credentials_create (test_refresh_token_str, - NULL); - grpc_httpcli_set_override (httpcli_get_should_not_be_called, refresh_token_httpcli_post_failure); - GPR_ASSERT (grpc_credentials_has_request_metadata (refresh_token_creds)); - GPR_ASSERT (grpc_credentials_has_request_metadata_only (refresh_token_creds)); - grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (&exec_ctx, void *) test_user_data); - grpc_credentials_unref (refresh_token_creds); - grpc_httpcli_set_override (NULL, NULL); - grpc_exec_ctx_finish (&exec_ctx); -} - -static void -validate_jwt_encode_and_sign_params (const grpc_auth_json_key * json_key, const char *scope, gpr_timespec token_lifetime) -{ - GPR_ASSERT (grpc_auth_json_key_is_valid (json_key)); - GPR_ASSERT (json_key->private_key != NULL); - GPR_ASSERT (RSA_check_key (json_key->private_key)); - GPR_ASSERT (json_key->type != NULL && strcmp (json_key->type, "service_account") == 0); - GPR_ASSERT (json_key->private_key_id != NULL && strcmp (json_key->private_key_id, "e6b5137873db8d2ef81e06a47289e6434ec8a165") == 0); - GPR_ASSERT (json_key->client_id != NULL && strcmp (json_key->client_id, "777-abaslkan11hlb6nmim3bpspl31ud.apps." "googleusercontent.com") == 0); - GPR_ASSERT (json_key->client_email != NULL && strcmp (json_key->client_email, "777-abaslkan11hlb6nmim3bpspl31ud@developer." "gserviceaccount.com") == 0); - if (scope != NULL) - GPR_ASSERT (strcmp (scope, test_scope) == 0); - GPR_ASSERT (!gpr_time_cmp (token_lifetime, grpc_max_auth_token_lifetime)); -} - -static char * -encode_and_sign_jwt_success (const grpc_auth_json_key * json_key, const char *audience, gpr_timespec token_lifetime, const char *scope) -{ - validate_jwt_encode_and_sign_params (json_key, scope, token_lifetime); - return gpr_strdup (test_signed_jwt); -} - -static char * -encode_and_sign_jwt_failure (const grpc_auth_json_key * json_key, const char *audience, gpr_timespec token_lifetime, const char *scope) -{ - validate_jwt_encode_and_sign_params (json_key, scope, token_lifetime); + grpc_credentials *refresh_token_creds = + grpc_google_refresh_token_credentials_create(test_refresh_token_str, + NULL); + grpc_httpcli_set_override(httpcli_get_should_not_be_called, + refresh_token_httpcli_post_failure); + GPR_ASSERT(grpc_credentials_has_request_metadata(refresh_token_creds)); + GPR_ASSERT(grpc_credentials_has_request_metadata_only(refresh_token_creds)); + grpc_credentials_get_request_metadata( + refresh_token_creds, NULL, test_service_url, + on_oauth2_creds_get_metadata_failure, (&exec_ctx, void *)test_user_data); + grpc_credentials_unref(refresh_token_creds); + grpc_httpcli_set_override(NULL, NULL); + grpc_exec_ctx_finish(&exec_ctx); +} + +static void validate_jwt_encode_and_sign_params( + const grpc_auth_json_key *json_key, const char *scope, + gpr_timespec token_lifetime) { + GPR_ASSERT(grpc_auth_json_key_is_valid(json_key)); + GPR_ASSERT(json_key->private_key != NULL); + GPR_ASSERT(RSA_check_key(json_key->private_key)); + GPR_ASSERT(json_key->type != NULL && + strcmp(json_key->type, "service_account") == 0); + GPR_ASSERT(json_key->private_key_id != NULL && + strcmp(json_key->private_key_id, + "e6b5137873db8d2ef81e06a47289e6434ec8a165") == 0); + GPR_ASSERT(json_key->client_id != NULL && + strcmp(json_key->client_id, + "777-abaslkan11hlb6nmim3bpspl31ud.apps." + "googleusercontent.com") == 0); + GPR_ASSERT(json_key->client_email != NULL && + strcmp(json_key->client_email, + "777-abaslkan11hlb6nmim3bpspl31ud@developer." + "gserviceaccount.com") == 0); + if (scope != NULL) GPR_ASSERT(strcmp(scope, test_scope) == 0); + GPR_ASSERT(!gpr_time_cmp(token_lifetime, grpc_max_auth_token_lifetime)); +} + +static char *encode_and_sign_jwt_success(const grpc_auth_json_key *json_key, + const char *audience, + gpr_timespec token_lifetime, + const char *scope) { + validate_jwt_encode_and_sign_params(json_key, scope, token_lifetime); + return gpr_strdup(test_signed_jwt); +} + +static char *encode_and_sign_jwt_failure(const grpc_auth_json_key *json_key, + const char *audience, + gpr_timespec token_lifetime, + const char *scope) { + validate_jwt_encode_and_sign_params(json_key, scope, token_lifetime); return NULL; } -static char * -encode_and_sign_jwt_should_not_be_called (const grpc_auth_json_key * json_key, const char *audience, gpr_timespec token_lifetime, const char *scope) -{ - GPR_ASSERT ("grpc_jwt_encode_and_sign should not be called" == NULL); +static char *encode_and_sign_jwt_should_not_be_called( + const grpc_auth_json_key *json_key, const char *audience, + gpr_timespec token_lifetime, const char *scope) { + GPR_ASSERT("grpc_jwt_encode_and_sign should not be called" == NULL); } -static void -on_jwt_creds_get_metadata_success (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) -{ +static void on_jwt_creds_get_metadata_success(grpc_exec_ctx *exec_ctx, + void *user_data, + grpc_credentials_md *md_elems, + size_t num_md, + grpc_credentials_status status) { char *expected_md_value; - gpr_asprintf (&expected_md_value, "Bearer %s", test_signed_jwt); - GPR_ASSERT (status == GRPC_CREDENTIALS_OK); - GPR_ASSERT (num_md == 1); - GPR_ASSERT (gpr_slice_str_cmp (md_elems[0].key, "Authorization") == 0); - GPR_ASSERT (gpr_slice_str_cmp (md_elems[0].value, expected_md_value) == 0); - GPR_ASSERT (user_data != NULL); - GPR_ASSERT (strcmp ((const char *) user_data, test_user_data) == 0); - gpr_free (expected_md_value); -} - -static void -on_jwt_creds_get_metadata_failure (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) -{ - GPR_ASSERT (status == GRPC_CREDENTIALS_ERROR); - GPR_ASSERT (num_md == 0); - GPR_ASSERT (user_data != NULL); - GPR_ASSERT (strcmp ((const char *) user_data, test_user_data) == 0); -} - -static void -test_jwt_creds_success (void) -{ - char *json_key_string = test_json_key_str (); + gpr_asprintf(&expected_md_value, "Bearer %s", test_signed_jwt); + GPR_ASSERT(status == GRPC_CREDENTIALS_OK); + GPR_ASSERT(num_md == 1); + GPR_ASSERT(gpr_slice_str_cmp(md_elems[0].key, "Authorization") == 0); + GPR_ASSERT(gpr_slice_str_cmp(md_elems[0].value, expected_md_value) == 0); + GPR_ASSERT(user_data != NULL); + GPR_ASSERT(strcmp((const char *)user_data, test_user_data) == 0); + gpr_free(expected_md_value); +} + +static void on_jwt_creds_get_metadata_failure(grpc_exec_ctx *exec_ctx, + void *user_data, + grpc_credentials_md *md_elems, + size_t num_md, + grpc_credentials_status status) { + GPR_ASSERT(status == GRPC_CREDENTIALS_ERROR); + GPR_ASSERT(num_md == 0); + GPR_ASSERT(user_data != NULL); + GPR_ASSERT(strcmp((const char *)user_data, test_user_data) == 0); +} + +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_credentials *jwt_creds = grpc_service_account_jwt_access_credentials_create (json_key_string, grpc_max_auth_token_lifetime, NULL); - GPR_ASSERT (grpc_credentials_has_request_metadata (jwt_creds)); - GPR_ASSERT (grpc_credentials_has_request_metadata_only (jwt_creds)); + grpc_credentials *jwt_creds = + grpc_service_account_jwt_access_credentials_create( + json_key_string, grpc_max_auth_token_lifetime, NULL); + GPR_ASSERT(grpc_credentials_has_request_metadata(jwt_creds)); + GPR_ASSERT(grpc_credentials_has_request_metadata_only(jwt_creds)); /* First request: jwt_encode_and_sign should be called. */ - grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_success); - grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (&exec_ctx, void *) test_user_data); - grpc_exec_ctx_finish (&exec_ctx); + grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); + grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, + on_jwt_creds_get_metadata_success, + (&exec_ctx, void *)test_user_data); + grpc_exec_ctx_finish(&exec_ctx); /* Second request: the cached token should be served directly. */ - grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_should_not_be_called); - grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (&exec_ctx, void *) test_user_data); - grpc_exec_ctx_finish (&exec_ctx); + grpc_jwt_encode_and_sign_set_override( + encode_and_sign_jwt_should_not_be_called); + grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, + on_jwt_creds_get_metadata_success, + (&exec_ctx, void *)test_user_data); + grpc_exec_ctx_finish(&exec_ctx); /* Third request: Different service url so jwt_encode_and_sign should be called again (no caching). */ - grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_success); - grpc_credentials_get_request_metadata (jwt_creds, NULL, other_test_service_url, on_jwt_creds_get_metadata_success, (&exec_ctx, void *) test_user_data); - grpc_exec_ctx_finish (&exec_ctx); + grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); + grpc_credentials_get_request_metadata(jwt_creds, NULL, other_test_service_url, + on_jwt_creds_get_metadata_success, + (&exec_ctx, void *)test_user_data); + grpc_exec_ctx_finish(&exec_ctx); - gpr_free (json_key_string); - grpc_credentials_unref (jwt_creds); - grpc_jwt_encode_and_sign_set_override (NULL); + gpr_free(json_key_string); + grpc_credentials_unref(jwt_creds); + grpc_jwt_encode_and_sign_set_override(NULL); } -static void -test_jwt_creds_signing_failure (void) -{ - char *json_key_string = test_json_key_str (); +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_credentials *jwt_creds = grpc_service_account_jwt_access_credentials_create (json_key_string, grpc_max_auth_token_lifetime, NULL); - GPR_ASSERT (grpc_credentials_has_request_metadata (jwt_creds)); - GPR_ASSERT (grpc_credentials_has_request_metadata_only (jwt_creds)); - - grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_failure); - grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_failure, (&exec_ctx, void *) test_user_data); - - gpr_free (json_key_string); - grpc_credentials_unref (jwt_creds); - grpc_jwt_encode_and_sign_set_override (NULL); - grpc_exec_ctx_finish (&exec_ctx); + grpc_credentials *jwt_creds = + grpc_service_account_jwt_access_credentials_create( + json_key_string, grpc_max_auth_token_lifetime, NULL); + GPR_ASSERT(grpc_credentials_has_request_metadata(jwt_creds)); + GPR_ASSERT(grpc_credentials_has_request_metadata_only(jwt_creds)); + + grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_failure); + grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, + on_jwt_creds_get_metadata_failure, + (&exec_ctx, void *)test_user_data); + + gpr_free(json_key_string); + grpc_credentials_unref(jwt_creds); + grpc_jwt_encode_and_sign_set_override(NULL); + grpc_exec_ctx_finish(&exec_ctx); +} + +static void set_google_default_creds_env_var_with_file_contents( + const char *file_prefix, const char *contents) { + size_t contents_len = strlen(contents); + char *creds_file_name; + FILE *creds_file = gpr_tmpfile(file_prefix, &creds_file_name); + GPR_ASSERT(creds_file_name != NULL); + GPR_ASSERT(creds_file != NULL); + GPR_ASSERT(fwrite(contents, 1, contents_len, creds_file) == contents_len); + fclose(creds_file); + gpr_setenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR, creds_file_name); + gpr_free(creds_file_name); } -static void -set_google_default_creds_env_var_with_file_contents (const char *file_prefix, const char *contents) -{ - size_t contents_len = strlen (contents); - char *creds_file_name; - FILE *creds_file = gpr_tmpfile (file_prefix, &creds_file_name); - GPR_ASSERT (creds_file_name != NULL); - GPR_ASSERT (creds_file != NULL); - GPR_ASSERT (fwrite (contents, 1, contents_len, creds_file) == contents_len); - fclose (creds_file); - gpr_setenv (GRPC_GOOGLE_CREDENTIALS_ENV_VAR, creds_file_name); - gpr_free (creds_file_name); -} - -static grpc_credentials * -composite_inner_creds (grpc_credentials * creds, const char *inner_creds_type) -{ +static grpc_credentials *composite_inner_creds(grpc_credentials *creds, + const char *inner_creds_type) { size_t i; grpc_composite_credentials *composite; - GPR_ASSERT (strcmp (creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0); - composite = (grpc_composite_credentials *) creds; - for (i = 0; i < composite->inner.num_creds; i++) - { - grpc_credentials *c = composite->inner.creds_array[i]; - if (strcmp (c->type, inner_creds_type) == 0) - return c; - } - GPR_ASSERT (0); /* Not found. */ + GPR_ASSERT(strcmp(creds->type, GRPC_CREDENTIALS_TYPE_COMPOSITE) == 0); + composite = (grpc_composite_credentials *)creds; + for (i = 0; i < composite->inner.num_creds; i++) { + grpc_credentials *c = composite->inner.creds_array[i]; + if (strcmp(c->type, inner_creds_type) == 0) return c; + } + GPR_ASSERT(0); /* Not found. */ } -static void -test_google_default_creds_auth_key (void) -{ +static void test_google_default_creds_auth_key(void) { grpc_service_account_jwt_access_credentials *jwt; grpc_credentials *creds; - char *json_key = test_json_key_str (); - grpc_flush_cached_google_default_credentials (); - set_google_default_creds_env_var_with_file_contents ("json_key_google_default_creds", json_key); - gpr_free (json_key); - creds = grpc_google_default_credentials_create (); - GPR_ASSERT (creds != NULL); - jwt = (grpc_service_account_jwt_access_credentials *) composite_inner_creds (creds, GRPC_CREDENTIALS_TYPE_JWT); - GPR_ASSERT (strcmp (jwt->key.client_id, "777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent.com") == 0); - grpc_credentials_unref (creds); - gpr_setenv (GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ -} - -static void -test_google_default_creds_access_token (void) -{ + char *json_key = test_json_key_str(); + grpc_flush_cached_google_default_credentials(); + set_google_default_creds_env_var_with_file_contents( + "json_key_google_default_creds", json_key); + gpr_free(json_key); + creds = grpc_google_default_credentials_create(); + GPR_ASSERT(creds != NULL); + jwt = (grpc_service_account_jwt_access_credentials *)composite_inner_creds( + creds, GRPC_CREDENTIALS_TYPE_JWT); + GPR_ASSERT( + strcmp(jwt->key.client_id, + "777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent.com") == + 0); + grpc_credentials_unref(creds); + gpr_setenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ +} + +static void test_google_default_creds_access_token(void) { grpc_google_refresh_token_credentials *refresh; grpc_credentials *creds; - grpc_flush_cached_google_default_credentials (); - set_google_default_creds_env_var_with_file_contents ("refresh_token_google_default_creds", test_refresh_token_str); - creds = grpc_google_default_credentials_create (); - GPR_ASSERT (creds != NULL); - refresh = (grpc_google_refresh_token_credentials *) composite_inner_creds (creds, GRPC_CREDENTIALS_TYPE_OAUTH2); - GPR_ASSERT (strcmp (refresh->refresh_token.client_id, "32555999999.apps.googleusercontent.com") == 0); - grpc_credentials_unref (creds); - gpr_setenv (GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ -} - -typedef enum -{ + grpc_flush_cached_google_default_credentials(); + set_google_default_creds_env_var_with_file_contents( + "refresh_token_google_default_creds", test_refresh_token_str); + creds = grpc_google_default_credentials_create(); + GPR_ASSERT(creds != NULL); + refresh = (grpc_google_refresh_token_credentials *)composite_inner_creds( + creds, GRPC_CREDENTIALS_TYPE_OAUTH2); + GPR_ASSERT(strcmp(refresh->refresh_token.client_id, + "32555999999.apps.googleusercontent.com") == 0); + grpc_credentials_unref(creds); + gpr_setenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ +} + +typedef enum { PLUGIN_INITIAL_STATE, PLUGIN_GET_METADATA_CALLED_STATE, PLUGIN_DESTROY_CALLED_STATE } plugin_state; -typedef struct -{ +typedef struct { const char *key; const char *value; } plugin_metadata; -static const plugin_metadata plugin_md[] = { {"foo", "bar"}, {"hi", "there"} }; +static const plugin_metadata plugin_md[] = {{"foo", "bar"}, {"hi", "there"}}; -static void -plugin_get_metadata_success (void *state, const char *service_url, grpc_credentials_plugin_metadata_cb cb, void *user_data) -{ +static void plugin_get_metadata_success(void *state, const char *service_url, + grpc_credentials_plugin_metadata_cb cb, + void *user_data) { size_t i; - grpc_metadata md[GPR_ARRAY_SIZE (plugin_md)]; - plugin_state *s = (plugin_state *) state; - GPR_ASSERT (strcmp (service_url, test_service_url) == 0); + grpc_metadata md[GPR_ARRAY_SIZE(plugin_md)]; + plugin_state *s = (plugin_state *)state; + GPR_ASSERT(strcmp(service_url, test_service_url) == 0); *s = PLUGIN_GET_METADATA_CALLED_STATE; - for (i = 0; i < GPR_ARRAY_SIZE (plugin_md); i++) - { - memset (&md[i], 0, sizeof (grpc_metadata)); - md[i].key = plugin_md[i].key; - md[i].value = plugin_md[i].value; - md[i].value_length = strlen (plugin_md[i].value); - } - cb (user_data, md, GPR_ARRAY_SIZE (md), GRPC_STATUS_OK, NULL); -} - -static void -plugin_get_metadata_failure (void *state, const char *service_url, grpc_credentials_plugin_metadata_cb cb, void *user_data) -{ - plugin_state *s = (plugin_state *) state; - GPR_ASSERT (strcmp (service_url, test_service_url) == 0); + for (i = 0; i < GPR_ARRAY_SIZE(plugin_md); i++) { + memset(&md[i], 0, sizeof(grpc_metadata)); + md[i].key = plugin_md[i].key; + md[i].value = plugin_md[i].value; + md[i].value_length = strlen(plugin_md[i].value); + } + cb(user_data, md, GPR_ARRAY_SIZE(md), GRPC_STATUS_OK, NULL); +} + +static void plugin_get_metadata_failure(void *state, const char *service_url, + grpc_credentials_plugin_metadata_cb cb, + void *user_data) { + plugin_state *s = (plugin_state *)state; + GPR_ASSERT(strcmp(service_url, test_service_url) == 0); *s = PLUGIN_GET_METADATA_CALLED_STATE; - cb (user_data, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, "Could not get metadata for plugin."); + cb(user_data, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, + "Could not get metadata for plugin."); } -static void -on_plugin_metadata_received_success (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) -{ +static void on_plugin_metadata_received_success( + grpc_exec_ctx *exec_ctx, void *user_data, grpc_credentials_md *md_elems, + size_t num_md, grpc_credentials_status status) { size_t i = 0; - GPR_ASSERT (user_data == NULL); - GPR_ASSERT (md_elems != NULL); - GPR_ASSERT (num_md == GPR_ARRAY_SIZE (plugin_md)); - for (i = 0; i < num_md; i++) - { - GPR_ASSERT (gpr_slice_str_cmp (md_elems[i].key, plugin_md[i].key) == 0); - GPR_ASSERT (gpr_slice_str_cmp (md_elems[i].value, plugin_md[i].value) == 0); - } -} - -static void -on_plugin_metadata_received_failure (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) -{ - GPR_ASSERT (user_data == NULL); - GPR_ASSERT (md_elems == NULL); - GPR_ASSERT (num_md == 0); - GPR_ASSERT (status == GRPC_CREDENTIALS_ERROR); -} - -static void -plugin_destroy (void *state) -{ - plugin_state *s = (plugin_state *) state; + GPR_ASSERT(user_data == NULL); + GPR_ASSERT(md_elems != NULL); + GPR_ASSERT(num_md == GPR_ARRAY_SIZE(plugin_md)); + for (i = 0; i < num_md; i++) { + GPR_ASSERT(gpr_slice_str_cmp(md_elems[i].key, plugin_md[i].key) == 0); + GPR_ASSERT(gpr_slice_str_cmp(md_elems[i].value, plugin_md[i].value) == 0); + } +} + +static void on_plugin_metadata_received_failure( + grpc_exec_ctx *exec_ctx, void *user_data, grpc_credentials_md *md_elems, + size_t num_md, grpc_credentials_status status) { + GPR_ASSERT(user_data == NULL); + GPR_ASSERT(md_elems == NULL); + GPR_ASSERT(num_md == 0); + GPR_ASSERT(status == GRPC_CREDENTIALS_ERROR); +} + +static void plugin_destroy(void *state) { + plugin_state *s = (plugin_state *)state; *s = PLUGIN_DESTROY_CALLED_STATE; } -static void -test_metadata_plugin_success (void) -{ +static void test_metadata_plugin_success(void) { grpc_credentials *creds; plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; @@ -852,18 +943,18 @@ test_metadata_plugin_success (void) plugin.get_metadata = plugin_get_metadata_success; plugin.destroy = plugin_destroy; - creds = grpc_metadata_credentials_create_from_plugin (plugin, NULL); - GPR_ASSERT (state == PLUGIN_INITIAL_STATE); - grpc_credentials_get_request_metadata (&exec_ctx, creds, NULL, test_service_url, on_plugin_metadata_received_success, NULL); - GPR_ASSERT (state == PLUGIN_GET_METADATA_CALLED_STATE); - grpc_credentials_release (creds); - GPR_ASSERT (state == PLUGIN_DESTROY_CALLED_STATE); - grpc_exec_ctx_finish (&exec_ctx); + creds = grpc_metadata_credentials_create_from_plugin(plugin, NULL); + GPR_ASSERT(state == PLUGIN_INITIAL_STATE); + grpc_credentials_get_request_metadata( + &exec_ctx, creds, NULL, test_service_url, + on_plugin_metadata_received_success, NULL); + GPR_ASSERT(state == PLUGIN_GET_METADATA_CALLED_STATE); + grpc_credentials_release(creds); + GPR_ASSERT(state == PLUGIN_DESTROY_CALLED_STATE); + grpc_exec_ctx_finish(&exec_ctx); } -static void -test_metadata_plugin_failure (void) -{ +static void test_metadata_plugin_failure(void) { grpc_credentials *creds; plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; @@ -873,45 +964,45 @@ test_metadata_plugin_failure (void) plugin.get_metadata = plugin_get_metadata_failure; plugin.destroy = plugin_destroy; - creds = grpc_metadata_credentials_create_from_plugin (plugin, NULL); - GPR_ASSERT (state == PLUGIN_INITIAL_STATE); - grpc_credentials_get_request_metadata (&exec_ctx, creds, NULL, test_service_url, on_plugin_metadata_received_failure, NULL); - GPR_ASSERT (state == PLUGIN_GET_METADATA_CALLED_STATE); - grpc_credentials_release (creds); - GPR_ASSERT (state == PLUGIN_DESTROY_CALLED_STATE); - grpc_exec_ctx_finish (&exec_ctx); -} - -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_empty_md_store (); - test_ref_unref_empty_md_store (); - test_add_to_empty_md_store (); - test_add_cstrings_to_empty_md_store (); - test_empty_preallocated_md_store (); - test_add_abunch_to_md_store (); - test_oauth2_token_fetcher_creds_parsing_ok (); - test_oauth2_token_fetcher_creds_parsing_bad_http_status (); - test_oauth2_token_fetcher_creds_parsing_empty_http_body (); - test_oauth2_token_fetcher_creds_parsing_invalid_json (); - test_oauth2_token_fetcher_creds_parsing_missing_token (); - test_oauth2_token_fetcher_creds_parsing_missing_token_type (); - test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime (); - test_google_iam_creds (); - test_access_token_creds (); - test_ssl_oauth2_composite_creds (); - test_ssl_oauth2_google_iam_composite_creds (); - test_compute_engine_creds_success (); - test_compute_engine_creds_failure (); - test_refresh_token_creds_success (); - test_refresh_token_creds_failure (); - test_jwt_creds_success (); - test_jwt_creds_signing_failure (); - test_google_default_creds_auth_key (); - test_google_default_creds_access_token (); - test_metadata_plugin_success (); - test_metadata_plugin_failure (); + creds = grpc_metadata_credentials_create_from_plugin(plugin, NULL); + GPR_ASSERT(state == PLUGIN_INITIAL_STATE); + grpc_credentials_get_request_metadata( + &exec_ctx, creds, NULL, test_service_url, + on_plugin_metadata_received_failure, NULL); + GPR_ASSERT(state == PLUGIN_GET_METADATA_CALLED_STATE); + grpc_credentials_release(creds); + GPR_ASSERT(state == PLUGIN_DESTROY_CALLED_STATE); + grpc_exec_ctx_finish(&exec_ctx); +} + +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_empty_md_store(); + test_ref_unref_empty_md_store(); + test_add_to_empty_md_store(); + test_add_cstrings_to_empty_md_store(); + test_empty_preallocated_md_store(); + test_add_abunch_to_md_store(); + test_oauth2_token_fetcher_creds_parsing_ok(); + test_oauth2_token_fetcher_creds_parsing_bad_http_status(); + test_oauth2_token_fetcher_creds_parsing_empty_http_body(); + test_oauth2_token_fetcher_creds_parsing_invalid_json(); + test_oauth2_token_fetcher_creds_parsing_missing_token(); + test_oauth2_token_fetcher_creds_parsing_missing_token_type(); + test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime(); + test_google_iam_creds(); + test_access_token_creds(); + test_ssl_oauth2_composite_creds(); + test_ssl_oauth2_google_iam_composite_creds(); + test_compute_engine_creds_success(); + test_compute_engine_creds_failure(); + test_refresh_token_creds_success(); + test_refresh_token_creds_failure(); + test_jwt_creds_success(); + test_jwt_creds_signing_failure(); + test_google_default_creds_auth_key(); + test_google_default_creds_access_token(); + test_metadata_plugin_success(); + test_metadata_plugin_failure(); return 0; } diff --git a/test/core/security/fetch_oauth2.c b/test/core/security/fetch_oauth2.c index 529d455b859..764d8da9b60 100644 --- a/test/core/security/fetch_oauth2.c +++ b/test/core/security/fetch_oauth2.c @@ -46,78 +46,77 @@ #include "src/core/support/file.h" #include "test/core/security/oauth2_utils.h" -static grpc_credentials * -create_refresh_token_creds (const char *json_refresh_token_file_path) -{ +static grpc_credentials *create_refresh_token_creds( + const char *json_refresh_token_file_path) { int success; - gpr_slice refresh_token = gpr_load_file (json_refresh_token_file_path, 1, &success); - if (!success) - { - gpr_log (GPR_ERROR, "Could not read file %s.", json_refresh_token_file_path); - exit (1); - } - return grpc_google_refresh_token_credentials_create ((const char *) GPR_SLICE_START_PTR (refresh_token), NULL); + gpr_slice refresh_token = + gpr_load_file(json_refresh_token_file_path, 1, &success); + if (!success) { + gpr_log(GPR_ERROR, "Could not read file %s.", json_refresh_token_file_path); + exit(1); + } + return grpc_google_refresh_token_credentials_create( + (const char *)GPR_SLICE_START_PTR(refresh_token), NULL); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { grpc_credentials *creds = NULL; char *json_key_file_path = NULL; char *json_refresh_token_file_path = NULL; char *token = NULL; int use_gce = 0; char *scope = NULL; - gpr_cmdline *cl = gpr_cmdline_create ("fetch_oauth2"); - gpr_cmdline_add_string (cl, "json_refresh_token", "File path of the json refresh token.", &json_refresh_token_file_path); - gpr_cmdline_add_flag (cl, "gce", "Get a token from the GCE metadata server (only works in GCE).", &use_gce); - gpr_cmdline_parse (cl, argc, argv); + gpr_cmdline *cl = gpr_cmdline_create("fetch_oauth2"); + gpr_cmdline_add_string(cl, "json_refresh_token", + "File path of the json refresh token.", + &json_refresh_token_file_path); + gpr_cmdline_add_flag( + cl, "gce", + "Get a token from the GCE metadata server (only works in GCE).", + &use_gce); + gpr_cmdline_parse(cl, argc, argv); - grpc_init (); + grpc_init(); - if (json_key_file_path != NULL && json_refresh_token_file_path != NULL) - { - gpr_log (GPR_ERROR, "--json_key and --json_refresh_token are mutually exclusive."); - exit (1); - } + if (json_key_file_path != NULL && json_refresh_token_file_path != NULL) { + gpr_log(GPR_ERROR, + "--json_key and --json_refresh_token are mutually exclusive."); + exit(1); + } - if (use_gce) - { - if (json_key_file_path != NULL || scope != NULL) - { - gpr_log (GPR_INFO, "Ignoring json key and scope to get a token from the GCE " "metadata server."); - } - creds = grpc_google_compute_engine_credentials_create (NULL); - if (creds == NULL) - { - gpr_log (GPR_ERROR, "Could not create gce credentials."); - exit (1); - } + if (use_gce) { + if (json_key_file_path != NULL || scope != NULL) { + gpr_log(GPR_INFO, + "Ignoring json key and scope to get a token from the GCE " + "metadata server."); } - else if (json_refresh_token_file_path != NULL) - { - creds = create_refresh_token_creds (json_refresh_token_file_path); - if (creds == NULL) - { - gpr_log (GPR_ERROR, "Could not create refresh token creds. %s does probably not " "contain a valid json refresh token.", json_refresh_token_file_path); - exit (1); - } + creds = grpc_google_compute_engine_credentials_create(NULL); + if (creds == NULL) { + gpr_log(GPR_ERROR, "Could not create gce credentials."); + exit(1); } - else - { - gpr_log (GPR_ERROR, "Missing --gce or --json_refresh_token option."); - exit (1); + } else if (json_refresh_token_file_path != NULL) { + creds = create_refresh_token_creds(json_refresh_token_file_path); + if (creds == NULL) { + gpr_log(GPR_ERROR, + "Could not create refresh token creds. %s does probably not " + "contain a valid json refresh token.", + json_refresh_token_file_path); + exit(1); } - GPR_ASSERT (creds != NULL); + } else { + gpr_log(GPR_ERROR, "Missing --gce or --json_refresh_token option."); + exit(1); + } + GPR_ASSERT(creds != NULL); - token = grpc_test_fetch_oauth2_token_with_credentials (creds); - if (token != NULL) - { - printf ("Got token: %s.\n", token); - gpr_free (token); - } - grpc_credentials_release (creds); - gpr_cmdline_destroy (cl); - grpc_shutdown (); + token = grpc_test_fetch_oauth2_token_with_credentials(creds); + if (token != NULL) { + printf("Got token: %s.\n", token); + gpr_free(token); + } + grpc_credentials_release(creds); + gpr_cmdline_destroy(cl); + grpc_shutdown(); return 0; } diff --git a/test/core/security/json_token_test.c b/test/core/security/json_token_test.c index d57340f107a..740fd018b61 100644 --- a/test/core/security/json_token_test.c +++ b/test/core/security/json_token_test.c @@ -47,174 +47,230 @@ /* This JSON key was generated with the GCE console and revoked immediately. The identifiers have been changed as well. Maximum size for a string literal is 509 chars in C89, yay! */ -static const char test_json_key_str_part1[] = "{ \"private_key\": \"-----BEGIN PRIVATE KEY-----" "\\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOEvJsnoHnyHkXcp\\n7mJE" "qg" "WGjiw71NfXByguekSKho65FxaGbsnSM9SMQAqVk7Q2rG+I0OpsT0LrWQtZ\\nyjSeg/" "rWBQvS4hle4LfijkP3J5BG+" "IXDMP8RfziNRQsenAXDNPkY4kJCvKux2xdD\\nOnVF6N7dL3nTYZg+" "uQrNsMTz9UxVAgMBAAECgYEAzbLewe1xe9vy+2GoSsfib+28\\nDZgSE6Bu/" "zuFoPrRc6qL9p2SsnV7txrunTyJkkOnPLND9ABAXybRTlcVKP/sGgza\\n/" "8HpCqFYM9V8f34SBWfD4fRFT+n/" "73cfRUtGXdXpseva2lh8RilIQfPhNZAncenU\\ngqXjDvpkypEusgXAykECQQD+"; -static const char test_json_key_str_part2[] = "53XxNVnxBHsYb+AYEfklR96yVi8HywjVHP34+OQZ\\nCslxoHQM8s+" "dBnjfScLu22JqkPv04xyxmt0QAKm9+vTdAkEA4ib7YvEAn2jXzcCI\\nEkoy2L/" "XydR1GCHoacdfdAwiL2npOdnbvi4ZmdYRPY1LSTO058tQHKVXV7NLeCa3\\nAARh2QJBAMKeDA" "G" "W303SQv2cZTdbeaLKJbB5drz3eo3j7dDKjrTD9JupixFbzcGw\\n8FZi5c8idxiwC36kbAL6Hz" "A" "ZoX+ofI0CQE6KCzPJTtYNqyShgKAZdJ8hwOcvCZtf\\n6z8RJm0+" "6YBd38lfh5j8mZd7aHFf6I17j5AQY7oPEc47TjJj/" "5nZ68ECQQDvYuI3\\nLyK5fS8g0SYbmPOL9TlcHDOqwG0mrX9qpg5DC2fniXNSrrZ64GTDKdzZ" "Y" "Ap6LI9W\\nIqv4vr6y38N79TTC\\n-----END PRIVATE KEY-----\\n\", "; -static const char test_json_key_str_part3[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; +static const char test_json_key_str_part1[] = + "{ \"private_key\": \"-----BEGIN PRIVATE KEY-----" + "\\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOEvJsnoHnyHkXcp\\n7mJE" + "qg" + "WGjiw71NfXByguekSKho65FxaGbsnSM9SMQAqVk7Q2rG+I0OpsT0LrWQtZ\\nyjSeg/" + "rWBQvS4hle4LfijkP3J5BG+" + "IXDMP8RfziNRQsenAXDNPkY4kJCvKux2xdD\\nOnVF6N7dL3nTYZg+" + "uQrNsMTz9UxVAgMBAAECgYEAzbLewe1xe9vy+2GoSsfib+28\\nDZgSE6Bu/" + "zuFoPrRc6qL9p2SsnV7txrunTyJkkOnPLND9ABAXybRTlcVKP/sGgza\\n/" + "8HpCqFYM9V8f34SBWfD4fRFT+n/" + "73cfRUtGXdXpseva2lh8RilIQfPhNZAncenU\\ngqXjDvpkypEusgXAykECQQD+"; +static const char test_json_key_str_part2[] = + "53XxNVnxBHsYb+AYEfklR96yVi8HywjVHP34+OQZ\\nCslxoHQM8s+" + "dBnjfScLu22JqkPv04xyxmt0QAKm9+vTdAkEA4ib7YvEAn2jXzcCI\\nEkoy2L/" + "XydR1GCHoacdfdAwiL2npOdnbvi4ZmdYRPY1LSTO058tQHKVXV7NLeCa3\\nAARh2QJBAMKeDA" + "G" + "W303SQv2cZTdbeaLKJbB5drz3eo3j7dDKjrTD9JupixFbzcGw\\n8FZi5c8idxiwC36kbAL6Hz" + "A" + "ZoX+ofI0CQE6KCzPJTtYNqyShgKAZdJ8hwOcvCZtf\\n6z8RJm0+" + "6YBd38lfh5j8mZd7aHFf6I17j5AQY7oPEc47TjJj/" + "5nZ68ECQQDvYuI3\\nLyK5fS8g0SYbmPOL9TlcHDOqwG0mrX9qpg5DC2fniXNSrrZ64GTDKdzZ" + "Y" + "Ap6LI9W\\nIqv4vr6y38N79TTC\\n-----END PRIVATE KEY-----\\n\", "; +static const char test_json_key_str_part3[] = + "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " + "\"client_email\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." + "com\", \"client_id\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." + "com\", \"type\": \"service_account\" }"; /* Test refresh token. */ -static const char test_refresh_token_str[] = "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," " \"type\": \"authorized_user\"}"; +static const char test_refresh_token_str[] = + "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," + " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," + " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," + " \"type\": \"authorized_user\"}"; static const char test_scope[] = "myperm1 myperm2"; static const char test_service_url[] = "https://foo.com/foo.v1"; -static char * -test_json_key_str (const char *bad_part3) -{ +static char *test_json_key_str(const char *bad_part3) { const char *part3 = bad_part3 != NULL ? bad_part3 : test_json_key_str_part3; - size_t result_len = strlen (test_json_key_str_part1) + strlen (test_json_key_str_part2) + strlen (part3); - char *result = gpr_malloc (result_len + 1); + size_t result_len = strlen(test_json_key_str_part1) + + strlen(test_json_key_str_part2) + strlen(part3); + char *result = gpr_malloc(result_len + 1); char *current = result; - strcpy (result, test_json_key_str_part1); - current += strlen (test_json_key_str_part1); - strcpy (current, test_json_key_str_part2); - current += strlen (test_json_key_str_part2); - strcpy (current, part3); + strcpy(result, test_json_key_str_part1); + current += strlen(test_json_key_str_part1); + strcpy(current, test_json_key_str_part2); + current += strlen(test_json_key_str_part2); + strcpy(current, part3); return result; } -static void -test_parse_json_key_success (void) -{ - char *json_string = test_json_key_str (NULL); - grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (json_string); - GPR_ASSERT (grpc_auth_json_key_is_valid (&json_key)); - GPR_ASSERT (json_key.type != NULL && strcmp (json_key.type, "service_account") == 0); - GPR_ASSERT (json_key.private_key_id != NULL && strcmp (json_key.private_key_id, "e6b5137873db8d2ef81e06a47289e6434ec8a165") == 0); - GPR_ASSERT (json_key.client_id != NULL && strcmp (json_key.client_id, "777-abaslkan11hlb6nmim3bpspl31ud.apps." "googleusercontent.com") == 0); - GPR_ASSERT (json_key.client_email != NULL && strcmp (json_key.client_email, "777-abaslkan11hlb6nmim3bpspl31ud@developer." "gserviceaccount.com") == 0); - GPR_ASSERT (json_key.private_key != NULL); - gpr_free (json_string); - grpc_auth_json_key_destruct (&json_key); +static void test_parse_json_key_success(void) { + char *json_string = test_json_key_str(NULL); + grpc_auth_json_key json_key = + grpc_auth_json_key_create_from_string(json_string); + GPR_ASSERT(grpc_auth_json_key_is_valid(&json_key)); + GPR_ASSERT(json_key.type != NULL && + strcmp(json_key.type, "service_account") == 0); + GPR_ASSERT(json_key.private_key_id != NULL && + strcmp(json_key.private_key_id, + "e6b5137873db8d2ef81e06a47289e6434ec8a165") == 0); + GPR_ASSERT(json_key.client_id != NULL && + strcmp(json_key.client_id, + "777-abaslkan11hlb6nmim3bpspl31ud.apps." + "googleusercontent.com") == 0); + GPR_ASSERT(json_key.client_email != NULL && + strcmp(json_key.client_email, + "777-abaslkan11hlb6nmim3bpspl31ud@developer." + "gserviceaccount.com") == 0); + GPR_ASSERT(json_key.private_key != NULL); + gpr_free(json_string); + grpc_auth_json_key_destruct(&json_key); } -static void -test_parse_json_key_failure_bad_json (void) -{ - const char non_closing_part3[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" "; - char *json_string = test_json_key_str (non_closing_part3); - grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (json_string); - GPR_ASSERT (!grpc_auth_json_key_is_valid (&json_key)); - gpr_free (json_string); - grpc_auth_json_key_destruct (&json_key); +static void test_parse_json_key_failure_bad_json(void) { + const char non_closing_part3[] = + "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " + "\"client_email\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." + "com\", \"client_id\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." + "com\", \"type\": \"service_account\" "; + char *json_string = test_json_key_str(non_closing_part3); + grpc_auth_json_key json_key = + grpc_auth_json_key_create_from_string(json_string); + GPR_ASSERT(!grpc_auth_json_key_is_valid(&json_key)); + gpr_free(json_string); + grpc_auth_json_key_destruct(&json_key); } -static void -test_parse_json_key_failure_no_type (void) -{ - const char no_type_part3[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\" }"; - char *json_string = test_json_key_str (no_type_part3); - grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (json_string); - GPR_ASSERT (!grpc_auth_json_key_is_valid (&json_key)); - gpr_free (json_string); - grpc_auth_json_key_destruct (&json_key); +static void test_parse_json_key_failure_no_type(void) { + const char no_type_part3[] = + "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " + "\"client_email\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." + "com\", \"client_id\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." + "com\" }"; + char *json_string = test_json_key_str(no_type_part3); + grpc_auth_json_key json_key = + grpc_auth_json_key_create_from_string(json_string); + GPR_ASSERT(!grpc_auth_json_key_is_valid(&json_key)); + gpr_free(json_string); + grpc_auth_json_key_destruct(&json_key); } -static void -test_parse_json_key_failure_no_client_id (void) -{ - const char no_client_id_part3[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", " "\"type\": \"service_account\" }"; - char *json_string = test_json_key_str (no_client_id_part3); - grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (json_string); - GPR_ASSERT (!grpc_auth_json_key_is_valid (&json_key)); - gpr_free (json_string); - grpc_auth_json_key_destruct (&json_key); +static void test_parse_json_key_failure_no_client_id(void) { + const char no_client_id_part3[] = + "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " + "\"client_email\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." + "com\", " + "\"type\": \"service_account\" }"; + char *json_string = test_json_key_str(no_client_id_part3); + grpc_auth_json_key json_key = + grpc_auth_json_key_create_from_string(json_string); + GPR_ASSERT(!grpc_auth_json_key_is_valid(&json_key)); + gpr_free(json_string); + grpc_auth_json_key_destruct(&json_key); } -static void -test_parse_json_key_failure_no_client_email (void) -{ - const char no_client_email_part3[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; - char *json_string = test_json_key_str (no_client_email_part3); - grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (json_string); - GPR_ASSERT (!grpc_auth_json_key_is_valid (&json_key)); - gpr_free (json_string); - grpc_auth_json_key_destruct (&json_key); +static void test_parse_json_key_failure_no_client_email(void) { + const char no_client_email_part3[] = + "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " + "\"client_id\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." + "com\", \"type\": \"service_account\" }"; + char *json_string = test_json_key_str(no_client_email_part3); + grpc_auth_json_key json_key = + grpc_auth_json_key_create_from_string(json_string); + GPR_ASSERT(!grpc_auth_json_key_is_valid(&json_key)); + gpr_free(json_string); + grpc_auth_json_key_destruct(&json_key); } -static void -test_parse_json_key_failure_no_private_key_id (void) -{ - const char no_private_key_id_part3[] = "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; - char *json_string = test_json_key_str (no_private_key_id_part3); - grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (json_string); - GPR_ASSERT (!grpc_auth_json_key_is_valid (&json_key)); - gpr_free (json_string); - grpc_auth_json_key_destruct (&json_key); +static void test_parse_json_key_failure_no_private_key_id(void) { + const char no_private_key_id_part3[] = + "\"client_email\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." + "com\", \"client_id\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." + "com\", \"type\": \"service_account\" }"; + char *json_string = test_json_key_str(no_private_key_id_part3); + grpc_auth_json_key json_key = + grpc_auth_json_key_create_from_string(json_string); + GPR_ASSERT(!grpc_auth_json_key_is_valid(&json_key)); + gpr_free(json_string); + grpc_auth_json_key_destruct(&json_key); } -static void -test_parse_json_key_failure_no_private_key (void) -{ - const char no_private_key_json_string[] = "{ \"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; - grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (no_private_key_json_string); - GPR_ASSERT (!grpc_auth_json_key_is_valid (&json_key)); - grpc_auth_json_key_destruct (&json_key); +static void test_parse_json_key_failure_no_private_key(void) { + const char no_private_key_json_string[] = + "{ \"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " + "\"client_email\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." + "com\", \"client_id\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." + "com\", \"type\": \"service_account\" }"; + grpc_auth_json_key json_key = + grpc_auth_json_key_create_from_string(no_private_key_json_string); + GPR_ASSERT(!grpc_auth_json_key_is_valid(&json_key)); + grpc_auth_json_key_destruct(&json_key); } -static grpc_json * -parse_json_part_from_jwt (const char *str, size_t len, char **scratchpad) -{ +static grpc_json *parse_json_part_from_jwt(const char *str, size_t len, + char **scratchpad) { char *b64; char *decoded; grpc_json *json; gpr_slice slice; - b64 = gpr_malloc (len + 1); - strncpy (b64, str, len); + b64 = gpr_malloc(len + 1); + strncpy(b64, str, len); b64[len] = '\0'; - slice = grpc_base64_decode (b64, 1); - GPR_ASSERT (!GPR_SLICE_IS_EMPTY (slice)); - decoded = gpr_malloc (GPR_SLICE_LENGTH (slice) + 1); - strncpy (decoded, (const char *) GPR_SLICE_START_PTR (slice), GPR_SLICE_LENGTH (slice)); - decoded[GPR_SLICE_LENGTH (slice)] = '\0'; - json = grpc_json_parse_string (decoded); - gpr_free (b64); + slice = grpc_base64_decode(b64, 1); + GPR_ASSERT(!GPR_SLICE_IS_EMPTY(slice)); + decoded = gpr_malloc(GPR_SLICE_LENGTH(slice) + 1); + strncpy(decoded, (const char *)GPR_SLICE_START_PTR(slice), + GPR_SLICE_LENGTH(slice)); + decoded[GPR_SLICE_LENGTH(slice)] = '\0'; + json = grpc_json_parse_string(decoded); + gpr_free(b64); *scratchpad = decoded; - gpr_slice_unref (slice); + gpr_slice_unref(slice); return json; } -static void -check_jwt_header (grpc_json * header) -{ +static void check_jwt_header(grpc_json *header) { grpc_json *ptr; grpc_json *alg = NULL; grpc_json *typ = NULL; grpc_json *kid = NULL; - for (ptr = header->child; ptr; ptr = ptr->next) - { - if (strcmp (ptr->key, "alg") == 0) - { - alg = ptr; - } - else if (strcmp (ptr->key, "typ") == 0) - { - typ = ptr; - } - else if (strcmp (ptr->key, "kid") == 0) - { - kid = ptr; - } + for (ptr = header->child; ptr; ptr = ptr->next) { + if (strcmp(ptr->key, "alg") == 0) { + alg = ptr; + } else if (strcmp(ptr->key, "typ") == 0) { + typ = ptr; + } else if (strcmp(ptr->key, "kid") == 0) { + kid = ptr; } - GPR_ASSERT (alg != NULL); - GPR_ASSERT (alg->type == GRPC_JSON_STRING); - GPR_ASSERT (strcmp (alg->value, "RS256") == 0); - - GPR_ASSERT (typ != NULL); - GPR_ASSERT (typ->type == GRPC_JSON_STRING); - GPR_ASSERT (strcmp (typ->value, "JWT") == 0); - - GPR_ASSERT (kid != NULL); - GPR_ASSERT (kid->type == GRPC_JSON_STRING); - GPR_ASSERT (strcmp (kid->value, "e6b5137873db8d2ef81e06a47289e6434ec8a165") == 0); + } + GPR_ASSERT(alg != NULL); + GPR_ASSERT(alg->type == GRPC_JSON_STRING); + GPR_ASSERT(strcmp(alg->value, "RS256") == 0); + + GPR_ASSERT(typ != NULL); + GPR_ASSERT(typ->type == GRPC_JSON_STRING); + GPR_ASSERT(strcmp(typ->value, "JWT") == 0); + + GPR_ASSERT(kid != NULL); + GPR_ASSERT(kid->type == GRPC_JSON_STRING); + GPR_ASSERT(strcmp(kid->value, "e6b5137873db8d2ef81e06a47289e6434ec8a165") == + 0); } -static void -check_jwt_claim (grpc_json * claim, const char *expected_audience, const char *expected_scope) -{ - gpr_timespec expiration = gpr_time_0 (GPR_CLOCK_REALTIME); - gpr_timespec issue_time = gpr_time_0 (GPR_CLOCK_REALTIME); +static void check_jwt_claim(grpc_json *claim, const char *expected_audience, + const char *expected_scope) { + gpr_timespec expiration = gpr_time_0(GPR_CLOCK_REALTIME); + gpr_timespec issue_time = gpr_time_0(GPR_CLOCK_REALTIME); gpr_timespec parsed_lifetime; grpc_json *iss = NULL; grpc_json *scope = NULL; @@ -224,231 +280,228 @@ check_jwt_claim (grpc_json * claim, const char *expected_audience, const char *e grpc_json *sub = NULL; grpc_json *ptr; - for (ptr = claim->child; ptr; ptr = ptr->next) - { - if (strcmp (ptr->key, "iss") == 0) - { - iss = ptr; - } - else if (strcmp (ptr->key, "sub") == 0) - { - sub = ptr; - } - else if (strcmp (ptr->key, "scope") == 0) - { - scope = ptr; - } - else if (strcmp (ptr->key, "aud") == 0) - { - aud = ptr; - } - else if (strcmp (ptr->key, "exp") == 0) - { - exp = ptr; - } - else if (strcmp (ptr->key, "iat") == 0) - { - iat = ptr; - } - } - - GPR_ASSERT (iss != NULL); - GPR_ASSERT (iss->type == GRPC_JSON_STRING); - GPR_ASSERT (strcmp (iss->value, "777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount.com") == 0); - - if (expected_scope != NULL) - { - GPR_ASSERT (scope != NULL); - GPR_ASSERT (sub == NULL); - GPR_ASSERT (scope->type == GRPC_JSON_STRING); - GPR_ASSERT (strcmp (scope->value, expected_scope) == 0); + for (ptr = claim->child; ptr; ptr = ptr->next) { + if (strcmp(ptr->key, "iss") == 0) { + iss = ptr; + } else if (strcmp(ptr->key, "sub") == 0) { + sub = ptr; + } else if (strcmp(ptr->key, "scope") == 0) { + scope = ptr; + } else if (strcmp(ptr->key, "aud") == 0) { + aud = ptr; + } else if (strcmp(ptr->key, "exp") == 0) { + exp = ptr; + } else if (strcmp(ptr->key, "iat") == 0) { + iat = ptr; } - else - { - /* Claims without scope must have a sub. */ - GPR_ASSERT (scope == NULL); - GPR_ASSERT (sub != NULL); - GPR_ASSERT (sub->type == GRPC_JSON_STRING); - GPR_ASSERT (strcmp (iss->value, sub->value) == 0); - } - - GPR_ASSERT (aud != NULL); - GPR_ASSERT (aud->type == GRPC_JSON_STRING); - GPR_ASSERT (strcmp (aud->value, expected_audience) == 0); - - GPR_ASSERT (exp != NULL); - GPR_ASSERT (exp->type == GRPC_JSON_NUMBER); - expiration.tv_sec = strtol (exp->value, NULL, 10); - - GPR_ASSERT (iat != NULL); - GPR_ASSERT (iat->type == GRPC_JSON_NUMBER); - issue_time.tv_sec = strtol (iat->value, NULL, 10); - - parsed_lifetime = gpr_time_sub (expiration, issue_time); - GPR_ASSERT (parsed_lifetime.tv_sec == grpc_max_auth_token_lifetime.tv_sec); + } + + GPR_ASSERT(iss != NULL); + GPR_ASSERT(iss->type == GRPC_JSON_STRING); + GPR_ASSERT( + strcmp( + iss->value, + "777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount.com") == + 0); + + if (expected_scope != NULL) { + GPR_ASSERT(scope != NULL); + GPR_ASSERT(sub == NULL); + GPR_ASSERT(scope->type == GRPC_JSON_STRING); + GPR_ASSERT(strcmp(scope->value, expected_scope) == 0); + } else { + /* Claims without scope must have a sub. */ + GPR_ASSERT(scope == NULL); + GPR_ASSERT(sub != NULL); + GPR_ASSERT(sub->type == GRPC_JSON_STRING); + GPR_ASSERT(strcmp(iss->value, sub->value) == 0); + } + + GPR_ASSERT(aud != NULL); + GPR_ASSERT(aud->type == GRPC_JSON_STRING); + GPR_ASSERT(strcmp(aud->value, expected_audience) == 0); + + GPR_ASSERT(exp != NULL); + GPR_ASSERT(exp->type == GRPC_JSON_NUMBER); + expiration.tv_sec = strtol(exp->value, NULL, 10); + + GPR_ASSERT(iat != NULL); + GPR_ASSERT(iat->type == GRPC_JSON_NUMBER); + issue_time.tv_sec = strtol(iat->value, NULL, 10); + + parsed_lifetime = gpr_time_sub(expiration, issue_time); + GPR_ASSERT(parsed_lifetime.tv_sec == grpc_max_auth_token_lifetime.tv_sec); } -static void -check_jwt_signature (const char *b64_signature, RSA * rsa_key, const char *signed_data, size_t signed_data_size) -{ - EVP_MD_CTX *md_ctx = EVP_MD_CTX_create (); - EVP_PKEY *key = EVP_PKEY_new (); - - gpr_slice sig = grpc_base64_decode (b64_signature, 1); - GPR_ASSERT (!GPR_SLICE_IS_EMPTY (sig)); - GPR_ASSERT (GPR_SLICE_LENGTH (sig) == 128); - - GPR_ASSERT (md_ctx != NULL); - GPR_ASSERT (key != NULL); - EVP_PKEY_set1_RSA (key, rsa_key); - - GPR_ASSERT (EVP_DigestVerifyInit (md_ctx, NULL, EVP_sha256 (), NULL, key) == 1); - GPR_ASSERT (EVP_DigestVerifyUpdate (md_ctx, signed_data, signed_data_size) == 1); - GPR_ASSERT (EVP_DigestVerifyFinal (md_ctx, GPR_SLICE_START_PTR (sig), GPR_SLICE_LENGTH (sig)) == 1); - - gpr_slice_unref (sig); - if (key != NULL) - EVP_PKEY_free (key); - if (md_ctx != NULL) - EVP_MD_CTX_destroy (md_ctx); +static void check_jwt_signature(const char *b64_signature, RSA *rsa_key, + const char *signed_data, + size_t signed_data_size) { + EVP_MD_CTX *md_ctx = EVP_MD_CTX_create(); + EVP_PKEY *key = EVP_PKEY_new(); + + gpr_slice sig = grpc_base64_decode(b64_signature, 1); + GPR_ASSERT(!GPR_SLICE_IS_EMPTY(sig)); + GPR_ASSERT(GPR_SLICE_LENGTH(sig) == 128); + + GPR_ASSERT(md_ctx != NULL); + GPR_ASSERT(key != NULL); + EVP_PKEY_set1_RSA(key, rsa_key); + + GPR_ASSERT(EVP_DigestVerifyInit(md_ctx, NULL, EVP_sha256(), NULL, key) == 1); + GPR_ASSERT(EVP_DigestVerifyUpdate(md_ctx, signed_data, signed_data_size) == + 1); + GPR_ASSERT(EVP_DigestVerifyFinal(md_ctx, GPR_SLICE_START_PTR(sig), + GPR_SLICE_LENGTH(sig)) == 1); + + gpr_slice_unref(sig); + if (key != NULL) EVP_PKEY_free(key); + if (md_ctx != NULL) EVP_MD_CTX_destroy(md_ctx); } -static char * -service_account_creds_jwt_encode_and_sign (const grpc_auth_json_key * key) -{ - return grpc_jwt_encode_and_sign (key, GRPC_JWT_OAUTH2_AUDIENCE, grpc_max_auth_token_lifetime, test_scope); +static char *service_account_creds_jwt_encode_and_sign( + const grpc_auth_json_key *key) { + return grpc_jwt_encode_and_sign(key, GRPC_JWT_OAUTH2_AUDIENCE, + grpc_max_auth_token_lifetime, test_scope); } -static char * -jwt_creds_jwt_encode_and_sign (const grpc_auth_json_key * key) -{ - return grpc_jwt_encode_and_sign (key, test_service_url, grpc_max_auth_token_lifetime, NULL); +static char *jwt_creds_jwt_encode_and_sign(const grpc_auth_json_key *key) { + return grpc_jwt_encode_and_sign(key, test_service_url, + grpc_max_auth_token_lifetime, NULL); } -static void -service_account_creds_check_jwt_claim (grpc_json * claim) -{ - check_jwt_claim (claim, GRPC_JWT_OAUTH2_AUDIENCE, test_scope); +static void service_account_creds_check_jwt_claim(grpc_json *claim) { + check_jwt_claim(claim, GRPC_JWT_OAUTH2_AUDIENCE, test_scope); } -static void -jwt_creds_check_jwt_claim (grpc_json * claim) -{ - check_jwt_claim (claim, test_service_url, NULL); +static void jwt_creds_check_jwt_claim(grpc_json *claim) { + check_jwt_claim(claim, test_service_url, NULL); } -static void -test_jwt_encode_and_sign (char *(*jwt_encode_and_sign_func) (const grpc_auth_json_key *), void (*check_jwt_claim_func) (grpc_json *)) -{ - char *json_string = test_json_key_str (NULL); +static void test_jwt_encode_and_sign( + char *(*jwt_encode_and_sign_func)(const grpc_auth_json_key *), + void (*check_jwt_claim_func)(grpc_json *)) { + char *json_string = test_json_key_str(NULL); grpc_json *parsed_header = NULL; grpc_json *parsed_claim = NULL; char *scratchpad; - grpc_auth_json_key json_key = grpc_auth_json_key_create_from_string (json_string); + grpc_auth_json_key json_key = + grpc_auth_json_key_create_from_string(json_string); const char *b64_signature; size_t offset = 0; - char *jwt = jwt_encode_and_sign_func (&json_key); - const char *dot = strchr (jwt, '.'); - GPR_ASSERT (dot != NULL); - parsed_header = parse_json_part_from_jwt (jwt, (size_t) (dot - jwt), &scratchpad); - GPR_ASSERT (parsed_header != NULL); - check_jwt_header (parsed_header); - offset = (size_t) (dot - jwt) + 1; - grpc_json_destroy (parsed_header); - gpr_free (scratchpad); - - dot = strchr (jwt + offset, '.'); - GPR_ASSERT (dot != NULL); - parsed_claim = parse_json_part_from_jwt (jwt + offset, (size_t) (dot - (jwt + offset)), &scratchpad); - GPR_ASSERT (parsed_claim != NULL); - check_jwt_claim_func (parsed_claim); - offset = (size_t) (dot - jwt) + 1; - grpc_json_destroy (parsed_claim); - gpr_free (scratchpad); - - dot = strchr (jwt + offset, '.'); - GPR_ASSERT (dot == NULL); /* no more part. */ + char *jwt = jwt_encode_and_sign_func(&json_key); + const char *dot = strchr(jwt, '.'); + GPR_ASSERT(dot != NULL); + parsed_header = + parse_json_part_from_jwt(jwt, (size_t)(dot - jwt), &scratchpad); + GPR_ASSERT(parsed_header != NULL); + check_jwt_header(parsed_header); + offset = (size_t)(dot - jwt) + 1; + grpc_json_destroy(parsed_header); + gpr_free(scratchpad); + + dot = strchr(jwt + offset, '.'); + GPR_ASSERT(dot != NULL); + parsed_claim = parse_json_part_from_jwt( + jwt + offset, (size_t)(dot - (jwt + offset)), &scratchpad); + GPR_ASSERT(parsed_claim != NULL); + check_jwt_claim_func(parsed_claim); + offset = (size_t)(dot - jwt) + 1; + grpc_json_destroy(parsed_claim); + gpr_free(scratchpad); + + dot = strchr(jwt + offset, '.'); + GPR_ASSERT(dot == NULL); /* no more part. */ b64_signature = jwt + offset; - check_jwt_signature (b64_signature, json_key.private_key, jwt, offset - 1); + check_jwt_signature(b64_signature, json_key.private_key, jwt, offset - 1); - gpr_free (json_string); - grpc_auth_json_key_destruct (&json_key); - gpr_free (jwt); + gpr_free(json_string); + grpc_auth_json_key_destruct(&json_key); + gpr_free(jwt); } -static void -test_service_account_creds_jwt_encode_and_sign (void) -{ - test_jwt_encode_and_sign (service_account_creds_jwt_encode_and_sign, service_account_creds_check_jwt_claim); +static void test_service_account_creds_jwt_encode_and_sign(void) { + test_jwt_encode_and_sign(service_account_creds_jwt_encode_and_sign, + service_account_creds_check_jwt_claim); } -static void -test_jwt_creds_jwt_encode_and_sign (void) -{ - test_jwt_encode_and_sign (jwt_creds_jwt_encode_and_sign, jwt_creds_check_jwt_claim); +static void test_jwt_creds_jwt_encode_and_sign(void) { + test_jwt_encode_and_sign(jwt_creds_jwt_encode_and_sign, + jwt_creds_check_jwt_claim); } -static void -test_parse_refresh_token_success (void) -{ - grpc_auth_refresh_token refresh_token = grpc_auth_refresh_token_create_from_string (test_refresh_token_str); - GPR_ASSERT (grpc_auth_refresh_token_is_valid (&refresh_token)); - GPR_ASSERT (refresh_token.type != NULL && (strcmp (refresh_token.type, "authorized_user") == 0)); - GPR_ASSERT (refresh_token.client_id != NULL && (strcmp (refresh_token.client_id, "32555999999.apps.googleusercontent.com") == 0)); - GPR_ASSERT (refresh_token.client_secret != NULL && (strcmp (refresh_token.client_secret, "EmssLNjJy1332hD4KFsecret") == 0)); - GPR_ASSERT (refresh_token.refresh_token != NULL && (strcmp (refresh_token.refresh_token, "1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42") == 0)); - grpc_auth_refresh_token_destruct (&refresh_token); +static void test_parse_refresh_token_success(void) { + grpc_auth_refresh_token refresh_token = + grpc_auth_refresh_token_create_from_string(test_refresh_token_str); + GPR_ASSERT(grpc_auth_refresh_token_is_valid(&refresh_token)); + GPR_ASSERT(refresh_token.type != NULL && + (strcmp(refresh_token.type, "authorized_user") == 0)); + GPR_ASSERT(refresh_token.client_id != NULL && + (strcmp(refresh_token.client_id, + "32555999999.apps.googleusercontent.com") == 0)); + GPR_ASSERT( + refresh_token.client_secret != NULL && + (strcmp(refresh_token.client_secret, "EmssLNjJy1332hD4KFsecret") == 0)); + GPR_ASSERT(refresh_token.refresh_token != NULL && + (strcmp(refresh_token.refresh_token, + "1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42") == 0)); + grpc_auth_refresh_token_destruct(&refresh_token); } -static void -test_parse_refresh_token_failure_no_type (void) -{ - const char refresh_token_str[] = "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"}"; - grpc_auth_refresh_token refresh_token = grpc_auth_refresh_token_create_from_string (refresh_token_str); - GPR_ASSERT (!grpc_auth_refresh_token_is_valid (&refresh_token)); +static void test_parse_refresh_token_failure_no_type(void) { + const char refresh_token_str[] = + "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," + " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," + " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"}"; + grpc_auth_refresh_token refresh_token = + grpc_auth_refresh_token_create_from_string(refresh_token_str); + GPR_ASSERT(!grpc_auth_refresh_token_is_valid(&refresh_token)); } -static void -test_parse_refresh_token_failure_no_client_id (void) -{ - const char refresh_token_str[] = "{ \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," " \"type\": \"authorized_user\"}"; - grpc_auth_refresh_token refresh_token = grpc_auth_refresh_token_create_from_string (refresh_token_str); - GPR_ASSERT (!grpc_auth_refresh_token_is_valid (&refresh_token)); +static void test_parse_refresh_token_failure_no_client_id(void) { + const char refresh_token_str[] = + "{ \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," + " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," + " \"type\": \"authorized_user\"}"; + grpc_auth_refresh_token refresh_token = + grpc_auth_refresh_token_create_from_string(refresh_token_str); + GPR_ASSERT(!grpc_auth_refresh_token_is_valid(&refresh_token)); } -static void -test_parse_refresh_token_failure_no_client_secret (void) -{ - const char refresh_token_str[] = "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," " \"type\": \"authorized_user\"}"; - grpc_auth_refresh_token refresh_token = grpc_auth_refresh_token_create_from_string (refresh_token_str); - GPR_ASSERT (!grpc_auth_refresh_token_is_valid (&refresh_token)); +static void test_parse_refresh_token_failure_no_client_secret(void) { + const char refresh_token_str[] = + "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," + " \"refresh_token\": \"1/Blahblasj424jladJDSGNf-u4Sua3HDA2ngjd42\"," + " \"type\": \"authorized_user\"}"; + grpc_auth_refresh_token refresh_token = + grpc_auth_refresh_token_create_from_string(refresh_token_str); + GPR_ASSERT(!grpc_auth_refresh_token_is_valid(&refresh_token)); } -static void -test_parse_refresh_token_failure_no_refresh_token (void) -{ - const char refresh_token_str[] = "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," " \"type\": \"authorized_user\"}"; - grpc_auth_refresh_token refresh_token = grpc_auth_refresh_token_create_from_string (refresh_token_str); - GPR_ASSERT (!grpc_auth_refresh_token_is_valid (&refresh_token)); +static void test_parse_refresh_token_failure_no_refresh_token(void) { + const char refresh_token_str[] = + "{ \"client_id\": \"32555999999.apps.googleusercontent.com\"," + " \"client_secret\": \"EmssLNjJy1332hD4KFsecret\"," + " \"type\": \"authorized_user\"}"; + grpc_auth_refresh_token refresh_token = + grpc_auth_refresh_token_create_from_string(refresh_token_str); + GPR_ASSERT(!grpc_auth_refresh_token_is_valid(&refresh_token)); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_parse_json_key_success (); - test_parse_json_key_failure_bad_json (); - test_parse_json_key_failure_no_type (); - test_parse_json_key_failure_no_client_id (); - test_parse_json_key_failure_no_client_email (); - test_parse_json_key_failure_no_private_key_id (); - test_parse_json_key_failure_no_private_key (); - test_service_account_creds_jwt_encode_and_sign (); - test_jwt_creds_jwt_encode_and_sign (); - test_parse_refresh_token_success (); - test_parse_refresh_token_failure_no_type (); - test_parse_refresh_token_failure_no_client_id (); - test_parse_refresh_token_failure_no_client_secret (); - test_parse_refresh_token_failure_no_refresh_token (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_parse_json_key_success(); + test_parse_json_key_failure_bad_json(); + test_parse_json_key_failure_no_type(); + test_parse_json_key_failure_no_client_id(); + test_parse_json_key_failure_no_client_email(); + test_parse_json_key_failure_no_private_key_id(); + test_parse_json_key_failure_no_private_key(); + test_service_account_creds_jwt_encode_and_sign(); + test_jwt_creds_jwt_encode_and_sign(); + test_parse_refresh_token_success(); + test_parse_refresh_token_failure_no_type(); + test_parse_refresh_token_failure_no_client_id(); + test_parse_refresh_token_failure_no_client_secret(); + test_parse_refresh_token_failure_no_refresh_token(); return 0; } diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c index 44257468e47..6b24972b4e7 100644 --- a/test/core/security/jwt_verifier_test.c +++ b/test/core/security/jwt_verifier_test.c @@ -48,429 +48,539 @@ /* This JSON key was generated with the GCE console and revoked immediately. The identifiers have been changed as well. Maximum size for a string literal is 509 chars in C89, yay! */ -static const char json_key_str_part1[] = "{ \"private_key\": \"-----BEGIN PRIVATE KEY-----" "\\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOEvJsnoHnyHkXcp\\n7mJE" "qg" "WGjiw71NfXByguekSKho65FxaGbsnSM9SMQAqVk7Q2rG+I0OpsT0LrWQtZ\\nyjSeg/" "rWBQvS4hle4LfijkP3J5BG+" "IXDMP8RfziNRQsenAXDNPkY4kJCvKux2xdD\\nOnVF6N7dL3nTYZg+" "uQrNsMTz9UxVAgMBAAECgYEAzbLewe1xe9vy+2GoSsfib+28\\nDZgSE6Bu/" "zuFoPrRc6qL9p2SsnV7txrunTyJkkOnPLND9ABAXybRTlcVKP/sGgza\\n/" "8HpCqFYM9V8f34SBWfD4fRFT+n/" "73cfRUtGXdXpseva2lh8RilIQfPhNZAncenU\\ngqXjDvpkypEusgXAykECQQD+"; -static const char json_key_str_part2[] = "53XxNVnxBHsYb+AYEfklR96yVi8HywjVHP34+OQZ\\nCslxoHQM8s+" "dBnjfScLu22JqkPv04xyxmt0QAKm9+vTdAkEA4ib7YvEAn2jXzcCI\\nEkoy2L/" "XydR1GCHoacdfdAwiL2npOdnbvi4ZmdYRPY1LSTO058tQHKVXV7NLeCa3\\nAARh2QJBAMKeDA" "G" "W303SQv2cZTdbeaLKJbB5drz3eo3j7dDKjrTD9JupixFbzcGw\\n8FZi5c8idxiwC36kbAL6Hz" "A" "ZoX+ofI0CQE6KCzPJTtYNqyShgKAZdJ8hwOcvCZtf\\n6z8RJm0+" "6YBd38lfh5j8mZd7aHFf6I17j5AQY7oPEc47TjJj/" "5nZ68ECQQDvYuI3\\nLyK5fS8g0SYbmPOL9TlcHDOqwG0mrX9qpg5DC2fniXNSrrZ64GTDKdzZ" "Y" "Ap6LI9W\\nIqv4vr6y38N79TTC\\n-----END PRIVATE KEY-----\\n\", "; -static const char json_key_str_part3_for_google_email_issuer[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." "com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; +static const char json_key_str_part1[] = + "{ \"private_key\": \"-----BEGIN PRIVATE KEY-----" + "\\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOEvJsnoHnyHkXcp\\n7mJE" + "qg" + "WGjiw71NfXByguekSKho65FxaGbsnSM9SMQAqVk7Q2rG+I0OpsT0LrWQtZ\\nyjSeg/" + "rWBQvS4hle4LfijkP3J5BG+" + "IXDMP8RfziNRQsenAXDNPkY4kJCvKux2xdD\\nOnVF6N7dL3nTYZg+" + "uQrNsMTz9UxVAgMBAAECgYEAzbLewe1xe9vy+2GoSsfib+28\\nDZgSE6Bu/" + "zuFoPrRc6qL9p2SsnV7txrunTyJkkOnPLND9ABAXybRTlcVKP/sGgza\\n/" + "8HpCqFYM9V8f34SBWfD4fRFT+n/" + "73cfRUtGXdXpseva2lh8RilIQfPhNZAncenU\\ngqXjDvpkypEusgXAykECQQD+"; +static const char json_key_str_part2[] = + "53XxNVnxBHsYb+AYEfklR96yVi8HywjVHP34+OQZ\\nCslxoHQM8s+" + "dBnjfScLu22JqkPv04xyxmt0QAKm9+vTdAkEA4ib7YvEAn2jXzcCI\\nEkoy2L/" + "XydR1GCHoacdfdAwiL2npOdnbvi4ZmdYRPY1LSTO058tQHKVXV7NLeCa3\\nAARh2QJBAMKeDA" + "G" + "W303SQv2cZTdbeaLKJbB5drz3eo3j7dDKjrTD9JupixFbzcGw\\n8FZi5c8idxiwC36kbAL6Hz" + "A" + "ZoX+ofI0CQE6KCzPJTtYNqyShgKAZdJ8hwOcvCZtf\\n6z8RJm0+" + "6YBd38lfh5j8mZd7aHFf6I17j5AQY7oPEc47TjJj/" + "5nZ68ECQQDvYuI3\\nLyK5fS8g0SYbmPOL9TlcHDOqwG0mrX9qpg5DC2fniXNSrrZ64GTDKdzZ" + "Y" + "Ap6LI9W\\nIqv4vr6y38N79TTC\\n-----END PRIVATE KEY-----\\n\", "; +static const char json_key_str_part3_for_google_email_issuer[] = + "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " + "\"client_email\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud@developer.gserviceaccount." + "com\", \"client_id\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." + "com\", \"type\": \"service_account\" }"; /* Trick our JWT library into issuing a JWT with iss=accounts.google.com. */ -static const char json_key_str_part3_for_url_issuer[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": \"accounts.google.com\", " "\"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; -static const char json_key_str_part3_for_custom_email_issuer[] = "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " "\"client_email\": " "\"foo@bar.com\", \"client_id\": " "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." "com\", \"type\": \"service_account\" }"; +static const char json_key_str_part3_for_url_issuer[] = + "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " + "\"client_email\": \"accounts.google.com\", " + "\"client_id\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." + "com\", \"type\": \"service_account\" }"; +static const char json_key_str_part3_for_custom_email_issuer[] = + "\"private_key_id\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\", " + "\"client_email\": " + "\"foo@bar.com\", \"client_id\": " + "\"777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent." + "com\", \"type\": \"service_account\" }"; static grpc_jwt_verifier_email_domain_key_url_mapping custom_mapping = { - "bar.com", "keys.bar.com/jwk" -}; + "bar.com", "keys.bar.com/jwk"}; static const char expected_user_data[] = "user data"; -static const char good_jwk_set[] = "{" " \"keys\": [" " {" " \"kty\": \"RSA\"," " \"alg\": \"RS256\"," " \"use\": \"sig\"," " \"kid\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\"," " \"n\": " "\"4S8myegefIeRdynuYkSqBYaOLDvU19cHKC56RIqGjrkXFoZuydIz1IxACpWTtDasb4jQ6mxP" "QutZC1nKNJ6D-tYFC9LiGV7gt-KOQ_cnkEb4hcMw_xF_OI1FCx6cBcM0-" "RjiQkK8q7HbF0M6dUXo3t0vedNhmD65Cs2wxPP1TFU=\"," " \"e\": \"AQAB\"" " }" " ]" "}"; - -static gpr_timespec expected_lifetime = { 3600, 0, GPR_TIMESPAN }; - -static const char good_google_email_keys_part1[] = "{\"e6b5137873db8d2ef81e06a47289e6434ec8a165\": \"-----BEGIN " "CERTIFICATE-----" "\\nMIICATCCAWoCCQDEywLhxvHjnDANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJB\\nVTET" "MBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0\\ncyBQdHkgTHR" "kMB4XDTE1MDYyOTA4Mzk1MFoXDTI1MDYyNjA4Mzk1MFowRTELMAkG\\nA1UEBhMCQVUxEzARBg" "NVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0\\nIFdpZGdpdHMgUHR5IEx0ZDCBn" "zANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4S8m\\nyegefIeRdynuYkSqBYaOLDvU19cHKC56" "RIqGjrkXFoZuydIz1IxACpWTtDasb4jQ\\n6mxPQutZC1nKNJ6D+tYFC9LiGV7gt+KOQ/"; - -static const char good_google_email_keys_part2[] = "cnkEb4hcMw/xF/OI1FCx6cBcM0+" "Rji\\nQkK8q7HbF0M6dUXo3t0vedNhmD65Cs2wxPP1TFUCAwEAATANBgkqhkiG9w0BAQsF\\nA" "AOBgQBfu69FkPmBknbKNFgurPz78kbs3VNN+k/" "PUgO5DHKskJmgK2TbtvX2VMpx\\nkftmHGzgzMzUlOtigCaGMgHWjfqjpP9uuDbahXrZBJzB8c" "Oq7MrQF8r17qVvo3Ue\\nPjTKQMAsU8uxTEMmeuz9L6yExs0rfd6bPOrQkAoVfFfiYB3/" "pA==\\n-----END CERTIFICATE-----\\n\"}"; +static const char good_jwk_set[] = + "{" + " \"keys\": [" + " {" + " \"kty\": \"RSA\"," + " \"alg\": \"RS256\"," + " \"use\": \"sig\"," + " \"kid\": \"e6b5137873db8d2ef81e06a47289e6434ec8a165\"," + " \"n\": " + "\"4S8myegefIeRdynuYkSqBYaOLDvU19cHKC56RIqGjrkXFoZuydIz1IxACpWTtDasb4jQ6mxP" + "QutZC1nKNJ6D-tYFC9LiGV7gt-KOQ_cnkEb4hcMw_xF_OI1FCx6cBcM0-" + "RjiQkK8q7HbF0M6dUXo3t0vedNhmD65Cs2wxPP1TFU=\"," + " \"e\": \"AQAB\"" + " }" + " ]" + "}"; + +static gpr_timespec expected_lifetime = {3600, 0, GPR_TIMESPAN}; + +static const char good_google_email_keys_part1[] = + "{\"e6b5137873db8d2ef81e06a47289e6434ec8a165\": \"-----BEGIN " + "CERTIFICATE-----" + "\\nMIICATCCAWoCCQDEywLhxvHjnDANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJB\\nVTET" + "MBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0\\ncyBQdHkgTHR" + "kMB4XDTE1MDYyOTA4Mzk1MFoXDTI1MDYyNjA4Mzk1MFowRTELMAkG\\nA1UEBhMCQVUxEzARBg" + "NVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0\\nIFdpZGdpdHMgUHR5IEx0ZDCBn" + "zANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4S8m\\nyegefIeRdynuYkSqBYaOLDvU19cHKC56" + "RIqGjrkXFoZuydIz1IxACpWTtDasb4jQ\\n6mxPQutZC1nKNJ6D+tYFC9LiGV7gt+KOQ/"; + +static const char good_google_email_keys_part2[] = + "cnkEb4hcMw/xF/OI1FCx6cBcM0+" + "Rji\\nQkK8q7HbF0M6dUXo3t0vedNhmD65Cs2wxPP1TFUCAwEAATANBgkqhkiG9w0BAQsF\\nA" + "AOBgQBfu69FkPmBknbKNFgurPz78kbs3VNN+k/" + "PUgO5DHKskJmgK2TbtvX2VMpx\\nkftmHGzgzMzUlOtigCaGMgHWjfqjpP9uuDbahXrZBJzB8c" + "Oq7MrQF8r17qVvo3Ue\\nPjTKQMAsU8uxTEMmeuz9L6yExs0rfd6bPOrQkAoVfFfiYB3/" + "pA==\\n-----END CERTIFICATE-----\\n\"}"; static const char expected_audience[] = "https://foo.com"; -static const char good_openid_config[] = "{" " \"issuer\": \"https://accounts.google.com\"," " \"authorization_endpoint\": " "\"https://accounts.google.com/o/oauth2/v2/auth\"," " \"token_endpoint\": \"https://www.googleapis.com/oauth2/v4/token\"," " \"userinfo_endpoint\": \"https://www.googleapis.com/oauth2/v3/userinfo\"," " \"revocation_endpoint\": \"https://accounts.google.com/o/oauth2/revoke\"," " \"jwks_uri\": \"https://www.googleapis.com/oauth2/v3/certs\"" "}"; - -static const char expired_claims[] = "{ \"aud\": \"https://foo.com\"," " \"iss\": \"blah.foo.com\"," " \"sub\": \"juju@blah.foo.com\"," " \"jti\": \"jwtuniqueid\"," " \"iat\": 100," /* Way back in the past... */ - " \"exp\": 120," " \"nbf\": 60," " \"foo\": \"bar\"}"; - -static const char claims_without_time_constraint[] = "{ \"aud\": \"https://foo.com\"," " \"iss\": \"blah.foo.com\"," " \"sub\": \"juju@blah.foo.com\"," " \"jti\": \"jwtuniqueid\"," " \"foo\": \"bar\"}"; - -static const char invalid_claims[] = "{ \"aud\": \"https://foo.com\"," " \"iss\": 46," /* Issuer cannot be a number. */ - " \"sub\": \"juju@blah.foo.com\"," " \"jti\": \"jwtuniqueid\"," " \"foo\": \"bar\"}"; - -typedef struct -{ +static const char good_openid_config[] = + "{" + " \"issuer\": \"https://accounts.google.com\"," + " \"authorization_endpoint\": " + "\"https://accounts.google.com/o/oauth2/v2/auth\"," + " \"token_endpoint\": \"https://www.googleapis.com/oauth2/v4/token\"," + " \"userinfo_endpoint\": \"https://www.googleapis.com/oauth2/v3/userinfo\"," + " \"revocation_endpoint\": \"https://accounts.google.com/o/oauth2/revoke\"," + " \"jwks_uri\": \"https://www.googleapis.com/oauth2/v3/certs\"" + "}"; + +static const char expired_claims[] = + "{ \"aud\": \"https://foo.com\"," + " \"iss\": \"blah.foo.com\"," + " \"sub\": \"juju@blah.foo.com\"," + " \"jti\": \"jwtuniqueid\"," + " \"iat\": 100," /* Way back in the past... */ + " \"exp\": 120," + " \"nbf\": 60," + " \"foo\": \"bar\"}"; + +static const char claims_without_time_constraint[] = + "{ \"aud\": \"https://foo.com\"," + " \"iss\": \"blah.foo.com\"," + " \"sub\": \"juju@blah.foo.com\"," + " \"jti\": \"jwtuniqueid\"," + " \"foo\": \"bar\"}"; + +static const char invalid_claims[] = + "{ \"aud\": \"https://foo.com\"," + " \"iss\": 46," /* Issuer cannot be a number. */ + " \"sub\": \"juju@blah.foo.com\"," + " \"jti\": \"jwtuniqueid\"," + " \"foo\": \"bar\"}"; + +typedef struct { grpc_jwt_verifier_status expected_status; const char *expected_issuer; const char *expected_subject; } verifier_test_config; -static void -test_claims_success (void) -{ +static void test_claims_success(void) { grpc_jwt_claims *claims; - gpr_slice s = gpr_slice_from_copied_string (claims_without_time_constraint); - grpc_json *json = grpc_json_parse_string_with_len ((char *) GPR_SLICE_START_PTR (s), GPR_SLICE_LENGTH (s)); - GPR_ASSERT (json != NULL); - 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); - GPR_ASSERT (strcmp (grpc_jwt_claims_issuer (claims), "blah.foo.com") == 0); - GPR_ASSERT (strcmp (grpc_jwt_claims_subject (claims), "juju@blah.foo.com") == 0); - 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); + gpr_slice s = gpr_slice_from_copied_string(claims_without_time_constraint); + grpc_json *json = grpc_json_parse_string_with_len( + (char *)GPR_SLICE_START_PTR(s), GPR_SLICE_LENGTH(s)); + GPR_ASSERT(json != NULL); + 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); + GPR_ASSERT(strcmp(grpc_jwt_claims_issuer(claims), "blah.foo.com") == 0); + GPR_ASSERT(strcmp(grpc_jwt_claims_subject(claims), "juju@blah.foo.com") == 0); + 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); } -static void -test_expired_claims_failure (void) -{ +static void test_expired_claims_failure(void) { grpc_jwt_claims *claims; - gpr_slice s = gpr_slice_from_copied_string (expired_claims); - grpc_json *json = grpc_json_parse_string_with_len ((char *) GPR_SLICE_START_PTR (s), GPR_SLICE_LENGTH (s)); - gpr_timespec exp_iat = { 100, 0, GPR_CLOCK_REALTIME }; - gpr_timespec exp_exp = { 120, 0, GPR_CLOCK_REALTIME }; - gpr_timespec exp_nbf = { 60, 0, GPR_CLOCK_REALTIME }; - GPR_ASSERT (json != NULL); - 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); - GPR_ASSERT (strcmp (grpc_jwt_claims_issuer (claims), "blah.foo.com") == 0); - GPR_ASSERT (strcmp (grpc_jwt_claims_subject (claims), "juju@blah.foo.com") == 0); - GPR_ASSERT (strcmp (grpc_jwt_claims_id (claims), "jwtuniqueid") == 0); - GPR_ASSERT (gpr_time_cmp (grpc_jwt_claims_issued_at (claims), exp_iat) == 0); - GPR_ASSERT (gpr_time_cmp (grpc_jwt_claims_expires_at (claims), exp_exp) == 0); - GPR_ASSERT (gpr_time_cmp (grpc_jwt_claims_not_before (claims), exp_nbf) == 0); - - GPR_ASSERT (grpc_jwt_claims_check (claims, "https://foo.com") == GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE); - grpc_jwt_claims_destroy (claims); + gpr_slice s = gpr_slice_from_copied_string(expired_claims); + grpc_json *json = grpc_json_parse_string_with_len( + (char *)GPR_SLICE_START_PTR(s), GPR_SLICE_LENGTH(s)); + gpr_timespec exp_iat = {100, 0, GPR_CLOCK_REALTIME}; + gpr_timespec exp_exp = {120, 0, GPR_CLOCK_REALTIME}; + gpr_timespec exp_nbf = {60, 0, GPR_CLOCK_REALTIME}; + GPR_ASSERT(json != NULL); + 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); + GPR_ASSERT(strcmp(grpc_jwt_claims_issuer(claims), "blah.foo.com") == 0); + GPR_ASSERT(strcmp(grpc_jwt_claims_subject(claims), "juju@blah.foo.com") == 0); + GPR_ASSERT(strcmp(grpc_jwt_claims_id(claims), "jwtuniqueid") == 0); + GPR_ASSERT(gpr_time_cmp(grpc_jwt_claims_issued_at(claims), exp_iat) == 0); + GPR_ASSERT(gpr_time_cmp(grpc_jwt_claims_expires_at(claims), exp_exp) == 0); + GPR_ASSERT(gpr_time_cmp(grpc_jwt_claims_not_before(claims), exp_nbf) == 0); + + GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == + GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE); + grpc_jwt_claims_destroy(claims); } -static void -test_invalid_claims_failure (void) -{ - gpr_slice s = gpr_slice_from_copied_string (invalid_claims); - grpc_json *json = grpc_json_parse_string_with_len ((char *) GPR_SLICE_START_PTR (s), GPR_SLICE_LENGTH (s)); - GPR_ASSERT (grpc_jwt_claims_from_json (json, s) == NULL); +static void test_invalid_claims_failure(void) { + gpr_slice s = gpr_slice_from_copied_string(invalid_claims); + grpc_json *json = grpc_json_parse_string_with_len( + (char *)GPR_SLICE_START_PTR(s), GPR_SLICE_LENGTH(s)); + GPR_ASSERT(grpc_jwt_claims_from_json(json, s) == NULL); } -static void -test_bad_audience_claims_failure (void) -{ +static void test_bad_audience_claims_failure(void) { grpc_jwt_claims *claims; - gpr_slice s = gpr_slice_from_copied_string (claims_without_time_constraint); - grpc_json *json = grpc_json_parse_string_with_len ((char *) GPR_SLICE_START_PTR (s), GPR_SLICE_LENGTH (s)); - GPR_ASSERT (json != NULL); - 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 (claims); + gpr_slice s = gpr_slice_from_copied_string(claims_without_time_constraint); + grpc_json *json = grpc_json_parse_string_with_len( + (char *)GPR_SLICE_START_PTR(s), GPR_SLICE_LENGTH(s)); + GPR_ASSERT(json != NULL); + 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(claims); } -static char * -json_key_str (const char *last_part) -{ - size_t result_len = strlen (json_key_str_part1) + strlen (json_key_str_part2) + strlen (last_part); - char *result = gpr_malloc (result_len + 1); +static char *json_key_str(const char *last_part) { + size_t result_len = strlen(json_key_str_part1) + strlen(json_key_str_part2) + + strlen(last_part); + char *result = gpr_malloc(result_len + 1); char *current = result; - strcpy (result, json_key_str_part1); - current += strlen (json_key_str_part1); - strcpy (current, json_key_str_part2); - current += strlen (json_key_str_part2); - strcpy (current, last_part); + strcpy(result, json_key_str_part1); + current += strlen(json_key_str_part1); + strcpy(current, json_key_str_part2); + current += strlen(json_key_str_part2); + strcpy(current, last_part); return result; } -static char * -good_google_email_keys (void) -{ - size_t result_len = strlen (good_google_email_keys_part1) + strlen (good_google_email_keys_part2); - char *result = gpr_malloc (result_len + 1); +static char *good_google_email_keys(void) { + size_t result_len = strlen(good_google_email_keys_part1) + + strlen(good_google_email_keys_part2); + char *result = gpr_malloc(result_len + 1); char *current = result; - strcpy (result, good_google_email_keys_part1); - current += strlen (good_google_email_keys_part1); - strcpy (current, good_google_email_keys_part2); + strcpy(result, good_google_email_keys_part1); + current += strlen(good_google_email_keys_part1); + strcpy(current, good_google_email_keys_part2); return result; } -static grpc_httpcli_response -http_response (int status, char *body) -{ +static grpc_httpcli_response http_response(int status, char *body) { grpc_httpcli_response response; - memset (&response, 0, sizeof (grpc_httpcli_response)); + memset(&response, 0, sizeof(grpc_httpcli_response)); response.status = status; response.body = body; - response.body_length = strlen (body); + response.body_length = strlen(body); return response; } -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, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ - GPR_ASSERT ("HTTP POST should not be called" == NULL); +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, gpr_timespec deadline, + grpc_httpcli_response_cb on_response, void *user_data) { + 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, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ - grpc_httpcli_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); - GPR_ASSERT (strcmp (request->path, "/robot/v1/metadata/x509/" "777-abaslkan11hlb6nmim3bpspl31ud@developer." "gserviceaccount.com") == 0); - on_response (exec_ctx, user_data, &response); - gpr_free (response.body); +static int httpcli_get_google_keys_for_email( + grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, + gpr_timespec deadline, grpc_httpcli_response_cb on_response, + void *user_data) { + grpc_httpcli_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); + GPR_ASSERT(strcmp(request->path, + "/robot/v1/metadata/x509/" + "777-abaslkan11hlb6nmim3bpspl31ud@developer." + "gserviceaccount.com") == 0); + on_response(exec_ctx, user_data, &response); + gpr_free(response.body); return 1; } -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 (claims); +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(claims); } -static void -test_jwt_verifier_google_email_issuer_success (void) -{ +static void test_jwt_verifier_google_email_issuer_success(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_jwt_verifier *verifier = grpc_jwt_verifier_create (NULL, 0); + 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); - grpc_auth_json_key key = grpc_auth_json_key_create_from_string (key_str); - gpr_free (key_str); - GPR_ASSERT (grpc_auth_json_key_is_valid (&key)); - grpc_httpcli_set_override (httpcli_get_google_keys_for_email, httpcli_post_should_not_be_called); - jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); - grpc_auth_json_key_destruct (&key); - GPR_ASSERT (jwt != NULL); - grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (&exec_ctx, void *) expected_user_data); - gpr_free (jwt); - grpc_jwt_verifier_destroy (verifier); - grpc_httpcli_set_override (NULL, NULL); - grpc_exec_ctx_finish (&exec_ctx); + char *key_str = json_key_str(json_key_str_part3_for_google_email_issuer); + grpc_auth_json_key key = grpc_auth_json_key_create_from_string(key_str); + gpr_free(key_str); + GPR_ASSERT(grpc_auth_json_key_is_valid(&key)); + grpc_httpcli_set_override(httpcli_get_google_keys_for_email, + httpcli_post_should_not_be_called); + jwt = grpc_jwt_encode_and_sign(&key, expected_audience, expected_lifetime, + NULL); + grpc_auth_json_key_destruct(&key); + GPR_ASSERT(jwt != NULL); + grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, + on_verification_success, + (&exec_ctx, void *)expected_user_data); + gpr_free(jwt); + grpc_jwt_verifier_destroy(verifier); + grpc_httpcli_set_override(NULL, NULL); + grpc_exec_ctx_finish(&exec_ctx); } -static int -httpcli_get_custom_keys_for_email (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ - grpc_httpcli_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->path, "/jwk/foo@bar.com") == 0); - on_response (exec_ctx, user_data, &response); - gpr_free (response.body); +static int httpcli_get_custom_keys_for_email( + grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, + gpr_timespec deadline, grpc_httpcli_response_cb on_response, + void *user_data) { + grpc_httpcli_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->path, "/jwk/foo@bar.com") == 0); + on_response(exec_ctx, user_data, &response); + gpr_free(response.body); return 1; } -static void -test_jwt_verifier_custom_email_issuer_success (void) -{ +static void test_jwt_verifier_custom_email_issuer_success(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_jwt_verifier *verifier = grpc_jwt_verifier_create (&custom_mapping, 1); + 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); - grpc_auth_json_key key = grpc_auth_json_key_create_from_string (key_str); - gpr_free (key_str); - GPR_ASSERT (grpc_auth_json_key_is_valid (&key)); - grpc_httpcli_set_override (httpcli_get_custom_keys_for_email, httpcli_post_should_not_be_called); - jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); - grpc_auth_json_key_destruct (&key); - GPR_ASSERT (jwt != NULL); - grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (&exec_ctx, void *) expected_user_data); - gpr_free (jwt); - grpc_jwt_verifier_destroy (verifier); - grpc_httpcli_set_override (NULL, NULL); - grpc_exec_ctx_finish (&exec_ctx); + char *key_str = json_key_str(json_key_str_part3_for_custom_email_issuer); + grpc_auth_json_key key = grpc_auth_json_key_create_from_string(key_str); + gpr_free(key_str); + GPR_ASSERT(grpc_auth_json_key_is_valid(&key)); + grpc_httpcli_set_override(httpcli_get_custom_keys_for_email, + httpcli_post_should_not_be_called); + jwt = grpc_jwt_encode_and_sign(&key, expected_audience, expected_lifetime, + NULL); + grpc_auth_json_key_destruct(&key); + GPR_ASSERT(jwt != NULL); + grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, + on_verification_success, + (&exec_ctx, void *)expected_user_data); + gpr_free(jwt); + grpc_jwt_verifier_destroy(verifier); + grpc_httpcli_set_override(NULL, NULL); + grpc_exec_ctx_finish(&exec_ctx); } -static int -httpcli_get_jwk_set (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ - grpc_httpcli_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->path, "/oauth2/v3/certs") == 0); - on_response (exec_ctx, user_data, &response); - gpr_free (response.body); +static int httpcli_get_jwk_set(grpc_exec_ctx *exec_ctx, + const grpc_httpcli_request *request, + gpr_timespec deadline, + grpc_httpcli_response_cb on_response, + void *user_data) { + grpc_httpcli_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->path, "/oauth2/v3/certs") == 0); + on_response(exec_ctx, user_data, &response); + gpr_free(response.body); return 1; } -static int -httpcli_get_openid_config (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ - grpc_httpcli_response response = http_response (200, gpr_strdup (good_openid_config)); - GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); - GPR_ASSERT (strcmp (request->host, "accounts.google.com") == 0); - GPR_ASSERT (strcmp (request->path, GRPC_OPENID_CONFIG_URL_SUFFIX) == 0); - grpc_httpcli_set_override (httpcli_get_jwk_set, httpcli_post_should_not_be_called); - on_response (exec_ctx, user_data, &response); - gpr_free (response.body); +static int httpcli_get_openid_config(grpc_exec_ctx *exec_ctx, + const grpc_httpcli_request *request, + gpr_timespec deadline, + grpc_httpcli_response_cb on_response, + void *user_data) { + grpc_httpcli_response response = + http_response(200, gpr_strdup(good_openid_config)); + GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); + GPR_ASSERT(strcmp(request->host, "accounts.google.com") == 0); + GPR_ASSERT(strcmp(request->path, GRPC_OPENID_CONFIG_URL_SUFFIX) == 0); + grpc_httpcli_set_override(httpcli_get_jwk_set, + httpcli_post_should_not_be_called); + on_response(exec_ctx, user_data, &response); + gpr_free(response.body); return 1; } -static void -test_jwt_verifier_url_issuer_success (void) -{ +static void test_jwt_verifier_url_issuer_success(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_jwt_verifier *verifier = grpc_jwt_verifier_create (NULL, 0); + 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); - grpc_auth_json_key key = grpc_auth_json_key_create_from_string (key_str); - gpr_free (key_str); - GPR_ASSERT (grpc_auth_json_key_is_valid (&key)); - grpc_httpcli_set_override (httpcli_get_openid_config, httpcli_post_should_not_be_called); - jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); - grpc_auth_json_key_destruct (&key); - GPR_ASSERT (jwt != NULL); - grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (&exec_ctx, void *) expected_user_data); - gpr_free (jwt); - grpc_jwt_verifier_destroy (verifier); - grpc_httpcli_set_override (NULL, NULL); - grpc_exec_ctx_finish (&exec_ctx); + char *key_str = json_key_str(json_key_str_part3_for_url_issuer); + grpc_auth_json_key key = grpc_auth_json_key_create_from_string(key_str); + gpr_free(key_str); + GPR_ASSERT(grpc_auth_json_key_is_valid(&key)); + grpc_httpcli_set_override(httpcli_get_openid_config, + httpcli_post_should_not_be_called); + jwt = grpc_jwt_encode_and_sign(&key, expected_audience, expected_lifetime, + NULL); + grpc_auth_json_key_destruct(&key); + GPR_ASSERT(jwt != NULL); + grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, + on_verification_success, + (&exec_ctx, void *)expected_user_data); + gpr_free(jwt); + grpc_jwt_verifier_destroy(verifier); + grpc_httpcli_set_override(NULL, NULL); + grpc_exec_ctx_finish(&exec_ctx); } -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); - GPR_ASSERT (claims == NULL); - GPR_ASSERT (user_data == (void *) expected_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); + GPR_ASSERT(claims == NULL); + GPR_ASSERT(user_data == (void *)expected_user_data); } -static int -httpcli_get_bad_json (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ - grpc_httpcli_response response = http_response (200, gpr_strdup ("{\"bad\": \"stuff\"}")); - GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); - on_response (exec_ctx, user_data, &response); - gpr_free (response.body); +static int httpcli_get_bad_json(grpc_exec_ctx *exec_ctx, + const grpc_httpcli_request *request, + gpr_timespec deadline, + grpc_httpcli_response_cb on_response, + void *user_data) { + grpc_httpcli_response response = + http_response(200, gpr_strdup("{\"bad\": \"stuff\"}")); + GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); + on_response(exec_ctx, user_data, &response); + gpr_free(response.body); return 1; } -static void -test_jwt_verifier_url_issuer_bad_config (void) -{ +static void test_jwt_verifier_url_issuer_bad_config(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_jwt_verifier *verifier = grpc_jwt_verifier_create (NULL, 0); + 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); - grpc_auth_json_key key = grpc_auth_json_key_create_from_string (key_str); - gpr_free (key_str); - GPR_ASSERT (grpc_auth_json_key_is_valid (&key)); - grpc_httpcli_set_override (httpcli_get_bad_json, httpcli_post_should_not_be_called); - jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); - grpc_auth_json_key_destruct (&key); - GPR_ASSERT (jwt != NULL); - grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, (&exec_ctx, void *) expected_user_data); - gpr_free (jwt); - grpc_jwt_verifier_destroy (verifier); - grpc_httpcli_set_override (NULL, NULL); - grpc_exec_ctx_finish (&exec_ctx); + char *key_str = json_key_str(json_key_str_part3_for_url_issuer); + grpc_auth_json_key key = grpc_auth_json_key_create_from_string(key_str); + gpr_free(key_str); + GPR_ASSERT(grpc_auth_json_key_is_valid(&key)); + grpc_httpcli_set_override(httpcli_get_bad_json, + httpcli_post_should_not_be_called); + jwt = grpc_jwt_encode_and_sign(&key, expected_audience, expected_lifetime, + NULL); + grpc_auth_json_key_destruct(&key); + GPR_ASSERT(jwt != NULL); + grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, + on_verification_key_retrieval_error, + (&exec_ctx, void *)expected_user_data); + gpr_free(jwt); + grpc_jwt_verifier_destroy(verifier); + grpc_httpcli_set_override(NULL, NULL); + grpc_exec_ctx_finish(&exec_ctx); } -static void -test_jwt_verifier_bad_json_key (void) -{ +static void test_jwt_verifier_bad_json_key(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_jwt_verifier *verifier = grpc_jwt_verifier_create (NULL, 0); + 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); - grpc_auth_json_key key = grpc_auth_json_key_create_from_string (key_str); - gpr_free (key_str); - GPR_ASSERT (grpc_auth_json_key_is_valid (&key)); - grpc_httpcli_set_override (httpcli_get_bad_json, httpcli_post_should_not_be_called); - jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); - grpc_auth_json_key_destruct (&key); - GPR_ASSERT (jwt != NULL); - grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, (&exec_ctx, void *) expected_user_data); - gpr_free (jwt); - grpc_jwt_verifier_destroy (verifier); - grpc_httpcli_set_override (NULL, NULL); - grpc_exec_ctx_finish (&exec_ctx); + char *key_str = json_key_str(json_key_str_part3_for_google_email_issuer); + grpc_auth_json_key key = grpc_auth_json_key_create_from_string(key_str); + gpr_free(key_str); + GPR_ASSERT(grpc_auth_json_key_is_valid(&key)); + grpc_httpcli_set_override(httpcli_get_bad_json, + httpcli_post_should_not_be_called); + jwt = grpc_jwt_encode_and_sign(&key, expected_audience, expected_lifetime, + NULL); + grpc_auth_json_key_destruct(&key); + GPR_ASSERT(jwt != NULL); + grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, + on_verification_key_retrieval_error, + (&exec_ctx, void *)expected_user_data); + gpr_free(jwt); + grpc_jwt_verifier_destroy(verifier); + grpc_httpcli_set_override(NULL, NULL); + grpc_exec_ctx_finish(&exec_ctx); } -static void -corrupt_jwt_sig (char *jwt) -{ +static void corrupt_jwt_sig(char *jwt) { gpr_slice sig; char *bad_b64_sig; gpr_uint8 *sig_bytes; - char *last_dot = strrchr (jwt, '.'); - GPR_ASSERT (last_dot != NULL); - sig = grpc_base64_decode (last_dot + 1, 1); - GPR_ASSERT (!GPR_SLICE_IS_EMPTY (sig)); - sig_bytes = GPR_SLICE_START_PTR (sig); - (*sig_bytes)++; /* Corrupt first byte. */ - bad_b64_sig = grpc_base64_encode (GPR_SLICE_START_PTR (sig), GPR_SLICE_LENGTH (sig), 1, 0); - memcpy (last_dot + 1, bad_b64_sig, strlen (bad_b64_sig)); - gpr_free (bad_b64_sig); - gpr_slice_unref (sig); + char *last_dot = strrchr(jwt, '.'); + GPR_ASSERT(last_dot != NULL); + sig = grpc_base64_decode(last_dot + 1, 1); + GPR_ASSERT(!GPR_SLICE_IS_EMPTY(sig)); + sig_bytes = GPR_SLICE_START_PTR(sig); + (*sig_bytes)++; /* Corrupt first byte. */ + bad_b64_sig = + grpc_base64_encode(GPR_SLICE_START_PTR(sig), GPR_SLICE_LENGTH(sig), 1, 0); + memcpy(last_dot + 1, bad_b64_sig, strlen(bad_b64_sig)); + gpr_free(bad_b64_sig); + gpr_slice_unref(sig); } -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); - GPR_ASSERT (claims == NULL); - GPR_ASSERT (user_data == (void *) expected_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); + GPR_ASSERT(claims == NULL); + GPR_ASSERT(user_data == (void *)expected_user_data); } -static void -test_jwt_verifier_bad_signature (void) -{ +static void test_jwt_verifier_bad_signature(void) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_jwt_verifier *verifier = grpc_jwt_verifier_create (NULL, 0); + 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); - grpc_auth_json_key key = grpc_auth_json_key_create_from_string (key_str); - gpr_free (key_str); - GPR_ASSERT (grpc_auth_json_key_is_valid (&key)); - grpc_httpcli_set_override (httpcli_get_openid_config, httpcli_post_should_not_be_called); - jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL); - grpc_auth_json_key_destruct (&key); - corrupt_jwt_sig (jwt); - GPR_ASSERT (jwt != NULL); - grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_bad_signature, (&exec_ctx, void *) expected_user_data); - gpr_free (jwt); - grpc_jwt_verifier_destroy (verifier); - grpc_httpcli_set_override (NULL, NULL); - grpc_exec_ctx_finish (&exec_ctx); + char *key_str = json_key_str(json_key_str_part3_for_url_issuer); + grpc_auth_json_key key = grpc_auth_json_key_create_from_string(key_str); + gpr_free(key_str); + GPR_ASSERT(grpc_auth_json_key_is_valid(&key)); + grpc_httpcli_set_override(httpcli_get_openid_config, + httpcli_post_should_not_be_called); + jwt = grpc_jwt_encode_and_sign(&key, expected_audience, expected_lifetime, + NULL); + grpc_auth_json_key_destruct(&key); + corrupt_jwt_sig(jwt); + GPR_ASSERT(jwt != NULL); + grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, + on_verification_bad_signature, + (&exec_ctx, void *)expected_user_data); + gpr_free(jwt); + grpc_jwt_verifier_destroy(verifier); + grpc_httpcli_set_override(NULL, NULL); + grpc_exec_ctx_finish(&exec_ctx); } -static int -httpcli_get_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) -{ - GPR_ASSERT (0); +static int httpcli_get_should_not_be_called( + grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, + gpr_timespec deadline, grpc_httpcli_response_cb on_response, + void *user_data) { + GPR_ASSERT(0); return 1; } -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); - GPR_ASSERT (claims == NULL); - GPR_ASSERT (user_data == (void *) expected_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); + GPR_ASSERT(claims == NULL); + GPR_ASSERT(user_data == (void *)expected_user_data); } -static void -test_jwt_verifier_bad_format (void) -{ +static void test_jwt_verifier_bad_format(void) { grpc_exec_ctx 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 (verifier, NULL, "bad jwt", expected_audience, on_verification_bad_format, (&exec_ctx, void *) expected_user_data); - grpc_jwt_verifier_destroy (verifier); - grpc_httpcli_set_override (NULL, NULL); - grpc_exec_ctx_finish (&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); + grpc_jwt_verifier_verify(verifier, NULL, "bad jwt", expected_audience, + on_verification_bad_format, + (&exec_ctx, void *)expected_user_data); + grpc_jwt_verifier_destroy(verifier); + grpc_httpcli_set_override(NULL, NULL); + grpc_exec_ctx_finish(&exec_ctx); } /* find verification key: bad jks, cannot find key in jks */ /* bad signature custom provided email*/ /* bad key */ -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_claims_success (); - test_expired_claims_failure (); - test_invalid_claims_failure (); - test_bad_audience_claims_failure (); - test_jwt_verifier_google_email_issuer_success (); - test_jwt_verifier_custom_email_issuer_success (); - test_jwt_verifier_url_issuer_success (); - test_jwt_verifier_url_issuer_bad_config (); - test_jwt_verifier_bad_json_key (); - test_jwt_verifier_bad_signature (); - test_jwt_verifier_bad_format (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_claims_success(); + test_expired_claims_failure(); + test_invalid_claims_failure(); + test_bad_audience_claims_failure(); + test_jwt_verifier_google_email_issuer_success(); + test_jwt_verifier_custom_email_issuer_success(); + test_jwt_verifier_url_issuer_success(); + test_jwt_verifier_url_issuer_bad_config(); + test_jwt_verifier_bad_json_key(); + test_jwt_verifier_bad_signature(); + test_jwt_verifier_bad_format(); return 0; } diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index fad2ecd64b8..f99d1705925 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -44,68 +44,62 @@ #include "src/core/security/credentials.h" -typedef struct -{ +typedef struct { grpc_pollset pollset; int is_done; char *token; } oauth2_request; -static void -on_oauth2_response (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) -{ +static void on_oauth2_response(grpc_exec_ctx *exec_ctx, void *user_data, + grpc_credentials_md *md_elems, size_t num_md, + grpc_credentials_status status) { oauth2_request *request = user_data; char *token = NULL; gpr_slice token_slice; - if (status == GRPC_CREDENTIALS_ERROR) - { - gpr_log (GPR_ERROR, "Fetching token failed."); - } - else - { - GPR_ASSERT (num_md == 1); - token_slice = md_elems[0].value; - token = gpr_malloc (GPR_SLICE_LENGTH (token_slice) + 1); - memcpy (token, GPR_SLICE_START_PTR (token_slice), GPR_SLICE_LENGTH (token_slice)); - token[GPR_SLICE_LENGTH (token_slice)] = '\0'; - } - gpr_mu_lock (GRPC_POLLSET_MU (&request->pollset)); + if (status == GRPC_CREDENTIALS_ERROR) { + gpr_log(GPR_ERROR, "Fetching token failed."); + } else { + GPR_ASSERT(num_md == 1); + token_slice = md_elems[0].value; + token = gpr_malloc(GPR_SLICE_LENGTH(token_slice) + 1); + memcpy(token, GPR_SLICE_START_PTR(token_slice), + GPR_SLICE_LENGTH(token_slice)); + token[GPR_SLICE_LENGTH(token_slice)] = '\0'; + } + gpr_mu_lock(GRPC_POLLSET_MU(&request->pollset)); request->is_done = 1; request->token = token; - grpc_pollset_kick (&request->pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&request->pollset)); + grpc_pollset_kick(&request->pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&request->pollset)); } -static void -do_nothing (grpc_exec_ctx * exec_ctx, void *unused, int success) -{ -} +static void do_nothing(grpc_exec_ctx *exec_ctx, void *unused, int success) {} -char * -grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds) -{ +char *grpc_test_fetch_oauth2_token_with_credentials(grpc_credentials *creds) { oauth2_request request; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure do_nothing_closure; - grpc_pollset_init (&request.pollset); + grpc_pollset_init(&request.pollset); request.is_done = 0; - grpc_closure_init (&do_nothing_closure, do_nothing, NULL); + grpc_closure_init(&do_nothing_closure, do_nothing, NULL); - grpc_credentials_get_request_metadata (&exec_ctx, creds, &request.pollset, "", on_oauth2_response, &request); + grpc_credentials_get_request_metadata(&exec_ctx, creds, &request.pollset, "", + on_oauth2_response, &request); - grpc_exec_ctx_finish (&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&request.pollset)); - while (!request.is_done) - { - grpc_pollset_worker worker; - grpc_pollset_work (&exec_ctx, &request.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC)); - } - gpr_mu_unlock (GRPC_POLLSET_MU (&request.pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&request.pollset)); + while (!request.is_done) { + grpc_pollset_worker worker; + grpc_pollset_work(&exec_ctx, &request.pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), + gpr_inf_future(GPR_CLOCK_MONOTONIC)); + } + gpr_mu_unlock(GRPC_POLLSET_MU(&request.pollset)); - grpc_pollset_shutdown (&exec_ctx, &request.pollset, &do_nothing_closure); - grpc_exec_ctx_finish (&exec_ctx); - grpc_pollset_destroy (&request.pollset); + grpc_pollset_shutdown(&exec_ctx, &request.pollset, &do_nothing_closure); + grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_destroy(&request.pollset); return request.token; } diff --git a/test/core/security/oauth2_utils.h b/test/core/security/oauth2_utils.h index a2eb06834d9..8082351b8a0 100644 --- a/test/core/security/oauth2_utils.h +++ b/test/core/security/oauth2_utils.h @@ -37,16 +37,15 @@ #include "src/core/security/credentials.h" #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* Fetch oauth2 access token with a credentials object. Does not take ownership. Returns NULL on a failure. The caller should call gpr_free on the token. */ - char *grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds); +char *grpc_test_fetch_oauth2_token_with_credentials(grpc_credentials *creds); #ifdef __cplusplus } #endif -#endif /* GRPC_TEST_CORE_SECURITY_OAUTH2_UTILS_H */ +#endif /* GRPC_TEST_CORE_SECURITY_OAUTH2_UTILS_H */ diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c index e2bc11bf772..1e4c1f67202 100644 --- a/test/core/security/print_google_default_creds_token.c +++ b/test/core/security/print_google_default_creds_token.c @@ -44,76 +44,72 @@ #include #include -typedef struct -{ +typedef struct { grpc_pollset pollset; int is_done; } synchronizer; -static void -on_metadata_response (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) -{ +static void on_metadata_response(grpc_exec_ctx *exec_ctx, void *user_data, + grpc_credentials_md *md_elems, size_t num_md, + grpc_credentials_status status) { synchronizer *sync = user_data; - if (status == GRPC_CREDENTIALS_ERROR) - { - fprintf (stderr, "Fetching token failed.\n"); - } - else - { - char *token; - GPR_ASSERT (num_md == 1); - token = gpr_dump_slice (md_elems[0].value, GPR_DUMP_ASCII); - printf ("\nGot token: %s\n\n", token); - gpr_free (token); - } - gpr_mu_lock (GRPC_POLLSET_MU (&sync->pollset)); + if (status == GRPC_CREDENTIALS_ERROR) { + fprintf(stderr, "Fetching token failed.\n"); + } else { + char *token; + GPR_ASSERT(num_md == 1); + token = gpr_dump_slice(md_elems[0].value, GPR_DUMP_ASCII); + printf("\nGot token: %s\n\n", token); + gpr_free(token); + } + gpr_mu_lock(GRPC_POLLSET_MU(&sync->pollset)); sync->is_done = 1; - grpc_pollset_kick (&sync->pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&sync->pollset)); + grpc_pollset_kick(&sync->pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&sync->pollset)); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { int result = 0; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; synchronizer sync; grpc_credentials *creds = NULL; char *service_url = "https://test.foo.google.com/Foo"; - gpr_cmdline *cl = gpr_cmdline_create ("print_google_default_creds_token"); - gpr_cmdline_add_string (cl, "service_url", "Service URL for the token request.", &service_url); - gpr_cmdline_parse (cl, argc, argv); + gpr_cmdline *cl = gpr_cmdline_create("print_google_default_creds_token"); + gpr_cmdline_add_string(cl, "service_url", + "Service URL for the token request.", &service_url); + gpr_cmdline_parse(cl, argc, argv); - grpc_init (); + grpc_init(); - creds = grpc_google_default_credentials_create (); - if (creds == NULL) - { - fprintf (stderr, "\nCould not find default credentials.\n\n"); - result = 1; - goto end; - } + creds = grpc_google_default_credentials_create(); + if (creds == NULL) { + fprintf(stderr, "\nCould not find default credentials.\n\n"); + result = 1; + goto end; + } - grpc_pollset_init (&sync.pollset); + grpc_pollset_init(&sync.pollset); sync.is_done = 0; - grpc_credentials_get_request_metadata (&exec_ctx, creds, &sync.pollset, service_url, on_metadata_response, &sync); + grpc_credentials_get_request_metadata(&exec_ctx, creds, &sync.pollset, + service_url, on_metadata_response, + &sync); - gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); - while (!sync.is_done) - { - grpc_pollset_worker worker; - grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); - gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); - } - gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); + while (!sync.is_done) { + grpc_pollset_worker worker; + grpc_pollset_work(&sync.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + gpr_inf_future(&exec_ctx, GPR_CLOCK_MONOTONIC)); + gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); + } + gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); - grpc_credentials_release (creds); + grpc_credentials_release(creds); end: - gpr_cmdline_destroy (cl); - grpc_shutdown (); + gpr_cmdline_destroy(cl); + grpc_shutdown(); return result; } diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index cd4ecb3d4c8..8aa80cca185 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -47,158 +47,147 @@ static grpc_pollset g_pollset; -static grpc_endpoint_test_fixture -secure_endpoint_create_fixture_tcp_socketpair (size_t slice_size, gpr_slice * leftover_slices, size_t leftover_nslices) -{ +static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( + size_t slice_size, gpr_slice *leftover_slices, size_t leftover_nslices) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - tsi_frame_protector *fake_read_protector = tsi_create_fake_protector (NULL); - tsi_frame_protector *fake_write_protector = tsi_create_fake_protector (NULL); + tsi_frame_protector *fake_read_protector = tsi_create_fake_protector(NULL); + tsi_frame_protector *fake_write_protector = tsi_create_fake_protector(NULL); grpc_endpoint_test_fixture f; grpc_endpoint_pair tcp; - tcp = grpc_iomgr_create_endpoint_pair ("fixture", slice_size); - 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, tcp.client, NULL, 0); - } - else - { - unsigned i; - tsi_result result; - size_t still_pending_size; - size_t total_buffer_size = 8192; - size_t buffer_size = total_buffer_size; - gpr_uint8 *encrypted_buffer = gpr_malloc (buffer_size); - gpr_uint8 *cur = encrypted_buffer; - gpr_slice encrypted_leftover; - for (i = 0; i < leftover_nslices; i++) - { - gpr_slice plain = leftover_slices[i]; - gpr_uint8 *message_bytes = GPR_SLICE_START_PTR (plain); - size_t message_size = GPR_SLICE_LENGTH (plain); - while (message_size > 0) - { - size_t protected_buffer_size_to_send = buffer_size; - size_t processed_message_size = message_size; - result = tsi_frame_protector_protect (fake_write_protector, message_bytes, &processed_message_size, cur, &protected_buffer_size_to_send); - GPR_ASSERT (result == TSI_OK); - message_bytes += processed_message_size; - message_size -= processed_message_size; - cur += protected_buffer_size_to_send; - GPR_ASSERT (buffer_size >= protected_buffer_size_to_send); - buffer_size -= protected_buffer_size_to_send; - } - gpr_slice_unref (plain); - } - do - { - size_t protected_buffer_size_to_send = buffer_size; - result = tsi_frame_protector_protect_flush (fake_write_protector, cur, &protected_buffer_size_to_send, &still_pending_size); - GPR_ASSERT (result == TSI_OK); - cur += protected_buffer_size_to_send; - GPR_ASSERT (buffer_size >= protected_buffer_size_to_send); - buffer_size -= protected_buffer_size_to_send; - } - while (still_pending_size > 0); - encrypted_leftover = gpr_slice_from_copied_buffer ((const char *) encrypted_buffer, total_buffer_size - buffer_size); - f.client_ep = grpc_secure_endpoint_create (fake_read_protector, tcp.client, &encrypted_leftover, 1); - gpr_slice_unref (encrypted_leftover); - gpr_free (encrypted_buffer); + tcp = grpc_iomgr_create_endpoint_pair("fixture", slice_size); + 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, tcp.client, NULL, 0); + } else { + unsigned i; + tsi_result result; + size_t still_pending_size; + size_t total_buffer_size = 8192; + size_t buffer_size = total_buffer_size; + gpr_uint8 *encrypted_buffer = gpr_malloc(buffer_size); + gpr_uint8 *cur = encrypted_buffer; + gpr_slice encrypted_leftover; + for (i = 0; i < leftover_nslices; i++) { + gpr_slice plain = leftover_slices[i]; + gpr_uint8 *message_bytes = GPR_SLICE_START_PTR(plain); + size_t message_size = GPR_SLICE_LENGTH(plain); + while (message_size > 0) { + size_t protected_buffer_size_to_send = buffer_size; + size_t processed_message_size = message_size; + result = tsi_frame_protector_protect( + fake_write_protector, message_bytes, &processed_message_size, cur, + &protected_buffer_size_to_send); + GPR_ASSERT(result == TSI_OK); + message_bytes += processed_message_size; + message_size -= processed_message_size; + cur += protected_buffer_size_to_send; + GPR_ASSERT(buffer_size >= protected_buffer_size_to_send); + buffer_size -= protected_buffer_size_to_send; + } + gpr_slice_unref(plain); } - - f.server_ep = grpc_secure_endpoint_create (fake_write_protector, tcp.server, NULL, 0); - grpc_exec_ctx_finish (&exec_ctx); + do { + size_t protected_buffer_size_to_send = buffer_size; + result = tsi_frame_protector_protect_flush(fake_write_protector, cur, + &protected_buffer_size_to_send, + &still_pending_size); + GPR_ASSERT(result == TSI_OK); + cur += protected_buffer_size_to_send; + GPR_ASSERT(buffer_size >= protected_buffer_size_to_send); + buffer_size -= protected_buffer_size_to_send; + } while (still_pending_size > 0); + encrypted_leftover = gpr_slice_from_copied_buffer( + (const char *)encrypted_buffer, total_buffer_size - buffer_size); + f.client_ep = grpc_secure_endpoint_create(fake_read_protector, tcp.client, + &encrypted_leftover, 1); + gpr_slice_unref(encrypted_leftover); + gpr_free(encrypted_buffer); + } + + f.server_ep = + grpc_secure_endpoint_create(fake_write_protector, tcp.server, NULL, 0); + grpc_exec_ctx_finish(&exec_ctx); return f; } static grpc_endpoint_test_fixture -secure_endpoint_create_fixture_tcp_socketpair_noleftover (size_t slice_size) -{ - return secure_endpoint_create_fixture_tcp_socketpair (slice_size, NULL, 0); +secure_endpoint_create_fixture_tcp_socketpair_noleftover(size_t slice_size) { + return secure_endpoint_create_fixture_tcp_socketpair(slice_size, NULL, 0); } static grpc_endpoint_test_fixture -secure_endpoint_create_fixture_tcp_socketpair_leftover (size_t slice_size) -{ - gpr_slice s = gpr_slice_from_copied_string ("hello world 12345678900987654321"); +secure_endpoint_create_fixture_tcp_socketpair_leftover(size_t slice_size) { + gpr_slice s = + gpr_slice_from_copied_string("hello world 12345678900987654321"); grpc_endpoint_test_fixture f; - f = secure_endpoint_create_fixture_tcp_socketpair (slice_size, &s, 1); + f = secure_endpoint_create_fixture_tcp_socketpair(slice_size, &s, 1); return f; } -static void -clean_up (void) -{ -} +static void clean_up(void) {} static grpc_endpoint_test_config configs[] = { - {"secure_ep/tcp_socketpair", - secure_endpoint_create_fixture_tcp_socketpair_noleftover, clean_up}, - {"secure_ep/tcp_socketpair_leftover", - secure_endpoint_create_fixture_tcp_socketpair_leftover, clean_up}, + {"secure_ep/tcp_socketpair", + secure_endpoint_create_fixture_tcp_socketpair_noleftover, clean_up}, + {"secure_ep/tcp_socketpair_leftover", + secure_endpoint_create_fixture_tcp_socketpair_leftover, clean_up}, }; -static void -inc_call_ctr (grpc_exec_ctx * exec_ctx, void *arg, int success) -{ - ++*(int *) arg; +static void inc_call_ctr(grpc_exec_ctx *exec_ctx, void *arg, int success) { + ++*(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); +static void test_leftover(grpc_endpoint_test_config config, size_t slice_size) { + grpc_endpoint_test_fixture f = config.create_fixture(slice_size); gpr_slice_buffer incoming; - gpr_slice s = gpr_slice_from_copied_string ("hello world 12345678900987654321"); + gpr_slice s = + gpr_slice_from_copied_string("hello world 12345678900987654321"); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; int n = 0; grpc_closure done_closure; - gpr_log (GPR_INFO, "Start test left over"); - - gpr_slice_buffer_init (&incoming); - grpc_closure_init (&done_closure, inc_call_ctr, &n); - 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 (0 == gpr_slice_cmp (s, incoming.slices[0])); - - grpc_endpoint_shutdown (&exec_ctx, f.client_ep); - grpc_endpoint_shutdown (&exec_ctx, 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); - gpr_slice_unref (s); - gpr_slice_buffer_destroy (&incoming); - - clean_up (); + gpr_log(GPR_INFO, "Start test left over"); + + gpr_slice_buffer_init(&incoming); + grpc_closure_init(&done_closure, inc_call_ctr, &n); + 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(0 == gpr_slice_cmp(s, incoming.slices[0])); + + grpc_endpoint_shutdown(&exec_ctx, f.client_ep); + grpc_endpoint_shutdown(&exec_ctx, 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); + gpr_slice_unref(s); + gpr_slice_buffer_destroy(&incoming); + + clean_up(); } -static void -destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) -{ - grpc_pollset_destroy (p); +static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, int success) { + grpc_pollset_destroy(p); } -int -main (int argc, char **argv) -{ +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_pollset_init (&g_pollset); - grpc_endpoint_tests (configs[0], &g_pollset); - test_leftover (configs[1], 1); - grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); - grpc_exec_ctx_finish (&exec_ctx); - grpc_shutdown (); + grpc_test_init(argc, argv); + + grpc_init(); + grpc_pollset_init(&g_pollset); + grpc_endpoint_tests(configs[0], &g_pollset); + test_leftover(configs[1], 1); + grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); + grpc_pollset_shutdown(&exec_ctx, &g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); + grpc_shutdown(); return 0; } diff --git a/test/core/security/security_connector_test.c b/test/core/security/security_connector_test.c index 691c68685b4..3f6c592b0bd 100644 --- a/test/core/security/security_connector_test.c +++ b/test/core/security/security_connector_test.c @@ -46,200 +46,212 @@ #include #include -static int -check_transport_security_type (const grpc_auth_context * ctx) -{ - grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name (ctx, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME); - const grpc_auth_property *prop = grpc_auth_property_iterator_next (&it); - if (prop == NULL) +static int check_transport_security_type(const grpc_auth_context *ctx) { + grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name( + ctx, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME); + const grpc_auth_property *prop = grpc_auth_property_iterator_next(&it); + if (prop == NULL) return 0; + if (strncmp(prop->value, GRPC_SSL_TRANSPORT_SECURITY_TYPE, + prop->value_length) != 0) { return 0; - if (strncmp (prop->value, GRPC_SSL_TRANSPORT_SECURITY_TYPE, prop->value_length) != 0) - { - return 0; - } + } /* Check that we have only one property with this name. */ - if (grpc_auth_property_iterator_next (&it) != NULL) - return 0; + if (grpc_auth_property_iterator_next(&it) != NULL) return 0; return 1; } -static void -test_unauthenticated_ssl_peer (void) -{ +static void test_unauthenticated_ssl_peer(void) { tsi_peer peer; grpc_auth_context *ctx; - GPR_ASSERT (tsi_construct_peer (1, &peer) == TSI_OK); - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, &peer.properties[0]) == TSI_OK); - ctx = tsi_ssl_peer_to_auth_context (&peer); - GPR_ASSERT (ctx != NULL); - GPR_ASSERT (!grpc_auth_context_peer_is_authenticated (ctx)); - GPR_ASSERT (check_transport_security_type (ctx)); - - tsi_peer_destruct (&peer); - GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); + GPR_ASSERT(tsi_construct_peer(1, &peer) == TSI_OK); + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, + &peer.properties[0]) == TSI_OK); + ctx = tsi_ssl_peer_to_auth_context(&peer); + GPR_ASSERT(ctx != NULL); + GPR_ASSERT(!grpc_auth_context_peer_is_authenticated(ctx)); + GPR_ASSERT(check_transport_security_type(ctx)); + + tsi_peer_destruct(&peer); + GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); } -static int -check_identity (const grpc_auth_context * ctx, const char *expected_property_name, const char **expected_identities, size_t num_identities) -{ +static int check_identity(const grpc_auth_context *ctx, + const char *expected_property_name, + const char **expected_identities, + size_t num_identities) { grpc_auth_property_iterator it; const grpc_auth_property *prop; size_t i; - GPR_ASSERT (grpc_auth_context_peer_is_authenticated (ctx)); - it = grpc_auth_context_peer_identity (ctx); - for (i = 0; i < num_identities; i++) - { - prop = grpc_auth_property_iterator_next (&it); - if (prop == NULL) - { - gpr_log (GPR_ERROR, "Expected identity value %s not found.", expected_identities[i]); - return 0; - } - if (strcmp (prop->name, expected_property_name) != 0) - { - gpr_log (GPR_ERROR, "Expected peer identity property name %s and got %s.", expected_property_name, prop->name); - return 0; - } - if (strncmp (prop->value, expected_identities[i], prop->value_length) != 0) - { - gpr_log (GPR_ERROR, "Expected peer identity %s and got %s.", expected_identities[i], prop->value); - return 0; - } - } - return 1; -} - -static int -check_x509_cn (const grpc_auth_context * ctx, const char *expected_cn) -{ - grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name (ctx, GRPC_X509_CN_PROPERTY_NAME); - const grpc_auth_property *prop = grpc_auth_property_iterator_next (&it); - if (prop == NULL) - { - gpr_log (GPR_ERROR, "CN property not found."); + GPR_ASSERT(grpc_auth_context_peer_is_authenticated(ctx)); + it = grpc_auth_context_peer_identity(ctx); + for (i = 0; i < num_identities; i++) { + prop = grpc_auth_property_iterator_next(&it); + if (prop == NULL) { + gpr_log(GPR_ERROR, "Expected identity value %s not found.", + expected_identities[i]); return 0; } - if (strncmp (prop->value, expected_cn, prop->value_length) != 0) - { - gpr_log (GPR_ERROR, "Expected CN %s and got %s", expected_cn, prop->value); + if (strcmp(prop->name, expected_property_name) != 0) { + gpr_log(GPR_ERROR, "Expected peer identity property name %s and got %s.", + expected_property_name, prop->name); return 0; } - if (grpc_auth_property_iterator_next (&it) != NULL) - { - gpr_log (GPR_ERROR, "Expected only one property for CN."); + if (strncmp(prop->value, expected_identities[i], prop->value_length) != 0) { + gpr_log(GPR_ERROR, "Expected peer identity %s and got %s.", + expected_identities[i], prop->value); return 0; } + } + return 1; +} + +static int check_x509_cn(const grpc_auth_context *ctx, + const char *expected_cn) { + grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name( + ctx, GRPC_X509_CN_PROPERTY_NAME); + const grpc_auth_property *prop = grpc_auth_property_iterator_next(&it); + if (prop == NULL) { + gpr_log(GPR_ERROR, "CN property not found."); + return 0; + } + if (strncmp(prop->value, expected_cn, prop->value_length) != 0) { + gpr_log(GPR_ERROR, "Expected CN %s and got %s", expected_cn, prop->value); + return 0; + } + if (grpc_auth_property_iterator_next(&it) != NULL) { + gpr_log(GPR_ERROR, "Expected only one property for CN."); + return 0; + } return 1; } -static void -test_cn_only_ssl_peer_to_auth_context (void) -{ +static void test_cn_only_ssl_peer_to_auth_context(void) { tsi_peer peer; grpc_auth_context *ctx; const char *expected_cn = "cn1"; - GPR_ASSERT (tsi_construct_peer (2, &peer) == TSI_OK); - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, &peer.properties[0]) == TSI_OK); - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, &peer.properties[1]) == TSI_OK); - ctx = tsi_ssl_peer_to_auth_context (&peer); - GPR_ASSERT (ctx != NULL); - GPR_ASSERT (grpc_auth_context_peer_is_authenticated (ctx)); - GPR_ASSERT (check_identity (ctx, GRPC_X509_CN_PROPERTY_NAME, &expected_cn, 1)); - GPR_ASSERT (check_transport_security_type (ctx)); - GPR_ASSERT (check_x509_cn (ctx, expected_cn)); - - tsi_peer_destruct (&peer); - GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); + GPR_ASSERT(tsi_construct_peer(2, &peer) == TSI_OK); + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, + &peer.properties[0]) == TSI_OK); + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, + &peer.properties[1]) == TSI_OK); + ctx = tsi_ssl_peer_to_auth_context(&peer); + GPR_ASSERT(ctx != NULL); + GPR_ASSERT(grpc_auth_context_peer_is_authenticated(ctx)); + GPR_ASSERT(check_identity(ctx, GRPC_X509_CN_PROPERTY_NAME, &expected_cn, 1)); + GPR_ASSERT(check_transport_security_type(ctx)); + GPR_ASSERT(check_x509_cn(ctx, expected_cn)); + + tsi_peer_destruct(&peer); + GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); } -static void -test_cn_and_one_san_ssl_peer_to_auth_context (void) -{ +static void test_cn_and_one_san_ssl_peer_to_auth_context(void) { tsi_peer peer; grpc_auth_context *ctx; const char *expected_cn = "cn1"; const char *expected_san = "san1"; - GPR_ASSERT (tsi_construct_peer (3, &peer) == TSI_OK); - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, &peer.properties[0]) == TSI_OK); - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, &peer.properties[1]) == TSI_OK); - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, expected_san, &peer.properties[2]) == TSI_OK); - ctx = tsi_ssl_peer_to_auth_context (&peer); - GPR_ASSERT (ctx != NULL); - GPR_ASSERT (grpc_auth_context_peer_is_authenticated (ctx)); - GPR_ASSERT (check_identity (ctx, GRPC_X509_SAN_PROPERTY_NAME, &expected_san, 1)); - GPR_ASSERT (check_transport_security_type (ctx)); - GPR_ASSERT (check_x509_cn (ctx, expected_cn)); - - tsi_peer_destruct (&peer); - GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); + GPR_ASSERT(tsi_construct_peer(3, &peer) == TSI_OK); + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, + &peer.properties[0]) == TSI_OK); + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, + &peer.properties[1]) == TSI_OK); + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, expected_san, + &peer.properties[2]) == TSI_OK); + ctx = tsi_ssl_peer_to_auth_context(&peer); + GPR_ASSERT(ctx != NULL); + GPR_ASSERT(grpc_auth_context_peer_is_authenticated(ctx)); + GPR_ASSERT( + check_identity(ctx, GRPC_X509_SAN_PROPERTY_NAME, &expected_san, 1)); + GPR_ASSERT(check_transport_security_type(ctx)); + GPR_ASSERT(check_x509_cn(ctx, expected_cn)); + + tsi_peer_destruct(&peer); + GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); } -static void -test_cn_and_multiple_sans_ssl_peer_to_auth_context (void) -{ +static void test_cn_and_multiple_sans_ssl_peer_to_auth_context(void) { tsi_peer peer; grpc_auth_context *ctx; const char *expected_cn = "cn1"; - const char *expected_sans[] = { "san1", "san2", "san3" }; + const char *expected_sans[] = {"san1", "san2", "san3"}; size_t i; - GPR_ASSERT (tsi_construct_peer (2 + GPR_ARRAY_SIZE (expected_sans), &peer) == TSI_OK); - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, &peer.properties[0]) == TSI_OK); - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, &peer.properties[1]) == TSI_OK); - for (i = 0; i < GPR_ARRAY_SIZE (expected_sans); i++) - { - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, expected_sans[i], &peer.properties[2 + i]) == TSI_OK); - } - ctx = tsi_ssl_peer_to_auth_context (&peer); - GPR_ASSERT (ctx != NULL); - GPR_ASSERT (grpc_auth_context_peer_is_authenticated (ctx)); - GPR_ASSERT (check_identity (ctx, GRPC_X509_SAN_PROPERTY_NAME, expected_sans, GPR_ARRAY_SIZE (expected_sans))); - GPR_ASSERT (check_transport_security_type (ctx)); - GPR_ASSERT (check_x509_cn (ctx, expected_cn)); - - tsi_peer_destruct (&peer); - GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); + GPR_ASSERT(tsi_construct_peer(2 + GPR_ARRAY_SIZE(expected_sans), &peer) == + TSI_OK); + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, + &peer.properties[0]) == TSI_OK); + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, + &peer.properties[1]) == TSI_OK); + for (i = 0; i < GPR_ARRAY_SIZE(expected_sans); i++) { + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, + expected_sans[i], &peer.properties[2 + i]) == TSI_OK); + } + ctx = tsi_ssl_peer_to_auth_context(&peer); + GPR_ASSERT(ctx != NULL); + GPR_ASSERT(grpc_auth_context_peer_is_authenticated(ctx)); + GPR_ASSERT(check_identity(ctx, GRPC_X509_SAN_PROPERTY_NAME, expected_sans, + GPR_ARRAY_SIZE(expected_sans))); + GPR_ASSERT(check_transport_security_type(ctx)); + GPR_ASSERT(check_x509_cn(ctx, expected_cn)); + + tsi_peer_destruct(&peer); + GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); } -static void -test_cn_and_multiple_sans_and_others_ssl_peer_to_auth_context (void) -{ +static void test_cn_and_multiple_sans_and_others_ssl_peer_to_auth_context( + void) { tsi_peer peer; grpc_auth_context *ctx; const char *expected_cn = "cn1"; - const char *expected_sans[] = { "san1", "san2", "san3" }; + const char *expected_sans[] = {"san1", "san2", "san3"}; size_t i; - GPR_ASSERT (tsi_construct_peer (4 + GPR_ARRAY_SIZE (expected_sans), &peer) == TSI_OK); - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, &peer.properties[0]) == TSI_OK); - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring ("foo", "bar", &peer.properties[1]) == TSI_OK); - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, &peer.properties[2]) == TSI_OK); - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring ("chapi", "chapo", &peer.properties[3]) == TSI_OK); - for (i = 0; i < GPR_ARRAY_SIZE (expected_sans); i++) - { - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, expected_sans[i], &peer.properties[4 + i]) == TSI_OK); - } - ctx = tsi_ssl_peer_to_auth_context (&peer); - GPR_ASSERT (ctx != NULL); - GPR_ASSERT (grpc_auth_context_peer_is_authenticated (ctx)); - GPR_ASSERT (check_identity (ctx, GRPC_X509_SAN_PROPERTY_NAME, expected_sans, GPR_ARRAY_SIZE (expected_sans))); - GPR_ASSERT (check_transport_security_type (ctx)); - GPR_ASSERT (check_x509_cn (ctx, expected_cn)); - - tsi_peer_destruct (&peer); - GRPC_AUTH_CONTEXT_UNREF (ctx, "test"); + GPR_ASSERT(tsi_construct_peer(4 + GPR_ARRAY_SIZE(expected_sans), &peer) == + TSI_OK); + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + TSI_CERTIFICATE_TYPE_PEER_PROPERTY, TSI_X509_CERTIFICATE_TYPE, + &peer.properties[0]) == TSI_OK); + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + "foo", "bar", &peer.properties[1]) == TSI_OK); + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, expected_cn, + &peer.properties[2]) == TSI_OK); + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + "chapi", "chapo", &peer.properties[3]) == TSI_OK); + for (i = 0; i < GPR_ARRAY_SIZE(expected_sans); i++) { + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, + expected_sans[i], &peer.properties[4 + i]) == TSI_OK); + } + ctx = tsi_ssl_peer_to_auth_context(&peer); + GPR_ASSERT(ctx != NULL); + GPR_ASSERT(grpc_auth_context_peer_is_authenticated(ctx)); + GPR_ASSERT(check_identity(ctx, GRPC_X509_SAN_PROPERTY_NAME, expected_sans, + GPR_ARRAY_SIZE(expected_sans))); + GPR_ASSERT(check_transport_security_type(ctx)); + GPR_ASSERT(check_x509_cn(ctx, expected_cn)); + + tsi_peer_destruct(&peer); + GRPC_AUTH_CONTEXT_UNREF(ctx, "test"); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - grpc_init (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + grpc_init(); - test_unauthenticated_ssl_peer (); - test_cn_only_ssl_peer_to_auth_context (); - test_cn_and_one_san_ssl_peer_to_auth_context (); - test_cn_and_multiple_sans_ssl_peer_to_auth_context (); - test_cn_and_multiple_sans_and_others_ssl_peer_to_auth_context (); + test_unauthenticated_ssl_peer(); + test_cn_only_ssl_peer_to_auth_context(); + test_cn_and_one_san_ssl_peer_to_auth_context(); + test_cn_and_multiple_sans_ssl_peer_to_auth_context(); + test_cn_and_multiple_sans_and_others_ssl_peer_to_auth_context(); - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/security/verify_jwt.c b/test/core/security/verify_jwt.c index cbeda507db5..7750afd426b 100644 --- a/test/core/security/verify_jwt.c +++ b/test/core/security/verify_jwt.c @@ -43,53 +43,47 @@ #include #include -typedef struct -{ +typedef struct { grpc_pollset pollset; int is_done; int success; } synchronizer; -static void -print_usage_and_exit (gpr_cmdline * cl, const char *argv0) -{ - char *usage = gpr_cmdline_usage_string (cl, argv0); - fprintf (stderr, "%s", usage); - gpr_free (usage); - gpr_cmdline_destroy (cl); - exit (1); +static void print_usage_and_exit(gpr_cmdline *cl, const char *argv0) { + char *usage = gpr_cmdline_usage_string(cl, argv0); + fprintf(stderr, "%s", usage); + gpr_free(usage); + gpr_cmdline_destroy(cl); + exit(1); } -static void -on_jwt_verification_done (void *user_data, grpc_jwt_verifier_status status, grpc_jwt_claims * claims) -{ +static void on_jwt_verification_done(void *user_data, + grpc_jwt_verifier_status status, + grpc_jwt_claims *claims) { synchronizer *sync = user_data; sync->success = (status == GRPC_JWT_VERIFIER_OK); - if (sync->success) - { - char *claims_str; - GPR_ASSERT (claims != NULL); - claims_str = 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); - } - else - { - GPR_ASSERT (claims == NULL); - fprintf (stderr, "Verification failed with error %s\n", grpc_jwt_verifier_status_to_string (status)); - } + if (sync->success) { + char *claims_str; + GPR_ASSERT(claims != NULL); + claims_str = + 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); + } else { + GPR_ASSERT(claims == NULL); + fprintf(stderr, "Verification failed with error %s\n", + grpc_jwt_verifier_status_to_string(status)); + } - gpr_mu_lock (GRPC_POLLSET_MU (&sync->pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&sync->pollset)); sync->is_done = 1; - grpc_pollset_kick (&sync->pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&sync->pollset)); + grpc_pollset_kick(&sync->pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&sync->pollset)); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { synchronizer sync; grpc_jwt_verifier *verifier; gpr_cmdline *cl; @@ -97,36 +91,36 @@ main (int argc, char **argv) char *aud = NULL; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - cl = gpr_cmdline_create ("JWT verifier tool"); - gpr_cmdline_add_string (cl, "jwt", "JSON web token to verify", &jwt); - gpr_cmdline_add_string (cl, "aud", "Audience for the JWT", &aud); - gpr_cmdline_parse (cl, argc, argv); - if (jwt == NULL || aud == NULL) - { - print_usage_and_exit (cl, argv[0]); - } + cl = gpr_cmdline_create("JWT verifier tool"); + gpr_cmdline_add_string(cl, "jwt", "JSON web token to verify", &jwt); + gpr_cmdline_add_string(cl, "aud", "Audience for the JWT", &aud); + gpr_cmdline_parse(cl, argc, argv); + if (jwt == NULL || aud == NULL) { + print_usage_and_exit(cl, argv[0]); + } - verifier = grpc_jwt_verifier_create (NULL, 0); + verifier = grpc_jwt_verifier_create(NULL, 0); - grpc_init (); + grpc_init(); - grpc_pollset_init (&sync.pollset); + grpc_pollset_init(&sync.pollset); sync.is_done = 0; - grpc_jwt_verifier_verify (&exec_ctx, verifier, &sync.pollset, jwt, aud, on_jwt_verification_done, &sync); + grpc_jwt_verifier_verify(&exec_ctx, verifier, &sync.pollset, jwt, aud, + on_jwt_verification_done, &sync); - gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); - while (!sync.is_done) - { - grpc_pollset_worker worker; - grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC)); - gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); - } - gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); + while (!sync.is_done) { + grpc_pollset_worker worker; + grpc_pollset_work(&sync.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + gpr_inf_future(&exec_ctx, GPR_CLOCK_MONOTONIC)); + gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); + } + gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); - grpc_jwt_verifier_destroy (verifier); - gpr_cmdline_destroy (cl); + grpc_jwt_verifier_destroy(verifier); + gpr_cmdline_destroy(cl); return !sync.success; } diff --git a/test/core/statistics/census_log_tests.c b/test/core/statistics/census_log_tests.c index 3622713e85d..6968a5646d6 100644 --- a/test/core/statistics/census_log_tests.c +++ b/test/core/statistics/census_log_tests.c @@ -46,104 +46,93 @@ /* Fills in 'record' of size 'size'. Each byte in record is filled in with the same value. The value is extracted from 'record' pointer. */ -static void -write_record (char *record, size_t size) -{ - char data = (gpr_uintptr) record % 255; - memset (record, data, size); +static void write_record(char *record, size_t size) { + char data = (gpr_uintptr)record % 255; + memset(record, data, size); } /* Reads fixed size records. Returns the number of records read in 'num_records'. */ -static void -read_records (size_t record_size, const char *buffer, size_t buffer_size, gpr_int32 * num_records) -{ +static void read_records(size_t record_size, const char *buffer, + size_t buffer_size, gpr_int32 *num_records) { gpr_int32 ix; - GPR_ASSERT (buffer_size >= record_size); - GPR_ASSERT (buffer_size % record_size == 0); + GPR_ASSERT(buffer_size >= record_size); + GPR_ASSERT(buffer_size % record_size == 0); *num_records = buffer_size / record_size; - for (ix = 0; ix < *num_records; ++ix) - { - size_t jx; - const char *record = buffer + (record_size * ix); - char data = (gpr_uintptr) record % 255; - for (jx = 0; jx < record_size; ++jx) - { - GPR_ASSERT (data == record[jx]); - } + for (ix = 0; ix < *num_records; ++ix) { + size_t jx; + const char *record = buffer + (record_size * ix); + char data = (gpr_uintptr)record % 255; + for (jx = 0; jx < record_size; ++jx) { + GPR_ASSERT(data == record[jx]); } + } } /* Tries to write the specified number of records. Stops when the log gets full. Returns the number of records written. Spins for random number of times, up to 'max_spin_count', between writes. */ -static size_t -write_records_to_log (int writer_id, gpr_int32 record_size, gpr_int32 num_records, gpr_int32 max_spin_count) -{ +static size_t write_records_to_log(int writer_id, gpr_int32 record_size, + gpr_int32 num_records, + gpr_int32 max_spin_count) { gpr_int32 ix; int counter = 0; - for (ix = 0; ix < num_records; ++ix) - { - gpr_int32 jx; - gpr_int32 spin_count = max_spin_count ? rand () % max_spin_count : 0; - char *record; - if (counter++ == num_records / 10) - { - printf (" Writer %d: %d out of %d written\n", writer_id, ix, num_records); - counter = 0; - } - record = (char *) (census_log_start_write (record_size)); - if (record == NULL) - { - return ix; - } - write_record (record, record_size); - census_log_end_write (record, record_size); - for (jx = 0; jx < spin_count; ++jx) - { - GPR_ASSERT (jx >= 0); - } + for (ix = 0; ix < num_records; ++ix) { + gpr_int32 jx; + gpr_int32 spin_count = max_spin_count ? rand() % max_spin_count : 0; + char *record; + if (counter++ == num_records / 10) { + printf(" Writer %d: %d out of %d written\n", writer_id, ix, + num_records); + counter = 0; } + record = (char *)(census_log_start_write(record_size)); + if (record == NULL) { + return ix; + } + write_record(record, record_size); + census_log_end_write(record, record_size); + for (jx = 0; jx < spin_count; ++jx) { + GPR_ASSERT(jx >= 0); + } + } return num_records; } /* Performs a single read iteration. Returns the number of records read. */ -static size_t -perform_read_iteration (size_t record_size) -{ +static size_t perform_read_iteration(size_t record_size) { const void *read_buffer = NULL; size_t bytes_available; size_t records_read = 0; - census_log_init_reader (); - while ((read_buffer = census_log_read_next (&bytes_available))) - { - gpr_int32 num_records = 0; - read_records (record_size, (const char *) read_buffer, bytes_available, &num_records); - records_read += num_records; - } + census_log_init_reader(); + while ((read_buffer = census_log_read_next(&bytes_available))) { + gpr_int32 num_records = 0; + read_records(record_size, (const char *)read_buffer, bytes_available, + &num_records); + records_read += num_records; + } return records_read; } /* Asserts that the log is empty. */ -static void -assert_log_empty (void) -{ +static void assert_log_empty(void) { size_t bytes_available; - census_log_init_reader (); - GPR_ASSERT (census_log_read_next (&bytes_available) == NULL); + census_log_init_reader(); + GPR_ASSERT(census_log_read_next(&bytes_available) == NULL); } /* Given log size and record size, computes the minimum usable space. */ -static gpr_int32 -min_usable_space (size_t log_size, size_t record_size) -{ +static gpr_int32 min_usable_space(size_t log_size, size_t record_size) { gpr_int32 usable_space; - gpr_int32 num_blocks = GPR_MAX (log_size / CENSUS_LOG_MAX_RECORD_SIZE, gpr_cpu_num_cores ()); + gpr_int32 num_blocks = + GPR_MAX(log_size / CENSUS_LOG_MAX_RECORD_SIZE, gpr_cpu_num_cores()); gpr_int32 waste_per_block = CENSUS_LOG_MAX_RECORD_SIZE % record_size; /* In the worst case, all except one core-local block is full. */ gpr_int32 num_full_blocks = num_blocks - 1; - usable_space = (gpr_int32) log_size - (num_full_blocks * CENSUS_LOG_MAX_RECORD_SIZE) - ((num_blocks - num_full_blocks) * waste_per_block); - GPR_ASSERT (usable_space > 0); + usable_space = (gpr_int32)log_size - + (num_full_blocks * CENSUS_LOG_MAX_RECORD_SIZE) - + ((num_blocks - num_full_blocks) * waste_per_block); + GPR_ASSERT(usable_space > 0); return usable_space; } @@ -151,44 +140,36 @@ min_usable_space (size_t log_size, size_t record_size) are sized such that CENSUS_LOG_2_MAX_RECORD_SIZE is a multiple of record size. If not a circular log, verifies that the number of records written match the number of records read. */ -static void -fill_log (size_t log_size, int no_fragmentation, int circular_log) -{ +static void fill_log(size_t log_size, int no_fragmentation, int circular_log) { int size; gpr_int32 records_written; gpr_int32 usable_space; gpr_int32 records_read; - if (no_fragmentation) - { - int log2size = rand () % (CENSUS_LOG_2_MAX_RECORD_SIZE + 1); - size = (1 << log2size); + if (no_fragmentation) { + int log2size = rand() % (CENSUS_LOG_2_MAX_RECORD_SIZE + 1); + size = (1 << log2size); + } else { + while (1) { + size = 1 + (rand() % CENSUS_LOG_MAX_RECORD_SIZE); + if (CENSUS_LOG_MAX_RECORD_SIZE % size) { + break; + } } - else - { - while (1) - { - size = 1 + (rand () % CENSUS_LOG_MAX_RECORD_SIZE); - if (CENSUS_LOG_MAX_RECORD_SIZE % size) - { - break; - } - } - } - printf (" Fill record size: %d\n", size); - records_written = write_records_to_log (0 /* writer id */ , size, (log_size / size) * 2, 0 /* spin count */ ); - usable_space = min_usable_space (log_size, size); - GPR_ASSERT (records_written * size >= usable_space); - records_read = perform_read_iteration (size); - if (!circular_log) - { - GPR_ASSERT (records_written == records_read); - } - assert_log_empty (); + } + printf(" Fill record size: %d\n", size); + records_written = write_records_to_log( + 0 /* writer id */, size, (log_size / size) * 2, 0 /* spin count */); + usable_space = min_usable_space(log_size, size); + GPR_ASSERT(records_written * size >= usable_space); + records_read = perform_read_iteration(size); + if (!circular_log) { + GPR_ASSERT(records_written == records_read); + } + assert_log_empty(); } /* Structure to pass args to writer_thread */ -typedef struct writer_thread_args -{ +typedef struct writer_thread_args { /* Index of this thread in the writers vector. */ int index; /* Record size. */ @@ -203,36 +184,34 @@ typedef struct writer_thread_args /* Writes the given number of records of random size (up to kMaxRecordSize) and random data to the specified log. */ -static void -writer_thread (void *arg) -{ - writer_thread_args *args = (writer_thread_args *) arg; +static void writer_thread(void *arg) { + writer_thread_args *args = (writer_thread_args *)arg; /* Maximum number of times to spin between writes. */ static const gpr_int32 MAX_SPIN_COUNT = 50; int records_written = 0; - printf (" Writer: %d\n", args->index); - while (records_written < args->num_records) - { - records_written += write_records_to_log (args->index, args->record_size, args->num_records - records_written, MAX_SPIN_COUNT); - if (records_written < args->num_records) - { - /* Ran out of log space. Sleep for a bit and let the reader catch up. - This should never happen for circular logs. */ - printf (" Writer stalled due to out-of-space: %d out of %d written\n", records_written, args->num_records); - gpr_sleep_until (GRPC_TIMEOUT_MILLIS_TO_DEADLINE (10)); - } + printf(" Writer: %d\n", args->index); + while (records_written < args->num_records) { + records_written += write_records_to_log(args->index, args->record_size, + args->num_records - records_written, + MAX_SPIN_COUNT); + if (records_written < args->num_records) { + /* Ran out of log space. Sleep for a bit and let the reader catch up. + This should never happen for circular logs. */ + printf(" Writer stalled due to out-of-space: %d out of %d written\n", + records_written, args->num_records); + gpr_sleep_until(GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10)); } + } /* Done. Decrement count and signal. */ - gpr_mu_lock (args->mu); + gpr_mu_lock(args->mu); (*args->count)--; - gpr_cv_broadcast (args->done); - printf (" Writer done: %d\n", args->index); - gpr_mu_unlock (args->mu); + gpr_cv_broadcast(args->done); + printf(" Writer done: %d\n", args->index); + gpr_mu_unlock(args->mu); } /* struct to pass args to reader_thread */ -typedef struct reader_thread_args -{ +typedef struct reader_thread_args { /* Record size. */ size_t record_size; /* Interval between read iterations. */ @@ -251,37 +230,35 @@ typedef struct reader_thread_args /* Reads and verifies the specified number of records. Reader can also be stopped via gpr_cv_signal(&args->stop). Sleeps for 'read_interval_in_msec' between read iterations. */ -static void -reader_thread (void *arg) -{ +static void reader_thread(void *arg) { gpr_int32 records_read = 0; - reader_thread_args *args = (reader_thread_args *) arg; + reader_thread_args *args = (reader_thread_args *)arg; gpr_int32 num_iterations = 0; gpr_timespec interval; int counter = 0; - printf (" Reader starting\n"); - interval = gpr_time_from_micros (args->read_iteration_interval_in_msec * 1000, GPR_TIMESPAN); - gpr_mu_lock (args->mu); - while (!args->stop_flag && records_read < args->total_records) - { - gpr_cv_wait (&args->stop, args->mu, interval); - if (!args->stop_flag) - { - records_read += perform_read_iteration (args->record_size); - GPR_ASSERT (records_read <= args->total_records); - if (counter++ == 100000) - { - printf (" Reader: %d out of %d read\n", records_read, args->total_records); - counter = 0; - } - ++num_iterations; - } + printf(" Reader starting\n"); + interval = gpr_time_from_micros(args->read_iteration_interval_in_msec * 1000, + GPR_TIMESPAN); + gpr_mu_lock(args->mu); + while (!args->stop_flag && records_read < args->total_records) { + gpr_cv_wait(&args->stop, args->mu, interval); + if (!args->stop_flag) { + records_read += perform_read_iteration(args->record_size); + GPR_ASSERT(records_read <= args->total_records); + if (counter++ == 100000) { + printf(" Reader: %d out of %d read\n", records_read, + args->total_records); + counter = 0; + } + ++num_iterations; } + } /* Done */ args->running = 0; - gpr_cv_broadcast (args->done); - printf (" Reader: records: %d, iterations: %d\n", records_read, num_iterations); - gpr_mu_unlock (args->mu); + gpr_cv_broadcast(args->done); + printf(" Reader: records: %d, iterations: %d\n", records_read, + num_iterations); + gpr_mu_unlock(args->mu); } /* Creates NUM_WRITERS writers where each writer writes NUM_RECORDS_PER_WRITER @@ -289,9 +266,7 @@ reader_thread (void *arg) READ_ITERATION_INTERVAL_IN_MSEC. */ /* Number of writers. */ #define NUM_WRITERS 5 -static void -multiple_writers_single_reader (int circular_log) -{ +static void multiple_writers_single_reader(int circular_log) { /* Sleep interval between read iterations. */ static const gpr_int32 READ_ITERATION_INTERVAL_IN_MSEC = 10; /* Number of records written by each writer. */ @@ -302,159 +277,145 @@ multiple_writers_single_reader (int circular_log) gpr_thd_id id; gpr_cv writers_done; int writers_count = NUM_WRITERS; - gpr_mu writers_mu; /* protects writers_done and writers_count */ + gpr_mu writers_mu; /* protects writers_done and writers_count */ writer_thread_args writers[NUM_WRITERS]; gpr_cv reader_done; - gpr_mu reader_mu; /* protects reader_done and reader.running */ + gpr_mu reader_mu; /* protects reader_done and reader.running */ reader_thread_args reader; - gpr_int32 record_size = 1 + rand () % MAX_RECORD_SIZE; - printf (" Record size: %d\n", record_size); + gpr_int32 record_size = 1 + rand() % MAX_RECORD_SIZE; + printf(" Record size: %d\n", record_size); /* Create and start writers. */ - gpr_cv_init (&writers_done); - gpr_mu_init (&writers_mu); - for (ix = 0; ix < NUM_WRITERS; ++ix) - { - writers[ix].index = ix; - writers[ix].record_size = record_size; - writers[ix].num_records = NUM_RECORDS_PER_WRITER; - writers[ix].done = &writers_done; - writers[ix].count = &writers_count; - writers[ix].mu = &writers_mu; - gpr_thd_new (&id, &writer_thread, &writers[ix], NULL); - } + gpr_cv_init(&writers_done); + gpr_mu_init(&writers_mu); + for (ix = 0; ix < NUM_WRITERS; ++ix) { + writers[ix].index = ix; + writers[ix].record_size = record_size; + writers[ix].num_records = NUM_RECORDS_PER_WRITER; + writers[ix].done = &writers_done; + writers[ix].count = &writers_count; + writers[ix].mu = &writers_mu; + gpr_thd_new(&id, &writer_thread, &writers[ix], NULL); + } /* Start reader. */ reader.record_size = record_size; reader.read_iteration_interval_in_msec = READ_ITERATION_INTERVAL_IN_MSEC; reader.total_records = NUM_WRITERS * NUM_RECORDS_PER_WRITER; reader.stop_flag = 0; - gpr_cv_init (&reader.stop); - gpr_cv_init (&reader_done); + gpr_cv_init(&reader.stop); + gpr_cv_init(&reader_done); reader.done = &reader_done; - gpr_mu_init (&reader_mu); + gpr_mu_init(&reader_mu); reader.mu = &reader_mu; reader.running = 1; - gpr_thd_new (&id, &reader_thread, &reader, NULL); + gpr_thd_new(&id, &reader_thread, &reader, NULL); /* Wait for writers to finish. */ - gpr_mu_lock (&writers_mu); - while (writers_count != 0) - { - gpr_cv_wait (&writers_done, &writers_mu, gpr_inf_future (GPR_CLOCK_REALTIME)); - } - gpr_mu_unlock (&writers_mu); - gpr_mu_destroy (&writers_mu); - gpr_cv_destroy (&writers_done); - gpr_mu_lock (&reader_mu); - if (circular_log) - { - /* Stop reader. */ - reader.stop_flag = 1; - gpr_cv_signal (&reader.stop); - } + gpr_mu_lock(&writers_mu); + while (writers_count != 0) { + gpr_cv_wait(&writers_done, &writers_mu, gpr_inf_future(GPR_CLOCK_REALTIME)); + } + gpr_mu_unlock(&writers_mu); + gpr_mu_destroy(&writers_mu); + gpr_cv_destroy(&writers_done); + gpr_mu_lock(&reader_mu); + if (circular_log) { + /* Stop reader. */ + reader.stop_flag = 1; + gpr_cv_signal(&reader.stop); + } /* wait for reader to finish */ - while (reader.running) - { - gpr_cv_wait (&reader_done, &reader_mu, gpr_inf_future (GPR_CLOCK_REALTIME)); - } - if (circular_log) - { - /* Assert that there were no out-of-space errors. */ - GPR_ASSERT (0 == census_log_out_of_space_count ()); - } - gpr_mu_unlock (&reader_mu); - gpr_mu_destroy (&reader_mu); - gpr_cv_destroy (&reader_done); - printf (" Reader: finished\n"); + while (reader.running) { + gpr_cv_wait(&reader_done, &reader_mu, gpr_inf_future(GPR_CLOCK_REALTIME)); + } + if (circular_log) { + /* Assert that there were no out-of-space errors. */ + GPR_ASSERT(0 == census_log_out_of_space_count()); + } + gpr_mu_unlock(&reader_mu); + gpr_mu_destroy(&reader_mu); + gpr_cv_destroy(&reader_done); + printf(" Reader: finished\n"); } /* Log sizes to use for all tests. */ #define LOG_SIZE_IN_MB 1 #define LOG_SIZE_IN_BYTES (LOG_SIZE_IN_MB << 20) -static void -setup_test (int circular_log) -{ - census_log_initialize (LOG_SIZE_IN_MB, circular_log); - GPR_ASSERT (census_log_remaining_space () == LOG_SIZE_IN_BYTES); +static void setup_test(int circular_log) { + census_log_initialize(LOG_SIZE_IN_MB, circular_log); + GPR_ASSERT(census_log_remaining_space() == LOG_SIZE_IN_BYTES); } /* Attempts to create a record of invalid size (size > CENSUS_LOG_MAX_RECORD_SIZE). */ -void -test_invalid_record_size (void) -{ +void test_invalid_record_size(void) { static const size_t INVALID_SIZE = CENSUS_LOG_MAX_RECORD_SIZE + 1; static const size_t VALID_SIZE = 1; void *record; - printf ("Starting test: invalid record size\n"); - setup_test (0); - record = census_log_start_write (INVALID_SIZE); - GPR_ASSERT (record == NULL); + printf("Starting test: invalid record size\n"); + setup_test(0); + record = census_log_start_write(INVALID_SIZE); + GPR_ASSERT(record == NULL); /* Now try writing a valid record. */ - record = census_log_start_write (VALID_SIZE); - GPR_ASSERT (record != NULL); - census_log_end_write (record, VALID_SIZE); + record = census_log_start_write(VALID_SIZE); + GPR_ASSERT(record != NULL); + census_log_end_write(record, VALID_SIZE); /* Verifies that available space went down by one block. In theory, this check can fail if the thread is context switched to a new CPU during the start_write execution (multiple blocks get allocated), but this has not been observed in practice. */ - GPR_ASSERT (LOG_SIZE_IN_BYTES - CENSUS_LOG_MAX_RECORD_SIZE == census_log_remaining_space ()); - census_log_shutdown (); + GPR_ASSERT(LOG_SIZE_IN_BYTES - CENSUS_LOG_MAX_RECORD_SIZE == + census_log_remaining_space()); + census_log_shutdown(); } /* Tests end_write() with a different size than what was specified in start_write(). */ -void -test_end_write_with_different_size (void) -{ +void test_end_write_with_different_size(void) { static const size_t START_WRITE_SIZE = 10; static const size_t END_WRITE_SIZE = 7; void *record_written; const void *record_read; size_t bytes_available; - printf ("Starting test: end write with different size\n"); - setup_test (0); - record_written = census_log_start_write (START_WRITE_SIZE); - GPR_ASSERT (record_written != NULL); - census_log_end_write (record_written, END_WRITE_SIZE); - census_log_init_reader (); - record_read = census_log_read_next (&bytes_available); - GPR_ASSERT (record_written == record_read); - GPR_ASSERT (END_WRITE_SIZE == bytes_available); - assert_log_empty (); - census_log_shutdown (); + printf("Starting test: end write with different size\n"); + setup_test(0); + record_written = census_log_start_write(START_WRITE_SIZE); + GPR_ASSERT(record_written != NULL); + census_log_end_write(record_written, END_WRITE_SIZE); + census_log_init_reader(); + record_read = census_log_read_next(&bytes_available); + GPR_ASSERT(record_written == record_read); + GPR_ASSERT(END_WRITE_SIZE == bytes_available); + assert_log_empty(); + census_log_shutdown(); } /* Verifies that pending records are not available via read_next(). */ -void -test_read_pending_record (void) -{ +void test_read_pending_record(void) { static const size_t PR_RECORD_SIZE = 1024; size_t bytes_available; const void *record_read; void *record_written; - printf ("Starting test: read pending record\n"); - setup_test (0); + printf("Starting test: read pending record\n"); + setup_test(0); /* Start a write. */ - record_written = census_log_start_write (PR_RECORD_SIZE); - GPR_ASSERT (record_written != NULL); + record_written = census_log_start_write(PR_RECORD_SIZE); + GPR_ASSERT(record_written != NULL); /* As write is pending, read should fail. */ - census_log_init_reader (); - record_read = census_log_read_next (&bytes_available); - GPR_ASSERT (record_read == NULL); + census_log_init_reader(); + record_read = census_log_read_next(&bytes_available); + GPR_ASSERT(record_read == NULL); /* A read followed by end_write() should succeed. */ - census_log_end_write (record_written, PR_RECORD_SIZE); - census_log_init_reader (); - record_read = census_log_read_next (&bytes_available); - GPR_ASSERT (record_written == record_read); - GPR_ASSERT (PR_RECORD_SIZE == bytes_available); - assert_log_empty (); - census_log_shutdown (); + census_log_end_write(record_written, PR_RECORD_SIZE); + census_log_init_reader(); + record_read = census_log_read_next(&bytes_available); + GPR_ASSERT(record_written == record_read); + GPR_ASSERT(PR_RECORD_SIZE == bytes_available); + assert_log_empty(); + census_log_shutdown(); } /* Tries reading beyond pending write. */ -void -test_read_beyond_pending_record (void) -{ +void test_read_beyond_pending_record(void) { /* Start a write. */ gpr_uint32 incomplete_record_size = 10; gpr_uint32 complete_record_size = 20; @@ -462,187 +423,169 @@ test_read_beyond_pending_record (void) void *complete_record; const void *record_read; void *incomplete_record; - printf ("Starting test: read beyond pending record\n"); - setup_test (0); - incomplete_record = census_log_start_write (incomplete_record_size); - GPR_ASSERT (incomplete_record != NULL); - complete_record = census_log_start_write (complete_record_size); - GPR_ASSERT (complete_record != NULL); - GPR_ASSERT (complete_record != incomplete_record); - census_log_end_write (complete_record, complete_record_size); + printf("Starting test: read beyond pending record\n"); + setup_test(0); + incomplete_record = census_log_start_write(incomplete_record_size); + GPR_ASSERT(incomplete_record != NULL); + complete_record = census_log_start_write(complete_record_size); + GPR_ASSERT(complete_record != NULL); + GPR_ASSERT(complete_record != incomplete_record); + census_log_end_write(complete_record, complete_record_size); /* Now iterate over blocks to read completed records. */ - census_log_init_reader (); - record_read = census_log_read_next (&bytes_available); - GPR_ASSERT (complete_record == record_read); - GPR_ASSERT (complete_record_size == bytes_available); + census_log_init_reader(); + record_read = census_log_read_next(&bytes_available); + GPR_ASSERT(complete_record == record_read); + GPR_ASSERT(complete_record_size == bytes_available); /* Complete first record. */ - census_log_end_write (incomplete_record, incomplete_record_size); + census_log_end_write(incomplete_record, incomplete_record_size); /* Have read past the incomplete record, so read_next() should return NULL. */ /* NB: this test also assumes our thread did not get switched to a different CPU between the two start_write calls */ - record_read = census_log_read_next (&bytes_available); - GPR_ASSERT (record_read == NULL); + record_read = census_log_read_next(&bytes_available); + GPR_ASSERT(record_read == NULL); /* Reset reader to get the newly completed record. */ - census_log_init_reader (); - record_read = census_log_read_next (&bytes_available); - GPR_ASSERT (incomplete_record == record_read); - GPR_ASSERT (incomplete_record_size == bytes_available); - assert_log_empty (); - census_log_shutdown (); + census_log_init_reader(); + record_read = census_log_read_next(&bytes_available); + GPR_ASSERT(incomplete_record == record_read); + GPR_ASSERT(incomplete_record_size == bytes_available); + assert_log_empty(); + census_log_shutdown(); } /* Tests scenario where block being read is detached from a core and put on the dirty list. */ -void -test_detached_while_reading (void) -{ +void test_detached_while_reading(void) { static const size_t DWR_RECORD_SIZE = 10; size_t bytes_available; const void *record_read; void *record_written; gpr_uint32 block_read = 0; - printf ("Starting test: detached while reading\n"); - setup_test (0); + printf("Starting test: detached while reading\n"); + setup_test(0); /* Start a write. */ - record_written = census_log_start_write (DWR_RECORD_SIZE); - GPR_ASSERT (record_written != NULL); - census_log_end_write (record_written, DWR_RECORD_SIZE); + record_written = census_log_start_write(DWR_RECORD_SIZE); + GPR_ASSERT(record_written != NULL); + census_log_end_write(record_written, DWR_RECORD_SIZE); /* Read this record. */ - census_log_init_reader (); - record_read = census_log_read_next (&bytes_available); - GPR_ASSERT (record_read != NULL); - GPR_ASSERT (DWR_RECORD_SIZE == bytes_available); + census_log_init_reader(); + record_read = census_log_read_next(&bytes_available); + GPR_ASSERT(record_read != NULL); + GPR_ASSERT(DWR_RECORD_SIZE == bytes_available); /* Now fill the log. This will move the block being read from core-local array to the dirty list. */ - while ((record_written = census_log_start_write (DWR_RECORD_SIZE))) - { - census_log_end_write (record_written, DWR_RECORD_SIZE); - } + while ((record_written = census_log_start_write(DWR_RECORD_SIZE))) { + census_log_end_write(record_written, DWR_RECORD_SIZE); + } /* In this iteration, read_next() should only traverse blocks in the core-local array. Therefore, we expect at most gpr_cpu_num_cores() more blocks. As log is full, if read_next() is traversing the dirty list, we will get more than gpr_cpu_num_cores() blocks. */ - while ((record_read = census_log_read_next (&bytes_available))) - { - ++block_read; - GPR_ASSERT (block_read <= gpr_cpu_num_cores ()); - } - census_log_shutdown (); + while ((record_read = census_log_read_next(&bytes_available))) { + ++block_read; + GPR_ASSERT(block_read <= gpr_cpu_num_cores()); + } + census_log_shutdown(); } /* Fills non-circular log with records sized such that size is a multiple of CENSUS_LOG_MAX_RECORD_SIZE (no per-block fragmentation). */ -void -test_fill_log_no_fragmentation (void) -{ +void test_fill_log_no_fragmentation(void) { const int circular = 0; - printf ("Starting test: fill log no fragmentation\n"); - setup_test (circular); - fill_log (LOG_SIZE_IN_BYTES, 1 /* no fragmentation */ , circular); - census_log_shutdown (); + printf("Starting test: fill log no fragmentation\n"); + setup_test(circular); + fill_log(LOG_SIZE_IN_BYTES, 1 /* no fragmentation */, circular); + census_log_shutdown(); } /* Fills circular log with records sized such that size is a multiple of CENSUS_LOG_MAX_RECORD_SIZE (no per-block fragmentation). */ -void -test_fill_circular_log_no_fragmentation (void) -{ +void test_fill_circular_log_no_fragmentation(void) { const int circular = 1; - printf ("Starting test: fill circular log no fragmentation\n"); - setup_test (circular); - fill_log (LOG_SIZE_IN_BYTES, 1 /* no fragmentation */ , circular); - census_log_shutdown (); + printf("Starting test: fill circular log no fragmentation\n"); + setup_test(circular); + fill_log(LOG_SIZE_IN_BYTES, 1 /* no fragmentation */, circular); + census_log_shutdown(); } /* Fills non-circular log with records that may straddle end of a block. */ -void -test_fill_log_with_straddling_records (void) -{ +void test_fill_log_with_straddling_records(void) { const int circular = 0; - printf ("Starting test: fill log with straddling records\n"); - setup_test (circular); - fill_log (LOG_SIZE_IN_BYTES, 0 /* block straddling records */ , circular); - census_log_shutdown (); + printf("Starting test: fill log with straddling records\n"); + setup_test(circular); + fill_log(LOG_SIZE_IN_BYTES, 0 /* block straddling records */, circular); + census_log_shutdown(); } /* Fills circular log with records that may straddle end of a block. */ -void -test_fill_circular_log_with_straddling_records (void) -{ +void test_fill_circular_log_with_straddling_records(void) { const int circular = 1; - printf ("Starting test: fill circular log with straddling records\n"); - setup_test (circular); - fill_log (LOG_SIZE_IN_BYTES, 0 /* block straddling records */ , circular); - census_log_shutdown (); + printf("Starting test: fill circular log with straddling records\n"); + setup_test(circular); + fill_log(LOG_SIZE_IN_BYTES, 0 /* block straddling records */, circular); + census_log_shutdown(); } /* Tests scenario where multiple writers and a single reader are using a log that is configured to discard old records. */ -void -test_multiple_writers_circular_log (void) -{ +void test_multiple_writers_circular_log(void) { const int circular = 1; - printf ("Starting test: multiple writers circular log\n"); - setup_test (circular); - multiple_writers_single_reader (circular); - census_log_shutdown (); + printf("Starting test: multiple writers circular log\n"); + setup_test(circular); + multiple_writers_single_reader(circular); + census_log_shutdown(); } /* Tests scenario where multiple writers and a single reader are using a log that is configured to discard old records. */ -void -test_multiple_writers (void) -{ +void test_multiple_writers(void) { const int circular = 0; - printf ("Starting test: multiple writers\n"); - setup_test (circular); - multiple_writers_single_reader (circular); - census_log_shutdown (); + printf("Starting test: multiple writers\n"); + setup_test(circular); + multiple_writers_single_reader(circular); + census_log_shutdown(); } /* Repeat the straddling records and multiple writers tests with a small log. */ -void -test_small_log (void) -{ +void test_small_log(void) { size_t log_size; const int circular = 0; - printf ("Starting test: small log\n"); - census_log_initialize (0, circular); - log_size = census_log_remaining_space (); - GPR_ASSERT (log_size > 0); - fill_log (log_size, 0, circular); - census_log_shutdown (); - census_log_initialize (0, circular); - multiple_writers_single_reader (circular); - census_log_shutdown (); + printf("Starting test: small log\n"); + census_log_initialize(0, circular); + log_size = census_log_remaining_space(); + GPR_ASSERT(log_size > 0); + fill_log(log_size, 0, circular); + census_log_shutdown(); + census_log_initialize(0, circular); + multiple_writers_single_reader(circular); + census_log_shutdown(); } -void -test_performance (void) -{ +void test_performance(void) { int write_size = 1; - for (; write_size < CENSUS_LOG_MAX_RECORD_SIZE; write_size *= 2) - { - gpr_timespec write_time; - gpr_timespec start_time; - double write_time_micro = 0.0; - int nrecords = 0; - setup_test (0); - start_time = gpr_now (GPR_CLOCK_REALTIME); - while (1) - { - void *record = census_log_start_write (write_size); - if (record == NULL) - { - break; - } - census_log_end_write (record, write_size); - nrecords++; - } - write_time = gpr_time_sub (gpr_now (GPR_CLOCK_REALTIME), start_time); - write_time_micro = write_time.tv_sec * 1000000 + write_time.tv_nsec / 1000; - census_log_shutdown (); - printf ("Wrote %d %d byte records in %.3g microseconds: %g records/us " "(%g ns/record), %g gigabytes/s\n", nrecords, write_size, write_time_micro, nrecords / write_time_micro, 1000 * write_time_micro / nrecords, (write_size * nrecords) / write_time_micro / 1000); + for (; write_size < CENSUS_LOG_MAX_RECORD_SIZE; write_size *= 2) { + gpr_timespec write_time; + gpr_timespec start_time; + double write_time_micro = 0.0; + int nrecords = 0; + setup_test(0); + start_time = gpr_now(GPR_CLOCK_REALTIME); + while (1) { + void *record = census_log_start_write(write_size); + if (record == NULL) { + break; + } + census_log_end_write(record, write_size); + nrecords++; } + write_time = gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), start_time); + write_time_micro = write_time.tv_sec * 1000000 + write_time.tv_nsec / 1000; + census_log_shutdown(); + printf( + "Wrote %d %d byte records in %.3g microseconds: %g records/us " + "(%g ns/record), %g gigabytes/s\n", + nrecords, write_size, write_time_micro, nrecords / write_time_micro, + 1000 * write_time_micro / nrecords, + (write_size * nrecords) / write_time_micro / 1000); + } } diff --git a/test/core/statistics/census_log_tests.h b/test/core/statistics/census_log_tests.h index 684b014cebb..ec3241b4f97 100644 --- a/test/core/statistics/census_log_tests.h +++ b/test/core/statistics/census_log_tests.h @@ -34,18 +34,18 @@ #ifndef GRPC_TEST_CORE_STATISTICS_CENSUS_LOG_TESTS_H #define GRPC_TEST_CORE_STATISTICS_CENSUS_LOG_TESTS_H -void test_invalid_record_size (); -void test_end_write_with_different_size (); -void test_read_pending_record (); -void test_read_beyond_pending_record (); -void test_detached_while_reading (); -void test_fill_log_no_fragmentation (); -void test_fill_circular_log_no_fragmentation (); -void test_fill_log_with_straddling_records (); -void test_fill_circular_log_with_straddling_records (); -void test_multiple_writers_circular_log (); -void test_multiple_writers (); -void test_performance (); -void test_small_log (); +void test_invalid_record_size(); +void test_end_write_with_different_size(); +void test_read_pending_record(); +void test_read_beyond_pending_record(); +void test_detached_while_reading(); +void test_fill_log_no_fragmentation(); +void test_fill_circular_log_no_fragmentation(); +void test_fill_log_with_straddling_records(); +void test_fill_circular_log_with_straddling_records(); +void test_multiple_writers_circular_log(); +void test_multiple_writers(); +void test_performance(); +void test_small_log(); #endif /* GRPC_TEST_CORE_STATISTICS_CENSUS_LOG_TESTS_H */ diff --git a/test/core/statistics/census_stub_test.c b/test/core/statistics/census_stub_test.c index ed4da9463ba..8e409a37263 100644 --- a/test/core/statistics/census_stub_test.c +++ b/test/core/statistics/census_stub_test.c @@ -41,41 +41,37 @@ #include "test/core/util/test_config.h" /* Tests census noop stubs in a simulated rpc flow */ -void -test_census_stubs (void) -{ +void test_census_stubs(void) { census_op_id op_id; - census_rpc_stats *stats = census_rpc_stats_create_empty (); - census_aggregated_rpc_stats data_map = { 0, NULL }; + census_rpc_stats *stats = census_rpc_stats_create_empty(); + census_aggregated_rpc_stats data_map = {0, NULL}; /* Initializes census library at server start up time. */ - census_init (); + census_init(); /* Starts tracing at the beginning of a rpc. */ - op_id = census_tracing_start_op (); + op_id = census_tracing_start_op(); /* Appends custom annotations on a trace object. */ - census_tracing_print (op_id, "annotation foo"); - census_tracing_print (op_id, "annotation bar"); + census_tracing_print(op_id, "annotation foo"); + census_tracing_print(op_id, "annotation bar"); /* Appends method tag on the trace object. */ - census_add_method_tag (op_id, "service_foo/method.bar"); + census_add_method_tag(op_id, "service_foo/method.bar"); /* Either record client side stats or server side stats associated with the op_id. Here for testing purpose, we record both. */ - census_record_rpc_client_stats (op_id, stats); - census_record_rpc_server_stats (op_id, stats); + census_record_rpc_client_stats(op_id, stats); + census_record_rpc_server_stats(op_id, stats); /* Ends a tracing. */ - census_tracing_end_op (op_id); + census_tracing_end_op(op_id); /* In process stats queries. */ - census_get_server_stats (&data_map); - census_aggregated_rpc_stats_set_empty (&data_map); - census_get_client_stats (&data_map); - census_aggregated_rpc_stats_set_empty (&data_map); - gpr_free (stats); - census_shutdown (); + census_get_server_stats(&data_map); + census_aggregated_rpc_stats_set_empty(&data_map); + census_get_client_stats(&data_map); + census_aggregated_rpc_stats_set_empty(&data_map); + gpr_free(stats); + census_shutdown(); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_census_stubs (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_census_stubs(); return 0; } diff --git a/test/core/statistics/hash_table_test.c b/test/core/statistics/hash_table_test.c index bcf3fb7b87d..453755f40a4 100644 --- a/test/core/statistics/hash_table_test.c +++ b/test/core/statistics/hash_table_test.c @@ -44,296 +44,258 @@ #include #include "test/core/util/test_config.h" -static gpr_uint64 -hash64 (const void *k) -{ - size_t len = strlen (k); - gpr_uint64 higher = gpr_murmur_hash3 ((const char *) k, len / 2, 0); - return higher << 32 | gpr_murmur_hash3 ((const char *) (k) + len / 2, len - len / 2, 0); +static gpr_uint64 hash64(const void *k) { + size_t len = strlen(k); + gpr_uint64 higher = gpr_murmur_hash3((const char *)k, len / 2, 0); + return higher << 32 | + gpr_murmur_hash3((const char *)(k) + len / 2, len - len / 2, 0); } -static int -cmp_str_keys (const void *k1, const void *k2) -{ - return strcmp ((const char *) k1, (const char *) k2); +static int cmp_str_keys(const void *k1, const void *k2) { + return strcmp((const char *)k1, (const char *)k2); } -static gpr_uint64 -force_collision (const void *k) -{ - return (1997 + hash64 (k) % 3); +static gpr_uint64 force_collision(const void *k) { + return (1997 + hash64(k) % 3); } -static void -free_data (void *data) -{ - gpr_free (data); -} +static void free_data(void *data) { gpr_free(data); } /* Basic tests that empty hash table can be created and destroyed. */ -static void -test_create_table (void) -{ +static void test_create_table(void) { /* Create table with uint64 key type */ census_ht *ht = NULL; census_ht_option ht_options = { - CENSUS_HT_UINT64, 1999, NULL, NULL, NULL, NULL - }; - ht = census_ht_create (&ht_options); - GPR_ASSERT (ht != NULL); - GPR_ASSERT (census_ht_get_size (ht) == 0); - census_ht_destroy (ht); + CENSUS_HT_UINT64, 1999, NULL, NULL, NULL, NULL}; + ht = census_ht_create(&ht_options); + GPR_ASSERT(ht != NULL); + GPR_ASSERT(census_ht_get_size(ht) == 0); + census_ht_destroy(ht); /* Create table with pointer key type */ ht = NULL; ht_options.key_type = CENSUS_HT_POINTER; ht_options.hash = &hash64; ht_options.compare_keys = &cmp_str_keys; - ht = census_ht_create (&ht_options); - GPR_ASSERT (ht != NULL); - GPR_ASSERT (census_ht_get_size (ht) == 0); - census_ht_destroy (ht); + ht = census_ht_create(&ht_options); + GPR_ASSERT(ht != NULL); + GPR_ASSERT(census_ht_get_size(ht) == 0); + census_ht_destroy(ht); } -static void -test_table_with_int_key (void) -{ - census_ht_option opt = { CENSUS_HT_UINT64, 7, NULL, NULL, NULL, NULL }; - census_ht *ht = census_ht_create (&opt); +static void test_table_with_int_key(void) { + census_ht_option opt = {CENSUS_HT_UINT64, 7, NULL, NULL, NULL, NULL}; + census_ht *ht = census_ht_create(&opt); gpr_uint64 i = 0; gpr_uint64 sum_of_keys = 0; size_t num_elements; census_ht_kv *elements = NULL; - GPR_ASSERT (ht != NULL); - GPR_ASSERT (census_ht_get_size (ht) == 0); - elements = census_ht_get_all_elements (ht, &num_elements); - GPR_ASSERT (num_elements == 0); - GPR_ASSERT (elements == NULL); - for (i = 0; i < 20; ++i) - { - census_ht_key key; - key.val = i; - census_ht_insert (ht, key, (void *) (gpr_intptr) i); - GPR_ASSERT (census_ht_get_size (ht) == i + 1); - } - for (i = 0; i < 20; i++) - { - gpr_uint64 *val = NULL; - census_ht_key key; - key.val = i; - val = census_ht_find (ht, key); - GPR_ASSERT (val == (void *) (gpr_intptr) i); - } - elements = census_ht_get_all_elements (ht, &num_elements); - GPR_ASSERT (elements != NULL); - GPR_ASSERT (num_elements == 20); - for (i = 0; i < num_elements; i++) - { - sum_of_keys += elements[i].k.val; - } - GPR_ASSERT (sum_of_keys == 190); - gpr_free (elements); - census_ht_destroy (ht); + GPR_ASSERT(ht != NULL); + GPR_ASSERT(census_ht_get_size(ht) == 0); + elements = census_ht_get_all_elements(ht, &num_elements); + GPR_ASSERT(num_elements == 0); + GPR_ASSERT(elements == NULL); + for (i = 0; i < 20; ++i) { + census_ht_key key; + key.val = i; + census_ht_insert(ht, key, (void *)(gpr_intptr)i); + GPR_ASSERT(census_ht_get_size(ht) == i + 1); + } + for (i = 0; i < 20; i++) { + gpr_uint64 *val = NULL; + census_ht_key key; + key.val = i; + val = census_ht_find(ht, key); + GPR_ASSERT(val == (void *)(gpr_intptr)i); + } + elements = census_ht_get_all_elements(ht, &num_elements); + GPR_ASSERT(elements != NULL); + GPR_ASSERT(num_elements == 20); + for (i = 0; i < num_elements; i++) { + sum_of_keys += elements[i].k.val; + } + GPR_ASSERT(sum_of_keys == 190); + gpr_free(elements); + census_ht_destroy(ht); } /* Test that there is no memory leak when keys and values are owned by table. */ -static void -test_value_and_key_deleter (void) -{ - census_ht_option opt = { CENSUS_HT_POINTER, 7, &hash64, - &cmp_str_keys, &free_data, &free_data - }; - census_ht *ht = census_ht_create (&opt); +static void test_value_and_key_deleter(void) { + census_ht_option opt = {CENSUS_HT_POINTER, 7, &hash64, + &cmp_str_keys, &free_data, &free_data}; + census_ht *ht = census_ht_create(&opt); census_ht_key key; char *val = NULL; char *val2 = NULL; - key.ptr = gpr_malloc (100); - val = gpr_malloc (10); - strcpy (val, "value"); - strcpy (key.ptr, "some string as a key"); - GPR_ASSERT (ht != NULL); - GPR_ASSERT (census_ht_get_size (ht) == 0); - census_ht_insert (ht, key, val); - GPR_ASSERT (census_ht_get_size (ht) == 1); - val = census_ht_find (ht, key); - GPR_ASSERT (val != NULL); - GPR_ASSERT (strcmp (val, "value") == 0); + key.ptr = gpr_malloc(100); + val = gpr_malloc(10); + strcpy(val, "value"); + strcpy(key.ptr, "some string as a key"); + GPR_ASSERT(ht != NULL); + GPR_ASSERT(census_ht_get_size(ht) == 0); + census_ht_insert(ht, key, val); + GPR_ASSERT(census_ht_get_size(ht) == 1); + val = census_ht_find(ht, key); + GPR_ASSERT(val != NULL); + GPR_ASSERT(strcmp(val, "value") == 0); /* Insert same key different value, old value is overwritten. */ - val2 = gpr_malloc (10); - strcpy (val2, "v2"); - census_ht_insert (ht, key, val2); - GPR_ASSERT (census_ht_get_size (ht) == 1); - val2 = census_ht_find (ht, key); - GPR_ASSERT (val2 != NULL); - GPR_ASSERT (strcmp (val2, "v2") == 0); - census_ht_destroy (ht); + val2 = gpr_malloc(10); + strcpy(val2, "v2"); + census_ht_insert(ht, key, val2); + GPR_ASSERT(census_ht_get_size(ht) == 1); + val2 = census_ht_find(ht, key); + GPR_ASSERT(val2 != NULL); + GPR_ASSERT(strcmp(val2, "v2") == 0); + census_ht_destroy(ht); } /* Test simple insert and erase operations. */ -static void -test_simple_add_and_erase (void) -{ - census_ht_option opt = { CENSUS_HT_UINT64, 7, NULL, NULL, NULL, NULL }; - census_ht *ht = census_ht_create (&opt); - GPR_ASSERT (ht != NULL); - GPR_ASSERT (census_ht_get_size (ht) == 0); +static void test_simple_add_and_erase(void) { + census_ht_option opt = {CENSUS_HT_UINT64, 7, NULL, NULL, NULL, NULL}; + census_ht *ht = census_ht_create(&opt); + GPR_ASSERT(ht != NULL); + GPR_ASSERT(census_ht_get_size(ht) == 0); { census_ht_key key; int val = 3; key.val = 2; - census_ht_insert (ht, key, (void *) &val); - GPR_ASSERT (census_ht_get_size (ht) == 1); - census_ht_erase (ht, key); - GPR_ASSERT (census_ht_get_size (ht) == 0); + census_ht_insert(ht, key, (void *)&val); + GPR_ASSERT(census_ht_get_size(ht) == 1); + census_ht_erase(ht, key); + GPR_ASSERT(census_ht_get_size(ht) == 0); /* Erasing a key from an empty table should be noop. */ - census_ht_erase (ht, key); - GPR_ASSERT (census_ht_get_size (ht) == 0); + census_ht_erase(ht, key); + GPR_ASSERT(census_ht_get_size(ht) == 0); /* Erasing a non-existant key from a table should be noop. */ - census_ht_insert (ht, key, (void *) &val); + census_ht_insert(ht, key, (void *)&val); key.val = 3; - census_ht_insert (ht, key, (void *) &val); + census_ht_insert(ht, key, (void *)&val); key.val = 9; - census_ht_insert (ht, key, (void *) &val); - GPR_ASSERT (census_ht_get_size (ht) == 3); + census_ht_insert(ht, key, (void *)&val); + GPR_ASSERT(census_ht_get_size(ht) == 3); key.val = 1; - census_ht_erase (ht, key); + census_ht_erase(ht, key); /* size unchanged after deleting non-existant key. */ - GPR_ASSERT (census_ht_get_size (ht) == 3); + GPR_ASSERT(census_ht_get_size(ht) == 3); /* size decrease by 1 after deleting an existant key. */ key.val = 2; - census_ht_erase (ht, key); - GPR_ASSERT (census_ht_get_size (ht) == 2); + census_ht_erase(ht, key); + GPR_ASSERT(census_ht_get_size(ht) == 2); } - census_ht_destroy (ht); + census_ht_destroy(ht); } -static void -test_insertion_and_deletion_with_high_collision_rate (void) -{ - census_ht_option opt = { CENSUS_HT_POINTER, 13, &force_collision, - &cmp_str_keys, NULL, NULL - }; - census_ht *ht = census_ht_create (&opt); +static void test_insertion_and_deletion_with_high_collision_rate(void) { + census_ht_option opt = {CENSUS_HT_POINTER, 13, &force_collision, + &cmp_str_keys, NULL, NULL}; + census_ht *ht = census_ht_create(&opt); char key_str[1000][GPR_LTOA_MIN_BUFSIZE]; gpr_uint64 val = 0; unsigned i = 0; - for (i = 0; i < 1000; i++) - { - census_ht_key key; - key.ptr = key_str[i]; - gpr_ltoa (i, key_str[i]); - census_ht_insert (ht, key, (void *) (&val)); - gpr_log (GPR_INFO, "%d\n", i); - GPR_ASSERT (census_ht_get_size (ht) == (i + 1)); - } - for (i = 0; i < 1000; i++) - { - census_ht_key key; - key.ptr = key_str[i]; - census_ht_erase (ht, key); - GPR_ASSERT (census_ht_get_size (ht) == (999 - i)); - } - census_ht_destroy (ht); + for (i = 0; i < 1000; i++) { + census_ht_key key; + key.ptr = key_str[i]; + gpr_ltoa(i, key_str[i]); + census_ht_insert(ht, key, (void *)(&val)); + gpr_log(GPR_INFO, "%d\n", i); + GPR_ASSERT(census_ht_get_size(ht) == (i + 1)); + } + for (i = 0; i < 1000; i++) { + census_ht_key key; + key.ptr = key_str[i]; + census_ht_erase(ht, key); + GPR_ASSERT(census_ht_get_size(ht) == (999 - i)); + } + census_ht_destroy(ht); } -static void -test_table_with_string_key (void) -{ - census_ht_option opt = { CENSUS_HT_POINTER, 7, &hash64, - &cmp_str_keys, NULL, NULL - }; - census_ht *ht = census_ht_create (&opt); +static void test_table_with_string_key(void) { + census_ht_option opt = {CENSUS_HT_POINTER, 7, &hash64, + &cmp_str_keys, NULL, NULL}; + census_ht *ht = census_ht_create(&opt); const char *keys[] = { - "k1", "a", "000", "apple", "banana_a_long_long_long_banana", - "%$", "111", "foo", "b" - }; - const int vals[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; + "k1", "a", "000", "apple", "banana_a_long_long_long_banana", + "%$", "111", "foo", "b"}; + const int vals[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; int i = 0; - GPR_ASSERT (ht != NULL); - GPR_ASSERT (census_ht_get_size (ht) == 0); - for (i = 0; i < 9; i++) - { - census_ht_key key; - key.ptr = (void *) (keys[i]); - census_ht_insert (ht, key, (void *) (vals + i)); - } - GPR_ASSERT (census_ht_get_size (ht) == 9); - for (i = 0; i < 9; i++) - { - census_ht_key key; - int *val_ptr; - key.ptr = (void *) (keys[i]); - val_ptr = census_ht_find (ht, key); - GPR_ASSERT (*val_ptr == vals[i]); - } + GPR_ASSERT(ht != NULL); + GPR_ASSERT(census_ht_get_size(ht) == 0); + for (i = 0; i < 9; i++) { + census_ht_key key; + key.ptr = (void *)(keys[i]); + census_ht_insert(ht, key, (void *)(vals + i)); + } + GPR_ASSERT(census_ht_get_size(ht) == 9); + for (i = 0; i < 9; i++) { + census_ht_key key; + int *val_ptr; + key.ptr = (void *)(keys[i]); + val_ptr = census_ht_find(ht, key); + GPR_ASSERT(*val_ptr == vals[i]); + } { /* inserts duplicate keys */ census_ht_key key; int *val_ptr = NULL; - key.ptr = (void *) (keys[2]); - census_ht_insert (ht, key, (void *) (vals + 8)); + key.ptr = (void *)(keys[2]); + census_ht_insert(ht, key, (void *)(vals + 8)); /* expect value to be over written by new insertion */ - GPR_ASSERT (census_ht_get_size (ht) == 9); - val_ptr = census_ht_find (ht, key); - GPR_ASSERT (*val_ptr == vals[8]); + GPR_ASSERT(census_ht_get_size(ht) == 9); + val_ptr = census_ht_find(ht, key); + GPR_ASSERT(*val_ptr == vals[8]); + } + for (i = 0; i < 9; i++) { + census_ht_key key; + int *val_ptr; + gpr_uint32 expected_tbl_sz = 9 - i; + GPR_ASSERT(census_ht_get_size(ht) == expected_tbl_sz); + key.ptr = (void *)(keys[i]); + val_ptr = census_ht_find(ht, key); + GPR_ASSERT(val_ptr != NULL); + census_ht_erase(ht, key); + GPR_ASSERT(census_ht_get_size(ht) == expected_tbl_sz - 1); + val_ptr = census_ht_find(ht, key); + GPR_ASSERT(val_ptr == NULL); } - for (i = 0; i < 9; i++) - { - census_ht_key key; - int *val_ptr; - gpr_uint32 expected_tbl_sz = 9 - i; - GPR_ASSERT (census_ht_get_size (ht) == expected_tbl_sz); - key.ptr = (void *) (keys[i]); - val_ptr = census_ht_find (ht, key); - GPR_ASSERT (val_ptr != NULL); - census_ht_erase (ht, key); - GPR_ASSERT (census_ht_get_size (ht) == expected_tbl_sz - 1); - val_ptr = census_ht_find (ht, key); - GPR_ASSERT (val_ptr == NULL); - } - census_ht_destroy (ht); + census_ht_destroy(ht); } -static void -test_insertion_with_same_key (void) -{ - census_ht_option opt = { CENSUS_HT_UINT64, 11, NULL, NULL, NULL, NULL }; - census_ht *ht = census_ht_create (&opt); +static void test_insertion_with_same_key(void) { + census_ht_option opt = {CENSUS_HT_UINT64, 11, NULL, NULL, NULL, NULL}; + census_ht *ht = census_ht_create(&opt); census_ht_key key; - const char vals[] = { 'a', 'b', 'c' }; + const char vals[] = {'a', 'b', 'c'}; char *val_ptr; key.val = 3; - census_ht_insert (ht, key, (void *) &(vals[0])); - GPR_ASSERT (census_ht_get_size (ht) == 1); - val_ptr = (char *) census_ht_find (ht, key); - GPR_ASSERT (val_ptr != NULL); - GPR_ASSERT (*val_ptr == 'a'); + census_ht_insert(ht, key, (void *)&(vals[0])); + GPR_ASSERT(census_ht_get_size(ht) == 1); + val_ptr = (char *)census_ht_find(ht, key); + GPR_ASSERT(val_ptr != NULL); + GPR_ASSERT(*val_ptr == 'a'); key.val = 4; - val_ptr = (char *) census_ht_find (ht, key); - GPR_ASSERT (val_ptr == NULL); + val_ptr = (char *)census_ht_find(ht, key); + GPR_ASSERT(val_ptr == NULL); key.val = 3; - census_ht_insert (ht, key, (void *) &(vals[1])); - GPR_ASSERT (census_ht_get_size (ht) == 1); - val_ptr = (char *) census_ht_find (ht, key); - GPR_ASSERT (val_ptr != NULL); - GPR_ASSERT (*val_ptr == 'b'); - census_ht_insert (ht, key, (void *) &(vals[2])); - GPR_ASSERT (census_ht_get_size (ht) == 1); - val_ptr = (char *) census_ht_find (ht, key); - GPR_ASSERT (val_ptr != NULL); - GPR_ASSERT (*val_ptr == 'c'); - census_ht_destroy (ht); + census_ht_insert(ht, key, (void *)&(vals[1])); + GPR_ASSERT(census_ht_get_size(ht) == 1); + val_ptr = (char *)census_ht_find(ht, key); + GPR_ASSERT(val_ptr != NULL); + GPR_ASSERT(*val_ptr == 'b'); + census_ht_insert(ht, key, (void *)&(vals[2])); + GPR_ASSERT(census_ht_get_size(ht) == 1); + val_ptr = (char *)census_ht_find(ht, key); + GPR_ASSERT(val_ptr != NULL); + GPR_ASSERT(*val_ptr == 'c'); + census_ht_destroy(ht); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_create_table (); - test_simple_add_and_erase (); - test_table_with_int_key (); - test_table_with_string_key (); - test_value_and_key_deleter (); - test_insertion_with_same_key (); - test_insertion_and_deletion_with_high_collision_rate (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_create_table(); + test_simple_add_and_erase(); + test_table_with_int_key(); + test_table_with_string_key(); + test_value_and_key_deleter(); + test_insertion_with_same_key(); + test_insertion_and_deletion_with_high_collision_rate(); return 0; } diff --git a/test/core/statistics/multiple_writers_circular_buffer_test.c b/test/core/statistics/multiple_writers_circular_buffer_test.c index c42c8633da6..56ada893efd 100644 --- a/test/core/statistics/multiple_writers_circular_buffer_test.c +++ b/test/core/statistics/multiple_writers_circular_buffer_test.c @@ -38,11 +38,9 @@ #include #include "test/core/util/test_config.h" -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - srand (gpr_now (GPR_CLOCK_REALTIME).tv_nsec); - test_multiple_writers_circular_log (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + srand(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); + test_multiple_writers_circular_log(); return 0; } diff --git a/test/core/statistics/multiple_writers_test.c b/test/core/statistics/multiple_writers_test.c index aed57a972b2..e524927da62 100644 --- a/test/core/statistics/multiple_writers_test.c +++ b/test/core/statistics/multiple_writers_test.c @@ -38,11 +38,9 @@ #include #include "test/core/util/test_config.h" -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - srand (gpr_now (GPR_CLOCK_REALTIME).tv_nsec); - test_multiple_writers (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + srand(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); + test_multiple_writers(); return 0; } diff --git a/test/core/statistics/performance_test.c b/test/core/statistics/performance_test.c index 44f4a30cfba..3f0e0800933 100644 --- a/test/core/statistics/performance_test.c +++ b/test/core/statistics/performance_test.c @@ -38,11 +38,9 @@ #include #include "test/core/util/test_config.h" -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - srand (gpr_now (GPR_CLOCK_REALTIME).tv_nsec); - test_performance (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + srand(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); + test_performance(); return 0; } diff --git a/test/core/statistics/quick_test.c b/test/core/statistics/quick_test.c index 91b484fd312..c72ae77b98e 100644 --- a/test/core/statistics/quick_test.c +++ b/test/core/statistics/quick_test.c @@ -38,19 +38,17 @@ #include #include "test/core/util/test_config.h" -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - srand (gpr_now (GPR_CLOCK_REALTIME).tv_nsec); - test_invalid_record_size (); - test_end_write_with_different_size (); - test_read_pending_record (); - test_read_beyond_pending_record (); - test_detached_while_reading (); - test_fill_log_no_fragmentation (); - test_fill_circular_log_no_fragmentation (); - test_fill_log_with_straddling_records (); - test_fill_circular_log_with_straddling_records (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + srand(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); + test_invalid_record_size(); + test_end_write_with_different_size(); + test_read_pending_record(); + test_read_beyond_pending_record(); + test_detached_while_reading(); + test_fill_log_no_fragmentation(); + test_fill_circular_log_no_fragmentation(); + test_fill_log_with_straddling_records(); + test_fill_circular_log_with_straddling_records(); return 0; } diff --git a/test/core/statistics/rpc_stats_test.c b/test/core/statistics/rpc_stats_test.c index 134c478d818..b1d8814cfa6 100644 --- a/test/core/statistics/rpc_stats_test.c +++ b/test/core/statistics/rpc_stats_test.c @@ -45,153 +45,154 @@ #include "test/core/util/test_config.h" /* Ensure all possible state transitions are called without causing problem */ -static void -test_init_shutdown (void) -{ - census_stats_store_init (); - census_stats_store_init (); - census_stats_store_shutdown (); - census_stats_store_shutdown (); - census_stats_store_init (); +static void test_init_shutdown(void) { + census_stats_store_init(); + census_stats_store_init(); + census_stats_store_shutdown(); + census_stats_store_shutdown(); + census_stats_store_init(); } -static void -test_create_and_destroy (void) -{ +static void test_create_and_destroy(void) { census_rpc_stats *stats = NULL; - census_aggregated_rpc_stats agg_stats = { 0, NULL }; + census_aggregated_rpc_stats agg_stats = {0, NULL}; - stats = census_rpc_stats_create_empty (); - GPR_ASSERT (stats != NULL); - GPR_ASSERT (stats->cnt == 0 && stats->rpc_error_cnt == 0 && stats->app_error_cnt == 0 && stats->elapsed_time_ms == 0.0 && stats->api_request_bytes == 0 && stats->wire_request_bytes == 0 && stats->api_response_bytes == 0 && stats->wire_response_bytes == 0); - gpr_free (stats); + stats = census_rpc_stats_create_empty(); + GPR_ASSERT(stats != NULL); + GPR_ASSERT(stats->cnt == 0 && stats->rpc_error_cnt == 0 && + stats->app_error_cnt == 0 && stats->elapsed_time_ms == 0.0 && + stats->api_request_bytes == 0 && stats->wire_request_bytes == 0 && + stats->api_response_bytes == 0 && stats->wire_response_bytes == 0); + gpr_free(stats); - census_aggregated_rpc_stats_set_empty (&agg_stats); - GPR_ASSERT (agg_stats.num_entries == 0); - GPR_ASSERT (agg_stats.stats == NULL); + census_aggregated_rpc_stats_set_empty(&agg_stats); + GPR_ASSERT(agg_stats.num_entries == 0); + GPR_ASSERT(agg_stats.stats == NULL); agg_stats.num_entries = 1; - agg_stats.stats = (census_per_method_rpc_stats *) gpr_malloc (sizeof (census_per_method_rpc_stats)); - agg_stats.stats[0].method = gpr_strdup ("foo"); - census_aggregated_rpc_stats_set_empty (&agg_stats); - GPR_ASSERT (agg_stats.num_entries == 0); - GPR_ASSERT (agg_stats.stats == NULL); + agg_stats.stats = (census_per_method_rpc_stats *)gpr_malloc( + sizeof(census_per_method_rpc_stats)); + agg_stats.stats[0].method = gpr_strdup("foo"); + census_aggregated_rpc_stats_set_empty(&agg_stats); + GPR_ASSERT(agg_stats.num_entries == 0); + GPR_ASSERT(agg_stats.stats == NULL); } #define ASSERT_NEAR(a, b) \ GPR_ASSERT((a - b) * (a - b) < 1e-24 * (a + b) * (a + b)) -static void -test_record_and_get_stats (void) -{ - census_rpc_stats stats = { 1, 2, 3, 4, 5.1, 6.2, 7.3, 8.4 }; +static void test_record_and_get_stats(void) { + census_rpc_stats stats = {1, 2, 3, 4, 5.1, 6.2, 7.3, 8.4}; census_op_id id; - census_aggregated_rpc_stats agg_stats = { 0, NULL }; + census_aggregated_rpc_stats agg_stats = {0, NULL}; /* Record client stats twice with the same op_id. */ - census_init (); - id = census_tracing_start_op (); - census_add_method_tag (id, "m1"); - census_record_rpc_client_stats (id, &stats); - census_record_rpc_client_stats (id, &stats); - census_tracing_end_op (id); + census_init(); + id = census_tracing_start_op(); + census_add_method_tag(id, "m1"); + census_record_rpc_client_stats(id, &stats); + census_record_rpc_client_stats(id, &stats); + census_tracing_end_op(id); /* Server stats expect to be empty */ - census_get_server_stats (&agg_stats); - GPR_ASSERT (agg_stats.num_entries == 0); - GPR_ASSERT (agg_stats.stats == NULL); + census_get_server_stats(&agg_stats); + GPR_ASSERT(agg_stats.num_entries == 0); + GPR_ASSERT(agg_stats.stats == NULL); /* Client stats expect to have one entry */ - census_get_client_stats (&agg_stats); - GPR_ASSERT (agg_stats.num_entries == 1); - GPR_ASSERT (agg_stats.stats != NULL); - GPR_ASSERT (strcmp (agg_stats.stats[0].method, "m1") == 0); - GPR_ASSERT (agg_stats.stats[0].minute_stats.cnt == 2 && agg_stats.stats[0].hour_stats.cnt == 2 && agg_stats.stats[0].total_stats.cnt == 2); - ASSERT_NEAR (agg_stats.stats[0].minute_stats.wire_response_bytes, 16.8); - ASSERT_NEAR (agg_stats.stats[0].hour_stats.wire_response_bytes, 16.8); - ASSERT_NEAR (agg_stats.stats[0].total_stats.wire_response_bytes, 16.8); + census_get_client_stats(&agg_stats); + GPR_ASSERT(agg_stats.num_entries == 1); + GPR_ASSERT(agg_stats.stats != NULL); + GPR_ASSERT(strcmp(agg_stats.stats[0].method, "m1") == 0); + GPR_ASSERT(agg_stats.stats[0].minute_stats.cnt == 2 && + agg_stats.stats[0].hour_stats.cnt == 2 && + agg_stats.stats[0].total_stats.cnt == 2); + ASSERT_NEAR(agg_stats.stats[0].minute_stats.wire_response_bytes, 16.8); + ASSERT_NEAR(agg_stats.stats[0].hour_stats.wire_response_bytes, 16.8); + ASSERT_NEAR(agg_stats.stats[0].total_stats.wire_response_bytes, 16.8); /* Get stats again, results should be the same. */ - census_get_client_stats (&agg_stats); - GPR_ASSERT (agg_stats.num_entries == 1); - census_aggregated_rpc_stats_set_empty (&agg_stats); - census_shutdown (); + census_get_client_stats(&agg_stats); + GPR_ASSERT(agg_stats.num_entries == 1); + census_aggregated_rpc_stats_set_empty(&agg_stats); + census_shutdown(); - /* Record both server (once) and client (twice) stats with different op_ids. */ - census_init (); - id = census_tracing_start_op (); - census_add_method_tag (id, "m2"); - census_record_rpc_client_stats (id, &stats); - census_tracing_end_op (id); - id = census_tracing_start_op (); - census_add_method_tag (id, "m3"); - census_record_rpc_server_stats (id, &stats); - census_tracing_end_op (id); - id = census_tracing_start_op (); - census_add_method_tag (id, "m4"); - census_record_rpc_client_stats (id, &stats); - census_tracing_end_op (id); + /* Record both server (once) and client (twice) stats with different op_ids. + */ + census_init(); + id = census_tracing_start_op(); + census_add_method_tag(id, "m2"); + census_record_rpc_client_stats(id, &stats); + census_tracing_end_op(id); + id = census_tracing_start_op(); + census_add_method_tag(id, "m3"); + census_record_rpc_server_stats(id, &stats); + census_tracing_end_op(id); + id = census_tracing_start_op(); + census_add_method_tag(id, "m4"); + census_record_rpc_client_stats(id, &stats); + census_tracing_end_op(id); /* Check server stats */ - census_get_server_stats (&agg_stats); - GPR_ASSERT (agg_stats.num_entries == 1); - GPR_ASSERT (strcmp (agg_stats.stats[0].method, "m3") == 0); - GPR_ASSERT (agg_stats.stats[0].minute_stats.app_error_cnt == 3 && agg_stats.stats[0].hour_stats.app_error_cnt == 3 && agg_stats.stats[0].total_stats.app_error_cnt == 3); - census_aggregated_rpc_stats_set_empty (&agg_stats); + census_get_server_stats(&agg_stats); + GPR_ASSERT(agg_stats.num_entries == 1); + GPR_ASSERT(strcmp(agg_stats.stats[0].method, "m3") == 0); + GPR_ASSERT(agg_stats.stats[0].minute_stats.app_error_cnt == 3 && + agg_stats.stats[0].hour_stats.app_error_cnt == 3 && + agg_stats.stats[0].total_stats.app_error_cnt == 3); + census_aggregated_rpc_stats_set_empty(&agg_stats); /* Check client stats */ - census_get_client_stats (&agg_stats); - GPR_ASSERT (agg_stats.num_entries == 2); - GPR_ASSERT (agg_stats.stats != NULL); - GPR_ASSERT ((strcmp (agg_stats.stats[0].method, "m2") == 0 && strcmp (agg_stats.stats[1].method, "m4") == 0) || (strcmp (agg_stats.stats[0].method, "m4") == 0 && strcmp (agg_stats.stats[1].method, "m2") == 0)); - GPR_ASSERT (agg_stats.stats[0].minute_stats.cnt == 1 && agg_stats.stats[1].minute_stats.cnt == 1); - census_aggregated_rpc_stats_set_empty (&agg_stats); - census_shutdown (); + census_get_client_stats(&agg_stats); + GPR_ASSERT(agg_stats.num_entries == 2); + GPR_ASSERT(agg_stats.stats != NULL); + GPR_ASSERT((strcmp(agg_stats.stats[0].method, "m2") == 0 && + strcmp(agg_stats.stats[1].method, "m4") == 0) || + (strcmp(agg_stats.stats[0].method, "m4") == 0 && + strcmp(agg_stats.stats[1].method, "m2") == 0)); + GPR_ASSERT(agg_stats.stats[0].minute_stats.cnt == 1 && + agg_stats.stats[1].minute_stats.cnt == 1); + census_aggregated_rpc_stats_set_empty(&agg_stats); + census_shutdown(); } -static void -test_record_stats_on_unknown_op_id (void) -{ - census_op_id unknown_id = { 0xDEAD, 0xBEEF }; - census_rpc_stats stats = { 1, 2, 3, 4, 5.1, 6.2, 7.3, 8.4 }; - census_aggregated_rpc_stats agg_stats = { 0, NULL }; +static void test_record_stats_on_unknown_op_id(void) { + census_op_id unknown_id = {0xDEAD, 0xBEEF}; + census_rpc_stats stats = {1, 2, 3, 4, 5.1, 6.2, 7.3, 8.4}; + census_aggregated_rpc_stats agg_stats = {0, NULL}; - census_init (); + census_init(); /* Tests that recording stats against unknown id is noop. */ - census_record_rpc_client_stats (unknown_id, &stats); - census_record_rpc_server_stats (unknown_id, &stats); - census_get_server_stats (&agg_stats); - GPR_ASSERT (agg_stats.num_entries == 0); - GPR_ASSERT (agg_stats.stats == NULL); - census_get_client_stats (&agg_stats); - GPR_ASSERT (agg_stats.num_entries == 0); - GPR_ASSERT (agg_stats.stats == NULL); - census_aggregated_rpc_stats_set_empty (&agg_stats); - census_shutdown (); + census_record_rpc_client_stats(unknown_id, &stats); + census_record_rpc_server_stats(unknown_id, &stats); + census_get_server_stats(&agg_stats); + GPR_ASSERT(agg_stats.num_entries == 0); + GPR_ASSERT(agg_stats.stats == NULL); + census_get_client_stats(&agg_stats); + GPR_ASSERT(agg_stats.num_entries == 0); + GPR_ASSERT(agg_stats.stats == NULL); + census_aggregated_rpc_stats_set_empty(&agg_stats); + census_shutdown(); } /* Test that record stats is noop when trace store is uninitialized. */ -static void -test_record_stats_with_trace_store_uninitialized (void) -{ - census_rpc_stats stats = { 1, 2, 3, 4, 5.1, 6.2, 7.3, 8.4 }; - census_op_id id = { 0, 0 }; - census_aggregated_rpc_stats agg_stats = { 0, NULL }; +static void test_record_stats_with_trace_store_uninitialized(void) { + census_rpc_stats stats = {1, 2, 3, 4, 5.1, 6.2, 7.3, 8.4}; + census_op_id id = {0, 0}; + census_aggregated_rpc_stats agg_stats = {0, NULL}; - census_init (); - id = census_tracing_start_op (); - census_add_method_tag (id, "m"); - census_tracing_end_op (id); + census_init(); + id = census_tracing_start_op(); + census_add_method_tag(id, "m"); + census_tracing_end_op(id); /* shuts down trace store only. */ - census_tracing_shutdown (); - census_record_rpc_client_stats (id, &stats); - census_get_client_stats (&agg_stats); - GPR_ASSERT (agg_stats.num_entries == 0); - census_stats_store_shutdown (); + census_tracing_shutdown(); + census_record_rpc_client_stats(id, &stats); + census_get_client_stats(&agg_stats); + GPR_ASSERT(agg_stats.num_entries == 0); + census_stats_store_shutdown(); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_init_shutdown (); - test_create_and_destroy (); - test_record_and_get_stats (); - test_record_stats_on_unknown_op_id (); - test_record_stats_with_trace_store_uninitialized (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_init_shutdown(); + test_create_and_destroy(); + test_record_and_get_stats(); + test_record_stats_on_unknown_op_id(); + test_record_stats_with_trace_store_uninitialized(); return 0; } diff --git a/test/core/statistics/small_log_test.c b/test/core/statistics/small_log_test.c index 4f1f80f2294..b26b95f639c 100644 --- a/test/core/statistics/small_log_test.c +++ b/test/core/statistics/small_log_test.c @@ -38,11 +38,9 @@ #include #include "test/core/util/test_config.h" -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - srand (gpr_now (GPR_CLOCK_REALTIME).tv_nsec); - test_small_log (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + srand(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); + test_small_log(); return 0; } diff --git a/test/core/statistics/trace_test.c b/test/core/statistics/trace_test.c index ac2e0d824d0..75904040ff7 100644 --- a/test/core/statistics/trace_test.c +++ b/test/core/statistics/trace_test.c @@ -47,237 +47,209 @@ #include "test/core/util/test_config.h" /* Ensure all possible state transitions are called without causing problem */ -static void -test_init_shutdown (void) -{ - census_tracing_init (); - census_tracing_init (); - census_tracing_shutdown (); - census_tracing_shutdown (); - census_tracing_init (); +static void test_init_shutdown(void) { + census_tracing_init(); + census_tracing_init(); + census_tracing_shutdown(); + census_tracing_shutdown(); + census_tracing_init(); } -static void -test_start_op_generates_locally_unique_ids (void) -{ +static void test_start_op_generates_locally_unique_ids(void) { /* Check that ids generated within window size of 1000 are unique. TODO(hongyu): Replace O(n^2) duplicate detection algorithm with O(nlogn) algorithm. Enhance the test to larger window size (>10^6) */ #define WINDOW_SIZE 1000 census_op_id ids[WINDOW_SIZE]; int i; - census_init (); - for (i = 0; i < WINDOW_SIZE; i++) - { - ids[i] = census_tracing_start_op (); - census_tracing_end_op (ids[i]); - } - for (i = 0; i < WINDOW_SIZE - 1; i++) - { - int j; - for (j = i + 1; j < WINDOW_SIZE; j++) - { - GPR_ASSERT (ids[i].upper != ids[j].upper || ids[i].lower != ids[j].lower); - } + census_init(); + for (i = 0; i < WINDOW_SIZE; i++) { + ids[i] = census_tracing_start_op(); + census_tracing_end_op(ids[i]); + } + for (i = 0; i < WINDOW_SIZE - 1; i++) { + int j; + for (j = i + 1; j < WINDOW_SIZE; j++) { + GPR_ASSERT(ids[i].upper != ids[j].upper || ids[i].lower != ids[j].lower); } + } #undef WINDOW_SIZE - census_shutdown (); + census_shutdown(); } -static void -test_get_trace_method_name (void) -{ +static void test_get_trace_method_name(void) { census_op_id id; const char write_name[] = "service/method"; - census_tracing_init (); - id = census_tracing_start_op (); - census_add_method_tag (id, write_name); - census_internal_lock_trace_store (); + census_tracing_init(); + id = census_tracing_start_op(); + census_add_method_tag(id, write_name); + census_internal_lock_trace_store(); { - const char *read_name = census_get_trace_method_name (census_get_trace_obj_locked (id)); - GPR_ASSERT (strcmp (read_name, write_name) == 0); + const char *read_name = + census_get_trace_method_name(census_get_trace_obj_locked(id)); + GPR_ASSERT(strcmp(read_name, write_name) == 0); } - census_internal_unlock_trace_store (); - census_tracing_shutdown (); + census_internal_unlock_trace_store(); + census_tracing_shutdown(); } -typedef struct thd_arg -{ +typedef struct thd_arg { int num_done; gpr_cv done; gpr_mu mu; } thd_arg; -static void -mimic_trace_op_sequences (void *arg) -{ +static void mimic_trace_op_sequences(void *arg) { census_op_id id; const char *method_name = "service_foo/method_bar"; int i = 0; const int num_iter = 200; - thd_arg *args = (thd_arg *) arg; - GPR_ASSERT (args != NULL); - gpr_log (GPR_INFO, "Start trace op sequence thread."); - for (i = 0; i < num_iter; i++) - { - id = census_tracing_start_op (); - census_add_method_tag (id, method_name); - /* pretend doing 1us work. */ - gpr_sleep_until (GRPC_TIMEOUT_MICROS_TO_DEADLINE (1)); - census_tracing_end_op (id); - } - gpr_log (GPR_INFO, "End trace op sequence thread."); - gpr_mu_lock (&args->mu); + thd_arg *args = (thd_arg *)arg; + GPR_ASSERT(args != NULL); + gpr_log(GPR_INFO, "Start trace op sequence thread."); + for (i = 0; i < num_iter; i++) { + id = census_tracing_start_op(); + census_add_method_tag(id, method_name); + /* pretend doing 1us work. */ + gpr_sleep_until(GRPC_TIMEOUT_MICROS_TO_DEADLINE(1)); + census_tracing_end_op(id); + } + gpr_log(GPR_INFO, "End trace op sequence thread."); + gpr_mu_lock(&args->mu); args->num_done += 1; - gpr_cv_broadcast (&args->done); - gpr_mu_unlock (&args->mu); + gpr_cv_broadcast(&args->done); + gpr_mu_unlock(&args->mu); } -static void -test_concurrency (void) -{ +static void test_concurrency(void) { #define NUM_THREADS 1000 gpr_thd_id tid[NUM_THREADS]; int i = 0; thd_arg arg; arg.num_done = 0; - gpr_mu_init (&arg.mu); - gpr_cv_init (&arg.done); - census_tracing_init (); - for (i = 0; i < NUM_THREADS; ++i) - { - gpr_thd_new (tid + i, mimic_trace_op_sequences, &arg, NULL); - } - gpr_mu_lock (&arg.mu); - while (arg.num_done < NUM_THREADS) - { - gpr_log (GPR_INFO, "num done %d", arg.num_done); - gpr_cv_wait (&arg.done, &arg.mu, gpr_inf_future (GPR_CLOCK_REALTIME)); - } - gpr_mu_unlock (&arg.mu); - census_tracing_shutdown (); + gpr_mu_init(&arg.mu); + gpr_cv_init(&arg.done); + census_tracing_init(); + for (i = 0; i < NUM_THREADS; ++i) { + gpr_thd_new(tid + i, mimic_trace_op_sequences, &arg, NULL); + } + gpr_mu_lock(&arg.mu); + while (arg.num_done < NUM_THREADS) { + gpr_log(GPR_INFO, "num done %d", arg.num_done); + gpr_cv_wait(&arg.done, &arg.mu, gpr_inf_future(GPR_CLOCK_REALTIME)); + } + gpr_mu_unlock(&arg.mu); + census_tracing_shutdown(); #undef NUM_THREADS } -static void -test_add_method_tag_to_unknown_op_id (void) -{ - census_op_id unknown_id = { 0xDEAD, 0xBEEF }; +static void test_add_method_tag_to_unknown_op_id(void) { + census_op_id unknown_id = {0xDEAD, 0xBEEF}; int ret = 0; - census_tracing_init (); - ret = census_add_method_tag (unknown_id, "foo"); - GPR_ASSERT (ret != 0); - census_tracing_shutdown (); + census_tracing_init(); + ret = census_add_method_tag(unknown_id, "foo"); + GPR_ASSERT(ret != 0); + census_tracing_shutdown(); } -static void -test_trace_print (void) -{ +static void test_trace_print(void) { census_op_id id; int i; - const char *annotation_txt[4] = { "abc", "", "$%^ *()_" }; + const char *annotation_txt[4] = {"abc", "", "$%^ *()_"}; char long_txt[CENSUS_MAX_ANNOTATION_LENGTH + 10]; - memset (long_txt, 'a', GPR_ARRAY_SIZE (long_txt)); + memset(long_txt, 'a', GPR_ARRAY_SIZE(long_txt)); long_txt[CENSUS_MAX_ANNOTATION_LENGTH + 9] = '\0'; annotation_txt[3] = long_txt; - census_tracing_init (); - id = census_tracing_start_op (); + census_tracing_init(); + id = census_tracing_start_op(); /* Adds large number of annotations to each trace */ - for (i = 0; i < 1000; i++) - { - census_tracing_print (id, annotation_txt[i % GPR_ARRAY_SIZE (annotation_txt)]); - } - census_tracing_end_op (id); + for (i = 0; i < 1000; i++) { + census_tracing_print(id, + annotation_txt[i % GPR_ARRAY_SIZE(annotation_txt)]); + } + census_tracing_end_op(id); - census_tracing_shutdown (); + census_tracing_shutdown(); } /* Returns 1 if two ids are equal, otherwise returns 0. */ -static int -ids_equal (census_op_id id1, census_op_id id2) -{ +static int ids_equal(census_op_id id1, census_op_id id2) { return (id1.upper == id2.upper) && (id1.lower == id2.lower); } -static void -test_get_active_ops (void) -{ +static void test_get_active_ops(void) { census_op_id id_1, id_2, id_3; census_trace_obj **active_ops; - const char *annotation_txt[] = { "annotation 1", "a2" }; + const char *annotation_txt[] = {"annotation 1", "a2"}; int i = 0; int n = 0; - gpr_log (GPR_INFO, "test_get_active_ops"); - census_tracing_init (); + gpr_log(GPR_INFO, "test_get_active_ops"); + census_tracing_init(); /* No active ops before calling start_op(). */ - active_ops = census_get_active_ops (&n); - GPR_ASSERT (active_ops == NULL); - GPR_ASSERT (n == 0); + active_ops = census_get_active_ops(&n); + GPR_ASSERT(active_ops == NULL); + GPR_ASSERT(n == 0); /* Starts one op */ - id_1 = census_tracing_start_op (); - census_add_method_tag (id_1, "foo_1"); - active_ops = census_get_active_ops (&n); - GPR_ASSERT (active_ops != NULL); - GPR_ASSERT (n == 1); - GPR_ASSERT (ids_equal (active_ops[0]->id, id_1)); - census_trace_obj_destroy (active_ops[0]); - gpr_free (active_ops); + id_1 = census_tracing_start_op(); + census_add_method_tag(id_1, "foo_1"); + active_ops = census_get_active_ops(&n); + GPR_ASSERT(active_ops != NULL); + GPR_ASSERT(n == 1); + GPR_ASSERT(ids_equal(active_ops[0]->id, id_1)); + census_trace_obj_destroy(active_ops[0]); + gpr_free(active_ops); active_ops = NULL; /* Start the second and the third ops */ - id_2 = census_tracing_start_op (); - census_add_method_tag (id_2, "foo_2"); - id_3 = census_tracing_start_op (); - census_add_method_tag (id_3, "foo_3"); - - active_ops = census_get_active_ops (&n); - GPR_ASSERT (n == 3); - for (i = 0; i < 3; i++) - { - census_trace_obj_destroy (active_ops[i]); - } - gpr_free (active_ops); + id_2 = census_tracing_start_op(); + census_add_method_tag(id_2, "foo_2"); + id_3 = census_tracing_start_op(); + census_add_method_tag(id_3, "foo_3"); + + active_ops = census_get_active_ops(&n); + GPR_ASSERT(n == 3); + for (i = 0; i < 3; i++) { + census_trace_obj_destroy(active_ops[i]); + } + gpr_free(active_ops); active_ops = NULL; /* End the second op and add annotations to the third ops */ - census_tracing_end_op (id_2); - census_tracing_print (id_3, annotation_txt[0]); - census_tracing_print (id_3, annotation_txt[1]); - - active_ops = census_get_active_ops (&n); - GPR_ASSERT (active_ops != NULL); - GPR_ASSERT (n == 2); - for (i = 0; i < 2; i++) - { - census_trace_obj_destroy (active_ops[i]); - } - gpr_free (active_ops); + census_tracing_end_op(id_2); + census_tracing_print(id_3, annotation_txt[0]); + census_tracing_print(id_3, annotation_txt[1]); + + active_ops = census_get_active_ops(&n); + GPR_ASSERT(active_ops != NULL); + GPR_ASSERT(n == 2); + for (i = 0; i < 2; i++) { + census_trace_obj_destroy(active_ops[i]); + } + gpr_free(active_ops); active_ops = NULL; /* End all ops. */ - census_tracing_end_op (id_1); - census_tracing_end_op (id_3); - active_ops = census_get_active_ops (&n); - GPR_ASSERT (active_ops == NULL); - GPR_ASSERT (n == 0); + census_tracing_end_op(id_1); + census_tracing_end_op(id_3); + active_ops = census_get_active_ops(&n); + GPR_ASSERT(active_ops == NULL); + GPR_ASSERT(n == 0); - census_tracing_shutdown (); + census_tracing_shutdown(); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_init_shutdown (); - test_start_op_generates_locally_unique_ids (); - test_get_trace_method_name (); - test_concurrency (); - test_add_method_tag_to_unknown_op_id (); - test_trace_print (); - test_get_active_ops (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_init_shutdown(); + test_start_op_generates_locally_unique_ids(); + test_get_trace_method_name(); + test_concurrency(); + test_add_method_tag_to_unknown_op_id(); + test_trace_print(); + test_get_active_ops(); return 0; } diff --git a/test/core/statistics/window_stats_test.c b/test/core/statistics/window_stats_test.c index 54999d02be3..578138fdd29 100644 --- a/test/core/statistics/window_stats_test.c +++ b/test/core/statistics/window_stats_test.c @@ -37,162 +37,171 @@ #include #include "test/core/util/test_config.h" -typedef struct test_stat -{ +typedef struct test_stat { double value1; int value2; } test_stat; -void -add_test_stat (void *base, const void *addme) -{ - test_stat *b = (test_stat *) base; - const test_stat *a = (const test_stat *) addme; +void add_test_stat(void *base, const void *addme) { + test_stat *b = (test_stat *)base; + const test_stat *a = (const test_stat *)addme; b->value1 += a->value1; b->value2 += a->value2; } -void -add_proportion_test_stat (double p, void *base, const void *addme) -{ - test_stat *b = (test_stat *) base; - const test_stat *a = (const test_stat *) addme; +void add_proportion_test_stat(double p, void *base, const void *addme) { + test_stat *b = (test_stat *)base; + const test_stat *a = (const test_stat *)addme; b->value1 += p * a->value1; - b->value2 += p * a->value2 + 0.5; /* +0.5 is poor mans (no c99) round() */ + b->value2 += p * a->value2 + 0.5; /* +0.5 is poor mans (no c99) round() */ } const struct census_window_stats_stat_info kMyStatInfo = { - sizeof (test_stat), NULL, add_test_stat, add_proportion_test_stat -}; + sizeof(test_stat), NULL, add_test_stat, add_proportion_test_stat}; -const gpr_timespec kMilliSecInterval = { 0, 1000000 }; -const gpr_timespec kSecInterval = { 1, 0 }; -const gpr_timespec kMinInterval = { 60, 0 }; -const gpr_timespec kHourInterval = { 3600, 0 }; -const gpr_timespec kPrimeInterval = { 0, 101 }; +const gpr_timespec kMilliSecInterval = {0, 1000000}; +const gpr_timespec kSecInterval = {1, 0}; +const gpr_timespec kMinInterval = {60, 0}; +const gpr_timespec kHourInterval = {3600, 0}; +const gpr_timespec kPrimeInterval = {0, 101}; -static int -compare_double (double a, double b, double epsilon) -{ - if (a >= b) - { - return (a > b + epsilon) ? 1 : 0; - } - else - { - return (b > a + epsilon) ? -1 : 0; - } +static int compare_double(double a, double b, double epsilon) { + if (a >= b) { + return (a > b + epsilon) ? 1 : 0; + } else { + return (b > a + epsilon) ? -1 : 0; + } } -void -empty_test (void) -{ +void empty_test(void) { census_window_stats_sums result; - const gpr_timespec zero = { 0, 0 }; + const gpr_timespec zero = {0, 0}; test_stat sum; - struct census_window_stats *stats = census_window_stats_create (1, &kMinInterval, 5, &kMyStatInfo); - GPR_ASSERT (stats != NULL); + struct census_window_stats *stats = + census_window_stats_create(1, &kMinInterval, 5, &kMyStatInfo); + GPR_ASSERT(stats != NULL); result.statistic = ∑ - census_window_stats_get_sums (stats, zero, &result); - GPR_ASSERT (result.count == 0 && sum.value1 == 0 && sum.value2 == 0); - census_window_stats_get_sums (stats, gpr_now (GPR_CLOCK_REALTIME), &result); - GPR_ASSERT (result.count == 0 && sum.value1 == 0 && sum.value2 == 0); - census_window_stats_destroy (stats); + census_window_stats_get_sums(stats, zero, &result); + GPR_ASSERT(result.count == 0 && sum.value1 == 0 && sum.value2 == 0); + census_window_stats_get_sums(stats, gpr_now(GPR_CLOCK_REALTIME), &result); + GPR_ASSERT(result.count == 0 && sum.value1 == 0 && sum.value2 == 0); + census_window_stats_destroy(stats); } -void -one_interval_test (void) -{ - const test_stat value = { 0.1, 4 }; +void one_interval_test(void) { + const test_stat value = {0.1, 4}; const double epsilon = 1e10 - 11; - gpr_timespec when = { 0, 0 }; + gpr_timespec when = {0, 0}; census_window_stats_sums result; test_stat sum; /* granularity == 5 so width of internal windows should be 12s */ - struct census_window_stats *stats = census_window_stats_create (1, &kMinInterval, 5, &kMyStatInfo); - GPR_ASSERT (stats != NULL); + struct census_window_stats *stats = + census_window_stats_create(1, &kMinInterval, 5, &kMyStatInfo); + GPR_ASSERT(stats != NULL); /* phase 1: insert a single value at t=0s, and check that various measurement times result in expected output values */ - census_window_stats_add (stats, when, &value); + census_window_stats_add(stats, when, &value); result.statistic = ∑ /* when = 0s, values extracted should be everything */ - census_window_stats_get_sums (stats, when, &result); - GPR_ASSERT (compare_double (result.count, 1, epsilon) == 0 && compare_double (sum.value1, value.value1, epsilon) == 0 && sum.value2 == value.value2); + census_window_stats_get_sums(stats, when, &result); + GPR_ASSERT(compare_double(result.count, 1, epsilon) == 0 && + compare_double(sum.value1, value.value1, epsilon) == 0 && + sum.value2 == value.value2); /* when = 6,30,60s, should be all of the data */ when.tv_sec = 6; - census_window_stats_get_sums (stats, when, &result); - GPR_ASSERT (compare_double (result.count, 1.0, epsilon) == 0 && compare_double (sum.value1, value.value1, epsilon) == 0 && sum.value2 == value.value2); + census_window_stats_get_sums(stats, when, &result); + GPR_ASSERT(compare_double(result.count, 1.0, epsilon) == 0 && + compare_double(sum.value1, value.value1, epsilon) == 0 && + sum.value2 == value.value2); /* when == 30s,60s, should be all of the data */ when.tv_sec = 30; - census_window_stats_get_sums (stats, when, &result); - GPR_ASSERT (compare_double (result.count, 1.0, epsilon) == 0 && compare_double (sum.value1, value.value1, epsilon) == 0 && sum.value2 == value.value2); + census_window_stats_get_sums(stats, when, &result); + GPR_ASSERT(compare_double(result.count, 1.0, epsilon) == 0 && + compare_double(sum.value1, value.value1, epsilon) == 0 && + sum.value2 == value.value2); when.tv_sec = 60; - census_window_stats_get_sums (stats, when, &result); - GPR_ASSERT (compare_double (result.count, 1.0, epsilon) == 0 && compare_double (sum.value1, value.value1, epsilon) == 0 && sum.value2 == value.value2); + census_window_stats_get_sums(stats, when, &result); + GPR_ASSERT(compare_double(result.count, 1.0, epsilon) == 0 && + compare_double(sum.value1, value.value1, epsilon) == 0 && + sum.value2 == value.value2); /* when = 66s, should be half (only take half of bottom bucket) */ when.tv_sec = 66; - census_window_stats_get_sums (stats, when, &result); - GPR_ASSERT (compare_double (result.count, 0.5, epsilon) == 0 && compare_double (sum.value1, value.value1 / 2, epsilon) == 0 && sum.value2 == value.value2 / 2); + census_window_stats_get_sums(stats, when, &result); + GPR_ASSERT(compare_double(result.count, 0.5, epsilon) == 0 && + compare_double(sum.value1, value.value1 / 2, epsilon) == 0 && + sum.value2 == value.value2 / 2); /* when = 72s, should be completely out of window */ when.tv_sec = 72; - census_window_stats_get_sums (stats, when, &result); - GPR_ASSERT (compare_double (result.count, 0, epsilon) == 0 && compare_double (sum.value1, 0, epsilon) == 0 && sum.value2 == 0); + census_window_stats_get_sums(stats, when, &result); + GPR_ASSERT(compare_double(result.count, 0, epsilon) == 0 && + compare_double(sum.value1, 0, epsilon) == 0 && sum.value2 == 0); /* phase 2: tear down and do as before, but inserting two values */ - census_window_stats_destroy (stats); - stats = census_window_stats_create (1, &kMinInterval, 5, &kMyStatInfo); - GPR_ASSERT (stats != NULL); + census_window_stats_destroy(stats); + stats = census_window_stats_create(1, &kMinInterval, 5, &kMyStatInfo); + GPR_ASSERT(stats != NULL); when.tv_sec = 0; when.tv_nsec = 17; - census_window_stats_add (stats, when, &value); + census_window_stats_add(stats, when, &value); when.tv_sec = 1; - census_window_stats_add (stats, when, &value); + census_window_stats_add(stats, when, &value); when.tv_sec = 0; - census_window_stats_get_sums (stats, when, &result); - GPR_ASSERT (compare_double (result.count, 0, epsilon) == 0 && compare_double (sum.value1, 0, epsilon) == 0 && sum.value2 == 0); + census_window_stats_get_sums(stats, when, &result); + GPR_ASSERT(compare_double(result.count, 0, epsilon) == 0 && + compare_double(sum.value1, 0, epsilon) == 0 && sum.value2 == 0); /* time = 3s, 30s, should get all data */ when.tv_sec = 3; - census_window_stats_get_sums (stats, when, &result); - GPR_ASSERT (compare_double (result.count, 2, epsilon) == 0 && compare_double (sum.value1, 2 * value.value1, epsilon) == 0 && sum.value2 == 2 * value.value2); + census_window_stats_get_sums(stats, when, &result); + GPR_ASSERT(compare_double(result.count, 2, epsilon) == 0 && + compare_double(sum.value1, 2 * value.value1, epsilon) == 0 && + sum.value2 == 2 * value.value2); when.tv_sec = 30; - census_window_stats_get_sums (stats, when, &result); - GPR_ASSERT (compare_double (result.count, 2, epsilon) == 0 && compare_double (sum.value1, 2 * value.value1, epsilon) == 0 && sum.value2 == 2 * value.value2); + census_window_stats_get_sums(stats, when, &result); + GPR_ASSERT(compare_double(result.count, 2, epsilon) == 0 && + compare_double(sum.value1, 2 * value.value1, epsilon) == 0 && + sum.value2 == 2 * value.value2); /* phase 3: insert into "middle" bucket, and force a shift, pushing out the two values in bottom bucket */ when.tv_sec = 30; - census_window_stats_add (stats, when, &value); + census_window_stats_add(stats, when, &value); when.tv_sec = 76; - census_window_stats_add (stats, when, &value); + census_window_stats_add(stats, when, &value); when.tv_sec = 0; - census_window_stats_get_sums (stats, when, &result); - GPR_ASSERT (result.count == 0 && sum.value1 == 0 && sum.value2 == 0); + census_window_stats_get_sums(stats, when, &result); + GPR_ASSERT(result.count == 0 && sum.value1 == 0 && sum.value2 == 0); when.tv_sec = 30; - census_window_stats_get_sums (stats, when, &result); + census_window_stats_get_sums(stats, when, &result); /* half of the single value in the 30 second bucket */ - GPR_ASSERT (compare_double (result.count, 0.5, epsilon) == 0 && compare_double (sum.value1, value.value1 / 2, epsilon) == 0 && sum.value2 == value.value2 / 2); + GPR_ASSERT(compare_double(result.count, 0.5, epsilon) == 0 && + compare_double(sum.value1, value.value1 / 2, epsilon) == 0 && + sum.value2 == value.value2 / 2); when.tv_sec = 74; - census_window_stats_get_sums (stats, when, &result); + census_window_stats_get_sums(stats, when, &result); /* half of the 76 second bucket, all of the 30 second bucket */ - GPR_ASSERT (compare_double (result.count, 1.5, epsilon) == 0 && compare_double (sum.value1, value.value1 * 1.5, epsilon) == 0 && sum.value2 == value.value2 / 2 * 3); + GPR_ASSERT(compare_double(result.count, 1.5, epsilon) == 0 && + compare_double(sum.value1, value.value1 * 1.5, epsilon) == 0 && + sum.value2 == value.value2 / 2 * 3); when.tv_sec = 76; - census_window_stats_get_sums (stats, when, &result); + census_window_stats_get_sums(stats, when, &result); /* >=76s, get all of the 76 second bucket, all of the 30 second bucket */ - GPR_ASSERT (compare_double (result.count, 2, epsilon) == 0 && compare_double (sum.value1, value.value1 * 2, epsilon) == 0 && sum.value2 == value.value2 * 2); + GPR_ASSERT(compare_double(result.count, 2, epsilon) == 0 && + compare_double(sum.value1, value.value1 * 2, epsilon) == 0 && + sum.value2 == value.value2 * 2); when.tv_sec = 78; - census_window_stats_get_sums (stats, when, &result); + census_window_stats_get_sums(stats, when, &result); /* half of the 76 second bucket, all of the 30 second bucket */ - GPR_ASSERT (compare_double (result.count, 2, epsilon) == 0 && compare_double (sum.value1, value.value1 * 2, epsilon) == 0 && sum.value2 == value.value2 * 2); - census_window_stats_destroy (stats); + GPR_ASSERT(compare_double(result.count, 2, epsilon) == 0 && + compare_double(sum.value1, value.value1 * 2, epsilon) == 0 && + sum.value2 == value.value2 * 2); + census_window_stats_destroy(stats); } -void -many_interval_test (void) -{ +void many_interval_test(void) { gpr_timespec intervals[4]; - const test_stat value = { 123.45, 8 }; + const test_stat value = {123.45, 8}; const double epsilon = 1e10 - 11; - gpr_timespec when = { 3600, 0 }; /* one hour */ + gpr_timespec when = {3600, 0}; /* one hour */ census_window_stats_sums result[4]; test_stat sums[4]; int i; @@ -201,112 +210,109 @@ many_interval_test (void) intervals[1] = kSecInterval; intervals[2] = kMinInterval; intervals[3] = kHourInterval; - for (i = 0; i < 4; i++) - { - result[i].statistic = &sums[i]; - } - stats = census_window_stats_create (4, intervals, 100, &kMyStatInfo); - GPR_ASSERT (stats != NULL); + for (i = 0; i < 4; i++) { + result[i].statistic = &sums[i]; + } + stats = census_window_stats_create(4, intervals, 100, &kMyStatInfo); + GPR_ASSERT(stats != NULL); /* add 10 stats within half of each time range */ - for (i = 0; i < 10; i++) - { - when.tv_sec += 180; /* covers 30 min of one hour range */ - census_window_stats_add (stats, when, &value); - } + for (i = 0; i < 10; i++) { + when.tv_sec += 180; /* covers 30 min of one hour range */ + census_window_stats_add(stats, when, &value); + } when.tv_sec += 120; - for (i = 0; i < 10; i++) - { - when.tv_sec += 3; /* covers 30 sec of one minute range */ - census_window_stats_add (stats, when, &value); - } + for (i = 0; i < 10; i++) { + when.tv_sec += 3; /* covers 30 sec of one minute range */ + census_window_stats_add(stats, when, &value); + } when.tv_sec += 2; - for (i = 0; i < 10; i++) - { - when.tv_nsec += 50000000; /* covers 0.5s of 1s range */ - census_window_stats_add (stats, when, &value); - } + for (i = 0; i < 10; i++) { + when.tv_nsec += 50000000; /* covers 0.5s of 1s range */ + census_window_stats_add(stats, when, &value); + } when.tv_nsec += 2000000; - for (i = 0; i < 10; i++) - { - when.tv_nsec += 50000; /* covers 0.5 ms of 1 ms range */ - census_window_stats_add (stats, when, &value); - } + for (i = 0; i < 10; i++) { + when.tv_nsec += 50000; /* covers 0.5 ms of 1 ms range */ + census_window_stats_add(stats, when, &value); + } when.tv_nsec += 20000; - census_window_stats_get_sums (stats, when, result); - GPR_ASSERT (compare_double (result[0].count, 10, epsilon) == 0 && compare_double (sums[0].value1, value.value1 * 10, epsilon) == 0 && sums[0].value2 == value.value2 * 10); + census_window_stats_get_sums(stats, when, result); + GPR_ASSERT(compare_double(result[0].count, 10, epsilon) == 0 && + compare_double(sums[0].value1, value.value1 * 10, epsilon) == 0 && + sums[0].value2 == value.value2 * 10); when.tv_nsec += 20000000; - census_window_stats_get_sums (stats, when, result); - GPR_ASSERT (compare_double (result[1].count, 20, epsilon) == 0 && compare_double (sums[1].value1, value.value1 * 20, epsilon) == 0 && sums[1].value2 == value.value2 * 20); + census_window_stats_get_sums(stats, when, result); + GPR_ASSERT(compare_double(result[1].count, 20, epsilon) == 0 && + compare_double(sums[1].value1, value.value1 * 20, epsilon) == 0 && + sums[1].value2 == value.value2 * 20); when.tv_sec += 2; - census_window_stats_get_sums (stats, when, result); - GPR_ASSERT (compare_double (result[2].count, 30, epsilon) == 0 && compare_double (sums[2].value1, value.value1 * 30, epsilon) == 0 && sums[2].value2 == value.value2 * 30); + census_window_stats_get_sums(stats, when, result); + GPR_ASSERT(compare_double(result[2].count, 30, epsilon) == 0 && + compare_double(sums[2].value1, value.value1 * 30, epsilon) == 0 && + sums[2].value2 == value.value2 * 30); when.tv_sec += 72; - census_window_stats_get_sums (stats, when, result); - GPR_ASSERT (compare_double (result[3].count, 40, epsilon) == 0 && compare_double (sums[3].value1, value.value1 * 40, epsilon) == 0 && sums[3].value2 == value.value2 * 40); - census_window_stats_destroy (stats); + census_window_stats_get_sums(stats, when, result); + GPR_ASSERT(compare_double(result[3].count, 40, epsilon) == 0 && + compare_double(sums[3].value1, value.value1 * 40, epsilon) == 0 && + sums[3].value2 == value.value2 * 40); + census_window_stats_destroy(stats); } -void -rolling_time_test (void) -{ - const test_stat value = { 0.1, 4 }; - gpr_timespec when = { 0, 0 }; +void rolling_time_test(void) { + const test_stat value = {0.1, 4}; + gpr_timespec when = {0, 0}; census_window_stats_sums result; test_stat sum; int i; - gpr_timespec increment = { 0, 0 }; - struct census_window_stats *stats = census_window_stats_create (1, &kMinInterval, 7, &kMyStatInfo); - GPR_ASSERT (stats != NULL); - srand (gpr_now (GPR_CLOCK_REALTIME).tv_nsec); - for (i = 0; i < 100000; i++) - { - increment.tv_nsec = rand () % 100000000; /* up to 1/10th second */ - when = gpr_time_add (when, increment); - census_window_stats_add (stats, when, &value); - } + gpr_timespec increment = {0, 0}; + struct census_window_stats *stats = + census_window_stats_create(1, &kMinInterval, 7, &kMyStatInfo); + GPR_ASSERT(stats != NULL); + srand(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); + for (i = 0; i < 100000; i++) { + increment.tv_nsec = rand() % 100000000; /* up to 1/10th second */ + when = gpr_time_add(when, increment); + census_window_stats_add(stats, when, &value); + } result.statistic = ∑ - census_window_stats_get_sums (stats, when, &result); + census_window_stats_get_sums(stats, when, &result); /* With 1/20th second average between samples, we expect 20*60 = 1200 samples on average. Make sure we are within 100 of that. */ - GPR_ASSERT (compare_double (result.count, 1200, 100) == 0); - census_window_stats_destroy (stats); + GPR_ASSERT(compare_double(result.count, 1200, 100) == 0); + census_window_stats_destroy(stats); } #include -void -infinite_interval_test (void) -{ - const test_stat value = { 0.1, 4 }; - gpr_timespec when = { 0, 0 }; +void infinite_interval_test(void) { + const test_stat value = {0.1, 4}; + gpr_timespec when = {0, 0}; census_window_stats_sums result; test_stat sum; int i; const int count = 100000; - gpr_timespec increment = { 0, 0 }; - struct census_window_stats *stats = census_window_stats_create (1, &gpr_inf_future (GPR_CLOCK_REALTIME), 10, &kMyStatInfo); - srand (gpr_now (GPR_CLOCK_REALTIME).tv_nsec); - for (i = 0; i < count; i++) - { - increment.tv_sec = rand () % 21600; /* 6 hours */ - when = gpr_time_add (when, increment); - census_window_stats_add (stats, when, &value); - } + gpr_timespec increment = {0, 0}; + struct census_window_stats *stats = census_window_stats_create( + 1, &gpr_inf_future(GPR_CLOCK_REALTIME), 10, &kMyStatInfo); + srand(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); + for (i = 0; i < count; i++) { + increment.tv_sec = rand() % 21600; /* 6 hours */ + when = gpr_time_add(when, increment); + census_window_stats_add(stats, when, &value); + } result.statistic = ∑ - census_window_stats_get_sums (stats, when, &result); + census_window_stats_get_sums(stats, when, &result); /* The only thing it makes sense to compare for "infinite" periods is the total counts */ - GPR_ASSERT (result.count == count); - census_window_stats_destroy (stats); + GPR_ASSERT(result.count == count); + census_window_stats_destroy(stats); } -int -main (int argc, char *argv[]) -{ - grpc_test_init (argc, argv); - empty_test (); - one_interval_test (); - many_interval_test (); - rolling_time_test (); - infinite_interval_test (); +int main(int argc, char *argv[]) { + grpc_test_init(argc, argv); + empty_test(); + one_interval_test(); + many_interval_test(); + rolling_time_test(); + infinite_interval_test(); return 0; } diff --git a/test/core/support/cmdline_test.c b/test/core/support/cmdline_test.c index 5102beb5195..1c77c152334 100644 --- a/test/core/support/cmdline_test.c +++ b/test/core/support/cmdline_test.c @@ -42,270 +42,238 @@ #define LOG_TEST() gpr_log(GPR_INFO, "%s", __FILE__) -static void -test_simple_int (void) -{ +static void test_simple_int(void) { int x = 1; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "-foo", "3" }; + char *args[] = {(char *)__FILE__, "-foo", "3"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_int (cl, "foo", NULL, &x); - GPR_ASSERT (x == 1); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (x == 3); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_int(cl, "foo", NULL, &x); + GPR_ASSERT(x == 1); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(x == 3); + gpr_cmdline_destroy(cl); } -static void -test_eq_int (void) -{ +static void test_eq_int(void) { int x = 1; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "-foo=3" }; + char *args[] = {(char *)__FILE__, "-foo=3"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_int (cl, "foo", NULL, &x); - GPR_ASSERT (x == 1); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (x == 3); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_int(cl, "foo", NULL, &x); + GPR_ASSERT(x == 1); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(x == 3); + gpr_cmdline_destroy(cl); } -static void -test_2dash_int (void) -{ +static void test_2dash_int(void) { int x = 1; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "--foo", "3" }; + char *args[] = {(char *)__FILE__, "--foo", "3"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_int (cl, "foo", NULL, &x); - GPR_ASSERT (x == 1); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (x == 3); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_int(cl, "foo", NULL, &x); + GPR_ASSERT(x == 1); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(x == 3); + gpr_cmdline_destroy(cl); } -static void -test_2dash_eq_int (void) -{ +static void test_2dash_eq_int(void) { int x = 1; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "--foo=3" }; + char *args[] = {(char *)__FILE__, "--foo=3"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_int (cl, "foo", NULL, &x); - GPR_ASSERT (x == 1); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (x == 3); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_int(cl, "foo", NULL, &x); + GPR_ASSERT(x == 1); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(x == 3); + gpr_cmdline_destroy(cl); } -static void -test_simple_string (void) -{ +static void test_simple_string(void) { char *x = NULL; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "-foo", "3" }; + char *args[] = {(char *)__FILE__, "-foo", "3"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_string (cl, "foo", NULL, &x); - GPR_ASSERT (x == NULL); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (0 == strcmp (x, "3")); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_string(cl, "foo", NULL, &x); + GPR_ASSERT(x == NULL); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(0 == strcmp(x, "3")); + gpr_cmdline_destroy(cl); } -static void -test_eq_string (void) -{ +static void test_eq_string(void) { char *x = NULL; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "-foo=3" }; + char *args[] = {(char *)__FILE__, "-foo=3"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_string (cl, "foo", NULL, &x); - GPR_ASSERT (x == NULL); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (0 == strcmp (x, "3")); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_string(cl, "foo", NULL, &x); + GPR_ASSERT(x == NULL); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(0 == strcmp(x, "3")); + gpr_cmdline_destroy(cl); } -static void -test_2dash_string (void) -{ +static void test_2dash_string(void) { char *x = NULL; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "--foo", "3" }; + char *args[] = {(char *)__FILE__, "--foo", "3"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_string (cl, "foo", NULL, &x); - GPR_ASSERT (x == NULL); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (0 == strcmp (x, "3")); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_string(cl, "foo", NULL, &x); + GPR_ASSERT(x == NULL); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(0 == strcmp(x, "3")); + gpr_cmdline_destroy(cl); } -static void -test_2dash_eq_string (void) -{ +static void test_2dash_eq_string(void) { char *x = NULL; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "--foo=3" }; + char *args[] = {(char *)__FILE__, "--foo=3"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_string (cl, "foo", NULL, &x); - GPR_ASSERT (x == NULL); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (0 == strcmp (x, "3")); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_string(cl, "foo", NULL, &x); + GPR_ASSERT(x == NULL); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(0 == strcmp(x, "3")); + gpr_cmdline_destroy(cl); } -static void -test_flag_on (void) -{ +static void test_flag_on(void) { int x = 2; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "--foo" }; + char *args[] = {(char *)__FILE__, "--foo"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_flag (cl, "foo", NULL, &x); - GPR_ASSERT (x == 2); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (x == 1); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_flag(cl, "foo", NULL, &x); + GPR_ASSERT(x == 2); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(x == 1); + gpr_cmdline_destroy(cl); } -static void -test_flag_no (void) -{ +static void test_flag_no(void) { int x = 2; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "--no-foo" }; + char *args[] = {(char *)__FILE__, "--no-foo"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_flag (cl, "foo", NULL, &x); - GPR_ASSERT (x == 2); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (x == 0); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_flag(cl, "foo", NULL, &x); + GPR_ASSERT(x == 2); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(x == 0); + gpr_cmdline_destroy(cl); } -static void -test_flag_val_1 (void) -{ +static void test_flag_val_1(void) { int x = 2; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "--foo=1" }; + char *args[] = {(char *)__FILE__, "--foo=1"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_flag (cl, "foo", NULL, &x); - GPR_ASSERT (x == 2); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (x == 1); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_flag(cl, "foo", NULL, &x); + GPR_ASSERT(x == 2); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(x == 1); + gpr_cmdline_destroy(cl); } -static void -test_flag_val_0 (void) -{ +static void test_flag_val_0(void) { int x = 2; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "--foo=0" }; + char *args[] = {(char *)__FILE__, "--foo=0"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_flag (cl, "foo", NULL, &x); - GPR_ASSERT (x == 2); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (x == 0); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_flag(cl, "foo", NULL, &x); + GPR_ASSERT(x == 2); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(x == 0); + gpr_cmdline_destroy(cl); } -static void -test_flag_val_true (void) -{ +static void test_flag_val_true(void) { int x = 2; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "--foo=true" }; + char *args[] = {(char *)__FILE__, "--foo=true"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_flag (cl, "foo", NULL, &x); - GPR_ASSERT (x == 2); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (x == 1); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_flag(cl, "foo", NULL, &x); + GPR_ASSERT(x == 2); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(x == 1); + gpr_cmdline_destroy(cl); } -static void -test_flag_val_false (void) -{ +static void test_flag_val_false(void) { int x = 2; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "--foo=false" }; + char *args[] = {(char *)__FILE__, "--foo=false"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_flag (cl, "foo", NULL, &x); - GPR_ASSERT (x == 2); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (x == 0); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_flag(cl, "foo", NULL, &x); + GPR_ASSERT(x == 2); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(x == 0); + gpr_cmdline_destroy(cl); } -static void -test_many (void) -{ +static void test_many(void) { char *str = NULL; int x = 0; int flag = 2; gpr_cmdline *cl; - char *args[] = { (char *) __FILE__, "--str", "hello", "-x=4", "-no-flag" }; + char *args[] = {(char *)__FILE__, "--str", "hello", "-x=4", "-no-flag"}; - LOG_TEST (); + LOG_TEST(); - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_string (cl, "str", NULL, &str); - gpr_cmdline_add_int (cl, "x", NULL, &x); - gpr_cmdline_add_flag (cl, "flag", NULL, &flag); - gpr_cmdline_parse (cl, GPR_ARRAY_SIZE (args), args); - GPR_ASSERT (x == 4); - GPR_ASSERT (0 == strcmp (str, "hello")); - GPR_ASSERT (flag == 0); - gpr_cmdline_destroy (cl); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_string(cl, "str", NULL, &str); + gpr_cmdline_add_int(cl, "x", NULL, &x); + gpr_cmdline_add_flag(cl, "flag", NULL, &flag); + gpr_cmdline_parse(cl, GPR_ARRAY_SIZE(args), args); + GPR_ASSERT(x == 4); + GPR_ASSERT(0 == strcmp(str, "hello")); + GPR_ASSERT(flag == 0); + gpr_cmdline_destroy(cl); } -static void -test_usage (void) -{ +static void test_usage(void) { gpr_cmdline *cl; char *usage; @@ -313,37 +281,37 @@ test_usage (void) int x = 0; int flag = 2; - cl = gpr_cmdline_create (NULL); - gpr_cmdline_add_string (cl, "str", NULL, &str); - gpr_cmdline_add_int (cl, "x", NULL, &x); - gpr_cmdline_add_flag (cl, "flag", NULL, &flag); + cl = gpr_cmdline_create(NULL); + gpr_cmdline_add_string(cl, "str", NULL, &str); + gpr_cmdline_add_int(cl, "x", NULL, &x); + gpr_cmdline_add_flag(cl, "flag", NULL, &flag); - usage = gpr_cmdline_usage_string (cl, "test"); - GPR_ASSERT (0 == strcmp (usage, "Usage: test [--str=string] [--x=int] [--flag|--no-flag]\n")); - gpr_free (usage); + usage = gpr_cmdline_usage_string(cl, "test"); + GPR_ASSERT( + 0 == strcmp(usage, + "Usage: test [--str=string] [--x=int] [--flag|--no-flag]\n")); + gpr_free(usage); - gpr_cmdline_destroy (cl); + gpr_cmdline_destroy(cl); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_simple_int (); - test_eq_int (); - test_2dash_int (); - test_2dash_eq_int (); - test_simple_string (); - test_eq_string (); - test_2dash_string (); - test_2dash_eq_string (); - test_flag_on (); - test_flag_no (); - test_flag_val_1 (); - test_flag_val_0 (); - test_flag_val_true (); - test_flag_val_false (); - test_many (); - test_usage (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_simple_int(); + test_eq_int(); + test_2dash_int(); + test_2dash_eq_int(); + test_simple_string(); + test_eq_string(); + test_2dash_string(); + test_2dash_eq_string(); + test_flag_on(); + test_flag_no(); + test_flag_val_1(); + test_flag_val_0(); + test_flag_val_true(); + test_flag_val_false(); + test_many(); + test_usage(); return 0; } diff --git a/test/core/support/env_test.c b/test/core/support/env_test.c index f208253540d..69aebcc918c 100644 --- a/test/core/support/env_test.c +++ b/test/core/support/env_test.c @@ -43,26 +43,22 @@ #define LOG_TEST_NAME(x) gpr_log(GPR_INFO, "%s", x) -static void -test_setenv_getenv (void) -{ +static void test_setenv_getenv(void) { const char *name = "FOO"; const char *value = "BAR"; char *retrieved_value; - LOG_TEST_NAME ("test_setenv_getenv"); + LOG_TEST_NAME("test_setenv_getenv"); - gpr_setenv (name, value); - retrieved_value = gpr_getenv (name); - GPR_ASSERT (retrieved_value != NULL); - GPR_ASSERT (strcmp (value, retrieved_value) == 0); - gpr_free (retrieved_value); + gpr_setenv(name, value); + retrieved_value = gpr_getenv(name); + GPR_ASSERT(retrieved_value != NULL); + GPR_ASSERT(strcmp(value, retrieved_value) == 0); + gpr_free(retrieved_value); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_setenv_getenv (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_setenv_getenv(); return 0; } diff --git a/test/core/support/file_test.c b/test/core/support/file_test.c index 600448d778e..330b2173ef9 100644 --- a/test/core/support/file_test.c +++ b/test/core/support/file_test.c @@ -46,63 +46,57 @@ static const char prefix[] = "file_test"; -static void -test_load_empty_file (void) -{ +static void test_load_empty_file(void) { FILE *tmp = NULL; gpr_slice slice; gpr_slice slice_with_null_term; int success; char *tmp_name; - LOG_TEST_NAME ("test_load_empty_file"); + LOG_TEST_NAME("test_load_empty_file"); - tmp = gpr_tmpfile (prefix, &tmp_name); - GPR_ASSERT (tmp_name != NULL); - GPR_ASSERT (tmp != NULL); - fclose (tmp); + tmp = gpr_tmpfile(prefix, &tmp_name); + GPR_ASSERT(tmp_name != NULL); + GPR_ASSERT(tmp != NULL); + fclose(tmp); - slice = gpr_load_file (tmp_name, 0, &success); - GPR_ASSERT (success == 1); - GPR_ASSERT (GPR_SLICE_LENGTH (slice) == 0); + slice = gpr_load_file(tmp_name, 0, &success); + GPR_ASSERT(success == 1); + GPR_ASSERT(GPR_SLICE_LENGTH(slice) == 0); - slice_with_null_term = gpr_load_file (tmp_name, 1, &success); - GPR_ASSERT (success == 1); - GPR_ASSERT (GPR_SLICE_LENGTH (slice_with_null_term) == 1); - GPR_ASSERT (GPR_SLICE_START_PTR (slice_with_null_term)[0] == 0); + slice_with_null_term = gpr_load_file(tmp_name, 1, &success); + GPR_ASSERT(success == 1); + GPR_ASSERT(GPR_SLICE_LENGTH(slice_with_null_term) == 1); + GPR_ASSERT(GPR_SLICE_START_PTR(slice_with_null_term)[0] == 0); - remove (tmp_name); - gpr_free (tmp_name); - gpr_slice_unref (slice); - gpr_slice_unref (slice_with_null_term); + remove(tmp_name); + gpr_free(tmp_name); + gpr_slice_unref(slice); + gpr_slice_unref(slice_with_null_term); } -static void -test_load_failure (void) -{ +static void test_load_failure(void) { FILE *tmp = NULL; gpr_slice slice; int success; char *tmp_name; - LOG_TEST_NAME ("test_load_failure"); + LOG_TEST_NAME("test_load_failure"); - tmp = gpr_tmpfile (prefix, &tmp_name); - GPR_ASSERT (tmp_name != NULL); - GPR_ASSERT (tmp != NULL); - fclose (tmp); - remove (tmp_name); + tmp = gpr_tmpfile(prefix, &tmp_name); + GPR_ASSERT(tmp_name != NULL); + GPR_ASSERT(tmp != NULL); + fclose(tmp); + remove(tmp_name); - slice = gpr_load_file (tmp_name, 0, &success); - GPR_ASSERT (success == 0); - GPR_ASSERT (GPR_SLICE_LENGTH (slice) == 0); - gpr_free (tmp_name); - gpr_slice_unref (slice); + slice = gpr_load_file(tmp_name, 0, &success); + GPR_ASSERT(success == 0); + GPR_ASSERT(GPR_SLICE_LENGTH(slice) == 0); + gpr_free(tmp_name); + gpr_slice_unref(slice); } -static void -test_load_small_file (void) -{ +static void test_load_small_file(void) { FILE *tmp = NULL; gpr_slice slice; gpr_slice slice_with_null_term; @@ -110,33 +104,32 @@ test_load_small_file (void) char *tmp_name; const char *blah = "blah"; - LOG_TEST_NAME ("test_load_small_file"); - - tmp = gpr_tmpfile (prefix, &tmp_name); - GPR_ASSERT (tmp_name != NULL); - GPR_ASSERT (tmp != NULL); - GPR_ASSERT (fwrite (blah, 1, strlen (blah), tmp) == strlen (blah)); - fclose (tmp); - - slice = gpr_load_file (tmp_name, 0, &success); - GPR_ASSERT (success == 1); - GPR_ASSERT (GPR_SLICE_LENGTH (slice) == strlen (blah)); - GPR_ASSERT (!memcmp (GPR_SLICE_START_PTR (slice), blah, strlen (blah))); - - slice_with_null_term = gpr_load_file (tmp_name, 1, &success); - GPR_ASSERT (success == 1); - GPR_ASSERT (GPR_SLICE_LENGTH (slice_with_null_term) == (strlen (blah) + 1)); - GPR_ASSERT (strcmp ((const char *) GPR_SLICE_START_PTR (slice_with_null_term), blah) == 0); - - remove (tmp_name); - gpr_free (tmp_name); - gpr_slice_unref (slice); - gpr_slice_unref (slice_with_null_term); + LOG_TEST_NAME("test_load_small_file"); + + tmp = gpr_tmpfile(prefix, &tmp_name); + GPR_ASSERT(tmp_name != NULL); + GPR_ASSERT(tmp != NULL); + GPR_ASSERT(fwrite(blah, 1, strlen(blah), tmp) == strlen(blah)); + fclose(tmp); + + slice = gpr_load_file(tmp_name, 0, &success); + GPR_ASSERT(success == 1); + GPR_ASSERT(GPR_SLICE_LENGTH(slice) == strlen(blah)); + GPR_ASSERT(!memcmp(GPR_SLICE_START_PTR(slice), blah, strlen(blah))); + + slice_with_null_term = gpr_load_file(tmp_name, 1, &success); + GPR_ASSERT(success == 1); + GPR_ASSERT(GPR_SLICE_LENGTH(slice_with_null_term) == (strlen(blah) + 1)); + GPR_ASSERT(strcmp((const char *)GPR_SLICE_START_PTR(slice_with_null_term), + blah) == 0); + + remove(tmp_name); + gpr_free(tmp_name); + gpr_slice_unref(slice); + gpr_slice_unref(slice_with_null_term); } -static void -test_load_big_file (void) -{ +static void test_load_big_file(void) { FILE *tmp = NULL; gpr_slice slice; int success; @@ -145,40 +138,36 @@ test_load_big_file (void) unsigned char *current; size_t i; - LOG_TEST_NAME ("test_load_big_file"); - - for (i = 0; i < sizeof (buffer); i++) - { - buffer[i] = 42; - } - - tmp = gpr_tmpfile (prefix, &tmp_name); - GPR_ASSERT (tmp != NULL); - GPR_ASSERT (tmp_name != NULL); - GPR_ASSERT (fwrite (buffer, 1, sizeof (buffer), tmp) == sizeof (buffer)); - fclose (tmp); - - slice = gpr_load_file (tmp_name, 0, &success); - GPR_ASSERT (success == 1); - GPR_ASSERT (GPR_SLICE_LENGTH (slice) == sizeof (buffer)); - current = GPR_SLICE_START_PTR (slice); - for (i = 0; i < sizeof (buffer); i++) - { - GPR_ASSERT (current[i] == 42); - } - - remove (tmp_name); - gpr_free (tmp_name); - gpr_slice_unref (slice); + LOG_TEST_NAME("test_load_big_file"); + + for (i = 0; i < sizeof(buffer); i++) { + buffer[i] = 42; + } + + tmp = gpr_tmpfile(prefix, &tmp_name); + GPR_ASSERT(tmp != NULL); + GPR_ASSERT(tmp_name != NULL); + GPR_ASSERT(fwrite(buffer, 1, sizeof(buffer), tmp) == sizeof(buffer)); + fclose(tmp); + + slice = gpr_load_file(tmp_name, 0, &success); + GPR_ASSERT(success == 1); + GPR_ASSERT(GPR_SLICE_LENGTH(slice) == sizeof(buffer)); + current = GPR_SLICE_START_PTR(slice); + for (i = 0; i < sizeof(buffer); i++) { + GPR_ASSERT(current[i] == 42); + } + + remove(tmp_name); + gpr_free(tmp_name); + gpr_slice_unref(slice); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_load_empty_file (); - test_load_failure (); - test_load_small_file (); - test_load_big_file (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_load_empty_file(); + test_load_failure(); + test_load_small_file(); + test_load_big_file(); return 0; } diff --git a/test/core/support/histogram_test.c b/test/core/support/histogram_test.c index d13aeb651d9..be935ede093 100644 --- a/test/core/support/histogram_test.c +++ b/test/core/support/histogram_test.c @@ -36,155 +36,143 @@ #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x); -static void -test_no_op (void) -{ - gpr_histogram_destroy (gpr_histogram_create (0.01, 60e9)); +static void test_no_op(void) { + gpr_histogram_destroy(gpr_histogram_create(0.01, 60e9)); } -static void -expect_percentile (gpr_histogram * h, double percentile, double min_expect, double max_expect) -{ - double got = gpr_histogram_percentile (h, percentile); - gpr_log (GPR_INFO, "@%f%%, expect %f <= %f <= %f", percentile, min_expect, got, max_expect); - GPR_ASSERT (min_expect <= got); - GPR_ASSERT (got <= max_expect); +static void expect_percentile(gpr_histogram *h, double percentile, + double min_expect, double max_expect) { + double got = gpr_histogram_percentile(h, percentile); + gpr_log(GPR_INFO, "@%f%%, expect %f <= %f <= %f", percentile, min_expect, got, + max_expect); + GPR_ASSERT(min_expect <= got); + GPR_ASSERT(got <= max_expect); } -static void -test_simple (void) -{ +static void test_simple(void) { gpr_histogram *h; - LOG_TEST ("test_simple"); + LOG_TEST("test_simple"); - h = gpr_histogram_create (0.01, 60e9); - gpr_histogram_add (h, 10000); - gpr_histogram_add (h, 10000); - gpr_histogram_add (h, 11000); - gpr_histogram_add (h, 11000); + h = gpr_histogram_create(0.01, 60e9); + gpr_histogram_add(h, 10000); + gpr_histogram_add(h, 10000); + gpr_histogram_add(h, 11000); + gpr_histogram_add(h, 11000); - expect_percentile (h, 50, 10001, 10999); - GPR_ASSERT (gpr_histogram_mean (h) == 10500); + expect_percentile(h, 50, 10001, 10999); + GPR_ASSERT(gpr_histogram_mean(h) == 10500); - gpr_histogram_destroy (h); + gpr_histogram_destroy(h); } -static void -test_percentile (void) -{ +static void test_percentile(void) { gpr_histogram *h; double last; double i; double cur; - LOG_TEST ("test_percentile"); - - h = gpr_histogram_create (0.05, 1e9); - gpr_histogram_add (h, 2.5); - gpr_histogram_add (h, 2.5); - gpr_histogram_add (h, 8); - gpr_histogram_add (h, 4); - - GPR_ASSERT (gpr_histogram_count (h) == 4); - GPR_ASSERT (gpr_histogram_minimum (h) == 2.5); - GPR_ASSERT (gpr_histogram_maximum (h) == 8); - GPR_ASSERT (gpr_histogram_sum (h) == 17); - GPR_ASSERT (gpr_histogram_sum_of_squares (h) == 92.5); - GPR_ASSERT (gpr_histogram_mean (h) == 4.25); - GPR_ASSERT (gpr_histogram_variance (h) == 5.0625); - GPR_ASSERT (gpr_histogram_stddev (h) == 2.25); - - expect_percentile (h, -10, 2.5, 2.5); - expect_percentile (h, 0, 2.5, 2.5); - expect_percentile (h, 12.5, 2.5, 2.5); - expect_percentile (h, 25, 2.5, 2.5); - expect_percentile (h, 37.5, 2.5, 2.8); - expect_percentile (h, 50, 3.0, 3.5); - expect_percentile (h, 62.5, 3.5, 4.5); - expect_percentile (h, 75, 5, 7.9); - expect_percentile (h, 100, 8, 8); - expect_percentile (h, 110, 8, 8); + LOG_TEST("test_percentile"); + + h = gpr_histogram_create(0.05, 1e9); + gpr_histogram_add(h, 2.5); + gpr_histogram_add(h, 2.5); + gpr_histogram_add(h, 8); + gpr_histogram_add(h, 4); + + GPR_ASSERT(gpr_histogram_count(h) == 4); + GPR_ASSERT(gpr_histogram_minimum(h) == 2.5); + GPR_ASSERT(gpr_histogram_maximum(h) == 8); + GPR_ASSERT(gpr_histogram_sum(h) == 17); + GPR_ASSERT(gpr_histogram_sum_of_squares(h) == 92.5); + GPR_ASSERT(gpr_histogram_mean(h) == 4.25); + GPR_ASSERT(gpr_histogram_variance(h) == 5.0625); + GPR_ASSERT(gpr_histogram_stddev(h) == 2.25); + + expect_percentile(h, -10, 2.5, 2.5); + expect_percentile(h, 0, 2.5, 2.5); + expect_percentile(h, 12.5, 2.5, 2.5); + expect_percentile(h, 25, 2.5, 2.5); + expect_percentile(h, 37.5, 2.5, 2.8); + expect_percentile(h, 50, 3.0, 3.5); + expect_percentile(h, 62.5, 3.5, 4.5); + expect_percentile(h, 75, 5, 7.9); + expect_percentile(h, 100, 8, 8); + expect_percentile(h, 110, 8, 8); /* test monotonicity */ last = 0.0; - for (i = 0; i < 100.0; i += 0.01) - { - cur = gpr_histogram_percentile (h, i); - GPR_ASSERT (cur >= last); - last = cur; - } - - gpr_histogram_destroy (h); + for (i = 0; i < 100.0; i += 0.01) { + cur = gpr_histogram_percentile(h, i); + GPR_ASSERT(cur >= last); + last = cur; + } + + gpr_histogram_destroy(h); } -static void -test_merge (void) -{ +static void test_merge(void) { gpr_histogram *h1, *h2; double last; double i; double cur; - LOG_TEST ("test_merge"); - - h1 = gpr_histogram_create (0.05, 1e9); - gpr_histogram_add (h1, 2.5); - gpr_histogram_add (h1, 2.5); - gpr_histogram_add (h1, 8); - gpr_histogram_add (h1, 4); - - h2 = gpr_histogram_create (0.01, 1e9); - GPR_ASSERT (gpr_histogram_merge (h1, h2) == 0); - gpr_histogram_destroy (h2); - - h2 = gpr_histogram_create (0.05, 1e10); - GPR_ASSERT (gpr_histogram_merge (h1, h2) == 0); - gpr_histogram_destroy (h2); - - h2 = gpr_histogram_create (0.05, 1e9); - GPR_ASSERT (gpr_histogram_merge (h1, h2) == 1); - GPR_ASSERT (gpr_histogram_count (h1) == 4); - GPR_ASSERT (gpr_histogram_minimum (h1) == 2.5); - GPR_ASSERT (gpr_histogram_maximum (h1) == 8); - GPR_ASSERT (gpr_histogram_sum (h1) == 17); - GPR_ASSERT (gpr_histogram_sum_of_squares (h1) == 92.5); - GPR_ASSERT (gpr_histogram_mean (h1) == 4.25); - GPR_ASSERT (gpr_histogram_variance (h1) == 5.0625); - GPR_ASSERT (gpr_histogram_stddev (h1) == 2.25); - gpr_histogram_destroy (h2); - - h2 = gpr_histogram_create (0.05, 1e9); - gpr_histogram_add (h2, 7.0); - gpr_histogram_add (h2, 17.0); - gpr_histogram_add (h2, 1.0); - GPR_ASSERT (gpr_histogram_merge (h1, h2) == 1); - GPR_ASSERT (gpr_histogram_count (h1) == 7); - GPR_ASSERT (gpr_histogram_minimum (h1) == 1.0); - GPR_ASSERT (gpr_histogram_maximum (h1) == 17.0); - GPR_ASSERT (gpr_histogram_sum (h1) == 42.0); - GPR_ASSERT (gpr_histogram_sum_of_squares (h1) == 431.5); - GPR_ASSERT (gpr_histogram_mean (h1) == 6.0); + LOG_TEST("test_merge"); + + h1 = gpr_histogram_create(0.05, 1e9); + gpr_histogram_add(h1, 2.5); + gpr_histogram_add(h1, 2.5); + gpr_histogram_add(h1, 8); + gpr_histogram_add(h1, 4); + + h2 = gpr_histogram_create(0.01, 1e9); + GPR_ASSERT(gpr_histogram_merge(h1, h2) == 0); + gpr_histogram_destroy(h2); + + h2 = gpr_histogram_create(0.05, 1e10); + GPR_ASSERT(gpr_histogram_merge(h1, h2) == 0); + gpr_histogram_destroy(h2); + + h2 = gpr_histogram_create(0.05, 1e9); + GPR_ASSERT(gpr_histogram_merge(h1, h2) == 1); + GPR_ASSERT(gpr_histogram_count(h1) == 4); + GPR_ASSERT(gpr_histogram_minimum(h1) == 2.5); + GPR_ASSERT(gpr_histogram_maximum(h1) == 8); + GPR_ASSERT(gpr_histogram_sum(h1) == 17); + GPR_ASSERT(gpr_histogram_sum_of_squares(h1) == 92.5); + GPR_ASSERT(gpr_histogram_mean(h1) == 4.25); + GPR_ASSERT(gpr_histogram_variance(h1) == 5.0625); + GPR_ASSERT(gpr_histogram_stddev(h1) == 2.25); + gpr_histogram_destroy(h2); + + h2 = gpr_histogram_create(0.05, 1e9); + gpr_histogram_add(h2, 7.0); + gpr_histogram_add(h2, 17.0); + gpr_histogram_add(h2, 1.0); + GPR_ASSERT(gpr_histogram_merge(h1, h2) == 1); + GPR_ASSERT(gpr_histogram_count(h1) == 7); + GPR_ASSERT(gpr_histogram_minimum(h1) == 1.0); + GPR_ASSERT(gpr_histogram_maximum(h1) == 17.0); + GPR_ASSERT(gpr_histogram_sum(h1) == 42.0); + GPR_ASSERT(gpr_histogram_sum_of_squares(h1) == 431.5); + GPR_ASSERT(gpr_histogram_mean(h1) == 6.0); /* test monotonicity */ last = 0.0; - for (i = 0; i < 100.0; i += 0.01) - { - cur = gpr_histogram_percentile (h1, i); - GPR_ASSERT (cur >= last); - last = cur; - } - - gpr_histogram_destroy (h1); - gpr_histogram_destroy (h2); + for (i = 0; i < 100.0; i += 0.01) { + cur = gpr_histogram_percentile(h1, i); + GPR_ASSERT(cur >= last); + last = cur; + } + + gpr_histogram_destroy(h1); + gpr_histogram_destroy(h2); } -int -main (void) -{ - test_no_op (); - test_simple (); - test_percentile (); - test_merge (); +int main(void) { + test_no_op(); + test_simple(); + test_percentile(); + test_merge(); return 0; } diff --git a/test/core/support/host_port_test.c b/test/core/support/host_port_test.c index 71a774191b1..eccc39a2db1 100644 --- a/test/core/support/host_port_test.c +++ b/test/core/support/host_port_test.c @@ -38,43 +38,36 @@ #include #include "test/core/util/test_config.h" -static void -join_host_port_expect (const char *host, int port, const char *expected) -{ +static void join_host_port_expect(const char *host, int port, + const char *expected) { char *buf; int len; - len = gpr_join_host_port (&buf, host, port); - GPR_ASSERT (len >= 0); - GPR_ASSERT (strlen (expected) == (size_t) len); - GPR_ASSERT (strcmp (expected, buf) == 0); - gpr_free (buf); + len = gpr_join_host_port(&buf, host, port); + GPR_ASSERT(len >= 0); + GPR_ASSERT(strlen(expected) == (size_t)len); + GPR_ASSERT(strcmp(expected, buf) == 0); + gpr_free(buf); } -static void -test_join_host_port (void) -{ - join_host_port_expect ("foo", 101, "foo:101"); - join_host_port_expect ("", 102, ":102"); - join_host_port_expect ("1::2", 103, "[1::2]:103"); - join_host_port_expect ("[::1]", 104, "[::1]:104"); +static void test_join_host_port(void) { + join_host_port_expect("foo", 101, "foo:101"); + join_host_port_expect("", 102, ":102"); + join_host_port_expect("1::2", 103, "[1::2]:103"); + join_host_port_expect("[::1]", 104, "[::1]:104"); } /* Garbage in, garbage out. */ -static void -test_join_host_port_garbage (void) -{ - join_host_port_expect ("[foo]", 105, "[foo]:105"); - join_host_port_expect ("[::", 106, "[:::106"); - join_host_port_expect ("::]", 107, "[::]]:107"); +static void test_join_host_port_garbage(void) { + join_host_port_expect("[foo]", 105, "[foo]:105"); + join_host_port_expect("[::", 106, "[:::106"); + join_host_port_expect("::]", 107, "[::]]:107"); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); - test_join_host_port (); - test_join_host_port_garbage (); + test_join_host_port(); + test_join_host_port_garbage(); return 0; } diff --git a/test/core/support/log_test.c b/test/core/support/log_test.c index c30ce6958f1..b39b0699134 100644 --- a/test/core/support/log_test.c +++ b/test/core/support/log_test.c @@ -37,27 +37,23 @@ #include "test/core/util/test_config.h" -static void -test_callback (gpr_log_func_args * args) -{ - GPR_ASSERT (0 == strcmp (__FILE__, args->file)); - GPR_ASSERT (args->severity == GPR_LOG_SEVERITY_INFO); - GPR_ASSERT (0 == strcmp (args->message, "hello 1 2 3")); +static void test_callback(gpr_log_func_args *args) { + GPR_ASSERT(0 == strcmp(__FILE__, args->file)); + GPR_ASSERT(args->severity == GPR_LOG_SEVERITY_INFO); + GPR_ASSERT(0 == strcmp(args->message, "hello 1 2 3")); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); /* test logging at various verbosity levels */ - gpr_log (GPR_DEBUG, "%s", "hello world"); - gpr_log (GPR_INFO, "%s", "hello world"); - gpr_log (GPR_ERROR, "%s", "hello world"); + gpr_log(GPR_DEBUG, "%s", "hello world"); + gpr_log(GPR_INFO, "%s", "hello world"); + gpr_log(GPR_ERROR, "%s", "hello world"); /* should succeed */ - GPR_ASSERT (1); - gpr_set_log_function (test_callback); - gpr_log_message (GPR_INFO, "hello 1 2 3"); - gpr_log (GPR_INFO, "hello %d %d %d", 1, 2, 3); + GPR_ASSERT(1); + gpr_set_log_function(test_callback); + gpr_log_message(GPR_INFO, "hello 1 2 3"); + gpr_log(GPR_INFO, "hello %d %d %d", 1, 2, 3); /* TODO(ctiller): should we add a GPR_ASSERT failure test here */ return 0; } diff --git a/test/core/support/murmur_hash_test.c b/test/core/support/murmur_hash_test.c index 946a800c606..1762486776f 100644 --- a/test/core/support/murmur_hash_test.c +++ b/test/core/support/murmur_hash_test.c @@ -38,58 +38,51 @@ #include -typedef gpr_uint32 (*hash_func) (const void *key, size_t len, gpr_uint32 seed); +typedef gpr_uint32 (*hash_func)(const void *key, size_t len, gpr_uint32 seed); /* From smhasher: This should hopefully be a thorough and uambiguous test of whether a hash is correctly implemented on a given platform */ -static void -verification_test (hash_func hash, gpr_uint32 expected) -{ +static void verification_test(hash_func hash, gpr_uint32 expected) { gpr_uint8 key[256]; gpr_uint32 hashes[256]; gpr_uint32 final = 0; size_t i; - memset (key, 0, sizeof (key)); - memset (hashes, 0, sizeof (hashes)); + memset(key, 0, sizeof(key)); + memset(hashes, 0, sizeof(hashes)); /* Hash keys of the form {0}, {0,1}, {0,1,2}... up to N=255,using 256-N as the seed */ - for (i = 0; i < 256; i++) - { - key[i] = (gpr_uint8) i; - hashes[i] = hash (key, i, (gpr_uint32) (256u - i)); - } + for (i = 0; i < 256; i++) { + key[i] = (gpr_uint8)i; + hashes[i] = hash(key, i, (gpr_uint32)(256u - i)); + } /* Then hash the result array */ - final = hash (hashes, sizeof (hashes), 0); + final = hash(hashes, sizeof(hashes), 0); /* The first four bytes of that hash, interpreted as a little-endian integer, is our verification value */ - if (expected != final) - { - gpr_log (GPR_INFO, "Verification value 0x%08X : Failed! (Expected 0x%08x)", final, expected); - abort (); - } - else - { - gpr_log (GPR_INFO, "Verification value 0x%08X : Passed!", final); - } + if (expected != final) { + gpr_log(GPR_INFO, "Verification value 0x%08X : Failed! (Expected 0x%08x)", + final, expected); + abort(); + } else { + gpr_log(GPR_INFO, "Verification value 0x%08X : Passed!", final); + } } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); /* basic tests to verify that things don't crash */ - gpr_murmur_hash3 ("", 0, 0); - gpr_murmur_hash3 ("xyz", 3, 0); - verification_test (gpr_murmur_hash3, 0xB0F57EE3); + gpr_murmur_hash3("", 0, 0); + gpr_murmur_hash3("xyz", 3, 0); + verification_test(gpr_murmur_hash3, 0xB0F57EE3); return 0; } diff --git a/test/core/support/slice_buffer_test.c b/test/core/support/slice_buffer_test.c index 9254f709e39..a48278434f1 100644 --- a/test/core/support/slice_buffer_test.c +++ b/test/core/support/slice_buffer_test.c @@ -35,46 +35,41 @@ #include #include "test/core/util/test_config.h" -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { gpr_slice_buffer buf; - gpr_slice aaa = gpr_slice_from_copied_string ("aaa"); - gpr_slice bb = gpr_slice_from_copied_string ("bb"); + gpr_slice aaa = gpr_slice_from_copied_string("aaa"); + gpr_slice bb = gpr_slice_from_copied_string("bb"); size_t i; - grpc_test_init (argc, argv); - gpr_slice_buffer_init (&buf); - for (i = 0; i < 10; i++) - { - gpr_slice_ref (aaa); - gpr_slice_ref (bb); - gpr_slice_buffer_add (&buf, aaa); - gpr_slice_buffer_add (&buf, bb); - } - GPR_ASSERT (buf.count > 0); - GPR_ASSERT (buf.length == 50); - gpr_slice_buffer_reset_and_unref (&buf); - GPR_ASSERT (buf.count == 0); - GPR_ASSERT (buf.length == 0); - for (i = 0; i < 10; i++) - { - gpr_slice_ref (aaa); - gpr_slice_ref (bb); - gpr_slice_buffer_add (&buf, aaa); - gpr_slice_buffer_add (&buf, bb); - } - GPR_ASSERT (buf.count > 0); - GPR_ASSERT (buf.length == 50); - for (i = 0; i < 10; i++) - { - gpr_slice_buffer_pop (&buf); - gpr_slice_unref (aaa); - gpr_slice_unref (bb); - } - GPR_ASSERT (buf.count == 0); - GPR_ASSERT (buf.length == 0); - gpr_slice_buffer_destroy (&buf); + grpc_test_init(argc, argv); + gpr_slice_buffer_init(&buf); + for (i = 0; i < 10; i++) { + gpr_slice_ref(aaa); + gpr_slice_ref(bb); + gpr_slice_buffer_add(&buf, aaa); + gpr_slice_buffer_add(&buf, bb); + } + GPR_ASSERT(buf.count > 0); + GPR_ASSERT(buf.length == 50); + gpr_slice_buffer_reset_and_unref(&buf); + GPR_ASSERT(buf.count == 0); + GPR_ASSERT(buf.length == 0); + for (i = 0; i < 10; i++) { + gpr_slice_ref(aaa); + gpr_slice_ref(bb); + gpr_slice_buffer_add(&buf, aaa); + gpr_slice_buffer_add(&buf, bb); + } + GPR_ASSERT(buf.count > 0); + GPR_ASSERT(buf.length == 50); + for (i = 0; i < 10; i++) { + gpr_slice_buffer_pop(&buf); + gpr_slice_unref(aaa); + gpr_slice_unref(bb); + } + GPR_ASSERT(buf.count == 0); + GPR_ASSERT(buf.length == 0); + gpr_slice_buffer_destroy(&buf); return 0; } diff --git a/test/core/support/slice_test.c b/test/core/support/slice_test.c index e041532c8b2..1d202f06186 100644 --- a/test/core/support/slice_test.c +++ b/test/core/support/slice_test.c @@ -41,220 +41,188 @@ #define LOG_TEST_NAME(x) gpr_log(GPR_INFO, "%s", x); -static void -test_slice_malloc_returns_something_sensible (void) -{ +static void test_slice_malloc_returns_something_sensible(void) { /* Calls gpr_slice_create for various lengths and verifies the internals for consistency. */ size_t length; size_t i; gpr_slice slice; - LOG_TEST_NAME ("test_slice_malloc_returns_something_sensible"); - - for (length = 0; length <= 1024; length++) - { - slice = gpr_slice_malloc (length); - /* If there is a length, slice.data must be non-NULL. If length is zero - we don't care. */ - if (length) - { - GPR_ASSERT (GPR_SLICE_START_PTR (slice)); - } - /* Returned slice length must be what was requested. */ - GPR_ASSERT (GPR_SLICE_LENGTH (slice) == length); - /* If the slice has a refcount, it must be destroyable. */ - if (slice.refcount) - { - GPR_ASSERT (slice.refcount->ref != NULL); - GPR_ASSERT (slice.refcount->unref != NULL); - } - /* We must be able to write to every byte of the data */ - for (i = 0; i < length; i++) - { - GPR_SLICE_START_PTR (slice)[i] = (gpr_uint8) i; - } - /* And finally we must succeed in destroying the slice */ - gpr_slice_unref (slice); + LOG_TEST_NAME("test_slice_malloc_returns_something_sensible"); + + for (length = 0; length <= 1024; length++) { + slice = gpr_slice_malloc(length); + /* If there is a length, slice.data must be non-NULL. If length is zero + we don't care. */ + if (length) { + GPR_ASSERT(GPR_SLICE_START_PTR(slice)); + } + /* Returned slice length must be what was requested. */ + GPR_ASSERT(GPR_SLICE_LENGTH(slice) == length); + /* If the slice has a refcount, it must be destroyable. */ + if (slice.refcount) { + GPR_ASSERT(slice.refcount->ref != NULL); + GPR_ASSERT(slice.refcount->unref != NULL); + } + /* We must be able to write to every byte of the data */ + for (i = 0; i < length; i++) { + GPR_SLICE_START_PTR(slice)[i] = (gpr_uint8)i; } + /* And finally we must succeed in destroying the slice */ + gpr_slice_unref(slice); + } } -static void -do_nothing (void *ignored) -{ -} +static void do_nothing(void *ignored) {} -static void -test_slice_new_returns_something_sensible (void) -{ +static void test_slice_new_returns_something_sensible(void) { gpr_uint8 x; - gpr_slice slice = gpr_slice_new (&x, 1, do_nothing); - GPR_ASSERT (slice.refcount); - GPR_ASSERT (slice.data.refcounted.bytes == &x); - GPR_ASSERT (slice.data.refcounted.length == 1); - gpr_slice_unref (slice); + gpr_slice slice = gpr_slice_new(&x, 1, do_nothing); + GPR_ASSERT(slice.refcount); + GPR_ASSERT(slice.data.refcounted.bytes == &x); + GPR_ASSERT(slice.data.refcounted.length == 1); + gpr_slice_unref(slice); } static int do_nothing_with_len_1_calls = 0; -static void -do_nothing_with_len_1 (void *ignored, size_t len) -{ - GPR_ASSERT (len == 1); +static void do_nothing_with_len_1(void *ignored, size_t len) { + GPR_ASSERT(len == 1); do_nothing_with_len_1_calls++; } -static void -test_slice_new_with_len_returns_something_sensible (void) -{ +static void test_slice_new_with_len_returns_something_sensible(void) { gpr_uint8 x; - gpr_slice slice = gpr_slice_new_with_len (&x, 1, do_nothing_with_len_1); - GPR_ASSERT (slice.refcount); - GPR_ASSERT (slice.data.refcounted.bytes == &x); - GPR_ASSERT (slice.data.refcounted.length == 1); - GPR_ASSERT (do_nothing_with_len_1_calls == 0); - gpr_slice_unref (slice); - GPR_ASSERT (do_nothing_with_len_1_calls == 1); + gpr_slice slice = gpr_slice_new_with_len(&x, 1, do_nothing_with_len_1); + GPR_ASSERT(slice.refcount); + GPR_ASSERT(slice.data.refcounted.bytes == &x); + GPR_ASSERT(slice.data.refcounted.length == 1); + GPR_ASSERT(do_nothing_with_len_1_calls == 0); + gpr_slice_unref(slice); + GPR_ASSERT(do_nothing_with_len_1_calls == 1); } -static void -test_slice_sub_works (unsigned length) -{ +static void test_slice_sub_works(unsigned length) { gpr_slice slice; gpr_slice sub; unsigned i, j, k; - LOG_TEST_NAME ("test_slice_sub_works"); - gpr_log (GPR_INFO, "length=%d", length); + LOG_TEST_NAME("test_slice_sub_works"); + gpr_log(GPR_INFO, "length=%d", length); /* Create a slice in which each byte is equal to the distance from it to the beginning of the slice. */ - slice = gpr_slice_malloc (length); - for (i = 0; i < length; i++) - { - GPR_SLICE_START_PTR (slice)[i] = (gpr_uint8) i; - } + slice = gpr_slice_malloc(length); + for (i = 0; i < length; i++) { + GPR_SLICE_START_PTR(slice)[i] = (gpr_uint8)i; + } /* Ensure that for all subsets length is correct and that we start on the correct byte. Additionally check that no copies were made. */ - for (i = 0; i < length; i++) - { - for (j = i; j < length; j++) - { - sub = gpr_slice_sub (slice, i, j); - GPR_ASSERT (GPR_SLICE_LENGTH (sub) == j - i); - for (k = 0; k < j - i; k++) - { - GPR_ASSERT (GPR_SLICE_START_PTR (sub)[k] == (gpr_uint8) (i + k)); - } - gpr_slice_unref (sub); - } + for (i = 0; i < length; i++) { + for (j = i; j < length; j++) { + sub = gpr_slice_sub(slice, i, j); + GPR_ASSERT(GPR_SLICE_LENGTH(sub) == j - i); + for (k = 0; k < j - i; k++) { + GPR_ASSERT(GPR_SLICE_START_PTR(sub)[k] == (gpr_uint8)(i + k)); + } + gpr_slice_unref(sub); } - gpr_slice_unref (slice); + } + gpr_slice_unref(slice); } -static void -check_head_tail (gpr_slice slice, gpr_slice head, gpr_slice tail) -{ - GPR_ASSERT (GPR_SLICE_LENGTH (slice) == GPR_SLICE_LENGTH (head) + GPR_SLICE_LENGTH (tail)); - GPR_ASSERT (0 == memcmp (GPR_SLICE_START_PTR (slice), GPR_SLICE_START_PTR (head), GPR_SLICE_LENGTH (head))); - GPR_ASSERT (0 == memcmp (GPR_SLICE_START_PTR (slice) + GPR_SLICE_LENGTH (head), GPR_SLICE_START_PTR (tail), GPR_SLICE_LENGTH (tail))); +static void check_head_tail(gpr_slice slice, gpr_slice head, gpr_slice tail) { + GPR_ASSERT(GPR_SLICE_LENGTH(slice) == + GPR_SLICE_LENGTH(head) + GPR_SLICE_LENGTH(tail)); + GPR_ASSERT(0 == memcmp(GPR_SLICE_START_PTR(slice), GPR_SLICE_START_PTR(head), + GPR_SLICE_LENGTH(head))); + GPR_ASSERT(0 == memcmp(GPR_SLICE_START_PTR(slice) + GPR_SLICE_LENGTH(head), + GPR_SLICE_START_PTR(tail), GPR_SLICE_LENGTH(tail))); } -static void -test_slice_split_head_works (size_t length) -{ +static void test_slice_split_head_works(size_t length) { gpr_slice slice; gpr_slice head, tail; size_t i; - LOG_TEST_NAME ("test_slice_split_head_works"); - gpr_log (GPR_INFO, "length=%d", length); + LOG_TEST_NAME("test_slice_split_head_works"); + gpr_log(GPR_INFO, "length=%d", length); /* Create a slice in which each byte is equal to the distance from it to the beginning of the slice. */ - slice = gpr_slice_malloc (length); - for (i = 0; i < length; i++) - { - GPR_SLICE_START_PTR (slice)[i] = (gpr_uint8) i; - } + slice = gpr_slice_malloc(length); + for (i = 0; i < length; i++) { + GPR_SLICE_START_PTR(slice)[i] = (gpr_uint8)i; + } /* Ensure that for all subsets length is correct and that we start on the correct byte. Additionally check that no copies were made. */ - for (i = 0; i < length; i++) - { - tail = gpr_slice_ref (slice); - head = gpr_slice_split_head (&tail, i); - check_head_tail (slice, head, tail); - gpr_slice_unref (tail); - gpr_slice_unref (head); - } - - gpr_slice_unref (slice); + for (i = 0; i < length; i++) { + tail = gpr_slice_ref(slice); + head = gpr_slice_split_head(&tail, i); + check_head_tail(slice, head, tail); + gpr_slice_unref(tail); + gpr_slice_unref(head); + } + + gpr_slice_unref(slice); } -static void -test_slice_split_tail_works (size_t length) -{ +static void test_slice_split_tail_works(size_t length) { gpr_slice slice; gpr_slice head, tail; size_t i; - LOG_TEST_NAME ("test_slice_split_tail_works"); - gpr_log (GPR_INFO, "length=%d", length); + LOG_TEST_NAME("test_slice_split_tail_works"); + gpr_log(GPR_INFO, "length=%d", length); /* Create a slice in which each byte is equal to the distance from it to the beginning of the slice. */ - slice = gpr_slice_malloc (length); - for (i = 0; i < length; i++) - { - GPR_SLICE_START_PTR (slice)[i] = (gpr_uint8) i; - } + slice = gpr_slice_malloc(length); + for (i = 0; i < length; i++) { + GPR_SLICE_START_PTR(slice)[i] = (gpr_uint8)i; + } /* Ensure that for all subsets length is correct and that we start on the correct byte. Additionally check that no copies were made. */ - for (i = 0; i < length; i++) - { - head = gpr_slice_ref (slice); - tail = gpr_slice_split_tail (&head, i); - check_head_tail (slice, head, tail); - gpr_slice_unref (tail); - gpr_slice_unref (head); - } - - gpr_slice_unref (slice); + for (i = 0; i < length; i++) { + head = gpr_slice_ref(slice); + tail = gpr_slice_split_tail(&head, i); + check_head_tail(slice, head, tail); + gpr_slice_unref(tail); + gpr_slice_unref(head); + } + + gpr_slice_unref(slice); } -static void -test_slice_from_copied_string_works (void) -{ +static void test_slice_from_copied_string_works(void) { static const char *text = "HELLO WORLD!"; gpr_slice slice; - LOG_TEST_NAME ("test_slice_from_copied_string_works"); + LOG_TEST_NAME("test_slice_from_copied_string_works"); - slice = gpr_slice_from_copied_string (text); - GPR_ASSERT (strlen (text) == GPR_SLICE_LENGTH (slice)); - GPR_ASSERT (0 == memcmp (text, GPR_SLICE_START_PTR (slice), GPR_SLICE_LENGTH (slice))); - gpr_slice_unref (slice); + slice = gpr_slice_from_copied_string(text); + GPR_ASSERT(strlen(text) == GPR_SLICE_LENGTH(slice)); + GPR_ASSERT(0 == + memcmp(text, GPR_SLICE_START_PTR(slice), GPR_SLICE_LENGTH(slice))); + gpr_slice_unref(slice); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { unsigned length; - grpc_test_init (argc, argv); - test_slice_malloc_returns_something_sensible (); - test_slice_new_returns_something_sensible (); - test_slice_new_with_len_returns_something_sensible (); - for (length = 0; length < 128; length++) - { - test_slice_sub_works (length); - test_slice_split_head_works (length); - test_slice_split_tail_works (length); - } - test_slice_from_copied_string_works (); + grpc_test_init(argc, argv); + test_slice_malloc_returns_something_sensible(); + test_slice_new_returns_something_sensible(); + test_slice_new_with_len_returns_something_sensible(); + for (length = 0; length < 128; length++) { + test_slice_sub_works(length); + test_slice_split_head_works(length); + test_slice_split_tail_works(length); + } + test_slice_from_copied_string_works(); return 0; } diff --git a/test/core/support/stack_lockfree_test.c b/test/core/support/stack_lockfree_test.c index 8ad4ad26dfd..0f49e6fa52a 100644 --- a/test/core/support/stack_lockfree_test.c +++ b/test/core/support/stack_lockfree_test.c @@ -46,51 +46,42 @@ #define MAX_THREADS 32 -static void -test_serial_sized (size_t size) -{ - gpr_stack_lockfree *stack = gpr_stack_lockfree_create (size); +static void test_serial_sized(size_t size) { + gpr_stack_lockfree *stack = gpr_stack_lockfree_create(size); size_t i; size_t j; /* First try popping empty */ - GPR_ASSERT (gpr_stack_lockfree_pop (stack) == -1); + GPR_ASSERT(gpr_stack_lockfree_pop(stack) == -1); /* Now add one item and check it */ - gpr_stack_lockfree_push (stack, 3); - GPR_ASSERT (gpr_stack_lockfree_pop (stack) == 3); - GPR_ASSERT (gpr_stack_lockfree_pop (stack) == -1); + gpr_stack_lockfree_push(stack, 3); + GPR_ASSERT(gpr_stack_lockfree_pop(stack) == 3); + GPR_ASSERT(gpr_stack_lockfree_pop(stack) == -1); /* Now add repeatedly more items and check them */ - for (i = 1; i < size; i *= 2) - { - for (j = 0; j <= i; j++) - { - GPR_ASSERT (gpr_stack_lockfree_push (stack, (int) j) == (j == 0)); - } - for (j = 0; j <= i; j++) - { - GPR_ASSERT (gpr_stack_lockfree_pop (stack) == (int) (i - j)); - } - GPR_ASSERT (gpr_stack_lockfree_pop (stack) == -1); + for (i = 1; i < size; i *= 2) { + for (j = 0; j <= i; j++) { + GPR_ASSERT(gpr_stack_lockfree_push(stack, (int)j) == (j == 0)); } + for (j = 0; j <= i; j++) { + GPR_ASSERT(gpr_stack_lockfree_pop(stack) == (int)(i - j)); + } + GPR_ASSERT(gpr_stack_lockfree_pop(stack) == -1); + } - gpr_stack_lockfree_destroy (stack); + gpr_stack_lockfree_destroy(stack); } -static void -test_serial () -{ +static void test_serial() { size_t i; - for (i = 128; i < MAX_STACK_SIZE; i *= 2) - { - test_serial_sized (i); - } - test_serial_sized (MAX_STACK_SIZE); + for (i = 128; i < MAX_STACK_SIZE; i *= 2) { + test_serial_sized(i); + } + test_serial_sized(MAX_STACK_SIZE); } -struct test_arg -{ +struct test_arg { gpr_stack_lockfree *stack; int stack_size; int nthreads; @@ -98,83 +89,67 @@ struct test_arg int sum; }; -static void -test_mt_body (void *v) -{ - struct test_arg *arg = (struct test_arg *) v; +static void test_mt_body(void *v) { + struct test_arg *arg = (struct test_arg *)v; int lo, hi; int i; int res; lo = arg->rank * arg->stack_size / arg->nthreads; hi = (arg->rank + 1) * arg->stack_size / arg->nthreads; - for (i = lo; i < hi; i++) - { - gpr_stack_lockfree_push (arg->stack, i); - if ((res = gpr_stack_lockfree_pop (arg->stack)) != -1) - { - arg->sum += res; - } - } - while ((res = gpr_stack_lockfree_pop (arg->stack)) != -1) - { + for (i = lo; i < hi; i++) { + gpr_stack_lockfree_push(arg->stack, i); + if ((res = gpr_stack_lockfree_pop(arg->stack)) != -1) { arg->sum += res; } + } + while ((res = gpr_stack_lockfree_pop(arg->stack)) != -1) { + arg->sum += res; + } } -static void -test_mt_sized (size_t size, int nth) -{ +static void test_mt_sized(size_t size, int nth) { gpr_stack_lockfree *stack; struct test_arg args[MAX_THREADS]; gpr_thd_id thds[MAX_THREADS]; int sum; int i; - gpr_thd_options options = gpr_thd_options_default (); - - stack = gpr_stack_lockfree_create (size); - for (i = 0; i < nth; i++) - { - args[i].stack = stack; - args[i].stack_size = (int) size; - args[i].nthreads = nth; - args[i].rank = i; - args[i].sum = 0; - } - gpr_thd_options_set_joinable (&options); - for (i = 0; i < nth; i++) - { - GPR_ASSERT (gpr_thd_new (&thds[i], test_mt_body, &args[i], &options)); - } + gpr_thd_options options = gpr_thd_options_default(); + + stack = gpr_stack_lockfree_create(size); + for (i = 0; i < nth; i++) { + args[i].stack = stack; + args[i].stack_size = (int)size; + args[i].nthreads = nth; + args[i].rank = i; + args[i].sum = 0; + } + gpr_thd_options_set_joinable(&options); + for (i = 0; i < nth; i++) { + GPR_ASSERT(gpr_thd_new(&thds[i], test_mt_body, &args[i], &options)); + } sum = 0; - for (i = 0; i < nth; i++) - { - gpr_thd_join (thds[i]); - sum = sum + args[i].sum; - } - GPR_ASSERT ((unsigned) sum == ((unsigned) size * (size - 1)) / 2); - gpr_stack_lockfree_destroy (stack); + for (i = 0; i < nth; i++) { + gpr_thd_join(thds[i]); + sum = sum + args[i].sum; + } + GPR_ASSERT((unsigned)sum == ((unsigned)size * (size - 1)) / 2); + gpr_stack_lockfree_destroy(stack); } -static void -test_mt () -{ +static void test_mt() { size_t size; int nth; - for (nth = 1; nth < MAX_THREADS; nth++) - { - for (size = 128; size < MAX_STACK_SIZE; size *= 2) - { - test_mt_sized (size, nth); - } - test_mt_sized (MAX_STACK_SIZE, nth); + for (nth = 1; nth < MAX_THREADS; nth++) { + for (size = 128; size < MAX_STACK_SIZE; size *= 2) { + test_mt_sized(size, nth); } + test_mt_sized(MAX_STACK_SIZE, nth); + } } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_serial (); - test_mt (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_serial(); + test_mt(); return 0; } diff --git a/test/core/support/string_test.c b/test/core/support/string_test.c index faf4d01a110..f62cbe34358 100644 --- a/test/core/support/string_test.c +++ b/test/core/support/string_test.c @@ -45,273 +45,256 @@ #define LOG_TEST_NAME(x) gpr_log(GPR_INFO, "%s", x) -static void -test_strdup (void) -{ +static void test_strdup(void) { static const char *src1 = "hello world"; char *dst1; - LOG_TEST_NAME ("test_strdup"); + LOG_TEST_NAME("test_strdup"); - dst1 = gpr_strdup (src1); - GPR_ASSERT (0 == strcmp (src1, dst1)); - gpr_free (dst1); + dst1 = gpr_strdup(src1); + GPR_ASSERT(0 == strcmp(src1, dst1)); + gpr_free(dst1); - GPR_ASSERT (NULL == gpr_strdup (NULL)); + GPR_ASSERT(NULL == gpr_strdup(NULL)); } -static void -expect_dump (const char *buf, size_t len, gpr_uint32 flags, const char *result) -{ - char *got = gpr_dump (buf, len, flags); - GPR_ASSERT (0 == strcmp (got, result)); - gpr_free (got); +static void expect_dump(const char *buf, size_t len, gpr_uint32 flags, + const char *result) { + char *got = gpr_dump(buf, len, flags); + GPR_ASSERT(0 == strcmp(got, result)); + gpr_free(got); } -static void -test_dump (void) -{ - LOG_TEST_NAME ("test_dump"); - expect_dump ("\x01", 1, GPR_DUMP_HEX, "01"); - expect_dump ("\x01", 1, GPR_DUMP_HEX | GPR_DUMP_ASCII, "01 '.'"); - expect_dump ("\x01\x02", 2, GPR_DUMP_HEX, "01 02"); - expect_dump ("\x01\x23\x45\x67\x89\xab\xcd\xef", 8, GPR_DUMP_HEX, "01 23 45 67 89 ab cd ef"); - expect_dump ("ab", 2, GPR_DUMP_HEX | GPR_DUMP_ASCII, "61 62 'ab'"); +static void test_dump(void) { + LOG_TEST_NAME("test_dump"); + expect_dump("\x01", 1, GPR_DUMP_HEX, "01"); + expect_dump("\x01", 1, GPR_DUMP_HEX | GPR_DUMP_ASCII, "01 '.'"); + expect_dump("\x01\x02", 2, GPR_DUMP_HEX, "01 02"); + expect_dump("\x01\x23\x45\x67\x89\xab\xcd\xef", 8, GPR_DUMP_HEX, + "01 23 45 67 89 ab cd ef"); + expect_dump("ab", 2, GPR_DUMP_HEX | GPR_DUMP_ASCII, "61 62 'ab'"); } -static void -expect_slice_dump (gpr_slice slice, gpr_uint32 flags, const char *result) -{ - char *got = gpr_dump_slice (slice, flags); - GPR_ASSERT (0 == strcmp (got, result)); - gpr_free (got); - gpr_slice_unref (slice); +static void expect_slice_dump(gpr_slice slice, gpr_uint32 flags, + const char *result) { + char *got = gpr_dump_slice(slice, flags); + GPR_ASSERT(0 == strcmp(got, result)); + gpr_free(got); + gpr_slice_unref(slice); } -static void -test_dump_slice (void) -{ +static void test_dump_slice(void) { static const char *text = "HELLO WORLD!"; - static const char *long_text = "It was a bright cold day in April, and the clocks were striking " "thirteen. Winston Smith, his chin nuzzled into his breast in an effort " "to escape the vile wind, slipped quickly through the glass doors of " "Victory Mansions, though not quickly enough to prevent a swirl of " "gritty dust from entering along with him."; - - LOG_TEST_NAME ("test_dump_slice"); - - expect_slice_dump (gpr_slice_from_copied_string (text), GPR_DUMP_ASCII, text); - expect_slice_dump (gpr_slice_from_copied_string (long_text), GPR_DUMP_ASCII, long_text); - expect_slice_dump (gpr_slice_from_copied_buffer ("\x01", 1), GPR_DUMP_HEX, "01"); - expect_slice_dump (gpr_slice_from_copied_buffer ("\x01", 1), GPR_DUMP_HEX | GPR_DUMP_ASCII, "01 '.'"); + static const char *long_text = + "It was a bright cold day in April, and the clocks were striking " + "thirteen. Winston Smith, his chin nuzzled into his breast in an effort " + "to escape the vile wind, slipped quickly through the glass doors of " + "Victory Mansions, though not quickly enough to prevent a swirl of " + "gritty dust from entering along with him."; + + LOG_TEST_NAME("test_dump_slice"); + + expect_slice_dump(gpr_slice_from_copied_string(text), GPR_DUMP_ASCII, text); + expect_slice_dump(gpr_slice_from_copied_string(long_text), GPR_DUMP_ASCII, + long_text); + expect_slice_dump(gpr_slice_from_copied_buffer("\x01", 1), GPR_DUMP_HEX, + "01"); + expect_slice_dump(gpr_slice_from_copied_buffer("\x01", 1), + GPR_DUMP_HEX | GPR_DUMP_ASCII, "01 '.'"); } -static void -test_pu32_fail (const char *s) -{ +static void test_pu32_fail(const char *s) { gpr_uint32 out; - GPR_ASSERT (!gpr_parse_bytes_to_uint32 (s, strlen (s), &out)); + GPR_ASSERT(!gpr_parse_bytes_to_uint32(s, strlen(s), &out)); } -static void -test_pu32_succeed (const char *s, gpr_uint32 want) -{ +static void test_pu32_succeed(const char *s, gpr_uint32 want) { gpr_uint32 out; - GPR_ASSERT (gpr_parse_bytes_to_uint32 (s, strlen (s), &out)); - GPR_ASSERT (out == want); + GPR_ASSERT(gpr_parse_bytes_to_uint32(s, strlen(s), &out)); + GPR_ASSERT(out == want); } -static void -test_parse_uint32 (void) -{ - LOG_TEST_NAME ("test_parse_uint32"); - - test_pu32_fail ("-1"); - test_pu32_fail ("a"); - test_pu32_fail (""); - test_pu32_succeed ("0", 0); - test_pu32_succeed ("1", 1); - test_pu32_succeed ("2", 2); - test_pu32_succeed ("3", 3); - test_pu32_succeed ("4", 4); - test_pu32_succeed ("5", 5); - test_pu32_succeed ("6", 6); - test_pu32_succeed ("7", 7); - test_pu32_succeed ("8", 8); - test_pu32_succeed ("9", 9); - test_pu32_succeed ("10", 10); - test_pu32_succeed ("11", 11); - test_pu32_succeed ("12", 12); - test_pu32_succeed ("13", 13); - test_pu32_succeed ("14", 14); - test_pu32_succeed ("15", 15); - test_pu32_succeed ("16", 16); - test_pu32_succeed ("17", 17); - test_pu32_succeed ("18", 18); - test_pu32_succeed ("19", 19); - test_pu32_succeed ("1234567890", 1234567890); - test_pu32_succeed ("4294967295", 4294967295u); - test_pu32_fail ("4294967296"); - test_pu32_fail ("4294967297"); - test_pu32_fail ("4294967298"); - test_pu32_fail ("4294967299"); +static void test_parse_uint32(void) { + LOG_TEST_NAME("test_parse_uint32"); + + test_pu32_fail("-1"); + test_pu32_fail("a"); + test_pu32_fail(""); + test_pu32_succeed("0", 0); + test_pu32_succeed("1", 1); + test_pu32_succeed("2", 2); + test_pu32_succeed("3", 3); + test_pu32_succeed("4", 4); + test_pu32_succeed("5", 5); + test_pu32_succeed("6", 6); + test_pu32_succeed("7", 7); + test_pu32_succeed("8", 8); + test_pu32_succeed("9", 9); + test_pu32_succeed("10", 10); + test_pu32_succeed("11", 11); + test_pu32_succeed("12", 12); + test_pu32_succeed("13", 13); + test_pu32_succeed("14", 14); + test_pu32_succeed("15", 15); + test_pu32_succeed("16", 16); + test_pu32_succeed("17", 17); + test_pu32_succeed("18", 18); + test_pu32_succeed("19", 19); + test_pu32_succeed("1234567890", 1234567890); + test_pu32_succeed("4294967295", 4294967295u); + test_pu32_fail("4294967296"); + test_pu32_fail("4294967297"); + test_pu32_fail("4294967298"); + test_pu32_fail("4294967299"); } -static void -test_asprintf (void) -{ +static void test_asprintf(void) { char *buf; int i, j; - LOG_TEST_NAME ("test_asprintf"); + LOG_TEST_NAME("test_asprintf"); /* Print an empty string. */ - GPR_ASSERT (gpr_asprintf (&buf, "") == 0); - GPR_ASSERT (buf[0] == '\0'); - gpr_free (buf); + GPR_ASSERT(gpr_asprintf(&buf, "") == 0); + GPR_ASSERT(buf[0] == '\0'); + gpr_free(buf); /* Print strings of various lengths. */ - for (i = 1; i < 100; i++) - { - GPR_ASSERT (gpr_asprintf (&buf, "%0*d", i, 1) == i); - - /* The buffer should resemble "000001\0". */ - for (j = 0; j < i - 2; j++) - { - GPR_ASSERT (buf[j] == '0'); - } - GPR_ASSERT (buf[i - 1] == '1'); - GPR_ASSERT (buf[i] == '\0'); - gpr_free (buf); + for (i = 1; i < 100; i++) { + GPR_ASSERT(gpr_asprintf(&buf, "%0*d", i, 1) == i); + + /* The buffer should resemble "000001\0". */ + for (j = 0; j < i - 2; j++) { + GPR_ASSERT(buf[j] == '0'); } + GPR_ASSERT(buf[i - 1] == '1'); + GPR_ASSERT(buf[i] == '\0'); + gpr_free(buf); + } } -static void -test_strjoin (void) -{ - const char *parts[4] = { "one", "two", "three", "four" }; +static void test_strjoin(void) { + const char *parts[4] = {"one", "two", "three", "four"}; size_t joined_len; char *joined; - LOG_TEST_NAME ("test_strjoin"); + LOG_TEST_NAME("test_strjoin"); - joined = gpr_strjoin (parts, 4, &joined_len); - GPR_ASSERT (0 == strcmp ("onetwothreefour", joined)); - gpr_free (joined); + joined = gpr_strjoin(parts, 4, &joined_len); + GPR_ASSERT(0 == strcmp("onetwothreefour", joined)); + gpr_free(joined); - joined = gpr_strjoin (parts, 0, &joined_len); - GPR_ASSERT (0 == strcmp ("", joined)); - gpr_free (joined); + joined = gpr_strjoin(parts, 0, &joined_len); + GPR_ASSERT(0 == strcmp("", joined)); + gpr_free(joined); - joined = gpr_strjoin (parts, 1, &joined_len); - GPR_ASSERT (0 == strcmp ("one", joined)); - gpr_free (joined); + joined = gpr_strjoin(parts, 1, &joined_len); + GPR_ASSERT(0 == strcmp("one", joined)); + gpr_free(joined); } -static void -test_strjoin_sep (void) -{ - const char *parts[4] = { "one", "two", "three", "four" }; +static void test_strjoin_sep(void) { + const char *parts[4] = {"one", "two", "three", "four"}; size_t joined_len; char *joined; - LOG_TEST_NAME ("test_strjoin_sep"); + LOG_TEST_NAME("test_strjoin_sep"); - joined = gpr_strjoin_sep (parts, 4, ", ", &joined_len); - GPR_ASSERT (0 == strcmp ("one, two, three, four", joined)); - gpr_free (joined); + joined = gpr_strjoin_sep(parts, 4, ", ", &joined_len); + GPR_ASSERT(0 == strcmp("one, two, three, four", joined)); + gpr_free(joined); /* empty separator */ - joined = gpr_strjoin_sep (parts, 4, "", &joined_len); - GPR_ASSERT (0 == strcmp ("onetwothreefour", joined)); - gpr_free (joined); + joined = gpr_strjoin_sep(parts, 4, "", &joined_len); + GPR_ASSERT(0 == strcmp("onetwothreefour", joined)); + gpr_free(joined); /* degenerated case specifying zero input parts */ - joined = gpr_strjoin_sep (parts, 0, ", ", &joined_len); - GPR_ASSERT (0 == strcmp ("", joined)); - gpr_free (joined); + joined = gpr_strjoin_sep(parts, 0, ", ", &joined_len); + GPR_ASSERT(0 == strcmp("", joined)); + gpr_free(joined); /* single part should have no separator */ - joined = gpr_strjoin_sep (parts, 1, ", ", &joined_len); - GPR_ASSERT (0 == strcmp ("one", joined)); - gpr_free (joined); + joined = gpr_strjoin_sep(parts, 1, ", ", &joined_len); + GPR_ASSERT(0 == strcmp("one", joined)); + gpr_free(joined); } -static void -test_strsplit (void) -{ +static void test_strsplit(void) { gpr_slice_buffer *parts; gpr_slice str; - LOG_TEST_NAME ("test_strsplit"); + LOG_TEST_NAME("test_strsplit"); - parts = gpr_malloc (sizeof (gpr_slice_buffer)); - gpr_slice_buffer_init (parts); + parts = gpr_malloc(sizeof(gpr_slice_buffer)); + gpr_slice_buffer_init(parts); - str = gpr_slice_from_copied_string ("one, two, three, four"); - gpr_slice_split (str, ", ", parts); - GPR_ASSERT (4 == parts->count); - GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[0], "one")); - GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[1], "two")); - GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[2], "three")); - GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[3], "four")); - gpr_slice_buffer_reset_and_unref (parts); - gpr_slice_unref (str); + str = gpr_slice_from_copied_string("one, two, three, four"); + gpr_slice_split(str, ", ", parts); + GPR_ASSERT(4 == parts->count); + GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[0], "one")); + GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[1], "two")); + GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[2], "three")); + GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[3], "four")); + gpr_slice_buffer_reset_and_unref(parts); + gpr_slice_unref(str); /* separator not present in string */ - str = gpr_slice_from_copied_string ("one two three four"); - gpr_slice_split (str, ", ", parts); - GPR_ASSERT (1 == parts->count); - GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[0], "one two three four")); - gpr_slice_buffer_reset_and_unref (parts); - gpr_slice_unref (str); + str = gpr_slice_from_copied_string("one two three four"); + gpr_slice_split(str, ", ", parts); + GPR_ASSERT(1 == parts->count); + GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[0], "one two three four")); + gpr_slice_buffer_reset_and_unref(parts); + gpr_slice_unref(str); /* separator at the end */ - str = gpr_slice_from_copied_string ("foo,"); - gpr_slice_split (str, ",", parts); - GPR_ASSERT (2 == parts->count); - GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[0], "foo")); - GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[1], "")); - gpr_slice_buffer_reset_and_unref (parts); - gpr_slice_unref (str); + str = gpr_slice_from_copied_string("foo,"); + gpr_slice_split(str, ",", parts); + GPR_ASSERT(2 == parts->count); + GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[0], "foo")); + GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[1], "")); + gpr_slice_buffer_reset_and_unref(parts); + gpr_slice_unref(str); /* separator at the beginning */ - str = gpr_slice_from_copied_string (",foo"); - gpr_slice_split (str, ",", parts); - GPR_ASSERT (2 == parts->count); - GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[0], "")); - GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[1], "foo")); - gpr_slice_buffer_reset_and_unref (parts); - gpr_slice_unref (str); + str = gpr_slice_from_copied_string(",foo"); + gpr_slice_split(str, ",", parts); + GPR_ASSERT(2 == parts->count); + GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[0], "")); + GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[1], "foo")); + gpr_slice_buffer_reset_and_unref(parts); + gpr_slice_unref(str); /* standalone separator */ - str = gpr_slice_from_copied_string (","); - gpr_slice_split (str, ",", parts); - GPR_ASSERT (2 == parts->count); - GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[0], "")); - GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[1], "")); - gpr_slice_buffer_reset_and_unref (parts); - gpr_slice_unref (str); + str = gpr_slice_from_copied_string(","); + gpr_slice_split(str, ",", parts); + GPR_ASSERT(2 == parts->count); + GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[0], "")); + GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[1], "")); + gpr_slice_buffer_reset_and_unref(parts); + gpr_slice_unref(str); /* empty input */ - str = gpr_slice_from_copied_string (""); - gpr_slice_split (str, ", ", parts); - GPR_ASSERT (1 == parts->count); - GPR_ASSERT (0 == gpr_slice_str_cmp (parts->slices[0], "")); - gpr_slice_buffer_reset_and_unref (parts); - gpr_slice_unref (str); - - gpr_slice_buffer_destroy (parts); - gpr_free (parts); + str = gpr_slice_from_copied_string(""); + gpr_slice_split(str, ", ", parts); + GPR_ASSERT(1 == parts->count); + GPR_ASSERT(0 == gpr_slice_str_cmp(parts->slices[0], "")); + gpr_slice_buffer_reset_and_unref(parts); + gpr_slice_unref(str); + + gpr_slice_buffer_destroy(parts); + gpr_free(parts); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_strdup (); - test_dump (); - test_dump_slice (); - test_parse_uint32 (); - test_asprintf (); - test_strjoin (); - test_strjoin_sep (); - test_strsplit (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_strdup(); + test_dump(); + test_dump_slice(); + test_parse_uint32(); + test_asprintf(); + test_strjoin(); + test_strjoin_sep(); + test_strsplit(); return 0; } diff --git a/test/core/support/sync_test.c b/test/core/support/sync_test.c index 72788a75bac..220b16b60f5 100644 --- a/test/core/support/sync_test.c +++ b/test/core/support/sync_test.c @@ -49,44 +49,37 @@ #define N 4 -typedef struct queue -{ - gpr_cv non_empty; /* Signalled when length becomes non-zero. */ - gpr_cv non_full; /* Signalled when length becomes non-N. */ - gpr_mu mu; /* Protects all fields below. - (That is, except during initialization or - destruction, the fields below should be accessed - only by a thread that holds mu.) */ - int head; /* Index of head of queue 0..N-1. */ - int length; /* Number of valid elements in queue 0..N. */ - int elem[N]; /* elem[head .. head+length-1] are queue elements. */ +typedef struct queue { + gpr_cv non_empty; /* Signalled when length becomes non-zero. */ + gpr_cv non_full; /* Signalled when length becomes non-N. */ + gpr_mu mu; /* Protects all fields below. + (That is, except during initialization or + destruction, the fields below should be accessed + only by a thread that holds mu.) */ + int head; /* Index of head of queue 0..N-1. */ + int length; /* Number of valid elements in queue 0..N. */ + int elem[N]; /* elem[head .. head+length-1] are queue elements. */ } queue; /* Initialize *q. */ -void -queue_init (queue * q) -{ - gpr_mu_init (&q->mu); - gpr_cv_init (&q->non_empty); - gpr_cv_init (&q->non_full); +void queue_init(queue *q) { + gpr_mu_init(&q->mu); + gpr_cv_init(&q->non_empty); + gpr_cv_init(&q->non_full); q->head = 0; q->length = 0; } /* Free storage associated with *q. */ -void -queue_destroy (queue * q) -{ - gpr_mu_destroy (&q->mu); - gpr_cv_destroy (&q->non_empty); - gpr_cv_destroy (&q->non_full); +void queue_destroy(queue *q) { + gpr_mu_destroy(&q->mu); + gpr_cv_destroy(&q->non_empty); + gpr_cv_destroy(&q->non_full); } /* Wait until there is room in *q, then append x to *q. */ -void -queue_append (queue * q, int x) -{ - gpr_mu_lock (&q->mu); +void queue_append(queue *q, int x) { + gpr_mu_lock(&q->mu); /* To wait for a predicate without a deadline, loop on the negation of the predicate, and use gpr_cv_wait(..., gpr_inf_future(GPR_CLOCK_REALTIME)) inside the loop @@ -94,91 +87,78 @@ queue_append (queue * q, int x) makes the condition true should use gpr_cv_broadcast() on the 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)); - } - if (q->length == 0) - { /* Wake threads blocked in queue_remove(). */ - /* It's normal to use gpr_cv_broadcast() or gpr_signal() while - holding the lock. */ - gpr_cv_broadcast (&q->non_empty); - } + while (q->length == N) { + gpr_cv_wait(&q->non_full, &q->mu, gpr_inf_future(GPR_CLOCK_REALTIME)); + } + if (q->length == 0) { /* Wake threads blocked in queue_remove(). */ + /* It's normal to use gpr_cv_broadcast() or gpr_signal() while + holding the lock. */ + gpr_cv_broadcast(&q->non_empty); + } q->elem[(q->head + q->length) % N] = x; q->length++; - gpr_mu_unlock (&q->mu); + gpr_mu_unlock(&q->mu); } /* If it can be done without blocking, append x to *q and return non-zero. Otherwise return 0. */ -int -queue_try_append (queue * q, int x) -{ +int queue_try_append(queue *q, int x) { int result = 0; - if (gpr_mu_trylock (&q->mu)) - { - if (q->length != N) - { - if (q->length == 0) - { /* Wake threads blocked in queue_remove(). */ - gpr_cv_broadcast (&q->non_empty); - } - q->elem[(q->head + q->length) % N] = x; - q->length++; - result = 1; - } - gpr_mu_unlock (&q->mu); + if (gpr_mu_trylock(&q->mu)) { + if (q->length != N) { + if (q->length == 0) { /* Wake threads blocked in queue_remove(). */ + gpr_cv_broadcast(&q->non_empty); + } + q->elem[(q->head + q->length) % N] = x; + q->length++; + result = 1; } + gpr_mu_unlock(&q->mu); + } return result; } /* Wait until the *q is non-empty or deadline abs_deadline passes. If the queue is non-empty, remove its head entry, place it in *head, and return non-zero. Otherwise return 0. */ -int -queue_remove (queue * q, int *head, gpr_timespec abs_deadline) -{ +int queue_remove(queue *q, int *head, gpr_timespec abs_deadline) { int result = 0; - gpr_mu_lock (&q->mu); + gpr_mu_lock(&q->mu); /* To wait for a predicate with a deadline, loop on the negation of the predicate or until gpr_cv_wait() returns true. Code that makes the condition true should use gpr_cv_broadcast() on the corresponding condition variable. The predicate must be on state protected by the lock. */ - while (q->length == 0 && !gpr_cv_wait (&q->non_empty, &q->mu, abs_deadline)) - { + while (q->length == 0 && !gpr_cv_wait(&q->non_empty, &q->mu, abs_deadline)) { + } + if (q->length != 0) { /* Queue is non-empty. */ + result = 1; + if (q->length == N) { /* Wake threads blocked in queue_append(). */ + gpr_cv_broadcast(&q->non_full); } - if (q->length != 0) - { /* Queue is non-empty. */ - result = 1; - if (q->length == N) - { /* Wake threads blocked in queue_append(). */ - gpr_cv_broadcast (&q->non_full); - } - *head = q->elem[q->head]; - q->head = (q->head + 1) % N; - q->length--; - } /* else deadline exceeded */ - gpr_mu_unlock (&q->mu); + *head = q->elem[q->head]; + q->head = (q->head + 1) % N; + q->length--; + } /* else deadline exceeded */ + gpr_mu_unlock(&q->mu); return result; } /* ------------------------------------------------- */ /* Tests for gpr_mu and gpr_cv, and the queue example. */ -struct test -{ - int threads; /* number of threads */ +struct test { + int threads; /* number of threads */ - gpr_int64 iterations; /* number of iterations per thread */ + gpr_int64 iterations; /* number of iterations per thread */ gpr_int64 counter; - int thread_count; /* used to allocate thread ids */ - int done; /* threads not yet completed */ + int thread_count; /* used to allocate thread ids */ + int done; /* threads not yet completed */ - gpr_mu mu; /* protects iterations, counter, thread_count, done */ + gpr_mu mu; /* protects iterations, counter, thread_count, done */ - gpr_cv cv; /* signalling depends on test */ + gpr_cv cv; /* signalling depends on test */ - gpr_cv done_cv; /* signalled when done == 0 */ + gpr_cv done_cv; /* signalled when done == 0 */ queue q; @@ -190,338 +170,287 @@ struct test }; /* Return pointer to a new struct test. */ -static struct test * -test_new (int threads, gpr_int64 iterations) -{ - struct test *m = gpr_malloc (sizeof (*m)); +static struct test *test_new(int threads, gpr_int64 iterations) { + struct test *m = gpr_malloc(sizeof(*m)); m->threads = threads; m->iterations = iterations; m->counter = 0; m->thread_count = 0; m->done = threads; - gpr_mu_init (&m->mu); - gpr_cv_init (&m->cv); - gpr_cv_init (&m->done_cv); - queue_init (&m->q); - gpr_stats_init (&m->stats_counter, 0); - gpr_ref_init (&m->refcount, 0); - gpr_ref_init (&m->thread_refcount, threads); - gpr_event_init (&m->event); + gpr_mu_init(&m->mu); + gpr_cv_init(&m->cv); + gpr_cv_init(&m->done_cv); + queue_init(&m->q); + gpr_stats_init(&m->stats_counter, 0); + gpr_ref_init(&m->refcount, 0); + gpr_ref_init(&m->thread_refcount, threads); + gpr_event_init(&m->event); return m; } /* Return pointer to a new struct test. */ -static void -test_destroy (struct test *m) -{ - gpr_mu_destroy (&m->mu); - gpr_cv_destroy (&m->cv); - gpr_cv_destroy (&m->done_cv); - queue_destroy (&m->q); - gpr_free (m); +static void test_destroy(struct test *m) { + gpr_mu_destroy(&m->mu); + gpr_cv_destroy(&m->cv); + gpr_cv_destroy(&m->done_cv); + queue_destroy(&m->q); + gpr_free(m); } /* Create m->threads threads, each running (*body)(m) */ -static void -test_create_threads (struct test *m, void (*body) (void *arg)) -{ +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, NULL)); - } + for (i = 0; i != m->threads; i++) { + GPR_ASSERT(gpr_thd_new(&id, body, m, NULL)); + } } /* Wait until all threads report done. */ -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_mu_unlock (&m->mu); +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_mu_unlock(&m->mu); } /* Get an integer thread id in the raneg 0..threads-1 */ -static int -thread_id (struct test *m) -{ +static int thread_id(struct test *m) { int id; - gpr_mu_lock (&m->mu); + gpr_mu_lock(&m->mu); id = m->thread_count++; - gpr_mu_unlock (&m->mu); + gpr_mu_unlock(&m->mu); return id; } /* Indicate that a thread is done, by decrementing m->done and signalling done_cv if m->done==0. */ -static void -mark_thread_done (struct test *m) -{ - gpr_mu_lock (&m->mu); - GPR_ASSERT (m->done != 0); +static void mark_thread_done(struct test *m) { + gpr_mu_lock(&m->mu); + GPR_ASSERT(m->done != 0); m->done--; - if (m->done == 0) - { - gpr_cv_signal (&m->done_cv); - } - gpr_mu_unlock (&m->mu); + if (m->done == 0) { + gpr_cv_signal(&m->done_cv); + } + gpr_mu_unlock(&m->mu); } /* Test several threads running (*body)(struct test *m) for increasing settings of m->iterations, until about timeout_s to 2*timeout_s seconds have elapsed. If extra!=NULL, run (*extra)(m) in an additional thread. */ -static void -test (const char *name, void (*body) (void *m), void (*extra) (void *m), int timeout_s) -{ +static void test(const char *name, void (*body)(void *m), + void (*extra)(void *m), int timeout_s) { gpr_int64 iterations = 1024; struct test *m; - gpr_timespec start = gpr_now (GPR_CLOCK_REALTIME); + gpr_timespec start = gpr_now(GPR_CLOCK_REALTIME); gpr_timespec time_taken; - gpr_timespec deadline = gpr_time_add (start, gpr_time_from_micros (timeout_s * 1000000, GPR_TIMESPAN)); - fprintf (stderr, "%s:", name); - while (gpr_time_cmp (gpr_now (GPR_CLOCK_REALTIME), deadline) < 0) - { - iterations <<= 1; - fprintf (stderr, " %ld", (long) iterations); - m = test_new (10, iterations); - if (extra != NULL) - { - gpr_thd_id id; - GPR_ASSERT (gpr_thd_new (&id, extra, m, NULL)); - m->done++; /* one more thread to wait for */ - } - test_create_threads (m, body); - test_wait (m); - if (m->counter != m->threads * m->iterations) - { - fprintf (stderr, "counter %ld threads %d iterations %ld\n", (long) m->counter, m->threads, (long) m->iterations); - GPR_ASSERT (0); - } - test_destroy (m); + gpr_timespec deadline = gpr_time_add( + start, gpr_time_from_micros(timeout_s * 1000000, GPR_TIMESPAN)); + fprintf(stderr, "%s:", name); + while (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), deadline) < 0) { + iterations <<= 1; + fprintf(stderr, " %ld", (long)iterations); + m = test_new(10, iterations); + if (extra != NULL) { + gpr_thd_id id; + GPR_ASSERT(gpr_thd_new(&id, extra, m, NULL)); + m->done++; /* one more thread to wait for */ + } + test_create_threads(m, body); + test_wait(m); + if (m->counter != m->threads * m->iterations) { + fprintf(stderr, "counter %ld threads %d iterations %ld\n", + (long)m->counter, m->threads, (long)m->iterations); + GPR_ASSERT(0); } - time_taken = gpr_time_sub (gpr_now (GPR_CLOCK_REALTIME), start); - fprintf (stderr, " done %ld.%09d s\n", (long) time_taken.tv_sec, (int) time_taken.tv_nsec); + test_destroy(m); + } + time_taken = gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), start); + fprintf(stderr, " done %ld.%09d s\n", (long)time_taken.tv_sec, + (int)time_taken.tv_nsec); } /* Increment m->counter on each iteration; then mark thread as done. */ -static void -inc (void *v /*=m*/ ) -{ +static void inc(void *v /*=m*/) { struct test *m = v; gpr_int64 i; - for (i = 0; i != m->iterations; i++) - { - gpr_mu_lock (&m->mu); - m->counter++; - gpr_mu_unlock (&m->mu); - } - mark_thread_done (m); + for (i = 0; i != m->iterations; i++) { + gpr_mu_lock(&m->mu); + m->counter++; + gpr_mu_unlock(&m->mu); + } + mark_thread_done(m); } /* Increment m->counter under lock acquired with trylock, m->iterations times; then mark thread as done. */ -static void -inctry (void *v /*=m*/ ) -{ +static void inctry(void *v /*=m*/) { struct test *m = v; gpr_int64 i; - for (i = 0; i != m->iterations;) - { - if (gpr_mu_trylock (&m->mu)) - { - m->counter++; - gpr_mu_unlock (&m->mu); - i++; - } + for (i = 0; i != m->iterations;) { + if (gpr_mu_trylock(&m->mu)) { + m->counter++; + gpr_mu_unlock(&m->mu); + i++; } - mark_thread_done (m); + } + mark_thread_done(m); } /* Increment counter only when (m->counter%m->threads)==m->thread_id; then mark thread as done. */ -static void -inc_by_turns (void *v /*=m*/ ) -{ +static void inc_by_turns(void *v /*=m*/) { struct test *m = v; gpr_int64 i; - int id = thread_id (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)); - } - m->counter++; - gpr_cv_broadcast (&m->cv); - gpr_mu_unlock (&m->mu); + int id = thread_id(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)); } - mark_thread_done (m); + m->counter++; + gpr_cv_broadcast(&m->cv); + gpr_mu_unlock(&m->mu); + } + mark_thread_done(m); } /* Wait a millisecond and increment counter on each iteration; then mark thread as done. */ -static void -inc_with_1ms_delay (void *v /*=m*/ ) -{ +static void inc_with_1ms_delay(void *v /*=m*/) { struct test *m = v; gpr_int64 i; - for (i = 0; i != m->iterations; i++) - { - gpr_timespec deadline; - gpr_mu_lock (&m->mu); - deadline = gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), gpr_time_from_micros (1000, GPR_TIMESPAN)); - while (!gpr_cv_wait (&m->cv, &m->mu, deadline)) - { - } - m->counter++; - gpr_mu_unlock (&m->mu); + for (i = 0; i != m->iterations; i++) { + gpr_timespec deadline; + gpr_mu_lock(&m->mu); + deadline = gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), + gpr_time_from_micros(1000, GPR_TIMESPAN)); + while (!gpr_cv_wait(&m->cv, &m->mu, deadline)) { } - mark_thread_done (m); + m->counter++; + gpr_mu_unlock(&m->mu); + } + mark_thread_done(m); } /* Wait a millisecond and increment counter on each iteration, using an event for timing; then mark thread as done. */ -static void -inc_with_1ms_delay_event (void *v /*=m*/ ) -{ +static void inc_with_1ms_delay_event(void *v /*=m*/) { struct test *m = v; gpr_int64 i; - for (i = 0; i != m->iterations; i++) - { - gpr_timespec deadline; - deadline = gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), gpr_time_from_micros (1000, GPR_TIMESPAN)); - GPR_ASSERT (gpr_event_wait (&m->event, deadline) == NULL); - gpr_mu_lock (&m->mu); - m->counter++; - gpr_mu_unlock (&m->mu); - } - mark_thread_done (m); + for (i = 0; i != m->iterations; i++) { + gpr_timespec deadline; + deadline = gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), + gpr_time_from_micros(1000, GPR_TIMESPAN)); + GPR_ASSERT(gpr_event_wait(&m->event, deadline) == NULL); + gpr_mu_lock(&m->mu); + m->counter++; + gpr_mu_unlock(&m->mu); + } + mark_thread_done(m); } /* Produce m->iterations elements on queue m->q, then mark thread as done. Even threads use queue_append(), and odd threads use queue_try_append() until it succeeds. */ -static void -many_producers (void *v /*=m*/ ) -{ +static void many_producers(void *v /*=m*/) { struct test *m = v; gpr_int64 i; - int x = thread_id (m); - if ((x & 1) == 0) - { - for (i = 0; i != m->iterations; i++) - { - queue_append (&m->q, 1); - } + int x = thread_id(m); + if ((x & 1) == 0) { + for (i = 0; i != m->iterations; i++) { + queue_append(&m->q, 1); } - else - { - for (i = 0; i != m->iterations; i++) - { - while (!queue_try_append (&m->q, 1)) - { - } - } + } else { + for (i = 0; i != m->iterations; i++) { + while (!queue_try_append(&m->q, 1)) { + } } - mark_thread_done (m); + } + mark_thread_done(m); } /* Consume elements from m->q until m->threads*m->iterations are seen, wait an extra second to confirm that no more elements are arriving, then mark thread as done. */ -static void -consumer (void *v /*=m*/ ) -{ +static void consumer(void *v /*=m*/) { struct test *m = v; gpr_int64 n = m->iterations * m->threads; gpr_int64 i; int value; - for (i = 0; i != n; i++) - { - queue_remove (&m->q, &value, gpr_inf_future (GPR_CLOCK_REALTIME)); - } - gpr_mu_lock (&m->mu); + for (i = 0; i != n; i++) { + queue_remove(&m->q, &value, gpr_inf_future(GPR_CLOCK_REALTIME)); + } + 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_from_micros (1000000, GPR_TIMESPAN)))); - mark_thread_done (m); + gpr_mu_unlock(&m->mu); + GPR_ASSERT( + !queue_remove(&m->q, &value, + gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), + gpr_time_from_micros(1000000, GPR_TIMESPAN)))); + mark_thread_done(m); } /* Increment m->stats_counter m->iterations times, transfer counter value to m->counter, then mark thread as done. */ -static void -statsinc (void *v /*=m*/ ) -{ +static void statsinc(void *v /*=m*/) { struct test *m = v; gpr_int64 i; - for (i = 0; i != m->iterations; i++) - { - gpr_stats_inc (&m->stats_counter, 1); - } - gpr_mu_lock (&m->mu); - m->counter = gpr_stats_read (&m->stats_counter); - gpr_mu_unlock (&m->mu); - mark_thread_done (m); + for (i = 0; i != m->iterations; i++) { + gpr_stats_inc(&m->stats_counter, 1); + } + gpr_mu_lock(&m->mu); + m->counter = gpr_stats_read(&m->stats_counter); + gpr_mu_unlock(&m->mu); + mark_thread_done(m); } /* Increment m->refcount m->iterations times, decrement m->thread_refcount once, and if it reaches zero, set m->event to (void*)1; then mark thread as done. */ -static void -refinc (void *v /*=m*/ ) -{ +static void refinc(void *v /*=m*/) { struct test *m = v; gpr_int64 i; - for (i = 0; i != m->iterations; i++) - { - gpr_ref (&m->refcount); - } - if (gpr_unref (&m->thread_refcount)) - { - gpr_event_set (&m->event, (void *) 1); - } - mark_thread_done (m); + for (i = 0; i != m->iterations; i++) { + gpr_ref(&m->refcount); + } + if (gpr_unref(&m->thread_refcount)) { + gpr_event_set(&m->event, (void *)1); + } + mark_thread_done(m); } /* Wait until m->event is set to (void *)1, then decrement m->refcount m->stats_counter m->iterations times, and ensure that the last decrement caused the counter to reach zero, then mark thread as done. */ -static void -refcheck (void *v /*=m*/ ) -{ +static void refcheck(void *v /*=m*/) { struct test *m = v; gpr_int64 n = m->iterations * m->threads; gpr_int64 i; - GPR_ASSERT (gpr_event_wait (&m->event, gpr_inf_future (GPR_CLOCK_REALTIME)) == (void *) 1); - GPR_ASSERT (gpr_event_get (&m->event) == (void *) 1); - for (i = 1; i != n; i++) - { - GPR_ASSERT (!gpr_unref (&m->refcount)); - m->counter++; - } - GPR_ASSERT (gpr_unref (&m->refcount)); + GPR_ASSERT(gpr_event_wait(&m->event, gpr_inf_future(GPR_CLOCK_REALTIME)) == + (void *)1); + GPR_ASSERT(gpr_event_get(&m->event) == (void *)1); + for (i = 1; i != n; i++) { + GPR_ASSERT(!gpr_unref(&m->refcount)); + m->counter++; + } + GPR_ASSERT(gpr_unref(&m->refcount)); m->counter++; - mark_thread_done (m); + mark_thread_done(m); } /* ------------------------------------------------- */ -int -main (int argc, char *argv[]) -{ - grpc_test_init (argc, argv); - test ("mutex", &inc, NULL, 1); - test ("mutex try", &inctry, NULL, 1); - test ("cv", &inc_by_turns, NULL, 1); - test ("timedcv", &inc_with_1ms_delay, NULL, 1); - test ("queue", &many_producers, &consumer, 10); - test ("stats_counter", &statsinc, NULL, 1); - test ("refcount", &refinc, &refcheck, 1); - test ("timedevent", &inc_with_1ms_delay_event, NULL, 1); +int main(int argc, char *argv[]) { + grpc_test_init(argc, argv); + test("mutex", &inc, NULL, 1); + test("mutex try", &inctry, NULL, 1); + test("cv", &inc_by_turns, NULL, 1); + test("timedcv", &inc_with_1ms_delay, NULL, 1); + test("queue", &many_producers, &consumer, 10); + test("stats_counter", &statsinc, NULL, 1); + test("refcount", &refinc, &refcheck, 1); + test("timedevent", &inc_with_1ms_delay_event, NULL, 1); return 0; } diff --git a/test/core/support/thd_test.c b/test/core/support/thd_test.c index 09303c1958a..faba33c5e8c 100644 --- a/test/core/support/thd_test.c +++ b/test/core/support/thd_test.c @@ -41,8 +41,7 @@ #include #include "test/core/util/test_config.h" -struct test -{ +struct test { gpr_mu mu; int n; int is_done; @@ -50,67 +49,53 @@ struct test }; /* A Thread body. Decrement t->n, and if is becomes zero, set t->done. */ -static void -thd_body (void *v) -{ +static void thd_body(void *v) { struct test *t = v; - gpr_mu_lock (&t->mu); + gpr_mu_lock(&t->mu); t->n--; - if (t->n == 0) - { - t->is_done = 1; - gpr_cv_signal (&t->done_cv); - } - gpr_mu_unlock (&t->mu); + if (t->n == 0) { + t->is_done = 1; + gpr_cv_signal(&t->done_cv); + } + gpr_mu_unlock(&t->mu); } -static void -thd_body_joinable (void *v) -{ -} +static void thd_body_joinable(void *v) {} /* Test that we can create a number of threads and wait for them. */ -static void -test (void) -{ +static void test(void) { int i; gpr_thd_id thd; gpr_thd_id thds[1000]; struct test t; int n = 1000; - gpr_thd_options options = gpr_thd_options_default (); - gpr_mu_init (&t.mu); - gpr_cv_init (&t.done_cv); + gpr_thd_options options = gpr_thd_options_default(); + gpr_mu_init(&t.mu); + gpr_cv_init(&t.done_cv); t.n = n; t.is_done = 0; - for (i = 0; i != n; i++) - { - GPR_ASSERT (gpr_thd_new (&thd, &thd_body, &t, NULL)); - } - gpr_mu_lock (&t.mu); - while (!t.is_done) - { - gpr_cv_wait (&t.done_cv, &t.mu, gpr_inf_future (GPR_CLOCK_REALTIME)); - } - gpr_mu_unlock (&t.mu); - GPR_ASSERT (t.n == 0); - gpr_thd_options_set_joinable (&options); - for (i = 0; i < n; i++) - { - GPR_ASSERT (gpr_thd_new (&thds[i], &thd_body_joinable, NULL, &options)); - } - for (i = 0; i < n; i++) - { - gpr_thd_join (thds[i]); - } + for (i = 0; i != n; i++) { + GPR_ASSERT(gpr_thd_new(&thd, &thd_body, &t, NULL)); + } + gpr_mu_lock(&t.mu); + while (!t.is_done) { + gpr_cv_wait(&t.done_cv, &t.mu, gpr_inf_future(GPR_CLOCK_REALTIME)); + } + gpr_mu_unlock(&t.mu); + GPR_ASSERT(t.n == 0); + gpr_thd_options_set_joinable(&options); + for (i = 0; i < n; i++) { + GPR_ASSERT(gpr_thd_new(&thds[i], &thd_body_joinable, NULL, &options)); + } + for (i = 0; i < n; i++) { + gpr_thd_join(thds[i]); + } } /* ------------------------------------------------- */ -int -main (int argc, char *argv[]) -{ - grpc_test_init (argc, argv); - test (); +int main(int argc, char *argv[]) { + grpc_test_init(argc, argv); + test(); return 0; } diff --git a/test/core/support/time_test.c b/test/core/support/time_test.c index df65b45ddd9..ce35edd83cc 100644 --- a/test/core/support/time_test.c +++ b/test/core/support/time_test.c @@ -43,236 +43,225 @@ #include #include "test/core/util/test_config.h" -static void -to_fp (void *arg, const char *buf, size_t len) -{ - fwrite (buf, 1, len, (FILE *) arg); +static void to_fp(void *arg, const char *buf, size_t len) { + fwrite(buf, 1, len, (FILE *)arg); } /* Convert gpr_uintmax x to ascii base b (2..16), and write with (*writer)(arg, ...), zero padding to "chars" digits). */ -static void -u_to_s (gpr_uintmax x, unsigned base, int chars, void (*writer) (void *arg, const char *buf, size_t len), void *arg) -{ +static void u_to_s(gpr_uintmax x, unsigned base, int chars, + void (*writer)(void *arg, const char *buf, size_t len), + void *arg) { char buf[64]; - char *p = buf + sizeof (buf); - do - { - *--p = "0123456789abcdef"[x % base]; - x /= base; - chars--; - } - while (x != 0 || chars > 0); - (*writer) (arg, p, (size_t) (buf + sizeof (buf) - p)); + char *p = buf + sizeof(buf); + do { + *--p = "0123456789abcdef"[x % base]; + x /= base; + chars--; + } while (x != 0 || chars > 0); + (*writer)(arg, p, (size_t)(buf + sizeof(buf) - p)); } /* Convert gpr_intmax x to ascii base b (2..16), and write with (*writer)(arg, ...), zero padding to "chars" digits). */ -static void -i_to_s (gpr_intmax x, unsigned base, int chars, void (*writer) (void *arg, const char *buf, size_t len), void *arg) -{ - if (x < 0) - { - (*writer) (arg, "-", 1); - u_to_s ((gpr_uintmax) - x, base, chars - 1, writer, arg); - } - else - { - u_to_s ((gpr_uintmax) x, base, chars, writer, arg); - } +static void i_to_s(gpr_intmax x, unsigned base, int chars, + void (*writer)(void *arg, const char *buf, size_t len), + void *arg) { + if (x < 0) { + (*writer)(arg, "-", 1); + u_to_s((gpr_uintmax)-x, base, chars - 1, writer, arg); + } else { + u_to_s((gpr_uintmax)x, base, chars, writer, arg); + } } /* Convert ts to ascii, and write with (*writer)(arg, ...). */ -static void -ts_to_s (gpr_timespec t, void (*writer) (void *arg, const char *buf, size_t len), void *arg) -{ - if (t.tv_sec < 0 && t.tv_nsec != 0) - { - t.tv_sec++; - t.tv_nsec = GPR_NS_PER_SEC - t.tv_nsec; - } - i_to_s (t.tv_sec, 10, 0, writer, arg); - (*writer) (arg, ".", 1); - i_to_s (t.tv_nsec, 10, 9, writer, arg); +static void ts_to_s(gpr_timespec t, + void (*writer)(void *arg, const char *buf, size_t len), + void *arg) { + if (t.tv_sec < 0 && t.tv_nsec != 0) { + t.tv_sec++; + t.tv_nsec = GPR_NS_PER_SEC - t.tv_nsec; + } + i_to_s(t.tv_sec, 10, 0, writer, arg); + (*writer)(arg, ".", 1); + i_to_s(t.tv_nsec, 10, 9, writer, arg); } -static void -test_values (void) -{ +static void test_values(void) { int i; - gpr_timespec x = gpr_time_0 (GPR_CLOCK_REALTIME); - GPR_ASSERT (x.tv_sec == 0 && x.tv_nsec == 0); + gpr_timespec x = gpr_time_0(GPR_CLOCK_REALTIME); + GPR_ASSERT(x.tv_sec == 0 && x.tv_nsec == 0); - x = gpr_inf_future (GPR_CLOCK_REALTIME); - fprintf (stderr, "far future "); - i_to_s (x.tv_sec, 16, 16, &to_fp, stderr); - fprintf (stderr, "\n"); - GPR_ASSERT (x.tv_sec >= INT_MAX); - fprintf (stderr, "far future "); - ts_to_s (x, &to_fp, stderr); - fprintf (stderr, "\n"); + x = gpr_inf_future(GPR_CLOCK_REALTIME); + fprintf(stderr, "far future "); + i_to_s(x.tv_sec, 16, 16, &to_fp, stderr); + fprintf(stderr, "\n"); + GPR_ASSERT(x.tv_sec >= INT_MAX); + fprintf(stderr, "far future "); + ts_to_s(x, &to_fp, stderr); + fprintf(stderr, "\n"); - x = gpr_inf_past (GPR_CLOCK_REALTIME); - fprintf (stderr, "far past "); - i_to_s (x.tv_sec, 16, 16, &to_fp, stderr); - fprintf (stderr, "\n"); - GPR_ASSERT (x.tv_sec <= INT_MIN); - fprintf (stderr, "far past "); - ts_to_s (x, &to_fp, stderr); - fprintf (stderr, "\n"); + x = gpr_inf_past(GPR_CLOCK_REALTIME); + fprintf(stderr, "far past "); + i_to_s(x.tv_sec, 16, 16, &to_fp, stderr); + fprintf(stderr, "\n"); + GPR_ASSERT(x.tv_sec <= INT_MIN); + fprintf(stderr, "far past "); + ts_to_s(x, &to_fp, stderr); + fprintf(stderr, "\n"); - for (i = 1; i != 1000 * 1000 * 1000; i *= 10) - { - x = gpr_time_from_micros (i, GPR_TIMESPAN); - GPR_ASSERT (x.tv_sec == i / GPR_US_PER_SEC && x.tv_nsec == (i % GPR_US_PER_SEC) * GPR_NS_PER_US); - x = gpr_time_from_nanos (i, GPR_TIMESPAN); - GPR_ASSERT (x.tv_sec == i / GPR_NS_PER_SEC && x.tv_nsec == (i % GPR_NS_PER_SEC)); - x = gpr_time_from_millis (i, GPR_TIMESPAN); - GPR_ASSERT (x.tv_sec == i / GPR_MS_PER_SEC && x.tv_nsec == (i % GPR_MS_PER_SEC) * GPR_NS_PER_MS); - } + for (i = 1; i != 1000 * 1000 * 1000; i *= 10) { + x = gpr_time_from_micros(i, GPR_TIMESPAN); + GPR_ASSERT(x.tv_sec == i / GPR_US_PER_SEC && + x.tv_nsec == (i % GPR_US_PER_SEC) * GPR_NS_PER_US); + x = gpr_time_from_nanos(i, GPR_TIMESPAN); + GPR_ASSERT(x.tv_sec == i / GPR_NS_PER_SEC && + x.tv_nsec == (i % GPR_NS_PER_SEC)); + x = gpr_time_from_millis(i, GPR_TIMESPAN); + GPR_ASSERT(x.tv_sec == i / GPR_MS_PER_SEC && + x.tv_nsec == (i % GPR_MS_PER_SEC) * GPR_NS_PER_MS); + } /* Test possible overflow in conversion of -ve values. */ - x = gpr_time_from_micros (-(LONG_MAX - 999997), GPR_TIMESPAN); - GPR_ASSERT (x.tv_sec < 0); - GPR_ASSERT (x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); + x = gpr_time_from_micros(-(LONG_MAX - 999997), GPR_TIMESPAN); + GPR_ASSERT(x.tv_sec < 0); + GPR_ASSERT(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); - x = gpr_time_from_nanos (-(LONG_MAX - 999999997), GPR_TIMESPAN); - GPR_ASSERT (x.tv_sec < 0); - GPR_ASSERT (x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); + x = gpr_time_from_nanos(-(LONG_MAX - 999999997), GPR_TIMESPAN); + GPR_ASSERT(x.tv_sec < 0); + GPR_ASSERT(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); - x = gpr_time_from_millis (-(LONG_MAX - 997), GPR_TIMESPAN); - GPR_ASSERT (x.tv_sec < 0); - GPR_ASSERT (x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); + x = gpr_time_from_millis(-(LONG_MAX - 997), GPR_TIMESPAN); + GPR_ASSERT(x.tv_sec < 0); + GPR_ASSERT(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); /* Test general -ve values. */ - for (i = -1; i > -1000 * 1000 * 1000; i *= 7) - { - x = gpr_time_from_micros (i, GPR_TIMESPAN); - GPR_ASSERT (x.tv_sec * GPR_US_PER_SEC + x.tv_nsec / GPR_NS_PER_US == i); - x = gpr_time_from_nanos (i, GPR_TIMESPAN); - GPR_ASSERT (x.tv_sec * GPR_NS_PER_SEC + x.tv_nsec == i); - x = gpr_time_from_millis (i, GPR_TIMESPAN); - GPR_ASSERT (x.tv_sec * GPR_MS_PER_SEC + x.tv_nsec / GPR_NS_PER_MS == i); - } + for (i = -1; i > -1000 * 1000 * 1000; i *= 7) { + x = gpr_time_from_micros(i, GPR_TIMESPAN); + GPR_ASSERT(x.tv_sec * GPR_US_PER_SEC + x.tv_nsec / GPR_NS_PER_US == i); + x = gpr_time_from_nanos(i, GPR_TIMESPAN); + GPR_ASSERT(x.tv_sec * GPR_NS_PER_SEC + x.tv_nsec == i); + x = gpr_time_from_millis(i, GPR_TIMESPAN); + GPR_ASSERT(x.tv_sec * GPR_MS_PER_SEC + x.tv_nsec / GPR_NS_PER_MS == i); + } } -static void -test_add_sub (void) -{ +static void test_add_sub(void) { int i; int j; int k; /* Basic addition and subtraction. */ - for (i = -100; i <= 100; i++) - { - for (j = -100; j <= 100; j++) - { - for (k = 1; k <= 10000000; k *= 10) - { - int sum = i + j; - int diff = i - j; - gpr_timespec it = gpr_time_from_micros (i * k, GPR_TIMESPAN); - gpr_timespec jt = gpr_time_from_micros (j * k, GPR_TIMESPAN); - gpr_timespec sumt = gpr_time_add (it, jt); - gpr_timespec difft = gpr_time_sub (it, jt); - if (gpr_time_cmp (gpr_time_from_micros (sum * k, GPR_TIMESPAN), sumt) != 0) - { - fprintf (stderr, "i %d j %d sum %d sumt ", i, j, sum); - ts_to_s (sumt, &to_fp, stderr); - fprintf (stderr, "\n"); - GPR_ASSERT (0); - } - if (gpr_time_cmp (gpr_time_from_micros (diff * k, GPR_TIMESPAN), difft) != 0) - { - fprintf (stderr, "i %d j %d diff %d diff ", i, j, diff); - ts_to_s (sumt, &to_fp, stderr); - fprintf (stderr, "\n"); - GPR_ASSERT (0); - } - } - } + for (i = -100; i <= 100; i++) { + for (j = -100; j <= 100; j++) { + for (k = 1; k <= 10000000; k *= 10) { + int sum = i + j; + int diff = i - j; + gpr_timespec it = gpr_time_from_micros(i * k, GPR_TIMESPAN); + gpr_timespec jt = gpr_time_from_micros(j * k, GPR_TIMESPAN); + gpr_timespec sumt = gpr_time_add(it, jt); + gpr_timespec difft = gpr_time_sub(it, jt); + if (gpr_time_cmp(gpr_time_from_micros(sum * k, GPR_TIMESPAN), sumt) != + 0) { + fprintf(stderr, "i %d j %d sum %d sumt ", i, j, sum); + ts_to_s(sumt, &to_fp, stderr); + fprintf(stderr, "\n"); + GPR_ASSERT(0); + } + if (gpr_time_cmp(gpr_time_from_micros(diff * k, GPR_TIMESPAN), difft) != + 0) { + fprintf(stderr, "i %d j %d diff %d diff ", i, j, diff); + ts_to_s(sumt, &to_fp, stderr); + fprintf(stderr, "\n"); + GPR_ASSERT(0); + } + } } + } } -static void -test_overflow (void) -{ +static void test_overflow(void) { /* overflow */ - gpr_timespec x = gpr_time_from_micros (1, GPR_TIMESPAN); - do - { - x = gpr_time_add (x, x); - } - while (gpr_time_cmp (x, gpr_inf_future (GPR_TIMESPAN)) < 0); - GPR_ASSERT (gpr_time_cmp (x, gpr_inf_future (GPR_TIMESPAN)) == 0); - x = gpr_time_from_micros (-1, GPR_TIMESPAN); - do - { - x = gpr_time_add (x, x); - } - while (gpr_time_cmp (x, gpr_inf_past (GPR_TIMESPAN)) > 0); - GPR_ASSERT (gpr_time_cmp (x, gpr_inf_past (GPR_TIMESPAN)) == 0); + gpr_timespec x = gpr_time_from_micros(1, GPR_TIMESPAN); + do { + x = gpr_time_add(x, x); + } while (gpr_time_cmp(x, gpr_inf_future(GPR_TIMESPAN)) < 0); + GPR_ASSERT(gpr_time_cmp(x, gpr_inf_future(GPR_TIMESPAN)) == 0); + x = gpr_time_from_micros(-1, GPR_TIMESPAN); + do { + x = gpr_time_add(x, x); + } while (gpr_time_cmp(x, gpr_inf_past(GPR_TIMESPAN)) > 0); + GPR_ASSERT(gpr_time_cmp(x, gpr_inf_past(GPR_TIMESPAN)) == 0); } -static void -test_sticky_infinities (void) -{ +static void test_sticky_infinities(void) { int i; int j; int k; gpr_timespec infinity[2]; gpr_timespec addend[3]; - infinity[0] = gpr_inf_future (GPR_TIMESPAN); - infinity[1] = gpr_inf_past (GPR_TIMESPAN); - addend[0] = gpr_inf_future (GPR_TIMESPAN); - addend[1] = gpr_inf_past (GPR_TIMESPAN); - addend[2] = gpr_time_0 (GPR_TIMESPAN); + infinity[0] = gpr_inf_future(GPR_TIMESPAN); + infinity[1] = gpr_inf_past(GPR_TIMESPAN); + addend[0] = gpr_inf_future(GPR_TIMESPAN); + addend[1] = gpr_inf_past(GPR_TIMESPAN); + addend[2] = gpr_time_0(GPR_TIMESPAN); /* Infinities are sticky */ - for (i = 0; i != sizeof (infinity) / sizeof (infinity[0]); i++) - { - for (j = 0; j != sizeof (addend) / sizeof (addend[0]); j++) - { - gpr_timespec x = gpr_time_add (infinity[i], addend[j]); - GPR_ASSERT (gpr_time_cmp (x, infinity[i]) == 0); - x = gpr_time_sub (infinity[i], addend[j]); - GPR_ASSERT (gpr_time_cmp (x, infinity[i]) == 0); - } - for (k = -200; k <= 200; k++) - { - gpr_timespec y = gpr_time_from_micros (k * 100000, GPR_TIMESPAN); - gpr_timespec x = gpr_time_add (infinity[i], y); - GPR_ASSERT (gpr_time_cmp (x, infinity[i]) == 0); - x = gpr_time_sub (infinity[i], y); - GPR_ASSERT (gpr_time_cmp (x, infinity[i]) == 0); - } + for (i = 0; i != sizeof(infinity) / sizeof(infinity[0]); i++) { + for (j = 0; j != sizeof(addend) / sizeof(addend[0]); j++) { + gpr_timespec x = gpr_time_add(infinity[i], addend[j]); + GPR_ASSERT(gpr_time_cmp(x, infinity[i]) == 0); + x = gpr_time_sub(infinity[i], addend[j]); + GPR_ASSERT(gpr_time_cmp(x, infinity[i]) == 0); + } + for (k = -200; k <= 200; k++) { + gpr_timespec y = gpr_time_from_micros(k * 100000, GPR_TIMESPAN); + gpr_timespec x = gpr_time_add(infinity[i], y); + GPR_ASSERT(gpr_time_cmp(x, infinity[i]) == 0); + x = gpr_time_sub(infinity[i], y); + GPR_ASSERT(gpr_time_cmp(x, infinity[i]) == 0); } + } } -static void -test_similar (void) -{ - GPR_ASSERT (1 == gpr_time_similar (gpr_inf_future (GPR_TIMESPAN), gpr_inf_future (GPR_TIMESPAN), gpr_time_0 (GPR_TIMESPAN))); - GPR_ASSERT (1 == gpr_time_similar (gpr_inf_past (GPR_TIMESPAN), gpr_inf_past (GPR_TIMESPAN), gpr_time_0 (GPR_TIMESPAN))); - GPR_ASSERT (0 == gpr_time_similar (gpr_inf_past (GPR_TIMESPAN), gpr_inf_future (GPR_TIMESPAN), gpr_time_0 (GPR_TIMESPAN))); - GPR_ASSERT (0 == gpr_time_similar (gpr_inf_future (GPR_TIMESPAN), gpr_inf_past (GPR_TIMESPAN), gpr_time_0 (GPR_TIMESPAN))); - GPR_ASSERT (1 == gpr_time_similar (gpr_time_from_micros (10, GPR_TIMESPAN), gpr_time_from_micros (10, GPR_TIMESPAN), gpr_time_0 (GPR_TIMESPAN))); - GPR_ASSERT (1 == gpr_time_similar (gpr_time_from_micros (10, GPR_TIMESPAN), gpr_time_from_micros (15, GPR_TIMESPAN), gpr_time_from_micros (10, GPR_TIMESPAN))); - GPR_ASSERT (1 == gpr_time_similar (gpr_time_from_micros (15, GPR_TIMESPAN), gpr_time_from_micros (10, GPR_TIMESPAN), gpr_time_from_micros (10, GPR_TIMESPAN))); - GPR_ASSERT (0 == gpr_time_similar (gpr_time_from_micros (10, GPR_TIMESPAN), gpr_time_from_micros (25, GPR_TIMESPAN), gpr_time_from_micros (10, GPR_TIMESPAN))); - GPR_ASSERT (0 == gpr_time_similar (gpr_time_from_micros (25, GPR_TIMESPAN), gpr_time_from_micros (10, GPR_TIMESPAN), gpr_time_from_micros (10, GPR_TIMESPAN))); +static void test_similar(void) { + GPR_ASSERT(1 == gpr_time_similar(gpr_inf_future(GPR_TIMESPAN), + gpr_inf_future(GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + GPR_ASSERT(1 == gpr_time_similar(gpr_inf_past(GPR_TIMESPAN), + gpr_inf_past(GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + GPR_ASSERT(0 == gpr_time_similar(gpr_inf_past(GPR_TIMESPAN), + gpr_inf_future(GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + GPR_ASSERT(0 == gpr_time_similar(gpr_inf_future(GPR_TIMESPAN), + gpr_inf_past(GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + GPR_ASSERT(1 == gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + GPR_ASSERT(1 == gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(15, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN))); + GPR_ASSERT(1 == gpr_time_similar(gpr_time_from_micros(15, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN))); + GPR_ASSERT(0 == gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(25, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN))); + GPR_ASSERT(0 == gpr_time_similar(gpr_time_from_micros(25, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN))); } -int -main (int argc, char *argv[]) -{ - grpc_test_init (argc, argv); +int main(int argc, char *argv[]) { + grpc_test_init(argc, argv); - test_values (); - test_add_sub (); - test_overflow (); - test_sticky_infinities (); - test_similar (); + test_values(); + test_add_sub(); + test_overflow(); + test_sticky_infinities(); + test_similar(); return 0; } diff --git a/test/core/support/tls_test.c b/test/core/support/tls_test.c index 9c5cd54d63f..0a3c28417f6 100644 --- a/test/core/support/tls_test.c +++ b/test/core/support/tls_test.c @@ -43,48 +43,41 @@ #define NUM_THREADS 100 -GPR_TLS_DECL (test_var); +GPR_TLS_DECL(test_var); -static void -thd_body (void *arg) -{ +static void thd_body(void *arg) { gpr_intptr i; - GPR_ASSERT (gpr_tls_get (&test_var) == 0); + GPR_ASSERT(gpr_tls_get(&test_var) == 0); - for (i = 0; i < 10000000; i++) - { - gpr_tls_set (&test_var, i); - GPR_ASSERT (gpr_tls_get (&test_var) == i); - } - gpr_tls_set (&test_var, 0); + for (i = 0; i < 10000000; i++) { + gpr_tls_set(&test_var, i); + GPR_ASSERT(gpr_tls_get(&test_var) == i); + } + gpr_tls_set(&test_var, 0); } /* ------------------------------------------------- */ -int -main (int argc, char *argv[]) -{ - gpr_thd_options opt = gpr_thd_options_default (); +int main(int argc, char *argv[]) { + gpr_thd_options opt = gpr_thd_options_default(); int i; gpr_thd_id threads[NUM_THREADS]; - grpc_test_init (argc, argv); + grpc_test_init(argc, argv); - gpr_tls_init (&test_var); + gpr_tls_init(&test_var); - gpr_thd_options_set_joinable (&opt); + gpr_thd_options_set_joinable(&opt); - for (i = 0; i < NUM_THREADS; i++) - { - gpr_thd_new (&threads[i], thd_body, NULL, &opt); - } - for (i = 0; i < NUM_THREADS; i++) - { - gpr_thd_join (threads[i]); - } + for (i = 0; i < NUM_THREADS; i++) { + gpr_thd_new(&threads[i], thd_body, NULL, &opt); + } + for (i = 0; i < NUM_THREADS; i++) { + gpr_thd_join(threads[i]); + } - gpr_tls_destroy (&test_var); + gpr_tls_destroy(&test_var); return 0; } diff --git a/test/core/support/useful_test.c b/test/core/support/useful_test.c index 49a1bd353e8..cbf4f02e267 100644 --- a/test/core/support/useful_test.c +++ b/test/core/support/useful_test.c @@ -36,40 +36,38 @@ #include #include "test/core/util/test_config.h" -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { int four[4]; int five[5]; gpr_uint32 bitset = 0; - grpc_test_init (argc, argv); + grpc_test_init(argc, argv); - GPR_ASSERT (GPR_MIN (1, 2) == 1); - GPR_ASSERT (GPR_MAX (1, 2) == 2); - GPR_ASSERT (GPR_MIN (2, 1) == 1); - GPR_ASSERT (GPR_MAX (2, 1) == 2); - GPR_ASSERT (GPR_CLAMP (1, 0, 2) == 1); - GPR_ASSERT (GPR_CLAMP (0, 0, 2) == 0); - GPR_ASSERT (GPR_CLAMP (2, 0, 2) == 2); - GPR_ASSERT (GPR_CLAMP (-1, 0, 2) == 0); - GPR_ASSERT (GPR_CLAMP (3, 0, 2) == 2); - GPR_ASSERT (GPR_ROTL ((gpr_uint32) 0x80000001, 1) == 3); - GPR_ASSERT (GPR_ROTR ((gpr_uint32) 0x80000001, 1) == 0xc0000000); - GPR_ASSERT (GPR_ARRAY_SIZE (four) == 4); - GPR_ASSERT (GPR_ARRAY_SIZE (five) == 5); + GPR_ASSERT(GPR_MIN(1, 2) == 1); + GPR_ASSERT(GPR_MAX(1, 2) == 2); + GPR_ASSERT(GPR_MIN(2, 1) == 1); + GPR_ASSERT(GPR_MAX(2, 1) == 2); + GPR_ASSERT(GPR_CLAMP(1, 0, 2) == 1); + GPR_ASSERT(GPR_CLAMP(0, 0, 2) == 0); + GPR_ASSERT(GPR_CLAMP(2, 0, 2) == 2); + GPR_ASSERT(GPR_CLAMP(-1, 0, 2) == 0); + GPR_ASSERT(GPR_CLAMP(3, 0, 2) == 2); + GPR_ASSERT(GPR_ROTL((gpr_uint32)0x80000001, 1) == 3); + GPR_ASSERT(GPR_ROTR((gpr_uint32)0x80000001, 1) == 0xc0000000); + GPR_ASSERT(GPR_ARRAY_SIZE(four) == 4); + GPR_ASSERT(GPR_ARRAY_SIZE(five) == 5); - GPR_ASSERT (GPR_BITCOUNT ((1u << 31) - 1) == 31); - GPR_ASSERT (GPR_BITCOUNT (1u << 3) == 1); - GPR_ASSERT (GPR_BITCOUNT (0) == 0); + GPR_ASSERT(GPR_BITCOUNT((1u << 31) - 1) == 31); + GPR_ASSERT(GPR_BITCOUNT(1u << 3) == 1); + GPR_ASSERT(GPR_BITCOUNT(0) == 0); - GPR_ASSERT (GPR_BITSET (&bitset, 3) == 8); - GPR_ASSERT (GPR_BITCOUNT (bitset) == 1); - GPR_ASSERT (GPR_BITGET (bitset, 3) == 1); - GPR_ASSERT (GPR_BITSET (&bitset, 1) == 10); - GPR_ASSERT (GPR_BITCOUNT (bitset) == 2); - GPR_ASSERT (GPR_BITCLEAR (&bitset, 3) == 2); - GPR_ASSERT (GPR_BITCOUNT (bitset) == 1); - GPR_ASSERT (GPR_BITGET (bitset, 3) == 0); + GPR_ASSERT(GPR_BITSET(&bitset, 3) == 8); + GPR_ASSERT(GPR_BITCOUNT(bitset) == 1); + GPR_ASSERT(GPR_BITGET(bitset, 3) == 1); + GPR_ASSERT(GPR_BITSET(&bitset, 1) == 10); + GPR_ASSERT(GPR_BITCOUNT(bitset) == 2); + GPR_ASSERT(GPR_BITCLEAR(&bitset, 3) == 2); + GPR_ASSERT(GPR_BITCOUNT(bitset) == 1); + GPR_ASSERT(GPR_BITGET(bitset, 3) == 0); return 0; } diff --git a/test/core/surface/byte_buffer_reader_test.c b/test/core/surface/byte_buffer_reader_test.c index dd56ba86e48..560e0ac7b23 100644 --- a/test/core/surface/byte_buffer_reader_test.c +++ b/test/core/surface/byte_buffer_reader_test.c @@ -48,79 +48,72 @@ #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) -static void -test_read_one_slice (void) -{ +static void test_read_one_slice(void) { gpr_slice slice; grpc_byte_buffer *buffer; grpc_byte_buffer_reader reader; gpr_slice first_slice, second_slice; int first_code, second_code; - LOG_TEST ("test_read_one_slice"); - slice = gpr_slice_from_copied_string ("test"); - buffer = grpc_raw_byte_buffer_create (&slice, 1); - gpr_slice_unref (slice); - grpc_byte_buffer_reader_init (&reader, buffer); - first_code = grpc_byte_buffer_reader_next (&reader, &first_slice); - GPR_ASSERT (first_code != 0); - GPR_ASSERT (memcmp (GPR_SLICE_START_PTR (first_slice), "test", 4) == 0); - gpr_slice_unref (first_slice); - second_code = grpc_byte_buffer_reader_next (&reader, &second_slice); - GPR_ASSERT (second_code == 0); - grpc_byte_buffer_destroy (buffer); + LOG_TEST("test_read_one_slice"); + slice = gpr_slice_from_copied_string("test"); + buffer = grpc_raw_byte_buffer_create(&slice, 1); + gpr_slice_unref(slice); + grpc_byte_buffer_reader_init(&reader, buffer); + first_code = grpc_byte_buffer_reader_next(&reader, &first_slice); + GPR_ASSERT(first_code != 0); + GPR_ASSERT(memcmp(GPR_SLICE_START_PTR(first_slice), "test", 4) == 0); + gpr_slice_unref(first_slice); + second_code = grpc_byte_buffer_reader_next(&reader, &second_slice); + GPR_ASSERT(second_code == 0); + grpc_byte_buffer_destroy(buffer); } -static void -test_read_one_slice_malloc (void) -{ +static void test_read_one_slice_malloc(void) { gpr_slice slice; grpc_byte_buffer *buffer; grpc_byte_buffer_reader reader; gpr_slice first_slice, second_slice; int first_code, second_code; - LOG_TEST ("test_read_one_slice_malloc"); - slice = gpr_slice_malloc (4); - memcpy (GPR_SLICE_START_PTR (slice), "test", 4); - buffer = grpc_raw_byte_buffer_create (&slice, 1); - gpr_slice_unref (slice); - grpc_byte_buffer_reader_init (&reader, buffer); - first_code = grpc_byte_buffer_reader_next (&reader, &first_slice); - GPR_ASSERT (first_code != 0); - GPR_ASSERT (memcmp (GPR_SLICE_START_PTR (first_slice), "test", 4) == 0); - gpr_slice_unref (first_slice); - second_code = grpc_byte_buffer_reader_next (&reader, &second_slice); - GPR_ASSERT (second_code == 0); - grpc_byte_buffer_destroy (buffer); + LOG_TEST("test_read_one_slice_malloc"); + slice = gpr_slice_malloc(4); + memcpy(GPR_SLICE_START_PTR(slice), "test", 4); + buffer = grpc_raw_byte_buffer_create(&slice, 1); + gpr_slice_unref(slice); + grpc_byte_buffer_reader_init(&reader, buffer); + first_code = grpc_byte_buffer_reader_next(&reader, &first_slice); + GPR_ASSERT(first_code != 0); + GPR_ASSERT(memcmp(GPR_SLICE_START_PTR(first_slice), "test", 4) == 0); + gpr_slice_unref(first_slice); + second_code = grpc_byte_buffer_reader_next(&reader, &second_slice); + GPR_ASSERT(second_code == 0); + grpc_byte_buffer_destroy(buffer); } -static void -test_read_none_compressed_slice (void) -{ +static void test_read_none_compressed_slice(void) { gpr_slice slice; grpc_byte_buffer *buffer; grpc_byte_buffer_reader reader; gpr_slice first_slice, second_slice; int first_code, second_code; - LOG_TEST ("test_read_none_compressed_slice"); - slice = gpr_slice_from_copied_string ("test"); - buffer = grpc_raw_byte_buffer_create (&slice, 1); - gpr_slice_unref (slice); - grpc_byte_buffer_reader_init (&reader, buffer); - first_code = grpc_byte_buffer_reader_next (&reader, &first_slice); - GPR_ASSERT (first_code != 0); - GPR_ASSERT (memcmp (GPR_SLICE_START_PTR (first_slice), "test", 4) == 0); - gpr_slice_unref (first_slice); - second_code = grpc_byte_buffer_reader_next (&reader, &second_slice); - GPR_ASSERT (second_code == 0); - grpc_byte_buffer_destroy (buffer); + LOG_TEST("test_read_none_compressed_slice"); + slice = gpr_slice_from_copied_string("test"); + buffer = grpc_raw_byte_buffer_create(&slice, 1); + gpr_slice_unref(slice); + grpc_byte_buffer_reader_init(&reader, buffer); + first_code = grpc_byte_buffer_reader_next(&reader, &first_slice); + GPR_ASSERT(first_code != 0); + GPR_ASSERT(memcmp(GPR_SLICE_START_PTR(first_slice), "test", 4) == 0); + gpr_slice_unref(first_slice); + second_code = grpc_byte_buffer_reader_next(&reader, &second_slice); + GPR_ASSERT(second_code == 0); + grpc_byte_buffer_destroy(buffer); } -static void -read_compressed_slice (grpc_compression_algorithm algorithm, size_t input_size) -{ +static void read_compressed_slice(grpc_compression_algorithm algorithm, + size_t input_size) { gpr_slice input_slice; gpr_slice_buffer sliceb_in; gpr_slice_buffer sliceb_out; @@ -129,80 +122,76 @@ read_compressed_slice (grpc_compression_algorithm algorithm, size_t input_size) gpr_slice read_slice; size_t read_count = 0; - gpr_slice_buffer_init (&sliceb_in); - gpr_slice_buffer_init (&sliceb_out); - - input_slice = gpr_slice_malloc (input_size); - memset (GPR_SLICE_START_PTR (input_slice), 'a', input_size); - gpr_slice_buffer_add (&sliceb_in, input_slice); /* takes ownership */ - GPR_ASSERT (grpc_msg_compress (algorithm, &sliceb_in, &sliceb_out)); - - buffer = grpc_raw_compressed_byte_buffer_create (sliceb_out.slices, sliceb_out.count, algorithm); - grpc_byte_buffer_reader_init (&reader, buffer); - - while (grpc_byte_buffer_reader_next (&reader, &read_slice)) - { - GPR_ASSERT (memcmp (GPR_SLICE_START_PTR (read_slice), GPR_SLICE_START_PTR (input_slice) + read_count, GPR_SLICE_LENGTH (read_slice)) == 0); - read_count += GPR_SLICE_LENGTH (read_slice); - gpr_slice_unref (read_slice); - } - GPR_ASSERT (read_count == input_size); - grpc_byte_buffer_reader_destroy (&reader); - grpc_byte_buffer_destroy (buffer); - gpr_slice_buffer_destroy (&sliceb_out); - gpr_slice_buffer_destroy (&sliceb_in); + gpr_slice_buffer_init(&sliceb_in); + gpr_slice_buffer_init(&sliceb_out); + + input_slice = gpr_slice_malloc(input_size); + memset(GPR_SLICE_START_PTR(input_slice), 'a', input_size); + gpr_slice_buffer_add(&sliceb_in, input_slice); /* takes ownership */ + GPR_ASSERT(grpc_msg_compress(algorithm, &sliceb_in, &sliceb_out)); + + buffer = grpc_raw_compressed_byte_buffer_create(sliceb_out.slices, + sliceb_out.count, algorithm); + grpc_byte_buffer_reader_init(&reader, buffer); + + while (grpc_byte_buffer_reader_next(&reader, &read_slice)) { + GPR_ASSERT(memcmp(GPR_SLICE_START_PTR(read_slice), + GPR_SLICE_START_PTR(input_slice) + read_count, + GPR_SLICE_LENGTH(read_slice)) == 0); + read_count += GPR_SLICE_LENGTH(read_slice); + gpr_slice_unref(read_slice); + } + GPR_ASSERT(read_count == input_size); + grpc_byte_buffer_reader_destroy(&reader); + grpc_byte_buffer_destroy(buffer); + gpr_slice_buffer_destroy(&sliceb_out); + gpr_slice_buffer_destroy(&sliceb_in); } -static void -test_read_gzip_compressed_slice (void) -{ +static void test_read_gzip_compressed_slice(void) { const size_t INPUT_SIZE = 2048; - LOG_TEST ("test_read_gzip_compressed_slice"); - read_compressed_slice (GRPC_COMPRESS_GZIP, INPUT_SIZE); + LOG_TEST("test_read_gzip_compressed_slice"); + read_compressed_slice(GRPC_COMPRESS_GZIP, INPUT_SIZE); } -static void -test_read_deflate_compressed_slice (void) -{ +static void test_read_deflate_compressed_slice(void) { const size_t INPUT_SIZE = 2048; - LOG_TEST ("test_read_deflate_compressed_slice"); - read_compressed_slice (GRPC_COMPRESS_DEFLATE, INPUT_SIZE); + LOG_TEST("test_read_deflate_compressed_slice"); + read_compressed_slice(GRPC_COMPRESS_DEFLATE, INPUT_SIZE); } -static void -test_byte_buffer_from_reader (void) -{ +static void test_byte_buffer_from_reader(void) { gpr_slice slice; grpc_byte_buffer *buffer, *buffer_from_reader; grpc_byte_buffer_reader reader; - LOG_TEST ("test_byte_buffer_from_reader"); - slice = gpr_slice_malloc (4); - memcpy (GPR_SLICE_START_PTR (slice), "test", 4); - buffer = grpc_raw_byte_buffer_create (&slice, 1); - gpr_slice_unref (slice); - grpc_byte_buffer_reader_init (&reader, buffer); - - buffer_from_reader = grpc_raw_byte_buffer_from_reader (&reader); - GPR_ASSERT (buffer->type == buffer_from_reader->type); - GPR_ASSERT (buffer_from_reader->data.raw.compression == GRPC_COMPRESS_NONE); - GPR_ASSERT (buffer_from_reader->data.raw.slice_buffer.count == 1); - GPR_ASSERT (memcmp (GPR_SLICE_START_PTR (buffer_from_reader->data.raw.slice_buffer.slices[0]), "test", 4) == 0); - - grpc_byte_buffer_destroy (buffer); - grpc_byte_buffer_destroy (buffer_from_reader); + LOG_TEST("test_byte_buffer_from_reader"); + slice = gpr_slice_malloc(4); + memcpy(GPR_SLICE_START_PTR(slice), "test", 4); + buffer = grpc_raw_byte_buffer_create(&slice, 1); + gpr_slice_unref(slice); + grpc_byte_buffer_reader_init(&reader, buffer); + + buffer_from_reader = grpc_raw_byte_buffer_from_reader(&reader); + GPR_ASSERT(buffer->type == buffer_from_reader->type); + GPR_ASSERT(buffer_from_reader->data.raw.compression == GRPC_COMPRESS_NONE); + GPR_ASSERT(buffer_from_reader->data.raw.slice_buffer.count == 1); + GPR_ASSERT(memcmp(GPR_SLICE_START_PTR( + buffer_from_reader->data.raw.slice_buffer.slices[0]), + "test", 4) == 0); + + grpc_byte_buffer_destroy(buffer); + grpc_byte_buffer_destroy(buffer_from_reader); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_read_one_slice (); - test_read_one_slice_malloc (); - test_read_none_compressed_slice (); - test_read_gzip_compressed_slice (); - test_read_deflate_compressed_slice (); - test_byte_buffer_from_reader (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_read_one_slice(); + test_read_one_slice_malloc(); + test_read_none_compressed_slice(); + test_read_gzip_compressed_slice(); + test_read_deflate_compressed_slice(); + test_byte_buffer_from_reader(); return 0; } diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index de7f3b615c1..3209bc5bdf3 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -43,159 +43,141 @@ #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) -static void * -create_test_tag (void) -{ +static void *create_test_tag(void) { static gpr_intptr i = 0; - return (void *) (++i); + return (void *)(++i); } /* helper for tests to shutdown correctly and tersely */ -static void -shutdown_and_destroy (grpc_completion_queue * cc) -{ +static void shutdown_and_destroy(grpc_completion_queue *cc) { grpc_event ev; - grpc_completion_queue_shutdown (cc); - ev = grpc_completion_queue_next (cc, gpr_inf_past (GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT (ev.type == GRPC_QUEUE_SHUTDOWN); - grpc_completion_queue_destroy (cc); + grpc_completion_queue_shutdown(cc); + ev = grpc_completion_queue_next(cc, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); + grpc_completion_queue_destroy(cc); } /* ensure we can create and destroy a completion channel */ -static void -test_no_op (void) -{ - LOG_TEST ("test_no_op"); - shutdown_and_destroy (grpc_completion_queue_create (NULL)); +static void test_no_op(void) { + LOG_TEST("test_no_op"); + shutdown_and_destroy(grpc_completion_queue_create(NULL)); } -static void -test_wait_empty (void) -{ +static void test_wait_empty(void) { grpc_completion_queue *cc; grpc_event event; - LOG_TEST ("test_wait_empty"); + LOG_TEST("test_wait_empty"); - cc = grpc_completion_queue_create (NULL); - event = grpc_completion_queue_next (cc, gpr_now (GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT (event.type == GRPC_QUEUE_TIMEOUT); - shutdown_and_destroy (cc); + cc = grpc_completion_queue_create(NULL); + event = grpc_completion_queue_next(cc, gpr_now(GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT(event.type == GRPC_QUEUE_TIMEOUT); + shutdown_and_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(grpc_exec_ctx *exec_ctx, void *arg, + grpc_cq_completion *c) {} -static void -test_cq_end_op (void) -{ +static void test_cq_end_op(void) { grpc_event ev; grpc_completion_queue *cc; grpc_cq_completion completion; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - void *tag = create_test_tag (); + void *tag = create_test_tag(); - LOG_TEST ("test_cq_end_op"); + LOG_TEST("test_cq_end_op"); - cc = grpc_completion_queue_create (NULL); + cc = grpc_completion_queue_create(NULL); - grpc_cq_begin_op (cc); - grpc_cq_end_op (&exec_ctx, cc, tag, 1, do_nothing_end_completion, NULL, &completion); + grpc_cq_begin_op(cc); + grpc_cq_end_op(&exec_ctx, cc, tag, 1, 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); - GPR_ASSERT (ev.tag == tag); - GPR_ASSERT (ev.success); + ev = grpc_completion_queue_next(cc, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + GPR_ASSERT(ev.tag == tag); + GPR_ASSERT(ev.success); - shutdown_and_destroy (cc); - GPR_ASSERT (grpc_closure_list_empty (closure_list)); + shutdown_and_destroy(cc); + GPR_ASSERT(grpc_closure_list_empty(closure_list)); } -static void -test_shutdown_then_next_polling (void) -{ +static void test_shutdown_then_next_polling(void) { grpc_completion_queue *cc; grpc_event event; - LOG_TEST ("test_shutdown_then_next_polling"); - - cc = grpc_completion_queue_create (NULL); - grpc_completion_queue_shutdown (cc); - event = grpc_completion_queue_next (cc, gpr_inf_past (GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT (event.type == GRPC_QUEUE_SHUTDOWN); - grpc_completion_queue_destroy (cc); + LOG_TEST("test_shutdown_then_next_polling"); + + cc = grpc_completion_queue_create(NULL); + grpc_completion_queue_shutdown(cc); + event = + grpc_completion_queue_next(cc, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT(event.type == GRPC_QUEUE_SHUTDOWN); + grpc_completion_queue_destroy(cc); } -static void -test_shutdown_then_next_with_timeout (void) -{ +static void test_shutdown_then_next_with_timeout(void) { grpc_completion_queue *cc; grpc_event event; - LOG_TEST ("test_shutdown_then_next_with_timeout"); - - cc = grpc_completion_queue_create (NULL); - grpc_completion_queue_shutdown (cc); - event = grpc_completion_queue_next (cc, gpr_inf_future (GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT (event.type == GRPC_QUEUE_SHUTDOWN); - grpc_completion_queue_destroy (cc); + LOG_TEST("test_shutdown_then_next_with_timeout"); + + cc = grpc_completion_queue_create(NULL); + grpc_completion_queue_shutdown(cc); + event = + grpc_completion_queue_next(cc, gpr_inf_future(GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT(event.type == GRPC_QUEUE_SHUTDOWN); + grpc_completion_queue_destroy(cc); } -static void -test_pluck (void) -{ +static void test_pluck(void) { grpc_event ev; grpc_completion_queue *cc; void *tags[128]; - grpc_cq_completion completions[GPR_ARRAY_SIZE (tags)]; + grpc_cq_completion completions[GPR_ARRAY_SIZE(tags)]; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; unsigned i, j; - LOG_TEST ("test_pluck"); - - for (i = 0; i < GPR_ARRAY_SIZE (tags); i++) - { - tags[i] = create_test_tag (); - for (j = 0; j < i; j++) - { - GPR_ASSERT (tags[i] != tags[j]); - } - } - - cc = grpc_completion_queue_create (NULL); - - for (i = 0; i < GPR_ARRAY_SIZE (tags); i++) - { - grpc_cq_begin_op (cc); - grpc_cq_end_op (&exec_ctx, cc, tags[i], 1, do_nothing_end_completion, NULL, &completions[i]); - } - - for (i = 0; i < GPR_ARRAY_SIZE (tags); i++) - { - ev = grpc_completion_queue_pluck (cc, tags[i], gpr_inf_past (GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT (ev.tag == tags[i]); - } - - for (i = 0; i < GPR_ARRAY_SIZE (tags); i++) - { - grpc_cq_begin_op (cc); - grpc_cq_end_op (&exec_ctx, cc, tags[i], 1, do_nothing_end_completion, NULL, &completions[i]); - } + LOG_TEST("test_pluck"); - for (i = 0; i < GPR_ARRAY_SIZE (tags); i++) - { - ev = grpc_completion_queue_pluck (cc, tags[GPR_ARRAY_SIZE (tags) - i - 1], gpr_inf_past (GPR_CLOCK_REALTIME), NULL); - GPR_ASSERT (ev.tag == tags[GPR_ARRAY_SIZE (tags) - i - 1]); + for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { + tags[i] = create_test_tag(); + for (j = 0; j < i; j++) { + GPR_ASSERT(tags[i] != tags[j]); } - - shutdown_and_destroy (cc); - GPR_ASSERT (grpc_closure_list_empty (closure_list)); + } + + cc = grpc_completion_queue_create(NULL); + + for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { + grpc_cq_begin_op(cc); + grpc_cq_end_op(&exec_ctx, cc, tags[i], 1, do_nothing_end_completion, NULL, + &completions[i]); + } + + for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { + ev = grpc_completion_queue_pluck(cc, tags[i], + gpr_inf_past(GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT(ev.tag == tags[i]); + } + + for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { + grpc_cq_begin_op(cc); + grpc_cq_end_op(&exec_ctx, cc, tags[i], 1, do_nothing_end_completion, NULL, + &completions[i]); + } + + for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { + ev = grpc_completion_queue_pluck(cc, tags[GPR_ARRAY_SIZE(tags) - i - 1], + gpr_inf_past(GPR_CLOCK_REALTIME), NULL); + GPR_ASSERT(ev.tag == tags[GPR_ARRAY_SIZE(tags) - i - 1]); + } + + shutdown_and_destroy(cc); + GPR_ASSERT(grpc_closure_list_empty(closure_list)); } #define TEST_THREAD_EVENTS 10000 -typedef struct test_thread_options -{ +typedef struct test_thread_options { gpr_event on_started; gpr_event *phase1; gpr_event on_phase1_done; @@ -206,181 +188,164 @@ typedef struct test_thread_options grpc_completion_queue *cc; } test_thread_options; -gpr_timespec -ten_seconds_time (void) -{ - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10); +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) -{ - gpr_free (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) -{ +static void producer_thread(void *arg) { test_thread_options *opt = 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 *) (gpr_intptr) 1); - GPR_ASSERT (gpr_event_wait (opt->phase1, ten_seconds_time ())); - - gpr_log (GPR_INFO, "producer %d phase 1", opt->id); - for (i = 0; i < TEST_THREAD_EVENTS; i++) - { - grpc_cq_begin_op (opt->cc); - } - - gpr_log (GPR_INFO, "producer %d phase 1 done", opt->id); - gpr_event_set (&opt->on_phase1_done, (void *) (gpr_intptr) 1); - GPR_ASSERT (gpr_event_wait (opt->phase2, ten_seconds_time ())); - - gpr_log (GPR_INFO, "producer %d phase 2", opt->id); - for (i = 0; i < TEST_THREAD_EVENTS; i++) - { - grpc_cq_end_op (opt->cc, (void *) (gpr_intptr) 1, 1, free_completion, NULL, gpr_malloc (sizeof (&exec_ctx, 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 *) (gpr_intptr) 1); - GPR_ASSERT (grpc_closure_list_empty (closure_list)); + gpr_log(GPR_INFO, "producer %d started", opt->id); + gpr_event_set(&opt->on_started, (void *)(gpr_intptr)1); + GPR_ASSERT(gpr_event_wait(opt->phase1, ten_seconds_time())); + + gpr_log(GPR_INFO, "producer %d phase 1", opt->id); + for (i = 0; i < TEST_THREAD_EVENTS; i++) { + grpc_cq_begin_op(opt->cc); + } + + gpr_log(GPR_INFO, "producer %d phase 1 done", opt->id); + gpr_event_set(&opt->on_phase1_done, (void *)(gpr_intptr)1); + GPR_ASSERT(gpr_event_wait(opt->phase2, ten_seconds_time())); + + gpr_log(GPR_INFO, "producer %d phase 2", opt->id); + for (i = 0; i < TEST_THREAD_EVENTS; i++) { + grpc_cq_end_op(opt->cc, (void *)(gpr_intptr)1, 1, free_completion, NULL, + gpr_malloc(sizeof(&exec_ctx, 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 *)(gpr_intptr)1); + GPR_ASSERT(grpc_closure_list_empty(closure_list)); } -static void -consumer_thread (void *arg) -{ +static void consumer_thread(void *arg) { test_thread_options *opt = arg; grpc_event ev; - gpr_log (GPR_INFO, "consumer %d started", opt->id); - gpr_event_set (&opt->on_started, (void *) (gpr_intptr) 1); - GPR_ASSERT (gpr_event_wait (opt->phase1, ten_seconds_time ())); - - gpr_log (GPR_INFO, "consumer %d phase 1", opt->id); - - gpr_log (GPR_INFO, "consumer %d phase 1 done", opt->id); - gpr_event_set (&opt->on_phase1_done, (void *) (gpr_intptr) 1); - GPR_ASSERT (gpr_event_wait (opt->phase2, ten_seconds_time ())); - - gpr_log (GPR_INFO, "consumer %d phase 2", opt->id); - for (;;) - { - ev = grpc_completion_queue_next (opt->cc, ten_seconds_time (), NULL); - switch (ev.type) - { - case GRPC_OP_COMPLETE: - GPR_ASSERT (ev.success); - opt->events_triggered++; - break; - case GRPC_QUEUE_SHUTDOWN: - gpr_log (GPR_INFO, "consumer %d phase 2 done", opt->id); - gpr_event_set (&opt->on_finished, (void *) (gpr_intptr) 1); - return; - case GRPC_QUEUE_TIMEOUT: - gpr_log (GPR_ERROR, "Invalid timeout received"); - abort (); - } + gpr_log(GPR_INFO, "consumer %d started", opt->id); + gpr_event_set(&opt->on_started, (void *)(gpr_intptr)1); + GPR_ASSERT(gpr_event_wait(opt->phase1, ten_seconds_time())); + + gpr_log(GPR_INFO, "consumer %d phase 1", opt->id); + + gpr_log(GPR_INFO, "consumer %d phase 1 done", opt->id); + gpr_event_set(&opt->on_phase1_done, (void *)(gpr_intptr)1); + GPR_ASSERT(gpr_event_wait(opt->phase2, ten_seconds_time())); + + gpr_log(GPR_INFO, "consumer %d phase 2", opt->id); + for (;;) { + ev = grpc_completion_queue_next(opt->cc, ten_seconds_time(), NULL); + switch (ev.type) { + case GRPC_OP_COMPLETE: + GPR_ASSERT(ev.success); + opt->events_triggered++; + break; + case GRPC_QUEUE_SHUTDOWN: + gpr_log(GPR_INFO, "consumer %d phase 2 done", opt->id); + gpr_event_set(&opt->on_finished, (void *)(gpr_intptr)1); + return; + case GRPC_QUEUE_TIMEOUT: + gpr_log(GPR_ERROR, "Invalid timeout received"); + abort(); } + } } -static void -test_threading (size_t producers, size_t consumers) -{ - test_thread_options *options = gpr_malloc ((producers + consumers) * sizeof (test_thread_options)); +static void test_threading(size_t producers, size_t consumers) { + test_thread_options *options = + gpr_malloc((producers + consumers) * sizeof(test_thread_options)); gpr_event phase1 = GPR_EVENT_INIT; gpr_event phase2 = GPR_EVENT_INIT; - grpc_completion_queue *cc = grpc_completion_queue_create (NULL); + grpc_completion_queue *cc = grpc_completion_queue_create(NULL); size_t i; size_t total_consumed = 0; static int optid = 101; - gpr_log (GPR_INFO, "%s: %d producers, %d consumers", "test_threading", producers, consumers); + gpr_log(GPR_INFO, "%s: %d producers, %d consumers", "test_threading", + producers, consumers); /* start all threads: they will wait for phase1 */ - for (i = 0; i < producers + consumers; i++) - { - gpr_thd_id id; - gpr_event_init (&options[i].on_started); - gpr_event_init (&options[i].on_phase1_done); - gpr_event_init (&options[i].on_finished); - options[i].phase1 = &phase1; - options[i].phase2 = &phase2; - options[i].events_triggered = 0; - options[i].cc = cc; - options[i].id = optid++; - GPR_ASSERT (gpr_thd_new (&id, i < producers ? producer_thread : consumer_thread, options + i, NULL)); - gpr_event_wait (&options[i].on_started, ten_seconds_time ()); - } + for (i = 0; i < producers + consumers; i++) { + gpr_thd_id id; + gpr_event_init(&options[i].on_started); + gpr_event_init(&options[i].on_phase1_done); + gpr_event_init(&options[i].on_finished); + options[i].phase1 = &phase1; + options[i].phase2 = &phase2; + options[i].events_triggered = 0; + options[i].cc = cc; + options[i].id = optid++; + GPR_ASSERT(gpr_thd_new(&id, + i < producers ? producer_thread : consumer_thread, + options + i, NULL)); + gpr_event_wait(&options[i].on_started, ten_seconds_time()); + } /* start phase1: producers will pre-declare all operations they will complete */ - gpr_log (GPR_INFO, "start phase 1"); - gpr_event_set (&phase1, (void *) (gpr_intptr) 1); + gpr_log(GPR_INFO, "start phase 1"); + gpr_event_set(&phase1, (void *)(gpr_intptr)1); - gpr_log (GPR_INFO, "wait phase 1"); - for (i = 0; i < producers + consumers; i++) - { - GPR_ASSERT (gpr_event_wait (&options[i].on_phase1_done, ten_seconds_time ())); - } - gpr_log (GPR_INFO, "done phase 1"); + gpr_log(GPR_INFO, "wait phase 1"); + for (i = 0; i < producers + consumers; i++) { + GPR_ASSERT(gpr_event_wait(&options[i].on_phase1_done, ten_seconds_time())); + } + gpr_log(GPR_INFO, "done phase 1"); /* start phase2: operations will complete, and consumers will consume them */ - gpr_log (GPR_INFO, "start phase 2"); - gpr_event_set (&phase2, (void *) (gpr_intptr) 1); + gpr_log(GPR_INFO, "start phase 2"); + gpr_event_set(&phase2, (void *)(gpr_intptr)1); /* in parallel, we shutdown the completion channel - all events should still be consumed */ - grpc_completion_queue_shutdown (cc); + grpc_completion_queue_shutdown(cc); /* join all threads */ - gpr_log (GPR_INFO, "wait phase 2"); - for (i = 0; i < producers + consumers; i++) - { - GPR_ASSERT (gpr_event_wait (&options[i].on_finished, ten_seconds_time ())); - } - gpr_log (GPR_INFO, "done phase 2"); + gpr_log(GPR_INFO, "wait phase 2"); + for (i = 0; i < producers + consumers; i++) { + GPR_ASSERT(gpr_event_wait(&options[i].on_finished, ten_seconds_time())); + } + gpr_log(GPR_INFO, "done phase 2"); /* destroy the completion channel */ - grpc_completion_queue_destroy (cc); + grpc_completion_queue_destroy(cc); /* verify that everything was produced and consumed */ - for (i = 0; i < producers + consumers; i++) - { - if (i < producers) - { - GPR_ASSERT (options[i].events_triggered == TEST_THREAD_EVENTS); - } - else - { - total_consumed += options[i].events_triggered; - } + for (i = 0; i < producers + consumers; i++) { + if (i < producers) { + GPR_ASSERT(options[i].events_triggered == TEST_THREAD_EVENTS); + } else { + total_consumed += options[i].events_triggered; } - GPR_ASSERT (total_consumed == producers * TEST_THREAD_EVENTS); + } + GPR_ASSERT(total_consumed == producers * TEST_THREAD_EVENTS); - gpr_free (options); + gpr_free(options); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - grpc_init (); - test_no_op (); - test_wait_empty (); - test_shutdown_then_next_polling (); - test_shutdown_then_next_with_timeout (); - test_cq_end_op (); - test_pluck (); - test_threading (1, 1); - test_threading (1, 10); - test_threading (10, 1); - test_threading (10, 10); - grpc_shutdown (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + grpc_init(); + test_no_op(); + test_wait_empty(); + test_shutdown_then_next_polling(); + test_shutdown_then_next_with_timeout(); + test_cq_end_op(); + test_pluck(); + test_threading(1, 1); + test_threading(1, 10); + test_threading(10, 1); + test_threading(10, 10); + grpc_shutdown(); return 0; } diff --git a/test/core/surface/lame_client_test.c b/test/core/surface/lame_client_test.c index 434779b2733..0d29bea5559 100644 --- a/test/core/surface/lame_client_test.c +++ b/test/core/surface/lame_client_test.c @@ -38,15 +38,9 @@ #include #include -static void * -tag (gpr_intptr x) -{ - return (void *) x; -} +static void *tag(gpr_intptr x) { return (void *)x; } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { grpc_channel *chan; grpc_call *call; grpc_completion_queue *cq; @@ -59,17 +53,20 @@ main (int argc, char **argv) char *details = NULL; size_t details_capacity = 0; - grpc_test_init (argc, argv); - grpc_init (); + grpc_test_init(argc, argv); + grpc_init(); - grpc_metadata_array_init (&trailing_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); - chan = grpc_lame_client_channel_create ("lampoon:national", GRPC_STATUS_UNKNOWN, "Rpc sent on a lame channel."); - GPR_ASSERT (chan); - cq = grpc_completion_queue_create (NULL); - call = grpc_channel_create_call (chan, NULL, GRPC_PROPAGATE_DEFAULTS, cq, "/Foo", "anywhere", GRPC_TIMEOUT_SECONDS_TO_DEADLINE (100), NULL); - GPR_ASSERT (call); - cqv = cq_verifier_create (cq); + chan = grpc_lame_client_channel_create( + "lampoon:national", GRPC_STATUS_UNKNOWN, "Rpc sent on a lame channel."); + GPR_ASSERT(chan); + cq = grpc_completion_queue_create(NULL); + call = grpc_channel_create_call(chan, NULL, GRPC_PROPAGATE_DEFAULTS, cq, + "/Foo", "anywhere", + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(100), NULL); + GPR_ASSERT(call); + cqv = cq_verifier_create(cq); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -85,22 +82,22 @@ main (int argc, char **argv) op->flags = 0; op->reserved = NULL; op++; - error = grpc_call_start_batch (call, ops, (size_t) (op - ops), tag (1), NULL); - GPR_ASSERT (GRPC_CALL_OK == error); + error = grpc_call_start_batch(call, ops, (size_t)(op - ops), tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); /* the call should immediately fail */ - cq_expect_completion (cqv, tag (1), 1); - cq_verify (cqv); + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); - grpc_call_destroy (call); - grpc_channel_destroy (chan); - cq_verifier_destroy (cqv); - grpc_completion_queue_destroy (cq); + grpc_call_destroy(call); + grpc_channel_destroy(chan); + cq_verifier_destroy(cqv); + grpc_completion_queue_destroy(cq); - grpc_metadata_array_destroy (&trailing_metadata_recv); - gpr_free (details); + grpc_metadata_array_destroy(&trailing_metadata_recv); + gpr_free(details); - grpc_shutdown (); + grpc_shutdown(); return 0; } diff --git a/test/core/surface/multi_init_test.c b/test/core/surface/multi_init_test.c index fafaae5902d..99b7a52ff98 100644 --- a/test/core/surface/multi_init_test.c +++ b/test/core/surface/multi_init_test.c @@ -34,38 +34,30 @@ #include #include "test/core/util/test_config.h" -static void -test (int rounds) -{ +static void test(int rounds) { int i; - for (i = 0; i < rounds; i++) - { - grpc_init (); - } - for (i = 0; i < rounds; i++) - { - grpc_shutdown (); - } + for (i = 0; i < rounds; i++) { + grpc_init(); + } + for (i = 0; i < rounds; i++) { + grpc_shutdown(); + } } -static void -test_mixed () -{ - grpc_init (); - grpc_init (); - grpc_shutdown (); - grpc_init (); - grpc_shutdown (); - grpc_shutdown (); +static void test_mixed() { + grpc_init(); + grpc_init(); + grpc_shutdown(); + grpc_init(); + grpc_shutdown(); + grpc_shutdown(); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test (1); - test (2); - test (3); - test_mixed (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test(1); + test(2); + test(3); + test_mixed(); return 0; } diff --git a/test/core/transport/chttp2/alpn_test.c b/test/core/transport/chttp2/alpn_test.c index 0a9b67e5fd5..9a7d5ef0c37 100644 --- a/test/core/transport/chttp2/alpn_test.c +++ b/test/core/transport/chttp2/alpn_test.c @@ -36,24 +36,18 @@ #include #include "test/core/util/test_config.h" -static void -test_alpn_success (void) -{ - GPR_ASSERT (grpc_chttp2_is_alpn_version_supported ("h2", 2)); +static void test_alpn_success(void) { + GPR_ASSERT(grpc_chttp2_is_alpn_version_supported("h2", 2)); } -static void -test_alpn_failure (void) -{ - GPR_ASSERT (!grpc_chttp2_is_alpn_version_supported ("h2-155", 6)); - GPR_ASSERT (!grpc_chttp2_is_alpn_version_supported ("h1-15", 5)); +static void test_alpn_failure(void) { + GPR_ASSERT(!grpc_chttp2_is_alpn_version_supported("h2-155", 6)); + GPR_ASSERT(!grpc_chttp2_is_alpn_version_supported("h1-15", 5)); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_alpn_success (); - test_alpn_failure (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_alpn_success(); + test_alpn_failure(); return 0; } diff --git a/test/core/transport/chttp2/bin_encoder_test.c b/test/core/transport/chttp2/bin_encoder_test.c index 7d3ba224975..1ffd8ed3cbf 100644 --- a/test/core/transport/chttp2/bin_encoder_test.c +++ b/test/core/transport/chttp2/bin_encoder_test.c @@ -41,37 +41,32 @@ static int all_ok = 1; -static void -expect_slice_eq (gpr_slice expected, gpr_slice slice, char *debug, int line) -{ - if (0 != gpr_slice_cmp (slice, expected)) - { - char *hs = gpr_dump_slice (slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); - char *he = gpr_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; - } - gpr_slice_unref (expected); - gpr_slice_unref (slice); +static void expect_slice_eq(gpr_slice expected, gpr_slice slice, char *debug, + int line) { + if (0 != gpr_slice_cmp(slice, expected)) { + char *hs = gpr_dump_slice(slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); + char *he = gpr_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; + } + gpr_slice_unref(expected); + gpr_slice_unref(slice); } -static gpr_slice -B64 (const char *s) -{ - gpr_slice ss = gpr_slice_from_copied_string (s); - gpr_slice out = grpc_chttp2_base64_encode (ss); - gpr_slice_unref (ss); +static gpr_slice B64(const char *s) { + gpr_slice ss = gpr_slice_from_copied_string(s); + gpr_slice out = grpc_chttp2_base64_encode(ss); + gpr_slice_unref(ss); return out; } -static gpr_slice -HUFF (const char *s) -{ - gpr_slice ss = gpr_slice_from_copied_string (s); - gpr_slice out = grpc_chttp2_huffman_compress (ss); - gpr_slice_unref (ss); +static gpr_slice HUFF(const char *s) { + gpr_slice ss = gpr_slice_from_copied_string(s); + gpr_slice out = grpc_chttp2_huffman_compress(ss); + gpr_slice_unref(ss); return out; } @@ -80,93 +75,108 @@ HUFF (const char *s) gpr_slice_from_copied_buffer(expected, sizeof(expected) - 1), slice, \ #slice, __LINE__); -static void -expect_combined_equiv (const char *s, size_t len, int line) -{ - gpr_slice input = gpr_slice_from_copied_buffer (s, len); - gpr_slice base64 = grpc_chttp2_base64_encode (input); - gpr_slice expect = grpc_chttp2_huffman_compress (base64); - gpr_slice got = grpc_chttp2_base64_encode_and_huffman_compress (input); - if (0 != gpr_slice_cmp (expect, got)) - { - char *t = gpr_dump_slice (input, GPR_DUMP_HEX | GPR_DUMP_ASCII); - char *e = gpr_dump_slice (expect, GPR_DUMP_HEX | GPR_DUMP_ASCII); - char *g = gpr_dump_slice (got, GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log (GPR_ERROR, "FAILED:%d:\ntest: %s\ngot: %s\nwant: %s", t, g, e); - gpr_free (t); - gpr_free (e); - gpr_free (g); - all_ok = 0; - } - gpr_slice_unref (input); - gpr_slice_unref (base64); - gpr_slice_unref (expect); - gpr_slice_unref (got); +static void expect_combined_equiv(const char *s, size_t len, int line) { + gpr_slice input = gpr_slice_from_copied_buffer(s, len); + gpr_slice base64 = grpc_chttp2_base64_encode(input); + gpr_slice expect = grpc_chttp2_huffman_compress(base64); + gpr_slice got = grpc_chttp2_base64_encode_and_huffman_compress(input); + if (0 != gpr_slice_cmp(expect, got)) { + char *t = gpr_dump_slice(input, GPR_DUMP_HEX | GPR_DUMP_ASCII); + char *e = gpr_dump_slice(expect, GPR_DUMP_HEX | GPR_DUMP_ASCII); + char *g = gpr_dump_slice(got, GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log(GPR_ERROR, "FAILED:%d:\ntest: %s\ngot: %s\nwant: %s", t, g, e); + gpr_free(t); + gpr_free(e); + gpr_free(g); + all_ok = 0; + } + gpr_slice_unref(input); + gpr_slice_unref(base64); + gpr_slice_unref(expect); + gpr_slice_unref(got); } #define EXPECT_COMBINED_EQUIV(x) \ expect_combined_equiv(x, sizeof(x) - 1, __LINE__) -static void -expect_binary_header (const char *hdr, int binary) -{ - if (grpc_is_binary_header (hdr, strlen (hdr)) != binary) - { - gpr_log (GPR_ERROR, "FAILED: expected header '%s' to be %s", hdr, binary ? "binary" : "not binary"); - all_ok = 0; - } +static void expect_binary_header(const char *hdr, int binary) { + if (grpc_is_binary_header(hdr, strlen(hdr)) != binary) { + gpr_log(GPR_ERROR, "FAILED: expected header '%s' to be %s", hdr, + binary ? "binary" : "not binary"); + all_ok = 0; + } } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { /* Base64 test vectors from RFC 4648, with padding removed */ /* BASE64("") = "" */ - EXPECT_SLICE_EQ ("", B64 ("")); + EXPECT_SLICE_EQ("", B64("")); /* BASE64("f") = "Zg" */ - EXPECT_SLICE_EQ ("Zg", B64 ("f")); + EXPECT_SLICE_EQ("Zg", B64("f")); /* BASE64("fo") = "Zm8" */ - EXPECT_SLICE_EQ ("Zm8", B64 ("fo")); + EXPECT_SLICE_EQ("Zm8", B64("fo")); /* BASE64("foo") = "Zm9v" */ - EXPECT_SLICE_EQ ("Zm9v", B64 ("foo")); + EXPECT_SLICE_EQ("Zm9v", B64("foo")); /* BASE64("foob") = "Zm9vYg" */ - EXPECT_SLICE_EQ ("Zm9vYg", B64 ("foob")); + EXPECT_SLICE_EQ("Zm9vYg", B64("foob")); /* BASE64("fooba") = "Zm9vYmE" */ - EXPECT_SLICE_EQ ("Zm9vYmE", B64 ("fooba")); + EXPECT_SLICE_EQ("Zm9vYmE", B64("fooba")); /* BASE64("foobar") = "Zm9vYmFy" */ - EXPECT_SLICE_EQ ("Zm9vYmFy", B64 ("foobar")); + EXPECT_SLICE_EQ("Zm9vYmFy", B64("foobar")); - EXPECT_SLICE_EQ ("wMHCw8TF", B64 ("\xc0\xc1\xc2\xc3\xc4\xc5")); + EXPECT_SLICE_EQ("wMHCw8TF", B64("\xc0\xc1\xc2\xc3\xc4\xc5")); /* Huffman encoding tests */ - EXPECT_SLICE_EQ ("\xf1\xe3\xc2\xe5\xf2\x3a\x6b\xa0\xab\x90\xf4\xff", HUFF ("www.example.com")); - EXPECT_SLICE_EQ ("\xa8\xeb\x10\x64\x9c\xbf", HUFF ("no-cache")); - EXPECT_SLICE_EQ ("\x25\xa8\x49\xe9\x5b\xa9\x7d\x7f", HUFF ("custom-key")); - EXPECT_SLICE_EQ ("\x25\xa8\x49\xe9\x5b\xb8\xe8\xb4\xbf", HUFF ("custom-value")); - EXPECT_SLICE_EQ ("\xae\xc3\x77\x1a\x4b", HUFF ("private")); - EXPECT_SLICE_EQ ("\xd0\x7a\xbe\x94\x10\x54\xd4\x44\xa8\x20\x05\x95\x04\x0b\x81\x66\xe0\x82" "\xa6\x2d\x1b\xff", HUFF ("Mon, 21 Oct 2013 20:13:21 GMT")); - EXPECT_SLICE_EQ ("\x9d\x29\xad\x17\x18\x63\xc7\x8f\x0b\x97\xc8\xe9\xae\x82\xae\x43\xd3", HUFF ("https://www.example.com")); + EXPECT_SLICE_EQ("\xf1\xe3\xc2\xe5\xf2\x3a\x6b\xa0\xab\x90\xf4\xff", + HUFF("www.example.com")); + EXPECT_SLICE_EQ("\xa8\xeb\x10\x64\x9c\xbf", HUFF("no-cache")); + EXPECT_SLICE_EQ("\x25\xa8\x49\xe9\x5b\xa9\x7d\x7f", HUFF("custom-key")); + EXPECT_SLICE_EQ("\x25\xa8\x49\xe9\x5b\xb8\xe8\xb4\xbf", HUFF("custom-value")); + EXPECT_SLICE_EQ("\xae\xc3\x77\x1a\x4b", HUFF("private")); + EXPECT_SLICE_EQ( + "\xd0\x7a\xbe\x94\x10\x54\xd4\x44\xa8\x20\x05\x95\x04\x0b\x81\x66\xe0\x82" + "\xa6\x2d\x1b\xff", + HUFF("Mon, 21 Oct 2013 20:13:21 GMT")); + EXPECT_SLICE_EQ( + "\x9d\x29\xad\x17\x18\x63\xc7\x8f\x0b\x97\xc8\xe9\xae\x82\xae\x43\xd3", + HUFF("https://www.example.com")); /* Various test vectors for combined encoding */ - EXPECT_COMBINED_EQUIV (""); - EXPECT_COMBINED_EQUIV ("f"); - EXPECT_COMBINED_EQUIV ("fo"); - EXPECT_COMBINED_EQUIV ("foo"); - EXPECT_COMBINED_EQUIV ("foob"); - EXPECT_COMBINED_EQUIV ("fooba"); - EXPECT_COMBINED_EQUIV ("foobar"); - EXPECT_COMBINED_EQUIV ("www.example.com"); - EXPECT_COMBINED_EQUIV ("no-cache"); - EXPECT_COMBINED_EQUIV ("custom-key"); - EXPECT_COMBINED_EQUIV ("custom-value"); - EXPECT_COMBINED_EQUIV ("private"); - EXPECT_COMBINED_EQUIV ("Mon, 21 Oct 2013 20:13:21 GMT"); - EXPECT_COMBINED_EQUIV ("https://www.example.com"); - EXPECT_COMBINED_EQUIV ("\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\x19\x1a\x1b\x1c\x1d\x1e\x1f" "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f" "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f" "\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f" "\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f" "\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f" "\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f" "\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f" "\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f" "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf" "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf" "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf" "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf" "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef" "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"); - - expect_binary_header ("foo-bin", 1); - expect_binary_header ("foo-bar", 0); - expect_binary_header ("-bin", 0); + EXPECT_COMBINED_EQUIV(""); + EXPECT_COMBINED_EQUIV("f"); + EXPECT_COMBINED_EQUIV("fo"); + EXPECT_COMBINED_EQUIV("foo"); + EXPECT_COMBINED_EQUIV("foob"); + EXPECT_COMBINED_EQUIV("fooba"); + EXPECT_COMBINED_EQUIV("foobar"); + EXPECT_COMBINED_EQUIV("www.example.com"); + EXPECT_COMBINED_EQUIV("no-cache"); + EXPECT_COMBINED_EQUIV("custom-key"); + EXPECT_COMBINED_EQUIV("custom-value"); + EXPECT_COMBINED_EQUIV("private"); + EXPECT_COMBINED_EQUIV("Mon, 21 Oct 2013 20:13:21 GMT"); + EXPECT_COMBINED_EQUIV("https://www.example.com"); + EXPECT_COMBINED_EQUIV( + "\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\x19\x1a\x1b\x1c\x1d\x1e\x1f" + "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f" + "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f" + "\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f" + "\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f" + "\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f" + "\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f" + "\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f" + "\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f" + "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf" + "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf" + "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf" + "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf" + "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef" + "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"); + + expect_binary_header("foo-bin", 1); + expect_binary_header("foo-bar", 0); + expect_binary_header("-bin", 0); return all_ok ? 0 : 1; } diff --git a/test/core/transport/chttp2/hpack_parser_test.c b/test/core/transport/chttp2/hpack_parser_test.c index 2d8ac2e09ac..3a313375a49 100644 --- a/test/core/transport/chttp2/hpack_parser_test.c +++ b/test/core/transport/chttp2/hpack_parser_test.c @@ -42,120 +42,182 @@ #include "test/core/util/slice_splitter.h" #include "test/core/util/test_config.h" -typedef struct -{ - va_list args; -} test_checker; - -static void -onhdr (void *ud, grpc_mdelem * md) -{ +typedef struct { va_list args; } test_checker; + +static void onhdr(void *ud, grpc_mdelem *md) { const char *ekey, *evalue; test_checker *chk = ud; - ekey = va_arg (chk->args, char *); - GPR_ASSERT (ekey); - evalue = va_arg (chk->args, char *); - GPR_ASSERT (evalue); - GPR_ASSERT (gpr_slice_str_cmp (md->key->slice, ekey) == 0); - GPR_ASSERT (gpr_slice_str_cmp (md->value->slice, evalue) == 0); - GRPC_MDELEM_UNREF (md); + ekey = va_arg(chk->args, char *); + GPR_ASSERT(ekey); + evalue = va_arg(chk->args, char *); + GPR_ASSERT(evalue); + GPR_ASSERT(gpr_slice_str_cmp(md->key->slice, ekey) == 0); + GPR_ASSERT(gpr_slice_str_cmp(md->value->slice, evalue) == 0); + GRPC_MDELEM_UNREF(md); } -static void -test_vector (grpc_chttp2_hpack_parser * parser, grpc_slice_split_mode mode, const char *hexstring, ... /* char *key, char *value */ ) -{ - gpr_slice input = parse_hexstring (hexstring); +static void test_vector(grpc_chttp2_hpack_parser *parser, + grpc_slice_split_mode mode, const char *hexstring, + ... /* char *key, char *value */) { + gpr_slice input = parse_hexstring(hexstring); gpr_slice *slices; size_t nslices; size_t i; test_checker chk; - va_start (chk.args, hexstring); + va_start(chk.args, hexstring); parser->on_header = onhdr; parser->on_header_user_data = &chk; - grpc_split_slices (mode, &input, 1, &slices, &nslices); - gpr_slice_unref (input); + grpc_split_slices(mode, &input, 1, &slices, &nslices); + gpr_slice_unref(input); - for (i = 0; i < nslices; i++) - { - GPR_ASSERT (grpc_chttp2_hpack_parser_parse (parser, GPR_SLICE_START_PTR (slices[i]), GPR_SLICE_END_PTR (slices[i]))); - } + for (i = 0; i < nslices; i++) { + GPR_ASSERT(grpc_chttp2_hpack_parser_parse( + parser, GPR_SLICE_START_PTR(slices[i]), GPR_SLICE_END_PTR(slices[i]))); + } - for (i = 0; i < nslices; i++) - { - gpr_slice_unref (slices[i]); - } - gpr_free (slices); + for (i = 0; i < nslices; i++) { + gpr_slice_unref(slices[i]); + } + gpr_free(slices); - GPR_ASSERT (NULL == va_arg (chk.args, char *)); + GPR_ASSERT(NULL == va_arg(chk.args, char *)); - va_end (chk.args); + va_end(chk.args); } -static void -test_vectors (grpc_slice_split_mode mode) -{ +static void test_vectors(grpc_slice_split_mode mode) { grpc_chttp2_hpack_parser parser; - grpc_mdctx *mdctx = grpc_mdctx_create (); + grpc_mdctx *mdctx = grpc_mdctx_create(); - grpc_chttp2_hpack_parser_init (&parser, mdctx); + grpc_chttp2_hpack_parser_init(&parser, mdctx); /* D.2.1 */ - test_vector (&parser, mode, "400a 6375 7374 6f6d 2d6b 6579 0d63 7573" "746f 6d2d 6865 6164 6572", "custom-key", "custom-header", NULL); + test_vector(&parser, mode, + "400a 6375 7374 6f6d 2d6b 6579 0d63 7573" + "746f 6d2d 6865 6164 6572", + "custom-key", "custom-header", NULL); /* D.2.2 */ - test_vector (&parser, mode, "040c 2f73 616d 706c 652f 7061 7468", ":path", "/sample/path", NULL); + test_vector(&parser, mode, "040c 2f73 616d 706c 652f 7061 7468", ":path", + "/sample/path", NULL); /* D.2.3 */ - test_vector (&parser, mode, "1008 7061 7373 776f 7264 0673 6563 7265" "74", "password", "secret", NULL); + test_vector(&parser, mode, + "1008 7061 7373 776f 7264 0673 6563 7265" + "74", + "password", "secret", NULL); /* D.2.4 */ - test_vector (&parser, mode, "82", ":method", "GET", NULL); - grpc_chttp2_hpack_parser_destroy (&parser); + test_vector(&parser, mode, "82", ":method", "GET", NULL); + grpc_chttp2_hpack_parser_destroy(&parser); - grpc_chttp2_hpack_parser_init (&parser, mdctx); + grpc_chttp2_hpack_parser_init(&parser, mdctx); /* D.3.1 */ - test_vector (&parser, mode, "8286 8441 0f77 7777 2e65 7861 6d70 6c65" "2e63 6f6d", ":method", "GET", ":scheme", "http", ":path", "/", ":authority", "www.example.com", NULL); + test_vector(&parser, mode, + "8286 8441 0f77 7777 2e65 7861 6d70 6c65" + "2e63 6f6d", + ":method", "GET", ":scheme", "http", ":path", "/", ":authority", + "www.example.com", NULL); /* D.3.2 */ - test_vector (&parser, mode, "8286 84be 5808 6e6f 2d63 6163 6865", ":method", "GET", ":scheme", "http", ":path", "/", ":authority", "www.example.com", "cache-control", "no-cache", NULL); + test_vector(&parser, mode, "8286 84be 5808 6e6f 2d63 6163 6865", ":method", + "GET", ":scheme", "http", ":path", "/", ":authority", + "www.example.com", "cache-control", "no-cache", NULL); /* D.3.3 */ - test_vector (&parser, mode, "8287 85bf 400a 6375 7374 6f6d 2d6b 6579" "0c63 7573 746f 6d2d 7661 6c75 65", ":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_init (&parser, mdctx); + test_vector(&parser, mode, + "8287 85bf 400a 6375 7374 6f6d 2d6b 6579" + "0c63 7573 746f 6d2d 7661 6c75 65", + ":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_init(&parser, mdctx); /* D.4.1 */ - test_vector (&parser, mode, "8286 8441 8cf1 e3c2 e5f2 3a6b a0ab 90f4" "ff", ":method", "GET", ":scheme", "http", ":path", "/", ":authority", "www.example.com", NULL); + test_vector(&parser, mode, + "8286 8441 8cf1 e3c2 e5f2 3a6b a0ab 90f4" + "ff", + ":method", "GET", ":scheme", "http", ":path", "/", ":authority", + "www.example.com", NULL); /* D.4.2 */ - test_vector (&parser, mode, "8286 84be 5886 a8eb 1064 9cbf", ":method", "GET", ":scheme", "http", ":path", "/", ":authority", "www.example.com", "cache-control", "no-cache", NULL); + test_vector(&parser, mode, "8286 84be 5886 a8eb 1064 9cbf", ":method", "GET", + ":scheme", "http", ":path", "/", ":authority", "www.example.com", + "cache-control", "no-cache", NULL); /* D.4.3 */ - test_vector (&parser, mode, "8287 85bf 4088 25a8 49e9 5ba9 7d7f 8925" "a849 e95b b8e8 b4bf", ":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_init (&parser, mdctx); + test_vector(&parser, mode, + "8287 85bf 4088 25a8 49e9 5ba9 7d7f 8925" + "a849 e95b b8e8 b4bf", + ":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_init(&parser, mdctx); parser.table.max_bytes = 256; /* D.5.1 */ - test_vector (&parser, mode, "4803 3330 3258 0770 7269 7661 7465 611d" "4d6f 6e2c 2032 3120 4f63 7420 3230 3133" "2032 303a 3133 3a32 3120 474d 546e 1768" "7474 7073 3a2f 2f77 7777 2e65 7861 6d70" "6c65 2e63 6f6d", ":status", "302", "cache-control", "private", "date", "Mon, 21 Oct 2013 20:13:21 GMT", "location", "https://www.example.com", NULL); + test_vector(&parser, mode, + "4803 3330 3258 0770 7269 7661 7465 611d" + "4d6f 6e2c 2032 3120 4f63 7420 3230 3133" + "2032 303a 3133 3a32 3120 474d 546e 1768" + "7474 7073 3a2f 2f77 7777 2e65 7861 6d70" + "6c65 2e63 6f6d", + ":status", "302", "cache-control", "private", "date", + "Mon, 21 Oct 2013 20:13:21 GMT", "location", + "https://www.example.com", NULL); /* D.5.2 */ - test_vector (&parser, mode, "4803 3330 37c1 c0bf", ":status", "307", "cache-control", "private", "date", "Mon, 21 Oct 2013 20:13:21 GMT", "location", "https://www.example.com", NULL); + test_vector(&parser, mode, "4803 3330 37c1 c0bf", ":status", "307", + "cache-control", "private", "date", + "Mon, 21 Oct 2013 20:13:21 GMT", "location", + "https://www.example.com", NULL); /* D.5.3 */ - test_vector (&parser, mode, "88c1 611d 4d6f 6e2c 2032 3120 4f63 7420" "3230 3133 2032 303a 3133 3a32 3220 474d" "54c0 5a04 677a 6970 7738 666f 6f3d 4153" "444a 4b48 514b 425a 584f 5157 454f 5049" "5541 5851 5745 4f49 553b 206d 6178 2d61" "6765 3d33 3630 303b 2076 6572 7369 6f6e" "3d31", ":status", "200", "cache-control", "private", "date", "Mon, 21 Oct 2013 20:13:22 GMT", "location", "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_init (&parser, mdctx); + test_vector(&parser, mode, + "88c1 611d 4d6f 6e2c 2032 3120 4f63 7420" + "3230 3133 2032 303a 3133 3a32 3220 474d" + "54c0 5a04 677a 6970 7738 666f 6f3d 4153" + "444a 4b48 514b 425a 584f 5157 454f 5049" + "5541 5851 5745 4f49 553b 206d 6178 2d61" + "6765 3d33 3630 303b 2076 6572 7369 6f6e" + "3d31", + ":status", "200", "cache-control", "private", "date", + "Mon, 21 Oct 2013 20:13:22 GMT", "location", + "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_init(&parser, mdctx); parser.table.max_bytes = 256; /* D.6.1 */ - test_vector (&parser, mode, "4882 6402 5885 aec3 771a 4b61 96d0 7abe" "9410 54d4 44a8 2005 9504 0b81 66e0 82a6" "2d1b ff6e 919d 29ad 1718 63c7 8f0b 97c8" "e9ae 82ae 43d3", ":status", "302", "cache-control", "private", "date", "Mon, 21 Oct 2013 20:13:21 GMT", "location", "https://www.example.com", NULL); + test_vector(&parser, mode, + "4882 6402 5885 aec3 771a 4b61 96d0 7abe" + "9410 54d4 44a8 2005 9504 0b81 66e0 82a6" + "2d1b ff6e 919d 29ad 1718 63c7 8f0b 97c8" + "e9ae 82ae 43d3", + ":status", "302", "cache-control", "private", "date", + "Mon, 21 Oct 2013 20:13:21 GMT", "location", + "https://www.example.com", NULL); /* D.6.2 */ - test_vector (&parser, mode, "4883 640e ffc1 c0bf", ":status", "307", "cache-control", "private", "date", "Mon, 21 Oct 2013 20:13:21 GMT", "location", "https://www.example.com", NULL); + test_vector(&parser, mode, "4883 640e ffc1 c0bf", ":status", "307", + "cache-control", "private", "date", + "Mon, 21 Oct 2013 20:13:21 GMT", "location", + "https://www.example.com", NULL); /* D.6.3 */ - test_vector (&parser, mode, "88c1 6196 d07a be94 1054 d444 a820 0595" "040b 8166 e084 a62d 1bff c05a 839b d9ab" "77ad 94e7 821d d7f2 e6c7 b335 dfdf cd5b" "3960 d5af 2708 7f36 72c1 ab27 0fb5 291f" "9587 3160 65c0 03ed 4ee5 b106 3d50 07", ":status", "200", "cache-control", "private", "date", "Mon, 21 Oct 2013 20:13:22 GMT", "location", "https://www.example.com", "content-encoding", "gzip", "set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1", NULL); - grpc_chttp2_hpack_parser_destroy (&parser); - grpc_mdctx_unref (mdctx); + test_vector(&parser, mode, + "88c1 6196 d07a be94 1054 d444 a820 0595" + "040b 8166 e084 a62d 1bff c05a 839b d9ab" + "77ad 94e7 821d d7f2 e6c7 b335 dfdf cd5b" + "3960 d5af 2708 7f36 72c1 ab27 0fb5 291f" + "9587 3160 65c0 03ed 4ee5 b106 3d50 07", + ":status", "200", "cache-control", "private", "date", + "Mon, 21 Oct 2013 20:13:22 GMT", "location", + "https://www.example.com", "content-encoding", "gzip", + "set-cookie", + "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1", NULL); + grpc_chttp2_hpack_parser_destroy(&parser); + grpc_mdctx_unref(mdctx); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_vectors (GRPC_SLICE_SPLIT_MERGE_ALL); - test_vectors (GRPC_SLICE_SPLIT_ONE_BYTE); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_vectors(GRPC_SLICE_SPLIT_MERGE_ALL); + test_vectors(GRPC_SLICE_SPLIT_ONE_BYTE); return 0; } diff --git a/test/core/transport/chttp2/hpack_table_test.c b/test/core/transport/chttp2/hpack_table_test.c index cf64105a94a..aa3e273a6c9 100644 --- a/test/core/transport/chttp2/hpack_table_test.c +++ b/test/core/transport/chttp2/hpack_table_test.c @@ -44,245 +44,232 @@ #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) -static void -assert_str (const grpc_chttp2_hptbl * tbl, grpc_mdstr * mdstr, const char *str) -{ - GPR_ASSERT (gpr_slice_str_cmp (mdstr->slice, str) == 0); +static void assert_str(const grpc_chttp2_hptbl *tbl, grpc_mdstr *mdstr, + const char *str) { + GPR_ASSERT(gpr_slice_str_cmp(mdstr->slice, str) == 0); } -static void -assert_index (const grpc_chttp2_hptbl * tbl, gpr_uint32 idx, const char *key, const char *value) -{ - grpc_mdelem *md = grpc_chttp2_hptbl_lookup (tbl, idx); - assert_str (tbl, md->key, key); - assert_str (tbl, md->value, value); +static void assert_index(const grpc_chttp2_hptbl *tbl, gpr_uint32 idx, + const char *key, const char *value) { + grpc_mdelem *md = grpc_chttp2_hptbl_lookup(tbl, idx); + assert_str(tbl, md->key, key); + assert_str(tbl, md->value, value); } -static void -test_static_lookup (void) -{ +static void test_static_lookup(void) { grpc_chttp2_hptbl tbl; grpc_mdctx *mdctx; - mdctx = grpc_mdctx_create (); - grpc_chttp2_hptbl_init (&tbl, mdctx); - - LOG_TEST ("test_static_lookup"); - assert_index (&tbl, 1, ":authority", ""); - assert_index (&tbl, 2, ":method", "GET"); - assert_index (&tbl, 3, ":method", "POST"); - assert_index (&tbl, 4, ":path", "/"); - assert_index (&tbl, 5, ":path", "/index.html"); - assert_index (&tbl, 6, ":scheme", "http"); - assert_index (&tbl, 7, ":scheme", "https"); - assert_index (&tbl, 8, ":status", "200"); - assert_index (&tbl, 9, ":status", "204"); - assert_index (&tbl, 10, ":status", "206"); - assert_index (&tbl, 11, ":status", "304"); - assert_index (&tbl, 12, ":status", "400"); - assert_index (&tbl, 13, ":status", "404"); - assert_index (&tbl, 14, ":status", "500"); - assert_index (&tbl, 15, "accept-charset", ""); - assert_index (&tbl, 16, "accept-encoding", "gzip, deflate"); - assert_index (&tbl, 17, "accept-language", ""); - assert_index (&tbl, 18, "accept-ranges", ""); - assert_index (&tbl, 19, "accept", ""); - assert_index (&tbl, 20, "access-control-allow-origin", ""); - assert_index (&tbl, 21, "age", ""); - assert_index (&tbl, 22, "allow", ""); - assert_index (&tbl, 23, "authorization", ""); - assert_index (&tbl, 24, "cache-control", ""); - assert_index (&tbl, 25, "content-disposition", ""); - assert_index (&tbl, 26, "content-encoding", ""); - assert_index (&tbl, 27, "content-language", ""); - assert_index (&tbl, 28, "content-length", ""); - assert_index (&tbl, 29, "content-location", ""); - assert_index (&tbl, 30, "content-range", ""); - assert_index (&tbl, 31, "content-type", ""); - assert_index (&tbl, 32, "cookie", ""); - assert_index (&tbl, 33, "date", ""); - assert_index (&tbl, 34, "etag", ""); - assert_index (&tbl, 35, "expect", ""); - assert_index (&tbl, 36, "expires", ""); - assert_index (&tbl, 37, "from", ""); - assert_index (&tbl, 38, "host", ""); - assert_index (&tbl, 39, "if-match", ""); - assert_index (&tbl, 40, "if-modified-since", ""); - assert_index (&tbl, 41, "if-none-match", ""); - assert_index (&tbl, 42, "if-range", ""); - assert_index (&tbl, 43, "if-unmodified-since", ""); - assert_index (&tbl, 44, "last-modified", ""); - assert_index (&tbl, 45, "link", ""); - assert_index (&tbl, 46, "location", ""); - assert_index (&tbl, 47, "max-forwards", ""); - assert_index (&tbl, 48, "proxy-authenticate", ""); - assert_index (&tbl, 49, "proxy-authorization", ""); - assert_index (&tbl, 50, "range", ""); - assert_index (&tbl, 51, "referer", ""); - assert_index (&tbl, 52, "refresh", ""); - assert_index (&tbl, 53, "retry-after", ""); - assert_index (&tbl, 54, "server", ""); - assert_index (&tbl, 55, "set-cookie", ""); - assert_index (&tbl, 56, "strict-transport-security", ""); - assert_index (&tbl, 57, "transfer-encoding", ""); - assert_index (&tbl, 58, "user-agent", ""); - assert_index (&tbl, 59, "vary", ""); - assert_index (&tbl, 60, "via", ""); - assert_index (&tbl, 61, "www-authenticate", ""); - - grpc_chttp2_hptbl_destroy (&tbl); - grpc_mdctx_unref (mdctx); + mdctx = grpc_mdctx_create(); + grpc_chttp2_hptbl_init(&tbl, mdctx); + + LOG_TEST("test_static_lookup"); + assert_index(&tbl, 1, ":authority", ""); + assert_index(&tbl, 2, ":method", "GET"); + assert_index(&tbl, 3, ":method", "POST"); + assert_index(&tbl, 4, ":path", "/"); + assert_index(&tbl, 5, ":path", "/index.html"); + assert_index(&tbl, 6, ":scheme", "http"); + assert_index(&tbl, 7, ":scheme", "https"); + assert_index(&tbl, 8, ":status", "200"); + assert_index(&tbl, 9, ":status", "204"); + assert_index(&tbl, 10, ":status", "206"); + assert_index(&tbl, 11, ":status", "304"); + assert_index(&tbl, 12, ":status", "400"); + assert_index(&tbl, 13, ":status", "404"); + assert_index(&tbl, 14, ":status", "500"); + assert_index(&tbl, 15, "accept-charset", ""); + assert_index(&tbl, 16, "accept-encoding", "gzip, deflate"); + assert_index(&tbl, 17, "accept-language", ""); + assert_index(&tbl, 18, "accept-ranges", ""); + assert_index(&tbl, 19, "accept", ""); + assert_index(&tbl, 20, "access-control-allow-origin", ""); + assert_index(&tbl, 21, "age", ""); + assert_index(&tbl, 22, "allow", ""); + assert_index(&tbl, 23, "authorization", ""); + assert_index(&tbl, 24, "cache-control", ""); + assert_index(&tbl, 25, "content-disposition", ""); + assert_index(&tbl, 26, "content-encoding", ""); + assert_index(&tbl, 27, "content-language", ""); + assert_index(&tbl, 28, "content-length", ""); + assert_index(&tbl, 29, "content-location", ""); + assert_index(&tbl, 30, "content-range", ""); + assert_index(&tbl, 31, "content-type", ""); + assert_index(&tbl, 32, "cookie", ""); + assert_index(&tbl, 33, "date", ""); + assert_index(&tbl, 34, "etag", ""); + assert_index(&tbl, 35, "expect", ""); + assert_index(&tbl, 36, "expires", ""); + assert_index(&tbl, 37, "from", ""); + assert_index(&tbl, 38, "host", ""); + assert_index(&tbl, 39, "if-match", ""); + assert_index(&tbl, 40, "if-modified-since", ""); + assert_index(&tbl, 41, "if-none-match", ""); + assert_index(&tbl, 42, "if-range", ""); + assert_index(&tbl, 43, "if-unmodified-since", ""); + assert_index(&tbl, 44, "last-modified", ""); + assert_index(&tbl, 45, "link", ""); + assert_index(&tbl, 46, "location", ""); + assert_index(&tbl, 47, "max-forwards", ""); + assert_index(&tbl, 48, "proxy-authenticate", ""); + assert_index(&tbl, 49, "proxy-authorization", ""); + assert_index(&tbl, 50, "range", ""); + assert_index(&tbl, 51, "referer", ""); + assert_index(&tbl, 52, "refresh", ""); + assert_index(&tbl, 53, "retry-after", ""); + assert_index(&tbl, 54, "server", ""); + assert_index(&tbl, 55, "set-cookie", ""); + assert_index(&tbl, 56, "strict-transport-security", ""); + assert_index(&tbl, 57, "transfer-encoding", ""); + assert_index(&tbl, 58, "user-agent", ""); + assert_index(&tbl, 59, "vary", ""); + assert_index(&tbl, 60, "via", ""); + assert_index(&tbl, 61, "www-authenticate", ""); + + grpc_chttp2_hptbl_destroy(&tbl); + grpc_mdctx_unref(mdctx); } -static void -test_many_additions (void) -{ +static void test_many_additions(void) { grpc_chttp2_hptbl tbl; int i; char *key; char *value; grpc_mdctx *mdctx; - LOG_TEST ("test_many_additions"); - - mdctx = grpc_mdctx_create (); - grpc_chttp2_hptbl_init (&tbl, mdctx); - - for (i = 0; i < 1000000; i++) - { - gpr_asprintf (&key, "K:%d", i); - gpr_asprintf (&value, "VALUE:%d", i); - grpc_chttp2_hptbl_add (&tbl, grpc_mdelem_from_strings (mdctx, key, value)); - assert_index (&tbl, 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY, key, value); - gpr_free (key); - gpr_free (value); - if (i) - { - gpr_asprintf (&key, "K:%d", i - 1); - gpr_asprintf (&value, "VALUE:%d", i - 1); - assert_index (&tbl, 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY, key, value); - gpr_free (key); - gpr_free (value); - } + LOG_TEST("test_many_additions"); + + mdctx = grpc_mdctx_create(); + grpc_chttp2_hptbl_init(&tbl, mdctx); + + for (i = 0; i < 1000000; i++) { + gpr_asprintf(&key, "K:%d", i); + gpr_asprintf(&value, "VALUE:%d", i); + grpc_chttp2_hptbl_add(&tbl, grpc_mdelem_from_strings(mdctx, key, value)); + assert_index(&tbl, 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY, key, value); + gpr_free(key); + gpr_free(value); + if (i) { + gpr_asprintf(&key, "K:%d", i - 1); + gpr_asprintf(&value, "VALUE:%d", i - 1); + assert_index(&tbl, 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY, key, value); + gpr_free(key); + gpr_free(value); } + } - grpc_chttp2_hptbl_destroy (&tbl); - grpc_mdctx_unref (mdctx); + grpc_chttp2_hptbl_destroy(&tbl); + grpc_mdctx_unref(mdctx); } -static grpc_chttp2_hptbl_find_result -find_simple (grpc_chttp2_hptbl * tbl, const char *key, const char *value) -{ - grpc_mdelem *md = grpc_mdelem_from_strings (tbl->mdctx, key, value); - grpc_chttp2_hptbl_find_result r = grpc_chttp2_hptbl_find (tbl, md); - GRPC_MDELEM_UNREF (md); +static grpc_chttp2_hptbl_find_result find_simple(grpc_chttp2_hptbl *tbl, + const char *key, + const char *value) { + grpc_mdelem *md = grpc_mdelem_from_strings(tbl->mdctx, key, value); + grpc_chttp2_hptbl_find_result r = grpc_chttp2_hptbl_find(tbl, md); + GRPC_MDELEM_UNREF(md); return r; } -static void -test_find (void) -{ +static void test_find(void) { grpc_chttp2_hptbl tbl; int i; char buffer[32]; grpc_mdctx *mdctx; grpc_chttp2_hptbl_find_result r; - LOG_TEST ("test_find"); + LOG_TEST("test_find"); - mdctx = grpc_mdctx_create (); - grpc_chttp2_hptbl_init (&tbl, mdctx); - grpc_chttp2_hptbl_add (&tbl, grpc_mdelem_from_strings (mdctx, "abc", "xyz")); - grpc_chttp2_hptbl_add (&tbl, grpc_mdelem_from_strings (mdctx, "abc", "123")); - grpc_chttp2_hptbl_add (&tbl, grpc_mdelem_from_strings (mdctx, "x", "1")); + mdctx = grpc_mdctx_create(); + grpc_chttp2_hptbl_init(&tbl, mdctx); + grpc_chttp2_hptbl_add(&tbl, grpc_mdelem_from_strings(mdctx, "abc", "xyz")); + grpc_chttp2_hptbl_add(&tbl, grpc_mdelem_from_strings(mdctx, "abc", "123")); + grpc_chttp2_hptbl_add(&tbl, grpc_mdelem_from_strings(mdctx, "x", "1")); - r = find_simple (&tbl, "abc", "123"); - GPR_ASSERT (r.index == 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY); - GPR_ASSERT (r.has_value == 1); + r = find_simple(&tbl, "abc", "123"); + GPR_ASSERT(r.index == 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY); + GPR_ASSERT(r.has_value == 1); - r = find_simple (&tbl, "abc", "xyz"); - GPR_ASSERT (r.index == 3 + GRPC_CHTTP2_LAST_STATIC_ENTRY); - GPR_ASSERT (r.has_value == 1); + r = find_simple(&tbl, "abc", "xyz"); + GPR_ASSERT(r.index == 3 + GRPC_CHTTP2_LAST_STATIC_ENTRY); + GPR_ASSERT(r.has_value == 1); - r = find_simple (&tbl, "x", "1"); - GPR_ASSERT (r.index == 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); - GPR_ASSERT (r.has_value == 1); + r = find_simple(&tbl, "x", "1"); + GPR_ASSERT(r.index == 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); + GPR_ASSERT(r.has_value == 1); - r = find_simple (&tbl, "x", "2"); - GPR_ASSERT (r.index == 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); - GPR_ASSERT (r.has_value == 0); + r = find_simple(&tbl, "x", "2"); + GPR_ASSERT(r.index == 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); + GPR_ASSERT(r.has_value == 0); - r = find_simple (&tbl, "vary", "some-vary-arg"); - GPR_ASSERT (r.index == 59); - GPR_ASSERT (r.has_value == 0); + r = find_simple(&tbl, "vary", "some-vary-arg"); + GPR_ASSERT(r.index == 59); + GPR_ASSERT(r.has_value == 0); - r = find_simple (&tbl, "accept-encoding", "gzip, deflate"); - GPR_ASSERT (r.index == 16); - GPR_ASSERT (r.has_value == 1); + r = find_simple(&tbl, "accept-encoding", "gzip, deflate"); + GPR_ASSERT(r.index == 16); + GPR_ASSERT(r.has_value == 1); - r = find_simple (&tbl, "accept-encoding", "gzip"); - GPR_ASSERT (r.index == 16); - GPR_ASSERT (r.has_value == 0); + r = find_simple(&tbl, "accept-encoding", "gzip"); + GPR_ASSERT(r.index == 16); + GPR_ASSERT(r.has_value == 0); - r = find_simple (&tbl, ":method", "GET"); - GPR_ASSERT (r.index == 2); - GPR_ASSERT (r.has_value == 1); + r = find_simple(&tbl, ":method", "GET"); + GPR_ASSERT(r.index == 2); + GPR_ASSERT(r.has_value == 1); - r = find_simple (&tbl, ":method", "POST"); - GPR_ASSERT (r.index == 3); - GPR_ASSERT (r.has_value == 1); + r = find_simple(&tbl, ":method", "POST"); + GPR_ASSERT(r.index == 3); + GPR_ASSERT(r.has_value == 1); - r = find_simple (&tbl, ":method", "PUT"); - GPR_ASSERT (r.index == 2 || r.index == 3); - GPR_ASSERT (r.has_value == 0); + r = find_simple(&tbl, ":method", "PUT"); + GPR_ASSERT(r.index == 2 || r.index == 3); + GPR_ASSERT(r.has_value == 0); - r = find_simple (&tbl, "this-does-not-exist", ""); - GPR_ASSERT (r.index == 0); - GPR_ASSERT (r.has_value == 0); + r = find_simple(&tbl, "this-does-not-exist", ""); + GPR_ASSERT(r.index == 0); + GPR_ASSERT(r.has_value == 0); /* overflow the string buffer, check find still works */ - for (i = 0; i < 10000; i++) - { - gpr_ltoa (i, buffer); - grpc_chttp2_hptbl_add (&tbl, grpc_mdelem_from_strings (mdctx, "test", buffer)); - } - - r = find_simple (&tbl, "abc", "123"); - GPR_ASSERT (r.index == 0); - GPR_ASSERT (r.has_value == 0); - - r = find_simple (&tbl, "test", "9999"); - GPR_ASSERT (r.index == 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); - GPR_ASSERT (r.has_value == 1); - - r = find_simple (&tbl, "test", "9998"); - GPR_ASSERT (r.index == 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY); - GPR_ASSERT (r.has_value == 1); - - for (i = 0; i < tbl.num_ents; i++) - { - int expect = 9999 - i; - gpr_ltoa (expect, buffer); - - r = find_simple (&tbl, "test", buffer); - GPR_ASSERT (r.index == i + 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); - GPR_ASSERT (r.has_value == 1); - } - - r = find_simple (&tbl, "test", "10000"); - GPR_ASSERT (r.index != 0); - GPR_ASSERT (r.has_value == 0); - - grpc_chttp2_hptbl_destroy (&tbl); - grpc_mdctx_unref (mdctx); + for (i = 0; i < 10000; i++) { + gpr_ltoa(i, buffer); + grpc_chttp2_hptbl_add(&tbl, + grpc_mdelem_from_strings(mdctx, "test", buffer)); + } + + r = find_simple(&tbl, "abc", "123"); + GPR_ASSERT(r.index == 0); + GPR_ASSERT(r.has_value == 0); + + r = find_simple(&tbl, "test", "9999"); + GPR_ASSERT(r.index == 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); + GPR_ASSERT(r.has_value == 1); + + r = find_simple(&tbl, "test", "9998"); + GPR_ASSERT(r.index == 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY); + GPR_ASSERT(r.has_value == 1); + + for (i = 0; i < tbl.num_ents; i++) { + int expect = 9999 - i; + gpr_ltoa(expect, buffer); + + r = find_simple(&tbl, "test", buffer); + GPR_ASSERT(r.index == i + 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY); + GPR_ASSERT(r.has_value == 1); + } + + r = find_simple(&tbl, "test", "10000"); + GPR_ASSERT(r.index != 0); + GPR_ASSERT(r.has_value == 0); + + grpc_chttp2_hptbl_destroy(&tbl); + grpc_mdctx_unref(mdctx); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_static_lookup (); - test_many_additions (); - test_find (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_static_lookup(); + test_many_additions(); + test_find(); return 0; } diff --git a/test/core/transport/chttp2/status_conversion_test.c b/test/core/transport/chttp2/status_conversion_test.c index 9b8fb28c12c..e2729a0a198 100644 --- a/test/core/transport/chttp2/status_conversion_test.c +++ b/test/core/transport/chttp2/status_conversion_test.c @@ -44,81 +44,95 @@ #define HTTP2_STATUS_TO_GRPC_STATUS(a, b) \ GPR_ASSERT(grpc_chttp2_http2_status_to_grpc_status(a) == (b)) -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { int i; - grpc_test_init (argc, argv); + grpc_test_init(argc, argv); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_OK, GRPC_CHTTP2_NO_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_CANCELLED, GRPC_CHTTP2_CANCEL); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_UNKNOWN, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_INVALID_ARGUMENT, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_DEADLINE_EXCEEDED, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_NOT_FOUND, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_ALREADY_EXISTS, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_PERMISSION_DENIED, GRPC_CHTTP2_INADEQUATE_SECURITY); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_UNAUTHENTICATED, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_RESOURCE_EXHAUSTED, GRPC_CHTTP2_ENHANCE_YOUR_CALM); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_FAILED_PRECONDITION, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_ABORTED, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_OUT_OF_RANGE, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_UNIMPLEMENTED, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_INTERNAL, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_UNAVAILABLE, GRPC_CHTTP2_REFUSED_STREAM); - GRPC_STATUS_TO_HTTP2_ERROR (GRPC_STATUS_DATA_LOSS, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_OK, GRPC_CHTTP2_NO_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_CANCELLED, GRPC_CHTTP2_CANCEL); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_UNKNOWN, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_INVALID_ARGUMENT, + GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_DEADLINE_EXCEEDED, + GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_NOT_FOUND, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_ALREADY_EXISTS, + GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_PERMISSION_DENIED, + GRPC_CHTTP2_INADEQUATE_SECURITY); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_UNAUTHENTICATED, + GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_RESOURCE_EXHAUSTED, + GRPC_CHTTP2_ENHANCE_YOUR_CALM); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_FAILED_PRECONDITION, + GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_ABORTED, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_OUT_OF_RANGE, + GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_UNIMPLEMENTED, + GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_INTERNAL, GRPC_CHTTP2_INTERNAL_ERROR); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_UNAVAILABLE, + GRPC_CHTTP2_REFUSED_STREAM); + GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_DATA_LOSS, GRPC_CHTTP2_INTERNAL_ERROR); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_OK, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_CANCELLED, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_UNKNOWN, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_INVALID_ARGUMENT, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_DEADLINE_EXCEEDED, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_NOT_FOUND, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_ALREADY_EXISTS, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_PERMISSION_DENIED, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_UNAUTHENTICATED, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_RESOURCE_EXHAUSTED, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_FAILED_PRECONDITION, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_ABORTED, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_OUT_OF_RANGE, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_UNIMPLEMENTED, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_INTERNAL, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_UNAVAILABLE, 200); - GRPC_STATUS_TO_HTTP2_STATUS (GRPC_STATUS_DATA_LOSS, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_OK, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_CANCELLED, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_UNKNOWN, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_INVALID_ARGUMENT, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_DEADLINE_EXCEEDED, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_NOT_FOUND, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_ALREADY_EXISTS, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_PERMISSION_DENIED, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_UNAUTHENTICATED, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_RESOURCE_EXHAUSTED, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_FAILED_PRECONDITION, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_ABORTED, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_OUT_OF_RANGE, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_UNIMPLEMENTED, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_INTERNAL, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_UNAVAILABLE, 200); + GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_DATA_LOSS, 200); - HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_NO_ERROR, GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_PROTOCOL_ERROR, GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_INTERNAL_ERROR, GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_FLOW_CONTROL_ERROR, GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_SETTINGS_TIMEOUT, GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_STREAM_CLOSED, GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_FRAME_SIZE_ERROR, GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_REFUSED_STREAM, GRPC_STATUS_UNAVAILABLE); - HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_CANCEL, GRPC_STATUS_CANCELLED); - HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_COMPRESSION_ERROR, GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_CONNECT_ERROR, GRPC_STATUS_INTERNAL); - HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_ENHANCE_YOUR_CALM, GRPC_STATUS_RESOURCE_EXHAUSTED); - HTTP2_ERROR_TO_GRPC_STATUS (GRPC_CHTTP2_INADEQUATE_SECURITY, GRPC_STATUS_PERMISSION_DENIED); + HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_NO_ERROR, GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_PROTOCOL_ERROR, GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_INTERNAL_ERROR, GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_FLOW_CONTROL_ERROR, + GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_SETTINGS_TIMEOUT, + GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_STREAM_CLOSED, GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_FRAME_SIZE_ERROR, + GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_REFUSED_STREAM, + GRPC_STATUS_UNAVAILABLE); + HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_CANCEL, GRPC_STATUS_CANCELLED); + HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_COMPRESSION_ERROR, + GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_CONNECT_ERROR, GRPC_STATUS_INTERNAL); + HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_ENHANCE_YOUR_CALM, + GRPC_STATUS_RESOURCE_EXHAUSTED); + HTTP2_ERROR_TO_GRPC_STATUS(GRPC_CHTTP2_INADEQUATE_SECURITY, + GRPC_STATUS_PERMISSION_DENIED); - HTTP2_STATUS_TO_GRPC_STATUS (200, GRPC_STATUS_OK); - HTTP2_STATUS_TO_GRPC_STATUS (400, GRPC_STATUS_INVALID_ARGUMENT); - HTTP2_STATUS_TO_GRPC_STATUS (401, GRPC_STATUS_UNAUTHENTICATED); - HTTP2_STATUS_TO_GRPC_STATUS (403, GRPC_STATUS_PERMISSION_DENIED); - HTTP2_STATUS_TO_GRPC_STATUS (404, GRPC_STATUS_NOT_FOUND); - HTTP2_STATUS_TO_GRPC_STATUS (409, GRPC_STATUS_ABORTED); - HTTP2_STATUS_TO_GRPC_STATUS (412, GRPC_STATUS_FAILED_PRECONDITION); - HTTP2_STATUS_TO_GRPC_STATUS (429, GRPC_STATUS_RESOURCE_EXHAUSTED); - HTTP2_STATUS_TO_GRPC_STATUS (499, GRPC_STATUS_CANCELLED); - HTTP2_STATUS_TO_GRPC_STATUS (500, GRPC_STATUS_UNKNOWN); - HTTP2_STATUS_TO_GRPC_STATUS (503, GRPC_STATUS_UNAVAILABLE); - HTTP2_STATUS_TO_GRPC_STATUS (504, GRPC_STATUS_DEADLINE_EXCEEDED); + HTTP2_STATUS_TO_GRPC_STATUS(200, GRPC_STATUS_OK); + HTTP2_STATUS_TO_GRPC_STATUS(400, GRPC_STATUS_INVALID_ARGUMENT); + HTTP2_STATUS_TO_GRPC_STATUS(401, GRPC_STATUS_UNAUTHENTICATED); + HTTP2_STATUS_TO_GRPC_STATUS(403, GRPC_STATUS_PERMISSION_DENIED); + HTTP2_STATUS_TO_GRPC_STATUS(404, GRPC_STATUS_NOT_FOUND); + HTTP2_STATUS_TO_GRPC_STATUS(409, GRPC_STATUS_ABORTED); + HTTP2_STATUS_TO_GRPC_STATUS(412, GRPC_STATUS_FAILED_PRECONDITION); + HTTP2_STATUS_TO_GRPC_STATUS(429, GRPC_STATUS_RESOURCE_EXHAUSTED); + HTTP2_STATUS_TO_GRPC_STATUS(499, GRPC_STATUS_CANCELLED); + HTTP2_STATUS_TO_GRPC_STATUS(500, GRPC_STATUS_UNKNOWN); + HTTP2_STATUS_TO_GRPC_STATUS(503, GRPC_STATUS_UNAVAILABLE); + HTTP2_STATUS_TO_GRPC_STATUS(504, GRPC_STATUS_DEADLINE_EXCEEDED); /* check all status values can be converted */ - for (i = 0; i <= 999; i++) - { - grpc_chttp2_http2_status_to_grpc_status (i); - } + for (i = 0; i <= 999; i++) { + grpc_chttp2_http2_status_to_grpc_status(i); + } return 0; } diff --git a/test/core/transport/chttp2/stream_encoder_test.c b/test/core/transport/chttp2/stream_encoder_test.c index 452b1184a54..71db98c69e2 100644 --- a/test/core/transport/chttp2/stream_encoder_test.c +++ b/test/core/transport/chttp2/stream_encoder_test.c @@ -55,241 +55,217 @@ void **to_delete = NULL; size_t num_to_delete = 0; size_t cap_to_delete = 0; -static gpr_slice -create_test_slice (size_t length) -{ - gpr_slice slice = gpr_slice_malloc (length); +static gpr_slice create_test_slice(size_t length) { + gpr_slice slice = gpr_slice_malloc(length); size_t i; - for (i = 0; i < length; i++) - { - GPR_SLICE_START_PTR (slice)[i] = (gpr_uint8) i; - } + for (i = 0; i < length; i++) { + GPR_SLICE_START_PTR(slice)[i] = (gpr_uint8)i; + } return slice; } /* verify that the output generated by encoding the stream matches the hexstring passed in */ -static void -verify_sopb (size_t window_available, int eof, size_t expect_window_used, const char *expected) -{ +static void verify_sopb(size_t window_available, int eof, + size_t expect_window_used, const char *expected) { gpr_slice_buffer output; grpc_stream_op_buffer encops; gpr_slice merged; - gpr_slice expect = parse_hexstring (expected); - gpr_slice_buffer_init (&output); - grpc_sopb_init (&encops); - GPR_ASSERT (expect_window_used == grpc_chttp2_preencode (g_sopb.ops, &g_sopb.nops, (gpr_uint32) window_available, &encops)); - grpc_chttp2_encode (encops.ops, encops.nops, eof, 0xdeadbeef, &g_compressor, &output); + gpr_slice expect = parse_hexstring(expected); + gpr_slice_buffer_init(&output); + grpc_sopb_init(&encops); + GPR_ASSERT(expect_window_used == + grpc_chttp2_preencode(g_sopb.ops, &g_sopb.nops, + (gpr_uint32)window_available, &encops)); + grpc_chttp2_encode(encops.ops, encops.nops, eof, 0xdeadbeef, &g_compressor, + &output); encops.nops = 0; - merged = grpc_slice_merge (output.slices, output.count); - gpr_slice_buffer_destroy (&output); - grpc_sopb_destroy (&encops); - - if (0 != gpr_slice_cmp (merged, expect)) - { - char *expect_str = gpr_dump_slice (expect, GPR_DUMP_HEX | GPR_DUMP_ASCII); - char *got_str = gpr_dump_slice (merged, GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log (GPR_ERROR, "mismatched output for %s", expected); - gpr_log (GPR_ERROR, "EXPECT: %s", expect_str); - gpr_log (GPR_ERROR, "GOT: %s", got_str); - gpr_free (expect_str); - gpr_free (got_str); - g_failure = 1; - } - - gpr_slice_unref (merged); - gpr_slice_unref (expect); + merged = grpc_slice_merge(output.slices, output.count); + gpr_slice_buffer_destroy(&output); + grpc_sopb_destroy(&encops); + + if (0 != gpr_slice_cmp(merged, expect)) { + char *expect_str = gpr_dump_slice(expect, GPR_DUMP_HEX | GPR_DUMP_ASCII); + char *got_str = gpr_dump_slice(merged, GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log(GPR_ERROR, "mismatched output for %s", expected); + gpr_log(GPR_ERROR, "EXPECT: %s", expect_str); + gpr_log(GPR_ERROR, "GOT: %s", got_str); + gpr_free(expect_str); + gpr_free(got_str); + g_failure = 1; + } + + gpr_slice_unref(merged); + gpr_slice_unref(expect); } -static void -test_small_data_framing (void) -{ - grpc_sopb_add_no_op (&g_sopb); - verify_sopb (10, 0, 0, ""); +static void test_small_data_framing(void) { + grpc_sopb_add_no_op(&g_sopb); + verify_sopb(10, 0, 0, ""); - grpc_sopb_add_slice (&g_sopb, create_test_slice (3)); - verify_sopb (10, 0, 3, "000003 0000 deadbeef 000102"); + grpc_sopb_add_slice(&g_sopb, create_test_slice(3)); + verify_sopb(10, 0, 3, "000003 0000 deadbeef 000102"); - grpc_sopb_add_slice (&g_sopb, create_test_slice (4)); - verify_sopb (10, 0, 4, "000004 0000 deadbeef 00010203"); + grpc_sopb_add_slice(&g_sopb, create_test_slice(4)); + verify_sopb(10, 0, 4, "000004 0000 deadbeef 00010203"); - grpc_sopb_add_slice (&g_sopb, create_test_slice (3)); - grpc_sopb_add_slice (&g_sopb, create_test_slice (4)); - verify_sopb (10, 0, 7, "000007 0000 deadbeef 000102 00010203"); + grpc_sopb_add_slice(&g_sopb, create_test_slice(3)); + grpc_sopb_add_slice(&g_sopb, create_test_slice(4)); + verify_sopb(10, 0, 7, "000007 0000 deadbeef 000102 00010203"); - grpc_sopb_add_slice (&g_sopb, create_test_slice (0)); - grpc_sopb_add_slice (&g_sopb, create_test_slice (0)); - grpc_sopb_add_slice (&g_sopb, create_test_slice (0)); - grpc_sopb_add_slice (&g_sopb, create_test_slice (0)); - grpc_sopb_add_slice (&g_sopb, create_test_slice (3)); - verify_sopb (10, 0, 3, "000003 0000 deadbeef 000102"); + grpc_sopb_add_slice(&g_sopb, create_test_slice(0)); + grpc_sopb_add_slice(&g_sopb, create_test_slice(0)); + grpc_sopb_add_slice(&g_sopb, create_test_slice(0)); + grpc_sopb_add_slice(&g_sopb, create_test_slice(0)); + grpc_sopb_add_slice(&g_sopb, create_test_slice(3)); + verify_sopb(10, 0, 3, "000003 0000 deadbeef 000102"); - verify_sopb (10, 1, 0, "000000 0001 deadbeef"); + verify_sopb(10, 1, 0, "000000 0001 deadbeef"); - grpc_sopb_add_begin_message (&g_sopb, 255, 0); - verify_sopb (10, 0, 5, "000005 0000 deadbeef 00000000ff"); + grpc_sopb_add_begin_message(&g_sopb, 255, 0); + verify_sopb(10, 0, 5, "000005 0000 deadbeef 00000000ff"); } -static void -add_sopb_headers (size_t n, ...) -{ +static void add_sopb_headers(size_t n, ...) { size_t i; grpc_metadata_batch b; va_list l; - grpc_linked_mdelem *e = gpr_malloc (sizeof (*e) * n); - - grpc_metadata_batch_init (&b); - - va_start (l, n); - for (i = 0; i < n; i++) - { - char *key = va_arg (l, char *); - char *value = va_arg (l, char *); - if (i) - { - e[i - 1].next = &e[i]; - e[i].prev = &e[i - 1]; - } - e[i].md = grpc_mdelem_from_strings (g_mdctx, key, value); + grpc_linked_mdelem *e = gpr_malloc(sizeof(*e) * n); + + grpc_metadata_batch_init(&b); + + va_start(l, n); + for (i = 0; i < n; i++) { + char *key = va_arg(l, char *); + char *value = va_arg(l, char *); + if (i) { + e[i - 1].next = &e[i]; + e[i].prev = &e[i - 1]; } + e[i].md = grpc_mdelem_from_strings(g_mdctx, key, value); + } e[0].prev = NULL; e[n - 1].next = NULL; - va_end (l); + va_end(l); b.list.head = &e[0]; b.list.tail = &e[n - 1]; - if (cap_to_delete == num_to_delete) - { - cap_to_delete = GPR_MAX (2 * cap_to_delete, 1000); - to_delete = gpr_realloc (to_delete, sizeof (*to_delete) * cap_to_delete); - } + if (cap_to_delete == num_to_delete) { + cap_to_delete = GPR_MAX(2 * cap_to_delete, 1000); + to_delete = gpr_realloc(to_delete, sizeof(*to_delete) * cap_to_delete); + } to_delete[num_to_delete++] = e; - grpc_sopb_add_metadata (&g_sopb, b); + grpc_sopb_add_metadata(&g_sopb, b); } -static void -test_basic_headers (void) -{ +static void test_basic_headers(void) { int i; - add_sopb_headers (1, "a", "a"); - verify_sopb (0, 0, 0, "000005 0104 deadbeef 40 0161 0161"); + add_sopb_headers(1, "a", "a"); + verify_sopb(0, 0, 0, "000005 0104 deadbeef 40 0161 0161"); - add_sopb_headers (1, "a", "a"); - verify_sopb (0, 0, 0, "000001 0104 deadbeef be"); + add_sopb_headers(1, "a", "a"); + verify_sopb(0, 0, 0, "000001 0104 deadbeef be"); - add_sopb_headers (1, "a", "a"); - verify_sopb (0, 0, 0, "000001 0104 deadbeef be"); + add_sopb_headers(1, "a", "a"); + verify_sopb(0, 0, 0, "000001 0104 deadbeef be"); - add_sopb_headers (2, "a", "a", "b", "c"); - verify_sopb (0, 0, 0, "000006 0104 deadbeef be 40 0162 0163"); + add_sopb_headers(2, "a", "a", "b", "c"); + verify_sopb(0, 0, 0, "000006 0104 deadbeef be 40 0162 0163"); - add_sopb_headers (2, "a", "a", "b", "c"); - verify_sopb (0, 0, 0, "000002 0104 deadbeef bf be"); + add_sopb_headers(2, "a", "a", "b", "c"); + verify_sopb(0, 0, 0, "000002 0104 deadbeef bf be"); - add_sopb_headers (1, "a", "d"); - verify_sopb (0, 0, 0, "000004 0104 deadbeef 7f 00 0164"); + add_sopb_headers(1, "a", "d"); + verify_sopb(0, 0, 0, "000004 0104 deadbeef 7f 00 0164"); /* flush out what's there to make a few values look very popular */ - for (i = 0; i < 350; i++) - { - add_sopb_headers (3, "a", "a", "b", "c", "a", "d"); - verify_sopb (0, 0, 0, "000003 0104 deadbeef c0 bf be"); - } + for (i = 0; i < 350; i++) { + add_sopb_headers(3, "a", "a", "b", "c", "a", "d"); + verify_sopb(0, 0, 0, "000003 0104 deadbeef c0 bf be"); + } - add_sopb_headers (2, "a", "a", "k", "v"); - verify_sopb (0, 0, 0, "000006 0104 deadbeef c0 00 016b 0176"); + add_sopb_headers(2, "a", "a", "k", "v"); + verify_sopb(0, 0, 0, "000006 0104 deadbeef c0 00 016b 0176"); - add_sopb_headers (1, "a", "v"); + add_sopb_headers(1, "a", "v"); /* this could be 000004 0104 deadbeef 0f 30 0176 also */ - verify_sopb (0, 0, 0, "000004 0104 deadbeef 0f 2f 0176"); + verify_sopb(0, 0, 0, "000004 0104 deadbeef 0f 2f 0176"); } -static void -encode_int_to_str (int i, char *p) -{ - p[0] = (char) ('a' + i % 26); +static void encode_int_to_str(int i, char *p) { + p[0] = (char)('a' + i % 26); i /= 26; - GPR_ASSERT (i < 26); - p[1] = (char) ('a' + i); + GPR_ASSERT(i < 26); + p[1] = (char)('a' + i); p[2] = 0; } -static void -test_decode_table_overflow (void) -{ +static void test_decode_table_overflow(void) { int i; char key[3], value[3]; char *expect; - for (i = 0; i < 114; i++) - { - if (i > 0) - { - add_sopb_headers (1, "aa", "ba"); - } - - encode_int_to_str (i, key); - encode_int_to_str (i + 1, value); - - if (i + 61 >= 127) - { - gpr_asprintf (&expect, "000002 0104 deadbeef ff%02x 000007 0104 deadbeef 40 " "02%02x%02x 02%02x%02x", i + 61 - 127, key[0], key[1], value[0], value[1]); - } - else if (i > 0) - { - gpr_asprintf (&expect, "000001 0104 deadbeef %02x 000007 0104 deadbeef 40 " "02%02x%02x 02%02x%02x", 0x80 + 61 + i, key[0], key[1], value[0], value[1]); - } - else - { - gpr_asprintf (&expect, "000007 0104 deadbeef 40 02%02x%02x 02%02x%02x", key[0], key[1], value[0], value[1]); - } - - add_sopb_headers (1, key, value); - verify_sopb (0, 0, 0, expect); - gpr_free (expect); + for (i = 0; i < 114; i++) { + if (i > 0) { + add_sopb_headers(1, "aa", "ba"); } + encode_int_to_str(i, key); + encode_int_to_str(i + 1, value); + + if (i + 61 >= 127) { + gpr_asprintf(&expect, + "000002 0104 deadbeef ff%02x 000007 0104 deadbeef 40 " + "02%02x%02x 02%02x%02x", + i + 61 - 127, key[0], key[1], value[0], value[1]); + } else if (i > 0) { + gpr_asprintf(&expect, + "000001 0104 deadbeef %02x 000007 0104 deadbeef 40 " + "02%02x%02x 02%02x%02x", + 0x80 + 61 + i, key[0], key[1], value[0], value[1]); + } else { + gpr_asprintf(&expect, "000007 0104 deadbeef 40 02%02x%02x 02%02x%02x", + key[0], key[1], value[0], value[1]); + } + + add_sopb_headers(1, key, value); + verify_sopb(0, 0, 0, expect); + 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 */ - add_sopb_headers (1, "aa", "ba"); - verify_sopb (0, 0, 0, "000007 0104 deadbeef 40 026161 026261"); + add_sopb_headers(1, "aa", "ba"); + verify_sopb(0, 0, 0, "000007 0104 deadbeef 40 026161 026261"); } -static void -randstr (char *p, int bufsz) -{ +static void randstr(char *p, int bufsz) { int i; - int len = 1 + rand () % bufsz; - for (i = 0; i < len; i++) - { - p[i] = (char) ('a' + rand () % 26); - } + int len = 1 + rand() % bufsz; + for (i = 0; i < len; i++) { + p[i] = (char)('a' + rand() % 26); + } p[len] = 0; } -typedef struct -{ +typedef struct { char key[300]; char value[300]; int got_hdr; } test_decode_random_header_state; -static void -chk_hdr (void *p, grpc_mdelem * el) -{ +static void chk_hdr(void *p, grpc_mdelem *el) { test_decode_random_header_state *st = p; - GPR_ASSERT (0 == gpr_slice_str_cmp (el->key->slice, st->key)); - GPR_ASSERT (0 == gpr_slice_str_cmp (el->value->slice, st->value)); + GPR_ASSERT(0 == gpr_slice_str_cmp(el->key->slice, st->key)); + GPR_ASSERT(0 == gpr_slice_str_cmp(el->value->slice, st->value)); st->got_hdr = 1; - GRPC_MDELEM_UNREF (el); + GRPC_MDELEM_UNREF(el); } -static void -test_decode_random_headers_inner (int max_len) -{ +static void test_decode_random_headers_inner(int max_len) { int i; test_decode_random_header_state st; gpr_slice_buffer output; @@ -297,35 +273,37 @@ test_decode_random_headers_inner (int max_len) grpc_stream_op_buffer encops; grpc_chttp2_hpack_parser parser; - grpc_chttp2_hpack_parser_init (&parser, g_mdctx); - grpc_sopb_init (&encops); - - gpr_log (GPR_INFO, "max_len = %d", max_len); - - for (i = 0; i < 10000; i++) - { - randstr (st.key, max_len); - randstr (st.value, max_len); - - add_sopb_headers (1, st.key, st.value); - gpr_slice_buffer_init (&output); - GPR_ASSERT (0 == grpc_chttp2_preencode (g_sopb.ops, &g_sopb.nops, 0, &encops)); - grpc_chttp2_encode (encops.ops, encops.nops, 0, 0xdeadbeef, &g_compressor, &output); - encops.nops = 0; - merged = grpc_slice_merge (output.slices, output.count); - gpr_slice_buffer_destroy (&output); - - st.got_hdr = 0; - parser.on_header = chk_hdr; - parser.on_header_user_data = &st; - grpc_chttp2_hpack_parser_parse (&parser, GPR_SLICE_START_PTR (merged) + 9, GPR_SLICE_END_PTR (merged)); - GPR_ASSERT (st.got_hdr); - - gpr_slice_unref (merged); - } - - grpc_chttp2_hpack_parser_destroy (&parser); - grpc_sopb_destroy (&encops); + grpc_chttp2_hpack_parser_init(&parser, g_mdctx); + grpc_sopb_init(&encops); + + gpr_log(GPR_INFO, "max_len = %d", max_len); + + for (i = 0; i < 10000; i++) { + randstr(st.key, max_len); + randstr(st.value, max_len); + + add_sopb_headers(1, st.key, st.value); + gpr_slice_buffer_init(&output); + GPR_ASSERT(0 == + grpc_chttp2_preencode(g_sopb.ops, &g_sopb.nops, 0, &encops)); + grpc_chttp2_encode(encops.ops, encops.nops, 0, 0xdeadbeef, &g_compressor, + &output); + encops.nops = 0; + merged = grpc_slice_merge(output.slices, output.count); + gpr_slice_buffer_destroy(&output); + + st.got_hdr = 0; + parser.on_header = chk_hdr; + parser.on_header_user_data = &st; + grpc_chttp2_hpack_parser_parse(&parser, GPR_SLICE_START_PTR(merged) + 9, + GPR_SLICE_END_PTR(merged)); + GPR_ASSERT(st.got_hdr); + + gpr_slice_unref(merged); + } + + grpc_chttp2_hpack_parser_destroy(&parser); + grpc_sopb_destroy(&encops); } #define DECL_TEST_DECODE_RANDOM_HEADERS(n) \ @@ -334,53 +312,48 @@ test_decode_random_headers_inner (int max_len) } \ int keeps_formatting_correct_##n -DECL_TEST_DECODE_RANDOM_HEADERS (1); -DECL_TEST_DECODE_RANDOM_HEADERS (2); -DECL_TEST_DECODE_RANDOM_HEADERS (3); -DECL_TEST_DECODE_RANDOM_HEADERS (5); -DECL_TEST_DECODE_RANDOM_HEADERS (8); -DECL_TEST_DECODE_RANDOM_HEADERS (13); -DECL_TEST_DECODE_RANDOM_HEADERS (21); -DECL_TEST_DECODE_RANDOM_HEADERS (34); -DECL_TEST_DECODE_RANDOM_HEADERS (55); -DECL_TEST_DECODE_RANDOM_HEADERS (89); -DECL_TEST_DECODE_RANDOM_HEADERS (144); - -static void -run_test (void (*test) (), const char *name) -{ - gpr_log (GPR_INFO, "RUN TEST: %s", name); - g_mdctx = grpc_mdctx_create_with_seed (0); - grpc_chttp2_hpack_compressor_init (&g_compressor, g_mdctx); - grpc_sopb_init (&g_sopb); - test (); - grpc_chttp2_hpack_compressor_destroy (&g_compressor); - grpc_mdctx_unref (g_mdctx); - grpc_sopb_destroy (&g_sopb); +DECL_TEST_DECODE_RANDOM_HEADERS(1); +DECL_TEST_DECODE_RANDOM_HEADERS(2); +DECL_TEST_DECODE_RANDOM_HEADERS(3); +DECL_TEST_DECODE_RANDOM_HEADERS(5); +DECL_TEST_DECODE_RANDOM_HEADERS(8); +DECL_TEST_DECODE_RANDOM_HEADERS(13); +DECL_TEST_DECODE_RANDOM_HEADERS(21); +DECL_TEST_DECODE_RANDOM_HEADERS(34); +DECL_TEST_DECODE_RANDOM_HEADERS(55); +DECL_TEST_DECODE_RANDOM_HEADERS(89); +DECL_TEST_DECODE_RANDOM_HEADERS(144); + +static void run_test(void (*test)(), const char *name) { + gpr_log(GPR_INFO, "RUN TEST: %s", name); + g_mdctx = grpc_mdctx_create_with_seed(0); + grpc_chttp2_hpack_compressor_init(&g_compressor, g_mdctx); + grpc_sopb_init(&g_sopb); + test(); + grpc_chttp2_hpack_compressor_destroy(&g_compressor); + grpc_mdctx_unref(g_mdctx); + grpc_sopb_destroy(&g_sopb); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { size_t i; - grpc_test_init (argc, argv); - TEST (test_small_data_framing); - TEST (test_basic_headers); - TEST (test_decode_table_overflow); - TEST (test_decode_random_headers_1); - TEST (test_decode_random_headers_2); - TEST (test_decode_random_headers_3); - TEST (test_decode_random_headers_5); - TEST (test_decode_random_headers_8); - TEST (test_decode_random_headers_13); - TEST (test_decode_random_headers_21); - TEST (test_decode_random_headers_34); - TEST (test_decode_random_headers_55); - TEST (test_decode_random_headers_89); - TEST (test_decode_random_headers_144); - for (i = 0; i < num_to_delete; i++) - { - gpr_free (to_delete[i]); - } + grpc_test_init(argc, argv); + TEST(test_small_data_framing); + TEST(test_basic_headers); + TEST(test_decode_table_overflow); + TEST(test_decode_random_headers_1); + TEST(test_decode_random_headers_2); + TEST(test_decode_random_headers_3); + TEST(test_decode_random_headers_5); + TEST(test_decode_random_headers_8); + TEST(test_decode_random_headers_13); + TEST(test_decode_random_headers_21); + TEST(test_decode_random_headers_34); + TEST(test_decode_random_headers_55); + TEST(test_decode_random_headers_89); + TEST(test_decode_random_headers_144); + for (i = 0; i < num_to_delete; i++) { + gpr_free(to_delete[i]); + } return g_failure; } diff --git a/test/core/transport/chttp2/stream_map_test.c b/test/core/transport/chttp2/stream_map_test.c index 87efab5fa54..81fb80f84f1 100644 --- a/test/core/transport/chttp2/stream_map_test.c +++ b/test/core/transport/chttp2/stream_map_test.c @@ -38,228 +38,193 @@ #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) /* test creation & destruction */ -static void -test_no_op (void) -{ +static void test_no_op(void) { grpc_chttp2_stream_map map; - LOG_TEST ("test_no_op"); + LOG_TEST("test_no_op"); - grpc_chttp2_stream_map_init (&map, 8); - grpc_chttp2_stream_map_destroy (&map); + grpc_chttp2_stream_map_init(&map, 8); + grpc_chttp2_stream_map_destroy(&map); } /* test lookup on an empty map */ -static void -test_empty_find (void) -{ +static void test_empty_find(void) { grpc_chttp2_stream_map map; - LOG_TEST ("test_empty_find"); + LOG_TEST("test_empty_find"); - grpc_chttp2_stream_map_init (&map, 8); - GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (&map, 39128)); - grpc_chttp2_stream_map_destroy (&map); + grpc_chttp2_stream_map_init(&map, 8); + GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(&map, 39128)); + grpc_chttp2_stream_map_destroy(&map); } /* test it's safe to delete twice */ -static void -test_double_deletion (void) -{ +static void test_double_deletion(void) { grpc_chttp2_stream_map map; - LOG_TEST ("test_double_deletion"); - - grpc_chttp2_stream_map_init (&map, 8); - GPR_ASSERT (0 == grpc_chttp2_stream_map_size (&map)); - grpc_chttp2_stream_map_add (&map, 1, (void *) 1); - GPR_ASSERT ((void *) 1 == grpc_chttp2_stream_map_find (&map, 1)); - GPR_ASSERT (1 == grpc_chttp2_stream_map_size (&map)); - GPR_ASSERT ((void *) 1 == grpc_chttp2_stream_map_delete (&map, 1)); - GPR_ASSERT (0 == grpc_chttp2_stream_map_size (&map)); - GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (&map, 1)); - GPR_ASSERT (NULL == grpc_chttp2_stream_map_delete (&map, 1)); - GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (&map, 1)); - GPR_ASSERT (NULL == grpc_chttp2_stream_map_delete (&map, 1)); - GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (&map, 1)); - GPR_ASSERT (NULL == grpc_chttp2_stream_map_delete (&map, 1)); - GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (&map, 1)); - grpc_chttp2_stream_map_destroy (&map); + LOG_TEST("test_double_deletion"); + + grpc_chttp2_stream_map_init(&map, 8); + GPR_ASSERT(0 == grpc_chttp2_stream_map_size(&map)); + grpc_chttp2_stream_map_add(&map, 1, (void *)1); + GPR_ASSERT((void *)1 == grpc_chttp2_stream_map_find(&map, 1)); + GPR_ASSERT(1 == grpc_chttp2_stream_map_size(&map)); + GPR_ASSERT((void *)1 == grpc_chttp2_stream_map_delete(&map, 1)); + GPR_ASSERT(0 == grpc_chttp2_stream_map_size(&map)); + GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(&map, 1)); + GPR_ASSERT(NULL == grpc_chttp2_stream_map_delete(&map, 1)); + GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(&map, 1)); + GPR_ASSERT(NULL == grpc_chttp2_stream_map_delete(&map, 1)); + GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(&map, 1)); + GPR_ASSERT(NULL == grpc_chttp2_stream_map_delete(&map, 1)); + GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(&map, 1)); + grpc_chttp2_stream_map_destroy(&map); } /* test add & lookup */ -static void -test_basic_add_find (gpr_uint32 n) -{ +static void test_basic_add_find(gpr_uint32 n) { grpc_chttp2_stream_map map; gpr_uint32 i; size_t got; - LOG_TEST ("test_basic_add_find"); - gpr_log (GPR_INFO, "n = %d", n); - - grpc_chttp2_stream_map_init (&map, 8); - GPR_ASSERT (0 == grpc_chttp2_stream_map_size (&map)); - for (i = 1; i <= n; i++) - { - grpc_chttp2_stream_map_add (&map, i, (void *) (gpr_uintptr) i); - } - GPR_ASSERT (n == grpc_chttp2_stream_map_size (&map)); - GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (&map, 0)); - GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (&map, n + 1)); - for (i = 1; i <= n; i++) - { - got = (gpr_uintptr) grpc_chttp2_stream_map_find (&map, i); - GPR_ASSERT (i == got); - } - grpc_chttp2_stream_map_destroy (&map); + LOG_TEST("test_basic_add_find"); + gpr_log(GPR_INFO, "n = %d", n); + + grpc_chttp2_stream_map_init(&map, 8); + GPR_ASSERT(0 == grpc_chttp2_stream_map_size(&map)); + for (i = 1; i <= n; i++) { + grpc_chttp2_stream_map_add(&map, i, (void *)(gpr_uintptr)i); + } + GPR_ASSERT(n == grpc_chttp2_stream_map_size(&map)); + GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(&map, 0)); + GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(&map, n + 1)); + for (i = 1; i <= n; i++) { + got = (gpr_uintptr)grpc_chttp2_stream_map_find(&map, i); + GPR_ASSERT(i == got); + } + grpc_chttp2_stream_map_destroy(&map); } /* verify that for_each gets the right values during test_delete_evens_XXX */ -static void -verify_for_each (void *user_data, gpr_uint32 stream_id, void *ptr) -{ +static void verify_for_each(void *user_data, gpr_uint32 stream_id, void *ptr) { gpr_uint32 *for_each_check = user_data; - GPR_ASSERT (ptr); - GPR_ASSERT (*for_each_check == stream_id); + GPR_ASSERT(ptr); + GPR_ASSERT(*for_each_check == stream_id); *for_each_check += 2; } -static void -check_delete_evens (grpc_chttp2_stream_map * map, gpr_uint32 n) -{ +static void check_delete_evens(grpc_chttp2_stream_map *map, gpr_uint32 n) { gpr_uint32 for_each_check = 1; gpr_uint32 i; size_t got; - GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (map, 0)); - GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (map, n + 1)); - for (i = 1; i <= n; i++) - { - if (i & 1) - { - got = (gpr_uintptr) grpc_chttp2_stream_map_find (map, i); - GPR_ASSERT (i == got); - } - else - { - GPR_ASSERT (NULL == grpc_chttp2_stream_map_find (map, i)); - } - } - - grpc_chttp2_stream_map_for_each (map, verify_for_each, &for_each_check); - if (n & 1) - { - GPR_ASSERT (for_each_check == n + 2); - } - else - { - GPR_ASSERT (for_each_check == n + 1); + GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(map, 0)); + GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(map, n + 1)); + for (i = 1; i <= n; i++) { + if (i & 1) { + got = (gpr_uintptr)grpc_chttp2_stream_map_find(map, i); + GPR_ASSERT(i == got); + } else { + GPR_ASSERT(NULL == grpc_chttp2_stream_map_find(map, i)); } + } + + grpc_chttp2_stream_map_for_each(map, verify_for_each, &for_each_check); + if (n & 1) { + GPR_ASSERT(for_each_check == n + 2); + } else { + GPR_ASSERT(for_each_check == n + 1); + } } /* add a bunch of keys, delete the even ones, and make sure the map is consistent */ -static void -test_delete_evens_sweep (gpr_uint32 n) -{ +static void test_delete_evens_sweep(gpr_uint32 n) { grpc_chttp2_stream_map map; gpr_uint32 i; - LOG_TEST ("test_delete_evens_sweep"); - gpr_log (GPR_INFO, "n = %d", n); - - grpc_chttp2_stream_map_init (&map, 8); - for (i = 1; i <= n; i++) - { - grpc_chttp2_stream_map_add (&map, i, (void *) (gpr_uintptr) i); - } - for (i = 1; i <= n; i++) - { - if ((i & 1) == 0) - { - GPR_ASSERT ((void *) (gpr_uintptr) i == grpc_chttp2_stream_map_delete (&map, i)); - } + LOG_TEST("test_delete_evens_sweep"); + gpr_log(GPR_INFO, "n = %d", n); + + grpc_chttp2_stream_map_init(&map, 8); + for (i = 1; i <= n; i++) { + grpc_chttp2_stream_map_add(&map, i, (void *)(gpr_uintptr)i); + } + for (i = 1; i <= n; i++) { + if ((i & 1) == 0) { + GPR_ASSERT((void *)(gpr_uintptr)i == + grpc_chttp2_stream_map_delete(&map, i)); } - check_delete_evens (&map, n); - grpc_chttp2_stream_map_destroy (&map); + } + check_delete_evens(&map, n); + grpc_chttp2_stream_map_destroy(&map); } /* add a bunch of keys, delete the even ones immediately, and make sure the map is consistent */ -static void -test_delete_evens_incremental (gpr_uint32 n) -{ +static void test_delete_evens_incremental(gpr_uint32 n) { grpc_chttp2_stream_map map; gpr_uint32 i; - LOG_TEST ("test_delete_evens_incremental"); - gpr_log (GPR_INFO, "n = %d", n); - - grpc_chttp2_stream_map_init (&map, 8); - for (i = 1; i <= n; i++) - { - grpc_chttp2_stream_map_add (&map, i, (void *) (gpr_uintptr) i); - if ((i & 1) == 0) - { - grpc_chttp2_stream_map_delete (&map, i); - } + LOG_TEST("test_delete_evens_incremental"); + gpr_log(GPR_INFO, "n = %d", n); + + grpc_chttp2_stream_map_init(&map, 8); + for (i = 1; i <= n; i++) { + grpc_chttp2_stream_map_add(&map, i, (void *)(gpr_uintptr)i); + if ((i & 1) == 0) { + grpc_chttp2_stream_map_delete(&map, i); } - check_delete_evens (&map, n); - grpc_chttp2_stream_map_destroy (&map); + } + check_delete_evens(&map, n); + grpc_chttp2_stream_map_destroy(&map); } /* add a bunch of keys, delete old ones after some time, ensure the backing array does not grow */ -static void -test_periodic_compaction (gpr_uint32 n) -{ +static void test_periodic_compaction(gpr_uint32 n) { grpc_chttp2_stream_map map; gpr_uint32 i; gpr_uint32 del; - LOG_TEST ("test_periodic_compaction"); - gpr_log (GPR_INFO, "n = %d", n); - - grpc_chttp2_stream_map_init (&map, 16); - GPR_ASSERT (map.capacity == 16); - for (i = 1; i <= n; i++) - { - grpc_chttp2_stream_map_add (&map, i, (void *) (gpr_uintptr) i); - if (i > 8) - { - del = i - 8; - GPR_ASSERT ((void *) (gpr_uintptr) del == grpc_chttp2_stream_map_delete (&map, del)); - } + LOG_TEST("test_periodic_compaction"); + gpr_log(GPR_INFO, "n = %d", n); + + grpc_chttp2_stream_map_init(&map, 16); + GPR_ASSERT(map.capacity == 16); + for (i = 1; i <= n; i++) { + grpc_chttp2_stream_map_add(&map, i, (void *)(gpr_uintptr)i); + if (i > 8) { + del = i - 8; + GPR_ASSERT((void *)(gpr_uintptr)del == + grpc_chttp2_stream_map_delete(&map, del)); } - GPR_ASSERT (map.capacity == 16); - grpc_chttp2_stream_map_destroy (&map); + } + GPR_ASSERT(map.capacity == 16); + grpc_chttp2_stream_map_destroy(&map); } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { gpr_uint32 n = 1; gpr_uint32 prev = 1; gpr_uint32 tmp; - grpc_test_init (argc, argv); + grpc_test_init(argc, argv); - test_no_op (); - test_empty_find (); - test_double_deletion (); + test_no_op(); + test_empty_find(); + test_double_deletion(); - while (n < 100000) - { - test_basic_add_find (n); - test_delete_evens_sweep (n); - test_delete_evens_incremental (n); - test_periodic_compaction (n); + while (n < 100000) { + test_basic_add_find(n); + test_delete_evens_sweep(n); + test_delete_evens_incremental(n); + test_periodic_compaction(n); - tmp = n; - n += prev; - prev = tmp; - } + tmp = n; + n += prev; + prev = tmp; + } return 0; } diff --git a/test/core/transport/chttp2/timeout_encoding_test.c b/test/core/transport/chttp2/timeout_encoding_test.c index 949bd3fae64..ba6c3191f1e 100644 --- a/test/core/transport/chttp2/timeout_encoding_test.c +++ b/test/core/transport/chttp2/timeout_encoding_test.c @@ -45,122 +45,109 @@ #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) -static void -assert_encodes_as (gpr_timespec ts, const char *s) -{ +static void assert_encodes_as(gpr_timespec ts, const char *s) { char buffer[GRPC_CHTTP2_TIMEOUT_ENCODE_MIN_BUFSIZE]; - grpc_chttp2_encode_timeout (ts, buffer); - gpr_log (GPR_INFO, "check '%s' == '%s'", buffer, s); - GPR_ASSERT (0 == strcmp (buffer, s)); + grpc_chttp2_encode_timeout(ts, buffer); + gpr_log(GPR_INFO, "check '%s' == '%s'", buffer, s); + GPR_ASSERT(0 == strcmp(buffer, s)); } -void -test_encoding (void) -{ - LOG_TEST ("test_encoding"); - assert_encodes_as (gpr_time_from_micros (-1, GPR_TIMESPAN), "1n"); - assert_encodes_as (gpr_time_from_seconds (-10, GPR_TIMESPAN), "1n"); - assert_encodes_as (gpr_time_from_nanos (10, GPR_TIMESPAN), "10n"); - assert_encodes_as (gpr_time_from_nanos (999999999, GPR_TIMESPAN), "1S"); - assert_encodes_as (gpr_time_from_micros (1, GPR_TIMESPAN), "1u"); - assert_encodes_as (gpr_time_from_micros (10, GPR_TIMESPAN), "10u"); - assert_encodes_as (gpr_time_from_micros (100, GPR_TIMESPAN), "100u"); - assert_encodes_as (gpr_time_from_micros (890, GPR_TIMESPAN), "890u"); - assert_encodes_as (gpr_time_from_micros (900, GPR_TIMESPAN), "900u"); - assert_encodes_as (gpr_time_from_micros (901, GPR_TIMESPAN), "901u"); - assert_encodes_as (gpr_time_from_millis (1, GPR_TIMESPAN), "1m"); - assert_encodes_as (gpr_time_from_millis (2, GPR_TIMESPAN), "2m"); - assert_encodes_as (gpr_time_from_micros (10001, GPR_TIMESPAN), "10100u"); - assert_encodes_as (gpr_time_from_micros (999999, GPR_TIMESPAN), "1S"); - assert_encodes_as (gpr_time_from_millis (1000, GPR_TIMESPAN), "1S"); - assert_encodes_as (gpr_time_from_millis (2000, GPR_TIMESPAN), "2S"); - assert_encodes_as (gpr_time_from_millis (2500, GPR_TIMESPAN), "2500m"); - assert_encodes_as (gpr_time_from_millis (59900, GPR_TIMESPAN), "59900m"); - assert_encodes_as (gpr_time_from_seconds (50, GPR_TIMESPAN), "50S"); - assert_encodes_as (gpr_time_from_seconds (59, GPR_TIMESPAN), "59S"); - assert_encodes_as (gpr_time_from_seconds (60, GPR_TIMESPAN), "1M"); - assert_encodes_as (gpr_time_from_seconds (80, GPR_TIMESPAN), "80S"); - assert_encodes_as (gpr_time_from_seconds (90, GPR_TIMESPAN), "90S"); - assert_encodes_as (gpr_time_from_minutes (2, GPR_TIMESPAN), "2M"); - assert_encodes_as (gpr_time_from_minutes (20, GPR_TIMESPAN), "20M"); - assert_encodes_as (gpr_time_from_hours (1, GPR_TIMESPAN), "1H"); - assert_encodes_as (gpr_time_from_hours (10, GPR_TIMESPAN), "10H"); - assert_encodes_as (gpr_time_from_seconds (1000000000, GPR_TIMESPAN), "1000000000S"); +void test_encoding(void) { + LOG_TEST("test_encoding"); + assert_encodes_as(gpr_time_from_micros(-1, GPR_TIMESPAN), "1n"); + assert_encodes_as(gpr_time_from_seconds(-10, GPR_TIMESPAN), "1n"); + assert_encodes_as(gpr_time_from_nanos(10, GPR_TIMESPAN), "10n"); + assert_encodes_as(gpr_time_from_nanos(999999999, GPR_TIMESPAN), "1S"); + assert_encodes_as(gpr_time_from_micros(1, GPR_TIMESPAN), "1u"); + assert_encodes_as(gpr_time_from_micros(10, GPR_TIMESPAN), "10u"); + assert_encodes_as(gpr_time_from_micros(100, GPR_TIMESPAN), "100u"); + assert_encodes_as(gpr_time_from_micros(890, GPR_TIMESPAN), "890u"); + assert_encodes_as(gpr_time_from_micros(900, GPR_TIMESPAN), "900u"); + assert_encodes_as(gpr_time_from_micros(901, GPR_TIMESPAN), "901u"); + assert_encodes_as(gpr_time_from_millis(1, GPR_TIMESPAN), "1m"); + assert_encodes_as(gpr_time_from_millis(2, GPR_TIMESPAN), "2m"); + assert_encodes_as(gpr_time_from_micros(10001, GPR_TIMESPAN), "10100u"); + assert_encodes_as(gpr_time_from_micros(999999, GPR_TIMESPAN), "1S"); + assert_encodes_as(gpr_time_from_millis(1000, GPR_TIMESPAN), "1S"); + assert_encodes_as(gpr_time_from_millis(2000, GPR_TIMESPAN), "2S"); + assert_encodes_as(gpr_time_from_millis(2500, GPR_TIMESPAN), "2500m"); + assert_encodes_as(gpr_time_from_millis(59900, GPR_TIMESPAN), "59900m"); + assert_encodes_as(gpr_time_from_seconds(50, GPR_TIMESPAN), "50S"); + assert_encodes_as(gpr_time_from_seconds(59, GPR_TIMESPAN), "59S"); + assert_encodes_as(gpr_time_from_seconds(60, GPR_TIMESPAN), "1M"); + assert_encodes_as(gpr_time_from_seconds(80, GPR_TIMESPAN), "80S"); + assert_encodes_as(gpr_time_from_seconds(90, GPR_TIMESPAN), "90S"); + assert_encodes_as(gpr_time_from_minutes(2, GPR_TIMESPAN), "2M"); + assert_encodes_as(gpr_time_from_minutes(20, GPR_TIMESPAN), "20M"); + assert_encodes_as(gpr_time_from_hours(1, GPR_TIMESPAN), "1H"); + assert_encodes_as(gpr_time_from_hours(10, GPR_TIMESPAN), "10H"); + assert_encodes_as(gpr_time_from_seconds(1000000000, GPR_TIMESPAN), + "1000000000S"); } -static void -assert_decodes_as (const char *buffer, gpr_timespec expected) -{ +static void assert_decodes_as(const char *buffer, gpr_timespec expected) { gpr_timespec got; - gpr_log (GPR_INFO, "check decoding '%s'", buffer); - GPR_ASSERT (1 == grpc_chttp2_decode_timeout (buffer, &got)); - GPR_ASSERT (0 == gpr_time_cmp (got, expected)); + gpr_log(GPR_INFO, "check decoding '%s'", buffer); + GPR_ASSERT(1 == grpc_chttp2_decode_timeout(buffer, &got)); + GPR_ASSERT(0 == gpr_time_cmp(got, expected)); } -void -decode_suite (char ext, gpr_timespec (*answer) (long x, gpr_clock_type clock)) -{ - long test_vals[] = { 1, 12, 123, 1234, 12345, 123456, - 1234567, 12345678, 123456789, 98765432, 9876543, 987654, - 98765, 9876, 987, 98, 9 - }; +void decode_suite(char ext, + gpr_timespec (*answer)(long x, gpr_clock_type clock)) { + long test_vals[] = {1, 12, 123, 1234, 12345, 123456, + 1234567, 12345678, 123456789, 98765432, 9876543, 987654, + 98765, 9876, 987, 98, 9}; unsigned i; char *input; - for (i = 0; i < GPR_ARRAY_SIZE (test_vals); i++) - { - gpr_asprintf (&input, "%ld%c", test_vals[i], ext); - assert_decodes_as (input, answer (test_vals[i], GPR_TIMESPAN)); - gpr_free (input); + for (i = 0; i < GPR_ARRAY_SIZE(test_vals); i++) { + gpr_asprintf(&input, "%ld%c", test_vals[i], ext); + assert_decodes_as(input, answer(test_vals[i], GPR_TIMESPAN)); + gpr_free(input); - gpr_asprintf (&input, " %ld%c", test_vals[i], ext); - assert_decodes_as (input, answer (test_vals[i], GPR_TIMESPAN)); - gpr_free (input); + gpr_asprintf(&input, " %ld%c", test_vals[i], ext); + assert_decodes_as(input, answer(test_vals[i], GPR_TIMESPAN)); + gpr_free(input); - gpr_asprintf (&input, "%ld %c", test_vals[i], ext); - assert_decodes_as (input, answer (test_vals[i], GPR_TIMESPAN)); - gpr_free (input); + gpr_asprintf(&input, "%ld %c", test_vals[i], ext); + assert_decodes_as(input, answer(test_vals[i], GPR_TIMESPAN)); + gpr_free(input); - gpr_asprintf (&input, "%ld %c ", test_vals[i], ext); - assert_decodes_as (input, answer (test_vals[i], GPR_TIMESPAN)); - gpr_free (input); - } + gpr_asprintf(&input, "%ld %c ", test_vals[i], ext); + assert_decodes_as(input, answer(test_vals[i], GPR_TIMESPAN)); + gpr_free(input); + } } -void -test_decoding (void) -{ - LOG_TEST ("test_decoding"); - decode_suite ('n', gpr_time_from_nanos); - decode_suite ('u', gpr_time_from_micros); - decode_suite ('m', gpr_time_from_millis); - decode_suite ('S', gpr_time_from_seconds); - decode_suite ('M', gpr_time_from_minutes); - decode_suite ('H', gpr_time_from_hours); - assert_decodes_as ("1000000000000000000000u", gpr_inf_future (GPR_CLOCK_REALTIME)); +void test_decoding(void) { + LOG_TEST("test_decoding"); + decode_suite('n', gpr_time_from_nanos); + decode_suite('u', gpr_time_from_micros); + decode_suite('m', gpr_time_from_millis); + decode_suite('S', gpr_time_from_seconds); + decode_suite('M', gpr_time_from_minutes); + decode_suite('H', gpr_time_from_hours); + assert_decodes_as("1000000000000000000000u", + gpr_inf_future(GPR_CLOCK_REALTIME)); } -void -test_decoding_fails (void) -{ +void test_decoding_fails(void) { gpr_timespec x; - LOG_TEST ("test_decoding_fails"); - GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("", &x)); - GPR_ASSERT (0 == grpc_chttp2_decode_timeout (" ", &x)); - GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("x", &x)); - GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("1", &x)); - GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("1x", &x)); - GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("1ux", &x)); - GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("!", &x)); - GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("n1", &x)); - GPR_ASSERT (0 == grpc_chttp2_decode_timeout ("-1u", &x)); + LOG_TEST("test_decoding_fails"); + GPR_ASSERT(0 == grpc_chttp2_decode_timeout("", &x)); + GPR_ASSERT(0 == grpc_chttp2_decode_timeout(" ", &x)); + GPR_ASSERT(0 == grpc_chttp2_decode_timeout("x", &x)); + GPR_ASSERT(0 == grpc_chttp2_decode_timeout("1", &x)); + GPR_ASSERT(0 == grpc_chttp2_decode_timeout("1x", &x)); + GPR_ASSERT(0 == grpc_chttp2_decode_timeout("1ux", &x)); + GPR_ASSERT(0 == grpc_chttp2_decode_timeout("!", &x)); + GPR_ASSERT(0 == grpc_chttp2_decode_timeout("n1", &x)); + GPR_ASSERT(0 == grpc_chttp2_decode_timeout("-1u", &x)); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_encoding (); - test_decoding (); - test_decoding_fails (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_encoding(); + test_decoding(); + test_decoding_fails(); return 0; } diff --git a/test/core/transport/metadata_test.c b/test/core/transport/metadata_test.c index 33c2ddf091d..1861442bb1d 100644 --- a/test/core/transport/metadata_test.c +++ b/test/core/transport/metadata_test.c @@ -47,263 +47,237 @@ /* a large number */ #define MANY 10000 -static void -test_no_op (void) -{ +static void test_no_op(void) { grpc_mdctx *ctx; - LOG_TEST ("test_no_op"); + LOG_TEST("test_no_op"); - ctx = grpc_mdctx_create (); - grpc_mdctx_unref (ctx); + ctx = grpc_mdctx_create(); + grpc_mdctx_unref(ctx); } -static void -test_create_string (void) -{ +static void test_create_string(void) { grpc_mdctx *ctx; grpc_mdstr *s1, *s2, *s3; - LOG_TEST ("test_create_string"); - - ctx = grpc_mdctx_create (); - s1 = grpc_mdstr_from_string (ctx, "hello", 0); - s2 = grpc_mdstr_from_string (ctx, "hello", 0); - s3 = grpc_mdstr_from_string (ctx, "very much not hello", 0); - GPR_ASSERT (s1 == s2); - GPR_ASSERT (s3 != s1); - GPR_ASSERT (gpr_slice_str_cmp (s1->slice, "hello") == 0); - GPR_ASSERT (gpr_slice_str_cmp (s3->slice, "very much not hello") == 0); - GRPC_MDSTR_UNREF (s1); - GRPC_MDSTR_UNREF (s2); - grpc_mdctx_unref (ctx); - GRPC_MDSTR_UNREF (s3); + LOG_TEST("test_create_string"); + + ctx = grpc_mdctx_create(); + s1 = grpc_mdstr_from_string(ctx, "hello", 0); + s2 = grpc_mdstr_from_string(ctx, "hello", 0); + s3 = grpc_mdstr_from_string(ctx, "very much not hello", 0); + GPR_ASSERT(s1 == s2); + GPR_ASSERT(s3 != s1); + GPR_ASSERT(gpr_slice_str_cmp(s1->slice, "hello") == 0); + GPR_ASSERT(gpr_slice_str_cmp(s3->slice, "very much not hello") == 0); + GRPC_MDSTR_UNREF(s1); + GRPC_MDSTR_UNREF(s2); + grpc_mdctx_unref(ctx); + GRPC_MDSTR_UNREF(s3); } -static void -test_create_metadata (void) -{ +static void test_create_metadata(void) { grpc_mdctx *ctx; grpc_mdelem *m1, *m2, *m3; - LOG_TEST ("test_create_metadata"); - - ctx = grpc_mdctx_create (); - m1 = grpc_mdelem_from_strings (ctx, "a", "b"); - m2 = grpc_mdelem_from_strings (ctx, "a", "b"); - m3 = grpc_mdelem_from_strings (ctx, "a", "c"); - GPR_ASSERT (m1 == m2); - GPR_ASSERT (m3 != m1); - GPR_ASSERT (m3->key == m1->key); - GPR_ASSERT (m3->value != m1->value); - GPR_ASSERT (gpr_slice_str_cmp (m1->key->slice, "a") == 0); - GPR_ASSERT (gpr_slice_str_cmp (m1->value->slice, "b") == 0); - GPR_ASSERT (gpr_slice_str_cmp (m3->value->slice, "c") == 0); - GRPC_MDELEM_UNREF (m1); - GRPC_MDELEM_UNREF (m2); - GRPC_MDELEM_UNREF (m3); - grpc_mdctx_unref (ctx); + LOG_TEST("test_create_metadata"); + + ctx = grpc_mdctx_create(); + m1 = grpc_mdelem_from_strings(ctx, "a", "b"); + m2 = grpc_mdelem_from_strings(ctx, "a", "b"); + m3 = grpc_mdelem_from_strings(ctx, "a", "c"); + GPR_ASSERT(m1 == m2); + GPR_ASSERT(m3 != m1); + GPR_ASSERT(m3->key == m1->key); + GPR_ASSERT(m3->value != m1->value); + GPR_ASSERT(gpr_slice_str_cmp(m1->key->slice, "a") == 0); + GPR_ASSERT(gpr_slice_str_cmp(m1->value->slice, "b") == 0); + GPR_ASSERT(gpr_slice_str_cmp(m3->value->slice, "c") == 0); + GRPC_MDELEM_UNREF(m1); + GRPC_MDELEM_UNREF(m2); + GRPC_MDELEM_UNREF(m3); + grpc_mdctx_unref(ctx); } -static void -test_create_many_ephemeral_metadata (void) -{ +static void test_create_many_ephemeral_metadata(void) { grpc_mdctx *ctx; char buffer[GPR_LTOA_MIN_BUFSIZE]; long i; size_t mdtab_capacity_before; - LOG_TEST ("test_create_many_ephemeral_metadata"); + LOG_TEST("test_create_many_ephemeral_metadata"); - ctx = grpc_mdctx_create (); - mdtab_capacity_before = grpc_mdctx_get_mdtab_capacity_test_only (ctx); + ctx = grpc_mdctx_create(); + mdtab_capacity_before = grpc_mdctx_get_mdtab_capacity_test_only(ctx); /* 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_strings (ctx, "a", buffer)); - } + for (i = 0; i < MANY; i++) { + gpr_ltoa(i, buffer); + GRPC_MDELEM_UNREF(grpc_mdelem_from_strings(ctx, "a", buffer)); + } /* capacity should not grow */ - GPR_ASSERT (mdtab_capacity_before == grpc_mdctx_get_mdtab_capacity_test_only (ctx)); - grpc_mdctx_unref (ctx); + GPR_ASSERT(mdtab_capacity_before == + grpc_mdctx_get_mdtab_capacity_test_only(ctx)); + grpc_mdctx_unref(ctx); } -static void -test_create_many_persistant_metadata (void) -{ +static void test_create_many_persistant_metadata(void) { grpc_mdctx *ctx; char buffer[GPR_LTOA_MIN_BUFSIZE]; long i; - grpc_mdelem **created = gpr_malloc (sizeof (grpc_mdelem *) * MANY); + grpc_mdelem **created = gpr_malloc(sizeof(grpc_mdelem *) * MANY); grpc_mdelem *md; - LOG_TEST ("test_create_many_persistant_metadata"); + LOG_TEST("test_create_many_persistant_metadata"); - ctx = grpc_mdctx_create (); + ctx = grpc_mdctx_create(); /* add phase */ - for (i = 0; i < MANY; i++) - { - gpr_ltoa (i, buffer); - created[i] = grpc_mdelem_from_strings (ctx, "a", buffer); - } + for (i = 0; i < MANY; i++) { + gpr_ltoa(i, buffer); + created[i] = grpc_mdelem_from_strings(ctx, "a", buffer); + } /* verify phase */ - for (i = 0; i < MANY; i++) - { - gpr_ltoa (i, buffer); - md = grpc_mdelem_from_strings (ctx, "a", buffer); - GPR_ASSERT (md == created[i]); - GRPC_MDELEM_UNREF (md); - } + for (i = 0; i < MANY; i++) { + gpr_ltoa(i, buffer); + md = grpc_mdelem_from_strings(ctx, "a", buffer); + GPR_ASSERT(md == created[i]); + GRPC_MDELEM_UNREF(md); + } /* cleanup phase */ - for (i = 0; i < MANY; i++) - { - GRPC_MDELEM_UNREF (created[i]); - } - grpc_mdctx_unref (ctx); + for (i = 0; i < MANY; i++) { + GRPC_MDELEM_UNREF(created[i]); + } + grpc_mdctx_unref(ctx); - gpr_free (created); + gpr_free(created); } -static void -test_spin_creating_the_same_thing (void) -{ +static void test_spin_creating_the_same_thing(void) { grpc_mdctx *ctx; - LOG_TEST ("test_spin_creating_the_same_thing"); + LOG_TEST("test_spin_creating_the_same_thing"); - ctx = grpc_mdctx_create (); - GPR_ASSERT (grpc_mdctx_get_mdtab_count_test_only (ctx) == 0); - GPR_ASSERT (grpc_mdctx_get_mdtab_free_test_only (ctx) == 0); + ctx = grpc_mdctx_create(); + GPR_ASSERT(grpc_mdctx_get_mdtab_count_test_only(ctx) == 0); + GPR_ASSERT(grpc_mdctx_get_mdtab_free_test_only(ctx) == 0); - GRPC_MDELEM_UNREF (grpc_mdelem_from_strings (ctx, "a", "b")); - GPR_ASSERT (grpc_mdctx_get_mdtab_count_test_only (ctx) == 1); - GPR_ASSERT (grpc_mdctx_get_mdtab_free_test_only (ctx) == 1); + GRPC_MDELEM_UNREF(grpc_mdelem_from_strings(ctx, "a", "b")); + GPR_ASSERT(grpc_mdctx_get_mdtab_count_test_only(ctx) == 1); + GPR_ASSERT(grpc_mdctx_get_mdtab_free_test_only(ctx) == 1); - GRPC_MDELEM_UNREF (grpc_mdelem_from_strings (ctx, "a", "b")); - GPR_ASSERT (grpc_mdctx_get_mdtab_count_test_only (ctx) == 1); - GPR_ASSERT (grpc_mdctx_get_mdtab_free_test_only (ctx) == 1); + GRPC_MDELEM_UNREF(grpc_mdelem_from_strings(ctx, "a", "b")); + GPR_ASSERT(grpc_mdctx_get_mdtab_count_test_only(ctx) == 1); + GPR_ASSERT(grpc_mdctx_get_mdtab_free_test_only(ctx) == 1); - GRPC_MDELEM_UNREF (grpc_mdelem_from_strings (ctx, "a", "b")); - GPR_ASSERT (grpc_mdctx_get_mdtab_count_test_only (ctx) == 1); - GPR_ASSERT (grpc_mdctx_get_mdtab_free_test_only (ctx) == 1); + GRPC_MDELEM_UNREF(grpc_mdelem_from_strings(ctx, "a", "b")); + GPR_ASSERT(grpc_mdctx_get_mdtab_count_test_only(ctx) == 1); + GPR_ASSERT(grpc_mdctx_get_mdtab_free_test_only(ctx) == 1); - grpc_mdctx_unref (ctx); + grpc_mdctx_unref(ctx); } -static void -test_things_stick_around (void) -{ +static void test_things_stick_around(void) { grpc_mdctx *ctx; size_t i, j; char *buffer; size_t nstrs = 1000; - grpc_mdstr **strs = gpr_malloc (sizeof (grpc_mdstr *) * nstrs); - size_t *shuf = gpr_malloc (sizeof (size_t) * nstrs); + grpc_mdstr **strs = gpr_malloc(sizeof(grpc_mdstr *) * nstrs); + size_t *shuf = gpr_malloc(sizeof(size_t) * nstrs); grpc_mdstr *test; - LOG_TEST ("test_things_stick_around"); - - ctx = grpc_mdctx_create (); - - for (i = 0; i < nstrs; i++) - { - gpr_asprintf (&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%dx", i); - strs[i] = grpc_mdstr_from_string (ctx, buffer, 0); - shuf[i] = i; - gpr_free (buffer); - } - - for (i = 0; i < nstrs; i++) - { - GRPC_MDSTR_REF (strs[i]); - GRPC_MDSTR_UNREF (strs[i]); - } - - for (i = 0; i < nstrs; i++) - { - size_t p = (size_t) rand () % nstrs; - size_t q = (size_t) rand () % nstrs; - size_t temp = shuf[p]; - shuf[p] = shuf[q]; - shuf[q] = temp; - } - - for (i = 0; i < nstrs; i++) - { - GRPC_MDSTR_UNREF (strs[shuf[i]]); - for (j = i + 1; j < nstrs; j++) - { - gpr_asprintf (&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%dx", shuf[j]); - test = grpc_mdstr_from_string (ctx, buffer, 0); - GPR_ASSERT (test == strs[shuf[j]]); - GRPC_MDSTR_UNREF (test); - gpr_free (buffer); - } + LOG_TEST("test_things_stick_around"); + + ctx = grpc_mdctx_create(); + + for (i = 0; i < nstrs; i++) { + gpr_asprintf(&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%dx", i); + strs[i] = grpc_mdstr_from_string(ctx, buffer, 0); + shuf[i] = i; + gpr_free(buffer); + } + + for (i = 0; i < nstrs; i++) { + GRPC_MDSTR_REF(strs[i]); + GRPC_MDSTR_UNREF(strs[i]); + } + + for (i = 0; i < nstrs; i++) { + size_t p = (size_t)rand() % nstrs; + size_t q = (size_t)rand() % nstrs; + size_t temp = shuf[p]; + shuf[p] = shuf[q]; + shuf[q] = temp; + } + + for (i = 0; i < nstrs; i++) { + GRPC_MDSTR_UNREF(strs[shuf[i]]); + for (j = i + 1; j < nstrs; j++) { + gpr_asprintf(&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%dx", shuf[j]); + test = grpc_mdstr_from_string(ctx, buffer, 0); + GPR_ASSERT(test == strs[shuf[j]]); + GRPC_MDSTR_UNREF(test); + gpr_free(buffer); } + } - grpc_mdctx_unref (ctx); - gpr_free (strs); - gpr_free (shuf); + grpc_mdctx_unref(ctx); + gpr_free(strs); + gpr_free(shuf); } -static void -test_slices_work (void) -{ +static void test_slices_work(void) { /* ensure no memory leaks when switching representation from mdstr to slice */ grpc_mdctx *ctx; grpc_mdstr *str; gpr_slice slice; - LOG_TEST ("test_slices_work"); + LOG_TEST("test_slices_work"); - ctx = grpc_mdctx_create (); + ctx = grpc_mdctx_create(); - str = grpc_mdstr_from_string (ctx, "123456789012345678901234567890123456789012345678901234567890", 0); - slice = gpr_slice_ref (str->slice); - GRPC_MDSTR_UNREF (str); - gpr_slice_unref (slice); + str = grpc_mdstr_from_string( + ctx, "123456789012345678901234567890123456789012345678901234567890", 0); + slice = gpr_slice_ref(str->slice); + GRPC_MDSTR_UNREF(str); + gpr_slice_unref(slice); - str = grpc_mdstr_from_string (ctx, "123456789012345678901234567890123456789012345678901234567890", 0); - slice = gpr_slice_ref (str->slice); - gpr_slice_unref (slice); - GRPC_MDSTR_UNREF (str); + str = grpc_mdstr_from_string( + ctx, "123456789012345678901234567890123456789012345678901234567890", 0); + slice = gpr_slice_ref(str->slice); + gpr_slice_unref(slice); + GRPC_MDSTR_UNREF(str); - grpc_mdctx_unref (ctx); + grpc_mdctx_unref(ctx); } -static void -test_base64_and_huffman_works (void) -{ +static void test_base64_and_huffman_works(void) { grpc_mdctx *ctx; grpc_mdstr *str; gpr_slice slice1; gpr_slice slice2; - LOG_TEST ("test_base64_and_huffman_works"); + LOG_TEST("test_base64_and_huffman_works"); - ctx = grpc_mdctx_create (); - str = grpc_mdstr_from_string (ctx, "abcdefg", 0); - slice1 = grpc_mdstr_as_base64_encoded_and_huffman_compressed (str); - slice2 = grpc_chttp2_base64_encode_and_huffman_compress (str->slice); - GPR_ASSERT (0 == gpr_slice_cmp (slice1, slice2)); + ctx = grpc_mdctx_create(); + str = grpc_mdstr_from_string(ctx, "abcdefg", 0); + slice1 = grpc_mdstr_as_base64_encoded_and_huffman_compressed(str); + slice2 = grpc_chttp2_base64_encode_and_huffman_compress(str->slice); + GPR_ASSERT(0 == gpr_slice_cmp(slice1, slice2)); - gpr_slice_unref (slice2); - GRPC_MDSTR_UNREF (str); - grpc_mdctx_unref (ctx); + gpr_slice_unref(slice2); + GRPC_MDSTR_UNREF(str); + grpc_mdctx_unref(ctx); } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_no_op (); - test_create_string (); - test_create_metadata (); - test_create_many_ephemeral_metadata (); - test_create_many_persistant_metadata (); - test_spin_creating_the_same_thing (); - test_things_stick_around (); - test_slices_work (); - test_base64_and_huffman_works (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_no_op(); + test_create_string(); + test_create_metadata(); + test_create_many_ephemeral_metadata(); + test_create_many_persistant_metadata(); + test_spin_creating_the_same_thing(); + test_things_stick_around(); + test_slices_work(); + test_base64_and_huffman_works(); return 0; } diff --git a/test/core/transport/stream_op_test.c b/test/core/transport/stream_op_test.c index 74d70a92863..546080deb90 100644 --- a/test/core/transport/stream_op_test.c +++ b/test/core/transport/stream_op_test.c @@ -38,86 +38,79 @@ #include #include "test/core/util/test_config.h" -static void -assert_slices_equal (gpr_slice a, gpr_slice b) -{ - GPR_ASSERT (a.refcount == b.refcount); - if (a.refcount) - { - GPR_ASSERT (a.data.refcounted.bytes == b.data.refcounted.bytes); - GPR_ASSERT (a.data.refcounted.length == b.data.refcounted.length); - } - else - { - GPR_ASSERT (a.data.inlined.length == b.data.inlined.length); - GPR_ASSERT (0 == memcmp (a.data.inlined.bytes, b.data.inlined.bytes, a.data.inlined.length)); - } +static void assert_slices_equal(gpr_slice a, gpr_slice b) { + GPR_ASSERT(a.refcount == b.refcount); + if (a.refcount) { + GPR_ASSERT(a.data.refcounted.bytes == b.data.refcounted.bytes); + GPR_ASSERT(a.data.refcounted.length == b.data.refcounted.length); + } else { + GPR_ASSERT(a.data.inlined.length == b.data.inlined.length); + GPR_ASSERT(0 == memcmp(a.data.inlined.bytes, b.data.inlined.bytes, + a.data.inlined.length)); + } } -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { /* some basic test data */ - gpr_slice test_slice_1 = gpr_slice_malloc (1); - gpr_slice test_slice_2 = gpr_slice_malloc (2); - gpr_slice test_slice_3 = gpr_slice_malloc (3); - gpr_slice test_slice_4 = gpr_slice_malloc (4); + gpr_slice test_slice_1 = gpr_slice_malloc(1); + gpr_slice test_slice_2 = gpr_slice_malloc(2); + gpr_slice test_slice_3 = gpr_slice_malloc(3); + gpr_slice test_slice_4 = gpr_slice_malloc(4); unsigned i; grpc_stream_op_buffer buf; grpc_stream_op_buffer buf2; - grpc_test_init (argc, argv); + grpc_test_init(argc, argv); /* initialize one of our buffers */ - grpc_sopb_init (&buf); + grpc_sopb_init(&buf); /* it should start out empty */ - GPR_ASSERT (buf.nops == 0); + GPR_ASSERT(buf.nops == 0); /* add some data to the buffer */ - grpc_sopb_add_begin_message (&buf, 1, 2); - grpc_sopb_add_slice (&buf, test_slice_1); - grpc_sopb_add_slice (&buf, test_slice_2); - grpc_sopb_add_slice (&buf, test_slice_3); - grpc_sopb_add_slice (&buf, test_slice_4); - grpc_sopb_add_no_op (&buf); + grpc_sopb_add_begin_message(&buf, 1, 2); + grpc_sopb_add_slice(&buf, test_slice_1); + grpc_sopb_add_slice(&buf, test_slice_2); + grpc_sopb_add_slice(&buf, test_slice_3); + grpc_sopb_add_slice(&buf, test_slice_4); + grpc_sopb_add_no_op(&buf); /* verify that the data went in ok */ - GPR_ASSERT (buf.nops == 6); - GPR_ASSERT (buf.ops[0].type == GRPC_OP_BEGIN_MESSAGE); - GPR_ASSERT (buf.ops[0].data.begin_message.length == 1); - GPR_ASSERT (buf.ops[0].data.begin_message.flags == 2); - GPR_ASSERT (buf.ops[1].type == GRPC_OP_SLICE); - assert_slices_equal (buf.ops[1].data.slice, test_slice_1); - GPR_ASSERT (buf.ops[2].type == GRPC_OP_SLICE); - assert_slices_equal (buf.ops[2].data.slice, test_slice_2); - GPR_ASSERT (buf.ops[3].type == GRPC_OP_SLICE); - assert_slices_equal (buf.ops[3].data.slice, test_slice_3); - GPR_ASSERT (buf.ops[4].type == GRPC_OP_SLICE); - assert_slices_equal (buf.ops[4].data.slice, test_slice_4); - GPR_ASSERT (buf.ops[5].type == GRPC_NO_OP); + GPR_ASSERT(buf.nops == 6); + GPR_ASSERT(buf.ops[0].type == GRPC_OP_BEGIN_MESSAGE); + GPR_ASSERT(buf.ops[0].data.begin_message.length == 1); + GPR_ASSERT(buf.ops[0].data.begin_message.flags == 2); + GPR_ASSERT(buf.ops[1].type == GRPC_OP_SLICE); + assert_slices_equal(buf.ops[1].data.slice, test_slice_1); + GPR_ASSERT(buf.ops[2].type == GRPC_OP_SLICE); + assert_slices_equal(buf.ops[2].data.slice, test_slice_2); + GPR_ASSERT(buf.ops[3].type == GRPC_OP_SLICE); + assert_slices_equal(buf.ops[3].data.slice, test_slice_3); + GPR_ASSERT(buf.ops[4].type == GRPC_OP_SLICE); + assert_slices_equal(buf.ops[4].data.slice, test_slice_4); + GPR_ASSERT(buf.ops[5].type == GRPC_NO_OP); /* initialize the second buffer */ - grpc_sopb_init (&buf2); + grpc_sopb_init(&buf2); /* add a no-op, and then the original buffer */ - grpc_sopb_add_no_op (&buf2); - grpc_sopb_append (&buf2, buf.ops, buf.nops); + grpc_sopb_add_no_op(&buf2); + grpc_sopb_append(&buf2, buf.ops, buf.nops); /* should be one element bigger than the original */ - GPR_ASSERT (buf2.nops == buf.nops + 1); - GPR_ASSERT (buf2.ops[0].type == GRPC_NO_OP); + GPR_ASSERT(buf2.nops == buf.nops + 1); + GPR_ASSERT(buf2.ops[0].type == GRPC_NO_OP); /* and the tail should be the same */ - for (i = 0; i < buf.nops; i++) - { - GPR_ASSERT (buf2.ops[i + 1].type == buf.ops[i].type); - } + for (i = 0; i < buf.nops; i++) { + GPR_ASSERT(buf2.ops[i + 1].type == buf.ops[i].type); + } /* destroy the buffers */ - grpc_sopb_destroy (&buf); - grpc_sopb_destroy (&buf2); + grpc_sopb_destroy(&buf); + grpc_sopb_destroy(&buf2); - gpr_slice_unref (test_slice_1); - gpr_slice_unref (test_slice_2); - gpr_slice_unref (test_slice_3); - gpr_slice_unref (test_slice_4); + gpr_slice_unref(test_slice_1); + gpr_slice_unref(test_slice_2); + gpr_slice_unref(test_slice_3); + gpr_slice_unref(test_slice_4); return 0; } diff --git a/test/core/tsi/transport_security_test.c b/test/core/tsi/transport_security_test.c index 4852a44bb18..858b92fc9d2 100644 --- a/test/core/tsi/transport_security_test.c +++ b/test/core/tsi/transport_security_test.c @@ -46,8 +46,7 @@ #include "src/core/tsi/ssl_transport_security.h" #include "test/core/util/test_config.h" -typedef struct -{ +typedef struct { /* 1 if success, 0 if failure. */ int expected; @@ -67,255 +66,238 @@ typedef struct chromium/src/net/cert/x509_certificate_unittest.cc. TODO(jboeuf) uncomment test cases as we fix tsi_ssl_peer_matches_name. */ const cert_name_test_entry cert_name_test_entries[] = { - {1, "foo.com", "foo.com", NULL}, - {1, "f", "f", NULL}, - {0, "h", "i", NULL}, - {1, "bar.foo.com", "*.foo.com", NULL}, - {1, "www.test.fr", "common.name", - "*.test.com,*.test.co.uk,*.test.de,*.test.fr"}, - /* - {1, "wwW.tESt.fr", "common.name", ",*.*,*.test.de,*.test.FR,www"}, - */ - {0, "f.uk", ".uk", NULL}, - {0, "w.bar.foo.com", "?.bar.foo.com", NULL}, - {0, "www.foo.com", "(www|ftp).foo.com", NULL}, - {0, "www.foo.com", "www.foo.com#", NULL}, /* # = null char. */ - {0, "www.foo.com", "", "www.foo.com#*.foo.com,#,#"}, - {0, "www.house.example", "ww.house.example", NULL}, - {0, "test.org", "", "www.test.org,*.test.org,*.org"}, - {0, "w.bar.foo.com", "w*.bar.foo.com", NULL}, - {0, "www.bar.foo.com", "ww*ww.bar.foo.com", NULL}, - {0, "wwww.bar.foo.com", "ww*ww.bar.foo.com", NULL}, - {0, "wwww.bar.foo.com", "w*w.bar.foo.com", NULL}, - {0, "wwww.bar.foo.com", "w*w.bar.foo.c0m", NULL}, - {0, "WALLY.bar.foo.com", "wa*.bar.foo.com", NULL}, - {0, "wally.bar.foo.com", "*Ly.bar.foo.com", NULL}, - /* - {1, "ww%57.foo.com", "", "www.foo.com"}, - {1, "www&.foo.com", "www%26.foo.com", NULL}, - */ - - /* Common name must not be used if subject alternative name was provided. */ - {0, "www.test.co.jp", "www.test.co.jp", - "*.test.de,*.jp,www.test.co.uk,www.*.co.jp"}, - {0, "www.bar.foo.com", "www.bar.foo.com", - "*.foo.com,*.*.foo.com,*.*.bar.foo.com,*..bar.foo.com,"}, - - /* IDN tests */ - {1, "xn--poema-9qae5a.com.br", "xn--poema-9qae5a.com.br", NULL}, - {1, "www.xn--poema-9qae5a.com.br", "*.xn--poema-9qae5a.com.br", NULL}, - {0, "xn--poema-9qae5a.com.br", "", - "*.xn--poema-9qae5a.com.br," "xn--poema-*.com.br," "xn--*-9qae5a.com.br," "*--poema-9qae5a.com.br"}, - - /* The following are adapted from the examples quoted from - http://tools.ietf.org/html/rfc6125#section-6.4.3 - (e.g., *.example.com would match foo.example.com but - not bar.foo.example.com or example.com). */ - {1, "foo.example.com", "*.example.com", NULL}, - {0, "bar.foo.example.com", "*.example.com", NULL}, - {0, "example.com", "*.example.com", NULL}, - - /* Partial wildcards are disallowed, though RFC 2818 rules allow them. - That is, forms such as baz*.example.net, *baz.example.net, and - b*z.example.net should NOT match domains. Instead, the wildcard must - always be the left-most label, and only a single label. */ - {0, "baz1.example.net", "baz*.example.net", NULL}, - {0, "foobaz.example.net", "*baz.example.net", NULL}, - {0, "buzz.example.net", "b*z.example.net", NULL}, - {0, "www.test.example.net", "www.*.example.net", NULL}, - - /* Wildcards should not be valid for public registry controlled domains, - and unknown/unrecognized domains, at least three domain components must - be present. */ - {1, "www.test.example", "*.test.example", NULL}, - {1, "test.example.co.uk", "*.example.co.uk", NULL}, - {0, "test.example", "*.example", NULL}, - /* - {0, "example.co.uk", "*.co.uk", NULL}, - */ - {0, "foo.com", "*.com", NULL}, - {0, "foo.us", "*.us", NULL}, - {0, "foo", "*", NULL}, - - /* IDN variants of wildcards and registry controlled domains. */ - {1, "www.xn--poema-9qae5a.com.br", "*.xn--poema-9qae5a.com.br", NULL}, - {1, "test.example.xn--mgbaam7a8h", "*.example.xn--mgbaam7a8h", NULL}, - /* - {0, "xn--poema-9qae5a.com.br", "*.com.br", NULL}, - */ - {0, "example.xn--mgbaam7a8h", "*.xn--mgbaam7a8h", NULL}, - - /* Wildcards should be permissible for 'private' registry controlled - domains. */ - {1, "www.appspot.com", "*.appspot.com", NULL}, - {1, "foo.s3.amazonaws.com", "*.s3.amazonaws.com", NULL}, - - /* Multiple wildcards are not valid. */ - {0, "foo.example.com", "*.*.com", NULL}, - {0, "foo.bar.example.com", "*.bar.*.com", NULL}, - - /* Absolute vs relative DNS name tests. Although not explicitly specified - in RFC 6125, absolute reference names (those ending in a .) should - match either absolute or relative presented names. */ - {1, "foo.com", "foo.com.", NULL}, - {1, "foo.com.", "foo.com", NULL}, - {1, "foo.com.", "foo.com.", NULL}, - {1, "f", "f.", NULL}, - {1, "f.", "f", NULL}, - {1, "f.", "f.", NULL}, - {1, "www-3.bar.foo.com", "*.bar.foo.com.", NULL}, - {1, "www-3.bar.foo.com.", "*.bar.foo.com", NULL}, - {1, "www-3.bar.foo.com.", "*.bar.foo.com.", NULL}, - {0, ".", ".", NULL}, - {0, "example.com", "*.com.", NULL}, - {0, "example.com.", "*.com", NULL}, - {0, "example.com.", "*.com.", NULL}, - {0, "foo.", "*.", NULL}, - {0, "foo", "*.", NULL}, - /* - {0, "foo.co.uk", "*.co.uk.", NULL}, - {0, "foo.co.uk.", "*.co.uk.", NULL}, - */ - - /* An empty CN is OK. */ - {1, "test.foo.com", "", "test.foo.com"}, - - /* An IP should not be used for the CN. */ - {0, "173.194.195.139", "173.194.195.139", NULL}, + {1, "foo.com", "foo.com", NULL}, + {1, "f", "f", NULL}, + {0, "h", "i", NULL}, + {1, "bar.foo.com", "*.foo.com", NULL}, + {1, "www.test.fr", "common.name", + "*.test.com,*.test.co.uk,*.test.de,*.test.fr"}, + /* + {1, "wwW.tESt.fr", "common.name", ",*.*,*.test.de,*.test.FR,www"}, + */ + {0, "f.uk", ".uk", NULL}, + {0, "w.bar.foo.com", "?.bar.foo.com", NULL}, + {0, "www.foo.com", "(www|ftp).foo.com", NULL}, + {0, "www.foo.com", "www.foo.com#", NULL}, /* # = null char. */ + {0, "www.foo.com", "", "www.foo.com#*.foo.com,#,#"}, + {0, "www.house.example", "ww.house.example", NULL}, + {0, "test.org", "", "www.test.org,*.test.org,*.org"}, + {0, "w.bar.foo.com", "w*.bar.foo.com", NULL}, + {0, "www.bar.foo.com", "ww*ww.bar.foo.com", NULL}, + {0, "wwww.bar.foo.com", "ww*ww.bar.foo.com", NULL}, + {0, "wwww.bar.foo.com", "w*w.bar.foo.com", NULL}, + {0, "wwww.bar.foo.com", "w*w.bar.foo.c0m", NULL}, + {0, "WALLY.bar.foo.com", "wa*.bar.foo.com", NULL}, + {0, "wally.bar.foo.com", "*Ly.bar.foo.com", NULL}, + /* + {1, "ww%57.foo.com", "", "www.foo.com"}, + {1, "www&.foo.com", "www%26.foo.com", NULL}, + */ + + /* Common name must not be used if subject alternative name was provided. */ + {0, "www.test.co.jp", "www.test.co.jp", + "*.test.de,*.jp,www.test.co.uk,www.*.co.jp"}, + {0, "www.bar.foo.com", "www.bar.foo.com", + "*.foo.com,*.*.foo.com,*.*.bar.foo.com,*..bar.foo.com,"}, + + /* IDN tests */ + {1, "xn--poema-9qae5a.com.br", "xn--poema-9qae5a.com.br", NULL}, + {1, "www.xn--poema-9qae5a.com.br", "*.xn--poema-9qae5a.com.br", NULL}, + {0, "xn--poema-9qae5a.com.br", "", + "*.xn--poema-9qae5a.com.br," + "xn--poema-*.com.br," + "xn--*-9qae5a.com.br," + "*--poema-9qae5a.com.br"}, + + /* The following are adapted from the examples quoted from + http://tools.ietf.org/html/rfc6125#section-6.4.3 + (e.g., *.example.com would match foo.example.com but + not bar.foo.example.com or example.com). */ + {1, "foo.example.com", "*.example.com", NULL}, + {0, "bar.foo.example.com", "*.example.com", NULL}, + {0, "example.com", "*.example.com", NULL}, + + /* Partial wildcards are disallowed, though RFC 2818 rules allow them. + That is, forms such as baz*.example.net, *baz.example.net, and + b*z.example.net should NOT match domains. Instead, the wildcard must + always be the left-most label, and only a single label. */ + {0, "baz1.example.net", "baz*.example.net", NULL}, + {0, "foobaz.example.net", "*baz.example.net", NULL}, + {0, "buzz.example.net", "b*z.example.net", NULL}, + {0, "www.test.example.net", "www.*.example.net", NULL}, + + /* Wildcards should not be valid for public registry controlled domains, + and unknown/unrecognized domains, at least three domain components must + be present. */ + {1, "www.test.example", "*.test.example", NULL}, + {1, "test.example.co.uk", "*.example.co.uk", NULL}, + {0, "test.example", "*.example", NULL}, + /* + {0, "example.co.uk", "*.co.uk", NULL}, + */ + {0, "foo.com", "*.com", NULL}, + {0, "foo.us", "*.us", NULL}, + {0, "foo", "*", NULL}, + + /* IDN variants of wildcards and registry controlled domains. */ + {1, "www.xn--poema-9qae5a.com.br", "*.xn--poema-9qae5a.com.br", NULL}, + {1, "test.example.xn--mgbaam7a8h", "*.example.xn--mgbaam7a8h", NULL}, + /* + {0, "xn--poema-9qae5a.com.br", "*.com.br", NULL}, + */ + {0, "example.xn--mgbaam7a8h", "*.xn--mgbaam7a8h", NULL}, + + /* Wildcards should be permissible for 'private' registry controlled + domains. */ + {1, "www.appspot.com", "*.appspot.com", NULL}, + {1, "foo.s3.amazonaws.com", "*.s3.amazonaws.com", NULL}, + + /* Multiple wildcards are not valid. */ + {0, "foo.example.com", "*.*.com", NULL}, + {0, "foo.bar.example.com", "*.bar.*.com", NULL}, + + /* Absolute vs relative DNS name tests. Although not explicitly specified + in RFC 6125, absolute reference names (those ending in a .) should + match either absolute or relative presented names. */ + {1, "foo.com", "foo.com.", NULL}, + {1, "foo.com.", "foo.com", NULL}, + {1, "foo.com.", "foo.com.", NULL}, + {1, "f", "f.", NULL}, + {1, "f.", "f", NULL}, + {1, "f.", "f.", NULL}, + {1, "www-3.bar.foo.com", "*.bar.foo.com.", NULL}, + {1, "www-3.bar.foo.com.", "*.bar.foo.com", NULL}, + {1, "www-3.bar.foo.com.", "*.bar.foo.com.", NULL}, + {0, ".", ".", NULL}, + {0, "example.com", "*.com.", NULL}, + {0, "example.com.", "*.com", NULL}, + {0, "example.com.", "*.com.", NULL}, + {0, "foo.", "*.", NULL}, + {0, "foo", "*.", NULL}, + /* + {0, "foo.co.uk", "*.co.uk.", NULL}, + {0, "foo.co.uk.", "*.co.uk.", NULL}, + */ + + /* An empty CN is OK. */ + {1, "test.foo.com", "", "test.foo.com"}, + + /* An IP should not be used for the CN. */ + {0, "173.194.195.139", "173.194.195.139", NULL}, }; -typedef struct name_list -{ +typedef struct name_list { const char *name; struct name_list *next; } name_list; -typedef struct -{ +typedef struct { size_t name_count; char *buffer; name_list *names; } parsed_dns_names; -name_list * -name_list_add (const char *n) -{ - name_list *result = gpr_malloc (sizeof (name_list)); +name_list *name_list_add(const char *n) { + name_list *result = gpr_malloc(sizeof(name_list)); result->name = n; result->next = NULL; return result; } -static parsed_dns_names -parse_dns_names (const char *dns_names_str) -{ +static parsed_dns_names parse_dns_names(const char *dns_names_str) { parsed_dns_names result; name_list *current_nl; size_t i; - memset (&result, 0, sizeof (parsed_dns_names)); - if (dns_names_str == 0) - return result; + memset(&result, 0, sizeof(parsed_dns_names)); + if (dns_names_str == 0) return result; result.name_count = 1; - result.buffer = gpr_strdup (dns_names_str); - result.names = name_list_add (result.buffer); + result.buffer = gpr_strdup(dns_names_str); + result.names = name_list_add(result.buffer); current_nl = result.names; - for (i = 0; i < strlen (dns_names_str); i++) - { - if (dns_names_str[i] == ',') - { - result.buffer[i] = '\0'; - result.name_count++; - i++; - current_nl->next = name_list_add (result.buffer + i); - current_nl = current_nl->next; - } + for (i = 0; i < strlen(dns_names_str); i++) { + if (dns_names_str[i] == ',') { + result.buffer[i] = '\0'; + result.name_count++; + i++; + current_nl->next = name_list_add(result.buffer + i); + current_nl = current_nl->next; } + } return result; } -static void -destruct_parsed_dns_names (parsed_dns_names * pdn) -{ +static void destruct_parsed_dns_names(parsed_dns_names *pdn) { name_list *nl = pdn->names; - if (pdn->buffer != NULL) - gpr_free (pdn->buffer); - while (nl != NULL) - { - name_list *to_be_free = nl; - nl = nl->next; - gpr_free (to_be_free); - } + if (pdn->buffer != NULL) gpr_free(pdn->buffer); + while (nl != NULL) { + name_list *to_be_free = nl; + nl = nl->next; + gpr_free(to_be_free); + } } -static char * -processed_dns_name (const char *dns_name) -{ - char *result = gpr_strdup (dns_name); +static char *processed_dns_name(const char *dns_name) { + char *result = gpr_strdup(dns_name); size_t i; - for (i = 0; i < strlen (result); i++) - { - if (result[i] == '#') - { - result[i] = '\0'; - } + for (i = 0; i < strlen(result); i++) { + if (result[i] == '#') { + result[i] = '\0'; } + } return result; } -static tsi_peer -peer_from_cert_name_test_entry (const cert_name_test_entry * entry) -{ +static tsi_peer peer_from_cert_name_test_entry( + const cert_name_test_entry *entry) { size_t i; tsi_peer peer; name_list *nl; - parsed_dns_names dns_entries = parse_dns_names (entry->dns_names); + parsed_dns_names dns_entries = parse_dns_names(entry->dns_names); nl = dns_entries.names; - GPR_ASSERT (tsi_construct_peer (1 + dns_entries.name_count, &peer) == TSI_OK); - GPR_ASSERT (tsi_construct_string_peer_property_from_cstring (TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, entry->common_name, &peer.properties[0]) == TSI_OK); + GPR_ASSERT(tsi_construct_peer(1 + dns_entries.name_count, &peer) == TSI_OK); + GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( + TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY, entry->common_name, + &peer.properties[0]) == TSI_OK); i = 1; - while (nl != NULL) - { - char *processed = processed_dns_name (nl->name); - GPR_ASSERT (tsi_construct_string_peer_property (TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, processed, strlen (nl->name), &peer.properties[i++]) == TSI_OK); - nl = nl->next; - gpr_free (processed); - } - destruct_parsed_dns_names (&dns_entries); + while (nl != NULL) { + char *processed = processed_dns_name(nl->name); + GPR_ASSERT(tsi_construct_string_peer_property( + TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, processed, + strlen(nl->name), &peer.properties[i++]) == TSI_OK); + nl = nl->next; + gpr_free(processed); + } + destruct_parsed_dns_names(&dns_entries); return peer; } -char * -cert_name_test_entry_to_string (const cert_name_test_entry * entry) -{ +char *cert_name_test_entry_to_string(const cert_name_test_entry *entry) { char *s; - gpr_asprintf (&s, "{ success = %s, host_name = %s, common_name = %s, dns_names = %s}", entry->expected ? "true" : "false", entry->host_name, entry->common_name, entry->dns_names != NULL ? entry->dns_names : ""); + gpr_asprintf( + &s, "{ success = %s, host_name = %s, common_name = %s, dns_names = %s}", + entry->expected ? "true" : "false", entry->host_name, entry->common_name, + entry->dns_names != NULL ? entry->dns_names : ""); return s; } -static void -test_peer_matches_name (void) -{ +static void test_peer_matches_name(void) { size_t i = 0; - for (i = 0; i < GPR_ARRAY_SIZE (cert_name_test_entries); i++) - { - const cert_name_test_entry *entry = &cert_name_test_entries[i]; - tsi_peer peer = peer_from_cert_name_test_entry (entry); - int result = tsi_ssl_peer_matches_name (&peer, entry->host_name); - if (result != entry->expected) - { - char *entry_str = cert_name_test_entry_to_string (entry); - gpr_log (GPR_ERROR, "%s", entry_str); - gpr_free (entry_str); - GPR_ASSERT (0); /* Unexpected result. */ - } - tsi_peer_destruct (&peer); + for (i = 0; i < GPR_ARRAY_SIZE(cert_name_test_entries); i++) { + const cert_name_test_entry *entry = &cert_name_test_entries[i]; + tsi_peer peer = peer_from_cert_name_test_entry(entry); + int result = tsi_ssl_peer_matches_name(&peer, entry->host_name); + if (result != entry->expected) { + char *entry_str = cert_name_test_entry_to_string(entry); + gpr_log(GPR_ERROR, "%s", entry_str); + gpr_free(entry_str); + GPR_ASSERT(0); /* Unexpected result. */ } + tsi_peer_destruct(&peer); + } } -int -main (int argc, char **argv) -{ - grpc_test_init (argc, argv); - test_peer_matches_name (); +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + test_peer_matches_name(); return 0; } diff --git a/test/core/util/grpc_profiler.c b/test/core/util/grpc_profiler.c index 0df6c13e5d6..c2c0c9cf53b 100644 --- a/test/core/util/grpc_profiler.c +++ b/test/core/util/grpc_profiler.c @@ -36,34 +36,25 @@ #if GRPC_HAVE_PERFTOOLS #include -void -grpc_profiler_start (const char *filename) -{ - ProfilerStart (filename); -} +void grpc_profiler_start(const char *filename) { ProfilerStart(filename); } -void -grpc_profiler_stop () -{ - ProfilerStop (); -} +void grpc_profiler_stop() { ProfilerStop(); } #else #include -void -grpc_profiler_start (const char *filename) -{ +void grpc_profiler_start(const char *filename) { static int printed_warning = 0; - if (!printed_warning) - { - gpr_log (GPR_DEBUG, "You do not have google-perftools installed, profiling is disabled " "[for %s]", filename); - gpr_log (GPR_DEBUG, "To install on ubuntu: sudo apt-get install google-perftools " "libgoogle-perftools-dev"); - printed_warning = 1; - } + if (!printed_warning) { + gpr_log(GPR_DEBUG, + "You do not have google-perftools installed, profiling is disabled " + "[for %s]", + filename); + gpr_log(GPR_DEBUG, + "To install on ubuntu: sudo apt-get install google-perftools " + "libgoogle-perftools-dev"); + printed_warning = 1; + } } -void -grpc_profiler_stop (void) -{ -} +void grpc_profiler_stop(void) {} #endif diff --git a/test/core/util/grpc_profiler.h b/test/core/util/grpc_profiler.h index 423c73b3316..88ec6bcb0e9 100644 --- a/test/core/util/grpc_profiler.h +++ b/test/core/util/grpc_profiler.h @@ -35,15 +35,14 @@ #define GRPC_TEST_CORE_UTIL_GRPC_PROFILER_H #ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ +extern "C" { +#endif /* __cplusplus */ - void grpc_profiler_start (const char *filename); - void grpc_profiler_stop (); +void grpc_profiler_start(const char *filename); +void grpc_profiler_stop(); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif /* __cplusplus */ -#endif /* GRPC_TEST_CORE_UTIL_GRPC_PROFILER_H */ +#endif /* GRPC_TEST_CORE_UTIL_GRPC_PROFILER_H */ diff --git a/test/core/util/parse_hexstring.c b/test/core/util/parse_hexstring.c index 3d01dfc9a70..eced3173d16 100644 --- a/test/core/util/parse_hexstring.c +++ b/test/core/util/parse_hexstring.c @@ -34,45 +34,37 @@ #include "test/core/util/parse_hexstring.h" #include -gpr_slice -parse_hexstring (const char *hexstring) -{ +gpr_slice parse_hexstring(const char *hexstring) { size_t nibbles = 0; const char *p = 0; gpr_uint8 *out; gpr_uint8 temp; gpr_slice slice; - for (p = hexstring; *p; p++) - { - nibbles += (*p >= '0' && *p <= '9') || (*p >= 'a' && *p <= 'f'); - } + for (p = hexstring; *p; p++) { + nibbles += (*p >= '0' && *p <= '9') || (*p >= 'a' && *p <= 'f'); + } - GPR_ASSERT ((nibbles & 1) == 0); + GPR_ASSERT((nibbles & 1) == 0); - slice = gpr_slice_malloc (nibbles / 2); - out = GPR_SLICE_START_PTR (slice); + slice = gpr_slice_malloc(nibbles / 2); + out = GPR_SLICE_START_PTR(slice); nibbles = 0; temp = 0; - for (p = hexstring; *p; p++) - { - if (*p >= '0' && *p <= '9') - { - temp = (gpr_uint8) (temp << 4) | (gpr_uint8) (*p - '0'); - nibbles++; - } - else if (*p >= 'a' && *p <= 'f') - { - temp = (gpr_uint8) (temp << 4) | (gpr_uint8) (*p - 'a' + 10); - nibbles++; - } - if (nibbles == 2) - { - *out++ = temp; - nibbles = 0; - } + for (p = hexstring; *p; p++) { + if (*p >= '0' && *p <= '9') { + temp = (gpr_uint8)(temp << 4) | (gpr_uint8)(*p - '0'); + nibbles++; + } else if (*p >= 'a' && *p <= 'f') { + temp = (gpr_uint8)(temp << 4) | (gpr_uint8)(*p - 'a' + 10); + nibbles++; + } + if (nibbles == 2) { + *out++ = temp; + nibbles = 0; } + } return slice; } diff --git a/test/core/util/parse_hexstring.h b/test/core/util/parse_hexstring.h index d2c47703304..ddbfe541c69 100644 --- a/test/core/util/parse_hexstring.h +++ b/test/core/util/parse_hexstring.h @@ -36,6 +36,6 @@ #include -gpr_slice parse_hexstring (const char *hexstring); +gpr_slice parse_hexstring(const char *hexstring); #endif /* GRPC_TEST_CORE_UTIL_PARSE_HEXSTRING_H */ diff --git a/test/core/util/port.h b/test/core/util/port.h index ededcbe854f..93788bcab24 100644 --- a/test/core/util/port.h +++ b/test/core/util/port.h @@ -35,19 +35,18 @@ #define GRPC_TEST_CORE_UTIL_PORT_H #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* pick a port number that is currently unused by either tcp or udp. return 0 on failure. */ - int grpc_pick_unused_port (); +int grpc_pick_unused_port(); /* pick a port number that is currently unused by either tcp or udp. abort on failure. */ - int grpc_pick_unused_port_or_die (); +int grpc_pick_unused_port_or_die(); #ifdef __cplusplus } #endif -#endif /* GRPC_TEST_CORE_UTIL_PORT_H */ +#endif /* GRPC_TEST_CORE_UTIL_PORT_H */ diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index da2541ecc36..887079e0f8a 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -57,46 +57,37 @@ static int *chosen_ports = NULL; static size_t num_chosen_ports = 0; -static int -has_port_been_chosen (int port) -{ +static int has_port_been_chosen(int port) { size_t i; - for (i = 0; i < num_chosen_ports; i++) - { - if (chosen_ports[i] == port) - { - return 1; - } + for (i = 0; i < num_chosen_ports; i++) { + if (chosen_ports[i] == port) { + return 1; } + } return 0; } -typedef struct freereq -{ +typedef struct freereq { grpc_pollset pollset; int done; } freereq; -static void -destroy_pollset_and_shutdown (grpc_exec_ctx * exec_ctx, void *p, int success) -{ - grpc_pollset_destroy (p); - grpc_shutdown (); +static void destroy_pollset_and_shutdown(grpc_exec_ctx *exec_ctx, void *p, + int success) { + grpc_pollset_destroy(p); + grpc_shutdown(); } -static void -freed_port_from_server (grpc_exec_ctx * exec_ctx, void *arg, const grpc_httpcli_response * response) -{ +static void freed_port_from_server(grpc_exec_ctx *exec_ctx, void *arg, + const grpc_httpcli_response *response) { freereq *pr = arg; - gpr_mu_lock (GRPC_POLLSET_MU (&pr->pollset)); + gpr_mu_lock(GRPC_POLLSET_MU(&pr->pollset)); pr->done = 1; - grpc_pollset_kick (&pr->pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&pr->pollset)); + grpc_pollset_kick(&pr->pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&pr->pollset)); } -static void -free_port_using_server (char *server, int port) -{ +static void free_port_using_server(char *server, int port) { grpc_httpcli_context context; grpc_httpcli_request req; freereq pr; @@ -104,125 +95,112 @@ free_port_using_server (char *server, int port) grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure shutdown_closure; - grpc_init (); + grpc_init(); - memset (&pr, 0, sizeof (pr)); - memset (&req, 0, sizeof (req)); - grpc_pollset_init (&pr.pollset); - grpc_closure_init (&shutdown_closure, destroy_pollset_and_shutdown, &pr.pollset); + memset(&pr, 0, sizeof(pr)); + memset(&req, 0, sizeof(req)); + grpc_pollset_init(&pr.pollset); + grpc_closure_init(&shutdown_closure, destroy_pollset_and_shutdown, + &pr.pollset); req.host = server; - gpr_asprintf (&path, "/drop/%d", port); + gpr_asprintf(&path, "/drop/%d", port); req.path = path; - grpc_httpcli_context_init (&context); - grpc_httpcli_get (&exec_ctx, &context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), freed_port_from_server, &pr); - gpr_mu_lock (GRPC_POLLSET_MU (&pr.pollset)); - while (!pr.done) - { - grpc_pollset_worker worker; - grpc_pollset_work (&exec_ctx, &pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1)); - } - gpr_mu_unlock (GRPC_POLLSET_MU (&pr.pollset)); - - grpc_httpcli_context_destroy (&context); - grpc_exec_ctx_finish (&exec_ctx); - grpc_pollset_shutdown (&exec_ctx, &pr.pollset, &shutdown_closure); - grpc_exec_ctx_finish (&exec_ctx); - gpr_free (path); + grpc_httpcli_context_init(&context); + grpc_httpcli_get(&exec_ctx, &context, &pr.pollset, &req, + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), freed_port_from_server, + &pr); + gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); + while (!pr.done) { + grpc_pollset_worker worker; + grpc_pollset_work(&exec_ctx, &pr.pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1)); + } + gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); + + grpc_httpcli_context_destroy(&context); + grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_shutdown(&exec_ctx, &pr.pollset, &shutdown_closure); + grpc_exec_ctx_finish(&exec_ctx); + gpr_free(path); } -static void -free_chosen_ports () -{ - char *env = gpr_getenv ("GRPC_TEST_PORT_SERVER"); - if (env != NULL) - { - size_t i; - for (i = 0; i < num_chosen_ports; i++) - { - free_port_using_server (env, chosen_ports[i]); - } - gpr_free (env); +static void free_chosen_ports() { + char *env = gpr_getenv("GRPC_TEST_PORT_SERVER"); + if (env != NULL) { + size_t i; + for (i = 0; i < num_chosen_ports; i++) { + free_port_using_server(env, chosen_ports[i]); } + gpr_free(env); + } - gpr_free (chosen_ports); + gpr_free(chosen_ports); } -static void -chose_port (int port) -{ - if (chosen_ports == NULL) - { - atexit (free_chosen_ports); - } +static void chose_port(int port) { + if (chosen_ports == NULL) { + atexit(free_chosen_ports); + } num_chosen_ports++; - chosen_ports = gpr_realloc (chosen_ports, sizeof (int) * num_chosen_ports); + chosen_ports = gpr_realloc(chosen_ports, sizeof(int) * num_chosen_ports); chosen_ports[num_chosen_ports - 1] = port; } -static int -is_port_available (int *port, int is_tcp) -{ +static int is_port_available(int *port, int is_tcp) { const int proto = is_tcp ? IPPROTO_TCP : 0; - const int fd = socket (AF_INET, is_tcp ? SOCK_STREAM : SOCK_DGRAM, proto); + const int fd = socket(AF_INET, is_tcp ? SOCK_STREAM : SOCK_DGRAM, proto); int one = 1; struct sockaddr_in addr; - socklen_t alen = sizeof (addr); + socklen_t alen = sizeof(addr); int actual_port; - GPR_ASSERT (*port >= 0); - GPR_ASSERT (*port <= 65535); - if (fd < 0) - { - gpr_log (GPR_ERROR, "socket() failed: %s", strerror (errno)); - return 0; - } + GPR_ASSERT(*port >= 0); + GPR_ASSERT(*port <= 65535); + if (fd < 0) { + gpr_log(GPR_ERROR, "socket() failed: %s", strerror(errno)); + return 0; + } /* Reuseaddr lets us start up a server immediately after it exits */ - if (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof (one)) < 0) - { - gpr_log (GPR_ERROR, "setsockopt() failed: %s", strerror (errno)); - close (fd); - return 0; - } + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0) { + gpr_log(GPR_ERROR, "setsockopt() failed: %s", strerror(errno)); + close(fd); + return 0; + } /* Try binding to port */ addr.sin_family = AF_INET; addr.sin_addr.s_addr = INADDR_ANY; - addr.sin_port = htons ((gpr_uint16) * port); - if (bind (fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) - { - gpr_log (GPR_DEBUG, "bind(port=%d) failed: %s", *port, strerror (errno)); - close (fd); - return 0; - } + addr.sin_port = htons((gpr_uint16)*port); + if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + gpr_log(GPR_DEBUG, "bind(port=%d) failed: %s", *port, strerror(errno)); + close(fd); + return 0; + } /* Get the bound port number */ - if (getsockname (fd, (struct sockaddr *) &addr, &alen) < 0) - { - gpr_log (GPR_ERROR, "getsockname() failed: %s", strerror (errno)); - close (fd); - return 0; - } - GPR_ASSERT (alen <= sizeof (addr)); - actual_port = ntohs (addr.sin_port); - GPR_ASSERT (actual_port > 0); - if (*port == 0) - { - *port = actual_port; - } - else - { - GPR_ASSERT (*port == actual_port); - } - - close (fd); + if (getsockname(fd, (struct sockaddr *)&addr, &alen) < 0) { + gpr_log(GPR_ERROR, "getsockname() failed: %s", strerror(errno)); + close(fd); + return 0; + } + GPR_ASSERT(alen <= sizeof(addr)); + actual_port = ntohs(addr.sin_port); + GPR_ASSERT(actual_port > 0); + if (*port == 0) { + *port = actual_port; + } else { + GPR_ASSERT(*port == actual_port); + } + + close(fd); return 1; } -typedef struct portreq -{ +typedef struct portreq { grpc_pollset pollset; int port; int retries; @@ -230,55 +208,53 @@ typedef struct portreq grpc_httpcli_context *ctx; } portreq; -static void -got_port_from_server (grpc_exec_ctx * exec_ctx, void *arg, const grpc_httpcli_response * response) -{ +static void got_port_from_server(grpc_exec_ctx *exec_ctx, void *arg, + const grpc_httpcli_response *response) { size_t i; int port = 0; portreq *pr = arg; - if (!response || response->status != 200) - { - grpc_httpcli_request req; - memset (&req, 0, sizeof (req)); - GPR_ASSERT (pr->retries < 10); - pr->retries++; - req.host = pr->server; - req.path = "/get"; - gpr_log (GPR_DEBUG, "failed port pick from server: retrying"); - sleep (1); - grpc_httpcli_get (exec_ctx, pr->ctx, &pr->pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, pr); - return; - } - GPR_ASSERT (response); - GPR_ASSERT (response->status == 200); - for (i = 0; i < response->body_length; i++) - { - GPR_ASSERT (response->body[i] >= '0' && response->body[i] <= '9'); - port = port * 10 + response->body[i] - '0'; - } - GPR_ASSERT (port > 1024); - gpr_mu_lock (GRPC_POLLSET_MU (&pr->pollset)); + if (!response || response->status != 200) { + grpc_httpcli_request req; + memset(&req, 0, sizeof(req)); + GPR_ASSERT(pr->retries < 10); + pr->retries++; + req.host = pr->server; + req.path = "/get"; + gpr_log(GPR_DEBUG, "failed port pick from server: retrying"); + sleep(1); + grpc_httpcli_get(exec_ctx, pr->ctx, &pr->pollset, &req, + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), got_port_from_server, + pr); + return; + } + GPR_ASSERT(response); + GPR_ASSERT(response->status == 200); + for (i = 0; i < response->body_length; i++) { + GPR_ASSERT(response->body[i] >= '0' && response->body[i] <= '9'); + port = port * 10 + response->body[i] - '0'; + } + GPR_ASSERT(port > 1024); + gpr_mu_lock(GRPC_POLLSET_MU(&pr->pollset)); pr->port = port; - grpc_pollset_kick (&pr->pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&pr->pollset)); + grpc_pollset_kick(&pr->pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&pr->pollset)); } -static int -pick_port_using_server (char *server) -{ +static int pick_port_using_server(char *server) { 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_init(); - memset (&pr, 0, sizeof (pr)); - memset (&req, 0, sizeof (req)); - grpc_pollset_init (&pr.pollset); - grpc_closure_init (&shutdown_closure, destroy_pollset_and_shutdown, &pr.pollset); + memset(&pr, 0, sizeof(pr)); + memset(&req, 0, sizeof(req)); + grpc_pollset_init(&pr.pollset); + grpc_closure_init(&shutdown_closure, destroy_pollset_and_shutdown, + &pr.pollset); pr.port = -1; pr.server = server; pr.ctx = &context; @@ -286,27 +262,28 @@ pick_port_using_server (char *server) req.host = server; req.path = "/get"; - grpc_httpcli_context_init (&context); - grpc_httpcli_get (&exec_ctx, &context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, &pr); - grpc_exec_ctx_finish (&exec_ctx); - gpr_mu_lock (GRPC_POLLSET_MU (&pr.pollset)); - while (pr.port == -1) - { - grpc_pollset_worker worker; - grpc_pollset_work (&exec_ctx, &pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1)); - } - gpr_mu_unlock (GRPC_POLLSET_MU (&pr.pollset)); - - grpc_httpcli_context_destroy (&context); - grpc_pollset_shutdown (&exec_ctx, &pr.pollset, &shutdown_closure); - grpc_exec_ctx_finish (&exec_ctx); + grpc_httpcli_context_init(&context); + grpc_httpcli_get(&exec_ctx, &context, &pr.pollset, &req, + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), got_port_from_server, + &pr); + grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); + while (pr.port == -1) { + grpc_pollset_worker worker; + grpc_pollset_work(&exec_ctx, &pr.pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1)); + } + gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); + + grpc_httpcli_context_destroy(&context); + grpc_pollset_shutdown(&exec_ctx, &pr.pollset, &shutdown_closure); + grpc_exec_ctx_finish(&exec_ctx); return pr.port; } -int -grpc_pick_unused_port (void) -{ +int grpc_pick_unused_port(void) { /* We repeatedly pick a port and then see whether or not it is available for use both as a TCP socket and a UDP socket. First, we pick a random large port number. For subsequent @@ -323,68 +300,55 @@ grpc_pick_unused_port (void) int is_tcp = 1; int trial = 0; - char *env = gpr_getenv ("GRPC_TEST_PORT_SERVER"); - if (env) - { - int port = pick_port_using_server (env); - gpr_free (env); - if (port != 0) - { - chose_port (port); - } - return port; + char *env = gpr_getenv("GRPC_TEST_PORT_SERVER"); + if (env) { + int port = pick_port_using_server(env); + gpr_free(env); + if (port != 0) { + chose_port(port); + } + return port; + } + + for (;;) { + int port; + trial++; + if (trial == 1) { + port = getpid() % (65536 - 30000) + 30000; + } else if (trial <= NUM_RANDOM_PORTS_TO_PICK) { + port = rand() % (65536 - 30000) + 30000; + } else { + port = 0; + } + + if (has_port_been_chosen(port)) { + continue; } - for (;;) - { - int port; - trial++; - if (trial == 1) - { - port = getpid () % (65536 - 30000) + 30000; - } - else if (trial <= NUM_RANDOM_PORTS_TO_PICK) - { - port = rand () % (65536 - 30000) + 30000; - } - else - { - port = 0; - } - - if (has_port_been_chosen (port)) - { - continue; - } - - if (!is_port_available (&port, is_tcp)) - { - continue; - } - - GPR_ASSERT (port > 0); - /* Check that the port # is free for the other type of socket also */ - if (!is_port_available (&port, !is_tcp)) - { - /* In the next iteration trial to bind to the other type first - because perhaps it is more rare. */ - is_tcp = !is_tcp; - continue; - } - - chose_port (port); - return port; + if (!is_port_available(&port, is_tcp)) { + continue; } + GPR_ASSERT(port > 0); + /* Check that the port # is free for the other type of socket also */ + if (!is_port_available(&port, !is_tcp)) { + /* In the next iteration trial to bind to the other type first + because perhaps it is more rare. */ + is_tcp = !is_tcp; + continue; + } + + chose_port(port); + return port; + } + /* The port iterator reached the end without finding a suitable port. */ return 0; } -int -grpc_pick_unused_port_or_die (void) -{ - int port = grpc_pick_unused_port (); - GPR_ASSERT (port > 0); +int grpc_pick_unused_port_or_die(void) { + int port = grpc_pick_unused_port(); + GPR_ASSERT(port > 0); return port; } diff --git a/test/core/util/port_windows.c b/test/core/util/port_windows.c index fefe33e9ba5..a02cd2e3ef9 100644 --- a/test/core/util/port_windows.c +++ b/test/core/util/port_windows.c @@ -55,167 +55,141 @@ static int *chosen_ports = NULL; static size_t num_chosen_ports = 0; -static int -has_port_been_chosen (int port) -{ +static int has_port_been_chosen(int port) { size_t i; - for (i = 0; i < num_chosen_ports; i++) - { - if (chosen_ports[i] == port) - { - return 1; - } + for (i = 0; i < num_chosen_ports; i++) { + if (chosen_ports[i] == port) { + return 1; } + } return 0; } -static void -free_chosen_ports () -{ - gpr_free (chosen_ports); -} +static void free_chosen_ports() { gpr_free(chosen_ports); } -static void -chose_port (int port) -{ - if (chosen_ports == NULL) - { - atexit (free_chosen_ports); - } +static void chose_port(int port) { + if (chosen_ports == NULL) { + atexit(free_chosen_ports); + } num_chosen_ports++; - chosen_ports = gpr_realloc (chosen_ports, sizeof (int) * num_chosen_ports); + chosen_ports = gpr_realloc(chosen_ports, sizeof(int) * num_chosen_ports); chosen_ports[num_chosen_ports - 1] = port; } -static int -is_port_available (int *port, int is_tcp) -{ +static int is_port_available(int *port, int is_tcp) { const int proto = is_tcp ? IPPROTO_TCP : 0; - const SOCKET fd = socket (AF_INET, is_tcp ? SOCK_STREAM : SOCK_DGRAM, proto); + const SOCKET fd = socket(AF_INET, is_tcp ? SOCK_STREAM : SOCK_DGRAM, proto); int one = 1; struct sockaddr_in addr; - socklen_t alen = sizeof (addr); + socklen_t alen = sizeof(addr); int actual_port; - GPR_ASSERT (*port >= 0); - GPR_ASSERT (*port <= 65535); - if (INVALID_SOCKET == fd) - { - gpr_log (GPR_ERROR, "socket() failed: %s", strerror (errno)); - return 0; - } + GPR_ASSERT(*port >= 0); + GPR_ASSERT(*port <= 65535); + if (INVALID_SOCKET == fd) { + gpr_log(GPR_ERROR, "socket() failed: %s", strerror(errno)); + return 0; + } /* Reuseaddr lets us start up a server immediately after it exits */ - if (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (const char *) &one, sizeof (one)) < 0) - { - gpr_log (GPR_ERROR, "setsockopt() failed: %s", strerror (errno)); - closesocket (fd); - return 0; - } + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const char *)&one, + sizeof(one)) < 0) { + gpr_log(GPR_ERROR, "setsockopt() failed: %s", strerror(errno)); + closesocket(fd); + return 0; + } /* Try binding to port */ addr.sin_family = AF_INET; addr.sin_addr.s_addr = INADDR_ANY; - addr.sin_port = htons (*port); - if (bind (fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) - { - gpr_log (GPR_DEBUG, "bind(port=%d) failed: %s", *port, strerror (errno)); - closesocket (fd); - return 0; - } + addr.sin_port = htons(*port); + if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + gpr_log(GPR_DEBUG, "bind(port=%d) failed: %s", *port, strerror(errno)); + closesocket(fd); + return 0; + } /* Get the bound port number */ - if (getsockname (fd, (struct sockaddr *) &addr, &alen) < 0) - { - gpr_log (GPR_ERROR, "getsockname() failed: %s", strerror (errno)); - closesocket (fd); - return 0; - } - GPR_ASSERT (alen <= sizeof (addr)); - actual_port = ntohs (addr.sin_port); - GPR_ASSERT (actual_port > 0); - if (*port == 0) - { - *port = actual_port; - } - else - { - GPR_ASSERT (*port == actual_port); - } - - closesocket (fd); + if (getsockname(fd, (struct sockaddr *)&addr, &alen) < 0) { + gpr_log(GPR_ERROR, "getsockname() failed: %s", strerror(errno)); + closesocket(fd); + return 0; + } + GPR_ASSERT(alen <= sizeof(addr)); + actual_port = ntohs(addr.sin_port); + GPR_ASSERT(actual_port > 0); + if (*port == 0) { + *port = actual_port; + } else { + GPR_ASSERT(*port == actual_port); + } + + closesocket(fd); return 1; } -typedef struct portreq -{ +typedef struct portreq { grpc_pollset pollset; int port; } portreq; -static void -got_port_from_server (void *arg, const grpc_httpcli_response * response) -{ +static void got_port_from_server(void *arg, + const grpc_httpcli_response *response) { size_t i; int port = 0; portreq *pr = arg; - GPR_ASSERT (response); - GPR_ASSERT (response->status == 200); - for (i = 0; i < response->body_length; i++) - { - GPR_ASSERT (response->body[i] >= '0' && response->body[i] <= '9'); - port = port * 10 + response->body[i] - '0'; - } - GPR_ASSERT (port > 1024); - gpr_mu_lock (GRPC_POLLSET_MU (&pr->pollset)); + GPR_ASSERT(response); + GPR_ASSERT(response->status == 200); + for (i = 0; i < response->body_length; i++) { + GPR_ASSERT(response->body[i] >= '0' && response->body[i] <= '9'); + port = port * 10 + response->body[i] - '0'; + } + GPR_ASSERT(port > 1024); + gpr_mu_lock(GRPC_POLLSET_MU(&pr->pollset)); pr->port = port; - grpc_pollset_kick (&pr->pollset, NULL); - gpr_mu_unlock (GRPC_POLLSET_MU (&pr->pollset)); + grpc_pollset_kick(&pr->pollset, NULL); + gpr_mu_unlock(GRPC_POLLSET_MU(&pr->pollset)); } -static void -destroy_pollset_and_shutdown (void *p) -{ - grpc_pollset_destroy (p); - grpc_shutdown (); +static void destroy_pollset_and_shutdown(void *p) { + grpc_pollset_destroy(p); + grpc_shutdown(); } -static int -pick_port_using_server (char *server) -{ +static int pick_port_using_server(char *server) { grpc_httpcli_context context; grpc_httpcli_request req; portreq pr; - grpc_init (); + grpc_init(); - memset (&pr, 0, sizeof (pr)); - memset (&req, 0, sizeof (req)); - grpc_pollset_init (&pr.pollset); + memset(&pr, 0, sizeof(pr)); + memset(&req, 0, sizeof(req)); + grpc_pollset_init(&pr.pollset); pr.port = -1; req.host = server; req.path = "/get"; - grpc_httpcli_context_init (&context); - grpc_httpcli_get (&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, &pr); - gpr_mu_lock (GRPC_POLLSET_MU (&pr.pollset)); - while (pr.port == -1) - { - grpc_pollset_worker worker; - grpc_pollset_work (&pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1)); - } - gpr_mu_unlock (GRPC_POLLSET_MU (&pr.pollset)); - - grpc_httpcli_context_destroy (&context); - grpc_pollset_shutdown (&pr.pollset, destroy_pollset_and_shutdown, &pr.pollset); + grpc_httpcli_context_init(&context); + grpc_httpcli_get(&context, &pr.pollset, &req, + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), got_port_from_server, + &pr); + gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); + while (pr.port == -1) { + grpc_pollset_worker worker; + grpc_pollset_work(&pr.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1)); + } + gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); + + grpc_httpcli_context_destroy(&context); + grpc_pollset_shutdown(&pr.pollset, destroy_pollset_and_shutdown, &pr.pollset); return pr.port; } -int -grpc_pick_unused_port (void) -{ +int grpc_pick_unused_port(void) { /* We repeatedly pick a port and then see whether or not it is available for use both as a TCP socket and a UDP socket. First, we pick a random large port number. For subsequent @@ -232,70 +206,57 @@ grpc_pick_unused_port (void) int is_tcp = 1; int trial = 0; - char *env = gpr_getenv ("GRPC_TEST_PORT_SERVER"); - if (env) - { - int port = pick_port_using_server (env); - gpr_free (env); - if (port != 0) - { - return port; - } + char *env = gpr_getenv("GRPC_TEST_PORT_SERVER"); + if (env) { + int port = pick_port_using_server(env); + gpr_free(env); + if (port != 0) { + return port; + } + } + + for (;;) { + int port; + trial++; + if (trial == 1) { + port = _getpid() % (65536 - 30000) + 30000; + } else if (trial <= NUM_RANDOM_PORTS_TO_PICK) { + port = rand() % (65536 - 30000) + 30000; + } else { + port = 0; } - for (;;) - { - int port; - trial++; - if (trial == 1) - { - port = _getpid () % (65536 - 30000) + 30000; - } - else if (trial <= NUM_RANDOM_PORTS_TO_PICK) - { - port = rand () % (65536 - 30000) + 30000; - } - else - { - port = 0; - } - - if (has_port_been_chosen (port)) - { - continue; - } - - if (!is_port_available (&port, is_tcp)) - { - continue; - } - - GPR_ASSERT (port > 0); - /* Check that the port # is free for the other type of socket also */ - if (!is_port_available (&port, !is_tcp)) - { - /* In the next iteration trial to bind to the other type first - because perhaps it is more rare. */ - is_tcp = !is_tcp; - continue; - } - - /* TODO(ctiller): consider caching this port in some structure, to avoid - handing it out again */ - - chose_port (port); - return port; + if (has_port_been_chosen(port)) { + continue; + } + + if (!is_port_available(&port, is_tcp)) { + continue; + } + + GPR_ASSERT(port > 0); + /* Check that the port # is free for the other type of socket also */ + if (!is_port_available(&port, !is_tcp)) { + /* In the next iteration trial to bind to the other type first + because perhaps it is more rare. */ + is_tcp = !is_tcp; + continue; } + /* TODO(ctiller): consider caching this port in some structure, to avoid + handing it out again */ + + chose_port(port); + return port; + } + /* The port iterator reached the end without finding a suitable port. */ return 0; } -int -grpc_pick_unused_port_or_die (void) -{ - int port = grpc_pick_unused_port (); - GPR_ASSERT (port > 0); +int grpc_pick_unused_port_or_die(void) { + int port = grpc_pick_unused_port(); + GPR_ASSERT(port > 0); return port; } diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index 6de06280caa..ee481ef6749 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -45,151 +45,130 @@ #include "src/core/iomgr/tcp_server.h" #include "test/core/util/port.h" -static void -pretty_print_backoffs (reconnect_server * server) -{ +static void pretty_print_backoffs(reconnect_server *server) { gpr_timespec diff; int i = 1; double expected_backoff = 1000.0, backoff; timestamp_list *head = server->head; - gpr_log (GPR_INFO, "reconnect server: new connection"); - for (head = server->head; head && head->next; head = head->next, i++) - { - diff = gpr_time_sub (head->next->timestamp, head->timestamp); - backoff = gpr_time_to_millis (diff); - gpr_log (GPR_INFO, "retry %2d:backoff %6.2fs,expected backoff %6.2fs, jitter %4.2f%%", i, backoff / 1000.0, expected_backoff / 1000.0, (backoff - expected_backoff) * 100.0 / expected_backoff); - expected_backoff *= 1.6; - if (expected_backoff > 120 * 1000) - { - expected_backoff = 120 * 1000; - } + gpr_log(GPR_INFO, "reconnect server: new connection"); + for (head = server->head; head && head->next; head = head->next, i++) { + diff = gpr_time_sub(head->next->timestamp, head->timestamp); + backoff = gpr_time_to_millis(diff); + gpr_log(GPR_INFO, + "retry %2d:backoff %6.2fs,expected backoff %6.2fs, jitter %4.2f%%", + i, backoff / 1000.0, expected_backoff / 1000.0, + (backoff - expected_backoff) * 100.0 / expected_backoff); + expected_backoff *= 1.6; + if (expected_backoff > 120 * 1000) { + expected_backoff = 120 * 1000; } + } } -static void -on_connect (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * tcp) -{ +static void on_connect(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp) { char *peer; char *last_colon; - reconnect_server *server = (reconnect_server *) arg; - gpr_timespec now = gpr_now (GPR_CLOCK_REALTIME); + reconnect_server *server = (reconnect_server *)arg; + 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_destroy (exec_ctx, tcp); - if (peer) - { - last_colon = strrchr (peer, ':'); - if (server->peer == NULL) - { - server->peer = peer; - } - else - { - if (last_colon == NULL) - { - gpr_log (GPR_ERROR, "peer does not contain a ':'"); - } - else if (strncmp (server->peer, peer, (size_t) (last_colon - peer)) != 0) - { - gpr_log (GPR_ERROR, "mismatched peer! %s vs %s", server->peer, peer); - } - gpr_free (peer); - } + peer = grpc_endpoint_get_peer(tcp); + grpc_endpoint_shutdown(exec_ctx, tcp); + grpc_endpoint_destroy(exec_ctx, tcp); + if (peer) { + last_colon = strrchr(peer, ':'); + if (server->peer == NULL) { + server->peer = peer; + } else { + if (last_colon == NULL) { + gpr_log(GPR_ERROR, "peer does not contain a ':'"); + } else if (strncmp(server->peer, peer, (size_t)(last_colon - peer)) != + 0) { + gpr_log(GPR_ERROR, "mismatched peer! %s vs %s", server->peer, peer); + } + gpr_free(peer); } - new_tail = gpr_malloc (sizeof (timestamp_list)); + } + new_tail = gpr_malloc(sizeof(timestamp_list)); new_tail->timestamp = now; new_tail->next = NULL; - if (server->tail == NULL) - { - server->head = new_tail; - server->tail = new_tail; - } - else - { - server->tail->next = new_tail; - server->tail = new_tail; - } - pretty_print_backoffs (server); + if (server->tail == NULL) { + server->head = new_tail; + server->tail = new_tail; + } else { + server->tail->next = new_tail; + server->tail = new_tail; + } + pretty_print_backoffs(server); } -void -reconnect_server_init (reconnect_server * server) -{ - grpc_init (); +void reconnect_server_init(reconnect_server *server) { + grpc_init(); server->tcp_server = NULL; - grpc_pollset_init (&server->pollset); + grpc_pollset_init(&server->pollset); server->pollsets[0] = &server->pollset; server->head = NULL; server->tail = NULL; server->peer = NULL; } -void -reconnect_server_start (reconnect_server * server, int port) -{ +void reconnect_server_start(reconnect_server *server, int port) { struct sockaddr_in addr; int port_added; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; addr.sin_family = AF_INET; - addr.sin_port = htons ((gpr_uint16) port); - memset (&addr.sin_addr, 0, sizeof (addr.sin_addr)); + addr.sin_port = htons((gpr_uint16)port); + memset(&addr.sin_addr, 0, sizeof(addr.sin_addr)); - server->tcp_server = grpc_tcp_server_create (); - port_added = grpc_tcp_server_add_port (server->tcp_server, &addr, sizeof (addr)); - GPR_ASSERT (port_added == port); + server->tcp_server = grpc_tcp_server_create(); + port_added = + grpc_tcp_server_add_port(server->tcp_server, &addr, sizeof(addr)); + GPR_ASSERT(port_added == port); - grpc_tcp_server_start (&exec_ctx, server->tcp_server, server->pollsets, 1, on_connect, server); - gpr_log (GPR_INFO, "reconnect tcp server listening on 0.0.0.0:%d", port); + grpc_tcp_server_start(&exec_ctx, server->tcp_server, server->pollsets, 1, + on_connect, server); + gpr_log(GPR_INFO, "reconnect tcp server listening on 0.0.0.0:%d", port); - grpc_exec_ctx_finish (&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); } -void -reconnect_server_poll (reconnect_server * server, int seconds) -{ +void reconnect_server_poll(reconnect_server *server, int seconds) { grpc_pollset_worker worker; - gpr_timespec deadline = gpr_time_add (gpr_now (GPR_CLOCK_MONOTONIC), - gpr_time_from_seconds (seconds, GPR_TIMESPAN)); + gpr_timespec deadline = + gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), + gpr_time_from_seconds(seconds, GPR_TIMESPAN)); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - gpr_mu_lock (GRPC_POLLSET_MU (&server->pollset)); - grpc_pollset_work (&exec_ctx, &server->pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline); - gpr_mu_unlock (GRPC_POLLSET_MU (&server->pollset)); - grpc_exec_ctx_finish (&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&server->pollset)); + grpc_pollset_work(&exec_ctx, &server->pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), deadline); + gpr_mu_unlock(GRPC_POLLSET_MU(&server->pollset)); + grpc_exec_ctx_finish(&exec_ctx); } -void -reconnect_server_clear_timestamps (reconnect_server * server) -{ +void reconnect_server_clear_timestamps(reconnect_server *server) { timestamp_list *new_head = server->head; - while (server->head) - { - new_head = server->head->next; - gpr_free (server->head); - server->head = new_head; - } + while (server->head) { + new_head = server->head->next; + gpr_free(server->head); + server->head = new_head; + } server->tail = NULL; - gpr_free (server->peer); + gpr_free(server->peer); server->peer = NULL; } -static void -do_nothing (grpc_exec_ctx * exec_ctx, void *ignored, int success) -{ -} +static void do_nothing(grpc_exec_ctx *exec_ctx, void *ignored, int success) {} -void -reconnect_server_destroy (reconnect_server * server) -{ +void reconnect_server_destroy(reconnect_server *server) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure do_nothing_closure[2]; - grpc_closure_init (&do_nothing_closure[0], do_nothing, NULL); - grpc_closure_init (&do_nothing_closure[1], do_nothing, NULL); - grpc_tcp_server_destroy (&exec_ctx, server->tcp_server, &do_nothing_closure[0]); - reconnect_server_clear_timestamps (server); - grpc_pollset_shutdown (&exec_ctx, &server->pollset, &do_nothing_closure[1]); - grpc_exec_ctx_finish (&exec_ctx); - grpc_pollset_destroy (&server->pollset); - grpc_shutdown (); + grpc_closure_init(&do_nothing_closure[0], do_nothing, NULL); + grpc_closure_init(&do_nothing_closure[1], do_nothing, NULL); + grpc_tcp_server_destroy(&exec_ctx, server->tcp_server, + &do_nothing_closure[0]); + reconnect_server_clear_timestamps(server); + grpc_pollset_shutdown(&exec_ctx, &server->pollset, &do_nothing_closure[1]); + grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_destroy(&server->pollset); + grpc_shutdown(); } diff --git a/test/core/util/reconnect_server.h b/test/core/util/reconnect_server.h index aaf277390cf..8a278e0c7a7 100644 --- a/test/core/util/reconnect_server.h +++ b/test/core/util/reconnect_server.h @@ -39,34 +39,31 @@ #include "src/core/iomgr/tcp_server.h" #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif - typedef struct timestamp_list - { - gpr_timespec timestamp; - struct timestamp_list *next; - } timestamp_list; +typedef struct timestamp_list { + gpr_timespec timestamp; + struct timestamp_list *next; +} timestamp_list; - typedef struct reconnect_server - { - grpc_tcp_server *tcp_server; - grpc_pollset pollset; - grpc_pollset *pollsets[1]; - timestamp_list *head; - timestamp_list *tail; - char *peer; - } reconnect_server; +typedef struct reconnect_server { + grpc_tcp_server *tcp_server; + grpc_pollset pollset; + grpc_pollset *pollsets[1]; + timestamp_list *head; + timestamp_list *tail; + char *peer; +} reconnect_server; - void reconnect_server_init (reconnect_server * server); - void reconnect_server_start (reconnect_server * server, int port); - void reconnect_server_poll (reconnect_server * server, int seconds); - void reconnect_server_destroy (reconnect_server * server); - void reconnect_server_clear_timestamps (reconnect_server * server); +void reconnect_server_init(reconnect_server *server); +void reconnect_server_start(reconnect_server *server, int port); +void reconnect_server_poll(reconnect_server *server, int seconds); +void reconnect_server_destroy(reconnect_server *server); +void reconnect_server_clear_timestamps(reconnect_server *server); #ifdef __cplusplus } #endif -#endif /* GRPC_TEST_CORE_UTIL_RECONNECT_SERVER_H */ +#endif /* GRPC_TEST_CORE_UTIL_RECONNECT_SERVER_H */ diff --git a/test/core/util/slice_splitter.c b/test/core/util/slice_splitter.c index f0282c0aaa0..0f05072e505 100644 --- a/test/core/util/slice_splitter.c +++ b/test/core/util/slice_splitter.c @@ -38,114 +38,101 @@ #include #include -const char * -grpc_slice_split_mode_name (grpc_slice_split_mode mode) -{ - switch (mode) - { +const char *grpc_slice_split_mode_name(grpc_slice_split_mode mode) { + switch (mode) { case GRPC_SLICE_SPLIT_IDENTITY: return "identity"; case GRPC_SLICE_SPLIT_MERGE_ALL: return "merge_all"; case GRPC_SLICE_SPLIT_ONE_BYTE: return "one_byte"; - } + } return "error"; } -void -grpc_split_slices (grpc_slice_split_mode mode, gpr_slice * src_slices, size_t src_slice_count, gpr_slice ** dst_slices, size_t * dst_slice_count) -{ +void grpc_split_slices(grpc_slice_split_mode mode, gpr_slice *src_slices, + size_t src_slice_count, gpr_slice **dst_slices, + size_t *dst_slice_count) { size_t i, j; size_t length; - switch (mode) - { + switch (mode) { case GRPC_SLICE_SPLIT_IDENTITY: *dst_slice_count = src_slice_count; - *dst_slices = gpr_malloc (sizeof (gpr_slice) * src_slice_count); - for (i = 0; i < src_slice_count; i++) - { - (*dst_slices)[i] = src_slices[i]; - gpr_slice_ref ((*dst_slices)[i]); - } + *dst_slices = gpr_malloc(sizeof(gpr_slice) * src_slice_count); + for (i = 0; i < src_slice_count; i++) { + (*dst_slices)[i] = src_slices[i]; + gpr_slice_ref((*dst_slices)[i]); + } break; case GRPC_SLICE_SPLIT_MERGE_ALL: *dst_slice_count = 1; length = 0; - for (i = 0; i < src_slice_count; i++) - { - length += GPR_SLICE_LENGTH (src_slices[i]); - } - *dst_slices = gpr_malloc (sizeof (gpr_slice)); - **dst_slices = gpr_slice_malloc (length); + for (i = 0; i < src_slice_count; i++) { + length += GPR_SLICE_LENGTH(src_slices[i]); + } + *dst_slices = gpr_malloc(sizeof(gpr_slice)); + **dst_slices = gpr_slice_malloc(length); length = 0; - for (i = 0; i < src_slice_count; i++) - { - memcpy (GPR_SLICE_START_PTR (**dst_slices) + length, GPR_SLICE_START_PTR (src_slices[i]), GPR_SLICE_LENGTH (src_slices[i])); - length += GPR_SLICE_LENGTH (src_slices[i]); - } + for (i = 0; i < src_slice_count; i++) { + memcpy(GPR_SLICE_START_PTR(**dst_slices) + length, + GPR_SLICE_START_PTR(src_slices[i]), + GPR_SLICE_LENGTH(src_slices[i])); + length += GPR_SLICE_LENGTH(src_slices[i]); + } break; case GRPC_SLICE_SPLIT_ONE_BYTE: length = 0; - for (i = 0; i < src_slice_count; i++) - { - length += GPR_SLICE_LENGTH (src_slices[i]); - } + for (i = 0; i < src_slice_count; i++) { + length += GPR_SLICE_LENGTH(src_slices[i]); + } *dst_slice_count = length; - *dst_slices = gpr_malloc (sizeof (gpr_slice) * length); + *dst_slices = gpr_malloc(sizeof(gpr_slice) * length); length = 0; - for (i = 0; i < src_slice_count; i++) - { - for (j = 0; j < GPR_SLICE_LENGTH (src_slices[i]); j++) - { - (*dst_slices)[length] = gpr_slice_sub (src_slices[i], j, j + 1); - length++; - } - } + for (i = 0; i < src_slice_count; i++) { + for (j = 0; j < GPR_SLICE_LENGTH(src_slices[i]); j++) { + (*dst_slices)[length] = gpr_slice_sub(src_slices[i], j, j + 1); + length++; + } + } break; - } + } } -void -grpc_split_slices_to_buffer (grpc_slice_split_mode mode, gpr_slice * src_slices, size_t src_slice_count, gpr_slice_buffer * dst) -{ +void grpc_split_slices_to_buffer(grpc_slice_split_mode mode, + gpr_slice *src_slices, size_t src_slice_count, + gpr_slice_buffer *dst) { gpr_slice *slices; size_t nslices; size_t i; - grpc_split_slices (mode, src_slices, src_slice_count, &slices, &nslices); - for (i = 0; i < nslices; i++) - { - /* add indexed to avoid re-merging split slices */ - gpr_slice_buffer_add_indexed (dst, slices[i]); - } - gpr_free (slices); + grpc_split_slices(mode, src_slices, src_slice_count, &slices, &nslices); + for (i = 0; i < nslices; i++) { + /* add indexed to avoid re-merging split slices */ + gpr_slice_buffer_add_indexed(dst, slices[i]); + } + gpr_free(slices); } -void -grpc_split_slice_buffer (grpc_slice_split_mode mode, gpr_slice_buffer * src, gpr_slice_buffer * dst) -{ - grpc_split_slices_to_buffer (mode, src->slices, src->count, dst); +void grpc_split_slice_buffer(grpc_slice_split_mode mode, gpr_slice_buffer *src, + gpr_slice_buffer *dst) { + grpc_split_slices_to_buffer(mode, src->slices, src->count, dst); } -gpr_slice -grpc_slice_merge (gpr_slice * slices, size_t nslices) -{ +gpr_slice grpc_slice_merge(gpr_slice *slices, size_t nslices) { gpr_uint8 *out = NULL; size_t length = 0; size_t capacity = 0; size_t i; - for (i = 0; i < nslices; i++) - { - if (GPR_SLICE_LENGTH (slices[i]) + length > capacity) - { - capacity = GPR_MAX (capacity * 2, GPR_SLICE_LENGTH (slices[i]) + length); - out = gpr_realloc (out, capacity); - } - memcpy (out + length, GPR_SLICE_START_PTR (slices[i]), GPR_SLICE_LENGTH (slices[i])); - length += GPR_SLICE_LENGTH (slices[i]); + for (i = 0; i < nslices; i++) { + if (GPR_SLICE_LENGTH(slices[i]) + length > capacity) { + capacity = GPR_MAX(capacity * 2, GPR_SLICE_LENGTH(slices[i]) + length); + out = gpr_realloc(out, capacity); } + memcpy(out + length, GPR_SLICE_START_PTR(slices[i]), + GPR_SLICE_LENGTH(slices[i])); + length += GPR_SLICE_LENGTH(slices[i]); + } - return gpr_slice_new (out, length, gpr_free); + return gpr_slice_new(out, length, gpr_free); } diff --git a/test/core/util/slice_splitter.h b/test/core/util/slice_splitter.h index 992001730cd..d030c2cb555 100644 --- a/test/core/util/slice_splitter.h +++ b/test/core/util/slice_splitter.h @@ -40,8 +40,7 @@ #include #include -typedef enum -{ +typedef enum { /* merge all input slices into a single slice */ GRPC_SLICE_SPLIT_MERGE_ALL, /* leave slices as is */ @@ -52,13 +51,18 @@ typedef enum /* allocates *dst_slices; caller must unref all slices in dst_slices then free it */ -void grpc_split_slices (grpc_slice_split_mode mode, gpr_slice * src_slices, size_t src_slice_count, gpr_slice ** dst_slices, size_t * dst_slice_count); +void grpc_split_slices(grpc_slice_split_mode mode, gpr_slice *src_slices, + size_t src_slice_count, gpr_slice **dst_slices, + size_t *dst_slice_count); -void grpc_split_slices_to_buffer (grpc_slice_split_mode mode, gpr_slice * src_slices, size_t src_slice_count, gpr_slice_buffer * dst); -void grpc_split_slice_buffer (grpc_slice_split_mode mode, gpr_slice_buffer * src, gpr_slice_buffer * dst); +void grpc_split_slices_to_buffer(grpc_slice_split_mode mode, + gpr_slice *src_slices, size_t src_slice_count, + gpr_slice_buffer *dst); +void grpc_split_slice_buffer(grpc_slice_split_mode mode, gpr_slice_buffer *src, + gpr_slice_buffer *dst); -gpr_slice grpc_slice_merge (gpr_slice * slices, size_t nslices); +gpr_slice grpc_slice_merge(gpr_slice *slices, size_t nslices); -const char *grpc_slice_split_mode_name (grpc_slice_split_mode mode); +const char *grpc_slice_split_mode_name(grpc_slice_split_mode mode); #endif /* GRPC_TEST_CORE_UTIL_SLICE_SPLITTER_H */ diff --git a/test/core/util/test_config.c b/test/core/util/test_config.c index eb2ff22c8bd..168b98fe634 100644 --- a/test/core/util/test_config.c +++ b/test/core/util/test_config.c @@ -42,81 +42,58 @@ double g_fixture_slowdown_factor = 1.0; #if GPR_GETPID_IN_UNISTD_H #include -static unsigned -seed (void) -{ - return (unsigned) getpid (); -} +static unsigned seed(void) { return (unsigned)getpid(); } #endif #if GPR_GETPID_IN_PROCESS_H #include -static unsigned -seed (void) -{ - return _getpid (); -} +static unsigned seed(void) { return _getpid(); } #endif #if GPR_WINDOWS_CRASH_HANDLER -LONG -crash_handler (struct _EXCEPTION_POINTERS * ex_info) -{ - gpr_log (GPR_DEBUG, "Exception handler called, dumping information"); - while (ex_info->ExceptionRecord) - { - DWORD code = ex_info->ExceptionRecord->ExceptionCode; - DWORD flgs = ex_info->ExceptionRecord->ExceptionFlags; - PVOID addr = ex_info->ExceptionRecord->ExceptionAddress; - gpr_log ("code: %x - flags: %d - address: %p", code, flgs, addr); - ex_info->ExceptionRecord = ex_info->ExceptionRecord->ExceptionRecord; - } - if (IsDebuggerPresent ()) - { - __debugbreak (); - } - else - { - _exit (1); - } +LONG crash_handler(struct _EXCEPTION_POINTERS *ex_info) { + gpr_log(GPR_DEBUG, "Exception handler called, dumping information"); + while (ex_info->ExceptionRecord) { + DWORD code = ex_info->ExceptionRecord->ExceptionCode; + DWORD flgs = ex_info->ExceptionRecord->ExceptionFlags; + PVOID addr = ex_info->ExceptionRecord->ExceptionAddress; + gpr_log("code: %x - flags: %d - address: %p", code, flgs, addr); + ex_info->ExceptionRecord = ex_info->ExceptionRecord->ExceptionRecord; + } + if (IsDebuggerPresent()) { + __debugbreak(); + } else { + _exit(1); + } return EXCEPTION_EXECUTE_HANDLER; } -void -abort_handler (int sig) -{ - gpr_log (GPR_DEBUG, "Abort handler called."); - if (IsDebuggerPresent ()) - { - __debugbreak (); - } - else - { - _exit (1); - } +void abort_handler(int sig) { + gpr_log(GPR_DEBUG, "Abort handler called."); + if (IsDebuggerPresent()) { + __debugbreak(); + } else { + _exit(1); + } } -static void -install_crash_handler () -{ - SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) crash_handler); - _set_abort_behavior (0, _WRITE_ABORT_MSG); - _set_abort_behavior (0, _CALL_REPORTFAULT); - signal (SIGABRT, abort_handler); +static void install_crash_handler() { + SetUnhandledExceptionFilter((LPTOP_LEVEL_EXCEPTION_FILTER)crash_handler); + _set_abort_behavior(0, _WRITE_ABORT_MSG); + _set_abort_behavior(0, _CALL_REPORTFAULT); + signal(SIGABRT, abort_handler); } #else -static void -install_crash_handler () -{ -} +static void install_crash_handler() {} #endif -void -grpc_test_init (int argc, char **argv) -{ - install_crash_handler (); - gpr_log (GPR_DEBUG, "test slowdown: machine=%f build=%f total=%f", (double) GRPC_TEST_SLOWDOWN_MACHINE_FACTOR, (double) GRPC_TEST_SLOWDOWN_BUILD_FACTOR, (double) GRPC_TEST_SLOWDOWN_FACTOR); +void grpc_test_init(int argc, char **argv) { + install_crash_handler(); + gpr_log(GPR_DEBUG, "test slowdown: machine=%f build=%f total=%f", + (double)GRPC_TEST_SLOWDOWN_MACHINE_FACTOR, + (double)GRPC_TEST_SLOWDOWN_BUILD_FACTOR, + (double)GRPC_TEST_SLOWDOWN_FACTOR); /* seed rng with pid, so we don't end up with the same random numbers as a concurrently running test binary */ - srand (seed ()); + srand(seed()); } diff --git a/test/core/util/test_config.h b/test/core/util/test_config.h index 05057b9893e..15b71747fb5 100644 --- a/test/core/util/test_config.h +++ b/test/core/util/test_config.h @@ -37,9 +37,8 @@ #include #ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ +extern "C" { +#endif /* __cplusplus */ #ifndef GRPC_TEST_SLOWDOWN_BUILD_FACTOR #define GRPC_TEST_SLOWDOWN_BUILD_FACTOR 1.0 @@ -49,7 +48,7 @@ extern "C" #define GRPC_TEST_SLOWDOWN_MACHINE_FACTOR 1.0 #endif - extern double g_fixture_slowdown_factor; +extern double g_fixture_slowdown_factor; #define GRPC_TEST_SLOWDOWN_FACTOR \ (GRPC_TEST_SLOWDOWN_BUILD_FACTOR * GRPC_TEST_SLOWDOWN_MACHINE_FACTOR * \ @@ -71,10 +70,10 @@ extern "C" #define GRPC_TEST_PICK_PORT #endif - void grpc_test_init (int argc, char **argv); +void grpc_test_init(int argc, char **argv); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif /* __cplusplus */ -#endif /* GRPC_TEST_CORE_UTIL_TEST_CONFIG_H */ +#endif /* GRPC_TEST_CORE_UTIL_TEST_CONFIG_H */ From b8b1a462e5cc2d629be43feed1e8960f40867d6b Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 12:50:03 -0700 Subject: [PATCH 36/56] Finish cleanup --- src/core/iomgr/exec_ctx.c | 4 +- test/core/channel/channel_stack_test.c | 2 +- test/core/httpcli/httpcli_test.c | 16 ++--- test/core/iomgr/fd_posix_test.c | 52 ++++++++-------- test/core/iomgr/tcp_client_posix_test.c | 27 +++++---- test/core/iomgr/tcp_posix_test.c | 21 +++---- test/core/iomgr/tcp_server_posix_test.c | 10 ++-- test/core/iomgr/udp_server_test.c | 17 ++++-- test/core/iomgr/workqueue_test.c | 6 +- test/core/security/credentials_test.c | 60 +++++++++---------- test/core/security/jwt_verifier_test.c | 33 +++++----- .../print_google_default_creds_token.c | 5 +- test/core/security/verify_jwt.c | 5 +- test/core/surface/completion_queue_test.c | 11 ++-- 14 files changed, 141 insertions(+), 128 deletions(-) diff --git a/src/core/iomgr/exec_ctx.c b/src/core/iomgr/exec_ctx.c index fe8c48a94b0..74aad6cea3b 100644 --- a/src/core/iomgr/exec_ctx.c +++ b/src/core/iomgr/exec_ctx.c @@ -35,8 +35,8 @@ void grpc_exec_ctx_flush(grpc_exec_ctx *exec_ctx) { while (!grpc_closure_list_empty(exec_ctx->closure_list)) { - grpc_closure *c = closure_list->head; - closure_list->head = closure_list->tail = NULL; + grpc_closure *c = exec_ctx->closure_list.head; + exec_ctx->closure_list.head = exec_ctx->closure_list.tail = NULL; while (c != NULL) { grpc_closure *next = c->next; c->cb(exec_ctx, c->cb_arg, c->success); diff --git a/test/core/channel/channel_stack_test.c b/test/core/channel/channel_stack_test.c index 178fe2aa87e..2939027891b 100644 --- a/test/core/channel/channel_stack_test.c +++ b/test/core/channel/channel_stack_test.c @@ -138,7 +138,7 @@ static void test_create_channel_stack(void) { grpc_mdctx_unref(metadata_context); - GPR_ASSERT(grpc_closure_list_empty(closure_list)); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char **argv) { diff --git a/test/core/httpcli/httpcli_test.c b/test/core/httpcli/httpcli_test.c index d3a2f40bd03..4012f995c7b 100644 --- a/test/core/httpcli/httpcli_test.c +++ b/test/core/httpcli/httpcli_test.c @@ -85,13 +85,13 @@ static void test_get(int use_ssl, int port) { req.path = "/get"; req.handshaker = use_ssl ? &grpc_httpcli_ssl : &grpc_httpcli_plaintext; - grpc_httpcli_get(&g_context, &g_pollset, &req, n_seconds_time(15), on_finish, - (&exec_ctx, void *)42); + grpc_httpcli_get(&exec_ctx, &g_context, &g_pollset, &req, n_seconds_time(15), + on_finish, (void *)42); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (!g_done) { grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - n_seconds_time(&exec_ctx, 20)); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), n_seconds_time(20)); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -116,13 +116,13 @@ static void test_post(int use_ssl, int port) { req.path = "/post"; req.handshaker = use_ssl ? &grpc_httpcli_ssl : &grpc_httpcli_plaintext; - grpc_httpcli_post(&g_context, &g_pollset, &req, "hello", 5, - n_seconds_time(15), on_finish, (&exec_ctx, void *)42); + grpc_httpcli_post(&exec_ctx, &g_context, &g_pollset, &req, "hello", 5, + n_seconds_time(15), on_finish, (void *)42); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (!g_done) { grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - n_seconds_time(&exec_ctx, 20)); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), n_seconds_time(20)); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index c3d57157ad0..f592f63ba94 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -117,8 +117,8 @@ 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 */ - int success, grpc_closure_list *closure_list) { +static void session_shutdown_cb(grpc_exec_ctx *exec_ctx, void *arg, /*session */ + int success) { session *se = arg; server *sv = se->sv; grpc_fd_orphan(exec_ctx, se->em_fd, NULL, "a"); @@ -128,8 +128,8 @@ static void session_shutdown_cb(void *arg, /*session */ } /* Called when data become readable in a session. */ -static void session_read_cb(void *arg, /*session */ - int success, grpc_closure_list *closure_list) { +static void session_read_cb(grpc_exec_ctx *exec_ctx, void *arg, /*session */ + int success) { session *se = arg; int fd = se->em_fd->fd; @@ -173,8 +173,8 @@ 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, - grpc_closure_list *closure_list) { +static void listen_shutdown_cb(grpc_exec_ctx *exec_ctx, void *arg /*server */, + int success) { server *sv = arg; grpc_fd_orphan(exec_ctx, sv->em_fd, NULL, "b"); @@ -186,8 +186,8 @@ static void listen_shutdown_cb(void *arg /*server */, int success, } /* Called when a new TCP connection request arrives in the listening port. */ -static void listen_cb(void *arg, /*=sv_arg*/ - int success, grpc_closure_list *closure_list) { +static void listen_cb(grpc_exec_ctx *exec_ctx, void *arg, /*=sv_arg*/ + int success) { server *sv = arg; int fd; int flags; @@ -253,8 +253,9 @@ static void server_wait_and_shutdown(server *sv) { while (!sv->done) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(&exec_ctx, GPR_CLOCK_MONOTONIC)); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), + gpr_inf_future(GPR_CLOCK_MONOTONIC)); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -290,8 +291,8 @@ 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, - grpc_closure_list *closure_list) { +static void client_session_shutdown_cb(grpc_exec_ctx *exec_ctx, + void *arg /*client */, int success) { client *cl = arg; grpc_fd_orphan(exec_ctx, cl->em_fd, NULL, "c"); cl->done = 1; @@ -299,8 +300,8 @@ static void client_session_shutdown_cb(void *arg /*client */, int success, } /* Write as much as possible, then register notify_on_write. */ -static void client_session_write(void *arg, /*client */ - int success, grpc_closure_list *closure_list) { +static void client_session_write(grpc_exec_ctx *exec_ctx, void *arg, /*client */ + int success) { client *cl = arg; int fd = cl->em_fd->fd; ssize_t write_once = 0; @@ -367,8 +368,9 @@ static void client_wait_and_shutdown(client *cl) { while (!cl->done) { grpc_pollset_worker worker; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(&exec_ctx, GPR_CLOCK_MONOTONIC)); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), + gpr_inf_future(GPR_CLOCK_MONOTONIC)); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -404,8 +406,8 @@ 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(void *arg /* fd_change_data */, int success, - grpc_closure_list *closure_list) { +static void first_read_callback(grpc_exec_ctx *exec_ctx, + void *arg /* fd_change_data */, int success) { fd_change_data *fdc = arg; gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -414,8 +416,8 @@ static void first_read_callback(void *arg /* fd_change_data */, int success, gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); } -static void second_read_callback(void *arg /* fd_change_data */, int success, - grpc_closure_list *closure_list) { +static void second_read_callback(grpc_exec_ctx *exec_ctx, + void *arg /* fd_change_data */, int success) { fd_change_data *fdc = arg; gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -466,8 +468,9 @@ static void test_grpc_fd_change(void) { gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (a.cb_that_ran == NULL) { grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(&exec_ctx, GPR_CLOCK_MONOTONIC)); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), + gpr_inf_future(GPR_CLOCK_MONOTONIC)); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -489,8 +492,9 @@ static void test_grpc_fd_change(void) { gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (b.cb_that_ran == NULL) { grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(&exec_ctx, GPR_CLOCK_MONOTONIC)); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), + gpr_inf_future(GPR_CLOCK_MONOTONIC)); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index a7033f246b2..a61cccdb027 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -105,9 +105,9 @@ void test_succeeds(void) { /* connect to it */ GPR_ASSERT(getsockname(svr_fd, (struct sockaddr *)&addr, &addr_len) == 0); grpc_closure_init(&done, must_succeed, NULL); - grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, + grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, &g_pollset_set, (struct sockaddr *)&addr, addr_len, - gpr_inf_future(&exec_ctx, GPR_CLOCK_REALTIME)); + gpr_inf_future(GPR_CLOCK_REALTIME)); /* await the connection */ do { @@ -121,8 +121,9 @@ void test_succeeds(void) { while (g_connections_complete == connections_complete_before) { grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(&exec_ctx, 5)); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5)); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -149,17 +150,17 @@ void test_fails(void) { /* connect to a broken address */ grpc_closure_init(&done, must_fail, NULL); - grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, + grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, &g_pollset_set, (struct sockaddr *)&addr, addr_len, - gpr_inf_future(&exec_ctx, GPR_CLOCK_REALTIME)); + gpr_inf_future(GPR_CLOCK_REALTIME)); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); /* wait for the connection callback to finish */ while (g_connections_complete == connections_complete_before) { grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - test_deadline(&exec_ctx, )); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), test_deadline()); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -214,9 +215,8 @@ void test_times_out(void) { gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_closure_init(&done, must_fail, NULL); - grpc_tcp_client_connect(&done, &g_connecting, &g_pollset_set, - (&exec_ctx, struct sockaddr *)&addr, addr_len, - connect_deadline); + grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, &g_pollset_set, + (struct sockaddr *)&addr, addr_len, connect_deadline); /* Make sure the event doesn't trigger early */ gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -242,8 +242,9 @@ void test_times_out(void) { GPR_ASSERT(g_connections_complete == connections_complete_before + is_after_deadline); } - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_MILLIS_TO_DEADLINE(&exec_ctx, 10)); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), + GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10)); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index d2471c9668a..f676454b7f7 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -191,8 +191,8 @@ static void read_test(size_t num_bytes, size_t slice_size) { gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, - gpr_now(&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), deadline); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -237,8 +237,8 @@ static void large_read_test(size_t slice_size) { gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, - gpr_now(&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), deadline); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -279,8 +279,8 @@ static gpr_slice *allocate_blocks(size_t num_bytes, size_t slice_size, return slices; } -static void write_done(void *user_data /* write_socket_state */, int success, - grpc_closure_list *closure_list) { +static void write_done(grpc_exec_ctx *exec_ctx, + void *user_data /* write_socket_state */, int success) { struct write_socket_state *state = (struct write_socket_state *)user_data; gpr_log(GPR_INFO, "Write done callback called"); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -305,8 +305,9 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { for (;;) { grpc_pollset_worker worker; gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); - grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - GRPC_TIMEOUT_MILLIS_TO_DEADLINE(&exec_ctx, 10)); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), + GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10)); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); do { @@ -368,8 +369,8 @@ static void write_test(size_t num_bytes, size_t slice_size) { if (state.write_done) { break; } - grpc_pollset_work(&g_pollset, &worker, - gpr_now(&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), deadline); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index dd5fe7875ba..530381e37fe 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -59,8 +59,10 @@ static void on_connect(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp) { } static void test_no_op(void) { + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_tcp_server *s = grpc_tcp_server_create(); - grpc_tcp_server_destroy(s, NULL, NULL); + grpc_tcp_server_destroy(&exec_ctx, s, NULL); + grpc_exec_ctx_finish(&exec_ctx); } static void test_no_op_with_start(void) { @@ -68,7 +70,7 @@ static void test_no_op_with_start(void) { grpc_tcp_server *s = grpc_tcp_server_create(); LOG_TEST("test_no_op_with_start"); grpc_tcp_server_start(&exec_ctx, s, NULL, 0, on_connect, NULL); - grpc_tcp_server_destroy(s, NULL, NULL); + grpc_tcp_server_destroy(&exec_ctx, s, NULL); grpc_exec_ctx_finish(&exec_ctx); } @@ -144,8 +146,8 @@ static void test_connect(int n) { while (g_nconnects == nconnects_before && gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0) { grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, - gpr_now(&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), deadline); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c index 0f0cd98a603..d56500707c6 100644 --- a/test/core/iomgr/udp_server_test.c +++ b/test/core/iomgr/udp_server_test.c @@ -64,8 +64,10 @@ static void on_read(int fd) { } static void test_no_op(void) { + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_udp_server *s = grpc_udp_server_create(); - grpc_udp_server_destroy(s, NULL, NULL); + grpc_udp_server_destroy(&exec_ctx, s, NULL); + grpc_exec_ctx_finish(&exec_ctx); } static void test_no_op_with_start(void) { @@ -73,11 +75,12 @@ static void test_no_op_with_start(void) { grpc_udp_server *s = grpc_udp_server_create(); LOG_TEST("test_no_op_with_start"); grpc_udp_server_start(&exec_ctx, s, NULL, 0); - grpc_udp_server_destroy(s, NULL, NULL); + grpc_udp_server_destroy(&exec_ctx, s, NULL); grpc_exec_ctx_finish(&exec_ctx); } static void test_no_op_with_port(void) { + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; struct sockaddr_in addr; grpc_udp_server *s = grpc_udp_server_create(); LOG_TEST("test_no_op_with_port"); @@ -87,7 +90,8 @@ static void test_no_op_with_port(void) { GPR_ASSERT(grpc_udp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr), on_read)); - grpc_udp_server_destroy(s, NULL, NULL); + grpc_udp_server_destroy(&exec_ctx, s, NULL); + grpc_exec_ctx_finish(&exec_ctx); } static void test_no_op_with_port_and_start(void) { @@ -149,8 +153,8 @@ static void test_receive(int number_of_clients) { while (g_number_of_reads == number_of_reads_before && gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0) { grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, - gpr_now(&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), deadline); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -162,7 +166,8 @@ static void test_receive(int number_of_clients) { gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_udp_server_destroy(s, NULL, NULL); + grpc_udp_server_destroy(&exec_ctx, s, NULL); + grpc_exec_ctx_finish(&exec_ctx); } static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, int success) { diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c index a7394ae0511..90f7ba7a834 100644 --- a/test/core/iomgr/workqueue_test.c +++ b/test/core/iomgr/workqueue_test.c @@ -52,7 +52,7 @@ static void test_add_closure(void) { grpc_closure c; int done = 0; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_workqueue *wq = grpc_workqueue_create(&closure_list); + grpc_workqueue *wq = grpc_workqueue_create(&exec_ctx); gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5); grpc_pollset_worker worker; grpc_closure_init(&c, must_succeed, &done); @@ -62,8 +62,8 @@ static void test_add_closure(void) { gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); GPR_ASSERT(!done); - grpc_pollset_work(&g_pollset, &worker, - gpr_now(&exec_ctx, deadline.clock_type), deadline); + grpc_pollset_work(&exec_ctx, &g_pollset, &worker, + gpr_now(deadline.clock_type), deadline); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(done); diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index 7d19d5ae85b..e660484fdfe 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -554,16 +554,16 @@ static void test_compute_engine_creds_success(void) { grpc_httpcli_set_override(compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); grpc_credentials_get_request_metadata( - compute_engine_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_success, (&exec_ctx, void *)test_user_data); - grpc_exec_ctx_finish(&exec_ctx); + &exec_ctx, compute_engine_creds, NULL, test_service_url, + on_oauth2_creds_get_metadata_success, (void *)test_user_data); + grpc_exec_ctx_flush(&exec_ctx); /* Second request: the cached token should be served directly. */ grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); grpc_credentials_get_request_metadata( - compute_engine_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_success, (&exec_ctx, void *)test_user_data); + &exec_ctx, compute_engine_creds, NULL, test_service_url, + on_oauth2_creds_get_metadata_success, (void *)test_user_data); grpc_exec_ctx_finish(&exec_ctx); grpc_credentials_unref(compute_engine_creds); @@ -579,8 +579,8 @@ static void test_compute_engine_creds_failure(void) { GPR_ASSERT(grpc_credentials_has_request_metadata(compute_engine_creds)); GPR_ASSERT(grpc_credentials_has_request_metadata_only(compute_engine_creds)); grpc_credentials_get_request_metadata( - compute_engine_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_failure, (&exec_ctx, void *)test_user_data); + &exec_ctx, compute_engine_creds, NULL, test_service_url, + on_oauth2_creds_get_metadata_failure, (void *)test_user_data); grpc_credentials_unref(compute_engine_creds); grpc_httpcli_set_override(NULL, NULL); grpc_exec_ctx_finish(&exec_ctx); @@ -641,17 +641,17 @@ static void test_refresh_token_creds_success(void) { grpc_httpcli_set_override(httpcli_get_should_not_be_called, refresh_token_httpcli_post_success); grpc_credentials_get_request_metadata( - refresh_token_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_success, (&exec_ctx, void *)test_user_data); - grpc_exec_ctx_finish(&exec_ctx); + &exec_ctx, refresh_token_creds, NULL, test_service_url, + on_oauth2_creds_get_metadata_success, (void *)test_user_data); + grpc_exec_ctx_flush(&exec_ctx); /* Second request: the cached token should be served directly. */ grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); grpc_credentials_get_request_metadata( - refresh_token_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_success, (&exec_ctx, void *)test_user_data); - grpc_exec_ctx_finish(&exec_ctx); + &exec_ctx, refresh_token_creds, NULL, test_service_url, + on_oauth2_creds_get_metadata_success, (void *)test_user_data); + grpc_exec_ctx_flush(&exec_ctx); grpc_credentials_unref(refresh_token_creds); grpc_httpcli_set_override(NULL, NULL); @@ -668,8 +668,8 @@ static void test_refresh_token_creds_failure(void) { GPR_ASSERT(grpc_credentials_has_request_metadata(refresh_token_creds)); GPR_ASSERT(grpc_credentials_has_request_metadata_only(refresh_token_creds)); grpc_credentials_get_request_metadata( - refresh_token_creds, NULL, test_service_url, - on_oauth2_creds_get_metadata_failure, (&exec_ctx, void *)test_user_data); + &exec_ctx, refresh_token_creds, NULL, test_service_url, + on_oauth2_creds_get_metadata_failure, (void *)test_user_data); grpc_credentials_unref(refresh_token_creds); grpc_httpcli_set_override(NULL, NULL); grpc_exec_ctx_finish(&exec_ctx); @@ -758,26 +758,26 @@ static void test_jwt_creds_success(void) { /* First request: jwt_encode_and_sign should be called. */ grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); - grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, - on_jwt_creds_get_metadata_success, - (&exec_ctx, void *)test_user_data); - grpc_exec_ctx_finish(&exec_ctx); + grpc_credentials_get_request_metadata( + &exec_ctx, jwt_creds, NULL, test_service_url, + on_jwt_creds_get_metadata_success, (void *)test_user_data); + grpc_exec_ctx_flush(&exec_ctx); /* Second request: the cached token should be served directly. */ grpc_jwt_encode_and_sign_set_override( encode_and_sign_jwt_should_not_be_called); - grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, - on_jwt_creds_get_metadata_success, - (&exec_ctx, void *)test_user_data); - grpc_exec_ctx_finish(&exec_ctx); + grpc_credentials_get_request_metadata( + &exec_ctx, jwt_creds, NULL, test_service_url, + on_jwt_creds_get_metadata_success, (void *)test_user_data); + grpc_exec_ctx_flush(&exec_ctx); /* Third request: Different service url so jwt_encode_and_sign should be called again (no caching). */ grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); - grpc_credentials_get_request_metadata(jwt_creds, NULL, other_test_service_url, - on_jwt_creds_get_metadata_success, - (&exec_ctx, void *)test_user_data); - grpc_exec_ctx_finish(&exec_ctx); + grpc_credentials_get_request_metadata( + &exec_ctx, jwt_creds, NULL, other_test_service_url, + on_jwt_creds_get_metadata_success, (void *)test_user_data); + grpc_exec_ctx_flush(&exec_ctx); gpr_free(json_key_string); grpc_credentials_unref(jwt_creds); @@ -794,9 +794,9 @@ static void test_jwt_creds_signing_failure(void) { GPR_ASSERT(grpc_credentials_has_request_metadata_only(jwt_creds)); grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_failure); - grpc_credentials_get_request_metadata(jwt_creds, NULL, test_service_url, - on_jwt_creds_get_metadata_failure, - (&exec_ctx, void *)test_user_data); + grpc_credentials_get_request_metadata( + &exec_ctx, jwt_creds, NULL, test_service_url, + on_jwt_creds_get_metadata_failure, (void *)test_user_data); gpr_free(json_key_string); grpc_credentials_unref(jwt_creds); diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c index 6b24972b4e7..9c526a7b5d5 100644 --- a/test/core/security/jwt_verifier_test.c +++ b/test/core/security/jwt_verifier_test.c @@ -321,9 +321,8 @@ 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(verifier, NULL, jwt, expected_audience, - on_verification_success, - (&exec_ctx, void *)expected_user_data); + grpc_jwt_verifier_verify(&exec_ctx, verifier, NULL, jwt, expected_audience, + on_verification_success, (void *)expected_user_data); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); @@ -357,9 +356,8 @@ 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(verifier, NULL, jwt, expected_audience, - on_verification_success, - (&exec_ctx, void *)expected_user_data); + grpc_jwt_verifier_verify(&exec_ctx, verifier, NULL, jwt, expected_audience, + on_verification_success, (void *)expected_user_data); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); @@ -411,9 +409,8 @@ static void test_jwt_verifier_url_issuer_success(void) { NULL); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != NULL); - grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, - on_verification_success, - (&exec_ctx, void *)expected_user_data); + grpc_jwt_verifier_verify(&exec_ctx, verifier, NULL, jwt, expected_audience, + on_verification_success, (void *)expected_user_data); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); @@ -455,9 +452,9 @@ 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(verifier, NULL, jwt, expected_audience, + grpc_jwt_verifier_verify(&exec_ctx, verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, - (&exec_ctx, void *)expected_user_data); + (void *)expected_user_data); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); @@ -478,9 +475,9 @@ static void test_jwt_verifier_bad_json_key(void) { NULL); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != NULL); - grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, + grpc_jwt_verifier_verify(&exec_ctx, verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, - (&exec_ctx, void *)expected_user_data); + (void *)expected_user_data); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); @@ -527,9 +524,9 @@ 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(verifier, NULL, jwt, expected_audience, + grpc_jwt_verifier_verify(&exec_ctx, verifier, NULL, jwt, expected_audience, on_verification_bad_signature, - (&exec_ctx, void *)expected_user_data); + (void *)expected_user_data); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); @@ -557,9 +554,9 @@ static void test_jwt_verifier_bad_format(void) { 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(verifier, NULL, "bad jwt", expected_audience, - on_verification_bad_format, - (&exec_ctx, void *)expected_user_data); + grpc_jwt_verifier_verify(&exec_ctx, verifier, NULL, "bad jwt", + expected_audience, on_verification_bad_format, + (void *)expected_user_data); grpc_jwt_verifier_destroy(verifier); grpc_httpcli_set_override(NULL, NULL); grpc_exec_ctx_finish(&exec_ctx); diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c index 1e4c1f67202..f207e057947 100644 --- a/test/core/security/print_google_default_creds_token.c +++ b/test/core/security/print_google_default_creds_token.c @@ -98,8 +98,9 @@ int main(int argc, char **argv) { gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); while (!sync.is_done) { grpc_pollset_worker worker; - grpc_pollset_work(&sync.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(&exec_ctx, GPR_CLOCK_MONOTONIC)); + grpc_pollset_work(&exec_ctx, &sync.pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), + gpr_inf_future(GPR_CLOCK_MONOTONIC)); gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); diff --git a/test/core/security/verify_jwt.c b/test/core/security/verify_jwt.c index 7750afd426b..378a37f26c5 100644 --- a/test/core/security/verify_jwt.c +++ b/test/core/security/verify_jwt.c @@ -112,8 +112,9 @@ int main(int argc, char **argv) { gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); while (!sync.is_done) { grpc_pollset_worker worker; - grpc_pollset_work(&sync.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), - gpr_inf_future(&exec_ctx, GPR_CLOCK_MONOTONIC)); + grpc_pollset_work(&exec_ctx, &sync.pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), + gpr_inf_future(GPR_CLOCK_MONOTONIC)); gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&sync.pollset)); diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index 3209bc5bdf3..e3fc7897884 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -99,7 +99,7 @@ static void test_cq_end_op(void) { GPR_ASSERT(ev.success); shutdown_and_destroy(cc); - GPR_ASSERT(grpc_closure_list_empty(closure_list)); + grpc_exec_ctx_finish(&exec_ctx); } static void test_shutdown_then_next_polling(void) { @@ -172,7 +172,7 @@ static void test_pluck(void) { } shutdown_and_destroy(cc); - GPR_ASSERT(grpc_closure_list_empty(closure_list)); + grpc_exec_ctx_finish(&exec_ctx); } #define TEST_THREAD_EVENTS 10000 @@ -217,15 +217,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(opt->cc, (void *)(gpr_intptr)1, 1, free_completion, NULL, - gpr_malloc(sizeof(&exec_ctx, grpc_cq_completion))); + grpc_cq_end_op(&exec_ctx, opt->cc, (void *)(gpr_intptr)1, 1, + free_completion, NULL, + 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 *)(gpr_intptr)1); - GPR_ASSERT(grpc_closure_list_empty(closure_list)); + grpc_exec_ctx_finish(&exec_ctx); } static void consumer_thread(void *arg) { From 8602d3e4ac9b2eab62c3a994c90ebdc6162d4df6 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 12:57:02 -0700 Subject: [PATCH 37/56] Fix argument order --- src/core/iomgr/workqueue_posix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/iomgr/workqueue_posix.c b/src/core/iomgr/workqueue_posix.c index 2e510ee5a2d..0a0f3c364ea 100644 --- a/src/core/iomgr/workqueue_posix.c +++ b/src/core/iomgr/workqueue_posix.c @@ -119,7 +119,7 @@ static void on_readable(grpc_exec_ctx *exec_ctx, void *arg, int success) { gpr_free(workqueue); } else { gpr_mu_lock(&workqueue->mu); - grpc_closure_list_move(&exec_ctx->closure_list, &workqueue->closure_list); + grpc_closure_list_move(&workqueue->closure_list, &exec_ctx->closure_list); grpc_wakeup_fd_consume_wakeup(&workqueue->wakeup_fd); gpr_mu_unlock(&workqueue->mu); grpc_fd_notify_on_read(exec_ctx, workqueue->wakeup_read_fd, From c20b19d0f7358fea7c80a0040aab865484e18521 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 13:06:06 -0700 Subject: [PATCH 38/56] better logging --- tools/run_tests/port_server.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/run_tests/port_server.py b/tools/run_tests/port_server.py index d14c829fe06..48da9954712 100755 --- a/tools/run_tests/port_server.py +++ b/tools/run_tests/port_server.py @@ -52,7 +52,7 @@ with open(__file__) as f: _MY_VERSION = hashlib.sha1(f.read()).hexdigest() -def refill_pool(max_timeout): +def refill_pool(max_timeout, req): """Scan for ports not marked for being in use""" for i in range(1025, 32767): if len(pool) > 100: break @@ -60,11 +60,13 @@ def refill_pool(max_timeout): age = time.time() - in_use[i] if age < max_timeout: continue + req.log_message("kill old request %d" % i) del in_use[i] s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) try: s.bind(('localhost', i)) + req.log_message("found available port %d" % i) pool.append(i) except: pass # we really don't care about failures @@ -72,13 +74,14 @@ def refill_pool(max_timeout): s.close() -def allocate_port(): +def allocate_port(req): global pool global in_use max_timeout = 600 while not pool: - refill_pool(max_timeout) + refill_pool(max_timeout, req) if not pool: + req.log_message("failed to find ports: retrying soon") time.sleep(1) max_timeout /= 2 port = pool[0] @@ -100,7 +103,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): self.send_response(200) self.send_header('Content-Type', 'text/plain') self.end_headers() - p = allocate_port() + p = allocate_port(self) self.log_message('allocated port %d' % p) self.wfile.write('%d' % p) elif self.path[0:6] == '/drop/': From 58473e8c37efaac81a08698b5f3bf77163b78f25 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 14:37:11 -0700 Subject: [PATCH 39/56] Add mutex init --- src/core/surface/secure_channel_create.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index ae2eaad8969..0c1cb017495 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -209,6 +209,7 @@ static grpc_subchannel *subchannel_factory_create_subchannel( c->base.vtable = &connector_vtable; c->security_connector = f->security_connector; c->mdctx = f->mdctx; + gpr_mu_init(&c->mu); grpc_mdctx_ref(c->mdctx); gpr_ref_init(&c->refs, 1); args->args = final_args; From 4ed7a7585f14175137b39bc9b59ae4687ef35d0f Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 14:38:09 -0700 Subject: [PATCH 40/56] Increase deadline ==> decrease flakes --- test/core/end2end/tests/graceful_server_shutdown.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/core/end2end/tests/graceful_server_shutdown.c b/test/core/end2end/tests/graceful_server_shutdown.c index df420a9846d..6b786aa89a5 100644 --- a/test/core/end2end/tests/graceful_server_shutdown.c +++ b/test/core/end2end/tests/graceful_server_shutdown.c @@ -97,7 +97,7 @@ static void test_early_server_shutdown_finishes_inflight_calls( grpc_end2end_test_config config) { grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time(); + gpr_timespec deadline = n_seconds_time(10); grpc_end2end_test_fixture f = begin_test( config, "test_early_server_shutdown_finishes_inflight_calls", NULL, NULL); cq_verifier *cqv = cq_verifier_create(f.cq); From 8b52f853a52a51542627004ada6ffdbc84d14a4e Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 16:38:57 -0700 Subject: [PATCH 41/56] Document exec_ctx --- src/core/iomgr/exec_ctx.h | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/core/iomgr/exec_ctx.h b/src/core/iomgr/exec_ctx.h index 0cebc1665ef..bfa08c41dd7 100644 --- a/src/core/iomgr/exec_ctx.h +++ b/src/core/iomgr/exec_ctx.h @@ -36,6 +36,23 @@ #include "src/core/iomgr/closure.h" +/** Execution context. + * A bag of data that collects information along a callstack. + * Generally created at public API entry points, and passed down as + * pointer to child functions that manipulate it. + * + * Specific responsibilities (this may grow in the future): + * - track a list of work that needs to be delayed until the top of the + * call stack (this provides a convenient mechanism to run callbacks + * without worrying about locking issues) + * + * CONVENTIONS: + * Instance of this must ALWAYS be constructed on the stack, never + * heap allocated. Instances and pointers to them must always be called + * exec_ctx. 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; }; @@ -43,10 +60,17 @@ struct grpc_exec_ctx { #define GRPC_EXEC_CTX_INIT \ { GRPC_CLOSURE_LIST_INIT } -void grpc_exec_ctx_finish(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. */ void 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); +/** Add a closure to be executed at the next flush/finish point */ void grpc_exec_ctx_enqueue(grpc_exec_ctx *exec_ctx, grpc_closure *closure, int success); +/** Add a list of closures to be executed at the next flush/finish point. + * Leaves \a list empty. */ void grpc_exec_ctx_enqueue_list(grpc_exec_ctx *exec_ctx, grpc_closure_list *list); From 6ecd8ad519c360d18b32c8b6a2dbb3f6e9e6b2ef Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 17:01:34 -0700 Subject: [PATCH 42/56] Make zookeeper compile with execution contexts --- .../resolvers/zookeeper_resolver.c | 66 ++++++++++--------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/src/core/client_config/resolvers/zookeeper_resolver.c b/src/core/client_config/resolvers/zookeeper_resolver.c index 213d5a172fc..f640a0084ad 100644 --- a/src/core/client_config/resolvers/zookeeper_resolver.c +++ b/src/core/client_config/resolvers/zookeeper_resolver.c @@ -87,24 +87,27 @@ typedef struct { int resolved_num; } zookeeper_resolver; -static void zookeeper_destroy(grpc_resolver *r); +static void zookeeper_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *r); static void zookeeper_start_resolving_locked(zookeeper_resolver *r); -static grpc_closure *zookeeper_maybe_finish_next_locked(zookeeper_resolver *r) - GRPC_MUST_USE_RESULT; +static void zookeeper_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx, + zookeeper_resolver *r); -static void zookeeper_shutdown(grpc_resolver *r); -static void zookeeper_channel_saw_error(grpc_resolver *r, +static void zookeeper_shutdown(grpc_exec_ctx *exec_ctx, grpc_resolver *r); +static void zookeeper_channel_saw_error(grpc_exec_ctx *exec_ctx, + grpc_resolver *r, struct sockaddr *failing_address, int failing_address_len); -static void zookeeper_next(grpc_resolver *r, grpc_client_config **target_config, +static void zookeeper_next(grpc_exec_ctx *exec_ctx, grpc_resolver *r, + grpc_client_config **target_config, grpc_closure *on_complete); static const grpc_resolver_vtable zookeeper_resolver_vtable = { zookeeper_destroy, zookeeper_shutdown, zookeeper_channel_saw_error, zookeeper_next}; -static void zookeeper_shutdown(grpc_resolver *resolver) { +static void zookeeper_shutdown(grpc_exec_ctx *exec_ctx, + grpc_resolver *resolver) { zookeeper_resolver *r = (zookeeper_resolver *)resolver; grpc_closure *call = NULL; gpr_mu_lock(&r->mu); @@ -116,11 +119,12 @@ static void zookeeper_shutdown(grpc_resolver *resolver) { zookeeper_close(r->zookeeper_handle); gpr_mu_unlock(&r->mu); if (call != NULL) { - call->cb(call->cb_arg, 1); + call->cb(exec_ctx, call->cb_arg, 1); } } -static void zookeeper_channel_saw_error(grpc_resolver *resolver, +static void zookeeper_channel_saw_error(grpc_exec_ctx *exec_ctx, + grpc_resolver *resolver, struct sockaddr *sa, int len) { zookeeper_resolver *r = (zookeeper_resolver *)resolver; gpr_mu_lock(&r->mu); @@ -130,11 +134,10 @@ static void zookeeper_channel_saw_error(grpc_resolver *resolver, gpr_mu_unlock(&r->mu); } -static void zookeeper_next(grpc_resolver *resolver, +static void zookeeper_next(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver, grpc_client_config **target_config, grpc_closure *on_complete) { zookeeper_resolver *r = (zookeeper_resolver *)resolver; - grpc_closure *call; gpr_mu_lock(&r->mu); GPR_ASSERT(r->next_completion == NULL); r->next_completion = on_complete; @@ -142,10 +145,9 @@ static void zookeeper_next(grpc_resolver *resolver, if (r->resolved_version == 0 && r->resolving == 0) { zookeeper_start_resolving_locked(r); } else { - call = zookeeper_maybe_finish_next_locked(r); + zookeeper_maybe_finish_next_locked(exec_ctx, r); } gpr_mu_unlock(&r->mu); - if (call) call->cb(call->cb_arg, 1); } /** Zookeeper global watcher for connection management @@ -180,14 +182,13 @@ static void zookeeper_watcher(zhandle_t *zookeeper_handle, int type, int state, /** Callback function after getting all resolved addresses Creates a subchannel for each address */ -static void zookeeper_on_resolved(void *arg, +static void zookeeper_on_resolved(grpc_exec_ctx *exec_ctx, void *arg, grpc_resolved_addresses *addresses) { zookeeper_resolver *r = arg; grpc_client_config *config = NULL; grpc_subchannel **subchannels; grpc_subchannel_args args; grpc_lb_policy *lb_policy; - grpc_closure *call; size_t i; if (addresses != NULL) { grpc_lb_policy_args lb_policy_args; @@ -198,13 +199,13 @@ static void zookeeper_on_resolved(void *arg, args.addr = (struct sockaddr *)(addresses->addrs[i].addr); args.addr_len = addresses->addrs[i].len; subchannels[i] = grpc_subchannel_factory_create_subchannel( - r->subchannel_factory, &args); + exec_ctx, r->subchannel_factory, &args); } lb_policy_args.subchannels = subchannels; lb_policy_args.num_subchannels = addresses->naddrs; lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args); grpc_client_config_set_lb_policy(config, lb_policy); - GRPC_LB_POLICY_UNREF(lb_policy, "construction"); + GRPC_LB_POLICY_UNREF(exec_ctx, lb_policy, "construction"); grpc_resolved_addresses_destroy(addresses); gpr_free(subchannels); } @@ -212,20 +213,18 @@ static void zookeeper_on_resolved(void *arg, GPR_ASSERT(r->resolving == 1); r->resolving = 0; if (r->resolved_config != NULL) { - grpc_client_config_unref(r->resolved_config); + grpc_client_config_unref(exec_ctx, r->resolved_config); } r->resolved_config = config; r->resolved_version++; - call = zookeeper_maybe_finish_next_locked(r); + zookeeper_maybe_finish_next_locked(exec_ctx, r); gpr_mu_unlock(&r->mu); - if (call) call->cb(call->cb_arg, 1); - - GRPC_RESOLVER_UNREF(&r->base, "zookeeper-resolving"); + GRPC_RESOLVER_UNREF(exec_ctx, &r->base, "zookeeper-resolving"); } /** Callback function for each DNS resolved address */ -static void zookeeper_dns_resolved(void *arg, +static void zookeeper_dns_resolved(grpc_exec_ctx *exec_ctx, void *arg, grpc_resolved_addresses *addresses) { size_t i; zookeeper_resolver *r = arg; @@ -251,7 +250,7 @@ static void zookeeper_dns_resolved(void *arg, resolve_done = (r->resolved_num == r->resolved_total); gpr_mu_unlock(&r->mu); if (resolve_done) { - zookeeper_on_resolved(r, r->resolved_addrs); + zookeeper_on_resolved(exec_ctx, r, r->resolved_addrs); } } @@ -300,9 +299,11 @@ static void zookeeper_get_children_node_completion(int rc, const char *value, char *address = NULL; zookeeper_resolver *r = (zookeeper_resolver *)arg; int resolve_done = 0; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; if (rc != 0) { gpr_log(GPR_ERROR, "Error in getting a child node of %s", r->name); + grpc_exec_ctx_finish(&exec_ctx); return; } @@ -318,9 +319,11 @@ static void zookeeper_get_children_node_completion(int rc, const char *value, resolve_done = (r->resolved_num == r->resolved_total); gpr_mu_unlock(&r->mu); if (resolve_done) { - zookeeper_on_resolved(r, r->resolved_addrs); + zookeeper_on_resolved(&exec_ctx, r, r->resolved_addrs); } } + + grpc_exec_ctx_finish(&exec_ctx); } static void zookeeper_get_children_completion( @@ -411,28 +414,27 @@ static void zookeeper_start_resolving_locked(zookeeper_resolver *r) { zookeeper_resolve_address(r); } -static grpc_closure *zookeeper_maybe_finish_next_locked(zookeeper_resolver *r) { - grpc_closure *call = NULL; +static void zookeeper_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx, + zookeeper_resolver *r) { if (r->next_completion != NULL && r->resolved_version != r->published_version) { *r->target_config = r->resolved_config; if (r->resolved_config != NULL) { grpc_client_config_ref(r->resolved_config); } - call = r->next_completion; + grpc_exec_ctx_enqueue(exec_ctx, r->next_completion, 1); r->next_completion = NULL; r->published_version = r->resolved_version; } - return call; } -static void zookeeper_destroy(grpc_resolver *gr) { +static void zookeeper_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) { zookeeper_resolver *r = (zookeeper_resolver *)gr; gpr_mu_destroy(&r->mu); if (r->resolved_config != NULL) { - grpc_client_config_unref(r->resolved_config); + grpc_client_config_unref(exec_ctx, r->resolved_config); } - grpc_subchannel_factory_unref(r->subchannel_factory); + grpc_subchannel_factory_unref(exec_ctx, r->subchannel_factory); gpr_free(r->name); gpr_free(r->lb_policy_name); gpr_free(r); From 82f9bd84e5303c78b4b766655653ddb3e1e669f4 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 23 Sep 2015 09:31:51 -0700 Subject: [PATCH 43/56] Update Windows stuff --- src/core/client_config/subchannel.c | 14 ++-- src/core/iomgr/iocp_windows.c | 44 ++++++----- src/core/iomgr/iocp_windows.h | 10 ++- src/core/iomgr/pollset_set_windows.c | 6 +- src/core/iomgr/pollset_windows.c | 15 ++-- src/core/iomgr/resolve_address_windows.c | 6 +- src/core/iomgr/sockaddr_utils.c | 3 +- src/core/iomgr/socket_windows.h | 4 +- src/core/iomgr/tcp_client_windows.c | 40 +++++----- src/core/iomgr/tcp_server_windows.c | 49 ++++++------ src/core/iomgr/tcp_windows.c | 80 ++++++++++---------- src/core/security/security_connector.c | 8 +- src/core/surface/server.c | 6 +- src/core/transport/chttp2/frame_data.c | 2 +- src/core/transport/chttp2/frame_goaway.c | 2 +- test/core/util/port_windows.c | 19 +++-- vsprojects/vcxproj/grpc/grpc.vcxproj | 14 ++-- vsprojects/vcxproj/grpc/grpc.vcxproj.filters | 9 ++- 18 files changed, 173 insertions(+), 158 deletions(-) diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index c7dfba9a4b1..d9dc5ae39d5 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -258,7 +258,7 @@ static void subchannel_destroy(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { if (c->active != NULL) { connection_destroy(exec_ctx, c->active); } - gpr_free(c->filters); + gpr_free((void*)c->filters); grpc_channel_args_destroy(c->args); gpr_free(c->addr); grpc_mdctx_unref(c->mdctx); @@ -294,7 +294,7 @@ grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, grpc_connector_ref(c->connector); c->num_filters = args->filter_count; c->filters = gpr_malloc(sizeof(grpc_channel_filter *) * c->num_filters); - memcpy(c->filters, args->filters, + memcpy((void*)c->filters, args->filters, sizeof(grpc_channel_filter *) * c->num_filters); c->addr = gpr_malloc(args->addr_len); memcpy(c->addr, args->addr, args->addr_len); @@ -531,8 +531,8 @@ static void publish_transport(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { /* build final filter list */ num_filters = c->num_filters + c->connecting_result.num_filters + 1; filters = gpr_malloc(sizeof(*filters) * num_filters); - memcpy(filters, c->filters, sizeof(*filters) * c->num_filters); - memcpy(filters + c->num_filters, c->connecting_result.filters, + memcpy((void*)filters, c->filters, sizeof(*filters) * c->num_filters); + memcpy((void*)(filters + c->num_filters), c->connecting_result.filters, sizeof(*filters) * c->connecting_result.num_filters); filters[num_filters - 1] = &grpc_connected_channel_filter; @@ -545,7 +545,7 @@ static void publish_transport(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { grpc_channel_stack_init(exec_ctx, filters, num_filters, c->master, c->args, c->mdctx, stk); grpc_connected_channel_bind_transport(stk, c->connecting_result.transport); - gpr_free(c->connecting_result.filters); + gpr_free((void*)c->connecting_result.filters); memset(&c->connecting_result, 0, sizeof(c->connecting_result)); /* initialize state watcher */ @@ -559,7 +559,7 @@ static void publish_transport(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { if (c->disconnected) { gpr_mu_unlock(&c->mu); gpr_free(sw); - gpr_free(filters); + gpr_free((void*)filters); grpc_channel_stack_destroy(exec_ctx, stk); GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, c->master, "connecting"); GRPC_SUBCHANNEL_UNREF(exec_ctx, c, "connecting"); @@ -601,7 +601,7 @@ static void publish_transport(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { w4c = next; } - gpr_free(filters); + gpr_free((void*)filters); if (destroy_connection != NULL) { connection_destroy(exec_ctx, destroy_connection); diff --git a/src/core/iomgr/iocp_windows.c b/src/core/iomgr/iocp_windows.c index 54048910a23..0378cf0c765 100644 --- a/src/core/iomgr/iocp_windows.c +++ b/src/core/iomgr/iocp_windows.c @@ -56,7 +56,7 @@ static gpr_atm g_custom_events = 0; static HANDLE g_iocp; -static void do_iocp_work() { +static void do_iocp_work(grpc_exec_ctx *exec_ctx) { BOOL success; DWORD bytes = 0; DWORD flags = 0; @@ -64,8 +64,6 @@ static void do_iocp_work() { LPOVERLAPPED overlapped; grpc_winsocket *socket; grpc_winsocket_callback_info *info; - void (*f)(void *, int) = NULL; - void *opaque = NULL; success = GetQueuedCompletionStatus(g_iocp, &bytes, &completion_key, &overlapped, INFINITE); /* success = 0 and overlapped = NULL means the deadline got attained. @@ -98,22 +96,24 @@ static void do_iocp_work() { GPR_ASSERT(overlapped == &info->overlapped); GPR_ASSERT(!info->has_pending_iocp); gpr_mu_lock(&socket->state_mu); - if (info->cb) { - f = info->cb; - opaque = info->opaque; - info->cb = NULL; + if (info->closure) { + grpc_exec_ctx_enqueue(exec_ctx, info->closure, 1); + info->closure = NULL; } else { info->has_pending_iocp = 1; } gpr_mu_unlock(&socket->state_mu); - if (f) f(opaque, 1); } static void iocp_loop(void *p) { + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + while (gpr_atm_acq_load(&g_custom_events) || !gpr_event_get(&g_shutdown_iocp)) { - do_iocp_work(); + do_iocp_work(&exec_ctx); + grpc_exec_ctx_flush(&exec_ctx); } + grpc_exec_ctx_finish(&exec_ctx); gpr_event_set(&g_iocp_done, (void *)1); } @@ -168,31 +168,33 @@ void grpc_iocp_add_socket(grpc_winsocket *socket) { -) 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, - void (*cb)(void *, int), void *opaque, +static void socket_notify_on_iocp(grpc_exec_ctx *exec_ctx, + grpc_winsocket *socket, + grpc_closure *closure, grpc_winsocket_callback_info *info) { int run_now = 0; - GPR_ASSERT(!info->cb); + GPR_ASSERT(info->closure == NULL); gpr_mu_lock(&socket->state_mu); if (info->has_pending_iocp) { run_now = 1; info->has_pending_iocp = 0; + grpc_exec_ctx_enqueue(exec_ctx, closure, 1); } else { - info->cb = cb; - info->opaque = opaque; + info->closure = closure; } gpr_mu_unlock(&socket->state_mu); - if (run_now) cb(opaque, 1); } -void grpc_socket_notify_on_write(grpc_winsocket *socket, - void (*cb)(void *, int), void *opaque) { - socket_notify_on_iocp(socket, cb, opaque, &socket->write_info); +void grpc_socket_notify_on_write(grpc_exec_ctx *exec_ctx, + grpc_winsocket *socket, + grpc_closure *closure) { + socket_notify_on_iocp(exec_ctx, socket, closure, &socket->write_info); } -void grpc_socket_notify_on_read(grpc_winsocket *socket, void (*cb)(void *, int), - void *opaque) { - socket_notify_on_iocp(socket, cb, opaque, &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); } #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/iocp_windows.h b/src/core/iomgr/iocp_windows.h index 7d2dc45176b..35c418f3b45 100644 --- a/src/core/iomgr/iocp_windows.h +++ b/src/core/iomgr/iocp_windows.h @@ -43,10 +43,12 @@ void grpc_iocp_kick(void); void grpc_iocp_shutdown(void); void grpc_iocp_add_socket(grpc_winsocket *); -void grpc_socket_notify_on_write(grpc_winsocket *, - void (*cb)(void *, int success), void *opaque); +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 *, - void (*cb)(void *, int success), void *opaque); +void grpc_socket_notify_on_read(grpc_exec_ctx *exec_ctx, + grpc_winsocket *winsocket, + grpc_closure *closure); #endif /* GRPC_INTERNAL_CORE_IOMGR_IOCP_WINDOWS_H */ diff --git a/src/core/iomgr/pollset_set_windows.c b/src/core/iomgr/pollset_set_windows.c index c80dd592b0d..75da6dbfa1e 100644 --- a/src/core/iomgr/pollset_set_windows.c +++ b/src/core/iomgr/pollset_set_windows.c @@ -41,10 +41,12 @@ void grpc_pollset_set_init(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, +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) {} #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/pollset_windows.c b/src/core/iomgr/pollset_windows.c index e6791d49438..7707c3d502b 100644 --- a/src/core/iomgr/pollset_windows.c +++ b/src/core/iomgr/pollset_windows.c @@ -85,29 +85,26 @@ void grpc_pollset_init(grpc_pollset *pollset) { pollset->kicked_without_pollers = 0; } -void grpc_pollset_shutdown(grpc_pollset *pollset, - void (*shutdown_done)(void *arg), - void *shutdown_done_arg) { +void grpc_pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + grpc_closure *closure) { gpr_mu_lock(&pollset->mu); pollset->shutting_down = 1; grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); gpr_mu_unlock(&pollset->mu); - shutdown_done(shutdown_done_arg); + grpc_exec_ctx_enqueue(exec_ctx, closure, 1); } void grpc_pollset_destroy(grpc_pollset *pollset) { gpr_mu_destroy(&pollset->mu); } -void grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker *worker, +void grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + grpc_pollset_worker *worker, gpr_timespec now, gpr_timespec deadline) { int added_worker = 0; worker->next = worker->prev = NULL; gpr_cv_init(&worker->cv); - if (grpc_maybe_call_delayed_callbacks(&pollset->mu, 1 /* GPR_TRUE */)) { - goto done; - } - if (grpc_alarm_check(&pollset->mu, now, &deadline)) { + if (grpc_alarm_check(exec_ctx, now, &deadline)) { goto done; } if (!pollset->kicked_without_pollers && !pollset->shutting_down) { diff --git a/src/core/iomgr/resolve_address_windows.c b/src/core/iomgr/resolve_address_windows.c index fb5fd0d4f63..fcd80b3912f 100644 --- a/src/core/iomgr/resolve_address_windows.c +++ b/src/core/iomgr/resolve_address_windows.c @@ -128,6 +128,7 @@ done: /* Thread function to asynch-ify grpc_blocking_resolve_address */ static void do_request(void *rp) { + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; request *r = rp; grpc_resolved_addresses *resolved = grpc_blocking_resolve_address(r->name, r->default_port); @@ -137,7 +138,8 @@ static void do_request(void *rp) { gpr_free(r->default_port); grpc_iomgr_unregister_object(&r->iomgr_object); gpr_free(r); - cb(arg, resolved); + cb(&exec_ctx, arg, resolved); + grpc_exec_ctx_finish(&exec_ctx); } void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) { @@ -149,7 +151,7 @@ void grpc_resolve_address(const char *name, const char *default_port, grpc_resolve_cb cb, void *arg) { request *r = gpr_malloc(sizeof(request)); gpr_thd_id id; - const char *label; + char *label; gpr_asprintf(&label, "resolve:%s", name); grpc_iomgr_register_object(&r->iomgr_object, label); gpr_free(label); diff --git a/src/core/iomgr/sockaddr_utils.c b/src/core/iomgr/sockaddr_utils.c index 0e4bf245498..df74fe2fe04 100644 --- a/src/core/iomgr/sockaddr_utils.c +++ b/src/core/iomgr/sockaddr_utils.c @@ -158,8 +158,9 @@ int grpc_sockaddr_to_string(char **out, const struct sockaddr *addr, ip = &addr6->sin6_addr; port = ntohs(addr6->sin6_port); } + /* Windows inet_ntop wants a mutable ip pointer */ if (ip != NULL && - inet_ntop(addr->sa_family, ip, ntop_buf, sizeof(ntop_buf)) != NULL) { + inet_ntop(addr->sa_family, (void*)ip, ntop_buf, sizeof(ntop_buf)) != NULL) { ret = gpr_join_host_port(out, ntop_buf, port); } else { ret = gpr_asprintf(out, "(sockaddr family=%d)", addr->sa_family); diff --git a/src/core/iomgr/socket_windows.h b/src/core/iomgr/socket_windows.h index 45bc6572257..dfbfabe1f93 100644 --- a/src/core/iomgr/socket_windows.h +++ b/src/core/iomgr/socket_windows.h @@ -41,6 +41,7 @@ #include #include "src/core/iomgr/iomgr_internal.h" +#include "src/core/iomgr/exec_ctx.h" /* This holds the data for an outstanding read or write on a socket. The mutex to protect the concurrent access to that data is the one @@ -54,8 +55,7 @@ typedef struct grpc_winsocket_callback_info { OVERLAPPED overlapped; /* The callback information for the pending operation. May be empty if the caller hasn't registered a callback yet. */ - void (*cb)(void *opaque, int success); - void *opaque; + grpc_closure *closure; /* A boolean to describe if the IO Completion Port got a notification for that operation. This will happen if the operation completed before the called had time to register a callback. We could avoid that behavior diff --git a/src/core/iomgr/tcp_client_windows.c b/src/core/iomgr/tcp_client_windows.c index 28f1bc96c8d..4dfab3b9545 100644 --- a/src/core/iomgr/tcp_client_windows.c +++ b/src/core/iomgr/tcp_client_windows.c @@ -52,14 +52,15 @@ #include "src/core/iomgr/socket_windows.h" typedef struct { - void (*cb)(void *arg, grpc_endpoint *tcp); - void *cb_arg; + grpc_closure *on_done; gpr_mu mu; grpc_winsocket *socket; gpr_timespec deadline; grpc_alarm alarm; char *addr_name; int refs; + grpc_closure on_connect; + grpc_endpoint **endpoint; } async_connect; static void async_connect_unlock_and_cleanup(async_connect *ac) { @@ -73,7 +74,7 @@ static void async_connect_unlock_and_cleanup(async_connect *ac) { } } -static void on_alarm(void *acp, int occured) { +static void on_alarm(grpc_exec_ctx *exec_ctx, void *acp, int occured) { async_connect *ac = acp; gpr_mu_lock(&ac->mu); /* If the alarm didn't occur, it got cancelled. */ @@ -83,15 +84,14 @@ static void on_alarm(void *acp, int occured) { async_connect_unlock_and_cleanup(ac); } -static void on_connect(void *acp, int from_iocp) { +static void on_connect(grpc_exec_ctx *exec_ctx, void *acp, int from_iocp) { async_connect *ac = acp; SOCKET sock = ac->socket->socket; - grpc_endpoint *ep = NULL; + grpc_endpoint **ep = ac->endpoint; grpc_winsocket_callback_info *info = &ac->socket->write_info; - void (*cb)(void *arg, grpc_endpoint *tcp) = ac->cb; - void *cb_arg = ac->cb_arg; + grpc_closure *on_done = ac->on_done; - grpc_alarm_cancel(&ac->alarm); + grpc_alarm_cancel(exec_ctx, &ac->alarm); gpr_mu_lock(&ac->mu); @@ -106,7 +106,7 @@ static void on_connect(void *acp, int from_iocp) { gpr_log(GPR_ERROR, "on_connect error: %s", utf8_message); gpr_free(utf8_message); } else { - ep = grpc_tcp_create(ac->socket, ac->addr_name); + *ep = grpc_tcp_create(ac->socket, ac->addr_name); ac->socket = NULL; } } @@ -114,14 +114,15 @@ static void on_connect(void *acp, int from_iocp) { async_connect_unlock_and_cleanup(ac); /* If the connection was aborted, the callback was already called when the deadline was met. */ - cb(cb_arg, ep); + on_done->cb(exec_ctx, on_done->cb_arg, *ep != NULL); } /* Tries to issue one async connection, then schedules both an IOCP notification request for the connection, and one timeout alert. */ -void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *tcp), - void *arg, grpc_pollset_set *interested_parties, - const struct sockaddr *addr, int addr_len, +void grpc_tcp_client_connect(grpc_exec_ctx *exec_ctx, grpc_closure *on_done, + grpc_endpoint **endpoint, + grpc_pollset_set *interested_parties, + const struct sockaddr *addr, size_t addr_len, gpr_timespec deadline) { SOCKET sock = INVALID_SOCKET; BOOL success; @@ -137,6 +138,8 @@ void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *tcp), char *utf8_message; grpc_winsocket_callback_info *info; + *endpoint = NULL; + /* Use dualstack sockets where available. */ if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) { addr = (const struct sockaddr *)&addr6_v4mapped; @@ -189,16 +192,17 @@ void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *tcp), } ac = gpr_malloc(sizeof(async_connect)); - ac->cb = cb; - ac->cb_arg = arg; + ac->on_done = on_done; ac->socket = socket; gpr_mu_init(&ac->mu); ac->refs = 2; ac->addr_name = grpc_sockaddr_to_uri(addr); + ac->endpoint = endpoint; + grpc_closure_init(&ac->on_connect, on_connect, ac); - grpc_alarm_init(&ac->alarm, deadline, on_alarm, ac, + grpc_alarm_init(exec_ctx, &ac->alarm, deadline, on_alarm, ac, gpr_now(GPR_CLOCK_MONOTONIC)); - grpc_socket_notify_on_write(socket, on_connect, ac); + grpc_socket_notify_on_write(exec_ctx, socket, &ac->on_connect); return; failure: @@ -210,7 +214,7 @@ failure: } else if (sock != INVALID_SOCKET) { closesocket(sock); } - cb(arg, NULL); + grpc_exec_ctx_enqueue(exec_ctx, on_done, 0); } #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/tcp_server_windows.c b/src/core/iomgr/tcp_server_windows.c index be2c0055db5..9881a411527 100644 --- a/src/core/iomgr/tcp_server_windows.c +++ b/src/core/iomgr/tcp_server_windows.c @@ -67,6 +67,8 @@ typedef struct server_port { /* The cached AcceptEx for that port. */ LPFN_ACCEPTEX AcceptEx; int shutting_down; + /* closure for socket notification of accept being ready */ + grpc_closure on_accept; } server_port; /* the overall server */ @@ -86,8 +88,7 @@ struct grpc_tcp_server { size_t port_capacity; /* shutdown callback */ - void (*shutdown_complete)(void *); - void *shutdown_complete_arg; + grpc_closure *shutdown_complete; }; /* Public function. Allocates the proper data structures to hold a @@ -107,10 +108,10 @@ grpc_tcp_server *grpc_tcp_server_create(void) { static void dont_care_about_shutdown_completion(void *arg) {} -static void finish_shutdown(grpc_tcp_server *s) { +static void finish_shutdown(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { size_t i; - s->shutdown_complete(s->shutdown_complete_arg); + grpc_exec_ctx_enqueue(exec_ctx, s->shutdown_complete, 1); /* Now that the accepts have been aborted, we can destroy the sockets. The IOCP won't get notified on these, so we can flag them as already @@ -124,17 +125,13 @@ static void finish_shutdown(grpc_tcp_server *s) { } /* Public function. Stops and destroys a grpc_tcp_server. */ -void grpc_tcp_server_destroy(grpc_tcp_server *s, - void (*shutdown_complete)(void *shutdown_done_arg), - void *shutdown_complete_arg) { +void grpc_tcp_server_destroy(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s, + grpc_closure *shutdown_complete) { size_t i; int immediately_done = 0; gpr_mu_lock(&s->mu); - s->shutdown_complete = shutdown_complete - ? shutdown_complete - : dont_care_about_shutdown_completion; - s->shutdown_complete_arg = shutdown_complete_arg; + s->shutdown_complete = shutdown_complete; /* First, shutdown all fd's. This will queue abortion calls for all of the pending accepts due to the normal operation mechanism. */ @@ -149,7 +146,7 @@ void grpc_tcp_server_destroy(grpc_tcp_server *s, gpr_mu_unlock(&s->mu); if (immediately_done) { - finish_shutdown(s); + finish_shutdown(exec_ctx, s); } } @@ -201,7 +198,7 @@ error: return -1; } -static void decrement_active_ports_and_notify(server_port *sp) { +static void decrement_active_ports_and_notify(grpc_exec_ctx *exec_ctx, server_port *sp) { int notify = 0; sp->shutting_down = 0; gpr_mu_lock(&sp->server->mu); @@ -212,16 +209,13 @@ static void decrement_active_ports_and_notify(server_port *sp) { } gpr_mu_unlock(&sp->server->mu); if (notify) { - finish_shutdown(sp->server); + finish_shutdown(exec_ctx, sp->server); } } -/* start_accept will reference that for the IOCP notification request. */ -static void on_accept(void *arg, int from_iocp); - /* 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 void start_accept(server_port *port) { +static void start_accept(grpc_exec_ctx *exec_ctx, server_port *port) { SOCKET sock = INVALID_SOCKET; char *message; char *utf8_message; @@ -260,7 +254,7 @@ static void start_accept(server_port *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, on_accept, port); + grpc_socket_notify_on_read(exec_ctx, port->socket, &port->on_accept); return; failure: @@ -270,7 +264,7 @@ failure: change is not seen by on_accept and we proceed to trying new accept, but we fail there because the listening port has been closed in the meantime. */ - decrement_active_ports_and_notify(port); + decrement_active_ports_and_notify(exec_ctx, port); return; } utf8_message = gpr_format_message(WSAGetLastError()); @@ -280,7 +274,7 @@ failure: } /* Event manager callback when reads are ready. */ -static void on_accept(void *arg, int from_iocp) { +static void on_accept(grpc_exec_ctx *exec_ctx, void *arg, int from_iocp) { server_port *sp = arg; SOCKET sock = sp->new_socket; grpc_winsocket_callback_info *info = &sp->socket->read_info; @@ -310,7 +304,7 @@ static void on_accept(void *arg, int from_iocp) { if (sp->shutting_down) { /* During the shutdown case, we ARE expecting an error. So that's well, and we can wake up the shutdown thread. */ - decrement_active_ports_and_notify(sp); + decrement_active_ports_and_notify(exec_ctx, sp); return; } else { char *utf8_message = gpr_format_message(WSAGetLastError()); @@ -346,12 +340,12 @@ static void on_accept(void *arg, int from_iocp) { /* The only time we should call our callback, is where we successfully managed to accept a connection, and created an endpoint. */ - if (ep) sp->server->on_accept_cb(sp->server->on_accept_cb_arg, ep); + if (ep) sp->server->on_accept_cb(exec_ctx, sp->server->on_accept_cb_arg, ep); /* 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. */ - start_accept(sp); + start_accept(exec_ctx, sp); } static int add_socket_to_server(grpc_tcp_server *s, SOCKET sock, @@ -402,7 +396,7 @@ static int add_socket_to_server(grpc_tcp_server *s, SOCKET sock, } int grpc_tcp_server_add_port(grpc_tcp_server *s, const void *addr, - int addr_len) { + size_t addr_len) { int allocated_port = -1; unsigned i; SOCKET sock; @@ -464,7 +458,8 @@ grpc_tcp_server_get_socket(grpc_tcp_server *s, unsigned index) { return (index < s->nports) ? s->ports[index].socket->socket : INVALID_SOCKET; } -void grpc_tcp_server_start(grpc_tcp_server *s, grpc_pollset **pollset, +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) { @@ -476,7 +471,7 @@ 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 (i = 0; i < s->nports; i++) { - start_accept(s->ports + i); + start_accept(exec_ctx, s->ports + i); s->active_ports++; } gpr_mu_unlock(&s->mu); diff --git a/src/core/iomgr/tcp_windows.c b/src/core/iomgr/tcp_windows.c index ab309180eb1..4a531b8546c 100644 --- a/src/core/iomgr/tcp_windows.c +++ b/src/core/iomgr/tcp_windows.c @@ -82,6 +82,9 @@ typedef struct grpc_tcp { /* Refcounting how many operations are in progress. */ gpr_refcount refcount; + grpc_closure on_read; + grpc_closure on_write; + grpc_closure *read_cb; grpc_closure *write_cb; gpr_slice read_slice; @@ -135,7 +138,9 @@ static void tcp_ref(grpc_tcp *tcp) { gpr_ref(&tcp->refcount); } #endif /* Asynchronous callback from the IOCP, or the background thread. */ -static int on_read(grpc_tcp *tcp, int success) { +static void on_read(grpc_exec_ctx *exec_ctx, void *tcpp, int success) { + grpc_tcp *tcp = tcpp; + grpc_closure *cb = tcp->read_cb; grpc_winsocket *socket = tcp->socket; gpr_slice sub; gpr_slice *slice = NULL; @@ -164,23 +169,17 @@ static int on_read(grpc_tcp *tcp, int success) { } } - return success; -} - -static void on_read_cb(void *tcpp, int from_iocp) { - grpc_tcp *tcp = tcpp; - grpc_closure *cb = tcp->read_cb; - int success = on_read(tcp, from_iocp); tcp->read_cb = NULL; TCP_UNREF(tcp, "read"); if (cb) { - cb->cb(cb->cb_arg, success); + cb->cb(exec_ctx, cb->cb_arg, success); } } -static grpc_endpoint_op_status win_read(grpc_endpoint *ep, - gpr_slice_buffer *read_slices, - grpc_closure *cb) { +static void win_read(grpc_exec_ctx *exec_ctx, + grpc_endpoint *ep, + gpr_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; @@ -190,7 +189,8 @@ static grpc_endpoint_op_status win_read(grpc_endpoint *ep, WSABUF buffer; if (tcp->shutting_down) { - return GRPC_ENDPOINT_ERROR; + grpc_exec_ctx_enqueue(exec_ctx, cb, 0); + return; } tcp->read_cb = cb; @@ -202,6 +202,8 @@ static grpc_endpoint_op_status win_read(grpc_endpoint *ep, buffer.len = GPR_SLICE_LENGTH(tcp->read_slice); buffer.buf = (char *)GPR_SLICE_START_PTR(tcp->read_slice); + TCP_REF(tcp, "read"); + /* First let's try a synchronous, non-blocking read. */ status = WSARecv(tcp->socket->socket, &buffer, 1, &bytes_read, &flags, NULL, NULL); @@ -209,14 +211,11 @@ static grpc_endpoint_op_status win_read(grpc_endpoint *ep, /* Did we get data immediately ? Yay. */ if (info->wsa_error != WSAEWOULDBLOCK) { - int ok; info->bytes_transfered = bytes_read; - ok = on_read(tcp, 1); - return ok ? GRPC_ENDPOINT_DONE : GRPC_ENDPOINT_ERROR; + grpc_exec_ctx_enqueue(exec_ctx, &tcp->on_read, 1); + return; } - TCP_REF(tcp, "read"); - /* Otherwise, let's retry, by queuing a read. */ memset(&tcp->socket->read_info.overlapped, 0, sizeof(OVERLAPPED)); status = WSARecv(tcp->socket->socket, &buffer, 1, &bytes_read, &flags, @@ -225,19 +224,17 @@ static grpc_endpoint_op_status win_read(grpc_endpoint *ep, if (status != 0) { int wsa_error = WSAGetLastError(); if (wsa_error != WSA_IO_PENDING) { - int ok; info->wsa_error = wsa_error; - ok = on_read(tcp, 1); - return ok ? GRPC_ENDPOINT_DONE : GRPC_ENDPOINT_ERROR; + grpc_exec_ctx_enqueue(exec_ctx, &tcp->on_read, 0); + return; } } - grpc_socket_notify_on_read(tcp->socket, on_read_cb, tcp); - return GRPC_ENDPOINT_PENDING; + 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, int success) { +static void on_write(grpc_exec_ctx *exec_ctx, void *tcpp, int success) { grpc_tcp *tcp = (grpc_tcp *)tcpp; grpc_winsocket *handle = tcp->socket; grpc_winsocket_callback_info *info = &handle->write_info; @@ -263,13 +260,14 @@ static void on_write(void *tcpp, int success) { } TCP_UNREF(tcp, "write"); - cb->cb(cb->cb_arg, success); + cb->cb(exec_ctx, cb->cb_arg, success); } /* Initiates a write. */ -static grpc_endpoint_op_status win_write(grpc_endpoint *ep, - gpr_slice_buffer *slices, - grpc_closure *cb) { +static void win_write(grpc_exec_ctx *exec_ctx, + grpc_endpoint *ep, + gpr_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; @@ -281,7 +279,8 @@ static grpc_endpoint_op_status win_write(grpc_endpoint *ep, WSABUF *buffers = local_buffers; if (tcp->shutting_down) { - return GRPC_ENDPOINT_ERROR; + grpc_exec_ctx_enqueue(exec_ctx, cb, 0); + return; } tcp->write_cb = cb; @@ -306,9 +305,9 @@ static grpc_endpoint_op_status win_write(grpc_endpoint *ep, connection that has its send queue filled up. But if we don't, then we can avoid doing an async write operation at all. */ if (info->wsa_error != WSAEWOULDBLOCK) { - grpc_endpoint_op_status ret = GRPC_ENDPOINT_ERROR; + int ok = 0; if (status == 0) { - ret = GRPC_ENDPOINT_DONE; + ok = 1; GPR_ASSERT(bytes_sent == tcp->write_slices->length); } else { if (socket->read_info.wsa_error != WSAECONNRESET) { @@ -318,7 +317,8 @@ static grpc_endpoint_op_status win_write(grpc_endpoint *ep, } } if (allocated) gpr_free(allocated); - return ret; + grpc_exec_ctx_enqueue(exec_ctx, cb, ok); + return; } TCP_REF(tcp, "write"); @@ -334,24 +334,24 @@ static grpc_endpoint_op_status win_write(grpc_endpoint *ep, int wsa_error = WSAGetLastError(); if (wsa_error != WSA_IO_PENDING) { TCP_UNREF(tcp, "write"); - return GRPC_ENDPOINT_ERROR; + grpc_exec_ctx_enqueue(exec_ctx, cb, 0); + 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, on_write, tcp); - return GRPC_ENDPOINT_PENDING; + 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; @@ -364,7 +364,7 @@ static void win_add_to_pollset_set(grpc_endpoint *ep, grpc_pollset_set *pss) { 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) { +static void win_shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep) { 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 @@ -374,7 +374,7 @@ static void win_shutdown(grpc_endpoint *ep) { gpr_mu_unlock(&tcp->mu); } -static void win_destroy(grpc_endpoint *ep) { +static void win_destroy(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep) { grpc_tcp *tcp = (grpc_tcp *)ep; TCP_UNREF(tcp, "destroy"); } @@ -395,6 +395,8 @@ grpc_endpoint *grpc_tcp_create(grpc_winsocket *socket, char *peer_string) { tcp->socket = socket; gpr_mu_init(&tcp->mu); gpr_ref_init(&tcp->refcount, 1); + grpc_closure_init(&tcp->on_read, on_read, tcp); + grpc_closure_init(&tcp->on_read, on_write, tcp); tcp->peer_string = gpr_strdup(peer_string); return &tcp->base; } diff --git a/src/core/security/security_connector.c b/src/core/security/security_connector.c index ec5b1c86e52..ea07d49acb3 100644 --- a/src/core/security/security_connector.c +++ b/src/core/security/security_connector.c @@ -648,12 +648,12 @@ grpc_security_status grpc_ssl_channel_security_connector_create( goto error; } *sc = &c->base; - gpr_free(alpn_protocol_strings); + gpr_free((void*)alpn_protocol_strings); gpr_free(alpn_protocol_string_lengths); return GRPC_SECURITY_OK; error: - gpr_free(alpn_protocol_strings); + gpr_free((void*)alpn_protocol_strings); gpr_free(alpn_protocol_string_lengths); return GRPC_SECURITY_ERROR; } @@ -703,12 +703,12 @@ grpc_security_status grpc_ssl_server_security_connector_create( goto error; } *sc = &c->base; - gpr_free(alpn_protocol_strings); + gpr_free((void*)alpn_protocol_strings); gpr_free(alpn_protocol_string_lengths); return GRPC_SECURITY_OK; error: - gpr_free(alpn_protocol_strings); + gpr_free((void*)alpn_protocol_strings); gpr_free(alpn_protocol_string_lengths); return GRPC_SECURITY_ERROR; } diff --git a/src/core/surface/server.c b/src/core/surface/server.c index a26b84c0d3b..28d0e8938d3 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -183,7 +183,7 @@ typedef struct { struct grpc_server { size_t channel_filter_count; - const grpc_channel_filter **channel_filters; + grpc_channel_filter const**channel_filters; grpc_channel_args *channel_args; grpc_completion_queue **cqs; @@ -356,7 +356,7 @@ static void server_delete(grpc_exec_ctx *exec_ctx, grpc_server *server) { grpc_channel_args_destroy(server->channel_args); gpr_mu_destroy(&server->mu_global); gpr_mu_destroy(&server->mu_call); - gpr_free(server->channel_filters); + gpr_free((void*)server->channel_filters); while ((rm = server->registered_methods) != NULL) { server->registered_methods = rm->next; request_matcher_destroy(&rm->request_matcher); @@ -988,7 +988,7 @@ void grpc_server_setup_transport(grpc_exec_ctx *exec_ctx, grpc_server *s, chand->next->prev = chand->prev->next = chand; gpr_mu_unlock(&s->mu_global); - gpr_free(filters); + gpr_free((void*)filters); GRPC_CHANNEL_INTERNAL_REF(channel, "connectivity"); memset(&op, 0, sizeof(op)); diff --git a/src/core/transport/chttp2/frame_data.c b/src/core/transport/chttp2/frame_data.c index 99414523d56..acfa7c002eb 100644 --- a/src/core/transport/chttp2/frame_data.c +++ b/src/core/transport/chttp2/frame_data.c @@ -162,7 +162,7 @@ grpc_chttp2_parse_error grpc_chttp2_data_parser_parse( grpc_sopb_add_slice( &p->incoming_sopb, gpr_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg))); - GPR_ASSERT(end - cur <= p->frame_size); + GPR_ASSERT((size_t)(end - cur) <= p->frame_size); p->frame_size -= (gpr_uint32)(end - cur); return GRPC_CHTTP2_PARSE_OK; } diff --git a/src/core/transport/chttp2/frame_goaway.c b/src/core/transport/chttp2/frame_goaway.c index d2065ce79d0..2ff1eda89b6 100644 --- a/src/core/transport/chttp2/frame_goaway.c +++ b/src/core/transport/chttp2/frame_goaway.c @@ -138,7 +138,7 @@ grpc_chttp2_parse_error grpc_chttp2_goaway_parser_parse( /* fallthrough */ case GRPC_CHTTP2_GOAWAY_DEBUG: memcpy(p->debug_data + p->debug_pos, cur, (size_t)(end - cur)); - GPR_ASSERT(end - cur < GPR_UINT32_MAX - p->debug_pos); + GPR_ASSERT((size_t)(end - cur) < GPR_UINT32_MAX - p->debug_pos); p->debug_pos += (gpr_uint32)(end - cur); p->state = GRPC_CHTTP2_GOAWAY_DEBUG; if (is_last) { diff --git a/test/core/util/port_windows.c b/test/core/util/port_windows.c index a02cd2e3ef9..3d2567757a8 100644 --- a/test/core/util/port_windows.c +++ b/test/core/util/port_windows.c @@ -65,7 +65,7 @@ static int has_port_been_chosen(int port) { return 0; } -static void free_chosen_ports() { gpr_free(chosen_ports); } +static void free_chosen_ports(void) { gpr_free(chosen_ports); } static void chose_port(int port) { if (chosen_ports == NULL) { @@ -133,7 +133,7 @@ typedef struct portreq { int port; } portreq; -static void got_port_from_server(void *arg, +static void got_port_from_server(grpc_exec_ctx *exec_ctx, void *arg, const grpc_httpcli_response *response) { size_t i; int port = 0; @@ -151,7 +151,7 @@ static void got_port_from_server(void *arg, gpr_mu_unlock(GRPC_POLLSET_MU(&pr->pollset)); } -static void destroy_pollset_and_shutdown(void *p) { +static void destroy_pollset_and_shutdown(grpc_exec_ctx *exec_ctx, void *p, int success) { grpc_pollset_destroy(p); grpc_shutdown(); } @@ -160,6 +160,8 @@ static int pick_port_using_server(char *server) { grpc_httpcli_context context; grpc_httpcli_request req; portreq pr; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_closure destroy_pollset_closure; grpc_init(); @@ -172,20 +174,25 @@ static int pick_port_using_server(char *server) { req.path = "/get"; grpc_httpcli_context_init(&context); - grpc_httpcli_get(&context, &pr.pollset, &req, + grpc_httpcli_get(&exec_ctx, &context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), got_port_from_server, &pr); gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); while (pr.port == -1) { grpc_pollset_worker worker; - grpc_pollset_work(&pr.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + grpc_pollset_work(&exec_ctx, &pr.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1)); + gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); + grpc_exec_ctx_flush(&exec_ctx); + gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); } gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); grpc_httpcli_context_destroy(&context); - grpc_pollset_shutdown(&pr.pollset, destroy_pollset_and_shutdown, &pr.pollset); + grpc_closure_init(&destroy_pollset_closure, destroy_pollset_and_shutdown, &pr.pollset); + grpc_pollset_shutdown(&exec_ctx, &pr.pollset, &destroy_pollset_closure); + grpc_exec_ctx_finish(&exec_ctx); return pr.port; } diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index 9c963e0d436..5217fa6fbee 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -1,4 +1,4 @@ - + @@ -163,6 +163,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -663,10 +664,10 @@ - - - - + + + + @@ -678,5 +679,4 @@ - - + \ No newline at end of file diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index a8f82370d91..dea536f5adb 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -846,7 +846,6 @@ src\core\census - {968de0a1-346d-b75a-6f19-6a55119b8235} @@ -915,5 +914,7 @@ {0b0f9ab1-efa4-7f03-e446-6fb9b5227e84} - - + + + + \ No newline at end of file From f4fc5d2bfd9b9c20d7a0d9d936679d2c1602ebcf Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 23 Sep 2015 09:36:31 -0700 Subject: [PATCH 44/56] Enable warnings as errors on Windows --- src/core/surface/version.c | 4 +++- templates/vsprojects/vcxproj_defs.include | 8 ++++++++ .../grpc++_unsecure/grpc++_unsecure.vcxproj | 8 ++++++++ .../grpc_cpp_plugin/grpc_cpp_plugin.vcxproj | 4 ++++ .../grpc_csharp_plugin.vcxproj | 4 ++++ .../grpc_objective_c_plugin.vcxproj | 4 ++++ .../grpc_python_plugin.vcxproj | 4 ++++ .../grpc_ruby_plugin/grpc_ruby_plugin.vcxproj | 4 ++++ .../gen_hpack_tables/gen_hpack_tables.vcxproj | 4 ++++ .../gen_legal_metadata_characters.vcxproj | 4 ++++ vsprojects/vcxproj/gpr/gpr.vcxproj | 4 ++++ .../gpr_test_util/gpr_test_util.vcxproj | 4 ++++ vsprojects/vcxproj/grpc++/grpc++.vcxproj | 8 ++++++++ .../grpc++_test_config.vcxproj | 4 ++++ .../grpc++_test_util/grpc++_test_util.vcxproj | 4 ++++ .../grpc++_unsecure/grpc++_unsecure.vcxproj | 8 ++++++++ vsprojects/vcxproj/grpc/grpc.vcxproj | 20 +++++++++++++------ vsprojects/vcxproj/grpc/grpc.vcxproj.filters | 9 ++++----- .../grpc_cpp_plugin/grpc_cpp_plugin.vcxproj | 4 ++++ .../grpc_create_jwt/grpc_create_jwt.vcxproj | 4 ++++ .../grpc_csharp_ext/grpc_csharp_ext.vcxproj | 4 ++++ .../grpc_csharp_plugin.vcxproj | 4 ++++ .../grpc_fetch_oauth2.vcxproj | 4 ++++ .../grpc_objective_c_plugin.vcxproj | 4 ++++ .../grpc_plugin_support.vcxproj | 4 ++++ ...c_print_google_default_creds_token.vcxproj | 4 ++++ .../grpc_python_plugin.vcxproj | 4 ++++ .../grpc_ruby_plugin/grpc_ruby_plugin.vcxproj | 4 ++++ .../grpc_test_util/grpc_test_util.vcxproj | 4 ++++ .../grpc_test_util_unsecure.vcxproj | 4 ++++ .../grpc_unsecure/grpc_unsecure.vcxproj | 8 ++++++++ .../grpc_verify_jwt/grpc_verify_jwt.vcxproj | 4 ++++ .../interop_client_helper.vcxproj | 4 ++++ .../interop_client_main.vcxproj | 4 ++++ .../interop_server_helper.vcxproj | 4 ++++ .../interop_server_main.vcxproj | 4 ++++ vsprojects/vcxproj/qps/qps.vcxproj | 4 ++++ .../reconnect_server/reconnect_server.vcxproj | 4 ++++ .../alarm_heap_test/alarm_heap_test.vcxproj | 4 ++++ .../alarm_list_test/alarm_list_test.vcxproj | 4 ++++ .../vcxproj/test/alpn_test/alpn_test.vcxproj | 4 ++++ .../async_end2end_test.vcxproj | 4 ++++ .../auth_property_iterator_test.vcxproj | 4 ++++ .../bad_client_test/bad_client_test.vcxproj | 4 ++++ .../bin_encoder_test/bin_encoder_test.vcxproj | 4 ++++ .../channel_arguments_test.vcxproj | 4 ++++ .../chttp2_status_conversion_test.vcxproj | 4 ++++ .../chttp2_stream_encoder_test.vcxproj | 4 ++++ .../chttp2_stream_map_test.vcxproj | 4 ++++ .../test/cli_call_test/cli_call_test.vcxproj | 4 ++++ .../client_crash_test_server.vcxproj | 4 ++++ .../compression_test/compression_test.vcxproj | 4 ++++ .../connection_prefix_bad_client_test.vcxproj | 4 ++++ .../credentials_test/credentials_test.vcxproj | 4 ++++ .../cxx_byte_buffer_test.vcxproj | 4 ++++ .../cxx_slice_test/cxx_slice_test.vcxproj | 4 ++++ .../cxx_string_ref_test.vcxproj | 4 ++++ .../test/cxx_time_test/cxx_time_test.vcxproj | 4 ++++ .../test/end2end_certs/end2end_certs.vcxproj | 4 ++++ .../end2end_fixture_h2_compress.vcxproj | 4 ++++ .../end2end_fixture_h2_fakesec.vcxproj | 4 ++++ .../end2end_fixture_h2_full.vcxproj | 4 ++++ .../end2end_fixture_h2_oauth2.vcxproj | 4 ++++ .../end2end_fixture_h2_proxy.vcxproj | 4 ++++ .../end2end_fixture_h2_sockpair+trace.vcxproj | 4 ++++ .../end2end_fixture_h2_sockpair.vcxproj | 4 ++++ .../end2end_fixture_h2_sockpair_1byte.vcxproj | 4 ++++ .../end2end_fixture_h2_ssl.vcxproj | 4 ++++ .../end2end_fixture_h2_ssl_proxy.vcxproj | 4 ++++ .../test/end2end_test/end2end_test.vcxproj | 4 ++++ .../end2end_test_bad_hostname.vcxproj | 4 ++++ .../end2end_test_binary_metadata.vcxproj | 4 ++++ .../end2end_test_call_creds.vcxproj | 4 ++++ .../end2end_test_cancel_after_accept.vcxproj | 4 ++++ ...2end_test_cancel_after_client_done.vcxproj | 4 ++++ .../end2end_test_cancel_after_invoke.vcxproj | 4 ++++ .../end2end_test_cancel_before_invoke.vcxproj | 4 ++++ .../end2end_test_cancel_in_a_vacuum.vcxproj | 4 ++++ ...end2end_test_census_simple_request.vcxproj | 4 ++++ .../end2end_test_channel_connectivity.vcxproj | 4 ++++ .../end2end_test_compressed_payload.vcxproj | 4 ++++ .../end2end_test_default_host.vcxproj | 4 ++++ .../end2end_test_disappearing_server.vcxproj | 4 ++++ .../end2end_test_empty_batch.vcxproj | 4 ++++ ...2end_test_graceful_server_shutdown.vcxproj | 4 ++++ .../end2end_test_high_initial_seqno.vcxproj | 4 ++++ .../end2end_test_invoke_large_request.vcxproj | 4 ++++ .../end2end_test_large_metadata.vcxproj | 4 ++++ ...nd2end_test_max_concurrent_streams.vcxproj | 4 ++++ .../end2end_test_max_message_length.vcxproj | 4 ++++ .../end2end_test_metadata.vcxproj | 4 ++++ .../end2end_test_no_op.vcxproj | 4 ++++ .../end2end_test_payload.vcxproj | 4 ++++ .../end2end_test_ping_pong_streaming.vcxproj | 4 ++++ .../end2end_test_registered_call.vcxproj | 4 ++++ .../end2end_test_request_with_flags.vcxproj | 4 ++++ .../end2end_test_request_with_payload.vcxproj | 4 ++++ ...d2end_test_server_finishes_request.vcxproj | 4 ++++ ...d2end_test_shutdown_finishes_calls.vcxproj | 4 ++++ ...nd2end_test_shutdown_finishes_tags.vcxproj | 4 ++++ ...nd2end_test_simple_delayed_request.vcxproj | 4 ++++ .../end2end_test_simple_request.vcxproj | 4 ++++ .../end2end_test_trailing_metadata.vcxproj | 4 ++++ .../endpoint_pair_test.vcxproj | 4 ++++ .../test/fling_client/fling_client.vcxproj | 4 ++++ .../test/fling_server/fling_server.vcxproj | 4 ++++ .../generic_end2end_test.vcxproj | 4 ++++ .../gpr_cmdline_test/gpr_cmdline_test.vcxproj | 4 ++++ .../test/gpr_env_test/gpr_env_test.vcxproj | 4 ++++ .../test/gpr_file_test/gpr_file_test.vcxproj | 4 ++++ .../gpr_histogram_test.vcxproj | 4 ++++ .../gpr_host_port_test.vcxproj | 4 ++++ .../test/gpr_log_test/gpr_log_test.vcxproj | 4 ++++ .../gpr_slice_buffer_test.vcxproj | 4 ++++ .../gpr_slice_test/gpr_slice_test.vcxproj | 4 ++++ .../gpr_stack_lockfree_test.vcxproj | 4 ++++ .../gpr_string_test/gpr_string_test.vcxproj | 4 ++++ .../test/gpr_sync_test/gpr_sync_test.vcxproj | 4 ++++ .../test/gpr_thd_test/gpr_thd_test.vcxproj | 4 ++++ .../test/gpr_time_test/gpr_time_test.vcxproj | 4 ++++ .../test/gpr_tls_test/gpr_tls_test.vcxproj | 4 ++++ .../gpr_useful_test/gpr_useful_test.vcxproj | 4 ++++ .../grpc_auth_context_test.vcxproj | 4 ++++ .../grpc_base64_test/grpc_base64_test.vcxproj | 4 ++++ .../grpc_byte_buffer_reader_test.vcxproj | 4 ++++ .../grpc_channel_args_test.vcxproj | 4 ++++ .../grpc_channel_stack_test.vcxproj | 4 ++++ .../vcxproj/test/grpc_cli/grpc_cli.vcxproj | 4 ++++ .../grpc_completion_queue_test.vcxproj | 4 ++++ .../grpc_credentials_test.vcxproj | 4 ++++ .../grpc_jwt_verifier_test.vcxproj | 4 ++++ .../grpc_security_connector_test.vcxproj | 4 ++++ .../grpc_stream_op_test.vcxproj | 4 ++++ ...2_compress_bad_hostname_nosec_test.vcxproj | 4 ++++ .../h2_compress_bad_hostname_test.vcxproj | 4 ++++ ...ompress_binary_metadata_nosec_test.vcxproj | 4 ++++ .../h2_compress_binary_metadata_test.vcxproj | 4 ++++ .../h2_compress_call_creds_test.vcxproj | 4 ++++ ...ess_cancel_after_accept_nosec_test.vcxproj | 4 ++++ ..._compress_cancel_after_accept_test.vcxproj | 4 ++++ ...ancel_after_client_done_nosec_test.vcxproj | 4 ++++ ...ress_cancel_after_client_done_test.vcxproj | 4 ++++ ...ess_cancel_after_invoke_nosec_test.vcxproj | 4 ++++ ..._compress_cancel_after_invoke_test.vcxproj | 4 ++++ ...ss_cancel_before_invoke_nosec_test.vcxproj | 4 ++++ ...compress_cancel_before_invoke_test.vcxproj | 4 ++++ ...ress_cancel_in_a_vacuum_nosec_test.vcxproj | 4 ++++ ...2_compress_cancel_in_a_vacuum_test.vcxproj | 4 ++++ ...s_census_simple_request_nosec_test.vcxproj | 4 ++++ ...ompress_census_simple_request_test.vcxproj | 4 ++++ ...ss_channel_connectivity_nosec_test.vcxproj | 4 ++++ ...compress_channel_connectivity_test.vcxproj | 4 ++++ ...ress_compressed_payload_nosec_test.vcxproj | 4 ++++ ...2_compress_compressed_payload_test.vcxproj | 4 ++++ ...2_compress_default_host_nosec_test.vcxproj | 4 ++++ .../h2_compress_default_host_test.vcxproj | 4 ++++ ...ess_disappearing_server_nosec_test.vcxproj | 4 ++++ ..._compress_disappearing_server_test.vcxproj | 4 ++++ ...h2_compress_empty_batch_nosec_test.vcxproj | 4 ++++ .../h2_compress_empty_batch_test.vcxproj | 4 ++++ ...raceful_server_shutdown_nosec_test.vcxproj | 4 ++++ ...ress_graceful_server_shutdown_test.vcxproj | 4 ++++ ...ress_high_initial_seqno_nosec_test.vcxproj | 4 ++++ ...2_compress_high_initial_seqno_test.vcxproj | 4 ++++ ...ss_invoke_large_request_nosec_test.vcxproj | 4 ++++ ...compress_invoke_large_request_test.vcxproj | 4 ++++ ...compress_large_metadata_nosec_test.vcxproj | 4 ++++ .../h2_compress_large_metadata_test.vcxproj | 4 ++++ ..._max_concurrent_streams_nosec_test.vcxproj | 4 ++++ ...mpress_max_concurrent_streams_test.vcxproj | 4 ++++ ...ress_max_message_length_nosec_test.vcxproj | 4 ++++ ...2_compress_max_message_length_test.vcxproj | 4 ++++ .../h2_compress_metadata_nosec_test.vcxproj | 4 ++++ .../h2_compress_metadata_test.vcxproj | 4 ++++ .../h2_compress_no_op_nosec_test.vcxproj | 4 ++++ .../h2_compress_no_op_test.vcxproj | 4 ++++ .../h2_compress_payload_nosec_test.vcxproj | 4 ++++ .../h2_compress_payload_test.vcxproj | 4 ++++ ...ess_ping_pong_streaming_nosec_test.vcxproj | 4 ++++ ..._compress_ping_pong_streaming_test.vcxproj | 4 ++++ ...ompress_registered_call_nosec_test.vcxproj | 4 ++++ .../h2_compress_registered_call_test.vcxproj | 4 ++++ ...ress_request_with_flags_nosec_test.vcxproj | 4 ++++ ...2_compress_request_with_flags_test.vcxproj | 4 ++++ ...ss_request_with_payload_nosec_test.vcxproj | 4 ++++ ...compress_request_with_payload_test.vcxproj | 4 ++++ ...server_finishes_request_nosec_test.vcxproj | 4 ++++ ...press_server_finishes_request_test.vcxproj | 4 ++++ ...shutdown_finishes_calls_nosec_test.vcxproj | 4 ++++ ...press_shutdown_finishes_calls_test.vcxproj | 4 ++++ ..._shutdown_finishes_tags_nosec_test.vcxproj | 4 ++++ ...mpress_shutdown_finishes_tags_test.vcxproj | 4 ++++ ..._simple_delayed_request_nosec_test.vcxproj | 4 ++++ ...mpress_simple_delayed_request_test.vcxproj | 4 ++++ ...compress_simple_request_nosec_test.vcxproj | 4 ++++ .../h2_compress_simple_request_test.vcxproj | 4 ++++ ...press_trailing_metadata_nosec_test.vcxproj | 4 ++++ ...h2_compress_trailing_metadata_test.vcxproj | 4 ++++ .../h2_fakesec_bad_hostname_test.vcxproj | 4 ++++ .../h2_fakesec_binary_metadata_test.vcxproj | 4 ++++ .../h2_fakesec_call_creds_test.vcxproj | 4 ++++ ...2_fakesec_cancel_after_accept_test.vcxproj | 4 ++++ ...esec_cancel_after_client_done_test.vcxproj | 4 ++++ ...2_fakesec_cancel_after_invoke_test.vcxproj | 4 ++++ ..._fakesec_cancel_before_invoke_test.vcxproj | 4 ++++ ...h2_fakesec_cancel_in_a_vacuum_test.vcxproj | 4 ++++ ...fakesec_census_simple_request_test.vcxproj | 4 ++++ ..._fakesec_channel_connectivity_test.vcxproj | 4 ++++ ...h2_fakesec_compressed_payload_test.vcxproj | 4 ++++ .../h2_fakesec_default_host_test.vcxproj | 4 ++++ ...2_fakesec_disappearing_server_test.vcxproj | 4 ++++ .../h2_fakesec_empty_batch_test.vcxproj | 4 ++++ ...esec_graceful_server_shutdown_test.vcxproj | 4 ++++ ...h2_fakesec_high_initial_seqno_test.vcxproj | 4 ++++ ..._fakesec_invoke_large_request_test.vcxproj | 4 ++++ .../h2_fakesec_large_metadata_test.vcxproj | 4 ++++ ...akesec_max_concurrent_streams_test.vcxproj | 4 ++++ ...h2_fakesec_max_message_length_test.vcxproj | 4 ++++ .../h2_fakesec_metadata_test.vcxproj | 4 ++++ .../h2_fakesec_no_op_test.vcxproj | 4 ++++ .../h2_fakesec_payload_test.vcxproj | 4 ++++ ...2_fakesec_ping_pong_streaming_test.vcxproj | 4 ++++ .../h2_fakesec_registered_call_test.vcxproj | 4 ++++ ...h2_fakesec_request_with_flags_test.vcxproj | 4 ++++ ..._fakesec_request_with_payload_test.vcxproj | 4 ++++ ...kesec_server_finishes_request_test.vcxproj | 4 ++++ ...kesec_shutdown_finishes_calls_test.vcxproj | 4 ++++ ...akesec_shutdown_finishes_tags_test.vcxproj | 4 ++++ ...akesec_simple_delayed_request_test.vcxproj | 4 ++++ .../h2_fakesec_simple_request_test.vcxproj | 4 ++++ .../h2_fakesec_trailing_metadata_test.vcxproj | 4 ++++ .../h2_full_bad_hostname_nosec_test.vcxproj | 4 ++++ .../h2_full_bad_hostname_test.vcxproj | 4 ++++ ...h2_full_binary_metadata_nosec_test.vcxproj | 4 ++++ .../h2_full_binary_metadata_test.vcxproj | 4 ++++ .../h2_full_call_creds_test.vcxproj | 4 ++++ ...ull_cancel_after_accept_nosec_test.vcxproj | 4 ++++ .../h2_full_cancel_after_accept_test.vcxproj | 4 ++++ ...ancel_after_client_done_nosec_test.vcxproj | 4 ++++ ...full_cancel_after_client_done_test.vcxproj | 4 ++++ ...ull_cancel_after_invoke_nosec_test.vcxproj | 4 ++++ .../h2_full_cancel_after_invoke_test.vcxproj | 4 ++++ ...ll_cancel_before_invoke_nosec_test.vcxproj | 4 ++++ .../h2_full_cancel_before_invoke_test.vcxproj | 4 ++++ ...full_cancel_in_a_vacuum_nosec_test.vcxproj | 4 ++++ .../h2_full_cancel_in_a_vacuum_test.vcxproj | 4 ++++ ...l_census_simple_request_nosec_test.vcxproj | 4 ++++ ...h2_full_census_simple_request_test.vcxproj | 4 ++++ ...ll_channel_connectivity_nosec_test.vcxproj | 4 ++++ .../h2_full_channel_connectivity_test.vcxproj | 4 ++++ ...full_compressed_payload_nosec_test.vcxproj | 4 ++++ .../h2_full_compressed_payload_test.vcxproj | 4 ++++ .../h2_full_default_host_nosec_test.vcxproj | 4 ++++ .../h2_full_default_host_test.vcxproj | 4 ++++ ...ull_disappearing_server_nosec_test.vcxproj | 4 ++++ .../h2_full_disappearing_server_test.vcxproj | 4 ++++ .../h2_full_empty_batch_nosec_test.vcxproj | 4 ++++ .../h2_full_empty_batch_test.vcxproj | 4 ++++ ...raceful_server_shutdown_nosec_test.vcxproj | 4 ++++ ...full_graceful_server_shutdown_test.vcxproj | 4 ++++ ...full_high_initial_seqno_nosec_test.vcxproj | 4 ++++ .../h2_full_high_initial_seqno_test.vcxproj | 4 ++++ ...ll_invoke_large_request_nosec_test.vcxproj | 4 ++++ .../h2_full_invoke_large_request_test.vcxproj | 4 ++++ .../h2_full_large_metadata_nosec_test.vcxproj | 4 ++++ .../h2_full_large_metadata_test.vcxproj | 4 ++++ ..._max_concurrent_streams_nosec_test.vcxproj | 4 ++++ ...2_full_max_concurrent_streams_test.vcxproj | 4 ++++ ...full_max_message_length_nosec_test.vcxproj | 4 ++++ .../h2_full_max_message_length_test.vcxproj | 4 ++++ .../h2_full_metadata_nosec_test.vcxproj | 4 ++++ .../h2_full_metadata_test.vcxproj | 4 ++++ .../h2_full_no_op_nosec_test.vcxproj | 4 ++++ .../h2_full_no_op_test.vcxproj | 4 ++++ .../h2_full_payload_nosec_test.vcxproj | 4 ++++ .../h2_full_payload_test.vcxproj | 4 ++++ ...ull_ping_pong_streaming_nosec_test.vcxproj | 4 ++++ .../h2_full_ping_pong_streaming_test.vcxproj | 4 ++++ ...h2_full_registered_call_nosec_test.vcxproj | 4 ++++ .../h2_full_registered_call_test.vcxproj | 4 ++++ ...full_request_with_flags_nosec_test.vcxproj | 4 ++++ .../h2_full_request_with_flags_test.vcxproj | 4 ++++ ...ll_request_with_payload_nosec_test.vcxproj | 4 ++++ .../h2_full_request_with_payload_test.vcxproj | 4 ++++ ...server_finishes_request_nosec_test.vcxproj | 4 ++++ ..._full_server_finishes_request_test.vcxproj | 4 ++++ ...shutdown_finishes_calls_nosec_test.vcxproj | 4 ++++ ..._full_shutdown_finishes_calls_test.vcxproj | 4 ++++ ..._shutdown_finishes_tags_nosec_test.vcxproj | 4 ++++ ...2_full_shutdown_finishes_tags_test.vcxproj | 4 ++++ ..._simple_delayed_request_nosec_test.vcxproj | 4 ++++ ...2_full_simple_delayed_request_test.vcxproj | 4 ++++ .../h2_full_simple_request_nosec_test.vcxproj | 4 ++++ .../h2_full_simple_request_test.vcxproj | 4 ++++ ..._full_trailing_metadata_nosec_test.vcxproj | 4 ++++ .../h2_full_trailing_metadata_test.vcxproj | 4 ++++ .../h2_oauth2_bad_hostname_test.vcxproj | 4 ++++ .../h2_oauth2_binary_metadata_test.vcxproj | 4 ++++ .../h2_oauth2_call_creds_test.vcxproj | 4 ++++ ...h2_oauth2_cancel_after_accept_test.vcxproj | 4 ++++ ...uth2_cancel_after_client_done_test.vcxproj | 4 ++++ ...h2_oauth2_cancel_after_invoke_test.vcxproj | 4 ++++ ...2_oauth2_cancel_before_invoke_test.vcxproj | 4 ++++ .../h2_oauth2_cancel_in_a_vacuum_test.vcxproj | 4 ++++ ..._oauth2_census_simple_request_test.vcxproj | 4 ++++ ...2_oauth2_channel_connectivity_test.vcxproj | 4 ++++ .../h2_oauth2_compressed_payload_test.vcxproj | 4 ++++ .../h2_oauth2_default_host_test.vcxproj | 4 ++++ ...h2_oauth2_disappearing_server_test.vcxproj | 4 ++++ .../h2_oauth2_empty_batch_test.vcxproj | 4 ++++ ...uth2_graceful_server_shutdown_test.vcxproj | 4 ++++ .../h2_oauth2_high_initial_seqno_test.vcxproj | 4 ++++ ...2_oauth2_invoke_large_request_test.vcxproj | 4 ++++ .../h2_oauth2_large_metadata_test.vcxproj | 4 ++++ ...oauth2_max_concurrent_streams_test.vcxproj | 4 ++++ .../h2_oauth2_max_message_length_test.vcxproj | 4 ++++ .../h2_oauth2_metadata_test.vcxproj | 4 ++++ .../h2_oauth2_no_op_test.vcxproj | 4 ++++ .../h2_oauth2_payload_test.vcxproj | 4 ++++ ...h2_oauth2_ping_pong_streaming_test.vcxproj | 4 ++++ .../h2_oauth2_registered_call_test.vcxproj | 4 ++++ .../h2_oauth2_request_with_flags_test.vcxproj | 4 ++++ ...2_oauth2_request_with_payload_test.vcxproj | 4 ++++ ...auth2_server_finishes_request_test.vcxproj | 4 ++++ ...auth2_shutdown_finishes_calls_test.vcxproj | 4 ++++ ...oauth2_shutdown_finishes_tags_test.vcxproj | 4 ++++ ...oauth2_simple_delayed_request_test.vcxproj | 4 ++++ .../h2_oauth2_simple_request_test.vcxproj | 4 ++++ .../h2_oauth2_trailing_metadata_test.vcxproj | 4 ++++ .../h2_proxy_bad_hostname_nosec_test.vcxproj | 4 ++++ .../h2_proxy_bad_hostname_test.vcxproj | 4 ++++ ...2_proxy_binary_metadata_nosec_test.vcxproj | 4 ++++ .../h2_proxy_binary_metadata_test.vcxproj | 4 ++++ .../h2_proxy_call_creds_test.vcxproj | 4 ++++ ...oxy_cancel_after_accept_nosec_test.vcxproj | 4 ++++ .../h2_proxy_cancel_after_accept_test.vcxproj | 4 ++++ ...ancel_after_client_done_nosec_test.vcxproj | 4 ++++ ...roxy_cancel_after_client_done_test.vcxproj | 4 ++++ ...oxy_cancel_after_invoke_nosec_test.vcxproj | 4 ++++ .../h2_proxy_cancel_after_invoke_test.vcxproj | 4 ++++ ...xy_cancel_before_invoke_nosec_test.vcxproj | 4 ++++ ...h2_proxy_cancel_before_invoke_test.vcxproj | 4 ++++ ...roxy_cancel_in_a_vacuum_nosec_test.vcxproj | 4 ++++ .../h2_proxy_cancel_in_a_vacuum_test.vcxproj | 4 ++++ ...y_census_simple_request_nosec_test.vcxproj | 4 ++++ ...2_proxy_census_simple_request_test.vcxproj | 4 ++++ .../h2_proxy_default_host_nosec_test.vcxproj | 4 ++++ .../h2_proxy_default_host_test.vcxproj | 4 ++++ ...oxy_disappearing_server_nosec_test.vcxproj | 4 ++++ .../h2_proxy_disappearing_server_test.vcxproj | 4 ++++ .../h2_proxy_empty_batch_nosec_test.vcxproj | 4 ++++ .../h2_proxy_empty_batch_test.vcxproj | 4 ++++ ...raceful_server_shutdown_nosec_test.vcxproj | 4 ++++ ...roxy_graceful_server_shutdown_test.vcxproj | 4 ++++ ...roxy_high_initial_seqno_nosec_test.vcxproj | 4 ++++ .../h2_proxy_high_initial_seqno_test.vcxproj | 4 ++++ ...xy_invoke_large_request_nosec_test.vcxproj | 4 ++++ ...h2_proxy_invoke_large_request_test.vcxproj | 4 ++++ ...h2_proxy_large_metadata_nosec_test.vcxproj | 4 ++++ .../h2_proxy_large_metadata_test.vcxproj | 4 ++++ ...roxy_max_message_length_nosec_test.vcxproj | 4 ++++ .../h2_proxy_max_message_length_test.vcxproj | 4 ++++ .../h2_proxy_metadata_nosec_test.vcxproj | 4 ++++ .../h2_proxy_metadata_test.vcxproj | 4 ++++ .../h2_proxy_no_op_nosec_test.vcxproj | 4 ++++ .../h2_proxy_no_op_test.vcxproj | 4 ++++ .../h2_proxy_payload_nosec_test.vcxproj | 4 ++++ .../h2_proxy_payload_test.vcxproj | 4 ++++ ...oxy_ping_pong_streaming_nosec_test.vcxproj | 4 ++++ .../h2_proxy_ping_pong_streaming_test.vcxproj | 4 ++++ ...2_proxy_registered_call_nosec_test.vcxproj | 4 ++++ .../h2_proxy_registered_call_test.vcxproj | 4 ++++ ...xy_request_with_payload_nosec_test.vcxproj | 4 ++++ ...h2_proxy_request_with_payload_test.vcxproj | 4 ++++ ...server_finishes_request_nosec_test.vcxproj | 4 ++++ ...proxy_server_finishes_request_test.vcxproj | 4 ++++ ...shutdown_finishes_calls_nosec_test.vcxproj | 4 ++++ ...proxy_shutdown_finishes_calls_test.vcxproj | 4 ++++ ..._shutdown_finishes_tags_nosec_test.vcxproj | 4 ++++ ..._proxy_shutdown_finishes_tags_test.vcxproj | 4 ++++ ..._simple_delayed_request_nosec_test.vcxproj | 4 ++++ ..._proxy_simple_delayed_request_test.vcxproj | 4 ++++ ...h2_proxy_simple_request_nosec_test.vcxproj | 4 ++++ .../h2_proxy_simple_request_test.vcxproj | 4 ++++ ...proxy_trailing_metadata_nosec_test.vcxproj | 4 ++++ .../h2_proxy_trailing_metadata_test.vcxproj | 4 ++++ ...pair+trace_bad_hostname_nosec_test.vcxproj | 4 ++++ ...2_sockpair+trace_bad_hostname_test.vcxproj | 4 ++++ ...r+trace_binary_metadata_nosec_test.vcxproj | 4 ++++ ...ockpair+trace_binary_metadata_test.vcxproj | 4 ++++ .../h2_sockpair+trace_call_creds_test.vcxproj | 4 ++++ ...ace_cancel_after_accept_nosec_test.vcxproj | 4 ++++ ...air+trace_cancel_after_accept_test.vcxproj | 4 ++++ ...ancel_after_client_done_nosec_test.vcxproj | 4 ++++ ...race_cancel_after_client_done_test.vcxproj | 4 ++++ ...ace_cancel_after_invoke_nosec_test.vcxproj | 4 ++++ ...air+trace_cancel_after_invoke_test.vcxproj | 4 ++++ ...ce_cancel_before_invoke_nosec_test.vcxproj | 4 ++++ ...ir+trace_cancel_before_invoke_test.vcxproj | 4 ++++ ...race_cancel_in_a_vacuum_nosec_test.vcxproj | 4 ++++ ...pair+trace_cancel_in_a_vacuum_test.vcxproj | 4 ++++ ...e_census_simple_request_nosec_test.vcxproj | 4 ++++ ...r+trace_census_simple_request_test.vcxproj | 4 ++++ ...race_compressed_payload_nosec_test.vcxproj | 4 ++++ ...pair+trace_compressed_payload_test.vcxproj | 4 ++++ ...kpair+trace_empty_batch_nosec_test.vcxproj | 4 ++++ ...h2_sockpair+trace_empty_batch_test.vcxproj | 4 ++++ ...raceful_server_shutdown_nosec_test.vcxproj | 4 ++++ ...race_graceful_server_shutdown_test.vcxproj | 4 ++++ ...race_high_initial_seqno_nosec_test.vcxproj | 4 ++++ ...pair+trace_high_initial_seqno_test.vcxproj | 4 ++++ ...ce_invoke_large_request_nosec_test.vcxproj | 4 ++++ ...ir+trace_invoke_large_request_test.vcxproj | 4 ++++ ...ir+trace_large_metadata_nosec_test.vcxproj | 4 ++++ ...sockpair+trace_large_metadata_test.vcxproj | 4 ++++ ..._max_concurrent_streams_nosec_test.vcxproj | 4 ++++ ...+trace_max_concurrent_streams_test.vcxproj | 4 ++++ ...race_max_message_length_nosec_test.vcxproj | 4 ++++ ...pair+trace_max_message_length_test.vcxproj | 4 ++++ ...sockpair+trace_metadata_nosec_test.vcxproj | 4 ++++ .../h2_sockpair+trace_metadata_test.vcxproj | 4 ++++ ...h2_sockpair+trace_no_op_nosec_test.vcxproj | 4 ++++ .../h2_sockpair+trace_no_op_test.vcxproj | 4 ++++ ..._sockpair+trace_payload_nosec_test.vcxproj | 4 ++++ .../h2_sockpair+trace_payload_test.vcxproj | 4 ++++ ...ace_ping_pong_streaming_nosec_test.vcxproj | 4 ++++ ...air+trace_ping_pong_streaming_test.vcxproj | 4 ++++ ...r+trace_registered_call_nosec_test.vcxproj | 4 ++++ ...ockpair+trace_registered_call_test.vcxproj | 4 ++++ ...race_request_with_flags_nosec_test.vcxproj | 4 ++++ ...pair+trace_request_with_flags_test.vcxproj | 4 ++++ ...ce_request_with_payload_nosec_test.vcxproj | 4 ++++ ...ir+trace_request_with_payload_test.vcxproj | 4 ++++ ...server_finishes_request_nosec_test.vcxproj | 4 ++++ ...trace_server_finishes_request_test.vcxproj | 4 ++++ ...shutdown_finishes_calls_nosec_test.vcxproj | 4 ++++ ...trace_shutdown_finishes_calls_test.vcxproj | 4 ++++ ..._shutdown_finishes_tags_nosec_test.vcxproj | 4 ++++ ...+trace_shutdown_finishes_tags_test.vcxproj | 4 ++++ ...ir+trace_simple_request_nosec_test.vcxproj | 4 ++++ ...sockpair+trace_simple_request_test.vcxproj | 4 ++++ ...trace_trailing_metadata_nosec_test.vcxproj | 4 ++++ ...kpair+trace_trailing_metadata_test.vcxproj | 4 ++++ ...pair_1byte_bad_hostname_nosec_test.vcxproj | 4 ++++ ...2_sockpair_1byte_bad_hostname_test.vcxproj | 4 ++++ ...r_1byte_binary_metadata_nosec_test.vcxproj | 4 ++++ ...ockpair_1byte_binary_metadata_test.vcxproj | 4 ++++ .../h2_sockpair_1byte_call_creds_test.vcxproj | 4 ++++ ...yte_cancel_after_accept_nosec_test.vcxproj | 4 ++++ ...air_1byte_cancel_after_accept_test.vcxproj | 4 ++++ ...ancel_after_client_done_nosec_test.vcxproj | 4 ++++ ...byte_cancel_after_client_done_test.vcxproj | 4 ++++ ...yte_cancel_after_invoke_nosec_test.vcxproj | 4 ++++ ...air_1byte_cancel_after_invoke_test.vcxproj | 4 ++++ ...te_cancel_before_invoke_nosec_test.vcxproj | 4 ++++ ...ir_1byte_cancel_before_invoke_test.vcxproj | 4 ++++ ...byte_cancel_in_a_vacuum_nosec_test.vcxproj | 4 ++++ ...pair_1byte_cancel_in_a_vacuum_test.vcxproj | 4 ++++ ...e_census_simple_request_nosec_test.vcxproj | 4 ++++ ...r_1byte_census_simple_request_test.vcxproj | 4 ++++ ...byte_compressed_payload_nosec_test.vcxproj | 4 ++++ ...pair_1byte_compressed_payload_test.vcxproj | 4 ++++ ...kpair_1byte_empty_batch_nosec_test.vcxproj | 4 ++++ ...h2_sockpair_1byte_empty_batch_test.vcxproj | 4 ++++ ...raceful_server_shutdown_nosec_test.vcxproj | 4 ++++ ...byte_graceful_server_shutdown_test.vcxproj | 4 ++++ ...byte_high_initial_seqno_nosec_test.vcxproj | 4 ++++ ...pair_1byte_high_initial_seqno_test.vcxproj | 4 ++++ ...te_invoke_large_request_nosec_test.vcxproj | 4 ++++ ...ir_1byte_invoke_large_request_test.vcxproj | 4 ++++ ...ir_1byte_large_metadata_nosec_test.vcxproj | 4 ++++ ...sockpair_1byte_large_metadata_test.vcxproj | 4 ++++ ..._max_concurrent_streams_nosec_test.vcxproj | 4 ++++ ..._1byte_max_concurrent_streams_test.vcxproj | 4 ++++ ...byte_max_message_length_nosec_test.vcxproj | 4 ++++ ...pair_1byte_max_message_length_test.vcxproj | 4 ++++ ...sockpair_1byte_metadata_nosec_test.vcxproj | 4 ++++ .../h2_sockpair_1byte_metadata_test.vcxproj | 4 ++++ ...h2_sockpair_1byte_no_op_nosec_test.vcxproj | 4 ++++ .../h2_sockpair_1byte_no_op_test.vcxproj | 4 ++++ ..._sockpair_1byte_payload_nosec_test.vcxproj | 4 ++++ .../h2_sockpair_1byte_payload_test.vcxproj | 4 ++++ ...yte_ping_pong_streaming_nosec_test.vcxproj | 4 ++++ ...air_1byte_ping_pong_streaming_test.vcxproj | 4 ++++ ...r_1byte_registered_call_nosec_test.vcxproj | 4 ++++ ...ockpair_1byte_registered_call_test.vcxproj | 4 ++++ ...byte_request_with_flags_nosec_test.vcxproj | 4 ++++ ...pair_1byte_request_with_flags_test.vcxproj | 4 ++++ ...te_request_with_payload_nosec_test.vcxproj | 4 ++++ ...ir_1byte_request_with_payload_test.vcxproj | 4 ++++ ...server_finishes_request_nosec_test.vcxproj | 4 ++++ ...1byte_server_finishes_request_test.vcxproj | 4 ++++ ...shutdown_finishes_calls_nosec_test.vcxproj | 4 ++++ ...1byte_shutdown_finishes_calls_test.vcxproj | 4 ++++ ..._shutdown_finishes_tags_nosec_test.vcxproj | 4 ++++ ..._1byte_shutdown_finishes_tags_test.vcxproj | 4 ++++ ...ir_1byte_simple_request_nosec_test.vcxproj | 4 ++++ ...sockpair_1byte_simple_request_test.vcxproj | 4 ++++ ...1byte_trailing_metadata_nosec_test.vcxproj | 4 ++++ ...kpair_1byte_trailing_metadata_test.vcxproj | 4 ++++ ...2_sockpair_bad_hostname_nosec_test.vcxproj | 4 ++++ .../h2_sockpair_bad_hostname_test.vcxproj | 4 ++++ ...ockpair_binary_metadata_nosec_test.vcxproj | 4 ++++ .../h2_sockpair_binary_metadata_test.vcxproj | 4 ++++ .../h2_sockpair_call_creds_test.vcxproj | 4 ++++ ...air_cancel_after_accept_nosec_test.vcxproj | 4 ++++ ..._sockpair_cancel_after_accept_test.vcxproj | 4 ++++ ...ancel_after_client_done_nosec_test.vcxproj | 4 ++++ ...pair_cancel_after_client_done_test.vcxproj | 4 ++++ ...air_cancel_after_invoke_nosec_test.vcxproj | 4 ++++ ..._sockpair_cancel_after_invoke_test.vcxproj | 4 ++++ ...ir_cancel_before_invoke_nosec_test.vcxproj | 4 ++++ ...sockpair_cancel_before_invoke_test.vcxproj | 4 ++++ ...pair_cancel_in_a_vacuum_nosec_test.vcxproj | 4 ++++ ...2_sockpair_cancel_in_a_vacuum_test.vcxproj | 4 ++++ ...r_census_simple_request_nosec_test.vcxproj | 4 ++++ ...ockpair_census_simple_request_test.vcxproj | 4 ++++ ...pair_compressed_payload_nosec_test.vcxproj | 4 ++++ ...2_sockpair_compressed_payload_test.vcxproj | 4 ++++ ...h2_sockpair_empty_batch_nosec_test.vcxproj | 4 ++++ .../h2_sockpair_empty_batch_test.vcxproj | 4 ++++ ...raceful_server_shutdown_nosec_test.vcxproj | 4 ++++ ...pair_graceful_server_shutdown_test.vcxproj | 4 ++++ ...pair_high_initial_seqno_nosec_test.vcxproj | 4 ++++ ...2_sockpair_high_initial_seqno_test.vcxproj | 4 ++++ ...ir_invoke_large_request_nosec_test.vcxproj | 4 ++++ ...sockpair_invoke_large_request_test.vcxproj | 4 ++++ ...sockpair_large_metadata_nosec_test.vcxproj | 4 ++++ .../h2_sockpair_large_metadata_test.vcxproj | 4 ++++ ..._max_concurrent_streams_nosec_test.vcxproj | 4 ++++ ...ckpair_max_concurrent_streams_test.vcxproj | 4 ++++ ...pair_max_message_length_nosec_test.vcxproj | 4 ++++ ...2_sockpair_max_message_length_test.vcxproj | 4 ++++ .../h2_sockpair_metadata_nosec_test.vcxproj | 4 ++++ .../h2_sockpair_metadata_test.vcxproj | 4 ++++ .../h2_sockpair_no_op_nosec_test.vcxproj | 4 ++++ .../h2_sockpair_no_op_test.vcxproj | 4 ++++ .../h2_sockpair_payload_nosec_test.vcxproj | 4 ++++ .../h2_sockpair_payload_test.vcxproj | 4 ++++ ...air_ping_pong_streaming_nosec_test.vcxproj | 4 ++++ ..._sockpair_ping_pong_streaming_test.vcxproj | 4 ++++ ...ockpair_registered_call_nosec_test.vcxproj | 4 ++++ .../h2_sockpair_registered_call_test.vcxproj | 4 ++++ ...pair_request_with_flags_nosec_test.vcxproj | 4 ++++ ...2_sockpair_request_with_flags_test.vcxproj | 4 ++++ ...ir_request_with_payload_nosec_test.vcxproj | 4 ++++ ...sockpair_request_with_payload_test.vcxproj | 4 ++++ ...server_finishes_request_nosec_test.vcxproj | 4 ++++ ...kpair_server_finishes_request_test.vcxproj | 4 ++++ ...shutdown_finishes_calls_nosec_test.vcxproj | 4 ++++ ...kpair_shutdown_finishes_calls_test.vcxproj | 4 ++++ ..._shutdown_finishes_tags_nosec_test.vcxproj | 4 ++++ ...ckpair_shutdown_finishes_tags_test.vcxproj | 4 ++++ ...sockpair_simple_request_nosec_test.vcxproj | 4 ++++ .../h2_sockpair_simple_request_test.vcxproj | 4 ++++ ...kpair_trailing_metadata_nosec_test.vcxproj | 4 ++++ ...h2_sockpair_trailing_metadata_test.vcxproj | 4 ++++ .../h2_ssl_bad_hostname_test.vcxproj | 4 ++++ .../h2_ssl_binary_metadata_test.vcxproj | 4 ++++ .../h2_ssl_call_creds_test.vcxproj | 4 ++++ .../h2_ssl_cancel_after_accept_test.vcxproj | 4 ++++ ..._ssl_cancel_after_client_done_test.vcxproj | 4 ++++ .../h2_ssl_cancel_after_invoke_test.vcxproj | 4 ++++ .../h2_ssl_cancel_before_invoke_test.vcxproj | 4 ++++ .../h2_ssl_cancel_in_a_vacuum_test.vcxproj | 4 ++++ .../h2_ssl_census_simple_request_test.vcxproj | 4 ++++ .../h2_ssl_channel_connectivity_test.vcxproj | 4 ++++ .../h2_ssl_compressed_payload_test.vcxproj | 4 ++++ .../h2_ssl_default_host_test.vcxproj | 4 ++++ .../h2_ssl_disappearing_server_test.vcxproj | 4 ++++ .../h2_ssl_empty_batch_test.vcxproj | 4 ++++ ..._ssl_graceful_server_shutdown_test.vcxproj | 4 ++++ .../h2_ssl_high_initial_seqno_test.vcxproj | 4 ++++ .../h2_ssl_invoke_large_request_test.vcxproj | 4 ++++ .../h2_ssl_large_metadata_test.vcxproj | 4 ++++ ...h2_ssl_max_concurrent_streams_test.vcxproj | 4 ++++ .../h2_ssl_max_message_length_test.vcxproj | 4 ++++ .../h2_ssl_metadata_test.vcxproj | 4 ++++ .../h2_ssl_no_op_test.vcxproj | 4 ++++ .../h2_ssl_payload_test.vcxproj | 4 ++++ .../h2_ssl_ping_pong_streaming_test.vcxproj | 4 ++++ .../h2_ssl_proxy_bad_hostname_test.vcxproj | 4 ++++ .../h2_ssl_proxy_binary_metadata_test.vcxproj | 4 ++++ .../h2_ssl_proxy_call_creds_test.vcxproj | 4 ++++ ...ssl_proxy_cancel_after_accept_test.vcxproj | 4 ++++ ...roxy_cancel_after_client_done_test.vcxproj | 4 ++++ ...ssl_proxy_cancel_after_invoke_test.vcxproj | 4 ++++ ...sl_proxy_cancel_before_invoke_test.vcxproj | 4 ++++ ..._ssl_proxy_cancel_in_a_vacuum_test.vcxproj | 4 ++++ ...l_proxy_census_simple_request_test.vcxproj | 4 ++++ .../h2_ssl_proxy_default_host_test.vcxproj | 4 ++++ ...ssl_proxy_disappearing_server_test.vcxproj | 4 ++++ .../h2_ssl_proxy_empty_batch_test.vcxproj | 4 ++++ ...roxy_graceful_server_shutdown_test.vcxproj | 4 ++++ ..._ssl_proxy_high_initial_seqno_test.vcxproj | 4 ++++ ...sl_proxy_invoke_large_request_test.vcxproj | 4 ++++ .../h2_ssl_proxy_large_metadata_test.vcxproj | 4 ++++ ..._ssl_proxy_max_message_length_test.vcxproj | 4 ++++ .../h2_ssl_proxy_metadata_test.vcxproj | 4 ++++ .../h2_ssl_proxy_no_op_test.vcxproj | 4 ++++ .../h2_ssl_proxy_payload_test.vcxproj | 4 ++++ ...ssl_proxy_ping_pong_streaming_test.vcxproj | 4 ++++ .../h2_ssl_proxy_registered_call_test.vcxproj | 4 ++++ ...sl_proxy_request_with_payload_test.vcxproj | 4 ++++ ...proxy_server_finishes_request_test.vcxproj | 4 ++++ ...proxy_shutdown_finishes_calls_test.vcxproj | 4 ++++ ..._proxy_shutdown_finishes_tags_test.vcxproj | 4 ++++ ..._proxy_simple_delayed_request_test.vcxproj | 4 ++++ .../h2_ssl_proxy_simple_request_test.vcxproj | 4 ++++ ...2_ssl_proxy_trailing_metadata_test.vcxproj | 4 ++++ .../h2_ssl_registered_call_test.vcxproj | 4 ++++ .../h2_ssl_request_with_flags_test.vcxproj | 4 ++++ .../h2_ssl_request_with_payload_test.vcxproj | 4 ++++ ...2_ssl_server_finishes_request_test.vcxproj | 4 ++++ ...2_ssl_shutdown_finishes_calls_test.vcxproj | 4 ++++ ...h2_ssl_shutdown_finishes_tags_test.vcxproj | 4 ++++ ...h2_ssl_simple_delayed_request_test.vcxproj | 4 ++++ .../h2_ssl_simple_request_test.vcxproj | 4 ++++ .../h2_ssl_trailing_metadata_test.vcxproj | 4 ++++ .../hpack_parser_test.vcxproj | 4 ++++ .../hpack_table_test/hpack_table_test.vcxproj | 4 ++++ .../httpcli_format_request_test.vcxproj | 4 ++++ .../httpcli_parser_test.vcxproj | 4 ++++ ...ial_settings_frame_bad_client_test.vcxproj | 4 ++++ .../test/json_rewrite/json_rewrite.vcxproj | 4 ++++ .../json_rewrite_test.vcxproj | 4 ++++ .../vcxproj/test/json_test/json_test.vcxproj | 4 ++++ .../lame_client_test/lame_client_test.vcxproj | 4 ++++ .../lb_policies_test/lb_policies_test.vcxproj | 4 ++++ .../message_compress_test.vcxproj | 4 ++++ .../vcxproj/test/mock_test/mock_test.vcxproj | 4 ++++ .../multi_init_test/multi_init_test.vcxproj | 4 ++++ .../multiple_server_queues_test.vcxproj | 4 ++++ .../murmur_hash_test/murmur_hash_test.vcxproj | 4 ++++ .../no_server_test/no_server_test.vcxproj | 4 ++++ .../reconnect_interop_client.vcxproj | 4 ++++ .../reconnect_interop_server.vcxproj | 4 ++++ .../resolve_address_test.vcxproj | 4 ++++ .../secure_auth_context_test.vcxproj | 4 ++++ .../secure_endpoint_test.vcxproj | 4 ++++ .../server_crash_test_client.vcxproj | 4 ++++ .../test/shutdown_test/shutdown_test.vcxproj | 4 ++++ .../sockaddr_utils_test.vcxproj | 4 ++++ .../test/status_test/status_test.vcxproj | 4 ++++ .../thread_stress_test.vcxproj | 4 ++++ .../time_averaged_stats_test.vcxproj | 4 ++++ .../timeout_encoding_test.vcxproj | 4 ++++ .../test/timers_test/timers_test.vcxproj | 4 ++++ .../transport_metadata_test.vcxproj | 4 ++++ .../uri_parser_test/uri_parser_test.vcxproj | 4 ++++ .../workqueue_test/workqueue_test.vcxproj | 4 ++++ 651 files changed, 2633 insertions(+), 12 deletions(-) diff --git a/src/core/surface/version.c b/src/core/surface/version.c index e559d51448a..4b90e06a043 100644 --- a/src/core/surface/version.c +++ b/src/core/surface/version.c @@ -36,4 +36,6 @@ #include -const char *grpc_version_string(void) { return "0.11.0.0"; } +const char *grpc_version_string(void) { + return "0.11.0.0"; +} diff --git a/templates/vsprojects/vcxproj_defs.include b/templates/vsprojects/vcxproj_defs.include index 17fbf56232f..13d9c81f828 100644 --- a/templates/vsprojects/vcxproj_defs.include +++ b/templates/vsprojects/vcxproj_defs.include @@ -143,6 +143,7 @@ ${gen_package_props(packages, repo_root)}\ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true ${get_subsystem(project.is_library)} @@ -157,6 +158,7 @@ ${gen_package_props(packages, repo_root)}\ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true ${get_subsystem(project.is_library)} @@ -173,6 +175,7 @@ ${gen_package_props(packages, repo_root)}\ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true ${get_subsystem(project.is_library)} @@ -191,6 +194,7 @@ ${gen_package_props(packages, repo_root)}\ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true ${get_subsystem(project.is_library)} @@ -208,6 +212,7 @@ ${gen_package_props(packages, repo_root)}\ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true ${get_subsystem(project.is_library)} @@ -222,6 +227,7 @@ ${gen_package_props(packages, repo_root)}\ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true ${get_subsystem(project.is_library)} @@ -238,6 +244,7 @@ ${gen_package_props(packages, repo_root)}\ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true ${get_subsystem(project.is_library)} @@ -256,6 +263,7 @@ ${gen_package_props(packages, repo_root)}\ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true ${get_subsystem(project.is_library)} diff --git a/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj b/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj index acb62acefbd..b4c03217a2a 100644 --- a/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj +++ b/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj @@ -92,6 +92,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -106,6 +107,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -122,6 +124,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -140,6 +143,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -156,6 +160,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -170,6 +175,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -186,6 +192,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -204,6 +211,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj b/vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj index 3a0bcbaf576..db14eeabc01 100644 --- a/vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj +++ b/vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj @@ -66,6 +66,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -80,6 +81,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -96,6 +98,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -114,6 +117,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj b/vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj index 36ab430614c..03812a1f3b5 100644 --- a/vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj +++ b/vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj @@ -66,6 +66,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -80,6 +81,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -96,6 +98,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -114,6 +117,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj b/vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj index 1a584a7a4e4..eb74b9b7962 100644 --- a/vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj +++ b/vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj @@ -66,6 +66,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -80,6 +81,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -96,6 +98,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -114,6 +117,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj b/vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj index 9bed025d20a..e76dfbafd48 100644 --- a/vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj +++ b/vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj @@ -66,6 +66,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -80,6 +81,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -96,6 +98,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -114,6 +117,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj b/vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj index e9589be6138..8bac7dcbe7b 100644 --- a/vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj +++ b/vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj @@ -66,6 +66,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -80,6 +81,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -96,6 +98,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -114,6 +117,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/gen_hpack_tables/gen_hpack_tables.vcxproj b/vsprojects/vcxproj/gen_hpack_tables/gen_hpack_tables.vcxproj index 472db89de57..de0adf7ae5f 100644 --- a/vsprojects/vcxproj/gen_hpack_tables/gen_hpack_tables.vcxproj +++ b/vsprojects/vcxproj/gen_hpack_tables/gen_hpack_tables.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/gen_legal_metadata_characters/gen_legal_metadata_characters.vcxproj b/vsprojects/vcxproj/gen_legal_metadata_characters/gen_legal_metadata_characters.vcxproj index 0930f2c7d83..53902574efa 100644 --- a/vsprojects/vcxproj/gen_legal_metadata_characters/gen_legal_metadata_characters.vcxproj +++ b/vsprojects/vcxproj/gen_legal_metadata_characters/gen_legal_metadata_characters.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/gpr/gpr.vcxproj b/vsprojects/vcxproj/gpr/gpr.vcxproj index a130f5961e7..a656e0daf21 100644 --- a/vsprojects/vcxproj/gpr/gpr.vcxproj +++ b/vsprojects/vcxproj/gpr/gpr.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/gpr_test_util/gpr_test_util.vcxproj b/vsprojects/vcxproj/gpr_test_util/gpr_test_util.vcxproj index 8a67378b001..3e6ef370ef3 100644 --- a/vsprojects/vcxproj/gpr_test_util/gpr_test_util.vcxproj +++ b/vsprojects/vcxproj/gpr_test_util/gpr_test_util.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj b/vsprojects/vcxproj/grpc++/grpc++.vcxproj index 3a7f559a239..d455ffa58de 100644 --- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj +++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj @@ -92,6 +92,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -106,6 +107,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -122,6 +124,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -140,6 +143,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -156,6 +160,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -170,6 +175,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -186,6 +192,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -204,6 +211,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/grpc++_test_config/grpc++_test_config.vcxproj b/vsprojects/vcxproj/grpc++_test_config/grpc++_test_config.vcxproj index 1944be3a676..027f49a8012 100644 --- a/vsprojects/vcxproj/grpc++_test_config/grpc++_test_config.vcxproj +++ b/vsprojects/vcxproj/grpc++_test_config/grpc++_test_config.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj b/vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj index 3914aaf629d..6ecd9709cc2 100644 --- a/vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj +++ b/vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj index acb62acefbd..b4c03217a2a 100644 --- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj @@ -92,6 +92,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -106,6 +107,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -122,6 +124,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -140,6 +143,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -156,6 +160,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -170,6 +175,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -186,6 +192,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -204,6 +211,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index 5217fa6fbee..6be89fa96db 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -1,4 +1,4 @@ - + @@ -99,6 +99,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -113,6 +114,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -129,6 +131,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -147,6 +150,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -178,6 +182,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -194,6 +199,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -212,6 +218,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -664,10 +671,10 @@ - - - - + + + + @@ -679,4 +686,5 @@ - \ No newline at end of file + + diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index dea536f5adb..a8f82370d91 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -846,6 +846,7 @@ src\core\census + {968de0a1-346d-b75a-6f19-6a55119b8235} @@ -914,7 +915,5 @@ {0b0f9ab1-efa4-7f03-e446-6fb9b5227e84} - - - - \ No newline at end of file + + diff --git a/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj b/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj index 3a0bcbaf576..db14eeabc01 100644 --- a/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj +++ b/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj @@ -66,6 +66,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -80,6 +81,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -96,6 +98,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -114,6 +117,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/grpc_create_jwt/grpc_create_jwt.vcxproj b/vsprojects/vcxproj/grpc_create_jwt/grpc_create_jwt.vcxproj index d11611864fe..6ba101471ed 100644 --- a/vsprojects/vcxproj/grpc_create_jwt/grpc_create_jwt.vcxproj +++ b/vsprojects/vcxproj/grpc_create_jwt/grpc_create_jwt.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/grpc_csharp_ext/grpc_csharp_ext.vcxproj b/vsprojects/vcxproj/grpc_csharp_ext/grpc_csharp_ext.vcxproj index f2cfcb37de1..c22b8c9523b 100644 --- a/vsprojects/vcxproj/grpc_csharp_ext/grpc_csharp_ext.vcxproj +++ b/vsprojects/vcxproj/grpc_csharp_ext/grpc_csharp_ext.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj b/vsprojects/vcxproj/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj index 36ab430614c..03812a1f3b5 100644 --- a/vsprojects/vcxproj/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj +++ b/vsprojects/vcxproj/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj @@ -66,6 +66,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -80,6 +81,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -96,6 +98,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -114,6 +117,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/grpc_fetch_oauth2/grpc_fetch_oauth2.vcxproj b/vsprojects/vcxproj/grpc_fetch_oauth2/grpc_fetch_oauth2.vcxproj index ca4b1a84145..0aac47a3d49 100644 --- a/vsprojects/vcxproj/grpc_fetch_oauth2/grpc_fetch_oauth2.vcxproj +++ b/vsprojects/vcxproj/grpc_fetch_oauth2/grpc_fetch_oauth2.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj b/vsprojects/vcxproj/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj index 1a584a7a4e4..eb74b9b7962 100644 --- a/vsprojects/vcxproj/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj +++ b/vsprojects/vcxproj/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj @@ -66,6 +66,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -80,6 +81,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -96,6 +98,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -114,6 +117,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj index 01430d0912a..41902ccdf6c 100644 --- a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj +++ b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/grpc_print_google_default_creds_token/grpc_print_google_default_creds_token.vcxproj b/vsprojects/vcxproj/grpc_print_google_default_creds_token/grpc_print_google_default_creds_token.vcxproj index 485bbcd823f..7f54ed5b2d9 100644 --- a/vsprojects/vcxproj/grpc_print_google_default_creds_token/grpc_print_google_default_creds_token.vcxproj +++ b/vsprojects/vcxproj/grpc_print_google_default_creds_token/grpc_print_google_default_creds_token.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/grpc_python_plugin/grpc_python_plugin.vcxproj b/vsprojects/vcxproj/grpc_python_plugin/grpc_python_plugin.vcxproj index 9bed025d20a..e76dfbafd48 100644 --- a/vsprojects/vcxproj/grpc_python_plugin/grpc_python_plugin.vcxproj +++ b/vsprojects/vcxproj/grpc_python_plugin/grpc_python_plugin.vcxproj @@ -66,6 +66,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -80,6 +81,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -96,6 +98,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -114,6 +117,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj b/vsprojects/vcxproj/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj index e9589be6138..8bac7dcbe7b 100644 --- a/vsprojects/vcxproj/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj +++ b/vsprojects/vcxproj/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj @@ -66,6 +66,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -80,6 +81,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -96,6 +98,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -114,6 +117,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj index 75c3437285f..0d9ee7e6b1c 100644 --- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj +++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/grpc_test_util_unsecure/grpc_test_util_unsecure.vcxproj b/vsprojects/vcxproj/grpc_test_util_unsecure/grpc_test_util_unsecure.vcxproj index e86371dda63..f9a4007e041 100644 --- a/vsprojects/vcxproj/grpc_test_util_unsecure/grpc_test_util_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_test_util_unsecure/grpc_test_util_unsecure.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index d9af6de0d2c..fa20abe5295 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -92,6 +92,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -106,6 +107,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -122,6 +124,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -140,6 +143,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -156,6 +160,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -170,6 +175,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -186,6 +192,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -204,6 +211,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/grpc_verify_jwt/grpc_verify_jwt.vcxproj b/vsprojects/vcxproj/grpc_verify_jwt/grpc_verify_jwt.vcxproj index 5011dbc2cac..d7bf9dbb911 100644 --- a/vsprojects/vcxproj/grpc_verify_jwt/grpc_verify_jwt.vcxproj +++ b/vsprojects/vcxproj/grpc_verify_jwt/grpc_verify_jwt.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/interop_client_helper/interop_client_helper.vcxproj b/vsprojects/vcxproj/interop_client_helper/interop_client_helper.vcxproj index 40f3d102764..62113cb2d63 100644 --- a/vsprojects/vcxproj/interop_client_helper/interop_client_helper.vcxproj +++ b/vsprojects/vcxproj/interop_client_helper/interop_client_helper.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/interop_client_main/interop_client_main.vcxproj b/vsprojects/vcxproj/interop_client_main/interop_client_main.vcxproj index fb88c22cbc2..13ac3734e61 100644 --- a/vsprojects/vcxproj/interop_client_main/interop_client_main.vcxproj +++ b/vsprojects/vcxproj/interop_client_main/interop_client_main.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/interop_server_helper/interop_server_helper.vcxproj b/vsprojects/vcxproj/interop_server_helper/interop_server_helper.vcxproj index 5d79972d9a1..d6943efb687 100644 --- a/vsprojects/vcxproj/interop_server_helper/interop_server_helper.vcxproj +++ b/vsprojects/vcxproj/interop_server_helper/interop_server_helper.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj b/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj index 9115e395cbe..1907a971a29 100644 --- a/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj +++ b/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/qps/qps.vcxproj b/vsprojects/vcxproj/qps/qps.vcxproj index 6cc4861def6..caad34ad433 100644 --- a/vsprojects/vcxproj/qps/qps.vcxproj +++ b/vsprojects/vcxproj/qps/qps.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/reconnect_server/reconnect_server.vcxproj b/vsprojects/vcxproj/reconnect_server/reconnect_server.vcxproj index 24b95362986..d5032cfde73 100644 --- a/vsprojects/vcxproj/reconnect_server/reconnect_server.vcxproj +++ b/vsprojects/vcxproj/reconnect_server/reconnect_server.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/alarm_heap_test/alarm_heap_test.vcxproj b/vsprojects/vcxproj/test/alarm_heap_test/alarm_heap_test.vcxproj index 6d3c3afb716..c68ecbc8a65 100644 --- a/vsprojects/vcxproj/test/alarm_heap_test/alarm_heap_test.vcxproj +++ b/vsprojects/vcxproj/test/alarm_heap_test/alarm_heap_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/alarm_list_test/alarm_list_test.vcxproj b/vsprojects/vcxproj/test/alarm_list_test/alarm_list_test.vcxproj index 429c484d3ed..1941ecbb42c 100644 --- a/vsprojects/vcxproj/test/alarm_list_test/alarm_list_test.vcxproj +++ b/vsprojects/vcxproj/test/alarm_list_test/alarm_list_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/alpn_test/alpn_test.vcxproj b/vsprojects/vcxproj/test/alpn_test/alpn_test.vcxproj index b11844df38e..8112fe59ec2 100644 --- a/vsprojects/vcxproj/test/alpn_test/alpn_test.vcxproj +++ b/vsprojects/vcxproj/test/alpn_test/alpn_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/async_end2end_test/async_end2end_test.vcxproj b/vsprojects/vcxproj/test/async_end2end_test/async_end2end_test.vcxproj index e0836fad0ff..5389f3f3a2a 100644 --- a/vsprojects/vcxproj/test/async_end2end_test/async_end2end_test.vcxproj +++ b/vsprojects/vcxproj/test/async_end2end_test/async_end2end_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/auth_property_iterator_test/auth_property_iterator_test.vcxproj b/vsprojects/vcxproj/test/auth_property_iterator_test/auth_property_iterator_test.vcxproj index 81bea43dc16..1a6383d7a83 100644 --- a/vsprojects/vcxproj/test/auth_property_iterator_test/auth_property_iterator_test.vcxproj +++ b/vsprojects/vcxproj/test/auth_property_iterator_test/auth_property_iterator_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/bad_client_test/bad_client_test.vcxproj b/vsprojects/vcxproj/test/bad_client_test/bad_client_test.vcxproj index d7d13fd349a..8a52612f5ff 100644 --- a/vsprojects/vcxproj/test/bad_client_test/bad_client_test.vcxproj +++ b/vsprojects/vcxproj/test/bad_client_test/bad_client_test.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/bin_encoder_test/bin_encoder_test.vcxproj b/vsprojects/vcxproj/test/bin_encoder_test/bin_encoder_test.vcxproj index a5a2d00a8bd..acfd6d29c2c 100644 --- a/vsprojects/vcxproj/test/bin_encoder_test/bin_encoder_test.vcxproj +++ b/vsprojects/vcxproj/test/bin_encoder_test/bin_encoder_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/channel_arguments_test/channel_arguments_test.vcxproj b/vsprojects/vcxproj/test/channel_arguments_test/channel_arguments_test.vcxproj index 6227ea2d905..240ee270455 100644 --- a/vsprojects/vcxproj/test/channel_arguments_test/channel_arguments_test.vcxproj +++ b/vsprojects/vcxproj/test/channel_arguments_test/channel_arguments_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/chttp2_status_conversion_test/chttp2_status_conversion_test.vcxproj b/vsprojects/vcxproj/test/chttp2_status_conversion_test/chttp2_status_conversion_test.vcxproj index 3bf77402983..49e8d075d60 100644 --- a/vsprojects/vcxproj/test/chttp2_status_conversion_test/chttp2_status_conversion_test.vcxproj +++ b/vsprojects/vcxproj/test/chttp2_status_conversion_test/chttp2_status_conversion_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/chttp2_stream_encoder_test/chttp2_stream_encoder_test.vcxproj b/vsprojects/vcxproj/test/chttp2_stream_encoder_test/chttp2_stream_encoder_test.vcxproj index f87f8db8d50..aeceeb76bf7 100644 --- a/vsprojects/vcxproj/test/chttp2_stream_encoder_test/chttp2_stream_encoder_test.vcxproj +++ b/vsprojects/vcxproj/test/chttp2_stream_encoder_test/chttp2_stream_encoder_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/chttp2_stream_map_test/chttp2_stream_map_test.vcxproj b/vsprojects/vcxproj/test/chttp2_stream_map_test/chttp2_stream_map_test.vcxproj index b07e0657784..91dd6043c18 100644 --- a/vsprojects/vcxproj/test/chttp2_stream_map_test/chttp2_stream_map_test.vcxproj +++ b/vsprojects/vcxproj/test/chttp2_stream_map_test/chttp2_stream_map_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/cli_call_test/cli_call_test.vcxproj b/vsprojects/vcxproj/test/cli_call_test/cli_call_test.vcxproj index 3d572864233..83aa6e489e3 100644 --- a/vsprojects/vcxproj/test/cli_call_test/cli_call_test.vcxproj +++ b/vsprojects/vcxproj/test/cli_call_test/cli_call_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/client_crash_test_server/client_crash_test_server.vcxproj b/vsprojects/vcxproj/test/client_crash_test_server/client_crash_test_server.vcxproj index 1fec2e9e11e..8e7a2558d45 100644 --- a/vsprojects/vcxproj/test/client_crash_test_server/client_crash_test_server.vcxproj +++ b/vsprojects/vcxproj/test/client_crash_test_server/client_crash_test_server.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/compression_test/compression_test.vcxproj b/vsprojects/vcxproj/test/compression_test/compression_test.vcxproj index 9072ffd3d9c..7434d89f832 100644 --- a/vsprojects/vcxproj/test/compression_test/compression_test.vcxproj +++ b/vsprojects/vcxproj/test/compression_test/compression_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/connection_prefix_bad_client_test/connection_prefix_bad_client_test.vcxproj b/vsprojects/vcxproj/test/connection_prefix_bad_client_test/connection_prefix_bad_client_test.vcxproj index 0398fe0bfc7..e691bbb5e88 100644 --- a/vsprojects/vcxproj/test/connection_prefix_bad_client_test/connection_prefix_bad_client_test.vcxproj +++ b/vsprojects/vcxproj/test/connection_prefix_bad_client_test/connection_prefix_bad_client_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/credentials_test/credentials_test.vcxproj b/vsprojects/vcxproj/test/credentials_test/credentials_test.vcxproj index 4c8bcb8c829..7d655159c60 100644 --- a/vsprojects/vcxproj/test/credentials_test/credentials_test.vcxproj +++ b/vsprojects/vcxproj/test/credentials_test/credentials_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/cxx_byte_buffer_test/cxx_byte_buffer_test.vcxproj b/vsprojects/vcxproj/test/cxx_byte_buffer_test/cxx_byte_buffer_test.vcxproj index 6a6c51cbd52..628f947f49e 100644 --- a/vsprojects/vcxproj/test/cxx_byte_buffer_test/cxx_byte_buffer_test.vcxproj +++ b/vsprojects/vcxproj/test/cxx_byte_buffer_test/cxx_byte_buffer_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/cxx_slice_test/cxx_slice_test.vcxproj b/vsprojects/vcxproj/test/cxx_slice_test/cxx_slice_test.vcxproj index 190893d9ea4..af529983b8c 100644 --- a/vsprojects/vcxproj/test/cxx_slice_test/cxx_slice_test.vcxproj +++ b/vsprojects/vcxproj/test/cxx_slice_test/cxx_slice_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/cxx_string_ref_test/cxx_string_ref_test.vcxproj b/vsprojects/vcxproj/test/cxx_string_ref_test/cxx_string_ref_test.vcxproj index 50bc677304c..bd243d76b4d 100644 --- a/vsprojects/vcxproj/test/cxx_string_ref_test/cxx_string_ref_test.vcxproj +++ b/vsprojects/vcxproj/test/cxx_string_ref_test/cxx_string_ref_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/cxx_time_test/cxx_time_test.vcxproj b/vsprojects/vcxproj/test/cxx_time_test/cxx_time_test.vcxproj index 56575703dd1..cbb03ed7c07 100644 --- a/vsprojects/vcxproj/test/cxx_time_test/cxx_time_test.vcxproj +++ b/vsprojects/vcxproj/test/cxx_time_test/cxx_time_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/end2end_certs/end2end_certs.vcxproj b/vsprojects/vcxproj/test/end2end_certs/end2end_certs.vcxproj index 311e090f05f..c6140951c0d 100644 --- a/vsprojects/vcxproj/test/end2end_certs/end2end_certs.vcxproj +++ b/vsprojects/vcxproj/test/end2end_certs/end2end_certs.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_fixture_h2_compress/end2end_fixture_h2_compress.vcxproj b/vsprojects/vcxproj/test/end2end_fixture_h2_compress/end2end_fixture_h2_compress.vcxproj index 0024defbe93..80169a2e7f7 100644 --- a/vsprojects/vcxproj/test/end2end_fixture_h2_compress/end2end_fixture_h2_compress.vcxproj +++ b/vsprojects/vcxproj/test/end2end_fixture_h2_compress/end2end_fixture_h2_compress.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_fixture_h2_fakesec/end2end_fixture_h2_fakesec.vcxproj b/vsprojects/vcxproj/test/end2end_fixture_h2_fakesec/end2end_fixture_h2_fakesec.vcxproj index 98012a9bf23..13312ab1372 100644 --- a/vsprojects/vcxproj/test/end2end_fixture_h2_fakesec/end2end_fixture_h2_fakesec.vcxproj +++ b/vsprojects/vcxproj/test/end2end_fixture_h2_fakesec/end2end_fixture_h2_fakesec.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_fixture_h2_full/end2end_fixture_h2_full.vcxproj b/vsprojects/vcxproj/test/end2end_fixture_h2_full/end2end_fixture_h2_full.vcxproj index 82815319056..428209d1aac 100644 --- a/vsprojects/vcxproj/test/end2end_fixture_h2_full/end2end_fixture_h2_full.vcxproj +++ b/vsprojects/vcxproj/test/end2end_fixture_h2_full/end2end_fixture_h2_full.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_fixture_h2_oauth2/end2end_fixture_h2_oauth2.vcxproj b/vsprojects/vcxproj/test/end2end_fixture_h2_oauth2/end2end_fixture_h2_oauth2.vcxproj index 476776a1178..d55c2cd8e46 100644 --- a/vsprojects/vcxproj/test/end2end_fixture_h2_oauth2/end2end_fixture_h2_oauth2.vcxproj +++ b/vsprojects/vcxproj/test/end2end_fixture_h2_oauth2/end2end_fixture_h2_oauth2.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_fixture_h2_proxy/end2end_fixture_h2_proxy.vcxproj b/vsprojects/vcxproj/test/end2end_fixture_h2_proxy/end2end_fixture_h2_proxy.vcxproj index b600471f013..085f5e934c4 100644 --- a/vsprojects/vcxproj/test/end2end_fixture_h2_proxy/end2end_fixture_h2_proxy.vcxproj +++ b/vsprojects/vcxproj/test/end2end_fixture_h2_proxy/end2end_fixture_h2_proxy.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_fixture_h2_sockpair+trace/end2end_fixture_h2_sockpair+trace.vcxproj b/vsprojects/vcxproj/test/end2end_fixture_h2_sockpair+trace/end2end_fixture_h2_sockpair+trace.vcxproj index 18f4d043b83..fbd244d6b50 100644 --- a/vsprojects/vcxproj/test/end2end_fixture_h2_sockpair+trace/end2end_fixture_h2_sockpair+trace.vcxproj +++ b/vsprojects/vcxproj/test/end2end_fixture_h2_sockpair+trace/end2end_fixture_h2_sockpair+trace.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_fixture_h2_sockpair/end2end_fixture_h2_sockpair.vcxproj b/vsprojects/vcxproj/test/end2end_fixture_h2_sockpair/end2end_fixture_h2_sockpair.vcxproj index 62f9f8c6985..3fddcda0e5e 100644 --- a/vsprojects/vcxproj/test/end2end_fixture_h2_sockpair/end2end_fixture_h2_sockpair.vcxproj +++ b/vsprojects/vcxproj/test/end2end_fixture_h2_sockpair/end2end_fixture_h2_sockpair.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_fixture_h2_sockpair_1byte/end2end_fixture_h2_sockpair_1byte.vcxproj b/vsprojects/vcxproj/test/end2end_fixture_h2_sockpair_1byte/end2end_fixture_h2_sockpair_1byte.vcxproj index 879ce016e94..561c277fdc2 100644 --- a/vsprojects/vcxproj/test/end2end_fixture_h2_sockpair_1byte/end2end_fixture_h2_sockpair_1byte.vcxproj +++ b/vsprojects/vcxproj/test/end2end_fixture_h2_sockpair_1byte/end2end_fixture_h2_sockpair_1byte.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_fixture_h2_ssl/end2end_fixture_h2_ssl.vcxproj b/vsprojects/vcxproj/test/end2end_fixture_h2_ssl/end2end_fixture_h2_ssl.vcxproj index 7b9d6b40d34..5349baf604e 100644 --- a/vsprojects/vcxproj/test/end2end_fixture_h2_ssl/end2end_fixture_h2_ssl.vcxproj +++ b/vsprojects/vcxproj/test/end2end_fixture_h2_ssl/end2end_fixture_h2_ssl.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_fixture_h2_ssl_proxy/end2end_fixture_h2_ssl_proxy.vcxproj b/vsprojects/vcxproj/test/end2end_fixture_h2_ssl_proxy/end2end_fixture_h2_ssl_proxy.vcxproj index 647b8997a8e..182991dbfaf 100644 --- a/vsprojects/vcxproj/test/end2end_fixture_h2_ssl_proxy/end2end_fixture_h2_ssl_proxy.vcxproj +++ b/vsprojects/vcxproj/test/end2end_fixture_h2_ssl_proxy/end2end_fixture_h2_ssl_proxy.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj b/vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj index 8049cb50143..89524a1115f 100644 --- a/vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/end2end_test_bad_hostname/end2end_test_bad_hostname.vcxproj b/vsprojects/vcxproj/test/end2end_test_bad_hostname/end2end_test_bad_hostname.vcxproj index 6e7f08c08a3..ad90a116316 100644 --- a/vsprojects/vcxproj/test/end2end_test_bad_hostname/end2end_test_bad_hostname.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_bad_hostname/end2end_test_bad_hostname.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_binary_metadata/end2end_test_binary_metadata.vcxproj b/vsprojects/vcxproj/test/end2end_test_binary_metadata/end2end_test_binary_metadata.vcxproj index fdd6f54f8a3..e3b73fbfd0b 100644 --- a/vsprojects/vcxproj/test/end2end_test_binary_metadata/end2end_test_binary_metadata.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_binary_metadata/end2end_test_binary_metadata.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_call_creds/end2end_test_call_creds.vcxproj b/vsprojects/vcxproj/test/end2end_test_call_creds/end2end_test_call_creds.vcxproj index b83b7846bdd..53d002e46a0 100644 --- a/vsprojects/vcxproj/test/end2end_test_call_creds/end2end_test_call_creds.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_call_creds/end2end_test_call_creds.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_cancel_after_accept/end2end_test_cancel_after_accept.vcxproj b/vsprojects/vcxproj/test/end2end_test_cancel_after_accept/end2end_test_cancel_after_accept.vcxproj index f8bc4778138..700ff940bc4 100644 --- a/vsprojects/vcxproj/test/end2end_test_cancel_after_accept/end2end_test_cancel_after_accept.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_cancel_after_accept/end2end_test_cancel_after_accept.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_cancel_after_client_done/end2end_test_cancel_after_client_done.vcxproj b/vsprojects/vcxproj/test/end2end_test_cancel_after_client_done/end2end_test_cancel_after_client_done.vcxproj index d10025c4d1d..635682d9a4d 100644 --- a/vsprojects/vcxproj/test/end2end_test_cancel_after_client_done/end2end_test_cancel_after_client_done.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_cancel_after_client_done/end2end_test_cancel_after_client_done.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_cancel_after_invoke/end2end_test_cancel_after_invoke.vcxproj b/vsprojects/vcxproj/test/end2end_test_cancel_after_invoke/end2end_test_cancel_after_invoke.vcxproj index ce4d238d1d5..30b7abc686d 100644 --- a/vsprojects/vcxproj/test/end2end_test_cancel_after_invoke/end2end_test_cancel_after_invoke.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_cancel_after_invoke/end2end_test_cancel_after_invoke.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_cancel_before_invoke/end2end_test_cancel_before_invoke.vcxproj b/vsprojects/vcxproj/test/end2end_test_cancel_before_invoke/end2end_test_cancel_before_invoke.vcxproj index f9d63ce5951..1a542f629f6 100644 --- a/vsprojects/vcxproj/test/end2end_test_cancel_before_invoke/end2end_test_cancel_before_invoke.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_cancel_before_invoke/end2end_test_cancel_before_invoke.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_cancel_in_a_vacuum/end2end_test_cancel_in_a_vacuum.vcxproj b/vsprojects/vcxproj/test/end2end_test_cancel_in_a_vacuum/end2end_test_cancel_in_a_vacuum.vcxproj index 49e0e0bd2d1..918f9baa36c 100644 --- a/vsprojects/vcxproj/test/end2end_test_cancel_in_a_vacuum/end2end_test_cancel_in_a_vacuum.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_cancel_in_a_vacuum/end2end_test_cancel_in_a_vacuum.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_census_simple_request/end2end_test_census_simple_request.vcxproj b/vsprojects/vcxproj/test/end2end_test_census_simple_request/end2end_test_census_simple_request.vcxproj index a4a9db86200..2b08806a697 100644 --- a/vsprojects/vcxproj/test/end2end_test_census_simple_request/end2end_test_census_simple_request.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_census_simple_request/end2end_test_census_simple_request.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_channel_connectivity/end2end_test_channel_connectivity.vcxproj b/vsprojects/vcxproj/test/end2end_test_channel_connectivity/end2end_test_channel_connectivity.vcxproj index 29cc0c19a93..a5e42dc4d03 100644 --- a/vsprojects/vcxproj/test/end2end_test_channel_connectivity/end2end_test_channel_connectivity.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_channel_connectivity/end2end_test_channel_connectivity.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_compressed_payload/end2end_test_compressed_payload.vcxproj b/vsprojects/vcxproj/test/end2end_test_compressed_payload/end2end_test_compressed_payload.vcxproj index fd25159dc74..13261adf8aa 100644 --- a/vsprojects/vcxproj/test/end2end_test_compressed_payload/end2end_test_compressed_payload.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_compressed_payload/end2end_test_compressed_payload.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_default_host/end2end_test_default_host.vcxproj b/vsprojects/vcxproj/test/end2end_test_default_host/end2end_test_default_host.vcxproj index 3fdde8270d5..d677604db4b 100644 --- a/vsprojects/vcxproj/test/end2end_test_default_host/end2end_test_default_host.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_default_host/end2end_test_default_host.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_disappearing_server/end2end_test_disappearing_server.vcxproj b/vsprojects/vcxproj/test/end2end_test_disappearing_server/end2end_test_disappearing_server.vcxproj index 5104517f986..a1d62fa976a 100644 --- a/vsprojects/vcxproj/test/end2end_test_disappearing_server/end2end_test_disappearing_server.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_disappearing_server/end2end_test_disappearing_server.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_empty_batch/end2end_test_empty_batch.vcxproj b/vsprojects/vcxproj/test/end2end_test_empty_batch/end2end_test_empty_batch.vcxproj index d90a9142d2a..ab74bb532f2 100644 --- a/vsprojects/vcxproj/test/end2end_test_empty_batch/end2end_test_empty_batch.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_empty_batch/end2end_test_empty_batch.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_graceful_server_shutdown/end2end_test_graceful_server_shutdown.vcxproj b/vsprojects/vcxproj/test/end2end_test_graceful_server_shutdown/end2end_test_graceful_server_shutdown.vcxproj index 312bcc8e1ef..8d7622afa0b 100644 --- a/vsprojects/vcxproj/test/end2end_test_graceful_server_shutdown/end2end_test_graceful_server_shutdown.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_graceful_server_shutdown/end2end_test_graceful_server_shutdown.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_high_initial_seqno/end2end_test_high_initial_seqno.vcxproj b/vsprojects/vcxproj/test/end2end_test_high_initial_seqno/end2end_test_high_initial_seqno.vcxproj index c79be0416c4..0e088caa650 100644 --- a/vsprojects/vcxproj/test/end2end_test_high_initial_seqno/end2end_test_high_initial_seqno.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_high_initial_seqno/end2end_test_high_initial_seqno.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_invoke_large_request/end2end_test_invoke_large_request.vcxproj b/vsprojects/vcxproj/test/end2end_test_invoke_large_request/end2end_test_invoke_large_request.vcxproj index 6f2416340bb..c5372cdbc65 100644 --- a/vsprojects/vcxproj/test/end2end_test_invoke_large_request/end2end_test_invoke_large_request.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_invoke_large_request/end2end_test_invoke_large_request.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_large_metadata/end2end_test_large_metadata.vcxproj b/vsprojects/vcxproj/test/end2end_test_large_metadata/end2end_test_large_metadata.vcxproj index c999873e144..b289b19c34f 100644 --- a/vsprojects/vcxproj/test/end2end_test_large_metadata/end2end_test_large_metadata.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_large_metadata/end2end_test_large_metadata.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_max_concurrent_streams/end2end_test_max_concurrent_streams.vcxproj b/vsprojects/vcxproj/test/end2end_test_max_concurrent_streams/end2end_test_max_concurrent_streams.vcxproj index 9e40516ef85..e868bfa220e 100644 --- a/vsprojects/vcxproj/test/end2end_test_max_concurrent_streams/end2end_test_max_concurrent_streams.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_max_concurrent_streams/end2end_test_max_concurrent_streams.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_max_message_length/end2end_test_max_message_length.vcxproj b/vsprojects/vcxproj/test/end2end_test_max_message_length/end2end_test_max_message_length.vcxproj index e112ec2508a..b8c0ca85f8a 100644 --- a/vsprojects/vcxproj/test/end2end_test_max_message_length/end2end_test_max_message_length.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_max_message_length/end2end_test_max_message_length.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_metadata/end2end_test_metadata.vcxproj b/vsprojects/vcxproj/test/end2end_test_metadata/end2end_test_metadata.vcxproj index 65d2168f16d..5e36bb8b6fd 100644 --- a/vsprojects/vcxproj/test/end2end_test_metadata/end2end_test_metadata.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_metadata/end2end_test_metadata.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_no_op/end2end_test_no_op.vcxproj b/vsprojects/vcxproj/test/end2end_test_no_op/end2end_test_no_op.vcxproj index b33043e5e11..54f54a3685c 100644 --- a/vsprojects/vcxproj/test/end2end_test_no_op/end2end_test_no_op.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_no_op/end2end_test_no_op.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_payload/end2end_test_payload.vcxproj b/vsprojects/vcxproj/test/end2end_test_payload/end2end_test_payload.vcxproj index 6c45599c6af..228323c9924 100644 --- a/vsprojects/vcxproj/test/end2end_test_payload/end2end_test_payload.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_payload/end2end_test_payload.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_ping_pong_streaming/end2end_test_ping_pong_streaming.vcxproj b/vsprojects/vcxproj/test/end2end_test_ping_pong_streaming/end2end_test_ping_pong_streaming.vcxproj index b6e0cd35495..87c5ea0175f 100644 --- a/vsprojects/vcxproj/test/end2end_test_ping_pong_streaming/end2end_test_ping_pong_streaming.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_ping_pong_streaming/end2end_test_ping_pong_streaming.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_registered_call/end2end_test_registered_call.vcxproj b/vsprojects/vcxproj/test/end2end_test_registered_call/end2end_test_registered_call.vcxproj index 7e6496d6408..56d2593a9ca 100644 --- a/vsprojects/vcxproj/test/end2end_test_registered_call/end2end_test_registered_call.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_registered_call/end2end_test_registered_call.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_request_with_flags/end2end_test_request_with_flags.vcxproj b/vsprojects/vcxproj/test/end2end_test_request_with_flags/end2end_test_request_with_flags.vcxproj index 925297e6134..cdb334a2505 100644 --- a/vsprojects/vcxproj/test/end2end_test_request_with_flags/end2end_test_request_with_flags.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_request_with_flags/end2end_test_request_with_flags.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_request_with_payload/end2end_test_request_with_payload.vcxproj b/vsprojects/vcxproj/test/end2end_test_request_with_payload/end2end_test_request_with_payload.vcxproj index 044f1c01fab..9ddcf67ce5d 100644 --- a/vsprojects/vcxproj/test/end2end_test_request_with_payload/end2end_test_request_with_payload.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_request_with_payload/end2end_test_request_with_payload.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_server_finishes_request/end2end_test_server_finishes_request.vcxproj b/vsprojects/vcxproj/test/end2end_test_server_finishes_request/end2end_test_server_finishes_request.vcxproj index ee74f02d6dc..c1f33ba47f6 100644 --- a/vsprojects/vcxproj/test/end2end_test_server_finishes_request/end2end_test_server_finishes_request.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_server_finishes_request/end2end_test_server_finishes_request.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_shutdown_finishes_calls/end2end_test_shutdown_finishes_calls.vcxproj b/vsprojects/vcxproj/test/end2end_test_shutdown_finishes_calls/end2end_test_shutdown_finishes_calls.vcxproj index 2acec97286f..0ae7db6ff30 100644 --- a/vsprojects/vcxproj/test/end2end_test_shutdown_finishes_calls/end2end_test_shutdown_finishes_calls.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_shutdown_finishes_calls/end2end_test_shutdown_finishes_calls.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_shutdown_finishes_tags/end2end_test_shutdown_finishes_tags.vcxproj b/vsprojects/vcxproj/test/end2end_test_shutdown_finishes_tags/end2end_test_shutdown_finishes_tags.vcxproj index 6e4938cd0ea..418d1de0355 100644 --- a/vsprojects/vcxproj/test/end2end_test_shutdown_finishes_tags/end2end_test_shutdown_finishes_tags.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_shutdown_finishes_tags/end2end_test_shutdown_finishes_tags.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_simple_delayed_request/end2end_test_simple_delayed_request.vcxproj b/vsprojects/vcxproj/test/end2end_test_simple_delayed_request/end2end_test_simple_delayed_request.vcxproj index d34e8da0f7e..c85b45c3e58 100644 --- a/vsprojects/vcxproj/test/end2end_test_simple_delayed_request/end2end_test_simple_delayed_request.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_simple_delayed_request/end2end_test_simple_delayed_request.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_simple_request/end2end_test_simple_request.vcxproj b/vsprojects/vcxproj/test/end2end_test_simple_request/end2end_test_simple_request.vcxproj index 0e170f43a99..bc9c7591caa 100644 --- a/vsprojects/vcxproj/test/end2end_test_simple_request/end2end_test_simple_request.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_simple_request/end2end_test_simple_request.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/end2end_test_trailing_metadata/end2end_test_trailing_metadata.vcxproj b/vsprojects/vcxproj/test/end2end_test_trailing_metadata/end2end_test_trailing_metadata.vcxproj index 4d50a6ab134..47592d2e0e7 100644 --- a/vsprojects/vcxproj/test/end2end_test_trailing_metadata/end2end_test_trailing_metadata.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test_trailing_metadata/end2end_test_trailing_metadata.vcxproj @@ -65,6 +65,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -79,6 +80,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Windows @@ -95,6 +97,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Windows @@ -113,6 +116,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Windows diff --git a/vsprojects/vcxproj/test/endpoint_pair_test/endpoint_pair_test.vcxproj b/vsprojects/vcxproj/test/endpoint_pair_test/endpoint_pair_test.vcxproj index a8550d843e9..8586ee8049a 100644 --- a/vsprojects/vcxproj/test/endpoint_pair_test/endpoint_pair_test.vcxproj +++ b/vsprojects/vcxproj/test/endpoint_pair_test/endpoint_pair_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/fling_client/fling_client.vcxproj b/vsprojects/vcxproj/test/fling_client/fling_client.vcxproj index f24a2e5e87f..7248305124b 100644 --- a/vsprojects/vcxproj/test/fling_client/fling_client.vcxproj +++ b/vsprojects/vcxproj/test/fling_client/fling_client.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/fling_server/fling_server.vcxproj b/vsprojects/vcxproj/test/fling_server/fling_server.vcxproj index de8a5bc98aa..55fb4c0a64d 100644 --- a/vsprojects/vcxproj/test/fling_server/fling_server.vcxproj +++ b/vsprojects/vcxproj/test/fling_server/fling_server.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/generic_end2end_test/generic_end2end_test.vcxproj b/vsprojects/vcxproj/test/generic_end2end_test/generic_end2end_test.vcxproj index 1ac1766d518..0525818740e 100644 --- a/vsprojects/vcxproj/test/generic_end2end_test/generic_end2end_test.vcxproj +++ b/vsprojects/vcxproj/test/generic_end2end_test/generic_end2end_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_cmdline_test/gpr_cmdline_test.vcxproj b/vsprojects/vcxproj/test/gpr_cmdline_test/gpr_cmdline_test.vcxproj index 911d4253815..65422c98dbe 100644 --- a/vsprojects/vcxproj/test/gpr_cmdline_test/gpr_cmdline_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_cmdline_test/gpr_cmdline_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_env_test/gpr_env_test.vcxproj b/vsprojects/vcxproj/test/gpr_env_test/gpr_env_test.vcxproj index ae8d4f3d631..78ca9580eb2 100644 --- a/vsprojects/vcxproj/test/gpr_env_test/gpr_env_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_env_test/gpr_env_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_file_test/gpr_file_test.vcxproj b/vsprojects/vcxproj/test/gpr_file_test/gpr_file_test.vcxproj index c816708eaf3..6ca92ee9375 100644 --- a/vsprojects/vcxproj/test/gpr_file_test/gpr_file_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_file_test/gpr_file_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_histogram_test/gpr_histogram_test.vcxproj b/vsprojects/vcxproj/test/gpr_histogram_test/gpr_histogram_test.vcxproj index 6e66cdd78b8..f6bea9bc558 100644 --- a/vsprojects/vcxproj/test/gpr_histogram_test/gpr_histogram_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_histogram_test/gpr_histogram_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_host_port_test/gpr_host_port_test.vcxproj b/vsprojects/vcxproj/test/gpr_host_port_test/gpr_host_port_test.vcxproj index 73d23e98a96..160a6685e52 100644 --- a/vsprojects/vcxproj/test/gpr_host_port_test/gpr_host_port_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_host_port_test/gpr_host_port_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_log_test/gpr_log_test.vcxproj b/vsprojects/vcxproj/test/gpr_log_test/gpr_log_test.vcxproj index da1553a96e7..1626b4c58c1 100644 --- a/vsprojects/vcxproj/test/gpr_log_test/gpr_log_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_log_test/gpr_log_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_slice_buffer_test/gpr_slice_buffer_test.vcxproj b/vsprojects/vcxproj/test/gpr_slice_buffer_test/gpr_slice_buffer_test.vcxproj index 1f8a347104f..ae90e3cae5a 100644 --- a/vsprojects/vcxproj/test/gpr_slice_buffer_test/gpr_slice_buffer_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_slice_buffer_test/gpr_slice_buffer_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_slice_test/gpr_slice_test.vcxproj b/vsprojects/vcxproj/test/gpr_slice_test/gpr_slice_test.vcxproj index 036960afa46..145dd71d03a 100644 --- a/vsprojects/vcxproj/test/gpr_slice_test/gpr_slice_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_slice_test/gpr_slice_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_stack_lockfree_test/gpr_stack_lockfree_test.vcxproj b/vsprojects/vcxproj/test/gpr_stack_lockfree_test/gpr_stack_lockfree_test.vcxproj index 411a16d6a25..ce882f2d470 100644 --- a/vsprojects/vcxproj/test/gpr_stack_lockfree_test/gpr_stack_lockfree_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_stack_lockfree_test/gpr_stack_lockfree_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_string_test/gpr_string_test.vcxproj b/vsprojects/vcxproj/test/gpr_string_test/gpr_string_test.vcxproj index b6ca18c6166..dfe17cd382f 100644 --- a/vsprojects/vcxproj/test/gpr_string_test/gpr_string_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_string_test/gpr_string_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_sync_test/gpr_sync_test.vcxproj b/vsprojects/vcxproj/test/gpr_sync_test/gpr_sync_test.vcxproj index cb77d67cc25..413f0151fea 100644 --- a/vsprojects/vcxproj/test/gpr_sync_test/gpr_sync_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_sync_test/gpr_sync_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_thd_test/gpr_thd_test.vcxproj b/vsprojects/vcxproj/test/gpr_thd_test/gpr_thd_test.vcxproj index 9de3efde2f8..1b264b6b6a3 100644 --- a/vsprojects/vcxproj/test/gpr_thd_test/gpr_thd_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_thd_test/gpr_thd_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_time_test/gpr_time_test.vcxproj b/vsprojects/vcxproj/test/gpr_time_test/gpr_time_test.vcxproj index 6650653f86f..843493c3fa9 100644 --- a/vsprojects/vcxproj/test/gpr_time_test/gpr_time_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_time_test/gpr_time_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_tls_test/gpr_tls_test.vcxproj b/vsprojects/vcxproj/test/gpr_tls_test/gpr_tls_test.vcxproj index baf1ff7db51..1d518ad4196 100644 --- a/vsprojects/vcxproj/test/gpr_tls_test/gpr_tls_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_tls_test/gpr_tls_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/gpr_useful_test/gpr_useful_test.vcxproj b/vsprojects/vcxproj/test/gpr_useful_test/gpr_useful_test.vcxproj index 85b18af6203..d8ab9f2bfd0 100644 --- a/vsprojects/vcxproj/test/gpr_useful_test/gpr_useful_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_useful_test/gpr_useful_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/grpc_auth_context_test/grpc_auth_context_test.vcxproj b/vsprojects/vcxproj/test/grpc_auth_context_test/grpc_auth_context_test.vcxproj index a9021b5d746..b2aef1081e0 100644 --- a/vsprojects/vcxproj/test/grpc_auth_context_test/grpc_auth_context_test.vcxproj +++ b/vsprojects/vcxproj/test/grpc_auth_context_test/grpc_auth_context_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/grpc_base64_test/grpc_base64_test.vcxproj b/vsprojects/vcxproj/test/grpc_base64_test/grpc_base64_test.vcxproj index 41eaac0269e..c2214c6fdf5 100644 --- a/vsprojects/vcxproj/test/grpc_base64_test/grpc_base64_test.vcxproj +++ b/vsprojects/vcxproj/test/grpc_base64_test/grpc_base64_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/grpc_byte_buffer_reader_test/grpc_byte_buffer_reader_test.vcxproj b/vsprojects/vcxproj/test/grpc_byte_buffer_reader_test/grpc_byte_buffer_reader_test.vcxproj index ab075a34b30..99cfae34f6c 100644 --- a/vsprojects/vcxproj/test/grpc_byte_buffer_reader_test/grpc_byte_buffer_reader_test.vcxproj +++ b/vsprojects/vcxproj/test/grpc_byte_buffer_reader_test/grpc_byte_buffer_reader_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/grpc_channel_args_test/grpc_channel_args_test.vcxproj b/vsprojects/vcxproj/test/grpc_channel_args_test/grpc_channel_args_test.vcxproj index 304289d6d67..60948c917a2 100644 --- a/vsprojects/vcxproj/test/grpc_channel_args_test/grpc_channel_args_test.vcxproj +++ b/vsprojects/vcxproj/test/grpc_channel_args_test/grpc_channel_args_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/grpc_channel_stack_test/grpc_channel_stack_test.vcxproj b/vsprojects/vcxproj/test/grpc_channel_stack_test/grpc_channel_stack_test.vcxproj index 5974c9b0b69..70eb8eb00cd 100644 --- a/vsprojects/vcxproj/test/grpc_channel_stack_test/grpc_channel_stack_test.vcxproj +++ b/vsprojects/vcxproj/test/grpc_channel_stack_test/grpc_channel_stack_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/grpc_cli/grpc_cli.vcxproj b/vsprojects/vcxproj/test/grpc_cli/grpc_cli.vcxproj index 44c176a0930..c2cfad5ab78 100644 --- a/vsprojects/vcxproj/test/grpc_cli/grpc_cli.vcxproj +++ b/vsprojects/vcxproj/test/grpc_cli/grpc_cli.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/grpc_completion_queue_test/grpc_completion_queue_test.vcxproj b/vsprojects/vcxproj/test/grpc_completion_queue_test/grpc_completion_queue_test.vcxproj index eb77ac460b8..4eff5324dc3 100644 --- a/vsprojects/vcxproj/test/grpc_completion_queue_test/grpc_completion_queue_test.vcxproj +++ b/vsprojects/vcxproj/test/grpc_completion_queue_test/grpc_completion_queue_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/grpc_credentials_test/grpc_credentials_test.vcxproj b/vsprojects/vcxproj/test/grpc_credentials_test/grpc_credentials_test.vcxproj index 779b95949b7..124959b0388 100644 --- a/vsprojects/vcxproj/test/grpc_credentials_test/grpc_credentials_test.vcxproj +++ b/vsprojects/vcxproj/test/grpc_credentials_test/grpc_credentials_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/grpc_jwt_verifier_test/grpc_jwt_verifier_test.vcxproj b/vsprojects/vcxproj/test/grpc_jwt_verifier_test/grpc_jwt_verifier_test.vcxproj index f29306c05ca..adc801126c4 100644 --- a/vsprojects/vcxproj/test/grpc_jwt_verifier_test/grpc_jwt_verifier_test.vcxproj +++ b/vsprojects/vcxproj/test/grpc_jwt_verifier_test/grpc_jwt_verifier_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/grpc_security_connector_test/grpc_security_connector_test.vcxproj b/vsprojects/vcxproj/test/grpc_security_connector_test/grpc_security_connector_test.vcxproj index a6a42d2e09b..7f5730eef50 100644 --- a/vsprojects/vcxproj/test/grpc_security_connector_test/grpc_security_connector_test.vcxproj +++ b/vsprojects/vcxproj/test/grpc_security_connector_test/grpc_security_connector_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/grpc_stream_op_test/grpc_stream_op_test.vcxproj b/vsprojects/vcxproj/test/grpc_stream_op_test/grpc_stream_op_test.vcxproj index e6ae57978fc..bc46f36ad9b 100644 --- a/vsprojects/vcxproj/test/grpc_stream_op_test/grpc_stream_op_test.vcxproj +++ b/vsprojects/vcxproj/test/grpc_stream_op_test/grpc_stream_op_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_bad_hostname_nosec_test/h2_compress_bad_hostname_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_bad_hostname_nosec_test/h2_compress_bad_hostname_nosec_test.vcxproj index 2b9186f10b3..4858d758fbd 100644 --- a/vsprojects/vcxproj/test/h2_compress_bad_hostname_nosec_test/h2_compress_bad_hostname_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_bad_hostname_nosec_test/h2_compress_bad_hostname_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_bad_hostname_test/h2_compress_bad_hostname_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_bad_hostname_test/h2_compress_bad_hostname_test.vcxproj index e5854789bd5..8ed05c155d7 100644 --- a/vsprojects/vcxproj/test/h2_compress_bad_hostname_test/h2_compress_bad_hostname_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_bad_hostname_test/h2_compress_bad_hostname_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_binary_metadata_nosec_test/h2_compress_binary_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_binary_metadata_nosec_test/h2_compress_binary_metadata_nosec_test.vcxproj index 8d4e07f54b3..81c03767619 100644 --- a/vsprojects/vcxproj/test/h2_compress_binary_metadata_nosec_test/h2_compress_binary_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_binary_metadata_nosec_test/h2_compress_binary_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_binary_metadata_test/h2_compress_binary_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_binary_metadata_test/h2_compress_binary_metadata_test.vcxproj index 48d043888cd..be6a26d26f9 100644 --- a/vsprojects/vcxproj/test/h2_compress_binary_metadata_test/h2_compress_binary_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_binary_metadata_test/h2_compress_binary_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_call_creds_test/h2_compress_call_creds_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_call_creds_test/h2_compress_call_creds_test.vcxproj index f1a2afbfce7..7dad4ba8f0d 100644 --- a/vsprojects/vcxproj/test/h2_compress_call_creds_test/h2_compress_call_creds_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_call_creds_test/h2_compress_call_creds_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_cancel_after_accept_nosec_test/h2_compress_cancel_after_accept_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_cancel_after_accept_nosec_test/h2_compress_cancel_after_accept_nosec_test.vcxproj index c93ffb4cc36..53fc2bec980 100644 --- a/vsprojects/vcxproj/test/h2_compress_cancel_after_accept_nosec_test/h2_compress_cancel_after_accept_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_cancel_after_accept_nosec_test/h2_compress_cancel_after_accept_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_cancel_after_accept_test/h2_compress_cancel_after_accept_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_cancel_after_accept_test/h2_compress_cancel_after_accept_test.vcxproj index d7a560343be..1aba15483ef 100644 --- a/vsprojects/vcxproj/test/h2_compress_cancel_after_accept_test/h2_compress_cancel_after_accept_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_cancel_after_accept_test/h2_compress_cancel_after_accept_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_cancel_after_client_done_nosec_test/h2_compress_cancel_after_client_done_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_cancel_after_client_done_nosec_test/h2_compress_cancel_after_client_done_nosec_test.vcxproj index d3e32c3cfac..baadabb3bd0 100644 --- a/vsprojects/vcxproj/test/h2_compress_cancel_after_client_done_nosec_test/h2_compress_cancel_after_client_done_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_cancel_after_client_done_nosec_test/h2_compress_cancel_after_client_done_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_cancel_after_client_done_test/h2_compress_cancel_after_client_done_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_cancel_after_client_done_test/h2_compress_cancel_after_client_done_test.vcxproj index 9f07d9ccc45..32e39520c71 100644 --- a/vsprojects/vcxproj/test/h2_compress_cancel_after_client_done_test/h2_compress_cancel_after_client_done_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_cancel_after_client_done_test/h2_compress_cancel_after_client_done_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_cancel_after_invoke_nosec_test/h2_compress_cancel_after_invoke_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_cancel_after_invoke_nosec_test/h2_compress_cancel_after_invoke_nosec_test.vcxproj index d716a0d6730..1eef61c46e4 100644 --- a/vsprojects/vcxproj/test/h2_compress_cancel_after_invoke_nosec_test/h2_compress_cancel_after_invoke_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_cancel_after_invoke_nosec_test/h2_compress_cancel_after_invoke_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_cancel_after_invoke_test/h2_compress_cancel_after_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_cancel_after_invoke_test/h2_compress_cancel_after_invoke_test.vcxproj index dfcb4636bac..9b46f69b665 100644 --- a/vsprojects/vcxproj/test/h2_compress_cancel_after_invoke_test/h2_compress_cancel_after_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_cancel_after_invoke_test/h2_compress_cancel_after_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_cancel_before_invoke_nosec_test/h2_compress_cancel_before_invoke_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_cancel_before_invoke_nosec_test/h2_compress_cancel_before_invoke_nosec_test.vcxproj index 39f06fe3bcd..fb8ed12552e 100644 --- a/vsprojects/vcxproj/test/h2_compress_cancel_before_invoke_nosec_test/h2_compress_cancel_before_invoke_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_cancel_before_invoke_nosec_test/h2_compress_cancel_before_invoke_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_cancel_before_invoke_test/h2_compress_cancel_before_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_cancel_before_invoke_test/h2_compress_cancel_before_invoke_test.vcxproj index 1b0399161ac..e1b2fddcd9f 100644 --- a/vsprojects/vcxproj/test/h2_compress_cancel_before_invoke_test/h2_compress_cancel_before_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_cancel_before_invoke_test/h2_compress_cancel_before_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_cancel_in_a_vacuum_nosec_test/h2_compress_cancel_in_a_vacuum_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_cancel_in_a_vacuum_nosec_test/h2_compress_cancel_in_a_vacuum_nosec_test.vcxproj index 736642165e5..4a4d0cea5ef 100644 --- a/vsprojects/vcxproj/test/h2_compress_cancel_in_a_vacuum_nosec_test/h2_compress_cancel_in_a_vacuum_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_cancel_in_a_vacuum_nosec_test/h2_compress_cancel_in_a_vacuum_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_cancel_in_a_vacuum_test/h2_compress_cancel_in_a_vacuum_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_cancel_in_a_vacuum_test/h2_compress_cancel_in_a_vacuum_test.vcxproj index 0ffd5d95b7c..0ae659cacff 100644 --- a/vsprojects/vcxproj/test/h2_compress_cancel_in_a_vacuum_test/h2_compress_cancel_in_a_vacuum_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_cancel_in_a_vacuum_test/h2_compress_cancel_in_a_vacuum_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_census_simple_request_nosec_test/h2_compress_census_simple_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_census_simple_request_nosec_test/h2_compress_census_simple_request_nosec_test.vcxproj index f4c1c9c4ff2..22dde131a5f 100644 --- a/vsprojects/vcxproj/test/h2_compress_census_simple_request_nosec_test/h2_compress_census_simple_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_census_simple_request_nosec_test/h2_compress_census_simple_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_census_simple_request_test/h2_compress_census_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_census_simple_request_test/h2_compress_census_simple_request_test.vcxproj index 9da30f5d24f..8a98ea07b8c 100644 --- a/vsprojects/vcxproj/test/h2_compress_census_simple_request_test/h2_compress_census_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_census_simple_request_test/h2_compress_census_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_channel_connectivity_nosec_test/h2_compress_channel_connectivity_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_channel_connectivity_nosec_test/h2_compress_channel_connectivity_nosec_test.vcxproj index 90856ca11f0..99e72303f1e 100644 --- a/vsprojects/vcxproj/test/h2_compress_channel_connectivity_nosec_test/h2_compress_channel_connectivity_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_channel_connectivity_nosec_test/h2_compress_channel_connectivity_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_channel_connectivity_test/h2_compress_channel_connectivity_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_channel_connectivity_test/h2_compress_channel_connectivity_test.vcxproj index 9e525a0f411..ed1d0006185 100644 --- a/vsprojects/vcxproj/test/h2_compress_channel_connectivity_test/h2_compress_channel_connectivity_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_channel_connectivity_test/h2_compress_channel_connectivity_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_compressed_payload_nosec_test/h2_compress_compressed_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_compressed_payload_nosec_test/h2_compress_compressed_payload_nosec_test.vcxproj index 339b9aa3dd7..217e357097b 100644 --- a/vsprojects/vcxproj/test/h2_compress_compressed_payload_nosec_test/h2_compress_compressed_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_compressed_payload_nosec_test/h2_compress_compressed_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_compressed_payload_test/h2_compress_compressed_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_compressed_payload_test/h2_compress_compressed_payload_test.vcxproj index f7feafb6fb1..6ba296a5bc7 100644 --- a/vsprojects/vcxproj/test/h2_compress_compressed_payload_test/h2_compress_compressed_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_compressed_payload_test/h2_compress_compressed_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_default_host_nosec_test/h2_compress_default_host_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_default_host_nosec_test/h2_compress_default_host_nosec_test.vcxproj index 00a79cb5ffe..9fb7bc41ec6 100644 --- a/vsprojects/vcxproj/test/h2_compress_default_host_nosec_test/h2_compress_default_host_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_default_host_nosec_test/h2_compress_default_host_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_default_host_test/h2_compress_default_host_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_default_host_test/h2_compress_default_host_test.vcxproj index ea049053a60..b09ab659f71 100644 --- a/vsprojects/vcxproj/test/h2_compress_default_host_test/h2_compress_default_host_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_default_host_test/h2_compress_default_host_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_disappearing_server_nosec_test/h2_compress_disappearing_server_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_disappearing_server_nosec_test/h2_compress_disappearing_server_nosec_test.vcxproj index 731c9ff4e81..ffc42a170eb 100644 --- a/vsprojects/vcxproj/test/h2_compress_disappearing_server_nosec_test/h2_compress_disappearing_server_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_disappearing_server_nosec_test/h2_compress_disappearing_server_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_disappearing_server_test/h2_compress_disappearing_server_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_disappearing_server_test/h2_compress_disappearing_server_test.vcxproj index a1ad2c3132b..1abd723389c 100644 --- a/vsprojects/vcxproj/test/h2_compress_disappearing_server_test/h2_compress_disappearing_server_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_disappearing_server_test/h2_compress_disappearing_server_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_empty_batch_nosec_test/h2_compress_empty_batch_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_empty_batch_nosec_test/h2_compress_empty_batch_nosec_test.vcxproj index 37bdb0e9c95..e9473823d19 100644 --- a/vsprojects/vcxproj/test/h2_compress_empty_batch_nosec_test/h2_compress_empty_batch_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_empty_batch_nosec_test/h2_compress_empty_batch_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_empty_batch_test/h2_compress_empty_batch_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_empty_batch_test/h2_compress_empty_batch_test.vcxproj index b8c59fe56f6..529a395eec4 100644 --- a/vsprojects/vcxproj/test/h2_compress_empty_batch_test/h2_compress_empty_batch_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_empty_batch_test/h2_compress_empty_batch_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_graceful_server_shutdown_nosec_test/h2_compress_graceful_server_shutdown_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_graceful_server_shutdown_nosec_test/h2_compress_graceful_server_shutdown_nosec_test.vcxproj index 550edaaa48b..cac3db20943 100644 --- a/vsprojects/vcxproj/test/h2_compress_graceful_server_shutdown_nosec_test/h2_compress_graceful_server_shutdown_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_graceful_server_shutdown_nosec_test/h2_compress_graceful_server_shutdown_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_graceful_server_shutdown_test/h2_compress_graceful_server_shutdown_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_graceful_server_shutdown_test/h2_compress_graceful_server_shutdown_test.vcxproj index f931daf39eb..21527b80f10 100644 --- a/vsprojects/vcxproj/test/h2_compress_graceful_server_shutdown_test/h2_compress_graceful_server_shutdown_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_graceful_server_shutdown_test/h2_compress_graceful_server_shutdown_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_high_initial_seqno_nosec_test/h2_compress_high_initial_seqno_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_high_initial_seqno_nosec_test/h2_compress_high_initial_seqno_nosec_test.vcxproj index dd8aa5dd1a0..909bd7b8efc 100644 --- a/vsprojects/vcxproj/test/h2_compress_high_initial_seqno_nosec_test/h2_compress_high_initial_seqno_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_high_initial_seqno_nosec_test/h2_compress_high_initial_seqno_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_high_initial_seqno_test/h2_compress_high_initial_seqno_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_high_initial_seqno_test/h2_compress_high_initial_seqno_test.vcxproj index 60eb1822995..0cedd5cba96 100644 --- a/vsprojects/vcxproj/test/h2_compress_high_initial_seqno_test/h2_compress_high_initial_seqno_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_high_initial_seqno_test/h2_compress_high_initial_seqno_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_invoke_large_request_nosec_test/h2_compress_invoke_large_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_invoke_large_request_nosec_test/h2_compress_invoke_large_request_nosec_test.vcxproj index 5829f7f9f83..3cfbff56c79 100644 --- a/vsprojects/vcxproj/test/h2_compress_invoke_large_request_nosec_test/h2_compress_invoke_large_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_invoke_large_request_nosec_test/h2_compress_invoke_large_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_invoke_large_request_test/h2_compress_invoke_large_request_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_invoke_large_request_test/h2_compress_invoke_large_request_test.vcxproj index 2c30940e641..be31f12e1f7 100644 --- a/vsprojects/vcxproj/test/h2_compress_invoke_large_request_test/h2_compress_invoke_large_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_invoke_large_request_test/h2_compress_invoke_large_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_large_metadata_nosec_test/h2_compress_large_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_large_metadata_nosec_test/h2_compress_large_metadata_nosec_test.vcxproj index 6f3ba0e35d9..1ea061bbe13 100644 --- a/vsprojects/vcxproj/test/h2_compress_large_metadata_nosec_test/h2_compress_large_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_large_metadata_nosec_test/h2_compress_large_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_large_metadata_test/h2_compress_large_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_large_metadata_test/h2_compress_large_metadata_test.vcxproj index be6b303af0d..916e561c1a0 100644 --- a/vsprojects/vcxproj/test/h2_compress_large_metadata_test/h2_compress_large_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_large_metadata_test/h2_compress_large_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_max_concurrent_streams_nosec_test/h2_compress_max_concurrent_streams_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_max_concurrent_streams_nosec_test/h2_compress_max_concurrent_streams_nosec_test.vcxproj index 5f7bdd2f1c8..97557879cd5 100644 --- a/vsprojects/vcxproj/test/h2_compress_max_concurrent_streams_nosec_test/h2_compress_max_concurrent_streams_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_max_concurrent_streams_nosec_test/h2_compress_max_concurrent_streams_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_max_concurrent_streams_test/h2_compress_max_concurrent_streams_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_max_concurrent_streams_test/h2_compress_max_concurrent_streams_test.vcxproj index 09a5dc8a59f..a31ae01207c 100644 --- a/vsprojects/vcxproj/test/h2_compress_max_concurrent_streams_test/h2_compress_max_concurrent_streams_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_max_concurrent_streams_test/h2_compress_max_concurrent_streams_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_max_message_length_nosec_test/h2_compress_max_message_length_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_max_message_length_nosec_test/h2_compress_max_message_length_nosec_test.vcxproj index 0c44d034f21..e3c98bb76d4 100644 --- a/vsprojects/vcxproj/test/h2_compress_max_message_length_nosec_test/h2_compress_max_message_length_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_max_message_length_nosec_test/h2_compress_max_message_length_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_max_message_length_test/h2_compress_max_message_length_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_max_message_length_test/h2_compress_max_message_length_test.vcxproj index 8c806c7cc5c..ce21ae30e32 100644 --- a/vsprojects/vcxproj/test/h2_compress_max_message_length_test/h2_compress_max_message_length_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_max_message_length_test/h2_compress_max_message_length_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_metadata_nosec_test/h2_compress_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_metadata_nosec_test/h2_compress_metadata_nosec_test.vcxproj index 0a2a3a008d3..8a4b46e086e 100644 --- a/vsprojects/vcxproj/test/h2_compress_metadata_nosec_test/h2_compress_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_metadata_nosec_test/h2_compress_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_metadata_test/h2_compress_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_metadata_test/h2_compress_metadata_test.vcxproj index 9abd811e389..cab1e2f3871 100644 --- a/vsprojects/vcxproj/test/h2_compress_metadata_test/h2_compress_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_metadata_test/h2_compress_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_no_op_nosec_test/h2_compress_no_op_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_no_op_nosec_test/h2_compress_no_op_nosec_test.vcxproj index 89d71568ef5..98979f0dca7 100644 --- a/vsprojects/vcxproj/test/h2_compress_no_op_nosec_test/h2_compress_no_op_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_no_op_nosec_test/h2_compress_no_op_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_no_op_test/h2_compress_no_op_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_no_op_test/h2_compress_no_op_test.vcxproj index d90693be207..e2942d108d1 100644 --- a/vsprojects/vcxproj/test/h2_compress_no_op_test/h2_compress_no_op_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_no_op_test/h2_compress_no_op_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_payload_nosec_test/h2_compress_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_payload_nosec_test/h2_compress_payload_nosec_test.vcxproj index 5d6e0ca86d4..5391d8d3612 100644 --- a/vsprojects/vcxproj/test/h2_compress_payload_nosec_test/h2_compress_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_payload_nosec_test/h2_compress_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_payload_test/h2_compress_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_payload_test/h2_compress_payload_test.vcxproj index af32006bb04..e4dafe67963 100644 --- a/vsprojects/vcxproj/test/h2_compress_payload_test/h2_compress_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_payload_test/h2_compress_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_ping_pong_streaming_nosec_test/h2_compress_ping_pong_streaming_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_ping_pong_streaming_nosec_test/h2_compress_ping_pong_streaming_nosec_test.vcxproj index 11142f0204b..dbf913aecf8 100644 --- a/vsprojects/vcxproj/test/h2_compress_ping_pong_streaming_nosec_test/h2_compress_ping_pong_streaming_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_ping_pong_streaming_nosec_test/h2_compress_ping_pong_streaming_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_ping_pong_streaming_test/h2_compress_ping_pong_streaming_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_ping_pong_streaming_test/h2_compress_ping_pong_streaming_test.vcxproj index 581a664404d..cd50217d73f 100644 --- a/vsprojects/vcxproj/test/h2_compress_ping_pong_streaming_test/h2_compress_ping_pong_streaming_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_ping_pong_streaming_test/h2_compress_ping_pong_streaming_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_registered_call_nosec_test/h2_compress_registered_call_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_registered_call_nosec_test/h2_compress_registered_call_nosec_test.vcxproj index 5048ea10569..66acde2bc9d 100644 --- a/vsprojects/vcxproj/test/h2_compress_registered_call_nosec_test/h2_compress_registered_call_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_registered_call_nosec_test/h2_compress_registered_call_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_registered_call_test/h2_compress_registered_call_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_registered_call_test/h2_compress_registered_call_test.vcxproj index 2a8648e10d8..41526607c2f 100644 --- a/vsprojects/vcxproj/test/h2_compress_registered_call_test/h2_compress_registered_call_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_registered_call_test/h2_compress_registered_call_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_request_with_flags_nosec_test/h2_compress_request_with_flags_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_request_with_flags_nosec_test/h2_compress_request_with_flags_nosec_test.vcxproj index f569fa6112e..962cb22755c 100644 --- a/vsprojects/vcxproj/test/h2_compress_request_with_flags_nosec_test/h2_compress_request_with_flags_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_request_with_flags_nosec_test/h2_compress_request_with_flags_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_request_with_flags_test/h2_compress_request_with_flags_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_request_with_flags_test/h2_compress_request_with_flags_test.vcxproj index 1001f3e0acc..9863f28eecd 100644 --- a/vsprojects/vcxproj/test/h2_compress_request_with_flags_test/h2_compress_request_with_flags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_request_with_flags_test/h2_compress_request_with_flags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_request_with_payload_nosec_test/h2_compress_request_with_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_request_with_payload_nosec_test/h2_compress_request_with_payload_nosec_test.vcxproj index 17904a7de0e..3af4c820116 100644 --- a/vsprojects/vcxproj/test/h2_compress_request_with_payload_nosec_test/h2_compress_request_with_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_request_with_payload_nosec_test/h2_compress_request_with_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_request_with_payload_test/h2_compress_request_with_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_request_with_payload_test/h2_compress_request_with_payload_test.vcxproj index 073619d1e02..9f663310d98 100644 --- a/vsprojects/vcxproj/test/h2_compress_request_with_payload_test/h2_compress_request_with_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_request_with_payload_test/h2_compress_request_with_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_server_finishes_request_nosec_test/h2_compress_server_finishes_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_server_finishes_request_nosec_test/h2_compress_server_finishes_request_nosec_test.vcxproj index df210215e15..1296461963d 100644 --- a/vsprojects/vcxproj/test/h2_compress_server_finishes_request_nosec_test/h2_compress_server_finishes_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_server_finishes_request_nosec_test/h2_compress_server_finishes_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_server_finishes_request_test/h2_compress_server_finishes_request_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_server_finishes_request_test/h2_compress_server_finishes_request_test.vcxproj index 6e872c6f2da..78d48d1d5b0 100644 --- a/vsprojects/vcxproj/test/h2_compress_server_finishes_request_test/h2_compress_server_finishes_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_server_finishes_request_test/h2_compress_server_finishes_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_calls_nosec_test/h2_compress_shutdown_finishes_calls_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_calls_nosec_test/h2_compress_shutdown_finishes_calls_nosec_test.vcxproj index 3c3520ac679..f91af9a4efd 100644 --- a/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_calls_nosec_test/h2_compress_shutdown_finishes_calls_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_calls_nosec_test/h2_compress_shutdown_finishes_calls_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_calls_test/h2_compress_shutdown_finishes_calls_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_calls_test/h2_compress_shutdown_finishes_calls_test.vcxproj index 8bb9eeec3df..89a9c489a00 100644 --- a/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_calls_test/h2_compress_shutdown_finishes_calls_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_calls_test/h2_compress_shutdown_finishes_calls_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_tags_nosec_test/h2_compress_shutdown_finishes_tags_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_tags_nosec_test/h2_compress_shutdown_finishes_tags_nosec_test.vcxproj index 97e44db0c33..6d79c089889 100644 --- a/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_tags_nosec_test/h2_compress_shutdown_finishes_tags_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_tags_nosec_test/h2_compress_shutdown_finishes_tags_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_tags_test/h2_compress_shutdown_finishes_tags_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_tags_test/h2_compress_shutdown_finishes_tags_test.vcxproj index bfb07f3748c..a8e6d68a0d9 100644 --- a/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_tags_test/h2_compress_shutdown_finishes_tags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_shutdown_finishes_tags_test/h2_compress_shutdown_finishes_tags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_simple_delayed_request_nosec_test/h2_compress_simple_delayed_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_simple_delayed_request_nosec_test/h2_compress_simple_delayed_request_nosec_test.vcxproj index fc52d3e11a4..41fbe7b6e6d 100644 --- a/vsprojects/vcxproj/test/h2_compress_simple_delayed_request_nosec_test/h2_compress_simple_delayed_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_simple_delayed_request_nosec_test/h2_compress_simple_delayed_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_simple_delayed_request_test/h2_compress_simple_delayed_request_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_simple_delayed_request_test/h2_compress_simple_delayed_request_test.vcxproj index 0009c262988..ecbbfbbe6b2 100644 --- a/vsprojects/vcxproj/test/h2_compress_simple_delayed_request_test/h2_compress_simple_delayed_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_simple_delayed_request_test/h2_compress_simple_delayed_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_simple_request_nosec_test/h2_compress_simple_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_simple_request_nosec_test/h2_compress_simple_request_nosec_test.vcxproj index ecb81c9f366..0a448f3d12b 100644 --- a/vsprojects/vcxproj/test/h2_compress_simple_request_nosec_test/h2_compress_simple_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_simple_request_nosec_test/h2_compress_simple_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_simple_request_test/h2_compress_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_simple_request_test/h2_compress_simple_request_test.vcxproj index cf6936fed0b..42476048999 100644 --- a/vsprojects/vcxproj/test/h2_compress_simple_request_test/h2_compress_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_simple_request_test/h2_compress_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_trailing_metadata_nosec_test/h2_compress_trailing_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_trailing_metadata_nosec_test/h2_compress_trailing_metadata_nosec_test.vcxproj index a69d783d606..247e53bf80e 100644 --- a/vsprojects/vcxproj/test/h2_compress_trailing_metadata_nosec_test/h2_compress_trailing_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_trailing_metadata_nosec_test/h2_compress_trailing_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_compress_trailing_metadata_test/h2_compress_trailing_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_compress_trailing_metadata_test/h2_compress_trailing_metadata_test.vcxproj index 68df70e75e2..12cc02ece78 100644 --- a/vsprojects/vcxproj/test/h2_compress_trailing_metadata_test/h2_compress_trailing_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_compress_trailing_metadata_test/h2_compress_trailing_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_bad_hostname_test/h2_fakesec_bad_hostname_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_bad_hostname_test/h2_fakesec_bad_hostname_test.vcxproj index bbd53aec873..57f10ac567f 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_bad_hostname_test/h2_fakesec_bad_hostname_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_bad_hostname_test/h2_fakesec_bad_hostname_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_binary_metadata_test/h2_fakesec_binary_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_binary_metadata_test/h2_fakesec_binary_metadata_test.vcxproj index eae4694d314..01172043503 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_binary_metadata_test/h2_fakesec_binary_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_binary_metadata_test/h2_fakesec_binary_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_call_creds_test/h2_fakesec_call_creds_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_call_creds_test/h2_fakesec_call_creds_test.vcxproj index 6d0f329de47..c9f46fde404 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_call_creds_test/h2_fakesec_call_creds_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_call_creds_test/h2_fakesec_call_creds_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_cancel_after_accept_test/h2_fakesec_cancel_after_accept_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_cancel_after_accept_test/h2_fakesec_cancel_after_accept_test.vcxproj index 635568cd731..b2e2061f171 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_cancel_after_accept_test/h2_fakesec_cancel_after_accept_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_cancel_after_accept_test/h2_fakesec_cancel_after_accept_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_cancel_after_client_done_test/h2_fakesec_cancel_after_client_done_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_cancel_after_client_done_test/h2_fakesec_cancel_after_client_done_test.vcxproj index 28a745c1c73..dd8851407e5 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_cancel_after_client_done_test/h2_fakesec_cancel_after_client_done_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_cancel_after_client_done_test/h2_fakesec_cancel_after_client_done_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_cancel_after_invoke_test/h2_fakesec_cancel_after_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_cancel_after_invoke_test/h2_fakesec_cancel_after_invoke_test.vcxproj index ea414f4f338..cf8ecdd45b0 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_cancel_after_invoke_test/h2_fakesec_cancel_after_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_cancel_after_invoke_test/h2_fakesec_cancel_after_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_cancel_before_invoke_test/h2_fakesec_cancel_before_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_cancel_before_invoke_test/h2_fakesec_cancel_before_invoke_test.vcxproj index 57d57bdb499..acd4325747a 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_cancel_before_invoke_test/h2_fakesec_cancel_before_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_cancel_before_invoke_test/h2_fakesec_cancel_before_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_cancel_in_a_vacuum_test/h2_fakesec_cancel_in_a_vacuum_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_cancel_in_a_vacuum_test/h2_fakesec_cancel_in_a_vacuum_test.vcxproj index 05311ebbbcf..6558586d61a 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_cancel_in_a_vacuum_test/h2_fakesec_cancel_in_a_vacuum_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_cancel_in_a_vacuum_test/h2_fakesec_cancel_in_a_vacuum_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_census_simple_request_test/h2_fakesec_census_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_census_simple_request_test/h2_fakesec_census_simple_request_test.vcxproj index 62289b644f8..24c079eff7c 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_census_simple_request_test/h2_fakesec_census_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_census_simple_request_test/h2_fakesec_census_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_channel_connectivity_test/h2_fakesec_channel_connectivity_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_channel_connectivity_test/h2_fakesec_channel_connectivity_test.vcxproj index 03c86b9df85..7ca4cd25947 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_channel_connectivity_test/h2_fakesec_channel_connectivity_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_channel_connectivity_test/h2_fakesec_channel_connectivity_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_compressed_payload_test/h2_fakesec_compressed_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_compressed_payload_test/h2_fakesec_compressed_payload_test.vcxproj index e3992919725..d9c5fd860f3 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_compressed_payload_test/h2_fakesec_compressed_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_compressed_payload_test/h2_fakesec_compressed_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_default_host_test/h2_fakesec_default_host_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_default_host_test/h2_fakesec_default_host_test.vcxproj index a1a4a8950a2..30b57756191 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_default_host_test/h2_fakesec_default_host_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_default_host_test/h2_fakesec_default_host_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_disappearing_server_test/h2_fakesec_disappearing_server_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_disappearing_server_test/h2_fakesec_disappearing_server_test.vcxproj index fa52ef5853a..3a73b9c3181 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_disappearing_server_test/h2_fakesec_disappearing_server_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_disappearing_server_test/h2_fakesec_disappearing_server_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_empty_batch_test/h2_fakesec_empty_batch_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_empty_batch_test/h2_fakesec_empty_batch_test.vcxproj index 68007e4c76d..7acc6b941de 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_empty_batch_test/h2_fakesec_empty_batch_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_empty_batch_test/h2_fakesec_empty_batch_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_graceful_server_shutdown_test/h2_fakesec_graceful_server_shutdown_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_graceful_server_shutdown_test/h2_fakesec_graceful_server_shutdown_test.vcxproj index 77848c4cdef..eaf917d8846 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_graceful_server_shutdown_test/h2_fakesec_graceful_server_shutdown_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_graceful_server_shutdown_test/h2_fakesec_graceful_server_shutdown_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_high_initial_seqno_test/h2_fakesec_high_initial_seqno_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_high_initial_seqno_test/h2_fakesec_high_initial_seqno_test.vcxproj index 909593ed185..0a5dc982191 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_high_initial_seqno_test/h2_fakesec_high_initial_seqno_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_high_initial_seqno_test/h2_fakesec_high_initial_seqno_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_invoke_large_request_test/h2_fakesec_invoke_large_request_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_invoke_large_request_test/h2_fakesec_invoke_large_request_test.vcxproj index d0c40b361b9..37154659ff6 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_invoke_large_request_test/h2_fakesec_invoke_large_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_invoke_large_request_test/h2_fakesec_invoke_large_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_large_metadata_test/h2_fakesec_large_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_large_metadata_test/h2_fakesec_large_metadata_test.vcxproj index 64bd240bf49..5161910e7b9 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_large_metadata_test/h2_fakesec_large_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_large_metadata_test/h2_fakesec_large_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_max_concurrent_streams_test/h2_fakesec_max_concurrent_streams_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_max_concurrent_streams_test/h2_fakesec_max_concurrent_streams_test.vcxproj index 308240396c6..a0aa6cab7fd 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_max_concurrent_streams_test/h2_fakesec_max_concurrent_streams_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_max_concurrent_streams_test/h2_fakesec_max_concurrent_streams_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_max_message_length_test/h2_fakesec_max_message_length_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_max_message_length_test/h2_fakesec_max_message_length_test.vcxproj index dd08b8688b5..ee5176fec3e 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_max_message_length_test/h2_fakesec_max_message_length_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_max_message_length_test/h2_fakesec_max_message_length_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_metadata_test/h2_fakesec_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_metadata_test/h2_fakesec_metadata_test.vcxproj index 0460c5d1083..ffc470831d5 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_metadata_test/h2_fakesec_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_metadata_test/h2_fakesec_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_no_op_test/h2_fakesec_no_op_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_no_op_test/h2_fakesec_no_op_test.vcxproj index 939e378c15c..f53fbcd306b 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_no_op_test/h2_fakesec_no_op_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_no_op_test/h2_fakesec_no_op_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_payload_test/h2_fakesec_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_payload_test/h2_fakesec_payload_test.vcxproj index 25804a0f29e..0a57e76a82e 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_payload_test/h2_fakesec_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_payload_test/h2_fakesec_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_ping_pong_streaming_test/h2_fakesec_ping_pong_streaming_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_ping_pong_streaming_test/h2_fakesec_ping_pong_streaming_test.vcxproj index 85a38220a99..2b01a67d6d0 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_ping_pong_streaming_test/h2_fakesec_ping_pong_streaming_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_ping_pong_streaming_test/h2_fakesec_ping_pong_streaming_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_registered_call_test/h2_fakesec_registered_call_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_registered_call_test/h2_fakesec_registered_call_test.vcxproj index ec3c1326593..e0132607010 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_registered_call_test/h2_fakesec_registered_call_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_registered_call_test/h2_fakesec_registered_call_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_request_with_flags_test/h2_fakesec_request_with_flags_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_request_with_flags_test/h2_fakesec_request_with_flags_test.vcxproj index eceb5fd0807..e5b8e2933a0 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_request_with_flags_test/h2_fakesec_request_with_flags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_request_with_flags_test/h2_fakesec_request_with_flags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_request_with_payload_test/h2_fakesec_request_with_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_request_with_payload_test/h2_fakesec_request_with_payload_test.vcxproj index 058f33aca30..74bc008ddef 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_request_with_payload_test/h2_fakesec_request_with_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_request_with_payload_test/h2_fakesec_request_with_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_server_finishes_request_test/h2_fakesec_server_finishes_request_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_server_finishes_request_test/h2_fakesec_server_finishes_request_test.vcxproj index 11987bab640..a2b3008616f 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_server_finishes_request_test/h2_fakesec_server_finishes_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_server_finishes_request_test/h2_fakesec_server_finishes_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_shutdown_finishes_calls_test/h2_fakesec_shutdown_finishes_calls_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_shutdown_finishes_calls_test/h2_fakesec_shutdown_finishes_calls_test.vcxproj index 6fa477022d9..e67479f0195 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_shutdown_finishes_calls_test/h2_fakesec_shutdown_finishes_calls_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_shutdown_finishes_calls_test/h2_fakesec_shutdown_finishes_calls_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_shutdown_finishes_tags_test/h2_fakesec_shutdown_finishes_tags_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_shutdown_finishes_tags_test/h2_fakesec_shutdown_finishes_tags_test.vcxproj index ee9b06be791..747b49237a0 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_shutdown_finishes_tags_test/h2_fakesec_shutdown_finishes_tags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_shutdown_finishes_tags_test/h2_fakesec_shutdown_finishes_tags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_simple_delayed_request_test/h2_fakesec_simple_delayed_request_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_simple_delayed_request_test/h2_fakesec_simple_delayed_request_test.vcxproj index 92f2c403c09..d6bbf3d44d6 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_simple_delayed_request_test/h2_fakesec_simple_delayed_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_simple_delayed_request_test/h2_fakesec_simple_delayed_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_simple_request_test/h2_fakesec_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_simple_request_test/h2_fakesec_simple_request_test.vcxproj index 9bbd8615e6a..a9a3ed5d6c8 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_simple_request_test/h2_fakesec_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_simple_request_test/h2_fakesec_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_fakesec_trailing_metadata_test/h2_fakesec_trailing_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_fakesec_trailing_metadata_test/h2_fakesec_trailing_metadata_test.vcxproj index d443becde1f..2d60d264425 100644 --- a/vsprojects/vcxproj/test/h2_fakesec_trailing_metadata_test/h2_fakesec_trailing_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_fakesec_trailing_metadata_test/h2_fakesec_trailing_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_bad_hostname_nosec_test/h2_full_bad_hostname_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_bad_hostname_nosec_test/h2_full_bad_hostname_nosec_test.vcxproj index 9146b0cf536..0a487d0e255 100644 --- a/vsprojects/vcxproj/test/h2_full_bad_hostname_nosec_test/h2_full_bad_hostname_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_bad_hostname_nosec_test/h2_full_bad_hostname_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_bad_hostname_test/h2_full_bad_hostname_test.vcxproj b/vsprojects/vcxproj/test/h2_full_bad_hostname_test/h2_full_bad_hostname_test.vcxproj index ec5e32a9914..7c90f5f4bea 100644 --- a/vsprojects/vcxproj/test/h2_full_bad_hostname_test/h2_full_bad_hostname_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_bad_hostname_test/h2_full_bad_hostname_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_binary_metadata_nosec_test/h2_full_binary_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_binary_metadata_nosec_test/h2_full_binary_metadata_nosec_test.vcxproj index 0a02404f64a..9327fce04a0 100644 --- a/vsprojects/vcxproj/test/h2_full_binary_metadata_nosec_test/h2_full_binary_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_binary_metadata_nosec_test/h2_full_binary_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_binary_metadata_test/h2_full_binary_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_full_binary_metadata_test/h2_full_binary_metadata_test.vcxproj index 3d642d0e537..16296be4802 100644 --- a/vsprojects/vcxproj/test/h2_full_binary_metadata_test/h2_full_binary_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_binary_metadata_test/h2_full_binary_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_call_creds_test/h2_full_call_creds_test.vcxproj b/vsprojects/vcxproj/test/h2_full_call_creds_test/h2_full_call_creds_test.vcxproj index ca266a418f5..c27f23d1259 100644 --- a/vsprojects/vcxproj/test/h2_full_call_creds_test/h2_full_call_creds_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_call_creds_test/h2_full_call_creds_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_cancel_after_accept_nosec_test/h2_full_cancel_after_accept_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_cancel_after_accept_nosec_test/h2_full_cancel_after_accept_nosec_test.vcxproj index 1ed1007aa47..d5d7228130f 100644 --- a/vsprojects/vcxproj/test/h2_full_cancel_after_accept_nosec_test/h2_full_cancel_after_accept_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_cancel_after_accept_nosec_test/h2_full_cancel_after_accept_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_cancel_after_accept_test/h2_full_cancel_after_accept_test.vcxproj b/vsprojects/vcxproj/test/h2_full_cancel_after_accept_test/h2_full_cancel_after_accept_test.vcxproj index 0fac863b38c..21dec64b0d3 100644 --- a/vsprojects/vcxproj/test/h2_full_cancel_after_accept_test/h2_full_cancel_after_accept_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_cancel_after_accept_test/h2_full_cancel_after_accept_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_cancel_after_client_done_nosec_test/h2_full_cancel_after_client_done_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_cancel_after_client_done_nosec_test/h2_full_cancel_after_client_done_nosec_test.vcxproj index 1855a1e6e20..bc8686b7e7c 100644 --- a/vsprojects/vcxproj/test/h2_full_cancel_after_client_done_nosec_test/h2_full_cancel_after_client_done_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_cancel_after_client_done_nosec_test/h2_full_cancel_after_client_done_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_cancel_after_client_done_test/h2_full_cancel_after_client_done_test.vcxproj b/vsprojects/vcxproj/test/h2_full_cancel_after_client_done_test/h2_full_cancel_after_client_done_test.vcxproj index a1390f79466..da0c6054d48 100644 --- a/vsprojects/vcxproj/test/h2_full_cancel_after_client_done_test/h2_full_cancel_after_client_done_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_cancel_after_client_done_test/h2_full_cancel_after_client_done_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_cancel_after_invoke_nosec_test/h2_full_cancel_after_invoke_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_cancel_after_invoke_nosec_test/h2_full_cancel_after_invoke_nosec_test.vcxproj index 420dd685d2e..03aa2fdeb6c 100644 --- a/vsprojects/vcxproj/test/h2_full_cancel_after_invoke_nosec_test/h2_full_cancel_after_invoke_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_cancel_after_invoke_nosec_test/h2_full_cancel_after_invoke_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_cancel_after_invoke_test/h2_full_cancel_after_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_full_cancel_after_invoke_test/h2_full_cancel_after_invoke_test.vcxproj index 51bd5352d54..64b78c49749 100644 --- a/vsprojects/vcxproj/test/h2_full_cancel_after_invoke_test/h2_full_cancel_after_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_cancel_after_invoke_test/h2_full_cancel_after_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_cancel_before_invoke_nosec_test/h2_full_cancel_before_invoke_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_cancel_before_invoke_nosec_test/h2_full_cancel_before_invoke_nosec_test.vcxproj index 140cc7522fc..c07629affd7 100644 --- a/vsprojects/vcxproj/test/h2_full_cancel_before_invoke_nosec_test/h2_full_cancel_before_invoke_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_cancel_before_invoke_nosec_test/h2_full_cancel_before_invoke_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_cancel_before_invoke_test/h2_full_cancel_before_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_full_cancel_before_invoke_test/h2_full_cancel_before_invoke_test.vcxproj index ff1d7a435eb..7d0f2daa4ba 100644 --- a/vsprojects/vcxproj/test/h2_full_cancel_before_invoke_test/h2_full_cancel_before_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_cancel_before_invoke_test/h2_full_cancel_before_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_cancel_in_a_vacuum_nosec_test/h2_full_cancel_in_a_vacuum_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_cancel_in_a_vacuum_nosec_test/h2_full_cancel_in_a_vacuum_nosec_test.vcxproj index 15e5240b7df..7ee3617c02f 100644 --- a/vsprojects/vcxproj/test/h2_full_cancel_in_a_vacuum_nosec_test/h2_full_cancel_in_a_vacuum_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_cancel_in_a_vacuum_nosec_test/h2_full_cancel_in_a_vacuum_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_cancel_in_a_vacuum_test/h2_full_cancel_in_a_vacuum_test.vcxproj b/vsprojects/vcxproj/test/h2_full_cancel_in_a_vacuum_test/h2_full_cancel_in_a_vacuum_test.vcxproj index 46e5882adae..3df1fbb5e60 100644 --- a/vsprojects/vcxproj/test/h2_full_cancel_in_a_vacuum_test/h2_full_cancel_in_a_vacuum_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_cancel_in_a_vacuum_test/h2_full_cancel_in_a_vacuum_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_census_simple_request_nosec_test/h2_full_census_simple_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_census_simple_request_nosec_test/h2_full_census_simple_request_nosec_test.vcxproj index 3e36e1aa373..fa4d045105e 100644 --- a/vsprojects/vcxproj/test/h2_full_census_simple_request_nosec_test/h2_full_census_simple_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_census_simple_request_nosec_test/h2_full_census_simple_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_census_simple_request_test/h2_full_census_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_full_census_simple_request_test/h2_full_census_simple_request_test.vcxproj index 33738b29fbc..d610384667f 100644 --- a/vsprojects/vcxproj/test/h2_full_census_simple_request_test/h2_full_census_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_census_simple_request_test/h2_full_census_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_channel_connectivity_nosec_test/h2_full_channel_connectivity_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_channel_connectivity_nosec_test/h2_full_channel_connectivity_nosec_test.vcxproj index a934b44641a..4b47cee37a6 100644 --- a/vsprojects/vcxproj/test/h2_full_channel_connectivity_nosec_test/h2_full_channel_connectivity_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_channel_connectivity_nosec_test/h2_full_channel_connectivity_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_channel_connectivity_test/h2_full_channel_connectivity_test.vcxproj b/vsprojects/vcxproj/test/h2_full_channel_connectivity_test/h2_full_channel_connectivity_test.vcxproj index f578a0f088c..a30476bb4f8 100644 --- a/vsprojects/vcxproj/test/h2_full_channel_connectivity_test/h2_full_channel_connectivity_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_channel_connectivity_test/h2_full_channel_connectivity_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_compressed_payload_nosec_test/h2_full_compressed_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_compressed_payload_nosec_test/h2_full_compressed_payload_nosec_test.vcxproj index 46f3749d333..a621bdc7b89 100644 --- a/vsprojects/vcxproj/test/h2_full_compressed_payload_nosec_test/h2_full_compressed_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_compressed_payload_nosec_test/h2_full_compressed_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_compressed_payload_test/h2_full_compressed_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_full_compressed_payload_test/h2_full_compressed_payload_test.vcxproj index e342240880f..d418520dc64 100644 --- a/vsprojects/vcxproj/test/h2_full_compressed_payload_test/h2_full_compressed_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_compressed_payload_test/h2_full_compressed_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_default_host_nosec_test/h2_full_default_host_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_default_host_nosec_test/h2_full_default_host_nosec_test.vcxproj index b5d8b80cafe..a7ab3a39d07 100644 --- a/vsprojects/vcxproj/test/h2_full_default_host_nosec_test/h2_full_default_host_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_default_host_nosec_test/h2_full_default_host_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_default_host_test/h2_full_default_host_test.vcxproj b/vsprojects/vcxproj/test/h2_full_default_host_test/h2_full_default_host_test.vcxproj index 5c5212ee62d..cb434847f4e 100644 --- a/vsprojects/vcxproj/test/h2_full_default_host_test/h2_full_default_host_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_default_host_test/h2_full_default_host_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_disappearing_server_nosec_test/h2_full_disappearing_server_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_disappearing_server_nosec_test/h2_full_disappearing_server_nosec_test.vcxproj index 42c59235cc6..3fe08f73a6c 100644 --- a/vsprojects/vcxproj/test/h2_full_disappearing_server_nosec_test/h2_full_disappearing_server_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_disappearing_server_nosec_test/h2_full_disappearing_server_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_disappearing_server_test/h2_full_disappearing_server_test.vcxproj b/vsprojects/vcxproj/test/h2_full_disappearing_server_test/h2_full_disappearing_server_test.vcxproj index 8d820ae29c4..2adadd4d566 100644 --- a/vsprojects/vcxproj/test/h2_full_disappearing_server_test/h2_full_disappearing_server_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_disappearing_server_test/h2_full_disappearing_server_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_empty_batch_nosec_test/h2_full_empty_batch_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_empty_batch_nosec_test/h2_full_empty_batch_nosec_test.vcxproj index d3bd522c4d6..912a4b43719 100644 --- a/vsprojects/vcxproj/test/h2_full_empty_batch_nosec_test/h2_full_empty_batch_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_empty_batch_nosec_test/h2_full_empty_batch_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_empty_batch_test/h2_full_empty_batch_test.vcxproj b/vsprojects/vcxproj/test/h2_full_empty_batch_test/h2_full_empty_batch_test.vcxproj index a12298f83cb..108def04693 100644 --- a/vsprojects/vcxproj/test/h2_full_empty_batch_test/h2_full_empty_batch_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_empty_batch_test/h2_full_empty_batch_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_graceful_server_shutdown_nosec_test/h2_full_graceful_server_shutdown_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_graceful_server_shutdown_nosec_test/h2_full_graceful_server_shutdown_nosec_test.vcxproj index 216012061e4..6ab6ce4c605 100644 --- a/vsprojects/vcxproj/test/h2_full_graceful_server_shutdown_nosec_test/h2_full_graceful_server_shutdown_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_graceful_server_shutdown_nosec_test/h2_full_graceful_server_shutdown_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_graceful_server_shutdown_test/h2_full_graceful_server_shutdown_test.vcxproj b/vsprojects/vcxproj/test/h2_full_graceful_server_shutdown_test/h2_full_graceful_server_shutdown_test.vcxproj index ae5992f4e67..fa4718bd5fb 100644 --- a/vsprojects/vcxproj/test/h2_full_graceful_server_shutdown_test/h2_full_graceful_server_shutdown_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_graceful_server_shutdown_test/h2_full_graceful_server_shutdown_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_high_initial_seqno_nosec_test/h2_full_high_initial_seqno_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_high_initial_seqno_nosec_test/h2_full_high_initial_seqno_nosec_test.vcxproj index d78f941f387..ac508392739 100644 --- a/vsprojects/vcxproj/test/h2_full_high_initial_seqno_nosec_test/h2_full_high_initial_seqno_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_high_initial_seqno_nosec_test/h2_full_high_initial_seqno_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_high_initial_seqno_test/h2_full_high_initial_seqno_test.vcxproj b/vsprojects/vcxproj/test/h2_full_high_initial_seqno_test/h2_full_high_initial_seqno_test.vcxproj index 125c9b7e0e4..01c183d72a7 100644 --- a/vsprojects/vcxproj/test/h2_full_high_initial_seqno_test/h2_full_high_initial_seqno_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_high_initial_seqno_test/h2_full_high_initial_seqno_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_invoke_large_request_nosec_test/h2_full_invoke_large_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_invoke_large_request_nosec_test/h2_full_invoke_large_request_nosec_test.vcxproj index d4eb9ec4435..c43c30c8e4a 100644 --- a/vsprojects/vcxproj/test/h2_full_invoke_large_request_nosec_test/h2_full_invoke_large_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_invoke_large_request_nosec_test/h2_full_invoke_large_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_invoke_large_request_test/h2_full_invoke_large_request_test.vcxproj b/vsprojects/vcxproj/test/h2_full_invoke_large_request_test/h2_full_invoke_large_request_test.vcxproj index e7eae80f4de..5f6db4a39f4 100644 --- a/vsprojects/vcxproj/test/h2_full_invoke_large_request_test/h2_full_invoke_large_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_invoke_large_request_test/h2_full_invoke_large_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_large_metadata_nosec_test/h2_full_large_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_large_metadata_nosec_test/h2_full_large_metadata_nosec_test.vcxproj index 8178629afc5..10659c75f7c 100644 --- a/vsprojects/vcxproj/test/h2_full_large_metadata_nosec_test/h2_full_large_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_large_metadata_nosec_test/h2_full_large_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_large_metadata_test/h2_full_large_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_full_large_metadata_test/h2_full_large_metadata_test.vcxproj index a4c2526bd2f..bb0296eb177 100644 --- a/vsprojects/vcxproj/test/h2_full_large_metadata_test/h2_full_large_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_large_metadata_test/h2_full_large_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_max_concurrent_streams_nosec_test/h2_full_max_concurrent_streams_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_max_concurrent_streams_nosec_test/h2_full_max_concurrent_streams_nosec_test.vcxproj index 7937aca6f2f..9ce158e60b3 100644 --- a/vsprojects/vcxproj/test/h2_full_max_concurrent_streams_nosec_test/h2_full_max_concurrent_streams_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_max_concurrent_streams_nosec_test/h2_full_max_concurrent_streams_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_max_concurrent_streams_test/h2_full_max_concurrent_streams_test.vcxproj b/vsprojects/vcxproj/test/h2_full_max_concurrent_streams_test/h2_full_max_concurrent_streams_test.vcxproj index cb273d55ee0..8fd305a868f 100644 --- a/vsprojects/vcxproj/test/h2_full_max_concurrent_streams_test/h2_full_max_concurrent_streams_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_max_concurrent_streams_test/h2_full_max_concurrent_streams_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_max_message_length_nosec_test/h2_full_max_message_length_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_max_message_length_nosec_test/h2_full_max_message_length_nosec_test.vcxproj index a817cf9cd7e..b2daa8c0a9d 100644 --- a/vsprojects/vcxproj/test/h2_full_max_message_length_nosec_test/h2_full_max_message_length_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_max_message_length_nosec_test/h2_full_max_message_length_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_max_message_length_test/h2_full_max_message_length_test.vcxproj b/vsprojects/vcxproj/test/h2_full_max_message_length_test/h2_full_max_message_length_test.vcxproj index 384519f535d..2deefbdfc01 100644 --- a/vsprojects/vcxproj/test/h2_full_max_message_length_test/h2_full_max_message_length_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_max_message_length_test/h2_full_max_message_length_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_metadata_nosec_test/h2_full_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_metadata_nosec_test/h2_full_metadata_nosec_test.vcxproj index 169fbf830a6..e1b8b59ef30 100644 --- a/vsprojects/vcxproj/test/h2_full_metadata_nosec_test/h2_full_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_metadata_nosec_test/h2_full_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_metadata_test/h2_full_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_full_metadata_test/h2_full_metadata_test.vcxproj index dc56a9111b0..76718179e66 100644 --- a/vsprojects/vcxproj/test/h2_full_metadata_test/h2_full_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_metadata_test/h2_full_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_no_op_nosec_test/h2_full_no_op_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_no_op_nosec_test/h2_full_no_op_nosec_test.vcxproj index 3bc952fca45..874cbbc7ad7 100644 --- a/vsprojects/vcxproj/test/h2_full_no_op_nosec_test/h2_full_no_op_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_no_op_nosec_test/h2_full_no_op_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_no_op_test/h2_full_no_op_test.vcxproj b/vsprojects/vcxproj/test/h2_full_no_op_test/h2_full_no_op_test.vcxproj index 8d8807f353f..e3a9155c9bb 100644 --- a/vsprojects/vcxproj/test/h2_full_no_op_test/h2_full_no_op_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_no_op_test/h2_full_no_op_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_payload_nosec_test/h2_full_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_payload_nosec_test/h2_full_payload_nosec_test.vcxproj index bee1f362677..bc188e99606 100644 --- a/vsprojects/vcxproj/test/h2_full_payload_nosec_test/h2_full_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_payload_nosec_test/h2_full_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_payload_test/h2_full_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_full_payload_test/h2_full_payload_test.vcxproj index 29463d6db14..6d3717f3947 100644 --- a/vsprojects/vcxproj/test/h2_full_payload_test/h2_full_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_payload_test/h2_full_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_ping_pong_streaming_nosec_test/h2_full_ping_pong_streaming_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_ping_pong_streaming_nosec_test/h2_full_ping_pong_streaming_nosec_test.vcxproj index b6a412b79e3..65e8c204f7a 100644 --- a/vsprojects/vcxproj/test/h2_full_ping_pong_streaming_nosec_test/h2_full_ping_pong_streaming_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_ping_pong_streaming_nosec_test/h2_full_ping_pong_streaming_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_ping_pong_streaming_test/h2_full_ping_pong_streaming_test.vcxproj b/vsprojects/vcxproj/test/h2_full_ping_pong_streaming_test/h2_full_ping_pong_streaming_test.vcxproj index cae25a9684c..7c4acea925f 100644 --- a/vsprojects/vcxproj/test/h2_full_ping_pong_streaming_test/h2_full_ping_pong_streaming_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_ping_pong_streaming_test/h2_full_ping_pong_streaming_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_registered_call_nosec_test/h2_full_registered_call_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_registered_call_nosec_test/h2_full_registered_call_nosec_test.vcxproj index f58c4d72b30..4ad9e6f99d5 100644 --- a/vsprojects/vcxproj/test/h2_full_registered_call_nosec_test/h2_full_registered_call_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_registered_call_nosec_test/h2_full_registered_call_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_registered_call_test/h2_full_registered_call_test.vcxproj b/vsprojects/vcxproj/test/h2_full_registered_call_test/h2_full_registered_call_test.vcxproj index 1a1ca5da5c7..726c5e3822b 100644 --- a/vsprojects/vcxproj/test/h2_full_registered_call_test/h2_full_registered_call_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_registered_call_test/h2_full_registered_call_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_request_with_flags_nosec_test/h2_full_request_with_flags_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_request_with_flags_nosec_test/h2_full_request_with_flags_nosec_test.vcxproj index f18da5fece2..a29689b4834 100644 --- a/vsprojects/vcxproj/test/h2_full_request_with_flags_nosec_test/h2_full_request_with_flags_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_request_with_flags_nosec_test/h2_full_request_with_flags_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_request_with_flags_test/h2_full_request_with_flags_test.vcxproj b/vsprojects/vcxproj/test/h2_full_request_with_flags_test/h2_full_request_with_flags_test.vcxproj index e0d074118a2..bdd4b70026f 100644 --- a/vsprojects/vcxproj/test/h2_full_request_with_flags_test/h2_full_request_with_flags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_request_with_flags_test/h2_full_request_with_flags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_request_with_payload_nosec_test/h2_full_request_with_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_request_with_payload_nosec_test/h2_full_request_with_payload_nosec_test.vcxproj index 732d6b420ea..60fd44fe4ea 100644 --- a/vsprojects/vcxproj/test/h2_full_request_with_payload_nosec_test/h2_full_request_with_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_request_with_payload_nosec_test/h2_full_request_with_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_request_with_payload_test/h2_full_request_with_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_full_request_with_payload_test/h2_full_request_with_payload_test.vcxproj index 197d7beda94..fe3daef76da 100644 --- a/vsprojects/vcxproj/test/h2_full_request_with_payload_test/h2_full_request_with_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_request_with_payload_test/h2_full_request_with_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_server_finishes_request_nosec_test/h2_full_server_finishes_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_server_finishes_request_nosec_test/h2_full_server_finishes_request_nosec_test.vcxproj index 8ea6866c354..3b928a11465 100644 --- a/vsprojects/vcxproj/test/h2_full_server_finishes_request_nosec_test/h2_full_server_finishes_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_server_finishes_request_nosec_test/h2_full_server_finishes_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_server_finishes_request_test/h2_full_server_finishes_request_test.vcxproj b/vsprojects/vcxproj/test/h2_full_server_finishes_request_test/h2_full_server_finishes_request_test.vcxproj index a39ff9c26a0..0d319d1845b 100644 --- a/vsprojects/vcxproj/test/h2_full_server_finishes_request_test/h2_full_server_finishes_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_server_finishes_request_test/h2_full_server_finishes_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_shutdown_finishes_calls_nosec_test/h2_full_shutdown_finishes_calls_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_shutdown_finishes_calls_nosec_test/h2_full_shutdown_finishes_calls_nosec_test.vcxproj index c8497da7c8c..0154c9ff472 100644 --- a/vsprojects/vcxproj/test/h2_full_shutdown_finishes_calls_nosec_test/h2_full_shutdown_finishes_calls_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_shutdown_finishes_calls_nosec_test/h2_full_shutdown_finishes_calls_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_shutdown_finishes_calls_test/h2_full_shutdown_finishes_calls_test.vcxproj b/vsprojects/vcxproj/test/h2_full_shutdown_finishes_calls_test/h2_full_shutdown_finishes_calls_test.vcxproj index 6442bda8aba..a90e99baf35 100644 --- a/vsprojects/vcxproj/test/h2_full_shutdown_finishes_calls_test/h2_full_shutdown_finishes_calls_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_shutdown_finishes_calls_test/h2_full_shutdown_finishes_calls_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_shutdown_finishes_tags_nosec_test/h2_full_shutdown_finishes_tags_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_shutdown_finishes_tags_nosec_test/h2_full_shutdown_finishes_tags_nosec_test.vcxproj index 084fbd06eb7..43c7353e4f4 100644 --- a/vsprojects/vcxproj/test/h2_full_shutdown_finishes_tags_nosec_test/h2_full_shutdown_finishes_tags_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_shutdown_finishes_tags_nosec_test/h2_full_shutdown_finishes_tags_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_shutdown_finishes_tags_test/h2_full_shutdown_finishes_tags_test.vcxproj b/vsprojects/vcxproj/test/h2_full_shutdown_finishes_tags_test/h2_full_shutdown_finishes_tags_test.vcxproj index 72abcd89a52..5c9d8a8c03d 100644 --- a/vsprojects/vcxproj/test/h2_full_shutdown_finishes_tags_test/h2_full_shutdown_finishes_tags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_shutdown_finishes_tags_test/h2_full_shutdown_finishes_tags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_simple_delayed_request_nosec_test/h2_full_simple_delayed_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_simple_delayed_request_nosec_test/h2_full_simple_delayed_request_nosec_test.vcxproj index 0fc4d635bf2..443a425c559 100644 --- a/vsprojects/vcxproj/test/h2_full_simple_delayed_request_nosec_test/h2_full_simple_delayed_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_simple_delayed_request_nosec_test/h2_full_simple_delayed_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_simple_delayed_request_test/h2_full_simple_delayed_request_test.vcxproj b/vsprojects/vcxproj/test/h2_full_simple_delayed_request_test/h2_full_simple_delayed_request_test.vcxproj index 0e112840647..bd1175baa57 100644 --- a/vsprojects/vcxproj/test/h2_full_simple_delayed_request_test/h2_full_simple_delayed_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_simple_delayed_request_test/h2_full_simple_delayed_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_simple_request_nosec_test/h2_full_simple_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_simple_request_nosec_test/h2_full_simple_request_nosec_test.vcxproj index 17d3260aa0e..ca156706f4b 100644 --- a/vsprojects/vcxproj/test/h2_full_simple_request_nosec_test/h2_full_simple_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_simple_request_nosec_test/h2_full_simple_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_simple_request_test/h2_full_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_full_simple_request_test/h2_full_simple_request_test.vcxproj index 743cc3e3844..df9aba0dd56 100644 --- a/vsprojects/vcxproj/test/h2_full_simple_request_test/h2_full_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_simple_request_test/h2_full_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_trailing_metadata_nosec_test/h2_full_trailing_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_full_trailing_metadata_nosec_test/h2_full_trailing_metadata_nosec_test.vcxproj index 0e83c7b0e24..32d04a7b57e 100644 --- a/vsprojects/vcxproj/test/h2_full_trailing_metadata_nosec_test/h2_full_trailing_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_trailing_metadata_nosec_test/h2_full_trailing_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_full_trailing_metadata_test/h2_full_trailing_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_full_trailing_metadata_test/h2_full_trailing_metadata_test.vcxproj index 5da288c0d24..36803d88f8f 100644 --- a/vsprojects/vcxproj/test/h2_full_trailing_metadata_test/h2_full_trailing_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_trailing_metadata_test/h2_full_trailing_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_bad_hostname_test/h2_oauth2_bad_hostname_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_bad_hostname_test/h2_oauth2_bad_hostname_test.vcxproj index d06c5c4d051..3d5820b1f5f 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_bad_hostname_test/h2_oauth2_bad_hostname_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_bad_hostname_test/h2_oauth2_bad_hostname_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_binary_metadata_test/h2_oauth2_binary_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_binary_metadata_test/h2_oauth2_binary_metadata_test.vcxproj index d8576d92deb..c0e6c6aa4cb 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_binary_metadata_test/h2_oauth2_binary_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_binary_metadata_test/h2_oauth2_binary_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_call_creds_test/h2_oauth2_call_creds_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_call_creds_test/h2_oauth2_call_creds_test.vcxproj index 9831def7acc..987de8c0c55 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_call_creds_test/h2_oauth2_call_creds_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_call_creds_test/h2_oauth2_call_creds_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_cancel_after_accept_test/h2_oauth2_cancel_after_accept_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_cancel_after_accept_test/h2_oauth2_cancel_after_accept_test.vcxproj index 38acc7bf401..81910213917 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_cancel_after_accept_test/h2_oauth2_cancel_after_accept_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_cancel_after_accept_test/h2_oauth2_cancel_after_accept_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_cancel_after_client_done_test/h2_oauth2_cancel_after_client_done_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_cancel_after_client_done_test/h2_oauth2_cancel_after_client_done_test.vcxproj index c0b7f31f322..cdc39ab60f4 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_cancel_after_client_done_test/h2_oauth2_cancel_after_client_done_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_cancel_after_client_done_test/h2_oauth2_cancel_after_client_done_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_cancel_after_invoke_test/h2_oauth2_cancel_after_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_cancel_after_invoke_test/h2_oauth2_cancel_after_invoke_test.vcxproj index da80fba8b0e..84d07828134 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_cancel_after_invoke_test/h2_oauth2_cancel_after_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_cancel_after_invoke_test/h2_oauth2_cancel_after_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_cancel_before_invoke_test/h2_oauth2_cancel_before_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_cancel_before_invoke_test/h2_oauth2_cancel_before_invoke_test.vcxproj index b786ec9148d..8efa6ef67b7 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_cancel_before_invoke_test/h2_oauth2_cancel_before_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_cancel_before_invoke_test/h2_oauth2_cancel_before_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_cancel_in_a_vacuum_test/h2_oauth2_cancel_in_a_vacuum_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_cancel_in_a_vacuum_test/h2_oauth2_cancel_in_a_vacuum_test.vcxproj index e7077d7d0af..06adae70095 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_cancel_in_a_vacuum_test/h2_oauth2_cancel_in_a_vacuum_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_cancel_in_a_vacuum_test/h2_oauth2_cancel_in_a_vacuum_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_census_simple_request_test/h2_oauth2_census_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_census_simple_request_test/h2_oauth2_census_simple_request_test.vcxproj index dded63940d1..f39001f5ed4 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_census_simple_request_test/h2_oauth2_census_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_census_simple_request_test/h2_oauth2_census_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_channel_connectivity_test/h2_oauth2_channel_connectivity_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_channel_connectivity_test/h2_oauth2_channel_connectivity_test.vcxproj index 947477286c3..f24ae847497 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_channel_connectivity_test/h2_oauth2_channel_connectivity_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_channel_connectivity_test/h2_oauth2_channel_connectivity_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_compressed_payload_test/h2_oauth2_compressed_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_compressed_payload_test/h2_oauth2_compressed_payload_test.vcxproj index 020c027dcf0..c5436283fa4 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_compressed_payload_test/h2_oauth2_compressed_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_compressed_payload_test/h2_oauth2_compressed_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_default_host_test/h2_oauth2_default_host_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_default_host_test/h2_oauth2_default_host_test.vcxproj index 545e5cbae57..a44c77b625a 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_default_host_test/h2_oauth2_default_host_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_default_host_test/h2_oauth2_default_host_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_disappearing_server_test/h2_oauth2_disappearing_server_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_disappearing_server_test/h2_oauth2_disappearing_server_test.vcxproj index 58d1798fa2c..dd4a998178e 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_disappearing_server_test/h2_oauth2_disappearing_server_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_disappearing_server_test/h2_oauth2_disappearing_server_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_empty_batch_test/h2_oauth2_empty_batch_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_empty_batch_test/h2_oauth2_empty_batch_test.vcxproj index cf37a33c3d6..7c80b780f43 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_empty_batch_test/h2_oauth2_empty_batch_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_empty_batch_test/h2_oauth2_empty_batch_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_graceful_server_shutdown_test/h2_oauth2_graceful_server_shutdown_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_graceful_server_shutdown_test/h2_oauth2_graceful_server_shutdown_test.vcxproj index 450b011f291..94588083b8c 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_graceful_server_shutdown_test/h2_oauth2_graceful_server_shutdown_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_graceful_server_shutdown_test/h2_oauth2_graceful_server_shutdown_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_high_initial_seqno_test/h2_oauth2_high_initial_seqno_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_high_initial_seqno_test/h2_oauth2_high_initial_seqno_test.vcxproj index 97044173070..e67c25059e4 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_high_initial_seqno_test/h2_oauth2_high_initial_seqno_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_high_initial_seqno_test/h2_oauth2_high_initial_seqno_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_invoke_large_request_test/h2_oauth2_invoke_large_request_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_invoke_large_request_test/h2_oauth2_invoke_large_request_test.vcxproj index f3719f15078..a4bdbce918b 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_invoke_large_request_test/h2_oauth2_invoke_large_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_invoke_large_request_test/h2_oauth2_invoke_large_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_large_metadata_test/h2_oauth2_large_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_large_metadata_test/h2_oauth2_large_metadata_test.vcxproj index 8a8b391dd6d..31d379cbe1b 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_large_metadata_test/h2_oauth2_large_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_large_metadata_test/h2_oauth2_large_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_max_concurrent_streams_test/h2_oauth2_max_concurrent_streams_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_max_concurrent_streams_test/h2_oauth2_max_concurrent_streams_test.vcxproj index ce0b5e6e77a..3d8a00df4e8 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_max_concurrent_streams_test/h2_oauth2_max_concurrent_streams_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_max_concurrent_streams_test/h2_oauth2_max_concurrent_streams_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_max_message_length_test/h2_oauth2_max_message_length_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_max_message_length_test/h2_oauth2_max_message_length_test.vcxproj index 27897d2f9e8..b8f4572483f 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_max_message_length_test/h2_oauth2_max_message_length_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_max_message_length_test/h2_oauth2_max_message_length_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_metadata_test/h2_oauth2_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_metadata_test/h2_oauth2_metadata_test.vcxproj index 653d92e3732..8885817ec98 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_metadata_test/h2_oauth2_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_metadata_test/h2_oauth2_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_no_op_test/h2_oauth2_no_op_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_no_op_test/h2_oauth2_no_op_test.vcxproj index 1d8c0e75015..42a16a981e4 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_no_op_test/h2_oauth2_no_op_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_no_op_test/h2_oauth2_no_op_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_payload_test/h2_oauth2_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_payload_test/h2_oauth2_payload_test.vcxproj index 957fc443e28..100084ec28d 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_payload_test/h2_oauth2_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_payload_test/h2_oauth2_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_ping_pong_streaming_test/h2_oauth2_ping_pong_streaming_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_ping_pong_streaming_test/h2_oauth2_ping_pong_streaming_test.vcxproj index 4bb7fb42f47..cb4e4f51cfd 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_ping_pong_streaming_test/h2_oauth2_ping_pong_streaming_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_ping_pong_streaming_test/h2_oauth2_ping_pong_streaming_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_registered_call_test/h2_oauth2_registered_call_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_registered_call_test/h2_oauth2_registered_call_test.vcxproj index db57fb73b1b..314c4b66eb5 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_registered_call_test/h2_oauth2_registered_call_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_registered_call_test/h2_oauth2_registered_call_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_request_with_flags_test/h2_oauth2_request_with_flags_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_request_with_flags_test/h2_oauth2_request_with_flags_test.vcxproj index a140a8b387e..87cb6c99223 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_request_with_flags_test/h2_oauth2_request_with_flags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_request_with_flags_test/h2_oauth2_request_with_flags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_request_with_payload_test/h2_oauth2_request_with_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_request_with_payload_test/h2_oauth2_request_with_payload_test.vcxproj index d11a1b7f35e..8fd7c36cc8e 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_request_with_payload_test/h2_oauth2_request_with_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_request_with_payload_test/h2_oauth2_request_with_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_server_finishes_request_test/h2_oauth2_server_finishes_request_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_server_finishes_request_test/h2_oauth2_server_finishes_request_test.vcxproj index 0f537da1916..c087bd7d033 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_server_finishes_request_test/h2_oauth2_server_finishes_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_server_finishes_request_test/h2_oauth2_server_finishes_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_shutdown_finishes_calls_test/h2_oauth2_shutdown_finishes_calls_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_shutdown_finishes_calls_test/h2_oauth2_shutdown_finishes_calls_test.vcxproj index b7391dd3b39..d02a26558a9 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_shutdown_finishes_calls_test/h2_oauth2_shutdown_finishes_calls_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_shutdown_finishes_calls_test/h2_oauth2_shutdown_finishes_calls_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_shutdown_finishes_tags_test/h2_oauth2_shutdown_finishes_tags_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_shutdown_finishes_tags_test/h2_oauth2_shutdown_finishes_tags_test.vcxproj index 8dc6cb593ad..aa53624b237 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_shutdown_finishes_tags_test/h2_oauth2_shutdown_finishes_tags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_shutdown_finishes_tags_test/h2_oauth2_shutdown_finishes_tags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_simple_delayed_request_test/h2_oauth2_simple_delayed_request_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_simple_delayed_request_test/h2_oauth2_simple_delayed_request_test.vcxproj index 07ef3c21497..fb59ad4a27d 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_simple_delayed_request_test/h2_oauth2_simple_delayed_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_simple_delayed_request_test/h2_oauth2_simple_delayed_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_simple_request_test/h2_oauth2_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_simple_request_test/h2_oauth2_simple_request_test.vcxproj index 70f80fdb16a..fd86b7b8824 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_simple_request_test/h2_oauth2_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_simple_request_test/h2_oauth2_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_oauth2_trailing_metadata_test/h2_oauth2_trailing_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_oauth2_trailing_metadata_test/h2_oauth2_trailing_metadata_test.vcxproj index 24d7149c646..aede3280576 100644 --- a/vsprojects/vcxproj/test/h2_oauth2_trailing_metadata_test/h2_oauth2_trailing_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_oauth2_trailing_metadata_test/h2_oauth2_trailing_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_bad_hostname_nosec_test/h2_proxy_bad_hostname_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_bad_hostname_nosec_test/h2_proxy_bad_hostname_nosec_test.vcxproj index 1fabfbe8196..fba9242c7ec 100644 --- a/vsprojects/vcxproj/test/h2_proxy_bad_hostname_nosec_test/h2_proxy_bad_hostname_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_bad_hostname_nosec_test/h2_proxy_bad_hostname_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_bad_hostname_test/h2_proxy_bad_hostname_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_bad_hostname_test/h2_proxy_bad_hostname_test.vcxproj index 7f2605bd984..dc0f7d24a11 100644 --- a/vsprojects/vcxproj/test/h2_proxy_bad_hostname_test/h2_proxy_bad_hostname_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_bad_hostname_test/h2_proxy_bad_hostname_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_binary_metadata_nosec_test/h2_proxy_binary_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_binary_metadata_nosec_test/h2_proxy_binary_metadata_nosec_test.vcxproj index d93d527ede9..e36f16b073b 100644 --- a/vsprojects/vcxproj/test/h2_proxy_binary_metadata_nosec_test/h2_proxy_binary_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_binary_metadata_nosec_test/h2_proxy_binary_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_binary_metadata_test/h2_proxy_binary_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_binary_metadata_test/h2_proxy_binary_metadata_test.vcxproj index cfc91e6f871..c6d23648940 100644 --- a/vsprojects/vcxproj/test/h2_proxy_binary_metadata_test/h2_proxy_binary_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_binary_metadata_test/h2_proxy_binary_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_call_creds_test/h2_proxy_call_creds_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_call_creds_test/h2_proxy_call_creds_test.vcxproj index 2eac2db0a16..974daf80997 100644 --- a/vsprojects/vcxproj/test/h2_proxy_call_creds_test/h2_proxy_call_creds_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_call_creds_test/h2_proxy_call_creds_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_cancel_after_accept_nosec_test/h2_proxy_cancel_after_accept_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_cancel_after_accept_nosec_test/h2_proxy_cancel_after_accept_nosec_test.vcxproj index 185ee9b8afc..ecc7bc8e216 100644 --- a/vsprojects/vcxproj/test/h2_proxy_cancel_after_accept_nosec_test/h2_proxy_cancel_after_accept_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_cancel_after_accept_nosec_test/h2_proxy_cancel_after_accept_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_cancel_after_accept_test/h2_proxy_cancel_after_accept_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_cancel_after_accept_test/h2_proxy_cancel_after_accept_test.vcxproj index dfcf4eb4cb3..9f620465fa9 100644 --- a/vsprojects/vcxproj/test/h2_proxy_cancel_after_accept_test/h2_proxy_cancel_after_accept_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_cancel_after_accept_test/h2_proxy_cancel_after_accept_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_cancel_after_client_done_nosec_test/h2_proxy_cancel_after_client_done_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_cancel_after_client_done_nosec_test/h2_proxy_cancel_after_client_done_nosec_test.vcxproj index f94a09fa1a5..7c7ac507765 100644 --- a/vsprojects/vcxproj/test/h2_proxy_cancel_after_client_done_nosec_test/h2_proxy_cancel_after_client_done_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_cancel_after_client_done_nosec_test/h2_proxy_cancel_after_client_done_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_cancel_after_client_done_test/h2_proxy_cancel_after_client_done_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_cancel_after_client_done_test/h2_proxy_cancel_after_client_done_test.vcxproj index 0b76f8b0ef9..a5ef5e1684e 100644 --- a/vsprojects/vcxproj/test/h2_proxy_cancel_after_client_done_test/h2_proxy_cancel_after_client_done_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_cancel_after_client_done_test/h2_proxy_cancel_after_client_done_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_cancel_after_invoke_nosec_test/h2_proxy_cancel_after_invoke_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_cancel_after_invoke_nosec_test/h2_proxy_cancel_after_invoke_nosec_test.vcxproj index 67465d0146a..664777b4808 100644 --- a/vsprojects/vcxproj/test/h2_proxy_cancel_after_invoke_nosec_test/h2_proxy_cancel_after_invoke_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_cancel_after_invoke_nosec_test/h2_proxy_cancel_after_invoke_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_cancel_after_invoke_test/h2_proxy_cancel_after_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_cancel_after_invoke_test/h2_proxy_cancel_after_invoke_test.vcxproj index 2140162520c..5eebfe6b549 100644 --- a/vsprojects/vcxproj/test/h2_proxy_cancel_after_invoke_test/h2_proxy_cancel_after_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_cancel_after_invoke_test/h2_proxy_cancel_after_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_cancel_before_invoke_nosec_test/h2_proxy_cancel_before_invoke_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_cancel_before_invoke_nosec_test/h2_proxy_cancel_before_invoke_nosec_test.vcxproj index 4e9e942e180..8759e9af8d9 100644 --- a/vsprojects/vcxproj/test/h2_proxy_cancel_before_invoke_nosec_test/h2_proxy_cancel_before_invoke_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_cancel_before_invoke_nosec_test/h2_proxy_cancel_before_invoke_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_cancel_before_invoke_test/h2_proxy_cancel_before_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_cancel_before_invoke_test/h2_proxy_cancel_before_invoke_test.vcxproj index d3c9b49a41a..9ebba3fb764 100644 --- a/vsprojects/vcxproj/test/h2_proxy_cancel_before_invoke_test/h2_proxy_cancel_before_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_cancel_before_invoke_test/h2_proxy_cancel_before_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_cancel_in_a_vacuum_nosec_test/h2_proxy_cancel_in_a_vacuum_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_cancel_in_a_vacuum_nosec_test/h2_proxy_cancel_in_a_vacuum_nosec_test.vcxproj index 07ebc5099ae..e8db2f93c77 100644 --- a/vsprojects/vcxproj/test/h2_proxy_cancel_in_a_vacuum_nosec_test/h2_proxy_cancel_in_a_vacuum_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_cancel_in_a_vacuum_nosec_test/h2_proxy_cancel_in_a_vacuum_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_cancel_in_a_vacuum_test/h2_proxy_cancel_in_a_vacuum_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_cancel_in_a_vacuum_test/h2_proxy_cancel_in_a_vacuum_test.vcxproj index f65beb0d0a8..d4d49ca060f 100644 --- a/vsprojects/vcxproj/test/h2_proxy_cancel_in_a_vacuum_test/h2_proxy_cancel_in_a_vacuum_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_cancel_in_a_vacuum_test/h2_proxy_cancel_in_a_vacuum_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_census_simple_request_nosec_test/h2_proxy_census_simple_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_census_simple_request_nosec_test/h2_proxy_census_simple_request_nosec_test.vcxproj index c4b0ee87db8..dfe880ec7d2 100644 --- a/vsprojects/vcxproj/test/h2_proxy_census_simple_request_nosec_test/h2_proxy_census_simple_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_census_simple_request_nosec_test/h2_proxy_census_simple_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_census_simple_request_test/h2_proxy_census_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_census_simple_request_test/h2_proxy_census_simple_request_test.vcxproj index b6c039f24d0..7e40d40522b 100644 --- a/vsprojects/vcxproj/test/h2_proxy_census_simple_request_test/h2_proxy_census_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_census_simple_request_test/h2_proxy_census_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_default_host_nosec_test/h2_proxy_default_host_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_default_host_nosec_test/h2_proxy_default_host_nosec_test.vcxproj index a90842035d6..f754efea4e4 100644 --- a/vsprojects/vcxproj/test/h2_proxy_default_host_nosec_test/h2_proxy_default_host_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_default_host_nosec_test/h2_proxy_default_host_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_default_host_test/h2_proxy_default_host_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_default_host_test/h2_proxy_default_host_test.vcxproj index c970221e021..eb3aeb9ea9c 100644 --- a/vsprojects/vcxproj/test/h2_proxy_default_host_test/h2_proxy_default_host_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_default_host_test/h2_proxy_default_host_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_disappearing_server_nosec_test/h2_proxy_disappearing_server_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_disappearing_server_nosec_test/h2_proxy_disappearing_server_nosec_test.vcxproj index 59cacbc1ae1..580d2d031f4 100644 --- a/vsprojects/vcxproj/test/h2_proxy_disappearing_server_nosec_test/h2_proxy_disappearing_server_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_disappearing_server_nosec_test/h2_proxy_disappearing_server_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_disappearing_server_test/h2_proxy_disappearing_server_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_disappearing_server_test/h2_proxy_disappearing_server_test.vcxproj index 717c5906174..b8fe66a8352 100644 --- a/vsprojects/vcxproj/test/h2_proxy_disappearing_server_test/h2_proxy_disappearing_server_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_disappearing_server_test/h2_proxy_disappearing_server_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_empty_batch_nosec_test/h2_proxy_empty_batch_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_empty_batch_nosec_test/h2_proxy_empty_batch_nosec_test.vcxproj index dfe38214dc4..8c0ceb08ff8 100644 --- a/vsprojects/vcxproj/test/h2_proxy_empty_batch_nosec_test/h2_proxy_empty_batch_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_empty_batch_nosec_test/h2_proxy_empty_batch_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_empty_batch_test/h2_proxy_empty_batch_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_empty_batch_test/h2_proxy_empty_batch_test.vcxproj index bf6a07648b6..83dc9e42f79 100644 --- a/vsprojects/vcxproj/test/h2_proxy_empty_batch_test/h2_proxy_empty_batch_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_empty_batch_test/h2_proxy_empty_batch_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_graceful_server_shutdown_nosec_test/h2_proxy_graceful_server_shutdown_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_graceful_server_shutdown_nosec_test/h2_proxy_graceful_server_shutdown_nosec_test.vcxproj index f9b2b9c67ea..c2ccb14179f 100644 --- a/vsprojects/vcxproj/test/h2_proxy_graceful_server_shutdown_nosec_test/h2_proxy_graceful_server_shutdown_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_graceful_server_shutdown_nosec_test/h2_proxy_graceful_server_shutdown_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_graceful_server_shutdown_test/h2_proxy_graceful_server_shutdown_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_graceful_server_shutdown_test/h2_proxy_graceful_server_shutdown_test.vcxproj index c684193fedf..cb9c9289e2b 100644 --- a/vsprojects/vcxproj/test/h2_proxy_graceful_server_shutdown_test/h2_proxy_graceful_server_shutdown_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_graceful_server_shutdown_test/h2_proxy_graceful_server_shutdown_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_high_initial_seqno_nosec_test/h2_proxy_high_initial_seqno_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_high_initial_seqno_nosec_test/h2_proxy_high_initial_seqno_nosec_test.vcxproj index ba82b076db4..5bb8fe280b7 100644 --- a/vsprojects/vcxproj/test/h2_proxy_high_initial_seqno_nosec_test/h2_proxy_high_initial_seqno_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_high_initial_seqno_nosec_test/h2_proxy_high_initial_seqno_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_high_initial_seqno_test/h2_proxy_high_initial_seqno_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_high_initial_seqno_test/h2_proxy_high_initial_seqno_test.vcxproj index 8b4795d971b..f4b8987f5bc 100644 --- a/vsprojects/vcxproj/test/h2_proxy_high_initial_seqno_test/h2_proxy_high_initial_seqno_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_high_initial_seqno_test/h2_proxy_high_initial_seqno_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_invoke_large_request_nosec_test/h2_proxy_invoke_large_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_invoke_large_request_nosec_test/h2_proxy_invoke_large_request_nosec_test.vcxproj index 9327b1dc606..819da3a19e4 100644 --- a/vsprojects/vcxproj/test/h2_proxy_invoke_large_request_nosec_test/h2_proxy_invoke_large_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_invoke_large_request_nosec_test/h2_proxy_invoke_large_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_invoke_large_request_test/h2_proxy_invoke_large_request_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_invoke_large_request_test/h2_proxy_invoke_large_request_test.vcxproj index f839ca20f42..f8b597d0ea3 100644 --- a/vsprojects/vcxproj/test/h2_proxy_invoke_large_request_test/h2_proxy_invoke_large_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_invoke_large_request_test/h2_proxy_invoke_large_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_large_metadata_nosec_test/h2_proxy_large_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_large_metadata_nosec_test/h2_proxy_large_metadata_nosec_test.vcxproj index b18289b0fcd..02cdf390c41 100644 --- a/vsprojects/vcxproj/test/h2_proxy_large_metadata_nosec_test/h2_proxy_large_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_large_metadata_nosec_test/h2_proxy_large_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_large_metadata_test/h2_proxy_large_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_large_metadata_test/h2_proxy_large_metadata_test.vcxproj index a8615fd620e..ddbb077f4fa 100644 --- a/vsprojects/vcxproj/test/h2_proxy_large_metadata_test/h2_proxy_large_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_large_metadata_test/h2_proxy_large_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_max_message_length_nosec_test/h2_proxy_max_message_length_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_max_message_length_nosec_test/h2_proxy_max_message_length_nosec_test.vcxproj index 6cd9422232e..07025472dde 100644 --- a/vsprojects/vcxproj/test/h2_proxy_max_message_length_nosec_test/h2_proxy_max_message_length_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_max_message_length_nosec_test/h2_proxy_max_message_length_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_max_message_length_test/h2_proxy_max_message_length_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_max_message_length_test/h2_proxy_max_message_length_test.vcxproj index 03db2f7830d..a2acd072755 100644 --- a/vsprojects/vcxproj/test/h2_proxy_max_message_length_test/h2_proxy_max_message_length_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_max_message_length_test/h2_proxy_max_message_length_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_metadata_nosec_test/h2_proxy_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_metadata_nosec_test/h2_proxy_metadata_nosec_test.vcxproj index ed957b3b1d7..26e04eed61e 100644 --- a/vsprojects/vcxproj/test/h2_proxy_metadata_nosec_test/h2_proxy_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_metadata_nosec_test/h2_proxy_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_metadata_test/h2_proxy_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_metadata_test/h2_proxy_metadata_test.vcxproj index a9edb15b6fd..806531ab003 100644 --- a/vsprojects/vcxproj/test/h2_proxy_metadata_test/h2_proxy_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_metadata_test/h2_proxy_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_no_op_nosec_test/h2_proxy_no_op_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_no_op_nosec_test/h2_proxy_no_op_nosec_test.vcxproj index 160e486818a..7fcc6ff6f7e 100644 --- a/vsprojects/vcxproj/test/h2_proxy_no_op_nosec_test/h2_proxy_no_op_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_no_op_nosec_test/h2_proxy_no_op_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_no_op_test/h2_proxy_no_op_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_no_op_test/h2_proxy_no_op_test.vcxproj index b9473581fbf..3f5ab1f022c 100644 --- a/vsprojects/vcxproj/test/h2_proxy_no_op_test/h2_proxy_no_op_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_no_op_test/h2_proxy_no_op_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_payload_nosec_test/h2_proxy_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_payload_nosec_test/h2_proxy_payload_nosec_test.vcxproj index 1478de6617c..1df46a280fb 100644 --- a/vsprojects/vcxproj/test/h2_proxy_payload_nosec_test/h2_proxy_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_payload_nosec_test/h2_proxy_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_payload_test/h2_proxy_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_payload_test/h2_proxy_payload_test.vcxproj index 8edcfeeef10..d7f8fec00dd 100644 --- a/vsprojects/vcxproj/test/h2_proxy_payload_test/h2_proxy_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_payload_test/h2_proxy_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_ping_pong_streaming_nosec_test/h2_proxy_ping_pong_streaming_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_ping_pong_streaming_nosec_test/h2_proxy_ping_pong_streaming_nosec_test.vcxproj index 3fa6b173c56..4b6224f8513 100644 --- a/vsprojects/vcxproj/test/h2_proxy_ping_pong_streaming_nosec_test/h2_proxy_ping_pong_streaming_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_ping_pong_streaming_nosec_test/h2_proxy_ping_pong_streaming_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_ping_pong_streaming_test/h2_proxy_ping_pong_streaming_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_ping_pong_streaming_test/h2_proxy_ping_pong_streaming_test.vcxproj index 6ffad1c6802..c3795150641 100644 --- a/vsprojects/vcxproj/test/h2_proxy_ping_pong_streaming_test/h2_proxy_ping_pong_streaming_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_ping_pong_streaming_test/h2_proxy_ping_pong_streaming_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_registered_call_nosec_test/h2_proxy_registered_call_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_registered_call_nosec_test/h2_proxy_registered_call_nosec_test.vcxproj index 12d63ee7344..b2b94fb22bd 100644 --- a/vsprojects/vcxproj/test/h2_proxy_registered_call_nosec_test/h2_proxy_registered_call_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_registered_call_nosec_test/h2_proxy_registered_call_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_registered_call_test/h2_proxy_registered_call_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_registered_call_test/h2_proxy_registered_call_test.vcxproj index dfba13eb110..72613223e83 100644 --- a/vsprojects/vcxproj/test/h2_proxy_registered_call_test/h2_proxy_registered_call_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_registered_call_test/h2_proxy_registered_call_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_request_with_payload_nosec_test/h2_proxy_request_with_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_request_with_payload_nosec_test/h2_proxy_request_with_payload_nosec_test.vcxproj index 46c6873c6dc..335ad4719cb 100644 --- a/vsprojects/vcxproj/test/h2_proxy_request_with_payload_nosec_test/h2_proxy_request_with_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_request_with_payload_nosec_test/h2_proxy_request_with_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_request_with_payload_test/h2_proxy_request_with_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_request_with_payload_test/h2_proxy_request_with_payload_test.vcxproj index 670b8f1fb3f..8d749b144aa 100644 --- a/vsprojects/vcxproj/test/h2_proxy_request_with_payload_test/h2_proxy_request_with_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_request_with_payload_test/h2_proxy_request_with_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_server_finishes_request_nosec_test/h2_proxy_server_finishes_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_server_finishes_request_nosec_test/h2_proxy_server_finishes_request_nosec_test.vcxproj index 51cff273f8b..cfbd1d83458 100644 --- a/vsprojects/vcxproj/test/h2_proxy_server_finishes_request_nosec_test/h2_proxy_server_finishes_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_server_finishes_request_nosec_test/h2_proxy_server_finishes_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_server_finishes_request_test/h2_proxy_server_finishes_request_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_server_finishes_request_test/h2_proxy_server_finishes_request_test.vcxproj index 7fa6b280647..00583b0cfdc 100644 --- a/vsprojects/vcxproj/test/h2_proxy_server_finishes_request_test/h2_proxy_server_finishes_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_server_finishes_request_test/h2_proxy_server_finishes_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_calls_nosec_test/h2_proxy_shutdown_finishes_calls_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_calls_nosec_test/h2_proxy_shutdown_finishes_calls_nosec_test.vcxproj index d1f05c66836..4ab8b5a49a4 100644 --- a/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_calls_nosec_test/h2_proxy_shutdown_finishes_calls_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_calls_nosec_test/h2_proxy_shutdown_finishes_calls_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_calls_test/h2_proxy_shutdown_finishes_calls_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_calls_test/h2_proxy_shutdown_finishes_calls_test.vcxproj index ef34a3ceb54..713d071f92b 100644 --- a/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_calls_test/h2_proxy_shutdown_finishes_calls_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_calls_test/h2_proxy_shutdown_finishes_calls_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_tags_nosec_test/h2_proxy_shutdown_finishes_tags_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_tags_nosec_test/h2_proxy_shutdown_finishes_tags_nosec_test.vcxproj index e8ab56ac805..d0e300af143 100644 --- a/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_tags_nosec_test/h2_proxy_shutdown_finishes_tags_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_tags_nosec_test/h2_proxy_shutdown_finishes_tags_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_tags_test/h2_proxy_shutdown_finishes_tags_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_tags_test/h2_proxy_shutdown_finishes_tags_test.vcxproj index d114aafcc76..8793d50fba1 100644 --- a/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_tags_test/h2_proxy_shutdown_finishes_tags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_shutdown_finishes_tags_test/h2_proxy_shutdown_finishes_tags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_simple_delayed_request_nosec_test/h2_proxy_simple_delayed_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_simple_delayed_request_nosec_test/h2_proxy_simple_delayed_request_nosec_test.vcxproj index 86b17622091..a4c5919797f 100644 --- a/vsprojects/vcxproj/test/h2_proxy_simple_delayed_request_nosec_test/h2_proxy_simple_delayed_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_simple_delayed_request_nosec_test/h2_proxy_simple_delayed_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_simple_delayed_request_test/h2_proxy_simple_delayed_request_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_simple_delayed_request_test/h2_proxy_simple_delayed_request_test.vcxproj index 512d83a234a..e3209df5e4a 100644 --- a/vsprojects/vcxproj/test/h2_proxy_simple_delayed_request_test/h2_proxy_simple_delayed_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_simple_delayed_request_test/h2_proxy_simple_delayed_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_simple_request_nosec_test/h2_proxy_simple_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_simple_request_nosec_test/h2_proxy_simple_request_nosec_test.vcxproj index 3ca3f43c93a..0c30ba80ed6 100644 --- a/vsprojects/vcxproj/test/h2_proxy_simple_request_nosec_test/h2_proxy_simple_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_simple_request_nosec_test/h2_proxy_simple_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_simple_request_test/h2_proxy_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_simple_request_test/h2_proxy_simple_request_test.vcxproj index 708d9e9d9f7..748f916b18d 100644 --- a/vsprojects/vcxproj/test/h2_proxy_simple_request_test/h2_proxy_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_simple_request_test/h2_proxy_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_trailing_metadata_nosec_test/h2_proxy_trailing_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_trailing_metadata_nosec_test/h2_proxy_trailing_metadata_nosec_test.vcxproj index 6b6a9cb9bbf..3ef642bc245 100644 --- a/vsprojects/vcxproj/test/h2_proxy_trailing_metadata_nosec_test/h2_proxy_trailing_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_trailing_metadata_nosec_test/h2_proxy_trailing_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_proxy_trailing_metadata_test/h2_proxy_trailing_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_proxy_trailing_metadata_test/h2_proxy_trailing_metadata_test.vcxproj index 09e05c4683a..6b8e1879ef0 100644 --- a/vsprojects/vcxproj/test/h2_proxy_trailing_metadata_test/h2_proxy_trailing_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_proxy_trailing_metadata_test/h2_proxy_trailing_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_bad_hostname_nosec_test/h2_sockpair+trace_bad_hostname_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_bad_hostname_nosec_test/h2_sockpair+trace_bad_hostname_nosec_test.vcxproj index 1394faf87e6..30b628ec0e9 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_bad_hostname_nosec_test/h2_sockpair+trace_bad_hostname_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_bad_hostname_nosec_test/h2_sockpair+trace_bad_hostname_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_bad_hostname_test/h2_sockpair+trace_bad_hostname_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_bad_hostname_test/h2_sockpair+trace_bad_hostname_test.vcxproj index 76c51fae6b1..b960cc31bc4 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_bad_hostname_test/h2_sockpair+trace_bad_hostname_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_bad_hostname_test/h2_sockpair+trace_bad_hostname_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_binary_metadata_nosec_test/h2_sockpair+trace_binary_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_binary_metadata_nosec_test/h2_sockpair+trace_binary_metadata_nosec_test.vcxproj index d03ff2d8c18..fa888cc5041 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_binary_metadata_nosec_test/h2_sockpair+trace_binary_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_binary_metadata_nosec_test/h2_sockpair+trace_binary_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_binary_metadata_test/h2_sockpair+trace_binary_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_binary_metadata_test/h2_sockpair+trace_binary_metadata_test.vcxproj index 90758b9d95a..0ad7f518f6f 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_binary_metadata_test/h2_sockpair+trace_binary_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_binary_metadata_test/h2_sockpair+trace_binary_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_call_creds_test/h2_sockpair+trace_call_creds_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_call_creds_test/h2_sockpair+trace_call_creds_test.vcxproj index eff43c3b2a6..cb135ec9e15 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_call_creds_test/h2_sockpair+trace_call_creds_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_call_creds_test/h2_sockpair+trace_call_creds_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_accept_nosec_test/h2_sockpair+trace_cancel_after_accept_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_accept_nosec_test/h2_sockpair+trace_cancel_after_accept_nosec_test.vcxproj index dd335195a9f..ec0135006e3 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_accept_nosec_test/h2_sockpair+trace_cancel_after_accept_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_accept_nosec_test/h2_sockpair+trace_cancel_after_accept_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_accept_test/h2_sockpair+trace_cancel_after_accept_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_accept_test/h2_sockpair+trace_cancel_after_accept_test.vcxproj index d5a677d2e8c..135dd4f0912 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_accept_test/h2_sockpair+trace_cancel_after_accept_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_accept_test/h2_sockpair+trace_cancel_after_accept_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_client_done_nosec_test/h2_sockpair+trace_cancel_after_client_done_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_client_done_nosec_test/h2_sockpair+trace_cancel_after_client_done_nosec_test.vcxproj index b4fd8422e11..263b3626350 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_client_done_nosec_test/h2_sockpair+trace_cancel_after_client_done_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_client_done_nosec_test/h2_sockpair+trace_cancel_after_client_done_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_client_done_test/h2_sockpair+trace_cancel_after_client_done_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_client_done_test/h2_sockpair+trace_cancel_after_client_done_test.vcxproj index 02d407b0ac6..b89d0ee177d 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_client_done_test/h2_sockpair+trace_cancel_after_client_done_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_client_done_test/h2_sockpair+trace_cancel_after_client_done_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_invoke_nosec_test/h2_sockpair+trace_cancel_after_invoke_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_invoke_nosec_test/h2_sockpair+trace_cancel_after_invoke_nosec_test.vcxproj index 0dacd5c9bd8..2e7eeed74e8 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_invoke_nosec_test/h2_sockpair+trace_cancel_after_invoke_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_invoke_nosec_test/h2_sockpair+trace_cancel_after_invoke_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_invoke_test/h2_sockpair+trace_cancel_after_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_invoke_test/h2_sockpair+trace_cancel_after_invoke_test.vcxproj index 5d790cc07d7..bf8ececd32e 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_invoke_test/h2_sockpair+trace_cancel_after_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_after_invoke_test/h2_sockpair+trace_cancel_after_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_before_invoke_nosec_test/h2_sockpair+trace_cancel_before_invoke_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_before_invoke_nosec_test/h2_sockpair+trace_cancel_before_invoke_nosec_test.vcxproj index 24faacad2c3..d470dab0e1c 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_before_invoke_nosec_test/h2_sockpair+trace_cancel_before_invoke_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_before_invoke_nosec_test/h2_sockpair+trace_cancel_before_invoke_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_before_invoke_test/h2_sockpair+trace_cancel_before_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_before_invoke_test/h2_sockpair+trace_cancel_before_invoke_test.vcxproj index 1296bd33193..e240f5c5c77 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_before_invoke_test/h2_sockpair+trace_cancel_before_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_before_invoke_test/h2_sockpair+trace_cancel_before_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_in_a_vacuum_nosec_test/h2_sockpair+trace_cancel_in_a_vacuum_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_in_a_vacuum_nosec_test/h2_sockpair+trace_cancel_in_a_vacuum_nosec_test.vcxproj index 17f0193d4c0..a3d84db8c8d 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_in_a_vacuum_nosec_test/h2_sockpair+trace_cancel_in_a_vacuum_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_in_a_vacuum_nosec_test/h2_sockpair+trace_cancel_in_a_vacuum_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_in_a_vacuum_test/h2_sockpair+trace_cancel_in_a_vacuum_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_in_a_vacuum_test/h2_sockpair+trace_cancel_in_a_vacuum_test.vcxproj index c7d91fb7cbd..0e8b21d258a 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_in_a_vacuum_test/h2_sockpair+trace_cancel_in_a_vacuum_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_cancel_in_a_vacuum_test/h2_sockpair+trace_cancel_in_a_vacuum_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_census_simple_request_nosec_test/h2_sockpair+trace_census_simple_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_census_simple_request_nosec_test/h2_sockpair+trace_census_simple_request_nosec_test.vcxproj index 8ec2791e846..17228527c9c 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_census_simple_request_nosec_test/h2_sockpair+trace_census_simple_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_census_simple_request_nosec_test/h2_sockpair+trace_census_simple_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_census_simple_request_test/h2_sockpair+trace_census_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_census_simple_request_test/h2_sockpair+trace_census_simple_request_test.vcxproj index 4e928e8c669..a081f4af10f 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_census_simple_request_test/h2_sockpair+trace_census_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_census_simple_request_test/h2_sockpair+trace_census_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_compressed_payload_nosec_test/h2_sockpair+trace_compressed_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_compressed_payload_nosec_test/h2_sockpair+trace_compressed_payload_nosec_test.vcxproj index cc1aea93b70..0cf5f9976dd 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_compressed_payload_nosec_test/h2_sockpair+trace_compressed_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_compressed_payload_nosec_test/h2_sockpair+trace_compressed_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_compressed_payload_test/h2_sockpair+trace_compressed_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_compressed_payload_test/h2_sockpair+trace_compressed_payload_test.vcxproj index 55bfa5a08b0..af12e4acdab 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_compressed_payload_test/h2_sockpair+trace_compressed_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_compressed_payload_test/h2_sockpair+trace_compressed_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_empty_batch_nosec_test/h2_sockpair+trace_empty_batch_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_empty_batch_nosec_test/h2_sockpair+trace_empty_batch_nosec_test.vcxproj index 1e3f43b2f40..b7e8e0dd29b 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_empty_batch_nosec_test/h2_sockpair+trace_empty_batch_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_empty_batch_nosec_test/h2_sockpair+trace_empty_batch_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_empty_batch_test/h2_sockpair+trace_empty_batch_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_empty_batch_test/h2_sockpair+trace_empty_batch_test.vcxproj index af4dcebda76..c812341bc10 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_empty_batch_test/h2_sockpair+trace_empty_batch_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_empty_batch_test/h2_sockpair+trace_empty_batch_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_graceful_server_shutdown_nosec_test/h2_sockpair+trace_graceful_server_shutdown_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_graceful_server_shutdown_nosec_test/h2_sockpair+trace_graceful_server_shutdown_nosec_test.vcxproj index 707ace1f312..659d6710040 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_graceful_server_shutdown_nosec_test/h2_sockpair+trace_graceful_server_shutdown_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_graceful_server_shutdown_nosec_test/h2_sockpair+trace_graceful_server_shutdown_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_graceful_server_shutdown_test/h2_sockpair+trace_graceful_server_shutdown_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_graceful_server_shutdown_test/h2_sockpair+trace_graceful_server_shutdown_test.vcxproj index d2a34836728..702091433b2 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_graceful_server_shutdown_test/h2_sockpair+trace_graceful_server_shutdown_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_graceful_server_shutdown_test/h2_sockpair+trace_graceful_server_shutdown_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_high_initial_seqno_nosec_test/h2_sockpair+trace_high_initial_seqno_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_high_initial_seqno_nosec_test/h2_sockpair+trace_high_initial_seqno_nosec_test.vcxproj index aff80ec1a4c..fb8d0b1dee5 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_high_initial_seqno_nosec_test/h2_sockpair+trace_high_initial_seqno_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_high_initial_seqno_nosec_test/h2_sockpair+trace_high_initial_seqno_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_high_initial_seqno_test/h2_sockpair+trace_high_initial_seqno_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_high_initial_seqno_test/h2_sockpair+trace_high_initial_seqno_test.vcxproj index b4cc0457d7d..5ef20a485fc 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_high_initial_seqno_test/h2_sockpair+trace_high_initial_seqno_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_high_initial_seqno_test/h2_sockpair+trace_high_initial_seqno_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_invoke_large_request_nosec_test/h2_sockpair+trace_invoke_large_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_invoke_large_request_nosec_test/h2_sockpair+trace_invoke_large_request_nosec_test.vcxproj index f70030309a7..6555bf7c74d 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_invoke_large_request_nosec_test/h2_sockpair+trace_invoke_large_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_invoke_large_request_nosec_test/h2_sockpair+trace_invoke_large_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_invoke_large_request_test/h2_sockpair+trace_invoke_large_request_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_invoke_large_request_test/h2_sockpair+trace_invoke_large_request_test.vcxproj index 3481ae432a5..097ac03d4e9 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_invoke_large_request_test/h2_sockpair+trace_invoke_large_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_invoke_large_request_test/h2_sockpair+trace_invoke_large_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_large_metadata_nosec_test/h2_sockpair+trace_large_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_large_metadata_nosec_test/h2_sockpair+trace_large_metadata_nosec_test.vcxproj index 6c71b720270..42cbe03cf8e 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_large_metadata_nosec_test/h2_sockpair+trace_large_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_large_metadata_nosec_test/h2_sockpair+trace_large_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_large_metadata_test/h2_sockpair+trace_large_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_large_metadata_test/h2_sockpair+trace_large_metadata_test.vcxproj index 5747a4e36dd..8eba34a8015 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_large_metadata_test/h2_sockpair+trace_large_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_large_metadata_test/h2_sockpair+trace_large_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_max_concurrent_streams_nosec_test/h2_sockpair+trace_max_concurrent_streams_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_max_concurrent_streams_nosec_test/h2_sockpair+trace_max_concurrent_streams_nosec_test.vcxproj index a2620325e13..c870afc90ad 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_max_concurrent_streams_nosec_test/h2_sockpair+trace_max_concurrent_streams_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_max_concurrent_streams_nosec_test/h2_sockpair+trace_max_concurrent_streams_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_max_concurrent_streams_test/h2_sockpair+trace_max_concurrent_streams_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_max_concurrent_streams_test/h2_sockpair+trace_max_concurrent_streams_test.vcxproj index 1be397ca6b0..0e81b37a4f5 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_max_concurrent_streams_test/h2_sockpair+trace_max_concurrent_streams_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_max_concurrent_streams_test/h2_sockpair+trace_max_concurrent_streams_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_max_message_length_nosec_test/h2_sockpair+trace_max_message_length_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_max_message_length_nosec_test/h2_sockpair+trace_max_message_length_nosec_test.vcxproj index 8809ae14e24..b639d6f9288 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_max_message_length_nosec_test/h2_sockpair+trace_max_message_length_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_max_message_length_nosec_test/h2_sockpair+trace_max_message_length_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_max_message_length_test/h2_sockpair+trace_max_message_length_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_max_message_length_test/h2_sockpair+trace_max_message_length_test.vcxproj index b155399b3a4..0c6b6afaa94 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_max_message_length_test/h2_sockpair+trace_max_message_length_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_max_message_length_test/h2_sockpair+trace_max_message_length_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_metadata_nosec_test/h2_sockpair+trace_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_metadata_nosec_test/h2_sockpair+trace_metadata_nosec_test.vcxproj index 9f9c0ae9a5a..cab0f910711 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_metadata_nosec_test/h2_sockpair+trace_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_metadata_nosec_test/h2_sockpair+trace_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_metadata_test/h2_sockpair+trace_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_metadata_test/h2_sockpair+trace_metadata_test.vcxproj index 48d03552f35..f6ffb6515c9 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_metadata_test/h2_sockpair+trace_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_metadata_test/h2_sockpair+trace_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_no_op_nosec_test/h2_sockpair+trace_no_op_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_no_op_nosec_test/h2_sockpair+trace_no_op_nosec_test.vcxproj index 45a0ef1e97b..b35cea0e222 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_no_op_nosec_test/h2_sockpair+trace_no_op_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_no_op_nosec_test/h2_sockpair+trace_no_op_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_no_op_test/h2_sockpair+trace_no_op_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_no_op_test/h2_sockpair+trace_no_op_test.vcxproj index b6d082061c6..c08c0dc7659 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_no_op_test/h2_sockpair+trace_no_op_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_no_op_test/h2_sockpair+trace_no_op_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_payload_nosec_test/h2_sockpair+trace_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_payload_nosec_test/h2_sockpair+trace_payload_nosec_test.vcxproj index 72499f74dd8..4178a86ed83 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_payload_nosec_test/h2_sockpair+trace_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_payload_nosec_test/h2_sockpair+trace_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_payload_test/h2_sockpair+trace_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_payload_test/h2_sockpair+trace_payload_test.vcxproj index 03af8a23011..7b0cb26058a 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_payload_test/h2_sockpair+trace_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_payload_test/h2_sockpair+trace_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_ping_pong_streaming_nosec_test/h2_sockpair+trace_ping_pong_streaming_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_ping_pong_streaming_nosec_test/h2_sockpair+trace_ping_pong_streaming_nosec_test.vcxproj index 45a54aa3574..437cade925f 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_ping_pong_streaming_nosec_test/h2_sockpair+trace_ping_pong_streaming_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_ping_pong_streaming_nosec_test/h2_sockpair+trace_ping_pong_streaming_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_ping_pong_streaming_test/h2_sockpair+trace_ping_pong_streaming_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_ping_pong_streaming_test/h2_sockpair+trace_ping_pong_streaming_test.vcxproj index f20c33f05d0..941eb5714f3 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_ping_pong_streaming_test/h2_sockpair+trace_ping_pong_streaming_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_ping_pong_streaming_test/h2_sockpair+trace_ping_pong_streaming_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_registered_call_nosec_test/h2_sockpair+trace_registered_call_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_registered_call_nosec_test/h2_sockpair+trace_registered_call_nosec_test.vcxproj index 66f010676ab..843f3fc9ab3 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_registered_call_nosec_test/h2_sockpair+trace_registered_call_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_registered_call_nosec_test/h2_sockpair+trace_registered_call_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_registered_call_test/h2_sockpair+trace_registered_call_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_registered_call_test/h2_sockpair+trace_registered_call_test.vcxproj index e5f53c0a37a..17cac3bb639 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_registered_call_test/h2_sockpair+trace_registered_call_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_registered_call_test/h2_sockpair+trace_registered_call_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_flags_nosec_test/h2_sockpair+trace_request_with_flags_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_flags_nosec_test/h2_sockpair+trace_request_with_flags_nosec_test.vcxproj index aac8e914452..5bdbe599cfb 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_flags_nosec_test/h2_sockpair+trace_request_with_flags_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_flags_nosec_test/h2_sockpair+trace_request_with_flags_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_flags_test/h2_sockpair+trace_request_with_flags_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_flags_test/h2_sockpair+trace_request_with_flags_test.vcxproj index 68587cca238..36c30ea6720 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_flags_test/h2_sockpair+trace_request_with_flags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_flags_test/h2_sockpair+trace_request_with_flags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_payload_nosec_test/h2_sockpair+trace_request_with_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_payload_nosec_test/h2_sockpair+trace_request_with_payload_nosec_test.vcxproj index ab081c2c926..15ccd209cc7 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_payload_nosec_test/h2_sockpair+trace_request_with_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_payload_nosec_test/h2_sockpair+trace_request_with_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_payload_test/h2_sockpair+trace_request_with_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_payload_test/h2_sockpair+trace_request_with_payload_test.vcxproj index 04119b4c411..1f557fb8a1b 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_payload_test/h2_sockpair+trace_request_with_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_request_with_payload_test/h2_sockpair+trace_request_with_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_server_finishes_request_nosec_test/h2_sockpair+trace_server_finishes_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_server_finishes_request_nosec_test/h2_sockpair+trace_server_finishes_request_nosec_test.vcxproj index adbfd04887a..dc46d05d8b6 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_server_finishes_request_nosec_test/h2_sockpair+trace_server_finishes_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_server_finishes_request_nosec_test/h2_sockpair+trace_server_finishes_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_server_finishes_request_test/h2_sockpair+trace_server_finishes_request_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_server_finishes_request_test/h2_sockpair+trace_server_finishes_request_test.vcxproj index fc11af1acd1..6d3a96386d0 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_server_finishes_request_test/h2_sockpair+trace_server_finishes_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_server_finishes_request_test/h2_sockpair+trace_server_finishes_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_calls_nosec_test/h2_sockpair+trace_shutdown_finishes_calls_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_calls_nosec_test/h2_sockpair+trace_shutdown_finishes_calls_nosec_test.vcxproj index 103ea30dcdd..3e02890a843 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_calls_nosec_test/h2_sockpair+trace_shutdown_finishes_calls_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_calls_nosec_test/h2_sockpair+trace_shutdown_finishes_calls_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_calls_test/h2_sockpair+trace_shutdown_finishes_calls_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_calls_test/h2_sockpair+trace_shutdown_finishes_calls_test.vcxproj index ac51945c3e5..9566e622335 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_calls_test/h2_sockpair+trace_shutdown_finishes_calls_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_calls_test/h2_sockpair+trace_shutdown_finishes_calls_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_tags_nosec_test/h2_sockpair+trace_shutdown_finishes_tags_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_tags_nosec_test/h2_sockpair+trace_shutdown_finishes_tags_nosec_test.vcxproj index bd903e14d31..43d547e2153 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_tags_nosec_test/h2_sockpair+trace_shutdown_finishes_tags_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_tags_nosec_test/h2_sockpair+trace_shutdown_finishes_tags_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_tags_test/h2_sockpair+trace_shutdown_finishes_tags_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_tags_test/h2_sockpair+trace_shutdown_finishes_tags_test.vcxproj index 6178360a335..47dc167268d 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_tags_test/h2_sockpair+trace_shutdown_finishes_tags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_shutdown_finishes_tags_test/h2_sockpair+trace_shutdown_finishes_tags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_simple_request_nosec_test/h2_sockpair+trace_simple_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_simple_request_nosec_test/h2_sockpair+trace_simple_request_nosec_test.vcxproj index cf5844e2bd0..831816e0f63 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_simple_request_nosec_test/h2_sockpair+trace_simple_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_simple_request_nosec_test/h2_sockpair+trace_simple_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_simple_request_test/h2_sockpair+trace_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_simple_request_test/h2_sockpair+trace_simple_request_test.vcxproj index 6ad140c583c..ad659749341 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_simple_request_test/h2_sockpair+trace_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_simple_request_test/h2_sockpair+trace_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_trailing_metadata_nosec_test/h2_sockpair+trace_trailing_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_trailing_metadata_nosec_test/h2_sockpair+trace_trailing_metadata_nosec_test.vcxproj index a7a99eca770..00b2d9d3794 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_trailing_metadata_nosec_test/h2_sockpair+trace_trailing_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_trailing_metadata_nosec_test/h2_sockpair+trace_trailing_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair+trace_trailing_metadata_test/h2_sockpair+trace_trailing_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair+trace_trailing_metadata_test/h2_sockpair+trace_trailing_metadata_test.vcxproj index 7534e54e210..2c9e4909422 100644 --- a/vsprojects/vcxproj/test/h2_sockpair+trace_trailing_metadata_test/h2_sockpair+trace_trailing_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair+trace_trailing_metadata_test/h2_sockpair+trace_trailing_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_bad_hostname_nosec_test/h2_sockpair_1byte_bad_hostname_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_bad_hostname_nosec_test/h2_sockpair_1byte_bad_hostname_nosec_test.vcxproj index 0d714521e61..a29ccb8ea42 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_bad_hostname_nosec_test/h2_sockpair_1byte_bad_hostname_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_bad_hostname_nosec_test/h2_sockpair_1byte_bad_hostname_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_bad_hostname_test/h2_sockpair_1byte_bad_hostname_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_bad_hostname_test/h2_sockpair_1byte_bad_hostname_test.vcxproj index 0b9c37131b0..33d70c3754b 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_bad_hostname_test/h2_sockpair_1byte_bad_hostname_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_bad_hostname_test/h2_sockpair_1byte_bad_hostname_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_binary_metadata_nosec_test/h2_sockpair_1byte_binary_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_binary_metadata_nosec_test/h2_sockpair_1byte_binary_metadata_nosec_test.vcxproj index cb8a3a080cc..9ebe6bc8d7d 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_binary_metadata_nosec_test/h2_sockpair_1byte_binary_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_binary_metadata_nosec_test/h2_sockpair_1byte_binary_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_binary_metadata_test/h2_sockpair_1byte_binary_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_binary_metadata_test/h2_sockpair_1byte_binary_metadata_test.vcxproj index 7d0b5fc8c7c..5714e5bf0f3 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_binary_metadata_test/h2_sockpair_1byte_binary_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_binary_metadata_test/h2_sockpair_1byte_binary_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_call_creds_test/h2_sockpair_1byte_call_creds_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_call_creds_test/h2_sockpair_1byte_call_creds_test.vcxproj index a5e61d3bd7e..532c0c3e60a 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_call_creds_test/h2_sockpair_1byte_call_creds_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_call_creds_test/h2_sockpair_1byte_call_creds_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_accept_nosec_test/h2_sockpair_1byte_cancel_after_accept_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_accept_nosec_test/h2_sockpair_1byte_cancel_after_accept_nosec_test.vcxproj index 1a41b9ddf29..29c4271024b 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_accept_nosec_test/h2_sockpair_1byte_cancel_after_accept_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_accept_nosec_test/h2_sockpair_1byte_cancel_after_accept_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_accept_test/h2_sockpair_1byte_cancel_after_accept_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_accept_test/h2_sockpair_1byte_cancel_after_accept_test.vcxproj index d45e50901f8..6730639ed94 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_accept_test/h2_sockpair_1byte_cancel_after_accept_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_accept_test/h2_sockpair_1byte_cancel_after_accept_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_client_done_nosec_test/h2_sockpair_1byte_cancel_after_client_done_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_client_done_nosec_test/h2_sockpair_1byte_cancel_after_client_done_nosec_test.vcxproj index 0124b04f451..78e56a3b4cc 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_client_done_nosec_test/h2_sockpair_1byte_cancel_after_client_done_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_client_done_nosec_test/h2_sockpair_1byte_cancel_after_client_done_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_client_done_test/h2_sockpair_1byte_cancel_after_client_done_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_client_done_test/h2_sockpair_1byte_cancel_after_client_done_test.vcxproj index 66708078ec6..43fa4a5a531 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_client_done_test/h2_sockpair_1byte_cancel_after_client_done_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_client_done_test/h2_sockpair_1byte_cancel_after_client_done_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_invoke_nosec_test/h2_sockpair_1byte_cancel_after_invoke_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_invoke_nosec_test/h2_sockpair_1byte_cancel_after_invoke_nosec_test.vcxproj index 41dacb0bc91..8ee67b39f43 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_invoke_nosec_test/h2_sockpair_1byte_cancel_after_invoke_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_invoke_nosec_test/h2_sockpair_1byte_cancel_after_invoke_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_invoke_test/h2_sockpair_1byte_cancel_after_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_invoke_test/h2_sockpair_1byte_cancel_after_invoke_test.vcxproj index f11850686e3..901c878c002 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_invoke_test/h2_sockpair_1byte_cancel_after_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_after_invoke_test/h2_sockpair_1byte_cancel_after_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_before_invoke_nosec_test/h2_sockpair_1byte_cancel_before_invoke_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_before_invoke_nosec_test/h2_sockpair_1byte_cancel_before_invoke_nosec_test.vcxproj index 12f9aed2a1f..1091f5bfd25 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_before_invoke_nosec_test/h2_sockpair_1byte_cancel_before_invoke_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_before_invoke_nosec_test/h2_sockpair_1byte_cancel_before_invoke_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_before_invoke_test/h2_sockpair_1byte_cancel_before_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_before_invoke_test/h2_sockpair_1byte_cancel_before_invoke_test.vcxproj index 8f091632025..2e334681faf 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_before_invoke_test/h2_sockpair_1byte_cancel_before_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_before_invoke_test/h2_sockpair_1byte_cancel_before_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test/h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test/h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test.vcxproj index a905faff6be..806fcc3de76 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test/h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test/h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_in_a_vacuum_test/h2_sockpair_1byte_cancel_in_a_vacuum_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_in_a_vacuum_test/h2_sockpair_1byte_cancel_in_a_vacuum_test.vcxproj index fa7182d3124..ede84d748cd 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_in_a_vacuum_test/h2_sockpair_1byte_cancel_in_a_vacuum_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_cancel_in_a_vacuum_test/h2_sockpair_1byte_cancel_in_a_vacuum_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_census_simple_request_nosec_test/h2_sockpair_1byte_census_simple_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_census_simple_request_nosec_test/h2_sockpair_1byte_census_simple_request_nosec_test.vcxproj index 29740409ee8..d7923e0ee02 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_census_simple_request_nosec_test/h2_sockpair_1byte_census_simple_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_census_simple_request_nosec_test/h2_sockpair_1byte_census_simple_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_census_simple_request_test/h2_sockpair_1byte_census_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_census_simple_request_test/h2_sockpair_1byte_census_simple_request_test.vcxproj index db26ae2360e..20f781f9864 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_census_simple_request_test/h2_sockpair_1byte_census_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_census_simple_request_test/h2_sockpair_1byte_census_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_compressed_payload_nosec_test/h2_sockpair_1byte_compressed_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_compressed_payload_nosec_test/h2_sockpair_1byte_compressed_payload_nosec_test.vcxproj index d266e22f4a7..b8ffad9bc5d 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_compressed_payload_nosec_test/h2_sockpair_1byte_compressed_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_compressed_payload_nosec_test/h2_sockpair_1byte_compressed_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_compressed_payload_test/h2_sockpair_1byte_compressed_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_compressed_payload_test/h2_sockpair_1byte_compressed_payload_test.vcxproj index 527139c2ff4..f00238c7864 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_compressed_payload_test/h2_sockpair_1byte_compressed_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_compressed_payload_test/h2_sockpair_1byte_compressed_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_empty_batch_nosec_test/h2_sockpair_1byte_empty_batch_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_empty_batch_nosec_test/h2_sockpair_1byte_empty_batch_nosec_test.vcxproj index 617c00793d2..fde39343c8a 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_empty_batch_nosec_test/h2_sockpair_1byte_empty_batch_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_empty_batch_nosec_test/h2_sockpair_1byte_empty_batch_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_empty_batch_test/h2_sockpair_1byte_empty_batch_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_empty_batch_test/h2_sockpair_1byte_empty_batch_test.vcxproj index 8d0653d6bbe..9d1c5acda30 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_empty_batch_test/h2_sockpair_1byte_empty_batch_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_empty_batch_test/h2_sockpair_1byte_empty_batch_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_graceful_server_shutdown_nosec_test/h2_sockpair_1byte_graceful_server_shutdown_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_graceful_server_shutdown_nosec_test/h2_sockpair_1byte_graceful_server_shutdown_nosec_test.vcxproj index dd048524f9c..d8c939e3980 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_graceful_server_shutdown_nosec_test/h2_sockpair_1byte_graceful_server_shutdown_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_graceful_server_shutdown_nosec_test/h2_sockpair_1byte_graceful_server_shutdown_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_graceful_server_shutdown_test/h2_sockpair_1byte_graceful_server_shutdown_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_graceful_server_shutdown_test/h2_sockpair_1byte_graceful_server_shutdown_test.vcxproj index 88b7407d5dc..44aa2618829 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_graceful_server_shutdown_test/h2_sockpair_1byte_graceful_server_shutdown_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_graceful_server_shutdown_test/h2_sockpair_1byte_graceful_server_shutdown_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_high_initial_seqno_nosec_test/h2_sockpair_1byte_high_initial_seqno_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_high_initial_seqno_nosec_test/h2_sockpair_1byte_high_initial_seqno_nosec_test.vcxproj index dd1109f272c..87c15f5da4b 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_high_initial_seqno_nosec_test/h2_sockpair_1byte_high_initial_seqno_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_high_initial_seqno_nosec_test/h2_sockpair_1byte_high_initial_seqno_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_high_initial_seqno_test/h2_sockpair_1byte_high_initial_seqno_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_high_initial_seqno_test/h2_sockpair_1byte_high_initial_seqno_test.vcxproj index d4a5013db18..f13ed2c0abe 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_high_initial_seqno_test/h2_sockpair_1byte_high_initial_seqno_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_high_initial_seqno_test/h2_sockpair_1byte_high_initial_seqno_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_invoke_large_request_nosec_test/h2_sockpair_1byte_invoke_large_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_invoke_large_request_nosec_test/h2_sockpair_1byte_invoke_large_request_nosec_test.vcxproj index c198c59d34b..32123dce808 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_invoke_large_request_nosec_test/h2_sockpair_1byte_invoke_large_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_invoke_large_request_nosec_test/h2_sockpair_1byte_invoke_large_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_invoke_large_request_test/h2_sockpair_1byte_invoke_large_request_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_invoke_large_request_test/h2_sockpair_1byte_invoke_large_request_test.vcxproj index 94a1009423b..5b6446a6ac4 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_invoke_large_request_test/h2_sockpair_1byte_invoke_large_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_invoke_large_request_test/h2_sockpair_1byte_invoke_large_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_large_metadata_nosec_test/h2_sockpair_1byte_large_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_large_metadata_nosec_test/h2_sockpair_1byte_large_metadata_nosec_test.vcxproj index 468bd85feaf..85e90a4de6b 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_large_metadata_nosec_test/h2_sockpair_1byte_large_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_large_metadata_nosec_test/h2_sockpair_1byte_large_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_large_metadata_test/h2_sockpair_1byte_large_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_large_metadata_test/h2_sockpair_1byte_large_metadata_test.vcxproj index 6b9c929335e..12c2898487c 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_large_metadata_test/h2_sockpair_1byte_large_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_large_metadata_test/h2_sockpair_1byte_large_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_max_concurrent_streams_nosec_test/h2_sockpair_1byte_max_concurrent_streams_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_max_concurrent_streams_nosec_test/h2_sockpair_1byte_max_concurrent_streams_nosec_test.vcxproj index 8a90cc7c8c0..9c41c1f328b 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_max_concurrent_streams_nosec_test/h2_sockpair_1byte_max_concurrent_streams_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_max_concurrent_streams_nosec_test/h2_sockpair_1byte_max_concurrent_streams_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_max_concurrent_streams_test/h2_sockpair_1byte_max_concurrent_streams_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_max_concurrent_streams_test/h2_sockpair_1byte_max_concurrent_streams_test.vcxproj index 1722064e3a4..73534b16d01 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_max_concurrent_streams_test/h2_sockpair_1byte_max_concurrent_streams_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_max_concurrent_streams_test/h2_sockpair_1byte_max_concurrent_streams_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_max_message_length_nosec_test/h2_sockpair_1byte_max_message_length_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_max_message_length_nosec_test/h2_sockpair_1byte_max_message_length_nosec_test.vcxproj index bcf0df1a476..d401b09ecae 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_max_message_length_nosec_test/h2_sockpair_1byte_max_message_length_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_max_message_length_nosec_test/h2_sockpair_1byte_max_message_length_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_max_message_length_test/h2_sockpair_1byte_max_message_length_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_max_message_length_test/h2_sockpair_1byte_max_message_length_test.vcxproj index aee85bc7053..312f7cc2517 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_max_message_length_test/h2_sockpair_1byte_max_message_length_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_max_message_length_test/h2_sockpair_1byte_max_message_length_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_metadata_nosec_test/h2_sockpair_1byte_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_metadata_nosec_test/h2_sockpair_1byte_metadata_nosec_test.vcxproj index f667a69cbe4..b19a2114ef2 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_metadata_nosec_test/h2_sockpair_1byte_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_metadata_nosec_test/h2_sockpair_1byte_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_metadata_test/h2_sockpair_1byte_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_metadata_test/h2_sockpair_1byte_metadata_test.vcxproj index 1037f7110c2..95ec53033a0 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_metadata_test/h2_sockpair_1byte_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_metadata_test/h2_sockpair_1byte_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_no_op_nosec_test/h2_sockpair_1byte_no_op_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_no_op_nosec_test/h2_sockpair_1byte_no_op_nosec_test.vcxproj index 4180a6bb36e..9837f4974d0 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_no_op_nosec_test/h2_sockpair_1byte_no_op_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_no_op_nosec_test/h2_sockpair_1byte_no_op_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_no_op_test/h2_sockpair_1byte_no_op_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_no_op_test/h2_sockpair_1byte_no_op_test.vcxproj index 62c1b493d94..6ab26a51724 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_no_op_test/h2_sockpair_1byte_no_op_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_no_op_test/h2_sockpair_1byte_no_op_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_payload_nosec_test/h2_sockpair_1byte_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_payload_nosec_test/h2_sockpair_1byte_payload_nosec_test.vcxproj index d56d5c8c14b..034f96d5d90 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_payload_nosec_test/h2_sockpair_1byte_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_payload_nosec_test/h2_sockpair_1byte_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_payload_test/h2_sockpair_1byte_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_payload_test/h2_sockpair_1byte_payload_test.vcxproj index b4b2331a940..2d158d9b1c4 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_payload_test/h2_sockpair_1byte_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_payload_test/h2_sockpair_1byte_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_ping_pong_streaming_nosec_test/h2_sockpair_1byte_ping_pong_streaming_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_ping_pong_streaming_nosec_test/h2_sockpair_1byte_ping_pong_streaming_nosec_test.vcxproj index bdf8bb04cbb..da2a543aee4 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_ping_pong_streaming_nosec_test/h2_sockpair_1byte_ping_pong_streaming_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_ping_pong_streaming_nosec_test/h2_sockpair_1byte_ping_pong_streaming_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_ping_pong_streaming_test/h2_sockpair_1byte_ping_pong_streaming_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_ping_pong_streaming_test/h2_sockpair_1byte_ping_pong_streaming_test.vcxproj index e15d94364c4..9fdd5fd0d9f 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_ping_pong_streaming_test/h2_sockpair_1byte_ping_pong_streaming_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_ping_pong_streaming_test/h2_sockpair_1byte_ping_pong_streaming_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_registered_call_nosec_test/h2_sockpair_1byte_registered_call_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_registered_call_nosec_test/h2_sockpair_1byte_registered_call_nosec_test.vcxproj index c20cd019738..a80d979f11d 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_registered_call_nosec_test/h2_sockpair_1byte_registered_call_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_registered_call_nosec_test/h2_sockpair_1byte_registered_call_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_registered_call_test/h2_sockpair_1byte_registered_call_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_registered_call_test/h2_sockpair_1byte_registered_call_test.vcxproj index e331c07cdcb..20dc03602d4 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_registered_call_test/h2_sockpair_1byte_registered_call_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_registered_call_test/h2_sockpair_1byte_registered_call_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_flags_nosec_test/h2_sockpair_1byte_request_with_flags_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_flags_nosec_test/h2_sockpair_1byte_request_with_flags_nosec_test.vcxproj index 4add23b6760..0d2e4eb5c7b 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_flags_nosec_test/h2_sockpair_1byte_request_with_flags_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_flags_nosec_test/h2_sockpair_1byte_request_with_flags_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_flags_test/h2_sockpair_1byte_request_with_flags_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_flags_test/h2_sockpair_1byte_request_with_flags_test.vcxproj index f7819b003e8..3eacaf03fd2 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_flags_test/h2_sockpair_1byte_request_with_flags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_flags_test/h2_sockpair_1byte_request_with_flags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_payload_nosec_test/h2_sockpair_1byte_request_with_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_payload_nosec_test/h2_sockpair_1byte_request_with_payload_nosec_test.vcxproj index 02ecffa951f..b0185c36f90 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_payload_nosec_test/h2_sockpair_1byte_request_with_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_payload_nosec_test/h2_sockpair_1byte_request_with_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_payload_test/h2_sockpair_1byte_request_with_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_payload_test/h2_sockpair_1byte_request_with_payload_test.vcxproj index 4b55ded6c5a..99eb0bc5e00 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_payload_test/h2_sockpair_1byte_request_with_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_request_with_payload_test/h2_sockpair_1byte_request_with_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_server_finishes_request_nosec_test/h2_sockpair_1byte_server_finishes_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_server_finishes_request_nosec_test/h2_sockpair_1byte_server_finishes_request_nosec_test.vcxproj index badfa59a807..407be97d379 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_server_finishes_request_nosec_test/h2_sockpair_1byte_server_finishes_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_server_finishes_request_nosec_test/h2_sockpair_1byte_server_finishes_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_server_finishes_request_test/h2_sockpair_1byte_server_finishes_request_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_server_finishes_request_test/h2_sockpair_1byte_server_finishes_request_test.vcxproj index e3581723c4d..0e2c4f3cb35 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_server_finishes_request_test/h2_sockpair_1byte_server_finishes_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_server_finishes_request_test/h2_sockpair_1byte_server_finishes_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_calls_nosec_test/h2_sockpair_1byte_shutdown_finishes_calls_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_calls_nosec_test/h2_sockpair_1byte_shutdown_finishes_calls_nosec_test.vcxproj index aa3bcce0c35..c3130e80f48 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_calls_nosec_test/h2_sockpair_1byte_shutdown_finishes_calls_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_calls_nosec_test/h2_sockpair_1byte_shutdown_finishes_calls_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_calls_test/h2_sockpair_1byte_shutdown_finishes_calls_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_calls_test/h2_sockpair_1byte_shutdown_finishes_calls_test.vcxproj index d7c1359ba90..b617498901f 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_calls_test/h2_sockpair_1byte_shutdown_finishes_calls_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_calls_test/h2_sockpair_1byte_shutdown_finishes_calls_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_tags_nosec_test/h2_sockpair_1byte_shutdown_finishes_tags_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_tags_nosec_test/h2_sockpair_1byte_shutdown_finishes_tags_nosec_test.vcxproj index 069e48519bb..f046e30c30b 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_tags_nosec_test/h2_sockpair_1byte_shutdown_finishes_tags_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_tags_nosec_test/h2_sockpair_1byte_shutdown_finishes_tags_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_tags_test/h2_sockpair_1byte_shutdown_finishes_tags_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_tags_test/h2_sockpair_1byte_shutdown_finishes_tags_test.vcxproj index b5a5ea018c3..da0ea443882 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_tags_test/h2_sockpair_1byte_shutdown_finishes_tags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_shutdown_finishes_tags_test/h2_sockpair_1byte_shutdown_finishes_tags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_simple_request_nosec_test/h2_sockpair_1byte_simple_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_simple_request_nosec_test/h2_sockpair_1byte_simple_request_nosec_test.vcxproj index fa774940515..cb80433b4be 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_simple_request_nosec_test/h2_sockpair_1byte_simple_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_simple_request_nosec_test/h2_sockpair_1byte_simple_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_simple_request_test/h2_sockpair_1byte_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_simple_request_test/h2_sockpair_1byte_simple_request_test.vcxproj index 5971223430c..ad5a73964ee 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_simple_request_test/h2_sockpair_1byte_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_simple_request_test/h2_sockpair_1byte_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_trailing_metadata_nosec_test/h2_sockpair_1byte_trailing_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_trailing_metadata_nosec_test/h2_sockpair_1byte_trailing_metadata_nosec_test.vcxproj index fc50c8efc3c..58bed0ffb24 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_trailing_metadata_nosec_test/h2_sockpair_1byte_trailing_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_trailing_metadata_nosec_test/h2_sockpair_1byte_trailing_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_1byte_trailing_metadata_test/h2_sockpair_1byte_trailing_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_1byte_trailing_metadata_test/h2_sockpair_1byte_trailing_metadata_test.vcxproj index 452b7c6141d..c9e131f8502 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_1byte_trailing_metadata_test/h2_sockpair_1byte_trailing_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_1byte_trailing_metadata_test/h2_sockpair_1byte_trailing_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_bad_hostname_nosec_test/h2_sockpair_bad_hostname_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_bad_hostname_nosec_test/h2_sockpair_bad_hostname_nosec_test.vcxproj index e002f555041..6073673c3ed 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_bad_hostname_nosec_test/h2_sockpair_bad_hostname_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_bad_hostname_nosec_test/h2_sockpair_bad_hostname_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_bad_hostname_test/h2_sockpair_bad_hostname_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_bad_hostname_test/h2_sockpair_bad_hostname_test.vcxproj index 20394dd9161..9994cfad279 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_bad_hostname_test/h2_sockpair_bad_hostname_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_bad_hostname_test/h2_sockpair_bad_hostname_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_binary_metadata_nosec_test/h2_sockpair_binary_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_binary_metadata_nosec_test/h2_sockpair_binary_metadata_nosec_test.vcxproj index bd004d6f1c0..6409fd0ae74 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_binary_metadata_nosec_test/h2_sockpair_binary_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_binary_metadata_nosec_test/h2_sockpair_binary_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_binary_metadata_test/h2_sockpair_binary_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_binary_metadata_test/h2_sockpair_binary_metadata_test.vcxproj index 602dc28498d..7a22c191276 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_binary_metadata_test/h2_sockpair_binary_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_binary_metadata_test/h2_sockpair_binary_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_call_creds_test/h2_sockpair_call_creds_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_call_creds_test/h2_sockpair_call_creds_test.vcxproj index 176d9fdda51..7cb94a16bd9 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_call_creds_test/h2_sockpair_call_creds_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_call_creds_test/h2_sockpair_call_creds_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_cancel_after_accept_nosec_test/h2_sockpair_cancel_after_accept_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_cancel_after_accept_nosec_test/h2_sockpair_cancel_after_accept_nosec_test.vcxproj index 394e99cb8fc..bf9ac126783 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_cancel_after_accept_nosec_test/h2_sockpair_cancel_after_accept_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_cancel_after_accept_nosec_test/h2_sockpair_cancel_after_accept_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_cancel_after_accept_test/h2_sockpair_cancel_after_accept_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_cancel_after_accept_test/h2_sockpair_cancel_after_accept_test.vcxproj index f93880131dc..25a59fe8737 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_cancel_after_accept_test/h2_sockpair_cancel_after_accept_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_cancel_after_accept_test/h2_sockpair_cancel_after_accept_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_cancel_after_client_done_nosec_test/h2_sockpair_cancel_after_client_done_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_cancel_after_client_done_nosec_test/h2_sockpair_cancel_after_client_done_nosec_test.vcxproj index 274cd5b7514..58de3eda9b3 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_cancel_after_client_done_nosec_test/h2_sockpair_cancel_after_client_done_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_cancel_after_client_done_nosec_test/h2_sockpair_cancel_after_client_done_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_cancel_after_client_done_test/h2_sockpair_cancel_after_client_done_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_cancel_after_client_done_test/h2_sockpair_cancel_after_client_done_test.vcxproj index 467bcca12a4..ae87c37b88c 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_cancel_after_client_done_test/h2_sockpair_cancel_after_client_done_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_cancel_after_client_done_test/h2_sockpair_cancel_after_client_done_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_cancel_after_invoke_nosec_test/h2_sockpair_cancel_after_invoke_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_cancel_after_invoke_nosec_test/h2_sockpair_cancel_after_invoke_nosec_test.vcxproj index bfde5ba299d..6053ae54ee1 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_cancel_after_invoke_nosec_test/h2_sockpair_cancel_after_invoke_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_cancel_after_invoke_nosec_test/h2_sockpair_cancel_after_invoke_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_cancel_after_invoke_test/h2_sockpair_cancel_after_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_cancel_after_invoke_test/h2_sockpair_cancel_after_invoke_test.vcxproj index 1d946bf5313..fed5e1c139c 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_cancel_after_invoke_test/h2_sockpair_cancel_after_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_cancel_after_invoke_test/h2_sockpair_cancel_after_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_cancel_before_invoke_nosec_test/h2_sockpair_cancel_before_invoke_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_cancel_before_invoke_nosec_test/h2_sockpair_cancel_before_invoke_nosec_test.vcxproj index 025b71b0920..5249884d6f8 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_cancel_before_invoke_nosec_test/h2_sockpair_cancel_before_invoke_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_cancel_before_invoke_nosec_test/h2_sockpair_cancel_before_invoke_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_cancel_before_invoke_test/h2_sockpair_cancel_before_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_cancel_before_invoke_test/h2_sockpair_cancel_before_invoke_test.vcxproj index 88988e5bd3d..931c17f62b9 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_cancel_before_invoke_test/h2_sockpair_cancel_before_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_cancel_before_invoke_test/h2_sockpair_cancel_before_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_cancel_in_a_vacuum_nosec_test/h2_sockpair_cancel_in_a_vacuum_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_cancel_in_a_vacuum_nosec_test/h2_sockpair_cancel_in_a_vacuum_nosec_test.vcxproj index 32a64c6f35d..55d0e24bef0 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_cancel_in_a_vacuum_nosec_test/h2_sockpair_cancel_in_a_vacuum_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_cancel_in_a_vacuum_nosec_test/h2_sockpair_cancel_in_a_vacuum_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_cancel_in_a_vacuum_test/h2_sockpair_cancel_in_a_vacuum_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_cancel_in_a_vacuum_test/h2_sockpair_cancel_in_a_vacuum_test.vcxproj index 47e25cccdc4..dddce9a5ade 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_cancel_in_a_vacuum_test/h2_sockpair_cancel_in_a_vacuum_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_cancel_in_a_vacuum_test/h2_sockpair_cancel_in_a_vacuum_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_census_simple_request_nosec_test/h2_sockpair_census_simple_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_census_simple_request_nosec_test/h2_sockpair_census_simple_request_nosec_test.vcxproj index 2579010692a..b34717c062c 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_census_simple_request_nosec_test/h2_sockpair_census_simple_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_census_simple_request_nosec_test/h2_sockpair_census_simple_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_census_simple_request_test/h2_sockpair_census_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_census_simple_request_test/h2_sockpair_census_simple_request_test.vcxproj index f3201c7695b..ffddc79584c 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_census_simple_request_test/h2_sockpair_census_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_census_simple_request_test/h2_sockpair_census_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_compressed_payload_nosec_test/h2_sockpair_compressed_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_compressed_payload_nosec_test/h2_sockpair_compressed_payload_nosec_test.vcxproj index 22386b5b539..2ce8aaa4acf 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_compressed_payload_nosec_test/h2_sockpair_compressed_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_compressed_payload_nosec_test/h2_sockpair_compressed_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_compressed_payload_test/h2_sockpair_compressed_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_compressed_payload_test/h2_sockpair_compressed_payload_test.vcxproj index 694bb794a34..e61d117d6f5 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_compressed_payload_test/h2_sockpair_compressed_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_compressed_payload_test/h2_sockpair_compressed_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_empty_batch_nosec_test/h2_sockpair_empty_batch_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_empty_batch_nosec_test/h2_sockpair_empty_batch_nosec_test.vcxproj index 21f584c73ce..d735e42d805 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_empty_batch_nosec_test/h2_sockpair_empty_batch_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_empty_batch_nosec_test/h2_sockpair_empty_batch_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_empty_batch_test/h2_sockpair_empty_batch_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_empty_batch_test/h2_sockpair_empty_batch_test.vcxproj index 63a8cd6fe64..c3e5af8509a 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_empty_batch_test/h2_sockpair_empty_batch_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_empty_batch_test/h2_sockpair_empty_batch_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_graceful_server_shutdown_nosec_test/h2_sockpair_graceful_server_shutdown_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_graceful_server_shutdown_nosec_test/h2_sockpair_graceful_server_shutdown_nosec_test.vcxproj index dbcd07edf7b..8aa27d776b8 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_graceful_server_shutdown_nosec_test/h2_sockpair_graceful_server_shutdown_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_graceful_server_shutdown_nosec_test/h2_sockpair_graceful_server_shutdown_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_graceful_server_shutdown_test/h2_sockpair_graceful_server_shutdown_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_graceful_server_shutdown_test/h2_sockpair_graceful_server_shutdown_test.vcxproj index 0352c73ac9a..6cf4119441d 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_graceful_server_shutdown_test/h2_sockpair_graceful_server_shutdown_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_graceful_server_shutdown_test/h2_sockpair_graceful_server_shutdown_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_high_initial_seqno_nosec_test/h2_sockpair_high_initial_seqno_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_high_initial_seqno_nosec_test/h2_sockpair_high_initial_seqno_nosec_test.vcxproj index d88a9456b64..a9962c7285c 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_high_initial_seqno_nosec_test/h2_sockpair_high_initial_seqno_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_high_initial_seqno_nosec_test/h2_sockpair_high_initial_seqno_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_high_initial_seqno_test/h2_sockpair_high_initial_seqno_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_high_initial_seqno_test/h2_sockpair_high_initial_seqno_test.vcxproj index 6df9ae0eb8c..c27802c11d5 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_high_initial_seqno_test/h2_sockpair_high_initial_seqno_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_high_initial_seqno_test/h2_sockpair_high_initial_seqno_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_invoke_large_request_nosec_test/h2_sockpair_invoke_large_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_invoke_large_request_nosec_test/h2_sockpair_invoke_large_request_nosec_test.vcxproj index db37f2d4db4..307c9bc86f1 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_invoke_large_request_nosec_test/h2_sockpair_invoke_large_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_invoke_large_request_nosec_test/h2_sockpair_invoke_large_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_invoke_large_request_test/h2_sockpair_invoke_large_request_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_invoke_large_request_test/h2_sockpair_invoke_large_request_test.vcxproj index cc99d05156e..b9468b9f7a6 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_invoke_large_request_test/h2_sockpair_invoke_large_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_invoke_large_request_test/h2_sockpair_invoke_large_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_large_metadata_nosec_test/h2_sockpair_large_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_large_metadata_nosec_test/h2_sockpair_large_metadata_nosec_test.vcxproj index a2a5ab6e126..60a975aa8ca 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_large_metadata_nosec_test/h2_sockpair_large_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_large_metadata_nosec_test/h2_sockpair_large_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_large_metadata_test/h2_sockpair_large_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_large_metadata_test/h2_sockpair_large_metadata_test.vcxproj index d26920cb91b..c06280b3f7a 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_large_metadata_test/h2_sockpair_large_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_large_metadata_test/h2_sockpair_large_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_max_concurrent_streams_nosec_test/h2_sockpair_max_concurrent_streams_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_max_concurrent_streams_nosec_test/h2_sockpair_max_concurrent_streams_nosec_test.vcxproj index f87bf1dd586..7ecaa03cb06 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_max_concurrent_streams_nosec_test/h2_sockpair_max_concurrent_streams_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_max_concurrent_streams_nosec_test/h2_sockpair_max_concurrent_streams_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_max_concurrent_streams_test/h2_sockpair_max_concurrent_streams_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_max_concurrent_streams_test/h2_sockpair_max_concurrent_streams_test.vcxproj index 85dff646826..3e5923bab96 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_max_concurrent_streams_test/h2_sockpair_max_concurrent_streams_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_max_concurrent_streams_test/h2_sockpair_max_concurrent_streams_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_max_message_length_nosec_test/h2_sockpair_max_message_length_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_max_message_length_nosec_test/h2_sockpair_max_message_length_nosec_test.vcxproj index e13376f106d..1b9e74c3562 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_max_message_length_nosec_test/h2_sockpair_max_message_length_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_max_message_length_nosec_test/h2_sockpair_max_message_length_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_max_message_length_test/h2_sockpair_max_message_length_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_max_message_length_test/h2_sockpair_max_message_length_test.vcxproj index 69509c3f6f4..fee0c9c7a01 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_max_message_length_test/h2_sockpair_max_message_length_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_max_message_length_test/h2_sockpair_max_message_length_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_metadata_nosec_test/h2_sockpair_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_metadata_nosec_test/h2_sockpair_metadata_nosec_test.vcxproj index 192c9823cab..c6f40873910 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_metadata_nosec_test/h2_sockpair_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_metadata_nosec_test/h2_sockpair_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_metadata_test/h2_sockpair_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_metadata_test/h2_sockpair_metadata_test.vcxproj index e31a07f5e32..4d11518545b 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_metadata_test/h2_sockpair_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_metadata_test/h2_sockpair_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_no_op_nosec_test/h2_sockpair_no_op_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_no_op_nosec_test/h2_sockpair_no_op_nosec_test.vcxproj index bab6a293c15..433b333e3b6 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_no_op_nosec_test/h2_sockpair_no_op_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_no_op_nosec_test/h2_sockpair_no_op_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_no_op_test/h2_sockpair_no_op_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_no_op_test/h2_sockpair_no_op_test.vcxproj index f089d42384d..0a4391f6e81 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_no_op_test/h2_sockpair_no_op_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_no_op_test/h2_sockpair_no_op_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_payload_nosec_test/h2_sockpair_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_payload_nosec_test/h2_sockpair_payload_nosec_test.vcxproj index a2172bcf720..7ac93215ea3 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_payload_nosec_test/h2_sockpair_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_payload_nosec_test/h2_sockpair_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_payload_test/h2_sockpair_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_payload_test/h2_sockpair_payload_test.vcxproj index 11dc0c2e6c9..13114b37c5d 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_payload_test/h2_sockpair_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_payload_test/h2_sockpair_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_ping_pong_streaming_nosec_test/h2_sockpair_ping_pong_streaming_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_ping_pong_streaming_nosec_test/h2_sockpair_ping_pong_streaming_nosec_test.vcxproj index 55288e40f1d..1bce4499730 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_ping_pong_streaming_nosec_test/h2_sockpair_ping_pong_streaming_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_ping_pong_streaming_nosec_test/h2_sockpair_ping_pong_streaming_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_ping_pong_streaming_test/h2_sockpair_ping_pong_streaming_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_ping_pong_streaming_test/h2_sockpair_ping_pong_streaming_test.vcxproj index 67210ab8b30..e7a45b2722e 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_ping_pong_streaming_test/h2_sockpair_ping_pong_streaming_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_ping_pong_streaming_test/h2_sockpair_ping_pong_streaming_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_registered_call_nosec_test/h2_sockpair_registered_call_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_registered_call_nosec_test/h2_sockpair_registered_call_nosec_test.vcxproj index 8d44947502b..2b28bba3ac6 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_registered_call_nosec_test/h2_sockpair_registered_call_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_registered_call_nosec_test/h2_sockpair_registered_call_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_registered_call_test/h2_sockpair_registered_call_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_registered_call_test/h2_sockpair_registered_call_test.vcxproj index a4a55a5c3bf..dd1c692d96d 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_registered_call_test/h2_sockpair_registered_call_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_registered_call_test/h2_sockpair_registered_call_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_request_with_flags_nosec_test/h2_sockpair_request_with_flags_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_request_with_flags_nosec_test/h2_sockpair_request_with_flags_nosec_test.vcxproj index 6607b694d3e..e019e36c589 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_request_with_flags_nosec_test/h2_sockpair_request_with_flags_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_request_with_flags_nosec_test/h2_sockpair_request_with_flags_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_request_with_flags_test/h2_sockpair_request_with_flags_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_request_with_flags_test/h2_sockpair_request_with_flags_test.vcxproj index 246714e7e87..9b3264c3bc4 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_request_with_flags_test/h2_sockpair_request_with_flags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_request_with_flags_test/h2_sockpair_request_with_flags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_request_with_payload_nosec_test/h2_sockpair_request_with_payload_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_request_with_payload_nosec_test/h2_sockpair_request_with_payload_nosec_test.vcxproj index 3c489afd354..906ae7ce089 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_request_with_payload_nosec_test/h2_sockpair_request_with_payload_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_request_with_payload_nosec_test/h2_sockpair_request_with_payload_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_request_with_payload_test/h2_sockpair_request_with_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_request_with_payload_test/h2_sockpair_request_with_payload_test.vcxproj index 948b4269725..f2d802d1db6 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_request_with_payload_test/h2_sockpair_request_with_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_request_with_payload_test/h2_sockpair_request_with_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_server_finishes_request_nosec_test/h2_sockpair_server_finishes_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_server_finishes_request_nosec_test/h2_sockpair_server_finishes_request_nosec_test.vcxproj index e7464c9a79c..854c5ed830c 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_server_finishes_request_nosec_test/h2_sockpair_server_finishes_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_server_finishes_request_nosec_test/h2_sockpair_server_finishes_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_server_finishes_request_test/h2_sockpair_server_finishes_request_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_server_finishes_request_test/h2_sockpair_server_finishes_request_test.vcxproj index 131e24836a8..22b8c7efa59 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_server_finishes_request_test/h2_sockpair_server_finishes_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_server_finishes_request_test/h2_sockpair_server_finishes_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_calls_nosec_test/h2_sockpair_shutdown_finishes_calls_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_calls_nosec_test/h2_sockpair_shutdown_finishes_calls_nosec_test.vcxproj index 259486e82b0..41da6e2516e 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_calls_nosec_test/h2_sockpair_shutdown_finishes_calls_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_calls_nosec_test/h2_sockpair_shutdown_finishes_calls_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_calls_test/h2_sockpair_shutdown_finishes_calls_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_calls_test/h2_sockpair_shutdown_finishes_calls_test.vcxproj index 3a8222d5312..98cfe03137b 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_calls_test/h2_sockpair_shutdown_finishes_calls_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_calls_test/h2_sockpair_shutdown_finishes_calls_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_tags_nosec_test/h2_sockpair_shutdown_finishes_tags_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_tags_nosec_test/h2_sockpair_shutdown_finishes_tags_nosec_test.vcxproj index 659670f4d09..e59c985050c 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_tags_nosec_test/h2_sockpair_shutdown_finishes_tags_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_tags_nosec_test/h2_sockpair_shutdown_finishes_tags_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_tags_test/h2_sockpair_shutdown_finishes_tags_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_tags_test/h2_sockpair_shutdown_finishes_tags_test.vcxproj index 438e85587e0..94df53df75b 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_tags_test/h2_sockpair_shutdown_finishes_tags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_shutdown_finishes_tags_test/h2_sockpair_shutdown_finishes_tags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_simple_request_nosec_test/h2_sockpair_simple_request_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_simple_request_nosec_test/h2_sockpair_simple_request_nosec_test.vcxproj index 84f4c6a16c1..12d29dbaaaf 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_simple_request_nosec_test/h2_sockpair_simple_request_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_simple_request_nosec_test/h2_sockpair_simple_request_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_simple_request_test/h2_sockpair_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_simple_request_test/h2_sockpair_simple_request_test.vcxproj index 6f2f12e719c..b690301cc8c 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_simple_request_test/h2_sockpair_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_simple_request_test/h2_sockpair_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_trailing_metadata_nosec_test/h2_sockpair_trailing_metadata_nosec_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_trailing_metadata_nosec_test/h2_sockpair_trailing_metadata_nosec_test.vcxproj index 55b06b6870e..ade89a653f8 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_trailing_metadata_nosec_test/h2_sockpair_trailing_metadata_nosec_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_trailing_metadata_nosec_test/h2_sockpair_trailing_metadata_nosec_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_sockpair_trailing_metadata_test/h2_sockpair_trailing_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_sockpair_trailing_metadata_test/h2_sockpair_trailing_metadata_test.vcxproj index 2087712c906..eac03c3db22 100644 --- a/vsprojects/vcxproj/test/h2_sockpair_trailing_metadata_test/h2_sockpair_trailing_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_sockpair_trailing_metadata_test/h2_sockpair_trailing_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_bad_hostname_test/h2_ssl_bad_hostname_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_bad_hostname_test/h2_ssl_bad_hostname_test.vcxproj index 6b1606e638b..6b32422524b 100644 --- a/vsprojects/vcxproj/test/h2_ssl_bad_hostname_test/h2_ssl_bad_hostname_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_bad_hostname_test/h2_ssl_bad_hostname_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_binary_metadata_test/h2_ssl_binary_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_binary_metadata_test/h2_ssl_binary_metadata_test.vcxproj index 084eb51551f..e80c4aa2ff3 100644 --- a/vsprojects/vcxproj/test/h2_ssl_binary_metadata_test/h2_ssl_binary_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_binary_metadata_test/h2_ssl_binary_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_call_creds_test/h2_ssl_call_creds_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_call_creds_test/h2_ssl_call_creds_test.vcxproj index fdab68ae38a..52e1d4bc322 100644 --- a/vsprojects/vcxproj/test/h2_ssl_call_creds_test/h2_ssl_call_creds_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_call_creds_test/h2_ssl_call_creds_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_cancel_after_accept_test/h2_ssl_cancel_after_accept_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_cancel_after_accept_test/h2_ssl_cancel_after_accept_test.vcxproj index c1864ecf912..d4e1b659c77 100644 --- a/vsprojects/vcxproj/test/h2_ssl_cancel_after_accept_test/h2_ssl_cancel_after_accept_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_cancel_after_accept_test/h2_ssl_cancel_after_accept_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_cancel_after_client_done_test/h2_ssl_cancel_after_client_done_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_cancel_after_client_done_test/h2_ssl_cancel_after_client_done_test.vcxproj index bb9c5955457..fb08e044070 100644 --- a/vsprojects/vcxproj/test/h2_ssl_cancel_after_client_done_test/h2_ssl_cancel_after_client_done_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_cancel_after_client_done_test/h2_ssl_cancel_after_client_done_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_cancel_after_invoke_test/h2_ssl_cancel_after_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_cancel_after_invoke_test/h2_ssl_cancel_after_invoke_test.vcxproj index f2887c20055..71927acb994 100644 --- a/vsprojects/vcxproj/test/h2_ssl_cancel_after_invoke_test/h2_ssl_cancel_after_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_cancel_after_invoke_test/h2_ssl_cancel_after_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_cancel_before_invoke_test/h2_ssl_cancel_before_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_cancel_before_invoke_test/h2_ssl_cancel_before_invoke_test.vcxproj index 2292979f3be..5268c6f9775 100644 --- a/vsprojects/vcxproj/test/h2_ssl_cancel_before_invoke_test/h2_ssl_cancel_before_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_cancel_before_invoke_test/h2_ssl_cancel_before_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_cancel_in_a_vacuum_test/h2_ssl_cancel_in_a_vacuum_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_cancel_in_a_vacuum_test/h2_ssl_cancel_in_a_vacuum_test.vcxproj index 0f93acb94d5..8b6a7d22459 100644 --- a/vsprojects/vcxproj/test/h2_ssl_cancel_in_a_vacuum_test/h2_ssl_cancel_in_a_vacuum_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_cancel_in_a_vacuum_test/h2_ssl_cancel_in_a_vacuum_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_census_simple_request_test/h2_ssl_census_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_census_simple_request_test/h2_ssl_census_simple_request_test.vcxproj index 6977d8da4ce..35c69cc45c3 100644 --- a/vsprojects/vcxproj/test/h2_ssl_census_simple_request_test/h2_ssl_census_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_census_simple_request_test/h2_ssl_census_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_channel_connectivity_test/h2_ssl_channel_connectivity_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_channel_connectivity_test/h2_ssl_channel_connectivity_test.vcxproj index 23b15306003..dd42ceb294b 100644 --- a/vsprojects/vcxproj/test/h2_ssl_channel_connectivity_test/h2_ssl_channel_connectivity_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_channel_connectivity_test/h2_ssl_channel_connectivity_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_compressed_payload_test/h2_ssl_compressed_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_compressed_payload_test/h2_ssl_compressed_payload_test.vcxproj index e71ff343f07..f4038d8a363 100644 --- a/vsprojects/vcxproj/test/h2_ssl_compressed_payload_test/h2_ssl_compressed_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_compressed_payload_test/h2_ssl_compressed_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_default_host_test/h2_ssl_default_host_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_default_host_test/h2_ssl_default_host_test.vcxproj index ea362e3baa0..1b5f6f1af7a 100644 --- a/vsprojects/vcxproj/test/h2_ssl_default_host_test/h2_ssl_default_host_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_default_host_test/h2_ssl_default_host_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_disappearing_server_test/h2_ssl_disappearing_server_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_disappearing_server_test/h2_ssl_disappearing_server_test.vcxproj index 068986ed524..9e4de8d42b1 100644 --- a/vsprojects/vcxproj/test/h2_ssl_disappearing_server_test/h2_ssl_disappearing_server_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_disappearing_server_test/h2_ssl_disappearing_server_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_empty_batch_test/h2_ssl_empty_batch_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_empty_batch_test/h2_ssl_empty_batch_test.vcxproj index 1b8b646ad27..d6ab7549aab 100644 --- a/vsprojects/vcxproj/test/h2_ssl_empty_batch_test/h2_ssl_empty_batch_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_empty_batch_test/h2_ssl_empty_batch_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_graceful_server_shutdown_test/h2_ssl_graceful_server_shutdown_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_graceful_server_shutdown_test/h2_ssl_graceful_server_shutdown_test.vcxproj index 2db8886cacf..4943c845fc6 100644 --- a/vsprojects/vcxproj/test/h2_ssl_graceful_server_shutdown_test/h2_ssl_graceful_server_shutdown_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_graceful_server_shutdown_test/h2_ssl_graceful_server_shutdown_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_high_initial_seqno_test/h2_ssl_high_initial_seqno_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_high_initial_seqno_test/h2_ssl_high_initial_seqno_test.vcxproj index 2a3b8317d5f..07b5866162e 100644 --- a/vsprojects/vcxproj/test/h2_ssl_high_initial_seqno_test/h2_ssl_high_initial_seqno_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_high_initial_seqno_test/h2_ssl_high_initial_seqno_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_invoke_large_request_test/h2_ssl_invoke_large_request_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_invoke_large_request_test/h2_ssl_invoke_large_request_test.vcxproj index a23d2f62339..c03abbea4aa 100644 --- a/vsprojects/vcxproj/test/h2_ssl_invoke_large_request_test/h2_ssl_invoke_large_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_invoke_large_request_test/h2_ssl_invoke_large_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_large_metadata_test/h2_ssl_large_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_large_metadata_test/h2_ssl_large_metadata_test.vcxproj index aada59f36e6..e161efee4fb 100644 --- a/vsprojects/vcxproj/test/h2_ssl_large_metadata_test/h2_ssl_large_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_large_metadata_test/h2_ssl_large_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_max_concurrent_streams_test/h2_ssl_max_concurrent_streams_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_max_concurrent_streams_test/h2_ssl_max_concurrent_streams_test.vcxproj index 29e39fb488d..f7c4c036d10 100644 --- a/vsprojects/vcxproj/test/h2_ssl_max_concurrent_streams_test/h2_ssl_max_concurrent_streams_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_max_concurrent_streams_test/h2_ssl_max_concurrent_streams_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_max_message_length_test/h2_ssl_max_message_length_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_max_message_length_test/h2_ssl_max_message_length_test.vcxproj index 454e903cdff..317ece5fbdb 100644 --- a/vsprojects/vcxproj/test/h2_ssl_max_message_length_test/h2_ssl_max_message_length_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_max_message_length_test/h2_ssl_max_message_length_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_metadata_test/h2_ssl_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_metadata_test/h2_ssl_metadata_test.vcxproj index 607a5bfd380..1a551824c34 100644 --- a/vsprojects/vcxproj/test/h2_ssl_metadata_test/h2_ssl_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_metadata_test/h2_ssl_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_no_op_test/h2_ssl_no_op_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_no_op_test/h2_ssl_no_op_test.vcxproj index 0684eec62ce..072084d5d04 100644 --- a/vsprojects/vcxproj/test/h2_ssl_no_op_test/h2_ssl_no_op_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_no_op_test/h2_ssl_no_op_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_payload_test/h2_ssl_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_payload_test/h2_ssl_payload_test.vcxproj index 552ed6bdf2b..0b5d3846975 100644 --- a/vsprojects/vcxproj/test/h2_ssl_payload_test/h2_ssl_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_payload_test/h2_ssl_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_ping_pong_streaming_test/h2_ssl_ping_pong_streaming_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_ping_pong_streaming_test/h2_ssl_ping_pong_streaming_test.vcxproj index eeff84cdd7f..2f4405c062d 100644 --- a/vsprojects/vcxproj/test/h2_ssl_ping_pong_streaming_test/h2_ssl_ping_pong_streaming_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_ping_pong_streaming_test/h2_ssl_ping_pong_streaming_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_bad_hostname_test/h2_ssl_proxy_bad_hostname_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_bad_hostname_test/h2_ssl_proxy_bad_hostname_test.vcxproj index eac7164b94c..2e04c3565b1 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_bad_hostname_test/h2_ssl_proxy_bad_hostname_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_bad_hostname_test/h2_ssl_proxy_bad_hostname_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_binary_metadata_test/h2_ssl_proxy_binary_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_binary_metadata_test/h2_ssl_proxy_binary_metadata_test.vcxproj index e791cd77405..c2623b8edb3 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_binary_metadata_test/h2_ssl_proxy_binary_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_binary_metadata_test/h2_ssl_proxy_binary_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_call_creds_test/h2_ssl_proxy_call_creds_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_call_creds_test/h2_ssl_proxy_call_creds_test.vcxproj index a589bc968c5..f6a76c956ca 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_call_creds_test/h2_ssl_proxy_call_creds_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_call_creds_test/h2_ssl_proxy_call_creds_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_after_accept_test/h2_ssl_proxy_cancel_after_accept_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_after_accept_test/h2_ssl_proxy_cancel_after_accept_test.vcxproj index f679136625d..054376d5e00 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_after_accept_test/h2_ssl_proxy_cancel_after_accept_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_after_accept_test/h2_ssl_proxy_cancel_after_accept_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_after_client_done_test/h2_ssl_proxy_cancel_after_client_done_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_after_client_done_test/h2_ssl_proxy_cancel_after_client_done_test.vcxproj index 6c2372be9e0..99205c754da 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_after_client_done_test/h2_ssl_proxy_cancel_after_client_done_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_after_client_done_test/h2_ssl_proxy_cancel_after_client_done_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_after_invoke_test/h2_ssl_proxy_cancel_after_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_after_invoke_test/h2_ssl_proxy_cancel_after_invoke_test.vcxproj index 11b6f5214fd..8b824fa7a54 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_after_invoke_test/h2_ssl_proxy_cancel_after_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_after_invoke_test/h2_ssl_proxy_cancel_after_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_before_invoke_test/h2_ssl_proxy_cancel_before_invoke_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_before_invoke_test/h2_ssl_proxy_cancel_before_invoke_test.vcxproj index b4ea003a825..84a60e4abd9 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_before_invoke_test/h2_ssl_proxy_cancel_before_invoke_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_before_invoke_test/h2_ssl_proxy_cancel_before_invoke_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_in_a_vacuum_test/h2_ssl_proxy_cancel_in_a_vacuum_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_in_a_vacuum_test/h2_ssl_proxy_cancel_in_a_vacuum_test.vcxproj index f338605d8dd..1fae4c5d674 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_in_a_vacuum_test/h2_ssl_proxy_cancel_in_a_vacuum_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_cancel_in_a_vacuum_test/h2_ssl_proxy_cancel_in_a_vacuum_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_census_simple_request_test/h2_ssl_proxy_census_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_census_simple_request_test/h2_ssl_proxy_census_simple_request_test.vcxproj index d99e2bcbc9a..9f7b68843a6 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_census_simple_request_test/h2_ssl_proxy_census_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_census_simple_request_test/h2_ssl_proxy_census_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_default_host_test/h2_ssl_proxy_default_host_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_default_host_test/h2_ssl_proxy_default_host_test.vcxproj index 526dad54f58..1bee2546364 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_default_host_test/h2_ssl_proxy_default_host_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_default_host_test/h2_ssl_proxy_default_host_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_disappearing_server_test/h2_ssl_proxy_disappearing_server_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_disappearing_server_test/h2_ssl_proxy_disappearing_server_test.vcxproj index beedef1ca8b..ba977ee8762 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_disappearing_server_test/h2_ssl_proxy_disappearing_server_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_disappearing_server_test/h2_ssl_proxy_disappearing_server_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_empty_batch_test/h2_ssl_proxy_empty_batch_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_empty_batch_test/h2_ssl_proxy_empty_batch_test.vcxproj index c14d8d8129a..324872559d3 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_empty_batch_test/h2_ssl_proxy_empty_batch_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_empty_batch_test/h2_ssl_proxy_empty_batch_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_graceful_server_shutdown_test/h2_ssl_proxy_graceful_server_shutdown_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_graceful_server_shutdown_test/h2_ssl_proxy_graceful_server_shutdown_test.vcxproj index b4c5114c838..e44a7ab28b6 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_graceful_server_shutdown_test/h2_ssl_proxy_graceful_server_shutdown_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_graceful_server_shutdown_test/h2_ssl_proxy_graceful_server_shutdown_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_high_initial_seqno_test/h2_ssl_proxy_high_initial_seqno_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_high_initial_seqno_test/h2_ssl_proxy_high_initial_seqno_test.vcxproj index 37330664b3a..c73cc3ec33e 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_high_initial_seqno_test/h2_ssl_proxy_high_initial_seqno_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_high_initial_seqno_test/h2_ssl_proxy_high_initial_seqno_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_invoke_large_request_test/h2_ssl_proxy_invoke_large_request_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_invoke_large_request_test/h2_ssl_proxy_invoke_large_request_test.vcxproj index cbf37df6058..8954e8a091e 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_invoke_large_request_test/h2_ssl_proxy_invoke_large_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_invoke_large_request_test/h2_ssl_proxy_invoke_large_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_large_metadata_test/h2_ssl_proxy_large_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_large_metadata_test/h2_ssl_proxy_large_metadata_test.vcxproj index b85acdaee2e..8766301af38 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_large_metadata_test/h2_ssl_proxy_large_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_large_metadata_test/h2_ssl_proxy_large_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_max_message_length_test/h2_ssl_proxy_max_message_length_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_max_message_length_test/h2_ssl_proxy_max_message_length_test.vcxproj index bc1baca89f9..d2180ec936e 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_max_message_length_test/h2_ssl_proxy_max_message_length_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_max_message_length_test/h2_ssl_proxy_max_message_length_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_metadata_test/h2_ssl_proxy_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_metadata_test/h2_ssl_proxy_metadata_test.vcxproj index 589394bf5c7..38eb25138c3 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_metadata_test/h2_ssl_proxy_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_metadata_test/h2_ssl_proxy_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_no_op_test/h2_ssl_proxy_no_op_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_no_op_test/h2_ssl_proxy_no_op_test.vcxproj index bed45747e76..7f08edab844 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_no_op_test/h2_ssl_proxy_no_op_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_no_op_test/h2_ssl_proxy_no_op_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_payload_test/h2_ssl_proxy_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_payload_test/h2_ssl_proxy_payload_test.vcxproj index fa438b5aef7..5ce2daa7cc2 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_payload_test/h2_ssl_proxy_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_payload_test/h2_ssl_proxy_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_ping_pong_streaming_test/h2_ssl_proxy_ping_pong_streaming_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_ping_pong_streaming_test/h2_ssl_proxy_ping_pong_streaming_test.vcxproj index 0607e8e036b..ab38ecdf86e 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_ping_pong_streaming_test/h2_ssl_proxy_ping_pong_streaming_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_ping_pong_streaming_test/h2_ssl_proxy_ping_pong_streaming_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_registered_call_test/h2_ssl_proxy_registered_call_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_registered_call_test/h2_ssl_proxy_registered_call_test.vcxproj index 337e1923ac9..7c0cc1b04d1 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_registered_call_test/h2_ssl_proxy_registered_call_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_registered_call_test/h2_ssl_proxy_registered_call_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_request_with_payload_test/h2_ssl_proxy_request_with_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_request_with_payload_test/h2_ssl_proxy_request_with_payload_test.vcxproj index 095757a84e6..5f151d427c1 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_request_with_payload_test/h2_ssl_proxy_request_with_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_request_with_payload_test/h2_ssl_proxy_request_with_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_server_finishes_request_test/h2_ssl_proxy_server_finishes_request_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_server_finishes_request_test/h2_ssl_proxy_server_finishes_request_test.vcxproj index 7376777f775..9c76bd36e05 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_server_finishes_request_test/h2_ssl_proxy_server_finishes_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_server_finishes_request_test/h2_ssl_proxy_server_finishes_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_shutdown_finishes_calls_test/h2_ssl_proxy_shutdown_finishes_calls_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_shutdown_finishes_calls_test/h2_ssl_proxy_shutdown_finishes_calls_test.vcxproj index 5185727bc91..2fded0eda36 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_shutdown_finishes_calls_test/h2_ssl_proxy_shutdown_finishes_calls_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_shutdown_finishes_calls_test/h2_ssl_proxy_shutdown_finishes_calls_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_shutdown_finishes_tags_test/h2_ssl_proxy_shutdown_finishes_tags_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_shutdown_finishes_tags_test/h2_ssl_proxy_shutdown_finishes_tags_test.vcxproj index c45168775fd..b750b582fdb 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_shutdown_finishes_tags_test/h2_ssl_proxy_shutdown_finishes_tags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_shutdown_finishes_tags_test/h2_ssl_proxy_shutdown_finishes_tags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_simple_delayed_request_test/h2_ssl_proxy_simple_delayed_request_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_simple_delayed_request_test/h2_ssl_proxy_simple_delayed_request_test.vcxproj index c3be5eda264..37b0a0fb75c 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_simple_delayed_request_test/h2_ssl_proxy_simple_delayed_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_simple_delayed_request_test/h2_ssl_proxy_simple_delayed_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_simple_request_test/h2_ssl_proxy_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_simple_request_test/h2_ssl_proxy_simple_request_test.vcxproj index 7ee42991b8e..580d7f4bd01 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_simple_request_test/h2_ssl_proxy_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_simple_request_test/h2_ssl_proxy_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_proxy_trailing_metadata_test/h2_ssl_proxy_trailing_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_proxy_trailing_metadata_test/h2_ssl_proxy_trailing_metadata_test.vcxproj index 14f58971dac..97778078e71 100644 --- a/vsprojects/vcxproj/test/h2_ssl_proxy_trailing_metadata_test/h2_ssl_proxy_trailing_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_proxy_trailing_metadata_test/h2_ssl_proxy_trailing_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_registered_call_test/h2_ssl_registered_call_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_registered_call_test/h2_ssl_registered_call_test.vcxproj index fae88b74fd4..7a9b2b3aabc 100644 --- a/vsprojects/vcxproj/test/h2_ssl_registered_call_test/h2_ssl_registered_call_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_registered_call_test/h2_ssl_registered_call_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_request_with_flags_test/h2_ssl_request_with_flags_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_request_with_flags_test/h2_ssl_request_with_flags_test.vcxproj index 3c7cd13ddf5..f78dc73e1a3 100644 --- a/vsprojects/vcxproj/test/h2_ssl_request_with_flags_test/h2_ssl_request_with_flags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_request_with_flags_test/h2_ssl_request_with_flags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_request_with_payload_test/h2_ssl_request_with_payload_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_request_with_payload_test/h2_ssl_request_with_payload_test.vcxproj index 54eca785afc..b10238d1e85 100644 --- a/vsprojects/vcxproj/test/h2_ssl_request_with_payload_test/h2_ssl_request_with_payload_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_request_with_payload_test/h2_ssl_request_with_payload_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_server_finishes_request_test/h2_ssl_server_finishes_request_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_server_finishes_request_test/h2_ssl_server_finishes_request_test.vcxproj index ed4712c1b88..3378c716fcc 100644 --- a/vsprojects/vcxproj/test/h2_ssl_server_finishes_request_test/h2_ssl_server_finishes_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_server_finishes_request_test/h2_ssl_server_finishes_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_shutdown_finishes_calls_test/h2_ssl_shutdown_finishes_calls_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_shutdown_finishes_calls_test/h2_ssl_shutdown_finishes_calls_test.vcxproj index cfec4c25a83..9fdaf40373d 100644 --- a/vsprojects/vcxproj/test/h2_ssl_shutdown_finishes_calls_test/h2_ssl_shutdown_finishes_calls_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_shutdown_finishes_calls_test/h2_ssl_shutdown_finishes_calls_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_shutdown_finishes_tags_test/h2_ssl_shutdown_finishes_tags_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_shutdown_finishes_tags_test/h2_ssl_shutdown_finishes_tags_test.vcxproj index 6ec2c5345e4..c3ce6e7dcc6 100644 --- a/vsprojects/vcxproj/test/h2_ssl_shutdown_finishes_tags_test/h2_ssl_shutdown_finishes_tags_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_shutdown_finishes_tags_test/h2_ssl_shutdown_finishes_tags_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_simple_delayed_request_test/h2_ssl_simple_delayed_request_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_simple_delayed_request_test/h2_ssl_simple_delayed_request_test.vcxproj index 3da89873aad..4bf39b97152 100644 --- a/vsprojects/vcxproj/test/h2_ssl_simple_delayed_request_test/h2_ssl_simple_delayed_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_simple_delayed_request_test/h2_ssl_simple_delayed_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_simple_request_test/h2_ssl_simple_request_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_simple_request_test/h2_ssl_simple_request_test.vcxproj index 5527b80b314..5dd855ec5f8 100644 --- a/vsprojects/vcxproj/test/h2_ssl_simple_request_test/h2_ssl_simple_request_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_simple_request_test/h2_ssl_simple_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/h2_ssl_trailing_metadata_test/h2_ssl_trailing_metadata_test.vcxproj b/vsprojects/vcxproj/test/h2_ssl_trailing_metadata_test/h2_ssl_trailing_metadata_test.vcxproj index 60b66f0755a..6261f7fdb66 100644 --- a/vsprojects/vcxproj/test/h2_ssl_trailing_metadata_test/h2_ssl_trailing_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_ssl_trailing_metadata_test/h2_ssl_trailing_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/hpack_parser_test/hpack_parser_test.vcxproj b/vsprojects/vcxproj/test/hpack_parser_test/hpack_parser_test.vcxproj index fd1814586d4..f8b919b971d 100644 --- a/vsprojects/vcxproj/test/hpack_parser_test/hpack_parser_test.vcxproj +++ b/vsprojects/vcxproj/test/hpack_parser_test/hpack_parser_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/hpack_table_test/hpack_table_test.vcxproj b/vsprojects/vcxproj/test/hpack_table_test/hpack_table_test.vcxproj index 3aa6c7f7489..976ee676637 100644 --- a/vsprojects/vcxproj/test/hpack_table_test/hpack_table_test.vcxproj +++ b/vsprojects/vcxproj/test/hpack_table_test/hpack_table_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/httpcli_format_request_test/httpcli_format_request_test.vcxproj b/vsprojects/vcxproj/test/httpcli_format_request_test/httpcli_format_request_test.vcxproj index a1d3dfa48ee..ee8a76c90a2 100644 --- a/vsprojects/vcxproj/test/httpcli_format_request_test/httpcli_format_request_test.vcxproj +++ b/vsprojects/vcxproj/test/httpcli_format_request_test/httpcli_format_request_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/httpcli_parser_test/httpcli_parser_test.vcxproj b/vsprojects/vcxproj/test/httpcli_parser_test/httpcli_parser_test.vcxproj index 13d6427dd6b..346d179a894 100644 --- a/vsprojects/vcxproj/test/httpcli_parser_test/httpcli_parser_test.vcxproj +++ b/vsprojects/vcxproj/test/httpcli_parser_test/httpcli_parser_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/initial_settings_frame_bad_client_test/initial_settings_frame_bad_client_test.vcxproj b/vsprojects/vcxproj/test/initial_settings_frame_bad_client_test/initial_settings_frame_bad_client_test.vcxproj index e221f64a44d..cce665a3b98 100644 --- a/vsprojects/vcxproj/test/initial_settings_frame_bad_client_test/initial_settings_frame_bad_client_test.vcxproj +++ b/vsprojects/vcxproj/test/initial_settings_frame_bad_client_test/initial_settings_frame_bad_client_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/json_rewrite/json_rewrite.vcxproj b/vsprojects/vcxproj/test/json_rewrite/json_rewrite.vcxproj index 997ad252433..3e350c9a8be 100644 --- a/vsprojects/vcxproj/test/json_rewrite/json_rewrite.vcxproj +++ b/vsprojects/vcxproj/test/json_rewrite/json_rewrite.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/json_rewrite_test/json_rewrite_test.vcxproj b/vsprojects/vcxproj/test/json_rewrite_test/json_rewrite_test.vcxproj index b786beb0fd5..df3751343d5 100644 --- a/vsprojects/vcxproj/test/json_rewrite_test/json_rewrite_test.vcxproj +++ b/vsprojects/vcxproj/test/json_rewrite_test/json_rewrite_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/json_test/json_test.vcxproj b/vsprojects/vcxproj/test/json_test/json_test.vcxproj index 575bbd4f054..194e9ef9097 100644 --- a/vsprojects/vcxproj/test/json_test/json_test.vcxproj +++ b/vsprojects/vcxproj/test/json_test/json_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/lame_client_test/lame_client_test.vcxproj b/vsprojects/vcxproj/test/lame_client_test/lame_client_test.vcxproj index d70776fb653..335512a1aac 100644 --- a/vsprojects/vcxproj/test/lame_client_test/lame_client_test.vcxproj +++ b/vsprojects/vcxproj/test/lame_client_test/lame_client_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/lb_policies_test/lb_policies_test.vcxproj b/vsprojects/vcxproj/test/lb_policies_test/lb_policies_test.vcxproj index c93a7e60fe3..583b8747506 100644 --- a/vsprojects/vcxproj/test/lb_policies_test/lb_policies_test.vcxproj +++ b/vsprojects/vcxproj/test/lb_policies_test/lb_policies_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/message_compress_test/message_compress_test.vcxproj b/vsprojects/vcxproj/test/message_compress_test/message_compress_test.vcxproj index 9d81b98a13a..983beb21eec 100644 --- a/vsprojects/vcxproj/test/message_compress_test/message_compress_test.vcxproj +++ b/vsprojects/vcxproj/test/message_compress_test/message_compress_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/mock_test/mock_test.vcxproj b/vsprojects/vcxproj/test/mock_test/mock_test.vcxproj index 24a69444c39..910da5126ca 100644 --- a/vsprojects/vcxproj/test/mock_test/mock_test.vcxproj +++ b/vsprojects/vcxproj/test/mock_test/mock_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/multi_init_test/multi_init_test.vcxproj b/vsprojects/vcxproj/test/multi_init_test/multi_init_test.vcxproj index 123b62034b5..419792b4702 100644 --- a/vsprojects/vcxproj/test/multi_init_test/multi_init_test.vcxproj +++ b/vsprojects/vcxproj/test/multi_init_test/multi_init_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/multiple_server_queues_test/multiple_server_queues_test.vcxproj b/vsprojects/vcxproj/test/multiple_server_queues_test/multiple_server_queues_test.vcxproj index c5258c9ce85..4201c6662bc 100644 --- a/vsprojects/vcxproj/test/multiple_server_queues_test/multiple_server_queues_test.vcxproj +++ b/vsprojects/vcxproj/test/multiple_server_queues_test/multiple_server_queues_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/murmur_hash_test/murmur_hash_test.vcxproj b/vsprojects/vcxproj/test/murmur_hash_test/murmur_hash_test.vcxproj index b8ec9ee92e7..49a478874ee 100644 --- a/vsprojects/vcxproj/test/murmur_hash_test/murmur_hash_test.vcxproj +++ b/vsprojects/vcxproj/test/murmur_hash_test/murmur_hash_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/no_server_test/no_server_test.vcxproj b/vsprojects/vcxproj/test/no_server_test/no_server_test.vcxproj index 4cf2c8525db..8b20c83d836 100644 --- a/vsprojects/vcxproj/test/no_server_test/no_server_test.vcxproj +++ b/vsprojects/vcxproj/test/no_server_test/no_server_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/reconnect_interop_client/reconnect_interop_client.vcxproj b/vsprojects/vcxproj/test/reconnect_interop_client/reconnect_interop_client.vcxproj index 4a2b1180117..d35d6d34020 100644 --- a/vsprojects/vcxproj/test/reconnect_interop_client/reconnect_interop_client.vcxproj +++ b/vsprojects/vcxproj/test/reconnect_interop_client/reconnect_interop_client.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/reconnect_interop_server/reconnect_interop_server.vcxproj b/vsprojects/vcxproj/test/reconnect_interop_server/reconnect_interop_server.vcxproj index 5c6d04bbc96..1eb8f36a4fd 100644 --- a/vsprojects/vcxproj/test/reconnect_interop_server/reconnect_interop_server.vcxproj +++ b/vsprojects/vcxproj/test/reconnect_interop_server/reconnect_interop_server.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/resolve_address_test/resolve_address_test.vcxproj b/vsprojects/vcxproj/test/resolve_address_test/resolve_address_test.vcxproj index 7121732dd0a..c70d57fd0cf 100644 --- a/vsprojects/vcxproj/test/resolve_address_test/resolve_address_test.vcxproj +++ b/vsprojects/vcxproj/test/resolve_address_test/resolve_address_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/secure_auth_context_test/secure_auth_context_test.vcxproj b/vsprojects/vcxproj/test/secure_auth_context_test/secure_auth_context_test.vcxproj index 9565c72bfe2..ba496a7580e 100644 --- a/vsprojects/vcxproj/test/secure_auth_context_test/secure_auth_context_test.vcxproj +++ b/vsprojects/vcxproj/test/secure_auth_context_test/secure_auth_context_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/secure_endpoint_test/secure_endpoint_test.vcxproj b/vsprojects/vcxproj/test/secure_endpoint_test/secure_endpoint_test.vcxproj index afb9fa7929b..e2fcaeddd7d 100644 --- a/vsprojects/vcxproj/test/secure_endpoint_test/secure_endpoint_test.vcxproj +++ b/vsprojects/vcxproj/test/secure_endpoint_test/secure_endpoint_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/server_crash_test_client/server_crash_test_client.vcxproj b/vsprojects/vcxproj/test/server_crash_test_client/server_crash_test_client.vcxproj index 657b15c8ad5..613d2c74a3a 100644 --- a/vsprojects/vcxproj/test/server_crash_test_client/server_crash_test_client.vcxproj +++ b/vsprojects/vcxproj/test/server_crash_test_client/server_crash_test_client.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/shutdown_test/shutdown_test.vcxproj b/vsprojects/vcxproj/test/shutdown_test/shutdown_test.vcxproj index 8bd5cef3f1e..dc73660d913 100644 --- a/vsprojects/vcxproj/test/shutdown_test/shutdown_test.vcxproj +++ b/vsprojects/vcxproj/test/shutdown_test/shutdown_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/sockaddr_utils_test/sockaddr_utils_test.vcxproj b/vsprojects/vcxproj/test/sockaddr_utils_test/sockaddr_utils_test.vcxproj index 3ec34836948..9539eeaa048 100644 --- a/vsprojects/vcxproj/test/sockaddr_utils_test/sockaddr_utils_test.vcxproj +++ b/vsprojects/vcxproj/test/sockaddr_utils_test/sockaddr_utils_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/status_test/status_test.vcxproj b/vsprojects/vcxproj/test/status_test/status_test.vcxproj index f46053bf0d6..2d5f9640c93 100644 --- a/vsprojects/vcxproj/test/status_test/status_test.vcxproj +++ b/vsprojects/vcxproj/test/status_test/status_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/thread_stress_test/thread_stress_test.vcxproj b/vsprojects/vcxproj/test/thread_stress_test/thread_stress_test.vcxproj index 574d854a38e..4a33ea8693d 100644 --- a/vsprojects/vcxproj/test/thread_stress_test/thread_stress_test.vcxproj +++ b/vsprojects/vcxproj/test/thread_stress_test/thread_stress_test.vcxproj @@ -76,6 +76,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -90,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -106,6 +108,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -124,6 +127,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/time_averaged_stats_test/time_averaged_stats_test.vcxproj b/vsprojects/vcxproj/test/time_averaged_stats_test/time_averaged_stats_test.vcxproj index 96b77fd7863..8351157f211 100644 --- a/vsprojects/vcxproj/test/time_averaged_stats_test/time_averaged_stats_test.vcxproj +++ b/vsprojects/vcxproj/test/time_averaged_stats_test/time_averaged_stats_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/timeout_encoding_test/timeout_encoding_test.vcxproj b/vsprojects/vcxproj/test/timeout_encoding_test/timeout_encoding_test.vcxproj index 70a56eb46ff..19f6dc2aa14 100644 --- a/vsprojects/vcxproj/test/timeout_encoding_test/timeout_encoding_test.vcxproj +++ b/vsprojects/vcxproj/test/timeout_encoding_test/timeout_encoding_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/timers_test/timers_test.vcxproj b/vsprojects/vcxproj/test/timers_test/timers_test.vcxproj index 145c6d100e7..220dbb20141 100644 --- a/vsprojects/vcxproj/test/timers_test/timers_test.vcxproj +++ b/vsprojects/vcxproj/test/timers_test/timers_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/transport_metadata_test/transport_metadata_test.vcxproj b/vsprojects/vcxproj/test/transport_metadata_test/transport_metadata_test.vcxproj index 00e121f1bc0..c978f46c0a0 100644 --- a/vsprojects/vcxproj/test/transport_metadata_test/transport_metadata_test.vcxproj +++ b/vsprojects/vcxproj/test/transport_metadata_test/transport_metadata_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/uri_parser_test/uri_parser_test.vcxproj b/vsprojects/vcxproj/test/uri_parser_test/uri_parser_test.vcxproj index 6e3153f6094..c0ab50b276d 100644 --- a/vsprojects/vcxproj/test/uri_parser_test/uri_parser_test.vcxproj +++ b/vsprojects/vcxproj/test/uri_parser_test/uri_parser_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console diff --git a/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj b/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj index 851e650de61..750ef94b902 100644 --- a/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj +++ b/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj @@ -74,6 +74,7 @@ WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -88,6 +89,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDebug + true Console @@ -104,6 +106,7 @@ WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true MultiThreaded + true Console @@ -122,6 +125,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded + true Console From 04456843cdc05935abecb3c0b607d6053d27d865 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 23 Sep 2015 10:07:16 -0700 Subject: [PATCH 45/56] Windows fixes --- include/grpc++/impl/call.h | 6 +++--- src/cpp/proto/proto_utils.cc | 4 +++- src/cpp/util/time.cc | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/grpc++/impl/call.h b/include/grpc++/impl/call.h index fca56030479..885a1075ad1 100644 --- a/include/grpc++/impl/call.h +++ b/include/grpc++/impl/call.h @@ -126,11 +126,11 @@ class WriteOptions { } private: - void SetBit(const gpr_int32 mask) { flags_ |= mask; } + void SetBit(const gpr_uint32 mask) { flags_ |= mask; } - void ClearBit(const gpr_int32 mask) { flags_ &= ~mask; } + void ClearBit(const gpr_uint32 mask) { flags_ &= ~mask; } - bool GetBit(const gpr_int32 mask) const { return flags_ & mask; } + bool GetBit(const gpr_uint32 mask) const { return (flags_ & mask) != 0; } gpr_uint32 flags_; }; diff --git a/src/cpp/proto/proto_utils.cc b/src/cpp/proto/proto_utils.cc index be84c222a0e..f47acc8f8dc 100644 --- a/src/cpp/proto/proto_utils.cc +++ b/src/cpp/proto/proto_utils.cc @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -111,7 +112,8 @@ class GrpcBufferReader GRPC_FINAL if (backup_count_ > 0) { *data = GPR_SLICE_START_PTR(slice_) + GPR_SLICE_LENGTH(slice_) - backup_count_; - *size = backup_count_; + GPR_ASSERT(backup_count_ <= INT_MAX); + *size = (int)backup_count_; backup_count_ = 0; return true; } diff --git a/src/cpp/util/time.cc b/src/cpp/util/time.cc index b3401eb26b7..6157a37745a 100644 --- a/src/cpp/util/time.cc +++ b/src/cpp/util/time.cc @@ -57,8 +57,8 @@ void Timepoint2Timespec(const system_clock::time_point& from, return; } nanoseconds nsecs = duration_cast(deadline - secs); - to->tv_sec = secs.count(); - to->tv_nsec = nsecs.count(); + to->tv_sec = (time_t)secs.count(); + to->tv_nsec = (int)nsecs.count(); to->clock_type = GPR_CLOCK_REALTIME; } @@ -73,8 +73,8 @@ void TimepointHR2Timespec(const high_resolution_clock::time_point& from, return; } nanoseconds nsecs = duration_cast(deadline - secs); - to->tv_sec = secs.count(); - to->tv_nsec = nsecs.count(); + to->tv_sec = (time_t)secs.count(); + to->tv_nsec = (int)nsecs.count(); to->clock_type = GPR_CLOCK_REALTIME; } From 64db1580f891f9b89e1653804a3f20a1a979a8f9 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 23 Sep 2015 10:09:21 -0700 Subject: [PATCH 46/56] Remove workqueue_test from Windows for now --- build.yaml | 3 +- tools/run_tests/tests.json | 10 +- vsprojects/buildtests_c.sln | 27 --- .../workqueue_test/workqueue_test.vcxproj | 176 ------------------ .../workqueue_test.vcxproj.filters | 21 --- 5 files changed, 8 insertions(+), 229 deletions(-) delete mode 100644 vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj delete mode 100644 vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj.filters diff --git a/build.yaml b/build.yaml index 01754dd40ea..374ad382b44 100644 --- a/build.yaml +++ b/build.yaml @@ -742,7 +742,7 @@ targets: language: c src: [test/core/iomgr/udp_server_test.c] deps: [grpc_test_util, grpc, gpr_test_util, gpr] - platforms: [posix] + platforms: [mac, linux, posix] - name: uri_parser_test build: test language: c @@ -753,6 +753,7 @@ targets: language: c src: [test/core/iomgr/workqueue_test.c] deps: [grpc_test_util, grpc, gpr_test_util, gpr] + platforms: [mac, linux, posix] - name: async_end2end_test build: test language: c++ diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index d96e4662d1e..5f4d4d4ebd0 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -1151,6 +1151,8 @@ }, { "ci_platforms": [ + "linux", + "mac", "posix" ], "exclude_configs": [], @@ -1158,6 +1160,8 @@ "language": "c", "name": "udp_server_test", "platforms": [ + "linux", + "mac", "posix" ] }, @@ -1183,8 +1187,7 @@ "ci_platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ], "exclude_configs": [], "flaky": false, @@ -1193,8 +1196,7 @@ "platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ] }, { diff --git a/vsprojects/buildtests_c.sln b/vsprojects/buildtests_c.sln index ae5aaaa02f0..24b51d460d6 100644 --- a/vsprojects/buildtests_c.sln +++ b/vsprojects/buildtests_c.sln @@ -1237,17 +1237,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uri_parser_test", "vcxproj\ {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "workqueue_test", "vcxproj\test\workqueue_test\workqueue_test.vcxproj", "{1B6E9651-4D88-2ACB-BEE0-26599919361D}" - ProjectSection(myProperties) = preProject - lib = "False" - EndProjectSection - ProjectSection(ProjectDependencies) = postProject - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} = {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h2_compress_bad_hostname_test", "vcxproj\test\h2_compress_bad_hostname_test\h2_compress_bad_hostname_test.vcxproj", "{CB29C8C8-0EF3-843F-2E56-36E076A57D0C}" ProjectSection(myProperties) = preProject lib = "False" @@ -9800,22 +9789,6 @@ Global {E35C24A0-8725-E773-FE78-CC0C67071EF7}.Release-DLL|Win32.Build.0 = Release|Win32 {E35C24A0-8725-E773-FE78-CC0C67071EF7}.Release-DLL|x64.ActiveCfg = Release|x64 {E35C24A0-8725-E773-FE78-CC0C67071EF7}.Release-DLL|x64.Build.0 = Release|x64 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug|Win32.ActiveCfg = Debug|Win32 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug|x64.ActiveCfg = Debug|x64 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release|Win32.ActiveCfg = Release|Win32 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release|x64.ActiveCfg = Release|x64 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug|Win32.Build.0 = Debug|Win32 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug|x64.Build.0 = Debug|x64 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release|Win32.Build.0 = Release|Win32 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release|x64.Build.0 = Release|x64 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug-DLL|Win32.ActiveCfg = Debug|Win32 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug-DLL|Win32.Build.0 = Debug|Win32 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug-DLL|x64.ActiveCfg = Debug|x64 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Debug-DLL|x64.Build.0 = Debug|x64 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release-DLL|Win32.ActiveCfg = Release|Win32 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release-DLL|Win32.Build.0 = Release|Win32 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release-DLL|x64.ActiveCfg = Release|x64 - {1B6E9651-4D88-2ACB-BEE0-26599919361D}.Release-DLL|x64.Build.0 = Release|x64 {CB29C8C8-0EF3-843F-2E56-36E076A57D0C}.Debug|Win32.ActiveCfg = Debug|Win32 {CB29C8C8-0EF3-843F-2E56-36E076A57D0C}.Debug|x64.ActiveCfg = Debug|x64 {CB29C8C8-0EF3-843F-2E56-36E076A57D0C}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj b/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj deleted file mode 100644 index 750ef94b902..00000000000 --- a/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {1B6E9651-4D88-2ACB-BEE0-26599919361D} - - - - v100 - - - v110 - - - v120 - - - Application - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - workqueue_test - static - Debug - Debug - - - workqueue_test - static - Debug - Debug - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - - - Console - true - - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - - - Console - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) - true - MultiThreaded - true - - - Console - true - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - true - - - Console - true - true - true - - - - - - - - - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - - - {29D16885-7228-4C31-81ED-5F9187C7F2A9} - - - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - - - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - diff --git a/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj.filters b/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj.filters deleted file mode 100644 index 8b8c22896d8..00000000000 --- a/vsprojects/vcxproj/test/workqueue_test/workqueue_test.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - test\core\iomgr - - - - - - {3c17ce2b-b57b-9278-8494-48ab4df88ec8} - - - {7035b4d7-88e6-ce95-0011-0ea3cc64eddd} - - - {f0fb09d4-0bdc-a53c-1b5f-d71acbf72a5d} - - - - From 565b18b69c4fa112ef87b85cb4be1c4945a75831 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 23 Sep 2015 10:09:42 -0700 Subject: [PATCH 47/56] clang-format all core files --- src/core/client_config/subchannel.c | 14 +++++++------- src/core/iomgr/exec_ctx.h | 4 ++-- src/core/iomgr/iocp_windows.c | 6 ++---- src/core/iomgr/iocp_windows.h | 4 ++-- src/core/iomgr/pollset_set_windows.c | 4 ++-- src/core/iomgr/pollset_windows.c | 6 +++--- src/core/iomgr/sockaddr_utils.c | 3 ++- src/core/iomgr/tcp_client_windows.c | 5 +++-- src/core/iomgr/tcp_server_windows.c | 8 ++++---- src/core/iomgr/tcp_windows.c | 18 ++++++++---------- src/core/security/security_connector.c | 8 ++++---- src/core/support/stack_lockfree.c | 2 +- src/core/surface/server.c | 6 +++--- src/core/surface/version.c | 4 +--- test/core/util/port_windows.c | 9 ++++++--- 15 files changed, 50 insertions(+), 51 deletions(-) diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index d9dc5ae39d5..740389003a5 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -258,7 +258,7 @@ static void subchannel_destroy(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { if (c->active != NULL) { connection_destroy(exec_ctx, c->active); } - gpr_free((void*)c->filters); + gpr_free((void *)c->filters); grpc_channel_args_destroy(c->args); gpr_free(c->addr); grpc_mdctx_unref(c->mdctx); @@ -294,7 +294,7 @@ grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, grpc_connector_ref(c->connector); c->num_filters = args->filter_count; c->filters = gpr_malloc(sizeof(grpc_channel_filter *) * c->num_filters); - memcpy((void*)c->filters, args->filters, + memcpy((void *)c->filters, args->filters, sizeof(grpc_channel_filter *) * c->num_filters); c->addr = gpr_malloc(args->addr_len); memcpy(c->addr, args->addr, args->addr_len); @@ -531,8 +531,8 @@ static void publish_transport(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { /* build final filter list */ num_filters = c->num_filters + c->connecting_result.num_filters + 1; filters = gpr_malloc(sizeof(*filters) * num_filters); - memcpy((void*)filters, c->filters, sizeof(*filters) * c->num_filters); - memcpy((void*)(filters + c->num_filters), c->connecting_result.filters, + memcpy((void *)filters, c->filters, sizeof(*filters) * c->num_filters); + memcpy((void *)(filters + c->num_filters), c->connecting_result.filters, sizeof(*filters) * c->connecting_result.num_filters); filters[num_filters - 1] = &grpc_connected_channel_filter; @@ -545,7 +545,7 @@ static void publish_transport(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { grpc_channel_stack_init(exec_ctx, filters, num_filters, c->master, c->args, c->mdctx, stk); grpc_connected_channel_bind_transport(stk, c->connecting_result.transport); - gpr_free((void*)c->connecting_result.filters); + gpr_free((void *)c->connecting_result.filters); memset(&c->connecting_result, 0, sizeof(c->connecting_result)); /* initialize state watcher */ @@ -559,7 +559,7 @@ static void publish_transport(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { if (c->disconnected) { gpr_mu_unlock(&c->mu); gpr_free(sw); - gpr_free((void*)filters); + gpr_free((void *)filters); grpc_channel_stack_destroy(exec_ctx, stk); GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, c->master, "connecting"); GRPC_SUBCHANNEL_UNREF(exec_ctx, c, "connecting"); @@ -601,7 +601,7 @@ static void publish_transport(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { w4c = next; } - gpr_free((void*)filters); + gpr_free((void *)filters); if (destroy_connection != NULL) { connection_destroy(exec_ctx, destroy_connection); diff --git a/src/core/iomgr/exec_ctx.h b/src/core/iomgr/exec_ctx.h index bfa08c41dd7..f99aa038c59 100644 --- a/src/core/iomgr/exec_ctx.h +++ b/src/core/iomgr/exec_ctx.h @@ -38,7 +38,7 @@ /** Execution context. * A bag of data that collects information along a callstack. - * Generally created at public API entry points, and passed down as + * Generally created at public API entry points, and passed down as * pointer to child functions that manipulate it. * * Specific responsibilities (this may grow in the future): @@ -48,7 +48,7 @@ * * CONVENTIONS: * Instance of this must ALWAYS be constructed on the stack, never - * heap allocated. Instances and pointers to them must always be called + * heap allocated. Instances and pointers to them must always be called * exec_ctx. 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). diff --git a/src/core/iomgr/iocp_windows.c b/src/core/iomgr/iocp_windows.c index 0378cf0c765..3556b2c301b 100644 --- a/src/core/iomgr/iocp_windows.c +++ b/src/core/iomgr/iocp_windows.c @@ -169,8 +169,7 @@ void grpc_iocp_add_socket(grpc_winsocket *socket) { 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, + grpc_winsocket *socket, grpc_closure *closure, grpc_winsocket_callback_info *info) { int run_now = 0; GPR_ASSERT(info->closure == NULL); @@ -191,8 +190,7 @@ void grpc_socket_notify_on_write(grpc_exec_ctx *exec_ctx, socket_notify_on_iocp(exec_ctx, socket, closure, &socket->write_info); } -void grpc_socket_notify_on_read(grpc_exec_ctx *exec_ctx, - grpc_winsocket *socket, +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); } diff --git a/src/core/iomgr/iocp_windows.h b/src/core/iomgr/iocp_windows.h index 35c418f3b45..b0209e04e33 100644 --- a/src/core/iomgr/iocp_windows.h +++ b/src/core/iomgr/iocp_windows.h @@ -44,11 +44,11 @@ void grpc_iocp_shutdown(void); void grpc_iocp_add_socket(grpc_winsocket *); void grpc_socket_notify_on_write(grpc_exec_ctx *exec_ctx, - grpc_winsocket *winsocket, + grpc_winsocket *winsocket, grpc_closure *closure); void grpc_socket_notify_on_read(grpc_exec_ctx *exec_ctx, - grpc_winsocket *winsocket, + grpc_winsocket *winsocket, grpc_closure *closure); #endif /* GRPC_INTERNAL_CORE_IOMGR_IOCP_WINDOWS_H */ diff --git a/src/core/iomgr/pollset_set_windows.c b/src/core/iomgr/pollset_set_windows.c index 75da6dbfa1e..53d5d3dcd47 100644 --- a/src/core/iomgr/pollset_set_windows.c +++ b/src/core/iomgr/pollset_set_windows.c @@ -41,11 +41,11 @@ void grpc_pollset_set_init(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, +void grpc_pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pollset_set, grpc_pollset* pollset) {} -void grpc_pollset_set_del_pollset(grpc_exec_ctx *exec_ctx, +void grpc_pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pollset_set, grpc_pollset* pollset) {} diff --git a/src/core/iomgr/pollset_windows.c b/src/core/iomgr/pollset_windows.c index 7707c3d502b..5e835743af4 100644 --- a/src/core/iomgr/pollset_windows.c +++ b/src/core/iomgr/pollset_windows.c @@ -98,9 +98,9 @@ void grpc_pollset_destroy(grpc_pollset *pollset) { gpr_mu_destroy(&pollset->mu); } -void grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_pollset_worker *worker, - gpr_timespec now, gpr_timespec deadline) { +void grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + grpc_pollset_worker *worker, gpr_timespec now, + gpr_timespec deadline) { int added_worker = 0; worker->next = worker->prev = NULL; gpr_cv_init(&worker->cv); diff --git a/src/core/iomgr/sockaddr_utils.c b/src/core/iomgr/sockaddr_utils.c index df74fe2fe04..511a5d5c590 100644 --- a/src/core/iomgr/sockaddr_utils.c +++ b/src/core/iomgr/sockaddr_utils.c @@ -160,7 +160,8 @@ int grpc_sockaddr_to_string(char **out, const struct sockaddr *addr, } /* Windows inet_ntop wants a mutable ip pointer */ if (ip != NULL && - inet_ntop(addr->sa_family, (void*)ip, ntop_buf, sizeof(ntop_buf)) != NULL) { + inet_ntop(addr->sa_family, (void *)ip, ntop_buf, sizeof(ntop_buf)) != + NULL) { ret = gpr_join_host_port(out, ntop_buf, port); } else { ret = gpr_asprintf(out, "(sockaddr family=%d)", addr->sa_family); diff --git a/src/core/iomgr/tcp_client_windows.c b/src/core/iomgr/tcp_client_windows.c index 15fe30fb72b..3540c556764 100644 --- a/src/core/iomgr/tcp_client_windows.c +++ b/src/core/iomgr/tcp_client_windows.c @@ -120,7 +120,7 @@ static void on_connect(grpc_exec_ctx *exec_ctx, void *acp, int from_iocp) { /* Tries to issue one async connection, then schedules both an IOCP notification request for the connection, and one timeout alert. */ void grpc_tcp_client_connect(grpc_exec_ctx *exec_ctx, grpc_closure *on_done, - grpc_endpoint **endpoint, + grpc_endpoint **endpoint, grpc_pollset_set *interested_parties, const struct sockaddr *addr, size_t addr_len, gpr_timespec deadline) { @@ -179,7 +179,8 @@ void grpc_tcp_client_connect(grpc_exec_ctx *exec_ctx, grpc_closure *on_done, socket = grpc_winsocket_create(sock, "client"); info = &socket->write_info; - success = ConnectEx(sock, addr, (int)addr_len, NULL, 0, NULL, &info->overlapped); + success = + ConnectEx(sock, addr, (int)addr_len, NULL, 0, NULL, &info->overlapped); /* It wouldn't be unusual to get a success immediately. But we'll still get an IOCP notification, so let's ignore it. */ diff --git a/src/core/iomgr/tcp_server_windows.c b/src/core/iomgr/tcp_server_windows.c index 55cd1a5d6eb..7244606e98c 100644 --- a/src/core/iomgr/tcp_server_windows.c +++ b/src/core/iomgr/tcp_server_windows.c @@ -198,7 +198,8 @@ error: return -1; } -static void decrement_active_ports_and_notify(grpc_exec_ctx *exec_ctx, server_port *sp) { +static void decrement_active_ports_and_notify(grpc_exec_ctx *exec_ctx, + server_port *sp) { int notify = 0; sp->shutting_down = 0; gpr_mu_lock(&sp->server->mu); @@ -458,9 +459,8 @@ grpc_tcp_server_get_socket(grpc_tcp_server *s, unsigned index) { return (index < s->nports) ? s->ports[index].socket->socket : INVALID_SOCKET; } -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_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) { size_t i; diff --git a/src/core/iomgr/tcp_windows.c b/src/core/iomgr/tcp_windows.c index 4a531b8546c..2962762679d 100644 --- a/src/core/iomgr/tcp_windows.c +++ b/src/core/iomgr/tcp_windows.c @@ -176,10 +176,8 @@ static void on_read(grpc_exec_ctx *exec_ctx, void *tcpp, int success) { } } -static void win_read(grpc_exec_ctx *exec_ctx, - grpc_endpoint *ep, - gpr_slice_buffer *read_slices, - grpc_closure *cb) { +static void win_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, + gpr_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; @@ -264,10 +262,8 @@ static void on_write(grpc_exec_ctx *exec_ctx, void *tcpp, int success) { } /* Initiates a write. */ -static void win_write(grpc_exec_ctx *exec_ctx, - grpc_endpoint *ep, - gpr_slice_buffer *slices, - grpc_closure *cb) { +static void win_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, + gpr_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; @@ -344,14 +340,16 @@ static void win_write(grpc_exec_ctx *exec_ctx, grpc_socket_notify_on_write(exec_ctx, 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_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_exec_ctx *exec_ctx, 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; diff --git a/src/core/security/security_connector.c b/src/core/security/security_connector.c index ea07d49acb3..7c4cf6f04d6 100644 --- a/src/core/security/security_connector.c +++ b/src/core/security/security_connector.c @@ -648,12 +648,12 @@ grpc_security_status grpc_ssl_channel_security_connector_create( goto error; } *sc = &c->base; - gpr_free((void*)alpn_protocol_strings); + gpr_free((void *)alpn_protocol_strings); gpr_free(alpn_protocol_string_lengths); return GRPC_SECURITY_OK; error: - gpr_free((void*)alpn_protocol_strings); + gpr_free((void *)alpn_protocol_strings); gpr_free(alpn_protocol_string_lengths); return GRPC_SECURITY_ERROR; } @@ -703,12 +703,12 @@ grpc_security_status grpc_ssl_server_security_connector_create( goto error; } *sc = &c->base; - gpr_free((void*)alpn_protocol_strings); + gpr_free((void *)alpn_protocol_strings); gpr_free(alpn_protocol_string_lengths); return GRPC_SECURITY_OK; error: - gpr_free((void*)alpn_protocol_strings); + gpr_free((void *)alpn_protocol_strings); gpr_free(alpn_protocol_string_lengths); return GRPC_SECURITY_ERROR; } diff --git a/src/core/support/stack_lockfree.c b/src/core/support/stack_lockfree.c index 7e6beec0c24..df9a09894c6 100644 --- a/src/core/support/stack_lockfree.c +++ b/src/core/support/stack_lockfree.c @@ -67,7 +67,7 @@ typedef union lockfree_node { #define ENTRY_ALIGNMENT_BITS 3 /* make sure that entries aligned to 8-bytes */ #define INVALID_ENTRY_INDEX \ ((1 << 16) - 1) /* reserve this entry as invalid \ - */ + */ struct gpr_stack_lockfree { lockfree_node *entries; diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 28d0e8938d3..b6d33066a98 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -183,7 +183,7 @@ typedef struct { struct grpc_server { size_t channel_filter_count; - grpc_channel_filter const**channel_filters; + grpc_channel_filter const **channel_filters; grpc_channel_args *channel_args; grpc_completion_queue **cqs; @@ -356,7 +356,7 @@ static void server_delete(grpc_exec_ctx *exec_ctx, grpc_server *server) { grpc_channel_args_destroy(server->channel_args); gpr_mu_destroy(&server->mu_global); gpr_mu_destroy(&server->mu_call); - gpr_free((void*)server->channel_filters); + gpr_free((void *)server->channel_filters); while ((rm = server->registered_methods) != NULL) { server->registered_methods = rm->next; request_matcher_destroy(&rm->request_matcher); @@ -988,7 +988,7 @@ void grpc_server_setup_transport(grpc_exec_ctx *exec_ctx, grpc_server *s, chand->next->prev = chand->prev->next = chand; gpr_mu_unlock(&s->mu_global); - gpr_free((void*)filters); + gpr_free((void *)filters); GRPC_CHANNEL_INTERNAL_REF(channel, "connectivity"); memset(&op, 0, sizeof(op)); diff --git a/src/core/surface/version.c b/src/core/surface/version.c index 4b90e06a043..e559d51448a 100644 --- a/src/core/surface/version.c +++ b/src/core/surface/version.c @@ -36,6 +36,4 @@ #include -const char *grpc_version_string(void) { - return "0.11.0.0"; -} +const char *grpc_version_string(void) { return "0.11.0.0"; } diff --git a/test/core/util/port_windows.c b/test/core/util/port_windows.c index 3d2567757a8..60ad9b4f2ae 100644 --- a/test/core/util/port_windows.c +++ b/test/core/util/port_windows.c @@ -151,7 +151,8 @@ static void got_port_from_server(grpc_exec_ctx *exec_ctx, void *arg, gpr_mu_unlock(GRPC_POLLSET_MU(&pr->pollset)); } -static void destroy_pollset_and_shutdown(grpc_exec_ctx *exec_ctx, void *p, int success) { +static void destroy_pollset_and_shutdown(grpc_exec_ctx *exec_ctx, void *p, + int success) { grpc_pollset_destroy(p); grpc_shutdown(); } @@ -180,7 +181,8 @@ static int pick_port_using_server(char *server) { gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); while (pr.port == -1) { grpc_pollset_worker worker; - grpc_pollset_work(&exec_ctx, &pr.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + grpc_pollset_work(&exec_ctx, &pr.pollset, &worker, + gpr_now(GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1)); gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); grpc_exec_ctx_flush(&exec_ctx); @@ -189,7 +191,8 @@ static int pick_port_using_server(char *server) { gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); grpc_httpcli_context_destroy(&context); - grpc_closure_init(&destroy_pollset_closure, destroy_pollset_and_shutdown, &pr.pollset); + grpc_closure_init(&destroy_pollset_closure, destroy_pollset_and_shutdown, + &pr.pollset); grpc_pollset_shutdown(&exec_ctx, &pr.pollset, &destroy_pollset_closure); grpc_exec_ctx_finish(&exec_ctx); From 5c1ad056d2498fe719118f0bff2484c2f25469dc Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 23 Sep 2015 10:30:20 -0700 Subject: [PATCH 48/56] Fix Windows compilation --- test/core/security/credentials_test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index e660484fdfe..5c1e0f4b948 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -718,6 +718,7 @@ static char *encode_and_sign_jwt_should_not_be_called( const grpc_auth_json_key *json_key, const char *audience, gpr_timespec token_lifetime, const char *scope) { GPR_ASSERT("grpc_jwt_encode_and_sign should not be called" == NULL); + return NULL; } static void on_jwt_creds_get_metadata_success(grpc_exec_ctx *exec_ctx, From 258f8de866958599b454bbc73b9deaa78235acad Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 23 Sep 2015 12:32:40 -0700 Subject: [PATCH 49/56] Windows fixes --- src/core/iomgr/exec_ctx.c | 2 ++ src/core/iomgr/iocp_windows.c | 6 +++++- src/core/iomgr/pollset_windows.c | 5 +++++ src/core/iomgr/tcp_server_windows.c | 6 ++++-- src/core/iomgr/tcp_windows.c | 2 +- tools/run_tests/jobset.py | 2 +- 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/core/iomgr/exec_ctx.c b/src/core/iomgr/exec_ctx.c index 74aad6cea3b..a830a27b0ba 100644 --- a/src/core/iomgr/exec_ctx.c +++ b/src/core/iomgr/exec_ctx.c @@ -33,6 +33,8 @@ #include "src/core/iomgr/exec_ctx.h" +#include + void grpc_exec_ctx_flush(grpc_exec_ctx *exec_ctx) { while (!grpc_closure_list_empty(exec_ctx->closure_list)) { grpc_closure *c = exec_ctx->closure_list.head; diff --git a/src/core/iomgr/iocp_windows.c b/src/core/iomgr/iocp_windows.c index 3556b2c301b..c2f62a41b83 100644 --- a/src/core/iomgr/iocp_windows.c +++ b/src/core/iomgr/iocp_windows.c @@ -64,6 +64,7 @@ static void do_iocp_work(grpc_exec_ctx *exec_ctx) { LPOVERLAPPED overlapped; grpc_winsocket *socket; grpc_winsocket_callback_info *info; + grpc_closure *closure = NULL; success = GetQueuedCompletionStatus(g_iocp, &bytes, &completion_key, &overlapped, INFINITE); /* success = 0 and overlapped = NULL means the deadline got attained. @@ -97,12 +98,15 @@ static void do_iocp_work(grpc_exec_ctx *exec_ctx) { GPR_ASSERT(!info->has_pending_iocp); gpr_mu_lock(&socket->state_mu); if (info->closure) { - grpc_exec_ctx_enqueue(exec_ctx, info->closure, 1); + closure = info->closure; info->closure = NULL; } else { info->has_pending_iocp = 1; } gpr_mu_unlock(&socket->state_mu); + if (closure) { + closure->cb(exec_ctx, closure->cb_arg, 1); + } } static void iocp_loop(void *p) { diff --git a/src/core/iomgr/pollset_windows.c b/src/core/iomgr/pollset_windows.c index 5e835743af4..6182eb35328 100644 --- a/src/core/iomgr/pollset_windows.c +++ b/src/core/iomgr/pollset_windows.c @@ -115,6 +115,11 @@ void grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, pollset->kicked_without_pollers = 0; } done: + if (!grpc_closure_list_empty(exec_ctx->closure_list)) { + gpr_mu_unlock(&pollset->mu); + grpc_exec_ctx_flush(exec_ctx); + gpr_mu_lock(&pollset->mu); + } gpr_cv_destroy(&worker->cv); if (added_worker) { remove_worker(pollset, worker); diff --git a/src/core/iomgr/tcp_server_windows.c b/src/core/iomgr/tcp_server_windows.c index 7244606e98c..4b11ab0f064 100644 --- a/src/core/iomgr/tcp_server_windows.c +++ b/src/core/iomgr/tcp_server_windows.c @@ -380,8 +380,9 @@ static int add_socket_to_server(grpc_tcp_server *s, SOCKET sock, GPR_ASSERT(!s->on_accept_cb && "must add ports before starting server"); /* append it to the list under a lock */ if (s->nports == s->port_capacity) { - s->port_capacity *= 2; - s->ports = gpr_realloc(s->ports, sizeof(server_port) * s->port_capacity); + /* too many ports, and we need to store their address in a closure */ + /* TODO(ctiller): make server_port a linked list */ + abort(); } sp = &s->ports[s->nports++]; sp->server = s; @@ -389,6 +390,7 @@ static int add_socket_to_server(grpc_tcp_server *s, SOCKET sock, sp->shutting_down = 0; sp->AcceptEx = AcceptEx; sp->new_socket = INVALID_SOCKET; + grpc_closure_init(&sp->on_accept, on_accept, sp); GPR_ASSERT(sp->socket); gpr_mu_unlock(&s->mu); } diff --git a/src/core/iomgr/tcp_windows.c b/src/core/iomgr/tcp_windows.c index 2962762679d..9cae07316a9 100644 --- a/src/core/iomgr/tcp_windows.c +++ b/src/core/iomgr/tcp_windows.c @@ -394,7 +394,7 @@ grpc_endpoint *grpc_tcp_create(grpc_winsocket *socket, char *peer_string) { gpr_mu_init(&tcp->mu); gpr_ref_init(&tcp->refcount, 1); grpc_closure_init(&tcp->on_read, on_read, tcp); - grpc_closure_init(&tcp->on_read, on_write, tcp); + grpc_closure_init(&tcp->on_write, on_write, tcp); tcp->peer_string = gpr_strdup(peer_string); return &tcp->base; } diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py index 2a863191259..c0b9c02b3e6 100755 --- a/tools/run_tests/jobset.py +++ b/tools/run_tests/jobset.py @@ -174,6 +174,7 @@ class Job(object): for k, v in add_env.iteritems(): env[k] = v self._start = time.time() + message('START', spec.shortname, do_newline=travis) self._process = subprocess.Popen(args=spec.cmdline, stderr=subprocess.STDOUT, stdout=self._tempfile, @@ -185,7 +186,6 @@ class Job(object): self._travis = travis self._xml_test = ET.SubElement(xml_report, 'testcase', name=self._spec.shortname) if xml_report is not None else None - message('START', spec.shortname, do_newline=self._travis) def state(self, update_cache): """Poll current state of the job. Prints messages at completion.""" From 80183f3032fd7c30f5e2abe97ac8398c42bb716b Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 23 Sep 2015 12:33:59 -0700 Subject: [PATCH 50/56] Creds fix --- src/core/security/credentials.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index 48cfed74768..bf570d91b3e 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -1231,6 +1231,7 @@ static void plugin_md_request_metadata_ready(void *request, } } gpr_free(r); + grpc_exec_ctx_finish(&exec_ctx); } static void plugin_get_request_metadata( From 8475047dcbf2506c90189f588d52a3d169329a09 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 23 Sep 2015 12:56:45 -0700 Subject: [PATCH 51/56] FD logging cleanup --- src/core/iomgr/fd_posix.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index 31e30d210b6..b48b7f050aa 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -163,6 +163,9 @@ void grpc_fd_global_shutdown(void) { grpc_fd *grpc_fd_create(int fd, const char *name) { grpc_fd *r = alloc_fd(fd); grpc_iomgr_register_object(&r->iomgr_object, name); +#ifdef GRPC_FD_REF_COUNT_DEBUG + gpr_log(GPR_DEBUG, "FD %d %p create %s", fd, r, name); +#endif return r; } From caeff022dfec0a4a51bd7ac6831c9892a667911d Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 23 Sep 2015 14:18:55 -0700 Subject: [PATCH 52/56] Merge with gyp changes --- grpc.gyp | 34 +++++++++++++++++++++------------- src/core/surface/version.c | 4 +++- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/grpc.gyp b/grpc.gyp index c76276ba84c..60179f04ff7 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -205,9 +205,11 @@ 'src/core/httpcli/parser.c', 'src/core/iomgr/alarm.c', 'src/core/iomgr/alarm_heap.c', + 'src/core/iomgr/closure.c', 'src/core/iomgr/endpoint.c', 'src/core/iomgr/endpoint_pair_posix.c', 'src/core/iomgr/endpoint_pair_windows.c', + 'src/core/iomgr/exec_ctx.c', 'src/core/iomgr/fd_posix.c', 'src/core/iomgr/iocp_windows.c', 'src/core/iomgr/iomgr.c', @@ -238,6 +240,8 @@ 'src/core/iomgr/wakeup_fd_nospecial.c', 'src/core/iomgr/wakeup_fd_pipe.c', 'src/core/iomgr/wakeup_fd_posix.c', + 'src/core/iomgr/workqueue_posix.c', + 'src/core/iomgr/workqueue_windows.c', 'src/core/json/json.c', 'src/core/json/json_reader.c', 'src/core/json/json_string.c', @@ -387,9 +391,11 @@ 'src/core/httpcli/parser.c', 'src/core/iomgr/alarm.c', 'src/core/iomgr/alarm_heap.c', + 'src/core/iomgr/closure.c', 'src/core/iomgr/endpoint.c', 'src/core/iomgr/endpoint_pair_posix.c', 'src/core/iomgr/endpoint_pair_windows.c', + 'src/core/iomgr/exec_ctx.c', 'src/core/iomgr/fd_posix.c', 'src/core/iomgr/iocp_windows.c', 'src/core/iomgr/iomgr.c', @@ -420,6 +426,8 @@ 'src/core/iomgr/wakeup_fd_nospecial.c', 'src/core/iomgr/wakeup_fd_pipe.c', 'src/core/iomgr/wakeup_fd_posix.c', + 'src/core/iomgr/workqueue_posix.c', + 'src/core/iomgr/workqueue_windows.c', 'src/core/json/json.c', 'src/core/json/json_reader.c', 'src/core/json/json_string.c', @@ -1281,19 +1289,6 @@ 'test/core/iomgr/alarm_list_test.c', ] }, - { - 'target_name': 'alarm_test', - 'type': 'executable', - 'dependencies': [ - 'grpc_test_util', - 'grpc', - 'gpr_test_util', - 'gpr', - ], - 'sources': [ - 'test/core/iomgr/alarm_test.c', - ] - }, { 'target_name': 'alpn_test', 'type': 'executable', @@ -2229,6 +2224,19 @@ 'test/core/client_config/uri_parser_test.c', ] }, + { + 'target_name': 'workqueue_test', + 'type': 'executable', + 'dependencies': [ + 'grpc_test_util', + 'grpc', + 'gpr_test_util', + 'gpr', + ], + 'sources': [ + 'test/core/iomgr/workqueue_test.c', + ] + }, { 'target_name': 'h2_compress_bad_hostname_test', 'type': 'executable', diff --git a/src/core/surface/version.c b/src/core/surface/version.c index e559d51448a..4b90e06a043 100644 --- a/src/core/surface/version.c +++ b/src/core/surface/version.c @@ -36,4 +36,6 @@ #include -const char *grpc_version_string(void) { return "0.11.0.0"; } +const char *grpc_version_string(void) { + return "0.11.0.0"; +} From f8a455545b7886598a15c08dbc20ba5cd66a6ce1 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 23 Sep 2015 14:33:49 -0700 Subject: [PATCH 53/56] Fix specific worker wakeup --- src/core/iomgr/pollset_posix.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 850b51e09e3..42b8064837a 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -204,10 +204,12 @@ void grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, push_front_worker(pollset, worker); added_worker = 1; gpr_tls_set(&g_current_thread_poller, (gpr_intptr)pollset); + gpr_tls_set(&g_current_thread_worker, (gpr_intptr)worker); pollset->vtable->maybe_work_and_unlock(exec_ctx, pollset, worker, deadline, now); locked = 0; gpr_tls_set(&g_current_thread_poller, 0); + gpr_tls_set(&g_current_thread_worker, 0); } else { pollset->kicked_without_pollers = 0; } From 6301038bfc929eab09f8b744096166623e69f64f Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 24 Sep 2015 15:00:58 -0700 Subject: [PATCH 54/56] Fix some bugs leading to memory leaks --- src/core/iomgr/iomgr.c | 19 ++++++++----------- src/core/iomgr/pollset_posix.c | 13 ++++++++++--- src/core/surface/channel_connectivity.c | 1 + src/core/surface/secure_channel_create.c | 3 +++ 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index ef222416af7..612419b70e4 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -105,28 +105,25 @@ void grpc_iomgr_shutdown(void) { if (grpc_alarm_check(&exec_ctx, gpr_inf_future(GPR_CLOCK_MONOTONIC), NULL)) { gpr_mu_unlock(&g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(&g_mu); continue; } if (g_root_object.next != &g_root_object) { - int timeout = 0; 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) { - timeout = 1; + if (g_root_object.next != &g_root_object) { + gpr_log(GPR_DEBUG, + "Failed to free %d iomgr objects before shutdown deadline: " + "memory leaks are likely", + count_objects()); + dump_objects("LEAKED"); + } break; } } - if (timeout && g_root_object.next != &g_root_object) { - gpr_log(GPR_DEBUG, - "Failed to free %d iomgr objects before shutdown deadline: " - "memory leaks are likely", - count_objects()); - dump_objects("LEAKED"); - break; - } } } gpr_mu_unlock(&g_mu); diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 42b8064837a..43ad22c16d3 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -169,6 +169,7 @@ void grpc_pollset_del_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, } static void finish_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) { + GPR_ASSERT(grpc_closure_list_empty(pollset->idle_jobs)); pollset->vtable->finish_shutdown(pollset); grpc_exec_ctx_enqueue(exec_ctx, pollset->shutdown_done, 1); } @@ -236,6 +237,11 @@ done: * grpc_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)) { + gpr_mu_unlock(&pollset->mu); + grpc_exec_ctx_enqueue_list(exec_ctx, &pollset->idle_jobs); + grpc_exec_ctx_flush(exec_ctx); + gpr_mu_lock(&pollset->mu); } } } @@ -251,6 +257,9 @@ void grpc_pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, pollset->called_shutdown = 1; call_shutdown = 1; } + if (!grpc_pollset_has_workers(pollset)) { + grpc_exec_ctx_enqueue_list(exec_ctx, &pollset->idle_jobs); + } pollset->shutdown_done = closure; grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); gpr_mu_unlock(&pollset->mu); @@ -326,9 +335,7 @@ static void basic_do_promote(grpc_exec_ctx *exec_ctx, void *args, int success) { if (pollset->shutting_down) { /* We don't care about this pollset anymore. */ if (pollset->in_flight_cbs == 0 && !pollset->called_shutdown) { - GPR_ASSERT(!grpc_pollset_has_workers(pollset)); - pollset->called_shutdown = 1; - grpc_exec_ctx_enqueue(exec_ctx, pollset->shutdown_done, 1); + finish_shutdown(exec_ctx, pollset); } } else if (grpc_fd_is_orphaned(fd)) { /* Don't try to add it to anything, we'll drop our ref on it below */ diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index a685a99eacd..47cbab154f8 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -52,6 +52,7 @@ grpc_connectivity_state grpc_channel_check_connectivity_state( "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_FATAL_FAILURE; } state = grpc_client_channel_check_connectivity_state( diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 94d9f496af3..d6070a54a89 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -249,6 +249,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, GPR_ASSERT(reserved == NULL); if (grpc_find_security_connector_in_args(args) != NULL) { gpr_log(GPR_ERROR, "Cannot set security context in channel args."); + grpc_exec_ctx_finish(&exec_ctx); return grpc_lame_client_channel_create( target, GRPC_STATUS_INVALID_ARGUMENT, "Security connector exists in channel args."); @@ -257,6 +258,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, if (grpc_credentials_create_security_connector( creds, target, args, NULL, &security_connector, &new_args_from_connector) != GRPC_SECURITY_OK) { + grpc_exec_ctx_finish(&exec_ctx); return grpc_lame_client_channel_create( target, GRPC_STATUS_INVALID_ARGUMENT, "Failed to create security connector."); @@ -289,6 +291,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, GRPC_CHANNEL_INTERNAL_REF(channel, "subchannel_factory"); resolver = grpc_resolver_create(target, &f->base); if (!resolver) { + grpc_exec_ctx_finish(&exec_ctx); return NULL; } From fc193e1ff40d1ae557caf84d644a1b3a9bfe95b3 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 24 Sep 2015 15:29:03 -0700 Subject: [PATCH 55/56] Fix a livelock issue --- src/core/surface/server.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 80e6dc6d86d..27fc0945f9f 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -1046,12 +1046,13 @@ void grpc_server_shutdown_and_notify(grpc_server *server, channel_broadcaster_init(server, &broadcaster); + gpr_atm_rel_store(&server->shutdown_flag, 1); + /* collect all unregistered then registered calls */ gpr_mu_lock(&server->mu_call); kill_pending_work_locked(&exec_ctx, server); gpr_mu_unlock(&server->mu_call); - gpr_atm_rel_store(&server->shutdown_flag, 1); maybe_finish_shutdown(&exec_ctx, server); gpr_mu_unlock(&server->mu_global); From 7db24e06e2d7676b181f74773abe4b5572bbb30d Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 24 Sep 2015 23:44:07 -0700 Subject: [PATCH 56/56] Fix memory leak --- src/core/iomgr/udp_server.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/iomgr/udp_server.c b/src/core/iomgr/udp_server.c index e1a57b035fa..ae7c889d0c6 100644 --- a/src/core/iomgr/udp_server.c +++ b/src/core/iomgr/udp_server.c @@ -294,6 +294,7 @@ static int add_socket_to_server(grpc_udp_server *s, int fd, if (port >= 0) { grpc_sockaddr_to_string(&addr_str, (struct sockaddr *)&addr, 1); gpr_asprintf(&name, "udp-server-listener:%s", addr_str); + gpr_free(addr_str); gpr_mu_lock(&s->mu); /* append it to the list under a lock */ if (s->nports == s->port_capacity) { @@ -309,6 +310,7 @@ static int add_socket_to_server(grpc_udp_server *s, int fd, sp->read_cb = read_cb; GPR_ASSERT(sp->emfd); gpr_mu_unlock(&s->mu); + gpr_free(name); } return port;